From 2f8892360a608fc75bfcf18dbeae4859efde5854 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 7 Oct 2024 16:57:26 -0400 Subject: [PATCH] v2.5.4: fixed parchment scrap altering generation from 2 rooms --- .../levels/rooms/special/CryptRoom.java | 5 ++++- .../levels/rooms/special/SacrificeRoom.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/CryptRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/CryptRoom.java index f3f249b69..64b47a32b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/CryptRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/CryptRoom.java @@ -80,12 +80,15 @@ public class CryptRoom extends SpecialRoom { return new Gold().random(); } + //always generate the curse to prevent parchment scrap from altering levelgen + Armor.Glyph curse = Armor.Glyph.randomCurse(); + //if it isn't already cursed, give it a free upgrade if (!prize.cursed){ prize.upgrade(); //curse the armor, unless it has a glyph if (!prize.hasGoodGlyph()){ - prize.inscribe(Armor.Glyph.randomCurse()); + prize.inscribe(curse); } } prize.cursed = prize.cursedKnown = true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SacrificeRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SacrificeRoom.java index ae6f543b7..d007bd8df 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SacrificeRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SacrificeRoom.java @@ -90,12 +90,15 @@ public class SacrificeRoom extends SpecialRoom { return new Gold().random(); } + //always generate the curse to prevent parchment scrap from altering levelgen + Weapon.Enchantment curse = Weapon.Enchantment.randomCurse(); + //if it isn't already cursed, give it a free upgrade if (!prize.cursed){ prize.upgrade(); //curse the weapon, unless it has a glyph if (!prize.hasGoodEnchant()){ - prize.enchant(Weapon.Enchantment.randomCurse()); + prize.enchant(curse); } } prize.cursed = prize.cursedKnown = true;