Hook up make animation conditions for the default mods.

2018-10-07 16:29:19 +00:00
parent 14607f55c5
commit e038b86742
15 changed files with 344 additions and 82 deletions
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -1140,6 +1140,7 @@
 		Condition: build-incomplete
 	-WithSpriteBody:
 	WithGateSpriteBody:
+		PauseOnCondition: !build-incomplete
 		OpenSequence: open
 	Tooltip:
 	Buildable:
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -22,10 +22,13 @@ GAPOWR:
 	RevealsShroud:
 		Range: 4c0
 		MaxHeightDelta: 3
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !empdisable
+		RequiresCondition: !build-incomplete && !empdisable
 		Sequence: idle-lights
 	WithIdleOverlay@PLUG:
+		RequiresCondition: !build-incomplete
 		PauseOnCondition: empdisable
 		Sequence: idle-plug
 	Selectable:
@@ -42,19 +45,23 @@ GAPOWR:
 		Offset: 0,1
 		Conditions:
 			powrup: powrup.a
+		Requirements:
+			powrup: !build-incomplete
 	Power@pluga:
 		RequiresCondition: !empdisable && powrup.a
 		Amount: 50
 	WithIdleOverlay@pluga:
-		RequiresCondition: powrup.a
+		RequiresCondition: !build-incomplete && powrup.a
 		PauseOnCondition: empdisable
 		Sequence: idle-powrupa
 	Pluggable@plugb:
 		Offset: 1,1
 		Conditions:
 			powrup: powrup.b
+		Requirements:
+			powrup: !build-incomplete
 	WithIdleOverlay@plugb:
-		RequiresCondition: powrup.b
+		RequiresCondition: !build-incomplete && powrup.b
 		PauseOnCondition: empdisable
 		Sequence: idle-powrupb
 	Power@plugb:
@@ -105,11 +112,16 @@ GAPILE:
 		PrimaryCondition: primary
 		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-lights
 	WithIdleOverlay@LIGHT:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-light
 	WithIdleOverlay@FLAG:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-flag
 	Power:
 		Amount: -20
@@ -166,16 +178,24 @@ GAWEAP:
 		PrimaryCondition: primary
 		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@ROOF:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-roof
 	WithProductionDoorOverlay@DOOR:
+		RequiresCondition: !build-incomplete
 	WithIdleOverlay@WHITELIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-lights-white
 	WithIdleOverlay@REDLIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-lights-red
 	WithIdleOverlay@TURBINES:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-turbines
 	WithIdleOverlay@BIB:
+		RequiresCondition: !build-incomplete
 		Sequence: bib
 	Power:
 		Amount: -30
@@ -228,9 +248,13 @@ GAHPAD:
 		PlayerExperience: 15
 		StartRepairingNotification: Repairing
 	ProductionBar:
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@PLATFORM:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-platform
 	WithIdleOverlay@LIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-lights
 	WithDeathAnimation@BIB:
 		DeathSequence: dead-platform
@@ -282,19 +306,25 @@ GADEPT:
 	RallyPoint:
 		Palette: mouse
 		IsPlayerPalette: false
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHT:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-light
 	WithIdleOverlay@GROUND:
+		RequiresCondition: !build-incomplete
 		Sequence: ground
 	WithIdleOverlay@CIRCUITS:
+		RequiresCondition: !build-incomplete
 		Sequence: circuits
 	WithRepairOverlay@CRANE:
+		RequiresCondition: !build-incomplete
 		PauseOnCondition: empdisable
 		StartSequence: crane-start
 		Sequence: crane-loop
 		EndSequence: crane-end
 	WithRepairOverlay@PLATFORM:
-		RequiresCondition: !empdisable
+		RequiresCondition: !build-incomplete && !empdisable
 		Sequence: platform
 	WithDeathAnimation@BIB:
 		DeathSequence: dead-ground
@@ -343,9 +373,12 @@ GARADR:
 	RevealsShroud:
 		Range: 10c0
 		MaxHeightDelta: 3
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@DISH:
-		Sequence: idle-dish
+		RequiresCondition: !build-incomplete
 		PauseOnCondition: disabled || empdisable
+		Sequence: idle-dish
 	Targetable:
 		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	Power:
