Remove DisabledOverlay using WithColoredOverlay & remove IDisable from Husk

This commit is contained in:
atlimit8
2017-03-11 09:08:21 -06:00
parent 3111b2cf9b
commit 770efd710b
16 changed files with 70 additions and 95 deletions

View File

@@ -947,3 +947,10 @@
StartDelay: -1
SpawnAtLastPosition: false
RequiresCondition: !inside-tunnel
^DisabledOverlay:
WithColoredOverlay@IDISABLE:
RequiresCondition: disabled
Palette: disabled
GrantConditionOnDisabled@IDISABLE:
Condition: disabled

View File

@@ -1,5 +1,6 @@
GAPOWR:
Inherits: ^Building
Inherits@IDISABLE: ^DisabledOverlay
Buildable:
Queue: Building
BuildPaletteOrder: 10
@@ -35,7 +36,6 @@ GAPOWR:
Targetable:
TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate
ScalePowerWithHealth:
DisabledOverlay:
Pluggable@pluga:
Offset: 0,1
Conditions:
@@ -370,6 +370,7 @@ GATECH:
GAPLUG:
Inherits: ^Building
Inherits@IDISABLE: ^DisabledOverlay
Valued:
Cost: 1000
Tooltip:
@@ -389,7 +390,6 @@ GAPLUG:
IndicatorPalette: mouse
PowerupSpeech: EnablePower
PowerdownSpeech: DisablePower
DisabledOverlay:
WithIdleOverlay@DISH:
Sequence: idle-dish
WithIdleOverlay@LIGHTS:

View File

@@ -43,6 +43,7 @@ GAGATE_B:
GACTWR:
Inherits: ^Defense
Inherits@IDISABLE: ^DisabledOverlay
-WithSpriteBody:
WithWallSpriteBody:
Type: wall
@@ -58,7 +59,6 @@ GACTWR:
Building:
Selectable:
Bounds: 48, 36, 0, -6
DisabledOverlay:
Health:
HP: 500
Armor:

View File

@@ -1,5 +1,6 @@
NAPOWR:
Inherits: ^Building
Inherits@IDISABLE: ^DisabledOverlay
Buildable:
Queue: Building
BuildPaletteOrder: 20
@@ -33,12 +34,12 @@ NAPOWR:
TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate
ScalePowerWithHealth:
PowerTooltip:
DisabledOverlay:
SelectionDecorations:
VisualBounds: 88, 80, 2, -12
NAAPWR:
Inherits: ^Building
Inherits@IDISABLE: ^DisabledOverlay
Buildable:
Queue: Building
BuildPaletteOrder: 120
@@ -71,7 +72,6 @@ NAAPWR:
Targetable:
TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate
ScalePowerWithHealth:
DisabledOverlay:
PowerTooltip:
SelectionDecorations:
VisualBounds: 100, 74, 0, -12

View File

@@ -148,6 +148,7 @@ NAFNCE:
NALASR:
Inherits: ^Defense
Inherits@IDISABLE: ^DisabledOverlay
Valued:
Cost: 300
Tooltip:
@@ -160,7 +161,6 @@ NALASR:
Building:
Selectable:
Bounds: 40, 30, -8, -6
DisabledOverlay:
Health:
HP: 500
Armor:
@@ -188,6 +188,7 @@ NALASR:
NAOBEL:
Inherits: ^Defense
Inherits@IDISABLE: ^DisabledOverlay
Valued:
Cost: 1500
Tooltip:
@@ -203,7 +204,6 @@ NAOBEL:
Selectable:
Bounds: 88, 42, 0, -6
RequiresPower:
DisabledOverlay:
Health:
HP: 725
Armor:
@@ -232,6 +232,7 @@ NAOBEL:
NASAM:
Inherits: ^Defense
Inherits@IDISABLE: ^DisabledOverlay
Valued:
Cost: 500
Tooltip:
@@ -244,7 +245,6 @@ NASAM:
Selectable:
Bounds: 40, 30, -3, -8
RequiresPower:
DisabledOverlay:
Health:
HP: 600
Armor:
@@ -314,6 +314,7 @@ NASTLH:
NAMISL:
Inherits: ^Building
Inherits@IDISABLE: ^DisabledOverlay
Buildable:
Queue: Defense
BuildPaletteOrder: 180
@@ -346,7 +347,6 @@ NAMISL:
PowerupSpeech: EnablePower
PowerdownSpeech: DisablePower
RequiresPower:
DisabledOverlay:
ProvidesPrerequisite@buildingname:
SupportPowerChargeBar:
NukePower:

View File

@@ -1,5 +1,6 @@
NAPULS:
Inherits: ^Defense
Inherits@IDISABLE: ^DisabledOverlay
Valued:
Cost: 1000
Tooltip:
@@ -15,7 +16,6 @@ NAPULS:
Selectable:
Bounds: 78, 54, 0, -12
RequiresPower:
DisabledOverlay:
Health:
HP: 500
Armor: