sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 02:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add #334 - updated skill feedback with HP and XP

Browse source
This commit is contained in:
Sir Loading 2016-08-18 13:37:52 +02:00
parent bfdb5ac72f
commit bd2ec3e28e
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
View file

@ -37,6 +37,8 @@ public class SkillCallback implements Action1<SkillResponse> {
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());
}

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

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

2
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java
View file

@ -21,7 +21,7 @@ public class Skill extends BaseModel {
public Integer mana, lvl;
@Column
public Double gold;
public Double xp, hp, gold;
}