update grad-civs

gruppe-adler · Sep 8, 2017 · 83c325c · 83c325c
1 parent 8b90e66
commit 83c325c
Show file tree

Hide file tree

Showing 22 changed files with 347 additions and 108 deletions.
diff --git a/functions/missionSetup/cfgFunctions.hpp b/functions/missionSetup/cfgFunctions.hpp
@@ -2,6 +2,7 @@ class grad_missionSetup {
     class missionSetup {
         class createDiaryRecords {};
         class initCivs {};
+        class initCivsEquip {preInit = 1;};
         class initMission {postInit = 1;};
         class initVars {preInit = 1;};
         class intro {};

diff --git a/functions/missionSetup/fn_initCivs.sqf b/functions/missionSetup/fn_initCivs.sqf
@@ -1,49 +1,6 @@
 #include "component.hpp"
-#define REPNIF0(var1,var2) if(count var2 > 0) then {var1 = var2}
-#define APPENDUNIQUE(var1,var2) var1 = var1 + var2;var1 = var1 arrayIntersect var1
-
 
 private _enable = ([missionConfigFile >> "CfgGradCivs","enableCivs",0] call BIS_fnc_returnConfigEntry) == 1;
 if !(_enable) exitWith {};
 
-private _islandType = [missionConfigFile >> "CfgIslands" >> worldName,"type",""] call BIS_fnc_returnConfigEntry;
-if (_islandType == "") exitWith {ERROR("World is not defined in cfgIslands.")};
-
-private _civCfg = missionConfigFile >> "CfgCivilians" >> _islandType;
-
-private _clothes = [_civCfg,"clothes",[]] call BIS_fnc_returnConfigEntry;
-private _headgear = [_civCfg,"headgear",[]] call BIS_fnc_returnConfigEntry;
-private _faces = [_civCfg,"faces",[]] call BIS_fnc_returnConfigEntry;
-private _goggles = [_civCfg,"goggles",[]] call BIS_fnc_returnConfigEntry;
-private _backpacks = [_civCfg,"backpacks",[]] call BIS_fnc_returnConfigEntry;
-
-private _userEquipmentCfg = missionConfigFile >> "CfgGradCivs" >> "userEquipment";
-private _userClothes = [_userEquipmentCfg,"clothes",[]] call BIS_fnc_returnConfigEntry;
-private _userHeadgear = [_userEquipmentCfg,"headgear",[]] call BIS_fnc_returnConfigEntry;
-private _userFaces = [_userEquipmentCfg,"faces",[]] call BIS_fnc_returnConfigEntry;
-private _userGoggles = [_userEquipmentCfg,"goggles",[]] call BIS_fnc_returnConfigEntry;
-private _userBackpacks = [_userEquipmentCfg,"backpacks",[]] call BIS_fnc_returnConfigEntry;
-
-
-private _replace = ([_userEquipmentCfg,"replace",0] call BIS_fnc_returnConfigEntry) == 1;
-if (_replace) then {
-    REPNIF0(_clothes,_userClothes);
-    REPNIF0(_headgear,_userHeadgear);
-    REPNIF0(_faces,_userFaces);
-    REPNIF0(_goggles,_userGoggles);
-    REPNIF0(_backpacks,_userBackpacks);
-} else {
-    APPENDUNIQUE(_clothes,_userClothes);
-    APPENDUNIQUE(_headgear,_userHeadgear);
-    APPENDUNIQUE(_faces,_userFaces);
-    APPENDUNIQUE(_goggles,_userGoggles);
-    APPENDUNIQUE(_backpacks,_userBackpacks);
-};
-
-[_clothes] call grad_civs_fnc_setClothes;
-[_headgear] call grad_civs_fnc_setHeadgear;
-[_faces] call grad_civs_fnc_setFaces;
-[_goggles] call grad_civs_fnc_setGoggles;
-[_backpacks] call grad_civs_fnc_setBackpacks;
-
 [] call grad_civs_fnc_initModule;
diff --git a/functions/missionSetup/fn_initCivsEquip.sqf b/functions/missionSetup/fn_initCivsEquip.sqf
@@ -0,0 +1,51 @@
+#include "component.hpp"
+#define REPNIF0(var1,var2) if(count var2 > 0) then {var1 = var2}
+#define APPENDUNIQUE(var1,var2) var1 = var1 + var2;var1 = var1 arrayIntersect var1
+
+private _enable = ([missionConfigFile >> "CfgGradCivs","enableCivs",0] call BIS_fnc_returnConfigEntry) == 1;
+if !(_enable) exitWith {};
+
+private _islandType = [missionConfigFile >> "CfgIslands" >> worldName,"type",""] call BIS_fnc_returnConfigEntry;
+if (_islandType == "") exitWith {ERROR("World is not defined in cfgIslands.")};
+
+private _civCfg = missionConfigFile >> "CfgCivilians" >> _islandType;
+
+private _clothes = [_civCfg,"clothes",[]] call BIS_fnc_returnConfigEntry;
+private _headgear = [_civCfg,"headgear",[]] call BIS_fnc_returnConfigEntry;
+private _faces = [_civCfg,"faces",[]] call BIS_fnc_returnConfigEntry;
+private _goggles = [_civCfg,"goggles",[]] call BIS_fnc_returnConfigEntry;
+private _backpacks = [_civCfg,"backpacks",[]] call BIS_fnc_returnConfigEntry;
+private _vehicles = [_civCfg,"vehicles",[]] call BIS_fnc_returnConfigEntry;
+
+private _userEquipmentCfg = missionConfigFile >> "CfgGradCivs" >> "userEquipment";
+private _userClothes = [_userEquipmentCfg,"clothes",[]] call BIS_fnc_returnConfigEntry;
+private _userHeadgear = [_userEquipmentCfg,"headgear",[]] call BIS_fnc_returnConfigEntry;
+private _userFaces = [_userEquipmentCfg,"faces",[]] call BIS_fnc_returnConfigEntry;
+private _userGoggles = [_userEquipmentCfg,"goggles",[]] call BIS_fnc_returnConfigEntry;
+private _userBackpacks = [_userEquipmentCfg,"backpacks",[]] call BIS_fnc_returnConfigEntry;
+private _userVehicles = [_userEquipmentCfg,"vehicles",[]] call BIS_fnc_returnConfigEntry;
+
+
+private _replace = ([_userEquipmentCfg,"replace",0] call BIS_fnc_returnConfigEntry) == 1;
+if (_replace) then {
+    REPNIF0(_clothes,_userClothes);
+    REPNIF0(_headgear,_userHeadgear);
+    REPNIF0(_faces,_userFaces);
+    REPNIF0(_goggles,_userGoggles);
+    REPNIF0(_backpacks,_userBackpacks);
+    REPNIF0(_vehicles,_userVehicles);
+} else {
+    APPENDUNIQUE(_clothes,_userClothes);
+    APPENDUNIQUE(_headgear,_userHeadgear);
+    APPENDUNIQUE(_faces,_userFaces);
+    APPENDUNIQUE(_goggles,_userGoggles);
+    APPENDUNIQUE(_backpacks,_userBackpacks);
+    APPENDUNIQUE(_vehicles,_userVehicles);
+};
+
+[_clothes] call grad_civs_fnc_setClothes;
+[_headgear] call grad_civs_fnc_setHeadgear;
+[_faces] call grad_civs_fnc_setFaces;
+[_goggles] call grad_civs_fnc_setGoggles;
+[_backpacks] call grad_civs_fnc_setBackpacks;
+[_vehicles] call grad_civs_fnc_setVehicles;
diff --git a/node_modules/grad-civs/README.md b/node_modules/grad-civs/README.md
diff --git a/node_modules/grad-civs/cfgFunctions.hpp b/node_modules/grad-civs/cfgFunctions.hpp
diff --git a/node_modules/grad-civs/component.hpp b/node_modules/grad-civs/component.hpp
diff --git a/node_modules/grad-civs/functions/behaviour/fn_flee.sqf b/node_modules/grad-civs/functions/behaviour/fn_flee.sqf
diff --git a/node_modules/grad-civs/functions/behaviour/fn_stopCiv.sqf b/node_modules/grad-civs/functions/behaviour/fn_stopCiv.sqf
diff --git a/node_modules/grad-civs/functions/behaviour/fn_taskPatrol.sqf b/node_modules/grad-civs/functions/behaviour/fn_taskPatrol.sqf
diff --git a/node_modules/grad-civs/functions/common/fn_findBuildings.sqf b/node_modules/grad-civs/functions/common/fn_findBuildings.sqf
diff --git a/node_modules/grad-civs/functions/common/fn_findPositionOfInterest.sqf b/node_modules/grad-civs/functions/common/fn_findPositionOfInterest.sqf
diff --git a/node_modules/grad-civs/functions/common/fn_findRandomPos.sqf b/node_modules/grad-civs/functions/common/fn_findRandomPos.sqf
diff --git a/node_modules/grad-civs/functions/common/fn_findRandomPosArea.sqf b/node_modules/grad-civs/functions/common/fn_findRandomPosArea.sqf
diff --git a/node_modules/grad-civs/functions/common/fn_populateArea.sqf b/node_modules/grad-civs/functions/common/fn_populateArea.sqf
diff --git a/node_modules/grad-civs/functions/spawn/fn_cleanup.sqf b/node_modules/grad-civs/functions/spawn/fn_cleanup.sqf