mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
1.40 Changes In Config Inhertiance (RC)
This commit is contained in:
parent
dfdee62732
commit
93d889031f
@ -492,13 +492,13 @@ class CfgVehicles {
|
||||
};*/
|
||||
};
|
||||
|
||||
class I_Heli_light_03_base_F: Helicopter_Base_F {
|
||||
class Heli_light_03_base_F;
|
||||
class I_Heli_light_03_base_F: Heli_light_03_base_F {
|
||||
/*class Turrets: Turrets {
|
||||
class MainTurret: MainTurret {};
|
||||
};*/
|
||||
};
|
||||
|
||||
class I_Heli_light_03_F: I_Heli_light_03_base_F {
|
||||
class I_Heli_light_03_F: Heli_light_03_base_F {
|
||||
/*class Turrets: Turrets {
|
||||
class MainTurret: MainTurret {};
|
||||
};*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
|
||||
class SlotInfo;
|
||||
class MuzzleSlot;
|
||||
|
||||
class CfgWeapons {
|
||||
|
||||
@ -20,7 +20,7 @@ class CfgWeapons {
|
||||
};
|
||||
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_H"};
|
||||
};
|
||||
};
|
||||
@ -59,7 +59,7 @@ class CfgWeapons {
|
||||
};
|
||||
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_H"};
|
||||
};
|
||||
};
|
||||
@ -74,7 +74,7 @@ class CfgWeapons {
|
||||
|
||||
class EBR_base_F: Rifle_Long_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_B"};
|
||||
};
|
||||
};
|
||||
@ -82,7 +82,7 @@ class CfgWeapons {
|
||||
|
||||
class DMR_01_base_F: Rifle_Long_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_B"};
|
||||
};
|
||||
};
|
||||
@ -90,7 +90,7 @@ class CfgWeapons {
|
||||
|
||||
class LMG_Mk200_F: Rifle_Long_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_H"};
|
||||
};
|
||||
};
|
||||
@ -98,7 +98,7 @@ class CfgWeapons {
|
||||
|
||||
class LMG_Zafir_F: Rifle_Long_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_B"};
|
||||
};
|
||||
};
|
||||
@ -115,7 +115,7 @@ class CfgWeapons {
|
||||
};
|
||||
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_L"};
|
||||
};
|
||||
};
|
||||
@ -129,7 +129,7 @@ class CfgWeapons {
|
||||
};
|
||||
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_L"};
|
||||
};
|
||||
};
|
||||
@ -148,7 +148,7 @@ class CfgWeapons {
|
||||
|
||||
class pdw2000_base_F: Rifle_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
|
||||
};
|
||||
};
|
||||
@ -156,7 +156,7 @@ class CfgWeapons {
|
||||
|
||||
class SMG_01_Base: Rifle_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
|
||||
};
|
||||
};
|
||||
@ -164,7 +164,7 @@ class CfgWeapons {
|
||||
|
||||
class SMG_02_base_F: Rifle_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
|
||||
};
|
||||
};
|
||||
@ -180,7 +180,7 @@ class CfgWeapons {
|
||||
|
||||
class hgun_P07_F: Pistol_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
|
||||
};
|
||||
@ -189,7 +189,7 @@ class CfgWeapons {
|
||||
|
||||
class hgun_Rook40_F: Pistol_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
|
||||
};
|
||||
@ -198,7 +198,7 @@ class CfgWeapons {
|
||||
|
||||
class hgun_ACPC2_F: Pistol_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
|
||||
};
|
||||
};
|
||||
@ -206,7 +206,7 @@ class CfgWeapons {
|
||||
|
||||
class hgun_Pistol_heavy_01_F: Pistol_Base_F {
|
||||
class WeaponSlotsInfo: WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {
|
||||
class MuzzleSlot: MuzzleSlot {
|
||||
compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
|
||||
};
|
||||
};
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -223,43 +223,46 @@ class CfgVehicles {
|
||||
class B_Truck_01_Repair_F: B_Truck_01_mover_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_01_Repair_Name";
|
||||
};
|
||||
|
||||
class Truck_02_base_F;
|
||||
class O_Truck_02_transport_F: Truck_02_base_F {
|
||||
class Truck_02_transport_base_F;
|
||||
class O_Truck_02_transport_F: Truck_02_transport_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_transport_Name";
|
||||
};
|
||||
class Truck_02_base_F;
|
||||
class O_Truck_02_covered_F: Truck_02_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_covered_Name";
|
||||
};
|
||||
class O_Truck_02_ammo_F: Truck_02_base_F {
|
||||
class Truck_02_Ammo_base_F;
|
||||
class O_Truck_02_ammo_F: Truck_02_Ammo_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_ammo_Name";
|
||||
};
|
||||
class O_Truck_02_fuel_F: Truck_02_base_F {
|
||||
class Truck_02_fuel_base_F;
|
||||
class O_Truck_02_fuel_F: Truck_02_fuel_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_fuel_Name";
|
||||
};
|
||||
class O_Truck_02_box_F: Truck_02_base_F {
|
||||
class Truck_02_box_base_F;
|
||||
class O_Truck_02_box_F: Truck_02_box_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_box_Name";
|
||||
};
|
||||
class O_Truck_02_medical_F: O_Truck_02_box_F {
|
||||
class Truck_02_medical_base_F;
|
||||
class O_Truck_02_medical_F: Truck_02_medical_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_medical_Name";
|
||||
};
|
||||
|
||||
class I_Truck_02_transport_F: Truck_02_base_F {
|
||||
class I_Truck_02_transport_F: Truck_02_transport_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_transport_Name";
|
||||
};
|
||||
class I_Truck_02_covered_F: Truck_02_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_covered_Name";
|
||||
};
|
||||
class I_Truck_02_ammo_F: Truck_02_base_F {
|
||||
class I_Truck_02_ammo_F: Truck_02_Ammo_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_ammo_Name";
|
||||
};
|
||||
class I_Truck_02_fuel_F: Truck_02_base_F {
|
||||
class I_Truck_02_fuel_F: Truck_02_fuel_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_fuel_Name";
|
||||
};
|
||||
class I_Truck_02_box_F: Truck_02_base_F {
|
||||
class I_Truck_02_box_F: Truck_02_box_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_box_Name";
|
||||
};
|
||||
class I_Truck_02_medical_F: I_Truck_02_box_F {
|
||||
class I_Truck_02_medical_F: Truck_02_medical_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Truck_02_medical_Name";
|
||||
};
|
||||
|
||||
@ -306,13 +309,12 @@ class CfgVehicles {
|
||||
displayName = "$STR_ACE_RealisticNames_Heli_Light_01_civil_Name";
|
||||
};
|
||||
|
||||
class B_Heli_Transport_03_base_F;
|
||||
class B_Heli_Transport_03_F: B_Heli_Transport_03_base_F {
|
||||
class Heli_Transport_03_base_F;
|
||||
class B_Heli_Transport_03_F: Heli_Transport_03_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Heli_Transport_03_Name";
|
||||
};
|
||||
|
||||
class B_Heli_Transport_03_unarmed_base_F: B_Heli_Transport_03_base_F {};
|
||||
class B_Heli_Transport_03_unarmed_F: B_Heli_Transport_03_unarmed_base_F {
|
||||
class Heli_Transport_03_unarmed_base_F;
|
||||
class B_Heli_Transport_03_unarmed_F: Heli_Transport_03_unarmed_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Heli_Transport_03_unarmed_Name";
|
||||
};
|
||||
|
||||
@ -320,17 +322,18 @@ class CfgVehicles {
|
||||
class O_Heli_Light_02_F: Heli_Light_02_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Heli_Light_02_Name";
|
||||
};
|
||||
class O_Heli_Light_02_unarmed_F: Heli_Light_02_base_F {
|
||||
class Heli_Light_02_unarmed_base_F;
|
||||
class O_Heli_Light_02_unarmed_F: Heli_Light_02_unarmed_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Heli_Light_02_unarmed_Name";
|
||||
};
|
||||
|
||||
class I_Heli_light_03_base_F;
|
||||
class I_Heli_light_03_F: I_Heli_light_03_base_F {
|
||||
class Heli_light_03_base_F;
|
||||
class I_Heli_light_03_F: Heli_light_03_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Heli_light_03_Name";
|
||||
};
|
||||
|
||||
class I_Heli_light_03_unarmed_base_F;
|
||||
class I_Heli_light_03_unarmed_F: I_Heli_light_03_unarmed_base_F {
|
||||
class Heli_light_03_unarmed_base_F;
|
||||
class I_Heli_light_03_unarmed_F: Heli_light_03_unarmed_base_F {
|
||||
displayName = "$STR_ACE_RealisticNames_Heli_light_03_unarmed_Name";
|
||||
};
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
class Mode_SemiAuto;
|
||||
class Mode_Burst;
|
||||
class Mode_FullAuto;
|
||||
class MuzzleSlot;
|
||||
|
||||
// config inheritance of weapon slot info v1.32
|
||||
class SlotInfo;
|
||||
@ -21,7 +22,7 @@ class CfgWeapons {
|
||||
class RifleCore;
|
||||
class Rifle: RifleCore {
|
||||
class WeaponSlotsInfo {
|
||||
class MuzzleSlot: SlotInfo {};
|
||||
class MuzzleSlot: MuzzleSlot {};
|
||||
class CowsSlot: CowsSlot {};
|
||||
class PointerSlot: PointerSlot {};
|
||||
};
|
||||
|
@ -1,7 +1,8 @@
|
||||
|
||||
class CfgAmmo {
|
||||
class MissileBase;
|
||||
class M_Mo_120mm_AT: MissileBase {
|
||||
|
||||
class Missile_AGM_02_F;
|
||||
class M_Mo_120mm_AT: Missile_AGM_02_F {
|
||||
cost = 400000; // Stop it from aiming at FUCKING RABBITS.
|
||||
weaponLockSystem = 2;
|
||||
};
|
||||
@ -11,6 +12,7 @@ class CfgAmmo {
|
||||
weaponLockSystem = 4;
|
||||
};
|
||||
|
||||
class MissileBase;
|
||||
class M_Mo_82mm_AT: MissileBase {
|
||||
cost = 400000;
|
||||
weaponLockSystem = 2;
|
||||
|
Loading…
Reference in New Issue
Block a user