GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1556621-win-condition-translations into
lp:widelands.
Commit message:
Moved win condition helper scripts into win_conditions directory.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1556621 in widelands: "Catalogs with overlapping source file"
https://bugs.launchpad.net/widelands/+bug/1556621
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1556621-win-condition-translations/+merge/289019
This fixes the duplicate translations.
The scripts were in the superdirectory because we used to pick up any script
that was in the win_conditions directory as a win condition. Since we now have
an init.lua file to catalog the scripts, we don't need to keep the helper
scripts in the superdirectory any more.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1556621-win-condition-translations into
lp:widelands.
=== modified file 'data/scripting/win_conditions/artifacts.lua'
--- data/scripting/win_conditions/artifacts.lua 2016-01-23 13:47:48 +0000
+++ data/scripting/win_conditions/artifacts.lua 2016-03-15 08:46:20 +0000
@@ -3,12 +3,12 @@
-- =======================================================================
include "scripting/coroutine.lua" -- for sleep
-include "scripting/win_condition_functions.lua"
+include "scripting/win_conditions/win_condition_functions.lua"
include "scripting/formatting.lua"
set_textdomain("win_conditions")
-include "scripting/win_condition_texts.lua"
+include "scripting/win_conditions/win_condition_texts.lua"
local wc_name = "Artifacts"
-- This needs to be exactly like wc_name, but localized, because wc_name
=== modified file 'data/scripting/win_conditions/collectors.lua'
--- data/scripting/win_conditions/collectors.lua 2016-01-28 05:24:34 +0000
+++ data/scripting/win_conditions/collectors.lua 2016-03-15 08:46:20 +0000
@@ -7,11 +7,11 @@
include "scripting/formatting.lua"
include "scripting/format_scenario.lua"
include "scripting/table.lua"
-include "scripting/win_condition_functions.lua"
+include "scripting/win_conditions/win_condition_functions.lua"
set_textdomain("win_conditions")
-include "scripting/win_condition_texts.lua"
+include "scripting/win_conditions/win_condition_texts.lua"
local wc_name = "Collectors"
-- This needs to be exactly like wc_name, but localized, because wc_name
=== modified file 'data/scripting/win_conditions/defeat_all.lua'
--- data/scripting/win_conditions/defeat_all.lua 2016-01-28 05:24:34 +0000
+++ data/scripting/win_conditions/defeat_all.lua 2016-03-15 08:46:20 +0000
@@ -3,11 +3,11 @@
-- =======================================================================
include "scripting/coroutine.lua" -- for sleep
-include "scripting/win_condition_functions.lua"
+include "scripting/win_conditions/win_condition_functions.lua"
set_textdomain("win_conditions")
-include "scripting/win_condition_texts.lua"
+include "scripting/win_conditions/win_condition_texts.lua"
local wc_name = "Autocrat"
-- This needs to be exactly like wc_name, but localized, because wc_name
=== modified file 'data/scripting/win_conditions/endless_game.lua'
--- data/scripting/win_conditions/endless_game.lua 2016-01-28 05:24:34 +0000
+++ data/scripting/win_conditions/endless_game.lua 2016-03-15 08:46:20 +0000
@@ -3,11 +3,11 @@
-- =======================================================================
include "scripting/coroutine.lua" -- for sleep
-include "scripting/win_condition_functions.lua"
+include "scripting/win_conditions/win_condition_functions.lua"
set_textdomain("win_conditions")
-include "scripting/win_condition_texts.lua"
+include "scripting/win_conditions/win_condition_texts.lua"
local wc_name = "Endless Game"
-- This needs to be exactly like wc_name, but localized, because wc_name
=== modified file 'data/scripting/win_conditions/endless_game_fogless.lua'
--- data/scripting/win_conditions/endless_game_fogless.lua 2016-01-28 05:24:34 +0000
+++ data/scripting/win_conditions/endless_game_fogless.lua 2016-03-15 08:46:20 +0000
@@ -3,11 +3,11 @@
-- =======================================================================
include "scripting/coroutine.lua" -- for sleep
-include "scripting/win_condition_functions.lua"
+include "scripting/win_conditions/win_condition_functions.lua"
set_textdomain("win_conditions")
-include "scripting/win_condition_texts.lua"
+include "scripting/win_conditions/win_condition_texts.lua"
local wc_name = "Endless Game (no fog)"
-- This needs to be exactly like wc_name, but localized, because wc_name
=== modified file 'data/scripting/win_conditions/territorial_lord.lua'
--- data/scripting/win_conditions/territorial_lord.lua 2016-01-28 05:24:34 +0000
+++ data/scripting/win_conditions/territorial_lord.lua 2016-03-15 08:46:20 +0000
@@ -5,11 +5,11 @@
include "scripting/coroutine.lua" -- for sleep
include "scripting/messages.lua"
include "scripting/table.lua"
-include "scripting/win_condition_functions.lua"
+include "scripting/win_conditions/win_condition_functions.lua"
set_textdomain("win_conditions")
-include "scripting/win_condition_texts.lua"
+include "scripting/win_conditions/win_condition_texts.lua"
local wc_name = "Territorial Lord"
-- This needs to be exactly like wc_name, but localized, because wc_name
=== modified file 'data/scripting/win_conditions/territorial_time.lua'
--- data/scripting/win_conditions/territorial_time.lua 2016-01-28 05:24:34 +0000
+++ data/scripting/win_conditions/territorial_time.lua 2016-03-15 08:46:20 +0000
@@ -5,11 +5,11 @@
include "scripting/coroutine.lua" -- for sleep
include "scripting/messages.lua"
include "scripting/table.lua"
-include "scripting/win_condition_functions.lua"
+include "scripting/win_conditions/win_condition_functions.lua"
set_textdomain("win_conditions")
-include "scripting/win_condition_texts.lua"
+include "scripting/win_conditions/win_condition_texts.lua"
local wc_name = "Territorial Time"
-- This needs to be exactly like wc_name, but localized, because wc_name
=== renamed file 'data/scripting/win_condition_functions.lua' => 'data/scripting/win_conditions/win_condition_functions.lua'
=== renamed file 'data/scripting/win_condition_texts.lua' => 'data/scripting/win_conditions/win_condition_texts.lua'
=== modified file 'data/scripting/win_conditions/wood_gnome.lua'
--- data/scripting/win_conditions/wood_gnome.lua 2016-01-28 05:24:34 +0000
+++ data/scripting/win_conditions/wood_gnome.lua 2016-03-15 08:46:20 +0000
@@ -4,11 +4,11 @@
include "scripting/coroutine.lua" -- for sleep
include "scripting/table.lua"
-include "scripting/win_condition_functions.lua"
+include "scripting/win_conditions/win_condition_functions.lua"
set_textdomain("win_conditions")
-include "scripting/win_condition_texts.lua"
+include "scripting/win_conditions/win_condition_texts.lua"
local wc_name = "Wood Gnome"
-- This needs to be exactly like wc_name, but localized, because wc_name
=== modified file 'utils/buildcat.py'
--- utils/buildcat.py 2016-03-09 09:10:36 +0000
+++ utils/buildcat.py 2016-03-15 08:46:20 +0000
@@ -60,7 +60,6 @@
] ),
( "win_conditions/win_conditions", [
"../../data/scripting/win_conditions/*.lua",
- "../../data/scripting/win_condition_texts.lua",
]),
("world/world", [
"../../data/world/*.lua",
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
