From 861ebd61b7e1442463e8ef0b4333282819e96b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 28 Apr 2015 21:35:31 +0200 Subject: [PATCH 1/6] fix missing make animation for civilian buildings --- mods/cnc/rules/defaults.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 26b118a5f0..7a0f9ab03a 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -459,6 +459,7 @@ GenericVisibility: None FrozenUnderFog: StartsRevealed: true + -WithMakeAnimation: ^CivBuildingHusk: AppearsOnRadar: @@ -475,7 +476,6 @@ FrozenUnderFog: StartsRevealed: true ScriptTriggers: - WithMakeAnimation: ^TechBuilding: Inherits: ^CivBuilding @@ -501,7 +501,6 @@ Palette: terrain EditorAppearance: UseTerrainPalette: true - WithMakeAnimation: ^CivFieldHusk: AppearsOnRadar: @@ -519,7 +518,6 @@ FrozenUnderFog: StartsRevealed: true ScriptTriggers: - WithMakeAnimation: ^Wall: AppearsOnRadar: @@ -575,7 +573,6 @@ FrozenUnderFog: StartsRevealed: true ScriptTriggers: - WithMakeAnimation: ^TibTree: Tooltip: @@ -611,7 +608,6 @@ FrozenUnderFog: StartsRevealed: true ScriptTriggers: - WithMakeAnimation: EditorTilesetFilter: RequireTilesets: DESERT From a424440cd211300011fe1cf4ed25463b411386de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 28 Apr 2015 21:28:37 +0200 Subject: [PATCH 2/6] fix missing aim sequence --- mods/cnc/sequences/vehicles.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index f90da2621f..6dc4a181e6 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -215,7 +215,7 @@ mlrs: turret: Start: 32 Facings: 32 - turret-2: + aim: Start: 64 Facings: 32 turret-3: From c88daef3b3f6be99444a2ce72c8215de7920120a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 23 May 2015 16:10:48 +0200 Subject: [PATCH 3/6] fix missing make and crumble animation --- mods/d2k/rules/arrakis.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/d2k/rules/arrakis.yaml b/mods/d2k/rules/arrakis.yaml index 0b63cb91f1..85e2ce093a 100644 --- a/mods/d2k/rules/arrakis.yaml +++ b/mods/d2k/rules/arrakis.yaml @@ -76,5 +76,6 @@ sietch: Power: Amount: 0 ProvidesPrerequisite@buildingname: + -WithMakeAnimation: -WithCrumbleOverlay: From 13a8f6f5bd021f6db15cdfc947fbd024fe0303b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 28 Apr 2015 21:29:23 +0200 Subject: [PATCH 4/6] remove duplicate and unused land animation --- mods/cnc/sequences/misc.yaml | 13 ------------- mods/d2k/sequences/misc.yaml | 4 ---- 2 files changed, 17 deletions(-) diff --git a/mods/cnc/sequences/misc.yaml b/mods/cnc/sequences/misc.yaml index 12dcb6d553..251fa4e16b 100644 --- a/mods/cnc/sequences/misc.yaml +++ b/mods/cnc/sequences/misc.yaml @@ -121,38 +121,25 @@ allyrepair: crate: idle: ZOffset: -511 - land: - ZOffset: -511 xcratea: idle: xcrate ZOffset: -511 - land: xcrate - ZOffset: -511 xcrateb: idle: xcrate Start: 1 ZOffset: -511 - land: xcrate - Start: 1 - ZOffset: -511 xcratec: idle: xcrate Start: 2 ZOffset: -511 - land: xcrate - Start: 2 - ZOffset: -511 xcrated: idle: xcrate Start: 3 ZOffset: -511 - land: xcrate - Start: 3 - ZOffset: -511 crate-effects: airstrike: deviator diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml index 6cfa4c58fa..2469bf1086 100644 --- a/mods/d2k/sequences/misc.yaml +++ b/mods/d2k/sequences/misc.yaml @@ -313,10 +313,6 @@ crate: Start: 102 ZOffset: -511 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 spicebloom: From 47927963a7f4ccb7ae62509ca1fd4b52670f6994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 28 Apr 2015 21:06:12 +0200 Subject: [PATCH 5/6] fix misnamed TakeCover sequence --- mods/ra/sequences/infantry.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index ed8a7e586b..151823d0d1 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -632,10 +632,15 @@ thf: TilesetOverrides: DESERT: TEMPERAT INTERIOR: TEMPERAT - crawl: + prone-stand: Start: 72 Length: 4 Facings: 8 + prone-run: + Start: 72 + Length: 4 + Facings: 8 + Tick: 80 icon: thficon hijacker: @@ -677,10 +682,15 @@ hijacker: TilesetOverrides: DESERT: TEMPERAT INTERIOR: TEMPERAT - crawl: thf + prone-stand: thf Start: 72 Length: 4 Facings: 8 + prone-run: thf + Start: 72 + Length: 4 + Facings: 8 + Tick: 80 icon: hijackericon e7: From 9773cca21427c7307b6645171973d6fd2424c8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 1 May 2015 22:29:44 +0200 Subject: [PATCH 6/6] rename and fix unused sequences --- mods/cnc/sequences/vehicles.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index 6dc4a181e6..a94194fc37 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -191,10 +191,10 @@ msam: turret: Start: 32 Facings: 32 - aim: + empty-aim: Start: 64 Facings: 32 - turret-3: + aim: Start: 64 Facings: 32 icon: msamicnh.tem @@ -216,9 +216,9 @@ mlrs: Start: 32 Facings: 32 aim: - Start: 64 + Start: 32 Facings: 32 - turret-3: + empty-aim: Start: 96 Facings: 32 icon: mlrsicnh.tem