From 2e620483131eafbc7be48d59688ede6b00ac9c50 Mon Sep 17 00:00:00 2001 From: second_coming Date: Thu, 7 Apr 2016 11:02:27 +0100 Subject: [PATCH] Fixed incompatibility with marma --- config.sqf | 8 ++++---- initServer.sqf | 12 ++++++------ scripts/occupationLootCrates.sqf | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config.sqf b/config.sqf index 7d0d02f..3497e22 100644 --- a/config.sqf +++ b/config.sqf @@ -14,9 +14,9 @@ // Shared Config for each occupation monitor -SC_debug = true; // set to true to turn on debug features (not for live servers) +SC_debug = true; // set to true to turn on debug features (not for live servers) SC_extendedLogging = true; // set to true for additional logging -SC_infiSTAR_log = true; // true Use infiSTAR logging, false logs to server rpt +SC_infiSTAR_log = false; // true Use infiSTAR logging, false logs to server rpt SC_maxAIcount = 100; // the maximum amount of AI, if the AI count is above this then additional AI won't spawn SC_mapMarkers = false; // Place map markers at the occupied areas (occupyPlaces and occupyMilitary only) true/false @@ -46,14 +46,14 @@ SC_occupyStatic = false; // true if you want to garrison AI in spec SC_occupyVehicle = true; // true if you want to have roaming AI vehicles SC_occupySky = true; // true if you want to have roaming AI helis -SC_occupySea = true; // true if you want to have roaming AI boats +SC_occupySea = false; // true if you want to have roaming AI boats SC_occupyLootCrates = true; // true if you want to have random loot crates with guards SC_numberofLootCrates = 6; // if SC_occupyLootCrates = true spawn this many loot crates (overrided below for Namalsk) SC_LootCrateGuards = 4; // number of AI to spawn at each crate -SC_LootCrateGuardsRandomize = true; // Use a random number of guards up to a maximum = SC_numberofGuards (so between 1 and SC_numberofGuards) +SC_LootCrateGuardsRandomize = false; // Use a random number of guards up to a maximum = SC_numberofGuards (so between 1 and SC_numberofGuards) SC_occupyLootCratesMarkers = true; // true if you want to have markers on the loot crate spawns diff --git a/initServer.sqf b/initServer.sqf index d328ec0..610e8ae 100644 --- a/initServer.sqf +++ b/initServer.sqf @@ -24,6 +24,12 @@ SC_occupationVersion = "v5 (06-04-2016)"; diag_log format ["[OCCUPATION MOD]:: Occupation v%2 Initialised at %1",time,SC_occupationVersion]; +// Get the config for Occupation +call compile preprocessFileLineNumbers "\x\addons\a3_exile_occupation\config.sqf"; + +// Select the log style depending on config settings +SC_fnc_log = compile preprocessFileLineNumbers "\x\addons\a3_exile_occupation\scripts\occupationLog.sqf"; + // EventHandlers for AI reactions SC_fnc_repairVehicle = compile preprocessFileLineNumbers "\x\addons\a3_exile_occupation\scripts\reactions\repairVehicle.sqf"; SC_fnc_vehicleDestroyed = compile preprocessFileLineNumbers "\x\addons\a3_exile_occupation\scripts\reactions\vehicleDestroyed.sqf"; @@ -35,12 +41,6 @@ SC_fnc_getIn = compile preprocessFileLineNumbers "\x\addons\a3_exile_occup SC_fnc_refuel = compile preprocessFileLineNumbers "\x\addons\a3_exile_occupation\scripts\reactions\refuel.sqf"; SC_comeUnstuck = compile preprocessFileLineNumbers "\x\addons\a3_exile_occupation\scripts\reactions\comeUnstuck.sqf"; -// Get the config for Occupation -call compile preprocessFileLineNumbers "\x\addons\a3_exile_occupation\config.sqf"; - -// Select the log style depending on config settings -SC_fnc_log = compile preprocessFileLineNumbers "\x\addons\a3_exile_occupation\scripts\occupationLog.sqf"; - _logDetail = "============================================================================================================="; [_logDetail] call SC_fnc_log; _logDetail = format ["[OCCUPATION MOD]:: Occupation v%2 Initialised at %1",time,SC_occupationVersion]; diff --git a/scripts/occupationLootCrates.sqf b/scripts/occupationLootCrates.sqf index f4d61bd..25ded79 100644 --- a/scripts/occupationLootCrates.sqf +++ b/scripts/occupationLootCrates.sqf @@ -56,9 +56,10 @@ for "_i" from 1 to SC_numberofLootCrates do _group setBehaviour "AWARE"; _group setCombatMode "RED"; - _logDetail = text format ["[OCCUPATION:LootCrates]:: Creating crate %3 @ drop zone %1 with %2 guards",_position,_AICount,_i]; + _logDetail = format ["[OCCUPATION:LootCrates]:: Creating crate %3 at drop zone %1 with %2 guards",_position,_AICount,_i]; [_logDetail] call SC_fnc_log; + _box = "CargoNet_01_box_F" createvehicle _position; clearMagazineCargoGlobal _box; clearWeaponCargoGlobal _box; @@ -86,5 +87,4 @@ for "_i" from 1 to SC_numberofLootCrates do _box addItemCargoGlobal ["Exile_Item_WoodWindowKit", 1 + (random 1)]; _box addItemCargoGlobal ["Exile_Item_WoodDoorwayKit", 1 + (random 1)]; _box addItemCargoGlobal ["Exile_Item_WoodFloorPortKit", 1 + (random 2)]; -}; - +}; \ No newline at end of file