Merge pull request #11800 from WolfGaming/FixHuntable

RA: Delete the Huntable trait for walls and gates.
This commit is contained in:
Oliver Brakmann
2016-08-12 14:14:07 +02:00
committed by GitHub
4 changed files with 26 additions and 4 deletions

View File

@@ -6,7 +6,6 @@
PlayerExperienceModifier: 1
ScriptTriggers:
UpgradeManager:
Huntable:
RenderDebugState:
^SpriteActor:
@@ -58,6 +57,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^SpriteActor
Huntable:
Mobile:
Crushes: crate
TerrainSpeeds:
@@ -121,6 +121,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^SpriteActor
Huntable:
AppearsOnRadar:
UseLocation: yes
Targetable@GROUND:
@@ -169,6 +170,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^SpriteActor
Huntable:
Health:
Shape: Circle
Radius: 128
@@ -320,6 +322,7 @@
^DINO:
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Huntable:
Health:
HP: 1000
Shape: Circle
@@ -375,6 +378,7 @@
^Viceroid:
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Huntable:
Health:
HP: 300
Shape: Circle
@@ -432,6 +436,7 @@
^Plane:
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Huntable:
AppearsOnRadar:
UseLocation: yes
HiddenUnderFog:
@@ -452,6 +457,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^SpriteActor
Huntable:
Mobile:
Crushes: crate
TerrainSpeeds:
@@ -478,6 +484,7 @@
^Building:
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Huntable:
SelectionDecorations:
Selectable:
Priority: 3

View File

@@ -6,7 +6,6 @@
PlayerExperienceModifier: 1
ScriptTriggers:
UpgradeManager:
Huntable:
RenderDebugState:
^SpriteActor:
@@ -59,6 +58,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^SpriteActor
Huntable:
Mobile:
UpgradeTypes: notmobile
UpgradeMaxEnabledLevel: 0
@@ -161,6 +161,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^SpriteActor
Huntable:
Health:
Shape: Circle
Radius: 96
@@ -227,6 +228,7 @@
^Plane:
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Huntable:
AppearsOnRadar:
UseLocation: true
HiddenUnderFog:
@@ -241,6 +243,7 @@
^Building:
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Huntable:
SelectionDecorations:
Selectable:
Priority: 2

View File

@@ -5,7 +5,6 @@
PlayerExperienceModifier: 1
ScriptTriggers:
UpgradeManager:
Huntable:
RenderDebugState:
^SpriteActor:
@@ -68,6 +67,7 @@
Inherits@2: ^GainsExperience
Inherits@3: ^IronCurtainable
Inherits@4: ^SpriteActor
Huntable:
DrawLineToTarget:
UpdatesPlayerStatistics:
Mobile:
@@ -166,6 +166,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^SpriteActor
Huntable:
DrawLineToTarget:
Health:
HP: 25
@@ -307,6 +308,7 @@
Inherits@2: ^GainsExperience
Inherits@3: ^IronCurtainable
Inherits@4: ^SpriteActor
Huntable:
DrawLineToTarget:
UpdatesPlayerStatistics:
Mobile:
@@ -349,6 +351,7 @@
Inherits@2: ^GainsExperience
Inherits@3: ^IronCurtainable
Inherits@4: ^SpriteActor
Huntable:
DrawLineToTarget:
UpdatesPlayerStatistics:
AppearsOnRadar:
@@ -447,6 +450,7 @@
^Building:
Inherits: ^BasicBuilding
Huntable:
UpdatesPlayerStatistics:
GivesBuildableArea:
RepairableBuilding:
@@ -544,6 +548,7 @@
^TechBuilding:
Inherits: ^BasicBuilding
Huntable:
Health:
HP: 400
Armor:

View File

@@ -6,7 +6,6 @@
PlayerExperienceModifier: 1
ScriptTriggers:
UpgradeManager:
Huntable:
RenderDebugState:
^SpriteActor:
@@ -93,6 +92,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Inherits@3: ^Cloakable
Huntable:
SelectionDecorations:
Palette: pips
Selectable:
@@ -239,6 +239,7 @@
Inherits@2: ^ExistsInWorld
Inherits@3: ^SpriteActor
Inherits@4: ^Cloakable
Huntable:
DrawLineToTarget:
Health:
HP: 50
@@ -420,6 +421,7 @@
Inherits@3: ^EmpDisableMobile
Inherits@4: ^Cloakable
Inherits@5: ^DamagedByVeins
Huntable:
DrawLineToTarget:
Mobile:
Crushes: crate
@@ -525,6 +527,7 @@
Inherits@1: ^GainsExperience
Inherits@2: ^ExistsInWorld
Inherits@3: ^Cloakable
Huntable:
DrawLineToTarget:
AppearsOnRadar:
UseLocation: true
@@ -608,6 +611,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Inherits@3: ^HealsOnTiberium
Huntable:
DrawLineToTarget:
Health:
Shape: Circle
@@ -729,6 +733,7 @@
Inherits@1: ^GainsExperience
Inherits@2: ^ExistsInWorld
Inherits@3: ^SpriteActor
Huntable:
Voiced:
VoiceSet: Vehicle
AttackTurreted:
@@ -755,6 +760,7 @@
Inherits@1: ^EmpDisableMobile
Inherits@2: ^ExistsInWorld
Inherits@3: ^Cloakable
Huntable:
RenderVoxels:
RenderSprites:
WithVoxelBody:
@@ -823,6 +829,7 @@
^Gate:
Inherits: ^Building
Huntable:
Valued:
Cost: 250
Health: