From 4f02f2a4f21a1a8dd7f226430d14b530586f0c8e Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 14 Oct 2020 17:13:23 -0400 Subject: [PATCH] v0.9.0b: balance tweaks to tier one talents --- .../assets/messages/actors/actors.properties | 10 ++++----- .../actors/hero/Talent.java | 21 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index f661c8140..cd4133ae2 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -319,9 +319,9 @@ actors.hero.talent.test_subject.desc=_+1:_ Whenever he identifies a potion by us actors.hero.talent.iron_will.title=iron will actors.hero.talent.iron_will.desc=_+1:_ The max shield provided by the Warrior's seal is _increased by 1_.\n\n_+2:_ The max shield provided by the Warrior's seal is _increased by 2_. actors.hero.talent.energizing_meal.title=energizing meal -actors.hero.talent.energizing_meal.desc=_+1:_ Eating food grants the Mage _4 turns of wand recharging_.\n\n_+2:_ Eating food grants the Mage _6 turns of wand recharging_. +actors.hero.talent.energizing_meal.desc=_+1:_ Eating food grants the Mage _5 turns of wand recharging_.\n\n_+2:_ Eating food grants the Mage _8 turns of wand recharging_. actors.hero.talent.scholars_intuition.title=scholar's intuition -actors.hero.talent.scholars_intuition.desc=_+1:_ The Mage identifies wands _2x faster_.\n\n_+2:_ The Mage identifies wands _when he uses them_. +actors.hero.talent.scholars_intuition.desc=_+1:_ The Mage identifies wands _3x faster_.\n\n_+2:_ The Mage identifies wands _when he uses them_. actors.hero.talent.tested_hypothesis.title=tested hypothesis actors.hero.talent.tested_hypothesis.desc=_+1:_ Whenever he identifies a scroll by using it, the Mage gains _6 shielding_.\n\n_+2:_ Whenever he identifies a scroll by using it, the Mage gains _9 shielding_. actors.hero.talent.energizing_upgrade.title=energizing upgrade @@ -331,15 +331,15 @@ actors.hero.talent.rationed_meal.desc=_+1:_ Eating food gives the Rogue _15% mor actors.hero.talent.thiefs_intuition.title=thief's intuition actors.hero.talent.thiefs_intuition.desc=_+1:_ The Rogue identifies rings _2x faster_, and identifies the type of a ring _when he equips it_.\n\n_+2:_ The Rogue identifies rings _when he equips them_, and identifies the type of a ring _when he picks it up_. actors.hero.talent.sucker_punch.title=sucker punch -actors.hero.talent.sucker_punch.desc=_+1:_ The Rogue deals _1 bonus damage_ the first time he surprise attacks an enemy.\n\n_+2:_ The Rogue deals _1-2 bonus damage_ the first time he surprise attacks an enemy. +actors.hero.talent.sucker_punch.desc=_+1:_ The Rogue deals _1-2 bonus damage_ the first time he surprise attacks an enemy.\n\n_+2:_ The Rogue deals _2 bonus damage_ the first time he surprise attacks an enemy. actors.hero.talent.mending_shadows.title=mending shadows actors.hero.talent.mending_shadows.desc=_+1:_ The Rogue heals for 1 HP every _5 consecutive turns_ that he is hidden by his cloak.\n\n_+2:_ The Rogue heals for 1 HP every _3 consecutive turns_ that he is hidden by his cloak. actors.hero.talent.invigorating_meal.title=invigorating meal actors.hero.talent.invigorating_meal.desc=_+1:_ Eating food takes 1 turn and grants the Huntress _1 turn of haste_.\n\n_+2:_ Eating food takes 1 turn and grants the Huntress _2 turns of haste_. actors.hero.talent.survivalists_intuition.title=survivalist's intuition -actors.hero.talent.survivalists_intuition.desc=_+1:_ The Huntress identifies all equipment _1.5x faster_.\n\n_+2:_ The Huntress identifies all equipment _2x faster_. +actors.hero.talent.survivalists_intuition.desc=_+1:_ The Huntress identifies all equipment _1.75x faster_.\n\n_+2:_ The Huntress identifies all equipment _2.5x faster_. actors.hero.talent.followup_strike.title=followup strike -actors.hero.talent.followup_strike.desc=_+1:_ When the Huntress hits an enemy with her bow or a thrown weapon, her next melee attack against that enemy deals _1-2 bonus damage_.\n\n_+2:_ When the Huntress hits an enemy with her bow or a thrown weapon, her next melee attack against that enemy deals _2-3 bonus damage_ +actors.hero.talent.followup_strike.desc=_+1:_ When the Huntress hits an enemy with her bow or a thrown weapon, her next melee attack against that enemy deals _2 bonus damage_.\n\n_+2:_ When the Huntress hits an enemy with her bow or a thrown weapon, her next melee attack against that enemy deals _3 bonus damage_ actors.hero.talent.natures_aid.title=nature's aid actors.hero.talent.natures_aid.desc=_+1:_ The Huntress gains 2 armor of barkskin for _4 turns_ when a plant is trampled in her vision.\n\n_+2:_ The Huntress gains 2 armor of barkskin for _6 turns_ when a plant is trampled in her vision. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java index 0f8d4cec0..807332052 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java @@ -121,8 +121,8 @@ public enum Talent { hero.sprite.emitter().burst( Speck.factory( Speck.HEALING ), hero.pointsInTalent(HEARTY_MEAL) ); } if (hero.hasTalent(ENERGIZING_MEAL)){ - //4/6 turns of recharging - Buff.affect( hero, Recharging.class, 2*(1+hero.pointsInTalent(ENERGIZING_MEAL)) ); + //5/8 turns of recharging + Buff.affect( hero, Recharging.class, 2 + 3*(hero.pointsInTalent(ENERGIZING_MEAL)) ); ScrollOfRecharging.charge( hero ); } if (hero.hasTalent(RATIONED_MEAL)){ @@ -139,16 +139,18 @@ public enum Talent { } public static float itemIDSpeedFactor( Hero hero, Item item ){ - // 1.5x/2x speed with huntress talent - float factor = 1f + hero.pointsInTalent(SURVIVALISTS_INTUITION)/2f; + // 1.75x/2.5x speed with huntress talent + float factor = 1f + hero.pointsInTalent(SURVIVALISTS_INTUITION)*0.75f; - //otherwise 2x/3x speed (also ID instantly though) + // 2x/instant for Warrior (see onItemEquipped) if (item instanceof MeleeWeapon || item instanceof Armor){ factor *= 1f + hero.pointsInTalent(ARMSMASTERS_INTUITION); } + // 3x/instant for mage (see Wand.wandUsed()) if (item instanceof Wand){ - factor *= 1f + hero.pointsInTalent(SCHOLARS_INTUITION); + factor *= 1f + 2*hero.pointsInTalent(SCHOLARS_INTUITION); } + // 2x/instant for rogue (see onItemEqupped), also id's type on equip/on pickup if (item instanceof Ring){ factor *= 1f + hero.pointsInTalent(THIEFS_INTUITION); } @@ -178,7 +180,7 @@ public enum Talent { if (hero.hasTalent(Talent.SUCKER_PUNCH) && enemy instanceof Mob && ((Mob) enemy).surprisedBy(hero) && enemy.buff(SuckerPunchTracker.class) == null){ - dmg += Random.IntRange(1 , hero.pointsInTalent(Talent.SUCKER_PUNCH)); + dmg += Random.IntRange(hero.pointsInTalent(Talent.SUCKER_PUNCH) , 2); Buff.affect(enemy, SuckerPunchTracker.class); } @@ -186,10 +188,7 @@ public enum Talent { if (hero.belongings.weapon instanceof MissileWeapon) { Buff.affect(enemy, FollowupStrikeTracker.class); } else if (enemy.buff(FollowupStrikeTracker.class) != null){ - dmg += Random.IntRange(1, 2); - if (hero.pointsInTalent(FOLLOWUP_STRIKE) == 2){ - dmg += 1; - } + dmg += 1 + hero.pointsInTalent(FOLLOWUP_STRIKE); if (!(enemy instanceof Mob) || !((Mob) enemy).surprisedBy(hero)){ Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG, 0.75f, 1.2f); }