From d56516de3a12306121562c7d604b0499756bcae1 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 4 Jun 2014 22:09:06 +0200 Subject: [PATCH] Cleanup node naming, node drops and inv. images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Descriptions of all nodes are (hopefully) in proper English now, no more stupid non-descriptions like “Young2treebottom” etc. Bush branches drop sticks, young tree trunks drop sticks, too. --- bushes/init.lua | 14 ++++++++------ ...e2trunk.png => bushes_youngtree2trunk.png} | Bin .../textures/bushes_youngtree2trunk_inv.png | Bin 0 -> 918 bytes trunks/nodes.lua | 4 ++-- woodsoils/nodes.lua | 18 +++++++++--------- youngtrees/init.lua | 15 ++++++++++----- 6 files changed, 29 insertions(+), 22 deletions(-) rename bushes/textures/{youngtree2trunk.png => bushes_youngtree2trunk.png} (100%) create mode 100644 bushes/textures/bushes_youngtree2trunk_inv.png diff --git a/bushes/init.lua b/bushes/init.lua index 3d52c3d..93103e9 100644 --- a/bushes/init.lua +++ b/bushes/init.lua @@ -8,11 +8,11 @@ abstract_bushes = {} minetest.register_node("bushes:youngtree2_bottom", { - description = "youngtree2Bottom", + description = "Young Tree 2 (bottom)", drawtype="nodebox", - tiles = {"youngtree2trunk.png"}, - inventory_image = "youngtree2trunk.png", - wield_image = "youngtree2trunk.png", + tiles = {"bushes_youngtree2trunk.png"}, + inventory_image = "bushes_youngtree2trunk_inv.png", + wield_image = "bushes_youngtree2trunk_inv.png", paramtype = "light", walkable = false, is_ground_content = true, @@ -25,6 +25,7 @@ node_box = { }, groups = {snappy=3,flammable=2}, sounds = default.node_sound_leaves_defaults(), + drop = 'default:stick' }) local BushBranchCenter = { {1,1}, {3,2} } @@ -60,6 +61,7 @@ for i in pairs(BushBranchCenter) do leaves=1 }, sounds = default.node_sound_leaves_defaults(), + drop = 'default:stick 4' }) end @@ -102,6 +104,7 @@ for i in pairs(BushBranchSide) do leaves=1 }, sounds = default.node_sound_leaves_defaults(), + drop = 'default:stick 3' }) end @@ -112,7 +115,6 @@ for i in pairs(BushLeafNode) do description = "Bush Leaves "..Num, drawtype = "allfaces_optional", tiles = {"bushes_leaves_"..Num..".png"}, - inventory_image = "bushes_leaves_"..Num..".png", paramtype = "light", groups = { -- MM: Should we add leafdecay? snappy=3, @@ -255,4 +257,4 @@ plantslib:register_generate_plant({ "abstract_bushes.grow_youngtree2" ) - --http://dev.minetest.net/Node_Drawtypes \ No newline at end of file + --http://dev.minetest.net/Node_Drawtypes diff --git a/bushes/textures/youngtree2trunk.png b/bushes/textures/bushes_youngtree2trunk.png similarity index 100% rename from bushes/textures/youngtree2trunk.png rename to bushes/textures/bushes_youngtree2trunk.png diff --git a/bushes/textures/bushes_youngtree2trunk_inv.png b/bushes/textures/bushes_youngtree2trunk_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..ac36abd3c76e348ea2ce52aa63829b9f05e48745 GIT binary patch literal 918 zcmWlY+izM00Ecldjj35A@kN)I7`3={>q1LQODVT=xby&r1Dp$|Tn~o=hr;1@4h#w_ zcS=dQYCD^DPP?_6Cgo|Vm!xX4L=&@z8neXsw8X^d!=8P$d-#4|et*EXWwjWtj9(oW z2n1K4Wv%_f!dJZU`o&(GdJ7c@F8yaUW4fmgI%oaRNzH#c;P*1lCJkjB>MrNEFMPbq zkpo6QWYMF_YAt9@po*d!ton^5ufCgb@R)*HmX3P4f=8D`XQ<-fP|~29pFB zx5-mDkaz1i5-iei#;HH9FhNL~vB?kXY?{=t)}?v~X@qSYp&oMXGJ|b~;q5qauef?x z^yYjfj?@;t#zBf~GDsAWwONuiO8N=XHh(RKX_^s?HZEjI4evHulwus1DKq%_SDi-C z6tk)J^Au-Swix?g45l!C+~&U-C9C@v*I)CNXhki;V2TSEW< literal 0 HcmV?d00001 diff --git a/trunks/nodes.lua b/trunks/nodes.lua index b8b8624..734fb63 100644 --- a/trunks/nodes.lua +++ b/trunks/nodes.lua @@ -75,7 +75,7 @@ minetest.register_node("trunks:moss", { -- MoSS & FuNGuS ----------------------------------------------------------------------------------------------- minetest.register_node("trunks:moss_fungus", { - description = "Moss & Fungus", + description = "Moss with Fungus", drawtype = "nodebox",--"signlike", tiles = {"trunks_moss_fungus.png"}, inventory_image = "trunks_moss_fungus.png", @@ -151,7 +151,7 @@ minetest.register_node("trunks:twigs_roof", { minetest.register_alias("woodstuff:twigs_roof_corner", "trunks:twigs_roof_corner") minetest.register_node("trunks:twigs_roof_corner", { - description = "Twigs Roof Corner", + description = "Twigs Roof Corner 1", drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", diff --git a/woodsoils/nodes.lua b/woodsoils/nodes.lua index e4aeb1d..e80c522 100644 --- a/woodsoils/nodes.lua +++ b/woodsoils/nodes.lua @@ -1,7 +1,7 @@ -- nodes minetest.register_node("woodsoils:dirt_with_leaves_1", { - description = "Forrest Soil 1", + description = "Forest Soil 1", tiles = { "default_dirt.png^woodsoils_ground_cover.png", "default_dirt.png", @@ -12,14 +12,14 @@ minetest.register_node("woodsoils:dirt_with_leaves_1", { soil=1--, --not_in_creative_inventory=1 }, - --drop = 'default:dirt', + drop = 'default:dirt', sounds = default.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), }) minetest.register_node("woodsoils:dirt_with_leaves_2", { - description = "Forrest Soil 2", + description = "Forest Soil 2", tiles = { "woodsoils_ground.png", "default_dirt.png", @@ -30,14 +30,14 @@ minetest.register_node("woodsoils:dirt_with_leaves_2", { soil=1--, --not_in_creative_inventory=1 }, - --drop = 'default:dirt', + drop = 'default:dirt', sounds = default.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), }) minetest.register_node("woodsoils:grass_with_leaves_1", { - description = "Forrest Soil 3", + description = "Forest Soil 3", tiles = { "default_grass.png^woodsoils_ground_cover2.png", "default_dirt.png", @@ -48,14 +48,14 @@ minetest.register_node("woodsoils:grass_with_leaves_1", { soil=1--, --not_in_creative_inventory=1 }, - --drop = 'default:dirt', + drop = 'default:dirt', sounds = default.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), }) minetest.register_node("woodsoils:grass_with_leaves_2", { - description = "Forrest Soil 4", + description = "Forest Soil 4", tiles = { "default_grass.png^woodsoils_ground_cover.png", "default_dirt.png", @@ -66,7 +66,7 @@ minetest.register_node("woodsoils:grass_with_leaves_2", { soil=1--, --not_in_creative_inventory=1 }, - --drop = 'default:dirt', + drop = 'default:dirt', sounds = default.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), @@ -76,4 +76,4 @@ minetest.register_node("woodsoils:grass_with_leaves_2", { minetest.register_alias("forestsoils:dirt_with_leaves_1", "woodsoils:dirt_with_leaves_1") minetest.register_alias("forestsoils:dirt_with_leaves_2", "woodsoils:dirt_with_leaves_2") minetest.register_alias("forestsoils:grass_with_leaves_1", "woodsoils:grass_with_leaves_1") -minetest.register_alias("forestsoils:grass_with_leaves_2", "woodsoils:grass_with_leaves_2") \ No newline at end of file +minetest.register_alias("forestsoils:grass_with_leaves_2", "woodsoils:grass_with_leaves_2") diff --git a/youngtrees/init.lua b/youngtrees/init.lua index 4153cc8..142e3d6 100644 --- a/youngtrees/init.lua +++ b/youngtrees/init.lua @@ -4,7 +4,7 @@ minetest.register_node("youngtrees:bamboo", { - description = "youngtreeBamboo", + description = "Young Bamboo Tree", drawtype="nodebox", tiles = {"bamboo.png"}, inventory_image = "bamboo.png", @@ -22,13 +22,14 @@ node_box = { }, groups = {snappy=3,flammable=2}, sounds = default.node_sound_leaves_defaults(), + drop = 'trunks:twig_1' }) minetest.register_node("youngtrees:youngtree2_middle",{ - description = "youngtree2Middle", + description = "Young Tree 2 (middle)", drawtype="nodebox", tiles = {"youngtree2branch.png"}, inventory_image = "youngtree2branch.png", @@ -46,10 +47,11 @@ minetest.register_node("youngtrees:youngtree2_middle",{ }, groups = {snappy=3,flammable=2}, sounds = default.node_sound_leaves_defaults(), + drop = 'trunks:twig_1' }) minetest.register_node("youngtrees:youngtree_top", { - description = "youngtreeTop", + description = "Young Tree (top)", drawtype = "plantlike", tiles = {"youngtree16xa.png"}, inventory_image = "youngtree16xa.png", @@ -63,11 +65,12 @@ minetest.register_node("youngtrees:youngtree_top", { }, groups = {snappy=3,flammable=2}, sounds = default.node_sound_leaves_defaults(), + drop = 'trunks:twig_1' }) minetest.register_node("youngtrees:youngtree_middle", { - description = "youngtreeMiddle", + description = "Young Tree (middle)", drawtype = "plantlike", tiles = {"youngtree16xb.png"}, inventory_image = "youngtree16xb.png", @@ -81,12 +84,13 @@ minetest.register_node("youngtrees:youngtree_middle", { }, groups = {snappy=3,flammable=2}, sounds = default.node_sound_leaves_defaults(), + drop = 'trunks:twig_1' }) minetest.register_node("youngtrees:youngtree_bottom", { - description = "youngtreeBottom", + description = "Young Tree (bottom)", drawtype = "plantlike", tiles = {"youngtree16xc.png"}, inventory_image = "youngtree16xc.png", @@ -100,6 +104,7 @@ minetest.register_node("youngtrees:youngtree_bottom", { }, groups = {snappy=3,flammable=2}, sounds = default.node_sound_leaves_defaults(), + drop = 'trunks:twig_1' })