Reduced Failed Champ Damage

ToboterXP · Aug 22, 2022 · 7e8ac99 · 7e8ac99
1 parent fe18f6f
commit 7e8ac99
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/HKSecondQuest.cs b/HKSecondQuest.cs
@@ -286,10 +286,19 @@ public void OnGameStart(On.HeroController.orig_Start orig, global::HeroControlle
         /// </summary>
         public void OnDamage(On.HeroController.orig_TakeDamage orig, global::HeroController self, GameObject go, CollisionSide damageSide, int damageAmount, int hazardType)
         {
-            if (Enabled && ActiveRoom != null && damageAmount < ActiveRoom.MinDamage && damageAmount > 0)
+            if (Enabled && ActiveRoom != null)
             {
-                damageAmount = ActiveRoom.MinDamage;
-            }
+                if (damageAmount < ActiveRoom.MinDamage && damageAmount > 0)
+                {
+                    damageAmount = ActiveRoom.MinDamage;
+                }
+
+                if (damageAmount > ActiveRoom.MaxDamage)
+                {
+                    damageAmount = ActiveRoom.MaxDamage;
+                }
+            } 
+
             orig(self, go, damageSide, damageAmount, hazardType);
         }
 

diff --git a/Room.cs b/Room.cs
@@ -30,6 +30,8 @@ public abstract class Room
         /// </summary>
         public int MinDamage = 0;
 
+        public int MaxDamage = 100;
+
         public int Revision = 1; //World init gets called if save from older Revision is loaded
 
 

diff --git a/Rooms/City/FailedChamp.cs b/Rooms/City/FailedChamp.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HKSecondQuest.Rooms.City
+{
+    internal class FailedChamp : Room
+    {
+        public FailedChamp() : base("Dream_01_False_Knight") { MaxDamage = 1; }
+    }
+}