widelands

Merge lp:~widelands-dev/widelands/bug-1635932-trading-outpost-player-crash into lp:widelands

  1. bug-1635932-trading-outpost-player-crash
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8142
Proposed branch: lp:~widelands-dev/widelands/bug-1635932-trading-outpost-player-crash
Merge into: lp:widelands
Diff against target: 142 lines (+19/-22)
3 files modified
data/tribes/scripting/starting_conditions/atlanteans/trading_outpost.lua (+3/-4)
data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua (+11/-12)
data/tribes/scripting/starting_conditions/empire/trading_outpost.lua (+5/-6)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1635932-trading-outpost-player-crash
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+309088@code.launchpad.net

Commit message

Fixed crash with player number and bug with building names in Trading Outpost starting condition.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr branch lp:~widelands-dev/widelands/bug-1635932-trading-outpost-player-crash data/bzr_repo/_widelands_dev_widelands_bug_1635932_trading_outpost_player_crash' failed. Output:

bzr: ERROR: [Errno 122] Disk quota exceeded: u'/home/bunnybot/bunnybot/data/bzr_repo/_widelands_dev_widelands_bug_1635932_trading_outpost_player_crash/.bzr/checkout/limbo/new-13/world/critters/reindeer/reindeer_walk_w_10.png'

Revision history for this message
SirVer (sirver) wrote :

lgtm.

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr push :parent --overwrite' failed. Output:

