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

Combine time, weather & snow into one line

Browse Source
This commit is contained in:
Vortrex
2022-10-25 22:41:15 -05:00
parent ee4d4e3621
commit 54663dac0d
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
scripts/server/utilities.js
View File

@@ -79,32 +79,44 @@ function initAllClients() {
function updateServerRules() { function updateServerRules() {
logToConsole(LOG_DEBUG, `[AGRP.Utilities]: Updating all server rules ...`); logToConsole(LOG_DEBUG, `[AGRP.Utilities]: Updating all server rules ...`);
logToConsole(LOG_DEBUG, `[AGRP.Utilities]: Time support: ${isTimeSupported()}`); let timeWeatherRule = [];
let tempText = "";
if (isTimeSupported()) { if (isTimeSupported()) {
if (getServerConfig() != false) { if (getServerConfig() != false) {
let value = makeReadableTime(getServerConfig().hour, getServerConfig().minute); tempText = makeReadableTime(getServerConfig().hour, getServerConfig().minute);
logToConsole(LOG_DEBUG, `[AGRP.Utilities]: Setting server rule "Time" as ${value}`); timeWeatherRule.push(tempText);
server.setRule("Time", value); }
} else {
if (getGame() == AGRP_GAME_MAFIA_ONE) {
if (isNightTime(getServerConfig().hour)) {
tempText = "Night";
} else {
tempText = "Day";
}
timeWeatherRule.push(tempText);
} }
} }
if (isWeatherSupported()) { if (isWeatherSupported()) {
if (getServerConfig() != false) { if (getServerConfig() != false) {
if (typeof getGameConfig().weatherNames[getGame()] != "undefined") { if (typeof getGameConfig().weatherNames[getGame()] != "undefined") {
let value = getGameConfig().weatherNames[getGame()][getServerConfig().weather]; let tempText = getGameConfig().weatherNames[getGame()][getServerConfig().weather];
logToConsole(LOG_DEBUG, `[AGRP.Utilities]: Setting server rule "Weather" as ${value}`); timeWeatherRule.push(tempText);
server.setRule("Weather", value);
} }
} }
} }
if (isSnowSupported()) { if (isSnowSupported()) {
if (getServerConfig() != false) { if (getServerConfig() != false) {
let value = getYesNoFromBool(getServerConfig().fallingSnow); if (getServerConfig().fallingSnow == true) {
logToConsole(LOG_DEBUG, `[AGRP.Utilities]: Setting server rule "Snowing" as ${value}`); timeWeatherRule.push("Snowing");
server.setRule("Snowing", value); }
} }
} }
setServerRule("Time & Weather", timeWeatherRule.join(", "));
logToConsole(LOG_DEBUG, `[AGRP.Utilities]: All server rules updated successfully!`); logToConsole(LOG_DEBUG, `[AGRP.Utilities]: All server rules updated successfully!`);
} }
@@ -412,22 +424,6 @@ function clearTemporaryPeds() {
// =========================================================================== // ===========================================================================
function updateTimeRule() {
if (isTimeSupported()) {
server.setRule("Time", makeReadableTime(game.time.hour, game.time.minute));
}
if (getGame() == AGRP_GAME_MAFIA_ONE) {
if (isNightTime(getServerConfig().hour)) {
server.setRule("Time", "Night");
} else {
server.setRule("Time", "Day");
}
}
}
// ===========================================================================
function isClientInitialized(client) { function isClientInitialized(client) {
//if (typeof getServerData().clients[getPlayerId(client)] == "undefined") { //if (typeof getServerData().clients[getPlayerId(client)] == "undefined") {
// return false; // return false;