Changeset 89 for trunk/Game.pas

Timestamp:

Jun 7, 2024, 4:35:46 PM (5 months ago)

Author:

chronos

Message:

• Added: Allow to select color palette in new game dialog.
• Fixed: Use scrollboxes in options dialogs.

File:

• trunk/Game.pas (modified) (17 diffs)

trunk/Game.pas

@@ -11 +11 @@
   TMoveDirection = (drNone, drLeft, drUp, drRight, drDown);
   TTileAction = (taNone, taMove, taMerge, taAppear);
+  TColorPalette = (cpOrangeYellow, cpGreenYellow, cpPinkBlue, cpBlueCyan,
+    cpGreenCyan, cpPinkRed);
 
   { TTile }
@@ -109 +111 @@
     FCanUndo: Boolean;
     FBoardUndo: TBoard;
+    FColorPalette: TColorPalette;
     FSkin: TTileSkin;
     function GetTileColor(Value: Integer): TColor;
@@ -117 +120 @@
     procedure RenderTile(Canvas: TCanvas; Tile: TTile; TileRect: TRect; WithText: Boolean);
     procedure GameOver;
+    procedure SetColorPalette(AValue: TColorPalette);
     procedure SetSkin(AValue: TTileSkin);
     procedure Win;
@@ -162 +166 @@
     property RecordHistory: Boolean read FRecordHistory write SetRecordHistory;
     property Skin: TTileSkin read FSkin write SetSkin;
+    property ColorPalette: TColorPalette read FColorPalette write SetColorPalette;
   end;
 
@@ -169 +174 @@
 var
   SkinText: array[TTileSkin] of string;
+  ColorPaletteText: array[TColorPalette] of string;
 
 const
@@ -187 +193 @@
   STileShouldBeEmpty = 'Tile should be empty';
 
+  // Color palette
+  SOrangeYellow = 'Orange - yellow';
+  SGreenYellow = 'Green - yellow';
+  SPinkBlue = 'Pink - blue';
+  SBlueCyan = 'Blue - cyan';
+  SGreenCyan = 'Green - cyan';
+  SPinkRed = 'Pink - red';
 
 procedure Translate;
@@ -194 +207 @@
 
 uses
-  Core, MetaCanvas;
+  Core, MetaCanvas, PixelPointer;
 
 procedure Translate;
@@ -203 +216 @@
   SkinText[tsRoman] := SSkinRoman;
   SkinText[tsBinary] := SSkinBinary;
+
+  ColorPaletteText[cpOrangeYellow] := SOrangeYellow;
+  ColorPaletteText[cpGreenYellow] := SGreenYellow;
+  ColorPaletteText[cpPinkBlue] := SPinkBlue;
+  ColorPaletteText[cpBlueCyan] := SBlueCyan;
+  ColorPaletteText[cpGreenCyan] := SGreenCyan;
+  ColorPaletteText[cpPinkRed] := SPinkRed;
 end;
 
@@ -267 +287 @@
   GameStep.Board.Clear;
   GameStep.Skin := Game.Skin;
+  GameStep.ColorPalette := Game.ColorPalette;
   GameStep.Score := 0;
   for I := 0 to Length(InitialTiles) - 1 do
@@ -293 +314 @@
 begin
   FreeAndNil(Moves);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -442 +463 @@
 begin
   Size := Point(0, 0);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -519 +540 @@
   if Running and Assigned(FOnGameOver) then FOnGameOver(Self);
   Running := False;
+end;
+
+procedure TGame.SetColorPalette(AValue: TColorPalette);
+begin
+  if FColorPalette = AValue then Exit;
+  FColorPalette := AValue;
+  DoPaint;
 end;
 
@@ -579 +607 @@
   FRunning := Source.FRunning;
   Skin := Source.Skin;
+  ColorPalette := Source.ColorPalette;
 end;
 
@@ -1174 +1203 @@
     WriteBool('RecordHistory', RecordHistory);
     WriteInteger('Skin', Integer(Skin));
+    WriteInteger('ColorPalette', Integer(ColorPalette));
     FBoardUndo.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
     Board.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
@@ -1198 +1228 @@
     RecordHistory := ReadBoolWithDefault('RecordHistory', False);
     Skin := TTileSkin(ReadIntegerWithDefault('Skin', Integer(tsPowerOfTwo)));
+    ColorPalette := TColorPalette(ReadIntegerWithDefault('ColorPalette', Integer(cpOrangeYellow)));
     FBoardUndo.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
     Board.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
@@ -1229 +1260 @@
 
 function TGame.GetTileColor(Value: Integer): TColor;
+var
+  Color: TPixel32;
 begin
   if Core.Core.ThemeManager1.Theme.Name = 'Dark' then begin
@@ -1263 +1296 @@
     end;
   end;
+
+  Color.RGB := Result;
+  case ColorPalette of
+    cpOrangeYellow: Result := TColor(TPixel32.CreateRGB(Color.R, Color.G, Color.B));
+    cpGreenYellow: Result := TColor(TPixel32.CreateRGB(Color.R, Color.B, Color.G));
+    cpPinkBlue: Result := TColor(TPixel32.CreateRGB(Color.B, Color.R, Color.G));
+    cpBlueCyan: Result := TColor(TPixel32.CreateRGB(Color.B, Color.G, Color.R));
+    cpGreenCyan: Result := TColor(TPixel32.CreateRGB(Color.G, Color.B, Color.R));
+    cpPinkRed: Result := TColor(TPixel32.CreateRGB(Color.G, Color.R, Color.B));
+  end;
 end;