kaputtnik has proposed merging lp:~franku/widelands/better_dither_values into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~franku/widelands/better_dither_values/+merge/266673
This branch contains edited "dither layer" values for terrains and fixed some
problems with Wasteland terrains.
I've changed also the priority of water and land terrain, because with the old
values, it sometimes looks like a tree is planted into water. I believe with my
adjustments it will now look better.
See http://home.arcor.de/frank.ue/archipelago.jpg for a comparison.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~franku/widelands/better_dither_values into lp:widelands.
=== modified file 'world/terrains/init.lua'
--- world/terrains/init.lua 2015-02-24 13:51:38 +
+++ world/terrains/init.lua 2015-08-02 20:15:25 +
@@ -61,7 +61,7 @@
-- This describes the z layer of the terrain when rendered next to another
-- one and blending slightly over it to hide the triangles.
- dither_layer = 120,
+ dither_layer = 340,
-- Terrain affinity constants. This is used to model how well plants grow on this terrain.
-- Temperature are in Kelvin.
@@ -83,7 +83,7 @@
default_resource = "water",
default_resource_amount = 10,
textures = { pics_dir .. "green/wiese2_00.png" },
- dither_layer = 12,
+ dither_layer = 350,
temperature = 295.65369623095955,
humidity = 0.68188133706990839,
fertility = 0.42867491634505633,
@@ -99,7 +99,7 @@
default_resource = "water",
default_resource_amount = 10,
textures = { pics_dir .. "green/wiese3_00.png" },
- dither_layer = 12,
+ dither_layer = 350,
temperature = 294.08241457107198,
humidity = 0.67113553507660639,
fertility = 0.41316511937935013,
@@ -114,7 +114,7 @@
default_resource = "water",
default_resource_amount = 10,
textures = { pics_dir .. "green/wiese4_00.png" },
- dither_layer = 12,
+ dither_layer = 350,
temperature = 288.58389722412585,
humidity = 0.67472017740529411,
fertility = 0.41570129413077317,
@@ -129,7 +129,7 @@
default_resource = "water",
default_resource_amount = 5,
textures = { pics_dir .. "green/steppe_00.png" },
- dither_layer = 130,
+ dither_layer = 330,
temperature = 295.73278633026462,
humidity = 0.89597247873747632,
fertility = 0.15303469813105364,
@@ -144,7 +144,7 @@
default_resource = "water",
default_resource_amount = 4,
textures = { pics_dir .. "green/steppe_kahl_00.png" },
- dither_layer = 140,
+ dither_layer = 320,
temperature = 308.05534629938688,
humidity = 0.47595742923029816,
fertility = 0.98842836360535302,
@@ -159,7 +159,7 @@
default_resource = "",
default_resource_amount = 0,
textures = { pics_dir .. "green/bergwiese_00.png" },
- dither_layer = 120,
+ dither_layer = 160,
temperature = 289.05001901926897,
humidity = 0.51128431681792141,
fertility = 0.61550531961182953,
@@ -174,7 +174,7 @@
default_resource = "",
default_resource_amount = 0,
textures = { pics_dir .. "green/berg1_00.png" },
- dither_layer = 110,
+ dither_layer = 70,
temperature = 286.5853971152747,
humidity = 0.392290548702316,
fertility = 0.90073346602648985,
@@ -189,7 +189,7 @@
default_resource = "",
default_resource_amount = 0,
textures = { pics_dir .. "green/berg2_00.png" },
- dither_layer = 110,
+ dither_layer = 70,
temperature = 286.22963024142905,
humidity = 0.19387388774216724,
fertility = 0.67416621022233836,
@@ -204,7 +204,7 @@
default_resource = "",
default_resource_amount = 0,
textures = { pics_dir .. "green/berg3_00.png" },
- dither_layer = 110,
+ dither_layer = 70,
temperature = 281.41196619670609,
humidity = 0.19972412128499525,
fertility = 0.67259046087670449,
@@ -219,7 +219,7 @@
default_resource = "",
default_resource_amount = 0,
textures = { pics_dir .. "green/berg4_00.png" },
- dither_layer = 110,
+ dither_layer = 70,
temperature = 281.41200738401443,
humidity = 0.19973909047983246,
fertility = 0.67261898072511717,
@@ -234,7 +234,7 @@
default_resource = "water",
default_resource_amount = 20,
textures = path.list_directory(pics_dir .. "green", "sumpf_\\d+.png"),
- dither_layer = 70,
+ dither_layer = 370,
fps = 14,
temperature = 289.89394318611949,
humidity = 0.47310737388281437,
@@ -250,7 +250,7 @@
default_resource = "",
default_resource_amount = 0,
textures = { pics_dir .. "green/strand_00.png" },
- dither_layer = 150,
+ dither_layer = 60,
temperature = 295.31687025892853,
humidity = 0.152564445518208,
fertility = 0.58492011270054045,
@@ -265,7 +265,7 @@
default_resource = "",
default_resource_amount = 0,
textures = { pics_dir .. "green/schnee_00.png" },
- dither_layer = 310,
+ dither_layer = 220,
tempe