add "_raw" in name fishing:fish, shark, pike, clownfish, bluefish
							
								
								
									
										12
									
								
								baitball.lua
									
									
									
									
									
								
							
							
						
						| @@ -27,35 +27,35 @@ minetest.register_craftitem("fishing:baitball_shark", { | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:fish", "fishing:fish"} | ||||
| 	recipe = {"fishing:fish_raw", "fishing:fish_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:shark", "fishing:shark"} | ||||
| 	recipe = {"fishing:shark_raw", "fishing:shark_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:pike", "fishing:pike"} | ||||
| 	recipe = {"fishing:pike_raw", "fishing:pike_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:fish", "fishing:shark"} | ||||
| 	recipe = {"fishing:fish_raw", "fishing:shark_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:fish", "fishing:pike"} | ||||
| 	recipe = {"fishing:fish_raw", "fishing:pike_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:shark", "fishing:pike"} | ||||
| 	recipe = {"fishing:shark_raw", "fishing:pike_raw"} | ||||
| }) | ||||
|   | ||||
| @@ -21,8 +21,8 @@ fishing_setting.baits["fishing:bait_worm"] = { ["bait"] = "fishing:bait_worm", [ | ||||
|  | ||||
| --shark bait | ||||
| --bait_fish | ||||
| fishing_setting.baits["fishing:fish"] = { ["bait"] = "fishing:fish", ["bobber"] = "fishing:bobber_shark_entity",["texture"] = "fishing_fish.png", ["hungry"] = 50 } | ||||
| 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"] = { ["bait"] = "fishing:clownfish", ["bobber"] = "fishing:bobber_shark_entity",["texture"] = "fishing_clownfish.png", ["hungry"] = 50 } | ||||
| fishing_setting.baits["fishing:bluefish"] = { ["bait"] = "fishing:bluefish", ["bobber"] = "fishing:bobber_shark_entity",["texture"] = "fishing_bluefish.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 } | ||||
|  | ||||
|   | ||||
							
								
								
									
										77
									
								
								crafting.lua
									
									
									
									
									
								
							
							
						
						| @@ -81,20 +81,20 @@ minetest.register_craft({ | ||||
| minetest.register_craft({ | ||||
| 	type = "cooking", | ||||
| 	output = "fishing:fish_cooked", | ||||
| 	recipe = "fishing:fish", | ||||
| 	recipe = "fishing:fish_raw", | ||||
| 	cooktime = 2, | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "cooking", | ||||
| 	output = "fishing:fish_cooked", | ||||
| 	recipe = "fishing:clownfish", | ||||
| 	recipe = "fishing:clownfish_raw", | ||||
| 	cooktime = 2, | ||||
| }) | ||||
| minetest.register_craft({ | ||||
| 	type = "cooking", | ||||
| 	output = "fishing:fish_cooked", | ||||
| 	recipe = "fishing:bluefish", | ||||
| 	recipe = "fishing:bluefish_raw", | ||||
| 	cooktime = 2, | ||||
| }) | ||||
|  | ||||
| @@ -134,7 +134,7 @@ end | ||||
| minetest.register_craft({ | ||||
| 	type = "cooking", | ||||
| 	output = "fishing:shark_cooked", | ||||
| 	recipe = "fishing:shark", | ||||
| 	recipe = "fishing:shark_raw", | ||||
| 	cooktime = 2, | ||||
| }) | ||||
|  | ||||
| @@ -144,12 +144,11 @@ minetest.register_craft({ | ||||
| minetest.register_craft({ | ||||
| 	type = "cooking", | ||||
| 	output = "fishing:pike_cooked", | ||||
| 	recipe = "fishing:pike", | ||||
| 	recipe = "fishing:pike_raw", | ||||
| 	cooktime = 2, | ||||
| }) | ||||
|  | ||||
|  | ||||
|  | ||||
| -- baitball | ||||
| minetest.register_craftitem("fishing:baitball", { | ||||
| 	description = fishing_setting.func.S("Bait Ball"), | ||||
| @@ -175,81 +174,85 @@ minetest.register_craftitem("fishing:baitball_shark", { | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:fish", "fishing:fish"} | ||||
| 	recipe = {"fishing:fish_raw", "fishing:fish_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:clownfish", "fishing:clownfish"} | ||||
| 	recipe = {"fishing:clownfish_raw", "fishing:clownfish_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:clownfish", "fishing:fish"} | ||||
| 	recipe = {"fishing:clownfish_raw", "fishing:fish_raw"} | ||||
| }) | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:bluefish", "fishing:bluefish"} | ||||
| 	recipe = {"fishing:bluefish_raw", "fishing:bluefish_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:bluefish", "fishing:fish"} | ||||
| 	recipe = {"fishing:bluefish_raw", "fishing:fish_raw"} | ||||
| }) | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:clownfish", "fishing:bluefish"} | ||||
| }) | ||||
|  | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:shark", "fishing:shark"} | ||||
| 	recipe = {"fishing:clownfish_raw", "fishing:bluefish_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:pike", "fishing:pike"} | ||||
| 	recipe = {"fishing:clownfish_raw", "fishing:shark_raw"} | ||||
| }) | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:clownfish_raw", "fishing:pike_raw"} | ||||
| }) | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:bluefish_raw", "fishing:shark_raw"} | ||||
| }) | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:bluefish_raw", "fishing:pike_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:fish", "fishing:shark"} | ||||
| 	recipe = {"fishing:shark_raw", "fishing:shark_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:fish", "fishing:pike"} | ||||
| 	recipe = {"fishing:pike_raw", "fishing:pike_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:shark", "fishing:pike"} | ||||
| 	recipe = {"fishing:fish_raw", "fishing:shark_raw"} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:fish_raw", "fishing:pike_raw"} | ||||
| }) | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	type = "shapeless", | ||||
| 	output = "fishing:baitball_shark 20", | ||||
| 	recipe = {"fishing:shark_raw", "fishing:pike_raw"} | ||||
| }) | ||||
|  | ||||
|   | ||||
							
								
								
									
										20
									
								
								fishes.lua
									
									
									
									
									
								
							
							
						
						| @@ -7,10 +7,10 @@ | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| -- Fish | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| minetest.register_craftitem("fishing:fish", { | ||||
| minetest.register_craftitem("fishing:fish_raw", { | ||||
| 	description = fishing_setting.func.S("Fish"), | ||||
| 	groups = {}, | ||||
| 	inventory_image = "fishing_fish.png", | ||||
| 	inventory_image = "fishing_fish_raw.png", | ||||
| 	 on_use = minetest.item_eat(2), | ||||
| }) | ||||
| 	----------------------------------------------------- | ||||
| @@ -35,30 +35,30 @@ minetest.register_craftitem("fishing:fish", { | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| -- clownfish | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| minetest.register_craftitem("fishing:clownfish", { | ||||
| minetest.register_craftitem("fishing:clownfish_raw", { | ||||
| 	description = fishing_setting.func.S("Clownfish"), | ||||
| 	groups = {}, | ||||
| 	inventory_image = "fishing_clownfish.png", | ||||
| 	inventory_image = "fishing_clownfish_raw.png", | ||||
| 	 on_use = minetest.item_eat(2), | ||||
| }) | ||||
|  | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| -- bluefish | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| minetest.register_craftitem("fishing:bluefish", { | ||||
| minetest.register_craftitem("fishing:bluefish_raw", { | ||||
| 	description = fishing_setting.func.S("Bluefish"), | ||||
| 	groups = {}, | ||||
| 	inventory_image = "fishing_bluefish.png", | ||||
| 	inventory_image = "fishing_bluefish_raw.png", | ||||
| 	 on_use = minetest.item_eat(2), | ||||
| }) | ||||
|  | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| -- Whatthef... it's a freakin' Shark! | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| minetest.register_craftitem("fishing:shark", { | ||||
| minetest.register_craftitem("fishing:shark_raw", { | ||||
| 	description = fishing_setting.func.S("Shark"), | ||||
| 	groups = {}, | ||||
| 	inventory_image = "fishing_shark.png", | ||||
| 	inventory_image = "fishing_shark_raw.png", | ||||
| 	 on_use = minetest.item_eat(2), | ||||
| }) | ||||
| 	----------------------------------------------------- | ||||
| @@ -74,10 +74,10 @@ minetest.register_craftitem("fishing:shark", { | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| -- Pike | ||||
| ----------------------------------------------------------------------------------------------- | ||||
| minetest.register_craftitem("fishing:pike", { | ||||
| minetest.register_craftitem("fishing:pike_raw", { | ||||
| 	description = fishing_setting.func.S("Northern Pike"), | ||||
| 	groups = {}, | ||||
| 	inventory_image = "fishing_pike.png", | ||||
| 	inventory_image = "fishing_pike_raw.png", | ||||
| 	 on_use = minetest.item_eat(2), | ||||
| }) | ||||
| 	----------------------------------------------------- | ||||
|   | ||||
| @@ -289,8 +289,6 @@ function fishing_setting.func.load_trophies() | ||||
| 	end | ||||
| end | ||||
|  | ||||
|  | ||||
|  | ||||
| function fishing_setting.func.save_trophies() | ||||
| 	local input = io.open(fishing_setting.file_trophies, "w") | ||||
| 	if input then | ||||
| @@ -309,7 +307,7 @@ 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 } | ||||
| 		fishing_setting.trophies[playername] = { ["fish_raw"] = 0,["shark_raw"] = 0, ["pike_raw"] = 0, ["clownfish_raw"]= 0,  ["bluefish_raw"] = 0 } | ||||
| 	end | ||||
| end) | ||||
|  | ||||
| @@ -317,7 +315,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" or fish == "shark" or fish == "pike" or fish == "clownfish" or fish == "bluefish" then | ||||
| 	if fish == "fish_raw" or fish == "shark_raw" or fish == "pike_raw" or fish == "clownfish_raw" or fish == "bluefish_raw" then | ||||
| 		fishing_setting.trophies[player_name][fish] = fishing_setting.trophies[player_name][fish] + 1 | ||||
| 		 | ||||
| 		if fishing_setting.trophies[player_name][fish]%100 == 0 then | ||||
| @@ -339,7 +337,7 @@ end | ||||
| if (minetest.get_modpath("unified_inventory")) then | ||||
| 	unified_inventory.register_button("menu_fishing", { | ||||
| 		type = "image", | ||||
| 		image = "fishing_fish.png", | ||||
| 		image = "fishing_fish_raw.png", | ||||
| 		tooltip = "fishing menu configuration", | ||||
| 		action = function(player) | ||||
| 			local player_name = player:get_player_name() | ||||
|   | ||||
							
								
								
									
										10
									
								
								prizes.lua
									
									
									
									
									
								
							
							
						
						| @@ -1,14 +1,14 @@ | ||||
|  | ||||
|  | ||||
| fishing_setting.prizes["fish"] = { | ||||
| 	{"fishing",  				"fish",			0,			"a Fish."}, | ||||
| 	{"fishing",  				"clownfish",			0,			"a Clownfish."}, | ||||
| 	{"fishing",  				"bluefish",			0,			"a Bluefish."} | ||||
| 	{"fishing",  				"fish_raw",			0,			"a Fish."}, | ||||
| 	{"fishing",  				"clownfish_raw",			0,			"a Clownfish."}, | ||||
| 	{"fishing",  				"bluefish_raw",			0,			"a Bluefish."} | ||||
| } | ||||
|  | ||||
| fishing_setting.prizes["shark"] = { | ||||
| 	{"fishing",  				"shark",			0,			"a small Shark."}, | ||||
| 	{"fishing",  				"pike",				0,			"a Northern Pike."} | ||||
| 	{"fishing",  				"shark_raw",			0,			"a small Shark."}, | ||||
| 	{"fishing",  				"pike_raw",				0,			"a Northern Pike."} | ||||
| } | ||||
|  | ||||
|  | ||||
|   | ||||
| Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 317 B | 
| Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 352 B | 
| Before Width: | Height: | Size: 486 B After Width: | Height: | Size: 486 B | 
| Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B | 
| Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 389 B | 
							
								
								
									
										10
									
								
								trophies.lua
									
									
									
									
									
								
							
							
						
						| @@ -9,11 +9,11 @@ | ||||
|  | ||||
| local trophy = { | ||||
| --	  mod						 item				 name				icon | ||||
|     {"fishing",  				"fish",				"Fish",				"fishing_fish.png"}, | ||||
| 	{"fishing",  				"pike",				"Northern Pike",	"fishing_pike.png"}, | ||||
| 	{"fishing",  				"shark",			"Shark",			"fishing_shark.png"}, | ||||
| 	{"fishing",		            "clownfish",		"Clownfish",		"fishing_clownfish.png"}, | ||||
| 	{"fishing",	                "bluefish",	        "Bluefish",	        "fishing_bluefish.png"}, | ||||
|     {"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",	                "bluefish_raw",	        "Bluefish",	        "fishing_bluefish_raw.png"}, | ||||
| } | ||||
|  | ||||
| local function has_trophy_privilege(meta, player) | ||||
|   | ||||