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

Merge pull request #8000 from pchote/bogus-yaml-removals

Browse Source 
Fix yaml merging
This commit is contained in:
Matthias Mailänder
2015-04-25 13:42:18 +02:00
parent 14777e46c4 8a1f9261c3
commit 175e9a14b7
8 changed files with 156 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ra/maps/desert-shellmap/map.yaml
View File

@@ -1330,7 +1330,7 @@ Rules:
Health:
HP: 200
E7:
-Selectable:
-AnnounceOnKill:
powerproxy.paratroopers:
ParatroopersPower:
DisplayBeacon: false

2
mods/ra/maps/monster-tank-madness/map.yaml
View File

@@ -2102,7 +2102,7 @@ Rules:
MissionObjectives:
EarlyGameOver: true
World:
-CrateDrop:
-CrateSpawner:
-SpawnMPUnits:
-MPStartLocations:
LuaScript:

2
mods/ra/maps/soviet-01/map.yaml
View File

@@ -666,7 +666,7 @@ Rules:
ParatroopersPower@paratroopers:
ChargeTime: 60
DropItems: E1,E1,E1,E2,E2
#-RallyPoint: # TODO https://github.com/OpenRA/OpenRA/issues/6818
-RallyPoint:
-Sellable:
DOME:
-Sellable:

2
mods/ra/maps/survival02/map.yaml
View File

@@ -1029,7 +1029,7 @@ Rules:
MissionObjectives:
EarlyGameOver: true
World:
-CrateDrop:
-CrateSpawner:
-SpawnMPUnits:
-MPStartLocations:
LuaScript:

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

