Add score counter for endless + fix commandbar layout

Difegue · Dec 1, 2023 · 90332e3 · 90332e3
1 parent 49b31f6
commit 90332e3
Show file tree

Hide file tree

Showing 27 changed files with 89 additions and 18 deletions.
diff --git a/LCDonald.Core/Games/AiAiBananaCatch.cs b/LCDonald.Core/Games/AiAiBananaCatch.cs
@@ -153,6 +153,7 @@ protected override void UpdateCore()
                     QueueSound(new LCDGameSound("../common/hit.ogg"));
                     _bananaPositions.Remove(banPos);
                     _bananasCollected++;
+                    IncrementScore();
                 }
             }
 

diff --git a/LCDonald.Core/Games/AmyRougeTennis.cs b/LCDonald.Core/Games/AmyRougeTennis.cs
@@ -231,6 +231,7 @@ public override void CustomUpdate()
             if (_ballPosition < 20 && _ballPosition != -1 && _aiResistance > 0 && _ballDirection)
             {
                 _aiResistance--;
+                IncrementScore();
                 QueueSound(new LCDGameSound("hit.ogg"));
                 _ballDirection = false;
 

diff --git a/LCDonald.Core/Games/AmyRougeVolleyball.cs b/LCDonald.Core/Games/AmyRougeVolleyball.cs
@@ -236,6 +236,7 @@ public override void CustomUpdate()
             if (_ballPosition < 20 && _ballPosition != -1 && _aiResistance > 0 && _ballDirection)
             {
                 _aiResistance--;
+                IncrementScore();
                 QueueSound(new LCDGameSound("hit_return.ogg"));
                 _ballDirection = false;
 

diff --git a/LCDonald.Core/Games/BigFishing.cs b/LCDonald.Core/Games/BigFishing.cs
@@ -290,6 +290,7 @@ private void ReelUpAnimation()
             PlayAnimation(reelAnimation);
 
             _fishCaught++;
+            IncrementScore();
             _hasLure = true;
 
             _rodPosition = 0;

diff --git a/LCDonald.Core/Games/BillyGiantEgg.cs b/LCDonald.Core/Games/BillyGiantEgg.cs
@@ -160,6 +160,7 @@ protected override void UpdateCore()
                 if (horizontalPos == _billyPosition)
                 {
                     _fruitPositions.Remove(ringPos);
+                    IncrementScore();
 
                     if (horizontalPos == 1 || horizontalPos == 2)
                         BlinkElement(GET_LEFT, 1);

diff --git a/LCDonald.Core/Games/CreamFlowerCatch.cs b/LCDonald.Core/Games/CreamFlowerCatch.cs
@@ -153,6 +153,7 @@ protected override void UpdateCore()
                     QueueSound(new LCDGameSound("../common/hit.ogg"));
                     _flowerPositions.Remove(fPos);
                     _flowersCollected++;
+                    IncrementScore();
                 }
             }
 

diff --git a/LCDonald.Core/Games/CreamFlowerCatch2005.cs b/LCDonald.Core/Games/CreamFlowerCatch2005.cs
@@ -171,6 +171,7 @@ protected override void UpdateCore()
                     QueueSound(new LCDGameSound("hit.ogg"));
                     _flowerPositions.Remove(fPos);
                     _flowersCollected++;
+                    IncrementScore();
 
                     // blink the matching hit bubble
                     switch (digit)

diff --git a/LCDonald.Core/Games/KnucklesBaseball.cs b/LCDonald.Core/Games/KnucklesBaseball.cs
@@ -169,6 +169,7 @@ public override void CustomUpdate()
                     if (digit == _knucklesPosition)
                     {
                         _ballsIntercepted++;
+                        IncrementScore();
                         QueueSound(new LCDGameSound("../common/hit.ogg"));
                     } 
                     else

diff --git a/LCDonald.Core/Games/KnucklesSoccer.cs b/LCDonald.Core/Games/KnucklesSoccer.cs
@@ -172,6 +172,7 @@ public override void CustomUpdate()
                     if (digit == _knucklesPosition)
                     {
                         _ballsIntercepted++;
+                        IncrementScore();
                         QueueSound(new LCDGameSound("../common/hit.ogg"));
                     } 
                     else

diff --git a/LCDonald.Core/Games/KnucklesTreasureHunt.cs b/LCDonald.Core/Games/KnucklesTreasureHunt.cs
@@ -302,6 +302,7 @@ protected override void UpdateCore()
                 if (IsInFrontOfEmerald(emerald) && _hasKnucklesMoved)
                 {
                     _emeraldsCollected++;
+                    IncrementScore();
                     QueueSound(new LCDGameSound("emerald_get.ogg"));
                     _emeraldPositions.Remove(emerald);
                 }

diff --git a/LCDonald.Core/Games/ShadowBasketball.cs b/LCDonald.Core/Games/ShadowBasketball.cs
@@ -235,7 +235,8 @@ protected override void UpdateCore()
             {
                 QueueSound(new LCDGameSound("../common/hit.ogg"));
                 _goalsScored += 2;
-
+                IncrementScore();
+
                 // hack to make the ball unshootable for 2 cycles
                 _ballPosition = -10;
                 _ballHalfStep = true;

diff --git a/LCDonald.Core/Games/ShadowGrinder.cs b/LCDonald.Core/Games/ShadowGrinder.cs
@@ -154,6 +154,7 @@ public override void CustomUpdate()
                     case 2:
                         QueueSound(new LCDGameSound("../common/hit.ogg"));
                         _gapsDodged++;
+                        IncrementScore();
                         break;
                 } 
             } 

