From 345cb9baa535745f349b2dbe7a1c290f2a88b95c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 22 Jul 2022 12:41:27 -0400 Subject: [PATCH] v1.3.2: fixed potion/scroll/ring handlers not being consistent for seeds --- .../shatteredpixeldungeon/items/potions/Potion.java | 3 ++- .../shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java | 3 ++- .../shatteredpixeldungeon/items/scrolls/Scroll.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index 38d5ea81c..b11754c5e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -74,6 +74,7 @@ import com.watabou.utils.Reflection; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; public class Potion extends Item { @@ -84,7 +85,7 @@ public class Potion extends Item { private static final float TIME_TO_DRINK = 1f; - private static final HashMap colors = new HashMap() { + private static final LinkedHashMap colors = new LinkedHashMap() { { put("crimson",ItemSpriteSheet.POTION_CRIMSON); put("amber",ItemSpriteSheet.POTION_AMBER); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java index 212ead5f1..305c3d2b6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java @@ -42,12 +42,13 @@ import com.watabou.utils.Random; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; public class Ring extends KindofMisc { protected Buff buff; - private static final HashMap gems = new HashMap() { + private static final LinkedHashMap gems = new LinkedHashMap() { { put("garnet",ItemSpriteSheet.RING_GARNET); put("ruby",ItemSpriteSheet.RING_RUBY); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java index b60d32ef4..6f288aae8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java @@ -60,6 +60,7 @@ import com.watabou.utils.Reflection; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; public abstract class Scroll extends Item { @@ -67,7 +68,7 @@ public abstract class Scroll extends Item { protected static final float TIME_TO_READ = 1f; - private static final HashMap runes = new HashMap() { + private static final LinkedHashMap runes = new LinkedHashMap() { { put("KAUNAN",ItemSpriteSheet.SCROLL_KAUNAN); put("SOWILO",ItemSpriteSheet.SCROLL_SOWILO);