Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweaks to GM #788

Merged
merged 6 commits into from
Mar 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Templates/Factions/GM_CIVILIAN.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ _civUniforms = [
"gm_gc_civ_uniform_man_02_80_brn",
"gm_ge_civ_uniform_blouse_80_gry",
"gm_ge_ff_uniform_man_80_orn",
"gm_ge_dbp_uniform_suit_80_blu"
"gm_ge_dbp_uniform_suit_80_blu",
"gm_gc_civ_uniform_man_03_80_blu",
"gm_gc_civ_uniform_man_03_80_grn",
"gm_gc_civ_uniform_man_03_80_gry",
"gm_gc_civ_uniform_man_04_80_blu",
"gm_gc_civ_uniform_man_04_80_gry"
];

_civBackpacks = [
Expand Down
8 changes: 4 additions & 4 deletions src/Templates/Factions/GM_EastGer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ _inf set [T_INF_recon_JTAC, ["gm_gc_army_sf_rifleman_mpikms72_80_str"]]; // = 30
_veh = []; _veh resize T_VEH_SIZE;
_veh set [T_VEH_DEFAULT, []]; // = 0 Default if nothing found

_veh set [T_VEH_car_unarmed, ["gm_gc_army_p601"]]; // = 1 – REQUIRED
//_veh set [T_VEH_car_armed, []]; // = 2
_veh set [T_VEH_car_unarmed, ["gm_gc_army_uaz469_cargo"]]; // = 1 – REQUIRED
_veh set [T_VEH_car_armed, ["gm_gc_army_uaz469_dshkm"]]; // = 2
//_veh set [T_VEH_MRAP_unarmed, []]; // = 3 – REQUIRED
//_veh set [T_VEH_MRAP_HMG, []]; // = 4 – REQUIRED
//_veh set [T_VEH_MRAP_GMG, []]; // = 5 – REQUIRED
_veh set [T_VEH_IFV, ["gm_gc_army_bmp1sp2"]]; // = 6 – REQUIRED
_veh set [T_VEH_APC, ["gm_gc_army_btr60pb"]]; // = 7 – REQUIRED
_veh set [T_VEH_MBT, ["gm_gc_army_t55","gm_gc_army_t55a","gm_gc_army_t55ak","gm_gc_army_t55am2","gm_gc_army_t55am2b"]]; // = 8 – REQUIRED
_veh set [T_VEH_SPAA, ["gm_gc_army_zsu234v1"]]; // = 11
_veh set [T_VEH_stat_HMG_high, ["gm_ge_army_mg3_aatripod"]]; // = 12 – REQUIRED
_veh set [T_VEH_stat_HMG_high, ["gm_gc_army_dshkm_aatripod"]]; // = 12 – REQUIRED
//_veh set [T_VEH_stat_AA, []]; // = 16
//_veh set [T_VEH_stat_AT, []]; // = 17
_veh set [T_VEH_stat_mortar_light, ["B_Mortar_01_F"]]; // = 18 - REQUIRED
Expand All @@ -75,7 +75,7 @@ _veh set [T_VEH_heli_attack, ["gm_gc_airforce_mi2urn", "gm_pl_airforce_mi2urp"]]
//_veh set [T_VEH_plane_cargo, []]; // = 26 – UNUSED
_veh set [T_VEH_plane_unarmed, ["gm_gc_airforce_l410t"]]; // = 27 – UNUSED
_veh set [T_VEH_personal, ["gm_gc_army_bicycle_01_oli"]]; // = 31
_veh set [T_VEH_truck_inf, ["gm_gc_army_ural4320_cargo"]]; // = 32 – REQUIRED
_veh set [T_VEH_truck_inf, ["gm_gc_army_ural4320_cargo", "gm_gc_army_ural375d_cargo"]]; // = 32 – REQUIRED
_veh set [T_VEH_truck_cargo, ["gm_gc_army_ural44202"]]; // = 33
_veh set [T_VEH_truck_ammo, ["gm_gc_army_ural4320_reammo"]]; // = 34 – REQUIRED
_veh set [T_VEH_truck_repair, ["gm_gc_army_ural4320_repair"]]; // = 35
Expand Down
6 changes: 3 additions & 3 deletions src/Templates/Factions/GM_WestGer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ _veh set [T_VEH_DEFAULT, ["gm_ge_army_typ1200_cargo"]]; // = 0 Default if nothin
_veh set [T_VEH_car_unarmed, ["gm_ge_army_iltis_cargo", "gm_ge_army_typ1200_cargo"]]; // = 1 – REQUIRED
_veh set [T_VEH_car_armed, ["gm_ge_army_iltis_mg3"]]; // = 2
_veh set [T_VEH_MRAP_unarmed, ["gm_ge_army_iltis_cargo" , "gm_ge_army_typ1200_cargo"]]; // = 3 – REQUIRED
_veh set [T_VEH_MRAP_HMG, ["gm_ge_army_iltis_mg3"]]; // = 4 – REQUIRED
_veh set [T_VEH_MRAP_GMG, ["gm_ge_army_iltis_milan"]]; // = 5 – REQUIRED
_veh set [T_VEH_IFV, ["gm_ge_army_fuchsa0_reconnaissance", "gm_ge_army_fuchsa0_engineer", "gm_ge_army_fuchsa0_command", "gm_ge_army_luchsa1", "gm_ge_army_luchsa2", "gm_ge_army_bpz2a0"]]; // = 6 – REQUIRED
_veh set [T_VEH_MRAP_HMG, ["gm_ge_army_fuchsa0_command", "gm_ge_army_fuchsa0_engineer"]]; // = 4 – REQUIRED
_veh set [T_VEH_MRAP_GMG, ["gm_ge_army_fuchsa0_reconnaissance"]]; // = 5 – REQUIRED
_veh set [T_VEH_IFV, ["gm_ge_army_marder1a1a", "gm_ge_army_marder1a2", "gm_ge_army_marder1a1a", "gm_ge_army_luchsa1", "gm_ge_army_luchsa2", "gm_ge_army_bpz2a0"]]; // = 6 – REQUIRED
_veh set [T_VEH_APC, ["gm_ge_army_m113a1g_apc", "gm_ge_army_m113a1g_apc_milan", "gm_ge_army_m113a1g_command"]]; // = 7 – REQUIRED
_veh set [T_VEH_MBT, ["gm_ge_army_Leopard1a1", "gm_ge_army_Leopard1a1a1", "gm_ge_army_Leopard1a1a2", "gm_ge_army_Leopard1a3", "gm_ge_army_Leopard1a3a1", "gm_ge_army_Leopard1a5"]]; // = 8 – REQUIRED
_veh set [T_VEH_SPAA, ["gm_ge_army_gepard1a1"]]; // = 11
Expand Down
7 changes: 6 additions & 1 deletion src/Templates/Loadouts/GM_CIVILIAN/GM_CIVILIAN_1.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,10 @@ this forceAddUniform selectRandom [
"gm_gc_civ_uniform_man_01_80_blk",
"gm_gc_civ_uniform_man_01_80_blu",
"gm_gc_civ_uniform_man_02_80_brn",
"gm_ge_civ_uniform_blouse_80_gry"
"gm_ge_civ_uniform_blouse_80_gry",
"gm_gc_civ_uniform_man_03_80_blu",
"gm_gc_civ_uniform_man_03_80_grn",
"gm_gc_civ_uniform_man_03_80_gry",
"gm_gc_civ_uniform_man_04_80_blu",
"gm_gc_civ_uniform_man_04_80_gry"
];
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ private _uniforms = [
"gm_gc_civ_uniform_man_01_80_blk",
"gm_gc_civ_uniform_man_01_80_blu",
"gm_gc_civ_uniform_man_02_80_brn",
"gm_ge_civ_uniform_blouse_80_gry"
"gm_ge_civ_uniform_blouse_80_gry",
"gm_gc_civ_uniform_man_03_80_blu",
"gm_gc_civ_uniform_man_03_80_grn",
"gm_gc_civ_uniform_man_03_80_gry",
"gm_gc_civ_uniform_man_04_80_blu",
"gm_gc_civ_uniform_man_04_80_gry"
];

private _gunsAndAmmo = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ this forceAddUniform selectRandom [
"gm_gc_civ_uniform_man_01_80_blk",
"gm_gc_civ_uniform_man_01_80_blu",
"gm_gc_civ_uniform_man_02_80_brn",
"gm_ge_civ_uniform_blouse_80_gry"
"gm_ge_civ_uniform_blouse_80_gry",
"gm_gc_civ_uniform_man_03_80_blu",
"gm_gc_civ_uniform_man_03_80_grn",
"gm_gc_civ_uniform_man_03_80_gry",
"gm_gc_civ_uniform_man_04_80_blu",
"gm_gc_civ_uniform_man_04_80_gry"
];

this addBackpack selectRandom [
Expand Down
7 changes: 6 additions & 1 deletion src/Templates/Loadouts/GM_CIVILIAN/GM_PLAYER_1.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ private _uniforms = [
"gm_gc_civ_uniform_man_02_80_brn",
"gm_ge_civ_uniform_blouse_80_gry",
"gm_ge_ff_uniform_man_80_orn",
"gm_ge_dbp_uniform_suit_80_blu"
"gm_ge_dbp_uniform_suit_80_blu",
"gm_gc_civ_uniform_man_03_80_blu",
"gm_gc_civ_uniform_man_03_80_grn",
"gm_gc_civ_uniform_man_03_80_gry",
"gm_gc_civ_uniform_man_04_80_blu",
"gm_gc_civ_uniform_man_04_80_gry"
];

// ==== Uniform ====
Expand Down