diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 7b92ee775..ed8a97fb5 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java index dcc223116..12d654c7a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java @@ -96,19 +96,19 @@ public class SkillsFragment extends BaseMainFragment { if (specialItems != null) { Condition.In specialsWhere = Condition.column("key").in(""); - if (specialItems.getSnowball() > 1) { + if (specialItems.getSnowball() > 0) { specialsWhere.and("snowball"); } - if (specialItems.getShinySeed() > 1) { + if (specialItems.getShinySeed() > 0) { specialsWhere.and("shinySeed"); } - if (specialItems.getSeafoam() > 1) { + if (specialItems.getSeafoam() > 0) { specialsWhere.and("seafoam"); } - if (specialItems.getSpookySparkles() > 1) { + if (specialItems.getSpookySparkles() > 0) { specialsWhere.and("spookySparkles"); } @@ -159,7 +159,7 @@ public class SkillsFragment extends BaseMainFragment { adapter.setMana(event.newMana); StringBuilder message = new StringBuilder(); if (skill.isSpecialItem) { - message.append(activity.getString(R.string.used_skill_without_mana)); + message.append(activity.getString(R.string.used_skill_without_mana, skill.text)); } else { message.append(activity.getString(R.string.used_skill, skill.text, skill.mana)); }