Skip to content

Commit 6843ddb

Browse files
paramatparamat
committedJul 12, 2015
Default: Add savanna nodes, textures, crafting and fuels
·
5.8.00.4.13
1 parent 166b1c6 commit 6843ddb

16 files changed

+171
-39
lines changed
 

‎mods/default/README.txt

+21-14
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ VanessaE (WTFPL):
5757
default_nc_front.png
5858
default_nc_rb.png
5959
default_nc_side.png
60-
default_grass_*.png
6160
default_desert_sand.png
6261
default_desert_stone.png
6362
default_desert_stone_brick.png
@@ -104,7 +103,7 @@ Zeg9 (CC BY-SA 3.0):
104103
default_gold_block.png
105104

106105
paramat (CC BY-SA 3.0):
107-
wieldhand.png, based on character.png by Jordach (CC BY-SA 3.0)
106+
wieldhand.png, derived from character.png by Jordach (CC BY-SA 3.0)
108107
default_pinetree.png
109108
default_pinetree_top.png
110109
default_pinewood.png
@@ -113,6 +112,14 @@ paramat (CC BY-SA 3.0):
113112
default_river_water.png
114113
default_river_water_source_animated.png
115114
default_river_water_flowing_animated.png
115+
default_acacia_leaves.png
116+
default_acacia_sapling.png
117+
default_acacia_tree.png
118+
default_acacia_tree_top.png
119+
default_acacia_wood.png
120+
default_dry_grass.png
121+
default_dry_grass_side.png
122+
default_dry_grass_*.png
116123

117124
brunob.santos (CC BY-SA 4.0):
118125
default_desert_cobble.png
@@ -151,6 +158,18 @@ Philipbenr (CC BY-SA 3.0):
151158
default_grass.png
152159
default_grass_side.png
153160

161+
Gambit (WTFPL):
162+
default_bronze_ingot.png
163+
default_copper_ingot.png
164+
default_copper_lump.png
165+
default_iron_lump.png
166+
default_gold_lump.png
167+
default_clay_lump.png
168+
default_coal.png
169+
default_grass_*.png
170+
default_paper.png
171+
default_diamond_block.png
172+
154173
Glass breaking sounds (CC BY 3.0):
155174
1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
156175
2: http://www.freesound.org/people/Tomlija/sounds/97669/
@@ -190,15 +209,3 @@ Mito551 (sounds) (CC BY-SA):
190209
default_dirt_footstep.1.ogg
191210
default_dirt_footstep.2.ogg
192211
default_glass_footstep.ogg
193-
194-
Gambit (WTFPL):
195-
default_bronze_ingot.png
196-
default_copper_ingot.png
197-
default_copper_lump.png
198-
default_iron_lump.png
199-
default_gold_lump.png
200-
default_clay_lump.png
201-
default_coal.png
202-
default_grass_*.png
203-
default_paper.png
204-
default_diamond_block.png

‎mods/default/crafting.lua

+10-9
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ minetest.register_craft({
2121
}
2222
})
2323

24+
minetest.register_craft({
25+
output = 'default:acacia_wood 4',
26+
recipe = {
27+
{'default:acacia_tree'},
28+
}
29+
})
30+
2431
minetest.register_craft({
2532
output = 'default:stick 4',
2633
recipe = {
@@ -796,7 +803,7 @@ minetest.register_craft({
796803

797804
minetest.register_craft({
798805
type = "fuel",
799-
recipe = "default:sapling",
806+
recipe = "group:sapling",
800807
burntime = 10,
801808
})
802809

@@ -818,12 +825,6 @@ minetest.register_craft({
818825
burntime = 370,
819826
})
820827

821-
minetest.register_craft({
822-
type = "fuel",
823-
recipe = "default:junglesapling",
824-
burntime = 10,
825-
})
826-
827828
minetest.register_craft({
828829
type = "fuel",
829830
recipe = "default:grass_1",
@@ -832,7 +833,7 @@ minetest.register_craft({
832833

833834
minetest.register_craft({
834835
type = "fuel",
835-
recipe = "default:pine_sapling",
836-
burntime = 10,
836+
recipe = "default:dry_grass_1",
837+
burntime = 2,
837838
})
838839

‎mods/default/functions.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ minetest.register_abm({
328328
})
329329

330330
minetest.register_abm({
331-
nodenames = {"default:dirt_with_grass"},
331+
nodenames = {"default:dirt_with_grass", "default:dirt_with_dry_grass"},
332332
interval = 2,
333333
chance = 20,
334334
action = function(pos, node)

‎mods/default/nodes.lua

+139-15
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Soft / Non-Stone
2727
2828
default:dirt
2929
default:dirt_with_grass
30+
default:dirt_with_dry_grass
3031
default:dirt_with_grass_footsteps
3132
default:dirt_with_snow
3233
@@ -62,6 +63,11 @@ default:pinewood
6263
default:pine_needles
6364
default:pine_sapling
6465
66+
default:acacia_tree
67+
default:acacia_wood
68+
default:acacia_leaves
69+
default:acacia_sapling
70+
6571
Ores
6672
----
6773
(1. In stone 2. Block)
@@ -91,12 +97,19 @@ default:cactus
9197
default:papyrus
9298
default:dry_shrub
9399
default:junglegrass
100+
94101
default:grass_1
95102
default:grass_2
96103
default:grass_3
97104
default:grass_4
98105
default:grass_5
99106
107+
default:dry_grass_1
108+
default:dry_grass_2
109+
default:dry_grass_3
110+
default:dry_grass_4
111+
default:dry_grass_5
112+
100113
Liquids
101114
-------
102115
(1. Source 2. Flowing)
@@ -259,6 +272,19 @@ minetest.register_node("default:dirt_with_grass", {
259272
}),
260273
})
261274

275+
minetest.register_node("default:dirt_with_dry_grass", {
276+
description = "Dirt with Dry Grass",
277+
tiles = {"default_dry_grass.png",
278+
"default_dirt.png",
279+
"default_dirt.png^default_dry_grass_side.png"
280+
},
281+
groups = {crumbly = 3, soil = 1},
282+
drop = 'default:dirt',
283+
sounds = default.node_sound_dirt_defaults({
284+
footstep = {name = "default_grass_footstep", gain = 0.4},
285+
}),
286+
})
287+
262288
minetest.register_node("default:dirt_with_grass_footsteps", {
263289
description = "Dirt with Grass and Footsteps",
264290
tiles = {"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
@@ -536,10 +562,14 @@ minetest.register_node("default:junglesapling", {
536562

537563
minetest.register_node("default:pinetree", {
538564
description = "Pine Tree",
539-
tiles = {"default_pinetree_top.png", "default_pinetree_top.png", "default_pinetree.png"},
565+
tiles = {
566+
"default_pinetree_top.png",
567+
"default_pinetree_top.png",
568+
"default_pinetree.png"
569+
},
540570
paramtype2 = "facedir",
541571
is_ground_content = false,
542-
groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
572+
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
543573
sounds = default.node_sound_wood_defaults(),
544574

545575
on_place = minetest.rotate_node
@@ -549,7 +579,7 @@ minetest.register_node("default:pinewood", {
549579
description = "Pinewood Planks",
550580
tiles = {"default_pinewood.png"},
551581
is_ground_content = false,
552-
groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
582+
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
553583
sounds = default.node_sound_wood_defaults(),
554584
})
555585

@@ -561,20 +591,12 @@ minetest.register_node("default:pine_needles",{
561591
waving = 1,
562592
paramtype = "light",
563593
is_ground_content = false,
564-
groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
594+
groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
565595
drop = {
566596
max_items = 1,
567597
items = {
568-
{
569-
-- player will get sapling with 1/20 chance
570-
items = {"default:pine_sapling"},
571-
rarity = 20,
572-
},
573-
{
574-
-- player will get leaves only if he get no saplings,
575-
-- this is because max_items is 1
576-
items = {"default:pine_needles"},
577-
}
598+
{items = {"default:pine_sapling"}, rarity = 20},
599+
{items = {"default:pine_needles"}}
578600
}
579601
},
580602
sounds = default.node_sound_leaves_defaults(),
@@ -590,12 +612,86 @@ minetest.register_node("default:pine_sapling", {
590612
inventory_image = "default_pine_sapling.png",
591613
wield_image = "default_pine_sapling.png",
592614
paramtype = "light",
615+
sunlight_propagates = true,
593616
walkable = false,
594617
selection_box = {
595618
type = "fixed",
596619
fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
597620
},
598-
groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1},
621+
groups = {
622+
snappy = 2,
623+
dig_immediate = 3,
624+
flammable = 2,
625+
attached_node = 1,
626+
sapling = 1
627+
},
628+
sounds = default.node_sound_leaves_defaults(),
629+
})
630+
631+
minetest.register_node("default:acacia_tree", {
632+
description = "Acacia Tree",
633+
tiles = {
634+
"default_acacia_tree_top.png",
635+
"default_acacia_tree_top.png",
636+
"default_acacia_tree.png"
637+
},
638+
paramtype2 = "facedir",
639+
is_ground_content = false,
640+
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
641+
sounds = default.node_sound_wood_defaults(),
642+
643+
on_place = minetest.rotate_node
644+
})
645+
646+
minetest.register_node("default:acacia_wood", {
647+
description = "Acacia Wood Planks",
648+
tiles = {"default_acacia_wood.png"},
649+
is_ground_content = false,
650+
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
651+
sounds = default.node_sound_wood_defaults(),
652+
})
653+
654+
minetest.register_node("default:acacia_leaves", {
655+
description = "Acacia Leaves",
656+
drawtype = "allfaces_optional",
657+
visual_scale = 1.3,
658+
tiles = {"default_acacia_leaves.png"},
659+
paramtype = "light",
660+
is_ground_content = false,
661+
groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
662+
drop = {
663+
max_items = 1,
664+
items = {
665+
{items = {"default:acacia_sapling"}, rarity = 20},
666+
{items = {"default:acacia_leaves"}}
667+
}
668+
},
669+
sounds = default.node_sound_leaves_defaults(),
670+
671+
after_place_node = default.after_place_leaves,
672+
})
673+
674+
minetest.register_node("default:acacia_sapling", {
675+
description = "Acacia Tree Sapling",
676+
drawtype = "plantlike",
677+
visual_scale = 1.0,
678+
tiles = {"default_acacia_sapling.png"},
679+
inventory_image = "default_acacia_sapling.png",
680+
wield_image = "default_acacia_sapling.png",
681+
paramtype = "light",
682+
sunlight_propagates = true,
683+
walkable = false,
684+
selection_box = {
685+
type = "fixed",
686+
fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
687+
},
688+
groups = {
689+
snappy = 2,
690+
dig_immediate = 3,
691+
flammable = 2,
692+
attached_node = 1,
693+
sapling = 1
694+
},
599695
sounds = default.node_sound_leaves_defaults(),
600696
})
601697

@@ -848,6 +944,34 @@ for i=2,5 do
848944
})
849945
end
850946

947+
for i = 1, 5 do
948+
minetest.register_node("default:dry_grass_"..i, {
949+
description = "Dry Grass",
950+
drawtype = "plantlike",
951+
waving = 1,
952+
tiles = {"default_dry_grass_"..i..".png"},
953+
inventory_image = "default_dry_grass_"..i..".png",
954+
wield_image = "default_dry_grass_"..i..".png",
955+
paramtype = "light",
956+
sunlight_propagates = true,
957+
walkable = false,
958+
buildable_to = true,
959+
groups = {
960+
snappy = 3,
961+
flammable = 3,
962+
flora = 1,
963+
attached_node = 1,
964+
not_in_creative_inventory = 1
965+
},
966+
drop = "default:dry_grass_1",
967+
sounds = default.node_sound_leaves_defaults(),
968+
selection_box = {
969+
type = "fixed",
970+
fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
971+
},
972+
})
973+
end
974+
851975
--
852976
-- Liquids
853977
--

‎mods/default/textures/default_acacia_leaves.png

444 Bytes
Loading

‎mods/default/textures/default_acacia_sapling.png

359 Bytes
Loading

‎mods/default/textures/default_acacia_tree.png

682 Bytes
Loading

‎mods/default/textures/default_acacia_tree_top.png

731 Bytes
Loading

‎mods/default/textures/default_acacia_wood.png

261 Bytes
Loading

‎mods/default/textures/default_dry_grass.png

303 Bytes
Loading

‎mods/default/textures/default_dry_grass_1.png

219 Bytes
Loading

‎mods/default/textures/default_dry_grass_2.png

265 Bytes
Loading

‎mods/default/textures/default_dry_grass_3.png

295 Bytes
Loading

‎mods/default/textures/default_dry_grass_4.png

316 Bytes
Loading

‎mods/default/textures/default_dry_grass_5.png

339 Bytes
Loading

‎mods/default/textures/default_dry_grass_side.png

285 Bytes
Loading

1 commit comments

Comments
 (1)

HybridDog commented on Jul 17, 2015

@HybridDog
HybridDog
on Jul 17, 2015
Contributor

freeminer has dried dirt, too

Please sign in to comment.