diff --git a/blends/character.blend b/blends/character.blend new file mode 100644 index 0000000..0d6544d Binary files /dev/null and b/blends/character.blend differ diff --git a/extras/SP_Palette_V2.png b/extras/SP_Palette_V2.png index a7966b9..51e4ddc 100644 Binary files a/extras/SP_Palette_V2.png and b/extras/SP_Palette_V2.png differ diff --git a/game.conf b/game.conf index 56af760..cde3f44 100644 --- a/game.conf +++ b/game.conf @@ -1,2 +1,2 @@ -name = Solar Fields -disallowed_mapgens = v5,v6,flat,carpathian,v7,fractal,singlenode \ No newline at end of file +name = Solar Plains +disallowed_mapgens = v5,v6,carpathian,v7,fractal,singlenode \ No newline at end of file diff --git a/mods/atmos/init.lua b/mods/atmos/init.lua index 555809c..0c60617 100644 --- a/mods/atmos/init.lua +++ b/mods/atmos/init.lua @@ -299,14 +299,19 @@ local function make_skybox(player) local height = atmos_ratio(atmos.cloud.height.min, atmos.cloud.height.max, cloud_curve) local thicc = atmos_ratio(atmos.cloud.thicc.min, atmos.cloud.thicc.max, cloud_curve) + local sun_ + player:set_clouds({ density = atmos.cloud.density.now, height = height, thickness = thicc, color = minetest.rgba( - atmos_ratio(atmos.cloud.colour.red, fog_cloud.result.red, blend_curve), - atmos_ratio(atmos.cloud.colour.grn, fog_cloud.result.grn, blend_curve), - atmos_ratio(atmos.cloud.colour.blu, fog_cloud.result.blu, blend_curve), + atmos_ratio(atmos_ratio(atmos.cloud.colour.red, merge_result.bot.r, 0.65), + fog_cloud.result.red, blend_curve), + atmos_ratio(atmos_ratio(atmos.cloud.colour.grn, merge_result.bot.g, 0.65), + fog_cloud.result.grn, blend_curve), + atmos_ratio(atmos_ratio(atmos.cloud.colour.blu, merge_result.bot.b, 0.65), + fog_cloud.result.blu, blend_curve), result_fog.a ), speed = atmos.wind_to_vector(atmos.wind.rads, atmos.wind.speed) diff --git a/mods/atmos/skybox/skybox_clear_gradient.atm b/mods/atmos/skybox/skybox_clear_gradient.atm index 7cbf690..fa9cb8d 100644 --- a/mods/atmos/skybox/skybox_clear_gradient.atm +++ b/mods/atmos/skybox/skybox_clear_gradient.atm @@ -1,102 +1,103 @@ -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010417", ["bottom"] = "#0E1133", ["base"] = "#070826", ["light"] = 0.06} -return {["top"] = "#08132F", ["bottom"] = "#172449", ["base"] = "#101B3C", ["light"] = 0.07} -return {["top"] = "#1A1E40", ["bottom"] = "#4D4255", ["base"] = "#182340", ["light"] = 0.08} -return {["top"] = "#353967", ["bottom"] = "#8B5E68", ["base"] = "#564A71", ["light"] = 0.09} -return {["top"] = "#41467B", ["bottom"] = "#9F6864", ["base"] = "#9F6864", ["light"] = 0.1} -return {["top"] = "#4B538E", ["bottom"] = "#B0725A", ["base"] = "#B0725A", ["light"] = 0.2} -return {["top"] = "#475A9B", ["bottom"] = "#A26E6A", ["base"] = "#A26E6A", ["light"] = 0.4} -return {["top"] = "#445FA4", ["bottom"] = "#997D9A", ["base"] = "#997D9A", ["light"] = 0.6} -return {["top"] = "#4066B3", ["bottom"] = "#A18CAC", ["base"] = "#A18CAC", ["light"] = 0.8} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#99AAFF", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#3B69BB", ["bottom"] = "#e4f3ff", ["base"] = "#698dcc", ["light"] = 1} -return {["top"] = "#4066B3", ["bottom"] = "#A18CAC", ["base"] = "#A18CAC", ["light"] = 0.8} -return {["top"] = "#445FA4", ["bottom"] = "#997D9A", ["base"] = "#997D9A", ["light"] = 0.6} -return {["top"] = "#475A9B", ["bottom"] = "#A26E6A", ["base"] = "#A26E6A", ["light"] = 0.4} -return {["top"] = "#4B538E", ["bottom"] = "#B0725A", ["base"] = "#B0725A", ["light"] = 0.2} -return {["top"] = "#41467B", ["bottom"] = "#9F6864", ["base"] = "#9F6864", ["light"] = 0.1} -return {["top"] = "#353967", ["bottom"] = "#8B5E68", ["base"] = "#564A71", ["light"] = 0.09} -return {["top"] = "#1A1E40", ["bottom"] = "#4D4255", ["base"] = "#182340", ["light"] = 0.08} -return {["top"] = "#08132F", ["bottom"] = "#172449", ["base"] = "#101B3C", ["light"] = 0.07} -return {["top"] = "#010417", ["bottom"] = "#0E1133", ["base"] = "#070826", ["light"] = 0.06} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} -return {["top"] = "#010109", ["bottom"] = "#010214", ["base"] = "#00010D", ["light"] = 0.05} \ No newline at end of file +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#14212a", ["bottom"] = "#171e24", ["base"] = "#171f25", ["light"] = 0.05} +return {["top"] = "#132c3e", ["bottom"] = "#232728", ["base"] = "#1d282f", ["light"] = 0.10} +return {["top"] = "#2b4158", ["bottom"] = "#816949", ["base"] = "#444140", ["light"] = 0.11} +return {["top"] = "#676891", ["bottom"] = "#c79161", ["base"] = "#a17268", ["light"] = 0.15} +return {["top"] = "#8078a9", ["bottom"] = "#e29c6d", ["base"] = "#c78679", ["light"] = 0.30} +return {["top"] = "#7d7d9f", ["bottom"] = "#e5a57a", ["base"] = "#bf988b", ["light"] = 0.50} +return {["top"] = "#798196", ["bottom"] = "#e6b386", ["base"] = "#b9a699", ["light"] = 0.70} +return {["top"] = "#427eb4", ["bottom"] = "#d4d1c6", ["base"] = "#8ab7c0", ["light"] = 0.90} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#2e7dc0", ["bottom"] = "#c4d1da", ["base"] = "#698dcc", ["light"] = 1} +return {["top"] = "#427eb4", ["bottom"] = "#d4d1c6", ["base"] = "#8ab7c0", ["light"] = 0.90} +return {["top"] = "#798196", ["bottom"] = "#e6b386", ["base"] = "#b9a699", ["light"] = 0.70} +return {["top"] = "#7d7d9f", ["bottom"] = "#e5a57a", ["base"] = "#bf988b", ["light"] = 0.50} +return {["top"] = "#8078a9", ["bottom"] = "#e29c6d", ["base"] = "#c78679", ["light"] = 0.30} +return {["top"] = "#676891", ["bottom"] = "#c79161", ["base"] = "#a17268", ["light"] = 0.15} +return {["top"] = "#2b4158", ["bottom"] = "#816949", ["base"] = "#444140", ["light"] = 0.11} +return {["top"] = "#132c3e", ["bottom"] = "#232728", ["base"] = "#1d282f", ["light"] = 0.10} +return {["top"] = "#14212a", ["bottom"] = "#171e24", ["base"] = "#171f25", ["light"] = 0.05} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} +return {["top"] = "#010104", ["bottom"] = "#010104", ["base"] = "#00010D", ["light"] = 0.03} \ No newline at end of file diff --git a/mods/bucket/textures/bucket_bucket.png b/mods/bucket/textures/bucket_bucket.png index 1246fa5..cf5b8ff 100644 Binary files a/mods/bucket/textures/bucket_bucket.png and b/mods/bucket/textures/bucket_bucket.png differ diff --git a/mods/bucket/textures/bucket_lava.png b/mods/bucket/textures/bucket_lava.png index 5b68392..a83c5f9 100644 Binary files a/mods/bucket/textures/bucket_lava.png and b/mods/bucket/textures/bucket_lava.png differ diff --git a/mods/bucket/textures/bucket_water.png b/mods/bucket/textures/bucket_water.png index dbc34d2..734688d 100644 Binary files a/mods/bucket/textures/bucket_water.png and b/mods/bucket/textures/bucket_water.png differ diff --git a/mods/core/player.lua b/mods/core/player.lua index ee6af26..edbeaf1 100644 --- a/mods/core/player.lua +++ b/mods/core/player.lua @@ -76,9 +76,30 @@ default.player_register_model("character.x", { -- Utility animations (not currently used by the game; but still usable by mods). sit = { x= 81, y=160, }, lay_bed = { x= 226, y=228, }, - collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.77, 0.3}, - stepheight = 0.6, }, + collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.77, 0.3}, + stepheight = 0.6, +}) + +default.player_register_model("character.b3d", { + animation_speed = 60, + textures = { + "(wardrobe_skin.png^[multiply:#ffffff)" + }, + animations = { + -- Standard animations. + stand = { x= 0, y= 239, }, + lay = { x=162, y=166, }, + walk = { x=168, y=187, }, + mine = { x=189, y=198, }, + walk_mine = { x=200, y=219, }, + dead = { x= 221, y=225, }, + -- Utility animations (not currently used by the game; but still usable by mods). + sit = { x= 81, y=160, }, + lay_bed = { x= 226, y=228, }, + }, + collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.77, 0.3}, + stepheight = 0.6, }) -- Player stats and animations @@ -144,8 +165,8 @@ end -- Update appearance when the player joins minetest.register_on_joinplayer(function(player) default.player_attached[player:get_player_name()] = false - default.player_set_model(player, "character.x") - player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30) + default.player_set_model(player, "character.b3d") + player:set_local_animation({x=0, y=239}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30) -- anim: stand, sit, lay, walk, mine, walk and mine player:set_properties({ visual_size = {x=1, y=1}, diff --git a/mods/core/textures/core_lava.png b/mods/core/textures/core_lava.png index aac8a56..8857948 100644 Binary files a/mods/core/textures/core_lava.png and b/mods/core/textures/core_lava.png differ diff --git a/mods/core/textures/core_lava_flowing_anim.png b/mods/core/textures/core_lava_flowing_anim.png index 1e9a31d..1fa2646 100644 Binary files a/mods/core/textures/core_lava_flowing_anim.png and b/mods/core/textures/core_lava_flowing_anim.png differ diff --git a/mods/core/textures/core_lava_source_anim.png b/mods/core/textures/core_lava_source_anim.png index af9a9d9..fc62456 100644 Binary files a/mods/core/textures/core_lava_source_anim.png and b/mods/core/textures/core_lava_source_anim.png differ diff --git a/mods/intro/init.lua b/mods/intro/init.lua index c2b8e93..7c0b19a 100644 --- a/mods/intro/init.lua +++ b/mods/intro/init.lua @@ -172,13 +172,13 @@ function intro.reset_hud(player) player:hud_set_hotbar_image("hud_hotbar.png") player:hud_set_hotbar_selected_image("hud_hotbar_selected.png") + waila.init_hud(player) hb.custom_hud(player) player:hud_set_flags({crosshair = true, hotbar = true, healthbar = false, wielditem = true, breathbar = false}) player:set_attribute("core_display_hud", "true") hudclock.display_bg(player) hudinfo.display_hud_text(player) - waila.init_hud(player) end minetest.register_on_newplayer(function(player) diff --git a/mods/vhs/init.lua b/mods/vhs/init.lua index 2eaa9b1..faafa82 100644 --- a/mods/vhs/init.lua +++ b/mods/vhs/init.lua @@ -1,4 +1,4 @@ --- VHS, or, Visual Hud Styles: +-- VHS, or, Visual Hud Styles, or no, it's not for displaying a analog video signal: -- License, MIT --[[ diff --git a/mods/waila/init.lua b/mods/waila/init.lua index 884a413..645fe43 100644 --- a/mods/waila/init.lua +++ b/mods/waila/init.lua @@ -269,12 +269,12 @@ local function core_loop() minetest.after(0.25, core_loop) end -core_loop() +--core_loop() function waila.init_hud(player) player_huds[player:get_player_name()] = {} - local bg = player:hud_add({ + player_huds[player:get_player_name()].bg = player:hud_add({ hud_elem_type = "image", position = {x=0.5, y=0}, offset = {x=0, y=-8}, @@ -282,7 +282,7 @@ function waila.init_hud(player) text = "ptextures_transparent.png", }) - local itemimage = player:hud_add({ + player_huds[player:get_player_name()].itemimg = player:hud_add({ hud_elem_type = "image", position = {x=0.5, y=0}, scale = {x=1, y=1}, @@ -291,7 +291,7 @@ function waila.init_hud(player) alignment = {x=1, y=0}, }) - local desc = player:hud_add({ + player_huds[player:get_player_name()].desc = player:hud_add({ hud_elem_type = "text", position = {x=0.5, y=0}, text = "", @@ -299,7 +299,8 @@ function waila.init_hud(player) alignment = {x=1, y=0}, offset = {x=-74, y=10}, }) - local harvestimg = player:hud_add({ + + player_huds[player:get_player_name()].harvestimg = player:hud_add({ hud_elem_type = "image", position = {x=0.5, y=0}, text = "ptextures_transparent.png", @@ -308,7 +309,7 @@ function waila.init_hud(player) scale = {x=1, y=1}, }) - local harvestable = player:hud_add({ + player_huds[player:get_player_name()].harvestable = player:hud_add({ hud_elem_type = "text", position = {x=0.5, y=0}, text = "", @@ -317,7 +318,7 @@ function waila.init_hud(player) offset = {x=-74, y=30}, }) - local modname = player:hud_add({ + player_huds[player:get_player_name()].modname = player:hud_add({ hud_elem_type = "text", position = {x=0.5, y=0}, text = "", @@ -326,7 +327,7 @@ function waila.init_hud(player) offset = {x=-74, y=70} }) - local facing = player:hud_add({ + player_huds[player:get_player_name()].facedir = player:hud_add({ hud_elem_type = "text", offset = {x=-74, y=50}, position = {x=0.5, y=0}, diff --git a/mods/wardrobe/init.lua b/mods/wardrobe/init.lua index ad7d627..174afd0 100644 --- a/mods/wardrobe/init.lua +++ b/mods/wardrobe/init.lua @@ -949,12 +949,6 @@ function wardrobe.apply_to_player(player, fields) textures = { "wardrobe_player_" .. pname .. ".png", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", }, }) @@ -963,13 +957,7 @@ function wardrobe.apply_to_player(player, fields) player:set_properties({ textures = { - "ptextures_transparent.png", "wardrobe_player_" .. pname .. ".png", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", }, }) @@ -985,7 +973,6 @@ function wardrobe.apply_to_player(player, fields) player:set_properties({ textures = { - "ptextures_transparent.png", "(wardrobe_skin".. ".png^[multiply:#".. wardrobe.formspec_selections_rgb[pname][1].. ")^".. "(wardrobe_eyes_white_".. wardrobe.formspec_selections[pname][1] ..".png^[multiply:#".. wardrobe.formspec_selections_rgb[pname][2].. ")^".. "(wardrobe_eyes_pupil_".. wardrobe.formspec_selections[pname][2] ..".png^[multiply:#".. wardrobe.formspec_selections_rgb[pname][3].. ")^".. @@ -1008,12 +995,7 @@ function wardrobe.apply_to_player(player, fields) "(wardrobe_acc_".. wardrobe.formspec_selections[pname][19] ..".png^[multiply:#".. wardrobe.formspec_selections_rgb[pname][19].. ")^".. "(wardrobe_acc_".. wardrobe.formspec_selections[pname][20] ..".png^[multiply:#".. wardrobe.formspec_selections_rgb[pname][20].. ")^".. "(wardrobe_acc_".. wardrobe.formspec_selections[pname][21] ..".png^[multiply:#".. wardrobe.formspec_selections_rgb[pname][21].. ")^".. - "(wardrobe_acc_".. wardrobe.formspec_selections[pname][22] ..".png^[multiply:#".. wardrobe.formspec_selections_rgb[pname][22].. ")", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", - "ptextures_transparent.png", + "(wardrobe_acc_".. wardrobe.formspec_selections[pname][22] ..".png^[multiply:#".. wardrobe.formspec_selections_rgb[pname][22].. ")" } }) diff --git a/mods/wardrobe/textures/wardrobe_player_test.png b/mods/wardrobe/textures/wardrobe_player_test.png new file mode 100644 index 0000000..e06ec91 Binary files /dev/null and b/mods/wardrobe/textures/wardrobe_player_test.png differ