first suggestions and changes before testing

AsYetUntitled · May 2, 2020 · b8c5ff8 · b8c5ff8
1 parent 869a0f9
commit b8c5ff8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 52 deletions.
diff --git a/Altis_Life.Altis/config/Config_Loadouts.hpp b/Altis_Life.Altis/config/Config_Loadouts.hpp
@@ -5,7 +5,7 @@
         //     CIV's loadout are selected randonly if he is not in jail,
         //         otherwise, for the other teams, player will get the uniform related to his level
 
-        class lvl_X : lvl_base { // where X is a level of the selected team and inherits from lvl_base
+        class lvl_X : lvl_base { // where X is the level of the selected team and inherits from lvl_base
             uniformClass = "";
             backpack = "";
             linkedItems[] = {};
@@ -61,36 +61,12 @@ class Loadouts {
             weapons[] = {"hgun_P07_snds_F"};
             magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
         };
-        class lvl_2 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            weapons[] = {"hgun_P07_snds_F"};
-            magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
-        };
-        class lvl_3 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            weapons[] = {"hgun_P07_snds_F"};
-            magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
-        };
-        class lvl_4 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            weapons[] = {"hgun_P07_snds_F"};
-            magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
-        };
-        class lvl_5 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            weapons[] = {"hgun_P07_snds_F"};
-            magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
-        };
-        class lvl_6 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            weapons[] = {"hgun_P07_snds_F"};
-            magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
-        };
-        class lvl_7 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            weapons[] = {"hgun_P07_snds_F"};
-            magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
-        };
+        class lvl_2 : lvl_1 {};
+        class lvl_3 : lvl_1 {};
+        class lvl_4 : lvl_1 {};
+        class lvl_5 : lvl_1 {};
+        class lvl_6 : lvl_1 {};
+        class lvl_7 : lvl_1 {};
     };
 
     // MED
@@ -99,21 +75,9 @@ class Loadouts {
             uniformClass = "U_Rangemaster";
             items[] = {"FirstAidKit"};
         };
-        class lvl_2 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            items[] = {"FirstAidKit"};
-        };
-        class lvl_3 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            items[] = {"FirstAidKit"};
-        };
-        class lvl_4 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            items[] = {"FirstAidKit"};
-        };
-        class lvl_5 : lvl_base {
-            uniformClass = "U_Rangemaster";
-            items[] = {"FirstAidKit"};
-        };
+        class lvl_2 : lvl_1 {};
+        class lvl_3 : lvl_1 {};
+        class lvl_4 : lvl_1 {};
+        class lvl_5 : lvl_1 {};
     };
 };
diff --git a/Altis_Life.Altis/core/functions/fn_startLoadout.sqf b/Altis_Life.Altis/core/functions/fn_startLoadout.sqf
@@ -8,21 +8,21 @@
 */
 private _level = call {
     if (playerSide isEqualTo civilian) exitWith {
-        if (life_is_arredted) then {
+        if (life_is_arrested) then {
             "arrested"
         } else {
-            str(floor random [0, round(count(missionConfigFile >> "Loadouts" >> str(playerSide)-1)/2), count(missionConfigFile >> "Loadouts" >> str(playerSide))-1])
+            floor random [0, round(count(missionConfigFile >> "Loadouts" >> str(playerSide))-1)/2), count(missionConfigFile >> "Loadouts" >> str(playerSide))-1]
         };
     };
     if (playerSide isEqualTo west) exitWith {
-        str(FETCH_CONST(life_coplevel))
+        FETCH_CONST(life_coplevel)
     };
     if (playerSide isEqualTo independent) exitWith {
-        str(FETCH_CONST(life_mediclevel))
+        FETCH_CONST(life_mediclevel)
     };
 };
 
-player setUnitLoadout (missionConfigFile >> "Loadouts" >> str(playerSide) >> "lvl_"+_level);
+player setUnitLoadout (missionConfigFile >> "Loadouts" >> str(playerSide) >> format["lvl_",_level]);
 
 [] call life_fnc_playerSkins;
 [] call life_fnc_saveGear;