From e1d293c87538fe981bf61c7e713e047bd4f6175d Mon Sep 17 00:00:00 2001
From: Aristeas <94058548+ari-steas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:53:58 -0500
Subject: [PATCH] Clean up block categories

---
 .../Data/Scripts/Additions/PointAdditions.cs  |   2 +-
 .../BlockCategories_StarCoreCorporate.sbc     | 356 +++++++++---------
 2 files changed, 180 insertions(+), 178 deletions(-)

diff --git a/Gamemode Mods/Starcore_Pointslist/Data/Scripts/Additions/PointAdditions.cs b/Gamemode Mods/Starcore_Pointslist/Data/Scripts/Additions/PointAdditions.cs
index 221218d6e..c5a54d2bc 100644
--- a/Gamemode Mods/Starcore_Pointslist/Data/Scripts/Additions/PointAdditions.cs	
+++ b/Gamemode Mods/Starcore_Pointslist/Data/Scripts/Additions/PointAdditions.cs	
@@ -768,7 +768,7 @@ internal class PointAdditions : MySessionComponentBase
             ["Heat_Heatsink"] = 10,
             ["Heat_FlatRadiator"] = 10,
 			["ActiveRadiator"] = 250,
-			["RadiatorPanel"] = 5,
+			["RadiatorPanel"] = 10,
 			["ExtendableRadiatorBase"] = 5,
             #endregion
         };
diff --git a/Utility Mods/StarCore Tournament Weapon Category/Data/BlockCategories_StarCoreCorporate.sbc b/Utility Mods/StarCore Tournament Weapon Category/Data/BlockCategories_StarCoreCorporate.sbc
index 99d8c16c0..9acfa59a7 100644
--- a/Utility Mods/StarCore Tournament Weapon Category/Data/BlockCategories_StarCoreCorporate.sbc	
+++ b/Utility Mods/StarCore Tournament Weapon Category/Data/BlockCategories_StarCoreCorporate.sbc	
@@ -8,86 +8,150 @@
       <Id>
         <TypeId>GuiBlockCategoryDefinition</TypeId>
       </Id>
-      <DisplayName>SC [All Access]</DisplayName>
-      <Name>.SC_.[All Access]</Name>
+      <DisplayName>SC [All Access] Utility</DisplayName>
+      <Name>.SC_.[ALL]_A</Name>
       <StrictSearch>true</StrictSearch>
       <ItemIds>
 
-        <!--BAR-->
+		<string>GravityGenerator</string>
+		<string>Door</string>
+		<string>AirtightHangarDoor</string>
+		<string>SurvivalKitLarge</string>
+		<string>SmallLight</string>
+		<string>LargeBlockFrontLight</string>
+
+        <string>SC_PowerControlSystem_L</string>
+        <string>SC_RCS_Computer</string>
+
+        <string>LargeBlockConveyorPipeJunction</string>
+        <string>LargeBlockConveyor</string>
+        <string>ConveyorTube</string>
+        <string>ConveyorTubeDuct</string>
+
+        <string>MA_Buster_ArmorBlock</string>
+
+        <string>LargeDecoy</string>
+        <string>LargeBlockRadioAntenna</string>
+        <string>LargeFlightMovement</string>
+
+        <string>LargeTurretControlBlock</string>
+
         <string>SELtdLargeNanobotBuildAndRepairSystem</string>
-		  
-		<!-- S.I -->
-        <string>FieldGen_Core</string>
-        <string>FieldGen_Capacity_Upgrade</string>
+
+		<string>LargeProgrammableBlock</string>
+		<string>6SidePB</string>
+		<string>LargeBlockRemoteControl</string>
+
+        <string>DampeningEnhancer_x2_Large</string>
+        <string>LargeStator</string>
+        <string>WorklightSmall</string>
+
+      </ItemIds>
+    </Category>
+
+    <Category xsi:type="MyObjectBuilder_GuiBlockCategoryDefinition">
+      <Id>
+        <TypeId>GuiBlockCategoryDefinition</TypeId>
+      </Id>
+      <DisplayName>  [ALL] Mobility</DisplayName>
+      <Name>.SC_.[ALL]_B</Name>
+      <StrictSearch>true</StrictSearch>
+      <ItemIds>
+
 
         <!--INVALID-->
-        <string>MA_Afterburner_Large_5x</string>
         <string>SC_SRB</string>
         <string>DETPAK</string>
