Amoxliatl and naguas (#6237)

oldschoolgg · Dec 11, 2024 · c2b2b79 · c2b2b79
1 parent d6d03ac
commit c2b2b79
Show file tree

Hide file tree

Showing 15 changed files with 458 additions and 107 deletions.
diff --git 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
 <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 |
@@ -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
@@ -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>

diff --git 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"]
 	}
-}
+}
diff --git 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
@@ -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
@@ -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)
+		}
 	}
 ];