diff --git a/addons/alpha_characters/$PBOPREFIX$ b/addons/alpha_characters/$PBOPREFIX$ deleted file mode 100644 index 4f91d6c7..00000000 --- a/addons/alpha_characters/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\cav\addons\alpha_characters \ No newline at end of file diff --git a/addons/alpha_characters/stringtable.xml b/addons/alpha_characters/stringtable.xml deleted file mode 100644 index b0f37792..00000000 --- a/addons/alpha_characters/stringtable.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - Alpha Co. - Infantry - - - - Trooper - - - - Air Controller - - - Officer - - - Joint Fires Observer - - - - - Helicopter Pilot - - - Helicopter Co-Pilot - - - Helicopter Crew Chief - - - Helicopter Door Gunner - - - - Attack Helicopter Pilot - - - Attack Helicopter Co-Pilot - - - - Fighter Pilot - - - - Fixed Wing Pilot - - - Fixed Wing Co-Pilot - - - - - Team Buffalo - - - Team Raider - - - Team Raven - - - Team Hog - - - Team Titan - - - - - diff --git a/addons/alpha_characters_units/$PBOPREFIX$ b/addons/alpha_characters_units/$PBOPREFIX$ deleted file mode 100644 index b57222be..00000000 --- a/addons/alpha_characters_units/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\cav\addons\alpha_characters_units \ No newline at end of file diff --git a/addons/alpha_characters_units/stringtable.xml b/addons/alpha_characters_units/stringtable.xml deleted file mode 100644 index a7ea317b..00000000 --- a/addons/alpha_characters_units/stringtable.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - - Air Controller (Pegasus-1) - - - Air Controller (Pegasus-2) - - - - Joint Fires Observer (Infidel-1) - - - Joint Fires Observer (Infidel-2) - - - - Helicopter Pilot (Buffalo-1) - - - Helicopter Pilot (Buffalo-2) - - - Helicopter Pilot (Buffalo-3) - - - Helicopter Pilot (Buffalo-4) - - - Helicopter Pilot (Buffalo-5) - - - Helicopter Pilot (Buffalo-6) - - - - - Attack Helicopter Pilot (Raider-1) - - - Attack Helicopter Pilot (Raider-2) - - - Attack Helicopter Pilot (Raider-3) - - - Attack Helicopter Pilot (Raider-4) - - - - - Attack Helicopter Pilot (Raven-1) - - - Attack Helicopter Pilot (Raven-2) - - - Attack Helicopter Pilot (Raven-3) - - - Attack Helicopter Pilot (Raven-4) - - - - Fighter Pilot (Hog-1) - - - Fighter Pilot (Hog-2) - - - Fighter Pilot (Hog-3) - - - Fighter Pilot (Hog-4) - - - Fighter Pilot (Hog-5) - - - Fighter Pilot (Hog-6) - - - Fighter Pilot (Hog-7) - - - Fighter Pilot (Hog-8) - - - Fighter Pilot (Hog-9) - - - - Fixed Wing Pilot (Titan-1) - - - Fixed Wing Pilot (Titan-2) - - - Fixed Wing Pilot (Titan-3) - - - Fixed Wing Pilot (Titan-4) - - - - - Team Buffalo-1 - - - Team Buffalo-2 - - - Team Buffalo-3 - - - Team Buffalo-4 - - - Team Buffalo-5 - - - Team Buffalo-6 - - - - Team Raider-1 - - - Team Raider-2 - - - Team Raider-3 - - - Team Raider-4 - - - - Team Raven-1 - - - Team Raven-2 - - - Team Raven-3 - - - Team Raven-4 - - - - Team Hog-1 - - - Team Hog-2 - - - Team Hog-3 - - - Team Hog-4 - - - Team Hog-5 - - - Team Hog-6 - - - Team Hog-7 - - - Team Hog-8 - - - Team Hog-9 - - - - Team Titan-1 - - - Team Titan-2 - - - Team Titan-3 - - - Team Titan-4 - - - - HQ Pegasus-1 - - - HQ Pegasus-2 - - - - HQ Infidel-1 - - - HQ Infidel-2 - - - - diff --git a/addons/bravo_characters/$PBOPREFIX$ b/addons/bravo_characters/$PBOPREFIX$ deleted file mode 100644 index fff4bd2b..00000000 --- a/addons/bravo_characters/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\cav\addons\bravo_characters \ No newline at end of file diff --git a/addons/bravo_characters/stringtable.xml b/addons/bravo_characters/stringtable.xml deleted file mode 100644 index 0892db69..00000000 --- a/addons/bravo_characters/stringtable.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - Bravo Co. - Infantry - - - Bravo Co. - Infantry (Heavy Weapons Squad) - - - Bravo Co. - Logistics - - - - - Trooper - - - - - Platoon Sergeant - - - Platoon Leader - - - Platoon Medic - - - - - Tank Commander - - - Tank Driver - - - Tank Gunner - - - Tank Loader - - - - IFV Commander - - - IFV Driver - - - IFV Gunner - - - - - Squad Leader - - - - Fire Team Leader - - - Automatic Rifleman - - - Grenadier - - - Rifleman - - - Rifleman (AT) - - - Rifleman (LAT) - - - Combat Life Saver - - - - Alpha Fire Team Leader - - - Alpha Automatic Rifleman - - - Alpha Grenadier - - - Alpha Rifleman - - - Alpha Rifleman (AT) - - - Alpha Rifleman (LAT) - - - Alpha Combat Life Saver - - - - Bravo Fire Team Leader - - - Bravo Automatic Rifleman - - - Bravo Grenadier - - - Bravo Rifleman - - - Bravo Rifleman (AT) - - - Bravo Rifleman (LAT) - - - Bravo Combat Life Saver - - - - - Team Leader - - - Combat Medic - - - - - Ops Officer - - - Ops NCO - - - - Logistic Team Leader - - - Logistics Team Member - - - - - Squad Lancer - - - - Team Banshee - - - Team Saber - - - - Team Mustang - - - - Team Apollo - - - - diff --git a/addons/bravo_characters_units/$PBOPREFIX$ b/addons/bravo_characters_units/$PBOPREFIX$ deleted file mode 100644 index 8e29c592..00000000 --- a/addons/bravo_characters_units/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\cav\addons\bravo_characters_units \ No newline at end of file diff --git a/addons/bravo_characters_units/stringtable.xml b/addons/bravo_characters_units/stringtable.xml deleted file mode 100644 index 574b89d7..00000000 --- a/addons/bravo_characters_units/stringtable.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - - - Platoon Sergeant (Lancer-5) - - - Platoon Leader (Lancer-6) - - - Platoon Medic (Lancer-7) - - - - Squad Leader (Lancer-1) - - - Squad Leader (Lancer-2) - - - Squad Leader (Lancer-3) - - - Squad Leader (Lancer-4) - - - - - Platoon Medic (Viking-7) - - - - Platoon Leader (Viking-1) - - - Team Leader (Viking-2) - - - Team Leader (Viking-3) - - - Team Leader (Viking-4) - - - - Commander (Banshee-1) - - - Commander (Banshee-2) - - - Commander (Banshee-3) - - - Commander (Banshee-4) - - - - Commander (Saber-1) - - - Commander (Saber-2) - - - Commander (Saber-3) - - - Commander (Saber-4) - - - - - Team Leader (Mustang-1) - - - Team Leader (Mustang-2) - - - - - Ops Officer (Apollo-6) - - - Ops NCO (Apollo-5) - - - - Logistic Team Leader (Apollo-1) - - - Logistic Team Leader (Apollo-2) - - - - - - HQ Lancer-5 - - - HQ Lancer-6 - - - HQ Lancer-7 - - - - Squad Lancerr-1 - - - Squad Lancerr-2 - - - Squad Lancerr-3 - - - Squad Lancerr-4 - - - - Team Viking-1 - - - Team Viking-2 - - - Team Viking-3 - - - Team Viking-4 - - - - HQ Viking-5 - - - HQ Viking-6 - - - HQ Viking-7 - - - - Team Banshee-1 - - - Team Banshee-2 - - - Team Banshee-3 - - - Team Banshee-4 - - - - Team Saber-1 - - - Team Saber-2 - - - Team Saber-3 - - - Team Saber-4 - - - - Team Mustang-1 - - - Team Mustang-2 - - - - HQ Apollo-5 - - - HQ Apollo-6 - - - - Team Apollo-1 - - - Team Apollo-2 - - - diff --git a/addons/charlie_characters/stringtable.xml b/addons/charlie_characters/stringtable.xml deleted file mode 100644 index 181fdb98..00000000 --- a/addons/charlie_characters/stringtable.xml +++ /dev/null @@ -1,186 +0,0 @@ - - - - Charlie Co. - Infantry - - - Charlie Co. - Infantry (Heavy Weapons Squad) - - - - Trooper - - - - Officer - - - - Platoon Sergeant - - - Platoon Leader - - - Platoon Medic - - - - - Squad Leader - - - - Fire Team Leader - - - Automatic Rifleman - - - Grenadier - - - Rifleman - - - Rifleman (AT) - - - Rifleman (LAT) - - - Combat Life Saver - - - - Alpha Fire Team Leader - - - Alpha Automatic Rifleman - - - Alpha Grenadier - - - Alpha Rifleman - - - Alpha Rifleman (AT) - - - Alpha Rifleman (LAT) - - - Alpha Combat Life Saver - - - - Bravo Fire Team Leader - - - Bravo Automatic Rifleman - - - Bravo Grenadier - - - Bravo Rifleman - - - Bravo Rifleman (AT) - - - Bravo Rifleman (LAT) - - - Bravo Combat Life Saver - - - - - - Squad Leader - - - - Fire Team Leader - - - Automatic Rifleman - - - Grenadier - - - Rifleman - - - Rifleman (AT) - - - Rifleman (LAT) - - - Combat Life Saver - - - - Alpha Fire Team Leader - - - Alpha Automatic Rifleman - - - Alpha Grenadier - - - Alpha Rifleman - - - Alpha Rifleman (AT) - - - Alpha Rifleman (LAT) - - - Alpha Combat Life Saver - - - - Bravo Fire Team Leader - - - Bravo Automatic Rifleman - - - Bravo Grenadier - - - Bravo Rifleman - - - Bravo Rifleman (AT) - - - Bravo Rifleman (LAT) - - - Bravo Combat Life Saver - - - - - - - - Squad Bandit - - - Squad Misfit - - - Squad Havoc - - - - diff --git a/addons/charlie_characters_units/$PBOPREFIX$ b/addons/charlie_characters_units/$PBOPREFIX$ deleted file mode 100644 index c65a8cb7..00000000 --- a/addons/charlie_characters_units/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\cav\addons\charlie_characters_units \ No newline at end of file diff --git a/addons/charlie_characters_units/CfgGroups.hpp b/addons/charlie_characters_units/CfgGroups.hpp deleted file mode 100644 index b0f7bd85..00000000 --- a/addons/charlie_characters_units/CfgGroups.hpp +++ /dev/null @@ -1,628 +0,0 @@ -class CfgGroups { - class West { - class BLU_USA_7CAV_F { - class Cav_Charlie_Infantry_Squads { - - class Cav_B_C_Bandit_5_HQ { - name = CSTRING(C_Squad_Bandit_5); - icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_PlatoonSergeant_Bandit_5_F"; - }; - }; - class Cav_B_C_Bandit_6_HQ { - name = CSTRING(C_Squad_Bandit_6); - icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_PlatoonLeader_Bandit_6_F"; - }; - }; - class Cav_B_C_Bandit_7_HQ { - name = CSTRING(C_Squad_Bandit_7); - icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_PlatoonMedic_Bandit_7_F"; - }; - }; - - class Cav_B_C_Bandit_1_Squad { - name = CSTRING(C_Squad_Bandit_1); - icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_SquadLeader_Bandit_1_F"; - }; - class Unit1 { - position[] = {1.5, -1.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; - }; - class Unit2 { - position[] = {0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; - }; - class Unit3 { - position[] = {-0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Grenadier_F"; - }; - class Unit4 { - position[] = {-1.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Rifleman_F"; - }; - class Unit5 { - position[] = {1.5, -2.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; - }; - class Unit6 { - position[] = {0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; - }; - class Unit7 { - position[] = {-0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_Grenadier_F"; - }; - class Unit8 { - position[] = {-1.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; - }; - }; - class Cav_B_C_Bandit_2_Squad { - name = CSTRING(C_Squad_Bandit_2); - icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_SquadLeader_Bandit_2_F"; - }; - class Unit1 { - position[] = {1.5, -1.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; - }; - class Unit2 { - position[] = {0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; - }; - class Unit3 { - position[] = {-0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Grenadier_F"; - }; - class Unit4 { - position[] = {-1.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Rifleman_F"; - }; - class Unit5 { - position[] = {1.5, -2.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; - }; - class Unit6 { - position[] = {0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; - }; - class Unit7 { - position[] = {-0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_Grenadier_F"; - }; - class Unit8 { - position[] = {-1.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; - }; - }; - class Cav_B_C_Bandit_3_Squad { - name = CSTRING(C_Squad_Bandit_3); - icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_SquadLeader_Bandit_3_F"; - }; - class Unit1 { - position[] = {1.5, -1.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; - }; - class Unit2 { - position[] = {0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; - }; - class Unit3 { - position[] = {-0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Grenadier_F"; - }; - class Unit4 { - position[] = {-1.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Rifleman_F"; - }; - class Unit5 { - position[] = {1.5, -2.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; - }; - class Unit6 { - position[] = {0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; - }; - class Unit7 { - position[] = {-0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_Grenadier_F"; - }; - class Unit8 { - position[] = {-1.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; - }; - }; - class Cav_B_C_Bandit_4_Squad { - name = CSTRING(C_Squad_Bandit_4); - icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_SquadLeader_Bandit_4_F"; - }; - class Unit1 { - position[] = {1.5, -1.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; - }; - class Unit2 { - position[] = {0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; - }; - class Unit3 { - position[] = {-0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Grenadier_F"; - }; - class Unit4 { - position[] = {-1.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Rifleman_F"; - }; - class Unit5 { - position[] = {1.5, -2.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; - }; - class Unit6 { - position[] = {0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; - }; - class Unit7 { - position[] = {-0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_Grenadier_F"; - }; - class Unit8 { - position[] = {-1.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; - }; - }; - - - class Cav_B_C_Misfit_5_HQ { - name = CSTRING(C_Squad_Misfit_5); - icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_PlatoonSergeant_Misfit_5_F"; - }; - }; - class Cav_B_C_Misfit_6_HQ { - name = CSTRING(C_Squad_Misfit_6); - icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_PlatoonLeader_Misfit_6_F"; - }; - }; - class Cav_B_C_Misfit_7_HQ { - name = CSTRING(C_Squad_Misfit_7); - icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_PlatoonMedic_Misfit_7_F"; - }; - }; - - class Cav_B_C_Misfit_1_Squad { - name = CSTRING(C_Squad_Misfit_1); - icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_SquadLeader_Misfit_1_F"; - }; - class Unit1 { - position[] = {1.5, -1.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; - }; - class Unit2 { - position[] = {0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; - }; - class Unit3 { - position[] = {-0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Grenadier_F"; - }; - class Unit4 { - position[] = {-1.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Rifleman_F"; - }; - class Unit5 { - position[] = {1.5, -2.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; - }; - class Unit6 { - position[] = {0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; - }; - class Unit7 { - position[] = {-0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_Grenadier_F"; - }; - class Unit8 { - position[] = {-1.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; - }; - }; - class Cav_B_C_Misfit_2_Squad { - name = CSTRING(C_Squad_Misfit_2); - icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_SquadLeader_Misfit_2_F"; - }; - class Unit1 { - position[] = {1.5, -1.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; - }; - class Unit2 { - position[] = {0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; - }; - class Unit3 { - position[] = {-0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Grenadier_F"; - }; - class Unit4 { - position[] = {-1.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Rifleman_F"; - }; - class Unit5 { - position[] = {1.5, -2.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; - }; - class Unit6 { - position[] = {0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; - }; - class Unit7 { - position[] = {-0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_Grenadier_F"; - }; - class Unit8 { - position[] = {-1.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; - }; - }; - class Cav_B_C_Misfit_3_Squad { - name = CSTRING(C_Squad_Misfit_3); - icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_SquadLeader_Misfit_3_F"; - }; - class Unit1 { - position[] = {1.5, -1.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; - }; - class Unit2 { - position[] = {0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; - }; - class Unit3 { - position[] = {-0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Grenadier_F"; - }; - class Unit4 { - position[] = {-1.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Rifleman_F"; - }; - class Unit5 { - position[] = {1.5, -2.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; - }; - class Unit6 { - position[] = {0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; - }; - class Unit7 { - position[] = {-0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_Grenadier_F"; - }; - class Unit8 { - position[] = {-1.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; - }; - }; - class Cav_B_C_Misfit_4_Squad { - name = CSTRING(C_Squad_Misfit_4); - icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; - side = 1; - class Unit0 { - position[] = {0, 0, 0}; - rank = "SERGEANT"; - side = 1; - vehicle = "Cav_B_C_SquadLeader_Misfit_4_F"; - }; - class Unit1 { - position[] = {1.5, -1.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; - }; - class Unit2 { - position[] = {0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; - }; - class Unit3 { - position[] = {-0.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Grenadier_F"; - }; - class Unit4 { - position[] = {-1.5, -1.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Alpha_Rifleman_F"; - }; - class Unit5 { - position[] = {1.5, -2.0, 0.0}; - rank = "CORPORAL"; - side = 1; - vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; - }; - class Unit6 { - position[] = {0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; - }; - class Unit7 { - position[] = {-0.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_Grenadier_F"; - }; - class Unit8 { - position[] = {-1.5, -2.0, 0.0}; - rank = "PRIVATE"; - side = 1; - vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; - }; - }; - - - // class Cav_B_C_Havoc_1_Squad { - // name = CSTRING(C_Squad_Havoc_1); - // icon = "\A3\ui_f\data\map\markers\nato\b_support.paa"; - // faction = "BLU_USA_7CAV_F"; - // side = 1; - // class Unit0 { - // position[] = {0, 0, 0}; - // rank = "SERGEANT"; - // side = 1; - // vehicle = "Cav_B_C_Weap_SquadLeader_Havoc_1_F"; - // }; - // class Unit1 { - // position[] = {1.5, -1.0, 0.0}; - // rank = "CORPORAL"; - // side = 1; - // vehicle = "Cav_B_C_Weap_Alpha_FireTeamLeader_F"; - // }; - // class Unit2 { - // position[] = {0.5, -1.0, 0.0}; - // rank = "PRIVATE"; - // side = 1; - // vehicle = "Cav_B_C_Weap_Alpha_AutomaticRifleman_F"; - // }; - // class Unit3 { - // position[] = {-0.5, -1.0, 0.0}; - // rank = "PRIVATE"; - // side = 1; - // vehicle = "Cav_B_C_Weap_Alpha_Grenadier_F"; - // }; - // class Unit4 { - // position[] = {-1.5, -1.0, 0.0}; - // rank = "PRIVATE"; - // side = 1; - // vehicle = "Cav_B_C_Weap_Alpha_Rifleman_F"; - // }; - // class Unit5 { - // position[] = {1.5, -2.0, 0.0}; - // rank = "CORPORAL"; - // side = 1; - // vehicle = "Cav_B_C_Weap_Bravo_FireTeamLeader_F"; - // }; - // class Unit6 { - // position[] = {0.5, -2.0, 0.0}; - // rank = "PRIVATE"; - // side = 1; - // vehicle = "Cav_B_C_Weap_Bravo_AutomaticRifleman_F"; - // }; - // class Unit7 { - // position[] = {-0.5, -2.0, 0.0}; - // rank = "PRIVATE"; - // side = 1; - // vehicle = "Cav_B_C_Weap_Bravo_Grenadier_F"; - // }; - // class Unit8 { - // position[] = {-1.5, -2.0, 0.0}; - // rank = "PRIVATE"; - // side = 1; - // vehicle = "Cav_B_C_Weap_Bravo_CombatLifeSaver_F"; - // }; - // }; - - }; - }; - }; -}; \ No newline at end of file diff --git a/addons/charlie_characters_units/CfgVehicles.hpp b/addons/charlie_characters_units/CfgVehicles.hpp deleted file mode 100644 index 4d1e20c8..00000000 --- a/addons/charlie_characters_units/CfgVehicles.hpp +++ /dev/null @@ -1,150 +0,0 @@ - -class CfgVehicles { - class Cav_B_C_PlatoonSergeant_F; - class Cav_B_C_PlatoonLeader_F; - class Cav_B_C_PlatoonMedic_F; - class Cav_B_C_SquadLeader_F; - - class Cav_B_C_PlatoonSergeant_Bandit_5_F : Cav_B_C_PlatoonSergeant_F { - _generalMacro = "Cav_B_C_PlatoonSergeant_Bandit_5_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_PlatoonSergeant_Bandit_5); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 1; - }; - class Cav_B_C_PlatoonLeader_Bandit_6_F : Cav_B_C_PlatoonLeader_F { - _generalMacro = "Cav_B_C_PlatoonLeader_Bandit_6_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_PlatoonLeader_Bandit_6); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 1; - }; - class Cav_B_C_PlatoonMedic_Bandit_7_F : Cav_B_C_PlatoonMedic_F { - _generalMacro = "Cav_B_C_PlatoonMedic_Bandit_7_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_PlatoonMedic_Bandit_7); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 1; - }; - - class Cav_B_C_SquadLeader_Bandit_1_F : Cav_B_C_SquadLeader_F { - _generalMacro = "Cav_B_C_SquadLeader_Bandit_1_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_SquadLeader_Bandit_1); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 1; - }; - class Cav_B_C_SquadLeader_Bandit_2_F : Cav_B_C_SquadLeader_F { - _generalMacro = "Cav_B_C_SquadLeader_Bandit_2_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_SquadLeader_Bandit_2); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 1; - }; - class Cav_B_C_SquadLeader_Bandit_3_F : Cav_B_C_SquadLeader_F { - _generalMacro = "Cav_B_C_SquadLeader_Bandit_3_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_SquadLeader_Bandit_3); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 1; - }; - class Cav_B_C_SquadLeader_Bandit_4_F : Cav_B_C_SquadLeader_F { - _generalMacro = "Cav_B_C_SquadLeader_Bandit_4_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_SquadLeader_Bandit_4); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 1; - }; - - - class Cav_B_C_PlatoonSergeant_Misfit_5_F : Cav_B_C_PlatoonSergeant_F { - _generalMacro = "Cav_B_C_PlatoonSergeant_Misfit_5_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_PlatoonSergeant_Misfit_5); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 2; - }; - class Cav_B_C_PlatoonLeader_Misfit_6_F : Cav_B_C_PlatoonLeader_F { - _generalMacro = "Cav_B_C_PlatoonLeader_Misfit_6_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_PlatoonLeader_Misfit_6); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 2; - }; - class Cav_B_C_PlatoonMedic_Misfit_7_F : Cav_B_C_PlatoonMedic_F { - _generalMacro = "Cav_B_C_PlatoonMedic_Misfit_7_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_PlatoonMedic_Misfit_7); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 2; - }; - - class Cav_B_C_SquadLeader_Misfit_1_F : Cav_B_C_SquadLeader_F { - _generalMacro = "Cav_B_C_SquadLeader_Misfit_1_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_SquadLeader_Misfit_1); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 2; - }; - class Cav_B_C_SquadLeader_Misfit_2_F : Cav_B_C_SquadLeader_F { - _generalMacro = "Cav_B_C_SquadLeader_Misfit_2_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_SquadLeader_Misfit_2); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 2; - }; - class Cav_B_C_SquadLeader_Misfit_3_F : Cav_B_C_SquadLeader_F { - _generalMacro = "Cav_B_C_SquadLeader_Misfit_3_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_SquadLeader_Misfit_3); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 2; - }; - class Cav_B_C_SquadLeader_Misfit_4_F : Cav_B_C_SquadLeader_F { - _generalMacro = "Cav_B_C_SquadLeader_Misfit_4_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_SquadLeader_Misfit_4); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 2; - }; - - class Cav_B_C_Weap_SquadLeader_F; - class Cav_B_C_Weap_SquadLeader_Havoc_1_F : Cav_B_C_Weap_SquadLeader_F { - _generalMacro = "Cav_B_C_Weap_SquadLeader_H_Havoc_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_SquadLeader_Havoc_1); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - cavPlatoon = 2; - }; - -}; diff --git a/addons/charlie_characters_units/script_component.hpp b/addons/charlie_characters_units/script_component.hpp deleted file mode 100644 index 1721caf6..00000000 --- a/addons/charlie_characters_units/script_component.hpp +++ /dev/null @@ -1,5 +0,0 @@ -#define COMPONENT charlie_characters_units -#define COMPONENT_BEAUTIFIED Charlie Units - -#include "\z\cav\addons\main\script_mod.hpp" -#include "\z\cav\addons\main\script_macros.hpp" diff --git a/addons/charlie_characters_units/stringtable.xml b/addons/charlie_characters_units/stringtable.xml deleted file mode 100644 index c3527554..00000000 --- a/addons/charlie_characters_units/stringtable.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - Platoon Sergeant (Bandit-5) - - - Platoon Leader (Bandit-6) - - - Platoon Medic (Bandit-7) - - - - Platoon Sergeant (Misfit-5) - - - Platoon Leader (Misfit-6) - - - Platoon Medic (Misfit-7) - - - - - Squad Leader (Bandit-1) - - - Squad Leader (Bandit-2) - - - Squad Leader (Bandit-3) - - - Squad Leader (Bandit-4) - - - - Squad Leader (Misfit-1) - - - Squad Leader (Misfit-2) - - - Squad Leader (Misfit-3) - - - Squad Leader (Misfit-4) - - - - - - Squad Leader (Havoc-1) - - - - - - - Squad Bandit-1 - - - Squad Bandit-2 - - - Squad Bandit-3 - - - Squad Bandit-4 - - - HQ Bandit-5 - - - HQ Bandit-6 - - - HQ Bandit-7 - - - - Squad Misfit-1 - - - Squad Misfit-2 - - - Squad Misfit-3 - - - Squad Misfit-4 - - - HQ Misfit-5 - - - HQ Misfit-6 - - - HQ Misfit-7 - - - - - Squad Havoc-1 - - - - diff --git a/addons/common/CfgFactionClasses.hpp b/addons/common/CfgFactionClasses.hpp index 6624bd51..b570609a 100644 --- a/addons/common/CfgFactionClasses.hpp +++ b/addons/common/CfgFactionClasses.hpp @@ -1,15 +1,14 @@ - class CfgFactionClasses { - class BLU_USA_7CAV_F { - displayName = CSTRING(Faction_Display); + class cav_blu_usa_7cav_f { + displayName = CSTRING(faction_display); author = ECSTRING(main,modteam); flag = QPATHTOF(data\faction_cav_flag_co.paa); icon = QPATHTOF(data\faction_cav_icon_co.paa); priority = 0; side = 1; - }; - class IND_USA_7CAV_F { - displayName = CSTRING(Faction_Display); + } + class cav_ind_usa_7cav_f { + displayName = CSTRING(faction_display); author = ECSTRING(main,modteam); flag = QPATHTOF(data\faction_cav_flag_co.paa); icon = QPATHTOF(data\faction_cav_icon_co.paa); diff --git a/addons/common/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp index bf4f1cce..32b77783 100644 --- a/addons/common/CfgVehicles.hpp +++ b/addons/common/CfgVehicles.hpp @@ -1,12 +1,13 @@ class CfgVehicles { class B_Soldier_base_F; - class Cav_B_base_F : B_Soldier_base_F { - _generalMacro = "Cav_B_base_F"; + class Cav_B_Soldier_base_F : B_Soldier_base_F { + _generalMacro = "Cav_B_Soldier_base_F"; scope = 1; scopeCurator = 0; displayName = CSTRING(trooper); author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_base_F.jpg); + cavCompany = ""; cavPlatoon = -1; @@ -17,7 +18,73 @@ class CfgVehicles { identityTypes[] = {"LanguageENG_F","Head_NATO","G_NATO_default"}; side = 1; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; + + model = "\A3\Characters_F\BLUFOR\b_soldier_01.p3d"; + modelSides[] = {3,2,1,0}; + + hiddenSelections[] = {"camo1","camo2","camo3"}; + hiddenSelectionsTextures[] = { + "rhsusf\addons\rhsusf_infantry\data\rhsusf_combat01_ocp_co.paa", + "rhsusf\addons\rhsusf_infantry\data\rhsusf_combat01_ocp_pockets_co.paa", + "rhsusf\addons\rhsusf_infantry\data\patches\1CAV_ocp_co.paa" + }; + + uniformClass = "rhs_uniform_cu_ocp_1stcav"; + + weapons[] = {"rhs_weap_m4a1_carryhandle","Throw","Put"}; + respawnWeapons[] = {"rhs_weap_m4a1_carryhandle","Throw","Put"}; + + magazines[] = { + MULT_OBJ_12(rhs_mag_30Rnd_556x45_M855A1_Stanag) + }; + respawnMagazines[] = { + MULT_OBJ_12(rhs_mag_30Rnd_556x45_M855A1_Stanag) + }; + items[] = { + MULT_OBJ_1(FirstAidKit) + }; + respawnItems[] = { + MULT_OBJ_1(FirstAidKit) + }; + linkedItems[] = { + "rhsusf_iotv_ocp_Rifleman", + "rhsusf_ach_helmet_ocp", + "ItemMap", + "ItemCompass", + "ItemWatch", + "ItemRadio", + "rhsusf_ANPVS_14" + }; + respawnLinkedItems[] = { + "rhsusf_iotv_ocp_Rifleman", + "rhsusf_ach_helmet_ocp", + "ItemMap", + "ItemCompass", + "ItemWatch", + "ItemRadio", + "rhsusf_ANPVS_14" + }; + }; + class Cav_I_Soldier_base_F : I_Soldier_base_F { + _generalMacro = "Cav_I_Soldier_base_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(trooper); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_base_F.jpg); + + cavCompany = ""; + cavPlatoon = -1; + + role = "Rifleman"; + + genericNames = "EnglishMen"; + icon = "iconMan"; + identityTypes[] = {"LanguageENG_F","Head_NATO","G_NATO_default"}; + + side = 2; + faction = "cav_ind_usa_7cav_f"; model = "\A3\Characters_F\BLUFOR\b_soldier_01.p3d"; modelSides[] = {3,2,1,0}; diff --git a/addons/gear/CfgWeapons.hpp b/addons/gear/CfgWeapons.hpp index c8b33df8..71e73375 100644 --- a/addons/gear/CfgWeapons.hpp +++ b/addons/gear/CfgWeapons.hpp @@ -120,8 +120,7 @@ class cfgWeapons { class UniformItem; - class Cav_B_RRD_Parade_Uniform : ItemCore - { + class Cav_B_RRD_Parade_Uniform : ItemCore { author = "Dunn.W"; scope = 2; scopeCurator = 2; diff --git a/addons/troops_alpha/$PBOPREFIX$ b/addons/troops_alpha/$PBOPREFIX$ new file mode 100644 index 00000000..93f13362 --- /dev/null +++ b/addons/troops_alpha/$PBOPREFIX$ @@ -0,0 +1 @@ +z\cav\addons\troops_alpha \ No newline at end of file diff --git a/addons/alpha_characters/CfgEditorSubcategories.hpp b/addons/troops_alpha/CfgEditorSubcategories.hpp similarity index 100% rename from addons/alpha_characters/CfgEditorSubcategories.hpp rename to addons/troops_alpha/CfgEditorSubcategories.hpp diff --git a/addons/alpha_characters/CfgGroups.hpp b/addons/troops_alpha/CfgGroups.hpp similarity index 93% rename from addons/alpha_characters/CfgGroups.hpp rename to addons/troops_alpha/CfgGroups.hpp index df1cce06..48ff991d 100644 --- a/addons/alpha_characters/CfgGroups.hpp +++ b/addons/troops_alpha/CfgGroups.hpp @@ -1,6 +1,6 @@ class CfgGroups { class West { - class BLU_USA_7CAV_F { + class cav_blu_usa_7cav_f { name = ECSTRING(common,faction_display); class Cav_Alpha_Infantry_Squads { name = CSTRING(Cat_Alpha_Company_Inf); @@ -8,7 +8,7 @@ class CfgGroups { class Cav_B_A_Buffalo_Team { name = CSTRING(A_Team_Buffalo); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -39,7 +39,7 @@ class CfgGroups { class Cav_B_A_Raven_Team { name = CSTRING(A_Team_Raven); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -58,7 +58,7 @@ class CfgGroups { class Cav_B_A_Raider_Team { name = CSTRING(A_Team_Raider); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -77,7 +77,7 @@ class CfgGroups { class Cav_B_A_Hog_Team { name = CSTRING(A_Team_Hog); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -90,7 +90,7 @@ class CfgGroups { class Cav_B_A_Titan_Team { name = CSTRING(A_Team_Titan); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; diff --git a/addons/alpha_characters/CfgVehicles.hpp b/addons/troops_alpha/CfgVehicles.hpp similarity index 98% rename from addons/alpha_characters/CfgVehicles.hpp rename to addons/troops_alpha/CfgVehicles.hpp index 9e23684c..27aad060 100644 --- a/addons/alpha_characters/CfgVehicles.hpp +++ b/addons/troops_alpha/CfgVehicles.hpp @@ -1,11 +1,11 @@ class CfgVehicles { - class Cav_B_base_F; - class Cav_B_Alpha_base_F : Cav_B_base_F { + class Cav_B_Soldier_base_F; + class Cav_B_Alpha_base_F : Cav_B_Soldier_base_F { _generalMacro = "Cav_B_Alpha_base_F"; scope = 1; scopeCurator = 0; - displayName = CSTRING(Trooper); + displayName = ECSTRING(common,trooper); author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_base_F.jpg); cavCompany = "Alpha"; @@ -48,6 +48,7 @@ class CfgVehicles { icon = "iconManOfficer"; }; + // Officers class Cav_B_A_Officer_F : Cav_B_Alpha_base_F { _generalMacro = "Cav_B_A_Officer_F"; diff --git a/addons/alpha_characters/config.cpp b/addons/troops_alpha/config.cpp similarity index 100% rename from addons/alpha_characters/config.cpp rename to addons/troops_alpha/config.cpp diff --git a/addons/alpha_characters/script_component.hpp b/addons/troops_alpha/script_component.hpp similarity index 80% rename from addons/alpha_characters/script_component.hpp rename to addons/troops_alpha/script_component.hpp index 39ae8fef..7749c167 100644 --- a/addons/alpha_characters/script_component.hpp +++ b/addons/troops_alpha/script_component.hpp @@ -1,4 +1,4 @@ -#define COMPONENT alpha_characters +#define COMPONENT troops_alpha #define COMPONENT_BEAUTIFIED Alpha Characters #include "\z\cav\addons\main\script_mod.hpp" diff --git a/addons/troops_alpha/stringtable.xml b/addons/troops_alpha/stringtable.xml new file mode 100644 index 00000000..ebfdce35 --- /dev/null +++ b/addons/troops_alpha/stringtable.xml @@ -0,0 +1,68 @@ + + + + Alpha Co. - Infantry + + + + Air Controller + + + Officer + + + Joint Fires Observer + + + + + Helicopter Pilot + + + Helicopter Co-Pilot + + + Helicopter Crew Chief + + + Helicopter Door Gunner + + + + Attack Helicopter Pilot + + + Attack Helicopter Co-Pilot + + + + Fighter Pilot + + + + Fixed Wing Pilot + + + Fixed Wing Co-Pilot + + + + + Team Buffalo + + + Team Raider + + + Team Raven + + + Team Hog + + + Team Titan + + + + + diff --git a/addons/troops_alpha_units/$PBOPREFIX$ b/addons/troops_alpha_units/$PBOPREFIX$ new file mode 100644 index 00000000..d3d47e19 --- /dev/null +++ b/addons/troops_alpha_units/$PBOPREFIX$ @@ -0,0 +1 @@ +z\cav\addons\troops_alpha_units \ No newline at end of file diff --git a/addons/alpha_characters_units/CfgGroups.hpp b/addons/troops_alpha_units/CfgGroups.hpp similarity index 93% rename from addons/alpha_characters_units/CfgGroups.hpp rename to addons/troops_alpha_units/CfgGroups.hpp index 3977df9b..445e4665 100644 --- a/addons/alpha_characters_units/CfgGroups.hpp +++ b/addons/troops_alpha_units/CfgGroups.hpp @@ -1,12 +1,12 @@ class CfgGroups { class West { - class BLU_USA_7CAV_F { + class cav_blu_usa_7cav_f { class Cav_Alpha_Infantry_Squads { class Cav_B_A_Pegasus_1_HQ { name = CSTRING(A_Team_Pegasus_1); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -18,7 +18,7 @@ class CfgGroups { class Cav_B_A_Pegasus_2_HQ { name = CSTRING(A_Team_Pegasus_2); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -31,7 +31,7 @@ class CfgGroups { class Cav_B_A_Infidel_1_HQ { name = CSTRING(A_Team_Infidel_1); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -43,7 +43,7 @@ class CfgGroups { class Cav_B_A_Infidel_2_HQ { name = CSTRING(A_Team_Infidel_2); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -56,7 +56,7 @@ class CfgGroups { class Cav_B_A_Buffalo_1_Team { name = CSTRING(A_Team_Buffalo_1); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -86,7 +86,7 @@ class CfgGroups { class Cav_B_A_Buffalo_2_Team { name = CSTRING(A_Team_Buffalo_2); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -116,7 +116,7 @@ class CfgGroups { class Cav_B_A_Buffalo_3_Team { name = CSTRING(A_Team_Buffalo_3); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -146,7 +146,7 @@ class CfgGroups { class Cav_B_A_Buffalo_4_Team { name = CSTRING(A_Team_Buffalo_4); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -176,7 +176,7 @@ class CfgGroups { class Cav_B_A_Buffalo_5_Team { name = CSTRING(A_Team_Buffalo_5); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -206,7 +206,7 @@ class CfgGroups { class Cav_B_A_Buffalo_6_Team { name = CSTRING(A_Team_Buffalo_6); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -237,7 +237,7 @@ class CfgGroups { class Cav_B_A_Raider_1_Team { name = CSTRING(A_Team_Raider_1); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -255,7 +255,7 @@ class CfgGroups { class Cav_B_A_Raider_2_Team { name = CSTRING(A_Team_Raider_2); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -273,7 +273,7 @@ class CfgGroups { class Cav_B_A_Raider_3_Team { name = CSTRING(A_Team_Raider_3); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -291,7 +291,7 @@ class CfgGroups { class Cav_B_A_Raider_4_Team { name = CSTRING(A_Team_Raider_4); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -310,7 +310,7 @@ class CfgGroups { class Cav_B_A_Raven_1_Team { name = CSTRING(A_Team_Raven_1); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -328,7 +328,7 @@ class CfgGroups { class Cav_B_A_Raven_2_Team { name = CSTRING(A_Team_Raven_2); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -346,7 +346,7 @@ class CfgGroups { class Cav_B_A_Raven_3_Team { name = CSTRING(A_Team_Raven_3); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -364,7 +364,7 @@ class CfgGroups { class Cav_B_A_Raven_4_Team { name = CSTRING(A_Team_Raven_4); icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -383,7 +383,7 @@ class CfgGroups { class Cav_B_A_Hog_Team_1 { name = CSTRING(A_Team_Hog_1); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -395,7 +395,7 @@ class CfgGroups { class Cav_B_A_Hog_Team_2 { name = CSTRING(A_Team_Hog_2); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -407,7 +407,7 @@ class CfgGroups { class Cav_B_A_Hog_Team_3 { name = CSTRING(A_Team_Hog_3); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -419,7 +419,7 @@ class CfgGroups { class Cav_B_A_Hog_Team_4 { name = CSTRING(A_Team_Hog_4); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -431,7 +431,7 @@ class CfgGroups { class Cav_B_A_Hog_Team_5 { name = CSTRING(A_Team_Hog_5); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -443,7 +443,7 @@ class CfgGroups { class Cav_B_A_Hog_Team_6 { name = CSTRING(A_Team_Hog_6); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -455,7 +455,7 @@ class CfgGroups { class Cav_B_A_Hog_Team_7 { name = CSTRING(A_Team_Hog_7); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -467,7 +467,7 @@ class CfgGroups { class Cav_B_A_Hog_Team_8 { name = CSTRING(A_Team_Hog_8); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -479,7 +479,7 @@ class CfgGroups { class Cav_B_A_Hog_Team_9 { name = CSTRING(A_Team_Hog_9); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -492,7 +492,7 @@ class CfgGroups { class Cav_B_A_Titan_Team_1 { name = CSTRING(A_Team_Titan_1); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -510,7 +510,7 @@ class CfgGroups { class Cav_B_A_Titan_Team_2 { name = CSTRING(A_Team_Titan_2); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -528,7 +528,7 @@ class CfgGroups { class Cav_B_A_Titan_Team_3 { name = CSTRING(A_Team_Titan_3); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -546,7 +546,7 @@ class CfgGroups { class Cav_B_A_Titan_Team_4 { name = CSTRING(A_Team_Titan_4); icon = "\A3\ui_f\data\map\markers\nato\b_plane.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; diff --git a/addons/alpha_characters_units/CfgVehicles.hpp b/addons/troops_alpha_units/CfgVehicles.hpp similarity index 100% rename from addons/alpha_characters_units/CfgVehicles.hpp rename to addons/troops_alpha_units/CfgVehicles.hpp diff --git a/addons/alpha_characters_units/config.cpp b/addons/troops_alpha_units/config.cpp similarity index 100% rename from addons/alpha_characters_units/config.cpp rename to addons/troops_alpha_units/config.cpp diff --git a/addons/alpha_characters_units/script_component.hpp b/addons/troops_alpha_units/script_component.hpp similarity index 76% rename from addons/alpha_characters_units/script_component.hpp rename to addons/troops_alpha_units/script_component.hpp index c8aba5a7..914d69ab 100644 --- a/addons/alpha_characters_units/script_component.hpp +++ b/addons/troops_alpha_units/script_component.hpp @@ -1,4 +1,4 @@ -#define COMPONENT alpha_characters_units +#define COMPONENT troops_alpha_units #define COMPONENT_BEAUTIFIED Alpha Units #include "\z\cav\addons\main\script_mod.hpp" diff --git a/addons/troops_alpha_units/stringtable.xml b/addons/troops_alpha_units/stringtable.xml new file mode 100644 index 00000000..32588ed2 --- /dev/null +++ b/addons/troops_alpha_units/stringtable.xml @@ -0,0 +1,208 @@ + + + + + Air Controller (Pegasus-1) + + + Air Controller (Pegasus-2) + + + + Joint Fires Observer (Infidel-1) + + + Joint Fires Observer (Infidel-2) + + + + Helicopter Pilot (Buffalo-1) + + + Helicopter Pilot (Buffalo-2) + + + Helicopter Pilot (Buffalo-3) + + + Helicopter Pilot (Buffalo-4) + + + Helicopter Pilot (Buffalo-5) + + + Helicopter Pilot (Buffalo-6) + + + + + Attack Helicopter Pilot (Raider-1) + + + Attack Helicopter Pilot (Raider-2) + + + Attack Helicopter Pilot (Raider-3) + + + Attack Helicopter Pilot (Raider-4) + + + + + Attack Helicopter Pilot (Raven-1) + + + Attack Helicopter Pilot (Raven-2) + + + Attack Helicopter Pilot (Raven-3) + + + Attack Helicopter Pilot (Raven-4) + + + + Fighter Pilot (Hog-1) + + + Fighter Pilot (Hog-2) + + + Fighter Pilot (Hog-3) + + + Fighter Pilot (Hog-4) + + + Fighter Pilot (Hog-5) + + + Fighter Pilot (Hog-6) + + + Fighter Pilot (Hog-7) + + + Fighter Pilot (Hog-8) + + + Fighter Pilot (Hog-9) + + + + Fixed Wing Pilot (Titan-1) + + + Fixed Wing Pilot (Titan-2) + + + Fixed Wing Pilot (Titan-3) + + + Fixed Wing Pilot (Titan-4) + + + + + Team Buffalo-1 + + + Team Buffalo-2 + + + Team Buffalo-3 + + + Team Buffalo-4 + + + Team Buffalo-5 + + + Team Buffalo-6 + + + + Team Raider-1 + + + Team Raider-2 + + + Team Raider-3 + + + Team Raider-4 + + + + Team Raven-1 + + + Team Raven-2 + + + Team Raven-3 + + + Team Raven-4 + + + + Team Hog-1 + + + Team Hog-2 + + + Team Hog-3 + + + Team Hog-4 + + + Team Hog-5 + + + Team Hog-6 + + + Team Hog-7 + + + Team Hog-8 + + + Team Hog-9 + + + + Team Titan-1 + + + Team Titan-2 + + + Team Titan-3 + + + Team Titan-4 + + + + HQ Pegasus-1 + + + HQ Pegasus-2 + + + + HQ Infidel-1 + + + HQ Infidel-2 + + + + diff --git a/addons/troops_bravo/$PBOPREFIX$ b/addons/troops_bravo/$PBOPREFIX$ new file mode 100644 index 00000000..22ea3a1e --- /dev/null +++ b/addons/troops_bravo/$PBOPREFIX$ @@ -0,0 +1 @@ +z\cav\addons\troops_bravo \ No newline at end of file diff --git a/addons/bravo_characters/CfgEditorSubcategories.hpp b/addons/troops_bravo/CfgEditorSubcategories.hpp similarity index 100% rename from addons/bravo_characters/CfgEditorSubcategories.hpp rename to addons/troops_bravo/CfgEditorSubcategories.hpp diff --git a/addons/bravo_characters/CfgGroups.hpp b/addons/troops_bravo/CfgGroups.hpp similarity index 96% rename from addons/bravo_characters/CfgGroups.hpp rename to addons/troops_bravo/CfgGroups.hpp index 5cf0a5f1..419103b3 100644 --- a/addons/bravo_characters/CfgGroups.hpp +++ b/addons/troops_bravo/CfgGroups.hpp @@ -1,6 +1,6 @@ class CfgGroups { class West { - class BLU_USA_7CAV_F { + class cav_blu_usa_7cav_f { name = ECSTRING(common,faction_display); class Cav_Bravo_Infantry_Squads { name = CSTRING(Cat_Bravo_Company_Inf); @@ -8,7 +8,7 @@ class CfgGroups { class Cav_B_B_Lancer_Squad { name = CSTRING(B_Squad_Lancer); icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -69,7 +69,7 @@ class CfgGroups { class Cav_B_B_Banshee_Squad { name = CSTRING(B_Squad_Banshee); icon = "\A3\ui_f\data\map\markers\nato\b_mech_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -94,7 +94,7 @@ class CfgGroups { class Cav_B_B_Saber_Squad { name = CSTRING(B_Squad_Saber); icon = "\A3\ui_f\data\map\markers\nato\b_armor.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -127,7 +127,7 @@ class CfgGroups { class Cav_B_B_Mustang_Squad { name = CSTRING(B_Squad_Mustang); icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -157,7 +157,7 @@ class CfgGroups { class Cav_B_B_Apollo_Squad { name = CSTRING(B_Squad_Apollo); icon = "\A3\ui_f\data\map\markers\nato\b_maint.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; diff --git a/addons/bravo_characters/CfgVehicles.hpp b/addons/troops_bravo/CfgVehicles.hpp similarity index 99% rename from addons/bravo_characters/CfgVehicles.hpp rename to addons/troops_bravo/CfgVehicles.hpp index d439a5a0..a291fb0d 100644 --- a/addons/bravo_characters/CfgVehicles.hpp +++ b/addons/troops_bravo/CfgVehicles.hpp @@ -1,10 +1,10 @@ class CfgVehicles { - class Cav_B_base_F; - class Cav_B_Bravo_base_F : Cav_B_base_F { + class Cav_B_Soldier_base_F; + class Cav_B_Bravo_base_F : Cav_B_Soldier_base_F { _generalMacro = "Cav_B_Bravo_base_F"; scope = 1; scopeCurator = 0; - displayName = CSTRING(Trooper); + displayName = ECSTRING(common,trooper); author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Bravo_base_F.jpg); cavCompany = "Bravo"; @@ -39,7 +39,7 @@ class CfgVehicles { _generalMacro = "Cav_B_Bravo_Crew_base_F"; scope = 1; scopeCurator = 0; - displayName = CSTRING(Trooper); + displayName = ECSTRING(common,trooper); author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Bravo_base_F.jpg); linkedItems[] = { diff --git a/addons/bravo_characters/config.cpp b/addons/troops_bravo/config.cpp similarity index 100% rename from addons/bravo_characters/config.cpp rename to addons/troops_bravo/config.cpp diff --git a/addons/bravo_characters/script_component.hpp b/addons/troops_bravo/script_component.hpp similarity index 80% rename from addons/bravo_characters/script_component.hpp rename to addons/troops_bravo/script_component.hpp index 3c0acd88..0c68da6b 100644 --- a/addons/bravo_characters/script_component.hpp +++ b/addons/troops_bravo/script_component.hpp @@ -1,4 +1,4 @@ -#define COMPONENT bravo_characters +#define COMPONENT troops_bravo #define COMPONENT_BEAUTIFIED Bravo Characters #include "\z\cav\addons\main\script_mod.hpp" diff --git a/addons/troops_bravo/stringtable.xml b/addons/troops_bravo/stringtable.xml new file mode 100644 index 00000000..709d4554 --- /dev/null +++ b/addons/troops_bravo/stringtable.xml @@ -0,0 +1,163 @@ + + + + Bravo Co. - Infantry + + + Bravo Co. - Infantry (Heavy Weapons Squad) + + + Bravo Co. - Logistics + + + + + Platoon Sergeant + + + Platoon Leader + + + Platoon Medic + + + + + Tank Commander + + + Tank Driver + + + Tank Gunner + + + Tank Loader + + + + IFV Commander + + + IFV Driver + + + IFV Gunner + + + + + Squad Leader + + + + Fire Team Leader + + + Automatic Rifleman + + + Grenadier + + + Rifleman + + + Rifleman (AT) + + + Rifleman (LAT) + + + Combat Life Saver + + + + Alpha Fire Team Leader + + + Alpha Automatic Rifleman + + + Alpha Grenadier + + + Alpha Rifleman + + + Alpha Rifleman (AT) + + + Alpha Rifleman (LAT) + + + Alpha Combat Life Saver + + + + Bravo Fire Team Leader + + + Bravo Automatic Rifleman + + + Bravo Grenadier + + + Bravo Rifleman + + + Bravo Rifleman (AT) + + + Bravo Rifleman (LAT) + + + Bravo Combat Life Saver + + + + + Team Leader + + + Combat Medic + + + + + Ops Officer + + + Ops NCO + + + + Logistic Team Leader + + + Logistics Team Member + + + + + Squad Lancer + + + + Team Banshee + + + Team Saber + + + + Team Mustang + + + + Team Apollo + + + + diff --git a/addons/troops_bravo_atlas/CfgGroups.hpp b/addons/troops_bravo_atlas/CfgGroups.hpp index 13fbde1d..581ecd0a 100644 --- a/addons/troops_bravo_atlas/CfgGroups.hpp +++ b/addons/troops_bravo_atlas/CfgGroups.hpp @@ -1,6 +1,6 @@ class CfgGroups { class West { - class BLU_USA_7CAV_F { + class cav_blu_usa_7cav_f { name = ECSTRING(common,faction_display); class Cav_Bravo_Atlas_Squads { name = CSTRING(cat_bravo_atlas_squads); @@ -8,7 +8,7 @@ class CfgGroups { class Cav_B_B_Atlas_Medical_Squad { name = CSTRING(medical_squad); icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -26,7 +26,7 @@ class CfgGroups { class Cav_B_B_Atlas_Medical_3_1_Squad { name = CSTRING(medical_3_1_squad); icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -44,7 +44,7 @@ class CfgGroups { class Cav_B_B_Atlas_Medical_3_2_Squad { name = CSTRING(medical_3_2_squad); icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -63,7 +63,7 @@ class CfgGroups { class Cav_B_B_Atlas_Logistics_Squad { name = CSTRING(logistics_squad); icon = "\A3\ui_f\data\map\markers\nato\b_maint.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -111,7 +111,7 @@ class CfgGroups { class Cav_B_B_Atlas_Logistics_3_3_Squad { name = CSTRING(logistics_3_3_squad); icon = "\A3\ui_f\data\map\markers\nato\b_maint.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -159,7 +159,7 @@ class CfgGroups { class Cav_B_B_Atlas_Logistics_3_4_Squad { name = CSTRING(logistics_3_4_squad); icon = "\A3\ui_f\data\map\markers\nato\b_maint.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -208,7 +208,7 @@ class CfgGroups { class Cav_B_B_Atlas_HQ_3_5_Squad { name = CSTRING(HQ_3_5_Squad); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -220,7 +220,7 @@ class CfgGroups { class Cav_B_B_Atlas_HQ_3_6_Squad { name = CSTRING(HQ_3_6_Squad); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { diff --git a/addons/troops_bravo_atlas/CfgVehicles.hpp b/addons/troops_bravo_atlas/CfgVehicles.hpp index bd84c458..be19e8d8 100644 --- a/addons/troops_bravo_atlas/CfgVehicles.hpp +++ b/addons/troops_bravo_atlas/CfgVehicles.hpp @@ -1,6 +1,6 @@ class CfgVehicles { - class Cav_B_base_F; - class Cav_B_Bravo_Atlas_base_F : Cav_B_base_F { + class Cav_B_Soldier_base_F; + class Cav_B_Bravo_Atlas_base_F : Cav_B_Soldier_base_F { _generalMacro = "Cav_B_Bravo_Atlas_base_F"; scope = 1; scopeCurator = 0; diff --git a/addons/troops_bravo_units/$PBOPREFIX$ b/addons/troops_bravo_units/$PBOPREFIX$ new file mode 100644 index 00000000..bb2b5c3e --- /dev/null +++ b/addons/troops_bravo_units/$PBOPREFIX$ @@ -0,0 +1 @@ +z\cav\addons\troops_bravo_units \ No newline at end of file diff --git a/addons/bravo_characters_units/CfgGroups.hpp b/addons/troops_bravo_units/CfgGroups.hpp similarity index 95% rename from addons/bravo_characters_units/CfgGroups.hpp rename to addons/troops_bravo_units/CfgGroups.hpp index d33744b3..22ee3b49 100644 --- a/addons/bravo_characters_units/CfgGroups.hpp +++ b/addons/troops_bravo_units/CfgGroups.hpp @@ -1,12 +1,12 @@ class CfgGroups { class West { - class BLU_USA_7CAV_F { + class cav_blu_usa_7cav_f { class Cav_Bravo_Infantry_Squads { class Cav_B_B_Banshee_1_Squad { name = CSTRING(B_Squad_Banshee_1); icon = "\A3\ui_f\data\map\markers\nato\b_mech_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -30,7 +30,7 @@ class CfgGroups { class Cav_B_B_Banshee_2_Squad { name = CSTRING(B_Squad_Banshee_2); icon = "\A3\ui_f\data\map\markers\nato\b_mech_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -54,7 +54,7 @@ class CfgGroups { class Cav_B_B_Banshee_3_Squad { name = CSTRING(B_Squad_Banshee_3); icon = "\A3\ui_f\data\map\markers\nato\b_mech_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -78,7 +78,7 @@ class CfgGroups { class Cav_B_B_Banshee_4_Squad { name = CSTRING(B_Squad_Banshee_4); icon = "\A3\ui_f\data\map\markers\nato\b_mech_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -103,7 +103,7 @@ class CfgGroups { class Cav_B_B_Saber_1_Squad { name = CSTRING(B_Squad_Saber_1); icon = "\A3\ui_f\data\map\markers\nato\b_armor.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -133,7 +133,7 @@ class CfgGroups { class Cav_B_B_Saber_2_Squad { name = CSTRING(B_Squad_Saber_2); icon = "\A3\ui_f\data\map\markers\nato\b_armor.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -163,7 +163,7 @@ class CfgGroups { class Cav_B_B_Saber_3_Squad { name = CSTRING(B_Squad_Saber_3); icon = "\A3\ui_f\data\map\markers\nato\b_armor.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -193,7 +193,7 @@ class CfgGroups { class Cav_B_B_Saber_4_Squad { name = CSTRING(B_Squad_Saber_4); icon = "\A3\ui_f\data\map\markers\nato\b_armor.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -226,7 +226,7 @@ class CfgGroups { class Cav_B_B_Mustang_1_Squad { name = CSTRING(B_Squad_Mustang_1); icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -256,7 +256,7 @@ class CfgGroups { class Cav_B_B_Mustang_2_Squad { name = CSTRING(B_Squad_Mustang_2); icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -287,7 +287,7 @@ class CfgGroups { class Cav_B_B_Apollo_5_HQ { name = CSTRING(B_Squad_Apollo_5); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -299,7 +299,7 @@ class CfgGroups { class Cav_B_B_Apollo_6_HQ { name = CSTRING(B_Squad_Apollo_6); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -311,7 +311,7 @@ class CfgGroups { class Cav_B_B_Apollo_1_Squad { name = CSTRING(B_Squad_Apollo_1); icon = "\A3\ui_f\data\map\markers\nato\b_maint.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -353,7 +353,7 @@ class CfgGroups { class Cav_B_B_Apollo_2_Squad { name = CSTRING(B_Squad_Apollo_2); icon = "\A3\ui_f\data\map\markers\nato\b_maint.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; diff --git a/addons/bravo_characters_units/CfgVehicles.hpp b/addons/troops_bravo_units/CfgVehicles.hpp similarity index 100% rename from addons/bravo_characters_units/CfgVehicles.hpp rename to addons/troops_bravo_units/CfgVehicles.hpp diff --git a/addons/bravo_characters_units/config.cpp b/addons/troops_bravo_units/config.cpp similarity index 100% rename from addons/bravo_characters_units/config.cpp rename to addons/troops_bravo_units/config.cpp diff --git a/addons/bravo_characters_units/script_component.hpp b/addons/troops_bravo_units/script_component.hpp similarity index 76% rename from addons/bravo_characters_units/script_component.hpp rename to addons/troops_bravo_units/script_component.hpp index b1e4b27c..4e6b9042 100644 --- a/addons/bravo_characters_units/script_component.hpp +++ b/addons/troops_bravo_units/script_component.hpp @@ -1,4 +1,4 @@ -#define COMPONENT bravo_characters_units +#define COMPONENT troops_bravo_units #define COMPONENT_BEAUTIFIED Bravo Units #include "\z\cav\addons\main\script_mod.hpp" diff --git a/addons/troops_bravo_units/stringtable.xml b/addons/troops_bravo_units/stringtable.xml new file mode 100644 index 00000000..8595b787 --- /dev/null +++ b/addons/troops_bravo_units/stringtable.xml @@ -0,0 +1,189 @@ + + + + + Platoon Sergeant (Lancer-5) + + + Platoon Leader (Lancer-6) + + + Platoon Medic (Lancer-7) + + + + Squad Leader (Lancer-1) + + + Squad Leader (Lancer-2) + + + Squad Leader (Lancer-3) + + + Squad Leader (Lancer-4) + + + + + Platoon Medic (Viking-7) + + + + Platoon Leader (Viking-1) + + + Team Leader (Viking-2) + + + Team Leader (Viking-3) + + + Team Leader (Viking-4) + + + + Commander (Banshee-1) + + + Commander (Banshee-2) + + + Commander (Banshee-3) + + + Commander (Banshee-4) + + + + Commander (Saber-1) + + + Commander (Saber-2) + + + Commander (Saber-3) + + + Commander (Saber-4) + + + + + Team Leader (Mustang-1) + + + Team Leader (Mustang-2) + + + + + Ops Officer (Apollo-6) + + + Ops NCO (Apollo-5) + + + + Logistic Team Leader (Apollo-1) + + + Logistic Team Leader (Apollo-2) + + + + + + HQ Lancer-5 + + + HQ Lancer-6 + + + HQ Lancer-7 + + + + Squad Lancerr-1 + + + Squad Lancerr-2 + + + Squad Lancerr-3 + + + Squad Lancerr-4 + + + + Team Viking-1 + + + Team Viking-2 + + + Team Viking-3 + + + Team Viking-4 + + + + HQ Viking-5 + + + HQ Viking-6 + + + HQ Viking-7 + + + + Team Banshee-1 + + + Team Banshee-2 + + + Team Banshee-3 + + + Team Banshee-4 + + + + Team Saber-1 + + + Team Saber-2 + + + Team Saber-3 + + + Team Saber-4 + + + + Team Mustang-1 + + + Team Mustang-2 + + + + HQ Apollo-5 + + + HQ Apollo-6 + + + + Team Apollo-1 + + + Team Apollo-2 + + + diff --git a/addons/troops_bravo_viking/CfgGroups.hpp b/addons/troops_bravo_viking/CfgGroups.hpp index 4c2f23ba..9b99f799 100644 --- a/addons/troops_bravo_viking/CfgGroups.hpp +++ b/addons/troops_bravo_viking/CfgGroups.hpp @@ -1,13 +1,13 @@ class CfgGroups { class West { - class BLU_USA_7CAV_F { + class cav_blu_usa_7cav_f { name = ECSTRING(common,faction_display); class Cav_Bravo_Viking_Squads { name = CSTRING(Cat_Bravo_Viking_Squads); class Cav_B_B_Scout_Squad { name = CSTRING(b_scout_squad); icon = "\A3\ui_f\data\map\markers\nato\b_recon.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -67,7 +67,7 @@ class CfgGroups { class Cav_B_B_Scout_2_1_Squad { name = CSTRING(b_scout_2_1_squad); icon = "\A3\ui_f\data\map\markers\nato\b_recon.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -127,7 +127,7 @@ class CfgGroups { class Cav_B_B_Scout_2_2_Squad { name = CSTRING(b_scout_2_2_squad); icon = "\A3\ui_f\data\map\markers\nato\b_recon.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -187,7 +187,7 @@ class CfgGroups { class Cav_B_B_Scout_2_3_Squad { name = CSTRING(b_scout_2_3_squad); icon = "\A3\ui_f\data\map\markers\nato\b_recon.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -247,7 +247,7 @@ class CfgGroups { class Cav_B_B_Scout_2_4_Squad { name = CSTRING(b_scout_2_4_squad); icon = "\A3\ui_f\data\map\markers\nato\b_recon.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -308,7 +308,7 @@ class CfgGroups { class Cav_B_B_Scout_HQ_5_Squad { name = CSTRING(b_scout_hq_5_squad); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -320,7 +320,7 @@ class CfgGroups { class Cav_B_B_Scout_HQ_6_Squad { name = CSTRING(b_scout_hq_6_squad); icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -332,7 +332,7 @@ class CfgGroups { class Cav_B_B_Scout_HQ_7_Squad { name = CSTRING(b_scout_hq_7_squad); icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; diff --git a/addons/troops_bravo_viking/CfgVehicles.hpp b/addons/troops_bravo_viking/CfgVehicles.hpp index 92102ae1..30fbd4d8 100644 --- a/addons/troops_bravo_viking/CfgVehicles.hpp +++ b/addons/troops_bravo_viking/CfgVehicles.hpp @@ -1,6 +1,6 @@ class CfgVehicles { - class Cav_B_base_F; - class Cav_B_Bravo_Scout_base_F : Cav_B_base_F { + class Cav_B_Soldier_base_F; + class Cav_B_Bravo_Scout_base_F : Cav_B_Soldier_base_F { _generalMacro = "Cav_B_Bravo_Scout_base_F"; scope = 1; scopeCurator = 0; diff --git a/addons/charlie_characters/$PBOPREFIX$ b/addons/troops_charlie/$PBOPREFIX$ similarity index 100% rename from addons/charlie_characters/$PBOPREFIX$ rename to addons/troops_charlie/$PBOPREFIX$ diff --git a/addons/charlie_characters/CfgEditorSubcategories.hpp b/addons/troops_charlie/CfgEditorSubcategories.hpp similarity index 100% rename from addons/charlie_characters/CfgEditorSubcategories.hpp rename to addons/troops_charlie/CfgEditorSubcategories.hpp diff --git a/addons/charlie_characters/CfgGroups.hpp b/addons/troops_charlie/CfgGroups.hpp similarity index 97% rename from addons/charlie_characters/CfgGroups.hpp rename to addons/troops_charlie/CfgGroups.hpp index 07bed543..8ab59dc3 100644 --- a/addons/charlie_characters/CfgGroups.hpp +++ b/addons/troops_charlie/CfgGroups.hpp @@ -1,6 +1,6 @@ class CfgGroups { class West { - class BLU_USA_7CAV_F { + class cav_blu_usa_7cav_f { name = ECSTRING(common,faction_display); class Cav_Charlie_Infantry_Squads { name = CSTRING(Cat_Charlie_Company_Inf); @@ -8,7 +8,7 @@ class CfgGroups { class Cav_B_C_Bandit_Squad { name = CSTRING(C_Squad_Bandit); icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -69,7 +69,7 @@ class CfgGroups { class Cav_B_C_Misfit_Squad { name = CSTRING(C_Squad_Misfit); icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -130,7 +130,7 @@ class CfgGroups { //class Cav_B_C_Havoc_Squad { // name = CSTRING(C_Squad_Havoc); // icon = "\A3\ui_f\data\map\markers\nato\b_support.paa"; - // faction = "BLU_USA_7CAV_F"; + // faction = "cav_blu_usa_7cav_f"; // side = 1; // class Unit0 { // position[] = {0, 0, 0}; diff --git a/addons/charlie_characters/CfgVehicles.hpp b/addons/troops_charlie/CfgVehicles.hpp similarity index 59% rename from addons/charlie_characters/CfgVehicles.hpp rename to addons/troops_charlie/CfgVehicles.hpp index bcd23201..f3188007 100644 --- a/addons/charlie_characters/CfgVehicles.hpp +++ b/addons/troops_charlie/CfgVehicles.hpp @@ -1,11 +1,11 @@ class CfgVehicles { - class Cav_B_base_F; - class Cav_B_Charlie_base_F : Cav_B_base_F { + class Cav_B_Soldier_base_F; + class Cav_B_Charlie_base_F : Cav_B_Soldier_base_F { _generalMacro = "Cav_B_Charlie_base_F"; scope = 1; scopeCurator = 0; - displayName = CSTRING(Trooper); + displayName = ECSTRING(common,trooper); author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_base_F.jpg); cavCompany = "Charlie"; @@ -21,7 +21,7 @@ class CfgVehicles { _generalMacro = "Cav_B_Charlie_Weap_base_F"; scope = 1; scopeCurator = 0; - displayName = CSTRING(Trooper); + displayName = ECSTRING(common,trooper); author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_base_F.jpg); @@ -32,7 +32,7 @@ class CfgVehicles { uniformClass = "rhs_uniform_cu_ocp_1stcav"; }; - // Charlie + // Squad class Cav_B_C_Officer_F : Cav_B_Charlie_base_F { _generalMacro = "Cav_B_C_Officer_F"; scope = 2; @@ -280,7 +280,17 @@ class CfgVehicles { }; }; + class Cav_B_C_Trooper_F : Cav_B_Charlie_base_F { + _generalMacro = "Cav_B_C_Trooper_F"; + scope = 2; + scopeCurator = 0; + displayName = ECSTRING(common,trooper); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + }; + + // Squad Teams class Cav_B_C_Alpha_FireTeamLeader_F : Cav_B_C_FireTeamLeader_F { _generalMacro = "Cav_B_C_Alpha_FireTeamLeader_F"; scope = 1; @@ -396,237 +406,4 @@ class CfgVehicles { author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); }; - - - // Havoc - class Cav_B_C_Weap_SquadLeader_F : Cav_B_Charlie_Weap_base_F { - _generalMacro = "Cav_B_C_Weap_SquadLeader_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_SquadLeader); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - - icon = "iconManLeader"; - }; - - class Cav_B_C_Weap_FireTeamLeader_F : Cav_B_Charlie_Weap_base_F { - _generalMacro = "Cav_B_C_Weap_FireTeamLeader_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_FireTeamLeader); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - - icon = "iconManLeader"; - - weapons[] = {"rhs_weap_m4a1_m320","Throw","Put"}; - respawnWeapons[] = {"rhs_weap_m4a1_m320","Throw","Put"}; - - magazines[] = { - MULT_OBJ_6(rhs_mag_30Rnd_556x45_M855A1_Stanag), - MULT_OBJ_4(rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red), - MULT_OBJ_12(rhs_mag_M441_HE) - }; - respawnMagazines[] = { - MULT_OBJ_6(rhs_mag_30Rnd_556x45_M855A1_Stanag), - MULT_OBJ_4(rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red), - MULT_OBJ_12(rhs_mag_M441_HE) - }; - }; - class Cav_B_C_Weap_AutomaticRifleman_F : Cav_B_Charlie_Weap_base_F { - _generalMacro = "Cav_B_C_Weap_AutomaticRifleman_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_AutomaticRifleman); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - - role = "MachineGunner"; - icon = "iconManMG"; - - weapons[] = {"rhs_weap_m249_pip_L_para","Throw","Put"}; - respawnWeapons[] = {"rhs_weap_m249_pip_L_para","Throw","Put"}; - - magazines[] = { - MULT_OBJ_3(rhs_200rnd_556x45_M_SAW) - }; - respawnMagazines[] = { - MULT_OBJ_3(rhs_200rnd_556x45_M_SAW) - }; - }; - class Cav_B_C_Weap_Grenadier_F : Cav_B_Charlie_Weap_base_F { - _generalMacro = "Cav_B_C_Weap_Grenadier_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Grenadier); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - - weapons[] = {"rhs_weap_m4a1_m320","Throw","Put"}; - respawnWeapons[] = {"rhs_weap_m4a1_m320","Throw","Put"}; - - magazines[] = { - MULT_OBJ_10(rhs_mag_30Rnd_556x45_M855A1_Stanag), - MULT_OBJ_12(rhs_mag_M441_HE) - }; - respawnMagazines[] = { - MULT_OBJ_10(rhs_mag_30Rnd_556x45_M855A1_Stanag), - MULT_OBJ_12(rhs_mag_M441_HE) - }; - }; - class Cav_B_C_Weap_Rifleman_F : Cav_B_Charlie_Weap_base_F { - _generalMacro = "Cav_B_C_Weap_Rifleman_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Rifleman); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_RiflemanAT_F : Cav_B_Charlie_Weap_base_F { - _generalMacro = "Cav_B_C_Weap_RiflemanAT_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_RiflemanAT); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - - icon = "iconManAT"; - }; - class Cav_B_C_Weap_RiflemanLAT_F : Cav_B_Charlie_Weap_base_F { - _generalMacro = "Cav_B_C_Weap_RiflemanLAT_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_RiflemanLAT); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - - icon = "iconManAT"; - }; - class Cav_B_C_Weap_CombatLifeSaver_F : Cav_B_Charlie_Weap_base_F { - _generalMacro = "Cav_B_C_Weap_CombatLifeSaver_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_CombatLifeSaver); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - - role = "CombatLifeSaver"; - icon = "iconManMedic"; - }; - - class Cav_B_C_Weap_Alpha_FireTeamLeader_F : Cav_B_C_Weap_FireTeamLeader_F { - _generalMacro = "Cav_B_C_Weap_Alpha_FireTeamLeader_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Alpha_FireTeamLeader); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Alpha_AutomaticRifleman_F : Cav_B_C_Weap_AutomaticRifleman_F { - _generalMacro = "Cav_B_C_Weap_Alpha_AutomaticRifleman_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Alpha_AutomaticRifleman); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Alpha_Grenadier_F : Cav_B_C_Weap_Grenadier_F { - _generalMacro = "Cav_B_C_Weap_Alpha_Grenadier_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Alpha_Grenadier); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Alpha_Rifleman_F : Cav_B_C_Weap_Rifleman_F { - _generalMacro = "Cav_B_C_Weap_Alpha_Rifleman_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Alpha_Rifleman); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Alpha_RiflemanAT_F : Cav_B_C_Weap_RiflemanAT_F { - _generalMacro = "Cav_B_C_Weap_Alpha_RiflemanAT_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Alpha_RiflemanAT); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Alpha_RiflemanLAT_F : Cav_B_C_Weap_RiflemanLAT_F { - _generalMacro = "Cav_B_C_Weap_Alpha_RiflemanLAT_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Alpha_RiflemanLAT); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Alpha_CombatLifeSaver_F : Cav_B_C_Weap_CombatLifeSaver_F { - _generalMacro = "Cav_B_C_Weap_Alpha_CombatLifeSaver_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Alpha_CombatLifeSaver); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - - - class Cav_B_C_Weap_Bravo_FireTeamLeader_F : Cav_B_C_Weap_FireTeamLeader_F { - _generalMacro = "Cav_B_C_Weap_Bravo_FireTeamLeader_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Bravo_FireTeamLeader); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Bravo_AutomaticRifleman_F : Cav_B_C_Weap_AutomaticRifleman_F { - _generalMacro = "Cav_B_C_Weap_Bravo_AutomaticRifleman_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Bravo_AutomaticRifleman); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Bravo_Grenadier_F : Cav_B_C_Weap_Grenadier_F { - _generalMacro = "Cav_B_C_Weap_Bravo_Grenadier_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Bravo_Grenadier); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Bravo_Rifleman_F : Cav_B_C_Weap_Rifleman_F { - _generalMacro = "Cav_B_C_Weap_Bravo_Rifleman_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Bravo_Rifleman); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Bravo_RiflemanAT_F : Cav_B_C_Weap_RiflemanAT_F { - _generalMacro = "Cav_B_C_Weap_Bravo_RiflemanAT_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Bravo_RiflemanAT); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Bravo_RiflemanLAT_F : Cav_B_C_Weap_RiflemanLAT_F { - _generalMacro = "Cav_B_C_Weap_Bravo_RiflemanLAT_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Bravo_RiflemanLAT); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; - class Cav_B_C_Weap_Bravo_CombatLifeSaver_F : Cav_B_C_Weap_CombatLifeSaver_F { - _generalMacro = "Cav_B_C_Weap_Bravo_CombatLifeSaver_F"; - scope = 1; - scopeCurator = 0; - displayName = CSTRING(C_Weap_Bravo_CombatLifeSaver); - author = ECSTRING(main,modteam); - //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); - }; }; \ No newline at end of file diff --git a/addons/charlie_characters/config.cpp b/addons/troops_charlie/config.cpp similarity index 100% rename from addons/charlie_characters/config.cpp rename to addons/troops_charlie/config.cpp diff --git a/addons/charlie_characters/script_component.hpp b/addons/troops_charlie/script_component.hpp similarity index 100% rename from addons/charlie_characters/script_component.hpp rename to addons/troops_charlie/script_component.hpp diff --git a/addons/troops_charlie/stringtable.xml b/addons/troops_charlie/stringtable.xml new file mode 100644 index 00000000..668979b6 --- /dev/null +++ b/addons/troops_charlie/stringtable.xml @@ -0,0 +1,111 @@ + + + + Charlie Co. - Infantry + + + Charlie Co. - Infantry (Heavy Weapons Squad) + + + + Officer + + + + Platoon Sergeant + + + Platoon Leader + + + Platoon Medic + + + + + Squad Leader + + + + Fire Team Leader + + + Automatic Rifleman + + + Grenadier + + + Rifleman + + + Rifleman (AT) + + + Rifleman (LAT) + + + Combat Life Saver + + + + + + + Alpha Fire Team Leader + + + Alpha Automatic Rifleman + + + Alpha Grenadier + + + Alpha Rifleman + + + Alpha Rifleman (AT) + + + Alpha Rifleman (LAT) + + + Alpha Combat Life Saver + + + + Bravo Fire Team Leader + + + Bravo Automatic Rifleman + + + Bravo Grenadier + + + Bravo Rifleman + + + Bravo Rifleman (AT) + + + Bravo Rifleman (LAT) + + + Bravo Combat Life Saver + + + + + + Squad Bandit + + + Squad Misfit + + + Squad Havoc + + + + diff --git a/addons/troops_charlie_bandit/$PBOPREFIX$ b/addons/troops_charlie_bandit/$PBOPREFIX$ new file mode 100644 index 00000000..281cb2fc --- /dev/null +++ b/addons/troops_charlie_bandit/$PBOPREFIX$ @@ -0,0 +1 @@ +z\cav\addons\troops_charlie_bandit \ No newline at end of file diff --git a/addons/troops_charlie_bandit/CfgGroups.hpp b/addons/troops_charlie_bandit/CfgGroups.hpp new file mode 100644 index 00000000..c3fd00af --- /dev/null +++ b/addons/troops_charlie_bandit/CfgGroups.hpp @@ -0,0 +1,286 @@ +class CfgGroups { + class West { + class cav_blu_usa_7cav_f { + class Cav_Charlie_Infantry_Squads { + + class Cav_B_C_Bandit_5_HQ { + name = CSTRING(C_Squad_Bandit_5); + icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_PlatoonSergeant_Bandit_5_F"; + }; + }; + class Cav_B_C_Bandit_6_HQ { + name = CSTRING(C_Squad_Bandit_6); + icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_PlatoonLeader_Bandit_6_F"; + }; + }; + class Cav_B_C_Bandit_7_HQ { + name = CSTRING(C_Squad_Bandit_7); + icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_PlatoonMedic_Bandit_7_F"; + }; + }; + + class Cav_B_C_Bandit_1_Squad { + name = CSTRING(C_Squad_Bandit_1); + icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_SquadLeader_Bandit_1_F"; + }; + class Unit1 { + position[] = {1.5, -1.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; + }; + class Unit2 { + position[] = {0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; + }; + class Unit3 { + position[] = {-0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Grenadier_F"; + }; + class Unit4 { + position[] = {-1.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Rifleman_F"; + }; + class Unit5 { + position[] = {1.5, -2.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; + }; + class Unit6 { + position[] = {0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; + }; + class Unit7 { + position[] = {-0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_Grenadier_F"; + }; + class Unit8 { + position[] = {-1.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; + }; + }; + class Cav_B_C_Bandit_2_Squad { + name = CSTRING(C_Squad_Bandit_2); + icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_SquadLeader_Bandit_2_F"; + }; + class Unit1 { + position[] = {1.5, -1.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; + }; + class Unit2 { + position[] = {0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; + }; + class Unit3 { + position[] = {-0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Grenadier_F"; + }; + class Unit4 { + position[] = {-1.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Rifleman_F"; + }; + class Unit5 { + position[] = {1.5, -2.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; + }; + class Unit6 { + position[] = {0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; + }; + class Unit7 { + position[] = {-0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_Grenadier_F"; + }; + class Unit8 { + position[] = {-1.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; + }; + }; + class Cav_B_C_Bandit_3_Squad { + name = CSTRING(C_Squad_Bandit_3); + icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_SquadLeader_Bandit_3_F"; + }; + class Unit1 { + position[] = {1.5, -1.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; + }; + class Unit2 { + position[] = {0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; + }; + class Unit3 { + position[] = {-0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Grenadier_F"; + }; + class Unit4 { + position[] = {-1.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Rifleman_F"; + }; + class Unit5 { + position[] = {1.5, -2.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; + }; + class Unit6 { + position[] = {0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; + }; + class Unit7 { + position[] = {-0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_Grenadier_F"; + }; + class Unit8 { + position[] = {-1.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; + }; + }; + class Cav_B_C_Bandit_4_Squad { + name = CSTRING(C_Squad_Bandit_4); + icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_SquadLeader_Bandit_4_F"; + }; + class Unit1 { + position[] = {1.5, -1.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; + }; + class Unit2 { + position[] = {0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; + }; + class Unit3 { + position[] = {-0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Grenadier_F"; + }; + class Unit4 { + position[] = {-1.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Rifleman_F"; + }; + class Unit5 { + position[] = {1.5, -2.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; + }; + class Unit6 { + position[] = {0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; + }; + class Unit7 { + position[] = {-0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_Grenadier_F"; + }; + class Unit8 { + position[] = {-1.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; + }; + }; + }; + }; + }; +}; \ No newline at end of file diff --git a/addons/troops_charlie_bandit/CfgVehicles.hpp b/addons/troops_charlie_bandit/CfgVehicles.hpp new file mode 100644 index 00000000..76fd7c05 --- /dev/null +++ b/addons/troops_charlie_bandit/CfgVehicles.hpp @@ -0,0 +1,72 @@ + +class CfgVehicles { + class Cav_B_C_PlatoonSergeant_F; + class Cav_B_C_PlatoonLeader_F; + class Cav_B_C_PlatoonMedic_F; + class Cav_B_C_SquadLeader_F; + + class Cav_B_C_PlatoonSergeant_Bandit_5_F : Cav_B_C_PlatoonSergeant_F { + _generalMacro = "Cav_B_C_PlatoonSergeant_Bandit_5_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_PlatoonSergeant_Bandit_5); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 1; + }; + class Cav_B_C_PlatoonLeader_Bandit_6_F : Cav_B_C_PlatoonLeader_F { + _generalMacro = "Cav_B_C_PlatoonLeader_Bandit_6_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_PlatoonLeader_Bandit_6); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 1; + }; + class Cav_B_C_PlatoonMedic_Bandit_7_F : Cav_B_C_PlatoonMedic_F { + _generalMacro = "Cav_B_C_PlatoonMedic_Bandit_7_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_PlatoonMedic_Bandit_7); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 1; + }; + + class Cav_B_C_SquadLeader_Bandit_1_F : Cav_B_C_SquadLeader_F { + _generalMacro = "Cav_B_C_SquadLeader_Bandit_1_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_SquadLeader_Bandit_1); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 1; + }; + class Cav_B_C_SquadLeader_Bandit_2_F : Cav_B_C_SquadLeader_F { + _generalMacro = "Cav_B_C_SquadLeader_Bandit_2_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_SquadLeader_Bandit_2); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 1; + }; + class Cav_B_C_SquadLeader_Bandit_3_F : Cav_B_C_SquadLeader_F { + _generalMacro = "Cav_B_C_SquadLeader_Bandit_3_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_SquadLeader_Bandit_3); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 1; + }; + class Cav_B_C_SquadLeader_Bandit_4_F : Cav_B_C_SquadLeader_F { + _generalMacro = "Cav_B_C_SquadLeader_Bandit_4_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_SquadLeader_Bandit_4); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 1; + }; +}; diff --git a/addons/troops_charlie_bandit/config.cpp b/addons/troops_charlie_bandit/config.cpp new file mode 100644 index 00000000..2cfcc59b --- /dev/null +++ b/addons/troops_charlie_bandit/config.cpp @@ -0,0 +1,41 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + name = COMPONENT_NAME; + units[] = { + "Cav_B_C_PlatoonSergeant_Bandit_5_F", + "Cav_B_C_PlatoonLeader_Bandit_6_F", + "Cav_B_C_PlatoonMedic_Bandit_7_F", + + "Cav_B_C_SquadLeader_Bandit_1_F", + "Cav_B_C_SquadLeader_Bandit_2_F", + "Cav_B_C_SquadLeader_Bandit_3_F", + "Cav_B_C_SquadLeader_Bandit_4_F", + + // Groups + "Cav_B_C_Bandit_5_HQ", + "Cav_B_C_Bandit_6_HQ", + "Cav_B_C_Bandit_7_HQ", + "Cav_B_C_Bandit_1_Squad", + "Cav_B_C_Bandit_2_Squad", + "Cav_B_C_Bandit_3_Squad", + "Cav_B_C_Bandit_4_Squad" + }; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "cav_main", + "cav_common", + + "cav_troops_charlie" + }; + author = ECSTRING(main,modteam); + authors[] = {"Brostrom.A (Evul)"}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + }; +}; + +#include "CfgVehicles.hpp" +#include "CfgGroups.hpp" \ No newline at end of file diff --git a/addons/troops_charlie_bandit/script_component.hpp b/addons/troops_charlie_bandit/script_component.hpp new file mode 100644 index 00000000..55e2c10b --- /dev/null +++ b/addons/troops_charlie_bandit/script_component.hpp @@ -0,0 +1,5 @@ +#define COMPONENT troops_charlie_bandit +#define COMPONENT_BEAUTIFIED Charlie Co Bandit Troops + +#include "\z\cav\addons\main\script_mod.hpp" +#include "\z\cav\addons\main\script_macros.hpp" diff --git a/addons/troops_charlie_bandit/stringtable.xml b/addons/troops_charlie_bandit/stringtable.xml new file mode 100644 index 00000000..a128fb73 --- /dev/null +++ b/addons/troops_charlie_bandit/stringtable.xml @@ -0,0 +1,53 @@ + + + + + Platoon Sergeant (Bandit-5) + + + Platoon Leader (Bandit-6) + + + Platoon Medic (Bandit-7) + + + + Squad Leader (Bandit-1) + + + Squad Leader (Bandit-2) + + + Squad Leader (Bandit-3) + + + Squad Leader (Bandit-4) + + + + + + + Squad Bandit-1 + + + Squad Bandit-2 + + + Squad Bandit-3 + + + Squad Bandit-4 + + + + HQ Bandit-5 + + + HQ Bandit-6 + + + HQ Bandit-7 + + + diff --git a/addons/troops_charlie_misfit/$PBOPREFIX$ b/addons/troops_charlie_misfit/$PBOPREFIX$ new file mode 100644 index 00000000..4a3deaf7 --- /dev/null +++ b/addons/troops_charlie_misfit/$PBOPREFIX$ @@ -0,0 +1 @@ +z\cav\addons\troops_charlie_misfit \ No newline at end of file diff --git a/addons/troops_charlie_misfit/CfgGroups.hpp b/addons/troops_charlie_misfit/CfgGroups.hpp new file mode 100644 index 00000000..3086963b --- /dev/null +++ b/addons/troops_charlie_misfit/CfgGroups.hpp @@ -0,0 +1,286 @@ +class CfgGroups { + class West { + class cav_blu_usa_7cav_f { + class Cav_Charlie_Infantry_Squads { + + class Cav_B_C_Misfit_5_HQ { + name = CSTRING(C_Squad_Misfit_5); + icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_PlatoonSergeant_Misfit_5_F"; + }; + }; + class Cav_B_C_Misfit_6_HQ { + name = CSTRING(C_Squad_Misfit_6); + icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_PlatoonLeader_Misfit_6_F"; + }; + }; + class Cav_B_C_Misfit_7_HQ { + name = CSTRING(C_Squad_Misfit_7); + icon = "\A3\ui_f\data\map\markers\nato\b_med.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_PlatoonMedic_Misfit_7_F"; + }; + }; + + class Cav_B_C_Misfit_1_Squad { + name = CSTRING(C_Squad_Misfit_1); + icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_SquadLeader_Misfit_1_F"; + }; + class Unit1 { + position[] = {1.5, -1.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; + }; + class Unit2 { + position[] = {0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; + }; + class Unit3 { + position[] = {-0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Grenadier_F"; + }; + class Unit4 { + position[] = {-1.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Rifleman_F"; + }; + class Unit5 { + position[] = {1.5, -2.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; + }; + class Unit6 { + position[] = {0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; + }; + class Unit7 { + position[] = {-0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_Grenadier_F"; + }; + class Unit8 { + position[] = {-1.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; + }; + }; + class Cav_B_C_Misfit_2_Squad { + name = CSTRING(C_Squad_Misfit_2); + icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_SquadLeader_Misfit_2_F"; + }; + class Unit1 { + position[] = {1.5, -1.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; + }; + class Unit2 { + position[] = {0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; + }; + class Unit3 { + position[] = {-0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Grenadier_F"; + }; + class Unit4 { + position[] = {-1.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Rifleman_F"; + }; + class Unit5 { + position[] = {1.5, -2.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; + }; + class Unit6 { + position[] = {0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; + }; + class Unit7 { + position[] = {-0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_Grenadier_F"; + }; + class Unit8 { + position[] = {-1.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; + }; + }; + class Cav_B_C_Misfit_3_Squad { + name = CSTRING(C_Squad_Misfit_3); + icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_SquadLeader_Misfit_3_F"; + }; + class Unit1 { + position[] = {1.5, -1.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; + }; + class Unit2 { + position[] = {0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; + }; + class Unit3 { + position[] = {-0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Grenadier_F"; + }; + class Unit4 { + position[] = {-1.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Rifleman_F"; + }; + class Unit5 { + position[] = {1.5, -2.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; + }; + class Unit6 { + position[] = {0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; + }; + class Unit7 { + position[] = {-0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_Grenadier_F"; + }; + class Unit8 { + position[] = {-1.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; + }; + }; + class Cav_B_C_Misfit_4_Squad { + name = CSTRING(C_Squad_Misfit_4); + icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; + faction = "cav_blu_usa_7cav_f"; + side = 1; + class Unit0 { + position[] = {0, 0, 0}; + rank = "SERGEANT"; + side = 1; + vehicle = "Cav_B_C_SquadLeader_Misfit_4_F"; + }; + class Unit1 { + position[] = {1.5, -1.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Alpha_FireTeamLeader_F"; + }; + class Unit2 { + position[] = {0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_AutomaticRifleman_F"; + }; + class Unit3 { + position[] = {-0.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Grenadier_F"; + }; + class Unit4 { + position[] = {-1.5, -1.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Alpha_Rifleman_F"; + }; + class Unit5 { + position[] = {1.5, -2.0, 0.0}; + rank = "CORPORAL"; + side = 1; + vehicle = "Cav_B_C_Bravo_FireTeamLeader_F"; + }; + class Unit6 { + position[] = {0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_AutomaticRifleman_F"; + }; + class Unit7 { + position[] = {-0.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_Grenadier_F"; + }; + class Unit8 { + position[] = {-1.5, -2.0, 0.0}; + rank = "PRIVATE"; + side = 1; + vehicle = "Cav_B_C_Bravo_CombatLifeSaver_F"; + }; + }; + }; + }; + }; +}; \ No newline at end of file diff --git a/addons/troops_charlie_misfit/CfgVehicles.hpp b/addons/troops_charlie_misfit/CfgVehicles.hpp new file mode 100644 index 00000000..77cd97b5 --- /dev/null +++ b/addons/troops_charlie_misfit/CfgVehicles.hpp @@ -0,0 +1,72 @@ + +class CfgVehicles { + class Cav_B_C_PlatoonSergeant_F; + class Cav_B_C_PlatoonLeader_F; + class Cav_B_C_PlatoonMedic_F; + class Cav_B_C_SquadLeader_F; + + class Cav_B_C_PlatoonSergeant_Misfit_5_F : Cav_B_C_PlatoonSergeant_F { + _generalMacro = "Cav_B_C_PlatoonSergeant_Misfit_5_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_PlatoonSergeant_Misfit_5); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 2; + }; + class Cav_B_C_PlatoonLeader_Misfit_6_F : Cav_B_C_PlatoonLeader_F { + _generalMacro = "Cav_B_C_PlatoonLeader_Misfit_6_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_PlatoonLeader_Misfit_6); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 2; + }; + class Cav_B_C_PlatoonMedic_Misfit_7_F : Cav_B_C_PlatoonMedic_F { + _generalMacro = "Cav_B_C_PlatoonMedic_Misfit_7_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_PlatoonMedic_Misfit_7); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 2; + }; + + class Cav_B_C_SquadLeader_Misfit_1_F : Cav_B_C_SquadLeader_F { + _generalMacro = "Cav_B_C_SquadLeader_Misfit_1_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_SquadLeader_Misfit_1); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 2; + }; + class Cav_B_C_SquadLeader_Misfit_2_F : Cav_B_C_SquadLeader_F { + _generalMacro = "Cav_B_C_SquadLeader_Misfit_2_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_SquadLeader_Misfit_2); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 2; + }; + class Cav_B_C_SquadLeader_Misfit_3_F : Cav_B_C_SquadLeader_F { + _generalMacro = "Cav_B_C_SquadLeader_Misfit_3_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_SquadLeader_Misfit_3); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 2; + }; + class Cav_B_C_SquadLeader_Misfit_4_F : Cav_B_C_SquadLeader_F { + _generalMacro = "Cav_B_C_SquadLeader_Misfit_4_F"; + scope = 1; + scopeCurator = 0; + displayName = CSTRING(C_SquadLeader_Misfit_4); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + cavPlatoon = 2; + }; +}; diff --git a/addons/charlie_characters_units/config.cpp b/addons/troops_charlie_misfit/config.cpp similarity index 62% rename from addons/charlie_characters_units/config.cpp rename to addons/troops_charlie_misfit/config.cpp index c9aa475b..914fff66 100644 --- a/addons/charlie_characters_units/config.cpp +++ b/addons/troops_charlie_misfit/config.cpp @@ -4,15 +4,6 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = { - "Cav_B_C_PlatoonSergeant_Bandit_5_F", - "Cav_B_C_PlatoonLeader_Bandit_6_F", - "Cav_B_C_PlatoonMedic_Bandit_7_F", - - "Cav_B_C_SquadLeader_Bandit_1_F", - "Cav_B_C_SquadLeader_Bandit_2_F", - "Cav_B_C_SquadLeader_Bandit_3_F", - "Cav_B_C_SquadLeader_Bandit_4_F", - "Cav_B_C_PlatoonSergeant_Misfit_5_F", "Cav_B_C_PlatoonLeader_Misfit_6_F", "Cav_B_C_PlatoonMedic_Misfit_7_F", @@ -22,16 +13,8 @@ class CfgPatches { "Cav_B_C_SquadLeader_Misfit_3_F", "Cav_B_C_SquadLeader_Misfit_4_F", - "Cav_B_C_Weap_SquadLeader_Havoc_1_F", - // Groups - "Cav_B_C_Bandit_5_HQ", - "Cav_B_C_Bandit_6_HQ", - "Cav_B_C_Bandit_7_HQ", - "Cav_B_C_Bandit_1_Squad", - "Cav_B_C_Bandit_2_Squad", - "Cav_B_C_Bandit_3_Squad", - "Cav_B_C_Bandit_4_Squad", + "Cav_B_C_Misfit_5_HQ", "Cav_B_C_Misfit_6_HQ", "Cav_B_C_Misfit_7_HQ", @@ -46,7 +29,7 @@ class CfgPatches { "cav_main", "cav_common", - "cav_charlie_characters" + "cav_troops_charlie" }; author = ECSTRING(main,modteam); authors[] = {"Brostrom.A (Evul)"}; @@ -55,5 +38,6 @@ class CfgPatches { }; }; +#include "CfgEditorSubcategories.hpp" #include "CfgVehicles.hpp" #include "CfgGroups.hpp" \ No newline at end of file diff --git a/addons/troops_charlie_misfit/script_component.hpp b/addons/troops_charlie_misfit/script_component.hpp new file mode 100644 index 00000000..35feec53 --- /dev/null +++ b/addons/troops_charlie_misfit/script_component.hpp @@ -0,0 +1,5 @@ +#define COMPONENT troops_charlie_misfit +#define COMPONENT_BEAUTIFIED Charlie Co Misfit Troops + +#include "\z\cav\addons\main\script_mod.hpp" +#include "\z\cav\addons\main\script_macros.hpp" diff --git a/addons/troops_charlie_misfit/stringtable.xml b/addons/troops_charlie_misfit/stringtable.xml new file mode 100644 index 00000000..6d577621 --- /dev/null +++ b/addons/troops_charlie_misfit/stringtable.xml @@ -0,0 +1,53 @@ + + + + + Platoon Sergeant (Misfit-5) + + + Platoon Leader (Misfit-6) + + + Platoon Medic (Misfit-7) + + + + Squad Leader (Misfit-1) + + + Squad Leader (Misfit-2) + + + Squad Leader (Misfit-3) + + + Squad Leader (Misfit-4) + + + + + + + Squad Misfit-1 + + + Squad Misfit-2 + + + Squad Misfit-3 + + + Squad Misfit-4 + + + + HQ Misfit-5 + + + HQ Misfit-6 + + + HQ Misfit-7 + + + diff --git a/addons/troops_charlie_weapons/CfgEditorSubcategories.hpp b/addons/troops_charlie_weapons/CfgEditorSubcategories.hpp deleted file mode 100644 index 79f9760b..00000000 --- a/addons/troops_charlie_weapons/CfgEditorSubcategories.hpp +++ /dev/null @@ -1,5 +0,0 @@ -class CfgEditorSubcategories { - class Cav_EdSubcat_Personnel_Charlie_Weapons { - displayname = CSTRING(display); - }; -}; \ No newline at end of file diff --git a/addons/troops_charlie_weapons/CfgGroups.hpp b/addons/troops_charlie_weapons/CfgGroups.hpp index 95661a86..866b6688 100644 --- a/addons/troops_charlie_weapons/CfgGroups.hpp +++ b/addons/troops_charlie_weapons/CfgGroups.hpp @@ -1,11 +1,11 @@ class CfgGroups { class West { - class BLU_USA_7CAV_F { + class cav_blu_usa_7cav_f { class Cav_Charlie_Infantry_Squads { class Cav_B_C_Weapons_Basic_Squad { name = CSTRING(basic_squad); icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -65,7 +65,7 @@ class CfgGroups { class Cav_B_C_Weapons_1_4_Squad { name = CSTRING(1_4_squad); icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; @@ -125,7 +125,7 @@ class CfgGroups { class Cav_B_C_Weapons_2_4_Squad { name = CSTRING(2_4_squad); icon = "\A3\ui_f\data\map\markers\nato\b_inf.paa"; - faction = "BLU_USA_7CAV_F"; + faction = "cav_blu_usa_7cav_f"; side = 1; class Unit0 { position[] = {0, 0, 0}; diff --git a/addons/troops_charlie_weapons/CfgVehicles.hpp b/addons/troops_charlie_weapons/CfgVehicles.hpp index 510d8113..8583fddd 100644 --- a/addons/troops_charlie_weapons/CfgVehicles.hpp +++ b/addons/troops_charlie_weapons/CfgVehicles.hpp @@ -1,6 +1,6 @@ class CfgVehicles { - class Cav_B_base_F; - class Cav_B_Charlie_Weapons_base_F : Cav_B_base_F { + class Cav_B_Charlie_Weap_base_F; + class Cav_B_Charlie_Weapons_base_F : Cav_B_Charlie_Weap_base_F { _generalMacro = "Cav_B_Charlie_Weapons_base_F"; scope = 1; scopeCurator = 0; @@ -45,6 +45,8 @@ class CfgVehicles { "rhsusf_ANPVS_14" }; }; + + class Cav_B_C_Weapons_SquadLeader_F : Cav_B_Charlie_Weapons_base_F { _generalMacro = "Cav_B_C_Weapons_SquadLeader_F"; scope = 2; @@ -56,6 +58,18 @@ class CfgVehicles { icon = "iconManLeader"; }; + + class Cav_B_C_Weapons_Trooper_F : Cav_B_Charlie_Weapons_base_F { + _generalMacro = "Cav_B_C_Weapons_M240B_Machinegunner_F"; + scope = 2; + scopeCurator = 0; + displayName = CSTRING(m240b_machinegunner); + author = ECSTRING(main,modteam); + //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); + + icon = "iconManMG"; + }; + class Cav_B_C_Weapons_M240B_FireTeamLeader_F : Cav_B_Charlie_Weapons_base_F { _generalMacro = "Cav_B_C_Weapons_FireTeamLeader_F"; scope = 2; @@ -181,7 +195,7 @@ class CfgVehicles { author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); }; - class Cav_B_C_Weapons_Alpha_Trooper_2_F : Cav_B_C_Weapons_M240B_Machinegunner_F { + class Cav_B_C_Weapons_Alpha_Trooper_2_F : Cav_B_C_Weapons_Trooper_F { _generalMacro = "Cav_B_C_Weapons_Alpha_Trooper_1_F"; scope = 1; scopeCurator = 0; @@ -189,7 +203,7 @@ class CfgVehicles { author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); }; - class Cav_B_C_Weapons_Alpha_Trooper_3_F : Cav_B_C_Weapons_M240B_Machinegunner_F { + class Cav_B_C_Weapons_Alpha_Trooper_3_F : Cav_B_C_Weapons_Trooper_F { _generalMacro = "Cav_B_C_Weapons_Alpha_Trooper_1_F"; scope = 1; scopeCurator = 0; @@ -197,7 +211,7 @@ class CfgVehicles { author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); }; - class Cav_B_C_Weapons_Alpha_Trooper_4_F : Cav_B_C_Weapons_M240B_Machinegunner_F { + class Cav_B_C_Weapons_Alpha_Trooper_4_F : Cav_B_C_Weapons_Trooper_F { _generalMacro = "Cav_B_C_Weapons_Alpha_Trooper_1_F"; scope = 1; scopeCurator = 0; @@ -214,7 +228,7 @@ class CfgVehicles { author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); }; - class Cav_B_C_Weapons_Bravo_Trooper_2_F : Cav_B_C_Weapons_M240B_Machinegunner_F { + class Cav_B_C_Weapons_Bravo_Trooper_2_F : Cav_B_C_Weapons_Trooper_F { _generalMacro = "Cav_B_C_Weapons_Bravo_Trooper_1_F"; scope = 1; scopeCurator = 0; @@ -222,7 +236,7 @@ class CfgVehicles { author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); }; - class Cav_B_C_Weapons_Bravo_Trooper_3_F : Cav_B_C_Weapons_M240B_Machinegunner_F { + class Cav_B_C_Weapons_Bravo_Trooper_3_F : Cav_B_C_Weapons_Trooper_F { _generalMacro = "Cav_B_C_Weapons_Bravo_Trooper_1_F"; scope = 1; scopeCurator = 0; @@ -230,7 +244,7 @@ class CfgVehicles { author = ECSTRING(main,modteam); //editorPreview = QPATHTOF(EditorPreviews\I_Cav_Charlie_Rifleman_F.jpg); }; - class Cav_B_C_Weapons_Bravo_Trooper_4_F : Cav_B_C_Weapons_M240B_Machinegunner_F { + class Cav_B_C_Weapons_Bravo_Trooper_4_F : Cav_B_C_Weapons_Trooper_F { _generalMacro = "Cav_B_C_Weapons_Bravo_Trooper_1_F"; scope = 1; scopeCurator = 0; diff --git a/addons/troops_charlie_weapons/config.cpp b/addons/troops_charlie_weapons/config.cpp index e72dc4d6..768a1b30 100644 --- a/addons/troops_charlie_weapons/config.cpp +++ b/addons/troops_charlie_weapons/config.cpp @@ -32,6 +32,5 @@ class CfgPatches { }; }; -#include "CfgEditorSubcategories.hpp" #include "CfgVehicles.hpp" #include "CfgGroups.hpp" \ No newline at end of file diff --git a/addons/troops_training/CfgVehicles.hpp b/addons/troops_training/CfgVehicles.hpp index c1c3c75d..a853ceb0 100644 --- a/addons/troops_training/CfgVehicles.hpp +++ b/addons/troops_training/CfgVehicles.hpp @@ -1,7 +1,7 @@ class CfgVehicles { - class Cav_B_base_F; - class Cav_B_Training_base_F : Cav_B_base_F { + class Cav_B_Soldier_base_F; + class Cav_B_Training_base_F : Cav_B_Soldier_base_F { _generalMacro = "Cav_B_Training_base_F"; scope = 1; scopeCurator = 0;