nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-18 00:08:25 +01:00
Code Issues Releases Wiki Activity

fixed pole remove node when place this

Browse Source 
remove random place bobber
remove worms eat on use
remove whitespace
remove material.lua useless
This commit is contained in:
crabman77 2015-08-20 17:03:03 +02:00
parent 5e8399b17b
commit eee9d0a5f9
5 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/fishing/bobber.lua
View File

@ -24,7 +24,7 @@ minetest.register_node("fishing:bobber_box", {
"fishing_bobber.png", "fishing_bobber.png",
"fishing_bobber.png", "fishing_bobber.png",
"fishing_bobber.png^[transformFX" "fishing_bobber.png^[transformFX"
}, -- },
groups = {not_in_creative_inventory=1}, groups = {not_in_creative_inventory=1},
}) })

2
mods/fishing/bobber_shark.lua
View File

@ -22,7 +22,7 @@ minetest.register_node("fishing:bobber_shark_box", {
"fishing_bobber_shark.png", "fishing_bobber_shark.png",
"fishing_bobber_shark.png", "fishing_bobber_shark.png",
"fishing_bobber_shark.png^[transformFX" "fishing_bobber_shark.png^[transformFX"
}, -- },
groups = {not_in_creative_inventory=1}, groups = {not_in_creative_inventory=1},
}) })

3
mods/fishing/init.lua
View File

