diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java index b466c9294..30ec3b20d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java @@ -37,6 +37,8 @@ public class SkillCallback implements Action1 { this.user.setFlags(user.getFlags()); } if (user.getStats() != null) { + usedSkill.xp = user.getStats().getExp() - this.user.getStats().getExp(); + usedSkill.hp = user.getStats().getHp() - this.user.getStats().getHp(); usedSkill.gold = user.getStats().getGp() - this.user.getStats().getGp(); this.user.getStats().merge(user.getStats()); } 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 5b8b56cc3..638c71a3c 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 @@ -114,6 +114,12 @@ public class SkillsFragment extends BaseMainFragment { adapter.setMana(event.newMana); StringBuilder message = new StringBuilder(); message.append(activity.getString(R.string.used_skill, skill.text, skill.mana)); + if (skill.xp != 0) { + message.append(" + ").append(round(skill.xp, 2)).append(" XP"); + } + if (skill.hp != 0) { + message.append(" + ").append(round(skill.hp, 2)).append(" HP"); + } if (skill.gold != 0) { message.append(" + ").append(round(skill.gold, 2)).append(" GP"); } diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java index 8fe867459..35ed06f51 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java @@ -21,7 +21,7 @@ public class Skill extends BaseModel { public Integer mana, lvl; @Column - public Double gold; + public Double xp, hp, gold; }