widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/balancing_tribes into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/balancing_tribes/+merge/286346

This is not ready yet, just putting it here so that we will get Travis/AppVeyor builds.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/balancing_tribes into lp:widelands.

=== modified file 'data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua'
--- data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua	2016-01-25 15:58:01 +0000
+++ data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua	2016-02-17 15:45:55 +0000
@@ -15,7 +15,7 @@
       planks = 5,
       spidercloth = 5,
       diamond = 2,
-      quartz = 2
+      gold = 2
    },
    return_on_dismantle = {
       log = 1,
@@ -23,7 +23,7 @@
       planks = 2,
       spidercloth = 2,
       diamond = 1,
-      quartz = 1
+      gold = 1
    },
 
    animations = {

=== modified file 'data/tribes/workers/barbarians/soldier/init.lua'
--- data/tribes/workers/barbarians/soldier/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/soldier/init.lua	2016-02-17 15:45:55 +0000
@@ -88,7 +88,7 @@
       minimum = 1200,
       maximum = 1600
    },
-   attack_incr_per_level = 700,
+   attack_incr_per_level = 800,
    defense = 3,
    defense_incr_per_level = 4,
    evade = 25,