From fdc74353fc3c9d3c63271356e21d96dfeb9cd824 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 5 Jul 2016 22:30:19 +0100 Subject: [PATCH] Migrate to 1.06 patch content. --- .../UtilityCommands/UpgradeMapCommand.cs | 1 + .../UtilityCommands/UpgradeModCommand.cs | 1 + .../UtilityCommands/UpgradeRules.cs | 30 + mods/d2k/bits/xmas/bloxxmas00.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas01.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas02.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas03.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas04.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas05.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas06.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas07.tmp | Bin 2094 -> 0 bytes mods/d2k/bits/xmas/bloxxmas08.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas09.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas10.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas11.tmp | Bin 4148 -> 0 bytes mods/d2k/bits/xmas/bloxxmas12.tmp | Bin 6202 -> 0 bytes mods/d2k/bits/xmas/bloxxmas13.tmp | Bin 9283 -> 0 bytes mods/d2k/bits/xmas/bloxxmas14.tmp | Bin 9283 -> 0 bytes mods/d2k/bits/xmas/bloxxmas15.tmp | Bin 12364 -> 0 bytes mods/d2k/bits/xmas/bloxxmas16.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas17.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas18.tmp | Bin 1067 -> 0 bytes mods/d2k/bits/xmas/bloxxmas19.tmp | Bin 4148 -> 0 bytes mods/d2k/bits/xmas/bloxxmas20.tmp | Bin 4148 -> 0 bytes mods/d2k/bits/xmas/grenade.shp | Bin 88 -> 0 bytes mods/d2k/bits/xmas/grenadier.shp | Bin 23399 -> 0 bytes mods/d2k/bits/xmas/grenadiericon.shp | Bin 2100 -> 0 bytes mods/d2k/bits/xmas/raidersicon.shp | Bin 2329 -> 0 bytes mods/d2k/mod.yaml | 1 - mods/d2k/rules/palettes.yaml | 2 +- mods/d2k/sequences/aircraft.yaml | 6 +- mods/d2k/sequences/infantry.yaml | 117 ++-- mods/d2k/sequences/misc.yaml | 109 ++-- mods/d2k/sequences/structures.yaml | 610 +++++++++--------- mods/d2k/sequences/vehicles.yaml | 52 +- mods/d2k/tilesets/arrakis.yaml | 63 +- 36 files changed, 526 insertions(+), 466 deletions(-) delete mode 100644 mods/d2k/bits/xmas/bloxxmas00.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas01.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas02.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas03.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas04.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas05.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas06.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas07.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas08.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas09.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas10.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas11.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas12.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas13.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas14.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas15.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas16.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas17.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas18.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas19.tmp delete mode 100644 mods/d2k/bits/xmas/bloxxmas20.tmp delete mode 100644 mods/d2k/bits/xmas/grenade.shp delete mode 100644 mods/d2k/bits/xmas/grenadier.shp delete mode 100644 mods/d2k/bits/xmas/grenadiericon.shp delete mode 100644 mods/d2k/bits/xmas/raidersicon.shp 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 9930a985daa9a8cdffb002a412c75f1beced005c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmYk5!D<{a42CDrLvMYB9GkY+ER3)byX2|T-I8yTi_T5URQ0eJv75L$_ZK^2OvvfUmBUuE zgX^}hfbnLkPf63N?h_BU953+X5O%6)32@5N*;P}~$Px~gC@x{434)xgbZ2ZVnaz%- zWb!+FM8T;*;xNW2CE`pHe!1yR$2)nbqM42RU-fD&vXaZ-WA#=F0h~&C{qCoF9Z%&) zAwTPhe%IOJs1@Mj3UJqS4_@t8K8|vcYvfeI4WBp~Pe$CuoDX zNt@fs5unFYKVL3%@mh&CQxRZSkhxHKI9w?xjVp|TgPM@WWC#p>JBpO}(_#5JXi1v+ zg$Qst?6IR1uokNpz5 zJmfj2MJ}w6&tApllWZQ1DngT1fhFcA%FDZwt7SsKuu*3 zFzi=J09AJ)n`L+Nw3>>GYnm5~0==J*FzdouOj--nhAEyQoKb3I6O15ev<3^|-Iy^{ zlJ2R55}9`qedEy4y7efCVi#hn7D$0C);opun^%Z|C;)B$LyLoA>NQV5@di|_w16bG z2L9>O_;fEn#7UGO=p`mZJI8>cgt21U?dGt>K}9q;Hvm8Z+F7V|*R7TmKwORE85IQu zpyq(-(eN|0MB`b5vSSZX+JS*cjmaFSh)`D5c;PEt)R}s!Nu26R>3M9}H<6Q{z}Ba$ z(HW05{~{VQ-^vS%O&4eKTELzR@=+XBdBBD9Du75EgGZ+UXb8bkI2njFOQpN_XQnj! z9??B(-Jdon>ao=3*YSoOHUtzje|>p@J8T)qU*i=C`HPyOy$HYGAAdF)w6?*#vkvIl zi_~72U*G4Wc0)D9gksROwfDlaRllzJyvY%am0AJNS~K@lwc0NX*fqw=P6o@8`C|#x zQuSPG5-0f?8HMi*JJeOAy%$U-b!C2N1TBJzRdrZXf$88eLC0haI;UP~6^8agzvFoS E4`f*qzW@LL diff --git a/mods/d2k/bits/xmas/bloxxmas02.tmp b/mods/d2k/bits/xmas/bloxxmas02.tmp deleted file mode 100644 index 4fe015dccb9ed1e8ee9106cdc357f52170204851..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmXYwO={dg5QSyPBD-86%lxekD!NM;LDAG;H>gR08@w{wX=8GY+`-2Tj6IOAC((?A zy1VLCy;o14r_a;PG;!Zd-#<*#7v9J9`_r!l~yd3MY7kvnCo#woI{-4MT!>HQcSy< zm@NF$aeIlgM--KDGN9F@Yw41@RXrWVGqT!j&r)$Qs>EP_h`O@OYc(5l8sbR zNRU*#9$MX$1_|k#4FHa%%ZRCaQ?J#edeIKXHP0jwmp3wxTAkox>kh$4Hn5 zqoa1W{LJxi&Qj`b`C;giH1nf0?R#ktG{eH zj)piHHl9I23iv(U#TYfrVY2VZtq*f0H3WlS-2D-#L4cv;)i>YPpN|)}^h%u}z*|rg zVcNqX$1(#+i~2E3Ej)AizdjD{r~Eneo?y}w>XKx Y@I?U&0x;Wfo}Lh_dTYrs;WT~x3+l%&_5c6? diff --git a/mods/d2k/bits/xmas/bloxxmas03.tmp b/mods/d2k/bits/xmas/bloxxmas03.tmp deleted file mode 100644 index 5e1ed97b3d8ddb7a4670ad716bca81b34f3b9527..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmW-g%W54l42GxBMR$FLEPGoAj<7YH22`Uob+L&L7_uruH?s*{_YL~K4d*n_Pcd`x z*s}hMG*`>j@@iSQUo9VBFUvdTG5);$_31s|A7YI=C)FlqT-waXco^f~V9Zq2v>Z&T z#P{Xj-QADN%j|)elPZT&DXZK(58wNK-Fqo<$GG_L(oCmLPtqAX*Y&9d5Ve7wyCH)5qBgxsI21EWz{6? zikLT-zV8qk$K!EWy4k!d!zTB-ngFFl^fB)L0&{-8z*}`15781lTx%%wi+}m@a6YqS zYHn6}6Qi2ELYy2ZKaQVI!+_21t0bz-(}Zjqz!W!%>)x3{{A2)1FOpc(C#fMGl$suZpjpahA&GCkC6Ow57)TDWeKXnICC$RJrRW}JxlQ(c&eU!O6~SN3 z3zZo0t*=x@tyLm>qI+~!^f!7aB66!L-6r6=eLi_r&g*98l#pt)1c{hJrxZ*0k3L|7 z=PcT4%H)eouEpGKevi+h--7g{(^_I;wnaM8p(DyJtmW_ywJ*cY2@cnz(qzvlV?U*` zlBm7x{~n_s^z&ou`&kZxM2wk|X+=Dwk1zw%TIs=Lu31r73vEj-0#KZ5@#lmF`nP0o zQ{`WiVsc1C&upcPKH|Ti=A;xmfPV-p6`lzJqX%$LST6K2t3n|t5ja9lyiagT>O35F UD?b7Sj9Q^doKsO!S(Z2d0r8bI1^@s6 diff --git a/mods/d2k/bits/xmas/bloxxmas04.tmp b/mods/d2k/bits/xmas/bloxxmas04.tmp deleted file mode 100644 index 441ba1354ec97bfdb1c072eeec16a0e43e50eb1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmXAo&8i$X5QW>|MRs`wFYVat3tdPhhCor)kO*2(1A<=8t~VFIhTkENnB@&U4EWQH z)IFnC{pg%irBBPJ<-@Y@eptSKT$azQ=lJ>ik8fZ2{$uX(CLQJ})u!4~O|FvFHE&vS z8%4ZeND>jMYMV8=UN!35$=Ee+!&FC&+j-(J2-hB3F+SY;;SUq@$LUSuZI7a&BlhqX z^*FkJzeP2z&Bb23?|+4v$2sGKl((~1cdJj`%&d3a-}Wcbz4xQ{7MFP16RgH#E#&C! z5@*0g@o;-Y1`fH+M~e8bz4oSiv${Q<(=GJyVZ$}GdXL!mP_H#rvHQKMhXKPyXK-yz z?{VUxRS@D|{_Ei`VomFF?%C1qk9QA_RQa>^m!rr4*?mhx(+22!eeAocNRH^oK~UDe zO=cFer0m2Uoz$MEzPw@rj5)Wn8p*^)^=UcBDkE~sk_ z@@AqW28CLsRE9FW`xGBwLOpZQ!BoE*388uT0kosZnmAuGXP__;uU>}aAtZP?{-G=8 zzCw+<4}}0g=@d|PuyqzNgTdw){i++u3Blj+0TYVfX{v+H?_$Hk z3&ry$|EEZkp4ghoAa9xX#4(w!fS*HhX0fsIIdR65vJScO!LC~-)Y%zyoFzJ2R?Equ zGX+6gz;T0CVn^9By%v*rlnP(KLg;xebd#I<7XmR@#flb Ul$CboCM7Bbzj>Phu`Iv+0{>Y%_W%F@ diff --git a/mods/d2k/bits/xmas/bloxxmas05.tmp b/mods/d2k/bits/xmas/bloxxmas05.tmp deleted file mode 100644 index 2cd0333ad21e65fa1772f4805733461f946ec383..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmYjQ%W51!3>-raxit9&AM^SGvtF1(ubc+6;6pE%^(mN~bjnfl3Hhn+KazszNpAwF z9^;T%W|*CpN~%)ndb*yjrV01e^y$qsy~q2we!Tns`2+rc9N%!S%BEaRZ6RtZBC4@S ziLU1RQ&%-!Sb0&rX^c`3fhPycEk9?i$Yv!|UCh|s&mJp+HKg@9Uq=3hKLQsfWHdt zZ$0<>TZvmYHP(u-QX&{~>%Hf8-}Bdl2Yg1q1Ef}*mr^J)ht_kxxjVGyU#-zk!!e-A zK^-+LqFCDB9B$POaQD5P9YP|1D1>JbwcignJF6xDhcY0sibO#LB@vGr(_x3B%5`D1 z1$=Z1Dlv|8{Izrx31y>(9+#K?3;JMiEOmZN$RBB8OeH94qrMiXgF2pfDMHJ@h9FEZ z21ZB`FT&p>-li1}tZ#UT2KsF;Bt_g^R)pf~d9542$wX;8nyk*CMgs=*>QAO_HU-5=+sju{*? z_J>jVb$^gM_D99w8%O_Rf6)EE{lU~=ov}Y2<~9AdKk#pW`G>nO9SdZ0+og>CInQH% luoqS_U*rQp%)N)S+Y5%f4QTAoSmhUgZu>)b$Ky1;{R;$@kr)5~ diff --git a/mods/d2k/bits/xmas/bloxxmas06.tmp b/mods/d2k/bits/xmas/bloxxmas06.tmp deleted file mode 100644 index 96e432d7de8a3eb17767abede1440ea3450ce057..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmZvbPmAU@492t2LocRZVUPWH?V%x?kVB#(mt2{V42rFPEeB}U zXCKXGx?y0wwZkxp02ErTQgp1WJO?)nt~|N(()_22 zDn8Qg_qZX&38I6&OL@A$NK!llf`$lsC_mzcluEjf<7PicQ1m; z^anA@uw~5Y*M1(ulJ7jQbvk1Vs~sGW$9u|c_d(20^W$(UqGQ3dR`Y@W)Hyb3>3^FI z^k?7bFQpNseUcgUH@o;re>v+H{b7Plpcl+>daJ+upZ@9u)%fdM{qg_kuW7#i7yi|g AfdBvi diff --git a/mods/d2k/bits/xmas/bloxxmas07.tmp b/mods/d2k/bits/xmas/bloxxmas07.tmp deleted file mode 100644 index 9a729e076c678703dfef2333b9e7819c8c6d7074..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2094 zcmYM0!K&Ow5Je|hd1LYmUWQ<@i$G1Q#EhX*ZsBR8h8}2`rFfg!JhILoEa^Y~5CJZqcj|&*u-GW2@N)Aid1N zQ%XrF!!!;UcOw3oWG;z%>oE>SJgQ#FyUp6C=_P(_JjsOX6y%$I#CFsb@F(ihs7PvU83|l_|1_Wu~CF{14 zS{e^R5yY+UKQkMNY06iB>@qy}{XL2Ws$4lVG4mqn=gm-@RW^P`7iB)-1!ZST2_W0GD^wcR0et`{&28tSwiYWe#YeET)U2 zs73M#$|wXs8&j}&Pg5zXIh!_E4t?Qpy`0M|>y)>;eb$1D9sdYG`7%G)LD<3!W!FQIHZ2+5GBF|Z!ozviQr_= zEz1EVy-*<`l5DxHoJPxt85HFR_W~dS1Tx|x;$oES1jnVu6^t!n2UL)oG#HmYP(QU#&C=+G z%f%e1a9R})24A%0MW;_8G(CnRqyn~}sd<~DgHMT#m*kb??i9C-2|YMRs_$Hsv>u%m zguiia2DSgWm}rhcA0JgF{AM?@+1!PBF&N>Bt|J56hcnVZB+tyj_-$?DP5c{^!?Ee1A?GtEk#mN*}7D^x`U2UF)u`j%eay zszt2er?%UWZPQ`ZL^+cYrXj(H6!jon-PL7Cl(h&UVva`!4{0hI=7vkUfx(Lt6$7SJ zwR8p?1LwPiyMZ8K7ELu&3MSbrIg{z=iNK!?=(ui)1vIP*ft9or0G6orv4LRPY$xdT z5ir0>=2TB?u*|Gu~gSqtF9AD-GwTzCknw8G@vuL)MZ4{jU_IZS!W=-zl{oN8kuNy-N}i z+RZlW+67jB4#c=pJ5gdU2c-2$cix1M0v3LZahVL6h&ROZ!Bp$K^M2Y3gY>tL+jMDpPn;vum2T+F3vo<6|IW*t zl){8dV_0p3Y<%?7=d9;3ZnqIBrxiq$)oNkBM?WRn?0r7ow5-HN+qnzXkRw}2u@?QD zbM~Bw;10C)wF*m3t*oyzHz)Pr@47mTLmjlhoeR|`o4Mv~#@#%qkJ~(+T$bhCKODRv A4*&oF diff --git a/mods/d2k/bits/xmas/bloxxmas09.tmp b/mods/d2k/bits/xmas/bloxxmas09.tmp deleted file mode 100644 index 8b56275d990e95bd8060b91553fc6ef0696e2bff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmXw2%c|ry5cNP7vl;RWv&?H7K^JnF?t$vM8g4XLPy&HhgULo4lkNS4{O+X_sW0TH zFDY9Ot4j4ar~G;PJbjoZj1SYVKTOk4*bn*p$G?928Q;H*GmP1DTzl_^_aXiH`EJHs zys)sIBb>x*4K*{5@U zd1dC5QrMd?BaD|+4ayGv%WKCw67l|9zh>rs7pWH)lR_%<@n!F=bvtj(UHgH2nd@<} zr&!?>Ik<$!RgUJ&Tr(q5g&hnkwC-@nf#rgMdCw+Gs&zx@F%Biv5X>-!-)x1x);dC3 z2&g)Q$BI3^en+km3HH_z$6G3yY-Bk#(i0(-WqVbt)u{BU422dz#XfqVu0kgdXv-|BP!`s~IbxBV5dSnlXSnjf u<3Rzf9-&FfI3@8!z#dL#Wx-YOPHFZ4 diff --git a/mods/d2k/bits/xmas/bloxxmas10.tmp b/mods/d2k/bits/xmas/bloxxmas10.tmp deleted file mode 100644 index 6da401d11cbce11bcc114375b4333800fdd6154d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmX9-O{ya|5cWV8*@RqSmib#7x=>eR3^ipLQ^tZaDAsDG>4keBCfCRva+f(sF7bHu zLmopu`Bh6GseZcZtFJz;KCV8jR@fg_zyGjW{ep9oe}4Y^k6&^Bt-WFM&|6NV9E?>d z3Nr;I3Cyw&AyTG+yp&Sk_kop2gb9X$CFIZrcmIAk_`&b)_n@5BNHkMMEJd8rcgH!U z=hDI>#V(Q?M<`YKgz&rhT~rqfH1<(ENMw<$Opnd$aR=`-&uN}wE#^Pd8#F#BU&c00L#V0S$ufdxBPnT#)tSmP3zPi7T*H{)V?$`KV_~Ow~ zO4H-F^LkzvT^{je`6)jB^2J|KG=#Yqo!7`s?_=fdW%J_Sq5b@+)MdiQeM7Qm_Nt#1 znNFpC^~;wFbbjA#P(KSvL_z7oe$->qq-Iq$hPxL)nAtoI$0c3nd1^4F^k&y59(57Z z5J#lATjonTo{>p9rkbu#!#atKV`$J%OS<09(9h}I^svjJ7V1KC+3oyIF1qnx!8U|* ztIp~K1OWP64jk*`(^Nr(Z_B4|U(571o$rOQtAZlrCsl5=d@1l)SC8) z(c*ZDQ9_K55p~w{UXlVtN;iGyN4mAdA+6cfRW*S`L+b7Mx}H)|t; UIzoUpF&Ir9SWfn@(rWeN|5YAqq5uE@ diff --git a/mods/d2k/bits/xmas/bloxxmas11.tmp b/mods/d2k/bits/xmas/bloxxmas11.tmp deleted file mode 100644 index f416f57454a74019b25f9ece927ce476b86bff17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4148 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 l@hJRULdwE|9=|=Wlp47eYqL%+w>~ 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 P)9>H@dl1Lp{}}%V;S&xe diff --git a/mods/d2k/bits/xmas/bloxxmas15.tmp b/mods/d2k/bits/xmas/bloxxmas15.tmp deleted file mode 100644 index ff0294ebc11e93618abda0e4b44e479898e895b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12364 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 diff --git a/mods/d2k/bits/xmas/bloxxmas16.tmp b/mods/d2k/bits/xmas/bloxxmas16.tmp deleted file mode 100644 index 7828c8d83f4e84db08432e1b3f23ca94c5cc39ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmXAoO^Vz=423r~a$VxN*|ln{8RO6<(4bW%B0t!AQAuo$JUDs!|D2kDd6!4mf979)0$sFCkiyTzD9 zlOaT9Gvq#k8*S_W(5ERJ@ zJEy^tI^msC7609QM8U~GzB?Fk>0}b{>n9yyJd%ehCRFllwvtTAW$4kxDLG4aiH&DV z$%v&y)d%=?I{DU%P1%S{wa03M4p6EhV-^wFPE~d<)#eN zfHqTNAUR6z>8_$jp)_ zXxllRj#wEH#(qQ~E(5I&xyl0qVb6sVbcso9jHsuxa61PLEyrWwfou$RS)DrYG>P_d XqpIe_u!v1icODa|82r?mG|k8VqHi@s diff --git a/mods/d2k/bits/xmas/bloxxmas17.tmp b/mods/d2k/bits/xmas/bloxxmas17.tmp deleted file mode 100644 index 6815e68bb005e75719b179d5572c16ade79f95e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmXX_!H(QE40V7Udh0Lbm^Qu60wyFHg95C|sh5F_vRGknTc3hG^*8#j1rivVk;g!u zk{Xg>nbhOsBl&K4H@q1J>^H-Qx5Mxr-~IXb$A5nL3Fn{tKWv_<hVxaZ04ZOd*j3 zE|Nk}DwK$f3$X|Z{|9FhVSI962_=ky;2R@H3*RntNk)F2S) zfni5X&Vn~gFoYbWl)}RtpZ82SSUaG?Y_=q?l z0!K|UMOM{y^{dr=g)p!OWZW47)$*z;dU$)@m$SNB0Iv=Y7Rrn2uj_i;Tdlu6r|P=8 zf_*1JBbzRI)Z=l?tKaG?xSF|&f&F(4?k7I-{c(!z>0Dpu<##YfA+WMU=&??$H&H#> z-s-j`AiB}m(?b?0XHMSQac+`*Ya6P*Iw}f&=nm9BxV9DCE9Lp6ZN7YTRYLA47{wU7 zFVb1B$9S|>&tdzE4az|2zJf3oljp1Mw`<*YYj%-hP-$Xdgs$VCuQ6+WnqU6j+HwX- zAofZ|5GaA#wLVUw>)vh^8h`G^>wzI(2N1vRf2d~vveo*mR!vYjbdd?mRLpyMfUi&U zJl}K)5C{Bvf5QRXPrd_a%)Jd>)&V+~~MB&N>o)y%||`r2?2ia#?8Hk3J^ zVDs+kz0{%6XzXMdgjCmK71uts`l9%IZo80+?yLRi+o?&EDyG=_R+ zn2{dI`Q~ifbiONqh#ZMuscO(!jxSU}ps6vEJ=AWkuSnw=d| zD;$`C{5)kO;9!1!eMSB}&AtHPiWx$RxZMyIGF#ZS#OU)}ro~-E(L#icJJP}dz>v@< zhe+q$Q6R>qW_$jfTT;u}R=v#Ah2bzMn)eGLbM?|_+r_l#g>Nu(SsV((*mI_&YiJI3 zjB+Weh<|TG$(&Ngyxh%qJD1$5YkPtEsA3p}j_|wPRtx3wp<>8 z%m5auM~hOyt`P(Rf0$d#(QekZ7q~Ez6AC#s28aE~1ixc1up?N`mY@xMNl6a*5rzp% aj6q8Zb_0oG;<4r^ibESXkgwErpZ^2MUo@Bi diff --git a/mods/d2k/bits/xmas/bloxxmas19.tmp b/mods/d2k/bits/xmas/bloxxmas19.tmp deleted file mode 100644 index d09979a49c8b9a92ac869e3c9853dbe93a0a009b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4148 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 BykYJ?pIaVV@0JsKIV+xarXW1o$-g` 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 diff --git a/mods/d2k/bits/xmas/grenadiericon.shp b/mods/d2k/bits/xmas/grenadiericon.shp deleted file mode 100644 index debecb5b74471f91000a9e764f5925f7ef0dc2ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2100 zcmX|CZH(MT8J_*hmx$y`8YST)@uev#6~&v-Bh9T(yGiAZITmRwP3CFBD|4Nwq56+iib;D6SiV~@RJoF7=0 zXU6kB@B6&-eoPKzj|hZ^<5vNAC7V38@8R1gJU=dnO4F*Vj515*^`!`B}pmw77jzErVoy< z#j#4lU}pbJ87$yl@BY7X+#9b&>ck4F)vn^XNw-?nKIJcP6|BYJF7LK3Bj>X(=3i6Q zfgw1Q_%2CPJx$yEwi(A7Q%jkn@mXB1A@48k{Ow4Mtd?U0Ff?2eMS&c07Z@)J{y5fR z((jj-8HV5>_|xq?>Vr3}$XXSQ5DIq7gT5~vXRgupBux{I5dIH1ikZ9$@cqB#XJ;%j zXxa8e8VszKWO%D<;2l$AL@TDOQy}6f0&BVR*$^#>XRlx_U|@TFci0kIlEvo6wq!kD z?aJ4>-TI;ocGf7>Xp(?WX6I19Ear>+_9&(>6ScRU)xm1Za{S?>DzhKgOkJL`Q9+G| zNuYtB%v{8TT>AT|!~l1hIHPvz$(hI5f9-W^mAKUMx~4D;M^!pf;M;n4j?*vr%*+4bAF_0FTg!D58&>q z6k5al$Avdc7q*b+8fmH3`vS+-L=If4X+Ktvt>L~Wke zP@H?Sw!@3%n>dWYQ><0w|A8UoRzMZ^+pJ>@vPwcxX_2`jmUkEvZPTNH5lXhSYUdtD z&XG1ai8@RyDgTz!$AJ%tI(z5Qmy3VRgb^u~UJZJdElHL^0>4Ls;!iQTT&}QPoyAY{ zy?pPwSgx#VKhkLEk~}mGYf}93hCztuAC%N`mWI>Ad$0<@3QqLvD`oL#K`QsuM6h>_ zmK}Hjfy36YkY_!x08+k!rret3_e5=e-kIY{5NxlOj{a)`J)TBR6h)&By>99JYyi6I=P(ty{UA&EZe`cSlk6K zjVYl-nrSDx$F#9C#Xv_s;vb|~+8ee8O1?9U8FhBI;U2hmmjgRQ!pe6OlJN90DM zDUQeuC(V6#x*y0$+V{dJjKiS#;${L3V={5PDCa$$#?V>~L{%ID1kBUufTJ?~%S&3c_4Ul^&2%-CK~WvnYe KoK}GK%Kreg#lvm@ diff --git a/mods/d2k/bits/xmas/raidersicon.shp b/mods/d2k/bits/xmas/raidersicon.shp deleted file mode 100644 index 8ede09bbece04fe59dbd90148342ba4c6d26c403..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2329 zcmX|DU5pdg6+Yu#?}A{KYnEMO?__soS?G_0aEY=3Y#dDDXvYtoTXl6Wt7xREiETDT zYAJ+zJ64lB_S%5WUll@VQ%I^JRb|yCfmD@RRa{?RjNKDRiU7|a^)F& z)iDp9hdF1?+LwKRuma4vd1bFOei6k_QVh@ z5sDRYfbl2}(-4DaSqJu&aMyJ_-2}zOJ$hP(-4!BZOescNQ5e0z2+Dig33DMjMmX{h>j@-F(`)(cMI$4!vg}@6iiSk84y6Cvx$-q9=5no;N1OA>I zsWoa5ymVJ4awIV`b7c1Rcw_u_cQ)b$=QT!A+%wiaNjjvPPG>rZp;(pD`uGx&8^m>? z{}Rq*j@(U02)<2jM{4J4XGR-!ifQy_vD58}#~BGcgYqZq<0CSOG%(23n%m8!k0cT# z;=YgOj#gWG7C>&jU0=v`=i0AN#;?`G}$g1kp z99o0dOOf#!iRRHh=D;%$VIA)5k8z_mI!YR{P0n1O7_U*fT5GkWtW`aeObSU-cS$7D zuqj1(_!J#wF86!*QIX;Z_uVVC23Bc}CTlfXtF2TdNidpHRuUwuDo`6<_Exy6!siYiLN^!{k)|BRl-eFv|c8L44vBVp7u%0r0PLgBHLrj-TW2&Rk>D5rTTSPq55la{@0 zqnFyf5G&&GCphOkxz$_=mqU7x*Ywb$9)bbAya3-kYg86P;gf<;)`Jpn?>^)^&eD)5 zr*Wn+y6PLdhHbM_DGe=`H9o{IXysCfFX{YzGbg1|lF__gNSPD2xC<;bDXAVRqT3cElVD zY18&{suB`~kgf-fW-{6C9d6iz27G~N9G#d-MS~Y9jmVQ@czSk|nbQP;=R=F8iJlt1 z7udvbzX;!A?QI)9Q|aNKA2{>|#j}Z}>FESMLQE;lYm32VbLwSA`lpJNWMDnynHtTr zIQNJChie0XPeo>DBXUHc5%}-vTT;*{=~{}%THaud_U7t`~anZ3(jGX@@>%H<4W zp3h~i(b&jU@Rzy-cSkls&lAThsP-2Q2Yz^(w(8l)jAB@dXONz>R?MbpSxGUjW4!tP zmM2Ei5G$#!(+TX94(rcTbVIjHIJRh62`h(UtcmspPn8KyB;silgZCKen;#*IwB2@G z@ezA|IKG(7Sy{^cy*y*(a(oJ6;xXUMVmc8|U~VV3Lnm(FpYT3Yduhxa$PfFO;=io( zCgh9MY7Ku4eZr~Uyo;yPbH0BMZuek1C6%f!oG3X?yM^+s<;|6ZuGrj5%pATqCT zNLop(ds@1>IUqjhmvmJXW326stE6M2INF8&1?vX?B;MHiw2m`=Kit=;>-()&ug@_8 z_r02J50}^q{266?Q7J1nHB1Y|XD$~NCB5!ffgP}mslN7r#+>K}%#ogCZJ3>^eD)0T z@A+NeD(iaNGORQD6K)E=?HPWbyH<2s?WsMU(pumZZ%k6}6cJ{79PzD(@WOx?OQ-`Znx)EFJ_K6K1fqQTtT|*}VS0O6iFF7r5*{{Vse8}A49|U#>p6==JeTlh`F?M~wKtAykcn_XJ z>pZ)Uq{GaFG2NZ><$K`tojZF-y#dwn@7LWN`Xkx{uW%o+q_}~##7BXTPXR0sE{n?p Z1D?VgUU7Zcqve5tjf2aBYm?qJ=zscDg2Dg* 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: