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

[GunChleoc]

Barbarian stronghold is gone

=== removed directory 'global/militarysites/stronghold.barbarians'
=== removed file 'global/militarysites/stronghold.barbarians/conf'
--- global/militarysites/stronghold.barbarians/conf	2014-03-08 20:40:31 +0000
+++ global/militarysites/stronghold.barbarians/conf	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-size=medium
-max_soldiers=3
-heal_per_second=110
-conquers=7
-buildable=no
-prefer_heroes=false
-occupied_string=
-aggressor_string=Your Stronghold discovered an aggressor.
-attack_string=Your Stronghold is under attack.
-defeated_enemy_string=The enemy defeated your soldiers at the Stronghold
-defeated_you_string=Your soldiers defeated the enemy at the Stronghold
-
-
-[idle]
-pics=../../../tribes/barbarians/stronghold/stronghold_i_??.png
-hotspot=47 44
-playercolor=true
-fps=10
 
=== removed file 'global/militarysites/stronghold.barbarians/menu.png'
 Binary files global/militarysites/stronghold.barbarians/menu.png	2010-12-04 13:52:49 +0000 and global/militarysites/stronghold.barbarians/menu.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tribes/atlanteans/conf'
--- tribes/atlanteans/conf	2014-03-08 20:40:31 +0000
+++ tribes/atlanteans/conf	2014-03-10 09:17:08 +0000
@@ -150,7 +150,6 @@
 donjon.barbarians=_Donjon
 fortress.barbarians=_Fortress
 sentry.barbarians=_Sentry
-stronghold.barbarians=Stronghold
 sentry.empire=_Sentry
 barracks.empire=_Barracks
 barrier.empire=_Barrier
 
=== modified file 'tribes/barbarians/conf'
--- tribes/barbarians/conf	2014-03-09 21:33:54 +0000
+++ tribes/barbarians/conf	2014-03-10 09:17:08 +0000
@@ -219,7 +219,6 @@
 [militarysite types]
 barrier=_Barrier
 sentry=_Sentry
-stronghold=Stronghold
 citadel=_Citadel
 fortress=_Fortress
 donjon=_Donjon
 
=== removed directory 'tribes/barbarians/stronghold'
=== removed file 'tribes/barbarians/stronghold/conf'
--- tribes/barbarians/stronghold/conf	2014-03-08 20:40:31 +0000
+++ tribes/barbarians/stronghold/conf	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-size=medium
-max_soldiers=3
-heal_per_second=110
-conquers=7
-prefer_heroes=false
-occupied_string=Your soldiers have occupied your Stronghold
-aggressor_string=Your Stronghold discovered an aggressor.
-attack_string=Your Stronghold is under attack.
-defeated_enemy_string=The enemy defeated your soldiers at the Stronghold
-defeated_you_string=Your soldiers defeated the enemy at the Stronghold
-
-
-# Stronghold was removed from buildable buildings after Build15 and should be removed after Build18
-# See https://bugs.launchpad.net/widelands/+bug/695018#14
-buildable=no
-
-#enhancement=barrier
-#[buildcost]
-#blackwood=3
-#raw_stone=3
-
-[idle]
-pics=stronghold_i_??.png
-hotspot=45 41
-playercolor=true
-fps=10
-
-#[build]
-#pics=stronghold_b_??.png
-#hotspot=47 44
 
=== removed file 'tribes/barbarians/stronghold/help.lua'
--- tribes/barbarians/stronghold/help.lua	2012-03-17 22:22:38 +0000
+++ tribes/barbarians/stronghold/help.lua	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-use("aux", "formatting")
-use("aux", "format_help")
-
-set_textdomain("tribe_barbarians")
-
-return {
-	text =
-		rt("image=tribes/barbarians/constructionsite/idle_with_worker_00.png",p(_"The help text of this building is under construction."))
-}
 \ No newline at end of file
 
=== removed file 'tribes/barbarians/stronghold/menu.png'
 Binary files tribes/barbarians/stronghold/menu.png	2010-11-30 20:04:25 +0000 and tribes/barbarians/stronghold/menu.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_b_00.png'
 Binary files tribes/barbarians/stronghold/stronghold_b_00.png	2010-11-30 20:04:25 +0000 and tribes/barbarians/stronghold/stronghold_b_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_b_01.png'
 Binary files tribes/barbarians/stronghold/stronghold_b_01.png	2010-11-30 20:04:25 +0000 and tribes/barbarians/stronghold/stronghold_b_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_b_02.png'
 Binary files tribes/barbarians/stronghold/stronghold_b_02.png	2010-11-30 20:04:25 +0000 and tribes/barbarians/stronghold/stronghold_b_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_b_03.png'
 Binary files tribes/barbarians/stronghold/stronghold_b_03.png	2010-11-30 20:04:25 +0000 and tribes/barbarians/stronghold/stronghold_b_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_00.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_00.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_00_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_00_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_00_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_01.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_01.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_01.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_01_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_01_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_01_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_02.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_02.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_02.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_02_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_02_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_02_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_03.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_03.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_03.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_03_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_03_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_03_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_04.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_04.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_04.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_04_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_04_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_04_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_05.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_05.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_05.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_05_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_05_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_05_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_06.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_06.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_06.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_06_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_06_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_06_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_07.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_07.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_07.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_07_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_07_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_07_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_08.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_08.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_08.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_08_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_08_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_08_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_09.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_09.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_09.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_09_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_09_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_09_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_10.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_10.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_10.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_10_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_10_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_10_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_11.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_11.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_11.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_11_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_11_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_11_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_12.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_12.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_12.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_12_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_12_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_12_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_13.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_13.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_13.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_13_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_13_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_13_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_14.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_14.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_14.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_14_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_14_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_14_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_15.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_15.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_15.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_15_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_15_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_15_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_16.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_16.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_16.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_16_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_16_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_16_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_17.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_17.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_17.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_17_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_17_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_17_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_18.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_18.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_18.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_18_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_18_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_18_pc.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_19.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_19.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_19.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'tribes/barbarians/stronghold/stronghold_i_19_pc.png'
 Binary files tribes/barbarians/stronghold/stronghold_i_19_pc.png	2011-10-03 15:51:56 +0000 and tribes/barbarians/stronghold/stronghold_i_19_pc.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'tribes/empire/conf'
--- tribes/empire/conf	2014-03-08 20:40:31 +0000
+++ tribes/empire/conf	2014-03-10 09:17:08 +0000
@@ -157,7 +157,6 @@
 donjon.barbarians=_Donjon
 fortress.barbarians=_Fortress
 sentry.barbarians=_Sentry
-stronghold.barbarians=Stronghold
 
 [warehouse types]
 headquarters=_Headquarters