Remove "Primary" tag.

2015-12-13 18:46:19 +00:00
parent ef2f9cbafa
commit 5b017cee58
11 changed files with 200 additions and 12 deletions
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -95,6 +95,14 @@ construction_yard:
 		ZOffset: 256
 		UpgradeTypes: stardecoration
 		UpgradeMinEnabledLevel: 1
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 wind_trap:
 	Inherits: ^Building
@@ -198,6 +206,14 @@ barracks:
 		ZOffset: 256
 		UpgradeTypes: stardecoration
 		UpgradeMinEnabledLevel: 1
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 refinery:
 	Inherits: ^Building
@@ -366,6 +382,14 @@ light_factory:
 		ZOffset: 256
 		UpgradeTypes: stardecoration
 		UpgradeMinEnabledLevel: 1
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 heavy_factory:
 	Inherits: ^Building
@@ -439,6 +463,14 @@ heavy_factory:
 		ZOffset: 256
 		UpgradeTypes: stardecoration
 		UpgradeMinEnabledLevel: 1
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 outpost:
 	Inherits: ^Building
@@ -541,6 +573,14 @@ starport:
 	Power:
 		Amount: -150
 	ProvidesPrerequisite@buildingname:
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 wall:
 	Inherits@1: ^SpriteActor
--- a/mods/d2k/sequences/misc.yaml
+++ b/mods/d2k/sequences/misc.yaml
@@ -107,6 +107,7 @@ pips:
 	pickup-indicator: DATA.R8
 		Start: 112
 	tag-primary: primary.shp
+		Offset: 0, 2
 	pip-empty: DATA.R8
 		Start: 15
 	pip-green: DATA.R8
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -169,6 +169,14 @@ SPEN:
 	ProvidesPrerequisite@buildingname:
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 SYRD:
 	Inherits: ^Building
@@ -256,6 +264,14 @@ SYRD:
 	ProvidesPrerequisite@buildingname:
 	EditorTilesetFilter:
 		ExcludeTilesets: INTERIOR
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 IRON:
 	Inherits: ^ScienceBuilding
@@ -845,6 +861,14 @@ WEAP:
 		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
 	InfiltrateForSupportPower:
 		Proxy: vehicles.upgraded
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 FACT:
 	Inherits: ^Building
@@ -1074,6 +1098,14 @@ HPAD:
 		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
 	InfiltrateForSupportPower:
 		Proxy: aircraft.upgraded
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 AFLD:
 	Inherits: ^Building
@@ -1183,6 +1215,14 @@ AFLD:
 		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
 	InfiltrateForSupportPower:
 		Proxy: aircraft.upgraded
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 POWR:
 	Inherits: ^Building
@@ -1354,6 +1394,14 @@ BARR:
 		Proxy: barracks.upgraded
 	Targetable:
 		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 KENN:
 	Inherits: ^Building
@@ -1394,6 +1442,14 @@ KENN:
 	ProvidesPrerequisite@buildingname:
 	WithBuildingExplosion:
 		Sequences: building, building_napalm, large_explosion, self_destruct
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 TENT:
 	Inherits: ^Building
@@ -1466,6 +1522,14 @@ TENT:
 		Proxy: barracks.upgraded
 	Targetable:
 		TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 FIX:
 	Inherits: ^Building
--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -60,6 +60,7 @@ pips:
 		Offset: 0, 2
 	tag-primary:
 		Start: 2
+		Offset: 0, 2
 	pip-empty: pips2
 	pip-green: pips2
 		Start: 1
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -108,6 +108,15 @@ GAPILE:
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 88, 56, 0, -8
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		Palette: ra
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 GAWEAP:
 	Inherits: ^Building
@@ -159,6 +168,15 @@ GAWEAP:
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 154, 100, -2, -12
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		Palette: ra
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 GAHPAD:
 	Inherits: ^Building
@@ -203,6 +221,15 @@ GAHPAD:
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 88, 66, 0, -5
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		Palette: ra
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 GADEPT:
 	Inherits: ^Building
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -116,6 +116,15 @@ NAHAND:
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 116, 78, 3, -8
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		Palette: ra
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 NAWEAP:
 	Inherits: ^Building
@@ -163,6 +172,15 @@ NAWEAP:
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 149, 116, -3, -20
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		Palette: ra
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 NAHPAD:
 	Inherits: ^Building
@@ -207,6 +225,15 @@ NAHPAD:
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 78, 54, 0, -8
+	WithDecoration@primary:
+		RequiresSelection: true
+		Image: pips
+		Sequence: tag-primary
+		Palette: ra
+		ReferencePoint: Top
+		ZOffset: 256
+		UpgradeTypes: primary
+		UpgradeMinEnabledLevel: 1

 NARADR:
 	Inherits: ^Building
@@ -406,3 +433,4 @@ NAWAST:
 	SelectionDecorations:
 		VisualBounds: 100, 60, 5, -5
 	RenderSprites:
+
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -90,6 +90,7 @@ pips:
 		Length: 10
 	tag-primary: pipsra #TODO: backfall to RA asset
 		Start: 2
+		Offset: 0, 2
 	pip-empty: pips2
 	pip-green: pips2
 		Start: 1