Minor functionality and logic fixes.

nerthul11 · Aug 22, 2024 · 61d359a · 61d359a
1 parent a3bf0ae
commit 61d359a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/CombatRandomizer.cs b/CombatRandomizer.cs
@@ -9,7 +9,7 @@ namespace CombatRandomizer
     public class CombatRandomizer : Mod, IGlobalSettings<CombatSettings> 
     {
         new public string GetName() => "CombatRandomizer";
-        public override string GetVersion() => "1.0.1.2";
+        public override string GetVersion() => "1.0.1.3";
 
         private static CombatRandomizer _instance;
         public CombatRandomizer() : base()

diff --git a/CombatRandomizer.csproj b/CombatRandomizer.csproj
@@ -8,8 +8,8 @@
     <Product>CombatRandomizer</Product>
     <Description>A Randomizer add-on for a cursed combat experience.</Description>
     <Copyright>Copyright © </Copyright>
-    <AssemblyVersion>1.0.1.2</AssemblyVersion>
-    <FileVersion>1.0.1.2</FileVersion>
+    <AssemblyVersion>1.0.1.3</AssemblyVersion>
+    <FileVersion>1.0.1.3</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

diff --git a/Manager/LogicHandler.cs b/Manager/LogicHandler.cs
@@ -34,10 +34,10 @@ private static void ApplyLogic(GenerationSettings gs, LogicManagerBuilder lmb)
             lmb.AddItem(new StringItemTemplate("Notch_Fragment", "NOTCHES++"));
 
             // Modify combat macros
-            lmb.DoMacroEdit(new("ALLBALDURS", "((FIREBALL | QUAKE) + (SOULGAIN>10 | SOULPLUG>4)) | GLOWINGWOMB + (SOULGAIN>10 | SOULPLUG>4) | (WEAVERSONG | SPORESHROOM + FOCUS + (SOULGAIN>10 | SOULPLUG>4)) + OBSCURESKIPS | CYCLONE + DIFFICULTSKIPS"));
-            lmb.DoMacroEdit(new("AERIALMINIBOSS", "ORIG + (NAILDAMAGE>4 + SOULGAIN>8 + SOULPLUG>3 | NAILDAMAGE>4 + SOULGAIN>6 + SOULPLUG>1 + MILDCOMBATSKIPS | SPICYCOMBATSKIPS)"));
-            lmb.DoMacroEdit(new("BOSS", "ORIG + (NAILDAMAGE>4 + SOULGAIN>8 + SOULPLUG>3 | NAILDAMAGE>4 + SOULGAIN>6 + SOULPLUG>1 + MILDCOMBATSKIPS | SPICYCOMBATSKIPS)"));
-            lmb.DoMacroEdit(new("BOSSFLUKE", "ORIG + (SOULGAIN>8 + SOULPLUG>3 | NAILDAMAGE>4 + SOULGAIN>6 + SOULPLUG>1 + MILDCOMBATSKIPS | SPICYCOMBATSKIPS) | NAILDAMAGE>12 + MILDCOMBATSKIPS | NAILDAMAGE>8 + SPICYCOMBATSKIPS"));
+            lmb.DoMacroEdit(new("ALLBALDURS", "((FIREBALL | QUAKE) + (SOULGAIN>7 | SOULPLUG>3)) | GLOWINGWOMB + (SOULGAIN>7 | SOULPLUG>3) | (WEAVERSONG | SPORESHROOM + FOCUS + (SOULGAIN>7 | SOULPLUG>3)) + OBSCURESKIPS | CYCLONE + DIFFICULTSKIPS"));
+            lmb.DoMacroEdit(new("AERIALMINIBOSS", "ORIG + (NAILDAMAGE>4 + SOULGAIN>7 + SOULPLUG>3 | NAILDAMAGE>4 + SOULGAIN>5 + SOULPLUG>1 + MILDCOMBATSKIPS | SPICYCOMBATSKIPS)"));
+            lmb.DoMacroEdit(new("BOSS", "ORIG + (NAILDAMAGE>4 + SOULGAIN>7 + SOULPLUG>3 | NAILDAMAGE>4 + SOULGAIN>5 + SOULPLUG>1 + MILDCOMBATSKIPS | SPICYCOMBATSKIPS)"));
+            lmb.DoMacroEdit(new("BOSSFLUKE", "ORIG + (SOULGAIN>7 + SOULPLUG>3 | NAILDAMAGE>4 + SOULGAIN>5 + SOULPLUG>1 + MILDCOMBATSKIPS | SPICYCOMBATSKIPS) | NAILDAMAGE>12 + MILDCOMBATSKIPS | NAILDAMAGE>8 + SPICYCOMBATSKIPS"));
             lmb.DoMacroEdit(new("MINIBOSS", "ORIG + (NAILDAMAGE>4 + SOULGAIN>6 + SOULPLUG>1 | NAILDAMAGE>4 + SOULPLUG + MILDCOMBATSKIPS | SPICYCOMBATSKIPS)"));
         }
 

diff --git a/Modules/CombatModule.cs b/Modules/CombatModule.cs
@@ -77,8 +77,11 @@ private void SoulDrain()
                 if (Settings.SoulPlugs == Difficulty.Extreme)
                     amount = 7;
                 amount -= SoulPlugItems;
-                PlayerData.instance.TakeMP(Math.Max(0, amount));
-                GameCameras.instance.soulOrbFSM.SendEvent("MP DRAIN");
+                if (amount > 0)
+                {
+                    PlayerData.instance.TakeMP(amount);
+                    GameCameras.instance.soulOrbFSM.SendEvent("MP DRAIN");
+                }
                 Frames = 0;
             }
         }
@@ -140,20 +143,20 @@ public void SetNailDamage()
                 SplitClaw splitClaw = ItemChangerMod.Modules.Get<SplitClaw>();
                 if (splitClaw != null)
                 {
-                    anyClaw = splitClaw.hasWalljumpAny;
-                    hasClaw = splitClaw.hasWalljumpBoth;
+                    anyClaw = splitClaw.hasWalljumpLeft || splitClaw.hasWalljumpRight;
+                    hasClaw = splitClaw.hasWalljumpLeft & splitClaw.hasWalljumpRight;
                 }
 
                 // If no Wings or Claw, then max one vanilla upgrade
-                if (!hasWings || !anyClaw || !hasClaw)
+                if (!hasWings & !anyClaw & !hasClaw)
                     damage = Math.Min(damage, 9);
 
                 // If no Wings and Split Claw, allow two upgrades
                 if (anyClaw & !hasWings & !hasClaw)
                     damage = Math.Min(damage, 13);
 
                 // If Wings but no Claw, allow three upgrades
-                if (hasWings & !hasClaw & !hasClaw)
+                if (hasWings & !anyClaw & !hasClaw)
                     damage = Math.Min(damage, 17);
 
                 // If Claw or Wings + Split Claw, do nothing