From c89b7e29c379d2c9abf280a97ec7a0755f0fb2a4 Mon Sep 17 00:00:00 2001 From: bas080 Date: Wed, 24 Jul 2013 21:48:52 +0200 Subject: [PATCH] Fixed hungry mod and updated some textures --- mods/default/nodes.lua | 5 +- .../default/textures/default_bronze_block.png | Bin 290 -> 225 bytes .../default/textures/default_copper_block.png | Bin 599 -> 230 bytes .../textures/default_diamond_block.png | Bin 225 -> 206 bytes mods/default/textures/default_gold_block.png | Bin 258 -> 166 bytes mods/default/textures/default_steel_block.png | Bin 219 -> 168 bytes mods/default/textures/default_torch.png | Bin 180 -> 181 bytes mods/hungry/init.lua | 71 ++++++++---------- 8 files changed, 36 insertions(+), 40 deletions(-) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index fbf052f..eba0c7e 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -551,8 +551,9 @@ mesecon_lamp_box = { minetest.register_node("default:torch", { drawtype = "nodebox", - tiles = {"default_torch.png", "default_torch_side.png"}, - inventory_image = "default_torch.png", + description = "Electrical lamp", + tiles = {"default_torch.png"}, + inventory_image = "default_torch_inventory.png", wield_light = 5, paramtype = "light", paramtype2 = "wallmounted", diff --git a/mods/default/textures/default_bronze_block.png b/mods/default/textures/default_bronze_block.png index ca5f85b522f9a21124ea9a74e5b5d1ccd75c4d31..32b4afae840c35ca815e7394aff47a335019ce13 100644 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*ZZ@dAqwX^f2Ty_#QQH-UJlkEbxdd zW?0K!D-E&99T2 zbreNhCeALnKSAh{ob&C+3&xz-N(-JX1q& zPVcs5rytZTU1cIsHStT*UqO+bDL*Xl9egP^jc4L}!>w$3{mY-vIi|RmAuLcm+=W?i QBhY3BPgg&ebxsLQ0HnrF3;+NC literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)gaEa{HEjtmSN`?>!lvVtUwgWR1M z)}51i3FIgwdj$D1FjT2AFf_C#?TH+c}l9E`GYL#4+3Zxi}3=EBR4a{{7EJ6%Stc)$J3@o$_jI0a{ iR=Vl1plHa=PsvQH#I50m^pqVy4Gf;HelF{r5}E*N}y5JLTv~pmedPi(?4Kb<;DBd3>I?R82*SdSi~6a;7wcf5NJPxr>mdKI;Vst E0N;&Dz5oCK literal 599 zcmV-d0;v6oP)1s&=xcvOi6mjK+j$i`m`f;@9MA=|V%%=)StSs7SsPFR?{Xg+h45is@OmX9 zS`mWAj#uGhBb~doY?KVO!*WtNiy{30I5-HPz)J{|>fY)98{el(eY%UnL@FkJp5UE8 z$ah72d0-lTzpQ11fI`O$DSP-WKyeCa3czsDaJpdL znaKdzedys0Bq9Y)Drvi3{o4cAfMP)BoAGhd1R?oGzhJt*Rb8ATdN2jXiQf^?kv;Ij zQ2}^xIhs%E0fRfq_|XI(T^$8>Q62bM<#M(|4i^#l&Jk1y=KK-VyF*zbu8sC8066~O zVxos{AbyQ6)XQUQg}4Qi>1GAMod92Hr{jJv)M)&b+Qj-uuYqKx6xVW8a-I66;W!hD lyjto}FcTw|rtA+Cz5&f(T1I?K`d$D4002ovPDHLkV1mxK0~-JU diff --git a/mods/default/textures/default_diamond_block.png b/mods/default/textures/default_diamond_block.png index 768033578f656bdeb1e68d44655fe260641ccceb..a6206e0cc70c2f359c367fa3140cd959932b06c1 100644 GIT binary patch delta 183 zcmaFJc#hGyGr-TCmrII^fq{Y7)59eQNV9=32Z(%d=Di1qljQC0!tfsi7wla=d7`31 zwS*uS?;Yo8N1$x9r;B3<$93Pcwp@n-1Q;IXPfu4-5({fm|Lzs%;^FX-U8iNcnWN6K z*@=&8=KA}WY-u&U#moP6smzk@cN(dW*1c)*lsvM2i|D-@+}a{VE(y*3mnLRBPP%r# aLSSEApIC=U2wy(X8U{~SKbLh*2~7ZCBS517 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP>{XE z)7O>#E<2x?g0%TTn}0x|22U5q5R21GgAWQe7;tnyh`D>YROSe83G@4!t?oNRE_~9u zuF~Q({jrs~&k-&L>vtkM9ISI1og`K`I2Z9IPPHj;S;lm;EKW9Mbvu)wrAR``{{x?v z#+%7@Hq3hxdvgB1cBW}D;-{W{yR+74^_%c%6K6M{*tUQ3&NDU3t}#jbmrdc%S!`gv U=Ge0=pj#L`UHx3vIVCg!0O!0>*8l(j diff --git a/mods/default/textures/default_gold_block.png b/mods/default/textures/default_gold_block.png index 4ed9ed7e22acbe43e69627263c482896a0e515a6..1f6c9f033342bfdf8b33a0080d343175ddf732dc 100644 GIT binary patch delta 126 zcmZo-TE?i@8Q|y6%O%Cdz`(%k>ERLtq}f2214KSJ^WI~kqG1TTgn+T+$@>`_fnvs< zE{-7_*OUL0Onzw3EcD<}O2UtCa~m5uXDcu>&tmZraAsP@t#|Nfr+|autJ~!*3_gqu YYvTB>IXw5Q0BUFOboFyt=akR{0D~|l$p8QV delta 219 zcmZ3+*uERLtqy<2jgAGW^fBv61QPHrTS&&~zqUdv(0Z@#i z#5JPCIX^cyHLrx>+nH(mfnwF3E{-7$YGh~&ejcHf)+}_jW^5UWY2{8vlH=O_Pgv70;bB5onoy(Ri>UUjv*Y^b9)X7GAQsIx*&O@ej48qzHhAQ{*`J6 xR;_B*R#D{q&CckP_=97;k_TIlwkM;WNzNrvZ4nJ z@ErkR#;MwT(m=slPZ!4!i{7O{2L%r(a4epuobrFA%wgF#r{yjsyfM|coGdV9^;WYt z?5k!*zW>|7lkkvf!yylbB^8fS4+y0uWffSRGdq}Bp1I)2rH0PO%%=s*9$h&gyjWw| zqUsM%)y0_g=W##HuAjFe^7)QUK7UjKHa?!ao?AI3p;xPWsgF&bdcRw!z)$O$K!-4R My85}Sb4q9e0IR4^OaK4? diff --git a/mods/default/textures/default_torch.png b/mods/default/textures/default_torch.png index 685a6195b04291cb2ca44a69e9b2a252bd18e02e..089e5af41df89815a0feb4f106d957cc787f7f82 100644 GIT binary patch delta 103 zcmV-t0GR)@0kr{;RbU7U2GsV!0000&Nkl*{@*6@yW9PlSp#@rS z1F-mPGs$H3SnFP#xbUEh6b)r_iYyAMTorj~TYMOTj=9T$*AM#B4X#F^V2J<#002ov JPDHLkV1iJtDe3?K delta 102 zcmV-s0Ga=_0ki>-RbK=#Y;9nF0000%Nklh($ diff --git a/mods/hungry/init.lua b/mods/hungry/init.lua index 70fef61..20aec70 100644 --- a/mods/hungry/init.lua +++ b/mods/hungry/init.lua @@ -1,51 +1,46 @@ --Simplest hunger mod ever by bas080 -local enabled = minetest.setting_getbool("enable_damage") -if enabled then - local timer = 0 +local hunger = {} +hunger.enabled = minetest.setting_getbool("enable_damage") +if hunger.enabled then local distance_interval = 15 --set distance check interval in seconds - local hunger_per_meter = 1/500 --1 hp per 500 meter walk local hunger_per_cubic = 1/100 --1 hp per 100 blocks dig - local hunger = 0 - - local player = nil - local pos_one minetest.register_on_joinplayer(function(joiner) - minetest.after(0.5, function(param) - player = joiner - pos_one = player:getpos() + local player = joiner + local name = player:get_player_name() + minetest.after(5, function() + hunger[name] = 0 + local pos_one = player:getpos() + hunger.update(player, pos_one) end) end) + hunger.update = function(player, pos_one) + if player == nil or pos_one == nil then return end + local pos_two = player:getpos() + if pos_two == nil then return end + local name = player:get_player_name() + minetest.after(distance_interval, function() + hunger.update(player,pos_two) + end) + print(hunger[name]) + hunger[name] = hunger[name] + (math.hypot(pos_one.x-pos_two.x, pos_one.y-pos_two.y)+math.abs(pos_one.y-pos_two.y))*hunger_per_meter + if hunger[name] >=0.5 then + player:set_hp(player:get_hp()-hunger[name]) + hunger[name] = 0 + minetest.sound_play({ name="hunger_stomach" }, { + gain = 1.0; + max_hear_distance = 16; + }); + end + end minetest.register_on_dignode(function(pos, oldnode, player) - hunger = hunger + hunger_per_cubic - if hunger >= 0.5 then - hunger = 0 - player:set_hp(player:get_hp()-hunger) - end - end) - - minetest.register_globalstep(function(dtime) - if player ~= nil then - timer = timer + dtime - if timer >= distance_interval then - timer = 0 - local pos_two = player:getpos() - hunger = hunger + (math.hypot(pos_one.x-pos_two.x, pos_one.y-pos_two.y)+math.abs(pos_one.y-pos_two.y))*hunger_per_meter - pos_one = pos_two - if hunger >=0.5 then - timer = 0 - player:set_hp(player:get_hp()-hunger) - hunger=0 - minetest.sound_play({ name="hunger_stomach" }, { - gain = 1.0; - max_hear_distance = 16; - }); - end - end + local name = player:get_player_name() + hunger[name] = hunger[name] + hunger_per_cubic + if hunger[name] >= 0.5 then + player:set_hp(player:get_hp()-hunger[name]) + hunger[name] = 0 end end) end - -