+        <string>MA_Afterburner_Large_5x</string>
         <string>AncientAfterburnerT40</string>
-        <string>LargeDecoy_MetalFoam</string>
 
-        <!--WYSEMAN-->
-        <string>SC_Flare</string>
+        <string>BlinkDriveLarge</string>
 
-        <!--MUZZ-->
-        <string>Starcore_RWR_Projectiles</string>
+        <string>LargeBlockGyro</string>
+        <string>AQD_LG_GyroBooster</string>
+        <string>AQD_LG_LargeGyro</string>
+        <string>AQD_LG_GyroUpgrade</string>
 
-        <!--FUSION-->
-        <string>Caster_Accelerator_0</string>
-        <string>Caster_Accelerator_90</string>
-        <string>Caster_Feeder</string>
-        <string>Caster_CentralPipe_0</string>
-        <string>Caster_CentralPipe_90</string>
-        <string>Caster_CentralPipe_T</string>
+		<string>LargeBlockLargeThrust</string>
+        <string>HugeHydrogenThruster</string>
+        <string>AWGFocusDrive</string>
+        <string>IonHeavyCovered</string>
+
+		<!-- Fusion Thruster -->
         <string>Caster_FocusLens</string>
-        <string>Caster_Reactor</string>
 
-        <!--MORE UTILITY STUFF-->
-        <string>SC_RCS_Computer</string>
-        <string>DampeningEnhancer_x2_Large</string>
-        <string>SC_PowerControlSystem_L</string>
-        <string>LargeLargeBlockUpgrade</string>
-        <string>AQD_LG_GyroBooster</string>
-        <string>AQD_LG_GyroUpgrade</string>
+        <string>LargeHydrogenTank</string>
+        <string>LargeHydrogenTankSmall</string>
+
+      </ItemIds>
+    </Category>
+
+    <Category xsi:type="MyObjectBuilder_GuiBlockCategoryDefinition">
+      <Id>
+        <TypeId>GuiBlockCategoryDefinition</TypeId>
+      </Id>
+      <DisplayName>  [ALL] Defense</DisplayName>
+      <Name>.SC_.[ALL]_C</Name>
+      <StrictSearch>true</StrictSearch>
+      <ItemIds>
+
+		<!-- S.I -->
+        <string>FieldGen_Core</string>
+        <string>FieldGen_Capacity_Upgrade</string>
+
+        <!--MUZZ-->
+        <string>Starcore_RWR_Projectiles</string>
         <string>SC_Radome</string>
-        <string>WorklightSmall</string>
-        <string>BlinkDriveLarge</string>
+
         <string>Mk25Rangefinder</string>
-		
-        <string>GIGA_BLASTPLATE</string>
 
+        <string>3x3_Blastplate_A</string>
+        <string>3x3_Blastplate_B</string>
+        <string>3x3_Blastplate_C</string>
+        <string>ACTIVE_BLASTPLATE</string>
+
+        <string>SC_Flare</string>
+		<string>LargeDecoy_MetalFoam</string>
+
+		<string>DSControlLarge</string>
+		<string>EmitterL</string>
+		<string>LargeShieldModulator</string>
+		<string>LargeEnhancer</string>
+
+		<string>Barbette5x5</string>
+
+      </ItemIds>
+    </Category>
+
+    <Category xsi:type="MyObjectBuilder_GuiBlockCategoryDefinition">
+      <Id>
+        <TypeId>GuiBlockCategoryDefinition</TypeId>
+      </Id>
+      <DisplayName>  [ALL] Power</DisplayName>
+      <Name>.SC_.[ALL]_D</Name>
+      <StrictSearch>true</StrictSearch>
+      <ItemIds>
+
+        <string>LargeBlockSolarPanel</string>
+        <string>LargeBlockBatteryBlock</string>
+        <string>LargeBlockSmallGenerator</string>
+        <string>SmallLargeBlockUpgrade</string>
+        <string>LargeBlockLargeGenerator</string>
+        <string>LargeLargeBlockUpgrade</string>
+
+		<!--FUSION-->
+        <string>Caster_Accelerator_0</string>
+        <string>Caster_CentralPipe_0</string>
+        <string>Caster_Reactor</string>
+        <string>RadiatorPanel</string>
+        <string>Heat_Heatsink</string>
 
       </ItemIds>
     </Category>
 
