From 071d7de63919b85ae809dd15bbae7041acc8f3b1 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 7 Jun 2018 19:25:42 -0400 Subject: [PATCH] v0.7.0: adjusted rooms and spellbook to accomodate droprate changes --- .../items/artifacts/UnstableSpellbook.java | 4 +++- .../rooms/secret/SecretLaboratoryRoom.java | 23 ++++++++++--------- .../rooms/secret/SecretLibraryRoom.java | 19 +++++++-------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java index 954672280..eb0ebc890 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java @@ -34,6 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfIdentify; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRemoveCurse; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTransmutation; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; @@ -115,7 +116,8 @@ public class UnstableSpellbook extends Artifact { scroll instanceof ScrollOfRemoveCurse || scroll instanceof ScrollOfMagicMapping) && Random.Int(2) == 0) //don't roll teleportation scrolls on boss floors - || (scroll instanceof ScrollOfTeleportation && Dungeon.bossLevel())); + || (scroll instanceof ScrollOfTeleportation && Dungeon.bossLevel()) + || (scroll instanceof ScrollOfTransmutation)); scroll.ownedByBook = true; curItem = scroll; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java index f209b5b80..ea7f6bbfd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java @@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Alchemy; import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfExperience; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfFrost; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHaste; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfInvisibility; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLevitation; @@ -44,19 +45,19 @@ import java.util.HashMap; public class SecretLaboratoryRoom extends SecretRoom { - //TODO adjust based on changes to generator chances private static HashMap, Float> potionChances = new HashMap<>(); static{ - potionChances.put(PotionOfHealing.class, 2f); - potionChances.put(PotionOfExperience.class, 5f); - potionChances.put(PotionOfToxicGas.class, 1f); - potionChances.put(PotionOfParalyticGas.class, 3f); - potionChances.put(PotionOfLiquidFlame.class, 1f); - potionChances.put(PotionOfLevitation.class, 1f); - potionChances.put(PotionOfMindVision.class, 3f); - potionChances.put(PotionOfPurity.class, 2f); - potionChances.put(PotionOfInvisibility.class, 1f); - potionChances.put(PotionOfFrost.class, 1f); + potionChances.put(PotionOfHealing.class, 1f); + potionChances.put(PotionOfMindVision.class, 2f); + potionChances.put(PotionOfFrost.class, 3f); + potionChances.put(PotionOfLiquidFlame.class, 3f); + potionChances.put(PotionOfToxicGas.class, 3f); + potionChances.put(PotionOfHaste.class, 4f); + potionChances.put(PotionOfInvisibility.class, 4f); + potionChances.put(PotionOfLevitation.class, 4f); + potionChances.put(PotionOfParalyticGas.class, 4f); + potionChances.put(PotionOfPurity.class, 4f); + potionChances.put(PotionOfExperience.class, 6f); } public void paint( Level level ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java index 95340979b..f77605e94 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java @@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRemoveCurse; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTerror; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTransmutation; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; @@ -52,19 +53,19 @@ public class SecretLibraryRoom extends SecretRoom { return Math.max(7, super.minHeight()); } - //TODO adjust based on changes to generator chances private static HashMap, Float> scrollChances = new HashMap<>(); static{ scrollChances.put( ScrollOfIdentify.class, 1f ); - scrollChances.put( ScrollOfTeleportation.class, 1f ); - scrollChances.put( ScrollOfRemoveCurse.class, 3f ); - scrollChances.put( ScrollOfRecharging.class, 1f ); + scrollChances.put( ScrollOfRemoveCurse.class, 2f ); scrollChances.put( ScrollOfMagicMapping.class, 3f ); - scrollChances.put( ScrollOfRage.class, 1f ); - scrollChances.put( ScrollOfTerror.class, 2f ); - scrollChances.put( ScrollOfLullaby.class, 2f ); - scrollChances.put( ScrollOfPsionicBlast.class, 5f ); - scrollChances.put( ScrollOfMirrorImage.class, 1f ); + scrollChances.put( ScrollOfMirrorImage.class, 3f ); + scrollChances.put( ScrollOfRecharging.class, 3f ); + scrollChances.put( ScrollOfLullaby.class, 4f ); + scrollChances.put( ScrollOfPsionicBlast.class, 4f ); + scrollChances.put( ScrollOfRage.class, 4f ); + scrollChances.put( ScrollOfTeleportation.class, 4f ); + scrollChances.put( ScrollOfTerror.class, 4f ); + scrollChances.put( ScrollOfTransmutation.class, 6f ); } public void paint( Level level ) {