diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeMapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeMapCommand.cs index 81e4c74ec9..de0f6d4bdc 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeMapCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeMapCommand.cs @@ -68,6 +68,7 @@ namespace OpenRA.Mods.Common.UtilityCommands var map = new Map(modData, package); ProcessYaml(modData, map, map.WeaponDefinitions, engineDate, UpgradeRules.UpgradeWeaponRules); ProcessYaml(modData, map, map.RuleDefinitions, engineDate, UpgradeRules.UpgradeActorRules); + ProcessYaml(modData, map, map.SequenceDefinitions, engineDate, UpgradeRules.UpgradeSequences); UpgradeRules.UpgradePlayers(modData, engineDate, ref map.PlayerDefinitions, null, 0); UpgradeRules.UpgradeActors(modData, engineDate, ref map.ActorDefinitions, null, 0); map.Save(package); diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeModCommand.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeModCommand.cs index a47da3e330..c2e6a68d99 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeModCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeModCommand.cs @@ -69,6 +69,7 @@ namespace OpenRA.Mods.Common.UtilityCommands ProcessYaml("Rules", modData.Manifest.Rules, modData, engineDate, UpgradeRules.UpgradeActorRules); ProcessYaml("Weapons", modData.Manifest.Weapons, modData, engineDate, UpgradeRules.UpgradeWeaponRules); + ProcessYaml("Sequences", modData.Manifest.Sequences, modData, engineDate, UpgradeRules.UpgradeSequences); ProcessYaml("Tilesets", modData.Manifest.TileSets, modData, engineDate, UpgradeRules.UpgradeTileset); ProcessYaml("Cursors", modData.Manifest.Cursors, modData, engineDate, UpgradeRules.UpgradeCursors); ProcessYaml("Chrome Metrics", modData.Manifest.ChromeMetrics, modData, engineDate, UpgradeRules.UpgradeChromeMetrics); diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 61a4a7b4e7..a69e512444 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -329,6 +329,36 @@ namespace OpenRA.Mods.Common.UtilityCommands } } + static int RemapD2k106Sequence(int frame) + { + if (frame < 2518) + return frame; + if (frame < 3370) + return frame + 248; + if (frame < 4011) + return frame + 253; + if (frame < 4036) + return frame + 261; + return frame + 264; + } + + internal static void UpgradeSequences(ModData modData, int engineVersion, ref List nodes, MiniYamlNode parent, int depth) + { + foreach (var node in nodes) + { + if (engineVersion < 20160730 && modData.Manifest.Mod.Id == "d2k" && depth == 2) + { + if (node.Key == "Start") + node.Value.Value = RemapD2k106Sequence(FieldLoader.GetValue("", node.Value.Value)).ToString(); + if (node.Key == "Frames") + node.Value.Value = FieldLoader.GetValue("", node.Value.Value) + .Select(RemapD2k106Sequence).JoinWith(", "); + } + + UpgradeSequences(modData, engineVersion, ref node.Value.Nodes, node, depth + 1); + } + } + internal static void UpgradeTileset(ModData modData, int engineVersion, ref List nodes, MiniYamlNode parent, int depth) { foreach (var node in nodes) diff --git a/mods/d2k/bits/xmas/bloxxmas00.tmp b/mods/d2k/bits/xmas/bloxxmas00.tmp deleted file mode 100644 index 9930a985da..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas00.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas01.tmp b/mods/d2k/bits/xmas/bloxxmas01.tmp deleted file mode 100644 index a9b2ce9f7d..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas01.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas02.tmp b/mods/d2k/bits/xmas/bloxxmas02.tmp deleted file mode 100644 index 4fe015dccb..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas02.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas03.tmp b/mods/d2k/bits/xmas/bloxxmas03.tmp deleted file mode 100644 index 5e1ed97b3d..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas03.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas04.tmp b/mods/d2k/bits/xmas/bloxxmas04.tmp deleted file mode 100644 index 441ba1354e..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas04.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas05.tmp b/mods/d2k/bits/xmas/bloxxmas05.tmp deleted file mode 100644 index 2cd0333ad2..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas05.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas06.tmp b/mods/d2k/bits/xmas/bloxxmas06.tmp deleted file mode 100644 index 96e432d7de..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas06.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas07.tmp b/mods/d2k/bits/xmas/bloxxmas07.tmp deleted file mode 100644 index 9a729e076c..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas07.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas08.tmp b/mods/d2k/bits/xmas/bloxxmas08.tmp deleted file mode 100644 index 8b96a49d42..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas08.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas09.tmp b/mods/d2k/bits/xmas/bloxxmas09.tmp deleted file mode 100644 index 8b56275d99..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas09.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas10.tmp b/mods/d2k/bits/xmas/bloxxmas10.tmp deleted file mode 100644 index 6da401d11c..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas10.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas11.tmp b/mods/d2k/bits/xmas/bloxxmas11.tmp deleted file mode 100644 index f416f57454..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas11.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas12.tmp b/mods/d2k/bits/xmas/bloxxmas12.tmp deleted file mode 100644 index bc2be2f250..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas12.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas13.tmp b/mods/d2k/bits/xmas/bloxxmas13.tmp deleted file mode 100644 index 01e2ceedaa..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas13.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas14.tmp b/mods/d2k/bits/xmas/bloxxmas14.tmp deleted file mode 100644 index bfe87c19fe..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas14.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas15.tmp b/mods/d2k/bits/xmas/bloxxmas15.tmp deleted file mode 100644 index ff0294ebc1..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas15.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas16.tmp b/mods/d2k/bits/xmas/bloxxmas16.tmp deleted file mode 100644 index 7828c8d83f..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas16.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas17.tmp b/mods/d2k/bits/xmas/bloxxmas17.tmp deleted file mode 100644 index 6815e68bb0..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas17.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas18.tmp b/mods/d2k/bits/xmas/bloxxmas18.tmp deleted file mode 100644 index 1d8931ec1c..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas18.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas19.tmp b/mods/d2k/bits/xmas/bloxxmas19.tmp deleted file mode 100644 index d09979a49c..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas19.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/bloxxmas20.tmp b/mods/d2k/bits/xmas/bloxxmas20.tmp deleted file mode 100644 index b874a34edf..0000000000 Binary files a/mods/d2k/bits/xmas/bloxxmas20.tmp and /dev/null differ diff --git a/mods/d2k/bits/xmas/grenade.shp b/mods/d2k/bits/xmas/grenade.shp deleted file mode 100644 index ab850bf904..0000000000 Binary files a/mods/d2k/bits/xmas/grenade.shp and /dev/null differ diff --git a/mods/d2k/bits/xmas/grenadier.shp b/mods/d2k/bits/xmas/grenadier.shp deleted file mode 100644 index fbc70c8b39..0000000000 Binary files a/mods/d2k/bits/xmas/grenadier.shp and /dev/null differ diff --git a/mods/d2k/bits/xmas/grenadiericon.shp b/mods/d2k/bits/xmas/grenadiericon.shp deleted file mode 100644 index debecb5b74..0000000000 Binary files a/mods/d2k/bits/xmas/grenadiericon.shp and /dev/null differ diff --git a/mods/d2k/bits/xmas/raidersicon.shp b/mods/d2k/bits/xmas/raidersicon.shp deleted file mode 100644 index 8ede09bbec..0000000000 Binary files a/mods/d2k/bits/xmas/raidersicon.shp and /dev/null differ diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index f719b87328..4dff080cc6 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -21,7 +21,6 @@ Packages: ~SOUND.RS d2k|bits d2k|bits/tex - d2k|bits/xmas d2k|uibits MapFolders: diff --git a/mods/d2k/rules/palettes.yaml b/mods/d2k/rules/palettes.yaml index 7915dc9540..9fac9205e8 100644 --- a/mods/d2k/rules/palettes.yaml +++ b/mods/d2k/rules/palettes.yaml @@ -35,7 +35,7 @@ PaletteFromR8@moveflash: Name: moveflash Filename: DATA.R8 - Offset: 2572352 + Offset: 2652107 InvertColor: true AllowModifiers: false PaletteFromRGBA@disabled: diff --git a/mods/d2k/sequences/aircraft.yaml b/mods/d2k/sequences/aircraft.yaml index e3905c5ed1..08b4eb8336 100644 --- a/mods/d2k/sequences/aircraft.yaml +++ b/mods/d2k/sequences/aircraft.yaml @@ -3,7 +3,7 @@ carryall: Start: 1923 Facings: -32 icon: DATA.R8 - Start: 4029 + Start: 4290 Offset: -30,-24 ornithopter: @@ -14,10 +14,10 @@ ornithopter: Tick: 120 Transpose: true icon: DATA.R8 - Start: 4031 + Start: 4292 Offset: -30,-24 frigate: idle: DATA.R8 Start: 2517 - Facings: 1 \ No newline at end of file + Facings: 1 diff --git a/mods/d2k/sequences/infantry.yaml b/mods/d2k/sequences/infantry.yaml index dece805a78..77a87abcfa 100644 --- a/mods/d2k/sequences/infantry.yaml +++ b/mods/d2k/sequences/infantry.yaml @@ -56,7 +56,7 @@ light_inf: Tick: 800 ZOffset: -511 icon: DATA.R8 - Start: 4011 + Start: 4272 Offset: -30,-24 trooper: @@ -116,7 +116,7 @@ trooper: Tick: 800 ZOffset: -511 icon: DATA.R8 - Start: 4012 + Start: 4273 Offset: -30,-24 engineer: @@ -167,7 +167,7 @@ engineer: Tick: 800 ZOffset: -511 icon: DATA.R8 - Start: 4013 + Start: 4274 Offset: -30,-24 thumper: @@ -201,7 +201,7 @@ thumper: Length: 5 Tick: 480 thump-sand: DATA.R8 - Frames: 3629, 3630, 3626, 3627, 3628 + Frames: 3882, 3883, 3879, 3880, 3881 Length: 5 Tick: 480 BlendMode: Multiply @@ -227,7 +227,7 @@ thumper: Tick: 800 ZOffset: -511 icon: DATA.R8 - Start: 4014 + Start: 4275 Offset: -30,-24 thumping: @@ -243,7 +243,7 @@ thumping: Length: 5 Tick: 150 icon: DATA.R8 - Frames: 4014 + Frames: 4275 Offset: -30,-24 fremen: @@ -304,7 +304,7 @@ fremen: Tick: 800 ZOffset: -511 icon: DATA.R8 - Start: 4032 + Start: 4293 Offset: -30,-24 saboteur: @@ -355,7 +355,7 @@ saboteur: Tick: 800 ZOffset: -511 icon: DATA.R8 - Start: 4034 + Start: 4295 Offset: -30,-24 sardaukar: @@ -416,100 +416,105 @@ sardaukar: Tick: 800 ZOffset: -511 icon: DATA.R8 - Start: 4015 + Start: 4276 Offset: -30,-24 -grenadier: # 2502 - 2749 in 1.06 DATA.R8 - Defaults: - Offset: 1,-4 - stand: grenadier.shp +grenadier: + stand: DATA.R8 + Start: 2518 Facings: -8 - idle: grenadier.shp - Start: 203 - Length: 16 - run: grenadier.shp - Start: 8 - Length: 6 - Facings: 8 - Tick: 120 - throw: grenadier.shp - Start: 56 - Length: 6 - Facings: 8 - Tick: 120 - die1: grenadier.shp - Start: 176 - Length: 19 - die2: grenadier.shp - Start: 176 - Length: 19 - die3: grenadier.shp - Start: 176 - Length: 19 - die4: grenadier.shp - Start: 176 - Length: 19 - die-crushed: grenadier.shp - Start: 195 + Transpose: true + idle: DATA.R8 + Frames: 2700, 2707, 2714, 2721, 2728, 2735, 2742, 2749 Length: 8 + idle2: DATA.R8 + Frames: 2699, 2706, 2713, 2720, 2727, 2734, 2741, 2748 + Length: 8 + run: DATA.R8 + Start: 2526 + Length: 6 + Facings: -8 + Transpose: true + Tick: 120 + throw: DATA.R8 + Start: 2574 + Length: 6 + Facings: -8 + Transpose: true + Tick: 120 + die1: DATA.R8 + Frames: 2694, 2701, 2708, 2715, 2722, 2729, 2736, 2743 + Length: 19 + die2: DATA.R8 + Frames: 2695, 2702, 2709, 2716, 2723, 2730, 2737, 2744 + Length: 19 + die3: DATA.R8 + Frames: 2696, 2703, 2710, 2717, 2724, 2731, 2738, 2745 + Length: 19 + die4: DATA.R8 + Frames: 2697, 2704, 2711, 2718, 2725, 2732, 2738, 2746 + Length: 19 + die-crushed: DATA.R8 + Frames: 2698, 2705, 2712, 2719, 2726, 2733, 2740, 2747 Tick: 800 ZOffset: -511 - prone-stand: grenadier.shp - Start: 104 + prone-stand: DATA.R8 + Start: 2622 Length: 4 Facings: 8 - prone-run: grenadier.shp - Start: 104 + prone-run: DATA.R8 + Start: 2654 Length: 4 Facings: 8 Tick: 120 - prone-throw: grenadier.shp + prone-throw: DATA.R8 Start: 136 Length: 5 Facings: 8 Tick: 120 - icon: grenadiericon.shp # 4281 in 1.06 DATA.R8 - Offset: 0,0 + icon: DATA.R8 + Start: 4297 + Offset: -30,-24 sandworm: mouth: DATA.R8 - Start: 3549 + Start: 3802 Length: 15 Tick: 100 sand: DATA.R8 - Start: 3565 + Start: 3818 Length: 20 Tick: 100 idle: DATA.R8 Start: 39 lightninga: DATA.R8 - Start: 3591 + Start: 3844 Length: 5 Tick: 80 BlendMode: Additive lightningb: DATA.R8 - Start: 3596 + Start: 3849 Length: 5 Tick: 80 BlendMode: Additive lightningc: DATA.R8 - Start: 3601 + Start: 3854 Length: 5 Tick: 80 BlendMode: Additive lightningd: DATA.R8 - Start: 3606 + Start: 3859 Length: 5 Tick: 80 BlendMode: Additive lightninge: DATA.R8 - Start: 3611 + Start: 3864 Length: 5 Tick: 80 BlendMode: Additive lightningf: DATA.R8 - Start: 3616 + Start: 3869 Length: 5 Tick: 80 BlendMode: Additive - icon: wormicon.shp \ No newline at end of file + icon: wormicon.shp diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml index 0aa57f9730..5836af2bae 100644 --- a/mods/d2k/sequences/misc.yaml +++ b/mods/d2k/sequences/misc.yaml @@ -4,51 +4,51 @@ explosion: Tick: 80 ZOffset: 511 piff: DATA.R8 - Start: 3626 + Start: 3879 Length: 5 piffs: DATA.R8 - Start: 3429 + Start: 3682 Length: 4 small_explosion: DATA.R8 - Start: 3403 + Start: 3656 Length: 15 med_explosion: DATA.R8 - Start: 3390 + Start: 3643 Length: 12 tiny_explosion: DATA.R8 - Start: 3386 + Start: 3639 Length: 4 nuke: DATA.R8 - Start: 3965 + Start: 4218 Length: 14 self_destruct: DATA.R8 - Start: 3433 + Start: 3686 Length: 15 building: DATA.R8 - Start: 3448 + Start: 3701 Length: 22 large_explosion: DATA.R8 - Start: 3988 + Start: 4241 Length: 22 small_napalm: DATA.R8 - Start: 3421 + Start: 3674 Length: 8 rocket_explosion: DATA.R8 - Start: 3381 + Start: 3634 Length: 5 BlendMode: Alpha shockwave: DATA.R8 - Start: 3687 + Start: 3940 Length: 6 Tick: 120 deviator: DATA.R8 - Start: 3512 + Start: 3765 Length: 23 BlendMode: Alpha Offset: 12, -10 Tick: 120 bloomspawn: DATA.R8 - Start: 3980 + Start: 4233 Length: 8 Tick: 120 Offset: 0, -16 @@ -58,9 +58,9 @@ explosion: Length: 12 Tick: 1600 -large_trail: +large_trail: idle: DATA.R8 - Start: 3873 + Start: 4126 Length: 4 Tick: 80 BlendMode: Additive @@ -68,42 +68,42 @@ large_trail: small_trail: idle: DATA.R8 - Start: 3735 + Start: 3988 Length: 4 Tick: 80 ZOffset: 1023 small_trail2: idle: DATA.R8 - Start: 3540 + Start: 3793 Length: 4 Tick: 80 ZOffset: 1023 bazooka_trail: idle: DATA.R8 - Start: 3381 + Start: 3634 Length: 4 Tick: 80 ZOffset: 1023 bazooka_trail2: idle: DATA.R8 - Start: 3544 + Start: 3797 Length: 4 Tick: 80 ZOffset: 1023 deviator_trail: idle: DATA.R8 - Start: 3535 + Start: 3788 Length: 5 Tick: 80 ZOffset: 1023 laserfire: idle: DATA.R8 - Start: 3386 + Start: 3639 Length: 4 Tick: 80 BlendMode: Additive @@ -192,38 +192,38 @@ beacon: rpg: idle: DATA.R8 - Start: 3015 + Start: 3263 Facings: -32 ZOffset: 1023 120mm: idle: DATA.R8 - Start: 3014 + Start: 3262 BlendMode: Additive ZOffset: 1023 155mm: idle: DATA.R8 - Start: 3081 + Start: 3329 ZOffset: 1023 crate-effects: Defaults: ZOffset: 2047 dollar: DATA.R8 - Start: 3679 + Start: 3932 Length: 8 reveal-map: DATA.R8 - Start: 3947 + Start: 4200 Length: 18 hide-map: DATA.R8 - Frames: 3965, 3964, 3963, 3962, 3961, 3960, 3959, 3958, 3957, 3956, 3955, 3954, 3953, 3952, 3951, 3950, 3949, 3948 + Frames: 4218, 4217, 4216, 4215, 4214, 4213, 4212, 4211, 4210, 4209, 4208, 4207, 4206, 4205, 4204, 4203, 4202, 4201 Length: 18 levelup: levelup.shp Length: * Tick: 200 cloak: DATA.R8 - Start: 3911 + Start: 4164 Lenght: 36 allyrepair: @@ -236,13 +236,13 @@ allyrepair: missile: idle: DATA.R8 - Start: 3088 + Start: 3336 Facings: -32 ZOffset: 1023 missile2: idle: DATA.R8 - Start: 3306 + Start: 3554 Facings: -32 ZOffset: 1023 @@ -256,25 +256,25 @@ atomic: fire: 1: DATA.R8 - Start: 3712 + Start: 3965 Length: 10 Offset: 4,-17 ZOffset: 1023 BlendMode: Additive 2: DATA.R8 - Start: 3723 + Start: 3976 Length: 11 Offset: 0,-3 ZOffset: 1023 BlendMode: Additive 3: DATA.R8 - Start: 3885 + Start: 4138 Length: 13 Offset: 0,-3 ZOffset: 1023 BlendMode: Additive 4: DATA.R8 - Start: 3712 + Start: 3965 Length: 10 Offset: 0,-3 ZOffset: 1023 @@ -284,54 +284,55 @@ smoke_m: Defaults: ZOffset: 511 idle: DATA.R8 - Start: 3418 + Start: 3671 Length: 2 BlendMode: Additive loop: DATA.R8 - Start: 3418 + Start: 3671 Length: 2 BlendMode: Additive end: DATA.R8 - Start: 3418 + Start: 3671 Length: 3 BlendMode: Additive bombs: idle: DATA.R8 - Start: 3280 + Start: 3528 Length: 4 ZOffset: 1023 grenade: - idle: grenade.shp # frames 3618-3621 from patch 1.06 DATA.R8 + idle: DATA.R8 + Start: 3618 Length: 4 Tick: 80 ZOffset: 1023 shrapnel: idle: DATA.R8 - Start: 3290 + Start: 3538 Length: 4 ZOffset: 1023 shrapnel2: idle: DATA.R8 - Start: 3294 + Start: 3542 Length: 1 ZOffset: 1023 shrapnel3: idle: DATA.R8 - Start: 3295 + Start: 3543 Length: 8 ZOffset: 1023 shrapnel4: idle: DATA.R8 - Start: 3303 + Start: 3551 Length: 1 ZOffset: 1023 - + mpspawn: idle: mpspawn.shp Length: * @@ -350,35 +351,35 @@ wormspawner: sietch: idle: DATA.R8 - Start: 2998 + Start: 3246 Offset: -32,32 doubleblast: idle: DATA.R8 - Start: 3279 + Start: 3527 Facings: -16 BlendMode: Additive ZOffset: 511 doubleblastbullet: idle: DATA.R8 - Start: 3248 + Start: 3496 Facings: -16 BlendMode: Additive ZOffset: 1023 icon: ornistrike: DATA.R8 - Start: 4031 + Start: 4292 Offset: -30,-24 fremen: DATA.R8 - Start: 4032 + Start: 4293 Offset: -30,-24 saboteur: DATA.R8 - Start: 4034 + Start: 4295 Offset: -30,-24 deathhand: DATA.R8 - Start: 4035 + Start: 4296 Offset: -30,-24 crate: @@ -411,7 +412,7 @@ spicebloom: moveflsh: idle: DATA.R8 - Start: 3621 + Start: 3874 Length: 5 Tick: 80 BlendMode: Multiply @@ -478,4 +479,4 @@ sandcraters: null: idle: DATA.R8 - Start: 3304 + Start: 3552 diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml index baba2a3eee..83d2e1cf1b 100644 --- a/mods/d2k/sequences/structures.yaml +++ b/mods/d2k/sequences/structures.yaml @@ -1,106 +1,106 @@ concretea: icon: DATA.R8 - Start:4050 + Start: 4314 Offset: -30,-24 concreteb: icon: DATA.R8 - Start:4053 + Start: 4317 Offset: -30,-24 wall: idle: DATA.R8 - Frames: 2527, 2530, 2528, 2538, 2531, 2532, 2542, 2535, 2529, 2539, 2533, 2534, 2540, 2536, 2537, 2541 + Frames: 2775, 2778, 2776, 2786, 2779, 2780, 2790, 2783, 2777, 2787, 2781, 2782, 2788, 2784, 2785, 2789 Length: 16 Offset: -16,16 damaged-idle: DATA.R8 - Frames: 2543, 2546, 2544, 2554, 2547, 2548, 2558, 2551, 2545, 2555, 2549, 2550, 2556, 2552, 2553, 2557 + Frames: 2791, 2794, 2792, 2802, 2795, 2796, 2806, 2799, 2793, 2803, 2797, 2798, 2804, 2800, 2801, 2805 Length: 16 Offset: -16,16 icon: DATA.R8 - Start: 4063 + Start: 4327 Offset: -30,-24 medium_gun_turret: idle: DATA.R8 - Frames: 2573, 2576, 2574, 2584, 2577, 2578, 2588, 2581, 2575, 2585, 2579, 2580, 2586, 2582, 2583, 2587 + Frames: 2821, 2824, 2822, 2832, 2825, 2826, 2836, 2829, 2823, 2833, 2827, 2828, 2834, 2830, 2831, 2835 Length: 16 Offset: -24,16 damaged-idle: DATA.R8 - Frames: 2621, 2624, 2622, 2632, 2625, 2626, 2636, 2629, 2623, 2633, 2627, 2628, 2634, 2630, 2631, 2635 + Frames: 2869, 2872, 2870, 2880, 2873, 2874, 2884, 2877, 2871, 2881, 2875, 2876, 2882, 2878, 2879, 2883 Length: 16 Offset: -24,16 - make: DATA.R8 #TODO: unused, enabling WMA currently breaks turrets (bleed 20151214) - Start: 4313 + make: DATA.R8 + Start: 4577 Length: 8 Offset: -16,16 crumble-overlay: DATA.R8 - Start: 4321 + Start: 4585 Length: 7 Offset: -16,16 turret: DATA.R8 - Start: 2589 + Start: 2837 Facings: -32 Offset: -24,16 muzzle: DATA.R8 - Start: 3775 + Start: 4028 Tick: 60 Facings: -32 Offset: 0,2 BlendMode: Additive icon: DATA.R8 - Start: 4069 + Start: 4333 Offset: -30,-24 large_gun_turret: idle: DATA.R8 - Frames: 2573, 2576, 2574, 2584, 2577, 2578, 2588, 2581, 2575, 2585, 2579, 2580, 2586, 2582, 2583, 2587 + Frames: 2821, 2824, 2822, 2832, 2825, 2826, 2836, 2829, 2823, 2833, 2827, 2828, 2834, 2830, 2831, 2835 Length: 16 Offset: -24,16 damaged-idle: DATA.R8 - Frames: 2621, 2624, 2622, 2632, 2625, 2626, 2636, 2629, 2623, 2633, 2627, 2628, 2634, 2630, 2631, 2635 + Frames: 2869, 2872, 2870, 2880, 2873, 2874, 2884, 2877, 2871, 2881, 2875, 2876, 2882, 2878, 2879, 2883 Length: 16 Offset: -24,16 - make: DATA.R8 #TODO: unused, enabling WMA currently breaks turrets (bleed 20151214) - Start: 4313 + make: DATA.R8 + Start: 4577 Length: 8 Offset: -16,16 crumble-overlay: DATA.R8 - Start: 4321 + Start: 4585 Length: 7 Offset: -16,16 turret: DATA.R8 - Start: 2637 + Start: 2885 Facings: -32 Offset: -24,16 icon: DATA.R8 - Start: 4075 + Start: 4339 Offset: -30,-24 conyard.atreides: idle: DATA.R8 - Start: 2559 + Start: 2807 Offset: -48,64 make: DATA.R8 - Start: 4109 + Start: 4373 Length: 30 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4139 + Start: 4403 Length: 12 Offset: -48,64 Tick: 170 damaged-idle: DATA.R8 - Start: 2560 + Start: 2808 Offset: -48,64 crane-overlay: DATA.R8 - Start: 4436 + Start: 4700 Length: 14 Offset: -48,64 Tick: 80 ZOffset: 1023 damaged-crane-overlay: DATA.R8 - Start: 4436 + Start: 4700 Length: 14 Offset: -48,64 Tick: 80 @@ -114,137 +114,137 @@ conyard.atreides: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4046 + Start: 4310 Offset: -30,-24 repair_pad.atreides: make: DATA.R8 - Start: 4370 + Start: 4634 Length: 10 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4380 + Start: 4644 Length: 10 Offset: -48,48 Tick: 100 idle: DATA.R8 - Start: 2571 + Start: 2819 Offset: -48,48 ZOffset: -1c511 damaged-idle: DATA.R8 - Start: 2572 + Start: 2820 Offset: -48,48 ZOffset: -1c511 active: DATA.R8 - Start: 4746 + Start: 5010 Length: 14 Offset: -48,48 ZOffset: -1c511 damaged-active: DATA.R8 - Start: 4746 + Start: 5010 Length: 14 Tick: 60 Offset: -48,48 ZOffset: -1c511 icon: DATA.R8 - Start: 4096 + Start: 4360 Offset: -30,-24 repair_pad.harkonnen: make: DATA.R8 - Start: 4370 + Start: 4634 Length: 10 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4380 + Start: 4644 Length: 10 Offset: -48,48 Tick: 100 idle: DATA.R8 - Start: 2731 + Start: 2979 Offset: -48,48 ZOffset: -1c511 damaged-idle: DATA.R8 - Start: 2732 + Start: 2980 Offset: -48,48 ZOffset: -1c511 active: DATA.R8 - Start: 4746 + Start: 5010 Length: 14 Offset: -48,48 ZOffset: -1c511 damaged-active: DATA.R8 - Start: 4746 + Start: 5010 Length: 14 Tick: 60 Offset: -48,48 ZOffset: -1c511 icon: DATA.R8 - Start: 4097 + Start: 4361 Offset: -30,-24 repair_pad.ordos: make: DATA.R8 - Start: 4370 + Start: 4634 Length: 10 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4380 + Start: 4644 Length: 10 Offset: -48,48 Tick: 100 idle: DATA.R8 - Start: 2891 + Start: 3139 Offset: -48,48 ZOffset: -1c511 damaged-idle: DATA.R8 - Start: 2892 + Start: 3140 Offset: -48,48 ZOffset: -1c511 active: DATA.R8 - Start: 4746 + Start: 5010 Length: 14 Offset: -48,48 ZOffset: -1c511 damaged-active: DATA.R8 - Start: 4746 + Start: 5010 Length: 14 Tick: 60 Offset: -48,48 ZOffset: -1c511 icon: DATA.R8 - Start: 4098 + Start: 4362 Offset: -30,-24 starport.atreides: idle: DATA.R8 - Start: 2671 + Start: 2919 ZOffset: -1c511 Offset: -48,48 damaged-idle: DATA.R8 - Start: 2672 + Start: 2920 ZOffset: -1c511 Offset: -48,48 active: DATA.R8 - Start: 4723 + Start: 4987 Length: 23 ZOffset: -1c511 Offset: -48,48 BlendMode: Additive Tick: 200 damaged-active: DATA.R8 - Start: 4723 + Start: 4987 Length: 23 ZOffset: -1c511 Offset: -48,48 BlendMode: Additive Tick: 200 make: DATA.R8 - Start: 4347 + Start: 4611 Length: 11 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4358 + Start: 4622 Length: 11 Offset: -48,48 Tick: 100 @@ -257,32 +257,32 @@ starport.atreides: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4092 + Start: 4356 Offset: -30,-24 power.atreides: idle: DATA.R8 - Start: 2523 + Start: 2771 Offset: -32,64 make: DATA.R8 - Start: 4151 + Start: 4415 Length: 12 Offset: -32,64 crumble-overlay: DATA.R8 - Start: 4163 + Start: 4427 Length: 12 Offset: -32,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2524 + Start: 2772 Offset: -32,64 idle-zaps: DATA.R8 - Start: 4492 + Start: 4756 Length: 10 Offset: -32,64 Tick: 200 damaged-idle-zaps: DATA.R8 - Start: 4497 + Start: 4761 Length: 5 Offset: -32,64 Tick: 200 @@ -295,24 +295,24 @@ power.atreides: Length: 4 Offset: -16,-16 icon: DATA.R8 - Start: 4056 + Start: 4320 Offset: -30,-24 barracks.atreides: idle: DATA.R8 - Start: 2525 + Start: 2773 Offset: -32,64 make: DATA.R8 - Start: 4176 + Start: 4440 Length: 8 Offset: -32,64 crumble-overlay: DATA.R8 - Start: 4184 + Start: 4448 Length: 9 Offset: -32,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2526 + Start: 2774 Offset: -32,64 bib: BLOXBASE.R8 Frames: 617, 618, 637, 638 @@ -323,27 +323,27 @@ barracks.atreides: Length: 4 Offset: -16,-16 icon: DATA.R8 - Start: 4059 + Start: 4323 Offset: -30,-24 outpost.atreides: idle: DATA.R8 - Start: 2521 + Start: 2769 Offset: -48,64 make: DATA.R8 - Start: 4254 + Start: 4518 Length: 9 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4263 + Start: 4527 Length: 10 Offset: -48,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2522 + Start: 2770 Offset: -48,64 idle-dish: DATA.R8 - Start: 4522 + Start: 4786 Length: 30 Offset: -48,64 bib: BLOXBASE.R8 @@ -355,30 +355,30 @@ outpost.atreides: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4072 + Start: 4336 Offset: -30,-24 refinery.atreides: idle: DATA.R8 - Start: 2561 + Start: 2809 Offset: -48,64 make: DATA.R8 - Start: 4231 + Start: 4495 Length: 11 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4241 + Start: 4505 Length: 12 Offset: -48,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2561 + Start: 2809 Offset: -48,64 idle-top: DATA.R8 - Start: 2562 + Start: 2810 Offset: -48,64 damaged-idle-top: DATA.R8 - Start: 2563 + Start: 2811 Offset: -48,64 bib: BLOXBASE.R8 Frames: 611, 612, 613, 631, 632, 633 @@ -389,10 +389,10 @@ refinery.atreides: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4066 + Start: 4330 Offset: -30,-24 smoke: DATA.R8 - Start: 3885 + Start: 4138 Length: 14 Offset: 10,-16 Tick: 200 @@ -400,49 +400,49 @@ refinery.atreides: silo.atreides: idle: DATA.R8 - Start: 2566 + Start: 2814 Offset: -16,16 damaged-idle: DATA.R8 - Start: 2569 + Start: 2817 Offset: -16,16 stages: DATA.R8 - Start: 2566 + Start: 2814 Length: 4 Offset: -16,16 damaged-stages: DATA.R8 - Start: 2569 + Start: 2817 Offset: -16,16 make: DATA.R8 - Start: 4313 + Start: 4577 Length: 7 Offset: -16,16 crumble-overlay: DATA.R8 - Start: 4320 + Start: 4584 Length: 7 Offset: -16,16 Tick: 200 icon: DATA.R8 - Start: 4084 + Start: 4348 Offset: -30,-24 hightech.atreides: idle: DATA.R8 - Start: 2564 + Start: 2812 Offset: -48,80 make: DATA.R8 - Start: 4274 + Start: 4538 Length: 10 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4284 + Start: 4548 Length: 10 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 2565 + Start: 2813 Offset: -48,80 production-welding: DATA.R8 - Start: 4614 + Start: 4878 Length: 30 Offset: -48,80 Tick: 500 @@ -456,27 +456,27 @@ hightech.atreides: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4078 + Start: 4342 Offset: -30,-24 research.atreides: idle: DATA.R8 - Start: 2669 + Start: 2917 Offset: -48,80 make: DATA.R8 - Start: 4391 + Start: 4655 Length: 10 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4401 + Start: 4665 Length: 11 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 2670 + Start: 2918 Offset: -48,80 idle-lights: DATA.R8 - Start: 4760 + Start: 5024 Length: 60 Tick: 80 Offset: -48,80 @@ -489,27 +489,27 @@ research.atreides: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4099 + Start: 4363 Offset: -30,-24 research.harkonnen: idle: DATA.R8 - Start: 2829 + Start: 3077 Offset: -48,80 make: DATA.R8 - Start: 4391 + Start: 4655 Length: 10 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4401 + Start: 4665 Length: 11 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 2830 + Start: 3078 Offset: -48,80 idle-lights: DATA.R8 - Start: 4760 + Start: 5024 Length: 60 Tick: 80 Offset: -48,80 @@ -522,27 +522,27 @@ research.harkonnen: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4100 + Start: 4364 Offset: -30,-24 research.ordos: idle: DATA.R8 - Start: 2989 + Start: 3237 Offset: -48,80 make: DATA.R8 - Start: 4391 + Start: 4655 Length: 10 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4401 + Start: 4665 Length: 11 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 2990 + Start: 3238 Offset: -48,80 idle-lights: DATA.R8 - Start: 4760 + Start: 5024 Length: 60 Tick: 80 Offset: -48,80 @@ -555,24 +555,24 @@ research.ordos: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4101 + Start: 4365 Offset: -30,-24 palace.atreides: idle: DATA.R8 - Start: 2676 + Start: 2924 Offset: -48,48 make: DATA.R8 - Start: 4413 + Start: 4677 Length: 11 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4424 + Start: 4688 Length: 11 Offset: -48,48 Tick: 100 damaged-idle: DATA.R8 - Start: 2677 + Start: 2925 Offset: -48,48 bib: BLOXBASE.R8 Frames: 631, 632, 633 @@ -583,34 +583,34 @@ palace.atreides: Length: 3 Offset: -16,-16 icon: DATA.R8 - Start: 4102 + Start: 4366 Offset: -30,-24 light.atreides: idle: DATA.R8 - Start: 2673 + Start: 2921 Offset: -48,64 make: DATA.R8 - Start: 4295 + Start: 4559 Length: 8 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4303 + Start: 4567 Length: 9 Offset: -48,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2673 + Start: 2921 Offset: -48,64 idle-top: DATA.R8 - Start: 2674 + Start: 2922 Offset: -48,64 ZOffset: 1023 damaged-idle-top: DATA.R8 - Start: 2675 + Start: 2923 Offset: -48,64 production-welding: DATA.R8 - Start: 4644 + Start: 4908 Length: 30 Offset: -48,64 Tick: 200 @@ -625,35 +625,35 @@ light.atreides: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4081 + Start: 4345 Offset: -30,-24 heavy.atreides: idle: DATA.R8 - Start: 2518 + Start: 2766 Offset: -48,80 make: DATA.R8 - Start: 4328 + Start: 4592 Length: 9 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4337 + Start: 4601 Length: 9 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 2518 + Start: 2766 Offset: -48,80 idle-top: DATA.R8 - Start: 2519 + Start: 2767 Offset: -48,80 ZOffset: 1023 damaged-idle-top: DATA.R8 - Start: 2520 + Start: 2768 Offset: -48,80 ZOffset: 1023 production-welding: DATA.R8 - Start: 4674 + Start: 4938 Length: 47 Offset: -48,80 Tick: 200 @@ -668,33 +668,33 @@ heavy.atreides: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4087 + Start: 4351 Offset: -30,-24 conyard.harkonnen: idle: DATA.R8 - Start: 2719 + Start: 2967 Offset: -48,64 make: DATA.R8 - Start: 4109 + Start: 4373 Length: 30 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4139 + Start: 4403 Length: 12 Offset: -48,64 Tick: 170 damaged-idle: DATA.R8 - Start: 2720 + Start: 2968 Offset: -48,64 crane-overlay: DATA.R8 - Start: 4450 + Start: 4714 Length: 14 Offset: -48,64 Tick: 80 ZOffset: 1023 damaged-crane-overlay: DATA.R8 - Start: 4450 + Start: 4714 Length: 14 Offset: -48,64 Tick: 80 @@ -708,38 +708,38 @@ conyard.harkonnen: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4047 + Start: 4311 Offset: -30,-24 starport.harkonnen: idle: DATA.R8 - Start: 2831 + Start: 3079 ZOffset: -1c511 Offset: -48,48 damaged-idle: DATA.R8 - Start: 2832 + Start: 3080 Offset: -48,48 ZOffset: -1c511 active: DATA.R8 - Start: 4723 + Start: 4987 Length: 23 ZOffset: -1c511 Offset: -48,48 BlendMode: Additive Tick: 200 damaged-active: DATA.R8 - Start: 4723 + Start: 4987 Length: 23 ZOffset: -1c511 Offset: -48,48 BlendMode: Additive Tick: 200 make: DATA.R8 - Start: 4347 + Start: 4611 Length: 11 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4358 + Start: 4622 Length: 11 Offset: -48,48 Tick: 100 @@ -752,32 +752,32 @@ starport.harkonnen: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4093 + Start: 4357 Offset: -30,-24 power.harkonnen: idle: DATA.R8 - Start: 2683 + Start: 2931 Offset: -32,64 make: DATA.R8 - Start: 4151 + Start: 4415 Length: 12 Offset: -32,64 crumble-overlay: DATA.R8 - Start: 4163 + Start: 4427 Length: 12 Offset: -32,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2684 + Start: 2932 Offset: -32,64 idle-zaps: DATA.R8 - Start: 4502 + Start: 4766 Length: 10 Offset: -32,64 Tick: 200 damaged-idle-zaps: DATA.R8 - Start: 4507 + Start: 4771 Length: 5 Offset: -32,64 Tick: 200 @@ -790,24 +790,24 @@ power.harkonnen: Length: 4 Offset: -16,-16 icon: DATA.R8 - Start: 4057 + Start: 4321 Offset: -30,-24 barracks.harkonnen: idle: DATA.R8 - Start: 2685 + Start: 2933 Offset: -32,64 make: DATA.R8 - Start: 4213 + Start: 4477 Length: 8 Offset: -32,64 crumble-overlay: DATA.R8 - Start: 4221 + Start: 4485 Length: 9 Offset: -32,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2686 + Start: 2934 Offset: -32,64 bib: BLOXBASE.R8 Frames: 617, 618, 637, 638 @@ -818,27 +818,27 @@ barracks.harkonnen: Length: 4 Offset: -16,-16 icon: DATA.R8 - Start: 4060 + Start: 4324 Offset: -30,-24 outpost.harkonnen: idle: DATA.R8 - Start: 2681 + Start: 2929 Offset: -48,64 make: DATA.R8 - Start: 4254 + Start: 4518 Length: 9 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4263 + Start: 4527 Length: 10 Offset: -48,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2682 + Start: 2930 Offset: -48,64 idle-dish: DATA.R8 - Start: 4553 + Start: 4817 Length: 30 Offset: -48,64 bib: BLOXBASE.R8 @@ -850,30 +850,30 @@ outpost.harkonnen: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4073 + Start: 4337 Offset: -30,-24 refinery.harkonnen: idle: DATA.R8 - Start: 2721 + Start: 2969 Offset: -48,64 make: DATA.R8 - Start: 4231 + Start: 4495 Length: 11 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4241 + Start: 4505 Length: 12 Offset: -48,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2721 + Start: 2969 Offset: -48,64 idle-top: DATA.R8 - Start: 2722 + Start: 2970 Offset: -48,64 damaged-idle-top: DATA.R8 - Start: 2723 + Start: 2971 Offset: -48,64 bib: BLOXBASE.R8 Frames: 611, 612, 613, 631, 632, 633 @@ -884,10 +884,10 @@ refinery.harkonnen: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4067 + Start: 4331 Offset: -30,-24 smoke: DATA.R8 - Start: 3885 + Start: 4138 Length: 14 Offset: 10,-16 Tick: 200 @@ -895,49 +895,49 @@ refinery.harkonnen: silo.harkonnen: idle: DATA.R8 - Start: 2726 + Start: 2974 Offset: -16,16 damaged-idle: DATA.R8 - Start: 2730 + Start: 2978 Offset: -16,16 stages: DATA.R8 - Start: 2726 + Start: 2974 Length: 4 Offset: -16,16 damaged-stages: DATA.R8 - Start: 2730 + Start: 2978 Offset: -16,16 make: DATA.R8 - Start: 4313 + Start: 4577 Length: 7 Offset: -16,16 crumble-overlay: DATA.R8 - Start: 4320 + Start: 4584 Length: 7 Offset: -16,16 Tick: 200 icon: DATA.R8 - Start: 4085 + Start: 4349 Offset: -30,-24 hightech.harkonnen: idle: DATA.R8 - Start: 2724 + Start: 2972 Offset: -48,80 make: DATA.R8 - Start: 4274 + Start: 4538 Length: 10 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4284 + Start: 4548 Length: 10 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 2725 + Start: 2973 Offset: -48,80 production-welding: DATA.R8 - Start: 4614 + Start: 4878 Length: 30 Offset: -48,80 Tick: 500 @@ -951,31 +951,31 @@ hightech.harkonnen: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4079 + Start: 4343 Offset: -30,-24 palace.harkonnen: idle: DATA.R8 - Start: 2836 + Start: 3084 Offset: -48,48 make: DATA.R8 - Start: 4413 + Start: 4677 Length: 11 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4424 + Start: 4688 Length: 11 Offset: -48,48 Tick: 100 damaged-idle: DATA.R8 - Start: 2837 + Start: 3085 Offset: -48,48 # active: DATA.R8 # TODO: overlay -# Start: 4820 +# Start: 5084 # Length: 20 # Offset: -48,64 damaged-active: DATA.R8 - Start: 4820 + Start: 5084 Length: 20 Offset: -48,48 bib: BLOXBASE.R8 @@ -987,34 +987,34 @@ palace.harkonnen: Length: 3 Offset: -16,-16 icon: DATA.R8 - Start: 4103 + Start: 4367 Offset: -30,-24 light.harkonnen: idle: DATA.R8 - Start: 2833 + Start: 3081 Offset: -48,64 make: DATA.R8 - Start: 4295 + Start: 4559 Length: 8 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4303 + Start: 4567 Length: 9 Offset: -48,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2833 + Start: 3081 Offset: -48,64 idle-top: DATA.R8 - Start: 2834 + Start: 3082 Offset: -48,64 ZOffset: 1023 damaged-idle-top: DATA.R8 - Start: 2835 + Start: 3083 Offset: -48,64 production-welding: DATA.R8 - Start: 4644 + Start: 4908 Length: 30 Offset: -48,64 Tick: 200 @@ -1029,35 +1029,35 @@ light.harkonnen: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4082 + Start: 4346 Offset: -30,-24 heavy.harkonnen: idle: DATA.R8 - Start: 2678 + Start: 2926 Offset: -48,80 make: DATA.R8 - Start: 4328 + Start: 4592 Length: 9 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4337 + Start: 4601 Length: 9 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 2678 + Start: 2926 Offset: -48,80 idle-top: DATA.R8 - Start: 2679 + Start: 2927 Offset: -48,80 ZOffset: 1023 damaged-idle-top: DATA.R8 - Start: 2680 + Start: 2928 Offset: -48,80 ZOffset: 1023 production-welding: DATA.R8 - Start: 4674 + Start: 4938 Length: 47 Offset: -48,80 Tick: 200 @@ -1072,33 +1072,33 @@ heavy.harkonnen: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4088 + Start: 4352 Offset: -30,-24 conyard.ordos: idle: DATA.R8 - Start: 2879 + Start: 3127 Offset: -48,64 make: DATA.R8 - Start: 4109 + Start: 4373 Length: 30 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4139 + Start: 4403 Length: 12 Offset: -48,64 Tick: 170 damaged-idle: DATA.R8 - Start: 2880 + Start: 3128 Offset: -48,64 crane-overlay: DATA.R8 - Start: 4464 + Start: 4728 Length: 14 Offset: -48,64 Tick: 80 ZOffset: 1023 damaged-crane-overlay: DATA.R8 - Start: 4464 + Start: 4728 Length: 14 Offset: -48,64 Tick: 80 @@ -1112,38 +1112,38 @@ conyard.ordos: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4048 + Start: 4312 Offset: -30,-24 starport.ordos: idle: DATA.R8 - Start: 2991 + Start: 3239 Offset: -48,48 ZOffset: -1c511 damaged-idle: DATA.R8 - Start: 2992 + Start: 3240 Offset: -48,48 ZOffset: -1c511 active: DATA.R8 - Start: 4723 + Start: 4987 Length: 23 ZOffset: -1c511 Offset: -48,48 BlendMode: Additive Tick: 200 damaged-active: DATA.R8 - Start: 4723 + Start: 4987 Length: 23 ZOffset: -1c511 Offset: -48,48 BlendMode: Additive Tick: 200 make: DATA.R8 - Start: 4347 + Start: 4611 Length: 11 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4358 + Start: 4622 Length: 11 Offset: -48,48 Tick: 100 @@ -1156,32 +1156,32 @@ starport.ordos: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4094 + Start: 4358 Offset: -30,-24 power.ordos: idle: DATA.R8 - Start: 2843 + Start: 3091 Offset: -32,64 make: DATA.R8 - Start: 4151 + Start: 4415 Length: 12 Offset: -32,64 crumble-overlay: DATA.R8 - Start: 4163 + Start: 4427 Length: 12 Offset: -32,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2844 + Start: 3092 Offset: -32,64 idle-zaps: DATA.R8 - Start: 4512 + Start: 4776 Length: 10 Offset: -32,64 Tick: 200 damaged-idle-zaps: DATA.R8 - Start: 4517 + Start: 4781 Length: 5 Offset: -32,64 Tick: 200 @@ -1194,24 +1194,24 @@ power.ordos: Length: 4 Offset: -16,-16 icon: DATA.R8 - Start: 4058 + Start: 4322 Offset: -30,-24 barracks.ordos: idle: DATA.R8 - Start: 2845 + Start: 3093 Offset: -32,64 make: DATA.R8 - Start: 4213 + Start: 4477 Length: 8 Offset: -32,64 crumble-overlay: DATA.R8 - Start: 4221 + Start: 4485 Length: 9 Offset: -32,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2846 + Start: 3094 Offset: -32,64 bib: BLOXBASE.R8 Frames: 617, 618, 637, 638 @@ -1222,27 +1222,27 @@ barracks.ordos: Length: 4 Offset: -16,-16 icon: DATA.R8 - Start: 4061 + Start: 4325 Offset: -30,-24 outpost.ordos: idle: DATA.R8 - Start: 2841 + Start: 3089 Offset: -48,64 make: DATA.R8 - Start: 4254 + Start: 4518 Length: 9 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4263 + Start: 4527 Length: 10 Offset: -48,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2842 + Start: 3090 Offset: -48,64 idle-dish: DATA.R8 - Start: 4583 + Start: 4847 Length: 30 Offset: -48,64 bib: BLOXBASE.R8 @@ -1254,30 +1254,30 @@ outpost.ordos: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4074 + Start: 4338 Offset: -30,-24 refinery.ordos: idle: DATA.R8 - Start: 2881 + Start: 3129 Offset: -48,64 make: DATA.R8 - Start: 4231 + Start: 4495 Length: 11 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4241 + Start: 4505 Length: 12 Offset: -48,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2881 + Start: 3129 Offset: -48,64 idle-top: DATA.R8 - Start: 2882 + Start: 3130 Offset: -48,64 damaged-idle-top: DATA.R8 - Start: 2883 + Start: 3131 Offset: -48,64 bib: BLOXBASE.R8 Frames: 611, 612, 613, 631, 632, 633 @@ -1288,10 +1288,10 @@ refinery.ordos: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4068 + Start: 4332 Offset: -30,-24 smoke: DATA.R8 - Start: 3885 + Start: 4138 Length: 14 Offset: 10,-16 Tick: 200 @@ -1299,49 +1299,49 @@ refinery.ordos: silo.ordos: idle: DATA.R8 - Start: 2886 + Start: 3134 Offset: -16,16 damaged-idle: DATA.R8 - Start: 2890 + Start: 3138 Offset: -16,16 stages: DATA.R8 - Start: 2886 + Start: 3134 Length: 4 Offset: -16,16 damaged-stages: DATA.R8 - Start: 2890 + Start: 3138 Offset: -16,16 make: DATA.R8 - Start: 4313 + Start: 4577 Length: 7 Offset: -16,16 crumble-overlay: DATA.R8 - Start: 4320 + Start: 4584 Length: 7 Offset: -16,16 Tick: 200 icon: DATA.R8 - Start: 4086 + Start: 4350 Offset: -30,-24 hightech.ordos: idle: DATA.R8 - Start: 2884 + Start: 3132 Offset: -48,80 make: DATA.R8 - Start: 4274 + Start: 4538 Length: 10 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4284 + Start: 4548 Length: 10 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 2885 + Start: 3133 Offset: -48,80 production-welding: DATA.R8 - Start: 4614 + Start: 4878 Length: 30 Offset: -48,80 Tick: 500 @@ -1355,24 +1355,24 @@ hightech.ordos: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4080 + Start: 4344 Offset: -30,-24 palace.ordos: idle: DATA.R8 - Start: 2996 + Start: 3244 Offset: -48,48 make: DATA.R8 - Start: 4413 + Start: 4677 Length: 11 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4424 + Start: 4688 Length: 11 Offset: -48,48 Tick: 100 damaged-idle: DATA.R8 - Start: 2997 + Start: 3245 Offset: -48,48 bib: BLOXBASE.R8 Frames: 631, 632, 633 @@ -1383,34 +1383,34 @@ palace.ordos: Length: 3 Offset: -16,-16 icon: DATA.R8 - Start: 4104 + Start: 4368 Offset: -30,-24 light.ordos: idle: DATA.R8 - Start: 2993 + Start: 3241 Offset: -48,64 make: DATA.R8 - Start: 4295 + Start: 4559 Length: 8 Offset: -48,64 crumble-overlay: DATA.R8 - Start: 4303 + Start: 4567 Length: 9 Offset: -48,64 Tick: 100 damaged-idle: DATA.R8 - Start: 2993 + Start: 3241 Offset: -48,64 idle-top: DATA.R8 - Start: 2994 + Start: 3242 Offset: -48,64 ZOffset: 1023 damaged-idle-top: DATA.R8 - Start: 2995 + Start: 3243 Offset: -48,64 production-welding: DATA.R8 - Start: 4644 + Start: 4908 Length: 30 Offset: -48,64 Tick: 200 @@ -1425,35 +1425,35 @@ light.ordos: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4083 + Start: 4347 Offset: -30,-24 heavy.ordos: idle: DATA.R8 - Start: 2838 + Start: 3086 Offset: -48,80 make: DATA.R8 - Start: 4328 + Start: 4592 Length: 9 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4337 + Start: 4601 Length: 9 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 2838 + Start: 3086 Offset: -48,80 idle-top: DATA.R8 - Start: 2839 + Start: 3087 Offset: -48,80 ZOffset: 1023 damaged-idle-top: DATA.R8 - Start: 2840 + Start: 3088 Offset: -48,80 ZOffset: 1023 production-welding: DATA.R8 - Start: 4674 + Start: 4938 Length: 47 Offset: -48,80 Tick: 200 @@ -1468,15 +1468,15 @@ heavy.ordos: Length: 6 Offset: -16,-16 icon: DATA.R8 - Start: 4089 + Start: 4353 Offset: -30,-24 palace.corrino: idle: DATA.R8 - Start: 3004 + Start: 3252 Offset: -48,48 damaged-idle: DATA.R8 - Start: 3005 + Start: 3253 Offset: -48,48 bib: BLOXBASE.R8 Frames: 631, 632, 633 @@ -1488,44 +1488,44 @@ palace.corrino: Offset: -16,-16 icon: palacecicon.shp make: DATA.R8 - Start: 4413 + Start: 4677 Length: 11 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4424 + Start: 4688 Length: 11 Offset: -48,48 Tick: 100 starport.smuggler: idle: DATA.R8 - Start: 2999 + Start: 3247 Offset: -48,48 ZOffset: -1c511 damaged-idle: DATA.R8 - Start: 3000 + Start: 3248 Offset: -48,48 ZOffset: -1c511 active: DATA.R8 - Start: 4723 + Start: 4987 Length: 23 ZOffset: -1c511 Offset: -48,48 BlendMode: Additive Tick: 200 damaged-active: DATA.R8 - Start: 4723 + Start: 4987 Length: 23 ZOffset: -1c511 Offset: -48,48 BlendMode: Additive Tick: 200 make: DATA.R8 - Start: 4347 + Start: 4611 Length: 11 Offset: -48,48 crumble-overlay: DATA.R8 - Start: 4358 + Start: 4622 Length: 11 Offset: -48,48 Tick: 100 @@ -1538,35 +1538,35 @@ starport.smuggler: Length: 6 Offset: -16,-16 icon: DATA.R8 # TODO: blank - Start: 4020 + Start: 4281 Offset: -30,-24 heavy.mercenary: idle: DATA.R8 - Start: 3001 + Start: 3249 Offset: -48,64 make: DATA.R8 - Start: 4328 + Start: 4592 Length: 9 Offset: -48,80 crumble-overlay: DATA.R8 - Start: 4337 + Start: 4601 Length: 9 Offset: -48,80 Tick: 100 damaged-idle: DATA.R8 - Start: 3001 + Start: 3249 Offset: -48,64 idle-top: DATA.R8 - Start: 3002 + Start: 3250 Offset: -48,64 ZOffset: 1023 damaged-idle-top: DATA.R8 - Start: 3003 + Start: 3251 Offset: -48,64 ZOffset: 1023 production-welding: DATA.R8 - Start: 4674 + Start: 4938 Length: 47 Offset: -48,80 Tick: 200 @@ -1580,16 +1580,16 @@ heavy.mercenary: Length: 6 Offset: -16,-16 icon: DATA.R8 # TODO: blank - Start: 4020 + Start: 4281 Offset: -30,-24 plates: # TODO: unused idle: DATA.R8 - Start: 3008 + Start: 3256 Length: 6 4-plates-icon: DATA.R8 - Start: 4050 + Start: 4314 Offset: -30,-24 6-plates-icon: DATA.R8 - Start: 4053 + Start: 4317 Offset: -30,-24 diff --git a/mods/d2k/sequences/vehicles.yaml b/mods/d2k/sequences/vehicles.yaml index 3b5bc9519f..f942caf3cf 100644 --- a/mods/d2k/sequences/vehicles.yaml +++ b/mods/d2k/sequences/vehicles.yaml @@ -3,7 +3,7 @@ mcv: Start: 1795 Facings: -32 icon: DATA.R8 - Start: 4023 + Start: 4284 Offset: -30,-24 mcv.husk: @@ -17,19 +17,19 @@ harvester: Start: 1699 Facings: -32 harvest: DATA.R8 - Start: 3631 + Start: 3884 Length: 6 Facings: -8 Tick: 80 ZOffset: 1 BlendMode: Multiply dock: DATA.R8 - Start: 3370 + Start: 3623 Length: 10 dock-loop: DATA.R8 - Start: 3380 + Start: 3633 icon: DATA.R8 - Start: 4019 + Start: 4280 Offset: -30,-24 harvester.husk: @@ -43,12 +43,12 @@ trike: Start: 1635 Facings: -32 muzzle: DATA.R8 - Start: 3839 + Start: 4092 Tick: 50 Facings: -32 BlendMode: Additive icon: DATA.R8 - Start: 4041 + Start: 4305 Offset: -30,-24 quad: @@ -56,7 +56,7 @@ quad: Start: 1667 Facings: -32 icon: DATA.R8 - Start: 4018 + Start: 4279 Offset: -30,-24 siege_tank: @@ -67,11 +67,11 @@ siege_tank: Start: 1891 Facings: -32 muzzle: DATA.R8 - Start: 3418 + Start: 3671 Length: 3 BlendMode: Additive icon: DATA.R8 - Start: 4026 + Start: 4287 Offset: -30,-24 siege_tank.husk: @@ -89,7 +89,7 @@ missile_tank: Start: 1603 Facings: -32 icon: DATA.R8 - Start: 4024 + Start: 4285 Offset: -30,-24 missile_tank.husk: @@ -103,7 +103,7 @@ sonic_tank: Start: 1827 Facings: -32 icon: DATA.R8 - Start: 4027 + Start: 4288 Offset: -30,-24 sonic_tank.husk: @@ -120,12 +120,12 @@ combat_tank_a: Start: 1859 Facings: -32 muzzle: DATA.R8 - Start: 3775 + Start: 4028 Tick: 60 Facings: -32 BlendMode: Additive icon: DATA.R8 - Start: 4020 + Start: 4281 Offset: -30,-24 combat_tank_a.husk: @@ -146,12 +146,12 @@ combat_tank_h: Start: 2115 Facings: -32 muzzle: DATA.R8 - Start: 3775 + Start: 4028 Tick: 60 Facings: -32 BlendMode: Additive icon: DATA.R8 - Start: 4021 + Start: 4282 Offset: -30,-24 combat_tank_h.husk: @@ -172,12 +172,12 @@ combat_tank_o: Start: 2485 Facings: -32 muzzle: DATA.R8 - Start: 3775 + Start: 4028 Tick: 60 Facings: -32 BlendMode: Additive icon: DATA.R8 - Start: 4022 + Start: 4283 Offset: -30,-24 combat_tank_o.husk: @@ -195,12 +195,12 @@ devastator: Start: 2083 Facings: -32 muzzle: DATA.R8 - Start: 3807 + Start: 4060 Tick: 80 Facings: -32 BlendMode: Additive icon: DATA.R8 - Start: 4028 + Start: 4289 Offset: -30,-24 devastator.husk: @@ -214,12 +214,12 @@ raider: Start: 2421 Facings: -32 muzzle: DATA.R8 - Start: 3743 + Start: 3996 Tick: 50 Facings: -32 BlendMode: Additive icon: DATA.R8 - Start: 4017 + Start: 4278 Offset: -30,-24 stealth_raider: @@ -227,18 +227,20 @@ stealth_raider: Start: 2421 Facings: -32 muzzle: DATA.R8 - Start: 3743 + Start: 3996 Tick: 50 Facings: -32 BlendMode: Additive - icon: raidersicon.shp # 4282 in 1.06 DATA.R8 + icon: DATA.R8 + Start: 4298 + Offset: -30,-24 deviator: idle: DATA.R8 Start: 2389 Facings: -32 icon: DATA.R8 - Start: 4025 + Start: 4286 Offset: -30,-24 deviator.husk: diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 209e1dba52..f8c9db5eb3 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -4235,56 +4235,64 @@ Templates: 1: Rough Template@500: Id: 500 - Images: bloxxmas00.tmp + Images: BLOXXMAS.R8 + Frames: 305 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@501: Id: 501 - Images: bloxxmas01.tmp + Images: BLOXXMAS.R8 + Frames: 325 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@502: Id: 502 - Images: bloxxmas02.tmp + Images: BLOXXMAS.R8 + Frames: 311 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@503: Id: 503 - Images: bloxxmas03.tmp + Images: BLOXXMAS.R8 + Frames: 312 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@504: Id: 504 - Images: bloxxmas04.tmp + Images: BLOXXMAS.R8 + Frames: 330 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@505: Id: 505 - Images: bloxxmas05.tmp + Images: BLOXXMAS.R8 + Frames: 316 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@506: Id: 506 - Images: bloxxmas06.tmp + Images: BLOXXMAS.R8 + Frames: 297 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@507: Id: 507 - Images: bloxxmas07.tmp + Images: BLOXXMAS.R8 + Frames: 356, 357 Size: 2,1 Category: Sand-Detail Tiles: @@ -4292,28 +4300,32 @@ Templates: 1: Cliff Template@508: Id: 508 - Images: bloxxmas08.tmp + Images: BLOXXMAS.R8 + Frames: 355 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@509: Id: 509 - Images: bloxxmas09.tmp + Images: BLOXXMAS.R8 + Frames: 375 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@510: Id: 510 - Images: bloxxmas10.tmp + Images: BLOXXMAS.R8 + Frames: 395 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@511: Id: 511 - Images: bloxxmas11.tmp + Images: BLOXXMAS.R8 + Frames: 414, 415, 434, 435 Size: 2,2 Category: Sand-Detail Tiles: @@ -4323,7 +4335,8 @@ Templates: 3: Cliff Template@512: Id: 512 - Images: bloxxmas12.tmp + Images: BLOXXMAS.R8 + Frames: 353, 354, 373, 374, 393, 394 Size: 2,3 Category: Sand-Detail Tiles: @@ -4335,7 +4348,8 @@ Templates: 5: Cliff Template@513: Id: 513 - Images: bloxxmas13.tmp + Images: BLOXXMAS.R8 + Frames: 350, 351, 352, 370, 371, 372, 390, 391, 392 Size: 3,3 Category: Rock-Detail Tiles: @@ -4350,7 +4364,8 @@ Templates: 8: Cliff Template@514: Id: 514 - Images: bloxxmas14.tmp + Images: BLOXXMAS.R8 + Frames: 347, 348, 349, 367, 368, 369, 387, 388, 389 Size: 3,3 Category: Rock-Detail Tiles: @@ -4365,7 +4380,8 @@ Templates: 8: Rock Template@515: Id: 515 - Images: bloxxmas15.tmp + Images: BLOXXMAS.R8 + Frames: 340, 341, 342, 343, 360, 361, 362, 363, 380, 381, 382, 383 Size: 4,3 Category: Rock-Detail Tiles: @@ -4383,28 +4399,32 @@ Templates: 11: Cliff Template@516: Id: 516 - Images: bloxxmas16.tmp + Images: BLOXXMAS.R8 + Frames: 717 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@517: Id: 517 - Images: bloxxmas17.tmp + Images: BLOXXMAS.R8 + Frames: 718 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@518: Id: 518 - Images: bloxxmas18.tmp + Images: BLOXXMAS.R8 + Frames: 737 Size: 1,1 Category: Sand-Detail Tiles: 0: Cliff Template@519: Id: 519 - Images: bloxxmas19.tmp + Images: BLOXXMAS.R8 + Frames: 738, 739, 758, 759 Size: 2,2 Category: Sand-Detail Tiles: @@ -4414,7 +4434,8 @@ Templates: 3: Cliff Template@520: Id: 520 - Images: bloxxmas20.tmp + Images: BLOXXMAS.R8 + Frames: 652, 653, 672, 673 Size: 2,2 Category: Sand-Detail Tiles: