widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #04296
[Merge] lp:~franku/widelands/new_tree_values into lp:widelands
kaputtnik has proposed merging lp:~franku/widelands/new_tree_values into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~franku/widelands/new_tree_values/+merge/267989
This branch contains the new values from king_of_nowhere for growing of trees.
Edit: See https://wl.widelands.org/forum/topic/1760/?page=9#post-14345 and the whole thread.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands/new_tree_values into lp:widelands.
=== modified file 'world/immovables/trees/alder/init.lua'
--- world/immovables/trees/alder/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/alder/init.lua 2015-08-13 19:41:41 +0000
@@ -2,17 +2,17 @@
terrain_affinity = {
-- In Kelvin.
- preferred_temperature = 288.52017999565811,
+ preferred_temperature = 125,
-- In percent (1 being very wet).
- preferred_humidity = 0.47306825150674514,
+ preferred_humidity = 0.65,
-- In percent (1 being very fertile).
- preferred_fertility = 0.25549931629360256,
+ preferred_fertility = 0.6,
-- A value in [0, 1] that defines how well this can deal with non-ideal
-- situations. Lower means it is less picky, i.e. it can deal better.
- pickiness = 0.65664594705489987,
+ pickiness = 0.6,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/aspen/init.lua'
--- world/immovables/trees/aspen/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/aspen/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 283.81248780942167,
- preferred_humidity = 0.70557470200287675,
- preferred_fertility = 0.33588939650946081,
- pickiness = 0.59843914180773927,
+ preferred_temperature = 100,
+ preferred_humidity = 0.6,
+ preferred_fertility = 0.7,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/beech/init.lua'
--- world/immovables/trees/beech/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/beech/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 300.14508337738721,
- preferred_humidity = 0.77507112831207114,
- preferred_fertility = 0.38542065815662707,
- pickiness = 0.54841250257531871,
+ preferred_temperature = 110,
+ preferred_humidity = 0.4,
+ preferred_fertility = 0.6,
+ pickiness = 0.6,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/birch/init.lua'
--- world/immovables/trees/birch/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/birch/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 291.12651445601364,
- preferred_humidity = 0.65106293118084879,
- preferred_fertility = 0.48649561495584542,
- pickiness = 0.62135485759566311,
+ preferred_temperature = 80,
+ preferred_humidity = 0.65,
+ preferred_fertility = 0.6,
+ pickiness = 0.6,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/cirrus/init.lua'
--- world/immovables/trees/cirrus/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/cirrus/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 310.49936985776878,
- preferred_humidity = 0.33093169701763475,
- preferred_fertility = 0.31490614339540746,
- pickiness = 0.88315509532524683,
+ preferred_temperature = 110,
+ preferred_humidity = 0.15,
+ preferred_fertility = 0.95,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/larch/init.lua'
--- world/immovables/trees/larch/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/larch/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 295.86828891510459,
- preferred_humidity = 0.7478695149543767,
- preferred_fertility = 0.34780112905399008,
- pickiness = 0.49942687492456173,
+ preferred_temperature = 50,
+ preferred_humidity = 0.8,
+ preferred_fertility = 0.45,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/liana/init.lua'
--- world/immovables/trees/liana/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/liana/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 306.84100508116637,
- preferred_humidity = 0.35031481816178961,
- preferred_fertility = 0.31239027089344407,
- pickiness = 0.86151023238517344,
+ preferred_temperature = 120,
+ preferred_humidity = 0.2,
+ preferred_fertility = 0.7,
+ pickiness = 0.6,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/maple/init.lua'
--- world/immovables/trees/maple/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/maple/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 287.08237775107762,
- preferred_humidity = 0.78730760686377821,
- preferred_fertility = 0.25649980531413097,
- pickiness = 0.4914243068268116,
+ preferred_temperature = 110,
+ preferred_humidity = 0.7,
+ preferred_fertility = 0.8,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/mushroom_dark/init.lua'
--- world/immovables/trees/mushroom_dark/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/mushroom_dark/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 309.42487291970855,
- preferred_humidity = 0.29869955897506961,
- preferred_fertility = 0.35114518577825204,
- pickiness = 0.84637961601374756,
+ preferred_temperature = 100,
+ preferred_humidity = 0.2,
+ preferred_fertility = 0.8,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/mushroom_green/init.lua'
--- world/immovables/trees/mushroom_green/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/mushroom_green/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 310.84256042489619,
- preferred_humidity = 0.32583735421559396,
- preferred_fertility = 0.32094588183657252,
- pickiness = 0.88139960431928877,
+ preferred_temperature = 105,
+ preferred_humidity = 0.2,
+ preferred_fertility = 0.9,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/mushroom_red/init.lua'
--- world/immovables/trees/mushroom_red/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/mushroom_red/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 308.87244819948864,
- preferred_humidity = 0.37172291715567279,
- preferred_fertility = 0.30300445222969019,
- pickiness = 0.84727340115725847,
+ preferred_temperature = 80,
+ preferred_humidity = 0.35,
+ preferred_fertility = 0.85,
+ pickiness = 0.6,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/oak/init.lua'
--- world/immovables/trees/oak/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/oak/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 294.10408393399462,
- preferred_humidity = 0.721922215809505,
- preferred_fertility = 0.33114978886085622,
- pickiness = 0.59052376522124506,
+ preferred_temperature = 90,
+ preferred_humidity = 0.7,
+ preferred_fertility = 0.5,
+ pickiness = 0.6,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/palm_borassus/init.lua'
--- world/immovables/trees/palm_borassus/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/palm_borassus/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 312.12514766707613,
- preferred_humidity = 0.56274510555621171,
- preferred_fertility = 0.24489562637623052,
- pickiness = 0.54267541248001672,
+ preferred_temperature = 180,
+ preferred_humidity = 0.4,
+ preferred_fertility = 0.4,
+ pickiness = 0.6,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/palm_coconut/init.lua'
--- world/immovables/trees/palm_coconut/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/palm_coconut/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 315.01192657773601,
- preferred_humidity = 0.56856538495343112,
- preferred_fertility = 0.21429551845213668,
- pickiness = 0.50649807217854759,
+ preferred_temperature = 130,
+ preferred_humidity = 0.5,
+ preferred_fertility = 0.6,
+ pickiness = 0.6,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/palm_date/init.lua'
--- world/immovables/trees/palm_date/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/palm_date/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 311.6086872522219,
- preferred_humidity = 0.55977490370368566,
- preferred_fertility = 0.24221393314943546,
- pickiness = 0.53647728188312771,
+ preferred_temperature = 160,
+ preferred_humidity = 0.5,
+ preferred_fertility = 0.5,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/palm_oil/init.lua'
--- world/immovables/trees/palm_oil/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/palm_oil/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 300.3652506361999,
- preferred_humidity = 0.65223396993513105,
- preferred_fertility = 0.34545960943365628,
- pickiness = 0.59177154775649499,
+ preferred_temperature = 150,
+ preferred_humidity = 0.55,
+ preferred_fertility = 0.5,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/palm_roystonea/init.lua'
--- world/immovables/trees/palm_roystonea/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/palm_roystonea/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 304.83556886356092,
- preferred_humidity = 0.7181862314395816,
- preferred_fertility = 0.1949366631836775,
- pickiness = 0.52936449638322058,
+ preferred_temperature = 160,
+ preferred_humidity = 0.6,
+ preferred_fertility = 0.6,
+ pickiness = 0.9,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/rowan/init.lua'
--- world/immovables/trees/rowan/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/rowan/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 294.59166485023684,
- preferred_humidity = 0.74201972248788728,
- preferred_fertility = 0.33111426545231115,
- pickiness = 0.48945390031487623,
+ preferred_temperature = 105,
+ preferred_humidity = 0.65,
+ preferred_fertility = 0.75,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/spruce/init.lua'
--- world/immovables/trees/spruce/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/spruce/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 292.74350620988707,
- preferred_humidity = 0.61529501977615531,
- preferred_fertility = 0.44275951351764303,
- pickiness = 0.58967388451703762,
+ preferred_temperature = 60,
+ preferred_humidity = 0.7,
+ preferred_fertility = 0.5,
+ pickiness = 0.6,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/twine/init.lua'
--- world/immovables/trees/twine/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/twine/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 315.3300699009219,
- preferred_humidity = 0.34569366631444903,
- preferred_fertility = 0.28483108808181667,
- pickiness = 0.82449455374241609,
+ preferred_temperature = 95,
+ preferred_humidity = 0.2,
+ preferred_fertility = 0.4,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/umbrella_green/init.lua'
--- world/immovables/trees/umbrella_green/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/umbrella_green/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 310.51132367138973,
- preferred_humidity = 0.32957171648974837,
- preferred_fertility = 0.32389405018372797,
- pickiness = 0.87535472470354003,
+ preferred_temperature = 110,
+ preferred_humidity = 0.2,
+ preferred_fertility = 0.85,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/immovables/trees/umbrella_red/init.lua'
--- world/immovables/trees/umbrella_red/init.lua 2015-01-20 18:34:53 +0000
+++ world/immovables/trees/umbrella_red/init.lua 2015-08-13 19:41:41 +0000
@@ -1,10 +1,10 @@
dirname = path.dirname(__file__)
terrain_affinity = {
- preferred_temperature = 311.2830599026309,
- preferred_humidity = 0.31272563185253022,
- preferred_fertility = 0.29388526960556194,
- pickiness = 0.89855557884303605,
+ preferred_temperature = 110,
+ preferred_humidity = 0.25,
+ preferred_fertility = 0.75,
+ pickiness = 0.8,
}
world:new_immovable_type{
=== modified file 'world/terrains/init.lua'
--- world/terrains/init.lua 2015-08-02 19:43:36 +0000
+++ world/terrains/init.lua 2015-08-13 19:41:41 +0000
@@ -65,15 +65,16 @@
-- Terrain affinity constants. This is used to model how well plants grow on this terrain.
-- Temperature are in Kelvin.
- temperature = 300.04278317924405,
+ temperature = 100,
-- Humidity is in percent (1 being very wet).
- humidity = 0.55340250282816961,
+ humidity = 0.6,
-- Fertility is in percent (1 being very fertile).
- fertility = 0.53191138330107279,
+ fertility = 0.7,
}
+
world:new_terrain_type{
name = "wiese2",
descname = _ "Meadow",
@@ -84,12 +85,13 @@
default_resource_amount = 10,
textures = { pics_dir .. "green/wiese2_00.png" },
dither_layer = 350,
- temperature = 295.65369623095955,
- humidity = 0.68188133706990839,
- fertility = 0.42867491634505633,
+ temperature = 100,
+ humidity = 0.6,
+ fertility = 0.65,
}
+
world:new_terrain_type{
name = "wiese3",
descname = _ "Meadow",
@@ -100,11 +102,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "green/wiese3_00.png" },
dither_layer = 350,
- temperature = 294.08241457107198,
- humidity = 0.67113553507660639,
- fertility = 0.41316511937935013,
+ temperature = 105,
+ humidity = 0.55,
+ fertility = 0.8,
}
+
world:new_terrain_type{
name = "wiese4",
descname = _ "Meadow",
@@ -115,11 +118,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "green/wiese4_00.png" },
dither_layer = 350,
- temperature = 288.58389722412585,
- humidity = 0.67472017740529411,
- fertility = 0.41570129413077317,
+ temperature = 110,
+ humidity = 0.65,
+ fertility = 0.75,
}
+
world:new_terrain_type{
name = "steppe",
descname = _ "Steppe",
@@ -130,11 +134,12 @@
default_resource_amount = 5,
textures = { pics_dir .. "green/steppe_00.png" },
dither_layer = 330,
- temperature = 295.73278633026462,
- humidity = 0.89597247873747632,
- fertility = 0.15303469813105364,
+ temperature = 100,
+ humidity = 0.4,
+ fertility = 0.4,
}
+
world:new_terrain_type{
name = "steppe_kahl",
descname = _ "Barren Steppe",
@@ -145,11 +150,12 @@
default_resource_amount = 4,
textures = { pics_dir .. "green/steppe_kahl_00.png" },
dither_layer = 320,
- temperature = 308.05534629938688,
- humidity = 0.47595742923029816,
- fertility = 0.98842836360535302,
+ temperature = 100,
+ humidity = 0.15,
+ fertility = 0.15,
}
+
world:new_terrain_type{
name = "bergwiese",
descname = _ "Mountain Meadow",
@@ -160,11 +166,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "green/bergwiese_00.png" },
dither_layer = 160,
- temperature = 289.05001901926897,
- humidity = 0.51128431681792141,
- fertility = 0.61550531961182953,
+ temperature = 85,
+ humidity = 0.75,
+ fertility = 0.5,
}
+
world:new_terrain_type{
name = "berg1",
descname = _ "Mountain",
@@ -175,11 +182,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "green/berg1_00.png" },
dither_layer = 70,
- temperature = 286.5853971152747,
- humidity = 0.392290548702316,
- fertility = 0.90073346602648985,
+ temperature = 80,
+ humidity = 0.1,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "berg2",
descname = _ "Mountain",
@@ -190,11 +198,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "green/berg2_00.png" },
dither_layer = 70,
- temperature = 286.22963024142905,
- humidity = 0.19387388774216724,
- fertility = 0.67416621022233836,
+ temperature = 80,
+ humidity = 0.1,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "berg3",
descname = _ "Mountain",
@@ -205,11 +214,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "green/berg3_00.png" },
dither_layer = 70,
- temperature = 281.41196619670609,
- humidity = 0.19972412128499525,
- fertility = 0.67259046087670449,
+ temperature = 80,
+ humidity = 0.1,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "berg4",
descname = _ "Mountain",
@@ -220,11 +230,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "green/berg4_00.png" },
dither_layer = 70,
- temperature = 281.41200738401443,
- humidity = 0.19973909047983246,
- fertility = 0.67261898072511717,
+ temperature = 80,
+ humidity = 0.1,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "sumpf",
descname = _ "Swamp",
@@ -236,11 +247,12 @@
textures = path.list_directory(pics_dir .. "green", "sumpf_\\d+.png"),
dither_layer = 370,
fps = 14,
- temperature = 289.89394318611949,
- humidity = 0.47310737388281437,
- fertility = 0.25499952877430737,
+ temperature = 105,
+ humidity = 0.999,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "strand",
descname = _ "Beach",
@@ -251,11 +263,10 @@
default_resource_amount = 0,
textures = { pics_dir .. "green/strand_00.png" },
dither_layer = 60,
- temperature = 295.31687025892853,
- humidity = 0.152564445518208,
- fertility = 0.58492011270054045,
+ temperature = 120,
+ humidity = 0.6,
+ fertility = 0.2,
}
-
world:new_terrain_type{
name = "schnee",
descname = _ "Snow",
@@ -266,11 +277,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "green/schnee_00.png" },
dither_layer = 220,
- temperature = 273.0,
- humidity = 0.99999999999999989,
- fertility = 9.9999999999999998e-17,
+ temperature = 50,
+ humidity = 0.999,
+ fertility = 0.001,
}
+
world:new_terrain_type{
name = "lava",
descname = _ "Lava",
@@ -283,10 +295,11 @@
dither_layer = 30,
fps = 4,
temperature = 1273.0,
- humidity = 9.9999999999999998e-17,
- fertility = 0.98999999999999999,
+ humidity = 0.001,
+ fertility = 0.001,
}
+
world:new_terrain_type{
name = "wasser",
descname = _ "Water",
@@ -298,14 +311,16 @@
textures = path.list_directory(pics_dir .. "green", "wasser_\\d+.png"),
dither_layer = 180,
fps = 14,
- temperature = 293.0,
- humidity = 0.99999999999999989,
- fertility = 0.25,
+ temperature = 100,
+ humidity = 0.999,
+ fertility = 0.001,
}
+
------------------------
-- Former blackland --
------------------------
+
world:new_terrain_type{
name = "ashes",
descname = _ "Ashes",
@@ -316,11 +331,12 @@
default_resource_amount = 5,
textures = { pics_dir .. "wasteland/ashes_00.png" },
dither_layer = 400,
- temperature = 308.50931307699597,
- humidity = 0.31736633817980997,
- fertility = 0.25631387504753977,
+ temperature = 120,
+ humidity = 0.15,
+ fertility = 0.9,
}
+
world:new_terrain_type{
name = "ashes2",
descname = _ "Ashes",
@@ -331,11 +347,12 @@
default_resource_amount = 4,
textures = { pics_dir .. "wasteland/ashes2_00.png" },
dither_layer = 410,
- temperature = 306.24553497496134,
- humidity = 0.31400675041069881,
- fertility = 0.22898571164372822,
+ temperature = 125,
+ humidity = 0.1,
+ fertility = 0.999,
}
+
world:new_terrain_type{
name = "hardground1",
descname = _ "Hard Ground",
@@ -346,11 +363,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "wasteland/hardground1_00.png" },
dither_layer = 420,
- temperature = 309.19891895863259,
- humidity = 0.33690034399837648,
- fertility = 0.33276290074784548,
+ temperature = 100,
+ humidity = 0.25,
+ fertility = 0.8,
}
+
world:new_terrain_type{
name = "hardground2",
descname = _ "Hard Ground",
@@ -361,11 +379,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "wasteland/hardground2_00.png" },
dither_layer = 370,
- temperature = 309.87872943866665,
- humidity = 0.31851348617841185,
- fertility = 0.30859538499363437,
+ temperature = 95,
+ humidity = 0.15,
+ fertility = 0.85,
}
+
world:new_terrain_type{
name = "hardground3",
descname = _ "Hard Ground",
@@ -376,11 +395,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "wasteland/hardground3_00.png" },
dither_layer = 380,
- temperature = 311.4313401428405,
- humidity = 0.31789599269051261,
- fertility = 0.30902388622783256,
+ temperature = 105,
+ humidity = 0.2,
+ fertility = 0.9,
}
+
world:new_terrain_type{
name = "hardground4",
descname = _ "Hard Ground",
@@ -391,11 +411,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "wasteland/hardground4_00.png" },
dither_layer = 390,
- temperature = 312.2828410320538,
- humidity = 0.31525755144085948,
- fertility = 0.31054473740033578,
+ temperature = 90,
+ humidity = 0.2,
+ fertility = 0.8,
}
+
world:new_terrain_type{
name = "hardlava",
descname = _ "Igneous Rocks",
@@ -406,11 +427,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "wasteland/hardlava_00.png" },
dither_layer = 360,
- temperature = 319.00977864170756,
- humidity = 0.35447880224872441,
- fertility = 0.23705760252500771,
+ temperature = 120,
+ humidity = 0.1,
+ fertility = 0.25,
}
+
world:new_terrain_type{
name = "wasteland_mountain1",
descname = _ "Mountain",
@@ -421,11 +443,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "wasteland/mountain1_00.png" },
dither_layer = 90,
- temperature = 305.47980607787952,
- humidity = 0.43741264859131379,
- fertility = 0.4942960101430538,
+ temperature = 80,
+ humidity = 0.05,
+ fertility = 0.2,
}
+
world:new_terrain_type{
name = "wasteland_mountain2",
descname = _ "Mountain",
@@ -436,11 +459,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "wasteland/mountain2_00.png" },
dither_layer = 90,
- temperature = 308.11414726442104,
- humidity = 0.43590895148164582,
- fertility = 0.50211854383693189,
+ temperature = 80,
+ humidity = 0.05,
+ fertility = 0.2,
}
+
world:new_terrain_type{
name = "wasteland_mountain3",
descname = _ "Mountain",
@@ -451,11 +475,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "wasteland/mountain3_00.png" },
dither_layer = 90,
- temperature = 309.2313908535491,
- humidity = 0.43430953848524012,
- fertility = 0.50532910869111358,
+ temperature = 80,
+ humidity = 0.05,
+ fertility = 0.2,
}
+
world:new_terrain_type{
name = "wasteland_mountain4",
descname = _ "Mountain",
@@ -466,11 +491,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "wasteland/mountain4_00.png" },
dither_layer = 80,
- temperature = 309.23137655560333,
- humidity = 0.43430890944898498,
- fertility = 0.50532858192033259,
+ temperature = 80,
+ humidity = 0.05,
+ fertility = 0.2,
}
+
world:new_terrain_type{
name = "wasteland_beach",
descname = _ "Beach",
@@ -481,11 +507,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "wasteland/strand_00.png" },
dither_layer = 50,
- temperature = 302.78152301395431,
- humidity = 0.25378089694315337,
- fertility = 0.41946731913025403,
+ temperature = 60,
+ humidity = 0.4,
+ fertility = 0.2,
}
+
world:new_terrain_type{
name = "lava-stone1",
descname = _ "Lava Rocks",
@@ -498,10 +525,11 @@
dither_layer = 20,
fps = 7,
temperature = 1273.0,
- humidity = 9.9999999999999998e-17,
- fertility = 0.98999999999999999,
+ humidity = 0.001,
+ fertility = 0.001,
}
+
world:new_terrain_type{
name = "lava-stone2",
descname = _ "Lava Rocks",
@@ -514,10 +542,11 @@
dither_layer = 10,
fps = 7,
temperature = 1273.0,
- humidity = 9.9999999999999998e-17,
- fertility = 0.98999999999999999,
+ humidity = 0.001,
+ fertility = 0.001,
}
+
world:new_terrain_type{
name = "wasteland_water",
descname = _ "Water",
@@ -529,15 +558,17 @@
textures = path.list_directory(pics_dir .. "wasteland", "water_\\d+.png"),
dither_layer = 170,
fps = 14,
- temperature = 313.0,
- humidity = 0.99999999999999989,
- fertility = 0.80000000000000004,
+ temperature = 100,
+ humidity = 0.999,
+ fertility = 0.001,
}
+
-------------------------
-- Former Winterland --
-------------------------
+
world:new_terrain_type{
name = "tundra",
descname = _ "Tundra",
@@ -548,11 +579,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "winter/tundra_00.png" },
dither_layer = 230,
- temperature = 285.15816824963719,
- humidity = 0.77781437710174905,
- fertility = 0.46117587943158045,
+ temperature = 45,
+ humidity = 0.85,
+ fertility = 0.5,
}
+
world:new_terrain_type{
name = "tundra2",
descname = _ "Tundra",
@@ -563,11 +595,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "winter/tundra2_00.png" },
dither_layer = 240,
- temperature = 299.65831265959122,
- humidity = 0.71243181397420374,
- fertility = 0.38729356301371143,
+ temperature = 55,
+ humidity = 0.75,
+ fertility = 0.45,
}
+
world:new_terrain_type{
name = "tundra3",
descname = _ "Tundra",
@@ -578,11 +611,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "winter/tundra3_00.png" },
dither_layer = 240,
- temperature = 291.97891709336449,
- humidity = 0.71392329660321152,
- fertility = 0.39949724244349072,
+ temperature = 50,
+ humidity = 0.8,
+ fertility = 0.4,
}
+
world:new_terrain_type{
name = "tundra_taiga",
descname = _ "Tundra Taiga",
@@ -593,11 +627,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "winter/tundra_taiga_00.png" },
dither_layer = 230,
- temperature = 290.59652759132916,
- humidity = 0.52019070699260228,
- fertility = 0.25232407403911222,
+ temperature = 40,
+ humidity = 0.75,
+ fertility = 0.4,
}
+
world:new_terrain_type{
name = "taiga",
descname = _ "Taiga",
@@ -608,11 +643,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "winter/taiga_00.png" },
dither_layer = 250,
- temperature = 285.35526221552516,
- humidity = 0.48486236876174976,
- fertility = 0.16382912093990756,
+ temperature = 35,
+ humidity = 0.75,
+ fertility = 0.3,
}
+
world:new_terrain_type{
name = "snow",
descname = _ "Snow",
@@ -623,11 +659,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "winter/snow_00.png" },
dither_layer = 250,
- temperature = 255.71533125102573,
- humidity = 0.67569418221390831,
- fertility = 0.4755944578602016,
+ temperature = 25,
+ humidity = 0.8,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "winter_mountain1",
descname = _ "Mountain",
@@ -638,11 +675,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "winter/mountain1_00.png" },
dither_layer = 110,
- temperature = 234.3236440452477,
- humidity = 0.353894295696628,
- fertility = 0.64095166379264268,
+ temperature = 20,
+ humidity = 0.3,
+ fertility = 0.05,
}
+
world:new_terrain_type{
name = "winter_mountain2",
descname = _ "Mountain",
@@ -653,11 +691,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "winter/mountain2_00.png" },
dither_layer = 110,
- temperature = 234.32036692949509,
- humidity = 0.35388395206559686,
- fertility = 0.64097548376370639,
+ temperature = 20,
+ humidity = 0.3,
+ fertility = 0.05,
}
+
world:new_terrain_type{
name = "winter_mountain3",
descname = _ "Mountain",
@@ -668,11 +707,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "winter/mountain3_00.png" },
dither_layer = 100,
- temperature = 234.32370923956316,
- humidity = 0.35386704652440848,
- fertility = 0.64096302130057681,
+ temperature = 20,
+ humidity = 0.3,
+ fertility = 0.05,
}
+
world:new_terrain_type{
name = "winter_mountain4",
descname = _ "Mountain",
@@ -683,11 +723,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "winter/mountain4_00.png" },
dither_layer = 100,
- temperature = 234.32284033138464,
- humidity = 0.35387628237099111,
- fertility = 0.64096295347399923,
+ temperature = 20,
+ humidity = 0.3,
+ fertility = 0.05,
}
+
world:new_terrain_type{
name = "ice",
descname = _ "Ice",
@@ -698,11 +739,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "winter/ice_00.png" },
dither_layer = 260,
- temperature = 241.18389899353673,
- humidity = 0.41922543451566474,
- fertility = 0.41963058218715021,
+ temperature = 25,
+ humidity = 0.5,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "winter_beach",
descname = _ "Beach",
@@ -713,11 +755,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "winter/strand_00.png" },
dither_layer = 40,
- temperature = 243.04482604455663,
- humidity = 0.52048324144504288,
- fertility = 0.35517827723739792,
+ temperature = 60,
+ humidity = 0.5,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "ice_floes",
descname = _ "Ice Floes",
@@ -729,11 +772,12 @@
textures = path.list_directory(pics_dir .. "winter", "ice_flows_\\d+.png"),
dither_layer = 210,
fps = 5,
- temperature = 265.80526108661786,
- humidity = 0.13459817136515448,
- fertility = 0.29392443481224101,
+ temperature = 50,
+ humidity = 0.999,
+ fertility = 0.001,
}
+
world:new_terrain_type{
name = "ice_floes2",
descname = _ "Ice Floes",
@@ -745,11 +789,12 @@
textures = path.list_directory(pics_dir .. "winter", "ice_flows2_\\d+.png"),
dither_layer = 210,
fps = 5,
- temperature = 265.80528666077464,
- humidity = 0.13462161525263067,
- fertility = 0.29399226894281316,
+ temperature = 50,
+ humidity = 0.999,
+ fertility = 0.001,
}
+
world:new_terrain_type{
name = "winter_water",
descname = _ "Water",
@@ -761,15 +806,17 @@
textures = path.list_directory(pics_dir .. "winter", "water_\\d+.png"),
dither_layer = 190,
fps = 8,
- temperature = 273.0,
- humidity = 0.99999999999999989,
- fertility = 0.40000000000000002,
+ temperature = 50,
+ humidity = 0.999,
+ fertility = 0.001,
}
+
---------------------
-- Former Desert --
---------------------
+
world:new_terrain_type{
name = "desert4",
descname = _ "Desert",
@@ -780,11 +827,12 @@
default_resource_amount = 2,
textures = { pics_dir .. "desert/desert4_00.png" },
dither_layer = 270,
- temperature = 318.95927963394809,
- humidity = 0.19850680766512677,
- fertility = 0.26285391621490406,
+ temperature = 168,
+ humidity = 0.001,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "drysoil",
descname = _ "Dry Soil",
@@ -795,11 +843,10 @@
default_resource_amount = 4,
textures = { pics_dir .. "desert/drysoil_00.png" },
dither_layer = 300,
- temperature = 322.57200571542654,
- humidity = 0.33221932657651621,
- fertility = 0.24996290818869515,
+ temperature = 172,
+ humidity = 0.2,
+ fertility = 0.2,
}
-
world:new_terrain_type{
name = "desert_steppe",
descname = _ "Steppe",
@@ -810,11 +857,12 @@
default_resource_amount = 5,
textures = { pics_dir .. "desert/steppe_00.png" },
dither_layer = 360,
- temperature = 307.66693414903386,
- humidity = 0.50785131521278204,
- fertility = 0.40543024435718211,
+ temperature = 155,
+ humidity = 0.5,
+ fertility = 0.5,
}
+
world:new_terrain_type{
name = "meadow",
descname = _ "Meadow",
@@ -825,11 +873,12 @@
default_resource_amount = 10,
textures = { pics_dir .. "desert/meadow_00.png" },
dither_layer = 310,
- temperature = 305.07841308001815,
- humidity = 0.66409487876828999,
- fertility = 0.28982229496468942,
+ temperature = 160,
+ humidity = 0.6,
+ fertility = 0.6,
}
+
world:new_terrain_type{
name = "mountainmeadow",
descname = _ "Mountain Meadow",
@@ -840,11 +889,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/mountainmeadow_00.png" },
dither_layer = 150,
- temperature = 289.36932830392055,
- humidity = 0.85111697807847664,
- fertility = 0.39411986912974672,
+ temperature = 145,
+ humidity = 0.5,
+ fertility = 0.5,
}
+
world:new_terrain_type{
name = "highmountainmeadow",
descname = _ "High Mountain Meadow",
@@ -855,11 +905,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/highmountainmeadow_00.png" },
dither_layer = 150,
- temperature = 295.28805163693715,
- humidity = 0.96636799120338213,
- fertility = 0.58747114224515407,
+ temperature = 140,
+ humidity = 0.4,
+ fertility = 0.4,
}
+
world:new_terrain_type{
name = "mountain1",
descname = _ "Mountain",
@@ -870,11 +921,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/mountain1_00.png" },
dither_layer = 120,
- temperature = 303.43073881374357,
- humidity = 0.3691356727889481,
- fertility = 0.9955591737548094,
+ temperature = 130,
+ humidity = 0.05,
+ fertility = 0.05,
}
+
world:new_terrain_type{
name = "mountain2",
descname = _ "Mountain",
@@ -885,11 +937,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/mountain2_00.png" },
dither_layer = 120,
- temperature = 303.42972829646413,
- humidity = 0.36724469817275668,
- fertility = 0.99483988816595148,
+ temperature = 130,
+ humidity = 0.05,
+ fertility = 0.05,
}
+
world:new_terrain_type{
name = "mountain3",
descname = _ "Mountain",
@@ -900,11 +953,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/mountain3_00.png" },
dither_layer = 130,
- temperature = 303.42994321508786,
- humidity = 0.36911137784238873,
- fertility = 0.99554973691737925,
+ temperature = 130,
+ humidity = 0.05,
+ fertility = 0.05,
}
+
world:new_terrain_type{
name = "mountain4",
descname = _ "Mountain",
@@ -915,11 +969,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/mountain4_00.png" },
dither_layer = 140,
- temperature = 303.42934087733249,
- humidity = 0.36877037568728566,
- fertility = 0.99539803013386874,
+ temperature = 130,
+ humidity = 0.05,
+ fertility = 0.05,
}
+
world:new_terrain_type{
name = "desert1",
descname = _ "Desert",
@@ -930,11 +985,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/desert1_00.png" },
dither_layer = 290,
- temperature = 317.94592510628115,
- humidity = 0.026741512333483181,
- fertility = 0.40660860612661509,
+ temperature = 167,
+ humidity = 0.001,
+ fertility = 0.001,
}
+
world:new_terrain_type{
name = "desert2",
descname = _ "Desert",
@@ -945,11 +1001,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/desert2_00.png" },
dither_layer = 280,
- temperature = 318.08427760835616,
- humidity = 0.014328787840514678,
- fertility = 0.22973365655463399,
+ temperature = 168,
+ humidity = 0.001,
+ fertility = 0.001,
}
+
world:new_terrain_type{
name = "desert3",
descname = _ "Desert",
@@ -960,11 +1017,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/desert3_00.png" },
dither_layer = 280,
- temperature = 328.1229356910701,
- humidity = 0.073760305337428986,
- fertility = 0.028419096361354063,
+ temperature = 178,
+ humidity = 0.001,
+ fertility = 0.001,
}
+
world:new_terrain_type{
name = "desert_beach",
descname = _ "Beach",
@@ -975,11 +1033,12 @@
default_resource_amount = 0,
textures = { pics_dir .. "desert/beach_00.png" },
dither_layer = 60,
- temperature = 329.25806053618618,
- humidity = 0.45713638428482906,
- fertility = 0.067762679294860309,
+ temperature = 179,
+ humidity = 0.5,
+ fertility = 0.1,
}
+
world:new_terrain_type{
name = "desert_water",
descname = _ "Water",
@@ -991,7 +1050,7 @@
textures = path.list_directory(pics_dir .. "desert", "wasser_\\d+.png"),
dither_layer = 200,
fps = 5,
- temperature = 308.0,
- humidity = 0.99999999999999989,
- fertility = 0.98999999999999999,
+ temperature = 150,
+ humidity = 0.999,
+ fertility = 0.001,
}
References
