From 8955af2ca20b539ef0c31cbcb590b1587c312ada Mon Sep 17 00:00:00 2001
From: D00Med <heiselong@gmx.com>
Date: Tue, 17 Jan 2017 06:40:25 +1000
Subject: [PATCH] butterfly improvements and '=' fix

---
 init.lua                      |   4 ++--
 mobs/butterfly.lua            |  13 +++++++++----
 models/butterfly.b3d          | Bin 0 -> 2078 bytes
 textures/dmobs_butterfly1.png | Bin 497 -> 440 bytes
 textures/dmobs_butterfly2.png | Bin 514 -> 448 bytes
 textures/dmobs_butterfly3.png | Bin 536 -> 445 bytes
 textures/dmobs_butterfly4.png | Bin 490 -> 454 bytes
 7 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 models/butterfly.b3d

diff --git a/init.lua b/init.lua
index 1a8c673..5a60105 100644
--- a/init.lua
+++ b/init.lua
@@ -8,11 +8,11 @@ dofile(minetest.get_modpath("dmobs").."/api.lua")
 
 -- Enable dragons (disable to remove tamed dragons and dragon bosses)
 dmobs.dragons = minetest.setting_getbool("dmobs.dragons") 
-if dmobs.dragons = nil then 
+if dmobs.dragons == nil then 
 dmobs.dragons = true
 end
 dmobs.regulars = minetest.setting_getbool("dmobs.regulars")
-if dmobs.regulars = nil then
+if dmobs.regulars == nil then
 dmobs.regulars = true
 end
 
diff --git a/mobs/butterfly.lua b/mobs/butterfly.lua
index 921de52..cbc152c 100644
--- a/mobs/butterfly.lua
+++ b/mobs/butterfly.lua
@@ -6,25 +6,30 @@ minetest.register_abm({
 	interval = 10.0,
 	chance = 10,
 	action = function(pos, node, active_object_count, active_object_count_wider)
-		minetest.env:add_entity({x=pos.x,y=pos.y,z=pos.z}, "dmobs:butterfly")
+		minetest.env:add_entity({x=pos.x,y=pos.y+0.3,z=pos.z}, "dmobs:butterfly")
 	end
 })
 
 minetest.register_entity("dmobs:butterfly", {
-	visual = "sprite",
+	visual = "mesh",
+	mesh = "butterfly.b3d",
 	physical = true,
 	textures = {"dmobs_butterfly.png",},
-	visual_size = {x=0.2, y=0.2},
+	visual_size = {x=0.3, y=0.3},
 	on_activate = function(self)
 		num = math.random(1,4)
 		self.object:set_properties({textures = {"dmobs_butterfly"..num..".png",},})
-		minetest.after(5, function()
+		self.object:set_animation({x=1, y=10}, 20, 0)
+		self.object:setyaw(math.pi+num)
+		minetest.after(10, function()
 		self.object:remove()
 		end)
 	end,
 	on_step = function(self)
 		local pos = self.object:getpos()
 		local vec = self.object:getvelocity()
+		local num = math.random(-math.pi, math.pi)
+		self.object:setyaw(math.pi+num)
 		self.object:setvelocity({x=-math.sin(12*pos.y), y=math.cos(12*pos.x), z=-math.sin(12*pos.y)})
 		self.object:setacceleration({x=-math.sin(6*vec.y), y=math.cos(6*vec.x), z=-math.sin(6*vec.y)})
 	end,
diff --git a/models/butterfly.b3d b/models/butterfly.b3d
new file mode 100644
index 0000000000000000000000000000000000000000..fcd7c4557a6b54f971f4735df873c2ecc4abd022
GIT binary patch
literal 2078
zcma)6T}V_x6rRj7?H{tA7eOkMC^I%Qsb<#AEv<G<*P`elibT!r$D)TGqH9V2(9c6@
zgfBj*k-D`)6ne)@3Zk;WqL&~fOAE51j0m#x-MQDb_2PEm+%q%h%$e_;^X<A^j;xsz
z7#qVFbLDULrI0n&2M-@APDxE&N_$QGt15yVY>>p8o8|6`VQiCs=e|N54wI2LEvLur
z%dUu08MfpX_$JXB??P$GdM`7_%d<YYA)U9;mPC`LHPF;W4c@L<zf@%Gb~?@TVSdJ%
zcDkMReiaSBeSY{gLH@Q#{?YPB!WXH&ggEAC+2fM!9?_-{qn8lXQ{cDvs~FQS=)Myt
z>YiHROZkIz-^Q=rLH(oUkA&|(^V__yFc#$J_;#Cc!3XdHGL{s3$avCmq|u~AKx2<}
z9BC{m(V9&(_gGIMolH83bgH?>I@6oufra26V+UMd^$~i=wLgs1Xso5X0>RZ?)eiZJ
zbUUqGxn8$sB)~@#3bZB^U`+r#&H)kv@DLP&a})s!u&@e@CQuOeC<fL7i(;@xVX!C)
zvcbL0*FujYpV>GK=a2y5hu$W=lQmUT@zt{MQ>DK5Oc6I5s~LgxK}@3=zsM0I9tG0m
z>xu{Z(Ql`@s)Y^3q9<1FD?gv}ORe#8$?@6J8{f*!dWT}IIM{)6<vjc83w=eROO}0o
z%gvtH#-4oQ=D&Ly^pCGL%IH76T=gx4;TGkC21$Pp_<3SqhyFNctz5bA9ap^##SX`i
z*3`(`??uVfyu~u1rjx7whhmYlffRR&%lmox^dwpJlgat>YPp(GDAwu&de@d0Cu$m2
z$cxF%dhhmfuI3nuwJ_Mt0t7s2643k~riqwh5fJuewL|!ce5HY4E3M^l5?=T*$Uy*D
zbGXJY2x+2?T$)e~*94l0I5Y|tO{gYo7HIsca0Mj9xgwz^Ktk+6LRdvYO++Fgu%of1
z>DPJjDL)_AK1F`Hv`X5M5RJl6n;ReUbk8~dp>n*u*0oHAlMrzhVbeP22+w<+C*^kP
zB}Fr&s&{1bai>0Zji{a0%?p!{>D@)obUPASgH68b5rNlz{QTWaeOBHLJ)DHrP@5_5
zlez0eLuwCq{wmhjm)+OHNr?J^7xv7d6tQ)|3ts=`rtV!nMuw9RB(Zw7r6fvR$f)PH
nVn6GT`sc}T5+WxQ@!xmc;dLD+c%O`wmEGymj)Yd;@LBu?Wmw-L

literal 0
HcmV?d00001

diff --git a/textures/dmobs_butterfly1.png b/textures/dmobs_butterfly1.png
index 3a5e432c36b754079602d8285f24568739c5ee54..fb037908515e8e880d5ec60c8f9cbbafb99b5a94 100644
GIT binary patch
delta 428
zcmV;d0aO0*1GobriBL{Q4GJ0x0000DNk~Le0000B0000G2nGNE0KmP4evu&<e`-lY
zK~yNuZIV4p!$2H|pIj4+v?-|;LX9Fsut=ekgXmIM7c)8vegmCd9bI+o=ve3na8M9e
z6?_3jhYE!@7Gv=xCg;>^i}_Cn_dIv^`*E7@ughL9BnaN|JeQ}Z7FSmf8Y!bytBdk=
zcZtmOBuPI4VC^KJ(K!7lh^eW(e*#6;Kx7Rr_vZ2ab@>mrZHuHIp}Q8sHZjUYGEOd4
z5Tn;+oE)R;iydc75C9@;q~&3y-sarTQ>!gY01cp6-<0O+T&fV=cZj>6%pBgLp5QdM
zq_9l@lHM0dKO%k&l{8y_W~?5kxh0Kq5rDY;0l;r7M0YL9`#0zVuynR9e=|-_L8D=R
z?m7g)`w&igUt`cf0ua{3unmB?`>6trO24g;%JB=H=MGQSOr7ZQ4P&7|-2PA@E5|R`
zwnd|Hs;QHc@Ec>HFxE!t;97yI=fO-LZAfj>Kr?kp2iJI>oBE;D)N0GJT3wWBdw<y+
WkH%sC`3nF5002ovPDHLk0$_q1kiE(P

delta 485
zcmV<B0UG|e1MvePiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyif1^o6
zK~y-)rBX3V0$~__zVnXgFC^tAazTm9QB)2=1>)HpMROrEgaj^aHbhHfjb&4dg+fC_
zQ5?5KG+cHdf~JEUB;gXGZ-d;|^;r@0EFZjl@AJIx^SlgyL@ptdShHUVOe|`ON@m+)
zVq<i;SIVyp0RZZ$m+zG{MI~=@e>162)(p_wzK<@-qtr|)v^(SDf27~k0l?f0LN8Te
z#6y@gp85o3ud3O$*xL9K)ru9Iz27nba2hRmUlEeq=qlHW75GCV&<CdYnB*|%r7Fl_
z+=E}CDJtzOY|--IJh?u&9(ecXEA+=?BU3oX_Ies82LR?S5ry>Q8r<!RfAT10%>ZT1
z0Ob-gX^KjPjpHwqh$%3apq2JRFID-@U0cF+m5?a}u{axtadn4j&FB+nxr9v7VFoGK
zg%J<IX|%XuUXq9!#=Z3b*KBtR?twRFau_Fz9o1n^Jmb^=B5D}0KxW%wshbYt1o@RA
z#P)1-;N$07UoG~S$9lJBJGLzb3-s+F0l?v7_p_RMfvW&~Hi=it6A-f%u{-1Y@sDJ`
b68?h^C==x1|64E900000NkvXXu0mjfNv_$Z

diff --git a/textures/dmobs_butterfly2.png b/textures/dmobs_butterfly2.png
index ba475a2488f0ce67ff32c910e10934268775db66..feb88b8196e025650a7f2b0cd4ecb8f80caebda0 100644
GIT binary patch
delta 436
zcmV;l0ZaaZ1i%9!iBL{Q4GJ0x0000DNk~Le0000B0000G2nGNE0KmP4evu&<e{xAg
zK~yNuZIV4p!%!H7pWHN}#+GQnAV~)+)FM)s(n&$V#YLQ4{R1w#2o4U;ilh1qTpR?~
zqJrQkq6mJV4qBn$M~KEjZLU*q8_YXhxX(HFJ%_7J&P>R_{~&k^@NzCs_f@XWZ!{7{
zD-`qcWqKLC+a?M_07g!?sq7v8e-nsIPey^lG!drB<<u&ZGZXSZY^909kd)&hx-1ND
z5Z!VT1)}vi-EwF>UyLor1Oh;qW>Ox8PBu6jo})Zok_xWBzs6h}b340*-feR~I!~dP
zmudxPeP4<$3xMd;CkjLAFV9NYd$dKY9%p@D8r~oPb-xC{Z>>toamns1e~@Z`ecQ)U
zw;TnvuJ!$JMer6h;po$kK@Aar=u9`;XoLj#dAg2?err|w57zK<Zqr$7Yv<?j4kJ52
z-LI*T{ReAgtTdIqLrpnHUmqCRfmj>%?ur6|cpLW8rqqlMw6=Ea-4(o?oA{yBl*dc5
eP|VAuyFd6>j$1xN=?4G+3IG5}MNUMnLSTZE3&2VM

delta 502
zcmV<S0SW%V1A+u0iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyif3!(N
zK~y-)jg!Ai8(|p7KkwazE+Rxjs5m%jN)$?(LG<DsjxE|i=;Wv<c4#*T$Id~)3?dZj
zKOmwgN(G0cX2=jHNqc7KR4Bn;h?_~CF1;gnIl*Un;eFrl=Y8Jq_kC4f&&i026Rd1=
zOYw{{04}A0WmN%4oP7ph-&mF)f2c1qE;o;raByDF$z5bkerHGJUSE>R^pM;|*2D$5
zfS^tbPQ(rpT+ftA7Sr6m`{rA_d90`)L<{StasS{O0R~>Y7wh#$aUm|q2XHb4M8!xJ
z(};@s#KW%!ssH-pb>e!Vf<Anhap*rZX=@3JQs-0Tfk}ImlhZxI3^c;pe~)&E7nbJO
z*!;q_q`*i?FlN<x`l4n6go<BI9Rm>W?IC(JPf_Y*n_Eid^;}mp>qZlMdV-VFJ+>u<
zt%lLs4oa>7sM%Hi{&?#Lth9EOoAp@o4HvcZE^*DS67TKtdE_&tQ@q+9WKlD5G6hfM
zc5pT8c-QE92N$(-pWCHUOq!j;1V63sv~-h}ZW2A3$H^4BQwYZNwO#hEmM`U`MA=)j
s{*UUZf6?j7Q+q~KJp3s?w=Si@Km5(rU1z*H{{R3007*qoM6N<$g6rDr>;M1&

diff --git a/textures/dmobs_butterfly3.png b/textures/dmobs_butterfly3.png
index 62c10bc0d43fdc80b5b1b16f1ccfef57aaaff97d..2d0db1850df9ba54eedcd535fafd4a35cf49c196 100644
GIT binary patch
delta 433
zcmV;i0Z#sy1ib?xiBL{Q4GJ0x0000DNk~Le0000B0000G2nGNE0KmP4evu&<e{V@d
zK~yNuZIV4p!%!H7pWHN{4UMIxgqng<p#g`u)WOZ7Kfr(BE-pGcbZ`?~T>SVKf`cH4
zgKHN>#cx5ZBBiB9QbBF5Q*Rs0J6*WXIrlw>t5xO}<fq@p_ggrHBK4O?Zg0*tVn!>u
zo?L5I$m$~mVF!Rc@1B$6{eJ>se_0s?nj(oQlB{3NP?=kh|KOCBCI~w?i5zKR;u?8u
z-HH{6!RKt<V(`3r;Y9=jz!b^2JZw!~vUoN|d3shVxY_-Pxb|lIZl0_@!t&D;CD)T`
zg#)`P)4~Lx9R>tphu3aP33qcfBJ~{DRp}ae0N%Sk0QKJnP9n!j;gCcRe>}}^NL#lQ
zG`QCF_cOlV>cj0Yh(J9NKuQev+vtS^xcPaDi0Z!$Hpgo?g<{`%NHci&d1b;F<-O~x
zkelN*QdXLi<9$sze}-R77^9Iks+l7N0?{^hvP*JUGZ@kgs+l94LNWG3sVPs-%988J
bxVt|{S&khfMlUA-0000<2SrXqu0mjfd#1k>

delta 524
zcmV+n0`vX71DFIMiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyif67Tj
zK~y-)l~X@R8*vo=-ra>#D4DE*q#;w|nLsE8l!`RoX2t4~L5f3{c5smlg{p&eC<@u@
z;396)#SrNx8je6tsMye)*El#t2U`aT-D2)JXpZ{}_ANj7{oecD_rCA_C@U5@Oi8$7
z|7M2pfDizn%}uPu1gymbL@0*{f90S^C03*o+ml0?5e`Jkibb9cUGrJG#w%i*wM3a`
zL)Q)vKLEjfv3runJ6XqJYaFXd!|~RsYvcxz{Mh{Y_t$X(z$0av<#-G~x7IC?PF*7h
zgF;lr6)_H5<G3RB6dSDzi%F-hk*^Lt4SMrGely1t%c~qDpyWsYw_xIue=DfH{)P{8
zZ}IiZXN>7ffCLV-x#xnt^TPIb4rNAIkxHy3%B&^Ie3q^`+@Y*k^icctN`*4|5_{zx
zjOj~=P!0p8fIhx!IvhX1rwbGNH#207@T2>YdS0jEL%zks@dNZfd5TRVhlpT8kxESN
zO-sEPf_{92Oe2ry!g~~=V(NWS%3?4z*uY{_#wAz0i=-bP!EVv~xq-Z)V)9u9Rk4ez
z*u`Q~Mj@(tU2uDQYHnDg&7T(;uy3Xe0HC0MVb>)nCrnB22>%mpZsHbSjoSvU$JpEe
O0000<MNUMnLSTZTD)EH?

diff --git a/textures/dmobs_butterfly4.png b/textures/dmobs_butterfly4.png
index 90dae3fc537be5427ee84e571d84246ba2bb02fb..48a62c25b4347d259438d6c4b3ebff50c0a36987 100644
GIT binary patch
delta 442
zcmV;r0Y(1m1I7a(iBL{Q4GJ0x0000DNk~Le0000B0000G2nGNE0KmP4evu&<e|Skm
zK~yNuZIZD|0#O{tKX)o!m~~Wo)dhlrEg=!okV~$)xHd=q0X4TYv_wroQA@NGG$e>~
zLsJkA(NKX!kdca^nIM(-8seT>_nY41eZKGezF(e_N+d<KUghn*M#v2EP<Z0{{zk!J
zlxSp9tSr4UG~lAqv;a6cn<0IkfBh#=2m1#k=+#ubn#$^Oj#MHk{=#nEr_*R!n0_|^
zM!*HY>T(W9icSZ$b7O<{dU4^Z%RvS3YN}Hn4v(iu&0jJXiwgh+;Ba$T%uZ{Lg1h_|
zm0FAKgAwEtGW&+meZLOXx<#XD@ltHHT~5d7swcB=h>5TVfMV$vER?@7fBkOOwnDgV
z@Zxw>7y*}rI>X*Re)9HSYs1yL)dkri0AHWlZUdlFYso;JqC)wby`u;rGuXaa>ru!*
ze-R${P%O1%$i1Tox=$y4o>k<{^$&~ixTmX)jU7XRvS)jC*M~%JuY%U2u(4whGJ}pE
kO3qv?E~1f1;dJ%`cL0$_5R6xSIRF3v07*qoM6N<$g5yib$N&HU

delta 478
zcmV<40U`dz1L^}IiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyif1F7~
zK~y-)rBgjfLQxd{?$bwvOQcZH;9{8yMhQAPL{dw*xJXNbLqUW?5JcqW;NYHvi!@3u
zIYmE9JSc-e={*7`7eSKL$@Dbnz3KCZptD>!ob!F>eBZeYe+*+RNBSI9G%$Tq_L-=y
zw3xn;x%~hDTT}%AXo1J^OtQ~Je}m0(woVSKLWcMkd0l0avvo2=5~4<$#ts1M=bunR
zPIxjkJnvXW2qoUgo7WD!G_yM=7#hv$&^s2Ot+W_tey?a)U0T5)2s0DZkQ2;ILW8Lx
z`%JVQ57O-3JaHYk27~(pfN`8n1mN~MjKhl~Twd*?jWi^;f8rWKZLh0Le-5ic4y)2*
z_L=DT=5%Nhy$g&3ET<QthMZz&$=(IMJ%HuI*bHvr?&%)i3uhzb%oxiNbNkU%C3rG5
zG@4Z**dT~=!-Z0z2rf3CLTK>ovjxmd0_-E{N4F9~sSxXdph#_{#X6}ICID<v6|YG<
z4Csh+ed(X71UtCZB@{>gG=rF+n@@?P763Ry-xL8d)&ae@`Y=Qi6Kf=@X!uY30DvRk
U1tLcykpKVy07*qoM6N<$f;a`tmH+?%