diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 5e4029219..5d95af8dd 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -22,6 +22,7 @@ import java.util.HashSet; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Drowsy; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; +import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CapeOfThorns; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.audio.Sample; @@ -794,12 +795,9 @@ public class Hero extends Char { @Override public int defenseProc( Char enemy, int damage ) { - RingOfThorns.Thorns thorns = buff( RingOfThorns.Thorns.class ); + CapeOfThorns.Thorns thorns = buff( CapeOfThorns.Thorns.class ); if (thorns != null) { - int dmg = Random.IntRange( 0, damage ); - if (dmg > 0) { - enemy.damage( dmg, thorns ); - } + damage = thorns.proc(damage, enemy); } Earthroot.Armor armor = buff( Earthroot.Armor.class ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java index 9f038def8..0079c7888 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java @@ -19,6 +19,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; import java.util.HashSet; +import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CapeOfThorns; import com.watabou.noosa.Camera; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; @@ -34,7 +35,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; -import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfThorns; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; @@ -54,7 +54,7 @@ public class DM300 extends Mob { EXP = 30; defenseSkill = 18; - loot = new RingOfThorns().random(); + loot = new CapeOfThorns(); lootChance = 0.333f; }