From e72d2f82e5c29a734ba3fe92512e9ecc3f043baf Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 30 Jun 2014 23:41:42 +0200 Subject: [PATCH] Rudimentary mud and slurry --- init.lua | 22 ++++++++++++++-------- locale/de.txt | 15 ++++++++++----- locale/template.txt | 17 ++++++++++------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/init.lua b/init.lua index a2c3e28..eae068b 100644 --- a/init.lua +++ b/init.lua @@ -393,6 +393,9 @@ function pedology.register_sucky_group(basename, basedescription, lumpbasedescri else groups = additional_groups end + if(w==3) then + groups["disable_jump"] = 1 + end pedology.register_sucky(basename, S((pedology.wetnames[w]).." "..basedescription), w, oozing, sucky, m, drop, sounds, groups) -- register dripping if(w>0 and pedology.USE_DRIPS == 1) then @@ -436,11 +439,11 @@ local sound_turf_fibric = {footstep = {name="pedology_turf_footstep", gain=0.28} --[[ register sucky and oozing nodes ]] --[[ ground nodes ]] pedology.register_sucky_group("clay", "clay", "clay lump", - 5, 3, 60, 1.25, {3000, 3100, 3200, 3500, 3550, 3600}, 4, sound_clay, { crumbly = 3, sun_dry = 1}) + 3, 3, 60, 1.25, {3000, 3100, 3200, 3500, 3550, 3600}, 4, sound_clay, { crumbly = 3, sun_dry = 1}) pedology.register_sucky_group("silt_fine", "fine silt", "fine silt lump", - 5, 3, 45, 1.25, {2800, 2900, 3000, 3100, 3200, 3300}, 4, sound_silt_fine, { crumbly = 3, sun_dry = 1 }) + 3, 3, 45, 1.25, {2800, 2900, 3000, 3100, 3200, 3300}, 4, sound_silt_fine, { crumbly = 3, sun_dry = 1 }) pedology.register_sucky_group("silt_medium", "medium silt", "medium silt lump", - 4, 3, 30, 1.25, {2600, 2800, 3200, 3800, 4200}, 4, sound_silt_medium, { crumbly = 3, sun_dry = 1 }) + 3, 3, 30, 1.25, {2600, 2800, 3200, 3800, 4200}, 4, sound_silt_medium, { crumbly = 3, sun_dry = 1 }) pedology.register_sucky_group("silt_coarse", "coarse silt", "coarse silt lump", 3, 3, 20, 1.25, {2000, 2200, 2400, 2800}, 2, sound_silt_coarse, { crumbly = 3, sun_dry = 1 }) pedology.register_sucky_group("sand_fine", "fine sand", "fine sand pile", @@ -549,11 +552,14 @@ minetest.register_node("pedology:ice_pure", { freezemelt = "pedology:water_fresh_source", }) ---[[ TODO: clay mud -pedology.register_liquid("clay_3", "sludgy clay", 192, 6, 5, 0, {a=192, r=104, g=23, b=0}, {oozing=1}) -pedology.register_liquid("clay_4", "muddy clay", 156, 4, 5, 0, {a=156, r=123, g=57, b=6}, {oozing=1}) -pedology.register_liquid("clay_5", "slurry clay", 128, 2, 5, 0, {a=128, r=146, g=85, b=73}, {oozing=1}) -]] +--[[ mud and slurry ]] +pedology.register_liquid("clay_4", "clay mud", 240, 6, 5, 0, {a=240, r=123, g=57, b=6}, {sucky=1, oozing=1, wet=4}) +pedology.register_liquid("clay_5", "clay slurry", 176, 4, 5, 0, {a=176, r=146, g=85, b=73}, {oozing=1, wet=5}) + +pedology.register_liquid("silt_fine_4", "fine silt mud", 230, 6, 5, 0, {a=230, r=137, g=82, b=0}, {sucky=1, oozing=1, wet=4}) +pedology.register_liquid("silt_fine_5", "fine silt slurry", 166, 4, 5, 0, {a=166, r=179, g=117, b=59}, {oozing=1, wet=5}) + +pedology.register_liquid("silt_medium_4", "medium silt mud", 220, 6, 5, 0, {a=220, r=165, g=131, b=0}, {oozing=1, wet=4}) --[[ turf ]] pedology.register_sucky_group("turf_fibric", "fibric turf", "fibric turf cutting", diff --git a/locale/de.txt b/locale/de.txt index f9c8905..d104ae1 100644 --- a/locale/de.txt +++ b/locale/de.txt @@ -6,8 +6,10 @@ dry clay = trockener Ton wet clay = feuchter Ton watery clay = wässriger Ton sludgy clay = matschiger Ton -muddy clay = schlammiger Ton -slurry clay = breiiger Ton +clay mud source = Tonschlammquelle +flowing clay mud = fließender Tonschlamm +clay slurry source = Tonschlämmenquelle +flowing clay slurry = fließende Tonschlämme dry clay lump = trockener Tonklumpen wet clay lump = feuchter Tonklumpen watery clay lump = wässriger Tonklumpen @@ -16,8 +18,10 @@ dry fine silt = trockener Feinschluff wet fine silt = feuchter Feinschluff watery fine silt = wässriger Feinschluff sludgy fine silt = matschiger Feinschluff -muddy fine silt = schlammiger Feinschluff -slurry fine silt = breiiger Feinschluff +fine silt mud source = Feinschluffschlammquelle +flowing fine silt mud = fließender Feinschluffschlamm +fine silt slurry source = Feinschluffschlämmenquelle +flowing fine silt slurry = fließende Feinschluffschlämme dry fine silt lump = trockener Feinschluffklumpen wet fine silt lump = feuchter Feinschluffklumpen watery fine silt lump = wässriger Feinschluffklumpen @@ -26,7 +30,8 @@ dry medium silt = trockener Mittelschluff wet medium silt = feuchter Mittelschluff watery medium silt = wässriger Mittelschluff sludgy medium silt = matschiger Mittelschluff -muddy medium silt = schlammiger Mittelschluff +medium silt mud source = Mittelschluffschlammquelle +flowing medium silt mud = fließender Mittelschluffschlamm dry medium silt lump = trockener Mittelschluffklumpen wet medium silt lump = feuchter Mittelschluffklumpen watery medium silt lump = wässriger Mittelschluffklumpen diff --git a/locale/template.txt b/locale/template.txt index e97971d..79b7b8e 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -6,20 +6,22 @@ dry clay wet clay watery clay sludgy clay -muddy clay -slurry clay +clay mud source +flowing clay mud +clay slurry source +flowing clay slurry dry clay lump wet clay lump watery clay lump sludgy clay lump -muddy clay lump -slurry clay lump dry fine silt wet fine silt watery fine silt sludgy fine silt -muddy fine silt -slurry fine silt +fine silt mud source +flowing fine silt mud +fine silt slurry source +flowing fine silt slurry dry fine silt lump wet fine silt lump watery fine silt lump @@ -28,7 +30,8 @@ dry medium silt wet medium silt watery medium silt sludgy medium silt -muddy medium silt +medium silt mud source +flowing medium silt mud dry medium silt lump wet medium silt lump watery medium silt lump