From 492b406ffa56fdf51841acddd0d078747a536586 Mon Sep 17 00:00:00 2001 From: ryo_saeba Date: Fri, 8 Jan 2021 19:30:08 +0000 Subject: [PATCH] Apply modified version of patch https://sourceforge.net/p/crossfire/patches/366/ by Titus. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@21743 282e977c-c81d-0410-88c4-b93c2d0d6712 --- ChangeLog | 17 ++++++ mapbuilding/benches.arc | 60 ++++++++++++++++++++ mapbuilding/benches.trs | 19 +++++++ mapbuilding/building.trs | 3 + mapbuilding/mb_burningfountain.base.111.png | Bin 0 -> 1377 bytes mapbuilding/mb_lavawell.base.111.png | Bin 0 -> 1247 bytes mapbuilding/mbforge_bench.base.111.png | Bin 0 -> 1347 bytes mapbuilding/mbjeweler_bench.base.111.png | Bin 0 -> 1267 bytes mapbuilding/mbkitchen_stove.base.111.png | Bin 0 -> 1313 bytes mapbuilding/mbtanbench.base.111.png | Bin 0 -> 1335 bytes mapbuilding/mbthaumaturgy_desk.base.111.png | Bin 0 -> 1316 bytes mapbuilding/mbworkbench.base.111.png | Bin 0 -> 1220 bytes mapbuilding/objects.arc | 20 +++++++ mapbuilding/objects.trs | 6 ++ 14 files changed, 125 insertions(+) create mode 100644 mapbuilding/benches.arc create mode 100644 mapbuilding/benches.trs create mode 100644 mapbuilding/mb_burningfountain.base.111.png create mode 100644 mapbuilding/mb_lavawell.base.111.png create mode 100644 mapbuilding/mbforge_bench.base.111.png create mode 100644 mapbuilding/mbjeweler_bench.base.111.png create mode 100644 mapbuilding/mbkitchen_stove.base.111.png create mode 100644 mapbuilding/mbtanbench.base.111.png create mode 100644 mapbuilding/mbthaumaturgy_desk.base.111.png create mode 100644 mapbuilding/mbworkbench.base.111.png diff --git a/ChangeLog b/ChangeLog index 5ee4d5cd3..78e0e2923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Apply modified version of patch https://sourceforge.net/p/crossfire/patches/366/ by Titus +After discussion on IRC, shop tile building materials as well as flaming tower +and magma were not included, deemed too specific to HW. +mapbuilding/benches.arc +mapbuilding/benches.trs +mapbuilding/building.trs +mapbuilding/mb_burningfountain.base.111.png +mapbuilding/mb_lavawell.base.111.png +mapbuilding/mbforge_bench.base.111.png +mapbuilding/mbjeweler_bench.base.111.png +mapbuilding/mbkitchen_stove.base.111.png +mapbuilding/mbtanbench.base.111.png +mapbuilding/mbthaumaturgy_desk.base.111.png +mapbuilding/mbworkbench.base.111.png +mapbuilding/objects.arc +mapbuilding/objects.trs +Nicolas Weeger 2021-01-08 New item, unlit (or burnt out) brazier light/unlit_brazier.arc diff --git a/mapbuilding/benches.arc b/mapbuilding/benches.arc new file mode 100644 index 000000000..3bb471710 --- /dev/null +++ b/mapbuilding/benches.arc @@ -0,0 +1,60 @@ +Object building_jeweler_bench +name Jeweler Bench Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbjeweler_bench.111 +slaying jeweler_bench +end +Object building_forge +name Forge Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbforge_bench.111 +slaying forge +end +Object building_kitchen_stove +name Kitchen Stove Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbkitchen_stove.111 +slaying stove +end +Object building_thaumaturgist_desk +name Thaumaturgist's Desk Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbthaumaturgy_desk.111 +slaying thaumaturg_desk +end +Object building_workbench +name Workbench Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbworkbench.111 +slaying workbench +end +Object building_tanning_bench +name Tanning Bench Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbtanbench.111 +slaying tanbench +end diff --git a/mapbuilding/benches.trs b/mapbuilding/benches.trs new file mode 100644 index 000000000..77896e229 --- /dev/null +++ b/mapbuilding/benches.trs @@ -0,0 +1,19 @@ +treasureone building_benches + arch building_jeweler_bench + chance 1 + more + arch building_forge + chance 1 + more + arch building_kitchen_stove + chance 1 + more + arch building_thaumaturgist_desk + chance 1 + more + arch building_workbench + chance 1 + more + arch building_tanning_bench + chance 1 +end diff --git a/mapbuilding/building.trs b/mapbuilding/building.trs index 3fd4723cb..01e8e34c5 100644 --- a/mapbuilding/building.trs +++ b/mapbuilding/building.trs @@ -32,6 +32,9 @@ treasureone building_material list building_objects chance 5 more + list building_benches + chance 1 + more arch building_window chance 2 more diff --git a/mapbuilding/mb_burningfountain.base.111.png b/mapbuilding/mb_burningfountain.base.111.png new file mode 100644 index 0000000000000000000000000000000000000000..ff78412288e63d554bcdc28431581e371a3ede71 GIT binary patch literal 1377 zcmV-n1)lneP)w~NTvuOPUuk4pVO(c$ zZDDI`Zh3Zce0XqmbZZzGT4G;gZE9U*V_IfqU1er#a&dZsf_j2~e0_QUdOccYWnpP) zWp8d~ZEJ6Ib9;h_dUtMeaB_Todxwa3goAp6fq#jLI}!nQfP!;;e|Ln0hm@6#o0^H1 zm5rE}lANA=h>3oVl8T$2mZhedr>2~zqLHAaovyE*tf{HHy^NchPffqrPQtAfkQ zqs_~t(9NdK%%`oahoYm3m6dwFy`0X=qt3{q&djE`w~mE{ccr9<$Ht<~#i7r*p3cdn z%*vv^y_Bn~k$`_}t*eU3$D_%^oXN(Y%F3V0%b~=?p02Nvi;H!-xRuAppvlOd$jPF{ z#+=8;oxZ-BrKOFWn}WZ-o5#qXy1A2@mxH6Dh{VO5uCb4-uA+N;YpJY{!o#4pvy;8O zm9w^!v9Xl9x|gY^j)J)|1ym3mB;X)OU8I9UFI6d$i-WDXwAWkWljLc)f}aon zM=Z`GXj7t{U^In%+&ZRG1KLtJq0~AaLyH_kpevQ30wgDzRffW?NZ8MpPAI_vy%~(Dd6YH+;pY$ zN8AaG`L8p37e|yV3V&P16<{eJ9`1HAEI@h0E#rE$1a$A`eMPB8r7Z^R*gQDmlm*Je z=R@1L2RKKsy+L15uqb@S-D(=wY|?g@Q-Z=v+#m$*O5u&|q-YT_nuX>P60EGen=U*i zCBerK6rMwhCT{dZ3cp@0Lqv>bp{3~x0X%~3dLewtDu$r&R@o$R=|xN2meRM7h#0K~ z{lO;S;{Sl1J)VkoBMhRLf<-04SsdDXHq=Ycd@2H}Kk$MtDL5&tvHn~tcPLnt!W4oO z);2bR7mY?<*C^E>ra$mVn1^uPZ--7@8lruYTYvzn&%gtMkkw7Ve<;RH5Hz*GE*>Sn z&F`)EVq8Tis0Btb9{yVwBJAv=7;{2Np-3}Ic1FA}BA1AzhhQjdN*OU)B83YGXB4HF j(t&6l5YCf{NE7}6XBm_Cam1uB00000NkvXXu0mjfK*@2l literal 0 HcmV?d00001 diff --git a/mapbuilding/mb_lavawell.base.111.png b/mapbuilding/mb_lavawell.base.111.png new file mode 100644 index 0000000000000000000000000000000000000000..2efeb6029a9522b996ccef484adadafd527aae6a GIT binary patch literal 1247 zcmV<51R(o~P)_ zdUtMeaB_Todxwa3goAp6fq#jLc7TF&e1CU@gol)sjhmW@mX(c|my(>Ge29sDj*^O- zo|dJinWv_lr=pRdq@Av>o~)^cZ`T;v#W!>wv4{GkGHgppPhYi zZ(yF8alyNg$HSV-$)d%(4qqN9qHm3qFt zoX*Rm&d8(A%%-@vj)jGHrKE?)#-h!|q0hLU&dH?A%A&r#l&hrVmB+`R$;h6_$)d)_oX5wVzP_5JrH!1Mg1^3-$HIm#L?Yv9glBznHJI zmxqdYsjii@x0SWHm8z|giH(7fm4%j^jG?5QgjVQk00001bW%=J06^y0W&i*Il}SWF zR2UhJ!M|%0VF1VB&-d=)y@`l~E=ExtA|k~>taWtlB)BN}H#pc`G6W|F>s$rr;81XL zb=A>`H2#PP-XOF=1mD9Z=lkCK_J@#w&%^&w!Xm;+<&*>lEQbU%<^9AlkRzN4fuOC3 z;5S~AT9I*D(Ps>K$(iFgKXxt90l@|B+lGtCL5xZZoq`NT*A(UDr5RNPStW982S|Z# zBRXp;YO|E3o$20*0))4w=nJG%AW0d~q5x65rRW1QP(=eqtpZ4>ZJFrG3|6kfAEJz) zr3iS-5h=m@>y4oM31_9?V>!V|h@Nid!A+7BR1u^E8Emg+-WFBG_o|vq_iz&SwRzO= z?ou0<7EeT`y-qKGAn!S2N-SQ&p^bj|u;GozlzmH0M5etC^d75rZ+U2`B}8_Y4Oss5 ztl@1AErB>-`Z$C83T{(NIAD7W7~FZ12QR6KBMkHh3}2`;lGgCVzYN${if#a6j@OD- zLCo_;(PhM3?-X@2=4whh&sUv8EbvXd3k1UY-4L`LPA1VVO&>VTVH8pTVY&haBX30Yi@aVa(sAjb#%SG zy;@>lV{K|(Wn)@qWnE=vYjSaVf`WR2e|&v;wY9aJoSa%^WnpP)Wp8d~ZEJ6Ib9;h< zf{BTMh=PfYiED9lW^ZqIetvLrZgX^UbbNezgM)^QgNKiddw_v^f`fQ^cW!cUa(sPz zhlqECgL;F3e~F5AfP!;;e|Ln0hm@6#o0^H1m5rE}lANA=h>3oVl8T$2mZhedr>2~z zqG4fSk)WiVuCJb~sj0iYjGLNIQAI#NK#`r8kDr}bTS{$hOj}q(h=XlWO+qs?CYP9X zt*3vUmTX5P6=-8xXJk^Mn{&9ahqthWs-=9DlXsv}EsTg}v#W!>wv4{GkGHgppPhXG zF#vIIV4j(A!Ml*h!$)wE6qQ1S9tE-WKe{8L*ipj^L z$-|t<#-GZ{pUTUj#KfMiuaS$3b-K8f$H$<_$ezf_qQ=IY$H$$%zM7?_jhvf;zrLHt z$e+5olbV-B6m9)2&wYZh4t&xe1fsmDjmYj^Cq@1^a@QMHc00DGTPE!Ct=GbNc z00Hw!L_t&-8EwHoYZGxC$MN^)e%G`;Ev7cMh;DrX1{57^Avmf_O78*q1RNa1E#RP= z&N{kXxGerz1EtO`{z0^(2%2JwdNt_r_4m6Z(yFhQsECSjfCxkoNq8lPIG~L2X5{_k zzak*11yqhfor7XHu1fM5FWF#yhmn$5UHUI z?u_W%Rd9n8Lzw|WxDrTdj(DXD^0qSv?XKZPK(BunX)HAY$q|$(%@MCnrcI4qC5WxWt#6fNG$F&w9&0o!iHbl3 zZlie%NAOG&>wpj`WO$tpV_TXy2N8jRbMAKPoFm<2ZEoTvLInN literal 0 HcmV?d00001 diff --git a/mapbuilding/mbjeweler_bench.base.111.png b/mapbuilding/mbjeweler_bench.base.111.png new file mode 100644 index 0000000000000000000000000000000000000000..cb897513383adcbf02a56b4ec938be0bdd79d85d GIT binary patch literal 1267 zcmVEEAt52PflcSa$;+1USwicU|U>eV_jxqSzupT zU0PdVV{3SNWpQs>U|LvWTwiHtaCv!VZ){_0YB8K+G0vQvoMTvFTvuOPUuk4pVO(c$ zZDDI`Zh3Zce0XqmbXsCxV{K|(Wn)@qWnE=vYjSaVf`WR2e|&v;T4iNnX=!C|Zf0$3 zZ*+5ef`WpHiGYZLiH(VCadT#GZ+CuvaB^;QbaHfje0qa}hKz%UkBobOfqR03czSnk za&U5deS3$9cZ7p_gMojEigtj4b9{eygoKBbm5rO4iI$a(n3s~Ao_vUjevXogo1T`X zrkSUvoTs9ZproCyub!-_sk^<5o0?BiMUkDDkDr}bTS{$hOj}q(h=XlWO+qs?CYP9X zt*3vUmTYKaT4!WZqMLKLv4^*?g{q}|m6Lajh-R~^gT1zlzPOLKw2YsfeQ|GKo|$pM zyO77jn#;+e#lf1WriY)Pl7W6`v8#g1%A?K8q|nW#&djH+tcRkbij|dmzP+5z%cIW7 zqt48xxVMglg?FW-hsVaE&BdY5xSr0*q|C~qzP*&ItC4_zY^|$`$;YF~!<@;+pUTRg z%FCg|#GbCNk&BCUy113c$Dql`p2*3f#>Sk-$DO{unx&Q1)qoi5j{zqLsX4=$fz7psANEHfQ#y#VpJ~5NJZu_ss=VS zci{&J10w-$-BJM>u4;+Oksy-5m=lb&bcEZ{(e8W~D2ptu67@I^o;bG2PJMB@QTn0}5Hbo#vRrO%0y! zAUifu=;elm4Glnm)-4rL2@f$v?rQK9C@zu;RTki53htD9T6jd|DD<)bA5(A>7_0Y? zfiTF9IX4l!Tk9Q4LKO%hz{eEa9&d;os&}6=Nq~HC^u%_y<_E{3( zAyCOc_C&pXghB2Ecz*Xx3%98{990|W&fJL$FK7ecz_-)f@yo3kEmZ9^ci{L}2$y1Y z@QO@K%E{I99m6K6nrE?KF4%?Slrp4J&O(8XZg92v5ffU(~xoL&r)%)h3AZ de3x_?egYz$kJ&zIv}6DP002ovPDHLkV1n0FOzi*w literal 0 HcmV?d00001 diff --git a/mapbuilding/mbkitchen_stove.base.111.png b/mapbuilding/mbkitchen_stove.base.111.png new file mode 100644 index 0000000000000000000000000000000000000000..f43f227b576d7b433576c9f030305d94a7cd197a GIT binary patch literal 1313 zcmV++1>X9JP)E-fxJGynhqJ3l@w zFfKkrKTA_lW^QiDlv?Svc$AcsW-1tzN=lS#Avr)mOjJ=cHZLzREk8p)TxMqf{{S#G zGc-9hJwZJ}MM6VHK~Gasc7um%baOsKL@6yOFfuMTI5J64Pg7f3YIJsIZ*OaMbpNOU zH99ssJvc)~LP$+YVry(_a&u{PbYg31Vr*()W@S7-I!sSaWN&g}YinL)Vpd>VTxDZj zW@1@jUs+vRTVZ2sczR`VZ(3klSYljXX=iYGd1h~HV{2;v001E&Ay{EtS6^FSX=Gbr zTxW1?VQXt{d3JJqcyM)eT4G;gZE9U*V_IfqU1er#a&dZsf_j2~e0_OZWo2P$X=QJ2 zW^HS4baQ)xf`W;OfQW*Ljfrb_ zdUtMeaB_Todxwa3goAp6fq#jLc7TF&e1CU@gol)sjhmW@mX(c|my(>Ge29sDj*^O- zo|dJinWv_lr=pRdq@Av>o~)^cZ`T;v#W!>wv4{GkGHgppPhYi zZ(yF8alyNg$HSV-$)d%(4qqN9qHm3qFt zoX*Rm&d8(A%%-@vj)jGHrKE?)#-h!|q0hLU&dH?A%A&r#l&hrVmB+`R$;h6_$)d)_oX5wVzP_5JrH!1Mg1^3-$H#hl+Tqu9dX6m9@B)s;!ZUje(Grg_fL*p`@H_@Ok9`0004WQchC{xgp6vP(Z;S zP|$(+02*8p(I5*;G(bVdo@BfZ#q7))l-weLio^DLC$>x~Ft0SZ>&IgR@*Oc^xDG0um?KA1)ifC}?x#p)zqkMw;c9>Sbqe#e%fp_F;*17O00 zIlKP=Z=%Ixwz$c>9U+AQXPj|Qn?^rtc4v2ziusd;A2GiN%T^#|hlqTAd3=b8evXoViHd-KY=DS@fqrO$iHU?lA%%r^hKz%Uig<^Q zjE9t!h=Xm3je&`ciHVk#ikqH`i*<~MW{jJfjhL5>o0^ZGosgA4prn$Vo|Th# zm6dvyoQ#&Grk9v?nWv_jmxG*}f}EV3oTs9luCJb!Y@V5Mo~)^#oqeC6lA)xWqMLJ~ zql%-Wh^0~~rKE?YrH!bjhpDHIsjQEwu9c~~y{e^rs;!Z$tC6g(qOGTYt*eTytcR|z zk*=|iue6u3tAeqyl(Djsv#W!%wv)8Cm9@B)wzHGBu!Xm@jJUCfxVMhFxRtuOle@Z? zy|#?Ky_LPay}r1QzP*&by_~+jn!dl7zrLHnyO6@epv1(U#KoM&!J5X#oX5kO$Ht<^ z$DPN=pvTCc$jPF~!<@;+pUKCg$;h6{%Ad;1q07ml%gUq7%A(E1q0P&r&d8(A$)wK9 zqt48x&djIJxSr6>rrzG(|Ns9$+<__p0004WQchC>;_c8vpSd0!33Ite$rQLuEs(^?QOrk2_ljUL)H3TXE8Ji0+ z9i#@PfP-5|Ok6(Me=(yy5ahlF14c%;0ud&5UMa-@uV9=e@bF7W+WPrg+gX6D2D=r_ z4T3UGHl|7jCK?duRY8nGQlPFM;-aZ$9_{V`RlxZA^|9BCNZw>rRW{S}whE7pg820H zv18Lg?nDF>gO;O_j&V?CMiIz-p!V133K+C4on0gHE6baJ^3$h-te8F>MM0oPN@RRu zc1<1QbWkW91Cz)K81f3z!{Q24vr56*88NH?MrKk%T7748M<2urMr2<=6f7<-X_+)- z2FUPZ$56rnreJaJ%sH#tvn*c1T0sK7aS{Vc{~D3OIw z01RXw&jtJUuI@)mQE(GLX0+`%a(v%hYzm+tX7<_3_b)D+$H<7)1Yk^8Y<=+f)r*Y_ zQRR_S{e+Vbo;`VffPn$in-Es@k}Hp1K7Dv%ExHnr`Cx@*8*bmcb@$%+O_(acNs^JV z_29KTH!fX0wG>kU)OXX)Tt75*(S^IAS`w;f)-{qz=8 tX%uGd%3ZtHpo9Thh%hvEPn-|r0RZl44w3axfL8zj002ovPDHLkV1kO#Wv&1K literal 0 HcmV?d00001 diff --git a/mapbuilding/mbthaumaturgy_desk.base.111.png b/mapbuilding/mbthaumaturgy_desk.base.111.png new file mode 100644 index 0000000000000000000000000000000000000000..b7286b29ba9e6ff7015e12bb01859494ef412031 GIT binary patch literal 1316 zcmV+<1>5?GP)GY-)0IX>@dAYiVL^YG7t%JU=>2PflcSa$;+1USwicU|U>eV_jxqSzupT zU0PdVV{3SNWpQs>U|LvWTwiHtaCv!VZ){_0YC<6pSYcdOUt3>kWLsfeXK-y{Yin+K zc5-}paCLP5)&N>!Ut?`*U1eihW@TMvW@~bBdV+#_f`5E{d0J&cZ`T;v#W!>wv4{GkGHgppPhYi zZ(yF8alyNg$HSV-$)d%(4qqN9qHm3qFt zoX*Rm&d8(A%%-@vj)jGHrKE?)#-h!|q0hLU&dH?A%A&r#l&hrVmB+`R$;h6_$)d)_oX5wVzP_5JrH!1Mg1^3-$H#hl+Tqu9dX6m9@B)s;!ZUje(Grg_fL*p`@JN@WIOf0004WQchCGpm9LM3$x4o`+Zv*0O2mwPvCLj!f0Kp9632Q;!toy zt)1>M4zK|wZxnt%f{%C9;5eH3oMf1Jz$p9#f$podHDj1V;xb|=`~>TubZ0whJY<-Y zq&eOfMd2qv7hT_3)mJXH=l3kzWE=iJ*`+O>;V+{95jkkHaO-{=qYKan^ER7C&)00000DlRQ9G&H4BDLX$tEHExU zLqAJXQD$y#ghCd3k1UY-4L`SYcdOUt3>kWLsfeXK-y{Yin+Kc5-}paCLNAVqarz zYF%YxT4rTkWoBz~ae9J+dV+s^eR*1CWnpP)Wp8d~ZEJ6Ib9;hGSX)YMZA@EOLx_WIQB6WKG$xmrb*-m=o|bHAV_IiqQlgu4 zxUq+~u!X9ne3g@TjEH8ltAo9^jJ~*!x3r9(oqcg{V4j(A!Ml*h!$)wE6qQ1S9tE-WKe{8L*ipj^L$-|t<#-GZ{pUTUj#KfMiuaS$3b-K8f z$H$<_$ezf_qQ=IY$H$$%zM7?_jhvf;zrLHt$e+5olbV-B6m9)2&wYZh4t&xe1 zfsmDjmYj^Cq?`)r(A@w400DGTPE!Ct=GbNc00E3iL_t(I%WYFFPsBhFouR$