Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Script #8

Merged
merged 12 commits into from
Mar 20, 2024
Merged

Update Script #8

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
134074d
Update README.md
talamortis Jul 2, 2018
baa96ae
.h has a error.
Aug 9, 2018
24d4982
Merge branch 'master' into master
talamortis Aug 9, 2018
7dcc136
Merge pull request #2 from cshaaa/master
talamortis Aug 9, 2018
2eb07a1
Fixed for new build.
talamortis Jan 13, 2019
5696ada
Merge remote-tracking branch 'azerothcore/master'
talamortis Mar 11, 2024
0cf474d
Fix Compile
talamortis Mar 11, 2024
ba81408
Script update
talamortis Mar 11, 2024
1de1420
Fix Build
talamortis Mar 11, 2024
e1b19dc
Update script
talamortis Mar 12, 2024
d1ea874
Update PS_loader.cpp
Talamorts1 Mar 14, 2024
6d92186
Update PS_loader.cpp
Talamorts1 Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 66 additions & 92 deletions src/PvPScript.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@ class PvPScript : public PlayerScript
public:
PvPScript() : PlayerScript("PvPScript") {}

void OnPlayerKilledByCreature(Creature* killer, Player* killed)
void OnPlayerKilledByCreature(Creature* killer, Player* killed/*, bool& durabilityLoss*/)
{
if (!sConfigMgr->GetOption<bool>("PvPChest", true))
return;

if (!killer->IsPet())
return;

return;

std::string name = killer->GetOwner()->GetName();

Expand All @@ -35,64 +34,18 @@ class PvPScript : public PlayerScript
if (Pet* pet = killer->ToPet())
if (Player* owner = pet->GetOwner())
{
if (owner->GetSession()->GetRemoteAddress() == killed->GetSession()->GetRemoteAddress())
return;

// Dont drop loot if killed is not worth honor for owner
if (!owner->isHonorOrXPTarget(killed))
if (!CheckConditions(owner, killed))
return;
}

// if player has Ress sickness do not spawn chest
if (killed->HasAura(15007))
return;

//Gurubashi Arena
if (killed->GetMapId() == 0 && killed->GetZoneId() == 33)
for (int i = 0; i < int(AreatoIgnore.size()); ++i)
if (killed->GetAreaId() == AreatoIgnore[i])
return;


// Dont drop chess if player is in battleground
if (killed->GetMap()->IsBattlegroundOrArena())
return;

//Dont Drop chest if player is no worth XP
if (!killed->isHonorOrXPTarget(killer->GetOwner()))
if (!CheckConditions(nullptr, killed))
return;

// if target is killed and killer is pet
if (!killed->IsAlive() && killer->IsPet())
{
if (GameObject* go = killer->SummonGameObject(SummonChest, killed->GetPositionX(), killed->GetPositionY(), killed->GetPositionZ(), killed->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, chestDespawn, false))
{
switch (KillAnnounce)
{
case 1: //Announce in chat handler
ChatHandler(killed->GetSession()).PSendSysMessage("You have been killed by player [%s] ", name.c_str());
break;
case 2: //Announce in notifaction
killed->GetSession()->SendNotification("You have been slain by [%s]", name.c_str());
break;
case 3: // Announe in Notifaction and chathandler
killed->GetSession()->SendNotification("You have been slain by [%s]", name.c_str());
ChatHandler(killed->GetSession()).PSendSysMessage("You have been killed by player [%s] ", name.c_str());
break;
}

killer->AddGameObject(go);
go->SetOwnerGUID(ObjectGuid::Empty); //This is so killed players can also loot the chest

for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
if (Item* pItem = killed->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
{
uint8 slot = pItem->GetSlot();
LootStoreItem storeItem = LootStoreItem(pItem->GetEntry(), 0, 100, 0, LOOT_MODE_DEFAULT, 0, 1, 1);
go->loot.AddItem(storeItem);
killed->DestroyItem(INVENTORY_SLOT_BAG_0, slot, true);
}
}
AnnounceKill(KillAnnounce, killed, name.c_str());
SpawnChest(killer, killed);
}
}

Expand All @@ -103,64 +56,85 @@ class PvPScript : public PlayerScript

std::string name = killer->GetName();

if (!CheckConditions(killer, killed))
return;

if (!killed->IsAlive())
{
SpawnChest(killer, killed);
AnnounceKill(KillAnnounce, killed, name.c_str());
}
}

