Merge branch 'master' into armouredZombie

oldschoolgg · Sep 17, 2024 · 4beec62 · 4beec62
2 parents 3bb31d3 + b977a2c
commit 4beec62
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 5 deletions.
diff --git a/src/data/monsters_data.json b/src/data/monsters_data.json
@@ -8199,6 +8199,46 @@
 		"slayerXP": 34,
 		"assignableSlayerMasters": ["turael", "spria", "mazchna"]
 	},
+	"4819": {
+		"members": true,
+		"combatLevel": 23,
+		"hitpoints": 19,
+		"maxHit": 3,
+		"attackType": ["crush"],
+		"attackSpeed": 4,
+		"aggressive": false,
+		"poisonous": false,
+		"immuneToPoison": false,
+		"immuneToVenom": false,
+		"attributes": [],
+		"category": [],
+		"examineText": "Nice claw!",
+		"wikiName": "Crab (Level 23)",
+		"wikiURL": "https://oldschool.runescape.wiki/w/Crab#Level_23",
+		"attackLevel": 19,
+		"strengthLevel": 20,
+		"defenceLevel": 26,
+		"magicLevel": 1,
+		"rangedLevel": 1,
+		"attackStab": 0,
+		"attackSlash": 0,
+		"attackCrush": 0,
+		"attackMagic": 0,
+		"attackRanged": 0,
+		"defenceStab": 0,
+		"defenceSlash": 0,
+		"defenceCrush": 0,
+		"defenceMagic": 0,
+		"defenceRanged": 0,
+		"attackAccuracy": 0,
+		"meleeStrength": 0,
+		"rangedStrength": 0,
+		"magicDamage": 0,
+		"isSlayerMonster": false,
+		"slayerLevelRequired": 0,
+		"slayerXP": 0,
+		"assignableSlayerMasters": []
+	},
 	"4863": {
 		"members": true,
 		"combatLevel": 9,

diff --git a/src/simulation/monsters/low/a-f/Crab.ts b/src/simulation/monsters/low/a-f/Crab.ts
@@ -0,0 +1,18 @@
+import LootTable from "../../../../structures/LootTable";
+import SimpleMonster from "../../../../structures/SimpleMonster";
+
+const freshCrabTable = new LootTable().add("Fresh crab claw", 1, 1).add("Fresh crab shell", 1, 1);
+
+export const CrabTable = new LootTable()
+	.every("Crab meat")
+
+	.add(new LootTable(), 5, 1) // Nothing drop
+	.add(freshCrabTable, 4, 1)
+	.add("Oyster", 1, 1);
+
+export default new SimpleMonster({
+	id: 4819,
+	name: "Crab",
+	table: CrabTable,
+	aliases: ["crab"],
+});
diff --git a/src/simulation/monsters/low/index.ts b/src/simulation/monsters/low/index.ts
@@ -51,6 +51,7 @@ import ChompyBird from "./a-f/ChompyBird";
 import Cockatrice from "./a-f/Cockatrice";
 import Cow from "./a-f/Cow";
 import CowCalf from "./a-f/CowCalf";
+import Crab from "./a-f/Crab";
 import CrawlingHand from "./a-f/CrawlingHand";
 import Crocodile from "./a-f/Crocodile";
 import CryptRat from "./a-f/CryptRat";
@@ -536,4 +537,5 @@ export const allLowMonsters = {
 	ZombiePirate,
 	TormentedDemon,
 	ArmouredZombie,
+	Crab,
 };
diff --git a/src/simulation/monsters/low/t-z/ZombiePirate.ts b/src/simulation/monsters/low/t-z/ZombiePirate.ts
@@ -4,6 +4,11 @@ import SimpleMonster from "../../../../structures/SimpleMonster";
 export const ZombiePirateTable = new LootTable()
 	.every("Bones")
 
+	/* Pre-roll */
+	.oneIn(2, new LootTable()) // 'Nothing' drop
+	.oneIn(24, "Zombie pirate key")
+	.oneIn(20_000, "Teleport anchoring scroll")
+
 	/* Runes */
 	.add("Blood rune", [30, 60], 4)
 	.add("Death rune", [30, 90], 4)
@@ -31,13 +36,10 @@ export const ZombiePirateTable = new LootTable()
 	.add("Blighted super restore(4)", [1, 3], 12)
 
 	/* Other */
-	.add(new LootTable(), 1, 181) // 'Nothing' drop
-	.add("Zombie pirate key", 1, 15)
 	.add("Coins", [1_000, 8_000], 12)
 	.add("Cannonball", [20, 100], 12)
 	.add("Gold ore", [5, 15], 12)
 	.add("Adamant seeds", [5, 10], 8)
-	.oneIn(20_000, "Teleport anchoring scroll")
 
 	/* Tertiary */
 	.tertiary(5000, "Zombie champion scroll");

diff --git a/src/simulation/openables/ZombiePiratesLocker.ts b/src/simulation/openables/ZombiePiratesLocker.ts
@@ -2,6 +2,9 @@ import LootTable from "../../structures/LootTable";
 import SimpleOpenable from "../../structures/SimpleOpenable";
 
 const ZombiePirateLocker = new LootTable()
+	/* Pre-roll */
+	.oneIn(275, "Teleport anchoring scroll")
+
 	/* Runes */
 	.add("Blood rune", [60, 120], 4)
 	.add("Death rune", [60, 180], 4)
@@ -32,8 +35,7 @@ const ZombiePirateLocker = new LootTable()
 	.add("Coins", [2_000, 16_000], 12)
 	.add("Cannonball", [40, 200], 12)
 	.add("Gold ore", [10, 30], 12)
-	.add("Adamant seeds", [10, 20], 8)
-	.oneIn(275, "Teleport anchoring scroll");
+	.add("Adamant seeds", [10, 20], 8);
 
 export default new SimpleOpenable({
 	id: 29_449,