From 1f0b4df3b0ac54f43f44fe1a81a3e7b47dea5be8 Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Mon, 3 Jun 2019 04:42:20 -0400 Subject: [PATCH] make spacing and order like upstream --- .../pre-Bucket_Game/mods/volcanic/README.md | 4 +- .../pre-Bucket_Game/mods/volcanic/nodes.lua | 166 +++++++++--------- .../volcanic_crusted_lava_source_animated.xcf | Bin 34547 -> 34251 bytes 3 files changed, 81 insertions(+), 89 deletions(-) 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 d7914d3923bee8d1695f1dbe1dce80f9e89ad062..b31748e5f31997a54dcb166a95cf35d2f762c39f 100644 GIT binary patch delta 477 zcmey|%XGS%X#*3pXD|a8u!^mI*@ZnL=p$LI@o*8A9h?hR_waAT$HR=3r)S zM#lKb@hsAu%@9HM^^@;$h;gwjhH%-kH~-@}z_>Y?EsTkA7f_)T7sow_6b~O*CC5Jq zm+KTzr92Cx++;>MDK1_oh^WlB$%*=6T)asTuBguDMtvrh$$FA(o3jL`@h~z1RZDZK zLS*$c!HVTvAzU?cpkj7`$v%1?7;V9(>L)^E>{EdX#W@=xJo93py0-$1`Cv5;P~XP1 zgA5aN*bGtRHv>X5Y@YA;j(hV8pJxJ${a_8TP!+kyK^lZ(p`ny|7OH{a|Ktl9qMP5x z{b8K^KJMS<*9mWU8E=5K=KX=FsW=CAc)kpTTfA$tO#U@4#?L@S!h*~Y!76bG-MSyF Qw#ppBt=HLXUNwgs0HeKPx&QzG delta 707 zcmX@z&GfmKX#*2;U^D|5upfrdJW3E+mJ34b*+OXhN(db@8$##ahR_v{AT*3@y}a3* znVZoy9VP&znSrAeLI8(lQ1&UFcB)B(oL+qmMH7}X|U$dlsY^@2#r{F}^QCC0^@1>uUCY_^qSV%Z!c zIEROk6Rc8B7b2x+2v#ZQ3*oBS166((U~~m5($9p5+UJ55>32f7=G8z&>;jV;?4L1~ zgB3bJ12Co^tk7XMM4{h;&8r=5%P>v{D~g4R=AH*DiiHMt>ebDsV_5_lAAl9*Lj$4W z8dy=j3dE%1Lz_kNuW>Q{p8UE}no}Mk*m@kOMx4_g!mBsgtY0;Ud-AOcZgKwL)ST4h zlFa-(1>eNtY>)zwxsxxlt4yB7tTB0w9!~-vRFDx!3ji@FvVcGhh