From 872b9f258fadedc06940ba832d479628afe0c54d Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Sun, 24 Apr 2016 22:36:47 -0700 Subject: [PATCH] Sheep model update. Fix broken walking. --- init.lua | 18 +++++++++--------- models/sheep.b3d | Bin 51023 -> 56567 bytes 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/init.lua b/init.lua index d6a4b36..06455a1 100644 --- a/init.lua +++ b/init.lua @@ -163,7 +163,6 @@ drivers.roam = { local pos = self.object:getpos() if vector.distance(pos, state.roam_target) < 1.0 then -- arrived (close enough! - print("arrived") state.roam_ttl = 0 return end @@ -174,17 +173,19 @@ drivers.roam = { local i, v = next(state.roam_path, nil) if not i then -- pathing failed - state.roam_path = nil - state.roam_idle = true - state.roam_move = nil - self.object:setvelocity(vector.new()) + state.roam_ttl = 0 return end if vector.distance(pos, v) < 0.3 then -- remove one - state.roam_path[i] = nil --FIXME shouldn't return here - return + local j = i + local i, v = next(state.roam_path, i) + if not v then + state.roam_path[j] = nil + state.roam_ttl = 0 + return + end end -- prune path more? local ii, vv = next(state.roam_path, i) @@ -280,7 +281,6 @@ drivers.roam = { print("no path found!") return end - print("going to: " .. dump(pick)) minetest.add_particle({ pos = {x = pick.x, y = pick.y - 0.1, z = pick.z}, velocity = vector.new(), @@ -491,7 +491,7 @@ local sheep_script = { }, idle = { nil, - {{x = 111, y = 119}, frame_speed = 10, frame_loop = true}, + {{x = 111, y = 129}, frame_speed = 10, frame_loop = true}, nil }, eat = { diff --git a/models/sheep.b3d b/models/sheep.b3d index 6eafb64b1353314ce8cae48c9ef1d5fc67d1abde..4e3ae7c2e5a03254cfe1c39eb0a5f809486c688b 100644 GIT binary patch delta 2888 zcmaLZ3s6&68USEWpimP?1`sgfMFeS!Aml`;l;rvVR#Z^5>*`j!=uk>$cM*Z`%!4F6 zS4xFb77@x@tuG25C=W@nEjz$ksaju*Qgusf9T3E+7V08*6dyHtRM&{5j-N%?egCx!WKglCa76#m6FH z+~SJh7|CmFbY80ATdP%U3NAh-5+?2&lWu<$$bPrM+K^Z-X64wwajuvBDe*GZw1jQD zp4~ljz?V&hU&OTkk9k{Vo~;r#?)hu_X}KSp2JdsP*F|O@iCAwzpT2lDfK8|0`dVgy znP3*E0F|H$RD;=|2GnxeaC85ci0GPfxVdAy)+pSqwG9}HQJl}2RkQQy0v)NS>#^RN z84?$_=>np!X8O2`z9#R+Ytc^J+ zm*a>R=Qw$D|CLl!m^(MkCU3ftoK5IN!SOQ z5kF+Mf#|!=BiBJ6g9G09DYJ(Cw4SUuX+Sn(iwyOACF}4TQ!tGZbibCIYWf^S+u9k5 za4l{9NpUr)E9^tLE56qc#Hd)IvGqf4!Hg?zT7am#l_X^7OY}6XP2Y#7XzN23737%Y zDq3Kv(+^~*Sw~~*-`cOzrGFcy8&wwlSetaA{b%{(<h&Uv>Z&bu#?s=7+@P@k^*|yO*pP zchCW%1I9?k%6X__wX;kUs$`cLr}1I%9`hkHZJ>AL1hF~#RBV6WQidJ6T%Anw3%L4( z#D|WEn~H8o@f%$pvAVxKBWcU7h>zcEl>W|F%`P|gno-{JU&jK;ekS>TdhyP~`=zHV z)vS;4*~x$a^RuRb22RhAj?Yhumxa%S;GQlI-i~04RwS(uKf37?LPon{c{KG2T74~( zz+^B5l!K{Y8ki1dfSF(xr~s9q3RHvHpa#@(Li+huL>?$|A^jw1qj<$dmr1HT4;AfI zyn*|*9>SvOL2~Mw0wj_sL;R=ItQFpu>xfUZ3aooNc+zcnsm{gOw7{A#`^k~M5+qrg zBz*@*>KOjB>R!ToyByW2&Pi)=|M_eFxuUDa>{!wZ078PrYTWD_R*4gqEf9NKf z_v=u;z(L01E420a+D_8qd<<2s@{|?e8T!rc9qq(-%?T7S?k8)qtcbMZPj@7B2t@4R-B1bL2%bjkOH9blZYFnJ}48d<8lXW>`M1QgqaQ}d?ZhRH*_q9?C4?96qjvrMLxsJH)iD9 zG$Z5Qd=LIxA2pI!!n@F}V1Gjbo}`VEsv1a8SvNYd-OKO^b}wM~75sYQCb)o3t#&qK zaM45_PZ_G50MEo#RT@i{6g-xN0`G2+7|4Rf3%={)p7d2hf$G8+u$@;K4uB zca+%N8brPK8uj7$Qh|$k*%g<{$;HjrP}$-A`ZIXCfZ+{a`;ZhT4xyUxnQrV==)tpO zOG#tPF#6(_PdC|C2vHL`2fWc~Di&2Eq7C!nyG|lfe{F4yJ->U^K1!kG-FfO0SuOas%w3@{VS0u`VV zRDo(R8`OYWPIwhsU@nQB+ltEfU@4jsm*KMtTlx;BDA^pPm?OD4N;OAm<|y49WtgK( bbChL{6y`{2j#TDIZH}_dk;WWpP0@b<4(e-* delta 2088 zcmaJ>c~BEq7zYIknk_~M1cKeDP^?j`ekc>k?gr!#i+CH3po|ArZN)OqIA|bPQLu7| z&x%qipok+P7Ct$&B!F5^K>b52UP!%5QR+?A+TEB~2WQ-wot=H}oA3AD_dA{+>U%c3 zuU%ju1cjc+wNv-8JyAI^(#<)+N_dtBMob9`9zEa6DsW0r6p2{nhHJmo+V%-@!j8lc zCp%%cS&G3M)|=K^vdwE}q&Rx_I@4NRnR%^AiXKg?O>5ha|6i9h%~ZEp6CrZmavlTQ z(%{cH-LE8CBPTij_6|>dlk0t6=s6qmGFqlA$+&>CPU+x9oyah)P0!i#hx|Hz2d7`( zz$}WN)Cgb~V0n$(FX3Z45ta>3G{lp34NVR0yn@+n3!x#U%CLjZNbYIm++>#G~n&RtpP4;4Tkmu2~@;jH4=-RXy{j{*f}J=kmk&%(x4BI^9`e zYJ)y9d*$ppERvN%zgBNnOy0!M)OATMuF&m)dvT-Ka-z`EqLqo4aYE@*XgxQYC9}11 z1E)d7Ok@ zL#}A)g*D-SU`u%v4D7IG>mDR?p61ak$ON{x%!|+7#w_tPIGA~nnV*-!d6{daZ|pv( zO-;X#(P^Qu_eKd5O6JD8N-QEcr|QCtWCrGJn#b%T8)IqF>;2u>wI5(i$ZHj;iIt0& zuYQdC!xYfG+T!tCo8K@_;Xp4 zFC!Er)Zc?dXzXorVs-u`!C$V=>}kca>lr}%CaX+d=S#P3FK!4(2xBasvmCS_su@Qd z$%Ljl5i`}C077jOuk7BnYno5u_7l0_H#m`5n5F0J%zcN0)BCiL9t~w%l2XMK61mD% zV#$x4VU5^+p#V0W>}1B1a1||DrK!i%tYX+Oz>y^@RdVG6^&za1?1rMTL)eUCI<6lN zkjEcp9kulxfaTzt8MQcExd$R1jAU!bIUdNeBgiR$m(y8ZPO;>biWYZYzKmT>OZX(@ zB`1Uh(WzwO>_Jztt7j4P7o_=vj{B5MRmrH9@z*ibZ$3N|#7$Ben#y$Vz@eF1m>`&d zlruErk#P&tLT17evsr{V5QcXDy`fpI-J-mQ>D`l{O|aU(DcnF(tYvBO(}|DJ`o0g8nLRHtkzLDr5M#8xjXR$aq@9(EABA1S zoqnqzP>7M!dQK|zCoVD04)16r5Hr+M`0GWKDcaqSUPnz~G-UA6Msheg$&Ya+GgMM? zod4=oQl*dQEp!|?0VG0t@?-kUOiI>!q*yNd?Ak4y)xg11A(e?*?dohH_3foQN0-=$NLzUk!@;Px$aE^K1tsKd!~CD4^-&5A!eXbh5jA;7NEN;jac#` z56Z?#jH#qs?W(rys8-aYVrl`<9oEJ}X0Ho(PvgDbThPrmhwRRt-t})S&ifU;1ARsR0mM})_W%F@