widelands

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

  1. bug-1290073
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 6869
Proposed branch: lp:~widelands-dev/widelands/bug-1290073
Merge into: lp:widelands
Diff against target: 939 lines (+33/-383)
19 files modified
tribes/atlanteans/armoursmithy/conf (+0/-16)
tribes/atlanteans/blackroot_farm/conf (+0/-10)
tribes/atlanteans/dungeon/conf (+4/-36)
tribes/atlanteans/farm/conf (+0/-10)
tribes/atlanteans/labyrinth/conf (+5/-45)
tribes/barbarians/battlearena/conf (+2/-20)
tribes/barbarians/farm/conf (+0/-10)
tribes/barbarians/fernery/conf (+0/-10)
tribes/barbarians/metalworks/help.lua (+1/-1)
tribes/barbarians/shovel/conf (+1/-1)
tribes/barbarians/trainingscamp/conf (+8/-72)
tribes/barbarians/trainingscamp/help.lua (+1/-1)
tribes/empire/arena/conf (+1/-9)
tribes/empire/colosseum/conf (+2/-18)
tribes/empire/farm/conf (+0/-10)
tribes/empire/marblemine/conf (+0/-22)
tribes/empire/quarry/conf (+0/-10)
tribes/empire/trainingscamp/conf (+8/-72)
tribes/empire/vineyard/conf (+0/-10)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1290073
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+210188@code.launchpad.net

Description of the change

