diff --git a/ammo.lua b/ammo.lua index db8f01e..703bb30 100644 --- a/ammo.lua +++ b/ammo.lua @@ -122,7 +122,7 @@ end end -minetest.sound_play("default_dig_cracky", {self.object:get_pos(), gain = 1.0}) +minetest.sound_play("default_dig_cracky", {pos = self.object:get_pos(), gain = 1.0}) if ignite > 0 then @@ -133,7 +133,7 @@ end if minetest.get_node(moveresult.collisions[1].node_pos).name == "tnt:tnt" then minetest.swap_node(moveresult.collisions[1].node_pos, {name = "tnt:tnt_burning"}) - minetest.sound_play("tnt_ignite", {moveresult.collisions[1].node_pos}, true) + minetest.sound_play("tnt_ignite", {pos = moveresult.collisions[1].node_pos}, true) minetest.get_node_timer(moveresult.collisions[1].node_pos):start(3) minetest.check_for_falling(moveresult.collisions[1].node_pos) end @@ -146,7 +146,7 @@ if string.find(minetest.get_node(moveresult.collisions[1].node_pos).name,"door_w minetest.swap_node(moveresult.collisions[1].node_pos, {name = "air"}) minetest.add_item(moveresult.collisions[1].node_pos, "default:wood 5") -minetest.sound_play("rangedweapons_woodbreak",{moveresult.collisions[1].node_pos}) +minetest.sound_play("rangedweapons_woodbreak",{pos = moveresult.collisions[1].node_pos}) end end @@ -156,18 +156,18 @@ local nodeName = minetest.get_node(moveresult.collisions[1].node_pos).name if nodeName == "default:glass" then minetest.swap_node(moveresult.collisions[1].node_pos, {name = "rangedweapons:broken_glass"}) -minetest.sound_play("glass_break",{moveresult.collisions[1].node_pos}) +minetest.sound_play("glass_break",{pos = moveresult.collisions[1].node_pos}) end if nodeName == "xpanes:pane" or nodeName == "xpanes:pane_flat" then minetest.swap_node(moveresult.collisions[1].node_pos, {name = "air"}) minetest.add_item(moveresult.collisions[1].node_pos, "rangedweapons:glass_shards") -minetest.sound_play("glass_break",{moveresult.collisions[1].node_pos}) +minetest.sound_play("glass_break",{pos = moveresult.collisions[1].node_pos}) end if string.find(nodeName,"door_glass") then minetest.swap_node(moveresult.collisions[1].node_pos, {name = "air"}) minetest.add_item(moveresult.collisions[1].node_pos, "vessels:glass_fragments 5") -minetest.sound_play("glass_break",{moveresult.collisions[1].node_pos}) +minetest.sound_play("glass_break",{pos = moveresult.collisions[1].node_pos}) end end @@ -215,7 +215,7 @@ if math.random(1,100) <= nodePen then glow = 2, }) end -minetest.sound_play("default_dig_cracky", {self.object:get_pos(), gain = 1.0}) +minetest.sound_play("default_dig_cracky", {pos = self.object:get_pos(), gain = 1.0}) self.object:set_properties({collisionbox = {0,0,0,0,0,0}}) --minetest.chat_send_all("hit") self.object:set_velocity(moveresult.collisions[1].old_velocity) @@ -223,7 +223,7 @@ else if minetest.get_item_group(minetest.get_node(moveresult.collisions[1].node_pos).name, "leaves") > 0 then -minetest.sound_play("default_dig_snappy", {self.object:get_pos(), gain = 1.5}) +minetest.sound_play("default_dig_snappy", {pos = self.object:get_pos(), gain = 1.5}) for i = 1,math.random(3,6) do minetest.add_particle({ @@ -342,7 +342,7 @@ if math.random(1,100) <= mobPen then glow = 2, }) end -minetest.sound_play("default_dig_cracky", {self.object:get_pos(), gain = 1.0}) +minetest.sound_play("default_dig_cracky", {pos = self.object:get_pos(), gain = 1.0}) self.object:set_properties({collisionbox = {0,0,0,0,0,0}}) self.object:set_velocity(moveresult.collisions[1].old_velocity) else diff --git a/awp.lua b/awp.lua index 57540d4..d35d548 100644 --- a/awp.lua +++ b/awp.lua @@ -8,8 +8,8 @@ minetest.register_tool("rangedweapons:awp_uld", { groups = {not_in_creative_inventory = 1}, inventory_image = "rangedweapons_awp.png", weapon_zoom = 7.5, - on_use = function(user) - minetest.sound_play("rangedweapons_empty", {user}) + on_use = function(itemstack, user) + minetest.sound_play("rangedweapons_empty", {pos = user:get_pos()}) end, on_secondary_use = function(itemstack, user, pointed_thing) eject_shell(itemstack,user,"rangedweapons:awp_rld",1.0,"rangedweapons_rifle_reload_a","rangedweapons:empty_shell") diff --git a/benelli.lua b/benelli.lua index d99bf4c..7a6c73c 100644 --- a/benelli.lua +++ b/benelli.lua @@ -53,8 +53,8 @@ minetest.register_tool("rangedweapons:benelli_uld", { description = "" ..core.colorize("#35cdff","benelli m3\n") ..core.colorize("#FFFFFF", "Ranged damage: 2\n") ..core.colorize("#FFFFFF", "projectiles: 5\n") ..core.colorize("#FFFFFF", "Gun gravity: 4\n") ..core.colorize("#FFFFFF", "Accuracy: 48%\n")..core.colorize("#FFFFFF", "knockback: 6\n") ..core.colorize("#FFFFFF", "Critical chance: 6%\n") ..core.colorize("#FFFFFF", "Critical efficiency: 2.0x\n") ..core.colorize("#FFFFFF", "Ammunition: 12 gauge shells\n") ..core.colorize("#FFFFFF", "Pump delay: 0.6\n")..core.colorize("#FFFFFF", "Clip size: 7\n") ..core.colorize("#be0d00", "Right-click, to eject the empty shell!\n") ..core.colorize("#fff21c", "Right-click to load in a bullet!\n") ..core.colorize("#FFFFFF", "Gun type: shotgun\n") ..core.colorize("#FFFFFF", "Bullet velocity: 25"), inventory_image = "rangedweapons_benelli.png", groups = {not_in_creative_inventory = 1}, - on_use = function(user) - minetest.sound_play("rangedweapons_empty", {user}) + on_use = function(itemstack, user) + minetest.sound_play("rangedweapons_empty", {pos = user:get_pos()}) end, on_secondary_use = function(itemstack, user, pointed_thing) eject_shell(itemstack,user,"rangedweapons:benelli_rld",0.6,"rangedweapons_shotgun_reload_a","rangedweapons:empty_shell") diff --git a/cooldown_stuff.lua b/cooldown_stuff.lua index 2d6dcd6..3aac020 100644 --- a/cooldown_stuff.lua +++ b/cooldown_stuff.lua @@ -79,7 +79,7 @@ if player:get_wielded_item():get_definition().loaded_gun ~= nil then local itemstack = player:get_wielded_item() if player:get_wielded_item():get_definition().loaded_sound ~= nil then -minetest.sound_play(itemstack:get_definition().loaded_sound, {player}) +minetest.sound_play(itemstack:get_definition().loaded_sound, {pos = player:get_pos()}) end itemstack:set_name(player:get_wielded_item():get_definition().loaded_gun) player:set_wielded_item(itemstack) @@ -88,7 +88,7 @@ end if player:get_wielded_item():get_definition().rw_next_reload ~= nil then local itemstack = player:get_wielded_item() if itemstack:get_definition().load_sound ~= nil then -minetest.sound_play(itemstack:get_definition().load_sound, {player}) +minetest.sound_play(itemstack:get_definition().load_sound, {pos = player:get_pos()}) end gunMeta = itemstack:get_meta() u_meta:set_float("rw_cooldown",gunMeta:get_float("RW_reload_delay")) diff --git a/hand_grenade.lua b/hand_grenade.lua index a24967c..e506d2b 100644 --- a/hand_grenade.lua +++ b/hand_grenade.lua @@ -56,7 +56,7 @@ then end gtimer = 0 - minetest.sound_play("rangedweapons_reload_a", {user}) + minetest.sound_play("rangedweapons_reload_a", {pos = user:get_pos()}) itemstack = "rangedweapons:hand_grenade_nopin" local pos = user:get_pos() pos.y = pos.y + 1.5 diff --git a/init.lua b/init.lua index d8064ce..a7ac5c3 100644 --- a/init.lua +++ b/init.lua @@ -23,7 +23,7 @@ minetest.register_node("rangedweapons:antigun_block", { ---- make_sparks = function(pos) -minetest.sound_play("rengedweapons_ricochet", {pos, gain = 0.75}) +minetest.sound_play("rengedweapons_ricochet", {pos = pos, gain = 0.75}) for i=1,9 do minetest.add_particle({ pos = pos, @@ -62,7 +62,7 @@ if GunCaps ~= nil then gun_unload_sound = GunCaps.gun_unload_sound or "" end -minetest.sound_play(gun_unload_sound, {player}) +minetest.sound_play(gun_unload_sound, {pos = player:get_pos()}) local gun_reload = 0.25 @@ -169,7 +169,7 @@ if GunCaps ~= nil then gun_unload_sound = GunCaps.gun_unload_sound or "" end -minetest.sound_play(gun_unload_sound, {player}) +minetest.sound_play(gun_unload_sound, {pos = player:get_pos()}) local gun_reload = 0.25 @@ -351,7 +351,7 @@ rangedweapons_shoot_gun = function(itemstack, player) if minetest.find_node_near(player:getpos(), 10,"rangedweapons:antigun_block") then -minetest.sound_play("rangedweapons_empty", {player}) +minetest.sound_play("rangedweapons_empty", {pos = player:get_pos()}) minetest.chat_send_player(player:get_player_name(), "" ..core.colorize("#ff0000","Guns are prohibited in this area!")) else @@ -546,7 +546,7 @@ rangedweapons_shoot_powergun = function(itemstack, player) if minetest.find_node_near(player:getpos(), 10,"rangedweapons:antigun_block") then -minetest.sound_play("rangedweapons_empty", {player}) +minetest.sound_play("rangedweapons_empty", {pos = player:get_pos()}) minetest.chat_send_player(player:get_player_name(), "" ..core.colorize("#ff0000","Guns are prohibited in this area!")) else local power_cooldown = 0 @@ -661,7 +661,7 @@ rangedweapons_launch_projectile = function(player,projNum,projDmg,projEnt,visual local svertical = player:get_look_vertical() if pos and dir and yaw then - minetest.sound_play(shoot_sound, {player}) + minetest.sound_play(shoot_sound, {pos = pos, max_hear_distance = 500}) pos.y = pos.y + 1.45 if has_shell > 0 then @@ -739,8 +739,8 @@ local gunMeta = itemstack:get_meta() local bulletStack = ItemStack({name = gunMeta:get_string("RW_ammo_name")}) -minetest.sound_play(rldsound, {player}) local pos = player:get_pos() +minetest.sound_play(rldsound, {pos = pos}) local dir = player:get_look_dir() local yaw = player:get_look_yaw() if pos and dir and yaw then diff --git a/javelin - Copy.lua b/javelin - Copy.lua deleted file mode 100644 index 4168f19..0000000 --- a/javelin - Copy.lua +++ /dev/null @@ -1,139 +0,0 @@ - - - -minetest.register_craftitem("rangedweapons:thrown_javelin", { - wield_scale = {x=2.0,y=2.0,z=1.0}, - inventory_image = "rangedweapons_thrown_javelin.png", -}) - -minetest.register_craftitem("rangedweapons:javelin", { - description = "" ..core.colorize("#35cdff","Javelin\n") ..core.colorize("#FFFFFF", "Mele damage: 9\n") ..core.colorize("#FFFFFF", "Mele range: 5\n")..core.colorize("#FFFFFF", "Full punch interval: 1.25\n") ..core.colorize("#FFFFFF", "Ranged damage: 4-16\n") ..core.colorize("#FFFFFF", "Accuracy: 100%\n") ..core.colorize("#FFFFFF", "Mob knockback: 10\n") ..core.colorize("#FFFFFF", "Critical chance: 15%\n") ..core.colorize("#FFFFFF", "Critical damage: 25-45\n") ..core.colorize("#FFFFFF", "javelin survival rate: 95%\n")..core.colorize("#FFFFFF", "Projectile gravity: 4\n") ..core.colorize("#FFFFFF", "Projectile velocity: 20\n")..core.colorize("#ffc000", "Right-click to throw, Left-click to stab") , - wield_scale = {x=2.0,y=2.0,z=1.0}, - range = 5, - stack_max= 10, - inventory_image = "rangedweapons_javelin.png", - on_secondary_use = function(itemstack, user, pointed_thing) - if not minetest.setting_getbool("creative_mode") then itemstack:take_item() - end - if pointed_thing.type ~= "nothing" then - local pointed = minetest.get_pointed_thing_position(pointed_thing) - if vector.distance(user:getpos(), pointed) < 8 then - return itemstack - end - end - local pos = user:getpos() - local dir = user:get_look_dir() - local yaw = user:get_look_yaw() - if pos and dir then - pos.y = pos.y + 1.5 - local obj = minetest.add_entity(pos, "rangedweapons:javelin") - if obj then - minetest.sound_play("rangedweapons_throw", {object=obj}) - obj:setvelocity({x=dir.x * 20, y=dir.y * 20, z=dir.z * 20}) - obj:setacceleration({x=dir.x * -1, y=-4, z=dir.z * -1}) - obj:setyaw(yaw + math.pi) - local ent = obj:get_luaentity() - if ent then - ent.player = ent.player or user - end - end - end - return itemstack - end, - tool_capabilities = { - full_punch_interval = 1.25, - max_drop_level = 0, - groupcaps = { - stabby = {times={[1]=0.25, [2]=0.50, [3]=0.75}, uses=0, maxlevel=1}, - }, - damage_groups = {fleshy=9,knockback=10}, - } -}) - -local rangedweapons_javelin = { - physical = false, - timer = 0, - visual = "wielditem", - visual_size = {x=0.5, y=0.5,}, - textures = {"rangedweapons:thrown_javelin"}, - lastpos= {}, - collisionbox = {0, 0, 0, 0, 0, 0}, -} -rangedweapons_javelin.on_step = function(self, dtime) - self.timer = self.timer + dtime - local pos = self.object:getpos() - local node = minetest.get_node(pos) - - if self.timer > 0.15 then - local objs = minetest.get_objects_inside_radius({x = pos.x, y = pos.y, z = pos.z}, 1) - for k, obj in pairs(objs) do - if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "rangedweapons:javelin" and obj:get_luaentity().name ~= "__builtin:item" then - if math.random(1, 100) <= 15 then - local damage = math.random(25,45) - obj:punch(self.object, 1.0, { - full_punch_interval = 1.0, - damage_groups= {fleshy = damage, knockback=20}, - }, nil) - minetest.sound_play("crit", {pos = self.lastpos, gain = 0.8}) - self.object:remove() - if not minetest.setting_getbool("creative_mode") and math.random(1, 100) <= 95 then - minetest.add_item(self.lastpos, "rangedweapons:javelin") - end - else - local damage = math.random(4,16) - obj:punch(self.object, 1.0, { - full_punch_interval = 1.0, - damage_groups= {fleshy = damage, knockback=10}, - }, nil) - minetest.sound_play("default_dig_cracky", {pos = self.lastpos, gain = 0.8}) - self.object:remove() - if not minetest.setting_getbool("creative_mode") and math.random(1, 100) <= 95 then - minetest.add_item(self.lastpos, "rangedweapons:javelin") - end - end - end - else - - if math.random(1, 100) <= 15 then - local damage = math.random(25,45) - obj:punch(self.object, 1.0, { - full_punch_interval = 1.0, - damage_groups= {fleshy = damage}, - }, nil) - minetest.sound_play("crit", {pos = self.lastpos, gain = 0.8}) - self.object:remove() - if not minetest.setting_getbool("creative_mode") and math.random(1, 100) <= 95 then - minetest.add_item(self.lastpos, "rangedweapons:javelin") - end - else - local damage = math.random(4,16) - obj:punch(self.object, 1.0, { - full_punch_interval = 1.0, - damage_groups= {fleshy = damage}, - }, nil) - minetest.sound_play("default_dig_cracky", {pos = self.lastpos, gain = 0.8}) - self.object:remove() - if not minetest.setting_getbool("creative_mode") and math.random(1, 100) <= 95 then - minetest.add_item(self.lastpos, "rangedweapons:javelin") - end - end - end -end -end - if self.lastpos.x ~= nil then - if minetest.registered_nodes[node.name].walkable then - if not minetest.setting_getbool("creative_mode") and math.random(1, 100) <= 95 then - minetest.add_item(self.lastpos, "rangedweapons:javelin") - end - minetest.sound_play("default_dig_cracky", {pos = self.lastpos, gain = 0.8}) - self.object:remove() - end - end - self.lastpos= {x = pos.x, y = pos.y, z = pos.z} -end - -minetest.register_entity("rangedweapons:javelin", rangedweapons_javelin) - - - diff --git a/m200.lua b/m200.lua index b1ac66a..f910a16 100644 --- a/m200.lua +++ b/m200.lua @@ -8,8 +8,8 @@ minetest.register_tool("rangedweapons:m200_uld", { groups = {not_in_creative_inventory = 1}, inventory_image = "rangedweapons_m200.png", weapon_zoom = 7.5, - on_use = function(user) - minetest.sound_play("rangedweapons_empty", {user}) + on_use = function(itemstack, user) + minetest.sound_play("rangedweapons_empty", {pos = user:get_pos()}) end, on_secondary_use = function(itemstack, user, pointed_thing) eject_shell(itemstack,user,"rangedweapons:m200_rld",1.0,"rangedweapons_rifle_reload_a","rangedweapons:empty_shell") diff --git a/spas12.lua b/spas12.lua index d1c3026..8d40802 100644 --- a/spas12.lua +++ b/spas12.lua @@ -53,8 +53,8 @@ minetest.register_tool("rangedweapons:spas12_uld", { description = "" ..core.colorize("#35cdff","spas-12\n") ..core.colorize("#FFFFFF", "Ranged damage: 2\n") ..core.colorize("#FFFFFF", "projectiles: 6\n") ..core.colorize("#FFFFFF", "Gun gravity: 3\n") ..core.colorize("#FFFFFF", "Accuracy: 52%\n")..core.colorize("#FFFFFF", "knockback: 7\n") ..core.colorize("#FFFFFF", "Critical chance: 7%\n") ..core.colorize("#FFFFFF", "Critical efficiency: 2.1x\n") ..core.colorize("#FFFFFF", "Ammunition: 12 gauge shells\n") ..core.colorize("#FFFFFF", "Pump delay: 0.45\n")..core.colorize("#FFFFFF", "Clip size: 8\n") ..core.colorize("#be0d00", "Right-click, to eject the empty shell!\n") ..core.colorize("#fff21c", "Right-click to load in a bullet!\n") ..core.colorize("#FFFFFF", "Gun type: shotgun\n") ..core.colorize("#FFFFFF", "Bullet velocity: 28"), inventory_image = "rangedweapons_spas12.png", groups = {not_in_creative_inventory = 1}, - on_use = function(user) - minetest.sound_play("rangedweapons_empty", {user}) + on_use = function(itemstack, user) + minetest.sound_play("rangedweapons_empty", {pos = user:get_pos()}) end, on_secondary_use = function(itemstack, user, pointed_thing) eject_shell(itemstack,user,"rangedweapons:spas12_rld",0.6,"rangedweapons_shotgun_reload_a","rangedweapons:empty_shell") diff --git a/svd.lua b/svd.lua index 4f3e2db..737705c 100644 --- a/svd.lua +++ b/svd.lua @@ -8,8 +8,8 @@ minetest.register_tool("rangedweapons:svd_uld", { groups = {not_in_creative_inventory = 1}, inventory_image = "rangedweapons_svd.png", weapon_zoom = 9, - on_use = function(user) - minetest.sound_play("rangedweapons_empty", {user}) + on_use = function(itemstack, user) + minetest.sound_play("rangedweapons_empty", {pos = user:get_pos()}) end, on_secondary_use = function(itemstack, user, pointed_thing) eject_shell(itemstack,user,"rangedweapons:svd_rld",1.0,"rangedweapons_rifle_reload_a","rangedweapons:empty_shell")