void SpawnChest(Unit* killer, Player* killed)
{
if (GameObject* go = killer->SummonGameObject(SummonChest, killed->GetPositionX(), killed->GetPositionY(), killed->GetPositionZ(), killed->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, chestDespawn, false))
{
killer->AddGameObject(go);
go->SetOwnerGUID(ObjectGuid::Empty); //This is so killed players can also loot the chest
AddChestItems(killed, go);
}
}

bool CheckConditions(Player* killer, Player* killed)
{
//if killer has same IP as death player do not drop loot as its cheating!
if (spawnchestIP)
if (killer->GetSession()->GetRemoteAddress() == killed->GetSession()->GetRemoteAddress())
return;
return false;

// if player has Ress sickness do not spawn chest
if (killed->HasAura(15007))
return;
return false;

// If player kills self do not drop loot
if (killer->GetGUID() == killed->GetGUID())
return;

//Gurubashi Arena
if (killed->GetMapId() == 0 && killed->GetZoneId() == 33)
for (int i = 0; i < int(AreatoIgnore.size()); ++i)
if (killed->GetAreaId() == AreatoIgnore[i])
return;
return false;

// if killer not worth honnor do not drop loot
if (!killer->isHonorOrXPTarget(killed))
return;
return false;

// Dont drop chess if player is in battleground
if (killed->GetMap()->IsBattlegroundOrArena())
return;
return false;

if (!killed->IsAlive())
//Gurubashi Arena
if (killed->GetMapId() == 0 && killed->GetZoneId() == 33)
for (int i = 0; i < int(AreatoIgnore.size()); ++i)
if (killed->GetAreaId() == AreatoIgnore[i])
return false;

return true;
}

void AnnounceKill(uint32 phase, Player* killed, std::string name)
{
switch (phase)
{
if (GameObject* go = killer->SummonGameObject(SummonChest, killed->GetPositionX(), killed->GetPositionY(), killed->GetPositionZ(), killed->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, chestDespawn, false))
{
switch (KillAnnounce)
{
case 1: //Announce in chat handler
ChatHandler(killed->GetSession()).PSendSysMessage("You have been killed by player [%s] ", name.c_str());
break;
case 2: //Announce in notifaction
killed->GetSession()->SendNotification("You have been slain by [%s]", name.c_str());
break;
case 3: // Announe in Notifaction and chathandler
killed->GetSession()->SendNotification("You have been slain by [%s]", name.c_str());
ChatHandler(killed->GetSession()).PSendSysMessage("You have been killed by player [%s] ", name.c_str());
break;
}
case 1: //Announce in chat handler
ChatHandler(killed->GetSession()).PSendSysMessage("You have been killed by player [%s] ", name.c_str());
break;
case 2: //Announce in notifaction
killed->GetSession()->SendNotification("You have been slain by [%s]", name.c_str());
break;
case 3: // Announe in Notifaction and chathandler
killed->GetSession()->SendNotification("You have been slain by [%s]", name.c_str());
ChatHandler(killed->GetSession()).PSendSysMessage("You have been killed by player [%s] ", name.c_str());
break;
}
}

killer->AddGameObject(go);
go->SetOwnerGUID(ObjectGuid::Empty); //This is so killed players can also loot the chest

for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
if (Item* pItem = killed->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
{
uint8 slot = pItem->GetSlot();
LootStoreItem storeItem = LootStoreItem(pItem->GetEntry(), 0, 100, 0, LOOT_MODE_DEFAULT, 0, 1, 1);
go->loot.AddItem(storeItem);
killed->DestroyItem(INVENTORY_SLOT_BAG_0, slot, true);
}
void AddChestItems(Player* killed, GameObject* go)
{
for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
if (Item* pItem = killed->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
{
uint8 slot = pItem->GetSlot();
LootStoreItem storeItem = LootStoreItem(pItem->GetEntry(), 0, 100, 0, LOOT_MODE_DEFAULT, 0, 1, 1);
go->loot.AddItem(storeItem);
killed->DestroyItem(INVENTORY_SLOT_BAG_0, slot, true);
}
}
}
};

Expand Down
Loading