Skip to content

Commit 8f8ed7d

Browse files
krzychu124krzychu124
authored
Merge pull request #1686 from CitiesSkylinesMods/game-update/compatibility_fix_1_15_1
Compatibility patch for 1.15.1-f4
2 parents 2d897c7 + 843fcb5 commit 8f8ed7d

File tree

7 files changed

+36
-32
lines changed

7 files changed

+36
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,24 @@ This changelog includes all versions and major variants of the mod going all the
2929

3030
> Date format: dd/mm/yyyy
3131
32+
#### 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
33+
34+
- [Meta] Compatibility patch for the game update 1.15.1-f4 (krzychu124)
35+
- [New] Clear all TM:PE rules from selected node #692, #1668 (kianzarrin)
36+
- [Fixed] Timed Traffic Lights wait = 0 issues #1497, #1674 (kianzarrin)
37+
- [Updated] Minor changes to Timed Traffic Lights sensitivity slider #1670 (kianzarrin)
38+
- [Updated] Pedestrian zone roads have now lower priority when setting up high priority road #1653 (kianzarrin)
39+
- [Steam] [TM:PE v11 STABLE](https://steamcommunity.com/sharedfiles/filedetails/?id=1637663252)
40+
41+
#### TM:PE V11.7.2.0 TEST, 15/11/2022
42+
43+
- [Meta] Compatibility patch for the game update 1.15.1-f4 (krzychu124)
44+
- [New] Clear all TM:PE rules from selected node #692, #1668 (kianzarrin)
45+
- [Fixed] Timed Traffic Lights wait = 0 issues #1497, #1674 (kianzarrin)
46+
- [Updated] Minor changes to Timed Traffic Lights sensitivity slider #1670 (kianzarrin)
47+
- [Updated] Pedestrian zone roads have now lower priority when setting up high priority road #1653 (kianzarrin)
48+
- [Steam] [TM:PE v11 TEST](https://steamcommunity.com/sharedfiles/filedetails/?id=2489276785)
49+
3250
#### TM:PE V[11.7.1.2](https://github.com/CitiesSkylinesMods/TMPE/compare/11.7.1.1...11.7.1.2) STABLE, 11/10/2022
3351

3452
- [Fixed] Game crash on load (krzychu124)

‎TLM/SharedAssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
// Minor Version
2121
// Build Number
2222
// Revision
23-
[assembly: AssemblyVersion("11.7.1.*")]
23+
[assembly: AssemblyVersion("11.7.2.*")]

‎TLM/TLM/Custom/PathFinding/CustomPathFind.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2630,6 +2630,11 @@ private bool ProcessItemCosts(
26302630
$"\toffsetLength={offsetLength}");
26312631
}
26322632
#endif
2633+
if ((vehicleCategory_ & VehicleInfo.VehicleCategory.PublicTransportRoad) != 0 &&
2634+
(vehicleCategory_ & ~(VehicleInfo.VehicleCategory.Bus | VehicleInfo.VehicleCategory.Trolleybus | VehicleInfo.VehicleCategory.Taxi)) == 0)
2635+
{
2636+
offsetLength *= 0.75f;
2637+
}
26332638

26342639
float baseLength = offsetLength / (prevLaneSpeed * maxLength_); // NON-STOCK CODE
26352640
float comparisonValue = item.ComparisonValue; // NON-STOCK CODE
@@ -3115,12 +3120,6 @@ private bool ProcessItemCosts(
31153120
}
31163121
}
31173122

