diff --git a/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/README.md b/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/README.md index 4468892..5dca327 100644 --- a/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/README.md +++ b/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/README.md @@ -12,10 +12,10 @@ Using worldedit, make permanent lava flow shapes. * Code: Open LICENCE file in your favorite text editor (code from the Minetest default mod is trivial) -* Lava Gel Texture +* Crusted Lava Texture CC BY-SA 3.0 Attribution: Cisoun's texture pack, edited by Poikilos -* Lava Gel Cool Lava Bucket Texture +* Crusted Lava Bucket Texture based on: - CC BY-SA 3.0 Lava from Cisoun's texture pack, edited by Poikilos - (c) 2015-2019 and CC BY-SA 3.0: Realistic Bucket by ElementW, modified by Poikilos. diff --git a/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/nodes.lua b/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/nodes.lua index 343de1e..0cc8836 100644 --- a/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/nodes.lua +++ b/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/nodes.lua @@ -3,96 +3,88 @@ -- * added liquid_range = 0 -- * changed liquid_alternative_* params -- * removed igniter from groups + +-- =================================================================== + +local lcsa = { + name = "volcanic_crusted_lava_source_animated.png" , + backface_culling = false , + + animation = { + type = "vertical_frames" , + aspect_w = 16 , + aspect_h = 16 , + length = 3.3 , + } , +} + +local lava_crust_source_tiles = { lcsa } + +-- =================================================================== + minetest.register_node("volcanic:crusted_lava_source", { - description = "Crusted Lava Source", - drawtype = "liquid", - tiles = { - { - name = "volcanic_crusted_lava_source_animated.png", - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 3.0, - }, - }, - }, - special_tiles = { - -- New-style lava source material (mostly unused) - { - name = "volcanic_crusted_lava_source_animated.png", - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 3.0, - }, - backface_culling = false, - }, - }, - paramtype = "light", - light_source = default.LIGHT_MAX - 1, - walkable = true, - pointable = false, - diggable = false, - buildable_to = true, - is_ground_content = false, - drop = "", - drowning = 1, - liquidtype = "source", + + description = "Crusted Lava Source" , + drawtype = "liquid" , + tiles = lava_crust_source_tiles , + special_tiles = lava_crust_source_tiles , + paramtype = "light" , + light_source = default.LIGHT_MAX - 1 , + + buildable_to = true , + diggable = false , + pointable = false , + walkable = true , + is_ground_content = false , + + damage_per_second = 2, -- formerly 4 * 2 + drop = "" , + drowning = 1 , + liquid_range = 0, + liquidtype = "source" , liquid_alternative_flowing = "volcanic:crusted_lava_flowing", liquid_alternative_source = "volcanic:crusted_lava_source", - liquid_range = 0, - liquid_viscosity = 7, - liquid_renewable = false, - damage_per_second = 2, -- formerly 4 * 2 - post_effect_color = {a = 191, r = 255, g = 64, b = 0}, - groups = {lava = 3, liquid = 2, hot = 3}, + liquid_renewable = false , + liquid_viscosity = 7 , + + post_effect_color = { a = 191, r = 255, g = 64, b = 0 } , + groups = { lava = 3, liquid = 2, hot = 3 } , }) + +-- =================================================================== + minetest.register_node("volcanic:crusted_lava_flowing", { - description = "Flowing Crusted Lava", - drawtype = "flowingliquid", - tiles = {"volcanic_crusted_lava.png"}, - special_tiles = { - { - name = "volcanic_crusted_lava_source_animated.png", -- intentionally use source animation - backface_culling = false, - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 3.3, - }, - }, - { - name = "volcanic_crusted_lava_source_animated.png", -- intentionally use source animation - backface_culling = true, - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 3.3, - }, - }, - }, - paramtype = "light", - paramtype2 = "flowingliquid", - light_source = default.LIGHT_MAX - 1, - walkable = true, - pointable = true, - diggable = true, - buildable_to = true, - is_ground_content = false, - drop = 'default:cobble', - drowning = 1, - liquidtype = "none", - liquid_alternative_flowing = "volcanic:crusted_lava_flowing", - liquid_alternative_source = "volcanic:crusted_lava_source", - liquid_range = 0, - liquid_viscosity = 7, - liquid_renewable = false, - damage_per_second = 2, -- formerly 4 * 2 - post_effect_color = {a = 191, r = 255, g = 64, b = 0}, - groups = {lava = 3, hot = 3, - not_in_creative_inventory = 1, crumbly = 3, cracky = 3}, + description = "Crusted Lava Flow", + drawtype = "flowingliquid" , + -- intentionally use source animation + tiles = lava_crust_source_tiles , + special_tiles = { lcsa, lcsa } , + + paramtype = "light" , + paramtype2 = "flowingliquid" , + light_source = default.LIGHT_MAX - 1 , + + buildable_to = true , + diggable = true , + pointable = true , + walkable = true , + is_ground_content = false , + + damage_per_second = 2 , -- formerly 4 * 2 + drop = "default:cobble" , + drowning = 1 , + + liquidtype = "none" , + liquid_alternative_flowing = "volcanic:crusted_lava_flowing" , + liquid_alternative_source = "volcanic:crusted_lava_source" , + liquid_range = 0 , + liquid_renewable = false , + liquid_viscosity = 7 , + + post_effect_color = { a = 191, r = 255, g = 64, b = 0 } , + groups = { + lava = 3, hot = 3, + not_in_creative_inventory = 1, + crumbly = 3, cracky = 3, + } , }) diff --git a/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/src/volcanic_crusted_lava_source_animated.xcf b/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/src/volcanic_crusted_lava_source_animated.xcf index d7914d3..b31748e 100644 Binary files a/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/src/volcanic_crusted_lava_source_animated.xcf and b/patches/deprecated/merged-upstream/pre-Bucket_Game/mods/volcanic/src/volcanic_crusted_lava_source_animated.xcf differ