diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index fbcc905a9..8635ca93f 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1528,7 +1528,7 @@ items.weapon.melee.flail$spinabilitytracker.desc=The Duelist is spinning her fla items.weapon.melee.gauntlet.name=stone gauntlet items.weapon.melee.gauntlet.stats_desc=This is a very fast weapon. items.weapon.melee.gauntlet.ability_name=combo strike -items.weapon.melee.gauntlet.ability_desc=The Duelist can perform a _combo strike_ with a stone gauntlet. This attack is guaranteed to hit and is instantaneous if the Duelist has already successfully attacked with melee or thrown weapons twice in the last 3 turns. +items.weapon.melee.gauntlet.ability_desc=The Duelist can perform a _combo strike_ with a stone gauntlet. This attack is guaranteed to hit and is instantaneous if the Duelist has already successfully attacked with melee or thrown weapons twice in the last 4 turns. items.weapon.melee.gauntlet.desc=This massive gauntlet is made of crimson fabric with heavy magical stone layered on top. The fabric tightens around you, making the thick stone plates almost like a second skin. Swinging such a heavy weapon requires strength, but adds tremendous force to your blows. items.weapon.melee.glaive.name=glaive @@ -1540,7 +1540,7 @@ items.weapon.melee.glaive.desc=A massive polearm consisting of a sword blade on items.weapon.melee.gloves.name=studded gloves items.weapon.melee.gloves.stats_desc=This is a very fast weapon. items.weapon.melee.gloves.ability_name=combo strike -items.weapon.melee.gloves.ability_desc=The Duelist can perform a _combo strike_ with studded gloves. This attack is guaranteed to hit and is instantaneous if the Duelist has already successfully attacked with melee or thrown weapons twice in the last 5 turns. +items.weapon.melee.gloves.ability_desc=The Duelist can perform a _combo strike_ with studded gloves. This attack is guaranteed to hit and is instantaneous if the Duelist has already successfully attacked with melee or thrown weapons twice in the last 6 turns. items.weapon.melee.gloves.desc=These studded gloves don't provide any real protection, but they act as a serviceable weapon while keeping the hands free. items.weapon.melee.greataxe.name=greataxe @@ -1654,7 +1654,7 @@ items.weapon.melee.runicblade.desc=A mysterious weapon from a distant land, with items.weapon.melee.sai.name=sai items.weapon.melee.sai.stats_desc=This is a very fast weapon. items.weapon.melee.sai.ability_name=combo strike -items.weapon.melee.sai.ability_desc=The Duelist can perform a _combo strike_ with sai. This attack is guaranteed to hit and is instantaneous if the Duelist has already successfully attacked with melee or thrown weapons in the last 4 turns. +items.weapon.melee.sai.ability_desc=The Duelist can perform a _combo strike_ with sai. This attack is guaranteed to hit and is instantaneous if the Duelist has already successfully attacked with melee or thrown weapons twice in the last 5 turns. items.weapon.melee.sai.desc=Two thin blades meant to be wielded in one hand each. Excellent for tearing down enemies with a flurry of cuts. items.weapon.melee.scimitar.name=scimitar diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gauntlet.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gauntlet.java index 82ae530ba..57b4657c9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gauntlet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gauntlet.java @@ -50,7 +50,7 @@ public class Gauntlet extends MeleeWeapon { @Override protected void duelistAbility(Hero hero, Integer target) { - Sai.comboStrikeAbility(hero, target, 3, this); + Sai.comboStrikeAbility(hero, target, 4, this); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gloves.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gloves.java index b09279baa..c91415868 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gloves.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gloves.java @@ -52,7 +52,7 @@ public class Gloves extends MeleeWeapon { @Override protected void duelistAbility(Hero hero, Integer target) { - Sai.comboStrikeAbility(hero, target, 5, this); + Sai.comboStrikeAbility(hero, target, 6, this); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java index 56e81142c..c24620f87 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java @@ -62,7 +62,7 @@ public class Sai extends MeleeWeapon { @Override protected void duelistAbility(Hero hero, Integer target) { - Sai.comboStrikeAbility(hero, target, 4, this); + Sai.comboStrikeAbility(hero, target, 5, this); } public static void comboStrikeAbility(Hero hero, Integer target, int comboTime, MeleeWeapon wep){ @@ -116,7 +116,7 @@ public class Sai extends MeleeWeapon { public static class ComboStrikeTracker extends FlavourBuff{ - public static float DURATION = 5f; + public static float DURATION = 6f; }