Add config for Chernarus scenario

ArmaForces · Mar 6, 2024 · 6000646 · 6000646
1 parent a5dc56c
commit 6000646
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 23 deletions.
diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp
@@ -12,6 +12,7 @@ PREP(getNearestLocationName);
 PREP(getNearestLocationWithAvailableName);
 PREP(getRandomEmptyPosition);
 PREP(getRandomPos);
+PREP(getTextFromConfig);
 PREP(isHouseNearby);
 PREP(isRoadNearby);
 PREP(playMusicServer);

diff --git a/addons/common/functions/fnc_getTextFromConfig.sqf b/addons/common/functions/fnc_getTextFromConfig.sqf
@@ -0,0 +1,29 @@
+#include "script_component.hpp"
+/*
+ * Author: 3Mydlo3
+ * Function loads config for killers stuff.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * None
+ *
+ * Public: No
+ */
+
+params ["_property", "_defaultConfig", "_missionConfig"];
+
+private _result = getText (_missionConfig >> _property);
+
+if (_result isEqualTo "") then {
+    _result = getText (_defaultConfig >> _property);
+    TRACE_3("Loaded property %1 from %2. Retrieved value: %3",_property,str _defaultConfig,_result);
+} else {
+    TRACE_3("Loaded property %1 from %2. Retrieved value: %3",_property,str _missionConfig,_result);
+};
+
+_result
diff --git a/addons/killers/XEH_preInit.sqf b/addons/killers/XEH_preInit.sqf
@@ -10,4 +10,6 @@ if (!EGVAR(common,enabled)) exitWith {};
 GVAR(killersRespawnMarker) = "";
 GVAR(stashes) = [];
 
+call FUNC(initConfig);
+
 ADDON = true;
diff --git a/addons/killers/functions/fnc_initConfig.sqf b/addons/killers/functions/fnc_initConfig.sqf
@@ -18,14 +18,4 @@
 private _killersConfig = (configFile >> "CfgSerialKillers" >> "Killers");
 private _missionKillersConfig = (missionConfigFile >> "CfgSerialKillers" >> "Killers");
 
-private _fnc_getTextProperty = {
-    params ["_property"];
-
-    if (isClass (_missionKillersConfig >> _property)) exitWith {
-        getText (_missionKillersConfig >> _property)
-    };
-
-    getText (_killersConfig >> _property)
-};
-
-GVAR(flagClassName) = "FlagClassName" call _fnc_getTextProperty;
+GVAR(flagClassName) = ["FlagClassName", _killersConfig, _missionKillersConfig] call EFUNC(common,getTextFromConfig);
diff --git a/addons/missions/SerialKillers_CUP_RHS.Chernarus_Winter/CfgSerialKillers.hpp b/addons/missions/SerialKillers_CUP_RHS.Chernarus_Winter/CfgSerialKillers.hpp
@@ -0,0 +1,12 @@
+class CfgSerialKillers
+{
+    class Killers
+    {
+        FlagClassName = "FlagCarrierINS";
+    };
+
+    class Police
+    {
+        FlagClassName = "FlagCarrierCDF";
+    };
+};
diff --git a/addons/missions/SerialKillers_CUP_RHS.Chernarus_Winter/description.ext b/addons/missions/SerialKillers_CUP_RHS.Chernarus_Winter/description.ext
@@ -19,3 +19,5 @@ respawnDelay = 20;
 respawnOnStart = -1;
 respawnTemplatesWest[] = {"MenuPosition", "Counter"};
 respawnTemplatesEast[] = {"Base", "Counter"};
+
+#include "CfgSerialKillers.hpp"
diff --git a/addons/police/CfgSerialKillers.hpp b/addons/police/CfgSerialKillers.hpp
@@ -2,6 +2,6 @@ class CfgSerialKillers
 {
     class Police
     {
-        FlagClassName = "Flag_US_F";
+        FlagClassName = "Flag_Gendarmerie_F";
     };
 };
diff --git a/addons/police/functions/fnc_initConfig.sqf b/addons/police/functions/fnc_initConfig.sqf
@@ -18,14 +18,4 @@
 private _policeConfig = (configFile >> "CfgSerialKillers" >> "Police");
 private _missionPoliceConfig = (missionConfigFile >> "CfgSerialKillers" >> "Police");
 
-private _fnc_getTextProperty = {
-    params ["_property"];
-
-    if (isClass (_missionPoliceConfig >> _property)) exitWith {
-        getText (_missionPoliceConfig >> _property)
-    };
-
-    getText (_policeConfig >> _property)
-};
-
-GVAR(flagClassName) = "FlagClassName" call _fnc_getTextProperty;
+GVAR(flagClassName) = ["FlagClassName", _policeConfig, _missionPoliceConfig] call EFUNC(common,getTextFromConfig);