widelands-dev team mailing list archive

[Angelo Locritani <angelo.locritani@xxxxxxxxx>]

Angelo Locritani has proposed merging lp:~alocritani/widelands/bug585987 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #585987 in widelands: "Heal soldiers in warehouses and training sites"
  https://bugs.launchpad.net/widelands/+bug/585987

For more details, see:
https://code.launchpad.net/~alocritani/widelands/bug585987/+merge/89525

just a proposal: healing in warehouses and headquarters, not in training. Logic: when soldiers are idle, their health increases: while training they are "busy" doing other things so no healing.
-- 
https://code.launchpad.net/~alocritani/widelands/bug585987/+merge/89525
Your team Widelands Developers is requested to review the proposed merge of lp:~alocritani/widelands/bug585987 into lp:widelands.

=== modified file 'tribes/atlanteans/headquarters/conf'
--- tribes/atlanteans/headquarters/conf	2009-12-31 18:36:51 +0000
+++ tribes/atlanteans/headquarters/conf	2012-01-21 10:00:33 +0000
@@ -2,6 +2,7 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]

=== modified file 'tribes/atlanteans/warehouse/conf'
--- tribes/atlanteans/warehouse/conf	2011-09-12 17:29:32 +0000
+++ tribes/atlanteans/warehouse/conf	2012-01-21 10:00:33 +0000
@@ -1,4 +1,5 @@
 size=medium
+heal_per_second=2
 
 [buildcost]
 trunk=2

=== modified file 'tribes/barbarians/headquarters/conf'
--- tribes/barbarians/headquarters/conf	2010-11-23 19:33:08 +0000
+++ tribes/barbarians/headquarters/conf	2012-01-21 10:00:33 +0000
@@ -6,6 +6,7 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]

=== modified file 'tribes/barbarians/headquarters_interim/conf'
--- tribes/barbarians/headquarters_interim/conf	2011-09-12 17:29:32 +0000
+++ tribes/barbarians/headquarters_interim/conf	2012-01-21 10:00:33 +0000
@@ -4,6 +4,7 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]

=== modified file 'tribes/barbarians/warehouse/conf'
--- tribes/barbarians/warehouse/conf	2010-10-18 15:50:45 +0000
+++ tribes/barbarians/warehouse/conf	2012-01-21 10:00:33 +0000
@@ -1,4 +1,5 @@
 size=medium
+heal_per_second=2
 
 [buildcost]
 trunk=3

=== modified file 'tribes/empire/headquarters/conf'
--- tribes/empire/headquarters/conf	2010-08-01 14:35:38 +0000
+++ tribes/empire/headquarters/conf	2012-01-21 10:00:33 +0000
@@ -2,6 +2,7 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]

=== modified file 'tribes/empire/headquarters_shipwreck/conf'
--- tribes/empire/headquarters_shipwreck/conf	2011-09-12 17:29:32 +0000
+++ tribes/empire/headquarters_shipwreck/conf	2012-01-21 10:00:33 +0000
@@ -2,10 +2,11 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]
 # sfx=0 ../../../sound/spoken/warehouse-bringitin
 pics=headquarters_shipwreck_i_??.png
 hotspot=93 40
-playercolor=true
\ No newline at end of file
+playercolor=true

=== modified file 'tribes/empire/warehouse/conf'
--- tribes/empire/warehouse/conf	2010-08-01 14:35:38 +0000
+++ tribes/empire/warehouse/conf	2012-01-21 10:00:33 +0000
@@ -1,4 +1,5 @@
 size=medium
+heal_per_second=2
 
 [buildcost]
 trunk=2