diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index dbd54a16f..6de270dfc 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -66679,7 +66679,7 @@ "bonuses": "0,0,0,15,0,0,0,0,15,0,15,0,0,0,0" }, { - "requirements": "{1,40}-{6,20}", + "requirements": "{1,20}-{6,40}", "ge_buy_limit": "2", "examine": "Enchanted Wizards robes.", "durability": null, @@ -91269,18 +91269,19 @@ "equipment_slot": "4" }, { - "remove_sleeves": "true", + "requirements": "{1,20}-{6,40}", "examine": "Enchanted Wizards robes.", - "grand_exchange_price": "72800", "durability": null, + "weight": "1", + "absorb": "3,1,0", + "equipment_slot": "4", + "remove_sleeves": "true", + "grand_exchange_price": "72800", "name": "Enchanted top", "tradeable": "true", - "weight": "1", "archery_ticket_price": "0", "id": "10688", - "absorb": "3,1,0", - "bonuses": "0,0,0,20,0,0,0,0,20,0,0,0,0,0,0", - "equipment_slot": "4" + "bonuses": "0,0,0,20,0,0,0,0,20,0,20,0,0,0,0" }, { "lendable": "true", diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json index b9b019767..326a072fb 100644 --- a/Server/data/configs/npc_configs.json +++ b/Server/data/configs/npc_configs.json @@ -182,15 +182,15 @@ }, { "examine": "He tries to keep order around here.", - "melee_animation": "284", + "melee_animation": "381", "range_animation": "0", "combat_audio": "511,513,512", "attack_speed": "4", "respawn_delay": "60", - "defence_animation": "285", + "defence_animation": "1156", "weakness": "9", "magic_animation": "0", - "death_animation": "287", + "death_animation": "836", "name": "Guard", "defence_level": "13", "safespot": null, @@ -10754,14 +10754,18 @@ }, { "examine": "A soldier of the Imperial Guard.", + "combat_audio": "511,513,512", + "melee_animation": "393", + "attack_speed": "4", + "magic_level": "1", + "defence_animation": "397", + "death_animation": "836", "name": "Soldier", "defence_level": "44", "safespot": null, "lifepoints": "55", - "combat_audio": "511,513,512", "strength_level": "44", "id": "1065", - "magic_level": "1", "range_level": "1", "attack_level": "44" }, @@ -10833,6 +10837,25 @@ "range_level": "1", "attack_level": "1" }, + { + "examine": "The Burthorpe Castle cook.", + "melee_animation": "422", + "range_animation": "422", + "combat_audio": "511,506,505", + "attack_speed": "4", + "defence_animation": "404", + "weakness": "9", + "magic_animation": "422", + "death_animation": "9055", + "name": "Eadburg", + "defence_level": "1", + "safespot": null, + "lifepoints": "10", + "strength_level": "1", + "id": "1072", + "range_level": "1", + "attack_level": "1" + }, { "examine": "A Burthorpe Castle Archer.", "start_gfx": "19", @@ -10879,13 +10902,13 @@ }, { "examine": "A Burthorpe Castle guard.", - "melee_animation": "0", + "melee_animation": "395", "range_animation": "0", "combat_audio": "511,513,512", "magic_level": "1", "defence_animation": "0", "magic_animation": "0", - "death_animation": "0", + "death_animation": "836", "name": "Guard", "defence_level": "33", "safespot": null, @@ -10898,13 +10921,13 @@ }, { "examine": "A Burthorpe Castle guard.", - "melee_animation": "0", + "melee_animation": "395", "range_animation": "0", "combat_audio": "511,513,512", "magic_level": "1", "defence_animation": "0", "magic_animation": "0", - "death_animation": "0", + "death_animation": "836", "name": "Guard", "defence_level": "33", "safespot": null, @@ -10917,11 +10940,12 @@ }, { "examine": "A servant for Prince Anlaf.", - "melee_animation": "0", - "range_animation": "0", - "defence_animation": "0", - "magic_animation": "0", - "death_animation": "0", + "melee_animation": "422", + "range_animation": "422", + "combat_audio": "511,513,512", + "defence_animation": "404", + "magic_animation": "422", + "death_animation": "9055", "name": "Servant", "defence_level": "1", "safespot": null, @@ -71188,4 +71212,4 @@ "range_level": "1", "attack_level": "1" } -] +] \ No newline at end of file diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json index a685ef42b..9a4ab615d 100644 --- a/Server/data/configs/npc_spawns.json +++ b/Server/data/configs/npc_spawns.json @@ -89,7 +89,7 @@ }, { "npc_id": "27", - "loc_data": "{2574,3285,2,0,0}-{2574,3308,2,0,0}-{2582,3284,2,0,0}-{2582,3309,2,0,0}-{2588,3290,2,0,0}-{2588,3303,2,0,0}-{2902,3568,1,1,3}-{2903,3569,1,1,3}-{2903,3567,1,0,3}-{2904,3566,1,0,3}-{2894,3559,1,0,3}-{2892,3557,1,0,3}-{2893,3569,1,0,3}" + "loc_data": "{2574,3285,2,0,0}-{2574,3308,2,0,0}-{2582,3284,2,0,0}-{2582,3309,2,0,0}-{2588,3290,2,0,0}-{2588,3303,2,0,0}-{2902,3568,1,1,3}-{2903,3559,1,1,3}-{2903,3557,1,1,3}-{2903,3569,1,1,3}-{2894,3559,1,1,3}-{2892,3557,1,0,3}-{2893,3569,1,1,3}" }, { "npc_id": "28", @@ -305,7 +305,7 @@ }, { "npc_id": "96", - "loc_data": "{2842,3450,0,0,0}-{2872,3437,0,0,0}-{2873,3449,0,0,0}-{2868,3456,0,0,0}-{2856,3490,0,0,0}-{2861,3492,0,0,0}-{2862,3505,0,0,0}-{2856,3507,0,0,0}-{3004,3920,0,1,7}-{3007,3925,0,1,3}-{3005,3927,0,1,3}-{3004,3924,0,1,3}-{2988,3918,0,1,2}-{2992,3921,0,1,2}-{2990,3923,0,1,3}-{2988,3925,0,1,6}-{2987,3921,0,1,6}" + "loc_data": "{2842,3450,0,0,0}-{2872,3437,0,0,0}-{2873,3449,0,0,0}-{2868,3456,0,0,0}-{2860,3490,0,0,0}-{2861,3492,0,0,0}-{2855,3511,0,0,0}-{2857,3508,0,0,0}-{3004,3920,0,1,7}-{3007,3925,0,1,3}-{3005,3927,0,1,3}-{3004,3924,0,1,3}-{2988,3918,0,1,2}-{2992,3921,0,1,2}-{2990,3923,0,1,3}-{2988,3925,0,1,6}-{2987,3921,0,1,6}" }, { "npc_id": "97", @@ -2601,7 +2601,7 @@ }, { "npc_id": "1072", - "loc_data": "{2897,3569,0,0,0}-{2893,3565,0,0,0}" + "loc_data": "{2893,3558,0,1,3}" }, { "npc_id": "1073", @@ -2609,15 +2609,15 @@ }, { "npc_id": "1074", - "loc_data": "{2897,3549,0,0,5}" + "loc_data": "{2897,3549,0,0,4}" }, { "npc_id": "1076", - "loc_data": "{2900,3556,0,0,1}-{2897,3565,0,1,4}" + "loc_data": "{2897,3556,0,0,6}-{2896,3566,0,0,6}" }, { "npc_id": "1077", - "loc_data": "{2897,3556,0,0,5}" + "loc_data": "{2900,3556,0,0,6}" }, { "npc_id": "1079", @@ -2625,7 +2625,7 @@ }, { "npc_id": "1081", - "loc_data": "{2896,3562,0,0,0}-{2891,3568,0,0,0}" + "loc_data": "{2897,3565,0,1,4}" }, { "npc_id": "1082", diff --git a/Server/src/main/kotlin/rs09/game/interaction/item/ImplingJarListener.kt b/Server/src/main/kotlin/rs09/game/interaction/item/ImplingJarListener.kt index ac90cbab7..499a0ef65 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/item/ImplingJarListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/item/ImplingJarListener.kt @@ -39,9 +39,9 @@ enum class ImplingLoot(val jarId: Int, val table: WeightBasedTable){ WeightedItem(Items.KNIFE_946,1, 1, 10.0), WeightedItem(Items.CHEESE_1985, 1, 1, 10.0), WeightedItem(Items.HAMMER_2347, 1, 1, 10.0), - WeightedItem(0, 1, 1, 10.0), WeightedItem(Items.BALL_OF_WOOL_1759, 1, 1, 10.0), WeightedItem(Items.ANCHOVIES_319, 1, 1, 10.0), + WeightedItem(0, 1, 1, 10.0), WeightedItem(Items.SPICE_2007, 1, 1, 1.0), WeightedItem(Items.FLAX_1779, 1, 1, 1.0), WeightedItem(Items.MUD_PIE_7170, 1, 1, 1.0), @@ -51,7 +51,6 @@ enum class ImplingLoot(val jarId: Int, val table: WeightBasedTable){ WeightedItem(Items.SAPPHIRE_1607, 1, 1, 1.0), WeightedItem(Items.HARD_LEATHER_1743, 1, 1, 1.0), WeightedItem(Items.LOBSTER_379, 1, 1, 1.0), - WeightedItem(Items.SOFT_CLAY_1761, 1, 1, 1.0) ).insertEasyClue(1.0)), YOUNG_IMPLING(Items.YOUNG_IMPLING_JAR_11240, WeightBasedTable.create( @@ -264,4 +263,4 @@ enum class ImplingLoot(val jarId: Int, val table: WeightBasedTable){ return jarMap[id] } } -} \ No newline at end of file +}