Update flowers_plus mod

mods/MAPGEN/flowers_plus/depends.txt

@@ -1,4 +1,4 @@
 biome_lib
-australia
+plantlife_i18n
 farming?
 flowers?

mods/MAPGEN/flowers_plus/flowers-changelog.txt

@@ -0,0 +1,24 @@
+Changelog
+---------
+
+2012-08-06: Tweaked selection boxes on all nodes.  Tweaked seaweed to use 
+signlike instead of raillike drawtype, (still forced to only spawn flat as 
+usual).  Adjusted light level limits to give it more time to grow.  Created 
+this changelog file using github commit messages as the basis.  Shrunk the 
+geranium flower down a bit to better match the others.
+
+2012-08-03: Tuned out the random-numbers-inside-ABM stuff. Uses the ABM's 
+chance setting instead.  Should be approximately the same as before, but 
+hopefully using a tad less CPU.  Minor tweak to ABM interval/growing delay.
+
+2012-08-01: Added blue geranium to the collection of flowers.
+
+2012-07-31: Disable debug by default.
+
+2012-07-30: many updates over the course of the day - first commit, removed 
+some redundant files, added wield/inventory image entries for each item, to 
+force the game to draw them properly (these shouldn't be needed, must be a 
+bug).  Tweaked spawn code so that the radius check also includes the name of 
+the item being spawned as well as items in group:flower, that way all items can 
+have a radius test, and not just those in group:flower. Fiddled with the spawn 
+rates a bit.

mods/MAPGEN/flowers_plus/init.lua

@@ -1,10 +1,5 @@
------------------------------------------------------------------------------------------------
-local title		= "Flowers Plus"
-local version 	= "2016-06-18"
-local mname		= "flowers_plus"
------------------------------------------------------------------------------------------------
-
-local S = biome_lib.intllib
+-- support for i18n
+local S = plantlife_i18n.gettext
 
 -- This file supplies a few additional plants and some related crafts
 -- for the plantlife modpack.  Last revision:  2013-04-24
@@ -18,7 +13,8 @@ local lilies_max_count = 320
 local lilies_rarity = 33
 local seaweed_max_count = 320
 local seaweed_rarity = 33
-
+local sunflowers_max_count = 10
+local sunflowers_rarity = 25
 
 -- register the various rotations of waterlilies
 
@@ -47,7 +43,7 @@ for i in ipairs(lilies_list) do
 	minetest.register_node(":flowers:waterlily"..deg1, {
 		description = S("Waterlily"),
 		drawtype = "nodebox",
-		tiles = { 
+		tiles = {
 			"flowers_waterlily"..deg2..".png",
 			"flowers_waterlily"..deg2..".png^[transformFY"
 		},
@@ -69,11 +65,13 @@ for i in ipairs(lilies_list) do
 		},
 		buildable_to = true,
 		node_placement_prediction = "",
+
 		liquids_pointable = true,
 		drop = "flowers:waterlily",
 		on_place = function(itemstack, placer, pointed_thing)
 			local keys=placer:get_player_control()
 			local pt = pointed_thing
+
 			local place_pos = nil
 			local top_pos = {x=pt.under.x, y=pt.under.y+1, z=pt.under.z}
 			local under_node = minetest.get_node(pt.under)
@@ -81,9 +79,10 @@ for i in ipairs(lilies_list) do
 			local top_node   = minetest.get_node(top_pos)
 
 			if biome_lib:get_nodedef_field(under_node.name, "buildable_to") then
-				if under_node.name ~= "group:water" then
+				if under_node.name ~= "default:water_source" then
 					place_pos = pt.under
-				elseif top_node.name ~= "group:water" and biome_lib:get_nodedef_field(top_node.name, "buildable_to") then
+				elseif top_node.name ~= "default:water_source"
+				       and biome_lib:get_nodedef_field(top_node.name, "buildable_to") then
 					place_pos = top_pos
 				else
 					return
@@ -141,11 +140,11 @@ for i in ipairs(algae_list) do
 		num = "_"..algae_list[i][1]
 		algae_groups = { snappy = 3,flammable=2,flower=1, not_in_creative_inventory=1 }
 	end
-	
+
 	minetest.register_node(":flowers:seaweed"..num, {
 		description = S("Seaweed"),
 		drawtype = "nodebox",
-		tiles = { 
+		tiles = {
 			"flowers_seaweed"..num..".png",
 			"flowers_seaweed"..num..".png^[transformFY"
 		},
@@ -164,9 +163,9 @@ for i in ipairs(algae_list) do
 		node_box = {
 			type = "fixed",
 			fixed = { -0.5, -0.49, -0.5, 0.5, -0.49, 0.5 },
-		},	
+		},
 		buildable_to = true,
-		
+
 		liquids_pointable = true,
 		drop = "flowers:seaweed",
 		on_place = function(itemstack, placer, pointed_thing)
@@ -182,7 +181,7 @@ for i in ipairs(algae_list) do
 			if biome_lib:get_nodedef_field(under_node.name, "buildable_to") then
 				if under_node.name ~= "default:water_source" then
 					place_pos = pt.under
-				elseif top_node.name ~= "default:water_source" 
+				elseif top_node.name ~= "default:water_source"
 				       and biome_lib:get_nodedef_field(top_node.name, "buildable_to") then
 					place_pos = top_pos
 				else
@@ -223,6 +222,40 @@ for i in ipairs(algae_list) do
 	})
 end
 
+local box = {
+	type="fixed",
+	fixed = { { -0.2, -0.5, -0.2, 0.2, 0.5, 0.2 } },
+}
+
+local sunflower_drop = "farming:seed_wheat"
+if minetest.registered_items["farming:seed_spelt"] then
+	sunflower_drop = "farming:seed_spelt"
+end
+
+minetest.register_node(":flowers:sunflower", {
+	description = S("Sunflower"),
+	drawtype = "mesh",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	inventory_image = "flowers_sunflower_inv.png",
+	mesh = "flowers_sunflower.obj",
+	tiles = { "flowers_sunflower.png" },
+	walkable = false,
+	buildable_to = true,
+	is_ground_content = true,
+	groups = { dig_immediate=3, flora=1, flammable=3 },
+	sounds = default.node_sound_leaves_defaults(),
+	selection_box = box,
+	collision_box = box,
+	drop = {
+		max_items = 1,
+		items = {
+			{items = {sunflower_drop}, rarity = 8},
+			{items = {"flowers:sunflower"}},
+		}
+	}
+})
+
 local extra_aliases = {
 	"waterlily",
 	"waterlily_225",
@@ -247,7 +280,6 @@ minetest.register_alias( "along_shore:seaweed_2"  ,	"flowers:seaweed_2"    )
 minetest.register_alias( "along_shore:seaweed_3"  ,	"flowers:seaweed_3"    )
 minetest.register_alias( "along_shore:seaweed_4"  ,	"flowers:seaweed_4"    )
 
-
 -- ongen registrations
 
 flowers_plus.grow_waterlily = function(pos)
@@ -260,7 +292,7 @@ flowers_plus.grow_waterlily = function(pos)
 		if lilies_list[i][1] ~= nil then
 			ext = "_"..lilies_list[i][1]
 		end
-	
+
 		if chance == num then
 			minetest.set_node(right_here, {name="flowers:waterlily"..ext, param2=math.random(0,3)})
 		end
@@ -268,7 +300,7 @@ flowers_plus.grow_waterlily = function(pos)
 end
 
 biome_lib:register_generate_plant({
-	surface = {"default:river_water_source", "australia:muddy_river_water_source"},
+	surface = {"default:river_water_source", "australia:muddy_water_source"},
 	max_count = lilies_max_count,
 	rarity = lilies_rarity,
 	min_elevation = 1,
@@ -288,18 +320,18 @@ flowers_plus.grow_seaweed = function(pos)
 end
 
 biome_lib:register_generate_plant({
-	surface = {"default:water_source"},
-	max_count = seaweed_max_count,
-	rarity = seaweed_rarity,
-	min_elevation = 1,
+    surface = {"default:water_source"},
+    max_count = seaweed_max_count,
+    rarity = seaweed_rarity,
+    min_elevation = 1,
 	max_elevation = 2,
 	near_nodes = {"default:dirt_with_grass"},
 	near_nodes_size = 4,
 	near_nodes_vertical = 1,
 	near_nodes_count = 1,
-	plantlife_limit = -0.9,
-},
-flowers_plus.grow_seaweed
+    plantlife_limit = -0.9,
+  },
+  flowers_plus.grow_seaweed
 )
 
 -- seaweed at beaches
@@ -317,6 +349,7 @@ biome_lib:register_generate_plant({
   },
   flowers_plus.grow_seaweed
 )
+
 biome_lib:register_generate_plant({
     surface = {"default:sand"},
     max_count = seaweed_max_count*2,
@@ -349,7 +382,7 @@ biome_lib:spawn_on_surfaces({
 	},
 	avoid_radius = 2.5,
 	spawn_chance = SPAWN_CHANCE*4,
-	spawn_surfaces = {"default:river_water_source", "australia:muddy_river_water_source"},
+	spawn_surfaces = {"default:river_water_source", "australia:muddy_water_source"},
 	avoid_nodes = {"group:flower", "group:flora" },
 	seed_diff = flowers_seed_diff,
 	light_min = 9,
@@ -398,6 +431,5 @@ biome_lib:spawn_on_surfaces({
 	facedir = 1
 })
 
------------------------------------------------------------------------------------------------
-minetest.log("MOD: "..title.." ["..version.."] ["..mname.."] loaded...")
------------------------------------------------------------------------------------------------
+print(S("[Flowers] Loaded."))
+

mods/MAPGEN/flowers_plus/models/flowers_sunflower.obj

@@ -0,0 +1,73 @@
+# Blender v2.70 (sub 0) OBJ File: 'sunflower.blend'
+# www.blender.org
+mtllib sunflower_sunflower.mtl
+o Cube
+v -0.015625 -0.500000 0.028125
+v -0.015625 -0.500000 -0.028125
+v 0.028125 -0.500000 -0.028125
+v 0.028125 -0.500000 0.028125
+v -0.015625 0.790890 0.028125
+v -0.015625 0.689140 -0.028125
+v 0.028125 0.689140 -0.028125
+v 0.028125 0.790890 0.028125
+v 0.250000 0.533494 -0.125000
+v -0.250000 0.533494 -0.125000
+v 0.250000 0.966506 0.125000
+v -0.250000 0.966506 0.125000
+v 0.267063 0.373606 -0.088749
+v 0.044375 0.303464 -0.141576
+v 0.239202 0.473737 0.108253
+v -0.008452 0.378817 0.108253
+v 0.017721 0.016639 -0.112053
+v -0.231280 0.110242 -0.115181
+v -0.030356 -0.036246 0.146223
+v -0.252831 0.028885 0.088910
+v 0.062500 0.641747 -0.057917
+v -0.106953 0.097386 -0.113617
+v -0.006318 -0.053008 0.024707
+v 0.118968 0.360674 0.006909
+v 0.116101 0.452031 0.108253
+v 0.017962 0.298392 -0.019504
+v 0.145794 0.358736 -0.115163
+v 0.240237 0.375544 0.033323
+v -0.224509 0.021356 -0.032606
+v -0.131273 0.023638 0.117567
+v -0.102951 0.016109 -0.003950
+vt 0.750000 0.875000
+vt 0.625000 0.875000
+vt 0.625000 0.750000
+vt 0.750000 0.750000
+vt 0.750000 1.000000
+vt 0.625000 1.000000
+vt 0.625000 0.500000
+vt 0.500000 0.500000
+vt 0.500000 1.000000
+vt 0.000100 0.500100
+vt 0.499900 0.500100
+vt 0.499900 0.999900
+vt 0.000100 0.999900
+vt 0.250000 0.250000
+vt 0.500000 0.250000
+vt 0.250000 0.500000
+vt 0.000000 0.250000
+vt 0.000000 0.000000
+vt 0.250000 0.000000
+vt 0.000000 0.500000
+vt 0.500000 0.000000
+usemtl Sunflower
+s off
+f 1/1 2/2 3/3 4/4
+f 5/5 8/6 7/2 6/1
+f 1/7 5/8 6/9 2/6
+f 2/7 6/6 7/9 3/8
+f 3/7 7/8 8/9 4/6
+f 5/7 1/8 4/9 8/6
+f 9/10 10/11 12/12 11/13
+f 24/14 26/15 16/8 25/16
+f 31/14 29/17 20/18 30/19
+f 17/8 22/16 31/14 23/15
+f 22/16 18/20 29/17 31/14
+f 27/19 14/21 26/15 24/14
+f 13/18 27/19 24/14 28/17
+f 23/15 31/14 30/19 19/21
+f 28/17 24/14 25/16 15/20

mods/australia_modpack/flowers_plus/locale/de.txt

@@ -1,6 +0,0 @@
-# Translation by Xanthin
-
-Waterlily = Seerose
-Seaweed = Seetang
-
-[Flowers_Plus] Loaded. = [Flowers_Plus] Geladen.

mods/australia_modpack/flowers_plus/locale/fr.txt

@@ -1,6 +0,0 @@
-# Template
-
-Waterlily = Nénuphar
-Seaweed = Algues
-
-[Flowers Plus] Loaded. = [Fleurs Plus] Chargées.

mods/australia_modpack/flowers_plus/locale/template.txt

@@ -1,6 +0,0 @@
-# Template
-
-Waterlily = 
-Seaweed = 
-
-[Flowers Plus] Loaded. = 

mods/australia_modpack/flowers_plus/locale/tr.txt

@@ -1,7 +0,0 @@
-# Turkish translation
-# mahmutelmas06@hotmail.com
-
-Waterlily = Nilüfer
-Seaweed = Deniz yosunu
-
-[Flowers] Loaded. = [Flowers Plus] yüklendi.