From 16bc2417c4888abd6a47ddea9df1a40fd5196e46 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:38:28 -0600
Subject: [PATCH 001/480] Add item script files
---
meta.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta.xml b/meta.xml
index 14889b51..bb9199e1 100644
--- a/meta.xml
+++ b/meta.xml
@@ -74,6 +74,9 @@
+
+
+
@@ -273,4 +276,4 @@
-
\ No newline at end of file
+
From 92c17bdaacf6f80bb1c0730e0f3a21c3d3d8d44f Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:38:39 -0600
Subject: [PATCH 002/480] Add to the TODO list
---
TODO.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/TODO.md b/TODO.md
index 7181c021..8c93826b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -24,3 +24,5 @@ For grand opening:
- Take second beer from crate
- Store second beer in trunk
------------------------------------------------------
+
+* Change mouse cursor/camera net events to force state instead of toggle on client end
\ No newline at end of file
From 46fa648f7500f756e5e4a4fd32a1ffe2fe9239d1 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:38:54 -0600
Subject: [PATCH 003/480] Dont sync player properties
---
scripts/client/main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/client/main.js b/scripts/client/main.js
index 3099ca1a..54101eca 100644
--- a/scripts/client/main.js
+++ b/scripts/client/main.js
@@ -214,7 +214,7 @@ addEventHandler("OnElementStreamIn", function(event, element) {
break;
case ELEMENT_PLAYER:
- syncPlayerProperties(element);
+ //syncPlayerProperties(element);
break;
case ELEMENT_OBJECT:
From 9acecff880dd0b4a27d153471b2172959ee79493 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:39:08 -0600
Subject: [PATCH 004/480] Fix auto last char always returning true
---
scripts/server/account.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/server/account.js b/scripts/server/account.js
index c40b0922..dddb9903 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -971,7 +971,7 @@ function doesPlayerHaveAutoSelectLastCharacterEnabled(client) {
return true;
}
- return true;
+ return false;
}
// ---------------------------------------------------------------------------
From 3c067b91656247631fc53331381e7343fb65c36c Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:39:41 -0600
Subject: [PATCH 005/480] Use clients instead of players in proximity chat
---
scripts/server/chat.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/server/chat.js b/scripts/server/chat.js
index 46d9b8e6..f76c28ce 100644
--- a/scripts/server/chat.js
+++ b/scripts/server/chat.js
@@ -102,7 +102,7 @@ function talkToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().talkDistance);
for(let i in clients) {
//if(clients[i] != client) {
- messagePlayerTalk(getClientFromPlayerElement(clients[i]), client, messageText);
+ messagePlayerTalk(clients[i], client, messageText);
//}
}
}
@@ -131,7 +131,7 @@ function whisperToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(client.player.position, getGlobalConfig().talkDistance);
for(let i in clients) {
//if(clients[i] != client) {
- messagePlayerWhisper(getClientFromPlayerElement(clients[i]), client, messageText);
+ messagePlayerWhisper(clients[i], client, messageText);
//}
}
}
@@ -142,7 +142,7 @@ function shoutToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(client.player.position, getGlobalConfig().shoutDistance);
for(let i in clients) {
//if(clients[i].index != client.index) {
- messagePlayerShout(getClientFromPlayerElement(clients[i]), client, messageText);
+ messagePlayerShout(clients[i], client, messageText);
//}
}
}
@@ -153,7 +153,7 @@ function doActionToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(client.player.position, getGlobalConfig().doActionDistance);
for(let i in clients) {
//if(clients[i].index != client.index) {
- messagePlayerDoAction(getClientFromPlayerElement(clients[i]), client, messageText);
+ messagePlayerDoAction(clients[i], client, messageText);
//}
}
}
@@ -164,7 +164,7 @@ function meActionToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(client.player.position, getGlobalConfig().meActionDistance);
for(let i in clients) {
//if(clients[i].index != client.index) {
- messagePlayerMeAction(getClientFromPlayerElement(clients[i]), client, messageText);
+ messagePlayerMeAction(clients[i], client, messageText);
//}
}
}
@@ -175,7 +175,7 @@ function clanChat(client, messageText) {
let clients = getClients();
for(let i in clients) {
if(getPlayerCurrentSubAccount(client).clan != getPlayerCurrentSubAccount(clients[i]).clan) {
- messageClientClanChat(getClientFromPlayerElement(clients[i]), client, messageText);
+ messageClientClanChat(clients[i], client, messageText);
}
}
}
From 8ce1f8dd933a7c93eaab0d1699ea146648a967c9 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:39:53 -0600
Subject: [PATCH 006/480] Fix wrong last login field name
---
scripts/server/class.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/server/class.js b/scripts/server/class.js
index 7bbae37f..2c60e277 100644
--- a/scripts/server/class.js
+++ b/scripts/server/class.js
@@ -302,7 +302,7 @@ function initClassTable() {
this.dateOfBirth = dbAssoc["sacct_when_born"];
this.spawnPosition = toVector3(dbAssoc["sacct_pos_x"], dbAssoc["sacct_pos_y"], dbAssoc["sacct_pos_z"]);
this.spawnHeading = toFloat(dbAssoc["sacct_angle"]);
- this.lastLogin = toInteger(dbAssoc["sacct_last_login"]);
+ this.lastLogin = toInteger(dbAssoc["sacct_when_lastlogin"]);
this.clan = toInteger(dbAssoc["sacct_clan"]);
this.clanFlags = toInteger(dbAssoc["sacct_clan_flags"]);
this.clanRank = toInteger(dbAssoc["sacct_clan_rank"]);
From 96c5c360b9b7cec7003224dfd5e2d5d94ae5e626 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:40:05 -0600
Subject: [PATCH 007/480] Add a ton of debug logging
---
scripts/server/client.js | 98 ++++++++++++++++++++++++++++++++++++----
1 file changed, 88 insertions(+), 10 deletions(-)
diff --git a/scripts/server/client.js b/scripts/server/client.js
index b7debb43..4ad4adf0 100644
--- a/scripts/server/client.js
+++ b/scripts/server/client.js
@@ -67,12 +67,14 @@ function addAllNetworkHandlers() {
// ---------------------------------------------------------------------------
function updatePlayerNameTag(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending ${getPlayerDisplayForConsole(client)}'s updated nametag to all players`);
triggerNetworkEvent("ag.nametag", null, client.name, getPlayerNameForNameTag(client), getPlayerColour(client), false, client.ping);
}
// ---------------------------------------------------------------------------
function updateAllPlayerNameTags() {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending updated nametags to all players`);
let clients = getClients();
for(let i in clients) {
updatePlayerNameTag(clients[i]);
@@ -82,6 +84,7 @@ function updateAllPlayerNameTags() {
// ---------------------------------------------------------------------------
function updatePlayerPing(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending ${getPlayerDisplayForConsole(client)}'s ping to all players`);
triggerNetworkEvent("ag.ping", null, client.name, client.ping);
}
@@ -115,55 +118,56 @@ function playerClientStarted(client) {
// ---------------------------------------------------------------------------
function showGameMessage(client, text, colour, duration) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing game message to ${getPlayerDisplayForConsole(client)} (${text}) for ${duration} milliseconds`);
triggerNetworkEvent("ag.smallGameMessage", client, text, colour, duration);
}
// ---------------------------------------------------------------------------
function enableCityAmbienceForPlayer(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Setting ${getPlayerDisplayForConsole(client)}'s city ambience to ${toUpperCase(getOnOffFromBool(false))}`);
triggerNetworkEvent("ag.ambience", client, true);
}
// ---------------------------------------------------------------------------
function disableCityAmbienceForPlayer(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Setting ${getPlayerDisplayForConsole(client)}'s city ambience to ${toUpperCase(getOnOffFromBool(false))}`);
triggerNetworkEvent("ag.ambience", client, false);
}
// ---------------------------------------------------------------------------
function clearPlayerOwnedPeds(client) {
- logToConsole(LOG_DEBUG, `[Asshat.Utilities] Clearing peds owned by ${getPlayerDisplayForConsole(client)}`);
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Clearing peds owned by ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.clearPeds", client);
}
// ---------------------------------------------------------------------------
-function updatePlayerJobType(client) {
- triggerNetworkEvent("ag.jobType", client, getJobIndexFromDatabaseId(getPlayerCurrentSubAccount(client).job));
-}
-
-// ---------------------------------------------------------------------------
-
function updatePlayerSpawnedState(client, state) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Setting ${getPlayerDisplayForConsole(client)}'s spawned state ${toUpperCase(getOnOffFromBool(state))}`);
triggerNetworkEvent("ag.spawned", client, state);
}
// ---------------------------------------------------------------------------
function setPlayerControlState(client, state) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Setting ${getPlayerDisplayForConsole(client)}'s control state ${toUpperCase(getOnOffFromBool(state))}`);
triggerNetworkEvent("ag.control", client, state);
}
// ---------------------------------------------------------------------------
function updatePlayerShowLogoState(client, state) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Setting ${getPlayerDisplayForConsole(client)}'s logo state ${toUpperCase(getOnOffFromBool(state))}`);
triggerNetworkEvent("ag.logo", client, state);
}
// ---------------------------------------------------------------------------
function restorePlayerCamera(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Restoring ${getPlayerDisplayForConsole(client)}'s camera`);
triggerNetworkEvent("ag.restoreCamera", client);
}
@@ -176,12 +180,14 @@ function setPlayer2DRendering(client, hudState = false, labelState = false, smal
// ---------------------------------------------------------------------------
function syncPlayerProperties(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending signal to sync ${getPlayerDisplayForConsole(client)}'s player ped properties`);
triggerNetworkEvent("ag.player.sync", null, client.player);
}
// ---------------------------------------------------------------------------
function updatePlayerSnowState(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Setting ${getPlayerDisplayForConsole(client)}'s snow state (Falling: ${toUpperCase(getOnOffFromBool(getServerConfig().fallingSnow))}, Ground: ${toUpperCase(getOnOffFromBool(getServerConfig().groundSnow))})`);
triggerNetworkEvent("ag.snow", client, getServerConfig().fallingSnow, getServerConfig().groundSnow);
}
@@ -201,7 +207,7 @@ function sendExcludedModelsForGroundSnowToPlayer(client) {
function sendRemovedWorldObjectsToPlayer(client) {
if(getGameConfig().removedWorldObjects[getServerGame()].length > 0) {
for(let i in getGameConfig().removedWorldObjects[getServerGame()]) {
- logToConsole(LOG_DEBUG, `[Asshat.Misc] Sending removed world object ${i} (${getGameConfig().removedWorldObjects[getServerGame()][i].model}) to ${client.name}`);
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending removed world object ${i} (${getGameConfig().removedWorldObjects[getServerGame()][i].model}) to ${client.name}`);
triggerNetworkEvent("ag.removeWorldObject", client, getGameConfig().removedWorldObjects[getServerGame()][i].model, getGameConfig().removedWorldObjects[getServerGame()][i].position, getGameConfig().removedWorldObjects[getServerGame()][i].range);
}
}
@@ -211,6 +217,7 @@ function sendRemovedWorldObjectsToPlayer(client) {
// ---------------------------------------------------------------------------
function updatePlayerHotBar(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending updated hotbar data to ${getPlayerDisplayForConsole(client)}`);
let tempHotBarItems = [];
for(let i in getPlayerData(client).hotBarItems) {
let itemImage = "";
@@ -231,192 +238,231 @@ function updatePlayerHotBar(client) {
// ---------------------------------------------------------------------------
function setPlayerWeaponDamageEnabled(client, state) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending weapon damage state for ${getPlayerDisplayForConsole(client)} to all players`);
triggerNetworkEvent("ag.weaponDamageEnabled", null, client.name, state);
}
// ---------------------------------------------------------------------------
function setPlayerWeaponDamageEvent(client, eventType) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending weapon damage event (${eventType}) for ${getPlayerDisplayForConsole(client)} to all players`);
triggerNetworkEvent("ag.weaponDamageEvent", null, client.name, eventType);
}
// ---------------------------------------------------------------------------
function sendJobRouteStopToPlayer(client, position, colour) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending job route stop data to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.showJobRouteStop", client, position, colour);
}
// ---------------------------------------------------------------------------
function showPlayerLoginSuccessGUI(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending login success GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.loginSuccess", client);
}
// ---------------------------------------------------------------------------
function showPlayerLoginFailedGUI(client, errorMessage) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending login failed GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.loginFailed", client, errorMessage);
}
// ---------------------------------------------------------------------------
function showPlayerRegistrationSuccessGUI(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending registration success GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.registrationSuccess", client);
}
// ---------------------------------------------------------------------------
function showPlayerRegistrationFailedGUI(client, errorMessage) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending registration failed GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.registrationFailed", client, errorMessage);
}
// ---------------------------------------------------------------------------
function sendPlayerGUIColours(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending GUI colours to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.guiColour", client, getServerConfig().guiColour[0], getServerConfig().guiColour[1], getServerConfig().guiColour[2]);
}
// ---------------------------------------------------------------------------
function sendPlayerGUIInit(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending GUI init signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.guiInit", client);
}
// ---------------------------------------------------------------------------
function showPlayerLoginGUI(client, errorMessage = "") {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending show login GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.showLogin", client);
}
// ---------------------------------------------------------------------------
function showPlayerRegistrationGUI(client, errorMessage = "") {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending show registration GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.showRegistration", client);
}
// ---------------------------------------------------------------------------
function showPlayerNewCharacterGUI(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending show new character GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.showNewCharacter", client);
}
// ---------------------------------------------------------------------------
function showPlayerCharacterSelectGUI(client, firstName, lastName, placeOfOrigin, dateOfBirth, skin) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending character select GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.showCharacterSelect", client, firstName, lastName, placeOfOrigin, dateOfBirth, skin);
}
// ---------------------------------------------------------------------------
function updatePlayerCharacterSelectGUI(client, firstName, lastName, placeOfOrigin, dateOfBirth, skin) {
- triggerNetworkEvent("ag.showCharacterSelect", client, firstName, lastName, placeOfOrigin, dateOfBirth, skin);
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending update character select GUI signal to ${getPlayerDisplayForConsole(client)}`);
+ triggerNetworkEvent("ag.switchCharacterSelect", client, firstName, lastName, placeOfOrigin, dateOfBirth, skin);
}
// ---------------------------------------------------------------------------
function showPlayerCharacterSelectSuccessGUI(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending character select success GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.characterSelectSuccess", client);
}
// ---------------------------------------------------------------------------
+function showPlayerCharacterSelectFailedGUI(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending character select failed GUI signal to ${getPlayerDisplayForConsole(client)}`);
+ triggerNetworkEvent("ag.characterSelectFailed", client);
+}
+
+// ---------------------------------------------------------------------------
+
function showPlayerPromptGUI(client, promptMessage, promptTitle) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending show prompt GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${promptTitle}, Message: ${promptMessage})`);
triggerNetworkEvent("ag.showPrompt", client, promptMessage, promptTitle);
}
// ---------------------------------------------------------------------------
function sendRunCodeToClient(client, code, returnTo) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending runcode to ${getPlayerDisplayForConsole(client)} (returnTo: ${getPlayerDisplayForConsole(getClientFromIndex(returnTo))}, Code: ${code})`);
triggerNetworkEvent("ag.runCode", client, code, returnTo);
}
// ---------------------------------------------------------------------------
function sendPlayerWorkingState(client, state) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending working state (${toUpperCase(getYesNoFromBool(state))}) to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.working", client, state);
}
// ---------------------------------------------------------------------------
function sendPlayerJobType(client, jobType) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending job type (${jobType}) to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.jobType", client, jobType);
}
// ---------------------------------------------------------------------------
function sendPlayerStopJobRoute(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending signal to abort job route to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.stopJobRoute", client);
}
// ---------------------------------------------------------------------------
function sendPlayerMouseCameraToggle(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending signal to toggle mouse camera ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.mouseCamera", client);
}
// ---------------------------------------------------------------------------
function sendPlayerMouseCursorToggle(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending signal to toggle mouse cursor ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.mouseCursor", client);
}
// ---------------------------------------------------------------------------
function sendAddAccountKeyBindToClient(client, key, keyState) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending added keybind to ${getPlayerDisplayForConsole(client)} (Key: ${sdl.getKeyName(key)}, State: ${(keyState) ? "down" : "up"})`);
triggerNetworkEvent("ag.addKeyBind", client, toInteger(key), (keyState) ? KEYSTATE_DOWN : KEYSTATE_UP);
}
// ---------------------------------------------------------------------------
-function sendRemoveAccountKeyBindToClient(client, key, keyState) {
+function sendRemoveAccountKeyBindToClient(client, key) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending deleted keybind to ${getPlayerDisplayForConsole(client)} (Key: ${sdl.getKeyName(key)})`);
triggerNetworkEvent("ag.delKeyBind", client, toInteger(key));
}
// ---------------------------------------------------------------------------
function sendPlayerSetPosition(client, position) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending set position signal to ${getPlayerDisplayForConsole(client)} (Position: ${position.x}, ${position.y}, ${position.z})`);
triggerNetworkEvent("ag.position", client, position);
}
// ---------------------------------------------------------------------------
function sendPlayerSetHeading(client, heading) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending set heading signal to ${getPlayerDisplayForConsole(client)} (Heading: ${heading})`);
triggerNetworkEvent("ag.heading", client, heading);
}
// ---------------------------------------------------------------------------
function sendPlayerSetInterior(client, interior) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending set heading signal to ${getPlayerDisplayForConsole(client)} (Interior: ${interior})`);
triggerNetworkEvent("ag.interior", client, interior);
}
// ---------------------------------------------------------------------------
function sendPlayerFrozenState(client, state) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending set heading signal to ${getPlayerDisplayForConsole(client)} (State: ${toUpperCase(getYesNoFromBool(state))})`);
triggerNetworkEvent("ag.frozen", client, state);
}
// ---------------------------------------------------------------------------
function givePlayerWeapon(client, weaponId, ammo, active) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending signal to ${getPlayerDisplayForConsole(client)} to give weapon (Weapon: ${weaponId}, Ammo: ${ammo})`);
triggerNetworkEvent("ag.giveWeapon", client, weaponId, ammo, active);
}
// ---------------------------------------------------------------------------
function clearPlayerWeapons(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending signal to ${getPlayerDisplayForConsole(client)} to clear weapons`);
triggerNetworkEvent("ag.clearWeapons", client);
}
// ---------------------------------------------------------------------------
function showPlayerNewCharacterFailedGUI(client, errorMessage) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending new character failed GUI signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.newCharacterFailed", client, errorMessage);
}
// ---------------------------------------------------------------------------
function sendPlayerRemoveFromVehicle(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending remove from vehicle signal to ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.removeFromVehicle", client);
}
@@ -429,30 +475,35 @@ function sendChatBoxMessageToPlayer(client, message, colour) {
// ---------------------------------------------------------------------------
function showPlayerItemTakeDelay(client, itemId) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item take delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(itemId).itemTypeIndex).takeDelay} milliseconds)`);
triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(itemId).itemTypeIndex).takeDelay);
}
// ---------------------------------------------------------------------------
function showPlayerItemUseDelay(client, itemSlot) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item use delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).useDelay} milliseconds)`);
triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).useDelay);
}
// ---------------------------------------------------------------------------
function showPlayerItemDropDelay(client, itemSlot) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item drop delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).dropDelay} milliseconds)`);
triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).dropDelay);
}
// ---------------------------------------------------------------------------
function showPlayerItemPickupDelay(client, itemId) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item pickup delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay} milliseconds)`);
triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay);
}
// ---------------------------------------------------------------------------
function showPlayerItemPutDelay(client, itemSlot) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item put delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).putDelay} milliseconds)`);
triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).putDelay);
}
@@ -461,11 +512,14 @@ function showPlayerItemPutDelay(client, itemSlot) {
function showPlayerItemSwitchDelay(client, itemSlot) {
if(itemSlot != -1) {
if(getPlayerData(client).hotBarItems[itemSlot] != -1) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item switch delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).switchDelay} milliseconds)`);
triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).switchDelay);
} else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item switch delay to ${getPlayerDisplayForConsole(client)} (instant)`);
playerSwitchItem(client, itemSlot);
}
} else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item switch delay to ${getPlayerDisplayForConsole(client)} (instant)`);
playerSwitchItem(client, itemSlot);
}
}
@@ -473,13 +527,37 @@ function showPlayerItemSwitchDelay(client, itemSlot) {
// ---------------------------------------------------------------------------
function sendPlayerDrunkEffect(client, amount, duration) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Setting drunk effect for ${getPlayerDisplayForConsole(client)} to ${amount} for ${duration} milliseconds`);
triggerNetworkEvent("ag.drunkEffect", client, amount, duration);
}
// ---------------------------------------------------------------------------
function sendPlayerClearPedState(client) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Clearing ped state for ${getPlayerDisplayForConsole(client)}`);
triggerNetworkEvent("ag.clearPedState", client);
}
+// ---------------------------------------------------------------------------
+
+function playerDamagedByPlayer(client, damagerPed, weaponId, pedPiece) {
+ let damagerClient = getClientFromPlayerElement(damagerPed);
+
+ if(!getPlayerData(damagerClient) || !getPlayerData(client)) {
+ return false;
+ }
+
+ switch(getPlayerData(damagerClient).weaponDamageEvent) {
+ case AG_WEAPON_DAMAGE_EVENT_TAZER:
+ if(!isPlayerTazed(client) && !isPlayerHandCuffed(client) && !isPlayerInAnyVehicle(client)) {
+ meActionToNearbyPlayers(client, `electrifies ${getCharacterFullName(damagerClient)} with their tazer`);
+ tazePlayer(client);
+ }
+ break;
+
+ default:
+ break;
+ }
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From 174a38121f0c9e99de21e4bbdc6c321f6d3ccb57 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:40:20 -0600
Subject: [PATCH 008/480] Made some soft colours a little more vibrant
---
scripts/server/colour.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/server/colour.js b/scripts/server/colour.js
index 97e7c64b..3c8952f1 100644
--- a/scripts/server/colour.js
+++ b/scripts/server/colour.js
@@ -30,17 +30,17 @@ let serverColours = {
royalBlue: toColour(0, 0, 255, 255),
teal: toColour(0, 255, 255, 255),
orange: toColour(255, 128, 0, 255),
- softRed: toColour(205, 92, 92, 255),
+ softRed: toColour(205, 60, 60, 255),
softGreen: toColour(50, 205, 50, 255),
lightPurple: toColour(150, 0, 150, 255),
lightGrey: toColour(200, 200, 200, 255),
mediumGrey: toColour(150, 150, 150, 255),
darkGrey: toColour(64, 64, 64, 255),
- policeBlue: toColour(70, 130, 180, 255),
+ policeBlue: toColour(50, 80, 200, 255),
medicPink: toColour(219, 112, 147, 255),
- firefighterRed: toColour(205, 92, 92, 255),
- busDriverGreen: toColour(50, 205, 50, 255),
- taxiDriverYellow: toColour(240, 230, 140, 255),
+ firefighterRed: toColour(205, 60, 60, 255),
+ busDriverGreen: toColour(50, 160, 50, 255),
+ taxiDriverYellow: toColour(240, 230, 100, 255),
civilianWhite: toColour(200, 200, 200, 255),
burntYellow: toColour(210, 210, 0, 255),
burntOrange: toColour(210, 120, 0, 255),
@@ -89,7 +89,7 @@ function getPlayerColour(client) {
// ---------------------------------------------------------------------------
function getBoolRedGreenInlineColour(boolVal) {
- return (!boolVal) ? "[#AA2222]" : "[#22AA22]";
+ return (!boolVal) ? "[#cd3c3c]" : "[#32cd32]";
}
// ---------------------------------------------------------------------------
\ No newline at end of file
From 731597e5d847723366ab184e8ee13ff181c50b1e Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:40:29 -0600
Subject: [PATCH 009/480] Add radio command
---
scripts/server/command.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/server/command.js b/scripts/server/command.js
index 95bcf1cd..1ac314a4 100644
--- a/scripts/server/command.js
+++ b/scripts/server/command.js
@@ -193,6 +193,8 @@ function loadCommands() {
commandData("freq", setWalkieTalkieFrequencyCommand, "[frequncy number]", getStaffFlagValue("none"), true, false),
//commandData("call", callWithPhoneCommand, "[number]", getStaffFlagValue("none"), true, false),
//commandData("speakerphone", togglePhoneSpeakerCommand, "", getStaffFlagValue("none"), true, false),
+ commandData("radio", walkieTalkieChatCommand, "", getStaffFlagValue("none"), true, false),
+ commandData("r", walkieTalkieChatCommand, "", getStaffFlagValue("none"), true, false),
],
job: [
commandData("takejob", takeJobCommand, "", getStaffFlagValue("none"), true, false),
@@ -204,8 +206,6 @@ function loadCommands() {
commandData("uniform", jobUniformCommand, "[uniform]", getStaffFlagValue("none"), true, false),
commandData("equip", jobEquipmentCommand, "[equipment]", getStaffFlagValue("none"), true, false),
- commandData("radio", jobRadioCommand, "", getStaffFlagValue("none"), true, false),
- commandData("r", jobRadioCommand, "", getStaffFlagValue("none"), true, false),
commandData("department", jobDepartmentRadioCommand, "", getStaffFlagValue("none"), true, false),
commandData("d", jobDepartmentRadioCommand, "", getStaffFlagValue("none"), true, false),
From 3267659cac96aa328ebec41453b88f736681aba9 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:40:49 -0600
Subject: [PATCH 010/480] Add tazer effect duration and wep types to config
---
scripts/server/config.js | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/scripts/server/config.js b/scripts/server/config.js
index d142d5db..14f0b88c 100644
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -59,6 +59,14 @@ let globalConfig = {
walkieTalkieTalkDistance: 15,
phoneSpeakerDistance: 15,
phoneTalkDistance: 15,
+ tazerEffectDuration: 15000,
+ weaponEquippableTypes: [
+ AG_ITEM_USETYPE_WEAPON,
+ AG_ITEM_USETYPE_TAZER,
+ AG_ITEM_USETYPE_EXTINGUISHER,
+ AG_ITEM_USETYPE_SPRAYPAINT,
+ AG_ITEM_USETYPE_PEPPERSPRAY,
+ ],
};
let gameConfig = {
From debae2ce68785e6cbbeaf6945453c6fcbf6c6d76 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:41:32 -0600
Subject: [PATCH 011/480] Add tazed/binded/trapped player ped state consts
---
scripts/server/const.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/server/const.js b/scripts/server/const.js
index a6170baa..1b9e9f9c 100644
--- a/scripts/server/const.js
+++ b/scripts/server/const.js
@@ -267,4 +267,8 @@ const AG_PEDSTATE_DEAD = 4;
const AG_PEDSTATE_ENTERINGPROPERTY = 5;
const AG_PEDSTATE_EXITINGPROPERTY = 6;
const AG_PEDSTATE_ENTERINGVEHICLE = 7;
-const AG_PEDSTATE_EXITINGVEHICLE = 8;
\ No newline at end of file
+const AG_PEDSTATE_EXITINGVEHICLE = 8;
+const AG_PEDSTATE_BINDED = 9;
+const AG_PEDSTATE_TAZED = 10;
+const AG_PEDSTATE_INTRUNK = 11;
+const AG_PEDSTATE_INITEM = 12;
\ No newline at end of file
From 4719baa9c50e7733c9caa57969f251cbc6984129 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:41:46 -0600
Subject: [PATCH 012/480] Add object quick funcs for runcode
---
scripts/server/developer.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/scripts/server/developer.js b/scripts/server/developer.js
index 5555c9d3..86797ea9 100644
--- a/scripts/server/developer.js
+++ b/scripts/server/developer.js
@@ -28,6 +28,14 @@ function p(params) {
return getPlayerFromParams(params);
}
+function o(params) {
+ return getElementsByType(ELEMENT_OBJECT)[params];
+}
+
+function io(params) {
+ return getItemData(params).object;
+}
+
function pd(params) {
return getPlayerData(getPlayerFromParams(params));
}
@@ -309,7 +317,7 @@ function restartGameModeCommand(command, params, client) {
// ---------------------------------------------------------------------------
function clientRunCodeFail(client, returnTo, code) {
- let returnClient = getClients()[returnTo];
+ let returnClient = getClientFromIndex(returnTo);
if(!returnClient) {
return false;
}
From cd8e8dda11f16ec1e09eb812d5f175acf6d561a9 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:42:08 -0600
Subject: [PATCH 013/480] Dont use exiting veh event, fix player spawn event
---
scripts/server/event.js | 48 ++++++++++++++++++++++++++---------------
1 file changed, 31 insertions(+), 17 deletions(-)
diff --git a/scripts/server/event.js b/scripts/server/event.js
index 1956a230..62855ee0 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -120,11 +120,10 @@ function onPedEnteringVehicle(event, ped, vehicle, seat) {
// ---------------------------------------------------------------------------
function onPedExitingVehicle(event, ped, vehicle) {
- //if(ped.isType(ELEMENT_PLAYER)) {
- // let client = getClientFromPlayerElement(ped);
- // getPlayerData(client).pedState = AG_PEDSTATE_EXITINGVEHICLE;
- //}
-
+ if(ped.isType(ELEMENT_PLAYER)) {
+ let client = getClientFromPlayerElement(ped);
+ getPlayerData(client).pedState = AG_PEDSTATE_EXITINGVEHICLE;
+ }
}
// ---------------------------------------------------------------------------
@@ -286,50 +285,65 @@ function onPedSpawn(ped) {
// ---------------------------------------------------------------------------
function onPlayerSpawn(ped) {
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Checking for ${getPlayerDisplayForConsole(client)}'s client element`);
if(getClientFromPlayerElement(ped) == null) {
+ logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s client element not set yet. Rechecking ...`);
setTimeout(onPlayerSpawn, 500, ped);
return false;
}
+ logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s client element is valid.`);
+
let client = getClientFromPlayerElement(ped);
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Checking ${getPlayerDisplayForConsole(client)}'s player data`);
if(!getPlayerData(client)) {
+ logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s player data is invalid. Kicking them from server.`);
client.disconnect();
return false;
}
- if(!isPlayerSwitchingCharacter(client)) {
- return false;
- }
+ logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s player data is valid.`);
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Processing ${getPlayerDisplayForConsole(client)}'s spawn (Player Element ID: ${client.player.id})`);
+ restorePlayerCamera(client);
+ //logToConsole(LOG_DEBUG, `Checking switchchar for ${getPlayerDisplayForConsole(client)}`);
+ //if(!isPlayerSwitchingCharacter(client)) {
+ // return false;
+ //}
+ logToConsole(LOG_DEBUG, `Storing ${getPlayerDisplayForConsole(client)} ped in client data `);
+ getPlayerData(client).ped = ped;
+
+ logToConsole(LOG_DEBUG, `Sending ${getPlayerDisplayForConsole(client)} the 'now playing as' message`);
messagePlayerAlert(client, `You are now playing as: [#0099FF]${getCharacterFullName(client)}`, getColourByName("white"));
messagePlayerNormal(client, "This server is in early development and may restart at any time for updates.", getColourByName("orange"));
messagePlayerNormal(client, "Please report any bugs using /bug and suggestions using /idea", getColourByName("yellow"));
- restorePlayerCamera(client, false, 1.0);
updatePlayerSpawnedState(client, true);
setPlayerInterior(client, getPlayerCurrentSubAccount(client).interior);
setPlayerDimension(client, getPlayerCurrentSubAccount(client).dimension);
updateAllPlayerNameTags();
- getPlayerData(client).switchingCharacter = false;
updatePlayerCash(client);
sendPlayerJobType(client, getJobIndexFromDatabaseId(getPlayerCurrentSubAccount(client)));
setPlayer2DRendering(client, true, true, true, true, true, true);
updatePlayerSnowState(client);
- updatePlayerHotBar(client);
- setEntityData(client.player, "ag.scale", getPlayerCurrentSubAccount(client).pedScale, true);
-
sendExcludedModelsForGroundSnowToPlayer(client);
sendRemovedWorldObjectsToPlayer(client);
- setTimeout(function() {
- syncPlayerProperties(client);
- }, 1000);
+ //setEntityData(client.player, "ag.scale", getPlayerCurrentSubAccount(client).pedScale, true);
+
+ //setTimeout(function() {
+ // syncPlayerProperties(client);
+ //}, 1000);
if(getServerConfig().showLogo && doesPlayerHaveLogoEnabled(client)) {
updatePlayerShowLogoState(client, true);
}
+ cachePlayerHotBarItems(client);
+ updatePlayerHotBar(client);
+
+ getPlayerData(client).switchingCharacter = false;
getPlayerData(client).pedState = AG_PEDSTATE_READY;
}
-// ---------------------------------------------------------------------------
\ No newline at end of file
+// ---------------------------------------------------------------------------
From b24a206705205dbb5b1479b237b423bb71033478 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:42:17 -0600
Subject: [PATCH 014/480] Remove unused GUI funcs
---
scripts/server/gui.js | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/scripts/server/gui.js b/scripts/server/gui.js
index fab862fb..2c2447a2 100644
--- a/scripts/server/gui.js
+++ b/scripts/server/gui.js
@@ -10,29 +10,13 @@
// ---------------------------------------------------------------------------
-function showPlayerPromptGUI(client) {
-
-}
-
-// ---------------------------------------------------------------------------
-
-function showPlayerPhoneGUI(client) {
-
-}
-
-// ---------------------------------------------------------------------------
-
-function showPlayerItemInventoryGUI(client) {
-
-}
-
-// ---------------------------------------------------------------------------
-
function playerPromptAnswerNo(client) {
if(!getEntityData(client, "ag.prompt")) {
return false;
}
+ logToConsole(LOG_DEBUG, `[Asshat.GUI] ${getPlayerDisplayForConsole(client)} answered NO to their prompt (${getEntityData(client, "ag.prompt")})`);
+
switch(getEntityData(client, "ag.prompt")) {
case AG_PROMPT_CREATEFIRSTCHAR:
showPlayerErrorGUI(client, "You don't have a character to play. Goodbye!", "No Characters")
@@ -53,6 +37,8 @@ function playerPromptAnswerYes(client) {
return false;
}
+ logToConsole(LOG_DEBUG, `[Asshat.GUI] ${getPlayerDisplayForConsole(client)} answered YES to their prompt (${getEntityData(client, "ag.prompt")})`);
+
switch(getEntityData(client, "ag.prompt")) {
case AG_PROMPT_CREATEFIRSTCHAR:
showPlayerNewCharacterGUI(client);
From f9517442e1c5a49c62893f58422f3f6c876e0269 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:42:31 -0600
Subject: [PATCH 015/480] Fix trying to drop item slot -1
---
scripts/server/item.js | 65 ++++++++++++++++++++++++++++++++----------
1 file changed, 50 insertions(+), 15 deletions(-)
diff --git a/scripts/server/item.js b/scripts/server/item.js
index e13a2e54..14619472 100644
--- a/scripts/server/item.js
+++ b/scripts/server/item.js
@@ -252,6 +252,10 @@ function dropItemCommand(command, params, client) {
hotBarSlot = toInteger(params);
}
+ if(hotBarSlot == -1) {
+ return false;
+ }
+
if(getPlayerData(client).hotBarItems[hotBarSlot] == -1) {
messagePlayerError(client, `Please equip an item or provide a slot ID to drop an item`);
return false;
@@ -398,24 +402,55 @@ function playerUseItem(client, hotBarSlot) {
return false;
}
- if(!isPlayerSurrendered(closestPlayer)) {
- messagePlayerError(client, `${getCharacterFullName(closestPlayer)} can't be tied up! They either need to have their hands up, be knocked out, or tazed`);
- return false;
- }
- break;
-
- case AG_ITEM_USETYPE_HANDCUFFS:
- closestPlayer = getClosestPlayer(getPlayerPosition(client));
-
- if(!getPlayerData(closestPlayer)) {
+ if(getDistance(getPlayerPosition(closestPlayer), getPlayerPosition(client)) > getGlobalConfig().handcuffPlayerDistance) {
messagePlayerError(client, "There isn't anyone close enough to tie up!");
return false;
}
if(!isPlayerSurrendered(closestPlayer)) {
- messagePlayerError(client, `${getCharacterFullName(closestPlayer)} can't be cuffed! They either need to have their hands up, be knocked out, or tazed`);
+ messagePlayerError(client, `${getCharacterFullName(closestPlayer)} can't be tied! They either need to have their hands up, be knocked out, or tazed`);
return false;
}
+
+ if(isPlayerHandCuffed(closestPlayer)) {
+ ropeUnTiePlayer(closestPlayer);
+ meActionToNearbyPlayers(client, `unties the rope from ${getCharacterFullName(closestPlayer)}'s hands and feet`);
+ } else {
+ if(!isPlayerSurrendered(closestPlayer)) {
+ messagePlayerError(client, `${getCharacterFullName(closestPlayer)} can't be tied up! They either need to have their hands up, be knocked out, or tazed`);
+ return false;
+ }
+
+ ropeTiePlayer(closestPlayer);
+ meActionToNearbyPlayers(client, `takes their rope and ties ${getCharacterFullName(closestPlayer)}'s hands and feet together.`);
+ }
+ break;
+
+ case AG_ITEM_USETYPE_HANDCUFF:
+ closestPlayer = getClosestPlayer(getPlayerPosition(client));
+
+ if(!getPlayerData(closestPlayer)) {
+ messagePlayerError(client, "There isn't anyone close enough to handcuff!");
+ return false;
+ }
+
+ if(getDistance(getPlayerPosition(closestPlayer), getPlayerPosition(client)) > getGlobalConfig().handcuffPlayerDistance) {
+ messagePlayerError(client, "There isn't anyone close enough to handcuff!");
+ return false;
+ }
+
+ if(isPlayerHandCuffed(closestPlayer)) {
+ unHandCuffPlayer(closestPlayer);
+ meActionToNearbyPlayers(client, `takes their key and removes the handcuffs from ${getCharacterFullName(closestPlayer)}`);
+ } else {
+ if(!isPlayerSurrendered(closestPlayer)) {
+ messagePlayerError(client, `${getCharacterFullName(closestPlayer)} can't be cuffed! They either need to have their hands up, be knocked out, or tazed`);
+ return false;
+ }
+
+ handCuffPlayer(closestPlayer);
+ meActionToNearbyPlayers(client, `takes their cuffs and places them on ${getCharacterFullName(closestPlayer)}`);
+ }
break;
case AG_ITEM_USETYPE_NONE:
@@ -424,7 +459,7 @@ function playerUseItem(client, hotBarSlot) {
case AG_ITEM_USETYPE_WALKIETALKIE:
getItemData(itemIndex).enabled = !getItemData(itemIndex).enabled;
- messagePlayerAlert(client, `You turned ${toUpperCase(getBoolRedGreenInlineColour(getOnOffFromBool(getItemData(itemIndex).enabled)))} your walkie talkie in slot ${getPlayerData(client).activeHotBarSlot+1} (${getItemValueDisplay(itemIndex)})`);
+ messagePlayerAlert(client, `You turned ${getBoolRedGreenInlineColour(getItemData(itemIndex).enabled)}${toUpperCase(getOnOffFromBool(getItemData(itemIndex).enabled))} [#FFFFFF]your walkie talkie in slot ${getPlayerData(client).activeHotBarSlot+1} [#AAAAAA](${getItemValueDisplay(itemIndex)})`);
break;
case AG_ITEM_USETYPE_PHONE:
@@ -510,7 +545,7 @@ function playerPickupItem(client, itemId) {
getItemData(itemId).ownerId = getPlayerCurrentSubAccount(client).databaseId;
getItemData(itemId).position = toVector3(0.0, 0.0, 0.0);
getItemData(itemId).dimension = 0;
- deleteGroundItemObject(itemIndex);
+ deleteGroundItemObject(itemId);
getPlayerData(client).hotBarItems[firstSlot] = itemId;
updatePlayerHotBar(client);
@@ -570,7 +605,7 @@ function playerSwitchItem(client, newHotBarSlot) {
if(currentHotBarItem != -1) {
if(getItemData(currentHotBarItem)) {
- if(getItemTypeData(getItemData(currentHotBarItem).itemTypeIndex).useType == AG_ITEM_USETYPE_WEAPON) {
+ if(getGlobalConfig().weaponEquippableTypes.indexOf(getItemTypeData(getItemData(currentHotBarItem).itemTypeIndex).useType) != -1) {
getItemData(currentHotBarItem).value = getPlayerWeaponAmmo(client);
clearPlayerWeapons(client);
}
@@ -1209,7 +1244,7 @@ function toggleItemEnabledCommand(command, params, client) {
}
getItemData(getPlayerActiveItem(client)).enabled = !getItemData(getPlayerActiveItem(client)).enabled;
- messagePlayerNormal(client, `You turned ${toUpperCase(getOnOffFromBool(getBoolRedGreenInlineColour(getItemData(getPlayerActiveItem(client)).enabled)))} (your ${getItemName(getPlayerActiveItem(client))} in slot ${getPlayerActiveItemSlot(client)}`)
+ messagePlayerNormal(client, `You turned ${getBoolRedGreenInlineColour(getItemData(itemIndex).enabled)}${toUpperCase(getOnOffFromBool(getItemData(itemIndex).enabled))} [#FFFFFF]your ${getItemName(getPlayerActiveItem(client))} in slot ${getPlayerActiveItemSlot(client)} [#AAAAAA](${getItemValueDisplay(getPlayerActiveItem(client))}`)
}
// ---------------------------------------------------------------------------
From 41bfd2207a2211843c15fa538fed976c54426de6 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:42:48 -0600
Subject: [PATCH 016/480] Delete job items on stop working
---
scripts/server/job.js | 70 +++++++++++++++++++++++++++++++------------
1 file changed, 51 insertions(+), 19 deletions(-)
diff --git a/scripts/server/job.js b/scripts/server/job.js
index 1aeba834..837140ea 100644
--- a/scripts/server/job.js
+++ b/scripts/server/job.js
@@ -533,6 +533,7 @@ function stopWorking(client) {
getPlayerCurrentSubAccount(client).lastJobVehicle = false;
}
+ deleteJobItems(client);
restorePlayerJobLockerItems(client);
let jobId = getPlayerCurrentSubAccount(client).job;
@@ -608,7 +609,7 @@ function jobUniformCommand(command, params, client) {
messagePlayerSuccess(client, `You have been given a [#AAAAAA]${uniforms[uniformId-1].name} [#FFFFFF]uniform and you can put it on from your inventory.`);
- let itemId = createItem(getItemTypeFromParams("Uniform"), getJobData(jobId).uniforms[uniformId].skin, AG_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
+ let itemId = createItem(getItemTypeFromParams("Outfit"), getJobData(jobId).uniforms[uniformId-1].skin, AG_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
let freeSlot = getPlayerFirstEmptyHotBarSlot(client);
getPlayerData(client).hotBarItems[freeSlot] = itemId;
getPlayerData(client).jobEquipmentCache.push(itemId);
@@ -1072,24 +1073,40 @@ function startJobRoute(client) {
// ---------------------------------------------------------------------------
-function stopJobRoute(client, successful = false) {
+function stopJobRoute(client, successful = false, alertPlayer = true) {
stopReturnToJobVehicleCountdown(client);
sendPlayerStopJobRoute(client);
if(doesPlayerHaveJobType(client, AG_JOB_BUS)) {
- respawnVehicle(getPlayerData(client).busRouteVehicle);
- messagePlayerAlert(client, `You stopped the ${getBusRouteData(getPlayerData(client).busRouteIsland, getPlayerData(client).busRoute).name} bus route! Your bus has been returned to the bus depot.`, getColourByName("yellow"));
- getPlayerData(client).busRouteVehicle = false;
- getPlayerData(client).busRoute = false;
- getPlayerData(client).busRouteStop = false;
- getPlayerData(client).busRouteIsland = false;
+ respawnVehicle(getPlayerData(client).jobRouteVehicle);
+ getPlayerData(client).jobRouteVehicle = false;
+ getPlayerData(client).jobRoute = false;
+ getPlayerData(client).jobRouteStop = false;
+ getPlayerData(client).jobRouteIsland = false;
+
+ if(alertPlayer) {
+ messagePlayerAlert(client, `You stopped the ${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} bus route! Your bus has been returned to the bus depot.`, getColourByName("yellow"));
+ }
} else if(doesPlayerHaveJobType(client, AG_JOB_GARBAGE)) {
- respawnVehicle(getPlayerData(client).garbageRouteVehicle);
- messagePlayerAlert(client, `You stopped the ${getBusRouteData(getPlayerData(client).garbageRouteIsland, getPlayerData(client).garbageRoute).name} garbage route! Your trashmaster has been returned to the bus depot.`, getColourByName("yellow"));
- getPlayerData(client).garbageRouteVehicle = false;
- getPlayerData(client).garbageRoute = false;
- getPlayerData(client).garbageRouteStop = false;
- getPlayerData(client).garbageRouteIsland = false;
+ respawnVehicle(getPlayerData(client).jobRouteVehicle);
+ getPlayerData(client).jobRouteVehicle = false;
+ getPlayerData(client).jobRoute = false;
+ getPlayerData(client).jobRouteStop = false;
+ getPlayerData(client).jobRouteIsland = false;
+
+ if(alertPlayer) {
+ messagePlayerAlert(client, `You stopped the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! Your trashmaster has been returned to the bus depot.`, getColourByName("yellow"));
+ }
+ } else if(doesPlayerHaveJobType(client, AG_JOB_POLICE)) {
+ respawnVehicle(getPlayerData(client).jobRouteVehicle);
+ getPlayerData(client).jobRouteVehicle = false;
+ getPlayerData(client).jobRoute = false;
+ getPlayerData(client).jobRouteStop = false;
+ getPlayerData(client).jobRouteIsland = false;
+
+ if(alertPlayer) {
+ messagePlayerAlert(client, `You stopped the ${getPolicePatrolRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} patrol route! Your police car has been returned to the station.`, getColourByName("yellow"));
+ }
}
}
@@ -1464,12 +1481,12 @@ function createJobLocationPickup(jobId, locationId) {
getJobData(jobId).locations[locationId].pickup = gta.createPickup(pickupModelId, getJobData(jobId).locations[locationId].position, getGameConfig().pickupTypes[getServerGame()].job);
getJobData(jobId).locations[locationId].pickup.dimension = getJobData(jobId).locations[locationId].dimension;
- addToWorld(getJobData(jobId).locations[locationId].pickup);
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.owner.type", AG_PICKUP_JOB, false);
- setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, locationId, false);
- setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, AG_LABEL_JOB, true);
- setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, getServerData().jobs[jobId].name, true);
- setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, jobId, true);
+ setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.owner.id", locationId, false);
+ setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.type", AG_LABEL_JOB, true);
+ setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.name", getJobData(jobId).name, true);
+ setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.jobType", jobId, true);
+ addToWorld(getJobData(jobId).locations[locationId].pickup);
}
}
@@ -1576,4 +1593,19 @@ function playerArrivedAtJobRouteStop(client) {
}
}
+// ---------------------------------------------------------------------------
+
+function deleteJobItems(client) {
+ for(let i in getPlayerData(client).jobEquipmentCache) {
+ for(let j in getPlayerData(client).hotBarItems) {
+ if(getPlayerData(client).hotBarItems[j] == getPlayerData(client).jobEquipmentCache[i]) {
+ getPlayerData(client).hotBarItems[j] = -1;
+ }
+ }
+ deleteItem(getPlayerData(client).jobEquipmentCache[i]);
+ }
+
+
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From d734b976abbf2b4cfafd3ca9bc8e28f729d4ab7b Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:42:56 -0600
Subject: [PATCH 017/480] Add check spawn util
---
scripts/server/misc.js | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/scripts/server/misc.js b/scripts/server/misc.js
index 32cdd64a..f1e5db6f 100644
--- a/scripts/server/misc.js
+++ b/scripts/server/misc.js
@@ -306,4 +306,24 @@ function playerChangeAFKState(client, afkState) {
}
}
+// ---------------------------------------------------------------------------
+
+function checkPlayerSpawning() {
+ let clients = getClients();
+ for(let i in clients) {
+ if(!isConsole(clients[i])) {
+ if(getPlayerData(clients[i])) {
+ if(getPlayerData(clients[i]).loggedIn) {
+ if(getPlayerData(clients[i]).ped == null) {
+ if(clients[i].player != null) {
+ getPlayerData(clients[i]).ped = clients[i].player;
+ onPlayerSpawn(clients[i].player);
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From dff0cc4fe7964d658226ec68ebd27f09ec0b0e02 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:43:13 -0600
Subject: [PATCH 018/480] Remove unused shared natives
---
scripts/server/native.js | 48 ++++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/scripts/server/native.js b/scripts/server/native.js
index 9354c3a6..9cfc67f3 100644
--- a/scripts/server/native.js
+++ b/scripts/server/native.js
@@ -18,30 +18,6 @@ function getServerGame() {
// ---------------------------------------------------------------------------
-function agGetPedPosition(ped) {
- return ped.position;
-}
-
-// ---------------------------------------------------------------------------
-
-function agGetPedRotation(ped) {
- return ped.heading;
-}
-
-// ---------------------------------------------------------------------------
-
-function agGetPedSkin(ped) {
- return ped.modelIndex;
-}
-
-// ---------------------------------------------------------------------------
-
-function agSetPedSkin(ped, skinId) {
- return ped.modelIndex = skinId;
-}
-
-// ---------------------------------------------------------------------------
-
function getPlayerPosition(client) {
if(client.player != null) {
return client.player.position;
@@ -51,6 +27,7 @@ function getPlayerPosition(client) {
// ---------------------------------------------------------------------------
function setPlayerPosition(client, position) {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s position to ${position.x}, ${position.y}, ${position.z}`);
sendPlayerSetPosition(client, position);
}
@@ -63,6 +40,7 @@ function getPlayerHeading(client) {
// ---------------------------------------------------------------------------
function setPlayerHeading(client, heading) {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s heading to ${heading}`);
sendPlayerSetHeading(client, heading);
}
@@ -91,12 +69,14 @@ function getPlayerInterior(client) {
// ---------------------------------------------------------------------------
function setPlayerDimension(client, dimension) {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s dimension to ${interior}`);
client.player.dimension = dimension;
}
// ---------------------------------------------------------------------------
function setPlayerInterior(client, interior) {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s interior to ${interior}`);
sendPlayerSetInterior(client, interior);
getPlayerCurrentSubAccount(client).interior = interior;
}
@@ -156,6 +136,7 @@ function getVehicleForNetworkEvent(vehicle) {
// ---------------------------------------------------------------------------
function deleteGameElement(element) {
+ logToConsole(LOG_DEBUG, `Destroying game element ${element.id} (Type: ${element.type})`);
if(element != null) {
destroyElement(element);
return true;
@@ -172,6 +153,7 @@ function isPlayerInFrontVehicleSeat(client) {
// ---------------------------------------------------------------------------
function removePlayerFromVehicle(client) {
+ logToConsole(LOG_DEBUG, `Removing ${getPlayerDisplayForConsole(client)} from their vehicle`);
sendPlayerRemoveFromVehicle(client);
return true;
}
@@ -179,6 +161,7 @@ function removePlayerFromVehicle(client) {
// ---------------------------------------------------------------------------
function setPlayerSkin(client, skin) {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s skin to ${skin} (${getGameData().skinNames[getServerGame()][skin]})`);
client.player.modelIndex = skin;
}
@@ -191,6 +174,8 @@ function getPlayerSkin(client) {
// ---------------------------------------------------------------------------
function disconnectPlayer(client) {
+ logToConsole(LOG_DEBUG, `Disconnecting (kicking) ${getPlayerDisplayForConsole(client)}`);
+ client.disconnect();
return false;
}
@@ -209,6 +194,7 @@ function getPlayerWeaponAmmo(client) {
// ---------------------------------------------------------------------------
function setPlayerVelocity(client, velocity) {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s velocity to ${velocity.x}, ${velocity.y}, ${velocity.z}`);
client.player.velocity = velocity;
}
@@ -234,10 +220,24 @@ function setElementDimension(element, dimension) {
function givePlayerHealth(client, amount) {
if(getPlayerHealth(client)+amount > 100) {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s health to 100`);
setPlayerHealth(client, 100);
} else {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s health to ${getPlayerHealth(client)+amount}`);
setPlayerHealth(client, getPlayerHealth(client)+amount);
}
}
+// ---------------------------------------------------------------------------
+
+function givePlayerArmour(client, amount) {
+ if(getPlayerArmour(client)+amount > 100) {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s armour to 100`);
+ setPlayerArmour(client, 100);
+ } else {
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s armour to ${getPlayerArmour(client)+amount}`);
+ setPlayerArmour(client, getPlayerArmour(client)+amount);
+ }
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From ce018eaf5f3e9acb4e8e36afee68f879d74bdfd5 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:43:37 -0600
Subject: [PATCH 019/480] Escape clan strings before query
---
scripts/server/subaccount.js | 43 ++++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 16 deletions(-)
diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js
index bb9099e8..446c38b6 100644
--- a/scripts/server/subaccount.js
+++ b/scripts/server/subaccount.js
@@ -81,7 +81,12 @@ function saveSubAccountToDatabase(subAccountData) {
let dbConnection = connectToDatabase();
if(dbConnection) {
- let dbQueryString = `UPDATE sacct_main SET sacct_pos_x=${subAccountData.spawnPosition.x}, sacct_pos_y=${subAccountData.spawnPosition.y}, sacct_pos_z=${subAccountData.spawnPosition.z}, sacct_angle=${subAccountData.spawnHeading}, sacct_skin=${subAccountData.skin}, sacct_cash=${subAccountData.cash}, sacct_job=${subAccountData.job}, sacct_int=${subAccountData.interior}, sacct_vw=${subAccountData.dimension} WHERE sacct_id=${subAccountData.databaseId}`;
+ let safeClanTag = escapeDatabaseString(subAccountData.clanTag);
+ let safeClanTitle = escapeDatabaseString(subAccountData.clanTitle);
+ let safeFirstName = escapeDatabaseString(subAccountData.firstName);
+ let safeLastName = escapeDatabaseString(subAccountData.lastName);
+ let safeMiddleName = escapeDatabaseString(subAccountData.middleName);
+ let dbQueryString = `UPDATE sacct_main SET sacct_name_first='${safeFirstName}', sacct_name_last='${safeLastName}', sacct_name_middle='${safeMiddleName}', sacct_pos_x=${subAccountData.spawnPosition.x}, sacct_pos_y=${subAccountData.spawnPosition.y}, sacct_pos_z=${subAccountData.spawnPosition.z}, sacct_angle=${subAccountData.spawnHeading}, sacct_skin=${subAccountData.skin}, sacct_cash=${subAccountData.cash}, sacct_job=${subAccountData.job}, sacct_int=${subAccountData.interior}, sacct_vw=${subAccountData.dimension}, sacct_last_login=${subAccountData.lastLogin}, sacct_clan=${subAccountData.clan}, sacct_clan_rank=${subAccountData.clanRank}, sacct_clan_tag='${safeClanTag}', sacct_clan_title='${safeClanTitle}', sacct_clan_flags=${subAccountData.clanFlags} WHERE sacct_id=${subAccountData.databaseId}`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
//freeDatabaseQuery(dbQuery);
disconnectFromDatabase(dbConnection);
@@ -115,19 +120,19 @@ function showCharacterSelectToClient(client) {
getPlayerData(client).switchingCharacter = true;
if(doesPlayerHaveAutoSelectLastCharacterEnabled(client)) {
- if(getPlayerData().subAccounts != null) {
- if(getPlayerData().subAccounts.length > 0) {
- selectCharacter(client, getPlayerLastUsedSubAccount(client));
- return true;
- }
+ if(getPlayerData(client).subAccounts.length > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] ${getPlayerDisplayForConsole(client)} is being auto-spawned as character ID ${getPlayerLastUsedSubAccount(client)}`);
+ selectCharacter(client, getPlayerLastUsedSubAccount(client));
+ return true;
}
}
if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) {
getPlayerData(client).currentSubAccount = 0;
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] Setting ${getPlayerDisplayForConsole(client)}'s character to ID ${getPlayerData(client).currentSubAccount}`);
let tempSubAccount = getPlayerData(client).subAccounts[0];
showPlayerCharacterSelectGUI(client, tempSubAccount.firstName, tempSubAccount.lastName, tempSubAccount.placeOfOrigin, tempSubAccount.dateOfBirth, tempSubAccount.skin);
- logToConsole(LOG_DEBUG, `[Asshat.Account] ${getPlayerDisplayForConsole(client)} is being shown the character select GUI`);
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] ${getPlayerDisplayForConsole(client)} is being shown the character select GUI`);
} else {
//let emojiNumbers = ["➊", "➋", "➌", "➍", "➎", "➏", "➐", "➑", "➒"];
//let emojiNumbers = ["①", "②", "③", "④", "⑤", "⑥", "⑦", "⑧", "⑨"];
@@ -136,7 +141,7 @@ function showCharacterSelectToClient(client) {
getPlayerData(client).subAccounts.forEach(function(subAccount, index) {
messagePlayerNormal(client, `${index+1} • [#AAAAAA]${subAccount.firstName} ${subAccount.lastName}`);
});
- logToConsole(LOG_DEBUG, `[Asshat.Account] ${getPlayerDisplayForConsole(client)} is being shown the character select/list message (GUI disabled)`);
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] ${getPlayerDisplayForConsole(client)} is being shown the character select/list message (GUI disabled)`);
}
}
@@ -199,6 +204,7 @@ function checkPreviousCharacter(client) {
let subAccountId = getPlayerData(client).currentSubAccount;
let tempSubAccount = getPlayerData(client).subAccounts[subAccountId];
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] Setting ${getPlayerDisplayForConsole(client)}'s character to ID ${getPlayerData(client).currentSubAccount}`);
updatePlayerCharacterSelectGUI(client, tempSubAccount.firstName, tempSubAccount.lastName, tempSubAccount.placeOfOrigin, tempSubAccount.dateOfBirth, tempSubAccount.skin);
}
}
@@ -215,6 +221,7 @@ function checkNextCharacter(client) {
let subAccountId = getPlayerData(client).currentSubAccount;
let tempSubAccount = getPlayerData(client).subAccounts[subAccountId];
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] Setting ${getPlayerDisplayForConsole(client)}'s character to ID ${getPlayerData(client).currentSubAccount}`);
updatePlayerCharacterSelectGUI("ag.switchCharacterSelect", client, tempSubAccount.firstName, tempSubAccount.lastName, tempSubAccount.placeOfOrigin, tempSubAccount.dateOfBirth, tempSubAccount.skin);
}
}
@@ -222,19 +229,23 @@ function checkNextCharacter(client) {
// ---------------------------------------------------------------------------
function selectCharacter(client, characterId = -1) {
- if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) {
- showPlayerCharacterSelectSuccessGUI(client);
- }
-
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] ${getPlayerDisplayForConsole(client)} character select called (Character ID ${characterId})`);
if(characterId != -1) {
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] ${getPlayerDisplayForConsole(client)} provided character ID (${characterId}) to spawn with`);
getPlayerData(client).currentSubAccount = characterId;
}
- logToConsole(LOG_DEBUG, `[Asshat.SubAccount] Spawning ${getPlayerDisplayForConsole(client)} with skin ${getPlayerCurrentSubAccount(client).skin}`);
- spawnPlayer(client, getPlayerCurrentSubAccount(client).spawnPosition, getPlayerCurrentSubAccount(client).spawnHeading, getPlayerCurrentSubAccount(client).skin);
+ showPlayerCharacterSelectSuccessGUI(client);
+
+ let spawnPosition = getPlayerCurrentSubAccount(client).spawnPosition;
+ let spawnHeading = getPlayerCurrentSubAccount(client).spawnHeading;
+ let skin = getPlayerCurrentSubAccount(client).skin
+
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] Spawning ${getPlayerDisplayForConsole(client)} as character ID ${getPlayerData(client).currentSubAccount} with skin ${skin} (${spawnPosition.x}, ${spawnPosition.y}, ${spawnPosition.z})`);
+ spawnPlayer(client, spawnPosition, spawnHeading, skin);
+ logToConsole(LOG_DEBUG, `[Asshat.SubAccount] Spawned ${getPlayerDisplayForConsole(client)} as character ID ${getPlayerData(client).currentSubAccount} with skin ${skin} (${spawnPosition.x}, ${spawnPosition.y}, ${spawnPosition.z})`);
getPlayerCurrentSubAccount(client).lastLogin = new Date().getTime();
- cachePlayerHotBarItems(client);
}
// ---------------------------------------------------------------------------
@@ -293,7 +304,7 @@ function useCharacterCommand(command, params, client) {
function getPlayerLastUsedSubAccount(client) {
let subAccounts = getPlayerData(client).subAccounts;
- lastUsed = 0;
+ let lastUsed = 0;
for(let i in subAccounts) {
if(subAccounts[i].lastLogin > subAccounts[lastUsed].lastLogin) {
lastUsed = i;
From 96a45065fceaa7e5b3c749df439b600c74b9ac4f Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:43:51 -0600
Subject: [PATCH 020/480] Fix get players in range util
---
scripts/server/utilities.js | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/scripts/server/utilities.js b/scripts/server/utilities.js
index 9de2a05b..616ada68 100644
--- a/scripts/server/utilities.js
+++ b/scripts/server/utilities.js
@@ -541,9 +541,7 @@ function getVehiclesInRange(position, distance) {
// ---------------------------------------------------------------------------
function getClientsInRange(position, distance) {
- //return getClients().filter(x => x.player && x.player.position.distance(position) <= distance);
-
- return getElementsByTypeInRange(ELEMENT_PLAYER, position, distance);
+ return getPlayersInRange(position, distance);
}
// ---------------------------------------------------------------------------
@@ -955,12 +953,12 @@ function getVehiclesInRange(position, range) {
// ---------------------------------------------------------------------------
function getPlayersInRange(position, range) {
- let peds = getPeds();
+ let clients = getClients();
let inRangePlayers = [];
- for(let i in peds) {
- if(peds[i].isType(ELEMENT_PLAYER)) {
- if(getDistance(position, peds[i].position) <= range) {
- inRangePlayers.push(peds[i]);
+ for(let i in clients) {
+ if(isPlayerSpawned(clients[i])) {
+ if(getDistance(position, getPlayerPosition(clients[i])) <= range) {
+ inRangePlayers.push(clients[i]);
}
}
}
@@ -1818,6 +1816,10 @@ function getPlayerNameForNameTag(client) {
// -------------------------------------------------------------------------
function isPlayerSpawned(client) {
+ if(client.console) {
+ return false;
+ }
+
return (client.player != null);
}
@@ -1876,13 +1878,15 @@ function resetClientStuff(client) {
}
if(isPlayerOnJobRoute(client)) {
- stopJobRoute(client);
+ stopJobRoute(client, false, false);
}
if(getPlayerData(client).rentingVehicle) {
stopRentingVehicle(client);
}
+ deleteJobItems(client);
+
getPlayerData(client).lastVehicle = null;
}
@@ -1891,7 +1895,7 @@ function resetClientStuff(client) {
function getPlayerFromCharacterId(subAccountId) {
let clients = getClients();
for(let i in clients) {
- for(let j in getPlayerData(clients).subAccounts) {
+ for(let j in getPlayerData(clients[i]).subAccounts) {
if(getPlayerData(clients[i]).subAccounts[j].databaseId == subAccountId) {
return clients[i];
}
@@ -1940,4 +1944,4 @@ function applyOffsetToVector3(position, position2) {
return toVector3(position.x+position2.x, position.y+position2.y, position.z+position2.z);
}
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
\ No newline at end of file
From 9603faed15b70d5a77c46f259708334e97fab4d7 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:44:09 -0600
Subject: [PATCH 021/480] Add handcuff item type script
---
scripts/server/item/handcuff.js | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 scripts/server/item/handcuff.js
diff --git a/scripts/server/item/handcuff.js b/scripts/server/item/handcuff.js
new file mode 100644
index 00000000..9a6781d9
--- /dev/null
+++ b/scripts/server/item/handcuff.js
@@ -0,0 +1,31 @@
+// ===========================================================================
+// Asshat-Gaming Roleplay
+// https://github.com/VortrexFTW/gtac_asshat_rp
+// Copyright (c) 2021 Asshat-Gaming (https://asshatgaming.com)
+// ---------------------------------------------------------------------------
+// FILE: handcuff.js
+// DESC: Provides features and usage for the handcuff item type
+// TYPE: Server (JavaScript)
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+
+function isPlayerHandCuffed(client) {
+ return (getPlayerData(client).pedState == AG_PEDSTATE_BINDED);
+}
+
+// ---------------------------------------------------------------------------
+
+function handCuffPlayer(client) {
+ getPlayerData(client).pedState = AG_PEDSTATE_BINDED;
+ setPlayerControlState(client, false);
+}
+
+// ---------------------------------------------------------------------------
+
+function unHandCuffPlayer(client) {
+ getPlayerData(client).pedState = AG_PEDSTATE_READY;
+ setPlayerControlState(client, true);
+}
+
+// ---------------------------------------------------------------------------
\ No newline at end of file
From c0a15ca72c6d1c0a940518351e2c4e573d8906e6 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:44:19 -0600
Subject: [PATCH 022/480] Add rope item type script
---
scripts/server/item/rope.js | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 scripts/server/item/rope.js
diff --git a/scripts/server/item/rope.js b/scripts/server/item/rope.js
new file mode 100644
index 00000000..4dacf4cb
--- /dev/null
+++ b/scripts/server/item/rope.js
@@ -0,0 +1,31 @@
+// ===========================================================================
+// Asshat-Gaming Roleplay
+// https://github.com/VortrexFTW/gtac_asshat_rp
+// Copyright (c) 2021 Asshat-Gaming (https://asshatgaming.com)
+// ---------------------------------------------------------------------------
+// FILE: handcuff.js
+// DESC: Provides features and usage for the handcuff item type
+// TYPE: Server (JavaScript)
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+
+function isPlayerTied(client) {
+ return (getPlayerData(client).pedState == AG_PEDSTATE_BINDED);
+}
+
+// ---------------------------------------------------------------------------
+
+function ropeTiePlayer(client) {
+ getPlayerData(client).pedState = AG_PEDSTATE_BINDED;
+ setPlayerControlState(client, false);
+}
+
+// ---------------------------------------------------------------------------
+
+function ropeUnTiePlayer(client) {
+ getPlayerData(client).pedState = AG_PEDSTATE_READY;
+ setPlayerControlState(client, true);
+}
+
+// ---------------------------------------------------------------------------
\ No newline at end of file
From 28d4b34826cc4622c1218011bb3c216210813210 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:44:40 -0600
Subject: [PATCH 023/480] Add tazer item script
---
scripts/server/item/tazer.js | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 scripts/server/item/tazer.js
diff --git a/scripts/server/item/tazer.js b/scripts/server/item/tazer.js
new file mode 100644
index 00000000..daeab207
--- /dev/null
+++ b/scripts/server/item/tazer.js
@@ -0,0 +1,36 @@
+// ===========================================================================
+// Asshat-Gaming Roleplay
+// https://github.com/VortrexFTW/gtac_asshat_rp
+// Copyright (c) 2021 Asshat-Gaming (https://asshatgaming.com)
+// ---------------------------------------------------------------------------
+// FILE: tazer.js
+// DESC: Provides features and usage for the tazer item type
+// TYPE: Server (JavaScript)
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+
+function isPlayerTazed(client) {
+ return (getPlayerData(client).pedState == AG_PEDSTATE_TAZED);
+}
+
+// ---------------------------------------------------------------------------
+
+function tazePlayer(client) {
+ getPlayerData(client).pedState = AG_PEDSTATE_TAZED;
+ setPlayerControlState(client, false);
+
+ setTimeout(function() {
+ unTazePlayer(client);
+ doActionToNearbyPlayers(client, `The tazer effect wears off`);
+ }, getGlobalConfig().tazerEffectDuration);
+}
+
+// ---------------------------------------------------------------------------
+
+function unTazePlayer(client) {
+ getPlayerData(client).pedState = AG_PEDSTATE_READY;
+ setPlayerControlState(client, true);
+}
+
+// ---------------------------------------------------------------------------
\ No newline at end of file
From 1a5940a9d2732e5ee4d05ae618c1457917ba6fdd Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:44:51 -0600
Subject: [PATCH 024/480] Fix walkie talkie utils
---
scripts/server/item/walkie-talkie.js | 29 ++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/scripts/server/item/walkie-talkie.js b/scripts/server/item/walkie-talkie.js
index 27a4e670..18374551 100644
--- a/scripts/server/item/walkie-talkie.js
+++ b/scripts/server/item/walkie-talkie.js
@@ -29,13 +29,15 @@ function getPlayerActiveWalkieTalkieFrequency(client) {
function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) {
walkieTalkieOutgoingToNearbyPlayers(transmittingPlayer, messageText);
- let clients = getPlayingClients();
+ let clients = getClients();
for(let i in clients) {
- if(!samePlayer(transmittingPlayer, clients[i])) {
- if(getPlayerActiveWalkieTalkieFrequency(clients[i]) == radioFrequency) {
- walkieTalkieIncomingToNearbyPlayers(clients[i], messageText);
- }
- }
+ if(isPlayerSpawned(clients[i])) {
+ if(!isSamePlayer(transmittingPlayer, clients[i])) {
+ if(getPlayerActiveWalkieTalkieFrequency(clients[i]) == radioFrequency) {
+ walkieTalkieIncomingToNearbyPlayers(clients[i], messageText);
+ }
+ }
+ }
}
}
@@ -44,7 +46,7 @@ function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) {
function walkieTalkieOutgoingToNearbyPlayers(client, messageText) {
let clients = getPlayersInRange(getPlayerPosition(client), getGlobalConfig().talkDistance);
for(let i in clients) {
- messagePlayerNormal(`[#CCCCCC]${getCharacterFullName(client)} [#AAAAAA](to radio): [#FFFFFF]${messageText}`);
+ messagePlayerNormal(clients[i], `[#CCCCCC]${getCharacterFullName(client)} [#AAAAAA](to radio): [#FFFFFF]${messageText}`);
}
}
@@ -53,7 +55,7 @@ function walkieTalkieOutgoingToNearbyPlayers(client, messageText) {
function walkieTalkieIncomingToNearbyPlayers(client, messageText) {
let clients = getPlayersInRange(getPlayerPosition(client), getGlobalConfig().walkieTalkieSpeakerDistance);
for(let i in clients) {
- messagePlayerNormal(`[#CCCCCC]${getCharacterFullName(client)} [#AAAAAA](from radio): [#FFFFFF]${messageText}`);
+ messagePlayerNormal(clients[i], `[#CCCCCC]${getCharacterFullName(client)} [#AAAAAA](from radio): [#FFFFFF]${messageText}`);
}
}
@@ -100,4 +102,15 @@ function setWalkieTalkieFrequencyCommand(command, params, client) {
messagePlayerSuccess(client, `You set the frequency of you walkie talkie in slot ${getPlayerData(client).activeHotbarSlot} to ${getItemValueDisplay(getPlayerActiveItem(client))}`)
}
+// ---------------------------------------------------------------------------
+
+function walkieTalkieChatCommand(command, params, client) {
+ if(areParamsEmpty(params)) {
+ messagePlayerSyntax(client, getCommandSyntaxText(command));
+ return false;
+ }
+
+ walkieTalkieTransmit(getPlayerActiveWalkieTalkieFrequency(client), params, client);
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From fcea55a8388bf96f1f9df2e2e9204cc4b14c2af9 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:45:27 -0600
Subject: [PATCH 025/480] Removed missing skins from SA game data array
---
scripts/shared/game-data.js | 82 ++++++++++++++++++++++---------------
1 file changed, 50 insertions(+), 32 deletions(-)
diff --git a/scripts/shared/game-data.js b/scripts/shared/game-data.js
index 4bbbb41c..58ccc6a7 100644
--- a/scripts/shared/game-data.js
+++ b/scripts/shared/game-data.js
@@ -1578,18 +1578,19 @@ let gameData = {
"Carl 'CJ' Johnson",
"The Truth",
"Maccer",
- "Andre",
- "Barry 'Big Bear' Thorne",
- "Emmet",
+ "INVALID",
+ "INVALID",
+ "INVALID",
"Taxi Driver/Train Driver",
"Janitor",
+ "Unknown",
"Normal Ped",
"Old Woman",
"Casino Croupier",
"Rich Woman",
"Street Girl",
"Normal Ped",
- "Mr.Whittaker (Rs Haul Owner)",
+ "Mr.Whittaker (RS Haul Owner)",
"Airport Ground Worker",
"Businessman",
"Beach Visitor",
@@ -1616,7 +1617,7 @@ let gameData = {
"Normal Ped",
"Normal Ped",
"Normal Ped",
- "Jethro",
+ "INVALID",
"Normal Ped",
"Normal Ped",
"Beach Visitor",
@@ -1639,7 +1640,7 @@ let gameData = {
"Colonel Fuhrberger",
"Prostitute",
"Prostitute",
- "Kendl Johnson",
+ "INVALID",
"Pool Player",
"Pool Player",
"Priest/Preacher",
@@ -1648,6 +1649,7 @@ let gameData = {
"Security Guard",
"Hippy",
"Hippy",
+ "INVALID",
"Prostitute",
"Stewardess",
"Homeless",
@@ -1659,7 +1661,7 @@ let gameData = {
"White Elvis",
"Blue Elvis",
"Prostitute",
- "Ryder With Robbery Mask",
+ "INVALID",
"Stripper",
"Normal Ped",
"Normal Ped",
@@ -1675,32 +1677,32 @@ let gameData = {
"Rollerskater",
"Biker",
"Normal Ped",
- "Balla",
- "Balla",
- "Balla",
- "Grove Street Families",
- "Grove Street Families",
- "Grove Street Families",
- "Los Santos Vagos",
- "Los Santos Vagos",
- "Los Santos Vagos",
- "The Russian Mafia",
- "The Russian Mafia",
- "The Russian Mafia",
- "Varios Los Aztecas",
- "Varios Los Aztecas",
- "Varios Los Aztecas",
+ "Ballas Gang Member",
+ "Ballas Gang Member",
+ "Ballas Gang Member",
+ "Grove Street Families Gang Member",
+ "Grove Street Families Gang Member",
+ "Grove Street Families Gang Member",
+ "Los Santos Vagos Gang Member",
+ "Los Santos Vagos Gang Member",
+ "Los Santos Vagos Gang Member",
+ "Russian Mafioso",
+ "Russian Mafioso",
+ "Russian Mafioso",
+ "Varios Los Aztecas Gang Member",
+ "Varios Los Aztecas Gang Member",
+ "Varios Los Aztecas Gang Member",
"Triad",
"Triad",
- "Johhny Sindacco",
+ "INVALID",
"Triad Boss",
"Da Nang Boy",
"Da Nang Boy",
"Da Nang Boy",
- "The Mafia",
- "The Mafia",
- "The Mafia",
- "The Mafia",
+ "Italian Mafioso",
+ "Italian Mafioso",
+ "Italian Mafioso",
+ "Italian Mafioso",
"Farm Inhabitant",
"Farm Inhabitant",
"Farm Inhabitant",
@@ -1722,7 +1724,7 @@ let gameData = {
"Crack Maker",
"Businessman",
"Businesswoman",
- "Big Smoke Armored",
+ "INVALID",
"Businesswoman",
"Normal Ped",
"Prostitute",
@@ -1781,7 +1783,7 @@ let gameData = {
"Burger Shot Cashier",
"Cab Driver",
"Prostitute",
- "Su Xi Mu (Suzie)",
+ "INVALID",
"Oriental Noodle Stand Vendor",
"Oriental Boating School Instructor",
"Clothes Shop Staff",
@@ -1846,7 +1848,7 @@ let gameData = {
"Sean 'Sweet' Johnson",
"Lance 'Ryder' Wilson",
"Mafia Boss",
- "T-Bone Mendez",
+ "INVALID",
"Paramedic",
"Paramedic",
"Paramedic",
@@ -1862,7 +1864,7 @@ let gameData = {
"Federal Agent",
"Army Soldier",
"Desert Sheriff",
- "Zero",
+ "INVALID",
"Ken Rosenberg",
"Kent Paul",
"Cesar Vialpando",
@@ -1872,7 +1874,23 @@ let gameData = {
"Jizzy B.",
"Madd Dogg",
"Catalina",
- "Claude Speed"
+ "Claude Speed",
+
+ // 300
+ "Lance 'Ryder' Wilson 2",
+ "Lance 'Ryder' Wilson (robbery mask)",
+ "Emmet",
+ "Andre",
+ "Denise",
+ "Jethro",
+ "Zero",
+ "T-Bone Mendez",
+ "Johnny Sindacco",
+ "Janitor",
+ "Barry 'Big Bear' Thorne (Skinny)",
+ "Melvin 'Big Smoke' Harris (Vest)",
+ "Psycho",
+ "Barry 'Big Bear' Thorne (Fat)",
],
],
weaponModels: [
From 0c56f8044cd44ef435608fede8b12d2b8c0db0ec Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:45:49 -0600
Subject: [PATCH 026/480] Add basic non-OOP utils so shared native
---
scripts/shared/native.js | 42 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/scripts/shared/native.js b/scripts/shared/native.js
index 413d5c23..d7f24717 100644
--- a/scripts/shared/native.js
+++ b/scripts/shared/native.js
@@ -13,6 +13,42 @@ setErrorMode(RESOURCEERRORMODE_STRICT);
// ---------------------------------------------------------------------------
+function and(var1, var2) {
+ return (var1 && var2);
+}
+
+// ---------------------------------------------------------------------------
+
+function or(var1, var2) {
+ return (var1 || var2);
+}
+
+// ---------------------------------------------------------------------------
+
+function not(var1) {
+ return !var1;
+}
+
+// ---------------------------------------------------------------------------
+
+function gt(var1, var2) {
+ return (var1 > var2);
+}
+
+// ---------------------------------------------------------------------------
+
+function lt(var1, var2) {
+ return (var1 < var2);
+}
+
+// ---------------------------------------------------------------------------
+
+function eq(var1, var2) {
+ return (var1 == var2);
+}
+
+// ---------------------------------------------------------------------------
+
function toInteger(val) {
return Number(val);
}
@@ -144,4 +180,10 @@ function isSamePlayer(client1, client2) {
return (client1 == client2);
}
+// ---------------------------------------------------------------------------
+
+function getClientFromIndex(index) {
+ return getClients().find(c => c.index == index);
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From 700db9c905ae04d5a3ee5bcb5b33ea6a9a5d27c8 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:39:45 -0600
Subject: [PATCH 027/480] Add debug logging, fix wep damage event trigger
---
scripts/client/main.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/client/main.js b/scripts/client/main.js
index 54101eca..699b922b 100644
--- a/scripts/client/main.js
+++ b/scripts/client/main.js
@@ -636,7 +636,7 @@ function enteredJobRouteSphere() {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.jobType", function(tempJobType) {
- logToConsole(LOG_INFO, `[Asshat.Main] Set local player job type to ${tempJobType}`);
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Set local player job type to ${tempJobType}`);
localPlayerJobType = tempJobType;
});
@@ -656,21 +656,21 @@ addNetworkHandler("ag.spawned", function(client, state) {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.weaponDamageEvent", function(clientName, eventType) {
- logToConsole(LOG_INFO, `[Asshat.Main] Set ${clientName} damage event type to ${eventType}`);
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Set ${clientName} damage event type to ${eventType}`);
weaponDamageEvent[clientName] = eventType;
});
// ---------------------------------------------------------------------------
addNetworkHandler("ag.weaponDamageEnabled", function(clientName, state) {
- logToConsole(LOG_INFO, `[Asshat.Main] ${(state)?"Enabled":"Disabled"} damage from ${clientName}`);
+ logToConsole(LOG_DEBUG, `[Asshat.Main] ${(state)?"Enabled":"Disabled"} damage from ${clientName}`);
weaponDamageEnabled[clientName] = state;
});
// ---------------------------------------------------------------------------
addNetworkHandler("ag.mouseCamera", function(state) {
- logToConsole(LOG_INFO, `[Asshat.Main] ${(state)?"Enabled":"Disabled"} mouse camera`);
+ logToConsole(LOG_DEBUG, `[Asshat.Main] ${(state)?"Enabled":"Disabled"} mouse camera`);
mouseCameraEnabled = !mouseCameraEnabled;
SetStandardControlsEnabled(!mouseCameraEnabled);
});
@@ -715,7 +715,7 @@ addEventHandler("OnPedInflictDamage", function(event, damagedPed, damagerEntity,
if(damagedPed == localPlayer) {
if(!weaponDamageEnabled[damagerEntity.name]) {
event.preventDefault();
- triggerNetworkEvent(player, "ag.weaponDamage", damagerEntity, weaponId, pedPiece);
+ triggerNetworkEvent("ag.weaponDamage", damagerEntity, weaponId, pedPiece);
}
}
});
From e7bc28255ab0489d0c3a607af611faf83e1452cb Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:40:23 -0600
Subject: [PATCH 028/480] Move prompt type from entity data to client data
---
scripts/server/account.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/server/account.js b/scripts/server/account.js
index dddb9903..8166dcec 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -423,7 +423,7 @@ function loginSuccess(client) {
if(getPlayerData(client).subAccounts.length == 0) {
if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) {
showPlayerPromptGUI(client, "You have no characters. Would you like to make one?", "No characters");
- setEntityData(client, "ag.prompt", AG_PROMPT_CREATEFIRSTCHAR, false);
+ getPlayerData(client).promptType = AG_PROMPT_CREATEFIRSTCHAR;
logToConsole(LOG_DEBUG, `[Asshat.Account] ${getPlayerDisplayForConsole(client)} is being shown the no characters prompt GUI`);
} else {
messagePlayerAlert(client, `You have no characters. Use /newchar to make one.`);
@@ -690,7 +690,7 @@ function checkRegistration(client, password, confirmPassword = "", emailAddress
if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) {
showPlayerRegistrationSuccessGUI(client);
showPlayerPromptGUI(client, "You have no characters. Would you like to make one?", "No Characters");
- setEntityData(client, "ag.prompt", AG_PROMPT_CREATEFIRSTCHAR, false);
+ getPlayerData(client).promptType = AG_PROMPT_CREATEFIRSTCHAR;
} else {
messagePlayerAlert(client, `You have no characters. Use /newchar to make one.`);
}
From cbfb6180c6767989bdda6fe5c3aec5aa31eab659 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:41:13 -0600
Subject: [PATCH 029/480] Show confirm GUI on bizorder, fix set pickup cmd
---
scripts/server/business.js | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/scripts/server/business.js b/scripts/server/business.js
index 1a55f7cd..10d3764d 100644
--- a/scripts/server/business.js
+++ b/scripts/server/business.js
@@ -514,7 +514,7 @@ function withdrawFromBusinessCommand(command, params, client) {
getServerData().businesses[businessId].till -= amount;
getPlayerCurrentSubAccount(client).cash += amount;
updatePlayerCash(client);
- messagePlayerSuccess(client, `You withdrew $${amount} from business '${tempBusinessData.name}''s till'`);
+ messagePlayerSuccess(client, `You withdrew $${amount} from business [#0099FF]${tempBusinessData.name} till'`);
}
// ---------------------------------------------------------------------------
@@ -543,7 +543,7 @@ function depositIntoBusinessCommand(command, params, client) {
getServerData().businesses[businessId].till += amount;
getPlayerCurrentSubAccount(client).cash -= amount;
updatePlayerCash(client);
- messagePlayerSuccess(client, `You deposited $${amount} into business '${tempBusinessData.name}''s till'`);
+ messagePlayerSuccess(client, `You deposited $${amount} into business [#0099FF]${tempBusinessData.name} [#FFFFFF]till'`);
}
// ---------------------------------------------------------------------------
@@ -556,9 +556,9 @@ function orderItemForBusinessCommand(command, params, client) {
let splitParams = params.split(" ");
- let itemType = getItemTypeFromParams(splitParams[0]);
- let amount = toInteger(splitParams[1]) || 1;
- let sellPrice = toInteger(splitParams[2]) || 0;
+ let itemType = getItemTypeFromParams(splitParams.slice(0,-2).join(" "));
+ let amount = toInteger(splitParams.slice(-2,-1)) || 1;
+ let sellPrice = toInteger(splitParams.slice(-1)) || 0;
let businessId = (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
if(!getBusinessData(businessId)) {
@@ -572,8 +572,20 @@ function orderItemForBusinessCommand(command, params, client) {
return false;
}
- let orderTotalCost = getItemTypeData(itemType).orderPrice*getServerConfig().inflationMultiplier*getItemTypeData(itemType).demandMultiplier*getItemTypeData(itemType).supplyMultiplier*getItemTypeData(itemType).riskMultiplier*amount;
+ let pricePerItem = getItemTypeData(itemType).orderPrice*getServerConfig().inflationMultiplier*getItemTypeData(itemType).demandMultiplier*getItemTypeData(itemType).supplyMultiplier*getItemTypeData(itemType).riskMultiplier;
+ let orderTotalCost = pricePerItem*amount;
+ getPlayerData(client).promptType = AG_PROMPT_BIZORDER;
+ getPlayerData(client).businessOrderAmount = amount;
+ getPlayerData(client).businessOrderBusiness = businessId;
+ getPlayerData(client).businessOrderItem = itemType;
+
+ showPlayerPromptGUI(client, `This order will cost [#AAAAAA]$${orderTotalCost} (${amount} at $${pricePerItem} each)`, "Business Order Cost");
+}
+
+// ---------------------------------------------------------------------------
+
+function orderItemForBusiness(businessId, itemType, amount, sellPrice) {
if(getBusinessData(businessId).till < orderTotalCost) {
let neededAmount = orderTotalCost-getBusinessData(businessId).till;
messagePlayerError(client, `The business doesn't have enough money (needs [#AAAAAA]$${neededAmount} [#FFFFFF]more)! Use [#AAAAAA]/bizdeposit [#FFFFFF]to add money to the business.`);
@@ -942,7 +954,7 @@ function deleteBusinessEntrancePickup(businessId) {
if(getBusinessData(businessId).entrancePickup != null) {
//removeFromWorld(getBusinessData(businessId).entrancePickup);
destroyElement(getBusinessData(businessId).entrancePickup);
- getBusinessData(businessId).entrancePickup = false;
+ getBusinessData(businessId).entrancePickup = null;
}
}
@@ -952,7 +964,7 @@ function deleteBusinessExitPickup(businessId) {
if(getBusinessData(businessId).exitPickup != null) {
//removeFromWorld(getBusinessData(businessId).exitPickup);
destroyElement(getBusinessData(businessId).exitPickup);
- getBusinessData(businessId).exitPickup = false;
+ getBusinessData(businessId).exitPickup = null;
}
}
@@ -962,7 +974,7 @@ function deleteBusinessEntranceBlip(businessId) {
if(getBusinessData(businessId).entranceBlip != null) {
//removeFromWorld(getBusinessData(businessId).entranceBlip);
destroyElement(getBusinessData(businessId).entranceBlip);
- getBusinessData(businessId).entranceBlip = false;
+ getBusinessData(businessId).entranceBlip = null;
}
}
@@ -972,7 +984,7 @@ function deleteBusinessExitBlip(businessId) {
if(getBusinessData(businessId).exitBlip != null) {
//removeFromWorld(getBusinessData(businessId).exitBlip);
destroyElement(getBusinessData(businessId).exitBlip);
- getBusinessData(businessId).exitBlip = false;
+ getBusinessData(businessId).exitBlip = null;
}
}
From 874166184d55941a6de1f2c343a97df43a97a11a Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:41:34 -0600
Subject: [PATCH 030/480] Add inflation multiplier to server config class
---
scripts/server/class.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/server/class.js b/scripts/server/class.js
index 2c60e277..15bcf358 100644
--- a/scripts/server/class.js
+++ b/scripts/server/class.js
@@ -44,6 +44,7 @@ function initClassTable() {
this.useGUI = true;
this.guiColour = [200, 200, 200];
this.showLogo = true;
+ this.inflationMultiplier = 1;
this.antiCheat = {
enabled: false,
@@ -141,6 +142,12 @@ function initClassTable() {
this.alcoholLevel = 0;
this.pedState = AG_PEDSTATE_NONE;
+
+ this.promptType = AG_PROMPT_NONE;
+
+ this.businessOrderAmount = 0;
+ this.businessOrderBusiness = -1;
+ this.businessOrderItem = -1;
}
},
accountData: class {
From e0e7ccec5b27c260252c3b09100ab7d6f29af0fb Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:42:12 -0600
Subject: [PATCH 031/480] Check if delay > 0 before showing item delay
---
scripts/server/client.js | 50 ++++++++++++++++++++++++++++++++--------
1 file changed, 40 insertions(+), 10 deletions(-)
diff --git a/scripts/server/client.js b/scripts/server/client.js
index 4ad4adf0..5b1298eb 100644
--- a/scripts/server/client.js
+++ b/scripts/server/client.js
@@ -475,36 +475,66 @@ function sendChatBoxMessageToPlayer(client, message, colour) {
// ---------------------------------------------------------------------------
function showPlayerItemTakeDelay(client, itemId) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item take delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(itemId).itemTypeIndex).takeDelay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(itemId).itemTypeIndex).takeDelay);
+ let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playerTakeItem(client, itemId);
+ }
}
// ---------------------------------------------------------------------------
function showPlayerItemUseDelay(client, itemSlot) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item use delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).useDelay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).useDelay);
+ let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).useDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playeUseItem(client, itemSlot);
+ }
}
// ---------------------------------------------------------------------------
function showPlayerItemDropDelay(client, itemSlot) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item drop delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).dropDelay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).dropDelay);
+ let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).dropDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playerDropItem(client, itemSlot);
+ }
}
// ---------------------------------------------------------------------------
function showPlayerItemPickupDelay(client, itemId) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item pickup delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay);
+ let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playerPickupItem(client, itemId);
+ }
}
// ---------------------------------------------------------------------------
function showPlayerItemPutDelay(client, itemSlot) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item put delay to ${getPlayerDisplayForConsole(client)} (${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).putDelay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).putDelay);
+ let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).putDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playerPutItem(client, itemSlot);
+ }
}
// ---------------------------------------------------------------------------
From 946b394fab008a1104efffc4317b4374afb9dc65 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:43:47 -0600
Subject: [PATCH 032/480] Change description of bizorder cmd
---
scripts/server/command.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/scripts/server/command.js b/scripts/server/command.js
index 1ac314a4..cf4d2526 100644
--- a/scripts/server/command.js
+++ b/scripts/server/command.js
@@ -28,7 +28,7 @@ let builtInCommands = [
function initCommandScript() {
logToConsole(LOG_DEBUG, "[Asshat.Command]: Initializing commands script ...");
serverCommands = loadCommands();
- addAllCommandHandlers();
+ //addAllCommandHandlers();
logToConsole(LOG_DEBUG, "[Asshat.Command]: Initialized commands script!");
}
@@ -71,7 +71,7 @@ function loadCommands() {
commandData("buy", buyFromBusinessCommand, " [amount]", getStaffFlagValue("none"), true, true, "Buy items from a business"),
commandData("bizstock", stockItemOnBusinessFloorCommand, "- ", getStaffFlagValue("none"), true, true, "Uses storage items to restock the business with."),
commandData("bizstore", storeItemInBusinessStorageCommand, "
- ", getStaffFlagValue("none"), true, true, "Moves items from the business to the business storage"),
- commandData("bizorder", orderItemForBusinessCommand, "
- ", getStaffFlagValue("none"), true, true, "Moves items from the business storage to the business."),
+ commandData("bizorder", orderItemForBusinessCommand, "
- ", getStaffFlagValue("none"), true, true, "Orders items to sell from a business"),
commandData("bizitemprice", setBusinessItemSellPriceCommand, "
- ", getStaffFlagValue("none"), true, true, "Sets the purchase price of a business item"),
commandData("bizname", setBusinessNameCommand, "", getStaffFlagValue("none"), true, true, "Changes a business name"),
commandData("bizowner", setBusinessOwnerCommand, "", getStaffFlagValue("none"), true, true, "Changes the owner of a business"),
@@ -327,6 +327,8 @@ function loadCommands() {
};
}
+// ---------------------------------------------------------------------------
+
function addAllCommandHandlers() {
for(let i in serverCommands) {
for(let j in serverCommands[i]) {
@@ -482,7 +484,7 @@ function enableAllCommandsByType(command, params, client) {
// ---------------------------------------------------------------------------
function onPlayerCommand(event, client, command, params) {
- //processPlayerCommand(command, params, client)
+ processPlayerCommand(command, params, client)
}
addEventHandler("OnPlayerCommand", onPlayerCommand);
From c143b6b43e7fcc92bc2bcb638a10d42cad7953b8 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:43:59 -0600
Subject: [PATCH 033/480] Add new prompt consts
---
scripts/server/const.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/server/const.js b/scripts/server/const.js
index 1b9e9f9c..a020dbde 100644
--- a/scripts/server/const.js
+++ b/scripts/server/const.js
@@ -9,7 +9,9 @@
// ===========================================================================
// Prompts (used for client GUI prompt responses)
+const AG_PROMPT_NONE = 0;
const AG_PROMPT_CREATEFIRSTCHAR = 1;
+const AG_PROMPT_BIZORDER = 2;
// Job Types
const AG_JOB_NONE = 0;
From 359a3ce0d79982343e68958141e58ba6d7fc8bf1 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:44:12 -0600
Subject: [PATCH 034/480] Change server log level from debug to all
---
scripts/server/core.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/server/core.js b/scripts/server/core.js
index ecd81a92..a1f79100 100644
--- a/scripts/server/core.js
+++ b/scripts/server/core.js
@@ -10,7 +10,7 @@
let scriptVersion = "1.0";
let serverStartTime = 0;
-let logLevel = LOG_DEBUG;
+let logLevel = LOG_ALL;
// -------------------------------------------------------------------------
From bf0c19d082a23cb8aebeb63edcf5cf6d5bd50a96 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:44:30 -0600
Subject: [PATCH 035/480] Check player spawning on process
---
scripts/server/event.js | 41 +++++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/scripts/server/event.js b/scripts/server/event.js
index 62855ee0..7f3a920e 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -87,6 +87,7 @@ function onPlayerChat(event, client, messageText) {
function onProcess(event, deltaTime) {
checkVehicleBuying();
+ checkPlayerSpawning();
}
// ---------------------------------------------------------------------------
@@ -277,24 +278,25 @@ function onPlayerDeath(client, position) {
// ---------------------------------------------------------------------------
function onPedSpawn(ped) {
- if(ped.type == ELEMENT_PLAYER) {
- setTimeout(onPlayerSpawn, 500, ped);
- }
+ //if(ped.type == ELEMENT_PLAYER) {
+ // setTimeout(onPlayerSpawn, 500, ped);
+ //}
}
// ---------------------------------------------------------------------------
function onPlayerSpawn(ped) {
- logToConsole(LOG_DEBUG, `[Asshat.Event] Checking for ${getPlayerDisplayForConsole(client)}'s client element`);
+ //logToConsole(LOG_DEBUG, `[Asshat.Event] Checking for ${getPlayerDisplayForConsole(client)}'s client element`);
if(getClientFromPlayerElement(ped) == null) {
logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s client element not set yet. Rechecking ...`);
setTimeout(onPlayerSpawn, 500, ped);
return false;
}
+ let client = getClientFromPlayerElement(ped);
+
logToConsole(LOG_DEBUG, `[Asshat.Event] ${getPlayerDisplayForConsole(client)}'s client element is valid.`);
- let client = getClientFromPlayerElement(ped);
logToConsole(LOG_DEBUG, `[Asshat.Event] Checking ${getPlayerDisplayForConsole(client)}'s player data`);
if(!getPlayerData(client)) {
@@ -318,15 +320,35 @@ function onPlayerSpawn(ped) {
messagePlayerAlert(client, `You are now playing as: [#0099FF]${getCharacterFullName(client)}`, getColourByName("white"));
messagePlayerNormal(client, "This server is in early development and may restart at any time for updates.", getColourByName("orange"));
messagePlayerNormal(client, "Please report any bugs using /bug and suggestions using /idea", getColourByName("yellow"));
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Updating spawned state for ${getPlayerDisplayForConsole(client)} to true`);
updatePlayerSpawnedState(client, true);
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Setting player interior to ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).interior}`);
setPlayerInterior(client, getPlayerCurrentSubAccount(client).interior);
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Setting player dimension to ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).dimension}`);
setPlayerDimension(client, getPlayerCurrentSubAccount(client).dimension);
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Updating all player name tags`);
updateAllPlayerNameTags();
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Syncing ${getPlayerDisplayForConsole(client)}'s cash ${getPlayerCurrentSubAccount(client).cash}`);
updatePlayerCash(client);
- sendPlayerJobType(client, getJobIndexFromDatabaseId(getPlayerCurrentSubAccount(client)));
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Sending ${getPlayerDisplayForConsole(client)}'s job type to their client (${getJobIndexFromDatabaseId(getPlayerCurrentSubAccount(client))})`);
+ sendPlayerJobType(client, getPlayerCurrentSubAccount(client).job);
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Enabling all rendering states for ${getPlayerDisplayForConsole(client)}`);
setPlayer2DRendering(client, true, true, true, true, true, true);
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Sending snow states to ${getPlayerDisplayForConsole(client)}`);
updatePlayerSnowState(client);
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Sending ground snow excluded models to ${getPlayerDisplayForConsole(client)}`);
sendExcludedModelsForGroundSnowToPlayer(client);
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Sending removed world objects to ${getPlayerDisplayForConsole(client)}`);
sendRemovedWorldObjectsToPlayer(client);
//setEntityData(client.player, "ag.scale", getPlayerCurrentSubAccount(client).pedScale, true);
@@ -335,14 +357,21 @@ function onPlayerSpawn(ped) {
// syncPlayerProperties(client);
//}, 1000);
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Updating logo state for ${getPlayerDisplayForConsole(client)}`);
if(getServerConfig().showLogo && doesPlayerHaveLogoEnabled(client)) {
updatePlayerShowLogoState(client, true);
}
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Caching ${getPlayerDisplayForConsole(client)}'s hotbar items`);
cachePlayerHotBarItems(client);
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Syncing ${getPlayerDisplayForConsole(client)}'s hotbar`);
updatePlayerHotBar(client);
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Setting ${getPlayerDisplayForConsole(client)}'s switchchar state to false`);
getPlayerData(client).switchingCharacter = false;
+
+ logToConsole(LOG_DEBUG, `[Asshat.Event] Setting ${getPlayerDisplayForConsole(client)}'s ped state to ready`);
getPlayerData(client).pedState = AG_PEDSTATE_READY;
}
From 98dc420a32caa7a56a616508a8327f69c51b3e89 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:45:03 -0600
Subject: [PATCH 036/480] Add bizorder prompt GUI handling
---
scripts/server/gui.js | 55 ++++++++++++++++++++++++++++++++++++-------
1 file changed, 47 insertions(+), 8 deletions(-)
diff --git a/scripts/server/gui.js b/scripts/server/gui.js
index 2c2447a2..128cec0e 100644
--- a/scripts/server/gui.js
+++ b/scripts/server/gui.js
@@ -11,44 +11,83 @@
// ---------------------------------------------------------------------------
function playerPromptAnswerNo(client) {
- if(!getEntityData(client, "ag.prompt")) {
+ if(getPlayerData(client).promptType == AG_PROMPT_NONE) {
return false;
}
- logToConsole(LOG_DEBUG, `[Asshat.GUI] ${getPlayerDisplayForConsole(client)} answered NO to their prompt (${getEntityData(client, "ag.prompt")})`);
+ logToConsole(LOG_DEBUG, `[Asshat.GUI] ${getPlayerDisplayForConsole(client)} answered NO to their prompt (${getPlayerData(client).promptType})`);
- switch(getEntityData(client, "ag.prompt")) {
+ switch(getPlayerData(client).promptType) {
case AG_PROMPT_CREATEFIRSTCHAR:
showPlayerErrorGUI(client, "You don't have a character to play. Goodbye!", "No Characters")
setTimeout(function() { client.disconnect(); }, 5000);
break;
+ case AG_PROMPT_BIZORDER:
+ if(getPlayerData(client).businessOrderAmount > 0) {
+ if(canPlayerUseGUI(client)) {
+ showPlayerErrorGUI(client, "You canceled the order.", "Business Order Canceled");
+ } else {
+ logToConsole(LOG_DEBUG, `${getPlayerDisplayForConsole(client)} canceled the order of ${getPlayerData(client).businessOrderAmount} ${getPlayerData(client).businessOrderItem} at ${getPlayerData(client).businessOrderCost/getPlayerData(client).businessOrderAmount} each for business ${getBusinessData(getPlayerData(client).businessOrderBusiness)}`);
+ messagePlayerError(client, "You canceled the order!");
+ }
+ } else {
+ showPlayerErrorGUI(client, "You aren't ordering anything for a business!", "Business Order Canceled");
+ }
+ break;
+
default:
break;
}
- client.removeData("ag.prompt");
+ getPlayerData(client).promptType = AG_PROMPT_NONE;
}
// ---------------------------------------------------------------------------
function playerPromptAnswerYes(client) {
- if(!getEntityData(client, "ag.prompt")) {
+ if(getPlayerData(client).promptType == AG_PROMPT_NONE) {
return false;
}
- logToConsole(LOG_DEBUG, `[Asshat.GUI] ${getPlayerDisplayForConsole(client)} answered YES to their prompt (${getEntityData(client, "ag.prompt")})`);
+ logToConsole(LOG_DEBUG, `[Asshat.GUI] ${getPlayerDisplayForConsole(client)} answered YES to their prompt (${getPlayerData(client).promptType})`);
- switch(getEntityData(client, "ag.prompt")) {
+ switch(getPlayerData(client).promptType) {
case AG_PROMPT_CREATEFIRSTCHAR:
showPlayerNewCharacterGUI(client);
break;
+ case AG_PROMPT_BIZORDER:
+ if(getPlayerData(client).businessOrderAmount > 0) {
+ if(getPlayerData(client).businessOrderCost > getBusinessData(getPlayerData(client).businessOrderBusiness).till) {
+ logToConsole(LOG_DEBUG, `[Asshat.GUI] ${getPlayerDisplayForConsole(client)} failed to order ${getPlayerData(client).businessOrderAmount} ${getPlayerData(client).businessOrderItem} at ${getPlayerData(client).businessOrderCost/getPlayerData(client).businessOrderAmount} each for business ${getBusinessData(getPlayerData(client).businessOrderBusiness)} (Reason: Not enough money in business till)`);
+ showPlayerErrorGUI(client, "This business doesn't have enough money! Deposit some using /bizdeposit", "Business Order Canceled");
+ getPlayerData(client).businessOrderAmount = 0;
+ getPlayerData(client).businessOrderBusiness = false;
+ getPlayerData(client).businessOrderItem = -1;
+ } else {
+ logToConsole(LOG_DEBUG, `${getPlayerDisplayForConsole(client)} successfully ordered ${getPlayerData(client).businessOrderAmount} ${getPlayerData(client).businessOrderItem} at ${getPlayerData(client).businessOrderCost/getPlayerData(client).businessOrderAmount} each for business ${getBusinessData(getPlayerData(client).businessOrderBusiness)}`);
+ showPlayerInfoGUI(client, `[Asshat.GUI] You ordered ${getPlayerData(client).businessOrderAmount} ${getPlayerData(client).businessOrderItem} for ${getPlayerData(client).businessOrderCost}!`, "Business Order Successful");
+ getPlayerData(client).businessOrderAmount = 0;
+ getPlayerData(client).businessOrderBusiness = false;
+ getPlayerData(client).businessOrderItem = -1;
+ }
+ } else {
+ showPlayerErrorGUI(client, `You aren't ordering anything for a business!`, `Business Order Canceled`);
+ }
+ break;
+
default:
break;
}
- client.removeData("ag.prompt");
+ getPlayerData(client).promptType = AG_PROMPT_NONE;
+}
+
+// ---------------------------------------------------------------------------
+
+function canPlayerUseGUI(client) {
+ return (getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client));
}
// ---------------------------------------------------------------------------
\ No newline at end of file
From 4e63b78258c75ca67a21d9c9501fb03fb63765c6 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:45:20 -0600
Subject: [PATCH 037/480] Just change skin for job uniform, dont use item
---
scripts/server/item.js | 62 +++++++++++++++++++++++++++++-------------
1 file changed, 43 insertions(+), 19 deletions(-)
diff --git a/scripts/server/item.js b/scripts/server/item.js
index 14619472..06df3ca3 100644
--- a/scripts/server/item.js
+++ b/scripts/server/item.js
@@ -351,7 +351,14 @@ function playerUseItem(client, hotBarSlot) {
switch(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useType) {
case AG_ITEM_USETYPE_SKIN:
let oldSkin = getPlayerSkin(client);
+ if(isPlayerWorking(client)) {
+ oldSkin = getPlayerCurrentSubAccount(client).skin;
+ }
+
let newSkin = getItemData(itemIndex).value;
+ if(isPlayerWorking(client)) {
+ newSkin = getPlayerCurrentSubAccount(client).skin;
+ }
setPlayerSkin(client, newSkin);
getItemData(itemIndex).value = oldSkin;
meActionToNearbyPlayers(client, `puts on ${getProperDeterminerForName(getSkinNameFromId(newSkin))} ${getSkinNameFromId(newSkin)} ${toLowerCase(getItemName(itemIndex))}`);
@@ -487,6 +494,8 @@ function playerDropItem(client, hotBarSlot) {
if(itemId != -1) {
meActionToNearbyPlayers(client, `drops ${getProperDeterminerForName(getItemName(itemId))} ${getItemName(itemId)} on the ground`);
+ resyncWeaponItemAmmo(client);
+
getPlayerData(client).hotBarItems[hotBarSlot] = -1;
updatePlayerHotBar(client);
@@ -524,6 +533,8 @@ function playerPutItem(client, hotBarSlot) {
break;
}
+ resyncWeaponItemAmmo(client);
+
getItemData(itemId).ownerType = ownerType;
getItemData(itemId).ownerId = ownerId;
getItemData(itemId).position = toVector(0.0, 0.0, 0.0);
@@ -603,15 +614,18 @@ function playerSwitchItem(client, newHotBarSlot) {
newHotBarItem = getPlayerData(client).hotBarItems[newHotBarSlot];
}
+ resyncWeaponItemAmmo(client);
+
if(currentHotBarItem != -1) {
if(getItemData(currentHotBarItem)) {
if(getGlobalConfig().weaponEquippableTypes.indexOf(getItemTypeData(getItemData(currentHotBarItem).itemTypeIndex).useType) != -1) {
- getItemData(currentHotBarItem).value = getPlayerWeaponAmmo(client);
clearPlayerWeapons(client);
}
}
}
+
+
if(newHotBarItem != -1) {
if(getItemData(newHotBarItem)) {
if(getItemTypeData(getItemData(newHotBarItem).itemTypeIndex).useType == AG_ITEM_USETYPE_WEAPON) {
@@ -892,6 +906,16 @@ function listPlayerInventoryCommand(command, params, client) {
if(getPlayerData(client).hotBarItems[i] == -1) {
itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA](Empty)`);
} else {
+ if(getGlobalConfig().weaponEquippableTypes.indexOf(getItemTypeData(getItemData(getPlayerData(client).hotBarItems[i]).itemTypeIndex).useType)) {
+ if(getPlayerData(client).hotBarItems[i] == getPlayerData(client).hotBarItems[getPlayerData(client).currentHotBarItem]) {
+ if(getPlayerWeaponAmmo(client) <= getItemData(getPlayerData(client).hotBarItems[i]).value) {
+ getItemData(getPlayerData(client).hotBarItems[i]).value = getPlayerWeaponAmmo(client);
+ } else {
+ setPlayerWeaponAmmo(client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[i]).itemTypeIndex).useId, getItemData(getPlayerData(client).hotBarItems[i]).value);
+ }
+ }
+ }
+
itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[i]).itemTypeIndex).name}[${getItemValueDisplay(getPlayerData(client).hotBarItems[i])}]`);
}
}
@@ -1059,24 +1083,6 @@ function listItemInventoryCommand(command, params, client) {
// ---------------------------------------------------------------------------
-function stockItemOnBusinessFloorCommand(command, params, client) {
-
-}
-
-// ---------------------------------------------------------------------------
-
-function storeItemInBusinessStorageCommand(command, params, client) {
-
-}
-
-// ---------------------------------------------------------------------------
-
-function orderItemForBusinessCommand(command, params, client) {
-
-}
-
-// ---------------------------------------------------------------------------
-
function getItemData(itemId) {
return getServerData().items[itemId];
}
@@ -1275,4 +1281,22 @@ function getPlayerItemSlot(client, slot) {
}
}
+// ---------------------------------------------------------------------------
+
+function resyncWeaponItemAmmo(client) {
+ if(getPlayerData(client).currentHotBarItem != -1) {
+ if(getPlayerData(client).hotBarItems[getPlayerData(client).currentHotBarItem] != -1) {
+ if(getItemData(getPlayerData(client).hotBarItems[getPlayerData(client).currentHotBarItem])) {
+ if(getGlobalConfig().weaponEquippableTypes.indexOf(getItemTypeData(getItemData(getPlayerData(client).hotBarItems[getPlayerData(client).currentHotBarItem]).itemTypeIndex).useType)) {
+ if(getPlayerWeaponAmmo(client) <= getItemData(getPlayerData(client).hotBarItems[getPlayerData(client).currentHotBarItem]).value) {
+ getItemData(getPlayerData(client).hotBarItems[getPlayerData(client).currentHotBarItem]).value = getPlayerWeaponAmmo(client);
+ } else {
+ setPlayerWeaponAmmo(client, getItemTypeData(getItemData(getPlayerData(client).hotBarItems[getPlayerData(client).currentHotBarItem]).itemTypeIndex).useId, getItemData(getPlayerData(client).hotBarItems[getPlayerData(client).currentHotBarItem]).value);
+ }
+ }
+ }
+ }
+ }
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From 3c0e44479c7481ed7db573df1e7ae0f6fcf6c7fb Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:45:40 -0600
Subject: [PATCH 038/480] Just set skin for job uniform, dont use item
---
scripts/server/job.js | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/scripts/server/job.js b/scripts/server/job.js
index 837140ea..8791a191 100644
--- a/scripts/server/job.js
+++ b/scripts/server/job.js
@@ -533,6 +533,7 @@ function stopWorking(client) {
getPlayerCurrentSubAccount(client).lastJobVehicle = false;
}
+ setPlayerSkin(client, getPlayerCurrentSubAccount(client).skin);
deleteJobItems(client);
restorePlayerJobLockerItems(client);
@@ -607,13 +608,15 @@ function jobUniformCommand(command, params, client) {
return false;
}
- messagePlayerSuccess(client, `You have been given a [#AAAAAA]${uniforms[uniformId-1].name} [#FFFFFF]uniform and you can put it on from your inventory.`);
+ setPlayerSkin(client, getJobData(jobId).uniforms[uniformId-1].skin);
- let itemId = createItem(getItemTypeFromParams("Outfit"), getJobData(jobId).uniforms[uniformId-1].skin, AG_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
- let freeSlot = getPlayerFirstEmptyHotBarSlot(client);
- getPlayerData(client).hotBarItems[freeSlot] = itemId;
- getPlayerData(client).jobEquipmentCache.push(itemId);
- updatePlayerHotBar(client);
+ //messagePlayerSuccess(client, `You have been given a [#AAAAAA]${uniforms[uniformId-1].name} [#FFFFFF]uniform and you can put it on from your inventory.`);
+ meActionToNearbyPlayers(client, `${getCharacterFullName(client)} puts on ${getProperDeterminerForName(getJobData(jobId).uniforms[uniformId-1].name)} ${getJobData(jobId).uniforms[uniformId-1].name} uniform`);
+ //let itemId = createItem(getItemTypeFromParams("Outfit"), getJobData(jobId).uniforms[uniformId-1].skin, AG_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
+ //let freeSlot = getPlayerFirstEmptyHotBarSlot(client);
+ //getPlayerData(client).hotBarItems[freeSlot] = itemId;
+ //getPlayerData(client).jobEquipmentCache.push(itemId);
+ //updatePlayerHotBar(client);
}
// ---------------------------------------------------------------------------
@@ -653,6 +656,7 @@ function jobEquipmentCommand(command, params, client) {
return false;
}
+ deleteJobItems(client);
givePlayerJobEquipment(client, equipmentId-1);
messagePlayerSuccess(client, `You have been given the ${equipments[equipmentId-1].name} equipment`);
}
@@ -717,7 +721,7 @@ function getJobData(jobId) {
function quitJob(client) {
stopWorking(client);
getPlayerCurrentSubAccount(client).job = AG_JOB_NONE;
- sendPlayerJobType(client, 0);
+ sendPlayerJobType(client, -1);
}
// ---------------------------------------------------------------------------
@@ -1485,7 +1489,7 @@ function createJobLocationPickup(jobId, locationId) {
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.owner.id", locationId, false);
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.type", AG_LABEL_JOB, true);
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.name", getJobData(jobId).name, true);
- setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.jobType", jobId, true);
+ setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.jobType", getJobData(jobId).databaseId, true);
addToWorld(getJobData(jobId).locations[locationId].pickup);
}
}
@@ -1605,7 +1609,7 @@ function deleteJobItems(client) {
deleteItem(getPlayerData(client).jobEquipmentCache[i]);
}
-
+ updatePlayerHotBar(client);
}
// ---------------------------------------------------------------------------
\ No newline at end of file
From ea031ed5a44fbe1bdd6566ed79f40325225c565e Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:46:37 -0600
Subject: [PATCH 039/480] Set ped to ready when clearing from prop enter
---
scripts/server/misc.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/server/misc.js b/scripts/server/misc.js
index f1e5db6f..54a27c4e 100644
--- a/scripts/server/misc.js
+++ b/scripts/server/misc.js
@@ -123,6 +123,7 @@ function enterExitPropertyCommand(command, params, client) {
if(getPlayerData(client).pedState != AG_PEDSTATE_READY) {
if(getPlayerData(client).pedState == AG_PEDSTATE_ENTERINGVEHICLE) {
sendPlayerClearPedState(client);
+ getPlayerData(client).pedState = AG_PEDSTATE_READY;
} else {
return false;
}
@@ -314,7 +315,7 @@ function checkPlayerSpawning() {
if(!isConsole(clients[i])) {
if(getPlayerData(clients[i])) {
if(getPlayerData(clients[i]).loggedIn) {
- if(getPlayerData(clients[i]).ped == null) {
+ if(!getPlayerData(clients[i]).ped) {
if(clients[i].player != null) {
getPlayerData(clients[i]).ped = clients[i].player;
onPlayerSpawn(clients[i].player);
From 752a00654332721a4b5b800af290f246758d1ea8 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:46:56 -0600
Subject: [PATCH 040/480] Wrong word in debug log for set player dimension
---
scripts/server/native.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/server/native.js b/scripts/server/native.js
index 9cfc67f3..e4e6ada5 100644
--- a/scripts/server/native.js
+++ b/scripts/server/native.js
@@ -69,7 +69,7 @@ function getPlayerInterior(client) {
// ---------------------------------------------------------------------------
function setPlayerDimension(client, dimension) {
- logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s dimension to ${interior}`);
+ logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s dimension to ${dimension}`);
client.player.dimension = dimension;
}
@@ -188,7 +188,7 @@ function getElementSyncer(element) {
// ---------------------------------------------------------------------------
function getPlayerWeaponAmmo(client) {
- client.player.weaponAmmunition + client.player.weaponClipAmmunition;
+ return client.player.weaponAmmunition;
}
// ---------------------------------------------------------------------------
From e511de5923a222ad9090f5a6b1360172cf240f43 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:47:12 -0600
Subject: [PATCH 041/480] Add line break for formatting
---
scripts/server/utilities.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/server/utilities.js b/scripts/server/utilities.js
index 616ada68..5bd3a85a 100644
--- a/scripts/server/utilities.js
+++ b/scripts/server/utilities.js
@@ -1944,4 +1944,4 @@ function applyOffsetToVector3(position, position2) {
return toVector3(position.x+position2.x, position.y+position2.y, position.z+position2.z);
}
-// -------------------------------------------------------------------------
\ No newline at end of file
+// -------------------------------------------------------------------------
From 6d6d4211f22b7b61f466b7095e1e1111d312dc20 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:47:30 -0600
Subject: [PATCH 042/480] Check if walkie-talkie is on before TX/RX
---
scripts/server/item/walkie-talkie.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/scripts/server/item/walkie-talkie.js b/scripts/server/item/walkie-talkie.js
index 18374551..f9031807 100644
--- a/scripts/server/item/walkie-talkie.js
+++ b/scripts/server/item/walkie-talkie.js
@@ -11,7 +11,7 @@
// ---------------------------------------------------------------------------
function getPlayerActiveWalkieTalkieFrequency(client) {
- let walkieTalkieSlot = getPlayerFirstItemSlotByUseType(client);
+ let walkieTalkieSlot = getPlayerFirstItemSlotByUseType(client, AG_ITEM_USETYPE_WALKIETALKIE);
if(walkieTalkieSlot != -1) {
if(getItemData(getPlayerData(client).hotBarItems[walkieTalkieSlot])) {
@@ -34,7 +34,9 @@ function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) {
if(isPlayerSpawned(clients[i])) {
if(!isSamePlayer(transmittingPlayer, clients[i])) {
if(getPlayerActiveWalkieTalkieFrequency(clients[i]) == radioFrequency) {
- walkieTalkieIncomingToNearbyPlayers(clients[i], messageText);
+ if(getItemData(getPlayerData(client).hotBarItems[getPlayerFirstItemSlotByUseType(client, AG_ITEM_USETYPE_WALKIETALKIE)]).enabled) {
+ walkieTalkieIncomingToNearbyPlayers(clients[i], messageText);
+ }
}
}
}
@@ -110,6 +112,11 @@ function walkieTalkieChatCommand(command, params, client) {
return false;
}
+ let walkieTalkieSlot = getPlayerFirstItemSlotByUseType(client, AG_ITEM_USETYPE_WALKIETALKIE);
+ if(!getItemData(getPlayerData(client).hotBarItems[walkieTalkieSlot]).enabled) {
+ messagePlayerError(client, "Please turn on a walkie talkie first!");
+ return false;
+ }
walkieTalkieTransmit(getPlayerActiveWalkieTalkieFrequency(client), params, client);
}
From 68dab614496bb19f02176424a48d0a43a3bd5130 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:48:00 -0600
Subject: [PATCH 043/480] Add inflation multiplier to job payouts
---
scripts/server/job/bus.js | 4 ++--
scripts/server/job/garbage.js | 6 ++++--
scripts/server/job/police.js | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/scripts/server/job/bus.js b/scripts/server/job/bus.js
index 28f373f5..7e4bb60e 100644
--- a/scripts/server/job/bus.js
+++ b/scripts/server/job/bus.js
@@ -406,8 +406,8 @@ function showCurrentBusStop(client) {
function playerArrivedAtBusStop(client) {
if(isLastStopOnBusRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) {
respawnVehicle(getPlayerData(client).jobRouteVehicle);
- messagePlayerNormal(client, `You finished the ${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} bus route! You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout} and your bus has been returned to the bus depot.`, getColourByName("yellow"));
- getPlayerCurrentSubAccount(client).cash += getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout;
+ messagePlayerNormal(client, `You finished the ${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} bus route! You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier} and your bus has been returned to the bus depot.`, getColourByName("yellow"));
+ getPlayerCurrentSubAccount(client).cash += getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier;
updatePlayerCash(client);
getPlayerData(client).jobRouteVehicle = false;
getPlayerData(client).jobRoute = 0;
diff --git a/scripts/server/job/garbage.js b/scripts/server/job/garbage.js
index 88f7859a..088d61b6 100644
--- a/scripts/server/job/garbage.js
+++ b/scripts/server/job/garbage.js
@@ -15,6 +15,7 @@ let garbageRoutes = [
{ // ROUTE 0
name: "Portland #1",
island: 0,
+ payout: 150,
positions: [
toVector3(1169.8, -45.54, 10.4),
toVector3(928, -59.1, 8.61),
@@ -37,6 +38,7 @@ let garbageRoutes = [
{ // ROUTE 0
name: "Staunton #1",
island: 1,
+ payout: 150,
positions: [
toVector3(49.85, -1539.9, 26.6),
toVector3(49.71, -1458.1, 26.6),
@@ -116,8 +118,8 @@ function showCurrentGarbageStop(client) {
function playerArrivedAtGarbageStop(client) {
if(isLastStopOnGarbageRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) {
respawnVehicle(getPlayerData(client).jobRouteVehicle);
- messagePlayerNormal(client, `You finished the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! You earned $${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout} and your trashmaster has been returned to the garbage depot.`, getColourByName("yellow"));
- getPlayerCurrentSubAccount(client).cash += getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout;
+ messagePlayerNormal(client, `You finished the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! You earned $${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier} and your trashmaster has been returned to the garbage depot.`, getColourByName("yellow"));
+ getPlayerCurrentSubAccount(client).cash += getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier;
updatePlayerCash(client);
getPlayerData(client).jobRouteVehicle = false;
getPlayerData(client).jobRoute = 0;
diff --git a/scripts/server/job/police.js b/scripts/server/job/police.js
index 32e946dc..a8593480 100644
--- a/scripts/server/job/police.js
+++ b/scripts/server/job/police.js
@@ -233,9 +233,9 @@ function policeDetainCommand(command, params, client) {
function playerArivedAtPolicePatrolPoint(client) {
if(isLastStopOnPolicePatrolRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) {
- messagePlayerNormal(client, `You finished the ${getPatrolRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} patrol route! You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout}`, getColourByName("yellow"));
+ messagePlayerNormal(client, `You finished the ${getPatrolRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} patrol route! You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier}`, getColourByName("yellow"));
messagePlayerNormal(client, `You can either continue driving the patrol route again, or use /stoproute to end your patrol.`, getColourByName("yellow"));
- getPlayerCurrentSubAccount(client).cash += getPolicePatrolRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout;
+ getPlayerCurrentSubAccount(client).cash += getPolicePatrolRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier;
updatePlayerCash(client);
getPlayerData(client).jobRouteVehicle = false;
getPlayerData(client).jobRoute = 0;
From 0b1471384b866861e11e44cd330cdc26a68e652a Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:48:23 -0600
Subject: [PATCH 044/480] Fix log level check
---
scripts/shared/native.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/shared/native.js b/scripts/shared/native.js
index d7f24717..b6573c20 100644
--- a/scripts/shared/native.js
+++ b/scripts/shared/native.js
@@ -159,18 +159,18 @@ function isConsole(client) {
// ---------------------------------------------------------------------------
function logToConsole(tempLogLevel, text) {
- if(logLevel & tempLogLevel || logLevel == LOG_ALL) {
+ if((logLevel & tempLogLevel) || logLevel == LOG_ALL) {
if(tempLogLevel == LOG_ERROR) {
console.error(text);
+ return true;
} else if(tempLogLevel == LOG_WARN) {
console.warn(text);
+ return true;
} else {
console.log(text);
+ return true;
}
-
- return true;
}
-
return false;
}
From 67acb165c857a07a601c1d53fa28eb5b579d5a64 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:36:54 -0600
Subject: [PATCH 045/480] Updated TODO and IDEAS list
---
IDEAS.md | 264 ++++++++++++++++++++++++++++++++-----------------------
TODO.md | 7 +-
2 files changed, 156 insertions(+), 115 deletions(-)
diff --git a/IDEAS.md b/IDEAS.md
index 1e0de21e..d14de14b 100644
--- a/IDEAS.md
+++ b/IDEAS.md
@@ -1,12 +1,12 @@
-Ideas for Asshat Gaming RP!
+# Ideas
+## For Asshat Gaming RP
==============================================================================================================
-NOTICE: Most of these ideas are totally random and some might be unrealistic. Every time I thought of something, I just immediately threw it into this file. I never checked to see if I had already added it, so there may be duplicates or similar entries spread out and unorganized.
+**NOTICE: Most of these ideas are totally random and some might be unrealistic. Every time I thought of something, I just immediately threw it into this file. I never checked to see if I had already added it, so there may be duplicates or similar entries spread out and unorganized.**
-==============================================================================================================
-
-* Businesses (some from GTA Online)
+---
+### Businesses (some from GTA Online)
* Nightclubs
* Executive Offices
* Warehouses
@@ -14,94 +14,95 @@ NOTICE: Most of these ideas are totally random and some might be unrealistic. Ev
* Houses
* Garages
* Casinos
-
-* Interactive peds with each one having a background story, characteristics, certain people or groups they like/dislike.
+---
+### Interactive peds with each one having a background story, characteristics, certain people or groups they like/dislike.
* Procedurally generated?
-
+---
* Nightclubs, bars, etc can employ "bouncer" peds that either prevent entry to certain people, or kick people out.
-
-* Background ambience.
+---
+### Background ambience.
* Anonymous city traffic and pedestrians
* They come and go and aren't persistent.
* Police peds/traffic will pursue if player has 1+ stars and comes within range and line of sight.
-
-* Named NPCs
+---
+### Named NPCs
* Persistent
* Move from place to place. Eat at restaurants, drive home, to work, get drunk at a bar, etc.
* Different personalities
* Relationship levels with each player and clan. If you piss them off, they won't do business with you.
-
-* Firefighter Job
+---
+### Firefighter Job
* Vehicles catch on fire instead of blowing up.
* Random property fires can occur.
* Firetrucks can "spray" a fire, lowering the damage until it is extinguished (Aim detection).
-
-* Streetsweeper Job
+---
+### Streetsweeper Job
* Instead of checkpoints, show actual messes on the road.
* Drive over the messes with the right vehicle to "clean" the mess.
* Only show messes if at least one player is on duty.
-
-* Garbageman Job
+---
+### Garbageman Job
* Instead of checkpoints, have trashbag objects outside of properties or wherever.
* Allow the trashtruck drivers to "pickup" the trashbag, then "place" into the truck.
* If the truck is full, deliver the trashbags to the dump.
* Only show trashbags if at least one player is currently doing the job.
-
-* Mailman Job
+---
+### Mailman Job
* Use a white solid van (Pony maybe) as a mail van.
* Load mail at the post office, and drive a specific route to "deliver" mail.
* Return the truck for payment.
-
-* Vehicle Towing
+---
+### Vehicle Towing
* Use a Yankee or something to store the vehicle "inside" (just make the car disappear) until better sync options are built.
* Universal command to tow/release a vehicle ( /tow ).
* Attach to nearest vehicle.
-
-* Item System
+---
+### Item System
* Several item types, including armour, skins, weapons, drugs, materials, and more.
* Items can be dropped and picked up.
* Items can be stored in a vehicle trunk or dash compartment.
* Items can be given, taken, or used.
-
-* Payphones
+---
+### Payphones
* Make built in payphones usable (detect position, ring sound, etc)
* Payphones can be called, making them ring to nearby players.
-
-* Multiple bed hospital.
+---
+### Multiple bed hospital.
* When one is taken, use the next one.
* If all are full, have a waiting list.
* Allow people to go in and lay on a bed to heal (or use a check-in system)
-
-* Several NPC's
+---
+### Several NPC's
* Paramedics/Doctors at hospitals,
* LC/VC/LS/SF/LV police dept desk clerk and dispatcher.
* Jail guard
* Interactive. Go up and talk to them for responses etc
-
-* Use permissions/flag system for everything.
+---
+### Use permissions/flag system for everything.
* Admin abilities
* Moderation (muted/frozen/etc)
* LEO abilities
* Clan abilities
* Account Settings
* etc
-
-* Interiors
+---
+### Interiors
* For games with interiors, properties inside of properties (possibly make it a sub-property, but using a "type" to define it. May not be necessary) AKA a business inside a business (illegal back room gambling, anyone?)
-
-* Stealable skins. When one is stolen, it is replaced by the thief's skin
-
-* Black market for anything.
+---
+### Stealable skins.
+ * When one is stolen, it is replaced by the thief's skin
+---
+### Black market for anything.
* Smuggled drugs
* LEO items
* Weapons and weapon upgrades
* Illegal vehicle upgrades like NOS.
-
-* Drug houses and weed farms.
+---
+### Drug houses and weed farms.
* Make weed only plantable in certain areas.
* Drug houses aren't limited to the type of house, as anybody can deal or use in any place.
-
-* Size-based inventories.
+---
+### Size-based inventories.
* Items should have a size and inventories can only hold so much.
* Items inside of items. This could be (but not limited to):
* Briefcases
@@ -110,15 +111,15 @@ NOTICE: Most of these ideas are totally random and some might be unrealistic. Ev
* Trashbags
* Boxes/crates
* Use the item sizes for storage capacity
-
-* Weapons like DayZ.
+---
+### Weapons like DayZ.
* Multiple weapon types that issue different damages.
* Ammo clips that only fit a compatible weapon
* Different clip types hold different amounts of ammo in them (and specific ammo types)
* Hollow point and armor piercing round types
* Modifications. Flashlight, silencer, bigger clip, tracer, scope, etc.
-
-* Crime scene investigations.
+---
+### Crime scene investigations.
* Blood
* Fingerprints
* Ballistics/bullets on ground, in objects, walls, etc.
@@ -129,8 +130,8 @@ NOTICE: Most of these ideas are totally random and some might be unrealistic. Ev
* Can be cleaned up by anybody (including the murderer or suspects)
* Showering or swimming clears blood from body
* Rain washes away blood outside (if not under an object or bridge). Perhaps line of sight check with high up Z at same coord?
-
-* Huge police interiors and garages.
+---
+### Police interiors and garages.
* Multiple interrogation rooms with blocked sound (chat is localized to that room)
* Multiple offices for ranking members
* Detective squad rooms with a CO office
@@ -138,15 +139,15 @@ NOTICE: Most of these ideas are totally random and some might be unrealistic. Ev
* Crime scene lab
* Cell block area (or multiple cell blocks)
* Elevators that can take you to multiple levels of the building (and roof/garage).
-
-* Custom MDC.
+---
+### Police Computer
* Arrest logs
* Past tickets
* Officer reports
* Investigation info
* APB list
-
-* Admin panel.
+---
+### Admin panel.
* Reports
* Multiple actions for each
* Viewing info and past reports/actions on the reporter and the situation.
@@ -155,45 +156,54 @@ NOTICE: Most of these ideas are totally random and some might be unrealistic. Ev
* Action
* Weapon/Kill/Death
* Others
-
-* Log everything possible.
-
-* Depending on type of injuries, have multiple results occur over time.
+---
+### Logging
+ * Log everything possible
+---
+### Injuries
+ * Depending on type of injuries, have multiple results occur over time.
* Gunshots lead to bleeding which could lead to passing out for loss of blood.
* Post-treatment effects are also possible including siezures from blunt force trauma.
-
-* Custom actions to have different results. Interactive-ness.
+---
+### Interactive Actions
* Hotwiring a car could be successful or could also fail, depending on vehicle type and variance.
* The user has to go through each step in order to complete the task.
* Hotwiring could have things like splitting and joining wires to make the car start or the alarm stop.
* Include medical procedures in this idea. Surgeries, gunshot wounds, etc
* Require certain tools to perform different actions.
* Different vehicles have different wires to use to be successful.
-
-* Limit weapons per person.
+---
+### Limit weapons per person.
* Have a visible large weapon if they have one (attached)
* Concealable smaller weapon.
-
-* Officers usually have a utility belt. Allow it to hold equipment as well.
-
-* Trunks can hold players/peds (not visibly) and items and is size based.
-
-* Get "inside" the back of trucks/trailers and store items inside.
+ * Officers usually have a utility belt. Allow it to hold equipment as well.
+---
+###
+---
+### Vehicle Trunks
+ * Can hold tied up players/peds
+ * Can hold items
+ * Size/capacity depending on vehicle
+---
+### Vehicle Interiors
+ * Get "inside" the back of trucks/trailers and store items inside.
* Use an interior for this and allow dropped items (including crates and boxes and etc).
* Shouts and certain speech can be heard outside wherever the truck is at.
* Vehicle sink or explode while inside the back causes death and objects destroyed.
* Also for airplane interiors
-
-* Multi space impound lot. When retrieving a car from impound, spawn it in the first empty space that isn't obstructed.
-
-* Weapons obtain damage from use and time. If not cared for, they can have decreased damage from shots, or even break or malfunction
+---
+### Impound Lot
+ * Multi space impound lot. When retrieving a car from impound, spawn it in the first empty space that isn't obstructed.
+---
+### Weapon Wear and Tear
+ * Weapons obtain damage from use and time. If not cared for, they can have decreased damage from shots, or even break or malfunction
* Cleaning weapons improves reliability
-
-* Weapons have identifying parts like barrel bores (for ballistics) and serial numbers. Serial numbers can be removed.
-
-* GUI color schemes (https://vortrex.info/f/1/4eca24d1.png) with a settings page to switch them. Orange, red, blue, purple, etc.
-
-* Police
+---
+### Weapon Identification
+ * Weapons have identifying parts like barrel bores (for ballistics) and serial numbers.
+ * Serial numbers can be removed.
+---
+### Police Behavior
* Stars
* 1 star for an initial misdemeanor. Traffic violation, pedestrian crime, etc. Police will pursue to fine/ticket.
* 2 stars for any subsequent crimes committed in police presence, after receiving one star and no action taken (if you don't pull over, run on foot, etc). Results in arrest.
@@ -203,8 +213,11 @@ NOTICE: Most of these ideas are totally random and some might be unrealistic. Ev
* NPC police will chase you if you have 1+ stars. If you lose them with 2 or less stars, they go away unless you are sighted by another officer before cooldown.
* Any traffic violation that takes place within LOS and range of police will cause them to chase you until you pull over.
* Failure to pull over within a timely manner, or breaking another law before pulling over adds a second star. They won't fine you at this level, only arrest or worse.
-
-* NPC Ideas
+ ```
+ Player police officers can issue an APB for a player suspect. NPC police drive and walk around as normal in the game but if they spot the player suspect within a certain distance and line of sight, their position is sent to any player police officers via radio and shown as a blip on the radar. If the suspect evades the NPC police, the blip fades out at the last seen suspect location and eventually disappears, no longer available to player police officers. This means that the blip will continue to show other officers at the suspect's updated location until a) all police officers lose line of sight, b) suspect gets too far away or c) enters a house/business (losing line of sight with police unless they enter). All of these will cause the blip to show the suspects last known and seen location while the blip fades out and eventually disappears. Any officer that re-establishes line of sight within a certain distance will cause the suspect's blip to show again for all police. NPC police will NOT use the built-in wanted level system because this causes excessive spawning of police no matter where the suspect is generally completely unfair. Instead, scripting functions like ped.runTo, vehicle.setCarMission, vehicle.setCruiseSpeed, etc will be used to pursue the suspect. The logic in these functions is not perfect. The NPC officer can wreck the police car, get slowed down by traffic or stuck on something altogether, and the ped can be evaded by continously going around corners and such. All of this provides the ability for the suspect to have a chance of getting away. Changing skin/clothes or driving different/unknown vehicles reduces the NPC's line of sight and distance checking and thus reduces their chance of identifying them when near
+ ```
+---
+=== NPC Types
* Bodyguards
* Biker gang formation
* Convoy Line
@@ -220,46 +233,39 @@ NOTICE: Most of these ideas are totally random and some might be unrealistic. Ev
* Mechanic
* Tweakers
* Bouncers
-
-* Accents
+---
+=== Accents
* Shown before message ... "[Japanese] John Smith says: hello"
* Pre-set accent choices
* Custom accent
-
-* Speakerphone
+---
+=== Speakerphone
* While on a phone call, using /speakerphone or something can allow others near the person on the phone to hear and be heard over the call.
-
-
-* Player police officers can issue an APB for a player suspect. NPC police drive and walk around as normal in the game but if they spot the player suspect within a certain distance and line of sight, their position is sent to any player police officers via radio and shown as a blip on the radar. If the suspect evades the NPC police, the blip fades out at the last seen suspect location and eventually disappears, no longer available to player police officers. This means that the blip will continue to show other officers at the suspect's updated location until a) all police officers lose line of sight, b) suspect gets too far away or c) enters a house/business (losing line of sight with police unless they enter). All of these will cause the blip to show the suspects last known and seen location while the blip fades out and eventually disappears. Any officer that re-establishes line of sight within a certain distance will cause the suspect's blip to show again for all police. NPC police will NOT use the built-in wanted level system because this causes excessive spawning of police no matter where the suspect is generally completely unfair. Instead, scripting functions like ped.runTo, vehicle.setCarMission, vehicle.setCruiseSpeed, etc will be used to pursue the suspect. The logic in these functions is not perfect. The NPC officer can wreck the police car, get slowed down by traffic or stuck on something altogether, and the ped can be evaded by continously going around corners and such. All of this provides the ability for the suspect to have a chance of getting away. Changing skin/clothes or driving different/unknown vehicles reduces the NPC's line of sight and distance checking and thus reduces their chance of identifying them when near.
-
-* Casinos
-
-* Pebble companion app
-
-* More GUI
- * Basic layouts
- * List
- * Columned List (Grid?)
- * Single Text Input Prompt
- * Complex Layouts
- * Info boxes for any type of server entity
- * Admin functions for each one (ban, kick, delete, set owner, etc)
- * Chat log
- * Lists of submitted ideas and bug reports
-
-* Web API
- * REST-like URLs
- * Type shortened to database table prefix style (/acct, /veh, etc)
-
-* Companion app for my Pebble watch (Rebble)
+---
+=== Casinos
+ * Will have to be custom-made and server sided
+ * Using server side will also allow casino gameplay in games where they don't exist
+---
+* Companion app
+ * Android/iOS
+ * Pebble watch (Uses phone companion app for connection)
* Whole thing streamlined
* Server select, then use GUI colours of server
* Connected players
* Links to account/character info
- * Character Info leads to owned vehicles, houses, businesses, current clan, etc
+ * Character info leads to owned vehicles, houses, businesses, current clan, etc
* Clan info leads to owned businesses, houses, vehicles, etc
* Business, house, vehicle info has links back to owners info pages
- * Alerts for reports, submitted bugs/ideas, hacker detection
+ * Notifications
+ * (Vehicle) For vehs with upgraded alarms, show when bumped or broken into
+ * (Business) For upgraded alarms, show when broken into
+ * (House) For upgraded alarms, show when broken into
+ * (Clan) House/Business/Vehicle bought/sold
+ * (Clan) Member joined/left
+ * (Clan) Point and turf war start/finish, add results
+ * (Admin) Reports
+ * (Admin) Hacker detection
+ * (Dev) Submitted bugs/ideas
* Silent mode to block incoming alerts
* Moderation action choices.
* Players
@@ -276,5 +282,43 @@ NOTICE: Most of these ideas are totally random and some might be unrealistic. Ev
* Config options
* Shutdown, restart, gmx, etc
* Alert (probably pre-made messages, configurable in pebble app)
-
-- Newspaper GUI
\ No newline at end of file
+---
+=== More GUI
+ * Basic layouts
+ * List
+ * Columned List (Grid?)
+ * Single Text Input Prompt
+ * Complex Layouts
+ * Info boxes for any type of server entity
+ * Admin functions for each one (ban, kick, delete, set owner, etc)
+ * Chat log
+ * Lists of submitted ideas and bug reports
+---
+=== Web API
+ * REST-like URLs
+ * Type shortened to database table prefix style (/acct, /veh, etc)
+ * Auth token header
+---
+=== Newspaper GUI
+---
+=== Tutorial Stuff
+ * Two sets of flags for each tutorial. One for "already finished" and "declined tutorial"
+ * Tutorials will be in their own dimension (tutorial dimension start + client index)
+ * Tutorials
+ * Business (Ask to take tutorial when purchasing one)
+ * House (Ask to take tutorial when purchasing/renting one)
+ * Job (One for each job. Ask to take tutorial when taking a job)
+ * Spawn job vehicle and put arrow on it to indicate as a job vehicle
+ * For route jobs, point camera at random route stop and show vehicle driving to it
+ * Show basic usage of each job's features through steps (i.e. for police: tazing, cuffing, detaining, arresting a player)
+ * Vehicle (ask to take tutorial when purchasing one. Show item in trunk/dash too)
+ * Set camera to look at DMV for registering vehicle
+ * Set camera to random pay and spray to modify/repair/recolour vehicle
+ * Clan (Ask to take tutorial when being set as owner of clan)
+ * Show rank management
+ * Show member management
+ * Show vehicle management
+ * Show business/house management
+ * Show turf wars
+ * Show point wars
+---
\ No newline at end of file
diff --git a/TODO.md b/TODO.md
index 8c93826b..c47b0aae 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,9 +4,8 @@
* Cut down on engine/lights/lock messages.
* Account settings to toggle tips
* Get coords for more bus routes.
-
+* Change mouse cursor/camera net events to force state instead of toggle on client end
* Add more jobs
-
------------------------------------------------------
For grand opening:
- Get remaining interiors set up for the businesses/houses in Vice City
@@ -23,6 +22,4 @@ For grand opening:
- Place item on ground (crate)
- Take second beer from crate
- Store second beer in trunk
-------------------------------------------------------
-
-* Change mouse cursor/camera net events to force state instead of toggle on client end
\ No newline at end of file
+------------------------------------------------------
\ No newline at end of file
From 9562a7cca17004d6c2ee3e6b0e326c2058e930c0 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:37:06 -0600
Subject: [PATCH 046/480] Fix black health bar
---
scripts/client/nametag.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/client/nametag.js b/scripts/client/nametag.js
index a2111f9e..744c1996 100644
--- a/scripts/client/nametag.js
+++ b/scripts/client/nametag.js
@@ -76,7 +76,7 @@ function drawNametag(x, y, health, armour, text, ping, alpha, distance, colour,
let hy = y-10/2;
let colourB = toColour(0, 0, 0, Math.floor(255.0*alpha)); // Background colour (black)
drawing.drawRectangle(null, [hx, hy], [width, 8], colourB, colourB, colourB, colourB);
- let colour = toColour(Math.floor(255.0*alpha), Math.floor(255.0-(health*255.0)), Math.floor(health*255.0), 0); // Health bar colour (varies, depending on health)
+ let colour = toColour(Math.floor(255.0-(health*255.0)), Math.floor(health*255.0), 0, Math.floor(255.0*alpha)); // Health bar colour (varies, depending on health)
drawing.drawRectangle(null, [hx+2, hy+2], [(width-4)*health, 10-6], colour, colour, colour, colour);
}
From 460b48fcf1df7fe62ad31876e504c0a82d9b4146 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:37:22 -0600
Subject: [PATCH 047/480] Fix biz withdraw/deposit
---
scripts/server/business.js | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/scripts/server/business.js b/scripts/server/business.js
index 10d3764d..18a3aa4f 100644
--- a/scripts/server/business.js
+++ b/scripts/server/business.js
@@ -504,17 +504,15 @@ function withdrawFromBusinessCommand(command, params, client) {
return false;
}
- let tempBusinessData = getServerData().businesses.filter(b => b.databaseId == businessId)[0];
-
- if(getServerData().businesses[businessId].till < amount) {
+ if(getBusinessData(businessId).till < amount) {
messagePlayerError(client, `Business '${tempBusinessData.name}' doesn't have that much money! Use /bizbalance.`);
return false;
}
- getServerData().businesses[businessId].till -= amount;
+ getBusinessData(businessId).till -= amount;
getPlayerCurrentSubAccount(client).cash += amount;
updatePlayerCash(client);
- messagePlayerSuccess(client, `You withdrew $${amount} from business [#0099FF]${tempBusinessData.name} till'`);
+ messagePlayerSuccess(client, `You withdrew $${amount} from business [#0099FF]${getBusinessData(businessId).name} till'`);
}
// ---------------------------------------------------------------------------
@@ -540,10 +538,10 @@ function depositIntoBusinessCommand(command, params, client) {
return false;
}
- getServerData().businesses[businessId].till += amount;
+ getBusinessData(businessId).till += amount;
getPlayerCurrentSubAccount(client).cash -= amount;
updatePlayerCash(client);
- messagePlayerSuccess(client, `You deposited $${amount} into business [#0099FF]${tempBusinessData.name} [#FFFFFF]till'`);
+ messagePlayerSuccess(client, `You deposited $${amount} into business [#0099FF]${getBusinessData(businessId).name} [#FFFFFF]till'`);
}
// ---------------------------------------------------------------------------
@@ -611,7 +609,7 @@ function viewBusinessTillAmountCommand(command, params, client) {
return false;
}
- messagePlayerSuccess(client, `Business '${getServerData().businesses[businessId].name}' till has $'${getServerData().businesses[businessId].till}'!`);
+ messagePlayerSuccess(client, `Business [#0099FF]${getBusinessData(businessId).name} [#FFFFFF]till has [#AAAAAA]$'${getBusinessData(businessId).till}'`);
}
// ---------------------------------------------------------------------------
From 3310f96fc210e3cf0586ca52eb312f0fefbbfb66 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:37:38 -0600
Subject: [PATCH 048/480] Add bizbalance/biztill cmd
---
scripts/server/command.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/server/command.js b/scripts/server/command.js
index cf4d2526..c067d89e 100644
--- a/scripts/server/command.js
+++ b/scripts/server/command.js
@@ -66,6 +66,7 @@ function loadCommands() {
commandData("bizlock", lockBusinessCommand, "", getStaffFlagValue("none"), true, true, "Locks a business"),
commandData("bizfee", setBusinessEntranceFeeCommand, "", getStaffFlagValue("none"), true, true, "Sets a fee to charge players when they enter the business."),
commandData("biztill", viewBusinessTillAmountCommand, "", getStaffFlagValue("none"), true, true, "Shows the business's till (cash register) amount"),
+ commandData("bizbalance", viewBusinessTillAmountCommand, "", getStaffFlagValue("none"), true, true, "Shows the business's till (cash register) amount"),
commandData("bizwithdraw", withdrawFromBusinessCommand, "", getStaffFlagValue("none"), true, true, "Take money out of the business till (cash register)"),
commandData("bizdeposit", depositIntoBusinessCommand, "", getStaffFlagValue("none"), true, true, "Put money into the business till (cash register)"),
commandData("buy", buyFromBusinessCommand, " [amount]", getStaffFlagValue("none"), true, true, "Buy items from a business"),
From f64215dd0752c17587a9a03a5c49ebea698d013a Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:37:54 -0600
Subject: [PATCH 049/480] Comment out veh burning check for now
---
scripts/server/event.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/server/event.js b/scripts/server/event.js
index 7f3a920e..5a7837f9 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -88,6 +88,7 @@ function onPlayerChat(event, client, messageText) {
function onProcess(event, deltaTime) {
checkVehicleBuying();
checkPlayerSpawning();
+ //checkVehicleBurning();
}
// ---------------------------------------------------------------------------
@@ -173,6 +174,12 @@ async function onPlayerEnteredVehicle(client) {
await waitUntil(() => client.player.vehicle != null);
let vehicle = client.player.vehicle;
+ if(vehicle.syncer != client.index) {
+ if(getPlayerVehicleSeat(client) == AG_VEHSEAT_DRIVER) {
+ vehicle.setSyncer(client, true);
+ }
+ }
+
if(vehicle.owner != -1) {
return false;
}
From d66ecf1b44489af37da00de40f4a97fe40c7b0cc Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:38:11 -0600
Subject: [PATCH 050/480] Veh burning check util
---
scripts/server/vehicle.js | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index 2d0a25be..540098a5 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -1058,4 +1058,13 @@ function checkVehicleBuying() {
}
}
+// -------------------------------------------------------------------------
+
+function checkVehicleBurning() {
+ let vehicles = getElementsByType(ELEMENT_VEHICLE);
+ for(let i in vehicles) {
+
+ }
+}
+
// -------------------------------------------------------------------------
\ No newline at end of file
From cf77e9afe785efafbbbed18bbd16622545e81793 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:38:27 -0600
Subject: [PATCH 051/480] Check vecs aren't null in get distance util
---
scripts/shared/native.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/shared/native.js b/scripts/shared/native.js
index b6573c20..f9204784 100644
--- a/scripts/shared/native.js
+++ b/scripts/shared/native.js
@@ -143,6 +143,9 @@ function doesEntityDataExist(entity, dataName) {
// ---------------------------------------------------------------------------
function getDistance(vec1, vec2) {
+ if(isNull(vec1) || isNull(vec2)) {
+ return false;
+ }
return vec1.distance(vec2);
}
From e19764421587f03c48a26ac7e7374eca4908e5a2 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:39:18 -0600
Subject: [PATCH 052/480] Grab values for spawn before trying
---
scripts/server/subaccount.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js
index 446c38b6..d48f3d3d 100644
--- a/scripts/server/subaccount.js
+++ b/scripts/server/subaccount.js
@@ -243,6 +243,7 @@ function selectCharacter(client, characterId = -1) {
logToConsole(LOG_DEBUG, `[Asshat.SubAccount] Spawning ${getPlayerDisplayForConsole(client)} as character ID ${getPlayerData(client).currentSubAccount} with skin ${skin} (${spawnPosition.x}, ${spawnPosition.y}, ${spawnPosition.z})`);
spawnPlayer(client, spawnPosition, spawnHeading, skin);
+ //spawnPlayer(p(0), getServerConfig().newCharacter.spawnPosition, 0.0, 26);
logToConsole(LOG_DEBUG, `[Asshat.SubAccount] Spawned ${getPlayerDisplayForConsole(client)} as character ID ${getPlayerData(client).currentSubAccount} with skin ${skin} (${spawnPosition.x}, ${spawnPosition.y}, ${spawnPosition.z})`);
getPlayerCurrentSubAccount(client).lastLogin = new Date().getTime();
From 22362acafc25d8545d02cc1102cca098d95779cd Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:44:46 -0600
Subject: [PATCH 053/480] Fix ccode return
---
scripts/server/developer.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/server/developer.js b/scripts/server/developer.js
index 86797ea9..7d4e6aa6 100644
--- a/scripts/server/developer.js
+++ b/scripts/server/developer.js
@@ -329,7 +329,7 @@ function clientRunCodeFail(client, returnTo, code) {
// ---------------------------------------------------------------------------
function clientRunCodeSuccess(client, returnTo, returnVal, code) {
- let returnClient = getClients()[returnTo];
+ let returnClient = getClientFromIndex(returnTo);
if(!returnClient) {
return false;
}
From c8c44de1be62586fff15781d0e849b235aafa5f7 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:44:56 -0600
Subject: [PATCH 054/480] Formatting
---
scripts/client/chatbox.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/client/chatbox.js b/scripts/client/chatbox.js
index 44e75bc4..39e16dec 100644
--- a/scripts/client/chatbox.js
+++ b/scripts/client/chatbox.js
@@ -12,10 +12,13 @@
let chatBoxHistory = [];
let bottomMessageIndex = 0;
+let maxChatBoxHistory = 500;
let scrollAmount = 1;
let maxChatBoxLines = 6;
+// ---------------------------------------------------------------------------
+
bindKey(SDLK_PAGEUP, KEYSTATE_DOWN, chatBoxScrollUp);
bindKey(SDLK_PAGEDOWN, KEYSTATE_DOWN, chatBoxScrollDown);
From 25e3d25a348e763e04a1008c7d152872beb98dfb Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 21 Jan 2021 04:45:18 -0600
Subject: [PATCH 055/480] Fix get client from index util, add get console
---
scripts/shared/native.js | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/scripts/shared/native.js b/scripts/shared/native.js
index f9204784..8209b520 100644
--- a/scripts/shared/native.js
+++ b/scripts/shared/native.js
@@ -186,7 +186,23 @@ function isSamePlayer(client1, client2) {
// ---------------------------------------------------------------------------
function getClientFromIndex(index) {
- return getClients().find(c => c.index == index);
+ let clients = getClients();
+ for(let i in clients) {
+ if(clients[i].index == index) {
+ return clients[i];
+ }
+ }
+}
+
+// ---------------------------------------------------------------------------
+
+function getConsoleClient() {
+ let clients = getClients();
+ for(let i in clients) {
+ if(isConsole(clients[i])) {
+ return clients[i];
+ }
+ }
}
// ---------------------------------------------------------------------------
\ No newline at end of file
From 91b142f8b6c8eb830281b6a8a73d3bee9bb1feef Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:30:11 -0600
Subject: [PATCH 056/480] Remove focus borders from remaining GUI text
---
scripts/client/gui.js | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/scripts/client/gui.js b/scripts/client/gui.js
index c34d8dda..a6477e5f 100644
--- a/scripts/client/gui.js
+++ b/scripts/client/gui.js
@@ -1583,7 +1583,10 @@ app.init = function()
textAlign: 0.5,
textColour: toColour(255, 255, 255, 255),
textFont: robotoFont,
- }
+ },
+ focused: {
+ borderColour: toColour(0, 0, 0, 0),
+ },
});
errorDialog.okayButton = errorDialog.window.button(20, 95, 360, 30, 'OK', {
@@ -1594,6 +1597,9 @@ app.init = function()
textFont: robotoFont,
textAlign: 0.5,
},
+ focused: {
+ borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], 255),
+ },
}, closeErrorDialog);
logToConsole(LOG_DEBUG, `[Asshat.GUI] Created error GUI ...`);
@@ -1623,7 +1629,10 @@ app.init = function()
textAlign: 0.5,
textColour: toColour(255, 255, 255, 255),
textFont: robotoFont,
- }
+ },
+ focused: {
+ borderColour: toColour(0, 0, 0, 0),
+ },
});
yesNoDialog.yesButton = yesNoDialog.window.button(20, 95, 175, 30, 'YES', {
@@ -1634,6 +1643,9 @@ app.init = function()
textFont: robotoFont,
textAlign: 0.5,
},
+ focused: {
+ borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], 255),
+ },
}, yesNoDialogAnswerYes);
yesNoDialog.noButton = yesNoDialog.window.button(205, 95, 175, 30, 'NO', {
@@ -1644,6 +1656,9 @@ app.init = function()
textFont: robotoFont,
textAlign: 0.5,
},
+ focused: {
+ borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], 255),
+ },
}, yesNoDialogAnswerNo);
logToConsole(LOG_DEBUG, `[Asshat.GUI] Created prompt GUI`);
@@ -1672,7 +1687,10 @@ app.init = function()
textAlign: 0.5,
textColour: toColour(255, 255, 255, 220),
textFont: robotoFont,
- }
+ },
+ focused: {
+ borderColour: toColour(0, 0, 0, 0),
+ },
});
infoDialog.okayButton = infoDialog.window.button(20, 95, 360, 30, 'OK', {
@@ -1683,6 +1701,9 @@ app.init = function()
textFont: robotoFont,
textAlign: 0.5,
},
+ focused: {
+ borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], 255),
+ },
}, closeInfoDialog);
logToConsole(LOG_DEBUG, `[Asshat.GUI] Created info dialog GUI`);
From 908ba1cee7b547b4f3f5998335a693975c815302 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:30:36 -0600
Subject: [PATCH 057/480] Temp disable acct str save
---
scripts/server/account.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/server/account.js b/scripts/server/account.js
index 8166dcec..76a3d222 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -447,11 +447,11 @@ function saveAccountToDatabase(accountData) {
let dbConnection = connectToDatabase();
if(dbConnection) {
let safePassword = escapeDatabaseString(dbConnection, accountData.password);
- let safeStaffTitle = escapeDatabaseString(dbConnection, accountData.staffTitle);
- let safeEmailAddress = escapeDatabaseString(dbConnection, accountData.emailAddress);
+ //let safeStaffTitle = escapeDatabaseString(dbConnection, accountData.staffTitle);
+ //let safeEmailAddress = escapeDatabaseString(dbConnection, accountData.emailAddress);
//let safeIRCAccount = dbConnection.escapetoString(accountData.ircAccount);
- let dbQueryString = `UPDATE acct_main SET acct_pass='${safePassword}', acct_settings=${accountData.settings}, acct_staff_flags=${accountData.flags.admin}, acct_staff_title='${safeStaffTitle}', acct_mod_flags=${toString(accountData.flags.moderation)}, acct_discord=${toString(accountData.discordAccount)}, acct_email='${safeEmailAddress}', acct_ip=INET_ATON('${accountData.ipAddress}') WHERE acct_id=${accountData.databaseId}`;
+ let dbQueryString = `UPDATE acct_main SET acct_pass='${safePassword}', acct_settings=${accountData.settings}, acct_staff_flags=${accountData.flags.admin}, acct_mod_flags=${toString(accountData.flags.moderation)}, acct_discord=${toString(accountData.discordAccount)}, acct_ip=INET_ATON('${accountData.ipAddress}') WHERE acct_id=${accountData.databaseId}`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
//freeDatabaseQuery(dbQuery);
disconnectFromDatabase(dbConnection);
From 052c189c2f98c5efa47f828f00536dafcf3111df Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:31:07 -0600
Subject: [PATCH 058/480] Add hex colours to some biz messages
---
scripts/server/business.js | 44 ++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/scripts/server/business.js b/scripts/server/business.js
index 18a3aa4f..25a7dbbb 100644
--- a/scripts/server/business.js
+++ b/scripts/server/business.js
@@ -505,7 +505,7 @@ function withdrawFromBusinessCommand(command, params, client) {
}
if(getBusinessData(businessId).till < amount) {
- messagePlayerError(client, `Business '${tempBusinessData.name}' doesn't have that much money! Use /bizbalance.`);
+ messagePlayerError(client, `Business [#0099FF]${tempBusinessData.name} doesn't have that much money! Use /bizbalance.`);
return false;
}
@@ -541,7 +541,7 @@ function depositIntoBusinessCommand(command, params, client) {
getBusinessData(businessId).till += amount;
getPlayerCurrentSubAccount(client).cash -= amount;
updatePlayerCash(client);
- messagePlayerSuccess(client, `You deposited $${amount} into business [#0099FF]${getBusinessData(businessId).name} [#FFFFFF]till'`);
+ messagePlayerSuccess(client, `You deposited $${amount} into business [#0099FF]${getBusinessData(businessId).name} [#FFFFFF]till`);
}
// ---------------------------------------------------------------------------
@@ -552,47 +552,55 @@ function orderItemForBusinessCommand(command, params, client) {
return false;
}
- let splitParams = params.split(" ");
-
- let itemType = getItemTypeFromParams(splitParams.slice(0,-2).join(" "));
- let amount = toInteger(splitParams.slice(-2,-1)) || 1;
- let sellPrice = toInteger(splitParams.slice(-1)) || 0;
- let businessId = (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
-
- if(!getBusinessData(businessId)) {
- messagePlayerError(client, "Business not found!");
+ if(!areThereEnoughParams(params, 3, " ")) {
+ messagePlayerSyntax(client, getCommandSyntaxText(command));
return false;
}
+ let splitParams = params.split(" ");
+ let itemType = getItemTypeFromParams(splitParams.slice(0,-2).join(" "));
+
if(!getItemTypeData(itemType)) {
messagePlayerError(client, "Invalid item type name or ID!");
messagePlayerInfo(client, "Use [#AAAAAA]/itemtypes [#FFFFFF]for a list of items");
return false;
}
+ let pricePerItem = getOrderPriceForItemType(itemType);
+
+ let amount = toInteger(splitParams.slice(-2, -1)) || 1;
+ let value = toInteger(splitParams.slice(-1)) || getItemTypeData(itemType).capacity;
+ let businessId = (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
+
+ logToConsole(LOG_DEBUG, `[Asshat.Business] ${getPlayerDisplayForConsole(client)} is ordering ${amount} ${splitParams.slice(0,-2).join(" ")} (${value})`);
+
+ if(!getBusinessData(businessId)) {
+ messagePlayerError(client, "You must be inside or near a business door!");
+ return false;
+ }
- let pricePerItem = getItemTypeData(itemType).orderPrice*getServerConfig().inflationMultiplier*getItemTypeData(itemType).demandMultiplier*getItemTypeData(itemType).supplyMultiplier*getItemTypeData(itemType).riskMultiplier;
let orderTotalCost = pricePerItem*amount;
- getPlayerData(client).promptType = AG_PROMPT_BIZORDER;
+ //getPlayerData(client).promptType = AG_PROMPT_BIZORDER;
getPlayerData(client).businessOrderAmount = amount;
getPlayerData(client).businessOrderBusiness = businessId;
getPlayerData(client).businessOrderItem = itemType;
+ getPlayerData(client).businessOrderValue = value;
- showPlayerPromptGUI(client, `This order will cost [#AAAAAA]$${orderTotalCost} (${amount} at $${pricePerItem} each)`, "Business Order Cost");
+ showPlayerPrompt(client, AG_PROMPT_BIZORDER, `Ordering ${amount} ${getPluralForm(getItemTypeData(itemType).name)} (${getItemValueDisplay(itemType, value)}) at $${pricePerItem} each will cost a total of $${orderTotalCost}`, "Business Order Cost");
}
// ---------------------------------------------------------------------------
-function orderItemForBusiness(businessId, itemType, amount, sellPrice) {
+function orderItemForBusiness(businessId, itemType, amount) {
if(getBusinessData(businessId).till < orderTotalCost) {
let neededAmount = orderTotalCost-getBusinessData(businessId).till;
- messagePlayerError(client, `The business doesn't have enough money (needs [#AAAAAA]$${neededAmount} [#FFFFFF]more)! Use [#AAAAAA]/bizdeposit [#FFFFFF]to add money to the business.`);
+ //messagePlayerError(client, `The business doesn't have enough money (needs [#AAAAAA]$${neededAmount} [#FFFFFF]more)! Use [#AAAAAA]/bizdeposit [#FFFFFF]to add money to the business.`);
return false;
}
getBusinessData(businessId).till -= orderTotalCost;
addToBusinessInventory(businessId, itemType, amount);
- messagePlayerSuccess(client, `You ordered ${amount} ${getPluralForm(getItemTypeData(itemType).name)} at $${getItemTypeData(itemType).orderPrice} each for business [#0099FF]'${getBusinessData(businessId).name} [#FFFFFF] and set their sell price to [#AAAAAA]$${sellPrice}`);
+ //messagePlayerSuccess(client, `You ordered ${amount} ${getPluralForm(getItemTypeData(itemType).name)} (${getItemValueDisplay(itemType, value)}) at $${getItemTypeData(itemType).orderPrice} each for business [#0099FF]${getBusinessData(businessId).name}`);
}
// ---------------------------------------------------------------------------
@@ -609,7 +617,7 @@ function viewBusinessTillAmountCommand(command, params, client) {
return false;
}
- messagePlayerSuccess(client, `Business [#0099FF]${getBusinessData(businessId).name} [#FFFFFF]till has [#AAAAAA]$'${getBusinessData(businessId).till}'`);
+ messagePlayerSuccess(client, `Business [#0099FF]${getBusinessData(businessId).name} [#FFFFFF]till has [#AAAAAA]$${getBusinessData(businessId).till}`);
}
// ---------------------------------------------------------------------------
From 34d32f9e9d1b2fdce95b560324a6cf83cda29553 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:31:18 -0600
Subject: [PATCH 059/480] Add biz order value to client data class
---
scripts/server/class.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/scripts/server/class.js b/scripts/server/class.js
index 15bcf358..9c416441 100644
--- a/scripts/server/class.js
+++ b/scripts/server/class.js
@@ -148,6 +148,7 @@ function initClassTable() {
this.businessOrderAmount = 0;
this.businessOrderBusiness = -1;
this.businessOrderItem = -1;
+ this.businessOrderValue = -1;
}
},
accountData: class {
@@ -953,6 +954,7 @@ function initClassTable() {
this.useType = AG_ITEM_USETYPE_NONE;
this.useId = 0;
this.useValue = 0;
+ this.maxValue = 0;
this.dropType = AG_ITEM_DROPTYPE_NONE;
this.useId = 0;
this.dropPosition = toVector3(0.0, 0.0, 0.0);
@@ -960,6 +962,9 @@ function initClassTable() {
this.dropScale = toVector3(0.0, 0.0, 0.0);
this.dropModel = 0;
this.orderPrice = 0;
+ this.demandMultiplier = 1;
+ this.supplyMultiplier = 1;
+ this.riskMultiplier = 1;
this.needsSaved = false;
this.switchDelay = 0;
this.pickupDelay = 0;
@@ -981,10 +986,11 @@ function initClassTable() {
this.dropModel = toInteger(dbAssoc["item_type_drop_model"]);
this.useId = toInteger(dbAssoc["item_type_use_id"]);
this.useValue = toInteger(dbAssoc["item_type_use_value"]);
+ this.maxValue = toInteger(dbAssoc["item_type_max_value"]);
this.orderPrice = toInteger(dbAssoc["item_type_order_price"]);
this.demandMultiplier = toFloat(dbAssoc["item_type_demand_multiplier"]);
this.supplyMultiplier = toFloat(dbAssoc["item_type_supply_multiplier"]);
- this.orderPrice = toInteger(dbAssoc["item_type_order_price"]);
+ this.riskMultiplier = toFloat(dbAssoc["item_type_risk_multiplier"]);
this.size = toInteger(dbAssoc["item_type_size"]);
this.capacity = toInteger(dbAssoc["item_type_capacity"]);
this.useDelay = toInteger(dbAssoc["item_type_delay_use"]);
From 32bfb56048e634acbdda348933ad3b1321e5d189 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:31:33 -0600
Subject: [PATCH 060/480] Add show player error/info GUI utils
---
scripts/server/client.js | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/scripts/server/client.js b/scripts/server/client.js
index 5b1298eb..a3040940 100644
--- a/scripts/server/client.js
+++ b/scripts/server/client.js
@@ -356,6 +356,20 @@ function showPlayerPromptGUI(client, promptMessage, promptTitle) {
// ---------------------------------------------------------------------------
+function showPlayerInfoGUI(client, infoMessage, infoTitle) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending show info GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${infoTitle}, Message: ${infoMessage})`);
+ triggerNetworkEvent("ag.showInfo", client, infoMessage, infoTitle);
+}
+
+// ---------------------------------------------------------------------------
+
+function showPlayerErrorGUI(client, errorMessage, errorTitle) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Sending show error GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${errorTitle}, Message: ${errorMessage})`);
+ triggerNetworkEvent("ag.showInfo", client, errorMessage, errorTitle);
+}
+
+// ---------------------------------------------------------------------------
+
function sendRunCodeToClient(client, code, returnTo) {
logToConsole(LOG_DEBUG, `[Asshat.Client] Sending runcode to ${getPlayerDisplayForConsole(client)} (returnTo: ${getPlayerDisplayForConsole(getClientFromIndex(returnTo))}, Code: ${code})`);
triggerNetworkEvent("ag.runCode", client, code, returnTo);
From 9e9309c3e79fa8a0e42f30ee8b76b9df0684e619 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:31:44 -0600
Subject: [PATCH 061/480] Add yes/no cmds for GUI-less prompts
---
scripts/server/command.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/server/command.js b/scripts/server/command.js
index c067d89e..40611609 100644
--- a/scripts/server/command.js
+++ b/scripts/server/command.js
@@ -252,6 +252,8 @@ function loadCommands() {
commandData("exit", enterExitPropertyCommand, "", getStaffFlagValue("none"), true, false),
commandData("cursor", toggleMouseCursorCommand, "", getStaffFlagValue("none"), true, false),
commandData("mousecam", toggleMouseCameraCommand, "", getStaffFlagValue("none"), true, false),
+ commandData("yes", playerPromptAnswerYesCommand, "", getStaffFlagValue("none"), true, false),
+ commandData("no", playerPromptAnswerNoCommand, "", getStaffFlagValue("none"), true, false),
],
moderation: [
commandData("kick", kickClientCommand, " [reason]", getStaffFlagValue("basicModeration"), true, true),
From 290578b3b5a6e2f314fc94fceee05f973fd40115 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:31:56 -0600
Subject: [PATCH 062/480] Remove old cmd checks on config cmds
---
scripts/server/config.js | 60 ----------------------------------------
1 file changed, 60 deletions(-)
diff --git a/scripts/server/config.js b/scripts/server/config.js
index 14f0b88c..05160c5c 100644
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -514,18 +514,6 @@ function getServerId() {
// -------------------------------------------------------------------------
function setTimeCommand(command, params, client) {
- if(getCommand(command).requireLogin) {
- if(!isPlayerLoggedIn(client)) {
- messagePlayerError(client, "You must be logged in to use this command!");
- return false;
- }
- }
-
- if(!doesPlayerHaveStaffPermission(client, getCommandRequiredPermissions(command))) {
- messagePlayerError(client, "You do not have permission to use this command!");
- return false;
- }
-
if(areParamsEmpty(params)) {
messagePlayerSyntax(client, getCommandSyntaxText(command));
return false;
@@ -555,18 +543,6 @@ function setTimeCommand(command, params, client) {
// ---------------------------------------------------------------------------
function setWeatherCommand(command, params, client) {
- if(getCommand(command).requireLogin) {
- if(!isPlayerLoggedIn(client)) {
- messagePlayerError(client, "You must be logged in to use this command!");
- return false;
- }
- }
-
- if(!doesPlayerHaveStaffPermission(client, getCommandRequiredPermissions(command))) {
- messagePlayerError(client, "You do not have permission to use this command!");
- return false;
- }
-
if(areParamsEmpty(params)) {
messagePlayerSyntax(client, getCommandSyntaxText(command));
return false;
@@ -590,18 +566,6 @@ function setWeatherCommand(command, params, client) {
// ---------------------------------------------------------------------------
function setSnowingCommand(command, params, client) {
- if(getCommand(command).requireLogin) {
- if(!isPlayerLoggedIn(client)) {
- messagePlayerError(client, "You must be logged in to use this command!");
- return false;
- }
- }
-
- if(!doesPlayerHaveStaffPermission(client, getCommandRequiredPermissions(command))) {
- messagePlayerError(client, "You do not have permission to use this command!");
- return false;
- }
-
if(areParamsEmpty(params)) {
messagePlayerSyntax(client, getCommandSyntaxText(command));
return false;
@@ -627,18 +591,6 @@ function setSnowingCommand(command, params, client) {
// ---------------------------------------------------------------------------
function toggleServerLogoCommand(command, params, client) {
- if(getCommand(command).requireLogin) {
- if(!isPlayerLoggedIn(client)) {
- messagePlayerError(client, "You must be logged in to use this command!");
- return false;
- }
- }
-
- if(!doesPlayerHaveStaffPermission(client, getCommandRequiredPermissions(command))) {
- messagePlayerError(client, "You do not have permission to use this command!");
- return false;
- }
-
getServerConfig().useLogo = !getServerConfig().useLogo;
updatePlayerShowLogoState(null, getServerConfig().useLogo);
@@ -651,18 +603,6 @@ function toggleServerLogoCommand(command, params, client) {
// ---------------------------------------------------------------------------
function toggleServerGUICommand(command, params, client) {
- if(getCommand(command).requireLogin) {
- if(!isPlayerLoggedIn(client)) {
- messagePlayerError(client, "You must be logged in to use this command!");
- return false;
- }
- }
-
- if(!doesPlayerHaveStaffPermission(client, getCommandRequiredPermissions(command))) {
- messagePlayerError(client, "You do not have permission to use this command!");
- return false;
- }
-
getServerConfig().useGUI = !getServerConfig().useGUI;
messageAdminAction(`${client.name} turned GUI ${toLowerCase(getOnOffFromBool(getServerConfig().useGUI))} for this server`);
From 7a72b2c65066f603b7a2e2e980baa9b70d2ad6da Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:32:30 -0600
Subject: [PATCH 063/480] Fix output on successful biz order confirm prompt
---
scripts/server/gui.js | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/scripts/server/gui.js b/scripts/server/gui.js
index 128cec0e..b6c04b53 100644
--- a/scripts/server/gui.js
+++ b/scripts/server/gui.js
@@ -65,12 +65,15 @@ function playerPromptAnswerYes(client) {
getPlayerData(client).businessOrderAmount = 0;
getPlayerData(client).businessOrderBusiness = false;
getPlayerData(client).businessOrderItem = -1;
+ getPlayerData(client).businessOrderValue = -1;
} else {
- logToConsole(LOG_DEBUG, `${getPlayerDisplayForConsole(client)} successfully ordered ${getPlayerData(client).businessOrderAmount} ${getPlayerData(client).businessOrderItem} at ${getPlayerData(client).businessOrderCost/getPlayerData(client).businessOrderAmount} each for business ${getBusinessData(getPlayerData(client).businessOrderBusiness)}`);
- showPlayerInfoGUI(client, `[Asshat.GUI] You ordered ${getPlayerData(client).businessOrderAmount} ${getPlayerData(client).businessOrderItem} for ${getPlayerData(client).businessOrderCost}!`, "Business Order Successful");
+ logToConsole(LOG_DEBUG, `[Asshat.GUI] ${getPlayerDisplayForConsole(client)} successfully ordered ${getPlayerData(client).businessOrderAmount} ${getPlayerData(client).businessOrderItem} at ${getPlayerData(client).businessOrderCost/getPlayerData(client).businessOrderAmount} each for business ${getBusinessData(getPlayerData(client).businessOrderBusiness)}`);
+ showPlayerInfoGUI(client, `You ordered ${getPlayerData(client).businessOrderAmount} ${getItemTypeData(getPlayerData(client).businessOrderItem).name} (${getItemValueDisplay(getPlayerData(client).businessOrderItem, getPlayerData(client).businessOrderValue)}) for ${getPlayerData(client).businessOrderCost}!`, "Business Order Successful");
+
getPlayerData(client).businessOrderAmount = 0;
getPlayerData(client).businessOrderBusiness = false;
getPlayerData(client).businessOrderItem = -1;
+ getPlayerData(client).businessOrderValue = -1;
}
} else {
showPlayerErrorGUI(client, `You aren't ordering anything for a business!`, `Business Order Canceled`);
@@ -90,4 +93,16 @@ function canPlayerUseGUI(client) {
return (getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client));
}
+// ---------------------------------------------------------------------------
+
+function playerPromptAnswerYesCommand(command, params, client) {
+ playerPromptAnswerYes(client);
+}
+
+// ---------------------------------------------------------------------------
+
+function playerPromptAnswerNoCommand(command, params, client) {
+ playerPromptAnswerNo(client);
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From f6e5886aaf1fd5fcf97cffb8ff8c671d7f3f612e Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:32:57 -0600
Subject: [PATCH 064/480] Fix contat issue for walkie talkie power toggle
---
scripts/server/item.js | 54 ++++++++++++++++++++++++++----------------
1 file changed, 33 insertions(+), 21 deletions(-)
diff --git a/scripts/server/item.js b/scripts/server/item.js
index 06df3ca3..3587a1cf 100644
--- a/scripts/server/item.js
+++ b/scripts/server/item.js
@@ -466,13 +466,13 @@ function playerUseItem(client, hotBarSlot) {
case AG_ITEM_USETYPE_WALKIETALKIE:
getItemData(itemIndex).enabled = !getItemData(itemIndex).enabled;
- messagePlayerAlert(client, `You turned ${getBoolRedGreenInlineColour(getItemData(itemIndex).enabled)}${toUpperCase(getOnOffFromBool(getItemData(itemIndex).enabled))} [#FFFFFF]your walkie talkie in slot ${getPlayerData(client).activeHotBarSlot+1} [#AAAAAA](${getItemValueDisplay(itemIndex)})`);
+ messagePlayerAlert(client, `You turned ${getBoolRedGreenInlineColour(getItemData(itemIndex).enabled)}${toUpperCase(getOnOffFromBool(getItemData(itemIndex).enabled))} [#FFFFFF]your walkie talkie in slot ${getPlayerData(client).activeHotBarSlot+1} [#AAAAAA](${getItemValueDisplayForItem(itemIndex)})`);
break;
case AG_ITEM_USETYPE_PHONE:
getItemData(itemIndex).enabled = !getItemData(itemIndex).enabled;
if(getItemData(itemIndex).enabled) {
- messagePlayerAlert(client, `You turned on your phone in slot ${getPlayerData(client).activeHotBarSlot+1} (${getItemValueDisplay(itemIndex)})`);
+ messagePlayerAlert(client, `You turned on your phone in slot ${getPlayerData(client).activeHotBarSlot+1} (${getItemValueDisplayForItem(itemIndex)})`);
} else {
messagePlayerAlert(client, `You turned OFF your phone in slot ${getPlayerData(client).activeHotBarSlot+1}`);
}
@@ -916,7 +916,7 @@ function listPlayerInventoryCommand(command, params, client) {
}
}
- itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[i]).itemTypeIndex).name}[${getItemValueDisplay(getPlayerData(client).hotBarItems[i])}]`);
+ itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getPlayerData(client).hotBarItems[i]).itemTypeIndex).name}[${getItemValueDisplayForItem(getPlayerData(client).hotBarItems[i])}]`);
}
}
@@ -953,7 +953,7 @@ function listBusinessStorageInventoryCommand(command, params, client) {
if(getBusinessData(businessId).storageItemCache[i] == -1) {
itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}[#AAAAAA](Empty)`);
} else {
- itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getBusinessData(businessId).storageItemCache[i]).itemTypeIndex).name}[${getItemValueDisplay(getBusinessData(businessId).storageItemCache[i])}]`);
+ itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getBusinessData(businessId).storageItemCache[i]).itemTypeIndex).name}[${getItemValueDisplayForItem(getBusinessData(businessId).storageItemCache[i])}]`);
}
}
@@ -990,7 +990,7 @@ function listBusinessFloorInventoryCommand(command, params, client) {
if(getBusinessData(businessId).floorItemCache[i] == -1) {
itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}[#AAAAAA](Empty)`);
} else {
- itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getBusinessData(businessId).floorItemCache[i]).itemTypeIndex).name}[${getItemValueDisplay(getBusinessData(businessId).floorItemCache[i])}]`);
+ itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getBusinessData(businessId).floorItemCache[i]).itemTypeIndex).name}[${getItemValueDisplayForItem(getBusinessData(businessId).floorItemCache[i])}]`);
}
}
@@ -1027,7 +1027,7 @@ function listHouseInventoryCommand(command, params, client) {
if(getHouseData(houseId).itemCache[i] == -1) {
itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}[#AAAAAA](Empty)`);
} else {
- itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getHouseData(houseId).itemCache[i]).itemTypeIndex).name}[${getItemValueDisplay(getBusinessData(houseId).itemCache[i])}]`);
+ itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getHouseData(houseId).itemCache[i]).itemTypeIndex).name}[${getItemValueDisplayForItem(getBusinessData(houseId).itemCache[i])}]`);
}
}
@@ -1064,7 +1064,7 @@ function listItemInventoryCommand(command, params, client) {
if(getItemData(itemId).itemCache[i] == -1) {
itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}[#AAAAAA](Empty)`);
} else {
- itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getItemData(itemId).itemCache[i]).itemTypeIndex).name}[${getItemValueDisplay(getItemData(itemId).itemCache[i])}]`);
+ itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA]${getItemTypeData(getItemData(getItemData(itemId).itemCache[i]).itemTypeIndex).name}[${getItemValueDisplayForItem(getItemData(itemId).itemCache[i])}]`);
}
}
@@ -1203,19 +1203,25 @@ function playerItemActionDelayComplete(client) {
// ---------------------------------------------------------------------------
-function getItemValueDisplay(itemId) {
- if(getItemData(itemId)) {
- if(getItemTypeData(getItemData(itemId).itemTypeIndex).useType == AG_ITEM_USETYPE_SKIN) {
- return getSkinNameFromId(getItemData(itemId).value);
- } else if(getItemTypeData(getItemData(itemId).itemTypeIndex).useType == AG_ITEM_USETYPE_FOOD) {
- return toString(getItemData(itemId).value)+"%";
- } else if(getItemTypeData(getItemData(itemId).itemTypeIndex).useType == AG_ITEM_USETYPE_PHONE) {
- return toString(getItemData(itemId).value);
- } else if(getItemTypeData(getItemData(itemId).itemTypeIndex).useType == AG_ITEM_USETYPE_WALKIETALKIE) {
- return toString(toString(getItemData(itemId).value).slice(0,-2)+"."+toString(getItemData(itemId).value).slice(-1)+"MHz");
- } else {
- return getItemData(itemId).value;
- }
+function getItemValueDisplayForItem(itemId) {
+ return getItemValueDisplay(getItemData(itemId).itemTypeIndex, getItemData(itemId).value);
+}
+
+// ---------------------------------------------------------------------------
+
+function getItemValueDisplay(itemType, value) {
+ if(getItemTypeData(itemType).useType == AG_ITEM_USETYPE_SKIN) {
+ return getSkinNameFromId(value);
+ } else if(getItemTypeData(itemType).useType == AG_ITEM_USETYPE_FOOD || getItemTypeData(itemType).useType == AG_ITEM_USETYPE_DRINK || getItemTypeData(itemType).useType == AG_ITEM_USETYPE_EXTINGUISHER || getItemTypeData(itemType).useType == AG_ITEM_USETYPE_SPRAYPAINT || getItemTypeData(itemType).useType == AG_ITEM_USETYPE_PEPPERSPRAY) {
+ return getPercentage(toString(value), getItemTypeData(itemType).capacity)+"%";
+ } else if(getItemTypeData(itemType).useType == AG_ITEM_USETYPE_PHONE) {
+ return toString(value);
+ } else if(getItemTypeData(itemType).useType == AG_ITEM_USETYPE_WEAPON || getItemTypeData(itemType).useType == AG_ITEM_USETYPE_TAZER) {
+ return toString(value)+" rounds";
+ } else if(getItemTypeData(itemType).useType == AG_ITEM_USETYPE_WALKIETALKIE) {
+ return toString(toString(value).slice(0,-2)+"."+toString(value).slice(-1)+"MHz");
+ } else {
+ return value;
}
return "unknown";
}
@@ -1250,7 +1256,7 @@ function toggleItemEnabledCommand(command, params, client) {
}
getItemData(getPlayerActiveItem(client)).enabled = !getItemData(getPlayerActiveItem(client)).enabled;
- messagePlayerNormal(client, `You turned ${getBoolRedGreenInlineColour(getItemData(itemIndex).enabled)}${toUpperCase(getOnOffFromBool(getItemData(itemIndex).enabled))} [#FFFFFF]your ${getItemName(getPlayerActiveItem(client))} in slot ${getPlayerActiveItemSlot(client)} [#AAAAAA](${getItemValueDisplay(getPlayerActiveItem(client))}`)
+ messagePlayerNormal(client, `You turned ${getBoolRedGreenInlineColour(getItemData(itemIndex).enabled)}${toUpperCase(getOnOffFromBool(getItemData(itemIndex).enabled))} [#FFFFFF]your ${getItemName(getPlayerActiveItem(client))} in slot ${getPlayerActiveItemSlot(client)} [#AAAAAA](${getItemValueDisplayForItem(getPlayerActiveItem(client))}`)
}
// ---------------------------------------------------------------------------
@@ -1299,4 +1305,10 @@ function resyncWeaponItemAmmo(client) {
}
}
+// ---------------------------------------------------------------------------
+
+function getOrderPriceForItemType(itemType) {
+ return getItemTypeData(itemType).orderPrice*getServerConfig().inflationMultiplier*getItemTypeData(itemType).demandMultiplier*getItemTypeData(itemType).supplyMultiplier*getItemTypeData(itemType).riskMultiplier;
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From 1b3c53f9cb0acabc135c6ccee123515d8ee3dac5 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:33:09 -0600
Subject: [PATCH 065/480] Add prompt util
---
scripts/server/misc.js | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/scripts/server/misc.js b/scripts/server/misc.js
index 54a27c4e..b543fdba 100644
--- a/scripts/server/misc.js
+++ b/scripts/server/misc.js
@@ -327,4 +327,21 @@ function checkPlayerSpawning() {
}
}
+// ---------------------------------------------------------------------------
+
+function showPlayerPrompt(client, promptType, promptMessage, promptTitle) {
+ if(promptType == AG_PROMPT_NONE) {
+ return false;
+ }
+
+ getPlayerData(client).promptType = promptType;
+
+ if(canPlayerUseGUI(client)) {
+ showPlayerPromptGUI(client, promptMessage, promptTitle);
+ } else {
+ messagePlayerNormal(client, `❓ ${promptMessage}`);
+ messagePlayerInfo(client, `[#FFFFFF]Use [#AAAAAA]/yes or [#AAAAAA]/no`);
+ }
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From 1b036db6e7c6a791e1a40de5b722e08fcef4506d Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:33:29 -0600
Subject: [PATCH 066/480] Add null check to player display for console util
---
scripts/server/utilities.js | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/scripts/server/utilities.js b/scripts/server/utilities.js
index 5bd3a85a..35517fa7 100644
--- a/scripts/server/utilities.js
+++ b/scripts/server/utilities.js
@@ -1801,6 +1801,9 @@ function arrayBufferToString(arrayBuffer) {
// -------------------------------------------------------------------------
function getPlayerDisplayForConsole(client) {
+ if(isNull(client)) {
+ return "(Unknown client)";
+ }
return `${client.name}[${client.index}]`;
}
@@ -1945,3 +1948,21 @@ function applyOffsetToVector3(position, position2) {
}
// -------------------------------------------------------------------------
+
+function getPluralForm(name) {
+ return name;
+}
+
+// -------------------------------------------------------------------------
+
+function removeColoursFromString(str) {
+ let matchRegex = /#([a-f0-9]{3}|[a-f0-9]{4}(?:[a-f0-9]{2}){0,2})\b/gi;
+ let matchedHexes = str.match(matchRegex);
+ for(let i in matchHex) {
+ str.replace(matchedHexes, `{${i}}`);
+ }
+
+ return [str, matchedHexes];
+}
+
+// -------------------------------------------------------------------------
\ No newline at end of file
From 6fd1b449073caf53358a90071bf6c0a8ba1762b3 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:33:42 -0600
Subject: [PATCH 067/480] Fix output msg on walkie talkie power enable
---
scripts/server/item/walkie-talkie.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/server/item/walkie-talkie.js b/scripts/server/item/walkie-talkie.js
index f9031807..37875223 100644
--- a/scripts/server/item/walkie-talkie.js
+++ b/scripts/server/item/walkie-talkie.js
@@ -101,7 +101,7 @@ function setWalkieTalkieFrequencyCommand(command, params, client) {
}
getItemData(getPlayerActiveItem(client)).value = params*100;
- messagePlayerSuccess(client, `You set the frequency of you walkie talkie in slot ${getPlayerData(client).activeHotbarSlot} to ${getItemValueDisplay(getPlayerActiveItem(client))}`)
+ messagePlayerSuccess(client, `You set the frequency of you walkie talkie in slot ${getPlayerData(client).activeHotbarSlot} to ${getItemValueDisplayForItem(getPlayerActiveItem(client))}`)
}
// ---------------------------------------------------------------------------
From b4e88d99df2607aa5fb33344e10cae6aebca01e9 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 23 Jan 2021 13:33:56 -0600
Subject: [PATCH 068/480] Add bunch of new low-level utils
---
scripts/shared/native.js | 104 +++++++++++++++++++++++++++++++++++++--
1 file changed, 100 insertions(+), 4 deletions(-)
diff --git a/scripts/shared/native.js b/scripts/shared/native.js
index 8209b520..fb739a99 100644
--- a/scripts/shared/native.js
+++ b/scripts/shared/native.js
@@ -31,24 +31,116 @@ function not(var1) {
// ---------------------------------------------------------------------------
-function gt(var1, var2) {
- return (var1 > var2);
+function bitAnd(var1, var2) {
+ return var1 & var2;
}
// ---------------------------------------------------------------------------
-function lt(var1, var2) {
+function bitOr(var1, var2) {
+ return var1 | var2;
+}
+
+// ---------------------------------------------------------------------------
+
+function bitXor(var1, var2) {
+ return var1 ^ var2;
+}
+
+// ---------------------------------------------------------------------------
+
+function bitNot(var1) {
+ return ~var1;
+}
+
+// ---------------------------------------------------------------------------
+
+function bitLeftShift(var1, var2) {
+ return var1 << var2;
+}
+
+// ---------------------------------------------------------------------------
+
+function bitRightShift(var1, var2) {
+ return var1 >> var2;
+}
+
+// ---------------------------------------------------------------------------
+
+function greaterThan(var1, var2) {
+ return var1 > var2;
+}
+
+// ---------------------------------------------------------------------------
+
+function lessThan(var1, var2) {
return (var1 < var2);
}
// ---------------------------------------------------------------------------
-function eq(var1, var2) {
+function greaterThanOrEqualTo(var1, var2) {
+ return (var1 >= var2);
+}
+
+// ---------------------------------------------------------------------------
+
+function lessThanOrEqualTo(var1, var2) {
+ return (var1 <= var2);
+}
+
+// ---------------------------------------------------------------------------
+
+function equals(var1, var2) {
return (var1 == var2);
}
// ---------------------------------------------------------------------------
+function modulo(var1, var2) {
+ return var1 % var2;
+}
+
+// ---------------------------------------------------------------------------
+
+function add(...args) {
+ return args.reduce((acc, a) => {
+ return acc + a;
+ }, 0);
+}
+
+// ---------------------------------------------------------------------------
+
+function subtract(...args) {
+ return args.reduce((acc, a) => {
+ return acc - a;
+ }, 0);
+}
+
+// ---------------------------------------------------------------------------
+
+function multiply(...args) {
+ return args.reduce((acc, a) => {
+ return acc * a;
+ }, 0);
+}
+
+// ---------------------------------------------------------------------------
+
+function divide(...args) {
+ return args.reduce((acc, a) => {
+ return acc / a;
+ }, 0);
+}
+
+// ---------------------------------------------------------------------------
+
+function toArray(...args) {
+ return args;
+}
+
+// ---------------------------------------------------------------------------
+
function toInteger(val) {
return Number(val);
}
@@ -92,6 +184,10 @@ function toLowerCase(val) {
// ---------------------------------------------------------------------------
function isNull(val) {
+ if(val == null) {
+ return true;
+ }
+
if(typeof val === "undefined") {
return true;
}
From 631242fca8f021ae83b1e3c98b3efb05c131a2aa Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:39:34 -0600
Subject: [PATCH 069/480] Add list dialog GUI
---
scripts/client/gui.js | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/scripts/client/gui.js b/scripts/client/gui.js
index a6477e5f..ad5f6e47 100644
--- a/scripts/client/gui.js
+++ b/scripts/client/gui.js
@@ -1707,6 +1707,41 @@ app.init = function()
}, closeInfoDialog);
logToConsole(LOG_DEBUG, `[Asshat.GUI] Created info dialog GUI`);
+// ------------------------------------------------------------------------------
+
+ logToConsole(LOG_DEBUG, `[Asshat.GUI] Creating list dialog GUI ...`);
+ listDialog.window = mexui.window(game.width/2-200, game.height/2-70, 400, 140, 'List', {
+ main: {
+ backgroundColour: toColour(0, 0, 0, windowAlpha),
+ },
+ title: {
+ textSize: 11.0,
+ textColour: toColour(0, 0, 0, 255),
+ backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], windowTitleAlpha),
+ },
+ icon: {
+ textSize: 11.0,
+ textColour: toColour(255, 255, 255, 255),
+ backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], windowTitleAlpha),
+ hover: {
+ backgroundColour: toColour(205, 60, 60, windowTitleAlpha),
+ },
+ },
+ });
+
+ listDialog.messageLabel = infoDialog.window.text(15, 50, 370, 20, 'Information Message', {
+ main: {
+ textSize: 10.0,
+ textAlign: 0.5,
+ textColour: toColour(255, 255, 255, 220),
+ textFont: robotoFont,
+ },
+ focused: {
+ borderColour: toColour(0, 0, 0, 0),
+ },
+ });
+ logToConsole(LOG_DEBUG, `[Asshat.GUI] Created info dialog GUI`);
+
// ------------------------------------------------------------------------------
logToConsole(LOG_DEBUG, `[Asshat.GUI] Creating character select GUI ...`);
From 511b7a696030ec81a9949e3719d5762e747a982d Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:39:50 -0600
Subject: [PATCH 070/480] Adding logging and event handlers
---
scripts/client/main.js | 264 +++++++++++++++++++++++------------------
1 file changed, 146 insertions(+), 118 deletions(-)
diff --git a/scripts/client/main.js b/scripts/client/main.js
index 699b922b..0120e7a1 100644
--- a/scripts/client/main.js
+++ b/scripts/client/main.js
@@ -66,6 +66,8 @@ let itemActionDelaySize = toVector2(100, 10);
let drunkEffectAmount = 0;
let drunkEffectDurationTimer = null;
+let controlsEnabled = false;
+
// ---------------------------------------------------------------------------
addEvent("OnLocalPlayerEnterSphere", 1);
@@ -95,6 +97,8 @@ bindEventHandler("onResourceReady", thisResource, function(event, resource) {
triggerNetworkEvent("ag.clientReady");
openAllGarages();
+
+
});
// ---------------------------------------------------------------------------
@@ -108,6 +112,13 @@ bindEventHandler("onResourceStart", thisResource, function(event, resource) {
addNetworkHandler("ag.passenger", enterVehicleAsPassenger);
triggerNetworkEvent("ag.clientStarted");
+ addEventHandler("onProcess", processEvent);
+});
+
+// ---------------------------------------------------------------------------
+
+bindEventHandler("onResourceStop", thisResource, function(event, resource) {
+ removeEventHandler("onProcess");
});
// ---------------------------------------------------------------------------
@@ -265,154 +276,133 @@ function getIslandFromPosition(position) {
// ---------------------------------------------------------------------------
-addEventHandler("onPedSpawn", function(event, ped) {
- // Nasty workaround since localPlayer is null as the player spawns (reported as client bug #194)
- setTimeout(initLocalPlayer, 500, ped);
-});
-
-// ---------------------------------------------------------------------------
-
-function attemptToShowBlipsOnSpawn(ped) {
- if(ped == localPlayer) {
- showIslandBlips();
- }
-}
-
-// ---------------------------------------------------------------------------
-
-addNetworkHandler("ag.skin", function(skin) {
- localPlayer.skin = skin;
-});
-
-// ---------------------------------------------------------------------------
-
-addNetworkHandler("ag.pedSkin", function(ped, skin) {
- ped.skin = skin;
+addNetworkHandler("ag.position", function(position) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Setting position to ${position.x}, ${position.y}, ${position.z}`);
+ localPlayer.position = position;
});
// ---------------------------------------------------------------------------
addNetworkHandler("ag.position", function(position) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Setting position to ${position.x}, ${position.y}, ${position.z}`);
localPlayer.position = position;
});
// ---------------------------------------------------------------------------
addNetworkHandler("ag.heading", function(heading) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Setting heading to ${heading}`);
localPlayer.heading = heading;
});
// ---------------------------------------------------------------------------
addNetworkHandler("ag.interior", function(interior) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Interior set to ${interior}`);
localPlayer.interior = interior;
gta.cameraInterior = interior;
});
// ---------------------------------------------------------------------------
-addNetworkHandler("ag.dimension", function(dimension) {
- localPlayer.dimension = dimension;
-});
-
-// ---------------------------------------------------------------------------
-
addNetworkHandler("ag.removeFromVehicle", function() {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Removing local player from vehicle`);
localPlayer.removeFromVehicle();
});
// ---------------------------------------------------------------------------
-function initLocalPlayer(player) {
- addEventHandler("onProcess", processEvent);
-}
-
-// ---------------------------------------------------------------------------
-
function processEvent(event, deltaTime) {
gta.clearMessages();
if(localPlayer != null) {
- localPlayer.wantedLevel = 0;
+ if(isSpawned) {
+ if(!controlsEnabled) {
+ //localPlayer.velocity = new Vec3(0.0, 0.0, 0.0);
+ localPlayer.clearObjective();
+ }
- let position = localPlayer.position;
- if(localPlayer.vehicle) {
- position = localPlayer.vehicle.position;
- }
+ localPlayer.wantedLevel = 0;
- if(inVehicle && localPlayer.vehicle != null) {
- if(!localPlayer.vehicle.engine) {
- localPlayer.vehicle.velocity = toVector3(0.0, 0.0, 0.0);
- localPlayer.vehicle.turnVelocity = toVector3(0.0, 0.0, 0.0);
- if(parkedVehiclePosition) {
- localPlayer.vehicle.position = parkedVehiclePosition;
- localPlayer.vehicle.heading = parkedVehicleHeading;
+ let position = localPlayer.position;
+ if(localPlayer.vehicle) {
+ position = localPlayer.vehicle.position;
+ }
+
+ if(inVehicle && localPlayer.vehicle != null) {
+ if(!localPlayer.vehicle.engine) {
+ localPlayer.vehicle.velocity = toVector3(0.0, 0.0, 0.0);
+ localPlayer.vehicle.turnVelocity = toVector3(0.0, 0.0, 0.0);
+ if(parkedVehiclePosition) {
+ localPlayer.vehicle.position = parkedVehiclePosition;
+ localPlayer.vehicle.heading = parkedVehicleHeading;
+ }
+ } else {
+ if(parkedVehiclePosition) {
+ parkedVehiclePosition = false;
+ parkedVehicleHeading = false;
+ }
+ }
+ }
+
+ getElementsByType(ELEMENT_PICKUP).forEach(function(pickup) {
+ if(pickup.isOwner) {
+ destroyElement(pickup);
+ }
+ });
+
+ getElementsByType(ELEMENT_MARKER).forEach(function(sphere) {
+ if(position.distance(sphere.position) <= sphere.radius) {
+ if(!inSphere) {
+ inSphere = sphere;
+ triggerEvent("OnLocalPlayerEnterSphere", null, sphere);
+ //triggerNetworkEvent("ag.onPlayerEnterSphere", sphere);
+ }
+ } else {
+ if(inSphere) {
+ inSphere = false;
+ triggerEvent("OnLocalPlayerExitSphere", null, sphere);
+ //triggerNetworkEvent("ag.onPlayerExitSphere", sphere);
+ }
+ }
+ });
+
+ if(gta.game == GAME_GTA_SA) {
+ if(jobRouteStopSphere != null) {
+ if(position.distance(jobRouteStopSphere.position) <= 2.0) {
+ enteredJobRouteSphere();
+ }
+ }
+ }
+
+ if(localPlayer.vehicle) {
+ if(!inVehicle) {
+ inVehicle = localPlayer.vehicle;
+ inVehicleSeat = getLocalPlayerVehicleSeat();
+ triggerEvent("OnLocalPlayerEnteredVehicle", inVehicle, inVehicleSeat);
}
} else {
- if(parkedVehiclePosition) {
- parkedVehiclePosition = false;
- parkedVehicleHeading = false;
+ if(inVehicle) {
+ triggerEvent("OnLocalPlayerExitedVehicle", inVehicle, inVehicleSeat);
+ inVehicle = false;
+ inVehicleSeat = false;
}
}
- }
- getElementsByType(ELEMENT_PICKUP).forEach(function(pickup) {
- if(pickup.isOwner) {
- destroyElement(pickup);
- }
- });
-
- getElementsByType(ELEMENT_MARKER).forEach(function(sphere) {
- if(position.distance(sphere.position) <= sphere.radius) {
- if(!inSphere) {
- inSphere = sphere;
- triggerEvent("OnLocalPlayerEnterSphere", null, sphere);
- //triggerNetworkEvent("ag.onPlayerEnterSphere", sphere);
+ if(forceWeapon != 0) {
+ if(localPlayer.weapon != forceWeapon) {
+ localPlayer.weapon = forceWeapon;
+ localPlayer.setWeaponClipAmmunition(getWeaponSlot(forceWeapon), forceWeaponClipAmmo);
+ localPlayer.setWeaponAmmunition(getWeaponSlot(forceWeapon), forceWeaponAmmo);
+ } else {
+ forceWeaponClipAmmo = localPlayer.getWeaponClipAmmunition(getWeaponSlot(forceWeapon));
+ forceWeaponAmmo = localPlayer.getWeaponAmmunition(getWeaponSlot(forceWeapon));
}
} else {
- if(inSphere) {
- inSphere = false;
- triggerEvent("OnLocalPlayerExitSphere", null, sphere);
- //triggerNetworkEvent("ag.onPlayerExitSphere", sphere);
+ if(localPlayer.weapon > 0) {
+ localPlayer.clearWeapons();
}
}
- });
-
- if(gta.game == GAME_GTA_SA) {
- if(jobRouteStopSphere != null) {
- if(position.distance(jobRouteStopSphere.position) <= 2.0) {
- enteredJobRouteSphere();
- }
- }
- }
-
- if(localPlayer.vehicle) {
- if(!inVehicle) {
- inVehicle = localPlayer.vehicle;
- inVehicleSeat = getLocalPlayerVehicleSeat();
- triggerEvent("OnLocalPlayerEnteredVehicle", inVehicle, inVehicleSeat);
- }
- } else {
- if(inVehicle) {
- triggerEvent("OnLocalPlayerExitedVehicle", inVehicle, inVehicleSeat);
- inVehicle = false;
- inVehicleSeat = false;
- }
- }
-
- if(forceWeapon != 0) {
- if(localPlayer.weapon != forceWeapon) {
- localPlayer.weapon = forceWeapon;
- localPlayer.setWeaponClipAmmunition(getWeaponSlot(forceWeapon), forceWeaponClipAmmo);
- localPlayer.setWeaponAmmunition(getWeaponSlot(forceWeapon), forceWeaponAmmo);
- } else {
- forceWeaponClipAmmo = localPlayer.getWeaponClipAmmunition(getWeaponSlot(forceWeapon));
- forceWeaponAmmo = localPlayer.getWeaponAmmunition(getWeaponSlot(forceWeapon));
- }
- } else {
- if(localPlayer.weapon > 0) {
- localPlayer.clearWeapons();
- }
}
}
}
@@ -529,36 +519,38 @@ function closeAllGarages() {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.freeze", function(state) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Setting frozen state to ${state}`);
gui.showCursor(state, !state);
});
// ---------------------------------------------------------------------------
addNetworkHandler("ag.control", function(controlState, cursorState = false) {
- gui.showCursor(cursorState, controlState);
-});
-
-// ---------------------------------------------------------------------------
-
-addNetworkHandler("ag.cursortoggle", function() {
- gui.showCursor(!gui.cursorEnabled, false);
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Setting control state to ${controlState} (Cursor: ${cursorState})`);
+ controlsEnabled = controlState;
+ localPlayer.invincible = true;
+ localPlayer.collisionsEnabled = controlState;
+ localPlayer.invincible = false;
});
// ---------------------------------------------------------------------------
addNetworkHandler("ag.fadeCamera", function(state, time) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Fading camera ${(state)?"in":"out"} for ${time} seconds`);
gta.fadeCamera(state, time);
});
// ---------------------------------------------------------------------------
addEventHandler("OnPedWasted", function(event, wastedPed, killerPed, weapon, pedPiece) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Ped ${wastedPed.name} died`);
wastedPed.clearWeapons();
});
// ---------------------------------------------------------------------------
addNetworkHandler("ag.showBusStop", function(position, colour) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Showing bus stop`);
if(gta.game == GAME_GTA_SA) {
jobRouteStopSphere = gta.createPickup(1318, position, 1);
} else {
@@ -572,6 +564,7 @@ addNetworkHandler("ag.showBusStop", function(position, colour) {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.snow", function(fallingSnow, groundSnow) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Setting falling snow to ${fallingSnow} and ground snow to ${groundSnow}`);
if(!isNull(snowing)) {
snowing = fallingSnow;
forceSnowing(groundSnow);
@@ -581,6 +574,7 @@ addNetworkHandler("ag.snow", function(fallingSnow, groundSnow) {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.money", function(amount) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Setting local player money`);
localPlayer.money = amount;
});
@@ -601,6 +595,7 @@ addNetworkHandler("ag.excludeGroundSnow", function(model) {
// ---------------------------------------------------------------------------
addEventHandler("OnLocalPlayerEnterSphere", function(event, sphere) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Local player entered sphere`);
if(sphere == jobRouteStopSphere) {
enteredJobRouteSphere();
}
@@ -609,6 +604,7 @@ addEventHandler("OnLocalPlayerEnterSphere", function(event, sphere) {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.smallGameMessage", function(text, colour, duration) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Showing small game message '${text}' for ${duration}ms`);
if(smallGameMessageText != "") {
clearTimeout(smallGameMessageTimer);
}
@@ -626,6 +622,7 @@ addNetworkHandler("ag.smallGameMessage", function(text, colour, duration) {
// ---------------------------------------------------------------------------
function enteredJobRouteSphere() {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Entered job route sphere`);
triggerNetworkEvent("ag.arrivedAtBusStop");
destroyElement(jobRouteStopSphere);
destroyElement(jobRouteStopBlip);
@@ -643,14 +640,15 @@ addNetworkHandler("ag.jobType", function(tempJobType) {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.working", function(tempWorking) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Setting working state to ${tempWorking}`);
localPlayerWorking = tempWorking;
});
// ---------------------------------------------------------------------------
addNetworkHandler("ag.spawned", function(client, state) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Setting spawned state to ${state}`);
isSpawned = state;
- syncPlayerProperties(localPlayer);
});
// ---------------------------------------------------------------------------
@@ -677,6 +675,13 @@ addNetworkHandler("ag.mouseCamera", function(state) {
// ---------------------------------------------------------------------------
+addNetworkHandler("ag.mouseCursor", function(state) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] ${(state)?"Enabled":"Disabled"} mouse cursor`);
+ gui.showCursor(state, !state);
+});
+
+// ---------------------------------------------------------------------------
+
function clearSelfOwnedPeds() {
logToConsole(LOG_DEBUG, `Clearing self-owned peds`);
getElementsByType(ELEMENT_CIVILIAN).forEach(function(ped) {
@@ -689,6 +694,7 @@ function clearSelfOwnedPeds() {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.set2DRendering", function(hudState, labelState, smallGameMessageState, scoreboardState, hotBarState, itemActionDelayState) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Updating render states (HUD: ${hudState}, Labels: ${labelState}, Bottom Text: ${smallGameMessageState}, Scoreboard: ${scoreboardState}, HotBar: ${hotBarState}, Item Action Delay: ${itemActionDelayState})`);
renderHUD = hudState;
setHUDEnabled(hudState);
@@ -711,11 +717,16 @@ function getLocalPlayerVehicleSeat() {
// ---------------------------------------------------------------------------
-addEventHandler("OnPedInflictDamage", function(event, damagedPed, damagerEntity, weaponId, healthLoss, pedPiece) {
- if(damagedPed == localPlayer) {
- if(!weaponDamageEnabled[damagerEntity.name]) {
- event.preventDefault();
- triggerNetworkEvent("ag.weaponDamage", damagerEntity, weaponId, pedPiece);
+addEventHandler("OnPedInflictDamage", function(event, damagedEntity, damagerEntity, weaponId, healthLoss, pedPiece) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] ${damagerEntity.name} (${damagerEntity.name}, ${damagerEntity.type} - ${typeof damagerEntity}) damaged ${damagedEntity} (${damagedEntity.name}, ${damagedEntity.type} - ${typeof damagedEntity}) at part ${pedPiece} with weapon ${weaponId}`);
+ if(!isNull(damagedEntity) && !isNull(damagerEntity)) {
+ if(damagedEntity.isType(ELEMENT_PLAYER)) {
+ if(damagedEntity == localPlayer) {
+ if(!weaponDamageEnabled[damagerEntity.name]) {
+ event.preventDefault();
+ triggerNetworkEvent("ag.weaponDamage", damagerEntity.name, weaponId, pedPiece, healthLoss);
+ }
+ }
}
}
});
@@ -723,6 +734,7 @@ addEventHandler("OnPedInflictDamage", function(event, damagedPed, damagerEntity,
// ---------------------------------------------------------------------------
addEventHandler("OnLocalPlayerExitedVehicle", function(event, vehicle, seat) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Local player exited vehicle`);
triggerNetworkEvent("ag.onPlayerExitVehicle");
if(inVehicleSeat) {
parkedVehiclePosition = false;
@@ -733,6 +745,7 @@ addEventHandler("OnLocalPlayerExitedVehicle", function(event, vehicle, seat) {
// ---------------------------------------------------------------------------
addEventHandler("OnLocalPlayerEnteredVehicle", function(event, vehicle, seat) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Local player entered vehicle`);
triggerNetworkEvent("ag.onPlayerEnterVehicle");
if(inVehicleSeat == 0) {
@@ -752,7 +765,7 @@ addNetworkHandler("ag.showItemActionDelay", function(duration) {
itemActionDelayDuration = duration;
itemActionDelayStart = sdl.ticks;
itemActionDelayEnabled = true;
- logToConsole(LOG_DEBUG, `Item action delay event called. Duration: ${itemActionDelayDuration}, Start: ${itemActionDelayStart}, Render: ${renderItemActionDelay}`);
+ logToConsole(LOG_DEBUG, `Item action delay started. Duration: ${itemActionDelayDuration}, Start: ${itemActionDelayStart}, Rendering Enabled: ${renderItemActionDelay}`);
});
// ---------------------------------------------------------------------------
@@ -764,6 +777,7 @@ function getWeaponSlot(weaponId) {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.drunkEffect", function(amount, duration) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Drunk effect set to ${amount} for ${duration}ms`);
drunkEffectAmount = 0;
drunkEffectDurationTimer = setInterval(function() {
drunkEffectAmount = drunkEffectAmount;
@@ -779,7 +793,21 @@ addNetworkHandler("ag.drunkEffect", function(amount, duration) {
// ---------------------------------------------------------------------------
addNetworkHandler("ag.clearPedState", function() {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Clearing local ped state`);
localPlayer.clearObjective();
});
+// ---------------------------------------------------------------------------
+
+addNetworkHandler("ag.pedSpeech", function(pedName, speechId) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Making ${pedName}'s ped talk (${speechId})`);
+ gta.SET_CHAR_SAY(int, int)
+});
+
+// ---------------------------------------------------------------------------
+
+addNetworkHandler("ag.hotbar", function(activeSlot, itemsArray) {
+ logToConsole(LOG_DEBUG, `[Asshat.Main] Updating hotbar`);
+});
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From edae8c4cc11b93a596eb2cd8ec85a863ae49f243 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:40:04 -0600
Subject: [PATCH 071/480] Add logging
---
scripts/server/account.js | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/scripts/server/account.js b/scripts/server/account.js
index 76a3d222..99e1179f 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -446,12 +446,18 @@ function loginSuccess(client) {
function saveAccountToDatabase(accountData) {
let dbConnection = connectToDatabase();
if(dbConnection) {
+ logToConsole(LOG_VERBOSE, `Escaping account data for ${getPlayerDisplayForConsole(client)}`);
let safePassword = escapeDatabaseString(dbConnection, accountData.password);
- //let safeStaffTitle = escapeDatabaseString(dbConnection, accountData.staffTitle);
- //let safeEmailAddress = escapeDatabaseString(dbConnection, accountData.emailAddress);
- //let safeIRCAccount = dbConnection.escapetoString(accountData.ircAccount);
+ logToConsole(LOG_VERBOSE, `${getPlayerDisplayForConsole(client)}'s password escaped successfully`);
+ let safeStaffTitle = escapeDatabaseString(dbConnection, accountData.staffTitle);
+ logToConsole(LOG_VERBOSE, `${getPlayerDisplayForConsole(client)}'s staff title escaped successfully`);
+ let safeEmailAddress = escapeDatabaseString(dbConnection, accountData.emailAddress);
+ logToConsole(LOG_VERBOSE, `${getPlayerDisplayForConsole(client)}'s email address escaped successfully`);
+ let safeIRCAccount = escapeDatabaseString(dbConnection, accountData.ircAccount);
+ logToConsole(LOG_VERBOSE, `${getPlayerDisplayForConsole(client)}'s irc account escaped successfully`);
- let dbQueryString = `UPDATE acct_main SET acct_pass='${safePassword}', acct_settings=${accountData.settings}, acct_staff_flags=${accountData.flags.admin}, acct_mod_flags=${toString(accountData.flags.moderation)}, acct_discord=${toString(accountData.discordAccount)}, acct_ip=INET_ATON('${accountData.ipAddress}') WHERE acct_id=${accountData.databaseId}`;
+ let dbQueryString = `UPDATE acct_main SET acct_pass='${safePassword}', acct_settings=${accountData.settings}, acct_staff_flags=${accountData.flags.admin}, acct_mod_flags=${accountData.flags.moderation}, acct_discord=${accountData.discordAccount}, acct_ip=INET_ATON('${accountData.ipAddress}') WHERE acct_id=${accountData.databaseId}`;
+ logToConsole(LOG_VERBOSE, dbQueryString);
let dbQuery = queryDatabase(dbConnection, dbQueryString);
//freeDatabaseQuery(dbQuery);
disconnectFromDatabase(dbConnection);
@@ -463,7 +469,9 @@ function saveAccountToDatabase(accountData) {
function saveAccountKeyBindsDatabase(keyBindData) {
let dbConnection = connectToDatabase();
if(dbConnection) {
+ logToConsole(LOG_VERBOSE, `Escaping account keybinds data for ${getPlayerDisplayForConsole(client)}`);
let safeCommandString = escapeDatabaseString(dbConnection, keyBindData.commandString);
+ logToConsole(LOG_VERBOSE, `${getPlayerDisplayForConsole(client)}'s keybind command string escaped successfully`);
if(keyBindData.databaseId == 0) {
let dbQueryString = `INSERT INTO acct_hotkey (acct_hotkey_cmdstr, acct_hotkey_key, acct_hotkey_down, acct_hotkey_enabled) VALUES ('${safeCommandString}', ${keyBindData.key}, ${boolToInt(keyBindData.keyState)}, ${boolToInt(keyBindData.enabled)}, ${keyBindData.account}`;
keyBindData.databaseId = getDatabaseInsertId(dbConnection);
@@ -485,6 +493,7 @@ function saveAccountStaffNotesDatabase(staffNoteData) {
let dbConnection = connectToDatabase();
if(dbConnection) {
let safeNoteContent = escapeDatabaseString(dbConnection, staffNoteData.note);
+ logToConsole(LOG_VERBOSE, `${getPlayerDisplayForConsole(client)}'s staff note string escaped successfully`);
if(staffNoteData.databaseId == 0) {
let dbQueryString = `INSERT INTO acct_note (acct_note_message, acct_note_who_added, acct_note_when_added, acct_note_server, acct_note_acct) VALUES ('${safeNoteContent}', ${staffNoteData.whoAdded}, UNIX_TIMESTAMP(), ${getServerId()}, ${staffNoteData.account}`;
staffNoteData.databaseId = getDatabaseInsertId(dbConnection);
@@ -544,6 +553,9 @@ function createAccount(name, password, email = "") {
function checkLogin(client, password) {
getPlayerData(client).loginAttemptsRemaining = getPlayerData(client).loginAttemptsRemaining-1;
+ if(getPlayerData(client).loginAttemptsRemaining <= 0) {
+ client.disconnect();
+ }
if(isPlayerLoggedIn(client)) {
logToConsole(LOG_WARN, `[Asshat.Account] ${getPlayerDisplayForConsole(client)} attempted to login but is already logged in`);
From 57fd6c0b2175997ba25b1fb634342952501c75fe Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:40:21 -0600
Subject: [PATCH 072/480] Fix business command checks output messages
---
scripts/server/business.js | 85 ++++++++++++++++++++++++++++----------
1 file changed, 63 insertions(+), 22 deletions(-)
diff --git a/scripts/server/business.js b/scripts/server/business.js
index 25a7dbbb..c991fe51 100644
--- a/scripts/server/business.js
+++ b/scripts/server/business.js
@@ -115,7 +115,7 @@ function createBusinessCommand(command, params, client) {
function createBusinessLocationCommand(command, params, client) {
if(!isPlayerSpawned(client)) {
- messagePlayerError("You must be spawned to use this command!");
+ messagePlayerError(client, "You must be spawned to use this command!");
return false;
}
@@ -127,7 +127,7 @@ function createBusinessLocationCommand(command, params, client) {
}
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -170,7 +170,7 @@ function deleteBusinessCommand(command, params, client) {
}
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -194,7 +194,7 @@ function setBusinessNameCommand(command, params, client) {
let businessId = (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -211,12 +211,12 @@ function setBusinessOwnerCommand(command, params, client) {
let businessId = (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
if(!newBusinessOwner) {
- messagePlayerError("Player not found!");
+ messagePlayerError(client, "Player not found!");
return false;
}
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -232,12 +232,12 @@ function setBusinessClanCommand(command, params, client) {
let businessId = (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
if(!getClanData(clanId)) {
- messagePlayerError("Clan not found!");
+ messagePlayerError(client, "Clan not found!");
return false;
}
@@ -263,12 +263,12 @@ function setBusinessJobCommand(command, params, client) {
}
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
if(!getJobData(jobId)) {
- messagePlayerError("Job not found!");
+ messagePlayerError(client, "Job not found!");
return false;
}
@@ -287,7 +287,7 @@ function setBusinessPublicCommand(command, params, client) {
}
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -306,7 +306,7 @@ function lockBusinessCommand(command, params, client) {
}
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -323,7 +323,7 @@ function setBusinessEntranceFeeCommand(command, params, client) {
let businessId = getBusinessFromParams(splitParams[1]) || (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -500,7 +500,7 @@ function withdrawFromBusinessCommand(command, params, client) {
let businessId = getBusinessFromParams(splitParams[1]) || (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -959,7 +959,7 @@ function doesBusinessHaveInterior(businessId) {
function deleteBusinessEntrancePickup(businessId) {
if(getBusinessData(businessId).entrancePickup != null) {
//removeFromWorld(getBusinessData(businessId).entrancePickup);
- destroyElement(getBusinessData(businessId).entrancePickup);
+ deleteGameElement(getBusinessData(businessId).entrancePickup);
getBusinessData(businessId).entrancePickup = null;
}
}
@@ -969,7 +969,7 @@ function deleteBusinessEntrancePickup(businessId) {
function deleteBusinessExitPickup(businessId) {
if(getBusinessData(businessId).exitPickup != null) {
//removeFromWorld(getBusinessData(businessId).exitPickup);
- destroyElement(getBusinessData(businessId).exitPickup);
+ deleteGameElement(getBusinessData(businessId).exitPickup);
getBusinessData(businessId).exitPickup = null;
}
}
@@ -979,7 +979,7 @@ function deleteBusinessExitPickup(businessId) {
function deleteBusinessEntranceBlip(businessId) {
if(getBusinessData(businessId).entranceBlip != null) {
//removeFromWorld(getBusinessData(businessId).entranceBlip);
- destroyElement(getBusinessData(businessId).entranceBlip);
+ deleteGameElement(getBusinessData(businessId).entranceBlip);
getBusinessData(businessId).entranceBlip = null;
}
}
@@ -989,7 +989,7 @@ function deleteBusinessEntranceBlip(businessId) {
function deleteBusinessExitBlip(businessId) {
if(getBusinessData(businessId).exitBlip != null) {
//removeFromWorld(getBusinessData(businessId).exitBlip);
- destroyElement(getBusinessData(businessId).exitBlip);
+ deleteGameElement(getBusinessData(businessId).exitBlip);
getBusinessData(businessId).exitBlip = null;
}
}
@@ -1049,7 +1049,48 @@ function addToBusinessInventory(businessId, itemType, amount, buyPrice) {
// ---------------------------------------------------------------------------
function buyFromBusinessCommand(command, params, client) {
+ if(areParamsEmpty(params)) {
+ messagePlayerSyntax(client, getCommandSyntaxText(command));
+ return false;
+ }
+ let splitParams = params.split(" ");
+ let businessId = getBusinessFromParams(splitParams[2]) || (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
+
+ if(!getBusinessData(businessId)) {
+ messagePlayerError(client, "Business not found!");
+ return false;
+ }
+
+ let itemSlot = toInteger(splitParams[0]) || 0;
+
+ if(typeof getBusinessData(businessId).floorItemCache[itemSlot] == "undefined") {
+ messagePlayerError(client, `Item slot ${itemSlot} doesn't exist!`);
+ return false;
+ }
+
+ if(getBusinessData(businessId).floorItemCache[itemSlot] == -1) {
+ messagePlayerError(client, `Item slot ${itemSlot} slot is empty!`);
+ return false;
+ }
+
+ let amount = 1;
+ if(areThereEnoughParams(params, 2, " ")) {
+ amount = toInteger(splitParams[1]) || 1;
+ if(amount <= 0) {
+ messagePlayerError(client, "The amount must be more than 0!");
+ return false;
+ }
+ }
+
+ if(getPlayerCurrentSubAccount(client).cash < getBusinessData(businessId).floorItemCache[itemSlot].buyPrice*amount) {
+ messagePlayerError(client, `You don't have enough money! You need [#AAAAAA]${getBusinessData(businessId).floorItemCache[itemSlot].buyPrice*amount-getPlayerCurrentSubAccount(client).cash} [#FFFFFF]more!`);
+ return false;
+ }
+
+ takePlayerCash(client, getBusinessData(businessId).floorItemCache[itemSlot].buyPrice*amount);
+
+ messagePlayerSuccess(client, `You bought ${amount} [#AAAAAA]${getItemTypeData(getItemData(getBusinessData(businessId).floorItemCache[itemSlot])).name} [#FFFFFF]for $${getBusinessData(businessId).floorItemCache[itemSlot].buyPrice*amount}!`);
}
// ---------------------------------------------------------------------------
@@ -1059,7 +1100,7 @@ function setBusinessItemSellPriceCommand(command, params, client) {
let businessId = getBusinessFromParams(splitParams[2]) || (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -1077,7 +1118,7 @@ function setBusinessItemSellPriceCommand(command, params, client) {
let newPrice = toInteger(splitParams[1]) || 0;
if(newPrice < 0) {
- messagePlayerError("The price can't be negative!");
+ messagePlayerError(client, "The price can't be negative!");
return false;
}
@@ -1094,7 +1135,7 @@ function storeItemInBusinessStorageCommand(command, params, client) {
let businessId = getBusinessFromParams(splitParams[2]) || (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
@@ -1130,7 +1171,7 @@ function stockItemOnBusinessFloorCommand(command, params, client) {
let businessId = getBusinessFromParams(splitParams[2]) || (isPlayerInAnyBusiness(client)) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client));
if(!getBusinessData(businessId)) {
- messagePlayerError("Business not found!");
+ messagePlayerError(client, "Business not found!");
return false;
}
From 2d9951a86c1f3b6619f1b2c5887e5883162de533 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:40:39 -0600
Subject: [PATCH 073/480] Bind hotbar update to client side
---
scripts/server/client.js | 124 ++++++++++++++++++++++++---------------
1 file changed, 77 insertions(+), 47 deletions(-)
diff --git a/scripts/server/client.js b/scripts/server/client.js
index a3040940..67205068 100644
--- a/scripts/server/client.js
+++ b/scripts/server/client.js
@@ -34,7 +34,7 @@ function addAllNetworkHandlers() {
addNetworkHandler("ag.exitedSphere", onPlayerExitedSphere);
addNetworkHandler("ag.playerDeath", onPlayerDeath);
addNetworkHandler("ag.onPlayerEnterVehicle", onPlayerEnteredVehicle);
- addNetworkHandler("ag.onPlayerExitVehicle", onPlayerExitedVehicle);
+ //addNetworkHandler("ag.onPlayerExitVehicle", onPlayerExitedVehicle);
// Job
addNetworkHandler("ag.arrivedAtJobRouteStop", playerArrivedAtJobRouteStop);
@@ -154,7 +154,7 @@ function updatePlayerSpawnedState(client, state) {
function setPlayerControlState(client, state) {
logToConsole(LOG_DEBUG, `[Asshat.Client] Setting ${getPlayerDisplayForConsole(client)}'s control state ${toUpperCase(getOnOffFromBool(state))}`);
- triggerNetworkEvent("ag.control", client, state);
+ triggerNetworkEvent("ag.control", client, state, !state);
}
// ---------------------------------------------------------------------------
@@ -224,11 +224,13 @@ function updatePlayerHotBar(client) {
let itemValue = 0;
let itemExists = false;
if(getPlayerData(client).hotBarItems[i] != -1) {
- let itemData = getItemData(getPlayerData(client).hotBarItems[i]);
- let itemTypeData = getItemTypeData(itemData.itemTypeIndex);
- itemExists = true;
- itemImage = itemTypeData.hotbarImage;
- itemValue = itemData.value;
+ if(getItemData(getPlayerData(client).hotBarItems[i])) {
+ let itemData = getItemData(getPlayerData(client).hotBarItems[i]);
+ let itemTypeData = getItemTypeData(itemData.itemTypeIndex);
+ itemExists = true;
+ itemImage = itemTypeData.hotbarImage;
+ itemValue = itemData.value;
+ }
}
tempHotBarItems.push([i, itemExists, itemImage, itemValue]);
}
@@ -247,6 +249,7 @@ function setPlayerWeaponDamageEnabled(client, state) {
function setPlayerWeaponDamageEvent(client, eventType) {
logToConsole(LOG_DEBUG, `[Asshat.Client] Sending weapon damage event (${eventType}) for ${getPlayerDisplayForConsole(client)} to all players`);
triggerNetworkEvent("ag.weaponDamageEvent", null, client.name, eventType);
+ getPlayerData(client).weaponDamageEvent = eventType;
}
// ---------------------------------------------------------------------------
@@ -489,65 +492,75 @@ function sendChatBoxMessageToPlayer(client, message, colour) {
// ---------------------------------------------------------------------------
function showPlayerItemTakeDelay(client, itemId) {
- let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay;
- if(delay > 0) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, delay);
- } else {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (instant)`);
- playerTakeItem(client, itemId);
+ if(getItemData(itemId)) {
+ let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playerTakeItem(client, itemId);
+ }
}
}
// ---------------------------------------------------------------------------
function showPlayerItemUseDelay(client, itemSlot) {
- let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).useDelay;
- if(delay > 0) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, delay);
- } else {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (instant)`);
- playeUseItem(client, itemSlot);
+ if(getItemData(getPlayerData(client).hotBarItems[itemSlot])) {
+ let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).useDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playerUseItem(client, itemSlot);
+ }
}
}
// ---------------------------------------------------------------------------
function showPlayerItemDropDelay(client, itemSlot) {
- let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).dropDelay;
- if(delay > 0) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, delay);
- } else {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (instant)`);
- playerDropItem(client, itemSlot);
+ if(getItemData(getPlayerData(client).hotBarItems[itemSlot])) {
+ let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).dropDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playerDropItem(client, itemSlot);
+ }
}
}
// ---------------------------------------------------------------------------
function showPlayerItemPickupDelay(client, itemId) {
- let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay;
- if(delay > 0) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, delay);
- } else {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (instant)`);
- playerPickupItem(client, itemId);
+ if(getItemData(itemId)) {
+ let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playerPickupItem(client, itemId);
+ }
}
}
// ---------------------------------------------------------------------------
function showPlayerItemPutDelay(client, itemSlot) {
- let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).putDelay;
- if(delay > 0) {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
- triggerNetworkEvent("ag.showItemActionDelay", client, delay);
- } else {
- logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (instant)`);
- playerPutItem(client, itemSlot);
+ if(getItemData(getPlayerData(client).hotBarItems[itemSlot])) {
+ let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).putDelay;
+ if(delay > 0) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
+ triggerNetworkEvent("ag.showItemActionDelay", client, delay);
+ } else {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (instant)`);
+ playerPutItem(client, itemSlot);
+ }
}
}
@@ -584,17 +597,34 @@ function sendPlayerClearPedState(client) {
// ---------------------------------------------------------------------------
-function playerDamagedByPlayer(client, damagerPed, weaponId, pedPiece) {
- let damagerClient = getClientFromPlayerElement(damagerPed);
+function playerDamagedByPlayer(client, damagerEntityName, weaponId, pedPiece, healthLoss) {
+ let damagerEntity = getClientByName(damagerEntityName);
- if(!getPlayerData(damagerClient) || !getPlayerData(client)) {
+ if(isNull(damagerEntity)) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] ${getPlayerDisplayForConsole(client)}'s damager entity from ID is null`);
return false;
}
- switch(getPlayerData(damagerClient).weaponDamageEvent) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] ${getPlayerDisplayForConsole(client)} was damaged by ${damagerEntity}`);
+
+ if(isNull(damagerEntity)) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] ${getPlayerDisplayForConsole(client)}'s damager client is INVALID`);
+ return false;
+ }
+
+ if(!getPlayerData(damagerEntity) || !getPlayerData(client)) {
+ logToConsole(LOG_DEBUG, `[Asshat.Client] ${getPlayerDisplayForConsole(client)}'s damager's client data is INVALID`);
+ return false;
+ }
+
+ logToConsole(LOG_DEBUG, `[Asshat.Client] ${getPlayerDisplayForConsole(client)}'s damager is ${getPlayerDisplayForConsole(damagerEntity)}`);
+
+ switch(getPlayerData(damagerEntity).weaponDamageEvent) {
case AG_WEAPON_DAMAGE_EVENT_TAZER:
+ logToConsole(LOG_DEBUG, `[Asshat.Client] ${getPlayerDisplayForConsole(client)}'s damager ${getPlayerDisplayForConsole(damagerEntity)} is using a tazer`);
if(!isPlayerTazed(client) && !isPlayerHandCuffed(client) && !isPlayerInAnyVehicle(client)) {
- meActionToNearbyPlayers(client, `electrifies ${getCharacterFullName(damagerClient)} with their tazer`);
+ logToConsole(LOG_DEBUG, `[Asshat.Client] ${getPlayerDisplayForConsole(client)} was not previously tazed, binded, or in a vehicle. Taze successful`);
+ meActionToNearbyPlayers(damagerEntity, `electrifies ${getCharacterFullName(client)} with their tazer`);
tazePlayer(client);
}
break;
From c2d1ad6f49352f04831c2418c0183302cdc4abda Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:40:52 -0600
Subject: [PATCH 074/480] Add item action reset
---
scripts/server/config.js | 1 +
scripts/server/item.js | 34 ++++++++++++++++++++++++++++++----
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/scripts/server/config.js b/scripts/server/config.js
index 05160c5c..18057646 100644
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -67,6 +67,7 @@ let globalConfig = {
AG_ITEM_USETYPE_SPRAYPAINT,
AG_ITEM_USETYPE_PEPPERSPRAY,
],
+ itemActionStateReset: 5000,
};
let gameConfig = {
diff --git a/scripts/server/item.js b/scripts/server/item.js
index 3587a1cf..06c35ba2 100644
--- a/scripts/server/item.js
+++ b/scripts/server/item.js
@@ -182,6 +182,8 @@ function useItemCommand(command, params, client) {
getPlayerData(client).itemActionState = AG_ITEM_ACTION_USE;
getPlayerData(client).itemActionItem = hotBarSlot;
showPlayerItemUseDelay(client, hotBarSlot);
+
+ clearPlayerItemActionStateAfterDelay(client, getGlobalConfig().itemActionStateReset);
}
// ---------------------------------------------------------------------------
@@ -241,6 +243,8 @@ function pickupItemCommand(command, params, client) {
getPlayerData(client).itemActionState = AG_ITEM_ACTION_PICKUP;
getPlayerData(client).itemActionItem = itemId;
showPlayerItemPickupDelay(client, itemId);
+
+ clearPlayerItemActionStateAfterDelay(client, getGlobalConfig().itemActionStateReset);
}
// ---------------------------------------------------------------------------
@@ -282,6 +286,8 @@ function dropItemCommand(command, params, client) {
getPlayerData(client).itemActionItem = hotBarSlot;
getPlayerData(client).itemActionState = AG_ITEM_ACTION_DROP;
showPlayerItemDropDelay(client, itemId);
+
+ clearPlayerItemActionStateAfterDelay(client, getGlobalConfig().itemActionStateReset);
}
// ---------------------------------------------------------------------------
@@ -310,6 +316,8 @@ function putItemCommand(command, params, client) {
getPlayerData(client).itemActionItem = hotBarSlot;
getPlayerData(client).itemActionState = AG_ITEM_ACTION_PUT;
showPlayerItemPutDelay(client, hotBarSlot);
+
+ clearPlayerItemActionStateAfterDelay(client, getGlobalConfig().itemActionStateReset);
}
// ---------------------------------------------------------------------------
@@ -338,6 +346,8 @@ function takeItemCommand(command, params, client) {
getPlayerData(client).itemActionItem = itemId;
getPlayerData(client).itemActionState = AG_ITEM_ACTION_TAKE;
showPlayerItemTakeDelay(client, itemId);
+
+ clearPlayerItemActionStateAfterDelay(client, getGlobalConfig().itemActionStateReset);
}
// ---------------------------------------------------------------------------
@@ -402,7 +412,7 @@ function playerUseItem(client, hotBarSlot) {
break;
case AG_ITEM_USETYPE_ROPE:
- closestPlayer = getClosestPlayer(getPlayerPosition(client));
+ closestPlayer = getClosestPlayer(getPlayerPosition(client), client);
if(!getPlayerData(closestPlayer)) {
messagePlayerError(client, "There isn't anyone close enough to tie up!");
@@ -434,7 +444,7 @@ function playerUseItem(client, hotBarSlot) {
break;
case AG_ITEM_USETYPE_HANDCUFF:
- closestPlayer = getClosestPlayer(getPlayerPosition(client));
+ closestPlayer = getClosestPlayer(getPlayerPosition(client), client);
if(!getPlayerData(closestPlayer)) {
messagePlayerError(client, "There isn't anyone close enough to handcuff!");
@@ -699,6 +709,8 @@ function playerSwitchHotBarSlotCommand(command, params, client) {
getPlayerData(client).itemActionItem = hotBarSlot;
getPlayerData(client).itemActionState = AG_ITEM_ACTION_SWITCH;
showPlayerItemSwitchDelay(client, hotBarSlot);
+
+ clearPlayerItemActionStateAfterDelay(client, getGlobalConfig().itemActionStateReset);
}
// ---------------------------------------------------------------------------
@@ -906,7 +918,7 @@ function listPlayerInventoryCommand(command, params, client) {
if(getPlayerData(client).hotBarItems[i] == -1) {
itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA](Empty)`);
} else {
- if(getGlobalConfig().weaponEquippableTypes.indexOf(getItemTypeData(getItemData(getPlayerData(client).hotBarItems[i]).itemTypeIndex).useType)) {
+ if(getGlobalConfig().weaponEquippableTypes.indexOf(getItemTypeData(getItemData(getPlayerData(client).hotBarItems[i]).itemTypeIndex).useType) != -1) {
if(getPlayerData(client).hotBarItems[i] == getPlayerData(client).hotBarItems[getPlayerData(client).currentHotBarItem]) {
if(getPlayerWeaponAmmo(client) <= getItemData(getPlayerData(client).hotBarItems[i]).value) {
getItemData(getPlayerData(client).hotBarItems[i]).value = getPlayerWeaponAmmo(client);
@@ -1119,9 +1131,9 @@ function saveItemToDatabase(itemId) {
queryDatabase(dbConnection, dbQueryString);
}
disconnectFromDatabase(dbConnection);
+ logToConsole(LOG_DEBUG, `[Asshat.Item]: Saved item '${tempItemData.name}' to database!`);
return true;
}
- logToConsole(LOG_DEBUG, `[Asshat.Item]: Saved item '${tempItemData.name}' to database!`);
return false;
}
@@ -1311,4 +1323,18 @@ function getOrderPriceForItemType(itemType) {
return getItemTypeData(itemType).orderPrice*getServerConfig().inflationMultiplier*getItemTypeData(itemType).demandMultiplier*getItemTypeData(itemType).supplyMultiplier*getItemTypeData(itemType).riskMultiplier;
}
+// ---------------------------------------------------------------------------
+
+function clearPlayerItemActionState(client) {
+ getPlayerData(client).itemActionState = AG_ITEM_ACTION_NONE;
+}
+
+// ---------------------------------------------------------------------------
+
+function clearPlayerItemActionStateAfterDelay(client, delay) {
+ setTimeout(function() {
+ clearPlayerItemActionState(client);
+ }, delay);
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From dfac46e128a99a2a816627f168b12f13945e713e Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:41:25 -0600
Subject: [PATCH 075/480] Add handsup ped type and airplane ticket item use
type
---
scripts/server/const.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/server/const.js b/scripts/server/const.js
index a020dbde..4dad2eb8 100644
--- a/scripts/server/const.js
+++ b/scripts/server/const.js
@@ -200,6 +200,7 @@ const AG_ITEM_USETYPE_EXTINGUISHER = 36; //
const AG_ITEM_USETYPE_SPRAYPAINT = 37; //
const AG_ITEM_USETYPE_PEPPERSPRAY = 38; //
const AG_ITEM_USETYPE_FLASHLIGHT = 39; //
+const AG_ITEM_USETYPE_AIRPLANETICKET = 40; //
// Item Drop Types
const AG_ITEM_DROPTYPE_NONE = 0; // Can't be dropped
@@ -273,4 +274,5 @@ const AG_PEDSTATE_EXITINGVEHICLE = 8;
const AG_PEDSTATE_BINDED = 9;
const AG_PEDSTATE_TAZED = 10;
const AG_PEDSTATE_INTRUNK = 11;
-const AG_PEDSTATE_INITEM = 12;
\ No newline at end of file
+const AG_PEDSTATE_INITEM = 12;
+const AG_PEDSTATE_HANDSUP = 13;
\ No newline at end of file
From f336f3b34c8fe2825bb82f34c757c816592b5d3e Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:41:37 -0600
Subject: [PATCH 076/480] Add mysql vars text
---
scripts/server/database.js | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/scripts/server/database.js b/scripts/server/database.js
index b4d162a4..c017f97d 100644
--- a/scripts/server/database.js
+++ b/scripts/server/database.js
@@ -132,18 +132,6 @@ function quickDatabaseQuery(queryString) {
// -------------------------------------------------------------------------
function executeDatabaseQueryCommand(command, params, client) {
- if(getCommand(command).requireLogin) {
- if(!isPlayerLoggedIn(client)) {
- messagePlayerError(client, "You must be logged in to use this command!");
- return false;
- }
- }
-
- if(!doesPlayerHaveStaffPermission(client, getCommandRequiredPermissions(command))) {
- messagePlayerError(client, "You do not have permission to use this command!");
- return false;
- }
-
if(areParamsEmpty(params)) {
messagePlayerSyntax(client, getCommandSyntaxText(command));
return false;
@@ -172,4 +160,17 @@ function executeDatabaseQueryCommand(command, params, client) {
return true;
}
+// -------------------------------------------------------------------------
+
+function setConstantsAsGlobalVariablesInDatabase() {
+ let dbConnection = connectToDatabase();
+ let entries = Object.entries(global);
+ for(let i in entries) {
+ logToConsole(LOG_DEBUG, `Checking entry ${i} (${entries[i]})`);
+ if(toString(i).slice(0, 3).indexOf("AG_") != -1) {
+ logToConsole(LOG_DEBUG, `Adding ${i} (${entries[i]}) to database global variables`);
+ }
+ }
+}
+
// -------------------------------------------------------------------------
\ No newline at end of file
From bbd24e21e64f76113e7d39489f9f3c70892080a6 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:41:59 -0600
Subject: [PATCH 077/480] Update event.js
---
scripts/server/event.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/server/event.js b/scripts/server/event.js
index 5a7837f9..2cccfa54 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -88,6 +88,7 @@ function onPlayerChat(event, client, messageText) {
function onProcess(event, deltaTime) {
checkVehicleBuying();
checkPlayerSpawning();
+ //checkPlayerPedState();
//checkVehicleBurning();
}
From 4d947093230f8802a2d64ee69c3b4826f10d8c00 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:42:13 -0600
Subject: [PATCH 078/480] Use delete element util
---
scripts/server/house.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/server/house.js b/scripts/server/house.js
index 3bb33969..15b594d5 100644
--- a/scripts/server/house.js
+++ b/scripts/server/house.js
@@ -159,7 +159,7 @@ function setHousePickupCommand(command, params, client) {
if(getHouseData(houseId).entrancePickupModel != -1) {
if(getHouseData(houseId).entrancePickup != null) {
- destroyElement(getHouseData(houseId).entrancePickup);
+ deleteGameElement(getHouseData(houseId).entrancePickup);
}
createHouseEntrancePickup(houseId);
@@ -243,7 +243,7 @@ function setHouseBlipCommand(command, params, client) {
if(getHouseData(houseId).entranceBlipModel != -1) {
if(getHouseData(houseId).entranceBlip != null) {
- destroyElement(getHouseData(houseId).entranceBlip);
+ deleteGameElement(getHouseData(houseId).entranceBlip);
}
createHouseEntranceBlip(houseId);
@@ -632,7 +632,7 @@ function doesHouseHaveInterior(houseId) {
function deleteHouseEntrancePickup(houseId) {
if(getHouseData(houseId).entrancePickup != null) {
//removeFromWorld(getHouseData(houseId).entrancePickup);
- destroyElement(getHouseData(houseId).entrancePickup);
+ deleteGameElement(getHouseData(houseId).entrancePickup);
getHouseData(houseId).entrancePickup = null;
}
}
@@ -642,7 +642,7 @@ function deleteHouseEntrancePickup(houseId) {
function deleteHouseExitPickup(houseId) {
if(getHouseData(houseId).exitPickup != null) {
//removeFromWorld(getHouseData(houseId).exitPickup);
- destroyElement(getHouseData(houseId).exitPickup);
+ deleteGameElement(getHouseData(houseId).exitPickup);
getHouseData(houseId).exitPickup = null;
}
}
@@ -652,7 +652,7 @@ function deleteHouseExitPickup(houseId) {
function deleteHouseEntranceBlip(houseId) {
if(getHouseData(houseId).entranceBlip != null) {
//removeFromWorld(getHouseData(houseId).entranceBlip);
- destroyElement(getHouseData(houseId).entranceBlip);
+ deleteGameElement(getHouseData(houseId).entranceBlip);
getHouseData(houseId).entranceBlip = null;
}
}
@@ -662,7 +662,7 @@ function deleteHouseEntranceBlip(houseId) {
function deleteHouseExitBlip(houseId) {
if(getHouseData(houseId).exitBlip != null) {
//removeFromWorld(getHouseData(houseId).exitBlip);
- destroyElement(getHouseData(houseId).exitBlip);
+ deleteGameElement(getHouseData(houseId).exitBlip);
getHouseData(houseId).exitBlip = null;
}
}
From 15348841f33541a1ca87229bca3ffa322148cf69 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:42:29 -0600
Subject: [PATCH 079/480] Add is player surrounded util
---
scripts/server/item/handcuff.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/scripts/server/item/handcuff.js b/scripts/server/item/handcuff.js
index 9a6781d9..e5952c91 100644
--- a/scripts/server/item/handcuff.js
+++ b/scripts/server/item/handcuff.js
@@ -28,4 +28,10 @@ function unHandCuffPlayer(client) {
setPlayerControlState(client, true);
}
+// ---------------------------------------------------------------------------
+
+function isPlayerSurrendered(client) {
+ return (getPlayerData(client).pedState == AG_PEDSTATE_TAZED || getPlayerData(client).pedState == AG_PEDSTATE_HANDSUP);
+}
+
// ---------------------------------------------------------------------------
\ No newline at end of file
From b8635ef626948adf7c97943575d9577c63e1cb7b Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:42:56 -0600
Subject: [PATCH 080/480] Fix walkie-talkie power toggle/check
---
scripts/server/item/walkie-talkie.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/server/item/walkie-talkie.js b/scripts/server/item/walkie-talkie.js
index 37875223..94d12021 100644
--- a/scripts/server/item/walkie-talkie.js
+++ b/scripts/server/item/walkie-talkie.js
@@ -34,7 +34,7 @@ function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) {
if(isPlayerSpawned(clients[i])) {
if(!isSamePlayer(transmittingPlayer, clients[i])) {
if(getPlayerActiveWalkieTalkieFrequency(clients[i]) == radioFrequency) {
- if(getItemData(getPlayerData(client).hotBarItems[getPlayerFirstItemSlotByUseType(client, AG_ITEM_USETYPE_WALKIETALKIE)]).enabled) {
+ if(getItemData(getPlayerData(clients[i]).hotBarItems[getPlayerFirstItemSlotByUseType(clients[i], AG_ITEM_USETYPE_WALKIETALKIE)]).enabled) {
walkieTalkieIncomingToNearbyPlayers(clients[i], messageText);
}
}
From dbbf5226dfb11d9f858e18e91a1ff34a63662af9 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:43:07 -0600
Subject: [PATCH 081/480] Use delete game object util
---
scripts/server/job.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/server/job.js b/scripts/server/job.js
index 8791a191..ddb1f1e0 100644
--- a/scripts/server/job.js
+++ b/scripts/server/job.js
@@ -611,7 +611,7 @@ function jobUniformCommand(command, params, client) {
setPlayerSkin(client, getJobData(jobId).uniforms[uniformId-1].skin);
//messagePlayerSuccess(client, `You have been given a [#AAAAAA]${uniforms[uniformId-1].name} [#FFFFFF]uniform and you can put it on from your inventory.`);
- meActionToNearbyPlayers(client, `${getCharacterFullName(client)} puts on ${getProperDeterminerForName(getJobData(jobId).uniforms[uniformId-1].name)} ${getJobData(jobId).uniforms[uniformId-1].name} uniform`);
+ meActionToNearbyPlayers(client, `puts on ${getProperDeterminerForName(getJobData(jobId).uniforms[uniformId-1].name)} ${getJobData(jobId).uniforms[uniformId-1].name} uniform`);
//let itemId = createItem(getItemTypeFromParams("Outfit"), getJobData(jobId).uniforms[uniformId-1].skin, AG_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
//let freeSlot = getPlayerFirstEmptyHotBarSlot(client);
//getPlayerData(client).hotBarItems[freeSlot] = itemId;
@@ -1203,7 +1203,7 @@ function canPlayerUseJob(client, jobId) {
function deleteJobLocation(jobLocationData) {
if(jobLocationData.pickup) {
- destroyElement(jobLocationData.pickup);
+ deleteGameElement(jobLocationData.pickup);
}
}
@@ -1459,7 +1459,7 @@ function saveAllJobsToDatabase() {
function deleteJobLocationBlip(jobId, locationId) {
if(getJobData(jobId).locations[locationId].blip != null) {
- destroyElement(getJobData(jobId).locations[locationId].blip);
+ deleteGameElement(getJobData(jobId).locations[locationId].blip);
getJobData(jobId).locations[locationId].blip = null;
}
}
@@ -1468,7 +1468,7 @@ function deleteJobLocationBlip(jobId, locationId) {
function deleteJobLocationPickup(jobId, locationId) {
if(getServerData().jobs[jobId].locations[locationId].pickup != null) {
- destroyElement(getJobData(jobId).locations[locationId].pickup);
+ deleteGameElement(getJobData(jobId).locations[locationId].pickup);
getServerData().jobs[jobId].locations[locationId].pickup = null;
}
}
From 724ea9a774a3c492e3008302241ffc483ab0c509 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:43:32 -0600
Subject: [PATCH 082/480] Add str escape for char info
---
scripts/server/subaccount.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js
index d48f3d3d..c3d22406 100644
--- a/scripts/server/subaccount.js
+++ b/scripts/server/subaccount.js
@@ -81,11 +81,11 @@ function saveSubAccountToDatabase(subAccountData) {
let dbConnection = connectToDatabase();
if(dbConnection) {
- let safeClanTag = escapeDatabaseString(subAccountData.clanTag);
- let safeClanTitle = escapeDatabaseString(subAccountData.clanTitle);
- let safeFirstName = escapeDatabaseString(subAccountData.firstName);
- let safeLastName = escapeDatabaseString(subAccountData.lastName);
- let safeMiddleName = escapeDatabaseString(subAccountData.middleName);
+ let safeClanTag = escapeDatabaseString(dbConnection, subAccountData.clanTag);
+ let safeClanTitle = escapeDatabaseString(dbConnection, subAccountData.clanTitle);
+ let safeFirstName = escapeDatabaseString(dbConnection, subAccountData.firstName);
+ let safeLastName = escapeDatabaseString(dbConnection, subAccountData.lastName);
+ let safeMiddleName = escapeDatabaseString(dbConnection, subAccountData.middleName);
let dbQueryString = `UPDATE sacct_main SET sacct_name_first='${safeFirstName}', sacct_name_last='${safeLastName}', sacct_name_middle='${safeMiddleName}', sacct_pos_x=${subAccountData.spawnPosition.x}, sacct_pos_y=${subAccountData.spawnPosition.y}, sacct_pos_z=${subAccountData.spawnPosition.z}, sacct_angle=${subAccountData.spawnHeading}, sacct_skin=${subAccountData.skin}, sacct_cash=${subAccountData.cash}, sacct_job=${subAccountData.job}, sacct_int=${subAccountData.interior}, sacct_vw=${subAccountData.dimension}, sacct_last_login=${subAccountData.lastLogin}, sacct_clan=${subAccountData.clan}, sacct_clan_rank=${subAccountData.clanRank}, sacct_clan_tag='${safeClanTag}', sacct_clan_title='${safeClanTitle}', sacct_clan_flags=${subAccountData.clanFlags} WHERE sacct_id=${subAccountData.databaseId}`;
let dbQuery = queryDatabase(dbConnection, dbQueryString);
//freeDatabaseQuery(dbQuery);
@@ -222,7 +222,7 @@ function checkNextCharacter(client) {
let subAccountId = getPlayerData(client).currentSubAccount;
let tempSubAccount = getPlayerData(client).subAccounts[subAccountId];
logToConsole(LOG_DEBUG, `[Asshat.SubAccount] Setting ${getPlayerDisplayForConsole(client)}'s character to ID ${getPlayerData(client).currentSubAccount}`);
- updatePlayerCharacterSelectGUI("ag.switchCharacterSelect", client, tempSubAccount.firstName, tempSubAccount.lastName, tempSubAccount.placeOfOrigin, tempSubAccount.dateOfBirth, tempSubAccount.skin);
+ updatePlayerCharacterSelectGUI(client, tempSubAccount.firstName, tempSubAccount.lastName, tempSubAccount.placeOfOrigin, tempSubAccount.dateOfBirth, tempSubAccount.skin);
}
}
From 9b8d1f2257effa6b509e81d89e78059ff1e3c2c0 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:44:17 -0600
Subject: [PATCH 083/480] Update xml
---
files/fonts/pricedown.ttf | Bin 151512 -> 0 bytes
files/fonts/roboto-regular.ttf | Bin 162876 -> 0 bytes
files/html/login.html | 46 --
files/html/qrcode.html | 11 -
files/images/main-logo.png | Bin 36196 -> 0 bytes
files/images/skins/gta3/Skin000.png | Bin 16986 -> 0 bytes
files/images/skins/gta3/Skin001.png | Bin 13036 -> 0 bytes
files/images/skins/gta3/Skin002.png | Bin 13954 -> 0 bytes
files/images/skins/gta3/Skin003.png | Bin 7576 -> 0 bytes
files/images/skins/gta3/Skin004.png | Bin 13682 -> 0 bytes
files/images/skins/gta3/Skin005.png | Bin 11501 -> 0 bytes
files/images/skins/gta3/Skin006.png | Bin 11789 -> 0 bytes
files/images/skins/gta3/Skin007.png | Bin 13546 -> 0 bytes
files/images/skins/gta3/Skin008.png | Bin 12312 -> 0 bytes
files/images/skins/gta3/Skin009.png | Bin 12909 -> 0 bytes
files/images/skins/gta3/Skin010.png | Bin 13048 -> 0 bytes
files/images/skins/gta3/Skin011.png | Bin 11999 -> 0 bytes
files/images/skins/gta3/Skin012.png | Bin 16090 -> 0 bytes
files/images/skins/gta3/Skin013.png | Bin 12111 -> 0 bytes
files/images/skins/gta3/Skin014.png | Bin 11612 -> 0 bytes
files/images/skins/gta3/Skin015.png | Bin 12012 -> 0 bytes
files/images/skins/gta3/Skin016.png | Bin 12126 -> 0 bytes
files/images/skins/gta3/Skin017.png | Bin 12689 -> 0 bytes
files/images/skins/gta3/Skin018.png | Bin 15159 -> 0 bytes
files/images/skins/gta3/Skin019.png | Bin 17690 -> 0 bytes
files/images/skins/gta3/Skin020.png | Bin 12838 -> 0 bytes
files/images/skins/gta3/Skin021.png | Bin 16380 -> 0 bytes
files/images/skins/gta3/Skin022.png | Bin 8412 -> 0 bytes
files/images/skins/gta3/Skin023.png | Bin 14755 -> 0 bytes
files/images/skins/gta3/Skin024.png | Bin 12241 -> 0 bytes
files/images/skins/gta3/Skin025.png | Bin 11568 -> 0 bytes
files/images/skins/gta3/Skin030.png | Bin 12910 -> 0 bytes
files/images/skins/gta3/Skin031.png | Bin 12090 -> 0 bytes
files/images/skins/gta3/Skin032.png | Bin 15568 -> 0 bytes
files/images/skins/gta3/Skin033.png | Bin 14046 -> 0 bytes
files/images/skins/gta3/Skin034.png | Bin 16344 -> 0 bytes
files/images/skins/gta3/Skin035.png | Bin 11460 -> 0 bytes
files/images/skins/gta3/Skin036.png | Bin 10492 -> 0 bytes
files/images/skins/gta3/Skin037.png | Bin 12899 -> 0 bytes
files/images/skins/gta3/Skin038.png | Bin 10488 -> 0 bytes
files/images/skins/gta3/Skin039.png | Bin 11228 -> 0 bytes
files/images/skins/gta3/Skin040.png | Bin 9887 -> 0 bytes
files/images/skins/gta3/Skin041.png | Bin 12881 -> 0 bytes
files/images/skins/gta3/Skin042.png | Bin 19036 -> 0 bytes
files/images/skins/gta3/Skin043.png | Bin 10101 -> 0 bytes
files/images/skins/gta3/Skin044.png | Bin 11026 -> 0 bytes
files/images/skins/gta3/Skin045.png | Bin 10659 -> 0 bytes
files/images/skins/gta3/Skin046.png | Bin 14906 -> 0 bytes
files/images/skins/gta3/Skin047.png | Bin 10436 -> 0 bytes
files/images/skins/gta3/Skin048.png | Bin 11625 -> 0 bytes
files/images/skins/gta3/Skin049.png | Bin 7892 -> 0 bytes
files/images/skins/gta3/Skin050.png | Bin 14011 -> 0 bytes
files/images/skins/gta3/Skin051.png | Bin 10443 -> 0 bytes
files/images/skins/gta3/Skin052.png | Bin 10589 -> 0 bytes
files/images/skins/gta3/Skin053.png | Bin 14151 -> 0 bytes
files/images/skins/gta3/Skin054.png | Bin 15698 -> 0 bytes
files/images/skins/gta3/Skin055.png | Bin 16411 -> 0 bytes
files/images/skins/gta3/Skin056.png | Bin 9071 -> 0 bytes
files/images/skins/gta3/Skin057.png | Bin 13786 -> 0 bytes
files/images/skins/gta3/Skin058.png | Bin 13900 -> 0 bytes
files/images/skins/gta3/Skin059.png | Bin 12849 -> 0 bytes
files/images/skins/gta3/Skin060.png | Bin 13460 -> 0 bytes
files/images/skins/gta3/Skin061.png | Bin 16356 -> 0 bytes
files/images/skins/gta3/Skin062.png | Bin 11623 -> 0 bytes
files/images/skins/gta3/Skin063.png | Bin 11759 -> 0 bytes
files/images/skins/gta3/Skin064.png | Bin 12829 -> 0 bytes
files/images/skins/gta3/Skin065.png | Bin 13710 -> 0 bytes
files/images/skins/gta3/Skin066.png | Bin 11064 -> 0 bytes
files/images/skins/gta3/Skin067.png | Bin 12148 -> 0 bytes
files/images/skins/gta3/Skin068.png | Bin 12297 -> 0 bytes
files/images/skins/gta3/Skin069.png | Bin 14846 -> 0 bytes
files/images/skins/gta3/Skin070.png | Bin 13303 -> 0 bytes
files/images/skins/gta3/Skin071.png | Bin 12160 -> 0 bytes
files/images/skins/gta3/Skin072.png | Bin 15329 -> 0 bytes
files/images/skins/gta3/Skin073.png | Bin 13239 -> 0 bytes
files/images/skins/gta3/Skin074.png | Bin 14520 -> 0 bytes
files/images/skins/gta3/Skin075.png | Bin 15102 -> 0 bytes
files/images/skins/gta3/Skin076.png | Bin 11022 -> 0 bytes
files/images/skins/gta3/Skin077.png | Bin 12138 -> 0 bytes
files/images/skins/gta3/Skin078.png | Bin 8690 -> 0 bytes
files/images/skins/gta3/Skin080.png | Bin 15596 -> 0 bytes
files/images/skins/gta3/Skin081.png | Bin 12972 -> 0 bytes
files/images/skins/gta3/Skin082.png | Bin 13383 -> 0 bytes
files/images/skins/gta3/Skin083.png | Bin 12612 -> 0 bytes
files/images/skins/gta3/Skin084.png | Bin 17859 -> 0 bytes
files/images/skins/gta3/Skin085.png | Bin 13262 -> 0 bytes
files/images/skins/gta3/Skin086.png | Bin 12657 -> 0 bytes
files/images/skins/gta3/Skin087.png | Bin 16035 -> 0 bytes
files/images/skins/gta3/Skin088.png | Bin 15397 -> 0 bytes
files/images/skins/gta3/Skin089.png | Bin 15145 -> 0 bytes
files/images/skins/gta3/Skin090.png | Bin 14529 -> 0 bytes
files/images/skins/gta3/Skin091 (1).png | Bin 16284 -> 0 bytes
files/images/skins/gta3/Skin091.png | Bin 15357 -> 0 bytes
files/images/skins/gta3/Skin092.png | Bin 13832 -> 0 bytes
files/images/skins/gta3/Skin093.png | Bin 13738 -> 0 bytes
files/images/skins/gta3/Skin094.png | Bin 11968 -> 0 bytes
files/images/skins/gta3/Skin095.png | Bin 9084 -> 0 bytes
files/images/skins/gta3/Skin096.png | Bin 14806 -> 0 bytes
files/images/skins/gta3/Skin097.png | Bin 13042 -> 0 bytes
files/images/skins/gta3/Skin098.png | Bin 14972 -> 0 bytes
files/images/skins/gta3/Skin099.png | Bin 12906 -> 0 bytes
files/images/skins/gta3/Skin100.png | Bin 14660 -> 0 bytes
files/images/skins/gta3/Skin101.png | Bin 9530 -> 0 bytes
files/images/skins/gta3/Skin102.png | Bin 12527 -> 0 bytes
files/images/skins/gta3/Skin103.png | Bin 12479 -> 0 bytes
files/images/skins/gta3/Skin104.png | Bin 13709 -> 0 bytes
files/images/skins/gta3/Skin105.png | Bin 13305 -> 0 bytes
files/images/skins/gta3/Skin106.png | Bin 14003 -> 0 bytes
files/images/skins/gta3/Skin107.png | Bin 12790 -> 0 bytes
files/images/skins/gta3/Skin108.png | Bin 11552 -> 0 bytes
files/images/skins/gta3/Skin109.png | Bin 14604 -> 0 bytes
files/images/skins/gta3/Skin110.png | Bin 13760 -> 0 bytes
files/images/skins/gta3/Skin111.png | Bin 11553 -> 0 bytes
files/images/skins/gta3/Skin112.png | Bin 12809 -> 0 bytes
files/images/skins/gta3/Skin113.png | Bin 10540 -> 0 bytes
files/images/skins/gta3/Skin114.png | Bin 11015 -> 0 bytes
files/images/skins/gta3/Skin115.png | Bin 8493 -> 0 bytes
files/images/skins/gta3/Skin116.png | Bin 8017 -> 0 bytes
files/images/skins/gta3/Skin118.png | Bin 12011 -> 0 bytes
files/images/skins/gta3/Skin119.png | Bin 15364 -> 0 bytes
files/images/skins/gta3/Skin120.png | Bin 11002 -> 0 bytes
files/images/skins/gta3/Skin121.png | Bin 11026 -> 0 bytes
files/images/skins/none.png | Bin 3973 -> 0 bytes
meta.xml | 193 +----
scripts/server/utilities.js | 23 +-
scripts/server/vehicle.js | 17 +
third-party/mathjs/mathjs.min.js | 41 +
third-party/mexui/Core/Component/Control.js | 134 ----
third-party/mexui/Core/Component/Entry.js | 32 -
third-party/mexui/Core/Component/Event.js | 6 -
third-party/mexui/Core/Component/Window.js | 389 ----------
third-party/mexui/Core/Control/Button.js | 40 -
third-party/mexui/Core/Control/Character.js | 11 -
third-party/mexui/Core/Control/Characters.js | 11 -
third-party/mexui/Core/Control/CheckBox.js | 68 --
third-party/mexui/Core/Control/Date.js | 182 -----
third-party/mexui/Core/Control/Day.js | 16 -
third-party/mexui/Core/Control/Digit.js | 11 -
third-party/mexui/Core/Control/Digits.js | 11 -
third-party/mexui/Core/Control/DropDown.js | 160 ----
third-party/mexui/Core/Control/Grid.js | 130 ----
third-party/mexui/Core/Control/Hour.js | 21 -
third-party/mexui/Core/Control/Image.js | 20 -
third-party/mexui/Core/Control/Integer.js | 16 -
third-party/mexui/Core/Control/Letter.js | 11 -
third-party/mexui/Core/Control/LetterDigit.js | 11 -
third-party/mexui/Core/Control/Letters.js | 11 -
.../mexui/Core/Control/LettersDigits.js | 11 -
third-party/mexui/Core/Control/Line.js | 23 -
third-party/mexui/Core/Control/List.js | 62 --
third-party/mexui/Core/Control/Minute.js | 21 -
third-party/mexui/Core/Control/Month.js | 16 -
third-party/mexui/Core/Control/Number.js | 16 -
third-party/mexui/Core/Control/Password.js | 7 -
.../mexui/Core/Control/PositiveInteger.js | 16 -
.../mexui/Core/Control/PositiveNumber.js | 16 -
third-party/mexui/Core/Control/ProgressBar.js | 35 -
third-party/mexui/Core/Control/RadioButton.js | 109 ---
.../mexui/Core/Control/RangedInteger.js | 24 -
.../mexui/Core/Control/RangedNumber.js | 24 -
third-party/mexui/Core/Control/Rectangle.js | 23 -
third-party/mexui/Core/Control/ScrollBar.js | 123 ---
third-party/mexui/Core/Control/Second.js | 21 -
third-party/mexui/Core/Control/Slider.js | 116 ---
third-party/mexui/Core/Control/TabPanel.js | 88 ---
third-party/mexui/Core/Control/Text.js | 20 -
third-party/mexui/Core/Control/TextArea.js | 7 -
third-party/mexui/Core/Control/TextInput.js | 381 ----------
third-party/mexui/Core/Control/Time.js | 162 ----
third-party/mexui/Core/Control/Tree.js | 156 ----
third-party/mexui/Core/Control/Week.js | 21 -
third-party/mexui/Core/Control/WeekDay.js | 16 -
third-party/mexui/Core/Control/Year.js | 21 -
third-party/mexui/Core/Entity/Component.js | 41 -
third-party/mexui/Core/Entity/ControlAxis.js | 200 -----
.../mexui/Core/Entity/ControlWithEntries.js | 98 ---
.../mexui/Core/Entity/StyleableEntity.js | 210 ------
third-party/mexui/Core/Entity/Transition.js | 184 -----
third-party/mexui/Core/Entry/DropDownItem.js | 7 -
third-party/mexui/Core/Entry/GridColumn.js | 9 -
third-party/mexui/Core/Entry/GridRow.js | 13 -
third-party/mexui/Core/Entry/ListRow.js | 7 -
third-party/mexui/Core/Entry/Tab.js | 26 -
third-party/mexui/Core/Entry/TreeRow.js | 17 -
third-party/mexui/Core/Init.js | 2 -
third-party/mexui/Core/Native.js | 154 ----
third-party/mexui/Core/Utility.js | 704 ------------------
third-party/mexui/Images/down-arrow.png | Bin 273 -> 0 bytes
third-party/mexui/mexui.js | 298 --------
third-party/moment/moment.min.js | 2 +
190 files changed, 83 insertions(+), 5046 deletions(-)
delete mode 100644 files/fonts/pricedown.ttf
delete mode 100644 files/fonts/roboto-regular.ttf
delete mode 100644 files/html/login.html
delete mode 100644 files/html/qrcode.html
delete mode 100644 files/images/main-logo.png
delete mode 100644 files/images/skins/gta3/Skin000.png
delete mode 100644 files/images/skins/gta3/Skin001.png
delete mode 100644 files/images/skins/gta3/Skin002.png
delete mode 100644 files/images/skins/gta3/Skin003.png
delete mode 100644 files/images/skins/gta3/Skin004.png
delete mode 100644 files/images/skins/gta3/Skin005.png
delete mode 100644 files/images/skins/gta3/Skin006.png
delete mode 100644 files/images/skins/gta3/Skin007.png
delete mode 100644 files/images/skins/gta3/Skin008.png
delete mode 100644 files/images/skins/gta3/Skin009.png
delete mode 100644 files/images/skins/gta3/Skin010.png
delete mode 100644 files/images/skins/gta3/Skin011.png
delete mode 100644 files/images/skins/gta3/Skin012.png
delete mode 100644 files/images/skins/gta3/Skin013.png
delete mode 100644 files/images/skins/gta3/Skin014.png
delete mode 100644 files/images/skins/gta3/Skin015.png
delete mode 100644 files/images/skins/gta3/Skin016.png
delete mode 100644 files/images/skins/gta3/Skin017.png
delete mode 100644 files/images/skins/gta3/Skin018.png
delete mode 100644 files/images/skins/gta3/Skin019.png
delete mode 100644 files/images/skins/gta3/Skin020.png
delete mode 100644 files/images/skins/gta3/Skin021.png
delete mode 100644 files/images/skins/gta3/Skin022.png
delete mode 100644 files/images/skins/gta3/Skin023.png
delete mode 100644 files/images/skins/gta3/Skin024.png
delete mode 100644 files/images/skins/gta3/Skin025.png
delete mode 100644 files/images/skins/gta3/Skin030.png
delete mode 100644 files/images/skins/gta3/Skin031.png
delete mode 100644 files/images/skins/gta3/Skin032.png
delete mode 100644 files/images/skins/gta3/Skin033.png
delete mode 100644 files/images/skins/gta3/Skin034.png
delete mode 100644 files/images/skins/gta3/Skin035.png
delete mode 100644 files/images/skins/gta3/Skin036.png
delete mode 100644 files/images/skins/gta3/Skin037.png
delete mode 100644 files/images/skins/gta3/Skin038.png
delete mode 100644 files/images/skins/gta3/Skin039.png
delete mode 100644 files/images/skins/gta3/Skin040.png
delete mode 100644 files/images/skins/gta3/Skin041.png
delete mode 100644 files/images/skins/gta3/Skin042.png
delete mode 100644 files/images/skins/gta3/Skin043.png
delete mode 100644 files/images/skins/gta3/Skin044.png
delete mode 100644 files/images/skins/gta3/Skin045.png
delete mode 100644 files/images/skins/gta3/Skin046.png
delete mode 100644 files/images/skins/gta3/Skin047.png
delete mode 100644 files/images/skins/gta3/Skin048.png
delete mode 100644 files/images/skins/gta3/Skin049.png
delete mode 100644 files/images/skins/gta3/Skin050.png
delete mode 100644 files/images/skins/gta3/Skin051.png
delete mode 100644 files/images/skins/gta3/Skin052.png
delete mode 100644 files/images/skins/gta3/Skin053.png
delete mode 100644 files/images/skins/gta3/Skin054.png
delete mode 100644 files/images/skins/gta3/Skin055.png
delete mode 100644 files/images/skins/gta3/Skin056.png
delete mode 100644 files/images/skins/gta3/Skin057.png
delete mode 100644 files/images/skins/gta3/Skin058.png
delete mode 100644 files/images/skins/gta3/Skin059.png
delete mode 100644 files/images/skins/gta3/Skin060.png
delete mode 100644 files/images/skins/gta3/Skin061.png
delete mode 100644 files/images/skins/gta3/Skin062.png
delete mode 100644 files/images/skins/gta3/Skin063.png
delete mode 100644 files/images/skins/gta3/Skin064.png
delete mode 100644 files/images/skins/gta3/Skin065.png
delete mode 100644 files/images/skins/gta3/Skin066.png
delete mode 100644 files/images/skins/gta3/Skin067.png
delete mode 100644 files/images/skins/gta3/Skin068.png
delete mode 100644 files/images/skins/gta3/Skin069.png
delete mode 100644 files/images/skins/gta3/Skin070.png
delete mode 100644 files/images/skins/gta3/Skin071.png
delete mode 100644 files/images/skins/gta3/Skin072.png
delete mode 100644 files/images/skins/gta3/Skin073.png
delete mode 100644 files/images/skins/gta3/Skin074.png
delete mode 100644 files/images/skins/gta3/Skin075.png
delete mode 100644 files/images/skins/gta3/Skin076.png
delete mode 100644 files/images/skins/gta3/Skin077.png
delete mode 100644 files/images/skins/gta3/Skin078.png
delete mode 100644 files/images/skins/gta3/Skin080.png
delete mode 100644 files/images/skins/gta3/Skin081.png
delete mode 100644 files/images/skins/gta3/Skin082.png
delete mode 100644 files/images/skins/gta3/Skin083.png
delete mode 100644 files/images/skins/gta3/Skin084.png
delete mode 100644 files/images/skins/gta3/Skin085.png
delete mode 100644 files/images/skins/gta3/Skin086.png
delete mode 100644 files/images/skins/gta3/Skin087.png
delete mode 100644 files/images/skins/gta3/Skin088.png
delete mode 100644 files/images/skins/gta3/Skin089.png
delete mode 100644 files/images/skins/gta3/Skin090.png
delete mode 100644 files/images/skins/gta3/Skin091 (1).png
delete mode 100644 files/images/skins/gta3/Skin091.png
delete mode 100644 files/images/skins/gta3/Skin092.png
delete mode 100644 files/images/skins/gta3/Skin093.png
delete mode 100644 files/images/skins/gta3/Skin094.png
delete mode 100644 files/images/skins/gta3/Skin095.png
delete mode 100644 files/images/skins/gta3/Skin096.png
delete mode 100644 files/images/skins/gta3/Skin097.png
delete mode 100644 files/images/skins/gta3/Skin098.png
delete mode 100644 files/images/skins/gta3/Skin099.png
delete mode 100644 files/images/skins/gta3/Skin100.png
delete mode 100644 files/images/skins/gta3/Skin101.png
delete mode 100644 files/images/skins/gta3/Skin102.png
delete mode 100644 files/images/skins/gta3/Skin103.png
delete mode 100644 files/images/skins/gta3/Skin104.png
delete mode 100644 files/images/skins/gta3/Skin105.png
delete mode 100644 files/images/skins/gta3/Skin106.png
delete mode 100644 files/images/skins/gta3/Skin107.png
delete mode 100644 files/images/skins/gta3/Skin108.png
delete mode 100644 files/images/skins/gta3/Skin109.png
delete mode 100644 files/images/skins/gta3/Skin110.png
delete mode 100644 files/images/skins/gta3/Skin111.png
delete mode 100644 files/images/skins/gta3/Skin112.png
delete mode 100644 files/images/skins/gta3/Skin113.png
delete mode 100644 files/images/skins/gta3/Skin114.png
delete mode 100644 files/images/skins/gta3/Skin115.png
delete mode 100644 files/images/skins/gta3/Skin116.png
delete mode 100644 files/images/skins/gta3/Skin118.png
delete mode 100644 files/images/skins/gta3/Skin119.png
delete mode 100644 files/images/skins/gta3/Skin120.png
delete mode 100644 files/images/skins/gta3/Skin121.png
delete mode 100644 files/images/skins/none.png
create mode 100644 third-party/mathjs/mathjs.min.js
delete mode 100644 third-party/mexui/Core/Component/Control.js
delete mode 100644 third-party/mexui/Core/Component/Entry.js
delete mode 100644 third-party/mexui/Core/Component/Event.js
delete mode 100644 third-party/mexui/Core/Component/Window.js
delete mode 100644 third-party/mexui/Core/Control/Button.js
delete mode 100644 third-party/mexui/Core/Control/Character.js
delete mode 100644 third-party/mexui/Core/Control/Characters.js
delete mode 100644 third-party/mexui/Core/Control/CheckBox.js
delete mode 100644 third-party/mexui/Core/Control/Date.js
delete mode 100644 third-party/mexui/Core/Control/Day.js
delete mode 100644 third-party/mexui/Core/Control/Digit.js
delete mode 100644 third-party/mexui/Core/Control/Digits.js
delete mode 100644 third-party/mexui/Core/Control/DropDown.js
delete mode 100644 third-party/mexui/Core/Control/Grid.js
delete mode 100644 third-party/mexui/Core/Control/Hour.js
delete mode 100644 third-party/mexui/Core/Control/Image.js
delete mode 100644 third-party/mexui/Core/Control/Integer.js
delete mode 100644 third-party/mexui/Core/Control/Letter.js
delete mode 100644 third-party/mexui/Core/Control/LetterDigit.js
delete mode 100644 third-party/mexui/Core/Control/Letters.js
delete mode 100644 third-party/mexui/Core/Control/LettersDigits.js
delete mode 100644 third-party/mexui/Core/Control/Line.js
delete mode 100644 third-party/mexui/Core/Control/List.js
delete mode 100644 third-party/mexui/Core/Control/Minute.js
delete mode 100644 third-party/mexui/Core/Control/Month.js
delete mode 100644 third-party/mexui/Core/Control/Number.js
delete mode 100644 third-party/mexui/Core/Control/Password.js
delete mode 100644 third-party/mexui/Core/Control/PositiveInteger.js
delete mode 100644 third-party/mexui/Core/Control/PositiveNumber.js
delete mode 100644 third-party/mexui/Core/Control/ProgressBar.js
delete mode 100644 third-party/mexui/Core/Control/RadioButton.js
delete mode 100644 third-party/mexui/Core/Control/RangedInteger.js
delete mode 100644 third-party/mexui/Core/Control/RangedNumber.js
delete mode 100644 third-party/mexui/Core/Control/Rectangle.js
delete mode 100644 third-party/mexui/Core/Control/ScrollBar.js
delete mode 100644 third-party/mexui/Core/Control/Second.js
delete mode 100644 third-party/mexui/Core/Control/Slider.js
delete mode 100644 third-party/mexui/Core/Control/TabPanel.js
delete mode 100644 third-party/mexui/Core/Control/Text.js
delete mode 100644 third-party/mexui/Core/Control/TextArea.js
delete mode 100644 third-party/mexui/Core/Control/TextInput.js
delete mode 100644 third-party/mexui/Core/Control/Time.js
delete mode 100644 third-party/mexui/Core/Control/Tree.js
delete mode 100644 third-party/mexui/Core/Control/Week.js
delete mode 100644 third-party/mexui/Core/Control/WeekDay.js
delete mode 100644 third-party/mexui/Core/Control/Year.js
delete mode 100644 third-party/mexui/Core/Entity/Component.js
delete mode 100644 third-party/mexui/Core/Entity/ControlAxis.js
delete mode 100644 third-party/mexui/Core/Entity/ControlWithEntries.js
delete mode 100644 third-party/mexui/Core/Entity/StyleableEntity.js
delete mode 100644 third-party/mexui/Core/Entity/Transition.js
delete mode 100644 third-party/mexui/Core/Entry/DropDownItem.js
delete mode 100644 third-party/mexui/Core/Entry/GridColumn.js
delete mode 100644 third-party/mexui/Core/Entry/GridRow.js
delete mode 100644 third-party/mexui/Core/Entry/ListRow.js
delete mode 100644 third-party/mexui/Core/Entry/Tab.js
delete mode 100644 third-party/mexui/Core/Entry/TreeRow.js
delete mode 100644 third-party/mexui/Core/Init.js
delete mode 100644 third-party/mexui/Core/Native.js
delete mode 100644 third-party/mexui/Core/Utility.js
delete mode 100644 third-party/mexui/Images/down-arrow.png
delete mode 100644 third-party/mexui/mexui.js
create mode 100644 third-party/moment/moment.min.js
diff --git a/files/fonts/pricedown.ttf b/files/fonts/pricedown.ttf
deleted file mode 100644
index 69c76cf3f2a6bbc93f570124554fec06d7bbac25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 151512
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