Fixed Giles spamming chat messages

Fixed looping when a player attempted dart trap, spinning blades, floor spikes and pressure pads
Fixed direction player faces when traversing hand holds
Fixed animation for walking across planks

.dockerignore

@@ -0,0 +1,30 @@
+# Local volumes
+/config
+/data
+/db
+
+# Updated through volumes
+Server/data
+Server/worldprops
+
+# Env files containing secrets
+/.env
+/*.env
+
+# Log files
+logs
+*.log
+
+# Git files
+.git
+.gitattributes
+.gitignore
+
+# Basic stuff
+*.md
+LICENSE
+.gitlab-ci.yml
+
+# Docker files
+docker-compose.yml
+Dockerfile

.gitignore

@@ -18,7 +18,8 @@ Server/data/global_kill_stats.json
 Server/ge_test.db
 Server/latestdump.txt
 Management-Server/managementprops/
-Server/worldprops/
+Server/worldprops/*
+!Server/worldprops/default.conf
 
 **/.idea/workspace.xml
 **/.idea/tasks.xml
@@ -32,3 +33,12 @@ gradle
 build/kotlin/sessions/
 **/*.iml
 Server/hasRan.txt
+
+# Local volumes
+/config
+/data
+/db
+
+# Env files containing secrets
+/.env
+/*.env

.gitlab/issue_templates/Default.md

@@ -0,0 +1,17 @@
+What I did: 
+
+What I expected to happen: 
+
+What actually happened: 
+
+IDs of related NPCs/items:
+
+2009-era source (if relevant):
+
+Screenshots or video:
+
+LIVE SERVER username affected by this issue: 
+
+**Bug reports are not accepted by SP users. SP is often out of date and results in invalid bug reports.**
+
+**If the bug is exploitable make sure you tick the confidential checkbox below**

Dockerfile

@@ -4,14 +4,8 @@ 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
+# Copy all sources etc
+COPY . .
 
 # Make sure ./run has permissions
 RUN chmod +x run

README.md

@@ -29,6 +29,7 @@
   * [Prerequisites](#prerequisites)
   * [Project Setup](#project-setup)
   * [Running the project](#running-the-project)
+  * [Browser WebSocket Transport](#browser-websocket-transport)
 * [License](#license)
 * [Contact](#contact)
 
@@ -125,6 +126,112 @@ Start the game server with the included run script. Use `./run -h` for more info
 
 Start the game server with `run-server.bat`
 
+#### Browser WebSocket Transport
+
+Enable the listener in `Server/worldprops/default.conf`:
+
+```properties
+websocket_enabled = true
+websocket_port = 0
+```
+
+When `websocket_port = 0`, the listener uses `53594 + world_id`. For world `1`, that is `53595`.
+
+Both plain WebSocket (`ws://`) and secure WebSocket (`wss://`) are supported. Use `ws://` for local HTTP testing. PWA requires HTTPS/WSS.
+
+Enable WSS with a Java keystore:
+
+```properties
+websocket_tls_enabled = true
+websocket_tls_keystore_path = "certs/dev-wss.p12"
+websocket_tls_keystore_password = "<keystore-password>"
+```
+
+The keystore password is optional. Leave `websocket_tls_keystore_password` blank when using a PKCS12 file exported with an empty password:
+
+```bash
+openssl pkcs12 -export \
+  -in fullchain.pem \
+  -inkey privkey.pem \
+  -out certs/dev-wss.p12 \
+  -name websocket \
+  -passout pass:
+```
+
+For local WSS development, create a certificate for your hostname or LAN IP that the browser will use, then point the server at a PKCS12 keystore. For production, use a normal certificate from certbot. Plain WS does not require a certificate.
+
+#### Docker
+
+Make sure [Docker Engine](https://docs.docker.com/engine/install/) & [Docker Compose](https://docs.docker.com/compose/install/) plugin are installed first:
+
+Go to the project root where the git repository is cloned into:
+
+```bash
+cd /path/to/project-dir
+```
+
+To configure the database, copy the mysql env file template to a env file in the project root:
+
+```bash
+cp mysql.env.example mysql.env
+```
+
+Customize the env file however necessary.
+
+Create a new directory called 'config' into the project root.
+
+```bash
+mkdir config
+```
+
+Copy the server config file template in the config directory:
+
+```bash
+cp Server/worldprops/default.conf config/default.conf
+```
+
+Edit the server configuration file as per needed.
+
+Go to the project root directory and execute:
+
+```bash
+docker compose up --build
+```
+
+Which will build the docker image using the local Dockerfile and starts the server and database containers.
+
+The previous up command should be run every time the server sources are modified to propagate the changes to the container.
+
+For the first time, the server compilation process takes a long time. Grab some coffee in the meanwhile.
+
+You can check (and follow) the containers logs by running the following in the project root directory (-f for follow and Ctrl+C to stop):
+
+```bash
+docker compose logs -f
+```
+
+Any compilation or runtime errors will be logged here.
+
+If you have already compiled the server and made no changes to the sources, you can simply run without the build option (however it will be cached anyways):
+
+```bash
+docker compose up
+```
+
+To later restart the server to apply simple configuration changes, in the project root directory run:
+
+```bash
+docker compose restart server
+```
+
+To shut down / take down the server, in the project root directory run:
+
+```bash
+docker compose up --build
+```
+
+The database files, build cache and config files will be persisted on the host filesystem for easy backup management.
+
 ### License
 
 We use the AGPL 3.0 license, which can be found [here](https://www.gnu.org/licenses/agpl-3.0.en.html). Please be sure to read and understand the license. Failure to follow the guidelines outlined in the license will result in legal action. If you know or hear of anyone breaking this license, please send a report, with proof, to Red Bracket#8151, ceikry#2724, or woahscam#8535 on discord or email woahscam@hotmail.com. **We WILL NOT change the license to fit your needs.**
@@ -149,4 +256,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

@@ -11,7 +11,6 @@
 
     <ObjectAction mode="remove" id="356" x="2804" y="3428" z="0"/>
     <ObjectAction mode="add" id="356" x="2804" y="3428" z="0"/>
-    <ObjectAction mode="add" id="2783" x="3229" y="3254" z="0"/>
 
     <ObjectAction mode="remove" id="20228" x="2537" y="3573" z="0"/>
     <ObjectAction mode="add" id="27663" x="2537" y="3573" z="0" direction="w"/>

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,33 +135,33 @@
     "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",
-    "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?",
@@ -188,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",
@@ -228,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?",
@@ -239,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.",
@@ -257,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?",
@@ -281,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",
@@ -310,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.",
@@ -338,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",
@@ -360,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!",
@@ -410,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!",
@@ -424,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!",
@@ -459,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",
@@ -486,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?",
@@ -496,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!!!",
@@ -521,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.",
@@ -594,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",
@@ -693,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!!!",
@@ -752,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/ammo_configs.json

@@ -125,7 +125,7 @@
     "start_graphic": "232,96",
     "darkbow_graphic": "",
     "projectile": "226,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "813",
@@ -133,7 +133,7 @@
     "start_graphic": "233,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "814",
@@ -141,7 +141,7 @@
     "start_graphic": "234,96",
     "darkbow_graphic": "",
     "projectile": "228,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "815",
@@ -149,7 +149,7 @@
     "start_graphic": "235,96",
     "darkbow_graphic": "",
     "projectile": "229,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "816",
@@ -157,7 +157,7 @@
     "start_graphic": "236,96",
     "darkbow_graphic": "",
     "projectile": "230,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "817",
@@ -165,7 +165,7 @@
     "start_graphic": "237,96",
     "darkbow_graphic": "",
     "projectile": "231,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "825",
@@ -221,7 +221,7 @@
     "start_graphic": "206,96",
     "darkbow_graphic": "",
     "projectile": "200,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "832",
@@ -229,7 +229,7 @@
     "start_graphic": "207,96",
     "darkbow_graphic": "",
     "projectile": "201,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "833",
@@ -237,7 +237,7 @@
     "start_graphic": "208,96",
     "darkbow_graphic": "",
     "projectile": "202,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "834",
@@ -245,7 +245,7 @@
     "start_graphic": "209,96",
     "darkbow_graphic": "",
     "projectile": "203,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "835",
@@ -253,7 +253,7 @@
     "start_graphic": "210,96",
     "darkbow_graphic": "",
     "projectile": "204,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "836",
@@ -261,7 +261,7 @@
     "start_graphic": "211,96",
     "darkbow_graphic": "",
     "projectile": "205,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "863",
@@ -325,7 +325,7 @@
     "start_graphic": "219,96",
     "darkbow_graphic": "",
     "projectile": "212,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "871",
@@ -333,7 +333,7 @@
     "start_graphic": "220,96",
     "darkbow_graphic": "",
     "projectile": "213,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "872",
@@ -341,7 +341,7 @@
     "start_graphic": "221,96",
     "darkbow_graphic": "",
     "projectile": "214,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "873",
@@ -349,7 +349,7 @@
     "start_graphic": "223,96",
     "darkbow_graphic": "",
     "projectile": "216,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "874",
@@ -357,7 +357,7 @@
     "start_graphic": "222,96",
     "darkbow_graphic": "",
     "projectile": "215,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "875",
@@ -365,7 +365,7 @@
     "start_graphic": "224,96",
     "darkbow_graphic": "",
     "projectile": "217,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "876",
@@ -373,7 +373,7 @@
     "start_graphic": "225,96",
     "darkbow_graphic": "",
     "projectile": "218,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "877",
@@ -389,7 +389,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "879",
@@ -421,7 +421,7 @@
     "start_graphic": "19,96",
     "darkbow_graphic": "1104,96",
     "projectile": "10,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "884",
@@ -437,7 +437,7 @@
     "start_graphic": "18,96",
     "darkbow_graphic": "1105,96",
     "projectile": "9,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "886",
@@ -453,7 +453,7 @@
     "start_graphic": "20,96",
     "darkbow_graphic": "1106,96",
     "projectile": "11,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "888",
@@ -469,7 +469,7 @@
     "start_graphic": "21,96",
     "darkbow_graphic": "1107,96",
     "projectile": "12,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "890",
@@ -485,7 +485,7 @@
     "start_graphic": "22,96",
     "darkbow_graphic": "1108,96",
     "projectile": "13,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "892",
@@ -501,7 +501,7 @@
     "start_graphic": "24,96",
     "darkbow_graphic": "1109,96",
     "projectile": "15,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "2532",
@@ -565,7 +565,7 @@
     "start_graphic": "273,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "4160",
@@ -725,7 +725,7 @@
     "start_graphic": "19,96",
     "darkbow_graphic": "1104,96",
     "projectile": "10,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5617",
@@ -733,7 +733,7 @@
     "start_graphic": "18,96",
     "darkbow_graphic": "1105,96",
     "projectile": "9,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5618",
@@ -741,7 +741,7 @@
     "start_graphic": "20,96",
     "darkbow_graphic": "1106,96",
     "projectile": "11,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5619",
@@ -749,7 +749,7 @@
     "start_graphic": "21,96",
     "darkbow_graphic": "1107,96",
     "projectile": "12,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5620",
@@ -757,7 +757,7 @@
     "start_graphic": "22,96",
     "darkbow_graphic": "1108,96",
     "projectile": "13,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5621",
@@ -773,7 +773,7 @@
     "start_graphic": "19,96",
     "darkbow_graphic": "1104,96",
     "projectile": "10,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5623",
@@ -781,7 +781,7 @@
     "start_graphic": "18,96",
     "darkbow_graphic": "1105,96",
     "projectile": "9,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5624",
@@ -789,7 +789,7 @@
     "start_graphic": "20,96",
     "darkbow_graphic": "1106,96",
     "projectile": "11,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5625",
@@ -797,7 +797,7 @@
     "start_graphic": "21,96",
     "darkbow_graphic": "1107,96",
     "projectile": "12,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5626",
@@ -805,7 +805,7 @@
     "start_graphic": "22,96",
     "darkbow_graphic": "1108,96",
     "projectile": "13,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5627",
@@ -813,7 +813,7 @@
     "start_graphic": "24,96",
     "darkbow_graphic": "1109,96",
     "projectile": "15,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5628",
@@ -821,7 +821,7 @@
     "start_graphic": "232,96",
     "darkbow_graphic": "",
     "projectile": "226,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5629",
@@ -829,7 +829,7 @@
     "start_graphic": "233,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5630",
@@ -837,7 +837,7 @@
     "start_graphic": "235,96",
     "darkbow_graphic": "",
     "projectile": "229,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5631",
@@ -845,7 +845,7 @@
     "start_graphic": "273,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5633",
@@ -853,7 +853,7 @@
     "start_graphic": "236,96",
     "darkbow_graphic": "",
     "projectile": "230,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5634",
@@ -861,7 +861,7 @@
     "start_graphic": "237,96",
     "darkbow_graphic": "",
     "projectile": "231,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5635",
@@ -869,7 +869,7 @@
     "start_graphic": "232,96",
     "darkbow_graphic": "",
     "projectile": "226,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5636",
@@ -877,7 +877,7 @@
     "start_graphic": "233,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5637",
@@ -885,7 +885,7 @@
     "start_graphic": "234,96",
     "darkbow_graphic": "",
     "projectile": "228,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5638",
@@ -893,7 +893,7 @@
     "start_graphic": "273,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5639",
@@ -901,7 +901,7 @@
     "start_graphic": "235,96",
     "darkbow_graphic": "",
     "projectile": "229,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5640",
@@ -909,7 +909,7 @@
     "start_graphic": "236,96",
     "darkbow_graphic": "",
     "projectile": "230,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5641",
@@ -917,7 +917,7 @@
     "start_graphic": "237,96",
     "darkbow_graphic": "",
     "projectile": "231,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5642",
@@ -925,7 +925,7 @@
     "start_graphic": "206,96",
     "darkbow_graphic": "",
     "projectile": "200,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5643",
@@ -933,7 +933,7 @@
     "start_graphic": "207,96",
     "darkbow_graphic": "",
     "projectile": "201,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5644",
@@ -941,7 +941,7 @@
     "start_graphic": "208,96",
     "darkbow_graphic": "",
     "projectile": "202,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5645",
@@ -949,7 +949,7 @@
     "start_graphic": "209,96",
     "darkbow_graphic": "",
     "projectile": "203,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5646",
@@ -957,7 +957,7 @@
     "start_graphic": "210,96",
     "darkbow_graphic": "",
     "projectile": "204,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5647",
@@ -965,7 +965,7 @@
     "start_graphic": "211,96",
     "darkbow_graphic": "",
     "projectile": "205,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5648",
@@ -973,7 +973,7 @@
     "start_graphic": "206,96",
     "darkbow_graphic": "",
     "projectile": "200,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5649",
@@ -981,7 +981,7 @@
     "start_graphic": "207,96",
     "darkbow_graphic": "",
     "projectile": "201,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5650",
@@ -989,7 +989,7 @@
     "start_graphic": "208,96",
     "darkbow_graphic": "",
     "projectile": "202,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5651",
@@ -997,7 +997,7 @@
     "start_graphic": "209,96",
     "darkbow_graphic": "",
     "projectile": "203,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5652",
@@ -1005,7 +1005,7 @@
     "start_graphic": "210,96",
     "darkbow_graphic": "",
     "projectile": "204,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5653",
@@ -1013,7 +1013,7 @@
     "start_graphic": "211,96",
     "darkbow_graphic": "",
     "projectile": "205,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5654",
@@ -1021,7 +1021,7 @@
     "start_graphic": "219,96",
     "darkbow_graphic": "",
     "projectile": "212,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5655",
@@ -1029,7 +1029,7 @@
     "start_graphic": "220,96",
     "darkbow_graphic": "",
     "projectile": "213,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5656",
@@ -1037,7 +1037,7 @@
     "start_graphic": "221,96",
     "darkbow_graphic": "",
     "projectile": "214,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5657",
@@ -1045,7 +1045,7 @@
     "start_graphic": "223,96",
     "darkbow_graphic": "",
     "projectile": "216,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5658",
@@ -1053,7 +1053,7 @@
     "start_graphic": "222,96",
     "darkbow_graphic": "",
     "projectile": "215,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5659",
@@ -1061,7 +1061,7 @@
     "start_graphic": "224,96",
     "darkbow_graphic": "",
     "projectile": "217,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5660",
@@ -1069,7 +1069,7 @@
     "start_graphic": "225,96",
     "darkbow_graphic": "",
     "projectile": "218,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5661",
@@ -1077,7 +1077,7 @@
     "start_graphic": "219,96",
     "darkbow_graphic": "",
     "projectile": "212,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5662",
@@ -1085,7 +1085,7 @@
     "start_graphic": "220,96",
     "darkbow_graphic": "",
     "projectile": "213,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5663",
@@ -1093,7 +1093,7 @@
     "start_graphic": "221,96",
     "darkbow_graphic": "",
     "projectile": "214,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5664",
@@ -1101,7 +1101,7 @@
     "start_graphic": "223,96",
     "darkbow_graphic": "",
     "projectile": "216,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5665",
@@ -1109,7 +1109,7 @@
     "start_graphic": "222,96",
     "darkbow_graphic": "",
     "projectile": "215,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5666",
@@ -1117,7 +1117,7 @@
     "start_graphic": "224,96",
     "darkbow_graphic": "",
     "projectile": "217,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5667",
@@ -1125,7 +1125,7 @@
     "start_graphic": "225,96",
     "darkbow_graphic": "",
     "projectile": "218,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "6061",
@@ -1133,7 +1133,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "6062",
@@ -1141,7 +1141,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "6522",
@@ -1293,7 +1293,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9287",
@@ -1301,7 +1301,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9288",
@@ -1309,7 +1309,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9289",
@@ -1317,7 +1317,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9290",
@@ -1325,7 +1325,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9291",
@@ -1333,7 +1333,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9293",
@@ -1341,7 +1341,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9294",
@@ -1349,7 +1349,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9295",
@@ -1357,7 +1357,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9296",
@@ -1365,7 +1365,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9297",
@@ -1373,7 +1373,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9298",
@@ -1381,7 +1381,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9300",
@@ -1389,7 +1389,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9301",
@@ -1397,7 +1397,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9302",
@@ -1405,7 +1405,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9303",
@@ -1413,7 +1413,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9304",
@@ -1421,7 +1421,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9305",
@@ -1429,7 +1429,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9335",
@@ -1557,7 +1557,7 @@
     "start_graphic": "1116,96",
     "darkbow_graphic": "1114,96",
     "projectile": "1120,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "11228",
@@ -1565,7 +1565,7 @@
     "start_graphic": "1116,96",
     "darkbow_graphic": "1114,96",
     "projectile": "1120,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "11229",
@@ -1573,7 +1573,7 @@
     "start_graphic": "1116,96",
     "darkbow_graphic": "1114,96",
     "projectile": "1120,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "11230",
@@ -1589,7 +1589,7 @@
     "start_graphic": "1123,96",
     "darkbow_graphic": "",
     "projectile": "1122,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "11233",
@@ -1597,7 +1597,7 @@
     "start_graphic": "1123,96",
     "darkbow_graphic": "",
     "projectile": "1122,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "11234",
@@ -1605,7 +1605,7 @@
     "start_graphic": "1123,96",
     "darkbow_graphic": "",
     "projectile": "1122,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "13083",
@@ -1621,7 +1621,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "13085",
@@ -1629,7 +1629,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "13086",
@@ -1637,7 +1637,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "13280",
@@ -1661,7 +1661,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "1837,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "13881",
@@ -1669,7 +1669,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "1837,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "13882",
@@ -1677,7 +1677,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "1837,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "13883",
@@ -1701,7 +1701,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "1837,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "13955",
@@ -1709,7 +1709,7 @@
     "start_graphic": "1837,96",
     "darkbow_graphic": "",
     "projectile": "1840,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "13956",
@@ -1717,7 +1717,7 @@
     "start_graphic": "1837,96",
     "darkbow_graphic": "",
     "projectile": "1840,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "13957",

Server/data/configs/clue_rewards.json

@@ -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"
   },
@@ -301,7 +301,7 @@
   },
   {
     "id": "2025",
-    "replaceId": "1534",
+    "replaceId": "2026",
     "fence": "false",
     "metal": "false"
   },
@@ -312,7 +312,7 @@
     "metal": "false"
   },
   {
-    "id": "2036",
+    "id": "1530",
     "replaceId": "1531",
     "fence": "false",
     "metal": "false"
@@ -343,7 +343,7 @@
   },
   {
     "id": "2054",
-    "replaceId": "24375",
+    "replaceId": "2055",
     "fence": "false",
     "metal": "false"
   },
@@ -419,18 +419,6 @@
     "fence": "false",
     "metal": "false"
   },
-  {
-    "id": "2391",
-    "replaceId": "1561",
-    "fence": "false",
-    "metal": "true"
-  },
-  {
-    "id": "2392",
-    "replaceId": "1561",
-    "fence": "false",
-    "metal": "true"
-  },
   {
     "id": "2397",
     "replaceId": "24383",
@@ -925,7 +913,7 @@
   },
   {
     "id": "3747",
-    "replaceId": "1534",
+    "replaceId": "3748",
     "fence": "false",
     "metal": "false"
   },
@@ -943,7 +931,7 @@
   },
   {
     "id": "4148",
-    "replaceId": "4248",
+    "replaceId": "4246",
     "fence": "false",
     "metal": "false"
   },
@@ -1439,6 +1427,12 @@
     "fence": "false",
     "metal": "false"
   },
+  {
+    "id": "11470",
+    "replaceId": "11471",
+    "fence": "false",
+    "metal": "false"
+  },
   {
     "id": "11483",
     "replaceId": "11708",
@@ -1759,7 +1753,7 @@
   },
   {
     "id": "14245",
-    "replaceId": "14248",
+    "replaceId": "14246",
     "fence": "true",
     "metal": "false"
   },
@@ -1984,16 +1978,14 @@
     "replaceId": "28518",
     "fence": "false",
     "metal": "true",
-    "autowalk": "true",
-    "questRequirement": "Icthlarin's Little Helper"
+    "autowalk": "true"
   },
   {
     "id": "28514",
     "replaceId": "28518",
     "fence": "false",
     "metal": "true",
-    "autowalk": "true",
-    "questRequirement": "Icthlarin's Little Helper"
+    "autowalk": "true"
   },
   {
     "id": "21065",
@@ -2165,7 +2157,7 @@
   },
   {
     "id": "24376",
-    "replaceId": "24377",
+    "replaceId": "24375",
     "fence": "false",
     "metal": "false"
   },
@@ -2187,18 +2179,6 @@
     "fence": "false",
     "metal": "false"
   },
-  {
-    "id": "24560",
-    "replaceId": "15515",
-    "fence": "true",
-    "metal": "false"
-  },
-  {
-    "id": "24561",
-    "replaceId": "15517",
-    "fence": "true",
-    "metal": "false"
-  },
   {
     "id": "24565",
     "replaceId": "36316",
@@ -2689,7 +2669,7 @@
   },
   {
     "id": "31815",
-    "replaceId": "31816",
+    "replaceId": "31817",
     "fence": "false",
     "metal": "false"
   },

Server/data/configs/interface_configs.json

@@ -95,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",
@@ -365,6 +389,30 @@
     "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",
@@ -491,6 +539,12 @@
     "walkable": "true",
     "tabIndex": "-1"
   },
+  {
+    "id": "375",
+    "interfaceType": "3",
+    "walkable": "false",
+    "tabIndex": "-1"
+  },
   {
     "id": "377",
     "interfaceType": "8",

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/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",
@@ -1546,5 +1546,41 @@
     "animation": "426",
     "drop_ammo": "true",
     "ammunition": "14202,14203,14204,14205,14206"
+  },
+  {
+    "itemId": "10149",
+    "name": "Swamp lizard",
+    "ammo_slot": "13",
+    "weapon_type": "0",
+    "animation": "5247",
+    "drop_ammo": "false",
+    "ammunition": "10142"
+  },
+  {
+    "itemId": "10146",
+    "name": "Orange salamander",
+    "ammo_slot": "13",
+    "weapon_type": "0",
+    "animation": "5247",
+    "drop_ammo": "false",
+    "ammunition": "10143"
+  },
+  {
+    "itemId": "10147",
+    "name": "Red salamander",
+    "ammo_slot": "13",
+    "weapon_type": "0",
+    "animation": "5247",
+    "drop_ammo": "false",
+    "ammunition": "10144"
+  },
+  {
+    "itemId": "10148",
+    "name": "Black salamander",
+    "ammo_slot": "13",
+    "weapon_type": "0",
+    "animation": "5247",
+    "drop_ammo": "false",
+    "ammunition": "10145"
   }
 ]

Server/data/configs/shops.json

@@ -177,7 +177,7 @@
     "general_store": "true",
     "id": "21",
     "title": "Gunslik's Assorted Items",
-    "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": "{1935,10,100}-{1925,30,100}-{590,10,100}-{1755,10,100}-{2347,10,100}-{36,10,100}-{596,10,100}-{973,10,100}-{1059,10,100}-{229,300,100}-{233,10,100}-{954,10,100}"
   },
   {
     "npcs": "1334",
@@ -564,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",
@@ -2177,5 +2177,23 @@
     "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/pom.xml

@@ -6,6 +6,7 @@
   <version>1.0.0</version>
   <properties>
     <project.mainClassName>core.Server</project.mainClassName>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     <kotlin.version>1.8.20</kotlin.version>
     <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
@@ -90,6 +91,11 @@
       <version>2.9.0</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.java-websocket</groupId>
+      <artifactId>Java-WebSocket</artifactId>
+      <version>1.5.7</version>
+    </dependency>
   </dependencies>
 
   <build>

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

@@ -1,177 +0,0 @@
-package content.data;
-
-import core.game.node.entity.player.Player;
-
-/**
- * The BossKillcounter keeps track of the amount of bosses the player has slain.
- * addtoKillcount(player, npcId) should be added in the finalizeDeath() method of the combat handler for the boss.
- * @author Splinter
- */
-public enum BossKillCounter {
-	
-	
-	/* ORDINAL BOUND */
-	KING_BLACK_DRAGON(new int[] { 50 }, "King Black Dragon", 14649), 
-	BORK(new int[] { 7133, 7134 }, "Bork", -1),
-	DAGANNOTH_SUPREME(new int[] { 2881 }, "Dagannoth Supreme", 14639),
-	DAGANNOTH_PRIME(new int[] { 2882 }, "Dagannoth Prime", 14640), 
-	DAGANNOTH_REX(new int[] { 2883 }, "Dagannoth Rex", 14641), 
-	CHAOS_ELEMENTAL(new int[] { 3200 }, "Chaos Elemental", 14638), 
-	GIANT_MOLE(new int[] { 3340 }, "Giant Mole", 14642), 
-	SARADOMIN(new int[] { 6247 }, "Commander Zilyana", 14647), 
-	ZAMORAK(new int[] { 6203 }, "K'ril Tsutsaroth", 14648), 
-	BANDOS(new int[] { 6260 }, "General Graardor", 14646),
-	ARMADYL(new int[] { 6222 }, "Kree'arra", 14645), 
-	JAD(new int[] { 2745 }, "Tz-Tok Jad", 14828), 
-	KALPHITE_QUEEN(new int[] { 1160 }, "Kalphite Queen", 14650),
-	CORPOREAL_BEAST(new int[] { 8133 }, "Corporeal Beast", 14653),
-	TORMENTED_DEMONS(new int[] {
-        8349, 8350, 8351, 8352, 8353, 8354,
-        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),
-	
-
-	;
-
-	/**
-	 * The npcs that can increase the killcounter
-	 */
-	private final int[] npc;
-
-	/**
-	 * The name of the NPC, to be displayed as a sendMessage
-	 */
-	private final String name;
-	
-	/**
-	 * The item ID of the pet relating to the boss.
-	 */
-	private final int petId;
-
-	/**
-	 * Constructs a new {@code BossKillCounter} {@code Object}.
-	 * @param npc the npc.
-	 * @param name the npc's string name
-	 */
-	BossKillCounter(final int[] npc, final String name, final int petId) {
-		this.npc = npc;
-		this.name = name;
-		this.petId = petId;
-	}
-
-	/**
-	 * Gets the npc.
-	 * @return The npc.
-	 */
-	public int[] getNpc() {
-		return npc;
-	}
-
-	/**
-	 * Gets the NPC's name
-	 * @return their name
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * Gets the petId
-	 * @return The petId
-	 */
-	public int getPetId() {
-		return petId;
-	}
-
-	/**
-	 * Gets the type for the npc.
-	 * @param npc the npc.
-	 * @return the BossKillcounter
-	 */
-	public static BossKillCounter forNPC(final int npc) {
-		for (BossKillCounter kc : BossKillCounter.values()) {
-			for (int i : kc.getNpc()) {
-				if (npc == i) {
-					return kc;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Adds to the player's killcount for that particular boss.
-	 * @param killer The player who killed the npc
-	 * @param npcid the ID of the npc that just died
-	 */
-	public static void addtoKillcount(Player killer, int npcid) {
-		if (killer == null) {
-			return;
-		}
-		BossKillCounter boss = BossKillCounter.forNPC(npcid);
-		if (boss == null) {
-			return;
-		}
-		killer.getSavedData().getGlobalData().getBossCounters()[boss.ordinal()]++;
-		killer.getPacketDispatch().sendMessage("Your " + boss.getName() + " killcount is now: <col=ff0000>" + killer.getSavedData().getGlobalData().getBossCounters()[boss.ordinal()] + "</col>.");
-//		addBossPet(killer, npcid, boss);
-	}
-	
-//	/**
-//	 * Gives the player the pet if they killed a certain boss.
-//	 * The chance by default is 1/5000. This rate lowers to 1/2200 if the <GlobalEvents> for Boss Pets is active.
-//	 * Note: Not all bosses have pet versions of themselves.
-//	 */
-//	private static void addBossPet(Player killer, int npcid, BossKillCounter boss){
-//		if(boss.getPetId() == -1){ //The boss does not have a pet version.
-//			return;
-//		}
-//		int number = 5000;
-//		if (npcid == 2745) {
-//			number = 200;
-//			if (killer.getSlayer().getTask() == Tasks.JAD) {
-//				number = 100;
-//			}
-//		} else if (npcid == 3200) {
-//			number = 300;
-//		}
-//		int rand = number;
-//		if(rand == 10){
-//			for (int i = 0; i < killer.getFamiliarManager().getInsuredPets().size(); i++) {
-//				if (killer.getFamiliarManager().getInsuredPets().get(i).getBabyItemId() == boss.getPetId()) {
-//					return;
-//				}
-//			}
-//			if(killer.getFamiliarManager().hasFamiliar() && killer.getInventory().freeSlots() < 1){
-//				return;
-//			}
-//			if(!killer.getFamiliarManager().hasFamiliar()){
-//				killer.getFamiliarManager().summon(new Item(boss.getPetId()),  true);
-//				killer.sendNotificationMessage("You have a funny feeling like you're being followed.");
-//			} else if (killer.getInventory().freeSlots() > 0){
-//				killer.getInventory().add(new Item(boss.getPetId(), 1));
-//				killer.sendNotificationMessage("You feel something weird sneaking into your backpack.");
-//			}
-//			Repository.sendNews(killer.getUsername()+" now commands a miniature "+(boss.equals(CORPOREAL_BEAST) ? "Dark core" : boss.getName())+"!");
-//		}
-//	}
-
-	/**
-	 * Increments the player's Barrows chest counter.
-	 * @param player the player
-	 */
-	public static void addtoBarrowsCount(Player player) {
-		if (player == null) {
-			return;
-		}
-		player.getSavedData().getGlobalData().setBarrowsLoots(player.getSavedData().getGlobalData().getBarrowsLoots() + 1);
-		player.getPacketDispatch().sendMessage("Your Barrows chest count is: <col=ff0000>" + player.getSavedData().getGlobalData().getBarrowsLoots() + "</col>.");
-	}
-
-}

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

@@ -0,0 +1,72 @@
+package content.data
+
+import core.api.sendMessage
+import core.game.node.entity.player.Player
+import org.rs09.consts.NPCs
+
+/**
+ * Enumerates the bosses that have their kill counts tracked in a player's statistics (::stats).
+ * addToBossKillCount(player, npcId) should be added in the finalizeDeath() method of the combat handler for the boss.
+ * ORDINAL BOUND
+ * @author Bishop
+ */
+
+enum class BossKillCounter(val bossId: IntArray, val bossName: String) {
+
+    KING_BLACK_DRAGON(intArrayOf(NPCs.KING_BLACK_DRAGON_50), "King Black Dragon"),
+    BORK(intArrayOf(NPCs.BORK_7133, NPCs.BORK_7134), "Bork"),
+    DAGANNOTH_SUPREME(intArrayOf(NPCs.DAGANNOTH_SUPREME_2881), "Dagannoth Supreme"),
+    DAGANNOTH_PRIME(intArrayOf(NPCs.DAGANNOTH_PRIME_2882), "Dagannoth Prime"),
+    DAGANNOTH_REX(intArrayOf(NPCs.DAGANNOTH_REX_2883), "Dagannoth Rex"),
+    CHAOS_ELEMENTAL(intArrayOf(NPCs.CHAOS_ELEMENTAL_3200), "Chaos Elemental"),
+    GIANT_MOLE(intArrayOf(NPCs.GIANT_MOLE_3340), "Giant Mole"),
+    SARADOMIN(intArrayOf(NPCs.COMMANDER_ZILYANA_6247), "Commander Zilyana"),
+    ZAMORAK(intArrayOf(NPCs.KRIL_TSUTSAROTH_6203), "K'ril Tsutsaroth"),
+    BANDOS(intArrayOf(NPCs.GENERAL_GRAARDOR_6260), "General Graardor"),
+    ARMADYL(intArrayOf(NPCs.KREEARRA_6222), "Kree'arra"),
+    JAD(intArrayOf(NPCs.TZTOK_JAD_2745), "Tz-Tok Jad"),
+    KALPHITE_QUEEN(intArrayOf(NPCs.KALPHITE_QUEEN_1160), "Kalphite Queen"),
+    CORPOREAL_BEAST(intArrayOf(NPCs.CORPOREAL_BEAST_8133), "Corporeal Beast"),
+    TORMENTED_DEMONS(
+        intArrayOf(
+            NPCs.TORMENTED_DEMON_8349, NPCs.TORMENTED_DEMON_8350, NPCs.TORMENTED_DEMON_8351,
+            NPCs.TORMENTED_DEMON_8352, NPCs.TORMENTED_DEMON_8353, NPCs.TORMENTED_DEMON_8354,
+            NPCs.TORMENTED_DEMON_8355, NPCs.TORMENTED_DEMON_8356, NPCs.TORMENTED_DEMON_8357,
+            NPCs.TORMENTED_DEMON_8358, NPCs.TORMENTED_DEMON_8359, NPCs.TORMENTED_DEMON_8360,
+            NPCs.TORMENTED_DEMON_8361, NPCs.TORMENTED_DEMON_8362, NPCs.TORMENTED_DEMON_8363,
+            NPCs.TORMENTED_DEMON_8364, NPCs.TORMENTED_DEMON_8365, NPCs.TORMENTED_DEMON_8366),
+        "Tormented demon"
+    ),
+    PENANCE_QUEEN(intArrayOf(NPCs.PENANCE_QUEEN_5247), "Penance Queen");
+
+    companion object {
+        private fun forBossId(npc: Int): BossKillCounter? {
+            for (kc in values()) {
+                for (i in kc.bossId) {
+                    if (npc == i) {
+                        return kc
+                    }
+                }
+            }
+            return null
+        }
+
+        @JvmStatic
+        fun addToBossKillCount(killer: Player?, bossId: Int) {
+            if (killer == null) {
+                return
+            }
+            val boss: BossKillCounter = forBossId(bossId) ?: return
+            killer.getSavedData().globalData.bossCounters[boss.ordinal]++
+            sendMessage(killer, "Your ${boss.bossName} killcount is now: <col=ff0000>${killer.getSavedData().globalData.bossCounters[boss.ordinal]}</col>.")
+        }
+
+        fun addToBarrowsChestCount(player: Player?) {
+            if (player == null) {
+                return
+            }
+            player.getSavedData().globalData.barrowsLoots++
+            sendMessage(player, "Your Barrows chest count is: <col=ff0000>${player.getSavedData().globalData.barrowsLoots}</col>.")
+        }
+    }
+}

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

@@ -2,23 +2,27 @@ 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.diary.DiaryType
 import core.game.node.item.Item
-import core.game.system.task.Pulse
+import core.game.world.GameWorld
 import core.game.world.map.Location
 import core.game.world.update.flag.context.Animation
 import core.game.world.update.flag.context.Graphics
+import core.tools.Log
 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
+ * Represents a piece of enchanted jewellery.
+ * @author Vexia, downthecrop, Player Name
  */
 enum class EnchantedJewellery(
 
@@ -70,17 +74,17 @@ enum class EnchantedJewellery(
     ),
     AMULET_OF_GLORY(
             arrayOf(
-                    "Edgeville.",
-                    "Karamja.",
-                    "Draynor Village.",
-                    "Al-Kharid.",
-                    "Nowhere."
+                    "Edgeville",
+                    "Karamja",
+                    "Draynor Village",
+                    "Al Kharid",
+                    "Nowhere"
             ),
             arrayOf(
                     Location.create(3087, 3495, 0),
                     Location.create(2919, 3175, 0),
                     Location.create(3104, 3249, 0),
-                    Location.create(3304, 3124, 0)
+                    Location.create(3292, 3175, 0)
             ),
             Items.AMULET_OF_GLORY4_1712,
             Items.AMULET_OF_GLORY3_1710,
@@ -186,6 +190,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 +210,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 clicks one of the options in the jewellery piece's options dialog.
      * @param player the player.
      * @param item the used jewellery item.
      * @param buttonID the button id.
@@ -212,39 +223,92 @@ enum class EnchantedJewellery(
             }
             return
         }
+        attemptTeleport(player, item, buttonID, true, 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 replace Whether to attempt replacing the item with its lower-charge version. Always true unless you generated a fake item in code.
+     * @param isEquipped If the player is operating.
+     */
+    fun attemptTeleport(player: Player, item: Item, buttonID: Int, replace: Boolean, 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)
-                            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
-                }
-            })
+        if (!canTeleport(player, nextJewellery)) {
+            return false
         }
+        val location = getLocation(buttonID)
+        player.scripts.delay = GameWorld.ticks + 4
+        queueScript(player, 0, QueueStrength.SOFT) { stage ->
+            when (stage) {
+                0 -> {
+                    lock(player, 4)
+                    // This is an intentional teleport animation & graphics difference as these two jewellery
+                    // animations are authentic to 2009 while others are currently unknown.
+                    if (this == RING_OF_DUELING || this == GAMES_NECKLACE) {
+                        visualize(player, JEWELLERY_ANIMATION, JEWELLERY_GRAPHICS)
+                    } else {
+                        visualize(player, ANIMATION, GRAPHICS)
+                    }
+                    playGlobalAudio(player.location, Sounds.TELEPORT_ALL_200)
+                    player.impactHandler.disabledTicks = 4
+                    closeInterface(player)
+                    return@queueScript delayScript(player, 3)
+                }
+                1 -> {
+                    teleport(player, location)
+                    resetAnimator(player)
+                    if (this == RING_OF_DUELING || this == GAMES_NECKLACE) {
+                        player.graphics(JEWELLERY_GRAPHICS)
+                    }
+                    unlock(player)
+                    player.dispatch(TeleportEvent(TeleportManager.TeleportType.NORMAL, TeleportMethod.JEWELRY, item, location))
+
+                    if (DIGSITE_PENDANT.ids.contains(item.id)) {
+                        player.achievementDiaryManager.finishTask(player, DiaryType.VARROCK, 1, 10)
+                    }
+
+                    if (!replace) {
+                        return@queueScript stopExecuting(player)
+                    }
+                    if (isLastItemIndex(itemIndex)) {
+                        if (isSlayerRing(item)) {
+                            if (isEquipped) {
+                                // Remove it now, but only addItemOrDrop the gem after the teleport has procced
+                                if (removeItem(player, item, Container.EQUIPMENT)) {
+                                    return@queueScript delayScript(player, 1)
+                                }
+                                log(this.javaClass, Log.ERR, "Error replacing slayer ring with enchanted gem (removeItem from equipment)")
+                            }
+                            // Not equipped -> can replace fluently
+                            if (replaceSlot(player, item.slot, Item(Items.ENCHANTED_GEM_4155), item) == item) {
+                                return@queueScript stopExecuting(player)
+                            }
+                            log(this.javaClass, Log.ERR, "Error replacing slayer ring with enchanted gem (replaceSlot)")
+                        }
+                        // Not slayer ring
+                        if (isCrumble) {
+                            val removeFrom = if (isEquipped) Container.EQUIPMENT else Container.INVENTORY
+                            if (removeItem(player, item, removeFrom)) {
+                                return@queueScript stopExecuting(player)
+                            }
+                            log(this.javaClass, Log.ERR, "Error crumbling jewelry")
+                        }
+                    } else {
+                        replaceJewellery(player, item, nextJewellery, isEquipped)
+                    }
+                }
+                2 -> {
+                    addItemOrDrop(player, Items.ENCHANTED_GEM_4155)
+                    sendMessage(player, "Your Ring of Slaying reverts back into a regular enchanted gem.")
+                }
+            }
+            return@queueScript stopExecuting(player)
+        }
+        return true
     }
 
     private fun replaceJewellery(player: Player, item: Item, nextJewellery: Item, isEquipped: Boolean) {
@@ -255,18 +319,6 @@ enum class EnchantedJewellery(
         }
     }
 
-    private fun crumbleJewellery(player: Player, item: Item, isEquipped: Boolean) {
-        if (isEquipped) {
-            removeItem(player, item, Container.EQUIPMENT)
-        } else {
-            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.")
-        }
-    }
-
     private fun isSlayerRing(item: Item): Boolean {
         return (item.id in RING_OF_SLAYING.ids)
     }
@@ -275,11 +327,11 @@ 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
         setVarp(player, 2502, slayerManager.flags.taskFlags shr 4)
@@ -327,6 +379,8 @@ enum class EnchantedJewellery(
     companion object {
         private val ANIMATION = Animation(714)
         private val GRAPHICS = Graphics(308, 100, 50)
+        private val JEWELLERY_ANIMATION = Animation(9603)
+        private val JEWELLERY_GRAPHICS = Graphics(1684)
         val idMap = HashMap<Int, EnchantedJewellery>()
 
         init {

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

@@ -100,7 +100,7 @@ public enum GodBook {
 	 * @param page the page.
 	 */
 	public void insertPage(Player player, Item book, Item page) {
-                if (!hasRequirement(player, "Horror from the Deep"))
+                if (!hasRequirement(player, Quests.HORROR_FROM_THE_DEEP))
                         return;
 		if (hasPage(player, book, page)) {
 			player.sendMessage("The book already has that page.");

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/RepairItem.java

@@ -1,87 +0,0 @@
-package content.data;
-
-import core.game.node.item.Item;
-
-/**
- * Represents the repair item type.
- * @author Vexia
- */
-public enum RepairItem {
-	BRONZE_HATCHET(new Item(494, 1), new Item(1351, 1), 0),
-	BRONZE_PICKAXE(new Item(468, 1), new Item(1265, 1), 0),
-	IRON_HATCHET(new Item(496, 1), new Item(1349, 1), 0),
-	IRON_PICKAXE(new Item(470, 1), new Item(1267, 1), 0),
-	STEEL_HATCHET(new Item(498, 1), new Item(1353, 1), 0),
-	STEEL_PICKAXE(new Item(472, 1), new Item(1269, 1), 14),
-	BLACK_HATCHET(new Item(500, 1), new Item(1361, 1), 10),
-	MITHRIL_HATCHET(new Item(502, 1), new Item(1355, 1), 18),
-	MITHRIL_PICKAXE(new Item(474, 1), new Item(1273, 1), 43),
-	ADAMANT_HATCHET(new Item(504, 1), new Item(1357, 1), 43),
-	ADAMANT_PICKAXE(new Item(476, 1), new Item(1271, 1), 107),
-	RUNE_HATCHET(new Item(506, 1), new Item(1359, 1), 427),
-	RUNE_PICKAXE(new Item(478, 1), new Item(1275, 1), 1100),
-	DRAGON_HATCHET(new Item(6741, 1), new Item(6739, 1), 1800);
-
-	/**
-	 * The item id.
-	 */
-	private final Item item;
-
-	/**
-	 * The product item.
-	 */
-	private final Item product;
-
-	/**
-	 * The cost of the money to repair.
-	 */
-	private final int cost;
-
-	/**
-	 * Constructs a new {@code BobRepairItem} {@code Object}.
-	 * @param item the item.
-	 * @param product the product.
-	 * @param cost the cost.
-	 */
-	RepairItem(Item item, Item product, int cost) {
-		this.item = item;
-		this.product = product;
-		this.cost = cost;
-	}
-
-	/**
-	 * Gets the item.
-	 * @return The item.
-	 */
-	public Item getItem() {
-		return item;
-	}
-
-	/**
-	 * Gets the product.
-	 * @return The product.
-	 */
-	public Item getProduct() {
-		return product;
-	}
-
-	/**
-	 * Gets the cost.
-	 * @return The cost.
-	 */
-	public int getCost() {
-		return cost;
-	}
-
-	/**
-	 * Gets the reapir item by the id.
-	 * @param id the id.
-	 * @return the repair item.
-	 */
-	public static RepairItem forId(int id) {
-		for (RepairItem item : RepairItem.values())
-			if (item.item.getId() == id)
-				return item;
-		return null;
-	}
-}

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

@@ -0,0 +1,43 @@
+package content.data
+
+import core.game.node.item.Item
+
+/**
+ * Represents the repair item type.
+ * @author Vexia
+ * @author Damighty - Kotlin conversion
+ */
+enum class RepairItem(
+    val item: Item,
+    val product: Item,
+    val cost: Int
+) {
+    BRONZE_HATCHET(Item(494, 1), Item(1351, 1), 0),
+    BRONZE_PICKAXE(Item(468, 1), Item(1265, 1), 0),
+    IRON_HATCHET(Item(496, 1), Item(1349, 1), 0),
+    IRON_PICKAXE(Item(470, 1), Item(1267, 1), 0),
+    STEEL_HATCHET(Item(498, 1), Item(1353, 1), 0),
+    STEEL_PICKAXE(Item(472, 1), Item(1269, 1), 14),
+    BLACK_HATCHET(Item(500, 1), Item(1361, 1), 10),
+    MITHRIL_HATCHET(Item(502, 1), Item(1355, 1), 18),
+    MITHRIL_PICKAXE(Item(474, 1), Item(1273, 1), 43),
+    ADAMANT_HATCHET(Item(504, 1), Item(1357, 1), 43),
+    ADAMANT_PICKAXE(Item(476, 1), Item(1271, 1), 107),
+    RUNE_HATCHET(Item(506, 1), Item(1359, 1), 427),
+    RUNE_PICKAXE(Item(478, 1), Item(1275, 1), 1100),
+    DRAGON_HATCHET(Item(6741, 1), Item(6739, 1), 1800);
+
+    companion object {
+        /**
+         * List of all repairable item IDs.
+         */
+        @JvmStatic
+        val repairableItemIds: List<Int> = values().map { it.item.id }
+
+        /**
+         * Gets the repair item by the broken items ID.
+         */
+        @JvmStatic
+        fun forId(id: Int): RepairItem? = values().firstOrNull { it.item.id == id }
+    }
+}

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

@@ -30,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)), 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 */
@@ -110,14 +110,16 @@ 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))),
 	EGG_AND_TOMATO(new Food(new int[] {7064, 1923}, new HealingEffect(8))),
 	SWEET_CORN(new Food(new int[] {5988}, new MultiEffect(new HealingEffect(1), new PercentageHealthEffect(10)))),
 	SWEETCORN_BOWL(new Food(new int[] {7088, 1923}, new MultiEffect(new HealingEffect(1), new PercentageHealthEffect(10)))),
+	CHOPPED_TUNA(new Food(new int[] {7086, 1923}, new HealingEffect(10))),
+	CHOPPED_ONION(new Food(new int[] {1871, 1923}, new HealingEffect(1))),
 	POTATO_WITH_BUTTER(new Food(new int[] {6703}, new HealingEffect(7))),
 	CHILLI_POTATO(new Food(new int[] {7054}, new HealingEffect(14))),
 	FRIED_ONIONS(new Food(new int[] {7084, 1923}, new HealingEffect(5))),
@@ -128,8 +130,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))),
@@ -147,16 +149,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))),
@@ -169,8 +171,8 @@ public enum Consumables {
 	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))),
