pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 03:31:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add Buff infrastructure to go through different logic paths from different patches (#5073)
Build / Linux (push) Waiting to run
Details
Build / Windows (push) Waiting to run
Details

Browse Source
This commit is contained in:
dannuic
2026-05-02 22:53:26 -06:00
committed by GitHub
parent c253734c57
commit 18df055f16
201 changed files with 2856 additions and 3105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+12 -13
View File
@@ -3344,7 +3344,7 @@ void Client::GMKill() {
safe_delete(outapp);
}
void Client::MemorizeSpell(uint32 slot, uint32 spell_id, uint32 scribing, uint32 reduction){
void Client::MemorizeSpell(uint32 slot, int32 spell_id, uint32 scribing, uint32 reduction){
if (
!EQ::ValueWithin(
slot,
@@ -3811,10 +3811,10 @@ void Client::MessageString(uint32 type, uint32 string_id, uint32 distance)
return;
if (distance > 0)
Message::CloseMessageString(this, false, static_cast<float>(distance))(
ClientPatch::BroadcastMessageStringInRadius(this, false, static_cast<float>(distance))(
type, string_id);
else
Message::MessageString(this, type, string_id);
ClientPatch::SendMessageString(this, type, string_id);
}
//
@@ -3843,10 +3843,10 @@ void Client::MessageString(uint32 type, uint32 string_id, const char* message1,
type = 4;
if (distance > 0)
Message::CloseMessageString(this, false, static_cast<float>(distance))(type, string_id, message1,
ClientPatch::BroadcastMessageStringInRadius(this, false, static_cast<float>(distance))(type, string_id, message1,
message2, message3, message4, message5, message6, message7, message8, message9);
else
Message::MessageString(this, type, string_id, message1, message2, message3, message4, message5,
ClientPatch::SendMessageString(this, type, string_id, message1, message2, message3, message4, message5,
message6, message7, message8, message9);
}
@@ -4393,7 +4393,7 @@ void Client::Sacrifice(Mob *caster)
}
}
void Client::SendOPTranslocateConfirm(Mob *Caster, uint16 SpellID) {
void Client::SendOPTranslocateConfirm(Mob *Caster, int32 SpellID) {
if(!Caster || PendingTranslocate)
return;
@@ -6326,8 +6326,7 @@ void Client::SuspendMinion(int value)
if(value >= 1)
{
CurrentPet->SetPetState(m_suspendedminion.Buffs, m_suspendedminion.Items);
CurrentPet->SendPetBuffsToClient();
ClientPatch::SendFullBuffRefresh(CurrentPet);
}
CurrentPet->CalcBonuses();
@@ -6362,7 +6361,7 @@ void Client::SuspendMinion(int value)
}
else
{
uint16 SpellID = CurrentPet->GetPetSpellID();
int32 SpellID = CurrentPet->GetPetSpellID();
if(SpellID)
{
@@ -7103,7 +7102,7 @@ void Client::ConsentCorpses(std::string consent_name, bool deny)
}
}
void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration)
void Client::Doppelganger(int32 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration)
{
if(!target || !IsValidSpell(spell_id) || GetID() == target->GetID())
return;
@@ -8931,7 +8930,7 @@ int Client::GetQuiverHaste(int delay)
return (pi->GetItem()->BagWR * 0.0025f * delay) + 1;
}
void Client::SendColoredText(uint32 color, std::string message)
void Client::SendColoredText(uint32 color, const std::string& message)
{
// arbitrary size limit
if (message.size() > 512) // live does send this with empty strings sometimes ...
@@ -10714,7 +10713,7 @@ void Client::Fling(float value, float target_x, float target_y, float target_z,
std::vector<int> Client::GetLearnableDisciplines(uint8 min_level, uint8 max_level) {
std::vector<int> learnable_disciplines;
for (uint16 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
for (int32 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
bool learnable = true;
if (!IsValidSpell(spell_id)) {
continue;
@@ -10785,7 +10784,7 @@ std::vector<int> Client::GetScribeableSpells(uint8 min_level, uint8 max_level) {
std::vector<int> scribeable_spells;
std::unordered_map<uint32, std::vector<uint16>> spell_group_cache = LoadSpellGroupCache(min_level, max_level);
for (uint16 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
for (int32 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
bool scribeable = true;
if (!IsValidSpell(spell_id)) {
continue;