From d1cb01fde8951e888828f5dfcf9237d2b24d94cc Mon Sep 17 00:00:00 2001 From: Badhad <46411657+BadHad@users.noreply.github.com> Date: Thu, 8 Apr 2021 17:10:43 -0400 Subject: [PATCH] Ceikry Fancy Shit - Ceikry did a bunch of fancy shit with digging and easter eggs n shit. --- Server/data/configs/item_configs.json | 34 +++++++++++++++++++ .../global/action/DropItemHandler.java | 3 +- .../node/entity/skill/summoning/pet/Pets.java | 10 +++--- .../worldevents/holiday/easter/EasterEvent.kt | 2 +- 4 files changed, 42 insertions(+), 7 deletions(-) diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index ae009f99d..62842f60f 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -138794,5 +138794,39 @@ "hat": "true", "id": "14650", "bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" + }, + { + "id": "14651", + "examine": "Passed down from the super egg defending bunny knights.", + "destroy": "true", + "destroy_message": " WARNING: This item CAN NOT be re-obtained.", + "bonuses": "-4,69,50,-4,0,0,0,0,0,-1,0,70,0,0,0", + "requirements": "{0,40}", + "durability": null, + "weight": "0.4", + "attack_speed": "4", + "weapon_interface": "12", + "render_anim": "326", + "equipment_slot": "3", + "fun_weapon": "true", + "name": "Eggscalibur", + "archery_ticket_price": "0", + "bonuses": "-100,-100,-50,0,0,0,0,0,0,0,0,-10,0,0,0" + }, + { + "name": "Super Egg", + "id": "14652", + "examine": "SUPER. EGG. SUPER. EGG.", + "destroy": "true", + "destroy_message": "You dare destroy I?! THE ALL MIGHTY AND POWERFUL SUPER EGG?!", + "durability": null, + "weight": "0.4", + "attack_speed": "4", + "weapon_interface": "12", + "render_anim": "182", + "equipment_slot": "3", + "fun_weapon": "true", + "archery_ticket_price": "0", + "bonuses": "-100,-100,-50,0,0,0,0,0,0,0,0,-10,0,0,0" } ] \ No newline at end of file diff --git a/Server/src/main/java/core/game/content/global/action/DropItemHandler.java b/Server/src/main/java/core/game/content/global/action/DropItemHandler.java index 6564310b8..5b6da8cc9 100644 --- a/Server/src/main/java/core/game/content/global/action/DropItemHandler.java +++ b/Server/src/main/java/core/game/content/global/action/DropItemHandler.java @@ -7,6 +7,7 @@ import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import rs09.game.system.SystemLogger; +import rs09.game.system.config.ItemConfigParser; import rs09.game.world.GameWorld; /** @@ -37,7 +38,7 @@ public final class DropItemHandler { } player.getDialogueInterpreter().close(); player.getPulseManager().clear(); - if (option.equalsIgnoreCase("destroy") || option.equalsIgnoreCase("dissolve")) { + if (option.equalsIgnoreCase("destroy") || option.equalsIgnoreCase("dissolve") || (boolean) item.getDefinition().getHandlers().getOrDefault(ItemConfigParser.DESTROY,false)) { player.getDialogueInterpreter().open(9878, item); return true; } diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/pet/Pets.java b/Server/src/main/java/core/game/node/entity/skill/summoning/pet/Pets.java index 79db2dc04..ce8c539c3 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/pet/Pets.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/pet/Pets.java @@ -64,27 +64,27 @@ public enum Pets { /** * A creeping hand pet. */ - CREEPING_HAND(14652, -1, -1, 8619, -1, -1, 0.0033333333333333, 4, 1059), + //CREEPING_HAND(14652, -1, -1, 8619, -1, -1, 0.0033333333333333, 4, 1059), /** * Minitrice pet. */ - MINITRICE(14653, -1, -1, 8620, -1, -1, 0.0033333333333333, 4, 225), + //MINITRICE(14653, -1, -1, 8620, -1, -1, 0.0033333333333333, 4, 225), /** * Baby basilisk pet. */ - BABY_BASILISK(14654, -1, -1, 8621, -1, -1, 0.0033333333333333, 4, 221), + //BABY_BASILISK(14654, -1, -1, 8621, -1, -1, 0.0033333333333333, 4, 221), /** * Baby kurask pet. */ - BABY_KURASK(14655, -1, -1, 8622, -1, -1, 0.0033333333333333, 4, 526), + //BABY_KURASK(14655, -1, -1, 8622, -1, -1, 0.0033333333333333, 4, 526), /** * Abyssal minion pet. */ - ABYSSAL_MINION(14651, -1, -1, 8624, -1, -1, 0.0033333333333333, 4, 592), + //ABYSSAL_MINION(14651, -1, -1, 8624, -1, -1, 0.0033333333333333, 4, 592), /** * Rune guardian pets. diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/easter/EasterEvent.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/easter/EasterEvent.kt index b64911645..cc634e9ed 100644 --- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/easter/EasterEvent.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/easter/EasterEvent.kt @@ -60,7 +60,7 @@ class EasterEvent : WorldEvent("easter") { override fun checkActive(): Boolean { val isApril = Calendar.getInstance().get(Calendar.MONTH) == Calendar.APRIL val isBefore9th = Calendar.getInstance().get(Calendar.DAY_OF_MONTH) < 9 - return (isApril && isBefore9th) + return false } override fun initialize() {