[RLR-T-11] Fix carnival dagger mini game.

ThePhar · Oct 26, 2023 · 061bcd9 · 061bcd9
1 parent d831cab
commit 061bcd9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/RogueLegacy/GameObjects/Rooms/CarnivalShoot1BonusRoom.cs b/RogueLegacy/GameObjects/Rooms/CarnivalShoot1BonusRoom.cs
@@ -1,9 +1,9 @@
 //  RogueLegacyRandomizer - CarnivalShoot1BonusRoom.cs
-//  Last Modified 2023-10-24 4:10 PM
-//
+//  Last Modified 2023-10-26 3:26 PM
+// 
 //  This project is based on the modified disassembly of Rogue Legacy's engine, with permission to do so by its
 //  original creators. Therefore, the former creators' copyright notice applies to the original disassembly.
-//
+// 
 //  Original Source - © 2011-2018, Cellar Door Games Inc.
 //  Rogue Legacy™ is a trademark or registered trademark of Cellar Door Games Inc. All Rights Reserved.
 
@@ -54,7 +54,22 @@ public CarnivalShoot1BonusRoom()
         _balloonList = new List<ObjContainer>();
     }
 
-    private int ActiveTargets => _targetList.Select(t => !t.Broken).Count();
+    private int ActiveTargets
+    {
+        get
+        {
+            var num = 0;
+            foreach (var current in _targetList)
+            {
+                if (!current.Broken)
+                {
+                    num++;
+                }
+            }
+
+            return num;
+        }
+    }
 
     public override void LoadContent(GraphicsDevice graphics)
     {

diff --git a/RogueLegacy/Screens/GameOverScreen.cs b/RogueLegacy/Screens/GameOverScreen.cs
@@ -1,5 +1,5 @@
 //  RogueLegacyRandomizer - GameOverScreen.cs
-//  Last Modified 2023-10-24 4:17 PM
+//  Last Modified 2023-10-26 2:59 PM
 // 
 //  This project is based on the modified disassembly of Rogue Legacy's engine, with permission to do so by its
 //  original creators. Therefore, the former creators' copyright notice applies to the original disassembly.
@@ -406,6 +406,7 @@ public override void HandleInput()
                     Game.ScreenManager.Player.CurrentHealth = Game.PlayerStats.CurrentHealth;
                     Game.ScreenManager.Player.CurrentMana = Game.PlayerStats.CurrentMana;
                     Game.PlayerStats.FountainPieces = pieces;
+                    Game.PlayerStats.ReadStartingDiary = false;
 
                     (ScreenManager as RCScreenManager).DisplayScreen((int) ScreenType.Lineage, true);
                     _lockControls = true;