hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Events + handle paintball stuff on death

Browse Source
This commit is contained in:
Vortrex
2022-07-23 04:17:48 -05:00
parent 2eb58fa8cf
commit d30a3bcb29
1 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
scripts/server/event.js
View File

@@ -33,8 +33,8 @@ function addAllEventHandlers() {
addEventHandler("onElementStreamOut", onElementStreamOut); addEventHandler("onElementStreamOut", onElementStreamOut);
addEventHandler("onPedSpawn", onPedSpawn); addEventHandler("onPedSpawn", onPedSpawn);
addEventHandler("onPedEnteringVehicleEx", onPedEnteringVehicle); addEventHandler("onPedEnterVehicle", onPedEnteringVehicle);
addEventHandler("onPedExitingVehicleEx", onPedExitingVehicle); addEventHandler("onPedExitVehicle", onPedExitingVehicle);
addEventHandler("onPedEnteredVehicleEx", onPedEnteredVehicle); addEventHandler("onPedEnteredVehicleEx", onPedEnteredVehicle);
addEventHandler("onPedExitedVehicleEx", onPedExitedVehicle); addEventHandler("onPedExitedVehicleEx", onPedExitedVehicle);
@@ -123,9 +123,9 @@ function onPlayerQuit(event, client, quitReasonId) {
}); });
//messagePlayerNormal(null, `👋 ${getPlayerName(client)} has left the server (${reasonText})`, getColourByName("softYellow")); //messagePlayerNormal(null, `👋 ${getPlayerName(client)} has left the server (${reasonText})`, getColourByName("softYellow"));
if (isPlayerFishing(client)) { //if (isPlayerFishing(client)) {
stopFishing(client); // stopFishing(client);
} //}
if (isPlayerInPaintBall(client)) { if (isPlayerInPaintBall(client)) {
stopPaintBall(client); stopPaintBall(client);
@@ -412,7 +412,19 @@ function onPlayerExitedVehicle(client, vehicle) {
// =========================================================================== // ===========================================================================
function onPlayerDeath(client, position) { function onPedWasted(event, ped, killerPed, weapon, pedPiece) {
if (ped.isType(ELEMENT_PLAYER)) {
let killerClient = null;
if (killerPed != null && killerPed.type == ELEMENT_PLAYER) {
killerClient = getClientFromPlayerElement(killerPed);
}
onPlayerWasted(getClientFromPlayerElement(ped), killerClient, weapon, pedPiece);
}
}
// ===========================================================================
function onPlayerDeath(client, killer, weapon, pedPiece) {
logToConsole(LOG_INFO, `${getPlayerDisplayForConsole(client)} died.`); logToConsole(LOG_INFO, `${getPlayerDisplayForConsole(client)} died.`);
getPlayerData(client).pedState = AGRP_PEDSTATE_DEAD; getPlayerData(client).pedState = AGRP_PEDSTATE_DEAD;
updatePlayerSpawnedState(client, false); updatePlayerSpawnedState(client, false);
@@ -423,7 +435,25 @@ function onPlayerDeath(client, position) {
} }
setTimeout(function () { setTimeout(function () {
if (isPlayerInPaintBall(client)) { if (isPlayerInPaintBall(client)) {
respawnPlayerForPaintBall(client); getPlayerData(killer).paintBallKills++;
getPlayerData(client).paintBallDeaths++;
if (getPlayerData(killer).paintBallDeaths >= getGlobalConfig().paintBallMaxKills) {
let paintBallPlayers = getAllPlayersInBusiness(getPlayerData(client).paintBallBusiness);
let winner = paintBallPlayers[i];
for (let i in paintBallPlayers) {
if (getPlayerData(paintBallPlayers[i]).paintBallKills > getPlayerData(winner).paintBallKills) {
winner = paintBallPlayers[i];
}
}
for (let i in paintBallPlayers) {
showSmallGameMessage(paintBallPlayers[i], `${getLocaleString(paintBallPlayers[i], "PaintBallEnded")} ${getLocaleString(paintBallPlayers[i], "Winners", `${getCharacterFullName(winner)}`)}`);
stopPaintBall(paintBallPlayers[i]);
}
} else {
respawnPlayerForPaintBall(client);
}
} else { } else {
if (getPlayerCurrentSubAccount(client).inJail) { if (getPlayerCurrentSubAccount(client).inJail) {
let closestJail = getClosestPoliceStation(getPlayerPosition(client)); let closestJail = getClosestPoliceStation(getPlayerPosition(client));
@@ -477,6 +507,7 @@ function onPlayerDeath(client, position) {
}, 2000); }, 2000);
}, 1000); }, 1000);
/*
let queryData = [ let queryData = [
["log_death_server", getServerId()] ["log_death_server", getServerId()]
["log_death_who_died", getPlayerCurrentSubAccount(client).databaseId], ["log_death_who_died", getPlayerCurrentSubAccount(client).databaseId],
@@ -487,6 +518,7 @@ function onPlayerDeath(client, position) {
]; ];
let queryString = createDatabaseInsertQuery("log_death", queryData); let queryString = createDatabaseInsertQuery("log_death", queryData);
addToQueryQueue(queryString); addToQueryQueue(queryString);
*/
} }
// =========================================================================== // ===========================================================================
@@ -655,9 +687,6 @@ async function onPlayerSpawn(client) {
logToConsole(LOG_DEBUG, `[VRR.Event] Syncing ${getPlayerDisplayForConsole(client)}'s cash ${getPlayerCurrentSubAccount(client).cash}`); logToConsole(LOG_DEBUG, `[VRR.Event] Syncing ${getPlayerDisplayForConsole(client)}'s cash ${getPlayerCurrentSubAccount(client).cash}`);
updatePlayerCash(client); updatePlayerCash(client);
logToConsole(LOG_DEBUG, `[VRR.Event] Updating all player name tags`);
updateAllPlayerNameTags();
logToConsole(LOG_DEBUG, `[VRR.Event] Sending player nametag distance to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Event] Sending player nametag distance to ${getPlayerDisplayForConsole(client)}`);
sendNameTagDistanceToClient(client, getServerConfig().nameTagDistance); sendNameTagDistanceToClient(client, getServerConfig().nameTagDistance);
@@ -694,7 +723,13 @@ async function onPlayerSpawn(client) {
} }
} }
resetPlayerBlip(client) setPlayerWeaponDamageEvent(client, AGRP_WEAPON_DAMAGE_EVENT_NORMAL);
logToConsole(LOG_DEBUG, `[VRR.Event] Updating all player name tags`);
updateAllPlayerNameTags();
resetPlayerBlip(client);
messageDiscordEventChannel(`🧍 ${getPlayerName(client)} spawned as ${getCharacterFullName(client)}`); messageDiscordEventChannel(`🧍 ${getPlayerName(client)} spawned as ${getCharacterFullName(client)}`);
} }