From c338e88e76afade89d6de9e20c178d9e40c9bc28 Mon Sep 17 00:00:00 2001 From: Von Hresvelg Date: Tue, 6 Jul 2021 16:38:06 -0400 Subject: [PATCH 1/2] Updated Cockroach Worker Drop Table (Authentic) --- Server/data/configs/drop_tables.json | 130 ++++++++++++++++----------- 1 file changed, 77 insertions(+), 53 deletions(-) diff --git a/Server/data/configs/drop_tables.json b/Server/data/configs/drop_tables.json index c69f7b104..0a7beddb4 100644 --- a/Server/data/configs/drop_tables.json +++ b/Server/data/configs/drop_tables.json @@ -61615,8 +61615,8 @@ "main": [ { "minAmount": "1", - "weight": "50.0", - "id": "1165", + "weight": "25.0", + "id": "1143", "maxAmount": "1" }, { @@ -61633,19 +61633,19 @@ }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "1121", "maxAmount": "1" }, { "minAmount": "1", - "weight": "1.0", - "id": "1333", + "weight": "8.0", + "id": "1213", "maxAmount": "1" }, { "minAmount": "1", - "weight": "50.0", + "weight": "8.0", "id": "209", "maxAmount": "1" }, @@ -61669,43 +61669,43 @@ }, { "minAmount": "1", - "weight": "50.0", + "weight": "25.0", "id": "205", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "207", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "215", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "211", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "213", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "2485", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "217", "maxAmount": "1" }, @@ -61713,43 +61713,55 @@ "minAmount": "2", "weight": "50.0", "id": "448", - "maxAmount": "3" + "maxAmount": "2" }, { "minAmount": "1", - "weight": "25.0", + "weight": "50.0", "id": "454", "maxAmount": "2" }, { "minAmount": "1", - "weight": "50.0", + "weight": "25.0", "id": "564", "maxAmount": "2" }, { "minAmount": "1", - "weight": "50.0", + "weight": "25.0", "id": "561", "maxAmount": "20" }, { "minAmount": "1", - "weight": "50.0", + "weight": "25.0", "id": "562", "maxAmount": "18" }, { "minAmount": "1", - "weight": "50.0", + "weight": "25.0", "id": "557", "maxAmount": "22" }, { "minAmount": "1", - "weight": "5.0", + "weight": "4.0", "id": "31", "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "80.0", + "id": "0", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "4.0", + "id": "1", + "maxAmount": "1" } ] }, @@ -61767,13 +61779,13 @@ }, { "minAmount": "1", - "weight": "15.0", + "weight": "8.0", "id": "1185", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "1333", "maxAmount": "1" }, @@ -61791,13 +61803,13 @@ }, { "minAmount": "1", - "weight": "25.0", + "weight": "8.0", "id": "554", "maxAmount": "58" }, { "minAmount": "1", - "weight": "25.0", + "weight": "8.0", "id": "565", "maxAmount": "16" }, @@ -61833,103 +61845,103 @@ }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5298", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5281", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5280", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5301", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5297", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5299", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5292", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5106", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5293", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5296", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5105", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5294", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "12176", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5295", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5303", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5302", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", + "weight": "8.0", "id": "5321", "maxAmount": "1" }, @@ -61947,7 +61959,7 @@ }, { "minAmount": "5", - "weight": "25.0", + "weight": "50.0", "id": "995", "maxAmount": "5" }, @@ -61955,31 +61967,43 @@ "minAmount": "100", "weight": "50.0", "id": "995", - "maxAmount": "500" + "maxAmount": "400" }, { "minAmount": "1", "weight": "25.0", "id": "6004", - "maxAmount": "2" + "maxAmount": "3" }, { "minAmount": "1", - "weight": "5.0", - "id": "229", + "weight": "4.0", + "id": "5733", "maxAmount": "1" }, { "minAmount": "1", - "weight": "5.0", - "id": "2679", - "maxAmount": "1" - }, - { - "minAmount": "1", - "weight": "6.0", + "weight": "8.0", "id": "31", "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "100.0", + "id": "0", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "8.0", + "id": "5300", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "8.0", + "id": "5304", + "maxAmount": "1" } ] }, From a5b2c190a5b8b45305c35bc40be3fadc6d176372 Mon Sep 17 00:00:00 2001 From: skelsoft <9147770-skelsoft@users.noreply.gitlab.com> Date: Tue, 6 Jul 2021 22:31:03 +0000 Subject: [PATCH 2/2] ix: Keldagrim Stonemason, Dagannoth and more misc fixes --- Server/data/configs/item_configs.json | 15 ++++++++++----- Server/data/configs/npc_configs.json | 25 +++++++++++++------------ Server/data/configs/object_configs.json | 8 ++++++++ Server/data/configs/shops.json | 11 ++++++++++- 4 files changed, 41 insertions(+), 18 deletions(-) diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index ad5446673..cea5f5553 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -101022,7 +101022,7 @@ }, { "ge_buy_limit": "100", - "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)", + "examine": "A handy way to get around.", "durability": null, "low_alchemy": "8416", "high_alchemy": "12624", @@ -101038,6 +101038,7 @@ { "ge_buy_limit": "100", "grand_exchange_price": "29700", + "examine": "Swap this note at any bank for the equivalent item.", "durability": null, "name": "Combat bracelet(4)", "tradeable": "true", @@ -101045,7 +101046,7 @@ "id": "11119" }, { - "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)", + "examine": "A handy way to get around.", "grand_exchange_price": "1", "durability": null, "name": "Combat bracelet(3)", @@ -101059,6 +101060,7 @@ "equipment_slot": "9" }, { + "examine": "Swap this note at any bank for the equivalent item.", "durability": null, "name": "Combat bracelet(3)", "tradeable": "true", @@ -101066,7 +101068,7 @@ "id": "11121" }, { - "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)", + "examine": "A handy way to get around.", "grand_exchange_price": "1", "durability": null, "name": "Combat bracelet(2)", @@ -101080,6 +101082,7 @@ "equipment_slot": "9" }, { + "examine": "Swap this note at any bank for the equivalent item.", "durability": null, "name": "Combat bracelet(2)", "tradeable": "true", @@ -101087,7 +101090,7 @@ "id": "11123" }, { - "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)", + "examine": "A handy way to get around.", "grand_exchange_price": "1", "durability": null, "name": "Combat bracelet(1)", @@ -101101,6 +101104,7 @@ "equipment_slot": "9" }, { + "examine": "Swap this note at any bank for the equivalent item.", "durability": null, "name": "Combat bracelet(1)", "tradeable": "true", @@ -101109,7 +101113,7 @@ }, { "ge_buy_limit": "100", - "examine": "You will need to recharge the bracelet at the Legends Guild.(uncharged) A handy way to get around.(charged)", + "examine": "You will need to recharge the bracelet at the Legends Guild.", "durability": null, "low_alchemy": "8416", "high_alchemy": "12624", @@ -101125,6 +101129,7 @@ { "ge_buy_limit": "100", "grand_exchange_price": "29000", + "examine": "Swap this note at any bank for the equivalent item.", "durability": null, "name": "Combat bracelet", "tradeable": "true", diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json index 30e7d0ae5..7d543b6b3 100644 --- a/Server/data/configs/npc_configs.json +++ b/Server/data/configs/npc_configs.json @@ -23520,44 +23520,45 @@ "attack_level": "47" }, { - "examine": "A spiny horror from the ocean depths...", + "examine": "A horror from the ocean depths...", "melee_animation": "1343", - "attack_speed": "6", + "attack_speed": "4", "respawn_delay": "60", "defence_animation": "1340", - "slayer_exp": "100", + "slayer_exp": "120", "death_animation": "1342", "name": "Dagannoth", - "defence_level": "60", + "defence_level": "71", "safespot": null, - "lifepoints": "95", - "strength_level": "90", + "lifepoints": "120", + "strength_level": "70", "id": "2455", "aggressive": "true", "clue_level": "1", "range_level": "1", "projectile": "294", - "attack_level": "90" + "attack_level": "68" }, { - "examine": "It's an NPC.", + "examine": "A horror from the ocean depths...", "combat_style": "1", "melee_animation": "1343", + "attack_speed": "4", "respawn_delay": "60", "defence_animation": "1340", "slayer_exp": "0", "death_animation": "1342", "name": "Dagannoth", - "defence_level": "60", + "defence_level": "50", "safespot": null, "lifepoints": "70", - "strength_level": "90", + "strength_level": "70", "id": "2456", "aggressive": "true", "clue_level": "1", - "range_level": "90", + "range_level": "70", "projectile": "294", - "attack_level": "90" + "attack_level": "68" }, { "examine": "A fearsome magical creature from the deep..", diff --git a/Server/data/configs/object_configs.json b/Server/data/configs/object_configs.json index 8a084eb71..0fe29f652 100644 --- a/Server/data/configs/object_configs.json +++ b/Server/data/configs/object_configs.json @@ -20271,6 +20271,14 @@ "ids": "14003", "examine": "Why do I never take time to look at the grass?" }, + { + "ids": "15477", + "examine": "Home sweet home?" + }, + { + "ids": "15480", + "examine": "Home sweet home?" + }, { "ids": "15748", "examine": "Home sweet home?" diff --git a/Server/data/configs/shops.json b/Server/data/configs/shops.json index 5e5fa358b..55c93f003 100644 --- a/Server/data/configs/shops.json +++ b/Server/data/configs/shops.json @@ -2087,12 +2087,21 @@ "title": "Gnomic Supplies", "stock": "{1931,inf}-{1929,inf}-{1937,inf}-{2313,inf}-{1887,inf}-{590,inf}-{1735,inf}-{1951,inf}-{1969,inf}-{1949,inf}" }, + { + "npcs": "4248", + "high_alch": "0", + "currency": "995", + "general_store": "false", + "id": "236", + "title": "Keldagrim Stonemason", + "stock": "{3420,500}-{8786,30}-{8784,30}-{8788,30}" + }, { "npcs": "4856", "high_alch": "0", "currency": "995", "general_store": "false", - "id": "236", + "id": "237", "title": "Lovecraft's Tackle", "stock": "{303,10}-{307,10}-{309,10}-{311,1000}-{301,10}-{313,1000}-{314,1000}-{317,0}-{327,10}-{345,0}-{321,0}-{335,0}-{349,0}-{331,0}-{359,0}-{377,0}-{371,0}" }