From 31c5d02f929d91bf152d2766c745e80d8348fae8 Mon Sep 17 00:00:00 2001
From: bartvdbraak <bartvdbraak@gmail.com>
Date: Sun, 1 Mar 2020 16:20:07 +0100
Subject: [PATCH] bug fixes to slater point unlocks

---
 src/components/MainContent.vue  |  2 +-
 src/components/TableSection.vue |  7 ++++---
 src/data/masters.json           | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/components/MainContent.vue b/src/components/MainContent.vue
index 315d79a..6ae64b1 100644
--- a/src/components/MainContent.vue
+++ b/src/components/MainContent.vue
@@ -16,7 +16,7 @@ export default {
 					{id: 2, name: 'Defence level', filter: 'defence_req', value: {min: 1, current: 99, max: 99}, image: 'defence_icon.png'},
 				],
 				pointUnlocks: [
-					{id: 0, name: 'Seeing red', monster_ids: [83, 3], unlock: 'false', masters: [5,6,7]},
+					{id: 0, name: 'Seeing red', monster_ids: [83], unlock: 'false', masters: [5,6,7]},
 					{id: 1, name: 'I hope you mith me', monster_ids: [72], unlock: 'false', masters: [5,6,7]},
 					{id: 2, name: 'Watch the birdie', monster_ids: [4], unlock: 'false', masters: [4,5,6,7]},
 					{id: 3, name: 'Hot stuff', monster_ids: [102], unlock: 'false', masters: [4,6,7]},
diff --git a/src/components/TableSection.vue b/src/components/TableSection.vue
index 379f1af..a160384 100644
--- a/src/components/TableSection.vue
+++ b/src/components/TableSection.vue
@@ -193,9 +193,10 @@ export default {
 
 			//filter based on Point Unlocks
 			this.configData.pointUnlocks.forEach(reward=>{
-	            if ((reward.unlock === 'true' && reward.block) || (reward.unlock === 'false' && !reward.block)) {
-					//if reward unlocked but blocks monsters OR reward not unlocked and doesnt block
-					//then, add to removal
+	            if (reward.unlock === 'true' && reward.block) {
+					removeIds = removeIds.concat(reward.monster_ids)
+				}
+	            else if (reward.unlock === 'false' && !reward.block && reward.masters.includes(this.currentMaster.id)) {
 					removeIds = removeIds.concat(reward.monster_ids)
 				}
 			});
diff --git a/src/data/masters.json b/src/data/masters.json
index 7e73c80..aeb4401 100644
--- a/src/data/masters.json
+++ b/src/data/masters.json
@@ -1559,6 +1559,14 @@
         "combat_req": "0",
         "defence_req": "0"
       },
+      {
+        "id": "7",
+        "monster": "Basilisks",
+        "slayer_req": "40",
+        "taskweight": "5",
+        "combat_req": "40",
+        "defence_req": "20"
+      },
       {
         "id": "11",
         "monster": "Black demons",
@@ -1878,6 +1886,14 @@
         "combat_req": "0",
         "defence_req": "0"
       },
+      {
+        "id": "7",
+        "monster": "Basilisks",
+        "slayer_req": "40",
+        "taskweight": "6",
+        "combat_req": "40",
+        "defence_req": "0"
+      },
       {
         "id": "11",
         "monster": "Black demons",
@@ -2213,6 +2229,14 @@
         "combat_req": "0",
         "defence_req": "0"
       },
+      {
+        "id": "7",
+        "monster": "Basilisks",
+        "slayer_req": "40",
+        "taskweight": "7",
+        "combat_req": "40",
+        "defence_req": "0"
+      },
       {
         "id": "11",
         "monster": "Black demons",