From 670c0d9f9834e470cd10a9ac6e3958d4157ba398 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 7 Jun 2017 18:47:34 -0400 Subject: [PATCH] v0.6.0a: renamed overprice rations to small rations --- .../shatteredpixeldungeon/ShatteredPixelDungeon.java | 5 +++++ .../items/food/{OverpricedRation.java => SmallRation.java} | 3 +-- .../levels/rooms/special/ShopRoom.java | 6 +++--- .../shatteredpixeldungeon/messages/items/items.properties | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) rename core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/{OverpricedRation.java => SmallRation.java} (91%) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index cf3f316e9..75d9dd3bf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -70,6 +70,11 @@ public class ShatteredPixelDungeon extends Game { com.watabou.utils.Bundle.addAlias( com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Shortsword.class, "com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.NewShortsword" ); + + //v0.6.0a + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.food.SmallRation.class, + "com.shatteredpixel.shatteredpixeldungeon.items.food.OverpricedRation" ); com.watabou.utils.Bundle.exceptionReporter = new com.watabou.utils.Bundle.BundleExceptionCallback() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/SmallRation.java similarity index 91% rename from core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java rename to core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/SmallRation.java index 364b61cec..474bca4c3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/SmallRation.java @@ -24,8 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.food; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; -//TODO rename this class to small ration in the next update -public class OverpricedRation extends Food { +public class SmallRation extends Food { { image = ItemSpriteSheet.OVERPRICED; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java index b2c22f480..76125023e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java @@ -45,7 +45,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.bags.PotionBandolier; import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder; import com.shatteredpixel.shatteredpixeldungeon.items.bags.SeedPouch; import com.shatteredpixel.shatteredpixeldungeon.items.bags.WandHolster; -import com.shatteredpixel.shatteredpixeldungeon.items.food.OverpricedRation; +import com.shatteredpixel.shatteredpixeldungeon.items.food.SmallRation; import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; @@ -219,8 +219,8 @@ public class ShopRoom extends SpecialRoom { Generator.random( Generator.Category.SCROLL ) ); - itemsToSpawn.add( new OverpricedRation() ); - itemsToSpawn.add( new OverpricedRation() ); + itemsToSpawn.add( new SmallRation() ); + itemsToSpawn.add( new SmallRation() ); itemsToSpawn.add( new Bomb().random() ); switch (Random.Int(5)){ diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index f359f8fd1..dae964302 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -363,9 +363,9 @@ items.food.mysterymeat.not_well=You are not feeling well. items.food.mysterymeat.stuffed=You are stuffed. items.food.mysterymeat.desc=Eat at your own risk! -items.food.overpricedration.name=small food ration -items.food.overpricedration.eat_msg=That food tasted ok. -items.food.overpricedration.desc=It looks exactly like a standard ration of food but smaller. +items.food.smallration.name=small food ration +items.food.smallration.eat_msg=That food tasted ok. +items.food.smallration.desc=It looks exactly like a standard ration of food but smaller. items.food.pasty.pasty=pasty items.food.pasty.pie=pumpkin pie