From a29672c7b367ca079d12c5f21a2a7d38f74cb97b Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 26 Jan 2019 16:33:46 -0500 Subject: [PATCH] v0.7.2: Fixed: - incorrect spritesheet values for icy and toxic elixirs - wicked brew being craftable instead of caustic brew - dwarf king summoning skeletons while stunned/frozen --- .../shatteredpixeldungeon/actors/mobs/King.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/items/Recipe.java | 4 ++-- .../shatteredpixeldungeon/sprites/ItemSpriteSheet.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java index 61378e73c..bfa0d4205 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java @@ -117,7 +117,7 @@ public class King extends Mob { } private boolean canTryToSummon() { - if (Undead.count < maxArmySize()) { + if (paralysed <= 0 && Undead.count < maxArmySize()) { Char ch = Actor.findChar( ((CityBossLevel)Dungeon.level).pedestal( nextPedestal ) ); return ch == this || ch == null; } else { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java index 0400abab9..f20601a06 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java @@ -30,9 +30,9 @@ import com.shatteredpixel.shatteredpixeldungeon.items.food.StewedMeat; import com.shatteredpixel.shatteredpixeldungeon.items.potions.AlchemicalCatalyst; import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.BlizzardBrew; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.CausticBrew; import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.InfernalBrew; import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.ShockingBrew; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.WickedBrew; import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfAquaticRejuvenation; import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfDragonsBlood; import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfHoneyedHealing; @@ -188,7 +188,7 @@ public abstract class Recipe { new BlizzardBrew.Recipe(), new InfernalBrew.Recipe(), new ShockingBrew.Recipe(), - new WickedBrew.Recipe(), + new CausticBrew.Recipe(), new Alchemize.Recipe(), new AquaBlast.Recipe(), new BeaconOfReturning.Recipe(), diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index 7b07a3425..bb41ba9ec 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -557,8 +557,8 @@ public class ItemSpriteSheet { public static final int ELIXIR_HONEY = ELIXIRS+1; public static final int ELIXIR_MIGHT = ELIXIRS+2; public static final int ELIXIR_DRAGON = ELIXIRS+3; - public static final int ELIXIR_ICY = ELIXIRS+4; - public static final int ELIXIR_TOXIC = ELIXIRS+5; + public static final int ELIXIR_TOXIC = ELIXIRS+4; + public static final int ELIXIR_ICY = ELIXIRS+5; public static final int ELIXIR_RESTO = ELIXIRS+6; //discontinued public static final int ELIXIR_SURGE = ELIXIRS+7; //discontinued static{