From e00676d3a6c1ef1a334635fcb2df51c42d485526 Mon Sep 17 00:00:00 2001 From: bartvdbraak Date: Fri, 26 Apr 2019 16:09:56 +0200 Subject: [PATCH] more bugfixes --- data/chaeldar.csv | 100 +++---- data/konar.csv | 2 +- data/krystilia.csv | 56 ++-- data/monster/monsters.csv | 93 +++++++ data/monster/monsters.json | 554 +++++++++++++++++++++++++++++++++++++ data/monsters.csv | 205 +++++++------- data/monsters.json | 490 +++++++++++++------------------- data/nieve.csv | 2 +- data/vannaka.csv | 2 +- index.html | 18 +- js/script.js | 70 +++-- 11 files changed, 1083 insertions(+), 509 deletions(-) create mode 100644 data/monster/monsters.csv create mode 100644 data/monster/monsters.json diff --git a/data/chaeldar.csv b/data/chaeldar.csv index 0853a49..cda970a 100644 --- a/data/chaeldar.csv +++ b/data/chaeldar.csv @@ -1,50 +1,50 @@ -monster;slayer_req;slayer_req -Aberrant spectres;60;8 -Abyssal demons;85;12 -Aviansies;1;9 -Banshees;15;5 -Basilisks;40;7 -Black demons;1;10 -Bloodvelds;50;8 -Blue dragons;1;8 -Brine rats;47;7 -Bronze dragons;1;11 -Cave crawlers;10;5 -Cave horrors;58;10 -Cave krakens;87;12 -Cave slimes;17;6 -Cockatrices;25;6 -Dagannoths;1;11 -Dust devils;65;9 -Elves;1;8 -Fever spiders;42;7 -Fire giants;1;12 -Fossil Island Wyverns;66;7 -Gargoyles;75;11 -Greater demons1;9 -Harpie Bug Swarms;33;6 -Hellhounds;1;9 -Infernal Mages;45;7 -Iron dragons;1;12 -Jellies;52;10 -Jungle horrors;1;10 -Kalphites;1;11 -Kurasks;70;12 -Lesser demons;1;9 -Lizardmen;1;8 -Lizards;22;5 -Mogres;32;6 -Molanisks;39;6 -Mutated zygomites;57;7 -Nechryaels;80;12 -Pyrefiends;30;6 -Rockslugs;20;5 -Shadow warriors;1;8 -Skeletal Wyverns;72;7 -Spiritual creatures;63;12 -Steel dragon;1;9 -Trolls;1;11 -Turoth;55;10 -TzHaar;1;8 -Wall beasts;35;6 -Wyrms;62;6 \ No newline at end of file +monster,slayer_req,taskweight +Aberrant spectres,60,8 +Abyssal demons,85,12 +Aviansies,1,9 +Banshees,15,5 +Basilisks,40,7 +Black demons,1,10 +Bloodvelds,50,8 +Blue dragons,1,8 +Brine rats,47,7 +Bronze dragons,1,11 +Cave crawlers,10,5 +Cave horrors,58,10 +Cave krakens,87,12 +Cave slimes,17,6 +Cockatrices,25,6 +Dagannoths,1,11 +Dust devils,65,9 +Elves,1,8 +Fever spiders,42,7 +Fire giants,1,12 +Fossil Island Wyverns,66,7 +Gargoyles,75,11 +Greater demons,1,9 +Harpie Bug Swarms,33,6 +Hellhounds,1,9 +Infernal Mages,45,7 +Iron dragons,1,12 +Jellies,52,10 +Jungle horrors,1,10 +Kalphites,1,11 +Kurasks,70,12 +Lesser demons,1,9 +Lizardmen,1,8 +Lizards,22,5 +Mogres,32,6 +Molanisks,39,6 +Mutated zygomites,57,7 +Nechryaels,80,12 +Pyrefiends,30,6 +Rockslugs,20,5 +Shadow warriors,1,8 +Skeletal Wyverns,72,7 +Spiritual creatures,63,12 +Steel dragon,1,9 +Trolls,1,11 +Turoths,55,10 +TzHaar,1,8 +Wall beasts,35,6 +Wyrms,62,6 diff --git a/data/konar.csv b/data/konar.csv index 9169eb6..64615e8 100644 --- a/data/konar.csv +++ b/data/konar.csv @@ -8,7 +8,7 @@ Black demons,1,9 Black dragons,1,6 Bloodvelds,50,9 Blue dragons,1,4 -Boss,1,8 +Bosses,1,8 Brine rats,47,2 Bronze dragons,1,5 Cave krakens,87,9 diff --git a/data/krystilia.csv b/data/krystilia.csv index a3c4908..2640623 100644 --- a/data/krystilia.csv +++ b/data/krystilia.csv @@ -1,28 +1,28 @@ -monster,taskweight,slayer_req -Ankou,6,1 -Aviansie,7,1 -Bandit,4,1 -Bear,6,1 -Black demon,7,1 -Black dragon,4,1 -Chaos druid,5,1 -Dark warrior,4,1 -Earth warrior,6,1 -Ent,5,1 -Fire giant,7,1 -Greater demon,8,1 -Green dragon,4,1 -Hellhound,7,1 -Ice giant,6,1 -Ice warrior,7,1 -Lava dragon,3,1 -Lesser demon,6,1 -Magic axe,7,1 -Mammoth,6,1 -Revenant,5,1 -Rogue,5,1 -Scorpion,6,1 -Skeleton,5,1 -Spider,6,1 -Spiritual creatures,6,63 -Bosses,8,1 +monster,slayer_req,taskweight +Ankous,1,6 +Aviansies,1,7 +Bandits,1,4 +Bears,1,6 +Black demons,1,7 +Black dragons,1,4 +Chaos druids,1,5 +Dark warriors,1,4 +Earth warriors,1,6 +Ents,1,5 +Fire giants,1,7 +Greater demons,1,8 +Green dragons,1,4 +Hellhounds,1,7 +Ice giants,1,6 +Ice warriors,1,7 +Lava dragons,1,3 +Lesser demons,1,6 +Magic axes,1,7 +Mammoths,1,6 +Revenants,1,5 +Rogues,1,5 +Scorpions,1,6 +Skeletons,1,5 +Spiders,1,6 +Spiritual creatures,63,6 +Bosses,1,8 diff --git a/data/monster/monsters.csv b/data/monster/monsters.csv new file mode 100644 index 0000000..4d63e93 --- /dev/null +++ b/data/monster/monsters.csv @@ -0,0 +1,93 @@ +id,monster,slayer_req,masters +0,Aberrant spectres,60,"3, 4, 5, 6" +1,Abyssal demons,85,"5, 6" +2,Ankous,1,"3, 5, 6" +3,Banshees,15,"1, 2, 3, 4, 5" +4,Basilisks,40,"3, 4, 5" +5,Bats,1,"1, 2" +6,Bears,1,"1, 2" +7,Birds,1,1 +8,Black demons,1,"4, 5, 6" +9,Black dragons,1,"5, 6" +10,Bloodvelds,50,"3, 4, 5, 6" +11,Blue dragons,1,"3, 4, 5" +12,Brine rats,47,"3, 4, 5, 6" +13,Bronze dragons,1,"3, 4" +14,Catablepon,1,2 +15,Cave bugs,7,1 +16,Cave crawlers,10,"2, 4" +17,Cave horrors,58,"4, 5, 6" +18,Cave slimes,17,"1, 2, 4" +19,Cockatrices,25,"2, 3" +20,Cows,1,1 +21,Crawling Hands,5,"1, 2, 4" +22,Crocodiles,1,3 +23,Dagannoths,1,"4, 5, 6" +24,Dark beasts,90,"6, 5" +25,Dogs,1,"1, 2" +26,Dust devils,65,"3, 4, 5, 6" +27,Dwarfs,1,1 +28,Earth Warriors,1,3 +29,Elves,1,"3, 4, 5, 6" +30,Fever spiders,42,4 +31,Fire giants,1,"4, 5, 6" +32,Flesh Crawlers,1,2 +33,Fossil Island wyverns,66,"4, 5, 6" +34,Gargoyles,75,"4, 5, 6" +35,Ghosts,1,"1, 2" +36,Ghouls,1,"2, 3" +37,Goblins,1,1 +38,Goraks,1,6 +39,Greater demons,1,"4, 5, 6" +40,Green dragons,1,3 +41,Harpie bug swarms,33,"3, 4, 6" +42,Hellhounds,1,"4, 5, 6" +43,Hill Giant,1,"2, 3" +44,Hobgoblins,1,2 +45,Hydras,95,7 +46,Icefiends,1,1 +47,Ice giants,1,3 +48,Ice warriors,1,"2, 3" +49,Infernal Mages,45,"2, 3, 4, 6" +50,Iron dragons,1,"4, 5, 6" +51,Jellies,52,"3, 4, 6" +52,Jungle horrors,1,"3, 4, 6" +53,Lizardmen,1,"4, 5, 6" +54,Lizards,22,"1, 2, 4" +55,Kalphites,1,"2, 4, 5, 6" +56,Killerwatts,37,"2, 3" +57,Kurasks,70,4 +58,Lesser demons,1,"3, 4" +59,Mithril dragons,1,"5, 6" +60,Minotaurs,1,1 +61,Mogres,32,"2, 3" +62,Molanisks,39,3 +63,Monkeys,1,1 +64,Moss giants,1,3 +65,Nechryaels,80,"5, 6" +66,Ogres,1,3 +67,Otherworldly beings,1,3 +68,Pyrefiends,30,"2, 3" +69,Red dragons,1,"5, 6" +70,Rockslugs,20,2 +71,Scabarites,1,"5, 6" +72,Scorpions,1,1 +73,Sea snakes,1,3 +74,Shades,1,3 +75,Shadow warriors,1,"3, 4" +76,Skeletal Wyverns,72,"5, 6" +77,Skeletons,1,"1, 2" +78,Smoke devils,93,"5, 6" +79,Spiders,1,1 +80,Steel dragons,1,"4, 5, 6" +81,Suqahs,1,"5, 6" +82,Terror dogs,40,3 +83,Trolls,1,"3, 4, 5, 6" +84,Turoths,55,"3, 4, 5" +85,Vampyres,1,"2, 3" +86,Wall beasts,35,2 +87,Waterfiends,1,5 +88,Werewolves,1,3 +89,Wolves,1,"1, 2" +90,Zombies,1,"1, 2" +91,Zygomites,57,"4, 5, 6" diff --git a/data/monster/monsters.json b/data/monster/monsters.json new file mode 100644 index 0000000..505d25a --- /dev/null +++ b/data/monster/monsters.json @@ -0,0 +1,554 @@ +[ + { + "id": 0, + "monster": "Aberrant spectres", + "slayer_req": 60, + "masters": "3, 4, 5, 6" + }, + { + "id": 1, + "monster": "Abyssal demons", + "slayer_req": 85, + "masters": "5, 6" + }, + { + "id": 2, + "monster": "Ankous", + "slayer_req": 1, + "masters": "3, 5, 6" + }, + { + "id": 3, + "monster": "Banshees", + "slayer_req": 15, + "masters": "1, 2, 3, 4, 5" + }, + { + "id": 4, + "monster": "Basilisks", + "slayer_req": 40, + "masters": "3, 4, 5" + }, + { + "id": 5, + "monster": "Bats", + "slayer_req": 1, + "masters": "1, 2" + }, + { + "id": 6, + "monster": "Bears", + "slayer_req": 1, + "masters": "1, 2" + }, + { + "id": 7, + "monster": "Birds", + "slayer_req": 1, + "masters": 1 + }, + { + "id": 8, + "monster": "Black demons", + "slayer_req": 1, + "masters": "4, 5, 6" + }, + { + "id": 9, + "monster": "Black dragons", + "slayer_req": 1, + "masters": "5, 6" + }, + { + "id": 10, + "monster": "Bloodvelds", + "slayer_req": 50, + "masters": "3, 4, 5, 6" + }, + { + "id": 11, + "monster": "Blue dragons", + "slayer_req": 1, + "masters": "3, 4, 5" + }, + { + "id": 12, + "monster": "Brine rats", + "slayer_req": 47, + "masters": "3, 4, 5, 6" + }, + { + "id": 13, + "monster": "Bronze dragons", + "slayer_req": 1, + "masters": "3, 4" + }, + { + "id": 14, + "monster": "Catablepons", + "slayer_req": 1, + "masters": 2 + }, + { + "id": 15, + "monster": "Cave bugs", + "slayer_req": 7, + "masters": 1 + }, + { + "id": 16, + "monster": "Cave crawlers", + "slayer_req": 10, + "masters": "2, 4" + }, + { + "id": 17, + "monster": "Cave horrors", + "slayer_req": 58, + "masters": "4, 5, 6" + }, + { + "id": 18, + "monster": "Cave slimes", + "slayer_req": 17, + "masters": "1, 2, 4" + }, + { + "id": 19, + "monster": "Cockatrices", + "slayer_req": 25, + "masters": "2, 3" + }, + { + "id": 20, + "monster": "Cows", + "slayer_req": 1, + "masters": 1 + }, + { + "id": 21, + "monster": "Crawling hands", + "slayer_req": 5, + "masters": "1, 2, 4" + }, + { + "id": 22, + "monster": "Crocodiles", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 23, + "monster": "Dagannoths", + "slayer_req": 1, + "masters": "4, 5, 6" + }, + { + "id": 24, + "monster": "Dark beasts", + "slayer_req": 90, + "masters": "6, 5" + }, + { + "id": 25, + "monster": "Dogs", + "slayer_req": 1, + "masters": "1, 2" + }, + { + "id": 26, + "monster": "Dust devils", + "slayer_req": 65, + "masters": "3, 4, 5, 6" + }, + { + "id": 27, + "monster": "Dwarfs", + "slayer_req": 1, + "masters": 1 + }, + { + "id": 28, + "monster": "Earth warriors", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 29, + "monster": "Elves", + "slayer_req": 1, + "masters": "3, 4, 5, 6" + }, + { + "id": 30, + "monster": "Fever spiders", + "slayer_req": 42, + "masters": 4 + }, + { + "id": 31, + "monster": "Fire giants", + "slayer_req": 1, + "masters": "4, 5, 6" + }, + { + "id": 32, + "monster": "Flesh crawlers", + "slayer_req": 1, + "masters": 2 + }, + { + "id": 33, + "monster": "Fossil Island wyverns", + "slayer_req": 66, + "masters": "4, 5, 6" + }, + { + "id": 34, + "monster": "Gargoyles", + "slayer_req": 75, + "masters": "4, 5, 6" + }, + { + "id": 35, + "monster": "Ghosts", + "slayer_req": 1, + "masters": "1, 2" + }, + { + "id": 36, + "monster": "Ghouls", + "slayer_req": 1, + "masters": "2, 3" + }, + { + "id": 37, + "monster": "Goblins", + "slayer_req": 1, + "masters": 1 + }, + { + "id": 38, + "monster": "Goraks", + "slayer_req": 1, + "masters": 6 + }, + { + "id": 39, + "monster": "Greater demons", + "slayer_req": 1, + "masters": "4, 5, 6" + }, + { + "id": 40, + "monster": "Green dragons", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 41, + "monster": "Harpie bug swarms", + "slayer_req": 33, + "masters": "3, 4, 6" + }, + { + "id": 42, + "monster": "Hellhounds", + "slayer_req": 1, + "masters": "4, 5, 6" + }, + { + "id": 43, + "monster": "Hill Giant", + "slayer_req": 1, + "masters": "2, 3" + }, + { + "id": 44, + "monster": "Hobgoblins", + "slayer_req": 1, + "masters": 2 + }, + { + "id": 45, + "monster": "Hydras", + "slayer_req": 95, + "masters": 7 + }, + { + "id": 46, + "monster": "Icefiends", + "slayer_req": 1, + "masters": 1 + }, + { + "id": 47, + "monster": "Ice giants", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 48, + "monster": "Ice warriors", + "slayer_req": 1, + "masters": "2, 3" + }, + { + "id": 49, + "monster": "Infernal Mages", + "slayer_req": 45, + "masters": "2, 3, 4, 6" + }, + { + "id": 50, + "monster": "Iron dragons", + "slayer_req": 1, + "masters": "4, 5, 6" + }, + { + "id": 51, + "monster": "Jellies", + "slayer_req": 52, + "masters": "3, 4, 6" + }, + { + "id": 52, + "monster": "Jungle horrors", + "slayer_req": 1, + "masters": "3, 4, 6" + }, + { + "id": 53, + "monster": "Lizardmen", + "slayer_req": 1, + "masters": "4, 5, 6" + }, + { + "id": 54, + "monster": "Lizards", + "slayer_req": 22, + "masters": "1, 2, 4" + }, + { + "id": 55, + "monster": "Kalphites", + "slayer_req": 1, + "masters": "2, 4, 5, 6" + }, + { + "id": 56, + "monster": "Killerwatts", + "slayer_req": 37, + "masters": "2, 3" + }, + { + "id": 57, + "monster": "Kurasks", + "slayer_req": 70, + "masters": 4 + }, + { + "id": 58, + "monster": "Lesser demons", + "slayer_req": 1, + "masters": "3, 4" + }, + { + "id": 59, + "monster": "Mithril dragons", + "slayer_req": 1, + "masters": "5, 6" + }, + { + "id": 60, + "monster": "Minotaurs", + "slayer_req": 1, + "masters": 1 + }, + { + "id": 61, + "monster": "Mogres", + "slayer_req": 32, + "masters": "2, 3" + }, + { + "id": 62, + "monster": "Molanisks", + "slayer_req": 39, + "masters": 3 + }, + { + "id": 63, + "monster": "Monkeys", + "slayer_req": 1, + "masters": 1 + }, + { + "id": 64, + "monster": "Moss giants", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 65, + "monster": "Nechryaels", + "slayer_req": 80, + "masters": "5, 6" + }, + { + "id": 66, + "monster": "Ogres", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 67, + "monster": "Otherworldly beings", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 68, + "monster": "Pyrefiends", + "slayer_req": 30, + "masters": "2, 3" + }, + { + "id": 69, + "monster": "Red dragons", + "slayer_req": 1, + "masters": "5, 6" + }, + { + "id": 70, + "monster": "Rockslugs", + "slayer_req": 20, + "masters": 2 + }, + { + "id": 71, + "monster": "Scabarites", + "slayer_req": 1, + "masters": "5, 6" + }, + { + "id": 72, + "monster": "Scorpions", + "slayer_req": 1, + "masters": 1 + }, + { + "id": 73, + "monster": "Sea snakes", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 74, + "monster": "Shades", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 75, + "monster": "Shadow warriors", + "slayer_req": 1, + "masters": "3, 4" + }, + { + "id": 76, + "monster": "Skeletal Wyverns", + "slayer_req": 72, + "masters": "5, 6" + }, + { + "id": 77, + "monster": "Skeletons", + "slayer_req": 1, + "masters": "1, 2" + }, + { + "id": 78, + "monster": "Smoke devils", + "slayer_req": 93, + "masters": "5, 6" + }, + { + "id": 79, + "monster": "Spiders", + "slayer_req": 1, + "masters": 1 + }, + { + "id": 80, + "monster": "Steel dragons", + "slayer_req": 1, + "masters": "4, 5, 6" + }, + { + "id": 81, + "monster": "Suqahs", + "slayer_req": 1, + "masters": "5, 6" + }, + { + "id": 82, + "monster": "Terror dogs", + "slayer_req": 40, + "masters": 3 + }, + { + "id": 83, + "monster": "Trolls", + "slayer_req": 1, + "masters": "3, 4, 5, 6" + }, + { + "id": 84, + "monster": "Turoths", + "slayer_req": 55, + "masters": "3, 4, 5" + }, + { + "id": 85, + "monster": "Vampyres", + "slayer_req": 1, + "masters": "2, 3" + }, + { + "id": 86, + "monster": "Wall beasts", + "slayer_req": 35, + "masters": 2 + }, + { + "id": 87, + "monster": "Waterfiends", + "slayer_req": 1, + "masters": 5 + }, + { + "id": 88, + "monster": "Werewolves", + "slayer_req": 1, + "masters": 3 + }, + { + "id": 89, + "monster": "Wolves", + "slayer_req": 1, + "masters": "1, 2" + }, + { + "id": 90, + "monster": "Zombies", + "slayer_req": 1, + "masters": "1, 2" + }, + { + "id": 91, + "monster": "Zygomites", + "slayer_req": 57, + "masters": "4, 5, 6" + } +] \ No newline at end of file diff --git a/data/monsters.csv b/data/monsters.csv index 4d63e93..c2c7640 100644 --- a/data/monsters.csv +++ b/data/monsters.csv @@ -1,93 +1,112 @@ -id,monster,slayer_req,masters -0,Aberrant spectres,60,"3, 4, 5, 6" -1,Abyssal demons,85,"5, 6" -2,Ankous,1,"3, 5, 6" -3,Banshees,15,"1, 2, 3, 4, 5" -4,Basilisks,40,"3, 4, 5" -5,Bats,1,"1, 2" -6,Bears,1,"1, 2" -7,Birds,1,1 -8,Black demons,1,"4, 5, 6" -9,Black dragons,1,"5, 6" -10,Bloodvelds,50,"3, 4, 5, 6" -11,Blue dragons,1,"3, 4, 5" -12,Brine rats,47,"3, 4, 5, 6" -13,Bronze dragons,1,"3, 4" -14,Catablepon,1,2 -15,Cave bugs,7,1 -16,Cave crawlers,10,"2, 4" -17,Cave horrors,58,"4, 5, 6" -18,Cave slimes,17,"1, 2, 4" -19,Cockatrices,25,"2, 3" -20,Cows,1,1 -21,Crawling Hands,5,"1, 2, 4" -22,Crocodiles,1,3 -23,Dagannoths,1,"4, 5, 6" -24,Dark beasts,90,"6, 5" -25,Dogs,1,"1, 2" -26,Dust devils,65,"3, 4, 5, 6" -27,Dwarfs,1,1 -28,Earth Warriors,1,3 -29,Elves,1,"3, 4, 5, 6" -30,Fever spiders,42,4 -31,Fire giants,1,"4, 5, 6" -32,Flesh Crawlers,1,2 -33,Fossil Island wyverns,66,"4, 5, 6" -34,Gargoyles,75,"4, 5, 6" -35,Ghosts,1,"1, 2" -36,Ghouls,1,"2, 3" -37,Goblins,1,1 -38,Goraks,1,6 -39,Greater demons,1,"4, 5, 6" -40,Green dragons,1,3 -41,Harpie bug swarms,33,"3, 4, 6" -42,Hellhounds,1,"4, 5, 6" -43,Hill Giant,1,"2, 3" -44,Hobgoblins,1,2 -45,Hydras,95,7 -46,Icefiends,1,1 -47,Ice giants,1,3 -48,Ice warriors,1,"2, 3" -49,Infernal Mages,45,"2, 3, 4, 6" -50,Iron dragons,1,"4, 5, 6" -51,Jellies,52,"3, 4, 6" -52,Jungle horrors,1,"3, 4, 6" -53,Lizardmen,1,"4, 5, 6" -54,Lizards,22,"1, 2, 4" -55,Kalphites,1,"2, 4, 5, 6" -56,Killerwatts,37,"2, 3" -57,Kurasks,70,4 -58,Lesser demons,1,"3, 4" -59,Mithril dragons,1,"5, 6" -60,Minotaurs,1,1 -61,Mogres,32,"2, 3" -62,Molanisks,39,3 -63,Monkeys,1,1 -64,Moss giants,1,3 -65,Nechryaels,80,"5, 6" -66,Ogres,1,3 -67,Otherworldly beings,1,3 -68,Pyrefiends,30,"2, 3" -69,Red dragons,1,"5, 6" -70,Rockslugs,20,2 -71,Scabarites,1,"5, 6" -72,Scorpions,1,1 -73,Sea snakes,1,3 -74,Shades,1,3 -75,Shadow warriors,1,"3, 4" -76,Skeletal Wyverns,72,"5, 6" -77,Skeletons,1,"1, 2" -78,Smoke devils,93,"5, 6" -79,Spiders,1,1 -80,Steel dragons,1,"4, 5, 6" -81,Suqahs,1,"5, 6" -82,Terror dogs,40,3 -83,Trolls,1,"3, 4, 5, 6" -84,Turoths,55,"3, 4, 5" -85,Vampyres,1,"2, 3" -86,Wall beasts,35,2 -87,Waterfiends,1,5 -88,Werewolves,1,3 -89,Wolves,1,"1, 2" -90,Zombies,1,"1, 2" -91,Zygomites,57,"4, 5, 6" +monster,slayer_req +Aberrant spectres,60 +Abyssal demons,85 +Adamant dragons,1 +Ankous,1 +Aviansies,1 +Bandits,1 +Banshees,15 +Basilisks,40 +Bats,1 +Bears,1 +Birds,1 +Black demons,1 +Black dragons,1 +Bloodvelds,50 +Blue dragons,1 +Bosses,1 +Brine rats,47 +Bronze dragons,1 +Catablepons,1 +Cave bugs,7 +Cave crawlers,10 +Cave horrors,58 +Cave krakens,87 +Cave slimes,17 +Chaos druids,1 +Cockatrices,25 +Cows,1 +Crawling Hands,5 +Crocodiles,1 +Dagannoths,1 +Dark beasts,90 +Dark warriors,1 +Dogs,1 +Drakes,84 +Dust devils,65 +Dwarves,1 +Earth warriors,1 +Elves,1 +Ents,1 +Fever spiders,42 +Fire giants,1 +Flesh Crawlers,1 +Fossil Island Wyverns,66 +Gargoyles,75 +Ghosts,1 +Ghouls,1 +Goblins,1 +Greater demons,1 +Green dragons,1 +Harpie Bug Swarms,33 +Hellhounds,1 +Hill Giants,1 +Hobgoblins,1 +Hydras,95 +Ice giants,1 +Ice warriors,1 +Icefiends,1 +Infernal Mages,45 +Iron dragons,1 +Jellies,52 +Jungle horrors,1 +Kalphites,1 +Killerwatts,37 +Kurasks,70 +Lava dragons,1 +Lesser demons,1 +Lizardmen,1 +Lizards,22 +Magic axes,1 +Mammoths,1 +Minions of Scabaras,1 +Minotaurs,1 +Mithril dragons,1 +Mogres,32 +Molanisks,39 +Monkeys,1 +Moss giants,1 +Mutated zygomites,57 +Nechryaels,80 +Ogres,1 +Otherworldly beings,1 +Pyrefiends,30 +Rats,1 +Red dragons,1 +Revenants,1 +Rockslugs,20 +Rogues,1 +Rune dragons,1 +Scorpions,1 +Sea snakes,40 +Shades,1 +Shadow warriors,1 +Skeletal Wyverns,72 +Skeletons,1 +Smoke devils,93 +Spiders,1 +Spiritual creatures,63 +Steel dragon,1 +Steel dragons,1 +Suqahs,1 +Terror dogs,40 +Trolls,1 +Turoths,55 +TzHaar,1 +Vampyres,1 +Wall beasts,35 +Waterfiends,1 +Werewolves,1 +Wolves,1 +Wyrms,62 +Zombies,1 diff --git a/data/monsters.json b/data/monsters.json index 505d25a..434c713 100644 --- a/data/monsters.json +++ b/data/monsters.json @@ -1,554 +1,446 @@ [ { - "id": 0, "monster": "Aberrant spectres", - "slayer_req": 60, - "masters": "3, 4, 5, 6" + "slayer_req": 60 }, { - "id": 1, "monster": "Abyssal demons", - "slayer_req": 85, - "masters": "5, 6" + "slayer_req": 85 + }, + { + "monster": "Adamant dragons", + "slayer_req": 1 }, { - "id": 2, "monster": "Ankous", - "slayer_req": 1, - "masters": "3, 5, 6" + "slayer_req": 1 + }, + { + "monster": "Aviansies", + "slayer_req": 1 + }, + { + "monster": "Bandits", + "slayer_req": 1 }, { - "id": 3, "monster": "Banshees", - "slayer_req": 15, - "masters": "1, 2, 3, 4, 5" + "slayer_req": 15 }, { - "id": 4, "monster": "Basilisks", - "slayer_req": 40, - "masters": "3, 4, 5" + "slayer_req": 40 }, { - "id": 5, "monster": "Bats", - "slayer_req": 1, - "masters": "1, 2" + "slayer_req": 1 }, { - "id": 6, "monster": "Bears", - "slayer_req": 1, - "masters": "1, 2" + "slayer_req": 1 }, { - "id": 7, "monster": "Birds", - "slayer_req": 1, - "masters": 1 + "slayer_req": 1 }, { - "id": 8, "monster": "Black demons", - "slayer_req": 1, - "masters": "4, 5, 6" + "slayer_req": 1 }, { - "id": 9, "monster": "Black dragons", - "slayer_req": 1, - "masters": "5, 6" + "slayer_req": 1 }, { - "id": 10, "monster": "Bloodvelds", - "slayer_req": 50, - "masters": "3, 4, 5, 6" + "slayer_req": 50 }, { - "id": 11, "monster": "Blue dragons", - "slayer_req": 1, - "masters": "3, 4, 5" + "slayer_req": 1 + }, + { + "monster": "Bosses", + "slayer_req": 1 }, { - "id": 12, "monster": "Brine rats", - "slayer_req": 47, - "masters": "3, 4, 5, 6" + "slayer_req": 47 }, { - "id": 13, "monster": "Bronze dragons", - "slayer_req": 1, - "masters": "3, 4" + "slayer_req": 1 }, { - "id": 14, "monster": "Catablepons", - "slayer_req": 1, - "masters": 2 + "slayer_req": 1 }, { - "id": 15, "monster": "Cave bugs", - "slayer_req": 7, - "masters": 1 + "slayer_req": 7 }, { - "id": 16, "monster": "Cave crawlers", - "slayer_req": 10, - "masters": "2, 4" + "slayer_req": 10 }, { - "id": 17, "monster": "Cave horrors", - "slayer_req": 58, - "masters": "4, 5, 6" + "slayer_req": 58 + }, + { + "monster": "Cave krakens", + "slayer_req": 87 }, { - "id": 18, "monster": "Cave slimes", - "slayer_req": 17, - "masters": "1, 2, 4" + "slayer_req": 17 + }, + { + "monster": "Chaos druids", + "slayer_req": 1 }, { - "id": 19, "monster": "Cockatrices", - "slayer_req": 25, - "masters": "2, 3" + "slayer_req": 25 }, { - "id": 20, "monster": "Cows", - "slayer_req": 1, - "masters": 1 + "slayer_req": 1 }, { - "id": 21, - "monster": "Crawling hands", - "slayer_req": 5, - "masters": "1, 2, 4" + "monster": "Crawling Hands", + "slayer_req": 5 }, { - "id": 22, "monster": "Crocodiles", - "slayer_req": 1, - "masters": 3 + "slayer_req": 1 }, { - "id": 23, "monster": "Dagannoths", - "slayer_req": 1, - "masters": "4, 5, 6" + "slayer_req": 1 }, { - "id": 24, "monster": "Dark beasts", - "slayer_req": 90, - "masters": "6, 5" + "slayer_req": 90 + }, + { + "monster": "Dark warriors", + "slayer_req": 1 }, { - "id": 25, "monster": "Dogs", - "slayer_req": 1, - "masters": "1, 2" + "slayer_req": 1 + }, + { + "monster": "Drakes", + "slayer_req": 84 }, { - "id": 26, "monster": "Dust devils", - "slayer_req": 65, - "masters": "3, 4, 5, 6" + "slayer_req": 65 }, { - "id": 27, - "monster": "Dwarfs", - "slayer_req": 1, - "masters": 1 + "monster": "Dwarves", + "slayer_req": 1 }, { - "id": 28, "monster": "Earth warriors", - "slayer_req": 1, - "masters": 3 + "slayer_req": 1 }, { - "id": 29, "monster": "Elves", - "slayer_req": 1, - "masters": "3, 4, 5, 6" + "slayer_req": 1 + }, + { + "monster": "Ents", + "slayer_req": 1 }, { - "id": 30, "monster": "Fever spiders", - "slayer_req": 42, - "masters": 4 + "slayer_req": 42 }, { - "id": 31, "monster": "Fire giants", - "slayer_req": 1, - "masters": "4, 5, 6" + "slayer_req": 1 }, { - "id": 32, - "monster": "Flesh crawlers", - "slayer_req": 1, - "masters": 2 + "monster": "Flesh Crawlers", + "slayer_req": 1 }, { - "id": 33, - "monster": "Fossil Island wyverns", - "slayer_req": 66, - "masters": "4, 5, 6" + "monster": "Fossil Island Wyverns", + "slayer_req": 66 }, { - "id": 34, "monster": "Gargoyles", - "slayer_req": 75, - "masters": "4, 5, 6" + "slayer_req": 75 }, { - "id": 35, "monster": "Ghosts", - "slayer_req": 1, - "masters": "1, 2" + "slayer_req": 1 }, { - "id": 36, "monster": "Ghouls", - "slayer_req": 1, - "masters": "2, 3" + "slayer_req": 1 }, { - "id": 37, "monster": "Goblins", - "slayer_req": 1, - "masters": 1 + "slayer_req": 1 }, { - "id": 38, - "monster": "Goraks", - "slayer_req": 1, - "masters": 6 - }, - { - "id": 39, "monster": "Greater demons", - "slayer_req": 1, - "masters": "4, 5, 6" + "slayer_req": 1 }, { - "id": 40, "monster": "Green dragons", - "slayer_req": 1, - "masters": 3 + "slayer_req": 1 }, { - "id": 41, - "monster": "Harpie bug swarms", - "slayer_req": 33, - "masters": "3, 4, 6" + "monster": "Harpie Bug Swarms", + "slayer_req": 33 }, { - "id": 42, "monster": "Hellhounds", - "slayer_req": 1, - "masters": "4, 5, 6" + "slayer_req": 1 }, { - "id": 43, - "monster": "Hill Giant", - "slayer_req": 1, - "masters": "2, 3" + "monster": "Hill Giants", + "slayer_req": 1 }, { - "id": 44, "monster": "Hobgoblins", - "slayer_req": 1, - "masters": 2 + "slayer_req": 1 }, { - "id": 45, "monster": "Hydras", - "slayer_req": 95, - "masters": 7 + "slayer_req": 95 }, { - "id": 46, - "monster": "Icefiends", - "slayer_req": 1, - "masters": 1 - }, - { - "id": 47, "monster": "Ice giants", - "slayer_req": 1, - "masters": 3 + "slayer_req": 1 }, { - "id": 48, "monster": "Ice warriors", - "slayer_req": 1, - "masters": "2, 3" + "slayer_req": 1 + }, + { + "monster": "Icefiends", + "slayer_req": 1 }, { - "id": 49, "monster": "Infernal Mages", - "slayer_req": 45, - "masters": "2, 3, 4, 6" + "slayer_req": 45 }, { - "id": 50, "monster": "Iron dragons", - "slayer_req": 1, - "masters": "4, 5, 6" + "slayer_req": 1 }, { - "id": 51, "monster": "Jellies", - "slayer_req": 52, - "masters": "3, 4, 6" + "slayer_req": 52 }, { - "id": 52, "monster": "Jungle horrors", - "slayer_req": 1, - "masters": "3, 4, 6" + "slayer_req": 1 }, { - "id": 53, - "monster": "Lizardmen", - "slayer_req": 1, - "masters": "4, 5, 6" - }, - { - "id": 54, - "monster": "Lizards", - "slayer_req": 22, - "masters": "1, 2, 4" - }, - { - "id": 55, "monster": "Kalphites", - "slayer_req": 1, - "masters": "2, 4, 5, 6" + "slayer_req": 1 }, { - "id": 56, "monster": "Killerwatts", - "slayer_req": 37, - "masters": "2, 3" + "slayer_req": 37 }, { - "id": 57, "monster": "Kurasks", - "slayer_req": 70, - "masters": 4 + "slayer_req": 70 + }, + { + "monster": "Lava dragons", + "slayer_req": 1 }, { - "id": 58, "monster": "Lesser demons", - "slayer_req": 1, - "masters": "3, 4" + "slayer_req": 1 }, { - "id": 59, - "monster": "Mithril dragons", - "slayer_req": 1, - "masters": "5, 6" + "monster": "Lizardmen", + "slayer_req": 1 + }, + { + "monster": "Lizards", + "slayer_req": 22 + }, + { + "monster": "Magic axes", + "slayer_req": 1 + }, + { + "monster": "Mammoths", + "slayer_req": 1 + }, + { + "monster": "Minions of Scabaras", + "slayer_req": 1 }, { - "id": 60, "monster": "Minotaurs", - "slayer_req": 1, - "masters": 1 + "slayer_req": 1 + }, + { + "monster": "Mithril dragons", + "slayer_req": 1 }, { - "id": 61, "monster": "Mogres", - "slayer_req": 32, - "masters": "2, 3" + "slayer_req": 32 }, { - "id": 62, "monster": "Molanisks", - "slayer_req": 39, - "masters": 3 + "slayer_req": 39 }, { - "id": 63, "monster": "Monkeys", - "slayer_req": 1, - "masters": 1 + "slayer_req": 1 }, { - "id": 64, "monster": "Moss giants", - "slayer_req": 1, - "masters": 3 + "slayer_req": 1 + }, + { + "monster": "Mutated zygomites", + "slayer_req": 57 }, { - "id": 65, "monster": "Nechryaels", - "slayer_req": 80, - "masters": "5, 6" + "slayer_req": 80 }, { - "id": 66, "monster": "Ogres", - "slayer_req": 1, - "masters": 3 + "slayer_req": 1 }, { - "id": 67, "monster": "Otherworldly beings", - "slayer_req": 1, - "masters": 3 + "slayer_req": 1 }, { - "id": 68, "monster": "Pyrefiends", - "slayer_req": 30, - "masters": "2, 3" + "slayer_req": 30 + }, + { + "monster": "Rats", + "slayer_req": 1 }, { - "id": 69, "monster": "Red dragons", - "slayer_req": 1, - "masters": "5, 6" + "slayer_req": 1 + }, + { + "monster": "Revenants", + "slayer_req": 1 }, { - "id": 70, "monster": "Rockslugs", - "slayer_req": 20, - "masters": 2 + "slayer_req": 20 }, { - "id": 71, - "monster": "Scabarites", - "slayer_req": 1, - "masters": "5, 6" + "monster": "Rogues", + "slayer_req": 1 + }, + { + "monster": "Rune dragons", + "slayer_req": 1 }, { - "id": 72, "monster": "Scorpions", - "slayer_req": 1, - "masters": 1 + "slayer_req": 1 }, { - "id": 73, "monster": "Sea snakes", - "slayer_req": 1, - "masters": 3 + "slayer_req": 40 }, { - "id": 74, "monster": "Shades", - "slayer_req": 1, - "masters": 3 + "slayer_req": 1 }, { - "id": 75, "monster": "Shadow warriors", - "slayer_req": 1, - "masters": "3, 4" + "slayer_req": 1 }, { - "id": 76, "monster": "Skeletal Wyverns", - "slayer_req": 72, - "masters": "5, 6" + "slayer_req": 72 }, { - "id": 77, "monster": "Skeletons", - "slayer_req": 1, - "masters": "1, 2" + "slayer_req": 1 }, { - "id": 78, "monster": "Smoke devils", - "slayer_req": 93, - "masters": "5, 6" + "slayer_req": 93 }, { - "id": 79, "monster": "Spiders", - "slayer_req": 1, - "masters": 1 + "slayer_req": 1 + }, + { + "monster": "Spiritual creatures", + "slayer_req": 63 + }, + { + "monster": "Steel dragon", + "slayer_req": 1 }, { - "id": 80, "monster": "Steel dragons", - "slayer_req": 1, - "masters": "4, 5, 6" + "slayer_req": 1 }, { - "id": 81, "monster": "Suqahs", - "slayer_req": 1, - "masters": "5, 6" + "slayer_req": 1 }, { - "id": 82, "monster": "Terror dogs", - "slayer_req": 40, - "masters": 3 + "slayer_req": 40 }, { - "id": 83, "monster": "Trolls", - "slayer_req": 1, - "masters": "3, 4, 5, 6" + "slayer_req": 1 }, { - "id": 84, "monster": "Turoths", - "slayer_req": 55, - "masters": "3, 4, 5" + "slayer_req": 55 + }, + { + "monster": "TzHaar", + "slayer_req": 1 }, { - "id": 85, "monster": "Vampyres", - "slayer_req": 1, - "masters": "2, 3" + "slayer_req": 1 }, { - "id": 86, "monster": "Wall beasts", - "slayer_req": 35, - "masters": 2 + "slayer_req": 35 }, { - "id": 87, "monster": "Waterfiends", - "slayer_req": 1, - "masters": 5 + "slayer_req": 1 }, { - "id": 88, "monster": "Werewolves", - "slayer_req": 1, - "masters": 3 + "slayer_req": 1 }, { - "id": 89, "monster": "Wolves", - "slayer_req": 1, - "masters": "1, 2" + "slayer_req": 1 + }, + { + "monster": "Wyrms", + "slayer_req": 62 }, { - "id": 90, "monster": "Zombies", - "slayer_req": 1, - "masters": "1, 2" - }, - { - "id": 91, - "monster": "Zygomites", - "slayer_req": 57, - "masters": "4, 5, 6" + "slayer_req": 1 } ] \ No newline at end of file diff --git a/data/nieve.csv b/data/nieve.csv index 9b8851f..98d3e2f 100644 --- a/data/nieve.csv +++ b/data/nieve.csv @@ -8,7 +8,7 @@ Black demons,1,9 Black dragons,1,6 Bloodvelds,50,9 Blue dragons,1,4 -Bosses,Varies,8 +Bosses,1,8 Brine rats,47,3 Cave horrors,58,5 Cave krakens,87,6 diff --git a/data/vannaka.csv b/data/vannaka.csv index 636a113..b9ac451 100644 --- a/data/vannaka.csv +++ b/data/vannaka.csv @@ -4,7 +4,7 @@ Abyssal demons,85,5 Ankous,1,7 Banshees,15,6 Basilisks,40,8 -Bloodveld,50,8 +Bloodvelds,50,8 Blue dragons,1,7 Brine rats,47,7 Bronze dragons,1,7 diff --git a/index.html b/index.html index 7799ea3..de3cc9d 100644 --- a/index.html +++ b/index.html @@ -62,12 +62,18 @@

