From 302b18833a0a1a439c88f2ca397eb1b3ad968ad1 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Wed, 26 Oct 2022 04:05:24 +0200
Subject: [PATCH] Add variable interior for nether bulwark

---
 mods/MAPGEN/mcl_nether_fortresses/init.lua       |  11 +++++++++--
 ...ther_fortresses_nether_bulwark_interior_2.mts | Bin 0 -> 1170 bytes
 ...ther_fortresses_nether_bulwark_interior_3.mts | Bin 0 -> 757 bytes
 ...ther_fortresses_nether_bulwark_interior_4.mts | Bin 0 -> 882 bytes
 mods/MAPGEN/mcl_structures/api.lua               |   7 +++----
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 mods/MAPGEN/mcl_nether_fortresses/schematics/mcl_nether_fortresses_nether_bulwark_interior_2.mts
 create mode 100644 mods/MAPGEN/mcl_nether_fortresses/schematics/mcl_nether_fortresses_nether_bulwark_interior_3.mts
 create mode 100644 mods/MAPGEN/mcl_nether_fortresses/schematics/mcl_nether_fortresses_nether_bulwark_interior_4.mts

diff --git a/mods/MAPGEN/mcl_nether_fortresses/init.lua b/mods/MAPGEN/mcl_nether_fortresses/init.lua
index 4375089ee..57d9dbd8d 100644
--- a/mods/MAPGEN/mcl_nether_fortresses/init.lua
+++ b/mods/MAPGEN/mcl_nether_fortresses/init.lua
@@ -36,8 +36,15 @@ mcl_structures.register_structure("nether_bulwark",{
 	filenames = {
 		modpath.."/schematics/mcl_nether_fortresses_nether_bulwark.mts"
 	},
-	daughters = {
-		[modpath.."/schematics/mcl_nether_fortresses_nether_bulwark_interior_1.mts"] = vector.new(5,0,5),
+	daughters = {{
+			files = {
+				modpath.."/schematics/mcl_nether_fortresses_nether_bulwark_interior_1.mts",
+				modpath.."/schematics/mcl_nether_fortresses_nether_bulwark_interior_2.mts",
+				modpath.."/schematics/mcl_nether_fortresses_nether_bulwark_interior_3.mts",
+				modpath.."/schematics/mcl_nether_fortresses_nether_bulwark_interior_4.mts",
+			},
+			pos = vector.new(5,0,5),
+		},
 	},
 	y_offset = 0,
 	construct_nodes = {"group:wall"},
diff --git a/mods/MAPGEN/mcl_nether_fortresses/schematics/mcl_nether_fortresses_nether_bulwark_interior_2.mts b/mods/MAPGEN/mcl_nether_fortresses/schematics/mcl_nether_fortresses_nether_bulwark_interior_2.mts
new file mode 100644
index 0000000000000000000000000000000000000000..b73a5a59045f9c7b369c900114c32336099b7f1f
GIT binary patch
literal 1170
zcmeYb3HD`RVc=vCX5g&H1PlTU8o9|i@ku#}$=Ssv`FW{U2xfdzQD$;>d_jIrW^qPp
z3IlUuW)XuZy7I*0#GDcaEs$_=Nn&PEu@#s?G7{Y!NpvINmNUqpOMy*~FV4-+FUerg
zMwf+aj8D$UEKbcyO+mO;7uiKQiAlH}6kn2Gz@SOAat1Mw(&UWP;*w%3Fcn{%o0yZs
zpn%(X>6tkxsVNKwL|YP{l3$vXlgc0jwky9V)hazdCnYH-KRKI093+;KpI=mLm06UZ
z2WG}6#T#OmD2X>@P(ijA6iLW|0gK;?Id8*m2elaR@ZRRuS@Ubr<LAF#U&_vF)qQ1k
z&clkQV40`CpOdD;7RA1l>3_nGE#>x1yT*9dBCK+zn$u4n)4oW3arXGT9CmIW7JmD>
zCqVj?Zfa_4``OKZPhCC!yrBI=%(=bxPIDHlRQ~9-%q*_xZ9y-KXP3{_>uGjZP9K%*
z*s&_PyI(oHt9b9^qbnw8{+fPuPe5sO@0NFS-cQ)w6?V4NRcgk%n8T}A74DkmCNe!)
z)b7RPkXVjQXL&l7vF=`Xev`E2CXJL8g*i2B$La&_MjJ$4UZi!5@8=n(=aC8yzovX!
z)%)?%sl`re2h~Gdzen7V)VXu5Q9CH*6vtCupWylF8KFNX)Ogi8AKTRS>G$n*E3@A@
zSNUJ8=HajnxNNYX%;`{G53^F{|0RV!bA?S<CV4un;98-7w)?%n?^)a2UkTpS{%yBq
zS@E0R>|+;$m6Bakd^6Ygxzyj|T${g4wmn__yWn)&LUWVSa<)s$r}(dweY)9RgI`}M
zXZ5M-#U)pR|M(T&V>-_?^TE<G#a`yCi~Ai{iexSQ`Q^A~HuJ>;-G6`FDA4hHf8T2!
z<F@M3Fpeyz^9+f9S8f*m@*tgao@>Qsu8ESOb}L*THJ4fjDf++LcX|2ynC%_1Z=CMA
zANZW;v@Cxfe{@aL-A7z6Sbsj^IHqYFRr&Jrrf10v=T}RtcD~ww+0XjzmdpQEo7ScL
z4XclO?>ps2HFNa@-d^=B*Y7J|O4MzuSC!g&t+M_0>%7*#xm(-U{AOLPTcH2Te@)&t
z`M%joCK+Ajp6`7nt{lF-k>S*T!)>cyElvN({M&)&?}L`QD<;?P_J0=MFUP4201bHx
A#{d8T

literal 0
HcmV?d00001

diff --git a/mods/MAPGEN/mcl_nether_fortresses/schematics/mcl_nether_fortresses_nether_bulwark_interior_3.mts b/mods/MAPGEN/mcl_nether_fortresses/schematics/mcl_nether_fortresses_nether_bulwark_interior_3.mts
new file mode 100644
index 0000000000000000000000000000000000000000..0a4c054254075f04b8392e100db5364b6e180251
GIT binary patch
literal 757
zcmeYb3HD`RVc=vCX5g&H1Pt5^8o9|i@ku#}$=Ssv`FW{U2xfdzQD$;>d_jIrW^qPp
z3IlUuW)XuJNO^KbYH>-i6_|=I&P~k8VbI2HOmaqMacWL#3c@5Abj69qi8&yX^7BhF
z7$nhU;f`YvMVA6=WY7W$7ndYv78P58DI^b}`$7uMh`iL2jMSp|^!%I@1|g7Ka(+>&
z6^NUZlb@W;pn}hASlCp|c^i>k+@in}!?NZ2`@ehtz7EY+VLUAPE-?L6+Bx<Ulh!C&
zu!|I|zPK~ZV#hR{GVjHv%MKoyeEjO8iN>E9<Qo4jS#{B*KBB+Qdi${l<?A-Y{=b#+
zjB~~_j+B@(?^_lR{cFE9@Gr~GUZ*B|=;hArIjZfUSC7uWz2?=T+^*MVvulj@>;F~E
zz4NlB@q)?utDjdjot^tDp+~WB+P~YySJ&>`m5{V5D&mBE)$wUDUzNf+3*-MMxM!Wr
z=4n}$xIVLzSM$Eugx|$?vd>@T%<EO!6th+8XYjiJQMLB#Rv%usCd4Q$`FM}}F*#Aw
zEZvas<GRzzLjSJGI(4xuG`N<3dF3=Nh2p6qoip1`?~Spa|3+@jJAwY(_12FvgPSVW
zRQt?rzkap)KGXSitNHrh?!0Awa<R?ZRg>iBJ<a-c>yq2k3n6Q_XV|14&(<*r6X;zT
zd-VvzwOQ^8X+Pe*c=6)JkM$OJPR(n4_)j_fz>04%dJK0%W6nn34Q2oN{?2^o(yJ?0
ZNL`U$RJwll<JYNYWW^8iUoK?61OUSsT%Z5|

literal 0
HcmV?d00001

diff --git a/mods/MAPGEN/mcl_nether_fortresses/schematics/mcl_nether_fortresses_nether_bulwark_interior_4.mts b/mods/MAPGEN/mcl_nether_fortresses/schematics/mcl_nether_fortresses_nether_bulwark_interior_4.mts
new file mode 100644
index 0000000000000000000000000000000000000000..d7e23f0278fb2b5b1765efc93ef726f9efa49c7a
GIT binary patch
literal 882
zcmeYb3HD`RVc=vCX5g&H1Pr_k8o9|i@ku#}$=Ssv`FW{U2xfdzQD$;>d_jIrW^qPp
z3WFq0l?=>@nMDlRIOXG$Gct=)b5c_fhRL8SPApE$DTy!6&Cf5%U=RYyCg&HWTBYab
zq$K6!CucK=V$}f=1}n`;EK7_}%gHa#%u8nwftvspF3vA4N={`E1B+&)7MB!TfvNc7
z+{Bz5262#hN`8J(u~lYKejb<^pA>J1U7{r3kU<5cqqrn7v#8h#Od*9K+?N$|-cGw%
z)~vwOCdjpMcJBIbd#b-Oaxn_E2EDy$X}V>q8>jtzLnW4t3s=j^yW3q|;b{~eFSBZ<
z^wJ}$KX(OMWtYf2fB2}S_~{B={@%xXj%}|wCdIpoJ?SuqgBw#Pv+JCTRc`e%e<#lV
zJL#-_aB2FyrCyJ}1nNHa@GptD@#sY5mkAjjods12k8jOdZQ{ors&{;g`tSIn(q&S0
zho?4{uHsS(kMloe8hg0vSdvVIX81<FldW1|A~Du+lb_Fcy?kfaPZN{M9WhhqEnU3g
zt@)bkKkQUoeB4Y^3p+!e>g}{Dd-|$$<*6B~ulKy#&{ONb?$pwCvsz{+u5eNfKU{g@
z*_yzmg;6U$ef^-lZ|k93`=?iRn=Dhg{cY{)Nl&soLxq+FZMk-}<lL{@T%Z4L-BtDV
z-;}HmI|NVs+!15CWSy1NvWVi7TehwHqbD<a^`E+)cc-`6W*5fYU$1nqwC(NdTes5f
z4yPAi|6P46bNSq|Tg#<BKl-6y%sai|;;rv;2VJdREo=$OiqGBYJ11DYer?d=o!l2i
z_Bdxf$XfI!XnH8u!R<`nc!Q4eTzfsENp8pUqAfc@SFS2uIjN+o)z5G7TgmQs&!(Pj
z&v^GPd`h0z(c0WMf4*dzetSISf$zDgU9awnAGZseF+*V9;@@1mUKy)ug?!&6rYQT3
Jz2`6Q6aa`LmvsOD

literal 0
HcmV?d00001

diff --git a/mods/MAPGEN/mcl_structures/api.lua b/mods/MAPGEN/mcl_structures/api.lua
index d1be83015..efbe3ccb1 100644
--- a/mods/MAPGEN/mcl_structures/api.lua
+++ b/mods/MAPGEN/mcl_structures/api.lua
@@ -266,16 +266,15 @@ function mcl_structures.place_structure(pos, def, pr, blockseed)
 			local ap = function(pos,def,pr,blockseed) end
 
 			if def.daughters then
-				for fn,p in pairs(def.daughters) do
-					local p = vector.add(pp,p)
+				for _,d in pairs(def.daughters) do
+					local p = vector.add(pp,d.pos)
 					ap = function(pos,def,pr,blockseed)
-						mcl_structures.place_schematic(pos, fn, rot, nil, true, "place_center_x,place_center_z",function()
+						mcl_structures.place_schematic(pos, d.files[pr:next(1,#d.files)], rot, nil, true, "place_center_x,place_center_z",function()
 							if def.loot then generate_loot(pp,def,pr,blockseed) end
 							if def.construct_nodes then construct_nodes(pp,def,pr,blockseed) end
 							if def.after_place then
 								def.after_place(pos,def,pr)
 							end
-							--ap(pos,def,pr,blockseed)
 						end,pr)
 					end
 				end