sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix buying gem quests

Browse source
This commit is contained in:
Phillip Thelen 2016-08-04 12:14:50 +02:00
parent f2a716edc5
commit aad16502fd
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica" package="com.habitrpg.android.habitica"
android:versionCode="109" android:versionCode="110"
android:versionName="0.0.33.1" android:versionName="0.0.33.1"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:installLocation="auto" > android:installLocation="auto" >

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
View file

@ -877,7 +877,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
} else { } else {
observable = apiHelper.apiService.purchaseHourglassItem(event.item.purchaseType, event.item.key); observable = apiHelper.apiService.purchaseHourglassItem(event.item.purchaseType, event.item.key);
} }
} else if (event.item.purchaseType.equals("quests")) { } else if (event.item.purchaseType.equals("quests") && event.item.getCurrency().equals("gold")) {
observable = apiHelper.apiService.purchaseQuest(event.item.key); observable = apiHelper.apiService.purchaseQuest(event.item.key);
} else { } else {
observable = apiHelper.apiService.purchaseItem(event.item.purchaseType, event.item.key); observable = apiHelper.apiService.purchaseItem(event.item.purchaseType, event.item.key);

4
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java
View file

@ -96,9 +96,9 @@ public class ShopItem {
public boolean canBuy(HabitRPGUser user) { public boolean canBuy(HabitRPGUser user) {
if (getCurrency().equals("gold")) { if (getCurrency().equals("gold")) {
return getValue() < user.getStats().getGp(); return getValue() <= user.getStats().getGp();
} else if (getCurrency().equals("gems")) { } else if (getCurrency().equals("gems")) {
return getValue() < (user.getBalance()*4); return getValue() <= (user.getBalance()*4);
} else { } else {
return false; return false;
} }