diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java index e479ef8f7..0860ba1fa 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java @@ -130,6 +130,7 @@ public class GamesInProgress { info.level = hero.lvl; info.str = hero.STR; + info.strBonus = hero.STR() - hero.STR; info.exp = hero.exp; info.hp = hero.HP; info.ht = hero.HT; @@ -161,6 +162,7 @@ public class GamesInProgress { public int level; public int str; + public int strBonus; public int exp; public int hp; public int ht; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java index 2f47f6dda..f5b0eec78 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java @@ -107,10 +107,11 @@ public class WndGameInProgress extends Window { } pos += GAP; - - statSlot( Messages.get(this, "str"), info.str ); - if (info.shld > 0) statSlot( Messages.get(this, "health"), info.hp + "+" + info.shld + "/" + info.ht ); - else statSlot( Messages.get(this, "health"), (info.hp) + "/" + info.ht ); + + if (info.strBonus > 0) statSlot( Messages.get(this, "str"), info.str + "+" + info.strBonus ); + else statSlot( Messages.get(this, "str"), info.str ); + if (info.shld > 0) statSlot( Messages.get(this, "health"), info.hp + "+" + info.shld + "/" + info.ht ); + else statSlot( Messages.get(this, "health"), (info.hp) + "/" + info.ht ); statSlot( Messages.get(this, "exp"), info.exp + "/" + Hero.maxExp(info.level) ); pos += GAP; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java index 7d06211d1..5369f4e24 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java @@ -143,9 +143,11 @@ public class WndHero extends WndTabbed { pos = title.bottom() + 2*GAP; - statSlot( Messages.get(this, "str"), hero.STR() ); - if (hero.shielding() > 0) statSlot( Messages.get(this, "health"), hero.HP + "+" + hero.shielding() + "/" + hero.HT ); - else statSlot( Messages.get(this, "health"), (hero.HP) + "/" + hero.HT ); + int strBonus = hero.STR() - hero.STR; + if (strBonus > 0) statSlot( Messages.get(this, "str"), hero.STR + "+" + strBonus ); + else statSlot( Messages.get(this, "str"), hero.STR() ); + if (hero.shielding() > 0) statSlot( Messages.get(this, "health"), hero.HP + "+" + hero.shielding() + "/" + hero.HT ); + else statSlot( Messages.get(this, "health"), (hero.HP) + "/" + hero.HT ); statSlot( Messages.get(this, "exp"), hero.exp + "/" + hero.maxExp() ); pos += GAP; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java index 88b83a4a6..484b5e2c2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java @@ -222,8 +222,10 @@ public class WndRanking extends WndTabbed { } pos += GAP; - - pos = statSlot( this, Messages.get(this, "str"), Integer.toString( Dungeon.hero.STR() ), pos ); + + int strBonus = Dungeon.hero.STR() - Dungeon.hero.STR; + if (strBonus > 0) pos = statSlot(this, Messages.get(this, "str"), Dungeon.hero.STR + "+" + strBonus, pos); + else pos = statSlot(this, Messages.get(this, "str"), Integer.toString(Dungeon.hero.STR), pos); pos = statSlot( this, Messages.get(this, "health"), Integer.toString( Dungeon.hero.HT ), pos ); pos += GAP;