@@ -381,8 +414,10 @@ GATECH:
 	RevealsShroud:
 		Range: 4c0
 		MaxHeightDelta: 3
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !disabled
+		RequiresCondition: !build-incomplete && !disabled
 		Sequence: idle-lights
 	Power:
 		Amount: -150
@@ -408,14 +443,17 @@ GAPLUG:
 	Building:
 		Footprint: xxx xxx
 		Dimensions: 2,3
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@DISH:
+		RequiresCondition: !build-incomplete
 		PauseOnCondition: disabled || empdisable
 		Sequence: idle-dish
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !disabled && !empdisable
+		RequiresCondition: !build-incomplete && !disabled && !empdisable
 		Sequence: idle-lights
 	WithIdleOverlay@STRIP:
-		RequiresCondition: !disabled && !empdisable
+		RequiresCondition: !build-incomplete && !disabled && !empdisable
 		Sequence: idle-strip
 	Health:
 		HP: 100000
@@ -469,14 +507,14 @@ GAPLUG:
 			plug.ioncannon: plug.ioncannona
 			plug.hunterseeker: plug.hunterseekera
 		Requirements:
-			plug.ioncannon: !plug.ioncannonb && !plug.ioncannona && !plug.hunterseekera
-			plug.hunterseeker: !plug.hunterseekerb && !plug.ioncannona && !plug.hunterseekera
+			plug.ioncannon: !build-incomplete && !plug.ioncannonb && !plug.ioncannona && !plug.hunterseekera
+			plug.hunterseeker: !build-incomplete && !plug.hunterseekerb && !plug.ioncannona && !plug.hunterseekera
 	WithIdleOverlay@ioncannona:
-		RequiresCondition: plug.ioncannona
+		RequiresCondition: !build-incomplete && plug.ioncannona
 		PauseOnCondition: disabled
 		Sequence: idle-ioncannona
 	WithIdleOverlay@hunterseekera:
-		RequiresCondition: plug.hunterseekera
+		RequiresCondition: !build-incomplete && plug.hunterseekera
 		PauseOnCondition: disabled
 		Sequence: idle-hunterseekera
 	Pluggable@plugb:
@@ -485,14 +523,14 @@ GAPLUG:
 			plug.ioncannon: plug.ioncannonb
 			plug.hunterseeker: plug.hunterseekerb
 		Requirements:
-			plug.ioncannon: !plug.ioncannona && !plug.ioncannonb && !plug.hunterseekerb
-			plug.hunterseeker: !plug.hunterseekera && !plug.ioncannonb && !plug.hunterseekerb
+			plug.ioncannon: !build-incomplete && !plug.ioncannona && !plug.ioncannonb && !plug.hunterseekerb
+			plug.hunterseeker: !build-incomplete && !plug.hunterseekera && !plug.ioncannonb && !plug.hunterseekerb
 	WithIdleOverlay@ioncannonb:
-		RequiresCondition: plug.ioncannonb
+		RequiresCondition: !build-incomplete && plug.ioncannonb
 		PauseOnCondition: disabled
 		Sequence: idle-ioncannonb
 	WithIdleOverlay@hunterseekerb:
-		RequiresCondition: plug.hunterseekerb
+		RequiresCondition: !build-incomplete && plug.hunterseekerb
 		PauseOnCondition: disabled
 		Sequence: idle-hunterseekerb
 	ProvidesPrerequisite@buildingname:
--- a/mods/ts/rules/gdi-support.yaml
+++ b/mods/ts/rules/gdi-support.yaml
@@ -76,16 +76,18 @@ GACTWR:
 	AttackTurreted:
 		RequiresCondition: tower.vulcan || tower.rocket || tower.sam
 		PauseOnCondition: empdisable || disabled
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithSpriteTurret@VULC:
-		RequiresCondition: tower.vulcan
+		RequiresCondition: !build-incomplete && tower.vulcan
 		Recoils: false
 		Sequence: turret-vulcan
 	WithSpriteTurret@ROCKET:
-		RequiresCondition: tower.rocket
+		RequiresCondition: !build-incomplete && tower.rocket
 		Recoils: false
 		Sequence: turret-rocket
 	WithSpriteTurret@SAM:
-		RequiresCondition: tower.sam
+		RequiresCondition: !build-incomplete && tower.sam
 		Recoils: false
 		Sequence: turret-sam
 	Armament@VULCPRIMARY:
@@ -112,9 +114,9 @@ GACTWR:
 		Weapon: RedEye2
 		LocalOffset: 543,0,1697
 	WithMuzzleOverlay:
-		RequiresCondition: tower.vulcan
+		RequiresCondition: !build-incomplete && tower.vulcan
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !disabled
+		RequiresCondition: !build-incomplete && !disabled
 		Sequence: idle-lights
 	LineBuildNode:
 		Types: turret
@@ -132,6 +134,10 @@ GACTWR:
 			tower.vulcan: tower.vulcan
 			tower.rocket: tower.rocket
 			tower.sam: tower.sam
+		Requirements:
+			tower.vulcan: !build-incomplete
+			tower.rocket: !build-incomplete
+			tower.sam: !build-incomplete
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 	Replacement:
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -25,8 +25,10 @@ NAPOWR:
 	RevealsShroud:
 		Range: 4c0
 		MaxHeightDelta: 3
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !empdisable
+		RequiresCondition: !build-incomplete && !empdisable
 		Sequence: idle-lights
 	Power:
 		Amount: 100
@@ -64,8 +66,10 @@ NAAPWR:
 	RevealsShroud:
 		Range: 4c0
 		MaxHeightDelta: 3
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !empdisable
+		RequiresCondition: !build-incomplete && !empdisable
 		Sequence: idle-lights
 	Power:
 		Amount: 200
@@ -119,9 +123,13 @@ NAHAND:
 		PrimaryCondition: primary
 		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-lights
 	WithIdleOverlay@LIGHT:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-light
 	Power:
 		Amount: -20
@@ -178,12 +186,18 @@ NAWEAP:
 		PrimaryCondition: primary
 		SelectionNotification: PrimaryBuildingSelected
 	ProductionBar:
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@ROOF:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-roof
 	WithProductionDoorOverlay@DOOR:
+		RequiresCondition: !build-incomplete
 	WithIdleOverlay@LIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-lights
 	WithIdleOverlay@BIB:
+		RequiresCondition: !build-incomplete
 		Sequence: bib
 	Power:
 		Amount: -30
@@ -236,9 +250,13 @@ NAHPAD:
 		PlayerExperience: 15
 		StartRepairingNotification: Repairing
 	ProductionBar:
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@PLATFORM:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-platform
 	WithIdleOverlay@LIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-lights
 	WithDeathAnimation@BIB:
 		DeathSequence: dead-platform
@@ -292,9 +310,12 @@ NARADR:
 	RevealsShroud:
 		Range: 10c0
 		MaxHeightDelta: 3
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@DISH:
-		Sequence: idle-dish
+		RequiresCondition: !build-incomplete
 		PauseOnCondition: disabled || empdisable
+		Sequence: idle-dish
 	Targetable:
 		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	Power:
@@ -330,8 +351,10 @@ NATECH:
 	RevealsShroud:
 		Range: 4c0
 		MaxHeightDelta: 3
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !disabled
+		RequiresCondition: !build-incomplete && !disabled
 		Sequence: idle-lights
 	Power:
 		Amount: -150
@@ -370,8 +393,10 @@ NATMPL:
 		MaxHeightDelta: 3
 	Power:
 		Amount: -200
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !disabled
+		RequiresCondition: !build-incomplete && !disabled
 		Sequence: idle-lights
 	ProduceActorPower:
 		PauseOnCondition: empdisable || disabled
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -63,8 +63,6 @@ NAPOST:
 		NodeTypes: laserfencenode
 		SegmentType: nafnce
 		SegmentsRequireNode: true
-	WithMakeAnimation:
-		Condition: make-animation-playing
 	Selectable:
 		Bounds: 42, 44, 0, -12
 	LineBuildNode:
@@ -73,14 +71,16 @@ NAPOST:
 		Amount: -25
 	RevealsShroud:
 		Range: 4c0
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !disabled
+		RequiresCondition: !build-incomplete && !disabled
 		Sequence: lights
 	WithIdleOverlay@CHAINOFLIGHTS:
-		RequiresCondition: !disabled
+		RequiresCondition: !build-incomplete && !disabled
 		Sequence: chainoflights
 	LineBuildSegmentExternalCondition:
-		RequiresCondition: !disabled && !make-animation-playing
+		RequiresCondition: !build-incomplete && !disabled
 		Condition: active-posts

 NAFNCE:
