Changeset 51 for trunk

Timestamp:

Nov 3, 2019, 6:20:02 PM (5 years ago)

Author:

chronos

Message:

• Added: New tile skip alpha for alpha letters.

Location:

trunk

Files:

• Languages/Game2048.cs.mo (modified) ( previous)
• Languages/Game2048.cs.po (modified) (2 diffs)
• Languages/Game2048.po (modified) (2 diffs)
• UCore.lfm (modified) (3 diffs)
• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (9 diffs)

trunk/Languages/Game2048.cs.po

@@ -191 +191 @@
 #: ucore.swinmessage
 msgctxt "ucore.swinmessage"
-msgid "You reached %d and won! You can continue to play to get higher score."
-msgstr "Dosáhl jsi %d a vyhrál! Můžeš pokračovat ve hře k dosažení vyššího skóre."
+msgid "You reached %s and won! You can continue to play to get higher score."
+msgstr "Dosáhl jsi %s a vyhrál! Můžeš pokračovat ve hře k dosažení vyššího skóre."
 
 #: uformabout.slicense
@@ -238 +238 @@
 msgstr "Skóre"
 
+#: ugame.sskinalpha
+msgid "Alpha"
+msgstr "Písmena"
+
 #: ugame.sskinlinear
 msgid "Linear"

trunk/Languages/Game2048.po

@@ -181 +181 @@
 #: ucore.swinmessage
 msgctxt "ucore.swinmessage"
-msgid "You reached %d and won! You can continue to play to get higher score."
+msgid "You reached %s and won! You can continue to play to get higher score."
 msgstr ""
 
@@ -228 +228 @@
 msgstr ""
 
+#: ugame.sskinalpha
+msgid "Alpha"
+msgstr ""
+
 #: ugame.sskinlinear
 msgid "Linear"

trunk/UCore.lfm

@@ -4 +4 @@
   OldCreateOrder = False
   Height = 534
-  HorizontalOffset = 1092
-  VerticalOffset = 494
+  HorizontalOffset = 773
+  VerticalOffset = 525
   Width = 635
   PPI = 144
@@ -37 +37 @@
   object Translator1: TTranslator
     POFilesFolder = 'Languages'
+    OnTranslate = Translator1Translate
     left = 336
     top = 295
@@ -81 +82 @@
     end
   end
+  object ThemeManager2: TThemeManager
+    left = 163
+    top = 405
+  end
 end

trunk/UCore.pas

@@ -64 +64 @@
   SGameOverMessage = 'Game over!';
   SWinCaption = 'Win';
-  SWinMessage = 'You reached %d and won! You can continue to play to get higher score.';
+  SWinMessage = 'You reached %s and won! You can continue to play to get higher score.';
 
 { TCore }

trunk/UGame.pas

@@ -94 +94 @@
   end;
 
-  TTileSkin = (tsLinear, tsPowerOfTwo);
+  TTileSkin = (tsLinear, tsPowerOfTwo, tsAlpha);
 
   { TGame }
@@ -145 +145 @@
     procedure SaveToRegistry(RegContext: TRegistryContext);
     procedure LoadFromRegistry(RegContext: TRegistryContext);
-    function GetTileSkinValue(Value: Integer): Integer;
+    function GetTileSkinValue(Value: Integer): string;
+    function GetTileSkinScore(Value: Integer): Integer;
     constructor Create;
     destructor Destroy; override;
@@ -176 +177 @@
   SSkinLinear = 'Linear';
   SSkinPowerOfTwo = 'Power of two';
+  SSkinAlpha = 'Alpha';
   STileShouldBeEmpty = 'Tile should be empty';
+
 
 procedure Translate;
@@ -190 +193 @@
   SkinText[tsLinear] := SSkinLinear;
   SkinText[tsPowerOfTwo] := SSkinPowerOfTwo;
+  SkinText[tsAlpha] := SSkinAlpha;
 end;
 
@@ -694 +698 @@
               Board.Tiles[P.Y, P.X].Value := 0;
               Board.Tiles[P.Y, P.X].Merged := False;
-              Score := Score + GetTileSkinValue(Board.Tiles[PNew.Y, PNew.X].Value);
+              Score := Score + GetTileSkinScore(Board.Tiles[PNew.Y, PNew.X].Value);
             end;
           end;
@@ -715 +719 @@
   Canvas.RoundRect(TileRect, ScaleX(TileRect.Width div 20, 96), ScaleY(TileRect.Height div 20, 96));
   if WithText and (Tile.Value <> 0) then begin
-    ValueStr := IntToStr(GetTileSkinValue(Tile.Value));
+    ValueStr := GetTileSkinValue(Tile.Value);
     Canvas.Brush.Style := bsClear;
     Canvas.Font.Height := Trunc(TileRect.Height * 0.7);
@@ -859 +863 @@
               Board.Tiles[P.Y, P.X].NewValue := 0;
               Board.Tiles[P.Y, P.X].Merged := False;
-              Score := Score + GetTileSkinValue(Board.Tiles[PNew.Y, PNew.X].NewValue);
+              Score := Score + GetTileSkinScore(Board.Tiles[PNew.Y, PNew.X].NewValue);
               TileMoved := True;
             end;
@@ -918 +922 @@
 end;
 
-function TGame.GetTileSkinValue(Value: Integer): Integer;
-begin
-  if FSkin = tsPowerOfTwo then Result := 1 shl Value
-  else Result := Value;
+function TGame.GetTileSkinValue(Value: Integer): string;
+begin
+  case FSkin of
+    tsLinear: Result := IntToStr(Value);
+    tsPowerOfTwo: Result := IntToStr(1 shl Value);
+    tsAlpha: Result := Chr(Ord('A') + Value - 1);
+    else Result := IntToStr(Value);
+  end;
+end;
+
+function TGame.GetTileSkinScore(Value: Integer): Integer;
+begin
+  case FSkin of
+    tsLinear: Result := Value;
+    tsPowerOfTwo: Result := 1 shl Value;
+    tsAlpha: Result := Value;
+    else Result := Value;
+  end;
 end;
 
@@ -1083 +1101 @@
 end;
 
+initialization
+  Translate;
+
 end.