Changeset 109 for trunk

Timestamp:

Dec 10, 2024, 10:38:11 AM (5 weeks ago)

Author:

chronos

Message:

• Modified: Added more score information.
• Fixed: Record only non-zero scores.

Location:

trunk

Files:

• Board.pas (modified) (2 diffs)
• Core.pas (modified) (2 diffs)
• Forms/FormScore.lfm (modified) (2 diffs)
• Forms/FormScore.lrj (modified) (1 diff)
• Forms/FormScore.pas (modified) (1 diff)
• Languages/Game2048.cs.po (modified) (1 diff)
• Score.pas (modified) (4 diffs)

trunk/Board.pas

@@ -20 +20 @@
     procedure Clear;
     procedure ClearMerged;
+    function GetBiggestTile: Integer;
     function GetValueSum: Integer;
     function GetHighestTileValue: Integer;
@@ -122 +123 @@
 end;
 
+function TBoard.GetBiggestTile: Integer;
+var
+  X, Y: Integer;
+begin
+  Result := 0;
+  for Y := 0 to Size.Y - 1 do
+    for X := 0 to Size.X - 1 do
+      if not Tiles[Y, X].Disabled and
+      not Tiles[Y, X].Unmergeable and
+      (Tiles[Y, X].Value > Result) then Result := Tiles[Y, X].Value;
+end;
+
 function TBoard.GetValueSum: Integer;
 var

trunk/Core.pas

@@ -275 +275 @@
   Score: TScore;
 begin
+  if Game.Score = 0 then Exit;  // Do not record zero score
+
   Score := Scores.SearchByTime(Game.StartTime);
   if not Assigned(Score) then Score := Scores.AddNew;
@@ -282 +284 @@
   Score.UsedUndos := Game.UsedUndos;
   Score.BoardSize := IntToStr(Game.Board.Size.X) + 'x' + IntToStr(Game.Board.Size.Y);
+  Score.DisabledTiles := Game.DisabledTilesCount;
+  Score.UnmergeableTiles := Game.UnmergeableTilesCount;
+  Score.Duration := Now - Game.StartTime;
+  Score.BiggestTile := Game.Board.GetBiggestTile;
 end;
 

trunk/Forms/FormScore.lfm

@@ -22 +22 @@
       end    
       item
+        Caption = 'Board size'
+        Width = 100
+      end    
+      item
         Caption = 'Score'
+        Width = 100
+      end    
+      item
+        Caption = 'Biggest tile'
         Width = 100
       end    
@@ -34 +42 @@
       end    
       item
-        Caption = 'Board size'
-        Width = 101
+        Caption = 'Disabled tiles'
+        Width = 100
+      end    
+      item
+        Caption = 'Unmergeable tiles'
+        Width = 100
+      end    
+      item
+        Caption = 'Duration'
+        Width = 100
       end>
     OwnerData = True

trunk/Forms/FormScore.lrj

@@ -2 +2 @@
 {"hash":5875333,"name":"tformscore.caption","sourcebytes":[83,99,111,114,101],"value":"Score"},
 {"hash":372789,"name":"tformscore.listview1.columns[0].caption","sourcebytes":[84,105,109,101],"value":"Time"},
-{"hash":5875333,"name":"tformscore.listview1.columns[1].caption","sourcebytes":[83,99,111,114,101],"value":"Score"},
-{"hash":5532867,"name":"tformscore.listview1.columns[2].caption","sourcebytes":[77,111,118,101,115],"value":"Moves"},
-{"hash":6048611,"name":"tformscore.listview1.columns[3].caption","sourcebytes":[85,110,100,111,115],"value":"Undos"},
-{"hash":140711557,"name":"tformscore.listview1.columns[4].caption","sourcebytes":[66,111,97,114,100,32,115,105,122,101],"value":"Board size"},
+{"hash":140711557,"name":"tformscore.listview1.columns[1].caption","sourcebytes":[66,111,97,114,100,32,115,105,122,101],"value":"Board size"},
+{"hash":5875333,"name":"tformscore.listview1.columns[2].caption","sourcebytes":[83,99,111,114,101],"value":"Score"},
+{"hash":250115045,"name":"tformscore.listview1.columns[3].caption","sourcebytes":[66,105,103,103,101,115,116,32,116,105,108,101],"value":"Biggest tile"},
+{"hash":5532867,"name":"tformscore.listview1.columns[4].caption","sourcebytes":[77,111,118,101,115],"value":"Moves"},
+{"hash":6048611,"name":"tformscore.listview1.columns[5].caption","sourcebytes":[85,110,100,111,115],"value":"Undos"},
+{"hash":116225219,"name":"tformscore.listview1.columns[6].caption","sourcebytes":[68,105,115,97,98,108,101,100,32,116,105,108,101,115],"value":"Disabled tiles"},
+{"hash":268299811,"name":"tformscore.listview1.columns[7].caption","sourcebytes":[85,110,109,101,114,103,101,97,98,108,101,32,116,105,108,101,115],"value":"Unmergeable tiles"},
+{"hash":210283758,"name":"tformscore.listview1.columns[8].caption","sourcebytes":[68,117,114,97,116,105,111,110],"value":"Duration"},
 {"hash":4863637,"name":"tformscore.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"},
 {"hash":4860802,"name":"tformscore.buttonclear.caption","sourcebytes":[67,108,101,97,114],"value":"Clear"}

trunk/Forms/FormScore.pas

@@ -43 +43 @@
   with FScores[Item.Index] do begin
     Item.Caption := DateTimeToStr(StartTime);
+    Item.SubItems.Add(BoardSize);
     Item.SubItems.Add(IntToStr(Score));
+    Item.SubItems.Add(IntToStr(1 shl BiggestTile));
     Item.SubItems.Add(IntToStr(Moves));
     Item.SubItems.Add(IntToStr(UsedUndos));
-    Item.SubItems.Add(BoardSize);
+    Item.SubItems.Add(IntToStr(DisabledTiles));
+    Item.SubItems.Add(IntToStr(UnmergeableTiles));
+    Item.SubItems.Add(TimeToStr(Duration));
   end;
 end;

trunk/Languages/Game2048.cs.po

@@ -323 +323 @@
 #: tformscore.listview1.columns[1].caption
 msgctxt "tformscore.listview1.columns[1].caption"
+msgid "Board size"
+msgstr "Velikost desky"
+
+#: tformscore.listview1.columns[2].caption
+msgctxt "tformscore.listview1.columns[2].caption"
 msgid "Score"
 msgstr "Skóre"
 
-#: tformscore.listview1.columns[2].caption
+#: tformscore.listview1.columns[3].caption
+msgctxt "tformscore.listview1.columns[3].caption"
+msgid "Biggest tile"
+msgstr "Největší dlaždice"
+
+#: tformscore.listview1.columns[4].caption
+msgctxt "tformscore.listview1.columns[4].caption"
 msgid "Moves"
-msgstr "Pohyby"
-
-#: tformscore.listview1.columns[3].caption
+msgstr "Pohybů"
+
+#: tformscore.listview1.columns[5].caption
+msgctxt "tformscore.listview1.columns[5].caption"
 msgid "Undos"
 msgstr "Vrácení"
 
-#: tformscore.listview1.columns[4].caption
-msgid "Board size"
-msgstr "Velikost desky"
+#: tformscore.listview1.columns[6].caption
+msgctxt "tformscore.listview1.columns[6].caption"
+msgid "Disabled tiles"
+msgstr "Blokované dlaždice"
+
+#: tformscore.listview1.columns[7].caption
+msgctxt "tformscore.listview1.columns[7].caption"
+msgid "Unmergeable tiles"
+msgstr "Neslučitelné dlaždice"
+
+#: tformscore.listview1.columns[8].caption
+msgctxt "tformscore.listview1.columns[8].caption"
+msgid "Duration"
+msgstr "Trvání"
 
 #: tformsettings.buttoncancel.caption

trunk/Score.pas

@@ -17 +17 @@
     UsedUndos: Integer;
     BoardSize: string;
+    DisabledTiles: Integer;
+    UnmergeableTiles: Integer;
+    BiggestTile: Integer;
     procedure SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
     procedure LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
@@ -30 +33 @@
   end;
 
+
 implementation
 
@@ -39 +43 @@
     CurrentContext := RegContext;
     WriteDateTime('StartTime', StartTime);
+    WriteDateTime('Duration', Duration);
     WriteInteger('Score', Score);
     WriteInteger('Moves', Moves);
     WriteInteger('UsedUndos', UsedUndos);
     WriteString('BoardSize', BoardSize);
+    WriteInteger('DisabledTiles', DisabledTiles);
+    WriteInteger('UnmergeableTiles', UnmergeableTiles);
+    WriteInteger('BiggestTile', BiggestTile);
   end;
 end;
@@ -52 +60 @@
     CurrentContext := RegContext;
     StartTime := ReadDateTimeWithDefault('StartTime', StartTime);
+    Duration := ReadDateTimeWithDefault('Duration', Duration);
     Score := ReadIntegerWithDefault('Score', Score);
     Moves := ReadIntegerWithDefault('Moves', Moves);
     UsedUndos := ReadIntegerWithDefault('UsedUndos', UsedUndos);
     BoardSize := ReadStringWithDefault('BoardSize', BoardSize);
+    DisabledTiles := ReadIntegerWithDefault('DisabledTiles', DisabledTiles);
+    UnmergeableTiles := ReadIntegerWithDefault('UnmergeableTiles', UnmergeableTiles);
+    BiggestTile := ReadIntegerWithDefault('BiggestTile', BiggestTile);
   end;
 end;