Merge lp:~widelands-dev/widelands/bug-1290073 into lp:widelands

[GunChleoc]

- Removed all programs with the tag (only for compatibility with old savegames (build13)) from all conf files
- Changed "Ferner" to "Gardener" where it was overlooked
- Fixed an inconsistency in the help files

=== modified file 'tribes/atlanteans/armoursmithy/conf'
--- tribes/atlanteans/armoursmithy/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/armoursmithy/conf	2014-03-10 11:30:46 +0000
@@ -26,9 +26,7 @@
 
 [programs]
 produce_steel_shield=_Produce steel shield
-produce_s_shield=_Produce steel shield (only for compatibility with old savegames (build13))
 produce_advanced_shield=_Produce advanced shield
-produce_a_shield=_Produce advanced shield (only for compatibility with old savegames (build13))
 work=_Work
 
 [produce_steel_shield]
@@ -38,13 +36,6 @@
 animate=working 35000
 produce=steel_shield
 
-[produce_s_shield]
-return=skipped unless economy needs steel_shield
-sleep=32000
-consume=iron:2 coal:2
-animate=working 35000
-produce=steel_shield
-
 [produce_advanced_shield]
 return=skipped unless economy needs advanced_shield
 sleep=32000
@@ -52,13 +43,6 @@
 animate=working 45000
 produce=advanced_shield
 
-[produce_a_shield]
-return=skipped unless economy needs advanced_shield
-sleep=32000
-consume=iron:2 coal:2 gold
-animate=working 45000
-produce=advanced_shield
-
 [work]
 call=produce_steel_shield
 call=produce_advanced_shield

=== modified file 'tribes/atlanteans/blackroot_farm/conf'
--- tribes/atlanteans/blackroot_farm/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/blackroot_farm/conf	2014-03-10 11:30:46 +0000
@@ -20,27 +20,17 @@
 
 [programs]
 plant_blackroot=_Plant blackroot
-plant=Plant blackroot (only for compatibility with old savegames (build13))
 harvest_blackroot=_Harvest blackroot
-harvest=Harvest blackroot (only for compatibility with old savegames (build13))
 work=_Work
 
 [plant_blackroot]
 sleep=20000
 worker=plant
 
-[plant]
-sleep=20000
-worker=plant
-
 [harvest_blackroot]
 sleep=5000
 worker=harvest
 
-[harvest]
-sleep=5000
-worker=harvest
-
 [work]
 call=plant_blackroot
 call=harvest_blackroot

=== modified file 'tribes/atlanteans/dungeon/conf'
--- tribes/atlanteans/dungeon/conf	2013-08-14 19:52:55 +0000
+++ tribes/atlanteans/dungeon/conf	2014-03-10 11:30:46 +0000
@@ -37,14 +37,10 @@
 
 [programs]
 sleep=_Sleep
-upgrade_soldier_attack_0=_Upgrade soldier attack 0
-upgrade_attack_0=_Upgrade soldier attack 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_1=_Upgrade soldier attack 1
-upgrade_attack_1=_Upgrade soldier attack 1 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_2=_Upgrade soldier attack 2
-upgrade_attack_2=_Upgrade soldier attack 2 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_3=_Upgrade soldier attack 3
-upgrade_attack_3=_Upgrade soldier attack 3 (only for compatibility with old savegames (build13))
+upgrade_soldier_attack_0=_Upgrade soldier attack from level 0 to level 1
+upgrade_soldier_attack_1=_Upgrade soldier attack from level 1 to level 2
+upgrade_soldier_attack_2=_Upgrade soldier attack from level 2 to level 3
+upgrade_soldier_attack_3=_Upgrade soldier attack from level 3 to level 4
 
 [sleep]
 sleep=5000
@@ -57,13 +53,6 @@
 consume=bread smoked_fish,smoked_meat long_trident
 train=soldier attack 0 1
 
-[upgrade_attack_0]
-check_soldier=soldier attack 0
-sleep=30000
-check_soldier=soldier attack 0
-consume=bread smoked_fish,smoked_meat long_trident
-train=soldier attack 0 1
-
 [upgrade_soldier_attack_1]
 check_soldier=soldier attack 1
 sleep=30000
@@ -71,13 +60,6 @@
 consume=bread smoked_fish,smoked_meat steel_trident
 train=soldier attack 1 2
 
