diff --git a/data/pop-csv/iceberg.csv b/data/pop-csv/iceberg.csv index 31a57b0d..186ced1e 100644 --- a/data/pop-csv/iceberg.csv +++ b/data/pop-csv/iceberg.csv @@ -1,76 +1,101 @@ "Location","Phase","Cheese","Charm","Attraction Rate","Mouse","Sample Size" -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+","-","29.70%","Chipper",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+","-","28.86%","Icebreaker",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+","-","11.74%","Incompetent Ice Climber",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+","-","11.07%","Snow Slinger",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+","-","9.40%","Snow Soldier",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+","-","8.05%","Polar Bear",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+","-","1.17%","Living Salt",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Gouda","-","29.70%","Chipper",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Gouda","-","28.86%","Icebreaker",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Gouda","-","11.74%","Incompetent Ice Climber",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Gouda","-","11.07%","Snow Slinger",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Gouda","-","9.40%","Snow Soldier",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Gouda","-","8.05%","Polar Bear",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Gouda","-","1.17%","Living Salt",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Brie","-","29.70%","Chipper",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Brie","-","28.86%","Icebreaker",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Brie","-","11.74%","Incompetent Ice Climber",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Brie","-","11.07%","Snow Slinger",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Brie","-","9.40%","Snow Soldier",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Brie","-","8.05%","Polar Bear",596 -"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","Brie","-","1.17%","Living Salt",596 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","19.60%","Icebreaker",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","18.93%","Chipper",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","10.68%","Stickybomber",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","10.45%","Iceblock",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","9.77%","Snow Slinger",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","9.72%","Saboteur",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","9.55%","Wolfskie",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","5.65%","Snow Bowler",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","4.69%","Heavy Blaster",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","SB+","-","0.96%","Living Salt",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","19.60%","Icebreaker",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","18.93%","Chipper",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","10.68%","Stickybomber",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","10.45%","Iceblock",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","9.77%","Snow Slinger",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","9.72%","Saboteur",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","9.55%","Wolfskie",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","5.65%","Snow Bowler",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","4.69%","Heavy Blaster",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Gouda","-","0.96%","Living Salt",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","19.60%","Icebreaker",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","18.93%","Chipper",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","10.68%","Stickybomber",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","10.45%","Iceblock",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","9.77%","Snow Slinger",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","9.72%","Saboteur",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","9.55%","Wolfskie",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","5.65%","Snow Bowler",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","4.69%","Heavy Blaster",1770 -"Iceberg","Bombing Run (Ultimate Iceberg)","Brie","-","0.96%","Living Salt",1770 -"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+","-","26.53%","Wolfskie",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+","-","24.14%","Iceblock",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+","-","18.83%","Snowblind",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+","-","12.47%","Chipper",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+","-","6.63%","Iceblade",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+","-","5.57%","Snow Bowler",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+","-","5.04%","Water Wielder",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+","-","0.80%","Living Salt",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Gouda","-","26.53%","Wolfskie",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Gouda","-","24.14%","Iceblock",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Gouda","-","18.83%","Snowblind",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Gouda","-","12.47%","Chipper",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Gouda","-","6.63%","Iceblade",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Gouda","-","5.57%","Snow Bowler",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Gouda","-","5.04%","Water Wielder",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Gouda","-","0.80%","Living Salt",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Brie","-","26.53%","Wolfskie",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Brie","-","24.14%","Iceblock",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Brie","-","18.83%","Snowblind",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Brie","-","12.47%","Chipper",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Brie","-","6.63%","Iceblade",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Brie","-","5.57%","Snow Bowler",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Brie","-","5.04%","Water Wielder",377 -"Iceberg","The Mad Depths (Ultimate Iceberg)","Brie","-","0.80%","Living Salt",377 \ No newline at end of file +"Iceberg","Treacherous Tunnels","SB+/Gouda/Brie","-","19.93%","Snow Slinger",17680 +"Iceberg","Treacherous Tunnels","SB+/Gouda/Brie","-","19.53%","Polar Bear",17680 +"Iceberg","Treacherous Tunnels","SB+/Gouda/Brie","-","15.58%","Incompetent Ice Climber",17680 +"Iceberg","Treacherous Tunnels","SB+/Gouda/Brie","-","15.06%","Snow Soldier",17680 +"Iceberg","Treacherous Tunnels","SB+/Gouda/Brie","-","14.48%","Chipper",17680 +"Iceberg","Treacherous Tunnels","SB+/Gouda/Brie","-","14.41%","Icebreaker",17680 +"Iceberg","Treacherous Tunnels","SB+/Gouda/Brie","-","1.02%","Living Salt",17680 +"Iceberg","Treacherous Tunnels (Magnet)","SB+/Gouda/Brie","-","29.39%","Icebreaker",51622 +"Iceberg","Treacherous Tunnels (Magnet)","SB+/Gouda/Brie","-","29.30%","Chipper",51622 +"Iceberg","Treacherous Tunnels (Magnet)","SB+/Gouda/Brie","-","10.62%","Incompetent Ice Climber",51622 +"Iceberg","Treacherous Tunnels (Magnet)","SB+/Gouda/Brie","-","10.07%","Snow Soldier",51622 +"Iceberg","Treacherous Tunnels (Magnet)","SB+/Gouda/Brie","-","9.87%","Polar Bear",51622 +"Iceberg","Treacherous Tunnels (Magnet)","SB+/Gouda/Brie","-","9.70%","Snow Slinger",51622 +"Iceberg","Treacherous Tunnels (Magnet)","SB+/Gouda/Brie","-","1.05%","Living Salt",51622 +"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+/Gouda/Brie","-","29.39%","Icebreaker",51622 +"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+/Gouda/Brie","-","29.30%","Chipper",51622 +"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+/Gouda/Brie","-","10.62%","Incompetent Ice Climber",51622 +"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+/Gouda/Brie","-","10.07%","Snow Soldier",51622 +"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+/Gouda/Brie","-","9.87%","Polar Bear",51622 +"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+/Gouda/Brie","-","9.70%","Snow Slinger",51622 +"Iceberg","Treacherous Tunnels (Ultimate Iceberg)","SB+/Gouda/Brie","-","1.05%","Living Salt",51622 +"Iceberg","Brutal Bulwark","SB+/Gouda/Brie","-","30.43%","Polar Bear",105087 +"Iceberg","Brutal Bulwark","SB+/Gouda/Brie","-","29.26%","Snow Slinger",105087 +"Iceberg","Brutal Bulwark","SB+/Gouda/Brie","-","24.47%","Iceblock",105087 +"Iceberg","Brutal Bulwark","SB+/Gouda/Brie","-","4.98%","Yeti",105087 +"Iceberg","Brutal Bulwark","SB+/Gouda/Brie","-","4.97%","Mammoth",105087 +"Iceberg","Brutal Bulwark","SB+/Gouda/Brie","-","4.89%","Snow Bowler",105087 +"Iceberg","Brutal Bulwark","SB+/Gouda/Brie","-","1.00%","Living Salt",105087 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","15.67%","Snow Slinger",71242 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","14.76%","Wolfskie",71242 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","14.73%","Iceblock",71242 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","9.89%","Saboteur",71242 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","9.80%","Heavy Blaster",71242 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","9.75%","Icebreaker",71242 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","9.74%","Chipper",71242 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","9.67%","Stickybomber",71242 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","4.90%","Snow Bowler",71242 +"Iceberg","Bombing Run","SB+/Gouda/Brie","-","1.08%","Living Salt",71242 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","19.71%","Icebreaker",125206 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","19.60%","Chipper",125206 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","10.74%","Snow Slinger",125206 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","9.89%","Stickybomber",125206 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","9.82%","Iceblock",125206 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","9.79%","Saboteur",125206 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","9.76%","Wolfskie",125206 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","4.86%","Snow Bowler",125206 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","4.79%","Heavy Blaster",125206 +"Iceberg","Bombing Run (Magnet)","SB+/Gouda/Brie","-","1.04%","Living Salt",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","19.71%","Icebreaker",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","19.60%","Chipper",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","10.74%","Snow Slinger",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","9.89%","Stickybomber",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","9.82%","Iceblock",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","9.79%","Saboteur",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","9.76%","Wolfskie",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","4.86%","Snow Bowler",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","4.79%","Heavy Blaster",125206 +"Iceberg","Bombing Run (Ultimate Iceberg)","SB+/Gouda/Brie","-","1.04%","Living Salt",125206 +"Iceberg","The Mad Depths","SB+/Gouda/Brie","-","19.99%","Iceblock",19393 +"Iceberg","The Mad Depths","SB+/Gouda/Brie","-","19.12%","Wolfskie",19393 +"Iceberg","The Mad Depths","SB+/Gouda/Brie","-","14.86%","Iceblade",19393 +"Iceberg","The Mad Depths","SB+/Gouda/Brie","-","14.73%","Water Wielder",19393 +"Iceberg","The Mad Depths","SB+/Gouda/Brie","-","14.59%","Snowblind",19393 +"Iceberg","The Mad Depths","SB+/Gouda/Brie","-","10.18%","Chipper",19393 +"Iceberg","The Mad Depths","SB+/Gouda/Brie","-","5.12%","Snow Bowler",19393 +"Iceberg","The Mad Depths","SB+/Gouda/Brie","-","1.42%","Living Salt",19393 +"Iceberg","The Mad Depths (Magnet)","SB+/Gouda/Brie","-","19.62%","Iceblock",846 +"Iceberg","The Mad Depths (Magnet)","SB+/Gouda/Brie","-","18.09%","Wolfskie",846 +"Iceberg","The Mad Depths (Magnet)","SB+/Gouda/Brie","-","17.26%","Iceblade",846 +"Iceberg","The Mad Depths (Magnet)","SB+/Gouda/Brie","-","14.66%","Snowblind",846 +"Iceberg","The Mad Depths (Magnet)","SB+/Gouda/Brie","-","14.42%","Water Wielder",846 +"Iceberg","The Mad Depths (Magnet)","SB+/Gouda/Brie","-","9.57%","Chipper",846 +"Iceberg","The Mad Depths (Magnet)","SB+/Gouda/Brie","-","5.56%","Snow Bowler",846 +"Iceberg","The Mad Depths (Magnet)","SB+/Gouda/Brie","-","0.83%","Living Salt",846 +"Iceberg","The Mad Depths (Hearthstone)","SB+/Gouda/Brie","-","25.28%","Wolfskie",4170 +"Iceberg","The Mad Depths (Hearthstone)","SB+/Gouda/Brie","-","23.74%","Iceblock",4170 +"Iceberg","The Mad Depths (Hearthstone)","SB+/Gouda/Brie","-","19.86%","Snowblind",4170 +"Iceberg","The Mad Depths (Hearthstone)","SB+/Gouda/Brie","-","14.80%","Chipper",4170 +"Iceberg","The Mad Depths (Hearthstone)","SB+/Gouda/Brie","-","5.47%","Iceblade",4170 +"Iceberg","The Mad Depths (Hearthstone)","SB+/Gouda/Brie","-","5.16%","Snow Bowler",4170 +"Iceberg","The Mad Depths (Hearthstone)","SB+/Gouda/Brie","-","4.63%","Water Wielder",4170 +"Iceberg","The Mad Depths (Hearthstone)","SB+/Gouda/Brie","-","1.08%","Living Salt",4170 +"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+/Gouda/Brie","-","25.37%","Iceblock",34721 +"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+/Gouda/Brie","-","24.84%","Wolfskie",34721 +"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+/Gouda/Brie","-","19.64%","Snowblind",34721 +"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+/Gouda/Brie","-","14.45%","Chipper",34721 +"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+/Gouda/Brie","-","5.03%","Iceblade",34721 +"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+/Gouda/Brie","-","4.95%","Water Wielder",34721 +"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+/Gouda/Brie","-","4.76%","Snow Bowler",34721 +"Iceberg","The Mad Depths (Ultimate Iceberg)","SB+/Gouda/Brie","-","0.97%","Living Salt",34721 +"Iceberg","Icewing's Lair","SB+/Gouda/Brie","-","72.04%","Frostlance Guard",10442 +"Iceberg","Icewing's Lair","SB+/Gouda/Brie","-","25.70%","Icewing",10442 +"Iceberg","Icewing's Lair","SB+/Gouda/Brie","-","2.26%","Frostwing Commander",10442 +"Iceberg","The Hidden Depths","SB+/Gouda/Brie","-","50.90%","Frostwing Commander",14782 +"Iceberg","The Hidden Depths","SB+/Gouda/Brie","-","49.10%","Living Salt",14782 +"Iceberg","Generals","SB+/Gouda/Brie","-","32.44%","Lord Splodington",30256 +"Iceberg","Generals","SB+/Gouda/Brie","-","32.37%","Princess Fist",30256 +"Iceberg","Generals","SB+/Gouda/Brie","-","31.32%","Lady Coldsnap",30256 +"Iceberg","Generals","SB+/Gouda/Brie","-","3.88%","General Drheller",30256 +"Iceberg","The Deep Lair","SB+/Gouda/Brie","-","100.00%","Deep",1 diff --git a/data/pop-iceberg-ht.js b/data/pop-iceberg-ht.js deleted file mode 100644 index 8a577f0a..00000000 --- a/data/pop-iceberg-ht.js +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env node - -var jt = require("jacksmhtools-client"); -var utils = require("./_utils"); - -var cheese = [ - { fields: { cheese: "SB+" } }, - { fields: { cheese: "Gouda" } }, - { fields: { cheese: "Brie" } } -]; - -function bases(stageName) { - return [ - // { // no special base - // vars: { - // base: { - // // 'Deep Freeze': false, - // 'Hearthstone': false, - // 'Magnet': false, - // 'Remote Detonator': false, - // // 'Spiked': false, - // 'Ultimate Iceberg': false - // } - // }, - // fields: { stage: stageName } - // }, - // utils.genVarItem('base', 'Deep Freeze', { fields: { stage: stageName+' (Deep Freeze)' } }), - // utils.genVarItem('base', 'Hearthstone', { fields: { stage: stageName+' (Hearthstone)' } }), - // utils.genVarItem('base', 'Magnet', { fields: { stage: stageName+' (Magnet)' } }), - // utils.genVarItem('base', 'Remote Detonator', { fields: { stage: stageName+' (Remote Detonator)' } }), - // utils.genVarItem('base', 'Spiked', { fields: { stage: stageName+' (Spiked)' } }), - utils.genVarItem("base", "Ultimate Iceberg", { - fields: { stage: stageName + " (Ultimate Iceberg)" } - }) - ]; -} - -utils - .process({ - default: { - location: utils.genVarField("location", "Iceberg"), - cheese: cheese - }, - series: [ - { - // Treacherous Tunnels - phase: [{ vars: { stage: { "0-300ft": true } } }], - base: bases("Treacherous Tunnels") - }, - // { // Brutal Bulwark - // location: utils.genVarField('location', 'Iceberg'), - // phase: [ { vars: { stage: { '301-600ft': true } } } ], - // cheese: cheese, - // base: bases('Brutal Bulwark') - // }, - { - // Bombing Run - phase: [{ vars: { stage: { "601-1600ft": true } } }], - base: bases("Bombing Run") - }, - { - // The Mad Depths - phase: [{ vars: { stage: { "1601-1800ft": true } } }], - base: bases("The Mad Depths") - } - ], - process: function(item) { - console.error("requesting", JSON.stringify(item.vars)); - return jt - .getSAEncounterRateData(item.vars, item.opts) - .filter(function(item) { - return item.sample > 100; - }) - .map(utils.preparePopulation.bind(utils, item.fields)); - } - }) - .then(utils.toCsv.bind(utils, utils.POP_FIELDS)) - .then(console.log.bind(console)); diff --git a/data/pop-js/iceberg.js b/data/pop-js/iceberg.js new file mode 100644 index 00000000..70809739 --- /dev/null +++ b/data/pop-js/iceberg.js @@ -0,0 +1,247 @@ +const utils = require("../_utils"); + +// Three stages where the AR is modified based on the base +function getBaseConfigForStage(stageName) { + if (stageName == "Treacherous Tunnels" || stageName === "Bombing Run") { + // TT and BR can have increased Tunnel Rat attraction + // We'll point the user to the correct stage but the query will be the same + return [ + { + vars: { + base: { + "Magnet": true, + "Iceberg Boiler" : true, + "Ultimate Iceberg": true + } + }, + fields: { + stage: `${stageName} (Magnet)` + } + }, + { + vars: { + base: { + "Magnet": true, + "Iceberg Boiler" : true, + "Ultimate Iceberg": true + } + }, + fields: { + stage: `${stageName} (Ultimate Iceberg)` + } + } + ] + } else if (stageName == "The Mad Depths") { + // The Mad Depths has Tunnel Rats and Zealots so there's three different configurations + // 1. Tunnel Rats AR+ : Magnet + // 2. Zealots AR- : Hearthstone + // 3. Tunnel Rats AR+ && Zealots- : Ultimate + return [ + { + vars: { base: { "Magnet": true } }, + fields: { stage: `${stageName} (Magnet)` } + }, + { + vars: { base: { "Hearthstone": true, } }, + fields: { stage: `${stageName} (Hearthstone)` } + }, + { + vars: { + base: { + "Iceberg Boiler" : true, + "Ultimate Iceberg": true + } + }, + fields: { stage: `${stageName} (Ultimate Iceberg)` } + }, + ] + } + + return null; +} + +function genBases(stageName) { + return [ + // no special base config + { + vars: { + base: { + // 'Deep Freeze': false, + 'Hearthstone': false, + 'Magnet': false, + // 'Remote Detonator': false, + // 'Spiked': false, + 'Ultimate Iceberg': false, + 'Iceberg Boiler': false + } + }, + fields: { stage: stageName } + }, + ...getBaseConfigForStage(stageName) + ]; +} + +module.exports = { + default: { + location: utils.genVarField("location", "Iceberg"), + cheese: [ + { + vars: { + cheese: { + "Brie": true, + "Gouda": true, + "SB+": true, + } + }, + fields: { + cheese: "SB+/Gouda/Brie" + } + } + ], + }, + series: [ + { + // Not using genVarField for stage b/c the bases function + // will provide the stage field + + // Treacherous Tunnels + stage: [{ vars: { stage: { "0-300ft": true } } }], + base: genBases("Treacherous Tunnels"), + config: [ + { + opts: { + include: [ + "Chipper", + "Icebreaker", + "Incompetent Ice Climber", + "Living Salt", + "Polar Bear", + "Snow Slinger", + "Snow Soldier", + ], + }, + }, + ], + }, + { + // Brutal Bulwark + // No bases can modify pool in this stage + stage: utils.genVarField("stage", "301-600ft", { fields: { stage: "Brutal Bulwark"} }), + config: [ + { + opts: { + include: [ + "Iceblock", + "Living Salt", + "Mammoth", + "Polar Bear", + "Snow Bowler", + "Snow Slinger", + "Yeti", + ], + }, + }, + ], + }, + { + // Bombing Run + stage: [{ vars: { stage: { "601-1600ft": true } } }], + base: genBases("Bombing Run"), + config: [ + { + opts: { + include: [ + "Living Salt", + "Snow Slinger", + "Iceblock", + "Snow Bowler", + "Chipper", + "Icebreaker", + "Wolfskie", + "Heavy Blaster", + "Saboteur", + "Stickybomber", + ], + }, + }, + ], + }, + { + // The Mad Depths + stage: [{ vars: { stage: { "1601-1800ft": true } } }], + base: genBases("The Mad Depths"), + config: [ + { + opts: { + include: [ + "Chipper", + "Iceblade", + "Iceblock", + "Living Salt", + "Snow Bowler", + "Snowblind", + "Water Wielder", + "Wolfskie", + ], + }, + }, + ], + }, + { + stage: utils.genVarField("stage", "1800ft", { fields: { stage: "Icewing's Lair" } }), + config: [ + { + opts: { + include: [ + "Frostlance Guard", + "Frostwing Commander", + "Icewing", + ] + } + } + ] + }, + { + stage: utils.genVarField("stage", "1801-2000ft", { fields: { stage: "The Hidden Depths" } }), + config: [ + { + opts: { + include: [ + "Living Salt", + "Frostwing Commander", + "Frostwing Guard", + ] + } + } + ] + }, + { + stage: utils.genVarField("stage", "Generals"), + config: [ + { + opts: { + include: [ + "General Drheller", + "Lady Coldsnap", + "Lord Splodington", + "Princess Fist", + ] + } + } + ] + } + ], + + postProcess: function(data) { + data.push({ + stage: "The Deep Lair", + location: "Iceberg", + cheese: "SB+/Gouda/Brie", + mouse: "Deep", + attraction: "100.00%", + sample: 1 + }); + + return data; + } +}; diff --git a/data/populations.csv b/data/populations.csv index b207a429..26269835 100644 --- a/data/populations.csv +++ b/data/populations.csv @@ -1562,229 +1562,6 @@ Great Gnarled Tree,-,White Cheddar/Marble/Mozzarella/Cheddar,-,3.16%,Dwarf, Great Gnarled Tree,-,White Cheddar/Marble/Mozzarella/Cheddar,-,2.69%,Goldleaf, Great Gnarled Tree,-,White Cheddar/Marble/Mozzarella/Cheddar,-,1.74%,Wicked Witch of Whisker Woods, Great Gnarled Tree,-,White Cheddar/Marble/Mozzarella/Cheddar,-,1.42%,Bat, -Iceberg,Treacherous Tunnels,SB+,-,20.03%,Polar Bear,13499 -Iceberg,Treacherous Tunnels,SB+,-,19.52%,Snow Slinger, -Iceberg,Treacherous Tunnels,SB+,-,15.47%,Chipper, -Iceberg,Treacherous Tunnels,SB+,-,14.87%,Icebreaker, -Iceberg,Treacherous Tunnels,SB+,-,14.69%,Incompetent Ice Climber, -Iceberg,Treacherous Tunnels,SB+,-,14.55%,Snow Soldier, -Iceberg,Treacherous Tunnels,SB+,-,0.87%,Living Salt, -Iceberg,Treacherous Tunnels,Gouda,-,20.01%,Snow Slinger,39213 -Iceberg,Treacherous Tunnels,Gouda,-,19.72%,Polar Bear, -Iceberg,Treacherous Tunnels,Gouda,-,15.42%,Chipper, -Iceberg,Treacherous Tunnels,Gouda,-,14.99%,Icebreaker, -Iceberg,Treacherous Tunnels,Gouda,-,14.69%,Snow Soldier, -Iceberg,Treacherous Tunnels,Gouda,-,14.20%,Incompetent Ice Climber, -Iceberg,Treacherous Tunnels,Gouda,-,0.97%,Living Salt, -Iceberg,Treacherous Tunnels,Brie,-,19.65%,Snow Slinger,7123 -Iceberg,Treacherous Tunnels,Brie,-,19.14%,Polar Bear, -Iceberg,Treacherous Tunnels,Brie,-,15.84%,Icebreaker, -Iceberg,Treacherous Tunnels,Brie,-,14.99%,Chipper, -Iceberg,Treacherous Tunnels,Brie,-,14.85%,Snow Soldier, -Iceberg,Treacherous Tunnels,Brie,-,14.83%,Incompetent Ice Climber, -Iceberg,Treacherous Tunnels,Brie,-,0.70%,Living Salt, -Iceberg,Treacherous Tunnels (Magnet),SB+,-,29.70%,Icebreaker,44054 -Iceberg,Treacherous Tunnels (Magnet),SB+,-,29.36%,Chipper, -Iceberg,Treacherous Tunnels (Magnet),SB+,-,10.21%,Snow Slinger, -Iceberg,Treacherous Tunnels (Magnet),SB+,-,10.09%,Polar Bear, -Iceberg,Treacherous Tunnels (Magnet),SB+,-,9.91%,Incompetent Ice Climber, -Iceberg,Treacherous Tunnels (Magnet),SB+,-,9.84%,Snow Soldier, -Iceberg,Treacherous Tunnels (Magnet),SB+,-,0.88%,Living Salt, -Iceberg,Treacherous Tunnels (Magnet),Gouda,-,29.71%,Chipper,91963 -Iceberg,Treacherous Tunnels (Magnet),Gouda,-,29.30%,Icebreaker, -Iceberg,Treacherous Tunnels (Magnet),Gouda,-,10.33%,Snow Slinger, -Iceberg,Treacherous Tunnels (Magnet),Gouda,-,10.15%,Polar Bear, -Iceberg,Treacherous Tunnels (Magnet),Gouda,-,9.86%,Incompetent Ice Climber, -Iceberg,Treacherous Tunnels (Magnet),Gouda,-,9.71%,Snow Soldier, -Iceberg,Treacherous Tunnels (Magnet),Gouda,-,0.95%,Living Salt, -Iceberg,Treacherous Tunnels (Magnet),Brie,-,30.78%,Icebreaker,7561 -Iceberg,Treacherous Tunnels (Magnet),Brie,-,28.24%,Chipper, -Iceberg,Treacherous Tunnels (Magnet),Brie,-,10.33%,Snow Soldier, -Iceberg,Treacherous Tunnels (Magnet),Brie,-,10.25%,Polar Bear, -Iceberg,Treacherous Tunnels (Magnet),Brie,-,10.21%,Snow Slinger, -Iceberg,Treacherous Tunnels (Magnet),Brie,-,9.40%,Incompetent Ice Climber, -Iceberg,Treacherous Tunnels (Magnet),Brie,-,0.79%,Living Salt, -Iceberg,Brutal Bulwark,SB+,-,29.89%,Snow Slinger,84489 -Iceberg,Brutal Bulwark,SB+,-,29.53%,Polar Bear, -Iceberg,Brutal Bulwark,SB+,-,24.88%,Iceblock, -Iceberg,Brutal Bulwark,SB+,-,5.02%,Yeti, -Iceberg,Brutal Bulwark,SB+,-,4.92%,Snow Bowler, -Iceberg,Brutal Bulwark,SB+,-,4.86%,Mammoth, -Iceberg,Brutal Bulwark,SB+,-,0.90%,Living Salt, -Iceberg,Brutal Bulwark,Gouda,-,29.66%,Snow Slinger,176150 -Iceberg,Brutal Bulwark,Gouda,-,29.63%,Polar Bear, -Iceberg,Brutal Bulwark,Gouda,-,25.01%,Iceblock, -Iceberg,Brutal Bulwark,Gouda,-,4.98%,Mammoth, -Iceberg,Brutal Bulwark,Gouda,-,4.93%,Snow Bowler, -Iceberg,Brutal Bulwark,Gouda,-,4.90%,Yeti, -Iceberg,Brutal Bulwark,Gouda,-,0.90%,Living Salt, -Iceberg,Brutal Bulwark,Brie,-,29.97%,Polar Bear,19893 -Iceberg,Brutal Bulwark,Brie,-,29.59%,Snow Slinger, -Iceberg,Brutal Bulwark,Brie,-,24.29%,Iceblock, -Iceberg,Brutal Bulwark,Brie,-,5.08%,Yeti, -Iceberg,Brutal Bulwark,Brie,-,4.96%,Mammoth, -Iceberg,Brutal Bulwark,Brie,-,4.91%,Snow Bowler, -Iceberg,Brutal Bulwark,Brie,-,1.19%,Living Salt, -Iceberg,Bombing Run,SB+,-,14.92%,Wolfskie,126853 -Iceberg,Bombing Run,SB+,-,14.82%,Iceblock, -Iceberg,Bombing Run,SB+,-,14.67%,Snow Slinger, -Iceberg,Bombing Run,SB+,-,10.06%,Icebreaker, -Iceberg,Bombing Run,SB+,-,10.04%,Chipper, -Iceberg,Bombing Run,SB+,-,9.97%,Stickybomber, -Iceberg,Bombing Run,SB+,-,9.78%,Saboteur, -Iceberg,Bombing Run,SB+,-,9.77%,Heavy Blaster, -Iceberg,Bombing Run,SB+,-,5.02%,Snow Bowler, -Iceberg,Bombing Run,SB+,-,0.93%,Living Salt, -Iceberg,Bombing Run,Gouda,-,14.86%,Iceblock,263611 -Iceberg,Bombing Run,Gouda,-,14.79%,Wolfskie, -Iceberg,Bombing Run,Gouda,-,14.73%,Snow Slinger, -Iceberg,Bombing Run,Gouda,-,10.13%,Icebreaker, -Iceberg,Bombing Run,Gouda,-,10.07%,Chipper, -Iceberg,Bombing Run,Gouda,-,10.01%,Saboteur, -Iceberg,Bombing Run,Gouda,-,9.83%,Stickybomber, -Iceberg,Bombing Run,Gouda,-,9.65%,Heavy Blaster, -Iceberg,Bombing Run,Gouda,-,4.98%,Snow Bowler, -Iceberg,Bombing Run,Gouda,-,0.96%,Living Salt, -Iceberg,Bombing Run,Brie,-,14.69%,Snow Slinger,33073 -Iceberg,Bombing Run,Brie,-,14.56%,Wolfskie, -Iceberg,Bombing Run,Brie,-,14.38%,Iceblock, -Iceberg,Bombing Run,Brie,-,10.07%,Stickybomber, -Iceberg,Bombing Run,Brie,-,10.02%,Heavy Blaster, -Iceberg,Bombing Run,Brie,-,9.96%,Chipper, -Iceberg,Bombing Run,Brie,-,9.92%,Saboteur, -Iceberg,Bombing Run,Brie,-,9.75%,Icebreaker, -Iceberg,Bombing Run,Brie,-,4.86%,Snow Bowler, -Iceberg,Bombing Run,Brie,-,1.78%,Living Salt, -Iceberg,Bombing Run (Remote Detonator),SB+,-,20.12%,Icebreaker,3524 -Iceberg,Bombing Run (Remote Detonator),SB+,-,20.12%,Chipper, -Iceberg,Bombing Run (Remote Detonator),SB+,-,10.73%,Iceblock, -Iceberg,Bombing Run (Remote Detonator),SB+,-,10.27%,Snow Slinger, -Iceberg,Bombing Run (Remote Detonator),SB+,-,9.59%,Wolfskie, -Iceberg,Bombing Run (Remote Detonator),SB+,-,9.51%,Stickybomber, -Iceberg,Bombing Run (Remote Detonator),SB+,-,9.00%,Saboteur, -Iceberg,Bombing Run (Remote Detonator),SB+,-,5.36%,Snow Bowler, -Iceberg,Bombing Run (Remote Detonator),SB+,-,5.05%,Heavy Blaster, -Iceberg,Bombing Run (Remote Detonator),SB+,-,0.26%,Living Salt, -Iceberg,Bombing Run (Remote Detonator),Gouda,-,20.27%,Chipper,13676 -Iceberg,Bombing Run (Remote Detonator),Gouda,-,19.45%,Icebreaker, -Iceberg,Bombing Run (Remote Detonator),Gouda,-,10.11%,Stickybomber, -Iceberg,Bombing Run (Remote Detonator),Gouda,-,10.06%,Saboteur, -Iceberg,Bombing Run (Remote Detonator),Gouda,-,9.89%,Snow Slinger, -Iceberg,Bombing Run (Remote Detonator),Gouda,-,9.67%,Wolfskie, -Iceberg,Bombing Run (Remote Detonator),Gouda,-,9.65%,Iceblock, -Iceberg,Bombing Run (Remote Detonator),Gouda,-,5.25%,Snow Bowler, -Iceberg,Bombing Run (Remote Detonator),Gouda,-,5.02%,Heavy Blaster, -Iceberg,Bombing Run (Remote Detonator),Gouda,-,0.64%,Living Salt, -Iceberg,Bombing Run (Remote Detonator),Brie,-,20.24%,Chipper,1472 -Iceberg,Bombing Run (Remote Detonator),Brie,-,19.36%,Icebreaker, -Iceberg,Bombing Run (Remote Detonator),Brie,-,10.87%,Wolfskie, -Iceberg,Bombing Run (Remote Detonator),Brie,-,10.87%,Snow Slinger, -Iceberg,Bombing Run (Remote Detonator),Brie,-,9.99%,Saboteur, -Iceberg,Bombing Run (Remote Detonator),Brie,-,8.97%,Stickybomber, -Iceberg,Bombing Run (Remote Detonator),Brie,-,8.22%,Iceblock, -Iceberg,Bombing Run (Remote Detonator),Brie,-,5.23%,Snow Bowler, -Iceberg,Bombing Run (Remote Detonator),Brie,-,5.23%,Heavy Blaster, -Iceberg,Bombing Run (Remote Detonator),Brie,-,1.02%,Living Salt, -Iceberg,The Mad Depths,SB+,-,19.70%,Wolfskie,31638 -Iceberg,The Mad Depths,SB+,-,19.51%,Iceblock, -Iceberg,The Mad Depths,SB+,-,14.80%,Snowblind, -Iceberg,The Mad Depths,SB+,-,14.75%,Iceblade, -Iceberg,The Mad Depths,SB+,-,14.59%,Water Wielder, -Iceberg,The Mad Depths,SB+,-,10.70%,Chipper, -Iceberg,The Mad Depths,SB+,-,5.02%,Snow Bowler, -Iceberg,The Mad Depths,SB+,-,0.94%,Living Salt, -Iceberg,The Mad Depths,Gouda,-,19.37%,Iceblock,124358 -Iceberg,The Mad Depths,Gouda,-,19.22%,Wolfskie, -Iceberg,The Mad Depths,Gouda,-,14.81%,Snowblind, -Iceberg,The Mad Depths,Gouda,-,14.73%,Water Wielder, -Iceberg,The Mad Depths,Gouda,-,14.68%,Iceblade, -Iceberg,The Mad Depths,Gouda,-,10.46%,Chipper, -Iceberg,The Mad Depths,Gouda,-,4.91%,Snow Bowler, -Iceberg,The Mad Depths,Gouda,-,1.83%,Living Salt, -Iceberg,The Mad Depths,Brie,-,18.92%,Wolfskie,10688 -Iceberg,The Mad Depths,Brie,-,18.77%,Iceblock, -Iceberg,The Mad Depths,Brie,-,14.36%,Snowblind, -Iceberg,The Mad Depths,Brie,-,14.18%,Water Wielder, -Iceberg,The Mad Depths,Brie,-,14.05%,Iceblade, -Iceberg,The Mad Depths,Brie,-,9.58%,Chipper, -Iceberg,The Mad Depths,Brie,-,5.63%,Living Salt, -Iceberg,The Mad Depths,Brie,-,4.50%,Snow Bowler, -Iceberg,The Mad Depths (Hearthstone),SB+,-,24.73%,Iceblock,25868 -Iceberg,The Mad Depths (Hearthstone),SB+,-,24.65%,Wolfskie, -Iceberg,The Mad Depths (Hearthstone),SB+,-,19.71%,Snowblind, -Iceberg,The Mad Depths (Hearthstone),SB+,-,14.91%,Chipper, -Iceberg,The Mad Depths (Hearthstone),SB+,-,5.15%,Water Wielder, -Iceberg,The Mad Depths (Hearthstone),SB+,-,4.87%,Iceblade, -Iceberg,The Mad Depths (Hearthstone),SB+,-,4.87%,Snow Bowler, -Iceberg,The Mad Depths (Hearthstone),SB+,-,1.10%,Living Salt, -Iceberg,The Mad Depths (Hearthstone),Gouda,-,24.68%,Wolfskie,52305 -Iceberg,The Mad Depths (Hearthstone),Gouda,-,24.43%,Iceblock, -Iceberg,The Mad Depths (Hearthstone),Gouda,-,19.78%,Snowblind, -Iceberg,The Mad Depths (Hearthstone),Gouda,-,14.82%,Chipper, -Iceberg,The Mad Depths (Hearthstone),Gouda,-,5.07%,Iceblade, -Iceberg,The Mad Depths (Hearthstone),Gouda,-,4.95%,Water Wielder, -Iceberg,The Mad Depths (Hearthstone),Gouda,-,4.91%,Snow Bowler, -Iceberg,The Mad Depths (Hearthstone),Gouda,-,1.36%,Living Salt, -Iceberg,The Mad Depths (Hearthstone),Brie,-,24.66%,Wolfskie,3130 -Iceberg,The Mad Depths (Hearthstone),Brie,-,24.09%,Iceblock, -Iceberg,The Mad Depths (Hearthstone),Brie,-,20.03%,Snowblind, -Iceberg,The Mad Depths (Hearthstone),Brie,-,14.47%,Chipper, -Iceberg,The Mad Depths (Hearthstone),Brie,-,5.02%,Water Wielder, -Iceberg,The Mad Depths (Hearthstone),Brie,-,4.86%,Iceblade, -Iceberg,The Mad Depths (Hearthstone),Brie,-,4.35%,Snow Bowler, -Iceberg,The Mad Depths (Hearthstone),Brie,-,2.52%,Living Salt, -Iceberg,The Mad Depths (Magnet),SB+,-,20.40%,Wolfskie,4019 -Iceberg,The Mad Depths (Magnet),SB+,-,20.30%,Iceblock, -Iceberg,The Mad Depths (Magnet),SB+,-,15.25%,Water Wielder, -Iceberg,The Mad Depths (Magnet),SB+,-,14.93%,Iceblade, -Iceberg,The Mad Depths (Magnet),SB+,-,14.43%,Snowblind, -Iceberg,The Mad Depths (Magnet),SB+,-,9.38%,Chipper, -Iceberg,The Mad Depths (Magnet),SB+,-,4.78%,Snow Bowler, -Iceberg,The Mad Depths (Magnet),SB+,-,0.52%,Living Salt, -Iceberg,The Mad Depths (Magnet),Gouda,-,20.22%,Wolfskie,14750 -Iceberg,The Mad Depths (Magnet),Gouda,-,19.29%,Iceblock, -Iceberg,The Mad Depths (Magnet),Gouda,-,14.99%,Iceblade, -Iceberg,The Mad Depths (Magnet),Gouda,-,14.80%,Snowblind, -Iceberg,The Mad Depths (Magnet),Gouda,-,14.55%,Water Wielder, -Iceberg,The Mad Depths (Magnet),Gouda,-,9.66%,Chipper, -Iceberg,The Mad Depths (Magnet),Gouda,-,4.98%,Snow Bowler, -Iceberg,The Mad Depths (Magnet),Gouda,-,1.51%,Living Salt, -Iceberg,The Mad Depths (Magnet),Brie,-,20.73%,Wolfskie,1042 -Iceberg,The Mad Depths (Magnet),Brie,-,17.95%,Iceblock, -Iceberg,The Mad Depths (Magnet),Brie,-,15.83%,Water Wielder, -Iceberg,The Mad Depths (Magnet),Brie,-,14.68%,Snowblind, -Iceberg,The Mad Depths (Magnet),Brie,-,14.59%,Iceblade, -Iceberg,The Mad Depths (Magnet),Brie,-,8.64%,Chipper, -Iceberg,The Mad Depths (Magnet),Brie,-,5.57%,Snow Bowler, -Iceberg,The Mad Depths (Magnet),Brie,-,2.02%,Living Salt, -Iceberg,Generals,SB+,-,31.50%,Lady Coldsnap,21791 -Iceberg,Generals,SB+,-,31.01%,Princess Fist, -Iceberg,Generals,SB+,-,29.53%,Lord Splodington, -Iceberg,Generals,SB+,-,7.96%,General Drheller, -Iceberg,Generals,Gouda,-,32.10%,Lady Coldsnap,50163 -Iceberg,Generals,Gouda,-,31.92%,Princess Fist, -Iceberg,Generals,Gouda,-,31.61%,Lord Splodington, -Iceberg,Generals,Gouda,-,4.37%,General Drheller, -Iceberg,Generals,Brie,-,33.40%,Princess Fist,13540 -Iceberg,Generals,Brie,-,31.97%,Lord Splodington, -Iceberg,Generals,Brie,-,31.87%,Lady Coldsnap, -Iceberg,Generals,Brie,-,2.75%,General Drheller, -Iceberg,Icewing's Lair,SB+,-,67.59%,Frostlance Guard,18935 -Iceberg,Icewing's Lair,SB+,-,29.69%,Icewing, -Iceberg,Icewing's Lair,SB+,-,2.72%,Frostwing Commander, -Iceberg,Icewing's Lair,Gouda,-,67.86%,Frostlance Guard,22534 -Iceberg,Icewing's Lair,Gouda,-,26.63%,Icewing, -Iceberg,Icewing's Lair,Gouda,-,5.52%,Frostwing Commander, -Iceberg,Icewing's Lair,Brie,-,70.50%,Frostlance Guard,1715 -Iceberg,Icewing's Lair,Brie,-,21.17%,Icewing, -Iceberg,Icewing's Lair,Brie,-,8.34%,Frostwing Commander, -Iceberg,Hidden Depths,SB+,-,35.06%,Living Salt,17802 -Iceberg,Hidden Depths,SB+,-,35.06%,Frostwing Commander, -Iceberg,Hidden Depths,SB+,-,29.87%,Frostlance Guard, -Iceberg,Hidden Depths,Gouda,-,35.02%,Frostwing Commander,3144 -Iceberg,Hidden Depths,Gouda,-,34.13%,Living Salt, -Iceberg,Hidden Depths,Gouda,-,30.85%,Frostlance Guard, -Iceberg,The Deep Lair,SB+/Gouda/Brie,-,100.00%,Deep, King's Arms,-,Gilded,-,24.95%,Burglar,5715 King's Arms,-,Gilded,-,10.60%,Dwarf, King's Arms,-,Gilded,-,10.20%,Pugilist, diff --git a/package.json b/package.json index 45e7c7a9..df51dcb7 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "description": "Assortment of MouseHunt utilities", "scripts": { "\n-- POPULATION DATA --": "", - "ht-pop:iceberg": "node data/pop-iceberg-ht > data/pop-csv/iceberg.csv", "pop:acolyte": "node data/pop acolyte-realm > data/pop-csv/acolyte-realm.csv", "pop:balack": "node data/pop balacks-cove > data/pop-csv/balacks-cove.csv", "pop:beanstalk": "node data/pop bountiful-beanstalk > data/pop-csv/bountiful-beanstalk.csv", @@ -26,6 +25,7 @@ "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:iceberg": "node data/pop iceberg > data/pop-csv/iceberg.csv", "pop:jod": "node data/pop jungle-of-dread > data/pop-csv/jungle-of-dread.csv", "pop:lab": "node data/pop laboratory > data/pop-csv/laboratory.csv", "pop:laby": "node data/pop labyrinth > data/pop-csv/labyrinth.csv", diff --git a/src/bookmarklet/bm-cre.js b/src/bookmarklet/bm-cre.js index 70ee3813..b361020b 100644 --- a/src/bookmarklet/bm-cre.js +++ b/src/bookmarklet/bm-cre.js @@ -125,6 +125,7 @@ } if ( (sublocation === "Treacherous Tunnels" || + sublocation === "Bombing Run" || sublocation === "The Mad Depths") && userBase === "Magnet Base" ) { @@ -134,11 +135,6 @@ userBase === "Hearthstone Base" ) { return sublocation + " (Hearthstone)"; - } else if ( - sublocation === "Bombing Run" && - userBase === "Remote Detonator Base" - ) { - return sublocation + " (Remote Detonator)"; } else if ( (sublocation === "Treacherous Tunnels" || sublocation === "Bombing Run" || diff --git a/src/bookmarklet/bm-setup-fields.js b/src/bookmarklet/bm-setup-fields.js index 4795bd2d..58f18ca4 100644 --- a/src/bookmarklet/bm-setup-fields.js +++ b/src/bookmarklet/bm-setup-fields.js @@ -115,6 +115,7 @@ } if ( (sublocation === "Treacherous Tunnels" || + sublocation === "Bombing Run" || sublocation === "The Mad Depths") && userBase === "Magnet Base" ) { @@ -124,16 +125,12 @@ userBase === "Hearthstone Base" ) { return sublocation + " (Hearthstone)"; - } else if ( - sublocation === "Bombing Run" && - userBase === "Remote Detonator Base" - ) { - return sublocation + " (Remote Detonator)"; } else if ( (sublocation === "Treacherous Tunnels" || sublocation === "Bombing Run" || sublocation === "The Mad Depths") && - userBase === "Ultimate Iceberg Base" + (userBase === "Ultimate Iceberg Base" || + userBase === "Iceberg Boiler Base") ) { return sublocation + " (Ultimate Iceberg)"; } diff --git a/src/main/cre.js b/src/main/cre.js index 8b8d4303..72178fd2 100644 --- a/src/main/cre.js +++ b/src/main/cre.js @@ -837,74 +837,28 @@ function weaponChanged() { } function icebergPhase() { - var autoPhase = ""; - if ( - !!~phaseName.indexOf("Bombing Run") && - baseName === "Remote Detonator Base" - ) - autoPhase = "Bombing Run (Remote Detonator)"; - else if ( - !!~phaseName.indexOf("Bombing Run") && - (baseName === "Ultimate Iceberg Base" || baseName === "Iceberg Boiler Base") - ) - autoPhase = "Bombing Run (Ultimate Iceberg)"; - else if ( - phaseName === "Bombing Run (Remote Detonator)" && - baseName !== "Remote Detonator Base" - ) - autoPhase = "Bombing Run"; - else if ( - phaseName === "Bombing Run (Ultimate Iceberg)" && - (baseName !== "Ultimate Iceberg Base" && baseName !== "Iceberg Boiler Base") - ) - autoPhase = "Bombing Run"; - else if ( - !!~phaseName.indexOf("Treacherous Tunnels") && - baseName === "Magnet Base" - ) - autoPhase = "Treacherous Tunnels (Magnet)"; - else if ( - !!~phaseName.indexOf("Treacherous Tunnels") && - (baseName === "Ultimate Iceberg Base" || baseName === "Iceberg Boiler Base") - ) - autoPhase = "Treacherous Tunnels (Ultimate Iceberg)"; - else if ( - phaseName === "Treacherous Tunnels (Magnet)" && - baseName !== "Magnet Base" - ) - autoPhase = "Treacherous Tunnels"; - else if ( - phaseName === "Treacherous Tunnels (Ultimate Iceberg)" && - (baseName !== "Ultimate Iceberg Base" && baseName !== "Iceberg Boiler Base") - ) - autoPhase = "Treacherous Tunnels"; - else if ( - !!~phaseName.indexOf("The Mad Depths") && - baseName === "Hearthstone Base" - ) - autoPhase = "The Mad Depths (Hearthstone)"; - else if (!!~phaseName.indexOf("The Mad Depths") && baseName === "Magnet Base") - autoPhase = "The Mad Depths (Magnet)"; - else if ( - !!~phaseName.indexOf("The Mad Depths") && - (baseName === "Ultimate Iceberg Base" || baseName === "Iceberg Boiler Base") - ) - autoPhase = "The Mad Depths (Ultimate Iceberg)"; - else if ( - phaseName === "The Mad Depths (Hearthstone)" && - baseName !== "Hearthstone Base" - ) - autoPhase = "The Mad Depths"; - else if ( - phaseName === "The Mad Depths (Magnet)" && - baseName !== "Magnet Base" - ) - autoPhase = "The Mad Depths"; - else if ( - phaseName === "The Mad Depths (Ultimate Iceberg)" && - (baseName !== "Ultimate Iceberg Base" && baseName !== "Iceberg Boiler Base") - ) - autoPhase = "The Mad Depths"; + const magnetBasedEquipped = baseName === "Magnet Base"; + const ultimateBasedEquipped = (baseName === "Ultimate Iceberg Base" || baseName === "Iceberg Boiler Base"); + const hearthstoneBaseEquipped = baseName === "Hearthstone Base"; + + const currentPhase = phaseName.split(" (")[0]; + let autoPhase = currentPhase; + + if (currentPhase === "Treacherous Tunnels" || currentPhase === "Bombing Run") { + if (magnetBasedEquipped) { + autoPhase += " (Magnet)"; + } else if (ultimateBasedEquipped) { + autoPhase += " (Ultimate Iceberg)"; + } + } else if (currentPhase === "The Mad Depths") { + if (magnetBasedEquipped) { + autoPhase += " (Magnet)"; + } else if (hearthstoneBaseEquipped) { + autoPhase += " (Hearthstone)"; + } else if (ultimateBasedEquipped) { + autoPhase += " (Ultimate Iceberg)"; + } + } if (autoPhase !== "") { var phaseSelect = document.getElementById("phase");