Browse Source

added 4 new fish and trophy (carp, perch, catfish, exoticfish)

fish, carp, perch, catfish and pike only catched in rivers
clownfish, bluewhite,exoticfish and shark only catched in sea
convert sound stereo in mono
tags/v1.0.0
crabman77 4 years ago
parent
commit
14bdc521f2
24 changed files with 229 additions and 95 deletions
  1. +22
    -10
      README.md
  2. +3
    -0
      baits.lua
  3. +6
    -2
      bobber.lua
  4. +8
    -4
      bobber_shark.lua
  5. +28
    -0
      crafting.lua
  6. +40
    -0
      fishes.lua
  7. +33
    -60
      functions.lua
  8. +1
    -1
      init.lua
  9. +30
    -6
      locale/fr.txt
  10. +24
    -1
      locale/template.txt
  11. +6
    -0
      poles.lua
  12. +19
    -6
      prizes.lua
  13. BIN
      sounds/fishing_baitball.ogg
  14. BIN
      sounds/fishing_bobber1.ogg
  15. BIN
      sounds/fishing_bobber2.ogg
  16. BIN
      sounds/fishing_contest_end.ogg
  17. BIN
      sounds/fishing_contest_start.ogg
  18. BIN
      textures/fishing_carp_raw.png
  19. BIN
      textures/fishing_catfish_raw.png
  20. BIN
      textures/fishing_exoticfish_raw.png
  21. BIN
      textures/fishing_perch_raw.png
  22. BIN
      textures/fishing_pike_raw.png
  23. BIN
      textures/fishing_pole_wood_deco.png
  24. +9
    -5
      trophies.lua

+ 22
- 10
README.md View File

@@ -4,33 +4,45 @@
### Original by Mossmanikin https://github.com/Mossmanikin/fishing
### Rewrited by Crabman77

5 fish type
3 small fish (fish, clownfish,bluewhite fish)
2 predator fish (small shark, Northern Pike)
###9 fish type
**fish in rivers**
> - 2 small fish (fish, carp)
> - 3 predator fish (perch, catfish, Northern Pike)

**fish in sea**
>- 3 small fish (clownfish,bluewhite fish, exotic fish)
> - 1 predator fish (small shark)


3 kind of bait for small fish (corn, bread, worm)
3 kind of bait for predator fish (small fish)
4 kind of bait for predator fish (small fish)
2 poles, wood 30 uses and mithril 1500 uses
The baits have a variable luck(15% to 80%) changed between 30 minutes to 6 hours for a better gameplay
Baitball improves lucky bait of 20%

##Contest Game

###**Contest Game **
Contest game can be launched by admin, duration variable 2min to 4heures
Start/End is announced in chat and sound
A ranking appears(formspec) after contest

Adjustable settings in formspec
if the unified_inventory mod is active there is a button for classification or settings for the admin only
if the unified_inventory mod is actived there is a button for classification or settings for the admin only


[demo video youtube](https://youtu.be/8rt8g3F2Gmk)


![fishing]( http://nsm08.casimages.com/img/2015/07/01/1507010157379539613411965.png)
![fishing]( http://nsm08.casimages.com/img/2015/07/01//1507010157329539613411964.png)
![fishing]( http://nsm08.casimages.com/img/2015/07/01//1507010157319539613411963.png)

####Trophy and fish type
![fishing]( http://nsm08.casimages.com/img/2015/09/26//1509260649029539613611795.jpg)
#### Admin can look bait chance
![fishing]( http://nsm08.casimages.com/img/2015/09/26//1509260648599539613611793.jpg)
### admin menu
![fishing]( http://nsm08.casimages.com/img/2015/09/26//1509260649019539613611794.jpg)

![fishing]( http://nsm08.casimages.com/img/2015/07/01//1507010157389539613411968.png)

![fishing]( http://nsm08.casimages.com/img/2015/07/01//1507010157379539613411966.png)
![fishing]( http://nsm08.casimages.com/img/2015/07/01//1507010157389539613411967.png)
####formspec contest ranking
![fishing]( http://nsm08.casimages.com/img/2015/09/26//1509260648579539613611792.jpg)

+ 3
- 0
baits.lua View File

@@ -24,4 +24,7 @@ fishing_setting.baits["fishing:bait_worm"] = { ["bait"] = "fishing:bait_worm", [
fishing_setting.baits["fishing:fish_raw"] = { ["bait"] = "fishing:fish_raw", ["bobber"] = "fishing:bobber_shark_entity",["texture"] = "fishing_fish_raw.png", ["hungry"] = 50 }

fishing_setting.baits["fishing:clownfish_raw"] = { ["bait"] = "fishing:clownfish_raw", ["bobber"] = "fishing:bobber_shark_entity",["texture"] = "fishing_clownfish_raw.png", ["hungry"] = 50 }

fishing_setting.baits["fishing:bluewhite_raw"] = { ["bait"] = "fishing:bluewhite_raw", ["bobber"] = "fishing:bobber_shark_entity",["texture"] = "fishing_bluewhite_raw.png", ["hungry"] = 50 }

fishing_setting.baits["fishing:exoticfish_raw"] = { ["bait"] = "fishing:exoticfish_raw", ["bobber"] = "fishing:bobber_shark_entity",["texture"] = "fishing_exoticfish_raw.png", ["hungry"] = 50 }

+ 6
- 2
bobber.lua View File

@@ -39,7 +39,7 @@ local FISHING_BOBBER_ENTITY={
visual_size = {x=1/3, y=1/3, z=1/3},
textures = {"fishing:bobber_box"},
-- {left ,bottom, front, right, top , back}
collisionbox = {-2/16, -4/16, -2/16, 2/16, 1/16, 2/16},
collisionbox = {-2/16, -4/16, -2/16, 2/16, 2/16, 2/16},
randomtime = 50,
baitball = 0,
prize = "",
@@ -169,7 +169,11 @@ local FISHING_BOBBER_ENTITY={

self.randomtime = math.random(1,5)*10
if math.random(1, 100) <= fishing_setting.settings["fish_chance"] then
self.prize = fishing_setting.prizes["fish"][math.random(1,#fishing_setting.prizes["fish"])]
if self.water_type and self.water_type == "sea" then
self.prize = fishing_setting.prizes["sea"]["little"][math.random(1,#fishing_setting.prizes["sea"]["little"])]
else
self.prize = fishing_setting.prizes["rivers"]["little"][math.random(1,#fishing_setting.prizes["rivers"]["little"])]
end
else
if math.random(1, 100) <= 10 then
self.prize = fishing_setting.func.get_loot()


+ 8
- 4
bobber_shark.lua View File

@@ -142,11 +142,11 @@ local FISHING_BOBBER_SHARK_ENTITY={
-- 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.0425
pos.y = pos.y-0.050
self.object:moveto(pos, false)
self.old_pos2 = false
else
pos.y = pos.y+0.0425
pos.y = pos.y+0.050
self.object:moveto(pos, false)
self.old_pos2 = true
end
@@ -173,7 +173,11 @@ local FISHING_BOBBER_SHARK_ENTITY={
self.prize = fishing_setting.prizes["treasure"][math.random(1,#fishing_setting.prizes["treasure"])]
end
elseif chance <= fishing_setting.settings["fish_chance"] then
self.prize = fishing_setting.prizes["shark"][math.random(1,#fishing_setting.prizes["shark"])]
if self.water_type and self.water_type == "sea" then
self.prize = fishing_setting.prizes["sea"]["big"][math.random(1,#fishing_setting.prizes["sea"]["big"])]
else
self.prize = fishing_setting.prizes["rivers"]["big"][math.random(1,#fishing_setting.prizes["rivers"]["big"])]
end
else
if math.random(1, 100) <= 10 then
self.prize = fishing_setting.func.get_loot()
@@ -181,7 +185,7 @@ local FISHING_BOBBER_SHARK_ENTITY={
end

if self.prize ~= "" then
pos.y = self.old_pos.y-0.2
pos.y = self.old_pos.y-0.140
self.object:moveto(pos, false)
minetest.sound_play("fishing_bobber1", {pos=pos,gain = 0.5,})
end


+ 28
- 0
crafting.lua View File

@@ -91,6 +91,7 @@ minetest.register_craft({
recipe = "fishing:clownfish_raw",
cooktime = 2,
})

minetest.register_craft({
type = "cooking",
output = "fishing:fish_cooked",
@@ -98,6 +99,33 @@ minetest.register_craft({
cooktime = 2,
})

minetest.register_craft({
type = "cooking",
output = "fishing:fish_cooked",
recipe = "fishing:exoticfish_raw",
cooktime = 2,
})

minetest.register_craft({
type = "cooking",
output = "fishing:fish_cooked",
recipe = "fishing:carp_raw",
cooktime = 2,
})

minetest.register_craft({
type = "cooking",
output = "fishing:fish_cooked",
recipe = "fishing:perch_raw",
cooktime = 2,
})

minetest.register_craft({
type = "cooking",
output = "fishing:fish_cooked",
recipe = "fishing:catfish_raw",
cooktime = 2,
})

-----------------------------------------------------------------------------------------------
-- Wheat Seed


+ 40
- 0
fishes.lua View File

@@ -51,6 +51,46 @@ minetest.register_craftitem("fishing:bluewhite_raw", {
inventory_image = "fishing_bluewhite_raw.png",
on_use = minetest.item_eat(2),
})
-----------------------------------------------------------------------------------------------
-- exoticfish
-----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:exoticfish_raw", {
description = fishing_setting.func.S("Exotic"),
groups = {},
inventory_image = "fishing_exoticfish_raw.png",
on_use = minetest.item_eat(2),
})

-----------------------------------------------------------------------------------------------
-- carp
-----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:carp_raw", {
description = fishing_setting.func.S("Carp"),
groups = {},
inventory_image = "fishing_carp_raw.png",
on_use = minetest.item_eat(2),
})

-----------------------------------------------------------------------------------------------
-- perch
-----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:perch_raw", {
description = fishing_setting.func.S("Perch"),
groups = {},
inventory_image = "fishing_perch_raw.png",
on_use = minetest.item_eat(2),
})

-----------------------------------------------------------------------------------------------
-- catfish
-----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:catfish_raw", {
description = fishing_setting.func.S("Catfish"),
groups = {},
inventory_image = "fishing_catfish_raw.png",
on_use = minetest.item_eat(2),
})


-----------------------------------------------------------------------------------------------
-- Whatthef... it's a freakin' Shark!


+ 33
- 60
functions.lua View File

@@ -344,7 +344,7 @@ end)
function fishing_setting.func.add_to_trophies(player, fish, desc)
local player_name = player:get_player_name()
if not player_name then return end
if fish == "fish_raw" or fish == "shark_raw" or fish == "pike_raw" or fish == "clownfish_raw" or fish == "bluewhite_raw" then
if string.find(fish, "_raw") ~= nil then
if fishing_setting.trophies[fish] == nil then
fishing_setting.trophies[fish] = {}
end
@@ -361,10 +361,10 @@ function fishing_setting.func.add_to_trophies(player, fish, desc)
end

if fishing_setting.contest["contest"] ~= nil and fishing_setting.contest["contest"] == true then
if fishing_setting.contest[fish] == nil then
fishing_setting.contest[fish] = {}
if fishing_setting.contest["nb_fish"] == nil then
fishing_setting.contest["nb_fish"] = {}
end
fishing_setting.contest[fish][player_name] = (fishing_setting.contest[fish][player_name] or 0) + 1
fishing_setting.contest["nb_fish"][player_name] = (fishing_setting.contest["nb_fish"][player_name] or 0) + 1
minetest.chat_send_all(S("Yeah, %s caught "..desc):format(player_name))
end
end
@@ -413,13 +413,13 @@ function fishing_setting.func.save_contest()
end
end

--function load councours data from file
--function load contest data from file
function fishing_setting.func.load_contest()
local file = io.open(fishing_setting.file_contest, "r")
local settings = {}
local settings
fishing_setting.contest = {["contest"] = false, ["duration"] = 3600, ["bobber_nb"] = 4}
if file then
settings = minetest.deserialize(file:read("*all"))
settings = minetest.deserialize(file:read("*all"))
file:close()
if settings ~= nil and type(settings) == "table" then
if settings["contest"] ~= nil then
@@ -431,20 +431,8 @@ function fishing_setting.func.load_contest()
if settings["bobber_nb"] ~= nil then
fishing_setting.contest["bobber_nb"] = settings["bobber_nb"]
end
if settings["fish_raw"] ~= nil then
fishing_setting.contest["fish_raw"] = settings["fish_raw"]
end
if settings["clownfish_raw"] ~= nil then
fishing_setting.contest["clownfish_raw"] = settings["clownfish_raw"]
end
if settings["bluewhite_raw"] ~= nil then
fishing_setting.contest["bluewhite_raw"] = settings["bluewhite_raw"]
end
if settings["shark_raw"] ~= nil then
fishing_setting.contest["shark_raw"] = settings["shark_raw"]
end
if settings["pike_raw"] ~= nil then
fishing_setting.contest["pike_raw"] = settings["pike_raw"]
if settings["nb_fish"] ~= nil then
fishing_setting.contest["nb_fish"] = settings["nb_fish"]
end
end
end
@@ -496,11 +484,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
if not name then return end
if fields["save"] then
if fishing_setting.tmp_setting["reset"] == true then
fishing_setting.contest["fish_raw"] = {}
fishing_setting.contest["clownfish_raw"] = {}
fishing_setting.contest["bluewhite_raw"] = {}
fishing_setting.contest["shark_raw"] = {}
fishing_setting.contest["pike_raw"] = {}
fishing_setting.contest["nb_fish"] = {}
end

local progress = (fishing_setting.contest["contest"] or false)
@@ -562,11 +546,10 @@ end

function fishing_setting.func.set_winners(list)
local win = {}
local i = 1
-- this uses an custom sorting function ordering by score descending
for k,v in spairs(list, function(t,a,b) return t[b] < t[a] end) do
table.insert(win, {[k]=v})
if #win >= 6 then
table.insert(win, {["name"]=k, ["nb"]=v})
if #win >= 15 then
break
end
end
@@ -575,44 +558,34 @@ end


function fishing_setting.func.get_stat()
local winners= {}
for k,v in pairs(fishing_setting.contest) do
if string.find(k, "_raw") ~= nil then
if fishing_setting.contest[k] ~= nil then
winners[k] = fishing_setting.func.set_winners(fishing_setting.contest[k])
else
winners[k] = {}
end
end
end
local formspec = {"size[12,8]label[4.6,0;"..S("Fishing contest rankings").."]"}
local X = 0
local Y
for fish, fishers in pairs(winners) do
Y = 1.1
table.insert(formspec, "label["..(X+0.4)..",0.5;"..string.gsub(fish, "_raw", ""):upper().."]") --fish name
for _,s in ipairs(fishers) do
for pl,nb in pairs(s) do
table.insert(formspec, "label["..(X) ..","..Y..";"..tostring(nb).."]") -- nb fish caught
table.insert(formspec, "label["..(X+0.5) ..","..Y..";"..tostring(pl).."]") -- playername
end
Y = Y + 0.4
end
X = X + 2.3
end
table.insert(formspec, "button_exit[5.4,7.5;1.2,1;close;"..S("Close").."]")
local winners = {}
if fishing_setting.contest["nb_fish"] ~= nil then
winners = fishing_setting.func.set_winners(fishing_setting.contest["nb_fish"])
end
local formspec = {"size[6,8]label[2,0;"..S("Fishing contest rankings").."]"}
local Y = 1.1
table.insert(formspec, "label[0.5,0.5;No]")
table.insert(formspec, "label[2,0.5;Name]")
table.insert(formspec, "label[4.2,0.5;Fish Total]")
for num,n in ipairs(winners) do
table.insert(formspec, "label[0.5,"..Y..";"..tostring(num).."]") -- classement
table.insert(formspec, "label[2,"..Y..";"..n["name"].."]") -- playername
table.insert(formspec, "label[4.3,"..Y..";"..tostring(n["nb"]).."]") -- nb fish caught
Y = Y + 0.4
end
table.insert(formspec, "button_exit[2.4,7.5;1.2,1;close;"..S("Close").."]")
return table.concat(formspec)
end

function fishing_setting.func.get_hunger_info(player_name)
local formspec = "size[6,8]label[1.9,0;Fishing Info Center]"
local y = 1
local formspec = "size[6,9]label[1.9,0;Fishing Info Center]"
local y = 0.8
for i, a in pairs(fishing_setting.baits) do
formspec = formspec .."item_image_button[1,"..tostring(y)..";1,1;"..tostring(i)..";"..tostring(i)..";]"..
"label[2.2,"..tostring(y+0.2)..";Chance to fish :"..tostring(a["hungry"]).."%]"
formspec = formspec .."item_image_button[1,"..tostring(y)..";1,1;"..tostring(i)..";"..tostring(i)..";]"..
"label[2.2,"..tostring(y+0.2)..";Chance to fish :"..tostring(a["hungry"]).."%]"
y = y+1
end
formspec = formspec .."button_exit[2,7.5;2,1;close;"..S("Close").."]"
formspec = formspec .."button_exit[2,8.5;2,1;close;"..S("Close").."]"
minetest.show_formspec(player_name,"fishing:material_info", formspec)
end



+ 1
- 1
init.lua View File

@@ -1,6 +1,6 @@
-----------------------------------------------------------------------------------------------
local title = "Fishing - Crabman77's version"
local version = "0.0.2"
local version = "0.0.3"
local mname = "fishing"
-----------------------------------------------------------------------------------------------
-- original by wulfsdad (http://forum.minetest.net/viewtopic.php?id=4375)


+ 30
- 6
locale/fr.txt View File

@@ -10,6 +10,10 @@ Your fish escaped. = Le poisson s'est decroche.
You caught a Fish. = Vous avez attrape un poisson.
You caught a Clownfish. = Vous avez attrape un poisson clown.
You caught a Bluewhite. = Vous avez attrape un poisson bleu.
You caught a Carp. = Vous avez attrape une carpe.
You caught a Perch. = Vous avez attrape une perche.
You caught a Catfish. = Vous avez attrape un poisson chat.
You caught a Exoticfish. = Vous avez attrape un poisson exotic.
You caught a Twig. = Vous avez attrape une brindille .
You caught a Rat. = Vous avez attrape un rat.
You caught some Seaweed. = Vous avez attrape des algues.
@@ -44,6 +48,10 @@ Roasted Fish = Poisson grille
Sushi (Hoso Maki) = Sushi (Hoso Maki)
Clownfish = Poisson clown
Bluewhite = Poisson bleu
Carp = Carpe
Perch = Perche
Catfish = Poisson Chat
Exoticfish = Poisson Exotique
Shark = Requin
Roasted Shark = Requin grille
Northern Pike = Brochet
@@ -51,17 +59,25 @@ Roasted Northern Pike = Brochet grille


### 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 privileges serveur!
You win a new trophy, you have caught %s fish. = Vous gagnez un trophee, vous avez attrape %s poissons.
You win a new trophy, you have caught %s shark. = Vous gagnez un trophee, vous avez attrape %s requins.
You win a new trophy, you have caught %s pike. = Vous gagnez un trophee, vous avez attrape %s brochets.
You win a new trophy, you have caught %s clownfish. = Vous gagnez un trophee, vous avez attrape %s poissons clown.
You win a new trophy, you have caught %s bluewhite. = Vous gagnez un trophee, vous avez attrape %s poissons bleu.
You win a new trophy, you have caught %s carp. = Vous gagnez un trophee, vous avez attrape %s carpe.
You win a new trophy, you have caught %s perch. = Vous gagnez un trophee, vous avez attrape %s perche.
You win a new trophy, you have caught %s catfish. = Vous gagnez un trophee, vous avez attrape %s poissons chat.
You win a new trophy, you have caught %s exoticfish. = Vous gagnez un trophee, vous avez attrape %s poissons exotique.
Good luck to %s, He catch the treasure, %s! = %s a de la chance, Il attrappe le tresor, %s!
You catch the treasure, %s! = Vous attrappez le tresor, %s!
Yeah, %s caught a Fish. = Wouah, %s a attrappe un poisson
Yeah, %s caught a Clownfish. = Wouah, %s a attrappe un poisson clown.
Yeah, %s caught a Bluewhite. = Wouah, %s a attrappe un poisson bleu.
Yeah, %s caught a Carp. = Wouah, %s a attrappe une carpe.
Yeah, %s caught a Perch. = Wouah, %s a attrappe une perche.
Yeah, %s caught a Catfish. = Wouah, %s a attrappe un poisson cahet.
Yeah, %s caught a Exoticfish. = Wouah, %s a attrappe un poisson exotique.
Yeah, %s caught a Northern Pike. = Wouah, %s a attrappe un brochet.
Yeah, %s caught a small Shark. = Wouah, %s a attrappe un requin.
A fishing contest is in progress. (remaining time %s) = Un concours de peche est en cours. (temps restant %s)
@@ -85,11 +101,19 @@ Northern Pike Trophy = Trophee brochet
Shark Trophy = Trophee requin
Clownfish Trophy = Trophee poisson clown
Bluewhite Trophy = Trophee poisson bleu
This Huge Fish was caught by the Famous Angler %s ! =
This Huge Northern Pike was caught by the Famous Angler %s ! =
This Huge Shark was caught by the Famous Angler %s ! =
This Huge Clownfish was caught by the Famous Angler %s ! =
This Huge Bluewhite was caught by the Famous Angler %s ! =
Carp Trophy = Trophee carpe
Perch Trophy = Trophee perche
Catfish Trophy = Trophee poisson chat
Exoticfish Trophy = Trophee poisson exotique
This Huge Fish was caught by the Famous Angler %s ! = Cet enorme poisson a ete attrape par le celebre pecheur
This Huge Northern Pike was caught by the Famous Angler %s ! = Cet enorme brochet a ete attrape par le celebre pecheur
This Huge Shark was caught by the Famous Angler %s ! = Cet enorme requin a ete attrape par le celebre pecheur
This Huge Clownfish was caught by the Famous Angler %s ! = Cet enorme poisson clown a ete attrape par le celebre pecheur
This Huge Bluewhite was caught by the Famous Angler %s ! = Cet enorme poisson blue a ete attrape par le celebre pecheur
This Huge Carp was caught by the Famous Angler %s ! = Cet enorme carpe a ete attrape par le celebre pecheur
This Huge Perch was caught by the Famous Angler %s ! = Cet enorme perche a ete attrape par le celebre pecheur
This Huge Catfish was caught by the Famous Angler %s ! = Cet enorme poisson chat a ete attrape par le celebre pecheur
This Huge Exoticfish was caught by the Famous Angler %s ! = Cet enorme poisson exotique a ete attrape par le celebre pecheur

### worms.lua ###
Worm = ver


+ 24
- 1
locale/template.txt View File

@@ -10,7 +10,10 @@ The bait is still there. =
Your fish escaped. =
You caught a Fish. =
You caught a Clownfish. =
You caught a Bluefish. =
You caught a Carp. =
You caught a Perch. =
You caught a Catfish. =
You caught a Exoticfish. =
You caught a Twig. =
You caught a Rat. =
You caught some Seaweed. =
@@ -43,6 +46,10 @@ Roasted Fish =
Sushi (Hoso Maki) =
Clownfish =
Bluefish =
Carp =
Perch =
Catfish =
Exoticfish =
Shark =
Roasted Shark =
Northern Pike =
@@ -56,11 +63,19 @@ You win a new trophy, you have caught %s shark. =
You win a new trophy, you have caught %s pike. =
You win a new trophy, you have caught %s clownfish. =
You win a new trophy, you have caught %s bluewhite. =
You win a new trophy, you have caught %s carp. =
You win a new trophy, you have caught %s perch. =
You win a new trophy, you have caught %s catfish. =
You win a new trophy, you have caught %s exoticfish. =
Lucky %s, he caught the treasure, %s! =
You caught the treasure, %s!=
Yeah, %s caught a Fish. =
Yeah, %s caught a Clownfish. =
Yeah, %s caught a Bluefish. =
Yeah, %s caught a Carp. =
Yeah, %s caught a Perch. =
Yeah, %s caught a Catfish. =
Yeah, %s caught a Exoticfish. =
Yeah, %s caught a Northern Pike. =
Yeah, %s caught a small Shark. =
A fishing contest is in progress. (remaining time %s) =
@@ -111,11 +126,19 @@ Northern Pike Trophy =
Shark Trophy =
Clownfish Trophy =
Bluefish Trophy =
Carp Trophy =
Perch Trophy =
Catfish Trophy =
Exoticfish Trophy =
This Huge Fish was caught by the Famous Angler %s ! =
This Huge Northern Pike was caught by the Famous Angler %s ! =
This Huge Shark was caught by the Famous Angler %s ! =
This Huge Clownfish was caught by the Famous Angler %s ! =
This Huge Bluefish was caught by the Famous Angler %s ! =
This Huge Carp was caught by the Famous Angler %s ! =
This Huge Perch was caught by the Famous Angler %s ! =
This Huge Catfish was caught by the Famous Angler %s ! =
This Huge Exoticfish was caught by the Famous Angler %s ! =

### worms.lua ###
Worm =


+ 6
- 0
poles.lua View File

@@ -82,6 +82,12 @@ for _,pole in pairs(fishing_setting.poles) do
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
local luaentity = ent:get_luaentity()
local node = minetest.get_node_or_nil(pt.under)
if node and node.name == "default:river_water_source" then
luaentity.water_type = "rivers"
else
luaentity.water_type = "sea"
end
luaentity.owner = player_name
luaentity.bait = bait
luaentity.old_pos = new_pos


+ 19
- 6
prizes.lua View File

@@ -1,17 +1,30 @@

fishing_setting.prizes["rivers"] = {}
fishing_setting.prizes["rivers"]["little"] = {
{"fishing", "fish_raw", 0, "a Fish."},
{"fishing", "carp_raw", 0, "a Carp."},
}

fishing_setting.prizes["fish"] = {
{"fishing", "fish_raw", 0, "a Fish."},
{"fishing", "clownfish_raw", 0, "a Clownfish."},
{"fishing", "bluewhite_raw", 0, "a Bluewhite."}
fishing_setting.prizes["rivers"]["big"] = {
{"fishing", "pike_raw", 0, "a Northern Pike."},
{"fishing", "perch_raw", 0, "a Perch."},
{"fishing", "catfish_raw", 0, "a Catfish."},
}

fishing_setting.prizes["shark"] = {

fishing_setting.prizes["sea"] = {}
fishing_setting.prizes["sea"]["little"] = {
{"fishing", "clownfish_raw", 0, "a Clownfish."},
{"fishing", "bluewhite_raw", 0, "a Bluewhite."},
{"fishing", "exoticfish_raw", 0, "a Exoticfish."},
}

fishing_setting.prizes["sea"]["big"] = {
{"fishing", "shark_raw", 0, "a small Shark."},
{"fishing", "pike_raw", 0, "a Northern Pike."}
}



local stuff = {
-- mod item wear message ("You caught "..) nrmin chance (1/67)
{"flowers", "seaweed", 0, "some Seaweed.", 1, 5},


BIN
sounds/fishing_baitball.ogg View File


BIN
sounds/fishing_bobber1.ogg View File


BIN
sounds/fishing_bobber2.ogg View File


BIN
sounds/fishing_contest_end.ogg View File


BIN
sounds/fishing_contest_start.ogg View File


BIN
textures/fishing_carp_raw.png View File

Before After
Width: 32  |  Height: 32  |  Size: 1.2KB

BIN
textures/fishing_catfish_raw.png View File

Before After
Width: 32  |  Height: 32  |  Size: 1.2KB

BIN
textures/fishing_exoticfish_raw.png View File

Before After
Width: 32  |  Height: 32  |  Size: 782B

BIN
textures/fishing_perch_raw.png View File

Before After
Width: 32  |  Height: 32  |  Size: 1.6KB

BIN
textures/fishing_pike_raw.png View File

Before After
Width: 32  |  Height: 32  |  Size: 465B Width: 32  |  Height: 32  |  Size: 465B

BIN
textures/fishing_pole_wood_deco.png View File

Before After
Width: 32  |  Height: 32  |  Size: 440B

+ 9
- 5
trophies.lua View File

@@ -9,11 +9,15 @@

local trophy = {
-- mod item name icon
{"fishing", "fish_raw", "Fish", "fishing_fish_raw.png"},
{"fishing", "pike_raw", "Northern Pike", "fishing_pike_raw.png"},
{"fishing", "shark_raw", "Shark", "fishing_shark_raw.png"},
{"fishing", "clownfish_raw", "Clownfish", "fishing_clownfish_raw.png"},
{"fishing", "bluewhite_raw", "Bluewhite", "fishing_bluewhite_raw.png"},
{"fishing", "fish_raw", "Fish", "fishing_fish_raw.png"},
{"fishing", "carp_raw", "Carp", "fishing_carp_raw.png"},
{"fishing", "perch_raw", "Perch", "fishing_perch_raw.png"},
{"fishing", "catfish_raw", "Catfish", "fishing_catfish_raw.png"},
{"fishing", "pike_raw", "Northern Pike", "fishing_pike_raw.png"},
{"fishing", "clownfish_raw", "Clownfish", "fishing_clownfish_raw.png"},
{"fishing", "bluewhite_raw", "Bluewhite", "fishing_bluewhite_raw.png"},
{"fishing", "exoticfish_raw", "Exoticfish", "fishing_exoticfish_raw.png"},
{"fishing", "shark_raw", "Shark", "fishing_shark_raw.png"},
}

local function has_trophy_privilege(meta, player)


Loading…
Cancel
Save