forked from mff/fishing
		
	added new sound start/end contest
renamed bluefish to bluewhite
This commit is contained in:
		@@ -24,5 +24,5 @@ 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:bluefish_raw"] = { ["bait"] = "fishing:bluefish_raw", ["bobber"] = "fishing:bobber_shark_entity",["texture"] = "fishing_bluefish_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 }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								crafting.lua
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								crafting.lua
									
									
									
									
									
								
							@@ -94,7 +94,7 @@ minetest.register_craft({
 | 
			
		||||
minetest.register_craft({
 | 
			
		||||
	type = "cooking",
 | 
			
		||||
	output = "fishing:fish_cooked",
 | 
			
		||||
	recipe = "fishing:bluefish_raw",
 | 
			
		||||
	recipe = "fishing:bluewhite_raw",
 | 
			
		||||
	cooktime = 2,
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
@@ -191,18 +191,18 @@ minetest.register_craft({
 | 
			
		||||
minetest.register_craft({
 | 
			
		||||
	type = "shapeless",
 | 
			
		||||
	output = "fishing:baitball_shark 20",
 | 
			
		||||
	recipe = {"fishing:bluefish_raw", "fishing:bluefish_raw"}
 | 
			
		||||
	recipe = {"fishing:bluewhite_raw", "fishing:bluewhite_raw"}
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
minetest.register_craft({
 | 
			
		||||
	type = "shapeless",
 | 
			
		||||
	output = "fishing:baitball_shark 20",
 | 
			
		||||
	recipe = {"fishing:bluefish_raw", "fishing:fish_raw"}
 | 
			
		||||
	recipe = {"fishing:bluewhite_raw", "fishing:fish_raw"}
 | 
			
		||||
})
 | 
			
		||||
minetest.register_craft({
 | 
			
		||||
	type = "shapeless",
 | 
			
		||||
	output = "fishing:baitball_shark 20",
 | 
			
		||||
	recipe = {"fishing:clownfish_raw", "fishing:bluefish_raw"}
 | 
			
		||||
	recipe = {"fishing:clownfish_raw", "fishing:bluewhite_raw"}
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
minetest.register_craft({
 | 
			
		||||
@@ -218,12 +218,12 @@ minetest.register_craft({
 | 
			
		||||
minetest.register_craft({
 | 
			
		||||
	type = "shapeless",
 | 
			
		||||
	output = "fishing:baitball_shark 20",
 | 
			
		||||
	recipe = {"fishing:bluefish_raw", "fishing:shark_raw"}
 | 
			
		||||
	recipe = {"fishing:bluewhite_raw", "fishing:shark_raw"}
 | 
			
		||||
})
 | 
			
		||||
minetest.register_craft({
 | 
			
		||||
	type = "shapeless",
 | 
			
		||||
	output = "fishing:baitball_shark 20",
 | 
			
		||||
	recipe = {"fishing:bluefish_raw", "fishing:pike_raw"}
 | 
			
		||||
	recipe = {"fishing:bluewhite_raw", "fishing:pike_raw"}
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
minetest.register_craft({
 | 
			
		||||
 
 | 
			
		||||
@@ -43,12 +43,12 @@ minetest.register_craftitem("fishing:clownfish_raw", {
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
-----------------------------------------------------------------------------------------------
 | 
			
		||||
-- bluefish
 | 
			
		||||
-- bluewhite
 | 
			
		||||
-----------------------------------------------------------------------------------------------
 | 
			
		||||
minetest.register_craftitem("fishing:bluefish_raw", {
 | 
			
		||||
	description = fishing_setting.func.S("Bluefish"),
 | 
			
		||||
minetest.register_craftitem("fishing:bluewhite_raw", {
 | 
			
		||||
	description = fishing_setting.func.S("Bluewhite"),
 | 
			
		||||
	groups = {},
 | 
			
		||||
	inventory_image = "fishing_bluefish_raw.png",
 | 
			
		||||
	inventory_image = "fishing_bluewhite_raw.png",
 | 
			
		||||
	 on_use = minetest.item_eat(2),
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -347,7 +347,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 == "bluefish_raw" then
 | 
			
		||||
	if fish == "fish_raw" or fish == "shark_raw" or fish == "pike_raw" or fish == "clownfish_raw" or fish == "bluewhite_raw" then
 | 
			
		||||
		if fishing_setting.trophies[fish] == nil then
 | 
			
		||||
			fishing_setting.trophies[fish] = {}
 | 
			
		||||
		end
 | 
			
		||||
@@ -472,7 +472,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 | 
			
		||||
			if fields["reset"] and fields["reset"]:lower() == "yes" then
 | 
			
		||||
				fishing_setting.concours["fish_raw"] = {}
 | 
			
		||||
				fishing_setting.concours["clownfish_raw"] = {}
 | 
			
		||||
				fishing_setting.concours["bluefish_raw"] = {}
 | 
			
		||||
				fishing_setting.concours["bluewhite_raw"] = {}
 | 
			
		||||
				fishing_setting.concours["shark_raw"] = {}
 | 
			
		||||
				fishing_setting.concours["pike_raw"] = {}
 | 
			
		||||
			end
 | 
			
		||||
@@ -484,11 +484,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 | 
			
		||||
			if progress == false and fishing_setting.tmp_setting["concours"] == true then
 | 
			
		||||
				fishing_setting.concours["concours"] = true
 | 
			
		||||
				fishing_setting.concours["warning_said"] = false
 | 
			
		||||
				--TODO show time in H:M:S
 | 
			
		||||
				local time = fishing_setting.func.timetostr(fishing_setting.concours["duration"])
 | 
			
		||||
				minetest.chat_send_all(fishing_setting.func.S("Attention, Fishing contest start (duration %s)!!!"):format(time))
 | 
			
		||||
				--TODO play sound go contest
 | 
			
		||||
				minetest.sound_play("fishing_contest_depart",{gain=0.8})
 | 
			
		||||
				minetest.sound_play("fishing_contest_start",{gain=0.8})
 | 
			
		||||
				
 | 
			
		||||
			elseif progress == true and fishing_setting.tmp_setting["concours"] == false then
 | 
			
		||||
				fishing_setting.concours["concours"] = false
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@ The bait is still there. =
 | 
			
		||||
Your fish escaped. = Dein Fisch ist entkommen.
 | 
			
		||||
You caught a Fish. = Du hast einen Fisch gefangen.
 | 
			
		||||
You caught a Clownfish. = Du hast einen Clownfisch gefangen.
 | 
			
		||||
You caught a Bluefish. = Du hast einen blau-weissen Fisch gefangen.
 | 
			
		||||
You caught a Bluewhite. = Du hast einen blau-weissen Fisch gefangen.
 | 
			
		||||
You caught a Twig. = Du hast einen Zweig gefangen.
 | 
			
		||||
You caught a Rat. = Du hast eine Ratte gefangen.
 | 
			
		||||
You caught some Seaweed. = Du hast etwas Seetang gefangen.
 | 
			
		||||
@@ -41,7 +41,7 @@ Fish = Fisch
 | 
			
		||||
Roasted Fish = Gebratener Fisch
 | 
			
		||||
Sushi (Hoso Maki) = Sushi (Hoso Maki)
 | 
			
		||||
Clownfish = Clownfisch
 | 
			
		||||
Bluefish = blau-weisse Fisch
 | 
			
		||||
Bluewhite = blau-weisse Fisch
 | 
			
		||||
Shark = Hai
 | 
			
		||||
Roasted Shark = Gebratener Hai
 | 
			
		||||
Northern Pike = Hecht
 | 
			
		||||
@@ -54,7 +54,7 @@ You win a new trophie, you have catched %s fish. =
 | 
			
		||||
You win a new trophie, you have catched %s shark. =
 | 
			
		||||
You win a new trophie, you have catched %s pike. = 
 | 
			
		||||
You win a new trophie, you have catched %s clownfish. = 
 | 
			
		||||
You win a new trophie, you have catched %s bluefish. = 
 | 
			
		||||
You win a new trophie, you have catched %s bluewhite. = 
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
### material.lua ###
 | 
			
		||||
@@ -71,12 +71,12 @@ Fish Trophy = Fisch-Trophaee
 | 
			
		||||
Northern Pike Trophy = Hecht-Trophaee
 | 
			
		||||
Shark Trophy = Hai-Trophaee
 | 
			
		||||
Clownfish Trophy = Clownfisch-Trophaee
 | 
			
		||||
Bluefish Trophy = Blau-weisser-Fisch-Trophaee
 | 
			
		||||
Bluewhite Trophy = Blau-weisser-Fisch-Trophaee
 | 
			
		||||
This Huge Fish was caught by the Famous Angler %s ! = Dieser riesige Fisch wurde vom beruehmten Angler %s gefangen!
 | 
			
		||||
This Huge Northern Pike was caught by the Famous Angler %s ! = Dieser riesige Hecht wurde vom beruehmten Angler %s gefangen!
 | 
			
		||||
This Huge Shark was caught by the Famous Angler %s ! = Dieser riesige Hai wurde vom beruehmten Angler %s gefangen!
 | 
			
		||||
This Huge Clownfish was caught by the Famous Angler %s ! = Dieser riesige Clownfisch wurde vom beruehmten Angler %s gefangen!
 | 
			
		||||
This Huge Bluefish was caught by the Famous Angler %s ! = Dieser riesige blau-weisse Fisch wurde vom beruehmten Angler %s gefangen!
 | 
			
		||||
This Huge Bluewhite was caught by the Famous Angler %s ! = Dieser riesige blau-weisse Fisch wurde vom beruehmten Angler %s gefangen!
 | 
			
		||||
 | 
			
		||||
### worms.lua ###
 | 
			
		||||
Worm = Wurm
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@ The bait is still there. = L'appat est toujours la.
 | 
			
		||||
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 Bluefish. = Vous avez attrape un poisson bleu.
 | 
			
		||||
You caught a Bluewhite. = Vous avez attrape un poisson bleu.
 | 
			
		||||
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.
 | 
			
		||||
@@ -43,7 +43,7 @@ Fish = Poisson
 | 
			
		||||
Roasted Fish = Poisson grille
 | 
			
		||||
Sushi (Hoso Maki) = Sushi (Hoso Maki)
 | 
			
		||||
Clownfish = Poisson clown
 | 
			
		||||
Bluefish = Poisson bleu
 | 
			
		||||
Bluewhite = Poisson bleu
 | 
			
		||||
Shark = Requin
 | 
			
		||||
Roasted Shark = Requin grille
 | 
			
		||||
Northern Pike = Brochet
 | 
			
		||||
@@ -56,12 +56,12 @@ You win a new trophie, you have catched %s fish. = Vous gagnez un trophee, vous
 | 
			
		||||
You win a new trophie, you have catched %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 trophie, you have catched %s clownfish. = Vous gagnez un trophee, vous avez attrape %s poissons clown.
 | 
			
		||||
You win a new trophie, you have catched %s bluefish. = Vous gagnez un trophee, vous avez attrape %s poissons bleu.
 | 
			
		||||
You win a new trophie, you have catched %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!
 | 
			
		||||
You catch the tresor, %s! = Vous attrappez le tresor, %s!
 | 
			
		||||
Yeah, %s catch a Fish. = Wouah, %s a attrappe un poisson
 | 
			
		||||
Yeah, %s catch a Clownfish. = Wouah, %s a attrappe un poisson clown.
 | 
			
		||||
Yeah, %s catch a Bluefish. = Wouah, %s a attrappe un poisson bleu.
 | 
			
		||||
Yeah, %s catch a Bluewhite. = Wouah, %s a attrappe un poisson bleu.
 | 
			
		||||
Yeah, %s catch a Northern Pike. = Wouah, %s a attrappe un brochet.
 | 
			
		||||
Yeah, %s catch 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)
 | 
			
		||||
@@ -84,12 +84,12 @@ Fish Trophy = Trophee poisson
 | 
			
		||||
Northern Pike Trophy = Trophee brochet 
 | 
			
		||||
Shark Trophy = Trophee requin
 | 
			
		||||
Clownfish Trophy = Trophee poisson clown 
 | 
			
		||||
Bluefish Trophy = Trophee poisson bleu
 | 
			
		||||
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 Bluefish was caught by the Famous Angler %s ! = 
 | 
			
		||||
This Huge Bluewhite was caught by the Famous Angler %s ! = 
 | 
			
		||||
 | 
			
		||||
### worms.lua ###
 | 
			
		||||
Worm = ver
 | 
			
		||||
 
 | 
			
		||||
@@ -55,7 +55,7 @@ You win a new trophie, you have catched %s fish. =
 | 
			
		||||
You win a new trophie, you have catched %s shark. =
 | 
			
		||||
You win a new trophie, you have catched %s pike. = 
 | 
			
		||||
You win a new trophie, you have catched %s clownfish. = 
 | 
			
		||||
You win a new trophie, you have catched %s bluefish. = 
 | 
			
		||||
You win a new trophie, you have catched %s bluewhite. = 
 | 
			
		||||
Good luck to %s, He catch the tresor, %s! = 
 | 
			
		||||
You catch the tresor, %s! = 
 | 
			
		||||
Yeah, %s catch a Fish. = 
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
fishing_setting.prizes["fish"] = {
 | 
			
		||||
	{"fishing",  				"fish_raw",			0,			"a Fish."},
 | 
			
		||||
	{"fishing",  				"clownfish_raw",			0,			"a Clownfish."},
 | 
			
		||||
	{"fishing",  				"bluefish_raw",			0,			"a Bluefish."}
 | 
			
		||||
	{"fishing",  				"bluewhite_raw",			0,			"a Bluewhite."}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fishing_setting.prizes["shark"] = {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,3 +2,9 @@ These sounds are used for the Mod for Minetest; Fishing - Mossmanikin's version.
 | 
			
		||||
The included sounds are http://creativecommons.org/licenses/by-nc-sa/3.0/ 
 | 
			
		||||
 | 
			
		||||
--"fishing_bobber1" & "fishing_bobber2" sampled from "01260 water swimming splashing 1.wav", Attribution Noncommercial License, Robinhood76, http://www.freesound.org/people/Robinhood76/sounds/79657/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
"fishing_contest_start" resampled from "cor 9.mp3", Pierre Grandjean, https://www.freesound.org/people/Pierre%20Grandjean/sounds/125973/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
"fishing_contest_end" resampled from "Trompette 8", jebb, https://www.freesound.org/people/jebb/sounds/205848/
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								sounds/fishing_contest_end.ogg
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								sounds/fishing_contest_end.ogg
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								sounds/fishing_contest_start.ogg
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								sounds/fishing_contest_start.ogg
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 317 B  | 
@@ -13,7 +13,7 @@ local trophy = {
 | 
			
		||||
	{"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",	                "bluefish_raw",	        "Bluefish",	        "fishing_bluefish_raw.png"},
 | 
			
		||||
	{"fishing",	                "bluewhite_raw",	        "Bluewhite",	        "fishing_bluewhite_raw.png"},
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
local function has_trophy_privilege(meta, player)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user