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

Fix using some items

Browse Source
This commit is contained in:
Vortrex
2021-10-25 13:04:50 -05:00
parent 2a032c694c
commit 02cbdf61ef
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/server/item.js
View File

@@ -552,6 +552,9 @@ function playerUseItem(client, hotBarSlot) {
let closestPlayer; let closestPlayer;
let tempUseValue; let tempUseValue;
let vehicle;
let fuelPump;
let itemIndex = getPlayerData(client).hotBarItems[hotBarSlot]; let itemIndex = getPlayerData(client).hotBarItems[hotBarSlot];
if(itemIndex == -1) { if(itemIndex == -1) {
@@ -656,7 +659,7 @@ function playerUseItem(client, hotBarSlot) {
repairVehicle(vehicle); repairVehicle(vehicle);
getItemData(itemIndex).value = getItemData(itemIndex).value - getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue; getItemData(itemIndex).value = getItemData(itemIndex).value - getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue;
if(getItemData(itemIndex).value == 0) { if(getItemData(itemIndex).value <= 0) {
destroyItem(itemIndex); destroyItem(itemIndex);
} }
} }
@@ -695,7 +698,7 @@ function playerUseItem(client, hotBarSlot) {
case VRR_ITEM_USETYPE_FUELCAN: case VRR_ITEM_USETYPE_FUELCAN:
vehicle = getClosestVehicle(getPlayerPosition(client)); vehicle = getClosestVehicle(getPlayerPosition(client));
let fuelPump = getClosestFuelPump(getPlayerPosition(client)); fuelPump = getClosestFuelPump(getPlayerPosition(client));
if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getDistance(getPlayerPosition(client), getFuelPumpData(fuelPump).position)) { if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getDistance(getPlayerPosition(client), getFuelPumpData(fuelPump).position)) {
if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getGlobalConfig().vehicleRepairDistance) { if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getGlobalConfig().vehicleRepairDistance) {
meActionToNearbyPlayers(client, `takes their fuel can and refills the vehicle`); meActionToNearbyPlayers(client, `takes their fuel can and refills the vehicle`);
@@ -762,7 +765,17 @@ function playerUseItem(client, hotBarSlot) {
switchPlayerActiveHotBarSlot(client, -1); switchPlayerActiveHotBarSlot(client, -1);
break; break;
case VRR_ITEM_USETYPE_PLANT:
meActionToNearbyPlayers(client, `bends down and plants a ${getItemName(itemIndex)} in the ground`);
createGroundPlant(itemIndex);
if(getItemData(itemIndex).value == 0) {
destroyItem(itemIndex);
switchPlayerActiveHotBarSlot(client, -1);
}
break;
case VRR_ITEM_USETYPE_BADGE: case VRR_ITEM_USETYPE_BADGE:
meActionToNearbyPlayers(client, `shows their badge to everyone nearby.`);
let clients = getClients(); let clients = getClients();
for(let i in clients) { for(let i in clients) {
if(getDistance(getPlayerPosition(client), getPlayerPosition(clients[i])) <= 7) { if(getDistance(getPlayerPosition(client), getPlayerPosition(clients[i])) <= 7) {
@@ -1833,4 +1846,11 @@ function getItemPosition(itemId) {
} }
} }
// =========================================================================== // ===========================================================================
function createGroundPlant(itemId) {
createGroundItem(getItemTypeData(itemId).useId, 1, position, dimension);
groundPlantCache.push(itemId);
groundItemCache.push(itemId);
}