fixed conflicts

AsYetUntitled · May 2, 2020 · 8691d95 · 8691d95
2 parents b8c5ff8 + 160a64c
commit 8691d95
Showing 1 changed file with 56 additions and 0 deletions.
diff --git a/Altis_Life.Altis/config/Config_Loadouts.hpp b/Altis_Life.Altis/config/Config_Loadouts.hpp
@@ -5,7 +5,11 @@
         //     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
 
+<<<<<<< HEAD
         class lvl_X : lvl_base { // where X is the level of the selected team and inherits from lvl_base
+=======
+        class lvl_X : lvl_base { // where X is a level of the selected team and inherits from lvl_base
+>>>>>>> 160a64cff8da5be39cb944be6b0cc2bcc3676de6
             uniformClass = "";
             backpack = "";
             linkedItems[] = {};
@@ -60,6 +64,39 @@ class Loadouts {
             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"};
+<<<<<<< HEAD
+=======
+        };
+        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"};
+>>>>>>> 160a64cff8da5be39cb944be6b0cc2bcc3676de6
         };
         class lvl_2 : lvl_1 {};
         class lvl_3 : lvl_1 {};
@@ -74,6 +111,25 @@ class Loadouts {
         class lvl_1 : lvl_base {
             uniformClass = "U_Rangemaster";
             items[] = {"FirstAidKit"};
+<<<<<<< HEAD
+=======
+        };
+        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"};
+>>>>>>> 160a64cff8da5be39cb944be6b0cc2bcc3676de6
         };
         class lvl_2 : lvl_1 {};
         class lvl_3 : lvl_1 {};