From 0060be5bcd9f3f0d38079f4b90cbf44be9f54433 Mon Sep 17 00:00:00 2001 From: Mossmanikin Date: Mon, 14 Oct 2013 21:34:59 +0200 Subject: [PATCH] Removed what's been merged to plantlife Textures are still there in the "old" folder --- along_shore/along_shore_settings.txt | 22 ---- along_shore/generating.lua | 109 ------------------ along_shore/init.lua | 8 +- along_shore/nodes.lua | 95 --------------- along_shore/textures/credit_textures.txt | 7 +- .../{old & unused => old}/LillyPad3x16.png | Bin .../{old & unused => old}/MultiLilly16x.png | Bin .../textures/{ => old}/along_shore_empty.png | Bin .../{ => old}/along_shore_lilypads_1.png | Bin .../{ => old}/along_shore_lilypads_2.png | Bin .../{ => old}/along_shore_lilypads_3.png | Bin .../{ => old}/along_shore_lilypads_4.png | Bin .../along_shore_pondscum_1.png | Bin .../{ => old}/along_shore_seaweed_1.png | Bin .../{ => old}/along_shore_seaweed_2.png | Bin .../{ => old}/along_shore_seaweed_3.png | Bin .../{ => old}/along_shore_seaweed_4.png | Bin .../textures/{ => old}/flowers_seaweed.png | Bin .../textures/{ => old}/flowers_waterlily.png | Bin .../{ => old}/flowers_waterlily_22.5.png | Bin .../{ => old}/flowers_waterlily_45.png | Bin .../{ => old}/flowers_waterlily_67.5.png | Bin .../{old & unused => old}/lillyPad5x16.png | Bin .../lillypad3Flower16x.png | Bin .../{old & unused => old}/pondscum16xc.png | Bin 25 files changed, 5 insertions(+), 236 deletions(-) delete mode 100644 along_shore/along_shore_settings.txt delete mode 100644 along_shore/generating.lua delete mode 100644 along_shore/nodes.lua rename along_shore/textures/{old & unused => old}/LillyPad3x16.png (100%) rename along_shore/textures/{old & unused => old}/MultiLilly16x.png (100%) rename along_shore/textures/{ => old}/along_shore_empty.png (100%) rename along_shore/textures/{ => old}/along_shore_lilypads_1.png (100%) rename along_shore/textures/{ => old}/along_shore_lilypads_2.png (100%) rename along_shore/textures/{ => old}/along_shore_lilypads_3.png (100%) rename along_shore/textures/{ => old}/along_shore_lilypads_4.png (100%) rename along_shore/textures/{old & unused => old}/along_shore_pondscum_1.png (100%) rename along_shore/textures/{ => old}/along_shore_seaweed_1.png (100%) rename along_shore/textures/{ => old}/along_shore_seaweed_2.png (100%) rename along_shore/textures/{ => old}/along_shore_seaweed_3.png (100%) rename along_shore/textures/{ => old}/along_shore_seaweed_4.png (100%) rename along_shore/textures/{ => old}/flowers_seaweed.png (100%) rename along_shore/textures/{ => old}/flowers_waterlily.png (100%) rename along_shore/textures/{ => old}/flowers_waterlily_22.5.png (100%) rename along_shore/textures/{ => old}/flowers_waterlily_45.png (100%) rename along_shore/textures/{ => old}/flowers_waterlily_67.5.png (100%) rename along_shore/textures/{old & unused => old}/lillyPad5x16.png (100%) rename along_shore/textures/{old & unused => old}/lillypad3Flower16x.png (100%) rename along_shore/textures/{old & unused => old}/pondscum16xc.png (100%) diff --git a/along_shore/along_shore_settings.txt b/along_shore/along_shore_settings.txt deleted file mode 100644 index d155d07..0000000 --- a/along_shore/along_shore_settings.txt +++ /dev/null @@ -1,22 +0,0 @@ --- Settings for generation of stuff (at map-generation time) - - - - - -Lilypads_Max_Count = 320 -- absolute maximum number in an area of 80x80x80 nodes - - -Lilypads_Rarity = 33 -- larger values make lillypads more rare (100 means chance of 0 %) - - - -Seaweed_Max_Count = 320 -- absolute maximum number in an area of 80x80x80 nodes - - -Seaweed_Rarity = 33 -- larger values make lillypads more rare (100 means chance of 0 %) - - - - - diff --git a/along_shore/generating.lua b/along_shore/generating.lua deleted file mode 100644 index acebd5e..0000000 --- a/along_shore/generating.lua +++ /dev/null @@ -1,109 +0,0 @@ --- MM: all temperature values have nothing to do with the circumstances under which real plants grow --- MM: they are just used to get a result that looks "good" or more or less believable - ------------------------------------------------------------------------------------------------ --- LiLy PaDS ------------------------------------------------------------------------------------------------ - -abstract_along_shore.grow_lilypad = function(pos) - local right_here = {x=pos.x, y=pos.y+1, z=pos.z} - local lily_type = math.random(1,2) - if lily_type == 1 then - minetest.add_node(right_here, {name="along_shore:lilypads_"..math.random(1,4), param2=math.random(0,3)}) - end - if lily_type == 2 then - if minetest.get_modpath("flowers_plus") ~= nil then - local LiLy_PaDS = { - {1,"flowers:waterlily"}, - {2,"flowers:waterlily_225"}, - {3,"flowers:waterlily_45"}, - {4,"flowers:waterlily_675"} - } - for i in pairs(LiLy_PaDS) do - local NR = LiLy_PaDS[i][1] - local PaD = LiLy_PaDS[i][2] - local chance = math.random(1,4) - if chance == NR then - minetest.add_node(right_here, {name=PaD, param2=math.random(0,3)}) - end - end - else - minetest.add_node(right_here, {name="along_shore:lilypads_"..math.random(1,4), param2=math.random(0,3)}) - end - end -end - -plantslib:register_generate_plant({ - surface = {"default:water_source"}, - max_count = Lilypads_Max_Count, - rarity = Lilypads_Rarity, - min_elevation = 1, - max_elevation = 40, - near_nodes = {"default:dirt_with_grass"}, - near_nodes_size = 4, - near_nodes_vertical = 1, - near_nodes_count = 1, - plantlife_limit = -0.9, - temp_max = -0.22, -- MM: checked perlin values ingame, seemed to make sense - temp_min = 0.22, -- MM: checked perlin values ingame, seemed to make sense - }, - "abstract_along_shore.grow_lilypad" -) - ------------------------------------------------------------------------------------------------ --- Sea WeeD ------------------------------------------------------------------------------------------------ -abstract_along_shore.grow_seaweed = function(pos) - local right_here = {x=pos.x, y=pos.y+1, z=pos.z} - minetest.add_node(right_here, {name="along_shore:seaweed_"..math.random(1,4), param2=math.random(1,3)}) -end - -plantslib:register_generate_plant({ - surface = {"default:water_source"}, - max_count = Seaweed_Max_Count, - rarity = Seaweed_Rarity, - min_elevation = 1, - max_elevation = 40, - near_nodes = {"default:dirt_with_grass"}, - near_nodes_size = 4, - near_nodes_vertical = 1, - near_nodes_count = 1, - plantlife_limit = -0.9, - }, - "abstract_along_shore.grow_seaweed" -) - --- seaweed at beaches --- MM: not satisfied with it, but some beaches should have some algae -plantslib:register_generate_plant({ - surface = {"default:water_source"}, - max_count = Seaweed_Max_Count, - rarity = Seaweed_Rarity, - min_elevation = 1, - max_elevation = 40, - near_nodes = {"default:sand"}, - near_nodes_size = 1, - near_nodes_vertical = 0, - near_nodes_count = 3, - plantlife_limit = -0.9, - temp_max = -0.64, -- MM: more or less random values, just to make sure it's not everywhere - temp_min = -0.22, -- MM: more or less random values, just to make sure it's not everywhere - }, - "abstract_along_shore.grow_seaweed" -) -plantslib:register_generate_plant({ - surface = {"default:sand"}, - max_count = Seaweed_Max_Count*2, - rarity = Seaweed_Rarity/2, - min_elevation = 1, - max_elevation = 40, - near_nodes = {"default:water_source"}, - near_nodes_size = 1, - near_nodes_vertical = 0, - near_nodes_count = 3, - plantlife_limit = -0.9, - temp_max = -0.64, -- MM: more or less random values, just to make sure it's not everywhere - temp_min = -0.22, -- MM: more or less random values, just to make sure it's not everywhere - }, - "abstract_along_shore.grow_seaweed" -) \ No newline at end of file diff --git a/along_shore/init.lua b/along_shore/init.lua index f4fb47e..719d324 100644 --- a/along_shore/init.lua +++ b/along_shore/init.lua @@ -1,15 +1,9 @@ ----------------------------------------------------------------------------------------------- local title = "Along the Shore" -local version = "0.0.3" +local version = "0.0.4" local mname = "along_shore" ----------------------------------------------------------------------------------------------- -abstract_along_shore = {} - -dofile(minetest.get_modpath("along_shore").."/along_shore_settings.txt") -dofile(minetest.get_modpath("along_shore").."/generating.lua") -dofile(minetest.get_modpath("along_shore").."/nodes.lua") - ----------------------------------------------------------------------------------------------- print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") ----------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/along_shore/nodes.lua b/along_shore/nodes.lua deleted file mode 100644 index 7a3d82b..0000000 --- a/along_shore/nodes.lua +++ /dev/null @@ -1,95 +0,0 @@ -local quite_flat = {-1/2, -1/2, -1/2, 1/2, -7/16, 1/2} -local super_flat = {-1/2, -1/2, -1/2, 1/2, -15/32--[[<-flickers if smaller]], 1/2} - ------------------------------------------------------------------------------------------------ --- LiLy PaDS ------------------------------------------------------------------------------------------------ -minetest.register_alias("trunks:lilypad", "along_shore:lilypad_1") -local LiLy_PaDS = { {1}, {2}, {3}, {4} } - -for i in pairs(LiLy_PaDS) do - local NR = LiLy_PaDS[i][1] - local iNV = NR - 1 - - minetest.register_alias("trunks:lilypad_"..NR, "along_shore:lilypad_"..NR) - - minetest.register_node("along_shore:lilypads_"..NR, { - description = "Lily Pad", - drawtype = "nodebox", - tiles = { - "along_shore_lilypads_"..NR..".png", - "along_shore_lilypads_"..NR..".png^[transformFY", -- mirror - "along_shore_empty.png" - }, - inventory_image = "along_shore_lilypads_"..NR..".png", - wield_image = "along_shore_lilypads_"..NR..".png", - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, - buildable_to = true, - walkable = false, - node_box = {type = "fixed", fixed = super_flat}, - selection_box = {type = "fixed", fixed = quite_flat}, - groups = {dig_immediate=3,not_in_creative_inventory=iNV}, - drop = "along_shore:lilypads_1", - sounds = default.node_sound_leaves_defaults(), - liquids_pointable = true, - on_place = function(itemstack, placer, pointed_thing) - local pt = pointed_thing - local direction = minetest.dir_to_facedir(placer:get_look_dir()) - if minetest.get_node(pt.above).name=="air" then - minetest.set_node(pt.above, {name="along_shore:lilypads_"..math.random(1,4), param2=direction}) - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - return itemstack - end - end, - }) -end - ------------------------------------------------------------------------------------------------ --- Sea WeeD ------------------------------------------------------------------------------------------------ -minetest.register_alias("along_shore:pondscum_1", "along_shore:seaweed_1") - -local PoND_SCuM = { {1}, {2}, {3}, {4} } - -for i in pairs(PoND_SCuM) do - local NR = PoND_SCuM[i][1] - local iNV = NR - 1 - minetest.register_node("along_shore:seaweed_"..NR, { - description = "Seaweed", - --drawtype = "signlike", -- MM: idea here is: you can smack it against a wall and it stays there - drawtype = "nodebox", -- MM: think rotation is more important than previous idea - tiles = { - "along_shore_seaweed_"..NR..".png", - "along_shore_seaweed_"..NR..".png^[transformFY", -- mirror - "along_shore_empty.png" - }, - inventory_image = "along_shore_seaweed_2.png", - wield_image = "along_shore_seaweed_2.png", - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, - buildable_to = true, - walkable = false, - node_box = {type = "fixed", fixed = super_flat}, - selection_box = {type = "fixed", fixed = quite_flat}, - groups = {dig_immediate=2,not_in_creative_inventory=iNV,flower=1}, - drop = "along_shore:seaweed_1", - sounds = default.node_sound_leaves_defaults(), - liquids_pointable = true, - on_place = function(itemstack, placer, pointed_thing) - local pt = pointed_thing - local direction = minetest.dir_to_facedir(placer:get_look_dir()) - if minetest.get_node(pt.above).name=="air" then - minetest.set_node(pt.above, {name="along_shore:seaweed_"..math.random(1,4), param2=direction}) - if not minetest.setting_getbool("creative_mode") then - itemstack:take_item() - end - return itemstack - end - end, - }) -end \ No newline at end of file diff --git a/along_shore/textures/credit_textures.txt b/along_shore/textures/credit_textures.txt index fc88ec4..89b4ce7 100644 --- a/along_shore/textures/credit_textures.txt +++ b/along_shore/textures/credit_textures.txt @@ -5,11 +5,14 @@ Credit for textures of "along_shore" ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- FOLDER TEXTURE AUTHORS ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -../along_shore/textures (along_shore_empty.png) (Mossmanikin) +../along_shore/textures along_shore_seaweed_1Darker.png Neuromancer, VanessaE +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +../along_shore/textures/old (along_shore_empty.png) (Mossmanikin) along_shore_lilypads_1.png Mossmanikin, Neuromancer along_shore_lilypads_2.png Mossmanikin, Neuromancer along_shore_lilypads_3.png Mossmanikin, Neuromancer along_shore_lilypads_4.png Mossmanikin, Neuromancer + along_shore_pondscum_1.png Neuromancer along_shore_seaweed_1.png Neuromancer, VanessaE along_shore_seaweed_2.png Mossmanikin, Neuromancer, VanessaE along_shore_seaweed_3.png Mossmanikin, Neuromancer, VanessaE @@ -19,8 +22,6 @@ FOLDER TEXTURE AUTHORS flowers_waterlily_22.5.png Mossmanikin, VanessaE flowers_waterlily_45.png Mossmanikin, VanessaE flowers_waterlily_67.5.png Mossmanikin, VanessaE ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -../along_shore/textures/old & unused along_shore_pondscum_1.png Neuromancer lillypad3Flower16x.png Neuromancer LillyPad3x16.png Neuromancer lillyPad5x16.png Neuromancer diff --git a/along_shore/textures/old & unused/LillyPad3x16.png b/along_shore/textures/old/LillyPad3x16.png similarity index 100% rename from along_shore/textures/old & unused/LillyPad3x16.png rename to along_shore/textures/old/LillyPad3x16.png diff --git a/along_shore/textures/old & unused/MultiLilly16x.png b/along_shore/textures/old/MultiLilly16x.png similarity index 100% rename from along_shore/textures/old & unused/MultiLilly16x.png rename to along_shore/textures/old/MultiLilly16x.png diff --git a/along_shore/textures/along_shore_empty.png b/along_shore/textures/old/along_shore_empty.png similarity index 100% rename from along_shore/textures/along_shore_empty.png rename to along_shore/textures/old/along_shore_empty.png diff --git a/along_shore/textures/along_shore_lilypads_1.png b/along_shore/textures/old/along_shore_lilypads_1.png similarity index 100% rename from along_shore/textures/along_shore_lilypads_1.png rename to along_shore/textures/old/along_shore_lilypads_1.png diff --git a/along_shore/textures/along_shore_lilypads_2.png b/along_shore/textures/old/along_shore_lilypads_2.png similarity index 100% rename from along_shore/textures/along_shore_lilypads_2.png rename to along_shore/textures/old/along_shore_lilypads_2.png diff --git a/along_shore/textures/along_shore_lilypads_3.png b/along_shore/textures/old/along_shore_lilypads_3.png similarity index 100% rename from along_shore/textures/along_shore_lilypads_3.png rename to along_shore/textures/old/along_shore_lilypads_3.png diff --git a/along_shore/textures/along_shore_lilypads_4.png b/along_shore/textures/old/along_shore_lilypads_4.png similarity index 100% rename from along_shore/textures/along_shore_lilypads_4.png rename to along_shore/textures/old/along_shore_lilypads_4.png diff --git a/along_shore/textures/old & unused/along_shore_pondscum_1.png b/along_shore/textures/old/along_shore_pondscum_1.png similarity index 100% rename from along_shore/textures/old & unused/along_shore_pondscum_1.png rename to along_shore/textures/old/along_shore_pondscum_1.png diff --git a/along_shore/textures/along_shore_seaweed_1.png b/along_shore/textures/old/along_shore_seaweed_1.png similarity index 100% rename from along_shore/textures/along_shore_seaweed_1.png rename to along_shore/textures/old/along_shore_seaweed_1.png diff --git a/along_shore/textures/along_shore_seaweed_2.png b/along_shore/textures/old/along_shore_seaweed_2.png similarity index 100% rename from along_shore/textures/along_shore_seaweed_2.png rename to along_shore/textures/old/along_shore_seaweed_2.png diff --git a/along_shore/textures/along_shore_seaweed_3.png b/along_shore/textures/old/along_shore_seaweed_3.png similarity index 100% rename from along_shore/textures/along_shore_seaweed_3.png rename to along_shore/textures/old/along_shore_seaweed_3.png diff --git a/along_shore/textures/along_shore_seaweed_4.png b/along_shore/textures/old/along_shore_seaweed_4.png similarity index 100% rename from along_shore/textures/along_shore_seaweed_4.png rename to along_shore/textures/old/along_shore_seaweed_4.png diff --git a/along_shore/textures/flowers_seaweed.png b/along_shore/textures/old/flowers_seaweed.png similarity index 100% rename from along_shore/textures/flowers_seaweed.png rename to along_shore/textures/old/flowers_seaweed.png diff --git a/along_shore/textures/flowers_waterlily.png b/along_shore/textures/old/flowers_waterlily.png similarity index 100% rename from along_shore/textures/flowers_waterlily.png rename to along_shore/textures/old/flowers_waterlily.png diff --git a/along_shore/textures/flowers_waterlily_22.5.png b/along_shore/textures/old/flowers_waterlily_22.5.png similarity index 100% rename from along_shore/textures/flowers_waterlily_22.5.png rename to along_shore/textures/old/flowers_waterlily_22.5.png diff --git a/along_shore/textures/flowers_waterlily_45.png b/along_shore/textures/old/flowers_waterlily_45.png similarity index 100% rename from along_shore/textures/flowers_waterlily_45.png rename to along_shore/textures/old/flowers_waterlily_45.png diff --git a/along_shore/textures/flowers_waterlily_67.5.png b/along_shore/textures/old/flowers_waterlily_67.5.png similarity index 100% rename from along_shore/textures/flowers_waterlily_67.5.png rename to along_shore/textures/old/flowers_waterlily_67.5.png diff --git a/along_shore/textures/old & unused/lillyPad5x16.png b/along_shore/textures/old/lillyPad5x16.png similarity index 100% rename from along_shore/textures/old & unused/lillyPad5x16.png rename to along_shore/textures/old/lillyPad5x16.png diff --git a/along_shore/textures/old & unused/lillypad3Flower16x.png b/along_shore/textures/old/lillypad3Flower16x.png similarity index 100% rename from along_shore/textures/old & unused/lillypad3Flower16x.png rename to along_shore/textures/old/lillypad3Flower16x.png diff --git a/along_shore/textures/old & unused/pondscum16xc.png b/along_shore/textures/old/pondscum16xc.png similarity index 100% rename from along_shore/textures/old & unused/pondscum16xc.png rename to along_shore/textures/old/pondscum16xc.png