-[upgrade_attack_1]
-check_soldier=soldier attack 1
-sleep=30000
-check_soldier=soldier attack 1
-consume=bread smoked_fish,smoked_meat steel_trident
-train=soldier attack 1 2
-
 [upgrade_soldier_attack_2]
 check_soldier=soldier attack 2
 sleep=30000
@@ -85,13 +67,6 @@
 consume=bread smoked_fish,smoked_meat double_trident
 train=soldier attack 2 3
 
-[upgrade_attack_2]
-check_soldier=soldier attack 2
-sleep=30000
-check_soldier=soldier attack 2
-consume=bread smoked_fish,smoked_meat double_trident
-train=soldier attack 2 3
-
 [upgrade_soldier_attack_3]
 check_soldier=soldier attack 3
 sleep=30000
@@ -99,13 +74,6 @@
 consume=bread smoked_fish,smoked_meat heavy_double_trident
 train=soldier attack 3 4
 
-[upgrade_attack_3]
-check_soldier=soldier attack 3
-sleep=30000
-check_soldier=soldier attack 3
-consume=bread smoked_fish,smoked_meat heavy_double_trident
-train=soldier attack 3 4
-
 [idle]
 pics=dungeon_i_??.png  # ???
 hotspot=47 48

=== modified file 'tribes/atlanteans/farm/conf'
--- tribes/atlanteans/farm/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/farm/conf	2014-03-10 11:30:46 +0000
@@ -22,27 +22,17 @@
 
 [programs]
 plant_corn=_Plant corn
-plant=Plant corn (only for compatibility with old savegames (build13))
 harvest_corn=_Harvest corn
-harvest=Harvest corn (only for compatibility with old savegames (build13))
 work=_Work
 
 [plant_corn]
 sleep=14000  #orig 20000
 worker=plant
 
-[plant]
-sleep=14000  #orig 20000
-worker=plant
-
 [harvest_corn]
 sleep=4000  #orig 5000
 worker=harvest
 
-[harvest]
-sleep=4000  #orig 5000
-worker=harvest
-
 [work]
 call=plant_corn
 call=harvest_corn

=== modified file 'tribes/atlanteans/labyrinth/conf'
--- tribes/atlanteans/labyrinth/conf	2014-02-24 21:12:30 +0000
+++ tribes/atlanteans/labyrinth/conf	2014-03-10 11:30:46 +0000
@@ -43,16 +43,11 @@
 
 [programs]
 sleep=_Sleep
-upgrade_soldier_defense_0=_Upgrade soldier defense 0
-upgrade_defense_0=_Upgrade soldier defense 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_defense_1=_Upgrade soldier defense 1
-upgrade_defense_1=_Upgrade soldier defense 1 (only for compatibility with old savegames (build13))
-upgrade_soldier_hp_0=_Upgrade soldier health 0
-upgrade_hp_0=_Upgrade soldier health 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_evade_0=_Upgrade soldier evade 0
-upgrade_evade_0=_Upgrade soldier evade 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_evade_1=_Upgrade soldier evade 1
-upgrade_evade_1=_Upgrade soldier evade 1 (only for compatibility with old savegames (build13))
+upgrade_soldier_defense_0=_Upgrade soldier defense from level 0 to level 1
+upgrade_soldier_defense_1=_Upgrade soldier defense from level 1 to level 2
+upgrade_soldier_hp_0=_Upgrade soldier health from level 0 to level 1
+upgrade_soldier_evade_0=_Upgrade soldier evade from level 0 to level 1
+upgrade_soldier_evade_1=_Upgrade soldier evade from level 1 to level 2
 
 [sleep]
 sleep=5000
@@ -65,13 +60,6 @@
 consume=bread smoked_fish,smoked_meat steel_shield
 train=soldier defense 0 1
 
-[upgrade_defense_0]
-check_soldier=soldier defense 0 # Fails when aren't any soldier of level 0 defense
-sleep=30000
-check_soldier=soldier defense 0 # Because the soldier can be expulsed by the player
-consume=bread smoked_fish,smoked_meat steel_shield
-train=soldier defense 0 1
-
 [upgrade_soldier_defense_1]
 check_soldier=soldier defense 1 # Fails when aren't any soldier of level 1 defense
 sleep=30000
@@ -79,13 +67,6 @@
 consume=bread smoked_fish,smoked_meat advanced_shield
 train=soldier defense 1 2
 
-[upgrade_defense_1]
-check_soldier=soldier defense 1 # Fails when aren't any soldier of level 1 defense
-sleep=30000
-check_soldier=soldier defense 1 # Because the soldier can be expulsed by the player
-consume=bread smoked_fish,smoked_meat advanced_shield
-train=soldier defense 1 2
-
 [upgrade_soldier_hp_0]
 check_soldier=soldier hp 0 # Fails when aren't any soldier of level 0 hp
 sleep=30000
@@ -93,13 +74,6 @@
 consume=smoked_fish,smoked_meat:2 golden_tabard
 train=soldier hp 0 1
 
-[upgrade_hp_0]
-check_soldier=soldier hp 0 # Fails when aren't any soldier of level 0 hp
-sleep=30000
-check_soldier=soldier hp 0 # Because the soldier can be expulsed by the player
-consume=smoked_fish,smoked_meat:2 golden_tabard
-train=soldier hp 0 1
-
 [upgrade_soldier_evade_0]
 check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
 sleep=30000
@@ -107,13 +81,6 @@
 consume=bread smoked_fish,smoked_meat:2
 train=soldier evade 0 1
 
-[upgrade_evade_0]
-check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
-sleep=30000
-check_soldier=soldier evade 0 # Because the soldier can be expulsed by the player
-consume=bread smoked_fish,smoked_meat:2
-train=soldier evade 0 1
-
 [upgrade_soldier_evade_1]
 check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
 sleep=30000
@@ -121,13 +88,6 @@
 consume=bread:2 smoked_fish,smoked_meat:2
 train=soldier evade 1 2
 
-[upgrade_evade_1]
-check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
-sleep=30000
-check_soldier=soldier evade 1 # Because the soldier can be expulsed by the player
-consume=bread:2 smoked_fish,smoked_meat:2
-train=soldier evade 1 2
-
 [idle]
 pics=labyrinth_i_??.png  # ???
 hotspot=80 88

=== modified file 'tribes/barbarians/battlearena/conf'
--- tribes/barbarians/battlearena/conf	2013-08-14 19:52:55 +0000
+++ tribes/barbarians/battlearena/conf	2014-03-10 11:30:46 +0000
@@ -34,10 +34,8 @@
 
 [programs]
 sleep=_Sleep
-upgrade_soldier_evade_0=_Upgrade soldier evade 0
-upgrade_evade_0=_Upgrade soldier evade 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_evade_1=_Upgrade soldier evade 1
-upgrade_evade_1=_Upgrade soldier evade 1 (only for compatibility with old savegames (build13))
+upgrade_soldier_evade_0=_Upgrade soldier evade from level 0 to level 1
+upgrade_soldier_evade_1=_Upgrade soldier evade from level 1 to level 2
 
 [sleep]
 sleep=5000
@@ -51,14 +49,6 @@
 consume=pittabread fish,meat strongbeer
 train=soldier evade 0 1
 
-[upgrade_evade_0]
-check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
-sleep=15000
-animate=working 15000
-check_soldier=soldier evade 0 # Because the soldier can be expulsed by the player
-consume=pittabread fish,meat strongbeer
-train=soldier evade 0 1
-
 [upgrade_soldier_evade_1]
 check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
 sleep=15000
@@ -67,14 +57,6 @@
 consume=pittabread:2 fish,meat strongbeer
 train=soldier evade 1 2
 
-[upgrade_evade_1]
-check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
-sleep=15000
-animate=working 15000
-check_soldier=soldier evade 1 # Because the soldier can be expulsed by the player
-consume=pittabread:2 fish,meat strongbeer
-train=soldier evade 1 2
-
 [build]
 pics=battlearena_b_??.png
 hotspot=110 72

=== modified file 'tribes/barbarians/farm/conf'
--- tribes/barbarians/farm/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/farm/conf	2014-03-10 11:30:46 +0000
@@ -19,27 +19,17 @@
 
 [programs]
 plant_wheat=_Plant wheat
-plant=Plant wheat (only for compatibility with old savegames (build13))
 harvest_wheat=_Harvest wheat
-harvest=Harvest wheat (only for compatibility with old savegames (build13))
 work=_Work
 
 [plant_wheat]
 sleep=14000  #orig 20000
 worker=plant
 
-[plant]
-sleep=14000  #orig 20000
-worker=plant
-
 [harvest_wheat]
 sleep=4000  #orig 5000
 worker=harvest
 
-[harvest]
-sleep=4000  #orig 5000
-worker=harvest
-
 [work]
 call=plant_wheat
 call=harvest_wheat

=== modified file 'tribes/barbarians/fernery/conf'
--- tribes/barbarians/fernery/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/fernery/conf	2014-03-10 11:30:46 +0000
@@ -17,9 +17,7 @@
 
 [programs]
 plant_reed=_Plant reed
-plantreed=Plant reed (only for compatibility with savegames (build13))
 harvest_reed=_Harvest reed
-harvestreed=Harvest reed (only for compatibility with old savegames (build13))
 work=_Work
 
 [compatibility_programs]
@@ -34,18 +32,10 @@
 sleep=18000  #orig sleep=20000 but ferner animation was increased by 2sec
 worker=plantreed
 
-[plantreed]
-sleep=18000  #orig sleep=20000 but ferner animation was increased by 2sec
-worker=plantreed
-
 [harvest_reed]
 sleep=5000
 worker=harvestreed
 
-[harvestreed]
-sleep=5000
-worker=harvestreed
-
 [work]
 call=plant_reed
 call=harvest_reed

=== modified file 'tribes/barbarians/metalworks/help.lua'
--- tribes/barbarians/metalworks/help.lua	2014-03-05 18:47:03 +0000
+++ tribes/barbarians/metalworks/help.lua	2014-03-10 11:30:46 +0000
@@ -39,7 +39,7 @@
 		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/pick/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/stonemason/menu.png" },p(_"Stonemason")) ..
 		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/scythe/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/farmer/menu.png" },p(_"Farmer")) ..
 		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/ranger/menu.png" },p(_"Ranger")) ..
-		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/ferner/menu.png" },p(_"Ferner")) ..
+		dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/ferner/menu.png" },p(_"Gardener")) ..
 	--Building Section
 		rt(h2(_"Building")) ..
 		text_line(_"Space required:",_"Medium plot","pics/medium.png") ..

=== modified file 'tribes/barbarians/shovel/conf'
--- tribes/barbarians/shovel/conf	2014-03-03 20:59:04 +0000
+++ tribes/barbarians/shovel/conf	2014-03-10 11:30:46 +0000
@@ -1,4 +1,4 @@
-help=_The shovel is needed for the proper handling of plants. Therefore the ferner and the ranger use it. Produced at the metal workshop (but it ceases to be produced by the building if it is enhanced to an axfactory and war mill).
+help=_The shovel is needed for the proper handling of plants. Therefore the gardener and the ranger use it. Produced at the metal workshop (but it ceases to be produced by the building if it is enhanced to an axfactory and war mill).
 
 [idle]
 pics=idle.png

=== modified file 'tribes/barbarians/trainingscamp/conf'
--- tribes/barbarians/trainingscamp/conf	2014-02-24 21:12:30 +0000
+++ tribes/barbarians/trainingscamp/conf	2014-03-10 11:30:46 +0000
@@ -41,22 +41,14 @@
 
 [programs]
 sleep=_Sleep
-upgrade_soldier_attack_0=_Upgrade soldier attack 0
-upgrade_attack_0=_Upgrade soldier attack 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_1=_Upgrade soldier attack 1
-upgrade_attack_1=_Upgrade soldier attack 1 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_2=_Upgrade soldier attack 2
-upgrade_attack_2=_Upgrade soldier attack 2 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_3=_Upgrade soldier attack 3
-upgrade_attack_3=_Upgrade soldier attack 3 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_4=_Upgrade soldier attack 4
-upgrade_attack_4=_Upgrade soldier attack 4 (only for compatibility with old savegames (build13))
-upgrade_soldier_hp_0=_Upgrade soldier health 0
-upgrade_hp_0=_Upgrade soldier health 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_hp_1=_Upgrade soldier health 1
-upgrade_hp_1=_Upgrade soldier health 1 (only for compatibility with old savegames (build13))
-upgrade_soldier_hp_2=_Upgrade soldier health 2
-upgrade_hp_2=_Upgrade soldier health 2 (only for compatibility with old savegames (build13))
+upgrade_soldier_attack_0=_Upgrade soldier attack from level 0 to level 1
+upgrade_soldier_attack_1=_Upgrade soldier attack from level 1 to level 2
+upgrade_soldier_attack_2=_Upgrade soldier attack from level 2 to level 3
+upgrade_soldier_attack_3=_Upgrade soldier attack from level 3 to level 4
+upgrade_soldier_attack_4=_Upgrade soldier attack from level 4 to level 5
+upgrade_soldier_hp_0=_Upgrade soldier health from level 0 to level 1
+upgrade_soldier_hp_1=_Upgrade soldier health from level 1 to level 2
+upgrade_soldier_hp_2=_Upgrade soldier health from level 2 to level 3
 
 [sleep]
 sleep=5000
