From dbecfd8d7c20ed8ff5a5d31ab0ffa914762caade Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 9 Apr 2013 15:27:59 +0200 Subject: [PATCH] Update mobs_sheep.png, cosmetic changes to do_env_damage() --- api.lua | 15 ++++++++++++--- models/mobs_sheep.png | Bin 2293 -> 2419 bytes 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/api.lua b/api.lua index 1d03f8d..fce89f1 100644 --- a/api.lua +++ b/api.lua @@ -154,7 +154,16 @@ function mobs:register_mob(name, def) end local do_env_damage = function(self) - if self.light_damage and self.light_damage ~= 0 and self.object:getpos().y>0 and minetest.env:get_node_light(self.object:getpos()) and minetest.env:get_node_light(self.object:getpos()) > 3 and minetest.env:get_timeofday() > 0.2 and minetest.env:get_timeofday() < 0.8 then + local pos = self.object:getpos() + local n = minetest.env:get_node(pos) + + if self.light_damage and self.light_damage ~= 0 + and pos.y>0 + and minetest.env:get_node_light(pos) + and minetest.env:get_node_light(pos) > 4 + and minetest.env:get_timeofday() > 0.2 + and minetest.env:get_timeofday() < 0.8 + then self.object:punch(self.object, 1.0, { full_punch_interval=1.0, damage_groups = {fleshy=self.light_damage/(self.armor/100)} @@ -162,7 +171,7 @@ function mobs:register_mob(name, def) end if self.water_damage and self.water_damage ~= 0 and - minetest.get_item_group(minetest.env:get_node(self.object:getpos()).name, "water") ~= 0 + minetest.get_item_group(n.name, "water") ~= 0 then self.object:punch(self.object, 1.0, { full_punch_interval=1.0, @@ -171,7 +180,7 @@ function mobs:register_mob(name, def) end if self.lava_damage and self.lava_damage ~= 0 and - minetest.get_item_group(minetest.env:get_node(self.object:getpos()).name, "lava") ~= 0 + minetest.get_item_group(n.name, "lava") ~= 0 then self.object:punch(self.object, 1.0, { full_punch_interval=1.0, diff --git a/models/mobs_sheep.png b/models/mobs_sheep.png index 6f8c05dc6b3b5108c5d73ceef9a89f93c4eb48c9..b980e589a0bc883e4b2f878ee389e7c4714646e3 100755 GIT binary patch delta 2350 zcmV+}3DNfT5%Us|B#|)~3c>&Y4#EKyC`y2lQz?J%NklbYt}|_SbW|2s%ZzOm zNXQFFAdoj94@dxk$Ynp_WUrS*I{jg1_RP(llXJfJ`}uyp-_JScUe?P0sj&#|($bPt zD*b<-#L(T{ZL`^kD|D8Zmua`JUcDmyg@pw#Ff87@c|%5FiXg_u#{A>Jlv=H({ldU% zwa(4WDV0iuPVC3W$LR+(8VzwfIy!2%+h4qRK~H&s>Hmw1i!jB*X0sW6G$uT}4-5?G z^?G^`p({T59y04;j0fmSI2;Zd0DUwV5KjK6fWe^C>157=83y5yt{wiG zOeWkh0$0eT7Z_}2W@gr7!z@4ImC0nts!#rze+h@7p&>A4R>a4@Z;gGXkvHTAf+Bz8 z07fBvfGrja$qJJqQRv9X2-6|S(7ROogb(>JmC0lbON4^_qdH89x!rE?gNA)vK~tD| zuQ+@elLbS{uwEllXD(29kFaHn$jL~353)>4!OVI~xVqya1=s^U;v_!piIvoiD zc@?8sUO0Ct6v!>uas4Z^ut=M z_Tj^az?+?&UE`6W=)aSblaSJlTQ@MG9#xynCZ7`chr)7*GO70Sj;1WCa_meVdmYgDGFIpC>68~Yq=v2kmiO| zMOmz~DcgPhthScZUl__1h0En44^Z>-9!R&_b3xDK!huNc|2-LL?;hjTh9vt4lLflV z?fH(&nJew*4UMUwJ5&)XuQ^HsBaJt1-6YQs6i0~b(jAvF4E4zaMd5#AHS7s~vgKmh zSapK2F{QsC6dkK5%hj4ID~ZL~Vk!^x$}1qNFfV&5Nhpi{1Zva{Kv^*+*)vTU=r3M9YZ9c;M!=(-&L4VzkjZ7P<{W=*9cNCb+puB7#*G^( zyIoVABriMU5S=veQ&g2~X;CzD*4~uiynM>NF#q!BA4fH7-lbTo`b49Ei!!@fP7Rhs zy04vEZqE~!M0(Yy_ub8c()lfwWPO>TJ%|^Ep^fAnm+g%4FKk>D1W3XL06j$qK3K@abbj{@L=DCu>OKDWO%SJQd^g7tWO=PJnSzQjIf{=tME8= zJzp>2sH@m;ZEj3AUVB$#q#EY|R-t=osjnb(xGYvvod|z@xtdNI`5b9+lv9*r5OAl2 znUJTB&z%vSnrl5X+kASu=@be-T9ZTrGj|o1v@A|q5(T32(&**ud2g?s1A9cnv?kjH zvi(y*xIu7CQW&A+9WwG$)s;uEY$OGd5O8n)euRZo^GoRyF+$j!FoD#{K`Hl#f}7dldY z_^;ug)yC~PyFW1J&)Y|9Pe@B6WhGI@`V_11gdVjoj-Zpre2HLbo3aSX)%d;pKty()9*}Uh&&GdT=7?aNns7z6p zF>t{HJk^k{uT7DZL^xV<+Bm^iRxfn)^~V(DG1B6LD6Og@9^09!K3y~9IgCl8UlTmQ zo@>h{_UE6nKMxE6_G&0Nae+jvK^NF~J9vLtirp>AaVbmBPn{H`Ap(mqQ!n7UAmg^P zBNg%3+7!HKOT+Q8szg*5Wge_JJg*)k^+L{`zj#i3dV#;(`T;v=Cp#!GIxvug0>*dm z-+TJ+ZgRBYFb1~rV!BP3TT%D!{&ZePFW^Mcttz+VOcH83V9F!r}Q*}He`4fr59U^9$5Z+_ExqZ1ua z2P$%akSSH)v`Rr%g=^fec>19gyJ_{D_Iyt`ZI&ss`R45|)!H}vRmK6R=%(-;+d_7H z9J>9ZknP+4_{mm8L!x758#w^H=N*559LB$X-oZU3LZ`^fHH z@nFAehmTv&S~42&K}N92>`$+L?z-JY_TirA&%XWV_rE3>FE9kf4*K-yp52^%dt>(o zAN?XY`HNs~$Uc7;-96oZ>+D3f$!7r?-b@C>1H=-q!=B@7)^+#(-Ss{Xm_8Q&1C~D& UpGbg_KmY&$07*qoM6N<$f*%v3qyPW_ delta 2221 zcmV;e2vYa+67>;~Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wDSu>1L_t(oN5xnB zQ&VRej^lp;UDS5${?MQH2dy)@yEC229VCFsc1 zv)vsXm14EdP(?^cLIQ*kNXUgt5=gj*9QHZ+;^A;2o&M07esgl>%lEzKec$JKpYQw5 z;cfgujYs0Ht*xn4s(;@lhpw(JyWLJ)q2u*>8MnQ?y`;agvf>X6i{<5IG73{9F*Y_9 zm<6?crl6}a>V2AcW#`R&lK%a453YBgBp@X!8BFboY10WrHG9RJ)J zbEd%?_<^9vIDZ185S+l%)6;|%HbkP(k&zL$L&DG|)tvMpAGR{th+&CTz(1)O*FjMNAe9DZ_S+NS(bv;d*9fW;^~N0vMygj1jg!Fe61yu!)HYfMW)c z5Ze;ejFhpXB0DGr%#ihm z#wMKo{F5h7enkyr3WCS(few&#cX#`#)>o!3UeC2$J8iz1Yr9u8T$Ze>PMy75$Z-d* z01jcEJ%4-l{P}YxkH?Q6!;-VJ2Bz}r)hoaN89hBc{=oM76I7dU@%kC6O@wRt#+lXT zv)Ynm=3%4J_~_9i#9LTc*y53*n7>m~Q;^cFJGU@0svou5teg@Arowa93#itM&W2M| z+eK{=pK29tv|Y5d3fZPmFIoF*tE&{^;pe;iuYZk=?>jn-CS#y?nEAJBiUKPdt%kAT zdE0~tX{*lE6vnw4ay%{PjAiNll2EoN+-^5{fLdCjLwY>)1wE4s2O_z@I~f`8w6U*& zWR5U-fa`4)IlmKZv|cpVWCHHc<+#Dp6ecieymjX`d0w6$A#eH?B$+GIIcrr0V}y8=%k}fCpVfnEcjH&a^7KWMX~&KoJ9qA+9DfdF zeheTY9t~X_rpk+9&#DTdHAOK%-1FuayY&w5zj#jo9To`G1$3j`6b8KJj5|Ro1X94$4l!-**Y+ z4+FzWNu;qn4Q19|<_F3JBRo7aTX&pl5lvR5kCr6DwXG)G(!5z?P>u5dtI)Hy238?g zUlQu{B3QLVy->$$p0T3inv{_Ein56L@?dww2)XX*s65s5||4sO*2(Vk|Z zrS{ZZ!?~rV+_jsuK6?E$9DkNeLZNLK6AX5TW6P@#GPPD`St>KJW6#wKR&SmKdPjo* zrnm2PbpG&fvio4O#93*s$ndcj1{upGVO{4wUvCyJUi)U{`dO^2xyGF38|Q1{_iKy! z^qK|@;5>hmYW7P6&)AT&a^sA;fUlM%Xs)C=T0{suR-VdG4Qqf#Lx0EYs{(VWWhvek z(QMrbV_6Coq`m&6{pyJaC;zIHV&91LiGa@1X;KI3i?=T%X#cLDPd^Gmhrad%@7oo; zKO~rWj{#!xc>$H_n(}BI?{=sGX@s-sE3Es8@|5|;T&zjQcY;A$ePQZCdVS;4Rc0H8 z=);&a<~4y1OkcZ#_nB+aPJuaU(-(kO&)V+mDWj$ay8l6rx&7cXBBpYH;P1bw>ugRj$)Nnl(+e82O- zv!A-i(T2kqv9-0?2>DhVr38}_ddbSAe5jhRitQGi0Z9Y`D}VDM#!HX>Qk0;s&$;*D zeqTTRdBJWzszZVViTuz1@(KDmNeKsb|7qXuU>LRE{=WTIJ34@lsNeu8gLk{hL{^1+ z{5{3na9DlkH2po{vQN+0Y`5=r=(fJu`w;IACJ+yP{2}g#_U<|KF%6nz$7UNGAUypJ zKn~;I(%yG2ZGWL!kiakgR`mBz_NE;E?9iV-I`Cl#$1S~`+n#B?LH6KKK~EuI}eoi{7NDK015yANkvXXu0mjfg}zGH