Implemented possibility to restart the game after it ended

TheWirv · Dec 5, 2020 · eeaaa4d · eeaaa4d
1 parent 2378302
commit eeaaa4d
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 27 deletions.
diff --git a/Content/UI/UI_EndMenu.uasset b/Content/UI/UI_EndMenu.uasset
diff --git a/Content/UI/UI_IngameScoreAndTurns.uasset b/Content/UI/UI_IngameScoreAndTurns.uasset
diff --git a/Content/UI/UI_MainMenu.uasset b/Content/UI/UI_MainMenu.uasset
diff --git a/README.md b/README.md
@@ -15,10 +15,10 @@ There is a game field consisting of hex fields containing blocks. The player nee
 
 ## Ideas for more features, expansions..
 
-- [ ] Score (+ UI)
+- [X] ~~Score (+ UI)~~
 - [ ] Varying probabilities for the different token types (the rarer, the more points it's worth)
 - [X] ~~Game ends after x moves~~
-- [ ] Possibility to restart the game after ending of game
+- [X] ~~Possibility to restart the game after ending of game~~
 - [ ] Exception Handling
 - [ ] Special blocks with special effects
 - [ ] Combos

diff --git a/Source/MatchThreeLines/MTLGameState.cpp b/Source/MatchThreeLines/MTLGameState.cpp
@@ -166,6 +166,21 @@ bool AMTLGameState::DestroyTokens(TArray<AGameToken*> SelectedTokens)
     return true;
 };
 
+void AMTLGameState::ResetPlayingField()
+{
+    for (TArray<AGameToken*>& Column : PlayingField)
+    {
+        for (AGameToken* Token : Column)
+        {
+            Token->Destroy();
+        }
+        Column.Empty();
+    }
+    PlayingField.Empty();
+
+    InitPlayingField();
+}
+
 // protected functions
 void AMTLGameState::BeginPlay()
 {

diff --git a/Source/MatchThreeLines/MTLGameState.h b/Source/MatchThreeLines/MTLGameState.h
@@ -73,6 +73,8 @@ class MATCHTHREELINES_API AMTLGameState : public AGameStateBase
      */
     bool DestroyTokens(TArray<AGameToken*> SelectedTokens);
 
+    void ResetPlayingField();
+
 protected:
     virtual void BeginPlay() override;
 };
diff --git a/Source/MatchThreeLines/MTLPlayerController.cpp b/Source/MatchThreeLines/MTLPlayerController.cpp
@@ -4,6 +4,7 @@
 #include "MTLPlayerController.h"
 #include "MTLPlayerState.h"
 #include "GameToken.h"
+#include "MTLGameState.h"
 
 // private functions
 void AMTLPlayerController::OnMouseClicked()
@@ -88,6 +89,22 @@ void AMTLPlayerController::StartOrResumeGame()
     SetPause(false);
 }
 
+void AMTLPlayerController::ResetGame() const
+{
+    AMTLGameState* GameState = GetWorld()->GetGameState<AMTLGameState>();
+    AMTLPlayerState* MTLPlayerState = GetPlayerState<AMTLPlayerState>();
+
+    if (GameState != nullptr && MTLPlayerState != nullptr)
+    {
+        GameState->ResetPlayingField();
+        MTLPlayerState->Init();
+    }
+    else
+    {
+        GEngine->AddOnScreenDebugMessage(1, 1.f, FColor::Red, TEXT("Couldn't get GameState or PlayerState!"));
+    }
+}
+
 // protected functions
 void AMTLPlayerController::SetupInputComponent()
 {

diff --git a/Source/MatchThreeLines/MTLPlayerController.h b/Source/MatchThreeLines/MTLPlayerController.h
@@ -34,10 +34,14 @@ class MATCHTHREELINES_API AMTLPlayerController : public APlayerController
     /** Wait for a tiny bit, then display the End menu */
     void EndGame();
 
-    /** Display the in-game menu, then unpause the game */
+    /** Hide the main/pause menu, display the in-game menu, then unpause the game */
     UFUNCTION(BlueprintCallable, Category = "MTL – UI")
     void StartOrResumeGame();
 
+    /** Reset the playing field, score and remaining turns */
+    UFUNCTION(BlueprintCallable, Category = "MTL – UI")
+    void ResetGame() const;
+
 protected:
     /** Called when the game starts. */
     virtual void BeginPlay() override;

diff --git a/Source/MatchThreeLines/MTLPlayerState.cpp b/Source/MatchThreeLines/MTLPlayerState.cpp
@@ -67,6 +67,28 @@ void AMTLPlayerState::AddTokenToSelected(AGameToken* Token)
     }
 }
 
+void AMTLPlayerState::Init()
+{
+    AGameStateBase* GameStateBase = GetWorld()->GetGameState();
+    if (GameStateBase != nullptr)
+    {
+        const AMTLGameMode* GameMode = GameStateBase->GetDefaultGameMode<AMTLGameMode>();
+        if (GameMode != nullptr)
+        {
+            SetScore(0.f);
+            AmountOfRemainingTurns = GameMode->GetMaxAmountOfTurns();
+        }
+        else
+        {
+            GEngine->AddOnScreenDebugMessage(1, 1.f, FColor::Red, TEXT("Couldn't get GameMode!"));
+        }
+    }
+    else
+    {
+        GEngine->AddOnScreenDebugMessage(1, 1.f, FColor::Red, TEXT("Couldn't get GameState!"));
+    }
+}
+
 void AMTLPlayerState::EndTurn()
 {
     SetIsSelecting(false);
@@ -98,22 +120,5 @@ void AMTLPlayerState::BeginPlay()
 {
     Super::BeginPlay();
 
-    AGameStateBase* GameStateBase = GetWorld()->GetGameState();
-    if (GameStateBase != nullptr)
-    {
-        const AMTLGameMode* GameMode = GameStateBase->GetDefaultGameMode<AMTLGameMode>();
-        if (GameMode != nullptr)
-        {
-            SetScore(0.f);
-            AmountOfRemainingTurns = GameMode->GetMaxAmountOfTurns();
-        }
-        else
-        {
-            GEngine->AddOnScreenDebugMessage(1, 1.f, FColor::Red, TEXT("Couldn't get GameMode!"));
-        }
-    }
-    else
-    {
-        GEngine->AddOnScreenDebugMessage(1, 1.f, FColor::Red, TEXT("Couldn't get GameState!"));
-    }
+    Init();
 }
diff --git a/Source/MatchThreeLines/MTLPlayerState.h b/Source/MatchThreeLines/MTLPlayerState.h
@@ -64,6 +64,9 @@ class MATCHTHREELINES_API AMTLPlayerState : public APlayerState
 
     void AddTokenToSelected(AGameToken* Token);
 
+    /** Reset all members to default/initial values */
+    void Init();
+
     /** Destroys all selected GameTokens, if more than three have been selected; then decrements AmountOfRemainingTurns */
     void EndTurn();