Skip to content

Commit

Permalink
This PR continues on #2201
Browse files Browse the repository at this point in the history 
Adds Logistic Nodes and Templates by @stutpip123,
Added Helicopters as possible Logistic Vehicles (This needs to be done for the rest of the Templates at some point too).
Added Unsungs Category Chaos to fn_categoryOverrides

Mod Integration: Unsung (#2379)

* Add files via upload

* Update Unsung_AI_NVA_Tropical.sqf

* Update Unsung_AI_US_Tropical.sqf

* Update detector.sqf

* Update selector.sqf

* Update params.hpp

* reduced number of CAS and AA planes

* Update Unsung_AI_US_Tropical.sqf

* Update Unsung_AI_NVA_Tropical.sqf

* Update Unsung_Logistics_Nodes.sqf

* Add Unsung AA Planes

* Update params.hpp

* Update Unsung_AI_NVA_Tropical.sqf

* Update Unsung_AI_US_Tropical.sqf

* Update Unsung_Reb_VC_Tropical.sqf

* Update Unsung_Reb_VC_Tropical.sqf

* Update Unsung_AI_NVA_Tropical.sqf

* Update Unsung_Logistics_Nodes.sqf

* Update Unsung_Logistics_Nodes.sqf

* Update selector.sqf

* Update Unsung_AI_US_Tropical.sqf

* Update Unsung_AI_US_Tropical.sqf

* Update fn_equipmentIsValidForCurrentModset.sqf

* Update Templates.hpp

* Renaming/Small changes to files to work

* Update Categories for Unsung

* Add Cas Loadouts

* Add Helis as Possible Logistics vehicle

* Update Templates.hpp

* Add Identities, Casing etc.

* Update fn_equipmentSort.sqf

* Update fn_equipmentIsValidForCurrentModset.sqf

* Update UNS_Civ.sqf

* Update

* Equipment Fun

Co-authored-by: stutpip123 <[email protected]>
  • Loading branch information
@Lazejun @stutpip123
Lazejun and stutpip123 authored Sep 4, 2022
1 parent c5572b0 commit 0141ce4
Show file tree
Hide file tree
Showing 14 changed files with 2,245 additions and 1,470 deletions.
38 changes: 37 additions & 1 deletion A3A/addons/core/Templates/Templates.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,4 +489,40 @@ class Templates

Nodes[] = {"CUP_Logistics_Nodes.sqf"};
};
};

class UNS
{
priorityOcc = 7;
priorityInv = 7;
priorityReb = 7;
priorityCiv = 7;

requiredAddons[] = {
"uns_weap_w"
};
path = QPATHTOFOLDER(Templates\Templates\UNS);

class AI
{
class NVA {};
class US {};
};
class Reb
{
class VC {};
};

class Civ {};

class worldDefaults
{
class Default {
Occ = "NVA";
Inv = "US";
Reb = "VC";
};
};

Nodes[] = {"UNS_Logistics_Nodes.sqf"};
};
};
855 changes: 855 additions & 0 deletions A3A/addons/core/Templates/Templates/UNS/UNS_AI_NVA.sqf
View file

Large diffs are not rendered by default.

800 changes: 800 additions & 0 deletions A3A/addons/core/Templates/Templates/UNS/UNS_AI_US.sqf
View file

Large diffs are not rendered by default.

115 changes: 115 additions & 0 deletions A3A/addons/core/Templates/Templates/UNS/UNS_Civ.sqf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
//////////////////////////////
// Civilian Information //
//////////////////////////////

//////////////////////////
// Vehicles //
//////////////////////////

["vehiclesCivCar", [
"uns_willys", 1
,"uns_zil157", 0.3]] call _fnc_saveToTemplate;

["vehiclesCivIndustrial", [
"uns_zil157", 0.5]] call _fnc_saveToTemplate;

["vehiclesCivBoat", [
"UNS_skiff2_C", 0.4
,"UNS_skiff_C", 0.4
,"UNS_skiff2_cargo_C", 0.5
,"UNS_skiff_cargo_C", 0.5
,"UNS_sampan_cargo", 0.6
,"UNS_sampan_fish1", 0.5
,"UNS_sampan_large", 0.3
,"UNS_sampan_supply", 0.4
,"UNS_Sampan_Transport", 0.2
,"UNS_sampan_village", 0.3]] call _fnc_saveToTemplate;

["vehiclesCivRepair", []] call _fnc_saveToTemplate;

["vehiclesCivMedical", []] call _fnc_saveToTemplate;

["vehiclesCivFuel", []] call _fnc_saveToTemplate;

/////////////////////
/// Identities ///
/////////////////////

["voices", ["Male01CHI", "Male02CHI", "Male03CHI"]] call _fnc_saveToTemplate;
["faces", ["AsianHead_A3_01", "AsianHead_A3_02", "AsianHead_A3_04", "AsianHead_A3_05", "AsianHead_A3_06", "AsianHead_A3_07"]] call _fnc_saveToTemplate;

