summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Nelson <peter1138@openttd.org>2019-02-14 23:12:26 +0000
committerMichael Lutz <michi@icosahedron.de>2019-03-08 16:52:08 +0100
commitb8a0107ad157e946c46a4e65cb3f63bec1812670 (patch)
tree9985a413faa7bad1c59fe9fb0bbc86df323450e7
parenta69eb5f516963f6f7a39f90d959cdff61e8e70b2 (diff)
downloadopenttd-b8a0107ad157e946c46a4e65cb3f63bec1812670.tar.xz
Change: Add configurable curve penalty for ships.
-rw-r--r--src/pathfinder/yapf/yapf_ship.cpp20
-rw-r--r--src/saveload/saveload.h1
-rw-r--r--src/settings_type.h2
-rw-r--r--src/table/settings.ini20
4 files changed, 39 insertions, 4 deletions
diff --git a/src/pathfinder/yapf/yapf_ship.cpp b/src/pathfinder/yapf/yapf_ship.cpp
index 5a8afc1b9..c71bf8af5 100644
--- a/src/pathfinder/yapf/yapf_ship.cpp
+++ b/src/pathfinder/yapf/yapf_ship.cpp
@@ -169,6 +169,21 @@ protected:
}
public:
+ inline int CurveCost(Trackdir td1, Trackdir td2)
+ {
+ assert(IsValidTrackdir(td1));
+ assert(IsValidTrackdir(td2));
+
+ if (HasTrackdir(TrackdirCrossesTrackdirs(td1), td2)) {
+ /* 90-deg curve penalty */
+ return Yapf().PfGetSettings().ship_curve90_penalty;
+ } else if (td2 != NextTrackdir(td1)) {
+ /* 45-deg curve penalty */
+ return Yapf().PfGetSettings().ship_curve45_penalty;
+ }
+ return 0;
+ }
+
/**
* Called by YAPF to calculate the cost from the origin to the given node.
* Calculates only the cost of given node, adds it to the parent node cost
@@ -179,10 +194,7 @@ public:
/* base tile cost depending on distance */
int c = IsDiagonalTrackdir(n.GetTrackdir()) ? YAPF_TILE_LENGTH : YAPF_TILE_CORNER_LENGTH;
/* additional penalty for curves */
- if (n.GetTrackdir() != NextTrackdir(n.m_parent->GetTrackdir())) {
- /* new trackdir does not match the next one when going straight */
- c += YAPF_TILE_LENGTH;
- }
+ c += CurveCost(n.m_parent->GetTrackdir(), n.GetTrackdir());
/* Skipped tile cost for aqueducts. */
c += YAPF_TILE_LENGTH * tf->m_tiles_skipped;
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index 36c9687ea..d881a76c2 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -292,6 +292,7 @@ enum SaveLoadVersion : uint16 {
SLV_SHIPS_STOP_IN_LOCKS, ///< 206 PR#7150 Ship/lock movement changes.
SLV_FIX_CARGO_MONITOR, ///< 207 PR#7175 v1.9 Cargo monitor data packing fix to support 64 cargotypes.
SLV_TOWN_CARGOGEN, ///< 208 PR#6965 New algorithms for town building cargo generation.
+ SLV_SHIP_CURVE_PENALTY, ///< 209 PR#7289 Configurable ship curve penalties.
SL_MAX_VERSION, ///< Highest possible saveload version
};
diff --git a/src/settings_type.h b/src/settings_type.h
index 6fba8ed2c..46df6c8ec 100644
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -418,6 +418,8 @@ struct YAPFSettings {
uint32 rail_longer_platform_per_tile_penalty; ///< penalty for longer station platform than train (per tile)
uint32 rail_shorter_platform_penalty; ///< penalty for shorter station platform than train
uint32 rail_shorter_platform_per_tile_penalty; ///< penalty for shorter station platform than train (per tile)
+ uint32 ship_curve45_penalty; ///< penalty for 45-deg curve for ships
+ uint32 ship_curve90_penalty; ///< penalty for 90-deg curve for ships
};
/** Settings related to all pathfinders. */
diff --git a/src/table/settings.ini b/src/table/settings.ini
index c2faa43ca..bb8769c4c 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2163,6 +2163,26 @@ min = 0
max = 1000000
cat = SC_EXPERT
+[SDT_VAR]
+base = GameSettings
+var = pf.yapf.ship_curve45_penalty
+type = SLE_UINT
+from = SLV_SHIP_CURVE_PENALTY
+def = 1 * YAPF_TILE_LENGTH
+min = 0
+max = 1000000
+cat = SC_EXPERT
+
+[SDT_VAR]
+base = GameSettings
+var = pf.yapf.ship_curve90_penalty
+type = SLE_UINT
+from = SLV_SHIP_CURVE_PENALTY
+def = 6 * YAPF_TILE_LENGTH
+min = 0
+max = 1000000
+cat = SC_EXPERT
+
##
[SDT_VAR]
base = GameSettings