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

Just change skin for job uniform, dont use item

Browse Source
This commit is contained in:
Vortrex
2021-01-19 04:45:20 -06:00
parent 98dc420a32
commit 4e63b78258
1 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
scripts/server/item.js
View File

@@ -351,7 +351,14 @@ function playerUseItem(client, hotBarSlot) {
switch(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useType) { switch(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useType) {
case AG_ITEM_USETYPE_SKIN: case AG_ITEM_USETYPE_SKIN:
let oldSkin = getPlayerSkin(client); let oldSkin = getPlayerSkin(client);
if(isPlayerWorking(client)) {
oldSkin = getPlayerCurrentSubAccount(client).skin;
}
let newSkin = getItemData(itemIndex).value; let newSkin = getItemData(itemIndex).value;
if(isPlayerWorking(client)) {
newSkin = getPlayerCurrentSubAccount(client).skin;
}
setPlayerSkin(client, newSkin); setPlayerSkin(client, newSkin);
getItemData(itemIndex).value = oldSkin; getItemData(itemIndex).value = oldSkin;
meActionToNearbyPlayers(client, `puts on ${getProperDeterminerForName(getSkinNameFromId(newSkin))} ${getSkinNameFromId(newSkin)} ${toLowerCase(getItemName(itemIndex))}`); meActionToNearbyPlayers(client, `puts on ${getProperDeterminerForName(getSkinNameFromId(newSkin))} ${getSkinNameFromId(newSkin)} ${toLowerCase(getItemName(itemIndex))}`);
@@ -487,6 +494,8 @@ function playerDropItem(client, hotBarSlot) {
if(itemId != -1) { if(itemId != -1) {
meActionToNearbyPlayers(client, `drops ${getProperDeterminerForName(getItemName(itemId))} ${getItemName(itemId)} on the ground`); meActionToNearbyPlayers(client, `drops ${getProperDeterminerForName(getItemName(itemId))} ${getItemName(itemId)} on the ground`);
resyncWeaponItemAmmo(client);
getPlayerData(client).hotBarItems[hotBarSlot] = -1; getPlayerData(client).hotBarItems[hotBarSlot] = -1;
updatePlayerHotBar(client); updatePlayerHotBar(client);
@@ -524,6 +533,8 @@ function playerPutItem(client, hotBarSlot) {
break; break;
} }
resyncWeaponItemAmmo(client);
getItemData(itemId).ownerType = ownerType; getItemData(itemId).ownerType = ownerType;
getItemData(itemId).ownerId = ownerId; getItemData(itemId).ownerId = ownerId;
getItemData(itemId).position = toVector(0.0, 0.0, 0.0); getItemData(itemId).position = toVector(0.0, 0.0, 0.0);
@@ -603,15 +614,18 @@ function playerSwitchItem(client, newHotBarSlot) {
newHotBarItem = getPlayerData(client).hotBarItems[newHotBarSlot]; newHotBarItem = getPlayerData(client).hotBarItems[newHotBarSlot];
} }
resyncWeaponItemAmmo(client);
if(currentHotBarItem != -1) { if(currentHotBarItem != -1) {
if(getItemData(currentHotBarItem)) { if(getItemData(currentHotBarItem)) {
if(getGlobalConfig().weaponEquippableTypes.indexOf(getItemTypeData(getItemData(currentHotBarItem).itemTypeIndex).useType) != -1) { if(getGlobalConfig().weaponEquippableTypes.indexOf(getItemTypeData(getItemData(currentHotBarItem).itemTypeIndex).useType) != -1) {
getItemData(currentHotBarItem).value = getPlayerWeaponAmmo(client);
clearPlayerWeapons(client); clearPlayerWeapons(client);
} }
} }
} }
if(newHotBarItem != -1) { if(newHotBarItem != -1) {
if(getItemData(newHotBarItem)) { if(getItemData(newHotBarItem)) {
if(getItemTypeData(getItemData(newHotBarItem).itemTypeIndex).useType == AG_ITEM_USETYPE_WEAPON) { 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) { if(getPlayerData(client).hotBarItems[i] == -1) {
itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA](Empty)`); itemDisplay.push(`[#CCCCCC]${toInteger(i)+1}: [#AAAAAA](Empty)`);
} else { } 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])}]`); 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) { function getItemData(itemId) {
return getServerData().items[itemId]; return getServerData().items[itemId];
} }
@@ -1276,3 +1282,21 @@ 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);
}
}
}
}
}
}
// ---------------------------------------------------------------------------