Changeset 4

Timestamp:

Mar 26, 2015, 12:09:02 PM (9 years ago)

Author:

chronos

Message:

• Modified: Connect and disconnect stations using mouse move rather then clicking to each station.
• Added: Show available train count.

Location:

trunk

Files:

• Images/Locomotive.png (added)
• Images/Screenshot.png (added)
• Images/Tunnel.png (added)
• UEngine.pas (modified) (19 diffs)
• UGeometric.pas (modified) (2 diffs)

trunk/UEngine.pas

@@ -39 +39 @@
 
   TMetroLine = class
+    Engine: TEngine;
     Color: TColor;
     Stations: TMetroStations;
     Trains: TMetroTrains;
     TrackPoints: array of TPoint;
+    procedure ConnectStation(Station: TMetroStation);
+    procedure DisconnectStation(Station: TMetroStation);
     procedure AddTrack(P1, P2: TPoint);
     function GetTrackLength: Integer;
@@ -53 +56 @@
 
   TMetroLines = class(TObjectList)
+    Engine: TEngine;
+    function AddNew: TMetroLine;
     function SearchByColor(Color: TColor): TMetroLine;
   end;
@@ -78 +83 @@
   TMetroTrains = class(TObjectList)
     function GetUnusedTrain: TMetroTrain;
+    function GetUnusedCount: Integer;
   end;
 
@@ -109 +115 @@
   private
     LastMousePos: TPoint;
+    LastSelectedStation: TMetroStation;
+    MouseHold: Boolean;
     LastNewStationTime: TDateTime;
     LastNewPassengerTime: TDateTime;
     ImagePassenger: TImage;
+    ImageLocomotive: TImage;
     function GetExistStationShapes: TStationShapeSet;
     function GetStationOnPos(Pos: TPoint): TMetroStation;
@@ -150 +159 @@
   TrainSpeed = 3;
   ImagePassengerName = 'Images/Passenger.png';
+  ImageLocomotiveName = 'Images/Locomotive.png';
   TrainPassengerCount = 6;
   StationMinDistance = 50;
@@ -179 +189 @@
   if I < Count then Result := TMetroTrain(Items[I])
     else Result := nil;
+end;
+
+function TMetroTrains.GetUnusedCount: Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := 0 to Count - 1 do
+    if not Assigned(TMetroTrain(Items[I]).Line) then Inc(Result);
 end;
 
@@ -210 +229 @@
 { TMetroLines }
 
+function TMetroLines.AddNew: TMetroLine;
+begin
+  Result := TMetroLine.Create;
+  Result.Color := LineColors[Count];
+  Result.Engine := Engine;
+  Add(Result);
+end;
+
 function TMetroLines.SearchByColor(Color: TColor): TMetroLine;
 var
@@ -221 +248 @@
 
 { TMetroLine }
+
+procedure TMetroLine.ConnectStation(Station: TMetroStation);
+var
+  Train: TMetroTrain;
+begin
+  Stations.Add(Station);
+  Station.Lines.Add(Self);
+  if Stations.Count = 1 then begin
+    SetLength(TrackPoints, Length(TrackPoints) + 1);
+    TrackPoints[High(TrackPoints)] := Station.Position;
+  end else begin
+     if Stations.Count > 1 then
+       AddTrack(TMetroStation(Stations[Stations.Count - 2]).Position, Station.Position);
+       // Place one train if at least two stations present
+       if (Stations.Count = 2) then begin
+         Train := Engine.Trains.GetUnusedTrain;
+         if Assigned(Train) then begin
+           Train.Line := Self;
+           Train.TargetStation := TMetroStation(Stations.First);
+           Trains.Add(Train);
+         end;
+       end;
+  end;
+end;
+
+procedure TMetroLine.DisconnectStation(Station: TMetroStation);
+var
+  I: Integer;
+begin
+  if (Stations.Count > 0) and (Stations.Last = Station) then begin
+    Stations.Delete(Stations.Count - 1);
+    Station.Lines.Remove(Self);
+    if Stations.Count > 0 then begin
+      while (Length(TrackPoints) > 0) and (not ComparePoint(TrackPoints[High(TrackPoints)], TMetroStation(Stations.Last).Position)) do
+        SetLength(TrackPoints, Length(TrackPoints) - 1);
+    end else SetLength(TrackPoints, 0);
+    // Remove trains if less then two stations
+    if Stations.Count < 2 then
+      for I := Trains.Count - 1 downto 0 do begin
+        TMetroTrain(Trains[I]).Line := nil;
+        Trains.Delete(I);
+      end;
+  end;
+end;
 
 procedure TMetroLine.AddTrack(P1, P2: TPoint);
@@ -306 +377 @@
   Passengers.OwnsObjects := False;
   Direction := 1;
+  Line := nil;
 end;
 
@@ -528 +600 @@
 
 procedure TEngine.MouseMove(Position: TPoint);
+var
+  Station: TMetroStation;
 begin
   LastMousePos := Position;
+  if MouseHold then begin
+    if Assigned(SelectedLine) then begin
+      Station := GetStationOnPos(Position);
+      if not Assigned(LastSelectedStation) and Assigned(Station) then begin
+        if (SelectedLine.Stations.IndexOf(Station) = -1) then begin
+          SelectedLine.ConnectStation(Station);
+          SelectedStation := Station;
+        end else
+        if (SelectedLine.Stations.Count > 0) and (SelectedLine.Stations.Last = Station) then begin
+          SelectedLine.DisconnectStation(Station);
+          SelectedStation := TMetroStation(SelectedLine.Stations.Last);
+        end else if (SelectedLine.Stations.Count > 0) and (SelectedLine.Stations.First = Station) then begin
+          SelectedLine.ConnectStation(Station);
+          SelectedStation := Station;
+        end;
+      end;
+      LastSelectedStation := Station;
+    end;
+  end;
 end;
 
@@ -537 +630 @@
   Line: TMetroLine;
   I: Integer;
-  Train: TMetroTrain;
-begin
+begin
+  MouseHold := False;
   if Button = mbLeft then begin
+    SelectedStation := nil;
+
     // Line color selection
     for I := 0 to Lines.Count - 1 do
@@ -547 +642 @@
           Exit;
         end;
+  end else
+  if Button = mbRight then begin
+    SelectedLine := nil;
+  end;
+end;
+
+procedure TEngine.MouseDown(Button: TMouseButton; Position: TPoint);
+var
+  Station: TMetroStation;
+  Line: TMetroLine;
+  I: Integer;
+begin
+  if Button = mbLeft then begin
+    MouseHold := True;
+    LastSelectedStation := nil;
 
     // Station selection
     Station := GetStationOnPos(Position);
-    if Assigned(Station) then
-      if Assigned(SelectedLine) and ((SelectedLine.Stations.IndexOf(Station) = -1) or
-      (((SelectedLine.Stations.First = Station) and (SelectedLine.Stations.Last <> Station)))) then begin
-        SelectedLine.Stations.Add(Station);
-        Station.Lines.Add(SelectedLine);
-        if SelectedLine.Stations.Count = 1 then begin
-          SetLength(SelectedLine.TrackPoints, Length(SelectedLine.TrackPoints) + 1);
-          SelectedLine.TrackPoints[High(SelectedLine.TrackPoints)] := Station.Position;
-        end else
-        if SelectedLine.Stations.Count > 1 then
-          SelectedLine.AddTrack(TMetroStation(SelectedLine.Stations[SelectedLine.Stations.Count - 2]).Position, Station.Position);
-        if (SelectedLine.Stations.Count = 2) then begin
-          Train := Trains.GetUnusedTrain;
-          if Assigned(Train) then begin
-            Train.Line := SelectedLine;
-            Train.TargetStation := TMetroStation(SelectedLine.Stations.First);
-            SelectedLine.Trains.Add(Train);
-          end;
-        end;
-        Exit
-      end;
+    if Assigned(Station) then begin
+      SelectedStation := Station;
+      for I := 0 to Lines.Count - 1 do
+      if TMetroLine(Lines[I]).Stations.Count = 0 then
+        SelectedLine := TMetroLine(Lines[I]);
+    end;
 
     // Line selection
