Re: [Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-20 Thread wl-zocker
I deleted the lines and also took the freedom do delete an include. The game still runs and oxen and donkeys can be produced, so I hope it is all right. -- https://code.launchpad.net/~wl-zocker/widelands/bug-1341662/+merge/227395 Your team Widelands Developers is requested to review the proposed

Re: [Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-20 Thread GunChleoc
> I added the wildboar to map_generation.lua. It seems to work, so I probably > did the right thing :) Looks good to me > I noticed that some animals appear twice in the list. Is this to increase the > probability of their appearance or simply some leavings from the one_world > merge (that can b

Re: [Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-20 Thread wl-zocker
I added the wildboar to map_generation.lua. It seems to work, so I probably did the right thing :) I noticed that some animals appear twice in the list. Is this to increase the probability of their appearance or simply some leavings from the one_world merge (that can be removed)? Regarding src/l

Re: [Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-18 Thread GunChleoc
> I see no reason why the wildboar should not be in map_generation.lua. I did > not know of this file and now I know it, I do not understand it. That' because it was defined in the tribe rather than the world file I guess -- https://code.launchpad.net/~wl-zocker/widelands/bug-1341662/+merge/22739

Re: [Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-18 Thread wl-zocker
I see no reason why the wildboar should not be in map_generation.lua. I did not know of this file and now I know it, I do not understand it. -- https://code.launchpad.net/~wl-zocker/widelands/bug-1341662/+merge/227395 Your team Widelands Developers is requested to review the proposed merge of lp

Re: [Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-18 Thread GunChleoc
I did a bit of grepping... Do we want to add the wildboar to one of the critter lists in world/map_generation.lua? Do we still need to parse critters into the tribe? I found this line: src/logic/tribe.cc: PARSE_MAP_OBJECT_TYPES_BEGIN("critter bob") -- https://code.launchpa

[Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-18 Thread wl-zocker
The proposal to merge lp:~wl-zocker/widelands/bug-1341662 into lp:widelands has been updated. Description changed to: I moved the wildboar into world and deleted the barbarians/deer (gamekeeper now uses world/critter/stag). I also renamed the badger's idle files to have consecutive numbers. In

[Widelands-dev] [Merge] lp:~wl-zocker/widelands/bug-1341662 into lp:widelands

2014-07-18 Thread wl-zocker
wl-zocker has proposed merging lp:~wl-zocker/widelands/bug-1341662 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1341662 in widelands: "Remove the animals out of the Barbarian directory" https://bugs.launchpad.net/widelands/+bug/1341662 For m