Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands
The 'CommentPragmas:' in the file '.clang-format' does work. But it only applies to a line and not a codeblock. According to the documentation this is needed: // clang-format off some code that must not be formatted // clang-format on -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
Should be alright, now. If nobody objects I would merge this branch into trunk. -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
Continuous integration builds have changed state: Travis build 4344. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/468835505. Appveyor build 4138. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_hint_debug-4138. -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
Continuous integration builds have changed state: Travis build 4343. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/468776979. Appveyor build 4137. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_hint_debug-4137. -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
This line is a Lua comment, so it needs to start with --
> + "createware=meat",
> + "return"
>}
> */
> void WorkerProgram::parse_removeobject(Worker::Action* act, const
> std::vector&) {
> @@ -806,7 +833,7 @@
> "playsound=sound/hammering geologist_hammer 192",
> "animate=hacking 3000",
> "findresources" -- Plant a resource marker at the current location,
> according to what has
> -been found.
> + been found.
This line is a Lua comment, so it needs to start with --
>}
> */
> void WorkerProgram::parse_findresources(Worker::Action* act, const
> std::vector& cmd) {
> @@ -895,9 +922,13 @@
>buildship = {
> "walk=object-or-coords", -- Walk to coordinates from 1. or to
> object from 2.
> "plant=attrib:shipconstruction unless object", -- 2. This will
> create an object for us if
> -we don't have one yet "playsound=sound/sawmill sawmill 230", "animate=work
> 500", "construct", -- 1.
> -Add the current ware to the shipconstruction. This will find a space for us
> if no shipconstruction
> -object has been planted yet "animate=work 5000", "return"
> + we don't have one yet
This line is a Lua comment, so it needs to start with --
> + "playsound=sound/sawmill sawmill 230",
> + "animate=work 500",
> + "construct", -- 1. Add the current ware to the shipconstruction.
> This will find a space for
> + us if no shipconstruction object has been planted yet
This line is a Lua comment, so it needs to start with --
> + "animate=work 5000",
> + "return"
>},
> */
> /**
--
https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
Continuous integration builds have changed state: Travis build 4340. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/468217701. Appveyor build 4135. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_hint_debug-4135. -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
Continuous integration builds have changed state: Travis build 4339. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/468090637. Appveyor build 4134. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_hint_debug-4134. -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
Maybe the regular expression for 'CommentPragmas:' in the file '.clang-format' (in the base directory) has to be adjusted? -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
This happens when running clang_format: it breaks lines at column 100. Since you are on it: Please make sure the indented lines do not exceed the limit of 100 characters again. Otherwise they will break sphinx again after running clang-format. Thanks :-) -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands has been updated. Description changed to: Debug builds on travis are failing, because of erroneous indents. This should fix it. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands has been updated. Commit message changed to: set correct indent for documentation For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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/ai-hint-debug into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/ai-hint-debug
into lp:widelands.
Commit message:
set correct indent in ai_hints.cc for documentation
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943
Debug builds on travis are failing, because of 2 missing indents. This should
fix it.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands.
=== modified file 'src/ai/ai_hints.cc'
--- src/ai/ai_hints.cc 2018-12-13 07:24:01 +
+++ src/ai/ai_hints.cc 2018-12-14 15:08:24 +
@@ -138,7 +138,7 @@
**collects_ware_from_map**
The building will generate this ware from the map, e.g. a well mining the ``water`` ware,
or the hunter returning from the hunt with the ``meat`` ware. The same ware needs also to be
-listed as the first one of the building's outputs, e.g.::
+listed as the first one of the building's outputs, e.g.::
aihints = {
collects_ware_from_map = "meat"
@@ -151,7 +151,7 @@
**Note:** The AI expects exactly one such building type for each of the following wares:
``fish`` (fisher), ``granite`` (quarry), ``log`` (lumberjack/woodcutter), ``meat`` (hunter),
-``water`` (well).
+``water`` (well).
**mines**
The building will mine to obtain the given ware, e.g.::
___
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/ai-hint-debug into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands has been updated. Description changed to: Debug builds on travis are failing, because of 2 missing indents. This should fix it. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug 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
