From bc422e80754f96f408b29e74e45a972f8969e87f Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sun, 25 Aug 2019 11:29:02 +0100 Subject: [PATCH] Added module parts, made cell size smaller --- assets/world/module/human/base-center.vox | Bin 0 -> 1760 bytes assets/world/module/human/base-corner-blank.vox | Bin 0 -> 2092 bytes assets/world/module/human/base-edge-blank.vox | Bin 0 -> 1940 bytes assets/world/module/human/base-edge-door.vox | Bin 0 -> 1924 bytes assets/world/module/human/base-edge-window.vox | Bin 0 -> 1924 bytes assets/world/module/human/base-inner-blank.vox | Bin 0 -> 1884 bytes assets/world/module/human/example.vox | Bin 0 -> 8764 bytes world/src/generator/town.rs | 6 +++--- 8 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 assets/world/module/human/base-center.vox create mode 100644 assets/world/module/human/base-corner-blank.vox create mode 100644 assets/world/module/human/base-edge-blank.vox create mode 100644 assets/world/module/human/base-edge-door.vox create mode 100644 assets/world/module/human/base-edge-window.vox create mode 100644 assets/world/module/human/base-inner-blank.vox create mode 100644 assets/world/module/human/example.vox diff --git a/assets/world/module/human/base-center.vox b/assets/world/module/human/base-center.vox new file mode 100644 index 0000000000000000000000000000000000000000..14ed7d12dd4879e4c826f8342006fc708573579a GIT binary patch literal 1760 zcmeIxziU)M5Ww-7o&7O_e?f|1VHGhN1i|u74>?2=5+X_Zyv8ai%s-JLAP6Z0u}zu( zAZe}Ay}xGtPJ-oG9Hz^I4>SAT?!0%id!IM=o_rUPkCXW)g8Z%`Ta&jRatyc>JM)9t z#WbobyFA*&8r^iW{rp7pS09kS?9iG{I|m&85BhQvK3vUpI|NUSr~ z8Ea6;GcgfWWlS(+6jZdx8}k}9p}a#Ab79CRsA%9<4T*1PjeAgIE({q36)kd}XBbk< z%|sY73Mv|u=dChEffnY%kWo<4V$5?xig}=YBfTDJ=V+k+V*%SSHaOUf(INZ>kKe)f zIfQpRgt`u)o<~i-$01H_Bp5OZDjFP#{wci^)Joqg{UjO^xe_(8w}Ctp4MidB7wZza zQzykZ&VjQI&icx@6nY-@oVwi4DCCvcVjj6OC&&3gA{X{v<1A3$BJ$1#=N%sJV;?K~ z*-$w<4cqUh6MAxcai;pRI@hvmAJ*OV{q^cfpRYabyBll$_}!a+arCNx-CtkW*Yne( z{`1>Ozq&l@H`hNF&U@(Za_9Q_voHO{`f=ZQdGcR+JDpDZY&Kh1i$7t%Pw^l9M}7GN Dt*?sV literal 0 HcmV?d00001 diff --git a/assets/world/module/human/base-corner-blank.vox b/assets/world/module/human/base-corner-blank.vox new file mode 100644 index 0000000000000000000000000000000000000000..7523e5ed3d36fb7907d75ffa5ae7dc9a03b77c2f GIT binary patch literal 2092 zcmeIxy=qiJ6u|MB^D*ZLK7d$=g;m685CqGtF0zOpC`yv<7D*#XZc><+un+{nLa?{= z4fGAH+y}9~{%3<_EP{4k_;F_LoSD6QX6EISt*h@#DUUW6j|t^cmhyD--b3pho{Hy- zo%zL8uapbK-?p}Q7C-cK;3pxZjUsIj)58#_?Spu48*Lk;^|l^1I1CCA9VGgg>^G4E zCmKs3<@7ic^G$h3OS%^Vd&mh|OxYDoedEIw31QOE7F*#^a_f+ei!L{x-VjyXY zljE#obzhAfxRFB)ByBNrnjDCe<8{~IUiTU?khC+&Pv*gC8&M%yhiHs9+QIKAwFu_% zO_H4V zO1)|oBB~Nmjfm<*)J8-NB5D%ZW9Ca0aOapKZ!F( z=QZ)1ckcgrr**$``m-JV`=ub)}h4{wg9Pw!5quV3Cy-@ko4 sGw*+W&v&kGTz@s)TtA*RZk_y<+RkRPX+EEyxfYjj`j`40{log@7hrX=oB#j- literal 0 HcmV?d00001 diff --git a/assets/world/module/human/base-edge-blank.vox b/assets/world/module/human/base-edge-blank.vox new file mode 100644 index 0000000000000000000000000000000000000000..f93dd6e635997a8abc3fef072a383a9dd93b958d GIT binary patch literal 1940 zcmeIxy=oOf6u|L0Uo%JW2`t3IDq=JUf}Oc~2^aALMM+Wyl18F8DNO4FSO|h(A=q2` z2KoSk-9F9u-wl@6B50R|ALq=>+1b5k?!I`uedS{*<>BVy5uv3xgw2(Z-y0he5|$C&J(eR5S?d ztujVHf?60Hfr>VcSvTld2iiB#>p?+F2l_t*DmaoM!C?%E!f!|v-Y-#jcA~IvqOf0% zd-6VslI#tI!4arvNEDU5q6&i}P|=WkLBEo-$mz_SJUPpxk7MpjXZ8r?7_Go8~5=}g?WLpW<*DjS7KpZpwt@C5#-7{2mSGh z(;r_x-I{H3j?*O~{j56IS?@i+@3il?FJJ15wX6O4##%qVf2V&vy4Bz8tgr0rr*}vF z%ZHQx{oDKg>&NGnb?5y(+yDCdwU_216E1=0i{1I< z)vT0DjDOhP*B3KjrgcydXd1*p9K=rS#7=B)s@gJD4jUM;;sl!NVO3pLm1Tet ztLkgPyXGKLMg;?hfC>$ab)9k`wK0+l1`Yug+KM(*a$3WI7`b5J5Ky5_G3yQnI^{Ye z7&rt}XdtY&${YeD$OQw3fC_Dzvu>bM9#FoKT8|2pbfo@cKm}SdCeVyAq3{g}h4)J+ zJUgMVZ$e?eoc82>5=yc+C>S^dRA`V;RQ8H07&rt}XpnnBy^>xeeKK|Wm-I5J;}rW~ z8uTrPSh>Ijt}Yz{D&*>HH2Tz7YlDMu26S}}gj{+qLT`oM3cVG+Pxb>8(jnv^D`SI{ zgTMtYaDfY);uNPi#VM{CIE3uC%Ge-f-|>!jyyG43c)<%^@PZe-;48l3E570@zTypU zc*7gs@P;q=f-m@jFZhCg_F%R}-&U81^z+iW&U^30eW!K5bM;DJtX=OfHrM*`{k#3^ z(e3_rXZ_5&etLJ*zkE39-@m=@zkYl^Gw-6l=R4OoZ@lWa){pz<#>qda?QAyd^ZESD Qz4!_H|77|{|FVDi4Vj{!)Bpeg literal 0 HcmV?d00001 diff --git a/assets/world/module/human/base-edge-window.vox b/assets/world/module/human/base-edge-window.vox new file mode 100644 index 0000000000000000000000000000000000000000..a96fcb21da86d32f984b56e5f709da66d36130ee GIT binary patch literal 1924 zcmeIxy=qiJ6u|MB^ErY~U?CP(5o3ZNSY~yRMf^Zfl9XYSMxvV(<|QlyL9h_)Eqwzm z?d=Y^kylvoHVQk>k$o!rQc+{pD!h|V1bg)mo zjNzzGFBAqxAjdIvg^Yb*`v&%U5U`~K`#(4W9LdnYVGIq0|Iko)zJ|hYHx$-wD6H4U zHF=(f(pVb;g~1U>G!&@^MFa|iBamnZ&VDt{qH#_tHgD{6B9^%=RD2$ceL3gUow?wQ zgR>55!QA+6B$%B|^ zFW9aw95aoDb^38jK5Cav#rBn6D6ON;Eim5DWDRp;w6p zCl{Xi*@MXr=eE3Rt$kgcYu$SX-oM+wp4{$l_cmAV>!)`o z{mX~5{{7qg{_Dr*m3~ EZ$Y1)Q~&?~ literal 0 HcmV?d00001 diff --git a/assets/world/module/human/base-inner-blank.vox b/assets/world/module/human/base-inner-blank.vox new file mode 100644 index 0000000000000000000000000000000000000000..ce27fa56d22a873ee452575dd4fcca8eeabb3329 GIT binary patch literal 1884 zcmeIxzlzgA5Ww-7+1=R@d;$xxusZSd5CqFag9h;rigI^dilmX;<*x8v!a@)P3&Gyf zCs5zO?)Nn7cXL?AB4~Gk4>P+vyT4y%lh@DouYDAeC!^_8f;_4s&qwzk=RV-0csV_s zTwaevE)oCOKRBF5I$!ussOBrzSh>WiS|P9Gl{}NPCQhD?-O|jJb?G&%NncOL)okfz zGZ$*qj$9b4E?snKN$09E7!ooH9JS|F=eg=4A*`;{s6|3XfupYRURGzdG6zl6A|a!| zQG3pMMuPR)OhiIPfullMug(|+TBt=rMuDUDG3yD|>p=SkdOa9u=|KO70tZ(z1h|YL zAbf{_@P71v5S|?n&J76XML(1G2}p1@3<((pj*5WMKc#m9cU=^xpTq}10Zq6L{&t418Wj>>jJF)gU@+kcromJCiK$0#L z&iRR$QTQ!5u_DMNQv=I7PsEHu?!<~9m%_WiI6o0HN`Dry!UW13u@I9{1A)Sf-U!cu zC=rFZ#5f}{&Uo=~JmNmqA8OjR8lP?VUhF&X``xQo+H~i7d$qUIP9NNBUr+9|w+Fi$ z`}*nKN&E8Qto``*zWw_7d1Kv0f4BQx-@Ngr-P%2Ed$-U2NpHvFahpsg8_(iT*#4*f JAN|Yu@*Cw3nE3zz literal 0 HcmV?d00001 diff --git a/assets/world/module/human/example.vox b/assets/world/module/human/example.vox new file mode 100644 index 0000000000000000000000000000000000000000..47fd218a963f35128006615d03fee1b30ea89ddf GIT binary patch literal 8764 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 DrGVB* literal 0 HcmV?d00001 diff --git a/world/src/generator/town.rs b/world/src/generator/town.rs index 7f578a7514..fdb3478992 100644 --- a/world/src/generator/town.rs +++ b/world/src/generator/town.rs @@ -16,7 +16,7 @@ use rand_chacha::ChaChaRng; use std::sync::Arc; use vek::*; -const CELL_SIZE: i32 = 24; +const CELL_SIZE: i32 = 11; static UNIT_CHOOSER: UnitChooser = UnitChooser::new(0x100F4E37); @@ -136,7 +136,7 @@ impl TownState { let idx = rng.gen_range(0, 4); Vec2::new(dirs[idx], dirs[idx + 1]) }; - let road_len = 2 + rng.gen_range(1, 3) * 2 + 1; + let road_len = 2 + rng.gen_range(1, 6) * 2 + 1; // Make sure we aren't trying to create a road where a road already exists! match grid.get(start_pos + road_dir) { @@ -167,7 +167,7 @@ impl TownState { }; // Create roads - for _ in 0..12 { + for _ in 0..16 { create_road(); }