1
0
mirror of https://github.com/MinetestForFun/fishing.git synced 2025-07-21 17:40:27 +02:00

finished rewriting

This commit is contained in:
2015-06-26 22:33:51 +02:00
parent b54cc08fe3
commit 3af28b21b7
69 changed files with 1296 additions and 398 deletions

View File

@ -1,12 +1,12 @@
--function save settings
function fishing_setting.func.save()
local input = io.open(fishing_setting.file, "w")
local input = io.open(fishing_setting.file_settings, "w")
if input then
input:write(minetest.serialize(fishing_setting.settings))
input:close()
else
minetest.log("action","Open failed (mode:w) of " .. fishing_setting.file)
minetest.log("action","Open failed (mode:w) of " .. fishing_setting.file_settings)
end
end
@ -51,19 +51,20 @@ function fishing_setting.func.set_settings(new_settings, settings)
new_settings["shark_chance"] = settings["shark_chance"]
end
if settings["tresor_timer"] ~= nil then
new_settings["tresor_timer"] = settings["tresor_timer"]
if settings["tresor_enable"] ~= nil then
new_settings["tresor_enable"] = settings["tresor_enable"]
end
if settings["tresor_random_enable"] ~= nil then
new_settings["tresor_random_enable"] = settings["tresor_random_enable"]
end
if settings["escape_chance"] ~= nil then
new_settings["escape_chance"] = settings["escape_chance"]
end
end
--function load settings from file
function fishing_setting.func.load()
local file = io.open(fishing_setting.file, "r")
local file = io.open(fishing_setting.file_settings, "r")
local settings = {}
if file then
settings = minetest.deserialize(file:read("*all"))
@ -85,95 +86,51 @@ function fishing_setting.func.wear_value(wear)
return used
end
minetest.register_on_shutdown(function()
minetest.log("action", "[fishing] Server shuts down. Saving config")
fishing_setting.func.save()
end)
-- function return table where mods actived
function fishing_setting.func.ignore_mod(list)
local listOk = {}
for i,v in ipairs(list) do
if minetest.get_modpath(v[1]) ~= nil then
table.insert(listOk, v)
end
end
return listOk
end
--function random hungry by bait type
function fishing_setting.func.hungry_random()
for i,a in pairs(fishing_setting.baits) do
fishing_setting.baits[i]["hungry"] = math.random(15, 80)
print("hungry " ..i..": " ..fishing_setting.baits[i]["hungry"])
end
--change hungry after random time, min 0h30, max 6h00
minetest.after(math.random(1, 12)*1800,function() fishing_setting.func.hungry_random() end)
end
-- show notification when player catch tresor
function fishing_setting.func.notify(f_name, tresor)
local title = f_name .." catch a tresor"
local title = "Good luck to "..f_name ..", He catch the tresor, "..tresor[4].."!"
for _, player in ipairs(minetest.get_connected_players()) do
local name = player:get_player_name()
--FIXME display message
--if name == f_name then
-- fishing_setting.func.notify_send(name, tresor, message)
--else
fishing_setting.func.notify_send(name, title, tresor[4])
--end
local player_name = player:get_player_name()
if player_name == f_name then
minetest.chat_send_player(player_name, "You catch the tresor, "..tresor[4].."!")
else
minetest.chat_send_player(player_name, title)
end
end
end
-- show notification when player catch tresor
function fishing_setting.func.notify_send(name, title, message)
local player = minetest.get_player_by_name(name)
local one = player:hud_add({
hud_elem_type = "image",
name = "award_bg",
scale = {x = 1, y = 1},
text = "bg_default.png",
position = {x = 0.5, y = 0},
offset = {x = 0, y = 138},
alignment = {x = 0, y = -1}
})
local two = player:hud_add({
hud_elem_type = "text",
name = "award_au",
number = 0xFFFFFF,
scale = {x = 100, y = 20},
text = title,
position = {x = 0.5, y = 0},
offset = {x = 0, y = 40},
alignment = {x = 0, y = -1}
})
local three = player:hud_add({
hud_elem_type = "text",
name = "award_title",
number = 0xFFFFFF,
scale = {x = 100, y = 20},
text = message,
position = {x = 0.5, y = 0},
offset = {x = 30, y = 100},
alignment = {x = 0, y = -1}
})
local four = player:hud_add({
hud_elem_type = "image",
name = "award_icon",
scale = {x = 4, y = 4},
text = "fishing_pole_perfect.png",
position = {x = 0.5, y = 0},
offset = {x = -81.5, y = 126},
alignment = {x = 0, y = -1}
})
minetest.after(6, function()
player:hud_remove(one)
player:hud_remove(two)
player:hud_remove(three)
player:hud_remove(four)
end)
end
--Menu fishing configuration
fishing_setting.func.on_show_settings = function(name)
fishing_setting.func.on_show_settings = function(player_name)
if not fishing_setting.tmp_setting then
fishing_setting.tmp_setting = {}
fishing_setting.func.set_settings(fishing_setting.tmp_setting, fishing_setting.settings)
end
local formspec = "size[11,9]label[4,0;FISHING CONFIGURATION]"..
local formspec = "size[11,9]bgcolor[#99a8ba;]label[4,0;FISHING CONFIGURATION]"..
--Chance fish
"label[1.6,0.5;Chance fish]"..
"button[0,1;1,1;cfish;-1]"..
@ -195,25 +152,23 @@ fishing_setting.func.on_show_settings = function(name)
"label[2.1,4.2;"..tostring(fishing_setting.tmp_setting["tresor_chance"]).."]"..
"button[2.7,4;1,1;ctresor;+10]"..
"button[3.7,4;1,1;ctresor;+1]"..
--Bobber view range
"label[7.2,0.5;Bobber view range]"..
"button[7,1;1,1;bvrange;-1]"..
"label[8.1,1.2;"..tostring(fishing_setting.tmp_setting["bobber_view_range"]).."]"..
"button[8.7,1;1,1;bvrange;+1]"..
--Chance worm
"label[7.5,2;Chance worm]"..
"button[6,2.5;1,1;cworm;-1]"..
"button[7,2.5;1,1;cworm;-10]"..
"label[8.1,2.7;"..tostring(fishing_setting.tmp_setting["worm_chance"]).."]"..
"button[8.7,2.5;1,1;cworm;+10]"..
"button[9.7,2.5;1,1;cworm;+1]"..
--Timer tresor
"label[7.2,3.5;Timer tresor (in sec)]"..
"button[6,4.;1,1;ttresor;-60]"..
"button[7,4;1,1;ttresor;-600]"..
"label[7.9,4.2;"..tostring(fishing_setting.tmp_setting["tresor_timer"]).."]"..
"button[8.7,4;1,1;ttresor;+600]"..
"button[9.7,4;1,1;ttresor;+60]"..
"label[7.5,0.5;Chance worm]"..
"button[6,1;1,1;cworm;-1]"..
"button[7,1;1,1;cworm;-10]"..
"label[8.1,1.2;"..tostring(fishing_setting.tmp_setting["worm_chance"]).."]"..
"button[8.7,1;1,1;cworm;+10]"..
"button[9.7,1;1,1;cworm;+1]"..
--Chance escape
"label[7.2,2;Chance escape]"..
"button[7,2.5;1,1;cescape;-1]"..
"label[8.1,2.7;"..tostring(fishing_setting.tmp_setting["escape_chance"]).."]"..
"button[8.7,2.5;1,1;cescape;+1]"..
--Bobber view range
"label[7.2,3.5;Bobber view range]"..
"button[7,4;1,1;bvrange;-1]"..
"label[8.1,4.2;"..tostring(fishing_setting.tmp_setting["bobber_view_range"]).."]"..
"button[8.7,4;1,1;bvrange;+1]"..
--messages display
"label[0,5.7;Display messages in chat]"..
"button[3.7,5.5;1,1;dmessages;"..tostring(fishing_setting.tmp_setting["message"]).."]"..
@ -223,9 +178,9 @@ fishing_setting.func.on_show_settings = function(name)
--wearout
"label[0,7.3;Poles Wear]"..
"button[3.7,7.1;1,1;wearout;"..tostring(fishing_setting.tmp_setting["wear_out"]).."]"..
--TRESOR_RANDOM_ENABLE
"label[6,5.7;Random tresor enable]"..
"button[9.7,5.5;1,1;tresorenable;"..tostring(fishing_setting.tmp_setting["tresor_random_enable"]).."]"..
--TRESOR_ENABLE
"label[6,5.7;Tresor enable]"..
"button[9.7,5.5;1,1;tresorenable;"..tostring(fishing_setting.tmp_setting["tresor_enable"]).."]"..
--NEW_WORM_SOURCE
"label[6,6.5;New worm source]"..
"button[9.7,6.3;1,1;newworm;"..tostring(fishing_setting.tmp_setting["new_worm_source"]).."]"..
@ -235,7 +190,7 @@ fishing_setting.func.on_show_settings = function(name)
"button_exit[0.5,8.2;1.5,1;save;Abort]"..
"button_exit[9,8.2;1.5,1;save;Ok]"
minetest.show_formspec( name, "fishing:settings", formspec)
minetest.show_formspec(player_name, "fishing:settings", formspec)
end
@ -246,17 +201,13 @@ local inc = function(value, field, min, max)
elseif field == "+10" then
v = value + 10
elseif field == "+60" then
v = value + 60
elseif field == "+600" then
v = value + 600
v = value + 60
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
@ -286,9 +237,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
local name = player:get_player_name()
if not name then return end
if fields["save"] == "Ok" then
print("ok")
fishing_setting.func.set_settings(fishing_setting.settings, fishing_setting.tmp_setting)
fishing_setting.func.save()
fishing_setting.func.set_settings(fishing_setting.settings, fishing_setting.tmp_setting)
fishing_setting.func.save()
fishing_setting.tmp_setting = nil
return
elseif fields["quit"] or fields["abort"] then
fishing_setting.tmp_setting = nil
@ -303,8 +254,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
fishing_setting.tmp_setting["bobber_view_range"] = inc(fishing_setting.tmp_setting["bobber_view_range"], fields["bvrange"], 4, 20)
elseif fields["cworm"] then
fishing_setting.tmp_setting["worm_chance"] = inc(fishing_setting.tmp_setting["worm_chance"], fields["cworm"], 1, 100)
elseif fields["ttresor"] then
fishing_setting.tmp_setting["tresor_timer"] = inc(fishing_setting.tmp_setting["tresor_timer"], fields["ttresor"], 1800, 36000)
elseif fields["cescape"] then
fishing_setting.tmp_setting["escape_chance"] = inc(fishing_setting.tmp_setting["escape_chance"], fields["cescape"], 1, 30)
elseif fields["dmessages"] then
fishing_setting.tmp_setting["message"] = bool(fields["dmessages"])
elseif fields["poledeco"] then
@ -312,7 +263,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
elseif fields["wearout"] then
fishing_setting.tmp_setting["wear_out"] = bool(fields["wearout"])
elseif fields["tresorenable"] then
fishing_setting.tmp_setting["tresor_random_enable"] = bool(fields["tresorenable"])
fishing_setting.tmp_setting["tresor_enable"] = bool(fields["tresorenable"])
elseif fields["newworm"] then
fishing_setting.tmp_setting["new_worm_source"] = bool(fields["newworm"])
elseif fields["wormmob"] then
@ -325,3 +276,92 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
end)
--function load settings from file
function fishing_setting.func.load_trophies()
local file = io.open(fishing_setting.file_trophies, "r")
fishing_setting.trophies = {}
if file then
fishing_setting.trophies = minetest.deserialize(file:read("*all"))
file:close()
if fishing_setting.trophies and type(fishing_setting.trophies) ~= "table" then
fishing_setting.trophies = {}
end
end
end
function fishing_setting.func.save_trophies()
local input = io.open(fishing_setting.file_trophies, "w")
if input then
input:write(minetest.serialize(fishing_setting.trophies))
input:close()
else
minetest.log("action","Open failed (mode:w) of " .. fishing_setting.file_trophies)
end
end
minetest.register_on_shutdown(function()
minetest.log("action", "[fishing] Server shuts down. saving trophies table")
fishing_setting.func.save_trophies()
end)
minetest.register_on_joinplayer(function(player)
local playername = player:get_player_name()
if fishing_setting.trophies[playername] == nil then
fishing_setting.trophies[playername] = { ["fish"] = 0,["shark"] = 0, ["pike"] = 0, ["clownfish"]= 0, ["bluefish"] = 0 }
end
end)
function fishing_setting.func.add_to_trophies(player, fish)
local player_name = player:get_player_name()
if not player_name then return end
if fish == "fish" or fish == "shark" or fish == "pike" or fish == "clownfish" or fish == "bluefish" then
fishing_setting.trophies[player_name][fish] = fishing_setting.trophies[player_name][fish] + 1
if fishing_setting.trophies[player_name][fish]%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[player_name][fish]))
local inv = player:get_inventory()
local name = "fishing:trophy_"..fish
if inv:room_for_item("main", {name=name, count=1, wear=0, metadata=""}) then
inv:add_item("main", {name=name, count=1, wear=0, metadata=""})
else
minetest.spawn_item(player:getpos(), {name=name, count=1, wear=0, metadata=""})
end
end
end
end
if (minetest.get_modpath("unified_inventory")) then
unified_inventory.register_button("menu_fishing", {
type = "image",
image = "fishing_fish.png",
tooltip = "fishing menu configuration",
action = function(player)
local player_name = player:get_player_name()
if not player_name then return end
if minetest.check_player_privs(player_name, {server=true}) then
fishing_setting.func.on_show_settings(player_name)
else
minetest.chat_send_player(player_name, fishing_setting.func.S("You don't have the server priviledge!"))
end
end,
})
end
minetest.register_chatcommand("fishing_config", {
params = "",
description = "Display fishing configuration menu (admin only)",
privs = {server=true},
func = function(player_name, param)
if not player_name then return end
fishing_setting.func.on_show_settings(player_name)
end
})