Merge pull request #6342 from Phrohdoh/TibSunAI

TS TestAI and more.

mods/ts/rules/ai.yaml

@@ -1,2 +1,43 @@
 Player:
-
+	HackyAI@TestAI:
+		Name: Test AI
+		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
+		BuildingLimits:
+			proc: 4
+			gapowr: 8
+			napowr: 8
+			gapile: 1
+			nahand: 1
+			garadr: 1
+			gaweap: 1
+			naweap: 1
+		BuildingFractions:
+			proc: 30%
+			gapowr: 35%
+			napowr: 35%
+			gapile: 1%
+			nahand: 1%
+			gaweap: 1%
+			naweap: 1%
+		UnitsToBuild:
+			e1: 80%
+			e2: 8%
+			e3: 30%
+			medic: 2%
+			jumpjet: 15%
+			apc: 3%
+			smech: 25%
+			bike: 60%
+			bggy: 75%
+			ttnk: 45%
+			stnk: 8%
+		SquadSize: 20

mods/ts/rules/aircraft.yaml

@@ -19,11 +19,11 @@ DPOD:
 	Armor:
 		Type: Light
 	RevealsShroud:
-		Range: 0c0
+		Range: 5c0
 	Cargo:
 		Types: Infantry
-		MaxWeight: 5
+		MaxWeight: 1
-		PipCount: 5
+		PipCount: 1
 	Armament:
 		Weapon: Vulcan2
 	AttackHeli:

mods/ts/rules/defaults.yaml

@@ -11,6 +11,8 @@
 		Footprint: x
 		BuildSounds: place2.aud
 		TerrainTypes: Clear, Road
+		Adjacent: 4
+	FrozenUnderFog:
 	GivesBuildableArea:
 	Capturable:
 	SoundOnDamageTransition:
@@ -62,9 +64,6 @@
 		NodeTypes: wall
 	LineBuildNode:
 		Types: wall
-	SelectionDecorations:
-	Selectable:
-		Priority: 1
 	TargetableBuilding:
 		TargetTypes: Ground, C4
 	RenderBuildingWall:
@@ -323,6 +322,8 @@
 	Huntable:
 	LuaScriptEvents:
 	ScriptTriggers:
+	Guard:
+	Guardable:
 
 ^BlossomTree:
 	Tooltip:

mods/ts/rules/structures.yaml

@@ -69,6 +69,8 @@ GAPOWR:
 		Sequence: idle-lights
 	WithIdleOverlay@PLUG:
 		Sequence: idle-plug
+	Selectable:
+		Bounds: 64, 64
 	Power:
 		Amount: 100
 	InfiltrateForPowerOutage:
@@ -133,14 +135,14 @@ PROC:
 		Prerequisites: anypower
 		Owner: gdi,nod
 	Building:
-		Footprint: xxx xxx x==
+		Footprint: xxx= xxx= xxx=
-		Dimensions: 3,3
+		Dimensions: 4,3
 	Health:
 		HP: 900
 	RevealsShroud:
 		Range: 6
 	TiberianSunRefinery:
-		DockOffset: 4,3
+		DockOffset: 3,1
 	StoresResources:
 		PipColor: Green
 		PipCount: 15
@@ -159,6 +161,36 @@ PROC:
 	Power:
 		Amount: -30
 
+GASILO:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 70
+		Prerequisites: proc
+		Owner: gdi, nod
+	Valued:
+		Cost: 150
+	Tooltip:
+		Name: Silo
+		Description: Stores excess Tiberium.
+	Building:
+		Footprint: xx xx
+		Dimensions: 2, 2
+	-GivesBuildableArea:
+	Health:
+		HP: 300
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 4c0
+	RenderBuildingSilo:
+	StoresResources:
+		PipCount: 5
+		Capacity: 1500
+	-RenderBuilding:
+	Power:
+		Amount: -10
+
 GAWEAP:
 	Inherits: ^Building
 	Valued:
@@ -172,6 +204,7 @@ GAWEAP:
 		Queue: Building
 		BuildPaletteOrder: 50
 		Owner: gdi
+		Prerequisites: proc
 	Building:
 		Footprint: xxx= xxx= xxx=
 		Dimensions: 4,3
@@ -321,6 +354,7 @@ NAWEAP:
 		Queue: Building
 		BuildPaletteOrder: 50
 		Owner: nod
+		Prerequisites: proc
 	Building:
 		Footprint: xxx= xxx= xxx=
 		Dimensions: 4,3
