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

Fix english

Browse Source 
English mixed with french in the code is dead ugly. Fix this.
This commit is contained in:
Wouters Dorian
2015-07-15 15:54:05 +02:00
parent d8922786e5
commit dc055c58b5
9 changed files with 240 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bobber_shark.lua
View File

@@ -167,11 +167,11 @@ local FISHING_BOBBER_SHARK_ENTITY={
self.randomtime = math.random(1,5)*10 self.randomtime = math.random(1,5)*10
local chance = math.random(1, 100) local chance = math.random(1, 100)
--if 1 you catch a tresor, maybe ... --if 1 you catch a treasure, maybe ...
if chance == 1 then if chance == 1 then
--You are lucky ? :) --You are lucky ? :)
if math.random(1, 100) <= fishing_setting.settings["tresor_chance"] and fishing_setting.settings["tresor_enable"] then if math.random(1, 100) <= fishing_setting.settings["treasure_chance"] and fishing_setting.settings["treasure_enable"] then
self.prize = fishing_setting.prizes["tresor"][math.random(1,#fishing_setting.prizes["tresor"])] self.prize = fishing_setting.prizes["treasure"][math.random(1,#fishing_setting.prizes["treasure"])]
else else
self.prize = fishing_setting.prizes["stuff"][math.random(1,#fishing_setting.prizes["stuff"])] self.prize = fishing_setting.prizes["stuff"][math.random(1,#fishing_setting.prizes["stuff"])]
end end

276
functions.lua
View File

@@ -1,12 +1,12 @@
--function save settings --function save settings
function fishing_setting.func.save() function fishing_setting.func.save()
local input = io.open(fishing_setting.file_settings, "w") local input, err = io.open(fishing_setting.file_settings, "w")
if input then if input then
input:write(minetest.serialize(fishing_setting.settings)) input:write(minetest.serialize(fishing_setting.settings))
input:close() input:close()
else else
minetest.log("action","Open failed (mode:w) of " .. fishing_setting.file_settings) minetest.log("error", "open(" .. fishing_setting.file_settings .. ", 'w') failed: " .. err)
end end
end end
@@ -43,16 +43,16 @@ function fishing_setting.func.set_settings(new_settings, settings)
new_settings["fish_chance"] = settings["fish_chance"] new_settings["fish_chance"] = settings["fish_chance"]
end end
if settings["tresor_chance"] ~= nil then if settings["treasure_chance"] ~= nil then
new_settings["tresor_chance"] = settings["tresor_chance"] new_settings["treasure_chance"] = settings["treasure_chance"]
end end
if settings["shark_chance"] ~= nil then if settings["shark_chance"] ~= nil then
new_settings["shark_chance"] = settings["shark_chance"] new_settings["shark_chance"] = settings["shark_chance"]
end end
if settings["tresor_enable"] ~= nil then if settings["treasure_enable"] ~= nil then
new_settings["tresor_enable"] = settings["tresor_enable"] new_settings["treasure_enable"] = settings["treasure_enable"]
end end
if settings["escape_chance"] ~= nil then if settings["escape_chance"] ~= nil then
@@ -107,13 +107,13 @@ function fishing_setting.func.hungry_random()
end end
-- show notification when player catch tresor -- Show notification when a player catches treasure
function fishing_setting.func.notify(f_name, tresor) function fishing_setting.func.notify(f_name, treasure)
local title = fishing_setting.func.S("Good luck to %s, He catch the tresor, %s!"):format(f_name, tresor[4]) local title = fishing_setting.func.S("Lucky %s, he caught the treasure, %s!"):format(f_name, treasure[4])
for _, player in ipairs(minetest.get_connected_players()) do for _, player in ipairs(minetest.get_connected_players()) do
local player_name = player:get_player_name() local player_name = player:get_player_name()
if player_name == f_name then if player_name == f_name then
minetest.chat_send_player(player_name, fishing_setting.func.S("You catch the tresor, %s!"):format(tresor[4])) minetest.chat_send_player(player_name, fishing_setting.func.S("You caught the treasure, %s!"):format(treasure[4]))
else else
minetest.chat_send_player(player_name, title) minetest.chat_send_player(player_name, title)
end end
@@ -121,117 +121,96 @@ function fishing_setting.func.notify(f_name, tresor)
end end
--Menu fishing configuration -- Menu: fishing configuration
fishing_setting.func.on_show_settings = function(player_name) fishing_setting.func.on_show_settings = function(player_name)
local S = fishing_setting.func.S
if not fishing_setting.tmp_setting then if not fishing_setting.tmp_setting then
fishing_setting.tmp_setting = {} fishing_setting.tmp_setting = {}
fishing_setting.func.set_settings(fishing_setting.tmp_setting, fishing_setting.settings) fishing_setting.func.set_settings(fishing_setting.tmp_setting, fishing_setting.settings)
end end
local formspec = "size[10.8,9]label[4,0;FISHING CONFIGURATION]".. local formspec = "size[10.8,9]label[4,0;"..S("Fishing configuration").."]"..
--Chance fish -- Fish chance
"label[1.6,0.5;Chance fish]".. "label[1.6,0.5;"..S("Fish chance").."]"..
"button[0,1;1,1;cfish;-1]".. "button[0,1;1,1;cfish;-1]"..
"button[1,1;1,1;cfish;-10]".. "button[1,1;1,1;cfish;-10]"..
"label[2.1,1.2;"..tostring(fishing_setting.tmp_setting["fish_chance"]).."]".. "label[2.1,1.2;"..tostring(fishing_setting.tmp_setting["fish_chance"]).."]"..
"button[2.7,1;1,1;cfish;+10]".. "button[2.7,1;1,1;cfish;+10]"..
"button[3.7,1;1,1;cfish;+1]".. "button[3.7,1;1,1;cfish;+1]"..
--Chance shark -- Shark chance
"label[1.5,2;Chance shark]".. "label[1.5,2;"..S("Shark chance").."]"..
"button[0,2.5;1,1;cshark;-1]".. "button[0,2.5;1,1;cshark;-1]"..
"button[1,2.5;1,1;cshark;-10]".. "button[1,2.5;1,1;cshark;-10]"..
"label[2.1,2.7;"..tostring(fishing_setting.tmp_setting["shark_chance"]).."]".. "label[2.1,2.7;"..tostring(fishing_setting.tmp_setting["shark_chance"]).."]"..
"button[2.7,2.5;1,1;cshark;+10]".. "button[2.7,2.5;1,1;cshark;+10]"..
"button[3.7,2.5;1,1;cshark;+1]".. "button[3.7,2.5;1,1;cshark;+1]"..
--Chance tresor -- Treasure chance
"label[1.5,3.5;Chance tresor]".. "label[1.5,3.5;"..S("Treasure chance").."]"..
"button[0,4.;1,1;ctresor;-1]".. "button[0,4.;1,1;ctreasure;-1]"..
"button[1,4;1,1;ctresor;-10]".. "button[1,4;1,1;ctreasure;-10]"..
"label[2.1,4.2;"..tostring(fishing_setting.tmp_setting["tresor_chance"]).."]".. "label[2.1,4.2;"..tostring(fishing_setting.tmp_setting["treasure_chance"]).."]"..
"button[2.7,4;1,1;ctresor;+10]".. "button[2.7,4;1,1;ctreasure;+10]"..
"button[3.7,4;1,1;ctresor;+1]".. "button[3.7,4;1,1;ctreasure;+1]"..
--Chance worm -- Worm chance
"label[7.5,0.5;Chance worm]".. "label[7.5,0.5;"..S("Worm chance").."]"..
"button[6,1;1,1;cworm;-1]".. "button[6,1;1,1;cworm;-1]"..
"button[7,1;1,1;cworm;-10]".. "button[7,1;1,1;cworm;-10]"..
"label[8.1,1.2;"..tostring(fishing_setting.tmp_setting["worm_chance"]).."]".. "label[8.1,1.2;"..tostring(fishing_setting.tmp_setting["worm_chance"]).."]"..
"button[8.7,1;1,1;cworm;+10]".. "button[8.7,1;1,1;cworm;+10]"..
"button[9.7,1;1,1;cworm;+1]".. "button[9.7,1;1,1;cworm;+1]"..
--Chance escape -- Escape chance
"label[7.4,2;Chance escape]".. "label[7.4,2;"..S("Escape chance").."]"..
"button[6,2.5;1,1;cescape;-1]".. "button[6,2.5;1,1;cescape;-1]"..
"button[7,2.5;1,1;cescape;-10]".. "button[7,2.5;1,1;cescape;-10]"..
"label[8.1,2.7;"..tostring(fishing_setting.tmp_setting["escape_chance"]).."]".. "label[8.1,2.7;"..tostring(fishing_setting.tmp_setting["escape_chance"]).."]"..
"button[8.7,2.5;1,1;cescape;+10]".. "button[8.7,2.5;1,1;cescape;+10]"..
"button[9.7,2.5;1,1;cescape;+1]".. "button[9.7,2.5;1,1;cescape;+1]"..
-- Bobber view range -- Bobber view range
"label[7.2,3.5;Bobber view range]".. "label[7.2,3.5;"..S("Bobber view range").."]"..
"button[7,4;1,1;bvrange;-1]".. "button[7,4;1,1;bvrange;-1]"..
"label[8.1,4.2;"..tostring(fishing_setting.tmp_setting["bobber_view_range"]).."]".. "label[8.1,4.2;"..tostring(fishing_setting.tmp_setting["bobber_view_range"]).."]"..
"button[8.7,4;1,1;bvrange;+1]".. "button[8.7,4;1,1;bvrange;+1]"..
--messages display -- Messages display
"label[0,5.7;Display messages in chat]".. "label[0,5.7;"..S("Display messages in chat").."]"..
"button[3.7,5.5;1,1;dmessages;"..tostring(fishing_setting.tmp_setting["message"]).."]".. "button[3.7,5.5;1,1;dmessages;"..tostring(fishing_setting.tmp_setting["message"]).."]"..
--poledeco --poledeco
"label[0,6.5;Simple pole deco]".. "label[0,6.5;"..S("Simple pole deco").."]"..
"button[3.7,6.3;1,1;poledeco;"..tostring(fishing_setting.tmp_setting["simple_deco_fishing_pole"]).."]".. "button[3.7,6.3;1,1;poledeco;"..tostring(fishing_setting.tmp_setting["simple_deco_fishing_pole"]).."]"..
--wearout -- Wearout
"label[0,7.3;Poles Wear]".. "label[0,7.3;"..S("Poles wearout").."]"..
"button[3.7,7.1;1,1;wearout;"..tostring(fishing_setting.tmp_setting["wear_out"]).."]".. "button[3.7,7.1;1,1;wearout;"..tostring(fishing_setting.tmp_setting["wear_out"]).."]"..
--TRESOR_ENABLE -- TREASURE_ENABLE
"label[6,5.7;Tresor enable]".. "label[6,5.7;"..S("Enable treasure").."]"..
"button[9.7,5.5;1,1;tresorenable;"..tostring(fishing_setting.tmp_setting["tresor_enable"]).."]".. "button[9.7,5.5;1,1;treasureenable;"..tostring(fishing_setting.tmp_setting["treasure_enable"]).."]"..
-- NEW_WORM_SOURCE -- NEW_WORM_SOURCE
"label[6,6.5;New worm source (reboot)]".. "label[6,6.5;"..S("New worm source (reboot)").."]"..
"button[9.7,6.3;1,1;newworm;"..tostring(fishing_setting.tmp_setting["new_worm_source"]).."]".. "button[9.7,6.3;1,1;newworm;"..tostring(fishing_setting.tmp_setting["new_worm_source"]).."]"..
-- WORM_IS_MOB -- WORM_IS_MOB
"label[6,7.3;Worm is mob (reboot)]".. "label[6,7.3;"..S("Worm is a mob (reboot)").."]"..
"button[9.7,7.1;1,1;wormmob;"..tostring(fishing_setting.tmp_setting["worm_is_mob"]).."]".. "button[9.7,7.1;1,1;wormmob;"..tostring(fishing_setting.tmp_setting["worm_is_mob"]).."]"..
"button_exit[0,8.2;1.5,1;save;Abort]".. "button_exit[0,8.2;1.5,1;save;"..S("Abort").."]"..
"button_exit[9.2,8.2;1.5,1;save;Ok]" "button_exit[9.2,8.2;1.5,1;save;"..S("OK").."]"
minetest.show_formspec(player_name, "fishing:settings", formspec) minetest.show_formspec(player_name, "fishing:settings", formspec)
end end
local inc = function(value, field, min, max) local inc = function(value, field, min, max)
local v local inc = tonumber(field)
if field == "+1" then local v = value
v = value + 1 if inc ~= nil then
elseif field == "+10" then v = value + inc
v = value + 10
elseif field == "+60" then
v = value + 60
elseif field == "+600" then
v = value + 600
elseif field == "-1" then
v = value - 1
elseif field == "-10" then
v = value - 10
elseif field == "-60" then
v = value - 60
elseif field == "-600" then
v = value - 600
else -- useless, prevent crash
return value
end end
if v > max then if v > max then
v = max return max
end end
if v < min then if v < min then
v = min return min
end end
return v return v
end end
local bool = function(field) local bool = function(field)
local v return field ~= "true"
if field == "true" then
v = false
else
v = true
end
return v
end end
minetest.register_on_player_receive_fields(function(player, formname, fields) minetest.register_on_player_receive_fields(function(player, formname, fields)
@@ -250,8 +229,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
fishing_setting.tmp_setting["fish_chance"] = inc(fishing_setting.tmp_setting["fish_chance"], fields["cfish"], 1, 100) fishing_setting.tmp_setting["fish_chance"] = inc(fishing_setting.tmp_setting["fish_chance"], fields["cfish"], 1, 100)
elseif fields["cshark"] then elseif fields["cshark"] then
fishing_setting.tmp_setting["shark_chance"] = inc(fishing_setting.tmp_setting["shark_chance"], fields["cshark"], 1, 100) fishing_setting.tmp_setting["shark_chance"] = inc(fishing_setting.tmp_setting["shark_chance"], fields["cshark"], 1, 100)
elseif fields["ctresor"] then elseif fields["ctreasure"] then
fishing_setting.tmp_setting["tresor_chance"] = inc(fishing_setting.tmp_setting["tresor_chance"], fields["ctresor"], 1, 100) fishing_setting.tmp_setting["treasure_chance"] = inc(fishing_setting.tmp_setting["treasure_chance"], fields["ctreasure"], 1, 100)
elseif fields["bvrange"] then elseif fields["bvrange"] then
fishing_setting.tmp_setting["bobber_view_range"] = inc(fishing_setting.tmp_setting["bobber_view_range"], fields["bvrange"], 4, 20) fishing_setting.tmp_setting["bobber_view_range"] = inc(fishing_setting.tmp_setting["bobber_view_range"], fields["bvrange"], 4, 20)
elseif fields["cworm"] then elseif fields["cworm"] then
@@ -264,8 +243,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
fishing_setting.tmp_setting["simple_deco_fishing_pole"] = bool(fields["poledeco"]) fishing_setting.tmp_setting["simple_deco_fishing_pole"] = bool(fields["poledeco"])
elseif fields["wearout"] then elseif fields["wearout"] then
fishing_setting.tmp_setting["wear_out"] = bool(fields["wearout"]) fishing_setting.tmp_setting["wear_out"] = bool(fields["wearout"])
elseif fields["tresorenable"] then elseif fields["treasureenable"] then
fishing_setting.tmp_setting["tresor_enable"] = bool(fields["tresorenable"]) fishing_setting.tmp_setting["treasure_enable"] = bool(fields["treasureenable"])
elseif fields["newworm"] then elseif fields["newworm"] then
fishing_setting.tmp_setting["new_worm_source"] = bool(fields["newworm"]) fishing_setting.tmp_setting["new_worm_source"] = bool(fields["newworm"])
elseif fields["wormmob"] then elseif fields["wormmob"] then
@@ -279,8 +258,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
if fields["classement"] then if fields["classement"] then
local formspec = fishing_setting.func.get_stat() local formspec = fishing_setting.func.get_stat()
minetest.show_formspec(player_name, "fishing:classement", formspec) minetest.show_formspec(player_name, "fishing:classement", formspec)
elseif fields["concours"] then elseif fields["contest"] then
fishing_setting.func.on_show_settings_concours(player_name) fishing_setting.func.on_show_settings_contest(player_name)
elseif fields["configuration"] then elseif fields["configuration"] then
fishing_setting.func.on_show_settings(player_name) fishing_setting.func.on_show_settings(player_name)
end end
@@ -313,7 +292,7 @@ end
minetest.register_on_shutdown(function() minetest.register_on_shutdown(function()
minetest.log("action", "[fishing] Server shuts down. saving trophies table") minetest.log("action", "[fishing] Server shuts down. saving trophies table")
fishing_setting.func.save_trophies() fishing_setting.func.save_trophies()
fishing_setting.func.save_concours() fishing_setting.func.save_contest()
end) end)
@@ -338,8 +317,8 @@ end
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
local player_name = player:get_player_name() local player_name = player:get_player_name()
if fishing_setting.concours["concours"] == true then if fishing_setting.contest["contest"] == true then
minetest.chat_send_player(player_name, fishing_setting.func.S("A fishing contest is in progress. (remaining time %s)"):format(fishing_setting.func.timetostr(fishing_setting.concours["duration"]))) minetest.chat_send_player(player_name, fishing_setting.func.S("A fishing contest is in progress. (remaining time %s)"):format(fishing_setting.func.timetostr(fishing_setting.contest["duration"])))
end end
end) end)
@@ -353,7 +332,7 @@ function fishing_setting.func.add_to_trophies(player, fish, desc)
end end
fishing_setting.trophies[fish][player_name] = (fishing_setting.trophies[fish][player_name] or 0) + 1 fishing_setting.trophies[fish][player_name] = (fishing_setting.trophies[fish][player_name] or 0) + 1
if fishing_setting.trophies[fish][player_name]%100 == 0 then if fishing_setting.trophies[fish][player_name]%100 == 0 then
minetest.chat_send_player(player_name, fishing_setting.func.S("You win a new trophie, you have catched %s " .. fish.."."):format(fishing_setting.trophies[fish][player_name])) minetest.chat_send_player(player_name, fishing_setting.func.S("You win a new trophy, you have caught %s " .. fish.."."):format(fishing_setting.trophies[fish][player_name]))
local inv = player:get_inventory() local inv = player:get_inventory()
local name = "fishing:trophy_"..fish local name = "fishing:trophy_"..fish
if inv:room_for_item("main", {name=name, count=1, wear=0, metadata=""}) then if inv:room_for_item("main", {name=name, count=1, wear=0, metadata=""}) then
@@ -363,24 +342,25 @@ function fishing_setting.func.add_to_trophies(player, fish, desc)
end end
end end
if fishing_setting.concours["concours"] ~= nil and fishing_setting.concours["concours"] == true then if fishing_setting.contest["contest"] ~= nil and fishing_setting.contest["contest"] == true then
if fishing_setting.concours[fish] == nil then if fishing_setting.contest[fish] == nil then
fishing_setting.concours[fish] = {} fishing_setting.contest[fish] = {}
end end
fishing_setting.concours[fish][player_name] = (fishing_setting.concours[fish][player_name] or 0) + 1 fishing_setting.contest[fish][player_name] = (fishing_setting.contest[fish][player_name] or 0) + 1
minetest.chat_send_all(fishing_setting.func.S("Yeah, %s catch "..desc):format(player_name)) minetest.chat_send_all(fishing_setting.func.S("Yeah, %s caught "..desc):format(player_name))
end end
end end
end end
--Menu fishing configuration -- Menu: fishing configuration/contest
fishing_setting.func.on_show_admin_menu = function(player_name) fishing_setting.func.on_show_admin_menu = function(player_name)
local formspec = "size[5,5]label[1.6,0;FISHING MENU]".. local S = fishing_setting.func.S
"button[1,0.5;3,1;classement;Classement concours]".. local formspec = "size[5,5]label[1.6,0;"..S("Fishing Menu").."]"..
"button[1,1.5;3,1;concours;Concours]".. "button[0.5,0.5;4,1;classement;"..S("Contest rankings").."]"..
"button[1,2.5;3,1;configuration;Configuration]".. "button[0.5,1.5;4,1;contest;"..S("Contests").."]"..
"button_exit[1,4.5;3,1;close;Close]" "button[0.5,2.5;4,1;configuration;"..S("Configuration").."]"..
"button_exit[1,4.5;3,1;close;"..S("Close").."]"
minetest.show_formspec(player_name, "fishing:admin_conf", formspec) minetest.show_formspec(player_name, "fishing:admin_conf", formspec)
end end
@@ -406,48 +386,48 @@ end
--function save settings --function save settings
function fishing_setting.func.save_concours() function fishing_setting.func.save_contest()
local input = io.open(fishing_setting.file_concours, "w") local input = io.open(fishing_setting.file_contest, "w")
if input then if input then
input:write(minetest.serialize(fishing_setting.concours)) input:write(minetest.serialize(fishing_setting.contest))
input:close() input:close()
else else
minetest.log("action","Open failed (mode:w) of " .. fishing_setting.file_concours) minetest.log("action","Open failed (mode:w) of " .. fishing_setting.file_contest)
end end
end end
--function load councours data from file --function load councours data from file
function fishing_setting.func.load_concours() function fishing_setting.func.load_contest()
local file = io.open(fishing_setting.file_concours, "r") local file = io.open(fishing_setting.file_contest, "r")
local settings = {} local settings = {}
fishing_setting.concours = {["concours"] = false, ["duration"] = 3600, ["bobber_nb"] = 4} fishing_setting.contest = {["contest"] = false, ["duration"] = 3600, ["bobber_nb"] = 4}
if file then if file then
settings = minetest.deserialize(file:read("*all")) settings = minetest.deserialize(file:read("*all"))
file:close() file:close()
if settings ~= nil and type(settings) == "table" then if settings ~= nil and type(settings) == "table" then
if settings["concours"] ~= nil then if settings["contest"] ~= nil then
fishing_setting.concours["concours"] = settings["concours"] fishing_setting.contest["contest"] = settings["contest"]
end end
if settings["duration"] ~= nil then if settings["duration"] ~= nil then
fishing_setting.concours["duration"] = settings["duration"] fishing_setting.contest["duration"] = settings["duration"]
end end
if settings["bobber_nb"] ~= nil then if settings["bobber_nb"] ~= nil then
fishing_setting.concours["bobber_nb"] = settings["bobber_nb"] fishing_setting.contest["bobber_nb"] = settings["bobber_nb"]
end end
if settings["fish_raw"] ~= nil then if settings["fish_raw"] ~= nil then
fishing_setting.concours["fish_raw"] = settings["fish_raw"] fishing_setting.contest["fish_raw"] = settings["fish_raw"]
end end
if settings["clownfish_raw"] ~= nil then if settings["clownfish_raw"] ~= nil then
fishing_setting.concours["clownfish_raw"] = settings["clownfish_raw"] fishing_setting.contest["clownfish_raw"] = settings["clownfish_raw"]
end end
if settings["bluewhite_raw"] ~= nil then if settings["bluewhite_raw"] ~= nil then
fishing_setting.concours["bluewhite_raw"] = settings["bluewhite_raw"] fishing_setting.contest["bluewhite_raw"] = settings["bluewhite_raw"]
end end
if settings["shark_raw"] ~= nil then if settings["shark_raw"] ~= nil then
fishing_setting.concours["shark_raw"] = settings["shark_raw"] fishing_setting.contest["shark_raw"] = settings["shark_raw"]
end end
if settings["pike_raw"] ~= nil then if settings["pike_raw"] ~= nil then
fishing_setting.concours["pike_raw"] = settings["pike_raw"] fishing_setting.contest["pike_raw"] = settings["pike_raw"]
end end
end end
end end
@@ -455,66 +435,67 @@ end
--Menu fishing configuration --Menu fishing configuration
fishing_setting.func.on_show_settings_concours = function(player_name) fishing_setting.func.on_show_settings_contest = function(player_name)
local S = fishing_setting.func.S
if not fishing_setting.tmp_setting then if not fishing_setting.tmp_setting then
fishing_setting.tmp_setting = { ["concours"] = (fishing_setting.concours["concours"] or false), fishing_setting.tmp_setting = { ["contest"] = (fishing_setting.contest["contest"] or false),
["duration"] = (math.floor(fishing_setting.concours["duration"]) or 3600), ["duration"] = (math.floor(fishing_setting.contest["duration"]) or 3600),
["bobber_nb"] = (fishing_setting.concours["bobber_nb"] or 2), ["bobber_nb"] = (fishing_setting.contest["bobber_nb"] or 2),
["reset"] = "" ["reset"] = ""
} }
end end
local formspec = "size[6.1,7]label[1.9,0;FISHING CONCOURS]".. local formspec = "size[6.1,7]label[1.9,0;"..S("Fishing contest").."]"..
--Time concours --Time contest
"label[2.2,0.5;Duration(in sec)]".. "label[2.2,0.5;"..S("Duration(in sec)").."]"..
"button[0.8,1;1,1;duration;-60]".. "button[0.8,1;1,1;duration;-60]"..
"button[1.8,1;1,1;duration;-600]".. "button[1.8,1;1,1;duration;-600]"..
"label[2.7,1.2;"..tostring(fishing_setting.tmp_setting["duration"]).."]".. "label[2.7,1.2;"..tostring(fishing_setting.tmp_setting["duration"]).."]"..
"button[3.5,1;1,1;duration;+600]".. "button[3.5,1;1,1;duration;+600]"..
"button[4.5,1;1,1;duration;+60]".. "button[4.5,1;1,1;duration;+60]"..
--bobber nb --bobber nb
"label[2,2;Bobber number limit]".. "label[2,2;"..S("Bobber number limit").."]"..
"button[1.8,2.5;1,1;bobbernb;-1]".. "button[1.8,2.5;1,1;bobbernb;-1]"..
"label[2.9,2.7;"..tostring(fishing_setting.tmp_setting["bobber_nb"]).."]".. "label[2.9,2.7;"..tostring(fishing_setting.tmp_setting["bobber_nb"]).."]"..
"button[3.5,2.5;1,1;bobbernb;+1]".. "button[3.5,2.5;1,1;bobbernb;+1]"..
--concours enable --contest enable
"label[0.8,3.8;concours enable]".. "label[0.8,3.8;"..S("Enable contests").."]"..
"button[4.5,3.6;1,1;concours;"..tostring(fishing_setting.tmp_setting["concours"]).."]".. "button[4.5,3.6;1,1;contest;"..tostring(fishing_setting.tmp_setting["contest"]).."]"..
--reset --reset
"label[0.8,5.2;reset classements (type 'yes')]".. "label[0.8,5.2;"..S("Reset rankings (type 'yes')").."]"..
"field[4.8,5.4;1,1;reset;;]".. "field[4.8,5.4;1,1;reset;;]"..
"button_exit[0.8,6.2;1.5,1;save;Abort]".. "button_exit[0.8,6.2;1.5,1;save;"..S("Abort").."]"..
"button_exit[4,6.2;1.5,1;save;Ok]" "button_exit[4,6.2;1.5,1;save;"..S("OK").."]"
minetest.show_formspec(player_name, "fishing:concours", formspec) minetest.show_formspec(player_name, "fishing:contest", formspec)
end end
minetest.register_on_player_receive_fields(function(player, formname, fields) minetest.register_on_player_receive_fields(function(player, formname, fields)
if formname == "fishing:concours" then if formname == "fishing:contest" then
local name = player:get_player_name() local name = player:get_player_name()
if not name then return end if not name then return end
if fields["save"] == "Ok" then if fields["save"] == "Ok" then
if fields["reset"] and fields["reset"]:lower() == "yes" then if fields["reset"] and fields["reset"]:lower() == "yes" then
fishing_setting.concours["fish_raw"] = {} fishing_setting.contest["fish_raw"] = {}
fishing_setting.concours["clownfish_raw"] = {} fishing_setting.contest["clownfish_raw"] = {}
fishing_setting.concours["bluewhite_raw"] = {} fishing_setting.contest["bluewhite_raw"] = {}
fishing_setting.concours["shark_raw"] = {} fishing_setting.contest["shark_raw"] = {}
fishing_setting.concours["pike_raw"] = {} fishing_setting.contest["pike_raw"] = {}
end end
local progress = (fishing_setting.concours["concours"] or false) local progress = (fishing_setting.contest["contest"] or false)
fishing_setting.concours["duration"] = fishing_setting.tmp_setting["duration"] fishing_setting.contest["duration"] = fishing_setting.tmp_setting["duration"]
fishing_setting.concours["concours"] = fishing_setting.tmp_setting["concours"] fishing_setting.contest["contest"] = fishing_setting.tmp_setting["contest"]
fishing_setting.concours["bobber_nb"] = fishing_setting.tmp_setting["bobber_nb"] fishing_setting.contest["bobber_nb"] = fishing_setting.tmp_setting["bobber_nb"]
if progress == false and fishing_setting.tmp_setting["concours"] == true then if progress == false and fishing_setting.tmp_setting["contest"] == true then
fishing_setting.concours["concours"] = true fishing_setting.contest["contest"] = true
fishing_setting.concours["warning_said"] = false fishing_setting.contest["warning_said"] = false
local time = fishing_setting.func.timetostr(fishing_setting.concours["duration"]) local time = fishing_setting.func.timetostr(fishing_setting.contest["duration"])
minetest.chat_send_all(fishing_setting.func.S("Attention, Fishing contest start (duration %s)!!!"):format(time)) minetest.chat_send_all(fishing_setting.func.S("Attention, Fishing contest start (duration %s)!!!"):format(time))
minetest.sound_play("fishing_contest_start",{gain=0.8}) minetest.sound_play("fishing_contest_start",{gain=0.8})
elseif progress == true and fishing_setting.tmp_setting["concours"] == false then elseif progress == true and fishing_setting.tmp_setting["contest"] == false then
fishing_setting.concours["concours"] = false fishing_setting.contest["contest"] = false
end end
fishing_setting.func.save_concours() fishing_setting.func.save_contest()
fishing_setting.tmp_setting = nil fishing_setting.tmp_setting = nil
return return
elseif fields["quit"] or fields["abort"] then elseif fields["quit"] or fields["abort"] then
@@ -522,14 +503,14 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
return return
elseif fields["duration"] then elseif fields["duration"] then
fishing_setting.tmp_setting["duration"] = inc(fishing_setting.tmp_setting["duration"], fields["duration"], 120, 14400) fishing_setting.tmp_setting["duration"] = inc(fishing_setting.tmp_setting["duration"], fields["duration"], 120, 14400)
elseif fields["concours"] then elseif fields["contest"] then
fishing_setting.tmp_setting["concours"] = bool(fields["concours"]) fishing_setting.tmp_setting["contest"] = bool(fields["contest"])
elseif fields["bobbernb"] then elseif fields["bobbernb"] then
fishing_setting.tmp_setting["bobber_nb"] = inc(fishing_setting.tmp_setting["bobber_nb"], fields["bobbernb"], 1, 8) fishing_setting.tmp_setting["bobber_nb"] = inc(fishing_setting.tmp_setting["bobber_nb"], fields["bobbernb"], 1, 8)
else else
return return
end end
fishing_setting.func.on_show_settings_concours(name) fishing_setting.func.on_show_settings_contest(name)
end end
end) end)
@@ -572,16 +553,17 @@ end
function fishing_setting.func.get_stat() function fishing_setting.func.get_stat()
local winners= {} local winners= {}
for k,v in pairs(fishing_setting.concours) do for k,v in pairs(fishing_setting.contest) do
if string.find(k, "_raw") ~= nil then if string.find(k, "_raw") ~= nil then
if fishing_setting.concours[k] ~= nil then if fishing_setting.contest[k] ~= nil then
winners[k] = fishing_setting.func.set_winners(fishing_setting.concours[k]) winners[k] = fishing_setting.func.set_winners(fishing_setting.contest[k])
else else
winners[k] = {} winners[k] = {}
end end
end end
end end
local formspec = {"size[12,8]label[3.7,0;FISHING CONCOURS CLASSEMENT]"} local S = fishing_setting.func.S
local formspec = {"size[12,8]label[3.7,0;"..S("Fishing contest rankings").."]"}
local X = 0 local X = 0
local Y local Y
for fish, fishers in pairs(winners) do for fish, fishers in pairs(winners) do
@@ -589,14 +571,14 @@ function fishing_setting.func.get_stat()
table.insert(formspec, "label["..(X+0.4)..",0.5;"..string.gsub(fish, "_raw", ""):upper().."]") --fish name table.insert(formspec, "label["..(X+0.4)..",0.5;"..string.gsub(fish, "_raw", ""):upper().."]") --fish name
for _,s in ipairs(fishers) do for _,s in ipairs(fishers) do
for pl,nb in pairs(s) do for pl,nb in pairs(s) do
table.insert(formspec, "label["..(X) ..","..Y..";"..tostring(nb).."]") -- nb fish catched table.insert(formspec, "label["..(X) ..","..Y..";"..tostring(nb).."]") -- nb fish caught
table.insert(formspec, "label["..(X+0.5) ..","..Y..";"..tostring(pl).."]") -- playername table.insert(formspec, "label["..(X+0.5) ..","..Y..";"..tostring(pl).."]") -- playername
end end
Y = Y + 0.4 Y = Y + 0.4
end end
X = X + 2.3 X = X + 2.3
end end
table.insert(formspec, "button_exit[5.5,7.5;1.2,1;close;CLose]") table.insert(formspec, "button_exit[5.5,7.5;1.2,1;close;"..S("Close").."]")
return table.concat(formspec) return table.concat(formspec)
end end

26
init.lua
View File

@@ -21,9 +21,9 @@ fishing_setting.func = {}
fishing_setting.is_creative_mode = minetest.setting_getbool("creative_mode") fishing_setting.is_creative_mode = minetest.setting_getbool("creative_mode")
fishing_setting.file_settings = minetest.get_worldpath() .. "/fishing_config.txt" fishing_setting.file_settings = minetest.get_worldpath() .. "/fishing_config.txt"
fishing_setting.file_trophies = minetest.get_worldpath() .. "/fishing_trophies.txt" fishing_setting.file_trophies = minetest.get_worldpath() .. "/fishing_trophies.txt"
fishing_setting.file_concours = minetest.get_worldpath() .. "/fishing_concours.txt" fishing_setting.file_contest = minetest.get_worldpath() .. "/fishing_contest.txt"
fishing_setting.settings = {} fishing_setting.settings = {}
fishing_setting.concours = {} fishing_setting.contest = {}
--for random object --for random object
random_objects = {} random_objects = {}
fishing_setting.baits = {} fishing_setting.baits = {}
@@ -51,8 +51,8 @@ fishing_setting.settings["simple_deco_fishing_pole"] = SIMPLE_DECO_FISHING_POLE
fishing_setting.settings["bobber_view_range"] = BOBBER_VIEW_RANGE fishing_setting.settings["bobber_view_range"] = BOBBER_VIEW_RANGE
fishing_setting.settings["fish_chance"] = FISH_CHANCE fishing_setting.settings["fish_chance"] = FISH_CHANCE
fishing_setting.settings["shark_chance"] = SHARK_CHANCE fishing_setting.settings["shark_chance"] = SHARK_CHANCE
fishing_setting.settings["tresor_chance"] = TRESOR_CHANCE fishing_setting.settings["treasure_chance"] = TRESOR_CHANCE
fishing_setting.settings["tresor_enable"] = TRESOR_RANDOM_ENABLE fishing_setting.settings["treasure_enable"] = TRESOR_RANDOM_ENABLE
fishing_setting.settings["escape_chance"] = ESCAPE_CHANCE fishing_setting.settings["escape_chance"] = ESCAPE_CHANCE
-- load config file if exist in worldpath -- load config file if exist in worldpath
@@ -72,24 +72,24 @@ dofile(path .."poles.lua")
--random hungry bait --random hungry bait
fishing_setting.func.hungry_random() fishing_setting.func.hungry_random()
--load table catched fish by players --load table caught fish by players
fishing_setting.func.load_trophies() fishing_setting.func.load_trophies()
--load table concours --load table contest
fishing_setting.func.load_concours() fishing_setting.func.load_contest()
minetest.register_globalstep(function(dtime) minetest.register_globalstep(function(dtime)
if fishing_setting.concours["concours"] ~= nil and fishing_setting.concours["concours"] == true then if fishing_setting.contest["contest"] ~= nil and fishing_setting.contest["contest"] == true then
fishing_setting.concours["duration"] = fishing_setting.concours["duration"] - dtime fishing_setting.contest["duration"] = fishing_setting.contest["duration"] - dtime
if fishing_setting.concours["duration"] < 30 and fishing_setting.concours["warning_said"] ~= true then if fishing_setting.contest["duration"] < 30 and fishing_setting.contest["warning_said"] ~= true then
minetest.chat_send_all(fishing_setting.func.S("WARNING, Fishing contest will finish in 30 seconds.")) minetest.chat_send_all(fishing_setting.func.S("WARNING, Fishing contest will finish in 30 seconds."))
fishing_setting.concours["warning_said"] = true fishing_setting.contest["warning_said"] = true
end end
if fishing_setting.concours["duration"] < 0 then if fishing_setting.contest["duration"] < 0 then
minetest.chat_send_all(fishing_setting.func.S("End of fishing contest.")) minetest.chat_send_all(fishing_setting.func.S("End of fishing contest."))
minetest.sound_play("fishing_contest_end",{gain=0.8}) minetest.sound_play("fishing_contest_end",{gain=0.8})
fishing_setting.concours["concours"] = false fishing_setting.contest["contest"] = false
fishing_setting.func.show_result() fishing_setting.func.show_result()
end end
end end

10
locale/de.txt
View File

@@ -50,11 +50,11 @@ Roasted Northern Pike = Gebratener Hecht
### functions.lua ### ### functions.lua ###
You don't have the server priviledge! = You don't have the server priviledge! =
You win a new trophie, you have catched %s fish. = You win a new trophy, you have caught %s fish. =
You win a new trophie, you have catched %s shark. = You win a new trophy, you have caught %s shark. =
You win a new trophie, you have catched %s pike. = You win a new trophy, you have caught %s pike. =
You win a new trophie, you have catched %s clownfish. = You win a new trophy, you have caught %s clownfish. =
You win a new trophie, you have catched %s bluewhite. = You win a new trophy, you have caught %s bluewhite. =
### material.lua ### ### material.lua ###

26
locale/fr.txt
View File

@@ -52,19 +52,19 @@ Roasted Northern Pike = Brochet grille
### functions.lua ### ### functions.lua ###
You don't have the server priviledge! = Vous n'avez pas les privilèges serveur! You don't have the server priviledge! = Vous n'avez pas les privilèges serveur!
You win a new trophie, you have catched %s fish. = Vous gagnez un trophee, vous avez attrape %s poissons. You win a new trophy, you have caught %s fish. = Vous gagnez un trophee, vous avez attrape %s poissons.
You win a new trophie, you have catched %s shark. = Vous gagnez un trophee, vous avez attrape %s requins. You win a new trophy, you have caught %s shark. = Vous gagnez un trophee, vous avez attrape %s requins.
You win a new trophie, you have catched %s pike. = Vous gagnez un trophee, vous avez attrape %s brochets. You win a new trophy, you have caught %s pike. = Vous gagnez un trophee, vous avez attrape %s brochets.
You win a new trophie, you have catched %s clownfish. = Vous gagnez un trophee, vous avez attrape %s poissons clown. You win a new trophy, you have caught %s clownfish. = Vous gagnez un trophee, vous avez attrape %s poissons clown.
You win a new trophie, you have catched %s bluewhite. = Vous gagnez un trophee, vous avez attrape %s poissons bleu. You win a new trophy, you have caught %s bluewhite. = Vous gagnez un trophee, vous avez attrape %s poissons bleu.
Good luck to %s, He catch the tresor, %s! = %s a de la chance, Il attrappe le tresor, %s! Good luck to %s, He catch the treasure, %s! = %s a de la chance, Il attrappe le tresor, %s!
You catch the tresor, %s! = Vous attrappez le tresor, %s! You catch the treasure, %s! = Vous attrappez le tresor, %s!
Yeah, %s catch a Fish. = Wouah, %s a attrappe un poisson Yeah, %s caught a Fish. = Wouah, %s a attrappe un poisson
Yeah, %s catch a Clownfish. = Wouah, %s a attrappe un poisson clown. Yeah, %s caught a Clownfish. = Wouah, %s a attrappe un poisson clown.
Yeah, %s catch a Bluewhite. = Wouah, %s a attrappe un poisson bleu. Yeah, %s caught a Bluewhite. = Wouah, %s a attrappe un poisson bleu.
Yeah, %s catch a Northern Pike. = Wouah, %s a attrappe un brochet. Yeah, %s caught a Northern Pike. = Wouah, %s a attrappe un brochet.
Yeah, %s catch a small Shark. = Wouah, %s a attrappe un requin. Yeah, %s caught a small Shark. = Wouah, %s a attrappe un requin.
A fishing contest is in progress. (remaining time %s) = Un concour de peche est en cours. (temps restant %s) A fishing contest is in progress. (remaining time %s) = Un concours de peche est en cours. (temps restant %s)
Attention, Fishing contest start(duration %s)!!! = Attention, un concours de peche viens de commence(duree %s)!!! Attention, Fishing contest start(duration %s)!!! = Attention, un concours de peche viens de commence(duree %s)!!!
WARNING, Fishing contest will finish in 30 seconds. = Attention, le concours de peche se termine dans 30 secondes WARNING, Fishing contest will finish in 30 seconds. = Attention, le concours de peche se termine dans 30 secondes
End of fishing contest. = Le concours est fini End of fishing contest. = Le concours est fini

51
locale/template.txt
View File

@@ -51,22 +51,49 @@ Roasted Northern Pike =
### functions.lua ### ### functions.lua ###
You don't have the server priviledge! = You don't have the server priviledge! =
You win a new trophie, you have catched %s fish. = You win a new trophy, you have caught %s fish. =
You win a new trophie, you have catched %s shark. = You win a new trophy, you have caught %s shark. =
You win a new trophie, you have catched %s pike. = You win a new trophy, you have caught %s pike. =
You win a new trophie, you have catched %s clownfish. = You win a new trophy, you have caught %s clownfish. =
You win a new trophie, you have catched %s bluewhite. = You win a new trophy, you have caught %s bluewhite. =
Good luck to %s, He catch the tresor, %s! = Lucky %s, he caught the treasure, %s! =
You catch the tresor, %s! = You caught the treasure, %s!=
Yeah, %s catch a Fish. = Yeah, %s caught a Fish. =
Yeah, %s catch a Clownfish. = Yeah, %s caught a Clownfish. =
Yeah, %s catch a Bluefish. = Yeah, %s caught a Bluefish. =
Yeah, %s catch a Northern Pike. = Yeah, %s caught a Northern Pike. =
Yeah, %s catch a small Shark. = Yeah, %s caught a small Shark. =
A fishing contest is in progress. (remaining time %s) = A fishing contest is in progress. (remaining time %s) =
Attention, Fishing contest start(duration %s)!!! = Attention, Fishing contest start(duration %s)!!! =
WARNING, Fishing contest will finish in 30 seconds. = WARNING, Fishing contest will finish in 30 seconds. =
End of fishing contest. = End of fishing contest. =
Fishing configuration =
Fish chance =
Shark chance =
Treasure chance =
Worm chance =
Escape chance =
Bobber view range =
Display messages in chat =
Simple pole deco =
Poles wearout =
Enable treasure =
New worm source (reboot) =
Worm is a mob (reboot) =
Abort =
OK =
Fishing Menu =
Contest rankings =
Contests =
Configuration =
Close =
Fishing contest =
Duration(in sec) =
Bobber number limit =
Enable contests =
Reset rankings (type 'yes') =
Fishing contest rankings =
### material.lua ### ### material.lua ###
Show information about hunger fish = Show information about hunger fish =

4
poles.lua
View File

@@ -35,8 +35,8 @@ local bobbermax = pole["bobber_max"]
--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
if fishing_setting.concours["concours"] ~= nil and fishing_setting.concours["concours"] == true then if fishing_setting.contest["contest"] ~= nil and fishing_setting.contest["contest"] == true then
bobber_max = fishing_setting.concours["bobber_nb"] bobber_max = fishing_setting.contest["bobber_nb"]
else else
bobber_max = bobbermax bobber_max = bobbermax
end end

4
prizes.lua
View File

@@ -37,10 +37,10 @@ local stuff = {
fishing_setting.prizes["stuff"] = fishing_setting.func.ignore_mod(stuff) fishing_setting.prizes["stuff"] = fishing_setting.func.ignore_mod(stuff)
local tresor = { local treasure = {
{"default", "mese", 0, "a mese block."}, {"default", "mese", 0, "a mese block."},
{"default", "nyancat", 0, "a Nyan Cat."}, {"default", "nyancat", 0, "a Nyan Cat."},
{"default", "diamondblock", 0, "a Diamond Block."}, {"default", "diamondblock", 0, "a Diamond Block."},
} }
fishing_setting.prizes["tresor"] = fishing_setting.func.ignore_mod(tresor) fishing_setting.prizes["treasure"] = fishing_setting.func.ignore_mod(treasure)

4
settings.txt
View File

@@ -7,6 +7,6 @@ WORM_IS_MOB = true
WORM_CHANCE = 66 WORM_CHANCE = 66
FISH_CHANCE = 60 FISH_CHANCE = 60
SHARK_CHANCE = 50 SHARK_CHANCE = 50
TRESOR_CHANCE = 5 TREASURE_CHANCE = 5
TRESOR_RANDOM_ENABLE = true TREASURE_RANDOM_ENABLE = true
ESCAPE_CHANCE = 5 ESCAPE_CHANCE = 5