Skip to content

Commit 291fcc4

Browse files
krzychu124krzychu124
authored
Merge pull request #1785 from CitiesSkylinesMods/whats_new_11_9_3_0
What's new 11.9.3.0
2 parents 4e868a6 + bfca476 commit 291fcc4

File tree

8 files changed

+41
-19
lines changed

8 files changed

+41
-19
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,18 @@ 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.9.3.0](https://github.com/CitiesSkylinesMods/TMPE/compare/11.9.2.0...11.9.3.0) STABLE, 05/10/2025
33+
34+
- [Fixed] Reversible Tram AI compatibility - Timed Traffic Lights fail to detect waiting trams
35+
- [Updated] Updated location of despawn button in vehicle info popup to reduce risk of misclick #1784
36+
- [Steam] [TM:PE v11 STABLE](https://steamcommunity.com/sharedfiles/filedetails/?id=1637663252)
37+
38+
#### TM:PE V11.9.3.0 TEST, 05/10/2025
39+
40+
- [Fixed] Reversible Tram AI compatibility - Timed Traffic Lights fail to detect waiting trams
41+
- [Updated] Updated location of despawn button in vehicle info popup to reduce risk of misclick #1784
42+
- [Steam] [TM:PE v11 TEST](https://steamcommunity.com/sharedfiles/filedetails/?id=2489276785)
43+
3244
#### TM:PE V[11.9.2.0](https://github.com/CitiesSkylinesMods/TMPE/compare/11.9.1.0...11.9.2.0) STABLE, 24/09/2025
3345

3446
- [Meta] Internal version check compatible with 1.20.1-f1

‎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.9.2.*")]
23+
[assembly: AssemblyVersion("11.9.3.*")]

‎TLM/TLM/Patch/PatchCommons.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public static IEnumerable<CodeInstruction> TranspileTramTrainSimulationStep(ILGe
8484
int index = codes.FindIndex( instruction => TranspilerUtil.IsSameInstruction(instruction, searchInstruction));
8585
if (index > -1) {
8686
int target1 = index + 2;
87-
Label label = il.DefineLabel();
8887
List<Label> oldLabels = codes[target1].labels.ToList();
8988
codes[target1].labels.Clear(); // clear labels -> they are moved to new instruction
9089
List<CodeInstruction> newInstructions = GetUpdatePositionInstructions();

‎TLM/TLM/Patch/_External/RTramAIModPatch.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ namespace TrafficManager.Patch._External._RTramAIModPatch {
44
using System.Linq;
55
using System.Reflection;
66
using System.Reflection.Emit;
7+
using CSUtil.Commons;
78
using TrafficManager.API.Manager;
89
using TrafficManager.Manager.Impl;
910
using TrafficManager.Util;
@@ -39,7 +40,9 @@ public static IEnumerable<CodeInstruction> Transpiler(ILGenerator il, IEnumerabl
3940
int index = codes.FindIndex(instruction => TranspilerUtil.IsSameInstruction(instruction, searchInstruction));
4041
if (index > -1) {
4142
int target1 = index + 2;
42-
Label label = il.DefineLabel();
43+
if (codes[target1].opcode == OpCodes.Nop && codes[target1 + 1].opcode == OpCodes.Ldarg_2) {
44+
target1++;
45+
}
4346
List<Label> oldLabels = codes[target1].labels.ToList();
4447
codes[target1].labels.Clear(); // clear labels -> they are moved to new instruction
4548
List<CodeInstruction> newInstructions = PatchCommons.GetUpdatePositionInstructions();

‎TLM/TLM/Patch/_VehicleAI/_TramBaseAI/CalculateSegmentPositionPatch2.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private delegate void CalculatePositionDelegate(ushort vehicleID,
3030
public static MethodBase TargetMethod() => TranspilerUtil.DeclaredMethod<CalculatePositionDelegate>(typeof(TramBaseAI), "CalculateSegmentPosition");
3131

3232
[UsedImplicitly]
33-
public static bool Prefix(TrolleybusAI __instance,
33+
public static bool Prefix(TramBaseAI __instance,
3434
ushort vehicleID,
3535
ref Vehicle vehicleData,
3636
PathUnit.Position nextPosition,

‎TLM/TLM/Resources/whats_new.txt‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
[Version] 11.9.2.0
2-
[Released] Sep 24th 2025
3-
[Link] tmpe-v11920-stable-24092025
1+
[Version] 11.9.3.0
2+
[Released] Oct 05th 2025
3+
[Link] tmpe-v11930-stable-05102025
44
[Stable]
5-
[Updated] Changed location of despawn button in vehicle info popup #1781
6-
[Updated] Changed mod log file location on macOS to avoid TargetInvocationException. Mod log (TMPE.log) is saved in the same location as the game log (Player.log) #1780, #1776, #1741
7-
[Fixed] Detecting traffic light state when vehicle is approaching short segments with traffic lights #1759, #1730, #1229
8-
[Fixed] Very inaccurate priority detection when vehicle is approaching short segments (current or adjacent) #1730, #1229
9-
[Fixed] Slightly reduced memory footprint of API structs #1732
10-
[Meta] Internal version check compatible with 1.20.1-f1
11-
[Meta] Short segment detection improvements are available only at Very High Simulation Accuracy setting, since they may affect performance #1759, #1730, #1229
5+
[Fixed] Reversible Tram AI compatibility - Timed Traffic Lights fail to detect waiting trams
6+
[Updated] Updated location of despawn button in vehicle info popup to reduce risk of misclick #1784
127
[/Version]

‎TLM/TLM/UI/RemoveVehicleButtonExtender.cs‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,25 @@ protected UIButton AddRemoveVehicleButton(WorldInfoPanel panel) {
5555
UITextField textField = panel.Find<UITextField>("VehicleName");
5656
if (textField && textField.size.x > 220f) {
5757
// resize and move VehicleName text field to fit the mod despawn button in the row
58-
textField.relativePosition += new Vector3(-12, 0);
59-
textField.size += new Vector2(-20, 0);
58+
Vector3 posOffset;
59+
Vector2 sizeOffset;
60+
if (panel is CitizenVehicleWorldInfoPanel) {
61+
posOffset = new Vector3(12, 0);
62+
sizeOffset = new Vector2(-28, 0);
63+
} else if (panel is CityServiceVehicleWorldInfoPanel) {
64+
posOffset = new Vector3(20, 0);
65+
sizeOffset = new Vector2(-22, 0);
66+
} else {
67+
posOffset = new Vector3(17, 0);
68+
sizeOffset = new Vector2(-28, 0);
69+
}
70+
71+
textField.relativePosition += posOffset;
72+
textField.size += sizeOffset;
6073
}
6174

62-
button.AlignTo(panel.component, UIAlignAnchor.TopRight);
63-
button.relativePosition += new Vector3(-button.width - (4 * 33f), 5f);
75+
button.AlignTo(panel.component, UIAlignAnchor.TopLeft);
76+
button.relativePosition = new Vector3(45, 7f);
6477

6578
Log._Debug($"Added {button} to {panel}");
6679
return button;

‎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, 9, 2, 0);
14+
public static readonly Version CurrentVersion = new Version(11, 9, 3, 0);
1515

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

0 commit comments

Comments
 (0)