@@ -69,13 +61,6 @@
 consume=sharpaxe fish,meat pittabread
 train=soldier attack 0 1
 
-[upgrade_attack_0]
-check_soldier=soldier attack 0 # Fails when aren't any soldier of level 0 attack
-sleep=30000
-check_soldier=soldier attack 0 # Because the soldier can be expulsed by the player
-consume=sharpaxe fish,meat pittabread
-train=soldier attack 0 1
-
 [upgrade_soldier_attack_1]
 check_soldier=soldier attack 1
 sleep=30000
@@ -83,13 +68,6 @@
 consume=broadaxe fish,meat pittabread
 train=soldier attack 1 2
 
-[upgrade_attack_1]
-check_soldier=soldier attack 1
-sleep=30000
-check_soldier=soldier attack 1
-consume=broadaxe fish,meat pittabread
-train=soldier attack 1 2
-
 [upgrade_soldier_attack_2]
 check_soldier=soldier attack 2
 sleep=30000
@@ -97,13 +75,6 @@
 consume=bronzeaxe fish,meat pittabread
 train=soldier attack 2 3
 
-[upgrade_attack_2]
-check_soldier=soldier attack 2
-sleep=30000
-check_soldier=soldier attack 2
-consume=bronzeaxe fish,meat pittabread
-train=soldier attack 2 3
-
 [upgrade_soldier_attack_3]
 check_soldier=soldier attack 3
 sleep=30000
@@ -111,13 +82,6 @@
 consume=battleaxe fish,meat:2 pittabread
 train=soldier attack 3 4
 
-[upgrade_attack_3]
-check_soldier=soldier attack 3
-sleep=30000
-check_soldier=soldier attack 3
-consume=battleaxe fish,meat:2 pittabread
-train=soldier attack 3 4
-
 [upgrade_soldier_attack_4]
 check_soldier=soldier attack 4
 sleep=30000
@@ -125,13 +89,6 @@
 consume=warriorsaxe fish,meat pittabread:2
 train=soldier attack 4 5
 
-[upgrade_attack_4]
-check_soldier=soldier attack 4
-sleep=30000
-check_soldier=soldier attack 4
-consume=warriorsaxe fish,meat pittabread:2
-train=soldier attack 4 5
-
 [upgrade_soldier_hp_0]
 check_soldier=soldier hp 0
 sleep=30000
@@ -139,13 +96,6 @@
 consume=helm fish,meat,pittabread
 train=soldier hp 0 1
 
-[upgrade_hp_0]
-check_soldier=soldier hp 0
-sleep=30000
-check_soldier=soldier hp 0
-consume=helm fish,meat,pittabread
-train=soldier hp 0 1
-
 [upgrade_soldier_hp_1]
 check_soldier=soldier hp 1
 sleep=30000
@@ -153,13 +103,6 @@
 consume=mask fish,meat pittabread
 train=soldier hp 1 2
 
-[upgrade_hp_1]
-check_soldier=soldier hp 1
-sleep=30000
-check_soldier=soldier hp 1
-consume=mask fish,meat pittabread
-train=soldier hp 1 2
-
 [upgrade_soldier_hp_2]
 check_soldier=soldier hp 2
 sleep=30000
@@ -167,13 +110,6 @@
 consume=warhelmet fish,meat:2 pittabread
 train=soldier hp 2 3
 
-[upgrade_hp_2]
-check_soldier=soldier hp 2
-sleep=30000
-check_soldier=soldier hp 2
-consume=warhelmet fish,meat:2 pittabread
-train=soldier hp 2 3
-
 [build]
 pics=trainingscamp_b_??.png  # ???
 hotspot=110 77

=== modified file 'tribes/barbarians/trainingscamp/help.lua'
--- tribes/barbarians/trainingscamp/help.lua	2014-03-09 17:33:02 +0000
+++ tribes/barbarians/trainingscamp/help.lua	2014-03-10 11:30:46 +0000
@@ -13,7 +13,7 @@
 		rt("text-align=right",p("font-size=10 font-style=italic", _[[Chief Chat’Karuth in a speech to his army.]])) ..
 	--General Section
 		rt(h2(_"General")) ..
-		text_line(_"Purpose:", _"Trains soldiers in Attack up to level 4, and in Health up to level 2.<br>Equips the soldiers with all necessary weapons and armor parts.") ..
+		text_line(_"Purpose:", _"Trains soldiers in Attack up to level 5, and in Health up to level 3.<br>Equips the soldiers with all necessary weapons and armor parts.") ..
 		rt("<p font-weight=bold font-decoration=underline font-size=12>" .. _"Note:" .. "</p><p font-size=12>" ..
 		   _"Barbarian soldiers cannot be trained in ‘Defense’ and will remain at their initial level."
 		   .. "<br><br></p>") ..

=== modified file 'tribes/empire/arena/conf'
--- tribes/empire/arena/conf	2013-08-14 19:52:55 +0000
+++ tribes/empire/arena/conf	2014-03-10 11:30:46 +0000
@@ -27,8 +27,7 @@
 
 [programs]
 sleep=_Sleep
-upgrade_soldier_evade_0=_Upgrade soldier evade 0
-upgrade_evade_0=_Upgrade soldier evade 0 (only for compatibility with old savegames (build13))
+upgrade_soldier_evade_0=_Upgrade soldier evade from level 0 to level 1
 
 [sleep]
 sleep=5000
@@ -41,13 +40,6 @@
 consume=bread:2 fish,meat
 train=soldier evade 0 1
 
-[upgrade_evade_0]
-check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
-sleep=30000
-check_soldier=soldier evade 0 # Because the soldier can be expulsed by the player
-consume=bread:2 fish,meat
-train=soldier evade 0 1
-
 [inputs]
 bread=10
 fish=6

=== modified file 'tribes/empire/colosseum/conf'
--- tribes/empire/colosseum/conf	2013-08-14 19:52:55 +0000
+++ tribes/empire/colosseum/conf	2014-03-10 11:30:46 +0000
@@ -33,10 +33,8 @@
 
 [programs]
 sleep=_Sleep
-upgrade_soldier_evade_0=_Upgrade soldier evade 0
-upgrade_evade_0=_Upgrade soldier evade 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_evade_1=_Upgrade soldier evade 1
-upgrade_evade_1=_Upgrade soldier evade 1 (only for compatibility with old savegames (build13))
+upgrade_soldier_evade_0=_Upgrade soldier evade from level 0 to level 1
+upgrade_soldier_evade_1=_Upgrade soldier evade from level 1 to level 2
 
 [sleep]
 sleep=5000
@@ -49,13 +47,6 @@
 consume=bread:2 fish,meat
 train=soldier evade 0 1
 
-[upgrade_evade_0]
-check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
-sleep=30000
-check_soldier=soldier evade 0 # Because the soldier can be expulsed by the player
-consume=bread:2 fish,meat
-train=soldier evade 0 1
-
 [upgrade_soldier_evade_1]
 check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
 sleep=30000
@@ -63,13 +54,6 @@
 consume=bread:2 fish,meat:2
 train=soldier evade 1 2
 
-[upgrade_evade_1]
-check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
-sleep=30000
-check_soldier=soldier evade 1 # Because the soldier can be expulsed by the player
-consume=bread:2 fish,meat:2
-train=soldier evade 1 2
-
 [idle]
 pics=colosseum_i_??.png  # ???
 hotspot=81 106

=== modified file 'tribes/empire/farm/conf'
--- tribes/empire/farm/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/farm/conf	2014-03-10 11:30:46 +0000
@@ -21,27 +21,17 @@
 
 [programs]
 plant_wheat=_Plant wheat
-plant=Plant wheat (only for compatibility with old savegames (build13))
 harvest_wheat=_Harvest wheat
-harvest=Harvest wheat (only for compatibility with old savegames (build13))
 work=_Work
 
 [plant_wheat]
 sleep=14000  #orig 20000
 worker=plant
 
-[plant]
-sleep=14000  #orig 20000
-worker=plant
-
 [harvest_wheat]
 sleep=4000  #orig 5000
 worker=harvest
 
-[harvest]
-sleep=4000  #orig 5000
-worker=harvest
-
 [work]
 call=plant_wheat
 call=harvest_wheat

=== modified file 'tribes/empire/marblemine/conf'
--- tribes/empire/marblemine/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/marblemine/conf	2014-03-10 11:30:46 +0000
@@ -24,9 +24,7 @@
 
 [programs]
 mine_marble=_Mine marble
-prog_marble=_Mine marble (only for compatibility with old savegames (build13))
 mine_stone=_Mine stone
-prog_stone=_Mine stone (only for compatibility with old savegames (build13))
 work=_Work
 
 [mine_marble]
@@ -39,16 +37,6 @@
 mine=granit 2 50 5
 produce=marble stone
 
-[prog_marble]
-sleep=20000
-consume=wine ration
-animate=working 20000
-mine=granit 2 50 5
-produce=marble:2
-animate=working 20000
-mine=granit 2 50 5
-produce=marble stone
-
 [mine_stone]
 sleep=20000
 consume=ration wine
@@ -59,16 +47,6 @@
 mine=granit 2 50 5
 produce=stone:2
 
-[prog_stone]
-sleep=20000
-consume=ration wine
-animate=working 20000
-mine=granit 2 50 5
-produce=stone marble
-animate=working 20000
-mine=granit 2 50 5
-produce=stone:2
-
 [work]
 call=mine_marble
 call=mine_stone

=== modified file 'tribes/empire/quarry/conf'
--- tribes/empire/quarry/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/quarry/conf	2014-03-10 11:30:46 +0000
@@ -18,27 +18,17 @@
 
 [programs]
 mine_stone=_Mine stone
-stone=_Mine stone (only for compatibility with old savegames (build13))
 mine_marble=_Mine marble
-marble=_Mine marble (only for compatibility with old savegames (build13))
 work=_Work
 
 [mine_stone]
 sleep=25000
 worker=cut_stone
 
-[stone]
-sleep=25000
-worker=cut_stone
-
 [mine_marble]
 sleep=25000
 worker=cut_marble
 
-[marble]
-sleep=25000
-worker=cut_marble
-
 [work]
 call=mine_stone
 call=mine_stone

=== modified file 'tribes/empire/trainingscamp/conf'
--- tribes/empire/trainingscamp/conf	2014-02-24 21:12:30 +0000
+++ tribes/empire/trainingscamp/conf	2014-03-10 11:30:46 +0000
@@ -44,22 +44,14 @@
 
 [programs]
 sleep=_Sleep
-upgrade_soldier_attack_0=_Upgrade soldier attack 0
-upgrade_attack_0=_Upgrade soldier attack 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_1=_Upgrade soldier attack 1
-upgrade_attack_1=_Upgrade soldier attack 1 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_2=_Upgrade soldier attack 2
-upgrade_attack_2=_Upgrade soldier attack 2 (only for compatibility with old savegames (build13))
-upgrade_soldier_attack_3=_Upgrade soldier attack 3
-upgrade_attack_3=_Upgrade soldier attack 3 (only for compatibility with old savegames (build13))
-upgrade_soldier_hp_0=_Upgrade soldier health 0
-upgrade_hp_0=_Upgrade soldier health 0 (only for compatibility with old savegames (build13))
-upgrade_soldier_hp_1=_Upgrade soldier health 1
-upgrade_hp_1=_Upgrade soldier health 1 (only for compatibility with old savegames (build13))
-upgrade_soldier_hp_2=_Upgrade soldier health 2
-upgrade_hp_2=_Upgrade soldier health 2 (only for compatibility with old savegames (build13))
-upgrade_soldier_hp_3=_Upgrade soldier health 3
-upgrade_hp_3=_Upgrade soldier health 3 (only for compatibility with old savegames (build13))
+upgrade_soldier_attack_0=_Upgrade soldier attack from level 0 to level 1
+upgrade_soldier_attack_1=_Upgrade soldier attack from level 1 to level 2
+upgrade_soldier_attack_2=_Upgrade soldier attack from level 2 to level 3
+upgrade_soldier_attack_3=_Upgrade soldier attack from level 3 to level 4
+upgrade_soldier_hp_0=_Upgrade soldier health from level 0 to level 1
+upgrade_soldier_hp_1=_Upgrade soldier health from level 1 to level 2
+upgrade_soldier_hp_2=_Upgrade soldier health from level 2 to level 3
+upgrade_soldier_hp_3=_Upgrade soldier health from level 3 to level 4
 
 [sleep]
 sleep=5000
