From f8df68dea08243528f283957ac07804f789c55c2 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 4 Jan 2023 16:36:47 -0500 Subject: [PATCH] v2.0.0: redesigned the greataxe's ability --- core/src/main/assets/messages/items/items.properties | 5 +++-- .../shatteredpixeldungeon/items/weapon/melee/Greataxe.java | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 08aed3f60..1e152e81b 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1537,8 +1537,8 @@ 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=execute -items.weapon.melee.greataxe.ability_desc=The Duelist can _execute_ an enemy with a greataxe. This devastating blow is guaranteed to hit and deals +50% damage, but takes twice as long as a regular attack. +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.desc=Meant to be wielded over the shoulder, this titanic axe is as powerful as it is heavy. items.weapon.melee.greatshield.name=greatshield @@ -1602,6 +1602,7 @@ items.weapon.melee.meleeweapon.stats_desc= items.weapon.melee.meleeweapon.swift_equip=You quickly switch your equipped weapon. items.weapon.melee.meleeweapon.ability_need_equip=You must equip that weapon to use its ability. items.weapon.melee.meleeweapon.ability_no_charge=You don't have enough energy to use that ability. +items.weapon.melee.meleeweapon.ability_cant_use=You can't use that ability right now. items.weapon.melee.meleeweapon.ability_no_target=There is no target there. items.weapon.melee.meleeweapon.ability_bad_position=That target can't be reached. items.weapon.melee.meleeweapon.prompt=Select a Target diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java index 88e7364e9..e9e9c6dbf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java @@ -60,6 +60,11 @@ public class Greataxe extends MeleeWeapon { @Override protected void duelistAbility(Hero hero, Integer target) { + if (hero.HP / (float)hero.HT > 0.25f){ + GLog.w(Messages.get(this, "ability_cant_use")); + return; + } + if (target == null) { return; } @@ -85,7 +90,7 @@ public class Greataxe extends MeleeWeapon { onAbilityKill(hero); } } - hero.spendAndNext(2*hero.attackDelay()); + hero.spendAndNext(hero.attackDelay()); } }); }