@@ -201,48 +203,56 @@ public enum Consumables {
 	/** Ales */
 	ASGOLDIAN_ALE(new FakeConsumable(7508, new String[] {"I don't think I'd like gold in beer thanks. Leave it for the dwarves."})),
 	ASGARNIAN_ALE(new Drink(new int[] {1905, 1919}, new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)), "You drink the ale. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
+	ASGARNIAN_ALE_POH(new Drink(new int[] {7744, 7742}, new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)), "You drink the ale. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
 	ASGARNIAN_ALE_KEG(new Drink(new int[] {5785, 5783, 5781, 5779, 5769}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)), new Animation(2289), "You drink the ale. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
-	ASGARNIAN_ALE_M(new Drink(new int[] {5739, 1919}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)))),
-	ASGARNIAN_ALE_M_KEG(new Drink(new int[] {5865, 5863, 5861, 5859, 5769}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)), new Animation(2289))),
+	ASGARNIAN_ALE_M(new Drink(new int[] {5739, 1919}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)), "You drink the ale. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
+	ASGARNIAN_ALE_M_KEG(new Drink(new int[] {5865, 5863, 5861, 5859, 5769}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)), new Animation(2289), "You drink the ale. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
 	AXEMANS_FOLLY(new Drink(new int[] {5751, 1919}, new MultiEffect(new SkillEffect(Skills.WOODCUTTING, 1, 0), new HealingEffect(1), new SkillEffect(Skills.STRENGTH, -3, 0), new SkillEffect(Skills.ATTACK, -3, 0)))),
 	AXEMANS_FOLLY_KEG(new Drink(new int[] {5825, 5823, 5821, 5819, 5769}, new MultiEffect(new SkillEffect(Skills.WOODCUTTING, 1, 0), new HealingEffect(1), new SkillEffect(Skills.STRENGTH, -3, 0), new SkillEffect(Skills.ATTACK, -3, 0)), new Animation(2289))),
 	AXEMANS_FOLLY_M(new Drink(new int[] {5753, 1919}, new MultiEffect(new SkillEffect(Skills.WOODCUTTING, 2, 0), new HealingEffect(2), new SkillEffect(Skills.STRENGTH, -4, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
 	AXEMANS_FOLLY_M_KEG(new Drink(new int[] {5905, 5903, 5901, 5899, 5769}, new MultiEffect(new SkillEffect(Skills.WOODCUTTING, 2, 0), new HealingEffect(2), new SkillEffect(Skills.STRENGTH, -4, 0), new SkillEffect(Skills.ATTACK, -4, 0)), new Animation(2289))),
 	BANDITS_BREW(new Drink(new int[] {4627, 1919}, new MultiEffect(new SkillEffect(Skills.THIEVING, 1, 0), new SkillEffect(Skills.ATTACK, 1, 0), new SkillEffect(Skills.STRENGTH, -1, 0), new SkillEffect(Skills.DEFENCE, -6, 0), new HealingEffect(1)), "You drink the beer. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
 	BEER(new Drink(new int[] {1917, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 0, 0.04), new SkillEffect(Skills.ATTACK, 0, -0.07)), "You drink the beer. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
+	BEER_POH(new Drink(new int[] {7740, 7742}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 0, 0.04), new SkillEffect(Skills.ATTACK, 0, -0.07)), "You drink the beer. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
 	BEER_TANKARD(new Drink(new int[] {3803, 3805}, new MultiEffect(new SkillEffect(Skills.ATTACK, -9, 0), new SkillEffect(Skills.STRENGTH, 4, 0)), "You quaff the beer. You feel slightly reinvigorated...", "...but very dizzy too.")),
 	KEG_OF_BEER(new Drink(new int[] {3801}, new KegOfBeerEffect(), new Animation(1330), "You chug the keg. You feel reinvigorated...", "...but extremely drunk too.")),
 	CHEFS_DELIGHT(new Drink(new int[] {5755, 1919}, new MultiEffect(new SkillEffect(Skills.COOKING, 1, 0.05), new HealingEffect(1), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)))),
+	CHEFS_DELIGHT_POH(new Drink(new int[] {7754, 7742}, new MultiEffect(new SkillEffect(Skills.COOKING, 1, 0.05), new HealingEffect(1), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)))),
 	CHEFS_DELIGHT_KEG(new Drink(new int[] {5833, 5831, 5829, 5827, 5769}, new MultiEffect(new SkillEffect(Skills.COOKING, 1, 0.05), new HealingEffect(1), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)), new Animation(2289))),
 	CHEFS_DELIGHT_M(new Drink(new int[] {5757, 1919}, new MultiEffect(new SkillEffect(Skills.COOKING, 2, 0.05), new HealingEffect(2), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0)))),
 	CHEFS_DELIGHT_M_KEG(new Drink(new int[] {5913, 5911, 5909, 5907, 5769}, new MultiEffect(new SkillEffect(Skills.COOKING, 2, 0.05), new HealingEffect(2), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0)), new Animation(2289))),
 	CIDER(new Drink(new int[] {5763, 1919}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 1, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0))))),
+	CIDER_POH(new Drink(new int[] {7752, 7742}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 1, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0))))),
 	CIDER_KEG(new Drink(new int[] {5849, 5847, 5845, 5843, 5769}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 1, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0))), new Animation(2289))),
 	MATURE_CIDER(new Drink(new int[] {5765, 1919}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 2, 0), new SkillEffect(Skills.ATTACK, -5, 0), new SkillEffect(Skills.STRENGTH, -5, 0))))),
 	CIDER_M_KEG(new Drink(new int[] {5929, 5927, 5925, 5923, 5769}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 2, 0), new SkillEffect(Skills.ATTACK, -5, 0), new SkillEffect(Skills.STRENGTH, -5, 0))), new Animation(2289))),
 	DRAGON_BITTER(new Drink(new int[] {1911, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
+	DRAGON_BITTER_POH(new Drink(new int[] {7748, 7742}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
 	DRAGON_BITTER_KEG(new Drink(new int[] {5809, 5807, 5805, 5803, 5769}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)), new Animation(2289))),
 	DRAGON_BITTER_M(new Drink(new int[] {5745, 1919}, new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)))),
 	DRAGON_BITTER_M_KEG(new Drink(new int[] {5889, 5887, 5885, 5883, 5769}, new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)), new Animation(2289))),
 	DWARVEN_STOUT(new Drink(new int[] {1913, 1919}, new MultiEffect(new SkillEffect(Skills.MINING, 1, 0), new SkillEffect(Skills.SMITHING, 1 ,0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0), new SkillEffect(Skills.DEFENCE, -2, 0), new HealingEffect(1)), "You drink the Dwarven Stout. It tastes foul.", "It tastes pretty strong too.")),
 	DWARVEN_STOUT_KEG(new Drink(new int[] {5777, 5775, 5773, 5771, 5769}, new MultiEffect(new SkillEffect(Skills.MINING, 1, 0), new SkillEffect(Skills.SMITHING, 1 ,0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0), new SkillEffect(Skills.DEFENCE, -2, 0), new HealingEffect(1)), new Animation(2289), "You drink the Dwarven Stout. It tastes foul.", "It tastes pretty strong too.")),
-	DWARVEN_STOUT_M(new Drink(new int[] {5747, 1919}, new MultiEffect(new SkillEffect(Skills.MINING, 2, 0), new SkillEffect(Skills.SMITHING, 2 ,0), new SkillEffect(Skills.ATTACK, -7, 0), new SkillEffect(Skills.STRENGTH, -7, 0), new SkillEffect(Skills.DEFENCE, -7, 0), new HealingEffect(1)))),
-	DWARVEN_STOUT_M_KEG(new Drink(new int[] {5857, 5855, 5853, 5851, 5769}, new MultiEffect(new SkillEffect(Skills.MINING, 2, 0), new SkillEffect(Skills.SMITHING, 2 ,0), new SkillEffect(Skills.ATTACK, -7, 0), new SkillEffect(Skills.STRENGTH, -7, 0), new SkillEffect(Skills.DEFENCE, -7, 0), new HealingEffect(1)), new Animation(2289))),
+	DWARVEN_STOUT_M(new Drink(new int[] {5747, 1919}, new MultiEffect(new SkillEffect(Skills.MINING, 2, 0), new SkillEffect(Skills.SMITHING, 2 ,0), new SkillEffect(Skills.ATTACK, -7, 0), new SkillEffect(Skills.STRENGTH, -7, 0), new SkillEffect(Skills.DEFENCE, -7, 0), new HealingEffect(1)), "You drink the Dwarven Stout. It tastes foul.", "It tastes pretty strong too.")),
+	DWARVEN_STOUT_M_KEG(new Drink(new int[] {5857, 5855, 5853, 5851, 5769}, new MultiEffect(new SkillEffect(Skills.MINING, 2, 0), new SkillEffect(Skills.SMITHING, 2 ,0), new SkillEffect(Skills.ATTACK, -7, 0), new SkillEffect(Skills.STRENGTH, -7, 0), new SkillEffect(Skills.DEFENCE, -7, 0), new HealingEffect(1)), new Animation(2289), "You drink the Dwarven Stout. It tastes foul.", "It tastes pretty strong too.")),
 	GREENMANS_ALE(new Drink(new int[] {1909, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 1, 0), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0), new SkillEffect(Skills.DEFENCE, -3, 0)))),
+	GREENMANS_ALE_POH(new Drink(new int[] {7746, 7742}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 1, 0), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0), new SkillEffect(Skills.DEFENCE, -3, 0)))),
 	GREENMANS_ALE_KEG(new Drink(new int[] {5793, 5791, 5789, 5787, 5769}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 1, 0), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0), new SkillEffect(Skills.DEFENCE, -3, 0)), new Animation(2289))),
 	GREENMANS_ALE_M(new Drink(new int[] {5743, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 2, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)))),
 	GREENMANS_ALE_M_KEG(new Drink(new int[] {5873, 5871, 5869, 5867, 5769}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 2, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)), new Animation(2289))),
 	GROG(new Drink(new int[] {1915, 1919}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)))),
-	MOONLIGHT_MEAD(new Drink(new int[] {2955, 1919}, new HealingEffect(4), "It tastes like something just died in your mouth.")),
-	MOONLIGHT_MEAD_KEG(new Drink(new int[] {5817, 5815, 5813, 5811, 5769}, new HealingEffect(4), new Animation(2289),  "It tastes like something just died in your mouth.")),
-	MOONLIGHT_MEAD_M(new Drink(new int[] {5749, 1919}, new HealingEffect(6))),
-	MOONLIGHT_MEAD_M_KEG(new Drink(new int[] {5897, 5895, 5893, 5891, 5769}, new HealingEffect(6), new Animation(2289))),
+	MOONLIGHT_MEAD(new Drink(new int[] {2955, 1919}, new HealingEffect(5), "It tastes like something just died in your mouth.")),
+	MOONLIGHT_MEAD_KEG(new Drink(new int[] {5817, 5815, 5813, 5811, 5769}, new HealingEffect(5), new Animation(2289),  "It tastes like something just died in your mouth.")),
+	MOONLIGHT_MEAD_M(new Drink(new int[] {5749, 1919}, new HealingEffect(4), "It tastes like something just died in your mouth.")),
+	MOONLIGHT_MEAD_M_KEG(new Drink(new int[] {5897, 5895, 5893, 5891, 5769}, new HealingEffect(4), new Animation(2289), "It tastes like something just died in your mouth.")),
 	SLAYERS_RESPITE(new Drink(new int[] {5759, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.SLAYER, 2, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)))),
 	SLAYERS_RESPITE_KEG(new Drink(new int[] {5841, 5839, 5837, 5835, 5769}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.SLAYER, 2, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)), new Animation(2289))),
 	SLAYERS_RESPITE_M(new Drink(new int[] {5761, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.SLAYER, 4, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)))),
 	SLAYERS_RESPITE_M_KEG(new Drink(new int[] {5841, 5839, 5837, 5835, 5769}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.SLAYER, 4, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)), new Animation(2289))),
 	WIZARDS_MIND_BOMB(new Drink(new int[] {1907, 1919}, new WizardsMindBombEffect(), "You drink the Wizard's Mind Bomb.", "You feel very strange.")),
-	MATURE_WMB(new Drink(new int[] {5741, 1919}, new MatureWmbEffect())),
+	WIZARDS_MIND_BOMB_KEG(new Drink(new int[] {5801, 5799, 5797, 5795, 5769}, new WizardsMindBombEffect(), new Animation(2289), "You drink the Wizard's Mind Bomb.", "You feel very strange.")),
+	MATURE_WMB(new Drink(new int[] {5741, 1919}, new MatureWmbEffect(), "You drink the mature Wizard's Mind Bomb.", "You feel very strange.")),
+	MATURE_WMB_KEG(new Drink(new int[] {5881, 5879, 5877, 5875, 5769}, new MatureWmbEffect(), new Animation(2289), "You drink the mature Wizard's Mind Bomb.", "You feel very strange.")),
 
 	/** Cocktails */
 	FRUIT_BLAST(new Drink(new int[] {2084, 2026}, new HealingEffect(9))),
@@ -272,11 +282,11 @@ public enum Consumables {
 	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)))),
@@ -285,16 +295,19 @@ public enum Consumables {
 
 	/** 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_MILKY(new Drink(new int[] {4240, 1980}, new NettleTeaEffect())),
+	NETTLE_WATER(new Drink(new int[] {Items.NETTLE_WATER_4237, Items.BOWL_1923}, new HealingEffect((1)))),
+	CUP_OF_TEA_NETTLE(new Drink(new int[] {4242, 1980}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))),
+	CUP_OF_TEA_MILKY_NETTLE(new Drink(new int[] {4243, 1980}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))),
+	CUP_OF_TEA_NETTLE_PORCELAIN(new Drink(new int[] {4245, 4244}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))),
+	CUP_OF_TEA_MILKY_NETTLE_PORCELAIN(new Drink(new int[] {4246, 4244}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))),
+	NETTLE_TEA(new Drink(new int[] {4239, 1923}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))),
+	NETTLE_TEA_MILKY(new Drink(new int[] {4240, 1923}, new MultiEffect(new HealingEffect(3), new EnergyEffect(10)))),
 	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))),
+	CUP_OF_TEA_CLAY_MILKY(new Drink(new int[] {7731, 7728}, new SkillEffect(Skills.CONSTRUCTION, 1, 0), "You feel refreshed and ready for more building.")),
 	CUP_OF_TEA_WHITE(new Drink(new int[] {7733, 7732}, new SkillEffect(Skills.CONSTRUCTION, 2, 0), "You feel refreshed and ready for more building.")),
-	CUP_OF_TEA_WHITE_MILKY(new Drink(new int[] {7734, 7732}, new SkillEffect(Skills.CONSTRUCTION, 2, 0))),
+	CUP_OF_TEA_WHITE_MILKY(new Drink(new int[] {7734, 7732}, new SkillEffect(Skills.CONSTRUCTION, 2, 0), "You feel refreshed and ready for more building.")),
 	CUP_OF_TEA_GOLD(new Drink(new int[] {7736, 7735}, new SkillEffect(Skills.CONSTRUCTION, 3, 0), "You feel refreshed and ready for more building.")),
-	CUP_OF_TEA_GOLD_MILKY(new Drink(new int[] {7737, 7735}, new SkillEffect(Skills.CONSTRUCTION, 3, 0))),
+	CUP_OF_TEA_GOLD_MILKY(new Drink(new int[] {7737, 7735}, new SkillEffect(Skills.CONSTRUCTION, 3, 0), "You feel refreshed and ready for more building.")),
 
 	/** Miscellaneous */
 	CHOCOLATE_BAR(new Food(new int[] {1973}, new HealingEffect(3))),
@@ -306,8 +319,9 @@ public enum Consumables {
 	TCHIKI_MONKEY_PASTE(new Food(new int[] {7575}, new HealingEffect(5), "You eat the Tchiki monkey nut paste. It sticks to the roof of your mouth.")),
 	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))),
+	CAVIAR(new Food(new int[]{11326}, new HealingEffect(5))),
 	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.")),
 
@@ -319,44 +333,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))),
+	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 MultiEffect(new SetAttributeEffect("disease:immunity", 300), new RemoveTimerEffect("disease")))),
+	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)))),
 	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))),
+	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, 2), new SkillEffect(Skills.ATTACK, 2, 0.20), new SkillEffect(Skills.STRENGTH, 2, 0.12), new SkillEffect(Skills.DEFENCE, -2, -0.10), new PrayerEffect(0.0, 0.10, true)))),
+	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 RemoveTimerEffect("poison"), new RemoveTimerEffect("disease")))),
+	MAGIC_ESS(new Potion(new int[] {9021, 9022, 9023, 9024}, new SkillEffect(Skills.MAGIC,3,0))),
+	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 ZamorakMixEffect(), new SkillEffect(Skills.ATTACK, 2, 0.20), new SkillEffect(Skills.STRENGTH, 2, 0.12), new SkillEffect(Skills.DEFENCE, -2, -0.10)))),
 	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 AddTimerEffect("poison:immunity", secondsToTicks(90)), new HealingEffect(3)))),
-	RELIC_MIX(new BarbarianMix(new int[] {11437, 11439}, new MultiEffect(new RemoveTimerEffect("disease"), new SetAttributeEffect("disease:immunity", 300), 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)))),
 	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(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)))),
@@ -365,8 +379,13 @@ 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)))),
+	ANTIDOTE_PLUS_MIX(new BarbarianMix(new int[] {11501, 11503}, new MultiEffect(new AddTimerEffect("poison:immunity", minutesToTicks(9)), new HealingEffect(6)))),
+	ANTIP_SUPERMIX(new BarbarianMix(new int[] {11473, 11475}, new MultiEffect(new AddTimerEffect("poison:immunity", minutesToTicks(6)), new HealingEffect(6)))),
+	ANTIFIRE_MIX(new BarbarianMix(new int[] {11505, 11507}, new MultiEffect(new AddTimerEffect("dragonfire:immunity", 600, true), new HealingEffect(6)))),
+	MAGIC_ESS_MIX(new BarbarianMix(new int[] {11489, 11491}, new MultiEffect(new SkillEffect(Skills.MAGIC, 3, 0), new HealingEffect(6)))),
+	SUPER_DEF_MIX(new BarbarianMix(new int[] {11497, 11499}, new MultiEffect(new SkillEffect(Skills.DEFENCE, 5, 0.15), new HealingEffect(6)))),
+	RANGING_MIX(new BarbarianMix(new int[] {11509, 11511}, new MultiEffect(new SkillEffect(Skills.RANGE, 4, 0.1), new HealingEffect(6)))),
+	MAGIC_MIX(new BarbarianMix(new int[] {11513, 11515}, new MultiEffect(new SkillEffect(Skills.MAGIC, 4, 0), new HealingEffect(6)))),
 
     /** Stealing creation potions */
 	SC_PRAYER(new Potion(new int[] {14207, 14209, 14211, 14213, 14215}, new PrayerEffect(7, 0.25))),

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/DamageEffect.java

@@ -7,15 +7,21 @@ import core.game.node.entity.player.Player;
 public class DamageEffect extends ConsumableEffect {
     final double amt;
     final boolean isPercent;
+    final int baseAmount;
 
-    public DamageEffect(double amt,boolean isPercent){
+    public DamageEffect(double amt, boolean isPercent) {
+        this(amt, isPercent, 0);
+    }
+
+    public DamageEffect(double amt, boolean isPercent, int baseAmount) {
         this.amt = amt;
         this.isPercent = isPercent;
+        this.baseAmount = baseAmount;
     }
 
     @Override
     public void activate(Player p) {
-        p.getImpactHandler().manualHit(p,-getHealthEffectValue(p), ImpactHandler.HitsplatType.NORMAL);
+        p.getImpactHandler().manualHit(p, -getHealthEffectValue(p), ImpactHandler.HitsplatType.NORMAL);
     }
 
     @Override
@@ -23,8 +29,8 @@ public class DamageEffect extends ConsumableEffect {
         double amount = amt;
         if (isPercent) {
             amount /= 100;
-            return (int) -(amount * player.getSkills().getLifepoints());
+            return (int) -(amount * player.getSkills().getLifepoints() + baseAmount);
         }
-        return (int) -amt;
+        return (int) -(amt + baseAmount);
     }
 }

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

@@ -1,20 +0,0 @@
-package content.data.consumables.effects;
-
-import core.game.consumable.ConsumableEffect;
-import core.game.node.entity.player.Player;
-
-public class NettleTeaEffect extends ConsumableEffect {
-
-    private final static int healing = 3;
-
-    @Override
-    public void activate(Player p) {
-        final ConsumableEffect effect = p.getSkills().getLifepoints() < p.getSkills().getMaximumLifepoints() ? new MultiEffect(new HealingEffect(3), new EnergyEffect(5)) : new HealingEffect(3);
-        effect.activate(p);
-    }
-
-    @Override
-    public int getHealthEffectValue(Player player) {
-        return healing;
-    }
-}

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

@@ -5,16 +5,18 @@ 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.ceil
 import kotlin.math.floor
 
-class PrayerEffect(var base: Double, var bonus: Double) : ConsumableEffect() {
+class PrayerEffect @JvmOverloads constructor(var base: Double, var bonus: Double, private val roundUp: Boolean = false) : 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))
+        val rawAmount = base + (level * b)
+        val amount = if (roundUp) ceil(rawAmount) else floor(rawAmount)
         modPrayerPoints(player, amount)
     }
 }

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/consumables/effects/ZamorakMixEffect.java

@@ -0,0 +1,25 @@
+package content.data.consumables.effects;
+
+import core.game.consumable.ConsumableEffect;
+import core.game.node.entity.combat.ImpactHandler;
+import core.game.node.entity.player.Player;
+
+/**
+ * The Zamorak mix shows the regular Zamorak brew hitsplat (10% of pre-drink lifepoints + 2, rounded down)
+ * but also heals 6 lifepoints. The heal must be applied before the hit so the net change can never kill
+ * the player, while the hitsplat still reflects the pre-heal lifepoints.
+ */
+public class ZamorakMixEffect extends ConsumableEffect {
+	
+	@Override
+	public void activate(Player p) {
+		int damage = (int) (p.getSkills().getLifepoints() * 0.10 + 2);
+		p.getSkills().heal(6);
+		p.getImpactHandler().manualHit(p, damage, ImpactHandler.HitsplatType.NORMAL);
+	}
+	
+	@Override
+	public int getHealthEffectValue(Player player) {
+		return 6 - (int) (player.getSkills().getLifepoints() * 0.10 + 2);
+	}
+}

Server/src/main/content/data/skill/SkillingPets.java

@@ -1,103 +0,0 @@
-package content.data.skill;
-
-import core.game.node.entity.skill.Skills;
-import core.game.node.entity.player.Player;
-import core.game.node.item.Item;
-import core.game.world.repository.Repository;
-
-/**
- * Represents the skilling pets obtained randomly.
- * @author Empathy
- *
- */
-public enum SkillingPets {
-	
-	BABY_RED_CHINCHOMPA(new Item(14823), "Baby Chinchompa", Skills.HUNTER),
-	BABY_GREY_CHINCHOMPA(new Item(14824), "Baby Chinchompa", Skills.HUNTER),
-	BEAVER(new Item(14821), "Beaver", Skills.WOODCUTTING),
-	GOLEM(new Item(14822), "Rock Golem", Skills.MINING),
-	HERON(new Item(14827), "Heron", Skills.FISHING);
-
-	/**
-	 * The pet item drop.
-	 */
-	private final Item pet;
-	
-	/**
-	 * The name.
-	 */
-	private final String name;
-
-	/**
-	 * The skill.
-	 */
-	private final int skill;
-	
-	/**
-	 * Constructs a new {@code SkillingPets} object.
-	 * @param skill The skill id.
-	 * @param pet The pet item.
-	 */
-	SkillingPets(Item pet, String name, int skill) {
-		this.pet = pet;
-		this.name = name;
-		this.skill = skill;
-	}
-	
-	/**
-	 * Checks the pet drop.
-	 * @param player The player.
-	 * @param pet The pet drop to check.
-	 */
-	public static void checkPetDrop(Player player, SkillingPets pet) {
-		if (pet == null) {
-			return;
-		}
-		int defaultChance = 15000;
-		int newChance = (defaultChance / player.getSkills().getStaticLevel(pet.getSkill()) * 55);
-		int outOf = (newChance > defaultChance ? defaultChance : newChance);
-		int getChance = outOf;
-		if (getChance != 1) {
-			return;
-		}
-		if (player.hasItem(pet.getPet())) {
-			return;
-		}
-		if (player.getFamiliarManager().hasFamiliar() && player.getInventory().isFull()) {
-			return;
-		}
-		if (player.getFamiliarManager().hasFamiliar()) {
-			if (player.getFamiliarManager().getFamiliar().getName().equalsIgnoreCase(pet.getName())) {
-				return;
-			}
-			player.getInventory().add(pet.getPet());
-			player.sendNotificationMessage("You feel something weird sneaking into your backpack.");
-		} else {
-			player.getFamiliarManager().summon(pet.getPet(), true);
-			player.sendNotificationMessage("You have a funny feeling like you're being followed.");
-		}
-		Repository.sendNews(player.getUsername() + " has found a " + pet.getPet().getName() + "!");
-	}
-	 
-
-	/**
-	 * @return the pet
-	 */
-	public Item getPet() {
-		return pet;
-	}
-	
-	/**
-	 * @return the pet name.
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * @return the skill.
-	 */
-	public int getSkill() {
-		return skill;
-	}
-}

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

@@ -45,35 +45,35 @@ class ChampionChallengeListener : InteractionListener, MapArea {
 
     private val IMP_SCROLL_TEXT = arrayOf(
         "How about picking on someone your own size? I'll",
-        "see you at the Champion's Guild.",
+        "see you at the Champions' 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.",
+        "for you in the Champions' Guild.",
         "",
         "Champion of Goblins"
     )
 
     private val SKELETON_SCROLL_TEXT = arrayOf(
-        "I'll be waiting at the Champions' Guild to",
-        "collect your bones.",
+        "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!",
+        "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.",
+        "Get yourself to the Champions' Guild, if you dare",
+        "to face me puny human.",
         "",
         "Champion of Giants"
     )
@@ -93,28 +93,28 @@ class ChampionChallengeListener : InteractionListener, MapArea {
     )
 
     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.",
+        "I challenge you to a duel, come to the arena",
+        "beneath the Champions' 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!",
+        "Champions' Guild and prove it!",
         "",
         "Champion of Jogres"
     )
 
     private val LESSER_DEMON_SCROLL_TEXT = arrayOf(
-        "Come to the Champion's Guild so I can banish",
+        "Come to the Champions' Guild so I can banish",
         "you mortal!",
         "",
         "Champion of Lesser Demons"
     )
 
     private val PORTCULLIS = Scenery.PORTCULLIS_10553
-    private val LADDER = Scenery.LADDER_10554
     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
@@ -124,6 +124,13 @@ class ChampionChallengeListener : InteractionListener, MapArea {
     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
@@ -134,18 +141,18 @@ class ChampionChallengeListener : InteractionListener, MapArea {
             return@on true
         }
 
-        on(TRAPDOOR_CLOSED, IntType.SCENERY, "open") { _, node ->
-            replaceScenery(node.asScenery(), TRAPDOOR_OPEN, 100, node.location)
-            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, 100, node.location)
+            replaceScenery(node.asScenery(), TRAPDOOR_CLOSED, -1, node.location)
             return@on true
         }
 
@@ -154,15 +161,6 @@ class ChampionChallengeListener : InteractionListener, MapArea {
             return@on true
         }
 
-        on(LADDER, IntType.SCENERY, "climb-up") { player, _ ->
-            teleport(player, Location.create(3185, 9758, 0))
-            return@on true
-        }
-        on(CHAMPION_STATUE_OPEN, IntType.SCENERY, "climb-down") { player, _ ->
-            teleport(player, Location.create(3182, 9758, 0))
-            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.")
@@ -229,4 +227,4 @@ class ChampionChallengeListener : InteractionListener, MapArea {
             ZoneRestriction.RANDOM_EVENTS
         )
     }
-}
+}

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

@@ -70,7 +70,7 @@ class ChampionScrollsDropHandler : ChampionScrollsEventHookBase() {
 
             NPCs.CAVE_GOBLIN_GUARD_2073, NPCs.CAVE_GOBLIN_GUARD_2074,
 
-            NPCs.GOBLIN_GUARD_489, NPCs.GOBLIN_GUARD_6496, NPCs.GOBLIN_GUARD_6497,
+            NPCs.GOBLIN_GUARD_6496, NPCs.GOBLIN_GUARD_6497,
             NPCs.SERGEANT_GRIMSPIKE_6265,
             NPCs.SERGEANT_STEELWILL_6263,
             NPCs.SERGEANT_STRONGSTACK_6261

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

@@ -27,24 +27,24 @@ class LarxusDialogue(val ChallengeStart: Boolean = false) : DialogueFile() {
                 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 }
+                        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 any Prayers. 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 only allowed to take Weapons, no other items are allowed. 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 only allowed to use Melee attacks, no Ranged or Magic. 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 only allowed to use Magic attacks, no Melee or Ranged. 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 any Melee attacks. 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 any Special Attacks. 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 any Ranged attacks. 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 not allowed any Weapons or Armour. 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 only allowed to use Ranged attacks, no Melee or Magic. 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 any Magic attacks. 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 }
+                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 }
+                    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 -> {
@@ -65,7 +65,7 @@ class LarxusDialogue(val ChallengeStart: Boolean = false) : DialogueFile() {
                     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 }
+                4 -> npcl("This is the champions' arena. The champions of various races use it to duel those they deem worthy of the honour. If you find a challenge scroll in your travels, bring it here to face your challenger.").also { stage = END_DIALOGUE }
             }
         }
     }

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

@@ -3,8 +3,6 @@ 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
@@ -63,21 +61,11 @@ class ImpChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id,
         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) {
+
+            //somehow the maximumHit is determined to be zero by this point if you're using a melee special attack.
+            if (state.maximumHit == 0) {
                 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
-                }
+                sendMessage(player, "Larxus said you couldn't use special attacks in this duel.")
             }
         }
     }

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

@@ -1,8 +1,6 @@
 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
