From 82f0a6619234de60d8326dd47a564cf9e32cf020 Mon Sep 17 00:00:00 2001 From: aa6 Date: Sat, 24 Aug 2019 14:53:55 +0300 Subject: [PATCH] Fix: Code simplification. --- VERSION | 2 +- init.lua | 24 ++++++++---------------- util/version.png | Bin 1902 -> 1812 bytes 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/VERSION b/VERSION index 56e9df1..1bfc953 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.3 \ No newline at end of file +0.10.4 \ No newline at end of file diff --git a/init.lua b/init.lua index 4baffaf..7a4a64a 100755 --- a/init.lua +++ b/init.lua @@ -91,12 +91,11 @@ function minetest_wadsprint.api.addstamina(player_name, stamina_percentage) end end ---------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------- stamina_update_cycle() -- +--------------------------------------------------------------------- stamina_update_cycle_tick() -- ---------------------------------------------------------------------------------------------------- -function minetest_wadsprint.stamina_update_cycle(player) +function minetest_wadsprint.stamina_update_cycle_tick(player) if player.is_sprinting then - minetest_wadsprint.set_stamina(player, - player.stamina - + minetest_wadsprint.set_stamina(player, player.stamina - ( minetest_wadsprint.STAMINA_MAX_VALUE * minetest_wadsprint.SPRINT_STAMINA_DECREASE_PER_UPDATE_PERIOD_COEFFICIENT @@ -104,8 +103,7 @@ function minetest_wadsprint.stamina_update_cycle(player) ) else if player.stamina < minetest_wadsprint.STAMINA_MAX_VALUE then - minetest_wadsprint.set_stamina(player, - player.stamina + + minetest_wadsprint.set_stamina(player, player.stamina + ( minetest_wadsprint.STAMINA_MAX_VALUE * minetest_wadsprint.SPRINT_STAMINA_INCREASE_PER_UPDATE_PERIOD_COEFFICIENT @@ -119,12 +117,10 @@ end ---------------------------------------------------------------------------------------------------- function minetest_wadsprint.switch_to_walking(player) if player.is_walking == false then - if player.is_sprinting_physics_on == true then - minetest_wadsprint.set_sprinting_physics(player,false) - end player.is_walking = true player.is_sprinting = false player.is_ready_to_sprint = false + minetest_wadsprint.set_sprinting_physics(player,false) minetest_wadsprint.hudbar_update_ready_to_sprint(player) minetest_wadsprint.hudbar_update_stamina(player) end @@ -141,12 +137,10 @@ end -- sprinting does not decreases the stamina because decreasing stamina for not sprinting is unfair. function minetest_wadsprint.switch_to_ready_to_sprint(player) if player.is_ready_to_sprint == false then - if player.is_sprinting_physics_on == false then - minetest_wadsprint.set_sprinting_physics(player,true) - end player.is_walking = false player.is_sprinting = false player.is_ready_to_sprint = true + minetest_wadsprint.set_sprinting_physics(player,true) minetest_wadsprint.hudbar_update_ready_to_sprint(player) minetest_wadsprint.hudbar_update_stamina(player) end @@ -158,12 +152,10 @@ end -- then he isn't sprinting. function minetest_wadsprint.switch_to_sprinting(player) if player.is_sprinting == false then - if player.is_sprinting_physics_on == false then - minetest_wadsprint.set_sprinting_physics(player,true) - end player.is_walking = false player.is_sprinting = true player.is_ready_to_sprint = false + minetest_wadsprint.set_sprinting_physics(player,true) minetest_wadsprint.hudbar_update_ready_to_sprint(player) minetest_wadsprint.hudbar_update_stamina(player) end @@ -345,7 +337,7 @@ minetest.register_globalstep(function(dtime) -- Called every server step, usuall if timer_of_stats_update > minetest_wadsprint.PLAYER_STATS_UPDATE_PERIOD_SECONDS then timer_of_stats_update = 0 for player_name,player in pairs(minetest_wadsprint.stats) do - minetest_wadsprint.stamina_update_cycle(player) + minetest_wadsprint.stamina_update_cycle_tick(player) end end diff --git a/util/version.png b/util/version.png index 0a0f9e98c24afb811e7fa276c0faadbad9254287..720fd6cb43831fd0d431b6187b7d5805b455b480 100644 GIT binary patch delta 1694 zcmV;P24VT`4wMd%ihl?g3pF?I0Dolw00r+!L_t(o!|j-DY?b91fUkZ+ODo@WP-IX( z6rxndbl`Lj7>W)uRv1j`f@B%XpaX)iDOs@05n%=}K^ZIpWe$@u%|?q%1Pg5PQ5`KE zYhlz11lZ_+mO-(!Jw4ZcG)p->r?q82Ow{||xu5H~@8^2oynpYx^G2!i8H(sn`T(B` ze-grVGhz3gFmDD-tA(Gv14Yxp1MMq*>KH5@4=3J;yncQ%tX&J4Rq$j0a^^#2;r}Oe z^dMwqz`>m@05*#on{@d;?Rr`}6l%AT8rxaZ=IQJ8wky{EPLtMX{x8GV{ytd8oYvSZ z?Yvl%R%!e~oqt}U=WE*6=YMe}NvFhX)C}E{7?}wZeq*_IdO(Md(${xu(RcO5bJ~5e z4o=n52S283uGSRkp(Q$Eh;}%m`E{X4buZ1>s4>+#cY_uT)qUlfF-6&>i?(aSo$Zqi z&efH98vBw)FVrnl+aO$BrxV}Qgsqx;`%T5p=(A5K=zp?3EjO*+tIG;?{A%s>TqB>@ zLGuHl+}l?)p;{j~r&Vj3^5wg9=zi^cN>6;XeZu+6HT4cnnyxXUb<1}mb0N?0$ujus zQAp2#2m3eWqx!+*!_X}Y^52K*%aI?Cx@&MO2QJ(TeV>Q!lfblaZr^)QlLX&B3tbj8 z<4)BjqF!49gTd1mq%6~<6<(uvZ|IN(XHy_}<>Q67zX+RZVfH0>tSh(>sA{9|)uligBo7P+R!ZVYY1rLO`D3H#%#dlPD=L8m(){OXq~$u- zXTfvZq3S+ZHVjfGHs+&Jfmk514Z;bp0GpwmV$>z)LYq2p}eTFZ5QI|u$a39?4PsDCo3e;68uL!cPA0fE5~yb2AO&HCT`Bjxu% z0bJe~-k^3qRLzH^^N>8~)`b&uq4P6vYAbwH4E!*3y|Mu6DxgOR#C#n%9O0sT3wG7O zjSaB37LE)A{|!;aP+HdLu9O1vg*UkUKnJ9VErWhZmrJOlXsYY{~oLu1qDap@O&s334aCY@O~xCP6h6Vr3G;03$UcJ+2)Wjq@ONH)Tk`Y z9<6nMYD`}mp_9*R#|QKesZIEeAM1v@H2ZBW-O+5+%h6e78kZM7X_Xb~pr7i%Ra$so zQ$8=KU0&6(aeC#Eru?xueRjOQa#CxrwmxzFe3p`_Tb8zAv{Wr0s9))?iGNj^`Ay9p zpkr5P>{R`Jie8`C#9qnOd&(O}$ZaQ@39r&w+cd7X<~N^>+*njLwVE zKBbz{Nq1(4;#(&-_PF{uHOKVVQ}xSTwcADQxn9R)Ywl%jI1>l&S~Qup*|hp_66Nm|}Vk7eq)e%df30`#s1j%y%AgS(rp)oH^z4Wz5l zEj0O_Ubec`N03~!qSaf7zbY(hYa%Ew3WdJfTF*z+TI4v?XR53In(q5uE@07*qoM6N<$f{f=Xy8r+H delta 1740 zcmV;-1~d7T4(<++ihl% zOBgU*ii$L?fufd6i;;qW6x1mWg#qh;QmbvEMO3P^MG>e7)N-xPG+-EjEN)r$Q z$fX2<;nom@KuB_ur$5pea&k^W=pSdQ@4vI&cdxbH?|gf&eSc0JRlY)q__7=L+VGcQ zxMVD>?+lYi!SG^u?r)GY0^D|U$&c-YX#?Qk`{DUhLt)Mw7+nD40gmQnu z$Lq9)p?}*UeiCf_2NdRq-yS8GVeeu%(;HgNgl0p)cA>h>JE15R9y|d}p1dA!cOMK) zhm&n#$4_eByPtms1udX=14!r*%q2C4xF_J;EGX_C%mo=foCN2aLbp}WWR%CBRfT@NUh9yZ-`K zwS@6mq1>5FxH1`TONDxO)^KS3W_QJFnEvB1d*%fl)Jhw_q`R7VLzHLgV~wN7dna`jGB>PXCgtebHM|HS57pY0x)(>6gG^ zXn)i`^r_X&fQFl(cne%h;>IWdvk4h|C0S5392$NTqL+m(i_L+kSx~qITvUrXKp+>= zmqSVu81_Th`wV2vg8Q3=YJ=JddeElp!jU4u>9vx5)XAd zK;0W0C^aFf8$>6gq!NNTY;Y5GvnSTt;!W5}B)pB<2K0L2dVF6rq~8Y%4}Vu&ZU9n} zA-*Ln=?poS!7~-{qUG?%eAxK~^d19ARewZOol{5K>s@WML4l4Qr0H$7-^&^`Odn6w zD}yV|)YaPkXvOSab+F1DeoY@;rFC!9jaBc(%k<5Aw80$h@?D*NTqj3ri~X9|P(Mr$ zmM#oG<#7FdjI=c0NDoG;s^;dN8Pj%0zFc+D46vP>^SYcToXoW++c0_snjA*L{4rm}z%hy-oO0;aQ29ni?YKn}}f8VaT!}Y)h{bF}`S@}B} zh}A%$np1@wulc+5z@w--wI{Nj0TL0Jh${GF-E-k?X{-)NGjRqSRH!U(S zR53I