From 562b07801c53503806f8de994e1bfc11d0e4b0f9 Mon Sep 17 00:00:00 2001 From: TastyPumPum Date: Fri, 13 Oct 2023 20:03:36 +0100 Subject: [PATCH] Update revs to check for SlayerTask instead of skulled --- src/meta/types.ts | 1 - src/simulation/monsters/low/n-s/RevenantCyclops.ts | 14 +++++++------- .../monsters/low/n-s/RevenantDarkBeast.ts | 14 +++++++------- src/simulation/monsters/low/n-s/RevenantDemon.ts | 14 +++++++------- src/simulation/monsters/low/n-s/RevenantDragon.ts | 14 +++++++------- src/simulation/monsters/low/n-s/RevenantGoblin.ts | 14 +++++++------- .../monsters/low/n-s/RevenantHellhound.ts | 14 +++++++------- .../monsters/low/n-s/RevenantHobgoblin.ts | 14 +++++++------- src/simulation/monsters/low/n-s/RevenantImp.ts | 14 +++++++------- src/simulation/monsters/low/n-s/RevenantKnight.ts | 14 +++++++------- src/simulation/monsters/low/n-s/RevenantOrk.ts | 14 +++++++------- .../monsters/low/n-s/RevenantPyrefiend.ts | 14 +++++++------- src/util/util.ts | 2 +- 13 files changed, 78 insertions(+), 79 deletions(-) diff --git a/src/meta/types.ts b/src/meta/types.ts index 95132834e..cf89cd7c4 100644 --- a/src/meta/types.ts +++ b/src/meta/types.ts @@ -440,7 +440,6 @@ export interface MonsterKillOptions { */ hasSuperiors?: SimpleMonster; farmingLevel?: number; - skulled?: boolean; isAwakened?: boolean; lootTableOptions?: LootTableRollOptions; } diff --git a/src/simulation/monsters/low/n-s/RevenantCyclops.ts b/src/simulation/monsters/low/n-s/RevenantCyclops.ts index b15bc6f99..9c0a117a2 100644 --- a/src/simulation/monsters/low/n-s/RevenantCyclops.ts +++ b/src/simulation/monsters/low/n-s/RevenantCyclops.ts @@ -47,12 +47,12 @@ export default new SimpleMonster({ table: RevenantCyclopsTable, aliases: ['revenant cyclops'], customKillLogic: makeRevTable({ - seeds: [2440, 1342], - uniqueTable: [6507, 3579], - ancientEmblem: [1626, 5368], - ancientTotem: [2440, 1342], - ancientCrystal: [3253, 1789], - ancientStatuette: [4880, 2684], - topThree: [9760, 5368] + seeds: [1342, 1342], + uniqueTable: [3579, 716], + ancientEmblem: [5368, 5368], + ancientTotem: [1342, 1342], + ancientCrystal: [1789, 1789], + ancientStatuette: [2684, 2684], + topThree: [5368, 5368] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantDarkBeast.ts b/src/simulation/monsters/low/n-s/RevenantDarkBeast.ts index a00324177..7e74de150 100644 --- a/src/simulation/monsters/low/n-s/RevenantDarkBeast.ts +++ b/src/simulation/monsters/low/n-s/RevenantDarkBeast.ts @@ -47,12 +47,12 @@ export default new SimpleMonster({ table: RevenantDarkBeastTable, aliases: ['revenant dark beast'], customKillLogic: makeRevTable({ - seeds: [2220, 1210], - uniqueTable: [5867, 3227], - ancientEmblem: [1466, 4840], - ancientTotem: [2200, 1210], - ancientCrystal: [2933, 1613], - ancientStatuette: [4400, 2420], - topThree: [8800, 4840] + seeds: [1210, 1210], + uniqueTable: [3227, 645], + ancientEmblem: [4840, 4840], + ancientTotem: [1210, 1210], + ancientCrystal: [1613, 1613], + ancientStatuette: [2420, 2420], + topThree: [4840, 4840] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantDemon.ts b/src/simulation/monsters/low/n-s/RevenantDemon.ts index d6261018e..d0b4e3371 100644 --- a/src/simulation/monsters/low/n-s/RevenantDemon.ts +++ b/src/simulation/monsters/low/n-s/RevenantDemon.ts @@ -47,12 +47,12 @@ export default new SimpleMonster({ table: RevenantDemonTable, aliases: ['revenant demon'], customKillLogic: makeRevTable({ - seeds: [2440, 1342], - uniqueTable: [6507, 3579], - ancientEmblem: [1626, 5368], - ancientTotem: [2440, 1342], - ancientCrystal: [3253, 1789], - ancientStatuette: [4880, 2684], - topThree: [9760, 4840] + seeds: [1342, 1342], + uniqueTable: [3579, 716], + ancientEmblem: [5368, 5368], + ancientTotem: [1342, 1342], + ancientCrystal: [1789, 1789], + ancientStatuette: [2684, 2684], + topThree: [5368, 5368] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantDragon.ts b/src/simulation/monsters/low/n-s/RevenantDragon.ts index 83f90c14a..bf6c8ce3d 100644 --- a/src/simulation/monsters/low/n-s/RevenantDragon.ts +++ b/src/simulation/monsters/low/n-s/RevenantDragon.ts @@ -46,12 +46,12 @@ export default new SimpleMonster({ table: RevenantDragonTable, aliases: ['revenant dragon'], customKillLogic: makeRevTable({ - seeds: [2000, 1100], - uniqueTable: [5333, 2933], - ancientEmblem: [1333, 4400], - ancientTotem: [2000, 1100], - ancientCrystal: [2666, 1466], - ancientStatuette: [4000, 2000], - topThree: [8000, 4400] + seeds: [1100, 1100], + uniqueTable: [2933, 587], + ancientEmblem: [4400, 4400], + ancientTotem: [1100, 1100], + ancientCrystal: [1467, 1467], + ancientStatuette: [2000, 2000], + topThree: [4400, 4400] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantGoblin.ts b/src/simulation/monsters/low/n-s/RevenantGoblin.ts index d966c8d47..a1562d12e 100644 --- a/src/simulation/monsters/low/n-s/RevenantGoblin.ts +++ b/src/simulation/monsters/low/n-s/RevenantGoblin.ts @@ -47,12 +47,12 @@ export default new SimpleMonster({ table: RevenantGoblinTable, aliases: ['revenant goblin'], customKillLogic: makeRevTable({ - seeds: [7330, 1342], - uniqueTable: [19_467, 10_751], - ancientEmblem: [1626, 5368], - ancientTotem: [2440, 1342], - ancientCrystal: [3253, 1789], - ancientStatuette: [4880, 2684], - topThree: [9760, 5368] + seeds: [4032, 4032], + uniqueTable: [10_751, 2150], + ancientEmblem: [16_126, 16_126], + ancientTotem: [4032, 4032], + ancientCrystal: [5375, 5375], + ancientStatuette: [8063, 8063], + topThree: [16_126, 16_126] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantHellhound.ts b/src/simulation/monsters/low/n-s/RevenantHellhound.ts index 2979969f7..be917c5db 100644 --- a/src/simulation/monsters/low/n-s/RevenantHellhound.ts +++ b/src/simulation/monsters/low/n-s/RevenantHellhound.ts @@ -47,12 +47,12 @@ export default new SimpleMonster({ table: RevenantHellhoundTable, aliases: ['revenant hellhound'], customKillLogic: makeRevTable({ - seeds: [2440, 1342], - uniqueTable: [6507, 3579], - ancientEmblem: [1626, 5368], - ancientTotem: [2440, 1342], - ancientCrystal: [3253, 1789], - ancientStatuette: [4880, 2684], - topThree: [9760, 5368] + seeds: [1342, 1342], + uniqueTable: [3579, 716], + ancientEmblem: [5368, 5368], + ancientTotem: [1342, 1342], + ancientCrystal: [1789, 1789], + ancientStatuette: [2684, 2684], + topThree: [5368, 5368] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantHobgoblin.ts b/src/simulation/monsters/low/n-s/RevenantHobgoblin.ts index 37eda2176..7b803adbf 100644 --- a/src/simulation/monsters/low/n-s/RevenantHobgoblin.ts +++ b/src/simulation/monsters/low/n-s/RevenantHobgoblin.ts @@ -48,12 +48,12 @@ export default new SimpleMonster({ table: RevenantHobgoblinTable, aliases: ['revenant hobgoblin'], customKillLogic: makeRevTable({ - seeds: [3140, 1727], - uniqueTable: [8373, 4605], - ancientEmblem: [2093, 6908], - ancientTotem: [3140, 1727], - ancientCrystal: [4186, 2302], - ancientStatuette: [6280, 3454], - topThree: [12_560, 6908] + seeds: [1727, 1727], + uniqueTable: [4605, 921], + ancientEmblem: [6908, 6908], + ancientTotem: [1727, 1727], + ancientCrystal: [2302, 2302], + ancientStatuette: [3454, 3454], + topThree: [6908, 6908] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantImp.ts b/src/simulation/monsters/low/n-s/RevenantImp.ts index 7cbd010fb..c71b3947c 100644 --- a/src/simulation/monsters/low/n-s/RevenantImp.ts +++ b/src/simulation/monsters/low/n-s/RevenantImp.ts @@ -47,12 +47,12 @@ export default new SimpleMonster({ table: RevenantImpTable, aliases: ['revenant imp'], customKillLogic: makeRevTable({ - seeds: [11_000, 6050], - uniqueTable: [29_333, 16_133], - ancientEmblem: [7333, 24_200], - ancientTotem: [11_000, 6050], - ancientCrystal: [14_666, 8066], - ancientStatuette: [22_000, 12_000], - topThree: [44_000, 24_200] + seeds: [6050, 6050], + uniqueTable: [161_334, 3226], + ancientEmblem: [24_200, 24_200], + ancientTotem: [6050, 6050], + ancientCrystal: [8067, 8067], + ancientStatuette: [12_100, 12_000], + topThree: [24_200, 24_200] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantKnight.ts b/src/simulation/monsters/low/n-s/RevenantKnight.ts index c23df5476..92b21df62 100644 --- a/src/simulation/monsters/low/n-s/RevenantKnight.ts +++ b/src/simulation/monsters/low/n-s/RevenantKnight.ts @@ -47,12 +47,12 @@ export default new SimpleMonster({ table: RevenantKnightTable, aliases: ['revenant knight'], customKillLogic: makeRevTable({ - seeds: [2000, 1100], - uniqueTable: [5333, 2933], - ancientEmblem: [1333, 4400], - ancientTotem: [2000, 1100], - ancientCrystal: [2666, 1466], - ancientStatuette: [4000, 2200], - topThree: [8000, 4400] + seeds: [1100, 1100], + uniqueTable: [2933, 587], + ancientEmblem: [4400, 4400], + ancientTotem: [1100, 1100], + ancientCrystal: [1467, 1467], + ancientStatuette: [2200, 2200], + topThree: [4400, 4400] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantOrk.ts b/src/simulation/monsters/low/n-s/RevenantOrk.ts index 971308a0a..4e8012ad6 100644 --- a/src/simulation/monsters/low/n-s/RevenantOrk.ts +++ b/src/simulation/monsters/low/n-s/RevenantOrk.ts @@ -47,12 +47,12 @@ export default new SimpleMonster({ table: RevenantOrkTable, aliases: ['revenant ork'], customKillLogic: makeRevTable({ - seeds: [2200, 1210], - uniqueTable: [5867, 3227], - ancientEmblem: [1466, 1210], - ancientTotem: [2200, 1210], - ancientCrystal: [2933, 1613], - ancientStatuette: [4400, 2420], - topThree: [8800, 4840] + seeds: [1210, 1210], + uniqueTable: [3227, 645], + ancientEmblem: [4840, 4840], + ancientTotem: [1210, 1210], + ancientCrystal: [1613, 1613], + ancientStatuette: [2420, 2420], + topThree: [4840, 4840] }) }); diff --git a/src/simulation/monsters/low/n-s/RevenantPyrefiend.ts b/src/simulation/monsters/low/n-s/RevenantPyrefiend.ts index 5ea57e604..01657d305 100644 --- a/src/simulation/monsters/low/n-s/RevenantPyrefiend.ts +++ b/src/simulation/monsters/low/n-s/RevenantPyrefiend.ts @@ -47,12 +47,12 @@ export default new SimpleMonster({ table: RevenantPyrefiendTable, aliases: ['revenant pyrefiend'], customKillLogic: makeRevTable({ - seeds: [3140, 1727], - uniqueTable: [8373, 4605], - ancientEmblem: [2093, 6908], - ancientTotem: [3140, 1727], - ancientCrystal: [4186, 2302], - ancientStatuette: [6280, 3454], - topThree: [12_560, 6908] + seeds: [1727, 1727], + uniqueTable: [4605, 921], + ancientEmblem: [6908, 6908], + ancientTotem: [1727, 1727], + ancientCrystal: [2303, 2303], + ancientStatuette: [3454, 3454], + topThree: [6908, 6908] }) }); diff --git a/src/util/util.ts b/src/util/util.ts index 2bcdfd6c5..a06047406 100644 --- a/src/util/util.ts +++ b/src/util/util.ts @@ -224,7 +224,7 @@ export const revsUniqueTable = new LootTable() export function makeRevTable(table: RevTable): CustomKillLogic { return (options: MonsterKillOptions, currentLoot: Bank) => { - const index = options.skulled ? 1 : 0; + const index = options.onSlayerTask ? 1 : 0; if (roll(table.uniqueTable[index])) { currentLoot.add(revsUniqueTable.roll()); return;