Remove Infiltratable trait and refactor surrounding code to use target types

This commit is contained in:
ScottNZ
2014-08-01 01:19:05 +12:00
parent 9422285aa2
commit 058185754e
12 changed files with 54 additions and 94 deletions

View File

@@ -226,7 +226,7 @@ SPY:
TakeCover:
Disguise:
Infiltrates:
Types: Cash, SupportPower, Exploration
Types: SpyInfiltrate
-AutoTarget:
-RenderInfantry:
RenderDisguise:

View File

@@ -81,8 +81,6 @@ GAP:
SPEN:
Inherits: ^Building
Infiltratable:
Type: SupportPower
InfiltrateForSupportPower:
Proxy: powerproxy.sonarpulse
Valued:
@@ -96,7 +94,7 @@ SPEN:
Prerequisites: anypower, ~structures.soviet, ~techlevel.low
Hotkey: y
TargetableBuilding:
TargetTypes: Ground, Water
TargetTypes: Ground, Water, C4, DetonateAttack, SpyInfiltrate
Building:
Power: -30
Footprint: xxx xxx xxx
@@ -137,8 +135,6 @@ SPEN:
SYRD:
Inherits: ^Building
Infiltratable:
Type: SupportPower
InfiltrateForSupportPower:
Proxy: powerproxy.sonarpulse
Buildable:
@@ -152,7 +148,7 @@ SYRD:
Name: Shipyard
Description: Produces and repairs ships\nand transports.
TargetableBuilding:
TargetTypes: Ground, Water
TargetTypes: Ground, Water, C4, DetonateAttack, SpyInfiltrate
Building:
Power: -30
Footprint: xxx xxx xxx
@@ -384,6 +380,8 @@ DOME:
Power: -40
Footprint: xx xx
Dimensions: 2,2
TargetableBuilding:
TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate
RequiresPower:
CanPowerDown:
DisabledOverlay:
@@ -396,8 +394,6 @@ DOME:
Bib:
ProvidesRadar:
IronCurtainable:
Infiltratable:
Type: Exploration
InfiltrateForExploration:
DetectCloaked:
Range: 10
@@ -768,6 +764,8 @@ PROC:
Power: -30
Footprint: _x_ xxx x==
Dimensions: 3,3
TargetableBuilding:
TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate
Health:
HP: 900
Armor:
@@ -788,8 +786,6 @@ PROC:
InitialActivity: FindResources
SpawnOffset: 1,2
Facing: 64
Infiltratable:
Type: Cash
InfiltrateForCash:
Percentage: 50
Minimum: 500

View File

@@ -298,7 +298,7 @@ CHAMSPY:
TakeCover:
Disguise:
Infiltrates:
Types: Cash, SupportPower, Exploration
Types: SpyInfiltrate
-AutoTarget:
-RenderInfantry:
RenderDisguise:

View File

@@ -623,8 +623,6 @@ GARADR:
RequiresPower:
CanPowerDown:
ProvidesRadar:
Infiltratable:
Type: Exploration
InfiltrateForExploration:
DetectCloaked:
Range: 10
@@ -634,6 +632,8 @@ GARADR:
WithIdleOverlay@DISH:
Sequence: idle-dish
PauseOnLowPower: yes
TargetableBuilding:
TargetTypes: Ground, C4, SpyInfiltrate
NARADR:
Inherits: ^Building
@@ -661,8 +661,6 @@ NARADR:
RequiresPower:
CanPowerDown:
ProvidesRadar:
Infiltratable:
Type: Exploration
InfiltrateForExploration:
DetectCloaked:
Range: 10
@@ -672,6 +670,8 @@ NARADR:
WithIdleOverlay@DISH:
Sequence: idle-dish
PauseOnLowPower: yes
TargetableBuilding:
TargetTypes: Ground, C4, SpyInfiltrate
GATECH:
Inherits: ^Building