v2.5.0: adjusted on-hit talents to trigger before weapon proc fx

2024-08-07 14:45:02 -04:00
parent 8de664e3d5
commit 19b812d104
1 changed files with 2 additions and 2 deletions
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -1386,9 +1386,9 @@ public class Hero extends Char {
 			wep = belongings.attackingWeapon();
 		}

-		if (wep != null) damage = wep.proc( this, enemy, damage );
-
 		damage = Talent.onAttackProc( this, enemy, damage );
+
+		if (wep != null) damage = wep.proc( this, enemy, damage );
 		
 		switch (subClass) {
 		case SNIPER: