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

v1.2.2: fixed some sources of arti charging working on cursed artifacts

Browse Source
This commit is contained in:
Evan Debenham 2022-04-05 15:28:45 -04:00
parent f329bdf950
commit 5554abd279
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java
View File

@ -57,7 +57,9 @@ public class WildEnergy extends TargetedSpell {
hero.belongings.charge(1f); hero.belongings.charge(1f);
for (Buff b : hero.buffs()){ for (Buff b : hero.buffs()){
if (b instanceof Artifact.ArtifactBuff) ((Artifact.ArtifactBuff) b).charge(hero, 4); if (b instanceof Artifact.ArtifactBuff){
if (!((Artifact.ArtifactBuff) b).isCursed()) ((Artifact.ArtifactBuff) b).charge(hero, 4);
}
} }
Buff.affect(hero, Recharging.class, 8f); Buff.affect(hero, Recharging.class, 8f);

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java
View File

@ -163,7 +163,9 @@ public class MagesStaff extends MeleeWeapon {
if (attacker instanceof Hero && ((Hero) attacker).hasTalent(Talent.MYSTICAL_CHARGE)){ if (attacker instanceof Hero && ((Hero) attacker).hasTalent(Talent.MYSTICAL_CHARGE)){
Hero hero = (Hero) attacker; Hero hero = (Hero) attacker;
for (Buff b : hero.buffs()){ for (Buff b : hero.buffs()){
if (b instanceof Artifact.ArtifactBuff) ((Artifact.ArtifactBuff) b).charge(hero, hero.pointsInTalent(Talent.MYSTICAL_CHARGE)/2f); if (b instanceof Artifact.ArtifactBuff) {
if (!((Artifact.ArtifactBuff) b).isCursed()) ((Artifact.ArtifactBuff) b).charge(hero, 4);
}
} }
} }