diff --git a/LCDonald.Core/Games/ShadowHockey.cs b/LCDonald.Core/Games/ShadowHockey.cs
@@ -273,7 +273,8 @@ protected override void UpdateCore()
             {
                 QueueSound(new LCDGameSound("score.ogg"));
                 _goalsScored++;
-
+                IncrementScore();
+
                 // hack to make the ball unshootable for 2 cycles
                 _ballPosition = -10; 
                 _ballHalfStep = true;

diff --git a/LCDonald.Core/Games/SonicActionGame.cs b/LCDonald.Core/Games/SonicActionGame.cs
@@ -216,6 +216,7 @@ public override void CustomUpdate()
             {
                 QueueSound(new LCDGameSound("../common/hit.ogg"));
                 _platformsDodged++;
+                IncrementScore();
             }
 
             if (_platformsHit == 5)

diff --git a/LCDonald.Core/Games/SonicExtremeBoarding.cs b/LCDonald.Core/Games/SonicExtremeBoarding.cs
@@ -158,7 +158,8 @@ protected override void UpdateCore()
                     _ringPosition = 0;
                     QueueSound(new LCDGameSound("ring_hit.ogg"));
                     _ringsCollected++;
-
+                    IncrementScore();
+
                     // swap ring spawn point
                     _ringSpawn = _ringSpawn == 11 ? 17 : 11;
                 }

diff --git a/LCDonald.Core/Games/SonicSkateboard.cs b/LCDonald.Core/Games/SonicSkateboard.cs
@@ -180,6 +180,7 @@ protected override void UpdateCore()
                     _ringPositions.Remove(ringPos);
                     QueueSound(new LCDGameSound("../common/hit.ogg"));
                     _ringsCollected++;
+                    IncrementScore();
                 }
             }
         }

diff --git a/LCDonald.Core/Games/SonicSpeedway.cs b/LCDonald.Core/Games/SonicSpeedway.cs
@@ -199,6 +199,7 @@ public override void CustomUpdate()
             {
                 QueueSound(new LCDGameSound("../common/hit.ogg"));
                 _carRowsDodged++;
+                IncrementScore();
             }
 
             if (_carsHit == 5)

diff --git a/LCDonald.Core/Games/TailsSkyAdventure.cs b/LCDonald.Core/Games/TailsSkyAdventure.cs
@@ -183,7 +183,7 @@ protected override void UpdateCore()
                 QueueSound(new LCDGameSound("hit.ogg"));
                 _enemyPos = _projectilePos = -1;
                 _enemiesHit++;
-
+                IncrementScore();
             }
 
             // Move projectile forward

diff --git a/LCDonald.Core/Games/TailsSkyPatrol.cs b/LCDonald.Core/Games/TailsSkyPatrol.cs
@@ -147,6 +147,7 @@ protected override void UpdateCore()
                     QueueSound(new LCDGameSound("../common/hit.ogg"));
                     _ringPositions.Remove(ringPos);
                     _ringsCollected++;
+                    IncrementScore();
                 }
             }
 

diff --git a/LCDonald.Core/Games/TailsSoccer.cs b/LCDonald.Core/Games/TailsSoccer.cs
@@ -172,6 +172,7 @@ public override void CustomUpdate()
                     if (digit == _tailsPosition)
                     {
                         _ballsIntercepted++;
+                        IncrementScore();
                         QueueSound(new LCDGameSound("../common/hit.ogg"));
                     } 
                     else

diff --git a/LCDonald.Core/Model/ILCDGame.cs b/LCDonald.Core/Model/ILCDGame.cs
@@ -81,6 +81,7 @@ public interface ILCDGame
         event EventHandler Paused;
         event EventHandler Resumed;
         event EventHandler Stopped;
+        event EventHandler Scored;
 
     }
 

diff --git a/LCDonald.Core/Model/LCDGameBase.cs b/LCDonald.Core/Model/LCDGameBase.cs
@@ -15,6 +15,7 @@ public abstract class LCDGameBase : ILCDGame
         public event EventHandler Paused;
         public event EventHandler Resumed;
         public event EventHandler Stopped;
+        public event EventHandler Scored;
 #pragma warning restore CS8618
 
         protected int _customUpdateSpeed = 100;
@@ -211,6 +212,8 @@ public void Stop()
             Stopped?.Invoke(this, new EventArgs());
         }
 
+        public void IncrementScore() => Scored?.Invoke(this, new EventArgs());
+
         public void Update()
         {
             UpdateCore();

diff --git a/LCDonald/App.axaml b/LCDonald/App.axaml
@@ -13,6 +13,7 @@
 	<Application.Resources>
 		<ResourceDictionary>
 			<x:Double x:Key="ContentDialogMaxWidth">848</x:Double>
+			<FontFamily x:Key="DSEG7">avares://LCDonald/Assets#DSEG7 Classic</FontFamily>
 		</ResourceDictionary>
 	</Application.Resources>
 

diff --git a/LCDonald/Assets/DSEG7Classic-Italic.ttf b/LCDonald/Assets/DSEG7Classic-Italic.ttf
diff --git a/LCDonald/ViewModels/MainWindowViewModel.cs b/LCDonald/ViewModels/MainWindowViewModel.cs
@@ -68,13 +68,16 @@ partial void OnGameChanging(ILCDGame game)
                 Game.Paused -= Game_Paused;
                 Game.Resumed -= Game_Resumed;
                 Game.Stopped -= Game_Stopped;
+                Game.Scored -= Game_Scored;
             }
 
             game.Started += Game_Started;
             game.Paused += Game_Paused;
             game.Resumed += Game_Resumed;
             game.Stopped += Game_Stopped;
+            game.Scored += Game_Scored;
 
+            IsEndless = false;
             _currentInputs = game.GetAvailableInputs();
         }
 
@@ -94,6 +97,12 @@ partial void OnAvailableViewsChanged(List<MAMEView> views)
         [ObservableProperty]
         private bool _isPaused;
 
+        [ObservableProperty]
+        private bool _isEndless;
+
+        [ObservableProperty]
+        private int _score;
+
         [ObservableProperty]
         [NotifyCanExecuteChangedFor(nameof(PauseGameCommand))]
         [NotifyCanExecuteChangedFor(nameof(StopGameCommand))]
@@ -110,7 +119,10 @@ private void StartGame()
                 Game.Resume();
             }
             else if (!_isGameRunning)
+            {
+                IsEndless = false;
                 Game.Start();
+            }       
         }
 
         [RelayCommand]
@@ -121,7 +133,11 @@ private void StartEndless()
                 Game.Resume();
             }
             else if (!_isGameRunning)
+            {
+                IsEndless = true;
+                Score = 0;
                 Game.Start(true);
+            }
         }
 
         [RelayCommand(CanExecute = "IsGameRunning")] 
@@ -161,7 +177,13 @@ private void Game_Stopped(object? sender, EventArgs e)
                 IsGameRunning = false;
                 IsPaused = false;
             });
-
+        }
+        private void Game_Scored(object? sender, EventArgs e)
+        {
+            if (IsEndless)
+            {
+                Score++;
+            }
         }
     }
 

diff --git a/LCDonald/Views/MainView.axaml b/LCDonald/Views/MainView.axaml
@@ -189,9 +189,9 @@
 					<RowDefinition Height="*"/>
 				</Grid.RowDefinitions>
 				<Grid.ColumnDefinitions>
-					<ColumnDefinition MinWidth="32" Width="*" MaxWidth="400" />
-					<ColumnDefinition MinWidth="124" Width="*" />
-					<ColumnDefinition Width="268"/>
+					<ColumnDefinition MinWidth="32" Width="3*" MaxWidth="400" />
+					<ColumnDefinition Width="*" />
+					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
 
 				<Border Grid.Row="0" Grid.Column="0" Margin="0,4,0,0"
@@ -204,12 +204,14 @@
 				<ContentControl Content="{Binding Game.Name}" Grid.Row="0" Grid.Column="0" MinWidth="128"
 					   IsVisible="{Binding #NavView.DisplayMode, Converter={StaticResource MinimalDisplayModeConverter}}"
 					   Margin="8,0" ContentTemplate="{StaticResource GameTitleTemplate}" />
-
-					<ui:CommandBarButton Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" Width="120" Margin="0,0,8,0"
+
+				<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="2" Margin="0,0,12,0" HorizontalAlignment="Right">
+
+					<ui:CommandBarButton Width="120" Margin="0,0,8,0"
 										 IconSource="{Binding #LCDView.CurrentView, Mode=OneWay, Converter={StaticResource ViewIconConverter}}" 
 										 Label="{Binding #LCDView.CurrentView}" 
 										 ToolTip.Tip="Change View">
-						<ui:CommandBarButton.Flyout>
+					<ui:CommandBarButton.Flyout>
 							<Flyout>
 
 								<StackPanel Orientation="Vertical">
@@ -242,13 +244,26 @@
 						</ui:CommandBarButton.Flyout>
 					</ui:CommandBarButton>
 
-				<ui:CommandBarSeparator Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right"/>
+					<ui:CommandBarSeparator />
+
+					<TextBlock FontFamily="{StaticResource DSEG7}" Margin="4,0" HorizontalAlignment="Left"
+							   IsVisible="{Binding IsEndless, Mode=OneWay}" Width="80"
+							   Text="{Binding Score, StringFormat=\{0:000\}}" FontSize="32" VerticalAlignment="Center"/>
+
+					<ui:CommandBarButton IconSource="Play" Label="Play" ToolTip.Tip="Play" Command="{Binding StartGameCommand}"
+										 IsVisible="{Binding !IsGameRunning, Mode=OneWay}"/>
+					<ui:CommandBarButton IconSource="RepeatAll" Label="ENDLESS" ToolTip.Tip="Play (ENDLESS Mode)" Command="{Binding StartEndlessCommand}"
+										 IsVisible="{Binding !IsGameRunning, Mode=OneWay}"/>
+
+					<StackPanel IsVisible="{Binding IsGameRunning, Mode=OneWay}" Orientation="Horizontal">
+						<ui:CommandBarButton IconSource="Play" Label="Resume" ToolTip.Tip="Resume" Command="{Binding StartGameCommand}"
+										 IsVisible="{Binding IsPaused, Mode=OneWay}"/>
+						<ui:CommandBarButton IconSource="Pause" Label="Pause" ToolTip.Tip="Pause" Command="{Binding PauseGameCommand}"
+											 IsVisible="{Binding !IsPaused, Mode=OneWay}"/>
+						<ui:CommandBarButton IconSource="Stop" Label="Stop" ToolTip.Tip="Stop" Command="{Binding StopGameCommand}"
+											 IsVisible="True"/>
+					</StackPanel>
 
-				<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="2" Margin="0,0,12,0">
-					<ui:CommandBarButton IconSource="RepeatAll" Label="ENDLESS" ToolTip.Tip="Play" Command="{Binding StartEndlessCommand}"/>
-					<ui:CommandBarButton IconSource="Play" Label="Play" ToolTip.Tip="Play" Command="{Binding StartGameCommand}"/>
-					<ui:CommandBarButton IconSource="Pause" Label="Pause" ToolTip.Tip="Pause" Command="{Binding PauseGameCommand}"/>
-					<ui:CommandBarButton IconSource="Stop" Label="Stop" ToolTip.Tip="Stop" Command="{Binding StopGameCommand}"/>
 					<ui:CommandBarSeparator />
 					<ui:CommandBarButton IconSource="Keyboard" Label="Controls" ToolTip.Tip="Controls">
 						<ui:CommandBarButton.Flyout>
@@ -285,9 +300,18 @@
 				<Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
 						CornerRadius="{StaticResource ControlCornerRadius}" 
 						Grid.Row="1" Grid.ColumnSpan="3" Margin="0,8,0,0"
+						IsVisible="{Binding !IsEndless, Mode=OneWay}"
 						ClipToBounds="True">
 					<Image Source="avares://LCDonald/Assets/bg_1.jpg"
-					   Stretch="UniformToFill" Opacity="0.2"/>
+						   Stretch="UniformToFill" Opacity="0.2"/>
+				</Border>
+				<Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+						CornerRadius="{StaticResource ControlCornerRadius}"
+						Grid.Row="1" Grid.ColumnSpan="3" Margin="0,8,0,0"
+						IsVisible="{Binding IsEndless, Mode=OneWay}"
+						ClipToBounds="True">
+					<Image Source="avares://LCDonald/Assets/bg_2.jpg"
+						   Stretch="UniformToFill" Opacity="0.2"/>
 				</Border>
 
 				<controls:AvaloniaLCDView x:Name="LCDView" Grid.Row="1" Grid.ColumnSpan="3" Margin="0,8,0,0" Focusable="True"

diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ Feel free to look at the [issues](https://github.com/Difegue/LCDonald/issues) if
 * [AvaloniaUI](http://avaloniaui.net/)-based frontend, runs on Windows/Mac/Linux -- Backend is pure .NET and can run on (mostly)anything!
 
 All scanned/photographied materials in this repository are ©️SEGA, 2004/2005/2006.  
+This uses the [DSEG 7-segment font.](https://www.keshikan.net/fonts-e.html)  
 
 ## Build instructions