diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | bonemeal.lua | 3 | ||||
| -rw-r--r-- | crystal.lua | 8 | ||||
| -rw-r--r-- | dirt.lua | 3 | ||||
| -rw-r--r-- | extra.lua | 3 | ||||
| -rw-r--r-- | fishing.lua | 4 | ||||
| -rw-r--r-- | food.lua | 23 | ||||
| -rw-r--r-- | mapgen.lua | 2 | ||||
| -rw-r--r-- | mushroom.lua | 2 | ||||
| -rw-r--r-- | onion.lua | 1 | ||||
| -rw-r--r-- | plantlife.lua | 1 | ||||
| -rw-r--r-- | sapling.lua | 4 | ||||
| -rw-r--r-- | sealife.lua | 2 | ||||
| -rw-r--r-- | strawberry.lua | 1 |
14 files changed, 37 insertions, 21 deletions
@@ -13,6 +13,7 @@ Ethereal Mapgen mod for Minetest (works on all except v6) ### 1.24 - Updating code to newer functions, requires Minetest 0.4.16 and above + - Added food groups to be more compatible with other food mods ### 1.23 diff --git a/bonemeal.lua b/bonemeal.lua index d80fdac..404aa7b 100644 --- a/bonemeal.lua +++ b/bonemeal.lua @@ -73,7 +73,7 @@ local crops = { {"farming:blueberry_", 4},
{"farming:raspberry_", 4},
{"farming:carrot_", 8},
- {"farming:cocoa_", 3},
+ {"farming:cocoa_", 4},
{"farming:coffee_", 5},
{"farming:cucumber_", 4},
{"farming:potato_", 4},
@@ -88,6 +88,7 @@ local crops = { {"farming:onion_", 5},
{"farming:pepper_", 5},
{"farming:pineapple_", 8},
+ {"farming:pea_", 5},
}
-- check if sapling has enough height room to grow
diff --git a/crystal.lua b/crystal.lua index 0af1296..fdbdd17 100644 --- a/crystal.lua +++ b/crystal.lua @@ -11,13 +11,17 @@ minetest.register_node("ethereal:crystal_spike", { paramtype = "light", light_source = 7, sunlight_propagates = true, - walkable = false, + walkable = true, damage_per_second = 1, groups = {cracky = 1, falling_node = 1, puts_out_fire = 1, cools_lava = 1}, sounds = default.node_sound_glass_defaults(), selection_box = { type = "fixed", - fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 0.41, 5 / 16}, + fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 0, 5 / 16}, + }, + node_box = { + type = "fixed", + fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 0, 5 / 16}, }, }) @@ -57,7 +57,8 @@ for n = 1, #dirts do tiles = { "ethereal_grass_"..name.."_top.png", "default_dirt.png", - "default_dirt.png^ethereal_grass_"..name.."_side.png" + {name = "default_dirt.png^ethereal_grass_"..name.."_side.png", + tileable_vertical = false} }, is_ground_content = ethereal.cavedirt, groups = {crumbly = 3, soil = 1, ethereal_grass = 1}, @@ -133,10 +133,11 @@ minetest.register_craft({ minetest.register_craftitem("ethereal:bowl", { description = S("Bowl"), inventory_image = "bowl.png", + groups = {food_bowl = 1, flammable = 2}, }) minetest.register_craft({ - output = "ethereal:bowl", + output = "ethereal:bowl 4", recipe = { {"group:wood", "", "group:wood"}, {"", "group:wood", ""}, diff --git a/fishing.lua b/fishing.lua index 9640ba3..a7bf7e6 100644 --- a/fishing.lua +++ b/fishing.lua @@ -6,6 +6,7 @@ minetest.register_craftitem("ethereal:fish_raw", { description = S("Raw Fish"), inventory_image = "fish_raw.png", wield_image = "fish_raw.png", + groups = {food_fish_raw = 1, flammable = 3}, on_use = minetest.item_eat(2), }) @@ -14,6 +15,7 @@ minetest.register_craftitem("ethereal:fish_cooked", { description = S("Cooked Fish"), inventory_image = "fish_cooked.png", wield_image = "fish_cooked.png", + groups = {food_fish = 1, flammable = 3}, on_use = minetest.item_eat(5), }) @@ -35,7 +37,7 @@ minetest.register_craftitem("ethereal:sashimi", { minetest.register_craft({ output = "ethereal:sashimi 2", recipe = { - {'ethereal:seaweed','ethereal:fish_raw','ethereal:seaweed'}, + {'group:food_seaweed','group:food_fish_raw','group:food_seaweed'}, } }) @@ -16,7 +16,7 @@ minetest.register_node("ethereal:banana", { fixed = {-0.31, -0.5, -0.31, 0.31, 0.5, 0.31} }, groups = { - fleshy = 3, dig_immediate = 3, flammable = 2, + food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2, leafdecay = 1, leafdecay_drop = 1 }, drop = "ethereal:banana", @@ -38,7 +38,7 @@ minetest.register_craftitem("ethereal:banana_dough", { minetest.register_craft({ type = "shapeless", output = "ethereal:banana_dough", - recipe = {"farming:flour", "ethereal:banana"} + recipe = {"group:food_flour", "group:food_banana"} }) minetest.register_craft({ @@ -63,7 +63,7 @@ minetest.register_node("ethereal:orange", { fixed = {-0.27, -0.37, -0.27, 0.27, 0.44, 0.27} }, groups = { - fleshy = 3, dig_immediate = 3, flammable = 2, + food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2, leafdecay = 3, leafdecay_drop = 1 }, drop = "ethereal:orange", @@ -81,6 +81,7 @@ minetest.register_craftitem("ethereal:pine_nuts", { description = S("Pine Nuts"), inventory_image = "pine_nuts.png", wield_image = "pine_nuts.png", + groups = {food_pine_nuts = 1, flammable = 2}, on_use = minetest.item_eat(1), }) @@ -89,6 +90,7 @@ minetest.register_craftitem("ethereal:banana_bread", { description = S("Banana Loaf"), inventory_image = "banana_bread.png", wield_image = "banana_bread.png", + groups = {food_bread = 1, flammable = 3}, on_use = minetest.item_eat(6), }) @@ -107,7 +109,7 @@ minetest.register_node("ethereal:coconut", { fixed = {-0.31, -0.43, -0.31, 0.31, 0.44, 0.31} }, groups = { - snappy = 1, oddly_breakable_by_hand = 1, cracky = 1, + food_coconut = 1, snappy = 1, oddly_breakable_by_hand = 1, cracky = 1, choppy = 1, flammable = 1, leafdecay = 3, leafdecay_drop = 1 }, drop = "ethereal:coconut_slice 4", @@ -119,6 +121,7 @@ minetest.register_craftitem("ethereal:coconut_slice", { description = S("Coconut Slice"), inventory_image = "moretrees_coconut_slice.png", wield_image = "moretrees_coconut_slice.png", + groups = {food_coconut_slice = 1, flammable = 1}, on_use = minetest.item_eat(1), }) @@ -161,9 +164,9 @@ minetest.register_craftitem("ethereal:hearty_stew", { minetest.register_craft({ output = "ethereal:hearty_stew", recipe = { - {"ethereal:wild_onion_plant","ethereal:mushroom_plant", "ethereal:fern_tubers"}, - {"","ethereal:mushroom_plant", ""}, - {"","ethereal:bowl", ""}, + {"group:food_onion","flowers:mushroom_brown", "group:food_tuber"}, + {"","flowers:mushroom_brown", ""}, + {"","group:food_bowl", ""}, } }) @@ -172,9 +175,9 @@ if farming and farming.mod and farming.mod == "redo" then minetest.register_craft({ output = "ethereal:hearty_stew", recipe = { - {"ethereal:wild_onion_plant","ethereal:mushroom_plant", "farming:beans"}, - {"","ethereal:mushroom_plant", ""}, - {"","ethereal:bowl", ""}, + {"group:food_onion","flowers:mushroom_brown", "group:food_beans"}, + {"","flowers:mushroom_brown", ""}, + {"","group:food_bowl", ""}, } }) end @@ -544,7 +544,7 @@ add_node({"ethereal:green_dirt"}, 0.05, {"jumble"}, 1, 100, {"farming:carrot_7", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4"}, nil, nil, nil, ethereal.jumble)
add_node({"ethereal:prairie_dirt"}, 0.05, {"prairie"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4",
"farming:potato_3", "farming:tomato_7", "farming:corn_8", "farming:coffee_5",
- "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4"}, nil, nil, nil, ethereal.prairie)
+ "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4", "farming:pea_5"}, nil, nil, nil, ethereal.prairie)
-- melon and pumpkin
add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.015, {"junglee"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.junglee)
diff --git a/mushroom.lua b/mushroom.lua index 91947e1..f89b2e8 100644 --- a/mushroom.lua +++ b/mushroom.lua @@ -13,7 +13,7 @@ minetest.register_craft({ recipe = {
{"flowers:mushroom_brown"},
{"flowers:mushroom_brown"},
- {"ethereal:bowl"},
+ {"group:food_bowl"},
}
})
@@ -6,6 +6,7 @@ minetest.register_craftitem("ethereal:wild_onion_plant", { description = S("Wild Onion"),
inventory_image = "wild_onion.png",
wield_image = "wild_onion.png",
+ groups = {food_onion = 1, flammable = 2},
on_place = function(itemstack, placer, pointed_thing)
return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:wild_onion_1")
end,
diff --git a/plantlife.lua b/plantlife.lua index 3f9a714..31846e3 100644 --- a/plantlife.lua +++ b/plantlife.lua @@ -146,6 +146,7 @@ minetest.register_node("ethereal:fern", { minetest.register_craftitem("ethereal:fern_tubers", { description = S("Fern Tubers"), inventory_image = "fern_tubers.png", + groups = {food_tuber = 1, flammable = 2}, on_use = minetest.item_eat(1), }) diff --git a/sapling.lua b/sapling.lua index d616ffc..431ebe6 100644 --- a/sapling.lua +++ b/sapling.lua @@ -12,8 +12,8 @@ minetest.register_node("ethereal:bamboo_sprout", { sunlight_propagates = true, walkable = false, groups = { - snappy = 3, attached_node = 1, flammable = 2, - dig_immediate = 3, ethereal_sapling = 1 + food_bamboo_sprout = 1, snappy = 3, attached_node = 1, flammable = 2, + dig_immediate = 3, ethereal_sapling = 1, sapling = 1, }, sounds = default.node_sound_defaults(), selection_box = { diff --git a/sealife.lua b/sealife.lua index 08d2f0c..b97cb98 100644 --- a/sealife.lua +++ b/sealife.lua @@ -17,7 +17,7 @@ minetest.register_node("ethereal:seaweed", { fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} }, post_effect_color = {a = 64, r = 100, g = 100, b = 200}, - groups = {snappy = 3}, + groups = {food_seaweed = 1, snappy = 3, flammable = 3}, on_use = minetest.item_eat(1), sounds = default.node_sound_leaves_defaults(), after_dig_node = function(pos, node, metadata, digger) diff --git a/strawberry.lua b/strawberry.lua index eea150f..9f9b949 100644 --- a/strawberry.lua +++ b/strawberry.lua @@ -6,6 +6,7 @@ minetest.register_craftitem("ethereal:strawberry", { description = S("Strawberry"), inventory_image = "strawberry.png", wield_image = "strawberry.png", + groups = {food_strawberry = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:strawberry_1") end, |