Skip to content

Commit

Permalink
Updated classnames and cleaned up strings and classes
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreasBrostrom
AndreasBrostrom committed Jan 15, 2024
1 parent 17f52b6 commit c1934cd
Show file tree
Hide file tree
Showing 8 changed files with 355 additions and 31 deletions.
66 changes: 65 additions & 1 deletion addons/infantry/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class CfgVehicles {
class B_Soldier_base_F;
class Cav_B_Soldier_base_F: B_Soldier_base_F {
_generalMacro = "Cav_B_Soldier_base_F";
scope = 1;
scope = 0;
scopeCurator = 0;
displayName = CSTRING(trooper);
author = ECSTRING(Main,ModTeam);
Expand Down Expand Up @@ -381,6 +381,70 @@ class CfgVehicles {
};


// Crew
class Cav_B_Crew_F: Cav_B_Soldier_base_F {
_generalMacro = "Cav_B_Crew_base_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_B_Crew_F);
author = ECSTRING(Main,ModTeam);
};

// Crew - IFV/APC
class Cav_B_Commander_F: Cav_B_Crew_F {
_generalMacro = "Cav_B_Commander_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_B_Commander_F);
author = ECSTRING(Main,ModTeam);
};
class Cav_B_Gunner_F: Cav_B_Crew_F {
_generalMacro = "Cav_B_Gunner_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_B_Gunner_F);
author = ECSTRING(Main,ModTeam);
};
class Cav_B_Driver_F: Cav_B_Crew_F {
_generalMacro = "Cav_B_Driver_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_B_Driver_F);
author = ECSTRING(Main,ModTeam);
};

// Crew - Armor
class Cav_B_Armor_Commander_F: Cav_B_Crew_F {
_generalMacro = "Cav_B_Armor_Commander_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_B_Armor_Commander_F);
author = ECSTRING(Main,ModTeam);
};
class Cav_B_Armor_Gunner_F: Cav_B_Crew_F {
_generalMacro = "Cav_B_Armor_Gunner_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_B_Armor_Gunner_F);
author = ECSTRING(Main,ModTeam);
};
class Cav_B_Armor_Driver_F: Cav_B_Crew_F {
_generalMacro = "Cav_B_Armor_Driver_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_B_Armor_Driver_F);
author = ECSTRING(Main,ModTeam);
};
class Cav_B_Armor_Loader_F: Cav_B_Crew_F {
_generalMacro = "Cav_B_Armor_Loader_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_B_Armor_Loader_F);
author = ECSTRING(Main,ModTeam);
};



// Air - Fixed-Wings
class Cav_B_Pilot_base_F: Cav_B_Rifleman_F {
_generalMacro = "Cav_B_HelicopterPilot_base_F";
Expand Down
101 changes: 77 additions & 24 deletions addons/infantry/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,80 +5,133 @@
</Key>


<Key ID="STR_cav_infantry_alpha_Cav_B_Officer_F">
<Key ID="STR_cav_infantry_Cav_B_Officer_F">
<English>Officer</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_JTAC_F">

<Key ID="STR_cav_infantry_Cav_B_JTAC_F">
<English>JTAC</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_TACP_F">
<Key ID="STR_cav_infantry_Cav_B_TACP_F">
<English>TACP</English>
</Key>

<Key ID="STR_cav_infantry_alpha_Cav_B_PlatoonSergeant_F">
<Key ID="STR_cav_infantry_Cav_B_PlatoonSergeant_F">
<English>Platoon Sergeant</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_PlatoonLeader_F">
<Key ID="STR_cav_infantry_Cav_B_PlatoonLeader_F">
<English>Platoon Leader</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_PlatoonMedic_F">

<Key ID="STR_cav_infantry_Cav_B_PlatoonMedic_F">
<English>Platoon Medic</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_Rifleman_F">
<Key ID="STR_cav_infantry_Cav_B_Rifleman_F">
<English>Rifleman</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_SquadLeader_F">
<Key ID="STR_cav_infantry_Cav_B_SquadLeader_F">
<English>Squad Leader</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_FireTeamLeader_F">
<Key ID="STR_cav_infantry_Cav_B_FireTeamLeader_F">
<English>Fire Team Leader</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_AutomaticRifleman_F">
<Key ID="STR_cav_infantry_Cav_B_AutomaticRifleman_F">
<English>Automatic Rifleman</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_Grenadier_F">
<Key ID="STR_cav_infantry_Cav_B_Grenadier_F">
<English>Grenadier</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_RiflemanAT_F">
<Key ID="STR_cav_infantry_Cav_B_RiflemanLAT_F">
<English>Rifleman (LAT)</English>
</Key>

<Key ID="STR_cav_infantry_Cav_B_RiflemanAT_F">
<English>Rifleman (AT)</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_RiflemanLAT_F">
<English>Rifleman (LAT)</English>
<Key ID="STR_cav_infantry_Cav_B_RiflemanATAssistant_F">
<English>Rifleman (AT Assistant)</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_RiflemanAA_F">
<English>Rifleman (AA)</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_RiflemanAAAssistant_F">
<English>Rifleman (AA Assistant)</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_RiflemanATR_F">
<English>Rifleman (ATR)</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_RiflemanATRAssistant_F">
<English>Rifleman (ATR Assistant)</English>
</Key>


<Key ID="STR_cav_infantry_Cav_B_PlatoonMedic_F">
<English>Platoon Medic</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_Medic_F">
<English>Medic</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_CombatLifeSaver_F">
<Key ID="STR_cav_infantry_Cav_B_CombatLifeSaver_F">
<English>Combat Life Saver</English>
</Key>


<Key ID="STR_cav_infantry_Cav_B_Crew_F">
<English>Crew</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_Commander_F">
<English>Commander</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_Gunner_F">
<English>Gunner</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_Driver_F">
<English>Driver</English>
</Key>

<Key ID="STR_cav_infantry_Cav_B_Armor_Commander_F">
<English>Commander (Armor)</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_Armor_Gunner_F">
<English>Gunner (Armor)</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_Armor_Driver_F">
<English>Commander (Driver)</English>
</Key>
<Key ID="STR_cav_infantry_Cav_B_Armor_Loader_F">
<English>Commander (Loader)</English>
</Key>



<Key ID="STR_cav_infantry_alpha_Cav_B_A_Pilot_F">
<Key ID="STR_cav_infantry_Cav_B_Pilot_F">
<English>Pilot</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_A_CoPilot_F">
<Key ID="STR_cav_infantry_Cav_B_CoPilot_F">
<English>CoPilot</English>
</Key>

<Key ID="STR_cav_infantry_alpha_Cav_B_A_PilotLite_F">
<Key ID="STR_cav_infantry_Cav_B_PilotLite_F">
<English>Pilot (Lite)</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_A_CoPilotLite_F">
<Key ID="STR_cav_infantry_Cav_B_CoPilotLite_F">
<English>CoPilot (Lite)</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_A_CrewLite_F">
<Key ID="STR_cav_infantry_Cav_B_CrewLite_F">
<English>Crew (Lite)</English>
</Key>

<Key ID="STR_cav_infantry_alpha_Cav_B_A_HelicopterPilot_F">
<Key ID="STR_cav_infantry_Cav_B_HelicopterPilot_F">
<English>Helicopter Pilot</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_A_HelicopterCrew_F">
<Key ID="STR_cav_infantry_Cav_B_HelicopterCrew_F">
<English>Helicopter Crew</English>
</Key>

<Key ID="STR_cav_infantry_alpha_Cav_B_A_HelicopterAttackPilot_F">
<Key ID="STR_cav_infantry_Cav_B_HelicopterAttackPilot_F">
<English>Attack Helicopter Pilot</English>
</Key>
<Key ID="STR_cav_infantry_alpha_Cav_B_A_HelicopterAttackCoPilot_F">
<Key ID="STR_cav_infantry_Cav_B_HelicopterAttackCoPilot_F">
<English>Attack Helicopter CoPilot</English>
</Key>

Expand Down
2 changes: 1 addition & 1 deletion addons/infantry_alpha/CfgEditorSubcategories.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class CfgEditorSubcategories {
class Cav_EdSubcat_Infantry_Alpha {
displayname = CSTRING(Cav_EdSubcat_Infantry_Alpha);
displayname = CSTRING(Cav_EdSubcat_Infantry_Alpha);
};
};
3 changes: 1 addition & 2 deletions addons/infantry_alpha/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class CfgVehicles {
class Cav_B_Officer_F;
class Cav_B_A_Officer_F: Cav_B_Officer_F {
_generalMacro = "Cav_B_Training_base_F";
_generalMacro = "Cav_B_A_Officer_F";
scope = 2;
scopeCurator = 0;

Expand Down Expand Up @@ -128,7 +128,6 @@ class CfgVehicles {
_generalMacro = "Cav_B_A_HelicopterAttackCoPilot_F";
scope = 2;
scopeCurator = 0;
displayName = CSTRING(Cav_B_A_HelicopterAttackCoPilot_F);

editorSubcategory = "Cav_EdSubcat_Infantry_Alpha";

Expand Down
4 changes: 2 additions & 2 deletions addons/infantry_alpha/stringtable.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project name="cav">
<Package name="infantry_alpha">
<Key ID="STR_cav_infantry_alpha_Cav_EdSubcat_Infantry_Alpha">
<English>Men (Air)</English>
<Key ID="STR_cav_infantry_alpha_Cav_EdSubcat_Infantry_Bravo">
<English>Men (Mechanized)</English>
</Key>
</Package>
</Project>
Loading

0 comments on commit c1934cd

Please sign in to comment.