sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-31 19:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow transformational items to be used before lvl 10

Browse source
This commit is contained in:
Phillip Thelen 2016-10-18 12:08:54 +02:00
parent e7d32c3c6c
commit 9aa383fdab
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,6 +101,7 @@ import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
import com.magicmicky.habitrpgwrapper.lib.models.Shop;
import com.magicmicky.habitrpgwrapper.lib.models.SpecialItems;
import com.magicmicky.habitrpgwrapper.lib.models.Stats;
import com.magicmicky.habitrpgwrapper.lib.models.SuppressedModals;
import com.magicmicky.habitrpgwrapper.lib.models.Tag;
@ -802,21 +803,28 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
return;
}
SpecialItems specialItems = user.getItems().getSpecial();
Boolean hasSpecialItems = false;
if (specialItems != null) {
hasSpecialItems = specialItems.hasSpecialItems();
}
IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS);
if ((user.getPreferences() != null && user.getPreferences().getDisableClasses())
|| (user.getFlags() != null && !user.getFlags().getClassSelected())) {
if (((user.getPreferences() != null && user.getPreferences().getDisableClasses())
|| (user.getFlags() != null && !user.getFlags().getClassSelected())) &&
!hasSpecialItems) {
if (item != null) {
drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
}
} else {
IDrawerItem newItem = item;
if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS) {
if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS && !hasSpecialItems) {
newItem = new PrimaryDrawerItem()
.withName(this.getString(R.string.sidebar_skills))
.withEnabled(false)
.withBadge(this.getString(R.string.unlock_lvl_11))
.withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
} else if (user.getStats().getLvl() >= MIN_LEVEL_FOR_SKILLS) {
} else {
newItem = new PrimaryDrawerItem()
.withName(this.getString(R.string.sidebar_skills))
.withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);

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

@ -58,4 +58,8 @@ public class SpecialItems extends BaseModel {
public void setSpookySparkles(int spookySparkles) {
this.spookySparkles = spookySparkles;
}
public Boolean hasSpecialItems() {
return seafoam > 0 || shinySeed > 0 || snowball > 0 || spookySparkles > 0;
}
}