Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Amoxliatl #6237

Merged
merged 4 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docs/src/content/docs/osb/combat-achievements.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
<TabItem label="Medium">
| 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 |
Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand Down
131 changes: 131 additions & 0 deletions docs/src/content/docs/osb/monsters.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,137 @@ You can have one of the following boosts:
</Tabs>
---

## Amoxliatl

<Tabs>
<TabItem label="Information">
- 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]]

</TabItem>
<TabItem label="Costs">
- 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)]]

</TabItem>
<TabItem label="Requirements">
[[qp\:100]]

[[prayer\:43]] [[attack\:65]] [[strength\:65]] [[defence\:65]] [[hitpoints\:65]]

**Required Quests**

- The Heart of Darkness

</TabItem>
<TabItem label="Boosts">
<details>
<summary>Item in Bank Boosts</summary>
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]]

---

</details>
<details>
<summary>Equipped Item Boosts</summary>
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]]

---

</details>
<details>
<summary>Degradeable/Chargeable Item Boosts</summary>
These boosts are for items which degrade or have charges.

Melee gear boosts:

- 25% boost for [[Scythe of vitur]]

---

</details>
</TabItem>
</Tabs>
---

## Araxxor

<Tabs>
Expand Down
114 changes: 114 additions & 0 deletions packages/oldschooljs/src/data/monsters_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -14719,6 +14719,44 @@
"slayerXP": 85,
"assignableSlayerMasters": ["turael", "spria", "mazchna"]
},
"13033": {
"members": true,
"combatLevel": 98,
"hitpoints": 100,
"attackType": ["slash"],
"attackSpeed": 4,
"aggressive": true,
"poisonous": false,
"immuneToPoison": false,
"immuneToVenom": false,
"attributes": ["spectral"],
"category": ["lesser nagua"],
"wikiName": "Sulphur Nagua",
"wikiURL": "https://oldschool.runescape.wiki/w/Sulphur Nagua",
"attackLevel": 90,
"strengthLevel": 105,
"defenceLevel": 40,
"magicLevel": 50,
"rangedLevel": 1,
"attackStab": 0,
"attackSlash": 0,
"attackCrush": 0,
"attackMagic": 0,
"attackRanged": 0,
"defenceStab": 50,
"defenceSlash": 50,
"defenceCrush": 10,
"defenceMagic": 200,
"defenceRanged": 200,
"attackAccuracy": 0,
"meleeStrength": 0,
"rangedStrength": 0,
"magicDamage": 0,
"isSlayerMonster": true,
"slayerLevelRequired": 48,
"slayerXP": 105,
"assignableSlayerMasters": ["chaeldar", "konar"]
},
"13489": {
"members": true,
"combatLevel": 22,
Expand Down Expand Up @@ -14877,6 +14915,44 @@
"slayerXP": 4658,
"assignableSlayerMasters": ["turael", "spria", "nieve", "duradel"]
},
"13685": {
"members": true,
"combatLevel": 263,
"hitpoints": 520,
"attackType": ["magic"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The attackType field should be a string, not an array. Please change "attackType": ["magic"] to "attackType": "magic". This issue is also present in other entries in the file.

"attackSpeed": 8,
"aggressive": true,
"poisonous": false,
"immuneToPoison": true,
"immuneToVenom": true,
"attributes": ["Spectral"],
"category": ["lesser nagua"],
"wikiName": "Amoxliatl",
"wikiURL": "https://oldschool.runescape.wiki/w/Amoxliatl",
"attackLevel": 0,
"strengthLevel": 0,
"defenceLevel": 80,
"magicLevel": 170,
"rangedLevel": 0,
"attackStab": 0,
"attackSlash": 0,
"attackCrush": 0,
"attackMagic": 160,
"attackRanged": 0,
"defenceStab": 100,
"defenceSlash": 100,
"defenceCrush": 40,
"defenceMagic": 100,
"defenceRanged": 0,
"attackAccuracy": 0,
"meleeStrength": 0,
"rangedStrength": 0,
"magicDamage": 0,
"isSlayerMonster": true,
"slayerLevelRequired": 48,
"slayerXP": 546,
"assignableSlayerMasters": ["chaeldar", "konar"]
},
"14009": {
"members": true,
"combatLevel": 642,
Expand Down Expand Up @@ -14910,5 +14986,43 @@
"rangedStrength": 0,
"magicDamage": 0,
"isSlayerMonster": false
},
"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"]
}
}
44 changes: 44 additions & 0 deletions packages/oldschooljs/src/simulation/monsters/bosses/Amoxliatl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import LootTable from '../../../structures/LootTable';
import SimpleMonster from '../../../structures/SimpleMonster';
import { GemTable } from '../../subtables';

const SupplyTable = new LootTable()
.add('Rune mace', 1, 2)
.add('Rune pickaxe', 1, 1)
.add('Rune platebody', 1, 1)
.add('Rune platelegs', 1, 1)

.add('Water rune', [200, 400], 5)
.add('Chaos rune', [30, 60], 4)
.add('Death rune', [20, 40], 4)
.add('Blood rune', [15, 30], 4)
.add('Soul rune', [15, 30], 4)
.add('Nature rune', [30, 60], 3)

.add('Coal', [20, 30], 5)
.add('Gold ore', [20, 30], 5)
.add('Adamantite ore', [5, 10], 4)
.add('Prayer potion(3)', 1, 2)
.add('Runite ore', 1, 2)
.add('Blessed bone shards', [60, 100], 2)
.add('Water orb', [10, 20], 2)
.add('Water talisman', 1, 2)
.add(GemTable, 1, 2);

const TearTable = new LootTable().add('Frozen tear', [2, 4]).add('Frozen tear', [5, 10]).add('Frozen tear', [10, 20]);

const AmoxliatlTable = new LootTable()
.tertiary(3000, 'Moxi')
.tertiary(500, 'Tooth half of key (moon key)')
.tertiary(200, 'Clue scroll (elite)')
.tertiary(100, 'Glacial temotli')
.tertiary(25, 'Pendant of ates (inert)')
.every(SupplyTable, 2)
.every(TearTable);

export const Amoxliatl = new SimpleMonster({
id: 13685,
name: 'Amoxliatl',
table: AmoxliatlTable,
aliases: ['amoxliatl']
});
2 changes: 2 additions & 0 deletions packages/oldschooljs/src/simulation/monsters/bosses/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Amoxliatl } from './Amoxliatl';
import { Araxxor } from './Araxxor';
import { AwakenedDukeSucellus } from './AwakenedDukeSucellus';
import { AwakenedTheLeviathan } from './AwakenedTheLeviathan';
Expand Down Expand Up @@ -60,6 +61,7 @@ export const allBosses = {
AwakenedVardorvis,
Scurrius,
TheHueycoatl,
Amoxliatl,
...allWildyBosses,
...allSlayerBosses
};
36 changes: 36 additions & 0 deletions packages/oldschooljs/src/simulation/monsters/low/a-f/FrostNagua.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import LootTable from '../../../../structures/LootTable';
import SimpleMonster from '../../../../structures/SimpleMonster';
import { GemTable } from '../../../subtables';

const FrostNaguaTable = new LootTable()
.tertiary(7000, 'Tooth half of key (moon key)')
.tertiary(500, 'Glacial temotli')
.tertiary(100, 'Pendant of ates (inert)')
.tertiary(10, 'Frozen tear', [5, 10])
.tertiary(256, 'Clue scroll (hard)')

.add('Water rune', [10, 30], 3)
.add('Water rune', [30, 100], 3)
.add('Chaos rune', [20, 40], 3)
.add('Death rune', [10, 30], 2)
.add('Nature rune', [10, 20], 2)

.add('Coal', [10, 15], 3)
.add('Gold ore', [10, 20], 3)
.add('Soft clay', [10, 20], 3)
.add('Mithril ore', [5, 10], 2)

.add('Water orb', [2, 6], 3)
.add('Prayer potion(1)', 1, 2)
.add('Rune mace', 1, 1)
.add('Water talisman', 1, 1)
.add('Blessed bone shards', [30, 50], 1)
.add('Jug of water', [10, 30], 1)
.add(GemTable);

export const FrostNagua = new SimpleMonster({
id: 13_728,
name: 'Frost Nagua',
table: FrostNaguaTable,
aliases: ['frost nagua']
});
Loading