Changed Bounds/added VisualBounds in D2k mod

2015-06-05 04:46:23 +02:00
parent 0ff22b8cbc
commit f709a6f6c4
5 changed files with 54 additions and 20 deletions
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -145,12 +145,12 @@ orni:
 		RearmBuildings:
 	WithFacingSpriteBody:
 	WithShadow:
-	Selectable:
-		Bounds: 38,32,0,0
 	LeavesHusk:
 		HuskActor: orni.husk
 	AutoSelectionSize:
 	RenderSprites:
+	SelectionDecorations:
+		VisualBounds: 38,32,0,0

 orni.bomber:
 	AttackBomber:
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -34,7 +34,9 @@
 			Dune: 60
 		ROT: 5
 	SelectionDecorations:
+		VisualBounds: 32,32
 	Selectable:
+		Bounds: 32,32
 	TargetableUnit:
 		TargetTypes: Ground, C4
 	Passenger:
@@ -89,7 +91,9 @@
 			Dune: 70
 		ROT: 5
 	SelectionDecorations:
+		VisualBounds: 32,32
 	Selectable:
+		Bounds: 32,32
 	TargetableUnit:
 		TargetTypes: Ground, C4
 	Passenger:
@@ -213,6 +217,7 @@
 			Dune: 60
 			Rough: 70
 	SelectionDecorations:
+		VisualBounds: 12,18,0,-6
 	Selectable:
 		Bounds: 12,18,0,-6
 	TargetableUnit:
@@ -270,7 +275,9 @@
 	AppearsOnRadar:
 		UseLocation: yes
 	SelectionDecorations:
+		VisualBounds: 32,32
 	Selectable:
+		Bounds: 32,32
 	TargetableAircraft:
 		TargetTypes: Air
 		GroundedTargetTypes: Ground
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -113,6 +113,8 @@ crate:
 		Selectable: false
 		Bounds: 15,15,-1,-1
 	Passenger:
+	SelectionDecorations:
+		VisualBounds: 15,15,-1,-1

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

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

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

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

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

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

 heavy:
 	Inherits: ^Building
@@ -322,7 +334,7 @@ heavy:
 		Queue: Building
 		BuildPaletteOrder: 100
 	Selectable:
-		Bounds: 96,96
+		Bounds: 96,68,0,12
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -372,6 +384,8 @@ heavy:
 	Power:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
+	SelectionDecorations:
+		VisualBounds: 96,96

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

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

 wall:
 	Buildable:
@@ -540,7 +558,7 @@ guntower:
 	Sellable:
 		SellSounds: CHUNG.WAV
 	Selectable:
-		Bounds: 32,40,0,-8
+		Bounds: 32,32
 		Priority: 3
 	-GivesBuildableArea:
 	Health:
@@ -576,6 +594,8 @@ guntower:
 		Amount: -20
 	MustBeDestroyed:
 		RequiredForShortGame: false
+	SelectionDecorations:
+		VisualBounds: 32,40,0,-8

 rockettower:
 	Inherits: ^Building
@@ -594,7 +614,7 @@ rockettower:
 	Sellable:
 		SellSounds: CHUNG.WAV
 	Selectable:
-		Bounds: 32,40,0,-8
+		Bounds: 32,32
 		Priority: 3
 	-GivesBuildableArea:
 	Health:
@@ -631,6 +651,8 @@ rockettower:
 		Amount: -30
 	MustBeDestroyed:
 		RequiredForShortGame: false
+	SelectionDecorations:
+		VisualBounds: 32,40,0,-8

 repair:
 	Inherits: ^Building
@@ -652,6 +674,10 @@ repair:
 		Type: Concrete
 	RevealsShroud:
 		Range: 5c0
+	Selectable:
+		Bounds: 96,64
+	SelectionDecorations:
+		VisualBounds: 96,80
 	Reservable:
 	RepairsUnits:
 		Interval: 15
@@ -677,7 +703,7 @@ hightech:
 		Queue: Building
 		BuildPaletteOrder: 110
 	Selectable:
