Skip to content

Commit

Permalink
Further weapons updates as well as convention update
Browse files Browse the repository at this point in the history
  • Loading branch information
@pool011
pool011 committed Apr 3, 2024
1 parent 2971404 commit 3fce313
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 35 deletions.
31 changes: 16 additions & 15 deletions addons/vehicles_dragoon/CfgMagazines.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
class CfgMagazines {
class 140Rnd_30mm_MP_shells_Tracer_Red;
class 78Rnd_30mm_MP_shells_Tracer_Red: 140Rnd_30mm_MP_shells_Tracer_Red {
displayName = CSTRING(78Rnd_30mm_MP_shells_Tracer_Red);
displayNameShort = CSTRING(78Rnd_30mm_MP_shells_Tracer_Red_dispShort);
class cav_78Rnd_30mm_MP_shells_Tracer_Red: 140Rnd_30mm_MP_shells_Tracer_Red {
displayName = CSTRING(cav_78Rnd_30mm_MP_shells_Tracer_Red);
displayNameShort = CSTRING(cav_78Rnd_30mm_MP_shells_Tracer_Red_dispShort);
displayNameMFDFormat = "MP-T";
count=78;
};
class 60Rnd_30mm_APFSDS_shells_Tracer_Red;
class 78Rnd_30mm_APFSDS_shells_Tracer_Red: 60Rnd_30mm_APFSDS_shells_Tracer_Red {
displayName = CSTRING(78Rnd_30mm_APFSDS_shells_Tracer_Red);
displayNameShort = CSTRING(78Rnd_30mm_APFSDS_shells_Tracer_Red_dispShort);
class cav_78Rnd_30mm_APFSDS_shells_Tracer_Red: 60Rnd_30mm_APFSDS_shells_Tracer_Red {
displayName = CSTRING(cav_78Rnd_30mm_APFSDS_shells_Tracer_Red);
displayNameShort = CSTRING(cav_78Rnd_30mm_APFSDS_shells_Tracer_Red_dispShort);
displayNameMFDFormat = "APFSDS-T";
count=78;
};
class 78Rnd_30mm_HEI_shells_Tracer_Red: 78Rnd_30mm_MP_shells_Tracer_Red {
class cav_78Rnd_30mm_HEI_shells_Tracer_Red: cav_78Rnd_30mm_MP_shells_Tracer_Red {
ammo = "cav_B_30mm_HEI_Tracer_Red";
displayNameMFDFormat = "HEI-T";
displayName = CSTRING(78Rnd_30mm_HEI_shells_Tracer_Red);
displayNameShort = CSTRING(78Rnd_30mm_HEI_shells_Tracer_Red_dispShort);
displayName = CSTRING(cav_78Rnd_30mm_HEI_shells_Tracer_Red);
displayNameShort = CSTRING(cav_78Rnd_30mm_HEI_shells_Tracer_Red_dispShort);
initSpeed=1100;
};
class 4Rnd_Titan_long_missiles;
class cav_2Rnd_GAA_missiles: 4Rnd_Titan_long_missiles {
displayName = CSTRING(cav_2Rnd_GAA_missiles);
displayNameShort = CSTRING(cav_2Rnd_GAA_missiles_dispShort);
class cav_2Rnd_fim92_missiles: 4Rnd_Titan_long_missiles {
displayName = CSTRING(cav_2Rnd_fim92_missiles);
displayNameShort = CSTRING(cav_2Rnd_fim92_missiles_dispShort);
ammo = "rhs_ammo_fim92_missile";
count=2;
};
// TODO: ACE FCS Air Burst Mags
class 78Rnd_30mm_HEABT_shells_Tracer_Red: 78Rnd_30mm_MP_shells_Tracer_Red {
class cav_78Rnd_30mm_HEABT_shells_Tracer_Red: cav_78Rnd_30mm_MP_shells_Tracer_Red {
ammo="cav_B_30mm_HEAB_Tracer_Red";
displayNameMFDFormat="HEAB-T";
displayName=CSTRING(78Rnd_30mm_HEAB_shells_Tracer_Red);
displayNameShort=CSTRING(78Rnd_30mm_HEAB_shells_Tracer_Red_dispShort);
displayName=CSTRING(cav_78Rnd_30mm_HEAB_shells_Tracer_Red);
displayNameShort=CSTRING(cav_78Rnd_30mm_HEAB_shells_Tracer_Red_dispShort);
};
class 200Rnd_762x51_Belt_Red;
class cav_mag_300Rnd_762x51_Belt_Red: 200Rnd_762x51_Belt_Red {
Expand Down
4 changes: 2 additions & 2 deletions addons/vehicles_dragoon/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@ class CfgVehicles {
};
class Turrets: Turrets {
class MainTurret: MainTurret {
weapons[] = {"cav_autocannon_30mm_CTWS","LMG_coax_ext","cav_dragoon_missiles_AA","SmokeLauncher"};
magazines[] = {"78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_APFSDS_shells_Tracer_Red","78Rnd_30mm_APFSDS_shells_Tracer_Red","2000Rnd_762x51_Belt_T_Red","2000Rnd_762x51_Belt_T_Red","4Rnd_Titan_long_missiles","SmokeLauncherMag"};
weapons[] = {"cav_autocannon_30mm_CTWS","cav_dragoon_coax_m240","cav_dragoon_missiles_AA","SmokeLauncher"};
magazines[] = {"cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","2000Rnd_762x51_Belt_T_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_2Rnd_fim92_missiles","SmokeLauncherMag"};
class Turrets: Turrets {
class CommanderOptics: CommanderOptics {
weapons[] = {};
Expand Down
12 changes: 9 additions & 3 deletions addons/vehicles_dragoon/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,21 @@ class CfgWeapons {
{
class HE: HE
{
magazines[] += {"78Rnd_30mm_MP_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red"};
magazines[] += {"cav_78Rnd_30mm_MP_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red"};
};
class AP: AP
{
magazines[] += {"78Rnd_30mm_APFSDS_shells_Tracer_Red"};
magazines[] += {"cav_78Rnd_30mm_APFSDS_shells_Tracer_Red"};
};
};
class missiles_titan;
class cav_dragoon_missiles_AA: missiles_titan {
magazines[] = {"4Rnd_Titan_long_missiles"};
displayName = CSTRING(cav_dragoon_missiles_AA);
magazines[] = {"cav_2Rnd_fim92_missiles","rhs_fim92_mag"};
};
class LMG_coax_ext;
class cav_dragoon_coax_m240: LMG_coax_ext {
displayName = CSTRING(cav_dragoon_coax_m240);
magazines[] += {"cav_mag_300Rnd_762x51_Belt_Red"};
};
};
30 changes: 15 additions & 15 deletions addons/vehicles_dragoon/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,38 @@
</Key>

<!-- CfgMagazines -->
<Key ID="STR_cav_vehicles_dragoon_78Rnd_30mm_MP_shells_Tracer_Red">
<Key ID="STR_cav_vehicles_dragoon_cav_78Rnd_30mm_MP_shells_Tracer_Red">
<English>78Rnd MP Tracer (Red)</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_78Rnd_30mm_MP_shells_Tracer_Red_dispShort">
<Key ID="STR_cav_vehicles_dragoon_cav_78Rnd_30mm_MP_shells_Tracer_Red_dispShort">
<English>MP-T</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_78Rnd_30mm_APFSDS_shells_Tracer_Red">
<Key ID="STR_cav_vehicles_dragoon_cav_78Rnd_30mm_APFSDS_shells_Tracer_Red">
<English>78Rnd APFSDS Tracer (Red)</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_78Rnd_30mm_APFSDS_shells_Tracer_Red_dispShort">
<Key ID="STR_cav_vehicles_dragoon_cav_78Rnd_30mm_APFSDS_shells_Tracer_Red_dispShort">
<English>APFSDS-T</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_78Rnd_30mm_HEAB_shells_Tracer_Red">
<Key ID="STR_cav_vehicles_dragoon_cav_78Rnd_30mm_HEAB_shells_Tracer_Red">
<English>78Rnd HEAB Tracer (Red)</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_78Rnd_30mm_HEAB_shells_Tracer_Red_dispShort">
<Key ID="STR_cav_vehicles_dragoon_cav_78Rnd_30mm_HEAB_shells_Tracer_Red_dispShort">
<English>HEAB-T</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_78Rnd_30mm_HEI_shells_Tracer_Red">
<Key ID="STR_cav_vehicles_dragoon_cav_78Rnd_30mm_HEI_shells_Tracer_Red">
<English>78Rnd HEI Tracer (Red)</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_78Rnd_30mm_HEI_shells_Tracer_Red_dispShort">
<Key ID="STR_cav_vehicles_dragoon_cav_78Rnd_30mm_HEI_shells_Tracer_Red_dispShort">
<English>HEI-T</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_cav_mag_300Rnd_762x51_Belt_Red">
<English>300Rnd Linked M80A1 EPR Belt</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_cav_2Rnd_GAA_missiles">
<English>2Rnd Titan AA</English>
<Key ID="STR_cav_vehicles_dragoon_cav_2Rnd_fim92_missiles">
<English>2Rnd Stinger</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_cav_2Rnd_GAA_missiles_dispShort">
<English>Titan AA</English>
<Key ID="STR_cav_vehicles_dragoon_cav_2Rnd_fim92_missiles_dispShort">
<English>Stinger</English>
</Key>

<!-- CfgVehicles -->
Expand Down Expand Up @@ -199,11 +199,11 @@
</Key>

<!-- CfgWeapons -->
<Key ID="STR_cav_vehicles_dragoon_cav_dragoon_coax">
<Key ID="STR_cav_vehicles_dragoon_cav_dragoon_coax_m240">
<English>M240C Coax</English>
</Key>
<Key ID="STR_cav_vehicles_dragoon_cav_dragoon_missile_launcher">
<English>ATGM Launcher</English>
<Key ID="STR_cav_vehicles_dragoon_cav_dragoon_missiles_AA">
<English>Stinger Launcher</English>
</Key>
</Package>
</Project>

0 comments on commit 3fce313

Please sign in to comment.