Merge pull request #8171 from reaperrr/withunitbody1

Introduce WithFacingSpriteBody and related With*Animation traits
2015-06-07 17:11:48 +02:00
parent e445cc4fce d52906117e
commit 9882a6e34d
41 changed files with 759 additions and 289 deletions
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -20,8 +20,7 @@ carryall.reinforce:
 		Repulsable: False
 		LandAltitude: 100
 		LandWhenIdle: False
-	RenderUnit:
-		Image: carryall
+	WithFacingSpriteBody:
 	WithShadow:
 	LeavesHusk:
 		HuskActor: carryall.husk
@@ -29,6 +28,9 @@ carryall.reinforce:
 	-TargetableAircraft:
 	Carryall:
 		Automatic: False
+	AutoSelectionSize:
+	RenderSprites:
+		Image: carryall

 carryall:
 	Inherits: carryall.reinforce
@@ -55,8 +57,7 @@ carryall.infantry:
 		RepairBuildings: repair
 		RearmBuildings:
 		Repulsable: False
-	RenderUnit:
-		Image: carryall
+	WithFacingSpriteBody:
 	WithShadow:
 	Cargo:
 		MaxWeight: 5
@@ -69,6 +70,9 @@ carryall.infantry:
 	LeavesHusk:
 		HuskActor: carryall.infantry.husk
 	RejectsOrders:
+	AutoSelectionSize:
+	RenderSprites:
+		Image: carryall

 carryall.husk:
 	Inherits: ^AircraftHusk
@@ -79,9 +83,11 @@ carryall.husk:
 		Speed: 210
 		RepairBuildings: repair
 		RearmBuildings:
-	RenderUnit:
-		Image: carryall
+	WithFacingSpriteBody:
 	WithShadow:
+	AutoSelectionSize:
+	RenderSprites:
+		Image: carryall

 frigate:
 	Inherits: ^Plane
@@ -137,12 +143,14 @@ orni:
 		Speed: 280
 		RepairBuildings: repair
 		RearmBuildings:
-	RenderUnit:
+	WithFacingSpriteBody:
 	WithShadow:
 	Selectable:
 		Bounds: 38,32,0,0
 	LeavesHusk:
 		HuskActor: orni.husk
+	AutoSelectionSize:
+	RenderSprites:

 orni.bomber:
 	AttackBomber:
@@ -161,8 +169,7 @@ orni.bomber:
 		Repulsable: False
 	AmmoPool:
 		Ammo: 5
-	RenderUnit:
-		Image: orni
+	WithFacingSpriteBody:
 	WithShadow:
 	-Selectable:
 	-GainsExperience:
@@ -171,6 +178,9 @@ orni.bomber:
 	LeavesHusk:
 		HuskActor: orni.bomber.husk
 	RejectsOrders:
+	AutoSelectionSize:
+	RenderSprites:
+		Image: orni

 orni.husk:
 	Inherits: ^AircraftHusk
@@ -181,9 +191,11 @@ orni.husk:
 		Speed: 280
 		RepairBuildings: repair
 		RearmBuildings:
-	RenderUnit:
-		Image: orni
+	WithFacingSpriteBody:
 	WithShadow:
+	AutoSelectionSize:
+	RenderSprites:
+		Image: orni

 orni.bomber.husk:
 	Inherits: ^AircraftHusk
@@ -194,9 +206,11 @@ orni.bomber.husk:
 		Speed: 350
 		RepairBuildings: repair
 		RearmBuildings:
-	RenderUnit:
-		Image: orni
+	WithFacingSpriteBody:
 	WithShadow:
+	AutoSelectionSize:
+	RenderSprites:
+		Image: orni

 carryall.infantry.husk:
 	Inherits: ^AircraftHusk
@@ -207,6 +221,9 @@ carryall.infantry.husk:
 		Speed: 280
 		RepairBuildings: repair
 		RearmBuildings:
-	RenderUnit:
-		Image: carryall
+	WithFacingSpriteBody:
 	WithShadow:
+	AutoSelectionSize:
+	RenderSprites:
+		Image: carryall
+
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -32,7 +32,7 @@
 	Guard:
 		Voice: Guard
 	Guardable:
-	RenderUnit:
+	WithFacingSpriteBody:
 	BodyOrientation:
 	UpdatesPlayerStatistics:
 	Huntable:
@@ -58,6 +58,8 @@
 		Image: pips
 		Sequence: pickup-indicator
 		Offset: -12, -12
+	AutoSelectionSize:
+	RenderSprites:

 ^Tank:
 	AppearsOnRadar:
@@ -93,7 +95,7 @@
 	Guard:
 		Voice: Guard
 	Guardable:
-	RenderUnit:
+	WithFacingSpriteBody:
 	BodyOrientation:
 	UpdatesPlayerStatistics:
 	Huntable:
@@ -119,6 +121,8 @@
 		Image: pips
 		Sequence: pickup-indicator
 		Offset: -12, -12
+	AutoSelectionSize:
+	RenderSprites:

 ^Husk:
 	Health:
@@ -147,7 +151,9 @@
 		ForceHealthPercentage: 25
 	DisabledOverlay:
 	ScriptTriggers:
-	RenderUnit:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:

 ^TowerHusk:
 	Health:
@@ -295,9 +301,11 @@
 	UpgradeManager:
 	AnnounceOnSeen:
 		Notification: EnemyUnitsDetected
-	RenderUnit:
 	Voiced:
 		VoiceSet: GenericVoice
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:

 ^Helicopter:
 	Inherits: ^Plane