@@ -764,6 +798,7 @@ GAHPAD:
 		BuildPaletteOrder: 60
 		Owner: gdi
 		Queue: Building
+		Prerequisites: garadr
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -773,6 +808,7 @@ GAHPAD:
 		Range: 5c0
 	Exit@1:
 		SpawnOffset: 0,-256,0
+	RallyPoint:
 	Production:
 		Produces: Air
 	PrimaryBuilding:
@@ -807,6 +843,7 @@ NAHPAD:
 		Range: 5c0
 	Exit@1:
 		SpawnOffset: 0,-256,0
+	RallyPoint:
 	Production:
 		Produces: Air
 	PrimaryBuilding:
@@ -834,7 +871,7 @@ GADEPT:
 		Owner: gdi
 		Queue: Building
 	Building:
-		Footprint: _x_ xxx _x_
+		Footprint: =x= xxx =x=
 		Dimensions: 3,3
 	Health:
 		HP: 1100

mods/ts/sequences/structures.yaml

@@ -56,40 +56,50 @@ gapowr:
 	idle: gtpowr
 		Start: 0
 		ShadowStart: 3
+		Offset: 0, -10
 	damaged-idle: gtpowr
 		Start: 1
 		ShadowStart: 4
+		Offset: 0, -10
 	critical-idle: gtpowr
 		Start: 2
 		ShadowStart: 5
+		Offset: 0, -10
 	idle-lights: gtpowr_a
 		Start: 0
 		Length: 12
 		Tick: 200
+		Offset: 0, -10
 	damaged-idle-lights: gtpowr_a
 		Start: 12
 		Length: 12
 		Tick: 200
+		Offset: 0, -10
 	critical-idle-lights: gtpowr_a
 		Start: 24
 		Length: 12
 		Tick: 200
+		Offset: 0, -10
 	idle-plug: gtpowr_b
 		Start: 0
 		Length: 12
 		Tick: 200
+		Offset: 0, -10
 	damaged-idle-plug: gtpowr_b
 		Start: 0
 		Length: 12
 		Tick: 200
+		Offset: 0, -10
 	critical-idle-plug: gtpowr_b
 		Start: 0
 		Length: 12
 		Tick: 200
+		Offset: 0, -10
 	make: gtpowrmk
 		Start: 0
 		Length: 20
 		ShadowStart: 20
+		Offset: 0, -10
 	icon: powricon
 		Start: 0
 
@@ -926,50 +936,64 @@ proc: # TODO: unused narefn_a, narefn_b
 	idle: ntrefn
 		Start: 0
 		ShadowStart: 3
-		Offset: 0, -14
+		Offset: 0, -24
 	damaged-idle: ntrefn
 		Start: 1
 		ShadowStart: 4
-		Offset: 0, -14
+		Offset: 0, -24
 	critical-idle: ntrefn
 		Start: 2
 		ShadowStart: 5
-		Offset: 0, -14
+		Offset: 0, -24
 	make: ntrefnmk
 		Start: 0
 		Length: 20
 		ShadowStart: 20
-		Offset: 0, -14
+		Offset: 0, -24
 	idle-redlights: ntrefn_c
 		Start: 0
 		Length: 16
 		Tick: 120
-		Offset: 0, -14
+		Offset: 0, -24
 	damaged-idle-redlights: ntrefn_c
 		Start: 0
 		Length: 16
 		Tick: 120
-		Offset: 0, -14
+		Offset: 0, -24
 	critical-idle-redlights: ntrefn_c
 		Start: 16
 		Length: 16
 		Tick: 200
-		Offset: 0, -14
+		Offset: 0, -24
 	bib: ntrefnbb
 		Start: 0
 		Length: 1
-		Offset: 0, -14
+		Offset: 0, -24
 	damaged-bib: ntrefnbb
 		Start: 1
 		Length: 1
-		Offset: 0, -14
+		Offset: 0, -24
 	critical-bib: ntrefnbb
 		Start: 2
 		Length: 1
-		Offset: 0, -14
+		Offset: 0, -24
 	icon: reficon
 		Start: 0
 
+gasilo:
+	idle: gtsilo
+		Start: 0
+		ShadowStart: 4
+	damaged-idle: gtsilo
+		Start: 2
+		ShadowStart: 5
+	icon: siloicon
+		Start: 0
+	make: gtsilomk
+		Start: 0
+		Length: 18
+		ShadowStart: 20
+
 galite:
 	idle: gtlite
 		Start: 0