GB 1032 (CTE) Update (#7)

* Updated for 1032 CTE * Updated AI loadouts * Updated existing missions * Minor changes in objectives code * New game mode - BreakThrough - a spin on BreakOut where the objective is to traverse the map * Added Kill Confirmed on 747 * Added game mode descriptions * Removed the unnecessary secondary objective from KC
JakBaranowski · Dec 12, 2021 · 065c519 · 065c519
1 parent 34825ff
commit 065c519
Show file tree

Hide file tree

Showing 63 changed files with 1,467 additions and 367 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,23 +25,31 @@
 GroundBranch/Content/GroundBranch/Lua/Assassination.lua
 GroundBranch/Content/GroundBranch/Lua/Bomb.lua
 GroundBranch/Content/GroundBranch/Lua/Deathmatch.lua
+GroundBranch/Content/GroundBranch/Lua/DeathmatchValidate.lua
 GroundBranch/Content/GroundBranch/Lua/Defuse.lua
+GroundBranch/Content/GroundBranch/Lua/DTAS.lua
+GroundBranch/Content/GroundBranch/Lua/DTASValidate.lua
 GroundBranch/Content/GroundBranch/Lua/Flag.lua
 GroundBranch/Content/GroundBranch/Lua/IntelRetrieval.lua
+GroundBranch/Content/GroundBranch/Lua/IntelRetrievalValidate.lua
 GroundBranch/Content/GroundBranch/Lua/IntelTarget.lua
 GroundBranch/Content/GroundBranch/Lua/Laptop.lua
 GroundBranch/Content/GroundBranch/Lua/TeamElimination.lua
+GroundBranch/Content/GroundBranch/Lua/TeamEliminationValidate.lua
 GroundBranch/Content/GroundBranch/Lua/TerroristHunt.lua
+GroundBranch/Content/GroundBranch/Lua/TerroristHuntValidate.lua
 GroundBranch/Content/GroundBranch/Lua/Training.lua
 GroundBranch/Content/GroundBranch/Lua/Testing.lua
 GroundBranch/Content/GroundBranch/Lua/Uplink.lua
 GroundBranch/Content/GroundBranch/Lua/UplinkTarget.lua
+GroundBranch/Content/GroundBranch/Lua/UplinkValidate.lua
 ## Default mission setups
-GroundBranch/Content/GroundBranch/Mission/*/Deathmatch.mis
-GroundBranch/Content/GroundBranch/Mission/*/IntelRetrieval.mis
-GroundBranch/Content/GroundBranch/Mission/*/TeamElimination.mis
-GroundBranch/Content/GroundBranch/Mission/*/TerroristHunt.mis
-GroundBranch/Content/GroundBranch/Mission/*/Uplink.mis
+GroundBranch/Content/GroundBranch/Mission/*/Deathmatch*.mis
+GroundBranch/Content/GroundBranch/Mission/*/DTAS*.mis
+GroundBranch/Content/GroundBranch/Mission/*/IntelRetrieval*.mis
+GroundBranch/Content/GroundBranch/Mission/*/TeamElimination*.mis
+GroundBranch/Content/GroundBranch/Mission/*/TerroristHunt*.mis
+GroundBranch/Content/GroundBranch/Mission/*/Uplink*.mis
 GroundBranch/Content/GroundBranch/Mission/*/Training.mis
 ## Default player loadouts
 GroundBranch/Content/GroundBranch/DefaultLoadouts/Blue.kit
@@ -52,12 +60,12 @@ GroundBranch/Content/GroundBranch/DefaultLoadouts/NoTeam.kit
 GroundBranch/Content/GroundBranch/DefaultLoadouts/Red.kit
 GroundBranch/Content/GroundBranch/DefaultLoadouts/Red.res
 ## Default AI loadouts
-GroundBranch/Content/GroundBranch/AI/Loadouts/*BadGuys/BadGuys*.kit
-GroundBranch/Content/GroundBranch/AI/Loadouts/*BadGuys/BGLowVis_*.kit
-GroundBranch/Content/GroundBranch/AI/Loadouts/*BadGuys/BGMilitant_*.kit
+GroundBranch/Content/GroundBranch/AI/Loadouts/BadGuys/*.kit
 ## Default localization
 GroundBranch/Content/Localization/GroundBranch/en/Assassination.csv
+GroundBranch/Content/Localization/GroundBranch/en/Deathmatch.csv
 GroundBranch/Content/Localization/GroundBranch/en/Defuse.csv
+GroundBranch/Content/Localization/GroundBranch/en/DTAS.csv
 GroundBranch/Content/Localization/GroundBranch/en/GameMode.csv
 GroundBranch/Content/Localization/GroundBranch/en/GroundBranch.locres
 GroundBranch/Content/Localization/GroundBranch/en/IntelRetrieval.csv
@@ -72,8 +80,6 @@ GroundBranch/Content/Localization/GroundBranch/en/Uplink.csv
 GroundBranch/Content/GroundBranch/Lua/Rendezvous.lua
 GroundBranch/Content/Localization/GroundBranch/en/Rendezvous.csv
 GroundBranch/Content/GroundBranch/Mission/*/Rendezvous.mis
-## DTAS
-GroundBranch/Content/Localization/GroundBranch/en/DTAS.csv
 ## Simple mission generator
 GroundBranch/Content/GroundBranch/Lua/GeneralBombTarget.lua
 GroundBranch/Content/GroundBranch/Lua/GeneralLaptopTarget.lua

diff --git a/All.gbm b/All.gbm
@@ -1,6 +1,6 @@
 {
     "name" : "All",
-    "version" : "0.3.22",
+    "version" : "1032.3.25",
     "dependencies" : [
         "Common.gbm",
         "KillConfirmed.gbm",

diff --git a/BreakOut.gbm b/BreakOut.gbm
@@ -1,6 +1,6 @@
 {
     "name" : "BreakOut",
-    "version" : "0.3.22",
+    "version" : "1032.3.25",
     "dependencies" : [
         "Common.gbm"
     ],

diff --git a/BreakThrough.gbm b/BreakThrough.gbm
@@ -0,0 +1,12 @@
+{
+    "name" : "BreakOut",
+    "version" : "1032.3.25",
+    "dependencies" : [
+        "Common.gbm"
+    ],
+    "files" : [
+        "GroundBranch/Content/GroundBranch/Mission/*/BreakThrough.mis"
+        "GroundBranch/Content/GroundBranch/Lua/BreakThrough.lua",
+        "GroundBranch/Content/Localization/GroundBranch/en/BreakThrough.csv",
+    ]
+}
diff --git a/Common.gbm b/Common.gbm
@@ -1,6 +1,6 @@
 {
     "name" : "All",
-    "version" : "0.3.22",
+    "version" : "1032.3.25",
     "dependencies" : [],
     "globs" : [
 

diff --git a/GroundBranch/Content/GroundBranch/AI/Loadouts/EurAsi/HVT_AR_BLACK.kit b/GroundBranch/Content/GroundBranch/AI/Loadouts/EurAsi/HVT_AR_BLACK.kit
@@ -2,33 +2,73 @@
 	"Ver": 9,
 	"Data": [
         {
-			"Type": "HeadGear",
-			"Item": "HeadGear:BP_Hat_UtilityCover",
-			"Skin": "Black"
-		},
-		{
-            "Item": "PrimaryFirearm:BP_AK74_MI",
-            "Children": [
-                {
-                    "Item": "Magazine:BP_AK545_Magazine",
-                    "Well": "MagWell_AK545"
-                },
-                {
-                    "Item": "Sight:BP_Magnifier",
-                    "Rail": "RearSightRail",
-                    "Slot": 1
-                },
+            "Type": "Profile",
+			"Data": [
                 {
-                    "Item": "Sight:BP_MicroT2_Tall",
-                    "Rail": "RearSightRail",
-                    "Slot": 8
-                },
+                    "Type": "Head",
+                    "Item": "Head:BP_Rebel_Head_01"
+                }
+            ]
+        },
+        {
+			"Type": "Weapons",
+			"Data": [
                 {
-                    "Item": "RailAttachment:BP_TDStubby_VertGrip",
-                    "Rail": "BottomRail",
-                    "Slot": 3
+                    "Type": "PrimaryFirearm",
+                    "Item": "PrimaryFirearm:BP_AK74_MI",
+                    "Children": [
+                        {
+                            "Item": "Magazine:BP_AK545_Magazine",
+                            "Well": "MagWell_AK545"
+                        },
+                        {
+                            "Item": "Sight:BP_Magnifier",
+                            "Rail": "RearSightRail",
+                            "Slot": 1
+                        },
+                        {
+                            "Item": "Sight:BP_MicroT2_Tall",
+                            "Rail": "RearSightRail",
+                            "Slot": 8
+                        },
+                        {
+                            "Item": "RailAttachment:BP_TDStubby_VertGrip",
+                            "Rail": "BottomRail",
+                            "Slot": 3
+                        }
+                    ]
                 }
             ]
+        },
+        {
+			"Type": "Gear",
+			"Data": [
+                {
+					"Type": "Platform",
+					"Item": "Platform:BP_RuSpec_Vest"
+				},
+				{
+					"Type": "Pouch",
+					"Item": "Pouch:BP_RuSpec_Equipment"
+				}
+            ]
+		},
+        {
+			"Type": "Outfit",
+			"Data": [
+                {
+					"Type": "Shirt",
+					"Item": "Shirt:BP_RuSpec_Sleeve"
+				},
+				{
+					"Type": "Pants",
+					"Item": "Pants:BP_RuSpec_Pants"
+				},
+				{
+					"Type": "Gloves",
+					"Item": "Gloves:BP_RuSpec_Gloves"
+				}
+			]
 		}
 	]
 }
diff --git a/GroundBranch/Content/GroundBranch/AI/Loadouts/EurAsi/HVT_AR_WDLND.kit b/GroundBranch/Content/GroundBranch/AI/Loadouts/EurAsi/HVT_AR_WDLND.kit
@@ -2,33 +2,73 @@
 	"Ver": 9,
 	"Data": [
         {
-			"Type": "HeadGear",
-			"Item": "HeadGear:BP_Hat_UtilityCover",
-			"Skin": "Woodland"
-		},
-		{
-            "Item": "PrimaryFirearm:BP_AK74_MI",
-            "Children": [
-                {
-                    "Item": "Magazine:BP_AK545_Magazine",
-                    "Well": "MagWell_AK545"
-                },
-                {
-                    "Item": "Sight:BP_Magnifier",
-                    "Rail": "RearSightRail",
-                    "Slot": 1
-                },
+            "Type": "Profile",
+			"Data": [
                 {
-                    "Item": "Sight:BP_MicroT2_Tall",
-                    "Rail": "RearSightRail",
-                    "Slot": 8
-                },
+                    "Type": "Head",
+                    "Item": "Head:BP_Rebel_Head_01"
+                }
+            ]
+        },
+        {
+			"Type": "Weapons",
+			"Data": [
                 {
-                    "Item": "RailAttachment:BP_TDStubby_VertGrip",
-                    "Rail": "BottomRail",
-                    "Slot": 3
+                    "Type": "PrimaryFirearm",
+                    "Item": "PrimaryFirearm:BP_AK74_MI",
+                    "Children": [
+                        {
+                            "Item": "Magazine:BP_AK545_Magazine",
+                            "Well": "MagWell_AK545"
+                        },
+                        {
+                            "Item": "Sight:BP_Magnifier",
+                            "Rail": "RearSightRail",
+                            "Slot": 1
+                        },
+                        {
+                            "Item": "Sight:BP_MicroT2_Tall",
+                            "Rail": "RearSightRail",
+                            "Slot": 8
+                        },
+                        {
+                            "Item": "RailAttachment:BP_TDStubby_VertGrip",
+                            "Rail": "BottomRail",
+                            "Slot": 3
+                        }
+                    ]
                 }
             ]
+        },
+        {
+			"Type": "Gear",
+			"Data": [
+                {
+					"Type": "Platform",
+					"Item": "Platform:BP_RuSpec_Vest"
+				},
+				{
+					"Type": "Pouch",
+					"Item": "Pouch:BP_RuSpec_Equipment"
+				}
+            ]
+		},
+        {
+			"Type": "Outfit",
+			"Data": [
+                {
+					"Type": "Shirt",
+					"Item": "Shirt:BP_RuSpec_Sleeve"
+				},
+				{
+					"Type": "Pants",
+					"Item": "Pants:BP_RuSpec_Pants"
+				},
+				{
+					"Type": "Gloves",
+					"Item": "Gloves:BP_RuSpec_Gloves"
+				}
+			]
 		}
 	]
 }
diff --git a/GroundBranch/Content/GroundBranch/AI/Loadouts/EurAsi/HVT_CQB_BLACK.kit b/GroundBranch/Content/GroundBranch/AI/Loadouts/EurAsi/HVT_CQB_BLACK.kit
@@ -2,28 +2,68 @@
 	"Ver": 9,
 	"Data": [
         {
-			"Type": "HeadGear",
-			"Item": "HeadGear:BP_Hat_UtilityCover",
-			"Skin": "Black"
-		},
-		{
-            "Item": "PrimaryFirearm:BP_AK74_MI_CQB",
-            "Children": [
-                {
-                    "Item": "Magazine:BP_AK545_Magazine",
-                    "Well": "MagWell_AK545"
-                },
+            "Type": "Profile",
+			"Data": [
                 {
-                    "Item": "Sight:BP_MicroT2",
-                    "Rail": "RearSightRail",
-                    "Slot": 2
-                },
+                    "Type": "Head",
+                    "Item": "Head:BP_Rebel_Head_01"
+                }
+            ]
+        },
+        {
+			"Type": "Weapons",
+			"Data": [
                 {
-                    "Item": "RailAttachment:BP_TDStubby_VertGrip",
-                    "Rail": "BottomRail",
-                    "Slot": 4
+                    "Type": "PrimaryFirearm",
+                    "Item": "PrimaryFirearm:BP_AK74_MI_CQB",
+                    "Children": [
+                        {
+                            "Item": "Magazine:BP_AK545_Magazine",
+                            "Well": "MagWell_AK545"
+                        },
+                        {
+                            "Item": "Sight:BP_MicroT2",
+                            "Rail": "RearSightRail",
+                            "Slot": 2
+                        },
+                        {
+                            "Item": "RailAttachment:BP_TDStubby_VertGrip",
+                            "Rail": "BottomRail",
+                            "Slot": 4
+                        }
+                    ]
                 }
             ]
+        },
+        {
+			"Type": "Gear",
+			"Data": [
+                {
+					"Type": "Platform",
+					"Item": "Platform:BP_RuSpec_Vest"
+				},
+				{
+					"Type": "Pouch",
+					"Item": "Pouch:BP_RuSpec_Equipment"
+				}
+            ]
+		},
+        {
+			"Type": "Outfit",
+			"Data": [
+                {
+					"Type": "Shirt",
+					"Item": "Shirt:BP_RuSpec_Sleeve"
+				},
+				{
+					"Type": "Pants",
+					"Item": "Pants:BP_RuSpec_Pants"
+				},
+				{
+					"Type": "Gloves",
+					"Item": "Gloves:BP_RuSpec_Gloves"
+				}
+			]
 		}
 	]
 }