thallada/transport
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trains have own color, passengers can stay on

Browse Source
This commit is contained in:
Tyler Hallada 2018-04-15 02:54:35 -04:00
parent 95805184ea
commit d1d342ee0f
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Train.ts
View File

@ -1,3 +1,5 @@
import * as tinycolor from 'tinycolor2';
import Station from './Station'; import Station from './Station';
let trainCount = 0; let trainCount = 0;
@ -10,14 +12,16 @@ export default class Train {
public passengers: number; public passengers: number;
public id: number; public id: number;
public label: PIXI.Text; public label: PIXI.Text;
public color: tinycolorInstance;
constructor(location: PIXI.Point, speed: number, passengers: number, origin: Station, constructor(location: PIXI.Point, speed: number, passengers: number, origin: Station,
destination: Station) { destination: Station, color: tinycolorInstance) {
this.location = location; this.location = location;
this.speed = speed; this.speed = speed;
this.origin = origin; this.origin = origin;
this.destination = destination; this.destination = destination;
this.passengers = passengers; this.passengers = passengers;
this.color = color;
// for debugging // for debugging
trainCount += 1; trainCount += 1;

31
src/transport.ts
View File

@ -37,7 +37,7 @@ const initTrains = (numTrains: number, stations: Station[]): Train[] => {
const originStation = stations[Math.floor(Math.random() * stations.length)]; const originStation = stations[Math.floor(Math.random() * stations.length)];
trains.push(new Train( trains.push(new Train(
new PIXI.Point(originStation.location.x, originStation.location.y), new PIXI.Point(originStation.location.x, originStation.location.y),
0, 0, originStation, undefined), 0, 0, originStation, undefined, tinycolor('grey')),
); );
} }
return trains; return trains;
@ -54,8 +54,20 @@ const moveTrains = (trains: Train[], stations: Station[]) => {
train.destination = weightedRandom(closeStations, closeStationWeights); train.destination = weightedRandom(closeStations, closeStationWeights);
// board passengers // board passengers
train.passengers += randomInt(0, TRAIN_CAPACITY); const boardingPassengers = randomInt(0, Math.min(TRAIN_CAPACITY - train.passengers,
train.origin.population -= randomInt(0, TRAIN_CAPACITY); train.origin.population));
// set or mix train color with the color of new passenger origin
if (train.passengers === 0) {
train.color = train.origin.color;
} else {
train.color = tinycolor.mix(
train.color,
train.origin.color,
Math.round((boardingPassengers / train.passengers) * 100),
);
}
train.passengers += boardingPassengers;
train.origin.population -= boardingPassengers;
} }
// train reached destination, stop moving and let passengers off // train reached destination, stop moving and let passengers off
@ -71,8 +83,9 @@ const moveTrains = (trains: Train[], stations: Station[]) => {
); );
// transfer passengers to destination // transfer passengers to destination
train.destination.population += train.passengers; const disembarkingPassengers = randomInt(0, train.passengers);
train.passengers = 0; train.destination.population += disembarkingPassengers;
train.passengers -= disembarkingPassengers;
// prepare for next journey // prepare for next journey
train.origin = train.destination; train.origin = train.destination;
@ -111,7 +124,7 @@ const drawStations = (stations: Station[], graphics: PIXI.Graphics) => {
const drawTrains = (trains: Train[], graphics: PIXI.Graphics) => { const drawTrains = (trains: Train[], graphics: PIXI.Graphics) => {
for (const train of trains) { for (const train of trains) {
graphics.beginFill(parseInt(train.origin.color.toHex(), 16), 0.8); graphics.beginFill(parseInt(train.color.toHex(), 16), 0.8);
graphics.drawCircle(train.location.x, train.location.y, graphics.drawCircle(train.location.x, train.location.y,
rangeMap(train.passengers, 0, TRAIN_CAPACITY, 1, 5)); rangeMap(train.passengers, 0, TRAIN_CAPACITY, 1, 5));
graphics.endFill(); graphics.endFill();
@ -186,9 +199,9 @@ const run = () => {
app.stage.addChild(graphics); app.stage.addChild(graphics);
app.stage.addChild(fpsText); app.stage.addChild(fpsText);
// Add debug labels // Add debug labels
// for (const train of trains) { for (const train of trains) {
// app.stage.addChild(train.label); app.stage.addChild(train.label);
// } }
for (const station of stations) { for (const station of stations) {
app.stage.addChild(station.label); app.stage.addChild(station.label);
} }