use groups to create baitball and cooked craft instead of redundant code, thanks Chem871

fix indentation
This commit is contained in:
crabman77 2017-12-09 01:19:28 +01:00
parent 7a88dd9e1f
commit 091611b1cd
3 changed files with 49 additions and 225 deletions

View File

@ -24,35 +24,6 @@ minetest.register_craftitem("fishing:baitball_shark", {
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "fishing:baitball_shark 20", 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"}
})

View File

@ -82,49 +82,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = "fishing:fish_cooked", output = "fishing:fish_cooked",
recipe = "fishing:fish_raw", recipe = "group:fishraw",
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",
cooktime = 2, 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"}
})

View File

@ -9,35 +9,36 @@
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:fish_raw", { minetest.register_craftitem("fishing:fish_raw", {
description = fishing_setting.func.S("Fish"), description = fishing_setting.func.S("Fish"),
groups = {}, groups = {fishbait=1, fishraw=1},
inventory_image = "fishing_fish_raw.png", inventory_image = "fishing_fish_raw.png",
on_use = minetest.item_eat(2), on_use = minetest.item_eat(2),
}) })
-----------------------------------------------------
-- Roasted Fish -----------------------------------------------------
----------------------------------------------------- -- Roasted Fish
minetest.register_craftitem("fishing:fish_cooked", { -----------------------------------------------------
description = fishing_setting.func.S("Roasted Fish"), minetest.register_craftitem("fishing:fish_cooked", {
groups = {}, description = fishing_setting.func.S("Roasted Fish"),
inventory_image = "fishing_fish_cooked.png", groups = {},
on_use = minetest.item_eat(4), inventory_image = "fishing_fish_cooked.png",
}) on_use = minetest.item_eat(4),
----------------------------------------------------- })
-- Sushi -----------------------------------------------------
----------------------------------------------------- -- Sushi
minetest.register_craftitem("fishing:sushi", { -----------------------------------------------------
description = fishing_setting.func.S("Sushi (Hoso Maki)"), minetest.register_craftitem("fishing:sushi", {
groups = {}, description = fishing_setting.func.S("Sushi (Hoso Maki)"),
inventory_image = "fishing_sushi.png", groups = {},
on_use = minetest.item_eat(6), inventory_image = "fishing_sushi.png",
}) on_use = minetest.item_eat(6),
})
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
-- clownfish -- clownfish
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:clownfish_raw", { minetest.register_craftitem("fishing:clownfish_raw", {
description = fishing_setting.func.S("Clownfish"), description = fishing_setting.func.S("Clownfish"),
groups = {}, groups = {fishbait=1, fishraw=1},
inventory_image = "fishing_clownfish_raw.png", inventory_image = "fishing_clownfish_raw.png",
on_use = minetest.item_eat(2), on_use = minetest.item_eat(2),
}) })
@ -47,7 +48,7 @@ minetest.register_craftitem("fishing:clownfish_raw", {
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:bluewhite_raw", { minetest.register_craftitem("fishing:bluewhite_raw", {
description = fishing_setting.func.S("Bluewhite"), description = fishing_setting.func.S("Bluewhite"),
groups = {}, groups = {fishbait=1, fishraw=1},
inventory_image = "fishing_bluewhite_raw.png", inventory_image = "fishing_bluewhite_raw.png",
on_use = minetest.item_eat(2), on_use = minetest.item_eat(2),
}) })
@ -56,7 +57,7 @@ minetest.register_craftitem("fishing:bluewhite_raw", {
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:exoticfish_raw", { minetest.register_craftitem("fishing:exoticfish_raw", {
description = fishing_setting.func.S("Exotic"), description = fishing_setting.func.S("Exotic"),
groups = {}, groups = {fishbait=1, fishraw=1},
inventory_image = "fishing_exoticfish_raw.png", inventory_image = "fishing_exoticfish_raw.png",
on_use = minetest.item_eat(2), on_use = minetest.item_eat(2),
}) })
@ -66,7 +67,7 @@ minetest.register_craftitem("fishing:exoticfish_raw", {
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:carp_raw", { minetest.register_craftitem("fishing:carp_raw", {
description = fishing_setting.func.S("Carp"), description = fishing_setting.func.S("Carp"),
groups = {}, groups = {fishbait=1, fishraw=1},
inventory_image = "fishing_carp_raw.png", inventory_image = "fishing_carp_raw.png",
on_use = minetest.item_eat(2), on_use = minetest.item_eat(2),
}) })
@ -76,7 +77,7 @@ minetest.register_craftitem("fishing:carp_raw", {
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:perch_raw", { minetest.register_craftitem("fishing:perch_raw", {
description = fishing_setting.func.S("Perch"), description = fishing_setting.func.S("Perch"),
groups = {}, groups = {fishbait=1, fishraw=1},
inventory_image = "fishing_perch_raw.png", inventory_image = "fishing_perch_raw.png",
on_use = minetest.item_eat(2), on_use = minetest.item_eat(2),
}) })
@ -86,7 +87,7 @@ minetest.register_craftitem("fishing:perch_raw", {
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:catfish_raw", { minetest.register_craftitem("fishing:catfish_raw", {
description = fishing_setting.func.S("Catfish"), description = fishing_setting.func.S("Catfish"),
groups = {}, groups = {fishbait=1, fishraw=1},
inventory_image = "fishing_catfish_raw.png", inventory_image = "fishing_catfish_raw.png",
on_use = minetest.item_eat(2), on_use = minetest.item_eat(2),
}) })
@ -97,35 +98,36 @@ minetest.register_craftitem("fishing:catfish_raw", {
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:shark_raw", { minetest.register_craftitem("fishing:shark_raw", {
description = fishing_setting.func.S("Shark"), description = fishing_setting.func.S("Shark"),
groups = {}, groups = {fishbait=1},
inventory_image = "fishing_shark_raw.png", inventory_image = "fishing_shark_raw.png",
on_use = minetest.item_eat(2), on_use = minetest.item_eat(2),
}) })
-----------------------------------------------------
-- Roasted Shark -----------------------------------------------------
----------------------------------------------------- -- Roasted Shark
minetest.register_craftitem("fishing:shark_cooked", { -----------------------------------------------------
description = fishing_setting.func.S("Roasted Shark"), minetest.register_craftitem("fishing:shark_cooked", {
groups = {}, description = fishing_setting.func.S("Roasted Shark"),
inventory_image = "fishing_shark_cooked.png", groups = {},
on_use = minetest.item_eat(6), inventory_image = "fishing_shark_cooked.png",
}) on_use = minetest.item_eat(6),
})
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
-- Pike -- Pike
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craftitem("fishing:pike_raw", { minetest.register_craftitem("fishing:pike_raw", {
description = fishing_setting.func.S("Northern Pike"), description = fishing_setting.func.S("Northern Pike"),
groups = {}, groups = {fishbait=1},
inventory_image = "fishing_pike_raw.png", inventory_image = "fishing_pike_raw.png",
on_use = minetest.item_eat(2), on_use = minetest.item_eat(2),
}) })
----------------------------------------------------- -----------------------------------------------------
-- Roasted Pike -- Roasted Pike
----------------------------------------------------- -----------------------------------------------------
minetest.register_craftitem("fishing:pike_cooked", { minetest.register_craftitem("fishing:pike_cooked", {
description = fishing_setting.func.S("Roasted Northern Pike"), description = fishing_setting.func.S("Roasted Northern Pike"),
groups = {}, groups = {},
inventory_image = "fishing_pike_cooked.png", inventory_image = "fishing_pike_cooked.png",
on_use = minetest.item_eat(6), on_use = minetest.item_eat(6),
}) })