widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/bug582905 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)


The initial fix for this problem added the ability to build a fisher's hut.
This patch will additionally add a fisher to the HQ, and edited the map a bit so there is fish in the water and some paths down to the water.
-- 
https://code.launchpad.net/~hjd/widelands/bug582905/+merge/39228
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/bug582905 into lp:widelands.

=== removed file 'campaigns/t02.wmf/binary/bob'
Binary files campaigns/t02.wmf/binary/bob	2010-02-17 21:17:15 +0000 and campaigns/t02.wmf/binary/bob	1970-01-01 00:00:00 +0000 differ
=== removed file 'campaigns/t02.wmf/binary/bob_data'
Binary files campaigns/t02.wmf/binary/bob_data	2010-02-17 21:17:15 +0000 and campaigns/t02.wmf/binary/bob_data	1970-01-01 00:00:00 +0000 differ
=== added file 'campaigns/t02.wmf/binary/exploration'
Binary files campaigns/t02.wmf/binary/exploration	1970-01-01 00:00:00 +0000 and campaigns/t02.wmf/binary/exploration	2010-10-24 19:11:20 +0000 differ
=== modified file 'campaigns/t02.wmf/binary/mapobjects'
Binary files campaigns/t02.wmf/binary/mapobjects	2010-02-17 21:17:15 +0000 and campaigns/t02.wmf/binary/mapobjects	2010-10-24 19:11:20 +0000 differ
=== added file 'campaigns/t02.wmf/binary/node_ownership'
Binary files campaigns/t02.wmf/binary/node_ownership	1970-01-01 00:00:00 +0000 and campaigns/t02.wmf/binary/node_ownership	2010-10-24 19:11:20 +0000 differ
=== removed file 'campaigns/t02.wmf/binary/owned_fields'
Binary files campaigns/t02.wmf/binary/owned_fields	2010-02-17 21:17:15 +0000 and campaigns/t02.wmf/binary/owned_fields	1970-01-01 00:00:00 +0000 differ
=== modified file 'campaigns/t02.wmf/binary/resource'
Binary files campaigns/t02.wmf/binary/resource	2010-02-17 21:17:15 +0000 and campaigns/t02.wmf/binary/resource	2010-10-24 19:11:20 +0000 differ
=== removed file 'campaigns/t02.wmf/binary/seen_fields'
Binary files campaigns/t02.wmf/binary/seen_fields	2010-02-17 21:17:15 +0000 and campaigns/t02.wmf/binary/seen_fields	1970-01-01 00:00:00 +0000 differ
=== modified file 'campaigns/t02.wmf/binary/terrain'
Binary files campaigns/t02.wmf/binary/terrain	2010-02-17 21:17:15 +0000 and campaigns/t02.wmf/binary/terrain	2010-10-24 19:11:20 +0000 differ
=== removed file 'campaigns/t02.wmf/binary/ware'
Binary files campaigns/t02.wmf/binary/ware	2010-02-17 21:17:15 +0000 and campaigns/t02.wmf/binary/ware	1970-01-01 00:00:00 +0000 differ
=== modified file 'campaigns/t02.wmf/scripting/starting_conditions.lua'
--- campaigns/t02.wmf/scripting/starting_conditions.lua	2010-09-22 17:50:53 +0000
+++ campaigns/t02.wmf/scripting/starting_conditions.lua	2010-10-24 19:11:20 +0000
@@ -47,6 +47,7 @@
    burner=1,
    carrier=40,
    ferner=1,
+   fisher=1,
    geologist=4,
    ["lime-burner"]=1,
    lumberjack=3,