Render building lights as their own tint-ignoring animations.

This commit is contained in:
Paul Chote
2021-02-05 21:30:56 +00:00
committed by reaperrr
parent 5832ec76d4
commit 08c7c80bb7
8 changed files with 607 additions and 89 deletions

View File

@@ -752,8 +752,9 @@ CAARAY:
Sequence: idle-radar
WithIdleOverlay@SCANNER:
Sequence: idle-scanner
WithIdleOverlay@LIGHT:
Sequence: idle-light
WithIdleOverlay@LIGHT-bright:
Sequence: idle-light-bright
Palette: bright
ThrowsShrapnel@SMALL:
Pieces: 5, 7
ThrowsShrapnel@LARGE:
@@ -1319,10 +1320,13 @@ CTDAM:
Prerequisite: anypower
MapEditorData:
ExcludeTilesets: SNOW
WithIdleOverlay@LIGHTS:
Sequence: idle-lights
WithIdleOverlay@WATER:
Sequence: idle-water
WithIdleOverlay@LIGHT-BRIGHT:
Sequence: idle-lights-bright
Palette: bright
WithIdleOverlay@WATER-A:
Sequence: idle-water-a
WithIdleOverlay@WATER-B:
Sequence: idle-water-b
ThrowsShrapnel@SMALL:
Pieces: 5, 9
ThrowsShrapnel@LARGE:
@@ -1367,10 +1371,25 @@ GAKODK:
Palette: player
WithIdleOverlay@LARGELIGHTS:
Sequence: large-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHT-BRIGHT:
Sequence: large-lights-bright
Palette: bright
WithIdleOverlay@SMALLLIGHT:
Sequence: small-light
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@SMALLLIGHT-BRIGHT:
Sequence: small-light-bright
Palette: bright
WithIdleOverlay@SMALLLIGHTS:
Sequence: small-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@SMALLLIGHTS-BRIGHT:
Sequence: small-lights-bright
Palette: bright
GAOLDCC1:
Inherits: ^OldBase
@@ -1456,8 +1475,9 @@ GASPOT:
RevealsShroud:
Range: 6c0
MaxHeightDelta: 3
WithIdleOverlay@LIGHTS:
Sequence: idle-lights
WithIdleOverlay@LIGHTS-BRIGHT:
Sequence: idle-lights-bright
Palette: bright
MapEditorData:
Categories: Civilian building
IsometricSelectable:
@@ -1715,6 +1735,11 @@ NAMNTK:
Palette: player
WithIdleOverlay@LIGHTS:
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHT-BRIGHT:
Sequence: idle-lights-bright
Palette: bright
IsometricSelectable:
Height: 36

View File

