Overhaul WithDecoration trait.

2015-12-13 15:29:08 +00:00
parent cec2c584e6
commit 372bbaf7b6
17 changed files with 133 additions and 165 deletions
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -48,7 +48,6 @@
 		Sequence: rank
 		Palette: effect
 		ReferencePoint: Bottom, Right
-		Offset: 2, 2
 		UpgradeTypes: rank
 		ZOffset: 256
 		UpgradeMinEnabledLevel: 1
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -48,7 +48,6 @@
 		Sequence: rank
 		Palette: effect
 		ReferencePoint: Bottom, Right
-		Offset: 2, 2
 		UpgradeTypes: rank
 		ZOffset: 256
 		UpgradeMinEnabledLevel: 1
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -88,7 +88,7 @@ construction_yard:
 		Prerequisites: upgrade.conyard
 		Upgrades: stardecoration
 	WithDecoration@upgraded:
-		SelectionDecoration: true
+		RequiresSelection: true
 		Image: pips
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
@@ -191,7 +191,7 @@ barracks:
 		Prerequisites: upgrade.barracks
 		Upgrades: stardecoration
 	WithDecoration@upgraded:
-		SelectionDecoration: true
+		RequiresSelection: true
 		Image: pips
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
@@ -359,7 +359,7 @@ light_factory:
 		Prerequisites: upgrade.light
 		Upgrades: stardecoration
 	WithDecoration@upgraded:
-		SelectionDecoration: true
+		RequiresSelection: true
 		Image: pips
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
@@ -432,7 +432,7 @@ heavy_factory:
 		Prerequisites: upgrade.heavy
 		Upgrades: stardecoration
 	WithDecoration@upgraded:
-		SelectionDecoration: true
+		RequiresSelection: true
 		Image: pips
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
@@ -782,7 +782,7 @@ high_tech_factory:
 		Prerequisites: upgrade.hightech
 		Upgrades: stardecoration
 	WithDecoration@upgraded:
-		SelectionDecoration: true
+		RequiresSelection: true
 		Image: pips
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -47,7 +47,6 @@
 		Sequence: rank
 		Palette: effect
 		ReferencePoint: Bottom, Right
-		Offset: 2, 2
 		UpgradeTypes: rank
 		ZOffset: 256
 		UpgradeMinEnabledLevel: 1
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -218,7 +218,6 @@ SPY:
 		Sequence: pip-disguise
 		Palette: effect
 		ReferencePoint: Top, Right
-		Offset: 4, -2
 		ZOffset: 256
 		UpgradeTypes: disguise
 		UpgradeMinEnabledLevel: 1
--- a/mods/ra/rules/player.yaml
+++ b/mods/ra/rules/player.yaml
@@ -66,7 +66,6 @@ Player:
 	GlobalUpgradeManager:
 	EnemyWatcher:
 	VeteranProductionIconOverlay:
-		Offset: 2, 2
 		Image: iconchevrons
 		Sequence: veteran

--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -73,6 +73,7 @@ pips:
 	pip-disguise: pip-disguise
 		Length: *
 		Tick: 300
+		Offset: 0, -6

 v2:
 	idle:
@@ -370,6 +371,7 @@ rank:

 iconchevrons:
 	veteran:
+		Offset: 2, 2

 atomic:
 	up: atomicup
--- a/mods/ts/rules/civilian-infantry.yaml
+++ b/mods/ts/rules/civilian-infantry.yaml
@@ -65,7 +65,6 @@ CHAMSPY:
 		Sequence: pip-disguise
 		Palette: pips
 		ReferencePoint: Top, Right
-		Offset: 4, -2
 		ZOffset: 256
 		UpgradeTypes: disguise
 		UpgradeMinEnabledLevel: 1
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -44,7 +44,6 @@
 		Sequence: rank
 		Palette: ra
 		ReferencePoint: Bottom, Right
-		Offset: 2, 2
 		UpgradeTypes: rank
 		ZOffset: 256
 		UpgradeMinEnabledLevel: 1
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -107,6 +107,8 @@ pips:
 	pip-disguise: pip-disguise
 		Length: *
 		Tick: 300
+		Offset: 0, -6
+
 # TODO:
 	pip-empty-building:
 	pip-green-building: