Use new IAutoRenderSize for determining actor render bounds

2017-09-10 10:44:31 +02:00
parent 2501a93b87
commit 56b6aabbb8
26 changed files with 158 additions and 3 deletions
--- a/mods/cnc/rules/civilian.yaml
+++ b/mods/cnc/rules/civilian.yaml
@@ -417,6 +417,8 @@ BRIDGE1:
 	FreeActor@south:
 		Actor: bridgehut
 		SpawnOffset: 0,2
+	CustomRenderSize:
+		CustomBounds: 96,96

 BRIDGE2:
 	Inherits: ^Bridge
@@ -434,6 +436,8 @@ BRIDGE2:
 	FreeActor@south:
 		Actor: bridgehut
 		SpawnOffset: 2,2
+	CustomRenderSize:
+		CustomBounds: 120,120

 BRIDGE3:
 	Inherits: ^Bridge
@@ -451,6 +455,8 @@ BRIDGE3:
 	FreeActor@south:
 		Actor: bridgehut
 		SpawnOffset: 1,2
+	CustomRenderSize:
+		CustomBounds: 144,120

 BRIDGE4:
 	Inherits: ^Bridge
@@ -468,6 +474,8 @@ BRIDGE4:
 	FreeActor@south:
 		Actor: bridgehut
 		SpawnOffset: 3,2
+	CustomRenderSize:
+		CustomBounds: 144,96

 BRIDGEHUT:
 	AlwaysVisible:
@@ -479,6 +487,8 @@ BRIDGEHUT:
 	LegacyBridgeHut:
 	Targetable:
 		TargetTypes: BridgeHut, C4
+	CustomRenderSize:
+		CustomBounds: 48,48

 C1:
 	Inherits: ^CivInfantry
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -13,6 +13,7 @@
 	QuantizeFacingsFromSequence:
 	AutoSelectionSize:
 	RenderSprites:
+	AutoRenderSize:

 ^1x1Shape:
 	HitShape:
--- a/mods/cnc/rules/misc.yaml
+++ b/mods/cnc/rules/misc.yaml
@@ -134,3 +134,4 @@ FLARE:
 	AutoSelectionSize:
 	EditorTilesetFilter:
 		Categories: System
+	AutoRenderSize:
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -243,6 +243,7 @@ SILO:
 	SelectionDecorations:
 		VisualBounds: 49,30
 	-AcceptsDeliveredCash:
+	AutoRenderSize:

 PYLE:
 	Inherits: ^BaseBuilding
@@ -814,6 +815,7 @@ SAM:
 		Amount: -20
 	BodyOrientation:
 		UseClassicFacingFudge: True
+	AutoRenderSize:

 OBLI:
 	Inherits: ^Defense
--- a/mods/d2k/maps/atreides-04/rules.yaml
+++ b/mods/d2k/maps/atreides-04/rules.yaml
@@ -88,6 +88,7 @@ tile475:
 	BodyOrientation:
 		QuantizedFacings: 1
 	AutoSelectionSize:
+	AutoRenderSize:

 # Placed after the sietch is destroyed so that the cliff is still unpassable
 invisibleBlocker:
--- a/mods/d2k/rules/arrakis.yaml
+++ b/mods/d2k/rules/arrakis.yaml
@@ -63,6 +63,7 @@ spicebloom:
 			Radius: 512
 	EditorTilesetFilter:
 		Categories: System
+	AutoRenderSize:

 sandworm:
 	Inherits@1: ^SpriteActor
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -13,6 +13,7 @@
 	QuantizeFacingsFromSequence:
 	AutoSelectionSize:
 	RenderSprites:
+	AutoRenderSize:

 ^GainsExperience:
 	GainsExperience:
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -138,6 +138,8 @@ crate:
 		CustomBounds: 20,20
 	EditorTilesetFilter:
 		Categories: System
+	CustomRenderSize:
+		CustomBounds: 20,20

 mpspawn:
 	EditorOnlyTooltip:
--- a/mods/ra/maps/allies-01/rules.yaml
+++ b/mods/ra/maps/allies-01/rules.yaml
@@ -22,6 +22,7 @@ TRAN.Extraction:
 	AutoSelectionSize:
 	RenderSprites:
 		Image: tran
+	AutoRenderSize:

 TRAN.Insertion:
 	Inherits: TRAN.Extraction
@@ -31,6 +32,7 @@ TRAN.Insertion:
 	AutoSelectionSize:
 	RenderSprites:
 		Image: tran
+	AutoRenderSize:

 EINSTEIN:
 	Passenger:
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -320,6 +320,8 @@ BARL:
 	-Demolishable:
 	EditorTilesetFilter:
 		Categories: Decoration
+	CustomRenderSize:
+		CustomBounds: 24,24

 BRL3:
 	Inherits: ^TechBuilding
@@ -344,6 +346,8 @@ BRL3:
 	-Demolishable:
 	EditorTilesetFilter:
 		Categories: Decoration
+	CustomRenderSize:
+		CustomBounds: 24,24

 AMMOBOX1:
 	Inherits: ^AmmoBox
@@ -491,6 +495,8 @@ BRIDGE1:
 	FreeActor@south:
 		Actor: bridgehut
 		SpawnOffset: 0,1
+	CustomRenderSize:
+		CustomBounds: 120,72

 BRIDGE2:
 	Inherits: ^Bridge
