From 2cec65ac2d270c47b4161eb1e8a6a3a469e16ad6 Mon Sep 17 00:00:00 2001 From: bartvdbraak Date: Sun, 28 Apr 2019 23:45:06 +0200 Subject: [PATCH 1/2] - added gitignore, - updates monsters.csv and chaeldar.csv - new inputs for slay, def, cb --- .gitignore | 2 + data/chaeldar.csv | 100 +++++++++--------- data/monsters.csv | 223 +++++++++++++++++++-------------------- data/monsters_sorted.csv | 113 -------------------- index.html | 22 +++- 5 files changed, 181 insertions(+), 279 deletions(-) create mode 100644 .gitignore delete mode 100644 data/monsters_sorted.csv diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7c741e1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.* +!/.gitignore \ No newline at end of file diff --git a/data/chaeldar.csv b/data/chaeldar.csv index cda970a..8decf6a 100644 --- a/data/chaeldar.csv +++ b/data/chaeldar.csv @@ -1,50 +1,50 @@ -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 +monster,slayer_req,taskweight,combat_req,defence_req +Aberrant spectres,60,8,65,0 +Abyssal demons,85,12,85,0 +Aviansies,1,9,0,0 +Banshees,15,5,20,0 +Basilisks,40,7,40,20 +Black demons,1,10,80,0 +Bloodvelds,50,8,50,0 +Blue dragons,1,8,65,0 +Brine rats,47,7,45,0 +Bronze dragons,1,11,75,0 +Cave crawlers,10,5,10,0 +Cave horrors,58,10,85,0 +Cave krakens,87,12,80,0 +Cave slimes,17,6,15,0 +Cockatrices,25,6,25,20 +Dagannoths,1,11,75,0 +Dust devils,65,9,70,0 +Elves,1,8,0,0 +Fever spiders,42,7,40,0 +Fire giants,1,12,65,0 +Fossil Island Wyverns,66,7,60,0 +Gargoyles,75,11,80,0 +Greater demons,1,9,75,0 +Harpie Bug Swarms,33,6,45,0 +Hellhounds,1,9,75,0 +Infernal Mages,45,7,40,0 +Iron dragons,1,12,80,0 +Jellies,52,10,57,0 +Jungle horrors,1,10,65,0 +Kalphites,1,11,15,0 +Kurasks,70,12,65,0 +Lesser demons,1,9,60,0 +Lizardmen,1,8,0,0 +Lizards,22,5,15,0 +Mogres,32,6,30,0 +Molanisks,39,6,50,0 +Mutated zygomites,57,7,60,0 +Nechryaels,80,12,85,0 +Pyrefiends,30,6,25,0 +Rockslugs,20,5,20,0 +Shadow warriors,1,8,60,0 +Skeletal Wyverns,72,7,70,0 +Spiritual creatures,63,12,60,0 +Steel dragon,1,9,85,0 +Trolls,1,11,60,0 +Turoths,55,10,60,0 +TzHaar,1,8,0,0 +Wall beasts,35,6,30,5 +Wyrms,62,6,0,0 diff --git a/data/monsters.csv b/data/monsters.csv index c2c7640..54309df 100644 --- a/data/monsters.csv +++ b/data/monsters.csv @@ -1,112 +1,111 @@ -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 +monster,slayer_req,combat_req,defence_req +Aberrant spectres,60,65,0 +Abyssal demons,85,85,0 +Adamant dragons,1,0,0 +Ankous,1,40,0 +Aviansies,1,0,0 +Bandits,1,0,0 +Banshees,15,20,0 +Basilisks,40,40,20 +Bats,1,5,0 +Bears,1,13,0 +Birds,1,0,0 +Black demons,1,80,0 +Black dragons,1,80,0 +Bloodvelds,50,50,0 +Blue dragons,1,65,0 +Bosses,1,0,0 +Brine rats,47,45,0 +Bronze dragons,1,75,0 +Catablepons,1,35,0 +Cave bugs,7,0,0 +Cave crawlers,10,10,0 +Cave horrors,58,85,0 +Cave krakens,87,80,0 +Cave slimes,17,15,0 +Chaos druids,1,0,0 +Cockatrices,25,25,20 +Cows,1,5,0 +Crawling Hands,5,0,0 +Crocodiles,1,50,0 +Dagannoths,1,75,0 +Dark beasts,90,90,0 +Dark warriors,1,0,0 +Dogs,1,15,0 +Drakes,84,0,0 +Dust devils,65,70,0 +Dwarves,1,6,0 +Earth warriors,1,35,0 +Elves,1,0,0 +Ents,1,0,0 +Fever spiders,42,40,0 +Fire giants,1,65,0 +Flesh Crawlers,1,15,0 +Fossil Island Wyverns,66,60,0 +Gargoyles,75,80,0 +Ghosts,1,13,0 +Ghouls,1,25,0 +Goblins,1,0,0 +Greater demons,1,75,0 +Green dragons,1,52,0 +Harpie Bug Swarms,33,45,0 +Hellhounds,1,75,0 +Hill Giants,1,25,0 +Hobgoblins,1,20,0 +Hydras,95,0,0 +Ice giants,1,50,0 +Ice warriors,1,45,0 +Icefiends,1,20,0 +Infernal Mages,45,40,0 +Iron dragons,1,80,0 +Jellies,52,57,0 +Jungle horrors,1,65,0 +Kalphites,1,15,0 +Killerwatts,37,50,0 +Kurasks,70,65,0 +Lava dragons,1,0,0 +Lesser demons,1,60,0 +Lizardmen,1,0,0 +Lizards,22,15,0 +Magic axes,1,0,0 +Mammoths,1,0,0 +Minions of Scabaras,1,85,0 +Minotaurs,1,7,0 +Mithril dragons,1,0,0 +Mogres,32,30,0 +Molanisks,39,50,0 +Monkeys,1,0,0 +Moss giants,1,40,0 +Mutated zygomites,57,60,0 +Nechryaels,80,85,0 +Ogres,1,40,0 +Otherworldly beings,1,40,0 +Pyrefiends,30,25,0 +Rats,1,0,0 +Red dragons,1,68,0 +Revenants,1,0,0 +Rockslugs,20,20,0 +Rogues,1,0,0 +Rune dragons,1,0,0 +Scorpions,1,7,0 +Sea snakes,40,50,0 +Shades,1,30,0 +Shadow warriors,1,60,0 +Skeletal Wyverns,72,70,0 +Skeletons,1,15,0 +Smoke devils,93,85,0 +Spiders,1,0,0 +Spiritual creatures,63,60,0 +Steel dragons,1,85,0 +Suqahs,1,85,0 +Terror dogs,40,60,0 +Trolls,1,60,0 +Turoths,55,60,0 +TzHaar,1,0,0 +Vampyres,1,35,0 +Wall beasts,35,30,5 +Waterfiends,1,75,0 +Werewolves,1,60,0 +Wolves,1,20,0 +Wyrms,62,0,0 +Zombies,1,10,0 diff --git a/data/monsters_sorted.csv b/data/monsters_sorted.csv deleted file mode 100644 index 150590f..0000000 --- a/data/monsters_sorted.csv +++ /dev/null @@ -1,113 +0,0 @@ -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 -Icefiends,1 -Ice giants,1 -Ice warriors,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 -monster,slayer_req -Moss giants,1 -Mutated zygomites,57 -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/index.html b/index.html index d818aa0..b14aa06 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,7 @@
-
-

