Merge pull request UOX3DevTeam#327 from UOX3DevTeam/combat-fix

Damage Adjustment should not use any skill
DragonSlayer62 · Jan 25, 2025 · c637538 · c637538
2 parents d7b8e6f + 3d33f64
commit c637538
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/source/Changelog.txt b/source/Changelog.txt
@@ -1,3 +1,6 @@
+21/01/2025 - Dragon Slayer
+	Fixed damage dealt in combat was incorrectly modified while applying defense modifiers. (combat.cpp)
+
 07/12/2024 - Dragon Slayer
 	Updated the packet 0xf1 to reflect the current CUO Web Ping while maintaining backward compatibility with older ping statuses. (0xf1_freeshardServerPoll.js) (Thanks Karasho and Xuri)
 

diff --git a/source/combat.cpp b/source/combat.cpp
@@ -2649,7 +2649,7 @@ SI16 CHandleCombat::ApplyDefenseModifiers( WeatherType damageType, CChar *mChar,
 
 	if( getDef > 0 )
 	{
-		damage -= static_cast<R32>(( static_cast<R32>( getDef ) * static_cast<R32>( attSkill )) / 750 );
+		damage -= static_cast<R32>( getDef );
 	}
 
 	return static_cast<SI16>( std::round( damage ));