diff --git a/depends.txt b/depends.txt index d419617..9778ae9 100644 --- a/depends.txt +++ b/depends.txt @@ -1,4 +1,7 @@ default subterrane farming -harderstone? \ No newline at end of file +harderstone? +cottages? +bucket? +dynamic_liquid? \ No newline at end of file diff --git a/plants/cave_wheat.lua b/plants/cave_wheat.lua index 027f294..7b193b3 100644 --- a/plants/cave_wheat.lua +++ b/plants/cave_wheat.lua @@ -63,3 +63,33 @@ minetest.register_craft({ recipe = "dfcaverns:cave_wheat", burntime = 2 }) + +minetest.register_craftitem("dfcaverns:cave_flour", { + description = S("Cave Wheat Flour"), + inventory_image = "dfcaverns_flour.png", + groups = {flammable = 1}, +}) + +minetest.register_craftitem("dfcaverns:cave_bread", { + description = S("Cave Wheat Bread"), + inventory_image = "dfcaverns_bread.png", + on_use = minetest.item_eat(5), + groups = {flammable = 2}, +}) + +if minetest.get_modpath("cottages") then + cottages.handmill_product["dfcaverns:cave_wheat"] = "dfcaverns:cave_flour"; +else +minetest.register_craft({ + type = "shapeless", + output = "dfcaverns:cave_flour", + recipe = {"dfcaverns:cave_wheat", "dfcaverns:cave_wheat", "dfcaverns:cave_wheat", "dfcaverns:cave_wheat"} +}) +end + +minetest.register_craft({ + type = "cooking", + cooktime = 15, + output = "dfcaverns:cave_bread", + recipe = "dfcaverns:cave_flour" +}) diff --git a/plants/dimple_cup.lua b/plants/dimple_cup.lua index 00448a6..7d9cc8f 100644 --- a/plants/dimple_cup.lua +++ b/plants/dimple_cup.lua @@ -13,7 +13,7 @@ local register_dimple_cup = function(number) paramtype = "light", walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11}, + groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, color_blue = 1, light_sensitive_fungus = 11}, sounds = default.node_sound_leaves_defaults(), drop = { max_items = 1, diff --git a/plants/plump_helmet.lua b/plants/plump_helmet.lua index 43d0c9f..333ba07 100644 --- a/plants/plump_helmet.lua +++ b/plants/plump_helmet.lua @@ -96,9 +96,12 @@ minetest.register_node("dfcaverns:plump_helmet_1", { {-0.125 + displace_x, -0.4375, -0.1875 + displace_z, 0.1875 + displace_x, -0.3125, 0.125 + displace_z}, -- cap } }, + on_place = function(itemstack, placer, pointed_thing) return plump_helmet_on_place(itemstack, placer, pointed_thing, "dfcaverns:plump_helmet_1") end, + + on_use = minetest.item_eat(1), }) @@ -139,6 +142,8 @@ minetest.register_node("dfcaverns:plump_helmet_2", { on_place = function(itemstack, placer, pointed_thing) return plump_helmet_on_place(itemstack, placer, pointed_thing, "dfcaverns:plump_helmet_2") end, + + on_use = minetest.item_eat(2), }) minetest.register_node("dfcaverns:plump_helmet_3", { @@ -177,6 +182,8 @@ minetest.register_node("dfcaverns:plump_helmet_3", { on_place = function(itemstack, placer, pointed_thing) return plump_helmet_on_place(itemstack, placer, pointed_thing, "dfcaverns:plump_helmet_3") end, + + on_use = minetest.item_eat(3), }) minetest.register_node("dfcaverns:plump_helmet_4", { @@ -223,6 +230,8 @@ minetest.register_node("dfcaverns:plump_helmet_4", { on_place = function(itemstack, placer, pointed_thing) return plump_helmet_on_place(itemstack, placer, pointed_thing, "dfcaverns:plump_helmet_4") end, + + on_use = minetest.item_eat(4), }) local plump_names = {"dfcaverns:plump_helmet_spawn", "dfcaverns:plump_helmet_1", "dfcaverns:plump_helmet_2", "dfcaverns:plump_helmet_3"} diff --git a/plants/sweet_pod.lua b/plants/sweet_pod.lua index 165da72..d44297d 100644 --- a/plants/sweet_pod.lua +++ b/plants/sweet_pod.lua @@ -61,4 +61,139 @@ minetest.register_craft({ type = "fuel", recipe = "dfcaverns:sweet_pods", burntime = 4 -}) \ No newline at end of file +}) + +--------------------------------------------- +-- Sugar + +minetest.register_craftitem("dfcaverns:sugar", { + description = S("Sweet Pod Sugar"), + inventory_image = "dfcaverns_sugar.png", +}) + +if minetest.get_modpath("cottages") then + cottages.handmill_product["dfcaverns:sweet_pods"] = "dfcaverns:sugar"; +else +minetest.register_craft({ + type = "cooking", + cooktime = 3, + output = "dfcaverns:sugar", + recipe = "dfcaverns:sweet_pods", +}) +end + +---------------------------------------------- +-- Syrup + +if minetest.get_modpath("bucket") then + minetest.register_node("dfcaverns:dwarven_syrup_source", { + description = S("Dwarven Syrup Source"), + drawtype = "liquid", + tiles = { + { + name = "dfcaverns_dwarven_syrup_source_animated.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 2.0, + }, + }, + }, + special_tiles = { + { + name = "dfcaverns_dwarven_syrup_source_animated.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 2.0, + }, + backface_culling = false, + }, + }, + alpha = 160, + paramtype = "light", + walkable = false, + pointable = false, + diggable = false, + buildable_to = true, + is_ground_content = false, + drop = "", + drowning = 1, + liquidtype = "source", + liquid_alternative_flowing = "dfcaverns:dwarven_syrup_flowing", + liquid_alternative_source = "dfcaverns:dwarven_syrup_source", + liquid_viscosity = 7, + liquid_renewable = false, + liquid_range = 2, + post_effect_color = {a = 191, r = 179, g = 131, b = 88}, + groups = {liquid = 3, flammable = 2}, + sounds = default.node_sound_water_defaults(), + }) + + minetest.register_node("dfcaverns:dwarven_syrup_flowing", { + description = S("Flowing Dwarven Syrup"), + drawtype = "flowingliquid", + tiles = {"dfcaverns_dwarven_syrup.png"}, + special_tiles = { + { + name = "dfcaverns_dwarven_syrup_flowing_animated.png", + backface_culling = false, + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 0.8, + }, + }, + { + name = "dfcaverns_dwarven_syrup_flowing_animated.png", + backface_culling = true, + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 0.8, + }, + }, + }, + alpha = 160, + paramtype = "light", + paramtype2 = "flowingliquid", + walkable = false, + pointable = false, + diggable = false, + buildable_to = true, + is_ground_content = false, + drop = "", + drowning = 1, + liquidtype = "flowing", + liquid_alternative_flowing = "dfcaverns:dwarven_syrup_flowing", + liquid_alternative_source = "dfcaverns:dwarven_syrup_source", + liquid_viscosity = 7, + liquid_renewable = false, + liquid_range = 2, + post_effect_color = {a = 191, r = 179, g = 131, b = 88}, + groups = {liquid = 3, flammable = 2, not_in_creative_inventory = 1}, + sounds = default.node_sound_water_defaults(), + }) + + bucket.register_liquid( + "dfcaverns:dwarven_syrup_source", + "dfcaverns:dwarven_syrup_flowing", + "dfcaverns:dwarven_syrup_bucket", + "dfcaverns_bucket_dwarven_syrup.png", + S("Dwarven Syrup Bucket") + ) + + minetest.register_craft({ + type = "shapeless", + output = "dfcaverns:dwarven_syrup_bucket", + recipe = {"bucket:bucket_empty", "dfcaverns:sugar", "dfcaverns:sugar", "dfcaverns:sugar"}, + }) + + if minetest.get_modpath("dynamic_liquid") then + dynamic_liquid.liquid_abm("dfcaverns:dwarven_syrup_source", "dfcaverns:dwarven_syrup_flowing", 5) + end +end \ No newline at end of file diff --git a/textures/dfcaverns_bread.png b/textures/dfcaverns_bread.png new file mode 100644 index 0000000..d82b056 Binary files /dev/null and b/textures/dfcaverns_bread.png differ diff --git a/textures/dfcaverns_bucket_dwarven_syrup.png b/textures/dfcaverns_bucket_dwarven_syrup.png new file mode 100644 index 0000000..b10b7f8 Binary files /dev/null and b/textures/dfcaverns_bucket_dwarven_syrup.png differ diff --git a/textures/dfcaverns_dwarven_syrup.png b/textures/dfcaverns_dwarven_syrup.png new file mode 100644 index 0000000..4c96e90 Binary files /dev/null and b/textures/dfcaverns_dwarven_syrup.png differ diff --git a/textures/dfcaverns_dwarven_syrup_flowing_animated.png b/textures/dfcaverns_dwarven_syrup_flowing_animated.png new file mode 100644 index 0000000..2d4b8c6 Binary files /dev/null and b/textures/dfcaverns_dwarven_syrup_flowing_animated.png differ diff --git a/textures/dfcaverns_dwarven_syrup_source_animated.png b/textures/dfcaverns_dwarven_syrup_source_animated.png new file mode 100644 index 0000000..5835cb1 Binary files /dev/null and b/textures/dfcaverns_dwarven_syrup_source_animated.png differ diff --git a/textures/dfcaverns_flour.png b/textures/dfcaverns_flour.png new file mode 100644 index 0000000..de4cc2f Binary files /dev/null and b/textures/dfcaverns_flour.png differ diff --git a/textures/dfcaverns_sugar.png b/textures/dfcaverns_sugar.png new file mode 100644 index 0000000..93031af Binary files /dev/null and b/textures/dfcaverns_sugar.png differ diff --git a/textures/license.txt b/textures/license.txt index 8272b90..5192076 100644 --- a/textures/license.txt +++ b/textures/license.txt @@ -9,4 +9,12 @@ dftrees_tower_cap_gills - from caverealms mushroom gills dftrees_cave_wheat - derived from farming wheat dftrees_tunnel_tube - derived from moretrees palm tree bark dfcaverns_fungi - copied from caverealms -dfcaverns_glow_worm - copied from caverealms \ No newline at end of file +dfcaverns_glow_worm - copied from caverealms +dfcaverns_flour - derived from farming +dfcaverns_bread - derived from farming +dfcaverns_pig_tail_thread - copied from farming +dfcaverns_sugar - derived from farming + +dfcaverns_dwarven_syrup_source_animated - derived from default +dfcaverns_dwarven_syrup - derived from default +dfcaverns_dwarven_syrup_flowing_animated - derived from default \ No newline at end of file