@ -1,6 +1,6 @@
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
local title = "Fishing - Crabman77's version" local title = "Fishing - Crabman77's version"
local version = "0.0.1" local version = "0.0.2"
local mname = "fishing" local mname = "fishing"
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
-- original by wulfsdad (http://forum.minetest.net/viewtopic.php?id=4375) -- original by wulfsdad (http://forum.minetest.net/viewtopic.php?id=4375)
@ -68,7 +68,6 @@ dofile(path .."bobber_shark.lua")
dofile(path .."fishes.lua") dofile(path .."fishes.lua")
dofile(path .."trophies.lua") dofile(path .."trophies.lua")
dofile(path .."poles.lua") dofile(path .."poles.lua")
--dofile(path .."material.lua")
--random hungry bait --random hungry bait
fishing_setting.func.hungry_random() fishing_setting.func.hungry_random()

69
mods/fishing/poles.lua
View File

@ -2,14 +2,16 @@
-- Fishing Pole -- Fishing Pole
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
local S = fishing_setting.func.S
local function rod_wear(itemstack, user, pointed_thing, uses) local function rod_wear(itemstack, user, pointed_thing, uses)
itemstack:add_wear(65535/(uses-1)) itemstack:add_wear(65535/(uses-1))
return itemstack return itemstack
end end
fishing_setting.poles = {} fishing_setting.poles = {}
fishing_setting.poles.wood = {["name"] = "wood", ["max_use"] = 30, ["desc"] = fishing_setting.func.S("Fishing Pole"),["bobber_max"] = 2 } fishing_setting.poles.wood = {["name"] = "wood", ["max_use"] = 30, ["desc"] = S("Fishing Pole"),["bobber_max"] = 2 }
fishing_setting.poles.perfect = {["name"] = "perfect", ["max_use"] = 1500, ["desc"] = fishing_setting.func.S("Perfect Fishing Pole"),["bobber_max"] = 5} fishing_setting.poles.perfect = {["name"] = "perfect", ["max_use"] = 1500, ["desc"] = S("Perfect Fishing Pole"),["bobber_max"] = 5}
for _,pole in pairs(fishing_setting.poles) do for _,pole in pairs(fishing_setting.poles) do
@ -32,6 +34,14 @@ local bobbermax = pole["bobber_max"]
local bait = inv:get_stack("main", user:get_wield_index()+1 ):get_name() local bait = inv:get_stack("main", user:get_wield_index()+1 ):get_name()
if fishing_setting.baits[bait] == nil then return nil end if fishing_setting.baits[bait] == nil then return nil end
local objs = minetest.get_objects_inside_radius(pt.under, 1)
for m, obj in pairs(objs) do
if obj:get_luaentity() ~= nil and string.find(obj:get_luaentity().name, "fishing:bobber") then
if fishing_setting.settings["message"] == true then minetest.chat_send_player(player_name, S("Sorry, there is another bobber!")) end
return nil
end
end
--if contest then player must have only 2 boober --if contest then player must have only 2 boober
local bobber_nb = 0 local bobber_nb = 0
local bobber_max local bobber_max
@ -40,7 +50,7 @@ local bobbermax = pole["bobber_max"]
else else
bobber_max = bobbermax bobber_max = bobbermax
end end
--player has others bobbers?
for m, obj in pairs(minetest.get_objects_inside_radius(pt.under, 20)) do for m, obj in pairs(minetest.get_objects_inside_radius(pt.under, 20)) do
if obj:get_luaentity() ~= nil and string.find(obj:get_luaentity().name, "fishing:bobber") ~= nil then if obj:get_luaentity() ~= nil and string.find(obj:get_luaentity().name, "fishing:bobber") ~= nil then
if obj:get_luaentity().owner == player_name then if obj:get_luaentity().owner == player_name then
@ -50,49 +60,25 @@ local bobbermax = pole["bobber_max"]
end end
if bobber_nb >= bobber_max then if bobber_nb >= bobber_max then
if fishing_setting.settings["message"] == true then if fishing_setting.settings["message"] == true then
minetest.chat_send_player(player_name, fishing_setting.func.S("You don't have mores %s bobbers!"):format(bobber_max)) minetest.chat_send_player(player_name, S("You don't have mores %s bobbers!"):format(bobber_max))
end end
return nil return nil
end end
local bobbers = {} local nodes = 1
local objs = minetest.get_objects_inside_radius(pt.under, 3) for _,k in pairs({ {1, 0}, {-1,0}, {0,1}, {0,-1} }) do
for m, obj in pairs(objs) do local node_name = minetest.get_node({x=pt.under.x+k[1], y=pt.under.y, z=pt.under.z+k[2]}).name
if obj:get_luaentity() ~= nil and string.find(obj:get_luaentity().name, "fishing:bobber") ~= nil then if node_name and string.find(node_name, "water_source") ~= nil
bobbers[m] = obj and minetest.get_node({x=pt.under.x+k[1], y=pt.under.y+1, z=pt.under.z+k[2]}).name == "air" then
end nodes = nodes + 1
end
local nodes = {}
local i = 1
for _,k in pairs({ 1, 0, -1}) do
for _,l in pairs({ -1, 0, 1}) do
local node_name = minetest.get_node({x=pt.under.x+l, y=pt.under.y, z=pt.under.z+k}).name
if node and string.find(node_name, "water_source") ~= nil
and minetest.get_node({x=pt.under.x+l, y=pt.under.y+1, z=pt.under.z+k}).name == "air" then
local empty = true
for o, obj in pairs(bobbers) do
local p = obj:getpos()
local dist = ((p.x-pt.under.x)^2 + (p.y-pt.under.y)^2 + (p.z-pt.under.z)^2)^0.5
if dist < 2 then
empty = false
break
end
end
if empty then
nodes[i] = {x=pt.under.x+l, y=pt.under.y, z=pt.under.z+k}
i = i+1
end
end
end end
end end
--if water == -3 nodes --if water == -3 nodes
if #nodes < 2 then if nodes < 2 then
if fishing_setting.settings["message"] == true then minetest.chat_send_player(player_name, fishing_setting.func.S("You don't fishing in a bottle!")) end if fishing_setting.settings["message"] == true then minetest.chat_send_player(player_name, S("You don't fishing in a bottle!")) end
return nil return nil
end end
local new_pos = nodes[math.random(1, #nodes)] local new_pos = {x=pt.under.x, y=pt.under.y+(45/64), z=pt.under.z}
new_pos.y=new_pos.y+(45/64)
local ent = minetest.add_entity({interval = 1,x=new_pos.x, y=new_pos.y, z=new_pos.z}, fishing_setting.baits[bait].bobber) local ent = minetest.add_entity({interval = 1,x=new_pos.x, y=new_pos.y, z=new_pos.z}, fishing_setting.baits[bait].bobber)
if not ent then return nil end if not ent then return nil end
local luaentity = ent:get_luaentity() local luaentity = ent:get_luaentity()
@ -120,8 +106,15 @@ local bobbermax = pole["bobber_max"]
if string.find(pt_under_name, "water_") == nil then if string.find(pt_under_name, "water_") == nil then
local wear = itemstack:get_wear() local wear = itemstack:get_wear()
local direction = minetest.dir_to_facedir(placer:get_look_dir()) local direction = minetest.dir_to_facedir(placer:get_look_dir())
local meta = minetest.get_meta(pt.above) local dir = minetest.facedir_to_dir(direction)
local p = vector.add(pt.above, dir)
local n2 = minetest.get_node_or_nil(p)
local def = n2 and minetest.registered_items[n2.name]
if not def or not def.buildable_to then
return nil
end
minetest.set_node(pt.above, {name="fishing:pole_".. pole.name .."_deco", param2=direction}) minetest.set_node(pt.above, {name="fishing:pole_".. pole.name .."_deco", param2=direction})
local meta = minetest.get_meta(pt.above)
meta:set_int("wear", wear) meta:set_int("wear", wear)
if not fishing_setting.is_creative_mode then if not fishing_setting.is_creative_mode then
itemstack:take_item() itemstack:take_item()

1
mods/fishing/worms.lua
View File

@ -15,7 +15,6 @@ minetest.register_craftitem("fishing:bait_worm", {
description = fishing_setting.func.S("Worm"), description = fishing_setting.func.S("Worm"),
groups = { fishing_bait=1 }, groups = { fishing_bait=1 },
inventory_image = "fishing_bait_worm.png", inventory_image = "fishing_bait_worm.png",
on_use = minetest.item_eat(1),
on_place = function(itemstack, placer, pointed_thing) on_place = function(itemstack, placer, pointed_thing)
local pt = pointed_thing local pt = pointed_thing
minetest.add_entity({x=pt.under.x, y=pt.under.y+0.6, z=pt.under.z}, "fishing:bait_worm_entity") minetest.add_entity({x=pt.under.x, y=pt.under.y+0.6, z=pt.under.z}, "fishing:bait_worm_entity")