From 55f55f578c11b41de63f51bdb25b381c2e22f3a6 Mon Sep 17 00:00:00 2001
From: kolokolkkm <klimenkovknst@gmail.com>
Date: Sun, 16 Aug 2026 20:53:08 +0500
Subject: [PATCH 1/4] Fixing Russian file names

---
 .../GameController/GameController.cs          |  12 +++++------
 scenes/game/cards/Card.cs                     |   4 ++--
 scenes/ui/game_over/GameOver.cs               |   8 ++++----
 scenes/ui/game_ui/GameUI.cs                   |  12 +++++------
 .../card_click_1.mp3                          | Bin
 sounds/card_click_1.mp3.import                |  19 ++++++++++++++++++
 .../card_hover_1.mp3                          | Bin
 sounds/card_hover_1.mp3.import                |  19 ++++++++++++++++++
 .../correct_set_1.mp3                         | Bin
 sounds/correct_set_1.mp3.import               |  19 ++++++++++++++++++
 .../lose.wav                                  | Bin
 .../lose.wav.import                           |   6 +++---
 .../uncorrect_set_1.mp3                       | Bin
 sounds/uncorrect_set_1.mp3.import             |  19 ++++++++++++++++++
 .../unlock_achievement.mp3                    | Bin
 sounds/unlock_achievement.mp3.import          |  19 ++++++++++++++++++
 .../win.wav                                   | Bin
 .../win.wav.import                            |   6 +++---
 ...\260\321\206\320\270\321\217 1.mp3.import" |  19 ------------------
 ...\272\320\273\320\270\320\272 1.mp3.import" |  19 ------------------
 ...\276\321\207\320\272\321\203 1.mp3.import" |  19 ------------------
 ...\260\321\206\320\270\321\217 1.mp3.import" |  19 ------------------
 ...20\265\320\275\320\270\321\217.mp3.import" |  19 ------------------
 23 files changed, 118 insertions(+), 120 deletions(-)
 rename "sounds/\320\272\320\273\320\270\320\272 1.mp3" => sounds/card_click_1.mp3 (100%)
 create mode 100644 sounds/card_click_1.mp3.import
 rename "sounds/\320\275\320\260\320\262\320\265\320\264\320\265\320\275\320\270\320\265 \320\275\320\260 \320\272\320\260\321\200\321\202\320\276\321\207\320\272\321\203 1.mp3" => sounds/card_hover_1.mp3 (100%)
 create mode 100644 sounds/card_hover_1.mp3.import
 rename "sounds/\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3" => sounds/correct_set_1.mp3 (100%)
 create mode 100644 sounds/correct_set_1.mp3.import
 rename "sounds/\320\277\321\200\320\276\320\270\320\263\321\200\321\213\321\210.wav" => sounds/lose.wav (100%)
 rename "sounds/\320\277\321\200\320\276\320\270\320\263\321\200\321\213\321\210.wav.import" => sounds/lose.wav.import (53%)
 rename "sounds/\320\275\320\265\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3" => sounds/uncorrect_set_1.mp3 (100%)
 create mode 100644 sounds/uncorrect_set_1.mp3.import
 rename "sounds/\320\277\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\276\321\201\321\202\320\270\320\266\320\265\320\275\320\270\321\217.mp3" => sounds/unlock_achievement.mp3 (100%)
 create mode 100644 sounds/unlock_achievement.mp3.import
 rename "sounds/\320\277\320\276\320\261\320\265\320\264\320\260.wav" => sounds/win.wav (100%)
 rename "sounds/\320\277\320\276\320\261\320\265\320\264\320\260.wav.import" => sounds/win.wav.import (55%)
 delete mode 100644 "sounds/\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import"
 delete mode 100644 "sounds/\320\272\320\273\320\270\320\272 1.mp3.import"
 delete mode 100644 "sounds/\320\275\320\260\320\262\320\265\320\264\320\265\320\275\320\270\320\265 \320\275\320\260 \320\272\320\260\321\200\321\202\320\276\321\207\320\272\321\203 1.mp3.import"
 delete mode 100644 "sounds/\320\275\320\265\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import"
 delete mode 100644 "sounds/\320\277\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\276\321\201\321\202\320\270\320\266\320\265\320\275\320\270\321\217.mp3.import"

diff --git a/Core/Controllers/GameController/GameController.cs b/Core/Controllers/GameController/GameController.cs
index 6fc41b5..01a1d3e 100644
--- a/Core/Controllers/GameController/GameController.cs
+++ b/Core/Controllers/GameController/GameController.cs
@@ -36,7 +36,7 @@ public void ProcessSelectedSet(List<CardData> cards)
     {
         if (cards == null || cards.Count != 3)
         {
-            GD.PrintErr($"[GameController]: Ошибка! Проверяясь должно быть 3 карты, получено: {(cards?.Count ?? 0)}");
+            GD.PrintErr($"[GameController]: The number of cards is insufficient to check for a set. Cards transferred: {(cards?.Count ?? 0)}");
             return;
         }
 
@@ -110,10 +110,10 @@ private void HandleFailedSet()
 
     private void ValidateDependencies()
     {
-        if (GameScore == null) GD.PrintErr($"[GameController] Ошибка: Не прикреплен узел Score в инспекторе {Name}");
-        if (GameStreak == null) GD.PrintErr($"[GameController] Ошибка: Не прикреплен узел Streak в инспекторе {Name}");
-        if (CardValidator == null) GD.PrintErr($"[GameController] Ошибка: Не прикреплен узел CardValidator в инспекторе {Name}");
-        if (StreakStrategy == null) GD.PrintErr($"[GameController] Ошибка: Не прикреплен узел StreakStrategy в инспекторе {Name}");
-        if (PenaltyStrategy == null) GD.PrintErr($"[GameController] Ошибка: Ме прикреплен узел PenaltyStrategy в инспекторе {Name}");
+        if (GameScore == null) GD.PrintErr($"[GameController] Error: Score node not connected in the Inspector {Name}");
+        if (GameStreak == null) GD.PrintErr($"[GameController] Error: Streak node not connected in the Inspector {Name}");
+        if (CardValidator == null) GD.PrintErr($"[GameController] Error: CardValidator node not connected in the Inspector {Name}");
+        if (StreakStrategy == null) GD.PrintErr($"[GameController] Error: StreakStrategy node not connected in the Inspector {Name}");
+        if (PenaltyStrategy == null) GD.PrintErr($"[GameController] Error: PenaltyStrategy node not connected in the Inspector {Name}");
     }
 }
\ No newline at end of file
diff --git a/scenes/game/cards/Card.cs b/scenes/game/cards/Card.cs
index 6a9a3f6..7c708e7 100644
--- a/scenes/game/cards/Card.cs
+++ b/scenes/game/cards/Card.cs
@@ -103,9 +103,9 @@ public override void _Ready()
 		_clickArea = GetNode<Button>("ClickArea");
 		_selectionParticles = GetNode<GpuParticles2D>("SelectionParticles");
 		_sound = GetNode<AudioStreamPlayer>("AudioStreamPlayer");
-		_sound.Stream = ResourceLoader.Load<AudioStream>("res://sounds/наведение на карточку 1.mp3");
+		_sound.Stream = ResourceLoader.Load<AudioStream>("res://sounds/card_hover_1.mp3");
 		_sound2 = GetNode<AudioStreamPlayer>("AudioStreamPlayer2");
-		_sound2.Stream = ResourceLoader.Load<AudioStream>("res://sounds/клик 1.mp3");
+		_sound2.Stream = ResourceLoader.Load<AudioStream>("res://sounds/card_click_1.mp3");
 
 		if (_clickArea != null)
 		{
diff --git a/scenes/ui/game_over/GameOver.cs b/scenes/ui/game_over/GameOver.cs
index 39f9f9b..962f866 100644
--- a/scenes/ui/game_over/GameOver.cs
+++ b/scenes/ui/game_over/GameOver.cs
@@ -25,10 +25,10 @@ public void SetData(int score, int streak, int patterns, bool isNewScoreRecord,
 		_streakLabel.Text = $"x{streak}";
 		_patternsLabel.Text = patterns.ToString();
 
-        _recordLabel1.Text = isNewScoreRecord ? "Новый рекорд!" : "";
-        _recordLabel2.Text = isNewStreakRecord ? "Новый рекорд!" : "";
-        _recordLabel3.Text = isNewPatternsRecord ? "Новый рекорд!" : "";
-    }
+		_recordLabel1.Text = isNewScoreRecord ? "Новый рекорд!" : "";
+		_recordLabel2.Text = isNewStreakRecord ? "Новый рекорд!" : "";
+		_recordLabel3.Text = isNewPatternsRecord ? "Новый рекорд!" : "";
+	}
 
 	private void OnQuitPressed()
 	{
diff --git a/scenes/ui/game_ui/GameUI.cs b/scenes/ui/game_ui/GameUI.cs
index fe0a5ff..9d2b298 100644
--- a/scenes/ui/game_ui/GameUI.cs
+++ b/scenes/ui/game_ui/GameUI.cs
@@ -62,7 +62,7 @@ private void CheckSet()
 		if (ChekPattern(CardsField[selectedCards[0]], CardsField[selectedCards[1]], CardsField[selectedCards[2]]))
 		{
 			GD.Print("It`s set!");
-			PlaySound1("res://sounds/верная комбинация 1.mp3");
+			PlaySound1("res://sounds/correct_set_1.mp3");
 			CardClickedCounter = 0;
 			if (TheDeck.Count > 0)
 			{
@@ -103,7 +103,7 @@ private void CheckSet()
 		else
 		{
 			GD.Print("It isn`t set");
-			PlaySound1("res://sounds/неверная комбинация 1.mp3");
+			PlaySound1("res://sounds/uncorrect_set_1.mp3");
 			CardClickedCounter = 0;
 			for (int i = 0; i < 3; i++)
 			{
@@ -115,7 +115,6 @@ private void CheckSet()
 		}	
 	}
 
-	//Проверка на наличие паттерна
 	private static bool ChekPatternAvailable()
 	{
 		for (int c = 0; c < CardsField.Count-2; c++)
@@ -187,7 +186,7 @@ private void GenerateCards()
 		float scaleY = (screen.Y / 3.5f) / baseCardHeight;
 		float cardScale = Mathf.Min(scaleX, scaleY) * 0.75f;
 
-		float startX = screen.X * -0.17f; //для пятой колонки поменять на -0.21
+		float startX = screen.X * -0.17f;
 		float startY = screen.Y * -0.29f;
 
 		for (int i = 0; i < 12; i++)
@@ -256,7 +255,7 @@ private void AddAdditionalCards()
 
 		if (cardScene == null)
 		{
-			GD.PrintErr("[GameUI] Не удалось загрузить Card.tscn");
+			GD.PrintErr("[GameUI] \nFailed to load Card.tscn");
 			return;
 		}
 
@@ -406,7 +405,6 @@ private void OnStreakChanged(int value)
 		_streakLabel.Text = $"x{value}";
 	}
 
-	//Создание колоды
 	private void InitializeDeck()
 	{
 		TheDeck.Clear();
@@ -427,7 +425,7 @@ private void Shuffle<T>(IList<T> list)
 		while (n > 1)
 		{
 			n--;
-			int k = rng.Next(n + 1); // случайный индекс от 0 до n
+			int k = rng.Next(n + 1);
 			T value = list[k];
 			list[k] = list[n];
 			list[n] = value;
diff --git "a/sounds/\320\272\320\273\320\270\320\272 1.mp3" b/sounds/card_click_1.mp3
similarity index 100%
rename from "sounds/\320\272\320\273\320\270\320\272 1.mp3"
rename to sounds/card_click_1.mp3
diff --git a/sounds/card_click_1.mp3.import b/sounds/card_click_1.mp3.import
new file mode 100644
index 0000000..468db5e
--- /dev/null
+++ b/sounds/card_click_1.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://fr2g6glpe57l"
+path="res://.godot/imported/card_click_1.mp3-1c48c2c350ba66333c5fae19bd516832.mp3str"
+
+[deps]
+
+source_file="res://sounds/card_click_1.mp3"
+dest_files=["res://.godot/imported/card_click_1.mp3-1c48c2c350ba66333c5fae19bd516832.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4
diff --git "a/sounds/\320\275\320\260\320\262\320\265\320\264\320\265\320\275\320\270\320\265 \320\275\320\260 \320\272\320\260\321\200\321\202\320\276\321\207\320\272\321\203 1.mp3" b/sounds/card_hover_1.mp3
similarity index 100%
rename from "sounds/\320\275\320\260\320\262\320\265\320\264\320\265\320\275\320\270\320\265 \320\275\320\260 \320\272\320\260\321\200\321\202\320\276\321\207\320\272\321\203 1.mp3"
rename to sounds/card_hover_1.mp3
diff --git a/sounds/card_hover_1.mp3.import b/sounds/card_hover_1.mp3.import
new file mode 100644
index 0000000..a8701a2
--- /dev/null
+++ b/sounds/card_hover_1.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://c5jsxgngqkcd3"
+path="res://.godot/imported/card_hover_1.mp3-8bcd3b31bfbc447cbeed2c4bbcbde109.mp3str"
+
+[deps]
+
+source_file="res://sounds/card_hover_1.mp3"
+dest_files=["res://.godot/imported/card_hover_1.mp3-8bcd3b31bfbc447cbeed2c4bbcbde109.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git "a/sounds/\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3" b/sounds/correct_set_1.mp3
similarity index 100%
rename from "sounds/\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3"
rename to sounds/correct_set_1.mp3
diff --git a/sounds/correct_set_1.mp3.import b/sounds/correct_set_1.mp3.import
new file mode 100644
index 0000000..8d28bf6
--- /dev/null
+++ b/sounds/correct_set_1.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://6yjd0mbna0dw"
+path="res://.godot/imported/correct_set_1.mp3-8bc320e61f584b6c6a25099e082ac0be.mp3str"
+
+[deps]
+
+source_file="res://sounds/correct_set_1.mp3"
+dest_files=["res://.godot/imported/correct_set_1.mp3-8bc320e61f584b6c6a25099e082ac0be.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git "a/sounds/\320\277\321\200\320\276\320\270\320\263\321\200\321\213\321\210.wav" b/sounds/lose.wav
similarity index 100%
rename from "sounds/\320\277\321\200\320\276\320\270\320\263\321\200\321\213\321\210.wav"
rename to sounds/lose.wav
diff --git "a/sounds/\320\277\321\200\320\276\320\270\320\263\321\200\321\213\321\210.wav.import" b/sounds/lose.wav.import
similarity index 53%
rename from "sounds/\320\277\321\200\320\276\320\270\320\263\321\200\321\213\321\210.wav.import"
rename to sounds/lose.wav.import
index 81e67b4..36cc772 100644
--- "a/sounds/\320\277\321\200\320\276\320\270\320\263\321\200\321\213\321\210.wav.import"
+++ b/sounds/lose.wav.import
@@ -3,12 +3,12 @@
 importer="wav"
 type="AudioStreamWAV"
 uid="uid://7s2cslgt8pvr"
-path="res://.godot/imported/проигрыш.wav-ea45c21123b384609bae91758a1d4ea5.sample"
+path="res://.godot/imported/lose.wav-cb4e7670a5fe2d89b40e499c15bd8f1b.sample"
 
 [deps]
 
-source_file="res://sounds/проигрыш.wav"
-dest_files=["res://.godot/imported/проигрыш.wav-ea45c21123b384609bae91758a1d4ea5.sample"]
+source_file="res://sounds/lose.wav"
+dest_files=["res://.godot/imported/lose.wav-cb4e7670a5fe2d89b40e499c15bd8f1b.sample"]
 
 [params]
 
diff --git "a/sounds/\320\275\320\265\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3" b/sounds/uncorrect_set_1.mp3
similarity index 100%
rename from "sounds/\320\275\320\265\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3"
rename to sounds/uncorrect_set_1.mp3
diff --git a/sounds/uncorrect_set_1.mp3.import b/sounds/uncorrect_set_1.mp3.import
new file mode 100644
index 0000000..5b292b4
--- /dev/null
+++ b/sounds/uncorrect_set_1.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dym850wuhv6pv"
+path="res://.godot/imported/uncorrect_set_1.mp3-ac6a72111f36b24a03a7abc4117c8490.mp3str"
+
+[deps]
+
+source_file="res://sounds/uncorrect_set_1.mp3"
+dest_files=["res://.godot/imported/uncorrect_set_1.mp3-ac6a72111f36b24a03a7abc4117c8490.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git "a/sounds/\320\277\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\276\321\201\321\202\320\270\320\266\320\265\320\275\320\270\321\217.mp3" b/sounds/unlock_achievement.mp3
similarity index 100%
rename from "sounds/\320\277\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\276\321\201\321\202\320\270\320\266\320\265\320\275\320\270\321\217.mp3"
rename to sounds/unlock_achievement.mp3
diff --git a/sounds/unlock_achievement.mp3.import b/sounds/unlock_achievement.mp3.import
new file mode 100644
index 0000000..26ca63e
--- /dev/null
+++ b/sounds/unlock_achievement.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://4jln0j7cgybc"
+path="res://.godot/imported/unlock_achievement.mp3-dfb184d09822b866fb42d12d1edab4cd.mp3str"
+
+[deps]
+
+source_file="res://sounds/unlock_achievement.mp3"
+dest_files=["res://.godot/imported/unlock_achievement.mp3-dfb184d09822b866fb42d12d1edab4cd.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git "a/sounds/\320\277\320\276\320\261\320\265\320\264\320\260.wav" b/sounds/win.wav
similarity index 100%
rename from "sounds/\320\277\320\276\320\261\320\265\320\264\320\260.wav"
rename to sounds/win.wav
diff --git "a/sounds/\320\277\320\276\320\261\320\265\320\264\320\260.wav.import" b/sounds/win.wav.import
similarity index 55%
rename from "sounds/\320\277\320\276\320\261\320\265\320\264\320\260.wav.import"
rename to sounds/win.wav.import
index 0623132..f6096c0 100644
--- "a/sounds/\320\277\320\276\320\261\320\265\320\264\320\260.wav.import"
+++ b/sounds/win.wav.import
@@ -3,12 +3,12 @@
 importer="wav"
 type="AudioStreamWAV"
 uid="uid://ee27ggy3ip61"
-path="res://.godot/imported/победа.wav-2aa3db3cd0e3e34191701264b441ca85.sample"
+path="res://.godot/imported/win.wav-d8985249cb4cbbaa02050ce18417b390.sample"
 
 [deps]
 
-source_file="res://sounds/победа.wav"
-dest_files=["res://.godot/imported/победа.wav-2aa3db3cd0e3e34191701264b441ca85.sample"]
+source_file="res://sounds/win.wav"
+dest_files=["res://.godot/imported/win.wav-d8985249cb4cbbaa02050ce18417b390.sample"]
 
 [params]
 
diff --git "a/sounds/\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import" "b/sounds/\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import"
deleted file mode 100644
index 34d3d2d..0000000
--- "a/sounds/\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import"	
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://6yjd0mbna0dw"
-path="res://.godot/imported/верная комбинация 1.mp3-97b50e8501f48fbc2156d5e50f7040e4.mp3str"
-
-[deps]
-
-source_file="res://sounds/верная комбинация 1.mp3"
-dest_files=["res://.godot/imported/верная комбинация 1.mp3-97b50e8501f48fbc2156d5e50f7040e4.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git "a/sounds/\320\272\320\273\320\270\320\272 1.mp3.import" "b/sounds/\320\272\320\273\320\270\320\272 1.mp3.import"
deleted file mode 100644
index 2ff5b35..0000000
--- "a/sounds/\320\272\320\273\320\270\320\272 1.mp3.import"	
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://fr2g6glpe57l"
-path="res://.godot/imported/клик 1.mp3-8e4ed067407025e3cb3df523a60b70c7.mp3str"
-
-[deps]
-
-source_file="res://sounds/клик 1.mp3"
-dest_files=["res://.godot/imported/клик 1.mp3-8e4ed067407025e3cb3df523a60b70c7.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0.0
-bpm=0.0
-beat_count=0
-bar_beats=4
diff --git "a/sounds/\320\275\320\260\320\262\320\265\320\264\320\265\320\275\320\270\320\265 \320\275\320\260 \320\272\320\260\321\200\321\202\320\276\321\207\320\272\321\203 1.mp3.import" "b/sounds/\320\275\320\260\320\262\320\265\320\264\320\265\320\275\320\270\320\265 \320\275\320\260 \320\272\320\260\321\200\321\202\320\276\321\207\320\272\321\203 1.mp3.import"
deleted file mode 100644
index e9f9b69..0000000
--- "a/sounds/\320\275\320\260\320\262\320\265\320\264\320\265\320\275\320\270\320\265 \320\275\320\260 \320\272\320\260\321\200\321\202\320\276\321\207\320\272\321\203 1.mp3.import"	
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://c5jsxgngqkcd3"
-path="res://.godot/imported/наведение на карточку 1.mp3-72a81576d5627ba221e9c328b3dc513d.mp3str"
-
-[deps]
-
-source_file="res://sounds/наведение на карточку 1.mp3"
-dest_files=["res://.godot/imported/наведение на карточку 1.mp3-72a81576d5627ba221e9c328b3dc513d.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git "a/sounds/\320\275\320\265\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import" "b/sounds/\320\275\320\265\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import"
deleted file mode 100644
index b4d61d3..0000000
--- "a/sounds/\320\275\320\265\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import"	
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://dym850wuhv6pv"
-path="res://.godot/imported/неверная комбинация 1.mp3-c33a53122edc13bf757461b294bef0a3.mp3str"
-
-[deps]
-
-source_file="res://sounds/неверная комбинация 1.mp3"
-dest_files=["res://.godot/imported/неверная комбинация 1.mp3-c33a53122edc13bf757461b294bef0a3.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git "a/sounds/\320\277\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\276\321\201\321\202\320\270\320\266\320\265\320\275\320\270\321\217.mp3.import" "b/sounds/\320\277\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\276\321\201\321\202\320\270\320\266\320\265\320\275\320\270\321\217.mp3.import"
deleted file mode 100644
index f5f13e1..0000000
--- "a/sounds/\320\277\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\276\321\201\321\202\320\270\320\266\320\265\320\275\320\270\321\217.mp3.import"	
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://4jln0j7cgybc"
-path="res://.godot/imported/получение достижения.mp3-2720d59739f5dfc7e1c7d85188332ca9.mp3str"
-
-[deps]
-
-source_file="res://sounds/получение достижения.mp3"
-dest_files=["res://.godot/imported/получение достижения.mp3-2720d59739f5dfc7e1c7d85188332ca9.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

From 0b8881167d631c13d9b71eb4cb99bf2562ecd2e5 Mon Sep 17 00:00:00 2001
From: kolokolkkm <klimenkovknst@gmail.com>
Date: Mon, 17 Aug 2026 13:16:48 +0500
Subject: [PATCH 2/4] Game controller integration and minor adjustments

---
 Core/AchievementSystem/AchievementSystem.cs   |  15 +-
 .../GameController/GameController.cs          |   9 +-
 .../SaveController/GameSaveData.cs            |   1 +
 scenes/ui/game_ui/GameUI.cs                   | 162 +++++++++++-------
 scenes/ui/game_ui/GameUI.tscn                 |   2 +-
 ...ncorrect_set_1.mp3 => incorrect_set_1.mp3} | Bin
 sounds/incorrect_set_1.mp3.import             |  19 ++
 sounds/uncorrect_set_1.mp3.import             |  19 --
 8 files changed, 137 insertions(+), 90 deletions(-)
 rename sounds/{uncorrect_set_1.mp3 => incorrect_set_1.mp3} (100%)
 create mode 100644 sounds/incorrect_set_1.mp3.import
 delete mode 100644 sounds/uncorrect_set_1.mp3.import

diff --git a/Core/AchievementSystem/AchievementSystem.cs b/Core/AchievementSystem/AchievementSystem.cs
index efd4fc5..103f8db 100644
--- a/Core/AchievementSystem/AchievementSystem.cs
+++ b/Core/AchievementSystem/AchievementSystem.cs
@@ -13,11 +13,18 @@ public partial class AchievementSystem : Node
 
 	private GameSaveData saveData;
 
-	public override void _Ready()
+    private AudioStreamPlayer _achievementSound;
+
+    public override void _Ready()
 	{
 		saveData = SaveController.GameData;
 
-		foreach (var achievement in AllAchievements)
+        _achievementSound = new AudioStreamPlayer();
+        _achievementSound.Stream = ResourceLoader.Load<AudioStream>("res://sounds/unlock_achievement.mp3");
+
+        AddChild(_achievementSound);
+
+        foreach (var achievement in AllAchievements)
 		{
 			achievement.IsUnlocked =
 				saveData.Achievements.Contains(achievement.Id);
@@ -59,7 +66,9 @@ private void UnlockAchievement(AchievementData achievement)
 
 		achievement.IsUnlocked = true;
 
-		if (saveData != null && !saveData.Achievements.Contains(achievement.Id))
+        if (_achievementSound != null) _achievementSound.Play();
+
+        if (saveData != null && !saveData.Achievements.Contains(achievement.Id))
 		{
 			saveData.Achievements.Add(achievement.Id);
 			SaveController.SaveGameData(saveData);
diff --git a/Core/Controllers/GameController/GameController.cs b/Core/Controllers/GameController/GameController.cs
index 01a1d3e..c74f2ec 100644
--- a/Core/Controllers/GameController/GameController.cs
+++ b/Core/Controllers/GameController/GameController.cs
@@ -12,6 +12,7 @@ public partial class GameController : Node
 
     [Export] public Score GameScore { get; set; }
     [Export] public Streak GameStreak { get; set; }
+    public int SetsThisGame { get; private set; }
 
     [Export] public BaseCardValidator CardValidator { get; set; }
     [Export] public BaseStreakStrategy StreakStrategy { get; set; }
@@ -58,6 +59,7 @@ private void HandleSuccessfulSet(List<CardData> cards)
         int streakBonus = StreakStrategy.CalculateScore(GameScore, GameStreak);
         GameScore.Modify(ScoreForOneSet + streakBonus);
 
+        SetsThisGame++;
         SaveData.TotalSets++;
 
         gameAchievementSystem.CheckTotalSets(SaveData.TotalSets);
@@ -87,25 +89,26 @@ private void HandleFailedSet()
         EmitSignal(SignalName.SetCheckFailed);
     }
 
-    public (bool scoreRecord, bool streakRecord) FinishGame()
+    public (bool scoreRecord, bool streakRecord, bool PatternsRecord) FinishGame()
     {
         bool scoreRecord = GameScore.CurrentValue > SaveData.BestScore;
         bool streakRecord = GameStreak.MaxStreak > SaveData.BestStreak;
+        bool PatternsRecord = SetsThisGame > SaveData.BestPatterns;
 
         SaveData.TotalGames++;
         SaveData.TotalScore += GameScore.CurrentValue;
 
         SaveData.BestScore = Math.Max(SaveData.BestScore, GameScore.CurrentValue);
         SaveData.BestStreak = Math.Max(SaveData.BestStreak, GameStreak.MaxStreak);
+        SaveData.BestPatterns = Math.Max(SaveData.BestPatterns, SetsThisGame);
 
         if (SaveData.TotalGames >= 1)
         {
             gameAchievementSystem.UnlockByType(AchievementType.FirstGame);
-            GD.Print($"[GameController] unlock first game achievement");
         }
 
         SaveController.SaveGameData(SaveData);
-        return (scoreRecord, streakRecord);
+        return (scoreRecord, streakRecord, PatternsRecord);
     }
 
     private void ValidateDependencies()
diff --git a/Core/Controllers/SaveController/GameSaveData.cs b/Core/Controllers/SaveController/GameSaveData.cs
index b546bb7..31e6c4e 100644
--- a/Core/Controllers/SaveController/GameSaveData.cs
+++ b/Core/Controllers/SaveController/GameSaveData.cs
@@ -6,6 +6,7 @@ public partial class GameSaveData : Resource
 {
     [Export] public int BestScore { get; set; } = 0;
     [Export] public int BestStreak { get; set; } = 0;
+    [Export] public int BestPatterns { get; set; } = 0;
 
     [Export] public int TotalScore { get; set; } = 0;
 
diff --git a/scenes/ui/game_ui/GameUI.cs b/scenes/ui/game_ui/GameUI.cs
index 9d2b298..b94cbbc 100644
--- a/scenes/ui/game_ui/GameUI.cs
+++ b/scenes/ui/game_ui/GameUI.cs
@@ -27,6 +27,7 @@ public partial class GameUI : Control
 	public static int CardClickedCounter = 0;
 	private static List<Card> CardsField = new();
 	private static bool IsAddCards = false;
+	private List<int> _lastSelectedCardIndices = new();
 
 	public override void _Ready()
 	{
@@ -39,6 +40,9 @@ public override void _Ready()
 		gameController.GameScore.ValueChanged += OnScoreChanged;
 		gameController.GameStreak.ValueChanged += OnStreakChanged;
 
+		gameController.SetCheckSuccess += OnSetCheckSuccess;
+		gameController.SetCheckFailed += OnSetCheckFailed;
+
 		UpdateUI();
 		InitializeDeck();
 		CallDeferred(nameof(GenerateCards));
@@ -55,64 +59,30 @@ public override void _Ready()
 	private void CheckSet()
 	{
 		if (CardClickedCounter != 3) return;
-	
-		List<int> selectedCards = new List<int>();
-		for (int i = 0; i < CardsField.Count; i++) if (CardsField[i]._isSelected) selectedCards.Add(i);
-		GD.Print("ListCompiled");
-		if (ChekPattern(CardsField[selectedCards[0]], CardsField[selectedCards[1]], CardsField[selectedCards[2]]))
+
+		List<int> selectedIndices = new List<int>();
+		List<CardData> selectedCards = new List<CardData>();
+
+		for (int i = 0; i < CardsField.Count; i++)
 		{
-			GD.Print("It`s set!");
-			PlaySound1("res://sounds/correct_set_1.mp3");
-			CardClickedCounter = 0;
-			if (TheDeck.Count > 0)
+			if (CardsField[i]._isSelected) 
 			{
-				if (IsAddCards == false)
-				{
-					for (int i = 0; i < 3; i++)
-					{
-						GenerateNewCard(selectedCards[i]);
-					}
-				}
-				else
-				{
-					for (int i = 2; i > -1; i--)
-					{
-						CardsField[selectedCards[i]].QueueFree();
-						CardsField.RemoveAt(selectedCards[i]);
-						GD.Print("CardRemoved");
-					}
-					UpdateCardPosition();
-					GD.Print("CradUpadtePosition");
-				}
-				if (ChekPatternAvailable()) return;
-				AddAdditionalCards();
-			}
-			else
-			{
-				GD.Print("Last 12 card on field");
-				for (int i = 2; i > -1; i--)
-				{
-					CardsField[selectedCards[i]].QueueFree();
-					CardsField.RemoveAt(selectedCards[i]);
-					GD.Print("CardRemoved");
-				}
-				if (ChekPatternAvailable()) return;
-				EndGame();
+				selectedIndices.Add(i);
+				selectedCards.Add(new CardData(CardsField[i].Shape, CardsField[i].Color, CardsField[i].Fill, CardsField[i].Count));
 			}
 		}
-		else
+
+		if (selectedIndices.Count != 3)
 		{
-			GD.Print("It isn`t set");
-			PlaySound1("res://sounds/uncorrect_set_1.mp3");
-			CardClickedCounter = 0;
-			for (int i = 0; i < 3; i++)
-			{
-				CardsField[selectedCards[i]].SetSelected(false);
-				CardsField[selectedCards[i]].CCount = 0;
-			}
-			if (ChekPatternAvailable()) return;
-			AddAdditionalCards();
-		}	
+			GD.PrintErr($"[GameUI] Not 3 cards were selected, but {selectedIndices.Count}");
+			return;
+		}
+
+		_lastSelectedCardIndices = selectedIndices;
+
+		CardClickedCounter = 0;
+
+		gameController.ProcessSelectedSet(selectedCards);
 	}
 
 	private static bool ChekPatternAvailable()
@@ -367,25 +337,22 @@ private void OnPausePressed()
 
 	private void EndGame()
 	{
-		if (_isGameOver)
-			return;
+		if (_isGameOver) return;
 
 		_isGameOver = true;
 
 		int score = gameController.GameScore.CurrentValue;
-		int streak = gameController.GameStreak.CurrentValue;
+		int streak = gameController.GameStreak.MaxStreak;
+		int patterns = gameController.SetsThisGame;
 
-		var saveData = SaveController.GameData;
+		var records = gameController.FinishGame();
 
-		bool isNewScoreRecord = score > saveData.BestScore;
-		bool isNewStreakRecord = streak > saveData.BestStreak;
-		bool isNewPatternsRecord = true;
+		var gameOverScene = (PackedScene)GD.Load("res://scenes/ui/game_over/GameOver.tscn");
 
-		gameController.FinishGame();
+		var gameOverInstance =
+			gameOverScene.Instantiate<GameOver>();
 
-		var gameOverScene = (PackedScene)GD.Load("res://scenes/ui/game_over/GameOver.tscn");
-		var gameOverInstance = gameOverScene.Instantiate<GameOver>();
-		gameOverInstance.SetData(score, streak, 0, isNewScoreRecord, isNewStreakRecord, isNewPatternsRecord);
+		gameOverInstance.SetData(score, streak, patterns, records.scoreRecord, records.streakRecord, records.PatternsRecord);
 
 		AddChild(gameOverInstance);
 	}
@@ -431,4 +398,71 @@ private void Shuffle<T>(IList<T> list)
 			list[n] = value;
 		}
 	}
+	private void OnSetCheckSuccess(Godot.Collections.Array<CardData> checkedCards)
+	{
+		GD.Print("[GameUI] Correct SET!");
+
+		PlaySound1("res://sounds/correct_set_1.mp3");
+
+		if (TheDeck.Count > 0)
+		{
+			if (!IsAddCards)
+			{
+				for (int i = 0; i < 3; i++)
+				{
+					GenerateNewCard(_lastSelectedCardIndices[i]);
+				}
+			}
+			else
+			{
+				for (int i = 2; i >= 0; i--)
+				{
+					int index = _lastSelectedCardIndices[i];
+
+					CardsField[index].QueueFree();
+					CardsField.RemoveAt(index);
+				}
+
+				UpdateCardPosition();
+			}
+
+			_lastSelectedCardIndices.Clear();
+
+			if (ChekPatternAvailable())
+				return;
+
+			AddAdditionalCards();
+		}
+		else
+		{
+			for (int i = 2; i >= 0; i--)
+			{
+				int index = _lastSelectedCardIndices[i];
+
+				CardsField[index].QueueFree();
+				CardsField.RemoveAt(index);
+			}
+
+			if (ChekPatternAvailable())
+				return;
+
+			EndGame();
+		}
+
+		_lastSelectedCardIndices.Clear();
+	}
+	private void OnSetCheckFailed()
+	{
+		GD.Print("[GameUI] Uncorrect SET!");
+
+		PlaySound1("res://sounds/incorrect_set_1.mp3");
+
+		foreach (int index in _lastSelectedCardIndices)
+		{
+			CardsField[index].SetSelected(false);
+			CardsField[index].CCount = 0;
+		}
+
+		_lastSelectedCardIndices.Clear();
+	}
 }
diff --git a/scenes/ui/game_ui/GameUI.tscn b/scenes/ui/game_ui/GameUI.tscn
index c2b23d3..b326a7e 100644
--- a/scenes/ui/game_ui/GameUI.tscn
+++ b/scenes/ui/game_ui/GameUI.tscn
@@ -136,7 +136,7 @@ corner_radius_top_right = 50
 corner_radius_bottom_right = 50
 corner_radius_bottom_left = 50
 
-[node name="GameUi" type="Control" unique_id=1932013931 node_paths=PackedStringArray("gameController", "_streakLabel", "_timerLabel", "_scoreLabel", "_pauseButton", "_cardsContainer")]
+[node name="GameUi" type="Control" unique_id=1932013931 node_paths=PackedStringArray("gameController", "_streakLabel", "_timerLabel", "_scoreLabel", "_pauseButton", "_cardsContainer") groups=["GameUI"]]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
diff --git a/sounds/uncorrect_set_1.mp3 b/sounds/incorrect_set_1.mp3
similarity index 100%
rename from sounds/uncorrect_set_1.mp3
rename to sounds/incorrect_set_1.mp3
diff --git a/sounds/incorrect_set_1.mp3.import b/sounds/incorrect_set_1.mp3.import
new file mode 100644
index 0000000..2499468
--- /dev/null
+++ b/sounds/incorrect_set_1.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dym850wuhv6pv"
+path="res://.godot/imported/incorrect_set_1.mp3-613b8e20ff54b2c7c5283c3e02ef3cd3.mp3str"
+
+[deps]
+
+source_file="res://sounds/incorrect_set_1.mp3"
+dest_files=["res://.godot/imported/incorrect_set_1.mp3-613b8e20ff54b2c7c5283c3e02ef3cd3.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/sounds/uncorrect_set_1.mp3.import b/sounds/uncorrect_set_1.mp3.import
deleted file mode 100644
index 5b292b4..0000000
--- a/sounds/uncorrect_set_1.mp3.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://dym850wuhv6pv"
-path="res://.godot/imported/uncorrect_set_1.mp3-ac6a72111f36b24a03a7abc4117c8490.mp3str"
-
-[deps]
-
-source_file="res://sounds/uncorrect_set_1.mp3"
-dest_files=["res://.godot/imported/uncorrect_set_1.mp3-ac6a72111f36b24a03a7abc4117c8490.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

From a7e0b16ac392eec2f207db9e2040492c83260fcd Mon Sep 17 00:00:00 2001
From: kolokolkkm <klimenkovknst@gmail.com>
Date: Fri, 21 Aug 2026 13:14:07 +0500
Subject: [PATCH 3/4] Error correction with new records

---
 .../GameController/GameController.cs           | 17 +++++++++++------
 Core/StreakStrategy/LinearStreakStrategy.cs    | 18 +++++++++---------
 scenes/ui/game_ui/GameUI.tscn                  |  4 ++++
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Core/Controllers/GameController/GameController.cs b/Core/Controllers/GameController/GameController.cs
index c74f2ec..cb9b9a5 100644
--- a/Core/Controllers/GameController/GameController.cs
+++ b/Core/Controllers/GameController/GameController.cs
@@ -69,10 +69,6 @@ private void HandleSuccessfulSet(List<CardData> cards)
             gameAchievementSystem.UnlockByType(AchievementType.FirstSet);
         }
 
-        SaveData.BestScore = Math.Max(SaveData.BestScore, GameScore.HighScore);
-        SaveData.BestStreak = Math.Max(SaveData.BestStreak, GameStreak.MaxStreak);
-        SaveController.SaveGameData(SaveData);
-
         var cardArray = new Godot.Collections.Array<CardData>(cards);
         EmitSignal(SignalName.SetCheckSuccess, cardArray);
     }
@@ -93,11 +89,20 @@ private void HandleFailedSet()
     {
         bool scoreRecord = GameScore.CurrentValue > SaveData.BestScore;
         bool streakRecord = GameStreak.MaxStreak > SaveData.BestStreak;
-        bool PatternsRecord = SetsThisGame > SaveData.BestPatterns;
+        bool patternsRecord = SetsThisGame > SaveData.BestPatterns;
 
         SaveData.TotalGames++;
         SaveData.TotalScore += GameScore.CurrentValue;
 
+        if (scoreRecord)
+            SaveData.BestScore = GameScore.CurrentValue;
+
+        if (streakRecord)
+            SaveData.BestStreak = GameStreak.MaxStreak;
+
+        if (patternsRecord)
+            SaveData.BestPatterns = SetsThisGame;
+
         SaveData.BestScore = Math.Max(SaveData.BestScore, GameScore.CurrentValue);
         SaveData.BestStreak = Math.Max(SaveData.BestStreak, GameStreak.MaxStreak);
         SaveData.BestPatterns = Math.Max(SaveData.BestPatterns, SetsThisGame);
@@ -108,7 +113,7 @@ private void HandleFailedSet()
         }
 
         SaveController.SaveGameData(SaveData);
-        return (scoreRecord, streakRecord, PatternsRecord);
+        return (scoreRecord, streakRecord, patternsRecord);
     }
 
     private void ValidateDependencies()
diff --git a/Core/StreakStrategy/LinearStreakStrategy.cs b/Core/StreakStrategy/LinearStreakStrategy.cs
index 5c681f5..40ff7cf 100644
--- a/Core/StreakStrategy/LinearStreakStrategy.cs
+++ b/Core/StreakStrategy/LinearStreakStrategy.cs
@@ -4,15 +4,15 @@
 [GlobalClass]
 public partial class LinearStreakStrategy : BaseStreakStrategy
 {
-    [Export] public int PointsPerStreakStep { get; set; } = 5;
-    [Export] public int MaxMultiplier { get; set; } = 5;
+	[Export] public int PointsPerStreakStep { get; set; } = 5;
+	[Export] public int MaxMultiplier { get; set; } = 5;
 
-    public override int CalculateScore(Score score, Streak streak)
-    {
-        if(streak.CurrentValue < 1) return score.CurrentValue;
+	public override int CalculateScore(Score score, Streak streak)
+	{
+		if(streak.CurrentValue < 1) return score.CurrentValue;
 
-        int resultMultiplier = Mathf.Clamp(streak.CurrentValue, 1, MaxMultiplier);
+		int resultMultiplier = Mathf.Clamp(streak.CurrentValue, 1, MaxMultiplier);
 
-        return score.CurrentValue + (PointsPerStreakStep * resultMultiplier);
-    }
-}
\ No newline at end of file
+		return score.CurrentValue + (PointsPerStreakStep * resultMultiplier);
+	}
+}
diff --git a/scenes/ui/game_ui/GameUI.tscn b/scenes/ui/game_ui/GameUI.tscn
index b326a7e..8532f57 100644
--- a/scenes/ui/game_ui/GameUI.tscn
+++ b/scenes/ui/game_ui/GameUI.tscn
@@ -298,6 +298,7 @@ size_flags_vertical = 5
 
 [node name="GameController" type="Node" parent="." unique_id=829617540 node_paths=PackedStringArray("GameScore", "GameStreak", "CardValidator", "StreakStrategy", "PenaltyStrategy")]
 script = ExtResource("8_vp1mc")
+ScoreForOneSet = 100
 GameScore = NodePath("Score")
 GameStreak = NodePath("Streak")
 CardValidator = NodePath("ClassicCardValidator")
@@ -319,10 +320,13 @@ metadata/_custom_type_script = "uid://3n2ahowdbkax"
 
 [node name="LinearStreakStrategy" type="Node" parent="GameController" unique_id=81759365]
 script = ExtResource("12_bd4lo")
+PointsPerStreakStep = 50
+MaxMultiplier = 2147483647
 metadata/_custom_type_script = "uid://cl1qghsbela6r"
 
 [node name="FixedPenaltyStrategy" type="Node" parent="GameController" unique_id=601874918]
 script = ExtResource("13_cg7kb")
+PenaltyPoints = 100
 metadata/_custom_type_script = "uid://b47gwbx12p3t0"
 
 [node name="SoundsPlayer1" type="AudioStreamPlayer" parent="." unique_id=522768084]

From e35cbf2247eaa1bc5d8e46a800c7ffb723a2f9fb Mon Sep 17 00:00:00 2001
From: kolokolkkm <klimenkovknst@gmail.com>
Date: Thu, 27 Aug 2026 19:52:45 +0500
Subject: [PATCH 4/4] Adding all achievements and fixes

---
 Core/AchievementSystem/AchievementSystem.cs   | 22 +++---
 Core/AchievementSystem/Achievements.tscn      | 16 +++-
 .../GameController/GameController.cs          | 77 ++++++++++++++++++-
 Core/StreakStrategy/LinearStreakStrategy.cs   |  4 +-
 PatternShift.csproj                           |  2 +-
 PatternShift.csproj.old.1                     |  7 ++
 resources/achievements/All_achievements.tres  | 14 ++++
 resources/achievements/First_skin.tres        | 14 ++++
 resources/achievements/Mode_on_time.tres      | 14 ++++
 resources/achievements/NoMistakes.tres        | 13 ++++
 resources/achievements/Series_10.tres         | 14 ++++
 resources/achievements/Series_20.tres         | 14 ++++
 resources/achievements/Series_5.tres          | 14 ++++
 resources/achievements/Set_10_per_minute.tres | 14 ++++
 resources/achievements/Set_sec_5.tres         | 14 ++++
 resources/achievements/Sets25_NoMistakes.tres | 14 ++++
 resources/achievements/Sets_3_per_15_sec.tres | 14 ++++
 resources/achievements/TotalSets_10.tres      | 14 ++++
 resources/achievements/TotalSets_100.tres     | 14 ++++
 resources/achievements/TotalSets_50.tres      | 14 ++++
 resources/achievements/TotalSets_500.tres     | 14 ++++
 scenes/ui/game_ui/GameUI.cs                   | 14 ++++
 scenes/ui/game_ui/GameUI.tscn                 |  5 +-
 scenes/ui/pause/PausePopup.cs                 |  8 ++
 24 files changed, 349 insertions(+), 15 deletions(-)
 create mode 100644 PatternShift.csproj.old.1
 create mode 100644 resources/achievements/All_achievements.tres
 create mode 100644 resources/achievements/First_skin.tres
 create mode 100644 resources/achievements/Mode_on_time.tres
 create mode 100644 resources/achievements/NoMistakes.tres
 create mode 100644 resources/achievements/Series_10.tres
 create mode 100644 resources/achievements/Series_20.tres
 create mode 100644 resources/achievements/Series_5.tres
 create mode 100644 resources/achievements/Set_10_per_minute.tres
 create mode 100644 resources/achievements/Set_sec_5.tres
 create mode 100644 resources/achievements/Sets25_NoMistakes.tres
 create mode 100644 resources/achievements/Sets_3_per_15_sec.tres
 create mode 100644 resources/achievements/TotalSets_10.tres
 create mode 100644 resources/achievements/TotalSets_100.tres
 create mode 100644 resources/achievements/TotalSets_50.tres
 create mode 100644 resources/achievements/TotalSets_500.tres

diff --git a/Core/AchievementSystem/AchievementSystem.cs b/Core/AchievementSystem/AchievementSystem.cs
index 103f8db..fc9576a 100644
--- a/Core/AchievementSystem/AchievementSystem.cs
+++ b/Core/AchievementSystem/AchievementSystem.cs
@@ -13,18 +13,18 @@ public partial class AchievementSystem : Node
 
 	private GameSaveData saveData;
 
-    private AudioStreamPlayer _achievementSound;
+	private AudioStreamPlayer _achievementSound;
 
-    public override void _Ready()
+	public override void _Ready()
 	{
 		saveData = SaveController.GameData;
 
-        _achievementSound = new AudioStreamPlayer();
-        _achievementSound.Stream = ResourceLoader.Load<AudioStream>("res://sounds/unlock_achievement.mp3");
+		_achievementSound = new AudioStreamPlayer();
+		_achievementSound.Stream = ResourceLoader.Load<AudioStream>("res://sounds/unlock_achievement.mp3");
 
-        AddChild(_achievementSound);
+		AddChild(_achievementSound);
 
-        foreach (var achievement in AllAchievements)
+		foreach (var achievement in AllAchievements)
 		{
 			achievement.IsUnlocked =
 				saveData.Achievements.Contains(achievement.Id);
@@ -66,9 +66,13 @@ private void UnlockAchievement(AchievementData achievement)
 
 		achievement.IsUnlocked = true;
 
-        if (_achievementSound != null) _achievementSound.Play();
+		if (_achievementSound != null)
+		{
+			_achievementSound.Play();
+			GD.Print(achievement.AchievementName);
+		}
 
-        if (saveData != null && !saveData.Achievements.Contains(achievement.Id))
+		if (saveData != null && !saveData.Achievements.Contains(achievement.Id))
 		{
 			saveData.Achievements.Add(achievement.Id);
 			SaveController.SaveGameData(saveData);
@@ -82,7 +86,7 @@ private void UnlockAchievement(AchievementData achievement)
 		}
 	}
 
-	private void CheckAchievements(AchievementType type, int value = 1)
+	public void CheckAchievements(AchievementType type, int value = 1)
 	{
 		foreach (var achievement in AllAchievements)
 		{
diff --git a/Core/AchievementSystem/Achievements.tscn b/Core/AchievementSystem/Achievements.tscn
index c9cb23c..19377a8 100644
--- a/Core/AchievementSystem/Achievements.tscn
+++ b/Core/AchievementSystem/Achievements.tscn
@@ -5,8 +5,22 @@
 [ext_resource type="Resource" uid="uid://w8ijl5xmjo8y" path="res://resources/achievements/FirstSet.tres" id="3_qtoig"]
 [ext_resource type="Resource" uid="uid://bwfcy42k2nmt8" path="res://resources/achievements/FirstGame.tres" id="4_qtoig"]
 [ext_resource type="Resource" uid="uid://df185apnjqyui" path="res://resources/achievements/Points_1000.tres" id="5_l8182"]
+[ext_resource type="Resource" uid="uid://dsmnkn5rtudbs" path="res://resources/achievements/NoMistakes.tres" id="6_bjm61"]
+[ext_resource type="Resource" uid="uid://c0khsml6efaq" path="res://resources/achievements/TotalSets_10.tres" id="7_g78ka"]
+[ext_resource type="Resource" uid="uid://35cjnbw2xnvw" path="res://resources/achievements/TotalSets_50.tres" id="8_y5vsq"]
+[ext_resource type="Resource" uid="uid://bbetvxo00tbv2" path="res://resources/achievements/TotalSets_100.tres" id="9_y5vsq"]
+[ext_resource type="Resource" uid="uid://6nu02w1jojm6" path="res://resources/achievements/TotalSets_500.tres" id="10_ls5uk"]
+[ext_resource type="Resource" uid="uid://b47joqpxeutb4" path="res://resources/achievements/Sets25_NoMistakes.tres" id="11_ls5uk"]
+[ext_resource type="Resource" uid="uid://ci0gh7m10e81h" path="res://resources/achievements/Set_sec_5.tres" id="12_6dm4i"]
+[ext_resource type="Resource" uid="uid://dx6j4hc5a4x6s" path="res://resources/achievements/Series_5.tres" id="12_slb81"]
+[ext_resource type="Resource" uid="uid://bjowubeeylxw6" path="res://resources/achievements/Series_10.tres" id="13_hlqj6"]
+[ext_resource type="Resource" uid="uid://c4okwdq8fvn6o" path="res://resources/achievements/Series_20.tres" id="14_fffem"]
+[ext_resource type="Resource" uid="uid://dqnoxgli30dom" path="res://resources/achievements/Set_10_per_minute.tres" id="16_8vpy1"]
+[ext_resource type="Resource" uid="uid://la6qbi3b3qnr" path="res://resources/achievements/Sets_3_per_15_sec.tres" id="17_qqku5"]
+[ext_resource type="Resource" uid="uid://dhppdc71vdtci" path="res://resources/achievements/Mode_on_time.tres" id="18_gddjv"]
+[ext_resource type="Resource" uid="uid://beq8k6w0saixe" path="res://resources/achievements/All_achievements.tres" id="19_v8q2g"]
 
 [node name="AchievementSystem" type="Node" unique_id=1380662846]
 script = ExtResource("1_cke4p")
-AllAchievements = Array[ExtResource("2_8ygst")]([ExtResource("3_qtoig"), ExtResource("4_qtoig"), ExtResource("5_l8182")])
+AllAchievements = Array[ExtResource("2_8ygst")]([ExtResource("3_qtoig"), ExtResource("4_qtoig"), ExtResource("6_bjm61"), ExtResource("12_6dm4i"), ExtResource("5_l8182"), ExtResource("7_g78ka"), ExtResource("8_y5vsq"), ExtResource("9_y5vsq"), ExtResource("10_ls5uk"), ExtResource("12_slb81"), ExtResource("13_hlqj6"), ExtResource("14_fffem"), ExtResource("11_ls5uk"), ExtResource("16_8vpy1"), ExtResource("17_qqku5"), ExtResource("18_gddjv"), ExtResource("19_v8q2g")])
 metadata/_custom_type_script = "uid://c047evqheeiiv"
diff --git a/Core/Controllers/GameController/GameController.cs b/Core/Controllers/GameController/GameController.cs
index cb9b9a5..6dc2a30 100644
--- a/Core/Controllers/GameController/GameController.cs
+++ b/Core/Controllers/GameController/GameController.cs
@@ -7,12 +7,22 @@ public partial class GameController : Node
 {
     [Signal] public delegate void SetCheckSuccessEventHandler(Godot.Collections.Array<CardData> checkedCards);
     [Signal] public delegate void SetCheckFailedEventHandler();
+    [Signal] public delegate void TimeChangedEventHandler(int remainingTime);
+    [Signal] public delegate void GameFinishedEventHandler();
 
     [Export] public int ScoreForOneSet { get; set; } = 0;
+    [Export] public int GameDuration { get; set; } = 300;
+
+    public int RemainingTime { get; private set; }
+
+    private bool _isTimerPaused = false;
 
     [Export] public Score GameScore { get; set; }
     [Export] public Streak GameStreak { get; set; }
-    public int SetsThisGame { get; private set; }
+    [Export] public Timer GameTimer { get; set; }
+
+    public int SetsThisGame { get; private set; } = 0;
+    public int MistakesThisGame { get; private set; } = 0;
 
     [Export] public BaseCardValidator CardValidator { get; set; }
     [Export] public BaseStreakStrategy StreakStrategy { get; set; }
@@ -31,6 +41,10 @@ public override void _Ready()
         gameAchievementSystem = GetNode<AchievementSystem>("/root/Achievements");
 
         gameAchievementSystem.Initialize(GameScore, GameStreak);
+
+        GameTimer.Timeout += OnTimerTimeout;
+
+        StartGameTimer();
     }
 
     public void ProcessSelectedSet(List<CardData> cards)
@@ -63,12 +77,23 @@ private void HandleSuccessfulSet(List<CardData> cards)
         SaveData.TotalSets++;
 
         gameAchievementSystem.CheckTotalSets(SaveData.TotalSets);
+        gameAchievementSystem.CheckScore(GameScore.CurrentValue);
+        gameAchievementSystem.CheckStreak(GameStreak.CurrentValue);
 
         if (SaveData.TotalSets == 1)
         {
             gameAchievementSystem.UnlockByType(AchievementType.FirstSet);
         }
 
+        if (RemainingTime >= (GameDuration - 5))
+        {
+            gameAchievementSystem.CheckAchievements(AchievementType.FastSet);
+        }
+        if (RemainingTime >= (GameDuration - 15))
+        {
+            gameAchievementSystem.CheckAchievements(AchievementType.FastSet, SetsThisGame);
+        }
+
         var cardArray = new Godot.Collections.Array<CardData>(cards);
         EmitSignal(SignalName.SetCheckSuccess, cardArray);
     }
@@ -79,6 +104,7 @@ private void HandleFailedSet()
         GameScore.Modify(-penalty);
         GameStreak.ResetCurrentValue();
 
+        MistakesThisGame++;
         SaveData.TotalMistakes++;
         SaveController.SaveGameData(SaveData);
 
@@ -112,6 +138,11 @@ private void HandleFailedSet()
             gameAchievementSystem.UnlockByType(AchievementType.FirstGame);
         }
 
+        if (MistakesThisGame == 0)
+        {
+            gameAchievementSystem.UnlockByType(AchievementType.NoMistakes);
+        }
+
         SaveController.SaveGameData(SaveData);
         return (scoreRecord, streakRecord, patternsRecord);
     }
@@ -124,4 +155,48 @@ private void ValidateDependencies()
         if (StreakStrategy == null) GD.PrintErr($"[GameController] Error: StreakStrategy node not connected in the Inspector {Name}");
         if (PenaltyStrategy == null) GD.PrintErr($"[GameController] Error: PenaltyStrategy node not connected in the Inspector {Name}");
     }
+    public void StartGameTimer()
+    {
+        RemainingTime = GameDuration;
+
+        GameTimer.Start();
+
+        EmitSignal( SignalName.TimeChanged, RemainingTime);
+    }
+
+    private void OnTimerTimeout()
+    {
+        RemainingTime--;
+
+        if (RemainingTime <= 0)
+        {
+            RemainingTime = 0;
+            GameTimer.Stop();
+
+            EmitSignal(SignalName.TimeChanged, RemainingTime);
+
+            EmitSignal(SignalName.GameFinished);
+            return;
+        }
+
+        EmitSignal(SignalName.TimeChanged, RemainingTime);
+    }
+
+    public void PauseGameTimer()
+    {
+        if (GameTimer == null || GameTimer.IsStopped())
+            return;
+
+        _isTimerPaused = true;
+        GameTimer.Paused = true;
+    }
+
+    public void ResumeGameTimer()
+    {
+        if (GameTimer == null)
+            return;
+
+        _isTimerPaused = false;
+        GameTimer.Paused = false;
+    }
 }
\ No newline at end of file
diff --git a/Core/StreakStrategy/LinearStreakStrategy.cs b/Core/StreakStrategy/LinearStreakStrategy.cs
index 40ff7cf..0d1060b 100644
--- a/Core/StreakStrategy/LinearStreakStrategy.cs
+++ b/Core/StreakStrategy/LinearStreakStrategy.cs
@@ -9,10 +9,10 @@ public partial class LinearStreakStrategy : BaseStreakStrategy
 
 	public override int CalculateScore(Score score, Streak streak)
 	{
-		if(streak.CurrentValue < 1) return score.CurrentValue;
+		if(streak.CurrentValue <= 1) return score.CurrentValue;
 
 		int resultMultiplier = Mathf.Clamp(streak.CurrentValue, 1, MaxMultiplier);
 
-		return score.CurrentValue + (PointsPerStreakStep * resultMultiplier);
+		return PointsPerStreakStep * resultMultiplier;
 	}
 }
diff --git a/PatternShift.csproj b/PatternShift.csproj
index 19b3a42..ccbc2bc 100644
--- a/PatternShift.csproj
+++ b/PatternShift.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.7.1">
+<Project Sdk="Godot.NET.Sdk/4.7.0">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net9.0</TargetFramework>
diff --git a/PatternShift.csproj.old.1 b/PatternShift.csproj.old.1
new file mode 100644
index 0000000..19b3a42
--- /dev/null
+++ b/PatternShift.csproj.old.1
@@ -0,0 +1,7 @@
+<Project Sdk="Godot.NET.Sdk/4.7.1">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net9.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/resources/achievements/All_achievements.tres b/resources/achievements/All_achievements.tres
new file mode 100644
index 0000000..335edc7
--- /dev/null
+++ b/resources/achievements/All_achievements.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://beq8k6w0saixe"]
+
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_3pplh"]
+[ext_resource type="Texture2D" uid="uid://byfxnc1xfv5pi" path="res://assets/images/achievements/legend.png" id="1_vya30"]
+
+[resource]
+script = ExtResource("1_3pplh")
+Id = "all_achievements"
+AchievementName = "Легенда"
+AchievementDescription = "Открыть все дизайны карточек и получить все остальные достижения"
+Type = 12
+TargetValue = 1
+Icon = ExtResource("1_vya30")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/First_skin.tres b/resources/achievements/First_skin.tres
new file mode 100644
index 0000000..a7c2674
--- /dev/null
+++ b/resources/achievements/First_skin.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://bm3dsp7iq4ng3"]
+
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_aycrh"]
+[ext_resource type="Texture2D" uid="uid://c7fi1oxpfclbc" path="res://assets/images/achievements/collector.png" id="1_cygcu"]
+
+[resource]
+script = ExtResource("1_aycrh")
+Id = "first_skin"
+AchievementName = "Коллекционер"
+AchievementDescription = "Открыть первый дизайн карточек"
+Type = 6
+TargetValue = 1
+Icon = ExtResource("1_cygcu")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/Mode_on_time.tres b/resources/achievements/Mode_on_time.tres
new file mode 100644
index 0000000..67669cc
--- /dev/null
+++ b/resources/achievements/Mode_on_time.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://dhppdc71vdtci"]
+
+[ext_resource type="Texture2D" uid="uid://bucojbroaxmt2" path="res://assets/images/achievements/against_time.png" id="1_duiko"]
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_pgknf"]
+
+[resource]
+script = ExtResource("1_pgknf")
+Id = "mode_on_time"
+AchievementName = "Время"
+AchievementDescription = "Выиграть режим \"На время\""
+Type = 11
+TargetValue = 1
+Icon = ExtResource("1_duiko")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/NoMistakes.tres b/resources/achievements/NoMistakes.tres
new file mode 100644
index 0000000..83dedf1
--- /dev/null
+++ b/resources/achievements/NoMistakes.tres
@@ -0,0 +1,13 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://dsmnkn5rtudbs"]
+
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_d7sre"]
+[ext_resource type="Texture2D" uid="uid://su540gappm7v" path="res://assets/images/achievements/flawless.png" id="1_v6jhb"]
+
+[resource]
+script = ExtResource("1_d7sre")
+Id = "no_mistakes"
+AchievementName = "Без ошибок"
+AchievementDescription = "Закончить игру без единой ошибки"
+Type = 2
+Icon = ExtResource("1_v6jhb")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/Series_10.tres b/resources/achievements/Series_10.tres
new file mode 100644
index 0000000..5b0ccd1
--- /dev/null
+++ b/resources/achievements/Series_10.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://bjowubeeylxw6"]
+
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_8jng8"]
+[ext_resource type="Texture2D" uid="uid://bxij4eev2d8lq" path="res://assets/images/achievements/streak_x10.png" id="1_vrsk4"]
+
+[resource]
+script = ExtResource("1_8jng8")
+Id = "series_10"
+AchievementName = "Серия ×10"
+AchievementDescription = "Сделать серию из 10 правильных ответов"
+Type = 7
+TargetValue = 10
+Icon = ExtResource("1_vrsk4")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/Series_20.tres b/resources/achievements/Series_20.tres
new file mode 100644
index 0000000..138d23f
--- /dev/null
+++ b/resources/achievements/Series_20.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://c4okwdq8fvn6o"]
+
+[ext_resource type="Texture2D" uid="uid://ifxglfh6dkdq" path="res://assets/images/achievements/streak_x20.png" id="1_4qy0a"]
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_u8umm"]
+
+[resource]
+script = ExtResource("1_u8umm")
+Id = "series_20"
+AchievementName = "Серия ×20"
+AchievementDescription = "Cделать серию из 20 правильных ответов"
+Type = 7
+TargetValue = 20
+Icon = ExtResource("1_4qy0a")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/Series_5.tres b/resources/achievements/Series_5.tres
new file mode 100644
index 0000000..0c4f8c2
--- /dev/null
+++ b/resources/achievements/Series_5.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://dx6j4hc5a4x6s"]
+
+[ext_resource type="Texture2D" uid="uid://c358drlsquy3k" path="res://assets/images/achievements/streak_x5.png" id="1_gop6l"]
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_w5a7x"]
+
+[resource]
+script = ExtResource("1_w5a7x")
+Id = "Series_5"
+AchievementName = "Серия ×5"
+AchievementDescription = "Cделать серию из 5 правильных ответов"
+Type = 7
+TargetValue = 5
+Icon = ExtResource("1_gop6l")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/Set_10_per_minute.tres b/resources/achievements/Set_10_per_minute.tres
new file mode 100644
index 0000000..27448ae
--- /dev/null
+++ b/resources/achievements/Set_10_per_minute.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://dqnoxgli30dom"]
+
+[ext_resource type="Texture2D" uid="uid://bhscf7ntsltnv" path="res://assets/images/achievements/speedrunner.png" id="1_aqpsq"]
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_xfj6h"]
+
+[resource]
+script = ExtResource("1_xfj6h")
+Id = "Set_10_per_minute"
+AchievementName = "Спидраннер"
+AchievementDescription = "Найти 10 комбинаций менее чем за минуту"
+Type = 9
+TargetValue = 10
+Icon = ExtResource("1_aqpsq")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/Set_sec_5.tres b/resources/achievements/Set_sec_5.tres
new file mode 100644
index 0000000..9645dbe
--- /dev/null
+++ b/resources/achievements/Set_sec_5.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://ci0gh7m10e81h"]
+
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_m0pky"]
+[ext_resource type="Texture2D" uid="uid://dn5swbwsiij01" path="res://assets/images/achievements/quick_hands.png" id="1_qwp6j"]
+
+[resource]
+script = ExtResource("1_m0pky")
+Id = "set_sec_5"
+AchievementName = "Быстрые руки"
+AchievementDescription = "Найти комбинацию за 5 секунд"
+Type = 3
+TargetValue = 1
+Icon = ExtResource("1_qwp6j")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/Sets25_NoMistakes.tres b/resources/achievements/Sets25_NoMistakes.tres
new file mode 100644
index 0000000..99b8bc1
--- /dev/null
+++ b/resources/achievements/Sets25_NoMistakes.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://b47joqpxeutb4"]
+
+[ext_resource type="Texture2D" uid="uid://muacqjn047gh" path="res://assets/images/achievements/unstoppable.png" id="1_3ua8n"]
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="2_lilv8"]
+
+[resource]
+script = ExtResource("2_lilv8")
+Id = "Sets_25_without_mistakes"
+AchievementName = "Без промаха"
+AchievementDescription = "Найти 25 комбинаций подряд без ошибок"
+Type = 8
+TargetValue = 25
+Icon = ExtResource("1_3ua8n")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/Sets_3_per_15_sec.tres b/resources/achievements/Sets_3_per_15_sec.tres
new file mode 100644
index 0000000..e29bb11
--- /dev/null
+++ b/resources/achievements/Sets_3_per_15_sec.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://la6qbi3b3qnr"]
+
+[ext_resource type="Texture2D" uid="uid://dkod2v2n1c01a" path="res://assets/images/achievements/lightning.png" id="1_0kq8x"]
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_vahwl"]
+
+[resource]
+script = ExtResource("1_vahwl")
+Id = "Sets_3_per_15_sec"
+AchievementName = "Молния"
+AchievementDescription = "Найти 3 комбинации подряд быстрее чем за 15 секунд"
+Type = 10
+TargetValue = 3
+Icon = ExtResource("1_0kq8x")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/TotalSets_10.tres b/resources/achievements/TotalSets_10.tres
new file mode 100644
index 0000000..f533ca8
--- /dev/null
+++ b/resources/achievements/TotalSets_10.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://c0khsml6efaq"]
+
+[ext_resource type="Texture2D" uid="uid://qolle4ecu4o2" path="res://assets/images/achievements/explorer.png" id="1_7xif6"]
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="2_66fdo"]
+
+[resource]
+script = ExtResource("2_66fdo")
+Id = "totalSets_10"
+AchievementName = "Исследователь "
+AchievementDescription = "Найти 10 комбинаций"
+Type = 5
+TargetValue = 10
+Icon = ExtResource("1_7xif6")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/TotalSets_100.tres b/resources/achievements/TotalSets_100.tres
new file mode 100644
index 0000000..8029124
--- /dev/null
+++ b/resources/achievements/TotalSets_100.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://bbetvxo00tbv2"]
+
+[ext_resource type="Texture2D" uid="uid://xfjycp061qup" path="res://assets/images/achievements/logic_master.png" id="1_3dn3s"]
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_p5kjl"]
+
+[resource]
+script = ExtResource("1_p5kjl")
+Id = "totalSets_100"
+AchievementName = "Мастер логики"
+AchievementDescription = "Найти 100 комбинаций"
+Type = 5
+TargetValue = 100
+Icon = ExtResource("1_3dn3s")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/TotalSets_50.tres b/resources/achievements/TotalSets_50.tres
new file mode 100644
index 0000000..31a60de
--- /dev/null
+++ b/resources/achievements/TotalSets_50.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://35cjnbw2xnvw"]
+
+[ext_resource type="Texture2D" uid="uid://bdofd68t12sb" path="res://assets/images/achievements/analyst.png" id="1_dqbtw"]
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_li4cs"]
+
+[resource]
+script = ExtResource("1_li4cs")
+Id = "totalSets_50"
+AchievementName = "Аналитик "
+AchievementDescription = "Найти 50 комбинаций"
+Type = 5
+TargetValue = 50
+Icon = ExtResource("1_dqbtw")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/resources/achievements/TotalSets_500.tres b/resources/achievements/TotalSets_500.tres
new file mode 100644
index 0000000..e05809e
--- /dev/null
+++ b/resources/achievements/TotalSets_500.tres
@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="AchievementData" format=3 uid="uid://6nu02w1jojm6"]
+
+[ext_resource type="Script" uid="uid://dlp73yl0k544o" path="res://Core/AchievementSystem/AchievementData.cs" id="1_j83c4"]
+[ext_resource type="Texture2D" uid="uid://dqrcr6vpa7yyw" path="res://assets/images/achievements/genius.png" id="1_mll0k"]
+
+[resource]
+script = ExtResource("1_j83c4")
+Id = "totalSets_500"
+AchievementName = "Гений"
+AchievementDescription = "Найти 500 комбинаций"
+Type = 5
+TargetValue = 500
+Icon = ExtResource("1_mll0k")
+metadata/_custom_type_script = "uid://dlp73yl0k544o"
diff --git a/scenes/ui/game_ui/GameUI.cs b/scenes/ui/game_ui/GameUI.cs
index b94cbbc..3d7f306 100644
--- a/scenes/ui/game_ui/GameUI.cs
+++ b/scenes/ui/game_ui/GameUI.cs
@@ -42,6 +42,8 @@ public override void _Ready()
 
 		gameController.SetCheckSuccess += OnSetCheckSuccess;
 		gameController.SetCheckFailed += OnSetCheckFailed;
+		gameController.TimeChanged += OnTimeChanged;
+		gameController.GameFinished += EndGame;
 
 		UpdateUI();
 		InitializeDeck();
@@ -322,6 +324,8 @@ private void OnViewportResized()
 
 	private void OnPausePressed()
 	{
+		gameController.PauseGameTimer();
+
 		var pauseScene = (PackedScene)GD.Load("res://scenes/ui/pause/PausePopup.tscn");
 		var pauseInstance = pauseScene.Instantiate<PausePopup>();
 
@@ -331,6 +335,8 @@ private void OnPausePressed()
 			EndGame();
 		};
 
+		pauseInstance.Setup(gameController);
+
 		AddChild(pauseInstance);
 		_isPaused = true;
 	}
@@ -372,6 +378,14 @@ private void OnStreakChanged(int value)
 		_streakLabel.Text = $"x{value}";
 	}
 
+	private void OnTimeChanged(int remainingTime)
+	{
+		int minutes = remainingTime / 60;
+		int seconds = remainingTime % 60;
+
+		_timerLabel.Text = $"{minutes:00}:{seconds:00}";
+	}
+
 	private void InitializeDeck()
 	{
 		TheDeck.Clear();
diff --git a/scenes/ui/game_ui/GameUI.tscn b/scenes/ui/game_ui/GameUI.tscn
index 8532f57..7421975 100644
--- a/scenes/ui/game_ui/GameUI.tscn
+++ b/scenes/ui/game_ui/GameUI.tscn
@@ -296,11 +296,12 @@ layout_mode = 2
 size_flags_horizontal = 5
 size_flags_vertical = 5
 
-[node name="GameController" type="Node" parent="." unique_id=829617540 node_paths=PackedStringArray("GameScore", "GameStreak", "CardValidator", "StreakStrategy", "PenaltyStrategy")]
+[node name="GameController" type="Node" parent="." unique_id=829617540 node_paths=PackedStringArray("GameScore", "GameStreak", "GameTimer", "CardValidator", "StreakStrategy", "PenaltyStrategy")]
 script = ExtResource("8_vp1mc")
 ScoreForOneSet = 100
 GameScore = NodePath("Score")
 GameStreak = NodePath("Streak")
+GameTimer = NodePath("Timer")
 CardValidator = NodePath("ClassicCardValidator")
 StreakStrategy = NodePath("LinearStreakStrategy")
 PenaltyStrategy = NodePath("FixedPenaltyStrategy")
@@ -329,6 +330,8 @@ script = ExtResource("13_cg7kb")
 PenaltyPoints = 100
 metadata/_custom_type_script = "uid://b47gwbx12p3t0"
 
+[node name="Timer" type="Timer" parent="GameController" unique_id=146074093]
+
 [node name="SoundsPlayer1" type="AudioStreamPlayer" parent="." unique_id=522768084]
 
 [node name="SoundsPlayer2" type="AudioStreamPlayer" parent="." unique_id=2015957276]
diff --git a/scenes/ui/pause/PausePopup.cs b/scenes/ui/pause/PausePopup.cs
index 3b65ce9..11acabf 100644
--- a/scenes/ui/pause/PausePopup.cs
+++ b/scenes/ui/pause/PausePopup.cs
@@ -9,6 +9,13 @@ public partial class PausePopup : Control
 	[Export] private Button _quitButton;
 	[Export] private Button _completeButton;
 
+	private GameController _gameController;
+
+	public void Setup(GameController gameController)
+	{
+		_gameController = gameController;
+	}
+
 	public override void _Ready()
 	{
 		_resumeButton.Pressed += OnResumePressed;
@@ -19,6 +26,7 @@ public override void _Ready()
 
 	private void OnResumePressed()
 	{
+		_gameController.ResumeGameTimer();
 		GameUI._isPaused = false;
 		QueueFree();
 	}