From 03078c29dad53102244cafae821beee4ab9c5532 Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Thu, 9 Aug 2018 11:57:31 +0100 Subject: [PATCH] tidy code --- mobs/ant_queen.lua | 12 ++++----- mobs/ant_soldier.lua | 4 +-- mobs/ant_worker.lua | 2 +- mobs/black_widow.lua | 4 +-- mobs/bloco.lua | 4 +-- mobs/crab.lua | 2 +- mobs/crocodile.lua | 2 +- mobs/daddy_long_legs.lua | 4 +-- mobs/dolidrosaurus.lua | 2 +- mobs/duck.lua | 2 +- mobs/duckking.lua | 2 +- mobs/echidna.lua | 2 +- mobs/enderduck.lua | 4 +-- mobs/felucco.lua | 4 +-- mobs/flying_duck.lua | 6 ++--- mobs/giant_sandworm.lua | 2 +- mobs/icelamander.lua | 4 +-- mobs/icesnake.lua | 4 +-- mobs/kraken.lua | 2 +- mobs/larva.lua | 2 +- mobs/lava_titan.lua | 10 ++++---- mobs/manticore.lua | 10 ++++---- mobs/mantis.lua | 2 +- mobs/mantis_beast.lua | 2 +- mobs/masticone.lua | 2 +- mobs/mese_dragon.lua | 8 +++--- mobs/moonheron.lua | 2 +- mobs/mordain.lua | 4 +-- mobs/morde.lua | 38 ++++++++++++++-------------- mobs/morgre.lua | 4 +-- mobs/morgut.lua | 2 +- mobs/morlu.lua | 22 ++++++++-------- mobs/morvalar.lua | 54 ++++++++++++++++++++-------------------- mobs/morvy.lua | 28 ++++++++++----------- mobs/morwa.lua | 10 ++++---- mobs/night_master.lua | 2 +- mobs/octopus.lua | 2 +- mobs/pumpboom.lua | 12 ++++----- mobs/pumpking.lua | 2 +- mobs/sand_bloco.lua | 4 +-- mobs/sandworm.lua | 2 +- mobs/snow_biter.lua | 4 +-- mobs/spiderduck.lua | 10 ++++---- mobs/stone_eater.lua | 2 +- mobs/swimming_duck.lua | 2 +- mobs/tarantula.lua | 14 +++++------ mobs/werewolf.lua | 6 ++--- mobs/white_werewolf.lua | 6 ++--- 48 files changed, 168 insertions(+), 168 deletions(-) diff --git a/mobs/ant_queen.lua b/mobs/ant_queen.lua index 560f907..7606151 100644 --- a/mobs/ant_queen.lua +++ b/mobs/ant_queen.lua @@ -13,8 +13,8 @@ mobs:register_mob("nssm:ant_queen", { walk_velocity = 1.5, run_velocity = 2, lifetimer = 300, - rotate = 270, - sounds = { + rotate = 270, + sounds = { random = "ant", attack = "ant", }, @@ -87,11 +87,11 @@ mobs:register_mob("nssm:ant_queen", { local pos1 = {x=s.x+math.random(-3,3), y=s.y-1, z=s.z+math.random(-3,3)} local objects = minetest.get_objects_inside_radius(s, 10) - for _,obj in ipairs(objects) do - if (obj:get_luaentity() and obj:get_luaentity().name == "nssm:ant_soldier") then - counter = counter + 1 + for _,obj in ipairs(objects) do + if (obj:get_luaentity() and obj:get_luaentity().name == "nssm:ant_soldier") then + counter = counter + 1 end - end + end if ((pos1.x~=s.x) and (pos1.z~=s.z)) and (minetest.get_node(pos1).name == "air") diff --git a/mobs/ant_soldier.lua b/mobs/ant_soldier.lua index 98d52f8..e0afbe2 100644 --- a/mobs/ant_soldier.lua +++ b/mobs/ant_soldier.lua @@ -12,8 +12,8 @@ mobs:register_mob("nssm:ant_soldier", { fear_height = 4, walk_velocity = 0.5, run_velocity = 3, - rotate = 270, - sounds = { + rotate = 270, + sounds = { random = "ant", }, damage = 6, diff --git a/mobs/ant_worker.lua b/mobs/ant_worker.lua index 3766530..9ecd8c4 100644 --- a/mobs/ant_worker.lua +++ b/mobs/ant_worker.lua @@ -13,7 +13,7 @@ mobs:register_mob("nssm:ant_worker", { fear_height = 4, walk_velocity = 0.5, run_velocity = 2, - rotate = 270, + rotate = 270, sounds = { random = "ant", }, diff --git a/mobs/black_widow.lua b/mobs/black_widow.lua index 0d92f8a..853b2eb 100644 --- a/mobs/black_widow.lua +++ b/mobs/black_widow.lua @@ -12,8 +12,8 @@ mobs:register_mob("nssm:black_widow", { fear_height = 4, walk_velocity = 0.8, run_velocity = 2.5, - rotate = 270, - sounds = { + rotate = 270, + sounds = { random = "black_widow", }, damage = 4, diff --git a/mobs/bloco.lua b/mobs/bloco.lua index 6045dff..c53a607 100644 --- a/mobs/bloco.lua +++ b/mobs/bloco.lua @@ -12,8 +12,8 @@ mobs:register_mob("nssm:bloco", { fear_height = 4, walk_velocity = 0.6, run_velocity = 2.5, - rotate = 270, - sounds = { + rotate = 270, + sounds = { random = "bloco", }, damage = 4, diff --git a/mobs/crab.lua b/mobs/crab.lua index 32a2fb1..c37ca2a 100644 --- a/mobs/crab.lua +++ b/mobs/crab.lua @@ -6,7 +6,7 @@ mobs:register_mob("nssm:crab", { visual = "mesh", mesh = "crab.x", textures = {{"crab1.png"},{"crab2.png"}}, - sounds = { + sounds = { random = "crab", }, visual_size = {x=3, y=3}, diff --git a/mobs/crocodile.lua b/mobs/crocodile.lua index 04cab0b..725ee04 100644 --- a/mobs/crocodile.lua +++ b/mobs/crocodile.lua @@ -6,7 +6,7 @@ mobs:register_mob("nssm:crocodile", { visual = "mesh", mesh = "crocodile.x", textures = {{"croco.png"}}, - sounds = { + sounds = { random = "crocod", }, visual_size = {x=4, y=4}, diff --git a/mobs/daddy_long_legs.lua b/mobs/daddy_long_legs.lua index 0381c6a..98866f3 100644 --- a/mobs/daddy_long_legs.lua +++ b/mobs/daddy_long_legs.lua @@ -12,8 +12,8 @@ mobs:register_mob("nssm:daddy_long_legs", { walk_velocity = 0.7, fear_height = 4, run_velocity = 3.3, - rotate = 90, - sounds = { + rotate = 90, + sounds = { random = "daddy", }, damage = 3, diff --git a/mobs/dolidrosaurus.lua b/mobs/dolidrosaurus.lua index 30c45f7..d760fc1 100644 --- a/mobs/dolidrosaurus.lua +++ b/mobs/dolidrosaurus.lua @@ -19,7 +19,7 @@ mobs:register_mob("nssm:dolidrosaurus", { jump = false, jump_chance = 0, jump_height = 0, - sounds = { + sounds = { random = "crocod", }, drops = { diff --git a/mobs/duck.lua b/mobs/duck.lua index 31ba1ab..93878b4 100644 --- a/mobs/duck.lua +++ b/mobs/duck.lua @@ -14,7 +14,7 @@ mobs:register_mob("nssm:duck", { run_velocity = 2, damage = 2, jump = true, - sounds = { + sounds = { random = "duck", }, drops = { diff --git a/mobs/duckking.lua b/mobs/duckking.lua index 2780d45..e2d2b2d 100644 --- a/mobs/duckking.lua +++ b/mobs/duckking.lua @@ -17,7 +17,7 @@ mobs:register_mob("nssm:duckking", { run_velocity = 2, damage = 8, jump = true, - sounds = { + sounds = { random = "duckking", attack = "duckking", }, diff --git a/mobs/echidna.lua b/mobs/echidna.lua index 8bcc3cf..7c8fe4a 100644 --- a/mobs/echidna.lua +++ b/mobs/echidna.lua @@ -16,7 +16,7 @@ mobs:register_mob("nssm:echidna", { run_velocity = 3.5, damage = 12, jump = true, - sounds = { + sounds = { random = "echidna", }, drops = { diff --git a/mobs/enderduck.lua b/mobs/enderduck.lua index 63e0e6c..10bebf7 100644 --- a/mobs/enderduck.lua +++ b/mobs/enderduck.lua @@ -13,7 +13,7 @@ mobs:register_mob("nssm:enderduck", { fear_height = 4, run_velocity = 3.9, rotate = 270, - sounds = { + sounds = { random = "duck", }, damage = 5, @@ -24,7 +24,7 @@ mobs:register_mob("nssm:enderduck", { chance = 1, min = 1, max = 2}, - {name = "nssm:duck_legs", + {name = "nssm:duck_legs", chance = 1, min = 1, max = 2}, diff --git a/mobs/felucco.lua b/mobs/felucco.lua index 6cccce3..896d7b4 100644 --- a/mobs/felucco.lua +++ b/mobs/felucco.lua @@ -34,7 +34,7 @@ mobs:register_mob("nssm:felucco", { chance = 3, min = 1, max = 2}, - }, + }, armor = 70, drawtype = "front", water_damage = 2, @@ -58,5 +58,5 @@ mobs:register_mob("nssm:felucco", { run_end = 160, punch_start = 200, punch_end = 240, - } + } }) diff --git a/mobs/flying_duck.lua b/mobs/flying_duck.lua index c575cde..7e4fc50 100644 --- a/mobs/flying_duck.lua +++ b/mobs/flying_duck.lua @@ -10,8 +10,8 @@ mobs:register_mob("nssm:flying_duck", { view_range = 30, walk_velocity = 2, run_velocity = 2.5, - fall_speed = 0, - stepheight = 3, + fall_speed = 0, + stepheight = 3, sounds = { random = "duck", }, @@ -46,7 +46,7 @@ mobs:register_mob("nssm:flying_duck", { knock_back=5, blood_texture="nssm_blood.png", on_rightclick = nil, - fly = true, + fly = true, attack_type = "dogfight", animation = { speed_normal = 25, diff --git a/mobs/giant_sandworm.lua b/mobs/giant_sandworm.lua index f37c2ed..422f194 100644 --- a/mobs/giant_sandworm.lua +++ b/mobs/giant_sandworm.lua @@ -16,7 +16,7 @@ mobs:register_mob("nssm:giant_sandworm", { damage = 12, jump = false, drops = { - {name = "nssm:worm_flesh", + {name = "nssm:worm_flesh", chance = 1, min = 20, max = 30,}, diff --git a/mobs/icelamander.lua b/mobs/icelamander.lua index 90d2986..b26fdc3 100644 --- a/mobs/icelamander.lua +++ b/mobs/icelamander.lua @@ -13,7 +13,7 @@ mobs:register_mob("nssm:icelamander", { fear_height = 4, walk_velocity = 2, run_velocity = 4, - sounds = { + sounds = { random = "icelamander", }, damage = 12, @@ -39,7 +39,7 @@ mobs:register_mob("nssm:icelamander", { chance = 2, min = 1, max = 1}, - }, + }, armor = 40, drawtype = "front", water_damage = 0, diff --git a/mobs/icesnake.lua b/mobs/icesnake.lua index f5f9ef4..a44ad7c 100644 --- a/mobs/icesnake.lua +++ b/mobs/icesnake.lua @@ -13,7 +13,7 @@ mobs:register_mob("nssm:icesnake", { fear_height = 3, walk_velocity = 1.2, run_velocity = 3, - sounds = { + sounds = { random = "icesnake", }, damage = 4, @@ -36,7 +36,7 @@ mobs:register_mob("nssm:icesnake", { chance = 2, min = 1, max = 3}, - }, + }, armor = 70, drawtype = "front", water_damage = 0, diff --git a/mobs/kraken.lua b/mobs/kraken.lua index 37b4372..514bc7d 100644 --- a/mobs/kraken.lua +++ b/mobs/kraken.lua @@ -20,7 +20,7 @@ mobs:register_mob("nssm:kraken", { jump = false, jump_chance = 0, jump_height = 0, - sounds = { + sounds = { random = "kraken", }, drops = { diff --git a/mobs/larva.lua b/mobs/larva.lua index adede50..db54bc9 100644 --- a/mobs/larva.lua +++ b/mobs/larva.lua @@ -15,7 +15,7 @@ mobs:register_mob("nssm:larva", { jump_height =0, walk_velocity = 0.4, run_velocity = 0.4, - sounds = { + sounds = { random = "sand", }, damage = 1, diff --git a/mobs/lava_titan.lua b/mobs/lava_titan.lua index 0e335fc..11b47fe 100644 --- a/mobs/lava_titan.lua +++ b/mobs/lava_titan.lua @@ -47,9 +47,9 @@ mobs:register_mob("nssm:lava_titan", { knock_back=0, attack_type = "dogshoot", dogshoot_switch = true, - arrow = "nssm:lava_arrow", - shoot_interval = 2, - shoot_offset = 0, + arrow = "nssm:lava_arrow", + shoot_interval = 2, + shoot_offset = 0, --[[ on_dist_attack = function(self, player) local pos = player:get_pos() @@ -77,8 +77,8 @@ mobs:register_mob("nssm:lava_titan", { run_end = 110, punch_start = 301, punch_end = 340, - shoot_start =340, - shoot_end=400, + shoot_start =340, + shoot_end=400, }, do_custom = function (self) digging_attack(self, nil, self.run_velocity, {x=0, y=4, z=0}) diff --git a/mobs/manticore.lua b/mobs/manticore.lua index dee3c79..4446938 100644 --- a/mobs/manticore.lua +++ b/mobs/manticore.lua @@ -40,14 +40,14 @@ mobs:register_mob("nssm:manticore", { on_rightclick = nil, attack_type = "dogshoot", dogshoot_switch = true, - arrow = "nssm:spine", - shoot_interval = 2, + arrow = "nssm:spine", + shoot_interval = 2, group_attack=true, attack_animals=true, knock_back=2, blood_texture="nssm_blood.png", stepheight=1.1, - shoot_offset = 1, + shoot_offset = 1, animation = { speed_normal = 25, speed_run = 25, @@ -59,7 +59,7 @@ mobs:register_mob("nssm:manticore", { run_end = 108, punch_start = 110, punch_end = 143, - shoot_start =180, - shoot_end=230, + shoot_start =180, + shoot_end=230, } }) diff --git a/mobs/mantis.lua b/mobs/mantis.lua index c47684b..b77ab18 100644 --- a/mobs/mantis.lua +++ b/mobs/mantis.lua @@ -12,7 +12,7 @@ mobs:register_mob("nssm:mantis", { fear_height = 4, walk_velocity = 2, run_velocity = 2.5, - sounds = { + sounds = { random = "manti", }, damage = 4, diff --git a/mobs/mantis_beast.lua b/mobs/mantis_beast.lua index c56b288..30b77a7 100644 --- a/mobs/mantis_beast.lua +++ b/mobs/mantis_beast.lua @@ -12,7 +12,7 @@ mobs:register_mob("nssm:mantis_beast", { fear_height = 4, walk_velocity = 2.5, run_velocity = 3.5, - sounds = { + sounds = { random = "manti", }, damage = 5, diff --git a/mobs/masticone.lua b/mobs/masticone.lua index c292433..9c837e5 100644 --- a/mobs/masticone.lua +++ b/mobs/masticone.lua @@ -14,7 +14,7 @@ mobs:register_mob("nssm:masticone", { rotate = 270, walk_velocity = 1.5, run_velocity = 2.5, - sounds = { + sounds = { random = "masticone", }, damage = 5, diff --git a/mobs/mese_dragon.lua b/mobs/mese_dragon.lua index 733f5d0..b9083e9 100644 --- a/mobs/mese_dragon.lua +++ b/mobs/mese_dragon.lua @@ -13,7 +13,7 @@ mobs:register_mob("nssm:mese_dragon", { fear_height = 5, walk_velocity = 2, run_velocity = 4, - sounds = { + sounds = { shoot_attack = "mesed", attack = "mese_dragon", distance = 60, @@ -30,7 +30,7 @@ mobs:register_mob("nssm:mese_dragon", { chance = 1, min = 99, max = 99}, - }, + }, armor = 30, drawtype = "front", water_damage = 0, @@ -62,8 +62,8 @@ mobs:register_mob("nssm:mese_dragon", { punch_end = 275, punch2_start = 330, punch2_end = 370, - dattack_start = 120, - dattack_end = 160, + dattack_start = 120, + dattack_end = 160, }, do_custom = function(self) midas_ability(self, "default:mese_block", self.run_velocity,2, 3) diff --git a/mobs/moonheron.lua b/mobs/moonheron.lua index 07eca1d..2cf62bd 100644 --- a/mobs/moonheron.lua +++ b/mobs/moonheron.lua @@ -39,7 +39,7 @@ mobs:register_mob("nssm:moonheron", { knock_back=4, blood_texture="nssm_blood.png", on_rightclick = nil, - fly = true, + fly = true, attack_type = "dogfight", animation = { speed_normal = 25, diff --git a/mobs/mordain.lua b/mobs/mordain.lua index 0b0ac07..4c1909f 100644 --- a/mobs/mordain.lua +++ b/mobs/mordain.lua @@ -12,8 +12,8 @@ mobs:register_mob("nssm:mordain", { fear_height = 4, walk_velocity = 1, run_velocity = 3.5, - rotate = 270, - sounds = { + rotate = 270, + sounds = { random = "mordain", }, damage = 6, diff --git a/mobs/morde.lua b/mobs/morde.lua index 41257d5..25fb8c1 100644 --- a/mobs/morde.lua +++ b/mobs/morde.lua @@ -15,7 +15,7 @@ mobs:register_mob("nssm:morde", { run_velocity = 3.5, damage = 6, jump = true, - sounds = { + sounds = { random = "morde", }, drops = { @@ -82,21 +82,21 @@ mobs:register_mob("nssm:morde", { }, nil) minetest.add_particlespawner( - 6, --amount - 1, --time - {x=p.x-0.5, y=p.y-0.5, z=p.z-0.5}, --minpos - {x=p.x+0.5, y=p.y+0.5, z=p.z+0.5}, --maxpos - {x=(s.x-p.x)*m, y=(s.y-p.y+1)*m, z=(s.z-p.z)*m}, --minvel - {x=(s.x-p.x)*m, y=(s.y-p.y+1)*m, z=(s.z-p.z)*m}, --maxvel - {x=s.x-p.x, y=s.y-p.y+1, z=s.z-p.z}, --minacc - {x=s.x-p.x, y=s.y-p.y+1, z=s.z-p.z}, --maxacc - 0.2, --minexptime - 0.3, --maxexptime - 2, --minsize - 3, --maxsize - false, --collisiondetection - "morparticle.png" --texture - ) + 6, --amount + 1, --time + {x=p.x-0.5, y=p.y-0.5, z=p.z-0.5}, --minpos + {x=p.x+0.5, y=p.y+0.5, z=p.z+0.5}, --maxpos + {x=(s.x-p.x)*m, y=(s.y-p.y+1)*m, z=(s.z-p.z)*m}, --minvel + {x=(s.x-p.x)*m, y=(s.y-p.y+1)*m, z=(s.z-p.z)*m}, --maxvel + {x=s.x-p.x, y=s.y-p.y+1, z=s.z-p.z}, --minacc + {x=s.x-p.x, y=s.y-p.y+1, z=s.z-p.z}, --maxacc + 0.2, --minexptime + 0.3, --maxexptime + 2, --minsize + 3, --maxsize + false, --collisiondetection + "morparticle.png" --texture + ) end end end, @@ -140,10 +140,10 @@ minetest.register_entity("nssm:mortick", { local objects = minetest.get_objects_inside_radius(s, 8) for _,obj in ipairs(objects) do - if (obj:is_player()) then + if (obj:is_player()) then self.attack = obj - end - end + end + end --If found a player follow him if self.attack ~= 0 then diff --git a/mobs/morgre.lua b/mobs/morgre.lua index 6052d78..e25c9ab 100644 --- a/mobs/morgre.lua +++ b/mobs/morgre.lua @@ -14,8 +14,8 @@ mobs:register_mob("nssm:morgre", { fear_height = 4, walk_velocity = 0.5, run_velocity = 3.5, - sounds = { - explode = "tnt_explode", + sounds = { + explode = "tnt_explode", random = "morgre1", }, damage = 1, diff --git a/mobs/morgut.lua b/mobs/morgut.lua index a5372ef..5c1f0ae 100644 --- a/mobs/morgut.lua +++ b/mobs/morgut.lua @@ -16,7 +16,7 @@ mobs:register_mob("nssm:morgut", { damage = 4, runaway = true, jump = true, - sounds = { + sounds = { random = "morgut", }, drops = { diff --git a/mobs/morlu.lua b/mobs/morlu.lua index 483ea9d..a84c297 100644 --- a/mobs/morlu.lua +++ b/mobs/morlu.lua @@ -16,7 +16,7 @@ mobs:register_mob("nssm:morlu", { damage = 4, runaway = true, jump = true, - sounds = { + sounds = { random = "morlu1", random = "morlu2" }, @@ -163,18 +163,18 @@ mobs:register_mob("nssm:morlu", { minetest.after(1, function (self) if self then - local armor_stack = player_inv:get_stack("armor", armor_elements[steal_pos].pos) - armor_stack:take_item() - player_inv:set_stack('armor', armor_elements[steal_pos].pos, armor_stack) + local armor_stack = player_inv:get_stack("armor", armor_elements[steal_pos].pos) + armor_stack:take_item() + player_inv:set_stack('armor', armor_elements[steal_pos].pos, armor_stack) - armor_stack = armor_inv:get_stack("armor", armor_elements[steal_pos].pos) - armor_stack:take_item() - armor_inv:set_stack('armor', armor_elements[steal_pos].pos, armor_stack) + armor_stack = armor_inv:get_stack("armor", armor_elements[steal_pos].pos) + armor_stack:take_item() + armor_inv:set_stack('armor', armor_elements[steal_pos].pos, armor_stack) - armor:set_player_armor(self.attack, self.attack) - --armor:update_armor(self.attack) - armor:update_inventory(self.attack) - --armor:update_player_visuals(self.attack) + armor:set_player_armor(self.attack, self.attack) + --armor:update_armor(self.attack) + armor:update_inventory(self.attack) + --armor:update_player_visuals(self.attack) --Update personal inventory of armors: if (self.invnum ~= nil) and (self.invnum <= 5) then diff --git a/mobs/morvalar.lua b/mobs/morvalar.lua index 9c9e0f1..6988f6b 100644 --- a/mobs/morvalar.lua +++ b/mobs/morvalar.lua @@ -38,7 +38,7 @@ mobs:register_mob("nssm:morvalar", { damage = 8, runaway = true, jump = true, - sounds = { + sounds = { random = "morvalar7", }, armor = 50, @@ -140,16 +140,16 @@ mobs:register_mob("nssm:morvalar", { minetest.after(1, function (self) - local armor_stack = player_inv:get_stack("armor", armor_elements[steal_pos].pos) - armor_stack:take_item() - player_inv:set_stack('armor', armor_elements[steal_pos].pos, armor_stack) + local armor_stack = player_inv:get_stack("armor", armor_elements[steal_pos].pos) + armor_stack:take_item() + player_inv:set_stack('armor', armor_elements[steal_pos].pos, armor_stack) - armor_stack = armor_inv:get_stack("armor", armor_elements[steal_pos].pos) - armor_stack:take_item() - armor_inv:set_stack('armor', armor_elements[steal_pos].pos, armor_stack) + armor_stack = armor_inv:get_stack("armor", armor_elements[steal_pos].pos) + armor_stack:take_item() + armor_inv:set_stack('armor', armor_elements[steal_pos].pos, armor_stack) - armor:set_player_armor(self.attack, self.attack) - armor:update_inventory(self.attack) + armor:set_player_armor(self.attack, self.attack) + armor:update_inventory(self.attack) end,self) end end @@ -202,7 +202,7 @@ mobs:register_mob("nssm:morvalar6", { damage = 8, runaway = true, jump = true, - sounds = { + sounds = { random = "morvalar6", }, armor = 50, @@ -323,7 +323,7 @@ mobs:register_mob("nssm:morvalar5", { damage = 4, runaway = true, jump = true, - sounds = { + sounds = { random = "morvalar5", }, armor = 40, @@ -394,7 +394,7 @@ mobs:register_mob("nssm:morvalar4", { damage = 4, runaway = true, jump = true, - sounds = { + sounds = { random = "morvalar4", }, armor = 30, @@ -516,7 +516,7 @@ mobs:register_mob("nssm:morvalar3", { damage = 16, runaway = true, jump = true, - sounds = { + sounds = { random = "morvalar3", }, armor = 30, @@ -532,9 +532,9 @@ mobs:register_mob("nssm:morvalar3", { on_rightclick = nil, attack_type = "dogshoot", dogshoot_switch = true, - arrow = "nssm:morarrow", - shoot_interval = 2, - shoot_offset = 0, + arrow = "nssm:morarrow", + shoot_interval = 2, + shoot_offset = 0, animation = { speed_normal = 15, speed_run = 30, @@ -547,7 +547,7 @@ mobs:register_mob("nssm:morvalar3", { punch_start = 375, punch_end = 395, shoot_start = 400, - shoot_end = 450, + shoot_end = 450, }, do_custom = function(self) respawn_block(self) @@ -577,7 +577,7 @@ mobs:register_mob("nssm:morvalar2", { damage = 4, runaway = true, jump = true, - sounds = { + sounds = { random = "morvalar2", }, armor = 50, @@ -677,7 +677,7 @@ mobs:register_mob("nssm:morvalar1", { damage = 4, runaway = true, jump = true, - sounds = { + sounds = { random = "morvalar1", }, armor = 20, @@ -761,7 +761,7 @@ mobs:register_mob("nssm:morvalar0", { damage = 4, runaway = true, jump = true, - sounds = { + sounds = { random = "kamehameha", }, drops = { @@ -862,14 +862,14 @@ minetest.register_entity("nssm:kamehameha_bad", { if obj:get_luaentity() then local name = obj:get_luaentity().name if name ~= "nssm:morvalar0" and name ~="nssm:kamehameha_bad" then - obj:set_hp(obj:get_hp()-5) - if (obj:get_hp() <= 0) then - if (not obj:is_player()) then - obj:remove() - end - end + obj:set_hp(obj:get_hp()-5) + if (obj:get_hp() <= 0) then + if (not obj:is_player()) then + obj:remove() + end + end end - end + end end local objects = minetest.get_objects_inside_radius(pos, 1) for _,obj in ipairs(objects) do diff --git a/mobs/morvy.lua b/mobs/morvy.lua index c202645..5d52a8d 100644 --- a/mobs/morvy.lua +++ b/mobs/morvy.lua @@ -12,7 +12,7 @@ mobs:register_mob("nssm:morvy", { fear_height = 5, walk_velocity = 0.7, run_velocity = 2, - rotate = 270, + rotate = 270, damage = 4, sounds = { random = "morvy", @@ -78,11 +78,11 @@ mobs:register_mob("nssm:morvy", { local pos1 = {x=s.x+math.random(-0.5,0.5), y=s.y+0.2, z=s.z+math.random(-0.5,0.5)} local objects = minetest.get_objects_inside_radius(s, 10) - for _,obj in ipairs(objects) do - if (obj:get_luaentity() and ((obj:get_luaentity().name == "nssm:morbat1") or (obj:get_luaentity().name == "nssm:morbat2") or (obj:get_luaentity().name == "nssm:morbat3"))) then - counter = counter + 1 + for _,obj in ipairs(objects) do + if (obj:get_luaentity() and ((obj:get_luaentity().name == "nssm:morbat1") or (obj:get_luaentity().name == "nssm:morbat2") or (obj:get_luaentity().name == "nssm:morbat3"))) then + counter = counter + 1 end - end + end if (minetest.get_node(pos1).name == "air") and (counter < 5) @@ -137,8 +137,8 @@ mobs:register_mob("nssm:morbat1", { view_range = 40, walk_velocity = 0.5, run_velocity = 3, - fall_speed = 0, - stepheight = 3, + fall_speed = 0, + stepheight = 3, --[[ sounds = { random = "duck", },]] @@ -159,7 +159,7 @@ mobs:register_mob("nssm:morbat1", { light_damage = 0, blood_texture="morparticle.png", on_rightclick = nil, - fly = true, + fly = true, attack_type = "dogfight", animation = { speed_normal = 25, @@ -187,8 +187,8 @@ mobs:register_mob("nssm:morbat2", { view_range = 40, walk_velocity = 0.5, run_velocity = 3, - fall_speed = 0, - stepheight = 3, + fall_speed = 0, + stepheight = 3, --[[ sounds = { random = "duck", },]] @@ -209,7 +209,7 @@ mobs:register_mob("nssm:morbat2", { light_damage = 0, blood_texture="morparticle.png", on_rightclick = nil, - fly = true, + fly = true, attack_type = "explode", explosion_radius = 3, animation = { @@ -239,8 +239,8 @@ mobs:register_mob("nssm:morbat3", { view_range = 40, walk_velocity = 0.5, run_velocity = 3, - fall_speed = 0, - stepheight = 3, + fall_speed = 0, + stepheight = 3, --[[ sounds = { random = "duck", },]] @@ -261,7 +261,7 @@ mobs:register_mob("nssm:morbat3", { light_damage = 0, blood_texture="morparticle.png", on_rightclick = nil, - fly = true, + fly = true, attack_type = "shoot", arrow = "nssm:morarrow", shoot_interval = 3, diff --git a/mobs/morwa.lua b/mobs/morwa.lua index f5d300b..4e17d38 100644 --- a/mobs/morwa.lua +++ b/mobs/morwa.lua @@ -42,9 +42,9 @@ mobs:register_mob("nssm:morwa", { on_rightclick = nil, attack_type = "dogshoot", dogshoot_switch = true, - arrow = "nssm:morarrow", - shoot_interval = 2, - shoot_offset = 0, + arrow = "nssm:morarrow", + shoot_interval = 2, + shoot_offset = 0, animation = { speed_normal = 25, speed_run = 25, @@ -56,8 +56,8 @@ mobs:register_mob("nssm:morwa", { run_end = 120, punch_start = 130, punch_end = 160, - shoot_start =176, - shoot_end=226, + shoot_start =176, + shoot_end=226, }, do_custom = function (self) local pos = self.object:get_pos() diff --git a/mobs/night_master.lua b/mobs/night_master.lua index 0b16f14..b6f9a63 100644 --- a/mobs/night_master.lua +++ b/mobs/night_master.lua @@ -94,7 +94,7 @@ mobs:register_mob("nssm:night_master_2", { lava_damage = 5, light_damage = 0, on_rightclick = nil, - fly = true, + fly = true, attack_type = "dogfight", animation = { speed_normal = 25, diff --git a/mobs/octopus.lua b/mobs/octopus.lua index 88314f5..1e0ebe2 100644 --- a/mobs/octopus.lua +++ b/mobs/octopus.lua @@ -19,7 +19,7 @@ mobs:register_mob("nssm:octopus", { jump = false, jump_chance = 0, jump_height = 0, - sounds = { + sounds = { random = "octopus", }, drops = { diff --git a/mobs/pumpboom.lua b/mobs/pumpboom.lua index 2c62cd0..e46b2de 100644 --- a/mobs/pumpboom.lua +++ b/mobs/pumpboom.lua @@ -14,8 +14,8 @@ mobs:register_mob("nssm:pumpboom_small", { fear_height = 4, walk_velocity = 2, run_velocity = 2.5, - sounds = { - explode = "tnt_explode" + sounds = { + explode = "tnt_explode" }, damage = 1.5, jump = true, @@ -70,8 +70,8 @@ mobs:register_mob("nssm:pumpboom_medium", { walk_velocity = 2, explosion_radius = 6, run_velocity = 2.5, - sounds = { - explode = "tnt_explode" + sounds = { + explode = "tnt_explode" }, damage = 1.5, jump = true, @@ -126,8 +126,8 @@ mobs:register_mob("nssm:pumpboom_large", { view_range = 30, walk_velocity = 2, run_velocity = 3, - sounds = { - explode = "tnt_explode" + sounds = { + explode = "tnt_explode" }, damage = 1.5, jump = true, diff --git a/mobs/pumpking.lua b/mobs/pumpking.lua index 99d54a7..29bed76 100644 --- a/mobs/pumpking.lua +++ b/mobs/pumpking.lua @@ -14,7 +14,7 @@ mobs:register_mob("nssm:pumpking", { view_range = 35, walk_velocity = 2, run_velocity = 4, - sounds = { + sounds = { random = "king", explode = "tnt_explode", }, diff --git a/mobs/sand_bloco.lua b/mobs/sand_bloco.lua index f0495df..75c06a9 100644 --- a/mobs/sand_bloco.lua +++ b/mobs/sand_bloco.lua @@ -12,8 +12,8 @@ mobs:register_mob("nssm:sand_bloco", { fear_height = 4, walk_velocity = 0.8, run_velocity = 2, - rotate = 270, - sounds = { + rotate = 270, + sounds = { random = "bloco", }, damage = 4, diff --git a/mobs/sandworm.lua b/mobs/sandworm.lua index 416818e..f755485 100644 --- a/mobs/sandworm.lua +++ b/mobs/sandworm.lua @@ -21,7 +21,7 @@ mobs:register_mob("nssm:sandworm", { }, jump = false, drops = { - {name = "nssm:worm_flesh", + {name = "nssm:worm_flesh", chance = 2, min = 1, max = 3,}, diff --git a/mobs/snow_biter.lua b/mobs/snow_biter.lua index b292d1c..a509017 100644 --- a/mobs/snow_biter.lua +++ b/mobs/snow_biter.lua @@ -15,7 +15,7 @@ mobs:register_mob("nssm:snow_biter", { reach = 1.5, walk_velocity = 0.8, run_velocity = 3, - sounds = { + sounds = { random = "snow_biter", }, --pathfinding = true, @@ -38,7 +38,7 @@ mobs:register_mob("nssm:snow_biter", { chance = 2, min = 0, max = 4}, - }, + }, armor = 80, drawtype = "front", water_damage = 0, diff --git a/mobs/spiderduck.lua b/mobs/spiderduck.lua index 89b7d06..7a9325d 100644 --- a/mobs/spiderduck.lua +++ b/mobs/spiderduck.lua @@ -13,7 +13,7 @@ mobs:register_mob("nssm:spiderduck", { view_range = 24, walk_velocity = 2, run_velocity = 4, - sounds = { + sounds = { random = "duck", }, damage = 6, @@ -53,10 +53,10 @@ mobs:register_mob("nssm:spiderduck", { on_rightclick = nil, dogshoot_switch = true, attack_type = "dogshoot", - arrow = "nssm:webball", - reach = 2, - shoot_interval = 2, - shoot_offset = 2, + arrow = "nssm:webball", + reach = 2, + shoot_interval = 2, + shoot_offset = 2, animation = { speed_normal = 25, speed_run = 35, diff --git a/mobs/stone_eater.lua b/mobs/stone_eater.lua index 37d0a24..005f323 100644 --- a/mobs/stone_eater.lua +++ b/mobs/stone_eater.lua @@ -18,7 +18,7 @@ mobs:register_mob("nssm:stone_eater", { damage = 5, reach = 1.5, drops = { - {name = "default:stone", + {name = "default:stone", chance = 2, min = 1, max = 3,}, diff --git a/mobs/swimming_duck.lua b/mobs/swimming_duck.lua index 7c02286..356709b 100644 --- a/mobs/swimming_duck.lua +++ b/mobs/swimming_duck.lua @@ -16,7 +16,7 @@ mobs:register_mob("nssm:swimming_duck", { jump = false, jump_chance = 0, jump_height = 0, - sounds = { + sounds = { random = "duck", }, drops = { diff --git a/mobs/tarantula.lua b/mobs/tarantula.lua index 02710aa..d66a66b 100644 --- a/mobs/tarantula.lua +++ b/mobs/tarantula.lua @@ -13,8 +13,8 @@ mobs:register_mob("nssm:tarantula", { walk_velocity = 0.7, fear_height = 4, run_velocity = 3, - rotate = 270, - sounds = { + rotate = 270, + sounds = { random = "tarry", }, damage = 8, @@ -37,9 +37,9 @@ mobs:register_mob("nssm:tarantula", { on_rightclick = nil, dogshoot_switch = true, attack_type = "dogshoot", - arrow = "nssm:thickwebball", - shoot_interval = 2, - shoot_offset = 1, + arrow = "nssm:thickwebball", + shoot_interval = 2, + shoot_offset = 1, animation = { speed_normal = 20, speed_run = 25, @@ -91,8 +91,8 @@ mobs:register_mob("nssm:tarantula_propower", { lifetimer = 500, walk_velocity = 1.5, run_velocity = 3.3, - rotate = 270, - sounds = { + rotate = 270, + sounds = { random = "tarry", }, damage = 12, diff --git a/mobs/werewolf.lua b/mobs/werewolf.lua index cb6c892..2306fdb 100644 --- a/mobs/werewolf.lua +++ b/mobs/werewolf.lua @@ -12,7 +12,7 @@ mobs:register_mob("nssm:werewolf", { walk_velocity = 3, fear_height = 4, run_velocity = 5, - sounds = { + sounds = { random = "werewolf", }, damage = 5, @@ -30,7 +30,7 @@ mobs:register_mob("nssm:werewolf", { chance = 2, min = 1, max = 1}, - }, + }, armor = 80, drawtype = "front", water_damage = 2, @@ -54,5 +54,5 @@ mobs:register_mob("nssm:werewolf", { run_end = 160, punch_start = 170, punch_end = 193, - } + } }) diff --git a/mobs/white_werewolf.lua b/mobs/white_werewolf.lua index d3b01dd..69067fc 100644 --- a/mobs/white_werewolf.lua +++ b/mobs/white_werewolf.lua @@ -12,7 +12,7 @@ mobs:register_mob("nssm:white_werewolf", { walk_velocity = 3, fear_height = 4, run_velocity = 5, - sounds = { + sounds = { random = "werewolf", }, damage = 5, @@ -30,7 +30,7 @@ mobs:register_mob("nssm:white_werewolf", { chance = 2, min = 1, max = 1}, - }, + }, armor = 80, drawtype = "front", water_damage = 2, @@ -54,5 +54,5 @@ mobs:register_mob("nssm:white_werewolf", { run_end = 160, punch_start = 170, punch_end = 193, - } + } })