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

Add realistic names to dynamic loadout classes #5185

Merged
merged 2 commits into from
May 26, 2017
Merged

Add realistic names to dynamic loadout classes #5185

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1273e5
Add realistic names to dynamic loadout classes
kymckay May 20, 2017
d77d55d
UAV02 use non-CAS name for dynamic loadout
PabstMirror May 26, 2017
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
55 changes: 50 additions & 5 deletions addons/realisticnames/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,18 +293,27 @@ class CfgVehicles {
displayName = CSTRING(Heli_Attack_01_Name);
};

class Heli_Attack_01_dynamicLoadout_base_F;
class B_Heli_Attack_01_dynamicLoadout_F: Heli_Attack_01_dynamicLoadout_base_F {
displayName = CSTRING(Heli_Attack_01_Name);
};

class Heli_Light_01_unarmed_base_F;
class B_Heli_Light_01_F: Heli_Light_01_unarmed_base_F {
displayName = CSTRING(Heli_Light_01_Name);
};
class Heli_Light_01_civil_base_F: Heli_Light_01_unarmed_base_F {
displayName = CSTRING(Heli_Light_01_civil_Name);
};

class Heli_Light_01_armed_base_F;
class B_Heli_Light_01_armed_F: Heli_Light_01_armed_base_F {
displayName = CSTRING(Heli_Light_01_armed_Name);
};

class Heli_Light_01_civil_base_F: Heli_Light_01_unarmed_base_F {
displayName = CSTRING(Heli_Light_01_civil_Name);
class Heli_Light_01_dynamicLoadout_base_F;
class B_Heli_Light_01_dynamicLoadout_F: Heli_Light_01_dynamicLoadout_base_F {
displayName = CSTRING(Heli_Light_01_armed_Name);
};

class Heli_Transport_03_base_F;
Expand All @@ -328,6 +337,11 @@ class CfgVehicles {
displayName = CSTRING(Heli_Light_02_unarmed_Name);
};

class Heli_Light_02_dynamicLoadout_base_F;
class O_Heli_Light_02_dynamicLoadout_F: Heli_Light_02_dynamicLoadout_base_F {
displayName = CSTRING(Heli_Light_02_Name);
};

class Heli_light_03_base_F;
class I_Heli_light_03_F: Heli_light_03_base_F {
displayName = CSTRING(Heli_light_03_Name);
Expand All @@ -338,6 +352,11 @@ class CfgVehicles {
displayName = CSTRING(Heli_light_03_unarmed_Name);
};

class Heli_light_03_dynamicLoadout_base_F;
class I_Heli_light_03_dynamicLoadout_F: Heli_light_03_dynamicLoadout_base_F {
displayName = CSTRING(Heli_light_03_Name);
};

class Heli_Transport_02_base_F;
class I_Heli_Transport_02_F: Heli_Transport_02_base_F {
displayName = CSTRING(Heli_Transport_02_Name);
Expand All @@ -349,11 +368,21 @@ class CfgVehicles {
displayName = CSTRING(Plane_CAS_01_Name);
};

class Plane_CAS_01_dynamicLoadout_base_F;
class B_Plane_CAS_01_dynamicLoadout_F: Plane_CAS_01_dynamicLoadout_base_F {
displayName = CSTRING(Plane_CAS_01_Name);
};

class Plane_CAS_02_base_F;
class O_Plane_CAS_02_F: Plane_CAS_02_base_F {
displayName = CSTRING(Plane_CAS_02_Name);
};

class Plane_CAS_02_dynamicLoadout_base_F;
class O_Plane_CAS_02_dynamicLoadout_F: Plane_CAS_02_dynamicLoadout_base_F {
displayName = CSTRING(Plane_CAS_02_Name);
};

class Plane_Fighter_03_base_F;
class I_Plane_Fighter_03_CAS_F: Plane_Fighter_03_base_F {
displayName = CSTRING(Plane_Fighter_03_CAS_Name);
Expand All @@ -363,6 +392,11 @@ class CfgVehicles {
displayName = CSTRING(Plane_Fighter_03_AA_Name);
};

class Plane_Fighter_03_dynamicLoadout_base_F;
class I_Plane_Fighter_03_dynamicLoadout_F: Plane_Fighter_03_dynamicLoadout_base_F {
displayName = CSTRING(Plane_Fighter_03_Name);
};

// uavs
class UAV_02_base_F;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering while looking through the configs here, why are we not just adding the names to the base classes where applicable? This one for example, they all inherit from it anyway.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because displayName is defined here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not though, it's inherited from the base class 😛

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

air_f_gamma\Plane_Fighter_03\config.cpp

class I_Plane_Fighter_03_dynamicLoadout_F: Plane_Fighter_03_dynamicLoadout_base_F {
	displayName = "$STR_A3_CfgVehicles_O_Plane_Fighter_03_CAS0";

did I miss anything?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line I commented on 😆

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reference:

		class UAV_02_base_F: UAV //inherits 15 parameters from bin\config.bin/CfgVehicles/UAV, sources - ["A3_Drones_F_Air_F_Gamma_UAV_02"]
		{
			features = "Randomization: No						<br />Camo selections: 1 - the whole body						<br />Script door sources: None						<br />Script animations: None						<br />Executed scripts: None						<br />Firing from vehicles: No						<br />Slingload: Slingloadable						<br />Cargo proxy indexes: None";
			author = "Bohemia Interactive";
			_generalMacro = "UAV_02_base_F";
			displayName = "MQ-4A Greyhawk";
                        ...
		};

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vanilla Config:
class UAV_02_base_F: UAV {displayName = "MQ-4A Greyhawk";}
class B_UAV_02_F: UAV_02_base_F uses inheritance
class O_UAV_02_F: UAV_02_base_F {displayName = "K40 Ababil-3";};
class I_UAV_02_F: UAV_02_base_F {displayName = "K40 Ababil-3";}
So adding it to all is necessary

class B_UAV_02_F: UAV_02_base_F {
Expand All @@ -375,7 +409,7 @@ class CfgVehicles {
displayName = CSTRING(UAV_02_Name);
};

class UAV_02_CAS_base_F: UAV_02_base_F {};
class UAV_02_CAS_base_F;
class B_UAV_02_CAS_F: UAV_02_CAS_base_F {
displayName = CSTRING(UAV_02_CAS_Name);
};
Expand All @@ -386,6 +420,17 @@ class CfgVehicles {
displayName = CSTRING(UAV_02_CAS_Name);
};

class UAV_02_dynamicLoadout_base_F;
class B_UAV_02_dynamicLoadout_F: UAV_02_dynamicLoadout_base_F {
displayName = CSTRING(UAV_02_CAS_Name);
};
class O_UAV_02_dynamicLoadout_F: UAV_02_dynamicLoadout_base_F {
displayName = CSTRING(UAV_02_CAS_Name);
};
class I_UAV_02_dynamicLoadout_F: UAV_02_dynamicLoadout_base_F {
displayName = CSTRING(UAV_02_CAS_Name);
};

// pistols
class Pistol_Base_F;
class Weapon_hgun_P07_F: Pistol_Base_F {
Expand Down Expand Up @@ -525,11 +570,11 @@ class CfgVehicles {
class Weapon_SMG_02_F: Weapon_Base_F {
displayName = CSTRING(SMG_02_Name);
};

class Weapon_SMG_05_F: Weapon_Base_F {
displayName = CSTRING(SMG_05);
};

class Weapon_hgun_PDW2000_F: Weapon_Base_F {
displayName = CSTRING(hgun_PDW2000_Name);
};
Expand Down
14 changes: 14 additions & 0 deletions addons/realisticnames/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,20 @@
<Japanese>AW101 マーリン</Japanese>
<Korean>AW101 Merlin</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_Plane_Fighter_03_Name">
<English>L-159 ALCA</English>
<German>L-159 ALCA</German>
<Spanish>L-159 ALCA</Spanish>
<Polish>L-159 ALCA</Polish>
<Czech>L-159 ALCA</Czech>
<French>L-159 ALCA</French>
<Russian>L-159 Альбатрос</Russian>
<Portuguese>L-159 ALCA</Portuguese>
<Hungarian>L-159 ALCA</Hungarian>
<Italian>L-159 ALCA</Italian>
<Japanese>L-159 アルカ</Japanese>
<Korean>L-159 ALCA</Korean>
</Key>
<Key ID="STR_ACE_RealisticNames_Plane_Fighter_03_CAS_Name">
<English>L-159 ALCA (CAS)</English>
<German>L-159 ALCA (CAS)</German>
Expand Down