konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: fixed bugs with unencumbered spirit

Browse Source
This commit is contained in:
Evan Debenham
2023-03-06 13:24:02 -05:00
parent 77fd4acc58
commit 1ef2f4aec7
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java
View File

@@ -156,30 +156,26 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action {
int points = hero.pointsInTalent(Talent.UNENCUMBERED_SPIRIT);
if (hero.belongings.armor() != null){
if (hero.belongings.armor().tier == 3 && points >= 1){
enGainMulti += 0.25f;
}
if (hero.belongings.armor().tier == 2 && points >= 2){
enGainMulti += 0.50f;
}
if (hero.belongings.armor().tier == 1 && points >= 3){
if (hero.belongings.armor().tier <= 1 && points >= 3){
enGainMulti += 1.00f;
} else if (hero.belongings.armor().tier <= 2 && points >= 2){
enGainMulti += 0.50f;
} else if (hero.belongings.armor().tier <= 3 && points >= 1){
enGainMulti += 0.25f;
}
}
if (hero.belongings.weapon() instanceof MeleeWeapon
&& hero.buff(RingOfForce.BrawlersStance.class) == null){
if (((MeleeWeapon) hero.belongings.weapon()).tier == 3 && points >= 1){
if (((MeleeWeapon) hero.belongings.weapon()).tier <= 1 && points >= 3){
enGainMulti += 1.00f;
} else if (((MeleeWeapon) hero.belongings.weapon()).tier <= 2 && points >= 2){
enGainMulti += 0.50f;
} else if (((MeleeWeapon) hero.belongings.weapon()).tier <= 3 && points >= 1){
enGainMulti += 0.25f;
}
if (((MeleeWeapon) hero.belongings.weapon()).tier == 2 && points >= 2){
enGainMulti += 0.50f;
}
if (((MeleeWeapon) hero.belongings.weapon()).tier == 1 && points >= 3){
enGainMulti += 1.00f;
}
} else if (hero.belongings.weapon == null) {
if (hero.buff(RingOfForce.Force.class) == null && points == 3){
if (hero.buff(RingOfForce.Force.class) == null && points >= 3){
enGainMulti += 1.50f;
}
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
View File

@@ -870,8 +870,6 @@ public enum Talent {
static{
//v2.0.0
renamedTalents.put("ARMSMASTERS_INTUITION", "VETERANS_INTUITION");
//v2.0.0 BETA
renamedTalents.put("LIGHTLY_ARMED", "UNENCUMBERED_SPIRIT");
}
public static void restoreTalentsFromBundle( Bundle bundle, Hero hero ){