Merge pull request #314 from binarypizza/master

Add Steam AugerBot 3000 to the CRE weapons list
tsitu · Jan 19, 2025 · f0483ff · f0483ff
2 parents 0b12978 + d51b4fe
commit f0483ff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -146,7 +146,6 @@ New catch rate formula: <img src="https://render.githubusercontent.com/render/ma
 
 Classic minimum luck formula: <img src="https://render.githubusercontent.com/render/math?math=%5CLarge+%5Cdisplaystyle+ML+%3D+%5Cceil%28%5Cfrac%7B%5Csqrt%7B%5Cfrac%7BM%7D%7B3+-+min%282%2C+E%29%7D%7D%7D%7Bmin%282%2C+E%29%7D%29" alt="ML = \ceil(\frac{\sqrt{\frac{M}{3 - min(2, E)}}}{min(2, E)})"><br><br>
 
-
 New minimum luck formula: <img src="https://render.githubusercontent.com/render/math?math=\huge ML = \ceil({\frac{\ceil({\sqrt{\frac{M}{2}})}}{min(1.4, E)}})"><br><br>
 
 - E = Weapon Type Effectiveness %
@@ -185,7 +184,7 @@ The following special effects _are included in catch rate calculations_ for both
   |            Name            |                                                                                                      Effect                                                                                                      |
   | :------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
   |       Champion Charm       |                                                                       +2/3/4 Luck when equipped with Bronze/Silver/Golden Tournament Base                                                                        |
-  | Dragonbane Charm variants  |                                                                                  +300/600/900/1200% Power Bonus on Dragon-type mice                                                                                   |
+  | Dragonbane Charm variants  |                                                                                +300/600/900/1200% Power Bonus on Dragon-type mice                                                                                |
   |        EMP400 Charm        |                                                                                      +25000 Power with Fusion Fondue armed                                                                                       |
   |  Golem Guardian variants   |                                      &middot; +6 Luck when equipped with Glowing Golem Guardian Base<br>&middot; Charge levels are set in CRE and carry over to Best Setup                                       |
   |    Physical Brace Base     |                                                                              +25% Power Bonus when equipped with a Physical weapon                                                                               |
@@ -203,6 +202,7 @@ The following special effects _are included in catch rate calculations_ for both
   |       Fiery Warpath        |                &middot; Flamebane Charm gives +150 Power<br>&middot; Warden Slayer Trap gives +2500 Power and +2500% Power Bonus when equipped in Wave 4 or Portal<br>&middot; Super Warpath Charms give +50 Power on corresponding groups<br>&middot; TODO: Warpath Thrasher effect is not yet implemented                |
   |          Fort Rox          |                                                                                                                    Nightlight Charm gives +1/3/5/7/9/12/15% Power Bonus depending on the stage of night                                                                                                                    |
   |  Gnawnian Express Station  |                                                                                           Supply Grabber, Bandit Deflector, and Engine Doubler give +1500 Power in Supply Depot, Raider River, and Daredevil Canyon respectively                                                                                           |
+  |          Iceberg           |                                                                                                           &middot; Steam AugerBot 3000 gains an additional +45 luck (for 65 total) in all stages of the Iceberg                                                                                                            |
   | Iceberg & Slushy Shoreline | &middot; Steam Laser Mk. I gives +1750 Power and +3 Luck<br>&middot; Steam Laser Mk. II gives +1250 Power and +2 Luck<br>&middot; Steam Laser Mk. III gives +1500 Power and +2 Luck<br>&middot; Deep Freeze Base and Ultimate Iceberg Base give +665 Power and +9 Luck in Icewing's Lair, Hidden Depths, and The Deep Lair |
   |      Jungle of Dread       |                                                                                                              &middot; Dreaded Totem Trap gives +8500 Power<br>&middot; Dreaded Charm gives +300% Power Bonus                                                                                                               |
   |        Sand Crypts         |                                                                                                               Salt level applies a logarithmic function to decrease mouse power for King Grub & King Scarab                                                                                                                |

diff --git a/data/arrays.js b/data/arrays.js
@@ -780,6 +780,7 @@ var weaponsArray = {
   "Sphynx Wrath": ["Tactical", 6100, 10, 10, 25, "Very Fresh"],
   "Sprinkly Cupcake Surprise Trap": ["Arcane", 3500, 9, 9, 9, "Very Fresh"],
   "Stale Cupcake Golem Trap": ["Forgotten", 6700, 7, 0, 0, "Stale"],
+  "Steam AugerBot 3000": ["Hydro", 7000, 20, 20, 20, "Fresh"],
   "Steam Laser Mk. I": ["Hydro", 4200, 8, 0, 14, "No Effect"],
   "Steam Laser Mk. II": ["Hydro", 4800, 12, 10, 18, "Fresh"],
   "Steam Laser Mk. II (Broken!)": ["Hydro", 0, 0, 0, 0, "Uber Fresh"],

diff --git a/src/bookmarklet/bm-cre.js b/src/bookmarklet/bm-cre.js
@@ -123,6 +123,9 @@
       if (sublocation === "General") {
         return "Generals";
       }
+      if (sublocation === "Hidden Depths") {
+        return "The Hidden Depths";
+      }
       if (
         (sublocation === "Treacherous Tunnels" ||
           sublocation === "Bombing Run" ||

diff --git a/src/main/shared-cre-setup.js b/src/main/shared-cre-setup.js
@@ -376,6 +376,11 @@ function calculateTrapSetup(skipDisp) {
       } else if (weaponName === "Steam Laser Mk. III") {
         specialPower += 1500;
         specialLuck += 2;
+      } else if (
+        weaponName === "Steam AugerBot 3000" &&
+        locationName === "Iceberg"
+      ) {
+        specialLuck += 45;
       }
 
       // Deep Freeze / UIB / IBB bonuses before hunt 250