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

v3.0.0: fixed trinity effects blocked by antimagic being selectable

Browse Source
This commit is contained in:
Evan Debenham
2025-02-10 14:02:21 -05:00
parent b3570adc94
commit 19ee7d2fe2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/cleric/Trinity.java
+6 -2
View File
@@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility;
@@ -190,7 +191,7 @@ public class Trinity extends ArmorAbility {
add(btnBody); add(btnBody);
top = (int)btnBody.bottom(); top = (int)btnBody.bottom();
btnBody.enable(armor.charge >= trinityChargeUsePerEffect(bodyForm.getClass())); btnBody.enable(Dungeon.hero.buff(MagicImmune.class) == null && armor.charge >= trinityChargeUsePerEffect(bodyForm.getClass()));
} }
if (mindForm != null){ if (mindForm != null){
@@ -220,6 +221,9 @@ public class Trinity extends ArmorAbility {
top = (int)btnMind.bottom(); top = (int)btnMind.bottom();
btnMind.enable(armor.charge >= trinityChargeUsePerEffect(mindForm.getClass())); btnMind.enable(armor.charge >= trinityChargeUsePerEffect(mindForm.getClass()));
if (mindForm instanceof Wand && Dungeon.hero.buff(MagicImmune.class) != null){
btnMind.enable(false);
}
} }
if (spiritForm != null){ if (spiritForm != null){
@@ -263,7 +267,7 @@ public class Trinity extends ArmorAbility {
add(btnSpirit); add(btnSpirit);
top = (int)btnSpirit.bottom(); top = (int)btnSpirit.bottom();
btnSpirit.enable(armor.charge >= trinityChargeUsePerEffect(spiritForm.getClass())); btnSpirit.enable(Dungeon.hero.buff(MagicImmune.class) == null && armor.charge >= trinityChargeUsePerEffect(spiritForm.getClass()));
} }
resize(width, top); resize(width, top);
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
-1
View File
@@ -389,7 +389,6 @@ public class Ring extends KindofMisc {
&& target.buff(SpiritForm.SpiritFormBuff.class) != null && target.buff(SpiritForm.SpiritFormBuff.class) != null
&& target.buff(SpiritForm.SpiritFormBuff.class).ring() != null && target.buff(SpiritForm.SpiritFormBuff.class).ring() != null
&& target.buff(SpiritForm.SpiritFormBuff.class).ring().buffClass == type){ && target.buff(SpiritForm.SpiritFormBuff.class).ring().buffClass == type){
//TODO this works for all rings atm!
bonus += target.buff(SpiritForm.SpiritFormBuff.class).ring().soloBuffedBonus(); bonus += target.buff(SpiritForm.SpiritFormBuff.class).ring().soloBuffedBonus();
} }
return bonus; return bonus;