HackyAI dissolve update rule and yaml updates

mods/ts/rules/ai.yaml

@@ -1,41 +1,7 @@
 Player:
-	HackyAI@TestAI:
+	ModularBot@TestAI:
 		Name: Test AI
 		Type: test
-		BuildingCommonNames:
-			ConstructionYard: gacnst
-			Refinery: proc
-			Power: gapowr, napowr, naapwr
-			Barracks: gapile, nahand
-			VehiclesFactory: gaweap, naweap
-			Production: gapile, nahand, gaweap, naweap
-			Silo: gasilo
-		UnitsCommonNames:
-			Mcv: mcv
-			ExcludeFromSquads: harv
-		UnitsToBuild:
-			e1: 80%
-			e2: 25%
-			e3: 25%
-			cyborg: 15%
-			jumpjet: 15%
-			repair: 2%
-			medic: 2%
-			harv: 10%
-			mmch: 15%
-			ttnk: 15%
-			smech: 25%
-			bggy: 25%
-			hvr: 20%
-			bike: 20%
-			subtank: 10%
-			sonic: 10%
-			stnk: 8%
-		UnitLimits:
-			harv: 12
-			medic: 3
-			repair: 3
-		SquadSize: 20
 	GrantConditionOnBotOwner@test:
 		Condition: enable-test-ai
 		Bots: test
@@ -93,3 +59,37 @@ Player:
 			naobel: 3
 	BuildingRepairBotModule:
 		RequiresCondition: enable-test-ai
+	SquadManagerBotModule@test:
+		RequiresCondition: enable-test-ai
+		SquadSize: 20
+		ExcludeFromSquadsTypes: harv, mcv
+		ConstructionYardTypes: gacnst
+	UnitBuilderBotModule@test:
+		RequiresCondition: enable-test-ai
+		UnitsToBuild:
+			e1: 80
+			e2: 25
+			e3: 25
+			cyborg: 15
+			jumpjet: 15
+			repair: 2
+			medic: 2
+			harv: 10
+			mmch: 15
+			ttnk: 15
+			smech: 25
+			bggy: 25
+			hvr: 20
+			bike: 20
+			subtank: 10
+			sonic: 10
+			stnk: 8
+		UnitLimits:
+			harv: 12
+			medic: 3
+			repair: 3
+	McvManagerBotModule@test:
+		RequiresCondition: enable-test-ai
+		McvTypes: mcv
+		ConstructionYardTypes: gacnst
+		McvFactoryTypes: gaweap, naweap