cpp/openttd-patchpack/source Changeset - r25961:cdb060badef0

Changeset - r25961:cdb060badef0

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

SamuXarick - 3 years ago 2021-09-14 20:06:55
43006711+SamuXarick@users.noreply.github.com

Feature: [AI/GS] Missing water related functions and objects (#8390)

8 files changed with 319 insertions and 61 deletions:

regression/regression/main.nut

regression/regression/result.txt

232

src/script/api/ai_changelog.hpp

src/script/api/game_changelog.hpp

src/script/api/script_marine.cpp

src/script/api/script_marine.hpp

src/script/api/script_tile.cpp

src/script/api/script_tile.hpp

0 comments (0 inline, 0 general)

regression/regression/main.nut

➞

Show inline comments

@@ @@ -544,21 +544,24 @@ function Regression::Prices() @@
 	print("  ROADTYPE_TRAM,BT_BUS_STOP:   " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_TRAM, AIRoad.BT_BUS_STOP));
 	print("  ROADTYPE_TRAM,BT_TRUCK_STOP: " + AIRoad.GetBuildCost(AIRoad.ROADTYPE_TRAM, AIRoad.BT_TRUCK_STOP));
 	print(" -Water-");
 	print("  BT_DOCK:  " + AIMarine.GetBuildCost(AIMarine.BT_DOCK));
 	print("  BT_DEPOT: " + AIMarine.GetBuildCost(AIMarine.BT_DEPOT));
 	print("  BT_BUOY:  " + AIMarine.GetBuildCost(AIMarine.BT_BUOY));
 	print("  BT_LOCK:  " + AIMarine.GetBuildCost(AIMarine.BT_LOCK));
 	print("  BT_CANAL: " + AIMarine.GetBuildCost(AIMarine.BT_CANAL));
 	print(" -Tile-");
 	print("  BT_FOUNDATION:   " + AITile.GetBuildCost(AITile.BT_FOUNDATION));
 	print("  BT_TERRAFORM:    " + AITile.GetBuildCost(AITile.BT_TERRAFORM));
 	print("  BT_BUILD_TREES:  " + AITile.GetBuildCost(AITile.BT_BUILD_TREES));
 	print("  BT_CLEAR_GRASS:  " + AITile.GetBuildCost(AITile.BT_CLEAR_GRASS));
 	print("  BT_CLEAR_ROUGH:  " + AITile.GetBuildCost(AITile.BT_CLEAR_ROUGH));
 	print("  BT_CLEAR_ROCKY:  " + AITile.GetBuildCost(AITile.BT_CLEAR_ROCKY));
 	print("  BT_CLEAR_FIELDS: " + AITile.GetBuildCost(AITile.BT_CLEAR_FIELDS));
 	print("  BT_CLEAR_HOUSE:  " + AITile.GetBuildCost(AITile.BT_CLEAR_HOUSE));
 	print("  BT_CLEAR_WATER:  " + AITile.GetBuildCost(AITile.BT_CLEAR_WATER));
+}
 function cost_callback(old_path, new_tile, new_direction, self) { if (old_path == null) return 0; return old_path.GetCost() + 1; }
 function estimate_callback(tile, direction, goals, self) { return goals[0] - tile; }
 function neighbours_callback(path, cur_tile, self) { return [[cur_tile + 1, 1]]; }
 function check_direction_callback(tile, existing_direction, new_direction, self) { return false; }
@@ @@ -916,12 +919,15 @@ function Regression::Marine() @@
 	print("  IsLockTile():         " + AIMarine.IsLockTile(28487));
 	print("  IsCanalTile():        " + AIMarine.IsCanalTile(32127));
 	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
 	print("  BuildWaterDepot():    " + AIMarine.BuildWaterDepot(28479, 28480));
 	print("  BuildDock():          " + AIMarine.BuildDock(29253, AIStation.STATION_JOIN_ADJACENT));
 	print("  BuildBuoy():          " + AIMarine.BuildBuoy(28481));
 	print("  BuildLock():          " + AIMarine.BuildLock(28487));
 	print("  BuildCanal():         " + AIMarine.BuildCanal(28744));