-    <!--<Category xsi:type="MyObjectBuilder_GuiBlockCategoryDefinition">-->
-    <!--<Id>-->
-    <!--<TypeId>GuiBlockCategoryDefinition</TypeId>-->
-
-    <!--</Id>-->
-    <!--<DisplayName>[TIO]</DisplayName>-->
-    <!--<Name>[TIO]</Name>-->
-    <!--<StrictSearch>true</StrictSearch>-->
-    <!--<ItemIds>-->
-
-    <!--[TIO]-->
-    <!--<string>APE_Strong</string>-->
-    <!--<string>Priest_Block</string>-->
-    <!--<string>Reaver_Coilgun</string>-->
-    <!--<string>Fixed_Rockets</string>-->
-    <!--<string>Devastator_Torp</string>-->
-    <!--<string>Type18_Artillery</string>-->
-    <!--<string>Type19_Driver</string>-->
-    <!--<string>Type21_Artillery</string>-->
-    <!--<string>Type22_Driver</string>-->
-    <!--<string>Type24_Artillery</string>-->
-    <!--<string>Type25_Driver</string>-->
-    <!--<string>longsword</string>-->
-
-
-    <!--</ItemIds>-->
-    <!--</Category>-->
+
+
+
 
     <Category xsi:type="MyObjectBuilder_GuiBlockCategoryDefinition">
       <Id>
@@ -99,18 +163,11 @@
       <ItemIds>
 
         <!--[40K]-->
-        <string>NovaCannon</string>
-        <string>GothicTorp</string>
-        <string>MacroCannon</string>
+        <string>AegisFlakTurret</string>
+		<string>MacroCannon</string>
         <string>HeavyMacroCannon</string>
-        <string>FixedLance</string>
         <string>LanceBattery</string>
-        <string>LanceLightBattery</string>
-        <string>LanceHeavyBattery</string>
-        <string>MacroTurret</string>
-        <string>MacroLightTurret</string>
-        <string>MacroHeavyTurret</string>
-        <string>AegisFlakTurret</string>
+        <string>NovaCannon</string>
 
       </ItemIds>
     </Category>
@@ -126,22 +183,15 @@
       <ItemIds>
 
         <!--[MID]-->
+		<string>Priest_Block</string>
+		<string>PriestReskin_Block</string>
+		<string>Reaver_Coilgun</string>
+		<string>Assault_Coil_Turret</string>
         <string>DualSnubLaserTurret</string>
-        <string>UnguidedRocketTurret</string>
         <string>DualPulseLaserTurret</string>
-        <string>DrunkRocketTurret</string>
-        <string>Reaver_Coilgun</string>
-		<!--[raider]-->
-        <string>Assault_Coil_Turret</string>
-        <string>APE_Strong</string>
-        <string>Devastator_Torp</string>
-        <string>Priest_Block</string>
-        <string>Type18_Artillery</string>
-        <string>Type19_Driver</string>
-        <string>Type21_Artillery</string>
-        <string>Type22_Driver</string>
-        <string>Type24_Artillery</string>
-        <string>Type25_Driver</string>
+		<string>APE_Strong</string>
+		<string>Type18_Artillery</string>
+		<string>Devastator_Torp</string>
 
       </ItemIds>
     </Category>
@@ -151,23 +201,17 @@
         <TypeId>GuiBlockCategoryDefinition</TypeId>
 
       </Id>
-      <DisplayName>  [FLAW]</DisplayName>
-      <Name>.SC_[FLAW]</Name>
+      <DisplayName>  [FLW]</DisplayName>
+      <Name>.SC_[FLW]</Name>
       <StrictSearch>true</StrictSearch>
       <ItemIds>
 
-        <!--[FLAW]-->
+        <!--[FLW]-->
         <string>LargeRailgun_SC</string>
         <string>GoalieCasemate</string>
-        <string>KreegMagnetarCannon</string>
-        <string>Thagomizer</string>
-        <string>HeavyFighterBay</string>
-        <string>HeavyCarronade_5x5_Turret</string>
-        <string>X4_7x7_HeavyTurret</string>
-        <string>VindicatorKineticLance</string>
-        <string>HadeanPlasmaBlastgun</string>
-        <string>JN_175Fixed</string>
-        <string>longsword</string>
+		<string>X4_7x7_HeavyTurret</string>
+		<string>HeavyCarronade_5x5_Turret</string>
+		<string>JN_175Fixed</string>
 
       </ItemIds>
     </Category>
