pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Rules] Add ClientPetsUserOwnerNameInLastName rule (#3442)

Browse Source 
* [Rules] Add ClientPetsUserOwnerNameInLastName rule

# Notes
- This rule defaults to `true` and maintains `Kinglykrab's Pet` as my pet's name, disabling allows you to manually modify the last name or have pets with no last name.

* Update npc.cpp
This commit is contained in:
Alex King 2023-06-24 20:01:40 -04:00 committed by GitHub
parent 327dacdbe1
commit d558f9ece2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ruletypes.h
View File

@ -256,6 +256,7 @@ RULE_BOOL(Pets, UnTargetableSwarmPet, false, "Setting whether swarm pets should
RULE_REAL(Pets, PetPowerLevelCap, 10, "Maximum number of levels a player pet can go up with pet power") RULE_REAL(Pets, PetPowerLevelCap, 10, "Maximum number of levels a player pet can go up with pet power")
RULE_BOOL(Pets, CanTakeNoDrop, false, "Setting whether anyone can give no-drop items to pets") RULE_BOOL(Pets, CanTakeNoDrop, false, "Setting whether anyone can give no-drop items to pets")
RULE_BOOL(Pets, LivelikeBreakCharmOnInvis, true, "Default: true will break charm on any type of invis (hide/ivu/iva/etc) false will only break if the pet can not see you (ex. you have an undead pet and cast IVU") RULE_BOOL(Pets, LivelikeBreakCharmOnInvis, true, "Default: true will break charm on any type of invis (hide/ivu/iva/etc) false will only break if the pet can not see you (ex. you have an undead pet and cast IVU")
RULE_BOOL(Pets, ClientPetsUseOwnerNameInLastName, true, "Disable this to keep client pet's last names from being owner_name's pet")
RULE_CATEGORY_END() RULE_CATEGORY_END()
RULE_CATEGORY(GM) RULE_CATEGORY(GM)

85
zone/npc.cpp
View File

@ -2359,74 +2359,67 @@ void NPC::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
void NPC::PetOnSpawn(NewSpawn_Struct* ns) void NPC::PetOnSpawn(NewSpawn_Struct* ns)
{ {
//Basic settings to make sure swarm pets work properly. //Basic settings to make sure swarm pets work properly.
Mob *swarmOwner = nullptr; Mob *swarm_owner = nullptr;
if (GetSwarmOwner()) if (GetSwarmOwner()) {
{ swarm_owner = entity_list.GetMobID(GetSwarmOwner());
swarmOwner = entity_list.GetMobID(GetSwarmOwner());
} }
if (swarmOwner != nullptr) if (swarm_owner) {
{ if (swarm_owner->IsClient()) {
if(swarmOwner->IsClient())
{
SetPetOwnerClient(true); //Simple flag to determine if pet belongs to a client SetPetOwnerClient(true); //Simple flag to determine if pet belongs to a client
SetAllowBeneficial(true);//Allow temp pets to receive buffs and heals if owner is client. SetAllowBeneficial(true);//Allow temp pets to receive buffs and heals if owner is client.
//This will allow CLIENT swarm pets NOT to be targeted with F8. //This will allow CLIENT swarm pets NOT to be targeted with F8.
ns->spawn.targetable_with_hotkey = 0; ns->spawn.targetable_with_hotkey = false;
no_target_hotkey = 1; no_target_hotkey = true;
} } else {
else
{
//NPC cast swarm pets should still be targetable with F8. //NPC cast swarm pets should still be targetable with F8.
ns->spawn.targetable_with_hotkey = 1; ns->spawn.targetable_with_hotkey = true;
no_target_hotkey = 0; no_target_hotkey = false;
} }
SetTempPet(true); //Simple mob flag for checking if temp pet SetTempPet(true); //Simple mob flag for checking if temp pet
swarmOwner->SetTempPetsActive(true); //Necessary fail safe flag set if mob ever had a swarm pet to ensure they are removed. swarm_owner->SetTempPetsActive(true); //Necessary fail safe flag set if mob ever had a swarm pet to ensure they are removed.
swarmOwner->SetTempPetCount(swarmOwner->GetTempPetCount() + 1); swarm_owner->SetTempPetCount(swarm_owner->GetTempPetCount() + 1);
//Not recommended if using above (However, this will work better on older clients). //Not recommended if using above (However, this will work better on older clients).
if (RuleB(Pets, UnTargetableSwarmPet)) if (RuleB(Pets, UnTargetableSwarmPet)) {
{ ns->spawn.bodytype = BT_NoTarget;
ns->spawn.bodytype = 11; }
if(!IsCharmed() && swarmOwner->IsClient()) {
std::string tmp_lastname = swarmOwner->GetName(); if (
tmp_lastname += "'s Pet"; !IsCharmed() &&
if (tmp_lastname.size() < sizeof(ns->spawn.lastName)) swarm_owner->IsClient() &&
strn0cpy(ns->spawn.lastName, tmp_lastname.c_str(), sizeof(ns->spawn.lastName)); RuleB(Pets, ClientPetsUseOwnerNameInLastName)
) {
const auto& tmp_lastname = fmt::format("{}'s Pet", swarm_owner->GetName());
if (tmp_lastname.size() < sizeof(ns->spawn.lastName)) {
strn0cpy(ns->spawn.lastName, tmp_lastname.c_str(), sizeof(ns->spawn.lastName));
} }
} }
if (swarmOwner->IsNPC()) { if (swarm_owner->IsNPC()) {
SetPetOwnerNPC(true); SetPetOwnerNPC(true);
} }
} } else if (GetOwnerID()) {
else if(GetOwnerID())
{
ns->spawn.is_pet = 1; ns->spawn.is_pet = 1;
if (!IsCharmed())
{ if (!IsCharmed()) {
Client *client = entity_list.GetClientByID(GetOwnerID()); const auto c = entity_list.GetClientByID(GetOwnerID());
if(client) if (c) {
{
SetPetOwnerClient(true); SetPetOwnerClient(true);
std::string tmp_lastname = client->GetName(); if (RuleB(Pets, ClientPetsUseOwnerNameInLastName)) {
tmp_lastname += "'s Pet"; const auto& tmp_lastname = fmt::format("{}'s Pet", c->GetName());
if (tmp_lastname.size() < sizeof(ns->spawn.lastName)) if (tmp_lastname.size() < sizeof(ns->spawn.lastName)) {
strn0cpy(ns->spawn.lastName, tmp_lastname.c_str(), sizeof(ns->spawn.lastName)); strn0cpy(ns->spawn.lastName, tmp_lastname.c_str(), sizeof(ns->spawn.lastName));
} }
else }
{ } else {
if (entity_list.GetNPCByID(GetOwnerID())) if (entity_list.GetNPCByID(GetOwnerID())) {
{
SetPetOwnerNPC(true); SetPetOwnerNPC(true);
} }
} }
} }
} } else {
else
{
ns->spawn.is_pet = 0; ns->spawn.is_pet = 0;
} }
} }