widelands

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

  1. bug-1342563
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 7118
Proposed branch: lp:~widelands-dev/widelands/bug-1342563
Merge into: lp:widelands
Diff against target: 131 lines (+10/-18)
10 files modified
campaigns/atl01.wmf/scripting/init.lua (+2/-2)
campaigns/tutorial01.wmf/scripting/init.lua (+2/-2)
tribes/atlanteans/scripting/sc00_headquarters.lua (+1/-1)
tribes/atlanteans/scripting/sc01_fortified_village.lua (+1/-1)
tribes/barbarians/conf (+0/-4)
tribes/barbarians/scripting/sc00_headquarters.lua (+1/-1)
tribes/barbarians/scripting/sc01_fortified_village.lua (+1/-1)
tribes/empire/conf (+0/-4)
tribes/empire/scripting/sc00_headquarters.lua (+1/-1)
tribes/empire/scripting/sc01_fortified_village.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1342563
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+226981@code.launchpad.net

Description of the change

Renamed a few strings for starting conditions

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

Rename the lua files too for consistency - so that all are named the same. Might need to grep() for the filenames to get all uses.

review: Needs Fixing
Revision history for this message
GunChleoc (gunchleoc) wrote :

Done :)

Revision history for this message
SirVer (sirver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'campaigns/atl01.wmf/scripting/init.lua'
2--- campaigns/atl01.wmf/scripting/init.lua 2014-07-15 10:02:22 +0000
3+++ campaigns/atl01.wmf/scripting/init.lua 2014-07-17 15:27:21 +0000
4@@ -88,8 +88,8 @@
5 p1:forbid_buildings{"shipyard"}
6
7 -- A default headquarters
8- include "tribes/atlanteans/scripting/sc00_headquarters_medium.lua"
9- init.func(p1) -- defined in sc00_headquarters_medium
10+ include "tribes/atlanteans/scripting/sc00_headquarters.lua"
11+ init.func(p1) -- defined in sc00_headquarters
12 set_textdomain("scenario_atl01.wmf")
13 local hq = wl.Game().map.player_slots[1].starting_field.immovable
14 hq:set_workers{shipwright=1}
15
16=== modified file 'campaigns/tutorial01.wmf/scripting/init.lua'
17--- campaigns/tutorial01.wmf/scripting/init.lua 2014-07-15 10:02:22 +0000
18+++ campaigns/tutorial01.wmf/scripting/init.lua 2014-07-17 15:27:21 +0000
19@@ -9,8 +9,8 @@
20 plr:allow_buildings("all")
21
22 -- A default headquarters
23-include "tribes/barbarians/scripting/sc00_headquarters_medium.lua"
24-init.func(plr) -- defined in sc00_headquarters_medium
25+include "tribes/barbarians/scripting/sc00_headquarters.lua"
26+init.func(plr) -- defined in sc00_headquarters
27
28 set_textdomain("scenario_tutorial01.wmf")
29
30
31=== renamed file 'tribes/atlanteans/scripting/sc00_headquarters_medium.lua' => 'tribes/atlanteans/scripting/sc00_headquarters.lua'
32--- tribes/atlanteans/scripting/sc00_headquarters_medium.lua 2014-03-25 06:18:48 +0000
33+++ tribes/atlanteans/scripting/sc00_headquarters.lua 2014-07-17 15:27:21 +0000
34@@ -7,7 +7,7 @@
35 set_textdomain("tribe_atlanteans")
36
37 init = {
38- name = _ "Headquarters medium",
39+ name = _ "Headquarters",
40 func = function(plr, shared_in_start)
41
42 local sf = wl.Game().map.player_slots[plr.number].starting_field
43
44=== renamed file 'tribes/atlanteans/scripting/sc01_castle_village.lua' => 'tribes/atlanteans/scripting/sc01_fortified_village.lua'
45--- tribes/atlanteans/scripting/sc01_castle_village.lua 2014-03-25 06:18:48 +0000
46+++ tribes/atlanteans/scripting/sc01_fortified_village.lua 2014-07-17 15:27:21 +0000
47@@ -7,7 +7,7 @@
48 set_textdomain("tribe_atlanteans")
49
50 return {
51- name = _ "Castle village",
52+ name = _ "Fortified Village",
53 func = function(plr, shared_in_start)
54
55 local sf = wl.Game().map.player_slots[plr.number].starting_field
56
57=== modified file 'tribes/barbarians/conf'
58--- tribes/barbarians/conf 2014-07-03 07:36:22 +0000
59+++ tribes/barbarians/conf 2014-07-17 15:27:21 +0000
60@@ -211,7 +211,3 @@
61 [trainingsite types]
62 battlearena=_Battle Arena
63 trainingcamp=_Training Camp
64-
65-[initializations]
66-headquarters_medium=_Headquarters Medium
67-castle_village=_Citadel Village
68
69=== renamed file 'tribes/barbarians/scripting/sc00_headquarters_medium.lua' => 'tribes/barbarians/scripting/sc00_headquarters.lua'
70--- tribes/barbarians/scripting/sc00_headquarters_medium.lua 2014-03-25 06:18:48 +0000
71+++ tribes/barbarians/scripting/sc00_headquarters.lua 2014-07-17 15:27:21 +0000
72@@ -7,7 +7,7 @@
73 set_textdomain("tribe_barbarians")
74
75 init = {
76- name = _ "Headquarters medium",
77+ name = _ "Headquarters",
78 func = function(player, shared_in_start)
79
80 local sf = wl.Game().map.player_slots[player.number].starting_field
81
82=== renamed file 'tribes/barbarians/scripting/sc01_citadel_village.lua' => 'tribes/barbarians/scripting/sc01_fortified_village.lua'
83--- tribes/barbarians/scripting/sc01_citadel_village.lua 2014-03-25 06:18:48 +0000
84+++ tribes/barbarians/scripting/sc01_fortified_village.lua 2014-07-17 15:27:21 +0000
85@@ -7,7 +7,7 @@
86 set_textdomain("tribe_barbarians")
87
88 return {
89- name = _ "Citadel village",
90+ name = _ "Fortified Village",
91 func = function(plr, shared_in_start)
92
93 local sf = wl.Game().map.player_slots[plr.number].starting_field
94
95=== modified file 'tribes/empire/conf'
96--- tribes/empire/conf 2014-07-03 07:36:22 +0000
97+++ tribes/empire/conf 2014-07-17 15:27:21 +0000
98@@ -212,7 +212,3 @@
99 colosseum=_Colosseum
100 arena=_Arena
101 trainingcamp=_Training Camp
102-
103-[initializations]
104-headquarters_medium=_Headquarters Medium
105-castle_village=_Castle Village
106
107=== renamed file 'tribes/empire/scripting/sc00_headquarters_medium.lua' => 'tribes/empire/scripting/sc00_headquarters.lua'
108--- tribes/empire/scripting/sc00_headquarters_medium.lua 2014-03-25 06:18:48 +0000
109+++ tribes/empire/scripting/sc00_headquarters.lua 2014-07-17 15:27:21 +0000
110@@ -7,7 +7,7 @@
111 set_textdomain("tribe_empire")
112
113 return {
114- name = _ "Headquarters medium",
115+ name = _ "Headquarters",
116 func = function(p, shared_in_start)
117
118 local sf = wl.Game().map.player_slots[p.number].starting_field
119
120=== renamed file 'tribes/empire/scripting/sc01_castle_village.lua' => 'tribes/empire/scripting/sc01_fortified_village.lua'
121--- tribes/empire/scripting/sc01_castle_village.lua 2014-03-25 06:18:48 +0000
122+++ tribes/empire/scripting/sc01_fortified_village.lua 2014-07-17 15:27:21 +0000
123@@ -7,7 +7,7 @@
124 set_textdomain("tribe_empire")
125
126 return {
127- name = _ "Castle village",
128+ name = _ "Fortified Village",
129 func = function(plr, shared_in_start)
130
131 local sf = wl.Game().map.player_slots[plr.number].starting_field

Subscribers

People subscribed via source and target branches

to status/vote changes: