v2.0.0: cleaned up a few weapon ability details and softened greataxe ability

core/src/main/assets/messages/items/items.properties

@@ -1487,7 +1487,7 @@ items.weapon.enchantments.vampiric.desc=This powerful enchantment leeches life f
 items.weapon.melee.assassinsblade.name=assassin's blade
 items.weapon.melee.assassinsblade.stats_desc=This weapon is stronger against unaware enemies.
 items.weapon.melee.assassinsblade.ability_name=sneak
-items.weapon.melee.assassinsblade.ability_desc=The duelist can _sneak_ while wielding an assassin's blade. This ability lets the duelist blink up to 3 tiles away and grants her 1 turn of invisibility, but costs 2 charges.
+items.weapon.melee.assassinsblade.ability_desc=The duelist can _sneak_ while wielding an assassin's blade. This ability is instantaneous, lets the duelist blink up to 3 tiles away, grants her 1 turn of invisibility, but costs 2 charges.
 items.weapon.melee.assassinsblade.desc=A small wavy blade made of obsidian, difficult to use despite being lightweight, but deadly if it finds the right mark.
 
 items.weapon.melee.battleaxe.name=battle axe
@@ -1507,13 +1507,13 @@ items.weapon.melee.crossbow$chargedshot.desc=The Duelist is focusing power into
 items.weapon.melee.dagger.name=dagger
 items.weapon.melee.dagger.stats_desc=This weapon is stronger against unaware enemies.
 items.weapon.melee.dagger.ability_name=sneak
-items.weapon.melee.dagger.ability_desc=The duelist can _sneak_ while wielding a dagger. This ability lets the duelist blink up to 5 tiles away and grants her 1 turn of invisibility, but costs 2 charges.
+items.weapon.melee.dagger.ability_desc=The duelist can _sneak_ while wielding a dagger. This ability is instantaneous, lets the duelist blink up to 3 tiles away, grants her 1 turn of invisibility, but costs 2 charges.
 items.weapon.melee.dagger.desc=A simple iron dagger with a worn wooden handle.
 
 items.weapon.melee.dirk.name=dirk
 items.weapon.melee.dirk.stats_desc=This weapon is stronger against unaware enemies.
 items.weapon.melee.dirk.ability_name=sneak
-items.weapon.melee.dirk.ability_desc=The duelist can _sneak_ while wielding a dirk. This ability lets the duelist blink up to 4 tiles away and grants her 1 turn of invisibility, but costs 2 charges.
+items.weapon.melee.dirk.ability_desc=The duelist can _sneak_ while wielding a dirk. This ability is instantaneous, lets the duelist blink up to 3 tiles away, grants her 1 turn of invisibility, but costs 2 charges.
 items.weapon.melee.dirk.desc=A longer thrusting dagger, gives a bit more steel to plunge into foes.
 
 items.weapon.melee.flail.name=flail
@@ -1546,7 +1546,7 @@ items.weapon.melee.gloves.desc=These studded gloves don't provide any real prote
 items.weapon.melee.greataxe.name=greataxe
 items.weapon.melee.greataxe.stats_desc=This weapon is incredibly heavy.
 items.weapon.melee.greataxe.ability_name=retribution
-items.weapon.melee.greataxe.ability_desc=The Duelist can perform a _retribution_ attack with a greataxe if she is below 25% health. This devastating attack is guaranteed to hit and deals +50% damage.
+items.weapon.melee.greataxe.ability_desc=The Duelist can perform a _retribution_ attack with a greataxe if she is below 33% health. This devastating attack is guaranteed to hit and deals +35% damage.
 items.weapon.melee.greataxe.desc=Meant to be wielded over the shoulder, this titanic axe is as powerful as it is heavy.
 
 items.weapon.melee.greatshield.name=greatshield
@@ -1624,7 +1624,7 @@ items.weapon.melee.shortsword.desc=A quite short sword, only a few inches longer
 items.weapon.melee.quarterstaff.name=quarterstaff
 items.weapon.melee.quarterstaff.stats_desc=This weapon blocks 0-2 damage.
 items.weapon.melee.quarterstaff.ability_name=defensive stance
-items.weapon.melee.quarterstaff.ability_desc=The duelist can assume a _defensive stance_ with a quarterstaff. This stance doubles her evasion for 6 turns, but costs two charges.
+items.weapon.melee.quarterstaff.ability_desc=The duelist can assume a _defensive stance_ with a quarterstaff. This stance doubles her evasion for 6 turns and takes no time to activate, but costs two charges.
 items.weapon.melee.quarterstaff.desc=A staff of hardwood, its ends are shod with iron.
 items.weapon.melee.quarterstaff$defensivestance.name=defensive stance
 items.weapon.melee.quarterstaff$defensivestance.desc=The Duelist is using her quarterstaff to deflect incoming blows and projectiles. As long as she is in this stance, her evasion against all attacks is doubled.\n\nTurns remaining: %s.
@@ -1659,7 +1659,7 @@ items.weapon.melee.sai.desc=Two thin blades meant to be wielded in one hand each
 items.weapon.melee.scimitar.name=scimitar
 items.weapon.melee.scimitar.stats_desc=This is a rather fast weapon.
 items.weapon.melee.scimitar.ability_name=sword dance
-items.weapon.melee.scimitar.ability_desc=The duelist can perform a _sword dance_ with a scimitar. This stance grants the Duelist +60% attack speed and -33% accuracy for 6 turns, and costs two charges.
+items.weapon.melee.scimitar.ability_desc=The duelist can perform a _sword dance_ with a scimitar. This stance grants the Duelist +60% attack speed and -33% accuracy for 6 turns, takes no time to activate, and costs two charges.
 items.weapon.melee.scimitar.desc=A thick curved blade. Its shape allows for faster, yet less powerful attacks.
 items.weapon.melee.scimitar$sworddance.name=sword dance
 items.weapon.melee.scimitar$sworddance.desc=The Duelist is making quick momentum based strikes with her weapon, in a sort of dance. While this stance is active, she attacks 60%% faster with melee weapons (enough to attack exactly twice a turn with a scimiar), but suffers -33%% accuracy.\n\nTurns remaining: %s.

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java

@@ -60,7 +60,7 @@ public class Greataxe extends MeleeWeapon {
 
 	@Override
 	protected void duelistAbility(Hero hero, Integer target) {
-		if (hero.HP / (float)hero.HT > 0.25f){
+		if (hero.HP / (float)hero.HT > 0.33f){
 			GLog.w(Messages.get(this, "ability_cant_use"));
 			return;
 		}
@@ -84,7 +84,7 @@ public class Greataxe extends MeleeWeapon {
 			@Override
 			public void call() {
 				beforeAbilityUsed(hero);
-				if (hero.attack(enemy, 1.5f, 0, Char.INFINITE_ACCURACY)){
+				if (hero.attack(enemy, 1.35f, 0, Char.INFINITE_ACCURACY)){
 					Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG);
 					if (!enemy.isAlive()){
 						onAbilityKill(hero);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java

@@ -52,7 +52,7 @@ public class Quarterstaff extends MeleeWeapon {
 
 	@Override
 	public float abilityChargeUse(Hero hero) {
-		return 2;
+		return 2*super.abilityChargeUse(hero);
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Scimitar.java

@@ -47,7 +47,7 @@ public class Scimitar extends MeleeWeapon {
 
 	@Override
 	public float abilityChargeUse(Hero hero) {
-		return 2;
+		return 2*super.abilityChargeUse(hero);
 	}
 
 	@Override