Arma3_Exile/a3_exile_occupation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed incompatibility with marma

Browse Source
This commit is contained in:
second_coming 2016-04-07 11:02:27 +01:00
parent f2a2236eb2
commit 2e62048313
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.sqf
View File

@ -14,9 +14,9 @@
// Shared Config for each occupation monitor // 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_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_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 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_occupyVehicle = true; // true if you want to have roaming AI vehicles
SC_occupySky = true; // true if you want to have roaming AI helis 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_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_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_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 SC_occupyLootCratesMarkers = true; // true if you want to have markers on the loot crate spawns

12
initServer.sqf
View File

@ -24,6 +24,12 @@ SC_occupationVersion = "v5 (06-04-2016)";
diag_log format ["[OCCUPATION MOD]:: Occupation v%2 Initialised at %1",time,SC_occupationVersion]; 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 // EventHandlers for AI reactions
SC_fnc_repairVehicle = compile preprocessFileLineNumbers "\x\addons\a3_exile_occupation\scripts\reactions\repairVehicle.sqf"; 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"; 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_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"; 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 = "=============================================================================================================";
[_logDetail] call SC_fnc_log; [_logDetail] call SC_fnc_log;
_logDetail = format ["[OCCUPATION MOD]:: Occupation v%2 Initialised at %1",time,SC_occupationVersion]; _logDetail = format ["[OCCUPATION MOD]:: Occupation v%2 Initialised at %1",time,SC_occupationVersion];

6
scripts/occupationLootCrates.sqf
View File

@ -56,9 +56,10 @@ for "_i" from 1 to SC_numberofLootCrates do
_group setBehaviour "AWARE"; _group setBehaviour "AWARE";
_group setCombatMode "RED"; _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; [_logDetail] call SC_fnc_log;
_box = "CargoNet_01_box_F" createvehicle _position; _box = "CargoNet_01_box_F" createvehicle _position;
clearMagazineCargoGlobal _box; clearMagazineCargoGlobal _box;
clearWeaponCargoGlobal _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_WoodWindowKit", 1 + (random 1)];
_box addItemCargoGlobal ["Exile_Item_WoodDoorwayKit", 1 + (random 1)]; _box addItemCargoGlobal ["Exile_Item_WoodDoorwayKit", 1 + (random 1)];
_box addItemCargoGlobal ["Exile_Item_WoodFloorPortKit", 1 + (random 2)]; _box addItemCargoGlobal ["Exile_Item_WoodFloorPortKit", 1 + (random 2)];
}; };