[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1530370-soldiers-lua into lp:widelands
Continuous integration builds have changed state: Travis build 937. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/120305987. Appveyor build 770. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1530370_soldiers_lua-770. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1530370-soldiers-lua/+merge/290800 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1530370-soldiers-lua into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535065-mapgen-user-feedback into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1535065-mapgen-user-feedback into lp:widelands.
Commit message:
After a random map has been generated, a message window will inform the player
that the player starting positions need to be checked.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1535065 in widelands: "Editor crashes with random map regarding player
positions + starting positions that are not viable"
https://bugs.launchpad.net/widelands/+bug/1535065
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1535065-mapgen-user-feedback/+merge/290803
Generating viable player starting positions is a hard problem, and I don't
think that we will ever be able to guarantee good starting positions 100% of
the time, and not for Build 19 in any case. So, I think we should go with a
message to the user for now.
I think the starting positions are still useful, because they will give the
player something to start from.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1535065-mapgen-user-feedback into lp:widelands.
=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc 2016-03-26 18:42:32 +
+++ src/editor/ui_menus/editor_main_menu_random_map.cc 2016-04-02 18:44:54 +
@@ -37,6 +37,7 @@
#include "logic/map.h"
#include "logic/map_objects/world/world.h"
#include "random/random.h"
+#include "ui_basic/messagebox.h"
#include "ui_basic/progresswindow.h"
using namespace Widelands;
@@ -426,6 +427,8 @@
}
void MainMenuNewRandomMap::clicked_create_map() {
+ ok_button_.set_enabled(false);
+ cancel_button_.set_enabled(false);
EditorInteractive & eia =
dynamic_cast(*get_parent());
Widelands::EditorGameBase & egbase = eia.egbase();
@@ -463,6 +466,18 @@
map.recalc_whole_map(egbase.world());
eia.map_changed(EditorInteractive::MapWas::kReplaced);
+ UI::WLMessageBox mbox
+ (&eia,
+ /** TRANSLATORS: Window title. This is shown after a random map has been created in the editor.*/
+ _("Random Map"),
+ /** TRANSLATORS: This is shown after a random map has been created in the editor. */
+ /** TRANSLATORS: You don't need to be literal with your translation, */
+ /** TRANSLATORS: as long as the user understands that he needs to check the player position.*/
+ _("The map has been generated. "
+"Please double-check the player starting positions to make sure that your carriers won’t drown, "
+"or be stuck on an island or on top of a mountain."),
+ UI::WLMessageBox::MBoxType::kOk);
+ mbox.run();
die();
}
___
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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1512151-load-small-map into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1512151-load-small-map into lp:widelands. Commit message: Set main view and selection to (0,0) when loading a new map in the editor. This fixes a crash when current coordinates were outside of the new maps's size. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1512151 in widelands: ""Assertion `c.x < width' failed" when loading smaller map in editor" https://bugs.launchpad.net/widelands/+bug/1512151 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1512151-load-small-map/+merge/290802 To reproduce the bug, load a big map in the editor and scroll the view left and up. Then open a small map. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1512151-load-small-map into lp:widelands. === modified file 'src/editor/editorinteractive.cc' --- src/editor/editorinteractive.cc 2016-04-02 07:33:57 + +++ src/editor/editorinteractive.cc 2016-04-02 18:40:59 + @@ -692,6 +692,14 @@ child->die(); } } + + // Make sure that we will start at coordinates (0,0). + mainview_move(0, 0); + set_sel_pos +(Widelands::NodeAndTriangle<> + (Widelands::Coords(0, 0), + Widelands::TCoords<> + (Widelands::Coords(0, 0), Widelands::TCoords<>::D))); break; case MapWas::kGloballyMutated: ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/spidercloth_menu_icon into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/spidercloth_menu_icon into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/spidercloth_menu_icon/+merge/290400 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/spidercloth_menu_icon into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/spidercloth_menu_icon into lp:widelands
We will probably get more feedback on this icon if it is merged. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/spidercloth_menu_icon/+merge/290400 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/spidercloth_menu_icon into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
T have retested this myself now, and since I don't expect any new bugs (famous last words...), I'm gonna merge. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1562332 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1562332 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1562332/+merge/290794 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1562332. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1562332 into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1562332/+merge/290794 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1562332. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1530370-soldiers-lua into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1530370-soldiers-lua into lp:widelands.
Commit message:
The soldier values in the warfare tutorial are now calculated from the actual
values. Added soldier values to worker help.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1530370 in widelands: "wrong text for the healing of garrisoned soldiers"
https://bugs.launchpad.net/widelands/+bug/1530370
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1530370-soldiers-lua/+merge/290800
See commit message.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1530370-soldiers-lua into lp:widelands.
=== modified file 'data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua'
--- data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua 2016-02-17 22:13:21 +
+++ data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua 2016-04-02 16:40:22 +
@@ -9,6 +9,10 @@
include "scripting/formatting.lua"
include "scripting/format_scenario.lua"
+-- We want the soldier here so we can get some actual stats.
+local tribe = wl.Game():get_tribe_description("barbarians")
+local soldier = wl.Game():get_worker_description(tribe.soldier)
+
-- =
-- Texts below
-- =
@@ -29,17 +33,24 @@
body = rt(
p(_[[A new soldier is created like a worker: when a military building needs a soldier, a carrier grabs the needed weapons and armor from a warehouse (or your headquarters) and walks up the road to your new building. Basic Barbarian soldiers do not use armor, they only need an ax.]]) ..
p(_[[Take a look at the soldiers that are on their way to our military buildings. They look different from normal workers: they have a health bar over their head that displays their remaining health, and they have four symbols, which symbolize the individual soldier’s current levels in the four different categories: health, attack, defense and evade.]]) ..
- p(_[[If a Barbarian soldier is fully trained, he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then! The individual abilities have the following meaning:]])
+ -- TRANSLATORS: the current stats are: 3 health, 5 attack, 0 defense, 2 evade.
+ p((_[[If a Barbarian soldier is fully trained, he has level %1% health, level %2% attack, level %3% defense and level %4% evade. This is one fearsome warrior then! The individual abilities have the following meaning:]]):bformat(soldier.max_health_level, soldier.max_attack_level, soldier.max_defense_level, soldier.max_evade_level))
) ..
- rt("image=tribes/workers/barbarians/soldier/health_level0.png", h2(_"Health:"))..
- rt(p(_[[The total life of a soldier. A Barbarian soldier starts with 130 health, and he will gain 28 health with each health level.]])) ..
+ rt("image=tribes/workers/barbarians/soldier/health_level0.png", h2(_"Health:")) ..
+ -- TRANSLATORS: the current stats are: 13000 health, 2800 health gain.
+ rt(p((_[[The total life of a soldier. A Barbarian soldier starts with %1% health, and he will gain %2% health with each health level.]]):bformat(soldier.base_health, soldier.health_incr_per_level))) ..
rt("image=tribes/workers/barbarians/soldier/attack_level0.png", h2(_"Attack:")) ..
- rt(p(_[[The amount of damage a soldier will inflict on the enemy when an attack is successful. A Barbarian soldier with attack level 0 inflicts ~14 points of health damage when he succeeds in hitting an enemy. For each attack level, he gains 7 damage points.]])) ..
+ -- TRANSLATORS: the current stats are: 1400 damage, gains 850 damage points.
+ rt(p(_[[The amount of damage a soldier will inflict on the enemy when an attack is successful. A Barbarian soldier with attack level 0 inflicts ~%1% points of health damage when he succeeds in hitting an enemy. For each attack level, he gains %2% damage points.]]):bformat(soldier.base_min_attack + (soldier.base_max_attack - soldier.base_min_attack) / 2, soldier.attack_incr_per_level)) ..
-- The Atlanteans' image, because the Barbarian one has a white background
rt("image=tribes/workers/atlanteans/soldier/defense_level0.png", h2(_"Defense:")) ..
- rt(p(_[[The defense is the percentage that is subtracted from the attack value. The Barbarians cannot train in this skill and therefore have always defense level 0, which means that the damage is always reduced by 3%. If an attacker with an attack value of 35 points hits a Barbarian soldier, the Barbarian will lose 35·0.97 = 34 health.]])) ..
+ -- TRANSLATORS: the current stats are: 3%. The calculated health value is 3395
+ -- TRANSLATORS: The last two %% after the placeholder are the percent symbol.
+ rt(p(_[[The defense is the percentage that is subtracted from the attack value. The Barbarians cannot train in this skill and therefore have always defense level 0, which means that the damage is always
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1422347-no-scenario-replays into lp:widelands
Continuous integration builds have changed state: Travis build 875. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/117286050. Appveyor build 708. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1422347_no_scenario_replays-708. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1422347-no-scenario-replays/+merge/289582 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1422347-no-scenario-replays. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1422347-no-scenario-replays into lp:widelands
Bunnybot encountered an error while working on this merge proposal: 'ascii' codec can't decode byte 0xe2 in position 27: ordinal not in range(128) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1422347-no-scenario-replays/+merge/289582 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1422347-no-scenario-replays. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1562332 into lp:widelands
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1562332/+merge/290794 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1562332. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/lua-driven-help into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/lua-driven-help. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands
Thanks for testing again and for the suggestion :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/lua-driven-help. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1562332 into lp:widelands
Bunnybot encountered an error while working on this merge proposal: Running 'bzr branch lp:~widelands-dev/widelands/bug-1562332 data/bzr_repo/_widelands_dev_widelands_bug_1562332' failed. Output: bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1562332/": location is a repository. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1562332/+merge/290794 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1562332 into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1562332 into lp:widelands
Bunnybot encountered an error while working on this merge proposal: Running 'bzr branch lp:~widelands-dev/widelands/bug-1562332 data/bzr_repo/_widelands_dev_widelands_bug_1562332' failed. Output: bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1562332/": location is a repository. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1562332/+merge/290794 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1562332 into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1562332 into lp:widelands
Bunnybot encountered an error while working on this merge proposal: Running 'bzr branch lp:~widelands-dev/widelands/bug-1562332 data/bzr_repo/_widelands_dev_widelands_bug_1562332' failed. Output: bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/bug-1562332/": location is a repository. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1562332/+merge/290794 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1562332 into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1562332 into lp:widelands
Klaus Halfmann has proposed merging lp:~widelands-dev/widelands/bug-1562332 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1562332 in widelands: "Crash in FullscreenMenuInternetLobby::fill_client_list" https://bugs.launchpad.net/widelands/+bug/1562332 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1562332/+merge/290794 This just fiexes the crash. Some more general Issues are adessed in #1434875 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1562332 into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands
Review: Approve testing I couldn't trigger the error anymore by open several programs/images and afterwards start this branch. So i think Miroslav has found and fixed the error :-) All looks good now and this would be a really great enhancement to widelands. There is only one small thing: The Readme in Main screen -> About contains the header/string: "Widelands Help You could find general help during game play or editor by using the help button in the main menu." I think we could add the F1 shortcut here and instead "Main Menu" we should call it "Bottom menu" :-) -- https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/lua-driven-help. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands
Review: Resubmit All the points that you raised should be fixed now :) -- https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/lua-driven-help. ___ 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
