Skip to content

Commit

Permalink
Fixing WW2 template errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@billw2012
billw2012 committed Apr 26, 2020
1 parent 701d5d9 commit cb5dd31
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 37 deletions.
5 changes: 2 additions & 3 deletions Vindicta.Altis/Templates/Factions/AAF.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ _inf set [T_INF_pilot_heli, ["I_helipilot_F"]];
_inf set [T_INF_survivor, ["I_Survivor_F"]];
_inf set [T_INF_unarmed, ["I_Soldier_unarmed_F"]];

//Recon
//==== Recon ====
_inf set [T_INF_recon_TL, ["Arma3_AAF_recon_TL"]];
_inf set [T_INF_recon_rifleman, ["Arma3_AAF_recon_rifleman", "Arma3_AAF_recon_autorifleman"]];
_inf set [T_INF_recon_medic, ["Arma3_AAF_recon_medic"]];
Expand All @@ -53,14 +53,13 @@ _inf set [T_INF_recon_marksman, ["Arma3_AAF_recon_marksman"]];
_inf set [T_INF_recon_JTAC, ["Arma3_AAF_recon_JTAC"]];


//Divers
//==== Drivers ====
_inf set [T_INF_diver_TL, ["I_diver_TL_F"]];
_inf set [T_INF_diver_rifleman, ["I_diver_F"]];
_inf set [T_INF_diver_exp, ["I_diver_exp_F"]];


//==== Vehicles ====

