GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1540827 into
lp:widelands.
Commit message:
Fixed bug with establishing smuggling routes in the Smugglers scenario.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1540827 in widelands: "Smugglers scenario needs testing"
https://bugs.launchpad.net/widelands/+bug/1540827
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1540827/+merge/290164
I only tested that the smuggling routes get established now.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1540827 into lp:widelands.
=== modified file 'data/maps/MP_Scenarios/Smugglers.wmf/scripting/smuggling.lua'
--- data/maps/MP_Scenarios/Smugglers.wmf/scripting/smuggling.lua 2016-01-28 05:24:34 +0000
+++ data/maps/MP_Scenarios/Smugglers.wmf/scripting/smuggling.lua 2016-03-26 09:22:28 +0000
@@ -10,7 +10,7 @@
-- Find a warehouse for in the given area
function find_warehouse(region)
for idx,f in ipairs(region) do
- if f.immovable and f.immovable.descr.type_name == "barbarians_warehouse" then
+ if f.immovable and f.immovable.descr.type_name == "warehouse" then
return f.immovable
end
end
@@ -47,10 +47,10 @@
end
if not send_whf.immovable or
- send_whf.immovable.descr.type_name ~= "barbarians_warehouse" or
+ send_whf.immovable.descr.type_name ~= "warehouse" or
send_whf.immovable.owner ~= send_plr or
not recv_whf.immovable or
- recv_whf.immovable.descr.type_name ~= "barbarians_warehouse" or
+ recv_whf.immovable.descr.type_name ~= "warehouse" or
recv_whf.immovable.owner ~= recv_plr
then
send_to_all(smuggling_route_broken:bformat(
_______________________________________________
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