@@ -509,6 +515,8 @@ BRIDGE2:
 	FreeActor@south:
 		Actor: bridgehut
 		SpawnOffset: 2,1
+	CustomRenderSize:
+		CustomBounds: 120,48

 SBRIDGE1:
 	Inherits: ^Bridge
@@ -527,6 +535,8 @@ SBRIDGE1:
 	FreeActor@south:
 		Actor: bridgehut.small
 		SpawnOffset: 1,1
+	CustomRenderSize:
+		CustomBounds: 72,48

 SBRIDGE2:
 	Inherits: ^Bridge
@@ -545,6 +555,8 @@ SBRIDGE2:
 	FreeActor@east:
 		Actor: bridgehut.small
 		SpawnOffset: 1,1
+	CustomRenderSize:
+		CustomBounds: 48,72

 SBRIDGE3:
 	Inherits: ^Bridge
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -12,6 +12,7 @@
 	QuantizeFacingsFromSequence:
 	AutoSelectionSize:
 	RenderSprites:
+	AutoRenderSize:

 ^1x1Shape:
 	HitShape:
@@ -786,6 +787,8 @@
 		Type: Light
 	EditorTilesetFilter:
 		Categories: Decoration
+	CustomRenderSize:
+		CustomBounds: 24,24

 ^CivBuilding:
 	Inherits: ^TechBuilding
@@ -974,6 +977,8 @@
 	ScriptTriggers:
 	BodyOrientation:
 		QuantizedFacings: 1
+	CustomRenderSize:
+		CustomBounds: 96,48

 ^Rock:
 	Inherits@1: ^SpriteActor
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -201,6 +201,7 @@ FLARE:
 	AutoSelectionSize:
 	EditorTilesetFilter:
 		Categories: Decoration
+	AutoRenderSize:

 MINE:
 	Inherits@1: ^SpriteActor
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -381,3 +381,4 @@ HUNTER:
 	HitShape:
 	EditorTilesetFilter:
 		Categories: System
+	AutoRenderSize:
--- a/mods/ts/rules/bridges.yaml
+++ b/mods/ts/rules/bridges.yaml
@@ -34,6 +34,7 @@ CABHUT:
 		Name: Bridge
 	EditorTilesetFilter:
 		Categories: Bridge
+	AutoRenderSize:

 ^LowBridge:
 	Inherits: ^LowBridgeRamp
@@ -81,6 +82,8 @@ LOBRDG_A_D:
 		BOffset: 1,1
 	CustomSelectionSize:
 		CustomBounds: 96, 48
+	CustomRenderSize:
+		CustomBounds: 96, 48

 LOBRDG_B:
 	Inherits: ^LowBridge
@@ -117,6 +120,8 @@ LOBRDG_B_D:
 		BOffset: -1,1
 	CustomSelectionSize:
 		CustomBounds: 96, 48
+	CustomRenderSize:
+		CustomBounds: 96, 48

 LOBRDG_R_SE:
 	Inherits: ^LowBridgeRamp
@@ -177,6 +182,8 @@ LOBRDG_R_SW:
 		CustomBounds: 96, 144
 	EditorTilesetFilter:
 		Categories: Bridge
+	CustomRenderSize:
+		CustomBounds: 96, 144

 BRIDGE1:
 	Inherits: ^ElevatedBridgePlaceholder
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -15,6 +15,7 @@
 	QuantizeFacingsFromSequence:
 	AutoSelectionSize:
 	RenderSprites:
+	AutoRenderSize:

 ^GainsExperience:
 	GainsExperience:
@@ -431,6 +432,8 @@
 		CustomBounds: 24,24
 	EditorTilesetFilter:
 		Categories: System
+	CustomRenderSize:
+		CustomBounds: 24,24

 ^Wall:
 	Inherits@1: ^SpriteActor
@@ -1099,6 +1102,7 @@
 		TerrainType: Rail
 	EditorTilesetFilter:
 		Categories: Railway
+	AutoRenderSize:

 ^Tunnel:
 	RenderSprites:
@@ -1118,6 +1122,8 @@
 		Dimensions: 3, 3
 	EditorTilesetFilter:
 		Categories: Tunnel
+	CustomRenderSize:
+		CustomBounds: 144, 144

 ^Gate:
 	Inherits: ^Building
--- a/mods/ts/rules/gdi-infantry.yaml
+++ b/mods/ts/rules/gdi-infantry.yaml
@@ -188,6 +188,7 @@ JUMPJET.Husk:
 		FallbackSequence: die-splash
 	EditorTilesetFilter:
 		Categories: Husk
+	AutoRenderSize:

 GHOST:
 	Inherits: ^Soldier
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -129,6 +129,8 @@ NAFNCE:
 		Weapons: SmallDebris
 		Pieces: 0, 1
 		Range: 2c0, 5c0
+	CustomRenderSize:
+		CustomBounds: 48, 24

 NALASR:
 	Inherits: ^Defense
--- a/mods/ts/rules/trees.yaml
+++ b/mods/ts/rules/trees.yaml
@@ -118,6 +118,7 @@ VEINHOLE:
 	AutoSelectionSize:
 	EditorTilesetFilter:
 		Categories: Resource spawn
+	AutoRenderSize:

 ^TibFlora:
 	Inherits: ^Tree