3118-
if ((nextLaneInfo.vehicleCategory & VehicleInfo.VehicleCategory.PublicTransportRoad) != 0 &&
3119-
(nextLaneInfo.vehicleCategory & ~(VehicleInfo.VehicleCategory.Bus | VehicleInfo.VehicleCategory.Trolleybus | VehicleInfo.VehicleCategory.Taxi)) == 0)
3120-
{
3121-
nextItem.ComparisonValue /= 100f;
3122-
}
3123-
31243123
if (isLogEnabled) {
31253124
DebugLog(
31263125
unitId,

‎TLM/TLM/Patch/_VehicleAI/VehicleAICommons.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace TrafficManager.Patch._VehicleAI {
1212
using UnityEngine.UI;
1313

1414
public class VehicleAICommons {
15-
private static readonly float vanillaSlowDrivingSpeed = 0.16f;
15+
private static readonly float vanillaSlowDrivingSpeed = 0.4f;
1616

1717
private static CalculateTargetSpeedDelegate CalculateTargetSpeed = GameConnectionManager.Instance.VehicleAIConnection.CalculateTargetSpeed;
1818
private static CalculateTargetSpeedByNetInfoDelegate CalculateTargetSpeedByNetInfo = GameConnectionManager.Instance.VehicleAIConnection.CalculateTargetSpeedByNetInfo;

‎TLM/TLM/Resources/whats_new.txt‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1-
[Version] 11.7.1.2
2-
[Released] Oct 11th 2022
3-
[Link] tmpe-v11712-stable-11102022
1+
[Version] 11.7.2.0
2+
[Released] Nov 15th 2022
3+
[Link] tmpe-v11720-stable-15112022
44
[Stable]
5-
[Fixed] Game crash on load (krzychu124)
6-
[/Version]
7-
8-
[Version] 11.7.1.1
9-
[Released] Oct 10th 2022
10-
[Link] tmpe-v11711-stable-10102022
11-
[Stable]
12-
[Meta] TM:PE 11.7.1.1 TEST branch released as STABLE - huge thanks to our beta testers!
13-
[New] Dead-end lane connections #1613, #1213 (kianzarrin)
14-
[New] Reset lane arrows when the user delete lane connections from selected node #1613 (kianzarrin)
15-
[Fixed] Cargo Trucks ignoring vehicle restrictions #1661 (krzychu124)
16-
[Fixed] Parking AI - "thinking about a parking spot" near pedestrian streets #1661, #1655 (krzychu124)
17-
[Fixed] Parking AI confused in large parking lots #1626, #1394, #924, #423, #352 (krzychu124)
18-
[Fixed] Internal issues causing desyc when other mod patched Citizen / CitizenUnit size in CitizenManager #1599 (krzychu124)
19-
[Updated] Slider value moved to label instead of tooltip #1660 (kianzarrin)
20-
[Updated] Hotreload save - debug improvements #1635 (kianzarrin)
21-
[Updated] Show DLC icon near the option if the feature requires DLC mechanics to work (previously the option was invisible without DLC) (krzychu124)
22-
[Updated] Translations update - Chinese Simplified, French, Indonesian, Korean, Slovak, Spanish, Thai
5+
[Meta] Compatibility patch for the game update 1.15.1-f4 (krzychu124)
6+
[New] Clear all TM:PE rules from selected node #692, #1668 (kianzarrin)
7+
[Fixed] Timed Traffic Lights wait = 0 issues #1497, #1674 (kianzarrin)
8+
[Updated] Minor changes to Timed Traffic Lights sensitivity slider #1670 (kianzarrin)
9+
[Updated] Pedestrian zone roads have now lower priority when setting up high priority road #1653 (kianzarrin)
2310
[/Version]

‎TLM/TLM/UI/WhatsNew/WhatsNew.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace TrafficManager.UI.WhatsNew {
1111

1212
public class WhatsNew {
1313
// bump and update what's new changelogs when new features added
14-
public static readonly Version CurrentVersion = new Version(11,7,1,2);
14+
public static readonly Version CurrentVersion = new Version(11,7,2,0);
1515

1616
private const string WHATS_NEW_FILE = "whats_new.txt";
1717
private const string RESOURCES_PREFIX = "TrafficManager.Resources.";

‎TLM/TLM/Util/VersionUtil.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ public static class VersionUtil {
3535
// we could alternatively use BuildConfig.APPLICATION_VERSION because const values are evaluated at compile time.
3636
// but I have decided not to do this because I don't want this to happen automatically with a rebuild if
3737
// CS updates. these values should be changed manually so as to force us to acknowledge that they have changed.
38-
public const uint EXPECTED_GAME_VERSION_U = 197256976U;
38+
public const uint EXPECTED_GAME_VERSION_U = 197387280U;
3939

4040
// see comments for EXPECTED_GAME_VERSION_U.
41-
public static Version ExpectedGameVersion => new Version(1, 15, 0, 7);
41+
public static Version ExpectedGameVersion => new Version(1, 15, 1, 4);
4242

4343
public static string ExpectedGameVersionString => BuildConfig.VersionToString(EXPECTED_GAME_VERSION_U, false);
4444

0 commit comments

Comments
 (0)