widelands

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

  1. bug-1290123
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 6867
Proposed branch: lp:~widelands-dev/widelands/bug-1290123
Merge into: lp:widelands
Diff against target: 202 lines (+0/-60)
6 files modified
global/militarysites/stronghold.barbarians/conf (+0/-18)
tribes/atlanteans/conf (+0/-1)
tribes/barbarians/conf (+0/-1)
tribes/barbarians/stronghold/conf (+0/-30)
tribes/barbarians/stronghold/help.lua (+0/-9)
tribes/empire/conf (+0/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1290123
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+210156@code.launchpad.net

Description of the change

Barbarian stronghold is gone

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
1=== removed directory 'global/militarysites/stronghold.barbarians'
2=== removed file 'global/militarysites/stronghold.barbarians/conf'
3--- global/militarysites/stronghold.barbarians/conf 2014-03-08 20:40:31 +0000
4+++ global/militarysites/stronghold.barbarians/conf 1970-01-01 00:00:00 +0000
5@@ -1,18 +0,0 @@
6-size=medium
7-max_soldiers=3
8-heal_per_second=110
9-conquers=7
10-buildable=no
11-prefer_heroes=false
12-occupied_string=
13-aggressor_string=Your Stronghold discovered an aggressor.
14-attack_string=Your Stronghold is under attack.
15-defeated_enemy_string=The enemy defeated your soldiers at the Stronghold
16-defeated_you_string=Your soldiers defeated the enemy at the Stronghold
17-
18-
19-[idle]
20-pics=../../../tribes/barbarians/stronghold/stronghold_i_??.png
21-hotspot=47 44
22-playercolor=true
23-fps=10
24
25=== removed file 'global/militarysites/stronghold.barbarians/menu.png'
26Binary 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
27=== modified file 'tribes/atlanteans/conf'
28--- tribes/atlanteans/conf 2014-03-08 20:40:31 +0000
29+++ tribes/atlanteans/conf 2014-03-10 09:17:08 +0000
30@@ -150,7 +150,6 @@
31 donjon.barbarians=_Donjon
32 fortress.barbarians=_Fortress
33 sentry.barbarians=_Sentry
34-stronghold.barbarians=Stronghold
35 sentry.empire=_Sentry
36 barracks.empire=_Barracks
37 barrier.empire=_Barrier
38
39=== modified file 'tribes/barbarians/conf'
40--- tribes/barbarians/conf 2014-03-09 21:33:54 +0000
41+++ tribes/barbarians/conf 2014-03-10 09:17:08 +0000
42@@ -219,7 +219,6 @@
43 [militarysite types]
44 barrier=_Barrier
45 sentry=_Sentry
46-stronghold=Stronghold
47 citadel=_Citadel
48 fortress=_Fortress
49 donjon=_Donjon
50
51=== removed directory 'tribes/barbarians/stronghold'
52=== removed file 'tribes/barbarians/stronghold/conf'
53--- tribes/barbarians/stronghold/conf 2014-03-08 20:40:31 +0000
54+++ tribes/barbarians/stronghold/conf 1970-01-01 00:00:00 +0000
55@@ -1,30 +0,0 @@
56-size=medium
57-max_soldiers=3
58-heal_per_second=110
59-conquers=7
60-prefer_heroes=false
61-occupied_string=Your soldiers have occupied your Stronghold
62-aggressor_string=Your Stronghold discovered an aggressor.
63-attack_string=Your Stronghold is under attack.
64-defeated_enemy_string=The enemy defeated your soldiers at the Stronghold
65-defeated_you_string=Your soldiers defeated the enemy at the Stronghold
66-
67-
68-# Stronghold was removed from buildable buildings after Build15 and should be removed after Build18
69-# See https://bugs.launchpad.net/widelands/+bug/695018#14
70-buildable=no
71-
72-#enhancement=barrier
73-#[buildcost]
74-#blackwood=3
75-#raw_stone=3
76-
77-[idle]
78-pics=stronghold_i_??.png
79-hotspot=45 41
80-playercolor=true
81-fps=10
82-
83-#[build]
84-#pics=stronghold_b_??.png
85-#hotspot=47 44
86
87=== removed file 'tribes/barbarians/stronghold/help.lua'
88--- tribes/barbarians/stronghold/help.lua 2012-03-17 22:22:38 +0000
89+++ tribes/barbarians/stronghold/help.lua 1970-01-01 00:00:00 +0000
90@@ -1,9 +0,0 @@
91-use("aux", "formatting")
92-use("aux", "format_help")
93-
94-set_textdomain("tribe_barbarians")
95-
96-return {
97- text =
98- rt("image=tribes/barbarians/constructionsite/idle_with_worker_00.png",p(_"The help text of this building is under construction."))
99-}
100\ No newline at end of file
101
102=== removed file 'tribes/barbarians/stronghold/menu.png'
103Binary 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
104=== removed file 'tribes/barbarians/stronghold/stronghold_b_00.png'
105Binary 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
106=== removed file 'tribes/barbarians/stronghold/stronghold_b_01.png'
107Binary 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
108=== removed file 'tribes/barbarians/stronghold/stronghold_b_02.png'
109Binary 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
110=== removed file 'tribes/barbarians/stronghold/stronghold_b_03.png'
111Binary 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
112=== removed file 'tribes/barbarians/stronghold/stronghold_i_00.png'
113Binary 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
114=== removed file 'tribes/barbarians/stronghold/stronghold_i_00_pc.png'
115Binary 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
116=== removed file 'tribes/barbarians/stronghold/stronghold_i_01.png'
117Binary 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
118=== removed file 'tribes/barbarians/stronghold/stronghold_i_01_pc.png'
119Binary 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
120=== removed file 'tribes/barbarians/stronghold/stronghold_i_02.png'
121Binary 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
122=== removed file 'tribes/barbarians/stronghold/stronghold_i_02_pc.png'
123Binary 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
124=== removed file 'tribes/barbarians/stronghold/stronghold_i_03.png'
125Binary 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
126=== removed file 'tribes/barbarians/stronghold/stronghold_i_03_pc.png'
127Binary 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
128=== removed file 'tribes/barbarians/stronghold/stronghold_i_04.png'
129Binary 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
130=== removed file 'tribes/barbarians/stronghold/stronghold_i_04_pc.png'
131Binary 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
132=== removed file 'tribes/barbarians/stronghold/stronghold_i_05.png'
133Binary 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
134=== removed file 'tribes/barbarians/stronghold/stronghold_i_05_pc.png'
135Binary 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
136=== removed file 'tribes/barbarians/stronghold/stronghold_i_06.png'
137Binary 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
138=== removed file 'tribes/barbarians/stronghold/stronghold_i_06_pc.png'
139Binary 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
140=== removed file 'tribes/barbarians/stronghold/stronghold_i_07.png'
141Binary 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
142=== removed file 'tribes/barbarians/stronghold/stronghold_i_07_pc.png'
143Binary 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
144=== removed file 'tribes/barbarians/stronghold/stronghold_i_08.png'
145Binary 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
146=== removed file 'tribes/barbarians/stronghold/stronghold_i_08_pc.png'
147Binary 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
148=== removed file 'tribes/barbarians/stronghold/stronghold_i_09.png'
149Binary 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
150=== removed file 'tribes/barbarians/stronghold/stronghold_i_09_pc.png'
151Binary 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
152=== removed file 'tribes/barbarians/stronghold/stronghold_i_10.png'
153Binary 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
154=== removed file 'tribes/barbarians/stronghold/stronghold_i_10_pc.png'
155Binary 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
156=== removed file 'tribes/barbarians/stronghold/stronghold_i_11.png'
157Binary 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
158=== removed file 'tribes/barbarians/stronghold/stronghold_i_11_pc.png'
159Binary 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
160=== removed file 'tribes/barbarians/stronghold/stronghold_i_12.png'
161Binary 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
162=== removed file 'tribes/barbarians/stronghold/stronghold_i_12_pc.png'
163Binary 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
164=== removed file 'tribes/barbarians/stronghold/stronghold_i_13.png'
165Binary 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
166=== removed file 'tribes/barbarians/stronghold/stronghold_i_13_pc.png'
167Binary 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
168=== removed file 'tribes/barbarians/stronghold/stronghold_i_14.png'
169Binary 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
170=== removed file 'tribes/barbarians/stronghold/stronghold_i_14_pc.png'
171Binary 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
172=== removed file 'tribes/barbarians/stronghold/stronghold_i_15.png'
173Binary 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
174=== removed file 'tribes/barbarians/stronghold/stronghold_i_15_pc.png'
175Binary 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
176=== removed file 'tribes/barbarians/stronghold/stronghold_i_16.png'
177Binary 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
178=== removed file 'tribes/barbarians/stronghold/stronghold_i_16_pc.png'
179Binary 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
180=== removed file 'tribes/barbarians/stronghold/stronghold_i_17.png'
181Binary 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
182=== removed file 'tribes/barbarians/stronghold/stronghold_i_17_pc.png'
183Binary 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
184=== removed file 'tribes/barbarians/stronghold/stronghold_i_18.png'
185Binary 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
186=== removed file 'tribes/barbarians/stronghold/stronghold_i_18_pc.png'
187Binary 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
188=== removed file 'tribes/barbarians/stronghold/stronghold_i_19.png'
189Binary 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
190=== removed file 'tribes/barbarians/stronghold/stronghold_i_19_pc.png'
191Binary 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
192=== modified file 'tribes/empire/conf'
193--- tribes/empire/conf 2014-03-08 20:40:31 +0000
194+++ tribes/empire/conf 2014-03-10 09:17:08 +0000
195@@ -157,7 +157,6 @@
196 donjon.barbarians=_Donjon
197 fortress.barbarians=_Fortress
198 sentry.barbarians=_Sentry
199-stronghold.barbarians=Stronghold
200
201 [warehouse types]
202 headquarters=_Headquarters

Subscribers

People subscribed via source and target branches

to status/vote changes: