Updated Crumble Undead and created Snowscape API

New API will allow creating new global functions without conflicting with upstream changes.
Crumble undead now works on more undead, including Barrows brothers and revenants.

.gitignore

@@ -31,3 +31,4 @@ gradle
 **/*.swo
 build/kotlin/sessions/
 **/*.iml
+Server/hasRan.txt

.gitlab-ci.yml

@@ -1,16 +1,20 @@
 variables:
   # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
-  MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true -Xmx1024m"
+  MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true -Xmx3g"
   # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
   # when running from the command line.
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-fast --show-version"
 
-# This template uses jdk8 for verifying and deploying images
-image: maven:3-openjdk-11
+image: maven:3-openjdk-11-slim
+
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 
 before_script:
-  - apt-get update -qq && apt-get install -qq -y --no-install-recommends jq
+  - 'free -mh'
+  - 'apt-get update -q'
 
 # Cache downloaded dependencies and plugins between builds.
 # To keep cache across branches add 'key: "$CI_JOB_NAME"'
@@ -22,7 +26,7 @@ verify:jdk11:
   stage: build
   script:
     - 'cd Server'
-    - 'mvn $MAVEN_CLI_OPTS verify -DskipTests'
+    - 'mvn $MAVEN_CLI_OPTS verify'
   except:
     variables:
       - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -30,6 +34,7 @@ verify:jdk11:
 test:json:
   stage: test
   script:
+    - 'apt-get install -q -y --no-install-recommends jq'
     - 'find . -name \*.json -type f -print0 | xargs -0 -n1 -P8 jq empty'
   except:
     variables:

Dockerfile

@@ -0,0 +1,20 @@
+# Starting out with the openjdk-11-slim image
+FROM maven:3-openjdk-11-slim
+
+# Set working directory to /app
+WORKDIR /app
+
+# Update apt; install git and git-lfs 
+RUN apt-get update && apt-get -qq -y install git git-lfs
+
+# Clone the 2009scape repository
+RUN git clone --depth=1 https://gitlab.com/2009scape/2009scape.git
+
+# Fake it til you make it - let's go home
+WORKDIR /app/2009scape
+
+# Make sure ./run has permissions
+RUN chmod +x run
+
+# Run it
+CMD ["./run"]

README.md

@@ -72,7 +72,7 @@ There are many ways everyone can contribute! From the most seasoned programmers
 * **Wiki Editors**: Did you know we have a wiki? Well it's always in need of people to fill it out and stay on top of it. Editing the wiki is one of the easiest ways you can contribute to 2009Scape! If you're an active player and have the will, there's so much you could be helping out with over at the wiki. [Click here to go to the wiki](https://cdn.2009scape.org/wiki/doku.php?id=start).
 
 
-* **JSON editors**: We could always use more JSON editors! Please note that JSON editing **must** be done using the [Thanos Tool](https://gitlab.com/2009scape/rs09-thanos-tool/-/jobs/artifacts/master/raw/build/libs/thanostool.jar?job=build).
+* **JSON editors**: We could always use more JSON editors! Please note that JSON editing **must** be done using the [Thanos Tool](https://gitlab.com/2009scape/tools/rs09-thanos-tool/-/jobs/5153567519/artifacts/file/build/libs/zaros.jar). **This does not run on modern Java** and requires **Java 11** to run (using the usual 'java -jar zaros.jar').
 
 
 * **Authenticity Auditors**: As a remake, authenticity is central to our core values! We could always use someone to go through the game and create large lists of simple tasks that can be done to bring us closer to the authentic 2009 game! The preferred way to do this is one-area-at-a-time. If you want to see an example of some audits we've done in the past, take a look [here](https://gitlab.com/2009scape/2009scape/-/issues/46).
@@ -131,7 +131,7 @@ We use the AGPL 3.0 license, which can be found [here](https://www.gnu.org/licen
 
 ### Contact
 
-**Reminder: There is no official support for setting up your own server. Do not ping/dm developers, or ask in support channels about setting up your server. Support for the live server and 2009Scape single-player is available in the Discord.**
+**Reminder: There is no official support for setting up your own server. Do not ping/dm developers, or ask in support channels about setting up your server. Support for the live server and 2009Scape single-player is available on the [2009Scape forums](https://forum.2009scape.org/).**
 
 
 [license-shield]: https://img.shields.io/badge/license-AGPL--3.0-informational
@@ -149,4 +149,4 @@ These credits can be spent in the 2009Scape Reward Shop. It's important to be cl
 
 Testers are not the only people who can gain credits - other ways of earning credits can be found on [the 2009Scape website](https://2009scape.org/site/game_guide/credits.html).
 
-Please be patient! The Credit system is not fully complete yet, so it will take a long time for credits to be awarded. 
+Please be patient! The Credit system is not fully complete yet, so it will take a long time for credits to be awarded. 

Server/.gitignore

@@ -2,6 +2,7 @@ bin/**
 out/**
 data/logs/**
 data/profile/**
+data/playerstats/**
 .idea/**
 /bin
 .DS_Store**

Server/data/ObjectParser.xml

@@ -22,8 +22,10 @@
     <ObjectAction mode="add" id="39242" x="2955" y="3273" z="0" direction="w"/>
     <ObjectAction mode="add" id="39241" x="2955" y="3274" z="0" />
     <ObjectAction mode="add" id="20987" x="2821" y="2996" z="0" direction="s"/>
-    <ObjectAction mode="add" id="9472" x="3353" y="3951" z="0" direction="s"/>
     <ObjectAction mode="add" id="21301" x="2662" y="3162" z="0" direction="e"/>
     <ObjectAction mode="add" id="4176" x="2629" y="3661" z="2" type="4" direction="e"/>
 
+    <ObjectAction mode="add" id="2489" x="2839" y="3282" z="0" direction="w"/>
+    <ObjectAction mode="add" id="36695" x="2894" y="3510" z="0" direction="w"/>
+
 </parsing>

Server/data/botdata/bot_dialogue.json

@@ -13,7 +13,7 @@
     "This is my own dialogue",
     "@name run.",
     "@name you cant hide from me.",
-    "jajajajajaja",
+    "Jajajajajaja",
     "How do i get to Varrock @name?",
     "How do i get to Camelot @name?",
     "How do i get to Taverly @name?",
@@ -21,17 +21,17 @@
     "How do i get to Yanille @name?",
     "How do i get to Catherby @name?",
     "Gotta go srry.",
-    "wiggle wiggle wiggle yeah",
+    "Wiggle wiggle wiggle yeah",
     "@name lookin goofy",
     "@name lookin stoopid",
     "@name lookin like a red bracket",
     "@name get yo weasel lookin ass outta here",
     "@name lookin like some sort of twocan sam",
     " /hop world 1 got a noob here!",
-    "woot",
+    "Woot",
     "Hows your day been @name?",
-    "heyy @name :)",
-    "gtg srry",
+    "Heyy @name :)",
+    "Gtg srry",
     "I wont answer your questions @name",
     "Stop asking questions @name",
     "Roflmao",
@@ -48,7 +48,7 @@
     "Nice Armor @name!",
     "Nice Weapon @name!",
     "Venezuela #1",
-    "2009Scape and chill @name?",
+    "2009scape and chill @name?",
     "@name is my girlfriend",
     "Buying gf",
     "Bank sale pm me for info",
@@ -61,14 +61,14 @@
     "Fuckin sit @name.",
     "Error: Botting client broken tell Evilwaffles.",
     "@name bots all the time",
-    "report @name",
-    "apparently @name bots",
+    "Report @name",
+    "Apparently @name bots",
     "@name hates kermit",
     "There are no mods on to help you",
     "Report me, you wont",
     "Yes, Im botting. And?",
     "ERROR: BOTSCRIPT 404. REPORT TO BOT OWNER (Evilwaffles)",
-    "flash2:wave: FUCK",
+    "Flash2:wave: FUCK",
     "I love 2009Scape!",
     "Ja Ja Ja Ja",
     "This is fun!",
@@ -105,9 +105,9 @@
     "Trade me @name",
     "LOL",
     "How do I get to lumbrich",
-    "bruh",
-    "poggers",
-    "shitpost",
+    "Bruh",
+    "Poggers",
+    "Shitpost",
     "I wish i could find an RS Gf",
     "Where do you find runite ore @name?",
     "Where is the best coal location @name?",
@@ -135,41 +135,39 @@
     "Im not a bot",
     "Nah Im a real person",
     "Bruh are you even a real person lol?",
-    "e",
+    "E",
     "Hellooooo @name",
-    "wc lvl @name?",
-    "fletching level @name?",
-    "firemaking level @name?",
+    "Wc lvl @name?",
+    "Fletching level @name?",
+    "Firemaking level @name?",
     "Have you seen the dude in the ge?",
     "Wonderful weather today @name",
     "Lowkey drunk af rn",
     "I am so tired",
     "Wassup @name",
-    "follow me @name!",
+    "Follow me @name!",
     "Server goes brrrr",
-    "bruh i am not a bot",
+    "Bruh i am not a bot",
     "I think @name is a bot",
     "Are you a bot @name?",
-    "insert spiderman meme here",
-    "pot calling the kettle black etc",
-    "ooh, a piece of candy",
+    "Insert spiderman meme here",
+    "Pot calling the kettle black etc",
+    "Ooh, a piece of candy",
     "I love woodcutting",
     "Im going to go level up later",
     "I love mining shooting stars",
     " /this @name looks dumb",
     "AAAAAAAAAAAAAAAAAAAAAAAAHHHHHH!!!",
-    "como estas @name",
-    "Summer = always the best community manaer",
-    "so how about that ceikry guy",
-    "so how about that kermit dude",
-    "woah is an abusive mod",
+    "Como estas @name",
+    "So how about that ceikry guy",
+    "So how about that kermit dude",
+    "Woah is an abusive mod",
     "I heard Woah and Ceikry are dating now",
     "House party in Yanille!",
     "Can i have some gp @name?",
     "Where do i find partyhats?",
     "Why do mobs drop boxes?",
     "What exp rate do you play on @name?",
-    "Have you met Summer?",
     "Hey @name",
     "Hey @name",
     "Hey @name",
@@ -190,33 +188,33 @@
     "NobodyCLP has big feet",
     "Chicken tendies for dindin",
     "Spicey Chicken tendies is litty as a mf titty",
-    "red bracket stinky",
-    "ra ra rasputin",
-    "lover of the russian queen",
+    "Red bracket stinky",
+    "Ra ra rasputin",
+    "Lover of the russian queen",
     "Whens the next update coming out?",
     "How many players are maxed?",
     "I dont use discord @name",
     "I dont use the CC @name",
     "Why should i use discord?",
     "2009Scape is life",
-    "brb gotta make dinner",
+    "Brb gotta make dinner",
     "I need to go to the GE",
     "@name can i have a ge tele?",
-    "lol @name shut up",
+    "Lol @name shut up",
     "Where are teak trees?",
     "How do i make planks @name?",
     "Idk about that scraggley ass alex guy.",
     "Rusty? More like Crusty af lmfao.",
     "I need to sell some stuff on the ge",
     "I have so many logs to sell lol",
-    "nah",
-    "yes",
+    "Nah",
+    "Yes",
     "Where can i mine iron?",
     "Where can i mine tin?",
     "Where can i mine copper?",
     "Where can i mine clay?",
     "Where can i mine coal?",
-    "no",
+    "No",
     "We are no strangers to love",
     "You know the rules and so do I",
     "A full commitment's what I'm thinking of",
@@ -230,10 +228,10 @@
     "Never gonna make you cry",
     "Never gonna say goodbye",
     "Never gonna tell a lie and hurt you",
-    "why",
-    "why",
-    "why",
-    "why",
+    "Why",
+    "Why",
+    "Why",
+    "Why",
     "Why does it not show your messages in the chatbox?",
     "Why do you not show up in chat?",
     "Why do you not show up in chat @name?",
@@ -241,7 +239,7 @@
     "When did you start playing @name?",
     "When did you start on this server @name?",
     "When did you first get here @name?",
-    "russias greatest love machine",
+    "Russias greatest love machine",
     "Never gonna run around and desert you",
     "Two things are infinite, the universe & @names stupidity",
     "If you tell the truth, you dont have to remember anything.",
@@ -259,7 +257,7 @@
     "What do you think @name?",
     "How does that sound @name?",
     "That sounds great @name.",
-    "I’m learning English.",
+    "I'm learning English.",
     "I don't understand.",
     "Could you repeat that please @name?",
     "Could you please talk slower @name?",
@@ -283,26 +281,26 @@
     "@name?",
     "@name how long have you played",
     "@name world 1 or world 2?",
-    "what is your main world @name?",
+    "What is your main world @name?",
     "I prefer world 1 tbh",
     "I prefer world 2 tbh",
     "@name world 1 for life",
     "@name fog bots when?",
-    "damn somalian pirates",
-    "bracket more like brrrrrr acket",
-    "why the racket bracket",
+    "Damn somalian pirates",
+    "Bracket more like brrrrrr acket",
+    "Why the racket bracket",
     "Hi @name I am dad",
     "@name likes dad jokes",
-    "ur nuts @name",
-    "lootshare go brr",
-    "partay with froggay",
+    "Ur nuts @name",
+    "Lootshare go brr",
+    "Partay with froggay",
     "Know what else is lame? Not being able to play 2009scape right now",
     "Can you even grind on osrs",
-    "i botted to 88 fishing",
+    "I botted to 88 fishing",
     "Do not forget to vote in running polls!",
     "Always check announcments",
-    "we thrivin",
-    "ship @name",
+    "We thrivin",
+    "Ship @name",
     "Dont forget to vote 2009scape!",
     "Kermit is too legit 2 quit",
     "Out here on the range we are having fun",
@@ -312,11 +310,11 @@
     "I dont like him @name",
     "I dont like it @name",
     "Im an American.",
-    "ima go pickup my lady ting",
-    "that portuguese dude is something else",
+    "Ima go pickup my lady ting",
+    "That portuguese dude is something else",
     "@name!! @name!!",
-    "bowdi boy",
-    "i love bowdi... sometimes",
+    "Bowdi boy",
+    "I love bowdi... sometimes",
     "@name = @name",
     "I'm bacon.. go on dad... say it",
     "I'm going to leave.",
@@ -340,7 +338,7 @@
     "I couldn't agree more @name",
     "It cost me a fortune @name",
     "I am dog tired",
-    "Don’t take it personally",
+    "Don't take it personally",
     "We will be having a good time",
     "Same as always @name",
     "No problem",
@@ -362,40 +360,23 @@
     "530 gang for life",
     "@name, have you read the rules?",
     "@name, have you checked out the forums?",
-    "why are the leprechauns moving?",
+    "Why are the leprechauns moving?",
     "I am beyond the point of no return!",
     "Nothin' personnel, kid.",
     "All your base are belong to us",
     "May Guthix bring you balance.",
     "May Guthix bring you balance.",
     "May Guthix bring you balance.",
-    "Thy death was not in vain, for it brought some balance to the world. May Guthix bring you rest.",
-    "May you walk the path, and never fall, for Guthix walks beside thee on thy journey. May Guthix bring you peace.",
-    "All things must end, as all begin; Only Guthix knows the role thou must play. May Guthix bring you balance.",
-    "In life, in death, in joy, in sorrow: May thine experience show thee balance. May Guthix bring you balance.",
-    "Thou must do as thou must, no matter what. Thine actions bring balance to this world. May Guthix bring you balance.",
-    "The river flows, the sun ignites, May you stand with Guthix in thy fights. May Guthix bring you balance.",
     "A journey of a single step, May take thee over a thousand miles. May Guthix bring you balance.",
     "Zamorak give me strength!",
     "Zamorak give me strength!",
     "Zamorak give me strength!",			
-    "May your bloodthirst never be sated, and may all your battles be glorious. Zamorak bring you strength.",
-    "There is no opinion that cannot be proven true...by crushing those who choose to disagree with it. Zamorak give me strength!",
-    "Battles are not lost and won; They simply remove the weak from the equation. Zamorak give me strength!",
-    "Those who fight, then run away, shame Zamorak with their cowardice. Zamorak give me strength!",
-    "Battle is by those who choose to disagree with it. Zamorak give me strength!",
-    "Strike fast, strike hard, strike true: The strength of Zamorak will be with you. Zamorak give me strength!",
     "The weak deserve to die, so the strong may flourish. This is the creed of Zamorak.",
     "This is Saradomin's wisdom.",
     "This is Saradomin's wisdom.",
     "This is Saradomin's wisdom.",			
     "Go in peace in the name of Saradomin; may his glory shine upon you like the sun.",
     "Thy cause was false, thy skills did lack; See you in Lumbridge when you get back.",
-    "Protect your self, protect your friends. Mine is the glory that never ends. This is Saradomin's wisdom.",
-    "The darkness in life may be avoided, by the light of wisdom shining. This is Saradomin's wisdom.",
-    "Show love to your friends, and mercy to your enemies, and know that the wisdom of Saradomin will follow. This is Saradomin's wisdom.",
-    "A fight begun, when the cause is just, will prevail over all others. This is Saradomin's wisdom.",
-    "The currency of goodness is honour; It retains its value through scarcity. This is Saradomin's wisdom.",
     "For Camelot!",
     "Firmly grasp it!",
     "My legs!",
@@ -412,7 +393,7 @@
     "Fluff",
     "Bwuh",
     "I'm literally just mothin' bro",
-    "Certified 2009scape classic.",
+    "Certified 2009Scape Classic.",
     "Make sure to like, comment and subscribe @name it really helps",
     "Real 2009scape hours!!! Murder that like if you up!!!!",
     "W00t!",
@@ -426,32 +407,32 @@
     "Drip check",
     "Uhuhuhuhuhuhuhuhu",
     "Ahhhhhhhhhhhhhhhh",
-    "yall got any deez?",
+    "Yall got any deez?",
     "Deez nuts",
     "When she give you that yoinky sploinky",
-    "Sir, this is a 2009scape.",
+    "Sir, this is a 2009Scape.",
     "Oh dear! You are dead!",
     "Cor blimey, mate! What are ye doing in me pockets?",
-    "yeah i got funnies",
-    "read muv luv",
+    "Yeah i got funnies",
+    "Read muv luv",
     "Why doesn't she love me bros?",
     "@name is off the goop don't listen to the clown",
-    "do yall got laptops",
-    "cfunny play the alien warp sound effect",
+    "Do yall got laptops",
+    "Cfunny play the alien warp sound effect",
     "Ware to all whom doom hither, where cope is all yet constant.",
     "Who wants to come G W D?",
     "How do I make money?",
     "Ironmen stand alone together!",
-    "based",
-    "where is she",
+    "Based",
+    "Where is she",
     "*S N I I I I I I I I I F F F F F F F F F F F*",
     "Hey @name, who was in Paris?",
     "Huh whuh?",
-    "who's lone?",
-    "who *is* he?",
+    "Who's lone?",
+    "Who *is* he?",
     "Hi @name, I'm Dad!",
-    "anyone wanna play melty blood after I high alch these bows?",
-    "buru nyaaaa",
+    "Anyone wanna play melty blood after I high alch these bows?",
+    "Buru nyaaaa",
     "Number 15, Taverley Dungeon Black Dragons.",
     "House party at Rimmington! Host: @name!",
     "Spending 200m! Trade me, no junk!",
@@ -461,19 +442,19 @@
     "Nice outfit @name, does it come in children's size 12?",
     ":)",
     ":D",
-    "die screaming",
+    "Die screaming",
     "Only on Tuesdays",
-    "we stan 2009scape",
+    "We stan 2009scape",
     "There is no spoon",
     "Where's the cow level?",
     "Join 2009scape Clan Chat!",
     "Join 2009scape Cc!",
     "Chop chop!",
-    "Runescape rox my sox!!!!!!1",
+    "2009Scape rox my sox!!!!!!1",
     "Type ::scripts for all 99s",
     "Help I just died to Evil Chicken and I lost my stuff!",
     "Can you fight Bandos in this game?",
-    "one bad gloop",
+    "One bad gloop",
     "@name is not cute or funny",
     "You have committed crimes against Gielinor and her people. What say you?",
     "Barrows trauma",
@@ -488,7 +469,7 @@
     "Praise Andrew Gower",
     "Please help me I can't stop playing 2009scape",
     "Are you ignoring me, @name?!",
-    "i agree with this rfc can we put it in the game please",
+    "I agree with this rfc can we put it in the game please",
     "@name, we've been trying to reach you about your car's extended warranty",
     "Trimming armour, 25k gp",
     "Hey why does my furniture disappear?",
@@ -498,21 +479,525 @@
     "Shlisshalpshlaap",
     "Somebody call for an exterminator?",
     "Decisive action. Should work.",
-    "R E A D Y  T O  R A I S E  S O M E  H E L L",
     "Darkness overpowering.",
     "Got any questions about propane? Or propane accessories?",
     "When someone asks me if I am a god, I say Y E S!!!",
     "You run out of Marines?",
-    "Goliath Online",
-    "I'm escaping to the one place that hasn't been corrupted by Capitalism. Lunar Isle!",
     "Selling wildy protection, 100k gp",
-    "Can’t we get you on Mastermind, @name? Next contestant – @name from Lumbridge. Special subject – the bleedin’ obvious.",
-    "Oh, you’re German! I’m sorry, I thought there was something wrong with you.",
-    "Listen, don’t mention the war! I mentioned it once, but I think I got away with it all right.",
+    "Can't we get you on Mastermind, @name?",
+    "Listen, don't mention the war! I mentioned it once, but I think I got away with it all right.",
     "Cunnilingus and psychiatry brought us to this.",
-    "Oh, poor baby. What do you want, a Brimstail's Sampler?",
-    "There's an old TzHarrian saying, you fuck up once, you lose two teeth.",
-    "The lineup consisted simply of six hydrocoptic marzelvanes so fitted to the ambifacient lunar waneshaft that sidefumbling was prevented."
+    "Ah, the Wilderness... where dreams of riches meet a swift demise.",
+    "Who needs a quest guide? I've got the whole wiki memorized.",
+    "Buying GF 10k coins. Must have at least 70 Agility.",
+    "I swear, the goblins in Goblin Village have it out for me.",
+    "Why do wizards always hang out in towers? Is it a zoning thing?",
+    "I'm training my Construction skill. My house is gonna be lit!",
+    "The GE is like the stock market, but with dragon bones.",
+    "Why do we need a cabbage patch in Draynor? Seriously.",
+    "I've been mining rune essence for hours. My pickaxe hates me.",
+    "@name hit 99 Cooking. Time to open a gourmet restaurant in Varrock.",
+    "I'm convinced the @name is actually a time-traveling wizard.",
+    "Anyone up for a Castle Wars match? I need that decorative armor.",
+    "Accidentally clicked Attack on a guard. Now I'm a wanted criminal.",
+    "Why do we even have a Duel Arena? It's just a fancy boxing ring.",
+    "I've got a stack of burnt lobsters. Anyone want to buy them?",
+    "Greetings, @name! Looking for a quest?",
+    "Just got a rare drop! The RNG gods are smiling upon me!",
+    "Anyone need help with a boss fight? I've got my dragon dagger ready.",
+    "Buying feathers! Will pay top price!",
+    "The Lumbridge cows are my favorite training spot.",
+    "Who needs a teleport? I've got my magic runes stocked.",
+    "@name hit 99 Woodcutting. Time to chop some yews!",
+    "Anyone seen the Wise Old Man lately? I owe him a visit.",
+    "Selling lobsters! Freshly caught from Catherby.",
+    "Swear, the Wilderness is scarier than my nightmares.",
+    "Looking for a clan to join. Any takers?",
+    "I'm an ironman, so no trading for me!",
+    "Anyone up for a Castle Wars match?",
+    "The Grand Exchange prices are crashing. Panic sell!",
+    "Who else remembers the Falador Massacre?",
+    "I'm saving up for a party hat. Wish me luck!",
+    "Barrows runs are my addiction. Those crypts are spooky.",
+    "I'm convinced the Wise Old Man is secretly Zamorak.",
+    "I'm a completionist, so I'm grinding out all the achievements.",
+    "The music in this game is surprisingly epic.",
+    "Tried to trade with a tree... It didn't go well.",
+    "My bank is like a black hole. Items disappear forever.",
+    "I'm convinced the Wise Old Man is just a confused tourist.",
+    "My character's fashion sense? Let's just say it's 'unique.'",
+    "Challenged a cow to a dance-off. It won.",
+    "Why does the Lumbridge Guide always look so lost?",
+    "I'm training Agility, but my real-life agility is zero.",
+    "Tried to fish in the desert. Sandfish are elusive.",
+    "The Grand Exchange is like a chaotic stock market.",
+    "I'm a master at clicking 'Continue' during quests.",
+    "I'm convinced the chickens are plotting world domination.",
+    "I'm a woodcutter, but I've never seen a talking tree.",
+    "I'm a vegetarian, except when it comes to killing dragons.",
+    "Why do wizards wear pointy hats? Is it a fashion statement?",
+    "Challenged a guard to a staring contest. He won.",
+    "I'm collecting cabbage. It's a noble pursuit.",
+    "Accidentally set my cat on fire. It's now a firecat.",
+    "I'm convinced the Wise Old Man is secretly a time traveler.",
+    "I'm a quest completionist, but I still can't find my keys.",
+    "I'm convinced the ducks are spying on us.",
+    "I'm a pro at avoiding the Lumbridge swamp. Too many frogs.",
+    "Hey, can someone lend me 10k? I promise I'll pay it back... eventually.",
+    "Why do I always find the one square where the random event spawns?",
+    "I'm training Prayer by burying bones. It's like a spiritual workout.",
+    "The Wise Old Man's fashion sense is questionable.",
+    "I'm convinced the ducks are secretly plotting world domination.",
+    "Why do wizards wear pointy hats? Is it a dress code?",
+    "I'm collecting cabbage. It's a noble pursuit, really.",
+    "I'm a vegetarian, except when it comes to killing dragons.",
+    "Why does the Lumbridge Guide always look so lost?",
+    "Training Agility, but my real-life agility is zero.",
+    "I'm convinced the Wise Old Man is secretly a time traveler.",
+    "Tried to mine air. It's an untapped resource.",
+    "I'm a quest completionist, but I still can't find my keys.",
+    "Challenged a guard to a staring contest. He won.",
+    "I'm saving up for a party hat. Priorities, you know?",
+    "Why do goblins drop coins? Do they moonlight as accountants?",
+    "I'm convinced the chickens are plotting something.",
+    "Clicked 'Attack' on a chicken. Now I'm a poultry murderer.",
+    "My character's fashion sense? Let's just say it's 'unique.'",
+    "Do you know where I can find the entrance to the Taverley Dungeon?",
+    "Hey, anyone here familiar with the Barrows? I need some tips.",
+    "Is there a bank nearby? My inventory is overflowing with loot",
+    "I'm clueless about clue scrolls",
+    "Where's the best spot to catch sharks? I'm aiming for 99 Fishing.",
+    "Is there a shortcut to the Karamja Volcano?",
+    "Can someone explain the mechanics of the Jad fight in the Fight Caves?",
+    "I'm stuck on the Elemental Workshop quest. Any hints?",
+    "Where can I find a loom to spin flax into bowstrings?",
+    "What's the best gear setup for killing dragons? I want that visage drop!",
+    "I'm trying to unlock the fairy rings",
+    "How do I recharge my amulet of glory?",
+    "Why do goblins drop coins?",
+    "The Grand Exchange is like the stock market",
+    "My real-life agility is more like a lumbering tortoise.",
+    "The Wise Old Man's fashion sense is like Woahs",
+    "I challenged a cow to a dance off, surprisingly smooth mooves.",
+    "Why does the Lumbridge Guide always look lost?",
+    "I'm convinced the ducks in Lumbridge are plotting world domination!",
+    "I accidentally ate my prayer potion I'm blessed with heartburn",
+    "I'm a vegetarian, except when it comes to slaying dragons.",
+    "Why do wizards wear pointy hats? Is it a magical dress code?",
+    "I'm a quest completionist, but I still can't find my keys in real life.",
+    "I challenged a guard to a staring contest. He won.",
+    "I'm saving up for a party hat. Priorities, ya know?",
+    "What's the deal with the Wilderness?",
+    "I'm convinced the chickens are secretly plotting world domination!",
+    "Accidentally clicked 'Attack' on a guard. Now I'm on a watchlist.",
+    "My character's fashion sense? Let's just say it's 'unique'",
+    "Lobsters heal my soul",
+    "Trimmed armor or bust!",
+    "Wilderness: Where friendships go to die",
+    "Buying gf 10k",
+    "Dancing for coins at Lumbridge",
+    "Wearing full rune like a boss",
+    "Teleporting to Camelot for quests",
+    "Fishing for hours at Catherby",
+    "PKing with a rune 2h",
+    "World 1 Falador Park parties",
+    "Staking my bank at the Duel Arena",
+    "Dying to Elvarg's fiery breath sums up my life",
+    "Got the Quest cape finally on my main!",
+    "Wearing a party hat with pride",
+    "Castle Wars: Red vs Blue",
+    "Trading in Varrock Square",
+    "Barrows runs for that sweet loot",
+    "Spending hours in Pest Control is life",
+    "Killing cows for leather armor is a good start",
+    "Farming herbs in Ardougne can be good money",
+    "Clan chat drama LOL",
+    "Mining rune essence endlessly",
+    "Agility courses: A love-hate relationship",
+    "Dueling for honor.... and GP",
+    "Buying runes from Aubury is decent money",
+    "Chasing the Easter Bunny like a scam",
+    "Wearing a skillcape with pride",
+    "Fletching yew longbows for profit",
+    "Going to implings in Puro-Puro",
+    "Castle Wars barricade wars",
+    "Dropping party hats at drop parties like pennies",
+    "Killing lesser demons in Karamja is part of my holy conquest",
+    "@name lures noobs into the Wilderness",
+    "Farming ranarrs for cash",
+    "Getting lost in the Underground Pass",
+    "Selling coal at the Grand Exchange",
+    "Fighting the Kalphite Queen",
+    "Picking flax in Seers' Village",
+    "Begging for free stuff in Lumbridge",
+    "Smithing rune platebodies for profit",
+    "Logging out in Lumbridge Castle",
+    "Hey @name, how do I get to the Grand Exchange?",
+    "Veteran here! @name, what's your favorite quest?",
+    "@name, how do I make money fast?",
+    "Hey @name, what's the best combat style for bossing?",
+    "@name, always carry an emergency teleport!",
+    "New player here! @name, what's the Wilderness like?",
+    "Hey @name, how do I join a clan?",
+    "@name, prioritize Prayer levels!",
+    "@name, what's the best way to train Agility?",
+    "Hey @name, what's your favorite minigame?",
+    "@name, never trust a PKer in Lumbridge!",
+    "@name, how do I get a fire cape?",
+    "Hey @name, what's the fastest way to level up Magic?",
+    "@name, try the Barrows tunnels!",
+    "@name, what's the deal with Pest Control?",
+    "Hey @name, how do I unlock the Fairy Rings?",
+    "@name, remember the old random events?",
+    "@name, should I train Strength or Attack first?",
+    "Hey @name, what's your favorite skillcape?",
+    "@name, can't do the Fight Caves!",
+    "@name, how do I get a pet?",
+    "Hey @name, what's the best food for boss fights?",
+    "@name, Castle Wars or Clan Wars?",
+    "@name, what's a clue scroll?",
+    "Hey @name, how do I defeat Jad?",
+    "@name, use Protect from Melee at KBD!",
+    "@name, should I train Ranged or Magic?",
+    "Hey @name, what's the best way to level up Crafting?",
+    "@name, don't forget your anti-dragon shield!",
+    "@name, what's the Stronghold of Security?",
+    "Hey @name, how do I access the Legends' Guild?",
+    "@name, remember the old PvP worlds?",
+    "@name, how do I get a dragon defender?",
+    "Hey @name, what's the best way to level up Herblore?",
+    "@name, always carry a charged amulet of glory!",
+    "@name, should I train Fishing or Cooking?",
+    "Hey @name, how do I defeat the Chaos Elemental?",
+    "@name, try the TzHaar Fight Pit!",
+    "@name, what's the best way to level up Smithing?",
+    "Hey @name, what's your favorite Slayer master?",
+    "@name, use the Ardougne cloak teleports!",
+    "@name, what's the Legends' Quest about?",
+    "Hey @name, how do I unlock the Ancient Magicks?",
+    "@name, remember the old Pest Control boats?",
+    "@name, what's the best way to level up Construction?",
+    "Hey @name, what's the fastest way to level up Prayer?",
+    "@name, the old Duel Arena stakes!",
+    "@name, what's the Warriors' Guild?",
+    "Hey @name, how do I defeat the Kalphite Queen?",
+    "@name, use the fairy ring code BIP!",
+    "@name, should I train Attack or Defense first?",
+    "Hey @name, what's the best way to level up Thieving?",
+    "@name, don't forget your charged glory amulet!",
+    "@name, what's the Legends' Cape?",
+    "Hey @name, how do I access the Heroes' Guild?",
+    "@name, remember the old Pest Control void gear?",
+    "@name, how do I get a firemaking skillcape?",
+    "Buying gf 10k",
+    "Trimming armor for free!",
+    "Wanna join my clan? We're called The Mighty Cabbages'!",
+    "I'll meet you at the Falador Party Room!",
+    "Dancing for coins in Varrock Square!",
+    "Remember when the Wilderness was dangerous?",
+    "I got a rune scimitar drop from Lesser Demons!",
+    "Lumbridge Swamp is haunted!",
+    "Anyone up for Castle Wars?",
+    "I miss the old random events!",
+    "World 2 is the trading hub!",
+    "I'm going to train my Agility at the Gnome Stronghold!",
+    "I just got 99 Cooking!",
+    "Fishing lobsters at Catherby is life!",
+    "The Legends' Guild is so exclusive!",
+    "Who needs a quest guide? I'll figure it out!",
+    "I'm mining rune essence for hours!",
+    "Barrows armor looks sick!",
+    "I'm stuck in the Underground Pass!",
+    "The Stronghold of Security taught me about account security!",
+    "I'm going to farm herbs in Ardougne!",
+    "I'm getting my fire cape!",
+    "I love the music in RuneScape!",
+    "I'm alching my maple longbows!",
+    "I'm doing the Recipe for Disaster subquests!",
+    "I'm going to train my combat stats at the Rock Crabs!",
+    "I'm going for the Quest Cape!",
+    "I'm going to mine pure essence!",
+    "I'm hunting chinchompas in the Feldip Hills!",
+    "I'm going to train my Woodcutting at Seers' Village!",
+    "I'm going to fish sharks at the Fishing Guild!",
+    "I'm going to train my Thieving at Ardougne Knights!",
+    "I'm going to hunt implings in Puro-Puro!",
+    "I'm going to train my Hunter at the Falconry!",
+    "I'm smithing rune platebodies!",
+    "I'm going to train my Farming at the Tree Gnome Stronghold!",
+    "I'm going to hunt red chinchompas in the Wilderness!",
+    "I'm doing the Underground Pass quest!",
+    "I'm going to fish monkfish in Piscatoris!",
+    "Meet me in Varrock, @name, for an epic trade",
+    "@name, join my clan; we'll conquer the Wilderness together!",
+    "Beware the dragons, @name, they're fiercer than you think",
+    "Crafting runes with @name, the best mage in Gielinor",
+    "Fishing lobsters with @name, the sea's no match for us",
+    "@name, your swordsmanship at Duel Arena is unmatched!",
+    "Questing through dark caves, @name always leads the way",
+    "Share your wisdom, @name, how'd you master those spells?",
+    "Legends speak of @name bravery at the God Wars",
+    "Need more arrows, @name? I've got plenty to spare",
+    "Cooking's a breeze when @name around, no burnt lobsters!",
+    "Mining together, @name and I strike gold every time",
+    "@name, let's barter; your herbs for my potions?",
+    "Training agility with @name, leaping like graceful gazelles",
+    "Heard @name got the best magic beans in town",
+    "Fletching bows with @name, aiming for perfection",
+    "Smithing with @name, our anvils never cool down",
+    "Adventuring with @name, every quest is a thrill",
+    "Battling demons, @name courage inspires us all",
+    "Slaying dragons, @name the hero we need",
+    "Gathering at Falador, @name party room is legendary",
+    "Hunting chinchompas, @name traps are always full",
+    "Farming's fun with @name, our crops never fail",
+    "Brewing potions, @name mixtures are magical",
+    "Casting spells with @name, we're invincible",
+    "Building fires, @name flames warm the coldest nights",
+    "Sailing to Pest Control, @name our fearless captain",
+    "Trading runes, @name deals are the fairest",
+    "Exploring dungeons, @name the light in the darkness",
+    "Charging orbs with @name, our energy knows no bounds",
+    "Dancing in Draynor, @name moves are enchanting",
+    "Playing Gnomeball, @name the star player",
+    "Harvesting willows, @name axe swings true",
+    "Enchanting jewelry, @name touch turns copper to gold",
+    "Summoning familiars, @name spirit wolf leads the pack",
+    "Thieving from stalls, @name hands are lightning-fast",
+    "Crafting runes, @name essence never runs dry",
+    "Fishing at Catherby, @name catch feeds us all",
+    "Cooking feasts, @name dishes delight the gods",
+    "Mining runite, @name pickaxe strikes rich veins",
+    "Bartering at Grand Exchange, @name a trading master",
+    "Training prayer, @name piety moves mountains",
+    "Fighting revenants, @name valor shines bright",
+    "Building homes, @name construction is flawless",
+    "Hunting imps, @name net is always full",
+    "Brewing ale, @name tavern is the town's favorite",
+    "Casting high alchemy, @name turns junk into treasure",
+    "Sailing to Karamja, @name adventures are legendary",
+    "Forging alliances, @name charisma unites clans",
+    "Defeating bosses, @name name echoes in legends",
+    "Are you mewing @name???",
+    "Check out that gyatt @name",
+    "Bruhhhhh @name got that rizz",
+    "@name rizzing up the bots",
+    "Ironman? More like copperboy LOL",
+    "What that gyatt do @name",
+    "He's got the zoomies!",
+    "@name likes pickles and dipped in mayo",
+    "Lmaaooooooo",
+    "Bruh she said she loved me...",
+    "I caught @name rizzing a mewing teacher",
+    "What that mouth do bb",
+    "Ayo tf he say",
+    "Ayo",
+    "Ayo @name a freak lowkey",
+    "Ayo tf",
+    "@name catch me outside howbout that",
+    "Wasssssuuuuppppppp",
+    "Knock knock @name",
+    "Oh boy howdy do i have a surprise for you",
+    "Noooooo",
+    "What do you mean I haven't done anything wtf",
+    "Redrocket redrocket!!!",
+    "I made 20,000 crochet sock puppets for ceikry",
+    "Come on @name",
+    "Are we rading tonight @name?",
+    "Why would he say that",
+    "Penguins are technically reptiles",
+    "Brb smell something burning",
+    "Need pest control partner, you handle the portals, i will afk",
+    "Bruhhhh the skibiddi rizz in my gyatt makes my mewing sesh rough",
+    "@name jajajajaja",
+    "Wait, I can't raid tonight @name",
+    "Brb, pizza's here. Hope they ask why I'm a grown man dressed like an elf",
+    "Sorry, gotta go AFK. My dog just ate my gaming headset.",
+    "Brb, my grandma just fell down the stairs",
+    "Hold on, the baby's crying, aka @name",
+    "Oops, spilled my drink",
+    "Guys, I need to log off, my plants are staging a revolt for not watering them",
+    "AFK a sec, my neighbor's llama is in my backyard again",
+    "My pizza rolls are ready",
+    "Lost track of time, i'm late for my own wedding",
+    "Sorry, can't hear you over the sound of my laundry",
+    "Turn HDR off in windows @name",
+    "Www. no one cares .com",
+    "Hey @name www dot stfu dot com",
+    "Like pitching a tent in a pair of britches",
+    "Mad as a bag of ferrets",
+    "I dont think beavers built the hoover dam",
+    "How do beavers get the concrete for dams?",
+    "@name show me the way",
+    "@name onwards brutha",
+    "@name eats fried rat tails",
+    "@name is a rat",
+    "Why are there so many people farming right now",
+    "@name fuck the police",
+    "@name says the like pickles on their hotdogs",
+    "Fuck the guards, free woah in varrock prison",
+    "Ayo fuck u mean",
+    "Woop woop thats da sound of the beast",
+    "How are you the way that you are",
+    "She sells seashells by the sea shore",
+    "@name certified rat",
+    "@name buys skimmed milk",
+    "Got milk?",
+    "Are you JSON because i want you to get array from me",
+    "@name likes string manipulation",
+    "@name sells legos",
+    "JUST DO IT",
+    "Why are there so many motherfucking options",
+    "Just hit the fucking auto hide thing",
+    "Just play",
+    "Hell no this shit is fuzzy as balls",
+    "@name is fuzzy as balls",
+    "Turn your brightness up @name",
+    "On my pc it runs perfectly",
+    "I know why mine seems a little jumpy",
+    "Stream the window not the monitor",
+    "Discords a bitch",
+    "Why are there so many handsome people at the ge like @name",
+    "I'll make you squeel of fortune",
+    "You will get it in due time @name",
+    "I was one turn away",
+    "It do be pipe time @name",
+    "Sometimes i like to cover myself in vaseline and pretend i'm a slug",
+    "Woah is a greased pig",
+    "Sometimes i dig holes in my backyard and pretend i'm a carrot",
+    "It's pipe time @name",
+    "If i am not pipe timing i am programming",
+    "Yes i have thigh high socks, no you cannot have them",
+    "I scream when i wear my programming socks",
+    "Anyone wanna buy @name's bathwater?",
+    "Anyone wanna buy my used socks?",
+    "@name be getting bags",
+    "What the fuck is this",
+    "Hi i noticed you haven't taken a break in hours @name",
+    "I really am seething rn",
+    "I am so fucking tilted",
+    "Go back to your fucking frogs",
+    "Life is simple as frog farmer",
+    "A q p",
+    "Oooooh that's a first",
+    "Been a minute @name",
+    "Hey @name",
+    "Oh shit it's @name",
+    "Hey @name wyd today?",
+    "Ayo @name",
+    "Wyd @name",
+    "Wbu @name?",
+    "Good fuck em, that's what they get",
+    "Deathknight lookin rat ass mf @name",
+    "@name sucks slugs",
+    "Brb gotta take a shit",
+    "@name will brb went to take a shit",
+    "Tell me when he is coming",
+    "This guy is being incredibly based",
+    "@name is based af",
+    "Taking l's all day today @name",
+    "That sucks massive dongus",
+    "Ah i was about to type that",
+    "Where is stormwind?",
+    "How do i buy gold",
+    "@name sells gold",
+    "@name is a gold digger",
+    "Ayo @name wanna buy some frog legs?",
+    "Brb fucking burnt my pizza rolls",
+    "I swear @name if you need roll again",
+    "@name you are a hunter you don't need plate armor",
+    "Dragonriding is satisfying",
+    "There's an old TzHarrian saying, you fuck up once, you lose two teeth",
+    "FUCK",
+    "@name i am ready when you are",
+    "Anyone selling logs?",
+    "That is hilarious @name",
+    "Alright @name",
+    "I need to go get my quest cape",
+    "500 barrows runs dry",
+    "Back to back to back barrows items, easy game",
+    "@name did you know them?",
+    "@name sucks eggs",
+    "@name eats snails",
+    "Who is that?",
+    "I've gotta go in 20 minutes",
+    "Bonk",
+    "Gtg in 30 minutes",
+    "They left 50 minutes ago",
+    "I think it's just gonna be us",
+    "Who is that?",
+    "Stop following me",
+    "@name stop following me",
+    "I think @name is watching me",
+    "@name wouldn't let me get a hit in at clan wars",
+    "Clan wars and chill?",
+    "Quick mewing sesh",
+    "Don't you stickbug me",
+    "Get stick bugged",
+    "Wtf why are you a dragon",
+    "Fun fact, woah eats eggs whole like a snake",
+    "Ceikys there's a rare over there",
+    "Where is goldshire?",
+    "How long have you played @name?",
+    "Wanna quest?",
+    "TROGDORRRRRR",
+    "Fuck this shit i'm out",
+    "Wait till you get your first 99",
+    "How is that even possible",
+    "That's the max",
+    "@name is trying to max",
+    "Complesionist cape?",
+    "How can you increase your run speed?",
+    "@name where is barrows?",
+    "@name where are rune rocks?",
+    "@name where is yanille?",
+    "@name how long have you played for?",
+    "Yes these quotes were hand typed",
+    "Kermit was here",
+    "World of Warcraft died after Wrath",
+    "Ceikry needs to add talent trees",
+    "How do you get to the wilderness?",
+    "Anyone tryna lure @name?",
+    "@name tried to lure me",
+    "@name bots all the time",
+    "Anyone want chicken tendies",
+    "Brb foods ready",
+    "Brb",
+    "Gotta go get food",
+    "Anyone else from northern alaska?",
+    "Fishing 4 gp",
+    "Looking for gf",
+    "Anyone wanna be my discord kitten?",
+    "Selling discord kittens",
+    "@name is a discord kitten",
+    "Add me on discord",
+    "Are you in the 09discord",
+    "Where are you going @name?",
+    "Idk what i am going to cook today",
+    "What should i eat tonight",
+    "He is in the cave",
+    "Don't forget to save game before logging out",
+    "American horror story died after season 1",
+    "Prequels are better than the sequels",
+    "Disney star wars is the best star wars",
+    "Halo 5 sucked",
+    "Selling xbox live gold and 1600 microsoft points for 50k gp",
+    "Buying gf 25gp and a bucket",
+    "@name i heard evilwaffles bots",
+    "@name hopefully ceikry doesn't find out about evilwaffles",
+    "Honk honk",
+    "Where is the road to mordor?",
+    "Golem lookin ass bitch",
+    "@name rat looking mf",
+    "@name uses sand paper to wipe",
+    "@name said Woah is cute",
+    "You need 25 of 40 to do that",
+    "Over 1000 unique lines of dialogue",
+    "What should i get to eat",
+    "Ge be poppin today",
+    "Where all the woahs at",
+    "Ayo woahscam got that gyatt",
+    "That is one i haven't seen before"
   ],
   "halloween": [
     "Trick or treat!!!",
@@ -523,9 +1008,9 @@
     "Costume party at my P O H!! Follow me!",
     "Trick, then!",
     "Brrrainssssssss...",
-    "'Cause this is thriller, thriller night, and no one's gonna save you from the beast about to strike!",
-    "This is Hallowe'en, this is Hallowe'en, pumpkins scream in the dead of night!",
-    "This is Hallowe'en, everybody make a scene, Trick or treat till the neighbors gonna die of fright!",
+    "'Cause this is thriller, thriller night!",
+    "This is Hallowe'en, this is Hallowe'en!",
+    "This is Hallowe'en, everybody make a scene!",
     "In this town we call home, everyone hail to the pumpkin song!",
     "Watch out for Skeleton Jack!",
     "The headless-what-man? Horse? Never heard of those.",
@@ -596,7 +1081,7 @@
     "Rusty = the grinch, @name = santa",
     "@name the red nose reindeer",
     "Put one foot in front of the other",
-    "and soon you will be walking out the doooor",
+    "And soon you will be walking out the doooor",
     "Elf on the shelf time",
     "@name loves pinecones",
     "I love the smell of pinecones",
@@ -695,21 +1180,21 @@
     "Woah got those roofies strapped",
     "Why is my drink cloudy?",
     "@name and woah be wrestlin",
-    "bekky want sum fuk?",
+    "Bekky want sum fuk?",
     "Damn @name you got an ass",
     "Is that a footlong in your pants or are you happy to see me?",
     "@name so hot i gotta change my pants",
     "@name is a sex god",
-    "bruh we hype today",
-    "dont be silly wrap the willy @name!",
-    "wrap it before you smack it @name",
-    "can i get a reeeeee @name?",
-    "valentines day is the best day",
+    "Bruh we hype today",
+    "Dont be silly wrap the willy @name!",
+    "Wrap it before you smack it @name",
+    "Can i get a reeeeee @name?",
+    "Valentines day is the best day",
     "@name shut up before i smack you with my crusty sock",
     "Valentines day, more like me and my hand day smh",
     "If you think these quotes are wild just wait @name",
     "All im saying is we have never seen @name and biden in the same room",
-    "red rocket, red rocket!",
+    "Red rocket, red rocket!",
     "Woahs favourite game is red rocket",
     "@name sexy af today",
     "Happy Valentines day @name!!!",
@@ -754,4 +1239,4 @@
     "@name and i are going to look for the easter bunny!!",
     "Hint for anyone who sees this you must dig above eagles peak"
   ]
-}
+}

Server/data/configs/account_limit_exceptions.conf

@@ -0,0 +1,2 @@
+[exceptions]
+"127.0.0.1" = 5

Server/data/configs/clue_rewards.json

@@ -389,31 +389,31 @@
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10666,
+      "id": 7334,
       "maxAmount": 1
     },
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10669,
+      "id": 7340,
       "maxAmount": 1
     },
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10672,
+      "id": 7346,
       "maxAmount": 1
     },
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10675,
+      "id": 7352,
       "maxAmount": 1
     },
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10678,
+      "id": 7358,
       "maxAmount": 1
     },
     {
@@ -949,7 +949,7 @@
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10667,
+      "id": 7336,
       "maxAmount": 1
     },
     {
@@ -961,7 +961,7 @@
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10670,
+      "id": 7342,
       "maxAmount": 1
     },
     {
@@ -973,7 +973,7 @@
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10673,
+      "id": 7348,
       "maxAmount": 1
     },
     {
@@ -985,7 +985,7 @@
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10676,
+      "id": 7354,
       "maxAmount": 1
     },
     {
@@ -997,7 +997,7 @@
     {
       "minAmount": 1,
       "weight": "5",
-      "id": 10679,
+      "id": 7360,
       "maxAmount": 1
     },
     {

Server/data/configs/door_configs.json

@@ -73,7 +73,7 @@
   },
   {
     "id": "92",
-    "replaceId": "17317",
+    "replaceId": "91",
     "fence": "false",
     "metal": "false"
   },
@@ -193,7 +193,7 @@
   },
   {
     "id": "1553",
-    "replaceId": "1552",
+    "replaceId": "1556",
     "fence": "true",
     "metal": "false"
   },
@@ -301,7 +301,7 @@
   },
   {
     "id": "2025",
-    "replaceId": "1534",
+    "replaceId": "2026",
     "fence": "false",
     "metal": "false"
   },
@@ -312,14 +312,14 @@
     "metal": "false"
   },
   {
-    "id": "2036",
+    "id": "1530",
     "replaceId": "1531",
     "fence": "false",
     "metal": "false"
   },
   {
     "id": "2039",
-    "replaceId": "1561",
+    "replaceId": "1560",
     "fence": "false",
     "metal": "true"
   },
@@ -332,13 +332,13 @@
   {
     "id": "2050",
     "replaceId": "15511",
-    "fence": "false",
+    "fence": "true",
     "metal": "false"
   },
   {
     "id": "2051",
     "replaceId": "15513",
-    "fence": "false",
+    "fence": "true",
     "metal": "false"
   },
   {
@@ -896,12 +896,12 @@
   {
     "id": "3725",
     "replaceId": "3727",
-    "fence": "false",
+    "fence": "true",
     "metal": "false"
   },
   {
     "id": "3726",
-    "replaceId": "3727",
+    "replaceId": "3728",
     "fence": "true",
     "metal": "false"
   },
@@ -925,7 +925,7 @@
   },
   {
     "id": "3747",
-    "replaceId": "1534",
+    "replaceId": "3748",
     "fence": "false",
     "metal": "false"
   },
@@ -943,7 +943,7 @@
   },
   {
     "id": "4148",
-    "replaceId": "4248",
+    "replaceId": "4246",
     "fence": "false",
     "metal": "false"
   },
@@ -979,19 +979,19 @@
   },
   {
     "id": "4423",
-    "replaceId": "4429",
+    "replaceId": "4425",
     "fence": "false",
     "metal": "false"
   },
   {
     "id": "4424",
-    "replaceId": "11382",
+    "replaceId": "4426",
     "fence": "false",
     "metal": "false"
   },
   {
     "id": "4427",
-    "replaceId": "11380",
+    "replaceId": "4429",
     "fence": "false",
     "metal": "false"
   },
@@ -1238,12 +1238,12 @@
   {
     "id": "7049",
     "replaceId": "7051",
-    "fence": "false",
+    "fence": "true",
     "metal": "false"
   },
   {
     "id": "7050",
-    "replaceId": "23919",
+    "replaceId": "7052",
     "fence": "true",
     "metal": "false"
   },
@@ -1340,7 +1340,7 @@
   {
     "id": "8810",
     "replaceId": "8812",
-    "fence": "false",
+    "fence": "true",
     "metal": "false"
   },
   {
@@ -1759,7 +1759,7 @@
   },
   {
     "id": "14245",
-    "replaceId": "14248",
+    "replaceId": "14246",
     "fence": "true",
     "metal": "false"
   },
@@ -1983,7 +1983,15 @@
     "id": "20391",
     "replaceId": "28518",
     "fence": "false",
-    "metal": "true"
+    "metal": "true",
+    "autowalk": "true"
+  },
+  {
+    "id": "28514",
+    "replaceId": "28518",
+    "fence": "false",
+    "metal": "true",
+    "autowalk": "true"
   },
   {
     "id": "21065",
@@ -2144,13 +2152,13 @@
   {
     "id": "24369",
     "replaceId": "24373",
-    "fence": "true",
+    "fence": "false",
     "metal": "false"
   },
   {
     "id": "24370",
     "replaceId": "24374",
-    "fence": "true",
+    "fence": "false",
     "metal": "false"
   },
   {
@@ -2177,18 +2185,6 @@
     "fence": "false",
     "metal": "false"
   },
-  {
-    "id": "24560",
-    "replaceId": "15515",
-    "fence": "false",
-    "metal": "false"
-  },
-  {
-    "id": "24561",
-    "replaceId": "15517",
-    "fence": "false",
-    "metal": "false"
-  },
   {
     "id": "24565",
     "replaceId": "36316",
@@ -2357,11 +2353,25 @@
     "fence": "false",
     "metal": "true"
   },
+  {
+    "id": "26081",
+    "replaceId": "26083",
+    "fence": "false",
+    "metal": "true",
+    "autowalk": "true"
+  },
+  {
+    "id": "26082",
+    "replaceId": "26084",
+    "fence": "false",
+    "metal": "true",
+    "autowalk": "true"
+  },
   {
     "id": "26130",
     "replaceId": "26132",
     "fence": "false",
-    "metal": "false"
+    "metal": "true"
   },
   {
     "id": "26131",
@@ -2507,12 +2517,6 @@
     "fence": "false",
     "metal": "false"
   },
-  {
-    "id": "28514",
-    "replaceId": "28518",
-    "fence": "true",
-    "metal": "true"
-  },
   {
     "id": "28589",
     "replaceId": "28588",
@@ -2671,7 +2675,7 @@
   },
   {
     "id": "31815",
-    "replaceId": "31816",
+    "replaceId": "31817",
     "fence": "false",
     "metal": "false"
   },
@@ -2798,7 +2802,7 @@
   {
     "id": "34780",
     "replaceId": "34778",
-    "fence": "false",
+    "fence": "true",
     "metal": "false"
   },
   {

Server/data/configs/interface_configs.json

@@ -1,7 +1,7 @@
 [
   {
     "id": "5",
-    "interfaceType": "1",
+    "interfaceType": "8",
     "walkable": "true",
     "tabIndex": "-1"
   },
@@ -25,7 +25,49 @@
   },
   {
     "id": "24",
-    "interfaceType": "1",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "34",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "38",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "42",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "46",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "57",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "58",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "59",
+    "interfaceType": "8",
     "walkable": "true",
     "tabIndex": "-1"
   },
@@ -53,6 +95,30 @@
     "walkable": "false",
     "tabIndex": "-1"
   },
+  {
+    "id": "68",
+    "interfaceType": "4",
+    "walkable": "false",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "69",
+    "interfaceType": "4",
+    "walkable": "false",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "70",
+    "interfaceType": "4",
+    "walkable": "false",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "71",
+    "interfaceType": "4",
+    "walkable": "false",
+    "tabIndex": "-1"
+  },
   {
     "id": "74",
     "interfaceType": "4",
@@ -125,6 +191,12 @@
     "walkable": "true",
     "tabIndex": "-1"
   },
+  {
+    "id": "139",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "140",
     "interfaceType": "4",
@@ -137,6 +209,12 @@
     "walkable": "true",
     "tabIndex": "3"
   },
+  {
+    "id": "169",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "172",
     "interfaceType": "4",
@@ -197,9 +275,33 @@
     "walkable": "true",
     "tabIndex": "6"
   },
+  {
+    "id": "194",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "195",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "196",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "198",
-    "interfaceType": "1",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "209",
+    "interfaceType": "8",
     "walkable": "true",
     "tabIndex": "-1"
   },
@@ -257,6 +359,12 @@
     "walkable": "false",
     "tabIndex": "-1"
   },
+  {
+    "id": "240",
+    "interfaceType": "3",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "241",
     "interfaceType": "4",
@@ -281,6 +389,36 @@
     "walkable": "false",
     "tabIndex": "-1"
   },
+  {
+    "id": "245",
+    "interfaceType": "4",
+    "walkable": "false",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "246",
+    "interfaceType": "4",
+    "walkable": "false",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "247",
+    "interfaceType": "4",
+    "walkable": "false",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "248",
+    "interfaceType": "4",
+    "walkable": "false",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "256",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "259",
     "interfaceType": "2",
@@ -371,6 +509,12 @@
     "walkable": "false",
     "tabIndex": "-1"
   },
+  {
+    "id": "328",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "336",
     "interfaceType": "3",
@@ -395,6 +539,12 @@
     "walkable": "true",
     "tabIndex": "-1"
   },
+  {
+    "id": "377",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "380",
     "interfaceType": "1",
@@ -449,12 +599,24 @@
     "walkable": "true",
     "tabIndex": "4"
   },
+  {
+    "id": "418",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "421",
     "interfaceType": "4",
     "walkable": "false",
     "tabIndex": "-1"
   },
+  {
+    "id": "428",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "430",
     "interfaceType": "2",
@@ -473,6 +635,30 @@
     "walkable": "true",
     "tabIndex": "-1"
   },
+  {
+    "id": "485",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "486",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "487",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
+  {
+    "id": "488",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "498",
     "interfaceType": "0",
@@ -493,7 +679,7 @@
   },
   {
     "id": "532",
-    "interfaceType": "1",
+    "interfaceType": "8",
     "walkable": "true",
     "tabIndex": "-1"
   },
@@ -605,9 +791,15 @@
     "walkable": "false",
     "tabIndex": "-1"
   },
+  {
+    "id": "653",
+    "interfaceType": "8",
+    "walkable": "true",
+    "tabIndex": "-1"
+  },
   {
     "id": "656",
-    "interfaceType": "1",
+    "interfaceType": "8",
     "walkable": "true",
     "tabIndex": "-1"
   },
@@ -721,7 +913,7 @@
   },
   {
     "id": "809",
-    "interfaceType": "1",
+    "interfaceType": "8",
     "walkable": "true",
     "tabIndex": "-1"
   }

Server/data/configs/music_tiles.json

@@ -0,0 +1,62 @@
+[
+  {
+    "id": "98",
+    "borders": "{3072,3456,3135,3519,[3076,3456,3085,3458]~,[3082,3459,3085,3460]}"
+  },
+  {
+    "id": "141",
+    "borders": "{3072,3392,3135,3455,[3076,3452,3085,3455]}"
+  },
+  {
+    "id": "228",
+    "borders": "{2896,5446,2919,5462}"
+  },
+  {
+    "id": "229",
+    "borders": "{2921,5456,2937,5479}"
+  },
+  {
+    "id": "230",
+    "borders": "{2904,5481,2927,5497}"
+  },
+  {
+    "id": "231",
+    "borders": "{2886,5464,2902,5487}"
+  },
+  {
+    "id": "386",
+    "borders": "{2820,5312,2849,5369}-{2849,5349,2880,5374}"
+  },
+  {
+    "id": "391",
+    "borders": "{2879,5340,2944,5366}-{2909,5316,2944,5340}"
+  },
+  {
+    "id": "399",
+    "borders": "{2816,5248,2943,5375,[2823,5250,2844,5310]~,[2844,5250,2878,5280]~,[2879,5340,2944,5366]~,[2909,5316,2944,5340]~,[2820,5312,2849,5369]~,[2849,5349,2880,5374]~,[2885,5253,2934,5278]~,[2913,5278,2937,5306]}"
+  },
+  {
+    "id": "404",
+    "borders": "{2823,5250,2844,5310}-{2844,5250,2878,5276}"
+  },
+  {
+    "id": "408",
+    "borders": "{2885,5253,2934,5278}-{2913,5278,2937,5306}"
+  },
+  {
+    "id": "459",
+    "borders": "{3137,5442,3192,5564}-{3193,5442,3198,5472}-{3193,5507,3198,5564}"
+  },
+  {
+    "id": "467",
+    "borders": "{3199,5441,3262,5564}-{3193,5482,3198,5497}"
+  },
+  {
+    "id": "488",
+    "borders": "{3263,5441,3327,5566}"
+  },
+  {
+    "id": "492",
+    "borders": "{3076,3452,3085,3460,[3076,3459,3081,3460]}"
+  }
+]

Server/data/configs/object_configs.json

@@ -145,7 +145,7 @@
   },
   {
     "examine": "Used for storage.",
-    "ids": "63,64"
+    "ids": "63,64,36351,36352"
   },
   {
     "examine": "Surprisingly sturdy looking.",
@@ -968,7 +968,7 @@
     "ids": "573"
   },
   {
-    "examine": "A carving of a figure from the history of RuneScape.",
+    "examine": "A carving of a figure from the history of 2009Scape.",
     "ids": "574,575,576,577,578"
   },
   {
@@ -1753,7 +1753,7 @@
   },
   {
     "examine": "Danger!",
-    "ids": "1032,5127,29373"
+    "ids": "1032,5127"
   },
   {
     "examine": "This tells you which way is which.",
@@ -2148,7 +2148,7 @@
     "ids": "1231"
   },
   {
-    "examine": "One of the most common trees in RuneScape.",
+    "examine": "One of the most common trees in 2009Scape.",
     "ids": "1276"
   },
   {
@@ -2601,7 +2601,7 @@
   },
   {
     "examine": "I can climb this.",
-    "ids": "1729"
+    "ids": "1729,36347,36363,36644"
   },
   {
     "examine": "Dare I go up?",
@@ -3584,7 +3584,7 @@
     "ids": "2375"
   },
   {
-    "examine": "Soil",
+    "examine": "Soil. Dug up!",
     "ids": "2376,2377,2378"
   },
   {
@@ -3641,7 +3641,7 @@
   },
   {
     "examine": "I can climb down this.",
-    "ids": "2408"
+    "ids": "2408,36693,36694"
   },
   {
     "examine": "A commonly found tree.",
@@ -4964,7 +4964,7 @@
     "ids": "3032"
   },
   {
-    "examine": "One of the most common trees in RuneScape.",
+    "examine": "One of the most common trees in 2009Scape.",
     "ids": "3033,3034,3035,3036"
   },
   {
@@ -6384,12 +6384,12 @@
     "ids": "4131"
   },
   {
-    "examine": "These doors look very ominous. A sign says 'To the tombs'.",
-    "ids": "4132,4133"
+    "examine": "This tells you which way is which.",
+    "ids": "4132,4133,4134,4135"
   },
   {
-    "examine": "Large doors set into the hillside.",
-    "ids": "4134,4135,4136,4137"
+    "examine": "These doors look very ominous. A sign says 'To the tombs'.",
+    "ids": "4136,4137"
   },
   {
     "examine": "Items are for sale here.",
@@ -6777,7 +6777,7 @@
   },
   {
     "examine": "A solid stone staircase.",
-    "ids": "4415,4416,4417,4418,4419,4420"
+    "ids": "4415,4416,4417,4418,4419,4420,36480,36481,36484,36495,36521,36523,36532,36540"
   },
   {
     "examine": "A spiky barricade.",
@@ -7609,7 +7609,7 @@
   },
   {
     "examine": "I can climb down this.",
-    "ids": "4911,4912"
+    "ids": "4911,4912,36349,36365"
   },
   {
     "examine": "It looks cramped and dark.",
@@ -8592,7 +8592,7 @@
     "ids": "5789,5790"
   },
   {
-    "examine": "A carving of a figure from the history of RuneScape.",
+    "examine": "A carving of a figure from the history of 2009Scape.",
     "ids": "5791,36749,36751"
   },
   {
@@ -12788,7 +12788,7 @@
     "ids": "8972"
   },
   {
-    "examine": "One of the most common trees in RuneScape.",
+    "examine": "One of the most common trees in 2009Scape.",
     "ids": "8973"
   },
   {
@@ -14100,7 +14100,7 @@
     "ids": "10080"
   },
   {
-    "examine": "One of the most common trees in RuneScape.",
+    "examine": "One of the most common trees in 2009Scape.",
     "ids": "10081"
   },
   {
@@ -15964,7 +15964,7 @@
     "ids": "11354,11355"
   },
   {
-    "examine": "A gateway back to RuneScape.",
+    "examine": "A gateway back to 2009Scape.",
     "ids": "11356"
   },
   {
@@ -16324,7 +16324,7 @@
     "ids": "11629"
   },
   {
-    "examine": "South to Falador :: West to Taverley :: East to Varrock.",
+    "examine": "This tells you which way is which.",
     "ids": "11630,11631,11632,11633"
   },
   {
@@ -16564,7 +16564,7 @@
     "ids": "11759"
   },
   {
-    "examine": "A carving of a figure from the history of RuneScape.",
+    "examine": "A carving of a figure from the history of 2009Scape.",
     "ids": "11761"
   },
   {
@@ -16741,7 +16741,7 @@
   },
   {
     "examine": "Better not eat them!",
-    "ids": "12003"
+    "ids": "12003,12128"
   },
   {
     "examine": "It's going to be a tight squeeze!",
@@ -16881,7 +16881,7 @@
   },
   {
     "examine": "A wall jutting out into the path.",
-    "ids": "12127,12128,12129,12130"
+    "ids": "12127,12129,12130"
   },
   {
     "examine": "Spooky.",
@@ -18728,7 +18728,7 @@
     "ids": "13409,13410"
   },
   {
-    "examine": "One of the most common trees in RuneScape.",
+    "examine": "One of the most common trees in 2009Scape.",
     "ids": "13411,13412"
   },
   {
@@ -18996,11 +18996,11 @@
     "ids": "13525"
   },
   {
-    "examine": "A map of RuneScape.",
+    "examine": "A map of 2009Scape.",
     "ids": "13526"
   },
   {
-    "examine": "A map of RuneScape including major cave systems.",
+    "examine": "A map of 2009Scape including major cave systems.",
     "ids": "13527"
   },
   {
@@ -20007,6 +20007,46 @@
     "examine": "Why do I never take time to look at the grass?",
     "ids": "14003"
   },
+  {
+    "examine": "Well, I have the logs in place, now to get something to boil.",
+    "ids": "14005"
+  },
+  {
+    "examine": "Covered in a thick layer of grease.",
+    "ids": "14006"
+  },
+  {
+    "examine": "I'm glad this isn't for dinner.",
+    "ids": "14007"
+  },
+  {
+    "examine": "This smells so very, very bad...",
+    "ids": "14008"
+  },
+  {
+    "examine": "It seems to have all boiled away.",
+    "ids": "14009"
+  },
+  {
+    "examine": "Stop examining signs! You're in the Wilderness now!",
+    "ids": "14503"
+  },
+  {
+    "examine": "Danger, Wilderness up ahead. Last chance to turn back...",
+    "ids": "14504"
+  },
+  {
+    "examine": "Danger, Wilderness up ahead. Watch out for the Beast!",
+    "ids": "14505"
+  },
+  {
+    "examine": "Danger, Wilderness up ahead. Beware of stray magma.",
+    "ids": "14506"
+  },
+  {
+    "examine": "Danger, Wilderness up ahead. Almost certain death!",
+    "ids": "14507"
+  },
   {
     "examine": "Home sweet home?",
     "ids": "15477"
@@ -20019,10 +20059,30 @@
     "examine": "Home sweet home?",
     "ids": "15748"
   },
+  {
+    "examine": "Danger - Possibly deadly creatures below!",
+    "ids": "16083,16151,16117"
+  },
+  {
+    "examine": "Large urn.",
+    "ids": "17362"
+  },
   {
     "examine": "A large fish.",
     "ids": "18482"
   },
+  {
+    "examine": "A sign on a cactus.",
+    "ids": "18876"
+  },
+  {
+    "examine": "Dead and half-buried.",
+    "ids": "19996"
+  },
+  {
+    "examine": "Dead animal head. Lovely.",
+    "ids": "19997"
+  },
   {
     "examine": "Might be worth opening?",
     "ids": "21299"
@@ -20127,10 +20187,18 @@
     "examine": "Contains traces of summoning energy.",
     "ids": "29939,29943,29944,29945,29947,29951,29952,29953,29954"
   },
+  {
+    "examine": "An interesting sign.",
+    "ids": "31297,31298,31299,31300,31301"
+  },
   {
     "examine": "I wonder what this spooky contains.",
     "ids": "37051"
   },
+  {
+    "examine": "The mine has collapsed.",
+    "ids": "37634"
+  },
   {
     "examine": "It really was this big!",
     "ids": "40043"
@@ -20195,6 +20263,14 @@
     "examine": "A wooden crate.",
     "ids": "15031"
   },
+  {
+    "examine": "A sealed barrel with a warning sign on it.",
+    "ids": "17296"
+  },
+  {
+    "examine": "A barrel with a warning sign on it.",
+    "ids": "17297"
+  },
   {
     "examine": "A beautiful landscape.",
     "ids": "24184"
@@ -20275,6 +20351,10 @@
     "examine": "Technically a bed.",
     "ids": "32031"
   },
+  {
+    "examine": "Now that's what I call slimline!",
+    "ids": "32072"
+  },
   {
     "examine": "A really bad portrait of the King.",
     "ids": "32326"
@@ -20293,7 +20373,7 @@
   },
   {
     "examine": "A wooden barrel for storage.",
-    "ids": "31136,36798"
+    "ids": "17308,31136,36798"
   },
   {
     "examine": "A home for baby creatures.",
@@ -20519,10 +20599,6 @@
     "examine": "Popular on sandy beaches where fruity cocktails may be found.",
     "ids": "18856"
   },
-  {
-    "examine": "Stop examining signs! You're in the Wilderness now!",
-    "ids": "14503"
-  },
   {
     "examine": "Looks like part of the entrance is blocked by rubble.",
     "ids": "15767"
@@ -20602,5 +20678,41 @@
   {
     "examine": "Keeps the puppies out of trouble.",
     "ids": "28341"
+  },
+  {
+    "examine": "Warning! Danger of death.",
+    "ids": "29373"
+  },
+  {
+    "examine": "There are some toolboxes on this table.",
+    "ids": "36573,36580"
+  },
+  {
+    "examine": "There's some rock I can use with the catapult here.",
+    "ids": "36574,36581"
+  },
+  {
+    "examine": "There are some barricades here.",
+    "ids": "36575,36582"
+  },
+  {
+    "examine": "There is some rope here.",
+    "ids": "36576,36583"
+  },
+  {
+    "examine": "There are some explosive potions here.",
+    "ids": "36577,36584"
+  },
+  {
+    "examine": "There are some pickaxes on this table.",
+    "ids": "36578,36585"
+  },
+  {
+    "examine": "There are some bandages on this table.",
+    "ids": "36579,36586"
+  },
+  {
+    "examine": "Rough but adequate.",
+    "ids": "14918"
   }
 ]

Server/data/configs/ranged_weapon_configs.json

@@ -15,7 +15,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236,13280"
+    "ammunition": "877,878,6061,6062,879,9236"
   },
   {
     "itemId": "800",
@@ -294,7 +294,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236,13280"
+    "ammunition": "877,878,6061,6062,879,9236"
   },
   {
     "itemId": "839",
@@ -1095,7 +1095,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "8882,877,878,6061,6062,879,9236"
+    "ammunition": "8882,877,878,6061,6062,879,9236,9139,9286,9293,9300,9140,9287,9294,9237,9145,9301,9292,9299,9306,9335,880,9238"
   },
   {
     "itemId": "9174",
@@ -1104,7 +1104,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236,13280"
+    "ammunition": "877,878,6061,6062,879,9236"
   },
   {
     "itemId": "9176",
@@ -1113,7 +1113,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,9140,879,9139,9236,13280"
+    "ammunition": "877,878,6061,6062,879,9139,9236,9286,9293,9300,9335,9237"
   },
   {
     "itemId": "9177",
@@ -1122,7 +1122,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236,9139,9140,9287,9294,9301,880,9238,9145,13280"
+    "ammunition": "877,878,6061,6062,879,9236,9139,9140,9287,9294,9301,880,9238,9145,9286,9293,9300,9292,9299,9306,9335,9237"
   },
   {
     "itemId": "9179",
@@ -1131,7 +1131,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9139,9140,9236,9141,9288,9295,9302,9336,9239,9145,13280"
+    "ammunition": "877,878,6061,6062,879,9139,9140,9236,9141,9288,9295,9302,9336,9239,9145,9286,9293,9300,9287,9294,9301,9292,9299,9306,9335,9237,880,9238"
   },
   {
     "itemId": "9181",
@@ -1140,7 +1140,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236,9141,9288,9295,9302,9336,9239,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9145,9139,9140,9241,13280"
+    "ammunition": "877,878,6061,6062,879,9236,9141,9288,9295,9302,9336,9239,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9145,9139,9140,9241,9286,9293,9300,9140,9287,9294,9301,9292,9299,9306,9335,9237,880,9238,13083,13084,13085,13086"
   },
   {
     "itemId": "9183",
@@ -1149,7 +1149,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236,9139,9141,9288,9295,9302,9336,9239,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9145,9143,9290,9297,9304,9339,9242,9340,9243,13280"
+    "ammunition": "877,878,6061,6062,879,9236,9139,9141,9288,9295,9302,9336,9239,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9145,9143,9290,9297,9304,9339,9242,9340,9243,9286,9293,9300,9140,9287,9294,9301,9292,9299,9306,9335,9237,880,9238,13083,13084,13085,13086"
   },
   {
     "itemId": "9185",
@@ -1158,7 +1158,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236,9139,9141,9288,9295,9302,9336,9239,9236,9237,9238,9239,9240,9241,9242,9243,9244,9245,9145,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9143,9290,9297,9304,9339,9242,9340,9243,9144,9291,9298,9305,9341,9244,9342,9245,9140,13280"
+    "ammunition": "877,878,6061,6062,879,9236,9139,9141,9288,9295,9302,9336,9239,9236,9237,9238,9239,9240,9241,9242,9243,9244,9245,9145,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9143,9290,9297,9304,9339,9242,9340,9243,9144,9291,9298,9305,9341,9244,9342,9245,9140,13280,9139,9286,9293,9300,9287,9294,9301,9292,9299,9306,9335,9237,880,13083,13084,13085,13086"
   },
   {
     "itemId": "9705",
@@ -1293,7 +1293,7 @@
     "weapon_type": "1",
     "animation": "4230",
     "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236,9141,9288,9295,9302,9140,9336,9239,13083,13084,13085,13086,13280"
+    "ammunition": "877,878,6061,6062,879,9139,9140,9236,9141,9288,9295,9302,9336,9239,9145,9286,9293,9300,9287,9294,9301,9292,9299,9306,9335,9237,880,9238,13083,13084,13085,13086"
   },
   {
     "itemId": "13405",
@@ -1502,69 +1502,6 @@
     "drop_ammo": "true",
     "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,78,4160"
   },
-  {
-    "itemId": "14671",
-    "name": "Armadyl crossbow",
-    "ammo_slot": "13",
-    "weapon_type": "1",
-    "animation": "4230",
-    "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236,9141,9288,9295,9302,9336,9239,9236,9237,9238,9239,9240,9241,9242,9243,9244,9245,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9143,9290,9297,9304,9339,9242,9340,9243,9144,9291,9298,9305,9341,9244,9342,9245,9140,13280"
-  },
-  {
-    "itemId": "14684",
-    "name": "Odium ward",
-    "ammo_slot": "13",
-    "weapon_type": "1",
-    "animation": "4230",
-    "drop_ammo": "true",
-    "ammunition": "8882,877,878,6061,6062,879,9236,9141,9288,9295,9302,9336,9239,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9143,9290,9297,9304,9339,9242,9340,9243"
-  },
-  {
-    "itemId": "14685",
-    "name": "Odium shard 1",
-    "ammo_slot": "13",
-    "weapon_type": "1",
-    "animation": "4230",
-    "drop_ammo": "true",
-    "ammunition": "877,878,6061,6062,879,9236"
-  },
-  {
-    "itemId": "14803",
-    "name": "Dark bow",
-    "ammo_slot": "13",
-    "weapon_type": "2",
-    "animation": "426",
-    "drop_ammo": "true",
-    "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160"
-  },
-  {
-    "itemId": "14804",
-    "name": "Dark bow",
-    "ammo_slot": "13",
-    "weapon_type": "2",
-    "animation": "426",
-    "drop_ammo": "true",
-    "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160"
-  },
-  {
-    "itemId": "14805",
-    "name": "Dark bow",
-    "ammo_slot": "13",
-    "weapon_type": "2",
-    "animation": "426",
-    "drop_ammo": "true",
-    "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160"
-  },
-  {
-    "itemId": "14806",
-    "name": "Dark bow",
-    "ammo_slot": "13",
-    "weapon_type": "2",
-    "animation": "426",
-    "drop_ammo": "true",
-    "ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160"
-  },
   {
     "itemId": "14192",
     "name": "Bow (class 1)",

Server/data/configs/shops.json

@@ -45,22 +45,13 @@
     "stock": "{1931,30,100}-{1935,30,100}-{1735,10,100}-{1925,10,100}-{1923,10,100}-{1887,10,100}-{590,10,100}-{1755,10,100}-{2347,10,100}-{550,10,100}-{9003,10,100}"
   },
   {
-    "npcs": "590",
+    "npcs": "590,591",
     "high_alch": "0",
     "currency": "995",
     "general_store": "true",
     "id": "6",
-    "title": "Aemad's Adventuring Supplies Store",
-    "stock": "{227,300,100}-{1265,10,100}-{1349,10,100}-{2142,10,100}-{590,10,100}-{1759,100,100}-{882,1000,100}-{954,10,100}-{970,10,100}-{946,10,100}-{1935,10,100}"
-  },
-  {
-    "npcs": "591",
-    "high_alch": "0",
-    "currency": "995",
-    "general_store": "true",
-    "id": "7",
-    "title": "Kortan General Store",
-    "stock": "{1931,30,100}-{1935,30,100}-{1735,10,100}-{1925,10,100}-{1923,10,100}-{1887,10,100}-{590,10,100}-{1755,10,100}-{2347,10,100}-{550,10,100}-{9003,10,100}"
+    "title": "Aemad's Adventuring Supplies",
+    "stock": "{227,10,100}-{1265,10,100}-{1349,10,100}-{2142,10,100}-{590,10,100}-{1759,100,100}-{882,1000,100}-{954,10,100}-{970,10,100}-{946,10,100}-{1935,10,100}"
   },
   {
     "npcs": "971",
@@ -222,7 +213,7 @@
     "general_store": "true",
     "id": "25",
     "title": "Lumbridge General Store",
-    "stock": "{1931,30,100}-{1935,30,100}-{1735,10,100}-{1925,10,100}-{1923,10,100}-{1887,10,100}-{590,10,100}-{1755,10,100}-{2347,10,100}-{550,10,100}-{9003,10,100}"
+    "stock": "{1931,30,100}-{1935,30,100}-{1735,10,100}-{1925,10,100}-{1923,10,100}-{1887,10,100}-{590,10,100}-{1755,10,100}-{2347,10,100}-{550,10,100}-{9003,10,100}-{1939,1000,1}"
   },
   {
     "npcs": "4716",
@@ -519,7 +510,7 @@
     "general_store": "false",
     "id": "59",
     "title": "Fancy Clothes Store",
-    "stock": "{1949,10,100}-{958,10,100}-{948,10,100}-{1733,10,100}-{1734,1000,100}-{1059,30,100}-{1061,10,100}-{1757,10,100}-{1013,10,100}-{1025,10,100}-{10088,0,100}-{10090,0,100}-{10091,0,100}-{10089,0,100}-{10087,0,100}-{11525,0,100}"
+    "stock": "{1949,0,100}-{579,10,100}-{1023,10,100}-{958,10,100}-{948,10,100}-{1733,10,100}-{1734,1000,100}-{1059,30,100}-{1061,10,100}-{428,10,100}-{426,10,100}-{1757,10,100}-{1013,10,100}-{1015,10,100}-{1011,10,100}-{1007,10,100}-{1025,10,100}-{10088,0,100}-{10090,0,100}-{10091,0,100}-{10089,0,100}-{10087,0,100}-{11525,0,100}"
   },
   {
     "npcs": "548",
@@ -573,7 +564,7 @@
     "general_store": "false",
     "id": "65",
     "title": "Dodgy Mikes Second-hand Clothing",
-    "stock": "{7114,10,100}"
+    "stock": "{7114,10,100}-{7122,10,100}-{7128,10,100}-{7134,10,100}-{7110,10,100}-{7126,10,100}-{7132,10,100}-{7138,10,100}-{7116,10,100}-{7124,10,100}-{7130,10,100}-{7112,10,100}-{7136,10,100}"
   },
   {
     "npcs": "2161",
@@ -1112,7 +1103,7 @@
     "currency": "995",
     "general_store": "false",
     "id": "126",
-    "title": "Pickaxe-is-mine",
+    "title": "Pickaxe-Is-Mine",
     "stock": "{1265,10,100}-{1269,10,100}-{1273,10,100}-{1271,10,100}-{1275,10,100}"
   },
   {
@@ -1251,13 +1242,13 @@
     "stock": "{12204,10,100}-{12207,10,100}-{12210,10,100}-{12213,10,100}-{12216,10,100}-{12219,10,100}-{12222,10,100}-{12183,125000,100}-{12155,5000,100}"
   },
   {
-    "npcs": "6996",
+    "npcs": "4472",
     "high_alch": "0",
     "currency": "995",
     "general_store": "false",
     "id": "142",
     "title": "Bogrog's Summoning Shop",
-    "stock": "{12204,10,100}-{12207,10,100}-{12210,10,100}-{12213,10,100}-{12216,10,100}-{12219,10,100}-{12222,10,100}-{12183,125000,100}-{12155,5000,100}"
+    "stock": "{12204,10,100}-{12207,10,100}-{12210,0,100}-{12213,0,100}-{12216,0,100}-{12219,0,100}-{12222,0,100}-{12183,65000,100}-{12155,5000,100}"
   },
   {
     "npcs": "3671",
@@ -1266,7 +1257,7 @@
     "general_store": "false",
     "id": "143",
     "title": "Fortunato's Fine Wine",
-    "stock": "{1993,10,100}-{1937,10,100}-{7919,10,100}-{1935,10,100}"
+    "stock": "{1993,10,100}-{7810,10,100}-{7919,10,100}-{1935,10,100}"
   },
   {
     "npcs": "558",
@@ -1476,7 +1467,7 @@
     "stock": "{8794,10,100}-{8790,300,100}-{4819,300,100}-{4820,300,100}-{1539,300,100}"
   },
   {
-    "npcs": "1079",
+    "npcs": "1079,1357,1358",
     "high_alch": "0",
     "currency": "995",
     "general_store": "false",
@@ -1608,7 +1599,7 @@
     "general_store": "false",
     "id": "181",
     "title": "MoonClan Fine Clothes",
-    "stock": "{9068,10,100}-{9069,10,100}-{9070,10,100}-{9071,10,100}-{9072,10,100}-{9073,10,100}-{9074,10,100}-{1733,50,100}-{1734,500,100}"
+    "stock": "{9068,10,100}-{9069,10,100}-{9070,10,100}-{9071,10,100}-{9072,10,100}-{9073,10,100}-{9074,10,100}-{1733,50,100}-{1734,500,100}-{9084,10,100}-{9096,10,100}-{9097,10,100}-{9098,10,100}-{9099,10,100}-{9100,10,100}-{9101,10,100}-{9102,10,100}-{9104,10,100}"
   },
   {
     "npcs": "",
@@ -1662,7 +1653,7 @@
     "general_store": "false",
     "id": "187",
     "title": "William's Wilderness Cape Shop",
-    "stock": "{4315,100,100}-{4335,100,100}-{4375,100,100}-{4395,100,100}"
+    "stock": "{4315,100,100}-{4335,100,100}-{4355,100,100}-{4375,100,100}-{4395,100,100}"
   },
   {
     "npcs": "1779",
@@ -1842,7 +1833,7 @@
     "general_store": "false",
     "id": "216",
     "title": "Ore Store",
-    "stock": "{436,20,100}-{438,10,100}-{440,10,100}-{442,5,100}-{453,10,100}-{444,5,100}-{447,0,100}-{449,0,100}"
+    "stock": "{436,10,100}-{438,10,100}-{440,0,100}-{442,0,100}-{453,0,100}-{444,0,100}-{447,0,100}-{449,0,100}"
   },
   {
     "npcs": "596",
@@ -1891,12 +1882,13 @@
   },
   {
     "npcs": "2564",
+    "force_shared": "true",
     "high_alch": "0",
     "currency": "995",
     "general_store": "false",
     "id": "222",
     "title": "Ore Shop\b",
-    "stock": "{436,1500,100}-{438,1500,100}-{440,1500,100}-{442,1500,100}-{444,1500,100}-{447,1500,100}-{453,1500,100}"
+    "stock": "{436,0,0}-{438,0,0}-{440,0,0}-{442,0,0}-{444,0,0}-{447,0,0}-{453,0,0}"
   },
   {
     "npcs": "603",
@@ -2176,5 +2168,32 @@
     "id": "254",
     "title": "Gabooty's Tai Bwo Wannai Drinky Store",
     "stock": "{2084,0,100}-{2092,0,100}-{2048,0,100}-{2054,0,100}-{2064,0,100}-{2074,0,100}"
+  },
+  {
+    "npcs": "1526",
+    "high_alch": "0",
+    "currency": "4067",
+    "general_store": "false",
+    "id": "255",
+    "title": "Castle Wars Ticket Exchange",
+    "stock": "{4068,1,100}-{4069,1,100}-{4070,1,100}-{4071,1,100}-{4072,1,100}-{4503,1,100}-{4504,1,100}-{4505,1,100}-{4506,1,100}-{4507,1,100}-{4508,1,100}-{4509,1,100}-{4510,1,100}-{4511,1,100}-{4512,1,100}-{4513,1,100}-{4514,1,100}-{4515,1,100}-{4516,1,100}"
+  },
+  {
+    "npcs": "5111",
+    "high_alch": "0",
+    "currency": "995",
+    "general_store": "false",
+    "id": "256",
+    "title": "Leon's Prototype Crossbow",
+    "stock": "{10156,2,100}"
+  },
+  {
+    "npcs": "2039",
+    "high_alch": "0",
+    "currency": "995",
+    "general_store": "false",
+    "id": "256",
+    "title": "Uglug's Stuffsies",
+    "stock": "{4844,100,10}-{10927,0,100}-{2862,100,100}-{1777,10,200}-{2876,0,500}-{2878,10,100}-{4850,0,100}-{946,5,100}-{4773,0,1000}-{4778,0,1000}-{4783,0,1000}-{4788,0,1500}-{4793,0,2000}-{4798,0,3000}-{4803,0,4000}-{4827,0,2000}"
   }
 ]

Server/data/eco/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

Server/data/eco/autostock.json

@@ -1,69 +0,0 @@
-{
-  "offers": [
-    {
-        "__comment" : "coal",
-        "item" : "453",
-        "qty" : "1000"
-    },
-    {
-        "__comment" : "vial",
-        "item" : "227",
-        "qty" : "10000"
-    },
-    {
-        "__comment" : "water vial",
-        "item" : "229",
-        "qty" : "10000"
-    },
-    {
-        "__comment" : "cooked lobster",
-        "item" : "379",
-        "qty" : "10000"
-    },
-    {
-        "__comment" : "Ashes",
-        "item" : "592",
-        "qty" : "1000"
-    },
-    {
-        "__comment" : "Mort myre fungi",
-        "item" : "2970",
-        "qty" : "1000"
-    },
-    {
-        "__comment" : "Poison ivy berries",
-        "item" : "6018",
-        "qty" : "1000"
-    },
-    {
-        "__comment" : "Potato cactus",
-        "item" : "3138",
-        "qty" : "1000"
-    },
-    {
-        "__comment" : "Unicorn horn",
-        "item" : "237",
-        "qty" : "1000"
-    },
-    {
-        "__comment" : "Red spider eggs",
-        "item" : "223",
-        "qty" : "1000"
-    },
-    {
-        "__comment" : "Bird nest",
-        "item" : "6693",
-        "qty" : "1000"
-    },
-    {
-        "__comment" : "Chocolate dust",
-        "item" : "1975",
-        "qty" : "1000"
-    },
-    {
-        "__comment" : "Limpwurt root",
-        "item" : "225",
-        "qty" : "10000"
-    }
-    ]
-}

Server/data/eco/ge_resource.emp

@@ -1 +0,0 @@
-<EFBFBD><EFBFBD>

Server/db_exports/global.sql

@@ -1,3 +1,7 @@
+CREATE DATABASE global;
+
+USE global;
+
 -- phpMyAdmin SQL Dump
 -- version 5.0.2
 -- https://www.phpmyadmin.net/

Server/db_exports/grafana-dashboard.json

@@ -0,0 +1,539 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_SQLITE",
+      "label": "SQLite",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "frser-sqlite-datasource",
+      "pluginName": "SQLite"
+    }
+  ],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "datasource",
+      "id": "frser-sqlite-datasource",
+      "name": "SQLite",
+      "version": "3.3.0"
+    },
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "10.0.1"
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "frser-sqlite-datasource",
+        "uid": "${DS_SQLITE}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "misc_pulses"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "other"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "packet_incoming"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "super-light-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "10.0.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "frser-sqlite-datasource",
+            "uid": "${DS_SQLITE}"
+          },
+          "queryText": "SELECT * FROM tick_lengths",
+          "queryType": "table",
+          "rawQueryText": "SELECT * FROM tick_lengths",
+          "refId": "A",
+          "timeColumns": [
+            "ts"
+          ]
+        }
+      ],
+      "title": "Tick Time",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "frser-sqlite-datasource",
+        "uid": "${DS_SQLITE}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 13,
+        "w": 13,
+        "x": 0,
+        "y": 9
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "10.0.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "frser-sqlite-datasource",
+            "uid": "${DS_SQLITE}"
+          },
+          "queryText": "select * from top_pulses;",
+          "queryType": "table",
+          "rawQueryText": "select * from top_pulses;",
+          "refId": "A",
+          "timeColumns": [
+            "time",
+            "ts"
+          ]
+        }
+      ],
+      "title": "Tick Time By Pulse (Total)",
+      "transformations": [
+        {
+          "id": "extractFields",
+          "options": {
+            "format": "json",
+            "jsonPaths": [
+              {
+                "path": "pulses"
+              }
+            ],
+            "keepTime": false,
+            "replace": false,
+            "source": "pulse_info"
+          }
+        },
+        {
+          "id": "extractFields",
+          "options": {
+            "source": "pulses"
+          }
+        }
+      ],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "frser-sqlite-datasource",
+        "uid": "${DS_SQLITE}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 11,
+        "x": 13,
+        "y": 9
+      },
+      "id": 4,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "frser-sqlite-datasource",
+            "uid": "${DS_SQLITE}"
+          },
+          "queryText": "SELECT * FROM high_volume_pulses;",
+          "queryType": "table",
+          "rawQueryText": "SELECT * FROM high_volume_pulses;",
+          "refId": "A",
+          "timeColumns": [
+            "time",
+            "ts"
+          ]
+        }
+      ],
+      "title": "High Volume Pulses",
+      "transformations": [
+        {
+          "id": "extractFields",
+          "options": {
+            "format": "json",
+            "source": "pulse_info"
+          }
+        },
+        {
+          "id": "extractFields",
+          "options": {
+            "source": "pulses"
+          }
+        }
+      ],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "frser-sqlite-datasource",
+        "uid": "${DS_SQLITE}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "stepBefore",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 11,
+        "x": 13,
+        "y": 18
+      },
+      "id": 3,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "frser-sqlite-datasource",
+            "uid": "${DS_SQLITE}"
+          },
+          "queryText": "SELECT * FROM bot_counts;",
+          "queryType": "table",
+          "rawQueryText": "SELECT * FROM bot_counts;",
+          "refId": "A",
+          "timeColumns": [
+            "time",
+            "ts"
+          ]
+        }
+      ],
+      "title": "Bot Population",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "1h",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-5m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Main",
+  "uid": "ffccf845-00a2-46f2-b0c0-a8b88032c701",
+  "version": 10,
+  "weekStart": ""
+}

Server/db_exports/testuser.sql

@@ -0,0 +1,2 @@
+CREATE USER IF NOT EXISTS 2009scapetest@localhost IDENTIFIED BY '2009scapetest';
+GRANT ALL PRIVILEGES ON global.* TO 2009scapetest@localhost;

Server/detekt.yml

@@ -285,7 +285,7 @@ exceptions:
       - 'Throwable'
     allowedExceptionNameRegex: '_|(ignore|expected).*'
   TooGenericExceptionThrown:
-    active: true
+    active: false
     exceptionNames:
       - 'Error'
       - 'Exception'
@@ -437,7 +437,7 @@ potential-bugs:
       - '*.CanIgnoreReturnValue'
     ignoreFunctionCall: []
   ImplicitDefaultLocale:
-    active: true
+    active: false
   ImplicitUnitReturnType:
     active: false
     allowExplicitReturnType: true
@@ -609,7 +609,7 @@ style:
   ObjectLiteralToLambda:
     active: true
   OptionalAbstractKeyword:
-    active: true
+    active: false
   OptionalUnit:
     active: false
   OptionalWhenBraces:
@@ -696,9 +696,9 @@ style:
   UseOrEmpty:
     active: true
   UseRequire:
-    active: true
+    active: false
   UseRequireNotNull:
-    active: true
+    active: false
   UselessCallOnNotNull:
     active: true
   UtilityClassWithPublicConstructor:

Server/pom.xml

@@ -7,8 +7,8 @@
   <properties>
     <project.mainClassName>core.Server</project.mainClassName>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
-    <kotlin.version>1.6.21</kotlin.version>
-    <kotlin.comipler.jvmTarget>1.6</kotlin.comipler.jvmTarget>
+    <kotlin.version>1.8.20</kotlin.version>
+    <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
     <junit.version>5.7.0</junit.version>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
@@ -16,7 +16,7 @@
   <dependencies>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <artifactId>kotlin-stdlib</artifactId>
       <version>${kotlin.version}</version>
       <scope>compile</scope>
     </dependency>
@@ -195,7 +195,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.10.1</version>
         <configuration>
-          <maxmem>1024m</maxmem>
+          <maxmem>2048m</maxmem>
           <useIncrementalCompilation>false</useIncrementalCompilation>
 		  <compilerArgs>
 			<arg>-XDcompilePolicy=simple</arg>

Server/src/main/content/data/BossKillCounter.java

@@ -30,11 +30,6 @@ public enum BossKillCounter {
         8355, 8356, 8357, 8358, 8359, 8360,
         8361, 8362, 8363, 8364, 8365, 8366,
         }, "Tormented demon", -1),
-	CALLISTO(new int[] { 8610 }, "Callisto", 14658),
-	SCORPIA(new int[] { 8611 }, "Scorpia", 14661),
-	VENENATIS(new int[] { 8612 }, "Venenatis", 14657),
-	VETION(new int[] { 8613 }, "Vet'ion", 14659),
-	KRAKEN(new int[] { 8614 }, "Cave Kraken", 14651),
 	
 
 	;

Server/src/main/content/data/ChargedItem.kt

@@ -0,0 +1,80 @@
+package content.data
+
+import core.api.toIntArray
+import core.cache.def.impl.ItemDefinition
+import org.rs09.consts.Items
+
+/**
+ * Represents a distinct charged item, i.e. items with (#).
+ * Not to be confused with items with internal charge, like degradation.
+ * @author RiL
+ */
+enum class ChargedItem(val ids: IntArray) {
+    AMULET_OF_GLORY((Items.AMULET_OF_GLORY4_1712 downTo Items.AMULET_OF_GLORY_1704 step 2).toIntArray()),
+    RING_OF_DUELLING((Items.RING_OF_DUELLING8_2552..Items.RING_OF_DUELLING1_2566 step 2).toIntArray()),
+    GAMES_NECKLACE((Items.GAMES_NECKLACE8_3853..Items.GAMES_NECKLACE1_3867 step 2).toIntArray()),
+    BROODOO_SHIELDA((Items.BROODOO_SHIELD_10_6215..Items.BROODOO_SHIELD_6235 step 2).toIntArray()),
+    BROODOO_SHIELDB((Items.BROODOO_SHIELD_10_6237..Items.BROODOO_SHIELD_6257 step 2).toIntArray()),
+    BROODOO_SHIELDC((Items.BROODOO_SHIELD_10_6259..Items.BROODOO_SHIELD_6279 step 2).toIntArray()),
+    ROD_OF_IVANDIS((Items.ROD_OF_IVANDIS10_7639..Items.ROD_OF_IVANDIS1_7648).toIntArray()),
+    BLACK_MASK((Items.BLACK_MASK_10_8901..Items.BLACK_MASK_8921 step 2).toIntArray()),
+    AMULET_OF_GLORYT((Items.AMULET_OF_GLORYT4_10354..Items.AMULET_OF_GLORYT_10362 step 2).toIntArray()),
+    CASTLEWAR_BRACE((Items.CASTLEWAR_BRACE3_11079..Items.CASTLEWAR_BRACE1_11083 step 2).toIntArray()),
+    FORINTHRY_BRACE((Items.FORINTHRY_BRACE5_11095..Items.FORINTHRY_BRACE1_11103 step 2).toIntArray()),
+    SKILLS_NECKLACE((Items.SKILLS_NECKLACE4_11105..Items.SKILLS_NECKLACE_11113 step 2).toIntArray()),
+    COMBAT_BRACELET((Items.COMBAT_BRACELET4_11118..Items.COMBAT_BRACELET_11126 step 2).toIntArray()),
+    DIGSITE_PENDANT((Items.DIGSITE_PENDANT_5_11194 downTo Items.DIGSITE_PENDANT_1_11190).toIntArray()),
+    VOID_SEAL((Items.VOID_SEAL8_11666..Items.VOID_SEAL1_11673).toIntArray()),
+    AMULET_OF_FARMING((Items.AMULET_OF_FARMING8_12622 downTo Items.AMULET_OF_FARMING1_12608 step 2).toIntArray()),
+    IVANDIS_FLAIL((Items.IVANDIS_FLAIL_30_13117..Items.IVANDIS_FLAIL_1_13146).toIntArray()),
+    RING_OF_SLAYING((Items.RING_OF_SLAYING8_13281..Items.RING_OF_SLAYING1_13288).toIntArray()),
+    RING_OF_WEALTH((Items.RING_OF_WEALTH4_14646 downTo Items.RING_OF_WEALTH_14638 step 2).toIntArray());
+
+    /**
+     * Get the item id for a specific [charge].
+     * If [charge] is outside the valid range, return the item id with the closest charge.
+     */
+    fun forCharge(charge: Int): Int {
+        return ids[maxCharge() - if (charge < 1) 1 + maxCharge() - ids.size else if (charge > maxCharge()) maxCharge() else charge]
+    }
+
+    /**
+     * Get the max charge of this ChargedItem.
+     */
+    fun maxCharge(): Int = maxCharges[ordinal]
+
+    companion object {
+        private val CHARGE_REGEX = Regex("""\(\D?(\d+)\)""")
+        private val idMap = HashMap<Int, ChargedItem>()
+        private val maxCharges = IntArray(values().size)
+
+        init {
+            values().forEach { chargedItem ->
+                maxCharges[chargedItem.ordinal] = getMaxCharge(chargedItem)
+                chargedItem.ids.forEach { idMap[it] = chargedItem }
+            }
+        }
+
+        private fun getMaxCharge(chargedItem: ChargedItem): Int {
+            return CHARGE_REGEX.find(ItemDefinition.forId(chargedItem.ids.first()).name)!!.groups[1]!!.value.toInt()
+        }
+
+        /**
+         * Check if the item id is a charged item.
+         */
+        fun contains(id: Int): Boolean = idMap.containsKey(id)
+
+        /**
+         * Get the ChargedItem enum for an item id, or null if it's not a charged item.
+         */
+        fun forId(id: Int): ChargedItem? = idMap[id]
+
+        /**
+         * Get the charge value of an item id, or null if it's not a charged item.
+         */
+        fun getCharge(id: Int): Int? {
+            val chargedItem = forId(id) ?: return null
+            return chargedItem.maxCharge() - chargedItem.ids.indexOf(id)
+        }
+    }
+}

Server/src/main/content/data/EnchantedJewellery.kt

@@ -2,11 +2,13 @@ package content.data
 
 import content.global.skill.magic.TeleportMethod
 import content.global.skill.slayer.SlayerManager.Companion.getInstance
+import content.global.skill.slayer.SlayerUtils
+import core.ServerConstants
 import core.api.*
 import core.game.event.TeleportEvent
+import core.game.interaction.QueueStrength
 import core.game.node.entity.player.Player
 import core.game.node.entity.player.link.TeleportManager
-import core.game.node.entity.player.link.audio.Audio
 import core.game.node.item.Item
 import core.game.system.task.Pulse
 import core.game.world.map.Location
@@ -14,11 +16,12 @@ import core.game.world.update.flag.context.Animation
 import core.game.world.update.flag.context.Graphics
 import org.rs09.consts.Items
 import core.game.world.GameWorld.Pulser
+import org.rs09.consts.Sounds
 import java.util.*
 
 /**
  * Represents an enchanted jewellery.
- * @author Vexia & downthecrop
+ * @author Vexia, downthecrop, Player Name
  */
 enum class EnchantedJewellery(
 
@@ -70,10 +73,10 @@ enum class EnchantedJewellery(
     ),
     AMULET_OF_GLORY(
             arrayOf(
-                    "Edgeville",
-                    "Karamja",
-                    "Draynor Village",
-                    "Al-Kharid",
+                    "Edgeville.",
+                    "Karamja.",
+                    "Draynor Village.",
+                    "Al-Kharid.",
                     "Nowhere."
             ),
             arrayOf(
@@ -103,7 +106,7 @@ enum class EnchantedJewellery(
                     "Barbarian Outpost.",
                     "Clan Wars.",
                     "Wilderness Volcano.",
-                    "Corporeal Beast"
+                    "Corporeal Beast."
             ),
             arrayOf(
                     Location.create(2899, 3563, 0),
@@ -135,10 +138,10 @@ enum class EnchantedJewellery(
     ),
     COMBAT_BRACELET(
             arrayOf(
-                    "Champions' Guild",
-                    "Monastery",
-                    "Ranging Guild",
-                    "Warriors' Guild",
+                    "Champions' Guild.",
+                    "Monastery.",
+                    "Ranging Guild.",
+                    "Warriors' Guild.",
                     "Nowhere."
             ),
             arrayOf(
@@ -155,10 +158,10 @@ enum class EnchantedJewellery(
     ),
     SKILLS_NECKLACE(
             arrayOf(
-                    "Fishing Guild",
-                    "Mining Guild",
-                    "Crafting Guild",
-                    "Cooking Guild",
+                    "Fishing Guild.",
+                    "Mining Guild.",
+                    "Crafting Guild.",
+                    "Cooking Guild.",
                     "Nowhere."
             ),
             arrayOf(
@@ -175,7 +178,7 @@ enum class EnchantedJewellery(
     ),
     RING_OF_WEALTH(
             arrayOf(
-                    "Grand Exchange",
+                    "Grand Exchange.",
                     "Nowhere."
             ),
             arrayOf(
@@ -186,6 +189,13 @@ enum class EnchantedJewellery(
             Items.RING_OF_WEALTH2_14642,
             Items.RING_OF_WEALTH1_14640,
             Items.RING_OF_WEALTH_14638
+    ),
+    RING_OF_LIFE(arrayOf<String>(),
+            arrayOf(
+                Location.create(ServerConstants.HOME_LOCATION)
+            ),
+            true,
+            Items.RING_OF_LIFE_2570
     );
 
     val isCrumble: Boolean = crumble
@@ -199,7 +209,7 @@ enum class EnchantedJewellery(
     constructor(options: Array<String>, locations: Array<Location>, vararg ids: Int) : this(options, locations, false, *ids)
 
     /**
-     * Method used to teleport the player to the desired location.
+     * Method used when the player "Use"s the jewellery piece.
      * @param player the player.
      * @param item the used jewellery item.
      * @param buttonID the button id.
@@ -212,38 +222,52 @@ enum class EnchantedJewellery(
             }
             return
         }
+        attemptTeleport(player, item, buttonID, isEquipped)
+    }
+
+    /**
+     * Method used to actually teleport the player to the desired location.
+     * @param player the player.
+     * @param item the used jewellery item.
+     * @param buttonID the button id.
+     * @param isEquipped If the player is operating.
+     */
+    fun attemptTeleport(player: Player, item: Item, buttonID: Int, isEquipped: Boolean): Boolean {
         val itemIndex = getItemIndex(item)
         val nextJewellery = Item(getNext(itemIndex))
-        if (canTeleport(player, nextJewellery)) {
-            Pulser.submit(object : Pulse(0) {
-                private var count = 0
-                private var location = getLocation(buttonID)
-                override fun pulse(): Boolean {
-                    when (count) {
-                        0 -> {
-                            lock(player,4)
-                            visualize(player, ANIMATION, GRAPHICS)
-                            playAudio(player, AUDIO, true)
-                            player.impactHandler.disabledTicks = 4
-                        }
-                        3 -> {
-                            teleport(player,location)
-                            resetAnimator(player)
-                            if (isLastItemIndex(itemIndex)) {
-                                if (isCrumble) crumbleJewellery(player, item, isEquipped)
-                            } else {
-                                replaceJewellery(player, item, nextJewellery, isEquipped)
-                            }
-                            unlock(player)
-                            player.dispatch(TeleportEvent(TeleportManager.TeleportType.NORMAL, TeleportMethod.JEWELRY, item, location))
-                            return true
-                        }
-                    }
-                    count += 1
-                    return false
-                }
-            })
+        if (!canTeleport(player, nextJewellery)) {
+            return false
         }
+        Pulser.submit(object : Pulse(0) {
+            private var count = 0
+            private var location = getLocation(buttonID)
+            override fun pulse(): Boolean {
+                when (count) {
+                    0 -> {
+                        lock(player,4)
+                        visualize(player, ANIMATION, GRAPHICS)
+                        playGlobalAudio(player.location, Sounds.TELEPORT_ALL_200)
+                        player.impactHandler.disabledTicks = 4
+                        closeInterface(player)
+                    }
+                    3 -> {
+                        teleport(player,location)
+                        resetAnimator(player)
+                        if (isLastItemIndex(itemIndex)) {
+                            if (isCrumble) crumbleJewellery(player, item, isEquipped)
+                        } else {
+                            replaceJewellery(player, item, nextJewellery, isEquipped)
+                        }
+                        unlock(player)
+                        player.dispatch(TeleportEvent(TeleportManager.TeleportType.NORMAL, TeleportMethod.JEWELRY, item, location))
+                        return true
+                    }
+                }
+                count += 1
+                return false
+            }
+        })
+        return true
     }
 
     private fun replaceJewellery(player: Player, item: Item, nextJewellery: Item, isEquipped: Boolean) {
@@ -261,8 +285,11 @@ enum class EnchantedJewellery(
             removeItem(player, item)
         }
         if (isSlayerRing(item)) {
-            addItem(player, Items.ENCHANTED_GEM_4155)
-            sendMessage(player, "Your Ring of Slaying reverts back into a regular enchanted gem.")
+            queueScript(player, 1, QueueStrength.SOFT) {
+                addItemOrDrop(player, Items.ENCHANTED_GEM_4155)
+                sendMessage(player, "Your Ring of Slaying reverts back into a regular enchanted gem.")
+                return@queueScript stopExecuting(player)
+            }
         }
     }
 
@@ -274,14 +301,14 @@ enum class EnchantedJewellery(
         val slayerManager = getInstance(player)
         if (!slayerManager.hasTask()) {
             sendNPCDialogue(player, slayerManager.master!!.npc, "You need something new to hunt. Come and " +
-                    "see me When you can and I'll give you a new task.", core.game.dialogue.FacialExpression.HALF_GUILTY)
+                    "see me when you can and I'll give you a new task.", core.game.dialogue.FacialExpression.HALF_GUILTY)
             return
         }
         sendNPCDialogue(player, slayerManager.master!!.npc, "You're currently " +
-                "assigned to kill ${getSlayerTaskName(player).lowercase(Locale.getDefault())}'s; " +
+                "assigned to kill ${SlayerUtils.pluralise(getSlayerTaskName(player))} " +
                 "only ${getSlayerTaskKillsRemaining(player)} more to go.", core.game.dialogue.FacialExpression.FRIENDLY)
         // Slayer tracker UI
-        setVarbit(player, 2502, 0, slayerManager.flags.taskFlags shr 4)
+        setVarp(player, 2502, slayerManager.flags.taskFlags shr 4)
     }
 
     private fun canTeleport(player: Player, item: Item): Boolean {
@@ -325,7 +352,6 @@ enum class EnchantedJewellery(
 
     companion object {
         private val ANIMATION = Animation(714)
-        private val AUDIO = Audio(200)
         private val GRAPHICS = Graphics(308, 100, 50)
         val idMap = HashMap<Int, EnchantedJewellery>()
 
@@ -335,4 +361,4 @@ enum class EnchantedJewellery(
             }
         }
     }
-}
+}

Server/src/main/content/data/GodBook.java

@@ -3,6 +3,8 @@ package content.data;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
 
+import static core.api.ContentAPIKt.hasRequirement;
+
 /**
  * A god book.
  * @author Vexia
@@ -98,6 +100,8 @@ public enum GodBook {
 	 * @param page the page.
 	 */
 	public void insertPage(Player player, Item book, Item page) {
+                if (!hasRequirement(player, Quests.HORROR_FROM_THE_DEEP))
+                        return;
 		if (hasPage(player, book, page)) {
 			player.sendMessage("The book already has that page.");
 			return;

Server/src/main/content/data/Lamps.java

@@ -22,6 +22,8 @@ public enum Lamps {
 	L_ACHIEVEMENT_2(new Item(11186), 1000, 30),
 	L_ACHIEVEMENT_3(new Item(11187), 1500, 35),
 
+	MYSTERIOUS_LAMP(new Item(13227), 10000, 30),
+
 	FALLY_ACHIEVEMENT_1(new Item(14580), 1000, 30),
 	FALLY_ACHIEVEMENT_2(new Item(14581), 5000, 40),
 	FALLY_ACHIEVEMENT_3(new Item(14582), 10000, 50),

Server/src/main/content/data/Quests.kt

@@ -0,0 +1,158 @@
+package content.data
+
+enum class Quests(val questName: String) {
+    MYTHS_OF_THE_WHITE_LANDS("Myths of the White Lands"),
+    BLACK_KNIGHTS_FORTRESS("Black Knights' Fortress"),
+    COOKS_ASSISTANT("Cook's Assistant"),
+    DEMON_SLAYER("Demon Slayer"),
+    DORICS_QUEST("Doric's Quest"),
+    DRAGON_SLAYER("Dragon Slayer"),
+    ERNEST_THE_CHICKEN("Ernest the Chicken"),
+    GOBLIN_DIPLOMACY("Goblin Diplomacy"),
+    IMP_CATCHER("Imp Catcher"),
+    THE_KNIGHTS_SWORD("The Knight's Sword"),
+    PIRATES_TREASURE("Pirate's Treasure"),
+    PRINCE_ALI_RESCUE("Prince Ali Rescue"),
+    THE_RESTLESS_GHOST("The Restless Ghost"),
+    ROMEO_JULIET("Romeo & Juliet"),
+    RUNE_MYSTERIES("Rune Mysteries"),
+    SHEEP_SHEARER("Sheep Shearer"),
+    SHIELD_OF_ARRAV("Shield of Arrav"),
+    VAMPIRE_SLAYER("Vampire Slayer"),
+    WITCHS_POTION("Witch's Potion"),
+    ANIMAL_MAGNETISM("Animal Magnetism"),
+    BETWEEN_A_ROCK("Between a Rock..."),
+    BIG_CHOMPY_BIRD_HUNTING("Big Chompy Bird Hunting"),
+    BIOHAZARD("Biohazard"),
+    CABIN_FEVER("Cabin Fever"),
+    CLOCK_TOWER("Clock Tower"),
+    CONTACT("Contact!"),
+    ZOGRE_FLESH_EATERS("Zogre Flesh Eaters"),
+    CREATURE_OF_FENKENSTRAIN("Creature of Fenkenstrain"),
+    DARKNESS_OF_HALLOWVALE("Darkness of Hallowvale"),
+    DEATH_TO_THE_DORGESHUUN("Death to the Dorgeshuun"),
+    DEATH_PLATEAU("Death Plateau"),
+    DESERT_TREASURE("Desert Treasure"),
+    DEVIOUS_MINDS("Devious Minds"),
+    THE_DIG_SITE("The Dig Site"),
+    DRUIDIC_RITUAL("Druidic Ritual"),
+    DWARF_CANNON("Dwarf Cannon"),
+    EADGARS_RUSE("Eadgar's Ruse"),
+    EAGLES_PEAK("Eagles' Peak"),
+    ELEMENTAL_WORKSHOP_I("Elemental Workshop I"),
+    ELEMENTAL_WORKSHOP_II("Elemental Workshop II"),
+    ENAKHRAS_LAMENT("Enakhra's Lament"),
+    ENLIGHTENED_JOURNEY("Enlightened Journey"),
+    THE_EYES_OF_GLOUPHRIE("The Eyes of Glouphrie"),
+    FAIRYTALE_I_GROWING_PAINS("Fairytale I - Growing Pains"),
+    FAIRYTALE_II_CURE_A_QUEEN("Fairytale II - Cure a Queen"),
+    FAMILY_CREST("Family Crest"),
+    THE_FEUD("The Feud"),
+    FIGHT_ARENA("Fight Arena"),
+    FISHING_CONTEST("Fishing Contest"),
+    FORGETTABLE_TALE("Forgettable Tale..."),
+    THE_FREMENNIK_TRIALS("The Fremennik Trials"),
+    WATERFALL_QUEST("Waterfall Quest"),
+    GARDEN_OF_TRANQUILITY("Garden of Tranquility"),
+    GERTRUDES_CAT("Gertrude's Cat"),
+    GHOSTS_AHOY("Ghosts Ahoy"),
+    THE_GIANT_DWARF("The Giant Dwarf"),
+    THE_GOLEM("The Golem"),
+    THE_GRAND_TREE("The Grand Tree"),
+    THE_HAND_IN_THE_SAND("The Hand in the Sand"),
+    HAUNTED_MINE("Haunted Mine"),
+    HAZEEL_CULT("Hazeel Cult"),
+    HEROES_QUEST("Heroes' Quest"),
+    HOLY_GRAIL("Holy Grail"),
+    HORROR_FROM_THE_DEEP("Horror from the Deep"),
+    ICTHLARINS_LITTLE_HELPER("Icthlarin's Little Helper"),
+    IN_AID_OF_THE_MYREQUE("In Aid of the Myreque"),
+    IN_SEARCH_OF_THE_MYREQUE("In Search of the Myreque"),
+    JUNGLE_POTION("Jungle Potion"),
+    LEGENDS_QUEST("Legend's Quest"),
+    LOST_CITY("Lost City"),
+    THE_LOST_TRIBE("The Lost Tribe"),
+    LUNAR_DIPLOMACY("Lunar Diplomacy"),
+    MAKING_HISTORY("Making History"),
+    MERLINS_CRYSTAL("Merlin's Crystal"),
+    MONKEY_MADNESS("Monkey Madness"),
+    MONKS_FRIEND("Monk's Friend"),
+    MOUNTAIN_DAUGHTER("Mountain Daughter"),
+    MOURNINGS_END_PART_I("Mourning's End Part I"),
+    MOURNINGS_END_PART_II("Mourning's End Part II"),
+    MURDER_MYSTERY("Murder Mystery"),
+    MY_ARMS_BIG_ADVENTURE("My Arm's Big Adventure"),
+    NATURE_SPIRIT("Nature Spirit"),
+    OBSERVATORY_QUEST("Observatory Quest"),
+    ONE_SMALL_FAVOUR("One Small Favour"),
+    PLAGUE_CITY("Plague City"),
+    PRIEST_IN_PERIL("Priest in Peril"),
+    RAG_AND_BONE_MAN("Rag and Bone Man"),
+    RATCATCHERS("Ratcatchers"),
+    RECIPE_FOR_DISASTER("Recipe for Disaster"),
+    RECRUITMENT_DRIVE("Recruitment Drive"),
+    REGICIDE("Regicide"),
+    ROVING_ELVES("Roving Elves"),
+    ROYAL_TROUBLE("Royal Trouble"),
+    RUM_DEAL("Rum Deal"),
+    SCORPION_CATCHER("Scorpion Catcher"),
+    SEA_SLUG("Sea Slug"),
+    THE_SLUG_MENACE("The Slug Menace"),
+    SHADES_OF_MORTTON("Shades of Mort'ton"),
+    SHADOW_OF_THE_STORM("Shadow of the Storm"),
+    SHEEP_HERDER("Sheep Herder"),
+    SHILO_VILLAGE("Shilo Village"),
+    A_SOULS_BANE("A Soul's Bane"),
+    SPIRITS_OF_THE_ELID("Spirits of the Elid"),
+    SWAN_SONG("Swan Song"),
+    TAI_BWO_WANNAI_TRIO("Tai Bwo Wannai Trio"),
+    A_TAIL_OF_TWO_CATS("A Tail of Two Cats"),
+    TEARS_OF_GUTHIX("Tears of Guthix"),
+    TEMPLE_OF_IKOV("Temple of Ikov"),
+    THRONE_OF_MISCELLANIA("Throne of Miscellania"),
+    THE_TOURIST_TRAP("The Tourist Trap"),
+    WITCHS_HOUSE("Witch's House"),
+    TREE_GNOME_VILLAGE("Tree Gnome Village"),
+    TRIBAL_TOTEM("Tribal Totem"),
+    TROLL_ROMANCE("Troll Romance"),
+    TROLL_STRONGHOLD("Troll Stronghold"),
+    UNDERGROUND_PASS("Underground Pass"),
+    WANTED("Wanted!"),
+    WATCHTOWER("Watchtower"),
+    COLD_WAR("Cold War"),
+    THE_FREMENNIK_ISLES("The Fremennik Isles"),
+    TOWER_OF_LIFE("Tower of Life"),
+    THE_GREAT_BRAIN_ROBBERY("The Great Brain Robbery"),
+    WHAT_LIES_BELOW("What Lies Below"),
+    OLAFS_QUEST("Olaf's Quest"),
+    ANOTHER_SLICE_OF_HAM("Another Slice of H.A.M"),
+    DREAM_MENTOR("Dream Mentor"),
+    GRIM_TALES("Grim Tales"),
+    KINGS_RANSOM("King's Ransom"),
+    THE_PATH_OF_GLOUPHRIE("The Path of Glouphrie"),
+    BACK_TO_MY_ROOTS("Back to my Roots"),
+    LAND_OF_THE_GOBLINS("Land of the Goblins"),
+    DEALING_WITH_SCABARAS("Dealing with Scabaras"),
+    WOLF_WHISTLE("Wolf Whistle"),
+    AS_A_FIRST_RESORT("As a First Resort..."),
+    CATAPULT_CONSTRUCTION("Catapult Construction"),
+    KENNITHS_CONCERNS("Kennith's Concerns"),
+    LEGACY_OF_SEERGAZE("Legacy of Seergaze"),
+    PERILS_OF_ICE_MOUNTAIN("Perils of Ice Mountain"),
+    TOKTZ_KET_DILL("TokTz-Ket-Dill"),
+    SMOKING_KILLS("Smoking Kills"),
+    ROCKING_OUT("Rocking Out"),
+    SPIRIT_OF_SUMMER("Spirit of Summer"),
+    MEETING_HISTORY("Meeting History"),
+    ALL_FIRED_UP("All Fired Up"),
+    SUMMERS_END("Summer's End"),
+    DEFENDER_OF_VARROCK("Defender of Varrock"),
+    SWEPT_AWAY("Swept Away"),
+    WHILE_GUTHIX_SLEEPS("While Guthix Sleeps"),
+    IN_PYRE_NEED("In Pyre Need"),
+    TEST_QUEST("Test Quest");
+
+    override fun toString(): String {
+        return questName
+    }
+}

Server/src/main/content/data/consumables/Consumables.java

@@ -2,15 +2,17 @@ package content.data.consumables;
 
 import content.data.consumables.effects.*;
 import core.game.consumable.*;
-import org.rs09.consts.Items;
 import core.game.node.entity.player.link.diary.DiaryType;
-import core.game.node.entity.state.EntityState;
-import core.game.world.update.flag.context.Animation;
 import core.game.node.entity.skill.Skills;
-import content.data.consumables.effects.KegOfBeerEffect;
+import core.game.world.update.flag.context.Animation;
+import org.rs09.consts.Items;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
+import static core.tools.TickUtilsKt.minutesToTicks;
+import static core.tools.TickUtilsKt.secondsToTicks;
+
 /**
  * Represents a repository of active consumables in the framework.
  */
@@ -28,36 +30,36 @@ public enum Consumables {
 	HERRING(new Food(new int[] {347}, new HealingEffect(5))),
 	MACKEREL(new Food(new int[] {355}, new HealingEffect(6))),
 	ROAST_BIRD_MEAT(new Food(new int[] {9980}, new HealingEffect(6))),
-	THIN_SNAIL(new Food(new int[] {3369}, new HealingEffect(5))),
+	THIN_SNAIL(new Food(new int[] {3369}, new RandomHealthEffect(5, 7))),
 	TROUT(new Food(new int[] {333}, new HealingEffect(7))),
-	SPIDER_ON_STICK(new Food(new int[] {6297, 6305}, new HealingEffect(7))),
+	SPIDER_ON_STICK(new Food(new int[] {6297, 6305}, new RandomHealthEffect(7, 11))),
 	SPIDER_ON_SHAFT(new Food(new int[] {6299}, new HealingEffect(7))),
 	ROAST_RABBIT(new Food(new int[] {7223}, new HealingEffect(7))),
-	LEAN_SNAIL(new Food(new int[] {3371}, new HealingEffect(8))),
+	LEAN_SNAIL(new Food(new int[] {3371}, new RandomHealthEffect(6, 8))),
 	COD(new Food(new int[] {339}, new HealingEffect(7))),
 	PIKE(new Food(new int[] {351}, new HealingEffect(8))),
 	ROAST_BEAST_MEAT(new Food(new int[] {9988}, new HealingEffect(8))),
 	COOKED_CRAB_MEAT(new Food(new int[] {7521, 7523, 7524, 7525, 7526}, new HealingEffect(2))),
-	FAT_SNAIL(new Food(new int[] {3373}, new HealingEffect(9))),
+	FAT_SNAIL(new Food(new int[] {3373}, new RandomHealthEffect(7, 9))),
 	SALMON(new Food(new int[] {329}, new HealingEffect(9))),
-	SLIMY_EEL(new Food(new int[] {3381}, new HealingEffect(6))),
+	SLIMY_EEL(new Food(new int[] {3381}, new RandomHealthEffect(6, 10))),
 	TUNA(new Food(new int[] {361}, new HealingEffect(10))),
-	COOKED_KARAMBWAN(new Food(new int[] {3144}, new HealingEffect(18))),
+	COOKED_KARAMBWAN(new Food(new int[] {3144}, new HealingEffect(18)), true),
 	COOKED_CHOMPY(new Food(new int[] {2878}, new HealingEffect(10))),
 	RAINBOW_FISH(new Food(new int[] {10136}, new HealingEffect(11))),
-	CAVE_EEL(new Food(new int[] {5003}, new HealingEffect(7))),
+	CAVE_EEL(new Food(new int[] {5003}, new RandomHealthEffect(8, 12))),
 	LOBSTER(new Food(new int[] {379}, new HealingEffect(12))),
 	COOKED_JUBBLY(new Food(new int[] {7568}, new HealingEffect(15))),
 	BASS(new Food(new int[] {365}, new HealingEffect(13))),
 	SWORDFISH(new Food(new int[] {373}, new HealingEffect(14))),
-	LAVA_EEL(new Food(new int[] {2149}, new HealingEffect(14))),
+	LAVA_EEL(new Food(new int[] {2149}, new HealingEffect(11))),
 	MONKFISH(new Food(new int[] {7946}, new HealingEffect(16))),
 	SHARK(new Food(new int[] {385}, new HealingEffect(20))),
 	SEA_TURTLE(new Food(new int[] {397}, new HealingEffect(21))),
 	MANTA_RAY(new Food(new int[] {391}, new HealingEffect(22))),
 	KARAMBWANJI(new Food(new int[] {3151}, new HealingEffect(3))),
 	STUFFED_SNAKE(new Food(new int[] {7579}, new HealingEffect(20), "You eat the stuffed snake-it's quite a meal! It tastes like chicken.")),
-	CRAYFISH(new Food(new int[] {13433}, new HealingEffect(2))),
+	CRAYFISH(new Food(new int[] {13433}, new HealingEffect(1))),
 	GIANT_FROG_LEGS(new Food(new int [] {4517}, new HealingEffect(6))),
 
 	/** Breads */
@@ -108,8 +110,8 @@ public enum Consumables {
 	MINT_CAKE(new Food(new int[] {9475}, new EnergyEffect(50))),
 
 	/** Vegetables */
-	POTATO(new Food(new int[] {1942}, new HealingEffect(1))),
-	BAKED_POTATO(new Food(new int[] {6701}, new HealingEffect(2))),
+	POTATO(new Food(new int[] {1942}, new HealingEffect(1), "You eat the potato. Yuck!")),
+	BAKED_POTATO(new Food(new int[] {6701}, new HealingEffect(4))),
 	SPICY_SAUCE(new Food(new int[] {7072, 1923}, new HealingEffect(2))),
 	CHILLI_CON_CARNE(new Food(new int[] {7062, 1923}, new HealingEffect(5))),
 	SCRAMBLED_EGG(new Food(new int[] {7078, 1923}, new HealingEffect(5))),
@@ -126,8 +128,8 @@ public enum Consumables {
 	MUSHROOM_POTATO(new Food(new int[] {7058}, new HealingEffect(20))),
 	TUNA_AND_CORN(new Food(new int[] {7068, 1923}, new HealingEffect(13))),
 	TUNA_POTATO(new Food(new int[] {7060}, new HealingEffect(22))),
-	ONION(new Food(new int[] {1957}, new HealingEffect(2), "It's always sad to see a grown man/woman cry.")),
-	CABBAGE(new Food(new int[] {1965}, new HealingEffect(2), "You eat the cabbage. Yuck!")),
+	ONION(new Food(new int[] {1957}, new HealingEffect(1), "It's always sad to see a grown man/woman cry.")),
+	CABBAGE(new Food(new int[] {1965}, new HealingEffect(1), "You eat the cabbage. Yuck!")),
 	DRAYNOR_CABBAGE(new Food(new int[] {1967}, new DraynorCabbageEffect(), "You eat the cabbage.", "It seems to taste nicer than normal.")),
 	EVIL_TURNIP(new Food(new int[] {12134, 12136, 12138}, new HealingEffect(6))),
 	SPINACH_ROLL(new Food(new int[] {1969}, new HealingEffect(2))),
@@ -145,16 +147,16 @@ public enum Consumables {
 	ORANGE(new Food(new int[] {2108}, new HealingEffect(2))),
 	ORANGE_CHUNKS(new Food(new int[] {2110}, new HealingEffect(2))),
 	ORANGE_SLICES(new Food(new int[] {2112}, new HealingEffect(2))),
-	PAPAYA_FRUIT(new Food(new int[] {5972}, new HealingEffect(2))),
+	PAPAYA_FRUIT(new Food(new int[] {5972}, new MultiEffect(new EnergyEffect(5), new HealingEffect(8)))),
 	TENTI_PINEAPPLE(new FakeConsumable(1851, new String[] {"Try using a knife to slice it into pieces."})),
 	PINEAPPLE(new FakeConsumable(2114, new String[] {"Try using a knife to slice it into pieces."})),
 	PINEAPPLE_CHUNKS(new Food(new int[] {2116}, new HealingEffect(2))),
 	PINEAPPLE_RING(new Food(new int[] {2118}, new HealingEffect(2))),
 	DWELLBERRIES(new Food(new int[] {2126}, new HealingEffect(2))),
-	JANGERBERRIES(new Food(new int[] {247}, new MultiEffect(new SkillEffect(Skills.ATTACK, 2, 0), new SkillEffect(Skills.STRENGTH, 1, 0), new PrayerEffect(1, 0), new SkillEffect(Skills.DEFENCE, -1, 0)))),
+	JANGERBERRIES(new Food(new int[] {247}, new MultiEffect(new SkillEffect(Skills.ATTACK, 2, 0), new SkillEffect(Skills.STRENGTH, 1, 0), new PrayerEffect(1, 0), new SkillEffect(Skills.DEFENCE, -1, 0)), "You eat the jangerberries.", "They taste very bitter.")),
 	STRAWBERRY(new Food(new int[] {5504}, new MultiEffect(new HealingEffect(1), new PercentageHealthEffect(6)))),
 	TOMATO(new Food(new int[] {1982}, new HealingEffect(2))),
-	WATERMELON(new FakeConsumable(5982, new String[] {"Try using a knife to slice it into pieces."})),
+	WATERMELON(new FakeConsumable(5982, new String[] {"You can't eat it whole; maybe you should cut it up."})),
 	WATERMELON_SLICE(new Food(new int[] {5984}, new PercentageHealthEffect(5))),
 	LEMON(new Food(new int[] {2102}, new HealingEffect(2))),
 	LEMON_CHUNKS(new Food(new int[] {2104}, new HealingEffect(2))),
@@ -164,11 +166,11 @@ public enum Consumables {
 	LIME_SLICES(new Food(new int[] {2124}, new HealingEffect(2))),
 	PEACH(new Food(new int[] {6883}, new HealingEffect(8))),
 	WHITE_TREE_FRUIT(new Food(new int[] {6469}, new MultiEffect(new RandomEnergyEffect(5, 10), new HealingEffect(3)))),
-	STRANGE_FRUIT(new Food(new int[] {464}, new MultiEffect(new RemoveStateEffect(EntityState.POISONED.ordinal()), new EnergyEffect(30)))),
+	STRANGE_FRUIT(new Food(new int[] {464}, new MultiEffect(new RemoveTimerEffect("poison"), new EnergyEffect(30)))),
 
 	/** Gnome Cooking */
-	TOAD_CRUNCHIES(new Food(new int[] {2217}, new HealingEffect(12))),
-	PREMADE_TD_CRUNCH(new Food(new int[] {2243}, new HealingEffect(12))),
+	TOAD_CRUNCHIES(new Food(new int[] {2217}, new HealingEffect(8))),
+	PREMADE_TD_CRUNCH(new Food(new int[] {2243}, new HealingEffect(8))),
 	SPICY_CRUNCHIES(new Food(new int[] {2213}, new HealingEffect(7))),
 	PREMADE_SY_CRUNCH(new Food(new int[] {2241}, new HealingEffect(7))),
 	WORM_CRUNCHIES(new Food(new int[] {2205}, new HealingEffect(8))),
@@ -244,40 +246,48 @@ public enum Consumables {
 
 	/** Cocktails */
 	FRUIT_BLAST(new Drink(new int[] {2084, 2026}, new HealingEffect(9))),
-	PREMADE_FR_BLAST(new Food(new int[] {2034, 2026}, new HealingEffect(9))),
+	PREMADE_FR_BLAST(new Drink(new int[] {2034, 2026}, new HealingEffect(9))),
+	CRAFTED_FR_BLAST(new Drink(new int[] {9514, 2026}, new HealingEffect(9))),
 	PINEAPPLE_PUNCH(new Drink(new int[] {2048, 2026}, new HealingEffect(9), "You drink the cocktail. It tastes great.")),
 	PREMADE_P_PUNCH(new Drink(new int[] {2036, 2026}, new HealingEffect(9), "You drink the cocktail. It tastes great.")),
+	CRAFTED_P_PUNCH(new Drink(new int[] {9512, 2026}, new HealingEffect(9))),
 	WIZARD_BLIZZARD(new Drink(new int[] {2054, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 6, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
 	PREMADE_WIZ_BLZD(new Drink(new int[] {2040, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 6, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
+	CRAFTED_WIZ_BLZD(new Drink(new int[]{9508, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 6, 0),new SkillEffect(Skills.ATTACK, -4, 0 )))),
 	SHORT_GREEN_GUY(new Drink(new int[] {2080, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 4, 0), new SkillEffect(Skills.ATTACK, -3, 0)))),
 	PREMADE_SGG(new Drink(new int[] {2038, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 4, 0), new SkillEffect(Skills.ATTACK, -3, 0)))),
+	CRAFTED_SGG(new Drink(new int[]{9510, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 4, 0), new SkillEffect(Skills.ATTACK, -3,0)))),
 	DRUNK_DRAGON(new Drink(new int[] {2092, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 7, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
 	PREMADE_DR_DRAGON(new Drink(new int[] {2032, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 7, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
+	CRAFTED_DR_DRAGON(new Drink(new int[] {9516, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 7, 0), new SkillEffect(Skills.ATTACK, -4,0)))),
 	CHOC_SATURDAY(new Drink(new int[] {2074, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 7, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
 	PREMADE_CHOC_SDY(new Drink(new int[] {2030, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 7, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
+	CRAFTED_CHOC_SDY(new Drink(new  int[] {9518, 2026}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 7,0), new SkillEffect(Skills.ATTACK, -4,0)))),
 	BLURBERRY_SPECIAL(new Drink(new int[] {2064, 2026}, new MultiEffect(new HealingEffect(6), new SkillEffect(Skills.STRENGTH, 6, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
 	PREMADE_BLURB_SP(new Drink(new int[] {2028, 2026}, new MultiEffect(new HealingEffect(6), new SkillEffect(Skills.STRENGTH, 6, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
+	CRAFTED_BLURB_SP(new Drink(new int[] {9520, 2026}, new MultiEffect(new HealingEffect(6), new SkillEffect(Skills.STRENGTH,6,0), new SkillEffect(Skills.ATTACK, -4,0)))),
 
 	/** Bottled Drinks */
 	KARAMJAN_RUM(new Drink(new int[] {431}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 5, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
 	BRAINDEATH_RUM(new Drink(new int[] {7157}, new MultiEffect(new SkillEffect(Skills.DEFENCE, 0, -0.1), new SkillEffect(Skills.ATTACK, 0, -0.05), new SkillEffect(Skills.PRAYER, 0, -0.05), new SkillEffect(Skills.RANGE, 0, -0.05), new SkillEffect(Skills.MAGIC, 0, -0.05), new SkillEffect(Skills.HERBLORE, 0, -0.05), new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.MINING, 1, 0)), "With a sense of impending doom you drink the 'rum'. You try very hard not to die.")),
 	RUM_TROUBLE_BREWING_RED(new Drink(new int[] {8940, 8940}, new TroubleBrewingRumEffect("Oh gods! It tastes like burning!"), new Animation(9605))),
 	RUM_TROUBLE_BREWING_BLUE(new Drink(new int[] {8941, 8941}, new TroubleBrewingRumEffect("My Liver! My Liver is melting!"), new Animation(9604))),
-	VODKA(new Drink(new int[] {2015}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -3, 0)))),
+	VODKA(new Drink(new int[] {2015}, new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.ATTACK, -4, 0), new SkillEffect(Skills.STRENGTH, 4, 0)))),
 	GIN(new Drink(new int[] {2019}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 1, 0), new SkillEffect(Skills.ATTACK, 4, 0), new RandomHealthEffect(3, 4)))),
 	BRANDY(new Drink(new int[] {2021}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.ATTACK, 4, 0)))),
 	WHISKY(new Drink(new int[] {2017}, new MultiEffect(new HealingEffect(5), new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
-	BOTTLE_OF_WINE(new Drink(new int[] {2015, 7921}, new MultiEffect(new HealingEffect(14), new SkillEffect(Skills.ATTACK, -3, 0)))),
+	BOTTLE_OF_WINE(new Drink(new int[] {7919, 7921}, new MultiEffect(new HealingEffect(14), new SkillEffect(Skills.ATTACK, -3, 0)))),
 
 	/** Wine */
 	JUG_OF_WINE(new Drink(new int[] {1993, 1935}, new MultiEffect(new HealingEffect(11), new SkillEffect(Skills.ATTACK, -2, 0)))),
 	HALF_FULL_WINE_JUG(new Drink(new int[] {1989, 1935}, new HealingEffect(7))),
+	JUG_OF_BAD_WINE(new Drink(new int[] {1991,1935}, new SkillEffect(Skills.ATTACK, -3, 0))),
 
 	/** Tea */
 	CUP_OF_TEA(new Drink(new int[] {712, 1980}, new MultiEffect(new HealingEffect(3), new SkillEffect(Skills.ATTACK, 3, 0)), "Aaah, nothing like a nice cuppa tea!")),
 	CUP_OF_TEA_NETTLE(new Drink(new int[] {4242, 1980}, new EnergyEffect(10))),
 	CUP_OF_TEA_MILKY_NETTLE(new Drink(new int[] {4243, 1980}, new EnergyEffect(10))),
-	NETTLE_TEA(new Drink(new int[] {4239, 1980}, new NettleTeaEffect())),
+	NETTLE_TEA(new Drink(new int[] {4239, 1923}, new NettleTeaEffect())),
 	NETTLE_TEA_MILKY(new Drink(new int[] {4240, 1980}, new NettleTeaEffect())),
 	CUP_OF_TEA_CLAY(new Drink(new int[] {7730, 7728}, new SkillEffect(Skills.CONSTRUCTION, 1, 0), "You feel refreshed and ready for more building.")),
 	CUP_OF_TEA_CLAY_MILKY(new Drink(new int[] {7731, 7728}, new SkillEffect(Skills.CONSTRUCTION, 1, 0))),
@@ -297,8 +307,9 @@ public enum Consumables {
 	OOMLIE_WRAP(new Food(new int[] {Items.COOKED_OOMLIE_WRAP_2343}, new MultiEffect(new HealingEffect(14), new AchievementEffect(DiaryType.KARAMJA, 2, 2)))),
 	ROE(new Food(new int[]{11324}, new HealingEffect(3))),
 	EQUA_LEAVES(new Food(new int[]{2128}, new HealingEffect(1))),
-	CHOC_ICE(new Food(new int[]{6794}, new HealingEffect(6))),
+	CHOC_ICE(new Food(new int[]{6794}, new HealingEffect(7))),
 	EDIBLE_SEAWEED(new Food(new int[] {403}, new HealingEffect(4))),
+	FROG_SPAWN(new Food(new int[] {5004}, new RandomHealthEffect(3, 7), "You eat the frogspawn. Yuck.")),
 
 	/** Special Events */
 	PUMPKIN(new Food(new int[] {1959}, new HealingEffect(14))),
@@ -308,43 +319,44 @@ public enum Consumables {
 	STRENGTH(new Potion(new int[] {113, 115, 117, 119}, new SkillEffect(Skills.STRENGTH, 3, 0.1))),
 	ATTACK(new Potion(new int[] {2428, 121, 123, 125}, new SkillEffect(Skills.ATTACK, 3, 0.1))),
 	DEFENCE(new Potion(new int[] {2432, 133, 135, 137}, new SkillEffect(Skills.DEFENCE, 3, 0.1))),
-	RANGING(new Potion(new int[] {2444, 169, 171, 173}, new SkillEffect(Skills.RANGE, 3, 0.1))),
-	MAGIC(new Potion(new int[] {3040, 3042, 3044, 3046}, new SkillEffect(Skills.MAGIC, 3, 0.1))),
-	SUPER_STRENGTH(new Potion(new int[] {2440, 157, 159, 161}, new SkillEffect(Skills.STRENGTH, 3, 0.2))),
-	SUPER_ATTACK(new Potion(new int[] {2436, 145, 147, 149}, new SkillEffect(Skills.ATTACK, 3, 0.2))),
-	SUPER_DEFENCE(new Potion(new int[] {2442, 163, 165, 167}, new SkillEffect(Skills.DEFENCE, 3, 0.2))),
-	ANTIPOISON(new Potion(new int[] {2446, 175, 177, 179}, new MultiEffect(new SetAttributeEffect("poison:immunity", 143), new RemoveStateEffect(EntityState.POISONED.ordinal())))),
-	ANTIPOISON_(new Potion(new int[] {5943, 5945, 5947, 5949}, new MultiEffect(new SetAttributeEffect("poison:immunity", 863), new RemoveStateEffect(EntityState.POISONED.ordinal())))),
-	ANTIPOISON__(new Potion(new int[] {5952, 5954, 5956, 5958}, new MultiEffect(new SetAttributeEffect("poison:immunity", 2000), new RemoveStateEffect(EntityState.POISONED.ordinal())))),
-	SUPER_ANTIP(new Potion(new int[] {2448, 181, 183, 185}, new MultiEffect(new SetAttributeEffect("poison:immunity", 1000), new RemoveStateEffect(EntityState.POISONED.ordinal())))),
-	RELICYM(new Potion(new int[] {4842, 4844, 4846, 4848}, new MultiEffect(new SetAttributeEffect("disease:immunity", 300), new RemoveStateEffect("disease")))),
+	RANGING(new Potion(new int[] {2444, 169, 171, 173}, new SkillEffect(Skills.RANGE, 4, 0.1))),
+	MAGIC(new Potion(new int[] {3040, 3042, 3044, 3046}, new SkillEffect(Skills.MAGIC, 4, 0))),
+	SUPER_STRENGTH(new Potion(new int[] {2440, 157, 159, 161}, new SkillEffect(Skills.STRENGTH, 5, 0.15))),
+	SUPER_ATTACK(new Potion(new int[] {2436, 145, 147, 149}, new SkillEffect(Skills.ATTACK, 5, 0.15))),
+	SUPER_DEFENCE(new Potion(new int[] {2442, 163, 165, 167}, new SkillEffect(Skills.DEFENCE, 5, 0.15))),
+	ANTIPOISON(new Potion(new int[] {2446, 175, 177, 179}, new AddTimerEffect("poison:immunity", secondsToTicks(90)))),
+	ANTIPOISON_(new Potion(new int[] {5943, 5945, 5947, 5949}, new AddTimerEffect("poison:immunity", minutesToTicks(9)))),
+	ANTIPOISON__(new Potion(new int[] {5952, 5954, 5956, 5958}, new AddTimerEffect("poison:immunity", minutesToTicks(12)))),
+	SUPER_ANTIP(new Potion(new int[] {2448, 181, 183, 185}, new AddTimerEffect("poison:immunity", minutesToTicks(6)))),
+	RELICYM(new Potion(new int[] {4842, 4844, 4846, 4848}, new CureDiseaseEffect())),
 	AGILITY(new Potion(new int[] {3032, 3034, 3036, 3038}, new SkillEffect(Skills.AGILITY, 3, 0))),
 	HUNTER(new Potion(new int[] {9998, 10000, 10002, 10004}, new SkillEffect(Skills.HUNTER, 3, 0))),
 	RESTORE(new Potion(new int[] {2430, 127, 129, 131}, new RestoreEffect(10, 0.3))),
-	SARA_BREW(new Potion(new int[] {6685, 6687, 6689, 6691}, new MultiEffect(new PercentHeal(2, .15), new SkillEffect(Skills.ATTACK, 0, -0.10), new SkillEffect(Skills.STRENGTH, 0, -0.10), new SkillEffect(Skills.MAGIC, 0, -0.10), new SkillEffect(Skills.RANGE, 0, -0.10), new SkillEffect(Skills.DEFENCE, 2, 0.2)))),
+	SARA_BREW(new Potion(new int[] {6685, 6687, 6689, 6691}, new MultiEffect(new PercentHeal(0, .15), new SkillEffect(Skills.ATTACK, 0, -0.10), new SkillEffect(Skills.STRENGTH, 0, -0.10), new SkillEffect(Skills.MAGIC, 0, -0.10), new SkillEffect(Skills.RANGE, 0, -0.10), new SkillEffect(Skills.DEFENCE, 0, 0.25)))),
 	SUMMONING(new Potion(new int[] {12140, 12142, 12144, 12146}, new MultiEffect(new RestoreSummoningSpecial(), new SummoningEffect(7, 0.25)))),
 	COMBAT(new Potion(new int[] {9739, 9741, 9743, 9745}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, .1), new SkillEffect(Skills.ATTACK, 3, .1)))),
-	ENERGY(new Potion(new int[] {3008, 3010, 3012, 3014}, new MultiEffect(new EnergyEffect(10), new HealingEffect(3)))),
+	ENERGY(new Potion(new int[] {3008, 3010, 3012, 3014}, new EnergyEffect(10))),
 	FISHING(new Potion(new int[] {2438, 151, 153, 155}, new SkillEffect(Skills.FISHING, 3, 0))),
 	PRAYER(new Potion(new int[] {2434, 139, 141, 143}, new PrayerEffect(7, 0.25))),
-	SUPER_RESTO(new Potion(new int[] {3024, 3026, 3028, 3030}, new MultiEffect(new RestoreEffect(8, 0.25), new PrayerEffect(8, 0.25), new SummoningEffect(8, 0.25)))),
-	ZAMMY_BREW(new Potion(new int[] {2450, 189, 191, 193}, new MultiEffect(new DamageEffect(10, true), new SkillEffect(Skills.ATTACK, 0, 0.15), new SkillEffect(Skills.STRENGTH, 0, 0.25), new SkillEffect(Skills.DEFENCE, 0, -0.1), new RandomPrayerEffect(0, 10)))),
-	ANTIFIRE(new Potion(new int[] {2452, 2454, 2456, 2458}, new SetAttributeEffect("fire:immune", 600, true))),
-	GUTH_REST(new Potion(new int[] {4417, 4419, 4421, 4423}, new MultiEffect(new RemoveStateEffect(EntityState.POISONED.ordinal()), new EnergyEffect(5), new HealingEffect(5)))),
+	SUPER_RESTO(new Potion(new int[] {3024, 3026, 3028, 3030}, new RestoreEffect(8, 0.25, true))),
+	ZAMMY_BREW(new Potion(new int[] {2450, 189, 191, 193}, new MultiEffect(new DamageEffect(10, true), new SkillEffect(Skills.ATTACK, 0, 0.25), new SkillEffect(Skills.STRENGTH, 0, 0.15), new SkillEffect(Skills.DEFENCE, 0, -0.1)))),
+	ANTIFIRE(new Potion(new int[] {2452, 2454, 2456, 2458}, new AddTimerEffect("dragonfire:immunity", 600, true))),
+	GUTH_REST(new Potion(new int[] {4417, 4419, 4421, 4423}, new MultiEffect(new RemoveTimerEffect("poison"), new EnergyEffect(5), new HealingEffect(5)))),
 	MAGIC_ESS(new Potion(new int[] {11491, 11489}, new SkillEffect(Skills.MAGIC,3,0))),
-	SANFEW(new Potion(new int[] {10925, 10927, 10929, 10931}, new MultiEffect(new RestoreEffect(8,0.25), new PrayerEffect(8,0.25), new RemoveStateEffect(EntityState.POISONED.ordinal()), new RemoveStateEffect("disease")))),
+	SANFEW(new Potion(new int[] {10925, 10927, 10929, 10931}, new MultiEffect(new RestoreEffect(8,0.25, true),  new AddTimerEffect("poison:immunity", secondsToTicks(90)), new RemoveTimerEffect("disease")))),
 	SUPER_ENERGY(new Potion(new int[] {3016, 3018, 3020, 3022}, new EnergyEffect(20))),
 	BLAMISH_OIL(new FakeConsumable(1582, new String[] {"You know... I'd really rather not."})),
 
 	/** Barbarian Mixes */
 	PRAYERMIX(new BarbarianMix(new int[] {11465, 11467}, new MultiEffect(new PrayerEffect(7, 0.25), new HealingEffect(6)))),
-	ZAMMY_MIX(new BarbarianMix(new int[] {11521, 11523}, new MultiEffect(new DamageEffect(10, true), new SkillEffect(Skills.ATTACK, 0, 0.15), new SkillEffect(Skills.STRENGTH, 0, 0.25), new SkillEffect(Skills.DEFENCE, 0, -0.1), new RandomPrayerEffect(0, 10)))),
+	ZAMMY_MIX(new BarbarianMix(new int[] {11521, 11523}, new MultiEffect(new DamageEffect(10, true), new SkillEffect(Skills.ATTACK, 0, 0.15), new SkillEffect(Skills.STRENGTH, 0, 0.25), new SkillEffect(Skills.DEFENCE, 0, -0.1)))),
 	ATT_MIX(new BarbarianMix(new int[] {11429, 11431}, new MultiEffect(new SkillEffect(Skills.ATTACK, 3, 0.1), new HealingEffect(3)))),
-	ANTIP_MIX(new BarbarianMix(new int[] {11433, 11435}, new MultiEffect(new RemoveStateEffect(EntityState.POISONED.ordinal()), new SetAttributeEffect("poison:immunity", 143), new HealingEffect(3)))),
-	RELIC_MIX(new BarbarianMix(new int[] {11437, 11439}, new MultiEffect(new RemoveStateEffect("disease"), new SetAttributeEffect("disease:immunity", 300), new HealingEffect(3)))),
+	ANTIP_MIX(new BarbarianMix(new int[] {11433, 11435}, new MultiEffect(new AddTimerEffect("poison:immunity", secondsToTicks(90)), new HealingEffect(3)))),
+	RELIC_MIX(new BarbarianMix(new int[] {11437, 11439}, new MultiEffect(new CureDiseaseEffect(), new HealingEffect(3)))),
 	STR_MIX(new BarbarianMix(new int[] {11443, 11441}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0.1), new HealingEffect(3)))),
 	RESTO_MIX(new BarbarianMix(new int[] {11449, 11451}, new MultiEffect(new RestoreEffect(10, 0.3), new HealingEffect(3)))),
-	ENERGY_MIX(new BarbarianMix(new int[] {11453, 11455}, new MultiEffect(new EnergyEffect(10), new HealingEffect(6)))),
+	SUPER_RESTO_MIX(new BarbarianMix(new int [] {11493, 11495}, new MultiEffect(new RestoreEffect(8,0.25), new PrayerEffect(8, 0.25), new SummoningEffect(8, 0.25), new HealingEffect(6)))),
+	ENERGY_MIX(new BarbarianMix(new int[] {11453, 11455}, new MultiEffect(new EnergyEffect(10), new HealingEffect(3)))),
 	DEF_MIX(new BarbarianMix(new int[] {11457, 11459}, new MultiEffect(new SkillEffect(Skills.DEFENCE, 3, 0.1), new HealingEffect(6)))),
 	AGIL_MIX(new BarbarianMix(new int[] {11461, 11463}, new MultiEffect(new SkillEffect(Skills.AGILITY, 3, 0), new HealingEffect(6)))),
 	COMBAT_MIX(new BarbarianMix(new int[] {11445, 11447}, new MultiEffect(new SkillEffect(Skills.ATTACK, 3, 0.1), new SkillEffect(Skills.STRENGTH, 3, 0.1), new HealingEffect(6)))),
@@ -353,6 +365,9 @@ public enum Consumables {
 	SUPER_ENERGY_MIX(new BarbarianMix(new int[] {11481, 11483}, new MultiEffect(new EnergyEffect(20), new HealingEffect(6)))),
 	HUNTING_MIX(new BarbarianMix(new int[] {11517, 11519}, new MultiEffect(new SkillEffect(Skills.HUNTER, 3, 0), new HealingEffect(6)))),
 	SUPER_STR_MIX(new BarbarianMix(new int[] {11485, 11487}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 5, 0.15), new HealingEffect(6)))),
+	ANTIDOTE_PLUS_MIX(new BarbarianMix(new int[] {11501, 11503}, new MultiEffect(new AddTimerEffect("poison:immunity", minutesToTicks(9)), new RandomHealthEffect(3, 7)))),
+	ANTIP_SUPERMIX(new BarbarianMix(new int[] {11473, 11475}, new MultiEffect(new AddTimerEffect("poison:immunity", minutesToTicks(6)), new RandomHealthEffect(3, 7)))),
+	ANTIFIRE_MIX(new BarbarianMix(new int[] {11505, 11507}, new MultiEffect(new AddTimerEffect("dragonfire:immunity", 600, true), new RandomHealthEffect(3, 7)))),
 
     /** Stealing creation potions */
 	SC_PRAYER(new Potion(new int[] {14207, 14209, 14211, 14213, 14215}, new PrayerEffect(7, 0.25))),
@@ -364,24 +379,28 @@ public enum Consumables {
 	SC_MAGIC(new Potion(new int[] {14267, 14269, 14271, 14273, 14275}, new SkillEffect(Skills.MAGIC, 3, 0.1))),
 	SC_SUMMONING(new Potion(new int[] {14277, 14279, 14281, 14283, 14285}, new SummoningEffect(7, 0.25)));
 
-	public static HashMap<Integer,Consumable> consumables = new HashMap<>();
+	public static HashMap<Integer,Consumables> consumables = new HashMap<>();
+
+	public static ArrayList<Integer> potions = new ArrayList<>();
 
 	private final Consumable consumable;
+	public boolean isIgnoreMainClock = false;
 
 	Consumables(Consumable consumable) {
 		this.consumable = consumable;
 	}
+	Consumables(Consumable consumable, boolean isIgnoreMainClock) {this.consumable = consumable; this.isIgnoreMainClock = isIgnoreMainClock;}
 
 	public Consumable getConsumable() {
 		return consumable;
 	}
 
-	public static Consumable getConsumableById(final int itemId) {
+	public static Consumables getConsumableById(final int itemId) {
 		return consumables.get(itemId);
 	}
 
-	public static void add(final Consumable consumable) {
-		for (int id : consumable.getIds()) {
+	public static void add(final Consumables consumable) {
+		for (int id : consumable.consumable.getIds()) {
 			consumables.putIfAbsent(id, consumable);
 		}
 	}
@@ -391,7 +410,12 @@ public enum Consumables {
 	 */
 	static {
 		for (Consumables consumable : Consumables.values()) {
-			add(consumable.consumable);
+			add(consumable);
+			if (consumable.consumable instanceof Potion) {
+				for (int pot : consumable.consumable.getIds()) {
+					potions.add(pot);
+				}
+			}
 		}
 	}
 }

Server/src/main/content/data/consumables/effects/AddTimerEffect.kt

@@ -0,0 +1,15 @@
+package content.data.consumables.effects
+
+import core.api.registerTimer
+import core.api.removeTimer
+import core.api.spawnTimer
+import core.game.consumable.ConsumableEffect
+import core.game.node.entity.player.Player
+
+class AddTimerEffect (val identifier: String, vararg val args: Any) : ConsumableEffect() {
+    override fun activate (p: Player) {
+        removeTimer (p, identifier)
+        val timer = spawnTimer (identifier, *args) ?: return
+        registerTimer (p, timer)
+    }
+}

Server/src/main/content/data/consumables/effects/CureDiseaseEffect.kt

@@ -0,0 +1,21 @@
+package content.data.consumables.effects
+
+import core.api.*
+import core.game.consumable.ConsumableEffect
+import core.game.node.entity.player.Player
+import core.game.system.timer.impl.Disease
+
+class CureDiseaseEffect () : ConsumableEffect() {
+    override fun activate (p: Player) {
+        val existingTimer = getTimer<Disease>(p)
+        if (existingTimer != null) {
+            existingTimer.hitsLeft -= 9
+            if (existingTimer.hitsLeft <= 0) {
+                sendMessage(p, "The disease has been cured.")
+                removeTimer<Disease>(p)
+            }else{
+                sendMessage(p,"You feel slightly better.")
+            }
+        }
+    }
+}

Server/src/main/content/data/consumables/effects/PrayerEffect.java

@@ -1,19 +0,0 @@
-package content.data.consumables.effects;
-
-import core.game.consumable.ConsumableEffect;
-import core.game.node.entity.player.Player;
-import core.game.node.entity.skill.Skills;
-
-public class PrayerEffect extends ConsumableEffect {
-    double base, bonus;
-    public PrayerEffect(double base, double bonus){
-        this.base = base;
-        this.bonus = bonus;
-    }
-    @Override
-    public void activate(Player p) {
-        int level = p.getSkills().getStaticLevel(Skills.PRAYER);
-        double amt = base + (level * bonus);
-        p.getSkills().incrementPrayerPoints(amt);
-    }
-}

Server/src/main/content/data/consumables/effects/PrayerEffect.kt

@@ -0,0 +1,20 @@
+package content.data.consumables.effects
+
+import core.api.*
+import core.game.consumable.ConsumableEffect
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import org.rs09.consts.Items
+import kotlin.math.floor
+
+class PrayerEffect(var base: Double, var bonus: Double) : ConsumableEffect() {
+    override fun activate(player: Player?) {
+        if(player == null) return
+        val level = getStatLevel(player, Skills.PRAYER)
+        var b = bonus
+        if(inInventory(player, Items.HOLY_WRENCH_6714))
+            b += 0.02 // Leaving this in for futureproofing. Current update is for properly rounding down.
+        val amount = floor(base + (level * b))
+        modPrayerPoints(player, amount)
+    }
+}

Server/src/main/content/data/consumables/effects/RemoveStateEffect.java

@@ -1,25 +0,0 @@
-package content.data.consumables.effects;
-
-import core.game.consumable.ConsumableEffect;
-import core.game.node.entity.player.Player;
-import core.game.node.entity.state.EntityState;
-
-public class RemoveStateEffect extends ConsumableEffect {
-    int state = -1;
-    String statekey;
-    @Deprecated
-    public RemoveStateEffect(int state){
-        this.state = state;
-    }
-    public RemoveStateEffect(String key){
-        statekey = key;
-    }
-    @Override
-    public void activate(Player p) {
-        if(state == -1){
-            p.clearState(statekey);
-            return;
-        }
-        p.getStateManager().remove(EntityState.values()[state]);
-    }
-}

Server/src/main/content/data/consumables/effects/RemoveTimerEffect.kt

@@ -0,0 +1,11 @@
+package content.data.consumables.effects
+
+import core.api.*
+import core.game.consumable.ConsumableEffect
+import core.game.node.entity.player.Player
+
+class RemoveTimerEffect (val identifier: String) : ConsumableEffect() {
+    override fun activate (p: Player) {
+        removeTimer (p, identifier)
+    }
+}

Server/src/main/content/data/consumables/effects/RestoreEffect.java

@@ -6,21 +6,37 @@ import core.game.node.entity.skill.Skills;
 
 public class RestoreEffect extends ConsumableEffect {
     double base,bonus;
+    boolean all_skills; // Except for hitpoints
     public RestoreEffect(double base, double bonus){
         this.base = base;
         this.bonus = bonus;
+        this.all_skills = false;
+    }
+
+    public RestoreEffect(double base, double bonus, boolean all_skills){
+        this.base = base;
+        this.bonus = bonus;
+        this.all_skills = all_skills;
     }
     final int[] SKILLS = new int[] { Skills.DEFENCE, Skills.ATTACK, Skills.STRENGTH, Skills.MAGIC, Skills.RANGE };
+    final int[] ALL_SKILLS = new int[]{
+            Skills.ATTACK,Skills.DEFENCE, Skills.STRENGTH,Skills.RANGE,Skills.PRAYER,Skills.MAGIC, Skills.COOKING,
+            Skills.WOODCUTTING,Skills.FLETCHING,Skills.FISHING,Skills.FIREMAKING,Skills.CRAFTING,Skills.SMITHING,
+            Skills.MINING,Skills.HERBLORE,Skills.AGILITY,Skills.THIEVING,Skills.SLAYER,Skills.FARMING,
+            Skills.RUNECRAFTING,Skills.HUNTER,Skills.CONSTRUCTION,Skills.SUMMONING };
     @Override
     public void activate(Player p) {
         Skills sk = p.getSkills();
-        for(int skill : SKILLS){
+        int[] skills = this.all_skills ? ALL_SKILLS : SKILLS;
+        for(int skill : skills){
             int statL = sk.getStaticLevel(skill);
+            int boost = (int) (base + (statL * bonus));
             int curL = sk.getLevel(skill);
             if(curL < statL){
-                int boost = (int) (base + (statL * bonus));
                 p.getSkills().updateLevel(skill, boost, statL);
             }
+            if (skill == Skills.PRAYER)
+                p.getSkills().incrementPrayerPoints(boost);
         }
     }
 }

Server/src/main/content/data/tables/AllotmentSeedDropTable.java

@@ -3,13 +3,13 @@ package content.data.tables;
 import core.api.StartupListener;
 import core.game.node.item.Item;
 import core.game.node.item.WeightedChanceItem;
+import core.tools.Log;
 import core.tools.RandomFunction;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import core.ServerConstants;
-import core.tools.SystemLogger;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -18,7 +18,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import static core.tools.SystemLogger.logInfo;
+import static core.api.ContentAPIKt.log;
 
 /**
  * Handles the allotment seed drop table.
@@ -57,11 +57,11 @@ public final class AllotmentSeedDropTable implements StartupListener {
 	@Override
 	public void startup() {
 		if(ServerConstants.ASDT_DATA_PATH != null && !new File(ServerConstants.ASDT_DATA_PATH).exists()){
-			SystemLogger.logErr(this.getClass(), "Can't locate ASDT file at " + ServerConstants.ASDT_DATA_PATH);
+			log(this.getClass(), Log.ERR, "Can't locate ASDT file at " + ServerConstants.ASDT_DATA_PATH);
 			return;
 		}
 		parse(ServerConstants.ASDT_DATA_PATH);
-		logInfo(this.getClass(), "Initialized Allotment Seed Drop Table from " + ServerConstants.ASDT_DATA_PATH);
+		log(this.getClass(), Log.FINE, "Initialized Allotment Seed Drop Table from " + ServerConstants.ASDT_DATA_PATH);
 	}
 
 	/**

Server/src/main/content/data/tables/BirdNest.java

@@ -8,6 +8,9 @@ import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.tools.RandomFunction;
 import core.tools.StringUtils;
+import org.rs09.consts.Sounds;
+
+import static core.api.ContentAPIKt.playAudio;
 
 /**
  * Represents a birds nest.
@@ -93,7 +96,7 @@ public enum BirdNest {
 	 */
 	public static void drop(final Player player) {
 		final BirdNest nest = getRandomNest(false);
-		player.getAudioManager().send(1997);
+		playAudio(player, Sounds.CUCKOO_1_1997);
 		GroundItemManager.create(nest.getNest(), player);
 		player.getPacketDispatch().sendMessage("<col=FF0000>A bird's nest falls out of the tree.");
 	}

Server/src/main/content/data/tables/CELEMinorTable.java

@@ -4,7 +4,7 @@ import core.api.StartupListener;
 import core.ServerConstants;
 import core.game.node.item.Item;
 import core.game.node.item.WeightedChanceItem;
-import core.tools.SystemLogger;
+import core.tools.Log;
 import core.tools.RandomFunction;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -18,7 +18,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import static core.tools.SystemLogger.logInfo;
+import static core.api.ContentAPIKt.log;
 
 /**
  * Handles the Chaos Elemental's minor drop table. It is supposed to roll this table alongside its standard major drops on the main table.
@@ -57,11 +57,11 @@ public final class CELEMinorTable implements StartupListener {
 	@Override
 	public void startup() {
 		if(ServerConstants.CELEDT_DATA_PATH != null && !new File(ServerConstants.CELEDT_DATA_PATH).exists()){
-			SystemLogger.logErr(this.getClass(), "Can't locate CELEDT file at " + ServerConstants.CELEDT_DATA_PATH);
+			log(this.getClass(), Log.ERR, "Can't locate CELEDT file at " + ServerConstants.CELEDT_DATA_PATH);
 			return;
 		}
 		parse(ServerConstants.CELEDT_DATA_PATH);
-		logInfo(this.getClass(), "Loaded up Chaos Elemental drop table from " + ServerConstants.CELEDT_DATA_PATH);
+		log(this.getClass(), Log.FINE, "Loaded up Chaos Elemental drop table from " + ServerConstants.CELEDT_DATA_PATH);
 	}
 
 	/**

Server/src/main/content/data/tables/GemDropTable.java

@@ -3,13 +3,13 @@ package content.data.tables;
 import core.api.StartupListener;
 import core.game.node.item.Item;
 import core.game.node.item.WeightedChanceItem;
+import core.tools.Log;
 import core.tools.RandomFunction;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import core.ServerConstants;
-import core.tools.SystemLogger;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -18,7 +18,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import static core.tools.SystemLogger.logInfo;
+import static core.api.ContentAPIKt.log;
 
 /**
  * Handles the gem drop table.
@@ -57,11 +57,11 @@ public final class GemDropTable implements StartupListener {
 	@Override
 	public void startup() {
 		if(ServerConstants.GDT_DATA_PATH != null && !new File(ServerConstants.GDT_DATA_PATH).exists()){
-			SystemLogger.logErr(this.getClass(), "Can't locate GDT file at " + ServerConstants.GDT_DATA_PATH);
+			log(this.getClass(), Log.ERR, "Can't locate GDT file at " + ServerConstants.GDT_DATA_PATH);
 			return;
 		}
 		parse(ServerConstants.GDT_DATA_PATH);
-		logInfo(this.getClass(), "Initialized Gem Drop Table from " + ServerConstants.GDT_DATA_PATH);
+		log(this.getClass(), Log.FINE, "Initialized Gem Drop Table from " + ServerConstants.GDT_DATA_PATH);
 	}
 
 	/**

Server/src/main/content/data/tables/HerbDropTable.java

@@ -3,13 +3,13 @@ package content.data.tables;
 import core.api.StartupListener;
 import core.game.node.item.Item;
 import core.game.node.item.WeightedChanceItem;
+import core.tools.Log;
 import core.tools.RandomFunction;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import core.ServerConstants;
-import core.tools.SystemLogger;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -18,7 +18,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import static core.tools.SystemLogger.logInfo;
+import static core.api.ContentAPIKt.log;
 
 /**
  * Handles the herb drop table.
@@ -57,11 +57,11 @@ public final class HerbDropTable implements StartupListener {
 	@Override
 	public void startup() {
 		if(ServerConstants.HDT_DATA_PATH != null && !new File(ServerConstants.HDT_DATA_PATH).exists()){
-			SystemLogger.logErr(this.getClass(), "Can't locate HDT file at " + ServerConstants.HDT_DATA_PATH);
+			log(this.getClass(), Log.ERR, "Can't locate HDT file at " + ServerConstants.HDT_DATA_PATH);
 			return;
 		}
 		parse(ServerConstants.HDT_DATA_PATH);
-		logInfo(this.getClass(), "Initialized Herb Drop Table from " + ServerConstants.HDT_DATA_PATH);
+		log(this.getClass(), Log.FINE, "Initialized Herb Drop Table from " + ServerConstants.HDT_DATA_PATH);
 	}
 
 	/**

Server/src/main/content/data/tables/RareDropTable.kt

@@ -2,15 +2,15 @@ package content.data.tables
 
 import core.ServerConstants
 import core.api.StartupListener
+import core.api.log
 import core.api.shouldRemoveNothings
 import core.api.utils.WeightBasedTable
 import core.api.utils.WeightedItem
 import core.game.node.entity.Entity
 import core.game.node.entity.player.Player
 import core.game.node.item.Item
+import core.tools.Log
 import core.tools.RandomFunction
-import core.tools.SystemLogger.logErr
-import core.tools.SystemLogger.logInfo
 import org.rs09.consts.Items
 import org.w3c.dom.Element
 import org.w3c.dom.Node
@@ -26,11 +26,11 @@ import javax.xml.parsers.ParserConfigurationException
 class RareDropTable : StartupListener {
     override fun startup() {
         if (ServerConstants.RDT_DATA_PATH != null && !File(ServerConstants.RDT_DATA_PATH).exists()) {
-            logErr(this.javaClass, "Can't locate RDT file at " + ServerConstants.RDT_DATA_PATH)
+            log(this::class.java, Log.ERR, "Can't locate RDT file at " + ServerConstants.RDT_DATA_PATH)
             return
         }
         parse(ServerConstants.RDT_DATA_PATH)
-        logInfo(this.javaClass, "Initialized Rare Drop Table from " + ServerConstants.RDT_DATA_PATH)
+        log(this::class.java, Log.FINE, "Initialized Rare Drop Table from " + ServerConstants.RDT_DATA_PATH)
     }
 
     companion object {

Server/src/main/content/data/tables/RareSeedDropTable.java

@@ -3,13 +3,13 @@ package content.data.tables;
 import core.api.StartupListener;
 import core.game.node.item.Item;
 import core.game.node.item.WeightedChanceItem;
+import core.tools.Log;
 import core.tools.RandomFunction;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import core.ServerConstants;
-import core.tools.SystemLogger;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -18,7 +18,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import static core.tools.SystemLogger.logInfo;
+import static core.api.ContentAPIKt.log;
 
 /**
  * Handles the rare seed drop table.
@@ -57,11 +57,11 @@ public final class RareSeedDropTable implements StartupListener {
 	@Override
 	public void startup() {
 		if(ServerConstants.RSDT_DATA_PATH != null && !new File(ServerConstants.RSDT_DATA_PATH).exists()){
-			SystemLogger.logErr(this.getClass(), "Can't locate RSDT file at " + ServerConstants.RSDT_DATA_PATH);
+			log(this.getClass(), Log.ERR, "Can't locate RSDT file at " + ServerConstants.RSDT_DATA_PATH);
 			return;
 		}
 		parse(ServerConstants.RSDT_DATA_PATH);
-		logInfo(this.getClass(), "Initialized Rare Seed Drop Table from " + ServerConstants.RSDT_DATA_PATH);
+		log(this.getClass(), Log.FINE, "Initialized Rare Seed Drop Table from " + ServerConstants.RSDT_DATA_PATH);
 	}
 
 	/**

Server/src/main/content/data/tables/UncommonSeedDropTable.java

@@ -3,13 +3,13 @@ package content.data.tables;
 import core.api.StartupListener;
 import core.game.node.item.Item;
 import core.game.node.item.WeightedChanceItem;
+import core.tools.Log;
 import core.tools.RandomFunction;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import core.ServerConstants;
-import core.tools.SystemLogger;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -18,7 +18,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import static core.tools.SystemLogger.logInfo;
+import static core.api.ContentAPIKt.log;
 
 /**
  * Handles the uncommon seed drop table.
@@ -57,11 +57,11 @@ public final class UncommonSeedDropTable implements StartupListener {
 	@Override
 	public void startup() {
 		if(ServerConstants.USDT_DATA_PATH != null && !new File(ServerConstants.USDT_DATA_PATH).exists()){
-			SystemLogger.logErr(this.getClass(), "Can't locate USDT file at " + ServerConstants.USDT_DATA_PATH);
+			log(this.getClass(), Log.ERR, "Can't locate USDT file at " + ServerConstants.USDT_DATA_PATH);
 			return;
 		}
 		parse(ServerConstants.USDT_DATA_PATH);
-		logInfo(this.getClass(), "Initialized Uncommon Seed Drop Table from " + ServerConstants.USDT_DATA_PATH);
+		log(this.getClass(), Log.FINE, "Initialized Uncommon Seed Drop Table from " + ServerConstants.USDT_DATA_PATH);
 	}
 
 	/**

Server/src/main/content/global/activity/cchallange/ChampionChallengeListener.kt

@@ -0,0 +1,229 @@
+package content.global.activity.cchallange
+
+import content.global.activity.cchallange.npc.EarthWarriorChampionNPC.Companion.spawnEarthWarriorChampion
+import content.global.activity.cchallange.npc.GhoulChampionNPC.Companion.spawnGhoulChampion
+import content.global.activity.cchallange.npc.GiantChampionNPC.Companion.spawnGiantChampion
+import content.global.activity.cchallange.npc.GoblinChampionNPC.Companion.spawnGoblinChampion
+import content.global.activity.cchallange.npc.HobgoblinChampionNPC.Companion.spawnHobgoblinChampion
+import content.global.activity.cchallange.npc.ImpChampionNPC.Companion.spawnImpChampion
+import content.global.activity.cchallange.npc.JogreChampionNPC.Companion.spawnJogreChampion
+import content.global.activity.cchallange.npc.LesserDemonChampionNPC.Companion.spawnLesserDemonChampion
+import content.global.activity.cchallange.npc.SkeletonChampionNPC.Companion.spawnSkeletonChampion
+import content.global.activity.cchallange.npc.ZombieChampionNPC.Companion.spawnZombieChampion
+import core.api.*
+import core.game.global.action.DoorActionHandler
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.player.Player
+import core.game.node.item.Item
+import core.game.system.task.Pulse
+import core.game.world.map.Location
+import core.game.world.map.zone.ZoneBorders
+import core.game.world.map.zone.ZoneRestriction
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+import org.rs09.consts.Scenery
+
+/**
+ * Represents the Champion challenge.
+ */
+
+class ChampionChallengeListener : InteractionListener, MapArea {
+
+    val EARTH_WARRIOR_SCROLL = Items.CHAMPION_SCROLL_6798
+    val GHOUL_SCROLL = Items.CHAMPION_SCROLL_6799
+    val GIANT_SCROLL = Items.CHAMPION_SCROLL_6800
+    val GOBLIN_SCROLL = Items.CHAMPION_SCROLL_6801
+    val HOBGOBLIN_SCROLL = Items.CHAMPION_SCROLL_6802
+    val IMP_SCROLL = Items.CHAMPION_SCROLL_6803
+    val JOGRE_SCROLL = Items.CHAMPION_SCROLL_6804
+    val LESSER_DEMON_SCROLL = Items.CHAMPION_SCROLL_6805
+    val SKELETON_SCROLL = Items.CHAMPION_SCROLL_6806
+    val ZOMBIE_SCROLL = Items.CHAMPION_SCROLL_6807
+
+    val MESSAGE_SCROLL = 222
+
+    private val IMP_SCROLL_TEXT = arrayOf(
+        "How about picking on someone your own size? I'll",
+        "see you at the Champion's Guild.",
+        "",
+        "Champion of Imps"
+    )
+
+    private val GOBLIN_SCROLL_TEXT = arrayOf(
+        "Fight me if you think you can human, I'll wait",
+        "for you in the Champion's Guild.",
+        "",
+        "Champion of Goblins"
+    )
+
+    private val SKELETON_SCROLL_TEXT = arrayOf(
+        "I'll be waiting at the Champions' Guild to",
+        "collect your bones.",
+        "",
+        "Champion of Skeletons"
+    )
+
+    private val ZOMBIE_SCROLL_TEXT = arrayOf(
+        "You come to Champions' Guild, you fight me,",
+        "I squish you, I get brains!",
+        "",
+        "Champion of Zombies"
+    )
+
+    private val GIANT_SCROLL_TEXT = arrayOf(
+        "Get yourself to the Champions' Guild, if you",
+        "dare to face me puny human.",
+        "",
+        "Champion of Giants"
+    )
+
+    private val HOBGOBLIN_SCROLL_TEXT = arrayOf(
+        "You won't defeat me, though you're welcome to",
+        "try at the Champions' Guild.",
+        "",
+        "Champion of Hobgoblins"
+    )
+
+    private val GHOUL_SCROLL_TEXT = arrayOf(
+        "Come and duel me at the Champions' Guild, I'll",
+        "make sure nothing goes to waste.",
+        "",
+        "Champion of Ghouls"
+    )
+
+    private val EARTH_WARRIOR_TEXT = arrayOf(
+        "I challenge you to a duel, come to the arena beneath",
+        "the Champion's Guild and fight me if you dare.",
+        "",
+        "Champion of Earth Warriors"
+    )
+
+    private val JOGRE_SCROLL_TEXT = arrayOf(
+        "You think you can defeat me? Come to the",
+        "Champion's Guild and prove it!",
+        "",
+        "Champion of Jogres"
+    )
+
+    private val LESSER_DEMON_SCROLL_TEXT = arrayOf(
+        "Come to the Champion's Guild so I can banish",
+        "you mortal!",
+        "",
+        "Champion of Lesser Demons"
+    )
+
+    private val PORTCULLIS = Scenery.PORTCULLIS_10553
+    private val CHAMPION_STATUE_CLOSED = Scenery.CHAMPION_STATUE_10556
+    private val CHAMPION_STATUE_OPEN = Scenery.CHAMPION_STATUE_10557
+    private val TRAPDOOR_CLOSED = Scenery.TRAPDOOR_10558
+    private val TRAPDOOR_OPEN = Scenery.TRAPDOOR_10559
+    private val LARXUS = NPCs.LARXUS_3050
+
+    private val ARENA_ZONE = 12696
+
+    override fun defineListeners() {
+        // Champion's Guild Basement Ladder to Main Floor
+        addClimbDest(Location(3190, 9758, 0), Location(3190, 3356, 0))
+        // Champion Statue Ladder to Arena
+        addClimbDest(Location(3184, 9758, 0), Location(3182, 9758, 0))
+        // Arena Ladder to Champion's Guild Basement
+        addClimbDest(Location(3183, 9758, 0), Location(3185, 9758, 0))
+
+        on(LARXUS, IntType.NPC, "talk-to") { player, _ ->
+            openDialogue(player, LarxusDialogue(false))
+            return@on true
+        }
+
+        on(ChampionScrollsDropHandler.SCROLLS, IntType.ITEM, "read") { player, node ->
+            updateAndReadScroll(player, node.asItem())
+            return@on true
+        }
+
+        onUseWith(IntType.NPC, ChampionScrollsDropHandler.SCROLLS, NPCs.LARXUS_3050) { player, _, _ ->
+            openDialogue(player, LarxusDialogue(true))
+            return@onUseWith true
+        }
+
+        on(TRAPDOOR_CLOSED, IntType.SCENERY, "open") { _, node ->
+            replaceScenery(node.asScenery(), TRAPDOOR_OPEN, 100, node.location)
+            return@on true
+        }
+
+        on(TRAPDOOR_OPEN, IntType.SCENERY, "close") { _, node ->
+            replaceScenery(node.asScenery(), TRAPDOOR_CLOSED, -1, node.location)
+            return@on true
+        }
+
+        on(CHAMPION_STATUE_CLOSED, IntType.SCENERY, "open") { _, node ->
+            replaceScenery(node.asScenery(), CHAMPION_STATUE_OPEN, 100, node.location)
+            return@on true
+        }
+
+        on(PORTCULLIS, IntType.SCENERY, "open") { player, node ->
+            if (player.getAttribute("championsarena:start", false) == false) {
+                sendNPCDialogue(player, NPCs.LARXUS_3050, "You need to arrange a challenge with me before you enter the arena.")
+            } else {
+                lock(player, 3)
+                submitWorldPulse(object : Pulse() {
+                    var counter = 0
+                    override fun pulse(): Boolean {
+                        when (counter++) {
+                            1 -> {
+                                player.familiarManager.dismiss()
+                            }
+                            2 -> DoorActionHandler.handleDoor(player, node.asScenery())
+                            3 -> when{
+                                removeItem(player, IMP_SCROLL) -> spawnImpChampion(player)
+                                removeItem(player, GOBLIN_SCROLL) -> spawnGoblinChampion(player)
+                                removeItem(player, SKELETON_SCROLL) -> spawnSkeletonChampion(player)
+                                removeItem(player, ZOMBIE_SCROLL) -> spawnZombieChampion(player)
+                                removeItem(player, GIANT_SCROLL) -> spawnGiantChampion(player)
+                                removeItem(player, HOBGOBLIN_SCROLL) -> spawnHobgoblinChampion(player)
+                                removeItem(player, GHOUL_SCROLL) -> spawnGhoulChampion(player)
+                                removeItem(player, EARTH_WARRIOR_SCROLL) -> {
+                                    spawnEarthWarriorChampion(player)
+                                    player.prayer.reset()
+                                }
+                                removeItem(player, JOGRE_SCROLL) -> spawnJogreChampion(player)
+                                removeItem(player, LESSER_DEMON_SCROLL) -> spawnLesserDemonChampion(player)
+                            }
+                        }
+                        return false
+                    }
+                })
+            }
+            return@on true
+        }
+    }
+
+    private fun updateAndReadScroll(player: Player, item: Item) {
+        val id = item.id
+        openInterface(player, MESSAGE_SCROLL).also {
+            when (id) {
+                IMP_SCROLL -> setInterfaceText(player, IMP_SCROLL_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+                GOBLIN_SCROLL -> setInterfaceText(player, GOBLIN_SCROLL_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+                SKELETON_SCROLL -> setInterfaceText(player, SKELETON_SCROLL_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+                ZOMBIE_SCROLL -> setInterfaceText(player, ZOMBIE_SCROLL_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+                GIANT_SCROLL -> setInterfaceText(player, GIANT_SCROLL_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+                HOBGOBLIN_SCROLL -> setInterfaceText(player, HOBGOBLIN_SCROLL_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+                GHOUL_SCROLL -> setInterfaceText(player, GHOUL_SCROLL_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+                EARTH_WARRIOR_SCROLL -> setInterfaceText(player, EARTH_WARRIOR_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+                JOGRE_SCROLL -> setInterfaceText(player, JOGRE_SCROLL_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+                LESSER_DEMON_SCROLL -> setInterfaceText(player, LESSER_DEMON_SCROLL_TEXT.joinToString("<br>"), MESSAGE_SCROLL, 4)
+            }
+        }
+    }
+
+    override fun defineAreaBorders(): Array<ZoneBorders> {
+        return arrayOf(getRegionBorders(ARENA_ZONE))
+    }
+
+    override fun getRestrictions(): Array<ZoneRestriction> {
+        return arrayOf(
+            ZoneRestriction.CANNON,
+            ZoneRestriction.FIRES,
+            ZoneRestriction.RANDOM_EVENTS
+        )
+    }
+}

Server/src/main/content/global/activity/cchallange/ChampionScrollsDropHandler.kt

@@ -0,0 +1,279 @@
+package content.global.activity.cchallange
+
+import core.api.sendMessage
+import core.api.sendNews
+import core.game.event.NPCKillEvent
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.node.item.GroundItemManager
+import core.game.node.item.Item
+import core.tools.*
+import core.game.world.GameWorld
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Handles the drop for champion challenge.
+ * @authors Phil, Skelsoft, Ceikry
+ */
+
+class ChampionScrollsDropHandler : ChampionScrollsEventHookBase() {
+    companion object {
+
+        private val IMPS = intArrayOf(
+            NPCs.IMP_708, NPCs.IMP_709, NPCs.IMP_1531, NPCs.IMP_6211
+        )
+
+        private val GOBLINS = intArrayOf(
+            NPCs.GOBLIN_100, NPCs.GOBLIN_101, NPCs.GOBLIN_102, NPCs.GOBLIN_444, NPCs.GOBLIN_445,
+
+            NPCs.GOBLIN_1769, NPCs.GOBLIN_1770, NPCs.GOBLIN_1771, NPCs.GOBLIN_1772, NPCs.GOBLIN_1773,
+            NPCs.GOBLIN_1774, NPCs.GOBLIN_1775, NPCs.GOBLIN_1776, NPCs.GOBLIN_2274, NPCs.GOBLIN_2275,
+            NPCs.GOBLIN_2276, NPCs.GOBLIN_2277, NPCs.GOBLIN_2278, NPCs.GOBLIN_2279, NPCs.GOBLIN_2280,
+            NPCs.GOBLIN_2281, NPCs.GOBLIN_2678, NPCs.GOBLIN_2679, NPCs.GOBLIN_2680, NPCs.GOBLIN_2681,
+            NPCs.GOBLIN_3264, NPCs.GOBLIN_3265, NPCs.GOBLIN_3266, NPCs.GOBLIN_3267, NPCs.GOBLIN_3726,
+            NPCs.GOBLIN_4261, NPCs.GOBLIN_4262, NPCs.GOBLIN_4263, NPCs.GOBLIN_4264, NPCs.GOBLIN_4265,
+            NPCs.GOBLIN_4266, NPCs.GOBLIN_4267, NPCs.GOBLIN_4268, NPCs.GOBLIN_4269, NPCs.GOBLIN_4270,
+            NPCs.GOBLIN_4271, NPCs.GOBLIN_4272, NPCs.GOBLIN_4273, NPCs.GOBLIN_4274, NPCs.GOBLIN_4275,
+            NPCs.GOBLIN_4276, NPCs.GOBLIN_4407, NPCs.GOBLIN_4408, NPCs.GOBLIN_4409, NPCs.GOBLIN_4410,
+            NPCs.GOBLIN_4411, NPCs.GOBLIN_4412, NPCs.GOBLIN_4479, NPCs.GOBLIN_4480, NPCs.GOBLIN_4481,
+            NPCs.GOBLIN_4482, NPCs.GOBLIN_4483, NPCs.GOBLIN_4484, NPCs.GOBLIN_4485, NPCs.GOBLIN_4486,
+            NPCs.GOBLIN_4487, NPCs.GOBLIN_4488, NPCs.GOBLIN_4489, NPCs.GOBLIN_4490, NPCs.GOBLIN_4491,
+            NPCs.GOBLIN_4492, NPCs.GOBLIN_4499, NPCs.GOBLIN_4633, NPCs.GOBLIN_4634, NPCs.GOBLIN_4635,
+            NPCs.GOBLIN_4636, NPCs.GOBLIN_4637, NPCs.GOBLIN_5855, NPCs.GOBLIN_5856, NPCs.GOBLIN_6125,
+            NPCs.GOBLIN_6126, NPCs.GOBLIN_6132, NPCs.GOBLIN_6133, NPCs.GOBLIN_6279, NPCs.GOBLIN_6280,
+            NPCs.GOBLIN_6281, NPCs.GOBLIN_6282, NPCs.GOBLIN_6283, NPCs.GOBLIN_6284, NPCs.GOBLIN_6402,
+            NPCs.GOBLIN_6403, NPCs.GOBLIN_6404, NPCs.GOBLIN_6405, NPCs.GOBLIN_6406, NPCs.GOBLIN_6407,
+            NPCs.GOBLIN_6408, NPCs.GOBLIN_6409, NPCs.GOBLIN_6410, NPCs.GOBLIN_6411, NPCs.GOBLIN_6412,
+            NPCs.GOBLIN_6413, NPCs.GOBLIN_6414, NPCs.GOBLIN_6415, NPCs.GOBLIN_6416, NPCs.GOBLIN_6417,
+            NPCs.GOBLIN_6418, NPCs.GOBLIN_6419, NPCs.GOBLIN_6420, NPCs.GOBLIN_6421, NPCs.GOBLIN_6422,
+            NPCs.GOBLIN_6423, NPCs.GOBLIN_6424, NPCs.GOBLIN_6425, NPCs.GOBLIN_6426, NPCs.GOBLIN_6427,
+            NPCs.GOBLIN_6428, NPCs.GOBLIN_6429, NPCs.GOBLIN_6430, NPCs.GOBLIN_6431, NPCs.GOBLIN_6432,
+            NPCs.GOBLIN_6433, NPCs.GOBLIN_6434, NPCs.GOBLIN_6435, NPCs.GOBLIN_6436, NPCs.GOBLIN_6437,
+            NPCs.GOBLIN_6438, NPCs.GOBLIN_6439, NPCs.GOBLIN_6440, NPCs.GOBLIN_6441, NPCs.GOBLIN_6442,
+            NPCs.GOBLIN_6443, NPCs.GOBLIN_6444, NPCs.GOBLIN_6445, NPCs.GOBLIN_6446, NPCs.GOBLIN_6447,
+            NPCs.GOBLIN_6448, NPCs.GOBLIN_6449, NPCs.GOBLIN_6450, NPCs.GOBLIN_6451, NPCs.GOBLIN_6452,
+            NPCs.GOBLIN_6453, NPCs.GOBLIN_6454, NPCs.GOBLIN_6455, NPCs.GOBLIN_6456, NPCs.GOBLIN_6457,
+            NPCs.GOBLIN_6458, NPCs.GOBLIN_6459, NPCs.GOBLIN_6460, NPCs.GOBLIN_6461, NPCs.GOBLIN_6462,
+            NPCs.GOBLIN_6463, NPCs.GOBLIN_6464, NPCs.GOBLIN_6465, NPCs.GOBLIN_6466, NPCs.GOBLIN_6467,
+            NPCs.GOBLIN_6490, NPCs.GOBLIN_6491, NPCs.GOBLIN_6492, NPCs.GOBLIN_6493, NPCs.GOBLIN_6494,
+            NPCs.GOBLIN_6495, NPCs.GOBLIN_7964, NPCs.GOBLIN_7965,
+
+            NPCs.CAVE_GOBLIN_1822, NPCs.CAVE_GOBLIN_1823, NPCs.CAVE_GOBLIN_1824, NPCs.CAVE_GOBLIN_1825,
+            NPCs.CAVE_GOBLIN_5752, NPCs.CAVE_GOBLIN_5753, NPCs.CAVE_GOBLIN_5754, NPCs.CAVE_GOBLIN_5755,
+            NPCs.CAVE_GOBLIN_5756, NPCs.CAVE_GOBLIN_5757, NPCs.CAVE_GOBLIN_5758, NPCs.CAVE_GOBLIN_5759,
+            NPCs.CAVE_GOBLIN_5760, NPCs.CAVE_GOBLIN_5761, NPCs.CAVE_GOBLIN_5762, NPCs.CAVE_GOBLIN_5763,
+            NPCs.CAVE_GOBLIN_5764, NPCs.CAVE_GOBLIN_5765, NPCs.CAVE_GOBLIN_5766, NPCs.CAVE_GOBLIN_5767,
+            NPCs.CAVE_GOBLIN_5768, NPCs.CAVE_GOBLIN_5769, NPCs.CAVE_GOBLIN_5783, NPCs.CAVE_GOBLIN_5785,
+            NPCs.CAVE_GOBLIN_5873, NPCs.CAVE_GOBLIN_5874, NPCs.CAVE_GOBLIN_5875, NPCs.CAVE_GOBLIN_5876,
+            NPCs.CAVE_GOBLIN_5877, NPCs.CAVE_GOBLIN_5878, NPCs.CAVE_GOBLIN_8451,
+
+            NPCs.CAVE_GOBLIN_GUARD_2073, NPCs.CAVE_GOBLIN_GUARD_2074,
+
+            NPCs.GOBLIN_GUARD_489, NPCs.GOBLIN_GUARD_6496, NPCs.GOBLIN_GUARD_6497,
+            NPCs.SERGEANT_GRIMSPIKE_6265,
+            NPCs.SERGEANT_STEELWILL_6263,
+            NPCs.SERGEANT_STRONGSTACK_6261
+        )
+
+        private val SKELETONS = intArrayOf(
+            NPCs.SKELETON_90, NPCs.SKELETON_91, NPCs.SKELETON_92, NPCs.SKELETON_93,
+
+            NPCs.SKELETON_459,
+
+            NPCs.SKELETON_1471, NPCs.SKELETON_2036, NPCs.SKELETON_2037, NPCs.SKELETON_2715,
+            NPCs.SKELETON_3151, NPCs.SKELETON_3152, NPCs.SKELETON_3291, NPCs.SKELETON_3581,
+            NPCs.SKELETON_4384, NPCs.SKELETON_4385, NPCs.SKELETON_4386, NPCs.SKELETON_5332,
+            NPCs.SKELETON_5333, NPCs.SKELETON_5334, NPCs.SKELETON_5335, NPCs.SKELETON_5336,
+            NPCs.SKELETON_5337, NPCs.SKELETON_5338, NPCs.SKELETON_5339, NPCs.SKELETON_5340,
+            NPCs.SKELETON_5341, NPCs.SKELETON_5365, NPCs.SKELETON_5366, NPCs.SKELETON_5367,
+            NPCs.SKELETON_5368, NPCs.SKELETON_5381, NPCs.SKELETON_5385, NPCs.SKELETON_5386,
+            NPCs.SKELETON_5387, NPCs.SKELETON_5388, NPCs.SKELETON_5389, NPCs.SKELETON_5390,
+            NPCs.SKELETON_5391, NPCs.SKELETON_5392, NPCs.SKELETON_5411, NPCs.SKELETON_5412,
+            NPCs.SKELETON_5422, NPCs.SKELETON_5423, NPCs.SKELETON_6091, NPCs.SKELETON_6092,
+            NPCs.SKELETON_6093, NPCs.SKELETON_6764, NPCs.SKELETON_6765, NPCs.SKELETON_6766,
+            NPCs.SKELETON_6767, NPCs.SKELETON_6768, NPCs.SKELETON_7774, NPCs.SKELETON_7775,
+            NPCs.SKELETON_7776, NPCs.SKELETON_7777, NPCs.SKELETON_7778, NPCs.SKELETON_7779,
+            NPCs.SKELETON_7788, NPCs.SKELETON_7815, NPCs.GIANT_SKELETON_1973,
+
+            NPCs.GIANT_SKELETON_5359, NPCs.GIANT_SKELETON_5384, NPCs.SKELETON_HELLHOUND_1575,
+
+            NPCs.SKELETON_MAGE_94, NPCs.SKELETON_MAGE_2717, NPCs.SKELETON_MAGE_3844,
+
+            NPCs.SKELETON_MAGE_3850, NPCs.SKELETON_MAGE_3851,
+
+            NPCs.SKELETON_HERO_6103, NPCs.SKELETON_BRUTE_6104, NPCs.SKELETON_WARLORD_6105,
+
+            NPCs.SKELETON_HEAVY_6106, NPCs.SKELETON_THUG_6107,
+            NPCs.NAZASTAROOL_508,
+
+            NPCs.UNDEAD_ONE_5353, NPCs.UNDEAD_ONE_5354, NPCs.UNDEAD_ONE_5355,
+            NPCs.UNDEAD_ONE_5356, NPCs.UNDEAD_ONE_5357, NPCs.UNDEAD_ONE_5358,
+        )
+
+        private val ZOMBIES = intArrayOf(
+            NPCs.ZOMBIE_73, NPCs.ZOMBIE_74, NPCs.ZOMBIE_75, NPCs.ZOMBIE_76, NPCs.ZOMBIE_419,
+            NPCs.ZOMBIE_420, NPCs.ZOMBIE_421, NPCs.ZOMBIE_422, NPCs.ZOMBIE_423, NPCs.ZOMBIE_424,
+
+            NPCs.ZOMBIE_1826, NPCs.ZOMBIE_2714, NPCs.ZOMBIE_2863, NPCs.ZOMBIE_2866, NPCs.ZOMBIE_2869,
+            NPCs.ZOMBIE_2878, NPCs.ZOMBIE_3622, NPCs.ZOMBIE_3623, NPCs.ZOMBIE_4392, NPCs.ZOMBIE_4393,
+            NPCs.ZOMBIE_4394, NPCs.ZOMBIE_5293, NPCs.ZOMBIE_5294, NPCs.ZOMBIE_5295, NPCs.ZOMBIE_5296,
+            NPCs.ZOMBIE_5297, NPCs.ZOMBIE_5298, NPCs.ZOMBIE_5299, NPCs.ZOMBIE_5300, NPCs.ZOMBIE_5301,
+            NPCs.ZOMBIE_5302, NPCs.ZOMBIE_5303, NPCs.ZOMBIE_5304, NPCs.ZOMBIE_5305, NPCs.ZOMBIE_5306,
+            NPCs.ZOMBIE_5307, NPCs.ZOMBIE_5308, NPCs.ZOMBIE_5309, NPCs.ZOMBIE_5310, NPCs.ZOMBIE_5311,
+            NPCs.ZOMBIE_5312, NPCs.ZOMBIE_5313, NPCs.ZOMBIE_5314, NPCs.ZOMBIE_5315, NPCs.ZOMBIE_5316,
+            NPCs.ZOMBIE_5317, NPCs.ZOMBIE_5318, NPCs.ZOMBIE_5319, NPCs.ZOMBIE_5320, NPCs.ZOMBIE_5321,
+            NPCs.ZOMBIE_5322, NPCs.ZOMBIE_5323, NPCs.ZOMBIE_5324, NPCs.ZOMBIE_5325, NPCs.ZOMBIE_5326,
+            NPCs.ZOMBIE_5327, NPCs.ZOMBIE_5328, NPCs.ZOMBIE_5329, NPCs.ZOMBIE_5330, NPCs.ZOMBIE_5331,
+            NPCs.ZOMBIE_5375, NPCs.ZOMBIE_5376, NPCs.ZOMBIE_5377, NPCs.ZOMBIE_5378, NPCs.ZOMBIE_5379,
+            NPCs.ZOMBIE_5380, NPCs.ZOMBIE_5393, NPCs.ZOMBIE_5394, NPCs.ZOMBIE_5395, NPCs.ZOMBIE_5396,
+            NPCs.ZOMBIE_5397, NPCs.ZOMBIE_5398, NPCs.ZOMBIE_5399, NPCs.ZOMBIE_5400, NPCs.ZOMBIE_5401,
+            NPCs.ZOMBIE_5402, NPCs.ZOMBIE_5403, NPCs.ZOMBIE_5404, NPCs.ZOMBIE_5405, NPCs.ZOMBIE_5406,
+            NPCs.ZOMBIE_5407, NPCs.ZOMBIE_5408, NPCs.ZOMBIE_5409, NPCs.ZOMBIE_5410, NPCs.ZOMBIE_6099,
+            NPCs.ZOMBIE_6100, NPCs.ZOMBIE_6131, NPCs.ZOMBIE_7789, NPCs.ZOMBIE_7790, NPCs.ZOMBIE_7791,
+            NPCs.ZOMBIE_7792, NPCs.ZOMBIE_7817, NPCs.ZOMBIE_7818, NPCs.ZOMBIE_7819, NPCs.ZOMBIE_7820,
+            NPCs.ZOMBIE_8142, NPCs.ZOMBIE_8143, NPCs.ZOMBIE_8144, NPCs.ZOMBIE_8145,
+
+            NPCs.ZOMBIE_PIRATE_2837, NPCs.ZOMBIE_PIRATE_2838, NPCs.ZOMBIE_PIRATE_2839,
+            NPCs.ZOMBIE_PIRATE_2840, NPCs.ZOMBIE_PIRATE_2841, NPCs.ZOMBIE_PIRATE_2842,
+            NPCs.ZOMBIE_PIRATE_5629, NPCs.ZOMBIE_PIRATE_5630, NPCs.ZOMBIE_PIRATE_5631,
+            NPCs.ZOMBIE_PIRATE_5632, NPCs.ZOMBIE_PIRATE_5633, NPCs.ZOMBIE_PIRATE_5634,
+            NPCs.ZOMBIE_PIRATE_5635, NPCs.ZOMBIE_PIRATE_5636, NPCs.ZOMBIE_PIRATE_5637,
+            NPCs.ZOMBIE_PIRATE_5638, NPCs.ZOMBIE_PIRATE_5639, NPCs.ZOMBIE_PIRATE_5640,
+            NPCs.ZOMBIE_PIRATE_5641, NPCs.ZOMBIE_PIRATE_5642, NPCs.ZOMBIE_PIRATE_5643,
+            NPCs.ZOMBIE_PIRATE_5644, NPCs.ZOMBIE_PIRATE_5645, NPCs.ZOMBIE_PIRATE_5646,
+            NPCs.ZOMBIE_PIRATE_5647, NPCs.ZOMBIE_PIRATE_5648, NPCs.ZOMBIE_PIRATE_5649,
+            NPCs.ZOMBIE_PIRATE_5650, NPCs.ZOMBIE_PIRATE_5651, NPCs.ZOMBIE_PIRATE_5652,
+            NPCs.ZOMBIE_PIRATE_5653, NPCs.ZOMBIE_PIRATE_5654, NPCs.ZOMBIE_PIRATE_5655,
+            NPCs.ZOMBIE_PIRATE_5656, NPCs.ZOMBIE_PIRATE_5657, NPCs.ZOMBIE_PIRATE_5658,
+            NPCs.ZOMBIE_PIRATE_5659, NPCs.ZOMBIE_PIRATE_5660, NPCs.ZOMBIE_PIRATE_5661,
+            NPCs.ZOMBIE_PIRATE_5662, NPCs.ZOMBIE_PIRATE_5663, NPCs.ZOMBIE_PIRATE_5664,
+            NPCs.ZOMBIE_PIRATE_5665,
+
+            NPCs.ZOMBIE_SWAB_2843, NPCs.ZOMBIE_SWAB_2845,
+            NPCs.ZOMBIE_SWAB_2846, NPCs.ZOMBIE_SWAB_2847,
+            NPCs.ZOMBIE_SWAB_2848,
+            NPCs.NAZASTAROOL_507,
+
+            NPCs.SLASH_BASH_2060, NPCs.SOREBONES_5627, NPCs.SOREBONES_5628,
+
+            NPCs.UNDEAD_LUMBERJACK_1524,
+
+            NPCs.UNDEAD_ONE_502, NPCs.UNDEAD_ONE_503, NPCs.UNDEAD_ONE_504, NPCs.UNDEAD_ONE_505,
+
+            NPCs.ZOGRE_2044, NPCs.ZOGRE_2045, NPCs.ZOGRE_2046, NPCs.ZOGRE_2047, NPCs.ZOGRE_2048,
+            NPCs.ZOGRE_2049, NPCs.ZOGRE_2051, NPCs.ZOGRE_2052, NPCs.ZOGRE_2053, NPCs.ZOGRE_2054,
+            NPCs.ZOGRE_2055,
+            NPCs.UNDEAD_LUMBERJACK_1524, NPCs.UNDEAD_LUMBERJACK_1525, NPCs.UNDEAD_LUMBERJACK_5678,
+            NPCs.UNDEAD_LUMBERJACK_5679, NPCs.UNDEAD_LUMBERJACK_5680, NPCs.UNDEAD_LUMBERJACK_5681,
+            NPCs.UNDEAD_LUMBERJACK_5682, NPCs.UNDEAD_LUMBERJACK_5683, NPCs.UNDEAD_LUMBERJACK_5684,
+            NPCs.UNDEAD_LUMBERJACK_5685, NPCs.UNDEAD_LUMBERJACK_5686, NPCs.UNDEAD_LUMBERJACK_5687,
+            NPCs.UNDEAD_LUMBERJACK_5688, NPCs.UNDEAD_LUMBERJACK_5689, NPCs.UNDEAD_LUMBERJACK_5690,
+            NPCs.UNDEAD_LUMBERJACK_5691, NPCs.UNDEAD_LUMBERJACK_5692, NPCs.UNDEAD_LUMBERJACK_5693,
+            NPCs.UNDEAD_LUMBERJACK_5694, NPCs.UNDEAD_LUMBERJACK_5695, NPCs.UNDEAD_LUMBERJACK_5696,
+            NPCs.UNDEAD_LUMBERJACK_5697, NPCs.UNDEAD_LUMBERJACK_5698, NPCs.UNDEAD_LUMBERJACK_5699,
+            NPCs.UNDEAD_LUMBERJACK_5700, NPCs.UNDEAD_LUMBERJACK_5701, NPCs.UNDEAD_LUMBERJACK_5702,
+            NPCs.UNDEAD_LUMBERJACK_5703, NPCs.UNDEAD_LUMBERJACK_5704, NPCs.UNDEAD_LUMBERJACK_5705,
+            NPCs.UNDEAD_LUMBERJACK_5706, NPCs.UNDEAD_LUMBERJACK_5707, NPCs.UNDEAD_LUMBERJACK_5708,
+            NPCs.UNDEAD_LUMBERJACK_5709, NPCs.UNDEAD_LUMBERJACK_5710, NPCs.UNDEAD_LUMBERJACK_5711,
+            NPCs.UNDEAD_LUMBERJACK_5712, NPCs.UNDEAD_LUMBERJACK_5713, NPCs.UNDEAD_LUMBERJACK_5714,
+            NPCs.UNDEAD_LUMBERJACK_5715, NPCs.UNDEAD_LUMBERJACK_5716, NPCs.UNDEAD_LUMBERJACK_5717,
+            NPCs.UNDEAD_LUMBERJACK_5718, NPCs.UNDEAD_LUMBERJACK_5719, NPCs.UNDEAD_LUMBERJACK_5720,
+            NPCs.UNDEAD_LUMBERJACK_5721, NPCs.UNDEAD_LUMBERJACK_5722, NPCs.UNDEAD_LUMBERJACK_5723,
+            NPCs.UNDEAD_LUMBERJACK_5724, NPCs.UNDEAD_LUMBERJACK_5725, NPCs.UNDEAD_LUMBERJACK_5726,
+            NPCs.UNDEAD_LUMBERJACK_5727, NPCs.UNDEAD_LUMBERJACK_5728, NPCs.UNDEAD_LUMBERJACK_5729,
+            NPCs.UNDEAD_LUMBERJACK_5730, NPCs.UNDEAD_LUMBERJACK_5731, NPCs.UNDEAD_LUMBERJACK_5732,
+            NPCs.UNDEAD_LUMBERJACK_5733, NPCs.UNDEAD_LUMBERJACK_5734, NPCs.UNDEAD_LUMBERJACK_5735,
+            NPCs.UNDEAD_LUMBERJACK_5736, NPCs.UNDEAD_LUMBERJACK_5737, NPCs.UNDEAD_LUMBERJACK_5738,
+            NPCs.UNDEAD_LUMBERJACK_5739, NPCs.UNDEAD_LUMBERJACK_5740, NPCs.UNDEAD_LUMBERJACK_5741,
+            NPCs.UNDEAD_LUMBERJACK_5742, NPCs.UNDEAD_LUMBERJACK_5743, NPCs.UNDEAD_LUMBERJACK_5744,
+            NPCs.UNDEAD_LUMBERJACK_5745, NPCs.UNDEAD_LUMBERJACK_5746, NPCs.UNDEAD_LUMBERJACK_5747,
+        )
+
+        private val GIANTS = intArrayOf(
+            NPCs.HILL_GIANT_117, NPCs.HILL_GIANT_4689, NPCs.HILL_GIANT_4690, NPCs.HILL_GIANT_4691,
+            NPCs.HILL_GIANT_4692, NPCs.HILL_GIANT_4693,
+
+            NPCs.FIRE_GIANT_110, NPCs.FIRE_GIANT_1582, NPCs.FIRE_GIANT_1583, NPCs.FIRE_GIANT_1584,
+            NPCs.FIRE_GIANT_1585, NPCs.FIRE_GIANT_1586, NPCs.FIRE_GIANT_7003, NPCs.FIRE_GIANT_7004,
+
+            NPCs.MOSS_GIANT_112, NPCs.MOSS_GIANT_1587, NPCs.MOSS_GIANT_1588, NPCs.MOSS_GIANT_1681,
+            NPCs.MOSS_GIANT_4534, NPCs.MOSS_GIANT_4688, NPCs.MOSS_GIANT_4706,
+
+            NPCs.ICE_GIANT_111, NPCs.ICE_GIANT_3072, NPCs.ICE_GIANT_4685, NPCs.ICE_GIANT_4686,
+            NPCs.ICE_GIANT_4687,
+            NPCs.BLACK_KNIGHT_TITAN_221,
+
+            NPCs.CYCLOPS_116, NPCs.CYCLOPS_4291, NPCs.CYCLOPS_4292, NPCs.CYCLOPS_6078,
+            NPCs.CYCLOPS_6079, NPCs.CYCLOPS_6080, NPCs.CYCLOPS_6081, NPCs.CYCLOPS_6082,
+            NPCs.CYCLOPS_6083, NPCs.CYCLOPS_6269, NPCs.CYCLOPS_6270,
+        )
+
+        private val HOBGOBLINS = intArrayOf(
+            NPCs.HOBGOBLIN_122, NPCs.HOBGOBLIN_123, NPCs.HOBGOBLIN_2685, NPCs.HOBGOBLIN_2686,
+            NPCs.HOBGOBLIN_2687, NPCs.HOBGOBLIN_2688, NPCs.HOBGOBLIN_3583, NPCs.HOBGOBLIN_4898,
+            NPCs.HOBGOBLIN_6275,
+        )
+
+        private val GHOUL = NPCs.GHOUL_1218
+        private val EARTH_WARRIOR = NPCs.EARTH_WARRIOR_124
+
+        private val JOGRES = intArrayOf(NPCs.JOGRE_113, NPCs.JOGRE_6268)
+
+        private val LESSER_DEMONS = intArrayOf(
+            NPCs.LESSER_DEMON_82, NPCs.LESSER_DEMON_4694, NPCs.LESSER_DEMON_4695,
+            NPCs.LESSER_DEMON_4696, NPCs.LESSER_DEMON_4697, NPCs.LESSER_DEMON_6101,
+        )
+
+        private val ZAKLN = NPCs.ZAKLN_GRITCH_6206
+
+        val SCROLLS = intArrayOf(
+            Items.CHAMPION_SCROLL_6803, Items.CHAMPION_SCROLL_6801, Items.CHAMPION_SCROLL_6806,
+            Items.CHAMPION_SCROLL_6807, Items.CHAMPION_SCROLL_6800, Items.CHAMPION_SCROLL_6802,
+            Items.CHAMPION_SCROLL_6799, Items.CHAMPION_SCROLL_6798, Items.CHAMPION_SCROLL_6804,
+            Items.CHAMPION_SCROLL_6805
+        )
+
+        val idMap = HashMap<Int, Int>()
+
+        init {
+            for (id in IMPS)
+                idMap[id] = 0
+            for (id in GOBLINS)
+                idMap[id] = 1
+            for (id in SKELETONS)
+                idMap[id] = 2
+            for (id in ZOMBIES)
+                idMap[id] = 3
+            for (id in GIANTS)
+                idMap[id] = 4
+            for (id in HOBGOBLINS)
+                idMap[id] = 5
+            for (id in JOGRES)
+                idMap[id] = 8
+            for (id in LESSER_DEMONS)
+                idMap[id] = 9
+
+            idMap[GHOUL] = 6
+            idMap[EARTH_WARRIOR] = 7
+        }
+    }
+
+    override fun onNpcKilled(player: Player, event: NPCKillEvent) {
+        if (player.isArtificial) return
+        if (player.questRepository.points >= 32) {
+            val scrollType = idMap[event.npc.id] ?: return
+            rollForScroll (player, scrollType, event.npc)
+        }
+    }
+
+    private fun rollForScroll(player: Player, scroll: Int, npc: NPC) {
+        val scrollID = SCROLLS[scroll]
+        val roll = RandomFunction.roll(if (GameWorld.settings!!.isDevMode) 5 else 5000)
+        if (roll) {
+            GroundItemManager.create(Item(scrollID), npc.location, player)
+            sendMessage(player, colorize("%RA Champion's scroll falls to the ground as you slay your opponent."))
+        }
+    }
+
+}

Server/src/main/content/global/activity/cchallange/ChampionScrollsEventHookBase.kt

@@ -0,0 +1,39 @@
+package content.global.activity.cchallange
+
+import core.api.LoginListener
+import core.game.event.Event
+import core.game.event.EventHook
+import core.game.event.NPCKillEvent
+import core.game.node.entity.Entity
+import core.game.node.entity.player.Player
+
+/**
+ * Manages the champion scrolls drop.
+ * @authors Phil, Skelsoft.
+ */
+
+abstract class ChampionScrollsEventHookBase : LoginListener {
+
+    protected companion object {
+        private fun <T> forEligibleEntityDo(entity: Entity, event: T, handler: (Player, T) -> Unit) {
+            if (entity !is Player) return
+            if (entity.isArtificial) return
+            handler(entity, event)
+        }
+    }
+
+    class EventHandler<T : Event>(
+        private val owner: ChampionScrollsEventHookBase,
+        private val handler: (Player, T) -> Unit) : EventHook<T> {
+        override fun process(entity: Entity, event: T) {
+            forEligibleEntityDo(entity, event, handler)
+        }
+    }
+
+    final override fun login(player: Player) {
+        player.hook(core.api.Event.NPCKilled, EventHandler(this, ::onNpcKilled))
+    }
+
+    protected open fun onNpcKilled(player: Player, event: NPCKillEvent) {}
+
+}

Server/src/main/content/global/activity/cchallange/LarxusDialogue.kt

@@ -0,0 +1,72 @@
+package content.global.activity.cchallange
+
+import core.api.*
+import core.game.dialogue.DialogueFile
+import core.game.dialogue.FacialExpression
+import core.game.node.entity.npc.NPC
+import core.plugin.Initializable
+import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the dialogue plugin used for the larxus npc.
+ * @author 'Vexia
+ * @version 1.1
+ */
+
+@Initializable
+class LarxusDialogue(val ChallengeStart: Boolean = false) : DialogueFile() {
+
+    override fun handle(componentID: Int, buttonID: Int) {
+        val scrolls = intArrayOf(Items.CHAMPION_SCROLL_6798, Items.CHAMPION_SCROLL_6799, Items.CHAMPION_SCROLL_6800, Items.CHAMPION_SCROLL_6801, Items.CHAMPION_SCROLL_6802, Items.CHAMPION_SCROLL_6803, Items.CHAMPION_SCROLL_6804, Items.CHAMPION_SCROLL_6805, Items.CHAMPION_SCROLL_6806, Items.CHAMPION_SCROLL_6807,)
+        npc = NPC(NPCs.LARXUS_3050)
+        if (ChallengeStart) {
+            when (stage) {
+                0 -> {
+                    face(findNPC(NPCs.LARXUS_3050)!!, player!!, 1)
+                    for (i in scrolls)when{
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6798) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use prayer's. Do you still want to proceed?").also { stage = 1 }
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6799) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only weapons. Do you still want to proceed?").also { stage = 1 }
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6800) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only melee combat skill. Do you still want to proceed?").also { stage = 1 }
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6801) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only magic skill. Do you still want to proceed?").also { stage = 1 }
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6802) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use melee combat skills. Do you still want to proceed?").also { stage = 1 }
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6803) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use weapons with special attack. Do you still want to proceed?").also { stage = 1 }
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6804) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use ranged skill. Do you still want to proceed?").also { stage = 1 }
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6805) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only equipment. Do you still want to proceed?").also { stage = 1 }
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6806) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only ranged skill. Do you still want to proceed?").also { stage = 1 }
+                        inInventory(player!!,Items.CHAMPION_SCROLL_6807) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use magic skill. Do you still want to proceed?").also { stage = 1 }
+                        else -> {
+                                sendMessage(player!!, "Nothing interesting happens.").also { stage = END_DIALOGUE } }
+                    }
+                }
+                1 -> options("Yes, let me at him!", "No, thanks I'll pass.").also { stage = 2 }
+                2 -> when (buttonID) {
+                    1 -> playerl("Yes, let me at him!").also { stage = 3 }
+                    2 -> playerl("No, thanks I'll pass.").also { stage = END_DIALOGUE }
+                }
+                3 -> npcl("Your challenger is ready, please go down through the trapdoor when you're ready.").also { stage = 4 }
+                4 -> {
+                    end()
+                    setAttribute(player!!, "championsarena:start", true)
+                }
+            }
+        } else {
+            when (stage) {
+                START_DIALOGUE -> {
+                    face(findNPC(NPCs.LARXUS_3050)!!, player!!, 1)
+                    npcl(FacialExpression.NEUTRAL, "Is there something I can help you with?").also { stage = 1 }
+                }
+                1 -> options("I was given a challenge, what now?", "What is this place?", "Nothing thanks.").also { stage = 2 }
+                2 -> when (buttonID) {
+                    1 -> playerl("I was given a challenge, what now?").also { stage = 3 }
+                    2 -> playerl("What is this place?").also { stage = 4 }
+                    3 -> playerl("Nothing thanks.").also { stage = END_DIALOGUE }
+                }
+                3 -> npcl("Well pass it here and we'll get you started.").also { stage = END_DIALOGUE }
+                4 -> npcl("This is the champions' arena, the champions of various, races use it to duel those they deem worthy of the, honour.").also { stage = END_DIALOGUE }
+            }
+        }
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/EarthWarriorChampionNPC.kt

@@ -0,0 +1,114 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Earth warrior champion NPC for Champions challenge.
+ */
+
+@Initializable
+class EarthWarriorChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return EarthWarriorChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.EARTH_WARRIOR_CHAMPION_3057)
+    }
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnEarthWarriorChampion(player: Player) {
+            val champion = EarthWarriorChampionNPC(NPCs.EARTH_WARRIOR_CHAMPION_3057)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    val prayerItems = intArrayOf(
+                        Items.PRAYER_POTION1_143, Items.PRAYER_POTION1_144,
+                        Items.PRAYER_POTION2_141, Items.PRAYER_POTION2_142,
+                        Items.PRAYER_POTION3_139, Items.PRAYER_POTION3_140,
+                        Items.PRAYER_POTION4_2434, Items.PRAYER_POTION4_2435,
+
+                        Items.SUPER_RESTORE1_3030, Items.SUPER_RESTORE1_3031,
+                        Items.SUPER_RESTORE2_3028, Items.SUPER_RESTORE2_3029,
+                        Items.SUPER_RESTORE3_3026, Items.SUPER_RESTORE3_3027,
+                        Items.SUPER_RESTORE4_3024, Items.SUPER_RESTORE4_3025,
+
+                        Items.PRAYER_CAPE_9759, Items.PRAYER_CAPET_9760,
+                        Items.PRAYER_HOOD_9761, Items.PRAYER_CAPE_10643,
+
+                        Items.PRAYER_POTION4_14209, Items.PRAYER_POTION4_14210,
+                        Items.PRAYER_POTION3_14211, Items.PRAYER_POTION3_14212,
+                        Items.PRAYER_POTION2_14213, Items.PRAYER_POTION2_14214,
+                        Items.PRAYER_POTION1_14215, Items.PRAYER_POTION1_14216,
+
+                        Items.FALADOR_SHIELD_1_14577, Items.FALADOR_SHIELD_2_14578,
+                        Items.FALADOR_SHIELD_3_14579,
+
+                        Items.PRAYER_MIX1_11467, Items.PRAYER_MIX1_11468,
+                        Items.PRAYER_MIX2_11465, Items.PRAYER_MIX2_11466,
+
+                        Items.SUP_RESTORE_MIX1_11495, Items.SUP_RESTORE_MIX1_11496,
+                        Items.SUP_RESTORE_MIX2_11493, Items.SUP_RESTORE_MIX2_11494,
+                    )
+                    if (player.inventory.containsAtLeastOneItem(prayerItems) || player.equipment.containsAtLeastOneItem(
+                            prayerItems
+                        )
+                    ) {
+                        sendNPCDialogue(player, NPCs.LARXUS_3050, "For this fight you're not allowed to use prayers!")
+                        teleport(player, Location.create(3182, 9758, 0)) // Behind Doors.
+                    } else {
+                        champion.init()
+                        registerHintIcon(player, champion)
+                        champion.attack(player)
+                    }
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Earth Warrior Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6798, 260, 63, 3)
+                setInterfaceText(killer, "432 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "432 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1452, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 432.0)
+            rewardXP(killer, Skills.SLAYER, 432.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/GhoulChampionNPC.kt

@@ -0,0 +1,105 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.container.impl.EquipmentContainer
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.node.item.Item
+import core.game.system.config.ItemConfigParser
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Ghoul champion NPC for Champions challenge.
+ */
+
+@Initializable
+class GhoulChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return GhoulChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.GHOUL_CHAMPION_3059)
+    }
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnGhoulChampion(player: Player) {
+            val champion = GhoulChampionNPC(NPCs.GHOUL_CHAMPION_3059)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    champion.init()
+                    registerHintIcon(player, champion)
+                    champion.attack(player)
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun checkImpact(state: BattleState) {
+        super.checkImpact(state)
+        val player = state.attacker
+        if (player is Player) {
+            val i: Item = player.equipment[EquipmentContainer.SLOT_WEAPON].id.asItem()
+            if (i.definition.getConfiguration(ItemConfigParser.TWO_HANDED, false) == true && state.style == CombatStyle.MELEE) {
+                state.neutralizeHits()
+                state.estimatedHit = state.maximumHit
+            }
+            if (state.style == CombatStyle.MAGIC) {
+                sendMessage(player, "You can use only weapons in this challenge.")
+                if (state.estimatedHit > -1) {
+                    state.estimatedHit = 0
+                    return
+                }
+                if (state.secondaryHit > -1) {
+                    state.secondaryHit = 0
+                    return
+                }
+            }
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Ghoul Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6799, 260, 63, 3)
+                setInterfaceText(killer, "400 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "400 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1453, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 400.0)
+            rewardXP(killer, Skills.SLAYER, 400.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/GiantChampionNPC.kt

@@ -0,0 +1,103 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Giant champion NPC for Champions challenge.
+ */
+
+@Initializable
+class GiantChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return GiantChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.GIANT_CHAMPION_3058)
+
+    }
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnGiantChampion(player: Player) {
+            val champion = GiantChampionNPC(NPCs.GIANT_CHAMPION_3058)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    champion.init()
+                    registerHintIcon(player, champion)
+                    champion.attack(player)
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun checkImpact(state: BattleState) {
+        super.checkImpact(state)
+        val player = state.attacker
+        if (player is Player) {
+            if (state.style == CombatStyle.MELEE) {
+                state.neutralizeHits()
+                state.estimatedHit = state.maximumHit
+            }
+            if (state.style == CombatStyle.RANGE || state.style == CombatStyle.MAGIC) {
+                sendMessage(player, "You can use only melee in this challenge.")
+                if (state.estimatedHit > -1) {
+                    state.estimatedHit = 0
+                    return
+                }
+                if (state.secondaryHit > -1) {
+                    state.secondaryHit = 0
+                    return
+                }
+            }
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Giant Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6800, 260, 63, 3)
+                setInterfaceText(killer, "280 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "280 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1454, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 280.0)
+            rewardXP(killer, Skills.SLAYER, 280.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/GoblinChampionNPC.kt

@@ -0,0 +1,101 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Goblin champion NPC for Champions challenge.
+ */
+
+@Initializable
+class GoblinChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return GoblinChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.GOBLIN_CHAMPION_3060)
+    }
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnGoblinChampion(player: Player) {
+            val champion = GoblinChampionNPC(NPCs.GOBLIN_CHAMPION_3060)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    champion.init()
+                    registerHintIcon(player, champion)
+                    champion.attack(player)
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun checkImpact(state: BattleState) {
+        super.checkImpact(state)
+        val player = state.attacker
+        if (player is Player) {
+            if (state.style == CombatStyle.MAGIC) {
+                state.neutralizeHits()
+                state.estimatedHit = state.maximumHit
+            }
+            if (state.style == CombatStyle.MELEE || state.style == CombatStyle.RANGE) {
+                sendMessage(player, "You can use only spells in this challenge.")
+                if (state.estimatedHit > -1) {
+                    state.estimatedHit = 0
+                    return
+                }
+                if (state.secondaryHit > -1) {
+                    state.secondaryHit = 0
+                    return
+                }
+            }
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Goblin Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6801, 260, 63, 3)
+                setInterfaceText(killer, "128 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "128 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1455, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 128.0)
+            rewardXP(killer, Skills.SLAYER, 128.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/HobgoblinChampionNPC.kt

@@ -0,0 +1,103 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Hobgoblin champion NPC for Champions challenge.
+ */
+
+@Initializable
+class HobgoblinChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return HobgoblinChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.HOBGOBLIN_CHAMPION_3061)
+    }
+
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnHobgoblinChampion(player: Player) {
+            val champion = HobgoblinChampionNPC(NPCs.HOBGOBLIN_CHAMPION_3061)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    champion.init()
+                    registerHintIcon(player, champion)
+                    champion.attack(player)
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun checkImpact(state: BattleState) {
+        super.checkImpact(state)
+        val player = state.attacker
+        if (player is Player) {
+            if (state.style == CombatStyle.MAGIC || state.style == CombatStyle.RANGE) {
+                state.neutralizeHits()
+                state.estimatedHit = state.maximumHit
+            }
+
+            if (state.style == CombatStyle.MELEE) {
+                sendMessage(player, "You cannot use melee in this challenge.")
+                if (state.estimatedHit > -1) {
+                    state.estimatedHit = 0
+                    return
+                }
+                if (state.secondaryHit > -1) {
+                    state.secondaryHit = 0
+                    return
+                }
+            }
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Hobgoblin Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6802, 260, 63, 3)
+                setInterfaceText(killer, "232 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "232 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1456, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 232.0)
+            rewardXP(killer, Skills.SLAYER, 232.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/ImpChampionNPC.kt

@@ -0,0 +1,104 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.combat.equipment.WeaponInterface
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Imp champion NPC for Champions challenge.
+ */
+
+@Initializable
+class ImpChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return ImpChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.IMP_CHAMPION_3062)
+    }
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnImpChampion(player: Player) {
+            val champion = ImpChampionNPC(NPCs.IMP_CHAMPION_3062)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    champion.init()
+                    registerHintIcon(player, champion)
+                    champion.attack(player)
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun checkImpact(state: BattleState) {
+        super.checkImpact(state)
+        val player = state.attacker
+        if (player is Player) {
+            val w = player.getExtension<WeaponInterface>(WeaponInterface::class.java)
+            if (state.style == CombatStyle.MELEE || state.style == CombatStyle.MAGIC || state.style == CombatStyle.RANGE) {
+                state.neutralizeHits()
+                state.estimatedHit = state.maximumHit
+            }
+            if (w.weaponInterface.interfaceId == 10) {
+                sendMessage(player, "You cannot use special attack in this challenge.")
+                if (state.estimatedHit > -1) {
+                    state.estimatedHit = 0
+                    return
+                }
+                if (state.secondaryHit > -1) {
+                    state.secondaryHit = 0
+                    return
+                }
+            }
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Imp Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6803, 260, 63, 3)
+                setInterfaceText(killer, "160 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "160 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1457, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 160.0)
+            rewardXP(killer, Skills.SLAYER, 160.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/JogreChampionNPC.kt

@@ -0,0 +1,102 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.combat.equipment.Weapon
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Jogre champion NPC for Champions challenge.
+ */
+
+@Initializable
+class JogreChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return JogreChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.JOGRE_CHAMPION_3063)
+    }
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnJogreChampion(player: Player) {
+            val champion = JogreChampionNPC(NPCs.JOGRE_CHAMPION_3063)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    champion.init()
+                    registerHintIcon(player, champion)
+                    champion.attack(player)
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun checkImpact(state: BattleState) {
+        super.checkImpact(state)
+        val player = state.attacker
+        if (player is Player) {
+            if (state.style == CombatStyle.MAGIC || state.style == CombatStyle.MELEE) {
+                state.neutralizeHits()
+                state.estimatedHit = state.maximumHit
+            }
+            if (state.weapon.type == Weapon.WeaponType.DEGRADING || state.style == CombatStyle.RANGE) {
+                sendMessage(player, "You cannot use ranged weapons.")
+                if (state.estimatedHit > -1) {
+                    state.estimatedHit = 0
+                    return
+                }
+                if (state.secondaryHit > -1) {
+                    state.secondaryHit = 0
+                    return
+                }
+            }
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Jogre Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6804, 260, 63, 3)
+                setInterfaceText(killer, "480 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "480 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1458, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 480.0)
+            rewardXP(killer, Skills.SLAYER, 480.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/LesserDemonChampionNPC.kt

@@ -0,0 +1,102 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.container.impl.EquipmentContainer
+import core.game.global.action.EquipHandler
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Lesser demon champion NPC for Champions challenge.
+ */
+
+@Initializable
+class LesserDemonChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return LesserDemonChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.LESSER_DEMON_CHAMPION_3064)
+    }
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnLesserDemonChampion(player: Player) {
+            val champion = LesserDemonChampionNPC(NPCs.LESSER_DEMON_CHAMPION_3064)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    champion.init()
+                    registerHintIcon(player, champion)
+                    champion.attack(player)
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun checkImpact(state: BattleState) {
+        super.checkImpact(state)
+        val player = state.attacker
+        if (player is Player) {
+            if (!player.equipment[3].hasItemPlugin()) {
+                state.neutralizeHits()
+                state.estimatedHit = state.maximumHit
+            } else {
+                EquipHandler.unequip(player, EquipmentContainer.SLOT_WEAPON, id)
+                sendMessage(player, "You cannot use weapons in this challenge.")
+                if (state.estimatedHit > -1) {
+                    state.estimatedHit = 0
+                    return
+                }
+                if (state.secondaryHit > -1) {
+                    state.secondaryHit = 0
+                    return
+                }
+            }
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Lesser Demon Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6805, 260, 63, 3)
+                setInterfaceText(killer, "592 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "592 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1459, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 592.0)
+            rewardXP(killer, Skills.SLAYER, 592.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/SkeletonChampionNPC.kt

@@ -0,0 +1,103 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.combat.equipment.Weapon
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Skeleton champion NPC for Champions challenge.
+ */
+
+@Initializable
+class SkeletonChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return SkeletonChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.SKELETON_CHAMPION_3065)
+    }
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnSkeletonChampion(player: Player) {
+            val champion = SkeletonChampionNPC(NPCs.SKELETON_CHAMPION_3065)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    champion.init()
+                    animate(champion, 259, true)
+                    registerHintIcon(player, champion)
+                    champion.attack(player)
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun checkImpact(state: BattleState) {
+        super.checkImpact(state)
+        val player = state.attacker
+        if (player is Player) {
+            if (state.style == CombatStyle.RANGE && state.weapon.type == Weapon.WeaponType.DEGRADING && state.weapon.type == Weapon.WeaponType.DOUBLE_SHOT) {
+                state.neutralizeHits()
+                state.estimatedHit = state.maximumHit
+            }
+            if (state.style == CombatStyle.MAGIC || state.style == CombatStyle.MELEE) {
+                sendMessage(player, "You can use only ranged weapons in this challenge.")
+                if (state.estimatedHit > -1) {
+                    state.estimatedHit = 0
+                    return
+                }
+                if (state.secondaryHit > -1) {
+                    state.secondaryHit = 0
+                    return
+                }
+            }
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Skeleton Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6806, 260, 63, 3)
+                setInterfaceText(killer, "232 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "232 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1460, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 232.0)
+            rewardXP(killer, Skills.SLAYER, 232.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/cchallange/npc/ZombieChampionNPC.kt

@@ -0,0 +1,102 @@
+package content.global.activity.cchallange.npc
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.AbstractNPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+/**
+ * Represents the Zombie champion NPC for Champions challenge.
+ */
+
+@Initializable
+class ZombieChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, location) {
+    var clearTime = 0
+    override fun construct(id: Int, location: Location, vararg objects: Any): AbstractNPC {
+        return ZombieChampionNPC(id, location)
+    }
+
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.ZOMBIES_CHAMPION_3066)
+    }
+
+    override fun handleTickActions() {
+        super.handleTickActions()
+        if (clearTime++ > 288) poofClear(this)
+    }
+
+    companion object {
+        fun spawnZombieChampion(player: Player) {
+            val champion = ZombieChampionNPC(NPCs.ZOMBIES_CHAMPION_3066)
+            champion.location = location(3170, 9758, 0)
+            champion.isWalks = true
+            champion.isAggressive = true
+            champion.isActive = false
+
+            if (champion.asNpc() != null && champion.isActive) {
+                champion.properties.teleportLocation = champion.properties.spawnLocation
+            }
+
+            champion.isActive = true
+            GameWorld.Pulser.submit(object : Pulse(0, champion) {
+                override fun pulse(): Boolean {
+                    champion.init()
+                    registerHintIcon(player, champion)
+                    champion.attack(player)
+                    return true
+                }
+            })
+        }
+    }
+
+    override fun checkImpact(state: BattleState) {
+        super.checkImpact(state)
+        val player = state.attacker
+        if (player is Player) {
+            if (state.style == CombatStyle.MELEE || state.style == CombatStyle.RANGE) {
+                state.estimatedHit = state.maximumHit
+                state.neutralizeHits()
+            }
+            if (state.style == CombatStyle.MAGIC) {
+                sendMessage(player, "You cannot use spells in this challenge.")
+                if (state.estimatedHit > -1) {
+                    state.estimatedHit = 0
+                    return
+                }
+                if (state.secondaryHit > -1) {
+                    state.secondaryHit = 0
+                    return
+                }
+            }
+        }
+    }
+
+    override fun finalizeDeath(killer: Entity?) {
+        if (killer is Player) {
+            lock(killer, 2)
+            runTask(killer, 1) {
+                openInterface(killer, 63)
+                setInterfaceText(killer, "Well done, you defeated the Zombie Champion!", 63, 2)
+                killer.packetDispatch.sendItemZoomOnInterface(Items.CHAMPION_SCROLL_6807, 260, 63, 3)
+                setInterfaceText(killer, "240 Slayer Xp", 63, 6)
+                setInterfaceText(killer, "240 Hitpoint Xp", 63, 7)
+            }
+            setVarbit(killer, 1461, 1, true)
+            rewardXP(killer, Skills.HITPOINTS, 240.0)
+            rewardXP(killer, Skills.SLAYER, 240.0)
+            removeAttribute("championsarena:start")
+            clearHintIcon(killer)
+        }
+        clear()
+        super.finalizeDeath(killer)
+    }
+}

Server/src/main/content/global/activity/jobs/CancelJobDialogueFile.kt

@@ -1,83 +0,0 @@
-package content.global.activity.jobs
-
-import core.api.*
-import content.global.activity.jobs.impl.GatheringJobs
-import content.global.activity.jobs.impl.SlayingJobs
-import core.game.dialogue.FacialExpression
-import core.game.node.entity.npc.NPC
-import core.game.node.item.Item
-import org.rs09.consts.Items
-import core.game.dialogue.DialogueFile
-import core.game.dialogue.Topic
-import core.tools.END_DIALOGUE
-import core.tools.START_DIALOGUE
-
-class CancelJobDialogueFile : DialogueFile() {
-    override fun handle(componentID: Int, buttonID: Int) {
-        when (stage) {
-            START_DIALOGUE -> showTopics(
-                Topic(core.game.dialogue.FacialExpression.HALF_ASKING, "How am I doing on my job?", 1),
-                Topic(core.game.dialogue.FacialExpression.HALF_GUILTY, "I'd like to cancel my job.", 10)
-            )
-
-            1 -> {
-                val jobType = JobType.values()[getAttribute(player!!, "jobs:type", 0)]
-                val jobId = getAttribute(player!!, "jobs:id", 0)
-                val needed = getAttribute(player!!, "jobs:amount", 0)
-
-                when (jobType) {
-                    JobType.GATHERING -> {
-                        sendItemDialogue(
-                            player!!,
-                            Item(GatheringJobs.values()[jobId].itemId),
-                            "You still need to gather $needed more."
-                        )
-                    }
-
-                    JobType.SLAYING -> {
-                        sendDialogue(
-                            player!!,
-                            "You still need to kill $needed more ${NPC(SlayingJobs.values()[jobId].ids[0]).name.lowercase()}"
-                        )
-                    }
-                }
-
-                stage = END_DIALOGUE
-            }
-
-            10 -> npc("It will cost 500 coins.")
-                  .also { stage++ }
-
-            11 -> showTopics(
-                Topic(core.game.dialogue.FacialExpression.HAPPY, "Yes, please.", 20),
-                Topic(core.game.dialogue.FacialExpression.NEUTRAL, "No, thanks.", 30)
-            )
-
-            20 -> npc("Alright then, hand over the money.")
-                  .also { stage++ }
-
-            21 -> if (inInventory(player!!, Items.COINS_995, 500)) {
-                player("Here you go.")
-
-                removeItem(player!!, Item(Items.COINS_995, 500))
-                removeAttribute(player!!, "jobs:id")
-                removeAttribute(player!!, "jobs:amount")
-                removeAttribute(player!!, "jobs:original_amount")
-                removeAttribute(player!!, "jobs:type")
-
-                stage = END_DIALOGUE
-            } else {
-                player(
-                    core.game.dialogue.FacialExpression.HALF_WORRIED,
-                    "Oh, I don't seem to have the money..."
-                ).also { stage++ }
-            }
-
-            22 -> npc("Ah, that sucks! Get to work.")
-                  .also { stage = END_DIALOGUE }
-
-            30 -> npc("Alright then, get to work!")
-                  .also { stage = END_DIALOGUE }
-        }
-    }
-}

Server/src/main/content/global/activity/jobs/CheckJobDialogueFile.kt

@@ -0,0 +1,174 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.BoneBuryingJobs
+import content.global.activity.jobs.impl.CombatJobs
+import content.global.activity.jobs.impl.ProductionJobs
+import core.api.addItem
+import core.api.amountInInventory
+import core.api.hasAnItem
+import core.game.dialogue.DialogueFile
+import core.game.dialogue.FacialExpression
+import core.game.dialogue.IfTopic
+import core.game.dialogue.Topic
+import core.game.node.entity.npc.NPC
+import core.game.node.item.Item
+import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
+import core.tools.StringUtils
+import org.rs09.consts.Items
+
+/**
+ * The dialogue file to handle a player asking about work with the employer that assigned them
+ * their current job.
+ */
+class CheckJobDialogueFile : DialogueFile() {
+    companion object {
+        const val TURN_IN_ITEMS_1 = 1
+        const val TURN_IN_ITEMS_2 = 2
+        const val TURN_IN_ITEMS_3 = 3
+        const val TURN_IN_ITEMS_4 = 4
+        const val TURN_IN_ITEMS_5 = 5
+        const val REMIND_JOB = 101
+        const val GET_TASK_LIST = 201
+        const val GET_NEW_JOB_1 = 301
+        const val GET_NEW_JOB_2 = 302
+        const val GET_NEW_JOB_3 = 303
+        const val GET_NEW_JOB_4 = 304
+        const val GET_NEW_JOB_5 = 305
+        const val GET_NEW_JOB_NONE = 306
+        const val GET_NEW_JOB_REACHED_LIMIT = 307
+    }
+
+    override fun handle(componentID: Int, buttonID: Int) {
+        val playerJobManager: JobManager = JobManager.getInstance(player!!)
+        val job = playerJobManager.job ?: return
+        val originalAmount = playerJobManager.jobOriginalAmount
+
+        when (stage) {
+            START_DIALOGUE -> showTopics(
+                IfTopic(
+                    FacialExpression.HAPPY,
+                    "I have the items you wanted.",
+                    TURN_IN_ITEMS_1,
+                    (job.type == JobType.PRODUCTION && amountInInventory(player!!, (job as ProductionJobs).itemId) > 0)
+                ), Topic(
+                    FacialExpression.HALF_ASKING, "Can you remind me what job you gave me?", REMIND_JOB
+                ), Topic(
+                    FacialExpression.HALF_ASKING, "Can I have a task list to remind me of my job?", GET_TASK_LIST
+                ), Topic(
+                    FacialExpression.HALF_GUILTY, "I'd like a new job please.", GET_NEW_JOB_1
+                )
+            )
+
+            TURN_IN_ITEMS_1 -> {
+                job as ProductionJobs
+                val itemName = Item(job.itemId).name.lowercase()
+                val itemNamePluralized = if (playerJobManager.jobAmount > 1) StringUtils.plusS(itemName) else itemName
+                npcl("Splendid! Now, I needed $originalAmount $itemNamePluralized.")
+                stage = TURN_IN_ITEMS_2
+            }
+
+            TURN_IN_ITEMS_2 -> {
+                if (playerJobManager.jobAmount == originalAmount) {
+                    npcl("So far, you haven't brought me any, so I'm waiting for ${playerJobManager.jobAmount}.")
+                } else {
+                    npcl("So far, you have brought me ${originalAmount - playerJobManager.jobAmount}, so I'm waiting for ${playerJobManager.jobAmount}.")
+                }
+                stage = TURN_IN_ITEMS_3
+            }
+
+            TURN_IN_ITEMS_3 -> {
+                if (amountInInventory(player!!, (job as ProductionJobs).itemId) >= playerJobManager.jobAmount) {
+                    npcl("I can see that you have plenty, would you like to hand some over to complete your job?")
+                } else {
+                    npcl("I can see that you have some, would you like to hand them over?")
+                }
+                stage = TURN_IN_ITEMS_4
+            }
+
+            TURN_IN_ITEMS_4 -> showTopics(
+                Topic("Yes, I'll give you what I have.", TURN_IN_ITEMS_5, skipPlayer = true),
+                Topic("No, I'll keep hold of it for now.", END_DIALOGUE, skipPlayer = true)
+            )
+
+            TURN_IN_ITEMS_5 -> {
+                playerJobManager.turnInItems()
+
+                if (playerJobManager.jobAmount == 0) {
+                    playerJobManager.rewardPlayer()
+                    npcl("There you go, thanks for your help. You're quite a skilled worker!")
+                } else {
+                    npcl("Thanks for your help. Come back when you've got more!")
+                }
+                stage = END_DIALOGUE
+            }
+
+            REMIND_JOB -> {
+                when (job.type) {
+                    JobType.PRODUCTION -> {
+                        job as ProductionJobs
+                        val itemName = Item(job.itemId).name.lowercase()
+                        val itemNamePluralized =
+                            if (playerJobManager.jobAmount > 1) StringUtils.plusS(itemName) else itemName
+                        npcl("You still need to gather ${playerJobManager.jobAmount} more $itemNamePluralized.")
+                    }
+
+                    JobType.BONE_BURYING -> {
+                        job as BoneBuryingJobs
+                        val boneName = Item(job.boneIds.first()).name.lowercase()
+                        val boneNamePluralized =
+                            if (playerJobManager.jobAmount > 1) StringUtils.plusS(boneName) else boneName
+                        npcl("You still need to bury ${playerJobManager.jobAmount} more $boneNamePluralized in the ${job.buryArea.title}.")
+                    }
+
+                    JobType.COMBAT -> {
+                        job as CombatJobs
+                        val monsterName = NPC(job.monsterIds.first()).name.lowercase()
+                        val monsterNamePluralized =
+                            if (playerJobManager.jobAmount > 1) StringUtils.plusS(monsterName) else monsterName
+                        npcl("You still need to kill ${playerJobManager.jobAmount} more $monsterNamePluralized.")
+                    }
+                }
+                stage = END_DIALOGUE
+            }
+
+            GET_TASK_LIST -> {
+                if (hasAnItem(player!!, Items.TASK_LIST_13464).exists()) {
+                    npcl("You already have one of those!")
+                } else {
+                    when (addItem(player!!, Items.TASK_LIST_13464)) {
+                        true -> npcl("Here you go then.")
+                        false -> dialogue("You don't have enough space in your inventory.")
+                    }
+                }
+
+                stage = END_DIALOGUE
+            }
+
+            GET_NEW_JOB_1 -> npcl("Let me see if I've got any work for you.").also {
+                if (playerJobManager.hasReachedJobLimit()) {
+                    stage = GET_NEW_JOB_REACHED_LIMIT
+                } else {
+                    playerJobManager.generate(npc!!)
+                    stage = if (playerJobManager.hasJob()) GET_NEW_JOB_2 else GET_NEW_JOB_NONE
+                }
+            }
+
+            GET_NEW_JOB_2 -> npcl(playerJobManager.getAssignmentMessage()).also { stage = GET_NEW_JOB_3 }
+            // Historically, the player would also have the option to ask for an easier task
+            GET_NEW_JOB_3 -> playerl("Okay, off I go!").also { stage = GET_NEW_JOB_4 }
+            GET_NEW_JOB_4 -> npcl("There, I've updated your task list to show your new job. Best of luck!").also {
+                stage = GET_NEW_JOB_5
+            }
+
+            GET_NEW_JOB_5 -> playerl("Thanks.").also { stage = END_DIALOGUE }
+            GET_NEW_JOB_NONE -> npcl("I'm sorry, I don't currently have any jobs that you're qualified for.").also {
+                stage = END_DIALOGUE
+            }
+
+            GET_NEW_JOB_REACHED_LIMIT -> npcl("You've hit your limit for the day. Come back tomorrow!").also {
+                stage = END_DIALOGUE
+            }
+        }
+    }
+}

Server/src/main/content/global/activity/jobs/Job.kt

@@ -0,0 +1,23 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.Employers
+import core.tools.RandomFunction
+
+/**
+ * The interface for a job that a player can be assigned.
+ *
+ * TODO: Once player data is stored in a database with support for migrations, implement a per-player field to store
+ * the player's current employer, so that multiple employers can assign the same job, but the player will only be
+ * able to turn the job into the employer that assigned it to them.
+ */
+interface Job {
+    val type: JobType
+    val lower: Int
+    val upper: Int
+
+    val employer: Employers
+
+    fun getAmount(): Int {
+        return RandomFunction.random(lower, upper + 1)
+    }
+}

Server/src/main/content/global/activity/jobs/JobManager.kt

@@ -1,114 +1,215 @@
 package content.global.activity.jobs
 
+import content.global.activity.jobs.impl.BoneBuryingJobs
+import content.global.activity.jobs.impl.CombatJobs
+import content.global.activity.jobs.impl.ProductionJobs
+import core.ServerStore
+import core.ServerStore.Companion.getInt
 import core.api.*
-import content.global.activity.jobs.impl.GatheringJobs
-import content.global.activity.jobs.impl.SlayingJobs
+import core.game.event.BoneBuryEvent
+import core.game.event.EventHook
+import core.game.event.JobAssignmentEvent
+import core.game.event.NPCKillEvent
+import core.game.node.entity.Entity
 import core.game.node.entity.npc.NPC
 import core.game.node.entity.player.Player
 import core.game.node.item.Item
+import core.tools.StringUtils
 import org.json.simple.JSONObject
 import org.rs09.consts.Items
-import core.ServerStore
-import core.ServerStore.Companion.getInt
+import java.lang.Integer.min
 
-object JobManager {
-    @JvmStatic
-    fun updateJobRemaining(player: Player, amount: Int = 0) {
-        val cur = getAttribute(player, "jobs:amount", 0)
-        val new = cur - amount
-        val jobType = JobType.values()[getAttribute(player, "jobs:type", 0)]
-        val jobId = getAttribute(player, "jobs:id", 0)
+/**
+ * Manages the player's job data & progression.
+ *
+ * @source https://runescape.wiki/w/Jobs?oldid=831782
+ */
+class JobManager(val player: Player? = null) : LoginListener, PersistPlayer {
+    var job: Job? = null
+    var jobAmount: Int = 0
+    var jobOriginalAmount: Int = 0
 
-        when (jobType) {
-            JobType.GATHERING -> { }
+    private fun hasLevelRequirement(job: ProductionJobs): Boolean {
+        if (player == null) return false
+        if (player.isArtificial) return false
 
-            JobType.SLAYING -> {
-                val job = SlayingJobs.values()[jobId]
-
-                if (new % 5 == 0 && new > 0) {
-                    sendMessage(
-                        player,
-                        "You have $new ${NPC(job.ids[0]).name.lowercase()} left to go."
-                    )
-                } else if (new == 0) {
-                    sendMessage(
-                        player,
-                        "<col=00AA00>You have completed your job.</col>"
-                    )
-                }
-            }
-        }
-
-        setAttribute(player, "jobs:amount", new)
+        return getStatLevel(player, job.skill) >= job.lvlReq
     }
 
-    @JvmStatic
-    fun rewardPlayer(player: Player, npc: NPC) {
-        val amt = getAttribute(player, "jobs:original_amount", 0)
-        val jobType = JobType.values()[getAttribute(player, "jobs:type", 0)]
-        val jobId = getAttribute(player, "jobs:id", 0)
+    fun hasJob(): Boolean = this.job != null
 
-        when (jobType) {
-            JobType.GATHERING -> {
-                val it = Item(GatheringJobs.values()[jobId].itemId)
-                var amount = amountInInventory(player, it.id)
-                val needed = getAttribute(player, "jobs:amount", 0)
+    // Historically the job limit would be 6 jobs per hour of play-time, using 3 per day for balance purposes
+    fun hasReachedJobLimit(): Boolean = player?.let { getStoreFile().getInt(it.username.lowercase()) >= 3 } ?: false
 
-                if (amount == 0) {
-                    openDialogue(player, CancelJobDialogueFile(), npc)
-                    return
-                }
+    fun generate(npc: NPC) {
+        if (player == null) return
+        if (player.isArtificial) return
 
-                if (amount < needed) {
-                    sendItemDialogue(
-                        player,
-                        GatheringJobs.values()[jobId].itemId,
-                        "You still need to gather ${needed - amount} more."
-                    )
+        val instance = getInstance(player)
 
-                    removeItem(player, Item(it.id, amount))
-                    setAttribute(player, "jobs:amount", needed - amount)
-
-                    return
-                }
-
-                if (amount > needed) {
-                    amount = needed
-                }
-
-                removeItem(player, Item(it.id, amount))
-            }
-
-            JobType.SLAYING -> {
-                val needed = getAttribute(player, "jobs:amount", 0)
-
-                if (needed > 0) {
-                    sendDialogue(
-                        player,
-                        "You still need to kill $needed more ${NPC(SlayingJobs.values()[jobId].ids[0]).name.lowercase()}."
-                    )
-
-                    return
-                }
-
-                sendDialogue(
-                    player,
-                    "Excellent work, thank you! Here's your reward."
+        // Create a list of jobs that the player can do and are given by the NPC being interacted with
+        val potentialJobs: List<Job> = (
+                ProductionJobs.values().filter { hasLevelRequirement(it) }
+                        + BoneBuryingJobs.values()
+                        + CombatJobs.values()
                 )
-            }
-        }
+            .filter { job -> job.employer.npcId == npc.id }
 
-        addItemOrDrop(player, Items.COINS_995, 250 * amt)
+        val job = potentialJobs.randomOrNull() ?: return
 
-        removeAttribute(player, "jobs:id")
-        removeAttribute(player, "jobs:amount")
-        removeAttribute(player, "jobs:original_amount")
-        removeAttribute(player, "jobs:type")
+        instance.job = job
+        this.jobAmount = job.getAmount()
+        this.jobOriginalAmount = instance.jobAmount
 
+        player.dispatch(JobAssignmentEvent(job.type, npc))
         getStoreFile()[player.username.lowercase()] = getStoreFile().getInt(player.username.lowercase()) + 1
     }
 
-    fun getStoreFile(): JSONObject {
-        return ServerStore.getArchive("daily-jobs-tracking")
+    fun getAssignmentMessage(): String? {
+        if (player == null) return null
+        if (player.isArtificial) return null
+
+        val instance = getInstance(player)
+        val job = instance.job ?: return null
+
+        return when (job.type) {
+            JobType.PRODUCTION -> {
+                job as ProductionJobs
+                val itemName = Item(job.itemId).name.lowercase()
+                val itemNamePluralized = if (this.jobAmount > 1) StringUtils.plusS(itemName) else itemName
+                "Okay, your job is to bring me ${this.jobAmount} $itemNamePluralized."
+            }
+
+            JobType.BONE_BURYING -> {
+                job as BoneBuryingJobs
+                val boneName = Item(job.boneIds.first()).name.lowercase()
+                val boneNamePluralized = if (this.jobAmount > 1) StringUtils.plusS(boneName) else boneName
+                "Okay, your job is to bury ${this.jobAmount} $boneNamePluralized in the ${job.buryArea.title}."
+            }
+
+            JobType.COMBAT -> {
+                job as CombatJobs
+                val monsterName = NPC(job.monsterIds.first()).name.lowercase()
+                val monsterNamePluralized = if (this.jobAmount > 1) StringUtils.plusS(monsterName) else monsterName
+                "Okay, your job is to kill ${this.jobAmount} $monsterNamePluralized."
+            }
+        }
+    }
+
+    /**
+     * TODO: Allow players to turn-in noted items (authentic to 2009)
+     */
+    fun turnInItems() {
+        if (player == null) return
+        if (player.isArtificial) return
+
+        val instance = getInstance(player)
+        val job = instance.job ?: return
+        if (job.type != JobType.PRODUCTION) return
+
+        val itemId = (job as ProductionJobs).itemId
+        val amountHeld = amountInInventory(player, itemId)
+        val amountToTurnIn = min(amountHeld, instance.jobAmount)
+        removeItem(player, Item(itemId, amountToTurnIn))
+        instance.jobAmount -= amountToTurnIn
+    }
+
+    fun rewardPlayer() {
+        if (player == null) return
+        if (player.isArtificial) return
+
+        val instance = getInstance(player)
+
+        addItemOrDrop(player, Items.COINS_995, 250 * instance.jobOriginalAmount)
+
+        instance.job = null
+        instance.jobAmount = -1
+        instance.jobOriginalAmount = -1
+    }
+
+    override fun login(player: Player) {
+        if (player.isArtificial) return
+
+        val jobManager = JobManager(player)
+        setAttribute(player, "job-manager", jobManager)
+
+        player.hook(Event.BoneBuried, object : EventHook<BoneBuryEvent> {
+            override fun process(entity: Entity, event: BoneBuryEvent) {
+                if (entity !is Player) return
+                if (entity.isArtificial) return
+
+                val instance = getInstance(entity)
+
+                if (!instance.hasJob()) return
+                if (instance.job?.type != JobType.BONE_BURYING) return
+                if (instance.jobAmount == 0) return
+
+                val job = (instance.job as BoneBuryingJobs)
+                if (inBorders(entity, job.buryArea.zoneBorder) && event.boneId in job.boneIds) {
+                    instance.jobAmount--
+                }
+            }
+        })
+        player.hook(Event.NPCKilled, object : EventHook<NPCKillEvent> {
+            override fun process(entity: Entity, event: NPCKillEvent) {
+                if (entity !is Player) return
+                if (entity.isArtificial) return
+
+                val instance = getInstance(entity)
+
+                if (!instance.hasJob()) return
+                if (instance.job?.type != JobType.COMBAT) return
+                if (instance.jobAmount == 0) return
+
+                val job = (instance.job as CombatJobs)
+                if (event.npc.id in job.monsterIds) {
+                    instance.jobAmount--
+                }
+            }
+        })
+    }
+
+    // TODO: Implement proper saving of job data to JSONObject once player save migration is possible
+    override fun savePlayer(player: Player, save: JSONObject) {
+        val instance = getInstance(player)
+        val jobId: Int = instance.job?.let {
+            when (it.type) {
+                JobType.PRODUCTION -> ProductionJobs.values().indexOf(it)
+                JobType.COMBAT -> CombatJobs.values().indexOf(it)
+                JobType.BONE_BURYING -> BoneBuryingJobs.values().indexOf(it)
+            }
+        } ?: -1
+
+        setAttribute(player, "/save:jobs:id", jobId)
+        setAttribute(player, "/save:jobs:type", instance.job?.type?.ordinal ?: -1)
+        setAttribute(player, "/save:jobs:amount", instance.jobAmount)
+        setAttribute(player, "/save:jobs:original_amount", instance.jobOriginalAmount)
+    }
+
+    // TODO: Implement proper loading of job data from JSONObject once player save migration is possible
+    override fun parsePlayer(player: Player, data: JSONObject) {
+        val instance = getInstance(player)
+        val jobId = getAttribute(player, "jobs:id", -1)
+        val jobType = getAttribute(player, "jobs:type", -1)
+
+        instance.job = when (JobType.values().getOrNull(jobType)) {
+            JobType.PRODUCTION -> ProductionJobs.values().getOrNull(jobId)
+            JobType.COMBAT -> CombatJobs.values().getOrNull(jobId)
+            JobType.BONE_BURYING -> BoneBuryingJobs.values().getOrNull(jobId)
+            else -> null
+        }
+        instance.jobAmount = getAttribute(player, "jobs:amount", -1)
+        instance.jobOriginalAmount = getAttribute(player, "jobs:original_amount", -1)
+    }
+
+    companion object {
+        @JvmStatic
+        fun getInstance(player: Player): JobManager {
+            return player.getAttribute("job-manager", JobManager(player))
+        }
+
+        fun getStoreFile(): JSONObject {
+            return ServerStore.getArchive("daily-jobs-tracking")
+        }
     }
 }

Server/src/main/content/global/activity/jobs/JobType.kt

@@ -1,6 +1,13 @@
 package content.global.activity.jobs
 
+/**
+ * An enum of the different types of jobs that a player can be assigned.
+ *
+ * Note: Due to how player save files keep track of the player's current job, it is essential that
+ * new entries are only appended to the end of this enum, and the ordering of existing entries is not changed.
+ */
 enum class JobType {
-    GATHERING,
-    SLAYING
+    PRODUCTION,
+    COMBAT,
+    BONE_BURYING
 }

Server/src/main/content/global/activity/jobs/StartJobDialogueFile.kt

@@ -0,0 +1,139 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.BoneBuryingJobs
+import content.global.activity.jobs.impl.CombatJobs
+import content.global.activity.jobs.impl.ProductionJobs
+import core.api.addItem
+import core.api.hasAnItem
+import core.game.dialogue.DialogueFile
+import core.game.dialogue.FacialExpression
+import core.game.dialogue.Topic
+import core.game.node.entity.npc.NPC
+import core.game.node.item.Item
+import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
+import core.tools.StringUtils
+import org.rs09.consts.Items
+
+/**
+ * The dialogue file to handle a player asking about work with any employer which they aren't currently working for.
+ */
+class StartJobDialogueFile : DialogueFile() {
+    companion object {
+        const val GET_TASK_LIST_1 = 1
+        const val GET_TASK_LIST_2 = 2
+        const val GET_TASK_LIST_YES = 3
+        const val GET_JOB_1 = 101
+        const val GET_JOB_2 = 102
+        const val GET_JOB_3 = 103
+        const val GET_JOB_4 = 104
+        const val GET_JOB_5 = 105
+        const val GET_JOB_NONE = 201
+        const val GET_JOB_EMPLOYED_1 = 301
+        const val GET_JOB_EMPLOYED_2 = 302
+        const val GET_JOB_LIMIT_REACHED = 401
+    }
+
+    override fun handle(componentID: Int, buttonID: Int) {
+        val playerJobManager: JobManager = JobManager.getInstance(player!!)
+
+        when (stage) {
+            START_DIALOGUE -> playerl(FacialExpression.ASKING, "Do you have any jobs for me?").also {
+                stage = if (hasAnItem(player!!, Items.TASK_LIST_13464).exists()) {
+                    if (playerJobManager.hasJob()) {
+                        GET_JOB_EMPLOYED_1
+                    } else {
+                        GET_JOB_1
+                    }
+                } else {
+                    GET_TASK_LIST_1
+                }
+            }
+
+            GET_TASK_LIST_1 -> npcl("Well, first of all, I can see that you don't have a task list to remind you about your current job. Would you like a task list now?").also {
+                stage = GET_TASK_LIST_2
+            }
+
+            GET_TASK_LIST_2 -> showTopics(
+                Topic("Yes, please.", GET_TASK_LIST_YES),
+                Topic("No, thanks.", if (playerJobManager.hasJob()) GET_JOB_EMPLOYED_1 else GET_JOB_1)
+            )
+
+            GET_TASK_LIST_YES -> {
+                when (addItem(player!!, Items.TASK_LIST_13464)) {
+                    true -> npcl("Here you go then.").also {
+                        stage = if (playerJobManager.hasJob()) GET_JOB_EMPLOYED_1 else GET_JOB_1
+                    }
+
+                    false -> dialogue("You don't have enough space in your inventory.").also { stage = END_DIALOGUE }
+                }
+            }
+
+            GET_JOB_1 -> npcl("Let me see if I've got any work for you.").also {
+                if (playerJobManager.hasReachedJobLimit()) {
+                    stage = GET_JOB_LIMIT_REACHED
+                } else {
+                    playerJobManager.generate(npc!!)
+                    stage = if (playerJobManager.hasJob()) GET_JOB_2 else GET_JOB_NONE
+                }
+            }
+
+            GET_JOB_2 -> npcl(playerJobManager.getAssignmentMessage()).also { stage = GET_JOB_3 }
+            // Historically, the player would also have the option to ask for an easier task
+            GET_JOB_3 -> playerl("Okay, off I go!").also { stage = GET_JOB_4 }
+            GET_JOB_4 -> npcl("There, I've updated your task list to show your new job. Best of luck!").also {
+                stage = GET_JOB_5
+            }
+
+            GET_JOB_5 -> playerl("Thanks.").also { stage = END_DIALOGUE }
+            GET_JOB_EMPLOYED_1 -> {
+                val job = playerJobManager.job ?: return
+                val employerName = NPC(job.employer.npcId).name
+                val amount = playerJobManager.jobAmount
+                val originalAmount = playerJobManager.jobOriginalAmount
+
+                if (amount == 0) {
+                    npcl("Hang about. Aren't you working for $employerName? It looks like you've complete their job, return to them for your reward.")
+                    stage = END_DIALOGUE
+                } else {
+                    when (job.type) {
+                        JobType.PRODUCTION -> {
+                            job as ProductionJobs
+                            val itemName = Item(job.itemId).name.lowercase()
+                            val itemNamePluralized = if (originalAmount > 1) StringUtils.plusS(itemName) else itemName
+                            npcl("Hang about. Aren't you working for $employerName? You were asked for $originalAmount $itemNamePluralized and still have $amount more to go.")
+                        }
+
+                        JobType.BONE_BURYING -> {
+                            job as BoneBuryingJobs
+                            val boneName = Item(job.boneIds.first()).name.lowercase()
+                            val boneNamePluralized = if (originalAmount > 1) StringUtils.plusS(boneName) else boneName
+                            npcl("Hang about. Aren't you working for $employerName? You were asked to bury $originalAmount $boneNamePluralized in the ${job.buryArea.title} and still have $amount more to go.")
+                        }
+
+                        JobType.COMBAT -> {
+                            job as CombatJobs
+                            val monsterName = NPC(job.monsterIds.first()).name.lowercase()
+                            val monsterNamePluralized = if (originalAmount > 1) StringUtils.plusS(monsterName) else monsterName
+                            npcl("Hang about. Aren't you working for $employerName? You were asked to kill $originalAmount $monsterNamePluralized and still have $amount more to go.")
+                        }
+                    }
+                    stage = GET_JOB_EMPLOYED_2
+                }
+            }
+
+            GET_JOB_EMPLOYED_2 -> showTopics(
+                Topic("Oh yes. I better go and finish their job first.", END_DIALOGUE),
+                Topic("I'd like a new job instead, please.", GET_JOB_1)
+            )
+
+            GET_JOB_NONE -> npcl("I'm sorry, I don't currently have any jobs that you're qualified for.").also {
+                stage = END_DIALOGUE
+            }
+
+            GET_JOB_LIMIT_REACHED -> npcl("You've hit your limit for the day. Come back tomorrow!").also {
+                stage = END_DIALOGUE
+            }
+        }
+    }
+}

Server/src/main/content/global/activity/jobs/TaskListReadListener.kt

@@ -0,0 +1,70 @@
+package content.global.activity.jobs
+
+import content.global.activity.jobs.impl.BoneBuryingJobs
+import content.global.activity.jobs.impl.CombatJobs
+import content.global.activity.jobs.impl.ProductionJobs
+import core.api.sendDialogue
+import core.api.sendItemDialogue
+import core.api.sendNPCDialogue
+import core.game.interaction.InteractionListener
+import core.game.node.entity.npc.NPC
+import core.game.node.item.Item
+import core.tools.StringUtils
+import org.rs09.consts.Items
+
+/**
+ * Handles the read option of the Task List item.
+ */
+class TaskListReadListener : InteractionListener {
+    override fun defineListeners() {
+        on(Items.TASK_LIST_13464, ITEM, "read") { player, _ ->
+            val playerJobManager: JobManager = JobManager.getInstance(player)
+            val job = playerJobManager.job
+            val amount = playerJobManager.jobAmount
+
+            if (job == null) {
+                sendDialogue(player, "I have not been assigned a job!")
+                return@on false
+            }
+
+            if(amount == 0) {
+                sendDialogue(
+                    player, "I have completed my job. I should return to ${NPC(job.employer.npcId).name} for my reward."
+                )
+                return@on true
+            }
+
+            when (job.type) {
+                JobType.PRODUCTION -> {
+                    job as ProductionJobs
+                    val itemName = Item(job.itemId).name.lowercase()
+                    val itemNamePluralized = if (amount > 1) StringUtils.plusS(itemName) else itemName
+                    sendItemDialogue(
+                        player, job.itemId, "My job is to gather $amount more $itemNamePluralized."
+                    )
+                }
+
+                JobType.BONE_BURYING -> {
+                    job as BoneBuryingJobs
+                    val boneName = Item(job.boneIds.first()).name.lowercase()
+                    val boneNamePluralized = if (amount > 1) StringUtils.plusS(boneName) else boneName
+                    sendItemDialogue(
+                        player,
+                        job.boneIds.first(),
+                        "My job is to bury $amount more $boneNamePluralized in the ${job.buryArea.title}."
+                    )
+                }
+
+                JobType.COMBAT -> {
+                    job as CombatJobs
+                    val monsterName = NPC(job.monsterIds.first()).name.lowercase()
+                    val monsterNamePluralized = if (amount > 1) StringUtils.plusS(monsterName) else monsterName
+                    sendNPCDialogue(
+                        player, job.monsterIds.first(), "My job is to kill $amount more $monsterNamePluralized."
+                    )
+                }
+            }
+            return@on true
+        }
+    }
+}

Server/src/main/content/global/activity/jobs/WorkForInteractionListener.kt

@@ -1,224 +1,45 @@
 package content.global.activity.jobs
 
-import content.global.activity.jobs.impl.GatheringJobs
-import content.global.activity.jobs.impl.SlayingJobs
-import core.api.*
-import core.game.event.EventHook
-import core.game.event.JobAssignmentEvent
-import core.game.event.NPCKillEvent
-import core.game.node.entity.Entity
-import core.game.node.entity.npc.NPC
-import core.game.node.entity.player.Player
-import core.game.node.item.Item
-import org.rs09.consts.Items
-import org.rs09.consts.NPCs
-import core.ServerStore.Companion.getInt
-import core.api.Event
-import core.game.interaction.InteractionListener
+import content.global.activity.jobs.impl.Employers
+import core.api.openDialogue
+import core.api.sendNPCDialogue
 import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.npc.NPC
 
 /**
  * Handles the work-for actions for the NPCs
  * @author Ceikry
  * @author vddCore
  */
-class WorkForInteractionListener : InteractionListener, LoginListener {
-    companion object {
-        private val WEAPON_ICONS = arrayListOf(
-            Items.BRONZE_SCIMITAR_1321,
-            Items.STEEL_SCIMITAR_1325,
-            Items.RUNE_SCIMITAR_1333,
-            Items.BRONZE_MACE_1422,
-            Items.MITHRIL_WARHAMMER_1343
-        )
-
-        private val EMPLOYERS_AND_JOBS = mapOf(
-            NPCs.HANS_0 to listOf(
-                GatheringJobs.AIR_RUNE,
-                GatheringJobs.COWHIDES,
-                GatheringJobs.WATER_RUNE
-            ),
-
-            NPCs.AGGIE_922 to listOf(
-                GatheringJobs.ASHES,
-                GatheringJobs.AIR_RUNE,
-                GatheringJobs.WATER_RUNE
-            ),
-
-            NPCs.GILLIE_GROATS_3807 to listOf(
-                GatheringJobs.COWHIDES
-            ),
-
-            NPCs.COOKING_TUTOR_4899 to listOf(
-                GatheringJobs.CAKE,
-                GatheringJobs.ANCHOVY_PIZZA,
-                GatheringJobs.COOKED_SALMON,
-                GatheringJobs.COOKED_TROUT,
-                GatheringJobs.MEAT_PIE,
-                GatheringJobs.MEAT_PIZZA,
-                GatheringJobs.PLAIN_PIZZA
-            ),
-
-            NPCs.FISHING_TUTOR_4901 to listOf(
-                GatheringJobs.RAW_SALMON,
-                GatheringJobs.RAW_SHRIMP,
-                GatheringJobs.RAW_TROUT
-            ),
-
-            NPCs.MINING_TUTOR_4902 to listOf(
-                GatheringJobs.COPPER_ORE,
-                GatheringJobs.TIN_ORE,
-                GatheringJobs.COAL,
-                GatheringJobs.IRON_ORE,
-                GatheringJobs.SILVER_ORE,
-                GatheringJobs.GOLD_ORE
-            ),
-
-            NPCs.PRAYER_TUTOR_4903 to listOf(
-                GatheringJobs.SILVER_ORE
-            ),
-
-            NPCs.SMELTING_TUTOR_4904 to listOf(
-                GatheringJobs.BRONZE_BAR,
-                GatheringJobs.IRON_BAR,
-                GatheringJobs.STEEL_BAR
-            ),
-
-            NPCs.WOODCUTTING_TUTOR_4906 to listOf(
-                GatheringJobs.LOG,
-                GatheringJobs.OAK,
-                GatheringJobs.WILLOW
-            )
-        )
-
-        private val EMPLOYER_JOB_TYPES = mapOf(
-            NPCs.HANS_0 to JobType.GATHERING,
-            NPCs.MELEE_TUTOR_705 to JobType.SLAYING,
-            NPCs.AGGIE_922 to JobType.GATHERING,
-            NPCs.RANGED_TUTOR_1861 to JobType.SLAYING,
-            NPCs.GILLIE_GROATS_3807 to JobType.GATHERING,
-            NPCs.MAGIC_TUTOR_4707 to JobType.SLAYING,
-            NPCs.COOKING_TUTOR_4899 to JobType.GATHERING,
-            NPCs.FISHING_TUTOR_4901 to JobType.GATHERING,
-            NPCs.MINING_TUTOR_4902 to JobType.GATHERING,
-            NPCs.PRAYER_TUTOR_4903 to JobType.GATHERING,
-            NPCs.SMELTING_TUTOR_4904 to JobType.GATHERING,
-            NPCs.WOODCUTTING_TUTOR_4906 to JobType.GATHERING
-        )
-
-        private val EMPLOYER_IDS = EMPLOYER_JOB_TYPES.keys.toIntArray()
-    }
-
-
-    override fun login(player: Player) {
-        val remaining = getAttribute(player, "jobs:amount", -1)
-        val jobType = JobType.values()[getAttribute(player, "jobs:type", 0)]
-
-        if (jobType == JobType.SLAYING && remaining > 0) {
-            player.hook(Event.NPCKilled, JobKillHook)
-        }
-    }
-
+class WorkForInteractionListener : InteractionListener {
     override fun defineListeners() {
-        on(EMPLOYER_IDS, IntType.NPC, "work-for") { player, node ->
-            if (JobManager.getStoreFile().getInt(player.username.lowercase()) == 3) {
-                sendNPCDialogue(player, node.id, "You've hit your limit for the day. Come back tomorrow!")
+        on(
+            Employers.values().map { employer -> employer.npcId }.toIntArray(),
+            IntType.NPC,
+            "work-for"
+        ) { player, node ->
+            val playerJobManager = JobManager.getInstance(player)
+            val job = playerJobManager.job
+
+            // Check if the player is talking to the NPC that gave them their job
+            if (job != null && job.employer.npcId == node.id) {
+                if (playerJobManager.jobAmount == 0) {
+                    playerJobManager.rewardPlayer()
+                    sendNPCDialogue(
+                        player,
+                        job.employer.npcId,
+                        "There you go, thanks for your help. You're quite a skilled worker!"
+                    )
+                } else {
+                    openDialogue(player, CheckJobDialogueFile(), node as NPC)
+                }
+
                 return@on true
             }
 
-            if (getAttribute(player, "jobs:id", -1) != -1) {
-                JobManager.rewardPlayer(player, node.asNpc())
-                return@on true
-            }
-
-            var amount: Int
-            val jobType = EMPLOYER_JOB_TYPES[node.id] ?: return@on false
-            val jobId = when (jobType) {
-                JobType.GATHERING -> {
-                    val job = EMPLOYERS_AND_JOBS[node.id]?.filter { checkRequirement(player, it) }?.randomOrNull()
-
-                    if (job == null) {
-                        sendNPCDialogue(
-                            player,
-                            node.id,
-                            "I'm sorry, I don't currently have any jobs that you're qualified for.",
-                            core.game.dialogue.FacialExpression.HALF_THINKING
-                        )
-                        return@on true
-                    }
-
-                    amount = job.getAmount()
-                    job.ordinal
-                }
-
-                JobType.SLAYING -> {
-                    SlayingJobs.values().random().ordinal.also {
-                        amount = SlayingJobs.values()[it].getAmount()
-                    }
-                }
-            }
-
-            when (jobType) {
-                JobType.GATHERING -> {
-                    val job = GatheringJobs.values()[jobId]
-
-                    sendItemDialogue(
-                        player,
-                        job.itemId,
-                        "You are assigned to gather $amount ${Item(job.itemId).name.lowercase()}"
-                    )
-                }
-
-                JobType.SLAYING -> {
-                    val job = SlayingJobs.values()[jobId]
-
-                    sendItemDialogue(
-                        player,
-                        WEAPON_ICONS.random(),
-                        "You are assigned to kill $amount ${NPC(job.ids[0]).name.lowercase()}"
-                    )
-
-                    player.unhook(JobKillHook) //try to unhook just in case they already had it hooked, unlikely but possible.
-                    player.hook(Event.NPCKilled, JobKillHook)
-                }
-            }
-
-            setAttribute(player, "/save:jobs:id", jobId)
-            setAttribute(player, "/save:jobs:amount", amount)
-            setAttribute(player, "/save:jobs:original_amount", amount)
-            setAttribute(player, "/save:jobs:type", jobType.ordinal)
-
-            player.dispatch(JobAssignmentEvent(jobType, node.asNpc()))
+            openDialogue(player, StartJobDialogueFile(), node as NPC)
             return@on true
         }
     }
-
-    private fun checkRequirement(player: Player, jobs: GatheringJobs?): Boolean {
-        jobs ?: return true
-
-        if (getStatLevel(player, jobs.skill) < jobs.lvlReq) {
-            return false
-        }
-
-        return true
-    }
-
-    private object JobKillHook : EventHook<NPCKillEvent> {
-        override fun process(entity: Entity, event: NPCKillEvent) {
-            if (entity !is Player) return
-            if (entity.isArtificial) return
-
-            val job = getAttribute(entity, "jobs:id", -1)
-
-            if (job !in 0 until SlayingJobs.values().size) {
-                return
-            }
-
-            val ids = SlayingJobs.values()[job].ids
-
-            if (event.npc.id in ids) {
-                JobManager.updateJobRemaining(entity, 1)
-            }
-        }
-    }
 }

Server/src/main/content/global/activity/jobs/impl/BoneBuryingJobs.kt

@@ -0,0 +1,30 @@
+package content.global.activity.jobs.impl
+
+import content.global.activity.jobs.Job
+import content.global.activity.jobs.JobType
+import core.game.world.map.zone.ZoneBorders
+import org.rs09.consts.Items
+
+/**
+ * An enum of the possible bone-burying jobs that can be assigned to a player.
+ *
+ * Note: Due to how player save files keep track of the player's current job, it is essential that
+ * new entries are only appended to the end of this enum, and the ordering of existing entries is not changed.
+ */
+enum class BoneBuryingJobs(val buryArea: BuryArea, val boneIds: List<Int>, override val employer: Employers) : Job {
+    BURY_DRAYNOR(BuryArea.DRAYNOR_WHEAT_FIELD, Bones.BONES, Employers.PRAYER_TUTOR),
+    BURY_LUMBRIDGE_GRAVEYARD(BuryArea.LUMBRIDGE_GRAVEYARD, Bones.BONES, Employers.PRAYER_TUTOR);
+
+    override val type = JobType.BONE_BURYING
+    override val lower = 22
+    override val upper = 26
+
+    enum class BuryArea(val zoneBorder: ZoneBorders, val title: String) {
+        DRAYNOR_WHEAT_FIELD(ZoneBorders(3107, 3265, 3132, 3293), "wheat field east of Draynor Village"),
+        LUMBRIDGE_GRAVEYARD(ZoneBorders(3238, 3191, 3252, 3204), "Lumbridge Graveyard");
+    }
+
+    object Bones {
+        val BONES = listOf(Items.BONES_526, Items.BONES_2530)
+    }
+}

Server/src/main/content/global/activity/jobs/impl/CombatJobs.kt

@@ -0,0 +1,209 @@
+package content.global.activity.jobs.impl
+
+import content.global.activity.jobs.Job
+import content.global.activity.jobs.JobType
+import org.rs09.consts.NPCs
+
+/**
+ * An enum of the possible combat jobs that can be assigned to a player.
+ *
+ * Note: Due to how player save files keep track of the player's current job, it is essential that
+ * new entries are only appended to the end of this enum, and the ordering of existing entries is not changed.
+ */
+enum class CombatJobs(val monsterIds: List<Int>, override val employer: Employers) : Job {
+    CHICKENS(Monsters.CHICKENS, Employers.RANGED_TUTOR),
+    COWS(Monsters.COWS, Employers.MAGIC_TUTOR),
+    GIANT_SPIDERS(Monsters.GIANT_SPIDERS, Employers.MAGIC_TUTOR),
+    SCORPIONS(Monsters.SCORPIONS, Employers.MELEE_TUTOR),
+    GOBLINS(Monsters.GOBLINS, Employers.MELEE_TUTOR);
+
+    override val type = JobType.COMBAT
+    override val lower = 22
+    override val upper = 28
+
+    object Monsters {
+        val GIANT_SPIDERS = listOf(NPCs.GIANT_SPIDER_59, NPCs.GIANT_SPIDER_60)
+        val SCORPIONS = listOf(NPCs.SCORPION_107, NPCs.SCORPION_1477, NPCs.SCORPION_4402, NPCs.SCORPION_4403)
+        val GOBLINS = listOf(
+            NPCs.GOBLIN_100,
+            NPCs.GOBLIN_101,
+            NPCs.GOBLIN_102,
+            NPCs.GOBLIN_1769,
+            NPCs.GOBLIN_1770,
+            NPCs.GOBLIN_1771,
+            NPCs.GOBLIN_1772,
+            NPCs.GOBLIN_1773,
+            NPCs.GOBLIN_1774,
+            NPCs.GOBLIN_1775,
+            NPCs.GOBLIN_1776,
+            NPCs.GOBLIN_2274,
+            NPCs.GOBLIN_2275,
+            NPCs.GOBLIN_2276,
+            NPCs.GOBLIN_2277,
+            NPCs.GOBLIN_2278,
+            NPCs.GOBLIN_2279,
+            NPCs.GOBLIN_2280,
+            NPCs.GOBLIN_2281,
+            NPCs.GOBLIN_2678,
+            NPCs.GOBLIN_2679,
+            NPCs.GOBLIN_2680,
+            NPCs.GOBLIN_2681,
+            NPCs.GOBLIN_3264,
+            NPCs.GOBLIN_3265,
+            NPCs.GOBLIN_3266,
+            NPCs.GOBLIN_3267,
+            NPCs.GOBLIN_3726,
+            NPCs.GOBLIN_4261,
+            NPCs.GOBLIN_4262,
+            NPCs.GOBLIN_4263,
+            NPCs.GOBLIN_4264,
+            NPCs.GOBLIN_4265,
+            NPCs.GOBLIN_4266,
+            NPCs.GOBLIN_4267,
+            NPCs.GOBLIN_4268,
+            NPCs.GOBLIN_4269,
+            NPCs.GOBLIN_4270,
+            NPCs.GOBLIN_4271,
+            NPCs.GOBLIN_4272,
+            NPCs.GOBLIN_4273,
+            NPCs.GOBLIN_4274,
+            NPCs.GOBLIN_4275,
+            NPCs.GOBLIN_4276,
+            NPCs.GOBLIN_4407,
+            NPCs.GOBLIN_4408,
+            NPCs.GOBLIN_4409,
+            NPCs.GOBLIN_4410,
+            NPCs.GOBLIN_4411,
+            NPCs.GOBLIN_4412,
+            NPCs.GOBLIN_444,
+            NPCs.GOBLIN_445,
+            NPCs.GOBLIN_4479,
+            NPCs.GOBLIN_4480,
+            NPCs.GOBLIN_4481,
+            NPCs.GOBLIN_4482,
+            NPCs.GOBLIN_4483,
+            NPCs.GOBLIN_4484,
+            NPCs.GOBLIN_4485,
+            NPCs.GOBLIN_4486,
+            NPCs.GOBLIN_4487,
+            NPCs.GOBLIN_4488,
+            NPCs.GOBLIN_4489,
+            NPCs.GOBLIN_4490,
+            NPCs.GOBLIN_4491,
+            NPCs.GOBLIN_4492,
+            NPCs.GOBLIN_4499,
+            NPCs.GOBLIN_4633,
+            NPCs.GOBLIN_4634,
+            NPCs.GOBLIN_4635,
+            NPCs.GOBLIN_4636,
+            NPCs.GOBLIN_4637,
+            NPCs.GOBLIN_5855,
+            NPCs.GOBLIN_5856,
+            NPCs.GOBLIN_6125,
+            NPCs.GOBLIN_6126,
+            NPCs.GOBLIN_6132,
+            NPCs.GOBLIN_6133,
+            NPCs.GOBLIN_6279,
+            NPCs.GOBLIN_6280,
+            NPCs.GOBLIN_6281,
+            NPCs.GOBLIN_6282,
+            NPCs.GOBLIN_6283,
+            NPCs.GOBLIN_6284,
+            NPCs.GOBLIN_6402,
+            NPCs.GOBLIN_6403,
+            NPCs.GOBLIN_6404,
+            NPCs.GOBLIN_6405,
+            NPCs.GOBLIN_6406,
+            NPCs.GOBLIN_6407,
+            NPCs.GOBLIN_6408,
+            NPCs.GOBLIN_6409,
+            NPCs.GOBLIN_6410,
+            NPCs.GOBLIN_6411,
+            NPCs.GOBLIN_6412,
+            NPCs.GOBLIN_6413,
+            NPCs.GOBLIN_6414,
+            NPCs.GOBLIN_6415,
+            NPCs.GOBLIN_6416,
+            NPCs.GOBLIN_6417,
+            NPCs.GOBLIN_6418,
+            NPCs.GOBLIN_6419,
+            NPCs.GOBLIN_6420,
+            NPCs.GOBLIN_6421,
+            NPCs.GOBLIN_6422,
+            NPCs.GOBLIN_6423,
+            NPCs.GOBLIN_6424,
+            NPCs.GOBLIN_6425,
+            NPCs.GOBLIN_6426,
+            NPCs.GOBLIN_6427,
+            NPCs.GOBLIN_6428,
+            NPCs.GOBLIN_6429,
+            NPCs.GOBLIN_6430,
+            NPCs.GOBLIN_6431,
+            NPCs.GOBLIN_6432,
+            NPCs.GOBLIN_6433,
+            NPCs.GOBLIN_6434,
+            NPCs.GOBLIN_6435,
+            NPCs.GOBLIN_6436,
+            NPCs.GOBLIN_6437,
+            NPCs.GOBLIN_6438,
+            NPCs.GOBLIN_6439,
+            NPCs.GOBLIN_6440,
+            NPCs.GOBLIN_6441,
+            NPCs.GOBLIN_6442,
+            NPCs.GOBLIN_6443,
+            NPCs.GOBLIN_6444,
+            NPCs.GOBLIN_6445,
+            NPCs.GOBLIN_6446,
+            NPCs.GOBLIN_6447,
+            NPCs.GOBLIN_6448,
+            NPCs.GOBLIN_6449,
+            NPCs.GOBLIN_6450,
+            NPCs.GOBLIN_6451,
+            NPCs.GOBLIN_6452,
+            NPCs.GOBLIN_6453,
+            NPCs.GOBLIN_6454,
+            NPCs.GOBLIN_6455,
+            NPCs.GOBLIN_6456,
+            NPCs.GOBLIN_6457,
+            NPCs.GOBLIN_6458,
+            NPCs.GOBLIN_6459,
+            NPCs.GOBLIN_6460,
+            NPCs.GOBLIN_6461,
+            NPCs.GOBLIN_6462,
+            NPCs.GOBLIN_6463,
+            NPCs.GOBLIN_6464,
+            NPCs.GOBLIN_6465,
+            NPCs.GOBLIN_6466,
+            NPCs.GOBLIN_6467,
+            NPCs.GOBLIN_6490,
+            NPCs.GOBLIN_6491,
+            NPCs.GOBLIN_6492,
+            NPCs.GOBLIN_6493,
+            NPCs.GOBLIN_6494,
+            NPCs.GOBLIN_6495,
+            NPCs.GOBLIN_7964,
+            NPCs.GOBLIN_7965
+        )
+        val COWS = listOf(
+            NPCs.COW_81,
+            NPCs.COW_397,
+            NPCs.COW_955,
+            NPCs.COW_1767,
+            NPCs.COW_3309,
+            NPCs.COW_CALF_1766,
+            NPCs.COW_CALF_1768,
+            NPCs.COW_CALF_2310
+        )
+        val CHICKENS = listOf(
+            NPCs.CHICKEN_1017,
+            NPCs.CHICKEN_1401,
+            NPCs.CHICKEN_1402,
+            NPCs.CHICKEN_2313,
+            NPCs.CHICKEN_2314,
+            NPCs.CHICKEN_2315,
+            NPCs.CHICKEN_288,
+            NPCs.CHICKEN_41,
+            NPCs.CHICKEN_951,
+        )
+    }
+}

Server/src/main/content/global/activity/jobs/impl/Employers.kt

@@ -0,0 +1,24 @@
+package content.global.activity.jobs.impl
+
+import org.rs09.consts.NPCs
+
+/**
+ * An enum of NPCs that can assign the player a job.
+ *
+ * TODO: Add the rest of the era-correct employers
+ */
+enum class Employers(val npcId: Int) {
+    WOODCUTTING_TUTOR(NPCs.WOODCUTTING_TUTOR_4906),
+    MAGIC_TUTOR(NPCs.MAGIC_TUTOR_4707),
+    MELEE_TUTOR(NPCs.MELEE_TUTOR_705),
+    RANGED_TUTOR(NPCs.RANGED_TUTOR_1861),
+    COOKING_TUTOR(NPCs.COOKING_TUTOR_4899),
+    CRAFTING_TUTOR(NPCs.CRAFTING_TUTOR_4900),
+    FISHING_TUTOR(NPCs.FISHING_TUTOR_4901),
+    MINING_TUTOR(NPCs.MINING_TUTOR_4902),
+    SMELTING_TUTOR(NPCs.SMELTING_TUTOR_4904),
+    PRAYER_TUTOR(NPCs.PRAYER_TUTOR_4903),
+    HANS(NPCs.HANS_0),
+    GILLIE_GROATS(NPCs.GILLIE_GROATS_3807),
+    AGGIE(NPCs.AGGIE_922);
+}

Server/src/main/content/global/activity/jobs/impl/GatheringJobs.kt

@@ -1,68 +0,0 @@
-package content.global.activity.jobs.impl
-
-import core.game.node.entity.skill.Skills
-import core.tools.RandomFunction
-
-enum class GatheringJobs(val lower: Int, val upper: Int, val lvlReq: Int, val itemId: Int,val skill: Int) {
-    LOG(20, 28, 1, 1511, Skills.WOODCUTTING),
-    COWHIDES(20, 28, 1, 1739, 0),
-    OAK(22, 28, 15, 1521, Skills.WOODCUTTING),
-    WATER_RUNE(20, 28, 5, 555, Skills.RUNECRAFTING),
-    EARTH_RUNE(20, 28, 9, 557, Skills.RUNECRAFTING),
-    FIRE_RUNE(20, 28, 14, 554, Skills.RUNECRAFTING),
-    AIR_RUNE(20, 28, 1, 556, Skills.RUNECRAFTING),
-    RUNE_ESS(20, 28, 1, 1436, Skills.MINING),
-    BALL_OF_WOOL(20, 28, 1, 1759, Skills.CRAFTING),
-    LEATHER_GLOVE(20, 28, 1, 1059, Skills.CRAFTING),
-    WILLOW(22, 28, 30, 1519, Skills.WOODCUTTING),
-    LEATHER_BOOT(24, 24, 1, 1061, Skills.CRAFTING),
-    BRONZE_DAGGER(24, 24, 1, 1205, Skills.SMITHING),
-    BRONZE_HELMS(22, 22, 1, 1139, Skills.SMITHING),
-    BRONZE_FULL_HELM(10, 10, 7, 1155, Skills.SMITHING),
-    BRONZE_CHAINBODY(10, 10, 11, 1103, Skills.SMITHING),
-    BRONZE_2H(10, 10, 14, 1307, Skills.SMITHING),
-    BRONZE_SCIM(10, 10, 5, 1321, Skills.SMITHING),
-    BRONZE_PLATEBODY(9, 10, 18, 1117, Skills.SMITHING),
-    BRONZE_PLATELEGS(9, 10, 16, 1075, Skills.SMITHING),
-    BRONZE_PLATESKIRTS(9, 10, 16, 1087, Skills.SMITHING),
-    BRONZE_WARHAMMER(9, 9, 9, 1337, Skills.SMITHING),
-    IRON_DAGGER(13, 13, 15, 1203, Skills.SMITHING),
-    IRON_CHAINBODY(10, 10, 26, 1101, Skills.SMITHING),
-    IRON_2H(9, 9, 29, 1309, Skills.SMITHING),
-    STEEL_BATTLEAXE(9, 9, 40, 1365, Skills.SMITHING),
-    STEEL_SCIMITAR(9, 9, 35, 1325, Skills.SMITHING),
-    STEEL_PLATEBODY(9, 10, 48, 1119, Skills.SMITHING),
-    STEEL_WARHAMMER(9, 10, 39, 1339, Skills.SMITHING),
-    LEATHER_CHAPS(22, 28, 18, 1095, Skills.CRAFTING),
-    LEATHER_BODY(22, 28, 14, 1129, Skills.CRAFTING),
-    LEATHER_COWL(22, 28, 9, 1167, Skills.CRAFTING),
-    LEATHER_COIF(22, 28, 38, 1169, Skills.CRAFTING),
-    RAW_SHRIMP(22, 28, 1, 317, Skills.FISHING),
-    COOKED_SHRIMP(22, 28, 1, 315, Skills.COOKING),
-    RAW_CRAYFISH(22, 28, 1, 13435, Skills.FISHING),
-    COOKED_CRAYFISH(22, 28, 1, 13433, Skills.COOKING),
-    RAW_TROUT(22, 28, 20, 335, Skills.FISHING),
-    COOKED_TROUT(22, 28, 15, 333, Skills.COOKING),
-    RAW_SALMON(22, 28, 30, 331, Skills.FISHING),
-    COOKED_SALMON(22, 28, 25, 329, Skills.COOKING),
-    CAKE(12, 16, 40, 1891, Skills.COOKING),
-    MEAT_PIE(12, 16, 20, 2327, Skills.COOKING),
-    PLAIN_PIZZA(12, 16, 35, 2289, Skills.COOKING),
-    MEAT_PIZZA(12, 16, 45, 2293, Skills.COOKING),
-    ANCHOVY_PIZZA(12, 16, 55, 2297, Skills.COOKING),
-    REDBERRY_PIE(12, 16, 10, 2325, Skills.COOKING),
-    COPPER_ORE(22, 28, 1, 436, Skills.MINING),
-    TIN_ORE(23, 26, 1, 438, Skills.MINING),
-    IRON_ORE(24, 24, 15, 440, Skills.MINING),
-    SILVER_ORE(22, 28, 20, 442, Skills.MINING),
-    COAL(22, 26, 30, 453, Skills.MINING),
-    GOLD_ORE(22, 24, 40, 444, Skills.MINING),
-    BRONZE_BAR(10, 12, 1, 2349, Skills.SMITHING),
-    IRON_BAR(22, 28, 15, 2351, Skills.SMITHING),
-    STEEL_BAR(22, 28, 30, 2353, Skills.SMITHING),
-    ASHES(26, 26, 1, 592, 0);
-
-    fun getAmount(): Int {
-        return RandomFunction.random(lower,upper + 1)
-    }
-}

Server/src/main/content/global/activity/jobs/impl/ProductionJobs.kt

@@ -0,0 +1,80 @@
+package content.global.activity.jobs.impl
+
+import content.global.activity.jobs.Job
+import content.global.activity.jobs.JobType
+import core.game.node.entity.skill.Skills
+
+/**
+ * An enum of the possible production jobs that can be assigned to a player.
+ *
+ * Note: Due to how player save files keep track of the player's current job, it is essential that
+ * new entries are only appended to the end of this enum, and the ordering of existing entries is not changed.
+ */
+enum class ProductionJobs(
+    override val lower: Int,
+    override val upper: Int,
+    val lvlReq: Int,
+    val itemId: Int,
+    val skill: Int,
+    override val employer: Employers
+) : Job {
+    LOG(20, 28, 1, 1511, Skills.WOODCUTTING, Employers.WOODCUTTING_TUTOR),
+    COWHIDES(20, 28, 1, 1739, 0, Employers.HANS),
+    OAK(22, 28, 15, 1521, Skills.WOODCUTTING, Employers.WOODCUTTING_TUTOR),
+    WATER_RUNE(20, 28, 5, 555, Skills.RUNECRAFTING, Employers.HANS),
+    EARTH_RUNE(20, 28, 9, 557, Skills.RUNECRAFTING, Employers.AGGIE),
+    FIRE_RUNE(20, 28, 14, 554, Skills.RUNECRAFTING, Employers.AGGIE),
+    AIR_RUNE(20, 28, 1, 556, Skills.RUNECRAFTING, Employers.HANS),
+    RUNE_ESS(20, 28, 1, 1436, Skills.MINING, Employers.MINING_TUTOR),
+    BALL_OF_WOOL(20, 28, 1, 1759, Skills.CRAFTING, Employers.GILLIE_GROATS),
+    LEATHER_GLOVE(20, 28, 1, 1059, Skills.CRAFTING, Employers.GILLIE_GROATS),
+    WILLOW(22, 28, 30, 1519, Skills.WOODCUTTING, Employers.WOODCUTTING_TUTOR),
+    LEATHER_BOOT(24, 24, 1, 1061, Skills.CRAFTING, Employers.HANS),
+    BRONZE_DAGGER(24, 24, 1, 1205, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    BRONZE_HELMS(22, 22, 1, 1139, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    BRONZE_FULL_HELM(10, 10, 7, 1155, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    BRONZE_CHAINBODY(10, 10, 11, 1103, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    BRONZE_2H(10, 10, 14, 1307, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    BRONZE_SCIM(10, 10, 5, 1321, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    BRONZE_PLATEBODY(9, 10, 18, 1117, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    BRONZE_PLATELEGS(9, 10, 16, 1075, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    BRONZE_PLATESKIRTS(9, 10, 16, 1087, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    BRONZE_WARHAMMER(9, 9, 9, 1337, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    IRON_DAGGER(13, 13, 15, 1203, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    IRON_CHAINBODY(10, 10, 26, 1101, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    IRON_2H(9, 9, 29, 1309, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    STEEL_BATTLEAXE(9, 9, 40, 1365, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    STEEL_SCIMITAR(9, 9, 35, 1325, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    STEEL_PLATEBODY(9, 10, 48, 1119, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    STEEL_WARHAMMER(9, 10, 39, 1339, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    LEATHER_CHAPS(22, 28, 18, 1095, Skills.CRAFTING, Employers.CRAFTING_TUTOR),
+    LEATHER_BODY(22, 28, 14, 1129, Skills.CRAFTING, Employers.CRAFTING_TUTOR),
+    LEATHER_COWL(22, 28, 9, 1167, Skills.CRAFTING, Employers.CRAFTING_TUTOR),
+    LEATHER_COIF(22, 28, 38, 1169, Skills.CRAFTING, Employers.CRAFTING_TUTOR),
+    RAW_SHRIMP(22, 28, 1, 317, Skills.FISHING, Employers.FISHING_TUTOR),
+    COOKED_SHRIMP(22, 28, 1, 315, Skills.COOKING, Employers.COOKING_TUTOR),
+    RAW_CRAYFISH(22, 28, 1, 13435, Skills.FISHING, Employers.FISHING_TUTOR),
+    COOKED_CRAYFISH(22, 28, 1, 13433, Skills.COOKING, Employers.COOKING_TUTOR),
+    RAW_TROUT(22, 28, 20, 335, Skills.FISHING, Employers.FISHING_TUTOR),
+    COOKED_TROUT(22, 28, 15, 333, Skills.COOKING, Employers.COOKING_TUTOR),
+    RAW_SALMON(22, 28, 30, 331, Skills.FISHING, Employers.FISHING_TUTOR),
+    COOKED_SALMON(22, 28, 25, 329, Skills.COOKING, Employers.COOKING_TUTOR),
+    CAKE(12, 16, 40, 1891, Skills.COOKING, Employers.GILLIE_GROATS),
+    MEAT_PIE(12, 16, 20, 2327, Skills.COOKING, Employers.COOKING_TUTOR),
+    PLAIN_PIZZA(12, 16, 35, 2289, Skills.COOKING, Employers.COOKING_TUTOR),
+    MEAT_PIZZA(12, 16, 45, 2293, Skills.COOKING, Employers.COOKING_TUTOR),
+    ANCHOVY_PIZZA(12, 16, 55, 2297, Skills.COOKING, Employers.COOKING_TUTOR),
+    REDBERRY_PIE(12, 16, 10, 2325, Skills.COOKING, Employers.GILLIE_GROATS),
+    COPPER_ORE(22, 28, 1, 436, Skills.MINING, Employers.MINING_TUTOR),
+    TIN_ORE(23, 26, 1, 438, Skills.MINING, Employers.MINING_TUTOR),
+    IRON_ORE(24, 24, 15, 440, Skills.MINING, Employers.MINING_TUTOR),
+    SILVER_ORE(22, 28, 20, 442, Skills.MINING, Employers.PRAYER_TUTOR),
+    COAL(22, 26, 30, 453, Skills.MINING, Employers.MINING_TUTOR),
+    GOLD_ORE(22, 24, 40, 444, Skills.MINING, Employers.MINING_TUTOR),
+    BRONZE_BAR(10, 12, 1, 2349, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    IRON_BAR(22, 28, 15, 2351, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    STEEL_BAR(22, 28, 30, 2353, Skills.SMITHING, Employers.SMELTING_TUTOR),
+    ASHES(26, 26, 1, 592, 0, Employers.AGGIE);
+
+    override val type = JobType.PRODUCTION
+}

Server/src/main/content/global/activity/jobs/impl/SlayingJobs.kt

@@ -1,15 +0,0 @@
-package content.global.activity.jobs.impl
-
-import core.tools.RandomFunction
-
-enum class SlayingJobs(val lower: Int, val upper: Int, vararg val ids: Int) {
-    CHICKEN(25,26,41,1017),
-    COW(25,25,397,1766,81,1767),
-    GIANT_SPIDER(22,25,59,60),
-    SCORPION(25,25,107,108,109,144,4402,4403),
-    GOBLIN(25,25,100,101,102,298,299,444,445,489,745,1769,1770,1771,1772,1773,1774,1775,1776,2274,2275,2276,2277,2278,2279,2280,2281,2678,2679,2680,2681,3060,3264,3265,3266,3267);
-
-    fun getAmount(): Int {
-        return RandomFunction.random(lower,upper + 1)
-    }
-}

Server/src/main/content/global/activity/penguinhns/LarryHandler.kt

@@ -74,7 +74,7 @@ class LarryHandler(player: Player? = null) : core.game.dialogue.DialoguePlugin(p
         }
 
         val level = getStatLevel(player, skill)
-        System.out.println("Level: $level")
+
         val expGained = points?.toDouble()?.times((level * 25))
         System.out.print("exp: $expGained")
         player.skills.addExperience(skill,expGained!!)

Server/src/main/content/global/activity/penguinhns/PenguinHNSEvent.kt

@@ -1,39 +1,19 @@
 package content.global.activity.penguinhns
 
-import org.json.simple.JSONObject
 import core.ServerStore
-import core.game.worldevents.PluginSet
-import core.game.worldevents.WorldEvent
-import core.game.world.GameWorld
+import core.api.StartupListener
+import core.api.log
+import core.plugin.ClassScanner
+import core.tools.Log
+import org.json.simple.JSONObject
 
-class PenguinHNSEvent : WorldEvent("penguin-hns"){
+class PenguinHNSEvent : StartupListener {
     val manager = PenguinManager()
-    var lastTrigger: Int = 0
-    var tickDelay = if(GameWorld.settings?.isDevMode == true) 100 else 100000
 
-    override fun checkActive(): Boolean {
-        return true //this event is always active.
-    }
-
-    override fun checkTrigger(): Boolean {
-        return PenguinManager.penguins.isEmpty()
-    }
-
-    override fun initialize() {
-        plugins = PluginSet(
-                LarryHandler(),
-                NotebookHandler(),
-        )
-        super.initialize()
-        fireEvent()
-        log("Penguin HNS initialized.")
-    }
-
-    override fun fireEvent() {
-        log("Loading penguins...")
+    override fun startup() {
         manager.rebuildVars()
-        lastTrigger = GameWorld.ticks
-        log("Penguins loaded.")
+        ClassScanner.definePlugins(LarryHandler(), NotebookHandler())
+        log(this::class.java, Log.FINE, "Penguin HNS initialized.")
     }
 
     companion object {

Server/src/main/content/global/activity/penguinhns/PenguinManager.kt

@@ -7,6 +7,8 @@ import core.game.world.map.Location
 import org.json.simple.JSONArray
 import org.json.simple.JSONObject
 import core.ServerStore.Companion.toJSONArray
+import core.api.log
+import core.tools.Log
 import java.util.*
 
 class PenguinManager{
@@ -31,7 +33,7 @@ class PenguinManager{
         private fun updateStoreFile(){
             val jsonTags = JSONArray()
             tagMapping.filter { it.value.isNotEmpty() }.forEach { (ordinal,taggers) ->
-                SystemLogger.logInfo(this::class.java, "$ordinal - ${taggers.first()}")
+                log(this::class.java, Log.FINE, "$ordinal - ${taggers.first()}")
                 val tag = JSONObject()
                 tag["ordinal"] = ordinal
                 tag["taggers"] = taggers
@@ -64,8 +66,4 @@ class PenguinManager{
             penguins = spawnedOrdinals.toMutableList()
         }
     }
-
-    fun log(message: String){
-        SystemLogger.logInfo(this::class.java, "[Penguins] $message")
-    }
 }

Server/src/main/content/global/activity/penguinhns/PenguinSpyingHandler.kt

@@ -1,5 +1,6 @@
 package content.global.activity.penguinhns
 
+import core.api.*
 import core.game.node.entity.npc.NPC
 import core.game.node.entity.player.Player
 import core.game.system.task.Pulse
@@ -17,6 +18,7 @@ class PenguinSpyingHandler : InteractionListener {
                 player.sendMessage("You've already tagged this penguin.")
             } else {
                 GameWorld.submit(SpyPulse(player, npc))
+                playJingle(player, 345)
             }
             return@on true
         }

Server/src/main/content/global/activity/shootingstar/ShootingStar.kt

@@ -11,12 +11,13 @@ import core.ServerStore.Companion.getString
 
 import content.global.bots.ShootingStarBot
 import core.game.world.repository.Repository
+import core.tools.RandomFunction
 
 /**
  * Represents a shooting star object (Only ever initialized once) (ideally)
  * @author Ceikry
  */
-class ShootingStar(var level: ShootingStarType = ShootingStarType.values().random()){
+class ShootingStar(var level: ShootingStarType = ShootingStarType.values().random()) {
     val crash_locations = mapOf(
             "East of Dark Wizards' Tower" to Location.create(2925, 3339, 0), // East of Dark Wizards' Tower
             "Crafting Guild" to Location.create(2940, 3280, 0), // Crafting Guild Mine
@@ -26,12 +27,12 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando
             "Brimhaven mining site" to Location.create(2743, 3143, 0), // Brimhaven mining site
             "South Crandor mining site" to Location.create(2822, 3239, 0), // South Crandor mining site (requires Dragon Slayer)
             "Karamja mining site" to Location.create(2854, 3032, 0), // Karamja mining site
-            "Shilo Village mining site" to Location.create(2826, 2997, 0), // Shilo Village mining site/Gem rocks
+            "Shilo Village mining site" to Location.create(2826, 2997, 0), // Shilo Village mining site/Gem rocks (requires Shilo Village prereqs)
             "Relleka mining site" to Location.create(2682, 3700, 0), // Rellekka mining site
-            "Jatizso mine" to Location.create(2393, 3815, 0), //Jatiszo mining site (requires Fremennik Trials)
-            //"Lunar Isle mine" to Location.create(2140, 3939, 0), // Lunar Isle mine (requires Lunar Diplomacy?)
-            //"Miscellania coal mine" to Location.create(2529, 3887, 0), // Miscellania coal mine (requires Fremennik Trials)
-            //"Neitiznot runite mine" to Location.create(2376, 3835, 0), // Near the Neitiznot runite mine (requires Fremennik Trials) currently inaccessible as bridge does not work
+            "Jatizso mine" to Location.create(2393, 3815, 0), //Jatiszo mining site (requires Fremennik Isles prereqs)
+            "Lunar Isle mine" to Location.create(2140, 3939, 0), // Lunar Isle mine (requires Lunar Diplomacy prereqs)
+            "Miscellania coal mine" to Location.create(2529, 3887, 0), // Miscellania coal mine (requires The Fremennik Trials)
+            //"Neitiznot runite mine" to Location.create(2376, 3835, 0), // Near the Neitiznot runite mine (requires Fremennik Isles prereqs) currently inaccessible as bridge does not work
             "Ardougne mining site" to Location.create(2600, 3232, 0), // Ardougne mining site (Monastery)
             "Ardougne eastern mine" to Location.create(2706, 3334, 0), // Ardougne mining site (Legends Guild)
             "Kandarin Coal trucks" to Location.create(2589, 3485, 0), // Kandarin Coal trucks
@@ -48,11 +49,11 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando
             "South-west Varrock mine" to Location.create(3176, 3362, 0), // South-west Varrock mine / Champion's Guild mine
             "Varrock east bank" to Location.create(3259, 3407, 0), // Varrock east bank / Rune shop
             "Lumbridge Swamp south-east mine" to Location.create(3227, 3150, 0), // Lumbridge Swamp south-east mine
-            //"Burgh de Rott bank" to Location.create(3500, 3219, 0), // Burgh de Rott bank (requires Quest to enter)
+            //"Burgh de Rott bank" to Location.create(3500, 3219, 0), // Burgh de Rott bank (requires quest to enter)
             "Canifis Bank" to Location.create(3504, 3487, 0), // Canifis bank
-            "Mos Le'Harmless bank" to Location.create(3687, 2969, 0), // Mos Le'Harmless bank (requires Quest to enter but is currently accessible for Slayer)
+            "Mos Le'Harmless bank" to Location.create(3687, 2969, 0), // Mos Le'Harmless bank (requires quest to enter but is currently accessible for Slayer)
             "Gnome stronghold Bank" to Location.create(2460, 3432, 0), // Gnome stronghold bank
-            "Lletya bank" to Location.create(2329, 3163, 0), // Lletya bank (requires Roving Elves?)
+            "Lletya bank" to Location.create(2329, 3163, 0), // Lletya bank (requires MEP1 prereqs)
             "Piscatoris mining site" to Location.create(2336, 3636, 0), // Piscatoris mining site
             "North Edgeville mining site" to Location.create(3101, 3569, 0), // Wilderness Steel mine / Zamorak mage mine
             "Southern wilderness mine" to Location.create(3025, 3591, 0), // Wilderness skeleton mine
@@ -79,22 +80,15 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando
      * Degrades a ShootingStar (or removes the starObject and spawns a Star Sprite if it's the last star)
      */
     fun degrade() {
-        if(level.ordinal == 0){
-            selfBots.filter { it.isMining() }.forEach { it.sleep() }
-            SceneryBuilder.remove(starObject)
-            isSpawned = false
-            starSprite.location = starObject.location
-            starSprite.init()
-            spriteSpawned = true
-            ShootingStarPlugin.getStoreFile().clear()
+        if(level.ordinal == 0) {
+            spawnSprite()
             return
         }
         level = getNextType()
         maxDust = level.totalStardust
         dustLeft = level.totalStardust
-
         ShootingStarPlugin.getStoreFile()["level"] = level.ordinal
-        ShootingStarPlugin.getStoreFile()["isDiscovered"] = isDiscovered
+        ShootingStarPlugin.getStoreFile()["dustLeft"] = dustLeft
 
         val newStar = Scenery(level.objectId, starObject.location)
         SceneryBuilder.replace(starObject, newStar)
@@ -110,7 +104,6 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando
      */
     fun fire() {
         SceneryBuilder.remove(starObject)
-        rebuildVars()
         clearSprite()
         SceneryBuilder.add(starObject)
         if(!isSpawned) {
@@ -122,38 +115,55 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando
             selfBots.filter { it.isIdle() }.forEach { it.activate(true) }
         }
         isSpawned = true
-        Repository.sendNews("A shooting star level ${level.ordinal + 1} just crashed near ${location.toLowerCase()}!")
+        Repository.sendNews("A shooting star level ${level.ordinal + 1} just crashed near ${location}!")
+        ShootingStarPlugin.getStoreFile()["level"] = level.ordinal
+        ShootingStarPlugin.getStoreFile()["location"] = location
+        ShootingStarPlugin.getStoreFile()["isDiscovered"] = isDiscovered
+        ShootingStarPlugin.getStoreFile()["dustLeft"] = dustLeft
     }
 
     /**
      * Rebuilds some of the variables with new information.
      */
     fun rebuildVars(){
-        if(firstStar && ShootingStarPlugin.getStoreFile().isNotEmpty()){
-            level = ShootingStarType.values()[ShootingStarPlugin.getStoreFile().getInt("level")]
-            location = ShootingStarPlugin.getStoreFile().getString("location")
-            isDiscovered = ShootingStarPlugin.getStoreFile().getBoolean("isDiscovered")
-        } else {
-            level = ShootingStarType.values().random()
-            location = crash_locations.entries.random().key
-            isDiscovered = false
+        // Defaults
+        var levelOrd = RandomFunction.random(9)
+        level = ShootingStarType.values()[levelOrd]
+        location = crash_locations.entries.random().key
+        isDiscovered = false
+        dustLeft = level.totalStardust
+        ticks = 0
+        spriteSpawned = false
+
+        if (firstStar && ShootingStarPlugin.getStoreFile().isNotEmpty()) {
+            // Replace default with stored values, if any
+            levelOrd = ShootingStarPlugin.getStoreFile().getInt("level", levelOrd)
+            level = ShootingStarType.values()[levelOrd]
+            location = ShootingStarPlugin.getStoreFile().getString("location", location)
+            isDiscovered = ShootingStarPlugin.getStoreFile().getBoolean("isDiscovered", false)
+            dustLeft = ShootingStarPlugin.getStoreFile().getInt("dustLeft", dustLeft)
+            ticks = ShootingStarPlugin.getStoreFile().getInt("ticks", ticks)
+            spriteSpawned = ShootingStarPlugin.getStoreFile().getBoolean("spriteSpawned", false)
         }
 
         maxDust = level.totalStardust
-        dustLeft = level.totalStardust
         starObject = Scenery(level.objectId, crash_locations.get(location))
+    }
 
-        ShootingStarPlugin.getStoreFile()["level"] = level.ordinal
-        ShootingStarPlugin.getStoreFile()["location"] = location
-        ShootingStarPlugin.getStoreFile()["isDiscovered"] = false
-
-        ticks = 0
-        firstStar = false
+    fun spawnSprite() {
+        selfBots.filter { it.isMining() }.forEach { it.sleep() }
+        SceneryBuilder.remove(starObject)
+        isSpawned = false
+        starSprite.location = starObject.location
+        starSprite.init()
+        spriteSpawned = true
+        ShootingStarPlugin.getStoreFile()["spriteSpawned"] = spriteSpawned
     }
 
     fun clearSprite() {
         starSprite.clear()
         spriteSpawned = false
+        ShootingStarPlugin.getStoreFile()["spriteSpawned"] = spriteSpawned
     }
 
     /**
@@ -161,6 +171,7 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando
      */
     fun decDust() {
         if(--dustLeft <= 0) degrade()
+        ShootingStarPlugin.getStoreFile()["dustLeft"] = dustLeft
     }
 
     /**
@@ -220,4 +231,4 @@ enum class ShootingStarType(val objectId: Int, val exp: Int, val totalStardust:
     LEVEL_7(38662, 114, 40, 0.80),
     LEVEL_8(38661, 145, 25, 0.85),
     LEVEL_9(38660, 210, 15, 0.95);
-}
+}

Server/src/main/content/global/activity/shootingstar/ShootingStarMiningPulse.kt

@@ -48,9 +48,10 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
             val bonusXp = 75 * player.skills.getStaticLevel(Skills.MINING)
             player.incrementAttribute("/save:shooting-star:bonus-xp", bonusXp)
             Repository.sendNews(player.username + " is the discoverer of the crashed star near " + star.location + "!")
-            player.sendMessage("You have ${player.skills.experienceMutiplier * player.getAttribute("shooting-star:bonus-xp", 0).toDouble()} bonus xp towards mining stardust.")
+            player.sendMessage("You have ${player.skills.experienceMultiplier * player.getAttribute("shooting-star:bonus-xp", 0).toDouble()} bonus xp towards mining stardust.")
             ShootingStarPlugin.submitScoreBoard(player)
             star.isDiscovered = true
+            ShootingStarPlugin.getStoreFile()["isDiscovered"] = star.isDiscovered
             return player.skills.getLevel(Skills.MINING) >= star.miningLevel
         }
         
@@ -83,14 +84,13 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
         if (GameWorld.settings?.isDevMode == true) {
             star.dustLeft = 1
         }
-        star.decDust()
 
         val bonusXp = player.getAttribute("shooting-star:bonus-xp", 0).toDouble()
         var xp = star.level.exp.toDouble()
         if(bonusXp > 0) {
             val delta = Math.min(bonusXp, xp)
             player.incrementAttribute("/save:shooting-star:bonus-xp", (-delta).toInt())
-            xp += delta;
+            xp += delta
             if(player.getAttribute("shooting-star:bonus-xp", 0) <= 0) {
                 player.sendMessage("You have obtained all of your bonus xp from the star.")
             }
@@ -103,6 +103,8 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
         if(!inInventory(player, Items.ANCIENT_BLUEPRINT_14651) && !inBank(player, Items.ANCIENT_BLUEPRINT_14651)){
             rollBlueprint(player)
         }
+
+        star.decDust()
         return false
     }
 

Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt

@@ -12,10 +12,11 @@ import core.ServerStore.Companion.getBoolean
 import core.game.dialogue.DialogueFile
 import core.game.interaction.InteractionListener
 import core.game.interaction.IntType
-import core.tools.SystemLogger
 import core.game.system.command.Privilege
 import core.game.world.GameWorld
+import core.tools.Log
 import core.tools.secondsToTicks
+import content.data.Quests
 
 class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Commands, StartupListener {
     override fun login(player: Player) {
@@ -26,14 +27,30 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
     override fun tick() {
         ++star.ticks
 
+        // Check if the current star sprite should expire
         val maxDelay = tickDelay + (tickDelay / 3)
         if(star.ticks > maxDelay && star.spriteSpawned){
             star.clearSprite()
         }
 
-        if ((star.ticks >= tickDelay && !star.spriteSpawned) || (!star.isSpawned && !star.spriteSpawned)) {
+        if (star.firstStar && !star.isSpawned && !star.spriteSpawned) {
+            // Apparently, the server has only just booted
+            star.rebuildVars()
+            if (star.spriteSpawned) {
+                star.spawnSprite()
+            } else {
+                star.fire()
+            }
+            star.firstStar = false
+        }
+
+        // Check if it's time to fire a new one
+        if (star.ticks >= tickDelay && !star.spriteSpawned) {
+            star.rebuildVars()
             star.fire()
         }
+
+        getStoreFile()["ticks"] = star.ticks
     }
 
     override fun defineListeners() {
@@ -65,34 +82,52 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
                 return@on true
             }
 
-            val condition: (Player) -> Boolean = when(star.location.toLowerCase()){
-                "canifis bank" -> { p -> p.questRepository.isComplete("Priest in Peril")}
-                //"Burgh de Rott bank" -> { p -> p.questRepository.isComplete("Priest in Peril")} // for now, require this as it is in Morytania. remove when appropriate quests added - Crash
-                "crafting guild" -> {p -> hasLevelStat(p, Skills.CRAFTING, 40) }
-                "lletya bank" -> {p -> p.questRepository.isComplete("Roving Elves")}
-                "jatizso mine" -> {p -> p.questRepository.isComplete("Fremennik Trials")}
-                "south crandor mining site" -> {p -> p.questRepository.isComplete("Dragon Slayer")}
-                else -> {_ -> true}
+            class RingDialogue(val star: ShootingStar) : DialogueFile() {
+                val shouldWarn = when (star.location) {
+                    "North Edgeville mining site",
+                    "Southern wilderness mine",
+                    "Wilderness hobgoblin mine",
+                    "Pirates' Hideout mine",
+                    "Lava Maze mining site",
+                    "Mage Arena bank" -> true
+                    else -> false
+                }
+
+                override fun handle(componentID: Int, buttonID: Int) {
+                    fun teleportToStar(player: Player) {
+                        val condition: (p: Player) -> Boolean = when (star.location.toLowerCase()) {
+                            "canifis bank"              -> {p -> requireQuest(p, Quests.PRIEST_IN_PERIL, "to access this.")}
+                            //"burgh de rott bank"        -> {p -> hasRequirement(p, Quests.IN_AID_OF_THE_MYREQUE)} //disabled: crash
+                            "crafting guild"            -> {p -> hasLevelStat(p, Skills.CRAFTING, 40)}
+                            "lletya bank"               -> {p -> hasRequirement(p, Quests.MOURNINGS_END_PART_I)}
+                            "jatizso mine"              -> {p -> hasRequirement(p, Quests.THE_FREMENNIK_ISLES)}
+                            "south crandor mining site" -> {p -> hasRequirement(p, Quests.DRAGON_SLAYER)}
+                            "shilo village mining site" -> {p -> hasRequirement(p, Quests.SHILO_VILLAGE)}
+                            "mos le'harmless bank"      -> {p -> hasRequirement(p, Quests.CABIN_FEVER)} //needs to be updated to check for completion when the quest releases; https://runescape.wiki/w/Mos_Le%27Harmless?oldid=913025
+                            "lunar isle mine"           -> {p -> hasRequirement(p, Quests.LUNAR_DIPLOMACY)}
+                            "miscellania coal mine"     -> {p -> requireQuest(p, Quests.THE_FREMENNIK_TRIALS, "to access this.")}
+                            //"neitiznot runite mine"     -> {p -> hasRequirement(p, Quests.THE_FREMENNIK_ISLES)} //disabled: currently not reachable
+                            else -> {_ -> true}
+                        }
+                        if (!condition.invoke(player)) {
+                            sendDialogue(player,"Magical forces prevent your teleportation.")
+                        } else if (teleport(player, star.crash_locations[star.location]!!.transform(0, -1, 0), TeleportManager.TeleportType.MINIGAME)) {
+                            getRingStoreFile()[player.username.toLowerCase()] = true
+                        }
+                    }
+                    when (stage) {
+                        0 -> dialogue(if (star.spriteSpawned) "The star sprite has already been freed." else "The star sprite is still trapped.").also { if (shouldWarn) stage++ else stage += 2 }
+                        1 -> dialogue("WARNING: The star is located in the wilderness.").also { stage++ }
+                        2 -> player.dialogueInterpreter.sendOptions("Teleport to the star?", "Yes", "No").also { stage++ }
+                        3 -> when (buttonID) {
+                            1 -> end().also { teleportToStar(player) }
+                            2 -> end()
+                        }
+                    }
+                }
             }
 
-            if(!condition.invoke(player) || player.skullManager.isWilderness){
-                sendDialogue(player, "Magical forces prevent your teleportation.")
-                return@on true
-            }
-
-            val shouldWarn = when(star.location){
-                "North Edgeville mining site",
-                "Southern wilderness mine",
-                "Wilderness Volcano bank",
-                "Wilderness hobgoblin mine",
-                "Pirates' Hideout mine",
-                "Lava Maze mining site",
-                "Mage Arena bank" -> true
-                else -> false
-            }
-
-            openDialogue(player, RingDialogue(shouldWarn, star))
-
+            openDialogue(player, RingDialogue(star))
             return@on true
         }
     }
@@ -103,6 +138,7 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
         }
 
         define("submit", Privilege.ADMIN) { _, _ ->
+            star.rebuildVars()
             star.fire()
         }
 
@@ -112,30 +148,11 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
     }
 
     override fun startup() {
-        SystemLogger.logInfo(this::class.java, "Shooting Stars initialized.")
+        log(this::class.java, Log.FINE, "Shooting Stars initialized.")
     }
 
     private data class ScoreboardEntry(val player: String, val time: Int)
 
-    private class RingDialogue(val shouldWarn: Boolean, val star: ShootingStar) : DialogueFile(){
-        override fun handle(componentID: Int, buttonID: Int) {
-            when (stage) {
-                0 -> dialogue(if (star.spriteSpawned) "The star sprite has already been freed." else "The star sprite is still trapped.").also { if (shouldWarn) stage++ else stage += 2 }
-                1 -> dialogue("WARNING: The star is located in the wilderness.").also { stage++ }
-                2 -> player!!.dialogueInterpreter.sendOptions("Teleport to the star?", "Yes", "No").also { stage++ }
-                3 -> when (buttonID) {
-                    1 -> teleport(player!!, star).also { end() }
-                    2 -> end()
-                }
-            }
-        }
-
-        fun teleport(player: Player, star: ShootingStar){
-            teleport(player, star.crash_locations[star.location]!!.transform(0, -1, 0), TeleportManager.TeleportType.MINIGAME)
-            getRingStoreFile()[player.username.toLowerCase()] = true
-        }
-    }
-
     companion object {
         private val star = ShootingStar()
         private val tickDelay = if(GameWorld.settings?.isDevMode == true) 200 else 25000

Server/src/main/content/global/activity/shootingstar/ShootingStarState.kt

@@ -1,47 +0,0 @@
-package content.global.activity.shootingstar
-
-import core.game.node.entity.player.Player
-import core.game.node.entity.state.PlayerState
-import core.game.node.entity.state.State
-import core.game.system.task.Pulse
-import core.tools.ticksToSeconds
-import org.json.simple.JSONObject
-
-@PlayerState("shooting-star")
-class ShootingStarState(player: Player? = null) : State(player) {
-    var ticksLeft = 1500
-
-    override fun save(root: JSONObject) {
-        root["ticksLeft"] = ticksLeft
-    }
-
-    override fun parse(_data: JSONObject) {
-        if(_data.containsKey("ticksLeft")){
-            ticksLeft = _data["ticksLeft"].toString().toInt()
-        }
-    }
-
-    override fun newInstance(player: Player?): State {
-        return ShootingStarState(player)
-    }
-
-    override fun createPulse() {
-        player ?: return
-        if(ticksLeft <= 0) return
-        pulse = object : Pulse(){
-            override fun pulse(): Boolean {
-                val minutes = ticksToSeconds(ticksLeft) / 60.0
-                if(minutes % 5.0 == 0.0){
-                    player.sendMessage("<col=f0f095>You have $minutes minutes of your mining bonus left</col>")
-                }
-                if(ticksLeft-- <= 0){
-                    player.sendMessage("<col=FF0000>Your mining bonus has run out!</col>")
-                    pulse = null
-                    return true
-                }
-                return false
-            }
-        }
-    }
-
-}

Server/src/main/content/global/activity/shootingstar/StarBonus.kt

@@ -0,0 +1,28 @@
+package content.global.activity.shootingstar
+
+import core.api.*
+import core.game.system.timer.*
+import core.game.node.entity.Entity
+import core.game.node.entity.player.Player
+import org.json.simple.*
+
+class StarBonus : PersistTimer (1, "shootingstar:bonus") {
+    var ticksLeft = 1500
+
+    override fun save (root: JSONObject, entity: Entity) {
+        root["ticksLeft"] = ticksLeft.toString()
+    }
+
+    override fun parse (root: JSONObject, entity: Entity) {
+        ticksLeft = root["ticksLeft"].toString().toInt()
+    }
+
+    override fun run (entity: Entity) : Boolean {
+        if (entity is Player && ticksLeft == 500) {
+            entity.sendMessage("<col=f0f095>You have 5 minutes of your mining bonus left</col>")
+        } else if (entity is Player && ticksLeft == 0) {
+            entity.sendMessage("<col=FF0000>Your mining bonus has run out!</col>")
+        }
+        return ticksLeft-- > 0
+    }
+}

Server/src/main/content/global/activity/shootingstar/StarSpriteDialogue.kt

@@ -82,7 +82,7 @@ class StarSpriteDialogue(player: Player? = null) : core.game.dialogue.DialoguePl
     override fun handle(interfaceId: Int, buttonId: Int): Boolean {
         when (stage) {
             0 -> {
-                npc("I'm a star sprite! I Was in my star in the sky, when it", "lost control and crashed into the ground. With half my", "star sticking into the ground, I became stuck.", "Fortunately, I was mined out by the kind creatures of")
+                npc("I'm a star sprite! I was in my star in the sky, when it", "lost control and crashed into the ground. With half my", "star sticking into the ground, I became stuck.", "Fortunately, I was mined out by the kind creatures of")
                 stage++
             }
             1 -> {
@@ -198,7 +198,8 @@ class StarSpriteDialogue(player: Player? = null) : core.game.dialogue.DialoguePl
 
                     getStoreFile()[player.username.toLowerCase()] = true //flag daily as completed
 
-                    player.registerState("shooting-star")?.init()
+                    val timer = getOrStartTimer <StarBonus> (player)
+                    timer.ticksLeft = 1500
 
                     if(wearingRing){
                         val item = intArrayOf(Items.COSMIC_RUNE_564, Items.ASTRAL_RUNE_9075, Items.GOLD_ORE_445, Items.COINS_995).random()
@@ -263,8 +264,8 @@ class StarSpriteDialogue(player: Player? = null) : core.game.dialogue.DialoguePl
 
     fun rollForRingBonus(player: Player, bonusId: Int, bonusBaseAmt: Int){
         if(RandomFunction.roll(3)){
-            val state = player.states["shooting-star"] as? ShootingStarState ?: return
-            state.ticksLeft += secondsToTicks(TimeUnit.MINUTES.toSeconds(5).toInt())
+            var bonus = getOrStartTimer <StarBonus> (player)
+            bonus.ticksLeft += 500
             sendMessage(player, colorize("%RYour ring shines dimly as if imbued with energy."))
         } else if(RandomFunction.roll(5)){
             addItem(player, bonusId, bonusBaseAmt)

Server/src/main/content/global/activity/ttrail/ClueScrollPlugin.java

@@ -3,6 +3,7 @@ package content.global.activity.ttrail;
 import core.game.component.Component;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
+import core.tools.Log;
 import core.tools.SystemLogger;
 import core.game.world.map.zone.MapZone;
 import core.game.world.map.zone.ZoneBorders;
@@ -15,6 +16,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static core.api.ContentAPIKt.log;
+
 /**
  * Represents a clue scroll plugin.
  * @author Vexia
@@ -138,7 +141,7 @@ public abstract class ClueScrollPlugin extends MapZone implements Plugin<Object>
 		if(clue.getClueId() == 2681)
 			return;
 		if (CLUE_SCROLLS.containsKey(clue.getClueId())) {
-			SystemLogger.logErr(this.getClass(), "Error! Plugin already registered with clue id - " + clue.getClueId() + ", trying to register " + clue.getClass().getCanonicalName() + " the real plugin using the id is " + CLUE_SCROLLS.get(clue.getClueId()).getClass().getCanonicalName() + "!");
+			log(this.getClass(), Log.ERR,  "Error! Plugin already registered with clue id - " + clue.getClueId() + ", trying to register " + clue.getClass().getCanonicalName() + " the real plugin using the id is " + CLUE_SCROLLS.get(clue.getClueId()).getClass().getCanonicalName() + "!");
 			return;
 		}
 		List<ClueScrollPlugin> organized = (List<ClueScrollPlugin>) ORGANIZED.get(clue.getLevel());
@@ -169,7 +172,7 @@ public abstract class ClueScrollPlugin extends MapZone implements Plugin<Object>
 	public static Item getClue(ClueLevel clueLevel) {
 		List<ClueScrollPlugin> clues = ORGANIZED.get(clueLevel);
 		if (clues == null) {
-			SystemLogger.logErr(ClueScrollPlugin.class, "Error! There are no clues for level " + clueLevel + "!");
+			log(ClueScrollPlugin.class, Log.ERR, "Error! There are no clues for level " + clueLevel + "!");
 			return null;
 		}
 		ClueScrollPlugin clue = clues.get(RandomFunction.random(clues.size()));
@@ -189,7 +192,7 @@ public abstract class ClueScrollPlugin extends MapZone implements Plugin<Object>
 		int hasAmt = 0;
 		for (int i = 0; i < equipment.length; i++) {
 			for (int k = 0; k < equipment[i].length; k++) {
-				if (player.getEquipment().contains(equipment[i][k], 1)) {
+				if (player.getEquipment().contains(equipment[i][k], 1) || player.costumeRoomBank.contains(equipment[i][k], 1)) {
 					hasAmt++;
 					break;
 				}

Server/src/main/content/global/activity/ttrail/EmoteCluePlugin.java

@@ -57,7 +57,7 @@ public final class EmoteCluePlugin extends EmoteClueScroll {
 	public Plugin<Object> newInstance(Object arg) throws Throwable {
 		Emotes emote = Emotes.BECKON;
 		register(new EmoteCluePlugin("digsite-beckon", 2677, ClueLevel.MEDIUM, emote, Emotes.BOW, new int[][] { { 6328 }, { 1267 }, { 658 } }, "Beckon in the Digsite, near the<br>eastern winch. Bow or curtsy<br>before you talk to me.<br>Equip a green gnome hat,<br>snakeskin boots and an<br>iron pickaxe.", new ZoneBorders(3368, 3425, 3371, 3429)));
-		register(new EmoteCluePlugin("tai-bwo-beckon", 2678, ClueLevel.MEDIUM, emote, Emotes.CLAP, new int[][] { { 1099 }, { 2552, 2554, 2556, 2558, 2560, 2562, 2564, 2568 }, { 1143 } }, "Beckon in Tai Bwo<br>Wannai. Clap before<br>you talk to me.<br>Equip green<br>dragonhide chaps, a<br>ring of dueling and a<br>mithril medium helmet.", new ZoneBorders(2771, 3053, 2814, 3074)));
+		register(new EmoteCluePlugin("tai-bwo-beckon", 2678, ClueLevel.MEDIUM, emote, Emotes.CLAP, new int[][] { { 1099 }, { 2552, 2554, 2556, 2558, 2560, 2562, 2564, 2566, 2568 }, { 1143 } }, "Beckon in Tai Bwo<br>Wannai. Clap before<br>you talk to me.<br>Equip green<br>dragonhide chaps, a<br>ring of dueling and a<br>mithril medium helmet.", new ZoneBorders(2771, 3053, 2814, 3074)));
 		emote = Emotes.BLOW_KISS;
 		//register(new EmoteCluePlugin("shilo-kiss", 2681, ClueLevel.HARD, emote, new int[][] { { 4089 }, { 5016 }, { 1127 } }, "Blow a kiss between<br>the tables in Shilo<br>Village bank. Beware<br>of double agents!<br>Equip a blue mystic<br>hat, bone spear and<br>rune plate body.", new ZoneBorders(2849, 2950, 2855, 2957)));
 		emote = Emotes.BOW;
@@ -99,7 +99,7 @@ public final class EmoteCluePlugin extends EmoteClueScroll {
 		//Fixed JFJ and Laugh Clues
 		//When Vexia emote is removed below.
 		//emote = Emotes.JUMP_FOR_JOY;
-		register(new EmoteCluePlugin("beehive-jump", 2703, ClueLevel.EASY, Emotes.JUMP_FOR_JOY, new int[][] { { 1833 }, { 648 }, { 1353 } }, "Jump for joy at the beehives.<br>Equip a desert shirt, green<br>gnome robe bottoms and a<br>steel axe.", new ZoneBorders(2762, 3439, 2764, 3441)));
+		register(new EmoteCluePlugin("beehive-jump", 2703, ClueLevel.EASY, Emotes.JUMP_FOR_JOY, new int[][] { { 1833 }, { 648 }, { 1353 } }, "Jump for joy at the beehives.<br>Equip a desert shirt, green<br>gnome robe bottoms and a<br>steel axe.", new ZoneBorders(2752, 3437,2766, 3450)));
 		// And emote, is replaced with what it is shortcutting Emotes.JUMP_FOR_JOY
 		// the clues work perfect. It seems to only be a problem with multiple emote clues.
 		// If you look around EmoteCluePlugin you will see there are multiple emote, shortcuts

Server/src/main/content/global/ame/KidnapHelper.kt

@@ -0,0 +1,28 @@
+package content.global.ame
+
+import core.ServerConstants
+import core.api.*
+import core.game.node.entity.player.Player
+import core.game.node.entity.player.link.TeleportManager.TeleportType
+import core.game.world.map.Location
+
+fun kidnapPlayer(player: Player, loc: Location, type: TeleportType) {
+    setAttribute(player, "kidnapped-by-random", true)
+    if (getAttribute(player, "/save:original-loc", null) == null) {
+        setAttribute(player, "/save:original-loc", player.location)
+    }
+    teleport(player, loc, type)
+}
+
+fun returnPlayer(player: Player) {
+    // Prevent returning more than once and sending the player back to HOME_LOCATION
+    if (getAttribute<Location?>(player, "kidnapped-by-random", null) == null) {
+        return
+    }
+
+    player.locks.unlockTeleport()
+    val destination = getAttribute(player, "/save:original-loc", ServerConstants.HOME_LOCATION ?: Location.create(3222, 3218, 0))
+    teleport(player, destination)
+    unlock(player)
+    removeAttributes(player, "/save:original-loc", "kidnapped-by-random")
+}