Task blocks:

    -
  1. (50 QP)
    2. -
  2. (100 QP)
    3. -
  3. (150 QP)
    4. -
  4. (200 QP)
    5. -
  5. (250 QP)
    6. -
  6. (Quest Cape)
    7. +
  7. + (50 QP)
    8. +
  8. + (100 QP)
    9. +
  9. + (150 QP)
    10. +
  10. + (200 QP)
    11. +
  11. + (250 QP)
    12. +
  12. + (Quest Cape)
diff --git a/js/script.js b/js/script.js index f2079b5..4e2ab57 100644 --- a/js/script.js +++ b/js/script.js @@ -2,7 +2,15 @@ String.prototype.capitalize = function() { return this.charAt(0).toUpperCase() + this.slice(1); } +function onlyUnique(value, index, self) { + return self.indexOf(value) === index; +} + function setBlocklists() { + + // generate blocklist options, currently unused for static html + // may be reused when updates to monsters.json require new html block options + $.getJSON( "data/monsters.json", {format: "json"}, function( data ) { var content = ''; @@ -19,7 +27,6 @@ function setBlocklists() { } $(document).ready(function() { - setBlocklists(); applyChanges('krystilia'); }); @@ -27,71 +34,74 @@ function filterTasks(data) { index_list = [] for (i = 0; i < data.length; i++) { - - // Unlocks - - switch (data[i].monster) { - case 'Red dragons': + console.log(i,data[i].monster) + + switch (data[i].monster.toUpperCase()) { + + // Slayer point unlocks + + case 'RED DRAGONS': if ($("#reddrags").prop("checked") == false) { - index_list.push(i) + index_list.unshift(i) } break; - case 'Mithril dragons': + case 'MITHRIL DRAGONS': if ($("#mithdrags").prop("checked") == false) { - index_list.push(i) + index_list.unshift(i) } break; - case 'Aviansie': + case 'AVIANSIES': if ($("#aviansies").prop("checked") == false) { - index_list.push(i) + index_list.unshift(i) } break; - case 'Tzhaar': + case 'TZHAAR': if ($("#tzhaar").prop("checked") == false) { - index_list.push(i) + index_list.unshift(i) } break; - case 'Lizardmen': + case 'LIZARDMEN': if ($("#lizardmen").prop("checked") == false) { - index_list.push(i) + index_list.unshift(i) } break; - case 'Bosses': + case 'BOSSES': if ($("#bosses").prop("checked") == false) { - index_list.push(i) + index_list.unshift(i) } break; - case 'Fossil Island Wyverns': + case 'FOSSIL ISLAND WYVERNS': if ($("#fossilwyverns").prop("checked") == true) { - index_list.push(i) - console.log('1') + index_list.unshift(i) } + + // Quest task unlocks + + } // Slayer requirement if (data[i].slayer_req > $("#slayerlevel").val()) { - index_list.push(i) + index_list.unshift(i) } // Task blocks $( ".blocktask" ).each(function( index ) { if ($(this).val().toUpperCase() == data[i].monster.toUpperCase()) { - index_list.push(i) - console.log('2') + index_list.unshift(i) } }); - // Quest unlocks - } - console.log(index_list) - - - for (var i in index_list) { - data.splice(i, 1) + unique_list = index_list.filter(onlyUnique); + console.log(unique_list) + + for (var i in unique_list) { + console.log(data[unique_list[i]]) + data.splice(unique_list[i], 1) } return data