Cleaned up d2k yaml rules.

Sanitized defaults.
2015-06-19 16:50:50 +02:00
parent f65df39e36
commit b193d5195d
8 changed files with 76 additions and 247 deletions
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -1,5 +1,5 @@
 carryall.reinforce:
-	Inherits: ^Helicopter
+	Inherits: ^Plane
 	Valued:
 		Cost: 1200
 	Tooltip:
@@ -20,15 +20,10 @@ carryall.reinforce:
 		Repulsable: False
 		LandAltitude: 100
 		LandWhenIdle: False
-	WithFacingSpriteBody:
-	WithShadow:
 	LeavesHusk:
 		HuskActor: carryall.husk
-	-Selectable:
-	-TargetableAircraft:
 	Carryall:
 		Automatic: False
-	AutoSelectionSize:
 	RenderSprites:
 		Image: carryall

@@ -57,36 +52,14 @@ carryall.infantry:
 		RepairBuildings: repair
 		RearmBuildings:
 		Repulsable: False
-	WithFacingSpriteBody:
-	WithShadow:
 	Cargo:
 		MaxWeight: 5
 		Types: Infantry
-	-Selectable:
-	-Voiced:
-	-TargetableAircraft:
-	-GainsExperience:
 	Tooltip:
 		Name: Carryall
 	LeavesHusk:
 		HuskActor: carryall.infantry.husk
 	RejectsOrders:
-	AutoSelectionSize:
-	RenderSprites:
-		Image: carryall
-
-carryall.husk:
-	Inherits: ^AircraftHusk
-	Tooltip:
-		Name: Carryall
-	Helicopter:
-		ROT: 4
-		Speed: 210
-		RepairBuildings: repair
-		RearmBuildings:
-	WithFacingSpriteBody:
-	WithShadow:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: carryall

@@ -105,23 +78,18 @@ frigate:
 		Repulsable: False
 	Health:
 		HP: 500
-	-TargetableAircraft:
 	-AppearsOnRadar:
 	Armor:
 		Type: Heavy
-	WithShadow:
 	Cargo:
 		MaxWeight: 20
 		PipCount: 10
 	Invulnerable:
-	-Selectable:
-	-GainsExperience:
 	FlyAwayOnIdle:
 	RejectsOrders:
-	-Voiced:

 orni:
-	Inherits: ^Helicopter
+	Inherits: ^Plane
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -145,20 +113,22 @@ orni:
 		Speed: 280
 		RepairBuildings: repair
 		RearmBuildings:
-	WithFacingSpriteBody:
-	WithShadow:
 	LeavesHusk:
 		HuskActor: orni.husk
-	AutoSelectionSize:
-	RenderSprites:
 	SelectionDecorations:
-		VisualBounds: 38,32,0,0
+	Selectable:
+		Bounds: 32,32
+	TargetableAircraft:
+		TargetTypes: Air
+		GroundedTargetTypes: Ground
+	Voiced:
+		VoiceSet: GenericVoice

 orni.bomber:
+	Inherits: ^Plane
 	AttackBomber:
 	Armament:
 		Weapon: Napalm
-	Inherits: ^Plane
 	Health:
 		HP: 100
 	Armor:
@@ -171,17 +141,11 @@ orni.bomber:
 		Repulsable: False
 	AmmoPool:
 		Ammo: 5
-	WithFacingSpriteBody:
-	WithShadow:
-	-Selectable:
-	-Voiced:
-	-GainsExperience:
 	Tooltip:
 		Name: Ornithopter
 	LeavesHusk:
 		HuskActor: orni.bomber.husk
 	RejectsOrders:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: orni

@@ -192,11 +156,8 @@ orni.husk:
 	Helicopter:
 		ROT: 6
 		Speed: 280
-		RepairBuildings: repair
+		RepairBuildings:
 		RearmBuildings:
-	WithFacingSpriteBody:
-	WithShadow:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: orni

@@ -207,14 +168,23 @@ orni.bomber.husk:
 	Plane:
 		ROT: 5
 		Speed: 350
-		RepairBuildings: repair
+		RepairBuildings:
 		RearmBuildings:
-	WithFacingSpriteBody:
-	WithShadow:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: orni

+carryall.husk:
+	Inherits: ^AircraftHusk
+	Tooltip:
+		Name: Carryall
+	Helicopter:
+		ROT: 4
+		Speed: 210
+		RepairBuildings:
+		RearmBuildings:
+	RenderSprites:
+		Image: carryall
+
 carryall.infantry.husk:
 	Inherits: ^AircraftHusk
 	Tooltip:
