EQ2/Emu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added proc type 20 (physical attack damage attempt) and type 21 (magical attack damage attempt) -- these will serve as attempts to hit, not requiring a successful hit

Browse Source
This commit is contained in:
Emagi 2025-08-10 17:15:33 -04:00
parent 2515b55e56
commit 2f558184b9
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/WorldServer/Combat.cpp
View File

@ -279,6 +279,8 @@ void Entity::MeleeAttack(Spawn* victim, float distance, bool primary, bool multi
CheckEncounterState((Entity*)victim); CheckEncounterState((Entity*)victim);
} }
CheckProcs(PROC_TYPE_PHYSICAL_ATTEMPT, victim);
if(hit_result == DAMAGE_PACKET_RESULT_SUCCESSFUL){ if(hit_result == DAMAGE_PACKET_RESULT_SUCCESSFUL){
/*if(GetAdventureClass() == MONK){ /*if(GetAdventureClass() == MONK){
max_damage*=3; max_damage*=3;
@ -359,6 +361,8 @@ bool Entity::RangeAttack(Spawn* victim, float distance, Item* weapon, Item* ammo
if(!victim) if(!victim)
return false; return false;
CheckProcs(PROC_TYPE_PHYSICAL_ATTEMPT, victim);
bool item_deleted = false; bool item_deleted = false;
if(weapon && weapon->IsRanged() && ammo && ammo->IsAmmo() && ammo->IsThrown()) { if(weapon && weapon->IsRanged() && ammo && ammo->IsAmmo() && ammo->IsThrown()) {
if(weapon->ranged_info->range_low <= distance && (weapon->ranged_info->range_high + ammo->thrown_info->range) >= distance) { if(weapon->ranged_info->range_low <= distance && (weapon->ranged_info->range_high + ammo->thrown_info->range) >= distance) {
@ -495,6 +499,9 @@ bool Entity::SpellAttack(Spawn* victim, float distance, LuaSpell* luaspell, int8
if(victim->IsEntity()) { if(victim->IsEntity()) {
CheckEncounterState((Entity*)victim); CheckEncounterState((Entity*)victim);
} }
CheckProcs(PROC_TYPE_MAGICAL_ATTEMPT, victim);
bool successful_hit = true; bool successful_hit = true;
if(hit_result == DAMAGE_PACKET_RESULT_SUCCESSFUL) { if(hit_result == DAMAGE_PACKET_RESULT_SUCCESSFUL) {
luaspell->last_spellattack_hit = true; luaspell->last_spellattack_hit = true;

2
source/WorldServer/Entity.h
View File

@ -1367,6 +1367,8 @@ struct Proc {
#define PROC_TYPE_DAMAGED_MAGIC 17 #define PROC_TYPE_DAMAGED_MAGIC 17
#define PROC_TYPE_RANGED_ATTACK 18 #define PROC_TYPE_RANGED_ATTACK 18
#define PROC_TYPE_RANGED_DEFENSE 19 #define PROC_TYPE_RANGED_DEFENSE 19
#define PROC_TYPE_PHYSICAL_ATTEMPT 20
#define PROC_TYPE_MAGICAL_ATTEMPT 21
struct ThreatTransfer { struct ThreatTransfer {
int32 Target; int32 Target;

2
source/WorldServer/LuaFunctions.cpp
View File

@ -6602,6 +6602,8 @@ int EQ2Emu_lua_AddWard(lua_State* state) {
if (wardType == WARD_TYPE_MAGICAL) if (wardType == WARD_TYPE_MAGICAL)
ward->DamageType = damageTypes; ward->DamageType = damageTypes;
else
ward->DamageType = 0; // doesn't get used, but default set it anyway
ward->DeleteWard = false; ward->DeleteWard = false;
// Add the ward to the entity // Add the ward to the entity