epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11800 from WolfGaming/FixHuntable

Browse Source 
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
parent 9604bf4cbd 299e925180
commit da3333073f
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mods/cnc/rules/defaults.yaml
View File

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

5
mods/d2k/rules/defaults.yaml
View File

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

7
mods/ra/rules/defaults.yaml
View File

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

9
mods/ts/rules/defaults.yaml
View File

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