@@ -222,11 +192,8 @@ carryall.infantry.husk:
 	Plane:
 		ROT: 4
 		Speed: 280
-		RepairBuildings: repair
+		RepairBuildings:
 		RearmBuildings:
-	WithFacingSpriteBody:
-	WithShadow:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: carryall

--- a/mods/d2k/rules/arrakis.yaml
+++ b/mods/d2k/rules/arrakis.yaml
@@ -5,8 +5,6 @@ spicebloom:
 		Footprint: x
 		Dimensions: 1,1
 	AppearsOnRadar:
-	ProximityCaptor:
-		Types: Tree
 	Tooltip:
 		Name: Spice Bloom
 	SeedsResource:
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -1,3 +1,13 @@
+^ExistsInWorld:
+	AppearsOnRadar:
+	UpdatesPlayerStatistics:
+	CombatDebugOverlay:
+	GivesExperience:
+	BodyOrientation:
+	ScriptTriggers:
+	UpgradeManager:
+	Huntable:
+
 ^GainsExperience:
 	GainsExperience:
 	GainsStatUpgrades:
@@ -20,8 +30,8 @@
 		UpgradeMaxAcceptedLevel: 4

 ^Vehicle:
-	Inherits: ^GainsExperience
-	AppearsOnRadar:
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^GainsExperience
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
@@ -41,26 +51,17 @@
 	Passenger:
 		CargoType: Vehicle
 	AttackMove:
-	HiddenUnderFog:
-	GivesExperience:
 	DrawLineToTarget:
+	HiddenUnderFog:
 	ActorLostNotification:
-	ProximityCaptor:
-		Types: Vehicle
 	GivesBounty:
 	Repairable:
 		RepairBuildings: repair
-	CombatDebugOverlay:
 	Guard:
 		Voice: Guard
 	Guardable:
 	WithFacingSpriteBody:
-	BodyOrientation:
-	UpdatesPlayerStatistics:
-	Huntable:
 	Demolishable:
-	ScriptTriggers:
-	UpgradeManager:
 	TemporaryOwnerManager:
 	MustBeDestroyed:
 	Voiced:
@@ -74,10 +75,9 @@
 	RenderSprites:

 ^Tank:
-	Inherits: ^GainsExperience
-	AppearsOnRadar:
+	Inherits: ^Vehicle
 	Mobile:
-		Crushes: crate
+		Crushes: crate, infantry
 		TerrainSpeeds:
 			Sand: 85
 			Rock: 100
@@ -86,66 +86,31 @@
 			Spice: 80
 			SpiceBlobs: 80
 			Dune: 70
-		ROT: 5
-	SelectionDecorations:
-	Selectable:
-		Bounds: 32,32
-	TargetableUnit:
-		TargetTypes: Ground, C4
-	Passenger:
-		CargoType: Vehicle
-	AttackMove:
-	HiddenUnderFog:
-	GivesExperience:
-	DrawLineToTarget:
-	ActorLostNotification:
-	ProximityCaptor:
-		Types: Tank
-	GivesBounty:
-	Repairable:
-		RepairBuildings: repair
-	CombatDebugOverlay:
-	Guard:
-		Voice: Guard
-	Guardable:
-	WithFacingSpriteBody:
-	BodyOrientation:
-	UpdatesPlayerStatistics:
-	Huntable:
-	Demolishable:
-	ScriptTriggers:
-	UpgradeManager:
-	TemporaryOwnerManager:
-	MustBeDestroyed:
-	Voiced:
-		VoiceSet: VehicleVoice
-	Carryable:
-	WithDecorationCarryable:
-		Image: pips
-		Sequence: pickup-indicator
-		Offset: -12, -12
-	AutoSelectionSize:
-	RenderSprites:

 ^Husk:
 	Health:
 		HP: 75
 	Armor:
 		Type: Light
-	Husk:
-		AllowedTerrain: Sand, Rock, Transition, Concrete, Spice, SpiceBlobs, Dune
 	HiddenUnderFog:
-	Burns:
-		Interval: 4
-	ProximityCaptor:
-		Types: Husk
 	Tooltip:
 		Name: Wreck
 	BodyOrientation:
+	AutoTargetIgnore:
+	ScriptTriggers:
+	WithFacingSpriteBody:
+	AutoSelectionSize:
+	RenderSprites:
+
+^VehicleHusk:
+	Inherits: ^Husk
+	Husk:
+		AllowedTerrain: Sand, Rock, Transition, Concrete, Spice, SpiceBlobs, Dune
+	Burns:
+		Interval: 4
 	TargetableUnit:
 		TargetTypes: Ground
 		RequiresForceFire: yes
-	AutoTargetIgnore:
 	Capturable:
 		Type: husk
 		AllowAllies: yes
@@ -153,10 +118,14 @@
 	TransformOnCapture:
 		ForceHealthPercentage: 25
 	DisabledOverlay:
-	ScriptTriggers:
-	WithFacingSpriteBody:
-	AutoSelectionSize:
-	RenderSprites:
+
+^AircraftHusk:
+	Inherits: ^Husk
+	WithShadow:
+	FallsToEarth:
+		Spins: False
+		Moves: True
+		Explosion: UnitExplodeScale

 ^TowerHusk:
 	Health:
@@ -170,26 +139,12 @@
 		Interval: 2
 	Tooltip:
 		Name: Destroyed Tower
-	ProximityCaptor:
-		Types: Husk
 	BodyOrientation:
 	ScriptTriggers:

-^AircraftHusk:
-	Inherits: ^Husk
-	-Husk:
-	-Burns:
-	-Capturable:
-	-TransformOnCapture:
-	-TargetableUnit:
-	FallsToEarth:
-		Spins: False
-		Moves: True
-		Explosion: UnitExplodeScale
-
 ^Infantry:
-	Inherits: ^GainsExperience
-	AppearsOnRadar:
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^GainsExperience
 	Health:
 		Radius: 96
 	Armor:
@@ -228,31 +183,22 @@
 		CrushedSequence: die-crushed
 	AutoTarget:
 	AttackMove:
+	DrawLineToTarget:
 	Passenger:
 		CargoType: Infantry
 		PipType: Green
 	HiddenUnderFog:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
-	ProximityCaptor:
-		Types: Infantry
 	GivesBounty:
 	Crushable:
 		CrushSound: CRUSH1.WAV
-	CombatDebugOverlay:
 	Guard:
 		Voice: Guard
 	Guardable:
-	BodyOrientation:
-	UpdatesPlayerStatistics:
-	Huntable:
-	ScriptTriggers:
 	DeathSounds:
 		DeathTypes: ExplosionDeath, SoundDeath, SmallExplosionDeath, BulletDeath
 	Parachutable:
 		FallRate: 130
-	UpgradeManager:
 	MustBeDestroyed:
 	TerrainModifiesDamage:
 		TerrainModifier:
@@ -261,41 +207,23 @@
 		VoiceSet: InfantryVoice

 ^Plane:
-	Inherits: ^GainsExperience
+	Inherits@1: ^ExistsInWorld
 	AppearsOnRadar:
 		UseLocation: yes
-	SelectionDecorations:
-	Selectable:
-		Bounds: 32,32
-	TargetableAircraft:
-		TargetTypes: Air
-		GroundedTargetTypes: Ground
 	HiddenUnderFog:
 		AlwaysVisibleStances: None
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
-	ProximityCaptor:
-		Types: Plane
-	GivesBounty:
-	CombatDebugOverlay:
-	BodyOrientation:
-	UpdatesPlayerStatistics:
-	Huntable:
 	AttackMove:
-	ScriptTriggers:
-	UpgradeManager:
+	DrawLineToTarget:
 	Voiced:
 		VoiceSet: GenericVoice
 	WithFacingSpriteBody:
 	AutoSelectionSize:
 	RenderSprites:
-
-^Helicopter:
-	Inherits: ^Plane
+	WithShadow:

 ^Building:
-	AppearsOnRadar:
+	Inherits@1: ^ExistsInWorld
 	SelectionDecorations:
 	Selectable:
 		Priority: 2
@@ -320,30 +248,22 @@
 		ActorTypes: rifle,rifle,rifle,rifle,rifle,bazooka,bazooka,bazooka,engineer
 	MustBeDestroyed:
 		RequiredForShortGame: true
-	GivesExperience:
 	FrozenUnderFog:
 	CaptureNotification:
 	ActorLostNotification:
 		Notification: BuildingLost
 	ShakeOnDeath:
-	ProximityCaptor:
-		Types: Building
 	Sellable:
 		SellSounds: BUILD1.WAV
 	GivesBounty:
-	CombatDebugOverlay:
 	Guardable:
 		Range: 3
-	BodyOrientation:
-	UpdatesPlayerStatistics:
 	WithCrumbleOverlay:
-	Huntable:
 	Demolishable:
 	DamagedWithoutFoundation:
 	ThrowsShrapnel:
 		Weapons: shrapnel
 		Pieces: 3, 7
 		Range: 2c0, 5c0
-	ScriptTriggers:
 	WithMakeAnimation:

--- a/mods/d2k/rules/husks.yaml
+++ b/mods/d2k/rules/husks.yaml
@@ -1,12 +1,12 @@
 mcv.husk:
-	Inherits: ^Husk
+	Inherits: ^VehicleHusk
 	Health:
 		HP: 175
 	Tooltip:
 		Name: Destroyed Mobile Construction Vehicle

 harvester.husk:
-	Inherits: ^Husk
+	Inherits: ^VehicleHusk
 	Health:
 		HP: 150
 	Tooltip:
@@ -15,40 +15,36 @@ harvester.husk:
 		IntoActor: harvester

 siegetank.husk:
-	Inherits: ^Husk
-	Tooltip:
+	Inherits: ^VehicleHusk
 	ThrowsParticle@turret:
 		Anim: turret
 	TransformOnCapture:
 		IntoActor: siegetank

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

 sonictank.husk:
-	Inherits: ^Husk
+	Inherits: ^VehicleHusk
 	TransformOnCapture:
 		IntoActor: sonictank

 devast.husk:
-	Inherits: ^Husk
+	Inherits: ^VehicleHusk
 	Health:
 		HP: 125
 	TransformOnCapture:
 		IntoActor: devast

 deviatortank.husk:
-	Inherits: ^Husk
+	Inherits: ^VehicleHusk
 	TransformOnCapture:
 		IntoActor: deviatortank

 ^combat.husk:
-	Inherits: ^Husk
+	Inherits: ^VehicleHusk
 	Health:
 		HP: 100
 	ThrowsParticle@turret:
--- a/mods/d2k/rules/starport.yaml
+++ b/mods/d2k/rules/starport.yaml
@@ -5,8 +5,6 @@ mcv.starport:
 		Queue: Starport
 	Valued:
 		Cost: 2500
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: mcv

@@ -25,8 +23,6 @@ trike.starport:
 		Queue: Starport
 	Valued:
 		Cost: 315
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: trike

@@ -36,8 +32,6 @@ quad.starport:
 		Queue: Starport
 	Valued:
 		Cost: 500
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: quad

@@ -47,8 +41,6 @@ siegetank.starport:
 		Queue: Starport
 	Valued:
 		Cost: 1075
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: siegetank

@@ -58,8 +50,6 @@ missiletank.starport:
 		Queue: Starport
 	Valued:
 		Cost: 1250
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: missiletank

@@ -70,8 +60,6 @@ combata.starport:
 		Queue: Starport
 	Valued:
 		Cost: 875
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: combata

@@ -82,8 +70,6 @@ combath.starport:
 		Queue: Starport
 	Valued:
 		Cost: 875
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: combath

@@ -94,8 +80,6 @@ combato.starport:
 		Queue: Starport
 	Valued:
 		Cost: 875
-	WithFacingSpriteBody:
-	AutoSelectionSize:
 	RenderSprites:
 		Image: combato

--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -77,8 +77,6 @@ conyard:
 	WithBuildingPlacedOverlay:
 		Palette: d2k
 	PrimaryBuilding:
-	SelectionDecorations:
-		VisualBounds: 96,64

 power:
 	Inherits: ^Building
@@ -113,8 +111,6 @@ power:
 		Amount: 100
 	ScalePowerWithHealth:
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-		VisualBounds: 64,64

 barracks:
 	Inherits: ^Building
@@ -171,8 +167,6 @@ barracks:
 			atreides: barracks.atreides
 			ordos: barracks.ordos
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-		VisualBounds: 64,64

 refinery:
 	Inherits: ^Building
@@ -226,8 +220,6 @@ refinery:
 	WithIdleOverlay@TOP:
 		Sequence: idle-top
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-		VisualBounds: 96,64

 silo:
 	Inherits: ^Building
@@ -266,8 +258,6 @@ silo:
 		Amount: -5
 	MustBeDestroyed:
 		RequiredForShortGame: false
