From c6c47ccfcda5d611e8faab76b43be43760cff2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 5 Jan 2014 13:36:24 +0100 Subject: [PATCH 01/11] English please --- mods/d2k/tilesets/arrakis.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 6e8c00cbf8..14883f12b2 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -4682,7 +4682,7 @@ Templates: Image: BLOXWAST Frames: 97,117 Size: 1,2 - Category: Dead-Wurm + Category: Dead-Worm PickAny: False Tiles: 0: Cliff @@ -4748,7 +4748,7 @@ Templates: Image: BLOXWAST Frames: 312 Size: 1,1 - Category: Dead-Wurm + Category: Dead-Worm PickAny: False Tiles: 0: Sand @@ -4757,7 +4757,7 @@ Templates: Image: BLOXWAST Frames: 310,311 Size: 2,1 - Category: Dead-Wurm + Category: Dead-Worm PickAny: False Tiles: 1: Sand @@ -4767,7 +4767,7 @@ Templates: Image: BLOXWAST Frames: 309 Size: 1,1 - Category: Dead-Wurm + Category: Dead-Worm PickAny: False Tiles: 0: Sand From 211bcedb9517dfce900fd8d07daee192a4fab6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 5 Jan 2014 13:42:22 +0100 Subject: [PATCH 02/11] stich the black wreck together --- mods/d2k/tilesets/arrakis.yaml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 14883f12b2..59888a47cb 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -4643,22 +4643,22 @@ Templates: 2: Rough 3: Rough 1: Rough - Template@461: + Template@461: # TODO: this should go away Id: 461 - Image: BLOXWAST - Frames: 373,374,375 + Image: BLOXBASE + Frames: 1,1,1 Size: 3,1 Category: Rotten-Base PickAny: False Tiles: - 0: Rough - 1: Rough - 2: Rough + 0: Clear + 1: Clear + 2: Clear Template@462: Id: 462 Image: BLOXWAST - Frames: 355,356,357,358,359 - Size: 5,1 + Frames: 355,356,357,358,359,373,374,375,338,339 + Size: 5,2 Category: Rotten-Base PickAny: False Tiles: @@ -4667,16 +4667,21 @@ Templates: 2: Rough 3: Rough 4: Rough - Template@463: + 5: Rough + 6: Rough + 7: Rough + 8: Rough + 9: Rough + Template@463: # TODO this should go away Id: 463 - Image: BLOXWAST - Frames: 338,339 + Image: BLOXBASE + Frames: 1,1 Size: 2,1 Category: Rotten-Base PickAny: False Tiles: - 0: Rough - 1: Rough + 0: Clear + 1: Clear Template@464: Id: 464 Image: BLOXWAST From b9cdbaebbf27b339b4268878ff2d400ce387fd75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 5 Jan 2014 14:10:22 +0100 Subject: [PATCH 03/11] merged the giant crater into one tile --- mods/d2k/maps/the-duell.oramap | Bin 11996 -> 11999 bytes mods/d2k/tilesets/arrakis.yaml | 56 ++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/mods/d2k/maps/the-duell.oramap b/mods/d2k/maps/the-duell.oramap index 76d25f511ff795481d35d166f524b438d0461383..9fd36ab69e40ab9168024547d706ab07eaac432a 100644 GIT binary patch delta 10866 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∾f8jAI!OcpjMfS=9j;Bkqh|`=2TN_xIUoZ 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 diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 59888a47cb..04a966d9e1 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -3512,29 +3512,29 @@ Templates: Tiles: 1: Rough 0: Rough - Template@361: + Template@361: # TODO: this should go away Id: 361 - Image: BLOXICE - Frames: 1,2,3,4 + Image: BLOXBASE + Frames: 1,1,1,1 Size: 4,1 Category: Sand-Detail PickAny: False Tiles: - 0: Cliff - 1: Cliff - 2: Cliff - 3: Cliff - Template@362: + 0: Clear + 1: Clear + 2: Clear + 3: Clear + Template@362: # TODO: this should go away Id: 362 - Image: BLOXICE - Frames: 5,6,7 + Image: BLOXBASE + Frames: 1,1,1 Size: 3,1 Category: Sand-Detail PickAny: False Tiles: - 0: Sand - 1: Sand - 2: Sand + 0: Clear + 1: Clear + 2: Clear Template@363: Id: 363 Image: BLOXICE @@ -3570,8 +3570,8 @@ Templates: Template@366: Id: 366 Image: BLOXICE - Frames: 309,310,311,312 - Size: 4,1 + Frames: 309,310,311,312,355,356,357,358,1,2,3,4,5,6,7,8 + Size: 4,4 Category: Ice-Detail PickAny: False Tiles: @@ -3579,6 +3579,18 @@ Templates: 1: Cliff 2: Cliff 3: Sand + 4: Sand + 5: Sand + 6: Sand + 7: Sand + 8: Cliff + 9: Cliff + 10: Cliff + 11: Cliff + 12: Sand + 13: Sand + 14: Sand + 15: Sand Template@367: Id: 367 Image: BLOXICE @@ -3706,18 +3718,18 @@ Templates: 1: Ice 5: Cliff 6: Cliff - Template@377: + Template@377: # TODO: this should go away Id: 377 - Image: BLOXICE - Frames: 355,356,357,358 + Image: BLOXBASE + Frames: 1,1,1,1 Size: 4,1 Category: Ice-Detail PickAny: False Tiles: - 0: Sand - 1: Sand - 2: Sand - 3: Sand + 0: Clear + 1: Clear + 2: Clear + 3: Clear Template@378: Id: 378 Image: BLOXICE From ca770e89c33ea412c17ce877fe55187b65d21154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 5 Jan 2014 14:15:08 +0100 Subject: [PATCH 04/11] merged the bottom of the big rock --- mods/d2k/maps/death-depths.oramap | Bin 13218 -> 13220 bytes mods/d2k/maps/venac-ditch.oramap | Bin 14532 -> 14528 bytes mods/d2k/tilesets/arrakis.yaml | 22 +++++++++++++--------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mods/d2k/maps/death-depths.oramap b/mods/d2k/maps/death-depths.oramap index be4bd975708ecd78dead12e5d5c623dc08cddc66..b69a39a5c2608b0b838cd2a280e91f01ab6fda97 100644 GIT binary patch delta 12031 zcmaKybx<5Z*X{}Kut;!scXxMpm*5iIWwC|D-5oZ#YeER_Zb1Tp;2u2qa+CMF->oZE z_xWdP&Q$%n&U8=D=~GXcJ;WZUsR9R&2Ll6x48!V2C+mKra*N9e1A|}&3xo7G>T2cA zZteK-Jj5i~)*#hx$oRSEeq5Dis$OmlM3R4n$NNyW97f_`5k11&LkS6J^3N&5xI00T z?AWuIUtHCfxZ}xCT_@zUoZ#kfiGnBG#bKtcB7i(%(1hDH;-AKoiO?*9H$biV`~VlS zB#k1`0H=DlQCGR({;d+Xl=%OtbQg9)dy71DQOs_V&%~d}KhJ6iN{ocBhhrTu*n?*@ zDdS}M<^?67_%{|FFWB=jj6I+uw&Th{+p)~vs0~TIcwI?Q>K$k_}r$bz=;(Mi?K{-I$lyVK8k-44Z2wtL~`me`;Nk5&}cW4qy0Vj-eDPwhxR0Ras}U`edAYr+*mKQA|VeB{2+(CV8WvoW!Xn^02F%Rp+yQ0XvSo2T;;8;o{k@1UGC>aN^Of4m6 zYpsx4SWg@>b5Y!QV7{|{`1WC-;sWNE*aJ=(UET}LJq7=^6b$w?*~)&tbC}RaIk&SM z%li+T`aL|4DdUN}6XA89*qpq!_xp$h#ZunV=@PC}E9eO)RdLuqJ>wp9A2Y)&V%K(t zg5G~Hu*cWhzYyJL&dld=a$WX^d0#) z&k~s|*pGYgVwQz5;QVh914MwLI&quO*=O*k!Zv+b{zN5RN-*e%1@E^~_y{}jCi2DA zB=``SAwVNN8IBDYk6>m7on?RH9k5}fU2yxB{1AfYM%@!z16LM#YyFD9)2P|qd4x35 z6XQZZWKRfiCjA_`3Pzear8nMz5w@Z*UwaXpe%emmQPO{Go)#gri4TvG$qR=zxIASD z{1nD|HDfK-2a0}U7>py%L6=`r!qJ=x`@&QWehPaiSxo{yHg>iWq?&=@;ECS}#gOe_ zN`2k6!X=j_X>*?%c`4?5FLbG;RpRUBm=2Mb(MoGa-0VXK^+gq}?I}`!fG_JOYL(Z_IY|e| zt0T=by3c?r>93OC(cKAUg_iti1!K(|01)p7Ne@;L82Ub^F^2f(RMn}$Az*p~Soe_i z-50Ph5O_xf8%9OBbz`;}5ktjs5N0!zL-E~!BBf4$cJ4=r$K7+qXYh_$!s>*+?{tac zK$Hyvw8s#)UxQobjpv)TeQhdbxO>GrOd_BzY!)yrY0P|x9WDo32fHYl=p-pd&A+NC z3^f)mapQ1Uwnez66bYSqqtZq+&YuRiPY2DoDhd$=@q#wczM1}5tTI>KOR!K|em`aB z!V{6?I0=#H8W1hhV3Y9Mwk!LwC@tUV#xHB=D{c8ufTHh^UqJacLJ!WiVlGN&7NW^- zg+su+C18&1`8utnb+A~A3)wdv^l?grkDQ78FdB6OofX3m1drd&IEs7p=Z+MvWds>TS_z6c4kKW z*i7Vu51Wfrq${zzQ?(;}Gv0Q&Xk<8tb~jM*4k=awIkH8gO@peJV~^CMz@9sExEl!ihs$2{!S-*l0xHS;v3LB zt?ZR< zCZ`#zPmJWs#dCo36QGX9AL=4C82SceMnbTTu<~MA<4$*~Dh)?E>k&Pk;RF^cja4_& zbR`Y==oWqmOgdl*jyuvB;z1Wry-dL&lc0rC4JYIL)VOuu-08mf9+U2wqbG}jwvfkI z@eY~fC>K*8R5n}$u>>9-B5lz=(Sr_Siz@xYk6?!lV$Inw<)4U+O~ZNA2B018 z>cRyHva5~co0BjwxT?{oF=`7ih-?||F~e@(QGfN2xVz~SVdZ5KFE`MRR<E15HH1H1wQL)%)!(U;SHbo0A&kuN_0Fca_ZZ8gak^2L2uCVQo*8*GP!8MAvab zQIPWvKkb&#oHj6ZfFP%*Z=1Nx*&(!UhNt-O(L*VkgjX4}dtO?E=}Un{>fn_hpx3$j z!AGb8?E5N^)zmOCe4cKTNx>o4ME1USluOnbQ^2`84#*oG4oo#2vVqlnH9xE!;Cd3T z@ioC)SIj(M-HadN(0+lvArLf|3C5UCz6-!S`~sz3BoOLzS8TrZT&)55T63dwDtC^B zq?@3U0ZnALnE9p8q?2JqtCdn7aR(N3D z;lEQKj*4tu{*0YzQ(N8@OpOLF~E$c(YIyBojx%)zO2RfDI#sC}r)7^T7lX2>ntv-Ff2N64&s$d0x6 zyI}d$6+gK;QM{8&G(JKEC}1U1+lWHC;XMI`k#L=^`e-cKrq2hg>-+{4>ax(%tTTkfjrG-Z=?f>0ZY=$iXv|vj^RDNay7RPvr zfUINI(bf%zq$l~J{=Thpu>M4dP6-QwijO`f2D90{);ya}@-qjZSN4jorg!GWCn*ht zjemQw{}2?$53V5A(csa^u-QP70!`A3uKq?b5o(-}NQn(Otn1cIc?m6om_EnwIsn_G$o|ZP{}Q>5x-1+j+O;k z^ByX^48Efmo!cLr`4VWmY?wg5gGPka8do*z$zUEcL@&Vr6&k+40cKM(*EubHUS7Q? zTfls-TEL_DVDaBrAbXLjIGq+^Z2ws(?}SvNL;RCw-f0UyR==o`*}>2pPGH*)F@|N* zX~2Ae4Ov*+HVl6mq9R1GQD%2`(+}K}evL(kW)%^Sc$_p*V4PIt?qDe;?}bCq)~DeO zy14cgm6bVZF&!~Hia;8wG-gQGC!YrN7ud9GBIH5Ra>`_YE3Q)-+JFl`aPNPkh^1uX zpJM*jCJvZKdS*+4i04-axZGDE`f?o(d&g6~~G|#E3nW5tI_e>>BhWut< zhi&ii@%d_a(}^8(jguO&zopd=ihwt@mLj4%RaKb8sce5z<9#nrL}_%$kDkQ;)lV&z ze*qNMWxy#IM@8)7zf-}-fnB`ErKKKFiWrm(3zx^eiJxAS)zEq1nonkGn_@F)#O_V| z8R=} z%ZGHHrZr}2@SP|U)5+hZq@nY|b(PH2Aqtc!i#`>!EN3VWZe!yepypM~I{DtOiauuj z_&97Qij26-A2FS{)`)gSBN~V3XA6g>t@M}YXF8skeA&un_Gr!ID?$CFrNxnHMUt=T zT2xe$2vhm7EwmXd%6HwP3Fl0DIKCGMkBGIg$1T^+2|r~bC2KXb;ostJ=G2%*x! z?YCy?m;LnTuKgq?y5dU}P$}OUDH?OQJ_kDAH}rWPNU$vmR_eI7x?HOVu}X#e2wv~q zCDQ6%Eee8Jy;Z5B16BLt`w!W>yFe-4!33m{-`?_9zKYj#!yq~4zFT6kecfOAlG~x;w zWQ@#U1mfdSm8%Fs^WnxNZmDRm%@wD;2MCh$Z&Q7j>rH%cHN5P^?Io+%jz}NP`i*`b zreYU3t*qR{*I&SkfQwV3#&G0o{+01qMtt-J-)*wcC>h@jfX?NJ#FHUuTly8T1JXns zF#oT}(>C)K7h~m%TPWfH)@%1Ez4<$SV>&L8nfhL_)+-ZH#wXt!F|Soa;o3yJ4OYg( z79V~2ve2+@OUmCyO;1Nlfs@7RjrGo?gqq`tox;LpA7TUfB=&})F2dgUVbUi4Sp=7` zE^!XFV_X)s-tj2DPc>c@Ky$iEqQG0a?0QO55Jfa7+vxHsLY^Ea~(zZ zfWYEzciPq8keOkaeR5(lY4UWnWq~}%{wZ}8?0q4j<#ea>@q}jhP}L2(WlJN!c%ihq zwO3o0smhtz1snON92An|$+qPgSCb)yWp6ol$VgJEjiclbE3vkpqn*Dv?j6j;!XeVr zP?a!-;0VK=JBYBK?g&6f`$*e$)kLGbI^l1h9tL=i)_Ap$zZ=vo_hS~4UJ4+_^AZ zoL}`jWj0}{VMZT+p?*$S1bSX*v%M6|gZo|3tN_wa955N5L%O5HxxJie zqUe3h=v9*x`cI1wf&#aX4jNbh|0E);nzHe>VEWcjBo51}q@`bG=2d4{_{W*t=z4$~ z`#J^scKWPiRoAH~4%7U&2}G&HXRQ27O4l?ORNw-A>)ANthQV3;f_Dm&u}YwciFkER zECPD;UibXYC%(*(z-yDTV1)IMT(Zd>#SMK-S>dMq7T4`4oH?BtOWyoqKR0Zh@u{Qy z-zEM*Jj2o4k4U~c zbii2()kZ%wf+`SC^>-2W(V<9vZWcE}noiQh>>}#vGsCJ-MIx9luAi2#cBh;_>$B)MX#33ooKEZ&6JD6N)1W2-x{VbAFLx^DCigI*NBXTeu^(_#>Dy? zCw*#*u5s@ndnY6NyG#I=oj!e}t$cZ5lL)9-73YBNs*5V4%J?In8~qdQ_q<@SgUi4i zHGfOPa6HA$tRrgN4|_qeno6|VzP<-a z80m|A!5(oWEs1J(;btaW<_TE*^HYCJ@o`x@#$r4MSQhLrhej}M&6hB)=`{esr1)$z&EZhA&d_9l;wUHZk+{qQM)6oj03^w^SR zpjH4aF`xgOOqO}lQnEJ&Mai3rgM3Y^tbOcO5wvYqW-Sg0%B|;wcC9(Nc^N`hLXhv} zDa~WRq*mJd$s_!VG|e-t1CV9h5~(6dnqk-ZQ%_w+`Km*62I}j`NS^8i&LcIs*-EMa z)D745@nY@2t3V1izu^apMsZX^*U~_JLtXFBv&00=F>wH_EYlATMmDYUokcRrc0I*M zuOI|#2Cwb&UuhNSj>@jTxT#IOh^2*|P4?KB!utCFh#wdt6{|@7%N=cg8u+B3%Q! zhhHoMj2o0iBmp^_cD2b4Q3W`^M@s8OKF6n8l0$jaOzxdsUHuXckCH4P06se~$Yzxt zW0#E?F`=rG$hr8qsG{fKLMKKiyVExq=KT)Xh5lA30m&|P$M2#I}G>4v+E3aDFW zlj^HlM$*Y=Ne6l{wrd{|tHZVC4JX>5ACk#3iKVE@pMLE|z;YDm?XsbII+LC=M&Z#7 zbnSW;fmG(ae=SLT^zkK!FgR<3zT(Upc*Vx3bR#)aKd)Y(>V+zUtM34!$g#~$)RWsw z4A|B$VMj=gsFhWDVr}sBoLkf00x?LjR%xS>s2&4{7r&W}uCxL6^8RSw zw@WgjGh%P;A5DrH7dWjsyJN0y5wNfTVtY?kBtY`AJ%)2uo~l5rOGO#igRdqBB}xyM z0B`xQ;ZHc_ZfR3WDjQ}8W$KS!%!0JUR5O&0b}`sAFMC-R9F0uQ$Tav!Is}iJrTuKiZ zeW2HNcKRa$JSVoWNKFEgd26nkJNX#qb!0D~WmhHy9`u?@;x4Y%CdDVq;c= z(NRWXeTfbjdCceUB#3=K?@{OBnCf93Pf3rX%aQ#D_ZE1kha_1xJ0tV#TIO~rxb&~y z+37Ng^FY@70GSW#w$SYH_;U3r#+b!3RRDR!>8NVshpK$OyW)@1)^Y^|5HRbPv2^PQ z@0nrGV(1^IYXkgF$mkM(X-93Z+ROQw{S&(zz;=oevhPms%!ssKOp)Pcx}$bnx*TVk zlkkbM!z^{!Cwh&k48ibHQlXD>f{HA#ET2OeEl21}l}CxuWSCBNZX_&8`PK=uV_|IAYk5=8ST{i20UAY*nd+V8JGKhegu>M~fgh)cH*@&r}dQ}+b zd;rS`E+`SIgceO>;|GYV&3J%jJX8wOej~HMI!@IV3UIsD$ZFLEZtW)e=b$_5T#xvO z9VX80I!cXQfI|&}!*o{*T4nH08cg&63X}j2jzy;oCBe*XB{qyc%TX3c??+~eJ=6B= zHB|?~y8Y9ia+45Cof-SDil#|SY+aj(#&-%xw@VE54akpVR~HlO)XEezm>o|ds=prB zwHF5t%4iHecNbLyYl8i*$uuA5oZynC?4+T}M78pR#&zA*d~CZ}rb!nPyzZ<>-d5-p z9Qn;-N>fBx3!+K5A%h@@NKs)0Pkt;fhE@4JJIYJ#N<#GMpW%V*P@|>$&J!spd z7gz6_mxg@F10`?lA_<=Fa(K?~e!Gs4pu45#rsO1vyyfNs-;2jc_0N@TD+DX9O^CEO za*n>o$?Z76C+n(=qCIheU$RW-i=DiZ6WT_~NuH^)2#F-+;`OV5uUMGCu#-HYQto;` zqx9sn{VG#Y=0Gl!S*Mo`vXI^c;?L_$w8CZSH+Y`Q2 z#^7WO*RwUO@iw$~H6AogN=Dj8Yhi1iK;rw`^Bf$QpFd5xq2+_7Mx+cdRdxdf@@sxR zDjXULG1EyfwdqENNWA3E++y*=NW$Ur=bXXkzS~*^a^w`eZ7Z88+v;dBdvfPl@pcxq zsbg8rrwg?h>Jd*i01^ z|A~7UpK)<^6U+`gQ$d2wBERUYLqpHztbcKplYkEaoVg!Q&%8sHf`gNt0qW0}-9%rp)dr~Q*aUaQ z>m{l2vPw$*^Fe8f)PS5wFd;3KreJO6dT@ux<6;}p=*+lw#~`Fy(whR~i&}`-)g9g} zPoe$F-y*cHQmE+Q$(rlP<=}{m?c8%fX7V%8mE;aT)mO3q_`@foAnpR)$n8??ipCkk zKl;b=SL6G3*%~s+%HljdBW=*H7~tP>2zvZDLbJh}&#fI}dGAAcpGu1ipjD+nA1OK8 z;~_Oxp)#&sZW@Yx+5XCTtiH=-=Azfx=wa-<%{I^kHCuVbwdv z%Cs2!kG@@Z(&W_@Wkqm7IS&t9t;J}_3+$rKB#E(26N%5ZDyxwcj{}jOZ3Qo;afmB5 zL99N#>#^C}T?R>S@-eW9e$KRh-d4I z7xaW>U~pc~_2#T*fP_N=XEn$6Vp)yL@pV4F^bncP6oeA)dR&;QeU2tepe+ToW1cIN zP@tB5pt3pIy_Kxr8=>Gs@%=~RGcK)+8>k+CwCWg#+ynG|aMA**t1>81TrQ*E$6C`- zX$a5F%k;e`g;J|m@z#17OIz3NC8b|As19SkfPQ+Ra{^j#TwqD~5J@z$?HTOo z9_jZvf5AybXGA!ktk@>hQ|ZEcj2zv$y^eKM%#b*64*nbiG-!VeYza<%7*3#Isu2hU z7b!GVXFIF<8t2xoB{(`yarwE?$90iznXmF{K|mgDF*NoH2X~jt^g5#DcW$_BGIhwT z7;tf(aKxukUi9B3oD+WwRm@hhkk&LP2~}+hAAuj?>JqPSt@m?0$bp&eug zd&8%-oljV7%X5ehe7x>%PJp$7zugndVBYV%SuOI%ZJCnS zMmzRsaOmMFz)}Q?5=JB|n9~*xF41CLS+?y%npiO9{6N@n75}hM|CE;jgMMwG@QW8L zZ}cHU=Scot;K7oEr`lj3x1IfOh59_gO|{$Kq&bR}_3&ww0hGMDs9e<@pg-=c!{w{C zDd;$%;t|`w#=?&8&yq5f5f=mc-DyO2VZXSfk%xYc2KxUxw|g~}4YFe@!_7CF!r(?EGSqH3A8v2v+{ zt20oA4m?VtUx6G0zPsQ~71Ot@>J8CzC1@mMG-`iKTm_*xNv-e~*$PkIe3)=jp3Oka z8JK{LUVrD}gJDPaA@tkAf6-iij3R!<6-M^t{AuHYm!05q^RHoyZ2!4F zivpcs4k8LOVxW|FAg{Xi*p9|kj`gly61z! zbZ;h?(cCxbLC8iXvap7~Noe5(XH^x^hvx0D3^nfcf;#3#_M{c6s^2a5V*)`Lv?rGG zKvbHpNqtd9vq((E?@bM6UtJ4{G&6CQl-a+L%gha!R7pv#4Hi~ON>N~_4)cQ?xj(w%G-$>%s#02agZo*_2HVj7$uf+Ut{_FO=ajc9?xNS-0q`c@$X=pGX zwN1e|@v_Z;d{bdPE0uiD*0AsyO@RwQ_N?E^@)Dart6&2CMA(?+d)`@Y64?q(eO0>A znZ&5A2zi;~H;eaPYUHaqHW@X)y_an5S$b7(xk1@F(9(!ct1=x{Nb0~dm=Dc^a|I!E zmE4hCV{NBN?jQM}-(>?6AxfN=Ne>2}-`s7Vw&!$h?|3GwOg~?JtIjn*jK0+wm+n@5 z@syTxZNXssV>Y0w2M`g&zhSvDQ0?7u|Crm2t(86~8F7wumYRrnD8(lu==tS8q?Beu zMTi=;w8GD0rK&DpV4@8bc`0{7$%hj|^cc^mB+3{(%t2#V)qums9N_R(LGGJ_lV@9& zN#VMFEnO+m`?wE50e6G)qKt%5c{Fw7CS_ODPHnzUU<1!FPa2hyE5$f&?UH{T>(}Tb z0Tt{Y%+Jm6#5k4{B6Q~|F?SB*8xDw0ZFUF5xlRq1yfUId)Yy@m^!%%m1hIj`l(Tkp zv2K?KIe_H}Ka-mbn?Oshb-HwK(jiGN6ywS*i&8had+`${q#M^U20Dg(yj(C~l2qcZ z$iwKoAELrte-rw4PINj!`#QwfiZ0gH1HbXCbyzl#t#i$uCMkoQGEb7(B0n-NDmmim zLCK>vNO=w^pVaM;%}!`_>Lcs`!L zUX=1GU)8`9ONX&0lHf!UGw3X?1QE{hEB{gYA+`*9#l@R!uCydK|V%YGj*a81D&){m+`BXt1nLncy&$$Dv_K{TXb7{0P7P(POx+=SLy=LINm?(G%<+($m@R{AyYGNap=>pJn)>ZtAl~on{*ANt zc|tf|nZ5|;?GRp<560^S9e2bP&Vr_c_;%!pUvRrst1; zbQrtbUoO(oIEjr(EhTzaYe;Pfjx2K80VF0Hb=7aogKX6s7W1U?EFyv1ps&%7#7Qge ziMa|{B2}`un$PV_zNpTyz^P@%+IPvq+@Tb5c=a$ez_(k3z2e=V;NVpJ^z{>dW8!9y za;4Bl17hKa;{J_#r#c$R1!=R+PR^eL;re3w=}f-}yf}Xjc`w#@6{vBLQz7(MsIpfB z&}UCH>sWYXunsQXnDRKXfJqnE??oYhnal#aleDr~221QL7=@)kHa$75-LMbbAEV*P zrrD-C-FY(`lr=ZwF6kpLjRA|2=pUFsxEelmfBOaKT<6MqF|Tl=PlBv=RPl za(vGB;f{I9?!pQJ{PE5>8l>H)AtF!0ul7{PEszF~~k&v~w72`MJ$qB_vW8;*XxJ zXvk%$+5*I|=7hfIGOY#$1Yr5ny))b`%4Dlmqf1NB!o}wzmJ;Uz$S)80D$y2in_6+< z6Uy?cRmC`(AOYP2UBp(uUej2V2n+})G)SQ^feYjeyTeYBav7}eXQXxj>6R>1!0>-_ z0soLfmS+oL7tUd?QBu8OznVlDHoZQT)DYhDk_W+)-~(DhQ@m1^IcHhDsVyrtD5{9% zPg;hY`D|z=8jETIthjY0bRDn?ehH1O_yRp^C5#4zZ!g)Lhl&7FrrHF40HZh|Dkx4I z1D;BTv|kk%ycjieyRJS0%mGFfLKW5OmagdOK42=P_O>h!(oD=+SMk5 zmzj)%f4yLDb7gAsU+sL;r&)=BnaBD`n#jjZ$Js-@kcY{^kB}rE`fbjkm-rtE2i2*? zb*<#<3a1vbsMLAj!K)?|EF4n@VtZJLLGXIL9KYZUbngpyn>vo{w_ELPMEi2mtc?s( zi_M8(78VSx&w{5fw+@+uCw_;1s4-Lr7T#5hiZgpZk9R8O2r(b7-$7@A;jtO7qRzE% z?qSeVvDFPYO##OALGS1zbdZ-Vx$<#Zx;gWr9Lb75b|d#=c;|H;wfD?H0(_6+)y{-h zQ(+_%e=1_}C@QRTdENp*R8>Clf_1I(JrrvYS(u{wzx})apDWzoXaDTIK#Mka=oZOy z0K2c)5r&0@#Wssk@@~)K%Du9_jQ+jg6o1k$7J0XP|7Ws(le-Jxrij@~!~OS=^t#5@ z9;nfgBf)>^-op%fTE}tv796565pUP4qwb!(y0YT)P<-C|$l(7;tCKC^6Ovq>ZU)7hey)7k*q^vMJq=o@Jr#b~TUp@>*6v#I z8B!`=F}R1Uto%(#sj)G>@vok-8bUN+`^kF?Z=YHke*@F9+|S*$Pfv;d2yCYRqG6Ej z>0+=tCjAN|FKYfj-s`A~TTlBP=32Ui*)_g+fBP^?QDJa-JNs90ajn~~&$GWyPd&Xu z{@=|1EAjv2zgf3)hXeEm8UM}+3DIx~!4kaI>*-*y~!O}Z2d$+(tqBvaRpGD3e{SR3@%4)kW zoZWG_$a_KMqX`CGJ;03P&Z0Mg9xck^gVSf>i`<94mHWMAze)SYr=pFxhbO2)U1MX@ z|6C;4T90r4hh4o@hVuj#<$w9s)A@N=DgNF0IU9}*!@|H=qyO`@|L+n^59c94q~ZA& F`ybTj73BZ` delta 12094 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 diff --git a/mods/d2k/maps/venac-ditch.oramap b/mods/d2k/maps/venac-ditch.oramap index fb78f30dbc47e5a876bc685281a492a1c0fe652a..b0c51888fde03ce2939847b513de4d0bb8b14045 100644 GIT binary patch delta 13226 zcmY*=WlY{rur=;Zad&qp#og_}t$1;F=ZCu%cXy{)afd>2cXxM(xBuMa&Aq$XY$luR z*$ktWbcV9h$S?tFCRDj9ol>2Dlznh ziiHn_&4nn1IkCKP6@|>7UuJ}uK0W!Zvi+Pq{n$^^y1L(fxO@9hy#9S~Q}B{{)urdZ z1ZK=L&wNvJe=FYeA}?AxCmtza*hO}m3XvY;aJ_59bej&5s1(~P9z(C*jgtwK&rC*t z`@`%DY!(mWEgXA#bRL~jtucE2nybb3Y*H&FFI8DDb1GyuIBf~ifd#>($sA{=R-(@L4iqFY6jJ!lkl~)os!($j^9F7i=HlBNr$DeBW~{?_#;} zEzkMl$^QB0d45JWEmY|k73r9R(4X^o@+|+bmB3vlF4w3;rfZ6!51{-LJ22E(_zIQDMu|u z&4+POg3Q~m1)Hf?MMsH$VDv|&fV~qYRu*3`CouZy;;^FbiSgR>$G11h1cKr=n&-gH z$?oEB=lf8h?on_0K0jETgHDj!e7F=Ug~)Cq-gce`E}~yRRIjWha{T>paPs2WXF-;O z@(91)R9__%xDP5f`=XT`NJ_|>^sIfPHBo0{hFmsWj%f;nBEA|aM;z#?0KRhg-Z>j` zMopC3MHYb{;^XSj9+&}g?2j&B9|d8E7uUGQ&jqMnyT&99Ev}34>%GRVn@lg>*9o1` zk01w!w^M>IFJOH|euUpn>oUc$+TieMDH*eQb?vT9ysyx9AzrDx*F-nAYjr@0Rp z3R)MGHCfC-+fTip@z{bAz*RYZKfDmybAXyqJa1z0UV9^a3P;IyaW#RCfH^wBV zC9;F7(BPKT?fee*8r=`AS|n9%hqJT1H<_ZfF5Jy3c{5>O8Qh`bm9(Lz?Q-Sn=Bdo^ zlZI9p*>{9`$F-n#Y+I6ZS`*{y8#YhM2{O5Tp2waFlF|a)ev3H3u&H{$xZg8?#U=;K9?&^gmCDXq{E%%e|f568>I3c?2P`|6L6wv;tLBj8*znOpP zg3(c&(F`$LF|UiK@oL;eep(gldL& zh*soAesFfO7!xAemiR7)5$qJUk$p(mNt|O};E9r!griN{T)L7k4%RlUQ=HMAZPZ_O z$lsarykL3&Z{XC%lKv*2%kSC)>7|Cm1=U)F1J)7-nFeHA?owVqtanSm9*p{s`7l;V z>GHI|DUCu=dSho`S=I4oxRsF4J4ElWmeqzHUl6(EFItT^??vpj$RRB4(0@zxRg%TCDS7sY zG52BQ;u%J~Fk1GINV84kiw7RT;6<=3rN;`ZcdnEt6dyfef?nT6C9u0xG-Pn94#w^k|d$V-86^% z+8#L|5;?M`i8YKJLgDv;_(xdpo`Hmi<@aDRVYV|zcj`!Ma!!cA0hxuy!2A$AvwR95 ze6=WUMIe73b44(J7Zb5LdHW;TF^1%C8LNM;#pVZFMeuV7Ue__MQ3*6Vc)SXFfKHl; z5;mlhRltz9_-6WUwm--5qXEf@im2T~Ri zZFof*=Itbt*RFv@fV=U%9BpDf>w%$uN~~>}34CehrIGrZ$@-fpNMZhz>w7Km&_F@U zIEfiE6_2f7^5H)U%jqMm`*Z;x93iSs4W>Dq%Lei8<&&0)wstv`Kpen&Ioo8{8};xs zVd-_3H^!KV@mGVN{AL8^<)StXSlrZjwynk{@ky!)35e8;>~a#A(Owu~Grr%9p-%{a z^Q;}i0^+F!2HNIF0qI4^lZA}HU-F$vf?!(M;RRGDh+%!W#QA6 z*m%d*Mpwl*uoEgIn2`heb5vGsXTnY(SA2xeU!&NMN)tEXu^}UTWD=j?DWFUWNX8OL z5Qu=9r0S38QS%)<#ZNho!S}DzEfTV`Lt zalV;SZY{3MZ0(zMi*{g-1ZRwzoIxDyzstQp6?0#bW? zD!w$Ie_%nMtN~M}hK2&fYEMyy(ml29i9KWEIWu@%BH`HT;K()Q0sR4%wznv&E?R(? zWq69L!WzU~(%41Wge`=4d6`EoWF04*@~8BklnOX5u8u|gbga=}VL=@AMDUditedH@ zsU~7zU)|9Y(e$PC)5K^GiNEg=Xr?F0Ny+`_NORODGC7N_OxkXh!`F^qDlZ(b#ixJ6 zh?^*sGkDR!)d7KNgiVBW7l9uFjt5|eKwD@ z6u&&62-d@$Dv;Y_?2=cAt6Q?8$7o~W4*90S5APRKpiE=6tora!qdE7D{10lH#NqrU zpVYK6m3~)m%ZAZDgRq8&gV7)i7G6xwmMJ7XUp$Y>Q3R;khS^8K|0{sY>LGu}25*4* zo&hzCv5EcO9BeOl8$H6Yyvf5tv_bhoUGMQjJPH3aV7!7*_QQB6LD3(9!!-PCNtZ!P zqPeo20Rtx?l%2sSC4jVe@vC?5U+Jt{>DV62EL=Gq-ZQ7J*3(+miw5dd^;sGcejIxQ z%fEZv;$39(x#1jtQ$&E-+=w^%id>m@#AJgq-3Vwr;`jEEZn^vDBaWnj#zjjf1rIPj zHiFV~jeW2a8vCfYNVsRiO-~wWnD+H5r1@`u_kMC9n`-niLW+!{pp?O&@1@^GVql+y zFu<%fAG30^>#y&H;K?SHKqA$iMMfI^hu)2TX_2pzVlm$t1Z?3{bc32PUM?H>A=c5a z@2`1NUYk$CVFu>Pb(0~(x$QAK6(Ha|J(b=jpNJ}7ShX(jWOi9;rs<|Zc0&eKHx+k~ z9({)Pl8#9@O}vbE4>5nN*^zb71h8EDwJzEhby`zs#}VEn5fguoqt`19mqn--4Kmba z1o+t$N#|3P0(e~vH+tn=3|!$+_-Cd?6h|!&Il1EJQXx*gz2A7%e8sh5ql@|`bdTya zwz_5S)G-7LjFrND(j3=mdd5;J)~Qbl;j{Rm98CRAYk7nzUKK!X! zhoiFJf-4}(BT4dQyb10<4JN@(tM$3ISkG@B7ebYCZT zDO@3(OICj;bA=soDo39Q7RahwVb(P40@PUytdO#Faqwk59COR6X+Iq(jq%XZ(615A z(WM$FIhIO^-Cb;DyId0zq4Tlr-ava{+TMkNoB3X0p?r=c3l~H z=cG()7{$omV@?fAO9kDs0b=EEIG7|U&w=WesQ$T7!o1Llo8XFb{%9N*7A*R%e(hmD z<>6>yY7<2=8mPQy$Z7V^M3jyrVnJEuF@m}r$6@M%Rhgo8Pbl`?RwKu{?VA9b7i3(I zW+t-DM(xc<8p>@^+WWjQ@o+{nC}KSme*Z5{l`H`E994u0snViBjscSYMzp`PopP0r zBTDPi<7m>cfLg&{wk=}Y;xd3lY#IDormV`Ts%e8*Tl9UVZdLxpXdcxX=95qFkd5?f z2%A@LUBF@Ou!rjK>xxtASUb>RaQ{B4&aEA=?MN8VxKY}l&hn<=4)$#KP!^d~m1&YeVA z+_p-`7Qy5$&HZtSHz*b^VgD!CG$|r zb?qKKRh`*d7`-Xg6o2T52#Zxg;jzhF%!<|uO7v0ORBIQ+4L9`N(_d!5QtZ6byBale zM;JQBK4hPUmXU-OTmV>TSVJN^4sx?z{2aYv{ne@ayHmFkKGJE(6_1u}x>p>E-Ygvc z+rvK?7Hiw@k9s`V#73>HYD4DuN6B0V*|g5wUPUs481;jz$brzMFr?*usu?E z4=8i-7>jF^1MEy%F999(+J zMZmY>gY?eG-$h-*X~(L; zC8%#4U+T|zI)FdIs@7>UXO0ocF2a}Uo-vGZ2m$5_9K0QJ#*|^?7Est*Mz4zx-BPCM z<6roxZoVJ|Ca0~)ttYenSXya;3}@jT!1?z~ zC|-d$;b8mHRge+PWS}S8Lvq?%!<%Mmo1HT_vHAF!`?fZ}2C{w?A}*dKl*w=ST^_Qn zi2DHPn;hT((NpuuqTJTx*JeHSsJE5)O<%sSh=w!nJI+y63!~(}LbIiEi*NB?{Sx0(^_(A~dLtA#A^lcCwWC|U-(oTK8=7kIU zhy#(jtt{D@J$DG+hs1H3aBO3?Ju~`=evy`3 zrzUPFAS31(kbYiH(Yi>lAW|FwefwE%Lmr9sfk)By`LcDZ6dlpP`6#@*Ti|=;ADEOM zI2KOb*9fus7+*yGW>!-2zNaIH=kQ!`a0UF3c4oU!sOcH>r+M5am}Z-P6GK(bmJG+< z)k(Hi{S|#3pP_DA(C9sOtQo}!5?{e9ewUxn(brb$Dn=;FuzK}tSSr+*8n>3*GRjT6sHBQ`MJTkh{Q*@`e9cRke+se9h@K# zOQnq`ZNiWtgw5j8R@I3fw^mg@4gg$=&Uosvah!zW9Xw*s)iq~Hq``Vk2!`xv&!kGV z;>AB1v^)Q3Q1O0qe-y_`Zc&g{;k-HvoO>2mUnctNtt24s>4#p?;C*>vZkL!u)-${e zn+eVi&C5e@Ju;5J`j#qeNmDp_4Sxz*RytT!1h0w`%eqke=*b6`7(fwK4RkyBE>Y12 zM>~fx5F1v)YDJ{rnlaa-X)_QfTRr@p;GWRYG7JQVMtC)O`Pyc>#M}DR3&u_ZLO`M1 zaX}vo)c!b4w5H4~-NREy;YKebx9Hwgu(zZs@w)Qa#Flp&(N0h>v{zBS%h$!+uIVl| zx^c6XGES6Ci*<>EJs~2<12hv1Zkk09<*RPLq*L3|lxJ4`c>BX}6hzg&_yaF#DwJqk zKlfJV8bXvro)Z$9XoP=ekQ$f9lIh&ALic;1#ZrsrcQ+T|V<83z4D+hsLazx^ZqDB| zN&{v&pIh3jWl~bBunQK0f#XUA%zf-zBb=UXJ{IEnsOIue&e8n1n*hZEIs%Wf&{iwa zWtLnMs*#T4UYT#Su5hGhNqz3^{8^BJ?*allYrjjUPs`t6JG5^47sx@)_hR8%udb89}OCFLX`CAaY;Ry8uqa{Hs057LiYCmh^Eidh?k~F(Y0zWu(FK1mnJn~vi zU7riMVZnlx-6H4&tD?Cnq8{q+wvgp9;&BTcuw^{l5wDyb?7=nk-%HQwUlFSPw81y=aGm9zhxa=aM&WE_f1 z#u?FhbM>GgP1Me)mIp@kvT9;qQkFLd^9;Pjn=wM*HR2+Az21j*M1>_GM?^1PcH` zQ6UH+hS$Ur71PSnH@8PYqT^+8#tB-0bpD zt1zC;AHHa<)q{Zhg^5J$eb9zzvd`5H3 zsJWBlihsyPjkdyUA&eIp)i?{tb|!&ted{vGoLMKXWG!`+m-uC&G2Z8@eA|Q{`Wd_V z`+SBhr=Gru0+D0Hx_8%eSXJ&zu$^gWZ zl-ySBRH=@&PwE>Kq`n5@oXJW*eaP|l*rfyc^v&5xe6)HBvOLUYm@|1OscEJ+SLnJbODrmcO-mHV>VLRc}Xc~bt$ zS2Yxe(FE)+x%*!gsT|F7-D=NcHd&B*A+gdG71;S;u`A+W>y7i1C*UkyKa`(<^ zh04o5cANc_Mj}GWAy$Wkb({nk_tDyLd~zq1zx1BpI_#%6c1VG{?TVEAQX6~9 z^iP?++`7vT$An=vtz#Bf6`=~J(^{L=+&e3SRB$D=VRI0|p0J~@Y zTyP|{YT6%x3DMEC8#&u@b#v;t%`oHB+hfbU4@ z-jER=n7E_z!Q;V!;NTluQ?INL_Pe9g@=*(Zwiqd!rrC}8N z_sV55(<@_M8Ud5AQaJXDC>{;@RgF@@F_i;~qRnkOD9oq*UqedO?#JghLXh8I&s(Fs zV0{9MH2O|L|Gk%A=e%bA<`B<6cDtVGXwE&*M|*EfMS$*x@~5hc1)Kdobt*!PG02mS zKIlWTq5mr*L?Q7_5BM193W@C(O-tEEfxg;r=HBPUz0FVcJ&J#xp-E{h6Y(Pv!BRr{ z!pU^oPYDRADo)iW(75|8Nr7xbQtn~a4XwHZdlH*&DdH*B*;i})S(w~;fhz_4Eo9#7z!tmT<7MOLneu(dOLZKq!{UBY@rLQoku4ey? z(-{1A<67Ku$TxCINf0aGI44-%`rE(<$}0yK{{9~ud;aEWj-W2zB&6wV-d|1MVkP07 zA=w~GOdbQe$Ip!^hjcd=l}nX8K_NI&j2Inqt~-AQ)&YB?h`w{zIH-h#0IjO8vo==T zz)vDuvM*M9*C+~?g^m^Z{R-wie;1AqI`xKdg#~zXEjx(59diH&EM-0-=lA{96)jeI zG5n%fyU6GiSoK<6_<|rZ-@Ih`F0iCb2&a&3zUE5uGtcjhEsrl~m?5nfkYJGBt6F;w zsG;5jn9vhs8wOFBzr}p^=IVZJWwsQ^10L@ILmG(l^{C%nY$Xldw~9nYS<3uGe6w8? z3dyMHyNIqDg6wfiQ8{L;zPckbF_}7;KFFY7ht*5VVa7IGSNrOBv_8Ioihaj#88oB6 z*iVK@5XYXW{-B5nYuw%#6308da!iP;-TV18BBkTZ`iIwj4l%_C%0h}~HkPoH8|d(` zPrB)m2}&}UlAyY21)KUpR^07vMRsg-)!E@j8e3VoFb00K;>`vzpS7r8-T4NFZHbqK zk~V=8=0_s#Gkq(p_zMy>N|3RsK4BI7GTGkesr6`hF=}agu1VNUt8B79MDAwXLLZ&` z^-C{Ddz*thEQtlGG+kHX7{rWHCE&vgn~(Xl7mDDx%D`aq6(kn0CCY%zr-HA`HoKE) zVUB^tVT{r-DHjJ>^Y4>auz7c1=q_Oz?zXjEh7n^MyM*F#>9gBEY^oe#rc1fYo#C$S z1P4-GO^U0|q3y)7pI?tC*+4Vuf{bU!88V1ulSUE~tbVZ^U)sIUsv?ML0W5PBTLaO} zQE)ot)HM3pXReH5Ndz!y@{FMfdc2Wr`2YE`BToTdvS58X{#XQa=XP!`AcgRd2Enf4HOtDy4s4gf`hN*^i50H$c(rV zvJG3-FY!X$xEIspmxy3;)^tMs9aTzkN0!g3f{umfI6)CP%{@|>*K7%K`N2bd>MNO3 zqTE?OYK|&jld}+(Ze0;#^8Ol5>b^PBrwx4_ zJnB7c-y++vcxRX*o3m5!tv}VK-xPqnCql)3xtzHY%t{dycTN!RqlS)W@B!O=6mbk zQNxc97}yvpNBp1yRCPtJjo7mG2~QOZIq9|FI%p%W|Zp?0dys+*$5tQOxFAr z7I$CErn1{+o07sW+fXJ`(}c&ZnL|FoEP}0#Zl@l6N|5)bvtLdL4Oo8$kEc(bnNqwM zlT&M04AhtMw9>kiWR*}N>W^tzRpWRmP2&(UAAXyakUv=Nke*FH4kCg{Y+5oag7C`MfoW8)KMP1AWBl|+@<&IXa*-!^Dm9|@^dft@Jfd22>2UYTL6$t$ocN^D3x|L;j} zxS8d)(w2$zgbR^49zf706AM$5PnbvupUDF-i@C!l3aIT(H$FgY{H7rGA3I-wwjJvx zht$u+6rp#c&hg9x7wkY+DPw6ZAT1#8pV1w#qP}>P*eDw-T)A+VQ>(Lue!F(wpzHFR zj_(iu#S7+}R+sK2JmnHOKF3kA`0)K&)LX5+5!+Kw$Lbj+2;ramx(fDa$YSsJ^cT(F8Y+#<(U_#$F>JUsYW(vTa!yS@EAc>=Hb3lMbOn@ZWf zPI^y5V{YR^<;!{ouXRV@{p6_DG*JNhKr}899w9I z9e(%6&x2m;EgGd6bkA>YUSQ7(D_~9t>OzVs`61<(F|Cr1vm=>7M~mKt*YNan4o$W* zu&dr1M&#dj2h)?J$|9!9EFO2H;h|rVf=s)@Ge8yAR@JvSpDWWxBN4(jX2pP;CRnLX z_B0RkPFqavSHBr2UXGNYT*6?%Cz$xcqH{LYTUcXWp&mg-;OU>N$v_7OS@8V@iU}hK z;fKyJ5!%dje1Szzxk!8AdWe96#$iD?*&zG*#Mk0AwWFBrzkahhh434r{e-y@)k9`$ zwD%-M4wkD@-*=g?{gW#DW=H^wgKMy>AeC^oz&yeFtb=y(4Xkb;Yi>7f0cN?N@;ljY zJ<^6ZV-rws2amjUJ2V;Q#qx-(=kxOUvnh`lFQ&rw*jQVfzh%dXv4u5Kw-9|0EH!3v zb+V+|v+?j5Z1#BFme;D(nn(HH?0QN@jS$E5>yOj^th-*;9w+PEHzT0qZnl&BQPv~% zsC@tw09{n7!Tc0HLh;AKL>-C+&2obCxTkStbP++Z6!I-9wdb;Fb&x{iGV@9qaz}SE zdK6|>>zp~Xd6j4REx^hp*-1+=KYGB;?8On0U8({ZrBTZ#6go=EXv_2So(weJA6`wn z-dXS{>su=>cp{kaS_BNyA8K(v{UgwiAGqh->AC{Dr8%LI$WnG26!F@Fwp_C4BCr0T zYW?+x&PZ)&^Fpjk72uRKZD(21L-Iv7Qd`*>w&WslVxQuz{;u)JC_UqiYi^~VNsHz5 zPsUZ40o!Z0F!)XFQP#Qk?sE1;aQgK|$9c?SArz{M=0<>38Mq^FMiCT)tL?ZEeP3M+ zMS(uwB0w$l-C&-wxtItpD$UWIbooB7${5QyPHq8LIFY(&Tt}}S=PaYoaN0T+VP%)e z^b<*qEhQZvY0@U>Wo#6bVrE{*@qfBOvQ>xwPXnfD3 zc(;3VTZ82L5@3VY$52}qV$|Ab44ErmV{sPA)~ARgeE<7zu#%c6W_Qymod*%Ce!lbl zFHox7%^3}P3e0E^%ohVw51IA@bGdXLqvY^q2e9|`v1>nxJBD@9I?w{jll-iDhzc=#Uj|=p&&Hy++b97nhi}Oj*tn_?$!~dZ5 zMlsMMxN=AN`!3S(B&{vT4tnT^WU~FiHj{^~Lmf=#6$ek*Px>SqGhsv7_SKdda>=J@ zJl5u!iau&r5ORnv(vo|Ql{T3f&4iC_Es@~)o%ep@HbFVR@mhDC6MFTEnLGQFd*A4X z0wqwxVyd(!C$U=OZ5CA!#xC8FZMWz@I-{gpfq)CzbqsFE zSmC|7mbG=&> zD=w#Pl>3|Hg8V8wJX^Bdc7(cyc%xx_S|2bI>qhwFCK932>9_>^XSWh^(f0yRFrTK~ z^Q02XJdBjHSV-ZI@B5R^Q32($63`eymk$y;G(R;-)Zfbv1hzPr@>hpGWQ!|O6hPb) zW=jeQJ$iAi!-v(fQ1-<6gbTv2!!#?j*{^&^UqPu-?M!W3F_S1dyt%!0f;*RqIKKen zy8T>1ces02ii5Uqskn#*AFQ{D31x4$Wf=MpbHd1s$s9rRjo-BtPyOQ}IVq6cwz4U( zl*K0Gr0zcO6BecK{}KKw`Hb`+?GpQ`qoay@zLlBT3z)_9AzfAEuMQE=IC@~=2yDf_ zOH#+4n7Zoz;eiR2!sek}qxgDGr~pk#Mc9o**?D_iCE`GoaRnIM3b|;6Wav{Fzxqu8 zziCFh7o_W?C$ot%jBiY^xp;1Ze?u8qw6dya@*<^&(VMVktdVXg&Iq%%|FXeGiq=ww z-YbfK8Ky=TC6ztG0qBl8IdhIr9Hqyg>cGoWRK|(}Vwm=WCm{2P$c-G67bx_!t@EPa zDbxwlN3AMmCsIJlv~XGKfwWA$Oe{<<8|<$yuDv7LBvUMsY7S5#+xWh_jCM(W$J{~4 z=r49ddLwvZ40Uh;ZVF#LokoFHV++I@vzC z!WMkXFUFul6kcH0!~;@Z!D`?8)rIyKp)$LgY6p)O z7vFpfDr>c8Q$XsmK7&)WS~E_janFZSS0Rl~Li)30(Oh-U<=lG8IDoxdPUP~7uhF91 z%US%(S@kBe?dO?{Iz1X4apC^XU&x+BLEDc}-gpg_*gy3H!CleViG_-JxWf*#9DgO` z_3*UcyKm7-Wi%8jN35UV+85pjn+g_X>pGWKaY3efai^(;2K*9*&8}XO{l{!>31K?i zs(c%m-EF$)6-~D#{6Os~>rP+PZ6}Pqf5a7Nv3miwSISd2M#Wu)I95cf&nPG_OG_Ho zSl~gdfgj1r%cr-v`i$C(y#unz!R!FmyZ)64JG&g3QOB&pIVUkv@yU=$^Z?U^T=&~r zrg7eApI+!|!h!twe6vqM5Vbc$?i78>3F*^Gs3d*5SKR9RBEVz>&ybWc?X|V$>OzPb zAxQa^&?N7vU|C0R{o$L(^)IF|L_@!uVA{R{^M;xFK$M&vD54~6#9Y!1<)lx#y9N2R zKMC~7x`^YT?B53`HzhuzJ<@S=s(+trAuSd#Gp3F({jxsU5I5~?XB_p(TGR|BieQ@lSiKqj=kY>sDy#CLqx6N^aHtuAm{ZD}S2ajOIusE?;;p0D= zR^~|EyZYSVoS`LPb?oI@uXWC;M;gYzM1Ezb=7yHTp9Hl@sCbvMh z0$Ozi9JnA3VoJB03~zLUK`QCmhevIGz4V*rQ@>DKXV)yOa$fA*?BEOc91K`9-bFOE z06BL!f5sgN4NLtKAJsQa^KGDaGE*1S15LG0i~PxV8{x7y|IlCZ7ErAowXp*CA&G46 zSc<+v>Xl>>hkW7(z{Vzcoq|(Bne~?T5EV-SNKrj<(VXIQdcq}iH3Lcn?w@+4PT3lZ zmbSmFN2ZWDXO_JIlpaC(xxo_7RM!D+bF0>}2nG$E!n67xQVI>rTbl&Ey86{mdCc_n zS`i<=Mxm7Bx!TdO2ItLm_pqn%tc*hP+U!HCK?n?9E?LNR#3lS)Vxv8}&Xk%k`^NKjtTn19R+)XPs({cy>3Z z%$|YvICJkN%r0SI_}Hm!cdo*UMnyaj}Kv@MHO8A6V}iCdYYBJV}^%#SD96C#V<7Re2O< zd5{UK^=o@I4SD>7bNLeMGZIedyG+@AA3(aq-spSZtdQ zysxk_(Y!Kb)qaewR8IC|dC(=caD;)MCJJ#<0XX->-)zS6CZl3#om|(MXnq->*Q6Ye zAD$(S-d*E({alu-men#~we!$5e^$w0c^0ipefcS1;0wMXl4}|#!?St#7;LcOcpde~ z3=MRnnHx+z?F=7E_$|YyS|#I1hDBuwt_&u&(yc)=ds^+#}F5o<0wx*@+{LZb_PwNiinDhz|T+BCgtyyoQ zWn6X6jV;7^>R?%UKFP^t(G87qR623y-;O%2-tYVIbkCDrr!QUUkiZ`)IE=}h*vlq^ zu{W6X3HyI)Xny5$)j+`i|6-a%t#6FN|5-Aj0AmCM7}yg0f5kTcyTx;Xf!P{4Fnb!= W+JNMsVg6f#_}8uf%|hS)v;H3)m)bJ` delta 13279 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 diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 04a966d9e1..da702ae278 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -4791,8 +4791,8 @@ Templates: Template@474: Id: 474 Image: BLOXWAST - Frames: 349,350,351,352,369,370,371,372,389,390,391,392 - Size: 4,3 + Frames: 349,350,351,352,369,370,371,372,389,390,391,392,385,386,387,388 + Size: 4,4 Category: Sand-Detail PickAny: False Tiles: @@ -4808,6 +4808,10 @@ Templates: 1: Cliff 5: Cliff 6: Cliff + 12: Sand + 13: Cliff + 14: Cliff + 15: Rough Template@475: Id: 475 Image: BLOXWAST @@ -4862,18 +4866,18 @@ Templates: PickAny: False Tiles: 0: Rough - Template@480: + Template@480: # TODO: this should go away Id: 480 - Image: BLOXWAST - Frames: 385,386,387,388 + Image: BLOXBASE + Frames: 1,1,1,1 Size: 4,1 Category: Sand-Detail PickAny: False Tiles: - 0: Sand - 1: Cliff - 2: Cliff - 3: Rough + 0: Clear + 1: Clear + 2: Clear + 3: Clear Template@481: Id: 481 Image: BLOXWAST From d5039e1ddba121f56efd6af9a48d8b8292f1c9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 5 Jan 2014 14:21:07 +0100 Subject: [PATCH 05/11] also a dead worm --- mods/d2k/tilesets/arrakis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index da702ae278..5234be9bc9 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -2902,7 +2902,7 @@ Templates: Image: BLOXBAT Frames: 609,610,629,630 Size: 2,2 - Category: Rotten-Base + Category: Dead-Worm PickAny: False Tiles: 0: Rough From b3e0632e25bc48d25c5f88515f46821e684a6306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 5 Jan 2014 14:52:20 +0100 Subject: [PATCH 06/11] category resorting --- mods/d2k/tilesets/arrakis.yaml | 101 +++++++++++++++++---------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 5234be9bc9..6776c7d53e 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -4,6 +4,7 @@ General: SheetSize: 1024 Palette: d2k.pal Extensions: .R8, .r8, .shp, .tmp + EditorTemplateOrder: Dune, Sand-Detail, Brick, Sand-Cliff, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform Terrain: TerrainType@Clear: # TODO: workaround for the stupid WinForms editor @@ -1261,7 +1262,7 @@ Templates: Image: BLOXBASE Frames: 677 Size: 1,1 - Category: Z-Crap(Unusual) + Category: Unidentified PickAny: False Tiles: 0: Cliff @@ -1451,7 +1452,7 @@ Templates: Image: BLOXBASE Frames: 600,601,602,620,621,622,640,641,642 Size: 3,3 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Rock @@ -1492,7 +1493,7 @@ Templates: Image: BLOXBASE Frames: 564,565,584,585 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1504,7 +1505,7 @@ Templates: Image: BLOXBASE Frames: 566,567,586,587 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1516,7 +1517,7 @@ Templates: Image: BLOXBASE Frames: 562,563,582,583 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 1: Cliff @@ -1528,7 +1529,7 @@ Templates: Image: BLOXBASE Frames: 560,561,580,581 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 1: Cliff @@ -1564,7 +1565,7 @@ Templates: Image: BLOXBASE Frames: 568,569,588,589 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1576,7 +1577,7 @@ Templates: Image: BLOXBASE Frames: 570,571,590,591 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1588,7 +1589,7 @@ Templates: Image: BLOXBASE Frames: 529,530,549,550 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 3: Rock @@ -1600,7 +1601,7 @@ Templates: Image: BLOXBASE Frames: 527,528,547,548 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 3: Rock @@ -1612,7 +1613,7 @@ Templates: Image: BLOXBASE Frames: 525,526,545,546 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 3: Rock @@ -1624,7 +1625,7 @@ Templates: Image: BLOXBASE Frames: 523,524,543,544 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 3: Sand @@ -1636,7 +1637,7 @@ Templates: Image: BLOXBASE Frames: 520,521,522,540,541,542 Size: 3,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 5: Cliff @@ -1650,7 +1651,7 @@ Templates: Image: BLOXBASE Frames: 480,481,482,500,501,502 Size: 3,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 2: Cliff @@ -1664,7 +1665,7 @@ Templates: Image: BLOXBASE Frames: 440,441,460,461 Size: 2,2 - Category: BaseBorder-Cliff + Category: Sand-Smooth PickAny: False Tiles: 1: Cliff @@ -1676,7 +1677,7 @@ Templates: Image: BLOXBASE Frames: 402,403,422,423,442,443 Size: 2,3 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1690,7 +1691,7 @@ Templates: Image: BLOXBASE Frames: 400,401,420,421 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1702,7 +1703,7 @@ Templates: Image: BLOXBASE Frames: 408,409,428,429 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1714,7 +1715,7 @@ Templates: Image: BLOXBASE Frames: 410,411,430,431,450,451 Size: 2,3 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1728,7 +1729,7 @@ Templates: Image: BLOXBASE Frames: 412,413,432,433 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1740,7 +1741,7 @@ Templates: Image: BLOXBASE Frames: 452,453 Size: 2,1 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1750,7 +1751,7 @@ Templates: Image: BLOXBASE Frames: 454,455,474,475,494,495 Size: 2,3 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1764,7 +1765,7 @@ Templates: Image: BLOXBASE Frames: 489,490,509,510 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 1: Cliff @@ -1776,7 +1777,7 @@ Templates: Image: BLOXBASE Frames: 448,449,468,469 Size: 2,2 - Category: BaseBorder-Cliff + Category: Sand-Smooth PickAny: False Tiles: 0: Cliff @@ -1788,7 +1789,7 @@ Templates: Image: BLOXBASE Frames: 487,488,507,508 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 1: Cliff @@ -1800,7 +1801,7 @@ Templates: Image: BLOXBASE Frames: 446,447,466,467 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 1: Cliff @@ -1812,7 +1813,7 @@ Templates: Image: BLOXBASE Frames: 444,445,464,465 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 1: Rock @@ -1824,7 +1825,7 @@ Templates: Image: BLOXBASE Frames: 456,457,476,477,496,497 Size: 2,3 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 1: Cliff @@ -1862,7 +1863,7 @@ Templates: Image: BLOXBASE Frames: 418,419,438,439 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -1874,7 +1875,7 @@ Templates: Image: BLOXBASE Frames: 378,379,398,399 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 3: Cliff @@ -1886,7 +1887,7 @@ Templates: Image: BLOXBASE Frames: 416,417,436,437 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 1: Cliff @@ -1898,7 +1899,7 @@ Templates: Image: BLOXBASE Frames: 376,377,396,397 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 3: Cliff @@ -2017,7 +2018,7 @@ Templates: Image: BLOXBASE Frames: 483,484,503,504 Size: 2,2 - Category: BaseBorder-Cliff + Category: Sand-Smooth PickAny: False Tiles: 1: Transition @@ -2029,7 +2030,7 @@ Templates: Image: BLOXBASE Frames: 485,486,505,506 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Sand @@ -2311,7 +2312,7 @@ Templates: Image: BLOXBASE Frames: 254,255,274,275 Size: 2,2 - Category: Z-Crap(Unusual) + Category: Unidentified PickAny: False Tiles: 0: Cliff @@ -2347,7 +2348,7 @@ Templates: Image: BLOXBASE Frames: 404,405,424,425 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -2359,7 +2360,7 @@ Templates: Image: BLOXBASE Frames: 406,407,426,427 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 2: Cliff @@ -2388,7 +2389,7 @@ Templates: Image: BLOXBASE Frames: 676,696 Size: 1,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 1: Cliff @@ -2434,7 +2435,7 @@ Templates: Image: BLOXBASE Frames: 511,512,513,531,532,533 Size: 3,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -2448,7 +2449,7 @@ Templates: Image: BLOXBASE Frames: 471,472,473,491,492,493 Size: 3,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 3: Cliff @@ -3767,7 +3768,7 @@ Templates: Image: BLOXICE Frames: 551 Size: 1,1 - Category: Z-Crap(Unusual) + Category: Unidentified PickAny: False Tiles: 0: Sand @@ -3776,7 +3777,7 @@ Templates: Image: BLOXICE Frames: 579,599,619,639 Size: 1,4 - Category: Z-Crap(Unusual) + Category: Unidentified PickAny: False Tiles: 0: Cliff @@ -3788,7 +3789,7 @@ Templates: Image: BLOXICE Frames: 539,559 Size: 1,2 - Category: Z-Crap(Unusual) + Category: Unidentified PickAny: False Tiles: 1: Cliff @@ -4006,7 +4007,7 @@ Templates: Image: BLOXICE Frames: 660,661,662 Size: 3,1 - Category: Z-Crap(Unusual) + Category: Unidentified PickAny: False Tiles: 0: Rough @@ -4314,7 +4315,7 @@ Templates: Image: BLOXTREE Frames: 747 Size: 1,1 - Category: Z-Crap(Unusual) + Category: Unidentified PickAny: False Tiles: 0: Rough @@ -4817,7 +4818,7 @@ Templates: Image: BLOXWAST Frames: 706,707,726,727 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 3: Cliff @@ -4829,7 +4830,7 @@ Templates: Image: BLOXWAST Frames: 557,558,559,577,578,579 Size: 3,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -4883,7 +4884,7 @@ Templates: Image: BLOXWAST Frames: 414,415,434,435 Size: 2,2 - Category: BaseBorder-Cliff + Category: Rock-Cliff PickAny: False Tiles: 0: Cliff @@ -6047,7 +6048,7 @@ Templates: Id: 842 Image: t842 Size: 2,2 - Category: Rock-Cliff-Sand + Category: Sand-Smooth PickAny: False Tiles: 0: Cliff @@ -6058,7 +6059,7 @@ Templates: Id: 843 Image: t843 Size: 2,2 - Category: Rock-Cliff-Sand + Category: Sand-Smooth PickAny: False Tiles: 0: Cliff From dd581e01352e17b38184a8364be789bf2e192d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 8 Jan 2014 07:45:08 +0100 Subject: [PATCH 07/11] identical to the right two tiles from 443 BLOXICE and BLOXTREE redundancy --- mods/d2k/tilesets/arrakis.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 6776c7d53e..55f16acdcb 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -3774,16 +3774,16 @@ Templates: 0: Sand Template@382: Id: 382 - Image: BLOXICE - Frames: 579,599,619,639 + Image: BLOXBASE + Frames: 1,1,1,1 Size: 1,4 Category: Unidentified PickAny: False Tiles: - 0: Cliff - 1: Cliff - 2: Cliff - 3: Cliff + 0: Clear + 1: Clear + 2: Clear + 3: Clear Template@383: Id: 383 Image: BLOXICE From c6db46029100ad93423b712fb2de68a64d877bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 8 Jan 2014 07:49:54 +0100 Subject: [PATCH 08/11] remove building bibs to avoid confusion --- mods/d2k/tilesets/arrakis.yaml | 86 +++++++++++++++++----------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 55f16acdcb..9d04e4a440 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -1041,24 +1041,24 @@ Templates: PickAny: False Tiles: 0: Concrete - Template@90: + Template@90: # TODO: This should go away Id: 90 Image: BLOXBASE - Frames: 649,650,651,669,670,671 + Frames: 1,1,1,1,1,1 Size: 3,2 Category: Brick PickAny: False Tiles: - 0: Concrete - 3: Concrete - 4: Concrete - 5: Concrete - 2: Concrete - 1: Concrete - Template@91: + 0: Clear + 3: Clear + 4: Clear + 5: Clear + 2: Clear + 1: Clear + Template@91: # TODO: This should go away Id: 91 Image: BLOXBASE - Frames: 646,647,648,666,667,668,686,687,688 + Frames: 1,1,1,1,1,1,1,1,1 Size: 3,3 Category: Brick PickAny: False @@ -1081,20 +1081,20 @@ Templates: PickAny: False Tiles: 0: Rough - Template@93: + Template@93: # TODO: This should go away Id: 93 Image: BLOXBASE - Frames: 643,644,645,663,664,665 + Frames: 1,1,1,1,1,1 Size: 3,2 Category: Brick PickAny: False Tiles: - 5: Concrete - 4: Concrete - 3: Concrete - 0: Concrete - 1: Concrete - 2: Concrete + 5: Clear + 4: Clear + 3: Clear + 0: Clear + 1: Clear + 2: Clear Template@94: Id: 94 Image: BLOXBASE @@ -1117,36 +1117,36 @@ Templates: Tiles: 0: Rough 1: Rock - Template@96: + Template@96: # TODO: This should go away Id: 96 Image: BLOXBASE - Frames: 614,615,616,634,635,636,654,655,656 + Frames: 1,1,1,1,1,1,1,1,1 Size: 3,3 Category: Rock-Detail PickAny: False Tiles: - 0: Rock - 1: Rock - 2: Rock - 5: Rock - 4: Rock - 3: Rock - 6: Rock - 7: Rock - 8: Rock - Template@97: + 0: Clear + 1: Clear + 2: Clear + 5: Clear + 4: Clear + 3: Clear + 6: Clear + 7: Clear + 8: Clear + Template@97: # TODO: This should go away Id: 97 Image: BLOXBASE - Frames: 617,618,637,638 + Frames: 1,1,1,1 Size: 2,2 Category: Rock-Detail PickAny: False Tiles: - 0: Rock - 1: Rock - 3: Rock - 2: Rock - Template@98: + 0: Clear + 1: Clear + 3: Clear + 2: Clear + Template@98: # TODO: This should go away Id: 98 Image: BLOXBASE Frames: 619,639 @@ -1194,17 +1194,17 @@ Templates: Template@102: Id: 102 Image: BLOXBASE - Frames: 611,612,613,631,632,633 + Frames: 1,1,1,1,1,1 Size: 3,2 Category: Rock-Detail PickAny: False Tiles: - 0: Rock - 1: Rock - 2: Rock - 5: Rock - 4: Rock - 3: Rock + 0: Clear + 1: Clear + 2: Clear + 5: Clear + 4: Clear + 3: Clear Template@103: Id: 103 Image: BLOXBASE From e496f2a36d9b4caf0c39a87de1d97a770120f039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 8 Jan 2014 07:53:32 +0100 Subject: [PATCH 09/11] randomized bricks --- mods/d2k/maps/brimstone/map.bin | Bin 81925 -> 81925 bytes mods/d2k/tilesets/arrakis.yaml | 13 +++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mods/d2k/maps/brimstone/map.bin b/mods/d2k/maps/brimstone/map.bin index 9c86a6c33e936233f440d566d8a213320baddcf1..65ff4ed25ef8d0251ab258cd2a091f57a0acccad 100644 GIT binary patch delta 453 zcmYjNJx>Bb6y$+-hmV7^x28knqa=_}Bh)tb7)>lCQ49qaLdAtktmLDiBgFXp8`QRz zcKiYp-+Su<$rd}AnVp#p2TnL}-baN~1U^{=ps4UDcSOh`Ba~!hEN?;K6(V DiA-bX diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index 9d04e4a440..e9805a4b6a 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -1024,23 +1024,24 @@ Templates: Template@88: Id: 88 Image: BLOXBASE - Frames: 657,658,659 - Size: 3,1 + Frames: 657,658,659,691 + Size: 1,1 Category: Brick - PickAny: False + PickAny: True Tiles: 0: Concrete 1: Concrete 2: Concrete - Template@89: + 3: Concrete + Template@89: # TODO: This should go away Id: 89 Image: BLOXBASE - Frames: 691 + Frames: 1 Size: 1,1 Category: Brick PickAny: False Tiles: - 0: Concrete + 0: Clear Template@90: # TODO: This should go away Id: 90 Image: BLOXBASE From ecca689f343738bc023407ad47aefcbf72263ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 9 Jan 2014 15:35:27 +0100 Subject: [PATCH 10/11] categorize everything --- mods/d2k/tilesets/arrakis.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index e9805a4b6a..d2c40175b2 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -4,7 +4,7 @@ General: SheetSize: 1024 Palette: d2k.pal Extensions: .R8, .r8, .shp, .tmp - EditorTemplateOrder: Dune, Sand-Detail, Brick, Sand-Cliff, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform + EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified Terrain: TerrainType@Clear: # TODO: workaround for the stupid WinForms editor @@ -74,6 +74,7 @@ Templates: Frames: 0, 8, 9, 48, 49, 50, 51, 52, 68, 69, 70, 71, 72 Size: 1,1 PickAny: True + Category: Basic Tiles: 0: Sand 1: Sand @@ -2065,6 +2066,7 @@ Templates: Frames: 1 Size: 1,1 PickAny: False + Category: Unidentified Tiles: 0: Clear Template@227: # TODO: this should go away @@ -2073,6 +2075,7 @@ Templates: Frames: 1 Size: 1,1 PickAny: False + Category: Unidentified Tiles: 0: Clear Template@228: # TODO: this should go away @@ -2081,6 +2084,7 @@ Templates: Frames: 1 Size: 1,1 PickAny: False + Category: Unidentified Tiles: 0: Clear Template@229: @@ -2374,6 +2378,7 @@ Templates: Frames: 1,1,1,1,1,1,1,1,1,1 Size: 5,2 PickAny: False + Category: Unidentified Tiles: 0: Clear 1: Clear @@ -2465,6 +2470,7 @@ Templates: Frames: 1,1,1,1,1,1,1,1,1,1 Size: 5,2 PickAny: False + Category: Unidentified Tiles: 0: Clear 5: Clear @@ -2482,6 +2488,7 @@ Templates: Frames: 306,307,552,553,554,555,556,572,573,574,575,576,592,593,594,595,596 Size: 1,1 PickAny: True + Category: Basic Tiles: 0: Rock 1: Rock @@ -2506,6 +2513,7 @@ Templates: Frames: 1 Size: 1,1 PickAny: False + Category: Unidentified Tiles: 0: Clear Template@268: # TODO: this should go away @@ -2514,6 +2522,7 @@ Templates: Frames: 1,1 Size: 2,1 PickAny: False + Category: Unidentified Tiles: 0: Clear 1: Clear @@ -2533,6 +2542,7 @@ Templates: Frames: 1,1,1 Size: 3,1 PickAny: False + Category: Unidentified Tiles: 0: Clear 1: Clear From d939d5183cd357a3fdc867667ebd66723503d5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 16 Jan 2014 20:58:18 +0100 Subject: [PATCH 11/11] fixed a crash in the actor border rendering --- OpenRA.Editor/Surface.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Editor/Surface.cs b/OpenRA.Editor/Surface.cs index d5c235a99c..eb3feaa134 100644 --- a/OpenRA.Editor/Surface.cs +++ b/OpenRA.Editor/Surface.cs @@ -491,7 +491,7 @@ namespace OpenRA.Editor if (currentTool == null) { var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation()); - if (x.Key != null) + if (x.Key != null && actorTemplates.ContainsKey(x.Value.Type)) DrawActorBorder(e.Graphics, x.Value.Location(), actorTemplates[x.Value.Type]); } }