From 6880123bfb861e0681f90dac141cad54b49c308c Mon Sep 17 00:00:00 2001 From: skelsoft <9147770-skelsoft@users.noreply.gitlab.com> Date: Sat, 17 Jul 2021 21:28:09 +0000 Subject: [PATCH 1/3] Fix: G. F. I. audit work, misc fixes --- Server/data/configs/item_configs.json | 42 +++++-- Server/data/configs/npc_configs.json | 174 ++++++++++++++++---------- 2 files changed, 141 insertions(+), 75 deletions(-) diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index 4c3038f53..8ee6a1c4c 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -73317,10 +73317,12 @@ }, { "turn90cw_anim": "1207", + "examine": "A fully charged rod.", "walk_anim": "1205", "has_special": "true", "durability": null, "turn90ccw_anim": "1208", + "attack_speed": "5", "two_handed": "true", "weapon_interface": "1", "turn180_anim": "1206", @@ -73338,10 +73340,12 @@ }, { "turn90cw_anim": "1207", + "examine": "A partialy charged rod.", "walk_anim": "1205", "has_special": "true", "durability": null, "turn90ccw_anim": "1208", + "attack_speed": "5", "two_handed": "true", "weapon_interface": "1", "turn180_anim": "1206", @@ -73359,7 +73363,7 @@ }, { "turn90cw_anim": "1207", - "examine": "A fully charged rod. (if less than 10) A partialy charged rod.", + "examine": "A partialy charged rod.", "walk_anim": "1205", "has_special": "true", "low_alchemy": "400", @@ -73386,10 +73390,12 @@ }, { "turn90cw_anim": "1207", + "examine": "A partialy charged rod.", "walk_anim": "1205", "has_special": "true", "durability": null, "turn90ccw_anim": "1208", + "attack_speed": "5", "two_handed": "true", "weapon_interface": "1", "turn180_anim": "1206", @@ -73407,10 +73413,12 @@ }, { "turn90cw_anim": "1207", + "examine": "A partialy charged rod.", "walk_anim": "1205", "has_special": "true", "durability": null, "turn90ccw_anim": "1208", + "attack_speed": "5", "two_handed": "true", "weapon_interface": "1", "turn180_anim": "1206", @@ -73428,10 +73436,12 @@ }, { "turn90cw_anim": "1207", + "examine": "A partialy charged rod.", "walk_anim": "1205", "has_special": "true", "durability": null, "turn90ccw_anim": "1208", + "attack_speed": "5", "two_handed": "true", "weapon_interface": "1", "turn180_anim": "1206", @@ -73449,10 +73459,12 @@ }, { "turn90cw_anim": "1207", + "examine": "A partialy charged rod.", "walk_anim": "1205", "has_special": "true", "durability": null, "turn90ccw_anim": "1208", + "attack_speed": "5", "two_handed": "true", "weapon_interface": "1", "turn180_anim": "1206", @@ -73470,10 +73482,12 @@ }, { "turn90cw_anim": "1207", + "examine": "A partialy charged rod.", "walk_anim": "1205", "has_special": "true", "durability": null, "turn90ccw_anim": "1208", + "attack_speed": "5", "two_handed": "true", "weapon_interface": "1", "turn180_anim": "1206", @@ -73491,10 +73505,12 @@ }, { "turn90cw_anim": "1207", + "examine": "2! 2 charges left! Ha Ha Ha.", "walk_anim": "1205", "has_special": "true", "durability": null, "turn90ccw_anim": "1208", + "attack_speed": "5", "two_handed": "true", "weapon_interface": "1", "turn180_anim": "1206", @@ -73512,10 +73528,12 @@ }, { "turn90cw_anim": "1207", + "examine": "A partialy charged rod.", "walk_anim": "1205", "has_special": "true", "durability": null, "turn90ccw_anim": "1208", + "attack_speed": "5", "two_handed": "true", "weapon_interface": "1", "turn180_anim": "1206", @@ -73533,7 +73551,7 @@ }, { "destroy_message": "You can make another one of these by using clay on Ivandis' coffin.", - "examine": "Rod of Ivandis mould.", + "examine": "A mould of the Rod of Ivandis.", "durability": null, "name": "Rod clay mould", "low_alchemy": "40", @@ -116752,7 +116770,7 @@ { "requirements": "{1,45}", "shop_price": "200", - "examine": "A spiked square shield.", + "examine": "A spiked, medium square shield.", "durability": null, "low_alchemy": "2576", "high_alchemy": "3864", @@ -116761,7 +116779,7 @@ "equipment_slot": "5", "grand_exchange_price": "57548", "name": "Rune spikeshield 100", - "tradeable": "true", + "tradeable": "false", "archery_ticket_price": "0", "id": "12922", "bonuses": "0,0,0,-6,-2,39,41,37,0,39,36,3,0,0,0", @@ -116770,7 +116788,7 @@ { "requirements": "{1,45}", "shop_price": "200", - "examine": "A spiked square shield.", + "examine": "A spiked, medium square shield.", "durability": null, "low_alchemy": "2576", "high_alchemy": "3864", @@ -116779,7 +116797,7 @@ "equipment_slot": "5", "grand_exchange_price": "57548", "name": "Rune spikeshield 80", - "tradeable": "true", + "tradeable": "false", "archery_ticket_price": "0", "id": "12923", "bonuses": "0,0,0,-6,-2,39,41,37,0,39,36,3,0,0,0" @@ -116787,7 +116805,7 @@ { "requirements": "{1,45}", "shop_price": "200", - "examine": "Uncharged: Not so spiky anymore.", + "examine": "A spiked, medium square shield.", "durability": null, "low_alchemy": "2576", "high_alchemy": "3864", @@ -116796,7 +116814,7 @@ "equipment_slot": "5", "grand_exchange_price": "57548", "name": "Rune spikeshield 60", - "tradeable": "true", + "tradeable": "false", "archery_ticket_price": "0", "id": "12924", "bonuses": "0,0,0,-6,-2,39,41,37,0,39,36,3,0,0,0" @@ -116804,7 +116822,7 @@ { "requirements": "{1,45}", "shop_price": "200", - "examine": "A spiked square shield.", + "examine": "A spiked, medium square shield.", "durability": null, "low_alchemy": "2576", "high_alchemy": "3864", @@ -116813,7 +116831,7 @@ "equipment_slot": "5", "grand_exchange_price": "57548", "name": "Rune spikeshield 40", - "tradeable": "true", + "tradeable": "false", "archery_ticket_price": "0", "id": "12925", "bonuses": "0,0,0,-6,-2,39,41,37,0,39,36,3,0,0,0" @@ -116821,7 +116839,7 @@ { "requirements": "{1,45}", "shop_price": "200", - "examine": "A spiked square shield.", + "examine": "A spiked, medium square shield.", "durability": null, "low_alchemy": "2576", "high_alchemy": "3864", @@ -116830,7 +116848,7 @@ "equipment_slot": "5", "grand_exchange_price": "57548", "name": "Rune spikeshield 20", - "tradeable": "true", + "tradeable": "false", "archery_ticket_price": "0", "id": "12926", "bonuses": "0,0,0,-6,-2,39,41,37,0,39,36,3,0,0,0" diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json index e231ac0b5..f102c4b8c 100644 --- a/Server/data/configs/npc_configs.json +++ b/Server/data/configs/npc_configs.json @@ -20719,7 +20719,7 @@ "melee_animation": "240", "range_animation": "240", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "241", @@ -20743,7 +20743,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -20767,7 +20767,7 @@ "melee_animation": "6249", "range_animation": "6249", "combat_audio": "537,539,538", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "25", "defence_animation": "6250", @@ -20815,7 +20815,7 @@ "melee_animation": "5487", "range_animation": "5487", "combat_audio": "774,775,777", - "attack_speed": "4" + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "5513", @@ -20839,7 +20839,7 @@ "melee_animation": "5487", "range_animation": "5487", "combat_audio": "774,775,777", - "attack_speed": "4" + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "5513", @@ -23575,7 +23575,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -26983,7 +26983,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -27078,8 +27078,8 @@ "lifepoints": "150", "strength_level": "100", "id": "2889", + "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "range_level": "1", - "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "attack_level": "100" }, { @@ -42161,7 +42161,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -42185,7 +42185,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -47188,7 +47188,7 @@ "melee_animation": "4332", "range_animation": "0", "attack_speed": "4", - "respawn_delay": "60", + "respawn_delay": "60", "defence_animation": "0", "weakness": "9", "magic_animation": "0", @@ -47199,7 +47199,7 @@ "strength_level": "100", "id": "5476", "aggressive": "true", - "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", + "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", "range_level": "1", "attack_level": "100" }, @@ -63402,7 +63402,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -67200,7 +67200,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -67295,8 +67295,8 @@ "lifepoints": "150", "strength_level": "100", "id": "2889", + "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "range_level": "1", - "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "attack_level": "100" }, { @@ -94199,7 +94199,7 @@ "melee_animation": "240", "range_animation": "240", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "241", @@ -94223,7 +94223,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -94247,7 +94247,7 @@ "melee_animation": "6249", "range_animation": "6249", "combat_audio": "537,539,538", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "25", "defence_animation": "6250", @@ -94295,7 +94295,7 @@ "melee_animation": "5487", "range_animation": "5487", "combat_audio": "774,775,777", - "attack_speed": "4" + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "5513", @@ -94319,7 +94319,7 @@ "melee_animation": "5487", "range_animation": "5487", "combat_audio": "774,775,777", - "attack_speed": "4" + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "5513", @@ -97055,7 +97055,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -100463,7 +100463,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -100558,8 +100558,8 @@ "lifepoints": "150", "strength_level": "100", "id": "2889", + "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "range_level": "1", - "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "attack_level": "100" }, { @@ -115647,7 +115647,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -115671,7 +115671,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -120676,7 +120676,7 @@ "melee_animation": "4332", "range_animation": "0", "attack_speed": "4", - "respawn_delay": "60", + "respawn_delay": "60", "defence_animation": "0", "weakness": "9", "magic_animation": "0", @@ -120687,7 +120687,7 @@ "strength_level": "100", "id": "5476", "aggressive": "true", - "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", + "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", "range_level": "1", "attack_level": "100" }, @@ -137130,7 +137130,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -140928,7 +140928,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -141023,8 +141023,8 @@ "lifepoints": "150", "strength_level": "100", "id": "2889", + "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "range_level": "1", - "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "attack_level": "100" }, { @@ -167935,7 +167935,7 @@ "melee_animation": "240", "range_animation": "240", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "241", @@ -167959,7 +167959,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -167983,7 +167983,7 @@ "melee_animation": "6249", "range_animation": "6249", "combat_audio": "537,539,538", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "25", "defence_animation": "6250", @@ -168031,7 +168031,7 @@ "melee_animation": "5487", "range_animation": "5487", "combat_audio": "774,775,777", - "attack_speed": "4" + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "5513", @@ -168055,7 +168055,7 @@ "melee_animation": "5487", "range_animation": "5487", "combat_audio": "774,775,777", - "attack_speed": "4" + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "5513", @@ -170791,7 +170791,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -174199,7 +174199,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -174294,8 +174294,8 @@ "lifepoints": "150", "strength_level": "100", "id": "2889", + "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "range_level": "1", - "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "attack_level": "100" }, { @@ -189377,7 +189377,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -189401,7 +189401,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -194404,7 +194404,7 @@ "melee_animation": "4332", "range_animation": "0", "attack_speed": "4", - "respawn_delay": "60", + "respawn_delay": "60", "defence_animation": "0", "weakness": "9", "magic_animation": "0", @@ -194415,7 +194415,7 @@ "strength_level": "100", "id": "5476", "aggressive": "true", - "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", + "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", "range_level": "1", "attack_level": "100" }, @@ -210618,7 +210618,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -214416,7 +214416,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -214511,8 +214511,8 @@ "lifepoints": "150", "strength_level": "100", "id": "2889", + "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "range_level": "1", - "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "attack_level": "100" }, { @@ -241415,7 +241415,7 @@ "melee_animation": "240", "range_animation": "240", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "241", @@ -241439,7 +241439,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -241463,7 +241463,7 @@ "melee_animation": "6249", "range_animation": "6249", "combat_audio": "537,539,538", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "25", "defence_animation": "6250", @@ -241511,7 +241511,7 @@ "melee_animation": "5487", "range_animation": "5487", "combat_audio": "774,775,777", - "attack_speed": "4" + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "5513", @@ -241535,7 +241535,7 @@ "melee_animation": "5487", "range_animation": "5487", "combat_audio": "774,775,777", - "attack_speed": "4" + "attack_speed": "4", "magic_level": "1", "respawn_delay": "20", "defence_animation": "5513", @@ -244271,7 +244271,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -247679,7 +247679,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -247774,8 +247774,8 @@ "lifepoints": "150", "strength_level": "100", "id": "2889", + "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "range_level": "1", - "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "attack_level": "100" }, { @@ -262863,7 +262863,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -262887,7 +262887,7 @@ "melee_animation": "4933", "range_animation": "4933", "combat_audio": "703,705,704", - "attack_speed": "4", + "attack_speed": "4", "magic_level": "1", "respawn_delay": "30", "defence_animation": "4934", @@ -267892,7 +267892,7 @@ "melee_animation": "4332", "range_animation": "0", "attack_speed": "4", - "respawn_delay": "60", + "respawn_delay": "60", "defence_animation": "0", "weakness": "9", "magic_animation": "0", @@ -267903,7 +267903,7 @@ "strength_level": "100", "id": "5476", "aggressive": "true", - "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", + "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", "range_level": "1", "attack_level": "100" }, @@ -284346,7 +284346,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -288144,7 +288144,7 @@ "melee_animation": "2365", "attack_speed": "6", "spell_id": "48", - "magic_level": "100", + "magic_level": "100", "respawn_delay": "60", "defence_animation": "2366", "magic_animation": "2365", @@ -288239,8 +288239,8 @@ "lifepoints": "150", "strength_level": "100", "id": "2889", + "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "range_level": "1", - "bonuses": "0,0,0,0,0,100,100,50,50,150,0,0,0,0,0", "attack_level": "100" }, { @@ -294424,11 +294424,17 @@ "id": "130" }, { - "examine": "One of the Burgher's Protectors", + "examine": "The Burgher's protectors.", "death_animation": "836", "name": "Honour Guard", + "defence_level": "80", + "lifepoints": "90", "melee_animation": "395", + "attack_speed": "4", + "strength_level": "90", "id": "5515", + "bonuses": "40,40,40,0,0,50,50,50,50,50,0,40,0,0,0", + "attack_level": "90", "defence_animation": "404" }, { @@ -294436,7 +294442,7 @@ "melee_animation": "4332", "range_animation": "0", "attack_speed": "4", - "respawn_delay": "60", + "respawn_delay": "60", "defence_animation": "0", "weakness": "9", "magic_animation": "0", @@ -294447,8 +294453,50 @@ "strength_level": "100", "id": "5524", "aggressive": "true", - "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", + "bonuses": "60,60,60,0,0,30,60,30,0,0,0,60,0,0,0", "range_level": "1", "attack_level": "100" + }, + { + "examine": "The Burgher's protectors.", + "death_animation": "836", + "name": "Honour Guard", + "defence_level": "80", + "lifepoints": "90", + "melee_animation": "395", + "attack_speed": "4", + "strength_level": "90", + "id": "5514", + "bonuses": "40,40,40,0,0,50,50,50,50,50,0,40,0,0,0", + "attack_level": "90", + "defence_animation": "404" + }, + { + "examine": "The Burgher's protectors.", + "death_animation": "836", + "name": "Honour Guard", + "defence_level": "80", + "lifepoints": "90", + "melee_animation": "395", + "attack_speed": "4", + "strength_level": "90", + "id": "5516", + "bonuses": "40,40,40,0,0,50,50,50,50,50,0,40,0,0,0", + "attack_level": "90", + "defence_animation": "404" + }, + { + "examine": "The Burgher's protectors.", + "death_animation": "836", + "name": "Honour Guard", + "defence_level": "80", + "lifepoints": "90", + "melee_animation": "395", + "attack_speed": "4", + "strength_level": "90", + "id": "5517", + "bonuses": "40,40,40,0,0,50,50,50,50,50,0,40,0,0,0", + "attack_level": "90", + "defence_animation": "404" } ] \ No newline at end of file From bf9d8fb59aa164dcf022e7e302f60b9886f96d30 Mon Sep 17 00:00:00 2001 From: Von Hresvelg Date: Sun, 18 Jul 2021 19:23:50 +0000 Subject: [PATCH 2/3] Updated King Black Dragon Drop Table --- Server/data/configs/drop_tables.json | 176 ++++++++++++++++----------- 1 file changed, 106 insertions(+), 70 deletions(-) diff --git a/Server/data/configs/drop_tables.json b/Server/data/configs/drop_tables.json index 3782c285d..abdaa0510 100644 --- a/Server/data/configs/drop_tables.json +++ b/Server/data/configs/drop_tables.json @@ -2213,123 +2213,159 @@ "main": [ { "minAmount": "1", - "weight": "125.0", + "weight": "50.0", + "id": "1369", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "50.0", + "id": "1315", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25.0", + "id": "1357", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25.0", + "id": "1317", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "50.0", "id": "1303", "maxAmount": "1" }, { "minAmount": "1", - "weight": "100.0", + "weight": "50.0", "id": "1123", "maxAmount": "1" }, { - "minAmount": "1", - "weight": "125.0", - "id": "1199", - "maxAmount": "1" - }, - { - "minAmount": "300", - "weight": "125.0", - "id": "554", - "maxAmount": "300" - }, - { - "minAmount": "300", - "weight": "125.0", + "minAmount": "105", + "weight": "25.0", "id": "556", - "maxAmount": "300" + "maxAmount": "105" }, { - "minAmount": "30", - "weight": "50.0", - "id": "565", - "maxAmount": "30" + "minAmount": "105", + "weight": "25.0", + "id": "554", + "maxAmount": "105" }, { - "minAmount": "50", - "weight": "50.0", + "minAmount": "7", + "weight": "8.0", "id": "560", - "maxAmount": "50" + "maxAmount": "7" }, { - "minAmount": "30", - "weight": "75.0", + "minAmount": "15", + "weight": "8.0", + "id": "565", + "maxAmount": "15" + }, + { + "minAmount": "15", + "weight": "8.0", "id": "563", - "maxAmount": "50" + "maxAmount": "15" }, { "minAmount": "690", - "weight": "100.0", + "weight": "25.0", "id": "884", "maxAmount": "690" }, { - "minAmount": "10", - "weight": "50.0", + "minAmount": "1", + "weight": "8.0", "id": "9144", - "maxAmount": "25" - }, - { - "minAmount": "5", - "weight": "100.0", - "id": "11232", - "maxAmount": "14" + "maxAmount": "12" }, { "minAmount": "1", - "weight": "75.0", - "id": "11237", - "maxAmount": "14" - }, - { - "minAmount": "1", - "weight": "75.0", - "id": "1737", + "weight": "50.0", + "id": "1725", "maxAmount": "1" }, { - "minAmount": "150", - "weight": "75.0", + "minAmount": "100", + "weight": "25.0", + "id": "441", + "maxAmount": "100" + }, + { + "minAmount": "100", + "weight": "25.0", + "id": "454", + "maxAmount": "100" + }, + { + "minAmount": "100", + "weight": "25.0", "id": "1516", - "maxAmount": "150" + "maxAmount": "100" + }, + { + "minAmount": "1", + "weight": "50.0", + "id": "9431", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25.0", + "id": "2361", + "maxAmount": "1" }, { "minAmount": "4", - "weight": "125.0", + "weight": "25.0", "id": "385", "maxAmount": "4" }, - { - "minAmount": "100", - "weight": "100.0", - "id": "445", - "maxAmount": "100" - }, - { - "minAmount": "3", - "weight": "50.0", - "id": "9431", - "maxAmount": "3" - }, - { - "minAmount": "3", - "weight": "50.0", - "id": "2361", - "maxAmount": "3" - }, { "minAmount": "1", - "weight": "20.0", - "id": "2677", + "weight": "8.0", + "id": "407", "maxAmount": "1" }, { "minAmount": "1", - "weight": "0.3", + "weight": "8.0", + "id": "12070", + "maxAmount": "1" + }, + { + "minAmount": "30", + "weight": "50.0", + "id": "995", + "maxAmount": "690" + }, + { + "minAmount": "1", + "weight": "0.18", "id": "11286", "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "100.0", + "id": "0", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "23.15", + "id": "31", + "maxAmount": "1" } ] }, From 2cbc2fdd6934506d3a536497c6ee33cd7c2ac99d Mon Sep 17 00:00:00 2001 From: phil lips Date: Sun, 18 Jul 2021 22:45:23 +0000 Subject: [PATCH 3/3] Add bone burying to Chicken Killer botscript --- .../kotlin/rs09/game/ai/general/ScriptAPI.kt | 7 ++- .../general/scriptrepository/ChickenKiller.kt | 51 ++++++++++++++++--- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt b/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt index 8e1f8dc90..914843913 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt @@ -213,10 +213,13 @@ class ScriptAPI(private val bot: Player) { * @param id the id to look for * @author Ceikry */ - fun takeNearestGroundItem(id: Int){ + fun takeNearestGroundItem(id: Int) : Boolean{ val item = getNearestGroundItem(id) - if(item != null) + if(item != null){ item.interaction?.handle(bot, item.interaction[2]) + return true + } + else return false } /** diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ChickenKiller.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ChickenKiller.kt index 4bb569afc..d462bf565 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ChickenKiller.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ChickenKiller.kt @@ -1,6 +1,8 @@ package rs09.game.ai.general.scriptrepository +import core.game.node.item.Item import core.game.world.map.Location +import core.game.world.map.zone.ZoneBorders import org.rs09.consts.Items import rs09.game.ai.general.ScriptAPI @@ -11,14 +13,16 @@ import rs09.game.ai.general.ScriptAPI class ChickenKiller : Script(){ var state = State.INIT var chickenCounter = 0 - var overlay: ScriptAPI.BottingOverlay?= null + var overlay: ScriptAPI.BottingOverlay? = null var startLocation = Location(0,0,0) var timer = 3 var lootFeathers = false + var featherNearby = false + var currentFeathers = 0 + val chickenPen = ZoneBorders(3231,3300,3235,3287) override fun tick() { when(state){ - State.INIT -> { overlay = scriptAPI.getOverlay() overlay!!.init() @@ -26,7 +30,7 @@ class ChickenKiller : Script(){ overlay!!.setTaskLabel("Chickens KO'd:") overlay!!.setAmount(0) state = State.CONFIG - bot.dialogueInterpreter.sendOptions("Loot Feathers?","Yes","No") + bot.dialogueInterpreter.sendOptions("Loot Feathers and bury bones?","Yes","No") bot.dialogueInterpreter.addAction{player,button -> lootFeathers = button == 2 state = State.KILLING @@ -51,15 +55,43 @@ class ChickenKiller : Script(){ State.IDLE -> { if(timer-- <= 0){ - state = State.LOOTING + featherNearby = scriptAPI.takeNearestGroundItem(Items.FEATHER_314) + currentFeathers = 0 + if (featherNearby) { + state = State.LOOTFEATHER + }else{ + state = State.LOOTBONES + } } } - State.LOOTING -> { - scriptAPI.takeNearestGroundItem(Items.FEATHER_314) - state = State.KILLING + State.LOOTFEATHER -> { + timer = 1 + if(timer-- >= 0) { + currentFeathers = bot.inventory.getAmount(Items.FEATHER_314) + scriptAPI.takeNearestGroundItem(Items.FEATHER_314) + featherNearby = false + } + state = State.LOOTBONES } + State.LOOTBONES -> { + timer = 1 + if(timer-- >= 0){ + scriptAPI.takeNearestGroundItem(Items.BONES_526) + } + state = State.BURYBONES + } + + State.BURYBONES -> { + timer = 1 + var hasBone = bot.hasItem(Item(Items.BONES_526)) + var bone = bot.inventory.getItem(Item(Items.BONES_526)) + if (hasBone) { + bone.interaction.handleItemOption(bot,bone.interaction.get(0),bot.inventory) + } + state = State.KILLING + } } } @@ -73,6 +105,9 @@ class ChickenKiller : Script(){ KILLING, LOOTING, RETURN, - CONFIG + CONFIG, + LOOTFEATHER, + LOOTBONES, + BURYBONES } } \ No newline at end of file