Slayer settings

+

Slayer settings

-
+
-

Unlocks:

+
Slayer point unlocks


@@ -57,7 +57,7 @@

-

Task blocks:

+
Blocked tasks
  1. @@ -75,13 +75,14 @@
- +
-

Quest unlocks:

+
Quest unlocks
+

-
+
+ @@ -138,13 +140,12 @@ +
Slayer Defence Combat
-
- -
+
diff --git a/js/script.js b/js/script.js index fa83f3c..c29d919 100644 --- a/js/script.js +++ b/js/script.js @@ -188,12 +188,6 @@ function filterTasks(data) { } - // Slayer requirement - - if (data[i].slayer_req > $("#slayerlevel").val()) { - index_list.unshift(i) - } - // Task blocks $( ".blocktask" ).each(function( index ) { @@ -202,6 +196,24 @@ function filterTasks(data) { } }); + // Slayer requirement + + if (data[i].slayer_req > $("#slayerlevel").val()) { + index_list.unshift(i) + } + + // Defence requirement + + if (data[i].defence_req > $("#defencelevel").val()) { + index_list.unshift(i) + } + + // Combat requirement + + if (data[i].combat_req > $("#combatlevel").val()) { + index_list.unshift(i) + } + } unique_list = index_list.filter(onlyUnique);