From 59b6385d107119f8de5f88a911a3adad705f29e8 Mon Sep 17 00:00:00 2001 From: David McMackins II Date: Tue, 17 Mar 2020 15:00:12 -0500 Subject: [PATCH 01/18] Fix bug where powered rails would not accelerate a fueled minecart --- mods/ENTITIES/mcl_minecarts/init.lua | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mods/ENTITIES/mcl_minecarts/init.lua b/mods/ENTITIES/mcl_minecarts/init.lua index 7c57334be..d23e8ad0b 100644 --- a/mods/ENTITIES/mcl_minecarts/init.lua +++ b/mods/ENTITIES/mcl_minecarts/init.lua @@ -409,14 +409,17 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o -- Slow down or speed up local acc = dir.y * -1.8 - + local friction = 0.4 local speed_mod = minetest.registered_nodes[minetest.get_node(pos).name]._rail_acceleration + + acc = acc - friction + if has_fuel then - acc = acc + 0.2 - elseif speed_mod and speed_mod ~= 0 then - acc = acc + speed_mod - else - acc = acc - 0.4 + acc = acc + 0.6 + end + + if speed_mod and speed_mod ~= 0 then + acc = acc + speed_mod + friction end new_acc = vector.multiply(dir, acc) From 21c68158394165033aed64d71fc309ed92fbee45 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sat, 25 Jul 2020 13:32:35 +0200 Subject: [PATCH 02/18] Added End Crystal --- mods/ENTITIES/mobs_mc/ender_dragon.lua | 17 +-- mods/ITEMS/mcl_bows/arrow.lua | 4 +- mods/ITEMS/mcl_end/end_crystal.lua | 114 ++++++++++++++++++ mods/ITEMS/mcl_end/init.lua | 3 + mods/ITEMS/mcl_end/locale/mcl_end.de.tr | 5 + mods/ITEMS/mcl_end/locale/template.txt | 5 + mods/ITEMS/mcl_end/models/mcl_end_crystal.b3d | Bin 0 -> 12932 bytes mods/ITEMS/mcl_end/models/mcl_end_crystal.png | Bin 0 -> 1940 bytes .../mcl_end/textures/mcl_end_crystal_item.png | Bin 0 -> 356 bytes mods/ITEMS/mcl_throwing/init.lua | 12 +- 10 files changed, 146 insertions(+), 14 deletions(-) create mode 100644 mods/ITEMS/mcl_end/end_crystal.lua create mode 100644 mods/ITEMS/mcl_end/models/mcl_end_crystal.b3d create mode 100644 mods/ITEMS/mcl_end/models/mcl_end_crystal.png create mode 100644 mods/ITEMS/mcl_end/textures/mcl_end_crystal_item.png diff --git a/mods/ENTITIES/mobs_mc/ender_dragon.lua b/mods/ENTITIES/mobs_mc/ender_dragon.lua index c9da0c498..71627aada 100644 --- a/mods/ENTITIES/mobs_mc/ender_dragon.lua +++ b/mods/ENTITIES/mobs_mc/ender_dragon.lua @@ -39,12 +39,6 @@ mobs:register_mob("mobs_mc:enderdragon", { dogshoot_count2_max = 5, passive = false, attack_animals = true, - drops = { - {name = mobs_mc.items.dragon_egg, - chance = 1, - min = 1, - max = 1}, - }, lava_damage = 0, fire_damage = 0, on_rightclick = nil, @@ -58,8 +52,17 @@ mobs:register_mob("mobs_mc:enderdragon", { walk_start = 0, walk_end = 20, run_start = 0, run_end = 20, }, - ignores_nametag = true, + on_die = function(self, own_pos) + if self._egg_spawn_pos then + local pos = minetest.string_to_pos(self._egg_spawn_pos) + --if minetest.get_node(pos).buildable_to then + minetest.set_node(pos, {name = mobs_mc.items.dragon_egg}) + return + --end + end + minetest.add_item(own_pos, mobs_mc.items.dragon_egg) + end }) diff --git a/mods/ITEMS/mcl_bows/arrow.lua b/mods/ITEMS/mcl_bows/arrow.lua index ad65eb122..45cc3e621 100644 --- a/mods/ITEMS/mcl_bows/arrow.lua +++ b/mods/ITEMS/mcl_bows/arrow.lua @@ -174,7 +174,7 @@ ARROW_ENTITY.on_step = function(self, dtime) if obj ~= self._shooter and obj:is_player() then ok = true elseif obj:get_luaentity() ~= nil then - if obj ~= self._shooter and obj:get_luaentity()._cmi_is_mob then + if obj ~= self._shooter and (obj:get_luaentity()._cmi_is_mob or obj:get_luaentity()._hittable_by_projectile) then ok = true end end @@ -196,7 +196,7 @@ ARROW_ENTITY.on_step = function(self, dtime) local obj = closest_object local is_player = obj:is_player() local lua = obj:get_luaentity() - if obj ~= self._shooter and (is_player or (lua and lua._cmi_is_mob)) then + if obj ~= self._shooter and (is_player or (lua and (lua._cmi_is_mob or lua._hittable_by_projectile))) then if obj:get_hp() > 0 then -- Check if there is no solid node between arrow and object local ray = minetest.raycast(self.object:get_pos(), obj:get_pos(), true) diff --git a/mods/ITEMS/mcl_end/end_crystal.lua b/mods/ITEMS/mcl_end/end_crystal.lua new file mode 100644 index 000000000..50d3312a8 --- /dev/null +++ b/mods/ITEMS/mcl_end/end_crystal.lua @@ -0,0 +1,114 @@ +local S = minetest.get_translator("mcl_end") + +local explosion_strength = 6 + +local directions = { + {x = 1}, {x = -1}, {z = 1}, {z = -1} +} + +local dimensions = {"x", "y", "z"} + +for _, dir in pairs(directions) do + for _, dim in pairs(dimensions) do + dir[dim] = dir[dim] or 0 + end +end + +local function find_crystal(pos) + local objects = minetest.get_objects_inside_radius(pos, 0) + for _, obj in pairs(objects) do + local luaentity = obj:get_luaentity() + if luaentity and luaentity.name == "mcl_end:crystal" then + return luaentity + end + end +end + +local function crystal_explode(self, puncher) + if self._exploded then return end + self._exploded = true + local strength = puncher and explosion_strength or 1 + mcl_explosions.explode(vector.add(self.object:get_pos(), {x = 0, y = 1.5, z = 0}), strength, {drop_chance = 1}, puncher) + minetest.after(0, self.object.remove, self.object) +end + +local function set_crystal_animation(self) + self.object:set_animation({x = 0, y = 60}, 30) +end + +local function spawn_crystal(pos) + local crystal = minetest.add_entity(pos, "mcl_end:crystal") + if not vector.equals(pos, vector.floor(pos)) then return end + if mcl_worlds.pos_to_dimension(pos) ~= "end" then return end + local portal_center + for _, dir in pairs(directions) do + local node = minetest.get_node(vector.add(pos, dir)) + if node.name == "mcl_portals:portal_end" then + portal_center = vector.add(pos, vector.multiply(dir, 3)) + break + end + end + if not portal_center then return end + local crystals = {} + for i, dir in pairs(directions) do + local crystal_pos = vector.add(portal_center, vector.multiply(dir, 3)) + crystals[i] = find_crystal(crystal_pos) + if not crystals[i] then return end + end + for _, crystal in pairs(crystals) do + crystal_explode(crystal) + end + local dragon = minetest.add_entity(vector.add(portal_center, {x = 0, y = 10, z = 0}), "mobs_mc:enderdragon") + dragon:get_luaentity()._egg_spawn_pos = minetest.pos_to_string(vector.add(portal_center, {x = 0, y = 4, z = 0})) +end + +minetest.register_entity("mcl_end:crystal", { + initial_properties = { + physical = true, + visual = "mesh", + visual_size = {x = 7.5, y = 7.5, z = 7.5}, + collisionbox = {-1, 0.5, -1, 1, 2.5, 1}, + mesh = "mcl_end_crystal.b3d", + textures = {"mcl_end_crystal.png"}, + collide_with_objects = true, + }, + on_punch = crystal_explode, + on_activate = set_crystal_animation, + _exploded = false, + _hittable_by_projectile = true +}) + +minetest.register_craftitem("mcl_end:crystal", { + inventory_image = "mcl_end_crystal_item.png", + description = S("End Crystal"), + stack_max = 64, + on_place = function(itemstack, placer, pointed_thing) + if pointed_thing.type == "node" then + local pos = minetest.get_pointed_thing_position(pointed_thing) + local node = minetest.get_node(pos).name + if find_crystal(pos) then return itemstack end + if node == "mcl_core:obsidian" or node == "mcl_core:bedrock" then + if not minetest.is_creative_enabled(placer:get_player_name()) then + itemstack:take_item() + end + spawn_crystal(pos) + end + end + return itemstack + end, + _tt_help = S("Ignited by a punch or a hit with an arrow").."\n"..S("Explosion radius: @1", tostring(explosion_strength)), + _doc_items_longdesc = S("End Crystals are explosive devices. They can be placed on Obsidian or Bedrock. Ignite them by a punch or a hit with an arrow. End Crystals can also be used the spawn the Ender Dragon by placing one at each side of the End Exit Portal."), + _doc_items_usagehelp = S("Place the End Crystal on Obsidian or Bedrock, then punch it or hit it with an arrow to cause an huge and probably deadly explosion. To Spawn the Ender Dragon, place one at each side of the End Exit Portal."), + +}) + +minetest.register_craft({ + output = "mcl_end:crystal", + recipe = { + {"mcl_core:glass", "mcl_core:glass", "mcl_core:glass"}, + {"mcl_core:glass", "mcl_end:ender_eye", "mcl_core:glass"}, + {"mcl_core:glass", "mcl_mobitems:ghast_tear", "mcl_core:glass"}, + } +}) + +minetest.register_alias("mcl_end_crystal:end_crystal", "mcl_end:crystal") diff --git a/mods/ITEMS/mcl_end/init.lua b/mods/ITEMS/mcl_end/init.lua index e3ca8a86b..2adcd7cf8 100644 --- a/mods/ITEMS/mcl_end/init.lua +++ b/mods/ITEMS/mcl_end/init.lua @@ -4,3 +4,6 @@ local basepath = minetest.get_modpath(minetest.get_current_modname()) dofile(basepath.."/chorus_plant.lua") dofile(basepath.."/building.lua") dofile(basepath.."/eye_of_ender.lua") +if not minetest.get_modpath("mcl_end_crystal") then + dofile(basepath.."/end_crystal.lua") +end diff --git a/mods/ITEMS/mcl_end/locale/mcl_end.de.tr b/mods/ITEMS/mcl_end/locale/mcl_end.de.tr index df3ad90f2..3914c2a98 100644 --- a/mods/ITEMS/mcl_end/locale/mcl_end.de.tr +++ b/mods/ITEMS/mcl_end/locale/mcl_end.de.tr @@ -26,3 +26,8 @@ The stem attaches itself to end stone and other chorus blocks.=Der Stängel muss Grows on end stone=Wächst auf Endstein Randomly teleports you when eaten=Zufällige Teleportation, wenn gegessen Guides the way to the mysterious End dimension=Weist den Weg zur mysteriösen Endedimension +End Crystal=Enderkristall +End Crystals are explosive devices. They can be placed on Obsidian or Bedrock. Ignite them by a punch or a hit with an arrow. End Crystals can also be used the spawn the Ender Dragon by placing one at each side of the End Exit Portal.=Enderkristalle sind explosiv. Sie können auf Obsidian oder Grundgestein platziert werden. Man kann sie durch einen Schlag oder einen Treffer mit einem Pfeil entzünden. Ausserdem können sie benutzt werden, um den Enderdrachen zu erzeugen, in dem man je einen auf jeder Seite des Endausgangsportals platziert. +Explosion radius: @1=Explosionsradius: @1 +Ignited by a punch or a hit with an arrow=Entzündbar durch einen Schlag oder einen Treffer mit einem Pfeil +Place the End Crystal on Obsidian or Bedrock, then punch it or hit it with an arrow to cause an huge and probably deadly explosion. To Spawn the Ender Dragon, place one at each side of the End Exit Portal.=Platziere den Enderkistall auf Obsidian oder Grundgestein, dann schlage ihn oder triff ihn mit einem Pfeil, um eine riesige und meistens tödliche Explosion zu bewirken. diff --git a/mods/ITEMS/mcl_end/locale/template.txt b/mods/ITEMS/mcl_end/locale/template.txt index 3f024383e..08c7de07b 100644 --- a/mods/ITEMS/mcl_end/locale/template.txt +++ b/mods/ITEMS/mcl_end/locale/template.txt @@ -26,3 +26,8 @@ The stem attaches itself to end stone and other chorus blocks.= Grows on end stone= Randomly teleports you when eaten= Guides the way to the mysterious End dimension= +End Crystal= +End Crystals are explosive devices. They can be placed on Obsidian or Bedrock. Ignite them by a punch or a hit with an arrow. End Crystals can also be used the spawn the Ender Dragon by placing one at each side of the End Exit Portal.= +Explosion radius: @1= +Ignited by a punch or a hit with an arrow= +Place the End Crystal on Obsidian or Bedrock, then punch it or hit it with an arrow to cause an huge and probably deadly explosion. To Spawn the Ender Dragon, place one at each side of the End Exit Portal.= diff --git a/mods/ITEMS/mcl_end/models/mcl_end_crystal.b3d b/mods/ITEMS/mcl_end/models/mcl_end_crystal.b3d new file mode 100644 index 0000000000000000000000000000000000000000..803bf99336149d7be36a2af547ff810a03f10947 GIT binary patch literal 12932 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 literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_throwing/init.lua b/mods/ITEMS/mcl_throwing/init.lua index 58399a29d..e46055e8a 100644 --- a/mods/ITEMS/mcl_throwing/init.lua +++ b/mods/ITEMS/mcl_throwing/init.lua @@ -157,7 +157,7 @@ local check_object_hit = function(self, pos, dmg) -- TODO: Deal knockback self.object:remove() return true - elseif entity._cmi_is_mob == true and (self._thrower ~= object) then + elseif (entity._cmi_is_mob == true or entity._hittable_by_projectile) and (self._thrower ~= object) then -- FIXME: Knockback is broken object:punch(self.object, 1.0, { full_punch_interval = 1.0, @@ -196,22 +196,24 @@ end local snowball_on_step = function(self, dtime) self.timer=self.timer+dtime local pos = self.object:get_pos() + local vel = self.object:get_velocity() local node = minetest.get_node(pos) local def = minetest.registered_nodes[node.name] + -- Destroy when hitting a solid node if self._lastpos.x~=nil then if (def and def.walkable) or not def then - minetest.sound_play("mcl_throwing_snowball_impact_hard", { pos = self.object:get_pos(), max_hear_distance=16, gain=0.7 }, true) - snowball_particles(self._lastpos, self.object:get_velocity()) + minetest.sound_play("mcl_throwing_snowball_impact_hard", { pos = pos, max_hear_distance=16, gain=0.7 }, true) + snowball_particles(self._lastpos, vel) self.object:remove() return end end if check_object_hit(self, pos, {snowball_vulnerable = 3}) then - minetest.sound_play("mcl_throwing_snowball_impact_soft", { pos = self.object:get_pos(), max_hear_distance=16, gain=0.7 }, true) - snowball_particles(pos, self.object:get_velocity()) + minetest.sound_play("mcl_throwing_snowball_impact_soft", { pos = pos, max_hear_distance=16, gain=0.7 }, true) + snowball_particles(pos, vel) self.object:remove() return end From a31ed90a81869e287652fb951051a1dc94130e31 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sun, 26 Jul 2020 13:28:13 +0200 Subject: [PATCH 03/18] Proper model --- mods/ITEMS/mcl_end/end_crystal.lua | 6 +++--- mods/ITEMS/mcl_end/models/mcl_end_crystal.b3d | Bin 12932 -> 20852 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_end/end_crystal.lua b/mods/ITEMS/mcl_end/end_crystal.lua index 50d3312a8..9872907f2 100644 --- a/mods/ITEMS/mcl_end/end_crystal.lua +++ b/mods/ITEMS/mcl_end/end_crystal.lua @@ -28,12 +28,12 @@ local function crystal_explode(self, puncher) if self._exploded then return end self._exploded = true local strength = puncher and explosion_strength or 1 - mcl_explosions.explode(vector.add(self.object:get_pos(), {x = 0, y = 1.5, z = 0}), strength, {drop_chance = 1}, puncher) + mcl_explosions.explode(vector.add(self.object:get_pos(), {x = 0, y = 1.5, z = 0}), strength, {drop_chance = 0}, puncher) minetest.after(0, self.object.remove, self.object) end local function set_crystal_animation(self) - self.object:set_animation({x = 0, y = 60}, 30) + self.object:set_animation({x = 0, y = 120}, 25) end local function spawn_crystal(pos) @@ -66,7 +66,7 @@ minetest.register_entity("mcl_end:crystal", { initial_properties = { physical = true, visual = "mesh", - visual_size = {x = 7.5, y = 7.5, z = 7.5}, + visual_size = {x = 6, y = 6}, collisionbox = {-1, 0.5, -1, 1, 2.5, 1}, mesh = "mcl_end_crystal.b3d", textures = {"mcl_end_crystal.png"}, diff --git a/mods/ITEMS/mcl_end/models/mcl_end_crystal.b3d b/mods/ITEMS/mcl_end/models/mcl_end_crystal.b3d index 803bf99336149d7be36a2af547ff810a03f10947..b6c2b9a3d9fefb019c65674128e188498869a1c5 100644 GIT binary patch literal 20852 zcmdtJcYICB8$W&{N{SSsiwM#LQEsrvnTbwB8WLH(vx4Y7IV_e%^uAh%=u)(mWG33i zDiMjc7OO0=Yh{&Ko$oy7%-nnK&Gq^H`}=<9<;l#s^PcxS^UO2lJojqXPTwIWT&J_r z>2&QPdiC&Qxl*1mdE!XFCQX{MXBnG{ieMGGFD!+GcIfEK7{*PWu)lQ{}jOf{;ysb(N3Y20JXB$R?edps@wqe-kk_(;GWe4O;9UWpSAx%Bi z)KisTt$(n=H;}bg>T`dr83;JFUWcJQuUGhaJ?H;l_1Ua{r5#%I)z_pj7*eqOKgThu z=Km}90e-dKvV9Hu{g3%k_1E}^@L$Gl;QxyKfM2I`NT@|^KGX_yV!6h@Db%rqHT76i z4{eqG1M00tZo#a*Qg8HssF#tZUg6jHKci6VdH-ho*@7Qy>Vi2mB`eoAK*J|6iFOgMPyP(7wd}{dN6- z-^4y&YcKe*hM(CtTeSa*{h?m*FHx_I&uAY-fABwHf2Cft{~Gu$&p)(R_1DyE{NKR; z75nKF{dz`p?Qs|`LoC64h!=I%{24wk%cKmG(oD+nXDG94m5yDfbT&-v`7@LqnK&>h z&%}v8L%AZ83QU}txbSBvS7B0_NhKy#`7@MjFsaU@8k3s*8Om-!pBbG&d<0GbskE9YP60)55J=!0kiZEbfpb6tM}Y)R0!b(hP67!W1`;?6Byb8y z;4F~9aUg-yKmzB01Wp4990(FP4? zCU~yPb8sqn2IqksoCMw5;z?sa4tyTbdbOSA%XKj0w;q6&Ibt`5fV5dBycuJ;DnIC0U>b*QJfB*!5Ja7 zQ!~XWp$N_g37irVI4C4=PDtH4M)$~LlLY=?rF^23|A+s{FlK;pKa-Jn5m!a{sao&9 zu)~Q@U*eTI?u&9vr56^lLq2xONatAYukxq&uPtJqA9|1x`&s2J!}Xo_`$vmd;uxIy z^u3DZelNecSt^h>V{L@aI^F4U+cP`8Qn7q($ltWKv54K?|7qsSKUFMWKk~{&jtce* z8wZH6(}+5Cvvyuov3!lm12QUGMeJV<8j{j|W+_;{zsSeWM_a_s_UuIZ)t{+g`5q*n*gRCh zn$JbjqCsTm(di17?^ANKZsRQSM%0ZX2R}_!uzW9*Qw~nI$lLn2rDWgx$qJV5ck;9R zITo>YAAcg#_Dxin4fi)Jf1%v-0-~K*C!K(YX zP7dt9Ucs8r#o-TcNcpz|6l_hMlH?n!Hd^FG6|AXWVIKvno(DSlZMUB+@-BO5OaDoU zQn2cop_6}_zu6-1m9frrY`-1~Ry|jA@{_TFHF(5 z-0n)t#sw)@caF8hn^rYdpE9>D{pC_e1*@K6I(f4Nech&{>f8M2L;X_&6|8#BS+;}C z)>Qra{eHBgR~u|w^^muE7U~T4)y~E9rK$SYxBcl~4V&Y#cMf}daD6eKH{%{D<4!nL z-^HN~jn45?bWqP!%l?p;lA=%cYfA^e_g1i8ocCV~e)i=4A$@Ms&h-0B?g~~tn{@{N z{mk}L5YQ!~;GjOOTzC2^s5-XG-&?+-zdoTjiY}gRtLUKK1K7IY>sV`tC6Rme^^5z`b6u?zta?|_8TJP&rY8ur37@@N ze{%gGI;_-7R5h@IcSCLmJ>PdevT=a`_U-&#`mEc-=!Ze~k#j;qvU=yx8TKFT*IW7K7feq)7+)OFuB^q@shGQR`Kl%E$`?7Og^^t&cc zrgKNEK>JXaWPVSQSMzg7JICKo+^F~XVJf}9Z7y0eXx=Vl4N+74ZNY zHr?T7g_6oy?c(=8`8mIrX!X4ly;5HFaGxB*?`K;3{w;`dQm;`hE%Z2TZ#2Z!k8`lGMn>8hPu0=}^g^yGI|i}%US9h})z$ceS;%f77M$v`p^_SpegAXt}|qHzlw!xlaCf{NicG%pD4r-?Qbc zUq30>56l-pfVbxlPX1{raWuLxH!CUM-Mc;4;qIbRfl$=yd$^&K|0Ab3`f}cftm1dF zR|fzvlDc_i1EHX`!`Vzn{|;Se(?^FZkwnLK$^1?)=N__Guv*^v%^m$aM$e*edNw5W zZq4!P1Z0f2uUmycC}{oR$Z7}wzuL^Cx%)bhEn`Y0cLo5%#yM6Ego4&5@7^fyfBB#3 zH11?S67Op5-30&)>k?Zl5DHp-yL`0w_Z=~f&iZL8@%j7vF z`&Qcc7x$h(YrWk`-Zn4i9n7)E&$m*rz$fICYdQakC&$rKGtw2_?i_oocH0uz?NiJ6 zdtZ;C@%>II*bt6g)~Abt)!H|GtF`~}<)f(E#w%ocwnwh!FFmp!{Ww=g zZ+=6zk{A=}kR1+0c>E>ymqL?6yZE6s*?I`h9+;-|5qXzRGZ> zOZ+x@_vF~%voQ)*tFQ0mLVeA?-RZ^Os!@RT;@IW(;}xt{hc@5c(@%BnOp6NLX~&g2 zlOs8HWy&N4tJNXt-c9}Zm_T~`rVpJRwAVX|V{aXts$jJ`c;3y^dxf{6pEfs9bm+~o zKGri7tadKY=yU0{@|)t7^}oT+MXBD=99wPw%o13iRW!ZFyZSh748}DZ?eqSYV{h%5 zrC_yV`+3OG^fCo?@Y;Tz@b)H2$$dEX?@uaLt3%;G`_qSwsg8@D1>?Gpw|e(A83MAmDM|KKaRDe@6z!b(g%9j;0_milu!EL&&Z=eUA-{Y^ZjSxg zTG8nSaICPeR^NL+&rd(v?HP)?IT%l#=~`+IS{+87!|5x1 z_M%4<)c35R99xmE3oUkFfM2@px{av6!z9HH!#Gx~H!aq4bglHZ`xc|vpeYJ=ILBIA z$Eiad(vLr$fg+ksQ?MgA)|2lKTHfIAKBk2f4?wY()c4qt94q!6Eq3JjKhh2+bV3b1 z)c5029BXMmJ6U`tZ9Vm4cQf_9`#X-cv`<$5cVAlTCDqUo5A}V1G{>&7u>W2s zwnhneX5;xTR-Q2&YiVCk+!vQNulT<7WSkmP7{jsRywHxV?Ubmr7rs=wdtb$lEptgb`gE@J-*gol%dz6z)MBendY0;SFhXj# zN5zik*vtGp)?%lAcOrGeFi$Dryo#N`vErQ9`ug)*OH=zF{}AAKKOWC?($$;DvEu%q z#kxqLspJ1R77+h$JZ^6z*PX<%8T?+N)xp}sDRr1tT!8yqRfowOYw5nTFyv@T=j=KG zc^_5m6pmeH;T|RV1gA9eJkmy|+<$bssT_NN-_NuvRxY53Z{G4h34tMlqiE0t*00rZIJR zhl2$7TQ#@ld1;=P;dxn}m*cq&&uw{b$8$AKC*$(`*@5SdJXhmlGIr+AYCKEEYOG4e zF8uRKJg?02Dm-VyWl6@>lwAEn28uiuqkJ&~&#v%?rCMsHd`Sbv+Wgs_=R6*vd^rOj z)#IOg@Z6K#y1rF~Mu-4(OQ~1;#b(m5>QupPOKkY-P z>WfA!tPz17J@?*`alB^2r&dLzPw`RP|{i7W@fx z1@571Y|)Z=`NSqImxK-qp{m~-v05E|a@Vb!->-#Gb^Yj4h0VlW4|4l-Ycx76k5v65mo%vxO4T)HTe&IqOIIxL9=9f}-2NaH)D7EV*~tfzo$}s+yxR4aG9Jv9Y)nPZ^Xiw00()Knh&IM_UB1t`^&_uLpW9U1yd~a z57@j(H>K@M&XF4}FOy9d!l}A<7_qaGAvRj-cxPV#LCG7|b2W zo1in&wM}Qqz+ZC7$tMw1-Ghu+!3%oi^*SMCb~r=s1m}{4GkQ>UpE6kasW$tI~&=ab~fsb5LJj$TyVH;q`~zmUHhx?Vam=_GlalS2}! zM^bffHDbYLpa)=6=C6~sxt${OMxG^+b0aC=e`Vpn&^P!x6z80G(U>mntPUIZtNYI!5M3Mp1qqfDZn^EwGR~?#!0PFTO->%t{Rw?We zIso>&O`oM9uD8gftes?Ztw`#wK)?<%JMVS%1s3vGHSE!E2k(+U(zlY#vArli!(^oi z`y;S07dtLhMlEa~lJ7k>k*@oD(z+^0VCzHQfP*$G+Sf*tY8Mh$uXUv5?H-h$g#xRL z4R8u}h&S5*_;0f0!YblarU&&f@XBedSYJEG=iU5JXs;qtw%!WTwowG-XDaZ**bKZd z*J!*R%^326bZWkgWPTe?`MC>NC4s)sKjeQ6YKa`}i-~)g1hQ;p80BZPEapOBVSE)z zwMJJv|3|)Cwv=Sv45jM%t=JdlZ4Y3@yj72BgMO^~mh8T;lvp(hrS;XW4ZP4laDx1s z-3Hy9{*K(*pFlot2%-EQz_3bE=1u7F*sBey9{ZjQue+QCRt=&2t{|{`1SjDC`=u3{ z{OLUjslJlTOYTk^s(c14=qm8u=UXCQuMcG7?A7E&*Y1?xIRFd3uFNs$4E9~oyE&r& zz9&+fbp(G3ru<&Qv9b^J4ZMJlSlbLa417<*@kZjD9Zc1`i|XeLW55FM_d6P+iL>94 z1=BW@H_L-*6V@@qDDw*?!3%p;=Zy`~z3y+x+Z)?R+Sp*q??5u(AORor58}SOK9X+y zN8H1A61(2Pw3!N#)lB6T*x{?aP@LOq^5wT=;u0K8VPaX5**_@m7Cs5OM5NY3e|o>4eH^^ITdMT~_H-&io_K<804X2$= zvC5hUeF3}Tev$Nc&jGTy^dk~Z!f6*3%a^En27o^T{!Qnn5?#2Lv?+c>+Bc1$UCnp} z4#t+9S17$tNG9)+ACoD&BWRF;7uLMITdYmUBj^4pJrqh1f%&4gFp4SfSQ z@Gc&BUwT|Ok=*TFNFF5ipur|sbx##~ES_*zYII^NdEc{;jPvYCyDM0w|8!Pl$A`Ms zfPXRhU7E3EGpXxRNV4|!q#;Hu*g`okVBVn3tl-}y$8DQP$5oF>anoKjRKXg3QuGhJ zT|I6{>pyHD&96TqkALn(!_2V44loyQL#|1MN$W|KJAaa<| z+ho9+-Zat-3u6MEVSImG&zCYstS3%?-y%((_NGy0Sl|^p+m^p7z4~PX8Fcw3`MGg4 z?QM!R=nFb*I(|)hzGxGvci=jiJ209?D_GfJU$7P66hFIuLt3!JAk)fY@QxQ|= zP1v={=<8bs7fR0@_mgGoFOUgIz3Bi0uTt<4ehzIG*gusbgAS3>-<~G}Tlb~|O|d55 zcm0r2BstDWBOQAFN*<9YI>;2eTg)%$oH6*N)Optta_Wb3q-={QI@lDe*a3V3Y|*Uv zwbcC3aq{G44tbdvNr#wX4R!$DnnT}7!K*UJPb+gszD*<@YKk@7X#rbi??=fan2?0Q zIVAbJUUZlVR%X{$qs@MzU!)P&vdN)-Ii$gbo^-egR;Pop34LS2tk8jmr%7O34msbj zCmmsih41;r91l$@g{p?1CGjMOtY6WCjx@z4!(50pH0Z81vT2_~HdQ-Ex_yYCqfD^! zF3>^Pxc_qF2vxcLMd z^gJw=l;3@xteO!<$C_cqxIl*&Rcujg$IIkQ^9y8Sr7$|q6q_V;1sktVwng?e@<<1I zfjm4GN@Gp2I_+E(dD@}OD|zH`+lwS-Xeb?Th6O$t8{}_S+9AhrSID7^i^QWwD4k%6 zWv^(eeL(tHy7@Ddp~K7>wIvEm-(4t;|j&}RB!dsNw`fb90oC8vWz=oC}l+CpE@ zBkHz2nu80-^TD|!uVDzCYKq;g^~r5-?a{R11!V2wTr!EhJ54je8ov(*T_)I;M|)-$ z5YL^tB+)K}ikQ0E#CX>LeJiv3WG{A~?8okt{n&jHV(K9*5Hf1)*kOvTW!8#|x=LXL zst7*wsJh`-#^M*m%70$~bZOp%MRXJA)i)IO>o8?LWy~CcB^d|uTzw;uv3lE= zv3ir2aR*+n-oV+f4f(TrbC$8CU#cq*_D8HTSUItsM+eLs?up%!bog8u7yj*y;-?B+ z?9i~{H~uy);AOZcez-@6zpd)RB85tl)eQcsI|$_VdCLQaxp-o$pLO^^Hy6zP)qvIV z+AK&9=)c3g$U0iFN7548_8QZAXR5de=4lG_bTC#Di zgF}C|!b@sZ!M0|+ps$cpu`8u=$7^F>`%?Jyvntp;st!8`=nHw_hIGlt%?;lkSPIWS zT@{;0)nVrc0o$cc_)TgR;)*?vl)`1#RO8>0S+>Jt$5P0tYYp7Q${MeYtd1Sb^aVcv z0X<&ds*bigSHlSb*0|t(b!;A0hrWdlw4OggyDMYYe%5&Jgc{h%j2HL>@8(BgD6f(W zZX9KelMdA2-`bh#3pN9MWtUj=Z(nD;zm_$2*jNKsFyjRs#N7RPZXx<>p#$!bSPIYf ztiiwiGx7qT;GO-`Msz&U4hLMf!hNLb{2M|e7B~S5dLJEm0G&Ki4)@us!=o-&#g)u- z5dFivRkJ&Z7U!16ZtkDayz`ZDWiu@B3EA4~8ba@_aL%iDs6%ZRT*V9vwtdS4@+#H; zMo~*Xqln|h=tQ;?W`_wRS^3NUXniNO<`)zm_YMv2Q-o?H*^6&A4Oq|@>;`SJob2#l z_lr?R-ec7Jm$LkS6PfY~?q=gF;kg%{qd_ir(ZRY_;(r{m+rOFw4(!}`xf@38*DQU# zuA)jaUL*6UI$%KukYhnUI5y^Qk`kdW?45J%nN||AO2MSoLiMFrWwI>mIko0U3{w)4T2H z^vlDjwgIaYlt`|aw~!}YaO~(uXll$V)L%+O?h3>hRTrF~ODnffd`EtSN*|nuW)4e0 z=23N+-#1L4&Ax>_aoOvS(1DRLD6i=RWFA!qJ%ucGj>Ze7JVr6!hM_Yq9TB^-L6Vif z><{3;4xq#LJNx3)(S@kug63%Ylgh|L1u?7|RfloGoPiFBtp?z;8BfrW=B~&y=Dg%- zz^YMo-~~M7Nf!p<;iLXW*OE%3=8Z!nFC$hd0Y=#3_r8PJubTcr3(DS=hPNlJ+3N`; znf+6bQ8veb1-blsAhx?!ggRY4D%JU^Z5Dg|11R$|1*=2{z-}}K`DuVxgZftN=~|E#D$%%keyW2_HFcC7ps*H3DZjjQ)%!cE}3&rsZPN$e^zpRR>)G z5B$*)A-MM|9lql`HQ+?~t;AAP9dIB6M|H)GQ%d1eW9$NIZ%8HTHQHcXAMs`m{Feed z;5NfcWHfb_00_Qbtn;42Ri@`bQv9117}A#;c4ZDXKszFP$H@>cmeCS zp)#J(${Dxwi^;T|Ub#e69rOhpa*0KiI5MTxo2VS`ojo8JqcbdtHlB zb-;tvX7|Vfc8~locy#8B;hrU;>ROx4oB9r|9^!(_KN^{NrMwSiivW^%8&skLzzMb+ zZvO&JdEtV)M~%pQw%L~kDo|6O6xg88g{UZ{61FNcJky~{qY_bdumNy_Sa-RL7VM~u zXSW@ic{sLliKse^A9z9UD)$P|z4KLYPUxV_xx1TwHL4ESms#h~exGW1)4;x&4#)H* zqUwMFUXa%}GtqKV9lu%HGxOT&<|U%)qJL;}$|nW+CDg=2Zg$D6+^S`Xs5*>E_`~I- zMD%HWE&R;mo6PkazWHiY9eCrru0}rhYGcQibuy3bZB-(wE_lHn6`bayc|+^sKhjHO zRvOT{L{weq3*X{TDjbD+dU@h^{zo%XlUtXFsspd^$tlk}BR5YUyx6;5M&`uUC8Fvu zF2Dl+qqZJs(trkdq+LquQz@-VMAZc+v}ttrla!M0hfj6?rOk<;Z%Rbf1r~VE_@zjx zGn(PRO@RU5Hf&)rst!2dy}T1kE5lph^^MjC%)t5*QFXuo7WmhWznU>5v^D*u@vY2D zV;W;iQFXw9eV1%@knW8_^vo8QEVA7fhpWEMw?Lh877E_$iJPQ_tJ~29RRXiRg5Sp_b=7LJxsACk)_Hf>!8xV2hoq8*JLf;j)gV-GC4?5;IFdD@XL)QMRTntO`%a2QhUh5v)13_7R<-~%kkv^E>jA)9DA^Og&F@@GCWkE#n^*e^E?-i?}W>Okg7mHUG#mkE+9%gv4|^hRPl9 zO*?oUCr1~05c8y!`Nzgk3>1=I@0%3ACO~h&lB^gx)>Ma(^5jw z$T{ukMXy4VboT}^kE)9~2JXeDTB3*uOlP-$O7b5)B<4|dE%wDuceJ5>0DX0)1QFR!TkOrfkN2@((VyPby&;)>tV=}I1rGcyJ#d?(Kh~65eR)fc^eI~+sxGjgN6qeWQr5D@v})RW za`Kr?iKx1EZ1#QINmVvCqNnSAB=&ChC8FxUC%Ao2m6tC3(STY-eu1S{+_yuWGa9i8r;o z^MxENa4r#5hrJI3_P$B_Y8hcVZyMc9N7wAE@YSd~jBoGocNxQjz3Aj&I$EJ!#S&3< zu$i!1M)%eMkrzF&`yw5_cc>yZkE)At0lt*$fPgpgp4fSd4#z*Qh|QzwfQ9ja)M-CD QU^1zsR-B>5D+YjfKud31&XkHXIWT+NY2%%pHp=IUgR?XBpwYP5H_LZ5lXJ4*;iD#N2bReA8 zvV6so)&=U}Yuj&|xqide^_$ul=~4du@%rHPt*e&)dWgBXapme&L(etWETF&Iysz%8 zb=>??@%Vs=@jE*{TN^Rp#p2}7Q-uzxNl`m?qVt3O18d7){p-Ou+P5^yxQ?#&_Cp8F zzZ84NKGpg2rOy^}ikWQj0(*P>~dU)1-DGbX%J z==`0s0fZM@unNY9tAkMXoWC7%!e)BcuxzBYf={*}MqA^eB(^{4saU&;Q4 z^nT@^zpbyFU*^9Lex~&ueC>~2&$R51gHE6Bn)>pH+JRSo5UJT4tjBoKV_e4?()g4o zht{6|{hmUfPvh&RPo>V|QuG*4{_}Xv{7X^pe_h>w-1WvD)|dR|_34Nl8yZ49Z)Be=wPvhP1Xa39AhyOF?@8!Rt?!V;o z;rS5D_t*UQn7`Nh@PEesFkb6kzdhf>f6-%HpIw)p@8O^E9{bOD2tCGo&5!>O%J;V+ z`R_5F{C9u;Jl_|8%)icGvVZv3J7C)S*!aQz`0!)D=zQSWrLlA4lkx8M7djc!67PCp zRs8m(H=CxsJgInk*_!yL#*M}N!{azRSloN>4V`=MeY}|Y_SfV4{Z9V$-Qqy;+n?Qn z?{t2@HEVR^TX#Gk@1Hz3j=lB1&f`~f#x-$znw#~P`#+TY>+=V1+&;2XpReijO|pLf zLVdo*+?cMv)^MUIbp1`b{@R#L0}5S#la1^BRJuO=OHuA$>hIUI=5G&1eZQK%-@=Zg zyQ99J&Ts3}_16a9{==yI)1~`Udvy2SsQc4ZkN@TC!+%;|iT{x1FaLaOedYUW{>#^g z|MdPPpN~CXwSVRBcZl_e^7-)}g8J{{{i{BozW8JQ%l9v&`B$%8w(0=MkQVZx+zbP9 zpZ}kuHb`xt+Th%$t!Y)zbSivI?Y!KlJzQ;=+EBIgbD#Dn)jpy2akUY-Px}J3QEDUA zM&~~53)RM|jZqty`?No$c9Gh6wF$XT`(m|;Y7J_W)acW`L~V-NWVK6kpY}AhPpeH; zyDax8?$~zQ zmo}xL_kJ^jfT2aSu3I?J{Xd;>#q!qX{`MdK_RG!szaRx=pjC+!G$9BDa!?=v1#(az z3I&o->WhXX6bM6sEEGsVfh-h=LxD6D$U%WL6bM9tJQPU6J3=06h(ryEs38kAB%+2; z)R2j~A=eXgeQ~ZK72}YH8d6b1Flxv}4T-2B7d1qqhGf)`i5ikoLpW;4Mh&Sbkc|TI zD3Fcn-%rm*<$jrQyI#1I$T>S`}xhT^fzPu8f`6`QVnpcS( z#6onQQ~jDMv6=UB^RCuPY(5)u!9Q12V)OZt-LuwKV)Gf3HRCr{V)Hqawcp!OiOpwK zuDxz&B{rXD`EbMimDqgd<@oULR$_BpkX_^VRbq4Okl)?^^a=W}i+V;uQI&i`bcBQME0qJ;j{`A*IwWvL^N%DJXYb>wF` zAC<|Dybs}|#g$JYhCbBfM1MC3?_4;)D@^NnPHX+>>-RvtPCm&mdubqvmcL50+*G3F zof0jllxX>)M9T#wTAnA-ayW^WpGmabOQPjf5-n$vX!(#t%XK7L9wX6m6p5C9NVMES zqU8+|Ehms@_q{~B%O%=9EivE0NkH>n`R+_Ynts0Xl8~mK@2VuI={N94OTIsnn5LiO zeiGC4bG%L>n|_Y7NmSF%@iB>Q`Z=y8aZNwRqa?cN=Qxr?HvRt>4OGED(N|6UgJ)hW zT=Zh$s}~EWy;ykf#d0>hSk8|Z%Ng@xIfq^>XVr`4JbSU6c`uf@kg!urW0xo-afjI9 z#S&kBSOTy;$O}7mEh+Vu|BkEE>p*skIXdo|^ zT)~S)19`FJ99}FM$crU+@nX?HUMx9K!j|W+qL6e4pn<$tG>{iN=Pa;jAg^CEkQa*v z@?z0IUMw2Oi$w!@v1lMK77gUZqJg|vG|(wcPBv`b+_p75+A*&P?+jb;-ky`s_*KwH z-{RN5p-(>#>LP-vAp3cczNw)9wqJtmXGGTbzo~*GnhKI=-*8Ce z$cse173B4c3i4u6L0&8>$cseLB`5P@$=keGayu`U b{LhOeNAzOJBfVI1O)r*w)Qcr&^ Date: Mon, 12 Oct 2020 11:07:11 +0200 Subject: [PATCH 04/18] Changed drop chance --- mods/ITEMS/mcl_end/end_crystal.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_end/end_crystal.lua b/mods/ITEMS/mcl_end/end_crystal.lua index 9872907f2..c07ff7930 100644 --- a/mods/ITEMS/mcl_end/end_crystal.lua +++ b/mods/ITEMS/mcl_end/end_crystal.lua @@ -28,7 +28,7 @@ local function crystal_explode(self, puncher) if self._exploded then return end self._exploded = true local strength = puncher and explosion_strength or 1 - mcl_explosions.explode(vector.add(self.object:get_pos(), {x = 0, y = 1.5, z = 0}), strength, {drop_chance = 0}, puncher) + mcl_explosions.explode(vector.add(self.object:get_pos(), {x = 0, y = 1.5, z = 0}), strength, {drop_chance = 1}, puncher) minetest.after(0, self.object.remove, self.object) end From d2518c91e8eabd353e3c3496a4629d24f0a1c4a2 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 23 Oct 2020 22:01:59 +0200 Subject: [PATCH 05/18] Tweak German End crystal translation --- mods/ITEMS/mcl_end/locale/mcl_end.de.tr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_end/locale/mcl_end.de.tr b/mods/ITEMS/mcl_end/locale/mcl_end.de.tr index 3914c2a98..69a3408bb 100644 --- a/mods/ITEMS/mcl_end/locale/mcl_end.de.tr +++ b/mods/ITEMS/mcl_end/locale/mcl_end.de.tr @@ -27,7 +27,7 @@ Grows on end stone=Wächst auf Endstein Randomly teleports you when eaten=Zufällige Teleportation, wenn gegessen Guides the way to the mysterious End dimension=Weist den Weg zur mysteriösen Endedimension End Crystal=Enderkristall -End Crystals are explosive devices. They can be placed on Obsidian or Bedrock. Ignite them by a punch or a hit with an arrow. End Crystals can also be used the spawn the Ender Dragon by placing one at each side of the End Exit Portal.=Enderkristalle sind explosiv. Sie können auf Obsidian oder Grundgestein platziert werden. Man kann sie durch einen Schlag oder einen Treffer mit einem Pfeil entzünden. Ausserdem können sie benutzt werden, um den Enderdrachen zu erzeugen, in dem man je einen auf jeder Seite des Endausgangsportals platziert. +End Crystals are explosive devices. They can be placed on Obsidian or Bedrock. Ignite them by a punch or a hit with an arrow. End Crystals can also be used the spawn the Ender Dragon by placing one at each side of the End Exit Portal.=Enderkristalle sind explosiv. Sie können auf Obsidian oder Grundgestein platziert werden. Man kann sie durch einen Schlag oder einen Treffer mit einem Pfeil entzünden. Außerdem können sie benutzt werden, um den Enderdrachen zu erzeugen, in dem man je einen auf jeder Seite des Endausgangsportals platziert. Explosion radius: @1=Explosionsradius: @1 Ignited by a punch or a hit with an arrow=Entzündbar durch einen Schlag oder einen Treffer mit einem Pfeil -Place the End Crystal on Obsidian or Bedrock, then punch it or hit it with an arrow to cause an huge and probably deadly explosion. To Spawn the Ender Dragon, place one at each side of the End Exit Portal.=Platziere den Enderkistall auf Obsidian oder Grundgestein, dann schlage ihn oder triff ihn mit einem Pfeil, um eine riesige und meistens tödliche Explosion zu bewirken. +Place the End Crystal on Obsidian or Bedrock, then punch it or hit it with an arrow to cause an huge and probably deadly explosion. To Spawn the Ender Dragon, place one at each side of the End Exit Portal.=Enderkistall auf Obsidian oder Grundgestein platzieren, dann Enderkristall schlagen oder mit einem Pfeil treffen. Dies bewirkt eine riesige und meistens tödliche Explosion. From 4ad1adb8506ba4629e71a1000992e5550d84ea70 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 23 Oct 2020 22:13:55 +0200 Subject: [PATCH 06/18] Add 2mac to credits --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7b5762de8..fda747a2a 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,7 @@ There are so many people to list (sorry). Check out the respective mod directori * MysticTempest: Bugfixes * [bzoss](https://github.com/bzoss): Status effects, potions, brewing stand * kay27 : Bugfixes, optimizations +* 2mac: Fix bug with powered rail * Lots of other people: TO BE WRITTEN (see mod directories for details) #### Mod credits (summary) From 3fde86eff6b6ea4d3cdd25b6455ce00040d88e5a Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 23 Oct 2020 22:50:53 +0200 Subject: [PATCH 07/18] Experience: Clean up HUD elements --- mods/HUD/mcl_experience/init.lua | 36 +++++++++----------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index bb62acbec..07f2631a5 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -72,6 +72,7 @@ hud_manager.add_hud = function(player,hud_name,def) direction = def.direction, size = def.size, offset = def.offset, + z_index = def.z_index, }) -- create new 3d array here -- depends.txt is not needed @@ -144,16 +145,9 @@ function mcl_experience.set_player_xp_level(player,level) name = player:get_player_name() pool[name].level = level pool[name].xp = mcl_experience.level_to_xp(level) ---todo: update bar hud_manager.change_hud({ player = player, - hud_name = "xp_level_fg", - element = "text", - data = tostring(level) - }) - hud_manager.change_hud({ - player = player, - hud_name = "xp_level_bg", + hud_name = "xp_level", element = "text", data = tostring(level) }) @@ -174,7 +168,7 @@ minetest.register_on_joinplayer(function(player) name = "experience bar background", text = "experience_bar_background.png", number = 36, direction = 0, offset = {x = (-8 * 28) - 29, y = -(48 + 24 + 16)}, - size = { x=28, y=28 }, z_index = 3, + size = { x=28, y=28 }, z_index = 10, }) hud_manager.add_hud(player,"experience_bar", @@ -183,26 +177,18 @@ minetest.register_on_joinplayer(function(player) name = "experience bar", text = "experience_bar.png", number = temp_pool.bar, direction = 0, offset = {x = (-8 * 28) - 29, y = -(48 + 24 + 16)}, - size = { x=28, y=28 }, z_index = 4, + size = { x=28, y=28 }, z_index = 11, }) - hud_manager.add_hud(player,"xp_level_bg", + hud_manager.add_hud(player,"xp_level", { hud_elem_type = "text", position = {x=0.5, y=1}, - name = "xp_level_bg", text = tostring(temp_pool.level), - number = 0x000000, + name = "xp_level", text = tostring(temp_pool.level), + number = 0xFFFFFF, offset = {x = 0, y = -(48 + 24 + 24)}, - z_index = 5, + z_index = 12, }) - hud_manager.add_hud(player,"xp_level_fg", - { - hud_elem_type = "text", position = {x=0.5, y=1}, - name = "xp_level_fg", text = tostring(temp_pool.level), - number = 0xFFFFFF, - offset = {x = -1, y = -(48 + 24 + 25)}, - z_index = 6, - }) end) function mcl_experience.xp_to_level(xp) @@ -257,8 +243,7 @@ function mcl_experience.add_experience(player, experience) minetest.sound_play("level_up",{gain=0.2,to_player = name}) temp_pool.last_time = minetest.get_us_time()/1000000 end - hud_manager.change_hud({player = player, hud_name = "xp_level_fg", element = "text", data = tostring(temp_pool.level)}) - hud_manager.change_hud({player = player, hud_name = "xp_level_bg", element = "text", data = tostring(temp_pool.level)}) + hud_manager.change_hud({player = player, hud_name = "xp_level", element = "text", data = tostring(temp_pool.level)}) elseif minetest.get_us_time()/1000000 - temp_pool.last_time > 0.01 then temp_pool.last_time = minetest.get_us_time()/1000000 minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100}) @@ -286,8 +271,7 @@ minetest.register_on_dieplayer(function(player) temp_pool.level = 0 temp_pool.xp = 0 - hud_manager.change_hud({player = player, hud_name = "xp_level_fg", element = "text", data = tostring(temp_pool.level)}) - hud_manager.change_hud({player = player, hud_name = "xp_level_bg", element = "text", data = tostring(temp_pool.level)}) + hud_manager.change_hud({player = player, hud_name = "xp_level", element = "text", data = tostring(temp_pool.level)}) hud_manager.change_hud({player = player, hud_name = "experience_bar", element = "number", data = temp_pool.bar}) mcl_experience.throw_experience(player:get_pos(), xp_amount) From 53dbd4e2c2b8d76f21fc35e4e15dc966410193ec Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 23 Oct 2020 22:58:13 +0200 Subject: [PATCH 08/18] Clean up /xp syntax help --- mods/HUD/mcl_experience/init.lua | 2 +- mods/HUD/mcl_experience/locale/mcl_experience.ru.tr | 2 +- mods/HUD/mcl_experience/locale/template.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index 07f2631a5..f0560ab7b 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -472,7 +472,7 @@ minetest.register_entity("mcl_experience:orb", { minetest.register_chatcommand("xp", { params = S("[] []"), - description = S("Gives [[player ] ] XP"), + description = S("Gives a player some XP"), privs = {server=true}, func = function(name, params) local player, xp = nil, 1000 diff --git a/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr b/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr index 1d2195e8d..72767125b 100644 --- a/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr +++ b/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr @@ -1,5 +1,5 @@ [] []=[<игрок>] [] -Gives [[player ] ] XP=Даёт [[игроку <игрок> []] единиц опыта XP +Gives a player some XP= Error: Too many parameters!=Ошибка: слишком много параметров! Error: Incorrect value of XP=Ошибка: Недопустимое значение XP Error: Player not found=Ошибка: Игрок не найден diff --git a/mods/HUD/mcl_experience/locale/template.txt b/mods/HUD/mcl_experience/locale/template.txt index 963d9dffa..93c0f1bdb 100644 --- a/mods/HUD/mcl_experience/locale/template.txt +++ b/mods/HUD/mcl_experience/locale/template.txt @@ -1,5 +1,5 @@ [] []= -Gives [[player ] ] XP= +Gives a player some XP= Error: Too many parameters!= Error: Incorrect value of XP= Error: Player not found= From 6706104c3aaba267b462f0be16b2331538d04fcf Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 23 Oct 2020 23:00:54 +0200 Subject: [PATCH 09/18] Remove enchantment table --- mods/ITEMS/mcl_tools/enchanting.lua | 102 -------------------- mods/ITEMS/mcl_tools/init.lua | 1 - mods/ITEMS/mcl_tools/locale/mcl_tools.de.tr | 2 - mods/ITEMS/mcl_tools/locale/mcl_tools.es.tr | 2 - mods/ITEMS/mcl_tools/locale/mcl_tools.fr.tr | 2 - mods/ITEMS/mcl_tools/locale/mcl_tools.ru.tr | 2 - mods/ITEMS/mcl_tools/locale/template.txt | 2 - 7 files changed, 113 deletions(-) delete mode 100644 mods/ITEMS/mcl_tools/enchanting.lua diff --git a/mods/ITEMS/mcl_tools/enchanting.lua b/mods/ITEMS/mcl_tools/enchanting.lua deleted file mode 100644 index be01c1857..000000000 --- a/mods/ITEMS/mcl_tools/enchanting.lua +++ /dev/null @@ -1,102 +0,0 @@ ---[[ -swiftness - how fast you mine -hardness - allows the tool to go way above it's level -durable - makes the tool last longer -slippery - you drop the tool randomly -careful - "not silk touch" -fortune - drops extra items and experience -autorepair - tool will repair itself randomly -spiky - the tool will randomly hurt you when used -sharpness - the tool does more damage -]]-- -local S = minetest.get_translator("mcl_tools") - -local enchantment_list = {"swiftness", "durable", "careful", "fortune", "autorepair", "sharpness"} - -local hexer = {"a","b","c","d","e","f","1","2","3","4","5","6","7","8","9","0"} -minetest.register_node("mcl_tools:enchantingtable", { - description = S("Enchanting Table"), - tiles = {"mcl_core_bedrock.png"}, - groups = {wood = 1, pathable = 1}, - sounds = mcl_sounds.node_sound_stone_defaults(), - is_ground_content = false, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.after(0,function(clicker) - local stack = clicker:get_wielded_item() - - local meta = stack:get_meta() - - if meta:get_string("enchanted") == "true" then return end - - if not minetest.registered_tools[itemstack:get_name()] then return end - - local tool_caps = itemstack:get_tool_capabilities() - local groupcaps = tool_caps.groupcaps - - if not groupcaps then return end - - local able_enchantments = table.copy(enchantment_list) - - - local player_level = mcl_experience.get_player_xp_level(clicker) - - local enchants_available = math.floor(player_level/5) - local max_enchant_level = math.floor(player_level/5) - if enchants_available <= 0 then return end - if enchants_available > 3 then enchants_available = 3 end - local stock_name = minetest.registered_tools[stack:get_name()].name - local description = minetest.registered_tools[stack:get_name()].description - for i = 1,enchants_available do - local new_enchant = enchantment_list[math.random(1,table.getn(enchantment_list))] - local level = math.random(1,max_enchant_level) - if meta:get_int(new_enchant) == 0 then - player_level = player_level - 5 - meta:set_int(new_enchant, level) - description = description.."\n"..new_enchant:gsub("^%l", string.upper)..": "..tostring(level) - if new_enchant == "swiftness" then - for index,table in pairs(groupcaps) do - for index2,time in pairs(table.times) do - tool_caps["groupcaps"][index]["times"][index2] = time/(level+1) - end - end - end - if new_enchant == "durable" then - for index,table in pairs(groupcaps) do - tool_caps["groupcaps"][index]["uses"] = table.uses*(level+1) - end - end - - if new_enchant == "sharpness" then - for index,data in pairs(tool_caps.damage_groups) do - tool_caps.damage_groups[index] = data*(level+1) - end - end - end - end - - meta:set_string("description", S("Enchanted @1", description)) - meta:set_string("enchanted", "true") - meta:set_tool_capabilities(tool_caps) - - mcl_experience.set_player_xp_level(clicker,player_level) - - - --create truly random hex - local colorstring = "#" - for i = 1,6 do - colorstring = colorstring..hexer[math.random(1,16)] - end - stack = minetest.itemstring_with_color(stack, colorstring) - clicker:set_wielded_item(stack) - end,clicker) - end -}) - -minetest.register_craft({ - output = "mcl_tools:enchantingtable", - recipe = { - {"mcl_core:obsidian", "mcl_core:obsidian", "mcl_core:obsidian"}, - {"mcl_core:obsidian", "mcl_core:diamond", "mcl_core:obsidian"}, - {"mcl_core:obsidian", "mcl_core:obsidian", "mcl_core:obsidian"}, - }, -}) diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index f0cea989a..f88ea8fa1 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -592,4 +592,3 @@ minetest.register_tool("mcl_tools:shears", { dofile(minetest.get_modpath("mcl_tools").."/crafting.lua") dofile(minetest.get_modpath("mcl_tools").."/aliases.lua") -dofile(minetest.get_modpath("mcl_tools").."/enchanting.lua") diff --git a/mods/ITEMS/mcl_tools/locale/mcl_tools.de.tr b/mods/ITEMS/mcl_tools/locale/mcl_tools.de.tr index 96bf565f7..6c061dd00 100644 --- a/mods/ITEMS/mcl_tools/locale/mcl_tools.de.tr +++ b/mods/ITEMS/mcl_tools/locale/mcl_tools.de.tr @@ -30,5 +30,3 @@ Iron Sword=Eisenschwert Golden Sword=Goldschwert Diamond Sword=Diamantschwert Shears=Schere -Enchanted @1= -Enchanting Table= diff --git a/mods/ITEMS/mcl_tools/locale/mcl_tools.es.tr b/mods/ITEMS/mcl_tools/locale/mcl_tools.es.tr index da16cbd29..40b1d709b 100644 --- a/mods/ITEMS/mcl_tools/locale/mcl_tools.es.tr +++ b/mods/ITEMS/mcl_tools/locale/mcl_tools.es.tr @@ -30,5 +30,3 @@ Iron Sword=Espada de hierro Golden Sword=Espada de oro Diamond Sword=Espada de diamante Shears=Tijeras -Enchanted @1= -Enchanting Table= diff --git a/mods/ITEMS/mcl_tools/locale/mcl_tools.fr.tr b/mods/ITEMS/mcl_tools/locale/mcl_tools.fr.tr index f5fb7a948..02cd7f2bd 100644 --- a/mods/ITEMS/mcl_tools/locale/mcl_tools.fr.tr +++ b/mods/ITEMS/mcl_tools/locale/mcl_tools.fr.tr @@ -30,5 +30,3 @@ Iron Sword=Épée en Fer Golden Sword=Épée en Or Diamond Sword=Épée en Diamant Shears=Cisailles -Enchanted @1= -Enchanting Table= diff --git a/mods/ITEMS/mcl_tools/locale/mcl_tools.ru.tr b/mods/ITEMS/mcl_tools/locale/mcl_tools.ru.tr index 4eb721d6c..e82fa15ef 100644 --- a/mods/ITEMS/mcl_tools/locale/mcl_tools.ru.tr +++ b/mods/ITEMS/mcl_tools/locale/mcl_tools.ru.tr @@ -30,5 +30,3 @@ Iron Sword=Железный меч Golden Sword=Золотой меч Diamond Sword=Алмазный меч Shears=Ножницы -Enchanted @1=@1 зачарованный(ая) -Enchanting Table=Волшебный стол diff --git a/mods/ITEMS/mcl_tools/locale/template.txt b/mods/ITEMS/mcl_tools/locale/template.txt index e08381324..ecb94105f 100644 --- a/mods/ITEMS/mcl_tools/locale/template.txt +++ b/mods/ITEMS/mcl_tools/locale/template.txt @@ -30,5 +30,3 @@ Iron Sword= Golden Sword= Diamond Sword= Shears= -Enchanted @1= -Enchanting Table= From fe1c8ca7581bc094b402815bff10dd0367b58429 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 23 Oct 2020 23:16:46 +0200 Subject: [PATCH 10/18] Hard-cap XP at 2^31-1 --- mods/HUD/mcl_experience/init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index f0560ab7b..c70bcee12 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -2,6 +2,7 @@ local S = minetest.get_translator("mcl_experience") mcl_experience = {} local pool = {} local registered_nodes +local max_xp = 2^31-1 local gravity = {x = 0, y = -((tonumber(minetest.settings:get("movement_gravity"))) or 9.81), z = 0} local size_min, size_max = 20, 59 -- percents @@ -235,7 +236,7 @@ function mcl_experience.add_experience(player, experience) local temp_pool = pool[name] local old_bar, old_xp, old_level = temp_pool.bar, temp_pool.xp, temp_pool.level - temp_pool.xp = math.max(temp_pool.xp + experience, 0) + temp_pool.xp = math.min(math.max(temp_pool.xp + experience, 0), max_xp) temp_pool.level = mcl_experience.xp_to_level(temp_pool.xp) temp_pool.bar, temp_pool.xp_next_level = mcl_experience.xp_to_bar(temp_pool.xp, temp_pool.level) if old_level ~= temp_pool.level then From 3236dc0d8e573e1129075521faf8de9c17b04032 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 23 Oct 2020 23:30:40 +0200 Subject: [PATCH 11/18] Simplify XP bar --- mods/HUD/mcl_experience/init.lua | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index c70bcee12..b984b6d19 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -69,7 +69,9 @@ hud_manager.add_hud = function(player,hud_name,def) hud_elem_type = def.hud_elem_type, position = def.position, text = def.text, + text2 = def.text2, number = def.number, + item = def.item, direction = def.direction, size = def.size, offset = def.offset, @@ -163,20 +165,14 @@ minetest.register_on_joinplayer(function(player) name = player:get_player_name() temp_pool = pool[name] - hud_manager.add_hud(player, "experience_bar_background", - { - hud_elem_type = "statbar", position = {x=0.5, y=1}, - name = "experience bar background", text = "experience_bar_background.png", - number = 36, direction = 0, - offset = {x = (-8 * 28) - 29, y = -(48 + 24 + 16)}, - size = { x=28, y=28 }, z_index = 10, - }) - hud_manager.add_hud(player,"experience_bar", { hud_elem_type = "statbar", position = {x=0.5, y=1}, - name = "experience bar", text = "experience_bar.png", - number = temp_pool.bar, direction = 0, + name = "experience bar", + text = "experience_bar.png", + text2 = "experience_bar_background.png", + number = temp_pool.bar, item = 36, + direction = 0, offset = {x = (-8 * 28) - 29, y = -(48 + 24 + 16)}, size = { x=28, y=28 }, z_index = 11, }) From 5374376e246eed1b6318fd06c9cf40c3c48e5774 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 23 Oct 2020 23:35:46 +0200 Subject: [PATCH 12/18] Don't play XP sound for negative or 0 XP --- mods/HUD/mcl_experience/init.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index b984b6d19..881667578 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -237,13 +237,17 @@ function mcl_experience.add_experience(player, experience) temp_pool.bar, temp_pool.xp_next_level = mcl_experience.xp_to_bar(temp_pool.xp, temp_pool.level) if old_level ~= temp_pool.level then if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.04 then - minetest.sound_play("level_up",{gain=0.2,to_player = name}) + if experience > 0 then + minetest.sound_play("level_up",{gain=0.2,to_player = name}) + end temp_pool.last_time = minetest.get_us_time()/1000000 end hud_manager.change_hud({player = player, hud_name = "xp_level", element = "text", data = tostring(temp_pool.level)}) elseif minetest.get_us_time()/1000000 - temp_pool.last_time > 0.01 then temp_pool.last_time = minetest.get_us_time()/1000000 - minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100}) + if experience > 0 then + minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100}) + end end if old_bar ~= temp_pool.bar then From 529e3be802847c57173a92fb3790a02966cd0d22 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 23 Oct 2020 23:54:27 +0200 Subject: [PATCH 13/18] Credit kay27 for XP --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fda747a2a..83bd4d861 100644 --- a/README.md +++ b/README.md @@ -203,7 +203,7 @@ There are so many people to list (sorry). Check out the respective mod directori * [ryvnf](https://github.com/ryvnf): Explosion mechanics * MysticTempest: Bugfixes * [bzoss](https://github.com/bzoss): Status effects, potions, brewing stand -* kay27 : Bugfixes, optimizations +* kay27 : Experience system, bugfixes, optimizations * 2mac: Fix bug with powered rail * Lots of other people: TO BE WRITTEN (see mod directories for details) From 730e5f6998f445bcc59c61582242c875a975890d Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 24 Oct 2020 11:42:24 +0200 Subject: [PATCH 14/18] Some mcl_experience cleanup --- mods/HUD/mcl_experience/init.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index 46b55df4a..ddcdd1562 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -46,7 +46,7 @@ end -- saves data to be utilized on next login local save_data = function(player) - name = player:get_player_name() + local name = player:get_player_name() local temp_pool = pool[name] local meta = player:get_meta() meta:set_int("xp", temp_pool.xp) @@ -508,7 +508,6 @@ minetest.register_chatcommand("xp", { end mcl_experience.add_experience(player, xp) local playername = player:get_player_name() --- minetest.chat_send_player(name, "Added " .. tostring(xp) .. " XP to " .. playername .. ", they've got " .. tostring(pool[playername].xp) .. " XP, level " .. tostring(pool[playername].level)) minetest.chat_send_player(name, S("Added @1 XP to @2, total: @3, experience level: @4", tostring(xp), playername, tostring(pool[playername].xp), tostring(pool[playername].level))) end, }) From c4f038ab77309c5f757b35ecbfb1c28b69778949 Mon Sep 17 00:00:00 2001 From: kay27 Date: Sat, 24 Oct 2020 13:48:39 +0400 Subject: [PATCH 15/18] Final (hopefully) megre of XP to master, sorry for all possible conflicts --- mods/HUD/mcl_experience/init.lua | 13 ++++++++----- mods/HUD/mcl_experience/locale/mcl_experience.ru.tr | 4 ++-- mods/HUD/mcl_experience/locale/template.txt | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index ddcdd1562..51346226b 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -181,7 +181,6 @@ minetest.register_on_joinplayer(function(player) offset = {x = 0, y = -(48 + 24 + 24)}, z_index = 12, }) - end) function mcl_experience.xp_to_level(xp) @@ -237,13 +236,15 @@ function mcl_experience.add_experience(player, experience) local temp_pool = pool[name] local old_bar, old_xp, old_level = temp_pool.bar, temp_pool.xp, temp_pool.level - temp_pool.xp = math.max(temp_pool.xp + experience, 0) + temp_pool.xp = math.min(math.max(temp_pool.xp + experience, 0), max_xp) if (temp_pool.xp >= temp_pool.xp_next_level) or (experience < 1) then temp_pool.level = mcl_experience.xp_to_level(temp_pool.xp) temp_pool.bar, temp_pool.bar_step, temp_pool.xp_next_level = mcl_experience.xp_to_bar(temp_pool.xp, temp_pool.level) if old_level ~= temp_pool.level then if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.04 then - minetest.sound_play("level_up",{gain=0.2,to_player = name}) + if experience > 0 then + minetest.sound_play("level_up",{gain=0.2,to_player = name}) + end temp_pool.last_time = minetest.get_us_time()/1000000 end hud_manager.change_hud({player = player, hud_name = "xp_level", element = "text", data = tostring(temp_pool.level)}) @@ -251,7 +252,9 @@ function mcl_experience.add_experience(player, experience) else if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.01 then temp_pool.last_time = minetest.get_us_time()/1000000 - minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100}) + if experience > 0 then + minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100}) + end end temp_pool.bar = temp_pool.bar + temp_pool.bar_step * experience end @@ -478,7 +481,7 @@ minetest.register_entity("mcl_experience:orb", { }) minetest.register_chatcommand("xp", { - params = S("[] []"), + params = S("[[] ]"), description = S("Gives a player some XP"), privs = {server=true}, func = function(name, params) diff --git a/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr b/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr index f4c0b714e..42cc9ec43 100644 --- a/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr +++ b/mods/HUD/mcl_experience/locale/mcl_experience.ru.tr @@ -1,5 +1,5 @@ -[] []=[<игрок>] [] -Gives a player some XP= +[[] ]=[[<игрок>] ] +Gives a player some XP=Даёт игроку XP Error: Too many parameters!=Ошибка: слишком много параметров! Error: Incorrect value of XP=Ошибка: Недопустимое значение XP Error: Player not found=Ошибка: Игрок не найден diff --git a/mods/HUD/mcl_experience/locale/template.txt b/mods/HUD/mcl_experience/locale/template.txt index 02afd0927..19eb6cc60 100644 --- a/mods/HUD/mcl_experience/locale/template.txt +++ b/mods/HUD/mcl_experience/locale/template.txt @@ -1,4 +1,4 @@ -[] []= +[[] ]= Gives a player some XP= Error: Too many parameters!= Error: Incorrect value of XP= From 196569682930128a16821abdb621ac6c75895f69 Mon Sep 17 00:00:00 2001 From: kay27 Date: Sat, 24 Oct 2020 21:49:11 +0400 Subject: [PATCH 16/18] Merge kay27_textures branch: more recongizable obsidian texture; better NP texture; Nether particles --- mods/CORE/mcl_worlds/init.lua | 6 ++ mods/ENVIRONMENT/mcl_weather/init.lua | 1 + mods/ENVIRONMENT/mcl_weather/nether_dust.lua | 39 +++++++ .../textures/mcl_particles_nether_dust1.png | Bin 0 -> 99 bytes .../textures/mcl_particles_nether_dust2.png | Bin 0 -> 99 bytes .../textures/mcl_particles_nether_dust3.png | Bin 0 -> 101 bytes .../mcl_core/textures/default_obsidian.png | Bin 188 -> 324 bytes .../textures/mcl_portals_portal.png | Bin 1086 -> 561 bytes tools/create_texture__mcl_portals_portal.py | 96 ++++++++++++++---- tools/create_texture__nether_dust.py | 25 +++++ 10 files changed, 147 insertions(+), 20 deletions(-) create mode 100644 mods/ENVIRONMENT/mcl_weather/nether_dust.lua create mode 100644 mods/ENVIRONMENT/mcl_weather/textures/mcl_particles_nether_dust1.png create mode 100644 mods/ENVIRONMENT/mcl_weather/textures/mcl_particles_nether_dust2.png create mode 100644 mods/ENVIRONMENT/mcl_weather/textures/mcl_particles_nether_dust3.png create mode 100644 tools/create_texture__nether_dust.py diff --git a/mods/CORE/mcl_worlds/init.lua b/mods/CORE/mcl_worlds/init.lua index d032426db..35549ffad 100644 --- a/mods/CORE/mcl_worlds/init.lua +++ b/mods/CORE/mcl_worlds/init.lua @@ -70,6 +70,12 @@ function mcl_worlds.has_weather(pos) return pos.y <= mcl_vars.mg_overworld_max and pos.y >= mcl_vars.mg_overworld_min - 64 end +-- Takes a position and returns true if this position can have Nether dust +function mcl_worlds.has_dust(pos) + -- Weather in the Overworld and the high part of the void below + return pos.y <= mcl_vars.mg_nether_max + 64 and pos.y >= mcl_vars.mg_nether_min - 64 +end + -- Takes a position (pos) and returns true if compasses are working here function mcl_worlds.compass_works(pos) -- It doesn't work in Nether and the End, but it works in the Overworld and in the high part of the void below diff --git a/mods/ENVIRONMENT/mcl_weather/init.lua b/mods/ENVIRONMENT/mcl_weather/init.lua index e31331f5e..c7b8fb6de 100644 --- a/mods/ENVIRONMENT/mcl_weather/init.lua +++ b/mods/ENVIRONMENT/mcl_weather/init.lua @@ -10,6 +10,7 @@ end dofile(modpath.."/weather_core.lua") dofile(modpath.."/snow.lua") dofile(modpath.."/rain.lua") +dofile(modpath.."/nether_dust.lua") if minetest.get_modpath("lightning") ~= nil then dofile(modpath.."/thunder.lua") diff --git a/mods/ENVIRONMENT/mcl_weather/nether_dust.lua b/mods/ENVIRONMENT/mcl_weather/nether_dust.lua new file mode 100644 index 000000000..2fc7e5dd4 --- /dev/null +++ b/mods/ENVIRONMENT/mcl_weather/nether_dust.lua @@ -0,0 +1,39 @@ +mcl_weather.nether_dust = {} +mcl_weather.nether_dust.particles_count = 99 + +-- calculates coordinates and draw particles for Nether dust +mcl_weather.nether_dust.add_dust_particles = function(player) + for i=mcl_weather.nether_dust.particles_count, 1,-1 do + local rpx, rpy, rpz = mcl_weather.get_random_pos_by_player_look_dir(player) + minetest.add_particle({ + pos = {x = rpx, y = rpy - math.random(6, 18), z = rpz}, + velocity = {x = math.random(-30,30)*0.01, y = math.random(-15,15)*0.01, z = math.random(-30,30)*0.01}, + acceleration = {x = math.random(-50,50)*0.02, y = math.random(-20,20)*0.02, z = math.random(-50,50)*0.02}, + expirationtime = 3, + size = math.random(6,20)*0.01, + collisiondetection = false, + object_collision = false, + vertical = false, + glow = math.random(0,minetest.LIGHT_MAX), + texture = "mcl_particles_nether_dust"..tostring(i%3+1)..".png", + playername = player:get_player_name() + }) + end +end + +local timer = 0 +minetest.register_globalstep(function(dtime) + timer = timer + dtime + if timer >= 0.7 then + timer = 0 + else + return + end + + for _, player in ipairs(minetest.get_connected_players()) do + if (mcl_weather.is_underwater(player) or not mcl_worlds.has_dust(player:get_pos())) then + return false + end + mcl_weather.nether_dust.add_dust_particles(player) + end +end) diff --git a/mods/ENVIRONMENT/mcl_weather/textures/mcl_particles_nether_dust1.png b/mods/ENVIRONMENT/mcl_weather/textures/mcl_particles_nether_dust1.png new file mode 100644 index 0000000000000000000000000000000000000000..25c71fba3be78495330f1a24b12ce04b2b9ed1bf GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)gaYymzYu0Xm!GcEqX$B#f3Q%R6t qFvEN?W#_j*9+#(!V@SoE?&t;ucLK6VwR~MTA literal 0 HcmV?d00001 diff --git a/mods/ENVIRONMENT/mcl_weather/textures/mcl_particles_nether_dust2.png b/mods/ENVIRONMENT/mcl_weather/textures/mcl_particles_nether_dust2.png new file mode 100644 index 0000000000000000000000000000000000000000..73135f3bb6fbb7b6ad2111e3eb9667f6dfab054e GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^OhC-Y$P6UUy?J{QNU;U@gt!9f{>-%a2OmEISxhBC re!&d$#gv`j0(o4XE{-7;bCNB9>_ZF(gW|#ifh-13S3j3^P6TY2?c(s&I7%0x*>FVdQ&MBb@08s-OGXMYp literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_core/textures/default_obsidian.png b/mods/ITEMS/mcl_core/textures/default_obsidian.png index 32b3371cef4b884e38755fc5c755bd368f282e01..a7f1d8896e2ec390565519fb55b66b5f2eb10bad 100644 GIT binary patch delta 309 zcmV-50m}Zo0mK537=H)?0001xk!Usm000SaNLh0L01m?d01m?e$8V@)0002?NklZ$=M!UKU|?gAVqjqS#qf*)FOcA|XXaq%P7COK^yJ<5U+=zrd-dn{A2h_xD$mTo z3z7Q#<1sS_JNMHkzwf`=@$>h4Oe5EK-Z^yk?K=Z;;NSnh zOlU%iVjlcl%9u*|xs)N|=o;?7+VSz*T}%x^JgN`|xlV%HNYI5$5K*{|Xu!|KONd7m zSq~Ef14Cc&6kKkYxGeA8m)pp`!r})-F%L9F$bMkvVCR+tcrI{Z_X7h116FT9ZTR>9FC0NsL&6O%h^z+y69=Cysm7><00000NkvXX Hu0mjf*5H!b delta 172 zcmV;d08{_O0=xl`7=Hu<0002(-QrRJ000kAOjJcsO*}<6G%zVD9~>rTWl>u$z`Ote z0BA`>K~#7F4UN$e0zn8v6UPD;v;YYW$kM=`bN$yOlh5~(fI*qe;b5|kpyi$4pU^vt z60t|HZ9q(3WroGNa?xRG^knwsHbTzQ^8|N9 z55lbMKvNWwk_0>mo;)Y8LMt9t*bS{96p5u?_0X#a59&b_B7f9F{saFAH+?XN_ulvW z`Oaeo=H)zxv&`X%j&7k22;_$s23cJ&jNf$uZE}tD$H`Z!BDX#!HD4)xm&Easy-ex5 zSs%s~32r?1_Yj~wL)oZc#g&-Y}eao<~)$b=48W&vu8YgOFol#c8N`jGKFbagq30obypbp zFQ$)REK4xjZwwIv+h}c0T4;M4ZG>tP&}}4G_z+-h<{GeN>_agx*L6jN z^~J&=PDG4*yAK918VP=`rT?gUb?y6rR8{=>ON1~NH-9OmC#4T9azOQz1rxbMC75x# zQtj|2lw~oHZGNUo1yx0=2v4_&P_c?BC0TyYoO3}fpR*LqkcIRBu nEWZ1`LmoaEP8-A)3b+3QuX}}IFzC$200000NkvXXu0mjfK|c3S delta 1078 zcmV-61j+lc1ilE67k@wq0{{R3B%=qU0002VP)t-sP6n?@1+Pj4uSNy0M+L7$1g}B_ zuSEo}NCmG@2Cqy7uS*55O$M(`1+P&CuSW&1QwOh72Cq{FuTciCR0pp^1g}~MuUQAL zRR^zI2(MfSuVo6aX9}-q3a?)YuV4wUW(u!Y2d`rZuX7Bqbbk%6ZVaz)46k(!uS^B6 zSO>3O2(N1kuV4wUY74Jz3$H%}uTKWARR^y|1g~NVuW<~obq%j<3$JMkuW}5pSqQII z2d`ZSuUQALWD2ij39ohyuWk#ka15_$3$LntEq4F_07G3T+rlzN;r>Cf> zsi&!_si>)@tADGitE;ZBudJ=Es;#rLv9YtLs;scAu&|}5siv*6w6L$UtE#N3uCBDP zvackZr^)~T0^vzSK~#7FEt7|WqA(DKC&4Ts31AR|0ov8MqJ79?d?> z4x4|c<|!7~5UwGq&X?K95^#NOUf=Avw8q+4a;(;~*?YeIDDwPOQ-Z|2O>zEg zzAoMSTO_f82QR1kd$+q@a;p^whkCE`?xz)pW`8?YWCTi=Y0(@w+kJhMEjEP2OHSY2 z?U%bQ%FwdVz1iSOf4 zx!_3QBMPbsrvlb45R3uha8%F3aX1jy<<7u^AR1g_tpKPbL?M>8UjvQ^V$v#v62JIv zzkjVU#+GCI_GL13&BAm1I|O`AQZ+J1xZm8#((;MBZm@&zDNN+VgeIXzn2ec8tc}DF+$<}e9_M+Hj=>$GT`!vDVpa6fzK4H#N_Y404|?4G{jCN)?gCvm z(RL7MP^`Ng{?vEHdI?YGb9SifK|3Ot0j%mo@KV}qH1ZnJC2LJ#707*qoM6N<$f-|7=wg3PC diff --git a/tools/create_texture__mcl_portals_portal.py b/tools/create_texture__mcl_portals_portal.py index f2b1e1524..6f0725f69 100644 --- a/tools/create_texture__mcl_portals_portal.py +++ b/tools/create_texture__mcl_portals_portal.py @@ -1,7 +1,44 @@ import png -w, h = 64, 256; +w, h = 16, 128; s = [[int(0) for c in range(w)] for c in range(h)] +def drawpixel(x, y, t): + if (x >= 0) and (x < w) and (y >= 0) and (y < h): + if(t == 1): + s[y][x] = 1 + elif t==2: + s[y][x] = 1 - s[y][x] + elif t==3: + s[y][x] = s[y][x] + 1 + if s[y][x] > 3: + s[y][x] =s[y][x]-4 + +def circle(X1, Y1, R, t): + x = 0 + y = R + delta = 1 - 2 * R + error = 0 + while y >= 0: + if Y1%w + y < w: + drawpixel(X1 + x, Y1 + y, t) + if Y1%w - y >= 0: + drawpixel(X1 + x, Y1 - y, t) + if Y1%w + y < w: + drawpixel(X1 - x, Y1 + y, t) + if Y1%w - y >= 0: + drawpixel(X1 - x, Y1 - y, t) + error = 2 * (delta + y) - 1 + if ((delta < 0) and (error <= 0)): + x = x + 1 + delta = delta + 2 * x + 1 + elif ((delta > 0) and (error > 0)): + y = y - 1 + delta = delta - 2 * y + 1 + else: + x = x + 1 + y = y - 1 + delta = delta + 2 * (x - y) + def line(y1, x1, y2, x2, v): signx = 1 signy = 1 @@ -19,10 +56,14 @@ def line(y1, x1, y2, x2, v): if dx >= dy: dir1 = 1 for i in range(max(dx, dy)+1): - if v==2: - s[x1][y1]=1-s[x1][y1] - else: - s[x1][y1] = v + if(v == 1): + s[x1][y1] = 1 + elif v==2: + s[x1][y1] = 1 - s[x1][y1] + elif v==3 or (v==4 and ((x1^y1)&1)) or (v==5 and (((x1|y1)&1)==0)) or (v==7 and ((((x1+1)|y1)&1)==0)) or (v==8 and ((((x1+1)|(y1+1))&1)==0)) or (v==6 and (((x1|(y1+1))&1)==0)): + s[x1][y1] = s[x1][y1] + 1 + if s[x1][y1] > 3: + s[x1][y1] = s[x1][y1] - 4 if dir1 == 1: x1 += signx offsy += dy @@ -37,22 +78,37 @@ def line(y1, x1, y2, x2, v): offsx -= dy # R, G, B, Alpha (0xFF = opaque): -palette=[(0x00,0x00,0xaf,0xa0), (0x7f,0x0f,0xaf,0xb8)] +palette=[ + (0x30,0x03,0xaf,0xa4), + (0x4f,0x1c,0xaf,0xb4), + (0x7f,0x3d,0xa0,0xc8), + (0x6d,0x5d,0x99,0xb1) +] -for j in range(16): - i = j * 4 - line(i, 0, 63-i, 63, 2) - line(63, i, 0, 63-i, 2) - i+=1 - line(i, 64, 63-i, 127, 2) - line(63, 64+i, 0, 127-i, 2) - i+=1 - line(i, 128, 63-i, 191, 2) - line(63, 128+i, 0, 191-i, 2) - i+=1 - line(i, 192, 63-i, 255, 2) - line(63, 192+i, 0, 255-i, 2) +circles = h//w +maxr = w//2 +for i in [1,2,3,5,9,10,11,13]: + for c in range(circles): + q = ((circles-c-1)+i)%w + circle(maxr, maxr+c*w, q, 3) -w = png.Writer(len(s[0]), len(s), palette=palette, bitdepth=1) + +linesperside = 2 +linestarts = round(w / linesperside) # 8 +lineoffset = round(w / linestarts) # 2 +wminus = w - 1 + +for j in range(linesperside): + for k in range(linestarts): + offset = k * w + for q in [0,1,3,4]: +# for q in [1]: + i = j*linestarts + ((k+q)%linestarts) + line(i, offset, wminus-i, offset+wminus, 5+(k&3)) + line(wminus, offset+i, 0, offset+wminus-i, 5+(k&3)) + + + +w = png.Writer(len(s[0]), len(s), palette=palette, bitdepth=2) f = open('mcl_portals_portal.png', 'wb') w.write(f, s) diff --git a/tools/create_texture__nether_dust.py b/tools/create_texture__nether_dust.py new file mode 100644 index 000000000..f1b8e27f2 --- /dev/null +++ b/tools/create_texture__nether_dust.py @@ -0,0 +1,25 @@ +import png + +s = [ + [ + '1', + ], + [ + '11', + ], + [ + '111', + '111', + ], +] + +# R, G, B, Alpha (0xFF = opaque): +palette=[(0x00,0x00,0x00,0x00), (0x8F,0x69,0x66,0x9F)] +#palette=[(0x00,0x00,0x00,0x00), (0xF0,0xF0,0xF0,0x80)] + +for i in range(0, len(s)): + print(str(i)+"/"+str(len(s))) + q = [[int(c) for c in row] for row in s[i]] + w = png.Writer(len(q[0]), len(q), palette=palette, bitdepth=1) + f = open('mcl_particles_nether_dust'+str(i+1)+'.png', 'wb') + w.write(f, q) From 9f981173286d69269526597a58c0d9115066a558 Mon Sep 17 00:00:00 2001 From: kay27 Date: Mon, 26 Oct 2020 01:06:35 +0400 Subject: [PATCH 17/18] Fix XP and Nether ashes --- mods/ENVIRONMENT/mcl_weather/nether_dust.lua | 2 +- mods/HUD/mcl_experience/init.lua | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mods/ENVIRONMENT/mcl_weather/nether_dust.lua b/mods/ENVIRONMENT/mcl_weather/nether_dust.lua index 2fc7e5dd4..e41746a71 100644 --- a/mods/ENVIRONMENT/mcl_weather/nether_dust.lua +++ b/mods/ENVIRONMENT/mcl_weather/nether_dust.lua @@ -31,7 +31,7 @@ minetest.register_globalstep(function(dtime) end for _, player in ipairs(minetest.get_connected_players()) do - if (mcl_weather.is_underwater(player) or not mcl_worlds.has_dust(player:get_pos())) then + if not mcl_worlds.has_dust(player:get_pos()) then return false end mcl_weather.nether_dust.add_dust_particles(player) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index 51346226b..7483538f7 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -3,6 +3,7 @@ mcl_experience = {} local pool = {} local registered_nodes local max_xp = 2^31-1 +local max_orb_age = 300 -- seconds local gravity = {x = 0, y = -((tonumber(minetest.settings:get("movement_gravity"))) or 9.81), z = 0} local size_min, size_max = 20, 59 -- percents @@ -147,7 +148,7 @@ function mcl_experience.set_player_xp_level(player,level) return end pool[name].level = level - pool[name].xp, pool[name].next_level = mcl_experience.bar_to_xp(pool[name].bar, level) + pool[name].xp, pool[name].bar_step, pool[name].next_level = mcl_experience.bar_to_xp(pool[name].bar, level) hud_manager.change_hud({player = player, hud_name = "xp_level", element = "text", data = tostring(level)}) -- we may don't update the bar end @@ -237,7 +238,7 @@ function mcl_experience.add_experience(player, experience) local old_bar, old_xp, old_level = temp_pool.bar, temp_pool.xp, temp_pool.level temp_pool.xp = math.min(math.max(temp_pool.xp + experience, 0), max_xp) - if (temp_pool.xp >= temp_pool.xp_next_level) or (experience < 1) then + if (temp_pool.xp >= temp_pool.xp_next_level) or (temp_pool.xp < old_xp) then temp_pool.level = mcl_experience.xp_to_level(temp_pool.xp) temp_pool.bar, temp_pool.bar_step, temp_pool.xp_next_level = mcl_experience.xp_to_bar(temp_pool.xp, temp_pool.level) if old_level ~= temp_pool.level then @@ -342,7 +343,7 @@ local function xp_step(self, dtime) self.age = self.age + dtime - if self.age > 300 then + if self.age > max_orb_age then self.object:remove() return end From 38ad237d92d4c650542a68ff05024c452a017100 Mon Sep 17 00:00:00 2001 From: kay27 Date: Mon, 26 Oct 2020 10:24:38 +0400 Subject: [PATCH 18/18] Fix multithreaded addition of XP --- mods/HUD/mcl_experience/init.lua | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index 7483538f7..7ffa20bdf 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -238,31 +238,31 @@ function mcl_experience.add_experience(player, experience) local old_bar, old_xp, old_level = temp_pool.bar, temp_pool.xp, temp_pool.level temp_pool.xp = math.min(math.max(temp_pool.xp + experience, 0), max_xp) - if (temp_pool.xp >= temp_pool.xp_next_level) or (temp_pool.xp < old_xp) then + + if (temp_pool.xp < temp_pool.xp_next_level) and (temp_pool.xp >= old_xp) then + temp_pool.bar = temp_pool.bar + temp_pool.bar_step * experience + else temp_pool.level = mcl_experience.xp_to_level(temp_pool.xp) temp_pool.bar, temp_pool.bar_step, temp_pool.xp_next_level = mcl_experience.xp_to_bar(temp_pool.xp, temp_pool.level) - if old_level ~= temp_pool.level then - if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.04 then - if experience > 0 then - minetest.sound_play("level_up",{gain=0.2,to_player = name}) - end - temp_pool.last_time = minetest.get_us_time()/1000000 - end - hud_manager.change_hud({player = player, hud_name = "xp_level", element = "text", data = tostring(temp_pool.level)}) - end - else - if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.01 then - temp_pool.last_time = minetest.get_us_time()/1000000 - if experience > 0 then - minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100}) - end - end - temp_pool.bar = temp_pool.bar + temp_pool.bar_step * experience end if old_bar ~= temp_pool.bar then hud_manager.change_hud({player = player, hud_name = "experience_bar", element = "number", data = math.floor(temp_pool.bar)}) end + + if experience > 0 and minetest.get_us_time()/1000000 - temp_pool.last_time > 0.01 then + if old_level ~= temp_pool.level then + minetest.sound_play("level_up",{gain=0.2,to_player = name}) + temp_pool.last_time = minetest.get_us_time()/1000000 + 0.2 + else + minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100}) + temp_pool.last_time = minetest.get_us_time()/1000000 + end + end + + if old_level ~= temp_pool.level then + hud_manager.change_hud({player = player, hud_name = "xp_level", element = "text", data = tostring(temp_pool.level)}) + end end --reset player level