From 091611b1cd65bc1e1ab763dec7b72c0852eb5f1c Mon Sep 17 00:00:00 2001 From: crabman77 Date: Sat, 9 Dec 2017 01:19:28 +0100 Subject: [PATCH] use groups to create baitball and cooked craft instead of redundant code, thanks Chem871 fix indentation --- baitball.lua | 31 +---------- crafting.lua | 151 +-------------------------------------------------- fishes.lua | 92 ++++++++++++++++--------------- 3 files changed, 49 insertions(+), 225 deletions(-) diff --git a/baitball.lua b/baitball.lua index 72aaa91..407f33d 100755 --- a/baitball.lua +++ b/baitball.lua @@ -24,35 +24,6 @@ minetest.register_craftitem("fishing:baitball_shark", { minetest.register_craft({ type = "shapeless", output = "fishing:baitball_shark 20", - recipe = {"fishing:fish_raw", "fishing:fish_raw"} + recipe = {"group:fishbait", "group:fishbait"} }) -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:shark_raw", "fishing:shark_raw"} -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:pike_raw", "fishing:pike_raw"} -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - 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"} -}) diff --git a/crafting.lua b/crafting.lua index ee941b1..c72c2d6 100755 --- a/crafting.lua +++ b/crafting.lua @@ -82,49 +82,7 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", output = "fishing:fish_cooked", - recipe = "fishing:fish_raw", - cooktime = 2, -}) - -minetest.register_craft({ - type = "cooking", - output = "fishing:fish_cooked", - recipe = "fishing:clownfish_raw", - cooktime = 2, -}) - -minetest.register_craft({ - type = "cooking", - output = "fishing:fish_cooked", - recipe = "fishing:bluewhite_raw", - 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", + recipe = "group:fishraw", cooktime = 2, }) @@ -214,110 +172,3 @@ minetest.register_craft({ }) --- baitball -minetest.register_craftitem("fishing:baitball", { - description = fishing_setting.func.S("Bait Ball"), - inventory_image = "fishing_baitball.png", - stack_max = 99, -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball 20", - recipe = {"farming:flour", "farming:corn", "bucket:bucket_water"}, - replacements = {{ "bucket:bucket_water", "bucket:bucket_empty"}} -}) - - --- baitball_shark -minetest.register_craftitem("fishing:baitball_shark", { - description = fishing_setting.func.S("Shark Bait Ball"), - inventory_image = "fishing_baitball_shark.png", - stack_max = 99, -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:fish_raw", "fishing:fish_raw"} -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:clownfish_raw", "fishing:clownfish_raw"} -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:clownfish_raw", "fishing:fish_raw"} -}) -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:bluewhite_raw", "fishing:bluewhite_raw"} -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:bluewhite_raw", "fishing:fish_raw"} -}) -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:clownfish_raw", "fishing:bluewhite_raw"} -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - 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:bluewhite_raw", "fishing:shark_raw"} -}) -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:bluewhite_raw", "fishing:pike_raw"} -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:shark_raw", "fishing:shark_raw"} -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - recipe = {"fishing:pike_raw", "fishing:pike_raw"} -}) - -minetest.register_craft({ - type = "shapeless", - output = "fishing:baitball_shark 20", - 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"} -}) - diff --git a/fishes.lua b/fishes.lua index 9a6fdcc..9bad07e 100755 --- a/fishes.lua +++ b/fishes.lua @@ -9,35 +9,36 @@ ----------------------------------------------------------------------------------------------- minetest.register_craftitem("fishing:fish_raw", { description = fishing_setting.func.S("Fish"), - groups = {}, + groups = {fishbait=1, fishraw=1}, inventory_image = "fishing_fish_raw.png", on_use = minetest.item_eat(2), }) - ----------------------------------------------------- - -- Roasted Fish - ----------------------------------------------------- - minetest.register_craftitem("fishing:fish_cooked", { - description = fishing_setting.func.S("Roasted Fish"), - groups = {}, - inventory_image = "fishing_fish_cooked.png", - on_use = minetest.item_eat(4), - }) - ----------------------------------------------------- - -- Sushi - ----------------------------------------------------- - minetest.register_craftitem("fishing:sushi", { - description = fishing_setting.func.S("Sushi (Hoso Maki)"), - groups = {}, - inventory_image = "fishing_sushi.png", - on_use = minetest.item_eat(6), - }) + +----------------------------------------------------- +-- Roasted Fish +----------------------------------------------------- +minetest.register_craftitem("fishing:fish_cooked", { + description = fishing_setting.func.S("Roasted Fish"), + groups = {}, + inventory_image = "fishing_fish_cooked.png", + on_use = minetest.item_eat(4), +}) +----------------------------------------------------- +-- Sushi +----------------------------------------------------- +minetest.register_craftitem("fishing:sushi", { + description = fishing_setting.func.S("Sushi (Hoso Maki)"), + groups = {}, + inventory_image = "fishing_sushi.png", + on_use = minetest.item_eat(6), +}) ----------------------------------------------------------------------------------------------- -- clownfish ----------------------------------------------------------------------------------------------- minetest.register_craftitem("fishing:clownfish_raw", { description = fishing_setting.func.S("Clownfish"), - groups = {}, + groups = {fishbait=1, fishraw=1}, inventory_image = "fishing_clownfish_raw.png", on_use = minetest.item_eat(2), }) @@ -47,7 +48,7 @@ minetest.register_craftitem("fishing:clownfish_raw", { ----------------------------------------------------------------------------------------------- minetest.register_craftitem("fishing:bluewhite_raw", { description = fishing_setting.func.S("Bluewhite"), - groups = {}, + groups = {fishbait=1, fishraw=1}, inventory_image = "fishing_bluewhite_raw.png", on_use = minetest.item_eat(2), }) @@ -56,7 +57,7 @@ minetest.register_craftitem("fishing:bluewhite_raw", { ----------------------------------------------------------------------------------------------- minetest.register_craftitem("fishing:exoticfish_raw", { description = fishing_setting.func.S("Exotic"), - groups = {}, + groups = {fishbait=1, fishraw=1}, inventory_image = "fishing_exoticfish_raw.png", on_use = minetest.item_eat(2), }) @@ -66,7 +67,7 @@ minetest.register_craftitem("fishing:exoticfish_raw", { ----------------------------------------------------------------------------------------------- minetest.register_craftitem("fishing:carp_raw", { description = fishing_setting.func.S("Carp"), - groups = {}, + groups = {fishbait=1, fishraw=1}, inventory_image = "fishing_carp_raw.png", on_use = minetest.item_eat(2), }) @@ -76,7 +77,7 @@ minetest.register_craftitem("fishing:carp_raw", { ----------------------------------------------------------------------------------------------- minetest.register_craftitem("fishing:perch_raw", { description = fishing_setting.func.S("Perch"), - groups = {}, + groups = {fishbait=1, fishraw=1}, inventory_image = "fishing_perch_raw.png", on_use = minetest.item_eat(2), }) @@ -86,7 +87,7 @@ minetest.register_craftitem("fishing:perch_raw", { ----------------------------------------------------------------------------------------------- minetest.register_craftitem("fishing:catfish_raw", { description = fishing_setting.func.S("Catfish"), - groups = {}, + groups = {fishbait=1, fishraw=1}, inventory_image = "fishing_catfish_raw.png", on_use = minetest.item_eat(2), }) @@ -97,35 +98,36 @@ minetest.register_craftitem("fishing:catfish_raw", { ----------------------------------------------------------------------------------------------- minetest.register_craftitem("fishing:shark_raw", { description = fishing_setting.func.S("Shark"), - groups = {}, + groups = {fishbait=1}, inventory_image = "fishing_shark_raw.png", on_use = minetest.item_eat(2), }) - ----------------------------------------------------- - -- Roasted Shark - ----------------------------------------------------- - minetest.register_craftitem("fishing:shark_cooked", { - description = fishing_setting.func.S("Roasted Shark"), - groups = {}, - inventory_image = "fishing_shark_cooked.png", - on_use = minetest.item_eat(6), - }) + +----------------------------------------------------- +-- Roasted Shark +----------------------------------------------------- +minetest.register_craftitem("fishing:shark_cooked", { + description = fishing_setting.func.S("Roasted Shark"), + groups = {}, + inventory_image = "fishing_shark_cooked.png", + on_use = minetest.item_eat(6), +}) ----------------------------------------------------------------------------------------------- -- Pike ----------------------------------------------------------------------------------------------- minetest.register_craftitem("fishing:pike_raw", { description = fishing_setting.func.S("Northern Pike"), - groups = {}, + groups = {fishbait=1}, inventory_image = "fishing_pike_raw.png", on_use = minetest.item_eat(2), }) - ----------------------------------------------------- - -- Roasted Pike - ----------------------------------------------------- - minetest.register_craftitem("fishing:pike_cooked", { - description = fishing_setting.func.S("Roasted Northern Pike"), - groups = {}, - inventory_image = "fishing_pike_cooked.png", - on_use = minetest.item_eat(6), - }) +----------------------------------------------------- +-- Roasted Pike +----------------------------------------------------- +minetest.register_craftitem("fishing:pike_cooked", { + description = fishing_setting.func.S("Roasted Northern Pike"), + groups = {}, + inventory_image = "fishing_pike_cooked.png", + on_use = minetest.item_eat(6), +})