_veh = +(tDefault select T_VEH);
_veh set [T_VEH_SIZE-1, nil];
_veh set [T_VEH_DEFAULT, ["I_G_Offroad_01_F"]];
Expand Down
23 changes: 18 additions & 5 deletions Vindicta.Altis/Templates/Factions/WW2_CIVILIAN.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ _array set [T_REQUIRED_ADDONS, [
_api = [];
_api resize T_API_SIZE;
_api set [T_API_fnc_init, {}];
_array set [T_API, _api];

//==== Undercover ====
_uc = [];
Expand All @@ -152,7 +151,6 @@ _uc set[T_UC_uniforms, +_civUniforms];
_uc set[T_UC_facewear, +_civFacewear];
_uc set[T_UC_headgear, +_civHeadgear];
_uc set[T_UC_civVehs, +_civVehiclesOnlyNames];
_array set [T_UC, _uc];

//==== Arsenal ====
_arsenal = [];
Expand Down Expand Up @@ -185,7 +183,6 @@ _arsenal set[T_ARSENAL_backpacks, [
_arsenal set[T_ARSENAL_uniforms, +_civUniforms];
_arsenal set[T_ARSENAL_facewear, +_civFacewear];
_arsenal set[T_ARSENAL_headgear, +_civHeadgear];
_array set [T_ARSENAL, _arsenal];

//==== Infantry ====
_inf = [];
Expand All @@ -203,12 +200,28 @@ _inf set [T_INF_exp, [
_inf set [T_INF_survivor, [
"WW2_CIVILIAN_Militant_1"
]];
_array set [T_INF, _inf];

//==== Vehicles ====
_veh = [];
_veh resize T_VEH_SIZE;
_veh set [T_VEH_default, _civVehicles];

//==== Cargo ====
_cargo = +(tDefault select T_CARGO);

// ==== Inventory ====
_inv = [T_INV] call t_fnc_newCategory;
_inv set [T_INV_items, +t_miscItems_civ_WW2 ];
_inv set [T_INV_backpacks, ["GEB_FieldPack_cbr", "B_LIB_SOV_RA_Rucksack"]];

//==== Arrays ====
_array set [T_API, _api];
_array set [T_INF, _inf];
_array set [T_VEH, _veh];
_array set [T_CARGO, _cargo];
_array set [T_DRONE, []];
_array set [T_GROUP, []];
_array set [T_ARSENAL, _arsenal];
_array set [T_UC, _uc];

_array
_array
32 changes: 12 additions & 20 deletions Vindicta.Altis/Templates/Factions/WW2_Heer.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ _veh set [T_VEH_stat_AT, ["ifr_lg40", "ifa3_p27G", "IFA3_Pak38", "LIB_Pak40", "L
_veh set [T_VEH_stat_mortar_light, ["LIB_GrWr34", "LIB_GrWr34_g"]];
_veh set [T_VEH_stat_mortar_heavy, ["LIB_leFH18", "LIB_FlaK_36_ARTY"]];

//_veh set [T_VEH_heli_light, [""]];
//_veh set [T_VEH_heli_heavy, [""]];
//_veh set [T_VEH_heli_cargo, [""]];
//_veh set [T_VEH_heli_attack, [""]];
_veh set [T_VEH_heli_light, []];
_veh set [T_VEH_heli_heavy, []];
_veh set [T_VEH_heli_cargo, []];
_veh set [T_VEH_heli_attack, []];

_veh set [T_VEH_plane_attack, ["sab_ju88_2", "sab_ju88", "sab_ju87", "sab_bf110", "sab_bf110_2", "sab_bf110", "sab_he111", "LIB_FW190F8", "LIB_FW190F8_4", "LIB_FW190F8_5", "LIB_FW190F8_2", "LIB_FW190F8_3", "LIB_Ju87"]];
_veh set [T_VEH_plane_fighter, ["sab_fw190_2", "sab_fw190", "sab_bf109", "sab_bf109", "sab_avia_2", "LIB_FW190F8", "LIB_FW190F8_4", "LIB_FW190F8_5", "LIB_FW190F8_2", "LIB_FW190F8_3", "LIB_Ju87"]];
Expand All @@ -131,18 +131,6 @@ _veh set [T_VEH_submarine, ["sab_boat_u7"]];
//==== Drones ====
_drone = +(tDefault select T_DRONE);
_drone set [T_DRONE_SIZE-1, nil];
//_drone set [T_DRONE_DEFAULT, [""]];

//_drone set [T_DRONE_UGV_unarmed, ["B_UGV_01_F"]];
//_drone set [T_DRONE_UGV_armed, ["B_UGV_01_rcws_F"]];
//_drone set [T_DRONE_plane_attack, ["B_UAV_02_dynamicLoadout_F"]];
//_drone set [T_DRONE_plane_unarmed, ["B_UAV_02_dynamicLoadout_F"]];
//_drone set [T_DRONE_heli_attack, ["B_T_UAV_03_dynamicLoadout_F"]];
//_drone set [T_DRONE_quadcopter, ["B_UAV_01_F"]];
//_drone set [T_DRONE_designator, ["B_Static_Designator_01_F"]];
//_drone set [T_DRONE_stat_HMG_low, ["B_HMG_01_A_F"]];
//_drone set [T_DRONE_stat_GMG_low, ["B_GMG_01_A_F"]];
//_drone set [T_DRONE_stat_AA, ["B_SAM_System_03_F"]];

//==== Cargo ====
_cargo = [];
Expand All @@ -154,10 +142,14 @@ _cargo set [T_CARGO_box_big, ["LIB_WeaponsBox_Big_GER"]];

//==== Groups ====
_group = +(tDefault select T_GROUP);

_group set [T_GROUP_SIZE-1, nil];

_group set [T_GROUP_inf_AA_team, [[[T_INF, T_INF_TL], [T_INF, T_INF_AT], [T_INF, T_INF_AT], [T_INF, T_INF_ammo]]]];
_group set [T_GROUP_inf_AA_team, [
[
T_INF_TL,
T_INF_AT,
T_INF_AT,
T_INF_ammo
] apply { [T_INF, _x] }
]];

//==== Vehicle Description ==== (Broken waiting for fix)
//(T_NAMES select T_VEH) set [T_VEH_car_unarmed, "Unarmed Car"]; // = 1 Car like a Prowler or UAZ
Expand Down
12 changes: 8 additions & 4 deletions Vindicta.Altis/Templates/Factions/WW2_Sov.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,14 @@ _cargo set [T_CARGO_box_big, ["LIB_WeaponsBox_Big_SU"]];

//==== Groups ====
_group = +(tDefault select T_GROUP);

_group set [T_GROUP_SIZE-1, nil];

_group set [T_GROUP_inf_AA_team, [[[T_INF, T_INF_TL], [T_INF, T_INF_AT], [T_INF, T_INF_AT], [T_INF, T_INF_ammo]]]];
_group set [T_GROUP_inf_AA_team, [
[
T_INF_TL,
T_INF_AT,
T_INF_AT,
T_INF_ammo
] apply { [T_INF, _x] }
]];

//==== Vehicle Description ==== (Broken waiting for fix)
//(T_NAMES select T_VEH) set [T_VEH_car_unarmed, "Unarmed Car"]; // = 1 Car like a Prowler or UAZ
Expand Down
12 changes: 8 additions & 4 deletions Vindicta.Altis/Templates/Factions/WW2_UK.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,14 @@ _cargo set [T_CARGO_box_big, ["LIB_WeaponsBox_Big_SU"]];

//==== Groups ====
_group = +(tDefault select T_GROUP);

_group set [T_GROUP_SIZE-1, nil];

_group set [T_GROUP_inf_AA_team, [[[T_INF, T_INF_TL], [T_INF, T_INF_AT], [T_INF, T_INF_AT], [T_INF, T_INF_ammo]]]];
_group set [T_GROUP_inf_AA_team, [
[
T_INF_TL,
T_INF_AT,
T_INF_AT,
T_INF_ammo
] apply { [T_INF, _x] }
]];

//==== Vehicle Descriptions ==== (Broken waiting for fix)
//(T_NAMES select T_VEH) set [T_VEH_car_unarmed, "Unarmed Car"]; // = 1 Car like a Prowler or UAZ
Expand Down
1 change: 0 additions & 1 deletion Vindicta.Altis/Templates/fn_processTemplateItems.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Author: Sparker 30 september 2019

#define pr private

#define DEBUG_TEMPLATES
#ifdef DEBUG_TEMPLATES
#define LOG_TEMPLATE diag_log format
#else
Expand Down

0 comments on commit cb5dd31

Please sign in to comment.