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

Use server config for economy settings

Browse Source
This commit is contained in:
Vortrex
2023-03-01 01:20:22 -06:00
parent 3f925a4a44
commit 9f8d4cf034
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/server/economy.js
View File

@@ -31,7 +31,7 @@ function playerPayDay(client) {
let grossIncome = getPlayerData(client).payDayAmount; let grossIncome = getPlayerData(client).payDayAmount;
// Passive income // Passive income
grossIncome = Math.round(grossIncome + getGlobalConfig().economy.passiveIncomePerPayDay); grossIncome = Math.round(grossIncome + getServerConfig().economy.passiveIncomePerPayDay);
// Job Pay // Job Pay
if (getPlayerJob(client) != -1) { if (getPlayerJob(client) != -1) {
@@ -39,7 +39,7 @@ function playerPayDay(client) {
} }
// Payday bonus // Payday bonus
grossIncome = Math.round(grossIncome * getGlobalConfig().economy.grossIncomeMultiplier); grossIncome = Math.round(grossIncome * getServerConfig().economy.grossIncomeMultiplier);
// Double bonus // Double bonus
if (isDoubleBonusActive()) { if (isDoubleBonusActive()) {
@@ -89,9 +89,9 @@ function calculateWealth(client) {
let houses = getAllHousesOwnedByPlayer(client); let houses = getAllHousesOwnedByPlayer(client);
let businesses = getAllBusinessesOwnedByPlayer(client); let businesses = getAllBusinessesOwnedByPlayer(client);
let vehicleUpKeep = applyServerInflationMultiplier(vehicles.length * getGlobalConfig().economy.upKeepCosts.upKeepPerVehicle); let vehicleUpKeep = applyServerInflationMultiplier(vehicles.length * getServerConfig().economy.upKeepCosts.upKeepPerVehicle);
let houseUpKeep = applyServerInflationMultiplier(houses.length * getGlobalConfig().economy.upKeepCosts.upKeepPerHouse); let houseUpKeep = applyServerInflationMultiplier(houses.length * getServerConfig().economy.upKeepCosts.upKeepPerHouse);
let businessUpKeep = applyServerInflationMultiplier(businesses.length * getGlobalConfig().economy.upKeepCosts.upKeepPerBusiness); let businessUpKeep = applyServerInflationMultiplier(businesses.length * getServerConfig().economy.upKeepCosts.upKeepPerBusiness);
return vehicleUpKeep + houseUpKeep + businessUpKeep; return vehicleUpKeep + houseUpKeep + businessUpKeep;
} }
@@ -99,7 +99,7 @@ function calculateWealth(client) {
// =========================================================================== // ===========================================================================
function calculateIncomeTax(amount) { function calculateIncomeTax(amount) {
return amount * getGlobalConfig().economy.incomeTaxRate; return amount * getServerConfig().economy.incomeTaxRate;
} }
// =========================================================================== // ===========================================================================
@@ -135,7 +135,7 @@ function setPayDayBonusMultiplier(command, params, client) {
return false; return false;
} }
getGlobalConfig().economy.grossIncomeMultiplier = newMultiplier; getServerConfig().economy.grossIncomeMultiplier = newMultiplier;
announceAdminAction(`PaydayBonusSet`, `{adminOrange}${getPlayerName(client)}{MAINCOLOUR}`, `{ALTCOLOUR}${newMultiplier * 100}%{MAINCOLOUR}`); announceAdminAction(`PaydayBonusSet`, `{adminOrange}${getPlayerName(client)}{MAINCOLOUR}`, `{ALTCOLOUR}${newMultiplier * 100}%{MAINCOLOUR}`);
} }
@@ -173,19 +173,19 @@ function repossessFirstAsset(client) {
let vehicles = getAllVehiclesOwnedByPlayer(client); let vehicles = getAllVehiclesOwnedByPlayer(client);
if (vehicles.length > 0) { if (vehicles.length > 0) {
deleteVehicle(vehicles[0]); deleteVehicle(vehicles[0]);
return getGlobalConfig().economy.upKeepCosts.upKeepPerVehicle; return getServerConfig().economy.upKeepCosts.upKeepPerVehicle;
} }
let houses = getAllHousesOwnedByPlayer(client); let houses = getAllHousesOwnedByPlayer(client);
if (houses.length > 0) { if (houses.length > 0) {
deleteHouse(houses[0].index); deleteHouse(houses[0].index);
return getGlobalConfig().economy.upKeepCosts.upKeepPerHouse; return getServerConfig().economy.upKeepCosts.upKeepPerHouse;
} }
let businesses = getAllBusinessesOwnedByPlayer(client); let businesses = getAllBusinessesOwnedByPlayer(client);
if (businesses.length > 0) { if (businesses.length > 0) {
deleteBusiness(businesses[0].index); deleteBusiness(businesses[0].index);
return getGlobalConfig().economy.upKeepCosts.upKeepPerBusiness; return getServerConfig().economy.upKeepCosts.upKeepPerBusiness;
} }
} }
@@ -220,7 +220,7 @@ function isDoubleBonusActive() {
// =========================================================================== // ===========================================================================
function getCurrencyString(amount) { function getCurrencyString(amount) {
let tempString = getGlobalConfig().economy.currencyString; let tempString = getServerConfig().economy.currencyString;
tempString = tempString.replace("{AMOUNT}", toString(makeLargeNumberReadable(amount))); tempString = tempString.replace("{AMOUNT}", toString(makeLargeNumberReadable(amount)));
return tempString; return tempString;
} }