- 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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
2626
27[programs]27[programs]
28produce_steel_shield=_Produce steel shield28produce_steel_shield=_Produce steel shield
29produce_s_shield=_Produce steel shield (only for compatibility with old savegames (build13))
30produce_advanced_shield=_Produce advanced shield29produce_advanced_shield=_Produce advanced shield
31produce_a_shield=_Produce advanced shield (only for compatibility with old savegames (build13))
32work=_Work30work=_Work
3331
34[produce_steel_shield]32[produce_steel_shield]
@@ -38,13 +36,6 @@
38animate=working 3500036animate=working 35000
39produce=steel_shield37produce=steel_shield
4038
41[produce_s_shield]
42return=skipped unless economy needs steel_shield
43sleep=32000
44consume=iron:2 coal:2
45animate=working 35000
46produce=steel_shield
47
48[produce_advanced_shield]39[produce_advanced_shield]
49return=skipped unless economy needs advanced_shield40return=skipped unless economy needs advanced_shield
50sleep=3200041sleep=32000
@@ -52,13 +43,6 @@
52animate=working 4500043animate=working 45000
53produce=advanced_shield44produce=advanced_shield
5445
55[produce_a_shield]
56return=skipped unless economy needs advanced_shield
57sleep=32000
58consume=iron:2 coal:2 gold
59animate=working 45000
60produce=advanced_shield
61
62[work]46[work]
63call=produce_steel_shield47call=produce_steel_shield
64call=produce_advanced_shield48call=produce_advanced_shield
6549
=== 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 @@
2020
21[programs]21[programs]
22plant_blackroot=_Plant blackroot22plant_blackroot=_Plant blackroot
23plant=Plant blackroot (only for compatibility with old savegames (build13))
24harvest_blackroot=_Harvest blackroot23harvest_blackroot=_Harvest blackroot
25harvest=Harvest blackroot (only for compatibility with old savegames (build13))
26work=_Work24work=_Work
2725
28[plant_blackroot]26[plant_blackroot]
29sleep=2000027sleep=20000
30worker=plant28worker=plant
3129
32[plant]
33sleep=20000
34worker=plant
35
36[harvest_blackroot]30[harvest_blackroot]
37sleep=500031sleep=5000
38worker=harvest32worker=harvest
3933
40[harvest]
41sleep=5000
42worker=harvest
43
44[work]34[work]
45call=plant_blackroot35call=plant_blackroot
46call=harvest_blackroot36call=harvest_blackroot
4737
=== 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 @@
3737
38[programs]38[programs]
39sleep=_Sleep39sleep=_Sleep
40upgrade_soldier_attack_0=_Upgrade soldier attack 040upgrade_soldier_attack_0=_Upgrade soldier attack from level 0 to level 1
41upgrade_attack_0=_Upgrade soldier attack 0 (only for compatibility with old savegames (build13))41upgrade_soldier_attack_1=_Upgrade soldier attack from level 1 to level 2
42upgrade_soldier_attack_1=_Upgrade soldier attack 142upgrade_soldier_attack_2=_Upgrade soldier attack from level 2 to level 3
43upgrade_attack_1=_Upgrade soldier attack 1 (only for compatibility with old savegames (build13))43upgrade_soldier_attack_3=_Upgrade soldier attack from level 3 to level 4
44upgrade_soldier_attack_2=_Upgrade soldier attack 2
45upgrade_attack_2=_Upgrade soldier attack 2 (only for compatibility with old savegames (build13))
46upgrade_soldier_attack_3=_Upgrade soldier attack 3
47upgrade_attack_3=_Upgrade soldier attack 3 (only for compatibility with old savegames (build13))
4844
49[sleep]45[sleep]
50sleep=500046sleep=5000
@@ -57,13 +53,6 @@
57consume=bread smoked_fish,smoked_meat long_trident53consume=bread smoked_fish,smoked_meat long_trident
58train=soldier attack 0 154train=soldier attack 0 1
5955
60[upgrade_attack_0]
61check_soldier=soldier attack 0
62sleep=30000
63check_soldier=soldier attack 0
64consume=bread smoked_fish,smoked_meat long_trident
65train=soldier attack 0 1
66
67[upgrade_soldier_attack_1]56[upgrade_soldier_attack_1]
68check_soldier=soldier attack 157check_soldier=soldier attack 1
69sleep=3000058sleep=30000
@@ -71,13 +60,6 @@
71consume=bread smoked_fish,smoked_meat steel_trident60consume=bread smoked_fish,smoked_meat steel_trident
72train=soldier attack 1 261train=soldier attack 1 2
7362
74[upgrade_attack_1]
75check_soldier=soldier attack 1
76sleep=30000
77check_soldier=soldier attack 1
78consume=bread smoked_fish,smoked_meat steel_trident
79train=soldier attack 1 2
80
81[upgrade_soldier_attack_2]63[upgrade_soldier_attack_2]
82check_soldier=soldier attack 264check_soldier=soldier attack 2
83sleep=3000065sleep=30000
@@ -85,13 +67,6 @@
85consume=bread smoked_fish,smoked_meat double_trident67consume=bread smoked_fish,smoked_meat double_trident
86train=soldier attack 2 368train=soldier attack 2 3
8769
88[upgrade_attack_2]
89check_soldier=soldier attack 2
90sleep=30000
91check_soldier=soldier attack 2
92consume=bread smoked_fish,smoked_meat double_trident
93train=soldier attack 2 3
94
95[upgrade_soldier_attack_3]70[upgrade_soldier_attack_3]
96check_soldier=soldier attack 371check_soldier=soldier attack 3
97sleep=3000072sleep=30000
@@ -99,13 +74,6 @@
99consume=bread smoked_fish,smoked_meat heavy_double_trident74consume=bread smoked_fish,smoked_meat heavy_double_trident
100train=soldier attack 3 475train=soldier attack 3 4
10176
102[upgrade_attack_3]
103check_soldier=soldier attack 3
104sleep=30000
105check_soldier=soldier attack 3
106consume=bread smoked_fish,smoked_meat heavy_double_trident
107train=soldier attack 3 4
108
109[idle]77[idle]
110pics=dungeon_i_??.png # ???78pics=dungeon_i_??.png # ???
111hotspot=47 4879hotspot=47 48
11280
=== 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 @@
2222
23[programs]23[programs]
24plant_corn=_Plant corn24plant_corn=_Plant corn
25plant=Plant corn (only for compatibility with old savegames (build13))
26harvest_corn=_Harvest corn25harvest_corn=_Harvest corn
27harvest=Harvest corn (only for compatibility with old savegames (build13))
28work=_Work26work=_Work
2927
30[plant_corn]28[plant_corn]
31sleep=14000 #orig 2000029sleep=14000 #orig 20000
32worker=plant30worker=plant
3331
34[plant]
35sleep=14000 #orig 20000
36worker=plant
37
38[harvest_corn]32[harvest_corn]
39sleep=4000 #orig 500033sleep=4000 #orig 5000
40worker=harvest34worker=harvest
4135
42[harvest]
43sleep=4000 #orig 5000
44worker=harvest
45
46[work]36[work]
47call=plant_corn37call=plant_corn
48call=harvest_corn38call=harvest_corn
4939
=== 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 @@
4343
44[programs]44[programs]
45sleep=_Sleep45sleep=_Sleep
46upgrade_soldier_defense_0=_Upgrade soldier defense 046upgrade_soldier_defense_0=_Upgrade soldier defense from level 0 to level 1
47upgrade_defense_0=_Upgrade soldier defense 0 (only for compatibility with old savegames (build13))47upgrade_soldier_defense_1=_Upgrade soldier defense from level 1 to level 2
48upgrade_soldier_defense_1=_Upgrade soldier defense 148upgrade_soldier_hp_0=_Upgrade soldier health from level 0 to level 1
49upgrade_defense_1=_Upgrade soldier defense 1 (only for compatibility with old savegames (build13))49upgrade_soldier_evade_0=_Upgrade soldier evade from level 0 to level 1
50upgrade_soldier_hp_0=_Upgrade soldier health 050upgrade_soldier_evade_1=_Upgrade soldier evade from level 1 to level 2
51upgrade_hp_0=_Upgrade soldier health 0 (only for compatibility with old savegames (build13))
52upgrade_soldier_evade_0=_Upgrade soldier evade 0
53upgrade_evade_0=_Upgrade soldier evade 0 (only for compatibility with old savegames (build13))
54upgrade_soldier_evade_1=_Upgrade soldier evade 1
55upgrade_evade_1=_Upgrade soldier evade 1 (only for compatibility with old savegames (build13))
5651
57[sleep]52[sleep]
58sleep=500053sleep=5000
@@ -65,13 +60,6 @@
65consume=bread smoked_fish,smoked_meat steel_shield60consume=bread smoked_fish,smoked_meat steel_shield
66train=soldier defense 0 161train=soldier defense 0 1
6762
68[upgrade_defense_0]
69check_soldier=soldier defense 0 # Fails when aren't any soldier of level 0 defense
70sleep=30000
71check_soldier=soldier defense 0 # Because the soldier can be expulsed by the player
72consume=bread smoked_fish,smoked_meat steel_shield
73train=soldier defense 0 1
74
75[upgrade_soldier_defense_1]63[upgrade_soldier_defense_1]
76check_soldier=soldier defense 1 # Fails when aren't any soldier of level 1 defense64check_soldier=soldier defense 1 # Fails when aren't any soldier of level 1 defense
77sleep=3000065sleep=30000
@@ -79,13 +67,6 @@
79consume=bread smoked_fish,smoked_meat advanced_shield67consume=bread smoked_fish,smoked_meat advanced_shield
80train=soldier defense 1 268train=soldier defense 1 2
8169
82[upgrade_defense_1]
83check_soldier=soldier defense 1 # Fails when aren't any soldier of level 1 defense
84sleep=30000
85check_soldier=soldier defense 1 # Because the soldier can be expulsed by the player
86consume=bread smoked_fish,smoked_meat advanced_shield
87train=soldier defense 1 2
88
89[upgrade_soldier_hp_0]70[upgrade_soldier_hp_0]
90check_soldier=soldier hp 0 # Fails when aren't any soldier of level 0 hp71check_soldier=soldier hp 0 # Fails when aren't any soldier of level 0 hp
91sleep=3000072sleep=30000
@@ -93,13 +74,6 @@
93consume=smoked_fish,smoked_meat:2 golden_tabard74consume=smoked_fish,smoked_meat:2 golden_tabard
94train=soldier hp 0 175train=soldier hp 0 1
9576
96[upgrade_hp_0]
97check_soldier=soldier hp 0 # Fails when aren't any soldier of level 0 hp
98sleep=30000
99check_soldier=soldier hp 0 # Because the soldier can be expulsed by the player
100consume=smoked_fish,smoked_meat:2 golden_tabard
101train=soldier hp 0 1
102
103[upgrade_soldier_evade_0]77[upgrade_soldier_evade_0]
104check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade78check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
105sleep=3000079sleep=30000
@@ -107,13 +81,6 @@
107consume=bread smoked_fish,smoked_meat:281consume=bread smoked_fish,smoked_meat:2
108train=soldier evade 0 182train=soldier evade 0 1
10983
110[upgrade_evade_0]
111check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
112sleep=30000
113check_soldier=soldier evade 0 # Because the soldier can be expulsed by the player
114consume=bread smoked_fish,smoked_meat:2
115train=soldier evade 0 1
116
117[upgrade_soldier_evade_1]84[upgrade_soldier_evade_1]
118check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade85check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
119sleep=3000086sleep=30000
@@ -121,13 +88,6 @@
121consume=bread:2 smoked_fish,smoked_meat:288consume=bread:2 smoked_fish,smoked_meat:2
122train=soldier evade 1 289train=soldier evade 1 2
12390
124[upgrade_evade_1]
125check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
126sleep=30000
127check_soldier=soldier evade 1 # Because the soldier can be expulsed by the player
128consume=bread:2 smoked_fish,smoked_meat:2
129train=soldier evade 1 2
130
131[idle]91[idle]
132pics=labyrinth_i_??.png # ???92pics=labyrinth_i_??.png # ???
133hotspot=80 8893hotspot=80 88
13494
=== 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 @@
3434
35[programs]35[programs]
36sleep=_Sleep36sleep=_Sleep
37upgrade_soldier_evade_0=_Upgrade soldier evade 037upgrade_soldier_evade_0=_Upgrade soldier evade from level 0 to level 1
38upgrade_evade_0=_Upgrade soldier evade 0 (only for compatibility with old savegames (build13))38upgrade_soldier_evade_1=_Upgrade soldier evade from level 1 to level 2
39upgrade_soldier_evade_1=_Upgrade soldier evade 1
40upgrade_evade_1=_Upgrade soldier evade 1 (only for compatibility with old savegames (build13))
4139
42[sleep]40[sleep]
43sleep=500041sleep=5000
@@ -51,14 +49,6 @@
51consume=pittabread fish,meat strongbeer49consume=pittabread fish,meat strongbeer
52train=soldier evade 0 150train=soldier evade 0 1
5351
54[upgrade_evade_0]
55check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
56sleep=15000
57animate=working 15000
58check_soldier=soldier evade 0 # Because the soldier can be expulsed by the player
59consume=pittabread fish,meat strongbeer
60train=soldier evade 0 1
61
62[upgrade_soldier_evade_1]52[upgrade_soldier_evade_1]
63check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade53check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
64sleep=1500054sleep=15000
@@ -67,14 +57,6 @@
67consume=pittabread:2 fish,meat strongbeer57consume=pittabread:2 fish,meat strongbeer
68train=soldier evade 1 258train=soldier evade 1 2
6959
70[upgrade_evade_1]
71check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
72sleep=15000
73animate=working 15000
74check_soldier=soldier evade 1 # Because the soldier can be expulsed by the player
75consume=pittabread:2 fish,meat strongbeer
76train=soldier evade 1 2
77
78[build]60[build]
79pics=battlearena_b_??.png61pics=battlearena_b_??.png
80hotspot=110 7262hotspot=110 72
8163
=== 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 @@
1919
20[programs]20[programs]
21plant_wheat=_Plant wheat21plant_wheat=_Plant wheat
22plant=Plant wheat (only for compatibility with old savegames (build13))
23harvest_wheat=_Harvest wheat22harvest_wheat=_Harvest wheat
24harvest=Harvest wheat (only for compatibility with old savegames (build13))
25work=_Work23work=_Work
2624
27[plant_wheat]25[plant_wheat]
28sleep=14000 #orig 2000026sleep=14000 #orig 20000
29worker=plant27worker=plant
3028
31[plant]
32sleep=14000 #orig 20000
33worker=plant
34
35[harvest_wheat]29[harvest_wheat]
36sleep=4000 #orig 500030sleep=4000 #orig 5000
37worker=harvest31worker=harvest
3832
39[harvest]
40sleep=4000 #orig 5000
41worker=harvest
42
43[work]33[work]
44call=plant_wheat34call=plant_wheat
45call=harvest_wheat35call=harvest_wheat
4636
=== 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 @@
1717
18[programs]18[programs]
19plant_reed=_Plant reed19plant_reed=_Plant reed
20plantreed=Plant reed (only for compatibility with savegames (build13))
21harvest_reed=_Harvest reed20harvest_reed=_Harvest reed
22harvestreed=Harvest reed (only for compatibility with old savegames (build13))
23work=_Work21work=_Work
2422
25[compatibility_programs]23[compatibility_programs]
@@ -34,18 +32,10 @@
34sleep=18000 #orig sleep=20000 but ferner animation was increased by 2sec32sleep=18000 #orig sleep=20000 but ferner animation was increased by 2sec
35worker=plantreed33worker=plantreed
3634
37[plantreed]
38sleep=18000 #orig sleep=20000 but ferner animation was increased by 2sec
39worker=plantreed
40
41[harvest_reed]35[harvest_reed]
42sleep=500036sleep=5000
43worker=harvestreed37worker=harvestreed
4438
45[harvestreed]
46sleep=5000
47worker=harvestreed
48
49[work]39[work]
50call=plant_reed40call=plant_reed
51call=harvest_reed41call=harvest_reed
5242
=== 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 @@
39 dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/pick/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/stonemason/menu.png" },p(_"Stonemason")) ..39 dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/pick/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/stonemason/menu.png" },p(_"Stonemason")) ..
40 dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/scythe/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/farmer/menu.png" },p(_"Farmer")) ..40 dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/scythe/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/farmer/menu.png" },p(_"Farmer")) ..
41 dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/ranger/menu.png" },p(_"Ranger")) ..41 dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/ranger/menu.png" },p(_"Ranger")) ..
42 dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/ferner/menu.png" },p(_"Ferner")) ..42 dependencies({"tribes/barbarians/metalworks/menu.png","tribes/barbarians/shovel/menu.png","tribes/barbarians/headquarters/menu.png","tribes/barbarians/ferner/menu.png" },p(_"Gardener")) ..
43 --Building Section43 --Building Section
44 rt(h2(_"Building")) ..44 rt(h2(_"Building")) ..
45 text_line(_"Space required:",_"Medium plot","pics/medium.png") ..45 text_line(_"Space required:",_"Medium plot","pics/medium.png") ..
4646
=== 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 @@
1help=_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).1help=_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).
22
3[idle]3[idle]
4pics=idle.png4pics=idle.png
55
=== 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 @@
4141
42[programs]42[programs]
43sleep=_Sleep43sleep=_Sleep
44upgrade_soldier_attack_0=_Upgrade soldier attack 044upgrade_soldier_attack_0=_Upgrade soldier attack from level 0 to level 1
45upgrade_attack_0=_Upgrade soldier attack 0 (only for compatibility with old savegames (build13))45upgrade_soldier_attack_1=_Upgrade soldier attack from level 1 to level 2
46upgrade_soldier_attack_1=_Upgrade soldier attack 146upgrade_soldier_attack_2=_Upgrade soldier attack from level 2 to level 3
47upgrade_attack_1=_Upgrade soldier attack 1 (only for compatibility with old savegames (build13))47upgrade_soldier_attack_3=_Upgrade soldier attack from level 3 to level 4
48upgrade_soldier_attack_2=_Upgrade soldier attack 248upgrade_soldier_attack_4=_Upgrade soldier attack from level 4 to level 5
49upgrade_attack_2=_Upgrade soldier attack 2 (only for compatibility with old savegames (build13))49upgrade_soldier_hp_0=_Upgrade soldier health from level 0 to level 1
50upgrade_soldier_attack_3=_Upgrade soldier attack 350upgrade_soldier_hp_1=_Upgrade soldier health from level 1 to level 2
51upgrade_attack_3=_Upgrade soldier attack 3 (only for compatibility with old savegames (build13))51upgrade_soldier_hp_2=_Upgrade soldier health from level 2 to level 3
52upgrade_soldier_attack_4=_Upgrade soldier attack 4
53upgrade_attack_4=_Upgrade soldier attack 4 (only for compatibility with old savegames (build13))
54upgrade_soldier_hp_0=_Upgrade soldier health 0
55upgrade_hp_0=_Upgrade soldier health 0 (only for compatibility with old savegames (build13))
56upgrade_soldier_hp_1=_Upgrade soldier health 1
57upgrade_hp_1=_Upgrade soldier health 1 (only for compatibility with old savegames (build13))
58upgrade_soldier_hp_2=_Upgrade soldier health 2
59upgrade_hp_2=_Upgrade soldier health 2 (only for compatibility with old savegames (build13))
6052
61[sleep]53[sleep]
62sleep=500054sleep=5000
@@ -69,13 +61,6 @@
69consume=sharpaxe fish,meat pittabread61consume=sharpaxe fish,meat pittabread
70train=soldier attack 0 162train=soldier attack 0 1
7163
72[upgrade_attack_0]
73check_soldier=soldier attack 0 # Fails when aren't any soldier of level 0 attack
74sleep=30000
75check_soldier=soldier attack 0 # Because the soldier can be expulsed by the player
76consume=sharpaxe fish,meat pittabread
77train=soldier attack 0 1
78
79[upgrade_soldier_attack_1]64[upgrade_soldier_attack_1]
80check_soldier=soldier attack 165check_soldier=soldier attack 1
81sleep=3000066sleep=30000
@@ -83,13 +68,6 @@
83consume=broadaxe fish,meat pittabread68consume=broadaxe fish,meat pittabread
84train=soldier attack 1 269train=soldier attack 1 2
8570
86[upgrade_attack_1]
87check_soldier=soldier attack 1
88sleep=30000
89check_soldier=soldier attack 1
90consume=broadaxe fish,meat pittabread
91train=soldier attack 1 2
92
93[upgrade_soldier_attack_2]71[upgrade_soldier_attack_2]
94check_soldier=soldier attack 272check_soldier=soldier attack 2
95sleep=3000073sleep=30000
@@ -97,13 +75,6 @@
97consume=bronzeaxe fish,meat pittabread75consume=bronzeaxe fish,meat pittabread
98train=soldier attack 2 376train=soldier attack 2 3
9977
100[upgrade_attack_2]
101check_soldier=soldier attack 2
102sleep=30000
103check_soldier=soldier attack 2
104consume=bronzeaxe fish,meat pittabread
105train=soldier attack 2 3
106
107[upgrade_soldier_attack_3]78[upgrade_soldier_attack_3]
108check_soldier=soldier attack 379check_soldier=soldier attack 3
109sleep=3000080sleep=30000
@@ -111,13 +82,6 @@
111consume=battleaxe fish,meat:2 pittabread82consume=battleaxe fish,meat:2 pittabread
112train=soldier attack 3 483train=soldier attack 3 4
11384
114[upgrade_attack_3]
115check_soldier=soldier attack 3
116sleep=30000
117check_soldier=soldier attack 3
118consume=battleaxe fish,meat:2 pittabread
119train=soldier attack 3 4
120
121[upgrade_soldier_attack_4]85[upgrade_soldier_attack_4]
122check_soldier=soldier attack 486check_soldier=soldier attack 4
123sleep=3000087sleep=30000
@@ -125,13 +89,6 @@
125consume=warriorsaxe fish,meat pittabread:289consume=warriorsaxe fish,meat pittabread:2
126train=soldier attack 4 590train=soldier attack 4 5
12791
128[upgrade_attack_4]
129check_soldier=soldier attack 4
130sleep=30000
131check_soldier=soldier attack 4
132consume=warriorsaxe fish,meat pittabread:2
133train=soldier attack 4 5
134
135[upgrade_soldier_hp_0]92[upgrade_soldier_hp_0]
136check_soldier=soldier hp 093check_soldier=soldier hp 0
137sleep=3000094sleep=30000
@@ -139,13 +96,6 @@
139consume=helm fish,meat,pittabread96consume=helm fish,meat,pittabread
140train=soldier hp 0 197train=soldier hp 0 1
14198
142[upgrade_hp_0]
143check_soldier=soldier hp 0
144sleep=30000
145check_soldier=soldier hp 0
146consume=helm fish,meat,pittabread
147train=soldier hp 0 1
148
149[upgrade_soldier_hp_1]99[upgrade_soldier_hp_1]
150check_soldier=soldier hp 1100check_soldier=soldier hp 1
151sleep=30000101sleep=30000
@@ -153,13 +103,6 @@
153consume=mask fish,meat pittabread103consume=mask fish,meat pittabread
154train=soldier hp 1 2104train=soldier hp 1 2
155105
156[upgrade_hp_1]
157check_soldier=soldier hp 1
158sleep=30000
159check_soldier=soldier hp 1
160consume=mask fish,meat pittabread
161train=soldier hp 1 2
162
163[upgrade_soldier_hp_2]106[upgrade_soldier_hp_2]
164check_soldier=soldier hp 2107check_soldier=soldier hp 2
165sleep=30000108sleep=30000
@@ -167,13 +110,6 @@
167consume=warhelmet fish,meat:2 pittabread110consume=warhelmet fish,meat:2 pittabread
168train=soldier hp 2 3111train=soldier hp 2 3
169112
170[upgrade_hp_2]
171check_soldier=soldier hp 2
172sleep=30000
173check_soldier=soldier hp 2
174consume=warhelmet fish,meat:2 pittabread
175train=soldier hp 2 3
176
177[build]113[build]
178pics=trainingscamp_b_??.png # ???114pics=trainingscamp_b_??.png # ???
179hotspot=110 77115hotspot=110 77
180116
=== 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 @@
13 rt("text-align=right",p("font-size=10 font-style=italic", _[[Chief Chat’Karuth in a speech to his army.]])) ..13 rt("text-align=right",p("font-size=10 font-style=italic", _[[Chief Chat’Karuth in a speech to his army.]])) ..
14 --General Section14 --General Section
15 rt(h2(_"General")) ..15 rt(h2(_"General")) ..
16 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.") ..16 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.") ..
17 rt("<p font-weight=bold font-decoration=underline font-size=12>" .. _"Note:" .. "</p><p font-size=12>" ..17 rt("<p font-weight=bold font-decoration=underline font-size=12>" .. _"Note:" .. "</p><p font-size=12>" ..
18 _"Barbarian soldiers cannot be trained in ‘Defense’ and will remain at their initial level."18 _"Barbarian soldiers cannot be trained in ‘Defense’ and will remain at their initial level."
19 .. "<br><br></p>") ..19 .. "<br><br></p>") ..
2020
=== 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 @@
2727
28[programs]28[programs]
29sleep=_Sleep29sleep=_Sleep
30upgrade_soldier_evade_0=_Upgrade soldier evade 030upgrade_soldier_evade_0=_Upgrade soldier evade from level 0 to level 1
31upgrade_evade_0=_Upgrade soldier evade 0 (only for compatibility with old savegames (build13))
3231
33[sleep]32[sleep]
34sleep=500033sleep=5000
@@ -41,13 +40,6 @@
41consume=bread:2 fish,meat40consume=bread:2 fish,meat
42train=soldier evade 0 141train=soldier evade 0 1
4342
44[upgrade_evade_0]
45check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
46sleep=30000
47check_soldier=soldier evade 0 # Because the soldier can be expulsed by the player
48consume=bread:2 fish,meat
49train=soldier evade 0 1
50
51[inputs]43[inputs]
52bread=1044bread=10
53fish=645fish=6
5446
=== 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 @@
3333
34[programs]34[programs]
35sleep=_Sleep35sleep=_Sleep
36upgrade_soldier_evade_0=_Upgrade soldier evade 036upgrade_soldier_evade_0=_Upgrade soldier evade from level 0 to level 1
37upgrade_evade_0=_Upgrade soldier evade 0 (only for compatibility with old savegames (build13))37upgrade_soldier_evade_1=_Upgrade soldier evade from level 1 to level 2
38upgrade_soldier_evade_1=_Upgrade soldier evade 1
39upgrade_evade_1=_Upgrade soldier evade 1 (only for compatibility with old savegames (build13))
4038
41[sleep]39[sleep]
42sleep=500040sleep=5000
@@ -49,13 +47,6 @@
49consume=bread:2 fish,meat47consume=bread:2 fish,meat
50train=soldier evade 0 148train=soldier evade 0 1
5149
52[upgrade_evade_0]
53check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
54sleep=30000
55check_soldier=soldier evade 0 # Because the soldier can be expulsed by the player
56consume=bread:2 fish,meat
57train=soldier evade 0 1
58
59[upgrade_soldier_evade_1]50[upgrade_soldier_evade_1]
60check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade51check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
61sleep=3000052sleep=30000
@@ -63,13 +54,6 @@
63consume=bread:2 fish,meat:254consume=bread:2 fish,meat:2
64train=soldier evade 1 255train=soldier evade 1 2
6556
66[upgrade_evade_1]
67check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
68sleep=30000
69check_soldier=soldier evade 1 # Because the soldier can be expulsed by the player
70consume=bread:2 fish,meat:2
71train=soldier evade 1 2
72
73[idle]57[idle]
74pics=colosseum_i_??.png # ???58pics=colosseum_i_??.png # ???
75hotspot=81 10659hotspot=81 106
7660
=== 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 @@
2121
22[programs]22[programs]
23plant_wheat=_Plant wheat23plant_wheat=_Plant wheat
24plant=Plant wheat (only for compatibility with old savegames (build13))
25harvest_wheat=_Harvest wheat24harvest_wheat=_Harvest wheat
26harvest=Harvest wheat (only for compatibility with old savegames (build13))
27work=_Work25work=_Work
2826
29[plant_wheat]27[plant_wheat]
30sleep=14000 #orig 2000028sleep=14000 #orig 20000
31worker=plant29worker=plant
3230
33[plant]
34sleep=14000 #orig 20000
35worker=plant
36
37[harvest_wheat]31[harvest_wheat]
38sleep=4000 #orig 500032sleep=4000 #orig 5000
39worker=harvest33worker=harvest
4034
41[harvest]
42sleep=4000 #orig 5000
43worker=harvest
44
45[work]35[work]
46call=plant_wheat36call=plant_wheat
47call=harvest_wheat37call=harvest_wheat
4838
=== 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 @@
2424
25[programs]25[programs]
26mine_marble=_Mine marble26mine_marble=_Mine marble
27prog_marble=_Mine marble (only for compatibility with old savegames (build13))
28mine_stone=_Mine stone27mine_stone=_Mine stone
29prog_stone=_Mine stone (only for compatibility with old savegames (build13))
30work=_Work28work=_Work
3129
32[mine_marble]30[mine_marble]
@@ -39,16 +37,6 @@
39mine=granit 2 50 537mine=granit 2 50 5
40produce=marble stone38produce=marble stone
4139
42[prog_marble]
43sleep=20000
44consume=wine ration
45animate=working 20000
46mine=granit 2 50 5
47produce=marble:2
48animate=working 20000
49mine=granit 2 50 5
50produce=marble stone
51
52[mine_stone]40[mine_stone]
53sleep=2000041sleep=20000
54consume=ration wine42consume=ration wine
@@ -59,16 +47,6 @@
59mine=granit 2 50 547mine=granit 2 50 5
60produce=stone:248produce=stone:2
6149
62[prog_stone]
63sleep=20000
64consume=ration wine
65animate=working 20000
66mine=granit 2 50 5
67produce=stone marble
68animate=working 20000
69mine=granit 2 50 5
70produce=stone:2
71
72[work]50[work]
73call=mine_marble51call=mine_marble
74call=mine_stone52call=mine_stone
7553
=== 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 @@
1818
19[programs]19[programs]
20mine_stone=_Mine stone20mine_stone=_Mine stone
21stone=_Mine stone (only for compatibility with old savegames (build13))
22mine_marble=_Mine marble21mine_marble=_Mine marble
23marble=_Mine marble (only for compatibility with old savegames (build13))
24work=_Work22work=_Work
2523
26[mine_stone]24[mine_stone]
27sleep=2500025sleep=25000
28worker=cut_stone26worker=cut_stone
2927
30[stone]
31sleep=25000
32worker=cut_stone
33
34[mine_marble]28[mine_marble]
35sleep=2500029sleep=25000
36worker=cut_marble30worker=cut_marble
3731
38[marble]
39sleep=25000
40worker=cut_marble
41
42[work]32[work]
43call=mine_stone33call=mine_stone
44call=mine_stone34call=mine_stone
4535
=== 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 @@
4444
45[programs]45[programs]
46sleep=_Sleep46sleep=_Sleep
47upgrade_soldier_attack_0=_Upgrade soldier attack 047upgrade_soldier_attack_0=_Upgrade soldier attack from level 0 to level 1
48upgrade_attack_0=_Upgrade soldier attack 0 (only for compatibility with old savegames (build13))48upgrade_soldier_attack_1=_Upgrade soldier attack from level 1 to level 2
49upgrade_soldier_attack_1=_Upgrade soldier attack 149upgrade_soldier_attack_2=_Upgrade soldier attack from level 2 to level 3
50upgrade_attack_1=_Upgrade soldier attack 1 (only for compatibility with old savegames (build13))50upgrade_soldier_attack_3=_Upgrade soldier attack from level 3 to level 4
51upgrade_soldier_attack_2=_Upgrade soldier attack 251upgrade_soldier_hp_0=_Upgrade soldier health from level 0 to level 1
52upgrade_attack_2=_Upgrade soldier attack 2 (only for compatibility with old savegames (build13))52upgrade_soldier_hp_1=_Upgrade soldier health from level 1 to level 2
53upgrade_soldier_attack_3=_Upgrade soldier attack 353upgrade_soldier_hp_2=_Upgrade soldier health from level 2 to level 3
54upgrade_attack_3=_Upgrade soldier attack 3 (only for compatibility with old savegames (build13))54upgrade_soldier_hp_3=_Upgrade soldier health from level 3 to level 4
55upgrade_soldier_hp_0=_Upgrade soldier health 0
56upgrade_hp_0=_Upgrade soldier health 0 (only for compatibility with old savegames (build13))
57upgrade_soldier_hp_1=_Upgrade soldier health 1
58upgrade_hp_1=_Upgrade soldier health 1 (only for compatibility with old savegames (build13))
59upgrade_soldier_hp_2=_Upgrade soldier health 2
60upgrade_hp_2=_Upgrade soldier health 2 (only for compatibility with old savegames (build13))
61upgrade_soldier_hp_3=_Upgrade soldier health 3
62upgrade_hp_3=_Upgrade soldier health 3 (only for compatibility with old savegames (build13))
6355
64[sleep]56[sleep]
65sleep=500057sleep=5000
@@ -72,13 +64,6 @@
72consume=lance bread fish,meat64consume=lance bread fish,meat
73train=soldier attack 0 165train=soldier attack 0 1
7466
75[upgrade_attack_0]
76check_soldier=soldier attack 0 # Fails when aren't any soldier of level 0 attack
77sleep=30000
78check_soldier=soldier attack 0 # Because the soldier can be expulsed by the player
79consume=lance bread fish,meat
80train=soldier attack 0 1
81
82[upgrade_soldier_attack_1]67[upgrade_soldier_attack_1]
83check_soldier=soldier attack 168check_soldier=soldier attack 1
84sleep=3000069sleep=30000
@@ -86,13 +71,6 @@
86consume=advanced_lance bread fish,meat71consume=advanced_lance bread fish,meat
87train=soldier attack 1 272train=soldier attack 1 2
8873
89[upgrade_attack_1]
90check_soldier=soldier attack 1
91sleep=30000
92check_soldier=soldier attack 1
93consume=advanced_lance bread fish,meat
94train=soldier attack 1 2
95
96[upgrade_soldier_attack_2]74[upgrade_soldier_attack_2]
97check_soldier=soldier attack 275check_soldier=soldier attack 2
98sleep=3000076sleep=30000
@@ -100,13 +78,6 @@
100consume=heavy_lance bread fish,meat:278consume=heavy_lance bread fish,meat:2
101train=soldier attack 2 379train=soldier attack 2 3
10280
103[upgrade_attack_2]
104check_soldier=soldier attack 2
105sleep=30000
106check_soldier=soldier attack 2
107consume=heavy_lance bread fish,meat:2
108train=soldier attack 2 3
109
110[upgrade_soldier_attack_3]81[upgrade_soldier_attack_3]
111check_soldier=soldier attack 382check_soldier=soldier attack 3
112sleep=3000083sleep=30000
@@ -114,13 +85,6 @@
114consume=war_lance bread:2 fish,meat85consume=war_lance bread:2 fish,meat
115train=soldier attack 3 486train=soldier attack 3 4
11687
117[upgrade_attack_3]
118check_soldier=soldier attack 3
119sleep=30000
120check_soldier=soldier attack 3
121consume=war_lance bread:2 fish,meat
122train=soldier attack 3 4
123
124[upgrade_soldier_hp_0]88[upgrade_soldier_hp_0]
125check_soldier=soldier hp 089check_soldier=soldier hp 0
126sleep=3000090sleep=30000
@@ -128,13 +92,6 @@
128consume=helm bread,fish,meat92consume=helm bread,fish,meat
129train=soldier hp 0 193train=soldier hp 0 1
13094
131[upgrade_hp_0]
132check_soldier=soldier hp 0
133sleep=30000
134check_soldier=soldier hp 0
135consume=helm bread,fish,meat
136train=soldier hp 0 1
137
138[upgrade_soldier_hp_1]95[upgrade_soldier_hp_1]
139check_soldier=soldier hp 196check_soldier=soldier hp 1
140sleep=3000097sleep=30000
@@ -142,13 +99,6 @@
142consume=armour bread fish,meat99consume=armour bread fish,meat
143train=soldier hp 1 2100train=soldier hp 1 2
144101
145[upgrade_hp_1]
146check_soldier=soldier hp 1
147sleep=30000
148check_soldier=soldier hp 1
149consume=armour bread fish,meat
150train=soldier hp 1 2
151
152[upgrade_soldier_hp_2]102[upgrade_soldier_hp_2]
153check_soldier=soldier hp 2103check_soldier=soldier hp 2
154sleep=30000104sleep=30000
@@ -156,13 +106,6 @@
156consume=chain_armour bread:2 fish,meat:2106consume=chain_armour bread:2 fish,meat:2
157train=soldier hp 2 3107train=soldier hp 2 3
158108
159[upgrade_hp_2]
160check_soldier=soldier hp 2
161sleep=30000
162check_soldier=soldier hp 2
163consume=chain_armour bread:2 fish,meat:2
164train=soldier hp 2 3
165
166[upgrade_soldier_hp_3]109[upgrade_soldier_hp_3]
167check_soldier=soldier hp 3110check_soldier=soldier hp 3
168sleep=30000111sleep=30000
@@ -170,13 +113,6 @@
170consume=plate_armour bread:2 fish,meat:2113consume=plate_armour bread:2 fish,meat:2
171train=soldier hp 3 4114train=soldier hp 3 4
172115
173[upgrade_hp_3]
174check_soldier=soldier hp 3
175sleep=30000
176check_soldier=soldier hp 3
177consume=plate_armour bread:2 fish,meat:2
178train=soldier hp 3 4
179
180[idle]116[idle]
181pics=trainingscamp_i_??.png # ???117pics=trainingscamp_i_??.png # ???
182hotspot=82 105118hotspot=82 105
183119
=== 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 @@
2121
22[programs]22[programs]
23plant_vine=_Plant vine23plant_vine=_Plant vine
24plantvine=Plant vine (only for compatibility with old savegames (build13))
25harvest_vine=_Harvest vine24harvest_vine=_Harvest vine
26harvestvine=Harvest vine (only for compatibility with old savegames (build13))
27work=_Work25work=_Work
2826
29[plant_vine]27[plant_vine]
30sleep=2000028sleep=20000
31worker=plantvine29worker=plantvine
3230
33[plantvine]
34sleep=20000
35worker=plantvine
36
37[harvest_vine]31[harvest_vine]
38sleep=500032sleep=5000
39worker=harvestvine33worker=harvestvine
4034
41[harvestvine]
42sleep=5000
43worker=harvestvine
44
45[work]35[work]
46call=plant_vine36call=plant_vine
47call=harvest_vine37call=harvest_vine

Subscribers

People subscribed via source and target branches

to status/vote changes: