huashui
/
KP-Liberation
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #708 from KillahPotatoes/v0.96.7-Wyqer2 

V0.96.7 wyqer2
This commit is contained in:
Christian 2019-11-22 20:30:30 +01:00 committed by GitHub
parent d719097beb 67d2652369
commit 87db8f8367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Missionframework/kp_liberation_config.sqf
View File

@ -335,9 +335,6 @@ blacklisted_from_arsenal = [
"O_UAV_06_medical_backpack_F",
"O_UGV_02_Demining_backpack_F",
"O_UGV_02_Science_backpack_F",
"optic_Nightstalker",
"optic_tws_mg",
"optic_tws",
"RHS_AGS30_Gun_Bag",
"RHS_AGS30_Tripod_Bag",
"RHS_DShkM_Gun_Bag",

17
Missionframework/scripts/server/game/server_restart.sqf
View File

@ -1,18 +1,17 @@
if (!isDedicated) exitWith {};
private ["_serverDuration","_timeStart","_timeSinceStart","_shutdownSuccess","_timeUntilRestart","_30minspassed","_15minspassed","_5minspassed","_60secondspassed"];
_serverDuration = (KP_liberation_restart * 60 * 60);
diag_log format ["[KP LIBERATION] [RESTART] Restart Timer Set To %1", _serverDuration];
_30minspassed = false;
_15minspassed = false;
_5minspassed = false;
_60secondspassed = false;
private _30minspassed = false;
private _15minspassed = false;
private _5minspassed = false;
private _60secondspassed = false;
_timeStart = diag_tickTime;
private _timeStart = diag_tickTime;
private ["_timeSinceStart","_timeUntilRestart"];
while{true} do
{
_timeSinceStart = diag_tickTime - _timeStart;
@ -57,8 +56,8 @@ while{true} do
diag_log "[KP LIBERATION] [RESTART] Restart timeout elapsed, attempting server shutdown.";
sleep 5;
_myPass = call compile preprocessFileLineNumbers "\userconfig\restart\myPass.hpp";
_shutdownSuccess = _myPass serverCommand "#restart";//you can change with #restartserver if you want to restart the server process(Windows Dedicated Only).
private _myPass = call compile preprocessFileLineNumbers "\userconfig\restart\myPass.hpp";
private _shutdownSuccess = _myPass serverCommand (["#restart", "#restartserver"] select ((productVersion select 6) isEqualTo "Windows"));
if(_shutdownSuccess) then
{

17
Missionframework/scripts/shared/defines.hpp
View File

@ -1,13 +1,10 @@
/*
Methods
*/
// Get parameter
#define GET_PARAM(outVar, paramName, paramDefault) outVar = [paramName,paramDefault] call F_getSaveableParam;\
publicVariable #outVar
#define GET_PARAM(outVar, paramName, paramDefault) outVar = [paramName,paramDefault] call F_getSaveableParam;\
publicVariable #outVar;\
diag_log format ["[KP LIBERATION] [PARAM] %1: %2", paramName, outVar]
// Get parameter and convert to bool
#define GET_PARAM_BOOL(outVar, paramName, paramDefault) outVar = [paramName,paramDefault] call F_getSaveableParam;\
if (outVar == 1) then {outVar = true} else {outVar = false};\
publicVariable #outVar
#define GET_PARAM_BOOL(outVar, paramName, paramDefault) outVar = [paramName,paramDefault] call F_getSaveableParam;\
if (outVar == 1) then {outVar = true} else {outVar = false};\
publicVariable #outVar;\
diag_log format ["[KP LIBERATION] [PARAM] %1: %2", paramName, outVar]

23
Missionframework/scripts/shared/fetch_params.sqf
View File

@ -1,7 +1,7 @@
#include "defines.hpp"
// Check if ACE is running
if (isClass (configfile >> "CfgPatches" >> "ace_common")) then {KP_liberation_ace = true; diag_log "[KP LIBERATION] ACE detected. Deactivating resupply and weather scripts from Liberation."} else {KP_liberation_ace = false};
if (isClass (configfile >> "CfgPatches" >> "ace_common")) then {KP_liberation_ace = true; diag_log "[KP LIBERATION] ACE detected. Deactivating resupply script from Liberation."} else {KP_liberation_ace = false};
/* Not saveable params */
GRLIB_param_wipe_savegame_1 = ["WipeSave1",0] call bis_fnc_getParamValue;
@ -19,11 +19,26 @@ KP_load_params = ["LoadSaveParams", 1] call BIS_fnc_getParamValue;
if(isServer) then {
/* Saveable params */
diag_log format ["[KP LIBERATION] [PARAM] ----- Server starts parameter initialization - time: %1", diag_ticktime];
switch (KP_load_params) do {
case 0: {
diag_log "[KP LIBERATION] [PARAM] Save/Load is set to SAVE";
};
case 1: {
diag_log "[KP LIBERATION] [PARAM] Save/Load is set to LOAD";
};
case 2: {
diag_log "[KP LIBERATION] [PARAM] Save/Load is set to USE SELECTED";
};
default {
diag_log "[KP LIBERATION] [PARAM] Save/Load has no valid value";
};
};
// Deactivate BI Revive when ACE Medical is running
if (isClass (configfile >> "CfgPatches" >> "ace_medical")) then {
bis_reviveParam_mode = 0; publicVariable "bis_reviveParam_mode";
diag_log "[KP LIBERATION] ACE Medical detected. Deactivating BI Revive System."
diag_log "[KP LIBERATION] [PARAM] ACE Medical detected. Deactivating BI Revive System."
} else {
GET_PARAM(bis_reviveParam_mode, "ReviveMode", 1);
};
@ -40,7 +55,7 @@ if(isServer) then {
GET_PARAM(GRLIB_time_factor, "DayDuration", 12);
GET_PARAM(GRLIB_resources_multiplier, "ResourcesMultiplier", 3);
GET_PARAM(GRLIB_unitcap, "Unitcap", 2);
GET_PARAM(GRLIB_civilian_activity, "civilians", 1);
GET_PARAM(GRLIB_civilian_activity, "Civilians", 1);
GET_PARAM(GRLIB_halo_param, "HaloJump", 1);
GET_PARAM(GRLIB_cleanup_vehicles, "CleanupVehicles", 2);
GET_PARAM(GRLIB_csat_aggressivity, "Aggressivity", 2);
@ -86,7 +101,7 @@ if(isServer) then {
KP_serverParamsFetched = true;
publicVariable "KP_serverParamsFetched";
diag_log "[KP LIBERATION] [PARAM] Server finished parameters initialization.";
diag_log format ["[KP LIBERATION] [PARAM] ----- Server finished parameter initialization - time: %1", diag_ticktime];
};
// Fix for not working float values in mission params

5
README.md
View File

@ -187,13 +187,16 @@ class Missions
## Changelog
### 0.96.7 (TBD, Hotfix release)
### 0.96.7 (TBD)
* Added: Mines and explosives will be saved around FOBs.
* Added: Inheritance support to object inits. (3rd array element, bool)
* Added: USAF mod support for all US based preset. Thanks to [Eogos](https://github.com/Eogos)
* Added: Save interval setting in config file.
* Added: Steam UID whitelist in config to grant access to commander actions even if not in that slot.
* Added: Applied mission parameters are logged in server rpt.
* Updated: Updated CUP presets to be inline with October 2019 stable build of CUP mods. Thanks to [Eogos](https://github.com/Eogos)
* Tweaked: Default blacklist now only holds the static and tent backpacks.
* Tweaked: Scripted server restart now automatically recognizes the OS of the server. More info in the [Wiki article](https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_FAQ#how-does-the-scripted-server-restart-work)
* Fixed: Some CUP presets had free buildable arsenals. Thanks to [Eogos](https://github.com/Eogos)
* Fixed: Wrong boat in CUP USMC Woodland preset. Thanks to [Eogos](https://github.com/Eogos)
* Fixed: Object inits will fire on units not only vehicles.