From b1a3b92ea43b102badc928b06e058b73b0b62d67 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 1 Feb 2019 00:54:26 -0500 Subject: [PATCH] v0.7.2: balance adjustments to meat pie and elixir of might --- core/src/main/assets/items.png | Bin 19480 -> 19482 bytes .../actors/buffs/WellFed.java | 5 +- .../actors/hero/Hero.java | 11 ++- .../items/food/MeatPie.java | 2 +- .../items/potions/elixirs/ElixirOfMight.java | 81 ++++++++++++++++-- .../messages/items/items.properties | 6 +- 6 files changed, 93 insertions(+), 12 deletions(-) diff --git a/core/src/main/assets/items.png b/core/src/main/assets/items.png index 741cd7589081557816c575c347532911b1493a06..a6a8274b848404406d649f6b36b02ba4a81aa7ec 100644 GIT binary patch literal 19482 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 literal 19480 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 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WellFed.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WellFed.java index a7eaf5649..7a9494c3e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WellFed.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WellFed.java @@ -40,7 +40,7 @@ public class WellFed extends Buff { if (left < 0){ detach(); return true; - } else if (left % 10 == 0){ + } else if (left % 18 == 0){ target.HP = Math.min(target.HT, target.HP + 1); } @@ -49,7 +49,8 @@ public class WellFed extends Buff { } public void reset(){ - //heals one HP every 10 turns for 450 turns + //heals one HP every 18 turns for 450 turns + //25 HP healed in total left = (int)Hunger.STARVING; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 70d0818c5..e2c28f741 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -81,6 +81,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfExperience; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfMight; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfAccuracy; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEvasion; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfForce; @@ -193,6 +194,10 @@ public class Hero extends Char { float multiplier = RingOfMight.HTMultiplier(this); HT = Math.round(multiplier * HT); + if (buff(ElixirOfMight.HTBoost.class) != null){ + HT += buff(ElixirOfMight.HTBoost.class).boost(); + } + if (boostHP){ HP += Math.max(HT - curHT, 0); } @@ -1240,7 +1245,11 @@ public class Hero extends Char { if (lvl < MAX_LEVEL) { lvl++; levelUp = true; - + + if (buff(ElixirOfMight.HTBoost.class) != null){ + buff(ElixirOfMight.HTBoost.class).onLevelUp(); + } + updateHT( true ); attackSkill++; defenseSkill++; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java index a64734386..d4d59b1fb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java @@ -76,7 +76,7 @@ public class MeatPie extends Food { @Override public int cost(ArrayList ingredients) { - return (int)Hunger.STARVING/50; + return 6; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java index cf9d3ef02..55a8b3e02 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java @@ -22,13 +22,17 @@ package com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs; import com.shatteredpixel.shatteredpixeldungeon.Badges; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.AlchemicalCatalyst; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; +import com.watabou.utils.Bundle; public class ElixirOfMight extends Elixir { @@ -41,31 +45,96 @@ public class ElixirOfMight extends Elixir { setKnown(); hero.STR++; - hero.HTBoost += 5; + + Buff.affect(hero, HTBoost.class).reset(); + HTBoost boost = Buff.affect(hero, HTBoost.class); + boost.reset(); + hero.updateHT( true ); - hero.sprite.showStatus( CharSprite.POSITIVE, Messages.get(this, "msg_1") ); + hero.sprite.showStatus( CharSprite.POSITIVE, Messages.get(this, "msg_1", boost.boost() )); GLog.p( Messages.get(this, "msg_2") ); Badges.validateStrengthAttained(); } + public String desc() { + return Messages.get(this, "desc", HTBoost.boost(Dungeon.hero.HT)); + } + @Override public int price() { //prices of ingredients - return quantity * (50 + 30); + return quantity * (50 + 40); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { - inputs = new Class[]{PotionOfStrength.class, PotionOfHealing.class}; + inputs = new Class[]{PotionOfStrength.class, AlchemicalCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 10; + cost = 5; output = ElixirOfMight.class; outQuantity = 1; } } + + public static class HTBoost extends Buff { + + { + type = buffType.POSITIVE; + } + + private int left; + + public void reset(){ + left = 5; + } + + public int boost(){ + return Math.round(left*boost(target.HT)/5f); + } + + public static int boost(int HT){ + return Math.round(4 + HT/20f); + } + + public void onLevelUp(){ + left --; + if (left <= 0){ + detach(); + } + } + + @Override + public int icon() { + return BuffIndicator.HEALING; + } + + @Override + public String toString() { + return Messages.get(this, "name"); + } + + @Override + public String desc() { + return Messages.get(this, "desc", boost(), left); + } + + private static String LEFT = "left"; + + @Override + public void storeInBundle(Bundle bundle) { + super.storeInBundle(bundle); + bundle.put( LEFT, left ); + } + + @Override + public void restoreFromBundle(Bundle bundle) { + super.restoreFromBundle(bundle); + left = bundle.getInt(LEFT); + } + } } 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 20bfd3d8d..7d3817424 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 @@ -609,9 +609,11 @@ items.potions.elixirs.elixiroficytouch.name=elixir of icy touch items.potions.elixirs.elixiroficytouch.desc=When consumed, this elixir will allow the drinker to sap the heat from enemies they attack. This effect will make the drinker immune to the cold, and allow them to chill enemies with physical attacks. items.potions.elixirs.elixirofmight.name=elixir of might -items.potions.elixirs.elixirofmight.msg_1=+1 str, +5 hp +items.potions.elixirs.elixirofmight.msg_1=+1 str, +%d hp items.potions.elixirs.elixirofmight.msg_2=Newfound strength surges through your body. -items.potions.elixirs.elixirofmight.desc=This powerful liquid will course through your muscles, permanently increasing your strength by one point and health by five points. +items.potions.elixirs.elixirofmight.desc=This powerful liquid will course through your muscles, permanently increasing your strength by one point and temporarily increasing maximum health by %d points. The heath boost scales with your maximum health, but will slowly wear off as you gain levels. +items.potions.elixirs.elixirofmight$htboost.name=max health boost +items.potions.elixirs.elixirofmight$htboost.desc=Your body feels unnaturally strong and healthy.\n\nYour maximum health is boosted for an extended period of time. As you gain levels, the boost will steadily fade.\n\nCurrent boost amount: %d\nLevels remaining: %d items.potions.elixirs.elixirofrestoration.name=elixir of restoration items.potions.elixirs.elixirofrestoration.desc=This elixir combines the properties of a healing and cleansing potion. When consumed, the drinker will start to rapidly heal, and will be cleansed of all negative effects.