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

v0.9.2: fixed two crash bugs caused by new talents

Browse Source
This commit is contained in:
Evan Debenham 2021-02-14 11:44:14 -05:00
parent 58ce8c5275
commit df0528721e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
View File

@ -304,11 +304,11 @@ public abstract class Wand extends Item {
public int buffedLvl() { public int buffedLvl() {
int lvl = super.buffedLvl(); int lvl = super.buffedLvl();
if (charger != null && charger.target != null) {
if (charger.target.buff(Talent.EmpoweringScrollsTracker.class) != null){ if (charger.target.buff(Talent.EmpoweringScrollsTracker.class) != null){
lvl += Dungeon.hero.pointsInTalent(Talent.EMPOWERING_SCROLLS); lvl += Dungeon.hero.pointsInTalent(Talent.EMPOWERING_SCROLLS);
} }
if (charger != null && charger.target != null) {
WandOfMagicMissile.MagicCharge buff = charger.target.buff(WandOfMagicMissile.MagicCharge.class); WandOfMagicMissile.MagicCharge buff = charger.target.buff(WandOfMagicMissile.MagicCharge.class);
if (buff != null && buff.level() > lvl){ if (buff != null && buff.level() > lvl){
return buff.level(); return buff.level();

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
View File

@ -351,8 +351,10 @@ abstract public class Weapon extends KindOfWeapon {
float multi = 1f; float multi = 1f;
if (attacker instanceof Hero && ((Hero) attacker).hasTalent(Talent.ENRAGED_CATALYST)){ if (attacker instanceof Hero && ((Hero) attacker).hasTalent(Talent.ENRAGED_CATALYST)){
Berserk rage = attacker.buff(Berserk.class); Berserk rage = attacker.buff(Berserk.class);
if (rage != null) {
multi += 0.2f * rage.rageAmount() * ((Hero) attacker).pointsInTalent(Talent.ENRAGED_CATALYST); multi += 0.2f * rage.rageAmount() * ((Hero) attacker).pointsInTalent(Talent.ENRAGED_CATALYST);
} }
}
return multi; return multi;
} }