From 6843ddb814fe71147ec86728018e99ad75ab243a Mon Sep 17 00:00:00 2001 From: paramat Date: Wed, 1 Jul 2015 13:03:14 +0100 Subject: [PATCH] Default: Add savanna nodes, textures, crafting and fuels --- mods/default/README.txt | 35 ++-- mods/default/crafting.lua | 19 ++- mods/default/functions.lua | 2 +- mods/default/nodes.lua | 154 ++++++++++++++++-- .../textures/default_acacia_leaves.png | Bin 0 -> 444 bytes .../textures/default_acacia_sapling.png | Bin 0 -> 359 bytes mods/default/textures/default_acacia_tree.png | Bin 0 -> 682 bytes .../textures/default_acacia_tree_top.png | Bin 0 -> 731 bytes mods/default/textures/default_acacia_wood.png | Bin 0 -> 261 bytes mods/default/textures/default_dry_grass.png | Bin 0 -> 303 bytes mods/default/textures/default_dry_grass_1.png | Bin 0 -> 219 bytes mods/default/textures/default_dry_grass_2.png | Bin 0 -> 265 bytes mods/default/textures/default_dry_grass_3.png | Bin 0 -> 295 bytes mods/default/textures/default_dry_grass_4.png | Bin 0 -> 316 bytes mods/default/textures/default_dry_grass_5.png | Bin 0 -> 339 bytes .../textures/default_dry_grass_side.png | Bin 0 -> 285 bytes 16 files changed, 171 insertions(+), 39 deletions(-) create mode 100644 mods/default/textures/default_acacia_leaves.png create mode 100644 mods/default/textures/default_acacia_sapling.png create mode 100644 mods/default/textures/default_acacia_tree.png create mode 100644 mods/default/textures/default_acacia_tree_top.png create mode 100644 mods/default/textures/default_acacia_wood.png create mode 100644 mods/default/textures/default_dry_grass.png create mode 100644 mods/default/textures/default_dry_grass_1.png create mode 100644 mods/default/textures/default_dry_grass_2.png create mode 100644 mods/default/textures/default_dry_grass_3.png create mode 100644 mods/default/textures/default_dry_grass_4.png create mode 100644 mods/default/textures/default_dry_grass_5.png create mode 100644 mods/default/textures/default_dry_grass_side.png diff --git a/mods/default/README.txt b/mods/default/README.txt index 9474e455..d48d5e03 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -57,7 +57,6 @@ VanessaE (WTFPL): default_nc_front.png default_nc_rb.png default_nc_side.png - default_grass_*.png default_desert_sand.png default_desert_stone.png default_desert_stone_brick.png @@ -104,7 +103,7 @@ Zeg9 (CC BY-SA 3.0): default_gold_block.png paramat (CC BY-SA 3.0): - wieldhand.png, based on character.png by Jordach (CC BY-SA 3.0) + wieldhand.png, derived from character.png by Jordach (CC BY-SA 3.0) default_pinetree.png default_pinetree_top.png default_pinewood.png @@ -113,6 +112,14 @@ paramat (CC BY-SA 3.0): default_river_water.png default_river_water_source_animated.png default_river_water_flowing_animated.png + default_acacia_leaves.png + default_acacia_sapling.png + default_acacia_tree.png + default_acacia_tree_top.png + default_acacia_wood.png + default_dry_grass.png + default_dry_grass_side.png + default_dry_grass_*.png brunob.santos (CC BY-SA 4.0): default_desert_cobble.png @@ -151,6 +158,18 @@ Philipbenr (CC BY-SA 3.0): default_grass.png default_grass_side.png +Gambit (WTFPL): + default_bronze_ingot.png + default_copper_ingot.png + default_copper_lump.png + default_iron_lump.png + default_gold_lump.png + default_clay_lump.png + default_coal.png + default_grass_*.png + default_paper.png + default_diamond_block.png + Glass breaking sounds (CC BY 3.0): 1: http://www.freesound.org/people/cmusounddesign/sounds/71947/ 2: http://www.freesound.org/people/Tomlija/sounds/97669/ @@ -190,15 +209,3 @@ Mito551 (sounds) (CC BY-SA): default_dirt_footstep.1.ogg default_dirt_footstep.2.ogg default_glass_footstep.ogg - -Gambit (WTFPL): - default_bronze_ingot.png - default_copper_ingot.png - default_copper_lump.png - default_iron_lump.png - default_gold_lump.png - default_clay_lump.png - default_coal.png - default_grass_*.png - default_paper.png - default_diamond_block.png diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 354efa46..304b2032 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -21,6 +21,13 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:acacia_wood 4', + recipe = { + {'default:acacia_tree'}, + } +}) + minetest.register_craft({ output = 'default:stick 4', recipe = { @@ -796,7 +803,7 @@ minetest.register_craft({ minetest.register_craft({ type = "fuel", - recipe = "default:sapling", + recipe = "group:sapling", burntime = 10, }) @@ -818,12 +825,6 @@ minetest.register_craft({ burntime = 370, }) -minetest.register_craft({ - type = "fuel", - recipe = "default:junglesapling", - burntime = 10, -}) - minetest.register_craft({ type = "fuel", recipe = "default:grass_1", @@ -832,7 +833,7 @@ minetest.register_craft({ minetest.register_craft({ type = "fuel", - recipe = "default:pine_sapling", - burntime = 10, + recipe = "default:dry_grass_1", + burntime = 2, }) diff --git a/mods/default/functions.lua b/mods/default/functions.lua index 426e27c4..6cd25456 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -328,7 +328,7 @@ minetest.register_abm({ }) minetest.register_abm({ - nodenames = {"default:dirt_with_grass"}, + nodenames = {"default:dirt_with_grass", "default:dirt_with_dry_grass"}, interval = 2, chance = 20, action = function(pos, node) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 0796db51..0df41df2 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -27,6 +27,7 @@ Soft / Non-Stone default:dirt default:dirt_with_grass +default:dirt_with_dry_grass default:dirt_with_grass_footsteps default:dirt_with_snow @@ -62,6 +63,11 @@ default:pinewood default:pine_needles default:pine_sapling +default:acacia_tree +default:acacia_wood +default:acacia_leaves +default:acacia_sapling + Ores ---- (1. In stone 2. Block) @@ -91,12 +97,19 @@ default:cactus default:papyrus default:dry_shrub default:junglegrass + default:grass_1 default:grass_2 default:grass_3 default:grass_4 default:grass_5 +default:dry_grass_1 +default:dry_grass_2 +default:dry_grass_3 +default:dry_grass_4 +default:dry_grass_5 + Liquids ------- (1. Source 2. Flowing) @@ -259,6 +272,19 @@ minetest.register_node("default:dirt_with_grass", { }), }) +minetest.register_node("default:dirt_with_dry_grass", { + description = "Dirt with Dry Grass", + tiles = {"default_dry_grass.png", + "default_dirt.png", + "default_dirt.png^default_dry_grass_side.png" + }, + groups = {crumbly = 3, soil = 1}, + drop = 'default:dirt', + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.4}, + }), +}) + minetest.register_node("default:dirt_with_grass_footsteps", { description = "Dirt with Grass and Footsteps", tiles = {"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, @@ -536,10 +562,14 @@ minetest.register_node("default:junglesapling", { minetest.register_node("default:pinetree", { description = "Pine Tree", - tiles = {"default_pinetree_top.png", "default_pinetree_top.png", "default_pinetree.png"}, + tiles = { + "default_pinetree_top.png", + "default_pinetree_top.png", + "default_pinetree.png" + }, paramtype2 = "facedir", is_ground_content = false, - groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2}, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2}, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node @@ -549,7 +579,7 @@ minetest.register_node("default:pinewood", { description = "Pinewood Planks", tiles = {"default_pinewood.png"}, is_ground_content = false, - groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1}, sounds = default.node_sound_wood_defaults(), }) @@ -561,20 +591,12 @@ minetest.register_node("default:pine_needles",{ waving = 1, paramtype = "light", is_ground_content = false, - groups = {snappy=3, leafdecay=3, flammable=2, leaves=1}, + groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1}, drop = { max_items = 1, items = { - { - -- player will get sapling with 1/20 chance - items = {"default:pine_sapling"}, - rarity = 20, - }, - { - -- player will get leaves only if he get no saplings, - -- this is because max_items is 1 - items = {"default:pine_needles"}, - } + {items = {"default:pine_sapling"}, rarity = 20}, + {items = {"default:pine_needles"}} } }, sounds = default.node_sound_leaves_defaults(), @@ -590,12 +612,86 @@ minetest.register_node("default:pine_sapling", { inventory_image = "default_pine_sapling.png", wield_image = "default_pine_sapling.png", paramtype = "light", + sunlight_propagates = true, walkable = false, selection_box = { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3} }, - groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1}, + groups = { + snappy = 2, + dig_immediate = 3, + flammable = 2, + attached_node = 1, + sapling = 1 + }, + sounds = default.node_sound_leaves_defaults(), +}) + +minetest.register_node("default:acacia_tree", { + description = "Acacia Tree", + tiles = { + "default_acacia_tree_top.png", + "default_acacia_tree_top.png", + "default_acacia_tree.png" + }, + paramtype2 = "facedir", + is_ground_content = false, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2}, + sounds = default.node_sound_wood_defaults(), + + on_place = minetest.rotate_node +}) + +minetest.register_node("default:acacia_wood", { + description = "Acacia Wood Planks", + tiles = {"default_acacia_wood.png"}, + is_ground_content = false, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1}, + sounds = default.node_sound_wood_defaults(), +}) + +minetest.register_node("default:acacia_leaves", { + description = "Acacia Leaves", + drawtype = "allfaces_optional", + visual_scale = 1.3, + tiles = {"default_acacia_leaves.png"}, + paramtype = "light", + is_ground_content = false, + groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1}, + drop = { + max_items = 1, + items = { + {items = {"default:acacia_sapling"}, rarity = 20}, + {items = {"default:acacia_leaves"}} + } + }, + sounds = default.node_sound_leaves_defaults(), + + after_place_node = default.after_place_leaves, +}) + +minetest.register_node("default:acacia_sapling", { + description = "Acacia Tree Sapling", + drawtype = "plantlike", + visual_scale = 1.0, + tiles = {"default_acacia_sapling.png"}, + inventory_image = "default_acacia_sapling.png", + wield_image = "default_acacia_sapling.png", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3} + }, + groups = { + snappy = 2, + dig_immediate = 3, + flammable = 2, + attached_node = 1, + sapling = 1 + }, sounds = default.node_sound_leaves_defaults(), }) @@ -848,6 +944,34 @@ for i=2,5 do }) end +for i = 1, 5 do + minetest.register_node("default:dry_grass_"..i, { + description = "Dry Grass", + drawtype = "plantlike", + waving = 1, + tiles = {"default_dry_grass_"..i..".png"}, + inventory_image = "default_dry_grass_"..i..".png", + wield_image = "default_dry_grass_"..i..".png", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + groups = { + snappy = 3, + flammable = 3, + flora = 1, + attached_node = 1, + not_in_creative_inventory = 1 + }, + drop = "default:dry_grass_1", + sounds = default.node_sound_leaves_defaults(), + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}, + }, + }) +end + -- -- Liquids -- diff --git a/mods/default/textures/default_acacia_leaves.png b/mods/default/textures/default_acacia_leaves.png new file mode 100644 index 0000000000000000000000000000000000000000..626e1b306d356abde3145bc8739f03c92207ac82 GIT binary patch literal 444 zcmV;t0YmT{kom(UenzU{bDP0=(k*IP57u+Bm0m%&=!f9yTu(E`d ziq1L7nlvn0788E6D{E%`=FcB>KjsMV^fnPrD$2}CqFBz10Ca0(U5&dtX}=L5&9VDk zOB^YlUzKg@UH~@L0{;Z~TvakkKRAx38T(z!VT%-HW&tEo0B4FJG5}4W{jLQdjuiLE ziZZi0jueupQ$x>T%jxz0;(_rr!zXKMgCy#jAT-IDH$=9a85!}w1?$&)VSSUhBkktt z*2ZqC#my#vm1&N3H2U!+qp8i6VLooSO5YFt``upsZOAY`FTNjV54yFnu4srL9MNS$ z56$ZW6^6!FHE#t#7iDIvc`IS0UBQsj9P84n-G{>#x#jeKYt?=VZ#f;xPp|gZYo=*39kz0000CHpIZX;h`|j0S*NUspZZe7`b&YyDy=YI~pCvE66Yh%O2Hyj^}xBl)wo9a@{D8{VP z%6Nu*;^(jbo~Nozn8tTO^k7Vbzp?TiU4Eb;)_C#QaYseSe5kLJ6g7?zz$d&nHSBmn4t22WQ%mvv4FO#s8{k+1*& literal 0 HcmV?d00001 diff --git a/mods/default/textures/default_acacia_tree.png b/mods/default/textures/default_acacia_tree.png new file mode 100644 index 0000000000000000000000000000000000000000..169823d41612d29e16c7faa44baae5d51b842de3 GIT binary patch literal 682 zcmV;b0#*HqP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^n? z2^1XGbQyO500JsWL_t(I%Po^jj@(ELL?4+SWvZ%e_(Zdt?cDzk#sEfFNy;DTg=$9- zAQ=&ikpKSu$2CN1t!RjplF2EvY?1QD|G$6p^Vd&auY*zwL50`rK*V{!->3mGXL_HQ zP0Wlj2aXeia=c&Ul!-ACLI6?bnurQ4LscL~MWcc!tu@A6m>K4VnbCV^uZ6W1$9Vv- z<^lmll$au_O3;A2v({qGg*l{{Xst2lWQ~ED0elXC3eFspQVPo!b4+54_t5Cn=NHHO zAcVlxE*vL?z!(bvb$7;GhzM&f93iJjyG}+Q)V+czSL@8y*-PQ-9b5BWfG9}=DF&|N zz};_ds+{LZ*)oDtw#?$DH+n-wQ9#8VjY_*3W)ruChR9YQxH~R#i)K#B+oxVETNvDL zOet|37h9?H-ocF&!>4~RTPNqtUJI=c9?vh_*9QTPi*vkQl)9q|=FrZ@^ZDdF-;6l` zh$%Dsq}EEz$vWl2W)uRNy>L%D(gc z{mt|1$#GnS7{FoMD*)GZ0pRXj=RvI%$I)fZ`F^uMc6#fyF;L+)&RlG@^7!$^abBd9 zsC#A1MQPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^n? z2_zerR=Otu00LV{L_t(I%YBo}iW5N;hQF$=PSWl4WG)@eOmsjL2Nm3lYu`iNxYC_2 zUAS_od%*{BA-EPC5EK;^FE~otOkyW}tLiEjne>b!cs6zTDGulS7jgUMHOHY!h6w<1 zFK+rpEwH#3H<$vrfBk9$m@Gww5hhFLACB~g>)w;6^8o;_Zarjh`2>2VsejK99Ur;e z!B&=*uL!KeEO$_+HhKH(4Hxg;AQ>hH1GcX8nGQ2X-^U#51_)hIeH^2F&|#aI-@;2u zg1W=G3u~AxCGN$jWSC&Gl-lzdeHs&QA4jb%gO#vlP^&A5c7P`Z*1`1UYrK9)H;m>R z#JzZaTTxLffi;Hln=h=KJ&FD~L1!h(DokAwZfzojXt)9nHgMW8nK{~{jJy&=!Y8=2 zjSzz3*9iT2f|*SbN`SPeFe2{7$OQ*_lG0ljbT_+%fXORZ+vH4p-NWvDAVPAq0g1V+^_0*xXW%9OFW==X}ohBu;Cx zso|KJo2v1F3L~sB7;CAslC41pTT7OfBtc!X=^RRVqCQFf%f{nNk4?>^g3!i{96STMm$O!Ra#M1mO%vl4g{Vf#L``DbLvc& zR(~1i94~f8P4F5kKX`oSpCC1f+s78~U_Vq1iT9p7{cn^H$M|TR{{S1^LDaALQ)vJI N002ovPDHLkV1hvjGz99K){rdHk(p>FJJmvd zx|8-yC+#^-TAMxe_xc*|@He{o`^IIUV$K4O$YKTtZeb8+WSBKa0w~B{;_2(kexIF@ zSI%%ny6{Y(P`RgzV+hA}*VBf4hYSQF)MR}@U(cg^f z+j`x$_j~S{;&)(H(BavkCl*DWU6FWYO) z^mS#w&nC($!d=lbD-kF(+tbA{gyTBn1cvYh7ML)4Eal|aXmR^K;5eHl%+WjVFimdKI;Vst E0L8FByZ`_I literal 0 HcmV?d00001 diff --git a/mods/default/textures/default_dry_grass_2.png b/mods/default/textures/default_dry_grass_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c925aceb891921ae4808b3489c77720f76c239e9 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;Vt8QlA-noJM=La8J7<711 z@QLMNr&olYT@`*|ZN#N@5mz@x-q;jzYfIGK?a}vlL_gXU^LTe`>LP21s-)EC%*XLirAtVbF z^7nLc43W5ew%1Xp!GME#`xdcm*1!L=S&#p7Y-9E;WBOB8BYVvC-L^FoFG-4idlKV( zUMxXs?;^M9Y*7hC4i`C;#9B{jp5!&*dbj=7e*JF@Y3+=s`x;iL0*z+yboFyt=akR{ E0HnTK9smFU literal 0 HcmV?d00001 diff --git a/mods/default/textures/default_dry_grass_3.png b/mods/default/textures/default_dry_grass_3.png new file mode 100644 index 0000000000000000000000000000000000000000..4e4d84e4382a9eb2d9540fff6ea5ab6db738bb89 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;Vt8QlA-noJM=La8J7<711 z@QLMNr&olYT@`*|ZN#N@5mz@x-q;jzYfIGK?a}vlL_gXU^LTe`>LP21s-)EC%*Ri@gt@STZ zDA&`)F+}3>*4~3mhYdKK;CGAD*j$&SML>%gJYD@<);T3K0RT#GaYFzA literal 0 HcmV?d00001 diff --git a/mods/default/textures/default_dry_grass_4.png b/mods/default/textures/default_dry_grass_4.png new file mode 100644 index 0000000000000000000000000000000000000000..d315849e0b655c9908bbf278d1b7389af7d9e3cc GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;Vt8QlA-noJM=La8J7<711 z@QLMNr&olYT@`*|ZN#N@5mz@x-q;jzYfIGK?a}vlL_gXU^LTe`>LP21s-)EC%H&EU7@@gnh zsL9jCF+}3>RKG^SBMKbdtz6r9cl_VNpZB4v!Bc_bPqk2Bq*j>g1HBVT(r)2mYkOsO z?7Da%MN#^|XQsouk{7AYtV^k_zP8Bb&y1tJ0&7D3Eu({s=JH%HDbL{5wOUr==5zU5 z`M$@D?HAquKGt&mvOCLK+~>gCSuPW%ta`re!;WRYp79?qX60S(6EqL#8U{~SKbLh* G2~7ZCq=hj4BSQm47L-f^6u{XBF-QE^^cSrn#U2zY0CqCVm_-ucY!521s-)EC$Q4yWF`LZTZ zXr`x&V~E7%(0)gu!v-A8*V~R*a9aGY&wctWZ331s$2~b9|ovnFT?Ymj~Wl6Z&{V_=Bwx zuXaWq;`9&)n#NcXllZ|~ZQe$>>>b9=<|{aK=9`CV;}17>}lJ_=58OyUnCsz3jg Zw-L!=&fK+U