Skip to content

Commit

Permalink
Realistic names for new assets from Tanks DLC (#6252)
Browse files Browse the repository at this point in the history
* LSV AT variants

* Angara > Armata, Nyx > Wiesel 2

* Fix some errors in last to commits

* Zamak MRL -> KamAZ MRL

* Vorona -> Metis-M

* Vehicle Vorona -> Metis-M

* Wiesel vehicle weapons

* Fix wrong inheritance

* Rooikat GT12 cannon

* Armata weaponry

* MB 4WD -> Jeep Wrangler

* Optics Attachments

* Fixed Type "Grenn" -> "Green"

* Rooikat SPMG -> MG4

* New Marid v2 -> Otokar ARMA

* Removed unnecessary inheritance.

* Simplify ace_vehicles config
  • Loading branch information
xrufix authored and PabstMirror committed Jun 1, 2018
1 parent 000e217 commit 655600b
Show file tree
Hide file tree
Showing 5 changed files with 447 additions and 1 deletion.
82 changes: 81 additions & 1 deletion addons/realisticnames/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,13 @@ class CfgVehicles {
class O_APC_Wheeled_02_base_F : APC_Wheeled_02_base_F {
displayName = CSTRING(APC_Wheeled_02_rcws_Name);
};
class APC_Wheeled_02_base_v2_F;
class O_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F {
displayName = CSTRING(APC_Wheeled_02_rcws_Name);
};
class O_T_APC_Wheeled_02_rcws_v2_ghex_F : APC_Wheeled_02_base_v2_F {
displayName = CSTRING(APC_Wheeled_02_rcws_Name);
};

class I_APC_Wheeled_03_base_F;
class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F {
Expand Down Expand Up @@ -257,6 +264,10 @@ class CfgVehicles {
class I_Truck_02_box_F: Truck_02_box_base_F {
displayName = CSTRING(Truck_02_box_Name);
};
class Truck_02_MRL_base_F;
class I_Truck_02_MRL_F: Truck_02_MRL_base_F {
displayName = CSTRING(Truck_02_MRL_Name);
};
class I_Truck_02_medical_F: Truck_02_medical_base_F {
displayName = CSTRING(Truck_02_medical_Name);
};
Expand Down Expand Up @@ -726,13 +737,26 @@ class CfgVehicles {
// APEX/Tanoa

// Jeep Wrangler
class Offroad_02_unarmed_base_F;
class Offroad_02_base_F;
class Offroad_02_unarmed_base_F : Offroad_02_base_F {};
class C_Offroad_02_unarmed_F: Offroad_02_unarmed_base_F {
displayName = CSTRING(C_Offroad_02_unarmed);
};
class I_C_Offroad_02_unarmed_F: Offroad_02_unarmed_base_F {
displayName = CSTRING(C_Offroad_02_unarmed);
};
class Offroad_02_at_base_F: Offroad_02_base_F {
displayName = CSTRING(C_Offroad_02_at);
};
class I_C_Offroad_02_at_F: Offroad_02_at_base_F {
displayName = CSTRING(C_Offroad_02_at);
};
class Offroad_02_lmg_base_F: Offroad_02_base_F {
displayName = CSTRING(C_Offroad_02_lmg);
};
class I_C_Offroad_02_lmg_F: Offroad_02_lmg_base_F {
displayName = CSTRING(C_Offroad_02_lmg);
};

// Cessna
class Plane_Civil_01_base_F;
Expand Down Expand Up @@ -763,6 +787,9 @@ class CfgVehicles {
class LSV_01_light_base_F : LSV_01_base_F {
displayName = CSTRING(lsv_01_light);
};
class LSV_01_AT_base_F : LSV_01_base_F {
displayName = CSTRING(lsv_01_at);
};

// Light Strike Vehicle Mk. II (Qilin)
class LSV_02_base_F;
Expand All @@ -772,5 +799,58 @@ class CfgVehicles {
class LSV_02_unarmed_base_F : LSV_02_base_F {
displayName = CSTRING(lsv_02_unarmed);
};
class LSV_02_AT_base_F : LSV_02_base_F {
displayName = CSTRING(lsv_02_at);
};

// Rooikat 120 (Rhino MGS)
class AFV_Wheeled_01_base_F;
class B_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F {
displayName = CSTRING(afv_wheeled_01);
};
class B_T_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F {
displayName = CSTRING(afv_wheeled_01);
};
class AFV_Wheeled_01_up_base_F;
class B_AFV_Wheeled_01_up_cannon_F : AFV_Wheeled_01_up_base_F {
displayName = CSTRING(afv_wheeled_01_up);
};
class B_T_AFV_Wheeled_01_up_cannon_F : AFV_Wheeled_01_up_base_F {
displayName = CSTRING(afv_wheeled_01_up);
};

// T-14 Armata (T-140 Angara)
class MBT_04_cannon_base_F;
class O_MBT_04_cannon_F : MBT_04_cannon_base_F {
displayName = CSTRING(MBT_04_cannon);
};
class O_T_MBT_04_cannon_F : MBT_04_cannon_base_F {
displayName = CSTRING(MBT_04_cannon);
};
class MBT_04_command_base_F; // Keep "K" designation for command variant.
class O_MBT_04_command_F : MBT_04_command_base_F {
displayName = CSTRING(MBT_04_command);
};
class O_T_MBT_04_command_F : MBT_04_command_base_F {
displayName = CSTRING(MBT_04_command);
};

// Wiesel 2 (AWC 302 Nyx)
class LT_01_AA_base_F;
class I_LT_01_AA_F : LT_01_AA_base_F {
displayName = CSTRING(LT_01_AA);
};
class LT_01_AT_base_F;
class I_LT_01_AT_F : LT_01_AT_base_F {
displayName = CSTRING(LT_01_AT);
};
class LT_01_cannon_base_F;
class I_LT_01_cannon_F : LT_01_cannon_base_F {
displayName = CSTRING(LT_01_cannon);
};
class LT_01_scout_base_F;
class I_LT_01_scout_F : LT_01_scout_base_F {
displayName = CSTRING(LT_01_scout);
};

};
136 changes: 136 additions & 0 deletions addons/realisticnames/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,14 @@ class CfgWeapons {
displayName = CSTRING(launch_NLAW_Name);
};

class launch_Vorona_base_F;
class launch_O_Vorona_brown_F : launch_Vorona_base_F {
displayName = CSTRING(launch_Vorona_brown);
};
class launch_O_Vorona_green_F : launch_Vorona_base_F {
displayName = CSTRING(launch_Vorona_green);
};

// marksmen marksman
class DMR_02_base_F: Rifle_Long_Base_F {
displayName = CSTRING(DMR_02); //MAR-10 .338;
Expand Down Expand Up @@ -356,6 +364,9 @@ class CfgWeapons {
class Missile_AGM_01_Plane_CAS_02_F: Missile_AGM_02_Plane_CAS_01_F {
displayName = "Kh-25MTP";
};
class missiles_Vorona : MissileLauncher {
displayName = CSTRING(missiles_vorona);
};

// rockets
class Rocket_04_HE_Plane_CAS_01_F: RocketPods {
Expand Down Expand Up @@ -444,6 +455,11 @@ class CfgWeapons {
};
};

class HMG_127_APC : HMG_127 {};
class ACE_HMG_127_KORD : HMG_127_APC {
displayName = "6P49 Kord";
};

class HMG_01: HMG_127 {
displayName = "XM312";
};
Expand Down Expand Up @@ -487,6 +503,10 @@ class CfgWeapons {
displayName = "Mini-Spike";
};

class missiles_SAAMI : MissileLauncher {
displayName = "FIM-92F";
};

// mortar
class mortar_155mm_AMOS: CannonCore {
displayName = "L/52";
Expand All @@ -508,6 +528,10 @@ class CfgWeapons {
class player: player {};
};

class ACE_cannon_120mm_GT12: cannon_120mm {
displayName = "GT12";
};

class cannon_105mm: CannonCore {
displayName = "M68";
class player: Mode_SemiAuto {
Expand All @@ -518,6 +542,10 @@ class CfgWeapons {
class cannon_125mm: CannonCore {
displayName = "2A46";
};

class cannon_125mm_advanced : cannon_125mm {
displayName = "2A82-1M";
};

// coax machine guns
class LMG_coax: LMG_RCWS {
Expand All @@ -533,6 +561,12 @@ class CfgWeapons {
class ACE_LMG_coax_L94A1_mem3: LMG_coax {
displayName = "L94A1";
};
class ACE_LMG_coax_ext_MG3: LMG_coax_ext {
displayName = "H&K MG3";
};
class ACE_LMG_coax_DenelMG4 : LMG_coax {
displayName = "Denel MG4";
};

// more autocannons
class autocannon_Base_F;
Expand Down Expand Up @@ -578,6 +612,24 @@ class CfgWeapons {
displayName = "L21A1 RARDEN";
};
};

class autocannon_30mm_RCWS : autocannon_Base_F {
displayName = "2A42";
};

class cannon_20mm : autocannon_Base_F {
class AP : autocannon_Base_F {};
class HE : autocannon_Base_F {};
};
class ACE_cannon_20mm_Rh202 : cannon_20mm {
displayName = "MK20 Rh 202";
class AP: AP {
displayName = "MK20 Rh 202";
};
class HE: HE {
displayName = "MK20 Rh 202";
};
};

//attachments

Expand All @@ -587,6 +639,90 @@ class CfgWeapons {
displayName = "UTG Defender 126";
};

class optic_hamr : ItemCore {
displayName = CSTRING(optic_hamr);
};
class optic_Hamr_khk_F : optic_hamr {
displayName = CSTRING(optic_hamr_khk);
};

class optic_Arco : ItemCore {
displayName = CSTRING(optic_arco);
};
class optic_Arco_blk_F : optic_Arco {
displayName = CSTRING(optic_arco_blk);
};
class optic_Arco_ghex_F : optic_Arco {
displayName = CSTRING(optic_arco_ghex);
};

class optic_ERCO_blk_f : optic_Arco {
displayName = CSTRING(optic_erco_blk);
};
class optic_ERCO_khk_f : optic_ERCO_blk_f {
displayName = CSTRING(optic_erco_khk);
};
class optic_ERCO_snd_f : optic_ERCO_blk_f {
displayName = CSTRING(optic_erco_snd);
};

class optic_LRPS : ItemCore {
displayName = CSTRING(optic_lrps);
};
class optic_LRPS_ghex_F : optic_LRPS {
displayName = CSTRING(optic_lrps_ghex);
};
class optic_LRPS_tna_F : optic_LRPS {
displayName = CSTRING(optic_lrps_tna);
};

class optic_DMS : ItemCore {
displayName = CSTRING(optic_dms);
};
class optic_DMS_ghex_F : optic_DMS {
displayName = CSTRING(optic_dms_ghex);
};

class optic_holosight : ItemCore {
displayName = CSTRING(optic_holosight);
};
class optic_Holosight_blk_F : optic_holosight {
displayName = CSTRING(optic_holosight_blk);
};
class optic_Holosight_khk_F : optic_holosight {
displayName = CSTRING(optic_holosight_khk);
};
class optic_Holosight_smg : ItemCore {
displayName = CSTRING(optic_holosight_smg);
};
class optic_Holosight_smg_blk_F : optic_Holosight_smg {
displayName = CSTRING(optic_holosight_smg_blk);
};
class optic_Holosight_smg_khk_F : optic_Holosight_smg {
displayName = CSTRING(optic_holosight_smg_khk);
};

class optic_MRCO : ItemCore {
displayName = CSTRING(optic_MRCO);
};

class optic_Yorris : ItemCore {
displayName = CSTRING(optic_Yorris);
};

class optic_ACO : ItemCore {
displayName = CSTRING(optic_ACO);
};
class optic_ACO_grn : ItemCore {
displayName = CSTRING(optic_ACO_grn);
};
class optic_ACO_smg : ItemCore {
displayName = CSTRING(optic_ACO_smg);
};
class optic_ACO_grn_smg : ItemCore {
displayName = CSTRING(optic_ACO_grn_smg);
};

// APEX/Tanoa

// QBZ-95 and variants
Expand Down
Loading

0 comments on commit 655600b

Please sign in to comment.