From 34d62f985288b89b3d6f3fad3cf02694daf68979 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 29 May 2022 18:33:54 -0400 Subject: [PATCH] v1.3.0: renamed dreamfoil to mageroyal --- core/src/main/assets/messages/items/items.properties | 2 +- core/src/main/assets/messages/plants/plants.properties | 10 +++++----- .../shatteredpixeldungeon/ShatteredPixelDungeon.java | 7 +++++++ .../shatteredpixeldungeon/items/Generator.java | 4 ++-- .../shatteredpixeldungeon/items/potions/Potion.java | 7 ++----- .../items/weapon/missiles/darts/TippedDart.java | 4 ++-- .../plants/{Dreamfoil.java => Mageroyal.java} | 8 +++----- .../shatteredpixeldungeon/sprites/ItemSpriteSheet.java | 2 +- 8 files changed, 23 insertions(+), 21 deletions(-) rename core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/{Dreamfoil.java => Mageroyal.java} (88%) diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 66d60d3b3..7a9eae394 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1577,7 +1577,7 @@ items.weapon.missiles.darts.chillingdart.name=chilling dart items.weapon.missiles.darts.chillingdart.desc=These darts are tipped with an icecap-based compound which will significantly chill their target. items.weapon.missiles.darts.cleansingdart.name=cleansing dart -items.weapon.missiles.darts.cleansingdart.desc=These darts are tipped with a dreamfoil-based compound which will temporarily make allies immune to all negative effects, or will cleanse positive effects from enemies. Enemies may even briefly forget that they are attacking or fleeing from you. The dart itself is still harmful to enemies, but will not harm allies. +items.weapon.missiles.darts.cleansingdart.desc=These darts are tipped with a mageroyal-based compound which will temporarily make allies immune to all negative effects, or will cleanse positive effects from enemies. Enemies may even briefly forget that they are attacking or fleeing from you. The dart itself is still harmful to enemies, but will not harm allies. items.weapon.missiles.darts.dart.name=dart items.weapon.missiles.darts.dart.ac_tip=TIP diff --git a/core/src/main/assets/messages/plants/plants.properties b/core/src/main/assets/messages/plants/plants.properties index f9850fee6..77e0b5a87 100644 --- a/core/src/main/assets/messages/plants/plants.properties +++ b/core/src/main/assets/messages/plants/plants.properties @@ -7,11 +7,11 @@ plants.blindweed.desc=Upon being touched a blindweed perishes in a bright flash plants.blindweed.warden_desc=_The Warden_ will channel a blindweed's energy into a temporary shroud of invisibility, instead of being disoriented. plants.blindweed$seed.name=seed of blindweed -plants.dreamfoil.name=dreamfoil -plants.dreamfoil.refreshed=You feel refreshed. -plants.dreamfoil.desc=The dreamfoil's prickly flowers contain a chemical which is known for its properties as a strong neutralizing agent. Anything that steps in this plant will be cleansed of many negative effects. -plants.dreamfoil.warden_desc=In addition to the neutralizing effect, _the Warden_ will become temporarily immune to all area-bound effects when stepping on dreamfoil. -plants.dreamfoil$seed.name=seed of dreamfoil +plants.mageroyal.name=mageroyal +plants.mageroyal.refreshed=You feel refreshed. +plants.mageroyal.desc=The mageroyal's prickly flowers contain a chemical which is known for its properties as a strong neutralizing agent. Anything that steps in this plant will be cleansed of many negative effects. +plants.mageroyal.warden_desc=In addition to the neutralizing effect, _the Warden_ will become temporarily immune to all area-bound effects when stepping on mageroyal. +plants.mageroyal$seed.name=seed of mageroyal plants.earthroot.name=earthroot plants.earthroot.desc=When a creature touches an earthroot, its roots create a kind of immobile natural armor around it. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index b6d6d6677..b0edcabfe 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -47,6 +47,13 @@ public class ShatteredPixelDungeon extends Game { super( sceneClass == null ? WelcomeScene.class : sceneClass, platform ); //v1.3.0 + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal.class, + "com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal.Seed.class, + "com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil.Seed" ); + com.watabou.utils.Bundle.addAlias( com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Dazzling.class, "com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Exhausting" ); 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 89e6beef4..111da2fde 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java @@ -154,7 +154,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.ThrowingSt import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Tomahawk; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Trident; import com.shatteredpixel.shatteredpixeldungeon.plants.Blindweed; -import com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil; +import com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal; import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot; import com.shatteredpixel.shatteredpixeldungeon.plants.Fadeleaf; import com.shatteredpixel.shatteredpixeldungeon.plants.Firebloom; @@ -276,7 +276,7 @@ public class Generator { Blindweed.Seed.class, Stormvine.Seed.class, Earthroot.Seed.class, - Dreamfoil.Seed.class, + Mageroyal.Seed.class, Starflower.Seed.class}; SEED.defaultProbs = new float[]{ 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 2 }; SEED.probs = SEED.defaultProbs.clone(); 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 699c4edb0..38d5ea81c 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 @@ -22,10 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.potions; import com.shatteredpixel.shatteredpixeldungeon.Assets; -import com.shatteredpixel.shatteredpixeldungeon.Badges; -import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; -import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; @@ -50,7 +47,7 @@ import com.shatteredpixel.shatteredpixeldungeon.journal.Catalog; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.plants.Blindweed; -import com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil; +import com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal; import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot; import com.shatteredpixel.shatteredpixeldungeon.plants.Fadeleaf; import com.shatteredpixel.shatteredpixeldungeon.plants.Firebloom; @@ -448,7 +445,7 @@ public class Potion extends Item { public static HashMap, Class> types = new HashMap<>(); static { types.put(Blindweed.Seed.class, PotionOfInvisibility.class); - types.put(Dreamfoil.Seed.class, PotionOfPurity.class); + types.put(Mageroyal.Seed.class, PotionOfPurity.class); types.put(Earthroot.Seed.class, PotionOfParalyticGas.class); types.put(Fadeleaf.Seed.class, PotionOfMindVision.class); types.put(Firebloom.Seed.class, PotionOfLiquidFlame.class); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java index 9b9efc673..c174b651f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java @@ -32,7 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Generator; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfRegrowth; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.plants.Blindweed; -import com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil; +import com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal; import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot; import com.shatteredpixel.shatteredpixeldungeon.plants.Fadeleaf; import com.shatteredpixel.shatteredpixeldungeon.plants.Firebloom; @@ -173,7 +173,7 @@ public abstract class TippedDart extends Dart { private static HashMap, Class> types = new HashMap<>(); static { types.put(Blindweed.Seed.class, BlindingDart.class); - types.put(Dreamfoil.Seed.class, CleansingDart.class); + types.put(Mageroyal.Seed.class, CleansingDart.class); types.put(Earthroot.Seed.class, ParalyticDart.class); types.put(Fadeleaf.Seed.class, DisplacingDart.class); types.put(Firebloom.Seed.class, IncendiaryDart.class); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Mageroyal.java similarity index 88% rename from core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java rename to core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Mageroyal.java index 4955d6e87..e8129e48c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Mageroyal.java @@ -24,16 +24,14 @@ package com.shatteredpixel.shatteredpixeldungeon.plants; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.BlobImmunity; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicalSleep; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; -import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; -public class Dreamfoil extends Plant { +public class Mageroyal extends Plant { { image = 7; @@ -58,9 +56,9 @@ public class Dreamfoil extends Plant { public static class Seed extends Plant.Seed { { - image = ItemSpriteSheet.SEED_DREAMFOIL; + image = ItemSpriteSheet.SEED_MAGEROYAL; - plantClass = Dreamfoil.class; + plantClass = Mageroyal.class; } } } \ No newline at end of file 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 1e19bf6a0..e0024cd20 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -562,7 +562,7 @@ public class ItemSpriteSheet { public static final int SEED_ICECAP = SEEDS+4; public static final int SEED_STORMVINE = SEEDS+5; public static final int SEED_SORROWMOSS = SEEDS+6; - public static final int SEED_DREAMFOIL = SEEDS+7; + public static final int SEED_MAGEROYAL = SEEDS+7; public static final int SEED_EARTHROOT = SEEDS+8; public static final int SEED_STARFLOWER = SEEDS+9; public static final int SEED_FADELEAF = SEEDS+10;