From f556a1ae261a49a46085f87594ed0191c4f21cfb Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Mon, 7 Dec 2015 23:08:40 +0000 Subject: [PATCH] Remove grass abms and plantlike grass decorations --- ...nital_stuff.lua => give_initial_stuff.lua} | 0 mods/default/functions.lua | 62 ---- mods/default/mapgen.lua | 267 ------------------ mods/default/nodes.lua | 89 ------ mods/default/textures/default_dry_shrub.png | Bin 148 -> 0 bytes mods/default/textures/default_grass_1.png | Bin 140 -> 0 bytes mods/default/textures/default_grass_2.png | Bin 153 -> 0 bytes mods/default/textures/default_grass_3.png | Bin 179 -> 0 bytes mods/default/textures/default_grass_4.png | Bin 211 -> 0 bytes mods/default/textures/default_grass_5.png | Bin 260 -> 0 bytes mods/default/textures/default_junglegrass.png | Bin 197 -> 0 bytes 11 files changed, 418 deletions(-) rename mods/ctf_inventory/{give_inital_stuff.lua => give_initial_stuff.lua} (100%) delete mode 100644 mods/default/textures/default_dry_shrub.png delete mode 100644 mods/default/textures/default_grass_1.png delete mode 100644 mods/default/textures/default_grass_2.png delete mode 100644 mods/default/textures/default_grass_3.png delete mode 100644 mods/default/textures/default_grass_4.png delete mode 100644 mods/default/textures/default_grass_5.png delete mode 100644 mods/default/textures/default_junglegrass.png diff --git a/mods/ctf_inventory/give_inital_stuff.lua b/mods/ctf_inventory/give_initial_stuff.lua similarity index 100% rename from mods/ctf_inventory/give_inital_stuff.lua rename to mods/ctf_inventory/give_initial_stuff.lua diff --git a/mods/default/functions.lua b/mods/default/functions.lua index f075558..8123327 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -98,27 +98,6 @@ default.cool_lava_flowing = function(pos) minetest.sound_play("default_cool_lava", {pos = pos, gain = 0.25}) end -minetest.register_abm({ - nodenames = {"default:lava_flowing"}, - neighbors = {"group:water"}, - interval = 1, - chance = 1, - action = function(...) - default.cool_lava_flowing(...) - end, -}) - -minetest.register_abm({ - nodenames = {"default:lava_source"}, - neighbors = {"group:water"}, - interval = 1, - chance = 1, - action = function(...) - default.cool_lava_source(...) - end, -}) - - -- -- Papyrus and cactus growing -- @@ -280,44 +259,3 @@ minetest.register_abm({ end end }) - - --- --- Grass growing --- - -minetest.register_abm({ - nodenames = {"default:dirt"}, - interval = 2, - chance = 200, - action = function(pos, node) - local above = {x = pos.x, y = pos.y + 1, z = pos.z} - local name = minetest.get_node(above).name - local nodedef = minetest.registered_nodes[name] - if nodedef and (nodedef.sunlight_propagates or nodedef.paramtype == "light") and - nodedef.liquidtype == "none" and - (minetest.get_node_light(above) or 0) >= 13 then - if name == "default:snow" or name == "default:snowblock" then - minetest.set_node(pos, {name = "default:dirt_with_snow"}) - else - minetest.set_node(pos, {name = "default:dirt_with_grass"}) - end - end - end -}) - -minetest.register_abm({ - nodenames = {"default:dirt_with_grass"}, - interval = 2, - chance = 20, - action = function(pos, node) - local above = {x = pos.x, y = pos.y + 1, z = pos.z} - local name = minetest.get_node(above).name - local nodedef = minetest.registered_nodes[name] - if name ~= "ignore" and nodedef and not ((nodedef.sunlight_propagates or - nodedef.paramtype == "light") and - nodedef.liquidtype == "none") then - minetest.set_node(pos, {name = "default:dirt"}) - end - end -}) diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index 051af66..5d26273 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -317,32 +317,6 @@ end function default.register_mgv6_decorations() - - -- Papyrus - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 8, - noise_params = { - offset = -0.3, - scale = 0.7, - spread = {x = 100, y = 100, z = 100}, - seed = 354, - octaves = 3, - persist = 0.7 - }, - y_min = 1, - y_max = 1, - decoration = "default:papyrus", - height = 2, - height_max = 4, - spawn_by = "default:water_source", - num_spawn_by = 1, - }) - - -- Cacti - minetest.register_decoration({ deco_type = "simple", place_on = {"default:desert_sand"}, @@ -361,46 +335,6 @@ function default.register_mgv6_decorations() height = 3, height_max = 4, }) - - -- Grasses - - for length = 1, 5 do - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = 0.007, - spread = {x = 100, y = 100, z = 100}, - seed = 329, - octaves = 3, - persist = 0.6 - }, - y_min = 1, - y_max = 30, - decoration = "default:grass_"..length, - }) - end - - -- Dry shrubs - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:desert_sand", "default:dirt_with_snow"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = 0.035, - spread = {x = 100, y = 100, z = 100}, - seed = 329, - octaves = 3, - persist = 0.6 - }, - y_min = 1, - y_max = 30, - decoration = "default:dry_shrub", - }) end @@ -411,207 +345,6 @@ end function default.register_decorations() - -- Flowers - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = -0.02, - scale = 0.03, - spread = {x = 200, y = 200, z = 200}, - seed = 436, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "flowers:rose", - }) - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = -0.02, - scale = 0.03, - spread = {x = 200, y = 200, z = 200}, - seed = 19822, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = 33, - y_max = 31000, - decoration = "flowers:tulip", - }) - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = -0.02, - scale = 0.03, - spread = {x = 200, y = 200, z = 200}, - seed = 1220999, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "flowers:dandelion_yellow", - }) - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = -0.02, - scale = 0.03, - spread = {x = 200, y = 200, z = 200}, - seed = 36662, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "flowers:geranium", - }) - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = -0.02, - scale = 0.03, - spread = {x = 200, y = 200, z = 200}, - seed = 1133, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "flowers:viola", - }) - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = -0.02, - scale = 0.03, - spread = {x = 200, y = 200, z = 200}, - seed = 73133, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "flowers:dandelion_white", - }) - - -- Grasses - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = 0.04, - scale = 0.04, - spread = {x = 200, y = 200, z = 200}, - seed = 66440, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "default:grass_1", - }) - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = 0.02, - scale = 0.06, - spread = {x = 200, y = 200, z = 200}, - seed = 66440, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "default:grass_2", - }) - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = 0.08, - spread = {x = 200, y = 200, z = 200}, - seed = 66440, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "default:grass_3", - }) - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = -0.02, - scale = 0.10, - spread = {x = 200, y = 200, z = 200}, - seed = 66440, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "default:grass_4", - }) - - minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = -0.04, - scale = 0.12, - spread = {x = 200, y = 200, z = 200}, - seed = 66440, - octaves = 3, - persist = 0.6 - }, - biomes = {"default:grassland"}, - y_min = -31000, - y_max = 31000, - decoration = "default:grass_5", - }) end diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 9d7b36e..173be4a 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -670,95 +670,6 @@ minetest.register_node("default:papyrus", { end, }) -minetest.register_node("default:dry_shrub", { - description = "Dry Shrub", - drawtype = "plantlike", - waving = 1, - visual_scale = 1.0, - tiles = {"default_dry_shrub.png"}, - inventory_image = "default_dry_shrub.png", - wield_image = "default_dry_shrub.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - groups = {snappy=3,flammable=3,attached_node=1}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}, - }, -}) - -minetest.register_node("default:junglegrass", { - description = "Jungle Grass", - drawtype = "plantlike", - waving = 1, - visual_scale = 1.3, - tiles = {"default_junglegrass.png"}, - inventory_image = "default_junglegrass.png", - wield_image = "default_junglegrass.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - groups = {snappy=3,flammable=2,flora=1,attached_node=1}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}, - }, -}) - -minetest.register_node("default:grass_1", { - description = "Grass", - drawtype = "plantlike", - waving = 1, - tiles = {"default_grass_1.png"}, - -- Use texture of a taller grass stage in inventory - inventory_image = "default_grass_3.png", - wield_image = "default_grass_3.png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - groups = {snappy=3,flammable=3,flora=1,attached_node=1}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}, - }, - - on_place = function(itemstack, placer, pointed_thing) - -- place a random grass node - local stack = ItemStack("default:grass_"..math.random(1,5)) - local ret = minetest.item_place(stack, placer, pointed_thing) - return ItemStack("default:grass_1 "..itemstack:get_count()-(1-ret:get_count())) - end, -}) - -for i=2,5 do - minetest.register_node("default:grass_"..i, { - description = "Grass", - drawtype = "plantlike", - waving = 1, - tiles = {"default_grass_"..i..".png"}, - inventory_image = "default_grass_"..i..".png", - wield_image = "default_grass_"..i..".png", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - drop = "default:grass_1", - groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=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_dry_shrub.png b/mods/default/textures/default_dry_shrub.png deleted file mode 100644 index e8a7f2773ba3fc4ce494940179ff857ced3822fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0T4>O0?3CkG(Eal|aXt9}qlm&3HfCpL=E=;$6Eu$;VH8OVOn8tmu^=JgQ2~%B pC}i>C@JmU!5F*05DJWQiA@exPD#POe4M0N}JYD@<);T3K0RVObCcppy diff --git a/mods/default/textures/default_grass_1.png b/mods/default/textures/default_grass_1.png deleted file mode 100644 index 505293026443b540308c245996a0d96d619467b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=86aj=tGuF|{^sF?wD_ zR^fRT!O4c~^LXb0978y+Crbz%IHACx!YUytAv9yg%!o#t h)}%BsK{Yl(2L1xZFMGa!f`!$0lxslt!64yIG5UYt{_#E^H7 WHF=imlG#AB7(8A5T-G@yGywoSyEY~O diff --git a/mods/default/textures/default_grass_4.png b/mods/default/textures/default_grass_4.png deleted file mode 100644 index 1496fb15590b6dd2ee9488a30eabd0b453f7d5d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=4P5+A%d&R*@Q6olf4_ zW|nc_!@p6XogR7{YNqSwY;w zKx9LMq>jTWMwj9Z8#Wu{BxqzLJW6_)n2=b&k(ip2m=bY7V8NLq#}to=99Xd6#F-Nr zCsrO%Sa60T#X!nnhNd=makr+nfrOQsq#sY%JQjw8dz`1QZ*^V`w1vUb)z4*}Q$iB} DNjOB| diff --git a/mods/default/textures/default_grass_5.png b/mods/default/textures/default_grass_5.png deleted file mode 100644 index a21253589130a6557f7f6f215a036749e112a3e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!S%6Q7E0A`J(Tl0E%<6RZ%{H?R z)QPUPvkceqDzb7*(~fR(&TX^v$TAI1HVn_RF!9r>n&=*!tGh^oQ3R-yu_VYZn8D%M zjWi&q#?!?yMB;L7kGIfa0}kg_rhiBLF5mmV$+a-;Rwxh8Bgw}0?SG&A^WUc3of7#+ zckBK5?F-key(+4}7MJDvhsA2ffhXS0mRWr54$kk|7IJeM7$20H%{3#fFqcKx`oLkH zd8zZtIU;W4@G!CpOueUEn!MP!u{PrOmV+;C*!RCa#njN`*~0;J2ZN`ppUXO@geCy1 CL|D!M diff --git a/mods/default/textures/default_junglegrass.png b/mods/default/textures/default_junglegrass.png deleted file mode 100644 index 25abb714602b1e7975514886f6ce20000328be4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=11*EGi!CcBzt)eHx}l zx~V`R#*!evU)OOG)?utBHuD-LC10<0Dy)6A qp(X#^3*{51lh?A@Z>^a1n*Z_