Changeset 11 for trunk

Timestamp:

Mar 26, 2015, 10:53:11 PM (10 years ago)

Author:

chronos

Message:

• Modified: Better new station placement. Random angle is used and new station is placed as far from center as necessery to have minimum distance from other stations.

File:

• trunk/UEngine.pas (modified) (6 diffs)

trunk/UEngine.pas

@@ -183 +183 @@
   ImageLocomotiveName = 'Images/Locomotive.png';
   TrainPassengerCount = 6;
-  StationMinDistance = 50;
+  StationMinDistance = 100;
+  StationMaxDistance = 300;
   MaxWaitingPassengers = 10;
 
@@ -236 +237 @@
   I: Integer;
   Pass: Integer;
+  Angle: Double;
+  L: Integer;
+const
+  Step = 20;
 begin
   Result := TMetroStation.Create;
   Result.Engine := Engine;
+  Angle := Random * 2 * Pi;
   // Ensure minimum distance between stations
   Pass := 0;
+  L := Step;
   repeat
-    Result.Position := Point(Trunc(Engine.Map.Size.X * 0.1 + Random(Trunc(Engine.Map.Size.X * 0.8))),
-      Trunc(Engine.Map.Size.Y * 0.1 + Random(Trunc(Engine.Map.Size.Y * 0.8))));
+    Result.Position := Point(Trunc(Engine.Map.Size.X / 2 + Cos(Angle) * L),
+      Trunc(Engine.Map.Size.Y / 2 + Sin(Angle) * L));
     MinD := High(Integer);
     for I := 0 to Engine.Stations.Count - 1 do begin
@@ -250 +257 @@
     end;
     Inc(Pass);
-  until (MinD > StationMinDistance) or (Pass > 100) or (Engine.Stations.Count = 0);
+    L := L + StationMinDistance div 2;
+  until (MinD > StationMinDistance) or
+    (Pass > 1000) or (Engine.Stations.Count = 0);
   Result.Shape := TStationShape(Random(Integer(Engine.ShapeCount)));
   Add(Result);
@@ -756 +765 @@
         if (Now - StationStopTime) > OneSecond then begin
           CurrentStationIndex := TargetStationIndex;
-          CurrentStation := TargetStation;
+          if CurrentStationIndex >= Line.Stations.Count then
+            CurrentStationIndex := Line.Stations.Count - 1;
+          CurrentStation := nil;
+          if Assigned(Line) then
+            if (CurrentStationIndex >= 0) and (CurrentStationIndex < Line.Stations.Count) then
+          CurrentStation := TMetroStation(Line.Stations[CurrentStationIndex]);
 
           // Choose next target station
@@ -779 +793 @@
 
           // Unload passengers in target station
+          if Assigned(CurrentStation) and (CurrentStationIndex < Line.Stations.Count) then
           for P := Passengers.Count - 1 downto 0 do begin
             if TMetroPassenger(Passengers[P]).Shape = CurrentStation.Shape then begin
@@ -788 +803 @@
           end;
           // Unload passengers to change line
+          if Assigned(CurrentStation) and (CurrentStationIndex < Line.Stations.Count) then
           for P := Passengers.Count - 1 downto 0 do begin
-            if not CurrentStation.GetBestStationForShape(TMetroPassenger(Passengers[P]).Shape, TargetStation, CurrentStationIndex) then begin
+            if not CurrentStation.GetBestStationForShape(TMetroPassenger(Passengers[P]).Shape,
+            TargetStation, CurrentStationIndex) then begin
               Passenger := TMetroPassenger(Passengers[P]);
               Passengers.Delete(P);