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

Jump to bottom

Western Sahara ION Services template #2939

Merged
merged 13 commits into from
Oct 18, 2023
Merged

Western Sahara ION Services template #2939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
64dde3d
Vanilla + WS retextures
ante185 Sep 5, 2023
a67d99d
Create WS_Vehicle_Attributes.sqf
ante185 Sep 5, 2023
01718cc
change transfer
ante185 Sep 5, 2023
0be376b
ION Marker
ante185 Sep 7, 2023
aa51691
APEX Expansion
ante185 Sep 7, 2023
a705669
killing more UNA files
ante185 Sep 7, 2023
0e5e445
killed unused retextures
ante185 Sep 7, 2023
35f8902
Update WS_AI_ION.sqf
ante185 Sep 15, 2023
8e846c0
Update WS_AI_ION.sqf
ante185 Sep 16, 2023
5324cfd
Update WS_AI_ION.sqf
ante185 Sep 16, 2023
262f45b
Update WS_AI_ION.sqf
ante185 Sep 16, 2023
01800ef
tabs to spaces & space reduction in class entries
Bob-Murphy Sep 24, 2023
7dba7f2
Merge branch 'unstable' into WS-ION
Bob-Murphy Oct 18, 2023
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
2 changes: 2 additions & 0 deletions A3A/addons/config_fixes/Vanilla/air.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@

class I_Heli_Transport_02_F;
class B_Heli_Light_01_F;
class B_Heli_Light_01_stripped_F;
class B_Heli_Light_01_dynamicLoadout_F;

class O_Heli_Light_02_dynamicLoadout_F;
class O_Heli_Light_02_unarmed_F;

Expand Down
2 changes: 1 addition & 1 deletion A3A/addons/config_fixes/Vanilla/soft.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,4 @@ class a3a_Van_02_black_medevac_F : C_Van_02_medevac_F
};
};
textureList[] = {"Black",1,"White",0,"CivAmbulance",0,"IdapAmbulance",0,"LDFAmbulance",0};
};
};
5 changes: 1 addition & 4 deletions A3A/addons/config_fixes/WS/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class CfgVehicles
textureList[] = {};
hiddenSelectionsTextures[] = {"a3\soft_f\offroad_01\data\offroad_01_ext_base01_co.paa","a3\soft_f\offroad_01\data\offroad_01_ext_base01_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_sfia2_co.paa"};
};

class a3a_green_Offroad_armor : B_Tura_Offroad_armor_lxWS
{
textureList[] = {};
Expand All @@ -55,7 +54,6 @@ class CfgVehicles
textureList[] = {};
hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_grn_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_grn_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_rust_co.paa"};
};

class a3a_ldf_Offroad_armor : B_Tura_Offroad_armor_lxWS
{
textureList[] = {};
Expand All @@ -80,7 +78,6 @@ class CfgVehicles
side = 2;
hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_eaf_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_eaf_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_rust_co.paa"};
};

class a3a_SIFA_Truck_02_medical_F : O_Truck_02_medical_F
{
side = 0;
Expand Down Expand Up @@ -109,4 +106,4 @@ class CfgVehicles
faction = "IND_E_F";
hiddenSelectionsTextures[] = {"a3\soft_f_enoch\truck_02\data\truck_02_kab_eaf_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_eaf_co.paa","a3\soft_f_enoch\truck_02\data\truck_02_int_eaf_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_green_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_green_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_green_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_green_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"};
};
};
};
57 changes: 34 additions & 23 deletions A3A/addons/core/CfgMarkers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,37 @@
class CfgMarkers {
class flag_NATO;
class CfgMarkers
{
class flag_NATO;

class a3a_flag_cdf: flag_NATO {
name = "CDF";
icon = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
};
class a3a_flag_cdf : flag_NATO
{
name = "CDF";
icon = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
};

class a3a_flag_napa: flag_NATO {
name = "NAPA";
icon = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
};

class a3a_flag_serbia: flag_NATO {
name = "Serbia";
icon = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
};
class a3a_flag_chdkz: flag_NATO {
name = "ChDKZ";
icon = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
texture = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
};
class a3a_flag_napa : flag_NATO
{
name = "NAPA";
icon = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
};

class a3a_flag_serbia : flag_NATO
{
name = "Serbia";
icon = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
};
class a3a_flag_chdkz : flag_NATO
{
name = "ChDKZ";
icon = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
texture = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
};
class a3a_flag_ION : flag_NATO
{
name = "ION";
icon = "\A3\Data_F\Flags\flag_ion_CO.paa";
texture = "\A3\Data_F\Flags\flag_ion_CO.paa"; //TODO: rectangularize marker texture
};
};
7 changes: 7 additions & 0 deletions A3A/addons/core/Templates/Templates.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,13 @@ class Templates
forceDLC[] = {"ws"};
climate[] = {"arid"};
};
class WS_ION : WS_Base
{
side = "Inv";
flagTexture = "\A3\Data_F\Flags\flag_ion_CO.paa";
name = "WS ION";
file = "WS_AI_ION";
};
class WS_SIFA : WS_Base
{
side = "Inv";
Expand Down
Loading