Merge pull request #8223 from Mailaender/fix-sequences

Fixed several broken YAML sequences
This commit is contained in:
Paul Chote
2015-05-24 13:12:22 +01:00
6 changed files with 19 additions and 29 deletions

View File

@@ -474,6 +474,7 @@
GenericVisibility: None GenericVisibility: None
FrozenUnderFog: FrozenUnderFog:
StartsRevealed: true StartsRevealed: true
-WithMakeAnimation:
^CivBuildingHusk: ^CivBuildingHusk:
AppearsOnRadar: AppearsOnRadar:
@@ -490,7 +491,6 @@
FrozenUnderFog: FrozenUnderFog:
StartsRevealed: true StartsRevealed: true
ScriptTriggers: ScriptTriggers:
WithMakeAnimation:
^TechBuilding: ^TechBuilding:
Inherits: ^CivBuilding Inherits: ^CivBuilding
@@ -516,7 +516,6 @@
Palette: terrain Palette: terrain
EditorAppearance: EditorAppearance:
UseTerrainPalette: true UseTerrainPalette: true
WithMakeAnimation:
^CivFieldHusk: ^CivFieldHusk:
AppearsOnRadar: AppearsOnRadar:
@@ -534,7 +533,6 @@
FrozenUnderFog: FrozenUnderFog:
StartsRevealed: true StartsRevealed: true
ScriptTriggers: ScriptTriggers:
WithMakeAnimation:
^Wall: ^Wall:
AppearsOnRadar: AppearsOnRadar:
@@ -590,7 +588,6 @@
FrozenUnderFog: FrozenUnderFog:
StartsRevealed: true StartsRevealed: true
ScriptTriggers: ScriptTriggers:
WithMakeAnimation:
^TibTree: ^TibTree:
Tooltip: Tooltip:
@@ -626,7 +623,6 @@
FrozenUnderFog: FrozenUnderFog:
StartsRevealed: true StartsRevealed: true
ScriptTriggers: ScriptTriggers:
WithMakeAnimation:
EditorTilesetFilter: EditorTilesetFilter:
RequireTilesets: DESERT RequireTilesets: DESERT

View File

@@ -121,38 +121,25 @@ allyrepair:
crate: crate:
idle: idle:
ZOffset: -511 ZOffset: -511
land:
ZOffset: -511
xcratea: xcratea:
idle: xcrate idle: xcrate
ZOffset: -511 ZOffset: -511
land: xcrate
ZOffset: -511
xcrateb: xcrateb:
idle: xcrate idle: xcrate
Start: 1 Start: 1
ZOffset: -511 ZOffset: -511
land: xcrate
Start: 1
ZOffset: -511
xcratec: xcratec:
idle: xcrate idle: xcrate
Start: 2 Start: 2
ZOffset: -511 ZOffset: -511
land: xcrate
Start: 2
ZOffset: -511
xcrated: xcrated:
idle: xcrate idle: xcrate
Start: 3 Start: 3
ZOffset: -511 ZOffset: -511
land: xcrate
Start: 3
ZOffset: -511
crate-effects: crate-effects:
airstrike: deviator airstrike: deviator

View File

@@ -191,10 +191,10 @@ msam:
turret: turret:
Start: 32 Start: 32
Facings: 32 Facings: 32
aim: empty-aim:
Start: 64 Start: 64
Facings: 32 Facings: 32
turret-3: aim:
Start: 64 Start: 64
Facings: 32 Facings: 32
icon: msamicnh.tem icon: msamicnh.tem
@@ -215,10 +215,10 @@ mlrs:
turret: turret:
Start: 32 Start: 32
Facings: 32 Facings: 32
turret-2: aim:
Start: 64 Start: 32
Facings: 32 Facings: 32
turret-3: empty-aim:
Start: 96 Start: 96
Facings: 32 Facings: 32
icon: mlrsicnh.tem icon: mlrsicnh.tem

View File

@@ -76,5 +76,6 @@ sietch:
Power: Power:
Amount: 0 Amount: 0
ProvidesPrerequisite@buildingname: ProvidesPrerequisite@buildingname:
-WithMakeAnimation:
-WithCrumbleOverlay: -WithCrumbleOverlay:

View File

@@ -306,10 +306,6 @@ crate:
Start: 102 Start: 102
ZOffset: -511 ZOffset: -511
Offset: -16,-16 Offset: -16,-16
land: DATA.R8
Start: 102
ZOffset: -511
Offset: -16,-16
# TODO: keep the redundant spicebloom.shp for now for the awful WinForms maps editor # TODO: keep the redundant spicebloom.shp for now for the awful WinForms maps editor
spicebloom: spicebloom:

View File

@@ -632,10 +632,15 @@ thf:
TilesetOverrides: TilesetOverrides:
DESERT: TEMPERAT DESERT: TEMPERAT
INTERIOR: TEMPERAT INTERIOR: TEMPERAT
crawl: prone-stand:
Start: 72 Start: 72
Length: 4 Length: 4
Facings: 8 Facings: 8
prone-run:
Start: 72
Length: 4
Facings: 8
Tick: 80
icon: thficon icon: thficon
hijacker: hijacker:
@@ -677,10 +682,15 @@ hijacker:
TilesetOverrides: TilesetOverrides:
DESERT: TEMPERAT DESERT: TEMPERAT
INTERIOR: TEMPERAT INTERIOR: TEMPERAT
crawl: thf prone-stand: thf
Start: 72 Start: 72
Length: 4 Length: 4
Facings: 8 Facings: 8
prone-run: thf
Start: 72
Length: 4
Facings: 8
Tick: 80
icon: hijackericon icon: hijackericon
e7: e7: