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

v3.3.0: fixed ring of force not working with spirit form

Browse Source
This commit is contained in:
Evan Debenham
2025-11-30 11:50:43 -05:00
parent 6fa7182d7b
commit ee14ea8360
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java
View File

@@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MonkEnergy; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MonkEnergy;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.SpiritForm;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
@@ -79,8 +80,16 @@ public class RingOfForce extends Ring {
} }
public static int damageRoll( Hero hero ){ public static int damageRoll( Hero hero ){
if (hero.buff(Force.class) != null //level can be 0 while still using a ring, so we specifically check for the presence of a ring of force
&& hero.buff(MonkEnergy.MonkAbility.UnarmedAbilityTracker.class) == null) { boolean usingForce = hero.buff(Force.class) != null;
if (hero.buff(SpiritForm.SpiritFormBuff.class) != null && hero.buff(SpiritForm.SpiritFormBuff.class).ring() instanceof RingOfForce){
usingForce = true;
}
//and ignore that presence if using monk abilities
if (hero.buff(MonkEnergy.MonkAbility.UnarmedAbilityTracker.class) != null){
usingForce = false;
}
if (usingForce) {
int level = getBuffedBonus(hero, Force.class); int level = getBuffedBonus(hero, Force.class);
float tier = tier(hero.STR()); float tier = tier(hero.STR());
int dmg = Hero.heroDamageIntRange(min(level, tier), max(level, tier)); int dmg = Hero.heroDamageIntRange(min(level, tier), max(level, tier));