//////////////////////////
// Loadouts //
//////////////////////////

private _civUniforms = [
"UNS_CIV_U",
"UNS_CIV_B"
];

private _pressUniforms = [
"U_Marshal"
];

["uniforms", _civUniforms + _pressUniforms] call _fnc_saveToTemplate;

private _civhats = [
"uns_H_Simc_nasi",
"UNS_Conehat_VC",
"UNS_Headband_BK",
"UNS_Boonie_VC",
"uns_sas_booniehat_vc_tan",
"UNS_Boonie3_VC"
];

["headgear", _civHats] call _fnc_saveToTemplate;

private _loadoutData = call _fnc_createLoadoutData;

_loadoutData set ["uniforms", _civUniforms];
_loadoutData set ["pressUniforms", _pressUniforms];
_loadoutData set ["workerHelmets", ["vn_c_conehat_02"]];
_loadoutData set ["helmets", _civHats];

_loadoutData set ["maps", ["ItemMap"]];
_loadoutData set ["watches", ["ItemWatch"]];
_loadoutData set ["compasses", ["ItemCompass"]];


private _manTemplate = {
["helmets"] call _fnc_setHelmet;
["uniforms"] call _fnc_setUniform;

["items_medical_standard"] call _fnc_addItemSet;

["maps"] call _fnc_addMap;
["watches"] call _fnc_addWatch;
["compasses"] call _fnc_addCompass;
};
private _workerTemplate = {
["workerHelmets"] call _fnc_setHelmet;
["uniforms"] call _fnc_setUniform;

["items_medical_standard"] call _fnc_addItemSet;

["maps"] call _fnc_addMap;
["watches"] call _fnc_addWatch;
["compasses"] call _fnc_addCompass;
};
private _pressTemplate = {
["pressUniforms"] call _fnc_setUniform;

["items_medical_standard"] call _fnc_addItemSet;

["maps"] call _fnc_addMap;
["watches"] call _fnc_addWatch;
["compasses"] call _fnc_addCompass;
};
private _prefix = "militia";
private _unitTypes = [
["Press", _pressTemplate],
["Worker", _workerTemplate],
["Man", _manTemplate]
];

[_prefix, _unitTypes, _loadoutData] call _fnc_generateAndSaveUnitsToTemplate;
128 changes: 128 additions & 0 deletions A3A/addons/core/Templates/Templates/UNS/UNS_Logistics_Nodes.sqf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
A3A_logistics_vehicleHardpoints append [
//Cars
["\uns_m274\uns_m274.p3d",[
[1, [0.13,-0.4,-0.71], [0,1,2]]
]],

//Small Trucks
["\uns_wheeled_w\m37b\uns_m37b1.p3d",[
[1, [0,-1.25,-0.82], [1,2,6]],
[1, [0,-2.05,-0.82], [3,4,5]]
]],

//Trucks
["uns_m35\uns_M35A2",[
[1, [0,-0.4,-0.5], [3,4]],
[1, [0,-1.2,-0.5], [5,6,7,8]],
[1, [0,-2,-0.5], [9,10]],
[1, [0,-2.8,-0.5], [1,2]]
]],

["\uns_wheeled_e\ural\uns_ural.p3d",[
[1, [0,-0.6,0.1], [2,3]],
[1, [0,-1.4,0.1], [4,5,6,7]],
[1, [0,-2.2,0.1], [8,9]],
[1, [0,-3,0.1], [10,11]]
]],

["uns_wheeled_e\zil157\uns_zil157.p3d",[
[1, [0,0.3,1.4], [2,11,12]],
[1, [0,-0.5,1.4], [1,3,4]],
[1, [0,-1.3,1.4], [5,6]],
[1, [0,-2.1,1.4], [7,8]]
]],

//Boats
["uns_boats\skiff\uns_skiff_1",[
[1, [0,0.6,-0.675], [0,1]]
]],

["\UNS_sampan\UNS_sampan_fish1.P3D",[
[1, [0.15,3.6,-0.445], []],
[1, [0.15,2.8,-0.445], []],
[1, [0.15,2,-0.445], []],
[1, [0.15,1.2,-0.445], [1]],
[1, [0.15,0.4,-0.445], []],
[1, [0.15,-0.4,-0.445], []]
]],

["\UNS_sampan\UNS_sampan_Transport.P3D",[
[1, [0,3.35,-0.7], [0]],
[1, [0,2.55,-0.7], []],
[1, [0,1.75,-0.7], [5]],
[1, [0,0.95,-0.7], []],
[1, [0,0.15,-0.7], []]
]],

["\UNS_sampan\UNS_sampan_large.P3D",[
[1, [0,2.3,-1.2], []],
[1, [0,1.5,-1.2], []],
[1, [0,0.7,-1.2], []],
[1, [0,-0.1,-1.2], []]
]],

//Helicopters
["\uns_ch47a\uns_ch47a.p3d",[
[1, [0.01,3.6,-2.71], []],
[1, [0.01,2.8,-2.71], [0,1,23]],
[1, [0.01,2,-2.71], [2,3,22]],
[1, [0.01,1.2,-2.71], [4,19,21]],
[1, [0.01,0.4,-2.71], [5,18]],
[1, [0.01,-0.4,-2.71], [6,17]],
[1, [0.01,-1.2,-2.71], [7,8,16]],
[1, [0.01,-2,-2.71], [9,14,15]],
[1, [0.01,-2.8,-2.71], [10,13]],
[1, [0.01,-3.6,-2.71], [11,12,20]]
]],

["\uns_mi8\uns_Mi8_MT",[
[1, [0.01,3.6,-2.29], [2,3,4,5]],
[1, [0.01,2.8,-2.29], [6,7]],
[1, [0.01,2,-2.29], [8,9]],
[1, [0.01,1.2,-2.29], [10,11]],
[1, [0.01,0.4,-2.29], [12,13]]
]],

["\uns_mi8\uns_Mi8_MTV",[
[1, [0.01,3.6,-2.29], [1,2,3,4]],
[1, [0.01,2.8,-2.29], [5,6]],
[1, [0.01,2,-2.29], [7,8]],
[1, [0.01,1.2,-2.29], [9,10]],
[1, [0.01,0.4,-2.29], [11,12]]
]]
];

