pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-06 13:33:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix entity ID on death with #castspell (#3592)

Browse Source 
# Notes
- Entities killed by a spell with #cast were not reporting their pre-death entity ID properly.
- Added an `entity_id_override` to `GetTargetDescription()` and added a pre-defined entity ID variable to the cast command so we can message the proper pre-death entity ID.
This commit is contained in:
Alex King 2023-09-17 14:40:31 -04:00 committed by GitHub
parent 9b992167f0
commit d7e810232a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
zone/gm_commands/castspell.cpp
View File

@ -7,58 +7,52 @@ void command_castspell(Client *c, const Seperator *sep)
return;
}
Mob *target = c;
if (c->GetTarget()) {
target = c->GetTarget();
}
if (!sep->IsNumber(1)) {
const auto arguments = sep->argnum;
if (!arguments || !sep->IsNumber(1)) {
c->Message(
Chat::White,
"Usage: #castspell [Spell ID] [Instant (0 = False, 1 = True, Default is 1 if Unused)]"
);
return;
}
else {
uint16 spell_id = Strings::ToUnsignedInt(sep->arg[1]);
if (IsCastRestrictedSpell(spell_id) && c->Admin() < commandCastSpecials) {
c->Message(Chat::Red, "Unable to cast spell.");
}
else if (spell_id >= SPDAT_RECORDS) {
c->Message(Chat::White, "Invalid Spell ID.");
}
else {
bool instant_cast = (c->Admin() >= commandInstacast ? true : false);
if (instant_cast && sep->IsNumber(2)) {
instant_cast = Strings::ToInt(sep->arg[2]) ? true : false;
c->Message(Chat::White, fmt::format("{}", Strings::ToInt(sep->arg[2])).c_str());
}
if (c->Admin() >= commandInstacast && instant_cast) {
c->SpellFinished(
spell_id,
target,
EQ::spells::CastingSlot::Item,
0,
-1,
spells[spell_id].resist_difficulty
);
}
else {
c->CastSpell(spell_id, target->GetID(), EQ::spells::CastingSlot::Item, spells[spell_id].cast_time);
}
c->Message(
Chat::White,
fmt::format(
"Cast {} ({}) on {}{}.",
GetSpellName(spell_id),
spell_id,
c->GetTargetDescription(target),
instant_cast ? " instantly" : ""
).c_str()
);
}
Mob* t = c;
if (c->GetTarget()) {
t = c->GetTarget();
}
const uint16 spell_id = Strings::ToUnsignedInt(sep->arg[1]);
if (IsCastRestrictedSpell(spell_id) && c->Admin() < commandCastSpecials) {
c->Message(Chat::White, "Unable to cast spell.");
return;
} else if (spell_id >= SPDAT_RECORDS) {
c->Message(Chat::White, "Invalid Spell ID.");
return;
}
const bool can_instant_cast = c->Admin() >= commandInstacast;
bool instant_cast = false;
if (can_instant_cast && sep->IsNumber(2)) {
instant_cast = Strings::ToBool(sep->arg[2]);
}
const uint16 target_id = t->GetID();
if (instant_cast) {
c->SpellFinished(spell_id, t);
} else {
c->CastSpell(spell_id, t->GetID(), EQ::spells::CastingSlot::Item, spells[spell_id].cast_time);
}
c->Message(
Chat::White,
fmt::format(
"Cast {} ({}) on {}{}.",
GetSpellName(spell_id),
spell_id,
c->GetTargetDescription(t, TargetDescriptionType::LCSelf, target_id),
instant_cast ? " instantly" : ""
).c_str()
);
}

4
zone/mob.cpp
View File

@ -5068,7 +5068,7 @@ const char *Mob::GetCleanName()
return clean_name;
}
std::string Mob::GetTargetDescription(Mob* target, uint8 description_type)
std::string Mob::GetTargetDescription(Mob* target, uint8 description_type, uint16 entity_id_override)
{
std::string self_return = "yourself";
@ -5119,7 +5119,7 @@ std::string Mob::GetTargetDescription(Mob* target, uint8 description_type)
fmt::format(
"{} ({})",
target->GetCleanName(),
target->GetID()
entity_id_override ? entity_id_override : target->GetID()
)
)
);

2
zone/mob.h
View File

@ -586,7 +586,7 @@ public:
virtual void SetName(const char *new_name = nullptr) { new_name ? strn0cpy(name, new_name, 64) :
strn0cpy(name, GetName(), 64); return; };
inline Mob* GetTarget() const { return target; }
std::string GetTargetDescription(Mob* target, uint8 description_type = TargetDescriptionType::LCSelf);
std::string GetTargetDescription(Mob* target, uint8 description_type = TargetDescriptionType::LCSelf, uint16 entity_id_override = 0);
virtual void SetTarget(Mob* mob);
inline bool HasTargetReflection() const { return (target && target != this && target->target == this); }
virtual inline float GetHPRatio() const { return max_hp == 0 ? 0 : ((float) current_hp / max_hp * 100); }