From 636a45bd7af3fee313053268434744fd57dd1095 Mon Sep 17 00:00:00 2001 From: Jordan Snelling Date: Fri, 7 Jun 2013 20:58:30 +0100 Subject: [PATCH 1/3] add new player texture with the hair as a hat the texture follows the same license as before. N.B. the old hair is darkened and is under the hat layer. looks much better than before. --- mods/default/models/character.png | Bin 3223 -> 3701 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/default/models/character.png b/mods/default/models/character.png index d794b870686d59ef6115f9c7122163f3e5f3ecf5..d4b35e56f7c5aaf8e61cb1ba8312c25d2352e21e 100644 GIT binary patch delta 3642 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 From 8260e3b886d2825fd77d2b92cbd5bd26d7ea8b91 Mon Sep 17 00:00:00 2001 From: Jordan Snelling Date: Fri, 7 Jun 2013 21:03:50 +0100 Subject: [PATCH 2/3] Revert "add new player texture with the hair as a hat" This reverts commit 636a45bd7af3fee313053268434744fd57dd1095. --- mods/default/models/character.png | Bin 3701 -> 3223 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/default/models/character.png b/mods/default/models/character.png index d4b35e56f7c5aaf8e61cb1ba8312c25d2352e21e..d794b870686d59ef6115f9c7122163f3e5f3ecf5 100644 GIT binary patch delta 3160 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 delta 3642 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 M07*qoM6N<$g0{2reE Date: Fri, 7 Jun 2013 21:36:34 +0100 Subject: [PATCH 3/3] add moonflower, glowing dye, glowing mese... --- mods/default/crafting.lua | 15 +++ mods/default/nodes.lua | 8 ++ .../default/textures/default_glowing_mese.png | Bin 0 -> 473 bytes mods/dye/init.lua | 6 ++ mods/dye/textures/dye_moonflower_glow.png | Bin 0 -> 430 bytes mods/moonflower/depends.txt | 1 + mods/moonflower/init.lua | 88 ++++++++++++++++++ .../moonflower/textures/moonflower_closed.png | Bin 0 -> 269 bytes mods/moonflower/textures/moonflower_open.png | Bin 0 -> 289 bytes 9 files changed, 118 insertions(+) create mode 100644 mods/default/textures/default_glowing_mese.png create mode 100644 mods/dye/textures/dye_moonflower_glow.png create mode 100644 mods/moonflower/depends.txt create mode 100644 mods/moonflower/init.lua create mode 100644 mods/moonflower/textures/moonflower_closed.png create mode 100644 mods/moonflower/textures/moonflower_open.png diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 868623f7..0170554f 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -304,6 +304,21 @@ minetest.register_craft({ recipe = {"default:steel_ingot", "default:copper_ingot"}, }) +minetest.register_craft({ + type = "shapeless", + output = "dye:glowing_dye", + recipe = {"default:mese_crystal_fragment", "moonflower:moonflower_closed"}, +}) + +minetest.register_craft({ + output = 'default:glowing_mese', + recipe = { + {'', 'dye:glowing_dye', ''}, + {'dye:glowing_dye', 'default:mese', 'dye:glowing_dye'}, + {'', 'dye:glowing_dye', ''}, + } +}) + minetest.register_craft({ output = 'default:coalblock', recipe = { diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 2f571f79..081fef6c 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -29,6 +29,14 @@ minetest.register_node("default:stone_with_coal", { sounds = default.node_sound_stone_defaults(), }) +minetest.register_node("default:glowing_mese", { + description = "Glowing Mese", + tiles = {"default_glowing_mese.png"}, + groups = {cracky=1,level=2}, + light_source = 14, + sounds = default.node_sound_stone_defaults(), +}) + minetest.register_node("default:stone_with_iron", { description = "Iron Ore", tiles = {"default_stone.png^default_mineral_iron.png"}, diff --git a/mods/default/textures/default_glowing_mese.png b/mods/default/textures/default_glowing_mese.png new file mode 100644 index 0000000000000000000000000000000000000000..ff7ae4617968f96ac93fddc5f44741f664bd6603 GIT binary patch literal 473 zcmV;~0Ve*5P)Px#24YJ`L;!UFodCKP4yEw`000SaNLh0L01m_e01m_fl`9S#00007bV*G`2i*n- z6dnRmgFP1j00CJ^L_t(2&yA8vZ`&{sg+FnTY-=g1_R?&?{QnUs%ClLi0oivzS})2M7E;q|AElj^OHAfb3~gHnj{PRpJLSg;9*)2efAJ z*qjisn)?TrUN<_KwuTszrDLP4MS-1d&t{&VUEe3%wp68f?>3v0+nZ}S5&FIB`_zyz z(sfkj|L2ehHkYb$yDeICc_B7G-PmmbF0bShp|F^5QY>5;(!8yabA=et^BnxZ>#OT~ zeqD%OqLk}87K>?KR)7(PFcGYw{Vw1hAKYB@{9m3P-Fea3-F^A~&e!7u^w5XvpyFDE P00000NkvXXu0mjfN=VA= literal 0 HcmV?d00001 diff --git a/mods/dye/init.lua b/mods/dye/init.lua index ebdc9380..e0ffbbc6 100644 --- a/mods/dye/init.lua +++ b/mods/dye/init.lua @@ -61,6 +61,12 @@ dye.excolors = {"white", "lightgrey", "grey", "darkgrey", "black", "red", "orang -- Local stuff local dyelocal = {} +-- Glowing Moonflower Dye: +minetest.register_craftitem("dye:glowing_dye", { + description = "Glowing Moonflower Dye", + inventory_image = "dye_moonflower_glow.png", +}) + -- This collection of colors is partly a historic thing, partly something else. dyelocal.dyes = { {"white", "White dye", {dye=1, basecolor_white=1, excolor_white=1, unicolor_white=1}}, diff --git a/mods/dye/textures/dye_moonflower_glow.png b/mods/dye/textures/dye_moonflower_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..941bd407d1aa8ea422e01130e92c4ed02870a278 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^LFk z<}&OO<6HU>D8gCb5n0T@z%2~Ij105pNB{-dOFVsD+3&KkiwLR~3r^V#6q3yhi70W- z&&^HED*mm);S1UQ}*~R&7*4 OPEN_TIME_END)) then + minetest.env:add_node(pos, { name = "moonflower:moonflower_open" }) + else + minetest.env:add_node(pos, { name = "moonflower:moonflower_closed" }) + end +end + +minetest.register_abm({ + nodenames = { "moonflower:moonflower_closed", "moonflower:moonflower_open" }, + interval = OPEN_CHECK, + chance = 1, + + action = function(pos, node, active_object_count, active_object_count_wider) + set_moonflower(pos) + end +}) + +minetest.register_on_generated(function(minp, maxp, seed) +for attempts = 0, SPAWN_ATTEMPTS do + -- choose a random location on the X and Z axes + local coords_x = math.random(minp.x, maxp.x) + local coords_z = math.random(minp.z, maxp.z) + + -- now scan upward until we find a suitable spot on the Y axis, if none is found this attempt is failed + for coords_y = minp.y, maxp.y do + local pos_here = { x = coords_x, y = coords_y, z = coords_z } + local node_here = minetest.env:get_node(pos_here) + local pos_top = { x = coords_x, y = coords_y + 1, z = coords_z } + local node_top = minetest.env:get_node(pos_top) + + if (node_here.name == "default:dirt_with_grass") and (node_top.name == "air") then + if (math.random() <= SPAWN_PROBABILITY) then + set_moonflower(pos_top) + end + break + end + end +end +end) diff --git a/mods/moonflower/textures/moonflower_closed.png b/mods/moonflower/textures/moonflower_closed.png new file mode 100644 index 0000000000000000000000000000000000000000..5b23e1a25ed0bb7f24fdb623eccf4020bfcb6a16 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=3>5rs@Vx>W0o5MlNa= zVH#GET6Xbfxi+P9cXfE5j|8eh($ literal 0 HcmV?d00001 diff --git a/mods/moonflower/textures/moonflower_open.png b/mods/moonflower/textures/moonflower_open.png new file mode 100644 index 0000000000000000000000000000000000000000..8035ca4869a9dafe73191b8f29085140546886ae GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b6;Ut{RWuS)HdQxtRCT%?_Z09(6(lU86 zJ=xB%oyp4NX-qnK>{wdoBA#`bnJ3dSGc|d15;M=HWv=Aq;aRuv>C=UZ4%!hhH@IVD aBp4Pvm&%Dyk9h^Op25@A&t;ucLK6Uc7G5s^ literal 0 HcmV?d00001