@@ -1,5 +1,40 @@
^Vehicle:
^ExistsInWorld:
AppearsOnRadar:
UpdatesPlayerStatistics:
CombatDebugOverlay:
DrawLineToTarget:
GivesExperience:
BodyOrientation:
ScriptTriggers:
UpgradeManager:
Huntable:
^GainsExperience:
GainsExperience:
GainsStatUpgrades:
SelfHealing@ELITE:
Step: 2
Ticks: 100
HealIfBelow: 1
DamageCooldown: 125
UpgradeTypes: selfheal
UpgradeMinEnabledLevel: 1
^IronCurtainable:
UpgradeOverlay@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
InvulnerabilityUpgrade@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
UpgradeMaxAcceptedLevel: 2
TimedUpgradeBar:
Upgrade: invulnerability
^Vehicle:
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^IronCurtainable
Mobile:
Crushes: mine, crate
TerrainSpeeds:
@@ -22,9 +57,6 @@
CargoType: Vehicle
AttackMove:
HiddenUnderFog:
GainsExperience:
GivesExperience:
DrawLineToTarget:
ActorLostNotification:
ProximityCaptor:
Types: Vehicle
@@ -32,11 +64,8 @@
GpsDot:
String: Vehicle
WithSmoke:
UpdatesPlayerStatistics:
CombatDebugOverlay:
Guard:
Guardable:
BodyOrientation:
Tooltip:
GenericName: Vehicle
EjectOnDeath:
@@ -45,36 +74,18 @@
EjectOnGround: true
EjectInAir: false
AllowUnsuitableCell: false
Huntable:
Capturable:
Type: vehicle
CaptureThreshold: 1
CancelActivity: True
CaptureNotification:
Notification: UnitStolen
ScriptTriggers:
GainsStatUpgrades:
SelfHealing@ELITE:
Step: 2
Ticks: 100
HealIfBelow: 1
DamageCooldown: 125
UpgradeTypes: selfheal
UpgradeMinEnabledLevel: 1
UpgradeManager:
UpgradeOverlay@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
InvulnerabilityUpgrade@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
UpgradeMaxAcceptedLevel: 2
TimedUpgradeBar:
Upgrade: invulnerability
MustBeDestroyed:
^Tank:
AppearsOnRadar:
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^IronCurtainable
Mobile:
Crushes: wall, mine, crate
TerrainSpeeds:
@@ -97,9 +108,6 @@
CargoType: Vehicle
AttackMove:
HiddenUnderFog:
GainsExperience:
GivesExperience:
DrawLineToTarget:
ActorLostNotification:
ProximityCaptor:
Types: Tank
@@ -107,11 +115,8 @@
GpsDot:
String: Vehicle
WithSmoke:
UpdatesPlayerStatistics:
CombatDebugOverlay:
Guard:
Guardable:
BodyOrientation:
Tooltip:
GenericName: Tank
EjectOnDeath:
@@ -120,32 +125,12 @@
EjectOnGround: true
EjectInAir: false
AllowUnsuitableCell: false
Huntable:
Capturable:
Type: vehicle
CaptureThreshold: 1
CancelActivity: True
CaptureNotification:
Notification: UnitStolen
ScriptTriggers:
GainsStatUpgrades:
SelfHealing@ELITE:
Step: 2
Ticks: 100
HealIfBelow: 1
DamageCooldown: 125
UpgradeTypes: selfheal
UpgradeMinEnabledLevel: 1
UpgradeManager:
UpgradeOverlay@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
InvulnerabilityUpgrade@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
UpgradeMaxAcceptedLevel: 2
TimedUpgradeBar:
Upgrade: invulnerability
MustBeDestroyed:
Parachutable:
ParachuteOffset: 0,0,200
@@ -158,7 +143,8 @@
WaterCorpsePalette:
^Infantry:
AppearsOnRadar:
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Health:
Radius: 128
Armor:
@@ -189,9 +175,6 @@
Passenger:
CargoType: Infantry
HiddenUnderFog:
GainsExperience:
GivesExperience:
DrawLineToTarget:
ActorLostNotification:
ProximityCaptor:
Types: Infantry
@@ -200,11 +183,8 @@
String: Infantry
Crushable:
CrushSound: squishy2.aud
UpdatesPlayerStatistics:
CombatDebugOverlay:
Guard:
Guardable:
BodyOrientation:
Tooltip:
GenericName: Soldier
SelfHealing@HOSPITAL:
@@ -217,8 +197,6 @@
GlobalUpgradable:
Upgrades: hospitalheal
Prerequisites: hosp
Huntable:
ScriptTriggers:
DeathSounds@NORMAL:
DeathTypes: 1, 2, 3, 4
DeathSounds@BURNED:
@@ -236,19 +214,12 @@
WaterImpactSound: splash9.aud
Cloneable:
Types: Infantry
GainsStatUpgrades:
SelfHealing@ELITE:
Step: 2
Ticks: 100
HealIfBelow: 1
DamageCooldown: 125
UpgradeTypes: selfheal
UpgradeMinEnabledLevel: 1
UpgradeManager:
MustBeDestroyed:
^Ship:
AppearsOnRadar:
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^IronCurtainable
Mobile:
Crushes: crate
TerrainSpeeds:
@@ -260,9 +231,6 @@
TargetTypes: Ground, Water, Repair
HiddenUnderFog:
AttackMove:
GainsExperience:
GivesExperience:
DrawLineToTarget:
ActorLostNotification:
Notification: NavalUnitLost
ProximityCaptor:
@@ -271,37 +239,16 @@
GpsDot:
String: Ship
WithSmoke:
UpdatesPlayerStatistics:
CombatDebugOverlay:
Guard:
Guardable:
BodyOrientation:
Tooltip:
GenericName: Ship
Huntable:
ScriptTriggers:
GainsStatUpgrades:
SelfHealing@ELITE:
Step: 2
Ticks: 100
HealIfBelow: 1
DamageCooldown: 125
UpgradeTypes: selfheal
UpgradeMinEnabledLevel: 1
UpgradeManager:
UpgradeOverlay@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
InvulnerabilityUpgrade@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
UpgradeMaxAcceptedLevel: 2
TimedUpgradeBar:
Upgrade: invulnerability
UpgradeMinEnabledLevel: 1
MustBeDestroyed:
^Plane:
Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^IronCurtainable
AppearsOnRadar:
UseLocation: true
SelectionDecorations:
@@ -314,9 +261,6 @@
AttackMove:
Guard:
Guardable:
GainsExperience:
GivesExperience:
DrawLineToTarget:
ActorLostNotification:
Notification: AirUnitLost
ProximityCaptor:
@@ -330,31 +274,8 @@
GivesBounty:
GpsDot:
String: Plane
UpdatesPlayerStatistics:
CombatDebugOverlay:
BodyOrientation:
Tooltip:
GenericName: Plane
Huntable:
ScriptTriggers:
GainsStatUpgrades:
SelfHealing@ELITE:
Step: 2
Ticks: 100
HealIfBelow: 1
DamageCooldown: 125
UpgradeTypes: selfheal
UpgradeMinEnabledLevel: 1
UpgradeManager:
UpgradeOverlay@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
InvulnerabilityUpgrade@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
UpgradeMaxAcceptedLevel: 2
TimedUpgradeBar:
Upgrade: invulnerability
WithShadow:
MustBeDestroyed:
@@ -367,7 +288,8 @@
Hovers:
^Building:
AppearsOnRadar:
Inherits@1: ^ExistsInWorld
Inherits@2: ^IronCurtainable
SelectionDecorations:
Selectable:
Priority: 3
@@ -393,7 +315,6 @@
ActorTypes: e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,e6,e6,e6,e6,e6
MustBeDestroyed:
RequiredForShortGame: true
GivesExperience:
CaptureNotification:
EditorAppearance:
RelativeToTopLeft: true
@@ -404,29 +325,14 @@
SellSounds: cashturn.aud
AcceptsSupplies:
GivesBounty:
UpdatesPlayerStatistics:
CombatDebugOverlay:
Guardable:
Range: 3
BodyOrientation:
FrozenUnderFog:
Tooltip:
GenericName: Structure
GpsDot:
String: Structure
Huntable:
Demolishable:
ScriptTriggers:
UpgradeManager:
UpgradeOverlay@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
InvulnerabilityUpgrade@IRONCURTAIN:
UpgradeTypes: invulnerability
UpgradeMinEnabledLevel: 1
UpgradeMaxAcceptedLevel: 2
TimedUpgradeBar:
Upgrade: invulnerability
^Defense:
Inherits: ^Building