Remove building lock from Sellable.

This commit is contained in:
Paul Chote
2018-10-27 16:56:24 +00:00
committed by abcdefg30
parent 492bcdd9a7
commit 94088d37a6
21 changed files with 30 additions and 104 deletions

View File

@@ -1399,6 +1399,8 @@ GALITE:
Palette: terraindecoration
-WithMakeAnimation:
-WithDeathAnimation:
Sellable:
RequiresCondition: !being-demolished
Health:
HP: 60000
Armor:

View File

@@ -372,9 +372,10 @@
Demolishable:
Condition: being-demolished
Sellable:
RequiresCondition: !being-demolished
RequiresCondition: !build-incomplete && !being-demolished
SellSounds: cashturn.aud
WithMakeAnimation:
Condition: build-incomplete
ThrowsShrapnel@SMALL:
Pieces: 3, 5
ThrowsShrapnel@LARGE:

View File

@@ -22,8 +22,6 @@ GAPOWR:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
@@ -112,8 +110,6 @@ GAPILE:
PrimaryCondition: primary
SelectionNotification: PrimaryBuildingSelected
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights
@@ -178,8 +174,6 @@ GAWEAP:
PrimaryCondition: primary
SelectionNotification: PrimaryBuildingSelected
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@ROOF:
RequiresCondition: !build-incomplete
Sequence: idle-roof
@@ -248,8 +242,6 @@ GAHPAD:
PlayerExperience: 15
StartRepairingNotification: Repairing
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@PLATFORM:
RequiresCondition: !build-incomplete
Sequence: idle-platform
@@ -306,8 +298,6 @@ GADEPT:
RallyPoint:
Palette: mouse
IsPlayerPalette: false
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHT:
RequiresCondition: !build-incomplete
Sequence: idle-light
@@ -373,8 +363,6 @@ GARADR:
RevealsShroud:
Range: 10c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@DISH:
RequiresCondition: !build-incomplete
PauseOnCondition: disabled || empdisable
@@ -414,8 +402,6 @@ GATECH:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
@@ -443,8 +429,6 @@ GAPLUG:
Building:
Footprint: xxx xxx
Dimensions: 2,3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@DISH:
RequiresCondition: !build-incomplete
PauseOnCondition: disabled || empdisable

View File

@@ -76,8 +76,6 @@ GACTWR:
AttackTurreted:
RequiresCondition: tower.vulcan || tower.rocket || tower.sam
PauseOnCondition: empdisable || disabled
WithMakeAnimation:
Condition: build-incomplete
WithSpriteTurret@VULC:
RequiresCondition: !build-incomplete && tower.vulcan
Recoils: false

View File

@@ -25,8 +25,6 @@ NAPOWR:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
@@ -66,8 +64,6 @@ NAAPWR:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !empdisable
Sequence: idle-lights
@@ -123,8 +119,6 @@ NAHAND:
PrimaryCondition: primary
SelectionNotification: PrimaryBuildingSelected
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-lights
@@ -186,8 +180,6 @@ NAWEAP:
PrimaryCondition: primary
SelectionNotification: PrimaryBuildingSelected
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@ROOF:
RequiresCondition: !build-incomplete
Sequence: idle-roof
@@ -250,8 +242,6 @@ NAHPAD:
PlayerExperience: 15
StartRepairingNotification: Repairing
ProductionBar:
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@PLATFORM:
RequiresCondition: !build-incomplete
Sequence: idle-platform
@@ -310,8 +300,6 @@ NARADR:
RevealsShroud:
Range: 10c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@DISH:
RequiresCondition: !build-incomplete
PauseOnCondition: disabled || empdisable
@@ -351,8 +339,6 @@ NATECH:
RevealsShroud:
Range: 4c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
@@ -393,8 +379,6 @@ NATMPL:
MaxHeightDelta: 3
Power:
Amount: -200
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights

View File

@@ -71,8 +71,6 @@ NAPOST:
Amount: -25
RevealsShroud:
Range: 4c0
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: lights
@@ -175,8 +173,6 @@ NALASR:
Armament:
Weapon: TurretLaserFire
LocalOffset: 498,0,317
WithMakeAnimation:
Condition: build-incomplete
RenderVoxels:
WithVoxelTurret:
RequiresCondition: !build-incomplete
@@ -223,8 +219,6 @@ NAOBEL:
RequiresCondition: charging && !disabled
SoundFiles: obelpowr.aud
Interval: 30, 40
WithMakeAnimation:
Condition: build-incomplete
WithChargeOverlay:
RequiresCondition: !build-incomplete
Palette: player
@@ -265,8 +259,6 @@ NASAM:
InitialFacing: 224
AttackTurreted:
PauseOnCondition: empdisable || disabled
WithMakeAnimation:
Condition: build-incomplete
WithSpriteTurret:
RequiresCondition: !build-incomplete
Recoils: false
@@ -302,8 +294,6 @@ NASTLH:
RevealsShroud:
Range: 6c0
MaxHeightDelta: 3
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@pulse:
RequiresCondition: !build-incomplete && !disabled
Sequence: pulse
@@ -352,8 +342,6 @@ NAMISL:
Type: Wood
RevealsShroud:
Range: 4c0
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@LIGHTS:
RequiresCondition: !build-incomplete && !disabled
Sequence: idle-lights
@@ -422,8 +410,6 @@ NAWAST:
Actor: WEED
SpawnOffset: 3,1
Facing: 160
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@GLOW:
RequiresCondition: !build-incomplete
Sequence: idle-glow

View File

@@ -41,8 +41,6 @@ GACNST:
ProductionType: Building
ProductionBar@Defense:
ProductionType: Defense
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@TOP:
RequiresCondition: !build-incomplete
Sequence: idle-top
@@ -104,8 +102,6 @@ PROC:
Actor: HARV
SpawnOffset: 2,1
Facing: 160
WithMakeAnimation:
Condition: build-incomplete
WithIdleOverlay@REDLIGHTS:
RequiresCondition: !build-incomplete
Sequence: idle-redlights
@@ -161,8 +157,6 @@ GASILO:
FactionImages:
gdi: gasilo.gdi
nod: gasilo.nod
WithMakeAnimation:
Condition: build-incomplete
WithSiloAnimation:
RequiresCondition: !build-incomplete
WithIdleOverlay@UNDERLAY:

View File

@@ -32,8 +32,6 @@ NAPULS:
Weapon: EMPulseCannon
LocalOffset: 212,0,1768
LocalYaw: 0,100
WithMakeAnimation:
Condition: build-incomplete
WithSpriteTurret:
RequiresCondition: !build-incomplete
Sequence: turret