Skip to content

Commit

Permalink
Merge branch 'master' into ForestryUpdate
Browse files Browse the repository at this point in the history
  • Loading branch information
nwjgit authored Mar 6, 2024
2 parents 8e0d0c0 + 36954f4 commit 6f815fc
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 4 deletions.
7 changes: 6 additions & 1 deletion src/lib/data/CollectionsExport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1848,7 +1848,12 @@ export const slayerCL = resolveItems([
// "Dagon'hai hat",
// "Dagon'hai robe top",
// "Dagon'hai robe bottom",
'Blood shard'
'Blood shard',
'Ancient ceremonial mask',
'Ancient ceremonial top',
'Ancient ceremonial legs',
'Ancient ceremonial gloves',
'Ancient ceremonial boots'
]);
export const tzHaarCL = resolveItems([
'Obsidian cape',
Expand Down
3 changes: 2 additions & 1 deletion src/lib/data/createables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1511,7 +1511,8 @@ const Createables: Createable[] = [
},
cantHaveItems: {
[itemID('Hell cat ears')]: 1
}
},
noCl: true
},
// Runecrafting Pouches
{
Expand Down
21 changes: 21 additions & 0 deletions src/lib/minions/data/killableMonsters/low.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { SkillsEnum } from 'oldschooljs/dist/constants';

import { GearStat } from '../../../gear/types';
import itemID from '../../../util/itemID';
import resolveItems from '../../../util/resolveItems';
import { KillableMonster } from '../../types';

const killableMonsters: KillableMonster[] = [
Expand Down Expand Up @@ -140,6 +141,26 @@ const killableMonsters: KillableMonster[] = [
attackStyleToUse: GearStat.AttackRanged,
defaultAttackStyles: [SkillsEnum.Ranged, SkillsEnum.Magic],
disallowedAttackStyles: [SkillsEnum.Attack, SkillsEnum.Strength]
},
{
id: Monsters.BloodReaver.id,
name: Monsters.BloodReaver.name,
aliases: Monsters.BloodReaver.aliases,
timeToFinish: Time.Second * 25,
table: Monsters.BloodReaver,
wildy: false,
difficultyRating: 3,
qpRequired: 1,
itemsRequired: resolveItems(['Frozen key']),
healAmountNeeded: 30,
attackStyleToUse: GearStat.AttackRanged,
disallowedAttackStyles: [SkillsEnum.Magic],
attackStylesUsed: [GearStat.AttackMagic],
itemInBankBoosts: [
{
[itemID('Arclight')]: 10
}
]
}
];

Expand Down
1 change: 1 addition & 0 deletions tests/unit/snapshots/banksnapshots.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -7245,6 +7245,7 @@ exports[`OSB Creatables 1`] = `
"frozen": false,
},
"name": "Hell cat ears",
"noCl": true,
"outputItems": Bank {
"bank": {
"24527": 1,
Expand Down
9 changes: 7 additions & 2 deletions tests/unit/snapshots/clsnapshots.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Chompy Birds (19)
Commander Zilyana (8)
Corporeal Beast (7)
Crazy archaeologist (3)
Creatables (661)
Creatables (660)
Creature Creation (7)
Cyclopes (8)
Dagannoth Kings (10)
Expand Down Expand Up @@ -87,7 +87,7 @@ Shooting Stars (2)
Skilling (41)
Skilling Pets (8)
Skotizo (6)
Slayer (65)
Slayer (70)
Soul Wars (3)
Temple Trekking (4)
Tempoross (12)
Expand Down Expand Up @@ -202,6 +202,11 @@ Ancient astroscope
Ancient blessing
Ancient bracers
Ancient carcanet
Ancient ceremonial boots
Ancient ceremonial gloves
Ancient ceremonial legs
Ancient ceremonial mask
Ancient ceremonial top
Ancient chaps
Ancient cloak
Ancient coif
Expand Down

0 comments on commit 6f815fc

Please sign in to comment.