From b0e45bce13d1dbe3cb1861989e9d3ebe8af6a1f1 Mon Sep 17 00:00:00 2001 From: Sokomine Date: Thu, 9 Oct 2014 03:40:15 +0200 Subject: [PATCH] added and repaired the tent village type --- buildings.lua | 40 ++++++++++++++++++++++++++----------- replacements.lua | 17 ++++++++++++++++ rotate.lua | 4 ++-- schems/tent_big_1.mts | Bin 399 -> 411 bytes schems/tent_big_2.mts | Bin 369 -> 379 bytes schems/tent_medium_1.mts | Bin 253 -> 261 bytes schems/tent_medium_2.mts | Bin 286 -> 291 bytes schems/tent_medium_3.mts | Bin 272 -> 277 bytes schems/tent_medium_4.mts | Bin 274 -> 277 bytes schems/tent_open_1.mts | Bin 187 -> 181 bytes schems/tent_open_2.mts | Bin 183 -> 174 bytes schems/tent_open_3.mts | Bin 265 -> 259 bytes schems/tent_open_big_1.mts | Bin 200 -> 193 bytes schems/tent_open_big_2.mts | Bin 200 -> 193 bytes schems/tent_open_big_3.mts | Bin 191 -> 182 bytes schems/tent_tiny_1.mts | Bin 218 -> 221 bytes schems/tent_tiny_2.mts | Bin 186 -> 164 bytes 17 files changed, 47 insertions(+), 14 deletions(-) diff --git a/buildings.lua b/buildings.lua index 760e6bc..759277c 100644 --- a/buildings.lua +++ b/buildings.lua @@ -11,6 +11,7 @@ mg_villages.village_sizes = { logcabin = { min = 15, max = 30, space_between_buildings=1, texture = 'default_wood.png'}, canadian = { min = 40, max = 110, space_between_buildings=1, texture = 'wool_white.png'}, grasshut = { min = 10, max = 40, space_between_buildings=1, texture = 'dryplants_reed.png'}, + tent = { min = 5, max = 20, space_between_buildings=2, texture = 'wool_white.png'}, } -- if set to true, the outer buildings in medieval villages will be fields; this is not very convincing yet @@ -107,18 +108,18 @@ mg_villages.BUILDINGS = { {scm="tree_place_9", yoff= 1, orients={0}, farming_plus=0, avoid='', typ='village_square', weight={medieval=1/12}, pervillage=1}, {scm="tree_place_10", yoff= 1, orients={0}, farming_plus=0, avoid='', typ='village_square', weight={medieval=1/12}, pervillage=1}, - {scm="wagon_1", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_2", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_3", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_4", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_5", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_6", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_7", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_8", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_9", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_10", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_11", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_12", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, + {scm="wagon_1", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_2", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_3", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_4", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_5", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_6", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_7", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_8", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_9", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_10", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_11", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_12", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, {scm="bench_1", yoff= 0, orients={0,1,2}, farming_plus=0, avoid='', typ='bench', weight={medieval=1/12}}, {scm="bench_2", yoff= 0, orients={0,1,2}, farming_plus=0, avoid='', typ='bench', weight={medieval=1/12}}, @@ -226,6 +227,20 @@ mg_villages.BUILDINGS = { {scm="field_3", yoff=-2, orients={0,1,2,3}, farming_plus=0, avoid='', typ='field', weight={fields=1}}, {scm="field_4", yoff=-2, orients={0,1,2,3}, farming_plus=0, avoid='', typ='field', weight={fields=1}}, + {scm="tent_tiny_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1}}, + {scm="tent_tiny_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1}}, + {scm="tent_big_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1}}, + {scm="tent_big_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1}}, + {scm="tent_medium_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/2}}, + {scm="tent_medium_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/2}}, + {scm="tent_medium_3", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/2}}, + {scm="tent_medium_4", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/2}}, + {scm="tent_open_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_3", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_big_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_big_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_big_3", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, } @@ -245,6 +260,7 @@ if( minetest.get_modpath("cottages")) then table.insert( mg_villages.village_types, 'lumberjack' ); table.insert( mg_villages.village_types, 'claytrader' ); table.insert( mg_villages.village_types, 'logcabin' ); + table.insert( mg_villages.village_types, 'tent' ); end if( minetest.get_modpath( 'hdb' ) and minetest.get_modpath( 'nbu' )) then diff --git a/replacements.lua b/replacements.lua index 219baea..144eabe 100644 --- a/replacements.lua +++ b/replacements.lua @@ -492,6 +492,23 @@ mg_villages.get_replacement_list = function( housetype, pr ) end + if( housetype == 'tent' ) then + table.insert( replacements, { "glasspanes:wool_pane", "cottages:wool_tent" }); + table.insert( replacements, { "default:gravel", "default:sand" }); + -- realtest needs diffrent fence posts and doors + if( mg_villages.realtest_trees ) then + local wood_type = mg_villages.replace_materials( replacements, pr, + {'default:wood'}, + {''}, + { 'default:wood' }, + 'default:wood'); + mg_villages.replace_tree_trunk( replacements, wood_type ); + mg_villages.replace_saplings( replacements, wood_type ); + end + return replacements; + end + + if( housetype == 'grasshut' ) then table.insert( replacements, {'moreblocks:fence_jungle_wood', 'default:fence' }); diff --git a/rotate.lua b/rotate.lua index 5ea86df..286a427 100644 --- a/rotate.lua +++ b/rotate.lua @@ -15,8 +15,8 @@ end -- accessd through mg_villages.mirror_facedir[ (rotation%2)+1 ][ facedir+1 ] mg_villages.mirror_facedir = {{ 2, 1, 0, 3, -- 0, 1, 2, 3 - 8, 5, 10, 7, -- 4, 5, 6, 7 - 4, 9, 6, 11, -- 8, 9,10,11 + 8, 9, 10, 11, -- 4, 5, 6, 7 + 4, 5, 6, 7, -- 8, 9,10,11 12, 13, 14, 15, --12,13,14,15 16, 17, 18, 19, --16,17,18,19 22, 21, 20, 23 --20,21,22,23 diff --git a/schems/tent_big_1.mts b/schems/tent_big_1.mts index e118416bb5e24def24af2415006270d2d4da9f95..9fe0c9bb3cc660530caee5bd0bf4369b7fd3e591 100644 GIT binary patch delta 190 zcmV;v073tc1DgX3O;l4&00RI900jUBkqsRa5@T<4bYW*@b2@i#Z){(5Wo~qlKhA&E zP|*&8Fbuq{DokpOgoOY9QoPkNHiCv%uk3P3@0wDeLO|p@=1+yDYD5SwxRRsk8#>p$ zd3#H5bJ}b&&z)-U*;>47V%uk*eXx?b)YHSstT30#&e?Nz=k_MwbgAVJ;eVRyk7&*? sW>RP2SrkI7-7NH#PtEQ;3A;eu4VDtZbChY`b$?DqN3?8s1BpwwY?t?1Gynhq delta 178 zcmV;j08Rg!1CIj@O;l4&00RI900saC|B(zG6%=P|VRLhEVQyt}I(KhxY+rC;Ze@`? z&VSufTMmFA3@e)t@Dbzv536Mo0|_MRr(I|UD?$>}a?Za- glp2lIJwBN_mb!+V-m*QVSHQkoeAdttwQB1VN34oUDJL^}aK2 zXX#^3%x3dscD>IYcJG!r_W94QrLMu#{mraca@$!wcXy6Ax$5`&J`nz=x%`N5hDm93 m7M^8<5JCOusi`irPz9o@DZD3{ms1S&VlrAHvf&47thZPeJy+oX delta 173 zcmey(^pT0zHze4Xfti5~1piOukrfq5&q*vUE=bHvEw(Dp&(DbmF(=w=sk<8#&DWs7 zqb;q~&;R%@|LWufCe9zfws4-5d2>Hf?dL;%PHa#|xL3L{}M^ Z1#NQnEjm!Oc&81wO2*DZjN$?}8vwx1N9O+2qiCmaDbjw9xnkA$ zVs~OW{>b@n@9$ACnq2I6{vcmt)$-A`b52!9tzhPxfs`HCY(ZyeOwEvkh{R~R0J{uj Ew`PAsVgLXD delta 142 zcmZo=`pd}c8xrixz|6o3g8wJ-Xp4%Z=Oh*v7bNDT7F(6)=jX(Om=nDM8tbN swETRJB}O|=+kdlfbnlS5>MELM#!?rv;jH7i7z1+$qa}|Sr0VLJ0Hr!OfB*mh diff --git a/schems/tent_medium_2.mts b/schems/tent_medium_2.mts index efca9d6d1244ad6133a153d60b2562d0c46ebac5..711f38b3b826d0c5b5b562a881eefd8ba99711b8 100644 GIT binary patch delta 150 zcmV;H0BQf80;2*9O;l4&00RI800aO9kqs*o5@T<4bYW*@b2@i#Z){(5Wo~qlO>b(w zP+JOsFbr$0S_cDR;Qf!PZCW<>;jbx6U)cyF>R?((?C?|xf`<&d75h;|=lQMMtlu$L z?2fLTbp^_}FQ4ym&UmWQ-~9u^MzIL$X!Z*gL?UUqS*}ekI$?hbHze4Xfti671piOu(H0d+&q*vUE=bHvEw(Dp&(DbmF(-QECmjul<~yLk zp?xAQe)s=Oa|iWTlYZ_L(q59w!z9Y$cF8$*`kr~WwG#9S(@QEJ9lNhCHaEOHXWiS& xM;^{BICF2oqM+-0zwP+PV(0j6x}U(runV@6FIsXL9Lx|naHdr&Pq?P`3jmZ)K0E*b diff --git a/schems/tent_medium_3.mts b/schems/tent_medium_3.mts index 790b7dd221f16643601c9408268a269c01ee2cce..75d72b5ed87f40adb4a457f0243293a1b7d2d9e5 100644 GIT binary patch delta 150 zcmV;H0BQe_0+j*`O;l4&00RI800aO9kqs*o5@T<4bYW*@b2@i#Z){(5Wo~qlO<`)i zkKqcyAP9st+uR@+1bhES-RzP|*zetunSI1XG{lrhY;ouW=84%n!wFOdDLAz~a+`BI z?sTw`JK(f*U+=NcICP%x`9VF#Y3^mHO6F4StA#{7aaLAqCGIuDzN*h&iq{at(`TH7>VpuTp)o1PCkpoy@6bG`}l+=*G%ufcS%qI>XaLCL$2N9`ex&gWK FWutiJLh}Fs delta 148 zcmbQrG>M7VHze4Xfti671piOu(H0d+&q*vUE=bHvEw(Dp&(DbmF(-N@q#pH;=4(*k zc`di1{@(vBQEEyFi$0##d+l~Bm1l*3MvrD}x?uX*LdS<5Ga@$IAMH8nEnROvQE5{$ zU+zzX!i;?DB`YqKZnxfM-{{T}({m($SGD#BCgns~)@7``Od(qXj`GP$)cytl%Og3n diff --git a/schems/tent_open_1.mts b/schems/tent_open_1.mts index a10e442868a61151a0384bf01577920065ebc10f..03a2c57e1f1ba30d0a1e2d1304fc274eb1ba760d 100644 GIT binary patch delta 112 zcmV-$0FVE>0kr`PO;l4&00RI800aO9kqs~t5@T<4bYW*@b2@i#Z){(5Wo~qlQX)iS zV1NTg1|~3M#L7YdCajPd44F{Wv49~=9zmn4V+BJ(<}pIe!|J~ObN~!Q0A^-p6ut;Z SjDZ=CIwmG$PXYj2BV>20ge3(4 delta 118 zcmdnWxSNsJHze4Xfti671piOuF%T6=&q*vUE=bHvEw(Dp&(DbmF(>*fxgYJn&BdU= z;rx8lzyJN+OSq>5=D)SkcqPH)%p~=wOvdM;s)UWjl^4@D&y&4aael(I!k^0jMdFsO U`fYHPbx!MJg`IICJ34B+0L;5EbN~PV diff --git a/schems/tent_open_2.mts b/schems/tent_open_2.mts index 2a5635595e4e682a628cddeeaa107a0844f173c4..54e23d033a90ae2a7bd08138216873f9b6e73fe0 100644 GIT binary patch delta 135 zcmdnaxQ>y>Hze4Xfti7ofrWu}BCkP_P;!1rNn(0xu~m6~eolNzYF-HgA6zUcH7_}X zfd|enDNU-Flbq1N?8c^MkaFad6NB2C36eZB1Fmc|*uZ4yBj>nywemTeJ@0<|vmbC^ aNk~g;vlc%h#Mo(Q@HnuYi^0z^B^>~Ttu9pn delta 116 zcmZ3-xSf&LHze4Xfti671piOuF%T6=&q*vUE=bHvEw(Dp&(DbmF(>*fxE}5ISG0dh@3GEAth&PVS!i R&otl|1CJ$-)C#lODgd@BDi#0$ diff --git a/schems/tent_open_3.mts b/schems/tent_open_3.mts index 7ce23d778b1e1144e862daebf42bb53762eaa99d..55a1dd3a9bd8c84a7a2a5a72e45d87e56456008b 100644 GIT binary patch delta 134 zcmV;10D1q30)qk!O;l4&00RI800aO9kqtx>5@T<4bYW*@b2@i#Z){(5Wo~qlW=2}Q zkX;UdFbIQ7nHv`{-v6XZ$o@1lzS-}kgN87GE&&5sx*_$q2AoI%ryQ{%J0+5-=lICw o+9@CN1Qsm!JAV+~3z5!b*vJ<-f&c&j delta 140 zcmZo>>SW^e4GH#TU}j(i!T%F^Ttr3Ea}tY-3lj5Ei>=D@^K;@s%!$cvu}3F*3ms74 zaCTnsinZ$h;%#2m(^&t$nYG<<4i8(SCZnvUwx3?6{mR1)mOipanl7z;xAEnJwTtJ> s{Z-kvz*66Gn|-VM*X!HMrlg7GhXoz?d+;;)*+=P_$`|?mde*)G07GazPXGV_ diff --git a/schems/tent_open_big_1.mts b/schems/tent_open_big_1.mts index 96860e35aedc5e49eab38215ffd2f10de656e36b..0391e01e42c86d71f493385103da94f6d1ddcb5b 100644 GIT binary patch delta 121 zcmV-<0EYj_0l@(bO;l4&00RI900jUBkquE~5@T<4bYW*@b2@i#Z){(5Wo~qMoMT`> z0*nkyP{;^`%utA%jSQF>SfG#@4`hWxW;DGpd$H?)v0x z0*nky49q~t1Y|LSSs;j;jSQIJ;s_QdWPw6vqV+;lLs&499(oD685C9!NK{z;AA$fL gN+5&-FhjxuMFP!9G>=qXo k{hwE!zdiqB>+)Iwxm8xjgeE_jRMJ2 Kk>RYE!ASt0c_vu^ delta 130 zcmZ3&xQkK9Hze4Xff)!{7+C%T0R!7aA;)x)^qj=v;)2Ay)MBgh{QR7F5R*YDIlrVN zF&!vYTvC)+9-o_7QZZ+$-)Sxe1)ie*1^@p)ERtRwJz+%$ySaj5z^c0|nvw&~E&KYe eHL|Zby;jLBZPT|aD*R8rovkt9$T>FKAQ1pyo;Dl+