Revert "Weapons are tools instead of nodes so they can't be placed"
This reverts commit 74472f7847
master
parent
74472f7847
commit
567303f4b7
|
@ -16,7 +16,7 @@ function block_league.bullets_hud_create(p_name)
|
|||
|
||||
local stack = inv:get_stack("main", i)
|
||||
local item_name = stack:get_name()
|
||||
local weapon = minetest.registered_items[item_name]
|
||||
local weapon = minetest.registered_nodes[item_name]
|
||||
|
||||
if weapon ~= nil and weapon.magazine ~= nil then
|
||||
sub_img_elems[item_name .. "_icon"] = {
|
||||
|
@ -80,7 +80,7 @@ end
|
|||
|
||||
function block_league.weapons_hud_update(arena, p_name, weapon_name)
|
||||
|
||||
local weapon = minetest.registered_items[weapon_name]
|
||||
local weapon = minetest.registered_nodes[weapon_name]
|
||||
local panel = panel_lib.get_panel(p_name, "bl_bullets")
|
||||
|
||||
local w_name = weapon.name
|
||||
|
|
|
@ -38,7 +38,7 @@ function block_league.refill_weapons(arena, p_name)
|
|||
local default_weapons = {"block_league:smg", "block_league:sword", "block_league:pixelgun"}
|
||||
|
||||
for i, weapon_name in pairs(default_weapons) do
|
||||
local magazine = minetest.registered_items[weapon_name].magazine
|
||||
local magazine = minetest.registered_nodes[weapon_name].magazine
|
||||
|
||||
if magazine then
|
||||
arena.players[p_name].weapons_magazine[weapon_name] = magazine
|
||||
|
|
|
@ -201,7 +201,7 @@ function bullet_set_entity(name, def, dmg, trail)
|
|||
local direction = vector.normalize(velocity)
|
||||
local node = minetest.get_node(pos)
|
||||
local speed = vector.length(velocity)
|
||||
local drag = math.max(minetest.registered_items[node.name].liquid_viscosity, 0.1) * self.sliding -- Ottiene l'attrito generato dal liquido che attraversa
|
||||
local drag = math.max(minetest.registered_nodes[node.name].liquid_viscosity, 0.1) * self.sliding -- Ottiene l'attrito generato dal liquido che attraversa
|
||||
local yaw = minetest.dir_to_yaw(direction)
|
||||
local pitch = math.acos(velocity.y/speed) - math.pi/3
|
||||
-- Controlla che il pitch sia un numero
|
||||
|
|
|
@ -16,7 +16,7 @@ function block_league.register_weapon(name, def)
|
|||
-- passare anche il nome in on_use (che lo richiede)
|
||||
def.name = name
|
||||
|
||||
minetest.register_tool(name, {
|
||||
minetest.register_node(name, {
|
||||
name = def.name,
|
||||
|
||||
description = def.description,
|
||||
|
|
|
@ -16,7 +16,7 @@ controls.register_on_hold(function(player, key)
|
|||
if key~="LMB" or not arena_lib.is_player_in_arena(p_name, "block_league") then return end
|
||||
|
||||
local weapon_name = player:get_wielded_item():get_name()
|
||||
local weap_def = minetest.registered_items[weapon_name]
|
||||
local weap_def = minetest.registered_nodes[weapon_name]
|
||||
|
||||
if not weap_def or not weap_def.continuos_fire then return end
|
||||
|
||||
|
@ -41,7 +41,7 @@ controls.register_on_release(function(player, key)
|
|||
elseif key == "LMB" then
|
||||
|
||||
local weapon_name = player:get_wielded_item():get_name()
|
||||
local weap_def = minetest.registered_items[weapon_name]
|
||||
local weap_def = minetest.registered_nodes[weapon_name]
|
||||
local arena = arena_lib.get_arena_by_player(p_name)
|
||||
|
||||
if not weap_def or not weap_def.slow_down_when_firing then return end
|
||||
|
|
Loading…
Reference in New Issue