@@ -62,12 +60,11 @@ class LesserDemonChampionNPC(id: Int = 0, location: Location? = null) : Abstract
         super.checkImpact(state)
         val player = state.attacker
         if (player is Player) {
-            if (!player.equipment[3].hasItemPlugin()) {
+            if (player.equipment.isEmpty) {
                 state.neutralizeHits()
                 state.estimatedHit = state.maximumHit
             } else {
-                EquipHandler.unequip(player, EquipmentContainer.SLOT_WEAPON, id)
-                sendMessage(player, "You cannot use weapons in this challenge.")
+                sendMessage(player, "You cannot wear any equipment in this challenge.")
                 if (state.estimatedHit > -1) {
                     state.estimatedHit = 0
                     return

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

@@ -63,8 +63,8 @@ class ZombieChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(i
         val player = state.attacker
         if (player is Player) {
             if (state.style == CombatStyle.MELEE || state.style == CombatStyle.RANGE) {
-                state.estimatedHit = state.maximumHit
                 state.neutralizeHits()
+                state.estimatedHit = state.maximumHit
             }
             if (state.style == CombatStyle.MAGIC) {
                 sendMessage(player, "You cannot use spells in this challenge.")

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

@@ -30,7 +30,7 @@ class PenguinManager{
             return tagMapping[Penguin.forLocation(location)?.ordinal]?.contains(player.username.toLowerCase()) ?: false
         }
 
-        private fun updateStoreFile(){
+        fun updateStoreFile(){
             val jsonTags = JSONArray()
             tagMapping.filter { it.value.isNotEmpty() }.forEach { (ordinal,taggers) ->
                 log(this::class.java, Log.FINE, "$ordinal - ${taggers.first()}")

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

@@ -44,18 +44,65 @@ enum class Penguin(val id: Int, val hint: String, val location: Location){
     BUSH_8(NPCs.BUSH_8105,"located in the kingdom of Asgarnia.",Location.create(2951, 3511, 0)),
     BUSH_9(NPCs.BUSH_8105,"located in the northern desert.",Location.create(3350, 3311, 0)),
     BUSH_10(NPCs.BUSH_8105,"located somewhere in the kingdom of Kandarin.",Location.create(2633, 3501, 0)),
-    BUSH_11(NPCs.BUSH_8105,"located south of Ardougne.",Location.create(2440, 3206, 0)),
-    BUSH_12(NPCs.BUSH_8105,"located where wizards study.",Location.create(3112, 3149, 0)),
+    BUSH_11(NPCs.BUSH_8105,"located where wizards study.",Location.create(3112, 3149, 0)),
     ROCK_1(NPCs.ROCK_8109,"located where the Imperial Guard train.",Location.create(2852, 3578, 0)),
     ROCK_2(NPCs.ROCK_8109,"located in the kingdom of Misthalin.",Location.create(3356, 3416, 0)),
-    ROCK_3(NPCs.ROCK_8109,"located near some ogres.",Location.create(2631, 2980, 0)),
+    ROCK_3(NPCs.ROCK_8109,"located near some ogres.",Location.create(2631, 2980, 0)), //potentially incorrect location
     ROCK_4(NPCs.ROCK_8109,"located in the Kingdom of Asgarnia.",Location.create(3013, 3501, 0)),
     ROCK_5(NPCs.ROCK_8109,"located between Fremennik and barbarians.",Location.create(2532, 3630, 0)),
     CRATE_1(NPCs.CRATE_8108,"located in the kingdom of Misthalin.",Location.create(3112, 3332, 0)),
     CRATE_2(NPCs.CRATE_8108,"located in the Kingdom of Misthalin.",Location.create(3305, 3508, 0)),
-    BARREL_1(NPCs.CRATE_8108,"located where no weapons may go.",Location.create(2806, 3383, 0)),
+    CRATE_3(NPCs.CRATE_8108,"located south of Ardougne.",Location.create(2440, 3206, 0)),
+    BARREL_1(NPCs.BARREL_8104,"located where no weapons may go.",Location.create(2806, 3383, 0)),
     TOADSTOOL_1(NPCs.TOADSTOOL_8110,"located in the kingdom of Misthalin.",Location.create(3156, 3178, 0)),
-    TOADSTOOL_2(NPCs.TOADSTOOL_8110,"located in the fairy realm.",Location.create(2409, 4462, 0));
+    TOADSTOOL_2(NPCs.TOADSTOOL_8110,"located in the fairy realm.",Location.create(2409, 4462, 0)), //potentially a spawn from 2010
+
+    BUSH_12(NPCs.BUSH_8105,"located on an island.",Location.create(2534, 3871, 0)),
+    BARREL_2(NPCs.BARREL_8104,"located near the ghost town.",Location.create(3654, 3491, 0)),
+    BUSH_13(NPCs.BUSH_8105,"located where bloodsuckers rule.",Location.create(3600, 3487, 0)),
+    BUSH_14(NPCs.BUSH_8105,"located on islands where brothers quarrel.",Location.create(2355, 3848, 0)),
+    ROCK_6(NPCs.ROCK_8109,"located on a large crescent island.",Location.create(2118, 3943, 0)),
+    ROCK_7(NPCs.ROCK_8109,"located on islands where brothers quarrel.",Location.create(2357, 3797, 0)),
+    ROCK_8(NPCs.ROCK_8109,"located in the Wilderness.",Location.create(3169, 3650, 0)),
+    BARREL_3(NPCs.BARREL_8104,"located where pirates feel mostly harmless.",Location.create(3738, 3001, 0)),
+    CACTUS_3(NPCs.CACTUS_8107,"located in the southern desert.",Location.create(3276, 2797, 0)),
+    TOADSTOOL_3(NPCs.TOADSTOOL_8110,"located near the pointy-eared ones.",Location.create(2314, 3174, 0)),
+    BUSH_15(NPCs.BUSH_8105,"located deep in the jungle.",Location.create(2938, 2978, 0)),
+    TOADSTOOL_4(NPCs.TOADSTOOL_8110,"located near the pointy-eared ones.",Location.create(2219, 3227, 0)),
+    BARREL_4(NPCs.BARREL_8104,"located south of Ardougne.",Location.create(2662, 3152, 0)),
+    //BARREL_5(NPCs.BARREL_8104,"located where monkeys rule.",Location.create(2751, 2700, 0)),
+    //currently not well accessible, will need to add when Ape Atoll is sorted.
+    //BUSH_16(NPCs.BUSH_8105,"located on islands where brothers quarrel.",Location.create(2353, 3834, 0)),
+    //currently not well accessible, will need to add when Neitiznot bridges are fixed.
+    ROCK_9(NPCs.ROCK_8109,"located near a mountain of wolves.",Location.create(2852, 3504, 0)),
+    ROCK_10(NPCs.ROCK_8109,"located on islands where brothers quarrel.",Location.create(2413, 3846, 0)),
+
+    BUSH_17(NPCs.BUSH_8105,"located near some ogres.",Location.create(2578, 2909, 0)),
+    CRATE_4(NPCs.CRATE_8108,"located where banana smugglers dwell.",Location.create(2869, 3157, 0)),
+    //CRATE_5(NPCs.CRATE_8108,"located near the island of Dragontooth.",Location.create(3824, 3562, 0)),
+    //current not accessible, will need to add when Dragontooth island is sorted.
+    ROCK_11(NPCs.ROCK_8109,"located where bloodsuckers rule.",Location.create(3550, 3439, 0)),
+    TOADSTOOL_5(NPCs.TOADSTOOL_8110,"located near the pointy-eared ones.",Location.create(2181, 3172, 0)),
+    BUSH_18(NPCs.BUSH_8105,"located where bloodsuckers rule.",Location.create(3472, 3392, 0)),
+    BUSH_19(NPCs.BUSH_8105,"located near Port Sarim.",Location.create(2989, 3121, 0)),
+    CRATE_6(NPCs.CRATE_8108,"located where fishers colonise.",Location.create(2322, 3658, 0)),
+    ROCK_12(NPCs.ROCK_8109,"located between Fremennik and barbarians.",Location.create(2675, 3717, 0)),
+    ROCK_13(NPCs.ROCK_8109,"located near the pointy-eared ones.",Location.create(2296, 3270, 0)),
+    CRATE_7(NPCs.CRATE_8108,"located where bloodsuckers rule.",Location.create(3637, 3486, 0)),
+    TOADSTOOL_6(NPCs.TOADSTOOL_8110,"located where bloodsuckers rule.",Location.create(3416, 3437, 0)),
+    BUSH_20(NPCs.BUSH_8105,"located where monkeys rule.",Location.create(2802, 2806, 0)),
+
+    ROCK_14(NPCs.ROCK_8109,"located near some ogres.",Location.create(2438, 3050, 0)),
+    CACTUS_4(NPCs.CACTUS_8107,"located in the southern desert.",Location.create(3252, 2963, 0)),
+    ROCK_15(NPCs.ROCK_8109,"located near some ogres.",Location.create(2340, 3064, 0)),
+    ROCK_16(NPCs.ROCK_8109,"located in the Wilderness.",Location.create(3108, 3837, 0)),
+    CACTUS_5(NPCs.CACTUS_8107,"located in the southern desert.",Location.create(3433, 3000, 0)),
+    CACTUS_6(NPCs.CACTUS_8107,"located in the southern desert.",Location.create(3274, 2813, 0)),
+    ROCK_17(NPCs.ROCK_8109,"located in the Wilderness.",Location.create(3019, 3866, 0)),
+    ROCK_18(NPCs.ROCK_8109,"located in the Wilderness.",Location.create(2991, 3824, 0)),
+    BUSH_21(NPCs.BUSH_8105,"located north of Ardougne.",Location.create(2398, 3361, 0)),
+    ROCK_19(NPCs.ROCK_8109,"located near the coast.",Location.create(2733, 3283, 0)),
+    ROCK_20(NPCs.ROCK_8109,"located in the Wilderness.",Location.create(3236, 3927, 0));
 
     companion object {
         private val locationMap = values().map { it.location.toString() to it }.toMap()

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) {
@@ -123,37 +116,54 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando
         }
         isSpawned = true
         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
     }
 
     /**

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

@@ -6,6 +6,7 @@ import core.game.node.entity.player.Player
 import core.game.node.entity.skill.SkillPulse
 import core.game.node.entity.skill.Skills
 import content.data.skill.SkillingTool
+import core.ServerConstants
 import core.game.node.item.Item
 import core.tools.RandomFunction
 import org.rs09.consts.Items
@@ -13,6 +14,9 @@ import core.game.world.GameWorld
 import core.game.world.repository.Repository
 import core.tools.colorize
 
+// TODO: Shooting stars should roll for bonus gems while mining
+// See: https://youtu.be/6OqZ2TGc6fM?si=U8nB5IDQREhWXApD
+
 /**
  * The pulse used to handle mining shooting stars.
  */
@@ -46,14 +50,14 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
         //checks if the star has been discovered and if not, awards the bonus xp. Xp can be awarded regardless of mining level as per the wiki.
         if (!star.isDiscovered && !player.isArtificial) {
             val bonusXp = 75 * player.skills.getStaticLevel(Skills.MINING)
-            player.incrementAttribute("/save:shooting-star:bonus-xp", bonusXp)
+            rewardXP(player, Skills.MINING, bonusXp.toDouble())
             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.")
             ShootingStarPlugin.submitScoreBoard(player)
             star.isDiscovered = true
+            ShootingStarPlugin.getStoreFile()["isDiscovered"] = star.isDiscovered
             return player.skills.getLevel(Skills.MINING) >= star.miningLevel
         }
-        
+
         if (player.skills.getLevel(Skills.MINING) < star.miningLevel) {
             player.dialogueInterpreter.sendDialogue("You need a Mining level of at least " + star.miningLevel + " in order to mine this layer.")
             return false
@@ -87,6 +91,7 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
         val bonusXp = player.getAttribute("shooting-star:bonus-xp", 0).toDouble()
         var xp = star.level.exp.toDouble()
         if(bonusXp > 0) {
+            // legacy: shooting star bonus xp used to be handed out in an inauthentic way; see GL !2092
             val delta = Math.min(bonusXp, xp)
             player.incrementAttribute("/save:shooting-star:bonus-xp", (-delta).toInt())
             xp += delta
@@ -99,7 +104,7 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
         if (ShootingStarPlugin.getStarDust(player) < 200) {
             player.inventory.add(Item(ShootingStarPlugin.STAR_DUST, 1))
         }
-        if(!inInventory(player, Items.ANCIENT_BLUEPRINT_14651) && !inBank(player, Items.ANCIENT_BLUEPRINT_14651)){
+        if (ServerConstants.SHOOTING_STAR_RING && hasAnItem(player, Items.ANCIENT_BLUEPRINT_14651).container == null) {
             rollBlueprint(player)
         }
 
@@ -129,7 +134,7 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
 
     override fun message(type: Int) {
         when (type) {
-            0 -> player.packetDispatch.sendMessage("You swing your pickaxe at the rock...")
+            0 -> player.packetDispatch.sendMessage("You swing your pickaxe at the rock.")
         }
     }
 

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

@@ -12,11 +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) {
@@ -27,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() {
@@ -66,49 +82,67 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
                 return@on true
             }
 
-            val condition: (Player) -> Boolean = when(star.location.toLowerCase()){
-                "canifis bank" -> { p -> hasRequirement(p, "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 -> hasRequirement(p, "Mourning's End Part I") }
-                "jatizso mine" -> {p -> hasRequirement(player, "Fremennik Trials") }
-                "south crandor mining site" -> {p -> hasRequirement(p, "Dragon Slayer") }
-                "shilo village mining site" -> {p -> hasRequirement(p, "Shilo Village") }
-                "mos le'harmless bank" -> {p -> hasRequirement(p, "Cabin Fever") }
-                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)}
+                            "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 -> teleportToStar(player)
+                            2 -> end()
+                        }
+                    }
+                }
             }
 
-            if(!condition.invoke(player)){
-                sendDialogue(player, "Magical forces prevent your teleportation.")
-                return@on true
-            }
-
-            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
-            }
-
-            openDialogue(player, RingDialogue(shouldWarn, star))
-
+            openDialogue(player, RingDialogue(star))
             return@on true
         }
     }
 
     override fun defineCommands() {
-        define("tostar", Privilege.ADMIN) { player, _ ->
+        define("tostar", Privilege.ADMIN, description = "Teleports you adjacent to the currently active star.") { player, _ ->
             teleport(player, star.starObject.location.transform(1,1,0))
         }
 
-        define("submit", Privilege.ADMIN) { _, _ ->
+        define("submit", Privilege.ADMIN, description = "Rebuilds and fires the shooting star event immediately.") { _, _ ->
+            star.rebuildVars()
             star.fire()
         }
 
-        define("resetsprite", Privilege.ADMIN) { player, _ ->
+        define("resetsprite", Privilege.ADMIN, description = "Resets your star sprite reward cooldown.") { player, _ ->
             player.savedData.globalData.starSpriteDelay = 0L
         }
     }
@@ -119,26 +153,6 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
 
     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){
-            if (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/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 -> {

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

@@ -0,0 +1,59 @@
+package content.global.ame
+
+import core.ServerConstants
+import core.api.*
+import core.game.interaction.QueueStrength
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.player.link.TeleportManager.TeleportType
+import core.game.world.map.Location
+import core.game.world.update.flag.context.Graphics
+import org.rs09.consts.Sounds
+
+fun kidnapPlayer(npc: NPC, player: Player, dest: Location, playerLine: String? = null, callback: (player: Player, npc: NPC) -> Unit) {
+    clearScripts(player)
+    val lockDuration = if (playerLine != null) 4 else 6
+    lock(player, lockDuration)
+    queueScript(player, 1, QueueStrength.SOFT) { stage: Int ->
+        when (stage) {
+            0 -> {
+                if (playerLine != null) {
+                    sendChat(player, playerLine)
+                    return@queueScript delayScript(player, 2)
+                }
+                return@queueScript delayScript(player, 0)
+            }
+            1 -> {
+                sendGraphics(Graphics(1576, 0, 0), player.location)
+                animate(player,8939)
+                playAudio(player, Sounds.TELEPORT_ALL_200)
+                return@queueScript delayScript(player, 3)
+            }
+            2 -> {
+                setAttribute(player, "kidnapped-by-random", true)
+                if (getAttribute<Location?>(player, "/save:original-loc", null) == null) {
+                    setAttribute(player, "/save:original-loc", player.location)
+                }
+                teleport(player, dest, TeleportType.INSTANT)
+                sendGraphics(Graphics(1577, 0, 0), player.location)
+                animate(player, 8941)
+                resetAnimator(player)
+                callback(player, npc)
+                return@queueScript delayScript(player, 2)
+            }
+            3 -> {
+                removeAttribute(player, "kidnapped-by-random") //this is not needed at this point anymore and will reenable the original-loc sanity check tick action
+                return@queueScript stopExecuting(player)
+            }
+            else -> return@queueScript stopExecuting(player)
+        }
+    }
+}
+
+fun returnPlayer(player: Player) {
+    player.locks.unlockTeleport()
+    val destination = getAttribute(player, "/save:original-loc", ServerConstants.HOME_LOCATION)
+    teleport(player, destination!!)
+    unlock(player)
+    removeAttributes(player, "/save:original-loc", "kidnapped-by-random")
+}

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

@@ -1,11 +1,20 @@
 package content.global.ame
 
-import content.global.ame.events.MysteriousOldManNPC
+import content.global.ame.events.surpriseexam.MysteriousOldManNPC
+import core.api.getAttribute
 import core.api.playGlobalAudio
 import core.api.poofClear
+import core.api.removeAttribute
+import core.api.sendMessage
+import core.api.setAttribute
+import core.api.utils.WeightBasedTable
 import core.game.interaction.MovementPulse
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.CombatStyle
 import core.game.node.entity.impl.PulseType
 import core.game.node.entity.npc.NPC
+import core.game.node.entity.npc.agg.AggressiveBehavior
+import core.game.node.entity.npc.agg.AggressiveHandler
 import core.game.node.entity.player.Player
 import core.game.node.item.Item
 import core.game.world.map.Location
@@ -13,9 +22,10 @@ import core.game.world.map.RegionManager
 import core.game.world.map.path.Pathfinder
 import core.game.world.update.flag.context.Graphics
 import core.integrations.discord.Discord
-import core.api.utils.WeightBasedTable
+import core.tools.RandomFunction
 import core.tools.secondsToTicks
 import core.tools.ticksToCycles
+import org.rs09.consts.NPCs
 import org.rs09.consts.Sounds
 import kotlin.random.Random
 import kotlin.reflect.full.createInstance
@@ -27,8 +37,8 @@ abstract class RandomEventNPC(id: Int) : NPC(id) {
     val SMOKE_GRAPHICS = Graphics(86)
     var initialized = false
     var finalized = false
-    var timerPaused = false
     var ticksLeft = secondsToTicks(180)
+    private val combatBracket = intArrayOf(10, 20, 40, 60, 90)
 
     open fun create(player: Player, loot: WeightBasedTable? = null, type: String = ""): RandomEventNPC {
         val event = this::class.createInstance()
@@ -36,6 +46,7 @@ abstract class RandomEventNPC(id: Int) : NPC(id) {
         event.loot = loot
         event.player = player
         event.spawnLocation = RegionManager.getSpawnLocation(player, this)
+        setAttribute(event, "spawned-by-ame", true)
         return event
     }
 
@@ -45,6 +56,7 @@ abstract class RandomEventNPC(id: Int) : NPC(id) {
             poofClear(this)
             playGlobalAudio(this.location, Sounds.SMOKEPUFF_1930, ticksToCycles(1))
         }
+        removeAttribute(player, "random:pause")
         finalized = true
     }
 
@@ -66,7 +78,6 @@ abstract class RandomEventNPC(id: Int) : NPC(id) {
         if (!player.getAttribute("random:pause", false)) {
             ticksLeft--
         }
-
         if (!pulseManager.hasPulseRunning() && !finalized) {
             follow()
         }
@@ -82,15 +93,18 @@ abstract class RandomEventNPC(id: Int) : NPC(id) {
     override fun init() {
         initialized = true
         finalized = false
-        timerPaused = false
         spawnLocation ?: terminate()
         location = spawnLocation
         player.setAttribute("re-npc", this)
         super.init()
+        super.aggressiveHandler = AggressiveHandler(this, object : AggressiveBehavior() {
+            override fun canSelectTarget(entity: Entity, target: Entity): Boolean {
+                return target == player
+            }
+        })
     }
 
     open fun onTimeUp() {
-        noteAndTeleport()
         terminate()
     }
 
@@ -118,4 +132,39 @@ abstract class RandomEventNPC(id: Int) : NPC(id) {
     }
 
     abstract fun talkTo(npc: NPC)
-}
+
+    override fun isAttackable(entity: Entity, style: CombatStyle, message: Boolean): Boolean {
+        if (entity != player) {
+            if (entity is Player) {
+                sendMessage(entity, "It isn't interested in fighting you.") //TODO authentic message
+            }
+            return false
+        }
+        return super.isAttackable(entity, style, message)
+    }
+
+    fun idForCombatLevel(ids: List<Int>, player: Player): Int {
+        val index = combatBracket.indexOfFirst { player.properties.currentCombatLevel <= it }.takeIf { it != -1 }?: ids.lastIndex
+        return ids[index]
+    }
+
+    fun sayLine(npc: NPC, phrases: Array<String>, hasOpeningPhrase: Boolean, hasOverTimePhrase: Boolean) {
+        val inInteraction = getAttribute(player, "random:pause", false) //used by Certer
+        if ((ticksLeft % 20 == 0 || ticksLeft <= 2) && !inInteraction) { //speak every 20 ticks, or in the 2nd-to-last tick before attack/note-&-teleport
+            var playDwarfWhistle = true
+            if (ticksLeft == secondsToTicks(180) && hasOpeningPhrase) {
+                sendChat(phrases[0])
+            } else if (ticksLeft <= 2 && hasOverTimePhrase) {
+                sendChat(phrases[phrases.size - 1])
+                playDwarfWhistle = false
+            } else {
+                val start = if (hasOpeningPhrase) 0 else 1
+                val end = if (hasOverTimePhrase) phrases.size - 2 else phrases.size - 1
+                sendChat(phrases[RandomFunction.random(start, end + 1)])
+            }
+            if (npc.id == NPCs.DRUNKEN_DWARF_956 && playDwarfWhistle) {
+                playGlobalAudio(this.location, Sounds.DWARF_WHISTLE_2297)
+            }
+        }
+    }
+}

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

@@ -1,23 +1,28 @@
 package content.global.ame
 
 import org.rs09.consts.Items
-import content.global.ame.events.MysteriousOldManNPC
+import content.global.ame.events.surpriseexam.MysteriousOldManNPC
 import content.global.ame.events.certer.CerterNPC
-import content.global.ame.events.drilldemon.SeargentDamienNPC
+import content.global.ame.events.drilldemon.SergeantDamienNPC
 import content.global.ame.events.drunkendwarf.DrunkenDwarfNPC
 import content.global.ame.events.evilbob.EvilBobNPC
 import content.global.ame.events.evilchicken.EvilChickenNPC
 import content.global.ame.events.freakyforester.FreakyForesterNPC
+import content.global.ame.events.maze.MazeNPC
 import content.global.ame.events.genie.GenieNPC
+import content.global.ame.events.candlelight.PiousPeteNPC
+import content.global.ame.events.pillory.PilloryNPC
 import content.global.ame.events.rickturpentine.RickTurpentineNPC
 import content.global.ame.events.rivertroll.RiverTrollRENPC
 import content.global.ame.events.rockgolem.RockGolemRENPC
+import content.global.ame.events.quizmaster.QuizMasterNPC
 import content.global.ame.events.sandwichlady.SandwichLadyRENPC
 import content.global.ame.events.shade.ShadeRENPC
 import content.global.ame.events.strangeplant.StrangePlantNPC
 import content.global.ame.events.swarm.SwarmNPC
 import content.global.ame.events.treespirit.TreeSpiritRENPC
 import content.global.ame.events.zombie.ZombieRENPC
+import core.ServerConstants
 
 import core.api.utils.WeightBasedTable
 import core.api.utils.WeightedItem
@@ -26,6 +31,7 @@ import core.game.node.entity.skill.Skills
 enum class RandomEvents(val npc: RandomEventNPC, val loot: WeightBasedTable? = null, val skillIds: IntArray = intArrayOf(), val type: String = "") {
     SANDWICH_LADY(npc = SandwichLadyRENPC()),
     GENIE(npc = GenieNPC()),
+    CANDLELIGHT(npc = PiousPeteNPC(), skillIds = intArrayOf(Skills.PRAYER)),
     CERTER(npc = CerterNPC(), loot = WeightBasedTable.create(
         WeightedItem(Items.UNCUT_SAPPHIRE_1623,1,1,3.4),
         WeightedItem(Items.KEBAB_1971,1,1,1.7),
@@ -43,7 +49,8 @@ enum class RandomEvents(val npc: RandomEventNPC, val loot: WeightBasedTable? = n
         WeightedItem(Items.TOOTH_HALF_OF_A_KEY_985,1,1,0.1),
         WeightedItem(Items.LOOP_HALF_OF_A_KEY_987,1,1,0.1)
     )),
-    DRILL_DEMON(npc = SeargentDamienNPC()),
+    MAZE(npc = MazeNPC()),
+    DRILL_DEMON(npc = SergeantDamienNPC()),
     EVIL_CHICKEN(npc = EvilChickenNPC()),
     STRANGE_PLANT(npc = StrangePlantNPC()),
     SWARM(npc = SwarmNPC()),
@@ -52,7 +59,9 @@ enum class RandomEvents(val npc: RandomEventNPC, val loot: WeightBasedTable? = n
     RICK_TURPENTINE(npc = RickTurpentineNPC(), loot = CERTER.loot),
     SURPRISE_EXAM(npc = MysteriousOldManNPC(), type = "sexam"),
     FREAKY_FORESTER(npc = FreakyForesterNPC(), skillIds = intArrayOf(Skills.WOODCUTTING)),
+    PILLORY(npc = PilloryNPC(), skillIds = intArrayOf(Skills.THIEVING)),
     TREE_SPIRIT(npc = TreeSpiritRENPC(), skillIds = intArrayOf(Skills.WOODCUTTING)),
+    QUIZ_MASTER(npc = QuizMasterNPC()),
     RIVER_TROLL(RiverTrollRENPC(), skillIds = intArrayOf(Skills.FISHING)),
     ROCK_GOLEM(RockGolemRENPC(), skillIds = intArrayOf(Skills.MINING)),
     SHADE(ShadeRENPC(), skillIds = intArrayOf(Skills.PRAYER)),
@@ -76,6 +85,9 @@ enum class RandomEvents(val npc: RandomEventNPC, val loot: WeightBasedTable? = n
 
         private fun populateMappings() {
             for (event in values()) {
+                if (!ServerConstants.INAUTHENTIC_CANDLELIGHT_RANDOM && event == CANDLELIGHT) {
+                    continue
+                }
                 for (id in event.skillIds) {
                     val list = skillMap[id] ?: ArrayList<RandomEvents>().also { skillMap[id] = it }
                     list.add (event)
@@ -85,5 +97,4 @@ enum class RandomEvents(val npc: RandomEventNPC, val loot: WeightBasedTable? = n
             }
         }
     }
-
 }

Server/src/main/content/global/ame/events/HostileRandomEventBehavior.kt

@@ -0,0 +1,20 @@
+package content.global.ame.events
+
+import core.api.getAttribute
+import core.game.node.entity.Entity
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.npc.NPCBehavior
+import org.rs09.consts.NPCs
+
+class HostileRandomEventBehavior : NPCBehavior(
+	NPCs.EVIL_CHICKEN_2463, NPCs.EVIL_CHICKEN_2464, NPCs.EVIL_CHICKEN_2465, NPCs.EVIL_CHICKEN_2466, NPCs.EVIL_CHICKEN_2467, NPCs.EVIL_CHICKEN_2468,
+    NPCs.RIVER_TROLL_391, NPCs.RIVER_TROLL_392, NPCs.RIVER_TROLL_393, NPCs.RIVER_TROLL_394, NPCs.RIVER_TROLL_395, NPCs.RIVER_TROLL_396,
+    NPCs.SHADE_425, NPCs.SHADE_426, NPCs.SHADE_427, NPCs.SHADE_428, NPCs.SHADE_429, NPCs.SHADE_430, NPCs.SHADE_431,
+    NPCs.TREE_SPIRIT_438, NPCs.TREE_SPIRIT_439, NPCs.TREE_SPIRIT_440, NPCs.TREE_SPIRIT_441, NPCs.TREE_SPIRIT_442, NPCs.TREE_SPIRIT_443,
+    NPCs.ZOMBIE_419, NPCs.ZOMBIE_420, NPCs.ZOMBIE_421, NPCs.ZOMBIE_422, NPCs.ZOMBIE_423, NPCs.ZOMBIE_424
+) {
+    override fun getXpMultiplier(self: NPC, attacker: Entity): Double {
+        val xprate = super.getXpMultiplier(self, attacker)
+        return if (getAttribute(self, "spawned-by-ame", false)) xprate / 16.0 else xprate
+    }
+}

Server/src/main/content/global/ame/events/MysteriousOldManDialogue.kt

@@ -1,41 +0,0 @@
-package content.global.ame.events
-
-import core.game.node.entity.player.Player
-import content.global.ame.events.supriseexam.SurpriseExamUtils
-import core.game.dialogue.DialogueFile
-import core.game.system.timer.impl.AntiMacro
-
-class MysteriousOldManDialogue(val type: String) : DialogueFile() {
-
-    val CHOICE_STAGE = 50000
-
-    override fun handle(componentID: Int, buttonID: Int) {
-
-        if(type == "sexam" && stage < CHOICE_STAGE){
-            npc("Would you like to come do a surprise exam?")
-            stage = CHOICE_STAGE
-        }
-
-        else if(stage >= CHOICE_STAGE){
-            when(stage) {
-                CHOICE_STAGE -> options("Yeah, sure!", "No, thanks.").also { stage++ }
-                CHOICE_STAGE.substage(1) -> when(buttonID){
-                    1 -> {
-                        end()
-                        teleport(player!!,type)
-                        AntiMacro.terminateEventNpc(player!!)
-                    }
-                    2 -> {
-                        end()
-                        AntiMacro.terminateEventNpc(player!!)
-                    }
-                }
-            }
-        }
-    }
-    fun teleport(player: Player,type: String){
-        when(type){
-            "sexam" -> SurpriseExamUtils.teleport(player)
-        }
-    }
-}

Server/src/main/content/global/ame/events/MysteriousOldManNPC.kt

@@ -1,31 +0,0 @@
-package content.global.ame.events
-
-import content.global.ame.RandomEventNPC
-import core.game.node.entity.npc.NPC
-import core.tools.RandomFunction
-import org.rs09.consts.NPCs
-import core.api.utils.WeightBasedTable
-
-class MysteriousOldManNPC(var type: String = "", override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.MYSTERIOUS_OLD_MAN_410) {
-    override fun init() {
-        super.init()
-        sayLine()
-    }
-
-    override fun tick() {
-        super.tick()
-        if(RandomFunction.random(1,10) == 5) sayLine()
-    }
-
-    fun sayLine() {
-        when(type){
-            "sexam" -> sendChat("Surprise exam, ${player.username.capitalize()}!")
-        }
-    }
-
-    override fun talkTo(npc: NPC) {
-        when(type){
-            "sexam" -> player.dialogueInterpreter.open(MysteriousOldManDialogue("sexam"),this.asNpc())
-        }
-    }
-}

Server/src/main/content/global/ame/events/candlelight/CandlelightInterface.kt

@@ -0,0 +1,164 @@
+package content.global.ame.events.candlelight
+
+import core.api.*
+import core.api.utils.PlayerCamera
+import core.game.interaction.InteractionListener
+import core.game.interaction.InterfaceListener
+import core.game.node.entity.Entity
+import core.game.node.entity.player.Player
+import core.game.world.map.Direction
+import core.game.world.map.Location
+import core.game.world.map.zone.ZoneBorders
+import core.game.world.map.zone.ZoneRestriction
+import org.rs09.consts.Scenery
+
+/**
+ * Candlelight Interface CANDLELIGHT_178
+ *
+ */
+class CandlelightInterface : InterfaceListener, InteractionListener, MapArea {
+    companion object {
+        const val CANDLELIGHT_INTERFACE = 178
+        const val CANDLELIGHT_RETURN_LOC = "/save:original-loc"
+        const val CANDLELIGHT_CANDLE_ARRAY = "/save:candlelight:candle-array"
+        const val CANDLELIGHT_CAMERA_AT = "candlelight:camera-at"
+
+        val CANDLE_LOC_ARRAY = arrayOf(
+             Location(1967, 4997),
+             Location(1968, 4998),
+             Location(1967, 4999),
+             Location(1968, 5000),
+             Location(1967, 5001),
+             Location(1968, 5002),
+             Location(1967, 5003),
+             Location(1968, 5004),
+             Location(1967, 5005),
+             Location(1968, 5006),
+             Location(1967, 5007),
+        )
+
+        fun initCandlelight(player: Player) {
+            val candleArray = intArrayOf(0,0,0,0,0,0,2,2,2,2,2)
+            candleArray.shuffle()
+            setAttribute(player, CANDLELIGHT_CANDLE_ARRAY, candleArray)
+            for (candleIndex in 0..10) {
+                setVarbit(player, 1771 + candleIndex, candleArray[candleIndex])
+            }
+        }
+
+        fun areCandlesLit(player: Player): Boolean {
+            val candleArray = getAttribute(player, CANDLELIGHT_CANDLE_ARRAY, intArrayOf(0,0,0,0,0,0,0,0,0,0,0))
+            for (candle in candleArray) {
+                if (candle == 0) {
+                    return false
+                }
+            }
+            return true
+        }
+
+        fun lightCandle(player: Player) {
+            var currentCamLoc = getAttribute(player, CANDLELIGHT_CAMERA_AT, Location(1968, 5002))
+            val candleIndex = CANDLE_LOC_ARRAY.indexOf(currentCamLoc)
+            val varbit = candleIndex + 1771 // Essentially all varbits are 1771 .. 1881
+
+            if (candleIndex != -1) {
+                val candleArray = getAttribute(player, CANDLELIGHT_CANDLE_ARRAY, intArrayOf(0,0,0,0,0,0,0,0,0,0,0))
+                if (candleArray[candleIndex] == 0) {
+                    candleArray[candleIndex] = 1
+                    setAttribute(player, CANDLELIGHT_CANDLE_ARRAY, candleArray)
+                    setVarbit(player, varbit, 1)
+                    sendMessage(player, "You light the candle.")
+                } else if (candleArray[candleIndex] == 1) {
+                    sendMessage(player, "This candle is already lit.")
+                } else {
+                    sendMessage(player, "This candle is too short to light.")
+                }
+            } else {
+                sendMessage(player, "There is nothing to light here.")
+            }
+        }
+
+        fun moveCamera(player: Player, direction: Direction, firstTime: Boolean = false) {
+            var currentCamLoc = getAttribute(player, CANDLELIGHT_CAMERA_AT, Location(1968, 5002))
+            when(direction) {
+                Direction.NORTH -> currentCamLoc = currentCamLoc.transform(Direction.NORTH)
+                Direction.SOUTH -> currentCamLoc = currentCamLoc.transform(Direction.SOUTH)
+                Direction.EAST -> currentCamLoc = currentCamLoc.transform(Direction.EAST)
+                Direction.WEST -> currentCamLoc = currentCamLoc.transform(Direction.WEST)
+                else -> {}
+            }
+            if (currentCamLoc.x < 1967) { currentCamLoc.x = 1967 }
+            if (currentCamLoc.x > 1968) { currentCamLoc.x = 1968 }
+            if (currentCamLoc.y < 4997) { currentCamLoc.y = 4997 }
+            if (currentCamLoc.y > 5007) { currentCamLoc.y = 5007 }
+            setAttribute(player, CANDLELIGHT_CAMERA_AT, currentCamLoc)
+            PlayerCamera(player).rotateTo(currentCamLoc.x - 30, currentCamLoc.y,0,200) // height is kind of a relative value?
+            PlayerCamera(player).panTo(currentCamLoc.x + 2, currentCamLoc.y,350, if(firstTime) 400 else 10)
+        }
+    }
+
+    override fun defineInterfaceListeners() {
+        on(CANDLELIGHT_INTERFACE){ player, component, opcode, buttonID, slot, itemID ->
+            when (buttonID) {
+                1 -> moveCamera(player, Direction.WEST)
+                2 -> moveCamera(player, Direction.EAST)
+                3 -> lightCandle(player)/* Light */
+                4 -> moveCamera(player, Direction.SOUTH)
+                5 -> moveCamera(player, Direction.NORTH)
+                9 -> closeInterface(player)
+            }
+            return@on true
+        }
+
+        onOpen(CANDLELIGHT_INTERFACE){ player, component ->
+            // Move camera
+            return@onOpen true
+        }
+
+        onClose(CANDLELIGHT_INTERFACE){ player, component ->
+            PlayerCamera(player).reset()
+            // Reset camera
+            return@onClose true
+        }
+    }
+
+
+    override fun defineListeners() {
+        on((11364 .. 11394).toIntArray(), SCENERY, "light") { player, node ->
+            setAttribute(player, CANDLELIGHT_CAMERA_AT, Location(node.location.x, node.location.y))
+            moveCamera(player, Direction.NORTH_WEST, true)
+            openInterface(player, CANDLELIGHT_INTERFACE)
+            return@on true
+        }
+    }
+
+    override fun defineDestinationOverrides() {
+        setDest(SCENERY, (11364 .. 11394).toIntArray(),"light"){ player, node ->
+            return@setDest Location(1970, node.location.y)
+        }
+    }
+
+
+    override fun defineAreaBorders(): Array<ZoneBorders> {
+        return arrayOf(ZoneBorders.forRegion(7758))
+    }
+
+    override fun getRestrictions(): Array<ZoneRestriction> {
+        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS, ZoneRestriction.TELEPORT, ZoneRestriction.OFF_MAP)
+    }
+
+    override fun areaEnter(entity: Entity) {
+        if (entity is Player) {
+            initCandlelight(entity)
+            entity.interfaceManager.removeTabs(0, 1, 2, 3, 4, 5, 6, 12)
+        }
+    }
+
+    override fun areaLeave(entity: Entity, logout: Boolean) {
+        if (entity is Player) {
+            entity.interfaceManager.restoreTabs()
+        }
+    }
+
+
+}

Server/src/main/content/global/ame/events/candlelight/PiousPeteDialogue.kt

@@ -0,0 +1,94 @@
+package content.global.ame.events.candlelight
+
+import content.global.ame.RandomEvents
+import content.global.ame.events.pillory.PilloryInterface
+import content.global.ame.returnPlayer
+import core.api.*
+import core.game.dialogue.*
+import core.game.interaction.QueueStrength
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.world.map.Location
+import core.game.world.update.flag.context.Graphics
+import core.plugin.Initializable
+import core.tools.END_DIALOGUE
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+import org.rs09.consts.Sounds
+
+// iface 178
+
+@Initializable
+class PiousPeteDialogue (player: Player? = null) : DialoguePlugin(player) {
+    override fun newInstance(player: Player): DialoguePlugin {
+        return PiousPeteDialogue(player)
+    }
+    override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+        openDialogue(player, PiousPeteDialogueFile(), npc)
+        return false
+    }
+    override fun getIds(): IntArray {
+        return intArrayOf(NPCs.PIOUS_PETE_3207, NPCs._6564)
+    }
+}
+
+class PiousPeteDialogueFile : DialogueLabeller() {
+
+    override fun addConversation() {
+        npc(ChatAnim.THINKING, "Have you lit all the tall candles?")
+        exec { player, npc ->
+            if (CandlelightInterface.areCandlesLit(player)) {
+                loadLabel(player, "yeslit")
+            } else {
+                loadLabel(player, "nolit")
+            }
+        }
+
+        label("nolit")
+        player(ChatAnim.HALF_GUILTY, "Sorry, not yet.")
+        npc(ChatAnim.SAD, "Please help me in lighting the candles. I just need you to light all the tall candles, but not the short ones.")
+        line("Click on the pillars to open an interface", "to move around and light the candles.")
+
+        label("yeslit")
+        player(ChatAnim.FRIENDLY, "Yes, the tall ones are all lit.")
+        npc(ChatAnim.HAPPY, "Thank you my brother! I will now return you where you came from with a parting gift.")
+        npc(ChatAnim.FRIENDLY, "Take care brother!")
+        exec { player, npc ->
+            queueScript(player, 0, QueueStrength.SOFT) { stage: Int ->
+                when (stage) {
+                    0 -> {
+                        lock(player, 6)
+                        sendGraphics(Graphics(1576, 0, 0), player.location)
+                        animate(player,8939)
+                        playAudio(player, Sounds.TELEPORT_ALL_200)
+                        return@queueScript delayScript(player, 3)
+                    }
+                    1 -> {
+                        returnPlayer(player)
+                        sendGraphics(Graphics(1577, 0, 0), player.location)
+                        animate(player,8941)
+                        closeInterface(player)
+                        return@queueScript delayScript(player, 3)
+                    }
+                    2 -> {
+                        val loot = RandomEvents.CERTER.loot!!.roll(player)[0]
+                        addItemOrDrop(player, loot.id, loot.amount)
+                        return@queueScript stopExecuting(player)
+                    }
+                    else -> return@queueScript stopExecuting(player)
+                }
+            }
+        }
+    }
+}
+class PiousPeteStartingDialogueFile : DialogueLabeller() {
+
+    override fun addConversation() {
+        npc("I'm sorry to drag you away from your tasks, but I need a little help with something.")
+        player(ChatAnim.THINKING,"How can I help?")
+        npc("This is a chapel dedicated to our lord, Saradomin, and I'm tasked with maintaining this chapel.")
+        npc(ChatAnim.SAD,"My task is to light the chapel candles, but I couldn't reach them myself and I kept getting dazzled by the light whenever I tried.")
+        npc("So I need your help in lighting the candles. I need you to light all the tall candles, but not the short ones.")
+        npc(ChatAnim.FRIENDLY, "Once all the tall candles are all lit, come back and see me, and I will reward you for your work.")
+    }
+}

Server/src/main/content/global/ame/events/candlelight/PiousPeteNPC.kt

@@ -0,0 +1,26 @@
+package content.global.ame.events.candlelight
+
+import content.global.ame.RandomEventNPC
+import content.global.ame.kidnapPlayer
+import core.api.*
+import core.api.utils.WeightBasedTable
+import core.game.node.entity.npc.NPC
+import core.game.world.map.Location
+import org.rs09.consts.NPCs
+
+class PiousPeteNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.PRIEST_3206) {
+    override fun init() {
+        super.init()
+        // Supposed to be "I'm sorry to drag you away from your tasks, but I need a little help with something." but it's too goddamn long.
+        sendChat("${player.username}! I need a little help with something.")
+        face(player)
+        kidnapPlayer(this, player, Location(1972, 5002, 0)) { player, _ ->
+            CandlelightInterface.initCandlelight(player)
+            openDialogue(player, PiousPeteStartingDialogueFile(), NPC(NPCs.PIOUS_PETE_3207))
+        }
+    }
+
+    override fun talkTo(npc: NPC) {
+        player.dialogueInterpreter.open(PiousPeteDialogueFile(),npc)
+    }
+}

Server/src/main/content/global/ame/events/certer/CerterNPC.kt

@@ -2,29 +2,20 @@ package content.global.ame.events.certer
 
 import core.game.node.entity.npc.NPC
 import core.game.node.entity.player.link.emote.Emotes
-import core.tools.RandomFunction
 import org.rs09.consts.NPCs
 import content.global.ame.RandomEventNPC
 import core.api.animate
+import core.api.lock
+import core.api.setAttribute
 import core.api.utils.WeightBasedTable
 
 class CerterNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.GILES_2538) {
-    lateinit var pName: String
     lateinit var phrases: Array<String>
 
     override fun tick() {
-        // Don't speak if we have the interface opened
-        if (!timerPaused) {
-            // Over allotted time phrase
-            if (ticksLeft <= 2) {
-                player.lock(2)
-                sendChat(phrases[4])
-
-                // Say a phrase every 20 ticks starting at 280 ticks
-                // as to not interfere with the init chat phrase
-            } else if (ticksLeft <= 280 && ticksLeft % 20 == 0) {
-                sendChat(phrases[RandomFunction.random(1, 3)])
-            }
+        sayLine(this, phrases, true, true)
+        if (ticksLeft == 2) {
+            lock(player, 2)
         }
         super.tick()
     }
@@ -36,15 +27,19 @@ class CerterNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NP
 
     override fun init() {
         super.init()
-        pName = player.username.capitalize()
-        phrases = arrayOf("Greetings $pName, I need your help.",
-        "ehem... Hello $pName, please talk to me!",
-        "Hello, are you there $pName?",
-        "It's really rude to ignore someone, $pName!",
-        "No-one ignores me!")
-        player.setAttribute("random:pause", false)
-        player.setAttribute("certer:reward", false)
-        sendChat(phrases[0])
+        phrases = arrayOf(
+            "Greetings ${player.username}, I need your help.",
+            "ehem... Hello ${player.username}, please talk to me!",
+            "Hello, are you there ${player.username}?",
+            "It's really rude to ignore someone, ${player.username}!",
+            "No-one ignores me!"
+        )
+        setAttribute(player, "certer:reward", false)
         animate(this, Emotes.BOW.animation, true)
     }
-}
+
+    override fun onTimeUp() {
+        noteAndTeleport()
+        terminate()
+    }
+}

Server/src/main/content/global/ame/events/drilldemon/DrillDemonListeners.kt

@@ -79,7 +79,7 @@ class DrillDemonListeners : InteractionListener, MapArea {
     }
 
     override fun getRestrictions(): Array<ZoneRestriction> {
-        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS)
+        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS, ZoneRestriction.OFF_MAP)
     }
 
     override fun areaEnter(entity: Entity) {
@@ -90,4 +90,4 @@ class DrillDemonListeners : InteractionListener, MapArea {
             setComponentVisibility(entity.asPlayer(), 746, 12, true)
         }
     }
-}
+}

Server/src/main/content/global/ame/events/drilldemon/DrillDemonUtils.kt

@@ -1,9 +1,9 @@
 package content.global.ame.events.drilldemon
 
+import content.global.ame.returnPlayer
 import core.api.*
 import core.game.interaction.QueueStrength
 import core.game.node.entity.player.Player
-import core.game.world.map.Location
 import core.game.world.map.zone.ZoneBorders
 import core.game.world.update.flag.context.Animation
 import org.rs09.consts.Items
@@ -11,7 +11,6 @@ import org.rs09.consts.NPCs
 
 object DrillDemonUtils {
     val DD_KEY_TASK = "/save:drilldemon:task"
-    val DD_KEY_RETURN_LOC = "/save:drilldemon:original-loc"
     val DD_SIGN_VARP = 531
     val DD_SIGN_JOG = 0
     val DD_SIGN_SITUP = 1
@@ -22,14 +21,6 @@ object DrillDemonUtils {
     val DD_AREA = ZoneBorders(3158, 4817, 3168, 4823)
     val DD_NPC = NPCs.SERGEANT_DAMIEN_2790
 
-    fun teleport(player: Player) {
-        setAttribute(player, DD_KEY_RETURN_LOC, player.location)
-        teleport(player, Location.create(3163, 4819, 0))
-        player.interfaceManager.closeDefaultTabs()
-        setComponentVisibility(player, 548, 69, true)
-        setComponentVisibility(player, 746, 12, true)
-    }
-
     fun changeSignsAndAssignTask(player: Player) {
         setVarp(player, DD_SIGN_VARP, 0)
         val tempList = arrayListOf(DD_SIGN_JOG, DD_SIGN_JUMP, DD_SIGN_PUSHUP, DD_SIGN_SITUP).shuffled().toMutableList()
@@ -63,13 +54,8 @@ object DrillDemonUtils {
     }
 
     fun cleanup(player: Player) {
-        player.locks.unlockTeleport()
-        unlock(player)
-        teleport(player, getAttribute(player, DD_KEY_RETURN_LOC, Location.create(3222, 3218, 0)))
-        removeAttribute(player, DD_KEY_RETURN_LOC)
-        removeAttribute(player, DD_KEY_TASK)
-        removeAttribute(player, DD_CORRECT_OFFSET)
-        removeAttribute(player, DD_CORRECT_COUNTER)
+        returnPlayer(player)
+        removeAttributes(player, DD_KEY_TASK, DD_CORRECT_OFFSET, DD_CORRECT_COUNTER)
         player.interfaceManager.openDefaultTabs()
         setComponentVisibility(player, 548, 69, false)
         setComponentVisibility(player, 746, 12, false)
@@ -98,6 +84,5 @@ object DrillDemonUtils {
             }
             return@queueScript stopExecuting(player)
         }
-
     }
 }

Server/src/main/content/global/ame/events/drilldemon/SeargentDamienNPC.kt

@@ -1,38 +0,0 @@
-package content.global.ame.events.drilldemon
-
-import core.game.node.entity.npc.NPC
-import org.rs09.consts.NPCs
-import content.global.ame.RandomEventNPC
-import core.api.*
-import core.api.utils.WeightBasedTable
-
-import core.game.interaction.QueueStrength
-import core.game.system.timer.impl.AntiMacro
-import core.tools.secondsToTicks
-
-class SeargentDamienNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.SERGEANT_DAMIEN_2790) {
-
-    override fun init() {
-        super.init()
-        sendChat(player.username.capitalize() + "! Drop and give me 20!")
-        queueScript(player, 4, QueueStrength.SOFT) { stage: Int ->
-            when (stage) {
-                0 -> {
-                    lock(player, secondsToTicks(30))
-                    DrillDemonUtils.teleport(player)
-                    AntiMacro.terminateEventNpc(player)
-                    return@queueScript delayScript(player, 2)
-                }
-                1 -> {
-                    openDialogue(player, SeargentDamienDialogue(isCorrect = true, eventStart = true), NPCs.SERGEANT_DAMIEN_2790)
-                    return@queueScript stopExecuting(player)
-                }
-                else -> return@queueScript stopExecuting(player)
-            }
-        }
-    }
-
-    override fun talkTo(npc: NPC) {
-        openDialogue(player, SeargentDamienDialogue(), npc)
-    }
-}

Server/src/main/content/global/ame/events/drilldemon/SergeantDamienNPC.kt

@@ -0,0 +1,28 @@
+package content.global.ame.events.drilldemon
+
+import core.game.node.entity.npc.NPC
+import org.rs09.consts.NPCs
+import content.global.ame.RandomEventNPC
+import content.global.ame.kidnapPlayer
+import core.api.*
+import core.api.utils.WeightBasedTable
+
+import core.game.world.map.Location
+
+class SergeantDamienNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.SERGEANT_DAMIEN_2790) {
+    override fun init() {
+        super.init()
+        sendChat("${player.username}! Drop and give me 20!")
+        face(player)
+        kidnapPlayer(this, player, Location(3163, 4819, 0)) { player, _ ->
+            player.interfaceManager.closeDefaultTabs()
+            setComponentVisibility(player, 548, 69, true)
+            setComponentVisibility(player, 746, 12, true)
+            openDialogue(player, SeargentDamienDialogue(isCorrect = true, eventStart = true), NPCs.SERGEANT_DAMIEN_2790)
+        }
+    }
+
+    override fun talkTo(npc: NPC) {
+        openDialogue(player, SeargentDamienDialogue(), npc)
+    }
+}

Server/src/main/content/global/ame/events/drunkendwarf/DrunkenDwarfNPC.kt

@@ -9,35 +9,27 @@ import org.rs09.consts.NPCs
 import org.rs09.consts.Sounds
 
 class DrunkenDwarfNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.DRUNKEN_DWARF_956) {
-    private val phrases = arrayOf("Oi, are you der @name!","Dunt ignore your matey!","Aww comeon, talk to ikle me @name!")
-    private var attackPhrase = false
+    lateinit var phrases: Array<String>
     private var attackDelay = 0
-    private var lastPhraseTime = 0
-
-    private fun sendPhrases() {
-        if (getWorldTicks() > lastPhraseTime + 5) {
-            playGlobalAudio(this.location, Sounds.DWARF_WHISTLE_2297)
-            sendChat(this, phrases.random().replace("@name",player.username.capitalize()))
-            this.face(player)
-            lastPhraseTime = getWorldTicks()
-        }
-    }
 
     override fun init() {
         super.init()
-        playGlobalAudio(this.location, Sounds.DWARF_WHISTLE_2297)
-        sendChat(this, "'Ello der ${player.username.capitalize()}! *hic*")
+        phrases = arrayOf(
+            "'Ello der ${player.username}! *hic*",
+            "Oi, are you der ${player.username}!",
+            "Dunt ignore your matey!",
+            "Aww comeon, talk to ikle me ${player.username}!",
+            "I hates you, ${player.username}!"
+        )
     }
 
     override fun tick() {
-        if (RandomFunction.roll(20) && !attackPhrase)
-            sendPhrases()
+        sayLine(this, phrases, true, true)
         if (ticksLeft <= 10) {
             ticksLeft = 10
-            if (!attackPhrase)
-                sendChat("I hates you, ${player.username.capitalize()}!").also { attackPhrase = true }
-            if (attackDelay <= getWorldTicks())
+            if (attackDelay <= getWorldTicks()) {
                 this.attack(player)
+            }
         }
         super.tick()
     }
@@ -47,4 +39,10 @@ class DrunkenDwarfNPC(override var loot: WeightBasedTable? = null) : RandomEvent
         this.pulseManager.clear()
         openDialogue(player, DrunkenDwarfDialogue(), this.asNpc())
     }
+
+    override fun onTimeUp() {
+        if (attackDelay <= getWorldTicks()) {
+            this.attack(player)
+        }
+    }
 }

Server/src/main/content/global/ame/events/evilbob/EvilBobDialogue.kt

@@ -22,10 +22,8 @@ class EvilBobDialogue(val rewardDialogue: Boolean = false, val rewardXpSkill: In
                     } else if (getAttribute(player!!, EvilBobUtils.eventComplete, false)) {
                         sendDialogue(player!!, "Evil Bob appears to be sleeping, best not to wake him up.").also { stage = END_DIALOGUE }
                     } else if (removeItem(player!!, Items.RAW_FISHLIKE_THING_6200)) {
-                        setAttribute(player!!, EvilBobUtils.fishCaught, false)
                         playerl(FacialExpression.NEUTRAL, "Here, I've brought you some fish.").also { stage = 500 }
                     } else if (removeItem(player!!, Items.RAW_FISHLIKE_THING_6204)) {
-                        setAttribute(player!!, EvilBobUtils.fishCaught, false)
                         setAttribute(player!!, EvilBobUtils.attentive, true)
                         setAttribute(player!!, EvilBobUtils.attentiveNewSpot, true)
                         playerl(FacialExpression.NEUTRAL, "Here, I've brought you some fish.").also { stage = 600 }

Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt

@@ -1,5 +1,7 @@
 package content.global.ame.events.evilbob
 
+import content.global.ame.returnPlayer
+import core.ServerConstants
 import core.api.*
 import core.game.dialogue.FacialExpression
 import core.game.interaction.IntType
@@ -7,8 +9,6 @@ import core.game.interaction.InteractionListener
 import core.game.interaction.QueueStrength
 import core.game.node.entity.Entity
 import core.game.node.entity.player.link.emote.Emotes
-import core.game.node.entity.skill.Skills
-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
@@ -36,7 +36,8 @@ class EvilBobListeners : InteractionListener, MapArea {
                 sendNPCDialogue(player, NPCs.SERVANT_2481, "You'll need a fishing net. There are plenty scattered around the beach.", FacialExpression.SAD)
             } else if (freeSlots(player) == 0) {
                 sendDialogue(player, "You don't have enough space in your inventory.")
-            } else if (getAttribute(player, EvilBobUtils.fishCaught, false)) {
+            } else if (inInventory(player, Items.FISHLIKE_THING_6202) || inInventory(player, Items.FISHLIKE_THING_6206) ||
+                    inInventory(player, Items.RAW_FISHLIKE_THING_6200) || inInventory(player, Items.RAW_FISHLIKE_THING_6204)) {
                 sendNPCDialogue(player, NPCs.SERVANT_2481, "You've already got a fish. Come over here to uncook it, then serve it to Evil Bob.", FacialExpression.SAD)
             } else {
                 lock(player, 6)
@@ -67,7 +68,6 @@ class EvilBobListeners : InteractionListener, MapArea {
                     }
                     sendItemDialogue(player, Items.FISHLIKE_THING_6202, "You catch a... what is this?? Is this a fish?? And it's cooked already??")
                     resetAnimator(player)
-                    setAttribute(player, EvilBobUtils.fishCaught, true)
                 }
             }
             return@on true
@@ -119,8 +119,8 @@ class EvilBobListeners : InteractionListener, MapArea {
                             return@queueScript delayScript(player, 2)
                         }
                         3 -> {
-                            sendMessage(player, "Welcome back to 2009Scape.")
-                            teleport(player, getAttribute(player, EvilBobUtils.prevLocation, Location.create(3222, 3219, 0)))
+                            sendMessage(player, "Welcome back to ${ServerConstants.SERVER_NAME}.")
+                            returnPlayer(player)
                             EvilBobUtils.reward(player)
                             EvilBobUtils.cleanup(player)
                             resetAnimator(player)
@@ -138,11 +138,11 @@ class EvilBobListeners : InteractionListener, MapArea {
     }
 
     override fun getRestrictions(): Array<ZoneRestriction> {
-        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS)
+        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS, ZoneRestriction.OFF_MAP)
     }
 
     override fun areaEnter(entity: Entity) {
         entity.locks.lockTeleport(1000000)
     }
 
-}
+}

Server/src/main/content/global/ame/events/evilbob/EvilBobNPC.kt

@@ -1,40 +1,22 @@
 package content.global.ame.events.evilbob
 
 import content.global.ame.RandomEventNPC
+import content.global.ame.kidnapPlayer
 import core.api.*
 import core.api.utils.WeightBasedTable
-import core.game.interaction.QueueStrength
 import core.game.node.entity.npc.NPC
-import core.game.system.timer.impl.AntiMacro
+import core.game.world.map.Location
 import org.rs09.consts.NPCs
-import org.rs09.consts.Sounds
 
 class EvilBobNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.EVIL_BOB_2478) {
-
     override fun init() {
         super.init()
         sendChat("meow")
-        queueScript(player, 4, QueueStrength.SOFT) { stage: Int ->
-            when (stage) {
-                0 -> {
-                    lock(player, 6)
-                    sendChat(player, "No... what? Nooooooooooooo!")
-                    animate(player, EvilBobUtils.teleAnim)
-                    player.graphics(EvilBobUtils.telegfx)
-                    playAudio(player, Sounds.TELEPORT_ALL_200)
-                    EvilBobUtils.giveEventFishingSpot(player)
-                    return@queueScript delayScript(player, 3)
-                }
-                1 -> {
-                    sendMessage(player, "Welcome to Scape2009.")
-                    EvilBobUtils.teleport(player)
-                    resetAnimator(player)
-                    openDialogue(player, EvilBobDialogue(), NPCs.EVIL_BOB_2479)
-                    AntiMacro.terminateEventNpc(player)
-                    return@queueScript stopExecuting(player)
-                }
-                else -> return@queueScript stopExecuting(player)
-            }
+        face(player)
+        kidnapPlayer(this, player, Location(3419, 4776, 0), "No... what? Nooooooooooooo!") { player, _ ->
+            EvilBobUtils.giveEventFishingSpot(player)
+            sendMessage(player, "Welcome to Scape2009.")
+            openDialogue(player, EvilBobDialogue(), NPCs.EVIL_BOB_2479)
         }
     }
 

Server/src/main/content/global/ame/events/evilbob/EvilBobUtils.kt

@@ -3,7 +3,6 @@ package content.global.ame.events.evilbob
 import core.api.*
 import core.game.node.entity.player.Player
 import core.game.node.entity.skill.Skills
-import core.game.world.map.Location
 import core.game.world.map.zone.ZoneBorders
 import core.game.world.update.flag.context.Animation
 import core.game.world.update.flag.context.Graphics
@@ -13,10 +12,8 @@ import org.rs09.consts.NPCs
 import org.rs09.consts.Scenery
 
 object EvilBobUtils {
-    const val prevLocation = "/save:evilbob:prevlocation"
     const val eventComplete = "/save:evilbob:eventcomplete"
     const val assignedFishingZone = "/save:evilbob:fishingzone"
-    const val fishCaught = "evilbob:fishcaught"
     const val attentive = "/save:evilbob:attentive"
     const val servantHelpDialogueSeen = "/save:evilbob:servantdialogeseen"
     const val attentiveNewSpot = "/save:evilbob:attentivenewspot"
@@ -52,15 +49,8 @@ object EvilBobUtils {
         }
     }
 
-    fun teleport(player: Player) {
-        setAttribute(player, prevLocation, player.location)
-        player.properties.teleportLocation = Location.create(3419, 4776, 0)
-    }
-
     fun cleanup(player: Player) {
-        player.locks.unlockTeleport()
-        player.properties.teleportLocation = getAttribute(player, prevLocation, null)
-        removeAttributes(player, assignedFishingZone, eventComplete, prevLocation, attentive, servantHelpDialogueSeen, attentiveNewSpot, startingDialogueSeen)
+        removeAttributes(player, assignedFishingZone, eventComplete, attentive, servantHelpDialogueSeen, attentiveNewSpot, startingDialogueSeen)
         removeAll(player, Items.FISHLIKE_THING_6202)
         removeAll(player, Items.FISHLIKE_THING_6202, Container.BANK)
         removeAll(player, Items.FISHLIKE_THING_6206)

Server/src/main/content/global/ame/events/evilbob/ServantCutscene.kt

@@ -3,38 +3,47 @@ package content.global.ame.events.evilbob
 import core.api.*
 import core.game.activity.Cutscene
 import core.game.node.entity.player.Player
+import core.game.world.map.Direction
 
 class ServantCutsceneN(player: Player) : Cutscene(player) {
 
     override fun setup() {
         setExit(player.location.transform(0, 0, 0))
         loadRegion(13642)
+        addNPC(2479, 28, 41, Direction.SOUTH)      // Evil Bob
+        addNPC(2481, 31, 41, Direction.SOUTH_WEST) // Servant
     }
 
     override fun runStage(stage: Int) {
         when (stage) {
             0 -> {
-                fadeToBlack()
-                timedUpdate(4)
+                teleport(player, 30, 41)
+                moveCamera(30, 37, 400, 255)
+                rotateCamera(30, 50, 400, 255)
+                openInterface(player, 186)
+                timedUpdate(0)
             }
             1 -> {
-                teleport(player, 29, 41)
-                moveCamera(30, 43) // +7 from statue
-                openInterface(player, 186)
+                timedUpdate(0)
+            }
+            2 -> {  // Slow start
+                moveCamera(30, 49, 400, 2)
                 timedUpdate(2)
             }
-            2 -> {
+            3 -> {  // Fast middle
+                moveCamera(30, 44, 380, 4)
+                timedUpdate(6)
+            }
+            4 -> {  // Slow end
+                moveCamera(30, 45, 340, 2)
                 timedUpdate(2)
-                rotateCamera(30, 51, 300, 100) // the statue loc
-                fadeFromBlack()
             }
-            3 -> {
-                timedUpdate(9)
-                moveCamera(30, 46, 300, 2) // +4 from statue
+            5 -> {
+                timedUpdate(2)
             }
-            4 -> {
-                end{ player.locks.lockTeleport(1000000) }
+            6 -> {
                 closeInterface(player)
+                end(fade = false) { player.locks.lockTeleport(1000000) }
             }
         }
     }
@@ -45,32 +54,40 @@ class ServantCutsceneS(player: Player) : Cutscene(player) {
     override fun setup() {
         setExit(player.location.transform(0, 0, 0))
         loadRegion(13642)
+        addNPC(2479, 28, 41, Direction.SOUTH)      // Evil Bob
+        addNPC(2481, 31, 41, Direction.SOUTH_WEST) // Servant
     }
 
     override fun runStage(stage: Int) {
         when (stage) {
             0 -> {
-                fadeToBlack()
-                timedUpdate(4)
+                teleport(player, 30, 41)
+                moveCamera(31, 46, 365, 255)
+                rotateCamera(29, 30, 365, 255)
+                openInterface(player, 186)
+                timedUpdate(0)
             }
             1 -> {
-                teleport(player, 29, 41)
-                moveCamera(29, 38) // +7 from statue
-                openInterface(player, 186)
-                timedUpdate(2)
+                timedUpdate(0)
             }
             2 -> {
+                moveCamera(31, 43, 480, 2)
                 timedUpdate(2)
-                rotateCamera(29, 30, 300, 100) // the statue loc
-                fadeFromBlack()
             }
             3 -> {
-                timedUpdate(9)
-                moveCamera(29, 35, 300, 2) // +4 from statue
+                moveCamera(31, 37, 455, 4)
+                timedUpdate(8)
             }
             4 -> {
-                end{ player.locks.lockTeleport(1000000) }
+                moveCamera(31, 36, 395, 2)
+                timedUpdate(2)
+            }
+            5 -> {
+                timedUpdate(3)
+            }
+            6 -> {
                 closeInterface(player)
+                end(fade = false) { player.locks.lockTeleport(1000000) }
             }
         }
     }
@@ -81,32 +98,40 @@ class ServantCutsceneE(player: Player) : Cutscene(player) {
     override fun setup() {
         setExit(player.location.transform(0, 0, 0))
         loadRegion(13642)
+        addNPC(2479, 28, 41, Direction.SOUTH)      // Evil Bob
+        addNPC(2481, 31, 41, Direction.SOUTH_WEST) // Servant
     }
 
     override fun runStage(stage: Int) {
         when (stage) {
             0 -> {
-                fadeToBlack()
-                timedUpdate(4)
+                teleport(player, 30, 41)
+                moveCamera(25, 41, 440, 255)
+                rotateCamera(42, 41, 440, 255)
+                openInterface(player, 186)
+                timedUpdate(0)
             }
             1 -> {
-                teleport(player, 29, 41)
-                moveCamera(35, 41) // +7 from statue
-                openInterface(player, 186)
+                timedUpdate(0)
+            }
+            2 -> {  // Slow start
+                moveCamera(28, 41, 500, 3)
                 timedUpdate(2)
             }
-            2 -> {
+            3 -> {  // Fast middle
+                moveCamera(34, 41, 390, 5)
+                timedUpdate(6)
+            }
+            4 -> {  // Slow end
+                moveCamera(36, 41, 340, 2)
                 timedUpdate(2)
-                rotateCamera(43, 41, 300, 100) // the statue loc
-                fadeFromBlack()
             }
-            3 -> {
-                timedUpdate(9)
-                moveCamera(38, 41, 300, 2) // +4 from statue
+            5 -> {
+                timedUpdate(4)
             }
-            4 -> {
-                end{ player.locks.lockTeleport(1000000) }
+            6 -> {
                 closeInterface(player)
+                end(fade = false) { player.locks.lockTeleport(1000000) }
             }
         }
     }
@@ -117,34 +142,41 @@ class ServantCutsceneW(player: Player) : Cutscene(player) {
     override fun setup() {
         setExit(player.location.transform(0, 0, 0))
         loadRegion(13642)
+        addNPC(2479, 28, 41, Direction.SOUTH)      // Evil Bob
+        addNPC(2481, 31, 41, Direction.SOUTH_WEST) // Servant
     }
 
     override fun runStage(stage: Int) {
         when (stage) {
             0 -> {
-                fadeToBlack()
-                timedUpdate(4)
+                teleport(player, 30, 41)
+                moveCamera(34, 41, 325, 255)
+                rotateCamera(16, 40, 300, 255)
+                openInterface(player, 186)
+                timedUpdate(0)
             }
             1 -> {
-                teleport(player, 29, 41)
-                moveCamera(25, 40) // +7 from statue
-                openInterface(player, 186)
+                timedUpdate(0)
+            }
+            2 -> {  // Slow start
+                moveCamera(31, 41, 440, 3)
                 timedUpdate(2)
             }
-            2 -> {
+            3 -> {  // Fast middle
+                moveCamera(24, 41, 330, 5)
+                timedUpdate(7)
+            }
+            4 -> {  // Slow end
+                moveCamera(23, 41, 300, 2)
                 timedUpdate(2)
-                rotateCamera(18, 40, 300, 100) // the statue loc
-                fadeFromBlack()
             }
-            3 -> {
-                timedUpdate(9)
-                moveCamera(22, 40, 300, 2) // +4 from statue
+            5 -> {
+                timedUpdate(3)
             }
-            4 -> {
-                end{ player.locks.lockTeleport(1000000) }
+            6 -> {
                 closeInterface(player)
+                end(fade = false) { player.locks.lockTeleport(1000000) }
             }
-
         }
     }
 }

Server/src/main/content/global/ame/events/evilbob/ServantDialogue.kt

@@ -1,5 +1,6 @@
 package content.global.ame.events.evilbob
 
+import core.ServerConstants
 import core.api.getAttribute
 import core.api.setAttribute
 import core.game.dialogue.DialogueFile
@@ -34,7 +35,7 @@ class ServantDialogue : DialogueFile() {
                     }
                 }
                 2 -> npcl(FacialExpression.SAD, "Come? Come where?").also { stage++ }
-                3 -> playerl(FacialExpression.FRIENDLY, "Away from this place! To 2009Scape proper!").also { stage++ }
+                3 -> playerl(FacialExpression.FRIENDLY, "Away from this place! To ${ServerConstants.SERVER_NAME} proper!").also { stage++ }
                 4 -> npcl(FacialExpression.SAD, "You go, ${player!!.username}, I don't belong there... I belong here, in Scape2009. This is the only place I can ever go...").also { stage++ }
                 5 -> options("But I love you!", "Oh alright then.").also { stage++ }
                 6 -> when(buttonID) {
@@ -54,4 +55,4 @@ class ServantDialogue : DialogueFile() {
                 }
             }
     }
-}
+}

Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt

@@ -9,9 +9,8 @@ import core.tools.RandomFunction
 import org.rs09.consts.Items
 import content.global.ame.RandomEventNPC
 import core.api.utils.WeightBasedTable
-import java.lang.Integer.max
 
-val ids = 2463..2468
+val ids = (2463..2468).toList()
 
 class EvilChickenNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(2463) {
     val phrases = arrayOf("Bwuk","Bwuk bwuk bwuk","Flee from me, @name!","Begone, @name!","Bwaaaauuuk bwuk bwuk","MUAHAHAHAHAAA!")
@@ -19,8 +18,7 @@ class EvilChickenNPC(override var loot: WeightBasedTable? = null) : RandomEventN
 
     override fun init() {
         super.init()
-        val index = max(0, (player.properties.combatLevel / 20) - 1)
-        val id = ids.toList()[index]
+        val id = idForCombatLevel(ids, player)
         this.transform(id)
         this.attack(player)
         sendChat(phrases.random().replace("@name",player.username.capitalize()))

Server/src/main/content/global/ame/events/freakyforester/FreakListeners.kt

@@ -57,10 +57,10 @@ class FreakListeners : InteractionListener, MapArea {
     }
 
     override fun getRestrictions(): Array<ZoneRestriction> {
-        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS)
+        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS, ZoneRestriction.OFF_MAP)
     }
 
     override fun areaEnter(entity: Entity) {
         entity.locks.lockTeleport(1000000)
     }
-}
+}

Server/src/main/content/global/ame/events/freakyforester/FreakUtils.kt

@@ -1,16 +1,15 @@
 package content.global.ame.events.freakyforester
 
+import content.global.ame.returnPlayer
 import core.api.*
 import org.rs09.consts.Items
 import org.rs09.consts.NPCs
 import core.game.node.entity.player.Player
-import core.game.world.map.Location
 import core.game.world.map.zone.ZoneBorders
 import core.tools.RandomFunction
 
 object FreakUtils{
     const val freakNpc = NPCs.FREAKY_FORESTER_2458
-    const val freakPreviousLoc = "/save:freakyf:location"
     const val freakTask = "/save:freakyf:task"
     const val freakComplete = "/save:freakyf:complete"
     const val pheasantKilled = "freakyf:killed"
@@ -26,15 +25,9 @@ object FreakUtils{
         player.dialogueInterpreter.open(FreakyForesterDialogue(), freakNpc)
     }
 
-    fun teleport(player: Player) {
-        setAttribute(player, freakPreviousLoc, player.location)
-        teleport(player, Location.create(2599, 4777 ,0))
-    }
-
     fun cleanup(player: Player) {
-        player.locks.unlockTeleport()
-        player.properties.teleportLocation = getAttribute(player,freakPreviousLoc,null)
-        removeAttributes(player, freakPreviousLoc, freakTask, freakComplete, pheasantKilled)
+        returnPlayer(player)
+        removeAttributes(player, freakTask, freakComplete, pheasantKilled)
         removeAll(player, Items.RAW_PHEASANT_6178)
         removeAll(player, Items.RAW_PHEASANT_6178, Container.BANK)
         removeAll(player, Items.RAW_PHEASANT_6179)

Server/src/main/content/global/ame/events/freakyforester/FreakyForesterNPC.kt

@@ -1,39 +1,21 @@
 package content.global.ame.events.freakyforester
 
 import content.global.ame.RandomEventNPC
+import content.global.ame.kidnapPlayer
 import core.api.*
 import org.rs09.consts.NPCs
 import core.api.utils.WeightBasedTable
-import core.game.interaction.QueueStrength
 import core.game.node.entity.npc.NPC
-import core.game.system.timer.impl.AntiMacro
-import core.game.world.update.flag.context.Graphics
-import org.rs09.consts.Sounds
+import core.game.world.map.Location
 
 class FreakyForesterNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.FREAKY_FORESTER_2458) {
-
     override fun init() {
         super.init()
         sendChat("Ah, ${player.username}, just the person I need!")
-        queueScript(player, 4, QueueStrength.SOFT) { stage: Int ->
-            when (stage) {
-                0 -> {
-                    lock(player, 6)
-                    sendGraphics(Graphics(308, 100, 50), player.location)
-                    animate(player,714)
-                    playAudio(player, Sounds.TELEPORT_ALL_200)
-                    return@queueScript delayScript(player, 3)
-                }
-                1 -> {
-                    FreakUtils.teleport(player)
-                    FreakUtils.giveFreakTask(player)
-                    AntiMacro.terminateEventNpc(player)
-                    openDialogue(player, FreakyForesterDialogue(), FreakUtils.freakNpc)
-                    resetAnimator(player)
-                    return@queueScript stopExecuting(player)
-                }
-                else -> return@queueScript stopExecuting(player)
-            }
+        face(player)
+        kidnapPlayer(this, player, Location(2599, 4777, 0)) { player, _ ->
+            FreakUtils.giveFreakTask(player)
+            openDialogue(player, FreakyForesterDialogue(), FreakUtils.freakNpc)
         }
     }
 

Server/src/main/content/global/ame/events/genie/GenieNPC.kt

@@ -4,27 +4,40 @@ import core.game.node.entity.npc.NPC
 import core.tools.RandomFunction
 import org.rs09.consts.NPCs
 import content.global.ame.RandomEventNPC
+import core.api.lock
 import core.api.playAudio
 import core.api.utils.WeightBasedTable
 import org.rs09.consts.Sounds
 
 class GenieNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.GENIE_409) {
-    val phrases = arrayOf("Greetings, @name!","Ehem... Master @name?","Are you there, Master @name?","No one ignores me!")
+    lateinit var phrases: Array<String>
 
     override fun tick() {
-        if(RandomFunction.random(1,15) == 5){
-            sendChat(phrases.random().replace("@name",player.username.capitalize()))
+        sayLine(this, phrases, true, true)
+        if (ticksLeft == 2) {
+            lock(player, 2)
         }
         super.tick()
     }
 
     override fun init() {
         super.init()
+        val honorific = if (player.isMale) "Master" else "Mistress"
+        phrases = arrayOf(
+            "Greetings, ${player.username}!",
+            "Ehem... $honorific ${player.username}?",
+            "Are you there, $honorific ${player.username}?",
+            "No one ignores me!"
+        )
         playAudio(player, Sounds.GENIE_APPEAR_2301)
-        sendChat(phrases.random().replace("@name",player.username.capitalize()))
     }
 
     override fun talkTo(npc: NPC) {
         player.dialogueInterpreter.open(GenieDialogue(),npc)
     }
+
+    override fun onTimeUp() {
+        noteAndTeleport()
+        terminate()
+    }
 }

Server/src/main/content/global/ame/events/maze/MazeInterface.kt

@@ -0,0 +1,305 @@
+package content.global.ame.events.maze
+
+import content.global.ame.returnPlayer
+import core.api.*
+import core.api.utils.WeightBasedTable
+import core.api.utils.WeightedItem
+import core.game.event.EventHook
+import core.game.event.TickEvent
+import core.game.global.action.DoorActionHandler
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.interaction.QueueStrength
+import core.game.node.entity.Entity
+import core.game.node.entity.player.Player
+import core.game.system.task.Pulse
+import core.game.world.GameWorld.Pulser
+import core.game.world.map.Location
+import core.game.world.map.zone.ZoneBorders
+import core.game.world.map.zone.ZoneRestriction
+import core.game.world.update.flag.context.Graphics
+import org.rs09.consts.*
+
+class MazeInterface : InteractionListener, EventHook<TickEvent>, MapArea {
+    companion object {
+        const val MAZE_TIMER_INTERFACE = Components.MAZETIMER_209
+        const val MAZE_TIMER_VARP = 531 // Interface 209 child 2 config: [531, 0]
+        const val MAZE_ATTRIBUTE_TICKS_LEFT = "maze:percent-ticks-left"
+        const val MAZE_ATTRIBUTE_CHESTS_OPEN = "/save:maze:chests-opened"
+
+        val STARTING_POINTS = arrayOf(
+                Location(2928, 4553, 0),
+                Location(2917, 4553, 0),
+                Location(2908, 4555, 0),
+                Location(2891, 4589, 0),
+                Location(2891, 4595, 0),
+                Location(2891, 4595, 0),
+                Location(2926, 4597, 0),
+                Location(2931, 4597, 0),
+                // There's 2 more, but there isn't a door for them...
+        )
+
+        val REWARD_ITEM = intArrayOf(
+                Items.COINS_995,
+                Items.FEATHER_314,
+                Items.IRON_ARROW_884,
+                Items.CHAOS_RUNE_562,
+                Items.STEEL_ARROW_886,
+                Items.DEATH_RUNE_560,
+                Items.COAL_454,
+                Items.NATURE_RUNE_561,
+                Items.MITHRIL_ORE_448
+        )
+
+        val ITEM_DIVISOR = arrayOf(
+                1.0,
+                2.0,
+                3.0,
+                9.0,
+                12.0,
+                18.0,
+                45.0,
+                162.0,
+                180.0,
+        )
+
+        val CHEST_REWARDS = WeightBasedTable.create(
+                WeightedItem(Items.AIR_RUNE_556,15,15,1.0),
+                WeightedItem(Items.WATER_RUNE_555,10,10,1.0),
+                WeightedItem(Items.EARTH_RUNE_557,10,10,1.0),
+                WeightedItem(Items.FIRE_RUNE_554,10,10,1.0),
+                WeightedItem(Items.BRONZE_ARROW_882,20,20,1.0),
+                WeightedItem(Items.BRONZE_BOLTS_877,10,10,1.0),
+                WeightedItem(Items.IRON_ARROW_884,15,15,1.0),
+                WeightedItem(Items.ATTACK_POTION2_123,1,1,1.0),
+                WeightedItem(Items.STRENGTH_POTION2_117,1,1,1.0),
+                WeightedItem(Items.DEFENCE_POTION2_135,1,1,1.0),
+        )
+
+        private val ONE_WAY_WALL = mapOf(
+            Location.create(2904, 4573, 0) to setOf( // Diagonal entries
+                Location.create(2904, 4573, 0),
+                Location.create(2904, 4572, 0),
+                Location.create(2904, 4574, 0),
+            ),
+            Location.create(2906, 4586, 0) to setOf(  // Diagonal entries
+                Location.create(2906, 4586, 0),
+                Location.create(2907, 4586, 0),
+            ),
+            Location.create(2902, 4575, 0) to setOf(Location.create(2903, 4575, 0)),
+            Location.create(2924, 4583, 0) to setOf(Location.create(2923, 4583, 0)),
+        )
+
+        fun initMaze(player: Player) {
+            setAttribute(player, MAZE_ATTRIBUTE_TICKS_LEFT, 300)
+            setVarp(player, MAZE_TIMER_VARP, (getAttribute<Int>(player, MAZE_ATTRIBUTE_TICKS_LEFT, 0) / 3),false)
+            openOverlay(player, MAZE_TIMER_INTERFACE)
+            sendMessage(player, "You need to reach the maze center, then you'll be returned to where you were.")
+            sendNPCDialogue(player, NPCs.MYSTERIOUS_OLD_MAN_410, "You need to reach the maze center, then you'll be returned to where you were.")
+        }
+
+        fun calculateLoot(player: Player) {
+            val randomNumber = (0..8).random()
+            val totalLevel = player.getSkills().totalLevel.toDouble()
+            val rewardPotential = getAttribute(player, MAZE_ATTRIBUTE_TICKS_LEFT, 0).toDouble() / 300.0
+            val itemDivisor = ITEM_DIVISOR[randomNumber]
+            val itemQuantity = (totalLevel * rewardPotential * 3.33) / itemDivisor
+            // sendMessage(player, "Maze reward calculation: $totalLevel * $rewardPotential * 3.33 / $itemDivisor = $itemQuantity")
+            if (itemQuantity.toInt() > 0) {
+                addItemOrDrop(player, REWARD_ITEM[randomNumber], itemQuantity.toInt())
+            }
+        }
+
+        /**
+         * Chest Location to rotation mapping.
+         * This is needed as it is impossible to obtain the underlying chest scenery for the rotation.
+         * 0: Facing North, 1: Facing East, 2: Facing South, 3: Facing West
+         */
+        val chestLocationRotationMap = mapOf(
+                Location(2930, 4595, 0).toString() to 2,
+                Location(2924, 4572, 0).toString() to 2,
+                Location(2925, 4573, 0).toString() to 0,
+                Location(2900, 4578, 0).toString() to 2,
+                Location(2901, 4560, 0).toString() to 1,
+                Location(2890, 4599, 0).toString() to 2,
+                Location(2896, 4591, 0).toString() to 2,
+                Location(2895, 4592, 0).toString() to 1,
+                Location(2901, 4560, 0).toString() to 3,
+                Location(2918, 4590, 0).toString() to 1,
+                Location(2917, 4590, 0).toString() to 3,
+        )
+
+        /**
+         * Chest Interaction workaround
+         *
+         * The issue here is that the walls(3626) of the Maze are overlapping some(not all) chest sceneries.
+         *
+         * The types for the wallScenery:
+         * Type 0 - flat panel |
+         * Type 2 - right angle panel with rotation 0:r 1:7 2:> 3:L
+         * Type 3 - corner post . for angle edges of walls
+         */
+        fun overrideScenery(wallScenery: core.game.node.scenery.Scenery, chestSceneryId: Int): core.game.node.scenery.Scenery {
+            if (wallScenery.id == chestSceneryId) {
+                replaceScenery(wallScenery, Scenery.CHEST_3636, 30)
+                wallScenery.isActive = true
+                return wallScenery // Return the chest scenery as the wallScenery isn't there.
+            }
+
+            addScenery(Scenery.CHEST_3636, wallScenery.location, chestLocationRotationMap[wallScenery.location.toString()] ?: 0, 10)
+            addScenery(wallScenery)
+            // replaceScenery(newChestScenery, Scenery.CHEST_3636, 3) // didn't work for an underlying scenery
+            // I did a world pulse since everyone will get to see the chest open.
+            Pulser.submit(object : Pulse(30) {
+                override fun pulse(): Boolean {
+                    addScenery(Scenery.CHEST_3635, wallScenery.location, chestLocationRotationMap[wallScenery.location.toString()] ?: 0, 10)
+                    addScenery(wallScenery)
+                    return true
+                }
+            })
+            // Return the chest scenery to replace PacketProcessor so that MISMATCH will not happen.
+            return core.game.node.scenery.Scenery(
+                    chestSceneryId,
+                    wallScenery.location,
+                    chestLocationRotationMap[wallScenery.location.toString()] ?: 0
+            )
+        }
+    }
+
+    override fun defineListeners() {
+
+        // This somehow doesn't trigger as the scenery.id != objId (3626 != 3635)
+        on(Scenery.CHEST_3635, IntType.SCENERY, "open") { player, node ->
+            if (getAttribute(player, MAZE_ATTRIBUTE_TICKS_LEFT, 0) > 0 && getAttribute(player, MAZE_ATTRIBUTE_CHESTS_OPEN, 0) < 10) {
+                animate(player, 536)
+    //          val actualScenery = RegionManager.getObject(node.location.z, node.location.x, node.location.y, 3626)
+                val tableRoll = CHEST_REWARDS.roll()
+                addItemOrBank(player, tableRoll[0].id, tableRoll[0].amount)
+                when (tableRoll[0].id){
+                    Items.AIR_RUNE_556 -> sendItemDialogue(player, Items.AIR_RUNE_556, "You've found some air runes!")
+                    Items.WATER_RUNE_555 -> sendItemDialogue(player, Items.WATER_RUNE_555, "You've found some water runes!")
+                    Items.EARTH_RUNE_557 -> sendItemDialogue(player, Items.EARTH_RUNE_557, "You've found some earth runes!")
+                    Items.FIRE_RUNE_554 -> sendItemDialogue(player, Items.FIRE_RUNE_554, "You've found some fire runes!")
+                    Items.BRONZE_ARROW_882 -> sendItemDialogue(player, Items.BRONZE_ARROW_882, "You've found some bronze arrows!")
+                    Items.BRONZE_BOLTS_877 -> sendItemDialogue(player, Items.BRONZE_BOLTS_877, "You've found some bronze bolts!")
+                    Items.IRON_ARROW_884 -> sendItemDialogue(player, Items.IRON_ARROW_884, "You've found some iron arrows!")
+                    Items.ATTACK_POTION2_123 -> sendItemDialogue(player, Items.ATTACK_POTION2_123, "You've found an attack potion!")
+                    Items.STRENGTH_POTION2_117 -> sendItemDialogue(player, Items.STRENGTH_POTION2_117, "You've found a strength potion!")
+                    Items.DEFENCE_POTION2_135 -> sendItemDialogue(player, Items.DEFENCE_POTION2_135, "You've found a defence potion!")
+                }
+                setAttribute(player, MAZE_ATTRIBUTE_CHESTS_OPEN, getAttribute(player, MAZE_ATTRIBUTE_CHESTS_OPEN, 0))
+            } else {
+                sendMessage(player,"You find nothing of interest.")
+            }
+            return@on true
+        }
+
+        on(Scenery.CHEST_3636, SCENERY, "search") { player, node ->
+            sendMessage(player,"You find nothing of interest.")
+            return@on true
+        }
+
+        on(Scenery.WALL_3626, IntType.SCENERY, "open") { player, node ->
+            sendMessage(player, "That bit doesn't open.") // 0xBrLo9woIY
+            return@on true
+        }
+
+        on(
+            intArrayOf(
+                Scenery.WALL_3628,
+                Scenery.WALL_3629,
+                Scenery.WALL_3630,
+                Scenery.WALL_3631,
+                Scenery.WALL_3632,
+            ),
+            IntType.SCENERY,
+            "open"
+        ) { player, node ->
+            val scenery = node as core.game.node.scenery.Scenery
+
+            if (ONE_WAY_WALL[scenery.location]?.contains(player.location) == true) {
+                sendDialogue(player, "I don't think that's the right way.")
+            } else {
+                DoorActionHandler.handleAutowalkDoor(player, scenery)
+            }
+
+            return@on true
+        }
+
+        on(Scenery.STRANGE_SHRINE_3634, IntType.SCENERY, "touch") { player, node ->
+            player.unhook(this)
+            lock(player, 12)
+            closeOverlay(player)
+            queueScript(player, 0, QueueStrength.SOFT) { stage: Int ->
+                when (stage) {
+                    0 -> {
+                        sendGraphics(Graphics(86, 0, 3), player.location)
+                        animate(player,862)
+                        return@queueScript delayScript(player, 6)
+                    }
+                    1 -> {
+                        sendGraphics(Graphics(1576, 0, 0), player.location)
+                        animate(player,8939)
+                        playAudio(player, Sounds.TELEPORT_ALL_200)
+                        return@queueScript delayScript(player, 3)
+                    }
+                    2 -> {
+                        returnPlayer(player)
+                        sendGraphics(Graphics(1577, 0, 0), player.location)
+                        animate(player,8941)
+                        closeOverlay(player)
+                        return@queueScript delayScript(player, 1)
+                    }
+                    3 -> {
+                        calculateLoot(player)
+                        removeAttribute(player, MAZE_ATTRIBUTE_TICKS_LEFT)
+                        removeAttribute(player, MAZE_ATTRIBUTE_CHESTS_OPEN)
+                        return@queueScript stopExecuting(player)
+                    }
+                    else -> return@queueScript stopExecuting(player)
+                }
+            }
+
+            return@on true
+        }
+    }
+
+    override fun process(entity: Entity, event: TickEvent) {
+        if (entity is Player) {
+            if (getAttribute(entity, MAZE_ATTRIBUTE_TICKS_LEFT, 0) > 0) {
+                setAttribute(entity, MAZE_ATTRIBUTE_TICKS_LEFT, getAttribute(entity, MAZE_ATTRIBUTE_TICKS_LEFT, 0) - 1)
+            }
+            setVarp(entity, MAZE_TIMER_VARP, (getAttribute(entity, MAZE_ATTRIBUTE_TICKS_LEFT, 0) / 3), false)
+        }
+    }
+
+    override fun defineAreaBorders(): Array<ZoneBorders> {
+        return arrayOf(getRegionBorders(11591))
+    }
+
+    override fun getRestrictions(): Array<ZoneRestriction> {
+        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS, ZoneRestriction.TELEPORT, ZoneRestriction.OFF_MAP)
+    }
+
+    override fun areaEnter(entity: Entity) {
+        if (entity is Player) {
+            sendMessage(entity, "Head for the center of the maze.")
+            entity.interfaceManager.removeTabs(0, 1, 2, 3, 4, 5, 6, 12)
+            openOverlay(entity, MAZE_TIMER_INTERFACE)
+        }
+    }
+
+    override fun areaLeave(entity: Entity, logout: Boolean) {
+        if (entity is Player) {
+            entity.interfaceManager.restoreTabs()
+            closeOverlay(entity)
+            entity.unhook(this)
+        }
+    }
+    override fun entityStep(entity: Entity, location: Location, lastLocation: Location) {
+        if (entity is Player) {
+            entity.hook(Event.Tick, this)
+        }
+    }
+
+}

Server/src/main/content/global/ame/events/maze/MazeNPC.kt

@@ -0,0 +1,32 @@
+package content.global.ame.events.maze
+
+import content.global.ame.RandomEventNPC
+import content.global.ame.kidnapPlayer
+import core.api.*
+import core.api.utils.WeightBasedTable
+import core.game.node.entity.npc.NPC
+import org.rs09.consts.NPCs
+
+class MazeNPC(var type: String = "", override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.MYSTERIOUS_OLD_MAN_410) {
+    override fun init() {
+        super.init()
+        sendChat("Aha, you'll do ${player.username}!")
+        face(player)
+        // Note: This event is NOT instanced:
+        // Sources:
+        // https://youtu.be/2gpzn9oNdy0 (2007)
+        // https://youtu.be/Tni1HURgnxg (2008)
+        // https://youtu.be/igdwDZOv9LU (2008)
+        // https://youtu.be/0oBCkLArUmc (2011 - even with personal Mysterious Old Man) - "Sorry, this is not the old man you are looking for."
+        // https://youtu.be/FMuKZm-Ikgs (2011)
+        // val region = DynamicRegion.create(11591)
+        kidnapPlayer(this, player, MazeInterface.STARTING_POINTS.random()) { player, _ ->
+            MazeInterface.initMaze(player)
+            removeAttribute(player, MazeInterface.MAZE_ATTRIBUTE_CHESTS_OPEN)
+        }
+    }
+
+    override fun talkTo(npc: NPC) {
+        sendMessage(player, "He isn't interested in talking to you.")
+    }
+}

Server/src/main/content/global/ame/events/pillory/PilloryInterface.kt

@@ -0,0 +1,219 @@
+package content.global.ame.events.pillory
+
+import content.global.ame.RandomEvents
+import content.global.ame.returnPlayer
+import core.api.*
+import core.game.dialogue.FacialExpression
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.player.Player
+import core.game.interaction.InterfaceListener
+import core.game.interaction.QueueStrength
+import core.game.node.entity.Entity
+import core.game.world.map.Location
+import core.game.world.map.zone.ZoneBorders
+import core.game.world.map.zone.ZoneRestriction
+import core.game.world.update.flag.context.Graphics
+import org.rs09.consts.NPCs
+import org.rs09.consts.Scenery
+import org.rs09.consts.Sounds
+
+/**
+ * Pillory Unlocking Interface PILLORY_189
+ *
+ * https://www.youtube.com/watch?v=caWn7pE2mkE
+ * https://www.youtube.com/watch?v=TMVR5cZZwZ0
+ * https://www.youtube.com/watch?v=Ym9LCDP-Q74
+ * https://www.youtube.com/watch?v=_vn0QZTtI6U (Failure)
+ * https://www.youtube.com/watch?v=zmXDikQIua4
+ *
+ * Child IDs
+ *  4 - Rotating Lock Model
+ *  5 6 7 - Swinging Keys Models
+ *  8 9 10 - Buttons for the Swinging Keys Models
+ *  11 12 13 14 15 16 - Padlocks at the Top
+ *  17 18 19 20 21 22 - Padlocks stars? Model 15272, Anim 4135
+ *
+ * Model IDs
+ *  Using the amazeballs ::listifmodels
+ *  9749, 9750, 9751, 9752 - Swinging Keys Models
+ *  9753, 9754, 9755, 9756 - Rotating Lock Models
+ *  9757 9758 locked unlock
+ */
+class PilloryInterface : InterfaceListener, InteractionListener, MapArea {
+    companion object {
+        const val PILLORY_LOCK_INTERFACE = 189
+        const val PILLORY_ATTRIBUTE_EVENT_KEYS = "pillory:event-keys"
+        const val PILLORY_ATTRIBUTE_EVENT_LOCK = "pillory:event-lock"
+        const val PILLORY_ATTRIBUTE_NEEDED_TO_GET_CORRECT = "/save:pillory:target-correct"
+        const val PILLORY_ATTRIBUTE_CORRECT_COUNTER = "/save:pillory:num-correct"
+
+        val LOCATIONS = arrayOf(
+                // Varrock Cages
+                Location(3226, 3407, 0),
+                Location(3228, 3407, 0),
+                Location(3230, 3407, 0),
+                // Seers Village Cages
+                Location(2681, 3489, 0),
+                Location(2683, 3489, 0),
+                Location(2685, 3489, 0),
+                // Yannile Cages
+                Location(2604, 3105, 0),
+                Location(2606, 3105, 0),
+                Location(2608, 3105, 0),
+        )
+
+        fun initPillory(player: Player) {
+            setAttribute(player, PILLORY_ATTRIBUTE_NEEDED_TO_GET_CORRECT, 3)
+            setAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, 0)
+            player.dialogueInterpreter.sendPlainMessage(true, "", "Solve the pillory puzzle to be returned to where you came from.")
+        }
+
+        fun randomPillory(player: Player) {
+            // Shuffle all 4 kinds of keys in, pick 3 for the keys, pick 1 from the 3 as the lock.
+            val keys = (0..3).toIntArray().let{ keys -> keys.shuffle(); return@let keys }
+            val lock = intArrayOf(keys[1], keys[2], keys[3]).random() // Last 3 as there are 4 keys. key[0] is fallback.
+
+            setAttribute(player, PILLORY_ATTRIBUTE_EVENT_KEYS, keys)
+            setAttribute(player, PILLORY_ATTRIBUTE_EVENT_LOCK, lock)
+
+            player.packetDispatch.sendModelOnInterface(9753 + lock, PILLORY_LOCK_INTERFACE, 4, 0)
+            player.packetDispatch.sendModelOnInterface(9749 + keys[1], PILLORY_LOCK_INTERFACE, 5, 0)
+            player.packetDispatch.sendModelOnInterface(9749 + keys[2], PILLORY_LOCK_INTERFACE, 6, 0)
+            player.packetDispatch.sendModelOnInterface(9749 + keys[3], PILLORY_LOCK_INTERFACE, 7, 0)
+
+            val numberToGetCorrect = getAttribute(player, PILLORY_ATTRIBUTE_NEEDED_TO_GET_CORRECT, 3)
+            val correctCount = getAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, 0)
+            for (i in 1.. 6) {
+                // Set if lock is red or green.
+                if (i <= correctCount) {
+                    player.packetDispatch.sendModelOnInterface(9758, PILLORY_LOCK_INTERFACE, 10 + i, 0)
+                } else {
+                    player.packetDispatch.sendModelOnInterface(9757, PILLORY_LOCK_INTERFACE, 10 + i, 0)
+                }
+                // Set if hide or show lock.
+                player.packetDispatch.sendInterfaceConfig(PILLORY_LOCK_INTERFACE, 10 + i, i > numberToGetCorrect)
+            }
+        }
+
+        fun selectedKey(player: Player, buttonID: Int) {
+            val keys = getAttribute(player, PILLORY_ATTRIBUTE_EVENT_KEYS, intArrayOf(0, 0, 0))
+            val lock = getAttribute(player, PILLORY_ATTRIBUTE_EVENT_LOCK, -1)
+            if (keys[buttonID] == lock) {
+                // CORRECT ANSWER
+                setAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, getAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, 0) + 1)
+                if (getAttribute(player, PILLORY_ATTRIBUTE_NEEDED_TO_GET_CORRECT, 3) <= getAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, -1)) {
+                    player.dialogueInterpreter.sendPlainMessage(true, "", "You've escaped!")
+                    sendMessage(player, "You've escaped!")
+                    removeAttribute(player, PILLORY_ATTRIBUTE_NEEDED_TO_GET_CORRECT)
+                    removeAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER)
+                    closeInterface(player)
+                    queueScript(player, 0, QueueStrength.SOFT) { stage: Int ->
+                        when (stage) {
+                            0 -> {
+                                lock(player, 6)
+                                sendGraphics(Graphics(1576, 0, 0), player.location)
+                                animate(player,8939)
+                                playAudio(player, Sounds.TELEPORT_ALL_200)
+                                return@queueScript delayScript(player, 3)
+                            }
+                            1 -> {
+                                val loot = RandomEvents.CERTER.loot!!.roll(player)[0]
+                                addItemOrDrop(player, loot.id, loot.amount)
+                                returnPlayer(player)
+                                sendGraphics(Graphics(1577, 0, 0), player.location)
+                                animate(player,8941)
+                                closeInterface(player)
+                                return@queueScript stopExecuting(player)
+                            }
+                            else -> return@queueScript stopExecuting(player)
+                        }
+                    }
+                    return
+                }
+                randomPillory(player)
+                player.dialogueInterpreter.sendPlainMessage(
+                        true,
+                        "",
+                        "Correct!",
+                        "" + getAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, 0) + " down, " +
+                                (getAttribute(player, PILLORY_ATTRIBUTE_NEEDED_TO_GET_CORRECT, 3) - getAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, 0)) + " to go!")
+                // Animation for the star, but it doesn't work.
+                player.packetDispatch.sendInterfaceConfig(PILLORY_LOCK_INTERFACE, 16 + getAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, 1), false)
+                sendAnimationOnInterface(player, 4135, PILLORY_LOCK_INTERFACE, 16 + getAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, 1))
+            } else {
+                // WRONG ANSWER
+                player.dialogueInterpreter.close()
+                player.dialogueInterpreter.sendDialogues(NPCs.TRAMP_2794 , FacialExpression.OLD_ANGRY1, "Bah, that's not right.","Use the key that matches the hole", "in the spinning lock.")
+                if (getAttribute(player, PILLORY_ATTRIBUTE_NEEDED_TO_GET_CORRECT, 0) < 6) {
+                    setAttribute(player, PILLORY_ATTRIBUTE_NEEDED_TO_GET_CORRECT, getAttribute(player, PILLORY_ATTRIBUTE_NEEDED_TO_GET_CORRECT, 0) + 1)
+                }
+                setAttribute(player, PILLORY_ATTRIBUTE_CORRECT_COUNTER, 0)
+                closeInterface(player)
+            }
+        }
+    }
+
+    override fun defineInterfaceListeners() {
+        on(PILLORY_LOCK_INTERFACE){ player, component, opcode, buttonID, slot, itemID ->
+            when (buttonID) {
+                8 -> selectedKey(player, 1)
+                9 -> selectedKey(player, 2)
+                10 -> selectedKey(player, 3)
+            }
+            return@on true
+        }
+
+        onOpen(PILLORY_LOCK_INTERFACE){ player, component ->
+            return@onOpen true
+        }
+    }
+
+    override fun defineListeners() {
+        on(Scenery.CAGE_6836, IntType.SCENERY, "unlock") { player, node ->
+            if (player.location in LOCATIONS) { // When you aren't inside.
+                randomPillory(player)
+                openInterface(player, PILLORY_LOCK_INTERFACE)
+                player.dialogueInterpreter.sendPlainMessage(true, "", "Pick the <col=8A0808>swinging key</col> that matches the", "hole in the <col=8A0808>spinning lock</col>.")
+            } else {
+                sendMessage(player, "You can't unlock the pillory, you'll let all the prisoners out!")
+            }
+            return@on true
+        }
+    }
+
+    override fun defineAreaBorders(): Array<ZoneBorders> {
+        return arrayOf(
+                // Varrock Cages
+                ZoneBorders(3226, 3407, 3226, 3407),
+                ZoneBorders(3228, 3407, 3228, 3407),
+                ZoneBorders(3230, 3407, 3230, 3407),
+                // Seers Village Cages
+                ZoneBorders(2681, 3489, 2681, 3489),
+                ZoneBorders(2683, 3489, 2683, 3489),
+                ZoneBorders(2685, 3489, 2685, 3489),
+                // Yannile Cages
+                ZoneBorders(2604, 3105, 2604, 3105),
+                ZoneBorders(2606, 3105, 2606, 3105),
+                ZoneBorders(2608, 3105, 2608, 3105),
+        )
+    }
+
+    override fun getRestrictions(): Array<ZoneRestriction> {
+        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS, ZoneRestriction.TELEPORT, ZoneRestriction.OFF_MAP)
+    }
+
+    override fun areaEnter(entity: Entity) {
+        if (entity is Player) {
+            entity.interfaceManager.removeTabs(0, 1, 2, 3, 4, 5, 6, 12)
+        }
+    }
+
+    override fun areaLeave(entity: Entity, logout: Boolean) {
+        if (entity is Player) {
+            entity.interfaceManager.restoreTabs()
+        }
+    }
+
+
+}

Server/src/main/content/global/ame/events/pillory/PilloryNPC.kt

@@ -0,0 +1,25 @@
+package content.global.ame.events.pillory
+
+import content.global.ame.RandomEventNPC
+import content.global.ame.kidnapPlayer
+import core.api.*
+import core.api.utils.WeightBasedTable
+import core.game.component.Component.setUnclosable
+import core.game.node.entity.npc.NPC
+import org.rs09.consts.NPCs
+
+class PilloryNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.PILLORY_GUARD_2791) {
+    override fun init() {
+        super.init()
+        sendChat("${player.username}, you're under arrest!")
+        face(player)
+        kidnapPlayer(this, player, PilloryInterface.LOCATIONS.random()) { player, _ ->
+            PilloryInterface.initPillory(player)
+            setUnclosable(player, player.dialogueInterpreter.sendPlainMessage(true, "", "Solve the pillory puzzle to be returned to where you came from."))
+        }
+    }
+
+    override fun talkTo(npc: NPC) {
+        sendMessage(player, "He isn't interested in talking to you.")
+    }
+}

Server/src/main/content/global/ame/events/quizmaster/QuizMasterBorders.kt

@@ -0,0 +1,37 @@
+package content.global.ame.events.quizmaster
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.world.map.Location
+import core.game.world.map.zone.ZoneBorders
+import core.game.world.map.zone.ZoneRestriction
+import org.rs09.consts.NPCs
+
+class QuizMasterBorders : MapArea {
+    override fun defineAreaBorders(): Array<ZoneBorders> {
+        return arrayOf(getRegionBorders(7754))
+    }
+
+    override fun getRestrictions(): Array<ZoneRestriction> {
+        return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS, ZoneRestriction.TELEPORT, ZoneRestriction.OFF_MAP)
+    }
+
+    override fun areaEnter(entity: Entity) {
+        if (entity is Player) {
+            entity.interfaceManager.removeTabs(0, 1, 2, 3, 4, 5, 6, 12)
+            face(entity, Location(1952, 4768, 1))
+            animate(entity,2378)
+            openDialogue(entity, QuizMasterDialogueFile(), NPC(NPCs.QUIZ_MASTER_2477))
+        }
+    }
+
+    override fun areaLeave(entity: Entity, logout: Boolean) {
+        if (entity is Player) {
+            entity.interfaceManager.restoreTabs()
+            //closeOverlay(entity)
+        }
+    }
+
+}