@@ -183,18 +227,14 @@
       <ItemIds>
 
         <!--[MA]-->
-        <string>MA_Fixed_T3</string>
+		<string>MA_PDX</string>
+		<string>MA_Gimbal_Laser</string>
+        <string>UNN_Heavy_Torpedo</string>
+        <string>MA_AC150</string>
         <string>MA_Gimbal_Laser_T2</string>
-        <string>MA_Gladius</string>
-        <string>MA_Guardian</string>
-        <string>MA_Derecho</string>
-        <string>MCRN_Heavy_Torpedo</string>
         <string>MA_T2PDX</string>
-        <string>MA_AC150</string>
-        <string>MA_Gimbal_Laser</string>
-        <string>MA_PDX</string>
-        <string>MA_Tiger</string>
-        <string>UNN_Heavy_Torpedo</string>
+        <string>MA_Derecho</string>
+        <string>MA_Gladius</string>
 
       </ItemIds>
     </Category>
@@ -210,20 +250,13 @@
       <ItemIds>
 
         <!--[NHI]-->
-        <string>NHI_Heavy_Gun_Turret</string>
-        <string>NHI_Autocannon_Turret</string>
-        <string>NHI_Fixed_Autocannon</string>
         <string>NHI_PD_Turret</string>
+        <string>NHI_Gatling_Laser_Turret</string>
+		<string>NHI_Autocannon_Turret</string>
         <string>NHI_Kinetic_Cannon_Turret</string>
-        <string>NHI_Fixed_Gatling_Laser</string>
-        <string>SC_Coil_Cannon</string>
-        <string>NHI_Mk1_Cannon_Turret</string>
         <string>NHI_Mk2_Cannon_Turret</string>
-        <string>NHI_Mk3_Cannon_Turret</string>
-        <string>NHI_Light_Railgun_Turret</string>
-        <string>NHI_Gatling_Laser_Turret</string>
-        <string>NHI_Light_Autocannon_Turret</string>
-
+        <string>SC_Coil_Cannon</string>
+		<string>NHI_Mk3_Cannon_Turret</string>
 
       </ItemIds>
     </Category>
@@ -238,16 +271,10 @@
       <ItemIds>
 
         <!--[ONYX]-->
-        <string>SC_AR_Eris</string>
-        <string>SC_AR_MagnaStar</string>
         <string>SC_AR_Tumult</string>
-        <string>SC_AR_Afflictor</string>
-        <string>SC_AR_Afflictor_Slanted</string>
         <string>SC_AR_Deimos</string>
-        <string>SC_AR_FocusedBeam</string>
         <string>SC_AR_Forager</string>
-        <string>SC_AR_Heliod</string>
-        <string>SC_AR_Phobos</string>
+        <string>SC_AR_Eris</string>
 
       </ItemIds>
     </Category>
@@ -263,17 +290,12 @@
       <ItemIds>
 
         <!--[SA]-->
-        <string>K_SA_HeavyMetal_Gauss_A</string>
-        <string>K_SA_HeavyMetal_Gauss_ERII</string>
-        <string>K_SA_HeavyMetal_Gauss_PGBC</string>
         <string>SA_HMI_Erebos</string>
-        <string>Hellfire_Laser_Block</string>
-        <string>K_SA_HeavyMetal_Spinal_Rotary_Reskin</string>
-        <string>K_SA_HeavyMetal_Spinal_Rotary</string>
-        <string>K_SA_Gauss_ERC</string>
+        <string>K_SA_HeavyMetal_Gauss_A</string>
         <string>K_SA_HeavyMetal_Gauss_ERFM</string>
+        <string>K_SA_HeavyMetal_Gauss_PGBC</string>
 
-      </ItemIds>
+	</ItemIds>
     </Category>
 
     <Category xsi:type="MyObjectBuilder_GuiBlockCategoryDefinition">
@@ -287,15 +309,10 @@
       <ItemIds>
 
         <!--[HAS]-->
-        <string>K_SA_Launcher_VIV</string>
-        <string>HAS_Cyclops</string>
-        <string>HAS_Mammon</string>
-        <string>HAS_Nyx</string>
         <string>K_SA_Launcher_VI</string>
-        <string>HAS_Thanatos</string>
-        <string>HAS_Esper</string>
+        <string>K_SA_Launcher_VIV</string>
         <string>HAS_Avenger</string>