@@ -25,10 +25,19 @@ GAPOWR:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights-bright
Palette: bright
WithIdleOverlay@PLUG:
RequiresCondition: !build-incomplete
PauseOnCondition: empdisable
Sequence: idle-plug
WithMakeOverlay@MAKE-BRIGHT:
Sequence: make-bright
Palette: bright
Power:
Amount: 100
RequiresCondition: !empdisable
@@ -171,9 +180,16 @@ GAPILE:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights
WithIdleOverlay@LIGHT:
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-light
Sequence: idle-lights-bright
Palette: bright
WithIdleOverlay@LIGHT-BRIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-light-bright
Palette: bright
WithIdleOverlay@FLAG:
RequiresCondition: !build-incomplete
Sequence: idle-flag
@@ -228,15 +244,30 @@ GAWEAP:
WithIdleOverlay@WHITELIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights-white
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@WHITELIGHTS-BRIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-lights-white-bright
Palette: bright
WithIdleOverlay@REDLIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights-red
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@REDLIGHTS-BRIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-lights-red-bright
Palette: bright
WithIdleOverlay@TURBINES:
RequiresCondition: !build-incomplete
Sequence: idle-turbines
WithIdleOverlay@BIB:
RequiresCondition: !build-incomplete
Sequence: bib
WithMakeOverlay@MAKE-BRIGHT:
Sequence: make-bright
Palette: bright
Power:
Amount: -30
ProvidesPrerequisite@buildingname:
@@ -287,8 +318,14 @@ GAHPAD:
RequiresCondition: !build-incomplete
Sequence: idle-platform
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights-bright
Palette: bright
WithDeathAnimation@BIB:
DeathSequence: dead-platform
UseDeathTypeSuffix: false
@@ -329,18 +366,39 @@ GADEPT:
WithIdleOverlay@LIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-light
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHT-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-light-bright
Palette: bright
WithIdleOverlay@GROUND:
RequiresCondition: !build-incomplete
Sequence: ground
WithIdleOverlay@CIRCUITS:
RequiresCondition: !build-incomplete
Sequence: circuits
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@CIRCUITS-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: circuits-bright
Palette: bright
WithRepairOverlay@CRANE:
RequiresCondition: !build-incomplete
PauseOnCondition: empdisable
StartSequence: crane-start
Sequence: crane-loop
EndSequence: crane-end
Palette: player-nobright
IsPlayerPalette: True
WithRepairOverlay@CRANE-BRIGHT:
RequiresCondition: !build-incomplete
PauseOnCondition: empdisable
StartSequence: crane-start
Sequence: crane-loop-bright
EndSequence: crane-end
Palette: bright
WithRepairOverlay@PLATFORM:
RequiresCondition: !build-incomplete && !empdisable
Sequence: platform
@@ -427,6 +485,12 @@ GATECH:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights-bright
Palette: bright
Power:
Amount: -150
ProvidesPrerequisite@buildingname:
@@ -455,7 +519,8 @@ GAPLUG:
Sequence: idle-dish
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled && !empdisable
Sequence: idle-lights
Sequence: idle-lights-bright
Palette: bright
WithIdleOverlay@STRIP:
RequiresCondition: !build-incomplete && !disabled && !empdisable
Sequence: idle-strip
@@ -541,10 +606,24 @@ GAPLUG:
RequiresCondition: !build-incomplete && plug.hunterseekera
PauseOnCondition: disabled
Sequence: idle-hunterseekera
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@hunterseekera-bright:
RequiresCondition: !build-incomplete && plug.hunterseekera
PauseOnCondition: disabled
Sequence: idle-hunterseekera-bright
Palette: bright
WithIdleOverlay@droppoda:
RequiresCondition: !build-incomplete && plug.droppoda
PauseOnCondition: disabled
Sequence: idle-droppoda
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@droppoda-bright:
RequiresCondition: !build-incomplete && plug.droppoda
PauseOnCondition: disabled
Sequence: idle-droppoda-bright
Palette: bright
Pluggable@plugb:
Offset: 1,2
Conditions:
@@ -567,10 +646,24 @@ GAPLUG:
RequiresCondition: !build-incomplete && plug.hunterseekerb
PauseOnCondition: disabled
Sequence: idle-hunterseekerb
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@hunterseekerb-bright:
RequiresCondition: !build-incomplete && plug.hunterseekerb
PauseOnCondition: disabled
Sequence: idle-hunterseekerb-bright
Palette: bright
WithIdleOverlay@droppodb:
RequiresCondition: plug.droppodb
PauseOnCondition: disabled
Sequence: idle-droppodb
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@droppodb-bright:
RequiresCondition: plug.droppodb
PauseOnCondition: disabled
Sequence: idle-droppodb-bright
Palette: bright
ProvidesPrerequisite@buildingname:
ProvidesPrerequisite@pluggableion:
RequiresCondition: !plug.ioncannona && !plug.ioncannonb

View File

@@ -115,6 +115,15 @@ GACTWR:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights-bright
Palette: bright
WithMakeOverlay@MAKE-BRIGHT:
Sequence: make-bright
Palette: bright
LineBuildNode:
Types: turret
Power@base:

View File

@@ -25,6 +25,12 @@ NAPOWR:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights-bright
Palette: bright
Power:
Amount: 100
RequiresCondition: !empdisable
@@ -62,6 +68,12 @@ NAAPWR:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights-bright
Palette: bright
Power:
Amount: 200
RequiresCondition: !empdisable
@@ -152,12 +164,14 @@ NAHAND:
PauseOnCondition: empdisable
ProductionBar:
ProductionType: Infantry
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights
WithIdleOverlay@LIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-light
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights-bright
Palette: bright
WithIdleOverlay@LIGHT-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-light-bright
Palette: bright
Power:
Amount: -20
ProvidesPrerequisite@buildingname:
@@ -209,6 +223,12 @@ NAWEAP:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights-bright
Palette: bright
WithIdleOverlay@BIB:
RequiresCondition: !build-incomplete
Sequence: bib
@@ -262,8 +282,14 @@ NAHPAD:
RequiresCondition: !build-incomplete
Sequence: idle-platform
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights-bright
Palette: bright
WithDeathAnimation@BIB:
DeathSequence: dead-platform
UseDeathTypeSuffix: false
@@ -344,6 +370,12 @@ NATECH:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights-bright
Palette: bright
Power:
Amount: -150
ProvidesPrerequisite@buildingname:
@@ -422,6 +454,12 @@ NATMPL:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights-bright
Palette: bright
ProduceActorPower:
PauseOnCondition: empdisable || disabled
Description: Hunter Seeker
@@ -467,6 +505,12 @@ NAMISL:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights-bright
Palette: bright
Power:
Amount: -50
ProvidesPrerequisite@buildingname:
@@ -483,9 +527,9 @@ NAMISL:
IncomingSpeechNotification: MissileLaunchDetected
LaunchSound: icbm1.aud
MissileWeapon: ClusterMissile
MissileDelay: 10
MissileDelay: 18
DetonationAltitude: 5c0
SpawnOffset: 72,72,0
SpawnOffset: 0, 0c128, 0c512
DisplayTimerRelationships: None
DisplayBeacon: False
DisplayRadarPing: True
@@ -496,6 +540,12 @@ NAMISL:
TrailInterval: 0
TrailSequences: idle
WithSupportPowerActivationOverlay:
Palette: player-nobright
IsPlayerPalette: True
WithSupportPowerActivationOverlay@BRIGHT:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights-bright
Palette: bright
NAWAST:
Inherits: ^Building
@@ -537,7 +587,8 @@ NAWAST:
Sequence: idle-glow
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights
Sequence: idle-lights-bright
Palette: bright
WithIdleOverlay@BIB:
RequiresCondition: !build-incomplete
Sequence: bib

View File

@@ -72,12 +72,19 @@ NAPOST:
GrantCondition@IDISABLE:
RequiresCondition: lowpower || powerdown || empdisable
Condition: disabled
WithIdleOverlay@LIGHTS:
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !disabled
Sequence: lights
Sequence: lights-bright
Palette: bright
WithIdleOverlay@CHAINOFLIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: chainoflights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@CHAINOFLIGHTS-BRIGHT:
RequiresCondition: !build-incomplete && !disabled
Sequence: chainoflights-bright
Palette: bright
LineBuildSegmentExternalCondition:
RequiresCondition: !build-incomplete && !disabled
Condition: active-posts
@@ -113,11 +120,27 @@ NAFNCE:
Type: laserfence
Sequence: enabled-x
Name: x-enabled
Palette: player-nobright
IsPlayerPalette: True
WithWallSpriteBody@XENABLED-BRIGHT:
RequiresCondition: laserfence-direction-x && active-posts == 2
Type: laserfence
Sequence: enabled-x-bright
Name: x-enabled-bright
Palette: bright
WithWallSpriteBody@YENABLED:
RequiresCondition: laserfence-direction-y && active-posts == 2
Type: laserfence
Sequence: enabled-y
Name: y-enabled
Palette: player-nobright
IsPlayerPalette: True
WithWallSpriteBody@YENABLED-BRIGHT:
RequiresCondition: laserfence-direction-y && active-posts == 2
Type: laserfence
Sequence: enabled-y-bright
Name: y-enabled-bright
Palette: bright
WithSpriteBody@XDISABLED:
RequiresCondition: laserfence-direction-x && active-posts < 2
Sequence: disabled-x

View File

@@ -65,12 +65,27 @@ GACNST:
WithIdleOverlay@TOP:
RequiresCondition: !build-incomplete
Sequence: idle-top
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@TOP-BRIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-top-bright
Palette: bright
WithIdleOverlay@SIDE:
RequiresCondition: !build-incomplete
Sequence: idle-side
WithIdleOverlay@FRONT:
RequiresCondition: !build-incomplete
Sequence: idle-front
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@FRONT-BRIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-front-bright
Palette: bright
WithMakeOverlay@MAKE-BRIGHT:
Sequence: make-bright
Palette: bright
WithBuildingPlacedOverlay:
RequiresCondition: !build-incomplete
Power:
@@ -116,9 +131,15 @@ PROC:
Actor: HARV
SpawnOffset: 2,1
Facing: 640
WithIdleOverlay@REDLIGHTS:
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-redlights
Sequence: idle-lights
Palette: player-nobright
IsPlayerPalette: True
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-lights-bright
Palette: bright
WithIdleOverlay@BIB:
RequiresCondition: !build-incomplete
Sequence: bib
@@ -184,9 +205,10 @@ GASILO:
Sequence: stages
WithSpriteBody:
Sequence: idle-underlay
WithIdleOverlay@LIGHTS:
WithIdleOverlay@LIGHTS-BRIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-lights
Sequence: idle-lights-bright
Palette: bright
StoresResources:
Capacity: 1500
Power: