From a18d4544206461490728d9dab0633af539e61e93 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 27 Jul 2019 13:45:58 -0400 Subject: [PATCH] v0.7.4a: fixed NPCs rarely getting hit by ranged attacks --- .../actors/mobs/npcs/Blacksmith.java | 2 +- .../actors/mobs/npcs/Ghost.java | 2 +- .../actors/mobs/npcs/Imp.java | 2 +- .../actors/mobs/npcs/RatKing.java | 2 +- .../actors/mobs/npcs/Sheep.java | 18 ++++++++++++++++++ .../actors/mobs/npcs/Wandmaker.java | 2 +- 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java index 8c00a44f2..ee738a925 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java @@ -226,7 +226,7 @@ public class Blacksmith extends NPC { @Override public int defenseSkill( Char enemy ) { - return 1000; + return 100_000_000; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java index 1e7e07579..f19165fcf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java @@ -80,7 +80,7 @@ public class Ghost extends NPC { @Override public int defenseSkill( Char enemy ) { - return 1000; + return 100_000_000; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java index 65963781e..276815a3b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java @@ -70,7 +70,7 @@ public class Imp extends NPC { @Override public int defenseSkill( Char enemy ) { - return 1000; + return 100_000_000; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java index 64701805d..bf841f930 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java @@ -37,7 +37,7 @@ public class RatKing extends NPC { @Override public int defenseSkill( Char enemy ) { - return 1000; + return 100_000_000; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java index 30f18ba57..03c17a9d9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java @@ -22,7 +22,10 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; +import com.shatteredpixel.shatteredpixeldungeon.messages.Languages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.SheepSprite; @@ -55,6 +58,21 @@ public class Sheep extends NPC { return true; } + @Override + public int defenseSkill(Char enemy) { + return 100_000_000; + } + + //FIXME translate this + @Override + public String defenseVerb() { + if (SPDSettings.language() == Languages.ENGLISH){ + return "Absorbed"; + } else { + return super.defenseVerb(); + } + } + @Override public void damage( int dmg, Object src ) { } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java index ffaf6f006..81d41bc77 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java @@ -63,7 +63,7 @@ public class Wandmaker extends NPC { @Override public int defenseSkill( Char enemy ) { - return 1000; + return 100_000_000; } @Override