bin/ai/regression/regression.nut
branchnoai
changeset 9737 ee408edf3851
parent 9733 49e424cd4edd
child 9745 fb2454d70f37
--- a/bin/ai/regression/regression.nut	Fri Feb 22 12:13:41 2008 +0000
+++ b/bin/ai/regression/regression.nut	Fri Feb 22 12:30:17 2008 +0000
@@ -31,146 +31,136 @@
 
 function Regression::Base()
 {
-	local base = AIBase();
-
 	print("");
 	print("--AIBase--");
-	print("  Rand():       " + base.Rand());
-	print("  Rand():       " + base.Rand());
-	print("  Rand():       " + base.Rand());
-	print("  RandRange(0): " + base.RandRange(0));
-	print("  RandRange(0): " + base.RandRange(0));
-	print("  RandRange(0): " + base.RandRange(0));
-	print("  RandRange(1): " + base.RandRange(1));
-	print("  RandRange(1): " + base.RandRange(1));
-	print("  RandRange(1): " + base.RandRange(1));
-	print("  RandRange(2): " + base.RandRange(2));
-	print("  RandRange(2): " + base.RandRange(2));
-	print("  RandRange(2): " + base.RandRange(2));
-	print("  RandRange(9): " + base.RandRange(9));
-	print("  RandRange(9): " + base.RandRange(9));
-	print("  RandRange(9): " + base.RandRange(9));
-	print("  Chance(1, 2): " + base.Chance(1, 2));
-	print("  Chance(1, 2): " + base.Chance(1, 2));
-	print("  Chance(1, 2): " + base.Chance(1, 2));
+	print("  Rand():       " + AIBase.Rand());
+	print("  Rand():       " + AIBase.Rand());
+	print("  Rand():       " + AIBase.Rand());
+	print("  RandRange(0): " + AIBase.RandRange(0));
+	print("  RandRange(0): " + AIBase.RandRange(0));
+	print("  RandRange(0): " + AIBase.RandRange(0));
+	print("  RandRange(1): " + AIBase.RandRange(1));
+	print("  RandRange(1): " + AIBase.RandRange(1));
+	print("  RandRange(1): " + AIBase.RandRange(1));
+	print("  RandRange(2): " + AIBase.RandRange(2));
+	print("  RandRange(2): " + AIBase.RandRange(2));
+	print("  RandRange(2): " + AIBase.RandRange(2));
+	print("  RandRange(9): " + AIBase.RandRange(9));
+	print("  RandRange(9): " + AIBase.RandRange(9));
+	print("  RandRange(9): " + AIBase.RandRange(9));
+	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
+	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
+	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
 }
 
 function Regression::Airport()
 {
-	local airport = AIAirport();
-	local company = AICompany();
-
 	print("");
 	print("--AIAirport--");
 
-	print("  IsHangarTile():       " + airport.IsHangarTile(32116));
-	print("  IsAirportTile():      " + airport.IsAirportTile(32116));
-	print("  GetHangarOfAirport(): " + airport.GetHangarOfAirport(32116));
+	print("  IsHangarTile():       " + AIAirport.IsHangarTile(32116));
+	print("  IsAirportTile():      " + AIAirport.IsAirportTile(32116));
+	print("  GetHangarOfAirport(): " + AIAirport.GetHangarOfAirport(32116));
 
 	for (local i = -1; i < 10; i++) {
-		print("  AiportAvailable(" + i + "):          " + airport.AiportAvailable(i));
-		print("  GetAirportWidth(" + i + "):          " + airport.GetAirportWidth(i));
-		print("  GetAirportHeight(" + i + "):         " + airport.GetAirportHeight(i));
-		print("  GetAirportCoverageRadius(" + i + "): " + airport.GetAirportCoverageRadius(i));
+		print("  AiportAvailable(" + i + "):          " + AIAirport.AiportAvailable(i));
+		print("  GetAirportWidth(" + i + "):          " + AIAirport.GetAirportWidth(i));
+		print("  GetAirportHeight(" + i + "):         " + AIAirport.GetAirportHeight(i));
+		print("  GetAirportCoverageRadius(" + i + "): " + AIAirport.GetAirportCoverageRadius(i));
 	}
 
-	print("  GetBankBalance():     " + company.GetBankBalance(AICompany.MY_COMPANY));
-	print("  BuildAirport():       " + airport.BuildAirport(32116, 0));
-	print("  IsHangarTile():       " + airport.IsHangarTile(32116));
-	print("  IsAirportTile():      " + airport.IsAirportTile(32116));
-	print("  GetHangarOfAirport(): " + airport.GetHangarOfAirport(32116));
-	print("  IsHangarTile():       " + airport.IsHangarTile(32119));
-	print("  IsAirportTile():      " + airport.IsAirportTile(32119));
-	print("  GetBankBalance():     " + company.GetBankBalance(AICompany.MY_COMPANY));
+	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
+	print("  BuildAirport():       " + AIAirport.BuildAirport(32116, 0));
+	print("  IsHangarTile():       " + AIAirport.IsHangarTile(32116));
+	print("  IsAirportTile():      " + AIAirport.IsAirportTile(32116));
+	print("  GetHangarOfAirport(): " + AIAirport.GetHangarOfAirport(32116));
+	print("  IsHangarTile():       " + AIAirport.IsHangarTile(32119));
+	print("  IsAirportTile():      " + AIAirport.IsAirportTile(32119));
+	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
 
-	print("  RemoveAirport():      " + airport.RemoveAirport(32118));
-	print("  IsHangarTile():       " + airport.IsHangarTile(32119));
-	print("  IsAirportTile():      " + airport.IsAirportTile(32119));
-	print("  GetBankBalance():     " + company.GetBankBalance(AICompany.MY_COMPANY));
-	print("  BuildAirport():       " + airport.BuildAirport(32116, 0));
+	print("  RemoveAirport():      " + AIAirport.RemoveAirport(32118));
+	print("  IsHangarTile():       " + AIAirport.IsHangarTile(32119));
+	print("  IsAirportTile():      " + AIAirport.IsAirportTile(32119));
+	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
+	print("  BuildAirport():       " + AIAirport.BuildAirport(32116, 0));
 }
 
 function Regression::Cargo()
 {
-	local cargo = AICargo();
-
 	print("");
 	print("--AICargo--");
 	for (local i = -1; i < 15; i++) {
 		print("  Cargo " + i);
-		print("    IsValidCargo():          " + cargo.IsValidCargo(i));
-		print("    GetCargoLabel():         '" + cargo.GetCargoLabel(i)+ "'");
-		print("    IsFreight():             " + cargo.IsFreight(i));
-		print("    GetCargoIncome(0, 0):    " + cargo.GetCargoIncome(0, 0, i));
-		print("    GetCargoIncome(10, 10):  " + cargo.GetCargoIncome(10, 10, i));
-		print("    GetCargoIncome(100, 10): " + cargo.GetCargoIncome(100, 10, i));
-		print("    GetCargoIncome(10, 100): " + cargo.GetCargoIncome(10, 100, i));
+		print("    IsValidCargo():          " + AICargo.IsValidCargo(i));
+		print("    GetCargoLabel():         '" + AICargo.GetCargoLabel(i)+ "'");
+		print("    IsFreight():             " + AICargo.IsFreight(i));
+		print("    GetCargoIncome(0, 0):    " + AICargo.GetCargoIncome(0, 0, i));
+		print("    GetCargoIncome(10, 10):  " + AICargo.GetCargoIncome(10, 10, i));
+		print("    GetCargoIncome(100, 10): " + AICargo.GetCargoIncome(100, 10, i));
+		print("    GetCargoIncome(10, 100): " + AICargo.GetCargoIncome(10, 100, i));
 	}
 }
 
 function Regression::Company()
 {
-	local company = AICompany();
-
 	print("");
 	print("--Company--");
 
 	/* Test AIXXXMode() in scopes */
 	{
 		local test = AITestMode();
-		print("  SetCompanyName():     " + company.SetCompanyName("Regression"));
-		print("  SetCompanyName():     " + company.SetCompanyName("Regression"));
+		print("  SetCompanyName():     " + AICompany.SetCompanyName("Regression"));
+		print("  SetCompanyName():     " + AICompany.SetCompanyName("Regression"));
 		{
 			local exec = AIExecMode();
-			print("  SetCompanyName():     " + company.SetCompanyName("Regression"));
-			print("  SetCompanyName():     " + company.SetCompanyName("Regression"));
+			print("  SetCompanyName():     " + AICompany.SetCompanyName("Regression"));
+			print("  SetCompanyName():     " + AICompany.SetCompanyName("Regression"));
 		}
 	}
 
-	print("  GetCompanyName():            " + company.GetCompanyName(AICompany.MY_COMPANY));
-	print("  GetPresidentName():          " + company.GetPresidentName(AICompany.MY_COMPANY));
-	print("  SetPresidentName():          " + company.SetPresidentName("Regression AI"));
-	print("  GetPresidentName():          " + company.GetPresidentName(AICompany.MY_COMPANY));
-	print("  GetCompanyValue():           " + company.GetCompanyValue(AICompany.MY_COMPANY));
-	print("  GetBankBalance():            " + company.GetBankBalance(AICompany.MY_COMPANY));
-	print("  GetCompanyName():            " + company.GetCompanyName(240));
-	print("  GetLoanAmount():             " + company.GetLoanAmount());
-	print("  GetMaxLoanAmount():          " + company.GetMaxLoanAmount());
-	print("  GetLoanInterval():           " + company.GetLoanInterval());
-	print("  SetLoanAmount(1):            " + company.SetLoanAmount(1));
-	print("  SetLoanAmount(100):          " + company.SetLoanAmount(100));
-	print("  SetLoanAmount(10000):        " + company.SetLoanAmount(10000));
-	print("  GetBankBalance():            " + company.GetBankBalance(AICompany.MY_COMPANY));
-	print("  GetLoanAmount():             " + company.GetLoanAmount());
-	print("  SetMinimumLoanAmount(31337): " + company.SetMinimumLoanAmount(31337));
-	print("  GetBankBalance():            " + company.GetBankBalance(AICompany.MY_COMPANY));
-	print("  GetLoanAmount():             " + company.GetLoanAmount());
-	print("  SetLoanAmount(10000):        " + company.SetLoanAmount(company.GetMaxLoanAmount()));
-	print("  GetBankBalance():            " + company.GetBankBalance(AICompany.MY_COMPANY));
-	print("  GetLoanAmount():             " + company.GetLoanAmount());
+	print("  GetCompanyName():            " + AICompany.GetCompanyName(AICompany.MY_COMPANY));
+	print("  GetPresidentName():          " + AICompany.GetPresidentName(AICompany.MY_COMPANY));
+	print("  SetPresidentName():          " + AICompany.SetPresidentName("Regression AI"));
+	print("  GetPresidentName():          " + AICompany.GetPresidentName(AICompany.MY_COMPANY));
+	print("  GetCompanyValue():           " + AICompany.GetCompanyValue(AICompany.MY_COMPANY));
+	print("  GetBankBalance():            " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
+	print("  GetCompanyName():            " + AICompany.GetCompanyName(240));
+	print("  GetLoanAmount():             " + AICompany.GetLoanAmount());
+	print("  GetMaxLoanAmount():          " + AICompany.GetMaxLoanAmount());
+	print("  GetLoanInterval():           " + AICompany.GetLoanInterval());
+	print("  SetLoanAmount(1):            " + AICompany.SetLoanAmount(1));
+	print("  SetLoanAmount(100):          " + AICompany.SetLoanAmount(100));
+	print("  SetLoanAmount(10000):        " + AICompany.SetLoanAmount(10000));
+	print("  GetBankBalance():            " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
+	print("  GetLoanAmount():             " + AICompany.GetLoanAmount());
+	print("  SetMinimumLoanAmount(31337): " + AICompany.SetMinimumLoanAmount(31337));
+	print("  GetBankBalance():            " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
+	print("  GetLoanAmount():             " + AICompany.GetLoanAmount());
+	print("  SetLoanAmount(10000):        " + AICompany.SetLoanAmount(AICompany.GetMaxLoanAmount()));
+	print("  GetBankBalance():            " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
+	print("  GetLoanAmount():             " + AICompany.GetLoanAmount());
 }
 
 function Regression::Engine()
 {
-	local engine = AIEngine();
 	local j = 0;
 
 	print("");
 	print("--Engine--");
 	for (local i = -1; i < 257; i++) {
-		if (engine.IsValidEngine(i)) j++;
+		if (AIEngine.IsValidEngine(i)) j++;
 		print("  Engine " + i);
-		print("    IsValidEngine():    " + engine.IsValidEngine(i));
-		print("    GetName():          " + engine.GetName(i));
-		print("    GetCargoType():     " + engine.GetCargoType(i));
-		print("    GetCapacity():      " + engine.GetCapacity(i));
-		print("    GetReliability():   " + engine.GetReliability(i));
-		print("    GetMaxSpeed():      " + engine.GetMaxSpeed(i));
-		print("    GetPrice():         " + engine.GetPrice(i));
-		print("    GetMaxAge():        " + engine.GetMaxAge(i));
-		print("    GetRunningCost():   " + engine.GetRunningCost(i));
-		print("    GetName():          " + engine.GetName(i));
-		print("    GetVehicleType():   " + engine.GetVehicleType(i));
+		print("    IsValidEngine():    " + AIEngine.IsValidEngine(i));
+		print("    GetName():          " + AIEngine.GetName(i));
+		print("    GetCargoType():     " + AIEngine.GetCargoType(i));
+		print("    GetCapacity():      " + AIEngine.GetCapacity(i));
+		print("    GetReliability():   " + AIEngine.GetReliability(i));
+		print("    GetMaxSpeed():      " + AIEngine.GetMaxSpeed(i));
+		print("    GetPrice():         " + AIEngine.GetPrice(i));
+		print("    GetMaxAge():        " + AIEngine.GetMaxAge(i));
+		print("    GetRunningCost():   " + AIEngine.GetRunningCost(i));
+		print("    GetName():          " + AIEngine.GetName(i));
+		print("    GetVehicleType():   " + AIEngine.GetVehicleType(i));
 	}
 	print("  Valid Engines:        " + j);
 }
@@ -252,24 +242,23 @@
 
 function Regression::Industry()
 {
-	local industry = AIIndustry();
 	local j = 0;
 
 	print("");
 	print("--Industry--");
-	print("  GetMaxIndustryID():  " + industry.GetMaxIndustryID());
-	print("  GetIndustryCount():  " + industry.GetIndustryCount());
-	for (local i = -1; i < industry.GetMaxIndustryID() + 1; i++) {
-		if (industry.IsValidIndustry(i)) j++;
+	print("  GetMaxIndustryID():  " + AIIndustry.GetMaxIndustryID());
+	print("  GetIndustryCount():  " + AIIndustry.GetIndustryCount());
+	for (local i = -1; i < AIIndustry.GetMaxIndustryID() + 1; i++) {
+		if (AIIndustry.IsValidIndustry(i)) j++;
 		print("  Industry " + i);
-		print("    IsValidIndustry(): " + industry.IsValidIndustry(i));
-		print("    GetName():         " + industry.GetName(i));
-		print("    GetLocation():     " + industry.GetLocation(i));
-		print("    GetProduction():   " + industry.GetProduction(i, 1));
-		print("    IsCargoAccepted(): " + industry.IsCargoAccepted(i, 1));
+		print("    IsValidIndustry(): " + AIIndustry.IsValidIndustry(i));
+		print("    GetName():         " + AIIndustry.GetName(i));
+		print("    GetLocation():     " + AIIndustry.GetLocation(i));
+		print("    GetProduction():   " + AIIndustry.GetProduction(i, 1));
+		print("    IsCargoAccepted(): " + AIIndustry.IsCargoAccepted(i, 1));
 	}
 	print("  Valid Industries:    " + j);
-	print("  GetIndustryCount():  " + industry.GetIndustryCount());
+	print("  GetIndustryCount():  " + AIIndustry.GetIndustryCount());
 }
 
 function Regression::IndustryList()
@@ -382,104 +371,97 @@
 
 function Regression::Map()
 {
-	local map = AIMap();
-
 	print("");
 	print("--Map--");
-	print("  GetMapSize():     " + map.GetMapSize());
-	print("  GetMapSizeX():    " + map.GetMapSizeX());
-	print("  GetMapSizeY():    " + map.GetMapSizeY());
-	print("  GetTileX(123):    " + map.GetTileX(123));
-	print("  GetTileY(123):    " + map.GetTileY(123));
-	print("  GetTileIndex():   " + map.GetTileIndex(123, 0));
-	print("  GetTileIndex():   " + map.GetTileIndex(0, 123));
-	print("  GetTileIndex():   " + map.GetTileIndex(0, 0));
-	print("  GetTileIndex():   " + map.GetTileIndex(-1, -1));
-	print("  GetTileIndex():   " + map.GetTileIndex(10000, 10000));
-	print("  IsValidTile(123): " + map.IsValidTile(123));
-	print("  GetTileX(124):    " + map.GetTileX(124));
-	print("  GetTileY(124):    " + map.GetTileY(124));
-	print("  IsValidTile(124): " + map.IsValidTile(124));
-	print("  IsValidTile(0):   " + map.IsValidTile(0));
-	print("  IsValidTile(-1):  " + map.IsValidTile(-1));
-	print("  IsValidTile():    " + map.IsValidTile(map.GetMapSize()));
-	print("  IsValidTile():    " + map.IsValidTile(map.GetMapSize() - 1));
-	print("  DemolishTile():   " + map.DemolishTile(19592));
-	print("  DemolishTile():   " + map.DemolishTile(19335));
+	print("  GetMapSize():     " + AIMap.GetMapSize());
+	print("  GetMapSizeX():    " + AIMap.GetMapSizeX());
+	print("  GetMapSizeY():    " + AIMap.GetMapSizeY());
+	print("  GetTileX(123):    " + AIMap.GetTileX(123));
+	print("  GetTileY(123):    " + AIMap.GetTileY(123));
+	print("  GetTileIndex():   " + AIMap.GetTileIndex(123, 0));
+	print("  GetTileIndex():   " + AIMap.GetTileIndex(0, 123));
+	print("  GetTileIndex():   " + AIMap.GetTileIndex(0, 0));
+	print("  GetTileIndex():   " + AIMap.GetTileIndex(-1, -1));
+	print("  GetTileIndex():   " + AIMap.GetTileIndex(10000, 10000));
+	print("  IsValidTile(123): " + AIMap.IsValidTile(123));
+	print("  GetTileX(124):    " + AIMap.GetTileX(124));
+	print("  GetTileY(124):    " + AIMap.GetTileY(124));
+	print("  IsValidTile(124): " + AIMap.IsValidTile(124));
+	print("  IsValidTile(0):   " + AIMap.IsValidTile(0));
+	print("  IsValidTile(-1):  " + AIMap.IsValidTile(-1));
+	print("  IsValidTile():    " + AIMap.IsValidTile(AIMap.GetMapSize()));
+	print("  IsValidTile():    " + AIMap.IsValidTile(AIMap.GetMapSize() - 1));
+	print("  DemolishTile():   " + AIMap.DemolishTile(19592));
+	print("  DemolishTile():   " + AIMap.DemolishTile(19335));
 	print("  Distance");
-	print("    DistanceManhattan(): " + map.DistanceManhattan(1, 10000));
-	print("    DistanceMax():       " + map.DistanceMax(1, 10000));
-	print("    DistanceSquare():    " + map.DistanceSquare(1, 10000));
-	print("    DistanceFromEdge():  " + map.DistanceFromEdge(10000));
+	print("    DistanceManhattan(): " + AIMap.DistanceManhattan(1, 10000));
+	print("    DistanceMax():       " + AIMap.DistanceMax(1, 10000));
+	print("    DistanceSquare():    " + AIMap.DistanceSquare(1, 10000));
+	print("    DistanceFromEdge():  " + AIMap.DistanceFromEdge(10000));
 }
 
 function Regression::Marine()
 {
-	local marine = AIMarine();
-	local company = AICompany();
-
 	print("");
 	print("--AIMarine--");
 
-	print("  IsWaterDepotTile():   " + marine.IsWaterDepotTile(32116));
-	print("  IsDockTile():         " + marine.IsDockTile(32116));
-	print("  IsBuoyTile():         " + marine.IsBuoyTile(32116));
-	print("  IsLockTile():         " + marine.IsLockTile(32116));
-	print("  IsCanalTile():        " + marine.IsCanalTile(32116));
+	print("  IsWaterDepotTile():   " + AIMarine.IsWaterDepotTile(32116));
+	print("  IsDockTile():         " + AIMarine.IsDockTile(32116));
+	print("  IsBuoyTile():         " + AIMarine.IsBuoyTile(32116));
+	print("  IsLockTile():         " + AIMarine.IsLockTile(32116));
+	print("  IsCanalTile():        " + AIMarine.IsCanalTile(32116));
 
-	print("  GetBankBalance():     " + company.GetBankBalance(AICompany.MY_COMPANY));
-	print("  BuildWaterDepot():    " + marine.BuildWaterDepot(28479, false));
-	print("  BuildDock():          " + marine.BuildDock(29253));
-	print("  BuildBuoy():          " + marine.BuildBuoy(28481));
-	print("  BuildLock():          " + marine.BuildLock(28487));
-	print("  BuildCanal():         " + marine.BuildCanal(32127));
-	print("  IsWaterDepotTile():   " + marine.IsWaterDepotTile(28479));
-	print("  IsDockTile():         " + marine.IsDockTile(29253));
-	print("  IsBuoyTile():         " + marine.IsBuoyTile(28481));
-	print("  IsLockTile():         " + marine.IsLockTile(28487));
-	print("  IsCanalTile():        " + marine.IsCanalTile(32127));
-	print("  GetBankBalance():     " + company.GetBankBalance(AICompany.MY_COMPANY));
+	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
+	print("  BuildWaterDepot():    " + AIMarine.BuildWaterDepot(28479, false));
+	print("  BuildDock():          " + AIMarine.BuildDock(29253));
+	print("  BuildBuoy():          " + AIMarine.BuildBuoy(28481));
+	print("  BuildLock():          " + AIMarine.BuildLock(28487));
+	print("  BuildCanal():         " + AIMarine.BuildCanal(32127));
+	print("  IsWaterDepotTile():   " + AIMarine.IsWaterDepotTile(28479));
+	print("  IsDockTile():         " + AIMarine.IsDockTile(29253));
+	print("  IsBuoyTile():         " + AIMarine.IsBuoyTile(28481));
+	print("  IsLockTile():         " + AIMarine.IsLockTile(28487));
+	print("  IsCanalTile():        " + AIMarine.IsCanalTile(32127));
+	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
 
-	print("  RemoveWaterDepot():   " + marine.RemoveWaterDepot(28479));
-	print("  RemoveDock():         " + marine.RemoveDock(29253));
-	print("  RemoveBuoy():         " + marine.RemoveBuoy(28481));
-	print("  RemoveLock():         " + marine.RemoveLock(28487));
-	print("  RemoveCanal():        " + marine.RemoveCanal(32127));
-	print("  IsWaterDepotTile():   " + marine.IsWaterDepotTile(28479));
-	print("  IsDockTile():         " + marine.IsDockTile(29253));
-	print("  IsBuoyTile():         " + marine.IsBuoyTile(28481));
-	print("  IsLockTile():         " + marine.IsLockTile(28487));
-	print("  IsCanalTile():        " + marine.IsCanalTile(32127));
-	print("  GetBankBalance():     " + company.GetBankBalance(AICompany.MY_COMPANY));
+	print("  RemoveWaterDepot():   " + AIMarine.RemoveWaterDepot(28479));
+	print("  RemoveDock():         " + AIMarine.RemoveDock(29253));
+	print("  RemoveBuoy():         " + AIMarine.RemoveBuoy(28481));
+	print("  RemoveLock():         " + AIMarine.RemoveLock(28487));
+	print("  RemoveCanal():        " + AIMarine.RemoveCanal(32127));
+	print("  IsWaterDepotTile():   " + AIMarine.IsWaterDepotTile(28479));
+	print("  IsDockTile():         " + AIMarine.IsDockTile(29253));
+	print("  IsBuoyTile():         " + AIMarine.IsBuoyTile(28481));
+	print("  IsLockTile():         " + AIMarine.IsLockTile(28487));
+	print("  IsCanalTile():        " + AIMarine.IsCanalTile(32127));
+	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.MY_COMPANY));
 
-	print("  BuildWaterDepot():    " + marine.BuildWaterDepot(28479, false));
-	print("  BuildDock():          " + marine.BuildDock(29253));
+	print("  BuildWaterDepot():    " + AIMarine.BuildWaterDepot(28479, false));
+	print("  BuildDock():          " + AIMarine.BuildDock(29253));
 }
 
 function Regression::Order()
 {
-	local order = AIOrder();
-
 	print("");
 	print("--Order--");
-	print("  GetNumberOfOrders():   " + order.GetNumberOfOrders(11));
-	print("  GetOrderDestination(): " + order.GetOrderDestination(11, 1));
-	print("  AreOrderFlagsValid():  " + order.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER));
-	print("  IsValidVehicleOrder(): " + order.IsValidVehicleOrder(11, 1));
-	print("  GetOrderFlags():       " + order.GetOrderFlags(11, 1));
-	print("  AppendOrder():         " + order.AppendOrder(11, 33416, AIOrder.AIOF_TRANSFER));
-	print("  InsertOrder():         " + order.InsertOrder(11, 0, 33416, AIOrder.AIOF_TRANSFER));
-	print("  GetNumberOfOrders():   " + order.GetNumberOfOrders(11));
-	print("  IsValidVehicleOrder(): " + order.IsValidVehicleOrder(11, 1));
-	print("  RemoveOrder():         " + order.RemoveOrder(11, 0));
-	print("  ChangeOrder():         " + order.ChangeOrder(11, 0, AIOrder.AIOF_FULL_LOAD));
-	print("  GetOrderDestination(): " + order.GetOrderDestination(11, 0));
-	print("  CopyOrders():          " + order.CopyOrders(11, 1));
-	print("  CopyOrders():          " + order.CopyOrders(12, 11));
-	print("  ShareOrders():         " + order.ShareOrders(12, 1));
-	print("  ShareOrders():         " + order.ShareOrders(12, 11));
-	print("  UnshareOrders():       " + order.UnshareOrders(12));
-	print("  AppendOrder():         " + order.AppendOrder(11, 33421, AIOrder.AIOF_NONE));
+	print("  GetNumberOfOrders():   " + AIOrder.GetNumberOfOrders(11));
+	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(11, 1));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER));
+	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(11, 1));
+	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(11, 1));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(11, 33416, AIOrder.AIOF_TRANSFER));
+	print("  InsertOrder():         " + AIOrder.InsertOrder(11, 0, 33416, AIOrder.AIOF_TRANSFER));
+	print("  GetNumberOfOrders():   " + AIOrder.GetNumberOfOrders(11));
+	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(11, 1));
+	print("  RemoveOrder():         " + AIOrder.RemoveOrder(11, 0));
+	print("  ChangeOrder():         " + AIOrder.ChangeOrder(11, 0, AIOrder.AIOF_FULL_LOAD));
+	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(11, 0));
+	print("  CopyOrders():          " + AIOrder.CopyOrders(11, 1));
+	print("  CopyOrders():          " + AIOrder.CopyOrders(12, 11));
+	print("  ShareOrders():         " + AIOrder.ShareOrders(12, 1));
+	print("  ShareOrders():         " + AIOrder.ShareOrders(12, 11));
+	print("  UnshareOrders():       " + AIOrder.UnshareOrders(12));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(11, 33421, AIOrder.AIOF_NONE));
 
 	local list = AIVehicleStationList(11);
 
@@ -545,119 +527,113 @@
 	print("  BuildRoute(): " + pf.BuildRoute(ret));
 	pf.FreeRoute(ret);
 
-	local road = AIRoad();
-	print("  IsRoadTile(): " + road.IsRoadTile(33425));
-	print("  IsRoadTile(): " + road.IsRoadTile(33480 + 256 * 5));
+	print("  IsRoadTile(): " + AIRoad.IsRoadTile(33425));
+	print("  IsRoadTile(): " + AIRoad.IsRoadTile(33480 + 256 * 5));
 }
 
 function Regression::Road()
 {
-	local road = AIRoad();
-
 	print("");
 	print("--Road--");
 	print("  Road");
-	print("    IsRoadTile():                  " + road.IsRoadTile(33411));
-	print("    BuildRoad():                   " + road.BuildRoad(0, 1));
-	print("    BuildRoad():                   " + road.BuildRoad(33411, 33411));
-	print("    BuildRoad():                   " + road.BuildRoad(33411, 33414));
-	print("    AreRoadTilesConnected():       " + road.AreRoadTilesConnected(33412, 33413));
-	print("    IsRoadTile():                  " + road.IsRoadTile(33411));
-	print("    GetNeighbourRoadCount():       " + road.GetNeighbourRoadCount(33412));
-	print("    RemoveRoad():                  " + road.RemoveRoad(33411, 33411));
-	print("    RemoveRoad():                  " + road.RemoveRoad(33411, 33412));
-	print("    RemoveRoad():                  " + road.RemoveRoad(19590, 19590));
+	print("    IsRoadTile():                  " + AIRoad.IsRoadTile(33411));
+	print("    BuildRoad():                   " + AIRoad.BuildRoad(0, 1));
+	print("    BuildRoad():                   " + AIRoad.BuildRoad(33411, 33411));
+	print("    BuildRoad():                   " + AIRoad.BuildRoad(33411, 33414));
+	print("    AreRoadTilesConnected():       " + AIRoad.AreRoadTilesConnected(33412, 33413));
+	print("    IsRoadTile():                  " + AIRoad.IsRoadTile(33411));
+	print("    GetNeighbourRoadCount():       " + AIRoad.GetNeighbourRoadCount(33412));
+	print("    RemoveRoad():                  " + AIRoad.RemoveRoad(33411, 33411));
+	print("    RemoveRoad():                  " + AIRoad.RemoveRoad(33411, 33412));
+	print("    RemoveRoad():                  " + AIRoad.RemoveRoad(19590, 19590));
 
 	print("  Depot");
-	print("    IsRoadTile():                  " + road.IsRoadTile(33411));
-	print("    BuildRoadDepot():              " + road.BuildRoadDepot(0, 1));
-	print("    BuildRoadDepot():              " + road.BuildRoadDepot(33411, 33411));
-	print("    BuildRoadDepot():              " + road.BuildRoadDepot(33411, 33414));
-	print("    BuildRoadDepot():              " + road.BuildRoadDepot(33411, 33412));
-	print("    IsRoadTile():                  " + road.IsRoadTile(33411));
-	print("    GetRoadDepotFrontTile():       " + road.GetRoadDepotFrontTile(33411));
-	print("    IsRoadDepotTile():             " + road.IsRoadDepotTile(33411));
-	print("    RemoveRoadDepot():             " + road.RemoveRoadDepot(33411));
-	print("    RemoveRoadDepot():             " + road.RemoveRoadDepot(33411));
+	print("    IsRoadTile():                  " + AIRoad.IsRoadTile(33411));
+	print("    BuildRoadDepot():              " + AIRoad.BuildRoadDepot(0, 1));
+	print("    BuildRoadDepot():              " + AIRoad.BuildRoadDepot(33411, 33411));
+	print("    BuildRoadDepot():              " + AIRoad.BuildRoadDepot(33411, 33414));
+	print("    BuildRoadDepot():              " + AIRoad.BuildRoadDepot(33411, 33412));
+	print("    IsRoadTile():                  " + AIRoad.IsRoadTile(33411));
+	print("    GetRoadDepotFrontTile():       " + AIRoad.GetRoadDepotFrontTile(33411));
+	print("    IsRoadDepotTile():             " + AIRoad.IsRoadDepotTile(33411));
+	print("    RemoveRoadDepot():             " + AIRoad.RemoveRoadDepot(33411));
+	print("    RemoveRoadDepot():             " + AIRoad.RemoveRoadDepot(33411));
 
 	print("  Station");
-	print("    IsRoadTile():                  " + road.IsRoadTile(33411));
-	print("    BuildRoadStation():            " + road.BuildRoadStation(0, 1, false, false));
-	print("    BuildRoadStation():            " + road.BuildRoadStation(33411, 33411, false, false));
-	print("    BuildRoadStation():            " + road.BuildRoadStation(33411, 33414, false, false));
-	print("    BuildRoadStation():            " + road.BuildRoadStation(33411, 33412, false, false));
-	print("    IsRoadTile():                  " + road.IsRoadTile(33411));
-	print("    GetDriveThroughBackTile():     " + road.GetDriveThroughBackTile(33411));
-	print("    GetRoadStationFrontTile():     " + road.GetRoadStationFrontTile(33411));
-	print("    IsRoadStationTile():           " + road.IsRoadStationTile(33411));
-	print("    IsDriveThroughRoadStationTile: " + road.IsDriveThroughRoadStationTile(33411));
-	print("    RemoveRoadStation():           " + road.RemoveRoadStation(33411));
-	print("    RemoveRoadStation():           " + road.RemoveRoadStation(33411));
+	print("    IsRoadTile():                  " + AIRoad.IsRoadTile(33411));
+	print("    BuildRoadStation():            " + AIRoad.BuildRoadStation(0, 1, false, false));
+	print("    BuildRoadStation():            " + AIRoad.BuildRoadStation(33411, 33411, false, false));
+	print("    BuildRoadStation():            " + AIRoad.BuildRoadStation(33411, 33414, false, false));
+	print("    BuildRoadStation():            " + AIRoad.BuildRoadStation(33411, 33412, false, false));
+	print("    IsRoadTile():                  " + AIRoad.IsRoadTile(33411));
+	print("    GetDriveThroughBackTile():     " + AIRoad.GetDriveThroughBackTile(33411));
+	print("    GetRoadStationFrontTile():     " + AIRoad.GetRoadStationFrontTile(33411));
+	print("    IsRoadStationTile():           " + AIRoad.IsRoadStationTile(33411));
+	print("    IsDriveThroughRoadStationTile: " + AIRoad.IsDriveThroughRoadStationTile(33411));
+	print("    RemoveRoadStation():           " + AIRoad.RemoveRoadStation(33411));
+	print("    RemoveRoadStation():           " + AIRoad.RemoveRoadStation(33411));
 
 	print("  Station Types");
-	print("    BuildRoadStation(bus):         " + road.BuildRoadStation(33411, 33410, false, false));
-	print("    BuildRoadStation(truck):       " + road.BuildRoadStation(33421, 33422, true,  false));
-	print("    BuildRoadStation(truck):       " + road.BuildRoadStation(33412, 33413, true,  false));
-	print("    BuildRoadStation(bus):         " + road.BuildRoadStation(33411 + 256, 33411, false, false));
-	print("    BuildRoadStation(truck):       " + road.BuildRoadStation(33412 + 256, 33412 + 256 + 256, true,  false));
-	print("    BuildRoadStation(bus-drive):   " + road.BuildRoadStation(33413, 33412, false, true));
-	print("    BuildRoadStation(truck-drive): " + road.BuildRoadStation(33414, 33413, true,  true));
-	print("    BuildRoadStation(bus-drive):   " + road.BuildRoadStation(33415, 33414, false, true));
-	print("    BuildRoadStation(truck-drive): " + road.BuildRoadStation(33416, 33415, true,  true));
-	print("    BuildRoadDepot():              " + road.BuildRoadDepot(33417, 33418));
-	print("    GetRoadStationFrontTile():     " + road.GetRoadStationFrontTile(33411 + 256));
-	print("    GetRoadStationFrontTile():     " + road.GetRoadStationFrontTile(33412 + 256));
-	print("    IsDriveThroughRoadStationTile: " + road.IsDriveThroughRoadStationTile(33415));
-	print("    GetDriveThroughBackTile():     " + road.GetDriveThroughBackTile(33415));
-	print("    GetRoadStationFrontTile():     " + road.GetRoadStationFrontTile(33415));
-	print("    IsRoadTile():                  " + road.IsRoadTile(33415));
+	print("    BuildRoadStation(bus):         " + AIRoad.BuildRoadStation(33411, 33410, false, false));
+	print("    BuildRoadStation(truck):       " + AIRoad.BuildRoadStation(33421, 33422, true,  false));
+	print("    BuildRoadStation(truck):       " + AIRoad.BuildRoadStation(33412, 33413, true,  false));
+	print("    BuildRoadStation(bus):         " + AIRoad.BuildRoadStation(33411 + 256, 33411, false, false));
+	print("    BuildRoadStation(truck):       " + AIRoad.BuildRoadStation(33412 + 256, 33412 + 256 + 256, true,  false));
+	print("    BuildRoadStation(bus-drive):   " + AIRoad.BuildRoadStation(33413, 33412, false, true));
+	print("    BuildRoadStation(truck-drive): " + AIRoad.BuildRoadStation(33414, 33413, true,  true));
+	print("    BuildRoadStation(bus-drive):   " + AIRoad.BuildRoadStation(33415, 33414, false, true));
+	print("    BuildRoadStation(truck-drive): " + AIRoad.BuildRoadStation(33416, 33415, true,  true));
+	print("    BuildRoadDepot():              " + AIRoad.BuildRoadDepot(33417, 33418));
+	print("    GetRoadStationFrontTile():     " + AIRoad.GetRoadStationFrontTile(33411 + 256));
+	print("    GetRoadStationFrontTile():     " + AIRoad.GetRoadStationFrontTile(33412 + 256));
+	print("    IsDriveThroughRoadStationTile: " + AIRoad.IsDriveThroughRoadStationTile(33415));
+	print("    GetDriveThroughBackTile():     " + AIRoad.GetDriveThroughBackTile(33415));
+	print("    GetRoadStationFrontTile():     " + AIRoad.GetRoadStationFrontTile(33415));
+	print("    IsRoadTile():                  " + AIRoad.IsRoadTile(33415));
 }
 
 function Regression::Sign()
 {
-	local sign = AISign();
 	local j = 0;
 
 	print("");
 	print("--Sign--");
-	print("  BuildSign(33410, 'Some Sign'):       " + sign.BuildSign(33410, "Some Sign"));
-	local sign_id = sign.BuildSign(33409, "Some other Sign");
-	print("  BuildSign(33409, 'Some other Sign'): " + sign_id);
-	print("  RemoveSign(" + sign_id + "):                       " + sign.RemoveSign(sign_id));
+	print("  BuildSign(33410, 'Some Sign'):       " + AISign.BuildSign(33410, "Some Sign"));
+	local AISign_id = AISign.BuildSign(33409, "Some other Sign");
+	print("  BuildSign(33409, 'Some other Sign'): " + AISign_id);
+	print("  RemoveSign(" + AISign_id + "):                       " + AISign.RemoveSign(AISign_id));
 	print("");
-	print("  GetMaxSignID():    " + sign.GetMaxSignID());
-	print("  GetSignCount():    " + sign.GetSignCount());
-	for (local i = -1; i < sign.GetMaxSignID() + 1; i++) {
-		if (sign.IsValidSign(i)) j++;
+	print("  GetMaxSignID():    " + AISign.GetMaxSignID());
+	print("  GetSignCount():    " + AISign.GetSignCount());
+	for (local i = -1; i < AISign.GetMaxSignID() + 1; i++) {
+		if (AISign.IsValidSign(i)) j++;
 		print("  Sign " + i);
-		print("    IsValidSign():   " + sign.IsValidSign(i));
-		print("    GetText():       " + sign.GetText(i));
-		print("    GetLocation():   " + sign.GetLocation(i));
+		print("    IsValidSign():   " + AISign.IsValidSign(i));
+		print("    GetText():       " + AISign.GetText(i));
+		print("    GetLocation():   " + AISign.GetLocation(i));
 	}
 	print("  Valid Signs:       " + j);
-	print("  GetSignCount():    " + sign.GetSignCount());
+	print("  GetSignCount():    " + AISign.GetSignCount());
 }
 
 function Regression::Station()
 {
-	local station = AIStation();
-
 	print("");
 	print("--Station--");
-	print("  IsValidStation(0):        " + station.IsValidStation(0));
-	print("  IsValidStation(1000):     " + station.IsValidStation(1000));
-	print("  GetName(0):               " + station.GetName(0));
-	print("  GetLocation(1):           " + station.GetLocation(1));
-	print("  GetLocation(1000):        " + station.GetLocation(1000));
-	print("  GetStationID(33411):      " + station.GetStationID(33411));
-	print("  GetStationID(34411):      " + station.GetStationID(34411));
-	print("  GetCargoWaiting(0, 0):    " + station.GetCargoWaiting(0, 0));
-	print("  GetCargoWaiting(1000, 0): " + station.GetCargoWaiting(1000, 0));
-	print("  GetCargoWaiting(0, 1000): " + station.GetCargoWaiting(0, 1000));
+	print("  IsValidStation(0):        " + AIStation.IsValidStation(0));
+	print("  IsValidStation(1000):     " + AIStation.IsValidStation(1000));
+	print("  GetName(0):               " + AIStation.GetName(0));
+	print("  GetLocation(1):           " + AIStation.GetLocation(1));
+	print("  GetLocation(1000):        " + AIStation.GetLocation(1000));
+	print("  GetStationID(33411):      " + AIStation.GetStationID(33411));
+	print("  GetStationID(34411):      " + AIStation.GetStationID(34411));
+	print("  GetCargoWaiting(0, 0):    " + AIStation.GetCargoWaiting(0, 0));
+	print("  GetCargoWaiting(1000, 0): " + AIStation.GetCargoWaiting(1000, 0));
+	print("  GetCargoWaiting(0, 1000): " + AIStation.GetCargoWaiting(0, 1000));
 
-	print("  GetCoverageRadius(bus):   " + station.GetCoverageRadius(AIStation.STATION_BUS_STOP));
-	print("  GetCoverageRadius(truck): " + station.GetCoverageRadius(AIStation.STATION_TRUCK_STOP));
-	print("  GetCoverageRadius(train): " + station.GetCoverageRadius(AIStation.STATION_TRAIN));
+	print("  GetCoverageRadius(bus):   " + AIStation.GetCoverageRadius(AIStation.STATION_BUS_STOP));
+	print("  GetCoverageRadius(truck): " + AIStation.GetCoverageRadius(AIStation.STATION_TRUCK_STOP));
+	print("  GetCoverageRadius(train): " + AIStation.GetCoverageRadius(AIStation.STATION_TRAIN));
 
 	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
 
@@ -773,23 +749,22 @@
 
 function Regression::Town()
 {
-	local town = AITown();
 	local j = 0;
 
 	print("");
 	print("--Town--");
-	print("  GetMaxTownID():    " + town.GetMaxTownID());
-	print("  GetTownCount():    " + town.GetTownCount());
-	for (local i = -1; i < town.GetMaxTownID() + 1; i++) {
-		if (town.IsValidTown(i)) j++;
+	print("  GetMaxTownID():    " + AITown.GetMaxTownID());
+	print("  GetTownCount():    " + AITown.GetTownCount());
+	for (local i = -1; i < AITown.GetMaxTownID() + 1; i++) {
+		if (AITown.IsValidTown(i)) j++;
 		print("  Town " + i);
-		print("    IsValidTown():   " + town.IsValidTown(i));
-		print("    GetName():       " + town.GetName(i));
-		print("    GetPopulation(): " + town.GetPopulation(i));
-		print("    GetLocation():   " + town.GetLocation(i));
+		print("    IsValidTown():   " + AITown.IsValidTown(i));
+		print("    GetName():       " + AITown.GetName(i));
+		print("    GetPopulation(): " + AITown.GetPopulation(i));
+		print("    GetLocation():   " + AITown.GetLocation(i));
 	}
 	print("  Valid Towns:       " + j);
-	print("  GetTownCount():    " + town.GetTownCount());
+	print("  GetTownCount():    " + AITown.GetTownCount());
 }
 
 function Regression::TownList()
@@ -827,87 +802,85 @@
 function Regression::Vehicle()
 {
 	local accounting = AIAccounting();
-	local company = AICompany();
-	local vehicle = AIVehicle();
 
 	print("");
 	print("--Vehicle--");
-	print("  IsValidVehicle(-1):   " + vehicle.IsValidVehicle(-1));
-	print("  IsValidVehicle(0):    " + vehicle.IsValidVehicle(0));
-	print("  IsValidVehicle(11):   " + vehicle.IsValidVehicle(11));
-	print("  ISValidVehicle(9999): " + vehicle.IsValidVehicle(9999));
+	print("  IsValidVehicle(-1):   " + AIVehicle.IsValidVehicle(-1));
+	print("  IsValidVehicle(0):    " + AIVehicle.IsValidVehicle(0));
+	print("  IsValidVehicle(11):   " + AIVehicle.IsValidVehicle(11));
+	print("  ISValidVehicle(9999): " + AIVehicle.IsValidVehicle(9999));
 
-	local bank = company.GetBankBalance(AICompany.MY_COMPANY);
+	local bank = AICompany.GetBankBalance(AICompany.MY_COMPANY);
 
 	{
 		local transaction = AITransactionMode();
-		print("  BuildVehicle():       " + vehicle.BuildVehicle(33417, 153));
-		print("  IsValidVehicle(11):   " + vehicle.IsValidVehicle(11));
+		print("  BuildVehicle():       " + AIVehicle.BuildVehicle(33417, 153));
+		print("  IsValidVehicle(11):   " + AIVehicle.IsValidVehicle(11));
 
 		print("  --Transaction--");
 		print("    GetCosts():         " + transaction.GetCosts());
 		print("    Execute():          " + transaction.Execute());
 
-		print("  IsValidVehicle(11):   " + vehicle.IsValidVehicle(11));
+		print("  IsValidVehicle(11):   " + AIVehicle.IsValidVehicle(11));
 	}
-	print("  CloneVehicle():       " + vehicle.CloneVehicle(33417, 11, true));
+	print("  CloneVehicle():       " + AIVehicle.CloneVehicle(33417, 11, true));
 
-	local bank_after = company.GetBankBalance(AICompany.MY_COMPANY);
+	local bank_after = AICompany.GetBankBalance(AICompany.MY_COMPANY);
 
 	print("  --Accounting--");
 	print("    GetCosts():         " + accounting.GetCosts());
 	print("    Should be:          " + (bank - bank_after));
 	print("    ResetCosts():       " + accounting.ResetCosts());
 
-	bank = company.GetBankBalance(AICompany.MY_COMPANY);
+	bank = AICompany.GetBankBalance(AICompany.MY_COMPANY);
 
-	print("  SellVehicle(12):      " + vehicle.SellVehicle(12));
-	print("  IsInDepot():          " + vehicle.IsInDepot(11));
-	print("  IsStoppedInDepot():   " + vehicle.IsStoppedInDepot(11));
-	print("  StartStopVehicle():   " + vehicle.StartStopVehicle(11));
-	print("  IsInDepot():          " + vehicle.IsInDepot(11));
-	print("  IsStoppedInDepot():   " + vehicle.IsStoppedInDepot(11));
-	print("  SendVehicleToDepot(): " + vehicle.SendVehicleToDepot(11));
-	print("  IsInDepot():          " + vehicle.IsInDepot(11));
-	print("  IsStoppedInDepot():   " + vehicle.IsStoppedInDepot(11));
+	print("  SellVehicle(12):      " + AIVehicle.SellVehicle(12));
+	print("  IsInDepot():          " + AIVehicle.IsInDepot(11));
+	print("  IsStoppedInDepot():   " + AIVehicle.IsStoppedInDepot(11));
+	print("  StartStopVehicle():   " + AIVehicle.StartStopVehicle(11));
+	print("  IsInDepot():          " + AIVehicle.IsInDepot(11));
+	print("  IsStoppedInDepot():   " + AIVehicle.IsStoppedInDepot(11));
+	print("  SendVehicleToDepot(): " + AIVehicle.SendVehicleToDepot(11));
+	print("  IsInDepot():          " + AIVehicle.IsInDepot(11));
+	print("  IsStoppedInDepot():   " + AIVehicle.IsStoppedInDepot(11));
 
-	bank_after = company.GetBankBalance(AICompany.MY_COMPANY);
+	bank_after = AICompany.GetBankBalance(AICompany.MY_COMPANY);
 
 	print("  --Accounting--");
 	print("    GetCosts():         " + accounting.GetCosts());
 	print("    Should be:          " + (bank - bank_after));
 
-	print("  GetName():            " + vehicle.GetName(11));
-	print("  SetName():            " + vehicle.SetName(11, "MyVehicleName"));
-	print("  GetName():            " + vehicle.GetName(11));
-	print("  CloneVehicle():       " + vehicle.CloneVehicle(33417, 11, true));
+	print("  GetName():            " + AIVehicle.GetName(11));
+	print("  SetName():            " + AIVehicle.SetName(11, "MyVehicleName"));
+	print("  GetName():            " + AIVehicle.GetName(11));
+	print("  CloneVehicle():       " + AIVehicle.CloneVehicle(33417, 11, true));
 
 	print("  --VehicleData--");
-	print("    GetLocation():       " + vehicle.GetLocation(11));
-	print("    GetEngineType():     " + vehicle.GetEngineType(11));
-	print("    GetUnitNumber():     " + vehicle.GetUnitNumber(11));
-	print("    GetAge():            " + vehicle.GetAge(11));
-	print("    GetMaxAge():         " + vehicle.GetMaxAge(11));
-	print("    GetAgeLeft():        " + vehicle.GetAgeLeft(11));
-	print("    GetRunningCost():    " + vehicle.GetRunningCost(11));
-	print("    GetProfitThisYear(): " + vehicle.GetProfitThisYear(11));
-	print("    GetProfitLastYear(): " + vehicle.GetProfitLastYear(11));
-	print("    GetVehicleType():    " + vehicle.GetVehicleType(11));
-	print("    IsInDepot():         " + vehicle.IsInDepot(11));
-	print("    IsStoppedInDepot():  " + vehicle.IsStoppedInDepot(11));
+	print("    GetLocation():       " + AIVehicle.GetLocation(11));
+	print("    GetEngineType():     " + AIVehicle.GetEngineType(11));
+	print("    GetUnitNumber():     " + AIVehicle.GetUnitNumber(11));
+	print("    GetAge():            " + AIVehicle.GetAge(11));
+	print("    GetMaxAge():         " + AIVehicle.GetMaxAge(11));
+	print("    GetAgeLeft():        " + AIVehicle.GetAgeLeft(11));
+	print("    GetRunningCost():    " + AIVehicle.GetRunningCost(11));
+	print("    GetProfitThisYear(): " + AIVehicle.GetProfitThisYear(11));
+	print("    GetProfitLastYear(): " + AIVehicle.GetProfitLastYear(11));
+	print("    GetVehicleType():    " + AIVehicle.GetVehicleType(11));
+	print("    IsInDepot():         " + AIVehicle.IsInDepot(11));
+	print("    IsStoppedInDepot():  " + AIVehicle.IsStoppedInDepot(11));
 
-	print("  BuildVehicle():       " + vehicle.BuildVehicle(32119, 219));
-	print("  IsValidVehicle(13):   " + vehicle.IsValidVehicle(13));
-	print("  IsInDepot(13):        " + vehicle.IsInDepot(13));
-	print("  IsStoppedInDepot(13): " + vehicle.IsStoppedInDepot(13));
-	print("  IsValidVehicle(14):   " + vehicle.IsValidVehicle(14));
-	print("  IsInDepot(14):        " + vehicle.IsInDepot(14));
-	print("  IsStoppedInDepot(14): " + vehicle.IsStoppedInDepot(14));
+	print("  BuildVehicle():       " + AIVehicle.BuildVehicle(32119, 219));
+	print("  IsValidVehicle(13):   " + AIVehicle.IsValidVehicle(13));
+	print("  IsInDepot(13):        " + AIVehicle.IsInDepot(13));
+	print("  IsStoppedInDepot(13): " + AIVehicle.IsStoppedInDepot(13));
+	print("  IsValidVehicle(14):   " + AIVehicle.IsValidVehicle(14));
+	print("  IsInDepot(14):        " + AIVehicle.IsInDepot(14));
+	print("  IsStoppedInDepot(14): " + AIVehicle.IsStoppedInDepot(14));
 
-	print("  BuildVehicle():       " + vehicle.BuildVehicle(28479, 204));
-	print("  IsValidVehicle(15):   " + vehicle.IsValidVehicle(15));
-	print("  IsInDepot(15):        " + vehicle.IsInDepot(15));
-	print("  IsStoppedInDepot(15): " + vehicle.IsStoppedInDepot(15));
+	print("  BuildVehicle():       " + AIVehicle.BuildVehicle(28479, 204));
+	print("  IsValidVehicle(15):   " + AIVehicle.IsValidVehicle(15));
+	print("  IsInDepot(15):        " + AIVehicle.IsInDepot(15));
+	print("  IsStoppedInDepot(15): " + AIVehicle.IsStoppedInDepot(15));
 
 	local list = AIVehicleList();