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

v2.0.0: fixed wrong internal name for unencumbered spirit

Browse Source
This commit is contained in:
Evan Debenham
2023-03-01 13:13:33 -05:00
parent 2dc9ff8aeb
commit 95d143e80e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,8 +150,8 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action {
float enGainMulti = 1f;
if (target instanceof Hero) {
Hero hero = (Hero) target;
if (hero.hasTalent(Talent.LIGHTLY_ARMED)) {
int points = hero.pointsInTalent(Talent.LIGHTLY_ARMED);
if (hero.hasTalent(Talent.UNENCUMBERED_SPIRIT)) {
int points = hero.pointsInTalent(Talent.UNENCUMBERED_SPIRIT);
if (hero.belongings.armor() != null){
if (hero.belongings.armor().tier == 3 && points >= 1){

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

@@ -159,7 +159,7 @@ public enum Talent {
//Champion T3
SECONDARY_CHARGE(139, 3), TWIN_UPGRADES(140, 3), COMBINED_LETHALITY(141, 3),
//Monk T3
LIGHTLY_ARMED(142, 3), MONASTIC_VIGOR(143, 3), COMBINED_ENERGY(144, 3),
UNENCUMBERED_SPIRIT(142, 3), MONASTIC_VIGOR(143, 3), COMBINED_ENERGY(144, 3),
//Challenge T4
CLOSE_THE_GAP(145, 4), INVIGORATING_VICTORY(146, 4), ELIMINATION_MATCH(147, 4),
//Elemental Strike T4
@@ -389,7 +389,7 @@ public enum Talent {
Item.updateQuickslot();
}
if (talent == LIGHTLY_ARMED && hero.pointsInTalent(talent) == 3){
if (talent == UNENCUMBERED_SPIRIT && hero.pointsInTalent(talent) == 3){
Item toGive = new ClothArmor().identify();
if (!toGive.collect()){
Dungeon.level.drop(toGive, hero.pos).sprite.drop();
@@ -813,7 +813,7 @@ public enum Talent {
Collections.addAll(tierTalents, SECONDARY_CHARGE, TWIN_UPGRADES, COMBINED_LETHALITY);
break;
case MONK:
Collections.addAll(tierTalents, LIGHTLY_ARMED, MONASTIC_VIGOR, COMBINED_ENERGY);
Collections.addAll(tierTalents, UNENCUMBERED_SPIRIT, MONASTIC_VIGOR, COMBINED_ENERGY);
break;
}
for (Talent talent : tierTalents){
@@ -867,7 +867,9 @@ public enum Talent {
private static final HashMap<String, String> renamedTalents = new HashMap<>();
static{
//v2.0.0
renamedTalents.put("ARMSMASTERS_INTUITION", "VETERANS_INTUITION");
renamedTalents.put("ARMSMASTERS_INTUITION", "VETERANS_INTUITION");
//v2.0.0 BETA
renamedTalents.put("LIGHTLY_ARMED", "UNENCUMBERED_SPIRIT");
}
public static void restoreTalentsFromBundle( Bundle bundle, Hero hero ){