@@ -72,13 +64,6 @@
 consume=lance bread fish,meat
 train=soldier attack 0 1
 
-[upgrade_attack_0]
-check_soldier=soldier attack 0 # Fails when aren't any soldier of level 0 attack
-sleep=30000
-check_soldier=soldier attack 0 # Because the soldier can be expulsed by the player
-consume=lance bread fish,meat
-train=soldier attack 0 1
-
 [upgrade_soldier_attack_1]
 check_soldier=soldier attack 1
 sleep=30000
@@ -86,13 +71,6 @@
 consume=advanced_lance bread fish,meat
 train=soldier attack 1 2
 
-[upgrade_attack_1]
-check_soldier=soldier attack 1
-sleep=30000
-check_soldier=soldier attack 1
-consume=advanced_lance bread fish,meat
-train=soldier attack 1 2
-
 [upgrade_soldier_attack_2]
 check_soldier=soldier attack 2
 sleep=30000
@@ -100,13 +78,6 @@
 consume=heavy_lance bread fish,meat:2
 train=soldier attack 2 3
 
-[upgrade_attack_2]
-check_soldier=soldier attack 2
-sleep=30000
-check_soldier=soldier attack 2
-consume=heavy_lance bread fish,meat:2
-train=soldier attack 2 3
-
 [upgrade_soldier_attack_3]
 check_soldier=soldier attack 3
 sleep=30000
@@ -114,13 +85,6 @@
 consume=war_lance bread:2 fish,meat
 train=soldier attack 3 4
 
-[upgrade_attack_3]
-check_soldier=soldier attack 3
-sleep=30000
-check_soldier=soldier attack 3
-consume=war_lance bread:2 fish,meat
-train=soldier attack 3 4
-
 [upgrade_soldier_hp_0]
 check_soldier=soldier hp 0
 sleep=30000
@@ -128,13 +92,6 @@
 consume=helm bread,fish,meat
 train=soldier hp 0 1
 
-[upgrade_hp_0]
-check_soldier=soldier hp 0
-sleep=30000
-check_soldier=soldier hp 0
-consume=helm bread,fish,meat
-train=soldier hp 0 1
-
 [upgrade_soldier_hp_1]
 check_soldier=soldier hp 1
 sleep=30000
@@ -142,13 +99,6 @@
 consume=armour bread fish,meat
 train=soldier hp 1 2
 
-[upgrade_hp_1]
-check_soldier=soldier hp 1
-sleep=30000
-check_soldier=soldier hp 1
-consume=armour bread fish,meat
-train=soldier hp 1 2
-
 [upgrade_soldier_hp_2]
 check_soldier=soldier hp 2
 sleep=30000
@@ -156,13 +106,6 @@
 consume=chain_armour bread:2 fish,meat:2
 train=soldier hp 2 3
 
-[upgrade_hp_2]
-check_soldier=soldier hp 2
-sleep=30000
-check_soldier=soldier hp 2
-consume=chain_armour bread:2 fish,meat:2
-train=soldier hp 2 3
-
 [upgrade_soldier_hp_3]
 check_soldier=soldier hp 3
 sleep=30000
@@ -170,13 +113,6 @@
 consume=plate_armour bread:2 fish,meat:2
 train=soldier hp 3 4
 
-[upgrade_hp_3]
-check_soldier=soldier hp 3
-sleep=30000
-check_soldier=soldier hp 3
-consume=plate_armour bread:2 fish,meat:2
-train=soldier hp 3 4
-
 [idle]
 pics=trainingscamp_i_??.png  # ???
 hotspot=82 105

=== modified file 'tribes/empire/vineyard/conf'
--- tribes/empire/vineyard/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/vineyard/conf	2014-03-10 11:30:46 +0000
@@ -21,27 +21,17 @@
 
 [programs]
 plant_vine=_Plant vine
-plantvine=Plant vine (only for compatibility with old savegames (build13))
 harvest_vine=_Harvest vine
-harvestvine=Harvest vine (only for compatibility with old savegames (build13))
 work=_Work
 
 [plant_vine]
 sleep=20000
 worker=plantvine
 
-[plantvine]
-sleep=20000
-worker=plantvine
-
 [harvest_vine]
 sleep=5000
 worker=harvestvine
 
-[harvestvine]
-sleep=5000
-worker=harvestvine
-
 [work]
 call=plant_vine
 call=harvest_vine