Skip to content

Commit b8c5ff8

Browse files
committed
first suggestions and changes before testing
1 parent 869a0f9 commit b8c5ff8

File tree

2 files changed

+16
-52
lines changed

2 files changed

+16
-52
lines changed

Altis_Life.Altis/config/Config_Loadouts.hpp

Lines changed: 11 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// CIV's loadout are selected randonly if he is not in jail,
66
// otherwise, for the other teams, player will get the uniform related to his level
77
8-
class lvl_X : lvl_base { // where X is a level of the selected team and inherits from lvl_base
8+
class lvl_X : lvl_base { // where X is the level of the selected team and inherits from lvl_base
99
uniformClass = "";
1010
backpack = "";
1111
linkedItems[] = {};
@@ -61,36 +61,12 @@ class Loadouts {
6161
weapons[] = {"hgun_P07_snds_F"};
6262
magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
6363
};
64-
class lvl_2 : lvl_base {
65-
uniformClass = "U_Rangemaster";
66-
weapons[] = {"hgun_P07_snds_F"};
67-
magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
68-
};
69-
class lvl_3 : lvl_base {
70-
uniformClass = "U_Rangemaster";
71-
weapons[] = {"hgun_P07_snds_F"};
72-
magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
73-
};
74-
class lvl_4 : lvl_base {
75-
uniformClass = "U_Rangemaster";
76-
weapons[] = {"hgun_P07_snds_F"};
77-
magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
78-
};
79-
class lvl_5 : lvl_base {
80-
uniformClass = "U_Rangemaster";
81-
weapons[] = {"hgun_P07_snds_F"};
82-
magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
83-
};
84-
class lvl_6 : lvl_base {
85-
uniformClass = "U_Rangemaster";
86-
weapons[] = {"hgun_P07_snds_F"};
87-
magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
88-
};
89-
class lvl_7 : lvl_base {
90-
uniformClass = "U_Rangemaster";
91-
weapons[] = {"hgun_P07_snds_F"};
92-
magazines[] = {"16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag","16Rnd_9x21_Mag"};
93-
};
64+
class lvl_2 : lvl_1 {};
65+
class lvl_3 : lvl_1 {};
66+
class lvl_4 : lvl_1 {};
67+
class lvl_5 : lvl_1 {};
68+
class lvl_6 : lvl_1 {};
69+
class lvl_7 : lvl_1 {};
9470
};
9571

9672
// MED
@@ -99,21 +75,9 @@ class Loadouts {
9975
uniformClass = "U_Rangemaster";
10076
items[] = {"FirstAidKit"};
10177
};
102-
class lvl_2 : lvl_base {
103-
uniformClass = "U_Rangemaster";
104-
items[] = {"FirstAidKit"};
105-
};
106-
class lvl_3 : lvl_base {
107-
uniformClass = "U_Rangemaster";
108-
items[] = {"FirstAidKit"};
109-
};
110-
class lvl_4 : lvl_base {
111-
uniformClass = "U_Rangemaster";
112-
items[] = {"FirstAidKit"};
113-
};
114-
class lvl_5 : lvl_base {
115-
uniformClass = "U_Rangemaster";
116-
items[] = {"FirstAidKit"};
117-
};
78+
class lvl_2 : lvl_1 {};
79+
class lvl_3 : lvl_1 {};
80+
class lvl_4 : lvl_1 {};
81+
class lvl_5 : lvl_1 {};
11882
};
11983
};

Altis_Life.Altis/core/functions/fn_startLoadout.sqf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
*/
99
private _level = call {
1010
if (playerSide isEqualTo civilian) exitWith {
11-
if (life_is_arredted) then {
11+
if (life_is_arrested) then {
1212
"arrested"
1313
} else {
14-
str(floor random [0, round(count(missionConfigFile >> "Loadouts" >> str(playerSide)-1)/2), count(missionConfigFile >> "Loadouts" >> str(playerSide))-1])
14+
floor random [0, round(count(missionConfigFile >> "Loadouts" >> str(playerSide))-1)/2), count(missionConfigFile >> "Loadouts" >> str(playerSide))-1]
1515
};
1616
};
1717
if (playerSide isEqualTo west) exitWith {
18-
str(FETCH_CONST(life_coplevel))
18+
FETCH_CONST(life_coplevel)
1919
};
2020
if (playerSide isEqualTo independent) exitWith {
21-
str(FETCH_CONST(life_mediclevel))
21+
FETCH_CONST(life_mediclevel)
2222
};
2323
};
2424

25-
player setUnitLoadout (missionConfigFile >> "Loadouts" >> str(playerSide) >> "lvl_"+_level);
25+
player setUnitLoadout (missionConfigFile >> "Loadouts" >> str(playerSide) >> format["lvl_",_level]);
2626

2727
[] call life_fnc_playerSkins;
2828
[] call life_fnc_saveGear;

0 commit comments

Comments
 (0)