LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.6.0a: renamed overprice rations to small rations

Browse Source
This commit is contained in:
Evan Debenham 2017-06-07 18:47:34 -04:00
parent a5af7b0c8d
commit 670c0d9f98
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
View File

@ -71,6 +71,11 @@ public class ShatteredPixelDungeon extends Game {
com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Shortsword.class, com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Shortsword.class,
"com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.NewShortsword" ); "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 = com.watabou.utils.Bundle.exceptionReporter =
new com.watabou.utils.Bundle.BundleExceptionCallback() { new com.watabou.utils.Bundle.BundleExceptionCallback() {
@Override @Override

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java → core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/SmallRation.java
View File

@ -24,8 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.food;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
//TODO rename this class to small ration in the next update public class SmallRation extends Food {
public class OverpricedRation extends Food {
{ {
image = ItemSpriteSheet.OVERPRICED; image = ItemSpriteSheet.OVERPRICED;

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java
View File

@ -45,7 +45,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.bags.PotionBandolier;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder; import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.SeedPouch; import com.shatteredpixel.shatteredpixeldungeon.items.bags.SeedPouch;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.WandHolster; 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.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
@ -219,8 +219,8 @@ public class ShopRoom extends SpecialRoom {
Generator.random( Generator.Category.SCROLL ) ); Generator.random( Generator.Category.SCROLL ) );
itemsToSpawn.add( new OverpricedRation() ); itemsToSpawn.add( new SmallRation() );
itemsToSpawn.add( new OverpricedRation() ); itemsToSpawn.add( new SmallRation() );
itemsToSpawn.add( new Bomb().random() ); itemsToSpawn.add( new Bomb().random() );
switch (Random.Int(5)){ switch (Random.Int(5)){

6
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -363,9 +363,9 @@ items.food.mysterymeat.not_well=You are not feeling well.
items.food.mysterymeat.stuffed=You are stuffed. items.food.mysterymeat.stuffed=You are stuffed.
items.food.mysterymeat.desc=Eat at your own risk! items.food.mysterymeat.desc=Eat at your own risk!
items.food.overpricedration.name=small food ration items.food.smallration.name=small food ration
items.food.overpricedration.eat_msg=That food tasted ok. items.food.smallration.eat_msg=That food tasted ok.
items.food.overpricedration.desc=It looks exactly like a standard ration of food but smaller. items.food.smallration.desc=It looks exactly like a standard ration of food but smaller.
items.food.pasty.pasty=pasty items.food.pasty.pasty=pasty
items.food.pasty.pie=pumpkin pie items.food.pasty.pie=pumpkin pie