--- a/mods/d2k/rules/husks.yaml
+++ b/mods/d2k/rules/husks.yaml
@@ -24,9 +24,11 @@ siegetank.husk:

 missiletank.husk:
 	Inherits: ^Husk
-	RenderUnit:
+	WithFacingSpriteBody:
 	TransformOnCapture:
 		IntoActor: missiletank
+	AutoSelectionSize:
+	RenderSprites:

 sonictank.husk:
 	Inherits: ^Husk
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -128,11 +128,13 @@ waypoint:

 ^carryall.colorpicker:
 	Inherits: carryall
-	RenderUnit:
-		Image: carryall
-		Palette: colorpicker
+	WithFacingSpriteBody:
 	Helicopter:
 		InitialFacing: 104
+	AutoSelectionSize:
+	RenderSprites:
+		Image: carryall
+		Palette: colorpicker

 camera:
 	Immobile:
--- a/mods/d2k/rules/starport.yaml
+++ b/mods/d2k/rules/starport.yaml
@@ -5,7 +5,9 @@ mcv.starport:
 		Queue: Starport
 	Valued:
 		Cost: 2500
-	RenderUnit:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
 		Image: mcv

 harvester.starport:
@@ -24,7 +26,9 @@ trike.starport:
 		Prerequisites: starport
 	Valued:
 		Cost: 315
-	RenderUnit:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
 		Image: trike

 quad.starport:
@@ -33,7 +37,9 @@ quad.starport:
 		Queue: Starport
 	Valued:
 		Cost: 500
-	RenderUnit:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
 		Image: quad

 siegetank.starport:
@@ -42,7 +48,9 @@ siegetank.starport:
 		Queue: Starport
 	Valued:
 		Cost: 1075
-	RenderUnit:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
 		Image: siegetank

 missiletank.starport:
@@ -51,7 +59,9 @@ missiletank.starport:
 		Queue: Starport
 	Valued:
 		Cost: 1250
-	RenderUnit:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
 		Image: missiletank

 combata.starport:
@@ -61,7 +71,9 @@ combata.starport:
 		Queue: Starport
 	Valued:
 		Cost: 875
-	RenderUnit:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
 		Image: combata

 combath.starport:
@@ -71,7 +83,9 @@ combath.starport:
 		Queue: Starport
 	Valued:
 		Cost: 875
-	RenderUnit:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
 		Image: combath

 combato.starport:
@@ -81,7 +95,9 @@ combato.starport:
 		Queue: Starport
 	Valued:
 		Cost: 875
-	RenderUnit:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
 		Image: combato

 carryall.starport:
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -75,6 +75,10 @@ harvester:
 		EmptyWeapon: UnitExplodeScale
 	LeavesHusk:
 		HuskActor: Harvester.Husk
+	RenderUnit:
+	-RenderSprites:
+	-WithFacingSpriteBody:
+	-AutoSelectionSize:
 	WithHarvestAnimation:
 		Palette: effect50alpha
 	AttractsWorms:
@@ -102,7 +106,7 @@ trike:
 		Speed: 128
 	RevealsShroud:
 		Range: 7c0
-	RenderUnit:
+	WithFacingSpriteBody:
 	WithMuzzleFlash:
 	Armament:
 		Weapon: HMG
@@ -115,6 +119,8 @@ trike:
 		EmptyWeapon: UnitExplodeTiny
 	AttractsWorms:
 		Intensity: 420
+	AutoSelectionSize:
+	RenderSprites:

 quad:
 	Inherits: ^Vehicle
@@ -181,8 +187,7 @@ siegetank:
 		MuzzleSequence: muzzle
 	AttackFrontal:
 	WithMuzzleFlash:
-	RenderUnit:
-		Image: SIEGETANK
+	WithFacingSpriteBody:
 	WithTurret:
 	Explodes:
 		Weapon: UnitExplodeScale
@@ -195,6 +200,9 @@ siegetank:
 		HuskActor: siegetank.husk
 	AttractsWorms:
 		Intensity: 600
+	AutoSelectionSize:
+	RenderSprites:
+		Image: SIEGETANK

 missiletank:
 	Inherits: ^Tank
@@ -289,7 +297,7 @@ devast:
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 7c0
-	RenderUnit:
+	WithFacingSpriteBody:
 	Armament:
 		Weapon: DevBullet
 		LocalOffset: 640,0,32
@@ -307,6 +315,8 @@ devast:
 		HuskActor: devast.husk
 	AttractsWorms:
 		Intensity: 700
+	AutoSelectionSize:
+	RenderSprites:

 raider:
 	Inherits: ^Vehicle
@@ -382,7 +392,7 @@ deviatortank:
 		Type: Light
 	RevealsShroud:
 		Range: 5c0
-	RenderUnit:
+	WithFacingSpriteBody:
 	Armament:
 		Weapon: NerveGasMissile
 		LocalOffset: -299,0,85
@@ -398,6 +408,8 @@ deviatortank:
 		HuskActor: deviatortank.husk
 	AttractsWorms:
 		Intensity: 600
+	AutoSelectionSize:
+	RenderSprites:

 ^combat:
 	Inherits: ^Tank
@@ -430,7 +442,7 @@ deviatortank:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	RenderUnit:
+	WithFacingSpriteBody:
 	WithTurret:
 	AutoTarget:
 	Explodes:
@@ -440,6 +452,8 @@ deviatortank:
 		Bounds: 30,30
 	AttractsWorms:
 		Intensity: 520
+	AutoSelectionSize:
+	RenderSprites:

 combata:
 	Inherits: ^combat