Changeset 90 for trunk

Timestamp:

Jun 7, 2024, 7:32:09 PM (5 months ago)

Author:

chronos

Message:

• Modified: Snap package updated to core22.
• Modified: Calculate different win tile value for different board sizes.

Location:

trunk

Files:

• Game.pas (modified) (1 diff)
• Install/snap/local/build.sh (modified) (1 diff)
• Install/snap/snapcraft.yaml (modified) (4 diffs)
• Packages/Common/Forms/FormAbout.lfm (modified) (3 diffs)

trunk/Game.pas

@@ -614 +614 @@
   I: Integer;
   Tile: TTile;
+const
+  Difficulty = 0.7;
 begin
   FCanUndo := False;
   Board.Clear;
+  WinTileValue := Round((Board.Size.X * Board.Size.Y) * Difficulty);
   Score := 0;
   Running := True;

trunk/Install/snap/local/build.sh

@@ -4 +4 @@
 
 pushd ../../..
-snapcraft --debug --use-lxd
+snapcraft --debug --use-lxd -v $@
 popd
 

trunk/Install/snap/snapcraft.yaml

@@ -15 +15 @@
   * Selectable tile skins (linear, exponential, alpha, binary, Roman)
 confinement: strict
-base: core20
+base: core22
 grade: stable
 icon: "Images/Logo 64x64.png"
@@ -43 +43 @@
     source: .
     source-type: local
-    build-packages: 
+    build-packages:
     - fpc
     - lazarus
@@ -51 +51 @@
       snapcraftctl build
       lazbuild --build-mode=Release Game2048.lpi
-      ROOT=/root/parts/2048x/install
-      install -d -m 755 $ROOT/usr/bin
-      install -s -m 755 Game2048 $ROOT/usr/bin/Game2048
-      install -d -m 755 $ROOT/usr/share/Game2048/languages
-      install -m 755 Languages/Game2048.po $ROOT/usr/share/Game2048/languages
-      install -m 755 Languages/Game2048.cs.po $ROOT/usr/share/Game2048/languages
-      install -d -m 755 $ROOT/usr/share/applications
-      install -m 755 Install/snap/local/2048.desktop $ROOT/usr/share/applications
-      install -d -m 755 $ROOT/usr/share/pixmaps
-      install -m 755 Images/2048.png $ROOT/usr/share/pixmaps
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/bin
+      install -s -m 755 Game2048 $SNAPCRAFT_PART_INSTALL/usr/bin/Game2048
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/Game2048/languages
+      install -m 755 Languages/*.po $SNAPCRAFT_PART_INSTALL/usr/share/Game2048/languages
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      install -m 755 Install/snap/local/2048.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
+      install -m 755 Images/2048.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
     stage:
       - etc
@@ -104 +102 @@
   2048x:
     command: usr/bin/Game2048
-    desktop: usr/share/applications/2048.desktop    
+    desktop: usr/share/applications/2048.desktop
     plugs:
       - desktop

trunk/Packages/Common/Forms/FormAbout.lfm

@@ -1 +1 @@
 object FormAbout: TFormAbout
-  Left = 624
+  Left = 929
   Height = 402
-  Top = 622
+  Top = 519
   Width = 702
   Caption = 'About'
@@ -10 +10 @@
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '2.2.6.0'
+  LCLVersion = '3.4.0.0'
   object LabelDescription: TLabel
     Left = 30
@@ -88 +88 @@
       Anchors = [akLeft, akBottom]
       Caption = 'Home page'
-      OnClick = ButtonHomePageClick
       ParentFont = False
       TabOrder = 0
+      OnClick = ButtonHomePageClick
     end
     object ButtonClose: TButton