+}
 function Regression::Order()
+{
 	print("");
 	print("--Order--");
@@ @@ -1467,15 +1473,47 @@ function Regression::TileList() @@
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
-	list.AddRectangle(54421 - 256 * 2, 256 * 2 + 54421 + 8);
+	list.AddRectangle(0x6F3F, 0x7248);
 	list.Valuate(AITile.IsWaterTile);
 	print("  Water():             done");
 	print("  IsWaterTile():       done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AITile.IsSeaTile);
 	print("  IsSeaTile():         done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AITile.IsRiverTile);
 	print("  IsRiverTile()        done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AIMarine.IsCanalTile);
 	print("  IsCanalTile()        done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}
 	list.Valuate(AITile.IsCoastTile);
 	print("  IsCoastTile()        done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
+	}

regression/regression/result.txt

➞

Show inline comments

@@ @@ -7362,12 +7362,15 @@ ERROR: IsEnd() is invalid as Begin() is @@
   IsBuoyTile():         false
   IsLockTile():         false
   IsCanalTile():        false
   GetBankBalance():     1999959285
   BuildWaterDepot():    true
   BuildDock():          true
   BuildBuoy():          true
   BuildLock():          true
   BuildCanal():         true
 --Prices--
  -Rail-
 ,BT_TRACK:    75
 ,BT_SIGNAL:   48
 ,BT_DEPOT:    450
@@ @@ -7388,21 +7391,24 @@ ERROR: IsEnd() is invalid as Begin() is @@
   ROADTYPE_TRAM,BT_BUS_STOP:   -1
   ROADTYPE_TRAM,BT_TRUCK_STOP: -1
  -Water-
   BT_DOCK:  262
   BT_DEPOT: 525
   BT_BUOY:  262
   BT_LOCK:  5625
   BT_CANAL: 3750
  -Tile-
   BT_FOUNDATION:   187
   BT_TERRAFORM:    187
   BT_BUILD_TREES:  15
   BT_CLEAR_GRASS:  15
   BT_CLEAR_ROUGH:  30
   BT_CLEAR_ROCKY:  150
   BT_CLEAR_FIELDS: 375
   BT_CLEAR_HOUSE:  1200
   BT_CLEAR_WATER:  7500
 --Rail--
     IsRailTile():                  false
     BuildRailTrack():              true
     BuildSignal():                 true
     RemoveRailTrack():             false
@@ @@ -8447,60 +8453,227 @@ ERROR: IsEnd() is invalid as Begin() is @@
   Count():             0
   ListDump:
   NeighbourRoadCount():done
   KeepValue(1):        done
   Count():             0
   ListDump:
   Water():             done
   Count():             45
   IsWaterTile():       done
   Count():             40
   ListDump:
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
   IsSeaTile():         done
   Count():             40
   ListDump:
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
   IsRiverTile()        done
   Count():             40
   ListDump:
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
   IsCanalTile()        done
   Count():             40
   ListDump:
 => 1
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
   IsCoastTile()        done
   Count():             40
   ListDump:
 => 1
 => 1
 => 1
 => 1
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 => 0
 --TileList_IndustryAccepting--
   Count():             47
   Location ListDump:
 => 16
 => 16
@@ @@ -9096,28 +9269,28 @@ ERROR: IsEnd() is invalid as Begin() is @@
   GetName():            MyVehicleName
   CloneVehicle():       13
   --VehicleData--
     GetLocation():       33417
     GetEngineType():     153
     GetUnitNumber():     1
-    GetAge():            0
+    GetAge():            1
     GetMaxAge():         5490
-    GetAgeLeft():        5490
+    GetAgeLeft():        5489
     GetCurrentSpeed():   7
     GetRunningCost():    421
-    GetProfitThisYear(): 0
+    GetProfitThisYear(): -1
     GetProfitLastYear(): 0
     GetCurrentValue():   5947
     GetVehicleType():    1
     GetRoadType():       0
     GetCapacity():       12
     GetCargoLoad():      0
     IsInDepot():         false
     GetNumWagons():      1
     GetWagonEngineType(): 153
-    GetWagonAge():       0
+    GetWagonAge():       1
     GetLength():         8
   GetOwner():           1
   BuildVehicle():       14
   IsValidVehicle(14):   true
   IsInDepot(14):        true
   IsStoppedInDepot(14): true
@@ @@ -9136,15 +9309,15 @@ ERROR: IsEnd() is invalid as Begin() is @@
   IsValidVehicle(18):   true
   IsValidVehicle(19):   false
   MoveWagonChain():     true
   GetNumWagons():       3
   GetLength():          24
   GetWagonEngineType(): 9
-  GetWagonAge():        1
+  GetWagonAge():        0
   GetWagonEngineType(): 27
-  GetWagonAge():        1
+  GetWagonAge():        0
   GetWagonEngineType(): 27
   GetWagonAge():        0
   GetWagonEngineType(): 65535
   GetWagonAge():        -1
   --Refit--
     GetBuildWithRefitCapacity(): -1
@@ @@ -9184,27 +9357,27 @@ ERROR: IsEnd() is invalid as Begin() is @@
 => 2
 => 1
 => 1
 => 1
 => 1
   Age ListDump:
 => 1
 => 1
 => 1
 => 1
 => 1
 => 0
 => 0
 => 0
   MaxAge ListDump:
 => 10980
 => 10980
 => 7320
 => 5490
 => 5490
   AgeLeft ListDump:
 => 10979
 => 10979
 => 7319
 => 10980
 => 10980
 => 7320
 => 5489
 => 5489
   CurrentSpeed ListDump:
 => 27
 => 0
 => 0

src/script/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -18,12 +18,17 @@ @@
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * API additions:
  * \li AINewGRF
  * \li AINewGRFList
  * \li AIGroup::GetNumVehicles
  * \li AIMarine::BT_LOCK
  * \li AIMarine::BT_CANAL
  * \li AITile::IsSeaTile
  * \li AITile::IsRiverTile
  * \li AITile::BT_CLEAR_WATER
+ *
  * \b 1.11.0
+ *
  * API additions:
  * \li AICargo::GetName
  * \li AIPriorityQueue

src/script/api/game_changelog.hpp

➞

Show inline comments

@@ @@ -17,12 +17,17 @@ @@
+ *
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * API additions:
  * \li GSNewGRF
  * \li GSNewGRFList
  * \li GSMarine::BT_LOCK
  * \li GSMarine::BT_CANAL
  * \li GSTile::IsSeaTile
  * \li GSTile::IsRiverTile
  * \li GSTile::BT_CLEAR_WATER
+ *
  * \b 1.11.0
+ *
  * API additions:
  * \li GSCargo::GetName
  * \li GSEventStoryPageButtonClick

src/script/api/script_marine.cpp

➞

Show inline comments

@@ @@ -164,9 +164,11 @@ @@
 /* static */ Money ScriptMarine::GetBuildCost(BuildType build_type)
+{
 	switch (build_type) {
 		case BT_DOCK:  return ::GetPrice(PR_BUILD_STATION_DOCK, 1, nullptr);
 		case BT_DEPOT: return ::GetPrice(PR_BUILD_DEPOT_SHIP, 1, nullptr);
 		case BT_BUOY:  return ::GetPrice(PR_BUILD_WAYPOINT_BUOY, 1, nullptr);
 		case BT_LOCK:  return ::GetPrice(PR_BUILD_LOCK, 1, nullptr);
 		case BT_CANAL: return ::GetPrice(PR_BUILD_CANAL, 1, nullptr);
 		default: return -1;
+	}
+}

src/script/api/script_marine.hpp

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ public: @@
 	 * Types of water-related objects in the game.
 	 */
 	enum BuildType {
 		BT_DOCK,  ///< Build a dock
 		BT_DEPOT, ///< Build a ship depot
 		BT_BUOY,  ///< Build a buoy
 		BT_LOCK,  ///< Build a lock
 		BT_CANAL, ///< Build a canal
 	};
 	/**
 	 * Checks whether the given tile is actually a tile with a water depot.
 	 * @param tile The tile to check.
 	 * @pre ScriptMap::IsValidTile(tile).

src/script/api/script_tile.cpp

➞

Show inline comments

@@ @@ -55,12 +55,26 @@ @@
+		}
+	}
 	return true;
+}
 /* static */ bool ScriptTile::IsSeaTile(TileIndex tile)
+{
 	if (!::IsValidTile(tile)) return false;
 	return ::IsTileType(tile, MP_WATER) && ::IsSea(tile);
+}
 /* static */ bool ScriptTile::IsRiverTile(TileIndex tile)
+{
 	if (!::IsValidTile(tile)) return false;
 	return ::IsTileType(tile, MP_WATER) && ::IsRiver(tile);
+}
 /* static */ bool ScriptTile::IsWaterTile(TileIndex tile)
+{
 	if (!::IsValidTile(tile)) return false;
 	return ::IsTileType(tile, MP_WATER) && !::IsCoast(tile);
+}
@@ @@ -317,9 +331,10 @@ @@
 		case BT_BUILD_TREES:  return ::GetPrice(PR_BUILD_TREES, 1, nullptr);
 		case BT_CLEAR_GRASS:  return ::GetPrice(PR_CLEAR_GRASS, 1, nullptr);
 		case BT_CLEAR_ROUGH:  return ::GetPrice(PR_CLEAR_ROUGH, 1, nullptr);
 		case BT_CLEAR_ROCKY:  return ::GetPrice(PR_CLEAR_ROCKS, 1, nullptr);
 		case BT_CLEAR_FIELDS: return ::GetPrice(PR_CLEAR_FIELDS, 1, nullptr);
 		case BT_CLEAR_HOUSE:  return ::GetPrice(PR_CLEAR_HOUSE, 1, nullptr);
 		case BT_CLEAR_WATER:  return ::GetPrice(PR_CLEAR_WATER, 1, nullptr);
 		default: return -1;
+	}
+}

src/script/api/script_tile.hpp

➞

Show inline comments

@@ @@ -116,12 +116,13 @@ public: @@
 		BT_BUILD_TREES,  ///< Build trees
 		BT_CLEAR_GRASS,  ///< Clear a tile with just grass
 		BT_CLEAR_ROUGH,  ///< Clear a rough tile
 		BT_CLEAR_ROCKY,  ///< Clear a tile with rocks
 		BT_CLEAR_FIELDS, ///< Clear a tile with farm fields
 		BT_CLEAR_HOUSE,  ///< Clear a tile with a house
 		BT_CLEAR_WATER,  ///< Clear a tile with either river or sea
 	};
 	/**
 	 * The types of terrain a tile can have.
+	 *
 	 * @note When a desert or rainforest tile are changed, their terrain type will remain the same. In other words, a sea tile can be of the desert terrain type.
@@ @@ -156,16 +157,33 @@ public: @@
 	 * @pre ScriptMap::IsValidTile(tile).
 	 * @return True if it is buildable, false if not.
 	 */
 	static bool IsBuildableRectangle(TileIndex tile, uint width, uint height);
 	/**
 	 * Checks whether the given tile is actually a sea tile.
 	 * @param tile The tile to check on.
 	 * @pre ScriptMap::IsValidTile(tile).
 	 * @return True if and only if the tile is a sea tile.
 	 */
 	static bool IsSeaTile(TileIndex tile);
 	/**
 	 * Checks whether the given tile is actually a river tile.
 	 * @param tile The tile to check on.
 	 * @pre ScriptMap::IsValidTile(tile).
 	 * @return True if and only if the tile is a river tile.
 	 */
 	static bool IsRiverTile(TileIndex tile);
 	/**
 	 * Checks whether the given tile is actually a water tile.
 	 * @param tile The tile to check on.
 	 * @pre ScriptMap::IsValidTile(tile).
 	 * @return True if and only if the tile is a water tile.
 	 * @note Returns false when a buoy is on the tile.
 	 */
 	static bool IsWaterTile(TileIndex tile);
 	/**
 	 * Checks whether the given tile is actually a coast tile.
 	 * @param tile The tile to check.

0 comments (0 inline, 0 general)