Server/src/main/content/global/ame/events/quizmaster/QuizMasterDialogueFile.kt

@@ -0,0 +1,152 @@
+package content.global.ame.events.quizmaster
+
+import content.global.ame.returnPlayer
+import core.ServerConstants
+import core.api.*
+import core.api.utils.WeightBasedTable
+import core.api.utils.WeightedItem
+import core.game.component.Component
+import core.game.dialogue.DialogueLabeller
+import core.game.dialogue.DialogueOption
+import core.game.dialogue.FacialExpression
+import core.game.interaction.QueueStrength
+import core.game.node.entity.player.Player
+import org.rs09.consts.Components
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+class QuizMasterDialogueFile : DialogueLabeller() {
+    companion object {
+        const val QUIZMASTER_INTERFACE = Components.MACRO_QUIZSHOW_191
+        const val QUIZMASTER_ATTRIBUTE_QUESTIONS_CORRECT = "/save:quizmaster:questions-correct"
+        const val QUIZMASTER_ATTRIBUTE_RANDOM_ANSWER = "quizmaster:random-answer"
+
+        /*
+        // Golden Models:
+        8828 ADAMANT_BATTLEAXE_1371
+        8829 SALMON_329
+        8830 TROUT_333
+        8831 NECKLACE
+        8832 WOODEN_SHIELD_1171
+        8833 BRONZE_MED_HELM_1139
+        8834 RING
+        8835 SECATEURS_5329
+        8836 BRONZE_SWORD_1277
+        8837 GARDENING_TROWEL_5325
+         */
+        val sets = arrayOf(
+                intArrayOf(8828, 8829, 8829),
+                intArrayOf(8831, 8837, 8835),
+                intArrayOf(8830, 8832, 8833),
+                intArrayOf(8835, 8834, 8831),
+                intArrayOf(8837, 8836, 8828),
+        )
+
+        fun randomQuestion(player: Player): Int {
+            val randomSet = intArrayOf(*sets.random())
+            val answer = intArrayOf(*randomSet)[0]
+            randomSet.shuffle()
+            val correctButton = randomSet.indexOf(answer) + 2 // buttons are 3,4,5
+
+            player.packetDispatch.sendModelOnInterface(randomSet[0], QUIZMASTER_INTERFACE, 6, 512)
+            player.packetDispatch.sendModelOnInterface(randomSet[1], QUIZMASTER_INTERFACE, 7, 512)
+            player.packetDispatch.sendModelOnInterface(randomSet[2], QUIZMASTER_INTERFACE, 8, 512)
+            player.packetDispatch.sendAngleOnInterface(QUIZMASTER_INTERFACE, 6, 512,0,0)
+            player.packetDispatch.sendAngleOnInterface(QUIZMASTER_INTERFACE, 7, 512,0,0)
+            player.packetDispatch.sendAngleOnInterface(QUIZMASTER_INTERFACE, 8, 512,0,0)
+
+            return correctButton
+        }
+
+        // Random Item should be "Mystery Box", but the current MYSTERY_BOX_6199 is already inauthentically used by Giftmas.
+        val tableRoll = WeightBasedTable.create(
+                WeightedItem(Items.LAMP_2528, 1, 1, 1.0, false),
+                WeightedItem(Items.CABBAGE_1965, 1, 1, 1.0, false),
+                WeightedItem(Items.DIAMOND_1601, 1, 1, 1.0, false),
+                WeightedItem(Items.BUCKET_1925, 1, 1, 1.0, false),
+                WeightedItem(Items.FLIER_956, 1, 1, 1.0, false),
+                WeightedItem(Items.OLD_BOOT_685, 1, 1, 1.0, false),
+                WeightedItem(Items.BODY_RUNE_559, 1, 1, 1.0, false),
+                WeightedItem(Items.ONION_1957, 1, 1, 1.0, false),
+                WeightedItem(Items.MITHRIL_SCIMITAR_1329, 1, 1, 1.0, false),
+                WeightedItem(Items.CASKET_405, 1, 1, 1.0, false),
+                WeightedItem(Items.STEEL_PLATEBODY_1119, 1, 1, 1.0, false),
+                WeightedItem(Items.NATURE_RUNE_561, 20, 20, 1.0, false),
+        )
+    }
+
+
+    override fun addConversation() {
+        assignToIds(NPCs.QUIZ_MASTER_2477)
+        afterClose { player ->
+            loadLabel(player, "question")
+        }
+
+        npc(FacialExpression.FRIENDLY,"WELCOME to the GREATEST QUIZ SHOW in the", "whole of ${ServerConstants.SERVER_NAME}:", "<col=8A0808>O D D</col>  <col=8A088A>O N E</col>  <col=08088A>O U T</col>", unclosable = true)
+        player(FacialExpression.THINKING, "I'm sure I didn't ask to take part in a quiz show...", unclosable = true)
+        npc(FacialExpression.FRIENDLY,"Please welcome our newest contestant:", "<col=FF0000>${player?.username}</col>!", "Just pick the O D D  O N E  O U T.", "Four questions right, and then you win!", unclosable = true)
+        goto("question")
+
+        label("question")
+        manual(unclosable = true) { player, _ ->
+            setAttribute(player, QUIZMASTER_ATTRIBUTE_RANDOM_ANSWER, randomQuestion(player))
+            val comp = Component(QUIZMASTER_INTERFACE)
+            player.interfaceManager.openChatbox(comp)
+            return@manual comp
+        }
+        exec { player, _ ->
+            if (buttonID == getAttribute(player, QUIZMASTER_ATTRIBUTE_RANDOM_ANSWER, 0)) {
+                // Correct Answer
+                setAttribute(player, QUIZMASTER_ATTRIBUTE_QUESTIONS_CORRECT, getAttribute(player, QUIZMASTER_ATTRIBUTE_QUESTIONS_CORRECT, 0) + 1)
+                if (getAttribute(player, QUIZMASTER_ATTRIBUTE_QUESTIONS_CORRECT, 0) >= 4) {
+                    goto("winner")
+                } else {
+                    goto("right")
+                }
+            } else {
+                goto("wrong")
+            }
+        }
+
+        label("right")
+        npc(FacialExpression.FRIENDLY,"Wow, you're a smart one!", "You're absolutely RIGHT!", "Okay, next question!", unclosable = true)
+        goto("question")
+
+        label("wrong")
+        npc(FacialExpression.FRIENDLY,"WRONG!", "That's just WRONG!", "Okay, next question!", unclosable = true)
+        goto("question")
+
+        label("winner")
+        npc(FacialExpression.FRIENDLY,"<col=08088A>CONGRATULATIONS!</col>", "You are a <col=8A0808>WINNER</col>!", "Please choose your <col=08088A>PRIZE</col>!", unclosable = true)
+        options(
+            DialogueOption("money", "1000 Coins", skipPlayer = true),
+            DialogueOption("item", "Random Item", skipPlayer = true)
+        )
+
+        label("money")
+        exec { player, _ ->
+            queueScript(player, 0, QueueStrength.SOFT) { _ ->
+                addItemOrDrop(player, Items.COINS_995, 1000)
+                return@queueScript stopExecuting(player)
+            }
+        }
+        goto("cleanup")
+
+        label("item")
+        exec { player, _ ->
+            queueScript(player, 0, QueueStrength.SOFT) { _ ->
+                addItemOrDrop(player, tableRoll.roll()[0].id)
+                return@queueScript stopExecuting(player)
+            }
+        }
+        goto("cleanup")
+
+        label("cleanup")
+        exec { player, _ ->
+            resetAnimator(player)
+            returnPlayer(player)
+            removeAttributes(player, QUIZMASTER_ATTRIBUTE_QUESTIONS_CORRECT, QUIZMASTER_ATTRIBUTE_RANDOM_ANSWER)
+        }
+        goto("nowhere")
+    }
+}

Server/src/main/content/global/ame/events/quizmaster/QuizMasterNPC.kt

@@ -0,0 +1,39 @@
+package content.global.ame.events.quizmaster
+
+import content.global.ame.RandomEventNPC
+import content.global.ame.kidnapPlayer
+import core.api.*
+import core.api.utils.WeightBasedTable
+import core.game.node.entity.npc.NPC
+import core.game.world.map.Location
+import org.rs09.consts.NPCs
+
+/**
+ * Quiz Master NPC:
+ *
+ * https://www.youtube.com/watch?v=EFAWSiPTfcM
+ * https://www.youtube.com/watch?v=caWn7pE2mkE
+ * https://www.youtube.com/watch?v=Bc1gAov2o4w
+ * https://www.youtube.com/watch?v=oHU8-MUarxE
+ * https://www.youtube.com/watch?v=wvjYiF4v9tI
+ * https://www.youtube.com/watch?v=dC6rlSnXEfw
+ */
+class QuizMasterNPC(var type: String = "", override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.QUIZ_MASTER_2477) {
+    override fun init() {
+        super.init()
+        sendChat("Hey ${player.username}! It's your lucky day!")
+        face(player)
+        kidnapPlayer(this, player, Location(1952, 4764, 1)) { player, _ ->
+            setAttribute(player, QuizMasterDialogueFile.QUIZMASTER_ATTRIBUTE_QUESTIONS_CORRECT, 0)
+            sendMessage(player, "Answer four questions correctly in a row to be teleported back where you came from.")
+            sendMessage(player, "You will need to relog in if you lose the quiz dialog.") // Inauthentic, but there to notify the player in case.
+            face(player, Location(1952, 4768, 1))
+            animate(player,2378)
+            // Quiz dialogue gets opened automatically on zone entry.
+        }
+    }
+
+    override fun talkTo(npc: NPC) {
+        openDialogue(player, QuizMasterDialogueFile(), this.asNpc())
+    }
+}

