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

Use new char name util in chat event

Browse Source
This commit is contained in:
Vortrex
2020-12-27 12:31:39 -06:00
parent bca39aad91
commit bcbd6d208e
1 changed files with 81 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
scripts/server/event.js
View File

@@ -62,7 +62,9 @@ addEventHandler("onPlayerChat", function(event, client, messageText) {
return false; return false;
} }
message(`${getClientSubAccountName(client)}: [#FFFFFF]${messageText}`, getPlayerColour(client)); messageText = messageText.substring(0, 128);
message(`${getCharacterFullName(client)}: [#FFFFFF]${messageText}`, getPlayerColour(client));
}); });
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -77,6 +79,41 @@ addEventHandler("OnPedExitVehicle", function(event, ped, vehicle) {
//} //}
}); });
addEventHandler("OnProcess", function(event, deltaTime) {
let clients = getClients();
for(let i in clients) {
if(getPlayerData(clients[i])) {
if(getPlayerData(clients[i]).buyingVehicle) {
if(getPlayerVehicle(clients[i]) == getPlayerData(clients[i]).buyingVehicle) {
if(getDistance(getVehiclePosition(getPlayerData(clients[i]).buyingVehicle), getVehicleData(getPlayerData(clients[i]).buyingVehicle).spawnPosition) > getGlobalConfig().buyVehicleDriveAwayDistance) {
if(getClientCurrentSubAccount(clients[i]).cash < getVehicleData(getPlayerData(clients[i]).buyingVehicle).buyPrice) {
messageClientError(client, "You don't have enough money to buy this vehicle!");
respawnVehicle(getPlayerData(clients[i]).buyingVehicle);
getPlayerData(clients[i]).buyingVehicle = false;
return false;
}
createNewDealershipVehicle(getVehicleData(getPlayerData(clients[i]).buyingVehicle).model, getVehicleData(getPlayerData(clients[i]).buyingVehicle).spawnPosition, getVehicleData(getPlayerData(clients[i]).buyingVehicle).spawnRotation, getVehicleData(getPlayerData(clients[i]).buyingVehicle).buyPrice, getVehicleData(getPlayerData(clients[i]).buyingVehicle).ownerId);
getClientCurrentSubAccount(clients[i]).cash -= getVehicleData(getPlayerData(clients[i]).buyingVehicle).buyPrice;
updatePlayerCash(clients[i]);
getVehicleData(getPlayerData(clients[i]).buyingVehicle).ownerId = getClientCurrentSubAccount(clients[i]).databaseId;
getVehicleData(getPlayerData(clients[i]).buyingVehicle).ownerType = AG_VEHOWNER_PLAYER;
getVehicleData(getPlayerData(clients[i]).buyingVehicle).buyPrice = 0;
getVehicleData(getPlayerData(clients[i]).buyingVehicle).rentPrice = 0;
getVehicleData(getPlayerData(clients[i]).buyingVehicle).spawnLocked = false;
getPlayerData(clients[i]).buyingVehicle = false;
messageClientSuccess(clients[i], "This vehicle is now yours! It will save wherever you leave it.");
}
} else {
messageClientError(client, "You canceled the vehicle purchase by exiting the vehicle!");
respawnVehicle(getPlayerData(clients[i]).buyingVehicle);
getPlayerData(clients[i]).buyingVehicle = false;
}
}
}
}
});
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
addEventHandler("OnPedEnterVehicle", function(event, ped, vehicle, seat) { addEventHandler("OnPedEnterVehicle", function(event, ped, vehicle, seat) {
@@ -91,7 +128,11 @@ addEventHandler("OnPedEnterVehicle", function(event, ped, vehicle, seat) {
if(ped.isType(ELEMENT_PLAYER)) { if(ped.isType(ELEMENT_PLAYER)) {
let client = getClientFromPlayerElement(ped); let client = getClientFromPlayerElement(ped);
if(!getVehicleData(vehicle).engine) { if(seat == 0) {
vehicle.engine = getVehicleData(vehicle).engine;
}
if(getVehicleData(vehicle).locked) {
if(doesClientHaveVehicleKeys(client, vehicle)) { if(doesClientHaveVehicleKeys(client, vehicle)) {
messageClientNormal(client, `🔒 This ${getVehicleName(vehicle)} is locked. Use /lock to unlock it`); messageClientNormal(client, `🔒 This ${getVehicleName(vehicle)} is locked. Use /lock to unlock it`);
if(doesPlayerHaveKeyBindForCommand(client, "lock")) { if(doesPlayerHaveKeyBindForCommand(client, "lock")) {
@@ -106,20 +147,14 @@ addEventHandler("OnPedEnterVehicle", function(event, ped, vehicle, seat) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function playerEnteredVehicle(client, vehicleId) { async function playerEnteredVehicle(client) {
setTimeout(function() { await waitUntil(() => client.player.vehicle != null);
let vehicle = client.player.vehicle; let vehicle = client.player.vehicle;
//console.log(`Vehicle: ${vehicle}`); console.log(vehicle);
//if(!vehicle || vehicle == null) {
// return false;
//}
//if(!getVehicleData(vehicle)) {
// return false;
//}
if(getPlayerVehicleSeat(client) == AG_VEHSEAT_DRIVER) { if(getPlayerVehicleSeat(client) == AG_VEHSEAT_DRIVER) {
vehicle.engine = getVehicleData(vehicle).engine;
if(getVehicleData(vehicle).buyPrice > 0) { if(getVehicleData(vehicle).buyPrice > 0) {
messageClientAlert(client, `This ${getVehicleName(vehicle)} is for sale! Cost: [#AAAAAA]$${getVehicleData(vehicle).buyPrice}`); messageClientAlert(client, `This ${getVehicleName(vehicle)} is for sale! Cost: [#AAAAAA]$${getVehicleData(vehicle).buyPrice}`);
messageClientTip(client, `Use /vehbuy if you want to buy it.`); messageClientTip(client, `Use /vehbuy if you want to buy it.`);
@@ -153,7 +188,6 @@ function playerEnteredVehicle(client, vehicleId) {
} }
} }
} }
}, 1000);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------