//Offsets for adding new statics/boxes to the JNL script.
A3A_logistics_attachmentOffset append [
//weapons //location //rotation //size //recoil //description
["uns_dshk_high_VC" call A3A_fnc_classNameToModel, [0.25, -0.5, 1.64], [0, 1, 0], 4, 100],
["uns_m2_high" call A3A_fnc_classNameToModel, [0.04, 0.13, 0], [0, 1, 0], 4, 100],
["uns_pk_high_VC" call A3A_fnc_classNameToModel, [0.04, 0, 0], [0, 1, 0], 4, 100],
["uns_m1941_82mm_mortarVC" call A3A_fnc_classNameToModel, [0,-0.52,0.74], [0, 1, 0], 3, 2000],
["uns_M1_81mm_mortar" call A3A_fnc_classNameToModel, [0.02,-0.39,0.70], [0, 1, 0], 3, 2000],
["uns_M2_60mm_mortar" call A3A_fnc_classNameToModel, [-0.02,-0.39,0.74], [0, 1, 0], 3, 1500],
["uns_M30_107mm_mortar" call A3A_fnc_classNameToModel, [0.02,-0.6,1.05], [0, 1, 0], 3, 3000]
];

//all vehicles with jnl loading nodes where the nodes are not located in the open, this can be because its inside the vehicle or it has a cover over the loading plane.
A3A_logistics_coveredVehicles append [
"uns_Mi8T_VPAF" call A3A_fnc_classNameToModel
, "uns_Mi8TV_VPAF_MG" call A3A_fnc_classNameToModel
, "uns_M35A2"
, "uns_nvatruck"
, "UNS_sampan_large" call A3A_fnc_classNameToModel
, "UNS_Sampan_Transport" call A3A_fnc_classNameToModel
, "uns_ch47_m60_army" call A3A_fnc_classNameToModel
];

//if you want a weapon to be loadable you need to add it to this as a array of [model, [blacklist specific vehicles]],
//if the vehicle is in the coveredVehicles array dont add it to the blacklist in this array.
A3A_logistics_weapons append [
["uns_pk_high_VC" call A3A_fnc_classNameToModel,["uns_M35A2", "uns_nvatruck"]],
["uns_dshk_high_VC" call A3A_fnc_classNameToModel,["uns_M35A2", "uns_nvatruck"]],
["uns_m1941_82mm_mortarVC" call A3A_fnc_classNameToModel,["uns_M35A2", "uns_nvatruck", "B_Boat_Transport_01_F" call A3A_fnc_classNameToModel, "UNS_sampan_fish1" call A3A_fnc_classNameToModel]],
["uns_m2_high" call A3A_fnc_classNameToModel,["uns_M35A2", "uns_nvatruck"]],
["uns_M2_60mm_mortar" call A3A_fnc_classNameToModel,["uns_M35A2", "uns_nvatruck", "B_Boat_Transport_01_F" call A3A_fnc_classNameToModel, "UNS_sampan_fish1" call A3A_fnc_classNameToModel]],
["uns_M30_107mm_mortar" call A3A_fnc_classNameToModel,["uns_M35A2", "uns_nvatruck", "B_Boat_Transport_01_F" call A3A_fnc_classNameToModel, "UNS_sampan_fish1" call A3A_fnc_classNameToModel]],
["uns_M1_81mm_mortar" call A3A_fnc_classNameToModel,["uns_M35A2", "uns_nvatruck", "B_Boat_Transport_01_F" call A3A_fnc_classNameToModel, "UNS_sampan_fish1" call A3A_fnc_classNameToModel]]
];
Loading

0 comments on commit 0141ce4

Please sign in to comment.