From 7a2b4639ee514a5d8ada157f942a851446ebf117 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 22 Aug 2024 12:23:41 -0400 Subject: [PATCH] v2.5.0: fixed vial of blood having no assigned sprite and not spawning --- .../shatteredpixeldungeon/items/Generator.java | 6 ++++-- .../shatteredpixeldungeon/items/trinkets/VialOfBlood.java | 2 +- .../shatteredpixeldungeon/sprites/ItemSpriteSheet.java | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java index 1fbbd6e7c..4eea261ce 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java @@ -120,6 +120,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.ThirteenLeafClove import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.TrapMechanism; import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.Trinket; import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.TrinketCatalyst; +import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.VialOfBlood; import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.WondrousResin; import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlastWave; @@ -576,9 +577,10 @@ public class Generator { MimicTooth.class, WondrousResin.class, EyeOfNewt.class, - SaltCube.class + SaltCube.class, + VialOfBlood.class }; - TRINKET.defaultProbs = new float[]{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; + TRINKET.defaultProbs = new float[]{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; TRINKET.probs = TRINKET.defaultProbs.clone(); for (Category cat : Category.values()){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/VialOfBlood.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/VialOfBlood.java index 44cbe3cf2..2a27c52eb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/VialOfBlood.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/VialOfBlood.java @@ -28,7 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class VialOfBlood extends Trinket { { - image = ItemSpriteSheet.ARTIFACT_HOURGLASS; + image = ItemSpriteSheet.BLOOD_VIAL; } @Override 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 eff771852..226f5b13a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -488,6 +488,7 @@ public class ItemSpriteSheet { public static final int WONDROUS_RESIN = TRINKETS+9; public static final int EYE_OF_NEWT = TRINKETS+10; public static final int SALT_CUBE = TRINKETS+11; + public static final int BLOOD_VIAL = TRINKETS+12; static{ assignItemRect(RAT_SKULL, 16, 11); assignItemRect(PARCHMENT_SCRAP, 10, 14); @@ -501,6 +502,7 @@ public class ItemSpriteSheet { assignItemRect(WONDROUS_RESIN, 12, 11); assignItemRect(EYE_OF_NEWT, 12, 12); assignItemRect(SALT_CUBE, 12, 13); + assignItemRect(BLOOD_VIAL, 6, 15); } private static final int SCROLLS = xy(1, 19); //16 slots