-        <string>HAS_Crossfield</string>
+        <string>HAS_Esper</string>
 
       </ItemIds>
     </Category>
@@ -313,12 +330,6 @@
         <!-- [EXO] -->
         <string>Hexcannon</string>
         <string>MetalStorm</string>
-        <string>TaiidanHangarBomber</string>
-        <string>TaiidanHangarBomberMedium</string>
-        <string>TaiidanRailBomber</string>
-        <string>TaiidanHangarFighter</string>
-        <string>TaiidanRailFighter</string>
-        <string>TaiidanSingleHangar</string>
 
       </ItemIds>
     </Category>
@@ -332,24 +343,22 @@
       <Name>.SC_[BTI]</Name>
       <StrictSearch>true</StrictSearch>
       <ItemIds>
+
         <!-- [BTI] -->
-        <string>Starcore_AMS_II_Block</string>
-        <string>ERPPC</string>
-        <string>Starcore_L_Laser_Block</string>
-        <string>ModularLRM5</string>
+	<string>ModularLRM5</string>
         <string>ModularLRM5Angled</string>
         <string>ModularLRM5AngledReversed</string>
-        <string>ModularMiddleLRM5</string>
-        <string>Starcore_M_Laser_Block</string>
-        <string>ModularMRM10</string>
+		<string>ModularMiddleLRM5</string>
+		<string>Starcore_Arrow_Block_Single</string>
+		<string>ModularMRM10</string>
         <string>ModularMRM10Angled</string>
         <string>ModularMRM10AngledReversed</string>
         <string>ModularMiddleMRM10</string>
-        <string>Starcore_AMS_I_Block</string>
-        <string>Starcore_PPC_Block</string>
-        <string>ModularSRM8</string>
-        <string>Starcore_Arrow_Block</string>
-        <string>Starcore_Arrow_Block_Single</string>
+		<string>Starcore_AMS_I_Block</string>
+        <string>Starcore_AMS_II_Block</string>
+		<string>Starcore_Arrow_Block</string>
+        <string>ERPPC</string>
+
       </ItemIds>
     </Category>
 
@@ -363,13 +372,13 @@
       <ItemIds>
         <!-- [SOL] -->
         <string>MagnaPulse_Gen</string>
-        <!-- 	<string>Flechette_DoubleBarrel</string>-->
-        <string>Impulse_Torch</string>
-        <!-- 	<string>SolHyp_ArcStrike_Torp</string>-->
+        <!-- <string>Flechette_DoubleBarrel</string> -->
+        <!-- <string>Impulse_Torch</string> -->
+        <!-- <string>SolHyp_ArcStrike_Torp</string> -->
         <string>Counter_Battery</string>
-        <string>S_Chem_Laser_Block</string>
-        <string>S_Armored_Laser_Block</string>
-        <!-- 	<string>Nariman_Dart_Turret</string>-->
+        <!-- <string>S_Chem_Laser_Block</string> -->
+        <!-- <string>S_Armored_Laser_Block</string> -->
+        <string>Nariman_Dart_Turret</string>
         <string>SolHyp_Magnetic_Coilgun</string>
       </ItemIds>
     </Category>
@@ -383,26 +392,19 @@
       <Name>.SC_[FAS]</Name>
       <IsBlockCategory>true</IsBlockCategory>
       <ItemIds>
+
         <!--[FAS]-->
-        <string>16InchTriple</string>
-        <string>6InchTriple</string>
+        <string>BoforTwinRemodel</string>
+        <string>QuadBofor</string>
+        <string>PomPomMain</string>
         <string>127mmMk32</string>
         <string>127mmMk12</string>
         <string>127mmMk24</string>
-        <string>381mmDualR</string>
-        <string>15cmTbtsKC36</string>
-        <string>105mmTwin</string>
+		<string>203mmTwin</string>
         <string>380mmMLE1935</string>
-        <string>15cmSKC28R</string>
-        <string>15cmSKC28NR</string>
-        <string>PomPomMain</string>
-        <string>BoforTwinRemodel</string>
-        <string>BoforSingleRemodel</string>
-        <string>TorpBarbette</string>
-        <string>Barbette5x5</string>
-        <string>QuadBofor</string>
-        <string>20InchTwin</string>
-        <string>406alternate</string>
+        <string>381mmDualR</string>
+        <string>16InchTriple</string>
+
       </ItemIds>
     </Category>