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

Fix NPC saving and utils

Browse Source
This commit is contained in:
Vortrex
2022-10-02 09:11:14 -05:00
parent 36e2175075
commit 34b84aeea0
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/server/npc.js
View File

@@ -45,6 +45,7 @@ class NPCData {
this.scale = toVector3(1.0, 1.0, 1.0); this.scale = toVector3(1.0, 1.0, 1.0);
this.heading = 0.0; this.heading = 0.0;
this.clan = 0; this.clan = 0;
this.rank = 0;
this.isWorking = false; this.isWorking = false;
this.jobUniform = this.skin; this.jobUniform = this.skin;
this.lastJobVehicle = null; this.lastJobVehicle = null;
@@ -104,8 +105,8 @@ class NPCData {
this.job = toInteger(dbAssoc["npc_job"]); this.job = toInteger(dbAssoc["npc_job"]);
this.interior = toInteger(dbAssoc["npc_int"]); this.interior = toInteger(dbAssoc["npc_int"]);
this.dimension = toInteger(dbAssoc["npc_vw"]); this.dimension = toInteger(dbAssoc["npc_vw"]);
this.walkStyle = toInteger(dbAssoc["npc_walkstyle"]); this.walkStyle = toInteger(dbAssoc["npc_walk_style"]);
this.fightStyle = toInteger(dbAssoc["npc_fightstyle"]); this.fightStyle = toInteger(dbAssoc["npc_fight_style"]);
this.health = toInteger(dbAssoc["npc_health"]); this.health = toInteger(dbAssoc["npc_health"]);
this.armour = toInteger(dbAssoc["npc_armour"]); this.armour = toInteger(dbAssoc["npc_armour"]);
this.typeFlags = toInteger(dbAssoc["npc_type_flags"]); this.typeFlags = toInteger(dbAssoc["npc_type_flags"]);
@@ -421,8 +422,8 @@ function saveNPCToDatabase(npcDataId) {
["npc_type_flags", toInteger(tempNPCData.typeFlags)], ["npc_type_flags", toInteger(tempNPCData.typeFlags)],
["npc_int", toInteger(tempNPCData.interior)], ["npc_int", toInteger(tempNPCData.interior)],
["npc_vw", toInteger(tempNPCData.dimension)], ["npc_vw", toInteger(tempNPCData.dimension)],
["npc_fight_style", toInteger(tempNPCData.walkStyle)], ["npc_fight_style", toInteger(tempNPCData.fightStyle)],
["npc_walk_style", toInteger(tempNPCData.fightStyle)], ["npc_walk_style", toInteger(tempNPCData.walkStyle)],
["npc_rank", toInteger(tempNPCData.rank)], ["npc_rank", toInteger(tempNPCData.rank)],
["npc_title", toString(safeTitle)], ["npc_title", toString(safeTitle)],
["npc_enabled", boolToInt(tempNPCData.enabled)], ["npc_enabled", boolToInt(tempNPCData.enabled)],
@@ -524,7 +525,7 @@ function deleteNPC(npcId) {
if (getNPCData(npcId)) { if (getNPCData(npcId)) {
if (getNPCData(npcId).ped != false) { if (getNPCData(npcId).ped != false) {
deleteEntity(getNPCData(npcId).ped); deleteGameElement(getNPCData(npcId).ped);
} }
getServerData().npcs.splice(npcId, 1); getServerData().npcs.splice(npcId, 1);
} }
@@ -676,7 +677,7 @@ function getNPCInfoCommand(command, params, client) {
return false; return false;
} }
let closestNPC = getClosestNPC(getPlayerPosition(client)); let closestNPC = getClosestNPC(getPlayerPosition(client), getPlayerDimension(client), getPlayerInterior(client));
if (!getNPCData(closestNPC)) { if (!getNPCData(closestNPC)) {
messagePlayerError(client, getLocaleString(client, "InvalidNPC")); messagePlayerError(client, getLocaleString(client, "InvalidNPC"));
@@ -736,7 +737,7 @@ function getNPCInfoCommand(command, params, client) {
// =========================================================================== // ===========================================================================
function getClosestNPC(position, interior, dimension) { function getClosestNPC(position, dimension, interior) {
let npcs = getServerData().npcs; let npcs = getServerData().npcs;
let closest = 0; let closest = 0;