From 116d2b501fc22f021a17415313e1b1c7b3496caf Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 28 Aug 2014 16:37:16 -0400 Subject: [PATCH] V0.2.0: Horn of Plenty number tweaking --- .../items/artifacts/HornOfPlenty.java | 16 ++++++++++------ .../items/food/Blandfruit.java | 2 +- .../items/food/ChargrilledMeat.java | 2 +- .../shatteredpixeldungeon/items/food/Food.java | 2 +- .../items/food/FrozenCarpaccio.java | 2 +- .../items/food/MysteryMeat.java | 2 +- .../items/food/OverpricedRation.java | 2 +- .../shatteredpixeldungeon/items/food/Pasty.java | 2 +- 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index 98da767a2..5b48aae62 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -131,12 +131,16 @@ public class HornOfPlenty extends Artifact { public boolean act() { if (charge < chargeCap) { - partialCharge += (1f/(200-level)); + //generates 0.2 food value every round, +0.02 value per level + //to a max of 0.8 food value per round (0.2+0.6, at level 30) + partialCharge += (1f*(0.2+(0.02*level))); - if (partialCharge >= 1) { + //charge is in increments of 36 food value. + if (partialCharge >= 36) { charge++; //TODO: change sprite based on fullness. - partialCharge -= 1; + //we'll do it at 3/0, 7/10, and 10/10, to relate to food items. + partialCharge -= 36; if (charge == chargeCap){ GLog.p("Your horn is full of food."); partialCharge = 0; @@ -158,7 +162,7 @@ public class HornOfPlenty extends Artifact { public void onSelect( Item item ) { if (item != null && item instanceof Food) { if (item instanceof Blandfruit && ((Blandfruit) item).potionAttrib == null){ - GLog.w("the horn rejects your unprepared blandfruit."); + GLog.w("your horn rejects the unprepared blandfruit."); } else { Hero hero = Dungeon.hero; hero.sprite.operate( hero.pos ); @@ -166,8 +170,8 @@ public class HornOfPlenty extends Artifact { hero.spend( TIME_TO_EAT ); curItem.level += ((Food)item).hornValue; - if (curItem.level >= 150){ - curItem.level = 150; + if (curItem.level >= 30){ + curItem.level = 30; GLog.p("your horn has consumed all the food it can!"); } else GLog.p("the horn consumes your food offering and grows in strength!"); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java index 7aaa7cecb..72727995b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java @@ -37,7 +37,7 @@ public class Blandfruit extends Food { stackable = false; image = ItemSpriteSheet.BLANDFRUIT; energy = (Hunger.STARVING - Hunger.HUNGRY)/2; - hornValue = 15; + hornValue = 3; //only applies when blandfruit is cooked } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java index 9d3c301dd..dbe66c5cf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java @@ -26,7 +26,7 @@ public class ChargrilledMeat extends Food { name = "chargrilled meat"; image = ItemSpriteSheet.STEAK; energy = Hunger.STARVING - Hunger.HUNGRY; - hornValue = 5; + hornValue = 1; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java index bf667ca3e..612bd2766 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java @@ -41,7 +41,7 @@ public class Food extends Item { public float energy = Hunger.HUNGRY; public String message = "That food tasted delicious!"; - public int hornValue = 15; + public int hornValue = 3; { stackable = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java index 5a296485b..0e5832b84 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java @@ -37,7 +37,7 @@ public class FrozenCarpaccio extends Food { name = "frozen carpaccio"; image = ItemSpriteSheet.CARPACCIO; energy = Hunger.STARVING - Hunger.HUNGRY; - hornValue = 5; + hornValue = 1; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java index 370b00132..301d6dc7e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java @@ -36,7 +36,7 @@ public class MysteryMeat extends Food { image = ItemSpriteSheet.MEAT; energy = Hunger.STARVING - Hunger.HUNGRY; message = "That food tasted... strange."; - hornValue = 5; + hornValue = 1; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java index dd19f197f..11bb367c0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java @@ -27,7 +27,7 @@ public class OverpricedRation extends Food { image = ItemSpriteSheet.OVERPRICED; energy = Hunger.STARVING - Hunger.HUNGRY; message = "That food tasted ok."; - hornValue = 5; + hornValue = 1; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java index 78b98b247..a0fee023d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java @@ -26,7 +26,7 @@ public class Pasty extends Food { name = "pasty"; image = ItemSpriteSheet.PASTY; energy = Hunger.STARVING; - hornValue = 25; + hornValue = 5; } @Override