From 1839396c824e4d8a329d0b699c4318798acaad55 Mon Sep 17 00:00:00 2001 From: "A. Demant" Date: Mon, 10 Dec 2018 17:20:02 +0100 Subject: [PATCH] some textures; errors --- api.lua | 9 +- chat_commands.lua | 5 +- config.lua | 6 +- nohup.out | 0 textures/src/Cause-Of-Death.svg | 1914 +++++++++++++++++++++++++++++ textures/src/WorkingTheLand.svg | 58 + textures/src/airchuck88-hiker.svg | 156 +++ textures/src/coal-mine.svg | 161 +++ textures/xpfw_death.png | Bin 0 -> 1952 bytes textures/xpfw_farming.png | Bin 0 -> 1851 bytes textures/xpfw_hiking.png | Bin 0 -> 1021 bytes textures/xpfw_miner.png | Bin 0 -> 1111 bytes 12 files changed, 2300 insertions(+), 9 deletions(-) delete mode 100644 nohup.out create mode 100644 textures/src/Cause-Of-Death.svg create mode 100644 textures/src/WorkingTheLand.svg create mode 100644 textures/src/airchuck88-hiker.svg create mode 100644 textures/src/coal-mine.svg create mode 100644 textures/xpfw_death.png create mode 100644 textures/xpfw_farming.png create mode 100644 textures/xpfw_hiking.png create mode 100644 textures/xpfw_miner.png diff --git a/api.lua b/api.lua index d06e188..3a88d2d 100644 --- a/api.lua +++ b/api.lua @@ -67,7 +67,7 @@ M.register_experience=function(name,indata) M.experiences[name]=tid end -xpfw.player_reset_attributes(player) +xpfw.player_reset_attributes=function(player) for i,att_def in ipairs(xpfw.attributes) do local setval=att_def.min or 0 if att_def.default ~= nil then @@ -167,9 +167,14 @@ minetest.register_globalstep(function(dtime) -- calculation walk by actual velocity local tvel=player:get_player_velocity() if tvel ~= nil then + local act_node=minetest.get_node(act_pos) + local vel_action="walked" + if minetest.get_item_group(act_node.name,"water")>0 then + vel_action="swam" + end local tvelo=vector.distance(tvel,{x=0,y=0,z=0}) if tvelo>0 then - xpfw.player_add_attribute(player,"walked",tvelo*dtime) + xpfw.player_add_attribute(player,vel_action,tvelo*dtime) end end --calculating mean sun level diff --git a/chat_commands.lua b/chat_commands.lua index 4f492c8..1aa35c8 100644 --- a/chat_commands.lua +++ b/chat_commands.lua @@ -32,9 +32,6 @@ minetest.register_chatcommand("xpreset", { }) minetest.register_chatcommand("xpfw", { - privs = { - server = true - }, params = "", description = "Get the statistics for the given player or yourself", func = function(name, param) @@ -44,7 +41,7 @@ minetest.register_chatcommand("xpfw", { minetest.chat_send_player(name, param) local player = "" for att_def in pairs(xpfw.attributes) do - player=player.."; "..att_def..": "..xpfw.player_get_attribute(minetest.get_player_by_name(name),att_def) + player=player.."; "..att_def..": "..math.ceil(xpfw.player_get_attribute(minetest.get_player_by_name(name),att_def)) end minetest.chat_send_player(name, dump(player)) diff --git a/config.lua b/config.lua index 4805651..fa5a8ee 100644 --- a/config.lua +++ b/config.lua @@ -12,11 +12,11 @@ xpfw.prefix=minetest.settings:get("xpfw.prefix") or "xp" xpfw.mean_weight=minetest.settings:get("xpfw.mean_weight") or 500 xpfw.experience_max=minetest.settings:get("xpfw.experience_max") or 20 -for i,attr in ipairs({"walked","distance","login","dug","build","deaths","spoke","killed_mobs","killed_player", +for i,attr in ipairs({"walked","distance","swam","login","dug","build","deaths","spoke","killed_mobs","killed_player", "lastlogin","logon"}) do xpfw.register_attribute(attr,{min=0,max=math.huge,default=0}) end xpfw.register_attribute("meanlight",{min=0,max=default.LIGHT_MAX, - moving_average_factor=minetest.settings:get("xpfw.light_mean_weight") or 500 - default=math.min(default.LIGHT_MAX,minetest.settings:get("xpfw.default")) or 11 + moving_average_factor=minetest.settings:get("xpfw.light_mean_weight") or 500, + default=math.min(default.LIGHT_MAX,minetest.settings:get("xpfw.default") or 11), }) diff --git a/nohup.out b/nohup.out deleted file mode 100644 index e69de29..0000000 diff --git a/textures/src/Cause-Of-Death.svg b/textures/src/Cause-Of-Death.svg new file mode 100644 index 0000000..076c62d --- /dev/null +++ b/textures/src/Cause-Of-Death.svg @@ -0,0 +1,1914 @@ + +image/svg+xml \ No newline at end of file diff --git a/textures/src/WorkingTheLand.svg b/textures/src/WorkingTheLand.svg new file mode 100644 index 0000000..9951765 --- /dev/null +++ b/textures/src/WorkingTheLand.svg @@ -0,0 +1,58 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/textures/src/airchuck88-hiker.svg b/textures/src/airchuck88-hiker.svg new file mode 100644 index 0000000..15b5ea4 --- /dev/null +++ b/textures/src/airchuck88-hiker.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + hiker + 2007-09-21T17:33:21 + silouhette of hiker hiking up a mountain + https://openclipart.org/detail/5661/hiker-by-airchuck88 + + + airchuck88 + + + + + climber + hike + hiker + man + mountain + silhouette + + + + + + + + + + + diff --git a/textures/src/coal-mine.svg b/textures/src/coal-mine.svg new file mode 100644 index 0000000..938abcf --- /dev/null +++ b/textures/src/coal-mine.svg @@ -0,0 +1,161 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/textures/xpfw_death.png b/textures/xpfw_death.png new file mode 100644 index 0000000000000000000000000000000000000000..a78979db2e860e97965d55c62ed05d7799c175a6 GIT binary patch literal 1952 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 literal 0 HcmV?d00001 diff --git a/textures/xpfw_hiking.png b/textures/xpfw_hiking.png new file mode 100644 index 0000000000000000000000000000000000000000..eae31ea936a7cefc38d259d7c82b25e5889807a4 GIT binary patch literal 1021 zcmVGK=b-A(dJH?8FoANko; z);GFdx2%vd(A_rCrWc(gWc%FMdd-6(rzP~7Z$wUO=rw@!sQCFlo+Wx(jR=0LYytS*+~lVwHWC}2tS)f0j3gl z`X}?0?6j4mh5Z$x#h0Q+Cuqe4=C`gVgbruoHem(@SzD)&-|t3+WLl$xAAGDp^Eu5c zMhMvslV@h(bOqZ?$o88tNM09W&-;QGbq?XLj4At7LWN>;hOak>bJ8o40eqYyeHIeZ)*x$ zE5Y-bmEb{6a=Xujl;Ngwkua4KydtD*3t(1hz3d`1>;p0i^5(*$M_t^>+^ z5}r(Qm#DNG_7!$kitnZI-t+)wOe5u+TJWeayArfWdjlRLIVa5n7euQ8{?w!dv*%ub zW9uVbewbglUn#Z`si^@??iT;=Zxet$ghQ1f{i<*~fW1Veg8?@RODn;c=?dsDGl1{9 z-2d>Ep+-}JO+}@fBz}^fi^j(!Lg+BAuFe!SI#81~1vp*&zqe#vB&znC={@It3+kZ-(r|m5tcyj} z9`Q|Ol6IsfJ#e+C^uDg<@|`;4R8_7bVdBu*4H`@!ELb&(#}$I$c|oTM4dWtgbb zqaroXs2XQH>lsI4PJfC@r7?7LDg6O;xXl4~(Z@+C^yCkD~ExfOAErPVYF+ zs_Ao`?(NyZIqTlEjt?zz$DJIvuQNW7}j^Cw+-;2 rTO4W)Q%X!|exu2=g2!BDVU6=2ICZMoNukEA00000NkvXXu0mjfO6dA_ literal 0 HcmV?d00001 diff --git a/textures/xpfw_miner.png b/textures/xpfw_miner.png new file mode 100644 index 0000000000000000000000000000000000000000..e298c7504fdc557dbb9fd6ea67263378ce928c75 GIT binary patch literal 1111 zcmV-d1gQIoP)8`W9+qU+qP}nwr$(CZQHhOk3HXgmC9;xo4u;^sh?-i&M$f^jWz$oSTl`D zR>1!h;J`Gd%U$GqYwYKVpdkcQoSk*iO9{wCC=2wS0|z;UGhn0ImPDiX{NWe#M(k6?=F z3uwT8uF;7r+@~gxi}QS7iwf{z8h5eNcN8b#3SoR?3+uRrFQZ7vCtj-n7oIZ^-Ey9l zc(IPuRHUnH6P@PP6>Bakt8(u(=KW`QLDjqqX! zM)iWEv;W_+7&*y!6##p=i~&qFZ0x@Vo8L0QwueW z;T_|ciYEi`!_WR*_(et}n6GI&BJOjH!3+x5p`0Ov>Zrkim%QN|Dab`ov`_~T?U!{8 zHXSpqGp!@_?@z+`oa8c3f4V9zjW3Cb743$-7$gkBMFT1x zV1`FMg`-$3iVJ%YO>=D?kVGrMKxe$=FAyGJ>~0M0AciP_S;9>?X$HvS;VKSV04}WO z8F?Tgz}QcoUcy=Q7ZM;_Rv08gE5R+qH22qlwA|tlu^=MA*v3&g?rlUi30Np9%Uedt ziKe-B&q?s-fckhd1`|XA$Yl3iT@$%jJCRz%5iRB7ZH0?wfV(iwi5g&L3}2`k#UQdZ zU;X|;_L5Lg%n<|S!fQ*6hxSA9CWgoXZ8^myl0oDE^F){69}g&#C?^&xfQ2HFaMuiQ z^du*MbGY8YlU2mRIYJ*%5oc1{J@XJh)>#