mff/fishing
1
0
Fork 1
mirror of https://github.com/MinetestForFun/fishing.git synced 2025-10-31 06:35:23 +01:00
Code Issues Releases Wiki Activity

added translation messages

Browse Source 
removed old commented code
change test for "water_"
This commit is contained in:
crabman77
2015-06-27 19:41:48 +02:00
parent 39da8cc8fd
commit efce0637ff
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
locale/fr.txt
View File

@@ -73,7 +73,7 @@ View information about hunger fish = Afficher les informations sur la faim des p
### poles.lua ### ### poles.lua ###
Fishing Pole = Canne a peche Fishing Pole = Canne a peche
Perfect Fishing Pole = Canne a peche parfaite Perfect Fishing Pole = Canne a peche parfaite
You don't fishing in a bottle! = Vous ne pouvez pas pecher dans une bouteille!
### trophies.lua ### ### trophies.lua ###
Fish Trophy = Trophee poisson Fish Trophy = Trophee poisson

2
locale/template.txt
View File

@@ -72,7 +72,7 @@ Show information about hunger fish =
### poles.lua ### ### poles.lua ###
Fishing Pole = Fishing Pole =
Perfect Fishing Pole = Perfect Fishing Pole =
You don't fishing in a bottle! =
### trophies.lua ### ### trophies.lua ###
Fish Trophy = Fish Trophy =

14
poles.lua
View File

@@ -7,7 +7,6 @@ local function rod_wear(itemstack, user, pointed_thing, uses)
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") } fishing_setting.poles.wood = {["name"] = "wood", ["max_use"] = 30, ["desc"] = fishing_setting.func.S("Fishing Pole") }
fishing_setting.poles.perfect = {["name"] = "perfect", ["max_use"] = 1500, ["desc"] = fishing_setting.func.S("Perfect Fishing Pole") } fishing_setting.poles.perfect = {["name"] = "perfect", ["max_use"] = 1500, ["desc"] = fishing_setting.func.S("Perfect Fishing Pole") }
@@ -46,7 +45,6 @@ for _,pole in pairs(fishing_setting.poles) do
for _,k in pairs({ 1, 0, -1}) do for _,k in pairs({ 1, 0, -1}) do
for _,l 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 local node_name = minetest.get_node({x=pt.under.x+l, y=pt.under.y, z=pt.under.z+k}).name
--if (node_name == "default:water_source" or node_name == "noairblocks:water_sourcex" or node_name == "default:river_water_source")
if node and string.find(node_name, "water_source") ~= nil 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 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 local empty = true
@@ -67,7 +65,7 @@ for _,pole in pairs(fishing_setting.poles) do
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, "You don't fishing in a bottle!!! ") end if fishing_setting.settings["message"] == true then minetest.chat_send_player(player, fishing_setting.func.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 = nodes[math.random(1, #nodes)]
@@ -83,7 +81,6 @@ for _,pole in pairs(fishing_setting.poles) do
inv:remove_item("main", bait) inv:remove_item("main", bait)
end end
minetest.sound_play("fishing_bobber2", {pos = new_pos, gain = 0.5}) minetest.sound_play("fishing_bobber2", {pos = new_pos, gain = 0.5})
if fishing_setting.settings["wear_out"] == true and not fishing_setting.is_creative_mode then if fishing_setting.settings["wear_out"] == true and not fishing_setting.is_creative_mode then
return rod_wear(itemstack, user, pointed_thing, pole.max_use) return rod_wear(itemstack, user, pointed_thing, pole.max_use)
else else
@@ -93,19 +90,15 @@ for _,pole in pairs(fishing_setting.poles) do
return nil return nil
end, end,
on_place = function(itemstack, placer, pointed_thing) on_place = function(itemstack, placer, pointed_thing)
if fishing_setting.settings["simple_deco_fishing_pole"] == false then return end if fishing_setting.settings["simple_deco_fishing_pole"] == false then return end
local pt = pointed_thing local pt = pointed_thing
local pt_under_name = minetest.get_node(pt.under).name local pt_under_name = minetest.get_node(pt.under).name
if pt_under_name ~= "default:water_source" and pt_under_name ~= "default:water_flowing" then if string.find(pt_under_name, "water_") == nil then
local wear = itemstack:get_wear() local wear = itemstack:get_wear()
--print (wear)
local direction = minetest.dir_to_facedir(placer:get_look_dir()) local direction = minetest.dir_to_facedir(placer:get_look_dir())
--local meta1 = minetest.get_meta(pt.under)
local meta = minetest.get_meta(pt.above) local meta = minetest.get_meta(pt.above)
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})
--meta1:set_int("wear", wear)
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()
@@ -114,9 +107,6 @@ for _,pole in pairs(fishing_setting.poles) do
return itemstack return itemstack
end, end,
}) })
minetest.register_node("fishing:pole_".. pole.name .."_deco", { minetest.register_node("fishing:pole_".. pole.name .."_deco", {
description = pole.desc, description = pole.desc,