Allow selection of vehicles with invalid ride, disable edit ride button when nothing is selected

Author: Basssiiie

src/objects/parkRide.ts

@@ -26,6 +26,8 @@ export class ParkRide
 	private _rideObj?: Ride | null;
 	private _trainsObj?: RideTrain[] | null;
 
+	_missing?: boolean;
+
 
 	/**
 	 * Creates a new park ride object.

src/objects/rideTrain.ts

@@ -36,7 +36,10 @@ export function createTrainFromAnyCar(car: Car): [RideTrain, number]
 		}
 		vehicles.push(new RideVehicle(currentCar));
 	}
-	return [new RideTrain(vehicles, true), carIndex];
+
+	const train = new RideTrain(vehicles);
+	train._special = true;
+	return [train, carIndex];
 }
 
 
@@ -46,9 +49,9 @@ export function createTrainFromAnyCar(car: Car): [RideTrain, number]
 export class RideTrain
 {
 	readonly _carId: number;
-	readonly _special?: boolean;
 	private _rideVehicles?: RideVehicle[] | null;
 
+	_special?: boolean;
 
 	/**
 	 * Creates a new train for a ride.
@@ -57,9 +60,9 @@ export class RideTrain
 	 * @param special Sets it as a special hidden train, which does not show up in
 	 * the regular ride window (like Giga lifthill entities).
 	 */
-	constructor(frontCarId: number, special?: boolean);
-	constructor(vehicles: RideVehicle[], special?: boolean);
-	constructor(param: number | RideVehicle[], special?: boolean)
+	constructor(frontCarId: number);
+	constructor(vehicles: RideVehicle[]);
+	constructor(param: number | RideVehicle[])
 	{
 		if (isNumber(param))
 		{
@@ -73,7 +76,6 @@ export class RideTrain
 			this._carId = param[0]._id;
 			this._rideVehicles = param;
 		}
-		this._special = special;
 	}
 
 
@@ -126,4 +128,4 @@ export class RideTrain
 		Log.assert(0 <= index && index < vehicles.length, "Vehicle index", index, "out of range for train of length", vehicles.length);
 		return vehicles[index];
 	}
-}
+}

src/services/actions.ts

@@ -22,7 +22,7 @@ export function register<T>(name: string, action: Action<T>): Action<T>
 	registeredActions[name] = action;
 	return (args: T): void =>
 	{
-		Log.debug("Execute action", name, "with args:", JSON.stringify(args));
+		Log.debug("[EXECUTE]", name, "with args:", JSON.stringify(args));
 		context.executeAction(name, <never>args);
 	};
 }

src/ui/mainWindow.ts

@@ -69,6 +69,7 @@ const mainWindow = window({
 					tooltip: "Changes properties of the ride, that are not related to its vehicles.",
 					width: 100,
 					height: 14,
+					disabled: compute(model._selectedRide, r => !r || !!r[0]._missing),
 					onClick: () =>
 					{
 						const ride = model._selectedRide.get();

src/utilities/logger.ts

@@ -22,7 +22,7 @@ const isDuktapeAvailable = (typeof Duktape !== "undefined");
 function print(level: LogLevel, messages: unknown[]): void
 {
 	const message = messages
-		.map(v => (Array.isArray(v) ? `[${v}]` : typeof v == "object" ? Duktape.enc('jx', v) : v))
+		.map(v => typeof v === "string" ? v : Duktape.enc('jx', v))
 		.join(" ");
 
 	console.log(`\x1b[1;33m<RVE/${level}>\x1b[37m ${message}`);

src/viewmodels/vehicleViewModel.ts

@@ -71,13 +71,25 @@ export class VehicleViewModel
 	private _isRefreshing?: boolean;
 	private _onPlayerAction?: IDisposable;
 	private _onGameTick?: IDisposable;
+	private _missingRideEntity?: ParkRide;
 
 	constructor()
 	{
-		this._rides.subscribe(r => updateSelectionOrNull(this._selectedRide, r));
-		this._trains.subscribe(t => updateSelectionOrNull(this._selectedTrain, t));
-		this._vehicles.subscribe(v => updateSelectionOrNull(this._selectedVehicle, v));
-
+		this._rides.subscribe(r =>
+		{
+			Log.debug("rides.set():", r);
+			updateSelectionOrNull(this._selectedRide, r);
+		});
+		this._trains.subscribe(t =>
+		{
+			Log.debug("trains.set():", t);
+			updateSelectionOrNull(this._selectedTrain, t);
+		});
+		this._vehicles.subscribe(v =>
+		{
+			Log.debug("vehicles.set():", v);
+			updateSelectionOrNull(this._selectedVehicle, v);
+		});
 		this._selectedVehicle.subscribe(vehicle =>
 		{
 			cancelTools(dragToolId);
@@ -156,6 +168,7 @@ export class VehicleViewModel
 		}
 
 		this._selectedRide.set([rides[idx], idx]);
+		this._checkMissingRideEntry(this._missingRideEntity, rides);
 	}
 
 	/**
@@ -197,36 +210,65 @@ export class VehicleViewModel
 	 */
 	_selectCar(car: Car): void
 	{
-		const
-			rides = this._rides.get(),
-			carId = car.id,
-			rideId = car.ride,
-			carRideIndex = findIndex(rides, r => r._id === rideId);
+		const rides = this._rides.get();
+		const carId = car.id;
+		const rideId = car.ride;
+		const carRideIndex = findIndex(rides, r => r._id === rideId);
+		const selectedRide = this._selectedRide;
+		let trains: RideTrain[];
 
-		if (isNull(carRideIndex))
+		if (isNull(carRideIndex)) // Fallback for missing ride id.
 		{
-			Log.debug("Could not find ride id", rideId, "for selected entity id", carId);
-			return;
+			Log.debug("Could not find ride id", rideId, "for selected entity id", carId, ", adding special ride");
+			const missingRide = this._missingRideEntity ||= new ParkRide(<never>{
+				id: -1,
+				name: "(missing ride)",
+				vehicles: []
+			});
+			const missingRideIdx = rides.indexOf(missingRide);
+			missingRide._missing = true;
+
+			if (missingRideIdx === -1) // Add to rides list, if not there yet.
+			{
+				this._rides.set(rides.concat(missingRide));
+				selectedRide.set([ missingRide, rides.length ]);
+			}
+			else // Else try to select it if not yet selected
+			{
+				const selected = selectedRide.get();
+				if (!selected || selected[0] !== missingRide)
+				{
+					selectedRide.set([ missingRide, missingRideIdx ]);
+				}
+			}
+
+			trains = [];
 		}
+		else
+		{
+			this._checkMissingRideEntry(this._missingRideEntity, rides);
 
-		this._selectedRide.set([ rides[carRideIndex], carRideIndex ]);
+			selectedRide.set([ rides[carRideIndex], carRideIndex ]);
+			trains = this._trains.get();
 
-		const trains = this._trains.get();
-		for (let t = 0; t < trains.length; t++)
-		{
-			const vehicles = trains[t]._vehicles();
-			for (let v = 0; v < vehicles.length; v++)
+			for (let t = 0; t < trains.length; t++)
 			{
-				if (vehicles[v]._id === carId)
+				const vehicles = trains[t]._vehicles();
+				for (let v = 0; v < vehicles.length; v++)
 				{
-					this._selectedTrain.set([ trains[t], t ]);
-					this._selectedVehicle.set([ vehicles[v], v ]);
-					return;
+					if (vehicles[v]._id === carId)
+					{
+						this._selectedTrain.set([ trains[t], t ]);
+						this._selectedVehicle.set([ vehicles[v], v ]);
+						return;
+					}
 				}
 			}
+
+			Log.debug("Could not find vehicle entity id", carId, "on ride id", rideId, ", adding special train");
 		}
 
-		Log.debug("Could not find vehicle entity id", carId, "on ride id", rideId, ", adding special train");
+		// Fallback for creating unknown train.
 		const [specialTrain, carIndex] = createTrainFromAnyCar(car);
 		const vehicle = specialTrain._vehicles()[carIndex];
 
@@ -504,6 +546,18 @@ export class VehicleViewModel
 
 		Log.debug("<", action, ">\n\t- type:", event.type, "(client:", event.isClientOnly, ")\n\t- args:", JSON.stringify(event.args), "\n\t- result:", JSON.stringify(event.result));
 	}
+
+	/**
+	 * Removes the missing ride entry if it is present in the rides list.
+	 */
+	private _checkMissingRideEntry(missingRide: ParkRide | undefined, rides: ParkRide[]): void
+	{
+		if (missingRide && rides.indexOf(missingRide) != -1)
+		{
+			Log.debug("Clearing missing ride entry from rides list");
+			this._rides.set(rides.filter(ride => ride !== missingRide));
+		}
+	}
 }
 
 
@@ -519,7 +573,7 @@ function updateSelectionOrNull<T>(value: WritableStore<[T, number] | null>, item
 		const selectedIdx = (previous && previous[1] < items.length) ? previous[1] : 0;
 		selection = [ items[selectedIdx], selectedIdx ];
 	}
-	Log.debug("[updateSelectionOrNull] =>", selection);
+	Log.debug("updateSelectionOrNull():", selection);
 	value.set(selection);
 }