@@ -173,8 +173,11 @@ NALASR:
 	Armament:
 		Weapon: TurretLaserFire
 		LocalOffset: 498,0,317
+	WithMakeAnimation:
+		Condition: build-incomplete
 	RenderVoxels:
 	WithVoxelTurret:
+		RequiresCondition: !build-incomplete
 	Power:
 		Amount: -40
 	SelectionDecorations:
@@ -218,11 +221,14 @@ NAOBEL:
 		RequiresCondition: charging && !disabled
 		SoundFiles: obelpowr.aud
 		Interval: 30, 40
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithChargeOverlay:
+		RequiresCondition: !build-incomplete
 		Palette: player
 		IsPlayerPalette: true
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !disabled
+		RequiresCondition: !build-incomplete && !disabled
 		Sequence: idle-lights
 	Power:
 		Amount: -150
@@ -257,7 +263,10 @@ NASAM:
 		InitialFacing: 224
 	AttackTurreted:
 		PauseOnCondition: empdisable || disabled
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithSpriteTurret:
+		RequiresCondition: !build-incomplete
 		Recoils: false
 	Armament:
 		Weapon: RedEye2
@@ -291,9 +300,11 @@ NASTLH:
 	RevealsShroud:
 		Range: 6c0
 		MaxHeightDelta: 3
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@pulse:
+		RequiresCondition: !build-incomplete && !disabled
 		Sequence: pulse
-		RequiresCondition: !disabled
 	WithRangeCircle:
 		Range: 12c0
 		Type: cloakgenerator
@@ -339,8 +350,10 @@ NAMISL:
 		Type: Wood
 	RevealsShroud:
 		Range: 4c0
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !disabled
+		RequiresCondition: !build-incomplete && !disabled
 		Sequence: idle-lights
 	Power:
 		Amount: -50
@@ -407,12 +420,16 @@ NAWAST:
 		Actor: WEED
 		SpawnOffset: 3,1
 		Facing: 160
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@GLOW:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-glow
 	WithIdleOverlay@LIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-lights
 	WithIdleOverlay@BIB:
+		RequiresCondition: !build-incomplete
 		Sequence: bib
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
-	RenderSprites:
--- a/mods/ts/rules/shared-structures.yaml
+++ b/mods/ts/rules/shared-structures.yaml
@@ -40,13 +40,19 @@ GACNST:
 		ProductionType: Building
 	ProductionBar@Defense:
 		ProductionType: Defense
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@TOP:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-top
 	WithIdleOverlay@SIDE:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-side
 	WithIdleOverlay@FRONT:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-front
 	WithBuildingPlacedOverlay:
+		RequiresCondition: !build-incomplete
 	Power:
 		Amount: 0
 	Selectable:
@@ -97,14 +103,20 @@ PROC:
 		Actor: HARV
 		SpawnOffset: 2,1
 		Facing: 160
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithIdleOverlay@REDLIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-redlights
 	WithIdleOverlay@BIB:
+		RequiresCondition: !build-incomplete
 		Sequence: bib
 	WithDockedOverlay@FLAME:
+		RequiresCondition: !build-incomplete
 		Sequence: flame
 		Palette: effect
 	WithDockingOverlay@UNLOAD:
+		RequiresCondition: !build-incomplete
 	Power:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
@@ -148,11 +160,15 @@ GASILO:
 		FactionImages:
 			gdi: gasilo.gdi
 			nod: gasilo.nod
-	WithSpriteBody:
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithSiloAnimation:
+		RequiresCondition: !build-incomplete
 	WithIdleOverlay@UNDERLAY:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-underlay
 	WithIdleOverlay@LIGHTS:
+		RequiresCondition: !build-incomplete
 		Sequence: idle-lights
 	StoresResources:
 		PipColor: Green
--- a/mods/ts/rules/shared-support.yaml
+++ b/mods/ts/rules/shared-support.yaml
@@ -32,7 +32,10 @@ NAPULS:
 		Weapon: EMPulseCannon
 		LocalOffset: 212,0,1768
 		LocalYaw: 0,100
+	WithMakeAnimation:
+		Condition: build-incomplete
 	WithSpriteTurret:
+		RequiresCondition: !build-incomplete
 		Sequence: turret
 	Power:
 		Amount: -150