Skip to content

Add onPlayerWeaponGiven/onPlayerWeaponTaken events #4470

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Add onPlayerWeaponGiven/onPlayerWeaponTaken events #4470

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
141d776
Add onPlayerWeaponGiven/onPlayerWeaponTaken events
omar-o22 Sep 15, 2025
8fb4efc
Fixes
omar-o22 Sep 16, 2025
95f9b20
Fixes
omar-o22 Sep 17, 2025
4fcc093
Merge branch 'master' into feature/add-onPlayerWeaponGiven/onPlayerWe…
tederis Sep 22, 2025
c8777e1
fixes
omar-o22 Sep 22, 2025
00ff440
Merge branch 'feature/add-onPlayerWeaponGiven/onPlayerWeaponTaken' of…
omar-o22 Sep 22, 2025
3ef6b0b
Fixes
omar-o22 Sep 23, 2025
d5c0e0a
Fixes
omar-o22 Sep 23, 2025
3b1a082
fixes
omar-o22 Sep 24, 2025
c4d2bad
Merge branch 'master' into feature/add-onPlayerWeaponGiven/onPlayerWe…
omar-o22 Sep 24, 2025
b026283
fixes
omar-o22 Sep 24, 2025
f92b1a9
Merge branch 'master' into feature/add-onPlayerWeaponGiven/onPlayerWe…
tederis Sep 25, 2025
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
4 changes: 4 additions & 0 deletions Server/mods/deathmatch/logic/CGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,6 +1655,8 @@ void CGame::AddBuiltInEvents()
m_Events.AddEvent("onPlayerChangesProtectedData", "element, key, value", nullptr, false);
m_Events.AddEvent("onPlayerChangesWorldSpecialProperty", "property, enabled", nullptr, false);
m_Events.AddEvent("onPlayerTeleport", "previousX, previousY, previousZ, currentX, currentY, currentZ", nullptr, false);
m_Events.AddEvent("onPlayerWeaponGiven", "weaponID, weaponAmmo, weaponSlot", nullptr, false);
m_Events.AddEvent("onPlayerWeaponTaken", "weaponID, weaponAmmo, weaponSlot", nullptr, false);

// Ped events
m_Events.AddEvent("onPedVehicleEnter", "vehicle, seat, jacked", NULL, false);
Expand All @@ -1663,6 +1665,8 @@ void CGame::AddBuiltInEvents()
m_Events.AddEvent("onPedWeaponSwitch", "previous, current", NULL, false);
m_Events.AddEvent("onPedWeaponReload", "weapon, clip, ammo", nullptr, false);
m_Events.AddEvent("onPedDamage", "loss", NULL, false);
m_Events.AddEvent("onPedWeaponGiven", "weaponID, weaponAmmo, weaponSlot", nullptr, false);
m_Events.AddEvent("onPedWeaponTaken", "weaponID, weaponAmmo, weaponSlot", nullptr, false);

// Element events
m_Events.AddEvent("onElementColShapeHit", "colshape, matchingDimension", NULL, false);
Expand Down
50 changes: 43 additions & 7 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4805,6 +4805,15 @@ bool CStaticFunctionDefinitions::GiveWeapon(CElement* pElement, unsigned char uc
if (pPed->IsSpawned())
{
unsigned char ucCurrentWeapon = pPed->GetWeaponType();
unsigned char ucWeaponSlot = CWeaponNames::GetSlotFromWeapon(ucWeaponID);

CLuaArguments arguments;
arguments.PushNumber(ucWeaponID);
arguments.PushNumber(usAmmo);
arguments.PushNumber(ucWeaponSlot);
if (!pPed->CallEvent(IS_PLAYER(pElement) ? "onPlayerWeaponGiven" : "onPedWeaponGiven", arguments))
return false;

if (ucCurrentWeapon != ucWeaponID && bSetAsCurrent)
{
// Call our weapon switch command
Expand All @@ -4821,8 +4830,8 @@ bool CStaticFunctionDefinitions::GiveWeapon(CElement* pElement, unsigned char uc
bSetAsCurrent = false;
}

unsigned char ucWeaponSlot = CWeaponNames::GetSlotFromWeapon(ucWeaponID);
unsigned char ucPreviousWeaponID = pPed->GetWeaponType(ucWeaponSlot);

pPed->SetWeaponType(ucWeaponID, ucWeaponSlot);
if (bSetAsCurrent)
pPed->SetWeaponSlot(ucWeaponSlot);
Expand Down Expand Up @@ -4876,8 +4885,14 @@ bool CStaticFunctionDefinitions::TakeWeapon(CElement* pElement, unsigned char uc
// Just because it's the same slot doesn't mean it's the same weapon -_- - Caz
if (pPed->IsSpawned() && pPed->GetWeapon(ucWeaponSlot) && pPed->GetWeaponType(ucWeaponSlot) == ucWeaponID)
{
CLuaArguments arguments;
arguments.PushNumber(ucWeaponID);
arguments.PushNumber(usAmmo);
arguments.PushNumber(ucWeaponSlot);
if (!pPed->CallEvent(IS_PLAYER(pElement) ? "onPlayerWeaponTaken" : "onPedWeaponTaken", arguments))
return false;

CBitStream BitStream;

SWeaponTypeSync weaponType;
weaponType.data.ucWeaponType = ucWeaponID;
BitStream.pBitStream->Write(&weaponType);
Expand Down Expand Up @@ -4928,14 +4943,35 @@ bool CStaticFunctionDefinitions::TakeAllWeapons(CElement* pElement)
CPed* pPed = static_cast<CPed*>(pElement);
if (pPed->IsSpawned())
{
CBitStream BitStream;
m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, TAKE_ALL_WEAPONS, *BitStream.pBitStream));

for (unsigned char ucWeaponSlot = 0; ucWeaponSlot < WEAPON_SLOTS; ++ucWeaponSlot)
{
pPed->SetWeaponType(0, ucWeaponSlot);
pPed->SetWeaponAmmoInClip(0, ucWeaponSlot);
pPed->SetWeaponTotalAmmo(0, ucWeaponSlot);
unsigned char ucWeaponID = pPed->GetWeaponType(ucWeaponSlot);
unsigned char ucAmmo = pPed->GetWeaponTotalAmmo(ucWeaponSlot);
if (ucWeaponID > 0)
{
CLuaArguments arguments;
arguments.PushNumber(ucWeaponID);
arguments.PushNumber(ucAmmo);
arguments.PushNumber(ucWeaponSlot);

bool shouldTake = true;
if (!pPed->CallEvent(IS_PLAYER(pElement) ? "onPlayerWeaponTaken" : "onPedWeaponTaken", arguments))
shouldTake = false;

if (shouldTake)
{
CBitStream BitStream;
SWeaponTypeSync weaponType;
weaponType.data.ucWeaponType = ucWeaponID;
BitStream.pBitStream->Write(&weaponType);
m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, TAKE_WEAPON, *BitStream.pBitStream));

pPed->SetWeaponType(0, ucWeaponSlot);
pPed->SetWeaponAmmoInClip(0, ucWeaponSlot);
pPed->SetWeaponTotalAmmo(0, ucWeaponSlot);
}
}
}

return true;
Expand Down
Loading