diff --git a/src/data/chaeldar_results.csv b/src/data/chaeldar_results.csv index 82fe369..4194007 100644 --- a/src/data/chaeldar_results.csv +++ b/src/data/chaeldar_results.csv @@ -1,49 +1,49 @@ -monster,slayer_req,taskweight,combat_req,defence_req,id -Aberrant spectres,60,8,65,0,0 -Abyssal demons,85,12,85,0,1 -Aviansies,1,9,0,0,4 -Banshees,15,5,20,0,6 -Basilisks,40,7,40,20,7 -Black demons,1,10,80,0,11 -Bloodvelds,50,8,50,0,13 -Blue dragons,1,8,65,0,14 -Brine rats,47,7,45,0,16 -Bronze dragons,1,11,75,0,17 -Cave crawlers,10,5,10,0,20 -Cave horrors,58,10,85,0,21 -Cave krakens,87,12,80,0,22 -Cave slimes,17,6,15,0,23 -Cockatrices,25,6,25,20,25 -Dagannoths,1,11,75,0,29 -Dust devils,65,9,70,0,34 -Elves,1,8,0,0,37 -Fever spiders,42,7,40,0,39 -Fire giants,1,12,65,0,40 -Fossil Island Wyverns,66,7,60,0,42 -Gargoyles,75,11,80,0,43 -Greater demons,1,9,75,0,47 -Harpie Bug Swarms,33,6,45,0,49 -Hellhounds,1,9,75,0,50 -Infernal Mages,45,7,40,0,57 -Iron dragons,1,12,80,0,58 -Jellies,52,10,57,0,59 -Jungle horrors,1,10,65,0,60 -Kalphites,1,11,15,0,61 -Kurasks,70,12,65,0,63 -Lesser demons,1,9,60,0,65 -Lizardmen,1,8,0,0,66 -Lizards,22,5,15,0,67 -Mogres,32,6,30,0,73 -Molanisks,39,6,50,0,74 -Mutated zygomites,57,7,60,0,77 -Nechryaels,80,12,85,0,78 -Pyrefiends,30,6,25,0,81 -Rockslugs,20,5,20,0,85 -Shadow warriors,1,8,60,0,91 -Skeletal Wyverns,72,7,70,0,92 -Spiritual creatures,63,12,60,0,96 -Trolls,1,11,60,0,100 -Turoths,55,10,60,0,101 -TzHaar,1,8,0,0,102 -Wall beasts,35,6,30,5,104 -Wyrms,62,6,0,0,108 +id,task_weight +0,8 +1,12 +4,9 +6,5 +7,7 +11,10 +13,8 +14,8 +16,7 +17,11 +20,5 +21,10 +22,12 +23,6 +25,6 +29,11 +34,9 +37,8 +39,7 +40,12 +42,7 +43,11 +47,9 +49,6 +50,9 +57,7 +58,12 +59,10 +60,10 +61,11 +63,12 +65,9 +66,8 +67,5 +73,6 +74,6 +77,7 +78,12 +81,6 +85,5 +91,8 +92,7 +96,12 +100,11 +101,10 +102,8 +104,6 +108,6 diff --git a/src/data/duradel_results.csv b/src/data/duradel_results.csv index e341b03..996ba44 100644 --- a/src/data/duradel_results.csv +++ b/src/data/duradel_results.csv @@ -1,40 +1,40 @@ -monster,slayer_req,taskweight,combat_req,defence_req,id -Aberrant spectres,60,7,65,0,0 -Abyssal demons,85,12,85,0,1 -Adamant dragons,1,2,0,0,2 -Ankous,1,5,40,0,3 -Aviansies,1,8,0,0,4 -Black demons,1,8,80,0,11 -Black dragons,1,9,80,0,12 -Bloodvelds,50,8,50,0,13 -Blue dragons,1,4,65,0,14 -Bosses,1,12,0,0,15 -Cave horrors,58,4,85,0,21 -Cave krakens,87,9,80,0,22 -Dagannoths,1,9,75,0,29 -Dark beasts,90,11,90,0,30 -Drakes,84,8,0,0,33 -Dust devils,65,5,70,0,34 -Elves,1,4,0,0,37 -Fire giants,1,7,65,0,40 -Fossil Island Wyverns,66,5,60,0,42 -Gargoyles,75,8,80,0,43 -Greater demons,1,9,75,0,47 -Hellhounds,1,10,75,0,50 -Iron dragons,1,5,80,0,58 -Kalphites,1,9,15,0,61 -Kurasks,70,4,65,0,63 -Lizardmen,1,10,0,0,66 -Mithril dragons,1,9,0,0,72 -Nechryaels,80,9,85,0,78 -Red dragons,1,8,68,0,83 -Rune dragons,1,2,0,0,87 -Skeletal Wyverns,72,7,70,0,92 -Smoke devils,93,9,85,0,94 -Spiritual creatures,63,7,60,0,96 -Steel dragons,1,7,85,0,97 -Suqahs,1,8,85,0,98 -Trolls,1,6,60,0,100 -TzHaar,1,10,0,0,102 -Waterfiends,1,2,75,0,105 -Wyrms,62,8,0,0,108 +id,task_weight +0,7 +1,12 +2,2 +3,5 +4,8 +11,8 +12,9 +13,8 +14,4 +15,12 +21,4 +22,9 +29,9 +30,11 +33,8 +34,5 +37,4 +40,7 +42,5 +43,8 +47,9 +50,10 +58,5 +61,9 +63,4 +66,10 +72,9 +78,9 +83,8 +87,2 +92,7 +94,9 +96,7 +97,7 +98,8 +100,6 +102,10 +105,2 +108,8 diff --git a/src/data/konar quo maten_results.csv b/src/data/konar quo maten_results.csv index 5d1530d..0b8341a 100644 --- a/src/data/konar quo maten_results.csv +++ b/src/data/konar quo maten_results.csv @@ -1,40 +1,40 @@ -monster,slayer_req,taskweight,combat_req,defence_req,id -Aberrant spectres,60,6,65,0,0 -Abyssal demons,85,9,85,0,1 -Adamant dragons,1,5,0,0,2 -Ankous,1,5,40,0,3 -Aviansies,1,6,0,0,4 -Black demons,1,9,80,0,11 -Black dragons,1,6,80,0,12 -Bloodvelds,50,9,50,0,13 -Blue dragons,1,4,65,0,14 -Bosses,1,8,0,0,15 -Brine rats,47,2,45,0,16 -Bronze dragons,1,5,75,0,17 -Cave krakens,87,9,80,0,22 -Dagannoths,1,8,75,0,29 -Dark beasts,90,5,90,0,30 -Drakes,84,10,0,0,33 -Dust devils,65,6,70,0,34 -Fire giants,1,9,65,0,40 -Fossil Island Wyverns,66,5,60,0,42 -Gargoyles,75,6,80,0,43 -Greater demons,1,7,75,0,47 -Hellhounds,1,8,75,0,50 -Hydras,95,10,0,0,53 -Iron dragons,1,5,80,0,58 -Jellies,52,6,57,0,59 -Kalphites,1,9,15,0,61 -Kurasks,70,3,65,0,63 -Lizardmen,1,8,0,0,66 -Mithril dragons,1,5,0,0,72 -Nechryaels,80,7,85,0,78 -Red dragons,1,5,68,0,83 -Rune dragons,1,5,0,0,87 -Skeletal Wyverns,72,5,70,0,92 -Smoke devils,93,7,85,0,94 -Steel dragons,1,5,85,0,97 -Trolls,1,6,60,0,100 -Turoths,55,3,60,0,101 -Waterfiends,1,2,75,0,105 -Wyrms,62,10,0,0,108 +id,task_weight +0,6 +1,9 +2,5 +3,5 +4,6 +11,9 +12,6 +13,9 +14,4 +15,8 +16,2 +17,5 +22,9 +29,8 +30,5 +33,10 +34,6 +40,9 +42,5 +43,6 +47,7 +50,8 +53,10 +58,5 +59,6 +61,9 +63,3 +66,8 +72,5 +78,7 +83,5 +87,5 +92,5 +94,7 +97,5 +100,6 +101,3 +105,2 +108,10 diff --git a/src/data/krystilia_results.csv b/src/data/krystilia_results.csv index c112f5a..bc76c99 100644 --- a/src/data/krystilia_results.csv +++ b/src/data/krystilia_results.csv @@ -1,28 +1,28 @@ -monster,slayer_req,taskweight,combat_req,defence_req,id -Ankous,1,6,40,0,3 -Aviansies,1,7,0,0,4 -Bandits,1,4,0,0,5 -Bears,1,6,13,0,9 -Black demons,1,7,80,0,11 -Black dragons,1,4,80,0,12 -Chaos druids,1,5,0,0,24 -Dark warriors,1,4,0,0,31 -Earth warriors,1,6,35,0,36 -Ents,1,5,0,0,38 -Fire giants,1,7,65,0,40 -Greater demons,1,8,75,0,47 -Green dragons,1,4,52,0,48 -Hellhounds,1,7,75,0,50 -Ice giants,1,6,50,0,54 -Ice warriors,1,7,45,0,55 -Lava dragons,1,3,0,0,64 -Lesser demons,1,6,60,0,65 -Magic axes,1,7,0,0,68 -Mammoths,1,6,0,0,69 -Revenants,1,5,0,0,84 -Rogues,1,5,0,0,86 -Scorpions,1,6,7,0,88 -Skeletons,1,5,15,0,93 -Spiders,1,6,0,0,95 -Spiritual creatures,63,6,60,0,96 -Bosses,1,8,0,0,15 +id,task_weight +3,6 +4,7 +5,4 +9,6 +11,7 +12,4 +24,5 +31,4 +36,6 +38,5 +40,7 +47,8 +48,4 +50,7 +54,6 +55,7 +64,3 +65,6 +68,7 +69,6 +84,5 +86,5 +88,6 +93,5 +95,6 +96,6 +15,8 diff --git a/src/data/mazchna_results.csv b/src/data/mazchna_results.csv index 318f6d4..24b9954 100644 --- a/src/data/mazchna_results.csv +++ b/src/data/mazchna_results.csv @@ -1,31 +1,31 @@ -monster,slayer_req,taskweight,combat_req,defence_req,id -Banshees,15,8,20,0,6 -Bats,1,7,5,0,8 -Bears,1,6,13,0,9 -Catablepons,1,8,35,0,18 -Cave bugs,7,8,0,0,19 -Cave crawlers,10,8,10,0,20 -Cave slimes,17,8,15,0,23 -Cockatrices,25,8,25,20,25 -Crawling Hands,5,8,0,0,27 -Lizards,22,8,15,0,67 -Dogs,1,7,15,0,32 -Earth warriors,1,6,35,0,36 -Flesh Crawlers,1,7,15,0,41 -Ghosts,1,7,13,0,44 -Ghouls,1,7,25,0,45 -Hill Giants,1,7,25,0,51 -Hobgoblins,1,7,20,0,52 -Ice warriors,1,7,45,0,55 -Kalphites,1,6,15,0,61 -Killerwatts,37,6,50,0,62 -Mogres,32,8,30,0,73 -Pyrefiends,30,8,25,0,81 -Rockslugs,20,8,20,0,85 -Scorpions,1,7,7,0,88 -Shades,1,8,30,0,90 -Skeletons,1,7,15,0,93 -Vampyres,1,6,35,0,103 -Wall beasts,35,7,30,5,104 -Wolves,1,7,20,0,107 -Zombies,1,7,10,0,109 +id,task_weight +6,8 +8,7 +9,6 +18,8 +19,8 +20,8 +23,8 +25,8 +27,8 +67,8 +32,7 +36,6 +41,7 +44,7 +45,7 +51,7 +52,7 +55,7 +61,6 +62,6 +73,8 +81,8 +85,8 +88,7 +90,8 +93,7 +103,6 +104,7 +107,7 +109,7 diff --git a/src/data/nieve_results.csv b/src/data/nieve_results.csv index 0b860d0..de85bca 100644 --- a/src/data/nieve_results.csv +++ b/src/data/nieve_results.csv @@ -1,42 +1,42 @@ -monster,slayer_req,taskweight,combat_req,defence_req,id -Aberrant spectres,60,6,65,0,0 -Abyssal demons,85,9,85,0,1 -Adamant dragons,1,2,0,0,2 -Ankous,1,5,40,0,3 -Aviansies,1,6,0,0,4 -Black demons,1,9,80,0,11 -Black dragons,1,6,80,0,12 -Bloodvelds,50,9,50,0,13 -Blue dragons,1,4,65,0,14 -Bosses,1,8,0,0,15 -Brine rats,47,3,45,0,16 -Cave horrors,58,5,85,0,21 -Cave krakens,87,6,80,0,22 -Dagannoths,1,8,75,0,29 -Dark beasts,90,5,90,0,30 -Drakes,84,7,0,0,33 -Dust devils,65,6,70,0,34 -Elves,1,4,0,0,37 -Fire giants,1,9,65,0,40 -Fossil Island Wyverns,66,5,60,0,42 -Gargoyles,75,6,80,0,43 -Greater demons,1,7,75,0,47 -Hellhounds,1,8,75,0,50 -Iron dragons,1,5,80,0,58 -Kalphites,1,9,15,0,61 -Kurasks,70,3,65,0,63 -Lizardmen,1,8,0,0,66 -Minions of Scabaras,1,4,85,0,70 -Mithril dragons,1,5,0,0,72 -Nechryaels,80,7,85,0,78 -Red dragons,1,5,68,0,83 -Rune dragons,1,2,0,0,87 -Skeletal Wyverns,72,5,70,0,92 -Smoke devils,93,7,85,0,94 -Spiritual creatures,63,6,60,0,96 -Steel dragons,1,5,85,0,97 -Suqahs,1,8,85,0,98 -Trolls,1,6,60,0,100 -Turoths,55,3,60,0,101 -TzHaar,1,10,0,0,102 -Wyrms,62,7,0,0,108 +id,task_weight +0,6 +1,9 +2,2 +3,5 +4,6 +11,9 +12,6 +13,9 +14,4 +15,8 +16,3 +21,5 +22,6 +29,8 +30,5 +33,7 +34,6 +37,4 +40,9 +42,5 +43,6 +47,7 +50,8 +58,5 +61,9 +63,3 +66,8 +70,4 +72,5 +78,7 +83,5 +87,2 +92,5 +94,7 +96,6 +97,5 +98,8 +100,6 +101,3 +102,10 +108,7 diff --git a/src/data/query_csv.py b/src/data/query_csv.py index 94df051..d3847ee 100644 --- a/src/data/query_csv.py +++ b/src/data/query_csv.py @@ -17,14 +17,21 @@ def write_results(current_master): reader = csv.reader(master) writer = csv.writer(results) - writer.writerow(next(reader, []) + ['id']) + # Skip old header + next(reader, []) + + # Write new CSV header row: + # id,task_weight\n + writer.writerow(['id'] + ['task_weight']) for row in reader: - + # row is found in slayer master AND monsters index = master_indices.get(row[0]) if index is not None: - writer.writerow(row + [index - 1]) + # Row with value for id and slayer_weight: + # 0,12\n + writer.writerow([index - 1] + [row[2]] ) if __name__ == "__main__": diff --git a/src/data/turael_results.csv b/src/data/turael_results.csv index 61d4114..ad5b677 100644 --- a/src/data/turael_results.csv +++ b/src/data/turael_results.csv @@ -1,25 +1,25 @@ -monster,slayer_req,taskweight,combat_req,defence_req,id -Banshees,15,8,20,0,6 -Bats,1,7,5,0,8 -Birds,1,6,0,0,10 -Bears,1,7,13,0,9 -Cave bugs,7,8,0,0,19 -Cave crawlers,10,8,10,0,20 -Cave slimes,17,8,15,0,23 -Cows,1,8,5,0,26 -Crawling Hands,5,8,0,0,27 -Dogs,1,7,15,0,32 -Dwarves,1,7,6,0,35 -Ghosts,1,7,13,0,44 -Goblins,1,7,0,0,46 -Icefiends,1,8,20,0,56 -Kalphites,1,6,15,0,61 -Lizards,22,8,15,0,67 -Minotaurs,1,7,7,0,71 -Monkeys,1,6,0,0,75 -Rats,1,7,0,0,82 -Scorpions,1,7,7,0,88 -Skeletons,1,7,15,0,93 -Spiders,1,6,0,0,95 -Wolves,1,7,20,0,107 -Zombies,1,7,10,0,109 +id,task_weight +6,8 +8,7 +10,6 +9,7 +19,8 +20,8 +23,8 +26,8 +27,8 +32,7 +35,7 +44,7 +46,7 +56,8 +61,6 +67,8 +71,7 +75,6 +82,7 +88,7 +93,7 +95,6 +107,7 +109,7 diff --git a/src/data/vannaka_results.csv b/src/data/vannaka_results.csv index 989086c..1d5eb7e 100644 --- a/src/data/vannaka_results.csv +++ b/src/data/vannaka_results.csv @@ -1,57 +1,57 @@ -monster,slayer_req,taskweight,combat_req,defence_req,id -Aberrant spectres,60,8,65,0,0 -Abyssal demons,85,5,85,0,1 -Ankous,1,7,40,0,3 -Banshees,15,6,20,0,6 -Basilisks,40,8,40,0,7 -Bloodvelds,50,8,50,0,13 -Blue dragons,1,7,65,0,14 -Brine rats,47,7,45,0,16 -Bronze dragons,1,7,75,0,17 -Cave bugs,7,7,0,0,19 -Cave crawlers,10,7,10,0,20 -Cave slimes,17,7,15,0,23 -Cockatrices,25,8,25,20,25 -Crawling Hands,5,6,0,0,27 -Crocodiles,1,6,50,0,28 -Dagannoths,1,7,75,0,29 -Lizards,22,7,15,0,67 -Dust devils,65,8,70,0,34 -Earth warriors,1,6,35,0,36 -Elves,1,7,0,0,37 -Fever spiders,42,7,40,0,39 -Fire giants,1,7,65,0,40 -Gargoyles,75,5,80,0,43 -Ghouls,1,7,25,0,45 -Green dragons,1,6,52,0,48 -Harpie Bug Swarms,33,8,45,0,49 -Hellhounds,1,7,75,0,50 -Hill Giants,1,7,25,0,51 -Hobgoblins,1,7,20,0,52 -Ice giants,1,7,50,0,54 -Ice warriors,1,7,45,0,55 -Infernal Mages,45,8,40,0,57 -Jellies,52,8,57,0,59 -Jungle horrors,1,8,65,0,60 -Kalphites,1,7,15,0,61 -Killerwatts,37,6,50,0,62 -Kurasks,70,7,65,0,63 -Lesser demons,1,7,60,0,65 -Mogres,32,7,30,0,73 -Molanisks,39,7,50,0,74 -Moss giants,1,7,40,0,76 -Nechryaels,80,5,85,0,78 -Ogres,1,7,40,0,79 -Otherworldly beings,1,8,40,0,80 -Pyrefiends,30,8,25,0,81 -Rockslugs,20,7,20,0,85 -Shades,1,8,30,0,90 -Sea snakes,40,6,50,0,89 -Shadow warriors,1,8,60,0,91 -Spiritual creatures,63,8,60,0,96 -Terror dogs,40,6,60,0,99 -Trolls,1,7,60,0,100 -Turoths,55,8,60,0,101 -Vampyres,1,7,35,0,103 -Wall beasts,35,6,30,5,104 -Werewolves,1,7,60,0,106 +id,task_weight +0,8 +1,5 +3,7 +6,6 +7,8 +13,8 +14,7 +16,7 +17,7 +19,7 +20,7 +23,7 +25,8 +27,6 +28,6 +29,7 +67,7 +34,8 +36,6 +37,7 +39,7 +40,7 +43,5 +45,7 +48,6 +49,8 +50,7 +51,7 +52,7 +54,7 +55,7 +57,8 +59,8 +60,8 +61,7 +62,6 +63,7 +65,7 +73,7 +74,7 +76,7 +78,5 +79,7 +80,8 +81,8 +85,7 +90,8 +89,6 +91,8 +96,8 +99,6 +100,7 +101,8 +103,7 +104,6 +106,7