-		Bounds: 96,96
+		Bounds: 96,68,0,12
 	Valued:
 		Cost: 750
 	Tooltip:
@@ -722,6 +748,8 @@ hightech:
 		Sequence: production-welding
 	Power:
 		Amount: -40
+	SelectionDecorations:
+		VisualBounds: 96,96

 research:
 	Inherits: ^Building
@@ -730,7 +758,7 @@ research:
 		Prerequisites: radar, heavy, upgrade.heavy, ~techlevel.high
 		BuildPaletteOrder: 140
 	Selectable:
-		Bounds: 96,64
+		Bounds: 96,64,0,16
 	Valued:
 		Cost: 1500
 	Tooltip:
@@ -767,6 +795,8 @@ research:
 	Power:
 		Amount: -40
 	ProvidesPrerequisite@buildingname:
+	SelectionDecorations:
+		VisualBounds: 96,80

 palace:
 	Inherits: ^Building
@@ -828,6 +858,8 @@ 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
@@ -38,6 +38,8 @@ mcv:
 		HuskActor: mcv.husk
 	AttractsWorms:
 		Intensity: 700
+	SelectionDecorations:
+		VisualBounds: 42,42

 harvester:
 	Inherits: ^Vehicle
@@ -85,6 +87,8 @@ harvester:
 		Palette: effect50alpha
 	AttractsWorms:
 		Intensity: 700
+	SelectionDecorations:
+		VisualBounds: 42,42

 trike:
 	Inherits: ^Vehicle
@@ -99,7 +103,6 @@ trike:
 		Description: Fast Scout\n Strong vs Infantry\n Weak vs Tanks, Aircraft
 	Selectable:
 		Class: trike
-		Bounds: 24,24
 	Health:
 		HP: 100
 	Armor:
@@ -155,7 +158,6 @@ quad:
 		EmptyWeapon: UnitExplodeTiny
 	Selectable:
 		Class: quad
-		Bounds: 24,24
 	AttractsWorms:
 		Intensity: 470

@@ -200,7 +202,6 @@ siegetank:
 		InitialStance: Defend
 	Selectable:
 		Class: siegetank
-		Bounds: 30,30
 	LeavesHusk:
 		HuskActor: siegetank.husk
 	AttractsWorms:
@@ -241,7 +242,6 @@ missiletank:
 		EmptyWeapon: UnitExplodeScale
 	Selectable:
 		Class: missiletank
-		Bounds: 30,30
 	LeavesHusk:
 		HuskActor: missiletank.husk
 	AttractsWorms:
@@ -258,8 +258,6 @@ sonictank:
 	Tooltip:
 		Name: Sonic Tank
 		Description: Fires sonic shocks\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery, Aircraft
-	Selectable:
-		Bounds: 30,30
 	Health:
 		HP: 130
 	Armor:
@@ -315,14 +313,14 @@ devast:
 	Explodes:
 		Weapon: UnitExplodeScale
 		EmptyWeapon: UnitExplodeScale
-	Selectable:
-		Bounds: 44,38,0,0
 	LeavesHusk:
 		HuskActor: devast.husk
 	AttractsWorms:
 		Intensity: 700
 	AutoSelectionSize:
 	RenderSprites:
+	SelectionDecorations:
+		VisualBounds: 44,38,0,0

 raider:
 	Inherits: ^Vehicle
@@ -335,8 +333,6 @@ raider:
 	Tooltip:
 		Name: Raider Trike
 		Description: Improved Scout\n Strong vs Infantry, Light Vehicles
-	Selectable:
-		Bounds: 24,24
 	Health:
 		HP: 110
 	Armor:
@@ -408,8 +404,6 @@ deviatortank:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
-	Selectable:
-		Bounds: 30,30
 	LeavesHusk:
 		HuskActor: deviatortank.husk
 	AttractsWorms:
@@ -456,7 +450,6 @@ deviatortank:
 		EmptyWeapon: UnitExplodeSmall
 	Selectable:
 		Class: combat
-		Bounds: 30,30
 	AttractsWorms:
 		Intensity: 520
 	AutoSelectionSize: