Flowers: update, add new flowers and replace textures

files/flowers/README.txt

@@ -7,7 +7,16 @@ Authors of source code
 Originally by Ironzorg (MIT) and VanessaE (MIT)
 Various Minetest developers and contributors (MIT)
 
-----------------------
-3dmushrooms based on old version of VanessaE mod plantlife_modpack
+Authors of textures
+-------------------
+MultiCraft Development Team
+
+Graphics in this mod is NOT free and can be used only as part of the official MultiCraft build.
+Allowed to be used in non-official builds ONLY for personal use.
+Exceptions: flowers_waterlily.png, flowers_mushroom_*.png
+
+-------------------
+
+3dmushrooms (flowers_mushroom) based on old version of VanessaE mod plantlife_modpack:
 https://gitlab.com/VanessaE/plantlife_modpack/tree/f11fa6e6fe12bde9c964c20e0e87906f8149485d/3dmushrooms
-License for media and all other assets: WTFPL
+License for media and all other assets: WTFPL

files/flowers/init.lua

@@ -2,30 +2,39 @@
 
 flowers = {}
 
+-- Intllib
+local S = intllib.make_gettext_pair()
+
 -- Map Generation
 
 dofile(minetest.get_modpath("flowers") .. "/mapgen.lua")
 
+local min, random = math.min, math.random
+
 --
 -- Flowers
 --
 
 -- Flower registration
 
-local function add_simple_flower(name, desc, box, f_groups)
+local function add_simple_flower(name, desc, box, f_groups, inv)
 	-- Common flowers' groups
 	f_groups.snappy = 3
 	f_groups.flower = 1
 	f_groups.flora = 1
 	f_groups.attached_node = 1
+	f_groups.flammable = 1
+
+	local image = "flowers_" .. name .. ".png"
+	local inventory_image = inv and "flowers_" .. name .. "_inv.png" or image
 
 	minetest.register_node("flowers:" .. name, {
-		description = desc,
+		description = S(desc),
 		drawtype = "plantlike",
 		waving = 1,
-		tiles = {"flowers_" .. name .. ".png"},
-		inventory_image = "flowers_" .. name .. ".png",
-		wield_image = "flowers_" .. name .. ".png",
+		tiles = {image},
+		inventory_image = inventory_image,
+		wield_image = inventory_image,
 		sunlight_propagates = true,
 		paramtype = "light",
 		walkable = false,
@@ -39,84 +48,196 @@ local function add_simple_flower(name, desc, box, f_groups)
 	})
 end
 
+local rose_size			= {-0.18, -0.5, -0.18, 0.18, 0.27, 0.18}
+local tulip_size		= {-0.16, -0.5, -0.16, 0.16, 0.18, 0.16}
+local houstonia_size	= {-0.23, -0.5, -0.23, 0.23, 0.06, 0.23}
+local orchid_size		= {-0.31, -0.5, -0.31, 0.31, 0.37, 0.31}
+local allium_size		= {-0.19, -0.5, -0.19, 0.19, 0.38, 0.19}
+local oxeye_daisy_size	= {-0.19, -0.5, -0.19, 0.19, 0.33, 0.19}
+
 flowers.datas = {
+	-- Rose
 	{
 		"rose",
 		"Red Rose",
-		{-1 / 8, -0.5, -1 / 8, 1 / 8, 3 / 16, 1 / 8},
-		{color_red = 1, flammable = 1}
+		rose_size,
+		{color_red = 1}
 	},
+	{
+		"rose_burgundy",
+		"Burgundy Rose",
+		rose_size,
+		{color_red = 1}
+	},
+	{
+		"rose_pink",
+		"Pink Rose",
+		rose_size,
+		{color_pink = 1}
+	},
+	{
+		"rose_white",
+		"White Rose",
+		rose_size,
+		{color_white = 1}
+	},
+	{
+		"rose_yellow",
+		"Yellow Rose",
+		rose_size,
+		{color_yellow = 1}
+	},
+
+	-- Tulip
 	{
 		"tulip",
 		"Orange Tulip",
-		{-1 / 8, -0.5, -1 / 8, 1 / 8, 5 / 16, 1 / 8},
-		{color_orange = 1, flammable = 1}
+		tulip_size,
+		{color_orange = 1}
+	},
+	{
+		"tulip_burgundy",
+		"Burgundy Tulip",
+		tulip_size,
+		{color_red = 1}
 	},
 	{
 		"tulip_pink",
 		"Pink Tulip",
-		{-1 / 8, -0.5, -1 / 8, 1 / 8, 5 / 16, 1 / 8},
-		{color_pink = 1, flammable = 1}
+		tulip_size,
+		{color_pink = 1}
 	},
 	{
 		"tulip_red",
 		"Red Tulip",
-		{-1 / 8, -0.5, -1 / 8, 1 / 8, 5 / 16, 1 / 8},
-		{color_red = 1, flammable = 1}
+		tulip_size,
+		{color_red = 1}
+	},
+	{
+		"tulip_violet",
+		"Violet Tulip",
+		tulip_size,
+		{color_violet = 1}
 	},
 	{
 		"tulip_white",
 		"White Tulip",
-		{-1 / 8, -0.5, -1 / 8, 1 / 8, 5 / 16, 1 / 8},
-		{color_white = 1, flammable = 1}
+		tulip_size,
+		{color_white = 1}
 	},
+	{
+		"tulip_yellow",
+		"Yellow Tulip",
+		tulip_size,
+		{color_yellow = 1}
+	},
+
+	-- Dandelion
 	{
 		"dandelion_yellow",
 		"Yellow Dandelion",
-		{-1 / 8, -0.5, -1 / 8, 1 / 8, 0, 1 / 8},
-		{color_yellow = 1, flammable = 1}
+		{-0.25, -0.5, -0.25, 0.25, 0, 0.25},
+		{color_yellow = 1}, true
 	},
+
+	-- Houstonia
 	{
 		"houstonia",
-		"Houstonia",
-		{-1 / 5, -0.5, -1 / 5, 1 / 5, 1 / 10, 1 / 5},
-		{color_white = 1, flammable = 1}
+		"White Houstonia",
+		houstonia_size,
+		{color_white = 1}
 	},
+	{
+		"houstonia_blue",
+		"Blue Houstonia",
+		houstonia_size,
+		{color_blue = 1}
+	},
+	{
+		"houstonia_pink",
+		"Pink Houstonia",
+		houstonia_size,
+		{color_pink = 1}
+	},
+
+
+	-- Orchid
 	{
 		"orchid",
 		"Blue Orchid",
-		{-1 / 4, -0.5, -1 / 4, 1 / 4, 1 / 3, 1 / 4},
-		{color_blue = 1, flammable = 1}
+		orchid_size,
+		{color_blue = 1}
 	},
 	{
-		"allium",
-		"Allium",
-		{-3 / 16, -0.5, -3 / 16, 3 / 16, 6 / 16, 3 / 16},
-		{color_violet = 1, flammable = 1}
+		"orchid_pink",
+		"Pink Orchid",
+		orchid_size,
+		{color_pink = 1}
 	},
+	{
+		"orchid_white",
+		"White Orchid",
+		orchid_size,
+		{color_white = 1}
+	},
+
+	-- Allium
+	{
+		"allium",
+		"Violet Allium",
+		allium_size,
+		{color_violet = 1}
+	},
+	{
+		"allium_blue",
+		"Blue Allium",
+		allium_size,
+		{color_blue = 1}
+	},
+	{
+		"allium_white",
+		"White Allium",
+		allium_size,
+		{color_white = 1}
+	},
+	{
+		"allium_magenta",
+		"Magenta Allium",
+		allium_size,
+		{color_magenta = 1}
+	},
+
+	-- Oxeye
 	{
 		"oxeye_daisy",
 		"White Oxeye",
-		{-3 / 16, -0.5, -3 / 16, 3 / 16, 2 / 6, 3 / 16},
-		{color_white = 1, flammable = 1}
+		oxeye_daisy_size,
+		{color_white = 1}
 	},
+	{
+		"oxeye_daisy_pink",
+		"Pink Oxeye",
+		oxeye_daisy_size,
+		{color_pink = 1}
+	},
+
+	-- Sunflower
 	{
 		"sunflower",
 		"Sunflower",
-		{-3 / 9, -0.5, -3 / 9, 3 / 9, 15 / 16, 3 / 9},
-		{color_yellow = 1, flammable = 1}
-	},
+		{-0.33, -0.5, -0.33, 0.33, 0.95, 0.33},
+		{color_yellow = 1}
+	}
 }
 
 for _, item in pairs(flowers.datas) do
 	add_simple_flower(unpack(item))
 end
 
--- set sunflower scale and drop
+-- Set sunflower scale and drop
 local sunflower_drops = {
 	{items = {"flowers:sunflower"}}
 }
-
 if minetest.get_modpath("farming_plants") then
 	sunflower_drops = {
 		{items = {"flowers:sunflower"}, rarity = 2},
@@ -136,9 +257,7 @@ minetest.override_item("flowers:sunflower", {
 -- Public function to enable override by mods
 
 function flowers.flower_spread(pos, node)
-	pos.y = pos.y - 1
-	local under = minetest.get_node(pos)
-	pos.y = pos.y + 1
+	local under = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
 	-- Replace flora with dry shrub in desert sand and silver sand,
 	-- as this is the only way to generate them.
 	-- However, preserve grasses in sand dune biomes.
@@ -172,8 +291,8 @@ function flowers.flower_spread(pos, node)
 		pos0, pos1, "group:soil")
 	local num_soils = #soils
 	if num_soils >= 1 then
-		for si = 1, math.min(3, num_soils) do
-			local soil = soils[math.random(num_soils)]
+		for _ = 1, min(3, num_soils) do
+			local soil = soils[random(num_soils)]
 			local soil_name = minetest.get_node(soil).name
 			local soil_above = {x = soil.x, y = soil.y + 1, z = soil.z}
 			light = minetest.get_node_light(soil_above)
@@ -184,9 +303,9 @@ function flowers.flower_spread(pos, node)
 					soil_name ~= "default:redsand" then
 					-- Spread also other flowers.
 				local flower = node.name
-				if math.random(3) == 1 then
+				if random(3) == 1 then
 					local fdata = flowers.datas
-					flower = "flowers:" .. fdata[math.random(#fdata)][1]
+					flower = "flowers:" .. fdata[random(#fdata)][1]
 				end
 
 				minetest.set_node(soil_above, {name = flower})
@@ -211,11 +330,11 @@ minetest.register_abm({
 --
 
 minetest.register_node("flowers:mushroom_red", {
-	description = "Red Mushroom",
-	tiles = {"3dmushrooms_red.png"},
-	inventory_image = "3dmushrooms_red_inv.png",
+	description = S"Red Mushroom",
+	tiles = {"flowers_mushroom_red.png"},
+	inventory_image = "flowers_mushroom_red_inv.png",
 	drawtype = "mesh",
-	mesh = "3dmushrooms.obj",
+	mesh = "flowers_mushroom.obj",
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
@@ -230,11 +349,11 @@ minetest.register_node("flowers:mushroom_red", {
 })
 
 minetest.register_node("flowers:mushroom_brown", {
-	description = "Brown Mushroom",
-	tiles = {"3dmushrooms_brown.png"},
-	inventory_image = "3dmushrooms_brown_inv.png",
+	description = S"Brown Mushroom",
+	tiles = {"flowers_mushroom_brown.png"},
+	inventory_image = "flowers_mushroom_brown_inv.png",
 	drawtype = "mesh",
-	mesh = "3dmushrooms.obj",
+	mesh = "flowers_mushroom.obj",
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
@@ -265,7 +384,7 @@ function flowers.mushroom_spread(pos, node)
 	if #positions == 0 then
 		return
 	end
-	local pos2 = positions[math.random(#positions)]
+	local pos2 = positions[random(#positions)]
 	pos2.y = pos2.y + 1
 	if minetest.get_node_light(pos2, 0.5) <= 3 then
 		minetest.set_node(pos2, {name = node.name})
@@ -298,7 +417,7 @@ minetest.register_alias("mushroom:red_natural", "flowers:mushroom_red")
 --
 
 minetest.register_node("flowers:waterlily", {
-	description = "Waterlily",
+	description = S"Waterlily",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -314,11 +433,11 @@ minetest.register_node("flowers:waterlily", {
 	node_placement_prediction = "",
 	node_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -15 / 32, 0.5}
+		fixed = {-0.5, -0.5, -0.5, 0.5, -15/32, 0.5}
 	},
 	selection_box = {
 		type = "fixed",
-		fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, -15 / 32, 7 / 16}
+		fixed = {-7/16, -0.5, -7/16, 7/16, -15/32, 7/16}
 	},
 
 	on_place = function(itemstack, placer, pointed_thing)
@@ -327,8 +446,8 @@ minetest.register_node("flowers:waterlily", {
 		local def = minetest.registered_nodes[node.name]
 
 		if def and def.on_rightclick then
-			return def.on_rightclick(pointed_thing.under, node, placer, itemstack,
-					pointed_thing)
+			return def.on_rightclick(pointed_thing.under, node, placer,
+					itemstack, pointed_thing) or itemstack
 		end
 
 		if def and def.liquidtype == "source" and
@@ -336,14 +455,11 @@ minetest.register_node("flowers:waterlily", {
 			local player_name = placer and placer:get_player_name() or ""
 			if not minetest.is_protected(pos, player_name) then
 				minetest.set_node(pos, {name = "flowers:waterlily",
-					param2 = math.random(0, 3)})
+					param2 = random(0, 3)})
 				if not (creative and creative.is_enabled_for
 						and creative.is_enabled_for(player_name)) then
 					itemstack:take_item()
 				end
-			else
-				minetest.chat_send_player(player_name, "Node is protected")
-				minetest.record_protection_violation(pos, player_name)
 			end
 		end
 

files/flowers/license.txt

@@ -4,6 +4,7 @@ License of source code
 The MIT License (MIT)
 Copyright (C) 2012-2016 Ironzorg, VanessaE
 Copyright (C) 2012-2016 Various Minetest developers and contributors
+Copyright (C) 2016-2020 MultiCraft Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
@@ -28,36 +29,7 @@ https://opensource.org/licenses/MIT
 Licenses of media (textures)
 ----------------------------
 
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
-Copyright (C) 2014-2016 RHRhino
-Copyright (C) 2015-2016 Gambit
-Copyright (C) 2016 yyt16384
-Copyright (C) 2017 paramat
+Copyright (C) 2020 MultiCraft Development Team
 
-You are free to:
-Share — copy and redistribute the material in any medium or format.
-Adapt — remix, transform, and build upon the material for any purpose, even commercially.
-The licensor cannot revoke these freedoms as long as you follow the license terms.
-
-Under the following terms:
-
-Attribution — You must give appropriate credit, provide a link to the license, and
-indicate if changes were made. You may do so in any reasonable manner, but not in any way
-that suggests the licensor endorses you or your use.
-
-ShareAlike — If you remix, transform, or build upon the material, you must distribute
-your contributions under the same license as the original.
-
-No additional restrictions — You may not apply legal terms or technological measures that
-legally restrict others from doing anything the license permits.
-
-Notices:
-
-You do not have to comply with the license for elements of the material in the public
-domain or where your use is permitted by an applicable exception or limitation.
-No warranties are given. The license may not give you all of the permissions necessary
-for your intended use. For example, other rights such as publicity, privacy, or moral
-rights may limit how you use the material.
-
-For more details:
-http://creativecommons.org/licenses/by-sa/3.0/
+Graphics in this mod is NOT free and can be used only as part of the official MultiCraft build.
+Allowed to be used in non-official builds ONLY for personal use.

files/flowers/locale/flowers.ru.tr

@@ -0,0 +1,30 @@
+# textdomain: flowers
+Red Rose=Красная Роза
+Burgundy Rose=Бордовая Роза
+Pink Rose=Розовая Роза
+White Rose=Белая Роза
+Yellow Rose=Жёлтая Роза
+Orange Tulip=Оранжевый Тюльпан
+Burgundy Tulip=Бордовый Тюльпан
+Pink Tulip=Розовый Тюльпан
+Red Tulip=Красный Тюльпан
+Violet Tulip=Фиолетовый Тюльпан
+White Tulip=Белый Тюльпан
+Yellow Tulip=Жёлтый Тюльпан
+Yellow Dandelion=Желтый Одуванчик
+White Houstonia=Белая Хоустония
+Blue Houstonia=Голубая Хоустония
+Pink Houstonia=Розовая Хоустония
+Blue Orchid=Голубая Орхидея
+Pink Orchid=Розовая Орхидея
+White Orchid=Белая Орхидея
+Violet Allium=Фиолетовый Аллиум
+Blue Allium=Голубой Аллиум
+White Allium=Белый Аллиум
+Magenta Allium=Пурпурный Аллиум
+White Oxeye=Белый Нивяник
+Pink Oxeye=Розовый Нивяник
+Sunflower=Подсолнух
+Red Mushroom=Красный Гриб
+Brown Mushroom=Коричневый Гриб
+Waterlily=Кувшинка

files/flowers/mapgen.lua

@@ -4,27 +4,27 @@
 
 local function register_mgv6_flower(flower_name)
 	minetest.register_decoration({
-		name = "flowers:"..flower_name,
+		name = "flowers:" .. flower_name,
 		deco_type = "simple",
 		place_on = {"default:dirt_with_grass"},
 		sidelen = 16,
 		noise_params = {
 			offset = 0,
-			scale = 0.006,
+			scale = 0.005,
 			spread = {x = 100, y = 100, z = 100},
 			seed = 436,
 			octaves = 3,
-			persist = 0.6
+			persist = 0.5
 		},
 		y_max = 30,
 		y_min = 1,
-		decoration = "flowers:"..flower_name
+		decoration = "flowers:" .. flower_name
 	})
 end
 
 local function register_mgv6_mushroom(mushroom_name)
 	minetest.register_decoration({
-		name = "flowers:"..mushroom_name,
+		name = "flowers:" .. mushroom_name,
 		deco_type = "simple",
 		place_on = {"default:dirt_with_grass"},
 		sidelen = 16,
@@ -38,7 +38,7 @@ local function register_mgv6_mushroom(mushroom_name)
 		},
 		y_max = 30,
 		y_min = 1,
-		decoration = "flowers:"..mushroom_name,
+		decoration = "flowers:" .. mushroom_name,
 		spawn_by = "default:tree",
 		num_spawn_by = 1
 	})
@@ -66,15 +66,30 @@ end
 
 function flowers.register_mgv6_decorations()
 	register_mgv6_flower("rose")
+	register_mgv6_flower("rose_burgundy")
+	register_mgv6_flower("rose_pink")
+	register_mgv6_flower("rose_white")
+	register_mgv6_flower("rose_yellow")
 	register_mgv6_flower("tulip")
+	register_mgv6_flower("tulip_burgundy")
 	register_mgv6_flower("tulip_pink")
 	register_mgv6_flower("tulip_red")
+	register_mgv6_flower("tulip_violet")
 	register_mgv6_flower("tulip_white")
+	register_mgv6_flower("tulip_yellow")
 	register_mgv6_flower("dandelion_yellow")
 	register_mgv6_flower("houstonia")
+	register_mgv6_flower("houstonia_blue")
+	register_mgv6_flower("houstonia_pink")
 	register_mgv6_flower("orchid")
+	register_mgv6_flower("orchid_pink")
+	register_mgv6_flower("orchid_white")
 	register_mgv6_flower("allium")
+	register_mgv6_flower("allium_blue")
+	register_mgv6_flower("allium_white")
+	register_mgv6_flower("allium_magenta")
 	register_mgv6_flower("oxeye_daisy")
+	register_mgv6_flower("oxeye_daisy_pink")
 	register_mgv6_flower("sunflower")
 
 	register_mgv6_mushroom("mushroom_brown")
@@ -90,29 +105,29 @@ end
 
 local function register_flower(seed, flower_name)
 	minetest.register_decoration({
-		name = "flowers:"..flower_name,
+		name = "flowers:" .. flower_name,
 		deco_type = "simple",
 		place_on = {"default:dirt_with_grass"},
 		sidelen = 16,
 		noise_params = {
 			offset = -0.02,
-			scale = 0.04,
+			scale = 0.03,
 			spread = {x = 100, y = 100, z = 100},
 			seed = seed,
 			octaves = 3,
-			persist = 0.6
+			persist = 0.5
 		},
 		biomes = {"stone_grassland", "sandstone_grassland",
 			"deciduous_forest", "coniferous_forest"},
 		y_max = 31000,
 		y_min = 1,
-		decoration = "flowers:"..flower_name
+		decoration = "flowers:" .. flower_name
 	})
 end
 
 local function register_mushroom(mushroom_name)
 	minetest.register_decoration({
-		name = "flowers:"..mushroom_name,
+		name = "flowers:" .. mushroom_name,
 		deco_type = "simple",
 		place_on = {"default:dirt_with_grass"},
 		sidelen = 16,
@@ -127,7 +142,7 @@ local function register_mushroom(mushroom_name)
 		biomes = {"deciduous_forest", "coniferous_forest"},
 		y_max = 31000,
 		y_min = 1,
-		decoration = "flowers:"..mushroom_name
+		decoration = "flowers:" .. mushroom_name
 	})
 end
 
@@ -152,17 +167,32 @@ local function register_waterlily()
 end
 
 function flowers.register_decorations()
-	register_flower(436,	 "rose")
-	register_flower(19822,	 "tulip")
-	register_flower(24539,	 "tulip_pink")
-	register_flower(37519,	 "tulip_red")
-	register_flower(40573,	 "tulip_white")
-	register_flower(122099,  "dandelion_yellow")
-	register_flower(107982,  "houstonia")
-	register_flower(36662,	 "orchid")
-	register_flower(1133,	 "allium")
-	register_flower(73133,	 "oxeye_daisy")
-	register_flower(48923,	 "sunflower")
+	register_flower(436,	"rose")
+	register_flower(3916,	"rose_burgundy")
+	register_flower(30314,	"rose_pink")
+	register_flower(52179,	"rose_white")
+	register_flower(9268,	"rose_yellow")
+	register_flower(19822,	"tulip")
+	register_flower(25137,	"tulip_burgundy")
+	register_flower(24539,	"tulip_pink")
+	register_flower(37519,	"tulip_red")
+	register_flower(79688,	"tulip_violet")
+	register_flower(40573,	"tulip_white")
+	register_flower(76634,	"tulip_yellow")
+	register_flower(122099, "dandelion_yellow")
+	register_flower(107982, "houstonia")
+	register_flower(23606,  "houstonia_blue")
+	register_flower(96954,  "houstonia_pink")
+	register_flower(36662,	"orchid")
+	register_flower(75512,	"orchid_pink")
+	register_flower(67220,	"orchid_white")
+	register_flower(1133,	"allium")
+	register_flower(86705,	"allium_blue")
+	register_flower(53513,	"allium_white")
+	register_flower(63145,	"allium_magenta")
+	register_flower(73133,	"oxeye_daisy")
+	register_flower(232452,	"oxeye_daisy_pink")
+	register_flower(48923,	"sunflower")
 
 	register_mushroom("mushroom_brown")
 	register_mushroom("mushroom_red")
@@ -175,8 +205,7 @@ end
 -- Detect mapgen to select functions
 --
 
-local mg_name = minetest.get_mapgen_setting("mg_name")
-if mg_name == "v6" then
+if minetest.get_mapgen_setting("mg_name") == "v6" then
 	flowers.register_mgv6_decorations()
 else
 	flowers.register_decorations()

files/flowers/models/flowers_mushroom.obj

@@ -1,89 +1,87 @@
-# Blender v2.73 (sub 0) OBJ File: 'plantlife_mushroom.blend'
-# www.blender.org
 o Cylinder
-v 0.261489 -0.177877 -0.000000
-v 0.165972 -0.203714 -0.000000
-v 0.210761 -0.224729 -0.000000
-v 0.258520 -0.211811 -0.000000
+v 0.261489 -0.177877 0
+v 0.165972 -0.203714 0
+v 0.210761 -0.224729 0
+v 0.25852 -0.211811 0
 v 0.185335 -0.171215 -0.184553
 v 0.116925 -0.199423 -0.118862
 v 0.148161 -0.219252 -0.151707
 v 0.182366 -0.205148 -0.184553
-v 0.001484 -0.155130 -0.260997
+v 0.001484 -0.15513 -0.260997
 v -0.001484 -0.189063 -0.168096
-v -0.002969 -0.206030 -0.214547
+v -0.002969 -0.20603 -0.214547
 v -0.001484 -0.189063 -0.260997
 v -0.182366 -0.139045 -0.184553
 v -0.119894 -0.178704 -0.118862
 v -0.154099 -0.192808 -0.151707
 v -0.185335 -0.172979 -0.184553
-v -0.258520 -0.132382 -0.000000
-v -0.168941 -0.174413 -0.000000
-v -0.216699 -0.187331 -0.000000
-v -0.261489 -0.166316 -0.000000
+v -0.25852 -0.132382 0
+v -0.168941 -0.174413 0
+v -0.216699 -0.187331 0
+v -0.261489 -0.166316 0
 v -0.182366 -0.139045 0.184553
 v -0.119894 -0.178704 0.118862
 v -0.154099 -0.192808 0.151707
 v -0.185335 -0.172979 0.184553
-v 0.001484 -0.155130 0.260997
+v 0.001484 -0.15513 0.260997
 v -0.001484 -0.189063 0.168096
-v -0.002969 -0.206030 0.214547
+v -0.002969 -0.20603 0.214547
 v -0.001484 -0.189063 0.260997
 v 0.185335 -0.171215 0.184553
 v 0.116925 -0.199423 0.118862
 v 0.148161 -0.219252 0.151708
 v 0.182366 -0.205148 0.184553
-v 0.059333 -0.075538 0.000000
+v 0.059333 -0.075538 0
 v 0.044915 -0.074277 -0.034942
 v 0.010106 -0.071232 -0.049416
 v -0.024704 -0.068186 -0.034942
-v -0.039122 -0.066925 0.000000
+v -0.039122 -0.066925 0
 v -0.024704 -0.068186 0.034942
 v 0.010106 -0.071232 0.049416
 v 0.044915 -0.074277 0.034942
-v 0.004580 -0.119744 -0.206430
+v 0.00458 -0.119744 -0.20643
 v 0.149993 -0.132466 -0.145968
-v 0.004580 -0.119744 0.206430
+v 0.00458 -0.119744 0.20643
 v -0.140833 -0.107022 0.145968
-v 0.210225 -0.137736 -0.000000
+v 0.210225 -0.137736 0
 v 0.149993 -0.132466 0.145968
-v -0.201064 -0.101752 -0.000000
+v -0.201064 -0.101752 0
 v -0.140833 -0.107022 -0.145968
-v 0.033054 -0.500000 -0.079800
+v 0.033054 -0.5 -0.0798
 v 0.025067 -0.177627 -0.060518
-v 0.079800 -0.500000 -0.033054
+v 0.0798 -0.5 -0.033054
 v 0.060518 -0.177627 -0.025067
-v 0.079800 -0.500000 0.033054
+v 0.0798 -0.5 0.033054
 v 0.060518 -0.177627 0.025067
-v 0.033054 -0.500000 0.079800
+v 0.033054 -0.5 0.0798
 v 0.025067 -0.177627 0.060518
-v -0.033054 -0.500000 0.079800
+v -0.033054 -0.5 0.0798
 v -0.025067 -0.177627 0.060518
-v -0.079800 -0.500000 0.033054
+v -0.0798 -0.5 0.033054
 v -0.060518 -0.177627 0.025067
-v -0.079800 -0.500000 -0.033054
+v -0.0798 -0.5 -0.033054
 v -0.060518 -0.177627 -0.025067
-v -0.033054 -0.500000 -0.079800
+v -0.033054 -0.5 -0.0798
 v -0.025067 -0.177627 -0.060518
 v 0.014323 -0.253674 -0.065067
-v 0.012105 -0.382623 -0.072780
+v 0.012105 -0.382623 -0.07278
 v 0.052438 -0.253674 -0.026952
 v 0.054739 -0.382623 -0.030146
 v 0.052438 -0.253674 0.026952
 v 0.054739 -0.382623 0.030146
 v 0.014323 -0.253674 0.065067
-v 0.012105 -0.382623 0.072780
-v -0.039580 -0.253674 0.065067
-v -0.048187 -0.382623 0.072780
+v 0.012105 -0.382623 0.07278
+v -0.03958 -0.253674 0.065067
+v -0.048187 -0.382623 0.07278
 v -0.077695 -0.253674 0.026952
-v -0.090820 -0.382623 0.030146
+v -0.09082 -0.382623 0.030146
 v -0.077695 -0.253674 -0.026952
-v -0.090820 -0.382623 -0.030146
-v -0.039580 -0.253674 -0.065067
-v -0.048187 -0.382623 -0.072780
-vt 0.261010 0.917920
+v -0.09082 -0.382623 -0.030146
+v -0.03958 -0.253674 -0.065067
+v -0.048187 -0.382623 -0.07278
+vt 0.26101 0.91792
 vt 0.235559 0.983636
-vt 0.016350 0.764426
+vt 0.01635 0.764426
 vt 0.080814 0.737724
 vt 0.545568 0.235207
 vt 0.764778 0.454417
@@ -91,28 +89,28 @@ vt 0.690996 0.484978
 vt 0.517617 0.311599
 vt 0.235559 0.235207
 vt 0.515845 0.302693
-vt 0.261010 0.302693
+vt 0.26101 0.302693
 vt 0.578125 0.234375
 vt 0.765625 0.234375
-vt 0.765625 0.312500
-vt 0.578125 0.312500
+vt 0.765625 0.3125
+vt 0.578125 0.3125
 vt 0.015625 0.234375
 vt 0.203125 0.234375
-vt 0.203125 0.312500
-vt 0.015625 0.312500
-vt 0.390625 0.312500
+vt 0.203125 0.3125
+vt 0.015625 0.3125
+vt 0.390625 0.3125
 vt 0.578125 0.390625
 vt 0.390625 0.390625
-vt 0.016350 0.454417
+vt 0.01635 0.454417
 vt 0.080814 0.482889
 vt 0.545569 0.983636
-vt 0.515845 0.917920
+vt 0.515845 0.91792
 vt 0.099043 0.730173
 vt 0.272422 0.903553
 vt 0.290733 0.368408
 vt 0.490395 0.368408
-vt 0.149550 0.709253
-vt 0.149550 0.509591
+vt 0.14955 0.709253
+vt 0.14955 0.509591
 vt 0.764778 0.764426
 vt 0.696041 0.737725
 vt 0.696041 0.482889
@@ -124,7 +122,7 @@ vt 0.631577 0.509591
 vt 0.390625 0.234375
 vt 0.517617 0.903553
 vt 0.690996 0.730173
-vt 0.432320 0.675133
+vt 0.43232 0.675133
 vt 0.473823 0.633629
 vt 0.015625 0.390625
 vt 0.490395 0.850435
@@ -133,8 +131,8 @@ vt 0.631577 0.709253
 vt 0.373624 0.533431
 vt 0.332121 0.574934
 vt 0.473823 0.574934
-vt 0.432320 0.533431
-vt 0.332121 0.633630
+vt 0.43232 0.533431
+vt 0.332121 0.63363
 vt 0.373624 0.675133
 vt 0.935126 0.767633
 vt 0.998032 0.830539
@@ -144,24 +142,24 @@ vt 0.846164 0.982408
 vt 0.783257 0.919502
 vt 0.783258 0.830539
 vt 0.846164 0.767633
-vt 0.375000 0.187500
-vt 0.375000 0.031250
-vt 0.500000 0.031250
-vt 0.500000 0.187500
-vt 0.625000 0.031250
-vt 0.625000 0.187500
-vt 0.750000 0.031250
-vt 0.750000 0.187500
-vt 0.875000 0.031250
-vt 0.875000 0.187500
-vt 1.000000 0.031250
-vt 1.000000 0.187500
-vt 0.000000 0.031250
-vt 0.125000 0.031250
-vt 0.125000 0.187500
-vt 0.000000 0.187500
-vt 0.250000 0.031250
-vt 0.250000 0.187500
+vt 0.375 0.1875
+vt 0.375 0.03125
+vt 0.5 0.03125
+vt 0.5 0.1875
+vt 0.625 0.03125
+vt 0.625 0.1875
+vt 0.75 0.03125
+vt 0.75 0.1875
+vt 0.875 0.03125
+vt 0.875 0.1875
+vt 1 0.03125
+vt 1 0.1875
+vt 0 0.03125
+vt 0.125 0.03125
+vt 0.125 0.1875
+vt 0 0.1875
+vt 0.25 0.03125
+vt 0.25 0.1875
 vt 0.542224 0.015885
 vt 0.601585 0.075246
 vt 0.601585 0.159195
@@ -170,95 +168,95 @@ vt 0.458275 0.218556
 vt 0.398914 0.159195
 vt 0.398914 0.075246
 vt 0.458275 0.015885
-vt 0.625000 0.125000
-vt 0.500000 0.125000
-vt 0.750000 0.125000
-vt 0.875000 0.125000
-vt 1.000000 0.125000
-vt 0.125000 0.125000
-vt 0.000000 0.125000
-vt 0.250000 0.125000
-vt 0.375000 0.125000
-vn -0.147000 -0.987300 0.060400
-vn -0.648700 -0.460200 0.606100
-vn -0.898800 -0.438400 0.000000
-vn -0.172000 -0.985100 0.000000
-vn 0.672500 0.376500 0.637100
-vn 0.935400 0.353500 0.000000
-vn 0.529200 0.848500 0.000000
-vn 0.396700 0.860200 0.320400
-vn -0.044900 -0.513100 -0.857100
-vn 0.558900 -0.565900 -0.606100
-vn -0.026600 -0.997800 -0.060400
-vn -0.086800 -0.992500 -0.085500
-vn -0.044900 -0.513100 0.857100
-vn 0.037800 0.432000 0.901100
-vn -0.596900 0.487600 0.637100
-vn -0.648700 -0.460200 -0.606100
-vn -0.596900 0.487600 -0.637100
-vn 0.037800 0.432000 -0.901100
-vn 0.809000 -0.587800 0.000000
-vn 0.672500 0.376500 -0.637100
-vn -0.147000 -0.987300 -0.060400
-vn -0.086800 -0.992500 0.085500
-vn -0.859800 0.510500 0.000000
-vn -0.372100 0.928200 0.000000
-vn -0.240600 0.916500 -0.319400
-vn -0.085100 -0.972600 0.216400
-vn -0.237500 -0.959200 0.153000
-vn 0.130500 -0.991400 0.000000
-vn 0.067400 -0.985900 0.153000
-vn 0.558900 -0.565900 0.606100
-vn -0.026600 -0.997800 0.060400
-vn -0.001700 -1.000000 0.000000
-vn -0.240600 0.916500 0.319400
-vn 0.077500 0.888400 0.452400
-vn -0.300700 -0.953700 0.000000
-vn 0.077500 0.888400 -0.452400
-vn 0.396700 0.860200 -0.320400
-vn 0.086200 0.978700 -0.186300
-vn 0.217800 0.967000 -0.132200
-vn -0.085100 -0.972600 -0.216400
-vn 0.067400 -0.985900 -0.153000
-vn -0.237500 -0.959200 -0.153000
-vn 0.086200 0.978700 0.186300
-vn -0.044600 0.990300 0.131300
-vn 0.272600 0.962100 0.000000
-vn 0.217800 0.967000 0.132200
-vn -0.098600 0.995100 0.000000
-vn -0.044600 0.990300 -0.131300
-vn -0.273500 -0.626100 -0.730200
-vn -0.402500 0.040600 -0.914500
-vn 0.360300 0.084000 -0.929000
-vn 0.335600 -0.581700 -0.740900
-vn 0.369900 0.027700 -0.928600
-vn 0.921100 -0.031200 -0.388000
-vn 0.913800 0.116800 -0.388800
-vn 0.921100 -0.031200 0.388000
-vn 0.913800 0.116800 0.388800
-vn 0.369900 0.027700 0.928600
-vn 0.360300 0.084000 0.929000
-vn -0.391600 0.105700 0.914000
-vn -0.402500 0.040600 0.914500
-vn -0.914200 0.156600 0.373800
-vn -0.927200 0.012400 0.374500
-vn -0.914200 0.156600 -0.373800
-vn -0.927200 0.012400 -0.374500
-vn -0.391600 0.105700 -0.914000
-vn 0.774400 -0.552100 -0.309000
-vn 0.774400 -0.552100 0.309000
-vn 0.335600 -0.581700 0.740900
-vn -0.273500 -0.626100 0.730200
-vn -0.690800 -0.658600 0.298100
-vn -0.690800 -0.658600 -0.298100
-vn 0.416700 -0.004500 -0.909100
-vn 0.925800 -0.089300 -0.367400
-vn 0.925800 -0.089300 0.367400
-vn 0.416700 -0.004500 0.909100
-vn -0.344300 0.121400 0.931000
-vn -0.896600 0.212200 0.388700
-vn -0.896600 0.212200 -0.388700
-vn -0.344300 0.121400 -0.931000
+vt 0.625 0.125
+vt 0.5 0.125
+vt 0.75 0.125
+vt 0.875 0.125
+vt 1 0.125
+vt 0.125 0.125
+vt 0 0.125
+vt 0.25 0.125
+vt 0.375 0.125
+vn -0.147 -0.9873 0.0604
+vn -0.6487 -0.4602 0.6061
+vn -0.8988 -0.4384 0
+vn -0.172 -0.9851 0
+vn 0.6725 0.3765 0.6371
+vn 0.9354 0.3535 0
+vn 0.5292 0.8485 0
+vn 0.3967 0.8602 0.3204
+vn -0.0449 -0.5131 -0.8571
+vn 0.5589 -0.5659 -0.6061
+vn -0.0266 -0.9978 -0.0604
+vn -0.0868 -0.9925 -0.0855
+vn -0.0449 -0.5131 0.8571
+vn 0.0378 0.432 0.9011
+vn -0.5969 0.4876 0.6371
+vn -0.6487 -0.4602 -0.6061
+vn -0.5969 0.4876 -0.6371
+vn 0.0378 0.432 -0.9011
+vn 0.809 -0.5878 0
+vn 0.6725 0.3765 -0.6371
+vn -0.147 -0.9873 -0.0604
+vn -0.0868 -0.9925 0.0855
+vn -0.8598 0.5105 0
+vn -0.3721 0.9282 0
+vn -0.2406 0.9165 -0.3194
+vn -0.0851 -0.9726 0.2164
+vn -0.2375 -0.9592 0.153
+vn 0.1305 -0.9914 0
+vn 0.0674 -0.9859 0.153
+vn 0.5589 -0.5659 0.6061
+vn -0.0266 -0.9978 0.0604
+vn -0.0017 -1 0
+vn -0.2406 0.9165 0.3194
+vn 0.0775 0.8884 0.4524
+vn -0.3007 -0.9537 0
+vn 0.0775 0.8884 -0.4524
+vn 0.3967 0.8602 -0.3204
+vn 0.0862 0.9787 -0.1863
+vn 0.2178 0.967 -0.1322
+vn -0.0851 -0.9726 -0.2164
+vn 0.0674 -0.9859 -0.153
+vn -0.2375 -0.9592 -0.153
+vn 0.0862 0.9787 0.1863
+vn -0.0446 0.9903 0.1313
+vn 0.2726 0.9621 0
+vn 0.2178 0.967 0.1322
+vn -0.0986 0.9951 0
+vn -0.0446 0.9903 -0.1313
+vn -0.2735 -0.6261 -0.7302
+vn -0.4025 0.0406 -0.9145
+vn 0.3603 0.084 -0.929
+vn 0.3356 -0.5817 -0.7409
+vn 0.3699 0.0277 -0.9286
+vn 0.9211 -0.0312 -0.388
+vn 0.9138 0.1168 -0.3888
+vn 0.9211 -0.0312 0.388
+vn 0.9138 0.1168 0.3888
+vn 0.3699 0.0277 0.9286
+vn 0.3603 0.084 0.929
+vn -0.3916 0.1057 0.914
+vn -0.4025 0.0406 0.9145
+vn -0.9142 0.1566 0.3738
+vn -0.9272 0.0124 0.3745
+vn -0.9142 0.1566 -0.3738
+vn -0.9272 0.0124 -0.3745
+vn -0.3916 0.1057 -0.914
+vn 0.7744 -0.5521 -0.309
+vn 0.7744 -0.5521 0.309
+vn 0.3356 -0.5817 0.7409
+vn -0.2735 -0.6261 0.7302
+vn -0.6908 -0.6586 0.2981
+vn -0.6908 -0.6586 -0.2981
+vn 0.4167 -0.0045 -0.9091
+vn 0.9258 -0.0893 -0.3674
+vn 0.9258 -0.0893 0.3674
+vn 0.4167 -0.0045 0.9091
+vn -0.3443 0.1214 0.931
+vn -0.8966 0.2122 0.3887
+vn -0.8966 0.2122 -0.3887
+vn -0.3443 0.1214 -0.931
 s 1
 f 23/1/1 24/2/2 20/3/3 19/4/4
 f 29/5/5 1/6/6 45/7/7 46/8/8