openttd/bee-reward
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: get the correct cargo id for use in goals text

Browse Source
This commit is contained in:
Andy
2015-01-01 08:13:08 +00:00
parent 524b958782
commit 3598257da7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
company.nut
View File

@@ -9,7 +9,7 @@ class CompanyGoal {
goal_id = null; // Number of the goal in OpenTTD goal window. goal_id = null; // Number of the goal in OpenTTD goal window.
timeout = null; // Timeout in ticks before the goal becomes obsolete. timeout = null; // Timeout in ticks before the goal becomes obsolete.
constructor(comp_id, cargo_id, accept, wanted_amount) { constructor(comp_id, cargo_id, accept, wanted_amount, cargoes) {
this.cargo_id = cargo_id; this.cargo_id = cargo_id;
this.accept = accept; this.accept = accept;
this.wanted_amount = wanted_amount; this.wanted_amount = wanted_amount;
@@ -26,7 +26,7 @@ class CompanyGoal {
destination_string = GSText(GSText.STR_INDUSTRY_NAME, destination); destination_string = GSText(GSText.STR_INDUSTRY_NAME, destination);
goal_type = GSGoal.GT_INDUSTRY; goal_type = GSGoal.GT_INDUSTRY;
} }
local goal_text = GSText(GSText.STR_COMPANY_GOAL, this.cargo_id, this.wanted_amount, destination_string); local goal_text = GSText(GSText.STR_COMPANY_GOAL, cargoes[this.cargo_id].cid, this.wanted_amount, destination_string);
this.goal_id = GSGoal.New(comp_id, goal_text, goal_type, destination); this.goal_id = GSGoal.New(comp_id, goal_text, goal_type, destination);
} }
@@ -120,7 +120,7 @@ class CompanyData {
} }
function GetMissingGoalCount(); function GetMissingGoalCount();
function AddActiveGoal(cargo_id, accept, amount); function AddActiveGoal(cargo_id, accept, amount, cargoes);
function HasGoal(cargo_id, accept); function HasGoal(cargo_id, accept);
function GetNumberOfGoalsForCargo(cargo_id); function GetNumberOfGoalsForCargo(cargo_id);
function IndustryClosed(ind_id); function IndustryClosed(ind_id);
@@ -160,11 +160,11 @@ function CompanyData::GetMissingGoalCount()
// @param cargo_id Cargo of the goal. // @param cargo_id Cargo of the goal.
// @param accept Accepting resource of the goal. // @param accept Accepting resource of the goal.
// @param amount Amount of cargo to deliver. // @param amount Amount of cargo to deliver.
function CompanyData::AddActiveGoal(cargo_id, accept, amount) function CompanyData::AddActiveGoal(cargo_id, accept, amount, cargoes)
{ {
foreach (num, goal in this.active_goals) { foreach (num, goal in this.active_goals) {
if (goal == null) { if (goal == null) {
this.active_goals[num] = CompanyGoal(this.comp_id, cargo_id, accept, amount); this.active_goals[num] = CompanyGoal(this.comp_id, cargo_id, accept, amount, cargoes);
break; break;
} }
} }

2
main.nut
View File

@@ -181,7 +181,7 @@ function BusyBeeClass::CreateChallenge(cid)
amount = 10 * 25 + 35 * 50 + (amount - 10 - 35) * 100; // 2000..7500 amount = 10 * 25 + 35 * 50 + (amount - 10 - 35) * 100; // 2000..7500
} }
if (cdata != null) { if (cdata != null) {
cdata.AddActiveGoal(cargo, accept, amount); cdata.AddActiveGoal(cargo, accept, amount, this.cargoes);
local destination_name; local destination_name;
if ("town" in accept) { if ("town" in accept) {