widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

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 +0000
+++ world/terrains/init.lua	2015-08-02 20:15:25 +0000
@@ -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,
    temperature = 273.0,
    humidity = 0.99999999999999989,
    fertility = 9.9999999999999998e-17,
@@ -280,7 +280,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = path.list_directory(pics_dir .. "green", "lava_\\d+.png"),
-   dither_layer = 0,
+   dither_layer = 30,
    fps = 4,
    temperature = 1273.0,
    humidity = 9.9999999999999998e-17,
@@ -296,7 +296,7 @@
    default_resource = "fish",
    default_resource_amount = 4,
    textures = path.list_directory(pics_dir .. "green", "wasser_\\d+.png"),
-   dither_layer = 230,
+   dither_layer = 180,
    fps = 14,
    temperature = 293.0,
    humidity = 0.99999999999999989,
@@ -315,7 +315,7 @@
    default_resource = "water",
    default_resource_amount = 5,
    textures = { pics_dir .. "wasteland/ashes_00.png" },
-   dither_layer = 30,
+   dither_layer = 400,
    temperature = 308.50931307699597,
    humidity = 0.31736633817980997,
    fertility = 0.25631387504753977,
@@ -330,7 +330,7 @@
    default_resource = "water",
    default_resource_amount = 4,
    textures = { pics_dir .. "wasteland/ashes2_00.png" },
-   dither_layer = 30,
+   dither_layer = 410,
    temperature = 306.24553497496134,
    humidity = 0.31400675041069881,
    fertility = 0.22898571164372822,
@@ -345,7 +345,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "wasteland/hardground1_00.png" },
-   dither_layer = 30,
+   dither_layer = 420,
    temperature = 309.19891895863259,
    humidity = 0.33690034399837648,
    fertility = 0.33276290074784548,
@@ -360,7 +360,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "wasteland/hardground2_00.png" },
-   dither_layer = 40,
+   dither_layer = 370,
    temperature = 309.87872943866665,
    humidity = 0.31851348617841185,
    fertility = 0.30859538499363437,
@@ -375,7 +375,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "wasteland/hardground3_00.png" },
-   dither_layer = 40,
+   dither_layer = 380,
    temperature = 311.4313401428405,
    humidity = 0.31789599269051261,
    fertility = 0.30902388622783256,
@@ -390,7 +390,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "wasteland/hardground4_00.png" },
-   dither_layer = 40,
+   dither_layer = 390,
    temperature = 312.2828410320538,
    humidity = 0.31525755144085948,
    fertility = 0.31054473740033578,
@@ -405,7 +405,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "wasteland/hardlava_00.png" },
-   dither_layer = 50,
+   dither_layer = 360,
    temperature = 319.00977864170756,
    humidity = 0.35447880224872441,
    fertility = 0.23705760252500771,
@@ -465,7 +465,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "wasteland/mountain4_00.png" },
-   dither_layer = 100,
+   dither_layer = 80,
    temperature = 309.23137655560333,
    humidity = 0.43430890944898498,
    fertility = 0.50532858192033259,
@@ -480,7 +480,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "wasteland/strand_00.png" },
-   dither_layer = 190,
+   dither_layer = 50,
    temperature = 302.78152301395431,
    humidity = 0.25378089694315337,
    fertility = 0.41946731913025403,
@@ -495,7 +495,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = path.list_directory(pics_dir .. "wasteland", "lava-stone1_\\d+.png"),
-   dither_layer = 10,
+   dither_layer = 20,
    fps = 7,
    temperature = 1273.0,
    humidity = 9.9999999999999998e-17,
@@ -511,7 +511,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = path.list_directory(pics_dir .. "wasteland", "lava-stone2_\\d+.png"),
-   dither_layer = 20,
+   dither_layer = 10,
    fps = 7,
    temperature = 1273.0,
    humidity = 9.9999999999999998e-17,
@@ -527,7 +527,7 @@
    default_resource = "fish",
    default_resource_amount = 4,
    textures = path.list_directory(pics_dir .. "wasteland", "water_\\d+.png"),
-   dither_layer = 240,
+   dither_layer = 170,
    fps = 14,
    temperature = 313.0,
    humidity = 0.99999999999999989,
@@ -547,7 +547,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "winter/tundra_00.png" },
-   dither_layer = 300,
+   dither_layer = 230,
    temperature = 285.15816824963719,
    humidity = 0.77781437710174905,
    fertility = 0.46117587943158045,
@@ -562,7 +562,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "winter/tundra2_00.png" },
-   dither_layer = 290,
+   dither_layer = 240,
    temperature = 299.65831265959122,
    humidity = 0.71243181397420374,
    fertility = 0.38729356301371143,
@@ -577,7 +577,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "winter/tundra3_00.png" },
-   dither_layer = 290,
+   dither_layer = 240,
    temperature = 291.97891709336449,
    humidity = 0.71392329660321152,
    fertility = 0.39949724244349072,
@@ -592,7 +592,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "winter/tundra_taiga_00.png" },
-   dither_layer = 300,
+   dither_layer = 230,
    temperature = 290.59652759132916,
    humidity = 0.52019070699260228,
    fertility = 0.25232407403911222,
@@ -607,7 +607,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "winter/taiga_00.png" },
-   dither_layer = 280,
+   dither_layer = 250,
    temperature = 285.35526221552516,
    humidity = 0.48486236876174976,
    fertility = 0.16382912093990756,
@@ -622,7 +622,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "winter/snow_00.png" },
-   dither_layer = 280,
+   dither_layer = 250,
    temperature = 255.71533125102573,
    humidity = 0.67569418221390831,
    fertility = 0.4755944578602016,
@@ -637,7 +637,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "winter/mountain1_00.png" },
-   dither_layer = 70,
+   dither_layer = 110,
    temperature = 234.3236440452477,
    humidity = 0.353894295696628,
    fertility = 0.64095166379264268,
@@ -652,7 +652,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "winter/mountain2_00.png" },
-   dither_layer = 70,
+   dither_layer = 110,
    temperature = 234.32036692949509,
    humidity = 0.35388395206559686,
    fertility = 0.64097548376370639,
@@ -667,7 +667,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "winter/mountain3_00.png" },
-   dither_layer = 80,
+   dither_layer = 100,
    temperature = 234.32370923956316,
    humidity = 0.35386704652440848,
    fertility = 0.64096302130057681,
@@ -682,7 +682,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "winter/mountain4_00.png" },
-   dither_layer = 80,
+   dither_layer = 100,
    temperature = 234.32284033138464,
    humidity = 0.35387628237099111,
    fertility = 0.64096295347399923,
@@ -697,7 +697,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "winter/ice_00.png" },
-   dither_layer = 270,
+   dither_layer = 260,
    temperature = 241.18389899353673,
    humidity = 0.41922543451566474,
    fertility = 0.41963058218715021,
@@ -712,7 +712,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "winter/strand_00.png" },
-   dither_layer = 200,
+   dither_layer = 40,
    temperature = 243.04482604455663,
    humidity = 0.52048324144504288,
    fertility = 0.35517827723739792,
@@ -727,7 +727,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = path.list_directory(pics_dir .. "winter", "ice_flows_\\d+.png"),
-   dither_layer = 260,
+   dither_layer = 210,
    fps = 5,
    temperature = 265.80526108661786,
    humidity = 0.13459817136515448,
@@ -743,7 +743,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = path.list_directory(pics_dir .. "winter", "ice_flows2_\\d+.png"),
-   dither_layer = 250,
+   dither_layer = 210,
    fps = 5,
    temperature = 265.80528666077464,
    humidity = 0.13462161525263067,
@@ -759,7 +759,7 @@
    default_resource = "fish",
    default_resource_amount = 4,
    textures = path.list_directory(pics_dir .. "winter", "water_\\d+.png"),
-   dither_layer = 220,
+   dither_layer = 190,
    fps = 8,
    temperature = 273.0,
    humidity = 0.99999999999999989,
@@ -779,7 +779,7 @@
    default_resource = "water",
    default_resource_amount = 2,
    textures = { pics_dir .. "desert/desert4_00.png" },
-   dither_layer = 170,
+   dither_layer = 270,
    temperature = 318.95927963394809,
    humidity = 0.19850680766512677,
    fertility = 0.26285391621490406,
@@ -794,7 +794,7 @@
    default_resource = "water",
    default_resource_amount = 4,
    textures = { pics_dir .. "desert/drysoil_00.png" },
-   dither_layer = 150,
+   dither_layer = 300,
    temperature = 322.57200571542654,
    humidity = 0.33221932657651621,
    fertility = 0.24996290818869515,
@@ -809,7 +809,7 @@
    default_resource = "water",
    default_resource_amount = 5,
    textures = { pics_dir .. "desert/steppe_00.png" },
-   dither_layer = 10,
+   dither_layer = 360,
    temperature = 307.66693414903386,
    humidity = 0.50785131521278204,
    fertility = 0.40543024435718211,
@@ -824,7 +824,7 @@
    default_resource = "water",
    default_resource_amount = 10,
    textures = { pics_dir .. "desert/meadow_00.png" },
-   dither_layer = 150,
+   dither_layer = 310,
    temperature = 305.07841308001815,
    humidity = 0.66409487876828999,
    fertility = 0.28982229496468942,
@@ -839,7 +839,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/mountainmeadow_00.png" },
-   dither_layer = 120,
+   dither_layer = 150,
    temperature = 289.36932830392055,
    humidity = 0.85111697807847664,
    fertility = 0.39411986912974672,
@@ -854,7 +854,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/highmountainmeadow_00.png" },
-   dither_layer = 120,
+   dither_layer = 150,
    temperature = 295.28805163693715,
    humidity = 0.96636799120338213,
    fertility = 0.58747114224515407,
@@ -869,7 +869,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/mountain1_00.png" },
-   dither_layer = 60,
+   dither_layer = 120,
    temperature = 303.43073881374357,
    humidity = 0.3691356727889481,
    fertility = 0.9955591737548094,
@@ -884,7 +884,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/mountain2_00.png" },
-   dither_layer = 60,
+   dither_layer = 120,
    temperature = 303.42972829646413,
    humidity = 0.36724469817275668,
    fertility = 0.99483988816595148,
@@ -899,7 +899,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/mountain3_00.png" },
-   dither_layer = 60,
+   dither_layer = 130,
    temperature = 303.42994321508786,
    humidity = 0.36911137784238873,
    fertility = 0.99554973691737925,
@@ -914,7 +914,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/mountain4_00.png" },
-   dither_layer = 60,
+   dither_layer = 140,
    temperature = 303.42934087733249,
    humidity = 0.36877037568728566,
    fertility = 0.99539803013386874,
@@ -929,7 +929,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/desert1_00.png" },
-   dither_layer = 150,
+   dither_layer = 290,
    temperature = 317.94592510628115,
    humidity = 0.026741512333483181,
    fertility = 0.40660860612661509,
@@ -944,7 +944,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/desert2_00.png" },
-   dither_layer = 160,
+   dither_layer = 280,
    temperature = 318.08427760835616,
    humidity = 0.014328787840514678,
    fertility = 0.22973365655463399,
@@ -959,7 +959,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/desert3_00.png" },
-   dither_layer = 160,
+   dither_layer = 280,
    temperature = 328.1229356910701,
    humidity = 0.073760305337428986,
    fertility = 0.028419096361354063,
@@ -974,7 +974,7 @@
    default_resource = "",
    default_resource_amount = 0,
    textures = { pics_dir .. "desert/beach_00.png" },
-   dither_layer = 150,
+   dither_layer = 60,
    temperature = 329.25806053618618,
    humidity = 0.45713638428482906,
    fertility = 0.067762679294860309,
@@ -989,7 +989,7 @@
    default_resource = "fish",
    default_resource_amount = 4,
    textures = path.list_directory(pics_dir .. "desert", "wasser_\\d+.png"),
-   dither_layer = 210,
+   dither_layer = 200,
    fps = 5,
    temperature = 308.0,
    humidity = 0.99999999999999989,