1
0
mirror of https://github.com/MinetestForFun/fishing.git synced 2025-07-22 18:10:27 +02:00

mores changes

write config
add functions load|save config
add tresor system chance
This commit is contained in:
2015-06-09 23:09:47 +02:00
parent ab21ae6cdc
commit ab67ad83b3
7 changed files with 238 additions and 125 deletions

View File

@ -1,8 +1,5 @@
minetest.register_alias("flowers_plus:seaweed", "flowers:seaweed") -- exception
-- bobber
minetest.register_node("fishing:bobber_box", {
drawtype = "nodebox",
@ -37,23 +34,21 @@ local FISHING_BOBBER_ENTITY={
textures = {"fishing:bobber_box"},
-- {left ,bottom, front, right, top , back}
collisionbox = {-2/16, -4/16, -2/16, 2/16, 0/16, 2/16},
view_range = 7,
randomtime = 50,
chance = 0,
amorce = false,
amorce = 0,
prize = "",
-- DESTROY BOBBER WHEN PUNCHING IT
-- DESTROY BOBBER WHEN PUNCHING IT
on_punch = function (self, puncher, time_from_last_punch, tool_capabilities, dir)
if not puncher:is_player() then return end
local player = puncher:get_player_name()
if player ~= self.object.owner then return end
if MESSAGES == true then minetest.chat_send_player(player, fishing_setting.S("You didn't prizes anything."), false) end -- fish escaped
if player ~= self.owner then return end
if fishing_setting.settings["message"] == true then minetest.chat_send_player(player, fishing_setting.S("You didn't prizes anything."), false) end
if not fishing_setting.is_creative_mode then
local inv = puncher:get_inventory()
if inv:room_for_item("main", {name="fishing:bait_corn", count=1, wear=0, metadata=""}) then
inv:add_item("main", {name="fishing:bait_corn", count=1, wear=0, metadata=""})
if MESSAGES == true then minetest.chat_send_player(player, fishing_setting.S("The bait is still there."), false) end -- bait still there
if inv:room_for_item("main", {name=self.bait, count=1, wear=0, metadata=""}) then
inv:add_item("main", {name=self.bait, count=1, wear=0, metadata=""})
if fishing_setting.settings["message"] == true then minetest.chat_send_player(player, fishing_setting.S("The bait is still there."), false) end
end
end
-- make sound and remove bobber
@ -64,7 +59,7 @@ local FISHING_BOBBER_ENTITY={
-- WHEN RIGHTCLICKING THE BOBBER THE FOLLOWING HAPPENS (CLICK AT THE RIGHT TIME WHILE HOLDING A FISHING POLE)
-- WHEN RIGHTCLICKING THE BOBBER THE FOLLOWING HAPPENS (CLICK AT THE RIGHT TIME WHILE HOLDING A FISHING POLE)
on_rightclick = function (self, clicker)
local item = clicker:get_wielded_item()
local player = clicker:get_player_name()
@ -72,25 +67,17 @@ local FISHING_BOBBER_ENTITY={
local pos = self.object:getpos()
local item_name = item:get_name()
if string.find(item_name, "fishing:pole_") ~= nil then
--##############################################################################################################
if player ~= self.owner then return end
if self.prize ~= "" then
local name = self.prize[1]..":"..self.prize[2]
local desc = self.prize[4]
print("You caught "..name.." "..desc)
local name = self.prize[1]..":"..self.prize[2]
local desc = self.prize[4]
print("You caught "..name.." "..desc)
minetest.chat_send_player(player, "You caught "..desc, false)
if inv:room_for_item("main", {name=name, count=1, wear=0, metadata=""}) then
local used
if self.prize[3] == "random" then
used = (2000*(math.random(20, 29)))
elseif self.prize[3] == "randomtools" then
used = (65535/(30-(math.random(15, 29))))
else
used = 0
end
inv:add_item("main", {name=name, count=1, wear=used, metadata=""})
local wear_value = fishing_setting.func.wear_value(self.prize[3])
if inv:room_for_item("main", {name=name, count=1, wear=wear_value, metadata=""}) then
inv:add_item("main", {name=name, count=1, wear=wear_value, metadata=""})
else
minetest.spawn_item(clicker:getpos(), name)
minetest.spawn_item(clicker:getpos(), {name=name, count=1, wear=wear_value, metadata=""})
end
end
@ -98,18 +85,11 @@ local FISHING_BOBBER_ENTITY={
minetest.sound_play("fishing_bobber1", { pos = self.object:getpos(), gain = 0.5, })
self.object:remove()
--##############################################################################################################
elseif item:get_name() == "fishing:amorce" then
if not fishing_setting.is_creative_mode then
inv:remove_item("main", "fishing:amorce")
end
self.amorce = true
self.amorce = 20
--addparticle
minetest.add_particlespawner(30, 0.5, -- for how long (?) -- Particles on splash
{x=pos.x,y=pos.y-0.0625,z=pos.z}, {x=pos.x,y=pos.y,z=pos.z}, -- position min, pos max
@ -120,8 +100,6 @@ local FISHING_BOBBER_ENTITY={
false, "fishing_particle_amorce.png")
-- add sound
minetest.sound_play("fishing_bobber1", {pos = self.object:getpos(), gain = 0.2, })
--inc hp
print("amorce")
end
end,
@ -132,14 +110,13 @@ local FISHING_BOBBER_ENTITY={
-- AS SOON AS THE BOBBER IS PLACED IT WILL ACT LIKE
on_step = function(self, dtime)
local pos = self.object:getpos()
--remove if no owner, no player, owner no in bobber_view_range
if self.owner == nil then self.object:remove(); return end
local player = minetest.get_player_by_name(self.owner)
if not player then self.object:remove(); return end
--remove if nobody in radius
local p = player:getpos()
local dist = ((p.x-pos.x)^2 + (p.y-pos.y)^2 + (p.z-pos.z)^2)^0.5
if dist > self.view_range then
local dist = ((p.x-pos.x)^2 + (p.y-pos.y)^2 + (p.z-pos.z)^2)^0.5
if dist > fishing_setting.settings["bobber_view_range"] then
minetest.sound_play("fishing_bobber1", {pos = self.object:getpos(),gain = 0.5,})
self.object:remove()
return
@ -149,67 +126,67 @@ local FISHING_BOBBER_ENTITY={
if math.random(1, 4) == 1 then
self.object:setyaw(self.object:getyaw()+((math.random(0,360)-180)/2880*math.pi))
end
--###################
self.timer = self.timer + 1
if self.timer < self.randomtime then
if self.prize ~= "" then
local n = math.random(1,3)
if n == 1 then
if self.old_pos2 == true then
pos.y = pos.y-0.0325
self.object:moveto(pos, false)
self.old_pos2 = false
else
pos.y = pos.y+0.0325
self.object:moveto(pos, false)
self.old_pos2 = true
end
-- if fish or others items, move bobber to simulate fish on the line
if self.prize ~= "" and math.random(1,3) == 1 then
if self.old_pos2 == true then
pos.y = pos.y-0.0325
self.object:moveto(pos, false)
self.old_pos2 = false
--minetest.sound_play("fishing_bobber1", {pos=pos,gain = 0.5,})
else
pos.y = pos.y+0.0325
self.object:moveto(pos, false)
self.old_pos2 = true
end
end
return
end
if self.prize == fishing_setting.prizes.tresor then
minetest.chat_send_player(player, "You lost the tresor, bad luck", false)
end
--change item on line
self.timer = 0
self.prize = ""
self.object:moveto(self.old_pos, false)
self.randomtime = math.random(2,12)*10
--self.object:moveto({x=pos.x,y=pos.y-0.015625,z=pos.z})
--print("randomtime:"..tostring(self.randomtime))
if math.random(1, 100) > FISH_CHANCE then
self.prize = ""
--Once the fish are not hungry :)
-- amorce increase lucky + 20%
if math.random(1, 100) > fishing_setting.settings.chance["hungry_fish"] + self.amorce then
return
end
local c = 0
if self.amorce then
c = 20
end
local chance = math.random(1, 100)+c
local chance = math.random(1, 100)
print(" chance: " .. tostring(chance) .. " randomtime: "..tostring(self.randomtime))
--if 1 you catch a tresor, maybe ...
if chance == 1 then
local r = math.random(1, 100)
if r < 10 then
self.prize = fishing_setting.prizes.tresor[math.random(1,#fishing_setting.prizes.tresor)]
--You are lucky ? :)
if math.random(1, 100) <= fishing_setting.settings.chance["tresor"] then
self.prize = fishing_setting.prizes.tresor
else
self.prize = ""
self.prize = fishing_setting.prizes.stuff[math.random(1,#fishing_setting.prizes.stuff)]
end
elseif chance < 10 then
self.prize = ""
elseif chance < 40 then
self.prize = fishing_setting.prizes.loose[math.random(1,#fishing_setting.prizes.loose)]
else
elseif chance <= fishing_setting.settings.chance["fish"] then
self.prize = fishing_setting.prizes.fish[math.random(1,#fishing_setting.prizes.fish)]
else
if math.random(1, 100) <= 10 then
self.prize = fishing_setting.prizes.loose[math.random(1,#fishing_setting.prizes.loose)]
end
end
self.amorce = false
if self.prize ~= nil then
if self.prize ~= nil and self.prize ~= "" then
pos.y = self.old_pos.y-0.1
self.object:moveto(pos, false)
minetest.sound_play("fishing_bobber1", {pos=pos,gain = 0.5,})
print("prize: "..tostring(self.prize[1])..":"..tostring(self.prize[2]))
end
end
end,
}