From d4be011784d6a938208b8721a4da13434544a36e Mon Sep 17 00:00:00 2001 From: Hank McCord Date: Tue, 19 Sep 2023 12:04:55 -0400 Subject: [PATCH 1/5] Add Town of Gnawnia pop script --- build/process-population.js | 1 + data/pop-csv/town-of-gnawnia.csv | 71 ++++++++++++++++ data/pop-js/town-of-gnawnia.js | 138 +++++++++++++++++++++++++++++++ data/populations.csv | 112 ------------------------- package.json | 1 + 5 files changed, 211 insertions(+), 112 deletions(-) create mode 100644 data/pop-csv/town-of-gnawnia.csv create mode 100644 data/pop-js/town-of-gnawnia.js diff --git a/build/process-population.js b/build/process-population.js index 7a1367cf..6d322103 100644 --- a/build/process-population.js +++ b/build/process-population.js @@ -34,6 +34,7 @@ "data/pop-csv/ronza.csv", "data/pop-csv/table-of-contents.csv", "data/pop-csv/town-of-digby.csv", + "data/pop-csv/town-of-gnawnia.csv", "data/pop-csv/toxic-spill.csv", "data/pop-csv/valour-rift.csv" ]; diff --git a/data/pop-csv/town-of-gnawnia.csv b/data/pop-csv/town-of-gnawnia.csv new file mode 100644 index 00000000..cbbc74a7 --- /dev/null +++ b/data/pop-csv/town-of-gnawnia.csv @@ -0,0 +1,71 @@ +"Location","Phase","Cheese","Charm","Attraction Rate","Mouse","Sample Size" +"Town of Gnawnia","-","Cheddar","-","36.62%","Cowardly",4669 +"Town of Gnawnia","-","Cheddar","-","18.85%","White",4669 +"Town of Gnawnia","-","Cheddar","-","17.73%","Grey",4669 +"Town of Gnawnia","-","Cheddar","-","17.22%","Brown",4669 +"Town of Gnawnia","-","Cheddar","-","9.57%","Dwarf",4669 +"Town of Gnawnia","-","White Cheddar","-","81.77%","Cowardly",1015 +"Town of Gnawnia","-","White Cheddar","-","18.23%","Dwarf",1015 +"Town of Gnawnia","-","Marble","-","25.49%","Cowardly",820 +"Town of Gnawnia","-","Marble","-","15.12%","Longtail",820 +"Town of Gnawnia","-","Marble","-","14.27%","Dwarf",820 +"Town of Gnawnia","-","Marble","-","9.88%","Granite",820 +"Town of Gnawnia","-","Marble","-","8.66%","Brown",820 +"Town of Gnawnia","-","Marble","-","7.80%","White",820 +"Town of Gnawnia","-","Marble","-","6.95%","Grey",820 +"Town of Gnawnia","-","Marble","-","6.59%","Pugilist",820 +"Town of Gnawnia","-","Marble","-","3.17%","Gold",820 +"Town of Gnawnia","-","Marble","-","2.07%","Diamond",820 +"Town of Gnawnia","-","Swiss","-","22.11%","Dwarf",1289 +"Town of Gnawnia","-","Swiss","-","20.33%","Longtail",1289 +"Town of Gnawnia","-","Swiss","-","13.73%","Pugilist",1289 +"Town of Gnawnia","-","Swiss","-","7.68%","Granite",1289 +"Town of Gnawnia","-","Swiss","-","7.68%","Bionic",1289 +"Town of Gnawnia","-","Swiss","-","7.21%","Steel",1289 +"Town of Gnawnia","-","Swiss","-","5.20%","Gold",1289 +"Town of Gnawnia","-","Swiss","-","4.65%","Diamond",1289 +"Town of Gnawnia","-","Swiss","-","4.65%","White",1289 +"Town of Gnawnia","-","Swiss","-","3.41%","Brown",1289 +"Town of Gnawnia","-","Swiss","-","3.34%","Grey",1289 +"Town of Gnawnia","-","Brie","-","25.38%","Pugilist",2652 +"Town of Gnawnia","-","Brie","-","16.52%","Flying",2652 +"Town of Gnawnia","-","Brie","-","15.80%","Speedy",2652 +"Town of Gnawnia","-","Brie","-","9.39%","Longtail",2652 +"Town of Gnawnia","-","Brie","-","7.99%","Gold",2652 +"Town of Gnawnia","-","Brie","-","7.84%","Steel",2652 +"Town of Gnawnia","-","Brie","-","6.83%","Diamond",2652 +"Town of Gnawnia","-","Brie","-","5.47%","Bionic",2652 +"Town of Gnawnia","-","Brie","-","4.79%","Zombie",2652 +"Town of Gnawnia","-","Gouda","-","20.02%","Dwarf",3622 +"Town of Gnawnia","-","Gouda","-","19.85%","Longtail",3622 +"Town of Gnawnia","-","Gouda","-","12.89%","Steel",3622 +"Town of Gnawnia","-","Gouda","-","9.77%","Granite",3622 +"Town of Gnawnia","-","Gouda","-","9.75%","Bionic",3622 +"Town of Gnawnia","-","Gouda","-","7.62%","Diamond",3622 +"Town of Gnawnia","-","Gouda","-","7.56%","Gold",3622 +"Town of Gnawnia","-","Gouda","-","5.19%","White",3622 +"Town of Gnawnia","-","Gouda","-","3.75%","Brown",3622 +"Town of Gnawnia","-","Gouda","-","3.59%","Grey",3622 +"Town of Gnawnia","-","SB+","-","21.33%","Speedy",3146 +"Town of Gnawnia","-","SB+","-","21.17%","Flying",3146 +"Town of Gnawnia","-","SB+","-","11.82%","Nibbler",3146 +"Town of Gnawnia","-","SB+","-","11.57%","Silvertail",3146 +"Town of Gnawnia","-","SB+","-","11.47%","Magic",3146 +"Town of Gnawnia","-","SB+","-","7.69%","Zombie",3146 +"Town of Gnawnia","-","SB+","-","6.39%","Gold",3146 +"Town of Gnawnia","-","SB+","-","4.35%","Master Burglar",3146 +"Town of Gnawnia","-","SB+","-","4.20%","Diamond",3146 +"Town of Gnawnia","-","Gilded","-","26.61%","Master Burglar",1533 +"Town of Gnawnia","-","Gilded","-","13.96%","Cowardly",1533 +"Town of Gnawnia","-","Gilded","-","11.35%","Gold",1533 +"Town of Gnawnia","-","Gilded","-","11.29%","Diamond",1533 +"Town of Gnawnia","-","Gilded","-","10.63%","Dwarf",1533 +"Town of Gnawnia","-","Gilded","-","5.35%","White",1533 +"Town of Gnawnia","-","Gilded","-","5.15%","Brown",1533 +"Town of Gnawnia","-","Gilded","-","4.89%","Grey",1533 +"Town of Gnawnia","-","Gilded","-","2.94%","Pugilist",1533 +"Town of Gnawnia","-","Gilded","-","2.02%","Steel",1533 +"Town of Gnawnia","-","Gilded","-","1.63%","Granite",1533 +"Town of Gnawnia","-","Gilded","-","1.63%","Bionic",1533 +"Town of Gnawnia","-","Gilded","-","1.44%","Longtail",1533 +"Town of Gnawnia","-","Gilded","-","1.11%","Zombie",1533 diff --git a/data/pop-js/town-of-gnawnia.js b/data/pop-js/town-of-gnawnia.js new file mode 100644 index 00000000..d1d5009c --- /dev/null +++ b/data/pop-js/town-of-gnawnia.js @@ -0,0 +1,138 @@ +const utils = require("../_utils"); + +const allCheeses = [ + "Cheddar", + "White Cheddar", + "Marble", + "Mozzarella", + "Swiss", + "Brie", + "Gouda", + "SB+", + "Gilded" +]; + +const mice = { + Cheddar: [ + "Brown", + "Cowardly", + "Dwarf", + "Grey", + "White", + ], + "White Cheddar": [ + "Cowardly", + "Dwarf", + ], + Marble: [ + "Brown", + "Cowardly", + "Diamond", + "Dwarf", + "Gold", + "Granite", + "Grey", + "Longtail", + "Pugilist", + "White", + ], + Swiss: [ + "Bionic", + "Brown", + "Diamond", + "Dwarf", + "Gold", + "Granite", + "Grey", + "Longtail", + "Pugilist", + "Steel", + "White", + ], + "Mozzarella": [ + "Bionic", + "Brown", + "Diamond", + "Dwarf", + "Gold", + "Granite", + "Grey", + "Longtail", + "Pugilist", + "Steel", + "White", + ], + Brie: [ + "Bionic", + "Diamond", + "Flying", + "Gold", + "Longtail", + "Pugilist", + "Speedy", + "Steel", + "Zombie" + ], + Gouda: [ + "Bionic", + "Brown", + "Diamond", + "Dwarf", + "Gold", + "Granite", + "Grey", + "Longtail", + "Steel", + "White", + ], + "SB+": [ + "Diamond", + "Flying", + "Gold", + "Magic", + "Master Burglar", + "Nibbler", + "Silvertail", + "Speedy", + "Zombie" + ], + Gilded: [ + "Bionic", + "Brown", + "Cowardly", + "Diamond", + "Dwarf", + "Gold", + "Granite", + "Grey", + "Longtail", + "Master Burglar", + "Pugilist", + "Steel", + "White", + "Zombie", + ] +} + +function genSeries() { + return allCheeses.map(c => { + return { + cheese: utils.genVarField("cheese", c), + config: [ + { + opts: { + include: mice[c] + } + } + ] + } + }) +} + +module.exports = { + default: { + location: utils.genVarField("location", "Town of Gnawnia"), + after: utils.genVarField("after", 1633446000) // 2021-10-05T15:00:00Z, Gnawnia + Windmill patch + }, + series: genSeries() +}; diff --git a/data/populations.csv b/data/populations.csv index a7801612..a6da7605 100644 --- a/data/populations.csv +++ b/data/populations.csv @@ -2989,118 +2989,6 @@ Town of Digby,-,Swiss/Marble/Mozzarella/Cheddar/White Cheddar,-,6.32%,Gold, Town of Digby,-,Swiss/Marble/Mozzarella/Cheddar/White Cheddar,-,5.76%,Zombie, Town of Digby,-,Swiss/Marble/Mozzarella/Cheddar/White Cheddar,-,1.02%,Bat, Town of Digby,-,Swiss/Marble/Mozzarella/Cheddar/White Cheddar,-,0.35%,Mole, -Town of Gnawnia,-,Gilded,-,27.27%,Master Burglar,10172 -Town of Gnawnia,-,Gilded,-,14.05%,Cowardly, -Town of Gnawnia,-,Gilded,-,11.72%,Diamond, -Town of Gnawnia,-,Gilded,-,11.55%,Dwarf, -Town of Gnawnia,-,Gilded,-,11.02%,Gold, -Town of Gnawnia,-,Gilded,-,4.66%,Grey, -Town of Gnawnia,-,Gilded,-,4.62%,Brown, -Town of Gnawnia,-,Gilded,-,4.26%,White, -Town of Gnawnia,-,Gilded,-,2.77%,Pugilist, -Town of Gnawnia,-,Gilded,-,1.91%,Steel, -Town of Gnawnia,-,Gilded,-,1.85%,Longtail, -Town of Gnawnia,-,Gilded,-,1.85%,Bionic, -Town of Gnawnia,-,Gilded,-,1.74%,Granite, -Town of Gnawnia,-,Gilded,-,0.74%,Zombie, -Town of Gnawnia,-,SB+,-,11.70%,Flying,25444 -Town of Gnawnia,-,SB+,-,9.82%,Cowardly, -Town of Gnawnia,-,SB+,-,9.76%,Speedy, -Town of Gnawnia,-,SB+,-,6.58%,Master Burglar, -Town of Gnawnia,-,SB+,-,6.49%,White, -Town of Gnawnia,-,SB+,-,6.30%,Grey, -Town of Gnawnia,-,SB+,-,6.25%,Brown, -Town of Gnawnia,-,SB+,-,5.69%,Pugilist, -Town of Gnawnia,-,SB+,-,5.17%,Longtail, -Town of Gnawnia,-,SB+,-,4.79%,Nibbler, -Town of Gnawnia,-,SB+,-,4.35%,Magic, -Town of Gnawnia,-,SB+,-,3.93%,Dwarf, -Town of Gnawnia,-,SB+,-,3.81%,Silvertail, -Town of Gnawnia,-,SB+,-,3.60%,Bionic, -Town of Gnawnia,-,SB+,-,3.55%,Steel, -Town of Gnawnia,-,SB+,-,3.55%,Granite, -Town of Gnawnia,-,SB+,-,2.06%,Gold, -Town of Gnawnia,-,SB+,-,1.75%,Diamond, -Town of Gnawnia,-,SB+,-,0.85%,Zombie, -Town of Gnawnia,-,Gouda,-,13.10%,Cowardly,8567 -Town of Gnawnia,-,Gouda,-,11.36%,Dwarf, -Town of Gnawnia,-,Gouda,-,10.07%,Pugilist, -Town of Gnawnia,-,Gouda,-,9.62%,Grey, -Town of Gnawnia,-,Gouda,-,9.30%,Brown, -Town of Gnawnia,-,Gouda,-,8.91%,White, -Town of Gnawnia,-,Gouda,-,5.88%,Flying, -Town of Gnawnia,-,Gouda,-,5.09%,Speedy, -Town of Gnawnia,-,Gouda,-,5.05%,Longtail, -Town of Gnawnia,-,Gouda,-,4.19%,Diamond, -Town of Gnawnia,-,Gouda,-,3.95%,Bionic, -Town of Gnawnia,-,Gouda,-,3.93%,Gold, -Town of Gnawnia,-,Gouda,-,3.92%,Granite, -Town of Gnawnia,-,Gouda,-,3.77%,Steel, -Town of Gnawnia,-,Gouda,-,1.86%,Zombie, -Town of Gnawnia,-,Brie,-,12.65%,Cowardly,27605 -Town of Gnawnia,-,Brie,-,11.70%,Dwarf, -Town of Gnawnia,-,Brie,-,11.58%,Pugilist, -Town of Gnawnia,-,Brie,-,8.68%,White, -Town of Gnawnia,-,Brie,-,8.57%,Grey, -Town of Gnawnia,-,Brie,-,8.53%,Brown, -Town of Gnawnia,-,Brie,-,6.67%,Flying, -Town of Gnawnia,-,Brie,-,5.20%,Speedy, -Town of Gnawnia,-,Brie,-,4.85%,Longtail, -Town of Gnawnia,-,Brie,-,4.09%,Granite, -Town of Gnawnia,-,Brie,-,4.02%,Diamond, -Town of Gnawnia,-,Brie,-,3.95%,Bionic, -Town of Gnawnia,-,Brie,-,3.84%,Gold, -Town of Gnawnia,-,Brie,-,3.80%,Steel, -Town of Gnawnia,-,Brie,-,1.85%,Zombie, -Town of Gnawnia,-,Swiss,-,17.30%,Dwarf,9511 -Town of Gnawnia,-,Swiss,-,12.49%,Cowardly, -Town of Gnawnia,-,Swiss,-,12.12%,Longtail, -Town of Gnawnia,-,Swiss,-,11.02%,Grey, -Town of Gnawnia,-,Swiss,-,10.95%,White, -Town of Gnawnia,-,Swiss,-,10.54%,Brown, -Town of Gnawnia,-,Swiss,-,5.00%,Pugilist, -Town of Gnawnia,-,Swiss,-,3.94%,Granite, -Town of Gnawnia,-,Swiss,-,3.89%,Gold, -Town of Gnawnia,-,Swiss,-,3.84%,Bionic, -Town of Gnawnia,-,Swiss,-,3.57%,Diamond, -Town of Gnawnia,-,Swiss,-,3.51%,Steel, -Town of Gnawnia,-,Swiss,-,1.83%,Zombie, -Town of Gnawnia,-,Marble/Mozzarella,-,22.18%,Cowardly,7073 -Town of Gnawnia,-,Marble/Mozzarella,-,15.07%,Grey, -Town of Gnawnia,-,Marble/Mozzarella,-,14.94%,Brown, -Town of Gnawnia,-,Marble/Mozzarella,-,14.15%,White, -Town of Gnawnia,-,Marble/Mozzarella,-,12.31%,Dwarf, -Town of Gnawnia,-,Marble/Mozzarella,-,6.23%,Pugilist, -Town of Gnawnia,-,Marble/Mozzarella,-,4.98%,Longtail, -Town of Gnawnia,-,Marble/Mozzarella,-,2.05%,Diamond, -Town of Gnawnia,-,Marble/Mozzarella,-,2.05%,Gold, -Town of Gnawnia,-,Marble/Mozzarella,-,1.99%,Granite, -Town of Gnawnia,-,Marble/Mozzarella,-,1.68%,Steel, -Town of Gnawnia,-,Marble/Mozzarella,-,1.46%,Bionic, -Town of Gnawnia,-,Marble/Mozzarella,-,0.89%,Zombie, -Town of Gnawnia,-,Cheddar,-,20.21%,White,1806 -Town of Gnawnia,-,Cheddar,-,18.44%,Brown, -Town of Gnawnia,-,Cheddar,-,17.33%,Grey, -Town of Gnawnia,-,Cheddar,-,15.73%,Cowardly, -Town of Gnawnia,-,Cheddar,-,11.18%,Dwarf, -Town of Gnawnia,-,Cheddar,-,3.60%,Pugilist, -Town of Gnawnia,-,Cheddar,-,2.55%,Bionic, -Town of Gnawnia,-,Cheddar,-,2.49%,Gold, -Town of Gnawnia,-,Cheddar,-,1.99%,Granite, -Town of Gnawnia,-,Cheddar,-,1.88%,Diamond, -Town of Gnawnia,-,Cheddar,-,1.77%,Steel, -Town of Gnawnia,-,Cheddar,-,1.72%,Longtail, -Town of Gnawnia,-,Cheddar,-,1.11%,Zombie, -Town of Gnawnia,-,White Cheddar,-,33.97%,Cowardly,2970 -Town of Gnawnia,-,White Cheddar,-,28.45%,Dwarf, -Town of Gnawnia,-,White Cheddar,-,7.31%,Pugilist, -Town of Gnawnia,-,White Cheddar,-,4.95%,Granite, -Town of Gnawnia,-,White Cheddar,-,4.92%,Longtail, -Town of Gnawnia,-,White Cheddar,-,4.61%,Gold, -Town of Gnawnia,-,White Cheddar,-,4.58%,Steel, -Town of Gnawnia,-,White Cheddar,-,4.48%,Diamond, -Town of Gnawnia,-,White Cheddar,-,4.48%,Bionic, -Town of Gnawnia,-,White Cheddar,-,2.26%,Zombie, Training Grounds,-,SB+,-,30.84%,Archer,24996 Training Grounds,-,SB+,-,12.49%,Kung Fu, Training Grounds,-,SB+,-,12.36%,Monk, diff --git a/package.json b/package.json index 7a9e08a7..0242790d 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "pop:furoma": "node data/pop furoma-rift > data/pop-csv/furoma-rift.csv", "!pop:ges": "node data/pop ges > data/pop-csv/ges.csv", "pop:geyser": "node data/pop queso-geyser > data/pop-csv/queso-geyser.csv", + "pop:gnawnia": "node data/pop town-of-gnawnia > data/pop-csv/town-of-gnawnia.csv", "pop:gwh": "node data/pop great-winter-hunt > data/pop-csv/great-winter-hunt.csv", "pop:harbour": "node data/pop harbour > data/pop-csv/harbour.csv", "pop:jod": "node data/pop jungle-of-dread > data/pop-csv/jungle-of-dread.csv", From 55deb1303ed70f96a2699617c6ba5e643398be17 Mon Sep 17 00:00:00 2001 From: Hank McCord Date: Tue, 19 Sep 2023 12:13:42 -0400 Subject: [PATCH 2/5] Add Windmill pop script --- build/process-population.js | 3 +- data/pop-csv/windmill.csv | 57 +++++++++++++++++ data/pop-js/windmill.js | 121 ++++++++++++++++++++++++++++++++++++ data/populations.csv | 78 ----------------------- package.json | 1 + 5 files changed, 181 insertions(+), 79 deletions(-) create mode 100644 data/pop-csv/windmill.csv create mode 100644 data/pop-js/windmill.js diff --git a/build/process-population.js b/build/process-population.js index 6d322103..ffdd1b46 100644 --- a/build/process-population.js +++ b/build/process-population.js @@ -36,7 +36,8 @@ "data/pop-csv/town-of-digby.csv", "data/pop-csv/town-of-gnawnia.csv", "data/pop-csv/toxic-spill.csv", - "data/pop-csv/valour-rift.csv" + "data/pop-csv/valour-rift.csv", + "data/pop-csv/windmill.csv" ]; const fs = require("fs"); diff --git a/data/pop-csv/windmill.csv b/data/pop-csv/windmill.csv new file mode 100644 index 00000000..d5895aee --- /dev/null +++ b/data/pop-csv/windmill.csv @@ -0,0 +1,57 @@ +"Location","Phase","Cheese","Charm","Attraction Rate","Mouse","Sample Size" +"Windmill","-","Cheddar","-","22.00%","Field",509 +"Windmill","-","Cheddar","-","21.02%","Scruffy",509 +"Windmill","-","Cheddar","-","15.13%","Brown",509 +"Windmill","-","Cheddar","-","14.93%","White",509 +"Windmill","-","Cheddar","-","13.16%","Grey",509 +"Windmill","-","Cheddar","-","10.41%","Dwarf",509 +"Windmill","-","Cheddar","-","3.34%","Spud",509 +"Windmill","-","White Cheddar","-","37.80%","Field",3376 +"Windmill","-","White Cheddar","-","34.30%","Scruffy",3376 +"Windmill","-","White Cheddar","-","19.31%","Dwarf",3376 +"Windmill","-","White Cheddar","-","8.59%","Spud",3376 +"Windmill","-","Marble","-","13.85%","Pugilist",628 +"Windmill","-","Marble","-","12.26%","Longtail",628 +"Windmill","-","Marble","-","10.99%","Dwarf",628 +"Windmill","-","Marble","-","10.35%","Grey",628 +"Windmill","-","Marble","-","10.03%","White",628 +"Windmill","-","Marble","-","9.24%","Scruffy",628 +"Windmill","-","Marble","-","8.76%","Brown",628 +"Windmill","-","Marble","-","8.76%","Field",628 +"Windmill","-","Marble","-","7.48%","Spud",628 +"Windmill","-","Marble","-","3.50%","Diamond",628 +"Windmill","-","Marble","-","3.18%","Gold",628 +"Windmill","-","Marble","-","1.59%","Mole",628 +"Windmill","-","Swiss","-","26.42%","Dwarf",1987 +"Windmill","-","Swiss","-","23.45%","Longtail",1987 +"Windmill","-","Swiss","-","10.72%","Spud",1987 +"Windmill","-","Swiss","-","9.96%","Pugilist",1987 +"Windmill","-","Swiss","-","9.66%","Scruffy",1987 +"Windmill","-","Swiss","-","7.45%","Gold",1987 +"Windmill","-","Swiss","-","6.89%","Diamond",1987 +"Windmill","-","Swiss","-","5.44%","Mole",1987 +"Windmill","-","Brie","-","19.12%","Pugilist",3169 +"Windmill","-","Brie","-","18.14%","Longtail",3169 +"Windmill","-","Brie","-","16.38%","Flying",3169 +"Windmill","-","Brie","-","15.30%","Speedy",3169 +"Windmill","-","Brie","-","10.13%","Spud",3169 +"Windmill","-","Brie","-","8.65%","Gold",3169 +"Windmill","-","Brie","-","7.42%","Diamond",3169 +"Windmill","-","Brie","-","4.86%","Mole",3169 +"Windmill","-","Gouda","-","25.38%","Dwarf",3459 +"Windmill","-","Gouda","-","24.49%","Longtail",3459 +"Windmill","-","Gouda","-","10.84%","Pugilist",3459 +"Windmill","-","Gouda","-","9.92%","Scruffy",3459 +"Windmill","-","Gouda","-","8.85%","Spud",3459 +"Windmill","-","Gouda","-","7.26%","Diamond",3459 +"Windmill","-","Gouda","-","6.94%","Gold",3459 +"Windmill","-","Gouda","-","6.33%","Mole",3459 +"Windmill","-","SB+","-","20.09%","Flying",3330 +"Windmill","-","SB+","-","17.42%","Silvertail",3330 +"Windmill","-","SB+","-","15.50%","Farmhand",3330 +"Windmill","-","SB+","-","11.74%","Tiny",3330 +"Windmill","-","SB+","-","11.14%","Diamond",3330 +"Windmill","-","SB+","-","10.36%","Gold",3330 +"Windmill","-","SB+","-","7.45%","Spud",3330 +"Windmill","-","SB+","-","6.31%","Mole",3330 +"Windmill","-","Grilled Cheese","-","100.00%","Captain Croissant",1910 diff --git a/data/pop-js/windmill.js b/data/pop-js/windmill.js new file mode 100644 index 00000000..7e076398 --- /dev/null +++ b/data/pop-js/windmill.js @@ -0,0 +1,121 @@ +const utils = require("../_utils"); + +const allCheeses = [ + "Cheddar", + "White Cheddar", + "Marble", + "Mozzarella", + "Swiss", + "Brie", + "Gouda", + "SB+", + "Grilled Cheese" +]; + +const mice = { + Cheddar: [ + "Brown", + "Dwarf", + "Field", + "Grey", + "Scruffy", + "Spud", + "White", + ], + "White Cheddar": [ + "Dwarf", + "Field", + "Scruffy", + "Spud", + ], + Marble: [ + "Brown", + "Diamond", + "Dwarf", + "Field", + "Gold", + "Grey", + "Longtail", + "Mole", + "Pugilist", + "Scruffy", + "Spud", + "White", + ], + Swiss: [ + "Diamond", + "Dwarf", + "Gold", + "Longtail", + "Mole", + "Pugilist", + "Scruffy", + "Spud", + ], + "Mozzarella": [ + "Diamond", + "Dwarf", + "Gold", + "Longtail", + "Pugilist", + "Scruffy", + "Spud", + "Mole", + ], + Brie: [ + "Diamond", + "Flying", + "Gold", + "Longtail", + "Mole", + "Pugilist", + "Speedy", + "Spud", + ], + Gouda: [ + "Diamond", + "Dwarf", + "Gold", + "Longtail", + "Pugilist", + "Scruffy", + "Spud", + "Mole", + ], + "SB+": [ + "Diamond", + "Farmhand", + "Flying", + "Gold", + "Mole", + "Silvertail", + "Spud", + "Tiny", + ], + "Grilled Cheese": [ + "Captain Croissant" + ] +} + +function genSeries() { + return allCheeses.map(c => { + return { + cheese: utils.genVarField("cheese", c), + config: [ + { + opts: { + include: mice[c] + } + } + ] + } + }) +} + +module.exports = { + default: { + location: utils.genVarField("location", "Windmill"), + after: utils.genVarField("after", 1633446000) // 2021-10-05T15:00:00Z, Gnawnia + Windmill patch + }, + series: genSeries() +}; diff --git a/data/populations.csv b/data/populations.csv index a6da7605..20d780f7 100644 --- a/data/populations.csv +++ b/data/populations.csv @@ -3531,84 +3531,6 @@ Whisker Woods Rift,Monstrous Black Widow,Lactrodectus Lancashire,-,0.31%,Fungal Whisker Woods Rift,Monstrous Black Widow,Lactrodectus Lancashire,-,0.29%,Cranky Caterpillar, Whisker Woods Rift,Monstrous Black Widow,Lactrodectus Lancashire,-,0.29%,Centaur Ranger, Whisker Woods Rift,Monstrous Black Widow,Lactrodectus Lancashire,-,0.27%,Cyclops Barbarian, -Windmill,-,Grilled,-,100.00%,Captain Croissant, -Windmill,-,SB+,-,10.25%,Pugilist,34687 -Windmill,-,SB+,-,9.90%,Spud, -Windmill,-,SB+,-,9.86%,Longtail, -Windmill,-,SB+,-,7.87%,Speedy, -Windmill,-,SB+,-,6.15%,Scruffy, -Windmill,-,SB+,-,6.10%,Tiny, -Windmill,-,SB+,-,6.06%,Flying, -Windmill,-,SB+,-,5.99%,Dwarf, -Windmill,-,SB+,-,5.10%,Farmhand, -Windmill,-,SB+,-,4.97%,Brown, -Windmill,-,SB+,-,4.95%,Field, -Windmill,-,SB+,-,4.93%,Mole, -Windmill,-,SB+,-,4.92%,Grey, -Windmill,-,SB+,-,4.89%,White, -Windmill,-,SB+,-,4.07%,Silvertail, -Windmill,-,SB+,-,2.04%,Diamond, -Windmill,-,SB+,-,1.95%,Gold, -Windmill,-,Gouda,-,12.90%,Pugilist,19581 -Windmill,-,Gouda,-,12.76%,Spud, -Windmill,-,Gouda,-,11.84%,Brown, -Windmill,-,Gouda,-,11.76%,Field, -Windmill,-,Gouda,-,11.62%,Grey, -Windmill,-,Gouda,-,11.43%,White, -Windmill,-,Gouda,-,7.71%,Scruffy, -Windmill,-,Gouda,-,7.70%,Dwarf, -Windmill,-,Gouda,-,4.74%,Longtail, -Windmill,-,Gouda,-,2.59%,Gold, -Windmill,-,Gouda,-,2.32%,Diamond, -Windmill,-,Gouda,-,1.33%,Speedy, -Windmill,-,Gouda,-,1.31%,Flying, -Windmill,-,Brie,-,12.79%,Pugilist,49410 -Windmill,-,Brie,-,12.41%,Spud, -Windmill,-,Brie,-,11.59%,Brown, -Windmill,-,Brie,-,11.48%,Grey, -Windmill,-,Brie,-,11.44%,Field, -Windmill,-,Brie,-,11.20%,White, -Windmill,-,Brie,-,7.61%,Dwarf, -Windmill,-,Brie,-,7.53%,Scruffy, -Windmill,-,Brie,-,5.02%,Longtail, -Windmill,-,Brie,-,2.60%,Gold, -Windmill,-,Brie,-,2.48%,Diamond, -Windmill,-,Brie,-,1.36%,Flying, -Windmill,-,Brie,-,1.26%,Mole, -Windmill,-,Brie,-,1.22%,Speedy, -Windmill,-,Swiss,-,13.14%,Pugilist,15552 -Windmill,-,Swiss,-,12.72%,Spud, -Windmill,-,Swiss,-,11.91%,White, -Windmill,-,Swiss,-,11.88%,Grey, -Windmill,-,Swiss,-,11.76%,Brown, -Windmill,-,Swiss,-,11.69%,Field, -Windmill,-,Swiss,-,7.87%,Dwarf, -Windmill,-,Swiss,-,7.54%,Scruffy, -Windmill,-,Swiss,-,4.97%,Longtail, -Windmill,-,Swiss,-,2.74%,Gold, -Windmill,-,Swiss,-,2.41%,Diamond, -Windmill,-,Swiss,-,1.38%,Mole, -Windmill,-,Marble/Mozzarella/Cheddar,-,13.17%,Spud,7746 -Windmill,-,Marble/Mozzarella/Cheddar,-,12.59%,Pugilist, -Windmill,-,Marble/Mozzarella/Cheddar,-,12.52%,Grey, -Windmill,-,Marble/Mozzarella/Cheddar,-,12.35%,Field, -Windmill,-,Marble/Mozzarella/Cheddar,-,11.59%,Brown, -Windmill,-,Marble/Mozzarella/Cheddar,-,11.36%,White, -Windmill,-,Marble/Mozzarella/Cheddar,-,7.81%,Scruffy, -Windmill,-,Marble/Mozzarella/Cheddar,-,7.78%,Dwarf, -Windmill,-,Marble/Mozzarella/Cheddar,-,4.83%,Longtail, -Windmill,-,Marble/Mozzarella/Cheddar,-,2.72%,Gold, -Windmill,-,Marble/Mozzarella/Cheddar,-,2.13%,Diamond, -Windmill,-,Marble/Mozzarella/Cheddar,-,1.14%,Mole, -Windmill,-,White Cheddar,-,20.50%,Spud,8318 -Windmill,-,White Cheddar,-,19.62%,Pugilist, -Windmill,-,White Cheddar,-,17.50%,Field, -Windmill,-,White Cheddar,-,12.26%,Scruffy, -Windmill,-,White Cheddar,-,11.43%,Dwarf, -Windmill,-,White Cheddar,-,8.74%,Longtail, -Windmill,-,White Cheddar,-,3.99%,Gold, -Windmill,-,White Cheddar,-,3.75%,Diamond, -Windmill,-,White Cheddar,-,2.20%,Mole, Zokor,Tech Foundry Outskirts,Glowing Gruyere,-,37.18%,Ash Golem,5723 Zokor,Tech Foundry Outskirts,Glowing Gruyere,-,33.23%,RR-8, Zokor,Tech Foundry Outskirts,Glowing Gruyere,-,20.71%,Reanimated Carver, diff --git a/package.json b/package.json index 0242790d..1ec1de99 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "pop:toxic": "node data/pop toxic-spill > data/pop-csv/toxic-spill.csv", "pop:vrift": "node data/pop valour-rift > data/pop-csv/valour-rift.csv", "pop:warpath": "node data/pop warpath > data/pop-csv/fiery-warpath.csv", + "pop:windmill": "node data/pop windmill > data/pop-csv/windmill.csv", "pop": "npm-run-all --parallel pop:*", "\n-- MINIFICATION --": "", "minify:bookmarklet": "uglifyjs-folder src/bookmarklet -yeo src/bookmarklet -p **/*.js,!**/*min.js", From 4ac172732fd5f418840042dd8f80c9ad4ca889b8 Mon Sep 17 00:00:00 2001 From: Hank McCord Date: Fri, 13 Oct 2023 17:03:09 -0400 Subject: [PATCH 3/5] Add Gloomy Greenwood location --- build/process-population.js | 1 + data/cheese-attraction.js | 4 ++ data/pop-csv/event.csv | 36 ---------- data/pop-csv/gloomy-greenwood.csv | 46 +++++++++++++ data/pop-js/gloomy-greenwood.js | 108 ++++++++++++++++++++++++++++++ package.json | 1 + 6 files changed, 160 insertions(+), 36 deletions(-) create mode 100644 data/pop-csv/gloomy-greenwood.csv create mode 100644 data/pop-js/gloomy-greenwood.js diff --git a/build/process-population.js b/build/process-population.js index 7a1367cf..cc8750b4 100644 --- a/build/process-population.js +++ b/build/process-population.js @@ -17,6 +17,7 @@ "data/pop-csv/fort-rox.csv", "data/pop-csv/fungal-cavern.csv", "data/pop-csv/furoma-rift.csv", + "data/pop-csv/gloomy-greenwood.csv", "data/pop-csv/great-winter-hunt.csv", "data/pop-csv/harbour.csv", "data/pop-csv/iceberg.csv", diff --git a/data/cheese-attraction.js b/data/cheese-attraction.js index a4378dbb..55b6e9aa 100644 --- a/data/cheese-attraction.js +++ b/data/cheese-attraction.js @@ -22,6 +22,7 @@ var baselineAttArray = { "Ascended": 1.0000, // Gamplay update 10/05 "Beanster": 1.0000, // Added with BB release 09 May 23 "Bland Queso": 0.9000, // Guesstimate | Calculated: 0.8970, Sample: 163254 (Excellent) + "Bonefort": 1.0000, // Added with Halloween 2021 "Brie": 0.8500, // Gamplay update 10/05 "Brie String": 0.8500, // Gamplay update 10/05 "Candy Corn": 0.9000, // Guesstimate | Calculated: 0.9019, Sample: 3601 (High) @@ -94,6 +95,7 @@ var baselineAttArray = { "Medium Queso": 1.0000, // Gamplay update 10/05 "Mild Queso": 1.0000, // Gamplay update 10/05 "Mineral": 1.0000, // Gamplay update 10/05 + "Monterey Jack-O-Lantern": 1.0000, // Added with Halloween 2021 "Moon": 1.0000, // Gamplay update 10/05 "Mozzarella": 0.7000, // Gamplay update 10/05 "Nian Gao'da": 1.0000, // Gamplay update 10/05 @@ -102,6 +104,7 @@ var baselineAttArray = { "Onyx Gorgonzola": 1.0000, // Gamplay update 10/05 "Pecan Pecorino": 1.0000, // Gamplay update 10/05 "Polluted Parmesan": 1.0000, // Gamplay update 10/05 + "Polter-Geitost": 1.0000, // Added with Halloween 2021 "Pungent Havarti": 1.0000, // Gamplay update 10/05 "Radioactive Blue": 1.0000, // Gamplay update 10/05 | Sample: 28100 "Rainy": 1.0000, // Gamplay update 10/05 @@ -120,6 +123,7 @@ var baselineAttArray = { "Runic String": 1.0000, // Gamplay update 10/05 "Runny": 1.0000, // Gamplay update 10/05 "SB+": 1.0000, // Gamplay update 10/05 + "Scream": 1.0000, // Added with Halloween 2021 "Seasoned Gouda": 0.9000, // Sample: 4275 (High) "Second Draft Derby": 1.0000, // Added with FF release "Shell": 1.0000, // Gamplay update 10/05 diff --git a/data/pop-csv/event.csv b/data/pop-csv/event.csv index 82f4e2ec..89642141 100644 --- a/data/pop-csv/event.csv +++ b/data/pop-csv/event.csv @@ -1,40 +1,4 @@ Location,Phase,Cheese,Charm,Attraction Rate,Mouse,Sample Size -Event,Halloween,SB+,-,0.00%,Baba Gaga, -Event,Halloween,SB+,-,0.00%,Captain Cannonball, -Event,Halloween,SB+,-,0.00%,Spectral Swashbuckler, -Event,Halloween,SB+,-,0.00%,Bonbon Gummy Globlin, -Event,Halloween,SB+,-,0.00%,Maize Harvester, -Event,Halloween,SB+,-,0.00%,Ghost Pirate Queen, -Event,Halloween,SB+,-,0.00%,Scorned Pirate, -Event,Halloween,SB+,-,0.00%,Spectral Butler, -Event,Halloween,SB+,-,0.00%,Hollowed Minion, -Event,Halloween,SB+,-,0.00%,Spirit Light, -Event,Halloween,SB+,-,0.00%,Admiral Arrrgh, -Event,Halloween,SB+,-,0.00%,Sugar Rush, -Event,Halloween,SB+,-,0.00%,Gourd Ghoul, -Event,Halloween,SB+,-,0.00%,Teenage Vampire, -Event,Halloween,SB+,-,0.00%,Dire Lycan, -Event,Halloween,SB+,-,0.00%,Creepy Marionette, -Event,Halloween,SB+,-,0.00%,Wild Chainsaw, -Event,Halloween,SB+,-,0.00%,Sandmouse, -Event,Halloween,SB+,-,0.00%,Zombot Unipire, -Event,Halloween,SB+,-,0.00%,Hollowhead, -Event,Halloween,SB+,-,0.00%,Cobweb, -Event,Halloween,SB+,-,0.00%,Pumpkin Hoarder, -Event,Halloween,SB+,-,0.00%,Grave Robber, -Event,Halloween,SB+,-,0.00%,Tomb Exhumer, -Event,Halloween,SB+,-,0.00%,Hollowed, -Event,Halloween,SB+,-,0.00%,Candy Cat, -Event,Halloween,SB+,-,0.00%,Candy Goblin, -Event,Halloween,SB+,-,0.00%,Tricky Witch, -Event,Halloween,SB+,-,0.00%,Shortcut, -Event,Halloween,SB+,-,0.00%,Grey Recluse, -Event,Halloween,SB+,-,0.00%,Trick, -Event,Halloween,SB+,-,0.00%,Treat, -Event,Halloween,SB+,-,0.00%,Gourdborg, -Event,Halloween,SB+,-,0.00%,Swamp Thang, -Event,Halloween,SB+,-,0.00%,Titanic Brain-Taker, -Event,Halloween,SB+,-,0.00%,Mousataur Priestess, Event,Spring Egg Hunt,SB+,-,0.00%,Chocolate Gold Foil, Event,Spring Egg Hunt,SB+,-,0.00%,Chocolate Overload, Event,Spring Egg Hunt,SB+,-,0.00%,Carefree Cook, diff --git a/data/pop-csv/gloomy-greenwood.csv b/data/pop-csv/gloomy-greenwood.csv new file mode 100644 index 00000000..c255bceb --- /dev/null +++ b/data/pop-csv/gloomy-greenwood.csv @@ -0,0 +1,46 @@ +"Location","Phase","Cheese","Charm","Attraction Rate","Mouse","Sample Size" +"Gloomy Greenwood","-","SB+","-","20.17%","Shortcut",23354 +"Gloomy Greenwood","-","SB+","-","14.98%","Tricky Witch",23354 +"Gloomy Greenwood","-","SB+","-","9.95%","Grey Recluse",23354 +"Gloomy Greenwood","-","SB+","-","9.87%","Zombot Unipire",23354 +"Gloomy Greenwood","-","SB+","-","9.83%","Cobweb",23354 +"Gloomy Greenwood","-","SB+","-","9.67%","Candy Goblin",23354 +"Gloomy Greenwood","-","SB+","-","9.08%","Candy Cat",23354 +"Gloomy Greenwood","-","SB+","-","8.88%","Teenage Vampire",23354 +"Gloomy Greenwood","-","SB+","-","7.57%","Sugar Rush",23354 +"Gloomy Greenwood","-","Gouda","-","15.00%","Teenage Vampire",157086 +"Gloomy Greenwood","-","Gouda","-","13.89%","Cobweb",157086 +"Gloomy Greenwood","-","Gouda","-","13.84%","Candy Cat",157086 +"Gloomy Greenwood","-","Gouda","-","13.69%","Sugar Rush",157086 +"Gloomy Greenwood","-","Gouda","-","11.96%","Zombot Unipire",157086 +"Gloomy Greenwood","-","Gouda","-","11.87%","Candy Goblin",157086 +"Gloomy Greenwood","-","Gouda","-","11.86%","Grey Recluse",157086 +"Gloomy Greenwood","-","Gouda","-","3.97%","Shortcut",157086 +"Gloomy Greenwood","-","Gouda","-","3.91%","Tricky Witch",157086 +"Gloomy Greenwood","-","Monterey Jack-O-Lantern","-","25.62%","Pumpkin Hoarder",163144 +"Gloomy Greenwood","-","Monterey Jack-O-Lantern","-","19.85%","Maize Harvester",163144 +"Gloomy Greenwood","-","Monterey Jack-O-Lantern","-","14.89%","Trick",163144 +"Gloomy Greenwood","-","Monterey Jack-O-Lantern","-","14.82%","Treat",163144 +"Gloomy Greenwood","-","Monterey Jack-O-Lantern","-","11.95%","Spirit Light",163144 +"Gloomy Greenwood","-","Monterey Jack-O-Lantern","-","7.89%","Gourdborg",163144 +"Gloomy Greenwood","-","Monterey Jack-O-Lantern","-","4.98%","Wild Chainsaw",163144 +"Gloomy Greenwood","-","Bonefort","-","20.66%","Sandmouse",235127 +"Gloomy Greenwood","-","Bonefort","-","19.70%","Hollowhead",235127 +"Gloomy Greenwood","-","Bonefort","-","14.91%","Dire Lycan",235127 +"Gloomy Greenwood","-","Bonefort","-","14.86%","Titanic Brain-Taker",235127 +"Gloomy Greenwood","-","Bonefort","-","9.97%","Mousataur Priestess",235127 +"Gloomy Greenwood","-","Bonefort","-","9.89%","Creepy Marionette",235127 +"Gloomy Greenwood","-","Bonefort","-","5.03%","Tomb Exhumer",235127 +"Gloomy Greenwood","-","Bonefort","-","4.97%","Grave Robber",235127 +"Gloomy Greenwood","-","Polter-Geitost","-","22.69%","Captain Cannonball",168657 +"Gloomy Greenwood","-","Polter-Geitost","-","21.82%","Spectral Swashbuckler",168657 +"Gloomy Greenwood","-","Polter-Geitost","-","21.73%","Scorned Pirate",168657 +"Gloomy Greenwood","-","Polter-Geitost","-","13.92%","Spectral Butler",168657 +"Gloomy Greenwood","-","Polter-Geitost","-","9.91%","Gourd Ghoul",168657 +"Gloomy Greenwood","-","Polter-Geitost","-","4.97%","Admiral Arrrgh",168657 +"Gloomy Greenwood","-","Polter-Geitost","-","4.96%","Ghost Pirate Queen",168657 +"Gloomy Greenwood","-","Scream","-","24.81%","Hollowed Minion",77214 +"Gloomy Greenwood","-","Scream","-","20.74%","Bonbon Gummy Globlin",77214 +"Gloomy Greenwood","-","Scream","-","19.77%","Swamp Thang",77214 +"Gloomy Greenwood","-","Scream","-","19.60%","Hollowed",77214 +"Gloomy Greenwood","-","Scream","-","15.07%","Baba Gaga",77214 diff --git a/data/pop-js/gloomy-greenwood.js b/data/pop-js/gloomy-greenwood.js new file mode 100644 index 00000000..6b0f6f09 --- /dev/null +++ b/data/pop-js/gloomy-greenwood.js @@ -0,0 +1,108 @@ +const utils = require("../_utils"); + +module.exports = { + default: { + location: utils.genVarField("location", "Gloomy Greenwood"), + }, + series: [ + { + cheese: utils.genVarField("cheese", ["SB+", "Gouda"]), + config: [ + { + opts: { + include: [ + "Candy Cat", + "Candy Goblin", + "Cobweb", + "Grey Recluse", + "Shortcut", + "Sugar Rush", + "Teenage Vampire", + "Tricky Witch", + "Zombot Unipire" + ] + } + } + ] + }, + { + cheese: utils.genVarField("cheese", "Monterey Jack-O-Lantern"), + config: [ + { + opts: { + include: [ + "Gourdborg", + "Maize Harvester", + "Pumpkin Hoarder", + "Spirit Light", + "Treat", + "Trick", + "Wild Chainsaw" + ] + } + } + ] + }, + { + cheese: utils.genVarField("cheese", "Bonefort"), + config: [ + { + opts: { + include: [ + "Creepy Marionette", + "Dire Lycan", + "Grave Robber", + "Hollowhead", + "Mousataur Priestess", + "Sandmouse", + "Titanic Brain-Taker", + "Tomb Exhumer" + ] + } + } + ] + }, + { + cheese: utils.genVarField("cheese", "Polter-Geitost"), + config: [ + { + opts: { + include: [ + "Admiral Arrrgh", + "Captain Cannonball", + "Ghost Pirate Queen", + "Gourd Ghoul", + "Scorned Pirate", + "Spectral Butler", + "Spectral Swashbuckler" + ] + } + } + ] + }, + { + cheese: utils.genVarField("cheese", "Scream"), + config: [ + { + opts: { + include: [ + "Baba Gaga", + "Bonbon Gummy Globlin", + "Hollowed", + "Hollowed Minion", + "Swamp Thang", + ] + } + } + ] + }, + ], + /** + * + * @param {{stage: string, location: string, cheese: string, mouse: string, attraction: string, sample: number}[]} data + * @returns {{stage: string, location: string, cheese: string, mouse: string, attraction: string, sample: number}[]} + */ + postProcess: function(data) { + return data; + }, +}; diff --git a/package.json b/package.json index 7a9e08a7..7a0e2035 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "pop:furoma": "node data/pop furoma-rift > data/pop-csv/furoma-rift.csv", "!pop:ges": "node data/pop ges > data/pop-csv/ges.csv", "pop:geyser": "node data/pop queso-geyser > data/pop-csv/queso-geyser.csv", + "pop:gloomy": "node data/pop gloomy-greenwood > data/pop-csv/gloomy-greenwood.csv", "pop:gwh": "node data/pop great-winter-hunt > data/pop-csv/great-winter-hunt.csv", "pop:harbour": "node data/pop harbour > data/pop-csv/harbour.csv", "pop:jod": "node data/pop jungle-of-dread > data/pop-csv/jungle-of-dread.csv", From 5963a9a05a139d4585a4d04aa4e772ef8deffbe2 Mon Sep 17 00:00:00 2001 From: Kuhmann Date: Fri, 12 Jan 2024 18:46:12 +0800 Subject: [PATCH 4/5] need test if bookmarketlet works. assuming naughty list works the same as ssdb. --- data/arrays.js | 2 ++ src/bookmarklet/bm-setup-items.js | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/data/arrays.js b/data/arrays.js index 0b21de6e..28d54b9a 100644 --- a/data/arrays.js +++ b/data/arrays.js @@ -497,6 +497,8 @@ var basesArray = { "Molten Shrapnel Base": [350, 12, 5, 8, "Extremely Stale"], "Monkey Jade Base": [350, 12, 10, 10, "Stale"], "Monolith Base": [500, 12, 0, 0, "No Effect"], + "Naughty List Printing Press (Paperless)": [500,15,0,10,"Fresh"], + "Naughty List Printing Press": [4500,35,35,57,"Fresh"], "Overgrown Ember Stone Base": [450, 10, 18, 12, "Ultimately Stale"], "Ox Jade Base": [375, 12, 10, 10, "Stale"], "Papyrus Base": [400, 8, 0, 10, "Fresh"], diff --git a/src/bookmarklet/bm-setup-items.js b/src/bookmarklet/bm-setup-items.js index 6b4df3fd..2a44a154 100644 --- a/src/bookmarklet/bm-setup-items.js +++ b/src/bookmarklet/bm-setup-items.js @@ -31,6 +31,11 @@ bases.push("Signature Series Denture Base (Toothless)"); } + // Auto-add Naughty List Printing Press Base variants + if (bases.indexOf("Naughty List Printing Press Base") >= 0) { + bases.push("Naughty List Printing Press (Paperless)"); + } + var weapons = arr .filter(function(el) { return el.classification === "weapon" && el.quantity > 0; From cc51429f09e728f6147788559ce18b996b32fb2c Mon Sep 17 00:00:00 2001 From: Hank McCord Date: Fri, 26 Jan 2024 14:50:56 -0500 Subject: [PATCH 5/5] Utilize gemology stages in FC --- data/pop-csv/fungal-cavern.csv | 138 +++++++++++++++++------------ data/pop-js/fungal-cavern.js | 98 ++++++++++++++++++-- src/bookmarklet/bm-cre.js | 2 + src/bookmarklet/bm-setup-fields.js | 2 + 4 files changed, 174 insertions(+), 66 deletions(-) diff --git a/data/pop-csv/fungal-cavern.csv b/data/pop-csv/fungal-cavern.csv index d6cdcce4..88912161 100644 --- 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 index a10c8584..1e99ecf3 100644 --- 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 index 8bf3e0d1..83f78516 100644 --- 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 index e47c6468..2865b88f 100644 --- 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"];