From 9394800c5ebe1c5262752e635414795c3113f9ff Mon Sep 17 00:00:00 2001 From: WKuchta Date: Sun, 23 Feb 2014 17:18:56 +0100 Subject: [PATCH 1/7] PL translation for campain of two brothers --- po/wesnoth-tb/pl.po | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/po/wesnoth-tb/pl.po b/po/wesnoth-tb/pl.po index b01b45a55a9d..3e62b6efcbc9 100644 --- a/po/wesnoth-tb/pl.po +++ b/po/wesnoth-tb/pl.po @@ -4,8 +4,8 @@ msgstr "" "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n" "POT-Creation-Date: 2012-12-07 20:59+0100\n" "PO-Revision-Date: 2012-01-21 18:12+0100\n" -"Last-Translator: Zbigniew Banach \n" -"Language-Team: \n" +"Last-Translator: Wojciech Kuchta \n" +"Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -182,6 +182,18 @@ msgid "" "spoken since that evil day at Toen Caric. If he will not come for me, " "perhaps he will return to aid our village in its hour of desperate need." msgstr "" +"Fragment dziennika Baranna z Maghre" +"\n" +"Gdybym tylko mógłbym spotkać tego „Mordaka”! Myślę, że moja magia może być" +"silniejsza niż jego. Ale on tylko rozkazuje z gór, dobrze strzeżony przez" +"jego służących więc muszę zmuszać chłopów do walki z jego sługami przy pomocy" +"mieczy i kijów. Potrzebuję mojego brata; on zawsze ma lepszą głowę do bitwy" +"niż ja.\n" +"\n" +"Czy usłyszał moje wołanie? Nie wiem czy zachował swój amulet; nie" +"rozmawialiśmy od czasu feralnego dnia w Toen Caric. Jeśli nie przybędzie" +"do mnie, to może powróci by pomóc naszej wiosce, która jest w wielkiej" +"potrzebie." #. [part] #: data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg:75 @@ -490,6 +502,19 @@ msgid "" "warning against it. Supposedly the place is haunted by lost souls who hunger " "for the living, and anyone who dies there is doomed to join them." msgstr "" +"Fragment dziennika Arvitha z Maghre\n" +"\n" +"Przez trzy dni poszukiwaliśmy Barrana i nic nie znaleźliśmy. Mój najlepszy" +"pomysł to wyprawa na północne granice, gdzie chowają się słudzy nekromanty," +"a wszystko pozostałe to tereny uprawne. Na początku myślałem, że" +"poszukiwania mogą być bezowocne, ale pod koniec pierwszego dnia znaleźliśmy" +"ślady. Niektóre z nich należały do szkieletów.\n" +"\n" +"Teraz jesteśmy dostatecznie blisko, abym był pewny: te ślady prowadzą do" +"lasów Grey Woods. Nikt z Maghre czy pozostałych wiosek nigdy nie udał się" +"do tych lasów. Opowieści przekazywane z pokolenia na pokolenie ostrzegały" +"przed tym. Prawdopodobnie to miejsce jest nawiedzone przez zagubione dusze" +"które polują na żywych ludzi i każdy kto tam umrze, dołączy do nich." #. [part] #: data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg:45 From 61701354520751da758e7cc23550db5f3436a9c9 Mon Sep 17 00:00:00 2001 From: mattsc Date: Mon, 3 Mar 2014 12:56:55 -0800 Subject: [PATCH 2/7] Add missing id attribute to RCA AI candidate action to_config() With this missing, certain combinations of actions/events would lead to the ids of all CAs being dropped (e.g. in saves after using [modify_ai]), which resulted in it not being possible to remove CAs any more as that is done by id. This fixes bug #21750. --- changelog | 5 +++++ src/ai/composite/rca.cpp | 1 + 2 files changed, 6 insertions(+) diff --git a/changelog b/changelog index 0a3f8d3756d6..9105ac59976a 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,9 @@ Version 1.11.11+dev: + * AI: + * Fixed a bug that made it impossible to change or delete Micro AIs after a + game had been reloaded (bug #21750). This was a general bug in the RCA AI + mechanism and applied to other CAs as well, but it was most visible in the + Micro AIs. * Language and i18n: * Updated translations: German diff --git a/src/ai/composite/rca.cpp b/src/ai/composite/rca.cpp index af06171009aa..56b2fb52c054 100644 --- a/src/ai/composite/rca.cpp +++ b/src/ai/composite/rca.cpp @@ -90,6 +90,7 @@ config candidate_action::to_config() const config cfg; cfg["enabled"] = enabled_; cfg["engine"] = engine_; + cfg["id"] = id_; cfg["name"] = name_; cfg["score"] = score_; cfg["max_score"] = max_score_; From c83045958b61523aa159fe689ca0a57578b3ea2e Mon Sep 17 00:00:00 2001 From: Alexander van Gessel Date: Mon, 3 Mar 2014 23:14:51 +0100 Subject: [PATCH 3/7] Initialize a variable --- src/minimap.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/minimap.cpp b/src/minimap.cpp index 0e9bd12483cc..767460f201af 100644 --- a/src/minimap.cpp +++ b/src/minimap.cpp @@ -168,6 +168,12 @@ surface getMinimap(int w, int h, const gamemap &map, const team *vw, const std:: } else { SDL_Color col; + std::map::const_iterator it = game_config::team_rgb_range.find(terrain_info.id()); + if (it == game_config::team_rgb_range.end()) { + col = create_color(0,0,0,0); + } else + col = int_to_color(it->second.rep()); + bool first = true; const t_translation::t_list& underlying_terrains = map.underlying_union_terrain(terrain); BOOST_FOREACH(const t_translation::t_terrain& underlying_terrain, underlying_terrains) { From c1c67f2a5715308d2c16e7c0bb1e3c5d726eba55 Mon Sep 17 00:00:00 2001 From: Alexander van Gessel Date: Mon, 3 Mar 2014 23:24:50 +0100 Subject: [PATCH 4/7] Run unit tests on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 28b285f77bdd..14c79019ca20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ install: - sudo apt-get update -qq - sudo apt-get install -qq libboost-iostreams-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev script: scons cxxtool=$CXX strict=True wesnoth wesnothd campaignd test +after_script: ./test notifications: email: false irc: From 62b287354f32155a587763d1ad463c733ce5f0f6 Mon Sep 17 00:00:00 2001 From: Alexander van Gessel Date: Tue, 4 Mar 2014 11:32:16 +0100 Subject: [PATCH 5/7] Fix Fisher-Yates implemenation of Lua helper.shuffle (bug #21706) --- changelog | 2 ++ data/lua/helper.lua | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index 9105ac59976a..07e089ebdeb2 100644 --- a/changelog +++ b/changelog @@ -6,6 +6,8 @@ Version 1.11.11+dev: Micro AIs. * Language and i18n: * Updated translations: German + * Miscellaneous and bug fixes: + * Fix Fisher-Yates implemenation of Lua helper.shuffle (bug #21706) Version 1.11.11: * Add-ons server: diff --git a/data/lua/helper.lua b/data/lua/helper.lua index bafa3100ad7f..3720962991b2 100644 --- a/data/lua/helper.lua +++ b/data/lua/helper.lua @@ -385,8 +385,8 @@ function helper.shuffle( t ) -- it uses the Fisher-Yates algorithm, also known as Knuth shuffle assert( type( t ) == "table", string.format( "helper.shuffle expects a table as parameter, got %s instead", type( t ) ) ) local length = #t - for index, value in ipairs( t ) do - local random = math.random( 1, length ) + for index = length, 2, -1 do + local random = math.random( 1, index ) t[index], t[random] = t[random], t[index] end end From 349253628d73e81db543a1b09034d1885d685d1a Mon Sep 17 00:00:00 2001 From: happygrue Date: Tue, 4 Mar 2014 12:32:58 -0500 Subject: [PATCH 6/7] Added missing scenario objective. Should not break string freeze as it is copied verbatim from the next scenario. --- changelog | 3 +++ .../scenarios/11_The_Court_of_Karrag.cfg | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index 07e089ebdeb2..9b5327074200 100644 --- a/changelog +++ b/changelog @@ -4,6 +4,9 @@ Version 1.11.11+dev: game had been reloaded (bug #21750). This was a general bug in the RCA AI mechanism and applied to other CAs as well, but it was most visible in the Micro AIs. + * Campaigns: + * The Hammer of Thursagan: + * Fixed missing objective in 'The Court of Karrag'. * Language and i18n: * Updated translations: German * Miscellaneous and bug fixes: diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg index db91e094ee3f..d0ba7b662e01 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg @@ -163,7 +163,11 @@ description=_"Death of Angarthing" condition="lose" [/objective] - + [objective] + description=_"Death of Dulcatulos" + condition="lose" + [/objective] + {TURNS_RUN_OUT} [gold_carryover] From f0246d3a19690ef6b57ee83e6d0128bd635d1c50 Mon Sep 17 00:00:00 2001 From: happygrue Date: Tue, 4 Mar 2014 12:48:51 -0500 Subject: [PATCH 7/7] Balance: Increased xp requirement for Rami, Saree --- changelog | 3 +++ data/core/units/khalifate/Rami.cfg | 2 +- data/core/units/khalifate/Saree.cfg | 2 +- players_changelog | 4 +++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index 9b5327074200..43b95dd3e03d 100644 --- a/changelog +++ b/changelog @@ -11,6 +11,9 @@ Version 1.11.11+dev: * Updated translations: German * Miscellaneous and bug fixes: * Fix Fisher-Yates implemenation of Lua helper.shuffle (bug #21706) + * Units: + * Increased the experience requirement for the Rami from 32 to 39 + * Increased the experience requirement for the Saree from 56 to 64 Version 1.11.11: * Add-ons server: diff --git a/data/core/units/khalifate/Rami.cfg b/data/core/units/khalifate/Rami.cfg index 3018eaadfe00..869c50b8fefc 100644 --- a/data/core/units/khalifate/Rami.cfg +++ b/data/core/units/khalifate/Rami.cfg @@ -7,7 +7,7 @@ hitpoints=34 movement_type=khalifatehorse movement=7 - experience=32 + experience=39 level=1 alignment=liminal advances_to=Qanas,Saree diff --git a/data/core/units/khalifate/Saree.cfg b/data/core/units/khalifate/Saree.cfg index e1afd97aae98..d55445030807 100644 --- a/data/core/units/khalifate/Saree.cfg +++ b/data/core/units/khalifate/Saree.cfg @@ -7,7 +7,7 @@ hitpoints=39 movement_type=khalifatehorse movement=8 - experience=56 + experience=64 level=2 alignment=liminal advances_to=Jawal diff --git a/players_changelog b/players_changelog index c34570c3eb7b..88b554e1a149 100644 --- a/players_changelog +++ b/players_changelog @@ -5,7 +5,9 @@ changelog: https://github.com/wesnoth/wesnoth/blob/master/changelog Version 1.11.11+dev: * Language and i18n: * Updated translations: German. - + * Units: + * Increased the experience requirement for the Rami from 32 to 39 + * Increased the experience requirement for the Saree from 56 to 64 Version 1.11.11: * Campaigns: