Merge pull request #13 from Jonyboylovespie/master

Fixes for 39.1
mend-dev · Oct 17, 2023 · 9f32766 · 9f32766
2 parents 7a71944 + 0e8b3d7
commit 9f32766
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/Bosses/Bloonarius/BloonariusConfig.cs b/Bosses/Bloonarius/BloonariusConfig.cs
@@ -74,8 +74,8 @@ public static class BloonariusConfig {
     public static void ApplyBloonariusSettings(BloonModel bloonModel, string difficulty, int level) {
         float multiplier = difficultyMultipliers[difficulty];
 
-        bloonModel.maxHealth = baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier;
-        if (level == 0) { bloonModel.maxHealth = baseMaxHealth * multiplier; }
+        bloonModel.maxHealth = (int)(baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier);
+        if (level == 0) { bloonModel.maxHealth = (int)(baseMaxHealth * multiplier); }
 
         bloonModel.leakDamage = 99999f;
         bloonModel.speed = (baseSpeed + levelSpeedAddition * level) * multiplier;

diff --git a/Bosses/Dreadbloon/DreadRockConfig.cs b/Bosses/Dreadbloon/DreadRockConfig.cs
@@ -27,8 +27,8 @@ public static class DreadRockConfig {
     public static void ApplyDreadRockSettings(BloonModel bloonModel, string difficulty, int level) {
         float multiplier = difficultyMultipliers[difficulty];
 
-        bloonModel.maxHealth = baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier;
-        if (level == 0) { bloonModel.maxHealth = baseMaxHealth * multiplier; }
+        bloonModel.maxHealth = (int)(baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier);
+        if (level == 0) { bloonModel.maxHealth = (int)(baseMaxHealth * multiplier); }
 
         bloonModel.leakDamage = (baseLeakDamage + levelLeakDamageAddition * level) * multiplier; ;
         bloonModel.speed = (baseSpeed + levelSpeedAddition * level) * multiplier;

diff --git a/Bosses/Dreadbloon/DreadbloonConfig.cs b/Bosses/Dreadbloon/DreadbloonConfig.cs
@@ -44,8 +44,8 @@ public static class DreadbloonConfig {
     public static void ApplyDreadbloonSettings(BloonModel bloonModel, string difficulty, int level) {
         float multiplier = difficultyMultipliers[difficulty];
 
-        bloonModel.maxHealth = baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier;
-        if (level == 0) { bloonModel.maxHealth = baseMaxHealth * multiplier; }
+        bloonModel.maxHealth = (int)(baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier);
+        if (level == 0) { bloonModel.maxHealth = (int)(baseMaxHealth * multiplier); }
 
         bloonModel.leakDamage = 99999f;
         bloonModel.speed = (baseSpeed + levelSpeedAddition * level) * multiplier;

diff --git a/Bosses/Lych/LychConfig.cs b/Bosses/Lych/LychConfig.cs
@@ -63,8 +63,8 @@ public static class LychConfig {
     public static void ApplyLychSettings(BloonModel bloonModel, string difficulty, int level) {
         float multiplier = difficultyMultipliers[difficulty];
 
-        bloonModel.maxHealth = baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier;
-        if (level == 0) { bloonModel.maxHealth = baseMaxHealth * multiplier; }
+        bloonModel.maxHealth = (int)(baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier);
+        if (level == 0) { bloonModel.maxHealth = (int)(baseMaxHealth * multiplier); }
 
         bloonModel.leakDamage = 99999f;
         bloonModel.speed = (baseSpeed + levelSpeedAddition * level) * multiplier;

diff --git a/Bosses/Lych/MiniLychConfig.cs b/Bosses/Lych/MiniLychConfig.cs
@@ -35,8 +35,8 @@ public static class MiniLychConfig {
     public static void ApplyMiniLychSettings(BloonModel bloonModel, string difficulty, int level) {
         float multiplier = difficultyMultipliers[difficulty];
 
-        bloonModel.maxHealth = baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier;
-        if (level == 0) { bloonModel.maxHealth = baseMaxHealth * multiplier; }
+        bloonModel.maxHealth = (int)(baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier);
+        if (level == 0) { bloonModel.maxHealth = (int)(baseMaxHealth * multiplier); }
 
         bloonModel.leakDamage = 99999f;
         bloonModel.speed = (baseSpeed + levelSpeedAddition * level) * multiplier;

diff --git a/Bosses/Phayze/PhayzeConfig.cs b/Bosses/Phayze/PhayzeConfig.cs
@@ -37,8 +37,8 @@ public static class PhayzeConfig {
     public static void ApplyPhayzeSettings(BloonModel bloonModel, string difficulty, int level) {
         float multiplier = difficultyMultipliers[difficulty];
 
-        bloonModel.maxHealth = baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier;
-        if (level == 0) { bloonModel.maxHealth = baseMaxHealth * multiplier; }
+        bloonModel.maxHealth = (int)(baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier);
+        if (level == 0) { bloonModel.maxHealth = (int)(baseMaxHealth * multiplier); }
 
         bloonModel.leakDamage = 99999f;
         bloonModel.speed = (baseSpeed + levelSpeedAddition * level) * multiplier;

diff --git a/Bosses/Vortex/VortexConfig.cs b/Bosses/Vortex/VortexConfig.cs
@@ -59,8 +59,8 @@ public static class VortexConfig {
     public static void ApplyVortexSettings(BloonModel bloonModel, string difficulty, int level) {
         float multiplier = difficultyMultipliers[difficulty];
 
-        bloonModel.maxHealth = baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier;
-        if (level == 0) { bloonModel.maxHealth = baseMaxHealth * multiplier; }
+        bloonModel.maxHealth = (int)(baseMaxHealth * (levelMaxHealthMultiplier * level) * multiplier);
+        if (level == 0) { bloonModel.maxHealth = (int)(baseMaxHealth * multiplier); }
 
         bloonModel.leakDamage = 99999f;
         bloonModel.speed = (baseSpeed + levelSpeedAddition * level) * multiplier;

diff --git a/Gamemodes/Roguemode.cs b/Gamemodes/Roguemode.cs
@@ -42,7 +42,7 @@ public void SetLivesEnabled(bool enabled) {
 
     public void ChangeCostModifier(float modifier) {
         if (!baseGameModeModel.HasMutator<GlobalCostModModel>()) {
-            baseGameModeModel.AddMutator(new GlobalCostModModel("costMultiplier", 1f, false));
+            baseGameModeModel.AddMutator(new GlobalCostModModel("costMultiplier", 1f));
         }
         baseGameModeModel.GetMutator<GlobalCostModModel>().multiplier = modifier;
     }

diff --git a/ModHelperData.cs b/ModHelperData.cs
@@ -1,8 +1,8 @@
 namespace BTD6Rogue;
 
 public static class ModHelperData {
-    public const string WorksOnVersion = "38.3";
-    public const string Version = "2.0.1";
+    public const string WorksOnVersion = "39.1";
+    public const string Version = "2.0.2";
     public const string Name = "BTD6Rogue";
     public const string Description =
         "BTD6 Rogue! The mod that turns bloons into a Roguelike, or BTD7 apparently\n" +