Skip to content

Commit

Permalink
Merge pull request #1103 from CitiesSkylinesMods/hotfix/release-stabl…
Browse files Browse the repository at this point in the history
…e-11.5.2

Version bump, compatibility fix for new BloodyPenguin's mod
  • Loading branch information
krzychu124 committed May 9, 2021
2 parents a3cd8fa + af9e331 commit 835eddc
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion TLM/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
// Minor Version
// Build Number
// Revision
[assembly: AssemblyVersion("11.5.1.*")]
[assembly: AssemblyVersion("11.5.2.*")]
12 changes: 9 additions & 3 deletions TLM/TLM/Custom/AI/CustomCargoTruckAI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ public class CustomCargoTruckAI : CarAI {
NetInfo.LaneType.Vehicle,
VehicleInfo.VehicleType.Train
| VehicleInfo.VehicleType.Ship
| VehicleInfo.VehicleType.Plane,
| VehicleInfo.VehicleType.Plane
| VehicleInfo.VehicleType.Ferry
| VehicleInfo.VehicleType.Helicopter,
allowUnderground,
false,
32f,
Expand Down Expand Up @@ -127,7 +129,9 @@ public class CustomCargoTruckAI : CarAI {
NetInfo.LaneType.Vehicle,
VehicleInfo.VehicleType.Train
| VehicleInfo.VehicleType.Ship
| VehicleInfo.VehicleType.Plane,
| VehicleInfo.VehicleType.Plane
| VehicleInfo.VehicleType.Ferry
| VehicleInfo.VehicleType.Helicopter,
undergroundTarget,
false,
32f,
Expand Down Expand Up @@ -166,7 +170,9 @@ public class CustomCargoTruckAI : CarAI {
const VehicleInfo.VehicleType VEHICLE_TYPES = VehicleInfo.VehicleType.Car
| VehicleInfo.VehicleType.Train
| VehicleInfo.VehicleType.Ship
| VehicleInfo.VehicleType.Plane;
| VehicleInfo.VehicleType.Plane
| VehicleInfo.VehicleType.Ferry
| VehicleInfo.VehicleType.Helicopter;

// NON-STOCK CODE START
PathCreationArgs args;
Expand Down
8 changes: 6 additions & 2 deletions TLM/TLM/Custom/AI/CustomPostVanAI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ public class CustomPostVanAI : CarAI {
// try to find other start position (plane, train, ship)
const VehicleInfo.VehicleType VEH_TYPE_MASK = VehicleInfo.VehicleType.Train
| VehicleInfo.VehicleType.Ship
| VehicleInfo.VehicleType.Plane;
| VehicleInfo.VehicleType.Plane
| VehicleInfo.VehicleType.Ferry
| VehicleInfo.VehicleType.Helicopter;
if (PathManager.FindPathPosition(
startPos,
ItemClass.Service.PublicTransport,
Expand Down Expand Up @@ -153,7 +155,9 @@ public class CustomPostVanAI : CarAI {
args.vehicleTypes = VehicleInfo.VehicleType.Car
| VehicleInfo.VehicleType.Train
| VehicleInfo.VehicleType.Ship
| VehicleInfo.VehicleType.Plane;
| VehicleInfo.VehicleType.Plane
| VehicleInfo.VehicleType.Ferry
| VehicleInfo.VehicleType.Helicopter;
args.maxLength = 20000f;
args.isHeavyVehicle = IsHeavyVehicle();
args.hasCombustionEngine = CombustionEngine();
Expand Down

0 comments on commit 835eddc

Please sign in to comment.