From 31719db813ec96a2c669c881e49034b31403ce94 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 6 Dec 2022 13:41:27 -0500
Subject: [PATCH] v2.0.0: cleaned up a few tiny errors in rapier and sword
 abilities

---
 .../shatteredpixeldungeon/items/weapon/melee/Rapier.java     | 2 +-
 .../shatteredpixeldungeon/items/weapon/melee/Sword.java      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java
index 9b3e09ef4..d19e3798a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java
@@ -109,7 +109,7 @@ public class Rapier extends MeleeWeapon {
 					@Override
 					public void call() {
 						//+3+lvl damage, equivalent to +67% damage, but more consistent
-						if (hero.attack(enemy, 1f, 3 + level(), Char.INFINITE_ACCURACY)){
+						if (hero.attack(enemy, 1f, augment.damageFactor(3 + level()), Char.INFINITE_ACCURACY)){
 							Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG);
 						}
 						onAbilityUsed(hero);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java
index 56df0dd8e..6c1199157 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java
@@ -79,9 +79,10 @@ public class Sword extends MeleeWeapon {
 		hero.sprite.attack(enemy.pos, new Callback() {
 			@Override
 			public void call() {
-				hero.attack(enemy, dmgMulti, 0, Char.INFINITE_ACCURACY);
+				if (hero.attack(enemy, dmgMulti, 0, Char.INFINITE_ACCURACY)){
+					Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG);
+				}
 				wep.onAbilityUsed(hero);
-				Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG);
 
 				if (!enemy.isAlive()){
 					hero.next();