Merge pull request #283 from hymccord/gemology-base

Utilize gemology stages in FC
tsitu · Jan 28, 2024 · d72e852 · d72e852
2 parents 2d5b947 + cc51429
commit d72e852
Show file tree

Hide file tree

Showing 4 changed files with 174 additions and 66 deletions.
diff --git a/data/pop-csv/fungal-cavern.csv b/data/pop-csv/fungal-cavern.csv
@@ -1,60 +1,80 @@
 "Location","Phase","Cheese","Charm","Attraction Rate","Mouse","Sample Size"
-"Fungal Cavern","-","SB+","-","14.56%","Funglore",27726
-"Fungal Cavern","-","SB+","-","13.91%","Lumahead",27726
-"Fungal Cavern","-","SB+","-","11.98%","Mush",27726
-"Fungal Cavern","-","SB+","-","11.95%","Floating Spore",27726
-"Fungal Cavern","-","SB+","-","11.85%","Quillback",27726
-"Fungal Cavern","-","SB+","-","8.94%","Mushroom Sprite",27726
-"Fungal Cavern","-","SB+","-","8.04%","Nightshade Masquerade",27726
-"Fungal Cavern","-","SB+","-","7.98%","Bitter Root",27726
-"Fungal Cavern","-","SB+","-","6.91%","Spiked Burrower",27726
-"Fungal Cavern","-","SB+","-","1.86%","Sporeticus",27726
-"Fungal Cavern","-","SB+","-","1.05%","Mouldy Mole",27726
-"Fungal Cavern","-","SB+","-","0.97%","Spore Muncher",27726
-"Fungal Cavern","-","Gouda","-","14.86%","Funglore",89573
-"Fungal Cavern","-","Gouda","-","14.77%","Mush",89573
-"Fungal Cavern","-","Gouda","-","13.89%","Floating Spore",89573
-"Fungal Cavern","-","Gouda","-","13.73%","Lumahead",89573
-"Fungal Cavern","-","Gouda","-","11.94%","Quillback",89573
-"Fungal Cavern","-","Gouda","-","9.96%","Mushroom Sprite",89573
-"Fungal Cavern","-","Gouda","-","8.07%","Bitter Root",89573
-"Fungal Cavern","-","Gouda","-","6.87%","Spiked Burrower",89573
-"Fungal Cavern","-","Gouda","-","2.01%","Sporeticus",89573
-"Fungal Cavern","-","Gouda","-","1.96%","Mouldy Mole",89573
-"Fungal Cavern","-","Gouda","-","1.95%","Spore Muncher",89573
-"Fungal Cavern","-","Brie","-","14.25%","Mush",9531
-"Fungal Cavern","-","Brie","-","12.81%","Quillback",9531
-"Fungal Cavern","-","Brie","-","12.44%","Lumahead",9531
-"Fungal Cavern","-","Brie","-","10.06%","Floating Spore",9531
-"Fungal Cavern","-","Brie","-","10.01%","Funglore",9531
-"Fungal Cavern","-","Brie","-","8.71%","Mushroom Sprite",9531
-"Fungal Cavern","-","Brie","-","8.45%","Bitter Root",9531
-"Fungal Cavern","-","Brie","-","7.10%","Spiked Burrower",9531
-"Fungal Cavern","-","Brie","-","5.98%","Sporeticus",9531
-"Fungal Cavern","-","Brie","-","5.29%","Mouldy Mole",9531
-"Fungal Cavern","-","Brie","-","4.90%","Spore Muncher",9531
-"Fungal Cavern","-","Glowing Gruyere","-","19.74%","Crag Elder",77141
-"Fungal Cavern","-","Glowing Gruyere","-","19.28%","Stone Maiden",77141
-"Fungal Cavern","-","Glowing Gruyere","-","18.09%","Crystalline Slasher",77141
-"Fungal Cavern","-","Glowing Gruyere","-","18.08%","Dirt Thing",77141
-"Fungal Cavern","-","Glowing Gruyere","-","12.46%","Cavern Crumbler",77141
-"Fungal Cavern","-","Glowing Gruyere","-","6.13%","Shattered Obsidian",77141
-"Fungal Cavern","-","Glowing Gruyere","-","4.20%","Splintered Stone Sentry",77141
-"Fungal Cavern","-","Glowing Gruyere","-","2.03%","Gemstone Worshipper",77141
-"Fungal Cavern","-","Mineral","-","26.62%","Gemorpher",41882
-"Fungal Cavern","-","Mineral","-","25.29%","Crystal Controller",41882
-"Fungal Cavern","-","Mineral","-","23.73%","Crystalback",41882
-"Fungal Cavern","-","Mineral","-","15.08%","Stalagmite",41882
-"Fungal Cavern","-","Mineral","-","6.17%","Crystal Cave Worm",41882
-"Fungal Cavern","-","Mineral","-","1.07%","Crystal Observer",41882
-"Fungal Cavern","-","Mineral","-","1.02%","Crystal Lurker",41882
-"Fungal Cavern","-","Mineral","-","1.02%","Crystal Queen",41882
-"Fungal Cavern","-","Gemstone","-","36.63%","Crystal Queen",34680
-"Fungal Cavern","-","Gemstone","-","28.85%","Crystal Lurker",34680
-"Fungal Cavern","-","Gemstone","-","24.19%","Crystal Observer",34680
-"Fungal Cavern","-","Gemstone","-","8.33%","Crystal Golem",34680
-"Fungal Cavern","-","Gemstone","-","1.03%","Diamondhide",34680
-"Fungal Cavern","-","Gemstone","-","0.96%","Huntereater",34680
-"Fungal Cavern","-","Diamond","-","66.91%","Crystal Behemoth",12887
-"Fungal Cavern","-","Diamond","-","25.04%","Huntereater",12887
-"Fungal Cavern","-","Diamond","-","8.05%","Diamondhide",12887
+"Fungal Cavern","-","SB+","-","14.56%","Funglore",29962
+"Fungal Cavern","-","SB+","-","13.96%","Lumahead",29962
+"Fungal Cavern","-","SB+","-","12.01%","Mush",29962
+"Fungal Cavern","-","SB+","-","11.91%","Floating Spore",29962
+"Fungal Cavern","-","SB+","-","11.85%","Quillback",29962
+"Fungal Cavern","-","SB+","-","9.00%","Mushroom Sprite",29962
+"Fungal Cavern","-","SB+","-","8.03%","Nightshade Masquerade",29962
+"Fungal Cavern","-","SB+","-","7.93%","Bitter Root",29962
+"Fungal Cavern","-","SB+","-","6.85%","Spiked Burrower",29962
+"Fungal Cavern","-","SB+","-","1.89%","Sporeticus",29962
+"Fungal Cavern","-","SB+","-","1.04%","Mouldy Mole",29962
+"Fungal Cavern","-","SB+","-","0.97%","Spore Muncher",29962
+"Fungal Cavern","-","Gouda","-","14.83%","Funglore",103756
+"Fungal Cavern","-","Gouda","-","14.75%","Mush",103756
+"Fungal Cavern","-","Gouda","-","13.81%","Floating Spore",103756
+"Fungal Cavern","-","Gouda","-","13.77%","Lumahead",103756
+"Fungal Cavern","-","Gouda","-","11.93%","Quillback",103756
+"Fungal Cavern","-","Gouda","-","9.99%","Mushroom Sprite",103756
+"Fungal Cavern","-","Gouda","-","8.06%","Bitter Root",103756
+"Fungal Cavern","-","Gouda","-","6.93%","Spiked Burrower",103756
+"Fungal Cavern","-","Gouda","-","2.02%","Sporeticus",103756
+"Fungal Cavern","-","Gouda","-","1.96%","Mouldy Mole",103756
+"Fungal Cavern","-","Gouda","-","1.95%","Spore Muncher",103756
+"Fungal Cavern","-","Brie","-","14.34%","Mush",10646
+"Fungal Cavern","-","Brie","-","12.72%","Quillback",10646
+"Fungal Cavern","-","Brie","-","12.34%","Lumahead",10646
+"Fungal Cavern","-","Brie","-","10.16%","Floating Spore",10646
+"Fungal Cavern","-","Brie","-","9.97%","Funglore",10646
+"Fungal Cavern","-","Brie","-","8.70%","Mushroom Sprite",10646
+"Fungal Cavern","-","Brie","-","8.50%","Bitter Root",10646
+"Fungal Cavern","-","Brie","-","7.08%","Spiked Burrower",10646
+"Fungal Cavern","-","Brie","-","5.94%","Sporeticus",10646
+"Fungal Cavern","-","Brie","-","5.34%","Mouldy Mole",10646
+"Fungal Cavern","-","Brie","-","4.90%","Spore Muncher",10646
+"Fungal Cavern","Gemology Base","Glowing Gruyere","-","26.43%","Crystalline Slasher",488
+"Fungal Cavern","Gemology Base","Glowing Gruyere","-","21.72%","Dirt Thing",488
+"Fungal Cavern","Gemology Base","Glowing Gruyere","-","15.98%","Crag Elder",488
+"Fungal Cavern","Gemology Base","Glowing Gruyere","-","12.70%","Stone Maiden",488
+"Fungal Cavern","Gemology Base","Glowing Gruyere","-","9.63%","Splintered Stone Sentry",488
+"Fungal Cavern","Gemology Base","Glowing Gruyere","-","9.22%","Shattered Obsidian",488
+"Fungal Cavern","Gemology Base","Glowing Gruyere","-","4.30%","Gemstone Worshipper",488
+"Fungal Cavern","Not Gemology","Glowing Gruyere","-","20.47%","Crag Elder",2228
+"Fungal Cavern","Not Gemology","Glowing Gruyere","-","19.43%","Stone Maiden",2228
+"Fungal Cavern","Not Gemology","Glowing Gruyere","-","18.72%","Dirt Thing",2228
+"Fungal Cavern","Not Gemology","Glowing Gruyere","-","17.15%","Crystalline Slasher",2228
+"Fungal Cavern","Not Gemology","Glowing Gruyere","-","11.58%","Cavern Crumbler",2228
+"Fungal Cavern","Not Gemology","Glowing Gruyere","-","6.06%","Shattered Obsidian",2228
+"Fungal Cavern","Not Gemology","Glowing Gruyere","-","4.35%","Splintered Stone Sentry",2228
+"Fungal Cavern","Not Gemology","Glowing Gruyere","-","2.24%","Gemstone Worshipper",2228
+"Fungal Cavern","Gemology Base","Mineral","-","34.57%","Crystal Controller",162
+"Fungal Cavern","Gemology Base","Mineral","-","22.84%","Crystalback",162
+"Fungal Cavern","Gemology Base","Mineral","-","22.22%","Stalagmite",162
+"Fungal Cavern","Gemology Base","Mineral","-","12.35%","Crystal Cave Worm",162
+"Fungal Cavern","Gemology Base","Mineral","-","3.09%","Crystal Observer",162
+"Fungal Cavern","Gemology Base","Mineral","-","2.47%","Crystal Queen",162
+"Fungal Cavern","Gemology Base","Mineral","-","2.47%","Crystal Lurker",162
+"Fungal Cavern","Not Gemology","Mineral","-","26.71%","Gemorpher",1550
+"Fungal Cavern","Not Gemology","Mineral","-","25.94%","Crystal Controller",1550
+"Fungal Cavern","Not Gemology","Mineral","-","24.00%","Crystalback",1550
+"Fungal Cavern","Not Gemology","Mineral","-","14.13%","Stalagmite",1550
+"Fungal Cavern","Not Gemology","Mineral","-","6.39%","Crystal Cave Worm",1550
+"Fungal Cavern","Not Gemology","Mineral","-","0.97%","Crystal Queen",1550
+"Fungal Cavern","Not Gemology","Mineral","-","0.97%","Crystal Lurker",1550
+"Fungal Cavern","Not Gemology","Mineral","-","0.90%","Crystal Observer",1550
+"Fungal Cavern","Gemology Base","Gemstone","-","32.04%","Crystal Queen",206
+"Fungal Cavern","Gemology Base","Gemstone","-","27.67%","Crystal Golem",206
+"Fungal Cavern","Gemology Base","Gemstone","-","19.42%","Crystal Lurker",206
+"Fungal Cavern","Gemology Base","Gemstone","-","14.56%","Crystal Observer",206
+"Fungal Cavern","Gemology Base","Gemstone","-","3.40%","Huntereater",206
+"Fungal Cavern","Gemology Base","Gemstone","-","2.91%","Diamondhide",206
+"Fungal Cavern","Not Gemology","Gemstone","-","37.70%","Crystal Queen",1106
+"Fungal Cavern","Not Gemology","Gemstone","-","29.48%","Crystal Lurker",1106
+"Fungal Cavern","Not Gemology","Gemstone","-","23.78%","Crystal Observer",1106
+"Fungal Cavern","Not Gemology","Gemstone","-","7.32%","Crystal Golem",1106
+"Fungal Cavern","Not Gemology","Gemstone","-","0.90%","Diamondhide",1106
+"Fungal Cavern","Not Gemology","Gemstone","-","0.81%","Huntereater",1106
+"Fungal Cavern","Not Gemology","Diamond","-","67.47%","Crystal Behemoth",1537
+"Fungal Cavern","Not Gemology","Diamond","-","24.66%","Huntereater",1537
+"Fungal Cavern","Not Gemology","Diamond","-","7.87%","Diamondhide",1537
diff --git a/data/pop-js/fungal-cavern.js b/data/pop-js/fungal-cavern.js
@@ -1,25 +1,109 @@
 const utils = require("../_utils");
 
 module.exports = {
+  default: {
+    location: utils.genVarField("location", "Fungal Cavern"),
+  },
   series: [
     {
       cheese: utils.genVarField("cheese", [
         "SB+",
         "Gouda",
         "Brie",
-        "Glowing Gruyere",
-        "Mineral",
-        "Gemstone",
-        "Diamond"
       ]),
-      location: utils.genVarField("location", "Fungal Cavern"),
       config: [
         {
           opts: {
-            exclude: ["Lucky"]
+            include: [
+              "Bitter Root",
+              "Floating Spore",
+              "Funglore",
+              "Lumahead",
+              "Mouldy Mole",
+              "Mush",
+              "Mushroom Sprite",
+              "Nightshade Masquerade",
+              "Quillback",
+              "Spiked Burrower",
+              "Spore Muncher",
+              "Sporeticus"
+            ]
           }
         }
       ]
-    }
+    },
+    {
+      cheese: utils.genVarField("cheese", "Glowing Gruyere"),
+      stage: utils.genVarField("stage", ["Gemology Base", "Not Gemology"]),
+      config: [
+        {
+          opts: {
+            include: [
+              "Cavern Crumbler",
+              "Crag Elder",
+              "Crystalline Slasher",
+              "Dirt Thing",
+              "Gemstone Worshipper",
+              "Shattered Obsidian",
+              "Splintered Stone Sentry",
+              "Stone Maiden"
+            ]
+          }
+        }
+      ]
+    },
+    {
+      cheese: utils.genVarField("cheese", "Mineral"),
+      stage: utils.genVarField("stage", ["Gemology Base", "Not Gemology"]),
+      config: [
+        {
+          opts: {
+            include: [
+              "Crystal Cave Worm",
+              "Crystal Controller",
+              "Crystal Lurker",
+              "Crystal Observer",
+              "Crystal Queen",
+              "Crystalback",
+              "Gemorpher",
+              "Stalagmite"
+            ]
+          }
+        }
+      ]
+    },
+    {
+      cheese: utils.genVarField("cheese", "Gemstone"),
+      stage: utils.genVarField("stage", ["Gemology Base", "Not Gemology"]),
+      config: [
+        {
+          opts: {
+            include: [
+              "Crystal Lurker",
+              "Crystal Observer",
+              "Crystal Queen",
+              "Crystal Golem",
+              "Diamondhide",
+              "Huntereater"
+            ]
+          }
+        }
+      ]
+    },
+    {
+      cheese: utils.genVarField("cheese", "Diamond"),
+      stage: utils.genVarField("stage", ["Gemology Base", "Not Gemology"]),
+      config: [
+        {
+          opts: {
+            include: [
+              "Diamondhide",
+              "Huntereater",
+              "Crystal Behemoth"
+            ]
+          }
+        }
+      ]
+    },
   ]
 };
diff --git a/src/bookmarklet/bm-cre.js b/src/bookmarklet/bm-cre.js
@@ -265,6 +265,8 @@
       state = state.replace(/high/g, "Medium");
       state = state.replace(/boss/g, "High");
       return state;
+    } else if (userLocation === "Fungal Cavern") {
+      return userBase === "Gemology Base" ? "Gemology Base" : "Not Gemology";
     } else if (userLocation === "Zokor") {
       var quest = userQuests["QuestAncientCity"];
 

diff --git a/src/bookmarklet/bm-setup-fields.js b/src/bookmarklet/bm-setup-fields.js
@@ -254,6 +254,8 @@
       state = state.replace(/high/g, "Medium");
       state = state.replace(/boss/g, "High");
       return state;
+    } else if (userLocation === "Fungal Cavern") {
+      return userBase === "Gemology Base" ? "Gemology Base" : "Not Gemology";
     } else if (userLocation === "Zokor") {
       var quest = userQuests["QuestAncientCity"];