-	SelectionDecorations:
-		VisualBounds: 32,32

 light:
 	Inherits: ^Building
@@ -325,8 +315,6 @@ light:
 		Sequence: idle-top
 	Power:
 		Amount: -20
-	SelectionDecorations:
-		VisualBounds: 96,64

 heavy:
 	Inherits: ^Building
@@ -429,8 +417,6 @@ radar:
 	Power:
 		Amount: -40
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-		VisualBounds: 96,64

 starport:
 	Inherits: ^Building
@@ -490,8 +476,6 @@ starport:
 	Power:
 		Amount: -40
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-		VisualBounds: 96,64

 wall:
 	HiddenUnderShroud:
@@ -530,8 +514,6 @@ wall:
 		TargetTypes: Ground
 	RenderBuildingWall:
 	AutoTargetIgnore:
-	ProximityCaptor:
-		Types: Wall
 	Sellable:
 		SellSounds: CHUNG.WAV
 	Guardable:
@@ -858,8 +840,6 @@ palace:
 	RequiresPower:
 	SupportPowerChargeBar:
 	ProvidesPrerequisite@buildingname:
-	SelectionDecorations:
-		VisualBounds: 96,96

 conyard.atreides:
 	Inherits: conyard
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -12,7 +12,6 @@ mcv:
 	Selectable:
 		Class: mcv
 		Priority: 3
-		Bounds: 42,42
 	Health:
 		HP: 800
 	Armor:
@@ -56,7 +55,6 @@ harvester:
 	Selectable:
 		Class: harvester
 		Priority: 7
-		Bounds: 42,42
 	Harvester:
 		PipCount: 10
 		Capacity: 40
@@ -112,7 +110,6 @@ trike:
 		Speed: 128
 	RevealsShroud:
 		Range: 7c0
-	WithFacingSpriteBody:
 	WithMuzzleFlash:
 	Armament:
 		Weapon: HMG
@@ -125,8 +122,6 @@ trike:
 		EmptyWeapon: UnitExplodeTiny
 	AttractsWorms:
 		Intensity: 420
-	AutoSelectionSize:
-	RenderSprites:

 quad:
 	Inherits: ^Vehicle
@@ -193,7 +188,6 @@ siegetank:
 		MuzzleSequence: muzzle
 	AttackFrontal:
 	WithMuzzleFlash:
-	WithFacingSpriteBody:
 	WithTurret:
 	Explodes:
 		Weapon: UnitExplodeScale
@@ -206,7 +200,6 @@ siegetank:
 		HuskActor: siegetank.husk
 	AttractsWorms:
 		Intensity: 600
-	AutoSelectionSize:
 	RenderSprites:
 		Image: SIEGETANK

@@ -301,7 +294,6 @@ devast:
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 7c0
-	WithFacingSpriteBody:
 	Armament:
 		Weapon: DevBullet
 		LocalOffset: 640,0,32
@@ -317,8 +309,6 @@ devast:
 		HuskActor: devast.husk
 	AttractsWorms:
 		Intensity: 700
-	AutoSelectionSize:
-	RenderSprites:
 	SelectionDecorations:
 		VisualBounds: 44,38,0,0

@@ -394,7 +384,6 @@ deviatortank:
 		Type: Light
 	RevealsShroud:
 		Range: 5c0
-	WithFacingSpriteBody:
 	Armament:
 		Weapon: NerveGasMissile
 		LocalOffset: -299,0,85
@@ -408,8 +397,6 @@ deviatortank:
 		HuskActor: deviatortank.husk
 	AttractsWorms:
 		Intensity: 600
-	AutoSelectionSize:
-	RenderSprites:

 ^combat:
 	Inherits: ^Tank
@@ -442,7 +429,6 @@ deviatortank:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleFlash:
-	WithFacingSpriteBody:
 	WithTurret:
 	AutoTarget:
 	Explodes:
@@ -452,8 +438,6 @@ deviatortank:
 		Class: combat
 	AttractsWorms:
 		Intensity: 520
-	AutoSelectionSize:
-	RenderSprites:

 combata:
 	Inherits: ^combat
--- a/mods/d2k/sequences/vehicles.yaml
+++ b/mods/d2k/sequences/vehicles.yaml
@@ -257,4 +257,4 @@ deviatortank.husk:
 	idle: DATA.R8
 		Start: 2389
 		Facings: -32
-		ZOffset: -512
+		ZOffset: -512