gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r15483) -Change [API CHANGE]: Remove AIIndustry::GetProduction, use AIIndustry::GetLastMonthProduction instead.

Browse Source
This commit is contained in:
yexo 2009-02-14 21:05:57 +00:00
parent 92fc2e692c
commit 7fdde2fec0
5 changed files with 205 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/ai/regression/regression.nut
View File

@ -550,12 +550,11 @@ function Regression::Industry()
print(" IsValidIndustry(): " + AIIndustry.IsValidIndustry(i)); print(" IsValidIndustry(): " + AIIndustry.IsValidIndustry(i));
print(" GetName(): " + AIIndustry.GetName(i)); print(" GetName(): " + AIIndustry.GetName(i));
print(" GetLocation(): " + AIIndustry.GetLocation(i)); print(" GetLocation(): " + AIIndustry.GetLocation(i));
print(" GetProduction(): " + AIIndustry.GetProduction(i, 1));
print(" IsCargoAccepted(): " + AIIndustry.IsCargoAccepted(i, 1)); print(" IsCargoAccepted(): " + AIIndustry.IsCargoAccepted(i, 1));
local cargo_list = AICargoList(); local cargo_list = AICargoList();
for (local j = cargo_list.Begin(); cargo_list.HasNext(); j = cargo_list.Next()) { for (local j = cargo_list.Begin(); cargo_list.HasNext(); j = cargo_list.Next()) {
if (AIIndustry.GetProduction(i, j) > 0) { if (AIIndustry.IsCargoAccepted(i, j) || AIIndustry.GetLastMonthProduction(i,j) >= 0) {
print(" GetLastMonthProduction(): " + AIIndustry.GetLastMonthProduction(i, j)); print(" GetLastMonthProduction(): " + AIIndustry.GetLastMonthProduction(i, j));
print(" GetLastMonthTransported(): " + AIIndustry.GetLastMonthTransported(i, j)); print(" GetLastMonthTransported(): " + AIIndustry.GetLastMonthTransported(i, j));
print(" GetStockpiledCargo(): " + AIIndustry.GetStockpiledCargo(i, j)); print(" GetStockpiledCargo(): " + AIIndustry.GetStockpiledCargo(i, j));
@ -598,14 +597,6 @@ function Regression::IndustryList()
for (local i = list.Begin(); list.HasNext(); i = list.Next()) { for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
print(" " + i + " => " + list.GetValue(i)); print(" " + i + " => " + list.GetValue(i));
} }
list.Valuate(AIIndustry.GetProduction, 1);
list.KeepAboveValue(50);
print(" KeepAboveValue(50): done");
print(" Count(): " + list.Count());
print(" Production ListDump:");
for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
print(" " + i + " => " + list.GetValue(i));
}
list = AIIndustryList_CargoAccepting(1); list = AIIndustryList_CargoAccepting(1);
print("--IndustryList_CargoAccepting--"); print("--IndustryList_CargoAccepting--");

289
bin/ai/regression/regression.txt
View File

@ -5066,19 +5066,22 @@
IsValidIndustry(): false IsValidIndustry(): false
GetName(): (null : 0x00000000) GetName(): (null : 0x00000000)
GetLocation(): -1 GetLocation(): -1
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
Industry 0 Industry 0
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Kennville Oil Refinery GetName(): Kennville Oil Refinery
GetLocation(): 19695 GetLocation(): 19695
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 1 Industry 1
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Sadtown Forest GetName(): Sadtown Forest
GetLocation(): 45122 GetLocation(): 45122
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 72 GetLastMonthProduction(): 72
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5087,7 +5090,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Fudinghattan Forest GetName(): Fudinghattan Forest
GetLocation(): 41929 GetLocation(): 41929
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 108 GetLastMonthProduction(): 108
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5096,7 +5098,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Benville Forest GetName(): Benville Forest
GetLocation(): 44640 GetLocation(): 44640
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 80 GetLastMonthProduction(): 80
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5105,7 +5106,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Netfingbridge Forest GetName(): Netfingbridge Forest
GetLocation(): 8793 GetLocation(): 8793
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 135 GetLastMonthProduction(): 135
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5114,7 +5114,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Hutfingford Forest GetName(): Hutfingford Forest
GetLocation(): 55429 GetLocation(): 55429
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 99 GetLastMonthProduction(): 99
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5123,7 +5122,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Great Hinninghall Forest GetName(): Great Hinninghall Forest
GetLocation(): 6533 GetLocation(): 6533
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 72 GetLastMonthProduction(): 72
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5132,7 +5130,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Tondston Forest GetName(): Tondston Forest
GetLocation(): 27609 GetLocation(): 27609
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 115 GetLastMonthProduction(): 115
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5141,49 +5138,83 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Planfield Sawmill GetName(): Planfield Sawmill
GetLocation(): 17318 GetLocation(): 17318
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
Industry 9 Industry 9
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Hutfingford Sawmill GetName(): Hutfingford Sawmill
GetLocation(): 60050 GetLocation(): 60050
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
Industry 10 Industry 10
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Naborough Sawmill GetName(): Naborough Sawmill
GetLocation(): 54184 GetLocation(): 54184
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
Industry 11 Industry 11
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Prundinghall Sawmill GetName(): Prundinghall Sawmill
GetLocation(): 48499 GetLocation(): 48499
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
Industry 12 Industry 12
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Fraston Sawmill GetName(): Fraston Sawmill
GetLocation(): 51419 GetLocation(): 51419
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
Industry 13 Industry 13
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Fort Frindston Sawmill GetName(): Fort Frindston Sawmill
GetLocation(): 15950 GetLocation(): 15950
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
Industry 14 Industry 14
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Grinnway Sawmill GetName(): Grinnway Sawmill
GetLocation(): 20001 GetLocation(): 20001
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
Industry 15 Industry 15
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Trenningville Coal Mine GetName(): Trenningville Coal Mine
GetLocation(): 51854 GetLocation(): 51854
GetProduction(): 104
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 126 GetLastMonthProduction(): 126
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5192,7 +5223,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Kennville Coal Mine GetName(): Kennville Coal Mine
GetLocation(): 11734 GetLocation(): 11734
GetProduction(): 88
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 99 GetLastMonthProduction(): 99
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5201,7 +5231,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Great Hinninghall Coal Mine GetName(): Great Hinninghall Coal Mine
GetLocation(): 13947 GetLocation(): 13947
GetProduction(): 152
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 171 GetLastMonthProduction(): 171
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5210,7 +5239,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Little Fruford Coal Mine GetName(): Little Fruford Coal Mine
GetLocation(): 23682 GetLocation(): 23682
GetProduction(): 112
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 126 GetLastMonthProduction(): 126
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5219,7 +5247,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Hutfingford Coal Mine GetName(): Hutfingford Coal Mine
GetLocation(): 57429 GetLocation(): 57429
GetProduction(): 88
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 99 GetLastMonthProduction(): 99
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5228,7 +5255,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Mendingston Coal Mine GetName(): Mendingston Coal Mine
GetLocation(): 8562 GetLocation(): 8562
GetProduction(): 152
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 171 GetLastMonthProduction(): 171
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5237,7 +5263,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Tondston Coal Mine GetName(): Tondston Coal Mine
GetLocation(): 29147 GetLocation(): 29147
GetProduction(): 104
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 117 GetLastMonthProduction(): 117
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5246,7 +5271,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Quartfingfield Coal Mine GetName(): Quartfingfield Coal Mine
GetLocation(): 27822 GetLocation(): 27822
GetProduction(): 136
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 153 GetLastMonthProduction(): 153
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5255,7 +5279,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Muningville Coal Mine GetName(): Muningville Coal Mine
GetLocation(): 43035 GetLocation(): 43035
GetProduction(): 80
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 90 GetLastMonthProduction(): 90
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5264,7 +5287,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Grinnway Coal Mine GetName(): Grinnway Coal Mine
GetLocation(): 17943 GetLocation(): 17943
GetProduction(): 32
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 40 GetLastMonthProduction(): 40
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5273,49 +5295,62 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Sadtown Power Station GetName(): Sadtown Power Station
GetLocation(): 48182 GetLocation(): 48182
GetProduction(): -1
IsCargoAccepted(): true IsCargoAccepted(): true
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 26 Industry 26
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Tunford Power Station GetName(): Tunford Power Station
GetLocation(): 33934 GetLocation(): 33934
GetProduction(): -1
IsCargoAccepted(): true IsCargoAccepted(): true
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 27 Industry 27
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Quartfingfield Power Station GetName(): Quartfingfield Power Station
GetLocation(): 23714 GetLocation(): 23714
GetProduction(): -1
IsCargoAccepted(): true IsCargoAccepted(): true
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 28 Industry 28
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Kennville Power Station GetName(): Kennville Power Station
GetLocation(): 20170 GetLocation(): 20170
GetProduction(): -1
IsCargoAccepted(): true IsCargoAccepted(): true
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 29 Industry 29
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Nuntfingburg Power Station GetName(): Nuntfingburg Power Station
GetLocation(): 6685 GetLocation(): 6685
GetProduction(): -1
IsCargoAccepted(): true IsCargoAccepted(): true
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 30 Industry 30
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Bedburg Power Station GetName(): Bedburg Power Station
GetLocation(): 29022 GetLocation(): 29022
GetProduction(): -1
IsCargoAccepted(): true IsCargoAccepted(): true
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 31 Industry 31
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Benville Power Station GetName(): Benville Power Station
GetLocation(): 44160 GetLocation(): 44160
GetProduction(): -1
IsCargoAccepted(): true IsCargoAccepted(): true
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 32 Industry 32
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Fort Frindston Oil Wells GetName(): Fort Frindston Oil Wells
GetLocation(): 14701 GetLocation(): 14701
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 108 GetLastMonthProduction(): 108
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5324,7 +5359,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Nuntfingburg Oil Wells GetName(): Nuntfingburg Oil Wells
GetLocation(): 5659 GetLocation(): 5659
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 40 GetLastMonthProduction(): 40
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5333,7 +5367,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Benville Oil Wells GetName(): Benville Oil Wells
GetLocation(): 36728 GetLocation(): 36728
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 64 GetLastMonthProduction(): 64
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5342,7 +5375,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Grinnway Oil Wells GetName(): Grinnway Oil Wells
GetLocation(): 14361 GetLocation(): 14361
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 63 GetLastMonthProduction(): 63
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5351,7 +5383,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Muningville Oil Wells GetName(): Muningville Oil Wells
GetLocation(): 36908 GetLocation(): 36908
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 72 GetLastMonthProduction(): 72
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5360,7 +5391,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Tondston Oil Wells GetName(): Tondston Oil Wells
GetLocation(): 34237 GetLocation(): 34237
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 108 GetLastMonthProduction(): 108
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5369,7 +5399,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Fort Frindston Iron Ore Mine GetName(): Fort Frindston Iron Ore Mine
GetLocation(): 17742 GetLocation(): 17742
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 108 GetLastMonthProduction(): 108
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5378,7 +5407,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Tondston Iron Ore Mine GetName(): Tondston Iron Ore Mine
GetLocation(): 25545 GetLocation(): 25545
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 30 GetLastMonthProduction(): 30
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5387,7 +5415,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Fudinghattan Iron Ore Mine GetName(): Fudinghattan Iron Ore Mine
GetLocation(): 47838 GetLocation(): 47838
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 72 GetLastMonthProduction(): 72
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5396,7 +5423,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Nuntfingburg Iron Ore Mine GetName(): Nuntfingburg Iron Ore Mine
GetLocation(): 8763 GetLocation(): 8763
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 72 GetLastMonthProduction(): 72
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5405,7 +5431,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Lardborough Iron Ore Mine GetName(): Lardborough Iron Ore Mine
GetLocation(): 60866 GetLocation(): 60866
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 81 GetLastMonthProduction(): 81
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5414,7 +5439,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Tunford Iron Ore Mine GetName(): Tunford Iron Ore Mine
GetLocation(): 41155 GetLocation(): 41155
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 108 GetLastMonthProduction(): 108
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5423,7 +5447,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Chentfingbourne Iron Ore Mine GetName(): Chentfingbourne Iron Ore Mine
GetLocation(): 19529 GetLocation(): 19529
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 135 GetLastMonthProduction(): 135
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5432,7 +5455,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Naborough Farm GetName(): Naborough Farm
GetLocation(): 52931 GetLocation(): 52931
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 81 GetLastMonthProduction(): 81
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5444,7 +5466,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Lardborough Farm GetName(): Lardborough Farm
GetLocation(): 59604 GetLocation(): 59604
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 81 GetLastMonthProduction(): 81
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5456,7 +5477,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Chentfingbourne Farm GetName(): Chentfingbourne Farm
GetLocation(): 24366 GetLocation(): 24366
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 63 GetLastMonthProduction(): 63
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5468,7 +5488,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Wrundtown Farm GetName(): Wrundtown Farm
GetLocation(): 36847 GetLocation(): 36847
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 72 GetLastMonthProduction(): 72
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5480,7 +5499,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Little Fruford Farm GetName(): Little Fruford Farm
GetLocation(): 28287 GetLocation(): 28287
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 90 GetLastMonthProduction(): 90
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5492,7 +5510,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Hutfingford Farm GetName(): Hutfingford Farm
GetLocation(): 57432 GetLocation(): 57432
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 117 GetLastMonthProduction(): 117
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5504,7 +5521,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Tondston Farm GetName(): Tondston Farm
GetLocation(): 23519 GetLocation(): 23519
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 81 GetLastMonthProduction(): 81
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5516,7 +5532,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Nuntfingburg Farm GetName(): Nuntfingburg Farm
GetLocation(): 10773 GetLocation(): 10773
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 126 GetLastMonthProduction(): 126
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5528,7 +5543,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Sadtown Farm GetName(): Sadtown Farm
GetLocation(): 48206 GetLocation(): 48206
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 40 GetLastMonthProduction(): 40
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5540,7 +5554,6 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Quartfingfield Farm GetName(): Quartfingfield Farm
GetLocation(): 24005 GetLocation(): 24005
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 72 GetLastMonthProduction(): 72
GetLastMonthTransported(): 0 GetLastMonthTransported(): 0
@ -5552,103 +5565,221 @@
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Little Fruford Steel Mill GetName(): Little Fruford Steel Mill
GetLocation(): 21107 GetLocation(): 21107
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 56 Industry 56
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Quartfingfield Steel Mill GetName(): Quartfingfield Steel Mill
GetLocation(): 23727 GetLocation(): 23727
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 57 Industry 57
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Bedburg Steel Mill GetName(): Bedburg Steel Mill
GetLocation(): 41813 GetLocation(): 41813
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 58 Industry 58
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Franinghead Steel Mill GetName(): Franinghead Steel Mill
GetLocation(): 8852 GetLocation(): 8852
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 59 Industry 59
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Lardborough Steel Mill GetName(): Lardborough Steel Mill
GetLocation(): 59867 GetLocation(): 59867
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 60 Industry 60
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Sadtown Steel Mill GetName(): Sadtown Steel Mill
GetLocation(): 55360 GetLocation(): 55360
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 61 Industry 61
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Fraston Steel Mill GetName(): Fraston Steel Mill
GetLocation(): 52953 GetLocation(): 52953
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 62 Industry 62
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Chentfingbourne Factory GetName(): Chentfingbourne Factory
GetLocation(): 24893 GetLocation(): 24893
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 63 Industry 63
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Fort Frindston Factory GetName(): Fort Frindston Factory
GetLocation(): 20819 GetLocation(): 20819
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 64 Industry 64
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Fudinghattan Factory GetName(): Fudinghattan Factory
GetLocation(): 46278 GetLocation(): 46278
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 65 Industry 65
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Prundinghall Factory GetName(): Prundinghall Factory
GetLocation(): 53096 GetLocation(): 53096
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 66 Industry 66
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Kennville Factory GetName(): Kennville Factory
GetLocation(): 14818 GetLocation(): 14818
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 67 Industry 67
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Muningville Factory GetName(): Muningville Factory
GetLocation(): 34375 GetLocation(): 34375
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 68 Industry 68
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Trenningville Factory GetName(): Trenningville Factory
GetLocation(): 44181 GetLocation(): 44181
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 69 Industry 69
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Wrundtown Oil Refinery GetName(): Wrundtown Oil Refinery
GetLocation(): 39663 GetLocation(): 39663
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
GetLastMonthProduction(): 0
GetLastMonthTransported(): 0
GetStockpiledCargo(): -1
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 70 Industry 70
IsValidIndustry(): true IsValidIndustry(): true
GetName(): Mendingston Power Station GetName(): Mendingston Power Station
GetLocation(): 6498 GetLocation(): 6498
GetProduction(): -1
IsCargoAccepted(): true IsCargoAccepted(): true
GetLastMonthProduction(): -1
GetLastMonthTransported(): -1
GetStockpiledCargo(): 0
Industry 71 Industry 71
IsValidIndustry(): false IsValidIndustry(): false
GetName(): (null : 0x00000000) GetName(): (null : 0x00000000)
GetLocation(): -1 GetLocation(): -1
GetProduction(): -1
IsCargoAccepted(): false IsCargoAccepted(): false
Valid Industries: 71 Valid Industries: 71
GetIndustryCount(): 71 GetIndustryCount(): 71
@ -6015,18 +6146,6 @@
2 => 0 2 => 0
1 => 0 1 => 0
0 => 0 0 => 0
KeepAboveValue(50): done
Count(): 9
Production ListDump:
20 => 152
17 => 152
22 => 136
18 => 112
21 => 104
15 => 104
19 => 88
16 => 88
23 => 80
--IndustryList_CargoAccepting-- --IndustryList_CargoAccepting--
Count(): 8 Count(): 8
Location ListDump: Location ListDump:

14
src/ai/api/ai_industry.cpp
View File

@ -38,20 +38,6 @@
return industry_name; return industry_name;
} }
/* static */ int32 AIIndustry::GetProduction(IndustryID industry_id, CargoID cargo_id)
{
if (!IsValidIndustry(industry_id)) return -1;
if (!AICargo::IsValidCargo(cargo_id)) return -1;
const Industry *i = ::GetIndustry(industry_id);
for (byte j = 0; j < lengthof(i->produced_cargo); j++) {
if (i->produced_cargo[j] == cargo_id) return i->production_rate[j] * 8;
}
return -1;
}
/* static */ bool AIIndustry::IsCargoAccepted(IndustryID industry_id, CargoID cargo_id) /* static */ bool AIIndustry::IsCargoAccepted(IndustryID industry_id, CargoID cargo_id)
{ {
if (!IsValidIndustry(industry_id)) return false; if (!IsValidIndustry(industry_id)) return false;

15
src/ai/api/ai_industry.hpp
View File

@ -45,21 +45,6 @@ public:
*/ */
static char *GetName(IndustryID industry_id); static char *GetName(IndustryID industry_id);
/**
* Gets the production of a cargo of the industry.
* @warning This function does not neccessarily return useful values for newindustries.
* An industry produces at least the returned amount per month,
* but the function can also return 0, when the industry produces lots of cargo.
* GetLastMonthProduction() is more robust.
* @param industry_id The index of the industry.
* @param cargo_id The index of the cargo.
* @pre IsValidIndustry(industry_id).
* @pre AICargo::IsValidCargo(cargo_id).
* @return The production of the cargo for this industry, or -1 if
* this industry doesn't produce this cargo.
*/
static int32 GetProduction(IndustryID industry_id, CargoID cargo_id);
/** /**
* See if an industry accepts a certain cargo. * See if an industry accepts a certain cargo.
* @param industry_id The index of the industry. * @param industry_id The index of the industry.

1
src/ai/api/ai_industry.hpp.sq
View File

@ -21,7 +21,6 @@ void SQAIIndustry_Register(Squirrel *engine) {
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetIndustryCount, "GetIndustryCount", 1, "?"); SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetIndustryCount, "GetIndustryCount", 1, "?");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::IsValidIndustry, "IsValidIndustry", 2, "?i"); SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::IsValidIndustry, "IsValidIndustry", 2, "?i");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetName, "GetName", 2, "?i"); SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetName, "GetName", 2, "?i");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetProduction, "GetProduction", 3, "?ii");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::IsCargoAccepted, "IsCargoAccepted", 3, "?ii"); SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::IsCargoAccepted, "IsCargoAccepted", 3, "?ii");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetStockpiledCargo, "GetStockpiledCargo", 3, "?ii"); SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetStockpiledCargo, "GetStockpiledCargo", 3, "?ii");
SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetLastMonthProduction, "GetLastMonthProduction", 3, "?ii"); SQAIIndustry.DefSQStaticMethod(engine, &AIIndustry::GetLastMonthProduction, "GetLastMonthProduction", 3, "?ii");