@@ -579 +674 @@
     end;
   end;
-  if Button = mbRight then begin
-    SelectedLine := nil;
-  end;
-end;
-
-procedure TEngine.MouseDown(Button: TMouseButton; Position: TPoint);
-begin
-
 end;
 
@@ -611 +698 @@
 
   for I := 0 to 2 do begin
-    NewLine := TMetroLine.Create;
-    NewLine.Color := LineColors[Lines.Count];
-    Lines.Add(NewLine);
+    NewLine := Lines.AddNew;
     NewTrain := TMetroTrain.Create;
     Trains.Add(NewTrain);
@@ -630 +715 @@
   Stations.Engine := Self;
   Lines := TMetroLines.Create;
+  Lines.Engine := Self;
   Passengers := TMetroPassengers.Create;
   Passengers.Engine := Self;
@@ -636 +722 @@
   Trains := TMetroTrains.Create;
   ImagePassenger := TImage.Create(nil);
+  ImageLocomotive := TImage.Create(nil);
   if FileExists(ImagePassengerName) then
     ImagePassenger.Picture.LoadFromFile(ImagePassengerName);
+  if FileExists(ImageLocomotiveName) then
+    ImageLocomotive.Picture.LoadFromFile(ImageLocomotiveName);
 end;
 
@@ -643 +732 @@
 begin
   Trains.Free;
+  ImageLocomotive.Free;
   ImagePassenger.Free;
   View.Free;
@@ -679 +769 @@
       Canvas.LineTo(TrackPoints[S]);
     end;
-    if (SelectedLine = TMetroLine(Lines[I])) and (Stations.Count > 0) then begin
-      Canvas.MoveTo(TMetroStation(SelectedLine.Stations.Last).Position);
+    if (SelectedLine = TMetroLine(Lines[I])) and Assigned(SelectedStation) then begin
+      Canvas.MoveTo(SelectedStation.Position);
       DrawLine(Canvas, LastMousePos);
     end;
@@ -744 +834 @@
 
   // Interface
+  Text := IntToStr(ServedPassengerCount);
   Canvas.Draw(Canvas.Width - 100, 20, ImagePassenger.Picture.Bitmap);
   Canvas.Brush.Style := bsClear;
-  Canvas.TextOut(Canvas.Width - 106 - Canvas.TextWidth(IntToStr(ServedPassengerCount)),
-    25, IntToStr(ServedPassengerCount));
+  Canvas.TextOut(Canvas.Width - 106 - Canvas.TextWidth(Text), 25, Text);
+
+  Text := IntToStr(Trains.GetUnusedCount);
+  Canvas.Draw(Canvas.Width - 160, 20, ImageLocomotive.Picture.Bitmap);
+  Canvas.Brush.Style := bsClear;
+  Canvas.TextOut(Canvas.Width - 166 - Canvas.TextWidth(Text), 25, Text);
 
   // Game over

trunk/UGeometric.pas

@@ -12 +12 @@
 function SubPoint(const P1, P2: TPoint): TPoint;
 function PointToLineDistance(const P, V, W: TPoint): Integer;
+function ComparePoint(P1, P2: TPoint): Boolean;
 
 implementation
@@ -61 +62 @@
 end;
 
+function ComparePoint(P1, P2: TPoint): Boolean;
+begin
+  Result := (P1.X = P2.X) and (P1.Y = P2.Y);
+end;
+
 
 end.