Implement proper TS Tiberium and Vein logic.

mods/ts/maps/2temp7/map.yaml

@@ -465,7 +465,7 @@ Actors:
 		Location: 68,-48
 		Owner: Neutral
 	Actor136: veinhole
-		Location: 63,-35
+		Location: 62,-36
 		Owner: Neutral
 	Actor137: srock01
 		Location: 60,-19
@@ -567,7 +567,7 @@ Actors:
 		Location: 80,25
 		Owner: Neutral
 	Actor170: veinhole
-		Location: 71,41
+		Location: 70,40
 		Owner: Neutral
 	Actor171: srock02
 		Location: 133,-14

mods/ts/maps/arivruns/map.yaml

@@ -1264,7 +1264,7 @@ Actors:
 		Location: 75,48
 		Owner: Neutral
 	Actor384: veinhole
-		Location: 138,-13
+		Location: 137,-14
 		Owner: Neutral
 	Actor385: trock01
 		Location: 144,-16

mods/ts/maps/float/map.yaml

@@ -651,7 +651,7 @@ Actors:
 		Location: 70,-20
 		Owner: Neutral
 	Actor195: veinhole
-		Location: 31,11
+		Location: 30,10
 		Owner: Neutral
 	Actor196: srock05
 		Location: 34,14
@@ -666,13 +666,13 @@ Actors:
 		Location: 98,-44
 		Owner: Neutral
 	Actor200: veinhole
-		Location: 97,-39
+		Location: 96,-40
 		Owner: Neutral
 	Actor201: trock03
 		Location: 102,-44
 		Owner: Neutral
 	Actor202: veinhole
-		Location: 71,-8
+		Location: 70,-9
 		Owner: Neutral
 	Actor203: trock01
 		Location: 96,-33

mods/ts/maps/t_garden/map.yaml

@@ -872,10 +872,10 @@ Actors:
 		Location: 129,-36
 		Owner: Neutral
 	Actor253: veinhole
-		Location: 101,-6
+		Location: 100,-7
 		Owner: Neutral
 	Actor254: veinhole
-		Location: 86,18
+		Location: 85,17
 		Owner: Neutral
 	Actor255: trock03
 		Location: 80,60

mods/ts/maps/tiers/map.yaml

@@ -437,13 +437,13 @@ Actors:
 		Location: 55,-5
 		Owner: Neutral
 	Actor129: veinhole
-		Location: 61,-18
+		Location: 60,-19
 		Owner: Neutral
 	Actor130: veinhole
-		Location: 72,-11
+		Location: 71,-12
 		Owner: Neutral
 	Actor131: veinhole
-		Location: 62,1
+		Location: 61,0
 		Owner: Neutral
 
 Rules:

mods/ts/rules/nod-structures.yaml

@@ -508,7 +508,7 @@ NAWAST:
 	Tooltip:
 		Name: Waste Refinery
 	Buildable:
-		Queue: Buildig
+		Queue: Building
 		BuildPaletteOrder: 130
 		Prerequisites: namisl, ~structures.nod, ~techlevel.superweapons
 		BuildLimit: 1

mods/ts/rules/player.yaml

@@ -5,6 +5,7 @@
 		ResourceValues:
 			Tiberium: 25
 			BlueTiberium: 40
+			Veins: 0
 
 EditorPlayer:
 	Inherits: ^BasePlayer

mods/ts/rules/trees.yaml

@@ -99,20 +99,17 @@ TREE24:
 TREE25:
 	Inherits: ^Tree
 
-VEINHOLEDUMMY:
+VEINHOLE:
 	HiddenUnderShroud:
 	RadarColorFromTerrain:
 		Terrain: Veins
 	AppearsOnMapPreview:
 		Terrain: Veins
 	Building:
-		Footprint: xx xx
-		Dimensions: 2, 2
+		Footprint: xxx xxx xxx
+		Dimensions: 3, 3
 	BodyOrientation:
 		QuantizedFacings: 1
-
-VEINHOLE:
-	Inherits: VEINHOLEDUMMY
 	AppearsOnRadar:
 	Tooltip:
 		Name: Veinhole

mods/ts/rules/world.yaml

