From bc9491ffdd5cf94156fbda275a05c4d7c07d8570 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 24 Jan 2017 02:31:49 +0100 Subject: [PATCH] Get rid of a ton of global variables --- mods/beds/init.lua | 6 +- mods/bookex/init.lua | 10 - mods/craftingpack/crafting/creative.lua | 68 +- mods/default/functions.lua | 4 +- mods/doors/init.lua | 4 +- mods/farming/melon.lua | 6 +- mods/farming/pumpkin.lua | 8 +- mods/mcl_boats/init.lua | 2 +- mods/mcl_cake/init.lua | 24 +- mods/mcl_compass/init.lua | 4 +- mods/mcl_minecarts/init.lua | 8 +- mods/mcl_throwing/init.lua | 14 +- mods/mobs/api.lua | 34 +- mods/mobs_mc/api-mcorg.lua | 872 ------- mods/mobs_mc/api-mm-mcmods.lua | 3010 ----------------------- mods/mobs_mc/horse.lua | 2 +- mods/mobs_mc/skeleton.lua | 2 +- mods/mobs_mc/slimes.lua | 32 +- mods/mobs_mc/wolf.lua | 2 +- mods/signs/init.lua | 210 +- mods/sprint/init.lua | 4 +- mods/wallet/init.lua | 2 +- 22 files changed, 214 insertions(+), 4114 deletions(-) delete mode 100644 mods/mobs_mc/api-mcorg.lua delete mode 100644 mods/mobs_mc/api-mm-mcmods.lua diff --git a/mods/beds/init.lua b/mods/beds/init.lua index 6c043463..001308f1 100644 --- a/mods/beds/init.lua +++ b/mods/beds/init.lua @@ -16,7 +16,7 @@ local function get_dir(pos) end end -function plock(start, max, tick, player, yaw) +local function plock(start, max, tick, player, yaw) if start+tick < max then player:set_look_pitch(-1.2) player:set_look_yaw(yaw) @@ -27,7 +27,7 @@ function plock(start, max, tick, player, yaw) end end -function exit(pos) +local function exit(pos) local npos = minetest.find_node_near(pos, 1, "beds:bed_bottom") if npos ~= nil then pos = npos end if minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z}).name == "air" then @@ -173,7 +173,7 @@ minetest.register_craft({ } }) -beds_player_spawns = {} +local beds_player_spawns = {} local file = io.open(minetest.get_worldpath().."/beds_player_spawns", "r") if file then beds_player_spawns = minetest.deserialize(file:read("*all")) diff --git a/mods/bookex/init.lua b/mods/bookex/init.lua index dafe228d..04906e60 100644 --- a/mods/bookex/init.lua +++ b/mods/bookex/init.lua @@ -1,13 +1,3 @@ - --- Boilerplate to support localized strings if intllib mod is installed. -local S; -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua"); - S = intllib.Getter(minetest.get_current_modname()); -else - S = function ( s ) return s end; -end - local function deepcopy ( t ) local nt = { }; for k, v in pairs(t) do diff --git a/mods/craftingpack/crafting/creative.lua b/mods/craftingpack/crafting/creative.lua index 9083b5b1..c3d6b445 100644 --- a/mods/craftingpack/crafting/creative.lua +++ b/mods/craftingpack/crafting/creative.lua @@ -1,40 +1,7 @@ crafting = {} crafting.creative_inventory_size = 0 -function init() - local inv = minetest.create_detached_inventory("creative", { - allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) - if minetest.setting_getbool("creative_mode") then - return count - else - return 0 - end - end, - allow_put = function(inv, listname, index, stack, player) - return 0 - end, - allow_take = function(inv, listname, index, stack, player) - if minetest.setting_getbool("creative_mode") then - return -1 - else - return 0 - end - end, - on_move = function(inv, from_list, from_index, to_list, to_index, count, player) - end, - on_put = function(inv, listname, index, stack, player) - end, - on_take = function(inv, listname, index, stack, player) - print(player:get_player_name().." takes item from creative inventory; listname="..dump(listname)..", index="..dump(index)..", stack="..dump(stack)) - if stack then - print("stack:get_name()="..dump(stack:get_name())..", stack:get_count()="..dump(stack:get_count())) - end - end, - }) - set_inv("#all") -end - -function set_inv(filter, player) +local function set_inv(filter, player) local inv = minetest.get_inventory({type="detached", name="creative"}) inv:set_size("main", 0) local creative_list = {} @@ -110,6 +77,39 @@ function set_inv(filter, player) --print("creative inventory size: "..dump(crafting.creative_inventory_size)) end +local function init() + local inv = minetest.create_detached_inventory("creative", { + allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) + if minetest.setting_getbool("creative_mode") then + return count + else + return 0 + end + end, + allow_put = function(inv, listname, index, stack, player) + return 0 + end, + allow_take = function(inv, listname, index, stack, player) + if minetest.setting_getbool("creative_mode") then + return -1 + else + return 0 + end + end, + on_move = function(inv, from_list, from_index, to_list, to_index, count, player) + end, + on_put = function(inv, listname, index, stack, player) + end, + on_take = function(inv, listname, index, stack, player) + print(player:get_player_name().." takes item from creative inventory; listname="..dump(listname)..", index="..dump(index)..", stack="..dump(stack)) + if stack then + print("stack:get_name()="..dump(stack:get_name())..", stack:get_count()="..dump(stack:get_count())) + end + end, + }) + set_inv("#all") +end + -- Create the trash field local trash = minetest.create_detached_inventory("creative_trash", { allow_put = function(inv, listname, index, stack, player) diff --git a/mods/default/functions.lua b/mods/default/functions.lua index cb44fefc..1081af3a 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -35,7 +35,7 @@ minetest.register_abm({ -- -- Functions -grow_cactus = function(pos, node) +local grow_cactus = function(pos, node) pos.y = pos.y-1 local name = minetest.get_node(pos).name if minetest.get_item_group(name, "sand") ~= 0 then @@ -53,7 +53,7 @@ grow_cactus = function(pos, node) end end -grow_reeds = function(pos, node) +local grow_reeds = function(pos, node) pos.y = pos.y-1 local name = minetest.get_node(pos).name if minetest.get_node_group(name, "soil_sugarcane") ~= 0 then diff --git a/mods/doors/init.lua b/mods/doors/init.lua index 190d774f..5b521553 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -480,7 +480,7 @@ local function punch(pos) me = minetest.get_node(pos) local tmp_node local tmp_node2 - oben = {x=pos.x, y=pos.y+1, z=pos.z} + local oben = {x=pos.x, y=pos.y+1, z=pos.z} if state == 1 then state = 0 minetest.sound_play("door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) @@ -604,7 +604,7 @@ local function punch(pos) me = minetest.get_node(pos) local tmp_node local tmp_node2 - oben = {x=pos.x, y=pos.y+1, z=pos.z} + local oben = {x=pos.x, y=pos.y+1, z=pos.z} if state == 1 then state = 0 minetest.sound_play("door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) diff --git a/mods/farming/melon.lua b/mods/farming/melon.lua index 3dccfcf0..a23e402f 100644 --- a/mods/farming/melon.lua +++ b/mods/farming/melon.lua @@ -26,7 +26,7 @@ minetest.register_node("farming:melon", { end if have_change == 0 then for z=-1,1 do - p = {x=pos.x, y=pos.y, z=pos.z+z} + local p = {x=pos.x, y=pos.y, z=pos.z+z} local n = minetest.get_node(p) if string.find(n.name, "melontige_linked_") and have_change == 0 then have_change = 1 @@ -249,9 +249,9 @@ minetest.register_abm({ end if have_change == 0 then for z=-1,1 do - p = {x=pos.x, y=pos.y-1, z=pos.z+z} + local p = {x=pos.x, y=pos.y-1, z=pos.z+z} newpos = {x=pos.x, y=pos.y, z=pos.z+z} - n = minetest.get_node(p) + local n = minetest.get_node(p) local nod2 = minetest.get_node(newpos) if n.name=="default:dirt_with_grass" and nod2.name=="air" and have_change == 0 or n.name=="default:dirt" and nod2.name=="air" and have_change == 0 diff --git a/mods/farming/pumpkin.lua b/mods/farming/pumpkin.lua index 4a2a6199..88d2e8f0 100644 --- a/mods/farming/pumpkin.lua +++ b/mods/farming/pumpkin.lua @@ -1,5 +1,3 @@ -LIGHT_MAX = 15 - minetest.register_craftitem("farming:pumpkin_seed", { description = "Pumpkin Seed", stack_max = 64, @@ -69,7 +67,7 @@ minetest.register_node("farming:pumpkin_face", { end if have_change == 0 then for z=-1,1 do - p = {x=pos.x, y=pos.y, z=pos.z+z} + local p = {x=pos.x, y=pos.y, z=pos.z+z} local n = minetest.get_node(p) if string.find(n.name, "pumpkintige_linked_") and have_change == 0 then have_change = 1 @@ -245,9 +243,9 @@ minetest.register_abm({ end if have_change == 0 then for z=-1,1 do - p = {x=pos.x, y=pos.y-1, z=pos.z+z} + local p = {x=pos.x, y=pos.y-1, z=pos.z+z} newpos = {x=pos.x, y=pos.y, z=pos.z+z} - n = minetest.get_node(p) + local n = minetest.get_node(p) local nod2 = minetest.get_node(newpos) if n.name=="default:dirt_with_grass" and nod2.name=="air" and have_change == 0 or n.name=="default:dirt" and nod2.name=="air" and have_change == 0 diff --git a/mods/mcl_boats/init.lua b/mods/mcl_boats/init.lua index 61efa729..2c076ab4 100644 --- a/mods/mcl_boats/init.lua +++ b/mods/mcl_boats/init.lua @@ -138,7 +138,7 @@ local names = { "Oak Boat", "Spruce Boat", "Birch Boat", "Jungle Boat", "Dark Oa local craftstuffs = { "default:wood", "default:sprucewood", "default:birchwood", "default:junglewood", "default:darkwood", "default:acaciawood" } for w=1, #woods do - textures = {"mcl_boats_texture.png"}, + local textures = {"mcl_boats_texture.png"} minetest.register_entity("mcl_boats:boat"..woods[w], boat) minetest.register_craftitem("mcl_boats:boat"..woods[w], { diff --git a/mods/mcl_cake/init.lua b/mods/mcl_cake/init.lua index 9472037d..cc8026ae 100644 --- a/mods/mcl_cake/init.lua +++ b/mods/mcl_cake/init.lua @@ -3,13 +3,13 @@ #!#!#!#Released under CC Attribution-ShareAlike 3.0 Unported #!#!# ]]-- -cake_texture = {"cake_top.png","cake_bottom.png","cake_inner.png","cake_side.png","cake_side.png","cake_side.png"} -slice_1 = { -7/16, -8/16, -7/16, -5/16, 0/16, 7/16} -slice_2 = { -7/16, -8/16, -7/16, -2/16, 0/16, 7/16} -slice_3 = { -7/16, -8/16, -7/16, 1/16, 0/16, 7/16} -slice_4 = { -7/16, -8/16, -7/16, 3/16, 0/16, 7/16} -slice_5 = { -7/16, -8/16, -7/16, 5/16, 0/16, 7/16} -slice_6 = { -7/16, -8/16, -7/16, 7/16, 0/16, 7/16} +local cake_texture = {"cake_top.png","cake_bottom.png","cake_inner.png","cake_side.png","cake_side.png","cake_side.png"} +local slice_1 = { -7/16, -8/16, -7/16, -5/16, 0/16, 7/16} +local slice_2 = { -7/16, -8/16, -7/16, -2/16, 0/16, 7/16} +local slice_3 = { -7/16, -8/16, -7/16, 1/16, 0/16, 7/16} +local slice_4 = { -7/16, -8/16, -7/16, 3/16, 0/16, 7/16} +local slice_5 = { -7/16, -8/16, -7/16, 5/16, 0/16, 7/16} +local slice_6 = { -7/16, -8/16, -7/16, 7/16, 0/16, 7/16} minetest.register_craft({ output = "mcl_cake:cake", @@ -46,7 +46,7 @@ minetest.register_node("mcl_cake:cake", { drop = '', on_rightclick = function(pos, node, clicker, itemstack) minetest.do_item_eat(2, ItemStack("mcl_cake:cake_5"), ItemStack("mcl_cake:cake"), clicker, {type="nothing"}) - minetest.add_node(pos,{type="node",name="mcl_cake:cake_5",param2=param2}) + minetest.add_node(pos,{type="node",name="mcl_cake:cake_5",param2=0}) end, sounds = default.node_sound_leaves_defaults(), }) @@ -68,7 +68,7 @@ minetest.register_node("mcl_cake:cake_5", { drop = '', on_rightclick = function(pos, node, clicker, itemstack) minetest.do_item_eat(2, ItemStack("mcl_cake:cake_4"), ItemStack("mcl_cake:cake_5"), clicker, {type="nothing"}) - minetest.add_node(pos,{type="node",name="mcl_cake:cake_4",param2=param2}) + minetest.add_node(pos,{type="node",name="mcl_cake:cake_4",param2=0}) end, sounds = default.node_sound_leaves_defaults(), }) @@ -90,7 +90,7 @@ minetest.register_node("mcl_cake:cake_4", { drop = '', on_rightclick = function(pos, node, clicker, itemstack) minetest.do_item_eat(2, ItemStack("mcl_cake:cake_3"), ItemStack("mcl_cake:cake_4"), clicker, {type="nothing"}) - minetest.add_node(pos,{type="node",name="mcl_cake:cake_3",param2=param2}) + minetest.add_node(pos,{type="node",name="mcl_cake:cake_3",param2=0}) end, sounds = default.node_sound_leaves_defaults(), }) @@ -112,7 +112,7 @@ minetest.register_node("mcl_cake:cake_3", { drop = '', on_rightclick = function(pos, node, clicker, itemstack) minetest.do_item_eat(2, ItemStack("mcl_cake:cake_2"), ItemStack("mcl_cake:cake_3"), clicker, {type="nothing"}) - minetest.add_node(pos,{type="node",name="mcl_cake:cake_2",param2=param2}) + minetest.add_node(pos,{type="node",name="mcl_cake:cake_2",param2=0}) end, sounds = default.node_sound_leaves_defaults(), }) @@ -134,7 +134,7 @@ minetest.register_node("mcl_cake:cake_2", { drop = '', on_rightclick = function(pos, node, clicker, itemstack) minetest.do_item_eat(2, ItemStack("mcl_cake:cake_1"), ItemStack("mcl_cake:cake_2"), clicker, {type="nothing"}) - minetest.add_node(pos,{type="node",name="mcl_cake:cake_1",param2=param2}) + minetest.add_node(pos,{type="node",name="mcl_cake:cake_1",param2=0}) end, sounds = default.node_sound_leaves_defaults(), }) diff --git a/mods/mcl_compass/init.lua b/mods/mcl_compass/init.lua index f013e020..8b88d951 100644 --- a/mods/mcl_compass/init.lua +++ b/mods/mcl_compass/init.lua @@ -13,9 +13,7 @@ minetest.register_globalstep(function(dtime) return false end if has_compass(player) then - local spawn = beds_player_spawns[player:get_player_name()] or - minetest.setting_get("static_spawnpoint") or - {x=0,y=0,z=0} + local spawn = minetest.setting_get("static_spawnpoint") or {x=0,y=0,z=0} local pos = player:getpos() local dir = player:get_look_horizontal() local angle_north = math.deg(math.atan2(spawn.x - pos.x, spawn.z - pos.z)) diff --git a/mods/mcl_minecarts/init.lua b/mods/mcl_minecarts/init.lua index 3931069c..b135ccb5 100644 --- a/mods/mcl_minecarts/init.lua +++ b/mods/mcl_minecarts/init.lua @@ -2,7 +2,7 @@ mcl_minecarts = {} mcl_minecarts.modpath = minetest.get_modpath("mcl_minecarts") mcl_minecarts.speed_max = 10 -function vector.floor(v) +local vector_floor = function(v) return { x = math.floor(v.x), y = math.floor(v.y), @@ -52,7 +52,7 @@ end function mcl_minecarts.cart:on_punch(puncher, time_from_last_punch, tool_capabilities, direction) local pos = self.object:getpos() if not self._railtype then - local node = minetest.get_node(vector.floor(pos)).name + local node = minetest.get_node(vector_floor(pos)).name self._railtype = minetest.get_item_group(node, "connect_to_raillike") end @@ -120,8 +120,8 @@ function mcl_minecarts.cart:on_step(dtime) local dir, last_switch = nil, nil local pos = self.object:getpos() if self._old_pos and not self._punched then - local flo_pos = vector.floor(pos) - local flo_old = vector.floor(self._old_pos) + local flo_pos = vector_floor(pos) + local flo_old = vector_floor(self._old_pos) if vector.equals(flo_pos, flo_old) then return end diff --git a/mods/mcl_throwing/init.lua b/mods/mcl_throwing/init.lua index 855c4511..450312bc 100644 --- a/mods/mcl_throwing/init.lua +++ b/mods/mcl_throwing/init.lua @@ -2,7 +2,7 @@ dofile(minetest.get_modpath("mcl_throwing").."/arrow.lua") dofile(minetest.get_modpath("mcl_throwing").."/throwable.lua") -arrows = { +local arrows = { {"mcl_throwing:arrow", "mcl_throwing:arrow_entity"}, } @@ -34,7 +34,7 @@ minetest.register_tool("mcl_throwing:bow", { inventory_image = "mcl_throwing_bow.png", stack_max = 1, on_place = function(itemstack, placer, pointed_thing) - wear = itemstack:get_wear() + local wear = itemstack:get_wear() itemstack:replace("mcl_throwing:bow_0") itemstack:add_wear(wear) return itemstack @@ -58,13 +58,13 @@ minetest.register_tool("mcl_throwing:bow_0", { stack_max = 1, groups = {not_in_creative_inventory=1}, on_place = function(itemstack, placer, pointed_thing) - wear = itemstack:get_wear() + local wear = itemstack:get_wear() itemstack:replace("mcl_throwing:bow_1") itemstack:add_wear(wear) return itemstack end, on_use = function(itemstack, user, pointed_thing) - wear = itemstack:get_wear() + local wear = itemstack:get_wear() itemstack:add_wear(wear) if mcl_throwing_shoot_arrow(itemstack, user, pointed_thing) then if not minetest.setting_getbool("creative_mode") then @@ -81,13 +81,13 @@ minetest.register_tool("mcl_throwing:bow_1", { stack_max = 1, groups = {not_in_creative_inventory=1}, on_place = function(itemstack, placer, pointed_thing) - wear = itemstack:get_wear() + local wear = itemstack:get_wear() itemstack:replace("mcl_throwing:bow_2") itemstack:add_wear(wear) return itemstack end, on_use = function(itemstack, user, pointed_thing) - wear = itemstack:get_wear() + local wear = itemstack:get_wear() itemstack:add_wear(wear) if mcl_throwing_shoot_arrow(itemstack, user, pointed_thing) then if not minetest.setting_getbool("creative_mode") then @@ -104,7 +104,7 @@ minetest.register_tool("mcl_throwing:bow_2", { stack_max = 1, groups = {not_in_creative_inventory=1}, on_use = function(itemstack, user, pointed_thing) - wear = itemstack:get_wear() + local wear = itemstack:get_wear() itemstack:replace("mcl_throwing:bow") itemstack:add_wear(wear) if mcl_throwing_shoot_arrow(itemstack, user, pointed_thing) then diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index d71b62bc..8987fa09 100644 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -68,7 +68,7 @@ local atan = function(x) end end -do_attack = function(self, player) +local do_attack = function(self, player) if self.state ~= "attack" then @@ -86,7 +86,7 @@ do_attack = function(self, player) end end -set_velocity = function(self, v) +local set_velocity = function(self, v) local yaw = self.object:getyaw() + self.rotate or 0 @@ -97,14 +97,14 @@ set_velocity = function(self, v) }) end -get_velocity = function(self) +local get_velocity = function(self) local v = self.object:getvelocity() return (v.x * v.x + v.z * v.z) ^ 0.5 end -set_animation = function(self, type) +local set_animation = function(self, type) if not self.animation then return @@ -199,7 +199,7 @@ set_animation = function(self, type) end -- check line of sight for walkers and swimmers alike -function line_of_sight_water(self, pos1, pos2, stepsize) +local function line_of_sight_water(self, pos1, pos2, stepsize) local s, pos_w = minetest.line_of_sight(pos1, pos2, stepsize) @@ -238,7 +238,7 @@ function line_of_sight_water(self, pos1, pos2, stepsize) end -- particle effects -function effect(pos, amount, texture, min_size, max_size, radius, gravity) +local function effect(pos, amount, texture, min_size, max_size, radius, gravity) radius = radius or 2 min_size = min_size or 0.5 @@ -263,7 +263,7 @@ function effect(pos, amount, texture, min_size, max_size, radius, gravity) end -- check if mob is dead or only hurt -function check_for_death(self) +local function check_for_death(self) -- has health actually changed? if self.health == self.old_health then @@ -350,7 +350,7 @@ function check_for_death(self) end -- check if within physical map limits (-30911 to 30927) -function within_limits(pos, radius) +local function within_limits(pos, radius) if (pos.x - radius) > -30913 and (pos.x + radius) < 30928 @@ -407,7 +407,7 @@ local function node_ok(pos, fallback) end -- environmental damage (water, lava, fire, light) -do_env_damage = function(self) +local do_env_damage = function(self) -- feed/tame text timer (so mob 'full' messages dont spam chat) if self.htimer > 0 then @@ -480,7 +480,7 @@ do_env_damage = function(self) end -- jump if facing a solid node (not fences or gates) -do_jump = function(self) +local do_jump = function(self) if self.fly or self.child then @@ -550,7 +550,7 @@ local get_distance = function(a, b) end -- blast damage to entities nearby (modified from TNT mod) -function entity_physics(pos, radius) +local function entity_physics(pos, radius) radius = radius * 2 @@ -582,7 +582,7 @@ function entity_physics(pos, radius) end -- should mob follow what I'm holding ? -function follow_holding(self, clicker) +local function follow_holding(self, clicker) if mobs.invis[clicker:get_player_name()] then return false @@ -745,7 +745,7 @@ local function breed(self) end -- find and replace what mob is looking for (grass, wheat etc.) -function replace(self, pos) +local function replace(self, pos) if self.replace_rate and self.child == false @@ -774,7 +774,7 @@ function replace(self, pos) end -- check if daytime and also if mob is docile during daylight hours -function day_docile(self) +local function day_docile(self) if self.docile_by_day == false then @@ -789,7 +789,7 @@ function day_docile(self) end -- path finding and smart mob routine by rnd -function smart_mobs(self, s, p, dist, dtime) +local function smart_mobs(self, s, p, dist, dtime) local s1 = self.path.lastpos @@ -1057,9 +1057,9 @@ local npc_attack = function(self) if obj and obj.type == "monster" then - p = obj.object:getpos() + local p = obj.object:getpos() - dist = get_distance(p, s) + local dist = get_distance(p, s) if dist < min_dist then min_dist = dist diff --git a/mods/mobs_mc/api-mcorg.lua b/mods/mobs_mc/api-mcorg.lua deleted file mode 100644 index 800a154b..00000000 --- a/mods/mobs_mc/api-mcorg.lua +++ /dev/null @@ -1,872 +0,0 @@ -mobs = {} - -mobs.default_definition = { - physical = true, - jump = function (self) - local v = self.object:getvelocity() - v.y = 5 - self.object:setvelocity(v) - end, - - - timer = 0, - env_damage_timer = 0, -- only if state = "attack" - bombtimer = -999, - attack = {player=nil, dist=nil}, - state = "stand", - v_start = false, - old_y = nil, - lifetimer = 600, - tamed = false, - - boom = function(self, tnt_range) - local pos = self.object:getpos() - self.object:remove() - tnt:boom(pos) - end, - - set_velocity = function(self, v) - local get_flowing_dir = function(self) - local pos = self.object:getpos() - local param2 = minetest.get_node(pos).param2 - local p4 = { - {x=1,y=0,z=0}, - {x=-1,y=0,z=0}, - {x=0,y=0,z=1}, - {x=0,y=0,z=-1}, - } - local out = {x=0,y=0,z=0} - local num = 0 - for i=1,4 do - local p2 = vector.add(pos, p4[i]) - local name = minetest.get_node(p2).name - local par2 = minetest.get_node(p2).param2 - -- param2 == 13 means water is falling down a block - if (name == "default:water_flowing" and par2 < param2 and param2 < 13) or (name == "default:water_flowing" and par2 == 13) or name == "air" then - out = vector.add(out, p4[i]) - num = num + 1 - end - end - if num then - return out - else - return false - end - end - local yaw = self.object:getyaw() - if self.drawtype == "side" then - yaw = yaw+(math.pi/2) - end - local x = math.sin(yaw) * -v - local z = math.cos(yaw) * v - local v1 = {x=x, y=self.object:getvelocity().y, z=z} - local pos = self.object:getpos() - local name = minetest.get_node(pos).name - if name == "default:water_flowing" then - local v = get_flowing_dir(self) - if v then - v1 = vector.add(v1, vector.multiply(v, 1.3)) - end - end - self.object:setvelocity(v1) - end, - - get_velocity = function(self) - local v = self.object:getvelocity() - return (v.x^2 + v.z^2)^(0.5) - end, - - set_animation = function(self, type) - if not self.animation then - return - end - if not self.animation.current then - self.animation.current = "" - end - if type == "stand" and self.animation.current ~= "stand" then - if - self.animation.stand_start - and self.animation.stand_end - and self.animation.speed_normal - then - self.object:set_animation( - {x=self.animation.stand_start,y=self.animation.stand_end}, - self.animation.speed_normal, 0 - ) - self.animation.current = "stand" - end - elseif type == "look" and self.animation.current ~= "look" then - if - self.animation.look_start - and self.animation.look_end - and self.animation.speed_normal - then - self.object:set_animation( - {x=self.animation.look_start,y=self.animation.look_end}, - self.animation.speed_normal, 0 - ) - self.animation.current = "look" - end - elseif type == "eat" and self.animation.current ~= "eat" then - if - self.animation.eat_start - and self.animation.eat_end - and self.animation.speed_normal - then - self.object:set_animation( - {x=self.animation.eat_start,y=self.animation.eat_end}, - self.animation.speed_normal, 0 - ) - self.animation.current = "eat" - if self.name == "mobs:sheep" and self.naked then - local pos = self.object:getpos() - pos.y = pos.y - 1 - if minetest.get_node(pos).name == "default:dirt_with_grass" then - minetest.set_node(pos, {name = "default:dirt"}) - self.naked = false - if not self.color then - self.object:set_properties({ - textures = {"sheep.png"}, - }) - else - self.object:set_properties({ - textures = {"sheep_"..self.color..".png"}, - }) - end - end - end - end - elseif type == "shoot" and self.animation.current ~= "shoot" then - if - self.animation.shoot_start - and self.animation.shoot_end - and self.animation.speed_normal - then - self.object:set_animation( - {x=self.animation.shoot_start,y=self.animation.shoot_end}, - self.animation.speed_normal, 0 - ) - self.animation.shootdur = (self.animation.shoot_end - self.animation.shoot_start)/self.animation.speed_normal - .5 - self.animation.current = "shoot" - end - elseif type == "fly" and self.animation.current ~= "fly" then - if - self.animation.fly_start - and self.animation.fly_end - and self.animation.speed_normal - then - self.object:set_animation( - {x=self.animation.fly_start,y=self.animation.fly_end}, - self.animation.speed_normal, 0 - ) - self.animation.current = "fly" - end - elseif type == "walk" and self.animation.current ~= "walk" then - if - self.animation.walk_start - and self.animation.walk_end - and self.animation.speed_normal - then - self.object:set_animation( - {x=self.animation.walk_start,y=self.animation.walk_end}, - self.animation.speed_normal, 0 - ) - self.animation.current = "walk" - end - elseif type == "run" and self.animation.current ~= "run" then - if - self.animation.run_start - and self.animation.run_end - and self.animation.speed_run - then - self.object:set_animation( - {x=self.animation.run_start,y=self.animation.run_end}, - self.animation.speed_run, 0 - ) - self.animation.current = "run" - end - elseif type == "punch" and self.animation.current ~= "punch" then - if - self.animation.punch_start - and self.animation.punch_end - and self.animation.speed_normal - then - self.object:set_animation( - {x=self.animation.punch_start,y=self.animation.punch_end}, - self.animation.speed_normal, 0 - ) - self.animation.current = "punch" - end - elseif type == "hurt" and self.animation.current ~= "hurt" then - self.animation.hurtdur = .5 - if - self.animation.hurt_start - and self.animation.hurt_end - and self.animation.speed_normal - then - self.object:set_animation( - {x=self.animation.hurt_start,y=self.animation.hurt_end}, - self.animation.speed_normal, 0 - ) - self.animation.current = "hurt" - self.animation.hurtdur = (self.animation.hurt_end - self.animation.hurt_start)/self.animation.speed_normal - 1 - end - elseif type == "death" and self.animation.current ~= "death" then - self.animation.deathdur = 1 - if - self.animation.death_start - and self.animation.death_end - and self.animation.speed_normal - then - self.object:set_animation( - {x=self.animation.death_start,y=self.animation.death_end}, - self.animation.speed_normal, 0 - ) - self.animation.current = "death" - self.animation.deathdur = (self.animation.death_end - self.animation.death_start)/self.animation.speed_normal - .5 - end - end - end, - - on_step = function(self, dtime) - if self.type == "monster" and minetest.setting_getbool("only_peaceful_mobs") then - self.object:remove() - end - - self.lifetimer = self.lifetimer - dtime - if self.lifetimer <= 0 and not self.tamed then - local player_count = 0 - for _,obj in ipairs(minetest.get_objects_inside_radius(self.object:getpos(), 30)) do - if obj:is_player() then - player_count = player_count+1 - end - end - if player_count == 0 and self.state ~= "attack" then - self.object:remove() - return - end - end - if self.object:getvelocity().y > 0.1 then - local yaw = self.object:getyaw() - if self.drawtype == "side" then - yaw = yaw+(math.pi/2) - end - local x = math.sin(yaw) * -2 - local z = math.cos(yaw) * 2 - self.object:setacceleration({x=x, y=-10, z=z}) - else - self.object:setacceleration({x=0, y=-10, z=0}) - end - - if self.disable_fall_damage and self.object:getvelocity().y == 0 then - if not self.old_y then - self.old_y = self.object:getpos().y - else - local d = self.old_y - self.object:getpos().y - if d > 5 then - local damage = d-5 - self.object:set_hp(self.object:get_hp()-damage) - if self.object:get_hp() == 0 then - self.object:remove() - end - end - self.old_y = self.object:getpos().y - end - end - - self.timer = self.timer+dtime - self.bombtimer = self.bombtimer+dtime - if self.state ~= "attack" then - if self.timer < 1 then - return - end - self.timer = 0 - end - - if self.sounds and self.sounds.random and math.random(1, 100) <= 1 then - minetest.sound_play(self.sounds.random, {object = self.object}) - end - - local do_env_damage = function(self) - local pos = self.object:getpos() - local n = minetest.get_node(pos) - - if self.light_damage and self.light_damage ~= 0 - and pos.y>0 - and minetest.get_node_light(pos) - and minetest.get_node_light(pos) > 4 - and minetest.get_timeofday() > 0.2 - and minetest.get_timeofday() < 0.8 - then - self.object:set_hp(self.object:get_hp()-self.light_damage) - if self.object:get_hp() == 0 then - self.object:remove() - end - end - - if self.water_damage and self.water_damage ~= 0 and - minetest.get_item_group(n.name, "water") ~= 0 - then - self.object:set_hp(self.object:get_hp()-self.water_damage) - if self.object:get_hp() == 0 then - self.object:remove() - end - end - - if self.lava_damage and self.lava_damage ~= 0 and - minetest.get_item_group(n.name, "lava") ~= 0 - then - self.object:set_hp(self.object:get_hp()-self.lava_damage) - if self.object:get_hp() == 0 then - self.object:remove() - end - end - end - - -- ridable pigs - if self.name == "mobs:pig" and self.saddle == "yes" and self.driver then - local item = self.driver:get_wielded_item() - if item:get_name() == "mobs:carrotstick" then - local yaw = self.driver:get_look_yaw() - math.pi / 2 - local velo = self.object:getvelocity() - local v = 1.5 - if math.abs(velo.x) + math.abs(velo.z) < .6 then velo.y = 5 end - self.state = "walk" - self:set_animation("walk") - self.object:setyaw(yaw) - self.object:setvelocity({x = -math.sin(yaw) * v, y = velo.y, z = math.cos(yaw) * v}) - - local inv = self.driver:get_inventory() - local stack = inv:get_stack("main", self.driver:get_wield_index()) - stack:add_wear(100) - if stack:get_wear() > 65400 then - stack = {name = "fishing:pole", count = 1} - end - inv:set_stack("main", self.driver:get_wield_index(), stack) - return - end - end - - self.env_damage_timer = self.env_damage_timer + dtime - if self.state == "attack" and self.env_damage_timer > 1 then - self.env_damage_timer = 0 - do_env_damage(self) - elseif self.state ~= "attack" then - do_env_damage(self) - end - - if self.type == "monster" and minetest.setting_getbool("enable_damage") then - for _,player in pairs(minetest.get_connected_players()) do - local s = self.object:getpos() - local p = player:getpos() - local dist = ((p.x-s.x)^2 + (p.y-s.y)^2 + (p.z-s.z)^2)^0.5 - if dist < 2 and self.attack_type == "bomb" and self.bombmode ~= "armed" then - if self.sounds and self.sounds.approach then - minetest.sound_play(self.sounds.approach, {object = self.object}) - end - self.bombmode = "armed" - self.bombtimer = 0 - end - if dist < self.view_range then - if self.attack.dist then - if dist < self.attack.dist then - self.attack.player = player - self.attack.dist = dist - end - else - self.state = "attack" - self.attack.player = player - self.attack.dist = dist - end - end - end - end - - if self.follow and self.follow ~= "" and not self.following then - for _,player in pairs(minetest.get_connected_players()) do - local s = self.object:getpos() - local p = player:getpos() - local dist = ((p.x-s.x)^2 + (p.y-s.y)^2 + (p.z-s.z)^2)^0.5 - if self.view_range and dist < self.view_range then - self.following = player - end - end - end - - if self.following and self.following:is_player() then - if self.following:get_wielded_item():get_name() ~= self.follow then - self.following = nil - self.v_start = false - else - local s = self.object:getpos() - local p = self.following:getpos() - local dist = ((p.x-s.x)^2 + (p.y-s.y)^2 + (p.z-s.z)^2)^0.5 - if dist > self.view_range then - self.following = nil - self.v_start = false - else - local vec = {x=p.x-s.x, y=p.y-s.y, z=p.z-s.z} - local yaw = math.atan(vec.z/vec.x)+math.pi/2 - if self.drawtype == "side" then - yaw = yaw+(math.pi/2) - end - if p.x > s.x then - yaw = yaw+math.pi - end - self.object:setyaw(yaw) - if dist > 2 then - if not self.v_start then - self.v_start = true - self.set_velocity(self, self.walk_velocity) - else - if self.jump and self.get_velocity(self) <= 0.5 and self.object:getvelocity().y == 0 then - self:jump() - end - self.set_velocity(self, self.walk_velocity) - end - self:set_animation("walk") - else - self.v_start = false - self.set_velocity(self, 0) - self:set_animation("stand") - end - return - end - end - end - - if self.state == "stand" then - if math.random(1, 4) == 1 then - self.object:setyaw(self.object:getyaw()+((math.random(0,360)-180)/180*math.pi)) - end - self.set_velocity(self, 0) - self.set_animation(self, "stand") - local standanim = math.random(1,4) - if standanim == 2 then - self.set_animation(self, "look") - elseif standanim == 3 then - self.set_animation(self, "eat") - elseif standanim == 4 then - self.set_animation(self, "fly") - end - if math.random(1, 100) <= 50 then - self.set_velocity(self, self.walk_velocity) - self.state = "walk" - self.set_animation(self, "walk") - end - elseif self.state == "walk" then - if math.random(1, 100) <= 30 then - self.object:setyaw(self.object:getyaw()+((math.random(0,360)-180)/180*math.pi)) - end - if self.jump and self.get_velocity(self) <= 0.5 and self.object:getvelocity().y == 0 then - self:jump() - end - self:set_animation("walk") - self.set_velocity(self, self.walk_velocity) - if math.random(1, 100) <= 10 then - self.set_velocity(self, 0) - self.state = "stand" - self:set_animation("stand") - end - elseif self.state == "attack" and (self.attack_type == "dogfight" or self.attack_type == "bomb") then - if not self.attack.player or not self.attack.player:is_player() then - self.state = "stand" - self:set_animation("stand") - self.attack = {player=nil, dist=nil} - return - end - local s = self.object:getpos() - local p = self.attack.player:getpos() - local dist = ((p.x-s.x)^2 + (p.y-s.y)^2 + (p.z-s.z)^2)^0.5 - if dist > self.view_range or self.attack.player:get_hp() <= 0 then - self.state = "stand" - self.v_start = false - self.set_velocity(self, 0) - self.attack = {player=nil, dist=nil} - self:set_animation("stand") - return - else - self.attack.dist = dist - end - if self.attack_type == "bomb" and self.bombmode == "armed" and self.bombtimer > 2 then - -- print("***BOOM",self.bombtimer) - self.bombmode = "exploded" - self.boom(self, math.random(2, 4)) - end - local vec = {x=p.x-s.x, y=p.y-s.y, z=p.z-s.z} - local yaw = math.atan(vec.z/vec.x)+math.pi/2 - if self.drawtype == "side" then - yaw = yaw+(math.pi/2) - end - if p.x > s.x then - yaw = yaw+math.pi - end - -- creepers use a spiraling approach: - if self.attack_type == "bomb" then - yaw = yaw - 14*math.pi/180 - end - self.object:setyaw(yaw) - if self.attack.dist > 2 then - if not self.v_start then - self.v_start = true - self.set_velocity(self, self.run_velocity) - else - if self.jump and self.get_velocity(self) <= 0.5 and self.object:getvelocity().y == 0 then - self:jump() - end - self.set_velocity(self, self.run_velocity) - end - self:set_animation("run") - else - self.set_velocity(self, 0) - self:set_animation("punch") - self.v_start = false - if self.timer > 1 then - self.timer = 0 - if self.sounds and self.sounds.attack then - minetest.sound_play(self.sounds.attack, {object = self.object}) - end - self.attack.player:punch(self.object, 1.0, { - full_punch_interval=1.0, - damage_groups = {fleshy=self.damage} - }, vec) - end - end - elseif self.state == "attack" and self.attack_type == "shoot" then - if not self.attack.player or not self.attack.player:is_player() then - self.state = "stand" - self:set_animation("stand") - self.attack = {player=nil, dist=nil} - return - end - local s = self.object:getpos() - local p = self.attack.player:getpos() - local dist = ((p.x-s.x)^2 + (p.y-s.y)^2 + (p.z-s.z)^2)^0.5 - if dist > self.view_range or self.attack.player:get_hp() <= 0 then - self.state = "stand" - self.v_start = false - self.set_velocity(self, 0) - self.attack = {player=nil, dist=nil} - self:set_animation("stand") - return - else - self.attack.dist = dist - self.shoot_interval = (dist + self.view_range) / self.view_range - end - - local vec = {x=p.x-s.x, y=p.y-s.y, z=p.z-s.z} - local yaw = math.atan(vec.z/vec.x)+math.pi/2 - if self.drawtype == "side" then - yaw = yaw+(math.pi/2) - end - if p.x > s.x then - yaw = yaw+math.pi - end - self.object:setyaw(yaw) - if self.attack.dist < 4 then - self.set_velocity(self, -self.run_velocity) - elseif self.attack.dist > 8 then - self.set_velocity(self, self.run_velocity) - else - self.set_velocity(self, 0) - end - if self.timer > self.shoot_interval and math.random(1, 100) <= 60 then - self.timer = 0 - - self:set_animation("shoot") - minetest.after(self.animation.shootdur, function() - self:set_animation("walk") - end) - if self.sounds and self.sounds.attack then - minetest.sound_play(self.sounds.attack, {object = self.object}) - end - - local p = self.object:getpos() - p.y = p.y + (self.collisionbox[2]+self.collisionbox[5])/2 - local obj = minetest.add_entity(p, self.arrow) - local amount = (vec.x^2+vec.y^2+vec.z^2)^0.5 - local v = 15 - vec.y = vec.y+1 - vec.x = vec.x*v/amount - vec.y = vec.y*v/amount - vec.z = vec.z*v/amount - obj:setvelocity(vec) - end - end - end, - - on_activate = function(self, staticdata, dtime_s) - self.object:set_armor_groups({fleshy=self.armor}) - self.object:setacceleration({x=0, y=-10, z=0}) - self.state = "stand" - self.attack = {player = nil, dist = nil} - self.object:setvelocity({x=0, y=self.object:getvelocity().y, z=0}) - self.object:setyaw(math.random(1, 360)/180*math.pi) - if self.type == "monster" and minetest.setting_getbool("only_peaceful_mobs") then - self.object:remove() - end - self.lifetimer = 600 - dtime_s - if staticdata then - local tmp = minetest.deserialize(staticdata) - if tmp and tmp.lifetimer then - self.lifetimer = tmp.lifetimer - dtime_s - end - if tmp and tmp.tamed then - self.tamed = tmp.tamed - end - if tmp and tmp.color then - self.color = tmp.color - end - if tmp and tmp.naked then - self.naked = tmp.naked - end - if tmp and tmp.saddle then - self.saddle = tmp.saddle - end - end - if self.name == "mobs:sheep" and self.color and not self.naked then - self.object:set_properties({ - textures = {"sheep_"..self.color..".png"}, - }) - self.drops = { - {name = "mobs:mutton_raw", - chance = 1, - min = 1, - max = 2,}, - {name = "wool:"..self.color, - chance = 1, - min = 1, - max = 1,}, - } - end - if self.name == "mobs:sheep" and not self.color then - local col = "white" - local cols = {"dark_grey", "grey", "black", "brown", "pink"} - if math.random(100) > 80 then - col = cols[math.random(1,5)] - end - self.color = col - self.object:set_properties({ - textures = {"sheep_"..self.color..".png"}, - }) - self.drops = { - {name = "mobs:mutton_raw", - chance = 1, - min = 1, - max = 2,}, - {name = "wool:"..self.color, - chance = 1, - min = 1, - max = 1,}, - } - end - if self.name == "mobs:sheep" and self.naked then - self.object:set_properties({ - textures = {"sheep_sheared.png"}, - }) - end - if self.name == "mobs:pig" and self.saddle == "yes" then - self.object:set_properties({ - textures = {"pig_with_saddle.png"}, - }) - end - - if self.lifetimer <= 0 and not self.tamed then - self.object:remove() - end - end, - - get_staticdata = function(self) - local tmp = { - lifetimer = self.lifetimer, - tamed = self.tamed, - color = self.color, - naked = self.naked, - saddle = self.saddle, - } - return minetest.serialize(tmp) - end, - - on_punch = function(self, hitter) - -- death happens at 20 hp so we can play the death animation: - if self.object:get_hp() <= 20 then - local pos = self.object:getpos() -minetest.add_particlespawner({ - amount = 20, - time = .2, - minpos = {x=pos.x-1, y=pos.y-.5, z=pos.z-1}, - maxpos = {x=pos.x+1, y=pos.y+.5, z=pos.z+1}, - minvel = {x=0, y=.3, z=0}, - maxvel = {x=0, y=2, z=0}, - minacc = {x=-.2, y=-.2, z=-.2}, - maxacc = {x=.2, y=.2, z=.2}, - minexptime = 1, - maxexptime = 5, - minsize = 1, - maxsize = 1, - collisiondetection = false, - vertical = false, - texture = "bettertnt_smoke.png", -}) - self:set_animation("death") - self.object:set_hp(1000) - if self.name == "mobs:pig" and self.driver then - local name = self.driver:get_player_name() - self.driver:set_detach() - default.player_attached[name] = false - default.player_set_animation(self.driver, "stand" , 30) - self.driver = nil - end - minetest.after(self.animation.deathdur, function() - self.object:remove() - end) - if self.sounds and self.sounds.death then - minetest.sound_play(self.sounds.death, {object = self.object}) - end - pos.y = pos.y + 0.5 - local obj = nil - local ndrops = 0 - for _,drop in ipairs(self.drops) do - if math.random(1, drop.chance) == 1 and ndrops < (self.maxdrops or 100) then - obj = minetest.add_item(pos, ItemStack(drop.name.." "..math.random(drop.min, drop.max))) - ndrops = ndrops + 1 - if obj then - obj:setvelocity({x=math.random(-1,1), y=5, z=math.random(-1,1)}) - end - end - end - else - if self.sounds and self.sounds.hurt then - minetest.sound_play(self.sounds.hurt, {object = self.object}) - end - self:set_animation("hurt") - minetest.after(self.animation.hurtdur, function() - self:set_animation("walk") - end) - end - end, - - __index = function(table,key) - return mobs.default_definition[key] - end,} - -function mobs:register_mob(name, def) - setmetatable (def,mobs.default_definition) - minetest.register_entity(name, def) -end - -function mobs:check_player_dist(pos, node) - for _,player in pairs(minetest.get_connected_players()) do - local p = player:getpos() - local dist = ((p.x-pos.x)^2 + (p.y-pos.y)^2 + (p.z-pos.z)^2)^0.5 - if dist < 24 then - return 1 - end - end - return nil -end - -mobs.spawning_mobs = {} -function mobs:register_spawn(name, nodes, max_light, min_light, chance, active_object_count, max_height, spawn_func) - if minetest.setting_getbool(string.gsub(name,":","_").."_spawn") ~= false then - mobs.spawning_mobs[name] = true - minetest.register_abm({ - nodenames = nodes, - neighbors = {"air"}, - interval = 10, - chance = chance, - action = function(pos, node, _, active_object_count_wider) - if node.name == "default:ice" or node.name == "default:glass" then - return - end - if active_object_count_wider > active_object_count then - return - end - if not mobs.spawning_mobs[name] then - return - end - pos.y = pos.y+1 - if not minetest.get_node_light(pos) then - return - end - if minetest.get_node_light(pos) > max_light then - return - end - if minetest.get_node_light(pos) < min_light then - return - end - if pos.y > max_height then - return - end - if minetest.get_node(pos).name ~= "air" then - return - end - pos.y = pos.y+1 - if minetest.get_node(pos).name ~= "air" then - return - end - if spawn_func and not spawn_func(pos, node) then - return - end - if mobs:check_player_dist(pos, node) then - return - end - if minetest.setting_getbool("display_mob_spawn") then - minetest.chat_send_all("[mobs] Add "..name.." at "..minetest.pos_to_string(pos)) - end - minetest.add_entity(pos, name) - end - }) - end -end - -function mobs:register_arrow(name, def) - minetest.register_entity(name, { - physical = false, - visual = def.visual, - visual_size = def.visual_size, - textures = def.textures, - velocity = def.velocity, - hit_player = def.hit_player, - hit_node = def.hit_node, - - on_step = function(self, dtime) - local pos = self.object:getpos() - if minetest.get_node(self.object:getpos()).name ~= "air" then - minetest.sound_play("bowhit1", {pos = pos}) - self.hit_node(self, pos, node) - self.object:remove() - return - end - pos.y = pos.y-1 - for _,player in pairs(minetest.get_objects_inside_radius(pos, 1)) do - if player:is_player() then - self.hit_player(self, player) - minetest.sound_play("damage", {pos = pos}) - self.object:remove() - return - end - end - end - }) -end - -function mobs:register_egg(mob, desc, img) -minetest.register_craftitem(mob, { - description = "Spawn "..desc, - inventory_image = img, - on_place = function(itemstack, placer, pointed_thing) - local pos = pointed_thing.above - if pointed_thing.above and not minetest.is_protected(pos, placer:get_player_name()) then - pos.y = pos.y + 0.5 - minetest.add_entity(pos, mob) - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - end - return itemstack - end, -}) -end - - diff --git a/mods/mobs_mc/api-mm-mcmods.lua b/mods/mobs_mc/api-mm-mcmods.lua deleted file mode 100644 index b24b4045..00000000 --- a/mods/mobs_mc/api-mm-mcmods.lua +++ /dev/null @@ -1,3010 +0,0 @@ - ---esmobs v1.3 ---maikerumine ---made for Extreme Survival game ---License for code WTFPL - --- Mobs Api (12th May 2016) ---REVISED 20160516 maikerumine for esmobs - -mobs = {} -mobs.mod = "redo" - --- Load settings -local damage_enabled = minetest.setting_getbool("enable_damage") -local peaceful_only = minetest.setting_getbool("only_peaceful_mobs") -local disable_blood = minetest.setting_getbool("mobs_disable_blood") -local creative = minetest.setting_getbool("creative_mode") -local spawn_protected = tonumber(minetest.setting_get("mobs_spawn_protected")) or 1 -local remove_far = minetest.setting_getbool("remove_far_mobs") - --- pathfinding settings -local enable_pathfinding = false -local enable_pathfind_digging = false -local stuck_timeout = 3 -- how long before mob gets stuck in place and starts searching -local stuck_path_timeout = 10 -- how long will mob follow path before giving up - ---bones settings maikerumine bones code -local enable_mob_bones = true -local enable_mob_allbones = false - - - --- internal functions - -local pi = math.pi -local square = math.sqrt -local atan = function(x) - - if x ~= x then - --error("atan bassed NaN") - print ("atan based NaN") - return 0 - else - return math.atan(x) - end -end - -do_attack = function(self, player) - - if self.state ~= "attack" then - - if math.random(0,100) < 90 - and self.sounds.war_cry then - - minetest.sound_play(self.sounds.war_cry,{ - object = self.object, - max_hear_distance = self.sounds.distance - }) - end - - self.state = "attack" - self.attack = player - end -end - -set_velocity = function(self, v) - - v = v or 0 - - local yaw = (self.object:getyaw() + self.rotate) or 0 - - self.object:setvelocity({ - x = math.sin(yaw) * -v, - y = self.object:getvelocity().y, - z = math.cos(yaw) * v - }) -end - -get_velocity = function(self) - - local v = self.object:getvelocity() - - return (v.x * v.x + v.z * v.z) ^ 0.5 -end - -set_animation = function(self, type) - - if not self.animation then - return - end - - self.animation.current = self.animation.current or "" - - self.animation.speed_normal = self.animation.speed_normal or 15 - - if type == "stand" - and self.animation.current ~= "stand" then - - if self.animation.stand_start - and self.animation.stand_end then - - self.object:set_animation({ - x = self.animation.stand_start, - y = self.animation.stand_end}, - (self.animation.speed_stand or self.animation.speed_normal), 0) - - self.animation.current = "stand" - end - - elseif type == "walk" - and self.animation.current ~= "walk" then - - if self.animation.walk_start - and self.animation.walk_end then - - self.object:set_animation({ - x = self.animation.walk_start, - y = self.animation.walk_end}, - (self.animation.speed_walk or self.animation.speed_normal), 0) - - self.animation.current = "walk" - end - - elseif type == "run" - and self.animation.current ~= "run" then - - if self.animation.run_start - and self.animation.run_end then - - self.object:set_animation({ - x = self.animation.run_start, - y = self.animation.run_end}, - (self.animation.speed_run or self.animation.speed_normal), 0) - - self.animation.current = "run" - end - - elseif type == "punch" - and self.animation.current ~= "punch" then - - if self.animation.punch_start - and self.animation.punch_end then - - self.object:set_animation({ - x = self.animation.punch_start, - y = self.animation.punch_end}, - (self.animation.speed_punch or self.animation.speed_normal), 0) - - self.animation.current = "punch" - end - elseif type == "punch2" - and self.animation.current ~= "punch2" then - - if self.animation.punch2_start - and self.animation.punch2_end then - - self.object:set_animation({ - x = self.animation.punch2_start, - y = self.animation.punch2_end}, - (self.animation.speed_punch2 or self.animation.speed_normal), 0) - - self.animation.current = "punch2" - end - elseif type == "shoot" - and self.animation.current ~= "shoot" then - - if self.animation.shoot_start - and self.animation.shoot_end then - - self.object:set_animation({ - x = self.animation.shoot_start, - y = self.animation.shoot_end}, - (self.animation.speed_shoot or self.animation.speed_normal), 0) - - self.animation.current = "shoot" - end - end -end - --- check line of sight for walkers and swimmers alike -function line_of_sight_water(self, pos1, pos2, stepsize) - - local s, pos_w = minetest.line_of_sight(pos1, pos2, stepsize) - - -- normal walking and flying mobs can see you through air - if s == true then - return true - end - - -- swimming mobs can see you through water - if s == false - and self.fly - and self.fly_in == "default:water_source" then - - local nod = minetest.get_node(pos_w).name - - if nod == "default:water_source" - or nod == "default:water_flowing" then - - return true - end - end - - return false - -end - --- particle effects -function effect(pos, amount, texture, max_size, radius) - - radius = radius or 2 - - minetest.add_particlespawner({ - amount = amount, - time = 0.25, - minpos = pos, - maxpos = pos, - minvel = {x = -radius, y = -radius, z = -radius}, - maxvel = {x = radius, y = radius, z = radius}, - minacc = {x = -radius, y = -radius, z = -radius}, - maxacc = {x = radius, y = radius, z = radius}, - minexptime = 0.1, - maxexptime = 1, - minsize = 0.5, - maxsize = (max_size or 1), - texture = texture, - }) -end - --- update nametag colour -function update_tag(self) - - local col = "#00FF00" - local qua = self.hp_max / 4 - - if self.health <= math.floor(qua * 3) then - col = "#FFFF00" - end - - if self.health <= math.floor(qua * 2) then - col = "#FF6600" - end - - if self.health <= math.floor(qua) then - col = "#FF0000" - end - - self.object:set_properties({ - nametag = self.nametag, - nametag_color = col - }) - -end - --- check if mob is dead or only hurt -function check_for_death(self) - - -- has health actually changed? - if self.health == self.old_health then - return - end - - self.old_health = self.health - - -- still got some health? play hurt sound - if self.health > 0 then - - if self.sounds.damage then - - minetest.sound_play(self.sounds.damage,{ - object = self.object, - gain = 1.0, - max_hear_distance = self.sounds.distance - }) - end - - -- make sure health isn't higher than max - if self.health > self.hp_max then - self.health = self.hp_max - end - - update_tag(self) - - return false - end - - -- drop items when dead - local obj - local pos = self.object:getpos() - - for _,drop in pairs(self.drops) do - - if math.random(1, drop.chance) == 1 then - - obj = minetest.add_item(pos, - ItemStack(drop.name .. " " - .. math.random(drop.min, drop.max))) - - if obj then - - obj:setvelocity({ - x = math.random(-1, 1), - y = 9, - z = math.random(-1, 1) - }) - end - end - end - - -- play death sound - if self.sounds.death then - - minetest.sound_play(self.sounds.death,{ - object = self.object, - gain = 1.0, - max_hear_distance = self.sounds.distance - }) - end - - -- execute custom death function - if self.on_die then - self.on_die(self, pos) - end - - self.object:remove() - - return true -end - --- check if within map limits (-30911 to 30927) -function within_limits(pos, radius) - - if (pos.x - radius) > -30913 - and (pos.x + radius) < 30928 - and (pos.y - radius) > -30913 - and (pos.y + radius) < 30928 - and (pos.z - radius) > -30913 - and (pos.z + radius) < 30928 then - return true -- within limits - end - - return false -- beyond limits -end - --- is mob facing a cliff -local function is_at_cliff(self) - - if self.fear_height == 0 then -- if 0, no falling protection! - return false - end - - local yaw = self.object:getyaw() - local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5) - local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5) - local pos = self.object:getpos() - local ypos = pos.y + self.collisionbox[2] -- just above floor - - if minetest.line_of_sight( - {x = pos.x + dir_x, y = ypos, z = pos.z + dir_z}, - {x = pos.x + dir_x, y = ypos - self.fear_height, z = pos.z + dir_z} - , 1) then - - return true - end - - return false -end - --- get node but use fallback for nil or unknown -local function node_ok(pos, fallback) - - fallback = fallback or "default:dirt" - - local node = minetest.get_node_or_nil(pos) - - if not node then - return minetest.registered_nodes[fallback] - end - - if minetest.registered_nodes[node.name] then - return node - end - - return minetest.registered_nodes[fallback] -end - --- environmental damage (water, lava, fire, light) -do_env_damage = function(self) - - -- feed/tame text timer (so mob 'full' messages dont spam chat) - if self.htimer > 0 then - self.htimer = self.htimer - 1 - end - - local pos = self.object:getpos() - - self.time_of_day = minetest.get_timeofday() - - -- remove mob if beyond map limits - if not within_limits(pos, 0) then - self.object:remove() - return - end - - -- daylight above ground - if self.light_damage ~= 0 - and pos.y > 0 - and self.time_of_day > 0.2 - and self.time_of_day < 0.8 - and (minetest.get_node_light(pos) or 0) > 12 then - - self.health = self.health - self.light_damage - - effect(pos, 5, "tnt_smoke.png") - end - - -- what is mob standing in? - pos.y = pos.y + self.collisionbox[2] + 0.1 -- foot level - self.standing_in = node_ok(pos, "air").name - --print ("standing in " .. self.standing_in) - - if self.water_damage ~= 0 - or self.lava_damage ~= 0 then - - local nodef = minetest.registered_nodes[self.standing_in] - - pos.y = pos.y + 1 - - -- water - if self.water_damage ~= 0 - and nodef.groups.water then - - self.health = self.health - self.water_damage - - effect(pos, 5, "bubble.png") - end - - -- lava or fire - if self.lava_damage ~= 0 - and (nodef.groups.lava - or self.standing_in == "fire:basic_flame" - or self.standing_in == "fire:permanent_flame") then - - self.health = self.health - self.lava_damage - - effect(pos, 5, "fire_basic_flame.png") - end - end - - check_for_death(self) -end - --- jump if facing a solid node (not fences or gates) -do_jump = function(self) - - if self.fly - or self.child then - return - end - - local pos = self.object:getpos() - - -- what is mob standing on? - pos.y = pos.y + self.collisionbox[2] - 0.2 - - local nod = node_ok(pos) - ---print ("standing on:", nod.name, pos.y) - - if minetest.registered_nodes[nod.name].walkable == false then - return - end - - -- where is front - local yaw = self.object:getyaw() - local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5) - local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5) - - -- what is in front of mob? - local nod = node_ok({ - x = pos.x + dir_x, - y = pos.y + 0.5, - z = pos.z + dir_z - }) - - -- thin blocks that do not need to be jumped - if nod.name == "default:snow" then - return - end - ---print ("in front:", nod.name, pos.y + 0.5) - - if (minetest.registered_items[nod.name].walkable - and not nod.name:find("fence") - and not nod.name:find("gate")) - or self.walk_chance == 0 then - - local v = self.object:getvelocity() - - v.y = self.jump_height + 1 - v.x = v.x * 2.2 - v.z = v.z * 2.2 - - self.object:setvelocity(v) - - if self.sounds.jump then - - minetest.sound_play(self.sounds.jump, { - object = self.object, - gain = 1.0, - max_hear_distance = self.sounds.distance - }) - end - else - if self.state ~= "attack" then - self.state = "stand" - set_animation(self, "stand") - end - end -end - --- this is a faster way to calculate distance -local get_distance = function(a, b) - - local x, y, z = a.x - b.x, a.y - b.y, a.z - b.z - - return square(x * x + y * y + z * z) -end - --- blast damage to entities nearby (modified from TNT mod) -function entity_physics(pos, radius) - - radius = radius * 2 - - local objs = minetest.get_objects_inside_radius(pos, radius) - local obj_pos, dist - - for _, obj in pairs(objs) do - - obj_pos = obj:getpos() - - dist = math.max(1, get_distance(pos, obj_pos)) - - local damage = math.floor((4 / dist) * radius) - local ent = obj:get_luaentity() - - if obj:is_player() then - obj:set_hp(obj:get_hp() - damage) - - else --if ent.health then - - obj:punch(obj, 1.0, { - full_punch_interval = 1.0, - damage_groups = {fleshy = damage}, - }, nil) - - end - end -end - --- should mob follow what I'm holding ? -function follow_holding(self, clicker) - - local item = clicker:get_wielded_item() - local t = type(self.follow) - - -- single item - if t == "string" - and item:get_name() == self.follow then - return true - - -- multiple items - elseif t == "table" then - - for no = 1, #self.follow do - - if self.follow[no] == item:get_name() then - return true - end - end - end - - return false -end - --- find two animals of same type and breed if nearby and horny -local function breed(self) - - -- child take 240 seconds before growing into adult - if self.child == true then - - self.hornytimer = self.hornytimer + 1 - - if self.hornytimer > 240 then - - self.child = false - self.hornytimer = 0 - - self.object:set_properties({ - textures = self.base_texture, - mesh = self.base_mesh, - visual_size = self.base_size, - collisionbox = self.base_colbox, - }) - - -- jump when fully grown so not to fall into ground - self.object:setvelocity({ - x = 0, - y = self.jump_height, - z = 0 - }) - end - - return - end - - -- horny animal can mate for 40 seconds, - -- afterwards horny animal cannot mate again for 200 seconds - if self.horny == true - and self.hornytimer < 240 then - - self.hornytimer = self.hornytimer + 1 - - if self.hornytimer >= 240 then - self.hornytimer = 0 - self.horny = false - end - end - - -- find another same animal who is also horny and mate if close enough - if self.horny == true - and self.hornytimer <= 40 then - - local pos = self.object:getpos() - - effect({x = pos.x, y = pos.y + 1, z = pos.z}, 4, "heart.png") - - local ents = minetest.get_objects_inside_radius(pos, 3) - local num = 0 - local ent = nil - - for i, obj in pairs(ents) do - - ent = obj:get_luaentity() - - -- check for same animal with different colour - local canmate = false - - if ent then - - if ent.name == self.name then - canmate = true - else - local entname = string.split(ent.name,":") - local selfname = string.split(self.name,":") - - if entname[1] == selfname[1] then - entname = string.split(entname[2],"_") - selfname = string.split(selfname[2],"_") - - if entname[1] == selfname[1] then - canmate = true - end - end - end - end - - if ent - and canmate == true - and ent.horny == true - and ent.hornytimer <= 40 then - num = num + 1 - end - - -- found your mate? then have a baby - if num > 1 then - - self.hornytimer = 41 - ent.hornytimer = 41 - - -- spawn baby - minetest.after(5, function(dtime) - - local mob = minetest.add_entity(pos, self.name) - local ent2 = mob:get_luaentity() - local textures = self.base_texture - - if self.child_texture then - textures = self.child_texture[1] - end - - mob:set_properties({ - textures = textures, - visual_size = { - x = self.base_size.x / 2, - y = self.base_size.y / 2 - }, - collisionbox = { - self.base_colbox[1] / 2, - self.base_colbox[2] / 2, - self.base_colbox[3] / 2, - self.base_colbox[4] / 2, - self.base_colbox[5] / 2, - self.base_colbox[6] / 2 - }, - }) - ent2.child = true - ent2.tamed = true - ent2.owner = self.owner - end) - - num = 0 - - break - end - end - end -end - --- find and replace what mob is looking for (grass, wheat etc.) -function replace(self, pos) - - if self.replace_rate - and self.child == false - and math.random(1, self.replace_rate) == 1 then - - local pos = self.object:getpos() - - pos.y = pos.y + self.replace_offset - --- print ("replace node = ".. minetest.get_node(pos).name, pos.y) - - if self.replace_what - and self.replace_with - and self.object:getvelocity().y == 0 - and #minetest.find_nodes_in_area(pos, pos, self.replace_what) > 0 then - - minetest.set_node(pos, {name = self.replace_with}) - - -- when cow/sheep eats grass, replace wool and milk - if self.gotten == true then - self.gotten = false - self.object:set_properties(self) - end - end - end -end - --- check if daytime and also if mob is docile during daylight hours -function day_docile(self) - - if self.docile_by_day == false then - - return false - - elseif self.docile_by_day == true - and self.time_of_day > 0.2 - and self.time_of_day < 0.8 then - - return true - end -end - --- path finding and smart mob routine by rnd -function smart_mobs(self, s, p, dist, dtime) - - local s1 = self.path.lastpos - - -- is it becoming stuck? - if math.abs(s1.x - s.x) + math.abs(s1.z - s.z) < 1.5 then - self.path.stuck_timer = self.path.stuck_timer + dtime - else - self.path.stuck_timer = 0 - end - - self.path.lastpos = {x = s.x, y = s.y, z = s.z} - - -- im stuck, search for path - if (self.path.stuck_timer > stuck_timeout and not self.path.following) - or (self.path.stuck_timer > stuck_path_timeout - and self.path.following) then - - self.path.stuck_timer = 0 - - -- lets try find a path, first take care of positions - -- since pathfinder is very sensitive - local sheight = self.collisionbox[5] - self.collisionbox[2] - - -- round position to center of node to avoid stuck in walls - -- also adjust height for player models! - s.x = math.floor(s.x + 0.5) - s.y = math.floor(s.y + 0.5) - sheight - s.z = math.floor(s.z + 0.5) - - local ssight, sground - ssight, sground = minetest.line_of_sight(s, { - x = s.x, y = s.y - 4, z = s.z}, 1) - - -- determine node above ground - if not ssight then - s.y = sground.y + 1 - end - - local p1 = self.attack:getpos() - - p1.x = math.floor(p1.x + 0.5) - p1.y = math.floor(p1.y + 0.5) - p1.z = math.floor(p1.z + 0.5) - - self.path.way = minetest.find_path(s, p1, 16, 2, 6, "Dijkstra") --"A*_noprefetch") - - -- attempt to unstick mob that is "daydreaming" - self.object:setpos({ - x = s.x + 0.1 * (math.random() * 2 - 1), - y = s.y + 1, - z = s.z + 0.1 * (math.random() * 2 - 1) - }) - - self.state = "" - do_attack(self, self.attack) - - -- no path found, try something else - if not self.path.way then - - self.path.following = false --- self.path.stuck = true - - -- lets make way by digging/building if not accessible - if enable_pathfind_digging then - - -- add block and remove one block above so - -- there is room to jump if needed - if s.y < p1.y then - - if not minetest.is_protected(s, "") then - minetest.set_node(s, {name = "default:dirt"}) - end - - local sheight = math.ceil(self.collisionbox[5]) + 1 - - -- assume mob is 2 blocks high so it digs above its head - s.y = s.y + sheight - - if not minetest.is_protected(s, "") then - - local node1 = minetest.get_node(s).name - - if node1 ~= "air" - and node1 ~= "ignore" then - minetest.set_node(s, {name = "air"}) - minetest.add_item(s, ItemStack(node1)) - end - end - - s.y = s.y - sheight - self.object:setpos({x = s.x, y = s.y + 2, z = s.z}) - - else -- dig 2 blocks to make door toward player direction - - local yaw1 = self.object:getyaw() + pi / 2 - - local p1 = { - x = s.x + math.cos(yaw1), - y = s.y, - z = s.z + math.sin(yaw1) - } - - if not minetest.is_protected(p1, "") then - - local node1 = minetest.get_node(p1).name - - if node1 ~= "air" - and node1 ~= "ignore" then - minetest.add_item(p1, ItemStack(node1)) - minetest.set_node(p1, {name = "air"}) - end - - p1.y = p1.y + 1 - node1 = minetest.get_node(p1).name - - if node1 ~= "air" - and node1 ~= "ignore" then - minetest.add_item(p1, ItemStack(node1)) - minetest.set_node(p1, {name = "air"}) - end - - end - end - end - - -- will try again in 2 second - self.path.stuck_timer = stuck_timeout - 2 - - -- frustration! cant find the damn path :( - if self.sounds.random then - minetest.sound_play(self.sounds.random, { - object = self.object, - max_hear_distance = self.sounds.distance - }) - end - - else - - -- yay i found path - if self.sounds.attack then - - set_velocity(self, self.walk_velocity) - - minetest.sound_play(self.sounds.attack, { - object = self.object, - max_hear_distance = self.sounds.distance - }) - end - - -- follow path now that it has it - self.path.following = true - end - end -end - --- monster find someone to attack -local monster_attack = function(self) - - if self.type ~= "monster" - or not damage_enabled - or self.state == "attack" - or day_docile(self) then - return - end - - local s = self.object:getpos() - local p, sp, dist - local player, type, obj, min_player = nil, nil, nil, nil - local min_dist = self.view_range + 1 - - for _,oir in pairs(minetest.get_objects_inside_radius(s, self.view_range)) do - - if oir:is_player() then - - player = oir - type = "player" - else - obj = oir:get_luaentity() - - if obj then - player = obj.object - type = obj.type - end - end - - if type == "player" - or type == "npc" then - - s = self.object:getpos() - p = player:getpos() - sp = s - - -- aim higher to make looking up hills more realistic - p.y = p.y + 1 - sp.y = sp.y + 1 - - dist = get_distance(p, s) - - if dist < self.view_range then - -- field of view check goes here - - -- choose closest player to attack - --if minetest.line_of_sight(sp, p, 2) == true - if line_of_sight_water(self, sp, p, 2) == true - and dist < min_dist then - min_dist = dist - min_player = player - end - end - end - end - - -- attack player - if min_player then - do_attack(self, min_player) - end -end - --- npc, find closest monster to attack -local npc_attack = function(self) - - if self.type ~= "npc" - or not self.attacks_monsters - or self.state == "attack" then - return - end - - local s = self.object:getpos() - local min_dist = self.view_range + 1 - local obj, min_player = nil, nil - - for _, oir in pairs(minetest.get_objects_inside_radius(s, self.view_range)) do - - obj = oir:get_luaentity() - - if obj - and obj.type == "monster" then - - p = obj.object:getpos() - - dist = get_distance(p, s) - - if dist < min_dist then - min_dist = dist - min_player = obj.object - end - end - end - - if min_player then - do_attack(self, min_player) - end -end - --- follow player if owner or holding item, if fish outta water then flop -local follow_flop = function(self) - - -- find player to follow - if (self.follow ~= "" - or self.order == "follow") - and not self.following - and self.state ~= "attack" - and self.state ~= "runaway" then - - local s, p, dist - - for _,player in pairs(minetest.get_connected_players()) do - - s = self.object:getpos() - p = player:getpos() - dist = get_distance(p, s) - - if dist < self.view_range then - self.following = player - break - end - end - end - - if self.type == "npc" - and self.order == "follow" - and self.state ~= "attack" - and self.owner ~= "" then - - -- npc stop following player if not owner - if self.following - and self.owner - and self.owner ~= self.following:get_player_name() then - self.following = nil - end - else - -- stop following player if not holding specific item - if self.following - and self.following:is_player() - and follow_holding(self, self.following) == false then - self.following = nil - end - - end - - -- follow that thing - if self.following then - - local s = self.object:getpos() - local p - - if self.following:is_player() then - - p = self.following:getpos() - - elseif self.following.object then - - p = self.following.object:getpos() - end - - if p then - - local dist = get_distance(p, s) - - -- dont follow if out of range - if dist > self.view_range then - self.following = nil - else - local vec = { - x = p.x - s.x, - y = p.y - s.y, - z = p.z - s.z - } - - if vec.x ~= 0 - and vec.z ~= 0 then - - yaw = (atan(vec.z / vec.x) + pi / 2) - self.rotate - - if p.x > s.x then - yaw = yaw + pi - end - - self.object:setyaw(yaw) - end - - -- anyone but standing npc's can move along - if dist > self.reach - and self.order ~= "stand" then - - if (self.jump - and get_velocity(self) <= 0.5 - and self.object:getvelocity().y == 0) - or (self.object:getvelocity().y == 0 - and self.jump_chance > 0) then - - do_jump(self) - end - - set_velocity(self, self.walk_velocity) - - if self.walk_chance ~= 0 then - set_animation(self, "walk") - end - else - set_velocity(self, 0) - set_animation(self, "stand") - end - - return - end - end - end - - -- water swimmers flop when on land - if self.fly - and self.fly_in == "default:water_source" - and self.standing_in ~= self.fly_in then - - self.state = "flop" - self.object:setvelocity({x = 0, y = -5, z = 0}) - - set_animation(self, "stand") - - return - end -end - --- dogshoot attack switch and counter function -local dogswitch = function(self, dtime) - - -- switch mode not activated - if not self.dogshoot_switch - or not dtime then - return 0 - end - - self.dogshoot_count = self.dogshoot_count + dtime - - if self.dogshoot_count > self.dogshoot_count_max then - - self.dogshoot_count = 0 - - if self.dogshoot_switch == 1 then - self.dogshoot_switch = 2 - else - self.dogshoot_switch = 1 - end - end - - return self.dogshoot_switch -end - --- execute current state (stand, walk, run, attacks) -local do_states = function(self, dtime) - - local yaw = 0 - - if self.state == "stand" then - - if math.random(1, 4) == 1 then - - local lp = nil - local s = self.object:getpos() - - if self.type == "npc" then - - local o = minetest.get_objects_inside_radius(self.object:getpos(), 3) - - for _,o in pairs(o) do - - if o:is_player() then - lp = o:getpos() - break - end - end - end - - -- look at any players nearby, otherwise turn randomly - if lp then - - local vec = { - x = lp.x - s.x, - y = lp.y - s.y, - z = lp.z - s.z - } - - if vec.x ~= 0 - and vec.z ~= 0 then - - yaw = (atan(vec.z / vec.x) + pi / 2) - self.rotate - - if lp.x > s.x then - yaw = yaw + pi - end - end - else - yaw = (math.random(0, 360) - 180) / 180 * pi - end - - self.object:setyaw(yaw) - end - - set_velocity(self, 0) - set_animation(self, "stand") - - -- npc's ordered to stand stay standing - if self.type ~= "npc" - or self.order ~= "stand" then - - if self.walk_chance ~= 0 - and math.random(1, 100) <= self.walk_chance - and is_at_cliff(self) == false then - - set_velocity(self, self.walk_velocity) - self.state = "walk" - set_animation(self, "walk") - end - end - - elseif self.state == "walk" then - - local s = self.object:getpos() - local lp = minetest.find_node_near(s, 1, {"group:water"}) - - -- if water nearby then turn away - if lp then - - local vec = { - x = lp.x - s.x, - y = lp.y - s.y, - z = lp.z - s.z - } - - if vec.x ~= 0 - and vec.z ~= 0 then - - yaw = atan(vec.z / vec.x) + 3 * pi / 2 - self.rotate - - if lp.x > s.x then - yaw = yaw + pi - end - - self.object:setyaw(yaw) - end - - -- otherwise randomly turn - elseif math.random(1, 100) <= 30 then - - local yaw = (math.random(0, 360) - 180) / 180 * pi - - self.object:setyaw(yaw) - end - - -- stand for great fall in front - local temp_is_cliff = is_at_cliff(self) - - -- jump when walking comes to a halt - if temp_is_cliff == false - and self.jump - and get_velocity(self) <= 0.5 - and self.object:getvelocity().y == 0 then - - do_jump(self) - end - - if temp_is_cliff - or math.random(1, 100) <= 30 then - - set_velocity(self, 0) - self.state = "stand" - set_animation(self, "stand") - else - set_velocity(self, self.walk_velocity) - set_animation(self, "walk") - end - - -- runaway when punched - elseif self.state == "runaway" then - - self.runaway_timer = self.runaway_timer + 1 - - -- stop after 3 seconds or when at cliff - if self.runaway_timer > 3 - or is_at_cliff(self) then - self.runaway_timer = 0 - set_velocity(self, 0) - self.state = "stand" - set_animation(self, "stand") - else - set_velocity(self, self.run_velocity) - set_animation(self, "walk") - end - - -- jump when walking comes to a halt - if self.jump - and get_velocity(self) <= 0.5 - and self.object:getvelocity().y == 0 then - - do_jump(self) - end - - -- attack routines (explode, dogfight, shoot, dogshoot) - elseif self.state == "attack" then - - -- calculate distance from mob and enemy - local s = self.object:getpos() - local p = self.attack:getpos() or s - local dist = get_distance(p, s) - - -- stop attacking if player or out of range - if dist > self.view_range - or not self.attack - or not self.attack:getpos() - or self.attack:get_hp() <= 0 then - - --print(" ** stop attacking **", dist, self.view_range) - self.state = "stand" - set_velocity(self, 0) - set_animation(self, "stand") - self.attack = nil - self.v_start = false - self.timer = 0 - self.blinktimer = 0 - - return - end - - if self.attack_type == "explode" then - - local vec = { - x = p.x - s.x, - y = p.y - s.y, - z = p.z - s.z - } - - if vec.x ~= 0 - and vec.z ~= 0 then - - yaw = atan(vec.z / vec.x) + pi / 2 - self.rotate - - if p.x > s.x then - yaw = yaw + pi - end - - self.object:setyaw(yaw) - end - - if dist > self.reach then - - if not self.v_start then - - self.v_start = true - set_velocity(self, self.run_velocity) - self.timer = 0 - self.blinktimer = 0 - else - self.timer = 0 - self.blinktimer = 0 - - if get_velocity(self) <= 0.5 - and self.object:getvelocity().y == 0 then - - local v = self.object:getvelocity() - v.y = 5 - self.object:setvelocity(v) - end - - set_velocity(self, self.run_velocity) - end - - set_animation(self, "run") - else - set_velocity(self, 0) - set_animation(self, "punch") - - self.timer = self.timer + dtime - self.blinktimer = (self.blinktimer or 0) + dtime - - if self.blinktimer > 0.2 then - - self.blinktimer = 0 - - if self.blinkstatus then - self.object:settexturemod("") - else - self.object:settexturemod("^[brighten") - end - - self.blinkstatus = not self.blinkstatus - end - - if self.timer > 3 then - - local pos = self.object:getpos() - local radius = self.explosion_radius or 1 - - -- hurt player/mobs caught in blast area - entity_physics(pos, radius) - - -- dont damage anything if area protected or next to water - if minetest.find_node_near(pos, 1, {"group:water"}) - or minetest.is_protected(pos, "") then - - if self.sounds.explode then - - minetest.sound_play(self.sounds.explode, { - object = self.object, - gain = 1.0, - max_hear_distance = 16 - }) - end - - self.object:remove() - - effect(pos, 15, "tnt_smoke.png", 5) - - return - end - - pos.y = pos.y - 1 - - mobs:explosion(pos, radius, 0, 1, self.sounds.explode) - - self.object:remove() - - return - end - end - - elseif self.attack_type == "dogfight" - or (self.attack_type == "dogshoot" and dogswitch(self, dtime) == 2) - or (self.attack_type == "dogshoot" and dist <= self.reach and dogswitch(self) == 0) then - - if self.fly - and dist > self.reach then - - local nod = node_ok(s) - local p1 = s - local me_y = math.floor(p1.y) - local p2 = p - local p_y = math.floor(p2.y + 1) - local v = self.object:getvelocity() - - if nod.name == self.fly_in then - - if me_y < p_y then - - self.object:setvelocity({ - x = v.x, - y = 1 * self.walk_velocity, - z = v.z - }) - - elseif me_y > p_y then - - self.object:setvelocity({ - x = v.x, - y = -1 * self.walk_velocity, - z = v.z - }) - end - else - if me_y < p_y then - - self.object:setvelocity({ - x = v.x, - y = 0.01, - z = v.z - }) - - elseif me_y > p_y then - - self.object:setvelocity({ - x = v.x, - y = -0.01, - z = v.z - }) - end - end - - end - - -- rnd: new movement direction - if self.path.following - and self.path.way - and self.attack_type ~= "dogshoot" then - - -- no paths longer than 50 - if #self.path.way > 50 - or dist < self.reach then - self.path.following = false - return - end - - local p1 = self.path.way[1] - - if not p1 then - self.path.following = false - return - end - - if math.abs(p1.x-s.x) + math.abs(p1.z - s.z) < 0.6 then - -- reached waypoint, remove it from queue - table.remove(self.path.way, 1) - end - - -- set new temporary target - p = {x = p1.x, y = p1.y, z = p1.z} - end - - local vec = { - x = p.x - s.x, - y = p.y - s.y, - z = p.z - s.z - } - - if vec.x ~= 0 - and vec.z ~= 0 then - - yaw = (atan(vec.z / vec.x) + pi / 2) - self.rotate - - if p.x > s.x then - yaw = yaw + pi - end - - self.object:setyaw(yaw) - end - - -- move towards enemy if beyond mob reach - if dist > self.reach then - - -- path finding by rnd - if self.pathfinding -- only if mob has pathfinding enabled - and enable_pathfinding then - - smart_mobs(self, s, p, dist, dtime) - end - - -- jump attack - if (self.jump - and get_velocity(self) <= 0.5 - and self.object:getvelocity().y == 0) - or (self.object:getvelocity().y == 0 - and self.jump_chance > 0) then - - do_jump(self) - end - - if is_at_cliff(self) then - - set_velocity(self, 0) - set_animation(self, "stand") - else - - if self.path.stuck then - set_velocity(self, self.walk_velocity) - else - set_velocity(self, self.run_velocity) - end - - set_animation(self, "run") - end - - else -- rnd: if inside reach range - - self.path.stuck = false - self.path.stuck_timer = 0 - self.path.following = false -- not stuck anymore - - set_velocity(self, 0) - - if not self.custom_attack then - - if self.timer > 1 then - - self.timer = 0 - - if self.double_melee_attack - and math.random(1, 2) == 1 then - set_animation(self, "punch2") - else - set_animation(self, "punch") - end - - local p2 = p - local s2 = s - - p2.y = p2.y + 1.5 - s2.y = s2.y + 1.5 - - --if minetest.line_of_sight(p2, s2) == true then - if line_of_sight_water(self, p2, s2) == true then - - -- play attack sound - if self.sounds.attack then - - minetest.sound_play(self.sounds.attack, { - object = self.object, - max_hear_distance = self.sounds.distance - }) - end - - -- punch player - self.attack:punch(self.object, 1.0, { - full_punch_interval = 1.0, - damage_groups = {fleshy = self.damage} - }, nil) - end - end - else -- call custom attack every second - if self.custom_attack - and self.timer > 1 then - - self.timer = 0 - - self.custom_attack(self, p) - end - end - end - - elseif self.attack_type == "shoot" - or (self.attack_type == "dogshoot" and dogswitch(self, dtime) == 1) - or (self.attack_type == "dogshoot" and dist > self.reach and dogswitch(self) == 0) then - - p.y = p.y - .5 - s.y = s.y + .5 - - local dist = get_distance(p, s) - local vec = { - x = p.x - s.x, - y = p.y - s.y, - z = p.z - s.z - } - - if vec.x ~= 0 - and vec.z ~= 0 then - - yaw = (atan(vec.z / vec.x) + pi / 2) - self.rotate - - if p.x > s.x then - yaw = yaw + pi - end - - self.object:setyaw(yaw) - end - - set_velocity(self, 0) - - if self.shoot_interval - and self.timer > self.shoot_interval - and math.random(1, 100) <= 60 then - - self.timer = 0 - set_animation(self, "shoot") - - -- play shoot attack sound - if self.sounds.shoot_attack then - - minetest.sound_play(self.sounds.shoot_attack, { - object = self.object, - max_hear_distance = self.sounds.distance - }) - end - - local p = self.object:getpos() - - p.y = p.y + (self.collisionbox[2] + self.collisionbox[5]) / 2 - - local obj = minetest.add_entity(p, self.arrow) - local ent = obj:get_luaentity() - local amount = (vec.x * vec.x + vec.y * vec.y + vec.z * vec.z) ^ 0.5 - local v = ent.velocity or 1 -- or set to default --seems to be buggy mc - ent.switch = 1 - - -- offset makes shoot aim accurate - vec.y = vec.y + self.shoot_offset - vec.x = vec.x * (v / amount) - vec.y = vec.y * (v / amount) - vec.z = vec.z * (v / amount) - - obj:setvelocity(vec) - end - end - end -end - --- falling and fall damage -local falling = function(self, pos) - - if self.fly then - return - end - - -- floating in water (or falling) - local v = self.object:getvelocity() - - -- going up then apply gravity - if v.y > 0.1 then - - self.object:setacceleration({ - x = 0, - y = self.fall_speed, - z = 0 - }) - end - - -- in water then float up - if minetest.registered_nodes[node_ok(pos).name].groups.liquid then - - if self.floats == 1 then - - self.object:setacceleration({ - x = 0, - y = -self.fall_speed / (math.max(1, v.y) ^ 2), - z = 0 - }) - end - else - -- fall downwards - self.object:setacceleration({ - x = 0, - y = self.fall_speed, - z = 0 - }) - - -- fall damage - if self.fall_damage == 1 - and self.object:getvelocity().y == 0 then - - local d = self.old_y - self.object:getpos().y - - if d > 5 then - - self.health = self.health - math.floor(d - 5) - - effect(pos, 5, "tnt_smoke.png") - - if check_for_death(self) then - return - end - end - - self.old_y = self.object:getpos().y - end - end -end - -local mob_punch = function(self, hitter, tflp, tool_capabilities, dir) - - -- direction error check - dir = dir or {x = 0, y = 0, z = 0} - - -- weapon wear - local weapon = hitter:get_wielded_item() - local punch_interval = 1.4 - - -- calculate mob damage - local damage = 0 - local armor = self.object:get_armor_groups() or {} - local tmp - - -- quick error check incase it ends up 0 (serialize.h check test) - if tflp == 0 then - tflp = 0.2 - end - - for group,_ in pairs( (tool_capabilities.damage_groups or {}) ) do - - tmp = tflp / (tool_capabilities.full_punch_interval or 1.4) - - if tmp < 0 then - tmp = 0.0 - elseif tmp > 1 then - tmp = 1.0 - end - - damage = damage + (tool_capabilities.damage_groups[group] or 0) - * tmp * ((armor[group] or 0) / 100.0) - end - - -- check for tool immunity or special damage - for _, no in pairs(self.immune_to) do - - if no[1] == weapon:get_name() then - - damage = no[2] or 0 - - break - end - end - - -- print ("Mob Damage is", damage) - - -- add weapon wear - if tool_capabilities then - punch_interval = tool_capabilities.full_punch_interval or 1.4 - end - - if weapon:get_definition() - and weapon:get_definition().tool_capabilities then - - weapon:add_wear(math.floor((punch_interval / 75) * 9000)) - hitter:set_wielded_item(weapon) - end - - -- weapon sounds - if weapon:get_definition().sounds ~= nil then - - local s = math.random(0, #weapon:get_definition().sounds) - - minetest.sound_play(weapon:get_definition().sounds[s], { - object = hitter, - max_hear_distance = 8 - }) - else - minetest.sound_play("default_punch", { - object = hitter, - max_hear_distance = 5 - }) - end - - -- do damage - self.health = self.health - math.floor(damage) - - -- exit here if dead - if check_for_death(self) then - return - end - - -- add healthy afterglow when hit - core.after(0.1, function() - self.object:settexturemod("^[colorize:#c9900070") - - core.after(0.3, function() - self.object:settexturemod("") - end) - end) - - -- blood_particles - if self.blood_amount > 0 - and not disable_blood then - - local pos = self.object:getpos() - - pos.y = pos.y + (-self.collisionbox[2] + self.collisionbox[5]) / 2 - - effect(pos, self.blood_amount, self.blood_texture) - end - - -- knock back effect (only on full punch) - if self.knock_back > 0 - and tflp > punch_interval then - - local v = self.object:getvelocity() - local r = 1.4 - math.min(punch_interval, 1.4) - local kb = r * 5 - local up = 2 - - -- if already in air then dont go up anymore when hit - if v.y > 0 - or self.fly then - up = 0 - end - - self.object:setvelocity({ - x = dir.x * kb, - y = up, - z = dir.z * kb - }) - - self.pause_timer = r - end - - -- if skittish then run away - if self.runaway == true then - - local lp = hitter:getpos() - local s = self.object:getpos() - - local vec = { - x = lp.x - s.x, - y = lp.y - s.y, - z = lp.z - s.z - } - - if vec.x ~= 0 - and vec.z ~= 0 then - - local yaw = atan(vec.z / vec.x) + 3 * pi / 2 - self.rotate - - if lp.x > s.x then - yaw = yaw + pi - end - - self.object:setyaw(yaw) - end - - self.state = "runaway" - self.runaway_timer = 0 - self.following = nil - end - - -- attack puncher and call other mobs for help - if self.passive == false - and self.state ~= "flop" - and self.child == false - and hitter:get_player_name() ~= self.owner then - - -- attack whoever punched mob - self.state = "" - do_attack(self, hitter) - - -- alert others to the attack - local obj = nil - - for _, oir in pairs(minetest.get_objects_inside_radius(hitter:getpos(), 5)) do - - obj = oir:get_luaentity() - - if obj then - - if obj.group_attack == true - and obj.state ~= "attack" then - do_attack(obj, hitter) - end - end - end - end -end - -local mob_activate = function(self, staticdata, dtime_s, def) - - -- remove monsters in peaceful mode, or when no data - if (self.type == "monster" and peaceful_only) - or not staticdata then - - self.object:remove() - - return - end - - -- load entity variables - local tmp = minetest.deserialize(staticdata) - - if tmp then - - for _,stat in pairs(tmp) do - self[_] = stat - end - end - - -- select random texture, set model and size - if not self.base_texture then - - self.base_texture = def.textures[math.random(1, #def.textures)] - self.base_mesh = def.mesh - self.base_size = self.visual_size - self.base_colbox = self.collisionbox - end - - -- set texture, model and size - local textures = self.base_texture - local mesh = self.base_mesh - local vis_size = self.base_size - local colbox = self.base_colbox - - -- specific texture if gotten - if self.gotten == true - and def.gotten_texture then - textures = def.gotten_texture - end - - -- specific mesh if gotten - if self.gotten == true - and def.gotten_mesh then - mesh = def.gotten_mesh - end - - -- set child objects to half size - if self.child == true then - - vis_size = { - x = self.base_size.x / 2, - y = self.base_size.y / 2 - } - - if def.child_texture then - textures = def.child_texture[1] - end - - colbox = { - self.base_colbox[1] / 2, - self.base_colbox[2] / 2, - self.base_colbox[3] / 2, - self.base_colbox[4] / 2, - self.base_colbox[5] / 2, - self.base_colbox[6] / 2 - } - end - - if self.health == 0 then - self.health = math.random (self.hp_min, self.hp_max) - end - - -- rnd: pathfinding init - self.path = {} - self.path.way = {} -- path to follow, table of positions - self.path.lastpos = {x = 0, y = 0, z = 0} - self.path.stuck = false - self.path.following = false -- currently following path? - self.path.stuck_timer = 0 -- if stuck for too long search for path - -- end init - - self.object:set_armor_groups({immortal = 1, fleshy = self.armor}) - self.old_y = self.object:getpos().y - self.old_health = self.health - self.object:setyaw((math.random(0, 360) - 180) / 180 * pi) - self.sounds.distance = self.sounds.distance or 10 - self.textures = textures - self.mesh = mesh - self.collisionbox = colbox - self.visual_size = vis_size - self.standing_in = "" - - -- set anything changed above - self.object:set_properties(self) - update_tag(self) -end - -local mob_step = function(self, dtime) - - local pos = self.object:getpos() - local yaw = self.object:getyaw() or 0 - - -- when lifetimer expires remove mob (except npc and tamed) - if self.type ~= "npc" - and not self.tamed - and self.state ~= "attack" - and remove_far ~= true then - - self.lifetimer = self.lifetimer - dtime - - if self.lifetimer <= 0 then - - -- only despawn away from player - local objs = minetest.get_objects_inside_radius(pos, 15) - - for _,oir in pairs(objs) do - - if oir:is_player() then - - self.lifetimer = 20 - - return - end - end - - minetest.log("action", - "lifetimer expired, removed " .. self.name) - - effect(pos, 15, "tnt_smoke.png") - - self.object:remove() - - return - end - end - - falling(self, pos) - - -- knockback timer - if self.pause_timer > 0 then - - self.pause_timer = self.pause_timer - dtime - - if self.pause_timer < 1 then - self.pause_timer = 0 - end - - return - end - - -- run custom function (defined in mob lua file) - if self.do_custom then - self.do_custom(self, dtime) - end - - -- attack timer - self.timer = self.timer + dtime - - if self.state ~= "attack" then - - if self.timer < 1 then - return - end - - self.timer = 0 - end - - -- never go over 100 - if self.timer > 100 then - self.timer = 1 - end - - -- node replace check (cow eats grass etc.) - replace(self, pos) - - -- mob plays random sound at times - if self.sounds.random - and math.random(1, 100) == 1 then - - minetest.sound_play(self.sounds.random, { - object = self.object, - max_hear_distance = self.sounds.distance - }) - end - - -- environmental damage timer (every 1 second) - self.env_damage_timer = self.env_damage_timer + dtime - - if (self.state == "attack" and self.env_damage_timer > 1) - or self.state ~= "attack" then - - self.env_damage_timer = 0 - - do_env_damage(self) - end - - monster_attack(self) - - npc_attack(self) - - breed(self) - - follow_flop(self) - - do_states(self, dtime) - ---BREAK - -- ridable pigs - if self.name == "mobs:pig" and self.saddle == "yes" and self.driver then - local item = self.driver:get_wielded_item() - if item:get_name() == "mobs:carrotstick" then - local yaw = self.driver:get_look_yaw() - math.pi / 2 - local velo = self.object:getvelocity() - local v = 1.5 - if math.abs(velo.x) + math.abs(velo.z) < .6 then velo.y = 5 end - self.state = "walk" - self.object:setyaw(yaw) - self.object:setvelocity({x = -math.sin(yaw) * v, y = velo.y, z = math.cos(yaw) * v}) - - local inv = self.driver:get_inventory() - local stack = inv:get_stack("main", self.driver:get_wield_index()) - stack:add_wear(100) - if stack:get_wear() > 65400 then - stack = {name = "fishing:pole_wood", count = 1} - end - inv:set_stack("main", self.driver:get_wield_index(), stack) - return - end - end - - self.env_damage_timer = self.env_damage_timer + dtime - if self.state == "attack" and self.env_damage_timer > 1 then - self.env_damage_timer = 0 - do_env_damage(self) - elseif self.state ~= "attack" then - do_env_damage(self) - end ---BREAK - - -end - --- default function when mobs are blown up with TNT -local do_tnt = function(obj, damage) - - --print ("----- Damage", damage) - - obj.object:punch(obj.object, 1.0, { - full_punch_interval = 1.0, - damage_groups = {fleshy = damage}, - }, nil) - - return false, true, {} -end - -mobs.spawning_mobs = {} - --- register mob function -function mobs:register_mob(name, def) - - mobs.spawning_mobs[name] = true - -minetest.register_entity(name, { - - stepheight = def.stepheight or 0.6, - name = name, - type = def.type, - attack_type = def.attack_type, - fly = def.fly, - fly_in = def.fly_in or "air", - owner = def.owner or "", - order = def.order or "", - on_die = def.on_die, - do_custom = def.do_custom, - jump_height = def.jump_height or 6, - jump_chance = def.jump_chance or 0, - drawtype = def.drawtype, -- DEPRECATED, use rotate instead - rotate = math.rad(def.rotate or 0), -- 0=front, 90=side, 180=back, 270=side2 - lifetimer = def.lifetimer or 180, -- 3 minutes - hp_min = def.hp_min or 5, - hp_max = def.hp_max or 10, - physical = true, - collisionbox = def.collisionbox, - visual = def.visual, - visual_size = def.visual_size or {x = 1, y = 1}, - mesh = def.mesh, - textures = def.textures, -- maikerumine texture code - makes_footstep_sound = def.makes_footstep_sound or false, - view_range = def.view_range or 5, - walk_velocity = def.walk_velocity or 1, - run_velocity = def.run_velocity or 2, - damage = def.damage or 0, - light_damage = def.light_damage or 0, - water_damage = def.water_damage or 0, - lava_damage = def.lava_damage or 0, - fall_damage = def.fall_damage or 1, - fall_speed = def.fall_speed or -10, -- must be lower than -2 (default: -10) - drops = def.drops or {}, - armor = def.armor, - on_rightclick = def.on_rightclick, - arrow = def.arrow, - shoot_interval = def.shoot_interval, - sounds = def.sounds or {}, - animation = def.animation, - follow = def.follow, - jump = def.jump or true, - walk_chance = def.walk_chance or 50, - attacks_monsters = def.attacks_monsters or false, - group_attack = def.group_attack or false, - --fov = def.fov or 120, - passive = def.passive or false, - recovery_time = def.recovery_time or 0.5, - knock_back = def.knock_back or 3, - blood_amount = def.blood_amount or 5, - blood_texture = def.blood_texture or "mobs_blood.png", - shoot_offset = def.shoot_offset or 0, - floats = def.floats or 1, -- floats in water by default - replace_rate = def.replace_rate, - replace_what = def.replace_what, - replace_with = def.replace_with, - replace_offset = def.replace_offset or 0, - timer = 0, - env_damage_timer = 0, -- only used when state = "attack" - tamed = false, - pause_timer = 0, - horny = false, - hornytimer = 0, - child = false, - gotten = false, - health = 0, - reach = def.reach or 3, - htimer = 0, - child_texture = def.child_texture, - docile_by_day = def.docile_by_day or false, - time_of_day = 0.5, - fear_height = def.fear_height or 0, - runaway = def.runaway, - runaway_timer = 0, - pathfinding = def.pathfinding, - immune_to = def.immune_to or {}, - explosion_radius = def.explosion_radius, - custom_attack = def.custom_attack, - double_melee_attack = def.double_melee_attack, - dogshoot_switch = def.dogshoot_switch, - dogshoot_count = 0, - dogshoot_count_max = def.dogshoot_count_max or 5, - - on_blast = def.on_blast or do_tnt, - - on_step = mob_step, - - on_punch = mob_punch, - - on_activate = function(self, staticdata, dtime_s) - mob_activate(self, staticdata, dtime_s, def) - end, - - get_staticdata = function(self) - - -- remove mob when out of range unless tamed - if remove_far - and self.remove_ok - and not self.tamed then - - --print ("REMOVED " .. self.name) - - self.object:remove() - - return nil - end - - self.remove_ok = true - self.attack = nil - self.following = nil - self.state = "stand" - - -- used to rotate older mobs - if self.drawtype - and self.drawtype == "side" then - self.rotate = math.rad(90) - end - - local tmp = {} - - for _,stat in pairs(self) do - - local t = type(stat) - - if t ~= 'function' - and t ~= 'nil' - and t ~= 'userdata' then - tmp[_] = self[_] - end - end - - -- print('===== '..self.name..'\n'.. dump(tmp)..'\n=====\n') - return minetest.serialize(tmp) - end, - -}) - -end -- END mobs:register_mob function - --- global functions - -function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, - interval, chance, active_object_count, min_height, max_height, day_toggle) - - -- chance override in minetest.conf for registered mob - local new_chance = tonumber(minetest.setting_get(name .. "_chance")) - - if new_chance ~= nil then - - if new_chance == 0 then - print("[Mobs Redo] " .. name .. " has spawning disabled") - return - end - - chance = new_chance - - print ("[Mobs Redo] Chance setting for " .. name .. " changed to " .. chance) - - end - - minetest.register_abm({ - - nodenames = nodes, - neighbors = neighbors, - interval = interval, - chance = chance, - catch_up = false, - - action = function(pos, node, aoc, active_object_count_wider) - - -- do not spawn if too many active entities in area - if active_object_count_wider > active_object_count - or not mobs.spawning_mobs[name] then - return - end - - -- if toggle set to nil then ignore day/night check - if day_toggle ~= nil then - - local tod = (minetest.get_timeofday() or 0) * 24000 - - if tod > 4500 and tod < 19500 then - -- daylight, but mob wants night - if day_toggle == false then - return - end - else - -- night time but mob wants day - if day_toggle == true then - return - end - end - end - - -- spawn above node - pos.y = pos.y + 1 - - -- only spawn away from player - local objs = minetest.get_objects_inside_radius(pos, 10) - - for _,oir in pairs(objs) do - - if oir:is_player() then - return - end - end - - -- mobs cannot spawn in protected areas when enabled - if spawn_protected == 1 - and minetest.is_protected(pos, "") then - return - end - - -- check if light and height levels are ok to spawn - local light = minetest.get_node_light(pos) - if not light - or light > max_light - or light < min_light - or pos.y > max_height - or pos.y < min_height then - return - end - - -- are we spawning inside solid nodes? - if minetest.registered_nodes[node_ok(pos).name].walkable == true then - return - end - - pos.y = pos.y + 1 - - if minetest.registered_nodes[node_ok(pos).name].walkable == true then - return - end - - -- spawn mob half block higher than ground - pos.y = pos.y - 0.5 - - local mob = minetest.add_entity(pos, name) - - if mob and mob:get_luaentity() then --- print ("[mobs] Spawned " .. name .. " at " --- .. minetest.pos_to_string(pos) .. " on " --- .. node.name .. " near " .. neighbors[1]) - else - print ("[mobs]" .. name .. " failed to spawn at " - .. minetest.pos_to_string(pos)) - end - - end - }) -end - --- compatibility with older mob registration -function mobs:register_spawn(name, nodes, max_light, min_light, chance, active_object_count, max_height, day_toggle) - - mobs:spawn_specific(name, nodes, {"air"}, min_light, max_light, 30, - chance, active_object_count, -31000, max_height, day_toggle) -end - --- set content id's -local c_air = minetest.get_content_id("air") -local c_ignore = minetest.get_content_id("ignore") -local c_obsidian = minetest.get_content_id("default:obsidian") -local c_brick = minetest.get_content_id("default:obsidianbrick") -local c_chest = minetest.get_content_id("default:chest_locked") - --- explosion (cannot break protected or unbreakable nodes) -function mobs:explosion(pos, radius, fire, smoke, sound) - - radius = radius or 0 - fire = fire or 0 - smoke = smoke or 0 - - -- if area protected or near map limits then no blast damage - if minetest.is_protected(pos, "") - or not within_limits(pos, radius) then - return - end - - -- explosion sound - if sound - and sound ~= "" then - - minetest.sound_play(sound, { - pos = pos, - gain = 1.0, - max_hear_distance = 16 - }) - end - - pos = vector.round(pos) -- voxelmanip doesn't work properly unless pos is rounded ?!?! - - local vm = VoxelManip() - local minp, maxp = vm:read_from_map(vector.subtract(pos, radius), vector.add(pos, radius)) - local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) - local data = vm:get_data() - local p = {} - local pr = PseudoRandom(os.time()) - - for z = -radius, radius do - for y = -radius, radius do - local vi = a:index(pos.x + (-radius), pos.y + y, pos.z + z) - for x = -radius, radius do - - p.x = pos.x + x - p.y = pos.y + y - p.z = pos.z + z - - if (x * x) + (y * y) + (z * z) <= (radius * radius) + pr:next(-radius, radius) - and data[vi] ~= c_air - and data[vi] ~= c_ignore - and data[vi] ~= c_obsidian - and data[vi] ~= c_brick - and data[vi] ~= c_chest then - - local n = node_ok(p).name - local on_blast = minetest.registered_nodes[n].on_blast - - if on_blast then - return on_blast(p) - else - -- after effects - if fire > 0 - and (minetest.registered_nodes[n].groups.flammable - or math.random(1, 100) <= 30) then - - minetest.set_node(p, {name = "fire:basic_flame"}) - else - minetest.set_node(p, {name = "air"}) - - if smoke > 0 then - effect(p, 2, "tnt_smoke.png", 5) - end - end - end - end - - vi = vi + 1 - - end - end - end -end - --- register arrow for shoot attack -function mobs:register_arrow(name, def) - - if not name or not def then return end -- errorcheck - - minetest.register_entity(name, { - - physical = false, - visual = def.visual, - visual_size = def.visual_size, - textures = def.textures, - velocity = def.velocity, - hit_player = def.hit_player, - hit_node = def.hit_node, - hit_mob = def.hit_mob, - drop = def.drop or false, - collisionbox = {0, 0, 0, 0, 0, 0}, -- remove box around arrows - timer = 0, - switch = 0, - - on_step = def.on_step or function(self, dtime) - - self.timer = self.timer + 1 - - local pos = self.object:getpos() - - if self.switch == 0 - or self.timer > 150 - or not within_limits(pos, 0) then - - self.object:remove() ; -- print ("removed arrow") - - return - end - - -- does arrow have a tail (fireball) - if def.tail - and def.tail == 1 - and def.tail_texture then - effect(pos, 1, def.tail_texture, 10, 0) - end - - if self.hit_node then - - local node = node_ok(pos).name - - --if minetest.registered_nodes[node].walkable then - if node ~= "air" then - - self.hit_node(self, pos, node) - - if self.drop == true then - - pos.y = pos.y + 1 - - self.lastpos = (self.lastpos or pos) - - minetest.add_item(self.lastpos, self.object:get_luaentity().name) - end - - self.object:remove() ; -- print ("hit node") - - return - end - end - - if (self.hit_player or self.hit_mob) - -- clear mob entity before arrow becomes active - and self.timer > (10 - (self.velocity / 2)) then - - for _,player in pairs(minetest.get_objects_inside_radius(pos, 1.0)) do - - if self.hit_player - and player:is_player() then - - self.hit_player(self, player) - self.object:remove() ; -- print ("hit player") - return - end - - if self.hit_mob - and player:get_luaentity() - and player:get_luaentity().name ~= self.object:get_luaentity().name - and player:get_luaentity().name ~= "__builtin:item" - and player:get_luaentity().name ~= "gauges:hp_bar" - and player:get_luaentity().name ~= "signs:text" - and player:get_luaentity().name ~= "itemframes:item" then - - self.hit_mob(self, player) - - self.object:remove() ; -- print ("hit mob") - - return - end - end - end - - self.lastpos = pos - end - }) -end - --- Spawn Egg -function mobs:register_egg(mob, desc, background, addegg, no_creative) - - local grp = {} - - -- do NOT add this egg to creative inventory (e.g. dungeon master) - if creative and no_creative == true then - grp = {not_in_creative_inventory = 1} - end - - local invimg = background - - if addegg == 1 then - invimg = "mobs_chicken_egg.png^(" .. invimg .. - "^[mask:mobs_chicken_egg_overlay.png)" - end - - minetest.register_craftitem(mob, { - - description = desc, - inventory_image = invimg, - groups = grp, - - on_place = function(itemstack, placer, pointed_thing) - - local pos = pointed_thing.above - - if pos - and within_limits(pos, 0) - and not minetest.is_protected(pos, placer:get_player_name()) then - - pos.y = pos.y + 1 - - local mob = minetest.add_entity(pos, mob) - local ent = mob:get_luaentity() - - if not ent then - mob:remove() - return - end - - if ent.type ~= "monster" then - -- set owner and tame if not monster - ent.owner = placer:get_player_name() - ent.tamed = true - end - - -- if not in creative then take item - if not creative then - itemstack:take_item() - end - end - - return itemstack - end, - }) -end - --- capture critter (thanks to blert2112 for idea) -function mobs:capture_mob(self, clicker, chance_hand, chance_net, chance_lasso, force_take, replacewith) - - if not self.child - and clicker:is_player() - and clicker:get_inventory() then - - -- get name of clicked mob - local mobname = self.name - - -- if not nil change what will be added to inventory - if replacewith then - mobname = replacewith - end - - local name = clicker:get_player_name() - - -- is mob tamed? - if self.tamed == false - and force_take == false then - - minetest.chat_send_player(name, "Not tamed!") - - return - end - - -- cannot pick up if not owner - if self.owner ~= name - and force_take == false then - - minetest.chat_send_player(name, self.owner.." is owner!") - - return - end - - if clicker:get_inventory():room_for_item("main", mobname) then - - -- was mob clicked with hand, net, or lasso? - local tool = clicker:get_wielded_item() - local chance = 0 - - if tool:is_empty() then - chance = chance_hand - - elseif tool:get_name() == "mobs:net" then - - chance = chance_net - - tool:add_wear(4000) -- 17 uses - - clicker:set_wielded_item(tool) - - elseif tool:get_name() == "mobs:magic_lasso" then - - chance = chance_lasso - - tool:add_wear(650) -- 100 uses - - clicker:set_wielded_item(tool) - end - - -- return if no chance - if chance == 0 then return end - - -- calculate chance.. add to inventory if successful? - if math.random(1, 100) <= chance then - - clicker:get_inventory():add_item("main", mobname) - - self.object:remove() - else - minetest.chat_send_player(name, "Missed!") - end - end - end -end - -local mob_obj = {} -local mob_sta = {} - --- feeding, taming and breeding (thanks blert2112) -function mobs:feed_tame(self, clicker, feed_count, breed, tame) - - if not self.follow then - return false - end - - -- can eat/tame with item in hand - if follow_holding(self, clicker) then - - -- if not in creative then take item - if not creative then - - local item = clicker:get_wielded_item() - - item:take_item() - - clicker:set_wielded_item(item) - end - - -- increase health - self.health = self.health + 4 - - if self.health >= self.hp_max then - - self.health = self.hp_max - - if self.htimer < 1 then - - minetest.chat_send_player(clicker:get_player_name(), - self.name:split(":")[2] - .. " at full health (" .. tostring(self.health) .. ")") - - self.htimer = 5 - end - end - - self.object:set_hp(self.health) - - update_tag(self) - - -- make children grow quicker - if self.child == true then - - self.hornytimer = self.hornytimer + 20 - - return true - end - - -- feed and tame - self.food = (self.food or 0) + 1 - if self.food >= feed_count then - - self.food = 0 - - if breed and self.hornytimer == 0 then - self.horny = true - end - - self.gotten = false - - if tame then - - if self.tamed == false then - minetest.chat_send_player(clicker:get_player_name(), - self.name:split(":")[2] - .. " has been tamed!") - end - - self.tamed = true - - if not self.owner or self.owner == "" then - self.owner = clicker:get_player_name() - end - end - - -- make sound when fed so many times - if self.sounds.random then - - minetest.sound_play(self.sounds.random, { - object = self.object, - max_hear_distance = self.sounds.distance - }) - end - end - - return true - end - - local item = clicker:get_wielded_item() - - -- if mob has been tamed you can name it with a nametag - if item:get_name() == "mobs:nametag" - and clicker:get_player_name() == self.owner then - - local name = clicker:get_player_name() - - -- store mob and nametag stack in external variables - mob_obj[name] = self - mob_sta[name] = item - - local tag = self.nametag or "" - - local formspec = "size[8,4]" - .. default.gui_bg - .. default.gui_bg_img - .. "field[0.5,1;7.5,0;name;Enter name:;" .. tag .. "]" - .. "button_exit[2.5,3.5;3,1;mob_rename;Rename]" - minetest.show_formspec(name, "mobs_nametag", formspec) - end - - return false - -end - --- inspired by blockmen's nametag mod -minetest.register_on_player_receive_fields(function(player, formname, fields) - - -- right-clicked with nametag and name entered? - if formname == "mobs_nametag" - and fields.name - and fields.name ~= "" then - - local name = player:get_player_name() - - if not mob_obj[name] - or not mob_obj[name].object then - return - end - - -- update nametag - mob_obj[name].nametag = fields.name - - update_tag(mob_obj[name]) - - -- if not in creative then take item - if not creative then - - mob_sta[name]:take_item() - - player:set_wielded_item(mob_sta[name]) - end - - -- reset external variables - mob_obj[name] = nil - mob_sta[name] = nil - - end -end) - --- compatibility function for old entities to new modpack entities -function mobs:alias_mob(old_name, new_name) - - -- spawn egg - minetest.register_alias(old_name, new_name) - - -- entity - minetest.register_entity(":" .. old_name, { - - physical = false, - - on_step = function(self) - - local pos = self.object:getpos() - - minetest.add_entity(pos, new_name) - - self.object:remove() - end - }) -end - - --Brandon Reese code to face pos - function mobs:face_pos(self,pos) - local s = self.object:getpos() - local vec = {x=pos.x-s.x, y=pos.y-s.y, z=pos.z-s.z} - local yaw = math.atan(vec.z/vec.x)+math.pi/2 - if self.drawtype == "side" then - yaw = yaw+(math.pi/2) - end - if pos.x > s.x then - yaw = yaw+math.pi - end - self.object:setyaw(yaw) - return yaw - end - - --Reese chat - local_chat = function(pos,text,radius) - if radius == nil then - radius = 25 - end - if pos ~= nil then - local oir = minetest.get_objects_inside_radius(pos, radius) - for _,p in pairs(oir) do - if p:is_player() then - minetest.chat_send_player(p:get_player_name(),text) - end - end - end - end - - --maikeruminefollow - function mobs:team_player(self,pos) - if tamed == true or - self.tamed == true then - self.order = "follow" - end - end diff --git a/mods/mobs_mc/horse.lua b/mods/mobs_mc/horse.lua index 65fa5226..276a1a2a 100644 --- a/mods/mobs_mc/horse.lua +++ b/mods/mobs_mc/horse.lua @@ -39,7 +39,7 @@ local function get_v(v) return math.sqrt(v.x^2+v.z^2) end -function merge(a, b) +local function merge(a, b) if type(a) == 'table' and type(b) == 'table' then for k,v in pairs(b) do if type(v)=='table' and type(a[k] or false)=='table' then merge(a[k],v) else a[k]=v end end end diff --git a/mods/mobs_mc/skeleton.lua b/mods/mobs_mc/skeleton.lua index 5f04e527..869d59cf 100644 --- a/mods/mobs_mc/skeleton.lua +++ b/mods/mobs_mc/skeleton.lua @@ -139,7 +139,7 @@ mobs:register_mob("mobs_mc:skeleton2", { mobs:register_spawn("mobs_mc:skeleton2", {"group:crumbly", "group:cracky", "group:choppy", "group:snappy"}, 7, -1, 5000, 4, -3000) -arrows = { +local arrows = { {"mcl_throwing:arrow", "mcl_throwing:arrow_entity" }, } diff --git a/mods/mobs_mc/slimes.lua b/mods/mobs_mc/slimes.lua index b604df6b..5933b186 100644 --- a/mods/mobs_mc/slimes.lua +++ b/mods/mobs_mc/slimes.lua @@ -118,12 +118,10 @@ mobs:register_mob("mobs_mc:greenmedium", { jump_chance = 100, fear_height = 60, on_die =function(self, pos) - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:greensmall") - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:greensmall") - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:greensmall") - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:greensmall") - ent = lavasmall:get_luaentity() - end + for i=1,4 do + minetest.add_entity(self.object:getpos(), "mobs_mc:greensmall") + end + end }) mobs:register_mob("mobs_mc:greenbig", { @@ -178,11 +176,11 @@ mobs:register_mob("mobs_mc:greenbig", { jump_height = 8, jump_chance = 100, fear_height = 60, - on_die =function(self, pos) - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:greenmedium") - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:greenmedium") - ent = lavasmall:get_luaentity() - end + on_die = function(self, pos) + for i=1,2 do + minetest.add_entity(self.object:getpos(), "mobs_mc:greenmedium") + end + end, }) mobs:register_spawn("mobs_mc:greensmall", {"default:flowing_water", "default:mossycobble"}, 7, -1, 5000, 4, 31000) mobs:register_spawn("mobs_mc:greenmedium", {"default:flowing_water", "default:mossycobble"}, 7, -1, 5000, 4, 31000) @@ -302,13 +300,11 @@ mobs:register_mob("mobs_mc:lavabig", { jump_height = 8, jump_chance = 100, fear_height = 60, - on_die =function(self, pos) - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:lavasmall") - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:lavasmall") - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:lavasmall") - lavasmall = minetest.add_entity(self.object:getpos(), "mobs_mc:lavasmall") - ent = lavasmall:get_luaentity() - end + on_die = function(self, pos) + for i=1,4 do + minetest.add_entity(self.object:getpos(), "mobs_mc:lavasmall") + end + end }) mobs:register_spawn("mobs_mc:lavasmall", {"nether:rack", "default:lava"}, 7, -1, 5000, 4, 31000) diff --git a/mods/mobs_mc/wolf.lua b/mods/mobs_mc/wolf.lua index a3d1c7f2..7239fd8c 100644 --- a/mods/mobs_mc/wolf.lua +++ b/mods/mobs_mc/wolf.lua @@ -142,7 +142,7 @@ mobs:register_mob("mobs_mc:wolf", { lava_damage = 5, light_damage = 0, on_rightclick = function(self, clicker) - tool = clicker:get_wielded_item() + local tool = clicker:get_wielded_item() local dog local ent if tool:get_name() == "mcl_mobitems:meat_raw" then diff --git a/mods/signs/init.lua b/mods/signs/init.lua index c7c17fc6..87e71875 100644 --- a/mods/signs/init.lua +++ b/mods/signs/init.lua @@ -18,6 +18,111 @@ else end end +-- CONSTANTS +local SIGN_WITH = 110 +local SIGN_PADDING = 8 + +local LINE_LENGTH = 16 +local NUMBER_OF_LINES = 4 + +local LINE_HEIGHT = 14 +local CHAR_WIDTH = 5 + +local string_to_array = function(str) + local tab = {} + for i=1,string.len(str) do + table.insert(tab, string.sub(str, i,i)) + end + return tab +end + +local string_to_word_array = function(str) + local tab = {} + local current = 1 + tab[1] = "" + for _,char in ipairs(string_to_array(str)) do + if char ~= " " then + tab[current] = tab[current]..char + else + current = current+1 + tab[current] = "" + end + end + return tab +end + +local create_lines = function(text) + local line = "" + local line_num = 1 + local tab = {} + for _,word in ipairs(string_to_word_array(text)) do + if string.len(line)+string.len(word) < LINE_LENGTH and word ~= "|" then + if line ~= "" then + line = line.." "..word + else + line = word + end + else + table.insert(tab, line) + if word ~= "|" then + line = word + else + line = "" + end + line_num = line_num+1 + if line_num > NUMBER_OF_LINES then + return tab + end + end + end + table.insert(tab, line) + return tab +end + +local generate_line = function(s, ypos) + local i = 1 + local parsed = {} + local width = 0 + local chars = 0 + while chars < max_chars and i <= #s do + local file = nil + if charmap[s:sub(i, i)] ~= nil then + file = charmap[s:sub(i, i)] + i = i + 1 + elseif i < #s and charmap[s:sub(i, i + 1)] ~= nil then + file = charmap[s:sub(i, i + 1)] + i = i + 2 + else + print("[signs] W: unknown symbol in '"..s.."' at "..i.." (probably "..s:sub(i, i)..")") + i = i + 1 + end + if file ~= nil then + width = width + CHAR_WIDTH + table.insert(parsed, file) + chars = chars + 1 + end + end + width = width - 1 + + local texture = "" + local xpos = math.floor((SIGN_WITH - 2 * SIGN_PADDING - width) / 2 + SIGN_PADDING) + for i = 1, #parsed do + texture = texture..":"..xpos..","..ypos.."="..parsed[i]..".png" + xpos = xpos + CHAR_WIDTH + 1 + end + return texture +end + +local generate_texture = function(lines) + local texture = "[combine:"..SIGN_WITH.."x"..SIGN_WITH + local ypos = 12 + for i = 1, #lines do + texture = texture..generate_line(lines[i], ypos) + ypos = ypos + LINE_HEIGHT + end + return texture +end + local signs = { {delta = {x = 0, y = 0, z = 0.399}, yaw = 0}, {delta = {x = 0.399, y = 0, z = 0}, yaw = math.pi / -2}, @@ -197,111 +302,6 @@ minetest.register_entity("signs:text", { end }) --- CONSTANTS -local SIGN_WITH = 110 -local SIGN_PADDING = 8 - -local LINE_LENGTH = 16 -local NUMBER_OF_LINES = 4 - -local LINE_HEIGHT = 14 -local CHAR_WIDTH = 5 - -string_to_array = function(str) - local tab = {} - for i=1,string.len(str) do - table.insert(tab, string.sub(str, i,i)) - end - return tab -end - -string_to_word_array = function(str) - local tab = {} - local current = 1 - tab[1] = "" - for _,char in ipairs(string_to_array(str)) do - if char ~= " " then - tab[current] = tab[current]..char - else - current = current+1 - tab[current] = "" - end - end - return tab -end - -create_lines = function(text) - local line = "" - local line_num = 1 - local tab = {} - for _,word in ipairs(string_to_word_array(text)) do - if string.len(line)+string.len(word) < LINE_LENGTH and word ~= "|" then - if line ~= "" then - line = line.." "..word - else - line = word - end - else - table.insert(tab, line) - if word ~= "|" then - line = word - else - line = "" - end - line_num = line_num+1 - if line_num > NUMBER_OF_LINES then - return tab - end - end - end - table.insert(tab, line) - return tab -end - -generate_texture = function(lines) - local texture = "[combine:"..SIGN_WITH.."x"..SIGN_WITH - local ypos = 12 - for i = 1, #lines do - texture = texture..generate_line(lines[i], ypos) - ypos = ypos + LINE_HEIGHT - end - return texture -end - -generate_line = function(s, ypos) - local i = 1 - local parsed = {} - local width = 0 - local chars = 0 - while chars < max_chars and i <= #s do - local file = nil - if charmap[s:sub(i, i)] ~= nil then - file = charmap[s:sub(i, i)] - i = i + 1 - elseif i < #s and charmap[s:sub(i, i + 1)] ~= nil then - file = charmap[s:sub(i, i + 1)] - i = i + 2 - else - print("[signs] W: unknown symbol in '"..s.."' at "..i.." (probably "..s:sub(i, i)..")") - i = i + 1 - end - if file ~= nil then - width = width + CHAR_WIDTH - table.insert(parsed, file) - chars = chars + 1 - end - end - width = width - 1 - - local texture = "" - local xpos = math.floor((SIGN_WITH - 2 * SIGN_PADDING - width) / 2 + SIGN_PADDING) - for i = 1, #parsed do - texture = texture..":"..xpos..","..ypos.."="..parsed[i]..".png" - xpos = xpos + CHAR_WIDTH + 1 - end - return texture -end - if minetest.setting_get("log_mods") then minetest.log("action", "signs loaded") end diff --git a/mods/sprint/init.lua b/mods/sprint/init.lua index ccc89a54..86e5e938 100644 --- a/mods/sprint/init.lua +++ b/mods/sprint/init.lua @@ -1,4 +1,4 @@ -player_running_physics = {} +local player_running_physics = {} minetest.register_globalstep(function(dtime) for _,player in ipairs(minetest.get_connected_players()) do --local pos = player:getpos() @@ -26,4 +26,4 @@ minetest.register_globalstep(function(dtime) end end -end) \ No newline at end of file +end) diff --git a/mods/wallet/init.lua b/mods/wallet/init.lua index 12442e27..4d2f6c75 100644 --- a/mods/wallet/init.lua +++ b/mods/wallet/init.lua @@ -53,7 +53,7 @@ local function update_wall(pos) minetest.add_node(pos, {name = basename..sum}) end -function update_wall_global(pos) +local function update_wall_global(pos) for i = 1,5 do local dir = directions[i] update_wall({x = pos.x + dir.x, y = pos.y + dir.y, z = pos.z + dir.z})