sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-18 03:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix issues with transformational items

Browse source
This commit is contained in:
Phillip Thelen 2016-10-14 13:35:01 +02:00
parent 51fb50ba38
commit e7d32c3c6c
2 changed files with 6 additions and 6 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"
xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica"
android:versionCode="128"
android:versionCode="129"
android:versionName="0.0.34.2"
android:screenOrientation="portrait"
android:installLocation="auto" >

10
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
View file

@ -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));
}