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

Just set skin for job uniform, dont use item

Browse Source
This commit is contained in:
Vortrex
2021-01-19 04:45:40 -06:00
parent 4e63b78258
commit 3c0e44479c
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/server/job.js
View File

@@ -533,6 +533,7 @@ function stopWorking(client) {
getPlayerCurrentSubAccount(client).lastJobVehicle = false; getPlayerCurrentSubAccount(client).lastJobVehicle = false;
} }
setPlayerSkin(client, getPlayerCurrentSubAccount(client).skin);
deleteJobItems(client); deleteJobItems(client);
restorePlayerJobLockerItems(client); restorePlayerJobLockerItems(client);
@@ -607,13 +608,15 @@ function jobUniformCommand(command, params, client) {
return false; 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); //messagePlayerSuccess(client, `You have been given a [#AAAAAA]${uniforms[uniformId-1].name} [#FFFFFF]uniform and you can put it on from your inventory.`);
let freeSlot = getPlayerFirstEmptyHotBarSlot(client); meActionToNearbyPlayers(client, `${getCharacterFullName(client)} puts on ${getProperDeterminerForName(getJobData(jobId).uniforms[uniformId-1].name)} ${getJobData(jobId).uniforms[uniformId-1].name} uniform`);
getPlayerData(client).hotBarItems[freeSlot] = itemId; //let itemId = createItem(getItemTypeFromParams("Outfit"), getJobData(jobId).uniforms[uniformId-1].skin, AG_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
getPlayerData(client).jobEquipmentCache.push(itemId); //let freeSlot = getPlayerFirstEmptyHotBarSlot(client);
updatePlayerHotBar(client); //getPlayerData(client).hotBarItems[freeSlot] = itemId;
//getPlayerData(client).jobEquipmentCache.push(itemId);
//updatePlayerHotBar(client);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -653,6 +656,7 @@ function jobEquipmentCommand(command, params, client) {
return false; return false;
} }
deleteJobItems(client);
givePlayerJobEquipment(client, equipmentId-1); givePlayerJobEquipment(client, equipmentId-1);
messagePlayerSuccess(client, `You have been given the ${equipments[equipmentId-1].name} equipment`); messagePlayerSuccess(client, `You have been given the ${equipments[equipmentId-1].name} equipment`);
} }
@@ -717,7 +721,7 @@ function getJobData(jobId) {
function quitJob(client) { function quitJob(client) {
stopWorking(client); stopWorking(client);
getPlayerCurrentSubAccount(client).job = AG_JOB_NONE; 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.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.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.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); addToWorld(getJobData(jobId).locations[locationId].pickup);
} }
} }
@@ -1605,7 +1609,7 @@ function deleteJobItems(client) {
deleteItem(getPlayerData(client).jobEquipmentCache[i]); deleteItem(getPlayerData(client).jobEquipmentCache[i]);
} }
updatePlayerHotBar(client);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------