From 55dbedb1ba64fc3e2b1362e6b97f1b3425348a1b Mon Sep 17 00:00:00 2001 From: ceikry Date: Fri, 20 Aug 2021 19:33:33 -0500 Subject: [PATCH 1/5] Fixed a bug with slayer. --- .../entity/skill/slayer/SlayerManager.java | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java index b40ca2c8c..d9bb373c9 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java @@ -108,31 +108,30 @@ public final class SlayerManager { if(hasTask()) { player.getSkills().addExperience(Skills.SLAYER, npc.getSkills().getMaximumLifepoints()); decrementAmount(1); - } - - if(!hasTask()){ - flags.setTaskStreak(flags.getTaskStreak() + 1); - flags.setCompletedTasks(flags.getCompletedTasks() + 1); - if ((flags.getCompletedTasks() > 4 || flags.canEarnPoints() ) && flags.getMaster() != Master.TURAEL && flags.getPoints() < 64000) { - int points = flags.getMaster().getTaskPoints()[0]; - if (flags.getTaskStreak() % 10 == 0) { - points = flags.getMaster().getTaskPoints()[1]; - } else if (flags.getTaskStreak() % 50 == 0) { - points = flags.getMaster().getTaskPoints()[2]; + if(!hasTask()){ + flags.setTaskStreak(flags.getTaskStreak() + 1); + flags.setCompletedTasks(flags.getCompletedTasks() + 1); + if ((flags.getCompletedTasks() > 4 || flags.canEarnPoints() ) && flags.getMaster() != Master.TURAEL && flags.getPoints() < 64000) { + int points = flags.getMaster().getTaskPoints()[0]; + if (flags.getTaskStreak() % 10 == 0) { + points = flags.getMaster().getTaskPoints()[1]; + } else if (flags.getTaskStreak() % 50 == 0) { + points = flags.getMaster().getTaskPoints()[2]; + } + flags.incrementPoints(points); + if (flags.getPoints() > 64000) { + flags.setPoints(64000); + } + player.sendMessages("You've completed " + flags.getTaskStreak() + " tasks in a row and received " + points + " points, with a total of " + flags.getPoints(),"You have completed " + flags.getCompletedTasks() + " tasks in total. Return to a Slayer master."); + } else if(flags.getCompletedTasks() == 4){ + player.sendMessage("You've completed your task; you will start gaining points on your next task!"); + flags.flagCanEarnPoints(); + } else { + player.sendMessages("You've completed your task; Complete " + (4 - flags.getCompletedTasks()) + " more task(s) to start gaining points.", "Return to a Slayer master."); } - flags.incrementPoints(points); - if (flags.getPoints() > 64000) { - flags.setPoints(64000); - } - player.sendMessages("You've completed " + flags.getTaskStreak() + " tasks in a row and received " + points + " points, with a total of " + flags.getPoints(),"You have completed " + flags.getCompletedTasks() + " tasks in total. Return to a Slayer master."); - } else if(flags.getCompletedTasks() == 4){ - player.sendMessage("You've completed your task; you will start gaining points on your next task!"); - flags.flagCanEarnPoints(); } else { - player.sendMessages("You've completed your task; Complete " + (4 - flags.getCompletedTasks()) + " more task(s) to start gaining points.", "Return to a Slayer master."); + //player.sendMessage("You're assigned to kill " + NPCDefinition.forId((player.getSlayer().getTask().getNpcs()[0])).getName().toLowerCase() + "s; Only " + getAmount() + " more to go."); } - } else { - //player.sendMessage("You're assigned to kill " + NPCDefinition.forId((player.getSlayer().getTask().getNpcs()[0])).getName().toLowerCase() + "s; Only " + getAmount() + " more to go."); } } From 2787a757f6c4dd9a2021c9d9d583834a3afb43d1 Mon Sep 17 00:00:00 2001 From: skelsoft <9147770-skelsoft@users.noreply.gitlab.com> Date: Sat, 21 Aug 2021 00:48:42 +0000 Subject: [PATCH 2/5] Fix: Morytania QA Pass 1, misc fixes --- Server/data/configs/item_configs.json | 2 +- Server/data/configs/npc_configs.json | 1164 +++-------------------- Server/data/configs/npc_spawns.json | 10 +- Server/data/configs/object_configs.json | 34 +- 4 files changed, 191 insertions(+), 1019 deletions(-) diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index e06274c39..1101cecd2 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -31513,7 +31513,7 @@ "id": "2956" }, { - "examine": "A druid pouch.", + "examine": "An empty druid pouch.", "durability": null, "name": "Druid pouch", "low_alchemy": "2", diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json index e6270d816..585640bd8 100644 --- a/Server/data/configs/npc_configs.json +++ b/Server/data/configs/npc_configs.json @@ -12546,21 +12546,24 @@ "slayer_task": "37", "melee_animation": "422", "range_animation": "422", - "attack_speed": "5", + "attack_speed": "4", + "magic_level": "1", + "respawn_delay": "21", "defence_animation": "404", "weakness": "9", "slayer_exp": "50", "magic_animation": "422", "death_animation": "9055", "name": "Ghoul", - "defence_level": "25", + "defence_level": "30", "safespot": null, - "lifepoints": "40", - "strength_level": "25", + "lifepoints": "50", + "strength_level": "40", "id": "1218", - "bonuses": "10,10,20,20,15,20,15,15,15,15,15,35,0,0,0", + "aggressive": "true", + "bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0", "range_level": "1", - "attack_level": "25" + "attack_level": "30" }, { "examine": "Yuck! It's all slimy!", @@ -12620,184 +12623,221 @@ "attack_level": "1" }, { - "examine": "A marsh coloured blamish snail", + "examine": "A marsh coloured blamish snail, these types are said to spit acid.", "combat_style": "1", "melee_animation": "8143", "range_animation": "0", - "respawn_delay": "60", + "attack_speed": "4", + "magic_level": "1", + "respawn_delay": "30", "defence_animation": "0", "weakness": "9", "slayer_exp": "0", "magic_animation": "0", "death_animation": "8144", "name": "Myre Blamish Snail", - "defence_level": "10", + "defence_level": "22", "safespot": null, - "lifepoints": "14", - "strength_level": "10", + "lifepoints": "8", + "strength_level": "0", "id": "1227", - "range_level": "1", - "attack_level": "10" + "aggressive": "true", + "bonuses": "10,10,10,0,0,5,5,30,5,50,0,10,0,0,0", + "range_level": "5", + "attack_level": "0" }, { - "examine": "A blood coloured blamish snail", + "examine": "A blood coloured blamish snail, these types are said to spit acid.", "combat_style": "1", "melee_animation": "8143", "range_animation": "0", - "respawn_delay": "60", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "30", "defence_animation": "0", "weakness": "9", "slayer_exp": "0", "magic_animation": "0", "death_animation": "8144", "name": "Blood Blamish Snail", - "defence_level": "10", + "defence_level": "45", "safespot": null, - "lifepoints": "14", - "strength_level": "10", + "lifepoints": "13", + "strength_level": "0", "id": "1228", - "range_level": "1", - "attack_level": "10" + "aggressive": "true", + "bonuses": "10,10,10,0,0,5,5,30,5,50,0,10,0,0,0", + "range_level": "12", + "attack_level": "0" }, { - "examine": "A muddy coloured blamish snail", + "examine": "A muddy coloured blamish snail, these types are said to spit acid.", "combat_style": "1", "melee_animation": "8143", "range_animation": "0", - "respawn_delay": "60", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "30", "defence_animation": "0", "weakness": "9", "slayer_exp": "0", "magic_animation": "0", "death_animation": "8144", "name": "Ochre Blamish Snail", - "defence_level": "10", + "defence_level": "18", "safespot": null, - "lifepoints": "14", - "strength_level": "10", + "lifepoints": "10", + "strength_level": "0", "id": "1229", - "range_level": "1", - "attack_level": "10" + "aggressive": "true", + "bonuses": "10,10,10,0,0,5,5,30,5,50,0,10,0,0,0", + "range_level": "7", + "attack_level": "0" }, { - "examine": "A bruise blue coloured blamish snail", + "examine": "A bruise blue coloured blamish snail, these types are said to spit acid.", "combat_style": "1", "melee_animation": "8143", "range_animation": "0", - "respawn_delay": "60", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "30", "defence_animation": "0", "weakness": "9", "slayer_exp": "0", "magic_animation": "0", "death_animation": "8144", "name": "Bruise Blamish Snail", - "defence_level": "10", + "defence_level": "40", "safespot": null, - "lifepoints": "14", - "strength_level": "10", + "lifepoints": "12", + "strength_level": "0", "id": "1230", - "range_level": "1", - "attack_level": "10" + "aggressive": "true", + "bonuses": "10,10,10,0,0,5,5,30,5,50,0,10,0,0,0", + "range_level": "15", + "attack_level": "0" }, { - "examine": "A branch bark coloured blamish snail", + "agg_radius": "", + "examine": "A branch bark coloured blamish snail, these types are said to spit acid.", "combat_style": "1", "melee_animation": "8143", "range_animation": "0", - "respawn_delay": "60", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "30", "defence_animation": "0", "weakness": "9", "slayer_exp": "0", "magic_animation": "0", "death_animation": "8144", "name": "Bark Blamish Snail", - "defence_level": "10", + "defence_level": "20", "safespot": null, - "lifepoints": "14", - "strength_level": "10", + "lifepoints": "22", + "strength_level": "0", "id": "1231", - "range_level": "1", - "attack_level": "10" + "aggressive": "true", + "bonuses": "10,10,10,0,0,5,5,30,5,50,0,10,0,0,0", + "range_level": "10", + "attack_level": "0" }, { - "examine": "A marsh coloured blamish snail", + "examine": "A marsh coloured blamish snail, these types are said to spit acid.", "combat_style": "1", "melee_animation": "8143", "range_animation": "0", - "respawn_delay": "60", + "attack_speed": "4", + "magic_level": "1", + "respawn_delay": "30", "defence_animation": "0", "weakness": "9", "slayer_exp": "0", "magic_animation": "0", "death_animation": "8144", "name": "Myre Blamish Snail", - "defence_level": "10", + "defence_level": "22", "safespot": null, - "lifepoints": "14", - "strength_level": "10", + "lifepoints": "8", + "strength_level": "0", "id": "1232", - "range_level": "1", - "attack_level": "10" + "aggressive": "true", + "bonuses": "10,10,10,0,0,5,5,30,5,50,0,10,0,0,0", + "range_level": "5", + "attack_level": "0" }, { - "examine": "A blood coloured blamish snail", + "examine": "A blood coloured blamish snail, these types are said to spit acid.", "combat_style": "1", "melee_animation": "8143", "range_animation": "0", - "respawn_delay": "60", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "30", "defence_animation": "0", "weakness": "9", "slayer_exp": "0", "magic_animation": "0", "death_animation": "8144", "name": "Blood Blamish Snail", - "defence_level": "10", + "defence_level": "45", "safespot": null, - "lifepoints": "14", - "strength_level": "10", + "lifepoints": "13", + "strength_level": "0", "id": "1233", - "range_level": "1", - "attack_level": "10" + "aggressive": "true", + "bonuses": "10,10,10,0,0,5,5,30,5,50,0,10,0,0,0", + "range_level": "12", + "attack_level": "0" }, { - "examine": "A muddy coloured blamish snail", + "examine": "A muddy coloured blamish snail, these types are said to spit acid.", "combat_style": "1", "melee_animation": "8143", "range_animation": "0", - "respawn_delay": "60", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "30", "defence_animation": "0", "weakness": "9", "slayer_exp": "0", "magic_animation": "0", "death_animation": "8144", "name": "Ochre Blamish Snail", - "defence_level": "10", + "defence_level": "18", "safespot": null, - "lifepoints": "14", - "strength_level": "10", + "lifepoints": "10", + "strength_level": "0", "id": "1234", - "range_level": "1", - "attack_level": "10" + "aggressive": "true", + "bonuses": "10,10,10,0,0,5,5,30,5,50,0,10,0,0,0", + "range_level": "7", + "attack_level": "0" }, { - "examine": "A bruise blue coloured blamish snail", + "examine": "A bruise blue coloured blamish snail, these types are said to spit acid.", "combat_style": "1", "melee_animation": "8143", "range_animation": "0", - "respawn_delay": "60", + "attack_speed": "6", + "magic_level": "1", + "respawn_delay": "30", "defence_animation": "0", "weakness": "9", "slayer_exp": "0", "magic_animation": "0", "death_animation": "8144", "name": "Bruise Blamish Snail", - "defence_level": "10", + "defence_level": "40", "safespot": null, - "lifepoints": "14", - "strength_level": "10", + "lifepoints": "12", + "strength_level": "0", "id": "1235", - "range_level": "1", - "attack_level": "10" + "aggressive": "true", + "bonuses": "10,10,10,0,0,5,5,30,5,50,0,10,0,0,0", + "range_level": "15", + "attack_level": "0" }, { "examine": "A Bedabin nomad fighter - a sandy swordsman.", @@ -28265,6 +28305,8 @@ "examine": "Champion of the ghouls.", "melee_animation": "422", "range_animation": "0", + "attack_speed": "4", + "magic_level": "1", "respawn_delay": "60", "defence_animation": "0", "weakness": "9", @@ -28272,14 +28314,15 @@ "magic_animation": "0", "death_animation": "836", "name": "Ghoul Champion", - "defence_level": "43", + "defence_level": "60", "safespot": null, - "lifepoints": "61", - "strength_level": "43", + "lifepoints": "100", + "strength_level": "80", "id": "3059", "aggressive": "true", - "range_level": "43", - "attack_level": "43" + "bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0", + "range_level": "60", + "attack_level": "60" }, { "examine": "Champion of the goblins.", @@ -69281,26 +69324,6 @@ "range_level": "1", "attack_level": "28" }, - { - "examine": "Champion of the ghouls.", - "melee_animation": "422", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "0", - "death_animation": "836", - "name": "Ghoul Champion", - "defence_level": "43", - "safespot": null, - "lifepoints": "61", - "strength_level": "43", - "id": "3059", - "aggressive": "true", - "range_level": "43", - "attack_level": "43" - }, { "examine": "Champion of the goblins.", "melee_animation": "6188", @@ -86798,27 +86821,6 @@ "range_level": "1", "attack_level": "4" }, - { - "examine": "A scary, man eating ghoul.", - "slayer_task": "37", - "melee_animation": "422", - "range_animation": "422", - "attack_speed": "5", - "defence_animation": "404", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "422", - "death_animation": "9055", - "name": "Ghoul", - "defence_level": "25", - "safespot": null, - "lifepoints": "40", - "strength_level": "25", - "id": "1218", - "bonuses": "10,10,20,20,15,20,15,15,15,15,15,35,0,0,0", - "range_level": "1", - "attack_level": "25" - }, { "examine": "Yuck! It's all slimy!", "melee_animation": "1273", @@ -86876,186 +86878,6 @@ "range_level": "1", "attack_level": "1" }, - { - "examine": "A marsh coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Myre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1227", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A blood coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Blood Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1228", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A muddy coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Ochre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1229", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A bruise blue coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Bruise Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1230", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A branch bark coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Bark Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1231", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A marsh coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Myre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1232", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A blood coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Blood Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1233", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A muddy coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Ochre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1234", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A bruise blue coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Bruise Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1235", - "range_level": "1", - "attack_level": "10" - }, { "examine": "A Bedabin nomad fighter - a sandy swordsman.", "melee_animation": "390", @@ -97104,22 +96926,6 @@ "range_level": "1", "attack_level": "2" }, - { - "examine": "Farmer/sheep liaison officer. Go on - give the dog a bone!", - "melee_animation": "0", - "range_animation": "0", - "defence_animation": "0", - "magic_animation": "0", - "death_animation": "0", - "name": "Sheepdog", - "defence_level": "1", - "safespot": null, - "lifepoints": "10", - "strength_level": "1", - "id": "2311", - "range_level": "1", - "attack_level": "1" - }, { "examine": "He rules the", "melee_animation": "0", @@ -102364,26 +102170,6 @@ "range_level": "1", "attack_level": "28" }, - { - "examine": "Champion of the ghouls.", - "melee_animation": "422", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "0", - "death_animation": "836", - "name": "Ghoul Champion", - "defence_level": "43", - "safespot": null, - "lifepoints": "61", - "strength_level": "43", - "id": "3059", - "aggressive": "true", - "range_level": "43", - "attack_level": "43" - }, { "examine": "Champion of the goblins.", "melee_animation": "6188", @@ -135268,55 +135054,6 @@ "range_level": "65", "attack_level": "65" }, - { - "examine": "A hermit slug.", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "8143", - "attack_speed": "5", - "magic_level": "18", - "respawn_delay": "55", - "end_gfx": "1387", - "defence_animation": "8145", - "magic_animation": "8143", - "death_animation": "8143", - "name": "Thorny snail", - "defence_level": "22", - "poison_immune": "true", - "safespot": null, - "lifepoints": "28", - "strength_level": "18", - "id": "6806", - "bonuses": "47,50,52,52,54,49,13,3,13,4,0,0,0,0,0", - "range_level": "21", - "projectile": "1386", - "attack_level": "19" - }, - { - "examine": "A hermit slug.", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "8143", - "attack_speed": "5", - "magic_level": "18", - "respawn_delay": "55", - "end_gfx": "1387", - "defence_animation": "8145", - "weakness": "10", - "magic_animation": "8143", - "death_animation": "8143", - "name": "Thorny snail", - "defence_level": "22", - "poison_immune": "true", - "safespot": null, - "lifepoints": "28", - "strength_level": "18", - "id": "6807", - "bonuses": "47,50,52,52,54,49,13,3,13,4,0,0,0,0,0", - "range_level": "21", - "projectile": "1386", - "attack_level": "19" - }, { "combat_style": "2", "melee_animation": "7970", @@ -143627,26 +143364,6 @@ "range_level": "1", "attack_level": "28" }, - { - "examine": "Champion of the ghouls.", - "melee_animation": "422", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "0", - "death_animation": "836", - "name": "Ghoul Champion", - "defence_level": "43", - "safespot": null, - "lifepoints": "61", - "strength_level": "43", - "id": "3059", - "aggressive": "true", - "range_level": "43", - "attack_level": "43" - }, { "examine": "Champion of the goblins.", "melee_animation": "6188", @@ -161152,27 +160869,6 @@ "range_level": "1", "attack_level": "4" }, - { - "examine": "A scary, man eating ghoul.", - "slayer_task": "37", - "melee_animation": "422", - "range_animation": "422", - "attack_speed": "5", - "defence_animation": "404", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "422", - "death_animation": "9055", - "name": "Ghoul", - "defence_level": "25", - "safespot": null, - "lifepoints": "40", - "strength_level": "25", - "id": "1218", - "bonuses": "10,10,20,20,15,20,15,15,15,15,15,35,0,0,0", - "range_level": "1", - "attack_level": "25" - }, { "examine": "Yuck! It's all slimy!", "melee_animation": "1273", @@ -161230,186 +160926,6 @@ "range_level": "1", "attack_level": "1" }, - { - "examine": "A marsh coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Myre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1227", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A blood coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Blood Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1228", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A muddy coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Ochre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1229", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A bruise blue coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Bruise Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1230", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A branch bark coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Bark Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1231", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A marsh coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Myre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1232", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A blood coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Blood Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1233", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A muddy coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Ochre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1234", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A bruise blue coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Bruise Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1235", - "range_level": "1", - "attack_level": "10" - }, { "examine": "A Bedabin nomad fighter - a sandy swordsman.", "melee_animation": "390", @@ -171458,22 +170974,6 @@ "range_level": "1", "attack_level": "2" }, - { - "examine": "Farmer/sheep liaison officer. Go on - give the dog a bone!", - "melee_animation": "0", - "range_animation": "0", - "defence_animation": "0", - "magic_animation": "0", - "death_animation": "0", - "name": "Sheepdog", - "defence_level": "1", - "safespot": null, - "lifepoints": "10", - "strength_level": "1", - "id": "2311", - "range_level": "1", - "attack_level": "1" - }, { "examine": "He rules the", "melee_animation": "0", @@ -176718,26 +176218,6 @@ "range_level": "1", "attack_level": "28" }, - { - "examine": "Champion of the ghouls.", - "melee_animation": "422", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "0", - "death_animation": "836", - "name": "Ghoul Champion", - "defence_level": "43", - "safespot": null, - "lifepoints": "61", - "strength_level": "43", - "id": "3059", - "aggressive": "true", - "range_level": "43", - "attack_level": "43" - }, { "examine": "Champion of the goblins.", "melee_animation": "6188", @@ -209374,55 +208854,6 @@ "range_level": "65", "attack_level": "65" }, - { - "examine": "A hermit slug.", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "8143", - "attack_speed": "5", - "magic_level": "18", - "respawn_delay": "55", - "end_gfx": "1387", - "defence_animation": "8145", - "magic_animation": "8143", - "death_animation": "8143", - "name": "Thorny snail", - "defence_level": "22", - "poison_immune": "true", - "safespot": null, - "lifepoints": "28", - "strength_level": "18", - "id": "6806", - "bonuses": "47,50,52,52,54,49,13,3,13,4,0,0,0,0,0", - "range_level": "21", - "projectile": "1386", - "attack_level": "19" - }, - { - "examine": "A hermit slug.", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "8143", - "attack_speed": "5", - "magic_level": "18", - "respawn_delay": "55", - "end_gfx": "1387", - "defence_animation": "8145", - "weakness": "10", - "magic_animation": "8143", - "death_animation": "8143", - "name": "Thorny snail", - "defence_level": "22", - "poison_immune": "true", - "safespot": null, - "lifepoints": "28", - "strength_level": "18", - "id": "6807", - "bonuses": "47,50,52,52,54,49,13,3,13,4,0,0,0,0,0", - "range_level": "21", - "projectile": "1386", - "attack_level": "19" - }, { "combat_style": "2", "melee_animation": "7970", @@ -217733,26 +217164,6 @@ "range_level": "1", "attack_level": "28" }, - { - "examine": "Champion of the ghouls.", - "melee_animation": "422", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "0", - "death_animation": "836", - "name": "Ghoul Champion", - "defence_level": "43", - "safespot": null, - "lifepoints": "61", - "strength_level": "43", - "id": "3059", - "aggressive": "true", - "range_level": "43", - "attack_level": "43" - }, { "examine": "Champion of the goblins.", "melee_animation": "6188", @@ -235250,27 +234661,6 @@ "range_level": "1", "attack_level": "4" }, - { - "examine": "A scary, man eating ghoul.", - "slayer_task": "37", - "melee_animation": "422", - "range_animation": "422", - "attack_speed": "5", - "defence_animation": "404", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "422", - "death_animation": "9055", - "name": "Ghoul", - "defence_level": "25", - "safespot": null, - "lifepoints": "40", - "strength_level": "25", - "id": "1218", - "bonuses": "10,10,20,20,15,20,15,15,15,15,15,35,0,0,0", - "range_level": "1", - "attack_level": "25" - }, { "examine": "Yuck! It's all slimy!", "melee_animation": "1273", @@ -235328,186 +234718,6 @@ "range_level": "1", "attack_level": "1" }, - { - "examine": "A marsh coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Myre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1227", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A blood coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Blood Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1228", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A muddy coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Ochre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1229", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A bruise blue coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Bruise Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1230", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A branch bark coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Bark Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1231", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A marsh coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Myre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1232", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A blood coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Blood Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1233", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A muddy coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Ochre Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1234", - "range_level": "1", - "attack_level": "10" - }, - { - "examine": "A bruise blue coloured blamish snail", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "0", - "magic_animation": "0", - "death_animation": "8144", - "name": "Bruise Blamish Snail", - "defence_level": "10", - "safespot": null, - "lifepoints": "14", - "strength_level": "10", - "id": "1235", - "range_level": "1", - "attack_level": "10" - }, { "examine": "A Bedabin nomad fighter - a sandy swordsman.", "melee_animation": "390", @@ -245556,22 +244766,6 @@ "range_level": "1", "attack_level": "2" }, - { - "examine": "Farmer/sheep liaison officer. Go on - give the dog a bone!", - "melee_animation": "0", - "range_animation": "0", - "defence_animation": "0", - "magic_animation": "0", - "death_animation": "0", - "name": "Sheepdog", - "defence_level": "1", - "safespot": null, - "lifepoints": "10", - "strength_level": "1", - "id": "2311", - "range_level": "1", - "attack_level": "1" - }, { "examine": "He rules the", "melee_animation": "0", @@ -250816,26 +250010,6 @@ "range_level": "1", "attack_level": "28" }, - { - "examine": "Champion of the ghouls.", - "melee_animation": "422", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "0", - "death_animation": "836", - "name": "Ghoul Champion", - "defence_level": "43", - "safespot": null, - "lifepoints": "61", - "strength_level": "43", - "id": "3059", - "aggressive": "true", - "range_level": "43", - "attack_level": "43" - }, { "examine": "Champion of the goblins.", "melee_animation": "6188", @@ -283720,55 +282894,6 @@ "range_level": "65", "attack_level": "65" }, - { - "examine": "A hermit slug.", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "8143", - "attack_speed": "5", - "magic_level": "18", - "respawn_delay": "55", - "end_gfx": "1387", - "defence_animation": "8145", - "magic_animation": "8143", - "death_animation": "8143", - "name": "Thorny snail", - "defence_level": "22", - "poison_immune": "true", - "safespot": null, - "lifepoints": "28", - "strength_level": "18", - "id": "6806", - "bonuses": "47,50,52,52,54,49,13,3,13,4,0,0,0,0,0", - "range_level": "21", - "projectile": "1386", - "attack_level": "19" - }, - { - "examine": "A hermit slug.", - "combat_style": "1", - "melee_animation": "8143", - "range_animation": "8143", - "attack_speed": "5", - "magic_level": "18", - "respawn_delay": "55", - "end_gfx": "1387", - "defence_animation": "8145", - "weakness": "10", - "magic_animation": "8143", - "death_animation": "8143", - "name": "Thorny snail", - "defence_level": "22", - "poison_immune": "true", - "safespot": null, - "lifepoints": "28", - "strength_level": "18", - "id": "6807", - "bonuses": "47,50,52,52,54,49,13,3,13,4,0,0,0,0,0", - "range_level": "21", - "projectile": "1386", - "attack_level": "19" - }, { "combat_style": "2", "melee_animation": "7970", @@ -292079,26 +291204,6 @@ "range_level": "1", "attack_level": "28" }, - { - "examine": "Champion of the ghouls.", - "melee_animation": "422", - "range_animation": "0", - "respawn_delay": "60", - "defence_animation": "0", - "weakness": "9", - "slayer_exp": "50", - "magic_animation": "0", - "death_animation": "836", - "name": "Ghoul Champion", - "defence_level": "43", - "safespot": null, - "lifepoints": "61", - "strength_level": "43", - "id": "3059", - "aggressive": "true", - "range_level": "43", - "attack_level": "43" - }, { "examine": "Champion of the goblins.", "melee_animation": "6188", @@ -297368,5 +296473,40 @@ "examine": "The sandwich lady.", "name": "Sandwich lady", "id": "3117" + }, + { + "examine": "A holy man.", + "name": "Drezel", + "id": "1049" + }, + { + "examine": "A holy man.", + "name": "Drezel", + "id": "7690" + }, + { + "examine": "A holy man.", + "name": "Drezel", + "id": "7707" + }, + { + "examine": "A slightly nervous guard.", + "name": "Ulizius", + "id": "1054" + }, + { + "examine": "A local holy man who supports the people trying to get though Mort Myre.", + "name": "Hiylik Myna", + "id": "1514" + }, + { + "examine": "The animated spirit of a soul not at rest.", + "name": "Filiman Tarlock", + "id": "1050" + }, + { + "examine": "The animated spirit of a soul not at rest.", + "name": "Nature Spirit", + "id": "1051" } ] \ No newline at end of file diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json index 41e8744dc..dad52babe 100644 --- a/Server/data/configs/npc_spawns.json +++ b/Server/data/configs/npc_spawns.json @@ -2961,7 +2961,7 @@ }, { "npc_id": "1228", - "loc_data": "{3420,3302,0,1,1}-{3424,3296,0,1,4}-{3509,3440,0,1,4}-{3518,3454,0,1,1}-{3504,3406,0,1,4}-{3497,3404,0,1,1}" + "loc_data": "{3469,3346,0,1,0}-{3494,3447,0,1,0}-{3530,3440,0,1,0}-{3556,3453,0,1,0}" }, { "npc_id": "1229", @@ -2973,7 +2973,7 @@ }, { "npc_id": "1231", - "loc_data": "{3426,3271,0,1,4}-{3435,3268,0,1,7}-{3443,3266,0,1,7}-{3442,3319,0,1,1}-{3445,3318,0,1,6}-{3518,3397,0,1,4}-{3519,3408,0,1,2}-{3516,3410,0,1,2}-{3489,3391,0,1,2}-{3487,3409,0,1,3}" + "loc_data": "{3504,3437,0,1,0}-{3509,3437,0,1,0}-{3498,3419,0,1,0}-{3493,3413,0,1,0}-{3524,3397,0,1,0}-{3438,3354,0,1,0}-{3429,3313,0,1,0}-{3429,3314,0,1,0}-{3437,3312,0,1,0}-{3437,3311,0,1,0}-{3451,3308,0,1,0}-{3447,3268,0,1,0}" }, { "npc_id": "1232", @@ -2981,7 +2981,7 @@ }, { "npc_id": "1233", - "loc_data": "{3432,3285,0,1,4}-{3434,3288,0,1,5}-{3428,3290,0,1,3}-{3440,3295,0,1,4}-{3436,3288,0,1,1}-{3446,3289,0,1,3}-{3514,3415,0,1,6}-{3509,3415,0,1,1}-{3516,3402,0,1,2}-{3492,3393,0,1,7}-{3493,3401,0,1,6}-{3487,3406,0,1,3}" + "loc_data": "{3485,3443,0,1,0}-{3516,3441,0,1,0}-{3537,3428,0,1,0}" }, { "npc_id": "1234", @@ -4359,6 +4359,10 @@ "npc_id": "2310", "loc_data": "{3025,3312,0,1,4}-{3043,3308,0,1,6}-{3023,3297,0,1,5}-{2928,3282,0,1,1}-{2927,3269,0,1,1}" }, + { + "npc_id": "2311", + "loc_data": "{3035,3296,0,0,0}" + }, { "npc_id": "2312", "loc_data": "{3014,3292,0,0,0}" diff --git a/Server/data/configs/object_configs.json b/Server/data/configs/object_configs.json index 193f044c7..09dc8d81a 100644 --- a/Server/data/configs/object_configs.json +++ b/Server/data/configs/object_configs.json @@ -5584,7 +5584,7 @@ "ids": "3514,3515" }, { - "examine": "A dark dank entrance to below..", + "examine": "A dark dank entrance to below.", "ids": "3516" }, { @@ -17025,7 +17025,7 @@ }, { "examine": "Better not eat them!", - "ids": "12094,12095,12096,12097,12098,12099" + "ids": "12094,12095,12096,12097,12098,12099,14121" }, { "examine": "A hot furnace.", @@ -20413,7 +20413,7 @@ }, { "examine": "Storage for all needs.", - "ids": "40047" + "ids": "40047,30648,30649,30650" }, { "examine": "A wooden barrel for storage.", @@ -20530,5 +20530,33 @@ { "examine": "Looking good!", "ids": "40065" + }, + { + "examine": "It looks slightly different from the rest.", + "ids": "30532" + }, + { + "examine": "'Here lies...' is all I can read.", + "ids": "30671,30672" + }, + { + "examine": "The inscription is worn away and unreadable.", + "ids": "30667,30669" + }, + { + "examine": "Whoever bought this must have really cared for the inhabitant.", + "ids": "30668" + }, + { + "examine": "Make a wish.", + "ids": "28715" + }, + { + "examine": "Contains no summoning energy.", + "ids": "28720,28721" + }, + { + "examine": "Glowing with barely-suppressed energies.", + "ids": "28719" } ] \ No newline at end of file From d9fbb49e51460ab2a09e8c5e26cce8a19de2fd76 Mon Sep 17 00:00:00 2001 From: ceikry Date: Fri, 20 Aug 2021 20:54:52 -0500 Subject: [PATCH 3/5] fix graphical prayer bug --- .../core/game/node/entity/player/link/prayer/Prayer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java b/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java index 200f24431..ee25e1d23 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java +++ b/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java @@ -118,6 +118,9 @@ public final class Prayer { else prayerActiveTicks = 0; if(prayerActiveTicks > 0 && prayerActiveTicks % 2 == 0){ + if(getPlayer().getSkills().getPrayerPoints() == 0){ + reset(); + } double amountDrain = 0; for(PrayerType type : getActive()){ double drain = type.getDrain(); @@ -131,9 +134,6 @@ public final class Prayer { } getPlayer().getSkills().decrementPrayerPoints(amountDrain); - if(getPlayer().getSkills().getPrayerPoints() == 0){ - reset(); - } } } From c95d86e0f428769fe639a76f70ab4b48a3007d1f Mon Sep 17 00:00:00 2001 From: ceikry Date: Fri, 20 Aug 2021 20:56:01 -0500 Subject: [PATCH 4/5] lil tweak --- .../java/core/game/node/entity/player/link/prayer/Prayer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java b/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java index ee25e1d23..234e49a71 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java +++ b/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java @@ -120,6 +120,7 @@ public final class Prayer { if(prayerActiveTicks > 0 && prayerActiveTicks % 2 == 0){ if(getPlayer().getSkills().getPrayerPoints() == 0){ reset(); + return; } double amountDrain = 0; for(PrayerType type : getActive()){ From 9e23e0d243f78f4ebb13e708be82325e65c54cc8 Mon Sep 17 00:00:00 2001 From: ceikry Date: Sun, 22 Aug 2021 16:42:35 -0500 Subject: [PATCH 5/5] Add independent sendGraphics method to ContentAPI. --- Server/src/main/kotlin/api/ContentAPI.kt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Server/src/main/kotlin/api/ContentAPI.kt b/Server/src/main/kotlin/api/ContentAPI.kt index c76a47259..dff42dfcd 100644 --- a/Server/src/main/kotlin/api/ContentAPI.kt +++ b/Server/src/main/kotlin/api/ContentAPI.kt @@ -1230,4 +1230,17 @@ object ContentAPI { fun sendNews(message: String){ Repository.sendNews(message, 12, "CC6600") } + + /** + * Sends a given Graphics object, or graphics ID, to the given location. + * @param gfx the Graphics object, or the Integer ID of the graphics, to send. Either works. + * @param location the location to send it to + */ + @JvmStatic + fun sendGraphics(gfx: G, location: Location){ + when(gfx){ + is Int -> Graphics.send(Graphics(gfx),location) + is Graphics -> Graphics.send(gfx, location) + } + } } \ No newline at end of file