Changeset 20 for trunk/UEngine.pas

Timestamp:

Apr 3, 2015, 10:40:01 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Passenger change in station to different line with better shape distance.
• Fixed: Allow circular lines.
• Modified: Use internal faster Time for new game events instead normal time.

Location:

trunk

Files:

• . (modified) (1 prop)
• UEngine.pas (modified) (30 diffs)

trunk

@@ -2 +2 @@
 BigMetro
 BigMetro.lps
+heaptrclog.trc

@@ -2 +2 @@
 BigMetro
 BigMetro.lps
+heaptrclog.trc

trunk/UEngine.pas

@@ -31 +31 @@
     Lines: TMetroLines;
     ShapeDistance: array[TStationShape] of Integer;
-    function GetBestStationForShape(Shape: TStationShape; Check, Current: TLineStation): Boolean;
+    function IsBestStationForShape(Shape: TStationShape; Check, Current: TLineStation): Boolean;
     constructor Create;
     destructor Destroy; override;
@@ -119 +119 @@
     InStation: Boolean;
     StationStopTime: TDateTime;
+    LastTrainMoveTime: TDateTime;
     TargetStation: TLineStation;
     function GetPosition: TPoint;
@@ -218 +219 @@
   TrainSize = 40;
   LineColorsDist = 50;
-  TrainSpeed = 3;
+  TrainSpeed = 2000;
   ImagePassengerName = 'Images/Passenger.png';
   ImageLocomotiveName = 'Images/Locomotive.png';
@@ -228 +229 @@
   TrackClickDistance = 20;
   EndStationLength = 50;
+  ShowDistances = False;
+  //TimePerSecond = (60 * OneMinute);
+  TimePerSecond = (60 * OneMinute);
 
 implementation
@@ -404 +408 @@
   Index: Integer;
 begin
+  if not Assigned(Station) then
+    raise Exception.Create('Station have to be defined');
   if not Assigned(LineStationDown) and not Assigned(LineStationUp) and (LineStations.Count > 0) then
     raise Exception.Create('No old line station to connect new station');
@@ -462 +468 @@
   LineStation.MapStation.Lines.Remove(Self);
   Index := LineStations.IndexOf(LineStation);
+
+  // Remove station from trains
+  for I := 0 to Trains.Count - 1 do
+  with TMetroTrain(Trains[I]) do
+  if TargetStation = LineStation then
+    TargetStation := TLineStation(LineStations[(Index + 1) mod LineStations.Count]);
+
   LineStations.Delete(Index);
 
@@ -543 +556 @@
 begin
   LineStations := TLineStations.Create;
-  LineStations.OwnsObjects := False;
+  LineStations.OwnsObjects := True;
   Trains := TMetroTrains.Create;
   Trains.OwnsObjects := False;
@@ -632 +645 @@
 { TMapStation }
 
-function TMapStation.GetBestStationForShape(Shape: TStationShape;
+function TMapStation.IsBestStationForShape(Shape: TStationShape;
   Check, Current: TLineStation): Boolean;
 var
@@ -643 +656 @@
   NextStationUp: TLineStation;
   NextStationDown: TLineStation;
+  CurrentLineStation: TLineStation;
 begin
   Distance := High(Integer);
   for I := 0 to Lines.Count - 1 do
   with TMetroLine(Lines[I]) do begin
-    StationIndex := LineStations.IndexOf(Current);
+    CurrentLineStation := LineStations.SearchMapStation(Current.MapStation);
+    StationIndex := LineStations.IndexOf(CurrentLineStation);
     if IsCircular then begin
       DirectionUp := False;
@@ -685 +700 @@
     end;
   end;
-  Result := Check.MapStation.ShapeDistance[Shape] = Distance;
+  Result := (Check.MapStation.ShapeDistance[Shape] <> -1) and (Check.MapStation.ShapeDistance[Shape] <= Distance);
 end;
 
@@ -883 +898 @@
       for I := 0 to Lines.Count - 1 do
       with TMetroLine(Lines[I]) do
-        for StationIndex := 0 to Stations.Count - 1 do
-        if TMapStation(Stations[StationIndex]) = Station then begin
+        for StationIndex := 0 to LineStations.Count - 1 do
+        if TLineStation(LineStations[StationIndex]).MapStation = Station then begin
         if not IsCircular then begin
           // Update for all adjecent stations
           if StationIndex > 0 then
-            ComputeShapeDistanceStation(TMapStation(Stations[StationIndex - 1]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
-          if (StationIndex >= 0) and (StationIndex < Stations.Count - 1) then
-            ComputeShapeDistanceStation(TMapStation(Stations[StationIndex + 1]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+            ComputeShapeDistanceStation(TLineStation(LineStations[StationIndex - 1]).MapStation,
+            UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+          if (StationIndex >= 0) and (StationIndex < LineStations.Count - 1) then
+            ComputeShapeDistanceStation(TLineStation(LineStations[StationIndex + 1]).MapStation,
+            UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
         end else begin
           // If circular then trains might go in single direction so passengers
@@ -903 +920 @@
           if DirectionUp then begin
             if StationIndex = 0 then
-              ComputeShapeDistanceStation(TMapStation(Stations[Stations.Count - 2]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+              ComputeShapeDistanceStation(TLineStation(LineStations[Stations.Count - 2]).MapStation,
+              UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
             if StationIndex > 0 then
-              ComputeShapeDistanceStation(TMapStation(Stations[StationIndex - 1]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+              ComputeShapeDistanceStation(TLineStation(LineStations[StationIndex - 1]).MapStation,
+              UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
           end;
           if DirectionDown then begin
-            if (StationIndex >= 0) and (StationIndex = Stations.Count - 1) then
-              ComputeShapeDistanceStation(TMapStation(Stations[1]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
-            if (StationIndex >= 0) and (StationIndex < Stations.Count - 1) then
-              ComputeShapeDistanceStation(TMapStation(Stations[StationIndex + 1]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+            if (StationIndex >= 0) and (StationIndex = LineStations.Count - 1) then
+              ComputeShapeDistanceStation(TLineStation(LineStations[1]).MapStation,
+              UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+            if (StationIndex >= 0) and (StationIndex < LineStations.Count - 1) then
+              ComputeShapeDistanceStation(TLineStation(LineStations[StationIndex + 1]).MapStation,
+              UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
           end;
         end;
@@ -927 +948 @@
   PosDelta: Integer;
   TargetStationIndex: Integer;
+  PosChange: Integer;
 begin
   // Move trains
@@ -933 +955 @@
     if Assigned(Line) then begin
       if InStation then begin
-        if (Now - StationStopTime) > OneSecond then begin
+        if (Time - StationStopTime) > OneHour then begin
           CurrentStation := TargetStation;
 
@@ -970 +992 @@
           if Assigned(CurrentStation)  then
           for P := Passengers.Count - 1 downto 0 do begin
-            if not CurrentStation.MapStation.GetBestStationForShape(TMetroPassenger(Passengers[P]).Shape,
+            if not CurrentStation.MapStation.IsBestStationForShape(TMetroPassenger(Passengers[P]).Shape,
             TargetStation, CurrentStation) then begin
               Passenger := TMetroPassenger(Passengers[P]);
@@ -980 +1002 @@
 
           // Load new passengers
+          if Assigned(CurrentStation) and not Assigned(CurrentStation.MapStation) then
+            raise Exception.Create('Station have to have MapStation');
           if Assigned(CurrentStation)  then
           for P := CurrentStation.MapStation.Passengers.Count - 1 downto 0 do begin
             if (Passengers.Count < TrainPassengerCount) then begin
               Passenger := TMetroPassenger(CurrentStation.MapStation.Passengers[P]);
-              if CurrentStation.MapStation.GetBestStationForShape(Passenger.Shape,
+              if CurrentStation.MapStation.IsBestStationForShape(Passenger.Shape,
             TargetStation, CurrentStation) then begin
                 Passenger.Station := nil;
@@ -996 +1020 @@
           LastPosDelta := Abs(TrackPos - Line.GetStationTrackPos(TargetStation));
           InStation := False;
+          LastTrainMoveTime := Time;
         end;
       end else begin
-        TrackPos := TrackPos + Direction * TrainSpeed;
+        PosChange := Trunc(Direction * TrainSpeed * (Time - LastTrainMoveTime));
+        TrackPos := TrackPos + PosChange;
+        LastTrainMoveTime := Time;
         if TrackPos < 0 then begin
           if Line.IsCircular then TrackPos := Line.GetTrackLength
@@ -1012 +1039 @@
           TrackPos := Line.GetStationTrackPos(TargetStation);
           InStation := True;
-          StationStopTime := Now;
+          StationStopTime := Time;
         end;
         LastPosDelta := PosDelta;
@@ -1094 +1121 @@
     end;
   end;
-
 end;
 
 procedure TEngine.Tick;
 const
-  NewStationPeriod = 20 * OneSecond;
+  NewStationPeriod = 1;
+  NewShapePeriod = 10;
+  NewTrainPeriod = 7; // Each week
   NewPassengerPeriod = 0.3 * OneSecond;
-  NewPassengerProbability = 0.01;
+  NewPassengerProbability = 0.005;
 var
   Passenger: TMetroPassenger;
@@ -1107 +1135 @@
 begin
   if State = gsRunning then begin
-    FTime := FTime + (Now - LastTickTime) / OneSecond * (60 * OneMinute);
+    FTime := FTime + (Now - LastTickTime) / OneSecond * TimePerSecond;
 
   // Add new trains
-  if (Now - LastNewWeekTime) > 7 then begin
-    LastNewWeekTime := Now;
+  if (Time - LastNewWeekTime) > NewTrainPeriod then begin
+    LastNewWeekTime := Time;
     Trains.AddNew;
     // TODO: Show notification screen with confirmation
@@ -1117 +1145 @@
 
   // Add new shape
-  if (Now - LastNewShapeTime) > 10 then begin
-    LastNewShapeTime := Now;
+  if (Time - LastNewShapeTime) > NewShapePeriod then begin
+    LastNewShapeTime := Time;
     if ShapeCount <= Integer(High(TStationShape)) then Inc(ShapeCount);
   end;
 
   // Add new stations
-  if (Now - LastNewStationTime) > NewStationPeriod then begin
-    LastNewStationTime := Now;
+  if (Time - LastNewStationTime) > NewStationPeriod then begin
+    LastNewStationTime := Time;
     Stations.AddNew;
   end;
 
   // Add new passengers
-  if (Now - LastNewPassengerTime) > NewPassengerPeriod then begin
-    LastNewPassengerTime := Now;
+  if (Time - LastNewPassengerTime) > NewPassengerPeriod then begin
+    LastNewPassengerTime := Time;
     for I := 0 to Stations.Count - 1 do
     with TMapStation(Stations[I]) do
@@ -1167 +1195 @@
   if MouseHold then begin
       FocusedStation := GetStationOnPos(Position);
+      Line := nil;
       if Assigned(TrackStationDown) then Line := TrackStationDown.Line;
       if Assigned(TrackStationUp) then Line := TrackStationUp.Line;
-      if not Assigned(LastFocusedStation) and Assigned(FocusedStation) then begin
+      if Assigned(Line) and not Assigned(LastFocusedStation) and Assigned(FocusedStation) then begin
         if Assigned(TrackStationDown) and (TrackStationDown.LineStation.MapStation = FocusedStation) then begin
           // Disconnect down
@@ -1183 +1212 @@
           Line.DisconnectStation(CurrentTrackPoint.LineStation);
         end else
-        if Assigned(Line) and (Line.LineStations.SearchMapStation(FocusedStation) = nil) then begin
+        if Assigned(Line) and ((Line.LineStations.SearchMapStation(FocusedStation) = nil) or
+        ((Line.LineStations.Count > 0) and
+        ((TLineStation(Line.LineStations.First).MapStation = FocusedStation) or
+        (TLineStation(Line.LineStations.Last).MapStation = FocusedStation)))) then begin
           if Assigned(TrackStationDown) then LineStationDown := TrackStationDown.LineStation
             else LineStationDown := nil;
@@ -1192 +1224 @@
             else if Assigned(TrackStationUp) then TrackStationUp := TrackStationUp.GetDown;
         end;
-        {else
-        if (TrackStationDown.Line.LineStations.Count > 0) and (TLineStation(TrackStationDown.Line.LineStations.Last).MapStation = FocusedStation) then begin
-          Line.ConnectStation(FocusedStation, TrackStationDown, TrackStationUp);
-          TrackStationDown := TTrackPoint(TrackStationDown.Line.TrackPoints.Last);
-        end;
-        }
       end;
       LastFocusedStation := FocusedStation;
@@ -1209 +1235 @@
   I: Integer;
 begin
-  MouseHold := False;
-  TrackStationDown := nil;
-  TrackStationUp := nil;
-
   if Button = mbLeft then begin
 
@@ -1222 +1244 @@
           Exit;
         end;
+
+    // Remove single line station on line
+    if Assigned(TrackStationDown) and (TrackStationDown.Line.LineStations.Count = 1) then begin
+      TrackStationDown.Line.DisconnectStation(TLineStation(TrackStationDown.Line.LineStations.First));
+    end;
+    if Assigned(TrackStationUp) and (TrackStationUp.Line.LineStations.Count = 1) then begin
+      TrackStationUp.Line.DisconnectStation(TLineStation(TrackStationUp.Line.LineStations.First));
+    end;
   end else
   if Button = mbRight then begin
     SelectedLine := nil;
   end;
+  MouseHold := False;
+  TrackStationDown := nil;
+  TrackStationUp := nil;
 end;
 
@@ -1268 +1301 @@
     Station := GetStationOnPos(Position);
     if Assigned(Station) then begin
-      NewLine := GetUnusedLine;
+      if Assigned(SelectedLine) and (SelectedLine.LineStations.Count = 0) then NewLine := SelectedLine
+        else NewLine := GetUnusedLine;
       if Assigned(NewLine) then begin
         NewLine.ConnectStation(Station, nil, nil);
@@ -1302 +1336 @@
   end;
 
-  for I := 0 to 2 do begin
+  for I := 0 to 5 do begin
     Lines.AddNew;
     NewTrain := TMetroTrain.Create;
@@ -1309 +1343 @@
 
   SelectedLine := nil;
-  LastNewStationTime := Now;
-  LastNewPassengerTime := Now;
-  LastNewWeekTime := Now;
-  LastNewShapeTime := Now;
+  FTime := 0;
+  LastNewStationTime := Time;
+  LastNewPassengerTime := Time;
+  LastNewWeekTime := Time;
+  LastNewShapeTime := Time;
   LastTickTime := Now;
-  FTime := 0;
   State := gsRunning;
 end;
@@ -1447 +1481 @@
     end;
 
-{
-    Canvas.Brush.Style := bsClear;
-    Text := '';
-    for P := 0 to 2 do
-      Text := Text + IntToStr(ShapeDistance[TStationShape(P)]) + ',';
-    Canvas.TextOut(Position.X + StationSize div 2, Position.Y + StationSize div 2, Text);
-    }
+    if ShowDistances then begin
+      Canvas.Brush.Style := bsClear;
+      Text := '';
+      for P := 0 to 5 do
+        Text := Text + IntToStr(ShapeDistance[TStationShape(P)]) + ',';
+      Canvas.TextOut(Position.X + StationSize div 2, Position.Y + StationSize div 2, Text);
+    end;
   end;
 

@@ -2 +2 @@
 BigMetro
 BigMetro.lps
+heaptrclog.trc