Server/src/main/content/global/ame/events/rivertroll/RiverTrollRENPC.kt

@@ -4,17 +4,14 @@ import core.game.node.entity.Entity
 import core.game.node.entity.npc.NPC
 import content.global.ame.RandomEventNPC
 import core.api.utils.WeightBasedTable
-import java.lang.Integer.max
 
-
-val ids = 391..396
+val ids = (391..396).toList()
 
 class RiverTrollRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(391){
     override fun talkTo(npc: NPC) {}
     override fun init() {
         super.init()
-        val index = max(0, (player.properties.combatLevel / 20) - 1)
-        val id = ids.toList()[index]
+        val id = idForCombatLevel(ids, player)
         this.transform(id)
         this.attack(player)
         sendChat("Fishies be mine, leave dem fishies!")

Server/src/main/content/global/ame/events/rockgolem/RockGolemBehavior.kt

@@ -0,0 +1,86 @@
+package content.global.ame.events.rockgolem
+
+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.CombatSwingHandler
+import core.game.node.entity.combat.InteractionType
+import core.game.node.entity.impl.Projectile
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.npc.NPCBehavior
+import core.game.world.update.flag.context.Animation
+import org.rs09.consts.NPCs
+
+class RockGolemBehavior() : NPCBehavior(NPCs.ROCK_GOLEM_413, NPCs.ROCK_GOLEM_414, NPCs.ROCK_GOLEM_415, NPCs.ROCK_GOLEM_416, NPCs.ROCK_GOLEM_417, NPCs.ROCK_GOLEM_418) {
+    private val swingHandler = RockGolemSwingHandler()
+
+    override fun getSwingHandlerOverride(self: NPC, original: CombatSwingHandler): CombatSwingHandler {
+        return swingHandler
+    }
+
+    override fun getXpMultiplier(self: NPC, attacker: Entity): Double {
+        return super.getXpMultiplier(self, attacker) / 16.0
+    }
+}
+
+private class RockGolemSwingHandler : CombatSwingHandler(CombatStyle.RANGE) {
+    override fun canSwing(entity: Entity, victim: Entity): InteractionType? {
+        return type?.swingHandler?.canSwing(entity, victim)
+    }
+
+    override fun swing(entity: Entity?, victim: Entity?, state: BattleState?): Int {
+        if (entity == null || victim == null) return -1
+
+        val prayingRange = victim.hasProtectionPrayer(CombatStyle.RANGE)
+
+        type = if (prayingRange) {
+            CombatStyle.MELEE
+        } else {
+            CombatStyle.RANGE
+        }
+
+        if (type == CombatStyle.MELEE && entity.location.getDistance(victim.location) > 1) return -1
+
+        return type?.swingHandler?.swing(entity, victim, state) ?: 0
+    }
+
+    override fun impact(entity: Entity?, victim: Entity?, state: BattleState?) {
+        type?.swingHandler?.impact(entity, victim, state)
+    }
+
+    override fun visualizeImpact(entity: Entity?, victim: Entity?, state: BattleState?) {
+        type?.swingHandler?.visualizeImpact(entity, victim, state)
+    }
+
+    override fun visualize(entity: Entity, victim: Entity?, state: BattleState?) {
+        when (type) {
+            CombatStyle.MELEE -> {
+                entity.animate(Animation(153))
+            }
+
+            CombatStyle.RANGE -> {
+                val speed = (100 + (Projectile.getLocation(entity).getDistance(victim!!.getLocation()) * 5)).toInt()
+                Projectile.create(entity, victim, 968, 48, 36, 80, speed, 5, entity.size() shl 5).send()
+                entity.animate(Animation(5347))
+            }
+
+            else -> {}
+        }
+    }
+
+    override fun calculateAccuracy(entity: Entity?): Int {
+        return type?.swingHandler?.calculateAccuracy(entity) ?: 0
+    }
+
+    override fun calculateHit(entity: Entity?, victim: Entity?, modifier: Double): Int {
+        return type?.swingHandler?.calculateHit(entity, victim, modifier) ?: 0
+    }
+
+    override fun calculateDefence(victim: Entity?, attacker: Entity?): Int {
+        return type?.swingHandler?.calculateDefence(victim, attacker) ?: 0
+    }
+
+    override fun getSetMultiplier(e: Entity?, skillId: Int): Double {
+        return type?.swingHandler?.getSetMultiplier(e, skillId) ?: 0.0
+    }
+}

Server/src/main/content/global/ame/events/rockgolem/RockGolemRENPC.kt

@@ -4,17 +4,14 @@ import core.game.node.entity.Entity
 import core.game.node.entity.npc.NPC
 import content.global.ame.RandomEventNPC
 import core.api.utils.WeightBasedTable
-import kotlin.math.max
 
-
-val ids = 413..418
+val ids = (413..418).toList()
 
 class RockGolemRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(413){
     override fun talkTo(npc: NPC) {}
     override fun init() {
         super.init()
-        val index = max(0,(player.properties.combatLevel / 20) - 1)
-        val id = ids.toList()[index]
+        val id = idForCombatLevel(ids, player)
         this.transform(id)
         this.attack(player)
         sendChat("Raarrrgghh! Flee human!")

Server/src/main/content/global/ame/events/sandwichlady/SandwichLadyRENPC.kt

@@ -5,32 +5,49 @@ import core.tools.RandomFunction
 import org.rs09.consts.Items
 import org.rs09.consts.NPCs
 import content.global.ame.RandomEventNPC
+import core.api.lock
 import core.api.utils.WeightBasedTable
 
 class SandwichLadyRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.SANDWICH_LADY_3117) {
-    val phrases = arrayOf("Hello, @name, can you hear me?","Sandwiches, @name!","Are you ignoring me, @name??","Yoohoo! Sandwiches, @name!","Hello, @name?", "Come get your sandwiches, @name!", "How could you ignore me like this, @name?!", "Do you even want your sandwiches, @name?")
+    lateinit var phrases: Array<String>
     var assigned_item = 0
-    val items = arrayOf(Items.BAGUETTE_6961,Items.TRIANGLE_SANDWICH_6962,Items.SQUARE_SANDWICH_6965,Items.ROLL_6963,Items.MEAT_PIE_2327,Items.KEBAB_1971,Items.CHOCOLATE_BAR_1973)
+    val items = arrayOf(Items.BAGUETTE_6961, Items.TRIANGLE_SANDWICH_6962, Items.SQUARE_SANDWICH_6965, Items.ROLL_6963, Items.MEAT_PIE_2327, Items.KEBAB_1971, Items.CHOCOLATE_BAR_1973)
 
     override fun tick() {
-        if(RandomFunction.random(1,15) == 5){
-            sendChat(phrases.random().replace("@name",player.username.capitalize()))
+        sayLine(this, phrases, true, true)
+        if (ticksLeft == 2) {
+            lock(player, 2)
         }
         super.tick()
     }
 
     override fun init() {
         super.init()
+        phrases = arrayOf(
+            // https://www.youtube.com/watch?v=ek8r3ZS929E
+            // She always starts with "Sandwiches, ${player.username}!" but she ALSO picks that at random, hence duplicate it with hasOpeningPhrase = true
+            "Sandwiches, ${player.username}!",
+            "Sandwiches, ${player.username}!",
+            "Come on ${player.username}, I made these specially!!",
+            "All types of sandwiches, ${player.username}.",
+            "Did you hear me ${player.username}?",
+            "You think I made these just for fun?!!?",
+            "How could you ignore me like this, ${player.username}?!" //unknown if authentic but it was already here
+        )
         assignItem()
-        sendChat(phrases.random().replace("@name",player.username.capitalize()))
+    }
+
+    override fun onTimeUp() {
+        noteAndTeleport()
+        terminate()
     }
 
     fun assignItem(){
         assigned_item = items.random()
-        player.setAttribute("sandwich-lady:item",assigned_item)
+        player.setAttribute("sandwich-lady:item", assigned_item)
     }
 
     override fun talkTo(npc: NPC) {
-        player.dialogueInterpreter.open(SandwichLadyDialogue(false),npc)
+        player.dialogueInterpreter.open(SandwichLadyDialogue(false), npc)
     }
 }

Server/src/main/content/global/ame/events/shade/ShadeRENPC.kt

@@ -4,15 +4,13 @@ import core.game.node.entity.Entity
 import core.game.node.entity.npc.NPC
 import content.global.ame.RandomEventNPC
 import core.api.utils.WeightBasedTable
-import kotlin.math.*
 
 class ShadeRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(425){
     val ids = (425..430).toList()
     override fun talkTo(npc: NPC) {}
     override fun init() {
         super.init()
-        val index = max(0, min(ids.size, (player.properties.combatLevel / 20) - 1))
-        val id = ids[index]
+        val id = idForCombatLevel(ids, player)
         this.transform(id)
         this.attack(player)
         sendChat("Leave this place!")

Server/src/main/content/global/ame/events/strangeplant/StrangePlantBehavior.kt

@@ -32,4 +32,8 @@ class StrangePlantBehavior() : NPCBehavior(NPCs.STRANGE_PLANT_408) {
     override fun onDeathStarted(self: NPC, killer: Entity) {
         AntiMacro.terminateEventNpc(killer.asPlayer())
     }
-}
+
+    override fun getXpMultiplier(self: NPC, attacker: Entity): Double {
+        return super.getXpMultiplier(self, attacker) / 16.0
+    }
+}

Server/src/main/content/global/ame/events/surpriseexam/MordautDialogue.kt

@@ -1,4 +1,4 @@
-package content.global.ame.events.supriseexam
+package content.global.ame.events.surpriseexam
 
 import core.game.component.Component
 import core.game.dialogue.FacialExpression

Server/src/main/content/global/ame/events/surpriseexam/MysteriousOldManNPC.kt

@@ -0,0 +1,24 @@
+package content.global.ame.events.surpriseexam
+
+import content.global.ame.RandomEventNPC
+import content.global.ame.kidnapPlayer
+import core.api.*
+import org.rs09.consts.NPCs
+import core.api.utils.WeightBasedTable
+import core.game.node.entity.npc.NPC
+import core.game.world.map.Location
+
+class MysteriousOldManNPC(var type: String = "", override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.MYSTERIOUS_OLD_MAN_410) {
+    override fun init() {
+        super.init()
+        sendChat("Surprise exam, ${player.username}!")
+        face(player)
+        kidnapPlayer(this, player, Location(1886, 5025, 0)) { _, _ ->
+            /* nothing needed */
+        }
+    }
+
+    override fun talkTo(npc: NPC) {
+        sendMessage(player, "He isn't interested in talking to you.")
+    }
+}