From 295970fbac9acd590dd71e49b6ca0a5e5ed9f81f Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Sat, 19 Nov 2022 23:37:27 +0000 Subject: [PATCH 1/4] Adding extra row of blocks in front of doors to schemas so villagers can get out --- .../mcl_villages/schematics/blacksmith.mts | Bin 988 -> 996 bytes .../mcl_villages/schematics/butcher.mts | Bin 804 -> 806 bytes .../mcl_villages/schematics/large_house.mts | Bin 1179 -> 1187 bytes .../mcl_villages/schematics/medium_house.mts | Bin 801 -> 807 bytes .../mcl_villages/schematics/small_house.mts | Bin 572 -> 578 bytes .../MAPGEN/mcl_villages/schematics/tavern.mts | Bin 1003 -> 1009 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/MAPGEN/mcl_villages/schematics/blacksmith.mts b/mods/MAPGEN/mcl_villages/schematics/blacksmith.mts index dab65afa47314919237e6abc50d80bd51d3690dd..d4e26fb26b773bf8a4a06adbd1638a3ad9f41182 100644 GIT binary patch delta 263 zcmV+i0r>vh2jm9`O;l4&00aOCu?Xk_e~S)+FbwQAKu~;x;Okrcb-OX76i{9gO}NVl zM|ZuA1ppYt#H{Aa5(Ox52n+2ZotirLchC1MGylTO^C5tx>7VJ9xfWV8968@3`I>?0 z?-I9Ls*5k@^Zn-e;mG-#Youq-e`ERz*xK{nSuINEKW={E_i^mu07r;Sf8Y3Gb>xX? zy#o0rKYY+74 N$~u2PJONM@WvrA~gzf+U delta 255 zcmVs>&EMPo~YO&^>I znvorb!vH|QCMN|aOdxe=REA8wKI#j}%Uep{LRAz{!V<^SYNeh=Nv@;h7k{e{M&Torj$*P??v3;wUbAB=M3=8Z(z!6SR;h2T0uaW0YZRvky zIIjVLZ9Gq4^~Lj5a7EHt8&zWyB+2?j+x{t!V}RPVu#63Fo&l^YY`kH>VS)wzr3{tu4I~`lQoG0%kkyk(W^EQxp4SBEdee?3FfA#K7 z)H+Y-7_}4gHnZoAov+F%g7e}=58vllzsf5TdBxYx_rLC|anlyh=Y|a%R*U3)wE*~+ zDfy_8bDqN!3L08dOU73Hke_y}D;a#L?Mq!fn=g%)POXO~ed+kTat?Fq!Pw|hVwNw< a@;{q#4wCN`kuX~mLQJ!r1urR50_N6#&Wa5H delta 273 zcmV+s0q*{$2BZcEO;l4&00aOFu?QXle+dr4AP`&*wTI$G@wt9o$_=F&duY>iCc2v` z?l95-kOf)=^S~J*AdVQQVyo`ltXAC{)$$On^(>%NEF!gnTCqxYsnw~n9S!4b_E%K( zwXET+J)F!_7O3qSW~yfiXT>tf5Z8Aqa{HP(+a;ULK8>?6m2R2YuIl?1Wz+Q@f6cNg z&#DNT!P(es*}CVZGl}FZxKq=2vb$Di6WMHH=5t%`UGnXeMe?~}!-k)s=PvmdlDiFm zUd1^dXQe7h4T%?#Zy)m04DiCvjRbBaQYUaDnJ#S2v>rDyD4U!>!`9hZRSML*(UJe8 XofD$xEx{6YH$sS^X4B#Ywkf{eCfkLc diff --git a/mods/MAPGEN/mcl_villages/schematics/large_house.mts b/mods/MAPGEN/mcl_villages/schematics/large_house.mts index 3939a2c4342ea3895e8a89c67851b6dcfa0354ee..6cc19543ed79c76e15073519a4834b4c98a1bef5 100644 GIT binary patch delta 324 zcmV-K0lWU238M)JO;l4&00aOGu?TAee^%KNf-npWcyWj)f`Z4V`s>yL+CoEHM5;`8 zUm#7g*~w@DK;Vp&-Tk_RqWA=+#$9#uJ8Q72n!|$OoQr#eI`OtXMU6b)hk&8qyWa&A z8)o0wCl`r7PeNfF%U6pB+>}8lzf06_R4T0~-@5X6NLj_#<p-#wxmOZFo6>qz|`jQWi@-K4R{`aF?>-;@yddmO-T`|tNecal+7x;dTm+?XeS z&CmOFl>JU?`NR7yZleq?aMk#q!Tsv>8QSkS@1u5N-y65T{oWWM?-mvo78XAV^gc3) zI5s`OC&2G`wG#YAsmVl9Mzig!GI687uC9Zgh|!m>y5gt0;zk51QaSZ{l%nauJu=;W zD9xnVEFA~{3TqZ@ zzpGXojlSX$62)`X(XiH6*wEWb;4LoeuPNVZs%S*XcAIkD(#%(GMAx9!RRFsYf4uDp z`FlH{YKio%W8N%4e|ur?<8%A#B~)$**g#7xGl}9xhG&okaD*yz zNkVKnCt;`g{T|V*Dm`Y|1kA0$7yl7C1O=djJ3c delta 228 zcmV4e|ll><8%A#rRx%LCA1A#(uSGDIJ&G)1pt^t zVdv(N%;`Lh=VyiT>~d=z&T=$f;(bk4S$G;)*y9pbwqu{&*ie@CscTFd;?ZC*8>)AN zVY+vC#?NnA*1&mOc0A*Hfh@|q9^>hdV{6^>7_Yykx9ii6@$89b;LpKxU_1hjQdD`O z4(G4(bnJhb!v8BYe=hLZe7<73%`~4&ulF?P-w%uWUR6~!nF(x9Kw$Ta emcNiONyFoPgnuF+A5UT*Y?1Rj|F|BJk+dQnJ$DEI diff --git a/mods/MAPGEN/mcl_villages/schematics/small_house.mts b/mods/MAPGEN/mcl_villages/schematics/small_house.mts index a3789504eedee18849ec211439fa09659c898b5f..92c0c150ddf4059776607b7f9f22a38bc8f091d6 100644 GIT binary patch delta 200 zcmV;(05|`<1i}OiO;l4&00aOD00{sHu?&R)f0K(2gCGn=OJ#KK?HBLY*Pvsi5Zxvu zn0T8OthG6k0+7fwW_dzn>wH|--Lf5gtU-top#y>=yAzonPV6qKAyH#_k8oxu!ASmD z|H*nnQmbLMcui|;_#OoVPA={87vXh*@V%QO{A6rYRp$(EaEC`zXPC|*sX1KAjC0sm zGMU3tW?|qsD1x7E_H);+29&uen-GQ#>Q}kj|Fycwi>gdRV?wjygj&g=*47J>vPL?_ C9$Q5K delta 194 zcmV;z06qW01iSMgxszd0M6LJfrZn`=#(5;Uud~4=-?q+h6rCpF?qTI2U=&Vc%p9 wENhWrP(L^Yi+=Wf!-nPfFxYKD`9CT^H(FKHDTp`~tFF)^Yiese0N5iPzwf72EC2ui diff --git a/mods/MAPGEN/mcl_villages/schematics/tavern.mts b/mods/MAPGEN/mcl_villages/schematics/tavern.mts index c26c14dbccb6acadb9f4838d01dcb900aba03a74..32b9052610204f5ce4882b189fbc92f6b91b631c 100644 GIT binary patch delta 386 zcmV-|0e$}K2k{38O;l4&00aOGu?Twte+hDfFbwnoZ9@r3bM*Rbzg}N;BpDIo<{&d( z&45{CyjqO05Da9E$(Z&{CE5&ku_dcyZeJ?x*pT^nno;xE<<@NEb!>q85C+f4dn`8Hm6f2?m! z%RuRa8dsUz<&dcn+NaZ#9_ssi>%^sHgy7|EG@% z#k6lO!EIHvZ$u&N{zaZi;5R-caC$U(?AQ=8XKa68&zF%^6q}Sa;Dxk7A0(Fqa9wRG gXJTJeTh@rZHIP!0kMVmTsu^GsPeKE(1u^l=tf6wbu$w?wVP=wE`gox01pN&UB8O3e^UUe z2oHUBFh}iZ$#z;z#yj^7IT{O*>Fj*7ePZo!c7QyOD8mj_9$FFXbhelsjMBE49X^sB zIcfjVvIk~P0Xt`yc|m#p1YQlgLU~tKLw0JC9lw4GotvGZwbQTdNLHcVik)ZftR{AB zXVo^6Ibp7-iss~@&tD1bg#6ZkYW||EwjXdR=NmoFPFDVxB}8w@ch;wfAYWe< z*WCEBY1` Date: Sun, 20 Nov 2022 00:44:43 +0000 Subject: [PATCH 2/4] Fix village building foundations --- mods/MAPGEN/mcl_villages/const.lua | 11 ++++++----- mods/MAPGEN/mcl_villages/foundation.lua | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mods/MAPGEN/mcl_villages/const.lua b/mods/MAPGEN/mcl_villages/const.lua index 65f43f344..f99ace591 100644 --- a/mods/MAPGEN/mcl_villages/const.lua +++ b/mods/MAPGEN/mcl_villages/const.lua @@ -51,17 +51,18 @@ schem_path = settlements.modpath.."/schematics/" -- local basic_pseudobiome_villages = minetest.settings:get_bool("basic_pseudobiome_villages", true) +-- Existing bug in which blacksmith foundation is nowhere near as long as the build. Figure which is needed and expand. settlements.schematic_table = { - {name = "large_house", mts = schem_path.."large_house.mts", hwidth = 11, hdepth = 12, hheight = 9, hsize = 14, max_num = 0.08 , rplc = basic_pseudobiome_villages }, + {name = "large_house", mts = schem_path.."large_house.mts", hwidth = 12, hdepth = 12, hheight = 9, hsize = 14, max_num = 0.08 , rplc = basic_pseudobiome_villages }, {name = "blacksmith", mts = schem_path.."blacksmith.mts", hwidth = 7, hdepth = 7, hheight = 13, hsize = 13, max_num = 0.055, rplc = basic_pseudobiome_villages }, - {name = "butcher", mts = schem_path.."butcher.mts", hwidth = 11, hdepth = 8, hheight = 10, hsize = 14, max_num = 0.03 , rplc = basic_pseudobiome_villages }, + {name = "butcher", mts = schem_path.."butcher.mts", hwidth = 12, hdepth = 8, hheight = 10, hsize = 14, max_num = 0.03 , rplc = basic_pseudobiome_villages }, {name = "church", mts = schem_path.."church.mts", hwidth = 13, hdepth = 13, hheight = 14, hsize = 15, max_num = 0.04 , rplc = basic_pseudobiome_villages }, {name = "farm", mts = schem_path.."farm.mts", hwidth = 7, hdepth = 7, hheight = 13, hsize = 13, max_num = 0.1 , rplc = basic_pseudobiome_villages }, {name = "lamp", mts = schem_path.."lamp.mts", hwidth = 3, hdepth = 3, hheight = 13, hsize = 10, max_num = 0.1 , rplc = false }, {name = "library", mts = schem_path.."library.mts", hwidth = 12, hdepth = 12, hheight = 8, hsize = 13, max_num = 0.04 , rplc = basic_pseudobiome_villages }, - {name = "medium_house", mts = schem_path.."medium_house.mts", hwidth = 8, hdepth = 12, hheight = 8, hsize = 14, max_num = 0.08 , rplc = basic_pseudobiome_villages }, - {name = "small_house", mts = schem_path.."small_house.mts", hwidth = 9, hdepth = 7, hheight = 8, hsize = 13, max_num = 0.7 , rplc = basic_pseudobiome_villages }, - {name = "tavern", mts = schem_path.."tavern.mts", hwidth = 11, hdepth = 10, hheight = 10, hsize = 13, max_num = 0.050, rplc = basic_pseudobiome_villages }, + {name = "medium_house", mts = schem_path.."medium_house.mts", hwidth = 9, hdepth = 12, hheight = 8, hsize = 14, max_num = 0.08 , rplc = basic_pseudobiome_villages }, + {name = "small_house", mts = schem_path.."small_house.mts", hwidth = 9, hdepth = 8, hheight = 8, hsize = 13, max_num = 0.7 , rplc = basic_pseudobiome_villages }, + {name = "tavern", mts = schem_path.."tavern.mts", hwidth = 12, hdepth = 10, hheight = 10, hsize = 13, max_num = 0.050, rplc = basic_pseudobiome_villages }, {name = "well", mts = schem_path.."well.mts", hwidth = 6, hdepth = 8, hheight = 6, hsize = 10, max_num = 0.045, rplc = basic_pseudobiome_villages }, } diff --git a/mods/MAPGEN/mcl_villages/foundation.lua b/mods/MAPGEN/mcl_villages/foundation.lua index 71c5cfdda..d2659c52e 100644 --- a/mods/MAPGEN/mcl_villages/foundation.lua +++ b/mods/MAPGEN/mcl_villages/foundation.lua @@ -48,6 +48,7 @@ function settlements.terraform(settlement_info, pr) for yi = 0,fheight *3 do if yi == 0 then local p = {x=pos.x+xi, y=pos.y, z=pos.z+zi} + -- Pass in biome info and make foundations of same material (seed: apple for desert) settlements.ground(p, pr) else -- write ground From 89f5d41366a80279efd83ae00a6f8726538b4747 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Tue, 29 Nov 2022 01:58:02 +0000 Subject: [PATCH 3/4] Fix village building foundation material for desert --- mods/MAPGEN/mcl_villages/foundation.lua | 30 ++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/mods/MAPGEN/mcl_villages/foundation.lua b/mods/MAPGEN/mcl_villages/foundation.lua index d2659c52e..e53a4a3ce 100644 --- a/mods/MAPGEN/mcl_villages/foundation.lua +++ b/mods/MAPGEN/mcl_villages/foundation.lua @@ -1,16 +1,34 @@ +local function mcl_log (message) + mcl_util.mcl_log (message, "[Village - Foundation]") +end + +local foundation_materials = {} + +foundation_materials["mcl_core:sand"] = "mcl_core:sandstone" +--"mcl_core:sandstonecarved" + ------------------------------------------------------------------------------- -- function to fill empty space below baseplate when building on a hill ------------------------------------------------------------------------------- -function settlements.ground(pos, pr) -- role model: Wendelsteinkircherl, Brannenburg +function settlements.ground(pos, pr, platform_material) -- role model: Wendelsteinkircherl, Brannenburg local p2 = vector.new(pos) local cnt = 0 + local mat = "mcl_core:dirt" + if not platform_material then + mat = "mcl_core:dirt" + else + mat = platform_material + end + p2.y = p2.y-1 while true do cnt = cnt+1 if cnt > 20 then break end if cnt>pr:next(2,4) then - mat = "mcl_core:stone" + if not platform_material then + mat = "mcl_core:stone" + end end minetest.swap_node(p2, {name=mat}) p2.y = p2.y-1 @@ -40,6 +58,12 @@ function settlements.terraform(settlement_info, pr) end --fheight = schematic_data["hheight"] * 3 -- remove trees and leaves above fheight = schematic_data["hheight"] -- remove trees and leaves above + + local surface_mat = settlement_info[i]["surface_mat"] + mcl_log("Surface material: " .. tostring(surface_mat)) + local platform_mat = foundation_materials[surface_mat] + mcl_log("Foundation material: " .. tostring(platform_mat)) + -- -- now that every info is available -> create platform and clear space above -- @@ -49,7 +73,7 @@ function settlements.terraform(settlement_info, pr) if yi == 0 then local p = {x=pos.x+xi, y=pos.y, z=pos.z+zi} -- Pass in biome info and make foundations of same material (seed: apple for desert) - settlements.ground(p, pr) + settlements.ground(p, pr, platform_mat) else -- write ground -- local p = {x=pos.x+xi, y=pos.y+yi, z=pos.z+zi} From 94a37790aa59c86aba613498fe4bf34632cb898d Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Thu, 15 Dec 2022 21:08:35 +0000 Subject: [PATCH 4/4] Fix incorrectly sized foundations --- mods/MAPGEN/mcl_villages/const.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mods/MAPGEN/mcl_villages/const.lua b/mods/MAPGEN/mcl_villages/const.lua index f99ace591..b844e6430 100644 --- a/mods/MAPGEN/mcl_villages/const.lua +++ b/mods/MAPGEN/mcl_villages/const.lua @@ -51,14 +51,13 @@ schem_path = settlements.modpath.."/schematics/" -- local basic_pseudobiome_villages = minetest.settings:get_bool("basic_pseudobiome_villages", true) --- Existing bug in which blacksmith foundation is nowhere near as long as the build. Figure which is needed and expand. settlements.schematic_table = { {name = "large_house", mts = schem_path.."large_house.mts", hwidth = 12, hdepth = 12, hheight = 9, hsize = 14, max_num = 0.08 , rplc = basic_pseudobiome_villages }, - {name = "blacksmith", mts = schem_path.."blacksmith.mts", hwidth = 7, hdepth = 7, hheight = 13, hsize = 13, max_num = 0.055, rplc = basic_pseudobiome_villages }, + {name = "blacksmith", mts = schem_path.."blacksmith.mts", hwidth = 8, hdepth = 11, hheight = 13, hsize = 13, max_num = 0.055, rplc = basic_pseudobiome_villages }, {name = "butcher", mts = schem_path.."butcher.mts", hwidth = 12, hdepth = 8, hheight = 10, hsize = 14, max_num = 0.03 , rplc = basic_pseudobiome_villages }, {name = "church", mts = schem_path.."church.mts", hwidth = 13, hdepth = 13, hheight = 14, hsize = 15, max_num = 0.04 , rplc = basic_pseudobiome_villages }, - {name = "farm", mts = schem_path.."farm.mts", hwidth = 7, hdepth = 7, hheight = 13, hsize = 13, max_num = 0.1 , rplc = basic_pseudobiome_villages }, - {name = "lamp", mts = schem_path.."lamp.mts", hwidth = 3, hdepth = 3, hheight = 13, hsize = 10, max_num = 0.1 , rplc = false }, + {name = "farm", mts = schem_path.."farm.mts", hwidth = 9, hdepth = 7, hheight = 13, hsize = 13, max_num = 0.1 , rplc = basic_pseudobiome_villages }, + {name = "lamp", mts = schem_path.."lamp.mts", hwidth = 3, hdepth = 4, hheight = 13, hsize = 10, max_num = 0.1 , rplc = false }, {name = "library", mts = schem_path.."library.mts", hwidth = 12, hdepth = 12, hheight = 8, hsize = 13, max_num = 0.04 , rplc = basic_pseudobiome_villages }, {name = "medium_house", mts = schem_path.."medium_house.mts", hwidth = 9, hdepth = 12, hheight = 8, hsize = 14, max_num = 0.08 , rplc = basic_pseudobiome_villages }, {name = "small_house", mts = schem_path.."small_house.mts", hwidth = 9, hdepth = 8, hheight = 8, hsize = 13, max_num = 0.7 , rplc = basic_pseudobiome_villages },