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

Don't check for ammo item on non-ammo weapons

Browse Source
This commit is contained in:
Vortrex
2022-06-26 14:36:11 -05:00
parent ad672a5912
commit 0f6ab26ca9
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/server/item.js
View File

@@ -1281,24 +1281,28 @@ function playerUseItem(client, hotBarSlot) {
} }
case VRR_ITEM_USETYPE_WEAPON: { case VRR_ITEM_USETYPE_WEAPON: {
for (let i in hotBarItems) { if (isMeleeWeapon(itemTypeData.useId, getGame()) == true) {
if (hotBarItems[i] != -1) { messagePlayerError(client, getLocaleString(client, "WeaponDoesNotUseAmmo", itemTypeData.name));
if (getItemData(hotBarItems[i]) != false) { } else {
if (getItemTypeData(getItemData(hotBarItems[i]).itemTypeIndex).useType == VRR_ITEM_USETYPE_AMMO_CLIP) { for (let i in hotBarItems) {
let ammoItemData = getItemData(hotBarItems[i]); if (hotBarItems[i] != -1) {
let ammoItemTypeData = getItemTypeData(ammoItemData.itemTypeIndex); if (getItemData(hotBarItems[i]) != false) {
if (ammoItemTypeData.useId == itemTypeData.databaseId) { if (getItemTypeData(getItemData(hotBarItems[i]).itemTypeIndex).useType == VRR_ITEM_USETYPE_AMMO_CLIP) {
givePlayerWeaponAmmo(client, ammoItemData.value); let ammoItemData = getItemData(hotBarItems[i]);
itemData.value = itemData.value + ammoItemData.value; let ammoItemTypeData = getItemTypeData(ammoItemData.itemTypeIndex);
deleteItem(hotBarItems[i]); if (ammoItemTypeData.useId == itemTypeData.databaseId) {
meActionToNearbyPlayers(client, `loads some ammo into their ${itemTypeData.name}`); givePlayerWeaponAmmo(client, ammoItemData.value);
return true; itemData.value = itemData.value + ammoItemData.value;
deleteItem(hotBarItems[i]);
meActionToNearbyPlayers(client, `loads some ammo into their ${itemTypeData.name}`);
return true;
}
} }
} }
} }
} }
messagePlayerError(client, getLocaleString(client, "NoAmmoToLoadIntoWeapon", itemTypeData.name));
} }
messagePlayerError(client, getLocaleString(client, "NoAmmoToLoadIntoWeapon", itemTypeData.name));
break; break;
} }