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.

Sign up for GitHub

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

Cwr3 post-test adjustments #3429

Merged
merged 2 commits into from
Nov 27, 2024
Merged

Cwr3 post-test adjustments #3429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96dc940
bike replaced, cop shotgun ammo provided
ante185 Nov 14, 2024
1c1733e
Update CWR_Reb_FIA.sqf
ante185 Nov 14, 2024
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
21 changes: 13 additions & 8 deletions A3A/addons/core/Templates/Templates/CWR/CWR_AI_US_Army_Temperate.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ private _mmItems = [];
private _sfmmItems = [""];

if (A3A_hasACE) then {
_slItems append ["ACE_microDAGR", "ACE_DAGR"];
_eeItems append ["ACE_Clacker", "ACE_DefusalKit"];
_mmItems append ["ACE_RangeCard", "ACE_ATragMX", "ACE_Kestrel4500"];
_slItems append ["ACE_microDAGR", "ACE_DAGR"];
_eeItems append ["ACE_Clacker", "ACE_DefusalKit"];
_mmItems append ["ACE_RangeCard", "ACE_ATragMX", "ACE_Kestrel4500"];
};

_loadoutData set ["items_squadLeader_extras", _slItems];
Expand Down Expand Up @@ -320,10 +320,10 @@ _policeLoadoutData set ["vests", ["V_TacVest_blk_POLICE"]];
_policeLoadoutData set ["helmets", ["H_Cap_police"]];

_policeLoadoutData set ["shotGuns", [
["CUP_sgun_CZ584", "", "", "", ["CUP_1Rnd_12Gauge_Pellets_No00_Buck"], [], ""]
["CUP_sgun_CZ584", "", "", "", ["CUP_1Rnd_12Gauge_Pellets_No00_Buck"], ["CUP_1Rnd_762x51_CZ584"], ""]
]];
_policeLoadoutData set ["SMGs", [
["CUP_smg_M3A1_blk", "", "", "", ["CUP_30Rnd_45ACP_M3A1_BLK_M"], [], ""],
["CUP_smg_M3A1_blk", "", "", "", ["CUP_30Rnd_45ACP_M3A1_BLK_M"], [], ""],
["CUP_smg_M3A1_blk", "", "", "", ["CUP_30Rnd_45ACP_M3A1_BLK_M"], [], ""]
]];
_policeLoadoutData set ["sidearms", [
Expand Down Expand Up @@ -733,9 +733,14 @@ private _policeTemplate = {
["vests"] call _fnc_setVest;
["uniforms"] call _fnc_setUniform;


[selectRandom ["SMGs", "shotGuns"]] call _fnc_setPrimary;
["primary", 5] call _fnc_addMagazines;
private _weapon = selectRandom ["SMGs", "shotGuns"];
[_weapon] call _fnc_setPrimary;
if (_weapon == "shotGuns") then {
["primary", 10] call _fnc_addMagazines;
} else {
["primary", 3] call _fnc_addMagazines;
};
["primary", 5] call _fnc_addAdditionalMuzzleMagazines;

["sidearms"] call _fnc_setHandgun;
["handgun", 2] call _fnc_addMagazines;
Expand Down
6 changes: 3 additions & 3 deletions A3A/addons/core/Templates/Templates/CWR/CWR_Reb_FIA.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
["flagTexture", "cwr3\general\cwr3_flags\data\fia.paa"] call _fnc_saveToTemplate;
["flagMarkerType", "cwr3_faction_fia"] call _fnc_saveToTemplate;

["vehiclesBasic", ["cwr3_c_jawa"]] call _fnc_saveToTemplate;
["vehiclesLightUnarmed", ["cwr3_i_uaz"]] call _fnc_saveToTemplate;
["vehiclesBasic", ["I_G_Quadbike_01_F"]] call _fnc_saveToTemplate;
["vehiclesLightUnarmed", ["cwr3_i_uaz", "cwr3_i_uaz_open", "cwr3_i_uaz452"]] call _fnc_saveToTemplate;
["vehiclesLightArmed", ["cwr3_i_uaz_dshkm"]] call _fnc_saveToTemplate;
["vehiclesTruck", ["cwr3_i_ural"]] call _fnc_saveToTemplate;
["vehiclesTruck", ["cwr3_i_ural", "cwr3_i_btr40"]] call _fnc_saveToTemplate;
["vehiclesAT", ["cwr3_i_uaz_spg9"]] call _fnc_saveToTemplate;
["vehiclesAA", ["cwr3_i_ural_zu23"]] call _fnc_saveToTemplate;
["vehiclesBoat", ["cwr3_i_zodiac"]] call _fnc_saveToTemplate;
Expand Down