From c2b2b7943f094221eb3452008ec519cd6bfec612 Mon Sep 17 00:00:00 2001 From: GC <30398469+gc@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:05:31 +1100 Subject: [PATCH] Amoxliatl and naguas (#6237) --- .../content/docs/osb/combat-achievements.mdx | 9 ++ docs/src/content/docs/osb/monsters.mdx | 131 +++++++++++++++++ .../oldschooljs/src/data/monsters_data.json | 120 +++------------ .../src/simulation/monsters/low/index.ts | 6 +- .../monsters/low/n-s/SulphurNagua.ts | 2 +- src/lib/combat_achievements/elite.ts | 22 +++ src/lib/combat_achievements/hard.ts | 56 +++++++ src/lib/combat_achievements/medium.ts | 24 +++ src/lib/data/Collections.ts | 6 + src/lib/data/CollectionsExport.ts | 5 +- .../data/killableMonsters/bosses/misc.ts | 138 ++++++++++++++++++ src/lib/minions/data/killableMonsters/low.ts | 20 +++ src/lib/slayer/tasks/chaeldarTasks.ts | 11 +- src/lib/slayer/tasks/konarTasks.ts | 8 + tests/unit/snapshots/clsnapshots.test.ts.snap | 7 +- 15 files changed, 458 insertions(+), 107 deletions(-) diff --git a/docs/src/content/docs/osb/combat-achievements.mdx b/docs/src/content/docs/osb/combat-achievements.mdx index 015d9289e9a..349ba7a6402 100644 --- a/docs/src/content/docs/osb/combat-achievements.mdx +++ b/docs/src/content/docs/osb/combat-achievements.mdx @@ -139,6 +139,8 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier | Monster | Task Name | How To Unlock | | -- | -- | -- | +| Amoxliatl | Temotli Triumph | 1 in 10 chance per kill | +| Amoxliatl | Amoxliatl Champion | 1x Amoxliatl KC | | Barrows | Pray for Success | 1 in 10 chance per kill | | Barrows | Barrows Champion | 25x Barrows KC | | Barrows | Can't Touch Me | 1 in 50 chance per kill | @@ -192,6 +194,11 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier | Abyssal Sire | Don't Whip Me | 1 in 10 chance per kill | | Abyssal Sire | Don't Stop Moving | 1 in 10 chance per kill | | Abyssal Sire | They Grow Up Too Fast | 1 in 10 chance per kill | +| Amoxliatl | Nagua Negation | 1 in 25 chance per kill | +| Amoxliatl | Amoxliatl Adept | 20x Amoxliatl KC | +| Amoxliatl | Totally Shattered | 1 in 50 chance per kill | +| Amoxliatl | Kemo Makti | 1 in 50 chance per kill | +| Amoxliatl | Amoxliatl Speed-Trialist | 1 in 70 chance per kill | | Barrows | Faithless Crypt Run | 1 in 2 chance per kill | | Barrows | Just Like That | 1 in 5 chance per kill | | Callisto | Callisto Adept | 10x Callisto KC | @@ -263,6 +270,8 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier | Abyssal Sire | Demonic Rebound | 1 in 10 chance per kill | | Abyssal Sire | Respiratory Runner | 1 in 10 chance per kill | | Alchemical Hydra | Alchemical Veteran | 75x Alchemical Hydra KC | +| Amoxliatl | Amoxliatl Speed-Chaser | 1 in 120 chance per kill | +| Amoxliatl | Without Ralos' Light | 1 in 150 chance per kill | | Araxxor | Araxxor Veteran | 25x Araxxor KC | | Araxxor | Araxxor Speed-Trialist | 1 in 1 chance per kill | | Araxxor | Relaxxor | 1 in 10 chance per kill | diff --git a/docs/src/content/docs/osb/monsters.mdx b/docs/src/content/docs/osb/monsters.mdx index d209ba9485f..bed34ab324b 100644 --- a/docs/src/content/docs/osb/monsters.mdx +++ b/docs/src/content/docs/osb/monsters.mdx @@ -216,6 +216,137 @@ You can have one of the following boosts: --- +## Amoxliatl + + + + - You can view the drops for this monster on the osrs wiki: [Amoxliatl](https://oldschool.runescape.wiki/w/Amoxliatl) + +- You can send your minion to kill this monster using: [[/k name\:Amoxliatl]] + +- You can check your KC using: [[/minion kc name\:Amoxliatl]] + +- You can check the KC leaderboard using: [[/lb kc monster\:Amoxliatl]] + +- You can check your collection log using: [[/cl name\:Amoxliatl]] + +- You can check the collection log leaderboard using: [[/lb cl cl\:Amoxliatl]] + + + + - Requires food in your bank to kill, the amount needed is heavily reduced based on your gear/experience. + +**Item Cost** + +- [[Super restore(4)]] or [[Prayer potion(4)]] + +- [[Super combat potion(4)]] + + + + [[qp\:100]] + +[[prayer\:43]] [[attack\:65]] [[strength\:65]] [[defence\:65]] [[hitpoints\:65]] + +**Required Quests** + +- The Heart of Darkness + + + +
+Item in Bank Boosts +These boosts are applied from just being in your bank, and do not need to be equipped (but can also be equipped). The best boost you can use will automatically be used. + +You can have one of the following boosts: + +- 5% boost for [[Pendant of ates (inert)]] + +--- + +You can have one of the following boosts: + +- 5% boost for [[Dragon claws]] + +--- + +
+
+Equipped Item Boosts +To get these boosts, you need the item equipped in the right setup. The best boost you can use will automatically be used. + +Melee gear boosts: + +- 7% boost for [[Avernic defender]] + +--- + +Melee gear boosts: + +- 7% boost for [[Amulet of rancour]] + +- 2% boost for [[Amulet of torture]] + +--- + +Melee gear boosts: + +- 7% boost for [[Infernal cape]] + +- 2% boost for [[Fire cape]] + +--- + +Melee gear boosts: + +- 7% boost for [[Ferocious gloves]] + +- 2% boost for [[Barrows gloves]] + +--- + +Melee gear boosts: + +- 10% boost for [[Inquisitor's hauberk]] + +- 5% boost for [[Torva platebody]] + +- 5% boost for [[Bandos chestplate]] + +--- + +Melee gear boosts: + +- 10% boost for [[Inquisitor's plateskirt]] + +- 5% boost for [[Torva platelegs]] + +- 5% boost for [[Bandos tassets]] + +--- + +Melee gear boosts: + +- 5% boost for [[Primordial boots]] + +--- + +
+
+Degradeable/Chargeable Item Boosts +These boosts are for items which degrade or have charges. + +Melee gear boosts: + +- 25% boost for [[Scythe of vitur]] + +--- + +
+ + +--- + ## Araxxor diff --git a/packages/oldschooljs/src/data/monsters_data.json b/packages/oldschooljs/src/data/monsters_data.json index 32e81e06480..8599d7446b0 100644 --- a/packages/oldschooljs/src/data/monsters_data.json +++ b/packages/oldschooljs/src/data/monsters_data.json @@ -14679,45 +14679,6 @@ "slayerXP": 1400, "assignableSlayerMasters": ["konar", "nieve", "duradel"] }, - "12490": { - "members": true, - "combatLevel": 121, - "hitpoints": 200, - "attackType": ["crush"], - "attackSpeed": 4, - "aggressive": false, - "poisonous": false, - "immuneToPoison": false, - "immuneToVenom": false, - "attributes": [], - "category": ["warped creatures"], - "wikiName": "Warped Tortoise", - "wikiURL": "https://oldschool.runescape.wiki/w/Warped Tortoise", - "attackLevel": 78, - "strengthLevel": 106, - "defenceLevel": 78, - "magicLevel": 50, - "rangedLevel": 0, - "attackStab": 0, - "attackSlash": 0, - "attackCrush": 0, - "attackMagic": 0, - "attackRanged": 0, - "defenceStab": 50, - "defenceSlash": 50, - "defenceCrush": 0, - "defenceMagic": 0, - "defenceRanged": 60, - "attackAccuracy": 0, - "meleeStrength": 0, - "rangedStrength": 0, - "magicDamage": 0, - "isSlayerMonster": true, - "slayerLevelRequired": 56, - "slayerXP": 200, - "assignableSlayerMasters": ["chaeldar", "konar", "nieve", "duradel"], - "id": 12490 - }, "12720": { "members": true, "combatLevel": 85, @@ -14992,44 +14953,6 @@ "slayerXP": 546, "assignableSlayerMasters": ["chaeldar", "konar"] }, - "13728": { - "members": true, - "combatLevel": 104, - "hitpoints": 120, - "attackType": ["magic"], - "attackSpeed": 5, - "aggressive": true, - "poisonous": false, - "immuneToPoison": false, - "immuneToVenom": false, - "attributes": ["spectral"], - "category": ["lesser nagua"], - "wikiName": "Frost Nagua", - "wikiURL": "https://oldschool.runescape.wiki/w/Frost Nagua", - "attackLevel": 1, - "strengthLevel": 1, - "defenceLevel": 40, - "magicLevel": 90, - "rangedLevel": 1, - "attackStab": 0, - "attackSlash": 0, - "attackCrush": 0, - "attackMagic": 70, - "attackRanged": 0, - "defenceStab": 50, - "defenceSlash": 50, - "defenceCrush": 10, - "defenceMagic": 60, - "defenceRanged": 0, - "attackAccuracy": 0, - "meleeStrength": 0, - "rangedStrength": 0, - "magicDamage": 0, - "isSlayerMonster": true, - "slayerLevelRequired": 48, - "slayerXP": 120, - "assignableSlayerMasters": ["chaeldar", "konar"] - }, "14009": { "members": true, "combatLevel": 642, @@ -15064,41 +14987,42 @@ "magicDamage": 0, "isSlayerMonster": false }, - "12491": { - "id": 12491, + "13728": { "members": true, - "combatLevel": 0, - "attackType": ["ranged", "crush"], - "attackSpeed": 4, + "combatLevel": 104, + "hitpoints": 120, + "attackType": ["magic"], + "attackSpeed": 5, "aggressive": true, "poisonous": false, "immuneToPoison": false, "immuneToVenom": false, - "attributes": [], - "category": ["warped creatures"], - "wikiName": "Warped Terrorbird", - "wikiURL": "https://oldschool.runescape.wiki/w/Warped Terrorbird", - "attackLevel": 0, - "strengthLevel": 0, - "defenceLevel": 0, - "magicLevel": 0, - "rangedLevel": 0, + "attributes": ["spectral"], + "category": ["lesser nagua"], + "wikiName": "Frost Nagua", + "wikiURL": "https://oldschool.runescape.wiki/w/Frost Nagua", + "attackLevel": 1, + "strengthLevel": 1, + "defenceLevel": 40, + "magicLevel": 90, + "rangedLevel": 1, "attackStab": 0, "attackSlash": 0, "attackCrush": 0, - "attackMagic": 0, + "attackMagic": 70, "attackRanged": 0, "defenceStab": 50, "defenceSlash": 50, - "defenceCrush": 0, - "defenceMagic": 0, - "defenceRanged": 62, + "defenceCrush": 10, + "defenceMagic": 60, + "defenceRanged": 0, "attackAccuracy": 0, "meleeStrength": 0, "rangedStrength": 0, "magicDamage": 0, "isSlayerMonster": true, - "slayerLevelRequired": 56, - "assignableSlayerMasters": ["chaeldar", "konar", "nieve", "duradel"] + "slayerLevelRequired": 48, + "slayerXP": 120, + "assignableSlayerMasters": ["chaeldar", "konar"] } -} \ No newline at end of file +} diff --git a/packages/oldschooljs/src/simulation/monsters/low/index.ts b/packages/oldschooljs/src/simulation/monsters/low/index.ts index 6583e4e64f1..3640041b189 100644 --- a/packages/oldschooljs/src/simulation/monsters/low/index.ts +++ b/packages/oldschooljs/src/simulation/monsters/low/index.ts @@ -257,8 +257,6 @@ import Vyrewatch from './t-z/Vyrewatch'; import VyrewatchSentinel from './t-z/VyrewatchSentinel'; import WallBeast from './t-z/WallBeast'; import WarpedJelly from './t-z/WarpedJelly'; -import { WarpedTerrorbird } from './t-z/WarpedTerrorbird'; -import { WarpedTortoise } from './t-z/WarpedTortoise'; import WarriorWoman from './t-z/WarriorWoman'; import Waterfiend from './t-z/Waterfiend'; import WealthyCitizen from './t-z/WealthyCitizen'; @@ -549,7 +547,5 @@ export const allLowMonsters = { ChilledJelly, WealthyCitizen, FrostNagua, - SulphurNagua, - WarpedTerrorbird, - WarpedTortoise + SulphurNagua }; diff --git a/packages/oldschooljs/src/simulation/monsters/low/n-s/SulphurNagua.ts b/packages/oldschooljs/src/simulation/monsters/low/n-s/SulphurNagua.ts index 53d7d2af336..86b3f7d3741 100644 --- a/packages/oldschooljs/src/simulation/monsters/low/n-s/SulphurNagua.ts +++ b/packages/oldschooljs/src/simulation/monsters/low/n-s/SulphurNagua.ts @@ -9,7 +9,7 @@ const SulphurNaguaTable = new LootTable() .add('Fire rune', [10, 40], 26) .add('Fire rune', [40, 60], 14) .add('Chaos rune', [40, 60], 11) - .add('Nature rune', [5, 10], 4) + .add('Nature rune', [50, 10], 4) .add('Death rune', [40, 60], 2) .add('Iron ore', [5, 10], 27) diff --git a/src/lib/combat_achievements/elite.ts b/src/lib/combat_achievements/elite.ts index faf12f0b50a..722a5c9771a 100644 --- a/src/lib/combat_achievements/elite.ts +++ b/src/lib/combat_achievements/elite.ts @@ -1761,5 +1761,27 @@ export const eliteCombatAchievements: CombatAchievement[] = [ chancePerKill: 50, hasChance: isCertainMonsterTrip(Monsters.TheHueycoatl.id) } + }, + { + id: 1152, + name: 'Amoxliatl Speed-Chaser', + desc: 'Kill Amoxliatl in less than 30 seconds.', + type: 'speed', + monster: 'Amoxliatl', + rng: { + chancePerKill: 120, + hasChance: isCertainMonsterTrip(Monsters.Amoxliatl.id) + } + }, + { + id: 1153, + name: "Without Ralos' Light", + desc: 'Kill Amoxliatl without losing any prayer points.', + type: 'restriction', + monster: 'Amoxliatl', + rng: { + chancePerKill: 150, + hasChance: isCertainMonsterTrip(Monsters.Amoxliatl.id) + } } ]; diff --git a/src/lib/combat_achievements/hard.ts b/src/lib/combat_achievements/hard.ts index 0350b615c15..a23d92c39e2 100644 --- a/src/lib/combat_achievements/hard.ts +++ b/src/lib/combat_achievements/hard.ts @@ -771,5 +771,61 @@ export const hardCombatAchievements: CombatAchievement[] = [ [Monsters.TheHueycoatl.id]: 10 } }) + }, + { + id: 266, + name: 'Nagua Negation', + desc: 'Kill Amoxliatl without taking any damage.', + type: 'perfection', + monster: 'Amoxliatl', + rng: { + chancePerKill: 25, + hasChance: isCertainMonsterTrip(Monsters.Amoxliatl.id) + } + }, + { + id: 267, + name: 'Amoxliatl Adept', + desc: 'Kill Amoxliatl 20 times.', + type: 'kill_count', + monster: 'Amoxliatl', + requirements: new Requirements().add({ + kcRequirement: { + [Monsters.Amoxliatl.id]: 20 + } + }) + }, + { + id: 268, + name: 'Totally Shattered', + desc: 'Kill Amoxliatl without any of her unstable ice shattering.', + type: 'mechanical', + monster: 'Amoxliatl', + rng: { + chancePerKill: 50, + hasChance: isCertainMonsterTrip(Monsters.Amoxliatl.id) + } + }, + { + id: 269, + name: 'Kemo Makti', + desc: 'Kill Amoxliatl 10 times without leaving her chamber.', + type: 'mechanical', + monster: 'Amoxliatl', + rng: { + chancePerKill: 50, + hasChance: isCertainMonsterTrip(Monsters.Amoxliatl.id) + } + }, + { + id: 270, + name: 'Amoxliatl Speed-Trialist', + desc: 'Kill Amoxliatl in less than 1 minute.', + type: 'speed', + monster: 'Amoxliatl', + rng: { + chancePerKill: 70, + hasChance: isCertainMonsterTrip(Monsters.Amoxliatl.id) + } } ]; diff --git a/src/lib/combat_achievements/medium.ts b/src/lib/combat_achievements/medium.ts index 4e6df5366e2..6ae2ef32e33 100644 --- a/src/lib/combat_achievements/medium.ts +++ b/src/lib/combat_achievements/medium.ts @@ -548,5 +548,29 @@ export const mediumCombatAchievements: CombatAchievement[] = [ [Monsters.TheHueycoatl.id]: 1 } }) + }, + { + id: 146, + name: 'Temotli Triumph', + desc: 'Kill Amoxliatl using only glacial temotli as a weapon.', + type: 'restriction', + monster: 'Amoxliatl', + rng: { + chancePerKill: 10, + hasChance: (data, user) => + isCertainMonsterTrip(Monsters.Amoxliatl.id)(data) && user.hasEquipped('Glacial temotli') + } + }, + { + id: 147, + name: 'Amoxliatl Champion', + desc: 'Kill Amoxliatl once.', + type: 'kill_count', + monster: 'Amoxliatl', + requirements: new Requirements().add({ + kcRequirement: { + [Monsters.Amoxliatl.id]: 1 + } + }) } ]; diff --git a/src/lib/data/Collections.ts b/src/lib/data/Collections.ts index 4040e08b434..42dc0765a0f 100644 --- a/src/lib/data/Collections.ts +++ b/src/lib/data/Collections.ts @@ -58,6 +58,7 @@ import { akumuCL, alchemicalHydraCL, allPetsCL, + amoxliatlCL, araxxorCL, balthazarsBigBonanzaCL, barbarianAssaultCL, @@ -246,6 +247,11 @@ export const allCollectionLogs: ICollection = { items: alchemicalHydraCL, fmtProg: kcProg(Monsters.AlchemicalHydra) }, + Amoxliatl: { + allItems: uniqueArr([...amoxliatlCL, ...Monsters.Amoxliatl.allItems]), + items: amoxliatlCL, + fmtProg: kcProg(Monsters.Amoxliatl) + }, Araxxor: { alias: [...Monsters.Araxxor.aliases, 'rax'], allItems: uniqueArr([...araxxorCL, ...Monsters.Araxxor.allItems]), diff --git a/src/lib/data/CollectionsExport.ts b/src/lib/data/CollectionsExport.ts index 027ad1e01d8..2c773e2527e 100644 --- a/src/lib/data/CollectionsExport.ts +++ b/src/lib/data/CollectionsExport.ts @@ -1761,7 +1761,8 @@ export const allPetsCL = resolveItems([ 'Scurry', 'Smol heredit', 'Nid', - 'Huberte' + 'Huberte', + 'Moxi' ]); export const camdozaalCL = resolveItems([ 'Barronite mace', @@ -3343,3 +3344,5 @@ export const araxxorCL = resolveItems([ 'Jar of venom', 'Coagulated venom' ]); + +export const amoxliatlCL = resolveItems(['Moxi', 'Glacial temotli', 'Pendant of ates (inert)', 'Frozen tear']); diff --git a/src/lib/minions/data/killableMonsters/bosses/misc.ts b/src/lib/minions/data/killableMonsters/bosses/misc.ts index 03492485718..caf6cd6ee70 100644 --- a/src/lib/minions/data/killableMonsters/bosses/misc.ts +++ b/src/lib/minions/data/killableMonsters/bosses/misc.ts @@ -958,6 +958,144 @@ const killableBosses: KillableMonster[] = [ qtyPerKill: 0.24 } ] + }, + { + id: Monsters.Amoxliatl.id, + name: Monsters.Amoxliatl.name, + aliases: Monsters.Amoxliatl.aliases, + timeToFinish: Time.Minute * 3, + respawnTime: 500, + table: Monsters.Amoxliatl, + requiredQuests: [QuestID.TheHeartofDarkness], + qpRequired: 100, + deathProps: { + hardness: 0.2, + steepness: 0.99 + }, + equippedItemBoosts: [ + { + items: [{ boostPercent: 7, itemID: itemID('Avernic defender') }], + gearSetup: 'melee' + }, + { + items: [ + { boostPercent: 7, itemID: itemID('Amulet of rancour') }, + { boostPercent: 2, itemID: itemID('Amulet of torture') } + ], + gearSetup: 'melee', + required: false + }, + { + items: [ + { boostPercent: 7, itemID: itemID('Infernal cape') }, + { boostPercent: 2, itemID: itemID('Fire cape') } + ], + gearSetup: 'melee', + required: false + }, + { + items: [ + { boostPercent: 7, itemID: itemID('Ferocious gloves') }, + { boostPercent: 2, itemID: itemID('Barrows gloves') } + ], + gearSetup: 'melee', + required: false + }, + { + items: resolveItems(["Inquisitor's hauberk", 'Torva platebody', 'Bandos chestplate']).map( + (id, index) => ({ + boostPercent: index === 0 ? 10 : 5, + itemID: id + }) + ), + gearSetup: 'melee', + required: false + }, + { + items: resolveItems(["Inquisitor's plateskirt", 'Torva platelegs', 'Bandos tassets']).map( + (id, index) => ({ + boostPercent: index === 0 ? 10 : 5, + itemID: id + }) + ), + gearSetup: 'melee', + required: false + }, + { + items: resolveItems(['Primordial boots']).map(id => ({ boostPercent: 5, itemID: id })), + gearSetup: 'melee', + required: false + } + ], + itemInBankBoosts: [ + { + [itemID('Pendant of ates (inert)')]: 5 + }, + { + [itemID('Dragon claws')]: 5 + } + ], + degradeableItemUsage: [ + { + required: false, + gearSetup: 'melee', + items: [ + { + itemID: itemID('Scythe of vitur'), + boostPercent: 25 + } + ] + } + ], + levelRequirements: { + prayer: 43, + attack: 65, + strength: 65, + defence: 65, + hitpoints: 65 + }, + attackStyleToUse: GearStat.AttackSlash, + attackStylesUsed: [GearStat.AttackMagic], + defaultAttackStyles: [SkillsEnum.Attack], + healAmountNeeded: 40 * 10, + minimumGearRequirements: { + melee: { + ...new Gear({ + neck: 'Amulet of fury', + cape: 'Fire cape', + body: 'Bandos chestplate', + legs: 'Bandos tassets', + hands: 'Ferocious gloves', + feet: 'Dragon boots', + ring: 'Berserker ring (i)', + ammo: "Rada's blessing 3" + }).stats, + defence_magic: 0, + prayer: 0, + defence_crush: 0, + defence_ranged: 0, + defence_slash: 0, + defence_stab: 0 + } + }, + itemCost: [ + { + itemCost: new Bank().add('Super restore(4)'), + qtyPerKill: 0.2, + alternativeConsumables: [ + { + itemCost: new Bank().add('Prayer potion(4)'), + qtyPerKill: 0.2 + } + ] + }, + { + itemCost: new Bank().add('Super combat potion(4)'), + qtyPerMinute: 0.03, + optional: true, + boostPercent: 7 + } + ] } ]; diff --git a/src/lib/minions/data/killableMonsters/low.ts b/src/lib/minions/data/killableMonsters/low.ts index d36897ef577..a8948b709bf 100644 --- a/src/lib/minions/data/killableMonsters/low.ts +++ b/src/lib/minions/data/killableMonsters/low.ts @@ -197,6 +197,26 @@ const killableMonsters: KillableMonster[] = [ attackStyleToUse: GearStat.AttackCrush, attackStylesUsed: [GearStat.AttackCrush], itemsRequired: resolveItems(['Fishbowl helmet', 'Diving apparatus']) + }, + { + id: Monsters.FrostNagua.id, + name: Monsters.FrostNagua.name, + aliases: Monsters.FrostNagua.aliases, + timeToFinish: Time.Second * 28.2, + table: Monsters.FrostNagua, + healAmountNeeded: 100, + attackStyleToUse: GearStat.AttackCrush, + attackStylesUsed: [GearStat.AttackCrush] + }, + { + id: Monsters.SulphurNagua.id, + name: Monsters.SulphurNagua.name, + aliases: Monsters.SulphurNagua.aliases, + timeToFinish: Time.Second * 28.2, + table: Monsters.SulphurNagua, + healAmountNeeded: 100, + attackStyleToUse: GearStat.AttackCrush, + attackStylesUsed: [GearStat.AttackCrush] } ]; diff --git a/src/lib/slayer/tasks/chaeldarTasks.ts b/src/lib/slayer/tasks/chaeldarTasks.ts index 685ad38cca7..337b5adc6f5 100644 --- a/src/lib/slayer/tasks/chaeldarTasks.ts +++ b/src/lib/slayer/tasks/chaeldarTasks.ts @@ -395,5 +395,14 @@ export const chaeldarTasks: AssignableSlayerTask[] = [ unlocked: true }, ...bossTasks, - ...polyporeTasks + ...polyporeTasks, + { + monster: Monsters.Amoxliatl, + amount: [50, 100], + weight: 4, + monsters: [Monsters.Amoxliatl.id, Monsters.FrostNagua.id, Monsters.SulphurNagua.id], + slayerLevel: 48, + unlocked: true + }, + ...bossTasks ]; diff --git a/src/lib/slayer/tasks/konarTasks.ts b/src/lib/slayer/tasks/konarTasks.ts index 31c9dfbf876..8ac9161e4ef 100644 --- a/src/lib/slayer/tasks/konarTasks.ts +++ b/src/lib/slayer/tasks/konarTasks.ts @@ -445,5 +445,13 @@ export const konarTasks: AssignableSlayerTask[] = [ slayerLevel: 62, unlocked: true }, + { + monster: Monsters.Amoxliatl, + amount: [55, 120], + weight: 2, + monsters: [Monsters.Amoxliatl.id, Monsters.FrostNagua.id, Monsters.SulphurNagua.id], + slayerLevel: 48, + unlocked: true + }, ...bossTasks ]; diff --git a/tests/unit/snapshots/clsnapshots.test.ts.snap b/tests/unit/snapshots/clsnapshots.test.ts.snap index 7ea98c52ae6..588e886def3 100644 --- a/tests/unit/snapshots/clsnapshots.test.ts.snap +++ b/tests/unit/snapshots/clsnapshots.test.ts.snap @@ -5,7 +5,8 @@ exports[`OSB Collection Log Groups/Categories 1`] = ` Achievement Diary (48) Aerial Fishing (9) Alchemical Hydra (11) -All Pets (60) +All Pets (61) +Amoxliatl (4) Araxxor (10) Barbarian Assault (11) Barrows Chests (25) @@ -729,6 +730,7 @@ Frog slippers Frog token Frozen cache Frozen tablet +Frozen tear Frozen whip mix Funky shaped log Fury ornament kit @@ -762,6 +764,7 @@ Gilded smile flag Gilded spade Gilded spear Gilded sq shield +Glacial temotli Gloves of darkness Gnome goggles Gnome scarf @@ -1075,6 +1078,7 @@ Monocle Mort'ton teleport Mos le'harmless teleport Mossy key +Moxi Mud battlestaff Mudskipper hat Mummy's body @@ -1149,6 +1153,7 @@ Pearl fly fishing rod Pegasian crystal Penance gloves Penance skirt +Pendant of ates (inert) Penguin mask Pest control teleport Pet chaos elemental