From aa2693795d6ba8610f8807526e4d003d0c2dcb04 Mon Sep 17 00:00:00 2001
From: epCode <64379263+epCode@users.noreply.github.com>
Date: Mon, 10 Oct 2022 13:42:01 -0700
Subject: [PATCH] Add Spider Jockey

---
 mods/ENTITIES/mcl_mobs/api.lua                |  13 ++++++++++++
 .../mobs_mc/models/mobs_mc_skeleton.b3d       | Bin 184408 -> 184760 bytes
 .../mobs_mc/models/mobs_mc_spider.b3d         | Bin 52909 -> 52909 bytes
 mods/ENTITIES/mobs_mc/skeleton+stray.lua      |  20 +++++++++++++++++-
 mods/ENTITIES/mobs_mc/spider.lua              |  13 ++++++++++--
 5 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua
index d0972d050c..d09a9adfed 100644
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@@ -467,6 +467,10 @@ local set_animation = function(self, anim, fixed_frame)
 		return
 	end
 
+	if self.jockey then
+		anim = "jockey"
+	end
+
 	if flight_check(self) and self.fly and anim == "walk" then anim = "fly" end
 
 	self._current_animation = self._current_animation or ""
@@ -3459,6 +3463,11 @@ end
 
 local mob_detach_child = function(self, child)
 
+	if self.detach_child then
+		if self.detach_child(self, child) then
+			return
+		end
+	end
 	if self.driver == child then
 		self.driver = nil
 	end
@@ -3807,6 +3816,9 @@ local mob_step = function(self, dtime)
 				_locked_object_eye_height = self._locked_object:get_properties().eye_height
 			end
 			local self_rot = self.object:get_rotation()
+			if self.object:get_attach() then
+				self_rot = self.object:get_attach():get_rotation()
+			end
 			local player_pos = self._locked_object:get_pos()
 			local direction_player = vector.direction(vector.add(self.object:get_pos(), vector.new(0, self.head_eye_height*.7, 0)), vector.add(player_pos, vector.new(0, _locked_object_eye_height, 0)))
 			local mob_yaw = math.deg(-(-(self_rot.y)-(-minetest.dir_to_yaw(direction_player))))+self.head_yaw_offset
@@ -4094,6 +4106,7 @@ minetest.register_entity(name, {
 	on_die = def.on_die,
 	spawn_small_alternative = def.spawn_small_alternative,
 	do_custom = def.do_custom,
+	detach_child = def.detach_child,
 	jump_height = def.jump_height or 4, -- was 6
 	rotate = math.rad(def.rotate or 0), --  0=front, 90=side, 180=back, 270=side2
 	lifetimer = def.lifetimer or 57.73,
diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_skeleton.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_skeleton.b3d
index f4ff18e25d0c956410b2c5831f383d2616a6f7dc..b390fb310adba6fb892b959bcab17afd1a12bdfa 100644
GIT binary patch
delta 3765
zcma)83sh5A7Jc_ZA|UcnAz&);-?1P<5{f3kd;X^M=Vy(|_^BWtJ1#%99ko)?7X{a7
zYg-lcs>@c<qB5oONy5Vd2@cb-3|3&A+SIAvb~&x9)e&n|h-S`7UP@$Kqi?Odl6TI&
z`<%1Sz4u+mfxdNz`YI<*)J?AH*sd&~+K%d?7x#pG%;B?Q;?!xAr+l4kKEKB}mXw&I
zTO_p@ro7oW?swk`OUxt89483gG5)T|FMBI4(fLEX-tuZe!yzD08?V@|mz)#I*dU7+
zhre^*6Z!bhMraR}#_RhHdA;!?!0s@-W?%E-7sB%VLly!U9Ee@{!#e(hg*95m#xZ)f
ziHf!|0C(LyY1b}j5EhgMSbd4J&*t;`eNj5$_%r&#nVGi3fc?6@f77h;qrxX!(yhM4
z?O|{5?baNfdGSbn`3Hw>M*#aw=ai-?1B->yNq>5Xx1uADe`?rXT}EGVuwMQCW!q5z
z|E1sBrdRXw1?77mKScam;ViyVc|v#XYPh~NrJubVuou!;Q&rGZA=z@;`oP5tI56=w
zV<+)%XJ66PWhwMa%0}A%3|Pm2Pnv|((ZV}#|7djq4hLcbHf#CzAbXdt`oS$-YJPHY
z#?>*TqIkx+SOxa!n0d?93D73i8bLAw2X3n|)cYmze#{j?)a<vBL{B!dwUOjZ;Lrrl
zpi(69Z7f4YhLe44t%?+q&zMU^V#x{?8%1>FWhpa?438ddbcp<|`o2Qz>T5N_I1|sw
zV^CX>!37+XP8JzDAj~0_sUqsYk+OLfYfB`W2t<d-radyUj9t_cRW!OTpZ1W1%P#Cz
z8q0i&s3NY&uG+tO_^~<TSY;x(yt9_bv#=FLw~NJSNx&Sh9c54HmA=a*x=TorlS-30
zP<BHvthZE+w^Zh*Bf7*28QKY|IBvWId%(nNVEDs0oDt5SJb%WvA?TEC%Z*4owxwM%
z>IiNh_GUIoCJt7a4KnX$|H>wskgQF1sZV@!l0T3Rw6cI45~Iup+Z$t9Tn<^FSZ<pm
zg|Pj3M6H+(<_oMc2l`mYvhqnJi_aqgAq&8KZ%A`e5HN^!EG(DAC}x5!lj(9v7Wt5s
z<dWGm>lkY<AcF$$6u;TH61)SX&^)4vR*1E8q)?_=0xM+ddJ;@FV0J21{AQ8w0w|{P
zb8K@G?$33#bJ)#QBqDkYIDZD`LU8^EoVXv~0-k=%z7pDVPj-C|E^O!;w<}ZxSEo#g
zv#_B+3A3gxBB}xCLc*)y!iKJeXw}O|1Y4g=0>-0EH^GA~1&<UQ@i||&<6RqSPvn6)
z-<AV(0v20pa+l*4Dl`W;(2hr2k%xV7xVJ!TDmQQeXnhgt562p21AhMK<|ORlm(ssQ
zB47`HQ%R<UckJCTz8hB3>&5AY_wzHXek`GqsQc|KFErc*vtzYiaww~+g#O;j2{yKY
zX|}55Q$pGKN^&~z+rIaWmz^R%gITIzB`ju_s$jpSR0TH}S6>G`kSjcHyVI!Y7Wp;K
zK@Ck&Cm=DmIaK+TF&fP8rjKs;tIb&(%C=QOWaaisV`rDht4fj^{>hrENrqzTvkpUl
zw^vH8AuA#j{ZS`oIthK)2F1?%#bghk5G**VFV*z8*o~7UOmx2k9OYfQ>i7D4P{G0S
zB14zUuH7Ne?GJO|ui1;mowdvd+wF2`i)C!s6JSevc*VyO@9Y6T7Q0KvVzKb||0c}b
z*l8YR9tYm-20sCoz0^XQA1P`nh}!MCsQvIEsv*DT=x)Ftdm4b){SRT~=0T&}4Un<O
z>vWyb9_Yb7D{x#77>Nsfh`U^8wWU4aUaLYp_$ZgWKsL%WyRnudXSMj<pWAzJ$=D(p
zTY>oj7S9#L;$p&uH~?@|#um!hdF4f-p$oux&dl#c>;-#?8)RZUc>ZUF_aaUKtpCxo
zT0Du6*P8^cXfLmvgvdK(FrH1m#J(ACk~6Lc?0rZWPb*)ncdMZI-s%eEgz>a`#U}}0
z-ogNxn6a!=ME!iP<oK<?fdb(n=8e}1YWhK(AbI$IKa9T<P;A?tyEX00siS#3)y_)0
zPZ7K^NawnVq$YQnO+^Q>3Kb1!V-z%s-R~wreN2h*jYjiFEW}A-LPlZk5XJ;HT^YL`
zMF)$fhm5HF-RD};j?MD7{lo8w1(&7ws|&8DVXhsHY%P+a@`$aFu^#eYFB!;d2MC8)
z6ut|vb-l6dSQJ$y-UC;8Z<jk)(@0+$)cFpEWXqjoFf}Exh-jMN{-`5G6;Q-F4!~vA
zv!O8a`v*B*u{py&bLr{ESFXpUc|Hg)L{t1ANbjUmNv(MBRjX|R+n-C-i$!r<{igm~
zYH%O8z|7bF)Oh{2#WMW1=jwsfdTV5Y9jJ?BEbfE*fSvpZY_g2qDr0dQAlAS%&r|jI
zeX<#KcluBagK%Em$IBGo$XL|<0lSe-Rne)kt3Y<4%+%3pOJ{5Is5;flj!PM96yyX)
z_!Oh-MS&7y;Yn@^xO6t>QO~sr(?*8p{(j8T^oz)!cp&lzK!)#{IR2Ye8Fu^pGpYAh
z#@bNf8rGdhCxgJkB6?iyCuk{~zK9NInvJv%HFNkfG{}^Q%7LP0xJA$rq>MQ?(pWaV
zjVj|!I?@m&pciHEN`dO*1hnHaL@D6$%n!iod)Ug^fkiZSS36Zw&Vm7k;d&7ZX&k9=
zyWH3A4yme;rr_P+ry4p>(IT!h_^}NZs%C#M(_qEjnDs_~Hsd&?zRye($kXf#GtE$R
zj`}erfR)x!jg)SoS%hUt)L(HSyQO+5tG3eNftbhV@LJ5yTLFKWj7k~Ew%1ZkU?yie
zI5)GUdNo^E3!b8Dd+Swfs2Kt}Y9ZivWK=^GyKDs{a=_riShz%E$xfCk(L(q+A;G+x
zx`alJd!96|jxLW>nyNW&tZtW?4ndKXN>dHT&9uOKOo&%!q%+kZ1f(XPdZZ2lsWHlv
t$jos~?g+tNrNQ9l3&s@&j|sj~W_GEKj#6^43#k?3qwI0*ZrL&De*x0&n3Dhi

delta 3166
zcmb7`4^WiX5x~Fq@DN0hBmBPzC?nb)3fvuH`1gHUoZ!T&(=p<o)*?`d(iwD;*jO=l
z4iHVy7=*BilZuIdP?HfjI6stwBh{#AA}BM;G_{h}P&J6LRunkB?%sVD!AWMCn|T~>
z_xE=9?e2T;n)mzk?DO%QH&36jq^rWSm|yN}D1GTezoP<u*3VnCIAi{%*^SpeOo?N!
zG=_D^8snNxyv@h|UsC@PU8BPxN;CvPl6nV?;<s0l6Z~(@G7MO@Tlb@ZwH@5HxVcAK
z*rsb@$j~76ZoW~x6DR7-Z_P5ie51Ve0J7!!3R~L0&q{A?I5URbe63hqmi0GX-}zXB
z`LB`2wu1<3s)uZAZ#GCvcmC2s2Hj(R)JCypqojAl%`oJ4?`S)O?CkH7+V?#EK&o7|
z*)lqa#PYS`YcK86_g6<6J~dxzt3`IT&#UcU2AHJVfrrM}y{TO;CKR^lZ^_2z3>&6;
z+YTeVbZ=$*!1Se(-qtb3@cG{PV%N|$eS6Y)!?wbywj;=T?XGRVSf-OYJiZ;n-aI#3
z%z5x%efPy7{X4088zp|-)yDQkS0+mnIv!X?XSgPFrnqpzX~FQ><$k^I`qav-zL_ej
z(6UBL-&`yZJPcx4EC?0{<JVTG4QAcX>Eeat5LKf1)!pRO(@zZI1VO0$yf2K^LTv~u
zVP`-a%Cu|)WQ8(4TPT-@vgoiW$vsB#UW<=(VdHJ{RKX-V97gAe=`2llps@wenZPt^
z0aY~o6mc4iB(TUJqW^i(MXJx1CSUSM6c0k9jzxPPKjWGng3fTJnc$`h&w@$E!Y4n$
zm1MA5F<7Xqrfk0ealtGkXp*8zS5%bT6!^W4g{Z?7RfeKE3UMg*rEuJVr$d~c>77YC
zAXn-cwKa6+uq4(DU+1uB-__bvi5_S&uxW+t14ZkY#xJMLCVR~~l{gN?p=QX=Wf7h$
zQC6gd(p<KB+Mlf}WWS(uV$<%OZSF+T_ss1^aj^1Ft&5QT8ph`_1KS6wc`U+jGfEys
zol3-72xqPE3d&TOD9eQMJeJM&Kz|-v#-(F0V+(3Fp(a!=_yda!^WJjY<;w!Q-el2<
zMrC>eT~prN?%l4};L-uy5uLAMWPLHrlTeh$Legkg4^c&@sZ23rRm`~SN@nii4#>=X
zWa%`SkevwEb6CjS`>4uB)pw|(!}B(({K<o2hAHha3(X88OD+eIrE1bf0-$C+)4;o%
znU^n>aig+cc1EZsulEqABSFDWg2FteQIVDV;A3KO&N3d63r$R-GJaOa7OT7WY<*z_
zlV4Psnf(5yEQ<%cSI?gJKT?wX2&Fx*dnBo2vyYD>smAYK?!=T%6#piq>f{p!YwFoW
z?;AdkQ@*hq#l<kEfoZ)9;(J?;P8+~p=&i$8w>4lD)4|$+t)i{4r$mkz#W(EX);8!z
zTJ>d{{rDs&srIa>OZm^RQ4Fa{vUa}FkmT=l3AtuAhb@smGP7MlP*cw)LT4TGhZoP`
zpC6_xDsaoI22D2qxf3P4+8WhLCaExge0{lL2!sCQNNMtj!=~G<umMh1X!KWD>V<X4
z(!Td0JLGWaDyz@4=Z((@tA2)o_kRXkt+4860$clIk-<;EKgNFW|FY24!A>n7lf2hl
z$@>@+Vs~8E?Hyw(YHXrkeVS-uYsRp>W|(xIg~xU4_B|sX?XP%@jVrp3U0pym_x=Re
zt;8Zv0#h>!gswU^-uo{USM3$uekZ3cRhGNO2Yy)Y<+}yZVMOTwuYmOpEF`Q<!R@FL
z4qwsHd0jzm^wdLItKxwUEP1CE>uKmUyW56Z%!GERZLG)+p$j^&&USoi$JcF#4(@Nk
zzaFn<ceDo;7j$q}I#rY1D)*{SQALqa)3$?j0k7#Dxatu)qX+G%ocR@_7fpW0&SVXI
zZfD`JDwGGXVHmKpFxVBwRRQ=^2&P%BDSEoz9=+I+Zia}*_{dO3hH+Zwno<^qaB6W)
zY2$-9J?xs&-bi~47KQQY>>=5o?oFYSiDLu>drw10HWUf)MHr7)?wy!$PWO&nuz<@N
z)#Ixd+U7y$0<M9*`P^#_{rnk0*{_b@X&rdb)HL;h>uIC>>MX(WHq39aaZXEFz}seu
z-%jflcFHI=QDJ|lu(Y`+$YwZw89!3Qv`L}oLR<PMcXW2hU7BLTs<4y+GBIbAJ2#u4
zuzMAj(nH%A&5}(TNtR&OKDH<@^#bKV0&PCm_?Z+jCDVQtX5{k-Rs}Wr-1Pvj1djrq
zfeFkk;3qWjasiL2?&6;Cg^9<o1F)okYr$B;y%>l30v^o{IYs!x#oxrW>@b*05Qr<~
zo*wm$F2q?jbf!#UTPcrq7VDsVqm-x8BQd3kuVR;BOB2_s9!I>HG7h#jVafKL<X+I#
z#N*j7fLVB!>TXPbsuz4?LEZN!_&B-P!n2vLx394OA2}TjMUK8ywR5F!&t1IZy@cp<
zD6R&zjB9VPnAAYm+FqHDgB>#WQoVb7Pf8H1X~CFJ%X|jg4tHdX;U<f*hPq;iCpNVi
zS#?Q?HSDQ*+>r@~0I;E%m#C_CX<8?{%m<#}bJ+LtuTSuu!774=;d&>Z?n(bf=|O7Y
zQ4^`T@MFT^l2B4Torqv?A<pJ;B9bDZ7Qv565Z-HaGVu2<K7k9$gtG1#rAMvVWr0d8
P2<<3|wYd1~OFZ^}dRNpo

diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_spider.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_spider.b3d
index c77d36cf3b4de2002785108d88ff8ca89284f234..0d71f637734281a04e702330e86dfdb7ce3a7fdf 100644
GIT binary patch
delta 7021
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

delta 7021
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
L${roD{jL81m3aa;

diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua
index ce80a680b6..3954edf685 100644
--- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua
+++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua
@@ -34,7 +34,6 @@ local skeleton = {
 		"mcl_bows_bow_0.png", -- bow
 		"mobs_mc_skeleton.png", -- skeleton
 	} },
-	visual_size = {x=1, y=1},
 	makes_footstep_sound = true,
 	textures = {
 		{
@@ -81,11 +80,27 @@ local skeleton = {
 		run_speed = 30,
 		shoot_start = 70,
 		shoot_end = 90,
+		jockey_start = 172,
+		jockey_end = 172,
 		die_start = 160,
 		die_end = 170,
 		die_speed = 15,
 		die_loop = false,
 	},
+	jock = "mobs_mc:spider",
+	on_spawn = function(self)
+		self.jockey = false
+		if math.random(100) == 1 then -- 1% like from MCwiki
+			self.jockey = true
+			local jock = minetest.add_entity(self.object:get_pos(), "mobs_mc:spider")
+			jock:get_luaentity().docile_by_day = false
+			self.object:set_attach(jock, "", vector.new(0,0,0), vector.new(0,0,0))
+		end
+		return true
+	end,
+	on_detach=function(self, parent)
+		self.jockey = false
+	end,
 	ignited_by_sunlight = true,
 	view_range = 16,
 	fear_height = 4,
@@ -93,6 +108,9 @@ local skeleton = {
 	arrow = "mcl_bows:arrow_entity",
 	shoot_arrow = function(self, pos, dir)
 		if mod_bows then
+			if self.attack then
+				self.object:set_yaw(minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.attack:get_pos())))
+			end
 			-- 2-4 damage per arrow
 			local dmg = math.max(4, math.random(2, 8))
 			mcl_bows.shoot_arrow("mcl_bows:arrow", pos, dir, self.object:get_yaw(), self.object, nil, dmg)
diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua
index 9a0f49395f..e94f804d65 100644
--- a/mods/ENTITIES/mobs_mc/spider.lua
+++ b/mods/ENTITIES/mobs_mc/spider.lua
@@ -14,7 +14,7 @@ local S = minetest.get_translator("mobs_mc")
 minetest.register_entity("mobs_mc:spider_eyes", {
 	visual = "mesh",
 	mesh = "mobs_mc_spider.b3d",
-	visual_size = {x=1.01, y=1.01},
+	visual_size = {x=1.01/3, y=1.01/3},
 	textures = {
 		"mobs_mc_spider_eyes.png",
 	},
@@ -44,6 +44,7 @@ local spider = {
 	xp_max = 5,
 	armor = {fleshy = 100, arthropod = 100},
 	on_spawn = function(self)
+		self.object:set_properties({visual_size={x=1,y=1}})
 		local spider_eyes=false
 		for n = 1, #self.object:get_children() do
 			local obj = self.object:get_children()[n]
@@ -55,6 +56,14 @@ local spider = {
 			minetest.add_entity(self.object:get_pos(), "mobs_mc:spider_eyes"):set_attach(self.object, "body.head", vector.new(0,-0.98,2), vector.new(90,180,180))
 		end
 	end,
+	on_die=function(self)
+		if self.object:get_children() and self.object:get_children()[1] then
+			self.object:get_children()[1]:set_detach()
+		end
+	end,
+	detach_child=function(self, child)
+		child:get_luaentity().jockey = false
+	end,
 	head_swivel = "Head_Control",
 	bone_eye_height = 1,
 	curiosity = 10,
@@ -65,7 +74,7 @@ local spider = {
 	textures = {
 		{"mobs_mc_spider.png"},
 	},
-	visual_size = {x=3, y=3},
+	visual_size = {x=1, y=1},
 	makes_footstep_sound = false,
 	sounds = {
 		random = "mobs_mc_spider_random",