LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.4: bonus strength is now displayed separately, using a plus sign

Browse Source
This commit is contained in:
Evan Debenham 2021-07-31 22:05:16 -04:00
parent d776e83bb5
commit 6b37305ddb
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java
View File

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

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java
View File

@ -108,9 +108,10 @@ 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;

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java
View File

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

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
View File

@ -223,7 +223,9 @@ 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;