From 52a61a069d7c70b3e9b078faeb0994ee9de0441a Mon Sep 17 00:00:00 2001
From: krzychu124
Date: Mon, 12 Dec 2022 18:26:51 +0100
Subject: [PATCH 1/4] what's new changelog update for release
---
TLM/SharedAssemblyInfo.cs | 2 +-
TLM/TLM/Resources/whats_new.txt | 18 ++++++++++--------
TLM/TLM/UI/WhatsNew/WhatsNew.cs | 2 +-
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/TLM/SharedAssemblyInfo.cs b/TLM/SharedAssemblyInfo.cs
index 1078f5cd6..b7a4568a5 100644
--- a/TLM/SharedAssemblyInfo.cs
+++ b/TLM/SharedAssemblyInfo.cs
@@ -20,4 +20,4 @@
// Minor Version
// Build Number
// Revision
-[assembly: AssemblyVersion("11.7.2.*")]
+[assembly: AssemblyVersion("11.7.3.*")]
diff --git a/TLM/TLM/Resources/whats_new.txt b/TLM/TLM/Resources/whats_new.txt
index 440e1dadc..f5a3d071f 100644
--- a/TLM/TLM/Resources/whats_new.txt
+++ b/TLM/TLM/Resources/whats_new.txt
@@ -1,10 +1,12 @@
-[Version] 11.7.2.0
-[Released] Nov 15th 2022
-[Link] tmpe-v11720-stable-15112022
+[Version] 11.7.3.0
+[Released] Dec 13th 2022
+[Link] tmpe-v11730-stable-13122022
[Stable]
-[Meta] Compatibility patch for the game update 1.15.1-f4 (krzychu124)
-[New] Clear all TM:PE rules from selected node #692, #1668 (kianzarrin)
-[Fixed] Timed Traffic Lights wait = 0 issues #1497, #1674 (kianzarrin)
-[Updated] Minor changes to Timed Traffic Lights sensitivity slider #1670 (kianzarrin)
-[Updated] Pedestrian zone roads have now lower priority when setting up high priority road #1653 (kianzarrin)
+[Meta] Compatibility patch for the game update 1.16.0-f3 (krzychu124)
+[New] Improved bus/trolleybus stop path #1688, #1690 (kianzarrin)
+[Fixed] Cargo truck pathfinding via CargoVehicle networks (cargo stations/terminals) #1701, #1703 (krzychu124)
+[Fixed] Lane connector on overlapping lanes #1706 (kianzarrin)
+[Fixed] Parking signs on lanes with bus stop #1707 (kianzarrin)
+[Updated] Minor changes in debug tools #1696, #1697 (kianzarrin)
+[Updated] TMPE API Updates compatibility with other mods #1689 #1692 (kianzarrin)
[/Version]
\ No newline at end of file
diff --git a/TLM/TLM/UI/WhatsNew/WhatsNew.cs b/TLM/TLM/UI/WhatsNew/WhatsNew.cs
index cc8a84775..a73e2ee1c 100644
--- a/TLM/TLM/UI/WhatsNew/WhatsNew.cs
+++ b/TLM/TLM/UI/WhatsNew/WhatsNew.cs
@@ -11,7 +11,7 @@ namespace TrafficManager.UI.WhatsNew {
public class WhatsNew {
// bump and update what's new changelogs when new features added
- public static readonly Version CurrentVersion = new Version(11,7,2,0);
+ public static readonly Version CurrentVersion = new Version(11,7,3,0);
private const string WHATS_NEW_FILE = "whats_new.txt";
private const string RESOURCES_PREFIX = "TrafficManager.Resources.";
From 6e29fb908e555166dc6eba8d325ee73c06328835 Mon Sep 17 00:00:00 2001
From: krzychu124
Date: Tue, 13 Dec 2022 09:59:35 +0100
Subject: [PATCH 2/4] Rephrased description of what's new message, updated game
version
---
TLM/TLM/Resources/whats_new.txt | 2 +-
TLM/TLM/Util/VersionUtil.cs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/TLM/TLM/Resources/whats_new.txt b/TLM/TLM/Resources/whats_new.txt
index f5a3d071f..919312d54 100644
--- a/TLM/TLM/Resources/whats_new.txt
+++ b/TLM/TLM/Resources/whats_new.txt
@@ -3,7 +3,7 @@
[Link] tmpe-v11730-stable-13122022
[Stable]
[Meta] Compatibility patch for the game update 1.16.0-f3 (krzychu124)
-[New] Improved bus/trolleybus stop path #1688, #1690 (kianzarrin)
+[New] Improved bus/trolleybus stop path (pull to side earlier and use more of available space) #1688, #1690 (kianzarrin)
[Fixed] Cargo truck pathfinding via CargoVehicle networks (cargo stations/terminals) #1701, #1703 (krzychu124)
[Fixed] Lane connector on overlapping lanes #1706 (kianzarrin)
[Fixed] Parking signs on lanes with bus stop #1707 (kianzarrin)
diff --git a/TLM/TLM/Util/VersionUtil.cs b/TLM/TLM/Util/VersionUtil.cs
index b86a38619..8e0bd27ac 100644
--- a/TLM/TLM/Util/VersionUtil.cs
+++ b/TLM/TLM/Util/VersionUtil.cs
@@ -35,10 +35,10 @@ public static class VersionUtil {
// we could alternatively use BuildConfig.APPLICATION_VERSION because const values are evaluated at compile time.
// but I have decided not to do this because I don't want this to happen automatically with a rebuild if
// CS updates. these values should be changed manually so as to force us to acknowledge that they have changed.
- public const uint EXPECTED_GAME_VERSION_U = 197387280U;
+ public const uint EXPECTED_GAME_VERSION_U = 201450256U;
// see comments for EXPECTED_GAME_VERSION_U.
- public static Version ExpectedGameVersion => new Version(1, 15, 1, 4);
+ public static Version ExpectedGameVersion => new Version(1, 16, 0, 3);
public static string ExpectedGameVersionString => BuildConfig.VersionToString(EXPECTED_GAME_VERSION_U, false);
From ba27a0fe460798deac786517b6e6d00755f959f8 Mon Sep 17 00:00:00 2001
From: krzychu124
Date: Tue, 13 Dec 2022 10:30:33 +0100
Subject: [PATCH 3/4] Compatibility change for 1.16.0-f3
---
TLM/TLM/Custom/PathFinding/CustomPathFind.cs | 11 +++++------
TLM/TLM/Util/Extensions/VehicleExtensions.cs | 3 ++-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/TLM/TLM/Custom/PathFinding/CustomPathFind.cs b/TLM/TLM/Custom/PathFinding/CustomPathFind.cs
index 31cfa97fb..a05a3db6f 100644
--- a/TLM/TLM/Custom/PathFinding/CustomPathFind.cs
+++ b/TLM/TLM/Custom/PathFinding/CustomPathFind.cs
@@ -2642,12 +2642,6 @@ private struct BufferItem {
$"\toffsetLength={offsetLength}");
}
#endif
- if ((vehicleCategory_ & VehicleInfo.VehicleCategory.PublicTransportRoad) != 0 &&
- (vehicleCategory_ & ~(VehicleInfo.VehicleCategory.Bus | VehicleInfo.VehicleCategory.Trolleybus | VehicleInfo.VehicleCategory.Taxi)) == 0)
- {
- offsetLength *= 0.75f;
- }
-
float baseLength = offsetLength / (prevLaneSpeed * maxLength_); // NON-STOCK CODE
float comparisonValue = item.ComparisonValue; // NON-STOCK CODE
#if ROUTING
@@ -3142,6 +3136,11 @@ private struct BufferItem {
$"ProcessItemCosts: Adding next item\n\tnextItem={nextItem}");
}
+ if ((nextLaneInfo.vehicleCategory & VehicleInfo.VehicleCategory.PublicTransportRoad) != 0 &&
+ (nextLaneInfo.vehicleCategory & ~(VehicleInfo.VehicleCategory.Bus | VehicleInfo.VehicleCategory.Trolleybus | VehicleInfo.VehicleCategory.Taxi)) == 0) {
+ nextItem.ComparisonValue -= baseLength * 0.25f;
+ }
+
AddBufferItem(
#if DEBUG
isLogEnabled,
diff --git a/TLM/TLM/Util/Extensions/VehicleExtensions.cs b/TLM/TLM/Util/Extensions/VehicleExtensions.cs
index 97f220242..4c6fab030 100644
--- a/TLM/TLM/Util/Extensions/VehicleExtensions.cs
+++ b/TLM/TLM/Util/Extensions/VehicleExtensions.cs
@@ -118,7 +118,8 @@ public static ExtVehicleType ToExtVehicleType(this uint vehicleId)
VehicleInfo.VehicleCategory.MaintenanceTruck |
VehicleInfo.VehicleCategory.ParkTruck |
VehicleInfo.VehicleCategory.PostTruck |
- VehicleInfo.VehicleCategory.SnowTruck)) != 0) {
+ VehicleInfo.VehicleCategory.SnowTruck |
+ VehicleInfo.VehicleCategory.BankTruck)) != 0) {
return ExtVehicleType.Service;
} else if ((category & VehicleInfo.VehicleCategory.Bus) != 0) {
return ExtVehicleType.Bus;
From f249e6101246cb9799577d39e442e8a07e87b22b Mon Sep 17 00:00:00 2001
From: krzychu124
Date: Tue, 13 Dec 2022 10:57:54 +0100
Subject: [PATCH 4/4] Changelog file update
---
CHANGELOG.md | 22 ++++++++++++++++++++++
README.md | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdebec571..0442515fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,28 @@ This changelog includes all versions and major variants of the mod going all the
> Date format: dd/mm/yyyy
+#### TM:PE V[11.7.3.0](https://github.com/CitiesSkylinesMods/TMPE/compare/11.7.2.0...11.7.3.0) STABLE, 13/12/2022
+
+- [Meta] Compatibility patch for the game update 1.16.0-f3 (krzychu124)
+- [New] Improved bus/trolleybus stop path (pull to side earlier and use more of available space) #1688, #1690 (kianzarrin)
+- [Fixed] Cargo truck pathfinding via CargoVehicle networks (cargo stations/terminals) #1701, #1703 (krzychu124)
+- [Fixed] Lane connector on overlapping lanes #1706 (kianzarrin)
+- [Fixed] Parking signs on lanes with bus stop #1707 (kianzarrin)
+- [Updated] Minor changes in debug tools #1696, #1697 (kianzarrin)
+- [Updated] TMPE API Updates compatibility with other mods #1689 #1692 (kianzarrin)
+- [Steam] [TM:PE v11 STABLE](https://steamcommunity.com/sharedfiles/filedetails/?id=1637663252)
+
+#### TM:PE V11.7.3.0 TEST, 13/12/2022
+
+- [Meta] Compatibility patch for the game update 1.16.0-f3 (krzychu124)
+- [New] Improved bus/trolleybus stop path (pull to side earlier and use more of available space) #1688, #1690 (kianzarrin)
+- [Fixed] Cargo truck pathfinding via CargoVehicle networks (cargo stations/terminals) #1701, #1703 (krzychu124)
+- [Fixed] Lane connector on overlapping lanes #1706 (kianzarrin)
+- [Fixed] Parking signs on lanes with bus stop #1707 (kianzarrin)
+- [Updated] Minor changes in debug tools #1696, #1697 (kianzarrin)
+- [Updated] TMPE API Updates compatibility with other mods #1689 #1692 (kianzarrin)
+- [Steam] [TM:PE v11 TEST](https://steamcommunity.com/sharedfiles/filedetails/?id=2489276785)
+
#### TM:PE V[11.7.2.0](https://github.com/CitiesSkylinesMods/TMPE/compare/11.7.1.2...11.7.2.0) STABLE, 15/11/2022
- [Meta] Compatibility patch for the game update 1.15.1-f4 (krzychu124)
diff --git a/README.md b/README.md
index 3e15feebd..47401d08b 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
Report a Bug
-
+