Unable to obtain lock held by <email address hidden> on taotie (process #11861), acquired 67 hours, 24 minutes ago.
See "bzr help break-lock" for more.
bzr: ERROR: Could not acquire lock "(remote lock)": bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/trunk/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/scripting/starting_conditions/atlanteans/trading_outpost.lua'
2--- data/tribes/scripting/starting_conditions/atlanteans/trading_outpost.lua 2016-04-02 12:17:00 +0000
3+++ data/tribes/scripting/starting_conditions/atlanteans/trading_outpost.lua 2016-10-23 09:52:24 +0000
4@@ -108,11 +108,10 @@
5 })
6
7 -- Get all warehouse types
8- local plr = wl.Game().players[player.number]
9 local warehouse_types = {}
10- for i, building in ipairs(wl.Game():get_tribe_description(plr.tribe_name).buildings) do
11+ for i, building in ipairs(wl.Game():get_tribe_description(player.tribe_name).buildings) do
12 if (building.type_name == "warehouse") then
13- table.insert(warehouse_types, building_name)
14+ table.insert(warehouse_types, building.name)
15 end
16 end
17
18@@ -125,7 +124,7 @@
19 -- collect all ~warehouses and pick one to insert the wares
20 local warehouses = {}
21 for i, building_name in ipairs(warehouse_types) do
22- warehouses = array_combine(warehouses, plr:get_buildings(building_name))
23+ warehouses = array_combine(warehouses, player:get_buildings(building_name))
24 end
25
26 if #warehouses > 0 then
27
28=== modified file 'data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua'
29--- data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2016-04-02 12:17:00 +0000
30+++ data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2016-10-23 09:52:24 +0000
31@@ -99,11 +99,10 @@
32 })
33
34 -- Get all warehouse types
35- local plr = wl.Game().players[player.number]
36 local warehouse_types = {}
37- for i, building in ipairs(wl.Game():get_tribe_description(plr.tribe_name).buildings) do
38+ for i, building in ipairs(wl.Game():get_tribe_description(player.tribe_name).buildings) do
39 if (building.type_name == "warehouse") then
40- table.insert(warehouse_types, building_name)
41+ table.insert(warehouse_types, building.name)
42 end
43 end
44
45@@ -116,7 +115,7 @@
46 -- collect all ~warehouses and pick one to insert the wares
47 local warehouses = {}
48 for i, building_name in ipairs(warehouse_types) do
49- warehouses = array_combine(warehouses, plr:get_buildings(building_name))
50+ warehouses = array_combine(warehouses, player:get_buildings(building_name))
51 end
52
53 if #warehouses > 0 then
54@@ -129,23 +128,23 @@
55 local wh = warehouses[idx]
56 local added = 0
57
58- if plr:get_wares("water") < 40 + #warehouses * 10 then
59+ if player:get_wares("water") < 40 + #warehouses * 10 then
60 wh:set_wares("water", wh:get_wares("water") + 20 + #warehouses * 2)
61 added = added + 1
62 end
63- if plr:get_wares("log") < 40 + #warehouses * 10 then
64+ if player:get_wares("log") < 40 + #warehouses * 10 then
65 wh:set_wares("log", wh:get_wares("log") + 20)
66 added = added + 1
67 end
68- if plr:get_wares("granite") < 30 + #warehouses * 10 then
69+ if player:get_wares("granite") < 30 + #warehouses * 10 then
70 wh:set_wares("granite", wh:get_wares("granite") + 10 + #warehouses * 2)
71 added = added + 1
72 end
73- if plr:get_wares("coal") < 70 + #warehouses * 10 then
74+ if player:get_wares("coal") < 70 + #warehouses * 10 then
75 wh:set_wares("coal", wh:get_wares("coal") + 25 + #warehouses * 5)
76 added = added + 1
77 end
78- if plr:get_wares("iron_ore") < 30 + #warehouses * 10 then
79+ if player:get_wares("iron_ore") < 30 + #warehouses * 10 then
80 wh:set_wares("iron_ore", wh:get_wares("iron_ore") + 10 + #warehouses * 2)
81 added = added + 1
82 end
83@@ -153,15 +152,15 @@
84 wh:set_wares("fish", wh:get_wares("fish") + 10)
85 added = added + 1
86 end
87- if plr:get_wares("gold") < 20 + #warehouses * 5 then
88+ if player:get_wares("gold") < 20 + #warehouses * 5 then
89 wh:set_wares("gold", wh:get_wares("gold") + 3)
90 added = added + 1
91 end
92- if plr:get_wares("wheat") < 60 + #warehouses * 10 then
93+ if player:get_wares("wheat") < 60 + #warehouses * 10 then
94 wh:set_wares("wheat", wh:get_wares("wheat") + 15 + #warehouses * 2)
95 added = added + 1
96 end
97- if plr:get_wares("barbarians_bread") < 40 + #warehouses * 5 then
98+ if player:get_wares("barbarians_bread") < 40 + #warehouses * 5 then
99 wh:set_wares("barbarians_bread", wh:get_wares("barbarians_bread") + 8 + #warehouses * 2)
100 added = added + 1
101 end
102
103=== modified file 'data/tribes/scripting/starting_conditions/empire/trading_outpost.lua'
104--- data/tribes/scripting/starting_conditions/empire/trading_outpost.lua 2016-04-02 12:17:00 +0000
105+++ data/tribes/scripting/starting_conditions/empire/trading_outpost.lua 2016-10-23 09:52:24 +0000
106@@ -105,11 +105,10 @@
107 })
108
109 -- Get all warehouse types
110- local plr = wl.Game().players[player.number]
111 local warehouse_types = {}
112- for i, building in ipairs(wl.Game():get_tribe_description(plr.tribe_name).buildings) do
113+ for i, building in ipairs(wl.Game():get_tribe_description(player.tribe_name).buildings) do
114 if (building.type_name == "warehouse") then
115- table.insert(warehouse_types, building_name)
116+ table.insert(warehouse_types, building.name)
117 end
118 end
119
120@@ -122,7 +121,7 @@
121 -- collect all ~warehouses and pick one to insert the wares
122 local warehouses = {}
123 for i, building_name in ipairs(warehouse_types) do
124- warehouses = array_combine(warehouses, plr:get_buildings(building_name))
125+ warehouses = array_combine(warehouses, player:get_buildings(building_name))
126 end
127
128 if #warehouses > 0 then
129@@ -159,11 +158,11 @@
130 if wh:get_wares("gold") < 50 then
131 wh:set_wares("gold", wh:get_wares("gold") + 1)
132 end
133- if plr:get_wares("wheat") < 60 + #warehouses * 10 then
134+ if player:get_wares("wheat") < 60 + #warehouses * 10 then
135 wh:set_wares("wheat", wh:get_wares("wheat") + 10 + #warehouses * 2)
136 added = added + 1
137 end
138- if plr:get_wares("flour") < 30 + #warehouses * 10 then
139+ if player:get_wares("flour") < 30 + #warehouses * 10 then
140 wh:set_wares("flour", wh:get_wares("flour") + #warehouses * 5)
141 added = added + 1
142 end

Subscribers

People subscribed via source and target branches

to status/vote changes: