From 9d41c0f34da8b310ff399601434a6bb982aab161 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Fri, 7 Sep 2018 22:12:13 +0200 Subject: [PATCH] Version MFF. --- README.txt | 1 - armor.lua | 2 +- changelog.txt | 0 depends.txt | 0 hbarmor.conf.example | 0 init.lua | 37 ++++++++++++++++-------------------- textures/hbarmor_bar.png | Bin 2770 -> 82 bytes textures/hbarmor_bgicon.png | Bin 424 -> 0 bytes textures/hbarmor_icon.png | Bin 3167 -> 397 bytes 9 files changed, 17 insertions(+), 23 deletions(-) mode change 100644 => 100755 README.txt mode change 100644 => 100755 armor.lua mode change 100644 => 100755 changelog.txt mode change 100644 => 100755 depends.txt mode change 100644 => 100755 hbarmor.conf.example mode change 100644 => 100755 init.lua mode change 100644 => 100755 textures/hbarmor_bar.png delete mode 100644 textures/hbarmor_bgicon.png mode change 100644 => 100755 textures/hbarmor_icon.png diff --git a/README.txt b/README.txt old mode 100644 new mode 100755 index 3e9f77d..4424cde --- a/README.txt +++ b/README.txt @@ -35,7 +35,6 @@ Dependencies: License of textures: -------------------- hbarmor_icon.png - Stu (CC BY-SA 3.0), modified by BlockMen -hbarmor_bgicon.png - Stu (CC BY-SA 3.0), modified by BlockMen hbarmor_bar.png - Wuzzy (WTFPL) diff --git a/armor.lua b/armor.lua old mode 100644 new mode 100755 index 511640d..7214b2b --- a/armor.lua +++ b/armor.lua @@ -21,7 +21,7 @@ end function hbarmor.set_armor(player_name, ges_state, items) local max_items = 4 - if items == 5 then + if items == 5 then max_items = items end local max = max_items * 65535 diff --git a/changelog.txt b/changelog.txt old mode 100644 new mode 100755 diff --git a/depends.txt b/depends.txt old mode 100644 new mode 100755 diff --git a/hbarmor.conf.example b/hbarmor.conf.example old mode 100644 new mode 100755 diff --git a/init.lua b/init.lua old mode 100644 new mode 100755 index 4aba3bd..47bf66e --- a/init.lua +++ b/init.lua @@ -16,7 +16,7 @@ hbarmor.autohide = true --load custom settings local set = io.open(minetest.get_modpath("hbarmor").."/hbarmor.conf", "r") -if set then +if set then dofile(minetest.get_modpath("hbarmor").."/hbarmor.conf") set:close() end @@ -50,7 +50,7 @@ local function custom_hud(player) end --register and define armor HUD bar -hb.register_hudbar("armor", 0xFFFFFF, "Armor", { icon = "hbarmor_icon.png", bgicon = "hbarmor_bgicon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, "%s: %d%%") +hb.register_hudbar("armor", 0xFFFFFF, "Armor", { icon = "hbarmor_icon.png", bar = "hbarmor_bar.png" }, 0, 100, hbarmor.autohide, "%s: %d%%") dofile(minetest.get_modpath("hbarmor").."/armor.lua") @@ -88,26 +88,21 @@ minetest.register_on_leaveplayer(function(player) hbarmor.player_active[name] = false end) -local main_timer = 0 -local timer = 0 -minetest.register_globalstep(function(dtime) - main_timer = main_timer + dtime - timer = timer + dtime - if main_timer > hbarmor.tick or timer > 4 then - if minetest.setting_getbool("enable_damage") then - if main_timer > hbarmor.tick then main_timer = 0 end - for _,player in ipairs(minetest.get_connected_players()) do - local name = player:get_player_name() - if hbarmor.player_active[name] == true then - local ret = hbarmor.get_armor(player) - if ret == false then - minetest.log("error", "[hbarmor] Call to hbarmor.get_armor in globalstep returned with false!") - end - -- update all hud elements - update_hud(player) +local function hbarmor_step() + if minetest.setting_getbool("enable_damage") then + for _,player in ipairs(minetest.get_connected_players()) do + local name = player:get_player_name() + if hbarmor.player_active[name] == true then + local ret = hbarmor.get_armor(player) + if ret == false then + minetest.log("error", "[hbarmor] Call to hbarmor.get_armor in step returned with false!") end + -- update all hud elements + update_hud(player) end end end - if timer > 4 then timer = 0 end -end) + + minetest.after(hbarmor.tick, hbarmor_step) +end +minetest.after(0, hbarmor_step) diff --git a/textures/hbarmor_bar.png b/textures/hbarmor_bar.png old mode 100644 new mode 100755 index 9623c4e9dfc56ab674ae08df4c278648129b4fa1..0e4495cf4e48e77a86ba4b755a5c95f58f9f69d5 GIT binary patch delta 64 zcmca48Z<$|ijkRtfq^Z}<~xvL4)6(a?eFjJ;jaz?a=AQR978x{lNEq$1qQ|qT$hA^ OECx?kKbLh*2~7amgAS1Z literal 2770 zcmV;@3N7`CP)uJ@VVD_UC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$Or zQF$}6R&?d%y_c8YA7_1QpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv z1)yUy0P^?0*fb9UASvow`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q z{wNRKos+;6rV8ldy0Owz(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E`vOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G4 z1dM~{UdP6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4E zs0sQWIt5*Tu0n&*J!lk~f_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+ zAA{TB3-ERLHar49hi4Ih5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=nat zP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+edD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVbnL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0 zWMyP6Wy582WNT#4$d1qunl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8d zZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iu ztvy=3T65Yu+7a4Yv^%sXb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i z^lS773}6Fm1Fpe-gF!>Ip{*g$u-szvGhed;vo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*Z zvFf(^Xl-N7w{EeXveC4Ov)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx z)P8cQ&Qi|OhNWW;>JChYI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_W zICNY@+|jrX%s^&6b2i>5eqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!q zl}XcFH*PieWwLj2ZSq`7V9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I- z?$tAVKYn8-l({mqQ$Q8{O!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;c zwT88(J6|n-WB%w`m$h~4pmp)YIh_ z3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dl zbFb#!9eY1iCsp6Bajj|Hr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syT zu9enWavU5N9)I?I-1m1*_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$m zU2Q)a|9JSc+Uc4zvS-T963!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;; zJuhGEb?H5K#o@~7t9DmUU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX z=)z6+o0o6-+`4{y+3mqQ%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@ z>;2q1Vm)$Z)P1z?N$8UYW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHs zy69KwU-!MxeeuI@&cF4|M9z%AfP?@5 z`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u02fI_K~xCWW9;wm|Ifg{z`(=+1p~_f Y0D}nv%)1^G`v3p{07*qoM6N<$f-F^0_W%F@ diff --git a/textures/hbarmor_bgicon.png b/textures/hbarmor_bgicon.png deleted file mode 100644 index 32401003a8f42a81bb123e03be086fdda348c159..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 424 zcmV;Z0ayNsP)paFLO0b(HqY%<_pLI`0NQ0n~k zCHwvUp@bUP7-M9bCb?WL_ux5z8-{!bui60Cy4YpNUw{yTSZhV!Nt3&<(k!~%@8?sq z#&Im)!CJj6bxsv8Gi!+001a04^sdD0IN_;R7Gek8~^|RvcA5vzP`7@!nnl5y2Zu1 z#>TqG$GphMy~)YG%F4gY%)-vj!q3mc(9p!s&&1Ku#naQq)YQn*(#X`*$kx`$*VoF| z*UH$~%-h?}+uP6F+|S+J&)(kA-`~^U-__ya*W~2b+9w1 z?dR|B=oc_xJSr`u6+#`ThO<|Nqg$nOgt= z00MMUPE!B?c9YFG0001wNkl|p0r1|Oo2+~6q;|;gGEQ-ZC$}S9L7;VowaK|3QbrXhr z)78>pNMe7P2qmoQ{Q!|tcE>V^Y5=qVYN%3G bhJSCL>(>g;IrcHI00000NkvXXu0mjfCKBlw literal 3167 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