@@ -204,7 +204,7 @@
 	CliffBackImpassabilityLayer:
 	SubterraneanActorLayer:
 	JumpjetActorLayer:
-	ResourceRenderer:
+	TSTiberiumRenderer:
 		ResourceTypes:
 			Tiberium:
 				Sequences: tib01, tib02, tib03, tib04, tib05, tib06, tib07, tib08, tib09, tib10, tib11, tib12
@@ -214,10 +214,23 @@
 				Sequences: tib01, tib02, tib03, tib04, tib05, tib06, tib07, tib08, tib09, tib10, tib11, tib12
 				Palette: bluetiberium
 				Name: Tiberium
-			Veins:
-				Sequences: veins
-				Palette: player
-				Name: Veins
+		Ramp1Sequences:
+			Tiberium: tib13, tib14
+			BlueTiberium: tib13, tib14
+		Ramp2Sequences:
+			Tiberium: tib15, tib16
+			BlueTiberium: tib15, tib16
+		Ramp3Sequences:
+			Tiberium: tib17, tib18
+			BlueTiberium: tib17, tib18
+		Ramp4Sequences:
+			Tiberium: tib19, tib20
+			BlueTiberium: tib19, tib20
+	TSVeinsRenderer:
+		ResourceType: Veins
+		Name: Veins
+		Palette: player
+		VeinholeActors: veinhole
 
 World:
 	Inherits: ^BaseWorld
@@ -257,7 +270,8 @@ World:
 	SmudgeLayer@LARGECRATER:
 		Type: LargeCrater
 		Sequence: largecraters
-	ResourceLayer:
+	TSResourceLayer:
+		VeinholeActors: veinhole
 		ResourceTypes:
 			Tiberium:
 				ResourceIndex: 1
@@ -273,7 +287,7 @@ World:
 				ResourceIndex: 3
 				TerrainType: Veins
 				AllowedTerrainTypes: Clear, Rough, DirtRoad
-				MaxDensity: 1
+				MaxDensity: 2
 	BridgeLayer:
 	CustomTerrainDebugOverlay:
 	ResourceClaimLayer:
@@ -371,7 +385,7 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	EditorCursorLayer:
-	EditorResourceLayer:
+	TSEditorResourceLayer:
 		ResourceTypes:
 			Tiberium:
 				ResourceIndex: 1
@@ -387,7 +401,8 @@ EditorWorld:
 				ResourceIndex: 3
 				TerrainType: Veins
 				AllowedTerrainTypes: Clear, Rough, DirtRoad
-				MaxDensity: 1
+				MaxDensity: 2
+		VeinholeActors: veinhole
 	EditorSelectionLayer:
 		Palette: ra
 		FootprintAlpha: 0.7

mods/ts/sequences/misc.yaml

@@ -400,20 +400,19 @@ resources:
 	tib10: tib10
 	tib11: tib11
 	tib12: tib12
-	tib13: tib13 # TODO: NW ramp variant, currently unused
-	tib14: tib14 # TODO: NW ramp variant, currently unused
-	tib15: tib15 # TODO: NE ramp variant, currently unused
-	tib16: tib16 # TODO: NE ramp variant, currently unused
-	tib17: tib17 # TODO: SE ramp variant, currently unused
-	tib18: tib18 # TODO: SE ramp variant, currently unused
-	tib19: tib19 # TODO: SW ramp variant, currently unused
-	tib20: tib20 # TODO: SW ramp variant, currently unused
+	tib13: tib13
+	tib14: tib14
+	tib15: tib15
+	tib16: tib16
+	tib17: tib17
+	tib18: tib18
+	tib19: tib19
+	tib20: tib20
 	veins: veins
-		Length: 1
-		Start: 52
+		Length: *
 		ShadowStart: -1
-		Tick: 180
-		Offset: 0, -12, 2.5
+		# TODO: Reduce z offset again after fixing #12229
+		Offset: 0, -12, 5.5
 		IgnoreWorldTint: false
 
 veins:

mods/ts/sequences/trees.yaml

@@ -192,5 +192,5 @@ veinhole:
 	idle:
 		ShadowStart: 1
 		UseTilesetExtension: true
-		Offset: 0,-60
+		Offset: 0, -36
 		ZRamp: 1