diff --git a/README.md b/README.md
index 63fff0083..caf98bfe5 100644
--- a/README.md
+++ b/README.md
@@ -149,4 +149,4 @@ These credits can be spent in the 2009Scape Reward Shop. It's important to be cl
Testers are not the only people who can gain credits - other ways of earning credits can be found on [the 2009Scape website](https://2009scape.org/site/game_guide/credits.html).
-Please be patient! The Credit system is not fully complete yet, so it will take a long time for credits to be awarded.
+Please be patient! The Credit system is not fully complete yet, so it will take a long time for credits to be awarded.
\ No newline at end of file
diff --git a/Server/.gitignore b/Server/.gitignore
index f22e9f978..a9a29cad7 100644
--- a/Server/.gitignore
+++ b/Server/.gitignore
@@ -2,6 +2,7 @@ bin/**
out/**
data/logs/**
data/profile/**
+data/playerstats/**
.idea/**
/bin
.DS_Store**
diff --git a/Server/README.md b/Server/README.md
deleted file mode 100644
index 63fff0083..000000000
--- a/Server/README.md
+++ /dev/null
@@ -1,152 +0,0 @@
-[![AGPL-3.0 License][license-shield]][license-url]
-
-
-
-
-
An open source MMORPG emulation server
-
-
-
- Community Hosted Server
- ·
- Discord Invite
- · Report Bug
-
-NOTE: Bug reports and support are only accepted by/offered to players of our live hosted server. We will not provide support to those running their own copies.
-
-## Table of Contents
-
-* [Live Server Information](#live-server-information)
-* [History of this Codebase](#history-of-this-codebase)
-* [Our Core Values](#our-core-values)
-* [Contributing](#contributing)
-* [Setup for Content Developers](#content-developers-setting-up-the-project)
- * [GitLab Setup](#gitlab-setup)
- * [Prerequisites](#prerequisites)
- * [Project Setup](#project-setup)
- * [Running the project](#running-the-project)
-* [License](#license)
-* [Contact](#contact)
-
-
-## Live Server Information
-
-Did you know that the 2009Scape Development Team hosts the main branch of this repo that you can connect to and play? Come join a growing community of people that love to grind out skills, quest, and hangout together. A download link for the launcher can be found [here](https://2009scape.org). Connecting to the live server is also one of the easiest ways to identify bugs/typos/missing features. Identifying these issues help developers, whether already on the project, or are even brand new to the project, fix bugs and issues in an expedited rate.
-
-## History of this Codebase
-
-The 2009Scape you see today has gone through a magnitude of changes. Originally starting its life as Arios498, this server saw a lot of people playing it daily, unfortunately, it was for profit and closed source. It was later upgraded to Arios530, targeting the build 530 of runescape with content in and around January 1st, 2009. Development came to a halt when a developer of the closed source project released the source code. The original developers of this server went on to create Kratos 530 back in 2015.
-
-This project was started out of love for the 530 revision. A small group of developers spent thousands of hours improving on the existing source that was left to the curb. Over the past year, this project has seen many developers coming and going, fixing bugs that they find either through their own server, or bugs that they find in the live game that is currently hosted. We do not accept donations of any kind. The smiles and wonderful compliments are more than enough to keep us going! Content and bugfixes are always number one on our list, and we try our best to answer any questions that you may have, provided you have read through this readme and frequently asked questions on the discord.
-
-## Our Core Values
-
-In the current climate of RuneScape Private Servers in general, we believe it's important to wear our core values on our sleeves and defend them with everything we have! Below are what we hold as our core, most important values:
-
-* **We do NOT believe in profiting off an RSPS.** To many of us here at the 2009Scape team, what we care about most is preserving the wonderful work of the Gower brothers in the most true-to-spirit manner possible. We do NOT do this to make a profit, and in fact **we outright refuse donations.** This is a labor of love and passion for everyone involved, a love for real RS2! This is perhaps the single most central value we have. If you want to "donate" to us, do so with your time and your dedication. That is what we desire most.
-
-
-* **Authenticity is central to the work**. As a remake, one of the most important things to us is being true to the Gower spirit. What the Gowers brought to us in our childhood is what we are driven to preserve for the remainder of the world.
-
-
-* **Open Source is crucial to the project**. We believe open source remakes to be crucial to preserving what we loved in our childhood, and we believe for-profit and/or closed-source servers are destined to flounder out and fail.
-
-
-* **Be welcoming**. One of our most important goals is to provide a community of friendly and caring people that get along and love to enjoy the game with eachother. For this reason, we do tend to be very strict when it comes to toxicity. We care about quality a whole lot more than quantity!
-
-## Contributing
-
-**Note: All merge requests MUST be made using the defaut MR template. Merge requests that do not use this template will not be accepted.**
-
-**Note: All new contributions MUST be made in Kotlin unless you are updating or fixing a bug in legacy code. More information on Kotlin can be found [here](https://kotlinlang.org/).**
-
-There are many ways everyone can contribute! From the most seasoned programmers to those who do not have the most remote clue how code works! Below are some things that can always use some love from the community.
-
-* **Content Testers**: I'm putting this one up top because of its importance. We, the contributors and developers, aren't perfect. Sometimes, we make mistakes. This is where you come in - If you want a sneak peek at upcoming content, have a knack for breaking things, or just want to contribute to the project without making code changes, you can become a tester! If you are interested in becoming a tester, reach out in the testing channel of the discord. [Why become a tester?](#why-become-a-tester)
-
-
-* **Wiki Editors**: Did you know we have a wiki? Well it's always in need of people to fill it out and stay on top of it. Editing the wiki is one of the easiest ways you can contribute to 2009Scape! If you're an active player and have the will, there's so much you could be helping out with over at the wiki. [Click here to go to the wiki](https://cdn.2009scape.org/wiki/doku.php?id=start).
-
-
-* **JSON editors**: We could always use more JSON editors! Please note that JSON editing **must** be done using the [Thanos Tool](https://gitlab.com/2009scape/tools/rs09-thanos-tool/-/jobs/5153567519/artifacts/file/build/libs/zaros.jar). **This does not run on modern Java** and requires **Java 11** to run (using the usual 'java -jar zaros.jar').
-
-
-* **Authenticity Auditors**: As a remake, authenticity is central to our core values! We could always use someone to go through the game and create large lists of simple tasks that can be done to bring us closer to the authentic 2009 game! The preferred way to do this is one-area-at-a-time. If you want to see an example of some audits we've done in the past, take a look [here](https://gitlab.com/2009scape/2009scape/-/issues/46).
-
-
-* **Code Contributors**: As a remake, we have massive amounts of content that need to be implemented or corrected. If you know how to program or are willing to learn, this is where you could be extremely helpful! We need everything from quests, to dialogue, to mini-games, to skills that still need to be corrected or implemented. This is perhaps one of the most valuable ways someone could help out the project! If you are interested in developing content, reach out in the development channel of the Discord.
-
-## Content Developers: Setting Up the Project.
-### GitLab Setup
-**Note: This allows you to commit changes to the main repo (with approval)! Also, always stay up to date with the most recent updates by pulling into your copy when 2009Scape updates!**
-
-1. Create a GitLab account if you haven't done so already.
-
-2. Follow our Git Basics guide [over on the wiki.](https://gitlab.com/2009scape/2009scape/-/wikis/git-basics)
-
-**If at anytime you have an issue with GitLab please refer to the [GitLab help center](https://gitlab.com/help).**
-
-### Prerequisites
-
-These are mandatory. If you don't install **all** of these programs **in order** prior to
-the project's setup, things won't work. At all.
-
-*For Windows users* - Turn developer mode on first in Windows developer settings.
-
-* [JDK 11](https://adoptium.net) or the Java SE Development Kit Version 11
-* [IntelliJ IDEA Community](https://www.jetbrains.com/idea/download/)
-
-### SSH setup
-
-1. [Set up a key if you don't have one (ed25519)](https://docs.gitlab.com/ee/user/ssh.html#generate-an-ssh-key-pair)
-2. [Add your public key to your gitlab account](https://docs.gitlab.com/ee/user/ssh.html#add-an-ssh-key-to-your-gitlab-account)
-3. [Verify you can connect to git@gitlab.com](https://docs.gitlab.com/ee/user/ssh.html#verify-that-you-can-connect)
-
-### Project Setup
-
-1. If you haven't already, make sure to follow our [Git Basics](https://gitlab.com/2009scape/2009scape/-/wikis/git-basics) guide.
-2. Run `git lfs pull` in the 2009scape folder you cloned as part of that guide. This only has to be done once, ever.
-3. Follow our [IntelliJ IDEA Setup Guide](https://gitlab.com/2009scape/2009scape/-/wikis/Setup-for-IntelliJ-IDEA-IDE)
-
-### Running the project
-
-1. If you followed the IntelliJ setup guide, which you probably should have, just use the provided run configuration.
-***Note: If you choose not to use the provided run scripts or IntelliJ, you *must* run `mvn clean` before it will build correctly.***
-
-#### Linux / OSX
-
-Start the game server with the included run script. Use `./run -h` for more info.
-
-#### Windows
-
-Start the game server with `run-server.bat`
-
-### 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.**
-
-### Contact
-
-**Reminder: There is no official support for setting up your own server. Do not ping/dm developers, or ask in support channels about setting up your server. Support for the live server and 2009Scape single-player is available on the [2009Scape forums](https://forum.2009scape.org/).**
-
-
-[license-shield]: https://img.shields.io/badge/license-AGPL--3.0-informational
-[license-url]: https://www.gnu.org/licenses/agpl-3.0.en.html
-
-### Why become a tester?
-
-Before content hits Live, it has to be tested. We can, but do not want to do this alone, and would love the help! But don't worry, there is something in it for you. Credits! Keep in mind that credits will only be awarded to people who thoroughly test the content and provide detailed reports on them. Like votes or HoF you must claim them in the #claim-to-fame channel on discord or matrix.
-
-* If you test smaller things like bug fixes there is a 2 credit reward.
-* If you test full quests or minigames you will be rewarded 5 credits.
-* If you find a bug in the content you are testing that hasn't already been found you will earn an extra credit.
-
-These credits can be spent in the 2009Scape Reward Shop. It's important to be clear that credits are gained by contributions to the project. We cannot and will not accept donations (of any kind), especially not in exchange for in-game credits or perks.
-
-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.
diff --git a/Server/data/ObjectParser.xml b/Server/data/ObjectParser.xml
index b10a0d445..e132f1f69 100644
--- a/Server/data/ObjectParser.xml
+++ b/Server/data/ObjectParser.xml
@@ -25,4 +25,7 @@
(p)
+ if (existingTimer != null) {
+ existingTimer.hitsLeft -= 9
+ if (existingTimer.hitsLeft <= 0) {
+ sendMessage(p, "The disease has been cured.")
+ removeTimer(p)
+ }else{
+ sendMessage(p,"You feel slightly better.")
+ }
+ }
+ }
+}
diff --git a/Server/src/main/content/data/consumables/effects/RestoreEffect.java b/Server/src/main/content/data/consumables/effects/RestoreEffect.java
index 3b57acabf..ba9b3ea8d 100644
--- a/Server/src/main/content/data/consumables/effects/RestoreEffect.java
+++ b/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);
}
}
}
diff --git a/Server/src/main/content/global/activity/cchallange/ChampionChallengeListener.kt b/Server/src/main/content/global/activity/cchallange/ChampionChallengeListener.kt
index 8cea6d806..e1e2cd6c8 100644
--- a/Server/src/main/content/global/activity/cchallange/ChampionChallengeListener.kt
+++ b/Server/src/main/content/global/activity/cchallange/ChampionChallengeListener.kt
@@ -114,7 +114,6 @@ class ChampionChallengeListener : InteractionListener, MapArea {
)
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 +123,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 +140,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 +160,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 +226,4 @@ class ChampionChallengeListener : InteractionListener, MapArea {
ZoneRestriction.RANDOM_EVENTS
)
}
-}
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt
index dcb48e84a..9432ea009 100644
--- a/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt
+++ b/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
@@ -30,7 +31,7 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando
"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 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 Fremennik Trials)
+ "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)
@@ -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
}
/**
diff --git a/Server/src/main/content/global/activity/shootingstar/ShootingStarMiningPulse.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStarMiningPulse.kt
index 456efb4f2..5f5ee3649 100644
--- a/Server/src/main/content/global/activity/shootingstar/ShootingStarMiningPulse.kt
+++ b/Server/src/main/content/global/activity/shootingstar/ShootingStarMiningPulse.kt
@@ -51,6 +51,7 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
player.sendMessage("You have ${player.skills.experienceMultiplier * player.getAttribute("shooting-star:bonus-xp", 0).toDouble()} bonus xp towards mining stardust.")
ShootingStarPlugin.submitScoreBoard(player)
star.isDiscovered = true
+ ShootingStarPlugin.getStoreFile()["isDiscovered"] = star.isDiscovered
return player.skills.getLevel(Skills.MINING) >= star.miningLevel
}
diff --git a/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt
index 274a414a6..1e993e1bb 100644
--- a/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt
+++ b/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() {
@@ -80,17 +96,17 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
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, "Priest in Peril", "to access this.") }
- //"burgh de rott bank" -> {p -> hasRequirement(p, "In Aid of the Myreque") } //disabled: crash
- "crafting guild" -> {p -> hasLevelStat(p, Skills.CRAFTING, 40) }
- "lletya bank" -> {p -> hasRequirement(p, "Mourning's End Part I") }
- "jatizso mine" -> {p -> hasRequirement(p, "The Fremennik Isles") }
- "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") } //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, "Lunar Diplomacy") }
- "miscellania coal mine" -> {p -> requireQuest(p, "The Fremennik Trials", "to access this.") }
- //"neitiznot runite mine" -> {p -> hasRequirement(p, "The Fremennik Isles") } //disabled: currently not reachable
+ "canifis bank" -> {p -> requireQuest(p, Quests.PRIEST_IN_PERIL, "to access this.")}
+ //"burgh de rott bank" -> {p -> hasRequirement(p, Quests.IN_AID_OF_THE_MYREQUE)} //disabled: crash
+ "crafting guild" -> {p -> hasLevelStat(p, Skills.CRAFTING, 40)}
+ "lletya bank" -> {p -> hasRequirement(p, Quests.MOURNINGS_END_PART_I)}
+ "jatizso mine" -> {p -> hasRequirement(p, Quests.THE_FREMENNIK_ISLES)}
+ "south crandor mining site" -> {p -> hasRequirement(p, Quests.DRAGON_SLAYER)}
+ "shilo village mining site" -> {p -> hasRequirement(p, Quests.SHILO_VILLAGE)}
+ "mos le'harmless bank" -> {p -> hasRequirement(p, Quests.CABIN_FEVER)} //needs to be updated to check for completion when the quest releases; https://runescape.wiki/w/Mos_Le%27Harmless?oldid=913025
+ "lunar isle mine" -> {p -> hasRequirement(p, Quests.LUNAR_DIPLOMACY)}
+ "miscellania coal mine" -> {p -> requireQuest(p, Quests.THE_FREMENNIK_TRIALS, "to access this.")}
+ //"neitiznot runite mine" -> {p -> hasRequirement(p, Quests.THE_FREMENNIK_ISLES)} //disabled: currently not reachable
else -> {_ -> true}
}
if (!condition.invoke(player)) {
@@ -122,6 +138,7 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
}
define("submit", Privilege.ADMIN) { _, _ ->
+ star.rebuildVars()
star.fire()
}
diff --git a/Server/src/main/content/global/activity/ttrail/ClueScrollPlugin.java b/Server/src/main/content/global/activity/ttrail/ClueScrollPlugin.java
index 13efad3c6..c049c6dab 100644
--- a/Server/src/main/content/global/activity/ttrail/ClueScrollPlugin.java
+++ b/Server/src/main/content/global/activity/ttrail/ClueScrollPlugin.java
@@ -192,7 +192,7 @@ public abstract class ClueScrollPlugin extends MapZone implements Plugin
int hasAmt = 0;
for (int i = 0; i < equipment.length; i++) {
for (int k = 0; k < equipment[i].length; k++) {
- if (player.getEquipment().contains(equipment[i][k], 1)) {
+ if (player.getEquipment().contains(equipment[i][k], 1) || player.costumeRoomBank.contains(equipment[i][k], 1)) {
hasAmt++;
break;
}
diff --git a/Server/src/main/content/global/ame/KidnapHelper.kt b/Server/src/main/content/global/ame/KidnapHelper.kt
new file mode 100644
index 000000000..5cef011ba
--- /dev/null
+++ b/Server/src/main/content/global/ame/KidnapHelper.kt
@@ -0,0 +1,28 @@
+package content.global.ame
+
+import core.ServerConstants
+import core.api.*
+import core.game.node.entity.player.Player
+import core.game.node.entity.player.link.TeleportManager.TeleportType
+import core.game.world.map.Location
+
+fun kidnapPlayer(player: Player, loc: Location, type: TeleportType) {
+ setAttribute(player, "kidnapped-by-random", true)
+ if (getAttribute(player, "/save:original-loc", null) == null) {
+ setAttribute(player, "/save:original-loc", player.location)
+ }
+ teleport(player, loc, type)
+}
+
+fun returnPlayer(player: Player) {
+ // Prevent returning more than once and sending the player back to HOME_LOCATION
+ if (getAttribute(player, "kidnapped-by-random", null) == null) {
+ return
+ }
+
+ player.locks.unlockTeleport()
+ val destination = getAttribute(player, "/save:original-loc", ServerConstants.HOME_LOCATION ?: Location.create(3222, 3218, 0))
+ teleport(player, destination)
+ unlock(player)
+ removeAttributes(player, "/save:original-loc", "kidnapped-by-random")
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/RandomEventNPC.kt b/Server/src/main/content/global/ame/RandomEventNPC.kt
index c0aba00af..716420e25 100644
--- a/Server/src/main/content/global/ame/RandomEventNPC.kt
+++ b/Server/src/main/content/global/ame/RandomEventNPC.kt
@@ -3,9 +3,15 @@ package content.global.ame
import content.global.ame.events.MysteriousOldManNPC
import core.api.playGlobalAudio
import core.api.poofClear
+import core.api.sendMessage
+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,10 +19,11 @@ 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.secondsToTicks
import core.tools.ticksToCycles
import org.rs09.consts.Sounds
+import kotlin.math.ceil
+import kotlin.math.min
import kotlin.random.Random
import kotlin.reflect.full.createInstance
@@ -66,7 +73,6 @@ abstract class RandomEventNPC(id: Int) : NPC(id) {
if (!player.getAttribute("random:pause", false)) {
ticksLeft--
}
-
if (!pulseManager.hasPulseRunning() && !finalized) {
follow()
}
@@ -87,6 +93,11 @@ abstract class RandomEventNPC(id: Int) : NPC(id) {
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() {
@@ -118,4 +129,19 @@ abstract class RandomEventNPC(id: Int) : NPC(id) {
}
abstract fun talkTo(npc: NPC)
-}
\ No newline at end of file
+
+ 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, player: Player): Int {
+ val index = min(ids.size, ceil(player.properties.currentCombatLevel / 20.0).toInt()) - 1
+ return ids[index]
+ }
+}
diff --git a/Server/src/main/content/global/ame/RandomEvents.kt b/Server/src/main/content/global/ame/RandomEvents.kt
index 7e07d744a..49bac5151 100644
--- a/Server/src/main/content/global/ame/RandomEvents.kt
+++ b/Server/src/main/content/global/ame/RandomEvents.kt
@@ -3,15 +3,18 @@ package content.global.ame
import org.rs09.consts.Items
import content.global.ame.events.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.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
@@ -43,7 +46,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 +56,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)),
diff --git a/Server/src/main/content/global/ame/events/HostileRandomEventBehavior.kt b/Server/src/main/content/global/ame/events/HostileRandomEventBehavior.kt
new file mode 100644
index 000000000..37083b045
--- /dev/null
+++ b/Server/src/main/content/global/ame/events/HostileRandomEventBehavior.kt
@@ -0,0 +1,19 @@
+package content.global.ame.events
+
+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.ROCK_GOLEM_413, NPCs.ROCK_GOLEM_414, NPCs.ROCK_GOLEM_415, NPCs.ROCK_GOLEM_416, NPCs.ROCK_GOLEM_417, NPCs.ROCK_GOLEM_418,
+ 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 {
+ return super.getXpMultiplier(self, attacker) / 16.0
+ }
+}
diff --git a/Server/src/main/content/global/ame/events/drilldemon/DrillDemonListeners.kt b/Server/src/main/content/global/ame/events/drilldemon/DrillDemonListeners.kt
index cb270f02f..2287de37d 100644
--- a/Server/src/main/content/global/ame/events/drilldemon/DrillDemonListeners.kt
+++ b/Server/src/main/content/global/ame/events/drilldemon/DrillDemonListeners.kt
@@ -79,7 +79,7 @@ class DrillDemonListeners : InteractionListener, MapArea {
}
override fun getRestrictions(): Array {
- 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)
}
}
-}
\ No newline at end of file
+}
diff --git a/Server/src/main/content/global/ame/events/drilldemon/DrillDemonUtils.kt b/Server/src/main/content/global/ame/events/drilldemon/DrillDemonUtils.kt
index d81f3ed51..a6638fecb 100644
--- a/Server/src/main/content/global/ame/events/drilldemon/DrillDemonUtils.kt
+++ b/Server/src/main/content/global/ame/events/drilldemon/DrillDemonUtils.kt
@@ -1,8 +1,11 @@
package content.global.ame.events.drilldemon
+import content.global.ame.kidnapPlayer
+import content.global.ame.returnPlayer
import core.api.*
import core.game.interaction.QueueStrength
import core.game.node.entity.player.Player
+import core.game.node.entity.player.link.TeleportManager
import core.game.world.map.Location
import core.game.world.map.zone.ZoneBorders
import core.game.world.update.flag.context.Animation
@@ -11,7 +14,6 @@ import org.rs09.consts.NPCs
object DrillDemonUtils {
val DD_KEY_TASK = "/save:drilldemon:task"
- val DD_KEY_RETURN_LOC = "/save:original-loc"
val DD_SIGN_VARP = 531
val DD_SIGN_JOG = 0
val DD_SIGN_SITUP = 1
@@ -23,8 +25,7 @@ object DrillDemonUtils {
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))
+ kidnapPlayer(player, Location.create(3163, 4819, 0), TeleportManager.TeleportType.INSTANT)
player.interfaceManager.closeDefaultTabs()
setComponentVisibility(player, 548, 69, true)
setComponentVisibility(player, 746, 12, true)
@@ -63,13 +64,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)
diff --git a/Server/src/main/content/global/ame/events/drilldemon/SeargentDamienNPC.kt b/Server/src/main/content/global/ame/events/drilldemon/SergeantDamienNPC.kt
similarity index 89%
rename from Server/src/main/content/global/ame/events/drilldemon/SeargentDamienNPC.kt
rename to Server/src/main/content/global/ame/events/drilldemon/SergeantDamienNPC.kt
index f767b0554..af4e8fe3c 100644
--- a/Server/src/main/content/global/ame/events/drilldemon/SeargentDamienNPC.kt
+++ b/Server/src/main/content/global/ame/events/drilldemon/SergeantDamienNPC.kt
@@ -10,11 +10,11 @@ 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) {
+class SergeantDamienNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(NPCs.SERGEANT_DAMIEN_2790) {
override fun init() {
super.init()
- sendChat(player.username.capitalize() + "! Drop and give me 20!")
+ sendChat(player.username+ "! Drop and give me 20!")
queueScript(player, 4, QueueStrength.SOFT) { stage: Int ->
when (stage) {
0 -> {
diff --git a/Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt b/Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt
index fc71ebd68..f2a3e9134 100644
--- a/Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt
+++ b/Server/src/main/content/global/ame/events/evilbob/EvilBobListeners.kt
@@ -1,5 +1,6 @@
package content.global.ame.events.evilbob
+import content.global.ame.returnPlayer
import core.ServerConstants
import core.api.*
import core.game.dialogue.FacialExpression
@@ -8,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
@@ -121,7 +120,7 @@ class EvilBobListeners : InteractionListener, MapArea {
}
3 -> {
sendMessage(player, "Welcome back to ${ServerConstants.SERVER_NAME}.")
- teleport(player, getAttribute(player, EvilBobUtils.prevLocation, Location.create(3222, 3219, 0)))
+ returnPlayer(player)
EvilBobUtils.reward(player)
EvilBobUtils.cleanup(player)
resetAnimator(player)
@@ -139,7 +138,7 @@ class EvilBobListeners : InteractionListener, MapArea {
}
override fun getRestrictions(): Array {
- 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) {
diff --git a/Server/src/main/content/global/ame/events/evilbob/EvilBobUtils.kt b/Server/src/main/content/global/ame/events/evilbob/EvilBobUtils.kt
index e07703ab9..d70eab940 100644
--- a/Server/src/main/content/global/ame/events/evilbob/EvilBobUtils.kt
+++ b/Server/src/main/content/global/ame/events/evilbob/EvilBobUtils.kt
@@ -1,7 +1,10 @@
package content.global.ame.events.evilbob
+import content.global.ame.kidnapPlayer
+import content.global.ame.returnPlayer
import core.api.*
import core.game.node.entity.player.Player
+import core.game.node.entity.player.link.TeleportManager
import core.game.node.entity.skill.Skills
import core.game.world.map.Location
import core.game.world.map.zone.ZoneBorders
@@ -13,10 +16,8 @@ import org.rs09.consts.NPCs
import org.rs09.consts.Scenery
object EvilBobUtils {
- const val prevLocation = "/save:original-loc"
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"
@@ -53,14 +54,11 @@ object EvilBobUtils {
}
fun teleport(player: Player) {
- setAttribute(player, prevLocation, player.location)
- player.properties.teleportLocation = Location.create(3419, 4776, 0)
+ kidnapPlayer(player, Location.create(3419, 4776, 0), TeleportManager.TeleportType.INSTANT)
}
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)
diff --git a/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt b/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt
index ac26b914b..5b065f567 100644
--- a/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt
+++ b/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()))
diff --git a/Server/src/main/content/global/ame/events/freakyforester/FreakListeners.kt b/Server/src/main/content/global/ame/events/freakyforester/FreakListeners.kt
index e2d36acc0..8754a8d08 100644
--- a/Server/src/main/content/global/ame/events/freakyforester/FreakListeners.kt
+++ b/Server/src/main/content/global/ame/events/freakyforester/FreakListeners.kt
@@ -57,10 +57,10 @@ class FreakListeners : InteractionListener, MapArea {
}
override fun getRestrictions(): Array {
- 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)
}
-}
\ No newline at end of file
+}
diff --git a/Server/src/main/content/global/ame/events/freakyforester/FreakUtils.kt b/Server/src/main/content/global/ame/events/freakyforester/FreakUtils.kt
index c08701297..e247bfeb1 100644
--- a/Server/src/main/content/global/ame/events/freakyforester/FreakUtils.kt
+++ b/Server/src/main/content/global/ame/events/freakyforester/FreakUtils.kt
@@ -1,16 +1,18 @@
package content.global.ame.events.freakyforester
+import content.global.ame.kidnapPlayer
+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.node.entity.player.link.TeleportManager
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:original-loc"
const val freakTask = "/save:freakyf:task"
const val freakComplete = "/save:freakyf:complete"
const val pheasantKilled = "freakyf:killed"
@@ -27,14 +29,12 @@ object FreakUtils{
}
fun teleport(player: Player) {
- setAttribute(player, freakPreviousLoc, player.location)
- teleport(player, Location.create(2599, 4777 ,0))
+ kidnapPlayer(player, Location.create(2599, 4777 ,0), TeleportManager.TeleportType.INSTANT)
}
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)
diff --git a/Server/src/main/content/global/ame/events/maze/MazeInterface.kt b/Server/src/main/content/global/ame/events/maze/MazeInterface.kt
new file mode 100644
index 000000000..108d456ca
--- /dev/null
+++ b/Server/src/main/content/global/ame/events/maze/MazeInterface.kt
@@ -0,0 +1,277 @@
+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, 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),
+ )
+
+ fun initMaze(player: Player) {
+ setAttribute(player, MAZE_ATTRIBUTE_TICKS_LEFT, 300)
+ setVarp(player, MAZE_TIMER_VARP, (getAttribute(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)
+ 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(Scenery.WALL_3628, IntType.SCENERY, "open") { player, node ->
+ // Door opening workaround
+ // Ignore 3629(WALL_3629) and 3630(WALL_3630) in handleAutowalkDoor ignoreSecondDoor
+ DoorActionHandler.handleAutowalkDoor(player, node as core.game.node.scenery.Scenery)
+ return@on true
+ }
+
+ on(Scenery.STRANGE_SHRINE_3634, IntType.SCENERY, "touch") { player, node ->
+ player.unhook(this)
+ closeOverlay(player)
+ queueScript(player, 0, QueueStrength.SOFT) { stage: Int ->
+ when (stage) {
+ 0 -> {
+ lock(player, 6)
+ sendGraphics(Graphics(86, 0, 3), player.location)
+ animate(player,862)
+ return@queueScript delayScript(player, 6)
+ }
+ 1 -> {
+ lock(player, 6)
+ 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 {
+ return arrayOf(getRegionBorders(11591))
+ }
+
+ override fun getRestrictions(): Array {
+ 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)
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/maze/MazeNPC.kt b/Server/src/main/content/global/ame/events/maze/MazeNPC.kt
new file mode 100644
index 000000000..e4befe00e
--- /dev/null
+++ b/Server/src/main/content/global/ame/events/maze/MazeNPC.kt
@@ -0,0 +1,57 @@
+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.interaction.QueueStrength
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.link.TeleportManager
+import core.game.system.timer.impl.AntiMacro
+import core.game.world.map.Location
+import core.game.world.map.build.DynamicRegion
+import core.game.world.update.flag.context.Graphics
+import org.rs09.consts.NPCs
+import org.rs09.consts.Sounds
+
+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)
+ queueScript(player, 4, 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 -> {
+ MazeInterface.initMaze(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(player, MazeInterface.STARTING_POINTS.random(), TeleportManager.TeleportType.INSTANT) // 10 random spots
+ AntiMacro.terminateEventNpc(player)
+ sendGraphics(Graphics(1577, 0, 0), player.location)
+ animate(player,8941)
+ removeAttribute(player, MazeInterface.MAZE_ATTRIBUTE_CHESTS_OPEN)
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
+ }
+ }
+
+ override fun talkTo(npc: NPC) {
+ // Do nothing.
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/pillory/PilloryInterface.kt b/Server/src/main/content/global/ame/events/pillory/PilloryInterface.kt
new file mode 100644
index 000000000..f48fc76f4
--- /dev/null
+++ b/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 swinging key that matches the", "hole in the spinning lock.")
+ } else {
+ sendMessage(player, "You can't unlock the pillory, you'll let all the prisoners out!")
+ }
+ return@on true
+ }
+ }
+
+ override fun defineAreaBorders(): Array {
+ 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 {
+ 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()
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/pillory/PilloryNPC.kt b/Server/src/main/content/global/ame/events/pillory/PilloryNPC.kt
new file mode 100644
index 000000000..f833d9ce2
--- /dev/null
+++ b/Server/src/main/content/global/ame/events/pillory/PilloryNPC.kt
@@ -0,0 +1,50 @@
+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.interaction.QueueStrength
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.link.TeleportManager
+import core.game.system.timer.impl.AntiMacro
+import core.game.world.map.Location
+import core.game.world.update.flag.context.Graphics
+import org.rs09.consts.NPCs
+import org.rs09.consts.Sounds
+
+// "::revent [-p] player name [-e event name]"
+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)
+ player.dialogueInterpreter.sendPlainMessage(true, "", "Solve the pillory puzzle to be returned to where you came from.")
+ queueScript(player, 4, 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 -> {
+ PilloryInterface.initPillory(player)
+ val dest = PilloryInterface.LOCATIONS.random() //9 random spots!
+ kidnapPlayer(player, dest, TeleportManager.TeleportType.INSTANT)
+ AntiMacro.terminateEventNpc(player)
+ sendGraphics(Graphics(1577, 0, 0), player.location)
+ animate(player,8941)
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
+ }
+ }
+
+ override fun talkTo(npc: NPC) {
+ //player.dialogueInterpreter.open(FreakyForesterDialogue(),npc)
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/quizmaster/QuizMasterBorders.kt b/Server/src/main/content/global/ame/events/quizmaster/QuizMasterBorders.kt
new file mode 100644
index 000000000..860d4d7dc
--- /dev/null
+++ b/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 {
+ return arrayOf(getRegionBorders(7754))
+ }
+
+ override fun getRestrictions(): Array {
+ 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)
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/quizmaster/QuizMasterDialogueFile.kt b/Server/src/main/content/global/ame/events/quizmaster/QuizMasterDialogueFile.kt
new file mode 100644
index 000000000..4790a8550
--- /dev/null
+++ b/Server/src/main/content/global/ame/events/quizmaster/QuizMasterDialogueFile.kt
@@ -0,0 +1,129 @@
+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.dialogue.DialogueFile
+import core.game.dialogue.FacialExpression
+import core.game.interaction.QueueStrength
+import core.game.node.entity.player.Player
+import core.tools.END_DIALOGUE
+import org.rs09.consts.Components
+import org.rs09.consts.Items
+
+class QuizMasterDialogueFile : DialogueFile() {
+ 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 handle(componentID: Int, buttonID: Int) {
+ when (stage) {
+ 0 -> npc(FacialExpression.FRIENDLY,"WELCOME to the GREATEST QUIZ SHOW in the", "whole of ${ServerConstants.SERVER_NAME}:", "O D D O N E O U T").also { stage++ }
+ 1 -> player(FacialExpression.THINKING, "I'm sure I didn't ask to take part in a quiz show...").also { stage++ }
+ 2 -> npc(FacialExpression.FRIENDLY,"Please welcome our newest contestant:", "${player?.username}!", "Just pick the O D D O N E O U T.", "Four questions right, and then you win!").also { stage++ }
+ 3 -> {
+ setAttribute(player!!, QUIZMASTER_ATTRIBUTE_RANDOM_ANSWER, randomQuestion(player!!))
+ player!!.interfaceManager.openChatbox(QUIZMASTER_INTERFACE)
+ stage++
+ }
+ 4-> {
+ 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) {
+ npc(FacialExpression.FRIENDLY,"CONGRATULATIONS!", "You are a WINNER!", "Please choose your PRIZE!")
+ stage = 5
+ } else {
+ npc(FacialExpression.FRIENDLY,"Wow, you're a smart one!", "You're absolutely RIGHT!", "Okay, next question!")
+ stage = 3
+ }
+ } else {
+ // Wrong Answer
+ npc(FacialExpression.FRIENDLY,"WRONG!", "That's just WRONG!", "Okay, next question!")
+ stage = 3
+ }
+ }
+ // Random Item should be "Mystery Box", but the current MYSTERY_BOX_6199 is already inauthentically used by Giftmas.
+ 5 -> options("1000 Coins", "Random Item").also { stage++ }
+ 6 -> {
+ resetAnimator(player!!)
+ returnPlayer(player!!)
+ when (buttonID) {
+ 1 -> {
+ queueScript(player!!, 0, QueueStrength.SOFT) { stage: Int ->
+ addItemOrDrop(player!!, Items.COINS_995, 1000)
+ return@queueScript stopExecuting(player!!)
+ }
+ }
+ 2 -> {
+ queueScript(player!!, 0, QueueStrength.SOFT) { stage: Int ->
+ addItemOrDrop(player!!, tableRoll.roll()[0].id)
+ return@queueScript stopExecuting(player!!)
+ }
+ }
+ }
+ removeAttributes(player!!, QUIZMASTER_ATTRIBUTE_QUESTIONS_CORRECT, QUIZMASTER_ATTRIBUTE_RANDOM_ANSWER)
+ stage = END_DIALOGUE
+ end()
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/quizmaster/QuizMasterNPC.kt b/Server/src/main/content/global/ame/events/quizmaster/QuizMasterNPC.kt
new file mode 100644
index 000000000..26407a1dc
--- /dev/null
+++ b/Server/src/main/content/global/ame/events/quizmaster/QuizMasterNPC.kt
@@ -0,0 +1,65 @@
+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.interaction.QueueStrength
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.link.TeleportManager
+import core.game.system.timer.impl.AntiMacro
+import core.game.world.map.Location
+import core.game.world.update.flag.context.Graphics
+import org.rs09.consts.NPCs
+import org.rs09.consts.Sounds
+
+/**
+ * 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!")
+ queueScript(player, 4, 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 -> {
+ kidnapPlayer(player, Location(1952, 4764, 1), TeleportManager.TeleportType.INSTANT)
+ setAttribute(player, QuizMasterDialogueFile.QUIZMASTER_ATTRIBUTE_QUESTIONS_CORRECT, 0)
+ AntiMacro.terminateEventNpc(player)
+ sendGraphics(Graphics(1577, 0, 0), player.location)
+ animate(player,8941)
+ 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.
+ return@queueScript delayScript(player, 6)
+ }
+ 2 -> {
+ face(player, Location(1952, 4768, 1))
+ animate(player,2378)
+ // This is not needed as when you enter the QuizMasterBorders, it should fire off the dialogue
+ // openDialogue(player, QuizMasterDialogueFile(), this.asNpc())
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
+
+ }
+ }
+
+ override fun talkTo(npc: NPC) {
+ openDialogue(player, QuizMasterDialogueFile(), this.asNpc())
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/rivertroll/RiverTrollRENPC.kt b/Server/src/main/content/global/ame/events/rivertroll/RiverTrollRENPC.kt
index b69ec7abe..dff28d7e9 100644
--- a/Server/src/main/content/global/ame/events/rivertroll/RiverTrollRENPC.kt
+++ b/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!")
diff --git a/Server/src/main/content/global/ame/events/rockgolem/RockGolemRENPC.kt b/Server/src/main/content/global/ame/events/rockgolem/RockGolemRENPC.kt
index 82fda9bf4..eb3399657 100644
--- a/Server/src/main/content/global/ame/events/rockgolem/RockGolemRENPC.kt
+++ b/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!")
diff --git a/Server/src/main/content/global/ame/events/shade/ShadeRENPC.kt b/Server/src/main/content/global/ame/events/shade/ShadeRENPC.kt
index 4d991afdf..60a0f57ae 100644
--- a/Server/src/main/content/global/ame/events/shade/ShadeRENPC.kt
+++ b/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!")
diff --git a/Server/src/main/content/global/ame/events/strangeplant/StrangePlantBehavior.kt b/Server/src/main/content/global/ame/events/strangeplant/StrangePlantBehavior.kt
index cd80ad3d9..0491e01bc 100644
--- a/Server/src/main/content/global/ame/events/strangeplant/StrangePlantBehavior.kt
+++ b/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())
}
-}
\ No newline at end of file
+
+ override fun getXpMultiplier(self: NPC, attacker: Entity): Double {
+ return super.getXpMultiplier(self, attacker) / 16.0
+ }
+}
diff --git a/Server/src/main/content/global/ame/events/supriseexam/MordautDialogue.kt b/Server/src/main/content/global/ame/events/surpriseexam/MordautDialogue.kt
similarity index 98%
rename from Server/src/main/content/global/ame/events/supriseexam/MordautDialogue.kt
rename to Server/src/main/content/global/ame/events/surpriseexam/MordautDialogue.kt
index ca0e61c3f..d3bd04af0 100644
--- a/Server/src/main/content/global/ame/events/supriseexam/MordautDialogue.kt
+++ b/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
diff --git a/Server/src/main/content/global/ame/events/MysteriousOldManDialogue.kt b/Server/src/main/content/global/ame/events/surpriseexam/MysteriousOldManDialogue.kt
similarity index 94%
rename from Server/src/main/content/global/ame/events/MysteriousOldManDialogue.kt
rename to Server/src/main/content/global/ame/events/surpriseexam/MysteriousOldManDialogue.kt
index 628a3c8f0..1415317a6 100644
--- a/Server/src/main/content/global/ame/events/MysteriousOldManDialogue.kt
+++ b/Server/src/main/content/global/ame/events/surpriseexam/MysteriousOldManDialogue.kt
@@ -1,7 +1,7 @@
package content.global.ame.events
import core.game.node.entity.player.Player
-import content.global.ame.events.supriseexam.SurpriseExamUtils
+import content.global.ame.events.surpriseexam.SurpriseExamUtils
import core.game.dialogue.DialogueFile
import core.game.system.timer.impl.AntiMacro
diff --git a/Server/src/main/content/global/ame/events/MysteriousOldManNPC.kt b/Server/src/main/content/global/ame/events/surpriseexam/MysteriousOldManNPC.kt
similarity index 100%
rename from Server/src/main/content/global/ame/events/MysteriousOldManNPC.kt
rename to Server/src/main/content/global/ame/events/surpriseexam/MysteriousOldManNPC.kt
diff --git a/Server/src/main/content/global/ame/events/supriseexam/SEDoorDialogue.kt b/Server/src/main/content/global/ame/events/surpriseexam/SEDoorDialogue.kt
similarity index 90%
rename from Server/src/main/content/global/ame/events/supriseexam/SEDoorDialogue.kt
rename to Server/src/main/content/global/ame/events/surpriseexam/SEDoorDialogue.kt
index 3fffea71b..221f4b4fe 100644
--- a/Server/src/main/content/global/ame/events/supriseexam/SEDoorDialogue.kt
+++ b/Server/src/main/content/global/ame/events/surpriseexam/SEDoorDialogue.kt
@@ -1,4 +1,4 @@
-package content.global.ame.events.supriseexam
+package content.global.ame.events.surpriseexam
import core.game.dialogue.DialogueFile
import core.tools.END_DIALOGUE
diff --git a/Server/src/main/content/global/ame/events/supriseexam/SEPatternInterface.kt b/Server/src/main/content/global/ame/events/surpriseexam/SEPatternInterface.kt
similarity index 96%
rename from Server/src/main/content/global/ame/events/supriseexam/SEPatternInterface.kt
rename to Server/src/main/content/global/ame/events/surpriseexam/SEPatternInterface.kt
index e445c5145..3ba12a8c0 100644
--- a/Server/src/main/content/global/ame/events/supriseexam/SEPatternInterface.kt
+++ b/Server/src/main/content/global/ame/events/surpriseexam/SEPatternInterface.kt
@@ -1,4 +1,4 @@
-package content.global.ame.events.supriseexam
+package content.global.ame.events.surpriseexam
import core.game.node.entity.npc.NPC
import org.rs09.consts.Components
diff --git a/Server/src/main/content/global/ame/events/supriseexam/SupriseExamListeners.kt b/Server/src/main/content/global/ame/events/surpriseexam/SupriseExamListeners.kt
similarity index 59%
rename from Server/src/main/content/global/ame/events/supriseexam/SupriseExamListeners.kt
rename to Server/src/main/content/global/ame/events/surpriseexam/SupriseExamListeners.kt
index 6629982fa..6d8ad6b4f 100644
--- a/Server/src/main/content/global/ame/events/supriseexam/SupriseExamListeners.kt
+++ b/Server/src/main/content/global/ame/events/surpriseexam/SupriseExamListeners.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.node.entity.player.Player
@@ -9,20 +9,22 @@ import org.rs09.consts.NPCs
import core.game.interaction.InteractionListener
import core.game.interaction.IntType
import content.global.handlers.iface.ExperienceInterface
+import core.api.MapArea
+import core.api.removeItem
+import core.game.world.map.zone.ZoneBorders
+import core.game.world.map.zone.ZoneRestriction
-class SupriseExamListeners : InteractionListener {
- val MORDAUT = NPCs.MR_MORDAUT_6117
- val BOOK_OF_KNOWLEDGE = Items.BOOK_OF_KNOWLEDGE_11640
+class SupriseExamListeners : InteractionListener, MapArea {
override fun defineListeners() {
- on(MORDAUT, IntType.NPC, "talk-to"){ player, node ->
+ on(NPCs.MR_MORDAUT_6117, IntType.NPC, "talk-to") { player, node ->
player.faceLocation(Location.create(1886, 5024, 0))
- val examComplete = player.getAttribute(SurpriseExamUtils.SE_KEY_CORRECT,0) == 3
- player.dialogueInterpreter.open(MordautDialogue(examComplete),node.asNpc())
+ val examComplete = player.getAttribute(SurpriseExamUtils.SE_KEY_CORRECT, 0) == 3
+ player.dialogueInterpreter.open(MordautDialogue(examComplete), node.asNpc())
return@on true
}
- on(SurpriseExamUtils.SE_DOORS, IntType.SCENERY, "open"){ player, node ->
+ on(SurpriseExamUtils.SE_DOORS, IntType.SCENERY, "open") { player, node ->
val correctDoor = player.getAttribute(SurpriseExamUtils.SE_DOOR_KEY,-1)
if(correctDoor == -1){
@@ -39,9 +41,9 @@ class SupriseExamListeners : InteractionListener {
return@on true
}
- on(BOOK_OF_KNOWLEDGE, IntType.ITEM, "read"){ player, _ ->
- player.setAttribute("caller"){skill: Int,p: Player ->
- if(p.inventory.remove(Item(BOOK_OF_KNOWLEDGE))) {
+ on(Items.BOOK_OF_KNOWLEDGE_11640, IntType.ITEM, "read") { player, _ ->
+ player.setAttribute("caller") { skill: Int, p: Player ->
+ if (removeItem(p, Items.BOOK_OF_KNOWLEDGE_11640)) {
val level = p.skills.getStaticLevel(skill)
val experience = level * 15.0
p.skills.addExperience(skill, experience)
@@ -54,8 +56,16 @@ class SupriseExamListeners : InteractionListener {
}
override fun defineDestinationOverrides() {
- setDest(IntType.NPC,MORDAUT){ _, _ ->
+ setDest(IntType.NPC, NPCs.MR_MORDAUT_6117) { _, _ ->
return@setDest Location.create(1886, 5025, 0)
}
}
-}
\ No newline at end of file
+
+ override fun defineAreaBorders(): Array {
+ return arrayOf(ZoneBorders.forRegion(7502))
+ }
+
+ override fun getRestrictions(): Array {
+ return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS, ZoneRestriction.OFF_MAP)
+ }
+}
diff --git a/Server/src/main/content/global/ame/events/supriseexam/SurpriseExamUtils.kt b/Server/src/main/content/global/ame/events/surpriseexam/SurpriseExamUtils.kt
similarity index 69%
rename from Server/src/main/content/global/ame/events/supriseexam/SurpriseExamUtils.kt
rename to Server/src/main/content/global/ame/events/surpriseexam/SurpriseExamUtils.kt
index ca0d405f6..01a722343 100644
--- a/Server/src/main/content/global/ame/events/supriseexam/SurpriseExamUtils.kt
+++ b/Server/src/main/content/global/ame/events/surpriseexam/SurpriseExamUtils.kt
@@ -1,21 +1,18 @@
-package content.global.ame.events.supriseexam
+package content.global.ame.events.surpriseexam
+import content.global.ame.kidnapPlayer
+import content.global.ame.returnPlayer
import core.api.*
import core.game.node.entity.impl.PulseType
import core.game.node.entity.player.Player
-import core.game.node.item.GroundItemManager
-import core.game.node.item.Item
import core.game.system.task.Pulse
import core.game.world.map.Location
import org.rs09.consts.Components
import org.rs09.consts.Items
-import core.ServerConstants
+import core.game.node.entity.player.link.TeleportManager
object SurpriseExamUtils {
-
- val SE_KEY_LOC = "/save:original-loc"
val SE_KEY_INDEX = "supexam:index"
- val SE_LOGOUT_KEY = "suprise_exam"
val SE_DOOR_KEY = "supexam:door"
val INTER_PATTERN_CHILDS = intArrayOf(6,7,8)
val INTER_OPTION_CHILDS = intArrayOf(10,11,12,13)
@@ -29,28 +26,16 @@ object SurpriseExamUtils {
intArrayOf(Items.FLY_FISHING_ROD_309,Items.BARBARIAN_ROD_11323,Items.SMALL_FISHING_NET_303,Items.HARPOON_311)
)
- fun teleport(player: Player){
- player.setAttribute(SE_KEY_LOC,player.location)
-
- registerLogoutListener(player, SE_LOGOUT_KEY){p ->
- p.location = getAttribute(p, SE_KEY_LOC, ServerConstants.HOME_LOCATION)
- }
-
- player.properties.teleportLocation = Location.create(1886, 5025, 0)
+ fun teleport(player: Player) {
+ kidnapPlayer(player, Location.create(1886, 5025, 0), TeleportManager.TeleportType.INSTANT)
}
fun cleanup(player: Player){
- player.properties.teleportLocation = player.getAttribute(SE_KEY_LOC,null)
- clearLogoutListener(player, SE_LOGOUT_KEY)
- player.removeAttribute(SE_KEY_LOC)
- player.removeAttribute(SE_KEY_INDEX)
- player.removeAttribute(SE_KEY_CORRECT)
+ returnPlayer(player)
+ removeAttributes(player, SE_KEY_INDEX, SE_KEY_CORRECT)
player.pulseManager.run(object : Pulse(2){
override fun pulse(): Boolean {
- val reward = Item(Items.BOOK_OF_KNOWLEDGE_11640)
- if(!player.inventory.add(reward)){
- GroundItemManager.create(reward,player)
- }
+ addItemOrDrop(player, Items.BOOK_OF_KNOWLEDGE_11640)
return true
}
}, PulseType.CUSTOM_1)
diff --git a/Server/src/main/content/global/ame/events/treespirit/TreeSpiritRENPC.kt b/Server/src/main/content/global/ame/events/treespirit/TreeSpiritRENPC.kt
index 2e4fb3436..3b0033972 100644
--- a/Server/src/main/content/global/ame/events/treespirit/TreeSpiritRENPC.kt
+++ b/Server/src/main/content/global/ame/events/treespirit/TreeSpiritRENPC.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 = 438..443
+val ids = (438..443).toList()
class TreeSpiritRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(438){
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("Leave these woods and never return!")
diff --git a/Server/src/main/content/global/ame/events/zombie/ZombieRENPC.kt b/Server/src/main/content/global/ame/events/zombie/ZombieRENPC.kt
index 230d85ee8..6b43d54b4 100644
--- a/Server/src/main/content/global/ame/events/zombie/ZombieRENPC.kt
+++ b/Server/src/main/content/global/ame/events/zombie/ZombieRENPC.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 ZombieRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(419){
val ids = (419..424).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("Brainsssss!")
diff --git a/Server/src/main/content/global/bots/Adventurer.kt b/Server/src/main/content/global/bots/Adventurer.kt
index a6c69e8e1..916503945 100644
--- a/Server/src/main/content/global/bots/Adventurer.kt
+++ b/Server/src/main/content/global/bots/Adventurer.kt
@@ -12,15 +12,16 @@ import core.game.world.map.Location
import core.game.world.map.RegionManager
import core.game.world.map.zone.ZoneBorders
import core.game.world.update.flag.*
-import core.tools.RandomFunction
import org.json.simple.JSONArray
import org.json.simple.JSONObject
import core.ServerConstants
+import core.api.log
import core.game.bots.AIRepository
import core.game.bots.CombatBotAssembler
import core.game.bots.Script
import core.game.interaction.IntType
import core.game.interaction.InteractionListeners
+import core.tools.Log
import java.io.File
import java.io.FileReader
import java.time.LocalDateTime
@@ -40,21 +41,27 @@ import kotlin.random.Random
* @author Ceikry
*/
-//Adventure Bots v4.0.0 -Expansion Edition-
+// Adventure Bots v1.1.0 : Expansion Edition (Previously v4.0.0)
+// Super Grand Exchange Update
class Adventurer(val style: CombatStyle): Script() {
var city: Location = lumbridge
- var ticks = 0
- var freshspawn = true
- var sold = false
- private val geloc: Location = if (Random.nextBoolean()){
- Location.create(3165, 3487, 0)
- }else{
- Location.create(3164, 3492, 0)
- }
+ var poiloc: Location = karamja
+ var geSocialLoc: Location = getRandomGESocialLocation()
+ var geClerkLoc: Location = getRandomGELocation()
+ var geClerksloc: Location = neGEClerk
+ var freshspawn: Boolean = true
+ var sold: Boolean = false
+ var poi: Boolean = false
+
+ val chance: Int = if (cityLocationsGE.contains(city)) 3500 else 3000
+ var ticks: Int = 0
var counter: Int = 0
- var random: Int = (5..30).random()
+ val waitTotal: Int = 8
+ var returnToAdventure: Int = 0
+ var geWait: Int = 0
+ var geLongWait: Int = 0
val type = when(style){
CombatStyle.MELEE -> CombatBotAssembler.Type.MELEE
@@ -74,23 +81,81 @@ class Adventurer(val style: CombatStyle): Script() {
}
override fun toString(): String {
- return "${bot.name} is an Adventurer bot at ${bot.location}! State: $state - City: $city"
+ return "${bot.username} is an Adventurer bot " +
+ "at ${bot.location}! " +
+ "State: $state - " +
+ "City: $city - " +
+ "Ticks: $ticks - " +
+ "Freshspawn: $freshspawn - " +
+ "Sold: $sold - " +
+ "Counter: $counter"
}
var state = State.START
- fun getRandomCity(): Location{
+ private fun getRandomCity(): Location{
return cities.random()
}
- fun getRandomPoi(): Location{
+ private fun getRandomPoi(): Location{
return pois.random()
}
+ private fun getRandomGESocialLocation(): Location{
+ return socialLocationsGE.random()
+ }
+
+ private fun getRandomGELocation(): Location {
+ return cityLocationsGE.random()
+ }
+
+ private fun randomNumberFromOne(maxInt: Int): Int {
+ return Random.nextInt(0, maxInt)
+ }
+
+ private fun otherPlayersNearby(): Boolean {
+ val localPlayers = RegionManager.getLocalPlayers(bot)
+ val otherPlayers = localPlayers.filter { it.name != bot.name }
+ return otherPlayers.isNotEmpty()
+ }
+
+ private fun checkNearBank() {
+ if(bankMap[city] == null){
+ scriptAPI.teleport(getRandomCity().also { city = it })
+ } else {
+ if(bankMap[city]?.insideBorder(bot) == true){
+ state = State.FIND_BANK
+ } else {
+ bankMap[city]?.let { scriptAPI.walkTo(it.randomLoc) }
+ }
+ }
+ }
+
+ private fun checkCounter(maxCounter: Int) {
+ if (counter++ >= maxCounter) {
+ state = State.TELEPORTING
+ }
+ }
+
+ private fun teleportToRandomCity() {
+ city = getRandomCity()
+ when (city) {
+ neGEClerk -> { scriptAPI.teleport(scriptAPI.randomizeLocationInRanges(city,-3,2,0,1,0)) }
+ swGEClerk -> { scriptAPI.teleport(scriptAPI.randomizeLocationInRanges(city,-2,3,-1,0,0)) }
+ nwGEBanker -> { scriptAPI.teleport(scriptAPI.randomizeLocationInRanges(city,-2,0,-3,2,0)) }
+ seGEBanker -> { scriptAPI.teleport(scriptAPI.randomizeLocationInRanges(city,0,2,-2,3,0)) }
+ else -> { scriptAPI.teleport(scriptAPI.randomizeLocationInRanges(city,-1,1,-1,1,0)) }
+ }
+ }
+
+ val resources = listOf(
+ "Rocks","Tree","Oak","Willow",
+ "Maple tree","Yew","Magic tree",
+ "Teak","Mahogany")
+
//TODO: Optimise and adjust how bots handle picking up ground items further.
fun immerse() {
- if (counter++ == 180) {state = State.TELEPORTING
- }
+ if (counter++ >= Random.nextInt(150,300)) { state = State.TELEPORTING }
val items = AIRepository.groundItems[bot]
if (Random.nextBoolean()) {
if (items.isNullOrEmpty()) {
@@ -98,33 +163,13 @@ class Adventurer(val style: CombatStyle): Script() {
state = State.LOOT_DELAY
}
if (bot.inventory.isFull) {
- if(bankMap[city] == null){
- scriptAPI.teleport(getRandomCity().also { city = it })
- } else {
- if(bankMap[city]?.insideBorder(bot) == true){
- state = State.FIND_BANK
- } else {
- scriptAPI.walkTo(bankMap[city]?.randomLoc ?: Location(0, 0, 0))
- }
- }
+ checkNearBank()
}
} else {
if (bot.inventory.isFull){
- if(bankMap[city] == null){
- scriptAPI.teleport(getRandomCity().also { city = it })
- } else {
- if(bankMap[city]?.insideBorder(bot) == true){
- state = State.FIND_BANK
- } else {
- scriptAPI.walkTo(bankMap[city]?.randomLoc ?: Location(0, 0, 0))
- }
- }
+ checkNearBank()
} else {
- val resources = listOf(
- "Rocks","Tree","Oak","Willow",
- "Maple tree","Yew","Magic tree",
- "Teak","Mahogany")
val resource = scriptAPI.getNearestNodeFromList(resources,true)
if(resource != null){
if(resource.name.contains("ocks")) InteractionListeners.run(resource.id,
@@ -137,18 +182,17 @@ class Adventurer(val style: CombatStyle): Script() {
}
fun refresh() {
+// log(this::class.java, Log.WARN, "${bot.username} refreshed from $state at $city with $ticks and $counter counter.")
scriptAPI.teleport(lumbridge)
- freshspawn = true
state = State.START
}
- var poi = false
- var poiloc = karamja
-
//Adventure Bots Actual Code STARTS HERE!!!
+ // 100 ticks = 60 seconds
override fun tick() {
ticks++
- if (ticks++ >= 800) {
+ // Hard refresh
+ if (ticks >= 1000) {
ticks = 0
refresh()
return
@@ -186,49 +230,42 @@ class Adventurer(val style: CombatStyle): Script() {
}
return
} else {
- state = State.EXPLORE
+ state = State.ADVENTURE
}
}
State.START -> {
if (freshspawn) {
freshspawn = false
- scriptAPI.randomWalkTo(lumbridge, 20)
+ scriptAPI.randomWalkTo(lumbridge, randomNumberFromOne(25))
} else {
- city = getRandomCity()
state = State.TELEPORTING
}
}
State.TELEPORTING -> {
+ if (freshspawn){ freshspawn = false }
+ teleportToRandomCity()
+ poi = false
+ sold = false
ticks = 0
counter = 0
- if (bot.location != city) {
- poi = false
- scriptAPI.teleport(city)
- } else {
- poi = false
- state = State.EXPLORE
- }
+ state = State.ADVENTURE
+ return
}
- State.EXPLORE -> {
- if (counter++ == 350) {
- state = State.TELEPORTING
- }
-
- val chance = if (city == ge || city == ge2) 5000 else 2500
- if (RandomFunction.random(chance) <= 10) {
- val nearbyPlayers = RegionManager.getLocalPlayers(bot)
- if (nearbyPlayers.isNotEmpty()) {
+ State.ADVENTURE -> {
+ checkCounter(800)
+ if (randomNumberFromOne(chance) <= 10) {
+ if (otherPlayersNearby()) {
ticks = 0
dialogue()
}
}
- if (RandomFunction.random(1000) <= 150 && !poi) {
- val roamDistance = if (city != ge && city != ge2) 225 else 7
- if ((city == ge || city == ge2) && RandomFunction.random(100) < 90) {
+ if (!poi && randomNumberFromOne(1000) <= 75) {
+ val roamDistance = if (!cityLocationsGE.contains(city)) 225 else randomNumberFromOne(5)
+ if (cityLocationsGE.contains(city) && randomNumberFromOne(100) < 90) {
if (!bot.bank.isEmpty) {
state = State.FIND_GE
}
@@ -238,33 +275,46 @@ class Adventurer(val style: CombatStyle): Script() {
return
}
- if (RandomFunction.random(1000) <= 50 && poi){
+ if (poi && randomNumberFromOne(1000) <= 100){
+ immerse()
+ return
+ }
+
+ if (poi && randomNumberFromOne(1000) <= 25){
+ dialogue()
+ }
+
+ if (poi && randomNumberFromOne(1000) <= 50){
val roamDistancePoi = when(poiloc){
- teakfarm, crawlinghands -> 5
- treegnome -> 50
- isafdar -> 40
- eaglespeek -> 40
- keldagrimout -> 30
- teak1 -> 30
- miningguild -> 5
- magics, coal -> 7
gemrocks, chaosnpc, chaosnpc2 -> 1
+ magics, coalTrucks -> 7
+ miningguild, teakfarm, crawlinghands -> 5
+ varLumberYard -> 20
+ keldagrimout, teak1 -> 30
+ eaglespeek, isafdar -> 40
+ treegnome -> 50
else -> 60
}
scriptAPI.randomWalkTo(poiloc,roamDistancePoi)
return
}
- if (RandomFunction.random(1000) <= 75) {
- if (city != ge && city != ge2) {
+ if (randomNumberFromOne(1000) <= 75) {
+ if (!cityLocationsGE.contains(city)) {
+ ticks = 0
immerse()
return
- } else {
- return
+ } else if (randomNumberFromOne(chance) <= 55 && otherPlayersNearby()) {
+ ticks = 0
+ dialogue()
}
}
- if (RandomFunction.random(20000) <= 60 && !poi) {
+ if (cityLocationsGE.contains(city) && randomNumberFromOne(1000) <= 50) {
+ state = State.IDLE_GE
+ }
+
+ if (!poi && randomNumberFromOne(1000) <= 5) {
poiloc = getRandomPoi()
city = teak1
poi = true
@@ -272,26 +322,24 @@ class Adventurer(val style: CombatStyle): Script() {
return
}
- if ((city == ge || city == ge2) && RandomFunction.random(1000) >= 999) {
- ticks = 0
- city = getRandomCity()
+ if (cityLocationsGE.contains(city) && randomNumberFromOne(1000) <= 100) {
state = State.TELEPORTING
- }
-
- if (city == ge || city == ge2) {
return
}
- if (city == teak1 && counter++ >= 240){
- city = getRandomCity()
- state = State.TELEPORTING
+ if (cityLocationsGE.contains(city)) {
+ return
}
- if (counter++ >= 240 && RandomFunction.random(100) >= 10) {
+ if (poi && randomNumberFromOne(1000) <= 20){
+ state = State.TELEPORTING
+ return
+ }
+
+ if (counter++ >= 750 && randomNumberFromOne(100) <= 50) {
+// log(this::class.java, Log.FINE, "${bot.username} has moved on to a different city at $ticks ticks and $counter counter.")
city = getRandomCity()
- if (RandomFunction.random(100) % 2 == 0) {
- counter = 0
- ticks = 0
+ if (randomNumberFromOne(100) % 2 == 0) {
state = State.TELEPORTING
} else {
if (citygroupA.contains(city)) {
@@ -309,122 +357,122 @@ class Adventurer(val style: CombatStyle): Script() {
return
}
- State.GE -> {
- var ge = false
- if (counter++ == 180) {
- state = State.TELEPORTING
- }
- if (!sold) {
- if (counter++ >= 15) {
- sold = true
- ge = true
+ State.IDLE_GE -> {
+ returnToAdventure = Random.nextInt(350, 750)
+ if (counter++ >= returnToAdventure){
+ if (randomNumberFromOne(100) <= 25){
+ ticks = 0
+ counter = 0
+ poiloc = getRandomPoi()
+ city = teak1
+ poi = true
+ scriptAPI.teleport(poiloc)
+ state = State.ADVENTURE
+ return
+ } else {
counter = 0
ticks = 0
- scriptAPI.sellAllOnGeAdv()
+ state = State.TELEPORTING
+ return
+ }
+ }
+ if (cityLocationsGE.contains(city)){
+ if (randomNumberFromOne(1000) <= 5) {
+ ticks = 0
+ geSocialLoc = scriptAPI.randomizeLocationInRanges(getRandomGESocialLocation(),-1,1,-1,1,0)
+ } else if (randomNumberFromOne(1000) <= 10) {
+ ticks = 0
+ scriptAPI.randomWalkTo(geSocialLoc, randomNumberFromOne(5))
+ return
+ }
+ if (randomNumberFromOne(1000) <= 5 && otherPlayersNearby()){
+ ticks = 0
+ dialogue()
+ } else if (randomNumberFromOne(1000) <= 250){
return
}
- } else if (ge && sold) {
- ge = false
- city = getRandomCity()
- state = State.TELEPORTING
}
return
}
State.FIND_GE -> {
- if (counter++ == 180) {
- state = State.TELEPORTING
- }
sold = false
val ge: Scenery? = scriptAPI.getNearestNode("Desk", true) as Scenery?
- if (ge == null || bot.bank.isEmpty) state = State.EXPLORE
+ if (ge == null || bot.bank.isEmpty) state = State.ADVENTURE
class GEPulse : MovementPulse(bot, ge, DestinationFlag.OBJECT) {
override fun pulse(): Boolean {
bot.faceLocation(ge?.location)
- state = State.GE
- return true
+ return true.also { state = State.GE }
}
}
+ if (ge == null || bot.bank.isEmpty) state = State.ADVENTURE
if (ge != null && !bot.bank.isEmpty) {
- counter = 0
- scriptAPI.randomWalkTo(geloc, 3)
- GameWorld.Pulser.submit(GEPulse())
+ if (randomNumberFromOne(1000) <= 25 && otherPlayersNearby()){
+ dialogue()
+ scriptAPI.randomWalkTo(geSocialLoc, randomNumberFromOne(5))
+ } else if (randomNumberFromOne(500) <= 50) {
+ GameWorld.Pulser.submit(GEPulse())
+ }
}
+ checkCounter(500)
+ return
+ }
+
+ State.GE -> {
+ geClerksloc = clerkLocationsGe.random()
+ geWait = Random.nextInt(35, 100)
+ geLongWait = Random.nextInt(350, 750)
+ if (!sold) {
+ if (randomNumberFromOne(500) <= 25){ scriptAPI.randomWalkTo(geClerksloc, randomNumberFromOne(4))}
+ if (counter++ >= geWait) {
+ scriptAPI.randomWalkTo(geClerksloc, randomNumberFromOne(1))
+ sold = true
+ counter = 0
+ ticks = 0
+ scriptAPI.sellAllOnGeAdv()
+ state = State.TELEPORTING
+ return
+ }
+ } else if (counter++ >= geLongWait) {
+ state = State.TELEPORTING
+ return
+ }
+ checkCounter(1000)
return
}
State.FIND_BANK -> {
- if (counter++ == 300) {
- state = State.TELEPORTING
- }
val bank: Scenery? = scriptAPI.getNearestNode("Bank booth", true) as Scenery?
- if (badedge.insideBorder(bot) || bot.location == badedge2 || bot.location == badedge3 || bot.location == badedge4) {
- bot.randomWalk(5, 5)
- }
- if (bank == null) state = State.EXPLORE
- class BankingPulse : MovementPulse(bot, bank, DestinationFlag.OBJECT) {
- override fun pulse(): Boolean {
- bot.faceLocation(bank?.location)
- state = State.IDLE_BANKS
- return true
- }
- }
- if (bank != null) {
- bot.pulseManager.run(BankingPulse())
+ if (bank == null) { state = State.TELEPORTING }
+ if (bank != null && randomNumberFromOne(100) <= 5) {
+ scriptAPI.depositAtBank()
+ } else if (bank != null && randomNumberFromOne(100) <= 5){
+ scriptAPI.randomWalkTo(bank.location,3)
}
+ checkCounter(500)
return
}
- State.IDLE_BANKS -> {
- if (counter++ == 300) {
- state = State.TELEPORTING
- }
- if (RandomFunction.random(1000) < 100) {
- for (item in bot.inventory.toArray()) {
- item ?: continue
- when (item.id) {
- 1359, 590, 1271, 995 -> continue
- }
- bot.bank.add(item)
- bot.inventory.remove(item)
- }
- counter = 0
- state = State.EXPLORE
- }
- return
- }
State.FIND_CITY -> {
- if (counter++ >= 600 || (city == ge || city == ge2)) {
- counter = 0
+ if (counter++ >= 500 || cityLocationsGE.contains(city)){
scriptAPI.teleport(getRandomCity().also { city = it })
- state = State.EXPLORE
+ state = State.ADVENTURE
}
if (bot.location.equals(city)) {
- state = State.EXPLORE
+ state = State.ADVENTURE
} else {
- scriptAPI.randomWalkTo(city, 5)
+ scriptAPI.randomWalkTo(city, randomNumberFromOne(10))
}
+ checkCounter(600)
return
}
- State.IDLE_CITY -> {
- if (counter++ == 300) {
- state = State.TELEPORTING
- }
- var random = (120..300).random()
- if (counter++ == random && RandomFunction.random(1000) % 33 == 0) {
- counter = 0
- state = State.EXPLORE
- }
- return
- }
}
}
fun dialogue() {
- val localPlayer = RegionManager.getLocalPlayers(bot).random()
val until = 1225 - dateCode
val lineStd = dialogue.getLines("standard").rand()
var lineAlt = ""
@@ -455,20 +503,29 @@ class Adventurer(val style: CombatStyle): Script() {
dateCode == 404 -> lineAlt = dialogue.getLines("easter").rand()
}
- val chat = if (lineAlt.isNotEmpty() && Random.nextBoolean()) { lineAlt } else { lineStd }
- .replace("@name", localPlayer.username)
- .replace("@timer", until.toString())
-
- scriptAPI.sendChat(chat)
+ var localPlayers = RegionManager.getLocalPlayers(bot)
+ if (localPlayers.isNotEmpty()) {
+ val localPlayer = localPlayers
+ .filter { it.name != bot.name }
+ .randomOrNull()
+ if (localPlayer != null) {
+ val chat = if (lineAlt.isNotEmpty() && Random.nextBoolean()) { lineAlt } else { lineStd }
+ .replace("@name", localPlayer.username)
+ .replace("@timer", until.toString())
+ scriptAPI.sendChat(chat)
+ } else {
+ val chat = if (lineAlt.isNotEmpty() && Random.nextBoolean()) { lineAlt } else { lineStd }
+ scriptAPI.sendChat(chat)
+ }
+ }
}
enum class State{
START,
- EXPLORE,
+ ADVENTURE,
FIND_BANK,
- IDLE_BANKS,
FIND_CITY,
- IDLE_CITY,
+ IDLE_GE,
GE,
TELEPORTING,
LOOT,
@@ -489,44 +546,94 @@ class Adventurer(val style: CombatStyle): Script() {
}
companion object {
- val badedge = ZoneBorders(3094, 3494, 3096, 3497)
- val badedge2 = Location.create(3094, 3492, 0)
- val badedge3 = Location.create(3094, 3490, 0)
- val badedge4 = Location.create(3094, 3494, 0)
-
+ // Start Cities
val yanille: Location = Location.create(2615, 3104, 0)
val ardougne: Location = Location.create(2662, 3304, 0)
val seers: Location = Location.create(2726, 3485, 0)
val edgeville: Location = Location.create(3088, 3486, 0)
- val ge: Location = Location.create(3168, 3487, 0)
- val ge2: Location = Location.create(3161, 3493, 0)
val catherby: Location = Location.create(2809, 3435, 0)
val falador: Location = Location.create(2965, 3380, 0)
val varrock: Location = Location.create(3213, 3428, 0)
val draynor: Location = Location.create(3080, 3250, 0)
val rimmington: Location = Location.create(2977, 3239, 0)
val lumbridge: Location = Location.create(3222, 3219, 0)
- val karamja = Location.create(2849, 3033, 0)
- val alkharid = Location.create(3297, 3219, 0)
- val feldiphills = Location.create(2535, 2919, 0)
- val isafdar = Location.create(2241, 3217, 0)
- val eaglespeek = Location.create(2333, 3579, 0)
- val canafis = Location.create(3492, 3485, 0)
- val treegnome = Location.create(2437, 3441, 0)
- val teak1 = Location.create(2334, 3048, 0)
- val teakfarm = Location.create(2825, 3085, 0)
- val keldagrimout = Location.create(2724,3692,0)
- val miningguild = Location.create(3046,9740,0)
- val magics = Location.create(2285,3146,0)
- val coal = Location.create(2581,3481,0)
- val crawlinghands = Location.create(3422,3548,0)
- val gemrocks = Location.create(2825,2997,0)
- val chaosnpc = Location.create(2612,9484,0)
- val chaosnpc2 = Location.create(2580,9501,0)
- val taverly = Location.create(2909, 3436, 0)
+ val karamja: Location = Location.create(2849, 3033, 0)
+ val alkharid: Location = Location.create(3297, 3219, 0)
+
+ // Start POI
+ val feldiphills: Location = Location.create(2535, 2919, 0)
+ val isafdar: Location = Location.create(2241, 3217, 0)
+ val eaglespeek: Location = Location.create(2333, 3579, 0)
+ val canafis: Location = Location.create(3492, 3485, 0)
+ val treegnome: Location = Location.create(2437, 3441, 0)
+ val teak1: Location = Location.create(2334, 3048, 0)
+ val teakfarm: Location = Location.create(2825, 3085, 0)
+ val keldagrimout: Location = Location.create(2724,3692, 0)
+ val miningguild: Location = Location.create(3046,9740, 0)
+ val magics: Location = Location.create(2285,3146, 0)
+ val coalTrucks: Location = Location.create(2581,3481, 0)
+ val crawlinghands: Location = Location.create(3422,3548, 0)
+ val gemrocks: Location = Location.create(2825,2997, 0)
+ val chaosnpc: Location = Location.create(2612,9484, 0)
+ val chaosnpc2: Location = Location.create(2586, 9501, 0)
+ val varLumberYard: Location = Location.create(3289, 3482, 0)
+ val taverly: Location = Location.create(2909, 3436, 0)
+
+ val swGEClerk: Location = Location.create(3164, 3487, 0)
+ val neGEClerk: Location = Location.create(3165, 3492, 0)
+ val nwGEBanker: Location = Location.create(3162, 3490, 0)
+ val seGEBanker: Location = Location.create(3167, 3489, 0)
+
+ val badedge = ZoneBorders(3094, 3494, 3096, 3497)
+ val badedge2: Location = Location.create(3094, 3492, 0)
+ val badedge3: Location = Location.create(3094, 3490, 0)
+ val badedge4: Location = Location.create(3094, 3494, 0)
+
var citygroupA = listOf(falador, varrock, draynor, rimmington, lumbridge, edgeville)
var citygroupB = listOf(yanille, ardougne, seers, catherby)
+ val cities = listOf(
+ swGEClerk, neGEClerk, nwGEBanker, seGEBanker,
+ yanille, ardougne, seers, catherby,
+ falador, varrock, draynor, rimmington,
+ lumbridge, edgeville
+ )
+
+ val pois = listOf(
+ karamja, karamja, alkharid,
+ alkharid, feldiphills, feldiphills,
+ isafdar, eaglespeek, eaglespeek,
+ canafis, treegnome, treegnome,
+ teak1, teakfarm, keldagrimout,
+ miningguild, coalTrucks, crawlinghands,
+ magics, gemrocks, chaosnpc, chaosnpc,
+ chaosnpc2, taverly,
+ varLumberYard)
+
+ val cityLocationsGE = listOf(swGEClerk, neGEClerk, nwGEBanker, seGEBanker)
+
+ val socialLocationsGE = listOf(
+ Location.create(3158, 3483, 0),
+ Location.create(3165, 3480, 0),
+ Location.create(3172, 3483, 0),
+ Location.create(3174, 3489, 0),
+ Location.create(3171, 3497, 0),
+ Location.create(3164, 3499, 0),
+ Location.create(3157, 3497, 0),
+ Location.create(3155, 3489, 0),
+ Location.create(3167, 3492, 0),
+ Location.create(3162, 3492, 0),
+ Location.create(3162, 3487, 0),
+ Location.create(3167, 3487, 0)
+ )
+
+ val clerkLocationsGe = listOf(
+ Location.create(3165, 3492, 0),
+ Location.create(3164, 3492, 0),
+ Location.create(3164, 3487, 0),
+ Location.create(3165, 3487, 0)
+ )
+
var bankMap = mapOf(
falador to ZoneBorders(2950, 3374, 2943, 3368),
varrock to ZoneBorders(3182, 3435, 3189, 3446),
@@ -538,22 +645,10 @@ class Adventurer(val style: CombatStyle): Script() {
catherby to ZoneBorders(2807, 3438, 2811, 3441)
)
- val cities = listOf(yanille, ardougne, seers, catherby, falador, varrock,
- draynor, rimmington, lumbridge, ge, ge2, edgeville)
-
- val pois = listOf(
- karamja, karamja, alkharid,
- alkharid, feldiphills, feldiphills,
- isafdar, eaglespeek, eaglespeek,
- canafis, treegnome, treegnome,
- teak1, teakfarm, keldagrimout,
- miningguild, coal, crawlinghands,
- magics, gemrocks, chaosnpc, chaosnpc,
- chaosnpc2, taverly)
-
private val whiteWolfMountainTop = Location(2850, 3496, 0)
private val catherbyToTopOfWhiteWolf = arrayOf(Location(2856, 3442, 0), Location(2848, 3455, 0), Location(2848, 3471, 0), Location(2848, 3487, 0))
private val tavleryToTopOfWhiteWolf = arrayOf(Location(2872, 3425, 0), Location(2863, 3440, 0), Location(2863, 3459, 0), Location(2854, 3475, 0), Location(2859, 3488, 0))
+
val common_stuck_locations = mapOf(
// South of Tavlery dungeon
ZoneBorders(2878, 3386, 2884, 3395) to { it: Adventurer ->
diff --git a/Server/src/main/content/global/bots/CannonballSmelter.kt b/Server/src/main/content/global/bots/CannonballSmelter.kt
index ca6406937..8ac77f7e1 100644
--- a/Server/src/main/content/global/bots/CannonballSmelter.kt
+++ b/Server/src/main/content/global/bots/CannonballSmelter.kt
@@ -7,8 +7,6 @@ import core.api.*
import core.game.bots.*
import core.game.ge.GrandExchange
import core.game.interaction.DestinationFlag
-import core.game.interaction.IntType
-import core.game.interaction.InteractionListeners
import core.game.interaction.MovementPulse
import core.game.node.Node
import core.game.node.entity.skill.Skills
@@ -16,6 +14,7 @@ import core.game.node.item.Item
import core.game.world.map.Location
import core.game.world.map.zone.ZoneBorders
import org.rs09.consts.Items
+import content.data.Quests
@PlayerCompatible
@ScriptName("Falador Cannonball Smelter")
@@ -273,6 +272,6 @@ class CannonballSmelter : Script() {
skills.put(Skills.HITPOINTS,99)
skills.put(Skills.DEFENCE,99)
skills.put(Skills.SMITHING,35)
- quests.add("Dwarf Cannon")
+ quests.add(Quests.DWARF_CANNON)
}
}
diff --git a/Server/src/main/content/global/dialogue/BankerDialogue.kt b/Server/src/main/content/global/dialogue/BankerDialogue.kt
index e913ce4f0..7b857da7d 100644
--- a/Server/src/main/content/global/dialogue/BankerDialogue.kt
+++ b/Server/src/main/content/global/dialogue/BankerDialogue.kt
@@ -45,18 +45,7 @@ class BankerDialogue(player: Player? = null) : core.game.dialogue.DialoguePlugin
2 -> showTopics(
Topic(core.game.dialogue.FacialExpression.FRIENDLY, "I'd like to access my bank account, please.", 10),
- IfTopic(
- core.game.dialogue.FacialExpression.FRIENDLY,
- "I'd like to switch to my ${getBankAccountName(player, true)} bank account.",
- 13,
- hasActivatedSecondaryBankAccount(player)
- ),
- IfTopic(
- core.game.dialogue.FacialExpression.FRIENDLY,
- "I'd like to open a secondary bank account.",
- 20,
- !hasActivatedSecondaryBankAccount(player)
- ),
+ Topic(core.game.dialogue.FacialExpression.FRIENDLY, "I'd like to switch my default bank account.", 7),
Topic(core.game.dialogue.FacialExpression.FRIENDLY, "I'd like to check my PIN settings.", 11),
Topic(core.game.dialogue.FacialExpression.FRIENDLY, "I'd like to collect items.", 12),
Topic(core.game.dialogue.FacialExpression.ASKING, "What is this place?", 3),
@@ -78,6 +67,53 @@ class BankerDialogue(player: Player? = null) : core.game.dialogue.DialoguePlugin
"Leave your valuables with us if you want to keep them safe."
).also { stage = END_DIALOGUE }
+ 7 -> showTopics(
+ IfTopic(
+ core.game.dialogue.FacialExpression.FRIENDLY,
+ "I'd like to turn on the Clan bank, please.",
+ 8,
+ !(player.getAttribute("clanbank:enabled",false))
+ ),
+ IfTopic(
+ core.game.dialogue.FacialExpression.FRIENDLY,
+ "I'd like to turn off the Clan bank, please.",
+ 9,
+ player.getAttribute("clanbank:enabled",false)
+ ),
+ IfTopic(
+ core.game.dialogue.FacialExpression.FRIENDLY,
+ "I'd like to switch to my ${getBankAccountName(player, true)} bank account.",
+ 13,
+ hasActivatedSecondaryBankAccount(player)
+ ),
+ IfTopic(
+ core.game.dialogue.FacialExpression.FRIENDLY,
+ "I'd like to open a secondary bank account.",
+ 20,
+ !hasActivatedSecondaryBankAccount(player)
+ ),
+ )
+
+ 8 -> {
+ player.setAttribute("/save:clanbank:enabled", true)
+
+ npcl(
+ core.game.dialogue.FacialExpression.FRIENDLY,
+ "The Clan bank has been enabled. " +
+ "If the Clan owner is online, you will access their primary bank account instead of your own."
+ ).also { stage = 2 }
+ }
+
+ 9 -> {
+ player.removeAttribute("clanbank:enabled")
+
+ npcl(
+ core.game.dialogue.FacialExpression.FRIENDLY,
+ "The Clan bank has been disabled. " +
+ "You will now always open your personal bank account."
+ ).also { stage = 2 }
+ }
+
10 -> {
openBankAccount(player)
end()
diff --git a/Server/src/main/content/global/dialogue/GardenerDialoguePlugin.kt b/Server/src/main/content/global/dialogue/GardenerDialoguePlugin.kt
index 3fa655c5d..6c192972c 100644
--- a/Server/src/main/content/global/dialogue/GardenerDialoguePlugin.kt
+++ b/Server/src/main/content/global/dialogue/GardenerDialoguePlugin.kt
@@ -3,160 +3,227 @@ package content.global.dialogue
import content.global.skill.farming.FarmerPayOptionDialogue
import content.global.skill.farming.Farmers
import content.global.skill.farming.FarmingPatch
-import core.game.node.entity.npc.NPC
+import content.global.skill.farming.PatchType
+import core.api.*
+import core.game.dialogue.FacialExpression
+import core.game.dialogue.IfTopic
+import core.game.dialogue.Topic
import core.game.node.entity.player.Player
import core.game.node.item.Item
import core.plugin.Initializable
import org.rs09.consts.Items
import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
@Initializable
class GardenerDialoguePlugin(player: Player? = null) : core.game.dialogue.DialoguePlugin(player) {
- override fun newInstance(player: Player?): core.game.dialogue.DialoguePlugin {
- return GardenerDialoguePlugin(player)
- }
-
- override fun open(vararg args: Any?): Boolean {
- npc = args[0] as NPC
- options("Would you look after my crops for me?","Can you sell me something?")
- return true
- }
-
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
- when(stage){
- 0 -> when(buttonId){
- 1 -> player("Would you look after my crops for me?").also { stage = 10 }
- 2 -> player("Can you sell me something?").also { stage = 30 }
+ val patches = Farmers.forId(npc.id)!!.patches
+ when (stage) {
+ // TODO: Can fruit trees be chopped down by the gardener too?
+ START_DIALOGUE -> {
+ val patch = patches[0].getPatchFor(player)
+ showTopics(
+ IfTopic(
+ FacialExpression.ASKING,
+ "Would you chop my tree down for me?",
+ 1000,
+ patch.patch.type == PatchType.TREE_PATCH && patch.plantable != null && patch.isGrown()
+ ),
+ IfTopic(
+ FacialExpression.ASKING,
+ "Would you look after my crops for me?",
+ 10,
+ !(patch.patch.type == PatchType.TREE_PATCH && patch.plantable != null && patch.isGrown())
+ ),
+ Topic(FacialExpression.ASKING, "Can you give me any farming advice?", 2000),
+ Topic(FacialExpression.ASKING, "Can you sell me something?", 30),
+ Topic(FacialExpression.NEUTRAL, "That's all, thanks.", END_DIALOGUE)
+ )
}
- 10 -> npc("I might. Which one were you thinking of?").also { stage++ }
- 11 -> when(npc.id){
- Farmers.ELSTAN.id, Farmers.LYRA.id -> options("The north-western allotment.","The south-eastern allotment.").also { stage = 15 }
- Farmers.DANTAERA.id, Farmers.KRAGEN.id -> options("The north allotment.","The south allotment.").also { stage = 15 }
- else -> player("Uh, that one.").also { stage++ }
+ 10 -> {
+ if (patches.size > 1) {
+ npc("I might. Which one were you thinking of?").also { stage = 20 }
+ } else {
+ openPayGardenerDialogue(player, patches[0])
+ }
}
- 12 -> npc("Oh, right. My bad.").also { stage++ }
- 13 -> checkPatch(player,Farmers.forId(npc.id)!!.patches[0])
-
- 15 -> when(buttonId){
- 1 -> checkPatch(player,Farmers.forId(npc.id)!!.patches[0])
- 2 -> checkPatch(player,Farmers.forId(npc.id)!!.patches[1])
+ 20 -> when (npc.id) {
+ Farmers.ELSTAN.id, Farmers.LYRA.id -> showTopics(
+ Topic(FacialExpression.NEUTRAL, "The north-western allotment.", 21),
+ Topic(FacialExpression.NEUTRAL, "The south-eastern allotment.", 22)
+ )
+ Farmers.DANTAERA.id, Farmers.KRAGEN.id -> showTopics(
+ Topic(FacialExpression.NEUTRAL, "The northern allotment.", 21),
+ Topic(FacialExpression.NEUTRAL, "The southern allotment.", 22)
+ )
}
+ 21 -> openPayGardenerDialogue(player, patches[0])
+ 22 -> openPayGardenerDialogue(player, patches[1])
- 30 -> npc("That depends on whether I have it to sell.","What is it that you're looking for?").also { stage++ }
- 31 -> options("Some plant cure.","A bucket of compost.","A rake.","(See more items)").also { stage = 32 }
- 32 -> when(buttonId){
- 1 -> player("Some plant cure.").also { stage = 100 }
- 2 -> player("A bucket of compost.").also { stage = 200 }
- 3 -> player("A rake.").also { stage = 300 }
- 4 -> options("A watering can.","A gardening trowel.","A seed dibber.","(See previous items)").also { stage++ }
- }
- 33 -> when(buttonId){
- 1 -> player("A watering can.").also { stage = 400 }
- 2 -> player("A gardening trowel.").also { stage = 500 }
- 3 -> player("A seed dibber.").also { stage = 600 }
- 4 -> options("Some plant cure.","A bucket of compost.","A rake.","(See more items)").also { stage = 32 }
- }
+ 30 -> npc(FacialExpression.NEUTRAL, "That depends on whether I have it to sell. What is it", "that you're looking for?").also { stage++ }
+ 31 -> showTopics(
+ Topic(FacialExpression.NEUTRAL, "Some plant cure.", 100),
+ Topic(FacialExpression.NEUTRAL, "A bucket of compost.", 200),
+ Topic(FacialExpression.NEUTRAL, "A rake.", 300),
+ Topic("(See more items)", 32, true)
+ )
+ 32 -> showTopics(
+ Topic(FacialExpression.NEUTRAL, "A watering can.", 400),
+ Topic(FacialExpression.NEUTRAL, "A gardening trowel.", 500),
+ Topic(FacialExpression.NEUTRAL, "A seed dibber.", 600),
+ Topic("(See previous items)", 31, true),
+ Topic(FacialExpression.NEUTRAL, "Forget it.", 40, true)
+ )
- 100 -> npc("Plant cure, eh? I might have some put aside for myself.","Tell you what, I'll sell you some plant cure","for 25 gp if you like.").also { stage++ }
- 101 -> options("Yes, that sounds like a fair price.","No thanks, I can get that much cheaper.").also { stage++ }
- 102 -> when(buttonId){
+ 40 -> player("Forget it, you don't have anything I need.").also { stage = END_DIALOGUE }
+
+ 100 -> npc("Plant cure, eh? I might have some put aside for myself.", "Tell you what. I'll sell you some plant cure for 25 gp if", "you like.").also { stage++ }
+ 101 -> options("Yes, that sounds like a fair price.", "No thanks, I can get that much cheaper elsewhere.").also { stage++ }
+ 102 -> when (buttonId) {
1 -> {
- player("Yes, that sounds like a fair price.").also { stage = END_DIALOGUE }
- if(player.inventory.remove(Item(995,25))){
- player.inventory.add(Item(Items.PLANT_CURE_6036))
+ player(FacialExpression.HAPPY, "Yes, that sounds like a fair price.").also { stage = END_DIALOGUE }
+ if (removeItem(player, Item(Items.COINS_995, 25))) {
+ addItemOrDrop(player, Items.PLANT_CURE_6036)
} else {
- player.sendMessage("You need 25 gp to pay for that.")
+ sendMessage(player, "You need 25 gp to pay for that.")
}
}
- 2 -> end()
+ 2 -> player("No thanks, I can get that much cheaper elsewhere.").also { stage = END_DIALOGUE }
}
- 200 -> npc("A bucket of compost, eh? I might have one spare...","tell you what, I'll sell it to you for 35 gp if you like.").also { stage++ }
- 201 -> options("Yes, that sounds fair.","No thanks, I can get that cheaper.").also { stage++ }
- 202 -> when(buttonId){
+ 200 -> npc("A bucket of compost, eh? I might have one spare...", "tell you what, I'll sell it to you for 35 gp if you like.").also { stage++ }
+ 201 -> options("Yes, that sounds like a fair price.", "No thanks, I can get that much cheaper elsewhere.").also { stage++ }
+ 202 -> when (buttonId) {
1 -> {
player("Yes, that sounds like a fair price.").also { stage = END_DIALOGUE }
- if(player.inventory.remove(Item(995,35))){
- player.inventory.add(Item(Items.COMPOST_6032))
+ if (removeItem(player, Item(Items.COINS_995, 35))) {
+ addItemOrDrop(player, Items.COMPOST_6032)
} else {
- player.sendMessage("You need 35 gp to pay for that.")
+ sendMessage(player, "You need 35 gp to pay for that.")
}
}
- 2 -> end()
+ 2 -> player("No thanks, I can get that much cheaper elsewhere.").also { stage = END_DIALOGUE }
}
- 300 -> npc("A rake, eh? I might have one spare...","tell you what, I'll sell it to you for 15 gp if you like.").also { stage++ }
- 301 -> options("Yes, that sounds fair.","No thanks, I can get that cheaper.").also { stage++ }
- 302 -> when(buttonId){
+ 300 -> npc("A rake, eh? I might have one spare...", "tell you what, I'll sell it to you for 15 gp if you like.").also { stage++ }
+ 301 -> options("Yes, that sounds like a fair price.", "No thanks, I can get that much cheaper elsewhere.").also { stage++ }
+ 302 -> when (buttonId) {
1 -> {
player("Yes, that sounds like a fair price.").also { stage = END_DIALOGUE }
- if(player.inventory.remove(Item(995,15))){
- player.inventory.add(Item(Items.RAKE_5341))
+ if (removeItem(player, Item(Items.COINS_995, 15))) {
+ addItemOrDrop(player, Items.RAKE_5341)
} else {
- player.sendMessage("You need 15 gp to pay for that.")
+ sendMessage(player, "You need 15 gp to pay for that.")
}
}
- 2 -> end()
+ 2 -> player("No thanks, I can get that much cheaper elsewhere.").also { stage = END_DIALOGUE }
}
- 400 -> npc("A watering can, eh? I might have one spare...","tell you what, I'll sell it to you for 25 gp if you like.").also { stage++ }
- 401 -> options("Yes, that sounds fair.","No thanks, I can get that cheaper.").also { stage++ }
+ 400 -> npc("A watering can, eh? I might have one spare...", "tell you what, I'll sell it to you for 25 gp if you like.").also { stage++ }
+ 401 -> options("Yes, that sounds like a fair price.", "No thanks, I can get that much cheaper elsewhere.").also { stage++ }
402 -> when(buttonId){
1 -> {
player("Yes, that sounds like a fair price.").also { stage = END_DIALOGUE }
- if(player.inventory.remove(Item(995,25))){
- player.inventory.add(Item(Items.WATERING_CAN8_5340))
+ if (removeItem(player, Item(Items.COINS_995, 25))) {
+ addItemOrDrop(player, Items.WATERING_CAN8_5340)
} else {
- player.sendMessage("You need 25 gp to pay for that.")
+ sendMessage(player, "You need 25 gp to pay for that.")
}
}
- 2 -> end()
+ 2 -> player("No thanks, I can get that much cheaper elsewhere.").also { stage = END_DIALOGUE }
}
- 500 -> npc("A gardening trowel, eh? I might have one spare...","tell you what, I'll sell it to you for 15 gp if you like.").also { stage++ }
- 501 -> options("Yes, that sounds fair.","No thanks, I can get that cheaper.").also { stage++ }
- 502 -> when(buttonId){
+ 500 -> npc("A gardening trowel, eh? I might have one spare...", "tell you what, I'll sell it to you for 15 gp if you like.").also { stage++ }
+ 501 -> options("Yes, that sounds like a fair price.", "No thanks, I can get that much cheaper elsewhere.").also { stage++ }
+ 502 -> when (buttonId) {
1 -> {
player("Yes, that sounds like a fair price.").also { stage = END_DIALOGUE }
- if(player.inventory.remove(Item(995,15))){
- player.inventory.add(Item(Items.GARDENING_TROWEL_5325))
+ if (removeItem(player, Item(Items.COINS_995, 15))) {
+ addItemOrDrop(player, Items.GARDENING_TROWEL_5325)
} else {
- player.sendMessage("You need 15 gp to pay for that.")
+ sendMessage(player, "You need 15 gp to pay for that.")
}
}
- 2 -> end()
+ 2 -> player("No thanks, I can get that much cheaper elsewhere.").also { stage = END_DIALOGUE }
}
- 600 -> npc("A seed dibber, eh? I might have one spare...","tell you what, I'll sell it to you for 15 gp if you like.").also { stage++ }
- 601 -> options("Yes, that sounds fair.","No thanks, I can get that cheaper.").also { stage++ }
- 602 -> when(buttonId){
+ 600 -> npc("A seed dibber, eh? I might have one spare...", "tell you what, I'll sell it to you for 15 gp if you like.").also { stage++ }
+ 601 -> options("Yes, that sounds like a fair price.", "No thanks, I can get that much cheaper elsewhere.").also { stage++ }
+ 602 -> when (buttonId) {
1 -> {
player("Yes, that sounds like a fair price.").also { stage = END_DIALOGUE }
- if(player.inventory.remove(Item(995,15))){
- player.inventory.add(Item(Items.SEED_DIBBER_5343))
+ if (removeItem(player, Item(Items.COINS_995, 15))) {
+ addItemOrDrop(player, Items.SEED_DIBBER_5343)
} else {
- player.sendMessage("You need 15 gp to pay for that.")
+ sendMessage(player, "You need 15 gp to pay for that.")
}
}
- 2 -> end()
+ 2 -> player("No thanks, I can get that much cheaper elsewhere.").also { stage = END_DIALOGUE }
+ }
+
+ // Note: This dialogue changes slightly in April 2009, and significantly in December 2009
+ 1000 -> npc(FacialExpression.THINKING, "Why? You look like you could chop it down yourself!").also { stage++ }
+ 1001 -> showTopics(
+ Topic(FacialExpression.NEUTRAL, "Yes, you're right - I'll do it myself.", END_DIALOGUE),
+ Topic(FacialExpression.NEUTRAL, "I can't be bothered - I'd rather pay you to do it.", 1020)
+ )
+
+ 1020 -> npc(FacialExpression.NEUTRAL, "Well, it's a lot of hard work - if you pay me 200 GP", "I'll chop it down for you.").also { stage++ }
+ 1021 -> {
+ if (inInventory(player, Items.COINS_995, 200)) {
+ showTopics(
+ Topic(FacialExpression.NEUTRAL, "Here's 200GP - chop my tree down please.", 1022),
+ Topic(FacialExpression.NEUTRAL, "I don't want to pay that much, sorry.", END_DIALOGUE)
+ )
+ } else {
+ player("I don't have that much money on me.").also { stage = END_DIALOGUE } // not authentic
+ }
+ }
+ 1022 -> {
+ end()
+ if (removeItem(player, Item(Items.COINS_995, 200))) {
+ patches[0].getPatchFor(player).clear()
+ }
+ }
+
+ 2000 -> {
+ val advice = arrayOf(
+ "There are four main Farming areas - Elstan looks after an area south of Falador, Dantaera has one to the north of Catherby, Kragen has one near Ardougne, and Lyra looks after a place in north Morytania.",
+ "If you want to grow fruit trees you could try a few places: Catherby and Brimhaven have a couple of fruit tree patches, and I hear that the gnomes are big on that sort of thing.",
+ "Bittercap mushrooms can only be grown in a special patch in Morytania, near the Mort Myre swamp. There the ground is especially dank and suited to growing poisonous fungi.",
+ "There is a special patch for growing Belladonna - I believe it's somewhere near Draynor Manor, where the ground is a tad 'unblessed'.",
+
+ "Don't just throw away your weeds after you've raked a patch - put them in a compost bin and make some compost.",
+ "Applying compost to a patch will not only reduce the chance that your crops will get diseased, but you will also grow more crops to harvest.",
+ "Supercompost is far better than normal compost, but more expensive to make. You need to rot the right type of item; show me an item, and I'll tell you if it's super-compostable or not.",
+
+ "Tree seeds must be grown in a plantpot of soil into a sapling, and then transferred to a tree patch to continue growing to adulthood.",
+ "You don't have to buy all your plantpots you know, you can make them yourself on a pottery wheel. If you're a good enough ${if (player!!.isMale) "craftsman" else "craftswoman"}, that is.",
+ "You can fill plantpots with soil from Farming patches, if you have a gardening trowel.",
+
+ "Vegetables, hops and flowers are far more likely to grow healthily if you water them periodically.",
+ "The only way to cure a bush or tree of disease is to prune away the diseased leaves with a pair of secateurs. For all other crops I would just apply some plant-cure.",
+ "If you need to be rid of your fruit trees for any reason, all you have to do is chop them down and then dig up the stump.",
+
+ "You can put up to ten potatoes, cabbages or onions in vegetable sacks, although you can't have a mix in the same sack.",
+ "You can put up to five tomatoes, strawberries, apples, bananas or oranges into a fruit basket, although you can't have a mix in the same basket.",
+ "If you want to make your own sacks and baskets you'll need to use the loom that's near the Farming shop in Falador. If you're a good enough ${if (player!!.isMale) "craftsman" else "craftswoman"}, that is.",
+ "You can buy all the farming tools from farming shops, which can be found close to the allotments.",
+
+ "Hops are good for brewing ales. I believe there's a brewery up in Keldagrim somewhere, and I've heard rumours that a place called Phasmatys used to be good for that type of thing. 'Fore they all died, of course.",
+ )
+ npcl(FacialExpression.NEUTRAL, advice.random()).also { stage = START_DIALOGUE }
}
}
return true
}
- fun checkPatch(player: Player,fPatch: FarmingPatch){
- if(fPatch.getPatchFor(player).isWeedy()){
- npc("You don't have anything planted in that patch.","Plant something and I might agree to look after it for you.").also { stage = END_DIALOGUE }
- } else if(fPatch.getPatchFor(player).isGrown()){
- npc("That patch is already fully grown!","I don't know what you want me to do with it!").also { stage = END_DIALOGUE }
- } else if(fPatch.getPatchFor(player).protectionPaid) {
- npc("Are you alright? You've already", "paid me for that.").also { stage = END_DIALOGUE }
- } else {
- end()
- player.dialogueInterpreter.open(FarmerPayOptionDialogue(fPatch.getPatchFor(player)),npc)
- }
+ fun openPayGardenerDialogue(player: Player, fPatch: FarmingPatch) {
+ end()
+ openDialogue(player, FarmerPayOptionDialogue(fPatch.getPatchFor(player)), npc)
}
override fun getIds(): IntArray {
diff --git a/Server/src/main/content/global/dialogue/ManDialoguePlugin.java b/Server/src/main/content/global/dialogue/ManDialoguePlugin.java
index 36785504e..aeff88be1 100644
--- a/Server/src/main/content/global/dialogue/ManDialoguePlugin.java
+++ b/Server/src/main/content/global/dialogue/ManDialoguePlugin.java
@@ -22,7 +22,7 @@ public class ManDialoguePlugin extends DialoguePlugin {
/**
* The NPC ids that use this dialogue plugin.
*/
- private static final int[] NPC_IDS = {1, 2, 3, 4, 5, 6, 16, 24, 25, 170, 351, 352, 353, 354, 359, 360, 361, 362, 363, 726, 727, 728, 729, 730, 1086, 2675, 2776, 3224, 3225, 3227, 5923, 5924,};
+ private static final int[] NPC_IDS = {1, 2, 3, 4, 5, 6, 16, 24, 25, 170, 1086, 2675, 2776, 3224, 3225, 3227, 5923, 5924,};
public ManDialoguePlugin() {
}
diff --git a/Server/src/main/content/global/handlers/iface/ClanInterfacePlugin.java b/Server/src/main/content/global/handlers/iface/ClanInterfacePlugin.java
index 1ad3857e8..5003507c2 100644
--- a/Server/src/main/content/global/handlers/iface/ClanInterfacePlugin.java
+++ b/Server/src/main/content/global/handlers/iface/ClanInterfacePlugin.java
@@ -36,17 +36,21 @@ public final class ClanInterfacePlugin extends ComponentPlugin {
switch (component.getId()) {
case 589:
switch (button) {
- case 9:
- if (player.getInterfaceManager().getComponent(590) != null) {
- player.getPacketDispatch().sendMessage("Please close the interface you have open before using 'Clan Setup'");
+ case 9:
+ if (player.getInterfaceManager().getComponent(590) != null) {
+ player.getPacketDispatch().sendMessage("Please close the interface you have open before using 'Clan Setup'");
+ return true;
+ }
+ ClanRepository.openSettings(player);
return true;
- }
- ClanRepository.openSettings(player);
- return true;
- case 14:
- player.getDetails().getCommunication().toggleLootshare(player);
- return true;
+ case 14:
+ if (player.getIronmanManager().checkRestriction()) {
+ return false;
+ }
+ player.getDetails().getCommunication().toggleLootshare(player);
+ return true;
}
+
break;
case 590:
final ClanRepository clan = ClanRepository.get(player.getName(), true);
diff --git a/Server/src/main/content/global/handlers/iface/ExperienceInterface.kt b/Server/src/main/content/global/handlers/iface/ExperienceInterface.kt
index be4d2599e..c7003ea83 100644
--- a/Server/src/main/content/global/handlers/iface/ExperienceInterface.kt
+++ b/Server/src/main/content/global/handlers/iface/ExperienceInterface.kt
@@ -10,6 +10,7 @@ import core.plugin.Initializable
import core.plugin.Plugin
import core.tools.Log
import org.rs09.consts.Sounds
+import content.data.Quests
/**
* Represents the experience interface.
@@ -78,15 +79,15 @@ class ExperienceInterface() : ComponentPlugin() {
}
private fun checkHerblore(player: Player): Boolean{
- return (player.questRepository.isComplete("Druidic Ritual"))
+ return (player.questRepository.isComplete(Quests.DRUIDIC_RITUAL))
}
private fun checkSummoning(player: Player): Boolean{
- return player.questRepository.isComplete("Wolf Whistle")
+ return player.questRepository.isComplete(Quests.WOLF_WHISTLE)
}
private fun checkRunecrafting(player: Player): Boolean{
- return player.questRepository.isComplete("Rune Mysteries")
+ return player.questRepository.isComplete(Quests.RUNE_MYSTERIES)
}
companion object {
diff --git a/Server/src/main/content/global/handlers/iface/FairyRingInterface.kt b/Server/src/main/content/global/handlers/iface/FairyRingInterface.kt
index 70a005ec4..69ad63e21 100644
--- a/Server/src/main/content/global/handlers/iface/FairyRingInterface.kt
+++ b/Server/src/main/content/global/handlers/iface/FairyRingInterface.kt
@@ -2,109 +2,130 @@ package content.global.handlers.iface
import core.api.*
import core.game.event.FairyRingDialEvent
-import core.game.component.Component
+import core.game.interaction.InterfaceListener
import core.game.node.entity.player.Player
import core.game.node.entity.player.link.TeleportManager
import core.game.system.task.Pulse
+import core.game.world.GameWorld
import core.game.world.map.Location
import core.game.world.map.RegionManager
import core.tools.RandomFunction
-import core.game.interaction.InterfaceListener
-import core.game.world.GameWorld
-
-val RING_1 = arrayOf('a','d','c','b')
-val RING_2 = arrayOf('i','l','k','j')
-val RING_3 = arrayOf('p','s','r','q')
+import content.data.Quests
/**
* Handles the fairy ring interface
* @author Ceikry
*/
class FairyRingInterface : InterfaceListener {
-
- val RINGS = 734
- val TRAVEL_LOG = 735
+ companion object {
+ const val RINGS_IFACE = 734
+ const val LOG_IFACE_ID = 735
+ const val VARP_F_RING = 816
+ const val VB_LOG_SORT_ORDER = 4618
+ const val VB_RING_1 = 2341
+ const val VB_RING_2 = 2342
+ const val VB_RING_3 = 2343
+ val RING_1 = arrayOf('a','d','c','b')
+ val RING_2 = arrayOf('i','l','k','j')
+ val RING_3 = arrayOf('p','s','r','q')
+ }
override fun defineInterfaceListeners() {
- onOpen(RINGS){player, _ ->
- player.interfaceManager.openSingleTab(Component(TRAVEL_LOG))
- player.setAttribute("fr:ring1", 0)
- player.setAttribute("fr:ring2", 0)
- player.setAttribute("fr:ring3", 0)
- FairyRing.drawLog(player)
+ onOpen(RINGS_IFACE){ player, _ ->
+ openSingleTab(player, LOG_IFACE_ID)
+ saveVarp(player, VARP_F_RING)
return@onOpen true
}
- onClose(RINGS){player, _ ->
- closeTabInterface(player)
- player.removeAttribute("fr:ring1")
- player.removeAttribute("fr:ring2")
- player.removeAttribute("fr:ring3")
- setVarp(player, 816, 0)
+ onOpen(LOG_IFACE_ID){ player, _ ->
+ drawLog(player)
+ return@onOpen true
+ }
+
+ onClose(RINGS_IFACE){ player, _ ->
closeTabInterface(player)
return@onClose true
}
- on(RINGS){player, _, _, buttonID, _, _ ->
- if(player.getAttribute("fr:time",0L) > System.currentTimeMillis()) return@on true
- var delayIncrementer = 1750L
+ on(RINGS_IFACE){ player, _, _, buttonID, _, _ ->
when(buttonID){
- 23 -> delayIncrementer += increment(player,1)
- 25 -> delayIncrementer += increment(player,2)
- 27 -> delayIncrementer += increment(player,3)
+ 23 -> increment(player,1)
+ 25 -> increment(player,2)
+ 27 -> increment(player,3)
24 -> decrement(player,1)
26 -> decrement(player,2)
28 -> decrement(player,3)
21 -> confirm(player)
}
- player.setAttribute("fr:time",System.currentTimeMillis() + delayIncrementer)
return@on true
}
- on(TRAVEL_LOG,12){player, _, _, _, _, _ ->
+ on(LOG_IFACE_ID,12){ player, _, _, _, _, _ ->
toggleSortOrder(player)
return@on true
}
}
- private fun toggleSortOrder(player: Player): Long{
- val ring1index = player.getAttribute("fr:ring1",0)
- var toSet = player.getAttribute("fr:sortorder",true)
- toSet = !toSet
- player.setAttribute("fr:sortorder",toSet)
- if(toSet) {
- setVarp(player, 816, ring1index)
- player.setAttribute("fr:ring2",0)
- player.setAttribute("fr:ring3",0)
+ /**
+ * Draws the travel log interface
+ * Currently, the visited logs is a bool array in globalData. Someone should migrate this to prefs or something at some point.
+ * On transmit of Varp 816, which all used varbits are part of here, the CS2 is invoked to populate the codes in the log and sort them correctly.
+ * @param player The player to draw the interface for
+ */
+ private fun drawLog (player: Player)
+ {
+ for (i in FairyRing.values().indices) {
+ /* Snowscape: show all fairy ring destinations, whether they have been there or not.
+ if (!player.savedData.globalData.hasTravelLog(i)) {
+ continue
+ }
+ */
+ val ring = FairyRing.values()[i]
+ if (ring.childId == -1) {
+ continue
+ }
+ setInterfaceText(player, "()
@@ -27,7 +28,7 @@ object QuestTabUtils {
closeInterface(player)
for (req in unmetReqs) {
if (req is QuestReq)
- questList.add(req.questReq.questName)
+ questList.add(req.questReq.quest.questName)
else if (req is SkillReq) {
if (statMap[req.skillId] == null || (statMap[req.skillId] != null && statMap[req.skillId]!! < req.level))
statMap[req.skillId] = req.level
@@ -82,163 +83,163 @@ object QuestTabUtils {
openInterface(player, Components.QUESTJOURNAL_SCROLL_275)
}
- fun getNameForButton (button: Int) : String {
- val name = when (button) {
- 10 -> "Myths of the White Lands"
- 11 -> "Myths of the White Lands"
+ private fun getNameForButton(button: Int) : String {
+ val quest = when (button) {
+ 10 -> Quests.MYTHS_OF_THE_WHITE_LANDS.questName
+ 11 -> Quests.MYTHS_OF_THE_WHITE_LANDS.questName
12 -> "Free Quests"
- 13 -> "Black Knights' Fortress"
- 14 -> "Cook's Assistant"
- 15 -> "Demon Slayer"
- 16 -> "Doric's Quest"
- 17 -> "Dragon Slayer"
- 18 -> "Ernest the Chicken"
- 19 -> "Goblin Diplomacy"
- 20 -> "Imp Catcher"
- 21 -> "The Knight's Sword"
- 22 -> "Pirate's Treasure"
- 23 -> "Prince Ali Rescue"
- 24 -> "The Restless Ghost"
- 25 -> "Romeo & Juliet"
- 26 -> "Rune Mysteries"
- 27 -> "Sheep Shearer"
- 28 -> "Shield of Arrav"
- 29 -> "Vampire Slayer"
- 30 -> "Witch's Potion"
+ 13 -> Quests.BLACK_KNIGHTS_FORTRESS.questName
+ 14 -> Quests.COOKS_ASSISTANT.questName
+ 15 -> Quests.DEMON_SLAYER.questName
+ 16 -> Quests.DORICS_QUEST.questName
+ 17 -> Quests.DRAGON_SLAYER.questName
+ 18 -> Quests.ERNEST_THE_CHICKEN.questName
+ 19 -> Quests.GOBLIN_DIPLOMACY.questName
+ 20 -> Quests.IMP_CATCHER.questName
+ 21 -> Quests.THE_KNIGHTS_SWORD.questName
+ 22 -> Quests.PIRATES_TREASURE.questName
+ 23 -> Quests.PRINCE_ALI_RESCUE.questName
+ 24 -> Quests.THE_RESTLESS_GHOST.questName
+ 25 -> Quests.ROMEO_JULIET.questName
+ 26 -> Quests.RUNE_MYSTERIES.questName
+ 27 -> Quests.SHEEP_SHEARER.questName
+ 28 -> Quests.SHIELD_OF_ARRAV.questName
+ 29 -> Quests.VAMPIRE_SLAYER.questName
+ 30 -> Quests.WITCHS_POTION.questName
31 -> "Members' Quests"
- 32 -> "Animal Magnetism"
- 33 -> "Between a Rock..."
- 34 -> "Big Chompy Bird Hunting"
- 35 -> "Biohazard"
- 36 -> "Cabin Fever"
- 37 -> "Clock Tower"
- 38 -> "Contact!"
- 39 -> "Zogre Flesh Eaters"
- 40 -> "Creature of Fenkenstrain"
- 41 -> "Darkness of Hallowvale"
- 42 -> "Death to the Dorgeshuun"
- 43 -> "Death Plateau"
- 44 -> "Desert Treasure"
- 45 -> "Devious Minds"
- 46 -> "The Dig Site"
- 47 -> "Druidic Ritual"
- 48 -> "Dwarf Cannon"
- 49 -> "Eadgar's Ruse"
- 50 -> "Eagles' Peak"
- 51 -> "Elemental Workshop I"
- 52 -> "Elemental Workshop II"
- 53 -> "Enakhra's Lament"
- 54 -> "Enlightened Journey"
- 55 -> "The Eyes of Glouphrie"
- 56 -> "Fairytale I - Growing Pains"
- 57 -> "Fairytale II - Cure a Queen"
- 58 -> "Family Crest"
- 59 -> "The Feud"
- 60 -> "Fight Arena"
- 61 -> "Fishing Contest"
- 62 -> "Forgettable Tale..."
- 63 -> "The Fremennik Trials"
- 64 -> "Waterfall Quest"
- 65 -> "Garden of Tranquillity"
- 66 -> "Gertrude's Cat"
- 67 -> "Ghosts Ahoy"
- 68 -> "The Giant Dwarf"
- 69 -> "The Golem"
- 70 -> "The Grand Tree"
- 71 -> "The Hand in the Sand"
- 72 -> "Haunted Mine"
- 73 -> "Hazeel Cult"
- 74 -> "Heroes' Quest"
- 75 -> "Holy Grail"
- 76 -> "Horror from the Deep"
- 77 -> "Icthlarin's Little Helper"
- 78 -> "In Aid of the Myreque"
- 79 -> "In Search of the Myreque"
- 80 -> "Jungle Potion"
- 81 -> "Legend's Quest"
- 82 -> "Lost City"
- 83 -> "The Lost Tribe"
- 84 -> "Lunar Diplomacy"
- 85 -> "Making History"
- 86 -> "Merlin's Crystal"
- 87 -> "Monkey Madness"
- 88 -> "Monk's Friend"
- 89 -> "Mountain Daughter"
- 90 -> "Mourning's End Part I"
- 91 -> "Mourning's End Part II"
- 92 -> "Murder Mystery"
- 93 -> "My Arm's Big Adventure"
- 94 -> "Nature Spirit"
- 95 -> "Observatory Quest"
- 96 -> "One Small Favour"
- 97 -> "Plague City"
- 98 -> "Priest in Peril"
- 99 -> "Rag and Bone Man"
- 100 -> "Ratcatchers"
- 101 -> "Recipe for Disaster"
- 102 -> "Recruitment Drive"
- 103 -> "Regicide"
- 104 -> "Roving Elves"
- 105 -> "Royal Trouble"
- 106 -> "Rum Deal"
- 107 -> "Scorpion Catcher"
- 108 -> "Sea Slug"
- 109 -> "The Slug Menace"
- 110 -> "Shades of Mort'ton"
- 111 -> "Shadow of the Storm"
- 112 -> "Sheep Herder"
- 113 -> "Shilo Village"
- 114 -> "A Soul's Bane"
- 115 -> "Spirits of the Elid"
- 116 -> "Swan Song"
- 117 -> "Tai Bwo Wannai Trio"
- 118 -> "A Tail of Two Cats"
- 119 -> "Tears of Guthix"
- 120 -> "Temple of Ikov"
- 121 -> "Throne of Miscellania"
- 122 -> "The Tourist Trap"
- 123 -> "Witch's House"
- 124 -> "Tree Gnome Village"
- 125 -> "Tribal Totem"
- 126 -> "Troll Romance"
- 127 -> "Troll Stronghold"
- 128 -> "Underground Pass"
- 129 -> "Wanted!"
- 130 -> "Watchtower"
- 131 -> "Cold War"
- 132 -> "The Fremennik Isles"
- 133 -> "Tower of Life"
- 134 -> "The Great Brain Robbery"
- 135 -> "What Lies Below"
- 136 -> "Olaf's Quest"
- 137 -> "Another Slice of H.A.M"
- 138 -> "Dream Mentor"
- 139 -> "Grim Tales"
- 140 -> "King's Ransom"
- 141 -> "The Path of Glouphrie"
- 142 -> "Back to my Roots"
- 143 -> "Land of the Goblins"
- 144 -> "Dealing with Scabaras"
- 145 -> "Wolf Whistle"
- 146 -> "As a First Resort..."
- 147 -> "Catapult Construction"
- 148 -> "Kennith's Concerns"
- 149 -> "Legacy of Seergaze"
- 150 -> "Perils of Ice Mountain"
- 151 -> "TokTz-Ket-Dill"
- 152 -> "Smoking Kills"
- 153 -> "Rocking Out"
- 154 -> "Spirit of Summer"
- 155 -> "Meeting History"
- 156 -> "All Fired Up"
- 157 -> "Summer's End"
- 158 -> "Defender of Varrock"
- 159 -> "Swept Away"
- 160 -> "While Guthix Sleeps"
- 161 -> "In Pyre Need"
- 162 -> "Myths of the White Lands"
+ 32 -> Quests.ANIMAL_MAGNETISM.questName
+ 33 -> Quests.BETWEEN_A_ROCK.questName
+ 34 -> Quests.BIG_CHOMPY_BIRD_HUNTING.questName
+ 35 -> Quests.BIOHAZARD.questName
+ 36 -> Quests.CABIN_FEVER.questName
+ 37 -> Quests.CLOCK_TOWER.questName
+ 38 -> Quests.CONTACT.questName
+ 39 -> Quests.ZOGRE_FLESH_EATERS.questName
+ 40 -> Quests.CREATURE_OF_FENKENSTRAIN.questName
+ 41 -> Quests.DARKNESS_OF_HALLOWVALE.questName
+ 42 -> Quests.DEATH_TO_THE_DORGESHUUN.questName
+ 43 -> Quests.DEATH_PLATEAU.questName
+ 44 -> Quests.DESERT_TREASURE.questName
+ 45 -> Quests.DEVIOUS_MINDS.questName
+ 46 -> Quests.THE_DIG_SITE.questName
+ 47 -> Quests.DRUIDIC_RITUAL.questName
+ 48 -> Quests.DWARF_CANNON.questName
+ 49 -> Quests.EADGARS_RUSE.questName
+ 50 -> Quests.EAGLES_PEAK.questName
+ 51 -> Quests.ELEMENTAL_WORKSHOP_I.questName
+ 52 -> Quests.ELEMENTAL_WORKSHOP_II.questName
+ 53 -> Quests.ENAKHRAS_LAMENT.questName
+ 54 -> Quests.ENLIGHTENED_JOURNEY.questName
+ 55 -> Quests.THE_EYES_OF_GLOUPHRIE.questName
+ 56 -> Quests.FAIRYTALE_I_GROWING_PAINS.questName
+ 57 -> Quests.FAIRYTALE_II_CURE_A_QUEEN.questName
+ 58 -> Quests.FAMILY_CREST.questName
+ 59 -> Quests.THE_FEUD.questName
+ 60 -> Quests.FIGHT_ARENA.questName
+ 61 -> Quests.FISHING_CONTEST.questName
+ 62 -> Quests.FORGETTABLE_TALE.questName
+ 63 -> Quests.THE_FREMENNIK_TRIALS.questName
+ 64 -> Quests.WATERFALL_QUEST.questName
+ 65 -> Quests.GARDEN_OF_TRANQUILITY.questName
+ 66 -> Quests.GERTRUDES_CAT.questName
+ 67 -> Quests.GHOSTS_AHOY.questName
+ 68 -> Quests.THE_GIANT_DWARF.questName
+ 69 -> Quests.THE_GOLEM.questName
+ 70 -> Quests.THE_GRAND_TREE.questName
+ 71 -> Quests.THE_HAND_IN_THE_SAND.questName
+ 72 -> Quests.HAUNTED_MINE.questName
+ 73 -> Quests.HAZEEL_CULT.questName
+ 74 -> Quests.HEROES_QUEST.questName
+ 75 -> Quests.HOLY_GRAIL.questName
+ 76 -> Quests.HORROR_FROM_THE_DEEP.questName
+ 77 -> Quests.ICTHLARINS_LITTLE_HELPER.questName
+ 78 -> Quests.IN_AID_OF_THE_MYREQUE.questName
+ 79 -> Quests.IN_SEARCH_OF_THE_MYREQUE.questName
+ 80 -> Quests.JUNGLE_POTION.questName
+ 81 -> Quests.LEGENDS_QUEST.questName
+ 82 -> Quests.LOST_CITY.questName
+ 83 -> Quests.THE_LOST_TRIBE.questName
+ 84 -> Quests.LUNAR_DIPLOMACY.questName
+ 85 -> Quests.MAKING_HISTORY.questName
+ 86 -> Quests.MERLINS_CRYSTAL.questName
+ 87 -> Quests.MONKEY_MADNESS.questName
+ 88 -> Quests.MONKS_FRIEND.questName
+ 89 -> Quests.MOUNTAIN_DAUGHTER.questName
+ 90 -> Quests.MOURNINGS_END_PART_I.questName
+ 91 -> Quests.MOURNINGS_END_PART_II.questName
+ 92 -> Quests.MURDER_MYSTERY.questName
+ 93 -> Quests.MY_ARMS_BIG_ADVENTURE.questName
+ 94 -> Quests.NATURE_SPIRIT.questName
+ 95 -> Quests.OBSERVATORY_QUEST.questName
+ 96 -> Quests.ONE_SMALL_FAVOUR.questName
+ 97 -> Quests.PLAGUE_CITY.questName
+ 98 -> Quests.PRIEST_IN_PERIL.questName
+ 99 -> Quests.RAG_AND_BONE_MAN.questName
+ 100 -> Quests.RATCATCHERS.questName
+ 101 -> Quests.RECIPE_FOR_DISASTER.questName
+ 102 -> Quests.RECRUITMENT_DRIVE.questName
+ 103 -> Quests.REGICIDE.questName
+ 104 -> Quests.ROVING_ELVES.questName
+ 105 -> Quests.ROYAL_TROUBLE.questName
+ 106 -> Quests.RUM_DEAL.questName
+ 107 -> Quests.SCORPION_CATCHER.questName
+ 108 -> Quests.SEA_SLUG.questName
+ 109 -> Quests.THE_SLUG_MENACE.questName
+ 110 -> Quests.SHADES_OF_MORTTON.questName
+ 111 -> Quests.SHADOW_OF_THE_STORM.questName
+ 112 -> Quests.SHEEP_HERDER.questName
+ 113 -> Quests.SHILO_VILLAGE.questName
+ 114 -> Quests.A_SOULS_BANE.questName
+ 115 -> Quests.SPIRITS_OF_THE_ELID.questName
+ 116 -> Quests.SWAN_SONG.questName
+ 117 -> Quests.TAI_BWO_WANNAI_TRIO.questName
+ 118 -> Quests.A_TAIL_OF_TWO_CATS.questName
+ 119 -> Quests.TEARS_OF_GUTHIX.questName
+ 120 -> Quests.TEMPLE_OF_IKOV.questName
+ 121 -> Quests.THRONE_OF_MISCELLANIA.questName
+ 122 -> Quests.THE_TOURIST_TRAP.questName
+ 123 -> Quests.WITCHS_HOUSE.questName
+ 124 -> Quests.TREE_GNOME_VILLAGE.questName
+ 125 -> Quests.TRIBAL_TOTEM.questName
+ 126 -> Quests.TROLL_ROMANCE.questName
+ 127 -> Quests.TROLL_STRONGHOLD.questName
+ 128 -> Quests.UNDERGROUND_PASS.questName
+ 129 -> Quests.WANTED.questName
+ 130 -> Quests.WATCHTOWER.questName
+ 131 -> Quests.COLD_WAR.questName
+ 132 -> Quests.THE_FREMENNIK_ISLES.questName
+ 133 -> Quests.TOWER_OF_LIFE.questName
+ 134 -> Quests.THE_GREAT_BRAIN_ROBBERY.questName
+ 135 -> Quests.WHAT_LIES_BELOW.questName
+ 136 -> Quests.OLAFS_QUEST.questName
+ 137 -> Quests.ANOTHER_SLICE_OF_HAM.questName
+ 138 -> Quests.DREAM_MENTOR.questName
+ 139 -> Quests.GRIM_TALES.questName
+ 140 -> Quests.KINGS_RANSOM.questName
+ 141 -> Quests.THE_PATH_OF_GLOUPHRIE.questName
+ 142 -> Quests.BACK_TO_MY_ROOTS.questName
+ 143 -> Quests.LAND_OF_THE_GOBLINS.questName
+ 144 -> Quests.DEALING_WITH_SCABARAS.questName
+ 145 -> Quests.WOLF_WHISTLE.questName
+ 146 -> Quests.AS_A_FIRST_RESORT.questName
+ 147 -> Quests.CATAPULT_CONSTRUCTION.questName
+ 148 -> Quests.KENNITHS_CONCERNS.questName
+ 149 -> Quests.LEGACY_OF_SEERGAZE.questName
+ 150 -> Quests.PERILS_OF_ICE_MOUNTAIN.questName
+ 151 -> Quests.TOKTZ_KET_DILL.questName
+ 152 -> Quests.SMOKING_KILLS.questName
+ 153 -> Quests.ROCKING_OUT.questName
+ 154 -> Quests.SPIRIT_OF_SUMMER.questName
+ 155 -> Quests.MEETING_HISTORY.questName
+ 156 -> Quests.ALL_FIRED_UP.questName
+ 157 -> Quests.SUMMERS_END.questName
+ 158 -> Quests.DEFENDER_OF_VARROCK.questName
+ 159 -> Quests.SWEPT_AWAY.questName
+ 160 -> Quests.WHILE_GUTHIX_SLEEPS.questName
+ 161 -> Quests.IN_PYRE_NEED.questName
+ 162 -> Quests.MYTHS_OF_THE_WHITE_LANDS.questName
else -> ""
}
- return name
+ return quest as String
}
}
diff --git a/Server/src/main/content/global/handlers/iface/SmeltingInterface.java b/Server/src/main/content/global/handlers/iface/SmeltingInterface.java
index 4032ff524..b7fadd28c 100644
--- a/Server/src/main/content/global/handlers/iface/SmeltingInterface.java
+++ b/Server/src/main/content/global/handlers/iface/SmeltingInterface.java
@@ -49,7 +49,7 @@ public class SmeltingInterface extends ComponentPlugin {
* @author 'Vexia
*/
public enum BarButton {
- BRONZE_1(16, Bar.BRONZE, 1), BRONZE_5(15, Bar.BRONZE, 5), BRONZE_10(14, Bar.BRONZE, 10), BRONZE_X(13, Bar.BRONZE, -1), BLURITE_1(20, Bar.BLURITE, 1), BLURITE_5(19, Bar.BLURITE, 5), BLURITE_10(18, Bar.BLURITE, 10), BLURITE_X(17, Bar.BLURITE, -1), IRON_1(24, Bar.IRON, 1), IRON_5(23, Bar.IRON, 5), IRON_10(22, Bar.IRON, 10), IRON_X(21, Bar.IRON, -1), SILVER_1(28, Bar.SILVER, 1), SILVER_5(27, Bar.SILVER, 5), SILVER_10(26, Bar.SILVER, 10), SILVER_X(25, Bar.SILVER, -1), STEEL_1(32, Bar.STEEL, 1), STEEL_5(31, Bar.STEEL, 5), STEEL_10(30, Bar.STEEL, 10), STEEL_X(29, Bar.STEEL, -1), GOLD_1(36, Bar.GOLD, 1), GOLD_5(35, Bar.GOLD, 5), GOLD_10(34, Bar.GOLD, 10), GOLD_X(33, Bar.GOLD, -1), MITHRIL_1(40, Bar.MITHRIL, 1), MITHRIL_5(39, Bar.MITHRIL, 5), MITHRIL_10(38, Bar.MITHRIL, 10), MITHRIL_X(37, Bar.MITHRIL, -1), ADAMANT_1(44, Bar.ADAMANT, 1), ADAMANT_5(43, Bar.ADAMANT, 5), ADAMANT_10(42, Bar.ADAMANT, 10), ADAMANT_X(41, Bar.ADAMANT, -1), RUNE_1(48, Bar.RUNITE, 1), RUNE_5(47, Bar.RUNITE, 5), RUNE_10(46, Bar.RUNITE, 10), RUNE_X(45, Bar.RUNITE, -1);
+ BRONZE_1(16, Bar.BRONZE, 1), BRONZE_5(15, Bar.BRONZE, 5), BRONZE_10(14, Bar.BRONZE, 30), BRONZE_X(13, Bar.BRONZE, -1), BLURITE_1(20, Bar.BLURITE, 1), BLURITE_5(19, Bar.BLURITE, 5), BLURITE_10(18, Bar.BLURITE, 30), BLURITE_X(17, Bar.BLURITE, -1), IRON_1(24, Bar.IRON, 1), IRON_5(23, Bar.IRON, 5), IRON_10(22, Bar.IRON, 30), IRON_X(21, Bar.IRON, -1), SILVER_1(28, Bar.SILVER, 1), SILVER_5(27, Bar.SILVER, 5), SILVER_10(26, Bar.SILVER, 30), SILVER_X(25, Bar.SILVER, -1), STEEL_1(32, Bar.STEEL, 1), STEEL_5(31, Bar.STEEL, 5), STEEL_10(30, Bar.STEEL, 30), STEEL_X(29, Bar.STEEL, -1), GOLD_1(36, Bar.GOLD, 1), GOLD_5(35, Bar.GOLD, 5), GOLD_10(34, Bar.GOLD, 30), GOLD_X(33, Bar.GOLD, -1), MITHRIL_1(40, Bar.MITHRIL, 1), MITHRIL_5(39, Bar.MITHRIL, 5), MITHRIL_10(38, Bar.MITHRIL, 30), MITHRIL_X(37, Bar.MITHRIL, -1), ADAMANT_1(44, Bar.ADAMANT, 1), ADAMANT_5(43, Bar.ADAMANT, 5), ADAMANT_10(42, Bar.ADAMANT, 30), ADAMANT_X(41, Bar.ADAMANT, -1), RUNE_1(48, Bar.RUNITE, 1), RUNE_5(47, Bar.RUNITE, 5), RUNE_10(46, Bar.RUNITE, 30), RUNE_X(45, Bar.RUNITE, -1);
/**
* Constructs a new {@code BarButton} {@code Object}.
diff --git a/Server/src/main/content/global/handlers/item/EctophialListener.kt b/Server/src/main/content/global/handlers/item/EctophialListener.kt
index 6370c9c22..111db96c5 100644
--- a/Server/src/main/content/global/handlers/item/EctophialListener.kt
+++ b/Server/src/main/content/global/handlers/item/EctophialListener.kt
@@ -13,6 +13,7 @@ import core.game.world.update.flag.context.Graphics
import org.rs09.consts.Items
import org.rs09.consts.Scenery
import org.rs09.consts.Sounds
+import content.data.Quests
@Suppress("unused")
class EctophialListener : InteractionListener {
@@ -37,7 +38,7 @@ class EctophialListener : InteractionListener {
}
on(Items.ECTOPHIAL_4251, IntType.ITEM, "empty") { player, node ->
- if (!hasRequirement(player, "Ghosts Ahoy"))
+ if (!hasRequirement(player, Quests.GHOSTS_AHOY))
return@on true
if (player.isTeleBlocked) {
diff --git a/Server/src/main/content/global/handlers/item/EnchantJewelleryTabListener.kt b/Server/src/main/content/global/handlers/item/EnchantJewelleryTabListener.kt
index 1a31d30b5..b37ed1b1e 100644
--- a/Server/src/main/content/global/handlers/item/EnchantJewelleryTabListener.kt
+++ b/Server/src/main/content/global/handlers/item/EnchantJewelleryTabListener.kt
@@ -10,12 +10,14 @@ import org.rs09.consts.Sounds
class EnchantJewelleryTabListener : InteractionListener {
private val LVL_1_ENCHANT = mapOf(
+ Items.BLUE_DRAGONHIDE_1751 to Items.PLAIN_SATCHEL_10877,
Items.SAPPHIRE_RING_1637 to Items.RING_OF_RECOIL_2550,
Items.SAPPHIRE_NECKLACE_1656 to Items.GAMES_NECKLACE8_3853,
Items.SAPPHIRE_AMULET_1694 to Items.AMULET_OF_MAGIC_1727,
Items.SAPPHIRE_BRACELET_11072 to Items.BRACELET_OF_CLAY_11074
)
private val LVL_2_ENCHANT = mapOf(
+ Items.GREEN_DRAGONHIDE_1753 to Items.GREEN_SATCHEL_10878,
Items.EMERALD_RING_1639 to Items.RING_OF_DUELLING8_2552,
Items.EMERALD_NECKLACE_1658 to Items.BINDING_NECKLACE_5521,
Items.EMERALD_AMULET_1696 to Items.AMULET_OF_DEFENCE_1729,
@@ -23,6 +25,7 @@ class EnchantJewelleryTabListener : InteractionListener {
)
private val LVL_3_ENCHANT = mapOf(
+ Items.RED_DRAGONHIDE_1749 to Items.RED_SATCHEL_10879,
Items.RUBY_RING_1641 to Items.RING_OF_FORGING_2568,
Items.RUBY_NECKLACE_1660 to Items.DIGSITE_PENDANT_5_11194,
Items.RUBY_AMULET_1698 to Items.AMULET_OF_STRENGTH_1725,
@@ -30,6 +33,7 @@ class EnchantJewelleryTabListener : InteractionListener {
)
private val LVL_4_ENCHANT = mapOf(
+ Items.DAGANNOTH_HIDE_6155 to Items.GOLD_SATCHEL_10881,
Items.DIAMOND_RING_1643 to Items.RING_OF_LIFE_2570,
Items.DIAMOND_NECKLACE_1662 to Items.PHOENIX_NECKLACE_11090,
Items.DIAMOND_AMULET_1700 to Items.AMULET_OF_POWER_1731,
@@ -37,6 +41,7 @@ class EnchantJewelleryTabListener : InteractionListener {
)
private val LVL_5_ENCHANT = mapOf(
+ Items.SUQAH_HIDE_9080 to Items.RUNE_SATCHEL_10882,
Items.DRAGONSTONE_RING_1645 to Items.RING_OF_WEALTH4_14646,
Items.DRAGON_NECKLACE_1664 to Items.SKILLS_NECKLACE4_11105,
Items.DRAGONSTONE_AMMY_1702 to Items.AMULET_OF_GLORY4_1712,
@@ -44,6 +49,7 @@ class EnchantJewelleryTabListener : InteractionListener {
)
private val LVL_6_ENCHANT = mapOf(
+ Items.BLACK_DRAGONHIDE_1747 to Items.BLACK_SATCHEL_10880,
Items.ONYX_RING_6575 to Items.RING_OF_STONE_6583,
Items.ONYX_NECKLACE_6577 to Items.BERSERKER_NECKLACE_11128,
Items.ONYX_AMULET_6581 to Items.AMULET_OF_FURY_6585,
diff --git a/Server/src/main/content/global/handlers/item/EnchantedGemListener.kt b/Server/src/main/content/global/handlers/item/EnchantedGemListener.kt
index 01d999e00..252dbe2ff 100644
--- a/Server/src/main/content/global/handlers/item/EnchantedGemListener.kt
+++ b/Server/src/main/content/global/handlers/item/EnchantedGemListener.kt
@@ -1,5 +1,6 @@
package content.global.handlers.item
+import content.global.skill.slayer.SlayerUtils
import core.api.*
import content.global.skill.slayer.Tasks
import org.rs09.consts.Items
@@ -41,7 +42,8 @@ class EnchantedGemDialogue() : DialogueFile() {
if(getSlayerTask(player!!) == Tasks.JAD) {
npcl(core.game.dialogue.FacialExpression.FRIENDLY, "You're currently assigned to kill TzTok-Jad!")
} else {
- npcl(core.game.dialogue.FacialExpression.FRIENDLY, "You're currently assigned to kill ${getSlayerTaskName(player!!)}s; only ${getSlayerTaskKillsRemaining(player!!)} more to go.")
+ npcl(core.game.dialogue.FacialExpression.FRIENDLY, "You're currently assigned to kill ${SlayerUtils.pluralise(
+ getSlayerTaskName(player!!))}; only ${getSlayerTaskKillsRemaining(player!!)} more to go.")
}
setVarp(player!!, 2502, getSlayerTaskFlags(player!!) shr 4)
stage = 1
diff --git a/Server/src/main/content/global/handlers/item/ExplorersRingPlugin.kt b/Server/src/main/content/global/handlers/item/ExplorersRingPlugin.kt
index 586967573..79208d80f 100644
--- a/Server/src/main/content/global/handlers/item/ExplorersRingPlugin.kt
+++ b/Server/src/main/content/global/handlers/item/ExplorersRingPlugin.kt
@@ -53,9 +53,9 @@ class ExplorersRingPlugin : InteractionListener {
sendMessage(player, "You have used up all of your charges for the day.")
return@on true
}
- sendDialogue(player, "Choose the item that you wish to convert to coins.")
- addDialogueAction (player) {_,_ ->
- sendItemSelect (player, "Choose") { slot, optionIndex ->
+ //sendDialogue(player, "Choose the item that you wish to convert to coins.")
+ //addDialogueAction (player) {_,_ ->
+ sendItemSelect (player, "Cast Low Level Alchemy on:") { slot, optionIndex ->
val item = player.inventory[slot]
if (item == null)
return@sendItemSelect
@@ -63,7 +63,7 @@ class ExplorersRingPlugin : InteractionListener {
return@sendItemSelect
getStoreFile()[player.username.lowercase() + ":alchs"] = remaining - 1
}
- }
+ //}
return@on true
}
diff --git a/Server/src/main/content/global/handlers/item/HouseTeleTabOptionListener.kt b/Server/src/main/content/global/handlers/item/HouseTeleTabOptionListener.kt
index 61ac1b029..ee6e3f1b8 100644
--- a/Server/src/main/content/global/handlers/item/HouseTeleTabOptionListener.kt
+++ b/Server/src/main/content/global/handlers/item/HouseTeleTabOptionListener.kt
@@ -5,24 +5,34 @@ import core.game.interaction.IntType
import core.game.interaction.InteractionListener
import core.game.node.entity.player.link.TeleportManager
import core.game.node.item.Item
+import core.game.node.entity.player.Player
+import core.game.world.repository.Repository
class HouseTeleTabOptionListener : InteractionListener {
override fun defineListeners() {
val homeTabID = 8013
on(homeTabID, IntType.ITEM, "break") {player, node ->
- var hasHouse = player.houseManager.location.exitLocation != null
- if (!hasHouse) {
- sendMessage( player, "You must have a house to teleport to before attempting that.")
- return@on false
+ //Snowscape: teleport to the last house you entered, if possible
+ var owner: Player
+ val lastHouseOwner = Repository.getPlayerByName(player.getAttribute("lasthouseentered", null))
+ if (lastHouseOwner != null && !lastHouseOwner.getHouseManager().isLocked()) {
+ owner = lastHouseOwner
+ } else {
+ var hasHouse = player.houseManager.location.exitLocation != null
+ if (!hasHouse) {
+ sendMessage( player, "You must have a house to teleport to before attempting that.")
+ return@on false
+ }
+ owner = player
}
closeInterface(player)
lock(player, 5)
if (inInventory(player, node.id)) {
- player.houseManager.preEnter(player, false)
- val location = player.houseManager.getEnterLocation()
+ owner.houseManager.preEnter(player, false)
+ val location = owner.houseManager.getEnterLocation()
if (teleport(player, location, TeleportManager.TeleportType.TELETABS)) {
removeItem(player, Item(node.id, 1))
- player.houseManager.postEnter(player, false)
+ owner.houseManager.postEnter(player, false)
}
}
return@on true
diff --git a/Server/src/main/content/global/handlers/item/ItemQuestRequirementListener.kt b/Server/src/main/content/global/handlers/item/ItemQuestRequirementListener.kt
index 4dd960bad..8acaa698a 100644
--- a/Server/src/main/content/global/handlers/item/ItemQuestRequirementListener.kt
+++ b/Server/src/main/content/global/handlers/item/ItemQuestRequirementListener.kt
@@ -4,6 +4,7 @@ import core.api.*
import core.game.node.entity.player.link.quest.QuestRepository
import org.rs09.consts.Items
import core.game.interaction.InteractionListener
+import content.data.Quests
class ItemQuestRequirementListener : InteractionListener {
@@ -106,7 +107,7 @@ class ItemQuestRequirementListener : InteractionListener {
/*
onEquip(fremennikIslesEquipment) { player, _ ->
- if (!isQuestComplete(player, "Fremennik Isles")) {
+ if (!isQuestComplete(player, Quests.THE_FREMENNIK_ISLES)) {
sendMessage(player, "You must have completed The Fremennik Isles to equip this.")
return@onEquip false
}
@@ -114,7 +115,7 @@ class ItemQuestRequirementListener : InteractionListener {
}
onEquip(fremennikIslesDuringQuestEquipment){ player, _ ->
- if (questStage(player, "Fremennik Isles") > 0) {
+ if (questStage(player, Quests.THE_FREMENNIK_ISLES) > 0) {
sendMessage(player, "You must have started The Fremennik Isles to equip this.")
return@onEquip false
}
@@ -123,23 +124,23 @@ class ItemQuestRequirementListener : InteractionListener {
*/
onEquip(fremennikTrialsEquipment) { player, _ ->
- return@onEquip hasRequirement(player, "Fremennik Trials")
+ return@onEquip hasRequirement(player, Quests.THE_FREMENNIK_TRIALS)
}
onEquip(fremennikIslesEquipment) {player, _ ->
- return@onEquip hasRequirement(player, "The Fremennik Isles")
+ return@onEquip hasRequirement(player, Quests.THE_FREMENNIK_ISLES)
}
onEquip(avasBackpacks){ player, _ ->
- return@onEquip hasRequirement(player, "Animal Magnetism")
+ return@onEquip hasRequirement(player, Quests.ANIMAL_MAGNETISM)
}
onEquip(lostCityWeapons){ player, _ ->
- return@onEquip hasRequirement(player, "Lost City")
+ return@onEquip hasRequirement(player, Quests.LOST_CITY)
}
onEquip(Items.CAPE_OF_LEGENDS_1052) { player, _ ->
- return@onEquip hasRequirement(player, "Legend's Quest")
+ return@onEquip hasRequirement(player, Quests.LEGENDS_QUEST)
}
onEquip(questCapes) { player, _ ->
@@ -152,84 +153,84 @@ class ItemQuestRequirementListener : InteractionListener {
}
onEquip(Items.WOLFBANE_2952){ player, _ ->
- return@onEquip hasRequirement(player, "Priest in Peril")
+ return@onEquip hasRequirement(player, Quests.PRIEST_IN_PERIL)
}
onEquip(Items.ANCIENT_MACE_11061){ player, _ ->
- return@onEquip hasRequirement(player, "Another Slice of H.A.M")
+ return@onEquip hasRequirement(player, Quests.ANOTHER_SLICE_OF_HAM)
}
onEquip(Items.ANCIENT_STAFF_4675){ player, _ ->
- return@onEquip hasRequirement(player, "Desert Treasure")
+ return@onEquip hasRequirement(player, Quests.DESERT_TREASURE)
}
onEquip(Items.ELEMENTAL_SHIELD_2890) { player, _ ->
- return@onEquip hasRequirement(player, "Elemental Workshop I")
+ return@onEquip hasRequirement(player, Quests.ELEMENTAL_WORKSHOP_I)
}
onEquip(crystalEquipment){ player, _ ->
- return@onEquip hasRequirement(player, "Roving Elves")
+ return@onEquip hasRequirement(player, Quests.ROVING_ELVES)
}
onEquip(dragonSlayerEquipment) {player, _ ->
- return@onEquip hasRequirement(player, "Dragon Slayer")
+ return@onEquip hasRequirement(player, Quests.DRAGON_SLAYER)
}
onEquip(Items.DRAGON_SCIMITAR_4587) {player, _ ->
- return@onEquip hasRequirement(player, "Monkey Madness")
+ return@onEquip hasRequirement(player, Quests.MONKEY_MADNESS)
}
onEquip(Items.GLOVES_7462) {player, _ ->
- return@onEquip hasRequirement(player, "Recipe for Disaster")
+ return@onEquip hasRequirement(player, Quests.RECIPE_FOR_DISASTER)
}
onEquip(Items.SLAYER_HELMET_13263) {player, _ ->
- return@onEquip hasRequirement(player, "Smoking Kills")
+ return@onEquip hasRequirement(player, Quests.SMOKING_KILLS)
}
onEquip (Items.DRAGON_HALBERD_3204) {player, _ ->
- return@onEquip hasRequirement(player, "Regicide")
+ return@onEquip hasRequirement(player, Quests.REGICIDE)
}
onEquip (Items.CLIMBING_BOOTS_3105) {player, _ ->
- return@onEquip hasRequirement(player, "Death Plateau")
+ return@onEquip hasRequirement(player, Quests.DEATH_PLATEAU)
}
onEquip (godBooks) {player, _ ->
- return@onEquip hasRequirement(player, "Horror from the Deep")
+ return@onEquip hasRequirement(player, Quests.HORROR_FROM_THE_DEEP)
}
onEquip (pharaohScepters) {player, _ ->
- return@onEquip hasRequirement(player, "Icthlarin's Little Helper")
+ return@onEquip hasRequirement(player, Quests.ICTHLARINS_LITTLE_HELPER)
}
onEquip (Items.DRAGON_SQ_SHIELD_1187) {player, _ ->
//because I know people won't believe it: https://runescape.wiki/w/Dragon_sq_shield?oldid=899636
- return@onEquip hasRequirement(player, "Legend's Quest")
+ return@onEquip hasRequirement(player, Quests.LEGENDS_QUEST)
}
onEquip (initiateArmour) {player, _ ->
- return@onEquip hasRequirement(player, "Recruitment Drive")
+ return@onEquip hasRequirement(player, Quests.RECRUITMENT_DRIVE)
}
onEquip (proselyteArmour) {player, _ ->
- return@onEquip hasRequirement(player, "The Slug Menace")
+ return@onEquip hasRequirement(player, Quests.THE_SLUG_MENACE)
}
onEquip (spiritShields) {player, _ ->
- return@onEquip hasRequirement(player, "Summer's End")
+ return@onEquip hasRequirement(player, Quests.SUMMERS_END)
}
onEquip (Items.DRAGON_MACE_1434) {player, _ ->
- return@onEquip hasRequirement(player, "Heroes' Quest")
+ return@onEquip hasRequirement(player, Quests.HEROES_QUEST)
}
onEquip (Items.DRAGON_BATTLEAXE_1377) {player, _ ->
- return@onEquip hasRequirement(player, "Heroes' Quest")
+ return@onEquip hasRequirement(player, Quests.HEROES_QUEST)
}
onEquip (Items.DARKLIGHT_6746) {player, _ ->
- return@onEquip hasRequirement(player, "Shadow of the Storm")
+ return@onEquip hasRequirement(player, Quests.SHADOW_OF_THE_STORM)
}
}
}
diff --git a/Server/src/main/content/global/handlers/item/SilverSicklePlugin.java b/Server/src/main/content/global/handlers/item/SilverSicklePlugin.java
index eb403f33b..e7529d646 100644
--- a/Server/src/main/content/global/handlers/item/SilverSicklePlugin.java
+++ b/Server/src/main/content/global/handlers/item/SilverSicklePlugin.java
@@ -8,6 +8,7 @@ import core.game.node.entity.player.Player;
import core.plugin.Initializable;
import core.plugin.Plugin;
import content.region.morytania.quest.naturespirit.NSUtils;
+import content.data.Quests;
/**
* Handles the Silver Sickle (b) to collect Mort Myre Fungus.
@@ -28,7 +29,7 @@ public final class SilverSicklePlugin extends OptionHandler {
switch (option) {
case "operate":
case "cast bloom":
- if(player.getQuestRepository().getQuest("Nature Spirit").getStage(player) >= 75) {
+ if(player.getQuestRepository().getQuest(Quests.NATURE_SPIRIT).getStage(player) >= 75) {
player.getPacketDispatch().sendAnimation(9021);
NSUtils.castBloom(player);
} else {
diff --git a/Server/src/main/content/global/handlers/item/SnowscapeSatchelListener.kt b/Server/src/main/content/global/handlers/item/SnowscapeSatchelListener.kt
new file mode 100755
index 000000000..872c94341
--- /dev/null
+++ b/Server/src/main/content/global/handlers/item/SnowscapeSatchelListener.kt
@@ -0,0 +1,183 @@
+package content.global.handlers.item
+
+import core.api.*
+import core.game.container.Container
+import content.global.skill.summoning.familiar.BurdenContainerListener
+import core.game.node.Node
+import core.game.node.entity.player.Player
+//import core.game.node.entity.player.info.login.PlayerSaver
+import core.game.node.item.Item
+import core.game.interaction.InteractionListener
+import core.game.interaction.IntType
+import org.json.simple.JSONArray
+import org.json.simple.JSONObject
+import org.json.simple.parser.JSONParser
+import org.rs09.consts.Items
+
+import core.game.component.Component
+import core.game.component.CloseEvent
+import core.game.container.access.InterfaceContainer
+import content.global.handlers.scenery.BankBoothListener
+import content.global.handlers.npc.BankerNPC
+
+/**
+ * Listener for satchels from Creature Creation, repurposed for Snowscape
+ * They are repurposed as item pouches, using the summoning familiar inventory interface
+ * @author
+ */
+class SnowscapeSatchelListener : InteractionListener {
+
+ companion object {
+
+ val plainSatchelId = 10877
+ val greenSatchelId = 10878
+ val redSatchelId = 10879
+ val blackSatchelId = 10880
+ val goldSatchelId = 10881
+ val runeSatchelId = 10882
+ val satchelIds = intArrayOf(plainSatchelId,greenSatchelId,redSatchelId,blackSatchelId,goldSatchelId,runeSatchelId)
+
+
+
+
+ private fun transferItem(player: Player, satchelId: Int, item: Item, amount: Int, withdraw: Boolean, asNote: Boolean = false) {
+ if (withdraw == false && !isAllowed(player, satchelId, unnote(item).getId())) {
+ player.sendMessage(item.getName() + " cannot be stored in the " + Item(satchelId).getName() + ".")
+ return
+ }
+ if (withdraw == true && asNote == false && satchelId == plainSatchelId) {
+ player.sendMessage("This satchel can only be emptied by a banker. Use it on a bank booth to get the items.")
+ return
+ }
+ val to = if (withdraw) player.getInventory() else getSatchel(player, satchelId)
+ val from = if (withdraw) getSatchel(player, satchelId) else player.getInventory()
+ val maximum = if (asNote) to.getMaximumAdd(note(item)) else to.getMaximumAdd(unnote(item))
+ if (maximum < 1 && withdraw == false) {
+ player.sendMessage("There is not enough space for the " + item.getName() + " in the satchel.")
+ return
+ }
+ val finalAmount = kotlin.comparisons.minOf(amount, from.getAmount(item), maximum)
+ val finalItem = Item(item.getId(), finalAmount)
+ if (finalAmount > 0 && from.remove(finalItem)) {
+ if (asNote) to.add(note(finalItem)) else to.add(unnote(finalItem))
+ }
+ }
+
+ private fun emptySatchel(player: Player, satchelId: Int, asNote: Boolean = false) {
+ if (asNote == false && satchelId == plainSatchelId) {
+ player.sendMessage("This satchel can only be emptied by a banker. Use it on a Bank Booth to get the items.")
+ return
+ }
+ val satchel = getSatchel(player, satchelId)
+ repeat(satchel.capacity()) { index ->
+ var item = satchel.get(index)
+ if (item != null) {
+ transferItem(player, satchelId, item, satchel.getAmount(item), true, asNote)
+ }
+ }
+ }
+
+
+ //Function to handle constructing the correct interfaces when the satchel is opened
+ private fun openSatchel(player: Player, node: Node) {
+ val satchelId = node.asItem().getId()
+ val satchel = getSatchel(player, satchelId)
+ if (satchel.getListeners().count() < 1) satchel.register(BurdenContainerListener(player))
+
+ player.getInterfaceManager().open(Component(671)).setCloseEvent(CloseEvent { player, component ->
+ player.getInterfaceManager().closeSingleTab()
+ removeAttribute(player, "openSatchel")
+ return@CloseEvent true
+ }
+ )
+ setAttribute(player, "openSatchel", satchelId)
+ satchel.shift()
+ player.getInterfaceManager().openSingleTab(Component(665))
+ InterfaceContainer.generateItems(player, player.getInventory().toArray(), arrayOf("Store-X","Store-All","Store-10","Store-5","Store-1"),665,0,7,4,93)
+ InterfaceContainer.generateItems(player, satchel.toArray(), arrayOf("Withdraw-X","Withdraw-All","Withdraw-10","Withdraw-5","Withdraw-1"),671,27,5,6,30)
+ }
+
+ // This is called by BurdenInterfacePlugin.java when the player interacts with the familiar interface and the "openSatchel" attribute exists
+ fun satchelInterfaceAction(player: Player, component: Component, opcode: Int, button: Int, slot: Int, itemId: Int) {
+ val satchelId = getAttribute(player, "openSatchel", 0)
+ val withdraw = component.getId() == 671
+ val container = if (withdraw) getSatchel(player, satchelId) else player.getInventory()
+ val item = if (slot >= 0 && slot < container.capacity()) container.get(slot) else null
+ if (item == null && button != 29) return
+ when (opcode) {
+ 155 -> if (button == 29) emptySatchel(player, satchelId) else transferItem(player, satchelId, item!!, 1, withdraw)
+ 196 -> transferItem(player, satchelId, item!!, 5, withdraw)
+ 124 -> transferItem(player, satchelId, item!!, 10, withdraw)
+ 199 -> transferItem(player, satchelId, item!!, container.getAmount(item), withdraw)
+ 234 -> sendInputDialogue(player, true, "Enter the amount:") { value -> transferItem(player, satchelId, item!!, value as Int, withdraw) }
+ 9 -> player.sendMessage(item!!.getDefinition().getExamine())
+ }
+ }
+
+
+
+ fun getSatchel(player: Player, satchelId: Int): Container {
+ var satchel: Container? = null
+ when (satchelId) {
+ plainSatchelId -> satchel = player.plainSatchel
+ greenSatchelId -> satchel = player.greenSatchel
+ redSatchelId -> satchel = player.redSatchel
+ blackSatchelId -> satchel = player.blackSatchel
+ goldSatchelId -> satchel = player.goldSatchel
+ runeSatchelId -> satchel = player.runeSatchel
+ }
+ return satchel!!
+ }
+
+ // Checks if the item is allowed in the satchel. The NPCDropTables.java function calls this on satchels the player is carrying.
+ fun isAllowed(player: Player, satchelId: Int, itemId: Int): Boolean {
+ when (satchelId) {
+ plainSatchelId -> return itemId !in satchelIds
+ greenSatchelId -> return (Item(itemId).getName().contains(" seed") || Item(itemId).getName().contains("Grimy") || Item(itemId).getName().contains("Clean "))
+ redSatchelId -> return itemId in intArrayOf(*(12158..12168).toList().toIntArray()) || Item(itemId).getName().equals("Clue scroll")
+ blackSatchelId -> return itemId in intArrayOf(995)
+ goldSatchelId -> return itemId in intArrayOf(436,438,440,442,444,446,447,449,451,453,668,2892,2349,2351,2353,2355,2357,2359,2361,2363,2365,1601,1603,1605,1607,1609,1611,1613,1615,1617,1619,1621,1623,1625,1627,1629,1631,6571,6573)
+ runeSatchelId -> return itemId in intArrayOf(556,555,557,554,558,559,564,562,9075,561,563,560,565,566,4694,4695,4696,4697,4698,4699)
+ }
+ return false
+ }
+ }
+
+
+
+ override fun defineListeners() {
+
+ onUseAnyWith(IntType.ITEM, *satchelIds) { player, used, with ->
+ val satchelId = with.asItem().getId()
+ transferItem(player, satchelId, used.asItem(), player.getInventory().getAmount(used.asItem()),false)
+ return@onUseAnyWith true
+ }
+
+ on(satchelIds, IntType.ITEM, "inspect","operate") { player, node ->
+ openSatchel(player, node)
+ return@on true
+ }
+
+ on(satchelIds, IntType.ITEM, "empty") { player, node ->
+ emptySatchel(player, node.asItem().getId())
+ return@on true
+ }
+
+ // BankBoothListener values are public but BankChestListener values are not, so rather than edit the BankChestListener file I have copied the IDs here. 12309 is the Culinomancer's chest.
+ val bankChests = intArrayOf(3194,4483,10562,14382,16695,16696,21301,27662,27663)
+ val bankUseWiths = intArrayOf(*BankBoothListener.BANK_BOOTHS, 12309, *bankChests)
+ onUseWith(IntType.SCENERY, satchelIds, *bankUseWiths) { player, used, with ->
+ emptySatchel(player, used.asItem().getId(), true)
+ return@onUseWith true
+ }
+
+ //6362 is the Ourania Altar banker.
+ val bankers = intArrayOf(*BankerNPC.NPC_IDS, *BankerNPC.SPECIAL_NPC_IDS, 6362)
+
+ onUseWith(IntType.NPC, satchelIds, *bankers) { player, used, with ->
+ emptySatchel(player, used.asItem().getId(), true)
+ return@onUseWith true
+ }
+
+ }
+}
diff --git a/Server/src/main/content/global/handlers/item/SnowscapeTeleorb.kt b/Server/src/main/content/global/handlers/item/SnowscapeTeleorb.kt
new file mode 100644
index 000000000..789827f2c
--- /dev/null
+++ b/Server/src/main/content/global/handlers/item/SnowscapeTeleorb.kt
@@ -0,0 +1,146 @@
+package content.global.handlers.item
+
+import core.api.*
+import core.game.node.Node
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.node.item.Item
+import core.game.interaction.InteractionListener
+import core.game.interaction.IntType
+import core.game.world.map.Location
+import core.game.world.map.build.DynamicRegion
+import core.game.world.map.zone.ZoneRestriction
+import core.game.world.update.flag.context.Animation
+import core.game.world.update.flag.context.Graphics
+import core.game.node.entity.player.link.TeleportManager
+import core.game.dialogue.*
+import core.tools.START_DIALOGUE
+import org.rs09.consts.Items
+import org.rs09.consts.Sounds
+
+import core.game.component.Component
+
+/**
+ * Listener for the strange teleorb object. Normally this object is part of the While Guthix Sleeps quest, but it has been repurposed.
+ * The new purpose is a custom teleport artifact, allowing players to save a location and teleport back to it.
+ * @author
+ */
+class SnowscapeTeleorb : InteractionListener {
+
+ // The teleorb item id
+ val teleorb = 14534
+
+ // How many law runes are required for one teleport charge
+ val runesPerTeleportNormal = 20
+ val runesPerTeleportBoosted = 2
+
+ override fun defineListeners() {
+ on(teleorb, IntType.ITEM, "inspect") { player, node ->
+ inspect(player, node)
+ return@on true
+ }
+ on(teleorb, IntType.ITEM, "activate") { player, node ->
+ activate(player, node)
+ return@on true
+ }
+ }
+ private fun inspect(player: Player, node: Node) {
+ openDialogue(player,SnowscapeTeleorbDialogue())
+ }
+
+ private fun activate(player: Player, node: Node) {
+ val charges = getAttribute(player, "teleorb:charges",0) as Int
+ var runesPerTeleport = if (getAttribute(player, "snowscape:boostedmode", false)) runesPerTeleportBoosted else runesPerTeleportNormal
+ if (charges >= runesPerTeleport) {
+ val destination = getAttribute(player, "teleorb:location", Location.create(3236,3218,0))
+ player.getTeleporter().send(destination, TeleportManager.TeleportType.ENTRANA_MAGIC_DOOR)
+ setAttribute(player, "/save:teleorb:charges", charges - runesPerTeleport)
+ player.sendMessage("Charges remaining: " + ((getAttribute(player, "teleorb:charges",0) as Int) / runesPerTeleport))
+ rewardXP(player, Skills.MAGIC, 15.0 * runesPerTeleport)
+ } else {
+ player.sendMessage("The teleorb is out of charges.")
+ }
+ }
+
+
+}
+
+
+
+
+class SnowscapeTeleorbDialogue : DialogueFile() {
+
+ // How many law runes are required for one teleport charge
+ val runesPerTeleportNormal = 20
+ val runesPerTeleportBoosted = 2
+
+ val teleorb = 14534
+ val lawRune = 563
+
+ override fun handle(componentID: Int, buttonID: Int) {
+ when (stage) {
+ START_DIALOGUE -> options("Update Location","Recharge","Show Info").also {stage++}
+
+ 1 -> when (buttonID) {
+ 1 -> player?.let {
+ end()
+ val region = it.getViewport().getRegion()
+ if (region == null || region is DynamicRegion || it.getZoneMonitor().isRestricted(ZoneRestriction.OFF_MAP)) {
+ it.sendMessage("This location cannot be saved!")
+ } else {
+ setAttribute(it, "/save:teleorb:location", it.getLocation())
+ sendInputDialogue(it, false, "Location saved. Enter a description of this location:",) { value ->
+ setAttribute(it, "/save:teleorb:description", value as String)
+ }
+ it.sendMessage("Location saved.")
+ it.graphics(Graphics(343))
+ it.animate(Animation(1818))
+ playAudio(it, Sounds.TELE_OTHER_CAST_199)
+ }
+ }
+ 2 -> options("Recharge with Law Runes","Recharge with additional orbs").also {stage++}
+ 3 -> player?.let {
+ end()
+ var runesPerTeleport = if (getAttribute(it, "snowscape:boostedmode", false)) runesPerTeleportBoosted else runesPerTeleportNormal
+ it.sendMessage("Current saved location: " + getAttribute(it, "teleorb:description", "Unknown").replace("_"," "))
+ it.sendMessage("Charges remaining: " + ((getAttribute(it, "teleorb:charges",0) as Int) / runesPerTeleport))
+ }
+ }
+ 2 -> when (buttonID) {
+ 1 -> player?.let {
+ end()
+ var runesPerTeleport = if (getAttribute(it, "snowscape:boostedmode", false)) runesPerTeleportBoosted else runesPerTeleportNormal
+ sendInputDialogue(it, true, "Each charge requires $runesPerTeleport Law Runes. How many runes would you like to use?",) { value ->
+ var amount = kotlin.math.min(amountInInventory(it,lawRune), value as Int)
+ if (removeItem(it, Item(lawRune, amount))) {
+ it.sendMessage("You charge the teleorb with $amount Law Runes.")
+ amount += (getAttribute(it, "teleorb:charges",0) as Int)
+ setAttribute(it, "/save:teleorb:charges", amount)
+ it.sendMessage("Current charges: " + ((getAttribute(it, "teleorb:charges",0) as Int) / runesPerTeleport))
+ it.graphics(Graphics(141,96))
+ it.animate(Animation(722))
+ playAudio(it, Sounds.LUNAR_EMBUE_RUNES_2888) //Yes, Imbue is mispelled in the sounds list.
+ }
+ }
+ }
+ 2 -> player?.let {
+ end()
+ var runesPerTeleport = if (getAttribute(it, "snowscape:boostedmode", false)) runesPerTeleportBoosted else runesPerTeleportNormal
+ sendInputDialogue(it, true, "Each additional orb adds one charge. How many would you like to use?",) { value ->
+ var amount = kotlin.math.min(amountInInventory(it,teleorb) - 1, value as Int)
+ if (amount > 0 && removeItem(it, Item(teleorb, amount))) {
+ it.sendMessage("You destroy $amount teleorbs, fusing their energy into one.")
+ amount = amount * runesPerTeleport
+ amount += (getAttribute(it, "teleorb:charges",0) as Int)
+ setAttribute(it, "/save:teleorb:charges", amount)
+ it.sendMessage("Current charges: " + ((getAttribute(it, "teleorb:charges",0) as Int) / runesPerTeleport))
+ it.graphics(Graphics(141,96))
+ it.animate(Animation(722))
+ playAudio(it, Sounds.LUNAR_EMBUE_RUNES_2888)
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/Server/src/main/content/global/handlers/item/TeleTabsListener.kt b/Server/src/main/content/global/handlers/item/TeleTabsListener.kt
index 21a291360..acf1ee45b 100644
--- a/Server/src/main/content/global/handlers/item/TeleTabsListener.kt
+++ b/Server/src/main/content/global/handlers/item/TeleTabsListener.kt
@@ -1,39 +1,55 @@
package content.global.handlers.item
-import core.api.inInventory
-import core.api.removeItem
-import core.api.teleport
+import content.region.kandarin.ardougne.quest.plaguecity.PlagueCityListeners.Companion.ARDOUGNE_TELE_ATTRIBUTE
+import core.api.*
import core.game.interaction.IntType
import core.game.interaction.InteractionListener
import core.game.node.entity.player.Player
import core.game.node.entity.player.link.TeleportManager
import core.game.node.item.Item
import core.game.world.map.Location
-import core.api.hasRequirement;
+import content.data.Quests
+
+import core.cache.def.impl.ItemDefinition;
class TeleTabsListener : InteractionListener {
enum class TeleTabs(val item: Int, val location: Location, val exp: Double, val requirementCheck: (Player) -> Boolean = { true }) {
ADDOUGNE_TELEPORT(8011, Location.create(2662, 3307, 0), 61.0, {
- player -> hasRequirement(player, "Plague City");
+ player -> getAttribute(player, ARDOUGNE_TELE_ATTRIBUTE, false)
}),
AIR_ALTAR_TELEPORT(13599, Location.create(2978, 3296, 0), 0.0),
- ASTRAL_ALTAR_TELEPORT(13611, Location.create(2156, 3862, 0), 0.0),
- BLOOD_ALTAR_TELEPORT(13610, Location.create(3559, 9778, 0), 0.0),
+ ASTRAL_ALTAR_TELEPORT(13611, Location.create(2156, 3862, 0), 0.0, {
+ player -> hasRequirement(player, Quests.LUNAR_DIPLOMACY);
+ }),
+ BLOOD_ALTAR_TELEPORT(13610, Location.create(3559, 9778, 0), 0.0, {
+ player -> hasRequirement(player, Quests.LEGACY_OF_SEERGAZE);
+ }),
BODY_ALTAR_TELEPORT(13604, Location.create(3055, 3443, 0), 0.0),
CAMELOT_TELEPORT(8010, Location.create(2757, 3477, 0), 55.5),
CHAOS_ALTAR_TELEPORT(13606, Location.create(3058, 3593, 0), 0.0),
- COSMIC_ALTAR_TELEPORT(13605, Location.create(2411, 4380, 0), 0.0),
- DEATH_ALTAR_TELEPORT(13609, Location.create(1863, 4639, 0), 0.0),
+ COSMIC_ALTAR_TELEPORT(13605, Location.create(2411, 4380, 0), 0.0, {
+ player -> hasRequirement(player, Quests.LOST_CITY);
+ }),
+ DEATH_ALTAR_TELEPORT(13609, Location.create(1863, 4639, 0), 0.0, {
+ player -> hasRequirement(player, Quests.MOURNINGS_END_PART_II);
+ }),
EARTH_ALTAR_TELEPORT(13602, Location.create(3304, 3472, 0), 0.0),
FALADOR_TELEPORT(8009, Location.create(2966, 3380, 0), 47.0),
FIRE_ALTAR_TELEPORT(13603, Location.create(3311, 3252, 0), 0.0),
- LAW_ALTAR_TELEPORT(13608, Location.create(2857, 3378, 0), 0.0),
+ LAW_ALTAR_TELEPORT(13608, Location.create(2857, 3378, 0), 0.0, {
+ player -> if (!ItemDefinition.canEnterEntrana(player)) (player.sendMessage("The power of Saradomin prevents you from taking armour or weaponry to Entrana.") !is Unit) else true; // ugly way of doing this, but the sendMessage function returns a Unit type, so by using !is Unit it becomes false.
+ }),
LUMBRIDGE_TELEPORT(8008, Location.create(3222, 3218, 0), 41.0),
MIND_ALTAR_TELEPORT(13600, Location.create(2979, 3510, 0), 0.0),
NATURE_ALTAR_TELEPORT(13607, Location.create(2868, 3013, 0), 0.0),
+ TELEKINETIC_GRAB(8022, Location.create(2836, 3285, 0), 0.0, {
+ player -> hasRequirement(player, Quests.DRAGON_SLAYER);
+ }),
VARROCK_TELEPORT(8007, Location.create(3212, 3423, 0), 35.00),
- WATCH_TOWER_TELEPORT(8012, Location.create(2548, 3114, 0), 68.00),
+ WATCH_TOWER_TELEPORT(8012, Location.create(2548, 3114, 0), 68.00, {
+ player -> hasRequirement(player, Quests.WATCHTOWER);
+ }),
WATER_ALTAR_TELEPORT(13601, Location.create(3182, 3162, 0), 0.0);
companion object {
@@ -51,9 +67,17 @@ class TeleTabsListener : InteractionListener {
val tabEnum = TeleTabs.forId(tab)
if (tabEnum != null && inInventory(player,tab)) {
val tabloc = tabEnum.location
- if (inInventory(player, tab) && tabEnum.requirementCheck(player)) {
- if (teleport(player, tabloc, TeleportManager.TeleportType.TELETABS)) {
- removeItem(player, Item(node.id, 1))
+ if (inInventory(player, tab)) {
+ if (tabEnum.requirementCheck(player)){
+ if (teleport(player, tabloc, TeleportManager.TeleportType.TELETABS)) {
+ removeItem(player, Item(node.id, 1))
+ }
+ }
+ else {
+ when (tabEnum){
+ TeleTabs.ADDOUGNE_TELEPORT -> sendMessage(player, "You need to complete Plague City to use this tablet.")
+ else -> sendMessage(player, "You do not have the requirements to use this tablet.")
+ }
}
}
}
diff --git a/Server/src/main/content/global/handlers/item/TeleportCrystalPlugin.java b/Server/src/main/content/global/handlers/item/TeleportCrystalPlugin.java
index 94c3b4eb7..5bbda0ffc 100644
--- a/Server/src/main/content/global/handlers/item/TeleportCrystalPlugin.java
+++ b/Server/src/main/content/global/handlers/item/TeleportCrystalPlugin.java
@@ -14,6 +14,7 @@ import core.game.world.map.zone.impl.WildernessZone;
import core.plugin.Plugin;
import static core.api.ContentAPIKt.hasRequirement;
+import content.data.Quests;
/**
* Represents the rotten potato plugin.
@@ -34,7 +35,7 @@ public final class TeleportCrystalPlugin extends OptionHandler {
@Override
public boolean handle(Player player, Node node, String option) {
- if (!hasRequirement(player, "Mourning's End Part I"))
+ if (!hasRequirement(player, Quests.MOURNINGS_END_PART_I))
return true;
if (!WildernessZone.checkTeleport(player, 20)) {
player.getPacketDispatch().sendMessage("The crystal is unresponsive.");
diff --git a/Server/src/main/content/global/handlers/item/equipment/CrystalEquipmentRegister.kt b/Server/src/main/content/global/handlers/item/equipment/CrystalEquipmentRegister.kt
index 2bb7bb48d..4504e9dfd 100644
--- a/Server/src/main/content/global/handlers/item/equipment/CrystalEquipmentRegister.kt
+++ b/Server/src/main/content/global/handlers/item/equipment/CrystalEquipmentRegister.kt
@@ -7,7 +7,7 @@ class CrystalEquipmentRegister : StartupListener {
val shield: Array = arrayOf(Items.NEW_CRYSTAL_SHIELD_4224, Items.CRYSTAL_SHIELD_FULL_4225, Items.CRYSTAL_SHIELD_9_10_4226, Items.CRYSTAL_SHIELD_8_10_4227, Items.CRYSTAL_SHIELD_7_10_4228, Items.CRYSTAL_SHIELD_6_10_4229, Items.CRYSTAL_SHIELD_5_10_4230, Items.CRYSTAL_SHIELD_4_10_4231, Items.CRYSTAL_SHIELD_3_10_4232, Items.CRYSTAL_SHIELD_2_10_4233, Items.CRYSTAL_SHIELD_1_10_4234, Items.CRYSTAL_SEED_4207)
val bow: Array = arrayOf(Items.NEW_CRYSTAL_BOW_4212, Items.CRYSTAL_BOW_FULL_4214, Items.CRYSTAL_BOW_9_10_4215, Items.CRYSTAL_BOW_8_10_4216, Items.CRYSTAL_BOW_7_10_4217, Items.CRYSTAL_BOW_6_10_4218, Items.CRYSTAL_BOW_5_10_4219, Items.CRYSTAL_BOW_4_10_4220, Items.CRYSTAL_BOW_3_10_4221, Items.CRYSTAL_BOW_2_10_4222, Items.CRYSTAL_BOW_1_10_4223, Items.CRYSTAL_SEED_4207)
override fun startup() {
- EquipmentDegrader.registerSet(250, shield)
- EquipmentDegrader.registerSet(250, bow)
+ EquipmentDegrader.registerSet(1200, shield)
+ EquipmentDegrader.registerSet(1200, bow)
}
}
\ No newline at end of file
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/AncientMaceSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/AncientMaceSpecialHandler.java
index 330523540..9c04d990f 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/AncientMaceSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/AncientMaceSpecialHandler.java
@@ -57,7 +57,7 @@ public final class AncientMaceSpecialHandler extends MeleeSwingHandler implement
state.setStyle(CombatStyle.MELEE);
int hit = 0;
if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.1, 0.98)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1));
+ hit = RandomFunction.random(calculateHit(entity, victim, 1) + 1);
if (entity.getSkills().getPrayerPoints() < entity.getSkills().getStaticLevel(5)) {
entity.getSkills().setPrayerPoints(entity.getSkills().getPrayerPoints() + hit);
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/BackstabSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/BackstabSpecialHandler.java
index bb243ad37..2baaab97e 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/BackstabSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/BackstabSpecialHandler.java
@@ -59,13 +59,10 @@ public final class BackstabSpecialHandler extends MeleeSwingHandler implements P
}
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- double accuracy = 1.0;
- if (!victim.getProperties().getCombatPulse().isAttacking()) {
- accuracy = 1.75;
- }
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, accuracy, 0.98)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.0));
- victim.getSkills().updateLevel(Skills.DEFENCE, -hit / 10, 0);
+ if (!victim.getProperties().getCombatPulse().isAttacking() || isAccurateImpact(entity, victim, CombatStyle.MELEE)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.0) + 1);
+ if (victim.getSkills().getStaticLevel(Skills.DEFENCE) >= victim.getSkills().getDynamicLevels()[Skills.DEFENCE])
+ victim.getSkills().updateLevel(Skills.DEFENCE, -hit, 0);
}
state.setEstimatedHit(hit);
return 1;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/ChainhitSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/ChainhitSpecialHandler.java
index a4682149f..b3e276dcd 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/ChainhitSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/ChainhitSpecialHandler.java
@@ -1,9 +1,7 @@
package content.global.handlers.item.equipment.special;
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.DeathTask;
+import core.game.node.entity.combat.*;
import core.game.node.entity.combat.ImpactHandler.HitsplatType;
import core.game.node.entity.impl.Animator.Priority;
import core.game.node.entity.impl.Projectile;
@@ -17,7 +15,6 @@ import core.game.world.update.flag.context.Graphics;
import core.plugin.Initializable;
import core.plugin.Plugin;
import core.tools.RandomFunction;
-import core.game.node.entity.combat.RangeSwingHandler;
import core.game.world.GameWorld;
import core.game.world.repository.Repository;
import org.rs09.consts.Sounds;
@@ -34,6 +31,13 @@ import static core.api.ContentAPIKt.playGlobalAudio;
@Initializable
public final class ChainhitSpecialHandler extends RangeSwingHandler implements Plugin {
+ /**
+ * Constructs a new {@code ChainhitSpecialHandler} {@code Object}.
+ */
+ public ChainhitSpecialHandler() {
+ super(SwingHandlerFlag.IGNORE_PRAYER_BOOSTS_DAMAGE);
+ }
+
/**
* The sp::ecial energy required.
*/
@@ -159,7 +163,7 @@ public final class ChainhitSpecialHandler extends RangeSwingHandler implements P
public boolean pulse() {
BattleState bs = new BattleState(entity, e);
bs.setMaximumHit(calculateHit(player, e, 1.0));
- bs.setEstimatedHit(RandomFunction.RANDOM.nextInt(bs.getMaximumHit()));
+ bs.setEstimatedHit(RandomFunction.random(bs.getMaximumHit() + 1));
handleHit(victim, e, player, bs);
ChainhitSpecialHandler.super.visualizeImpact(player, e, bs);
return true;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/ChinchompaSwingHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/ChinchompaSwingHandler.java
index fea739a85..0bd2e6d33 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/ChinchompaSwingHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/ChinchompaSwingHandler.java
@@ -31,13 +31,6 @@ public final class ChinchompaSwingHandler extends RangeSwingHandler {
*/
private static final Graphics END_GRAPHIC = new Graphics(157, 96);
- /**
- * Constructs a new {@code ChinchompaSwingHandler} {@code Object}.
- */
- public ChinchompaSwingHandler() {
- super(SwingHandlerFlag.IGNORE_STAT_BOOSTS_DAMAGE);
- }
-
@Override
public int swing(Entity entity, Entity victim, BattleState state) {
boolean multi = entity.getProperties().isMultiZone() && victim.getProperties().isMultiZone();
@@ -72,7 +65,7 @@ public final class ChinchompaSwingHandler extends RangeSwingHandler {
s.setStyle(CombatStyle.RANGE);
int hit = 0;
if (isAccurateImpact(entity, e, CombatStyle.RANGE)) {
- hit = RandomFunction.random(calculateHit(entity, e, 1.0));
+ hit = RandomFunction.random(calculateHit(entity, e, 1.0) + 1);
}
s.setEstimatedHit(hit);
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/CleaveSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/CleaveSpecialHandler.java
index dd669c168..f728dbaf2 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/CleaveSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/CleaveSpecialHandler.java
@@ -57,8 +57,8 @@ public final class CleaveSpecialHandler extends MeleeSwingHandler implements Plu
}
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.18, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.2203));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.25) + 1);
}
state.setEstimatedHit(hit);
return 1;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/DescentOfDarknessSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/DescentOfDarknessSpecialHandler.java
index 519f9462a..75ae1f8a8 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/DescentOfDarknessSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/DescentOfDarknessSpecialHandler.java
@@ -30,7 +30,7 @@ public final class DescentOfDarknessSpecialHandler extends RangeSwingHandler imp
/**
* The special energy required.
*/
- private static final int SPECIAL_ENERGY = 65;
+ private static final int SPECIAL_ENERGY = 55;
/**
* The descent of dragons projectile.
@@ -102,13 +102,13 @@ public final class DescentOfDarknessSpecialHandler extends RangeSwingHandler imp
state.setMaximumHit(max);
int hit = minDamage;
if (isAccurateImpact(entity, victim, CombatStyle.RANGE, 1.15, 1.0)) {
- hit += RandomFunction.random(max - minDamage);
+ hit += RandomFunction.random(max - minDamage + 1);
}
state.setEstimatedHit(hit);
if (w.getType() == WeaponType.DOUBLE_SHOT) {
hit = minDamage;
if (isAccurateImpact(entity, victim, CombatStyle.RANGE, 1.15, 1.0)) {
- hit += RandomFunction.random(max - minDamage);
+ hit += RandomFunction.random(max - minDamage + 1);
}
state.setSecondaryHit(hit);
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/EnergyDrainSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/EnergyDrainSpecialHandler.java
index c7b6dec41..4686eb2b8 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/EnergyDrainSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/EnergyDrainSpecialHandler.java
@@ -57,8 +57,8 @@ public final class EnergyDrainSpecialHandler extends MeleeSwingHandler implement
}
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.2, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.25, 1.0)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1) + 1);
}
if (victim instanceof Player) {
((Player) victim).getSettings().updateRunEnergy(10);
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/FeintSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/FeintSpecialHandler.java
index a22ba8c10..b85962790 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/FeintSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/FeintSpecialHandler.java
@@ -52,8 +52,9 @@ public final class FeintSpecialHandler extends MeleeSwingHandler implements Plug
}
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.0, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, RandomFunction.random(1.0, 1.2)));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.0, 0.25)) {
+ int minDamage = calculateHit(entity, victim, 0.2);
+ hit = minDamage + RandomFunction.random(calculateHit(entity, victim, 1.0) + 1);
}
state.setEstimatedHit(hit);
return 1;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/HamstringSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/HamstringSpecialHandler.java
index fefffaabd..6a89af4fc 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/HamstringSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/HamstringSpecialHandler.java
@@ -46,7 +46,8 @@ public final class HamstringSpecialHandler extends RangeSwingHandler implements
state.setMaximumHit(max);
int hit = 0;
if (isAccurateImpact(entity, victim)) {
- hit = RandomFunction.random(max);
+ int minDamage = calculateHit(entity, victim, 0.2);
+ hit = minDamage + RandomFunction.random(calculateHit(entity, victim, 1.0) + 1);
}
state.setEstimatedHit(hit);
Companion.useAmmo(entity, state, victim.getLocation());
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/HealingBladeSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/HealingBladeSpecialHandler.java
index 76780908b..5589c48c0 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/HealingBladeSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/HealingBladeSpecialHandler.java
@@ -57,20 +57,20 @@ public final class HealingBladeSpecialHandler extends MeleeSwingHandler implemen
}
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.12, 0.98)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.005));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 2.0, 1.0)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.1) + 1);
+ int healthRestore = hit / 2;
+ double prayerRestore = hit * 0.25;
+ if (healthRestore < 10) {
+ healthRestore = 10;
+ }
+ if (prayerRestore < 5) {
+ prayerRestore = 5;
+ }
+ entity.getSkills().heal(healthRestore);
+ entity.getSkills().incrementPrayerPoints(prayerRestore);
}
state.setEstimatedHit(hit);
- int healthRestore = hit / 2;
- double prayerRestore = hit * 0.25;
- if (healthRestore < 10) {
- healthRestore = 10;
- }
- if (prayerRestore < 5) {
- prayerRestore = 5;
- }
- entity.getSkills().heal(healthRestore);
- entity.getSkills().incrementPrayerPoints(prayerRestore);
return 1;
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/IceCleaveSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/IceCleaveSpecialHandler.java
index 42053679b..83c1e4a50 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/IceCleaveSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/IceCleaveSpecialHandler.java
@@ -57,8 +57,8 @@ public final class IceCleaveSpecialHandler extends MeleeSwingHandler implements
}
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.075, 0.98)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.005));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 2.0, 1.0)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.1) + 1);
}
state.setEstimatedHit(hit);
return 1;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/ImpaleSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/ImpaleSpecialHandler.java
index 11ddbd9f9..2e0ff5aa4 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/ImpaleSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/ImpaleSpecialHandler.java
@@ -59,7 +59,7 @@ public final class ImpaleSpecialHandler extends MeleeSwingHandler implements Plu
state.setStyle(CombatStyle.MELEE);
int hit = 0;
if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.1, 0.98)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.1));
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.1) + 1);
}
state.setEstimatedHit(hit);
return 1;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/JudgementSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/JudgementSpecialHandler.java
index 0fb647924..abdb00cc5 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/JudgementSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/JudgementSpecialHandler.java
@@ -57,8 +57,8 @@ public final class JudgementSpecialHandler extends MeleeSwingHandler implements
}
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.25, 0.98)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.25));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 2.0, 1.0)) {
+ hit = RandomFunction.random((int) (calculateHit(entity, victim, 1.1) * 1.25) + 1);
}
state.setEstimatedHit(hit);
return 1;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/PhantomStrikeSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/PhantomStrikeSpecialHandler.java
index 18af20d24..82f5b3eb3 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/PhantomStrikeSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/PhantomStrikeSpecialHandler.java
@@ -49,7 +49,7 @@ public final class PhantomStrikeSpecialHandler extends RangeSwingHandler impleme
state.setMaximumHit(max);
int hit = 0;
if (isAccurateImpact(entity, victim)) {
- hit = RandomFunction.random(max);
+ hit = RandomFunction.random(max + 1);
}
state.setEstimatedHit(hit);
Companion.useAmmo(entity, state, victim.getLocation());
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/PowershotSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/PowershotSpecialHandler.java
index aca1a0070..4fe5e5f90 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/PowershotSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/PowershotSpecialHandler.java
@@ -56,10 +56,7 @@ public final class PowershotSpecialHandler extends RangeSwingHandler implements
return -1;
}
state.setStyle(CombatStyle.RANGE);
- int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.RANGE, 1.98, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.0));
- }
+ int hit = RandomFunction.random(calculateHit(entity, victim, 1.0) + 1);
state.setEstimatedHit(hit);
Companion.useAmmo(entity, state, victim.getLocation());
return 1 + (int) Math.ceil(entity.getLocation().getDistance(victim.getLocation()) * 0.3);
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/PowerstabSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/PowerstabSpecialHandler.java
index 4c7ea7a83..172ca036c 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/PowerstabSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/PowerstabSpecialHandler.java
@@ -85,7 +85,7 @@ public final class PowerstabSpecialHandler extends MeleeSwingHandler implements
BattleState s = targets[count++] = new BattleState(entity, e);
int hit = 0;
if (isAccurateImpact(entity, e)) {
- hit = RandomFunction.random(calculateHit(entity, e, 1.0));
+ hit = RandomFunction.random(calculateHit(entity, e, 1.0) + 1);
}
s.setStyle(CombatStyle.MELEE);
s.setEstimatedHit(hit);
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/PunctureSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/PunctureSpecialHandler.java
index e489173fc..b5fc3357f 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/PunctureSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/PunctureSpecialHandler.java
@@ -61,18 +61,13 @@ public final class PunctureSpecialHandler extends MeleeSwingHandler implements P
return -1;
}
state.setStyle(CombatStyle.MELEE);
- // First hit
- //double accuracyMod, double defenceMod
int hit = 0;
- // accuracyMod defenceMod
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.05, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.1306));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.15, 1.0)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.15) + 1);
}
state.setEstimatedHit(hit);
- // Second hit
- // accuracyMod defenceMod
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.05, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.1306));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.15, 1.0)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.15) + 1);
} else {
hit = 0;
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/QuickSmashSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/QuickSmashSpecialHandler.java
index cc5e5a557..e1d043c9d 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/QuickSmashSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/QuickSmashSpecialHandler.java
@@ -3,9 +3,11 @@ package content.global.handlers.item.equipment.special;
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.DeathTask;
import core.game.node.entity.combat.MeleeSwingHandler;
import core.game.node.entity.impl.Animator.Priority;
import core.game.node.entity.player.Player;
+import core.game.node.entity.player.link.prayer.PrayerType;
import core.game.world.GameWorld;
import core.game.world.update.flag.context.Animation;
import core.game.world.update.flag.context.Graphics;
@@ -65,16 +67,22 @@ public final class QuickSmashSpecialHandler extends MeleeSwingHandler implements
return -1;
}
}
+ if (DeathTask.isDead(victim)) {
+ return -1;
+ }
if (!p.getSettings().drainSpecial(SPECIAL_ENERGY)) {
return -1;
}
- // TODO: apply protection prayers/experience manually (since this is bypassing normal BattleState machinery)
visualize(entity, victim, null);
int hit = 0;
if (isAccurateImpact(entity, victim)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.));
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.0) + 1);
}
- victim.getImpactHandler().handleImpact(entity, hit, CombatStyle.MELEE);
+ if (victim.hasProtectionPrayer(CombatStyle.MELEE))
+ hit *= (victim instanceof Player) ? 0.6 : 0;
+ BattleState b = new BattleState();
+ b.setEstimatedHit(victim.getImpactHandler().handleImpact(entity, hit, CombatStyle.MELEE).getAmount());
+ addExperience(entity, victim, b);
return 1;
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/RampageSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/RampageSpecialHandler.java
index 0aef9cd2b..2e70ab9ec 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/RampageSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/RampageSpecialHandler.java
@@ -65,15 +65,15 @@ public final class RampageSpecialHandler extends MeleeSwingHandler implements Pl
p.visualize(ANIMATION, GRAPHIC);
@SuppressWarnings("unused")
int boost = 0;
- for (int i = 0; i < 6; i++) {
- if (i == 2 || i == 3 || i == 5) {
- continue;
+ for (int i = 0; i < 7; i++) {
+ if (i == Skills.ATTACK || i == Skills.DEFENCE || i == Skills.RANGE || i == Skills.MAGIC) {
+ int drain = (int) (p.getSkills().getLevel(i) * 0.1);
+ boost += drain;
+ p.getSkills().updateLevel(i, -drain, 0);
}
- double drain = p.getSkills().getLevel(i) * 0.1;
- boost += drain;
- p.getSkills().updateLevel(i, (int) -drain, (int) (p.getSkills().getStaticLevel(i) - drain));
}
- p.getSkills().updateLevel(Skills.STRENGTH, (int) (p.getSkills().getStaticLevel(Skills.STRENGTH) * 0.20));
+ boost = 10 + (boost / 4);
+ p.getSkills().updateLevel(Skills.STRENGTH, boost, Math.max(p.getSkills().getStaticLevel(Skills.STRENGTH) + boost, p.getSkills().getLevel(Skills.STRENGTH)));
return -1;
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SaradominsLightningHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SaradominsLightningHandler.java
index 3875ba7be..9e672f4db 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SaradominsLightningHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SaradominsLightningHandler.java
@@ -52,9 +52,9 @@ public final class SaradominsLightningHandler extends MeleeSwingHandler implemen
state.setStyle(CombatStyle.MAGIC);
int hit = 0;
int secondary = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.10, 0.98)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.1));
- secondary = 5 + RandomFunction.RANDOM.nextInt(14);
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.10, 1.0)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.1) + 1);
+ secondary = 1 + RandomFunction.random(16);
}
state.setEstimatedHit(hit);
state.setSecondaryHit(secondary);
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SeercullSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SeercullSpecialHandler.java
index 5d9bc30ef..b4a374d3e 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SeercullSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SeercullSpecialHandler.java
@@ -1,5 +1,6 @@
package content.global.handlers.item.equipment.special;
+import core.game.node.entity.combat.SwingHandlerFlag;
import core.game.node.entity.skill.Skills;
import core.game.node.entity.Entity;
import core.game.node.entity.combat.BattleState;
@@ -24,6 +25,13 @@ import static core.api.ContentAPIKt.playGlobalAudio;
@Initializable
public final class SeercullSpecialHandler extends RangeSwingHandler implements Plugin {
+ /**
+ * Constructs a new {@code SeercullSpecialHandler} {@code Object}.
+ */
+ public SeercullSpecialHandler() {
+ super(SwingHandlerFlag.IGNORE_PRAYER_BOOSTS_DAMAGE);
+ }
+
/**
* The special energy required.
*/
@@ -57,11 +65,9 @@ public final class SeercullSpecialHandler extends RangeSwingHandler implements P
if (!((Player) entity).getSettings().drainSpecial(SPECIAL_ENERGY)) {
return -1;
}
- int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.RANGE, 1.05, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.0));
+ int hit = RandomFunction.random(calculateHit(entity, victim, 1.0) + 1);
+ if (victim.getSkills().getLevel(Skills.MAGIC) >= victim.getSkills().getStaticLevel(Skills.MAGIC))
victim.getSkills().updateLevel(Skills.MAGIC, -hit, 0);
- }
Companion.useAmmo(entity, state, victim.getLocation());
state.setEstimatedHit(hit);
return 1;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SeverSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SeverSpecialHandler.java
index 116e993d4..eb8419c10 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SeverSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SeverSpecialHandler.java
@@ -56,8 +56,8 @@ public final class SeverSpecialHandler extends MeleeSwingHandler implements Plug
return -1;
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.124, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.0));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.25, 1.0)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.0) + 1);
if (victim instanceof Player) {
Player p = (Player) victim;
if (p.getPrayer().get(PrayerType.PROTECT_FROM_MAGIC)) {
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/ShatterSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/ShatterSpecialHandler.java
index aebbd909f..1b226c390 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/ShatterSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/ShatterSpecialHandler.java
@@ -56,8 +56,8 @@ public final class ShatterSpecialHandler extends MeleeSwingHandler implements Pl
}
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 0.87, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.3546));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.25, 1.0)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.5) + 1);
}
state.setEstimatedHit(hit);
return 1;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SliceAndDiceSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SliceAndDiceSpecialHandler.java
index 808cae7a4..9f755280c 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SliceAndDiceSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SliceAndDiceSpecialHandler.java
@@ -56,24 +56,25 @@ public final class SliceAndDiceSpecialHandler extends MeleeSwingHandler implemen
return -1;
}
int maximum = calculateHit(entity, victim, 1.0);
- int[] hits = new int[] {0, 1};
- int hit = getHit(entity, victim, maximum);
+ int[] hits;
+ int hit = getHit(entity, victim, maximum - 1, maximum / 2);
if (hit > 0) {
- hits = new int[] {hit, hit / 2, (hit / 2) / 2, (hit / 2) - ((hit / 2) / 2)};
+ hits = new int[] {hit, hit / 2, (hit / 2) / 2, (hit / 2) / 2 + 1};
} else {
- hit = getHit(entity, victim, maximum);
+ hit = getHit(entity, victim, maximum * 7 / 8, maximum * 3 / 8);
if (hit > 0) {
- hits = new int[] {0, hit, hit / 2, hit - (hit / 2)};
+ hits = new int[] {0, hit, hit / 2, hit / 2 + 1};
} else {
- hit = getHit(entity, victim, maximum);
+ hit = getHit(entity, victim, maximum * 3 / 4, maximum / 4);
if (hit > 0) {
- hits = new int[] {0, 0, hit / 2, (hit / 2) + 10};
+ hits = new int[] {0, 0, hit, hit + 1};
} else {
- hit = getHit(entity, victim, (int) (maximum * 1.5));
+ hit = getHit(entity, victim, maximum * 5 / 4, maximum / 4);
if (hit > 0) {
hits = new int[] {0, 0, 0, hit};
} else {
- hits = new int[] {0, RandomFunction.random(2)};
+ hit = RandomFunction.random(2);
+ hits = new int[] {0, 0, hit, hit};
}
}
}
@@ -95,9 +96,9 @@ public final class SliceAndDiceSpecialHandler extends MeleeSwingHandler implemen
* @param maximum The maximum hit.
* @return The hit.
*/
- private int getHit(Entity entity, Entity victim, int maximum) {
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.25, 0.98)) {
- return RandomFunction.random(maximum);
+ private int getHit(Entity entity, Entity victim, int maximum, int minimum) {
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE)) {
+ return RandomFunction.random(minimum, maximum + 1);
}
return 0;
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SmashSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SmashSpecialHandler.java
index e4137d26c..ba4989eda 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SmashSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SmashSpecialHandler.java
@@ -59,7 +59,8 @@ public final class SmashSpecialHandler extends MeleeSwingHandler implements Plug
state.setStyle(CombatStyle.MELEE);
int hit = 0;
if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.0, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, RandomFunction.random(1.0, 1.5)));
+ int max = calculateHit(entity, victim, 1.0);
+ hit = max / 4 + RandomFunction.random(max + 1);
int lower = (int) (victim.getSkills().getLevel(Skills.DEFENCE) * 0.30);
victim.getSkills().updateLevel(Skills.DEFENCE, -lower, 0);
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SnapshotSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SnapshotSpecialHandler.java
index ddd761a21..618a0f4b2 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SnapshotSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SnapshotSpecialHandler.java
@@ -3,6 +3,7 @@ package content.global.handlers.item.equipment.special;
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.SwingHandlerFlag;
import core.game.node.entity.impl.Animator.Priority;
import core.game.node.entity.impl.Projectile;
import core.game.node.entity.player.Player;
@@ -25,6 +26,13 @@ import static core.api.ContentAPIKt.playGlobalAudio;
@Initializable
public final class SnapshotSpecialHandler extends RangeSwingHandler implements Plugin {
+ /**
+ * Constructs a new {@code SnapshotSpecialHandler} {@code Object}.
+ */
+ public SnapshotSpecialHandler() {
+ super(SwingHandlerFlag.IGNORE_PRAYER_BOOSTS_DAMAGE);
+ }
+
/**
* The special energy required.
*/
@@ -67,13 +75,13 @@ public final class SnapshotSpecialHandler extends RangeSwingHandler implements P
int max = calculateHit(entity, victim, 1.0);
state.setMaximumHit(max);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 0.9, 1.0)) {
- hit = RandomFunction.random(max);
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.43, 1.0)) {
+ hit = RandomFunction.random(max + 1);
}
state.setEstimatedHit(hit);
hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 0.9, 1.0)) {
- hit = RandomFunction.random(max);
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.43, 1.0)) {
+ hit = RandomFunction.random(max + 1);
}
state.setSecondaryHit(hit);
Companion.useAmmo(entity, state, victim.getLocation());
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SnipeSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SnipeSpecialHandler.java
index b3941ef7c..4d5b66609 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SnipeSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SnipeSpecialHandler.java
@@ -60,9 +60,10 @@ public final class SnipeSpecialHandler extends RangeSwingHandler implements Plug
}
state.setStyle(CombatStyle.RANGE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.RANGE, 1.05, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.0));
- victim.getSkills().updateLevel(Skills.DEFENCE, -hit, 0);
+ if (!victim.getProperties().getCombatPulse().isAttacking() || isAccurateImpact(entity, victim, CombatStyle.RANGE)) {
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.0) + 1);
+ if (victim.getSkills().getStaticLevel(Skills.DEFENCE) >= victim.getSkills().getDynamicLevels()[Skills.DEFENCE])
+ victim.getSkills().updateLevel(Skills.DEFENCE, -hit, 0);
}
Companion.useAmmo(entity, state, victim.getLocation());
state.setEstimatedHit(hit);
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java
index bdbef4ee4..c83d2fd5d 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java
@@ -85,7 +85,7 @@ public final class SpearWallSpecialHandler extends MeleeSwingHandler implements
if (CombatStyle.RANGE.getSwingHandler().canSwing(entity, e) != InteractionType.NO_INTERACT) {
BattleState s = targets[count++] = new BattleState(entity, e);
int hit = 0;
- hit = RandomFunction.random(calculateHit(entity, e, 1.0));
+ hit = RandomFunction.random(calculateHit(entity, e, 1.0) + 1);
s.setStyle(CombatStyle.MELEE);
s.setEstimatedHit(hit);
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java
index 4b7947736..3ef8ce0f7 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java
@@ -66,14 +66,14 @@ public final class SweepSpecialHandler extends MeleeSwingHandler implements Plug
for (BattleState s : targets) {
s.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, s.getVictim(), CombatStyle.MELEE, 1, 0.94)) {
- hit = RandomFunction.random(calculateHit(entity, s.getVictim(), 1.1));
+ if (isAccurateImpact(entity, s.getVictim(), CombatStyle.MELEE)) {
+ hit = RandomFunction.random(calculateHit(entity, s.getVictim(), 1.1) + 1);
}
s.setEstimatedHit(hit);
if (s.getVictim().size() > 1) {
hit = 0;
- if (isAccurateImpact(entity, s.getVictim(), CombatStyle.MELEE, 1, 0.94)) {
- hit = RandomFunction.random(calculateHit(entity, s.getVictim(), 1.1));
+ if (isAccurateImpact(entity, s.getVictim(), CombatStyle.MELEE, 0.75, 1.0)) {
+ hit = RandomFunction.random(calculateHit(entity, s.getVictim(), 1.1) + 1);
}
s.setSecondaryHit(hit);
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/WarstrikeSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/WarstrikeSpecialHandler.java
index 8982b198b..177769d5d 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/WarstrikeSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/WarstrikeSpecialHandler.java
@@ -57,8 +57,8 @@ public final class WarstrikeSpecialHandler extends MeleeSwingHandler implements
}
state.setStyle(CombatStyle.MELEE);
int hit = 0;
- if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.049, 0.98)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.1));
+ if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 2.0, 1.0)) {
+ hit = RandomFunction.random((int) (calculateHit(entity, victim, 1.1) * 1.1) + 1);
}
state.setEstimatedHit(hit);
if (victim instanceof Player) {
@@ -68,10 +68,10 @@ public final class WarstrikeSpecialHandler extends MeleeSwingHandler implements
if (left > 0) {
left = -victim.getSkills().updateLevel(Skills.STRENGTH, -left, 0);
if (left > 0) {
- left = -victim.getSkills().updateLevel(Skills.ATTACK, -left, 0);
+ left = (int) -(victim.getSkills().getPrayerPoints() + left);
+ victim.getSkills().decrementPrayerPoints(left);
if (left > 0) {
- left = (int) -(victim.getSkills().getPrayerPoints() + left);
- victim.getSkills().decrementPrayerPoints(left);
+ left = -victim.getSkills().updateLevel(Skills.ATTACK, -left, 0);
if (left > 0) {
left = -victim.getSkills().updateLevel(Skills.MAGIC, -left, 0);
if (left > 0)
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/WeakenSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/WeakenSpecialHandler.java
index 0fda16c8c..b8f45d90f 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/WeakenSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/WeakenSpecialHandler.java
@@ -57,18 +57,19 @@ public final class WeakenSpecialHandler extends MeleeSwingHandler implements Plu
state.setStyle(CombatStyle.MELEE);
int hit = 0;
if (isAccurateImpact(entity, victim, CombatStyle.MELEE, 1.0, 1.0)) {
- hit = RandomFunction.random(calculateHit(entity, victim, 1.0));
+ hit = RandomFunction.random(calculateHit(entity, victim, 1.0) + 1);
+ if (victim instanceof Player) {
+ ((Player) victim).getPacketDispatch().sendMessage("You have been drained.");
+ }
+ // TODO 10% drain to demons
+ int lower = (int) (victim.getSkills().getStaticLevel(Skills.DEFENCE) * 0.05) + 1;
+ victim.getSkills().updateLevel(Skills.DEFENCE, -lower, 0);
+ lower = (int) (victim.getSkills().getStaticLevel(Skills.ATTACK) * 0.05) + 1;
+ victim.getSkills().updateLevel(Skills.ATTACK, -lower, 0);
+ lower = (int) (victim.getSkills().getStaticLevel(Skills.STRENGTH) * 0.05) + 1;
+ victim.getSkills().updateLevel(Skills.STRENGTH, -lower, 0);
}
state.setEstimatedHit(hit);
- if (victim instanceof Player) {
- ((Player) victim).getPacketDispatch().sendMessage("You have been drained.");
- }
- int lower = (int) (victim.getSkills().getLevel(Skills.DEFENCE) * 0.05);
- victim.getSkills().updateLevel(Skills.DEFENCE, -lower, 0);
- int lower2 = (int) (victim.getSkills().getLevel(Skills.ATTACK) * 0.05);
- victim.getSkills().updateLevel(Skills.ATTACK, -lower2, 0);
- int lower3 = (int) (victim.getSkills().getLevel(Skills.STRENGTH) * 0.05);
- victim.getSkills().updateLevel(Skills.STRENGTH, -lower3, 0);
return hit;
}
diff --git a/Server/src/main/content/global/handlers/item/withnpc/CatOnArdougneCivilian.kt b/Server/src/main/content/global/handlers/item/withnpc/CatOnArdougneCivilian.kt
index 7046b50a2..e69de29bb 100644
--- a/Server/src/main/content/global/handlers/item/withnpc/CatOnArdougneCivilian.kt
+++ b/Server/src/main/content/global/handlers/item/withnpc/CatOnArdougneCivilian.kt
@@ -1,56 +0,0 @@
-package content.global.handlers.item.withnpc
-
-import core.api.Container
-import core.api.*
-import org.rs09.consts.Items
-import org.rs09.consts.NPCs
-import core.game.interaction.InteractionListener
-import core.game.interaction.IntType
-
-class CatOnArdougneCivilian: InteractionListener {
-
- private val civilians = intArrayOf(
- NPCs.CIVILIAN_785,
- NPCs.CIVILIAN_786,
- NPCs.CIVILIAN_787
- )
-
- private val cats = intArrayOf(
- Items.PET_CAT_1561,
- Items.PET_CAT_1562,
- Items.PET_CAT_1563,
- Items.PET_CAT_1564,
- Items.PET_CAT_1565,
- Items.PET_CAT_1566,
- Items.OVERGROWN_CAT_1567,
- Items.OVERGROWN_CAT_1568,
- Items.OVERGROWN_CAT_1569,
- Items.OVERGROWN_CAT_1570,
- Items.OVERGROWN_CAT_1571,
- Items.OVERGROWN_CAT_1572,
- Items.LAZY_CAT_6551,
- Items.LAZY_CAT_6552,
- Items.LAZY_CAT_6553,
- Items.LAZY_CAT_6554,
- Items.WILY_CAT_6555,
- Items.WILY_CAT_6556,
- Items.WILY_CAT_6557,
- Items.WILY_CAT_6558,
- Items.WILY_CAT_6559,
- Items.WILY_CAT_6560,
- Items.HELL_CAT_7582,
- Items.OVERGROWN_HELLCAT_7581,
- Items.LAZY_HELL_CAT_7584,
- Items.WILY_HELLCAT_7585,
- )
-
- override fun defineListeners() {
- onUseWith(IntType.NPC,cats,*civilians){ player, used, _ ->
- sendItemDialogue(player,Items.DEATH_RUNE_560,"You hand over the cat. newInstance(Object arg) throws Throwable {
- SceneryDefinition.forId(31155).getHandlers().put("option:pick-leaf", this);
- return this;
- }
-
- @Override
- public boolean handle(Player player, Node node, String option) {
- if (!player.getInventory().add(LEAF)) {
- player.getPacketDispatch().sendMessage("You don't have have enough space in your inventory.");
- } else {
- player.getPacketDispatch().sendMessage("You pick some doogle leaves.");
- }
- return true;
- }
-
-}
diff --git a/Server/src/main/content/global/handlers/scenery/DoorManagingPlugin.java b/Server/src/main/content/global/handlers/scenery/DoorManagingPlugin.java
index 295badfd8..b6d18c0fa 100644
--- a/Server/src/main/content/global/handlers/scenery/DoorManagingPlugin.java
+++ b/Server/src/main/content/global/handlers/scenery/DoorManagingPlugin.java
@@ -11,6 +11,9 @@ import core.game.world.map.Location;
import core.game.world.map.RegionManager;
import core.plugin.Initializable;
import core.plugin.Plugin;
+import org.rs09.consts.Sounds;
+
+import static core.api.ContentAPIKt.*;
/**
* Plugin used for handling the opening/closing of (double)
@@ -39,6 +42,14 @@ public final class DoorManagingPlugin extends OptionHandler {
if (name.contains("drawers") || name.contains("wardrobe") || name.contains("cupboard")) {
switch(option) {
case "open":
+ if (name.contains("drawers")) {
+ playAudio(player, Sounds.DRAWER_OPEN_64);
+ } else if (name.contains("wardrobe")) {
+ animate(player, 545, false);
+ playAudio(player, Sounds.WARDROBE_OPEN_96);
+ } else if (name.contains("cupboard")) {
+ playAudio(player, Sounds.CUPBOARD_OPEN_58);
+ }
case "go-through":
if (object.isActive()) {
SceneryBuilder.replace(object, object.transform(object.getId() + 1), 80);
@@ -46,6 +57,14 @@ public final class DoorManagingPlugin extends OptionHandler {
return true;
case "close":
case "shut":
+ if (name.contains("drawers")) {
+ playAudio(player, Sounds.DRAWER_CLOSE_63);
+ } else if (name.contains("wardrobe")) {
+ animate(player, 544, false);
+ playAudio(player, Sounds.WARDROBE_CLOSE_95);
+ } else if (name.contains("cupboard")) {
+ playAudio(player, Sounds.CUPBOARD_CLOSE_57);
+ }
SceneryBuilder.replace(object, object.transform(object.getId() - 1));
return true;
}
diff --git a/Server/src/main/content/global/handlers/scenery/FieldPickingPlugin.java b/Server/src/main/content/global/handlers/scenery/FieldPickingPlugin.java
index 307c09b20..1d0fa5c07 100644
--- a/Server/src/main/content/global/handlers/scenery/FieldPickingPlugin.java
+++ b/Server/src/main/content/global/handlers/scenery/FieldPickingPlugin.java
@@ -72,7 +72,7 @@ public final class FieldPickingPlugin extends OptionHandler {
player.dispatch(new ResourceProducedEvent(reward.getId(), reward.getAmount(), node, -1));
if (plant.name().startsWith("NETTLES") && (player.getEquipment().get(EquipmentContainer.SLOT_HANDS) == null || player.getEquipment().get(EquipmentContainer.SLOT_HANDS) != null && !player.getEquipment().get(EquipmentContainer.SLOT_HANDS).getName().contains("glove"))) {
player.getPacketDispatch().sendMessage("You have been stung by the nettles!");
- player.getImpactHandler().manualHit(player, 2, HitsplatType.POISON);
+ player.getImpactHandler().manualHit(player, 6, HitsplatType.POISON);
return true;
}
if (plant.respawn != -1 && plant != PickingPlant.FLAX) {
diff --git a/Server/src/main/content/global/handlers/scenery/LadderManagingPlugin.java b/Server/src/main/content/global/handlers/scenery/LadderManagingPlugin.java
index 0cb9a6500..9712fe790 100644
--- a/Server/src/main/content/global/handlers/scenery/LadderManagingPlugin.java
+++ b/Server/src/main/content/global/handlers/scenery/LadderManagingPlugin.java
@@ -23,6 +23,8 @@ public final class LadderManagingPlugin extends OptionHandler {
SceneryDefinition.setOptionHandler("climb-up", this);
SceneryDefinition.setOptionHandler("climb-down", this);
SceneryDefinition.setOptionHandler("climb", this);
+ SceneryDefinition.setOptionHandler("walk-up", this);
+ SceneryDefinition.setOptionHandler("walk-down", this);
return this;
}
diff --git a/Server/src/main/content/global/handlers/scenery/SearchOptionPlugin.java b/Server/src/main/content/global/handlers/scenery/SearchOptionPlugin.java
index 3b2144efb..f637107f1 100644
--- a/Server/src/main/content/global/handlers/scenery/SearchOptionPlugin.java
+++ b/Server/src/main/content/global/handlers/scenery/SearchOptionPlugin.java
@@ -7,6 +7,9 @@ import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.plugin.Initializable;
import core.plugin.Plugin;
+import content.data.Quests;
+
+import static core.api.ContentAPIKt.*;
/**
* Handles the search option.
@@ -80,6 +83,10 @@ public class SearchOptionPlugin extends OptionHandler {
player.getInventory().add(new Item(946));
return true;
}
+ if (node.getId() == 12799 && hasRequirement(player, Quests.IN_AID_OF_THE_MYREQUE)) {
+ openBankAccount(player);
+ return true;
+ }
player.getPacketDispatch().sendMessage("You search the " + node.getName().toLowerCase() + " but find nothing.");
return true;
}
diff --git a/Server/src/main/content/global/handlers/scenery/SignpostListener.kt b/Server/src/main/content/global/handlers/scenery/SignpostListener.kt
index 837462159..583aa259d 100644
--- a/Server/src/main/content/global/handlers/scenery/SignpostListener.kt
+++ b/Server/src/main/content/global/handlers/scenery/SignpostListener.kt
@@ -11,18 +11,21 @@ class SignpostListener : InteractionListener {
override fun defineListeners() {
on(Scenery.SIGNPOST_18493, IntType.SCENERY, "read") { player, node ->
if (node.asScenery().location.equals(Location(3235, 3228))) {
+ // Authentic
setInterfaceText(player, "Head north towards Fred's farm, and the windmill.", 135, 3) // North
setInterfaceText(player, "South to the swamps of Lumbridge.", 135, 9) // South
setInterfaceText(player, "Cross the bridge and head east to Al Kharid or north to Varrock.", 135, 8) // East
setInterfaceText(player, "West to the Lumbridge Castle and Draynor Village. Beware the goblins!", 135, 12) // West
openInterface(player, Components.AIDE_COMPASS_135)
} else if (node.asScenery().location.equals(Location(3261, 3230))) {
+ // Authentic
setInterfaceText(player, "North to farms and Varrock.", 135, 3) // North
setInterfaceText(player, "The River Lum lies to the south.", 135, 9) // South
setInterfaceText(player, "East to Al Kharid - toll gate; bring some money.", 135, 8) // East
setInterfaceText(player, "West to Lumbridge.", 135, 12) // West
openInterface(player, Components.AIDE_COMPASS_135)
} else if (node.asScenery().location.equals(Location(2983, 3278))) {
+ // Authentic
setInterfaceText(player, "North to the glorious White Knights' city of Falador.", 135, 3) // North
setInterfaceText(player, "South to Rimmington.", 135, 9) // South
setInterfaceText(player, "East to Port Sarim and Draynor Village.", 135, 8) // East
@@ -45,12 +48,14 @@ class SignpostListener : InteractionListener {
}
on(Scenery.SIGNPOST_24263, IntType.SCENERY, "read") { player, node ->
if (node.asScenery().location.equals(Location(3268, 3332))) {
+ // Authentic
setInterfaceText(player, "Sheep lay this way.", 135, 3) // North
setInterfaceText(player, "South through farms to Al Kharid and Lumbridge.", 135, 9) // South
setInterfaceText(player, "East to Al Kharid mine and follow the path north to Varrock east gate.", 135, 8) // East
setInterfaceText(player, "West to Champion's Guild and Varrock south gate.", 135, 12) // West
openInterface(player, Components.AIDE_COMPASS_135)
} else if (node.asScenery().location.equals(Location(3283, 3333))) {
+ // Authentic
setInterfaceText(player, "North to Varrock mine and Varrock east gate.", 135, 3) // North
setInterfaceText(player, "South to large Mining area and Al Kharid.", 135, 9) // South
setInterfaceText(player, "Follow the path east to the Dig Site.", 135, 8) // East
@@ -66,7 +71,13 @@ class SignpostListener : InteractionListener {
return@on true
}
on(Scenery.SIGNPOST_4132, IntType.SCENERY, "read") { player, node ->
- if (node.asScenery().location.equals(Location(3166, 3286))) {
+ if (node.asScenery().location.equals(Location(3223, 3427))) {
+ setInterfaceText(player, "North to Varrock Palace.", 135, 3) // North
+ setInterfaceText(player, "South to the Champion's Guild.", 135, 9) // South
+ setInterfaceText(player, "East to the Dig Site.", 135, 8) // East
+ setInterfaceText(player, "West to Barbarian Village and Falador.", 135, 12) // West
+ openInterface(player, Components.AIDE_COMPASS_135)
+ } else if (node.asScenery().location.equals(Location(3166, 3286))) {
setInterfaceText(player, "North to the windmill.", 135, 3) // North
setInterfaceText(player, "South to a fishing pond next to Fred's farm.", 135, 9) // South
setInterfaceText(player, "East to Lumbridge.", 135, 8) // East
@@ -133,6 +144,56 @@ class SignpostListener : InteractionListener {
}
return@on true
}
+ on(Scenery.SIGNPOST_4135, IntType.SCENERY, "read") { player, node ->
+ if (node.asScenery().location.equals(Location(3448, 3486))) {
+ setInterfaceText(player, "North to the Slayer Tower.", 135, 3) // North
+ setInterfaceText(player, "South to Mort Myre Swamp.", 135, 9) // South
+ setInterfaceText(player, "East to Canifis.", 135, 8) // East
+ setInterfaceText(player, "West to Varrock.", 135, 12) // West
+ openInterface(player, Components.AIDE_COMPASS_135)
+ } else {
+ setInterfaceText(player, "North to unknown.", 135, 3) // North
+ setInterfaceText(player, "South to unknown.", 135, 9) // South
+ setInterfaceText(player, "East to unknown.", 135, 8) // East
+ setInterfaceText(player, "West to unknown.", 135, 12) // West
+ openInterface(player, Components.AIDE_COMPASS_135)
+ }
+ return@on true
+ }
+ on(Scenery.SIGNPOST_31296, IntType.SCENERY, "read") { player, node ->
+ if (node.asScenery().location.equals(Location(3304, 3109))) {
+ // Authentic
+ setInterfaceText(player, "North to Al Kharid.", 135, 3) // North
+ setInterfaceText(player, "South to the Desert Mining Camp and Pollnivneach.", 135, 9) // South
+ setInterfaceText(player, "East and across the river to the Ruins of Uzer.", 135, 8) // East
+ setInterfaceText(player, "West to the Kalphite Lair.", 135, 12) // West
+ openInterface(player, Components.AIDE_COMPASS_135)
+ } else {
+ setInterfaceText(player, "North to unknown.", 135, 3) // North
+ setInterfaceText(player, "South to unknown.", 135, 9) // South
+ setInterfaceText(player, "East to unknown.", 135, 8) // East
+ setInterfaceText(player, "West to unknown.", 135, 12) // West
+ openInterface(player, Components.AIDE_COMPASS_135)
+ }
+ return@on true
+ }
+ on(Scenery.STONE_SIGNPOST_11630, IntType.SCENERY, "read") { player, node ->
+ // Authentic // https://youtu.be/vvHXKTOh_g4
+ if (node.asScenery().location.equals(Location(2967, 3412))) {
+ setInterfaceText(player, "North to Goblin Village.", 135, 3) // North
+ setInterfaceText(player, "South to Falador.", 135, 9) // South
+ setInterfaceText(player, "East to Varrock.", 135, 8) // East
+ setInterfaceText(player, "West to Taverley.", 135, 12) // West
+ openInterface(player, Components.AIDE_COMPASS_135)
+ } else {
+ setInterfaceText(player, "North to unknown.", 135, 3) // North
+ setInterfaceText(player, "South to unknown.", 135, 9) // South
+ setInterfaceText(player, "East to unknown.", 135, 8) // East
+ setInterfaceText(player, "West to unknown.", 135, 12) // West
+ openInterface(player, Components.AIDE_COMPASS_135)
+ }
+ return@on true
+ }
}
/**
* Old handlers of Signpost. Not all should be opening the AIDE_COMPASS.
diff --git a/Server/src/main/content/global/handlers/scenery/ThievingGuidePlugin.java b/Server/src/main/content/global/handlers/scenery/ThievingGuidePlugin.java
index 71efac4a5..4d306fc5e 100644
--- a/Server/src/main/content/global/handlers/scenery/ThievingGuidePlugin.java
+++ b/Server/src/main/content/global/handlers/scenery/ThievingGuidePlugin.java
@@ -81,24 +81,33 @@ public class ThievingGuidePlugin extends OptionHandler {
player.getDialogueInterpreter().sendDialogues(2266, null, "And where do you think you're going? A little too eager", "I think. Come and talk to me before you go wandering", "around in there.");
break;
case "crack":
- if (player.getSkills().getLevel(Skills.THIEVING) < 50) {
- player.getPacketDispatch().sendMessage("You need to be level " + level + " thief to crack this safe.");
- return true;
- }
- if (player.getInventory().freeSlots() == 0) {
- player.getPacketDispatch().sendMessage("Not enough inventory space.");
- return true;
- }
- final boolean success = success(player, Skills.THIEVING);
- player.lock(4);
- player.getPacketDispatch().sendMessage("You start cracking the safe.");
- player.animate(animations[success ? 1 : 0]);
+
GameWorld.getPulser().submit(new Pulse(3, player) {
@Override
public boolean pulse() {
+ if (player.getSkills().getLevel(Skills.THIEVING) < 50) {
+ player.getPacketDispatch().sendMessage("You need to be level " + level + " thief to crack this safe.");
+ return true;
+ }
+ if (player.getInventory().freeSlots() == 0) {
+ player.getPacketDispatch().sendMessage("Not enough inventory space.");
+ return true;
+ }
+ if (player.getSkills().getLifepoints() <= 6) {
+ player.getPacketDispatch().sendMessage("You're too injured to be dealing with traps right now.");
+ return true;
+ }
+ if (player.getLocation().getDistance(node.getLocation()) >= 1) {
+ return true;
+ }
+
+ final boolean success = success(player, Skills.THIEVING);
+ //player.lock(4);
+ player.getPacketDispatch().sendMessage("You start cracking the safe.");
+ player.animate(animations[success ? 1 : 0]);
if (success) {
handleSuccess(player, (Scenery) node);
- return true;
+ return false;
}
final boolean trapped = RandomFunction.random(3) == 1;
if (trapped) {
@@ -109,11 +118,12 @@ public class ThievingGuidePlugin extends OptionHandler {
@Override
public boolean pulse() {
player.animate(new Animation(-1, Priority.HIGH));
- return true;
+ return false;
}
});
}
- return true;
+
+ return false;
}
});
break;
diff --git a/Server/src/main/content/global/skill/agility/WildernessCourse.kt b/Server/src/main/content/global/skill/agility/WildernessCourse.kt
index ab6644421..00f08cf31 100644
--- a/Server/src/main/content/global/skill/agility/WildernessCourse.kt
+++ b/Server/src/main/content/global/skill/agility/WildernessCourse.kt
@@ -116,25 +116,19 @@ class WildernessCourse
when (counter++) {
0 -> {
AgilityHandler.forceWalk(player, -1, Location.create(x, 3937, 0), Location.create(x, 3940, 0), Animation.create(10580), 15, 0.0, null, 1) //10
- println("1")
player.teleporter.send(Location.create(3004, 3947, 0), TeleportManager.TeleportType.INSTANT, TeleportManager.WILDY_TELEPORT)
- println("tele")
counter++
AgilityHandler.forceWalk(player, 0, Location.create(x, 3948, 0), Location.create(x, 3950, 0), Animation.create(10579), 20, 12.5, null, 5) //20
- println("3")
return true
}
2 -> {
player.teleporter.send(Location.create(3004, 3947, 0), TeleportManager.TeleportType.INSTANT, TeleportManager.WILDY_TELEPORT)
- println("tele")
counter++
AgilityHandler.forceWalk(player, 0, Location.create(x, 3948, 0), Location.create(x, 3950, 0), Animation.create(10579), 20, 12.5, null, 5)
- println("3")
return true
}
3 -> {
AgilityHandler.forceWalk(player, 0, Location.create(x, 3948, 0), Location.create(x, 3950, 0), Animation.create(10579), 20, 12.5, null, 5)
- println("3")
return true
}
}
diff --git a/Server/src/main/content/global/skill/agility/shortcuts/BarSqueezeShortcut.java b/Server/src/main/content/global/skill/agility/shortcuts/BarSqueezeShortcut.java
index 2321706b1..efe0f727f 100644
--- a/Server/src/main/content/global/skill/agility/shortcuts/BarSqueezeShortcut.java
+++ b/Server/src/main/content/global/skill/agility/shortcuts/BarSqueezeShortcut.java
@@ -9,6 +9,7 @@ import core.game.world.map.Location;
import core.game.world.update.flag.context.Animation;
import core.plugin.Initializable;
import core.plugin.Plugin;
+import content.data.Quests;
/**
* Handles the bar squeezing shortcut.
@@ -61,7 +62,7 @@ public class BarSqueezeShortcut extends AgilityShortcut {
@Override
public boolean checkRequirements(Player player) {
- if (!player.getQuestRepository().isComplete("Priest in Peril") && !(player.getLocation().getY() >= 3159 && player.getLocation().getY() <= 3161)) {
+ if (!player.getQuestRepository().isComplete(Quests.PRIEST_IN_PERIL) && !(player.getLocation().getY() >= 3159 && player.getLocation().getY() <= 3161)) {
player.getDialogueInterpreter().sendDialogue("You need to have completed Priest in Peril in order to do this.");
return false;
}
diff --git a/Server/src/main/content/global/skill/agility/shortcuts/TunnelShortcut.java b/Server/src/main/content/global/skill/agility/shortcuts/TunnelShortcut.java
index 7388fde01..42cf77e34 100644
--- a/Server/src/main/content/global/skill/agility/shortcuts/TunnelShortcut.java
+++ b/Server/src/main/content/global/skill/agility/shortcuts/TunnelShortcut.java
@@ -15,6 +15,7 @@ import core.plugin.Initializable;
import core.plugin.Plugin;
import static core.api.ContentAPIKt.hasRequirement;
+import content.data.Quests;
/**
* Handles a tunnel shortcut.
@@ -73,7 +74,7 @@ public class TunnelShortcut extends AgilityShortcut {
@Override
public void run(final Player player, Scenery object, String option, boolean failed) {
if (object.getId() == 14922) {
- if (!hasRequirement(player, "Swan Song"))
+ if (!hasRequirement(player, Quests.SWAN_SONG))
return;
}
player.lock(6);
diff --git a/Server/src/main/content/global/skill/construction/BuildHotspot.java b/Server/src/main/content/global/skill/construction/BuildHotspot.java
index 32a461b9f..c5ca6c8e7 100644
--- a/Server/src/main/content/global/skill/construction/BuildHotspot.java
+++ b/Server/src/main/content/global/skill/construction/BuildHotspot.java
@@ -59,7 +59,7 @@ public enum BuildHotspot {
DINING_BENCH_1(15300, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_MID_ANIM, Decoration.BENCH_WOODEN, Decoration.BENCH_OAK, Decoration.BENCH_CARVED_OAK, Decoration.BENCH_TEAK, Decoration.BENCH_CARVED_TEAK, Decoration.BENCH_MAHOGANY, Decoration.BENCH_GILDED),
DINING_BENCH_2(15299, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_MID_ANIM, Decoration.BENCH_WOODEN, Decoration.BENCH_OAK, Decoration.BENCH_CARVED_OAK, Decoration.BENCH_TEAK, Decoration.BENCH_CARVED_TEAK, Decoration.BENCH_MAHOGANY,Decoration.BENCH_GILDED),
ROPE_BELL_PULL(15304, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.ROPE_PULL, Decoration.BELL_PULL, Decoration.FANCY_BELL_PULL),
- WALL_DECORATION(15303, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION),
+ WALL_DECORATION(15303, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION),
/**
* Low-level Work shop hotspots.
@@ -67,11 +67,11 @@ public enum BuildHotspot {
REPAIR(15448, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.REPAIR_BENCH, Decoration.WHETSTONE, Decoration.ARMOUR_STAND),
WORKBENCH(15439, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.WORKBENCH_WOODEN, Decoration.WORKBENCH_OAK,Decoration.WORKBENCH_STEEL_FRAME, Decoration.WORKBENCH_WITH_VICE,Decoration.WORKBENCH_WITH_LATHE),
CRAFTING(15441, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.CRAFTING_TABLE_1, Decoration.CRAFTING_TABLE_2,Decoration.CRAFTING_TABLE_3, Decoration.CRAFTING_TABLE_4),
- TOOL1(15443, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2, Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4, Decoration.TOOL_STORE_5),
- TOOL2(15444, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
- TOOL3(15445, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
- TOOL4(15446, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
- TOOL5(15447, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
+ TOOL1(15443, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2, Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4, Decoration.TOOL_STORE_5),
+ TOOL2(15444, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
+ TOOL3(15445, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
+ TOOL4(15446, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
+ TOOL5(15447, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
HERALDRY(15450, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.PLUMING_STAND, Decoration.SHIELD_EASEL,Decoration.BANNER_EASEL),
/**
@@ -188,20 +188,10 @@ public enum BuildHotspot {
MAP(15396, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.SMALL_MAP, Decoration.MEDIUM_MAP, Decoration.LARGE_MAP),
BOOKCASE2(15397, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.WOODEN_BOOKCASE, Decoration.OAK_BOOKCASE, Decoration.MAHOGANY_BOOKCASE),
- /**
- * Manegerie Hotspots
- */
- OBELISK(44911, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.MINI_OBELISK),
- PET_FEEDER(44910, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.OAK_PET_FEEDER, Decoration.TEAK_PET_FEEDER, Decoration.MAHOGANY_PET_FEEDER),
- PET_HOUSE(44909, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.OAK_PET_HOUSE, Decoration.TEAK_PET_HOUSE, Decoration.MAHOGANY_PET_HOUSE, Decoration.CONSECRATED_PET_HOUSE, Decoration.DESECRATED_PET_HOUSE, Decoration.NATURAL_PET_HOUSE),
- HABITAT_1(44907, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.GARDEN_HABITAT, Decoration.JUNGLE_HABITAT, Decoration.DESERT_HABITAT, Decoration.POLAR_HABITAT, Decoration.VOLCANIC_HABITAT),
- HABITAT_2(44908, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.GARDEN_HABITAT, Decoration.JUNGLE_HABITAT, Decoration.DESERT_HABITAT, Decoration.POLAR_HABITAT, Decoration.VOLCANIC_HABITAT),
-
-
/**
* Combat room hotspots.
*/
- WALL_DECORATION2(15297, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION),
+ WALL_DECORATION2(15297, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION),
STORAGE_SPACE(15296, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.GLOVE_RACK, Decoration.WEAPONS_RACK, Decoration.EXTRA_WEAPONS_RACK),
CR_RING(15277, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.BOXING_RING, Decoration.FENCING_RING, Decoration.COMBAT_RING, Decoration.NOTHING, Decoration.NOTHING2),
CR_CORNER(15278, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.BOXING_RING, Decoration.FENCING_RING, Decoration.COMBAT_RING, Decoration.NOTHING, Decoration.NOTHING2),
@@ -238,7 +228,7 @@ public enum BuildHotspot {
LECTERN(15420, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.OAK_LECTERN, Decoration.EAGLE_LECTERN, Decoration.DEMON_LECTERN, Decoration.TEAK_EAGLE_LECTERN, Decoration.TEAK_DEMON_LECTERN, Decoration.MAHOGANY_EAGLE_LECTERN, Decoration.MAHOGANY_DEMON_LECTERN),
CRYSTAL_BALL(15422, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.CRYSTAL_BALL, Decoration.ELEMENTAL_SPHERE, Decoration.CRYSTAL_OF_POWER),
BOOKCASE3(15425, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.WOODEN_BOOKCASE, Decoration.OAK_BOOKCASE, Decoration.MAHOGANY_BOOKCASE),
- WALL_CHART(15423, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.ALCHEMICAL_CHART, Decoration.ASTRONOMICAL_CHART, Decoration.INFERNAL_CHART),
+ WALL_CHART(15423, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.ALCHEMICAL_CHART, Decoration.ASTRONOMICAL_CHART, Decoration.INFERNAL_CHART),
TELESCOPE(15424, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.TELESCOPE1, Decoration.TELESCOPE2, Decoration.TELESCOPE3),
/**
@@ -394,7 +384,6 @@ public enum BuildHotspot {
linkedHotspots.add(new BuildHotspot[] { PRISON, PRISON_DOOR });
linkedHotspots.add(new BuildHotspot[] { DUNGEON_DOOR_LEFT, DUNGEON_DOOR_RIGHT });
linkedHotspots.add(new BuildHotspot[] { DUNGEON_DOOR_LEFT2, DUNGEON_DOOR_RIGHT2 });
- linkedHotspots.add(new BuildHotspot[] { HABITAT_1, HABITAT_2 });
linkedHotspots.add(new BuildHotspot[] { SMALL_PLANT_1, SMALL_PLANT1 });
linkedHotspots.add(new BuildHotspot[] { SHELVES, SHELVES_2 });
}
diff --git a/Server/src/main/content/global/skill/construction/BuildingUtils.java b/Server/src/main/content/global/skill/construction/BuildingUtils.java
index 424e5aa94..02bfbd9c2 100644
--- a/Server/src/main/content/global/skill/construction/BuildingUtils.java
+++ b/Server/src/main/content/global/skill/construction/BuildingUtils.java
@@ -349,7 +349,7 @@ public final class BuildingUtils {
*/
public static void removeDecoration(Player player, Scenery object) {
if (object.getId() == Decoration.PORTAL.getObjectId() && player.getHouseManager().getPortalAmount() <= 1) {
- player.getPacketDispatch().sendMessage("You need atleast one portal, how else would you leave your house?");
+ sendMessage(player, "You need at least one portal, how else would you leave your house?");
return;
}
Location l = object.getLocation();
@@ -369,6 +369,10 @@ public final class BuildingUtils {
if (objectId == object.getId() && hotspot.getCurrentX() == l.getChunkOffsetX() && hotspot.getCurrentY() == l.getChunkOffsetY()) {
player.animate(REMOVE_ANIMATION);
removeDecoration(player, region, room, hotspot, object, style);
+ Decoration decoration = Decoration.forObjectId(object.getId());
+ for (Item item : decoration.getRefundItems()) {
+ addItemOrDrop(player, item.getId(), item.getAmount());
+ }
break;
}
}
diff --git a/Server/src/main/content/global/skill/construction/CrestType.java b/Server/src/main/content/global/skill/construction/CrestType.java
index f54466772..277c77231 100644
--- a/Server/src/main/content/global/skill/construction/CrestType.java
+++ b/Server/src/main/content/global/skill/construction/CrestType.java
@@ -3,6 +3,7 @@ package content.global.skill.construction;
import core.game.node.entity.player.Player;
import org.rs09.consts.Items;
import core.game.node.entity.skill.Skills;
+import content.data.Quests;
/**
* Family crest types.
@@ -16,7 +17,7 @@ public enum CrestType implements CrestRequirement {
@Override
public boolean eligible(Player player) {
- return player.getQuestRepository().isComplete("Shield of Arrav");
+ return player.getQuestRepository().isComplete(Quests.SHIELD_OF_ARRAV);
}
},
ASGARNIA("the symbol of Asgarnia"), // no requirements
@@ -24,21 +25,21 @@ public enum CrestType implements CrestRequirement {
@Override
public boolean eligible(Player player) {
- return player.getQuestRepository().isComplete("The Lost Tribe");
+ return player.getQuestRepository().isComplete(Quests.THE_LOST_TRIBE);
}
},
DRAGON("a dragon") { // requires Dragon Slayer
@Override
public boolean eligible(Player player) {
- return player.getQuestRepository().isComplete("Dragon Slayer");
+ return player.getQuestRepository().isComplete(Quests.DRAGON_SLAYER);
}
},
FAIRY("a fairy") { // requries Lost City
@Override
public boolean eligible(Player player) {
- return player.getQuestRepository().isComplete("Lost City");
+ return player.getQuestRepository().isComplete(Quests.LOST_CITY);
}
},
GUTHIX("the symbol of Guthix") { // Requires 70+ Prayer
diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index 058de5a8b..95ad2c9b3 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -1,6 +1,4 @@
package content.global.skill.construction;
-
-
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.game.node.scenery.Scenery;
@@ -9,1071 +7,690 @@ import org.rs09.consts.Items;
/**
* Represents the decorations.
- * @author Emperor
+ * @author Emperor, Player Name
*
*/
public enum Decoration {
-
/**
* Garden centrepiece decorations.
*/
- PORTAL(13405, 8168, 1, 100.0, new Item(Items.IRON_BAR_2351, 10)),
- ROCK(13406, 8169, 5, 100.0, new Item(Items.LIMESTONE_BRICK_3420, 5)),
- POND(13407, 8170, 10, 100.0, new Item(Items.SOFT_CLAY_1761, 10)),
- IMP_STATUE(13408, 8171, 15, 150.0, new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5)),
- SMALL_OBELISK(42004, 14657, 41, 676, new Item(Items.MARBLE_BLOCK_8786, 1), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10)),
- DUNGEON_ENTRANCE(13409, 8172, 70, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
+ PORTAL (13405, 8168, 1, 100, new Item[] { new Item(Items.IRON_BAR_2351, 10) }),
+ ROCK (13406, 8169, 5, 100, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5) }),
+ POND (13407, 8170, 10, 100, new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
+ IMP_STATUE (13408, 8171, 15, 150, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5) }),
+ SMALL_OBELISK (42004, 14657, 41, 676, new Item[] { new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10) }),
+ DUNGEON_ENTRANCE(13409, 8172, 70, 500, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
-
/**
* Garden big tree decorations.
*/
- BIG_DEAD_TREE(13411, 8173, 5, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_DEAD_TREE_8417)),
- BIG_TREE(13412, 8174, 10, 44.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_NICE_TREE_8419)),
- BIG_OAK_TREE(13413, 8175, 15, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_OAK_TREE_8421)),
- BIG_WILLOW_TREE(13414, 8176, 30, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_WILLOW_TREE_8423)),
- BIG_MAPLE_TREE(13415, 8177, 45, 122.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MAPLE_TREE_8425)),
- BIG_YEW_TREE(13416, 8178, 60, 141.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_YEW_TREE_8427)),
- BIG_MAGIC_TREE(13417, 8179, 75, 223.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MAGIC_TREE_8429)),
-
+ BIG_DEAD_TREE (13411, 8173, 5, 31, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) }),
+ BIG_TREE (13412, 8174, 10, 44, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) }),
+ BIG_OAK_TREE (13413, 8175, 15, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) }),
+ BIG_WILLOW_TREE(13414, 8176, 30, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) }),
+ BIG_MAPLE_TREE (13415, 8177, 45, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) }),
+ BIG_YEW_TREE (13416, 8178, 60, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) }),
+ BIG_MAGIC_TREE (13417, 8179, 75, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) }),
+
/**
* Garden tree decorations.
*/
- DEAD_TREE(13418, 8173, 5, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_DEAD_TREE_8417)),
- TREE(13419, 8174, 10, 44.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_NICE_TREE_8419)),
- OAK_TREE(13420, 8175, 15, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_OAK_TREE_8421)),
- WILLOW_TREE(13421, 8176, 30, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_WILLOW_TREE_8423)),
- MAPLE_TREE(13423, 8177, 45, 122.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MAPLE_TREE_8425)),
- YEW_TREE(13422, 8178, 60, 141.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_YEW_TREE_8427)),
- MAGIC_TREE(13424, 8179, 75, 223.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MAGIC_TREE_8429)),
-
+ DEAD_TREE (13418, 8173, 5, 31, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) }),
+ TREE (13419, 8174, 10, 44, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) }),
+ OAK_TREE (13420, 8175, 15, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) }),
+ WILLOW_TREE(13421, 8176, 30, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) }),
+ MAPLE_TREE (13423, 8177, 45, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) }),
+ YEW_TREE (13422, 8178, 60, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) }),
+ MAGIC_TREE (13424, 8179, 75, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) }),
+
/**
* Garden big plant 1 decorations.
*/
- FERN(13425, 8186, 1, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_1_8431)),
- BUSH(13426, 8187, 6, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_2_8433)),
- TALL_PLANT(13427, 8188, 12, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_3_8435)),
-
+ FERN (13425, 8186, 1, 31, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+ BUSH (13426, 8187, 6, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+ TALL_PLANT(13427, 8188, 12, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
+
/**
* Garden big plant 2 decorations.
*/
- SHORT_PLANT(13428, 8189, 1, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_1_8431)),
- LARGE_LEAF_PLANT(13429, 8190, 6, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_2_8433)),
- HUGE_PLANT(13430, 8191, 12, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_3_8435)),
+ SHORT_PLANT (13428, 8189, 1, 31, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+ LARGE_LEAF_PLANT(13429, 8190, 6, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+ HUGE_PLANT (13430, 8191, 12, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
/**
* Garden small plant 1 decorations.
*/
- PLANT(13431, 8180, 1, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_1_8431)),
- SMALL_FERN(13432, 8181, 6, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_2_8433)),
- FERN_SP(13433, 8182, 12, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_3_8435)),
+ PLANT (13431, 8180, 1, 31, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+ SMALL_FERN(13432, 8181, 6, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+ FERN_SP (13433, 8182, 12, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
/**
* Garden small plant 2 decorations.
*/
- DOCK_LEAF(13434, 8183, 1, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_1_8431)),
- THISTLE(13435, 8184, 6, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_2_8433)),
- REEDS(13436, 8185, 12, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_3_8435)),
-
+ DOCK_LEAF(13434, 8183, 1, 31, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+ THISTLE (13435, 8184, 6, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+ REEDS (13436, 8185, 12, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
+
/**
* Parlour chair spot
*/
- CRUDE_CHAIR(13581, 8309, 1, 66.0, new Item(Items.PLANK_960, 2)),
- WOODEN_CHAIR(13582, 8310, 8, 96.0, new Item(Items.PLANK_960, 3)),
- ROCKING_CHAIR(13583, 8311, 14, 96.0, new Item(Items.PLANK_960, 3)),
- OAK_CHAIR(13584, 8312, 19, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- OAK_ARMCHAIR(13585, 8313, 26, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
- TEAK_ARMCHAIR(13586, 8314, 35, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
- MAHOGANY_ARMCHAIR(13587, 8315, 50, 280.0, new Item(Items.MAHOGANY_PLANK_8782, 2)),
+ CRUDE_CHAIR (13581, 8309, 1, 58, new Item[] { new Item(Items.PLANK_960, 2) }),
+ WOODEN_CHAIR (13582, 8310, 8, 87, new Item[] { new Item(Items.PLANK_960, 3) }),
+ ROCKING_CHAIR (13583, 8311, 14, 87, new Item[] { new Item(Items.PLANK_960, 3) }),
+ OAK_CHAIR (13584, 8312, 19, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ OAK_ARMCHAIR (13585, 8313, 26, 180, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+ TEAK_ARMCHAIR (13586, 8314, 35, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ MAHOGANY_ARMCHAIR(13587, 8315, 50, 280, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
/**
* Rugs rugs rugs
*/
- BROWN_RUG_CORNER(13588, 8316, 2, 30.0, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- RED_RUG_CORNER(13591, 8317, 13, 60.0, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- OPULENT_RUG_CORNER(13594, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 1)),
-
- BROWN_RUG_END(13589, 8316, 2, 30.0, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- RED_RUG_END(13592, 8317, 13, 60.0, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- OPULENT_RUG_END(13595, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 1)),
-
- BROWN_RUG_CENTER(13590, 8316, 2, 30.0, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- RED_RUG_CENTER(13593, 8317, 13, 60.0, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- OPULENT_RUG_CENTER(13596, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 1)),
+ BROWN_RUG_CORNER (13588, 8316, 2, 30, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ RED_RUG_CORNER (13591, 8317, 13, 60, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ OPULENT_RUG_CORNER(13594, 8318, 65, 360, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
+ BROWN_RUG_END (13589, 8316, 2, 30, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ RED_RUG_END (13592, 8317, 13, 60, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ OPULENT_RUG_END (13595, 8318, 65, 360, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
+ BROWN_RUG_CENTER (13590, 8316, 2, 30, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ RED_RUG_CENTER (13593, 8317, 13, 60, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ OPULENT_RUG_CENTER(13596, 8318, 65, 360, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
/**
* Parlour fireplaces
*/
- CLAY_FIREPLACE(13609, 8325, 3, 30.0, new Item(Items.SOFT_CLAY_1761, 3)),
- STONE_FIREPLACE(13611, 8326, 33, 40.0, new Item(Items.LIMESTONE_BRICK_3420, 2)),
- MARBLE_FIREPLACE(13613, 8327, 63, 500.0, new Item(Items.MARBLE_BLOCK_8786, 1)),
+ CLAY_FIREPLACE (13609, 8325, 3, 30, new Item[] { new Item(Items.SOFT_CLAY_1761, 3) }),
+ STONE_FIREPLACE (13611, 8326, 33, 40, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+ MARBLE_FIREPLACE(13613, 8327, 63, 500, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
/**
* Parlour curtain spot
*/
- TORN_CURTAINS(13603, 8322, 2, 132.0, new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
- CURTAINS(13604, 8323, 18, 225.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
- OPULENT_CURTAINS(13605, 8324, 40, 315.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
+ TORN_CURTAINS (13603, 8322, 2, 132, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
+ CURTAINS (13604, 8323, 18, 225, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
+ OPULENT_CURTAINS(13605, 8324, 40, 315, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
/**
- * Parlour bookcases
+ * Bookcases
*/
- WOODEN_BOOKCASE(13597, 8319, 4, 132.0, new Item(Items.PLANK_960, 4)),
- OAK_BOOKCASE(13598, 8320, 29, 225.0, new Item(Items.OAK_PLANK_8778, 3)),
- MAHOGANY_BOOKCASE(13599, 8321, 40, 315.0, new Item(Items.MAHOGANY_PLANK_8782, 3)),
+ WOODEN_BOOKCASE (13597, 8319, 4, 115, new Item[] { new Item(Items.PLANK_960, 4) }),
+ OAK_BOOKCASE (13598, 8320, 29, 180, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+ MAHOGANY_BOOKCASE(13599, 8321, 40, 420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
-
/**
* Kitchen Beer Barrels
* TODO: These also require cooking levels!
* Basic: 1, Cider: 14, Asgarnian: 24, Greenman's: 29, D.Bitter: 39, Chef's: 54
*
*/
- BASIC_BEER_BARREL(13568, 8239, 7, 87.0, new Item(Items.PLANK_960, 3)),
- CIDER_BARREL(13569, 8240, 12, 91.0, new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8)),
- ASGARNIAN_ALE_BARREL(13570, 8241, 18, 184.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.ASGARNIAN_ALE_1905, 8)),
- GREENMANS_ALE_BARREL(13571, 8242, 26, 184.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8)),
- DRAGON_BITTER_BARREL(13572, 8243, 36, 224.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2)),
- CHEFS_DELIGHT_BARREL(13573, 8244, 48, 224.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.CHEFS_DELIGHT_5755, 8), new Item(Items.STEEL_BAR_2353, 2)),
-
-
+ BASIC_BEER_BARREL (13568, 8239, 7, 87, new Item[] { new Item(Items.PLANK_960, 3) }),
+ CIDER_BARREL (13569, 8240, 12, 91, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8) }),
+ ASGARNIAN_ALE_BARREL(13570, 8241, 18, 184, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.ASGARNIAN_ALE_1905, 8) }),
+ GREENMANS_ALE_BARREL(13571, 8242, 26, 184, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8) }),
+ DRAGON_BITTER_BARREL(13572, 8243, 36, 224, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2) }),
+ CHEFS_DELIGHT_BARREL(13573, 8244, 48, 224, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.CHEFS_DELIGHT_5755, 8), new Item(Items.STEEL_BAR_2353, 2) }),
+
/**
* Kitchen Tables!
*/
- KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87.0, new Item(Items.PLANK_960, 3)),
- KITCHEN_OAK_TABLE(13578, 8247, 32, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
- KITCHEN_TEAK_TABLE(13579, 8248, 52, 270.0, new Item(Items.TEAK_PLANK_8780, 3)),
-
-
+ KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87, new Item[] { new Item(Items.PLANK_960, 3) }),
+ KITCHEN_OAK_TABLE (13578, 8247, 32, 180, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+ KITCHEN_TEAK_TABLE (13579, 8248, 52, 270, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+
/**
* Kitchen Stoves
*/
- BASIC_FIREPIT(13528, 8216, 5, 40.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 1)),
- FIREPIT_WITH_HOOK(13529, 8217, 11, 60.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2)),
- FIREPIT_WITH_POT(13531, 8218, 17, 80.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3)),
- SMALL_OVEN(13533, 8219, 24, 80.0, new Item(Items.STEEL_BAR_2353, 4)),
- LARGE_OVEN(13536, 8220, 29, 100.0, new Item(Items.STEEL_BAR_2353, 5)),
- BASIC_RANGE(13539, 8221, 34, 120.0, new Item(Items.STEEL_BAR_2353, 6)),
- FANCY_RANGE(13542, 8222, 42, 160.0, new Item(Items.STEEL_BAR_2353, 8)),
-
+ BASIC_FIREPIT (13528, 8216, 5, 40, new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353) }),
+ FIREPIT_WITH_HOOK(13529, 8217, 11, 60, new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2) }),
+ FIREPIT_WITH_POT (13531, 8218, 17, 80, new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3) }),
+ SMALL_OVEN (13533, 8219, 24, 80, new Item[] { new Item(Items.STEEL_BAR_2353, 4) }),
+ LARGE_OVEN (13536, 8220, 29, 100, new Item[] { new Item(Items.STEEL_BAR_2353, 5) }),
+ BASIC_RANGE (13539, 8221, 34, 120, new Item[] { new Item(Items.STEEL_BAR_2353, 6) }),
+ FANCY_RANGE (13542, 8222, 42, 160, new Item[] { new Item(Items.STEEL_BAR_2353, 8) }),
+
/**
* Kitchen larders
*/
- WOODEN_LARDER(13565, 8233, 9, 228.0, new Item(Items.PLANK_960, 8)),
- OAK_LARDER(13566, 8234, 33, 480.0, new Item(Items.OAK_PLANK_8778, 8)),
- TEAK_LARDER(13567, 8235, 43, 750.0, new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-
-
+ WOODEN_LARDER(13565, 8233, 9, 228, new Item[] { new Item(Items.PLANK_960, 8) }),
+ OAK_LARDER (13566, 8234, 33, 480, new Item[] { new Item(Items.OAK_PLANK_8778, 8) }),
+ TEAK_LARDER (13567, 8235, 43, 750, new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+
/**
* Kitchen shelves
*/
- WOODEN_SHELVES_1(13545, 8223, 6, 87.0, new Item(Items.PLANK_960, 3)),
- WOODEN_SHELVES_2(13546, 8224, 12, 147.0, new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6)),
- WOODEN_SHELVES_3(13547, 8225, 23, 147.0, new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6)),
- OAK_SHELVES_1(13548, 8226, 34, 240.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6)),
- OAK_SHELVES_2(13549, 8227, 45, 240.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6)),
- TEAK_SHELVES_1(13550, 8228, 56, 330.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6)),
- TEAK_SHELVES_2(13551, 8229, 67, 930.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2)),
-
+ WOODEN_SHELVES_1(13545, 8223, 6, 87, new Item[] { new Item(Items.PLANK_960, 3) }),
+ WOODEN_SHELVES_2(13546, 8224, 12, 147, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+ WOODEN_SHELVES_3(13547, 8225, 23, 147, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+ OAK_SHELVES_1 (13548, 8226, 34, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+ OAK_SHELVES_2 (13549, 8227, 45, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+ TEAK_SHELVES_1 (13550, 8228, 56, 330, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+ TEAK_SHELVES_2 (13551, 8229, 67, 930, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2) }),
+
/**
* Kitchen sinks
*/
- PUMP_AND_DRAIN(13559, 8230, 7, 100.0, new Item(Items.STEEL_BAR_2353, 5)),
- PUMP_AND_TUB(13561, 8231, 27, 200.0, new Item(Items.STEEL_BAR_2353, 10)),
- SINK(13563, 8232, 47, 300.0, new Item(Items.STEEL_BAR_2353, 15)),
-
-
+ PUMP_AND_DRAIN(13559, 8230, 7, 100, new Item[] { new Item(Items.STEEL_BAR_2353, 5) }),
+ PUMP_AND_TUB (13561, 8231, 27, 200, new Item[] { new Item(Items.STEEL_BAR_2353, 10) }),
+ SINK (13563, 8232, 47, 300, new Item[] { new Item(Items.STEEL_BAR_2353, 15) }),
+
/**
* Kitchen cat baskets/blankets
*/
- CAT_BLANKET(13574, 8236, 5, 15.0, new Item(Items.BOLT_OF_CLOTH_8790, 1)),
- CAT_BASKET(13575, 8237, 19, 58.0, new Item(Items.PLANK_960, 2)),
- CAST_BASKET_CUSHIONED(13576, 8238, 33, 58.0, new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2)),
-
-
+ CAT_BLANKET (13574, 8236, 5, 15, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790) }),
+ CAT_BASKET (13575, 8237, 19, 58, new Item[] { new Item(Items.PLANK_960, 2) }),
+ CAST_BASKET_CUSHIONED(13576, 8238, 33, 58, new Item[] { new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2) }),
+
/**
* Dining room tables
*/
- DINING_TABLE_WOOD(13293, 8246, 10, 115.0, new Item(Items.PLANK_960, 4)),
- DINING_TABLE_OAK(13294, 8247, 22, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
- DINING_TABLE_CARVED_OAK(13295, 8247, 31, 360.0, new Item(Items.OAK_PLANK_8778, 6)),
- DINING_TABLE_TEAK(13296, 8248, 38, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
- DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- DINING_TABLE_MAHOGANY(13298, 8120, 52, 840.0, new Item(Items.MAHOGANY_PLANK_8782, 6)),
- DINING_TABLE_OPULENT(13299, 8121, 72, 3100.0, new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4),
- new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2)),
-
+ DINING_TABLE_WOOD (13293, 8246, 10, 115, new Item[] { new Item(Items.PLANK_960, 4) }),
+ DINING_TABLE_OAK (13294, 8247, 22, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+ DINING_TABLE_CARVED_OAK (13295, 8247, 31, 360, new Item[] { new Item(Items.OAK_PLANK_8778, 6) }),
+ DINING_TABLE_TEAK (13296, 8248, 38, 360, new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+ DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600, new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ DINING_TABLE_MAHOGANY (13298, 8120, 52, 840, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) }),
+ DINING_TABLE_OPULENT (13299, 8121, 72, 3100, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2) }),
/**
* Dining room benches
*/
- BENCH_WOODEN(13300, 8108, 10, 115.0, new Item(Items.PLANK_960, 4)),
- BENCH_OAK(13301, 8109, 22, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
- BENCH_CARVED_OAK(13302, 8110, 31, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
- BENCH_TEAK(13303, 8111, 38, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
- BENCH_CARVED_TEAK(13304, 8112, 44, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
- BENCH_MAHOGANY(13305, 8113, 52, 560.0, new Item(Items.MAHOGANY_PLANK_8782, 6)),
- BENCH_GILDED(13306, 8114, 61, 1760.0, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4)),
-
+ BENCH_WOODEN (13300, 8108, 10, 115, new Item[] { new Item(Items.PLANK_960, 4) }),
+ BENCH_OAK (13301, 8109, 22, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+ BENCH_CARVED_OAK (13302, 8110, 31, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+ BENCH_TEAK (13303, 8111, 38, 360, new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+ BENCH_CARVED_TEAK(13304, 8112, 44, 360, new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+ BENCH_MAHOGANY (13305, 8113, 52, 560, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) }),
+ BENCH_GILDED (13306, 8114, 61, 1760, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) }),
+
/**
* Dining room bell-pulls
*/
- ROPE_PULL(13307, 8099, 5, 15.0, new Item(Items.ROPE_954, 1), new Item(Items.OAK_PLANK_8778, 1)),
- BELL_PULL(13308, 8100, 19, 58.0, new Item(Items.TEAK_PLANK_8780, 1), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- FANCY_BELL_PULL(13309, 8101, 33, 58.0, new Item(Items.TEAK_PLANK_8780, 1), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 1)),
-
+ ROPE_PULL (13307, 8099, 5, 15, new Item[] { new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778) }),
+ BELL_PULL (13308, 8100, 19, 58, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ FANCY_BELL_PULL(13309, 8101, 33, 58, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784) }),
+
/**
* Workshop workbench
*/
- WORKBENCH_WOODEN(13704, 8375, 17, 145.0, new Item(Items.PLANK_960, 1)),
- WORKBENCH_OAK(13705, 8376, 32, 300.0, new Item(Items.OAK_PLANK_8778, 5)),
- WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4)),
- WORKBENCH_WITH_VICE(13707, 8378, 62, 750.0, new Item(Items.STEEL_FRAMED_BENCH_8377, 1), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353, 1)),
- WORKBENCH_WITH_LATHE(13708, 8379, 77, 1000.0, new Item(Items.OAK_WORKBENCH_8376, 1), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353, 1)),
-
+ WORKBENCH_WOODEN (13704, 8375, 17, 143, new Item[] { new Item(Items.PLANK_960, 5) }),
+ WORKBENCH_OAK (13705, 8376, 32, 300, new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+ WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440, new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4) }),
+ WORKBENCH_WITH_VICE (13707, 8378, 62, 750, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.STEEL_BAR_2353, 5) }),
+ WORKBENCH_WITH_LATHE (13708, 8379, 77, 1000, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.STEEL_BAR_2353, 6) }),
+
/**
* Workshop repair benches/stands
*/
- REPAIR_BENCH(13713, 8389, 15, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- WHETSTONE(13714, 8390, 35, 260.0, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420, 1)),
- ARMOUR_STAND(13715, 8391, 55, 500.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420, 1)),
-
+ REPAIR_BENCH(13713, 8389, 15, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ WHETSTONE (13714, 8390, 35, 260, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420) }),
+ ARMOUR_STAND(13715, 8391, 55, 500, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420) }),
+
/**
* Workshop easels
*/
- PLUMING_STAND(13716, 8392, 16, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- SHIELD_EASEL(13717, 8393, 41, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
- BANNER_EASEL(13718, 8394, 66, 510.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-
+ PLUMING_STAND(13716, 8392, 16, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ SHIELD_EASEL (13717, 8393, 41, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+ BANNER_EASEL (13718, 8394, 66, 510, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+
/**
* Workshop crafting tables
* TODO: These are upgradable hotspots, therefore crafting table 3 would require
* crafting table 2 to be already built in that spot.
*/
- CRAFTING_TABLE_1(13709, 8380, 16, 50.0, new Item(Items.OAK_PLANK_8778, 4)),
- CRAFTING_TABLE_2(13710, 8381, 25, 100.0, new Item(Items.MOLTEN_GLASS_1775, 1)),
- CRAFTING_TABLE_3(13711, 8382, 34, 175.0, new Item(Items.MOLTEN_GLASS_1775, 2)),
- CRAFTING_TABLE_4(13712, 8383, 42, 240.0, new Item(Items.OAK_PLANK_8778, 2)),
-
+ CRAFTING_TABLE_1(13709, 8380, 16, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+ CRAFTING_TABLE_2(13710, 8381, 25, 1, new Item[] { new Item(Items.MOLTEN_GLASS_1775) }),
+ CRAFTING_TABLE_3(13711, 8382, 34, 2, new Item[] { new Item(Items.MOLTEN_GLASS_1775, 2) }),
+ CRAFTING_TABLE_4(13712, 8383, 42, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+
/**
* Workshop tool stores
* These are also upgradable just like the tables above.
*/
- TOOL_STORE_1(13699, 8384, 15, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- TOOL_STORE_2(13700, 8385, 25, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- TOOL_STORE_3(13701, 8386, 35, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- TOOL_STORE_4(13702, 8387, 44, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- TOOL_STORE_5(13703, 8388, 55, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
+ TOOL_STORE_1(13699, 8384, 15, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TOOL_STORE_2(13700, 8385, 25, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TOOL_STORE_3(13701, 8386, 35, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TOOL_STORE_4(13702, 8387, 44, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TOOL_STORE_5(13703, 8388, 55, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-
/**
* Wall-mounted decorations
*/
- OAK_DECORATION(13606, 8102, 16, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- TEAK_DECORATION(13606, 8103, 36, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
- GILDED_DECORATION(13607, 8104, 56, 1020.0, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2)),
-
+ OAK_DECORATION (13606, 8102, 16, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TEAK_DECORATION (13606, 8103, 36, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ GILDED_DECORATION(13607, 8104, 56, 1020, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) }),
+
/**
* Staircases.
*/
- OAK_STAIRCASE(13497, 8249, 27, 680.0, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4)),
- TEAK_STAIRCASE(13499, 8252, 48, 980.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4)),
- SPIRAL_STAIRCASE(13503, 8258, 67, 1040.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7)),
- MARBLE_STAIRCASE(13501, 8257, 82, 3200.0, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5)),
- MARBLE_SPIRAL(13505, 8259, 97, 4400.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7)),
-
+ OAK_STAIRCASE (13497, 8249, 27, 680, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+ TEAK_STAIRCASE (13499, 8252, 48, 980, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+ SPIRAL_STAIRCASE(13503, 8258, 67, 1040, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) }),
+ MARBLE_STAIRCASE(13501, 8257, 82, 3200, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) }),
+ MARBLE_SPIRAL (13505, 8259, 97, 4400, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) }),
+
/**
* Staircases going down.
*/
- OAK_STAIRS_DOWN(13498, 8249, 27, 680.0, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4)),
- TEAK_STAIRS_DOWN(13500, 8252, 48, 980.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4)),
- SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7)),
- MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200.0, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5)),
- MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7)),
-
+ OAK_STAIRS_DOWN (13498, 8249, 27, 680, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+ TEAK_STAIRS_DOWN (13500, 8252, 48, 980, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+ SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) }),
+ MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) }),
+ MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) }),
+
/**
* Portal room decorations.
*/
- TEAK_PORTAL(13636, 8328, 50, 270.0, new Item(Items.TEAK_PLANK_8780, 3)),
- MAHOGANY_PORTAL(13637, 8329, 65, 420.0, new Item(Items.MAHOGANY_PLANK_8782, 3)),
- MARBLE_PORTAL(13638, 8330, 80, 1500.0, new Item(Items.MARBLE_BLOCK_8786, 3)),
- TELEPORT_FOCUS(13640, 8331, 50, 40, new Item(Items.LIMESTONE_BRICK_3420, 2)),
- GREATER_TELEPORT_FOCUS(13641, 8332, 65, 500.0, new Item(Items.MARBLE_BLOCK_8786, 1)),
- SCRYING_POOL(13639, 8333, 80, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
- TEAK_VARROCK_PORTAL(13615, true),
- MAHOGANY_VARROCK_PORTAL(13622, true),
- MARBLE_VARROCK_PORTAL(13629, true),
- TEAK_LUMBRIDGE_PORTAL(13616, true),
+ TEAK_PORTAL (13636, 8328, 50, 270, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+ MAHOGANY_PORTAL (13637, 8329, 65, 420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
+ MARBLE_PORTAL (13638, 8330, 80, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) }),
+ TELEPORT_FOCUS (13640, 8331, 50, 40, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+ GREATER_TELEPORT_FOCUS (13641, 8332, 65, 500, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+ SCRYING_POOL (13639, 8333, 80, 2000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+ TEAK_VARROCK_PORTAL (13615, true),
+ MAHOGANY_VARROCK_PORTAL (13622, true),
+ MARBLE_VARROCK_PORTAL (13629, true),
+ TEAK_LUMBRIDGE_PORTAL (13616, true),
MAHOGANY_LUMBRIDGE_PORTAL(13623, true),
- MARBLE_LUMBRIDGE_PORTAL(13630, true),
- TEAK_FALADOR_PORTAL(13617, true),
- MAHOGANY_FALADOR_PORTAL(13624, true),
- MARBLE_FALADOR_PORTAL(13631, true),
- TEAK_CAMELOT_PORTAL(13618, true),
- MAHOGANY_CAMELOT_PORTAL(13625, true),
- MARBLE_CAMELOT_PORTAL(13632, true),
- TEAK_ARDOUGNE_PORTAL(13619, true),
- MAHOGANY_ARDOUGNE_PORTAL(13626, true),
- MARBLE_ARDOUGNE_PORTAL(13633, true),
- TEAK_YANILLE_PORTAL(13620, true),
- MAHOGANY_YANILLE_PORTAL(13627, true),
- MARBLE_YANILLE_PORTAL(13634, true),
- TEAK_KHARYRLL_PORTAL(13621, true),
- MAHOGANY_KHARYRLL_PORTAL(13628, true),
- MARBLE_KHARYRLL_PORTAL(13635, true),
-
+ MARBLE_LUMBRIDGE_PORTAL (13630, true),
+ TEAK_FALADOR_PORTAL (13617, true),
+ MAHOGANY_FALADOR_PORTAL (13624, true),
+ MARBLE_FALADOR_PORTAL (13631, true),
+ TEAK_CAMELOT_PORTAL (13618, true),
+ MAHOGANY_CAMELOT_PORTAL (13625, true),
+ MARBLE_CAMELOT_PORTAL (13632, true),
+ TEAK_ARDOUGNE_PORTAL (13619, true),
+ MAHOGANY_ARDOUGNE_PORTAL (13626, true),
+ MARBLE_ARDOUGNE_PORTAL (13633, true),
+ TEAK_YANILLE_PORTAL (13620, true),
+ MAHOGANY_YANILLE_PORTAL (13627, true),
+ MARBLE_YANILLE_PORTAL (13634, true),
+ TEAK_KHARYRLL_PORTAL (13621, true),
+ MAHOGANY_KHARYRLL_PORTAL (13628, true),
+ MARBLE_KHARYRLL_PORTAL (13635, true),
+
/**
* Skill hall decorations.
*/
- MITHRIL_ARMOUR(13491, 8270, 28, 135.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1)),
- ADAMANT_ARMOUR(13492, 8271, 28, 150.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1)),
- RUNE_ARMOUR(13493, 8272, 28, 165.0, new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1)),
- CRAWLING_HAND(13481, 8260, 38, 211.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982, 1)),
- COCKATRICE_HEAD(13482, 8261, 38, 224.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983, 1)),
- BASILISK_HEAD(13483, 8262, 38, 243.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984, 1)),
- KURASK_HEAD(13484, 8263, 58, 357.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985, 1)),
- ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986, 1)),
- KBD_HEAD(13486, 8265, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987, 1)),
- KQ_HEAD(13487, 8266, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988, 1)),
- MOUNTED_BASS(13488, 8267, 36, 151.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990, 1)),
- MOUNTED_SWORDFISH(13489, 8268, 56, 230.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992, 1)),
- MOUNTED_SHARK(13490, 8269, 76, 350.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994, 1)),
- RUNE_CASE1(13507, 8095, 41, 190.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1)),
- RUNE_CASE2(13508, 8095, 41, 212.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1)),
-
-
+ MITHRIL_ARMOUR (13491, 8270, 28, 135, new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) }, new Item[] { new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) }),
+ ADAMANT_ARMOUR (13492, 8271, 28, 150, new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) }, new Item[] { new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) }),
+ RUNE_ARMOUR (13493, 8272, 28, 165, new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) }, new Item[] { new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) }),
+ CRAWLING_HAND (13481, 8260, 38, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982) }),
+ COCKATRICE_HEAD (13482, 8261, 38, 224, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983) }),
+ BASILISK_HEAD (13483, 8262, 38, 243, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984) }),
+ KURASK_HEAD (13484, 8263, 58, 357, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985) }),
+ ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986) }),
+ KBD_HEAD (13486, 8265, 78, 1103, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987) }),
+ KQ_HEAD (13487, 8266, 78, 1103, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988) }),
+ MOUNTED_BASS (13488, 8267, 36, 151, new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990) }),
+ MOUNTED_SWORDFISH (13489, 8268, 56, 230, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992) }),
+ MOUNTED_SHARK (13490, 8269, 76, 350, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994) }),
+ RUNE_CASE1 (13507, 8095, 41, 190, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1) }),
+ RUNE_CASE2 (13508, 8095, 41, 212, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1) }),
+
/**
* Games room decorations.
*/
- CLAY_STONE(13392, 8153, 39, 100.0, new Item(Items.SOFT_CLAY_1761, 10)),
- LIMESTONE_STONE(13393, 8154, 59, 200.0, new Item(Items.LIMESTONE_BRICK_3420, 10)),
- MARBLE_STONE(13394, 8155, 79, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
- HOOP_AND_STICK(13398, 8162, 30, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- DARTBOARD(13400, 8163, 54, 290.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353, 1)),
- ARCHERY_TARGET(13402, 8164, 81, 600.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3)),
- BALANCE_1(13395, 8156, 37, 176.0, new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500)),
- BALANCE_2(13396, 8157, 57, 252.0, new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000)),
- BALANCE_3(13397, 8158, 77, 356.0, new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000)),
- OAK_CHEST(13385, 8165, 34, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
- TEAK_CHEST(13387, 8166, 44, 660.0, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 1)),
- MAHOGANY_CHEST(13389, 8167, 54, 860.0, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 1)),
- JESTER(13390, 8159, 39, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
- TREASURE_HUNT(13379, 8160, 49, 800.0, new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4)),
- HANGMAN(13404, 8161, 59, 1200.0, new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6)),
-
-
+ CLAY_STONE (13392, 8153, 39, 100, new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
+ LIMESTONE_STONE(13393, 8154, 59, 200, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) }),
+ MARBLE_STONE (13394, 8155, 79, 2000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+ HOOP_AND_STICK (13398, 8162, 30, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ DARTBOARD (13400, 8163, 54, 290, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353) }),
+ ARCHERY_TARGET (13402, 8164, 81, 600, new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3) }),
+ BALANCE_1 (13395, 8156, 37, 176, new Item[] { new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500) }),
+ BALANCE_2 (13396, 8157, 57, 252, new Item[] { new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000) }),
+ BALANCE_3 (13397, 8158, 77, 356, new Item[] { new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000) }),
+ OAK_CHEST (13385, 8165, 34, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+ TEAK_CHEST (13387, 8166, 44, 660, new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784) }),
+ MAHOGANY_CHEST (13389, 8167, 54, 860, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) }),
+ JESTER (13390, 8159, 39, 360, new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+ TREASURE_HUNT (13379, 8160, 49, 800, new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4) }),
+ HANGMAN (13404, 8161, 59, 1200, new Item[] { new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6) }),
+
/**
* Combat room decorations.
*/
- BOXING_RING(13129, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- FENCING_RING(13133, 8024, 41, 570.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
- COMBAT_RING(13137, 8025, 51, 630.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
- BALANCE_BEAM_LEFT(13143, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
- BALANCE_BEAM_CENTER(13142, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
- BALANCE_BEAM_RIGHT(13144, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
- RANGING_PEDESTALS(13147, 8026, 71, 720.0, new Item(Items.TEAK_PLANK_8780, 8)),
- MAGIC_BARRIER(13145, 8026, 71, 720.0, new Item(Items.TEAK_PLANK_8780, 8)),
- NOTHING(13721, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
- NOTHING2(13721, 8026, 71, 720.0, new Item(Items.TEAK_PLANK_8780, 8)),
- INVISIBLE_WALL(15283, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- INVISIBLE_WALL2(15284, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- INVISIBLE_WALL3(15285, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- GLOVE_RACK(13381, 8028, 34, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- WEAPONS_RACK(13382, 8029, 44, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
- EXTRA_WEAPONS_RACK(13383, 8030, 54, 440.0, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4)),
- BOXING_MAT_CORNER(13126, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- FENCING_MAT_CORNER(13135, 8024, 41, 570.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
- COMBAT_MAT_CORNER(13138, 8025, 51, 630.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
- BOXING_MAT_SIDE(13128, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- FENCING_MAT_SIDE(13134, 8024, 41, 570.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
- COMBAT_MAT_SIDE(13139, 8025, 51, 630.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
- BOXING_MAT(13127, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- FENCING_MAT(13136, 8024, 41, 570.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
- COMBAT_MAT(13140, 8025, 51, 630.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-
-
+ BOXING_RING (13129, 8023, 32, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ FENCING_RING (13133, 8024, 41, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+ COMBAT_RING (13137, 8025, 51, 630, new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+ BALANCE_BEAM_LEFT (13143, 8027, 81, 1000, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+ BALANCE_BEAM_CENTER(13142, 8027, 81, 1000, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+ BALANCE_BEAM_RIGHT (13144, 8027, 81, 1000, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+ RANGING_PEDESTALS (13147, 8026, 71, 720, new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
+ MAGIC_BARRIER (13145, 8026, 71, 720, new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
+ NOTHING (13721, 8027, 81, 1000, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+ NOTHING2 (13721, 8026, 71, 720, new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
+ INVISIBLE_WALL (15283, 8023, 32, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ INVISIBLE_WALL2 (15284, 8023, 32, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ INVISIBLE_WALL3 (15285, 8023, 32, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ GLOVE_RACK (13381, 8028, 34, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ WEAPONS_RACK (13382, 8029, 44, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ EXTRA_WEAPONS_RACK (13383, 8030, 54, 440, new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4) }),
+ BOXING_MAT_CORNER (13126, 8023, 32, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ FENCING_MAT_CORNER (13135, 8024, 41, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+ COMBAT_MAT_CORNER (13138, 8025, 51, 630, new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+ BOXING_MAT_SIDE (13128, 8023, 32, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ FENCING_MAT_SIDE (13134, 8024, 41, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+ COMBAT_MAT_SIDE (13139, 8025, 51, 630, new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+ BOXING_MAT (13127, 8023, 32, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ FENCING_MAT (13136, 8024, 41, 570, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+ COMBAT_MAT (13140, 8025, 51, 630, new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+
/**
* Formal garden decorations
*/
- GAZEBO(13477, 8192, 65, 1200, new Item(Items.MAHOGANY_PLANK_8782, 8), new Item(Items.STEEL_BAR_2353, 4)),
- SMALL_FOUNTAIN(13478, 8193, 71, 500, new Item(Items.MARBLE_BLOCK_8786, 1)),
- LARGE_FOUNTAIN(13479, 8194, 75, 1000, new Item(Items.MARBLE_BLOCK_8786, 2)),
- POSH_FOUNTAIN(13480, 8195, 81, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
- SUNFLOWER(13446, 8213, 66, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_SUNFLOWER_8457, 1)),
- MARIGOLDS(13447, 8214, 71, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MARIGOLDS_8459, 1)),
- ROSES(13448, 8215, 76, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_ROSES_8461, 1)),
- SUNFLOWER_BIG(13443, 8213, 66, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_SUNFLOWER_8457, 1)),
- MARIGOLDS_BIG(13444, 8214, 71, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MARIGOLDS_8459, 1)),
- ROSES_BIG(13445, 8215, 76, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_ROSES_8461, 1)),
- ROSEMARY(13440, 8210, 66, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_ROSEMARY_8451, 1)),
- DAFFODILS(13441, 8211, 71, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_DAFFODILS_8453, 1)),
- BLUEBELLS(13442, 8212, 76, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_BLUEBELLS_8455, 1)),
- ROSEMARY_BIG(13437, 8210, 66, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_ROSEMARY_8451, 1)),
- DAFFODILS_BIG(13438, 8211, 71, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_DAFFODILS_8453, 1)),
- BLUEBELLS_BIG(13439, 8212, 76, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_BLUEBELLS_8455, 1)),
- THORNY_HEDGE1(13456, 8203, 56, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.THORNY_HEDGE_8437, 1)),
- THORNY_HEDGE2(13457, 8203, 56, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.THORNY_HEDGE_8437, 1)),
- THORNY_HEDGE3(13458, 8203, 56, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.THORNY_HEDGE_8437, 1)),
- NICE_HEDGE1(13459, 8204, 60, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.NICE_HEDGE_8439, 1)),
- NICE_HEDGE2(13461, 8204, 60, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.NICE_HEDGE_8439, 1)),
- NICE_HEDGE3(13460, 8204, 60, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.NICE_HEDGE_8439, 1)),
- SMALL_BOX_HEDGE1(13462, 8205, 64, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.SMALL_BOX_HEDGE_8441, 1)),
- SMALL_BOX_HEDGE2(13464, 8205, 64, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.SMALL_BOX_HEDGE_8441, 1)),
- SMALL_BOX_HEDGE3(13463, 8205, 64, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.SMALL_BOX_HEDGE_8441, 1)),
- TOPIARY_HEDGE1(13465, 8206, 68, 141, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TOPIARY_HEDGE_8443, 1)),
- TOPIARY_HEDGE2(13467, 8206, 68, 141, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TOPIARY_HEDGE_8443, 1)),
- TOPIARY_HEDGE3(13466, 8206, 68, 141, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TOPIARY_HEDGE_8443, 1)),
- FANCY_HEDGE1(13468, 8207, 72, 158, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.FANCY_HEDGE_8445, 1)),
- FANCY_HEDGE2(13470, 8207, 72, 158, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.FANCY_HEDGE_8445, 1)),
- FANCY_HEDGE3(13469, 8207, 72, 158, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.FANCY_HEDGE_8445, 1)),
- TALL_FANCY_HEDGE1(13471, 8208, 76, 223, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_FANCY_HEDGE_8447, 1)),
- TALL_FANCY_HEDGE2(13473, 8208, 76, 223, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_FANCY_HEDGE_8447, 1)),
- TALL_FANCY_HEDGE3(13472, 8208, 76, 223, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_FANCY_HEDGE_8447, 1)),
- TALL_BOX_HEDGE1(13474, 8209, 80, 316, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_BOX_HEDGE_8449, 1)),
- TALL_BOX_HEDGE2(13476, 8209, 80, 316, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_BOX_HEDGE_8449, 1)),
- TALL_BOX_HEDGE3(13475, 8209, 80, 316, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_BOX_HEDGE_8449, 1)),
- BOUNDARY_STONES(13449, 8196, 55, 100, new Item(Items.SOFT_CLAY_1761, 10)),
- WOODEN_FENCE(13450, 8197, 59, 280, new Item(Items.PLANK_960, 10)),
- STONE_WALL(13451, 8198, 63, 200, new Item(Items.LIMESTONE_BRICK_3420, 10)),
- IRON_RAILINGS(13452, 8199, 67, 220, new Item(Items.IRON_BAR_2351, 10), new Item(Items.LIMESTONE_BRICK_3420, 6)),
- PICKET_FENCE(13453, 8200, 71, 640, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
- GARDEN_FENCE(13454, 8201, 75, 940, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 2)),
- MARBLE_WALL(13455, 8202, 79, 4000, new Item(Items.MARBLE_BLOCK_8786, 10)),
-
-
+ GAZEBO (13477, 8192, 65, 1200, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 8), new Item(Items.STEEL_BAR_2353, 4) }),
+ SMALL_FOUNTAIN (13478, 8193, 71, 500, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+ LARGE_FOUNTAIN (13479, 8194, 75, 1000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2) }),
+ POSH_FOUNTAIN (13480, 8195, 81, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) }),
+ SUNFLOWER (13446, 8213, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_SUNFLOWER_8457) }),
+ MARIGOLDS (13447, 8214, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MARIGOLDS_8459) }),
+ ROSES (13448, 8215, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSES_8461) }),
+ SUNFLOWER_BIG (13443, 8213, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_SUNFLOWER_8457) }),
+ MARIGOLDS_BIG (13444, 8214, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MARIGOLDS_8459) }),
+ ROSES_BIG (13445, 8215, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSES_8461) }),
+ ROSEMARY (13440, 8210, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSEMARY_8451) }),
+ DAFFODILS (13441, 8211, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DAFFODILS_8453) }),
+ BLUEBELLS (13442, 8212, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_BLUEBELLS_8455) }),
+ ROSEMARY_BIG (13437, 8210, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSEMARY_8451) }),
+ DAFFODILS_BIG (13438, 8211, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DAFFODILS_8453) }),
+ BLUEBELLS_BIG (13439, 8212, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_BLUEBELLS_8455) }),
+ THORNY_HEDGE1 (13456, 8203, 56, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) }),
+ THORNY_HEDGE2 (13457, 8203, 56, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) }),
+ THORNY_HEDGE3 (13458, 8203, 56, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) }),
+ NICE_HEDGE1 (13459, 8204, 60, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) }),
+ NICE_HEDGE2 (13461, 8204, 60, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) }),
+ NICE_HEDGE3 (13460, 8204, 60, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) }),
+ SMALL_BOX_HEDGE1 (13462, 8205, 64, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) }),
+ SMALL_BOX_HEDGE2 (13464, 8205, 64, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) }),
+ SMALL_BOX_HEDGE3 (13463, 8205, 64, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) }),
+ TOPIARY_HEDGE1 (13465, 8206, 68, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) }),
+ TOPIARY_HEDGE2 (13467, 8206, 68, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) }),
+ TOPIARY_HEDGE3 (13466, 8206, 68, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) }),
+ FANCY_HEDGE1 (13468, 8207, 72, 158, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) }),
+ FANCY_HEDGE2 (13470, 8207, 72, 158, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) }),
+ FANCY_HEDGE3 (13469, 8207, 72, 158, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) }),
+ TALL_FANCY_HEDGE1(13471, 8208, 76, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) }),
+ TALL_FANCY_HEDGE2(13473, 8208, 76, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) }),
+ TALL_FANCY_HEDGE3(13472, 8208, 76, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) }),
+ TALL_BOX_HEDGE1 (13474, 8209, 80, 316, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) }),
+ TALL_BOX_HEDGE2 (13476, 8209, 80, 316, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) }),
+ TALL_BOX_HEDGE3 (13475, 8209, 80, 316, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) }),
+ BOUNDARY_STONES (13449, 8196, 55, 100, new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
+ WOODEN_FENCE (13450, 8197, 59, 280, new Item[] { new Item(Items.PLANK_960, 10) }),
+ STONE_WALL (13451, 8198, 63, 200, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) }),
+ IRON_RAILINGS (13452, 8199, 67, 220, new Item[] { new Item(Items.IRON_BAR_2351, 10), new Item(Items.LIMESTONE_BRICK_3420, 6) }),
+ PICKET_FENCE (13453, 8200, 71, 640, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) }),
+ GARDEN_FENCE (13454, 8201, 75, 940, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 2) }),
+ MARBLE_WALL (13455, 8202, 79, 4000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 10) }),
+
/**
* Bedroom decorations.
*/
- WOODEN_BED(13148, 8031, 20, 117, new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- OAK_BED(13149, 8032, 30, 210, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- LARGE_OAK_BED(13150, 8033, 34, 330, new Item(Items.OAK_PLANK_8778, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- TEAK_BED(13151, 8034, 40, 300, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- LARGE_TEAK_BED(13152, 8035, 45, 480, new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- FOUR_POSTER(13153, 8036, 53, 450, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- GILDED_FOUR_POSTER(13154, 8037, 60, 1330, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 2)),
- OAK_CLOCK(13169, 8052, 25, 142, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792, 1)),
- TEAK_CLOCK(13170, 8053, 55, 202, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792, 1)),
- GILDED_CLOCK(13171, 8054, 85, 602, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792, 1), new Item(Items.GOLD_LEAF_8784, 1)),
- SHAVING_STAND(13162, 8045, 21, 30, new Item(Items.PLANK_960, 1), new Item(Items.MOLTEN_GLASS_1775, 1)),
- OAK_SHAVING_STAND(13163, 8046, 29, 61, new Item(Items.OAK_PLANK_8778, 1), new Item(Items.MOLTEN_GLASS_1775, 1)),
- OAK_DRESSER(13164, 8047, 37, 121, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
- TEAK_DRESSER(13165, 8048, 46, 181, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
- FANCY_TEAK_DRESSER(13166, 8049, 56, 182, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2)),
- MAHOGANY_DRESSER(13167, 8050, 64, 281, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
- GILDED_DRESSER(13168, 8051, 74, 582, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784, 1)),
- SHOE_BOX(13155, 8038, 20, 58, new Item(Items.PLANK_960, 2)),
- OAK_DRAWERS(13156, 8039, 27, 120, new Item(Items.OAK_PLANK_8778, 2)),
- OAK_WARDROBE(13157, 8040, 39, 180, new Item(Items.OAK_PLANK_8778, 3)),
- TEAK_DRAWERS(13158, 8041, 51, 180, new Item(Items.TEAK_PLANK_8780, 2)),
- TEAK_WARDROBE(13159, 8042, 63, 270, new Item(Items.TEAK_PLANK_8780, 3)),
- MAHOGANY_WARDROBE(13160, 8043, 75, 420, new Item(Items.MAHOGANY_PLANK_8782, 2)),
- GILDED_WARDROBE(13161, 8044, 87, 720, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 1)),
-
-
+ WOODEN_BED (13148, 8031, 20, 117, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ OAK_BED (13149, 8032, 30, 210, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ LARGE_OAK_BED (13150, 8033, 34, 330, new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ TEAK_BED (13151, 8034, 40, 300, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ LARGE_TEAK_BED (13152, 8035, 45, 480, new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ FOUR_POSTER (13153, 8036, 53, 450, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ GILDED_FOUR_POSTER(13154, 8037, 60, 1330, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 2) }),
+ OAK_CLOCK (13169, 8052, 25, 142, new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792) }),
+ TEAK_CLOCK (13170, 8053, 55, 202, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792) }),
+ GILDED_CLOCK (13171, 8054, 85, 602, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792), new Item(Items.GOLD_LEAF_8784) }),
+ SHAVING_STAND (13162, 8045, 21, 30, new Item[] { new Item(Items.PLANK_960), new Item(Items.MOLTEN_GLASS_1775) }),
+ OAK_SHAVING_STAND (13163, 8046, 29, 61, new Item[] { new Item(Items.OAK_PLANK_8778), new Item(Items.MOLTEN_GLASS_1775) }),
+ OAK_DRESSER (13164, 8047, 37, 121, new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+ TEAK_DRESSER (13165, 8048, 46, 181, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+ FANCY_TEAK_DRESSER(13166, 8049, 56, 182, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2) }),
+ MAHOGANY_DRESSER (13167, 8050, 64, 281, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+ GILDED_DRESSER (13168, 8051, 74, 582, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784) }),
+ SHOE_BOX (13155, 8038, 20, 58, new Item[] { new Item(Items.PLANK_960, 2) }),
+ OAK_DRAWERS (13156, 8039, 27, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ OAK_WARDROBE (13157, 8040, 39, 180, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+ TEAK_DRAWERS (13158, 8041, 51, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ TEAK_WARDROBE (13159, 8042, 63, 270, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+ MAHOGANY_WARDROBE (13160, 8043, 75, 420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
+ GILDED_WARDROBE (13161, 8044, 87, 720, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) }),
+
/**
* Quest hall decorations.
*/
- ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540, 1)),
- AMULET_OF_GLORY(13523, 8283, 47, 290, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704, 1)),
- CAPE_OF_LEGENDS(13524, 8284, 47, 300, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052, 1)),
- KING_ARTHUR(13510, 8285, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995, 1)),
- ELENA(13511, 8286, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996, 1)),
- GIANT_DWARF(13512, 8287, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997, 1)),
- MISCELLANIANS(13513, 8288, 35, 311, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998, 1)),
- LUMBRIDGE(13517, 8289, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002, 1)),
- THE_DESERT(13514, 8290, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999, 1)),
- MORYTANIA(13518, 8291, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003, 1)),
- KARAMJA(13516, 8292, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001, 1)),
- ISAFDAR(13515, 8293, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000, 1)),
- SILVERLIGHT(13519, 8279, 42, 187, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402, 1)),
- EXCALIBUR(13521, 8280, 42, 194, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35, 1)),
- DARKLIGHT(13520, 8281, 42, 202, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746, 1)),
- SMALL_MAP(13525, 8294, 38, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004, 1)),
- MEDIUM_MAP(13526, 8295, 58, 451, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005, 1)),
- LARGE_MAP(13527, 8296, 78, 591, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006, 1)),
-
- /**
- * Menagerie Decorations
- */
- //OBELISK
- MINI_OBELISK(44837, 15236, 41, 676, new Item(Items.MARBLE_BLOCK_8786, 1), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.GOLD_CHARM_12158, 10), new Item(Items.GREEN_CHARM_12159, 10), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10))
- //PET_FEEDER
- ,
- OAK_PET_FEEDER(44834, 15233, 37, 240, new Item(Items.OAK_PLANK_8778, 4)),
- TEAK_PET_FEEDER(44835, 15234, 52, 380, new Item(Items.TEAK_PLANK_8780, 4)),
- MAHOGANY_PET_FEEDER(44836, 15235, 67, 880, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 1))
- //PET_HOUSE
- ,
- OAK_PET_HOUSE(44828, 15227, 37, 240, new Item(Items.OAK_PLANK_8778, 4)),
- TEAK_PET_HOUSE(44829, 15228, 52, 380, new Item(Items.TEAK_PLANK_8780, 4)),
- MAHOGANY_PET_HOUSE(44830, 15229, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 4)),
- CONSECRATED_PET_HOUSE(44831, 15230, 92, 1580, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.MAGIC_STONE_8788, 1)),
- DESECRATED_PET_HOUSE(44832, 15231, 92, 1580, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.MAGIC_STONE_8788, 1)),
- NATURAL_PET_HOUSE(44833, 15232, 92, 1580, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.MAGIC_STONE_8788, 1))
- //HABITAT_SPACE
- ,
- GARDEN_HABITAT(new int[]{
- 4497,
- 4498,
- 44500,
- 44501,
- 44502,
- 44503,
- 44504,
- 44505,
- 44506,
- 44507,
- 44508,
- 44509,
- 44510,
- 44511,
- 44512,
- 44513,
- 44514,
- 44515,
- 44516,
- 44517,
- 44518,
- 44519,
- 44520,
- 44521,
- 44522,
- 44523,
- 44524,
- 44525,
- 44526,
- 44527,
- 44528,
- 44529,
- 44530,
- 44531,
- 44532,
- 44533,
- 44534,
- 44535,
- 44536,
- 44537,
- 44538,
- 44539,
- 44540,
- 44541,
- 44542,
- 44543,
- 44544,
- 44545,
- 44546,
- 44547,
- 44548,
- 44549,
- 44550,
- 44551,
- 44552,
- 44553,
- 44554,
- 44555,
- 44556,
- 44557,
- 44558,
- 44559,
- 44560,
- 44561,
- 44562,
- 44563 }, 15222, 37, 201, new Item(Items.BAGGED_PLANT_1_8431, 1), new Item(Items.BAGGED_PLANT_2_8433, 1), new Item(Items.BAGGED_PLANT_3_8435, 1)),
- JUNGLE_HABITAT(new int[]
- {
- 44564,
- 44565,
- 44566,
- 44567,
- 44568,
- 44569,
- 44570,
- 44571,
- 44572,
- 44573,
- 44574,
- 44575,
- 44576,
- 44577,
- 44578,
- 44579,
- 44580,
- 44581,
- 44582,
- 44583,
- 44584,
- 44585,
- 44586,
- 44587,
- 44588,
- 44589,
- 44590,
- 44591,
- 44592,
- 44593,
- 44594,
- 44595,
- 44596,
- 44597,
- 44598,
- 44599,
- 44600,
- 44601,
- 44602,
- 44603,
- 44604,
- 44605,
- 44606,
- 44607,
- 44608,
- 44609,
- 44610,
- 44611,
- 44612,
- 44613,
- 44614,
- 44615,
- 44616,
- 44617,
- 44618,
- 44619,
- 44620,
- 44621,
- 44622,
- 44623,
- 44624,
- 44625,
- 44626,
- 44627,
- 44628,
- 44629 }, 15223, 47, 278, new Item(Items.BAGGED_PLANT_3_8435, 3), new Item(Items.BAGGED_WILLOW_TREE_8423, 1), new Item(Items.BUCKET_OF_WATER_1929, 5)),
- DESERT_HABITAT(new int[]
- {
- 44630,
- 44631,
- 44632,
- 44633,
- 44634,
- 44635,
- 44636,
- 44637,
- 44638,
- 44639,
- 44640,
- 44641,
- 44642,
- 44643,
- 44644,
- 44645,
- 44646,
- 44647,
- 44648,
- 44649,
- 44650,
- 44651,
- 44652,
- 44653,
- 44654,
- 44655,
- 44656,
- 44657,
- 44658,
- 44659,
- 44660,
- 44661,
- 44662,
- 44663,
- 44664,
- 44665,
- 44666,
- 44667,
- 44668,
- 44669,
- 44670,
- 44671,
- 44672,
- 44673,
- 44674,
- 44675,
- 44676,
- 44677,
- 44678,
- 44679,
- 44680,
- 44681,
- 44682,
- 44683,
- 44684,
- 44685,
- 44686,
- 44687,
- 44688,
- 44689,
- 44690,
- 44691,
- 44692,
- 44693,
- 44694,
- 44695 }, 15224, 57, 238, new Item(Items.BUCKET_OF_SAND_1783, 10), new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(15237, 1)),
- POLAR_HABITAT(new int[]
- {
- 44696,
- 44697,
- 44698,
- 44699,
- 44700,
- 44701,
- 44702,
- 44703,
- 44704,
- 44705,
- 44706,
- 44707,
- 44708,
- 44709,
- 44710,
- 44711,
- 44712,
- 44713,
- 44714,
- 44715,
- 44716,
- 44717,
- 44718,
- 44719,
- 44720,
- 44721,
- 44722,
- 44723,
- 44724,
- 44725,
- 44726,
- 44727,
- 44728,
- 44729,
- 44730,
- 44731,
- 44732,
- 44733,
- 44734,
- 44735,
- 44736,
- 44737,
- 44738,
- 44739,
- 44740,
- 44741,
- 44742,
- 44743,
- 44744,
- 44745,
- 44746,
- 44747,
- 44748,
- 44749,
- 44750,
- 44751,
- 44752,
- 44753,
- 44754,
- 44755,
- 44756,
- 44757,
- 44758,
- 44759,
- 44760,
- 44761 }, 15225, 67, 373, new Item(Items.AIR_RUNE_556, 1000), new Item(Items.WATER_RUNE_555, 1000), new Item(15239, 1)),
- VOLCANIC_HABITAT(new int[]
- {
- 44762,
- 44763,
- 44764,
- 44765,
- 44766,
- 44767,
- 44768,
- 44769,
- 44770,
- 44771,
- 44772,
- 44773,
- 44774,
- 44775,
- 44776,
- 44777,
- 44778,
- 44779,
- 44780,
- 44781,
- 44782,
- 44783,
- 44784,
- 44785,
- 44786,
- 44787,
- 44788,
- 44789,
- 44790,
- 44791,
- 44792,
- 44793,
- 44794,
- 44795,
- 44796,
- 44797,
- 44798,
- 44799,
- 44800,
- 44801,
- 44802,
- 44803,
- 44804,
- 44805,
- 44806,
- 44807,
- 44808,
- 44809,
- 44810,
- 44811,
- 44812,
- 44813,
- 44814,
- 44815,
- 44816,
- 44817,
- 44818,
- 44819,
- 44820,
- 44821,
- 44822,
- 44823,
- 44824,
- 44825,
- 44826,
- 44827 }, 15226, 77, 77, new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.BAGGED_DEAD_TREE_8417, 1), new Item(Items.STONE_SLAB_13245, 5)),
-
+ ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540) }, new Item[] { new Item(Items.ANTI_DRAGON_SHIELD_1540) }),
+ AMULET_OF_GLORY (13523, 8283, 47, 290, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704) }, new Item[] { new Item(Items.AMULET_OF_GLORY_1704) }),
+ CAPE_OF_LEGENDS (13524, 8284, 47, 300, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052) }, new Item[] { new Item(Items.CAPE_OF_LEGENDS_1052) }),
+ KING_ARTHUR (13510, 8285, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995) }),
+ ELENA (13511, 8286, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996) }),
+ GIANT_DWARF (13512, 8287, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997) }),
+ MISCELLANIANS (13513, 8288, 35, 311, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998) }),
+ LUMBRIDGE (13517, 8289, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002) }),
+ THE_DESERT (13514, 8290, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999) }),
+ MORYTANIA (13518, 8291, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003) }),
+ KARAMJA (13516, 8292, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001) }),
+ ISAFDAR (13515, 8293, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000) }),
+ SILVERLIGHT (13519, 8279, 42, 187, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402) }, new Item[] { new Item(Items.SILVERLIGHT_2402) }),
+ EXCALIBUR (13521, 8280, 42, 194, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35) }, new Item[] { new Item(Items.EXCALIBUR_35) }),
+ DARKLIGHT (13520, 8281, 42, 202, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746) }, new Item[] { new Item(Items.DARKLIGHT_6746) }),
+ SMALL_MAP (13525, 8294, 38, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004) }),
+ MEDIUM_MAP (13526, 8295, 58, 451, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005) }),
+ LARGE_MAP (13527, 8296, 78, 591, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006) }),
/**
* Study decorations.
*/
- GLOBE(13649, 8341, 41, 180, new Item(Items.OAK_PLANK_8778, 3)),
- ORNAMENTAL_GLOBE(13650, 8342, 50, 270, new Item(Items.TEAK_PLANK_8780, 3)),
- LUNAR_GLOBE(13651, 8343, 59, 570, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784, 1)),
- CELESTIAL_GLOBE(13652, 8344, 68, 570, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784, 1)),
- ARMILLARY_SPHERE(13653, 8345, 77, 960, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 2), new Item(Items.STEEL_BAR_2353, 4)),
- SMALL_ORREY(13654, 8346, 86, 1320, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 3)),
- LARGE_ORREY(13655, 8347, 95, 1420, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 5)),
- OAK_LECTERN(13642, 8334, 40, 60, new Item(Items.OAK_PLANK_8778, 1)),
- EAGLE_LECTERN(13643, 8335, 47, 120, new Item(Items.OAK_PLANK_8778, 2)),
- DEMON_LECTERN(13644, 8336, 47, 120, new Item(Items.OAK_PLANK_8778, 2)),
- TEAK_EAGLE_LECTERN(13645, 8337, 57, 180, new Item(Items.TEAK_PLANK_8780, 2)),
- TEAK_DEMON_LECTERN(13646, 8338, 57, 180, new Item(Items.TEAK_PLANK_8780, 2)),
- MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 1)),
- MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 1)),
- CRYSTAL_BALL(13659, 8351, 42, 280, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567, 1)),
- ELEMENTAL_SPHERE(13660, 8352, 54, 580, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567, 1), new Item(Items.GOLD_LEAF_8784, 1)),
- CRYSTAL_OF_POWER(13661, 8353, 66, 890, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567, 1), new Item(Items.GOLD_LEAF_8784, 2)),
- ALCHEMICAL_CHART(13662, 8354, 43, 30, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- ASTRONOMICAL_CHART(13663, 8355, 63, 45, new Item(Items.BOLT_OF_CLOTH_8790, 3)),
- INFERNAL_CHART(13664, 8356, 83, 60, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
- TELESCOPE1(13656, 8348, 44, 121, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
- TELESCOPE2(13657, 8349, 64, 181, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
- TELESCOPE3(13658, 8350, 84, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
-
+ GLOBE (13649, 8341, 41, 180, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+ ORNAMENTAL_GLOBE (13650, 8342, 50, 270, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+ LUNAR_GLOBE (13651, 8343, 59, 570, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784) }),
+ CELESTIAL_GLOBE (13652, 8344, 68, 570, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784) }),
+ ARMILLARY_SPHERE (13653, 8345, 77, 960, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 2), new Item(Items.STEEL_BAR_2353, 4) }),
+ SMALL_ORREY (13654, 8346, 86, 1320, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 3) }),
+ LARGE_ORREY (13655, 8347, 95, 1420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 5) }),
+ OAK_LECTERN (13642, 8334, 40, 60, new Item[] { new Item(Items.OAK_PLANK_8778) }),
+ EAGLE_LECTERN (13643, 8335, 47, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ DEMON_LECTERN (13644, 8336, 47, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TEAK_EAGLE_LECTERN (13645, 8337, 57, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ TEAK_DEMON_LECTERN (13646, 8338, 57, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) }),
+ MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) }),
+ CRYSTAL_BALL (13659, 8351, 42, 280, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567) }),
+ ELEMENTAL_SPHERE (13660, 8352, 54, 580, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784) }),
+ CRYSTAL_OF_POWER (13661, 8353, 66, 890, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784, 2) }),
+ ALCHEMICAL_CHART (13662, 8354, 43, 30, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ ASTRONOMICAL_CHART (13663, 8355, 63, 45, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
+ INFERNAL_CHART (13664, 8356, 83, 60, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+ TELESCOPE1 (13656, 8348, 44, 121, new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+ TELESCOPE2 (13657, 8349, 64, 181, new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+ TELESCOPE3 (13658, 8350, 84, 580, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+
/**
* Costume room decorations.
*/
- OAK_TREASURE_CHEST(18804, 9839, 48, 120, new Item(Items.OAK_PLANK_8778, 2)),
- TEAK_TREASURE_CHEST(18806, 9840, 66, 180, new Item(Items.TEAK_PLANK_8780, 2)),
- MAHOGANY_TREASURE_CHEST(18808, 9841, 84, 280, new Item(Items.MAHOGANY_PLANK_8782, 2)),
- OAK_ARMOUR_CASE(18778, 9826, 46, 180, new Item(Items.OAK_PLANK_8778, 3)),
- TEAK_ARMOUR_CASE(18780, 9827, 64, 270, new Item(Items.TEAK_PLANK_8780, 3)),
- MGANY_ARMOUR_CASE(18782, 9828, 82, 420, new Item(Items.MAHOGANY_PLANK_8782, 3)),
- OAK_MAGIC_WARDROBE(18784, 9829, 42, 240, new Item(Items.OAK_PLANK_8778, 4)),
- C_OAK_MAGIC_WARDROBE(18786, 9830, 51, 360, new Item(Items.OAK_PLANK_8778, 6)),
- TEAK_MAGIC_WARDROBE(18788, 9831, 60, 360, new Item(Items.TEAK_PLANK_8780, 4)),
- C_TEAK_MAGIC_WARDROBE(18790, 9832, 69, 540, new Item(Items.TEAK_PLANK_8780, 6)),
- MGANY_MAGIC_WARDROBE(18792, 9833, 78, 560, new Item(Items.MAHOGANY_PLANK_8782, 4)),
- GILDED_MAGIC_WARDROBE(18794, 9834, 87, 860, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 1)),
- MARBLE_MAGIC_WARDROBE(18796, 9835, 96, 500, new Item(Items.MARBLE_BLOCK_8786, 1)),
- OAK_CAPE_RACK(18766, 9817, 54, 240, new Item(Items.OAK_PLANK_8778, 4)),
- TEAK_CAPE_RACK(18767, 9818, 63, 360, new Item(Items.TEAK_PLANK_8780, 4)),
- MGANY_CAPE_RACK(18768, 9819, 72, 560, new Item(Items.MAHOGANY_PLANK_8782, 4)),
- GILDED_CAPE_RACK(18769, 9820, 81, 860, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 1)),
- MARBLE_CAPE_RACK(18770, 9821, 90, 500, new Item(Items.MARBLE_BLOCK_8786, 1)),
- MAGIC_CAPE_RACK(18771, 9822, 99, 1000, new Item(Items.MAGIC_STONE_8788, 1)),
- OAK_TOY_BOX(18798, 9836, 50, 120, new Item(Items.OAK_PLANK_8778, 2)),
- TEAK_TOY_BOX(18800, 9837, 68, 180, new Item(Items.TEAK_PLANK_8780, 2)),
- MAHOGANY_TOY_BOX(18802, 9838, 86, 280, new Item(Items.MAHOGANY_PLANK_8782, 2)),
- OAK_COSTUME_BOX(18772, 9823, 44, 120, new Item(Items.OAK_PLANK_8778, 2)),
- TEAK_COSTUME_BOX(18774, 9824, 62, 180, new Item(Items.TEAK_PLANK_8780, 2)),
- MAHOGANY_COSTUME_BOX(18776, 9825, 80, 280, new Item(Items.MAHOGANY_PLANK_8782, 2)),
-
+ OAK_TREASURE_CHEST (18804, 9839, 48, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TEAK_TREASURE_CHEST (18806, 9840, 66, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ MAHOGANY_TREASURE_CHEST(18808, 9841, 84, 280, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
+ OAK_ARMOUR_CASE (18778, 9826, 46, 180, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+ TEAK_ARMOUR_CASE (18780, 9827, 64, 270, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+ MGANY_ARMOUR_CASE (18782, 9828, 82, 420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
+ OAK_MAGIC_WARDROBE (18784, 9829, 42, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+ C_OAK_MAGIC_WARDROBE (18786, 9830, 51, 360, new Item[] { new Item(Items.OAK_PLANK_8778, 6) }),
+ TEAK_MAGIC_WARDROBE (18788, 9831, 60, 360, new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+ C_TEAK_MAGIC_WARDROBE (18790, 9832, 69, 540, new Item[] { new Item(Items.TEAK_PLANK_8780, 6) }),
+ MGANY_MAGIC_WARDROBE (18792, 9833, 78, 560, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) }),
+ GILDED_MAGIC_WARDROBE (18794, 9834, 87, 860, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) }),
+ MARBLE_MAGIC_WARDROBE (18796, 9835, 96, 500, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+ OAK_CAPE_RACK (18766, 9817, 54, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+ TEAK_CAPE_RACK (18767, 9818, 63, 360, new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+ MGANY_CAPE_RACK (18768, 9819, 72, 560, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) }),
+ GILDED_CAPE_RACK (18769, 9820, 81, 860, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) }),
+ MARBLE_CAPE_RACK (18770, 9821, 90, 500, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+ MAGIC_CAPE_RACK (18771, 9822, 99, 1000, new Item[] { new Item(Items.MAGIC_STONE_8788) }),
+ OAK_TOY_BOX (18798, 9836, 50, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TEAK_TOY_BOX (18800, 9837, 68, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ MAHOGANY_TOY_BOX (18802, 9838, 86, 280, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
+ OAK_COSTUME_BOX (18772, 9823, 44, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TEAK_COSTUME_BOX (18774, 9824, 62, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ MAHOGANY_COSTUME_BOX (18776, 9825, 80, 280, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
+
/**
* Chapel decorations.
*/
- OAK_ALTAR(13179, 8062, 45, 240, new Item(Items.OAK_PLANK_8778, 4)),
- TEAK_ALTAR(13182, 8063, 50, 360, new Item(Items.TEAK_PLANK_8780, 4)),
- CLOTH_ALTAR(13185, 8064, 56, 390, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- MAHOGANY_ALTAR(13188, 8065, 60, 590, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- LIMESTONE_ALTAR(13191, 8066, 64, 910, new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.LIMESTONE_BRICK_3420, 2)),
- MARBLE_ALTAR(13194, 8067, 70, 1030, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
- GILDED_ALTAR(13197, 8068, 75, 2230, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 4)),
- SMALL_STATUE(13271, 8082, 49, 40, new Item(Items.LIMESTONE_BRICK_3420, 2)),
- MEDIUM_STATUE(13272, 8083, 69, 500, new Item(Items.MARBLE_BLOCK_8786, 1)),
- LARGE_STATUE(13282, 8084, 89, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
- WINDCHIMES(13214, 8079, 49, 323, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 4)),
- BELLS(13215, 8080, 58, 480, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 6)),
- ORGAN(13216, 8081, 69, 680, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 6)),
- SARADOMIN_SYMBOL(13172, 8055, 48, 120, new Item(Items.OAK_PLANK_8778, 2)),
- ZAMORAK_SYMBOL(13173, 8056, 48, 120, new Item(Items.OAK_PLANK_8778, 2)),
- GUTHIX_SYMBOL(13174, 8057, 48, 120, new Item(Items.OAK_PLANK_8778, 2)),
- SARADOMIN_ICON(13175, 8058, 59, 960, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
- ZAMORAK_ICON(13176, 8059, 59, 960, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
- GUTHIX_ICON(13177, 8060, 59, 960, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
- ICON_OF_BOB(13178, 8061, 71, 1160, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 2)),
- STEEL_TORCHES(13202, 8070, 45, 80, new Item(Items.STEEL_BAR_2353, 2)),
- WOODEN_TORCHES(13200, 8069, 49, 58, new Item(Items.PLANK_960, 2)),
- STEEL_CANDLESTICKS(13204, 8071, 53, 124, new Item(Items.STEEL_BAR_2353, 6), new Item(Items.CANDLE_36, 6)),
- GOLD_CANDLESTICKS(13206, 8072, 57, 46, new Item(Items.GOLD_BAR_2357, 6), new Item(Items.CANDLE_36, 6)),
- INCENSE_BURNERS(13208, 8073, 61, 280, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 2)),
- MAHOGANY_BURNERS(13210, 8074, 65, 600, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 2)),
- MARBLE_BURNERS(13212, 8075, 69, 1600, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.STEEL_BAR_2353, 2)),
- SHUTTERED_WINDOW(new int[] { 13253, 13226, 13235, 13244, 13217, 13262 }, 8076, 49, 228, new Item(Items.PLANK_960, 8)),
- DECORATIVE_WINDOW(new int[] { 13254, 13227, 13236, 13245, 13218, 13263 }, 8077, 69, 200, new Item(Items.MOLTEN_GLASS_1775, 8)),
- STAINED_GLASS(new int[] { 13255, 13228, 13237, 13246, 13219, 13264 }, 8078, 89, 400, new Item(Items.MOLTEN_GLASS_1775, 16)),
+ OAK_ALTAR (13179, 8062, 45, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+ TEAK_ALTAR (13182, 8063, 50, 360, new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+ CLOTH_ALTAR (13185, 8064, 56, 390, new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ MAHOGANY_ALTAR (13188, 8065, 60, 590, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ LIMESTONE_ALTAR (13191, 8066, 64, 910, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+ MARBLE_ALTAR (13194, 8067, 70, 1030, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+ GILDED_ALTAR (13197, 8068, 75, 2230, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 4) }),
+ SMALL_STATUE (13271, 8082, 49, 40, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+ MEDIUM_STATUE (13272, 8083, 69, 500, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+ LARGE_STATUE (13282, 8084, 89, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) }),
+ WINDCHIMES (13214, 8079, 49, 323, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 4) }),
+ BELLS (13215, 8080, 58, 480, new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 6) }),
+ ORGAN (13216, 8081, 69, 680, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 6) }),
+ SARADOMIN_SYMBOL (13172, 8055, 48, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ ZAMORAK_SYMBOL (13173, 8056, 48, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ GUTHIX_SYMBOL (13174, 8057, 48, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ SARADOMIN_ICON (13175, 8058, 59, 960, new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) }),
+ ZAMORAK_ICON (13176, 8059, 59, 960, new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) }),
+ GUTHIX_ICON (13177, 8060, 59, 960, new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) }),
+ ICON_OF_BOB (13178, 8061, 71, 1160, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 2) }),
+ STEEL_TORCHES (13202, 8070, 45, 80, new Item[] { new Item(Items.STEEL_BAR_2353, 2) }),
+ WOODEN_TORCHES (13200, 8069, 49, 58, new Item[] { new Item(Items.PLANK_960, 2) }),
+ STEEL_CANDLESTICKS(13204, 8071, 53, 124, new Item[] { new Item(Items.STEEL_BAR_2353, 6), new Item(Items.CANDLE_36, 6) }),
+ GOLD_CANDLESTICKS (13206, 8072, 57, 46, new Item[] { new Item(Items.GOLD_BAR_2357, 6), new Item(Items.CANDLE_36, 6) }),
+ INCENSE_BURNERS (13208, 8073, 61, 280, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 2) }),
+ MAHOGANY_BURNERS (13210, 8074, 65, 600, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 2) }),
+ MARBLE_BURNERS (13212, 8075, 69, 1600, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.STEEL_BAR_2353, 2) }),
+ SHUTTERED_WINDOW (new int[] { 13253, 13226, 13235, 13244, 13217, 13262 }, 8076, 49, 228, new Item[] { new Item(Items.PLANK_960, 8) }),
+ DECORATIVE_WINDOW (new int[] { 13254, 13227, 13236, 13245, 13218, 13263 }, 8077, 69, 200, new Item[] { new Item(Items.MOLTEN_GLASS_1775, 8) }),
+ STAINED_GLASS (new int[] { 13255, 13228, 13237, 13246, 13219, 13264 }, 8078, 89, 400, new Item[] { new Item(Items.MOLTEN_GLASS_1775, 16) }),
/**
* Throne room
*/
- OAK_THRONE(13665, 8357, 60, 800, new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786, 1)),
- TEAK_THRONE(13666, 8358, 67, 1450, new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.MARBLE_BLOCK_8786, 2)),
- MAHOGANY_THRONE(13667, 8359, 74, 2200, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 3)),
- GILDED_THRONE(13668, 8360, 81, 1700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.GOLD_LEAF_8784, 3)),
- SKELETON_THRONE(13669, 8361, 88, 7003, new Item(Items.MAGIC_STONE_8788, 5), new Item(Items.MARBLE_BLOCK_8786, 4), new Item(Items.BONES_526, 5), new Item(Items.SKULL_964, 2)),
- CRYSTAL_THRONE(13670, 8362, 95, 15000, new Item(Items.MAGIC_STONE_8788, 15)),
- DEMONIC_THRONE(13671, 8363, 99, 25000, new Item(Items.MAGIC_STONE_8788, 25)),
- OAK_LEVER(13672, 8364, 68, 300, new Item(Items.OAK_PLANK_8778, 5)),
- TEAK_LEVER(13673, 8365, 78, 450, new Item(Items.TEAK_PLANK_8780, 5)),
- MAHOGANY_LEVER(13674, 8366, 88, 700, new Item(Items.MAHOGANY_PLANK_8782, 5)),
- FLOOR_DECORATION(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8370, 61, 700, new Item(Items.MAHOGANY_PLANK_8782, 5)),
- STEEL_CAGE(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8371, 68, 1100, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.STEEL_BAR_2353, 20)),
- FLOOR_TRAP(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8372, 74, 770, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.CLOCKWORK_8792, 10)),
- MAGIC_CIRCLE(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8373, 82, 2700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 2)),
- MAGIC_CAGE(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8374, 89, 4700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 4)),
- OAK_TRAPDOOR(13675, 8367, 68, 300, new Item(Items.OAK_PLANK_8778, 5)),
- TEAK_TRAPDOOR(13676, 8368, 78, 450, new Item(Items.TEAK_PLANK_8780, 5)),
- MAHOGANY_TRAPDOOR(13677, 8369, 88, 700, new Item(Items.MAHOGANY_PLANK_8782, 5)),
- CARVED_TEAK_BENCH(13694, 8112, 44, 360, new Item(Items.TEAK_PLANK_8780, 4)),
- MAHOGANY_BENCH(13695, 8113, 52, 560, new Item(Items.MAHOGANY_PLANK_8782, 4)),
- GILDED_BENCH(13696, 8114, 61, 1760, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4)),
- OAK_DECO(13798, 8102, 16, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
- TEAK_DECO(13814, 8103, 36, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
- GILDED_DECO(13782, 8104, 56, 1020.0, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2)),
- ROUND_SHIELD(13734, 8105, 66, 120, new Item(Items.OAK_PLANK_8778, 2)),
- SQUARE_SHIELD(13766, 8106, 76, 360, new Item(Items.TEAK_PLANK_8780, 4)),
- KITE_SHIELD(13750, 8107, 86, 420, new Item(Items.MAHOGANY_PLANK_8782, 3)),
-
+ OAK_THRONE (13665, 8357, 60, 800, new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786) }),
+ TEAK_THRONE (13666, 8358, 67, 1450, new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.MARBLE_BLOCK_8786, 2) }),
+ MAHOGANY_THRONE (13667, 8359, 74, 2200, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 3) }),
+ GILDED_THRONE (13668, 8360, 81, 1700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.GOLD_LEAF_8784, 3) }),
+ SKELETON_THRONE (13669, 8361, 88, 7003, new Item[] { new Item(Items.MAGIC_STONE_8788, 5), new Item(Items.MARBLE_BLOCK_8786, 4), new Item(Items.BONES_526, 5), new Item(Items.SKULL_964, 2) }),
+ CRYSTAL_THRONE (13670, 8362, 95, 15000, new Item[] { new Item(Items.MAGIC_STONE_8788, 15) }),
+ DEMONIC_THRONE (13671, 8363, 99, 25000, new Item[] { new Item(Items.MAGIC_STONE_8788, 25) }),
+ OAK_LEVER (13672, 8364, 68, 300, new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+ TEAK_LEVER (13673, 8365, 78, 450, new Item[] { new Item(Items.TEAK_PLANK_8780, 5) }),
+ MAHOGANY_LEVER (13674, 8366, 88, 700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
+ FLOOR_DECORATION (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8370, 61, 700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
+ STEEL_CAGE (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8371, 68, 1100, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.STEEL_BAR_2353, 20) }),
+ FLOOR_TRAP (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8372, 74, 770, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.CLOCKWORK_8792, 10) }),
+ MAGIC_CIRCLE (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8373, 82, 2700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 2) }),
+ MAGIC_CAGE (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8374, 89, 4700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 4) }),
+ OAK_TRAPDOOR (13675, 8367, 68, 300, new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+ TEAK_TRAPDOOR (13676, 8368, 78, 450, new Item[] { new Item(Items.TEAK_PLANK_8780, 5) }),
+ MAHOGANY_TRAPDOOR(13677, 8369, 88, 700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
+ CARVED_TEAK_BENCH(13694, 8112, 44, 360, new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+ MAHOGANY_BENCH (13695, 8113, 52, 560, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) }),
+ GILDED_BENCH (13696, 8114, 61, 1760, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) }),
+ OAK_DECO (13798, 8102, 16, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ TEAK_DECO (13814, 8103, 36, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+ GILDED_DECO (13782, 8104, 56, 1020, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) }),
+ ROUND_SHIELD (13734, 8105, 66, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+ SQUARE_SHIELD (13766, 8106, 76, 360, new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+ KITE_SHIELD (13750, 8107, 86, 420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
+
/**
* Oubliette
*/
- SPIKES_MID(13334, 8302, 65, 623, new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
- SPIKES_SIDE(13335, 8302, 65, 623, new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
- SPIKES_CORNER(13336, 8302, 65, 623, new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
- SPIKES_FL(13338, 8302, 65, 623, new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
- TENTACLE_MID(13331, 8303, 71, 326, new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
- TENTACLE_SIDE(13332, 8303, 71, 326, new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
- TENTACLE_CORNER(13333, 8303, 71, 326, new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
- TENTACLE_FL(13338, 8303, 71, 326, new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
- FP_FLOOR_MID(13371, 8304, 77, 357, new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
- FP_FLOOR_SIDE(13371, 8304, 77, 357, new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
- FP_FLOOR_CORNER(13371, 8304, 77, 357, new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
- FLAME_PIT(13337, 8304, 77, 357, new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
- ROCNAR_FLOOR_MID(13371, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
- ROCNAR_FLOOR_SIDE(13371, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
- ROCNAR_FLOOR_CORNER(13371, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
- ROCNAR(13373, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
- ROCNAR_FL(13338, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
- OAK_CAGE(13313, 8297, 65, 640, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
- OAK_CAGE_DOOR(13314, 8297, 65, 640, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
- OAK_STEEL_CAGE(13316, 8298, 70, 800, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
- OAK_STEEL_CAGE_DOOR(13317, 8298, 70, 800, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
- STEEL_CAGE_OU(13319, 8299, 75, 400, new Item(Items.STEEL_BAR_2353, 20)),
- STEEL_CAGE_DOOR(13320, 8299, 75, 400, new Item(Items.STEEL_BAR_2353, 20)),
- SPIKED_CAGE(13322, 8300, 80, 500, new Item(Items.STEEL_BAR_2353, 25)),
- SPIKED_CAGE_DOOR(13323, 8300, 80, 500, new Item(Items.STEEL_BAR_2353, 25)),
- BONE_CAGE(13325, 8301, 85, 603, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10)),
- BONE_CAGE_DOOR(13326, 8301, 85, 603, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10)),
- SKELETON_GUARD(13366, 8131, 70, 223, new Item(Items.COINS_995, 50000)),
- GUARD_DOG(13367, 8132, 74, 273, new Item(Items.COINS_995, 75000)),
- HOBGOBLIN(13368, 8133, 78, 316, new Item(Items.COINS_995, 100000)),
- BABY_RED_DRAGON(13372, 8134, 82, 387, new Item(Items.COINS_995, 150000)),
- HUGE_SPIDER(13370, 8135, 86, 447, new Item(Items.COINS_995, 200000)),
- TROLL(13369, 8136, 90, 1000, new Item(Items.COINS_995, 1000000)),
- HELLHOUND(2715, 8137, 94, 2236, new Item(Items.COINS_995, 5000000)),
- OAK_LADDER(13328, 8306, 68, 300, new Item(Items.OAK_PLANK_8778, 5)),
- TEAK_LADDER(13329, 8307, 78, 450, new Item(Items.TEAK_PLANK_8780, 5)),
- MAHOGANY_LADDER(13330, 8308, 88, 700, new Item(Items.MAHOGANY_PLANK_8782, 5)),
- DECORATIVE_BLOOD(13312, 8125, 72, 4, new Item(Items.RED_DYE_1763, 4)),
- DECORATIVE_PIPE(13311, 8126, 83, 120, new Item(Items.STEEL_BAR_2353, 6)),
- HANGING_SKELETON(13310, 8127, 94, 3, new Item(Items.SKULL_964, 2), new Item(Items.BONES_526, 6)),
- CANDLE(13342, 8128, 72, 243, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_CANDLE_33, 4)),
- TORCH(13341, 8129, 84, 244, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4)),
- SKULL_TORCH(13343, 8130, 94, 246, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4), new Item(Items.SKULL_964, 4)),
-
+ SPIKES_MID (13334, 8302, 65, 623, new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) }),
+ SPIKES_SIDE (13335, 8302, 65, 623, new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) }),
+ SPIKES_CORNER (13336, 8302, 65, 623, new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) }),
+ SPIKES_FL (13338, 8302, 65, 623, new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) }),
+ TENTACLE_MID (13331, 8303, 71, 326, new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) }),
+ TENTACLE_SIDE (13332, 8303, 71, 326, new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) }),
+ TENTACLE_CORNER (13333, 8303, 71, 326, new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) }),
+ TENTACLE_FL (13338, 8303, 71, 326, new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) }),
+ FP_FLOOR_MID (13371, 8304, 77, 357, new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) }),
+ FP_FLOOR_SIDE (13371, 8304, 77, 357, new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) }),
+ FP_FLOOR_CORNER (13371, 8304, 77, 357, new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) }),
+ FLAME_PIT (13337, 8304, 77, 357, new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) }),
+ ROCNAR_FLOOR_MID (13371, 8305, 83, 387, new Item[] { new Item(Items.COINS_995, 150000) }),
+ ROCNAR_FLOOR_SIDE (13371, 8305, 83, 387, new Item[] { new Item(Items.COINS_995, 150000) }),
+ ROCNAR_FLOOR_CORNER(13371, 8305, 83, 387, new Item[] { new Item(Items.COINS_995, 150000) }),
+ ROCNAR (13373, 8305, 83, 387, new Item[] { new Item(Items.COINS_995, 150000) }),
+ ROCNAR_FL (13338, 8305, 83, 387, new Item[] { new Item(Items.COINS_995, 150000) }),
+ OAK_CAGE (13313, 8297, 65, 640, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) }),
+ OAK_CAGE_DOOR (13314, 8297, 65, 640, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) }),
+ OAK_STEEL_CAGE (13316, 8298, 70, 800, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+ OAK_STEEL_CAGE_DOOR(13317, 8298, 70, 800, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+ STEEL_CAGE_OU (13319, 8299, 75, 400, new Item[] { new Item(Items.STEEL_BAR_2353, 20) }),
+ STEEL_CAGE_DOOR (13320, 8299, 75, 400, new Item[] { new Item(Items.STEEL_BAR_2353, 20) }),
+ SPIKED_CAGE (13322, 8300, 80, 500, new Item[] { new Item(Items.STEEL_BAR_2353, 25) }),
+ SPIKED_CAGE_DOOR (13323, 8300, 80, 500, new Item[] { new Item(Items.STEEL_BAR_2353, 25) }),
+ BONE_CAGE (13325, 8301, 85, 603, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10) }),
+ BONE_CAGE_DOOR (13326, 8301, 85, 603, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10) }),
+ SKELETON_GUARD (13366, 8131, 70, 223, new Item[] { new Item(Items.COINS_995, 50000) }),
+ GUARD_DOG (13367, 8132, 74, 273, new Item[] { new Item(Items.COINS_995, 75000) }),
+ HOBGOBLIN (13368, 8133, 78, 316, new Item[] { new Item(Items.COINS_995, 100000) }),
+ BABY_RED_DRAGON (13372, 8134, 82, 387, new Item[] { new Item(Items.COINS_995, 150000) }),
+ HUGE_SPIDER (13370, 8135, 86, 447, new Item[] { new Item(Items.COINS_995, 200000) }),
+ TROLL (13369, 8136, 90, 1000, new Item[] { new Item(Items.COINS_995, 1000000) }),
+ HELLHOUND (2715, 8137, 94, 2236, new Item[] { new Item(Items.COINS_995, 5000000) }),
+ OAK_LADDER (13328, 8306, 68, 300, new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+ TEAK_LADDER (13329, 8307, 78, 450, new Item[] { new Item(Items.TEAK_PLANK_8780, 5) }),
+ MAHOGANY_LADDER (13330, 8308, 88, 700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
+ DECORATIVE_BLOOD (13312, 8125, 72, 4, new Item[] { new Item(Items.RED_DYE_1763, 4) }),
+ DECORATIVE_PIPE (13311, 8126, 83, 120, new Item[] { new Item(Items.STEEL_BAR_2353, 6) }),
+ HANGING_SKELETON (13310, 8127, 94, 3, new Item[] { new Item(Items.SKULL_964, 2), new Item(Items.BONES_526, 6) }),
+ CANDLE (13342, 8128, 72, 243, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_CANDLE_33, 4) }),
+ TORCH (13341, 8129, 84, 244, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4) }),
+ SKULL_TORCH (13343, 8130, 94, 246, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4), new Item(Items.SKULL_964, 4) }),
+
/**
* Dungeon corridor, junction, stairs & pit
*/
- OAK_DOOR_LEFT(13344, 8122, 74, 600, new Item(Items.OAK_PLANK_8778, 10)),
- OAK_DOOR_RIGHT(13345, 8122, 74, 600, new Item(Items.OAK_PLANK_8778, 10)),
- STEEL_DOOR_LEFT(13346, 8123, 84, 800, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
- STEEL_DOOR_RIGHT(13347, 8123, 84, 800, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
- MARBLE_DOOR_LEFT(13348, 8124, 94, 2000, new Item(Items.MARBLE_BLOCK_8786, 4)),
- MARBLE_DOOR_RIGHT(13349, 8124, 94, 2000, new Item(Items.MARBLE_BLOCK_8786, 4)),
- SPIKE_TRAP(13356, 8143, 72, 223, new Item(Items.COINS_995, 50000)),
- MAN_TRAP(13357, 8144, 76, 273, new Item(Items.COINS_995, 75000)),
- TANGLE_TRAP(13358, 8145, 80, 316, new Item(Items.COINS_995, 100000)),
- MARBLE_TRAP(13359, 8146, 84, 387, new Item(Items.COINS_995, 150000)),
- TELEPORT_TRAP(13360, 8147, 88, 447, new Item(Items.COINS_995, 200000)),
-
- /* objID, int, lvl, exp, materials */
- PIT_DOG(39260, 18791, 70, 200, new Item(Items.COINS_995, 40000)),
- PIT_OGRE(39261, 18792, 73, 234, new Item(Items.COINS_995, 55000)),
- PIT_ROCK_PROTECTOR(39262, 18793, 79, 300, new Item(Items.COINS_995, 90000)),
- PIT_SCABARITE(39263, 18794, 84, 387, new Item(Items.COINS_995, 150000)),
- PIT_BLACK_DEMON(39264, 18795, 89, 547, new Item(Items.COINS_995, 300000)),
- PIT_IRON_DRAGON(39265, 18796, 97, 2738, new Item(Items.COINS_995, 7500000)),
+ OAK_DOOR_LEFT (13344, 8122, 74, 600, new Item[] { new Item(Items.OAK_PLANK_8778, 10) }),
+ OAK_DOOR_RIGHT (13345, 8122, 74, 600, new Item[] { new Item(Items.OAK_PLANK_8778, 10) }),
+ STEEL_DOOR_LEFT (13346, 8123, 84, 800, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+ STEEL_DOOR_RIGHT (13347, 8123, 84, 800, new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+ MARBLE_DOOR_LEFT (13348, 8124, 94, 2000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+ MARBLE_DOOR_RIGHT (13349, 8124, 94, 2000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+ SPIKE_TRAP (13356, 8143, 72, 223, new Item[] { new Item(Items.COINS_995, 50000) }),
+ MAN_TRAP (13357, 8144, 76, 273, new Item[] { new Item(Items.COINS_995, 75000) }),
+ TANGLE_TRAP (13358, 8145, 80, 316, new Item[] { new Item(Items.COINS_995, 100000) }),
+ MARBLE_TRAP (13359, 8146, 84, 387, new Item[] { new Item(Items.COINS_995, 150000) }),
+ TELEPORT_TRAP (13360, 8147, 88, 447, new Item[] { new Item(Items.COINS_995, 200000) }),
+ PIT_DOG (39260, 18791, 70, 200, new Item[] { new Item(Items.COINS_995, 40000) }),
+ PIT_OGRE (39261, 18792, 73, 234, new Item[] { new Item(Items.COINS_995, 55000) }),
+ PIT_ROCK_PROTECTOR(39262, 18793, 79, 300, new Item[] { new Item(Items.COINS_995, 90000) }),
+ PIT_SCABARITE (39263, 18794, 84, 387, new Item[] { new Item(Items.COINS_995, 150000) }),
+ PIT_BLACK_DEMON (39264, 18795, 89, 547, new Item[] { new Item(Items.COINS_995, 300000) }),
+ PIT_IRON_DRAGON (39265, 18796, 97, 2738, new Item[] { new Item(Items.COINS_995, 7500000) }),
/**
* Treasure room
*/
- DEMON(13378, 8138, 75, 707, new Item(Items.COINS_995, 500000)),
- KALPHITE_SOLDIER(13374, 8139, 80, 866, new Item(Items.COINS_995, 750000)),
- TOK_XIL(13377, 8140, 85, 2236, new Item(Items.COINS_995, 5000000)),
- DAGANNOTH(13376, 8141, 90, 2738, new Item(Items.COINS_995, 7500000)),
- STEEL_DRAGON(13375, 8142, 95, 3162, new Item(Items.COINS_995, 1000000)),
- WOODEN_CRATE(13283, 8148, 75, 143, new Item(Items.PLANK_960, 5)),
- OAK_T_CHEST(13285, 8149, 79, 340, new Item(Items.OAK_PLANK_8778, 5), new Item(Items.STEEL_BAR_2353, 2)),
- TEAK_T_CHEST(13287, 8150, 83, 530, new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.STEEL_BAR_2353, 4)),
- MGANY_T_CHEST(13289, 8151, 87, 1000, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784, 1)),
- MAGIC_CHEST(13291, 8152, 91, 1000, new Item(Items.MAGIC_STONE_8788, 1)),
-
+ DEMON (13378, 8138, 75, 707, new Item[] { new Item(Items.COINS_995, 500000) }),
+ KALPHITE_SOLDIER (13374, 8139, 80, 866, new Item[] { new Item(Items.COINS_995, 750000) }),
+ TOK_XIL (13377, 8140, 85, 2236, new Item[] { new Item(Items.COINS_995, 5000000) }),
+ DAGANNOTH (13376, 8141, 90, 2738, new Item[] { new Item(Items.COINS_995, 7500000) }),
+ STEEL_DRAGON (13375, 8142, 95, 3162, new Item[] { new Item(Items.COINS_995, 1000000) }),
+ WOODEN_CRATE (13283, 8148, 75, 143, new Item[] { new Item(Items.PLANK_960, 5) }),
+ OAK_T_CHEST (13285, 8149, 79, 340, new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.STEEL_BAR_2353, 2) }),
+ TEAK_T_CHEST (13287, 8150, 83, 530, new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.STEEL_BAR_2353, 4) }),
+ MGANY_T_CHEST (13289, 8151, 87, 1000, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784) }),
+ MAGIC_CHEST (13291, 8152, 91, 1000, new Item[] { new Item(Items.MAGIC_STONE_8788) }),
+
/**
* Style related decoration.
*/
- BASIC_WOOD_WINDOW(13099, -1, 1, 0.0),
- BASIC_STONE_WINDOW(13091, -1, 1, 0.0),
- WHITEWASHED_STONE_WINDOW(13005, -1, 1, 0.0),
- FREMENNIK_WINDOW(13112, -1, 1, 0.0),
- TROPICAL_WOOD_WINDOW(10816, -1, 1, 0.0),
- FANCY_STONE_WINDOW(13117, -1, 1, 0.0),
-
+ BASIC_WOOD_WINDOW (13099, -1, 1, 0),
+ BASIC_STONE_WINDOW (13091, -1, 1, 0),
+ WHITEWASHED_STONE_WINDOW (13005, -1, 1, 0),
+ FREMENNIK_WINDOW (13112, -1, 1, 0),
+ TROPICAL_WOOD_WINDOW (10816, -1, 1, 0),
+ FANCY_STONE_WINDOW (13117, -1, 1, 0),
;
+
/**
* The object id.
*/
private final int objectId;
-
+
/**
* The item id for the interface.
*/
@@ -1083,17 +700,22 @@ public enum Decoration {
* The level requirement.
*/
private final int level;
-
+
/**
* The experience gained for building this decoration.
*/
- private final double experience;
-
+ private final int experience;
+
/**
* The item required.
*/
private final Item[] items;
-
+
+ /**
+ * The items that will be refunded.
+ */
+ private final Item[] refundItems;
+
/**
* The tools required.
*/
@@ -1103,33 +725,72 @@ public enum Decoration {
* The object ids depending on styling.
*/
private final int[] objectIds;
-
+
/**
* If this node should be invisible to user build options
*/
private boolean invisibleNode;
-
+
/**
- * Constructs a new {@code Portal} {@code Object}.
+ * Constructs a new object, no items, no tools, no refund items.
* @param objectId The object id.
* @param interfaceItem The item id for the building interface.
* @param level The level required.
* @param experience The experience gained.
- * @param items The items required.
*/
- private Decoration(int objectId, int interfaceItem, int level, double experience, Item... items) {
- this(objectId, interfaceItem, level, experience, new int[] { 2347, 8794 }, items);
+ Decoration(int objectId, int interfaceItem, int level, int experience) {
+ this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, new Item[] {}, new Item[] {});
}
-
+
/**
- * Constructs a new {@code Portal} {@code Object}.
+ * Constructs a new object, no tools, no refund items.
* @param objectId The object id.
* @param interfaceItem The item id for the building interface.
* @param level The level required.
* @param experience The experience gained.
* @param items The items required.
*/
- private Decoration(int objectId, int interfaceItem, int level, double experience, int[] tools, Item... items) {
+ Decoration(int objectId, int interfaceItem, int level, int experience, Item[] items) {
+ this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items, new Item[] {});
+ }
+
+ /**
+ * Constructs a new object, no refund items.
+ * @param objectId The object id.
+ * @param interfaceItem The item id for the building interface.
+ * @param level The level required.
+ * @param experience The experience gained.
+ * @param tools The tools needed.
+ * @param items The items required.
+ */
+ Decoration(int objectId, int interfaceItem, int level, int experience, int[] tools, Item[] items) {
+ this(objectId, interfaceItem, level, experience, tools, items, new Item[] {});
+ }
+
+ /**
+ * Constructs a new object, no tools.
+ * @param objectId The object id.
+ * @param interfaceItem The item id for the building interface.
+ * @param level The level required.
+ * @param experience The experience gained.
+ * @param items The items required.
+ * @param refundItems The items to be refunded when the item is removed.
+ */
+ Decoration(int objectId, int interfaceItem, int level, int experience, Item[] items, Item[] refundItems) {
+ this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items, refundItems);
+ }
+
+ /**
+ * Constructs a new object.
+ * @param objectId The object id.
+ * @param interfaceItem The item id for the building interface.
+ * @param level The level required.
+ * @param experience The experience gained.
+ * @param tools The tools needed.
+ * @param items The items required.
+ * @param refundItems The items to be refunded when the item is removed.
+ */
+ Decoration(int objectId, int interfaceItem, int level, int experience, int[] tools, Item[] items, Item[] refundItems) {
this.objectId = objectId;
this.objectIds = null;
this.interfaceItem = interfaceItem;
@@ -1137,39 +798,54 @@ public enum Decoration {
this.experience = experience;
this.tools = tools;
this.items = items;
+ this.refundItems = refundItems;
}
-
+
/**
* Decoration
* @param objectId
* @param invisibleNode
*/
- private Decoration(int objectId, boolean invisibleNode) {
+ Decoration(int objectId, boolean invisibleNode) {
this(objectId, -1, -1, -1);
this.invisibleNode = true;
}
-
+
/**
- * Constructs a new {@code Portal} {@code Object}.
+ * Constructs a new object, no tools, no refund items.
* @param objectIds The object id.
* @param interfaceItem The item id for the building interface.
* @param level The level required.
* @param experience The experience gained.
* @param items The items required.
*/
- private Decoration(int[] objectIds, int interfaceItem, int level, double experience, Item... items) {
- this(objectIds, interfaceItem, level, experience, new int[] { 2347, 8794 }, items);
+ Decoration(int[] objectIds, int interfaceItem, int level, int experience, Item[] items) {
+ this(objectIds, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items, new Item[] {});
}
-
/**
- * Constructs a new {@code Portal} {@code Object}.
+ * Constructs a new object no refund items.
* @param objectIds The object id.
* @param interfaceItem The item id for the building interface.
* @param level The level required.
* @param experience The experience gained.
+ * @param tools The tools needed.
* @param items The items required.
*/
- private Decoration(int[] objectIds, int interfaceItem, int level, double experience, int[] tools, Item... items) {
+ Decoration(int[] objectIds, int interfaceItem, int level, int experience, int[] tools, Item[] items) {
+ this(objectIds, interfaceItem, level, experience, tools, items, new Item[] {});
+ }
+
+ /**
+ * Constructs a new object.
+ * @param objectIds The object id.
+ * @param interfaceItem The item id for the building interface.
+ * @param level The level required.
+ * @param experience The experience gained.
+ * @param tools The tools needed.
+ * @param items The items required.
+ * @param refundItems The items to be refunded when the item is removed.
+ */
+ Decoration(int[] objectIds, int interfaceItem, int level, int experience, int[] tools, Item[] items, Item[] refundItems) {
this.objectId = objectIds[0];
this.objectIds = objectIds;
this.interfaceItem = interfaceItem;
@@ -1177,6 +853,7 @@ public enum Decoration {
this.experience = experience;
this.tools = tools;
this.items = items;
+ this.refundItems = refundItems;
}
/**
@@ -1203,7 +880,7 @@ public enum Decoration {
}
return null;
}
-
+
/**
* Gets a decoration for the given object id
* @param objectId - the object id of the built object
@@ -1217,7 +894,7 @@ public enum Decoration {
}
return null;
}
-
+
public static Decoration forName(String name) {
for (Decoration d : Decoration.values()) {
if (d.name().equals(name)) {
@@ -1239,7 +916,7 @@ public enum Decoration {
}
return 0;
}
-
+
/**
* Gets the objectId.
* @param style The current housing style.
@@ -1251,7 +928,7 @@ public enum Decoration {
}
return objectId;
}
-
+
/**
* Gets the objectId.
* @return The objectId.
@@ -1272,7 +949,7 @@ public enum Decoration {
* Gets the experience.
* @return The experience.
*/
- public double getExperience() {
+ public int getExperience() {
return experience;
}
@@ -1284,6 +961,14 @@ public enum Decoration {
return items;
}
+ /**
+ * Gets the refund items.
+ * @return The refund items.
+ */
+ public Item[] getRefundItems() {
+ return refundItems;
+ }
+
/**
* Gets the tools.
* @return The tools.
@@ -1308,10 +993,11 @@ public enum Decoration {
return objectIds;
}
+ /**
+ * If this node should be invisible to user build options
+ * @return true if so.
+ */
public boolean isInvisibleNode() {
return invisibleNode;
}
-
-
-
}
diff --git a/Server/src/main/content/global/skill/construction/HouseManager.java b/Server/src/main/content/global/skill/construction/HouseManager.java
index 8afd8dcff..65ee6c3d9 100644
--- a/Server/src/main/content/global/skill/construction/HouseManager.java
+++ b/Server/src/main/content/global/skill/construction/HouseManager.java
@@ -20,7 +20,6 @@ import core.game.world.GameWorld;
import org.rs09.consts.Sounds;
import java.awt.*;
-import java.nio.ByteBuffer;
import static core.api.ContentAPIKt.*;
import static core.api.regionspec.RegionSpecificationKt.fillWith;
@@ -99,39 +98,12 @@ public final class HouseManager {
}
- public void save(ByteBuffer buffer) {
- buffer.put((byte) location.ordinal());
- buffer.put((byte) style.ordinal());
- if (hasServant()) {
- servant.save(buffer);
- } else {
- buffer.put((byte) -1);
- }
- for (int z = 0; z < 4; z++) {
- for (int x = 0; x < 8; x++) {
- for (int y = 0; y < 8; y++) {
- Room room = rooms[z][x][y];
- if (room != null) {
- buffer.put((byte) z).put((byte) x).put((byte) y);
- buffer.put((byte) room.getProperties().ordinal());
- buffer.put((byte) room.getRotation().toInteger());
- for (int i = 0; i < room.getHotspots().length; i++) {
- if (room.getHotspots()[i].getDecorationIndex() > -1) {
- buffer.put((byte) i);
- buffer.put((byte) room.getHotspots()[i].getDecorationIndex());
- }
- }
- buffer.put((byte) -1);
- }
- }
- }
- }
- buffer.put((byte) -1);//Eof
- }
-
public void parse(JSONObject data){
location = HouseLocation.values()[Integer.parseInt( data.get("location").toString())];
style = HousingStyle.values()[Integer.parseInt( data.get("style").toString())];
+ if (data.get("locked") != null) {
+ locked = true;
+ }
Object servRaw = data.get("servant");
if(servRaw != null){
servant = Servant.parse((JSONObject) servRaw);
@@ -155,28 +127,6 @@ public final class HouseManager {
}
}
-
- public void parse(ByteBuffer buffer) {
- location = HouseLocation.values()[buffer.get() & 0xFF];
- style = HousingStyle.values()[buffer.get() & 0xFF];
- servant = Servant.parse(buffer);
- int z = 0;
- while ((z = buffer.get()) != -1) {
- if (z == 3) {
- hasDungeon = true;
- }
- int x = buffer.get();
- int y = buffer.get();
- Room room = rooms[z][x][y] = new Room(RoomProperties.values()[buffer.get() & 0xFF]);
- room.configure(style);
- room.setRotation(Direction.get(buffer.get() & 0xFF));
- int spot = 0;
- while ((spot = buffer.get()) != -1) {
- room.getHotspots()[spot].setDecorationIndex(buffer.get() & 0xFF);
- }
- }
- }
-
/**
* Prepares for entering the player's house.
* @param player
@@ -188,6 +138,7 @@ public final class HouseManager {
construct();
}
player.setAttribute("poh_entry", HouseManager.this);
+ player.setAttribute("/save:original-loc", location.getExitLocation());
player.lock(1);
player.debug("House location: " + houseRegion.getBaseLocation() + ", entry: " + getEnterLocation());
}
@@ -256,7 +207,7 @@ public final class HouseManager {
}
/**
- * Leaves this house.
+ * Leaves this house through the portal.
* @param player The player leaving.
*/
public static void leave(Player player) {
@@ -277,7 +228,9 @@ public final class HouseManager {
*/
public void toggleBuildingMode(Player player, boolean enable) {
if (!isInHouse(player)) {
- player.getPacketDispatch().sendMessage("Building mode really only helps if you're in a house.");
+ //player.getPacketDispatch().sendMessage("Building mode really only helps if you're in a house.");
+ setLocked(enable);
+ player.sendMessage("Your house is now "+(player.getHouseManager().isLocked() ? "locked." : "unlocked." ));
return;
}
if (buildingMode != enable) {
diff --git a/Server/src/main/content/global/skill/construction/HouseZone.java b/Server/src/main/content/global/skill/construction/HouseZone.java
index dd0075f23..33f875362 100644
--- a/Server/src/main/content/global/skill/construction/HouseZone.java
+++ b/Server/src/main/content/global/skill/construction/HouseZone.java
@@ -3,11 +3,12 @@ package content.global.skill.construction;
import core.game.node.entity.Entity;
import core.game.node.entity.player.Player;
+import core.game.world.map.build.DynamicRegion;
import core.game.world.map.zone.MapZone;
-import core.game.world.map.zone.ZoneRestriction;
import core.game.world.map.RegionManager;
import core.game.world.map.Region;
import core.game.system.task.Pulse;
+import core.game.world.map.zone.ZoneRestriction;
import static core.api.ContentAPIKt.*;
@@ -37,7 +38,7 @@ public final class HouseZone extends MapZone {
* Constructs the house zone object.
*/
public HouseZone(HouseManager house) {
- super("poh-zone" + house, true, ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.FOLLOWERS);
+ super("poh-zone" + house, true);
this.house = house;
}
@@ -81,15 +82,19 @@ public final class HouseZone extends MapZone {
if (e instanceof Player) {
Player p = (Player) e;
HouseManager.leave(p);
+ return true;
}
- return true;
+ return super.death(e, killer);
}
@Override
public boolean leave(Entity e, boolean logout) {
if (e instanceof Player) {
Player p = (Player) e;
- if (house == p.getHouseManager()) {
+ // The below tears down the house if the owner was the one who left
+ //if (house == p.getHouseManager()) {
+ // Snowscape: tear down the house when the last person leaves, allowing guests to stay in the house without the owner.
+ if (!house.getHouseRegion().isViewed() && (!house.hasDungeon() || !house.getDungeonRegion().isViewed())) {
house.expelGuests(p);
int toRemove = previousRegion;
int dungRemove = previousDungeon;
@@ -109,7 +114,11 @@ public final class HouseZone extends MapZone {
}
});
}
+ // Clear logout listener and original-loc (if appropriate)
clearLogoutListener(p, "houselogout");
+ if (!getAttribute(p, "kidnapped-by-random", false)) {
+ removeAttribute(p, "/save:original-loc");
+ }
return true;
}
return true;
diff --git a/Server/src/main/content/global/skill/construction/PortalOptionPlugin.java b/Server/src/main/content/global/skill/construction/PortalOptionPlugin.java
index 23d951dac..23d9621a2 100644
--- a/Server/src/main/content/global/skill/construction/PortalOptionPlugin.java
+++ b/Server/src/main/content/global/skill/construction/PortalOptionPlugin.java
@@ -8,6 +8,7 @@ import core.game.dialogue.DialoguePlugin;
import core.game.interaction.OptionHandler;
import core.game.node.Node;
import core.game.node.entity.player.Player;
+import core.game.node.entity.skill.Skills;
import core.game.node.scenery.Scenery;
import core.plugin.Initializable;
import core.plugin.Plugin;
@@ -33,6 +34,7 @@ public final class PortalOptionPlugin extends OptionHandler {
SceneryDefinition.forId(13405).getHandlers().put("option:lock", this);
SceneryDefinition.forId(13405).getHandlers().put("option:enter", this);
ClassScanner.definePlugin(new PortalDialogue());
+ ClassScanner.definePlugin(new PortalExitDialogue());
return this;
}
@@ -40,7 +42,8 @@ public final class PortalOptionPlugin extends OptionHandler {
public boolean handle(Player player, Node node, String option) {
Scenery object = node.asScenery();
if (object.getId() == 13405 && option.equals("enter")) {
- HouseManager.leave(player);
+ player.getDialogueInterpreter().open("houseExitDialogue");
+ //HouseManager.leave(player);
return true;
}
if (option.equals("lock")) {
@@ -111,11 +114,14 @@ public final class PortalOptionPlugin extends OptionHandler {
break;
}
//If the Player has a house, but does not have their house moved to the portal they are interacting with
+ /* Snowscape: allow entering house from anywhere
if (player.getHouseManager().getLocation().getPortalId() != player.getAttribute("con:portal", -1)) {
player.getPacketDispatch().sendMessage("Your house is in " + player.getHouseManager().getLocation().getName() + ".");
player.sendMessage("Speak with an estate agent to change your house location.");
break;
}
+ */
+ player.removeAttribute("lasthouseentered");
player.getHouseManager().enter(player, buttonId == 2);
break;
case 3:
@@ -134,10 +140,12 @@ public final class PortalOptionPlugin extends OptionHandler {
player.getPacketDispatch().sendMessage("You aren't a friend of yourself!");
return Unit.INSTANCE;
}
+ /* Snowscape: allow entering house if host is not home.
if (!p.getHouseManager().isLoaded()) {
player.getPacketDispatch().sendMessage("This player is not at home right now.");
return Unit.INSTANCE;
}
+ */
if (p.getHouseManager().isBuildingMode()) {
player.getPacketDispatch().sendMessage("This player is in building mode.");
return Unit.INSTANCE;
@@ -146,6 +154,7 @@ public final class PortalOptionPlugin extends OptionHandler {
player.getPacketDispatch().sendMessage("The other player has locked their house.");
return Unit.INSTANCE;
}
+ player.setAttribute("/save:lasthouseentered", (String) value);
p.setAttribute("poh_owner", (String) value);
p.getHouseManager().enter(player, false);
return Unit.INSTANCE;
@@ -162,4 +171,114 @@ public final class PortalOptionPlugin extends OptionHandler {
return new int[] { DialogueInterpreter.getDialogueKey("con:portal") };
}
}
+
+
+
+ /**
+ * Snowscape: select destination via dialogue when leaving the house
+ *
+ */
+ @PluginManifest(type= PluginType.DIALOGUE)
+ private class PortalExitDialogue extends DialoguePlugin {
+
+ /**
+ * Constructs a new {@code PortalExitDialogue} {@code Object}
+ */
+ public PortalExitDialogue() {
+
+ }
+
+ /**
+ * Constructs a new {@code PortalExitDialogue} {@code Object}
+ * @param player The player.
+ */
+ public PortalExitDialogue(Player player) {
+ super(player);
+ }
+
+ @Override
+ public DialoguePlugin newInstance(Player player) {
+ return new PortalExitDialogue(player);
+ }
+
+ @Override
+ public boolean open(Object... args) {
+ options("Leave house (home location)", "Rimmington", "Taverly", "Pollnivneach", "Next Page");
+ stage = 1;
+ return true;
+ }
+
+ @Override
+ public boolean handle(int interfaceId, int buttonId) {
+ switch (stage) {
+ case 1:
+ switch (buttonId) {
+ case 1:
+ HouseManager.leave(player);
+ end();
+ break;
+ case 2:
+ attemptHouseExit(HouseLocation.RIMMINGTON);
+ end();
+ break;
+ case 3:
+ attemptHouseExit(HouseLocation.TAVERLY);
+ end();
+ break;
+ case 4:
+ attemptHouseExit(HouseLocation.POLLNIVNEACH);
+ end();
+ break;
+ case 5:
+ options("Rellekka", "Brimhaven","Yanille", "Cancel");
+ stage = 2;
+ break;
+ }
+ break;
+ case 2:
+ switch (buttonId) {
+ case 1:
+ attemptHouseExit(HouseLocation.RELLEKKA);
+ end();
+ break;
+ case 2:
+ attemptHouseExit(HouseLocation.BRIMHAVEN);
+ end();
+ break;
+ case 3:
+ attemptHouseExit(HouseLocation.YANILLE);
+ end();
+ break;
+ case 4:
+ end();
+ break;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public int[] getIds() {
+ return new int[] { DialogueInterpreter.getDialogueKey("houseExitDialogue") };
+ }
+
+ public void attemptHouseExit(HouseLocation targetLocation){
+ int level = 0;
+ String message = null;
+ if (player.getHouseManager().isInHouse(player)) {
+ level = getStatLevel(player, Skills.CONSTRUCTION);
+ message = "You need ";
+ } else {
+ level = getStatLevel(Repository.getPlayerByName(player.getAttribute("lasthouseentered", null)), Skills.CONSTRUCTION);
+ message = "The house owner needs ";
+ }
+
+ if (targetLocation.getLevelRequirement() <= level){
+ //player.animate(Animation.RESET);
+ player.getProperties().setTeleportLocation(targetLocation.getExitLocation());
+ } else {
+ player.sendMessage(message + targetLocation.getLevelRequirement() + " Construction to for you to teleport to " + targetLocation.getName() + ".");
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Server/src/main/content/global/skill/construction/Servant.java b/Server/src/main/content/global/skill/construction/Servant.java
index 63275330d..a3527bdad 100644
--- a/Server/src/main/content/global/skill/construction/Servant.java
+++ b/Server/src/main/content/global/skill/construction/Servant.java
@@ -5,8 +5,6 @@ import core.game.node.entity.npc.NPC;
import core.game.node.item.Item;
import org.json.simple.JSONObject;
-import java.nio.ByteBuffer;
-
/**
* Represents a player's servant.
* @author Emperor
@@ -44,26 +42,9 @@ public final class Servant extends NPC {
}
/**
- * Saves the servant details.
- * @param buffer The buffer to write on.
- */
- public void save(ByteBuffer buffer) {
- buffer.put((byte) type.ordinal());
- buffer.putShort((byte) uses);
- if (item == null) {
- buffer.putShort((short) -1);
- } else {
- buffer.putShort((short) item.getId());
- buffer.putInt(item.getAmount());
- }
- buffer.put((byte) (greet ? 1 : 0));
- }
-
- /**
- * Parses the servant from the buffer.
+ * Parses the servant from the save file.
* @return The servant.
*/
-
public static Servant parse(JSONObject data){
int type = Integer.parseInt( data.get("type").toString());
Servant servant = new Servant(ServantType.values()[type]);
@@ -77,21 +58,6 @@ public final class Servant extends NPC {
return servant;
}
- public static Servant parse(ByteBuffer buffer) {
- int type = buffer.get();
- if (type == -1) {
- return null;
- }
- Servant servant = new Servant(ServantType.values()[type]);
- servant.uses = buffer.getShort() & 0xFFFF;
- int itemId = buffer.getShort() & 0xFFFF;
- if ((short) itemId != -1) {
- servant.item = new Item(itemId, buffer.getInt());
- }
- servant.greet = buffer.get() == 1;
- return servant;
- }
-
/**
* Gets the item value.
* @return The item.
diff --git a/Server/src/main/content/global/skill/construction/decoration/costume/SnowscapeFancyDressBox.kt b/Server/src/main/content/global/skill/construction/decoration/costume/SnowscapeFancyDressBox.kt
new file mode 100644
index 000000000..8306a1e41
--- /dev/null
+++ b/Server/src/main/content/global/skill/construction/decoration/costume/SnowscapeFancyDressBox.kt
@@ -0,0 +1,30 @@
+package content.global.skill.construction.decoration.costume
+
+import core.game.node.scenery.Scenery
+import core.game.node.scenery.SceneryBuilder
+import core.game.interaction.InteractionListener
+import core.game.interaction.IntType
+import core.api.*
+
+/**
+ *
+ *
+ */
+class SnowscapeCostumeRoomBank : InteractionListener {
+
+ val IDs = intArrayOf(18772,18774,18776)
+
+ override fun defineListeners() {
+ on(IDs, IntType.SCENERY, "open"){ player, node ->
+ if (!player.houseManager.isInHouse(player)) {
+ sendMessage(player, "You can only do that in your own house.")
+ return@on true
+ }
+
+ setAttribute(player, "inCostumeRoomBank", true)
+ openBankAccount(player)
+
+ return@on true
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/skill/construction/decoration/portalchamber/PortalChamberPlugin.java b/Server/src/main/content/global/skill/construction/decoration/portalchamber/PortalChamberPlugin.java
index 3c658fec2..bf1f26c54 100644
--- a/Server/src/main/content/global/skill/construction/decoration/portalchamber/PortalChamberPlugin.java
+++ b/Server/src/main/content/global/skill/construction/decoration/portalchamber/PortalChamberPlugin.java
@@ -17,6 +17,8 @@ import core.plugin.Initializable;
import core.plugin.Plugin;
import core.plugin.ClassScanner;
+import static content.region.kandarin.ardougne.quest.plaguecity.PlagueCityListeners.ARDOUGNE_TELE_ATTRIBUTE;
+
/**
* PortalChamberPlugin
* @author Clayton Williams
@@ -87,6 +89,12 @@ public class PortalChamberPlugin extends OptionHandler {
}
for (Locations l : Locations.values()) {
if (l.name().contains(identifier)) {
+ if (l == Locations.ARDOUGNE){
+ if (!player.getAttribute(ARDOUGNE_TELE_ATTRIBUTE, false)) {
+ player.sendMessage("You do not have the requirements to direct the portal there");
+ return;
+ }
+ }
Item[] runes = l.runes;
if (!player.getInventory().containsItems(runes)) {
player.sendMessage("You do not have the required runes to build this portal");
diff --git a/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt b/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt
index 4f7ddb15b..47051e46f 100644
--- a/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt
+++ b/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt
@@ -4,8 +4,10 @@ import core.api.playGlobalAudio
import core.api.teleport
import core.game.interaction.IntType
import core.game.interaction.InteractionListener
+import core.game.node.Node
import core.game.node.entity.player.Player
import core.game.node.item.Item
+import core.game.node.scenery.Scenery
import core.game.system.task.Pulse
import core.game.world.map.Location
import core.game.world.update.flag.context.Animation
@@ -27,27 +29,31 @@ class MountedGlory : InteractionListener {
)
override fun defineListeners() {
- on(MOUNTED_GLORY, IntType.SCENERY, "Edgeville") { player, _ ->
- mountedGloryTeleport(player,0)
+ on(MOUNTED_GLORY, IntType.SCENERY, "Edgeville") { player, `object` ->
+ mountedGloryAction(player, `object`, 0)
return@on true
}
- on(MOUNTED_GLORY, IntType.SCENERY, "Karamja") { player, _ ->
- mountedGloryTeleport(player,1)
+ on(MOUNTED_GLORY, IntType.SCENERY, "Karamja") { player, `object` ->
+ mountedGloryAction(player, `object`, 1)
return@on true
}
- on(MOUNTED_GLORY, IntType.SCENERY, "Draynor Village") { player, _ ->
- mountedGloryTeleport(player,2)
+ on(MOUNTED_GLORY, IntType.SCENERY, "Draynor Village") { player, `object` ->
+ mountedGloryAction(player, `object`, 2)
return@on true
}
- on(MOUNTED_GLORY, IntType.SCENERY, "Al Kharid") { player, _ ->
- mountedGloryTeleport(player,3)
+ on(MOUNTED_GLORY, IntType.SCENERY, "Al Kharid") { player, `object` ->
+ mountedGloryAction(player, `object`, 3)
return@on true
}
}
- private fun mountedGloryTeleport(player : Player, int : Int) {
+ private fun mountedGloryAction(player : Player, `object` : Node, int : Int) {
+ if (player.houseManager.isBuildingMode) {
+ player.dialogueInterpreter.open("con:removedec", `object` as Scenery)
+ return
+ }
if (!player.zoneMonitor.teleport(1, Item(Items.AMULET_OF_GLORY_1704))) {
return
}
diff --git a/Server/src/main/content/global/skill/construction/decoration/study/LecternPlugin.kt b/Server/src/main/content/global/skill/construction/decoration/study/LecternPlugin.kt
index 826056ce3..eb4accf67 100644
--- a/Server/src/main/content/global/skill/construction/decoration/study/LecternPlugin.kt
+++ b/Server/src/main/content/global/skill/construction/decoration/study/LecternPlugin.kt
@@ -10,6 +10,7 @@ import core.game.node.entity.player.Player
import core.game.node.entity.player.link.diary.DiaryType
import core.game.node.entity.skill.Skills
import content.global.skill.construction.Decoration
+import content.region.kandarin.ardougne.quest.plaguecity.PlagueCityListeners.Companion.ARDOUGNE_TELE_ATTRIBUTE
import core.game.node.entity.combat.spell.MagicStaff
import core.game.node.item.Item
import core.game.system.task.Pulse
@@ -84,6 +85,11 @@ class LecternPlugin : OptionHandler() {
player.sendMessages("You need the Bones to Peaches ability purchased from MTA before making these.", "This requirement doesn't apply to actually using the tabs.")
return false
}
+ if(this == ARDOUGNE && !getAttribute(player, ARDOUGNE_TELE_ATTRIBUTE, false)){
+ sendMessage(player, "You need to unlock Ardougne teleport before you can make a tablet.")
+ return false
+
+ }
var found = false
for (d in requiredDecorations) if (d.objectId == objectId) found = true
if (!found) {
diff --git a/Server/src/main/content/global/skill/construction/decoration/study/TelescopePlugin.kt b/Server/src/main/content/global/skill/construction/decoration/study/TelescopePlugin.kt
index 6149fae5e..ea1d8c783 100644
--- a/Server/src/main/content/global/skill/construction/decoration/study/TelescopePlugin.kt
+++ b/Server/src/main/content/global/skill/construction/decoration/study/TelescopePlugin.kt
@@ -26,25 +26,31 @@ class TelescopePlugin : OptionHandler() {
}
override fun handle(player: Player?, node: Node?, option: String?): Boolean {
+ val obj = node?.asScenery() as Scenery
val star = ShootingStarPlugin.getStar()
val delay: Int = 25000 + (25000 / 3)
val timeLeft = delay - star.ticks
- val fakeTimeLeftBecauseFuckPlayers = TimeUnit.MILLISECONDS.toMinutes(timeLeft * 600L) + if(RandomFunction.random(0,100) % 2 == 0) 2 else -2
- val obj = node?.asScenery() as Scenery
+ val window = when (obj.id) {
+ 13657 -> 9
+ 13658 -> 2
+ else -> 24
+ }
+ val fakeTimeLeft = RandomFunction.random(-window, window+1) + TimeUnit.MILLISECONDS.toMinutes(timeLeft * 600L)
player?.lock()
player?.animate(ANIMATION)
- player?.interfaceManager?.open(Component(782)).also { player?.unlock()
- Pulser.submit(object : Pulse(2, player) {
- override fun pulse(): Boolean {
- if (obj.isActive) {
- player?.dialogueInterpreter?.sendDialogue("You see a shooting star! The star looks like it will land","in about $fakeTimeLeftBecauseFuckPlayers minutes!")
+ player?.interfaceManager?.open(Component(782)).also {
+ player?.unlock()
+ Pulser.submit(object : Pulse(2, player) {
+ override fun pulse(): Boolean {
+ if (obj.isActive) {
+ player?.dialogueInterpreter?.sendDialogue("You see a shooting star! The star looks like it will land","in about $fakeTimeLeft minutes!")
+ return true
+ }
return true
}
- return true
- }
- })
- return true
- }
+ })
+ return true
+ }
}
companion object {
diff --git a/Server/src/main/content/global/skill/construction/decoration/workshop/SnowscapeWorkbench.kt b/Server/src/main/content/global/skill/construction/decoration/workshop/SnowscapeWorkbench.kt
new file mode 100644
index 000000000..86974da72
--- /dev/null
+++ b/Server/src/main/content/global/skill/construction/decoration/workshop/SnowscapeWorkbench.kt
@@ -0,0 +1,104 @@
+package content.global.skill.construction.decoration.workshop
+
+
+
+import core.api.*
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.Node
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import core.game.node.scenery.Scenery
+import core.game.node.item.Item
+import org.rs09.consts.Items
+import content.global.skill.construction.BuildingUtils
+
+
+/**
+ * Simple replacement intil flatpacks are in. Using the workbench will consume planks in exchange for construction exp.
+ *
+ *
+ */
+
+class SnowscapeWorkbench : InteractionListener {
+
+ val workbenchIds = intArrayOf(13704,13705,13706,13707,13708)
+ val plankIds = intArrayOf(Items.PLANK_960, Items.OAK_PLANK_8778, Items.TEAK_PLANK_8780, Items.MAHOGANY_PLANK_8782)
+
+ override fun defineListeners() {
+ defineInteraction(
+ IntType.SCENERY,
+ workbenchIds,
+ "work-at",
+ persistent = true, allowedDistance = 1,
+ handler = ::handlePlankConstruction
+ )
+ }
+
+ private fun handlePlankConstruction(player: Player, node: Node, state: Int) : Boolean {
+ if (!inInventory(player, Items.SAW_8794) || !inInventory(player, Items.HAMMER_2347)) {
+ sendMessage(player,"You need a hammer and saw to do that.")
+ player.scripts.reset()
+ return false
+ }
+
+ for (plankId in plankIds) {
+ if (amountInInventory(player, plankId) > 0) {
+ if (node.id < getAllowedWorkbench(plankId)) {
+ sendMessage(player,"You need a better workbench to use ${Item(plankId).getName()}s.")
+ player.scripts.reset()
+ return false
+ }
+ if (getDynLevel(player, Skills.CONSTRUCTION) < getLevelRequirement(plankId)) {
+ sendMessage(player,"You need level ${getLevelRequirement(plankId)} construction to use ${Item(plankId).getName()}s.")
+ player.scripts.reset()
+ return false
+ }
+
+ if (removeItem(player, Item(plankId, 1))) {
+ rewardXP(player, Skills.CONSTRUCTION, getExperience(plankId))
+ animate(player, BuildingUtils.BUILD_MID_ANIM) //This animation has a sound effect built in
+
+ return delayScript(player, 1)
+ }
+ }
+ }
+
+
+ sendMessage(player,"You have no planks in your inventory.")
+ player.scripts.reset()
+ return false
+ }
+
+ // The following functions really should have been an enum class or something, but I don't know how to do that
+
+ fun getAllowedWorkbench(plankId: Int) : Int {
+ return when (plankId) {
+ Items.PLANK_960 -> 13704
+ Items.OAK_PLANK_8778 -> 13705
+ Items.TEAK_PLANK_8780 -> 13706
+ Items.MAHOGANY_PLANK_8782 -> 13707
+ else -> 0
+ }
+ }
+
+ fun getExperience(plankId: Int) : Double {
+ return when (plankId) {
+ Items.PLANK_960 -> 30.0
+ Items.OAK_PLANK_8778 -> 60.0
+ Items.TEAK_PLANK_8780 -> 90.0
+ Items.MAHOGANY_PLANK_8782 -> 140.0
+ else -> 0.0
+ }
+ }
+
+ fun getLevelRequirement(plankId: Int) : Int {
+ return when (plankId) {
+ Items.PLANK_960 -> 1
+ Items.OAK_PLANK_8778 -> 15
+ Items.TEAK_PLANK_8780 -> 35
+ Items.MAHOGANY_PLANK_8782 -> 40
+ else -> 0
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/skill/construction/npc/HouseServantDialogue.java b/Server/src/main/content/global/skill/construction/npc/HouseServantDialogue.java
index 4fd2d8c47..ddb967ebe 100644
--- a/Server/src/main/content/global/skill/construction/npc/HouseServantDialogue.java
+++ b/Server/src/main/content/global/skill/construction/npc/HouseServantDialogue.java
@@ -360,7 +360,7 @@ public class HouseServantDialogue extends DialoguePlugin {
bankFetch(player, new Item(Items.MARBLE_BLOCK_8786));
break;
case 3: //magic stones
- bankFetch(player, new Item(Items.MAGIC_STONE_4703));
+ bankFetch(player, new Item(Items.MAGIC_STONE_8788));
break;
}
break;
diff --git a/Server/src/main/content/global/skill/cooking/CookingRecipePlugin.java b/Server/src/main/content/global/skill/cooking/CookingRecipePlugin.java
index 9ef36bcaf..067217358 100644
--- a/Server/src/main/content/global/skill/cooking/CookingRecipePlugin.java
+++ b/Server/src/main/content/global/skill/cooking/CookingRecipePlugin.java
@@ -44,29 +44,30 @@ public final class CookingRecipePlugin extends UseWithHandler {
@Override
public boolean handle(NodeUsageEvent event) {
Recipe recipe = null;
+ Item part = null;
// TODO: Transitioning to a Listener would save an O(n) pass through the recipes list on every use-with
+ recipeloop:
for (Recipe temp : Recipe.RECIPES) {
if (temp.isSingular()) {
if (temp.getBase().getId() == event.getUsedItem().getId() || temp.getBase().getId() == event.getBaseItem().getId()) {
for (Item ingredient : temp.getIngredients()) {
if (ingredient.getId() == event.getBaseItem().getId() || ingredient.getId() == event.getUsedItem().getId()) {
recipe = temp;
- break;
+ break recipeloop;
}
}
}
} else {
- Item part = null;
- Item ingredient = null;
for (int k = 0; k < temp.getParts().length; k++) {
for (int i = 0; i < temp.getIngredients().length; i++) {
- part = temp.getParts()[k];
- ingredient = temp.getIngredients()[i];
- if (part.getId() == event.getUsedItem().getId() && ingredient.getId() == event.getBaseItem().getId() || part.getId() == event.getBaseItem().getId() && ingredient.getId() == event.getUsedItem().getId()) {
+ Item tempPart = temp.getParts()[k];
+ Item ingredient = temp.getIngredients()[i];
+ if (tempPart.getId() == event.getUsedItem().getId() && ingredient.getId() == event.getBaseItem().getId() || tempPart.getId() == event.getBaseItem().getId() && ingredient.getId() == event.getUsedItem().getId()) {
if (k == i) {// represents that this ingredient can
// mix with the other.
recipe = temp;
- break;
+ part = tempPart;
+ break recipeloop;
}
}
}
@@ -76,6 +77,7 @@ public final class CookingRecipePlugin extends UseWithHandler {
if (recipe != null) {
final Player player = event.getPlayer();
final Recipe recipe_ = recipe;
+ final Item part_ = part;
SkillDialogueHandler handler = new SkillDialogueHandler(player, SkillDialogue.ONE_OPTION, recipe.getProduct()) {
@Override
public void create(final int amount, int index) {
@@ -91,7 +93,7 @@ public final class CookingRecipePlugin extends UseWithHandler {
@Override
public int getAll(int index) {
- return player.getInventory().getAmount(recipe_.getBase());
+ return player.getInventory().getAmount(part_ != null ? part_ : recipe_.getBase());
}
};
if (player.getInventory().getAmount(recipe.getBase()) == 1) {
diff --git a/Server/src/main/content/global/skill/cooking/CookingRewrite.kt b/Server/src/main/content/global/skill/cooking/CookingRewrite.kt
index 76d485956..7bc993a8b 100644
--- a/Server/src/main/content/global/skill/cooking/CookingRewrite.kt
+++ b/Server/src/main/content/global/skill/cooking/CookingRewrite.kt
@@ -66,7 +66,7 @@ class CookingRewrite : InteractionListener {
}
companion object {
- val COOKING_OBJs = intArrayOf(24313,21302, 13528, 13529, 13533, 13531, 13536, 13539, 13542, 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9374, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426, 40110, 10377)
+ val COOKING_OBJs = intArrayOf(24313,21302, 13528, 13529, 13533, 13531, 13536, 13539, 13542, 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9374, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 18170, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426, 40110, 10377)
@JvmStatic
fun cook(player: Player, `object`: Scenery?, initial: Int, product: Int, amount: Int) {
diff --git a/Server/src/main/content/global/skill/cooking/StandardCookingPulse.java b/Server/src/main/content/global/skill/cooking/StandardCookingPulse.java
index f081bed5a..d70856a27 100644
--- a/Server/src/main/content/global/skill/cooking/StandardCookingPulse.java
+++ b/Server/src/main/content/global/skill/cooking/StandardCookingPulse.java
@@ -4,6 +4,8 @@ import content.global.skill.skillcapeperks.SkillcapePerks;
import core.game.event.ResourceProducedEvent;
import core.game.node.entity.impl.Animator;
import core.game.node.entity.player.Player;
+import core.game.node.entity.player.info.LogType;
+import core.game.node.entity.player.info.PlayerMonitor;
import core.game.node.entity.player.link.audio.Audio;
import core.game.node.entity.skill.Skills;
import core.game.node.item.GroundItemManager;
@@ -15,7 +17,8 @@ import core.tools.RandomFunction;
import org.rs09.consts.Items;
import org.rs09.consts.Sounds;
-import static core.api.ContentAPIKt.playAudio;
+import static core.api.ContentAPIKt.*;
+import content.data.Quests;
public class StandardCookingPulse extends Pulse {
//range animation
@@ -38,12 +41,17 @@ public class StandardCookingPulse extends Pulse {
private boolean burned = false;
public CookableItems properties;
+ private int initialAmount;
+ private int processedAmount;
+
public StandardCookingPulse(Player player, Scenery object, int initial, int product, int amount) {
this.player = player;
this.object = object;
this.initial = initial;
this.product = product;
this.amount = amount;
+ this.initialAmount = amountInInventory(player, initial);
+ this.processedAmount = 0;
}
@Override
@@ -72,7 +80,7 @@ public class StandardCookingPulse extends Pulse {
this.experience = 0;
if (properties != null) {
// Handle Cook's Assistant range
- if (object.getId() == LUMBRIDGE_RANGE && !player.getQuestRepository().isComplete("Cook's Assistant")) {
+ if (object.getId() == LUMBRIDGE_RANGE && !player.getQuestRepository().isComplete(Quests.COOKS_ASSISTANT)) {
player.getPacketDispatch().sendMessage("You need to have completed the Cook's Assistant quest in order to use that range.");
return false;
}
@@ -169,6 +177,11 @@ public class StandardCookingPulse extends Pulse {
player.getInventory().add(productItem);
player.dispatch(new ResourceProducedEvent(productItem.getId(), 1, object, initialItem.getId()));
player.getSkills().addExperience(Skills.COOKING, experience, true);
+ processedAmount++;
+ if (processedAmount > initialAmount) {
+ PlayerMonitor.log(player, LogType.DUPE_ALERT, "cooked item (" + player.getName() + ", " + initialItem.getName() + "): initialAmount " + initialAmount + ", processedAmount " + processedAmount);
+ }
+ player.incrementAttribute("/save:stats_manager:food_cooked", 1);
} else {
player.dispatch(new ResourceProducedEvent(CookableItems.getBurnt(initial).getId(), 1, object, initialItem.getId()));
player.getInventory().add(CookableItems.getBurnt(initial));
diff --git a/Server/src/main/content/global/skill/cooking/recipe/HangoverRecipe.kt b/Server/src/main/content/global/skill/cooking/recipe/HangoverRecipe.kt
new file mode 100644
index 000000000..063b85ce4
--- /dev/null
+++ b/Server/src/main/content/global/skill/cooking/recipe/HangoverRecipe.kt
@@ -0,0 +1,44 @@
+package content.global.skill.cooking.recipe
+
+import core.api.*
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.skill.Skills
+import org.rs09.consts.Items
+
+class HangoverRecipe : InteractionListener {
+
+ companion object{
+ private const val SNAPE_GRASS = Items.SNAPE_GRASS_231
+ private const val HANGOVER_CURE = Items.HANGOVER_CURE_1504
+ private const val BUCKET_OF_MILK = Items.BUCKET_OF_MILK_1927
+ private const val CHOCOLATE_DUST = Items.CHOCOLATE_DUST_1975
+ private const val CHOCOLATE_MILK = Items.CHOCOLATEY_MILK_1977
+ }
+
+ override fun defineListeners() {
+ onUseWith(IntType.ITEM, CHOCOLATE_DUST, BUCKET_OF_MILK) { player, _, _ ->
+ if(hasLevelDyn(player, Skills.COOKING, 4)){
+ if(removeItem(player, CHOCOLATE_DUST) and removeItem(player, BUCKET_OF_MILK)){
+ addItem(player, CHOCOLATE_MILK)
+ sendItemDialogue(player, CHOCOLATE_MILK, "You mix the chocolate into the bucket.")
+ }
+ }
+ else {
+ sendDialogue(player, "You need a Cooking level of at least 4 to make chocolate milk.")
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(IntType.ITEM, SNAPE_GRASS, CHOCOLATE_MILK) { player, _, _ ->
+ if (removeItem(player, SNAPE_GRASS) && removeItem(player, CHOCOLATE_MILK))
+ {
+ sendItemDialogue(player, HANGOVER_CURE, "You mix the snape grass into the bucket.")
+ addItem(player, HANGOVER_CURE)
+ return@onUseWith true
+ }
+ return@onUseWith false
+ }
+
+ }
+}
diff --git a/Server/src/main/content/global/skill/cooking/recipe/Recipe.java b/Server/src/main/content/global/skill/cooking/recipe/Recipe.java
index 2402a9772..3e2eff513 100644
--- a/Server/src/main/content/global/skill/cooking/recipe/Recipe.java
+++ b/Server/src/main/content/global/skill/cooking/recipe/Recipe.java
@@ -119,6 +119,9 @@ public abstract class Recipe {
}
}
if (index != -1) {
+ if (!player.getInventory().containItems(event.getBaseItem().getId(), event.getUsedItem().getId())) {
+ return;
+ }
if (player.getInventory().remove(event.getBaseItem()) && player.getInventory().remove(event.getUsedItem())) {
player.getInventory().add(getParts()[index + 1]);
String message = getMixMessage(event);
diff --git a/Server/src/main/content/global/skill/crafting/BattlestaffListener.kt b/Server/src/main/content/global/skill/crafting/BattlestaffListener.kt
index 54a82b557..bb31a0689 100644
--- a/Server/src/main/content/global/skill/crafting/BattlestaffListener.kt
+++ b/Server/src/main/content/global/skill/crafting/BattlestaffListener.kt
@@ -10,11 +10,11 @@ import kotlin.math.min
class BattlestaffListener : InteractionListener {
- private val battlestaff = Items.BATTLESTAFF_1391
+ private val battlestaff = intArrayOf(Items.BATTLESTAFF_1391, Items.DRAMEN_STAFF_772)
val orbs = BattlestaffProduct.values().map { it.requiredOrbItemId }.toIntArray()
override fun defineListeners() {
- onUseWith(IntType.ITEM, orbs, battlestaff) { player, used, with ->
+ onUseWith(IntType.ITEM, orbs, *battlestaff) { player, used, with ->
val product = BattlestaffProduct.productMap[used.id] ?: return@onUseWith true
if (!hasLevelDyn(player, Skills.CRAFTING, product.minimumLevel)) {
@@ -25,7 +25,7 @@ class BattlestaffListener : InteractionListener {
// Avoids sending dialogue if only one can be created
if (amountInInventory(player, used.id) == 1 || amountInInventory(player, with.id) == 1) {
- if (removeItem(player, product.requiredOrbItemId) && removeItem(player, Items.BATTLESTAFF_1391)) {
+ if (removeItem(player, product.requiredOrbItemId) && removeItem(player, with.id)) {
addItem(player, product.producedItemId, product.amountProduced)
rewardXP(player, Skills.CRAFTING, product.experience)
}
@@ -44,7 +44,7 @@ class BattlestaffListener : InteractionListener {
runTask(player, 2, amount) {
if (amount < 1) return@runTask
- if (removeItem(player, product.requiredOrbItemId) && removeItem(player, Items.BATTLESTAFF_1391)) {
+ if (removeItem(player, product.requiredOrbItemId) && removeItem(player, with.id)) {
addItem(player, product.producedItemId, product.amountProduced)
rewardXP(player, Skills.CRAFTING, product.experience)
}
diff --git a/Server/src/main/content/global/skill/crafting/LeatherCraftDialogue.java b/Server/src/main/content/global/skill/crafting/LeatherCraftDialogue.java
index 0692339a6..65fa4ae71 100644
--- a/Server/src/main/content/global/skill/crafting/LeatherCraftDialogue.java
+++ b/Server/src/main/content/global/skill/crafting/LeatherCraftDialogue.java
@@ -196,7 +196,7 @@ public final class LeatherCraftDialogue extends DialoguePlugin {
case 5:
case 9:
case 13:
- amt = 10;
+ amt = 30;
break;
case 4:
case 8:
diff --git a/Server/src/main/content/global/skill/crafting/armour/DragonCraftPulse.java b/Server/src/main/content/global/skill/crafting/armour/DragonCraftPulse.java
index bc8022884..924d1364a 100644
--- a/Server/src/main/content/global/skill/crafting/armour/DragonCraftPulse.java
+++ b/Server/src/main/content/global/skill/crafting/armour/DragonCraftPulse.java
@@ -95,9 +95,6 @@ public final class DragonCraftPulse extends SkillPulse- {
player.getInventory().add(item);
player.getSkills().addExperience(Skills.CRAFTING, hide.getExperience(), true);
LeatherCrafting.decayThread(player);
- if (LeatherCrafting.isLastThread(player)) {
- LeatherCrafting.removeThread(player);
- }
amount--;
}
return amount < 1;
diff --git a/Server/src/main/content/global/skill/crafting/armour/HardCraftPulse.java b/Server/src/main/content/global/skill/crafting/armour/HardCraftPulse.java
index 4d02be91c..5a2207b4a 100644
--- a/Server/src/main/content/global/skill/crafting/armour/HardCraftPulse.java
+++ b/Server/src/main/content/global/skill/crafting/armour/HardCraftPulse.java
@@ -75,9 +75,6 @@ public final class HardCraftPulse extends SkillPulse
- {
player.getInventory().add(item);
player.getSkills().addExperience(Skills.CRAFTING, 35, true);
LeatherCrafting.decayThread(player);
- if (LeatherCrafting.isLastThread(player)) {
- LeatherCrafting.removeThread(player);
- }
}
amount--;
return amount < 1;
diff --git a/Server/src/main/content/global/skill/crafting/armour/LeatherCrafting.java b/Server/src/main/content/global/skill/crafting/armour/LeatherCrafting.java
index 2767fbc65..02f14d1ee 100644
--- a/Server/src/main/content/global/skill/crafting/armour/LeatherCrafting.java
+++ b/Server/src/main/content/global/skill/crafting/armour/LeatherCrafting.java
@@ -1,8 +1,12 @@
package content.global.skill.crafting.armour;
+import core.api.Container;
import core.game.component.Component;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
+import org.rs09.consts.Items;
+
+import static core.api.ContentAPIKt.*;
/**
* Represents a useful class for leather crafting related information.
@@ -40,52 +44,17 @@ public final class LeatherCrafting {
*/
private static final Component COMPONENT = new Component(154);
- /**
- * Checks if its the last thrad.
- * @return {@code True} if so.
- */
- public static boolean isLastThread(final Player player) {
- final Item thread = getThread(player);
- if (thread == null) {
- return false;
- }
- int charge = thread.getCharge();
- return charge >= 1004;
- }
-
/**
* Method used to decay thread.
- */
- public static void decayThread(final Player player) {
- final Item thread = getThread(player);
- if (thread == null) {
- return;
- }
- int charge = thread.getCharge();
- thread.setCharge(charge + 1);
- }
-
- /**
- * Method used to remove thread.
- * @param player the player.
- */
- public static void removeThread(final Player player) {
- if (player.getInventory().remove(THREAD)) {
- player.getPacketDispatch().sendMessage("You use a reel of your thread.");
- Item thread = getThread(player);
- if (thread != null) {
- thread.setCharge(1000);
- }
- }
- }
-
- /**
- * Gets the thread.
- * @param player the player.
- * @return the item.
+ * @author Player Name
*/
- public static Item getThread(final Player player) {
- return player.getInventory().get(player.getInventory().getSlot(THREAD));
+ public static void decayThread(final Player player) {
+ int charges = getAttribute(player, "threadCharges", 5) - 1;
+ if (charges <= 0 && removeItem(player, Items.THREAD_1734, Container.INVENTORY)) {
+ charges = 5;
+ sendMessage(player, "You use a reel of your thread.");
+ }
+ setAttribute(player, "/save:threadCharges", charges);
}
/**
diff --git a/Server/src/main/content/global/skill/crafting/armour/SnakeSkinPulse.java b/Server/src/main/content/global/skill/crafting/armour/SnakeSkinPulse.java
index a851caaf6..be012d01c 100644
--- a/Server/src/main/content/global/skill/crafting/armour/SnakeSkinPulse.java
+++ b/Server/src/main/content/global/skill/crafting/armour/SnakeSkinPulse.java
@@ -82,9 +82,6 @@ public final class SnakeSkinPulse extends SkillPulse
- {
player.getInventory().add(item);
player.getSkills().addExperience(Skills.CRAFTING, skin.getExperience(), true);
LeatherCrafting.decayThread(player);
- if (LeatherCrafting.isLastThread(player)) {
- LeatherCrafting.removeThread(player);
- }
}
amount--;
return amount < 1;
diff --git a/Server/src/main/content/global/skill/crafting/armour/SoftCraftPulse.java b/Server/src/main/content/global/skill/crafting/armour/SoftCraftPulse.java
index 2d62c165a..ab49815cf 100644
--- a/Server/src/main/content/global/skill/crafting/armour/SoftCraftPulse.java
+++ b/Server/src/main/content/global/skill/crafting/armour/SoftCraftPulse.java
@@ -90,10 +90,6 @@ public final class SoftCraftPulse extends SkillPulse
- {
player.getInventory().add(item);
player.getSkills().addExperience(Skills.CRAFTING, soft.getExperience(), true);
LeatherCrafting.decayThread(player);
- if (LeatherCrafting.isLastThread(player)) {
- LeatherCrafting.removeThread(player);
- }
-
if (soft == LeatherCrafting.SoftLeather.GLOVES) {
player.getAchievementDiaryManager().finishTask(player, DiaryType.LUMBRIDGE, 1, 3);
}
diff --git a/Server/src/main/content/global/skill/crafting/jewellery/JewelleryCrafting.java b/Server/src/main/content/global/skill/crafting/jewellery/JewelleryCrafting.java
index 37304e77d..89358a5fc 100644
--- a/Server/src/main/content/global/skill/crafting/jewellery/JewelleryCrafting.java
+++ b/Server/src/main/content/global/skill/crafting/jewellery/JewelleryCrafting.java
@@ -5,6 +5,7 @@ import core.game.component.Component;
import core.game.node.entity.skill.Skills;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
+import static core.api.ContentAPIKt.*;
import java.util.HashMap;
@@ -185,7 +186,9 @@ public class JewelleryCrafting {
for (int i = 0; i < data.items.length; i++) {
if (player.getInventory().contains(data.getItems()[i], 1)) {
length++;
- }
+ } else if (inEquipmentOrInventory(player, 10881, 1) && player.goldSatchel.contains(data.getItems()[i], 1)){
+ length++;
+ }
}
if (!player.getInventory().contains(mouldFor(data.name()), 1)) {
length--;
@@ -235,6 +238,9 @@ public class JewelleryCrafting {
amt = player.getInventory().getAmount(new Item(GOLD_BAR));
} else {
int first = player.getInventory().getAmount(new Item(data.getItems()[0]));
+ if (inEquipmentOrInventory(player, 10881, 1)) {
+ first += player.goldSatchel.getAmount(new Item(data.getItems()[0]));
+ }
int second = player.getInventory().getAmount(new Item(data.getItems()[1]));
if (first == second) {
amt = first;
@@ -250,7 +256,9 @@ public class JewelleryCrafting {
for (int i = 0; i < data.items.length; i++) {
if (player.getInventory().contains(data.getItems()[i], amount)) {
length++;
- }
+ } else if (data.getItems()[i] != GOLD_BAR && inEquipmentOrInventory(player, 10881, 1) && player.goldSatchel.contains(data.getItems()[i], 1)){
+ length++;
+ }
}
if (length != data.getItems().length) {
player.getPacketDispatch().sendMessage("You don't have the required items to make this item.");
diff --git a/Server/src/main/content/global/skill/crafting/jewellery/JewelleryPulse.java b/Server/src/main/content/global/skill/crafting/jewellery/JewelleryPulse.java
index e69a7ee29..be2f7b58c 100644
--- a/Server/src/main/content/global/skill/crafting/jewellery/JewelleryPulse.java
+++ b/Server/src/main/content/global/skill/crafting/jewellery/JewelleryPulse.java
@@ -67,11 +67,19 @@ public final class JewelleryPulse extends SkillPulse
- {
if (++ticks % 5 != 0) {
return false;
}
- if (player.getInventory().remove(getItems())) {
+ Item items[] = getItems();
+ for (int i = 0; i < items.length; i++) {
+ if (player.getInventory().remove(items[i]) || (items[i].getId() != 2357 && inEquipmentOrInventory(player, 10881, 1) && player.goldSatchel.remove(items[i]))) {
+ continue;
+ } else {
+ return true;
+ }
+ }
+ //if (player.getInventory().remove(getItems())) {
final Item item = new Item(type.getSendItem());
player.getInventory().add(item);
player.getSkills().addExperience(Skills.CRAFTING, type.getExperience(), true);
- }
+ //}
amount--;
return amount < 1;
}
diff --git a/Server/src/main/content/global/skill/crafting/lightsources/LightSourceLighter.kt b/Server/src/main/content/global/skill/crafting/lightsources/LightSourceLighter.kt
index e25677810..81a1a98cc 100644
--- a/Server/src/main/content/global/skill/crafting/lightsources/LightSourceLighter.kt
+++ b/Server/src/main/content/global/skill/crafting/lightsources/LightSourceLighter.kt
@@ -66,6 +66,12 @@ class LightSourceLighter : UseWithHandler(590,36,38){
lightSource ?: return false
+ // For Sea Slug Quest - No lighting of any torch on the fishing platform.
+ if(event.player.location.isInRegion(11059)) {
+ event.player.sendMessage("Your tinderbox is damp from the sea crossing. It won't work here.")
+ return true
+ }
+
if(!light(event.player,used,lightSource)){
event.player.sendMessage("You need a Firemaking level of at least ${lightSource.levelRequired} to light this.")
}
diff --git a/Server/src/main/content/global/skill/crafting/pottery/FirePotteryPulse.java b/Server/src/main/content/global/skill/crafting/pottery/FirePotteryPulse.java
index e7af471ef..e4cf4ec71 100644
--- a/Server/src/main/content/global/skill/crafting/pottery/FirePotteryPulse.java
+++ b/Server/src/main/content/global/skill/crafting/pottery/FirePotteryPulse.java
@@ -56,7 +56,7 @@ public final class FirePotteryPulse extends SkillPulse
- {
return false;
}
if (!player.getInventory().containsItem(pottery.getUnfinished())) {
- player.getPacketDispatch().sendMessage("You need a " + pottery.name().toLowerCase() + "in order to do this.");
+ player.getPacketDispatch().sendMessage("You need a " + pottery.name().toLowerCase() + " in order to do this.");
return false;
}
return true;
diff --git a/Server/src/main/content/global/skill/farming/CompostBin.kt b/Server/src/main/content/global/skill/farming/CompostBin.kt
index 617e800db..c7e7f5cc2 100644
--- a/Server/src/main/content/global/skill/farming/CompostBin.kt
+++ b/Server/src/main/content/global/skill/farming/CompostBin.kt
@@ -19,6 +19,19 @@ class CompostBin(val player: Player, val bin: CompostBins) {
var finishedTime = 0L
var isFinished = false
+ /**
+ * Resets the compost bin to its initial state.
+ */
+ fun reset() {
+ items.clear()
+ isSuperCompost = true
+ isTomatoes = true
+ isClosed = false
+ finishedTime = 0L
+ isFinished = false
+ updateBit()
+ }
+
fun isFull() : Boolean {
return items.size == 15
}
diff --git a/Server/src/main/content/global/skill/farming/CropHarvester.kt b/Server/src/main/content/global/skill/farming/CropHarvester.kt
index 779609bf8..b70347b67 100644
--- a/Server/src/main/content/global/skill/farming/CropHarvester.kt
+++ b/Server/src/main/content/global/skill/farming/CropHarvester.kt
@@ -61,7 +61,13 @@ class CropHarvester : OptionHandler() {
}
}
val anim = when (requiredItem) {
- Items.SPADE_952 -> if (fPatch.type == PatchType.HERB_PATCH) Animation(2282) else Animation(830)
+ Items.SPADE_952 -> {
+ when (fPatch.type) {
+ PatchType.HERB_PATCH -> Animation(2282)
+ PatchType.FLOWER_PATCH -> Animation(2292)
+ else -> Animation(830)
+ }
+ }
Items.SECATEURS_5329 -> if (fPatch.type == PatchType.TREE_PATCH) Animation(2277) else Animation(7227)
Items.MAGIC_SECATEURS_7409 -> if (fPatch.type == PatchType.TREE_PATCH) Animation(3340) else Animation(7228)
else -> Animation(0)
@@ -76,19 +82,36 @@ class CropHarvester : OptionHandler() {
sendMessage(player, "You lack the needed tool to harvest these crops.")
return true
}
- if (firstHarvest) {
+ val necklace = getItemFromEquipment(player, EquipmentSlot.NECK)
+ var noted = false
+ if (necklace != null && (necklace.name.lowercase().contains("amulet of farming") || necklace.name.lowercase().contains("amulet of nature"))) {
+ noted = true
+ } else if (inEquipment(player,10878,1)) {
+ noted = true
+ }
+ val sendHarvestMessages = if (fPatch.type == PatchType.FLOWER_PATCH) false else true
+ if (sendHarvestMessages && firstHarvest) {
sendMessage(player, "You begin to harvest the $patchName.")
+ if (noted) {
+ sendMessage(player, "The leprechaun exchanges your produce for banknotes.")
+ }
firstHarvest = false
}
animate(player, anim)
playAudio(player, sound)
+ // TODO: If a flower patch is being harvested, delay the clearing of the
+ // patch until after the animation has played - https://youtu.be/lg4GktlVNUY?t=75
delay = 2
- addItem(player, reward.id)
+ if (noted) {
+ addItem(player, note(reward).id)
+ } else {
+ addItem(player, reward.id)
+ }
rewardXP(player, Skills.FARMING, plantable.harvestXP)
if (patch.patch.type in livesBased) {
patch.rollLivesDecrement(
getDynLevel(player, Skills.FARMING),
- requiredItem == Items.MAGIC_SECATEURS_7409
+ inInventory(player, Items.MAGIC_SECATEURS_7409) //add ||inEquipment() check when Fairy Tale pt 1 has been implemented
)
} else {
patch.harvestAmt--
@@ -96,7 +119,7 @@ class CropHarvester : OptionHandler() {
patch.clear()
}
}
- if (patch.cropLives <= 0 || patch.harvestAmt <= 0) {
+ if (sendHarvestMessages && (patch.cropLives <= 0 || patch.harvestAmt <= 0)) {
sendMessage(player, "The $patchName is now empty.")
}
return patch.cropLives <= 0 || patch.harvestAmt <= 0
diff --git a/Server/src/main/content/global/skill/farming/DigUpPatchDialogue.kt b/Server/src/main/content/global/skill/farming/DigUpPatchDialogue.kt
index 21a773c20..a0d70bb07 100644
--- a/Server/src/main/content/global/skill/farming/DigUpPatchDialogue.kt
+++ b/Server/src/main/content/global/skill/farming/DigUpPatchDialogue.kt
@@ -24,7 +24,7 @@ class DigUpPatchDialogue(player: Player? = null) : DialoguePlugin(player) {
}
if (patch?.patch?.type == PatchType.TREE_PATCH) {
val isTreeStump = patch?.getCurrentState() == patch?.plantable!!.value + patch?.plantable!!.stages + 2
- if (!isTreeStump) {
+ if (patch!!.isGrown() && !isTreeStump) {
sendMessage(player, "You need to chop this tree down first.") // this message is not authentic
stage = 1000
return true
diff --git a/Server/src/main/content/global/skill/farming/FarmerPayOptionDialogue.kt b/Server/src/main/content/global/skill/farming/FarmerPayOptionDialogue.kt
index eeb8903f5..7b29a5568 100644
--- a/Server/src/main/content/global/skill/farming/FarmerPayOptionDialogue.kt
+++ b/Server/src/main/content/global/skill/farming/FarmerPayOptionDialogue.kt
@@ -1,68 +1,113 @@
package content.global.skill.farming
-import core.game.node.item.Item
-import org.rs09.consts.Items
+import core.api.*
import core.game.dialogue.DialogueFile
+import core.game.dialogue.FacialExpression
+import core.game.dialogue.Topic
+import core.game.node.item.Item
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
+import org.rs09.consts.Items
-class FarmerPayOptionDialogue(val patch: Patch): DialogueFile() {
+class FarmerPayOptionDialogue(val patch: Patch, val quickPay: Boolean = false): DialogueFile() {
var item: Item? = null
override fun handle(componentID: Int, buttonID: Int) {
- when(stage){
+ when (stage) {
START_DIALOGUE -> {
- item = patch.plantable?.protectionItem
- val protectionText = when(item?.id){
- Items.COMPOST_6032 -> if(item?.amount == 1) "bucket of compost" else "buckets of compost"
- Items.POTATOES10_5438 -> if(item?.amount == 1) "sack of potatoes" else "sacks of potatoes"
- Items.ONIONS10_5458 -> if(item?.amount == 1) "sack of onions" else "sacks of onions"
- Items.CABBAGES10_5478 -> if(item?.amount == 1) "sack of cabbages" else "sacks of cabbages"
- Items.JUTE_FIBRE_5931 -> "jute fibres"
- Items.APPLES5_5386 -> if(item?.amount == 1) "basket of apples" else "baskets of apples"
- Items.MARIGOLDS_6010 -> "harvest of marigold"
- Items.TOMATOES5_5968 -> if(item?.amount == 1) "basket of tomatoes" else "baskets of tomatoes"
- Items.ORANGES5_5396 -> if(item?.amount == 1) "basket of oranges" else "baskets of oranges"
- Items.COCONUT_5974 -> "coconuts"
- Items.CACTUS_SPINE_6016 -> "cactus spines"
- Items.STRAWBERRIES5_5406 -> if(item?.amount == 1) "basket of strawberries" else "baskets of strawberries"
- Items.BANANAS5_5416 -> if(item?.amount == 1) "basket of bananas" else "baskets of bananas"
- else -> item?.name?.toLowerCase()
- }
- if(item == null) npc("Sorry, I won't protect that.").also { stage = END_DIALOGUE }
- else{
- npc("I would like ${item?.amount} $protectionText","to protect that patch.")
- stage++
- }
- }
-
- 1 -> options("Sure!","No, thanks.").also { stage++ }
- 2 -> {
- if(player!!.inventory.containsItem(item)){
- player("Here you go.").also { stage = 10 }
+ if (patch.patch.type == PatchType.TREE_PATCH && patch.plantable != null && patch.isGrown()) {
+ // This is for the right-click "Pay" option; full dialogue is in GardenerDialoguePlugin
+ showTopics(
+ Topic("Yes, get rid of the tree.", 300, true),
+ Topic("No thanks.", END_DIALOGUE, true),
+ title = "Pay 200 gp to have the tree chopped down?"
+ )
+ } else if (patch.protectionPaid) {
+ npc("I don't know what you're talking about - I'm already", "looking after that patch for you.").also { stage = 100 }
+ } else if (patch.isDead) {
+ npc("That patch is dead - it's too late for me to do", "anything about it now.").also { stage = END_DIALOGUE }
+ } else if (patch.isDiseased) {
+ npc("That patch is diseased - I can't look after it", "until it has been cured.").also { stage = END_DIALOGUE } // this dialogue is not authentic
+ } else if (patch.isWeedy() || patch.isEmptyAndWeeded()) {
+ npc(FacialExpression.NEUTRAL, "You don't have anything planted in that patch. Plant", "something and I might agree to look after it for you.").also { stage = END_DIALOGUE }
+ } else if (patch.isGrown()) {
+ npc("That patch is already fully grown!", "I don't know what you want me to do with it!").also { stage = END_DIALOGUE }
} else {
- item = Item(item!!.noteChange,item!!.amount)
- if(player!!.inventory.containsItem(item)){
- player("Here you go.").also { stage = 10 }
+ item = patch.plantable?.protectionItem
+ val protectionText = when (item?.id) {
+ Items.COMPOST_6032 -> if (item?.amount == 1) "bucket of compost" else "buckets of compost"
+ Items.POTATOES10_5438 -> if (item?.amount == 1) "sack of potatoes" else "sacks of potatoes"
+ Items.ONIONS10_5458 -> if (item?.amount == 1) "sack of onions" else "sacks of onions"
+ Items.CABBAGES10_5478 -> if (item?.amount == 1) "sack of cabbages" else "sacks of cabbages"
+ Items.JUTE_FIBRE_5931 -> "jute fibres"
+ Items.APPLES5_5386 -> if (item?.amount == 1) "basket of apples" else "baskets of apples"
+ Items.MARIGOLDS_6010 -> "harvest of marigold"
+ Items.TOMATOES5_5968 -> if (item?.amount == 1) "basket of tomatoes" else "baskets of tomatoes"
+ Items.ORANGES5_5396 -> if (item?.amount == 1) "basket of oranges" else "baskets of oranges"
+ Items.COCONUT_5974 -> "coconuts"
+ Items.CACTUS_SPINE_6016 -> "cactus spines"
+ Items.STRAWBERRIES5_5406 -> if (item?.amount == 1) "basket of strawberries" else "baskets of strawberries"
+ Items.BANANAS5_5416 -> if (item?.amount == 1) "basket of bananas" else "baskets of bananas"
+ else -> item?.name?.lowercase()
+ }
+ if (item == null) {
+ npc("Sorry, I won't protect that.").also { stage = END_DIALOGUE }
+ } else if (quickPay && !(inInventory(player!!, item!!.id, item!!.amount) || inInventory(player!!, note(item!!).id, note(item!!).amount))) {
+ val amount = if (item?.amount == 1) "one" else item?.amount
+ npc(FacialExpression.HAPPY, "I want $amount $protectionText for that.")
+ stage = 200
+ } else if (quickPay) {
+ val amount = if (item?.amount == 1) "one" else item?.amount
+ showTopics(
+ Topic("Yes", 20, true),
+ Topic("No", END_DIALOGUE, true),
+ title = "Pay $amount $protectionText?"
+ )
} else {
- player("I don't have that to give.").also { stage = 20 }
+ val amount = if (item?.amount == 1) "one" else item?.amount
+ npc("If you like, but I want $amount $protectionText for that.")
+ stage++
}
}
}
- 10 -> {
- if(player!!.inventory.remove(item)){
- npc("Thank you! I'll keep an eye on this patch.").also { stage = END_DIALOGUE }
- patch?.protectionPaid = true
+ 1 -> {
+ if (!(inInventory(player!!, item!!.id, item!!.amount) || inInventory(player!!, note(item!!).id, note(item!!).amount))) {
+ player("I'm afraid I don't have any of those at the moment.").also { stage = 10 }
} else {
- npc("That stuff just... vanished....").also { stage = END_DIALOGUE }
+ showTopics(
+ Topic(FacialExpression.NEUTRAL, "Okay, it's a deal.", 20),
+ Topic(FacialExpression.NEUTRAL, "No, that's too much.", 10)
+ )
}
}
+ 10 -> npc("Well, I'm not wasting my time for free.").also { stage = END_DIALOGUE }
+
20 -> {
- npc("Come back when you do.")
- stage = END_DIALOGUE
+ if (removeItem(player!!, item) || removeItem(player!!, note(item!!))) {
+ patch.protectionPaid = true
+ // Note: A slight change in this dialogue was seen in a December 2009 video - https://youtu.be/7gVh42ylQ48?t=138
+ npc("That'll do nicely, ${if (player!!.isMale) "sir" else "madam"}. Leave it with me - I'll make sure", "those crops grow for you.").also { stage = END_DIALOGUE }
+ } else {
+ npc("This shouldn't be happening. Please report this.").also { stage = END_DIALOGUE }
+ }
+ }
+
+ 100 -> player("Oh sorry, I forgot.").also { stage = END_DIALOGUE }
+
+ // Right-click "Pay" - protect patch - player doesn't have payment
+ 200 -> player(FacialExpression.NEUTRAL, "Thanks, maybe another time.").also { stage = END_DIALOGUE }
+
+ // Right-click "Pay" - chop down tree
+ 300 -> {
+ if (removeItem(player!!, Item(Items.COINS_995, 200))) {
+ patch.clear()
+ dialogue("The gardener obligingly removes your tree.").also { stage = END_DIALOGUE }
+ } else {
+ dialogue("You need 200 gp to pay for that.").also { stage = END_DIALOGUE } // not authentic
+ }
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Server/src/main/content/global/skill/farming/FarmerPayOptionHandler.kt b/Server/src/main/content/global/skill/farming/FarmerPayOptionHandler.kt
index 724ce6c73..52d7874ad 100644
--- a/Server/src/main/content/global/skill/farming/FarmerPayOptionHandler.kt
+++ b/Server/src/main/content/global/skill/farming/FarmerPayOptionHandler.kt
@@ -1,5 +1,6 @@
package content.global.skill.farming
+import core.api.openDialogue
import core.game.node.Node
import core.game.node.entity.player.Player
import core.game.interaction.InteractionListener
@@ -8,35 +9,20 @@ import core.game.interaction.IntType
class FarmerPayOptionHandler : InteractionListener {
override fun defineListeners() {
- on(IntType.NPC,"pay","pay (north)","pay (north-west)"){ player, node ->
+ on(IntType.NPC,"pay","pay (north)","pay (north-west)") { player, node ->
return@on attemptPay(player,node,0)
}
- on(IntType.NPC,"pay (south)","pay (south-east)"){ player, node ->
+ on(IntType.NPC,"pay (south)","pay (south-east)") { player, node ->
return@on attemptPay(player,node,1)
}
}
- fun attemptPay(player: Player, node: Node, index: Int): Boolean{
+ fun attemptPay(player: Player, node: Node, index: Int): Boolean {
val farmer = Farmers.forId(node.id) ?: return false
val patch = farmer.patches[index].getPatchFor(player)
- if(patch.plantable == null){
- player.dialogueInterpreter.sendDialogue("I have nothing to protect in that patch.")
- return true
- }
-
- if(patch.protectionPaid){
- player.dialogueInterpreter.sendDialogue("I have already paid to protect that patch.")
- return true
- }
-
- if(patch.isGrown()){
- player.dialogueInterpreter.sendDialogue("This patch is already fully grown!")
- return true
- }
-
- player.dialogueInterpreter.open(FarmerPayOptionDialogue(patch),node.asNpc())
+ openDialogue(player, FarmerPayOptionDialogue(patch, true), node.asNpc())
return true
}
}
\ No newline at end of file
diff --git a/Server/src/main/content/global/skill/farming/FarmingPatch.kt b/Server/src/main/content/global/skill/farming/FarmingPatch.kt
index c322e4de8..ed033d253 100644
--- a/Server/src/main/content/global/skill/farming/FarmingPatch.kt
+++ b/Server/src/main/content/global/skill/farming/FarmingPatch.kt
@@ -117,8 +117,8 @@ enum class FarmingPatch(val varbit: Int, val type: PatchType) {
}
}
- fun getPatchFor(player: Player): Patch{
- var crops = getOrStartTimer
(player)!!
- return crops.getPatch(this)
+ fun getPatchFor(player: Player, addPatch : Boolean = true): Patch{
+ val crops = getOrStartTimer (player)
+ return crops.getPatch(this, addPatch)
}
}
diff --git a/Server/src/main/content/global/skill/farming/FarmingState.kt b/Server/src/main/content/global/skill/farming/FarmingState.kt
deleted file mode 100644
index ed7f769e5..000000000
--- a/Server/src/main/content/global/skill/farming/FarmingState.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package content.global.skill.farming
-
-import core.api.*
-import core.Util.clamp
-import core.game.node.entity.player.Player
-import core.game.system.task.Pulse
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import org.json.simple.JSONArray
-import org.json.simple.JSONObject
-import core.game.node.entity.state.PlayerState
-import core.game.node.entity.state.State
-import core.tools.SystemLogger
-import java.util.concurrent.TimeUnit
-import content.global.skill.farming.timers.*
-
-@PlayerState("farming")
-/**
- * Kept around solely for the purpose of porting save data from this old system to the new one.
- * //TODO REMOVE BY END OF 2023
-**/
-class FarmingState(player: Player? = null) : State(player) {
- override fun save(root: JSONObject) {}
- override fun parse(_data: JSONObject) {
- player ?: return
- if(_data.containsKey("farming-bins")){
- _data["bins"] = _data["farming-bins"]
- val timer = getOrStartTimer (player)
- timer.parse (_data, player)
- }
- if(_data.containsKey("farming-patches")){
- _data["patches"] = _data["farming-patches"]
- val timer = getOrStartTimer (player)
- timer.parse(_data, player)
- }
- }
-
- override fun newInstance(player: Player?): State {
- return FarmingState(player)
- }
-
- override fun createPulse() {}
-}
diff --git a/Server/src/main/content/global/skill/farming/HealthChecker.kt b/Server/src/main/content/global/skill/farming/HealthChecker.kt
index 43d0e24d9..5c819f1a3 100644
--- a/Server/src/main/content/global/skill/farming/HealthChecker.kt
+++ b/Server/src/main/content/global/skill/farming/HealthChecker.kt
@@ -36,13 +36,22 @@ class HealthChecker : OptionHandler() {
rewardXP(player, Skills.FARMING, patch.plantable?.checkHealthXP ?: 0.0)
patch.isCheckHealth = false
when (type) {
- PatchType.TREE_PATCH -> patch.setCurrentState(patch.getCurrentState() + 1)
- PatchType.FRUIT_TREE_PATCH -> patch.setCurrentState(patch.getCurrentState() - 14)
- PatchType.BUSH_PATCH -> {
- sendMessage(player, "You examine the bush for signs of disease and find that it's in perfect health.")
- patch.setCurrentState(patch.plantable!!.value + patch.plantable!!.stages + 4)
+ PatchType.TREE_PATCH -> {
+ patch.setCurrentState(patch.getCurrentState() + 1)
+ sendMessage(player, "You examine the tree for signs of disease and find that it is in perfect health.")
+ }
+ PatchType.FRUIT_TREE_PATCH -> {
+ patch.setCurrentState(patch.getCurrentState() - 14)
+ sendMessage(player, "You examine the tree for signs of disease and find that it is in perfect health.")
+ }
+ PatchType.BUSH_PATCH -> {
+ patch.setCurrentState(patch.plantable!!.value + patch.plantable!!.stages + 4)
+ sendMessage(player, "You examine the bush for signs of disease and find that it's in perfect health.")
+ }
+ PatchType.CACTUS_PATCH -> {
+ patch.setCurrentState(patch.plantable!!.value + patch.plantable!!.stages + 3)
+ sendMessage(player, "You examine the cactus for signs of disease and find that it is in perfect health.")
}
- PatchType.CACTUS_PATCH -> patch.setCurrentState(patch.plantable!!.value + patch.plantable!!.stages + 3)
else -> log(this::class.java, Log.ERR, "Unreachable patch type from when(type) switch in HealthChecker.kt")
}
diff --git a/Server/src/main/content/global/skill/farming/Patch.kt b/Server/src/main/content/global/skill/farming/Patch.kt
index 486f1d5bf..c3b70eb6d 100644
--- a/Server/src/main/content/global/skill/farming/Patch.kt
+++ b/Server/src/main/content/global/skill/farming/Patch.kt
@@ -123,6 +123,9 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
log(this::class.java, Log.DEBUG, "Patch for ${player.username} at varbit ${patch.varbit} with plantable ${plantable?.name ?: "none"} was set to diseased at stage $currentGrowthStage, which isn't valid.")
return (state and (0x80.inv()))
}
+ else if (state in listOf(0, 1, 2, 3)){
+ // we're weedy (or an empty plot) as normal just continue
+ }
else {
log (this::class.java, Log.ERR, "Patch for ${player.username} at varbit ${patch.varbit} with plantable ${plantable?.name ?: "none"} was set to state $state at growth stage $currentGrowthStage, which isn't valid. We're not sure why this is happening.")
}
@@ -134,6 +137,13 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
return compost != CompostType.NONE
}
+ /**
+ * Returns true if the patch is fully grown.
+ *
+ * Note: This returns true if the patch is fully weedy.
+ * Use `plantable == null` to check if a patch does
+ * not have anything planted.
+ */
fun isGrown(): Boolean{
return currentGrowthStage == (plantable?.stages ?: 0)
}
@@ -144,7 +154,8 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
PatchType.FRUIT_TREE_PATCH -> setVarbit(player, patch.varbit, plantable!!.value + plantable!!.stages + 20)
PatchType.BUSH_PATCH -> setVarbit(player, patch.varbit, 250 + (plantable!!.ordinal - Plantable.REDBERRY_SEED.ordinal))
PatchType.CACTUS_PATCH -> setVarbit(player, patch.varbit, 31)
- else -> log(this::class.java, Log.WARN, "Invalid setting of isCheckHealth for patch type: " + patch.type.name)
+ PatchType.TREE_PATCH -> setVarbit(player, patch.varbit, plantable!!.value + plantable!!.stages)
+ else -> log(this::class.java, Log.WARN, "Invalid setting of isCheckHealth for patch type: " + patch.type.name + "at" + patch.name)
}
} else {
when(patch.type){
@@ -276,18 +287,18 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
return
}
- diseaseMod = when(compost){
+ // This is so a cheat can force disease
+ diseaseMod = if (diseaseMod < 0) -128 else when(compost){
CompostType.NONE -> 0
CompostType.COMPOST -> 8
CompostType.SUPERCOMPOST -> 13
}
- if(patch != FarmingPatch.TROLL_STRONGHOLD_HERB && RandomFunction.random(128) <= (17 - diseaseMod) && !isWatered && !isGrown() && !protectionPaid && !isFlowerProtected() && patch.type != PatchType.EVIL_TURNIP_PATCH ){
- //bush, tree, fruit tree, herb and cactus can not disease on stage 1(0) of growth.
- if(!((patch.type == PatchType.BUSH_PATCH || patch.type == PatchType.TREE_PATCH || patch.type == PatchType.FRUIT_TREE_PATCH || patch.type == PatchType.CACTUS_PATCH || patch.type == PatchType.HERB_PATCH) && currentGrowthStage == 0)) {
- isDiseased = true
- return
- }
+ if(patch != FarmingPatch.TROLL_STRONGHOLD_HERB && RandomFunction.random(128) <= (17 - diseaseMod) && !isWatered && !isGrown() && !protectionPaid && !isFlowerProtected() && patch.type != PatchType.EVIL_TURNIP_PATCH && currentGrowthStage != 0){
+ isDiseased = true
+ // If we manually set disease mod reset it back to 0 so that crops can naturally grow after being treated/accidentally attempted to disease when they cannot be
+ if (diseaseMod < 0) diseaseMod = 0
+ return
}
if((patch.type == PatchType.FRUIT_TREE_PATCH || patch.type == PatchType.TREE_PATCH || patch.type == PatchType.BUSH_PATCH || patch.type == PatchType.CACTUS_PATCH) && plantable != null && plantable?.stages == currentGrowthStage + 1){
@@ -340,6 +351,19 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
}
fun clear(){
+ if (isGrown()) {
+ var seedAmount = 1
+ var seedMessage = "a seed"
+ if (patch.type == PatchType.ALLOTMENT || plantable!! == Plantable.JUTE_SEED) {
+ seedAmount = 3
+ seedMessage = "some seeds"
+ } else if (patch.type == PatchType.HOPS_PATCH) {
+ seedAmount = 4
+ seedMessage = "some seeds"
+ }
+ addItemOrDrop(player, plantable!!.itemID, seedAmount)
+ sendMessage(player, "You find $seedMessage in the patch as you clear it.")
+ }
isCheckHealth = false
isDiseased = false
isDead = false
@@ -376,7 +400,7 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
FarmingPatch.CATHERBY_ALLOTMENT_S,FarmingPatch.CATHERBY_ALLOTMENT_N -> FarmingPatch.CATHERBY_FLOWER_C
FarmingPatch.PORT_PHAS_ALLOTMENT_SE,FarmingPatch.PORT_PHAS_ALLOTMENT_NW -> FarmingPatch.PORT_PHAS_FLOWER_C
else -> return false
- }.getPatchFor(player)
+ }.getPatchFor(player, false)
return (fpatch.plantable != null &&
(fpatch.plantable == plantable?.protectionFlower || fpatch.plantable == Plantable.forItemID(Items.WHITE_LILY_SEED_14589))
diff --git a/Server/src/main/content/global/skill/farming/PatchRaker.kt b/Server/src/main/content/global/skill/farming/PatchRaker.kt
index 27bc3d8fa..10af95489 100644
--- a/Server/src/main/content/global/skill/farming/PatchRaker.kt
+++ b/Server/src/main/content/global/skill/farming/PatchRaker.kt
@@ -15,7 +15,7 @@ object PatchRaker {
val p = patch.getPatchFor(player)
val patchName = p.patch.type.displayName()
var firstRake = true
- if (p.isEmptyAndWeeded()) {
+ if (!p.isWeedy()) {
sendMessage(player, "This $patchName doesn't need weeding right now.")
return
}
diff --git a/Server/src/main/content/global/skill/farming/Plantable.kt b/Server/src/main/content/global/skill/farming/Plantable.kt
index c77d22b6e..83c016c64 100644
--- a/Server/src/main/content/global/skill/farming/Plantable.kt
+++ b/Server/src/main/content/global/skill/farming/Plantable.kt
@@ -3,88 +3,88 @@ package content.global.skill.farming
import core.game.node.item.Item
import org.rs09.consts.Items
-enum class Plantable(val itemID: Int, val value: Int, val stages: Int, val plantingXP: Double, val harvestXP: Double, val checkHealthXP: Double, val requiredLevel: Int, val applicablePatch: PatchType, val harvestItem: Int, val protectionItem: Item? = null,val protectionFlower: Plantable? = null) {
+enum class Plantable(val itemID: Int, val displayName: String, val value: Int, val stages: Int, val plantingXP: Double, val harvestXP: Double, val checkHealthXP: Double, val requiredLevel: Int, val applicablePatch: PatchType, val harvestItem: Int, val protectionItem: Item? = null, val protectionFlower: Plantable? = null) {
- //Flowers
- MARIGOLD_SEED(5096,8,4,8.5,47.0,0.0,2,PatchType.FLOWER_PATCH,Items.MARIGOLDS_6010),
- ROSEMARY_SEED(5097,13,4,12.0,66.5,0.0,11,PatchType.FLOWER_PATCH, Items.ROSEMARY_6014),
- NASTURTIUM_SEED(5098,18,4,19.5,111.0,0.0,24,PatchType.FLOWER_PATCH,Items.NASTURTIUMS_6012),
- WOAD_SEED(5099,23,4,20.5,115.5,0.0,25,PatchType.FLOWER_PATCH,Items.WOAD_LEAF_1793),
- LIMPWURT_SEED(5100,28,4,21.5,120.0,0.0,26,PatchType.FLOWER_PATCH,Items.LIMPWURT_ROOT_225),
- WHITE_LILY_SEED(14589,37,4,42.0,250.0,0.0,52,PatchType.FLOWER_PATCH,Items.WHITE_LILY_14583),
+ // Flowers
+ MARIGOLD_SEED(Items.MARIGOLD_SEED_5096,"marigold seed",8,4,8.5,47.0,0.0,2,PatchType.FLOWER_PATCH,Items.MARIGOLDS_6010),
+ ROSEMARY_SEED(Items.ROSEMARY_SEED_5097,"rosemary seed",13,4,12.0,66.5,0.0,11,PatchType.FLOWER_PATCH, Items.ROSEMARY_6014),
+ NASTURTIUM_SEED(Items.NASTURTIUM_SEED_5098,"nasturtium seed",18,4,19.5,111.0,0.0,24,PatchType.FLOWER_PATCH,Items.NASTURTIUMS_6012),
+ WOAD_SEED(Items.WOAD_SEED_5099,"woad seed",23,4,20.5,115.5,0.0,25,PatchType.FLOWER_PATCH,Items.WOAD_LEAF_1793),
+ LIMPWURT_SEED(Items.LIMPWURT_SEED_5100,"limpwurt seed",28,4,21.5,120.0,0.0,26,PatchType.FLOWER_PATCH,Items.LIMPWURT_ROOT_225),
+ WHITE_LILY_SEED(Items.WHITE_LILY_SEED_14589,"white lily seed",37,4,42.0,250.0,0.0,52,PatchType.FLOWER_PATCH,Items.WHITE_LILY_14583),
- //Flower(Technically)
- SCARECROW(6059,33,3,0.0,0.0,0.0,23,PatchType.FLOWER_PATCH,Items.SCARECROW_6059),
+ // Flower (technically)
+ SCARECROW(Items.SCARECROW_6059,"scarecrow",33,3,0.0,0.0,0.0,23,PatchType.FLOWER_PATCH,Items.SCARECROW_6059),
- //Allotments
- POTATO_SEED(5318, 6, 4, 8.0, 9.0, 0.0, 1, PatchType.ALLOTMENT, Items.POTATO_1942,Item(Items.COMPOST_6032,2),MARIGOLD_SEED),
- ONION_SEED(5319, 13, 4, 9.5, 10.5,0.0, 5, PatchType.ALLOTMENT,Items.ONION_1957,Item(Items.POTATOES10_5438),MARIGOLD_SEED),
- CABBAGE_SEED(5324, 20, 4, 10.0, 11.5, 0.0,7, PatchType.ALLOTMENT,Items.CABBAGE_1965,Item(Items.ONIONS10_5458),ROSEMARY_SEED),
- TOMATO_SEED(5322,27,4,12.5,14.0,0.0,12,PatchType.ALLOTMENT,Items.TOMATO_1982,Item(Items.CABBAGES10_5478,2),MARIGOLD_SEED),
- SWEETCORN_SEED(5320,34,6,17.0,19.0,0.0,20,PatchType.ALLOTMENT,Items.SWEETCORN_5986,Item(Items.JUTE_FIBRE_5931,10),SCARECROW),
- STRAWBERRY_SEED(5323,43,6,26.0,29.0,0.0,31,PatchType.ALLOTMENT,Items.STRAWBERRY_5504,Item(Items.APPLES5_5386)),
- WATERMELON_SEED(5321,52,8,48.5,54.5,0.0,47,PatchType.ALLOTMENT,Items.WATERMELON_5982,Item(Items.CURRY_LEAF_5970,10),NASTURTIUM_SEED),
+ // Allotments
+ POTATO_SEED(Items.POTATO_SEED_5318, "potato seed", 6, 4, 8.0, 9.0, 0.0, 1, PatchType.ALLOTMENT, Items.POTATO_1942,Item(Items.COMPOST_6032,2),MARIGOLD_SEED),
+ ONION_SEED(Items.ONION_SEED_5319, "onion seed", 13, 4, 9.5, 10.5,0.0, 5, PatchType.ALLOTMENT,Items.ONION_1957,Item(Items.POTATOES10_5438),MARIGOLD_SEED),
+ CABBAGE_SEED(Items.CABBAGE_SEED_5324, "cabbage seed", 20, 4, 10.0, 11.5, 0.0,7, PatchType.ALLOTMENT,Items.CABBAGE_1965,Item(Items.ONIONS10_5458),ROSEMARY_SEED),
+ TOMATO_SEED(Items.TOMATO_SEED_5322,"tomato seed",27,4,12.5,14.0,0.0,12,PatchType.ALLOTMENT,Items.TOMATO_1982,Item(Items.CABBAGES10_5478,2),MARIGOLD_SEED),
+ SWEETCORN_SEED(Items.SWEETCORN_SEED_5320,"sweetcorn seed",34,6,17.0,19.0,0.0,20,PatchType.ALLOTMENT,Items.SWEETCORN_5986,Item(Items.JUTE_FIBRE_5931,10),SCARECROW),
+ STRAWBERRY_SEED(Items.STRAWBERRY_SEED_5323,"strawberry seed",43,6,26.0,29.0,0.0,31,PatchType.ALLOTMENT,Items.STRAWBERRY_5504,Item(Items.APPLES5_5386)),
+ WATERMELON_SEED(Items.WATERMELON_SEED_5321,"watermelon seed",52,8,48.5,54.5,0.0,47,PatchType.ALLOTMENT,Items.WATERMELON_5982,Item(Items.CURRY_LEAF_5970,10),NASTURTIUM_SEED),
- //Hops
- BARLEY_SEED(5305,49,4,8.5,9.5,0.0,3,PatchType.HOPS_PATCH,Items.BARLEY_6006,Item(Items.COMPOST_6032,3)),
- HAMMERSTONE_SEED(5307,4,4,9.0,10.0,0.0,4,PatchType.HOPS_PATCH,Items.HAMMERSTONE_HOPS_5994,Item(Items.MARIGOLDS_6010)),
- ASGARNIAN_SEED(5308,11,5,10.9,12.0,0.0,8,PatchType.HOPS_PATCH,Items.ASGARNIAN_HOPS_5996,Item(Items.ONIONS10_5458)),
- JUTE_SEED(5306,56,5,13.0,14.5,0.0,13,PatchType.HOPS_PATCH,Items.JUTE_FIBRE_5931,Item(Items.BARLEY_MALT_6008,6)),
- YANILLIAN_SEED(5309,19,6,14.5,16.0,0.0,16,PatchType.HOPS_PATCH,Items.YANILLIAN_HOPS_5998,Item(Items.TOMATOES5_5968)),
- KRANDORIAN_SEED(5310,28,7,17.5,19.5,0.0,21,PatchType.HOPS_PATCH,Items.KRANDORIAN_HOPS_6000,Item(Items.CABBAGES10_5478,3)),
- WILDBLOOD_SEED(5311,38,8,23.0,26.0,0.0,28,PatchType.HOPS_PATCH,Items.WILDBLOOD_HOPS_6002,Item(Items.NASTURTIUMS_6012)),
+ // Hops
+ BARLEY_SEED(Items.BARLEY_SEED_5305,"barley seed",49,4,8.5,9.5,0.0,3,PatchType.HOPS_PATCH,Items.BARLEY_6006,Item(Items.COMPOST_6032,3)),
+ HAMMERSTONE_SEED(Items.HAMMERSTONE_SEED_5307,"Hammerstone hop seed",4,4,9.0,10.0,0.0,4,PatchType.HOPS_PATCH,Items.HAMMERSTONE_HOPS_5994,Item(Items.MARIGOLDS_6010)),
+ ASGARNIAN_SEED(Items.ASGARNIAN_SEED_5308,"Asgarnian hop seed",11,5,10.9,12.0,0.0,8,PatchType.HOPS_PATCH,Items.ASGARNIAN_HOPS_5996,Item(Items.ONIONS10_5458)),
+ JUTE_SEED(Items.JUTE_SEED_5306,"jute plant seed",56,5,13.0,14.5,0.0,13,PatchType.HOPS_PATCH,Items.JUTE_FIBRE_5931,Item(Items.BARLEY_MALT_6008,6)),
+ YANILLIAN_SEED(Items.YANILLIAN_SEED_5309,"Yanillian hop seed",19,6,14.5,16.0,0.0,16,PatchType.HOPS_PATCH,Items.YANILLIAN_HOPS_5998,Item(Items.TOMATOES5_5968)),
+ KRANDORIAN_SEED(Items.KRANDORIAN_SEED_5310,"Krandorian hop seed",28,7,17.5,19.5,0.0,21,PatchType.HOPS_PATCH,Items.KRANDORIAN_HOPS_6000,Item(Items.CABBAGES10_5478,3)),
+ WILDBLOOD_SEED(Items.WILDBLOOD_SEED_5311,"Wildblood hop seed",38,8,23.0,26.0,0.0,28,PatchType.HOPS_PATCH,Items.WILDBLOOD_HOPS_6002,Item(Items.NASTURTIUMS_6012)),
- //Trees
- OAK_SAPLING(5370,8,4,14.0,0.0,467.3,15,PatchType.TREE_PATCH,Items.OAK_ROOTS_6043,Item(Items.TOMATOES5_5968)),
- WILLOW_SAPLING(5371,15,6,25.0,0.0,1456.5,30,PatchType.TREE_PATCH,Items.WILLOW_ROOTS_6045,Item(Items.APPLES5_5386)),
- MAPLE_SAPLING(5372,24,8,45.0,0.0,3403.4,45,PatchType.TREE_PATCH,Items.MAPLE_ROOTS_6047,Item(Items.ORANGES5_5396)),
- YEW_SAPLING(5373,35,10,81.0,0.0,7069.9,60,PatchType.TREE_PATCH,Items.YEW_ROOTS_6049,Item(Items.CACTUS_SPINE_6016,10)),
- MAGIC_SAPLING(5374,48,12,145.5,0.0,13768.3,75,PatchType.TREE_PATCH,Items.MAGIC_ROOTS_6051,Item(Items.COCONUT_5974,25)),
+ // Trees
+ OAK_SAPLING(Items.OAK_SAPLING_5370,"oak sapling",8,4,14.0,0.0,467.3,15,PatchType.TREE_PATCH,Items.OAK_ROOTS_6043,Item(Items.TOMATOES5_5968)),
+ WILLOW_SAPLING(Items.WILLOW_SAPLING_5371,"willow sapling",15,6,25.0,0.0,1456.5,30,PatchType.TREE_PATCH,Items.WILLOW_ROOTS_6045,Item(Items.APPLES5_5386)),
+ MAPLE_SAPLING(Items.MAPLE_SAPLING_5372,"maple sapling",24,8,45.0,0.0,3403.4,45,PatchType.TREE_PATCH,Items.MAPLE_ROOTS_6047,Item(Items.ORANGES5_5396)),
+ YEW_SAPLING(Items.YEW_SAPLING_5373,"yew sapling",35,10,81.0,0.0,7069.9,60,PatchType.TREE_PATCH,Items.YEW_ROOTS_6049,Item(Items.CACTUS_SPINE_6016,10)),
+ MAGIC_SAPLING(Items.MAGIC_SAPLING_5374,"magic Tree sapling",48,12,145.5,0.0,13768.3,75,PatchType.TREE_PATCH,Items.MAGIC_ROOTS_6051,Item(Items.COCONUT_5974,25)),
- //Fruit Trees
- APPLE_SAPLING(5496,8,6,22.0,8.5,1199.5,27,PatchType.FRUIT_TREE_PATCH,Items.COOKING_APPLE_1955,Item(Items.SWEETCORN_5986,9)),
- BANANA_SAPLING(5497,35,6,28.0,10.5,1750.5,33,PatchType.FRUIT_TREE_PATCH,Items.BANANA_1963,Item(Items.APPLES5_5386,4)),
- ORANGE_SAPLING(5498,72,6,35.5,13.5,2470.2,39,PatchType.FRUIT_TREE_PATCH,Items.ORANGE_2108,Item(Items.STRAWBERRIES5_5406,3)),
- CURRY_SAPLING(5499,99,6,40.0,15.0,2906.9,42,PatchType.FRUIT_TREE_PATCH,Items.CURRY_LEAF_5970,Item(Items.BANANAS5_5416,5)),
- PINEAPPLE_SAPLING(5500,136,6,57.0,21.5,4605.7,51,PatchType.FRUIT_TREE_PATCH,Items.PINEAPPLE_2114,Item(Items.WATERMELON_5982,10)),
- PAPAYA_SAPLING(5501,163,6,72.0,27.0,6146.4,57,PatchType.FRUIT_TREE_PATCH,Items.PAPAYA_FRUIT_5972,Item(Items.PINEAPPLE_2114,10)),
- PALM_SAPLING(5502,200,6,110.5,41.5,10150.1,68,PatchType.FRUIT_TREE_PATCH,Items.COCONUT_5974,Item(Items.PAPAYA_FRUIT_5972,15)),
+ // Fruit Trees
+ APPLE_SAPLING(Items.APPLE_SAPLING_5496,"apple tree sapling",8,6,22.0,8.5,1199.5,27,PatchType.FRUIT_TREE_PATCH,Items.COOKING_APPLE_1955,Item(Items.SWEETCORN_5986,9)),
+ BANANA_SAPLING(Items.BANANA_SAPLING_5497,"banana tree sapling",35,6,28.0,10.5,1750.5,33,PatchType.FRUIT_TREE_PATCH,Items.BANANA_1963,Item(Items.APPLES5_5386,4)),
+ ORANGE_SAPLING(Items.ORANGE_SAPLING_5498,"orange tree sapling",72,6,35.5,13.5,2470.2,39,PatchType.FRUIT_TREE_PATCH,Items.ORANGE_2108,Item(Items.STRAWBERRIES5_5406,3)),
+ CURRY_SAPLING(Items.CURRY_SAPLING_5499,"curry tree sapling",99,6,40.0,15.0,2906.9,42,PatchType.FRUIT_TREE_PATCH,Items.CURRY_LEAF_5970,Item(Items.BANANAS5_5416,5)),
+ PINEAPPLE_SAPLING(Items.PINEAPPLE_SAPLING_5500,"pineapple plant",136,6,57.0,21.5,4605.7,51,PatchType.FRUIT_TREE_PATCH,Items.PINEAPPLE_2114,Item(Items.WATERMELON_5982,10)),
+ PAPAYA_SAPLING(Items.PAPAYA_SAPLING_5501,"papaya tree sapling",163,6,72.0,27.0,6146.4,57,PatchType.FRUIT_TREE_PATCH,Items.PAPAYA_FRUIT_5972,Item(Items.PINEAPPLE_2114,10)),
+ PALM_SAPLING(Items.PALM_SAPLING_5502,"palm tree sapling",200,6,110.5,41.5,10150.1,68,PatchType.FRUIT_TREE_PATCH,Items.COCONUT_5974,Item(Items.PAPAYA_FRUIT_5972,15)),
- //Bushes
- REDBERRY_SEED(5101,5,5,11.5,4.5,64.0,10,PatchType.BUSH_PATCH,Items.REDBERRIES_1951,Item(Items.CABBAGES10_5478,4)),
- CADAVABERRY_SEED(5102,15,6,18.0,7.0,102.5,22,PatchType.BUSH_PATCH,Items.CADAVA_BERRIES_753,Item(Items.TOMATOES5_5968,3)),
- DWELLBERRY_SEED(5103,26,27,31.5,12.0,177.5,36,PatchType.BUSH_PATCH,Items.DWELLBERRIES_2126,Item(Items.STRAWBERRIES5_5406,3)),
- JANGERBERRY_SEED(5104,38,8,50.5,19.0,284.5,48,PatchType.BUSH_PATCH,Items.JANGERBERRIES_247,Item(Items.WATERMELON_5982,6)),
- WHITEBERRY_SEED(5105,51,8,78.0,29.0,437.5,59,PatchType.BUSH_PATCH,Items.WHITE_BERRIES_239,null),
- POISON_IVY_SEED(5106,197,8,120.0,45.0,675.0,70,PatchType.BUSH_PATCH,Items.POISON_IVY_BERRIES_6018,null),
+ // Bushes
+ REDBERRY_SEED(Items.REDBERRY_SEED_5101,"redberry bush seed",5,5,11.5,4.5,64.0,10,PatchType.BUSH_PATCH,Items.REDBERRIES_1951,Item(Items.CABBAGES10_5478,4)),
+ CADAVABERRY_SEED(Items.CADAVABERRY_SEED_5102,"cadavaberry bush seed",15,6,18.0,7.0,102.5,22,PatchType.BUSH_PATCH,Items.CADAVA_BERRIES_753,Item(Items.TOMATOES5_5968,3)),
+ DWELLBERRY_SEED(Items.DWELLBERRY_SEED_5103,"dwellberry bush seed",26,27,31.5,12.0,177.5,36,PatchType.BUSH_PATCH,Items.DWELLBERRIES_2126,Item(Items.STRAWBERRIES5_5406,3)),
+ JANGERBERRY_SEED(Items.JANGERBERRY_SEED_5104,"jangerberry bush seed",38,8,50.5,19.0,284.5,48,PatchType.BUSH_PATCH,Items.JANGERBERRIES_247,Item(Items.WATERMELON_5982,6)),
+ WHITEBERRY_SEED(Items.WHITEBERRY_SEED_5105,"whiteberry bush seed",51,8,78.0,29.0,437.5,59,PatchType.BUSH_PATCH,Items.WHITE_BERRIES_239,null),
+ POISON_IVY_SEED(Items.POISON_IVY_SEED_5106,"poison ivy bush seed",197,8,120.0,45.0,675.0,70,PatchType.BUSH_PATCH,Items.POISON_IVY_BERRIES_6018,null),
- //Herbs
- GUAM_SEED(5291,4,4,11.0,12.5,0.0,9,PatchType.HERB_PATCH,Items.GRIMY_GUAM_199),
- MARRENTILL_SEED(5292,11,4,13.5,15.0,0.0,14,PatchType.HERB_PATCH,Items.GRIMY_MARRENTILL_201),
- TARROMIN_SEED(5293,18,4,16.0,18.0,0.0,19,PatchType.HERB_PATCH,Items.GRIMY_TARROMIN_203),
- HARRALANDER_SEED(5294,25,4,21.5,24.0,0.0,26,PatchType.HERB_PATCH,Items.GRIMY_HARRALANDER_205),
- RANARR_SEED(5295,32,4,27.0,30.5,0.0,32,PatchType.HERB_PATCH,Items.GRIMY_RANARR_207),
- AVANTOE_SEED(5298,39,4,54.5,61.5,0.0,50,PatchType.HERB_PATCH,Items.GRIMY_AVANTOE_211),
- TOADFLAX_SEED(5296,46,4,34.0,38.5,0.0,38,PatchType.HERB_PATCH,Items.GRIMY_TOADFLAX_3049),
- IRIT_SEED(5297,53,4,43.0,48.5,0.0,44,PatchType.HERB_PATCH,Items.GRIMY_IRIT_209),
- KWUARM_SEED(5299,68,4,69.0,78.0,0.0,56,PatchType.HERB_PATCH,Items.GRIMY_KWUARM_213),
- SNAPDRAGON_SEED(5300,75,4,87.5,98.5,0.0,62,PatchType.HERB_PATCH,Items.GRIMY_SNAPDRAGON_3051),
- CADANTINE_SEED(5301,82,4,106.5,120.0,0.0,67,PatchType.HERB_PATCH,Items.GRIMY_CADANTINE_215),
- LANTADYME_SEED(5302,89,4,134.5,151.5,0.0,73,PatchType.HERB_PATCH,Items.GRIMY_LANTADYME_2485),
- DWARF_WEED_SEED(5303,96,4,170.5,192.0,0.0,79,PatchType.HERB_PATCH,Items.GRIMY_DWARF_WEED_217),
- TORSTOL_SEED(5304,103,4,199.5,224.5,0.0,85,PatchType.HERB_PATCH,Items.GRIMY_TORSTOL_219),
- GOUT_TUBER(6311,192,4,105.0,45.0,0.0,29,PatchType.HERB_PATCH,Items.GOUTWEED_3261),
- SPIRIT_WEED_SEED(12176, 204, 4, 32.0, 36.0, 0.0, 36, PatchType.HERB_PATCH, Items.GRIMY_SPIRIT_WEED_12174),
+ // Herbs
+ GUAM_SEED(Items.GUAM_SEED_5291,"guam seed",4,4,11.0,12.5,0.0,9,PatchType.HERB_PATCH,Items.GRIMY_GUAM_199),
+ MARRENTILL_SEED(Items.MARRENTILL_SEED_5292,"marrentill seed",11,4,13.5,15.0,0.0,14,PatchType.HERB_PATCH,Items.GRIMY_MARRENTILL_201),
+ TARROMIN_SEED(Items.TARROMIN_SEED_5293,"tarromin seed",18,4,16.0,18.0,0.0,19,PatchType.HERB_PATCH,Items.GRIMY_TARROMIN_203),
+ HARRALANDER_SEED(Items.HARRALANDER_SEED_5294,"harralander seed",25,4,21.5,24.0,0.0,26,PatchType.HERB_PATCH,Items.GRIMY_HARRALANDER_205),
+ RANARR_SEED(Items.RANARR_SEED_5295,"ranarr seed",32,4,27.0,30.5,0.0,32,PatchType.HERB_PATCH,Items.GRIMY_RANARR_207),
+ AVANTOE_SEED(Items.AVANTOE_SEED_5298,"avantoe seed",39,4,54.5,61.5,0.0,50,PatchType.HERB_PATCH,Items.GRIMY_AVANTOE_211),
+ TOADFLAX_SEED(Items.TOADFLAX_SEED_5296,"toadflax seed",46,4,34.0,38.5,0.0,38,PatchType.HERB_PATCH,Items.GRIMY_TOADFLAX_3049),
+ IRIT_SEED(Items.IRIT_SEED_5297,"irit seed",53,4,43.0,48.5,0.0,44,PatchType.HERB_PATCH,Items.GRIMY_IRIT_209),
+ KWUARM_SEED(Items.KWUARM_SEED_5299,"kwuarm seed",68,4,69.0,78.0,0.0,56,PatchType.HERB_PATCH,Items.GRIMY_KWUARM_213),
+ SNAPDRAGON_SEED(Items.SNAPDRAGON_SEED_5300,"snapdragon seed",75,4,87.5,98.5,0.0,62,PatchType.HERB_PATCH,Items.GRIMY_SNAPDRAGON_3051),
+ CADANTINE_SEED(Items.CADANTINE_SEED_5301,"cadantine seed",82,4,106.5,120.0,0.0,67,PatchType.HERB_PATCH,Items.GRIMY_CADANTINE_215),
+ LANTADYME_SEED(Items.LANTADYME_SEED_5302,"lantadyme seed",89,4,134.5,151.5,0.0,73,PatchType.HERB_PATCH,Items.GRIMY_LANTADYME_2485),
+ DWARF_WEED_SEED(Items.DWARF_WEED_SEED_5303,"dwarf weed seed",96,4,170.5,192.0,0.0,79,PatchType.HERB_PATCH,Items.GRIMY_DWARF_WEED_217),
+ TORSTOL_SEED(Items.TORSTOL_SEED_5304,"torstol seed",103,4,199.5,224.5,0.0,85,PatchType.HERB_PATCH,Items.GRIMY_TORSTOL_219),
+ GOUT_TUBER(Items.GOUT_TUBER_6311,"gout tuber",192,4,105.0,45.0,0.0,29,PatchType.HERB_PATCH,Items.GOUTWEED_3261),
+ SPIRIT_WEED_SEED(Items.SPIRIT_WEED_SEED_12176,"spirit weed seed", 204, 4, 32.0, 36.0, 0.0, 36, PatchType.HERB_PATCH, Items.GRIMY_SPIRIT_WEED_12174),
- //Other
- BELLADONNA_SEED(5281, 4, 4, 91.0, 128.0, 0.0, 63, PatchType.BELLADONNA_PATCH, Items.CAVE_NIGHTSHADE_2398),
- MUSHROOM_SPORE(Items.MUSHROOM_SPORE_5282, 6, 7, 61.5, 57.7, 0.0, 53, PatchType.MUSHROOM_PATCH, Items.MUSHROOM_6004),
- CACTUS_SEED(Items.CACTUS_SEED_5280, 8, 7, 66.5, 25.0, 374.0, 55, PatchType.CACTUS_PATCH, Items.CACTUS_SPINE_6016),
- EVIL_TURNIP_SEED(Items.EVIL_TURNIP_SEED_12148, 4, 1, 41.0, 46.0, 0.0, 42, PatchType.EVIL_TURNIP_PATCH, Items.EVIL_TURNIP_12134)
+ // Special
+ BELLADONNA_SEED(Items.BELLADONNA_SEED_5281, "belladonna seed", 4, 4, 91.0, 128.0, 0.0, 63, PatchType.BELLADONNA_PATCH, Items.CAVE_NIGHTSHADE_2398),
+ MUSHROOM_SPORE(Items.MUSHROOM_SPORE_5282, "mushroom spore", 6, 7, 61.5, 57.7, 0.0, 53, PatchType.MUSHROOM_PATCH, Items.MUSHROOM_6004),
+ CACTUS_SEED(Items.CACTUS_SEED_5280, "cactus seed", 8, 7, 66.5, 25.0, 374.0, 55, PatchType.CACTUS_PATCH, Items.CACTUS_SPINE_6016),
+ EVIL_TURNIP_SEED(Items.EVIL_TURNIP_SEED_12148, "evil turnip seed", 4, 1, 41.0, 46.0, 0.0, 42, PatchType.EVIL_TURNIP_PATCH, Items.EVIL_TURNIP_12134)
;
- constructor(itemID: Int, value: Int, stages: Int, plantingXP: Double, harvestXP: Double, checkHealthXP: Double, requiredLevel: Int, applicablePatch: PatchType, harvestItem: Int, protectionFlower: Plantable)
- : this(itemID,value,stages,plantingXP,harvestXP,checkHealthXP,requiredLevel,applicablePatch,harvestItem,null,protectionFlower)
+ constructor(itemID: Int, displayName: String, value: Int, stages: Int, plantingXP: Double, harvestXP: Double, checkHealthXP: Double, requiredLevel: Int, applicablePatch: PatchType, harvestItem: Int, protectionFlower: Plantable)
+ : this(itemID,displayName,value,stages,plantingXP,harvestXP,checkHealthXP,requiredLevel,applicablePatch,harvestItem,null,protectionFlower)
companion object {
@JvmField
val plantables = values().map { it.itemID to it }.toMap()
diff --git a/Server/src/main/content/global/skill/farming/ToolLeprechaunInterface.kt b/Server/src/main/content/global/skill/farming/ToolLeprechaunInterface.kt
index 980d20b07..75fbe8f07 100644
--- a/Server/src/main/content/global/skill/farming/ToolLeprechaunInterface.kt
+++ b/Server/src/main/content/global/skill/farming/ToolLeprechaunInterface.kt
@@ -69,7 +69,7 @@ class ToolLeprechaunInterface : InterfaceListener {
setHasMagicSecateurs(player,false)
}
} else {
- sendMessage(player, "You already have one of those stored.")
+ sendMessage(player, "You cannot store more than one pair of secateurs in here.")
}
}
22 -> {
@@ -80,7 +80,7 @@ class ToolLeprechaunInterface : InterfaceListener {
removeItem(player, can)
setWateringCan(player,can)
} else {
- sendMessage(player, "You already have one of those stored.")
+ sendMessage(player, "You cannot store more than one watering can in here.")
}
}
23 -> doDeposit(player, Items.GARDENING_TROWEL_5325, ::setHasGardeningTrowel, ::hasGardeningTrowel)
@@ -119,7 +119,15 @@ class ToolLeprechaunInterface : InterfaceListener {
depositMethod.invoke(player, true)
removeItem(player, item)
} else {
- sendMessage(player, "You already have one of those stored.")
+ val itemName = when (item) {
+ // secateurs and watering cans are handled separately
+ Items.RAKE_5341 -> "rake"
+ Items.SEED_DIBBER_5343 -> "dibber"
+ Items.SPADE_952 -> "spade"
+ Items.GARDENING_TROWEL_5325 -> "trowel"
+ else -> getItemName(item).lowercase()
+ }
+ sendMessage(player, "You cannot store more than one $itemName in here.")
}
}
@@ -127,7 +135,7 @@ class ToolLeprechaunInterface : InterfaceListener {
player ?: return
val hasAmount = amountInInventory(player, item)
var finalAmount = amount
- val spaceLeft = (if (item == Items.BUCKET_1925) 31 else 255) - quantityCheckMethod.invoke(player)
+ val spaceLeft = (if (item == Items.BUCKET_1925) 255 else 255) - quantityCheckMethod.invoke(player)
if (hasAmount == 0) {
val itemName = if (item == Items.BUCKET_1925) "buckets" else getItemName(item).lowercase()
@@ -175,7 +183,7 @@ class ToolLeprechaunInterface : InterfaceListener {
private fun doStackedWithdrawal(player: Player?, item: Int, amount: Int, updateQuantityMethod: (Player?, Int) -> Unit, quantityCheckMethod: (Player?) -> Int) {
player ?: return
- val hasAmount = quantityCheckMethod.invoke(player)
+ val hasAmount = if (item == Items.BUCKET_1925) 31 else quantityCheckMethod.invoke(player)
var finalAmount = amount
if (hasAmount == 0) {
diff --git a/Server/src/main/content/global/skill/farming/UseWithPatchHandler.kt b/Server/src/main/content/global/skill/farming/UseWithPatchHandler.kt
index d71a7c409..6dac10dce 100644
--- a/Server/src/main/content/global/skill/farming/UseWithPatchHandler.kt
+++ b/Server/src/main/content/global/skill/farming/UseWithPatchHandler.kt
@@ -5,7 +5,6 @@ import core.game.node.entity.player.link.diary.DiaryType
import core.game.node.entity.skill.Skills
import core.game.node.item.Item
import core.game.system.task.Pulse
-import core.game.world.update.flag.context.Animation
import org.rs09.consts.Items
import core.game.interaction.IntType
import core.game.interaction.InteractionListener
@@ -13,6 +12,7 @@ import core.game.interaction.QueueStrength
import core.tools.StringUtils
import core.tools.prependArticle
import org.rs09.consts.Sounds
+import content.data.Quests
class UseWithPatchHandler : InteractionListener {
val RAKE = Items.RAKE_5341
@@ -21,11 +21,14 @@ class UseWithPatchHandler : InteractionListener {
val SECATEURS = Items.SECATEURS_5329
val MAGIC_SECATEURS = Items.MAGIC_SECATEURS_7409
val TROWEL = Items.GARDENING_TROWEL_5325
- val pourBucketAnim = Animation(2283)
- val wateringCanAnim = Animation(2293)
- val plantCureAnim = Animation(2288)
- val secateursTreeAnim = Animation(2277)
- val magicSecateursTreeAnim = Animation(3340)
+ val spadeDigAnim = getAnimation(830)
+ val trowelDigAnim = getAnimation(2272)
+ val pourBucketAnim = getAnimation(2283)
+ val seedDibberAnim = getAnimation(2291)
+ val wateringCanAnim = getAnimation(2293)
+ val plantCureAnim = getAnimation(2288)
+ val secateursTreeAnim = getAnimation(2277)
+ val magicSecateursTreeAnim = getAnimation(3340)
@JvmField
val allowedNodes = ArrayList()
@@ -37,7 +40,7 @@ class UseWithPatchHandler : InteractionListener {
val usedItem = used.asItem()
if (patch == FarmingPatch.TROLL_STRONGHOLD_HERB) {
- if (!hasRequirement(player, "My Arm's Big Adventure"))
+ if (!hasRequirement(player, Quests.MY_ARMS_BIG_ADVENTURE))
return@onUseWith true
}
@@ -46,7 +49,7 @@ class UseWithPatchHandler : InteractionListener {
RAKE -> PatchRaker.rake(player,patch)
SEED_DIBBER -> sendMessage(player, "I should plant a seed, not the seed dibber.")
SPADE -> {
- val anim = getAnimation(830)
+ val anim = spadeDigAnim
val p = patch.getPatchFor(player)
if (p.isDead) {
sendMessage(player, "You start digging the farming patch...")
@@ -112,7 +115,7 @@ class UseWithPatchHandler : InteractionListener {
return@onUseWith true
}
- val anim = Animation(2272)
+ val anim = trowelDigAnim
submitIndividualPulse(player, object : Pulse(anim.duration) {
override fun pulse(): Boolean {
@@ -156,15 +159,21 @@ class UseWithPatchHandler : InteractionListener {
Items.WATERING_CAN_5331,Items.WATERING_CAN1_5333,Items.WATERING_CAN2_5334,Items.WATERING_CAN3_5335,Items.WATERING_CAN4_5336,Items.WATERING_CAN5_5337,Items.WATERING_CAN6_5338,Items.WATERING_CAN7_5339,Items.WATERING_CAN8_5340 -> {
val p = patch.getPatchFor(player)
val t = p.patch.type
- if (p.isWatered || p.isEmptyAndWeeded() || p.isGrown() || p.plantable == Plantable.SCARECROW) {
- sendMessage(player, "This patch doesn't need watering.")
- } else if (t == PatchType.ALLOTMENT || t == PatchType.FLOWER_PATCH || t == PatchType.HOPS_PATCH) {
+ if (t == PatchType.ALLOTMENT || t == PatchType.FLOWER_PATCH || t == PatchType.HOPS_PATCH) {
submitIndividualPulse(player, object : Pulse() {
override fun pulse(): Boolean {
- if (p.isWeedy()) {
+ if (p.isWeedy() || p.isEmptyAndWeeded()) {
sendMessage(player, "You should grow something first.")
return true
}
+ if (p.isWatered || p.isGrown() || p.plantable == Plantable.SCARECROW) {
+ sendMessage(player, "This patch doesn't need watering.")
+ return true
+ }
+ if (p.isDiseased || p.isDead) {
+ sendMessage(player, "Water isn't going to cure that!")
+ return true
+ }
if (usedItem.id == Items.WATERING_CAN_5331) {
sendMessage(player, "You need to fill the watering can first.")
return true
@@ -178,6 +187,8 @@ class UseWithPatchHandler : InteractionListener {
return true
}
})
+ } else {
+ sendMessage(player, "This patch doesn't need watering.")
}
}
@@ -212,9 +223,9 @@ class UseWithPatchHandler : InteractionListener {
val plantable = Plantable.forItemID(usedItem.id) ?: return@onUseWith false
if (plantable.applicablePatch != patch.type) {
- val seedNamePlural = StringUtils.plusS(plantable.name.replace("_", " ").lowercase())
+ val plantableNamePlural = StringUtils.plusS(plantable.displayName)
val patchType = if (plantable.applicablePatch == PatchType.ALLOTMENT) "a vegetable patch" else prependArticle(plantable.applicablePatch.displayName())
- sendMessage(player, "You can only plant $seedNamePlural in $patchType.")
+ sendMessage(player, "You can only plant $plantableNamePlural in $patchType.")
return@onUseWith true
}
@@ -232,66 +243,74 @@ class UseWithPatchHandler : InteractionListener {
return@onUseWith true
}
- val plantItem =
- if (patch.type == PatchType.ALLOTMENT) Item(plantable.itemID,3) else if (patch.type == PatchType.HOPS_PATCH) {
- if (plantable == Plantable.JUTE_SEED) Item(plantable.itemID,3) else Item(plantable.itemID,4)
- } else {
- Item(plantable.itemID,1)
- }
-
- if (patch.type == PatchType.ALLOTMENT) {
- if (!player.inventory.containsItem(plantItem)) {
- sendMessage(player, "You need 3 seeds to plant an allotment patch.")
- return@onUseWith true
- }
+ val plantItem = when (patch.type) {
+ PatchType.ALLOTMENT -> Item(plantable.itemID, 3)
+ PatchType.HOPS_PATCH -> if (plantable == Plantable.JUTE_SEED) Item(plantable.itemID, 3) else Item(plantable.itemID, 4)
+ else -> Item(plantable.itemID,1)
}
- if (patch.type != PatchType.FRUIT_TREE_PATCH && patch.type != PatchType.TREE_PATCH) {
- if (!inInventory(player, Items.SEED_DIBBER_5343)) {
- sendMessage(player, "You need a seed dibber to plant that.")
- return@onUseWith true
- }
- } else {
- if (!inInventory(player, Items.SPADE_952) && plantable != Plantable.SCARECROW) {
- sendMessage(player, "You need a spade to plant that.")
- return@onUseWith true
- }
+
+ if (!player.inventory.containsItem(plantItem)) {
+ val seedPlural = if (plantItem.amount == 1) "seed" else "seeds"
+ sendMessage(player, "You need ${plantItem.amount} $seedPlural to plant ${prependArticle(patch.type.displayName())}.")
+ return@onUseWith true
}
- player.lock()
- if (removeItem(player, plantItem)) {
- if (plantable != Plantable.SCARECROW) {
- animate(player, 2291)
- playAudio(player, Sounds.FARMING_DIBBING_2432)
- }
- val delay = if (plantable == Plantable.SCARECROW) 0 else 3
- submitIndividualPulse(player, object : Pulse(delay) {
- override fun pulse(): Boolean {
- if (plantable == Plantable.JUTE_SEED && patch == FarmingPatch.MCGRUBOR_HOPS && !player.achievementDiaryManager.hasCompletedTask(DiaryType.SEERS_VILLAGE, 0, 7)) {
- player.achievementDiaryManager.finishTask(player, DiaryType.SEERS_VILLAGE, 0, 7)
- }
- p.plant(plantable)
- rewardXP(player, Skills.FARMING, plantable.plantingXP)
- p.setNewHarvestAmount()
- if (p.patch.type == PatchType.TREE_PATCH || p.patch.type == PatchType.FRUIT_TREE_PATCH) {
- addItem(player, Items.PLANT_POT_5350)
- }
- val itemAmount = if (plantItem.amount == 1) "a" else plantItem.amount
- val itemName = if (plantItem.amount == 1) getItemName(plantItem.id).lowercase() else StringUtils.plusS(getItemName(plantItem.id).lowercase())
- val patchName = p.patch.type.displayName()
- if (plantable == Plantable.SCARECROW) {
- sendMessage(player, "You place the scarecrow in the $patchName.")
- } else {
- sendMessage(player, "You plant $itemAmount $itemName in the $patchName.")
- }
+ val requiredItem = when (patch.type) {
+ PatchType.TREE_PATCH, PatchType.FRUIT_TREE_PATCH -> Items.SPADE_952
+ PatchType.FLOWER_PATCH -> if (plantable == Plantable.SCARECROW) null else Items.SEED_DIBBER_5343
+ else -> Items.SEED_DIBBER_5343
+ }
+ if (requiredItem != null && !inInventory(player, requiredItem)) {
+ sendMessage(player, "You need ${prependArticle(requiredItem.asItem().name.lowercase())} to plant that.")
+ return@onUseWith true
+ }
- player.unlock()
- return true
+ queueScript(player, 0, QueueStrength.WEAK) { stage: Int ->
+ when (stage) {
+ 0 -> {
+ val (anim, sound) = when (requiredItem) {
+ Items.SPADE_952 -> Pair(spadeDigAnim, Sounds.DIGSPADE_1470)
+ else -> Pair(seedDibberAnim,Sounds.FARMING_DIBBING_2432)
+ }
+ animate(player, anim)
+ playAudio(player, sound)
+ val delay = if (patch.type == PatchType.TREE_PATCH || patch.type == PatchType.FRUIT_TREE_PATCH || plantable == Plantable.SCARECROW) 3 else 0
+ return@queueScript delayScript(player,anim.duration + delay)
}
- })
+ 1 -> {
+ if (removeItem(player, plantItem)) {
+ if (plantable == Plantable.JUTE_SEED && patch == FarmingPatch.MCGRUBOR_HOPS && !player.achievementDiaryManager.hasCompletedTask(DiaryType.SEERS_VILLAGE, 0, 7)) {
+ player.achievementDiaryManager.finishTask(player, DiaryType.SEERS_VILLAGE, 0, 7)
+ }
+ p.plant(plantable)
+ rewardXP(player, Skills.FARMING, plantable.plantingXP)
+ p.setNewHarvestAmount()
+ if (p.patch.type == PatchType.TREE_PATCH || p.patch.type == PatchType.FRUIT_TREE_PATCH) {
+ addItem(player, Items.PLANT_POT_5350)
+ }
+
+ val itemAmount =
+ if (p.patch.type == PatchType.TREE_PATCH || p.patch.type == PatchType.FRUIT_TREE_PATCH) "the"
+ else if (plantItem.amount == 1) "a"
+ else plantItem.amount
+ val itemName =
+ if (plantItem.amount == 1) plantable.displayName else StringUtils.plusS(
+ plantable.displayName
+ )
+ val patchName = p.patch.type.displayName()
+ if (plantable == Plantable.SCARECROW) {
+ sendMessage(player, "You place the scarecrow in the $patchName.")
+ } else {
+ sendMessage(player, "You plant $itemAmount $itemName in the $patchName.")
+ }
+ }
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
}
}
}
-
return@onUseWith true
}
}
diff --git a/Server/src/main/content/global/skill/farming/timers/CropGrowth.kt b/Server/src/main/content/global/skill/farming/timers/CropGrowth.kt
index ae3765a99..074e5ae43 100644
--- a/Server/src/main/content/global/skill/farming/timers/CropGrowth.kt
+++ b/Server/src/main/content/global/skill/farming/timers/CropGrowth.kt
@@ -58,12 +58,18 @@ class CropGrowth : PersistTimer (500, "farming:crops", isSoft = true) {
for ((_, patch) in patchMap) {
val type = patch.patch.type
val shouldPlayCatchup = !patch.isGrown() || (type == PatchType.BUSH_PATCH && patch.getFruitOrBerryCount() < 4) || (type == PatchType.FRUIT_TREE_PATCH && patch.getFruitOrBerryCount() < 6)
- if(shouldPlayCatchup && patch.plantable != null && !patch.isDead){
- var stagesToSimulate = if (!patch.isGrown()) patch.plantable!!.stages - patch.currentGrowthStage else 0
- if (type == PatchType.BUSH_PATCH)
- stagesToSimulate += Math.min(4, 4 - patch.getFruitOrBerryCount())
- if (type == PatchType.FRUIT_TREE_PATCH)
- stagesToSimulate += Math.min(6, 6 - patch.getFruitOrBerryCount())
+ if (shouldPlayCatchup && !patch.isDead) {
+ var stagesToSimulate = if (!patch.isGrown()) {
+ if (patch.isWeedy() || patch.isEmptyAndWeeded()) patch.currentGrowthStage % 4
+ else patch.plantable!!.stages - patch.currentGrowthStage
+ } else 0
+
+ if (patch.plantable != null) {
+ if (type == PatchType.BUSH_PATCH)
+ stagesToSimulate += Math.min(4, 4 - patch.getFruitOrBerryCount())
+ if (type == PatchType.FRUIT_TREE_PATCH)
+ stagesToSimulate += Math.min(6, 6 - patch.getFruitOrBerryCount())
+ }
val nowTime = System.currentTimeMillis()
var simulatedTime = patch.nextGrowth
@@ -77,8 +83,8 @@ class CropGrowth : PersistTimer (500, "farming:crops", isSoft = true) {
}
}
- fun getPatch(patch: FarmingPatch): Patch {
- return patchMap[patch] ?: (Patch(player,patch).also { patchMap[patch] = it })
+ fun getPatch(patch: FarmingPatch, addPatch: Boolean ): Patch {
+ return patchMap[patch] ?: (Patch(player,patch).also { if (addPatch) patchMap[patch] = it })
}
fun getPatches(): MutableCollection{
diff --git a/Server/src/main/content/global/skill/firemaking/FireMakingPulse.java b/Server/src/main/content/global/skill/firemaking/FireMakingPulse.java
index 50b969efd..7d9f0b35d 100644
--- a/Server/src/main/content/global/skill/firemaking/FireMakingPulse.java
+++ b/Server/src/main/content/global/skill/firemaking/FireMakingPulse.java
@@ -19,6 +19,8 @@ import org.rs09.consts.Items;
import static core.api.ContentAPIKt.inInventory;
import static core.api.ContentAPIKt.replaceSlot;
+import static core.api.ContentAPIKt.removeItem;
+
/**
* Represents the pulse used to light a log.
* @author 'Vexia
@@ -89,9 +91,14 @@ public final class FireMakingPulse extends SkillPulse- {
if (player.getAttribute("remove-log", false)) {
player.removeAttribute("remove-log");
if (inInventory(player, node.getId(), 1)) {
- replaceSlot(player, node.getSlot(), new Item(node.getId(), (node.getAmount() - 1)), node, Container.INVENTORY);
+ //replaceSlot(player, node.getSlot(), new Item(node.getId(), (node.getAmount() - 1)), node, Container.INVENTORY);
+ // Snowscape, remove any item instead of specific slot, and update the grounditem with our new location.
+ removeItem(player, new Item(node.getId(), 1), Container.INVENTORY);
+ this.groundItem = new GroundItem(node, player.getLocation(), player);
GroundItemManager.create(groundItem);
- }
+ } else {
+ return false;
+ }
}
return true;
}
@@ -102,24 +109,28 @@ public final class FireMakingPulse extends SkillPulse
- {
@Override
public boolean reward() {
+ /* Snowscape: this section allows making a new fire without an animation if you're fast enough, but since we auto-repeat we don't need that
if (getLastFire() >= GameWorld.getTicks()) {
createFire();
return true;
}
- if (ticks == 0) {
+ */
+ if (ticks % 5 == 0) {
player.animate(ANIMATION);
}
- if (++ticks % 3 != 0) {
+ if (++ticks % 5 != 0) {
return false;
}
- if (ticks % 12 == 0) {
- player.animate(ANIMATION);
- }
+
if (!success()) {
return false;
}
createFire();
- return true;
+ // Snowscape: return with the remove-log attribute, so the next pulse attempts to remove another log and start over
+ player.setAttribute("remove-log", true);
+ return false;
+
+
}
/**
diff --git a/Server/src/main/content/global/skill/fishing/Fish.kt b/Server/src/main/content/global/skill/fishing/Fish.kt
index 46b73bee2..8ccc67f24 100644
--- a/Server/src/main/content/global/skill/fishing/Fish.kt
+++ b/Server/src/main/content/global/skill/fishing/Fish.kt
@@ -24,7 +24,7 @@ enum class Fish(val id: Int, val level: Int, val experience: Double, val lowChan
LOBSTER(Items.RAW_LOBSTER_377, 40, 90.0, 0.16, 0.375),
BASS(Items.RAW_BASS_363, 46, 100.0, 0.078, 0.16),
SWORDFISH(Items.RAW_SWORDFISH_371, 50, 100.0, 0.105, 0.191),
- LAVA_EEL(Items.RAW_LAVA_EEL_2148, 53, 30.0, 0.227, 0.379),
+ LAVA_EEL(Items.RAW_LAVA_EEL_2148, 53, 60.0, 0.227, 0.379),
MONKFISH(Items.RAW_MONKFISH_7944, 62, 120.0, 0.293, 0.356),
KARAMBWAN(Items.RAW_KARAMBWAN_3142, 65, 105.0, 0.414, 0.629),
SHARK(Items.RAW_SHARK_383, 76, 110.0, 0.121, 0.16),
diff --git a/Server/src/main/content/global/skill/fishing/FishingOption.kt b/Server/src/main/content/global/skill/fishing/FishingOption.kt
index b75ccf9b4..5b304893c 100644
--- a/Server/src/main/content/global/skill/fishing/FishingOption.kt
+++ b/Server/src/main/content/global/skill/fishing/FishingOption.kt
@@ -11,7 +11,7 @@ enum class FishingOption(val tool: Int, val level: Int, val animation: Animation
CRAYFISH_CAGE(Items.CRAYFISH_CAGE_13431, 1, Animation(10009), null, "cage", Fish.CRAYFISH),
SMALL_NET(Items.SMALL_FISHING_NET_303, 1, Animation(621), null, "net", Fish.SHRIMP, Fish.ANCHOVIE),
BAIT(Items.FISHING_ROD_307, 5, Animation(622), intArrayOf(Items.FISHING_BAIT_313), "bait", Fish.SARDINE, Fish.HERRING),
- LURE(Items.FLY_FISHING_ROD_309, 20, Animation(622), intArrayOf(Items.FEATHER_314, Items.STRIPY_FEATHER_10087), "lure", Fish.TROUT, Fish.SALMON, Fish.RAINBOW_FISH),
+ LURE(Items.FLY_FISHING_ROD_309, 20, Animation(622), intArrayOf(Items.FEATHER_314, Items.STRIPY_FEATHER_10087, Items.RED_FEATHER_10088, Items.BLUE_FEATHER_10089, Items.YELLOW_FEATHER_10090, Items.ORANGE_FEATHER_10091), "lure", Fish.TROUT, Fish.SALMON, Fish.RAINBOW_FISH),
PIKE_BAIT(Items.FISHING_ROD_307, 25, Animation(622), intArrayOf(Items.FISHING_BAIT_313), "bait", Fish.PIKE),
LOBSTER_CAGE(Items.LOBSTER_POT_301, 40, Animation(619), null, "cage", Fish.LOBSTER),
HARPOON(Items.HARPOON_311, 35, Animation(618), null, "harpoon", Fish.TUNA, Fish.SWORDFISH),
diff --git a/Server/src/main/content/global/skill/fletching/BoltCreatePlugin.java b/Server/src/main/content/global/skill/fletching/BoltCreatePlugin.java
deleted file mode 100644
index 711e9b626..000000000
--- a/Server/src/main/content/global/skill/fletching/BoltCreatePlugin.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-package core.game.node.entity.skill.fletching;
-
-import core.game.dialogue.SkillDialogueHandler;
-import core.game.dialogue.SkillDialogueHandler.SkillDialogue;
-import core.game.node.entity.skill.fletching.items.bolts.Bolt;
-import core.game.node.entity.skill.fletching.items.bolts.BoltPulse;
-import org.crandor.game.interaction.NodeUsageEvent;
-import org.crandor.game.interaction.UseWithHandler;
-import org.crandor.game.node.entity.player.Player;
-import org.crandor.net.packet.PacketRepository;
-import org.crandor.net.packet.context.ChildPositionContext;
-import org.crandor.net.packet.out.RepositionChild;
-import org.crandor.plugin.InitializablePlugin;
-import org.crandor.plugin.Plugin;
-
-*/
-/**
- * Represents the bolt creating plugin.
- * @author 'Vexia
- * @version 1.0
- *//*
-
-@InitializablePlugin
-public final class BoltCreatePlugin extends UseWithHandler {
-
- */
-/**
- * Constructs a new {@code BoltCreatePlugin} {@code Object}.
- *//*
-
- public BoltCreatePlugin() {
- super(314);
- }
-
- @Override
- public Plugin
newInstance(Object arg) throws Throwable {
- for (Bolt bolt : Bolt.values()) {
- addHandler(bolt.getItem().getId(), ITEM_TYPE, this);
- }
- return this;
- }
-
- @Override
- public boolean handle(final NodeUsageEvent event) {
- final Player player = event.getPlayer();
-
- }
-
-}
-*/
diff --git a/Server/src/main/content/global/skill/fletching/BoltGemPlugin.java b/Server/src/main/content/global/skill/fletching/BoltGemPlugin.java
deleted file mode 100644
index 70c38b30a..000000000
--- a/Server/src/main/content/global/skill/fletching/BoltGemPlugin.java
+++ /dev/null
@@ -1,45 +0,0 @@
-//package core.game.node.entity.skill.fletching;
-//
-//import core.game.dialogue.SkillDialogueHandler;
-//import core.game.dialogue.SkillDialogueHandler.SkillDialogue;
-//import core.game.node.entity.skill.fletching.items.gem.GemBolt;
-//import core.game.node.entity.skill.fletching.items.gem.GemBoltPulse;
-//import org.crandor.game.interaction.NodeUsageEvent;
-//import org.crandor.game.interaction.UseWithHandler;
-//import org.crandor.game.node.entity.player.Player;
-//import org.crandor.net.packet.PacketRepository;
-//import org.crandor.net.packet.context.ChildPositionContext;
-//import org.crandor.net.packet.out.RepositionChild;
-//import org.crandor.plugin.InitializablePlugin;
-//import org.crandor.plugin.Plugin;
-//
-///**
-// * Represents the plugin used to handle gem bolt making.
-// * @author 'Vexia
-// * @version 1.0
-// */
-//@InitializablePlugin
-//public class BoltGemPlugin extends UseWithHandler {
-//
-// /**
-// * Constructs a new {@code BoltGemPlugin} {@code Object}.
-// */
-// public BoltGemPlugin() {
-// super(45, 46, 9187, 9188, 9189, 9190, 9191, 9192, 9193, 9194);
-// }
-//
-// @Override
-// public Plugin newInstance(Object arg) throws Throwable {
-// for (GemBolt bolt : GemBolt.values()) {
-// addHandler(bolt.getBase().getId(), ITEM_TYPE, this);
-// }
-// return this;
-// }
-//
-// @Override
-// public boolean handle(final NodeUsageEvent event) {
-// final Player player = event.getPlayer();
-//
-// }
-//
-//}
diff --git a/Server/src/main/content/global/skill/fletching/DartCreatePlugin.java b/Server/src/main/content/global/skill/fletching/DartCreatePlugin.java
deleted file mode 100644
index c43104095..000000000
--- a/Server/src/main/content/global/skill/fletching/DartCreatePlugin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-package core.game.node.entity.skill.fletching;
-
-import core.game.node.entity.skill.fletching.items.darts.Dart;
-import org.crandor.game.interaction.NodeUsageEvent;
-import org.crandor.game.interaction.UseWithHandler;
-import org.crandor.plugin.InitializablePlugin;
-import org.crandor.plugin.Plugin;
-import core.game.content.quest.touristrap.TouristTrap;
-
-*/
-/**
- * Represents the plugin used to create a dart.
- * @author 'Vexia
- * @version 1.0
- *//*
-
-@InitializablePlugin
-public final class DartCreatePlugin extends UseWithHandler {
-
- */
-/**
- * Constructs a new {@code DartCreatePlugin} {@code Object}.
- *//*
-
- public DartCreatePlugin() {
- super(314);
- }
-
- @Override
- public Plugin newInstance(Object arg) throws Throwable {
- for (Dart dart : Dart.values()) {
- addHandler(dart.getItem().getId(), ITEM_TYPE, this);
- }
- return this;
- }
-
- @Override
- public boolean handle(NodeUsageEvent event) {
- if (event.getPlayer().getQuestRepository().getQuest(TouristTrap.NAME).getStage(event.getPlayer()) < 60) {
- event.getPlayer().getPacketDispatch().sendMessage("You need to start Tourist Trap in order to do this.");
- return true;
- }
- event.getPlayer().getDialogueInterpreter().open(328933, event.getUsedItem(), event.getBaseItem());
- return true;
- }
-
-}
-*/
diff --git a/Server/src/main/content/global/skill/fletching/FletchItem.java b/Server/src/main/content/global/skill/fletching/FletchItem.java
deleted file mode 100644
index fee42d6c1..000000000
--- a/Server/src/main/content/global/skill/fletching/FletchItem.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-package core.game.node.entity.skill.fletching;
-
-import org.crandor.game.node.item.Item;
-
-*/
-/**
- * Represents a fletching item to make.
- * @author 'Vexia
- *//*
-
-public enum FletchItem {
- ARROW_SHAFT(FletchType.LOG, new Item(52, 15), 1, 5), SHORTBOW(FletchType.LOG, new Item(50), 5, 5),
- LONGBOW(FletchType.LOG, new Item(48), 10, 10),
- OAK_SHORTBOW(FletchType.OAK, new Item(54), 20, 16.5),
- OAK_LONGBOW(FletchType.OAK, new Item(56), 25, 25),
- WILLOW_SHORTBOW(FletchType.WILLOW, new Item(60), 35, 33.3),
- WILLOW_LONGBOW(FletchType.WILLOW, new Item(58), 40, 41.5),
- MAPLE_SHORTBOW(FletchType.MAPLE, new Item(64), 50, 50),
- MAPLE_LONGBOW(FletchType.MAPLE, new Item(62), 55, 58.3),
- YEW_SHORTBOW(FletchType.YEW, new Item(68), 65, 55),
- YEW_LONGBOW(FletchType.YEW, new Item(66), 70, 75),
- MAGIC_SHORTBOW(FletchType.MAGIC, new Item(72), 80, 83.3),
- MAGIC_LONGBOW(FletchType.MAGIC, new Item(70), 85, 91.5),
- WOODEN_STOCK(FletchType.LOG, new Item(9440), 9, 6),
- OAK_STOCK(FletchType.OAK, new Item(9442), 24, 16),
- WILLOW_STOCK(FletchType.WILLOW, new Item(9444), 39, 22),
- TEAK_STOCK(FletchType.TEAK, new Item(9446), 46, 27),
- MAPLE_STOCK(FletchType.MAPLE, new Item(9448), 54, 32),
- MAHOGANY_STOCK(FletchType.MAHOGANY, new Item(9450), 61, 41),
- YEW_STOCK(FletchType.YEW, new Item(9452), 69, 50);
-
- */
-/**
- * Constructs a new {@code FletchItem.java} {@code Object}.
- * @param type the type.
- * @param product the product.
- * @param level the level.
- * @param experience the experience.
- *//*
-
- FletchItem(final FletchType type, final Item product, final int level, final double experience) {
- this.type = type;
- this.product = product;
- this.level = level;
- this.experience = experience;
- }
-
- */
-/**
- * Represents the type this item pertaint o.
- *//*
-
- private FletchType type;
-
- */
-/**
- * Represents the product of this item.
- *//*
-
- private Item product;
-
- */
-/**
- * Represents the level.
- *//*
-
- private final int level;
-
- */
-/**
- * Represents the experience.
- *//*
-
- private final double experience;
-
- */
-/**
- * Gets the type.
- * @return The type.
- *//*
-
- public FletchType getType() {
- return type;
- }
-
- */
-/**
- * Sets the type.
- * @param type The type to set.
- *//*
-
- public void setType(FletchType type) {
- this.type = type;
- }
-
- */
-/**
- * Gets the product.
- * @return The product.
- *//*
-
- public Item getProduct() {
- return product;
- }
-
- */
-/**
- * Sets the product.
- * @param product The product to set.
- *//*
-
- public void setProduct(Item product) {
- this.product = product;
- }
-
- */
-/**
- * Gets the level.
- * @return The level.
- *//*
-
- public int getLevel() {
- return level;
- }
-
- */
-/**
- * Gets the experience.
- * @return The experience.
- *//*
-
- public double getExperience() {
- return experience;
- }
-}
-*/
diff --git a/Server/src/main/content/global/skill/fletching/FletchType.java b/Server/src/main/content/global/skill/fletching/FletchType.java
deleted file mode 100644
index 33509c1ab..000000000
--- a/Server/src/main/content/global/skill/fletching/FletchType.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-package core.game.node.entity.skill.fletching;
-
-import org.crandor.game.component.Component;
-import org.crandor.game.node.item.Item;
-
-*/
-/**
- * Represents the multiple fletching types(log types)
- * @author 'Vexia
- *//*
-
-public enum FletchType {
- LOG(new Item(1511), FletchItem.ARROW_SHAFT, FletchItem.SHORTBOW, FletchItem.LONGBOW, FletchItem.WOODEN_STOCK), OAK(new Item(1521), FletchItem.OAK_SHORTBOW, FletchItem.OAK_LONGBOW, FletchItem.OAK_STOCK), WILLOW(new Item(1519), FletchItem.WILLOW_SHORTBOW, FletchItem.WILLOW_LONGBOW, FletchItem.WILLOW_STOCK), MAPLE(new Item(1517), FletchItem.MAPLE_SHORTBOW, FletchItem.MAPLE_LONGBOW, FletchItem.MAPLE_STOCK), TEAK(new Item(6333), FletchItem.TEAK_STOCK), MAHOGANY(new Item(6332), FletchItem.MAHOGANY_STOCK), YEW(new Item(1515), FletchItem.YEW_SHORTBOW, FletchItem.YEW_LONGBOW, FletchItem.YEW_STOCK), MAGIC(new Item(1513), FletchItem.MAGIC_SHORTBOW, FletchItem.MAGIC_LONGBOW);
-
- */
-/**
- * Constructs a new {@code FletchType} {@code Object}.
- * @param log the log.
- * @param items the item.s
- *//*
-
- FletchType(final Item log, final FletchItem... items) {
- this.log = log;
- this.items = items;
- }
-
- */
-/**
- * Represents the log of this type.
- *//*
-
- private final Item log;
-
- */
-/**
- * Represents the fletching items of this type.
- *//*
-
- private FletchItem[] items;
-
- */
-/**
- * Gets the items.
- * @return The items.
- *//*
-
- public FletchItem[] getItems() {
- return items;
- }
-
- */
-/**
- * Gets the log.
- * @return The log.
- *//*
-
- public Item getLog() {
- return log;
- }
-
- */
-/**
- * Method used to get the component based on type.
- * @return the component.
- *//*
-
- public Component getComponent() {
- return items.length > 1 ? new Component(301 + items.length) : new Component(309);
- }
-
- */
-/**
- * Method used to get the FletchType based on the log item.
- * @param item the item.
- * @return the fletch type.
- *//*
-
- public static FletchType forItem(final Item item) {
- for (FletchType type : FletchType.values()) {
- if (type.getLog().getId() == item.getId()) {
- return type;
- }
- }
- return null;
- }
-}
-*/
diff --git a/Server/src/main/content/global/skill/fletching/Fletching.java b/Server/src/main/content/global/skill/fletching/Fletching.java
index 4dea01354..15fda63c1 100644
--- a/Server/src/main/content/global/skill/fletching/Fletching.java
+++ b/Server/src/main/content/global/skill/fletching/Fletching.java
@@ -132,6 +132,7 @@ public class Fletching {
YEW_LONGBOW((byte) 1,66,855,70, 75, new Animation(6688)),
MAGIC_SHORTBOW((byte) 1,72,861,80, 83.3, new Animation(6683)),
MAGIC_LONGBOW((byte) 1,70,859,85, 91.5, new Animation(6689)),
+ OGRE_COMP_BOW((byte) 1,4825,4827,30, 45, new Animation(-1)),
//crossbows
BRONZE_CBOW((byte) 2,9454,9174,9, 6, new Animation(6671)),
@@ -190,13 +191,13 @@ public class Fletching {
}
public enum ArrowHeads {
- BRONZE_ARROW(39, 882, 1, 2.6),
- IRON_ARROW(40, 884, 15, 3.8),
- STEEL_ARROW(41, 886, 30, 6.3),
- MITHRIL_ARROW(42, 888, 45, 8.8),
- ADAMANT_ARROW(43, 890, 60, 11.3),
- RUNE_ARROW(44, 892, 75, 13.8),
- DRAGON_ARROW(11237, 11212, 90, 16.3),
+ BRONZE_ARROW(39, 882, 1, 1.3),
+ IRON_ARROW(40, 884, 15, 2.5),
+ STEEL_ARROW(41, 886, 30, 5),
+ MITHRIL_ARROW(42, 888, 45, 7.5),
+ ADAMANT_ARROW(43, 890, 60, 10),
+ RUNE_ARROW(44, 892, 75, 12.5),
+ DRAGON_ARROW(11237, 11212, 90, 15),
BROAD_ARROW(13278, 4160, 52, 15);
public int unfinished,finished,level;
@@ -265,13 +266,13 @@ public class Fletching {
}
}
private enum Items{
- STANDARD(1511,FletchingItems.ARROW_SHAFT, FletchingItems.SHORT_BOW, FletchingItems.LONG_BOW, FletchingItems.WOODEN_STOCK),
- ACHEY(2862, FletchingItems.OGRE_ARROW_SHAFT),
- OAK(1521, FletchingItems.OAK_SHORTBOW, FletchingItems.OAK_LONGBOW, FletchingItems.OAK_STOCK),
- WILLOW(1519, FletchingItems.WILLOW_SHORTBOW, FletchingItems.WILLOW_LONGBOW, FletchingItems.WILLOW_STOCK),
- MAPLE(1517, FletchingItems.MAPLE_SHORTOW, FletchingItems.MAPLE_LONGBOW, FletchingItems.MAPLE_STOCK),
- YEW(1515, FletchingItems.YEW_SHORTBOW, FletchingItems.YEW_LONGBOW, FletchingItems.YEW_STOCK),
- MAGIC(1513, FletchingItems.MAGIC_SHORTBOW, FletchingItems.MAGIC_LONGBOW),
+ STANDARD(1511, FletchingItems.ARROW_SHAFT, FletchingItems.SHORT_BOW, FletchingItems.LONG_BOW, FletchingItems.WOODEN_STOCK),
+ ACHEY(2862, FletchingItems.OGRE_ARROW_SHAFT, FletchingItems.OGRE_COMP_BOW),
+ OAK(1521, FletchingItems.OAK_ARROW_SHAFT, FletchingItems.OAK_SHORTBOW, FletchingItems.OAK_LONGBOW, FletchingItems.OAK_STOCK),
+ WILLOW(1519, FletchingItems.WILLOW_ARROW_SHAFT, FletchingItems.WILLOW_SHORTBOW, FletchingItems.WILLOW_LONGBOW, FletchingItems.WILLOW_STOCK),
+ MAPLE(1517, FletchingItems.MAPLE_ARROW_SHAFT, FletchingItems.MAPLE_SHORTOW, FletchingItems.MAPLE_LONGBOW, FletchingItems.MAPLE_STOCK),
+ YEW(1515, FletchingItems.YEW_ARROW_SHAFT, FletchingItems.YEW_SHORTBOW, FletchingItems.YEW_LONGBOW, FletchingItems.YEW_STOCK),
+ MAGIC(1513, FletchingItems.MAGIC_ARROW_SHAFT, FletchingItems.MAGIC_SHORTBOW, FletchingItems.MAGIC_LONGBOW),
TEAK(6333, FletchingItems.TEAK_STOCK),
MAHOGANY(6332, FletchingItems.MAHOGANY_STOCK);
@@ -304,28 +305,34 @@ public class Fletching {
//Achey logs
OGRE_ARROW_SHAFT(2864, 6.4, 5, 4),
+ OGRE_COMP_BOW(4825, 45, 30, 1),
//Oak logs
+ OAK_ARROW_SHAFT(52, 10, 15, 30),
OAK_SHORTBOW(54, 16.5, 20, 1),
OAK_LONGBOW(56,25,25,1),
OAK_STOCK(9442, 16, 24, 1),
//Willow logs
+ WILLOW_ARROW_SHAFT(52, 15, 30, 45),
WILLOW_SHORTBOW(60, 33.3, 35, 1),
WILLOW_LONGBOW(58, 41.5, 40, 1),
WILLOW_STOCK(9444, 22, 39, 1),
//Maple logs
+ MAPLE_ARROW_SHAFT(52, 20, 45, 60),
MAPLE_SHORTOW(64, 50, 50, 1),
MAPLE_LONGBOW(62, 58.3, 55, 1),
MAPLE_STOCK(9448, 32, 54, 1),
//Yew logs
+ YEW_ARROW_SHAFT(52, 25, 60, 75),
YEW_SHORTBOW(68, 67.5, 65, 1),
YEW_LONGBOW(66, 75, 70, 1),
YEW_STOCK(9452, 50, 69, 1),
//Magic logs
+ MAGIC_ARROW_SHAFT(52, 30, 75, 90),
MAGIC_SHORTBOW(72, 83.3, 80,1),
MAGIC_LONGBOW(70, 91.5, 85, 1),
diff --git a/Server/src/main/content/global/skill/fletching/FletchingListeners.kt b/Server/src/main/content/global/skill/fletching/FletchingListeners.kt
index 54ac72b5d..464a0b6ff 100644
--- a/Server/src/main/content/global/skill/fletching/FletchingListeners.kt
+++ b/Server/src/main/content/global/skill/fletching/FletchingListeners.kt
@@ -1,11 +1,13 @@
package content.global.skill.fletching
-import core.game.node.entity.skill.Skills
-import content.global.skill.fletching.Fletching
+import content.data.Quests
import content.global.skill.fletching.items.arrow.ArrowHeadPulse
import content.global.skill.fletching.items.arrow.HeadlessArrowPulse
+import content.global.skill.fletching.items.arrow.HeadlessOgreArrowPulse
import content.global.skill.fletching.items.bow.StringPulse
import content.global.skill.fletching.items.crossbow.LimbPulse
+import core.api.*
+import core.game.node.entity.skill.Skills
import core.game.node.item.Item
import core.net.packet.PacketRepository
import core.net.packet.context.ChildPositionContext
@@ -21,6 +23,7 @@ import org.rs09.consts.Items.YELLOW_FEATHER_10090
import core.game.dialogue.SkillDialogueHandler
import core.game.interaction.InteractionListener
import core.game.interaction.IntType
+import core.game.node.entity.player.Player
class FletchingListeners : InteractionListener {
@@ -32,7 +35,9 @@ class FletchingListeners : InteractionListener {
val MITH_GRAPPLE = Items.MITH_GRAPPLE_9418
val ROPE_GRAPPLE = Items.MITH_GRAPPLE_9419
val ARROW_SHAFT = Items.ARROW_SHAFT_52
+ val OGRE_ARROW_SHAFT = Items.OGRE_ARROW_SHAFT_2864
val FLETCHED_SHAFT = Items.HEADLESS_ARROW_53
+ val FLIGHTED_OGRE_ARROW = Items.FLIGHTED_OGRE_ARROW_2865
val UNFINISHED_ARROWS = Fletching.ArrowHeads.values().map(Fletching.ArrowHeads::unfinished).toIntArray()
val FEATHERS = intArrayOf(FEATHER_314,STRIPY_FEATHER_10087,RED_FEATHER_10088,BLUE_FEATHER_10089,YELLOW_FEATHER_10090,ORANGE_FEATHER_10091)
val UNSTRUNG_BOWS = Fletching.String.values().map(Fletching.String::unfinished).toIntArray()
@@ -42,6 +47,14 @@ class FletchingListeners : InteractionListener {
onUseWith(IntType.ITEM,STRINGS,*UNSTRUNG_BOWS){ player, string, bow ->
val enum = Fletching.stringMap[bow.id] ?: return@onUseWith false
+
+ if (bow.id == Items.UNSTRUNG_COMP_BOW_4825) {
+ // You shouldn't be able to string a bow
+ if (getQuestStage(player, Quests.ZOGRE_FLESH_EATERS) < 8) {
+ player.packetDispatch.sendMessage("You must have started Zogre Flesh Eaters and asked Grish to string this.")
+ return@onUseWith true
+ }
+ }
if(enum.string != string.id){
player.sendMessage("That's not the right kind of string for this.")
return@onUseWith true
@@ -76,6 +89,21 @@ class FletchingListeners : InteractionListener {
return@onUseWith true
}
+ onUseWith(IntType.ITEM,OGRE_ARROW_SHAFT,*FEATHERS){ player, shaft, feather ->
+ val handler: SkillDialogueHandler =
+ object : SkillDialogueHandler(player, SkillDialogue.MAKE_SET_ONE_OPTION, Item(FLIGHTED_OGRE_ARROW)) {
+ override fun create(amount: Int, index: Int) {
+ player.pulseManager.run(HeadlessOgreArrowPulse(player, shaft.asItem(), Item(feather.id, 4), amount))
+ }
+
+ override fun getAll(index: Int): Int {
+ return player.inventory.getAmount(FLIGHTED_OGRE_ARROW)
+ }
+ }
+ handler.open()
+ return@onUseWith true
+ }
+
onUseWith(IntType.ITEM,FLETCHED_SHAFT,*UNFINISHED_ARROWS){ player, shaft, unfinished ->
val head = Fletching.arrowHeadMap[unfinished.id] ?: return@onUseWith false
val handler: SkillDialogueHandler =
@@ -134,6 +162,36 @@ class FletchingListeners : InteractionListener {
return@onUseWith true
}
+ /**
+ * (Long) Kebbit bolts don't need feathers and go 6 at a time so use their own interaction
+ */
+ fun makeKebbitBolt(player : Player, ingredient : Item) : Boolean{
+ val longBolts = when(ingredient.id){
+ Items.KEBBIT_SPIKE_10105 -> false
+ Items.LONG_KEBBIT_SPIKE_10107 -> true
+ else -> return false
+ }
+ val level = if(longBolts) 42 else 26
+ if (getDynLevel(player, Skills.FLETCHING) < level){
+ sendMessage(player, "You need a fletching level of $level to create ${if (longBolts) "long " else ""}kebbit bolts.")
+ return true
+ }
+ val finalProduct = if(longBolts) Items.LONG_KEBBIT_BOLTS_10159 else Items.KEBBIT_BOLTS_10158
+ val xp = if(longBolts) 47.7 else 28.6 // source https://runescape.wiki/w/Fletching?oldid=1069981#Bolts_2
+ if(removeItem(player, ingredient.id)){
+ addItem(player, finalProduct, 6)
+ player.skills.addExperience(Skills.FLETCHING, xp)
+ animate(player, 885)
+ }
+ return true
+ }
+ onUseWith(IntType.ITEM, Items.CHISEL_1755, Items.KEBBIT_SPIKE_10105) { player, used, with ->
+ return@onUseWith makeKebbitBolt(player, with as Item)
+ }
+
+ onUseWith(IntType.ITEM, Items.CHISEL_1755, Items.LONG_KEBBIT_SPIKE_10107) { player, used, with ->
+ return@onUseWith makeKebbitBolt(player, with as Item)
+ }
}
}
\ No newline at end of file
diff --git a/Server/src/main/content/global/skill/fletching/FletchingPulse.java b/Server/src/main/content/global/skill/fletching/FletchingPulse.java
index 9c7d0d638..54219541e 100644
--- a/Server/src/main/content/global/skill/fletching/FletchingPulse.java
+++ b/Server/src/main/content/global/skill/fletching/FletchingPulse.java
@@ -9,6 +9,7 @@ import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.game.world.update.flag.context.Animation;
import core.tools.StringUtils;
+import content.data.Quests;
/**
* fletching skill pulse
@@ -36,6 +37,11 @@ public final class FletchingPulse extends SkillPulse- {
*/
private int amount = 0;
+ /**
+ * Represents the amount to arrows fletched (for ogre arrow shafts which is a random number from 2-6).
+ */
+ private int finalAmount = 0;
+
/**
* Constructs a new {@code FletchingPulse.java} {@code Object}.
* @param player
@@ -57,11 +63,22 @@ public final class FletchingPulse extends SkillPulse
- {
amount = player.getInventory().getAmount(node);
}
if (fletch == Fletching.FletchingItems.OGRE_ARROW_SHAFT) {
- if (player.getQuestRepository().getQuest("Big Chompy Bird Hunting").getStage(player) == 0) {
+ if (player.getQuestRepository().getQuest(Quests.BIG_CHOMPY_BIRD_HUNTING).getStage(player) == 0) {
player.getPacketDispatch().sendMessage("You must have started Big Chompy Bird Hunting to make those.");
return false;
}
}
+ if (fletch == Fletching.FletchingItems.OGRE_COMP_BOW) {
+ // Technically, this isn't supposed to show up till you've asked Grish.
+ if (player.getQuestRepository().getQuest(Quests.ZOGRE_FLESH_EATERS).getStage(player) < 8) {
+ player.getPacketDispatch().sendMessage("You must have started Zogre Flesh Eaters and asked Grish to make this.");
+ return false;
+ }
+ if (!player.getInventory().contains(2859, 1)) {
+ player.getPacketDispatch().sendMessage("You need to have Wolf Bones in order to make this.");
+ return false;
+ }
+ }
return true;
}
@@ -82,9 +99,18 @@ public final class FletchingPulse extends SkillPulse
- {
if (player.getInventory().remove(node)) {
final Item item = new Item(fletch.id,fletch.amount);
if ( fletch == Fletching.FletchingItems.OGRE_ARROW_SHAFT ) {
- item.setAmount(RandomFunction.random(3,6));
+ // The amount of shafts given is random; between two and six will be made.
+ finalAmount = RandomFunction.random(2,6);
+ item.setAmount(finalAmount);
}
- player.getInventory().add(item);
+ if ( fletch == Fletching.FletchingItems.OGRE_COMP_BOW ) {
+ if (!player.getInventory().contains(2859, 1)) {
+ return false;
+ } else {
+ player.getInventory().remove(new Item(2859));
+ }
+ }
+ player.getInventory().add(item);
player.getSkills().addExperience(Skills.FLETCHING, fletch.experience, true);
String message = getMessage();
player.getPacketDispatch().sendMessage(message);
@@ -110,6 +136,18 @@ public final class FletchingPulse extends SkillPulse
- {
switch (fletch) {
case ARROW_SHAFT:
return "You carefully cut the wood into 15 arrow shafts.";
+ case OAK_ARROW_SHAFT:
+ return "You carefully cut the wood into 30 arrow shafts.";
+ case WILLOW_ARROW_SHAFT:
+ return "You carefully cut the wood into 45 arrow shafts.";
+ case MAPLE_ARROW_SHAFT:
+ return "You carefully cut the wood into 60 arrow shafts.";
+ case YEW_ARROW_SHAFT:
+ return "You carefully cut the wood into 75 arrow shafts.";
+ case MAGIC_ARROW_SHAFT:
+ return "You carefully cut the wood into 90 arrow shafts.";
+ case OGRE_ARROW_SHAFT:
+ return "You carefully cut the wood into " + finalAmount + " arrow shafts.";
default:
return "You carefully cut the wood into " + (StringUtils.isPlusN(fletch.getItem().getName()) ? "an" : "a") + " " + fletch.getItem().getName().replace("(u)", "").trim() + ".";
}
diff --git a/Server/src/main/content/global/skill/fletching/items/arrow/HeadlessOgreArrowPulse.java b/Server/src/main/content/global/skill/fletching/items/arrow/HeadlessOgreArrowPulse.java
new file mode 100644
index 000000000..fd7af6731
--- /dev/null
+++ b/Server/src/main/content/global/skill/fletching/items/arrow/HeadlessOgreArrowPulse.java
@@ -0,0 +1,131 @@
+package content.global.skill.fletching.items.arrow;
+
+import core.game.node.entity.player.Player;
+import core.game.node.entity.skill.SkillPulse;
+import core.game.node.entity.skill.Skills;
+import core.game.node.item.Item;
+import org.rs09.consts.Items;
+
+import static core.api.ContentAPIKt.hasSpaceFor;
+import static core.api.ContentAPIKt.sendDialogue;
+
+/**
+ * Represents the arrow pulse for creating unfinished ogre arrows.
+ * @author 'Vexia
+ */
+public final class HeadlessOgreArrowPulse extends SkillPulse
- {
+
+ /**
+ * Represents the headless ogre arrow item.
+ */
+ private final Item HEADLESS_ARROW = new Item(Items.FLIGHTED_OGRE_ARROW_2865);
+
+ /**
+ * Represents the ogre arrow shaft item.
+ */
+ private final Item ARROW_SHAFT = new Item(Items.OGRE_ARROW_SHAFT_2864);
+
+ /**
+ * Represents the feather items.
+ */
+ private static final Item[] FEATHER = new Item[] {
+ new Item(Items.FEATHER_314, 4),
+ };
+
+ /**
+ * The feather being used.
+ */
+ private Item feather;
+
+ /**
+ * Represents the amount to make.
+ */
+ private int sets;
+
+ /**
+ * Constructs a new {@code ArrowPulse.java} {@code Object}.
+ * @param player the player.
+ * @param node the node.
+ */
+ public HeadlessOgreArrowPulse(Player player, Item node, Item feather, int sets) {
+ super(player, node);
+ this.sets = sets;
+ this.feather = feather;
+ }
+
+ @Override
+ public boolean checkRequirements() {
+ if (!player.getInventory().containsItem(ARROW_SHAFT)) {
+ player.getDialogueInterpreter().sendDialogue("You don't have any arrow shafts.");
+ return false;
+ }
+ if (feather == null || !player.getInventory().containsItem(feather)) {
+ player.getDialogueInterpreter().sendDialogue("You don't have any feathers.");
+ return false;
+ }
+ if (!hasSpaceFor(player, HEADLESS_ARROW.asItem())) {
+ sendDialogue(player, "You do not have enough inventory space.");
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public void animate() {
+ }
+
+ @Override
+ public boolean reward() {
+ int featherAmount = player.getInventory().getAmount(feather);
+ int shaftAmount = player.getInventory().getAmount(ARROW_SHAFT);
+ if (getDelay() == 1) {
+ super.setDelay(3);
+ }
+ if (featherAmount >= 24 && shaftAmount >= 6) {
+ feather.setAmount(24);
+ ARROW_SHAFT.setAmount(6);
+ player.getPacketDispatch().sendMessage("You attach 24 feathers to 6 ogre arrow shafts.");
+ } else {
+ int amount = Math.min(featherAmount / 4, shaftAmount);
+ feather.setAmount(amount*4);
+ ARROW_SHAFT.setAmount(amount);
+ player.getPacketDispatch().sendMessage(amount == 1
+ ? "You attach a feathers to a shaft." : "You attach " + amount * 4 + " feathers to " + amount + " ogre arrow shafts.");
+ }
+ if (player.getInventory().remove(feather, ARROW_SHAFT)) {
+ HEADLESS_ARROW.setAmount(ARROW_SHAFT.getAmount());
+ player.getSkills().addExperience(Skills.FLETCHING, HEADLESS_ARROW.getAmount(), true);
+ player.getInventory().add(HEADLESS_ARROW);
+ }
+ HEADLESS_ARROW.setAmount(1);
+ feather.setAmount(1);
+ ARROW_SHAFT.setAmount(1);
+ if (!player.getInventory().containsItem(ARROW_SHAFT)) {
+ return true;
+ }
+ if (!player.getInventory().containsItem(feather)) {
+ return true;
+ }
+ sets--;
+ return sets <= 0;
+ }
+
+ @Override
+ public void message(int type) {
+ }
+
+ /**
+ * Gets the feather item.
+ * @return the item.
+ */
+ private Item getFeather() {
+ int length = FEATHER.length;
+ for (int i = 0; i < length; i++) {
+ Item f = FEATHER[i];
+ if (player.getInventory().containsItem(f)) {
+ return f;
+ }
+ }
+ return null;
+ }
+}
diff --git a/Server/src/main/content/global/skill/fletching/items/bow/StringPulse.java b/Server/src/main/content/global/skill/fletching/items/bow/StringPulse.java
index fd1b2c560..0d8645e44 100644
--- a/Server/src/main/content/global/skill/fletching/items/bow/StringPulse.java
+++ b/Server/src/main/content/global/skill/fletching/items/bow/StringPulse.java
@@ -1,7 +1,7 @@
package content.global.skill.fletching.items.bow;
-import core.api.Container;
-import core.api.ContentAPIKt;
+import core.game.node.entity.player.info.LogType;
+import core.game.node.entity.player.info.PlayerMonitor;
import core.game.node.entity.player.link.diary.DiaryType;
import core.game.world.map.zone.ZoneBorders;
import core.game.node.entity.skill.SkillPulse;
@@ -10,6 +10,8 @@ import content.global.skill.fletching.Fletching;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
+import static core.api.ContentAPIKt.amountInInventory;
+
/**
* Represents the skill pulse of stringing.
*
@@ -27,6 +29,9 @@ public class StringPulse extends SkillPulse
- {
*/
private int amount;
+ private int initialAmount;
+ private int processedAmount;
+
/**
* Constructs a new {@code StringbowPlugin.java} {@code Object}.
*
@@ -37,6 +42,8 @@ public class StringPulse extends SkillPulse
- {
super(player, node);
this.bow = bow;
this.amount = amount;
+ this.initialAmount = amountInInventory(player, node.getId());
+ this.processedAmount = 0;
}
@Override
@@ -70,6 +77,10 @@ public class StringPulse extends SkillPulse
- {
player.getInventory().add(new Item(bow.product));
player.getSkills().addExperience(Skills.FLETCHING, bow.experience, true);
player.getPacketDispatch().sendMessage("You add a string to the bow.");
+ processedAmount++;
+ if (processedAmount > initialAmount) {
+ PlayerMonitor.log(player, LogType.DUPE_ALERT, "fletched item (" + player.getName() + ", " + bow.unfinished + "): initialAmount " + initialAmount + ", processedAmount " + processedAmount);
+ }
if (bow == Fletching.String.MAGIC_SHORTBOW
&& (new ZoneBorders(2721, 3489, 2724, 3493, 0).insideBorder(player)
diff --git a/Server/src/main/content/global/skill/fletching/items/darts/DartPulse.java b/Server/src/main/content/global/skill/fletching/items/darts/DartPulse.java
index 6f21ba8d7..d65fac185 100644
--- a/Server/src/main/content/global/skill/fletching/items/darts/DartPulse.java
+++ b/Server/src/main/content/global/skill/fletching/items/darts/DartPulse.java
@@ -7,6 +7,7 @@ import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import static core.api.ContentAPIKt.*;
+import content.data.Quests;
/**
* Represents the dart pulse.
@@ -46,7 +47,7 @@ public final class DartPulse extends SkillPulse
- {
player.getDialogueInterpreter().sendDialogue("You need a fletching level of " + dart.level + " to do this.");
return false;
}
- if (!player.getQuestRepository().isComplete("The Tourist Trap")){
+ if (!player.getQuestRepository().isComplete(Quests.THE_TOURIST_TRAP)){
player.getDialogueInterpreter().sendDialogue("You need to have completed Tourist Trap to fletch darts.");
return false;
}
diff --git a/Server/src/main/content/global/skill/gather/SkillingResource.java b/Server/src/main/content/global/skill/gather/SkillingResource.java
index 178f6679b..2d2b43e65 100644
--- a/Server/src/main/content/global/skill/gather/SkillingResource.java
+++ b/Server/src/main/content/global/skill/gather/SkillingResource.java
@@ -612,9 +612,6 @@ public enum SkillingResource {
*/
RUNITE_ORE_0(2107, 85, 0.95, 1250 | 2500 << 16, 125.0, 451, 1, "runite rocks", null, 452, Skills.MINING),
RUNITE_ORE_1(2106, 85, 0.95, 1250 | 2500 << 16, 125.0, 451, 1, "runite rocks", null, 450, Skills.MINING),
- RUNITE_ORE_2(6669, 85, 0.95, 1250 | 2500 << 16, 125.0, 451, 1, "runite rocks", null, 21296, Skills.MINING),
- RUNITE_ORE_3(6671, 85, 0.95, 1250 | 2500 << 16, 125.0, 451, 1, "runite rocks", null, 21298, Skills.MINING),
- RUNITE_ORE_4(6670, 85, 0.95, 1250 | 2500 << 16, 125.0, 451, 1, "runite rocks", null, 21297, Skills.MINING),
RUNITE_ORE_5(14861, 85, 0.95, 1250 | 2500 << 16, 125.0, 451, 1, "runite rocks", null, 25373, Skills.MINING),
RUNITE_ORE_6(14860, 85, 0.95, 1250 | 2500 << 16, 125.0, 451, 1, "runite rocks", null, 25372, Skills.MINING),
RUNITE_ORE_7(14859, 85, 0.95, 1250 | 2500 << 16, 125.0, 451, 1, "runite rocks", null, 25371, Skills.MINING),
@@ -632,7 +629,15 @@ public enum SkillingResource {
*/
GEM_ROCK_0(23567, 40, 0.95, 166 | 175 << 16, 65, 1625, 1, "gem rocks", null, 21297, Skills.MINING),
GEM_ROCK_1(23566, 40, 0.95, 166 | 175 << 16, 65, 1625, 1, "gem rocks", null, 21296, Skills.MINING),
- GEM_ROCK_2(23568, 40, 0.95, 166 | 175 << 16, 65, 1625, 1, "gem rocks", null, 21298, Skills.MINING);
+ GEM_ROCK_2(23568, 40, 0.95, 166 | 175 << 16, 65, 1625, 1, "gem rocks", null, 21298, Skills.MINING),
+
+ /**
+ * Magic stone.
+ */
+ MAGIC_STONE_0(6669, 20, 0.3, 100 | 200 << 16, 0.0, 4703, 1, "magic stone", null, 21296, Skills.MINING),
+ MAGIC_STONE_1(6671, 20, 0.3, 100 | 200 << 16, 0.0, 4703, 1, "magic stone", null, 21298, Skills.MINING),
+ MAGIC_STONE_2(6670, 20, 0.3, 100 | 200 << 16, 0.0, 4703, 1, "magic stone", null, 21297, Skills.MINING);
+
/**
* The resources mapping.
diff --git a/Server/src/main/content/global/skill/gather/fishing/barbfishing/BarbFishingPulse.kt b/Server/src/main/content/global/skill/gather/fishing/barbfishing/BarbFishingPulse.kt
index 2a66a2f1f..a44387209 100644
--- a/Server/src/main/content/global/skill/gather/fishing/barbfishing/BarbFishingPulse.kt
+++ b/Server/src/main/content/global/skill/gather/fishing/barbfishing/BarbFishingPulse.kt
@@ -48,6 +48,10 @@ class BarbFishingPulse(player: Player) : SkillPulse
(player,NPC(1176)) {
}
override fun reward(): Boolean {
+ if (delay == 1){
+ super.setDelay(5)
+ return false
+ }
val stragiXP = arrayOf(5,6,7)
val fishXP = arrayOf(50,70,80)
val reward = getRandomFish()
diff --git a/Server/src/main/content/global/skill/gather/mining/MiningListener.kt b/Server/src/main/content/global/skill/gather/mining/MiningListener.kt
index d744b0a8f..1c46081a4 100644
--- a/Server/src/main/content/global/skill/gather/mining/MiningListener.kt
+++ b/Server/src/main/content/global/skill/gather/mining/MiningListener.kt
@@ -106,10 +106,9 @@ class MiningListener : InteractionListener {
}
// Give the mining reward, increment 'rocks mined' attribute
- if(addItem(player, reward, rewardAmount)) {
- var rocksMined = getAttribute(player, "$STATS_BASE:$STATS_ROCKS", 0)
- setAttribute(player, "/save:$STATS_BASE:$STATS_ROCKS", ++rocksMined)
- }
+ addItemOrDrop(player, reward, rewardAmount)
+ var rocksMined = getAttribute(player, "$STATS_BASE:$STATS_ROCKS", 0)
+ setAttribute(player, "/save:$STATS_BASE:$STATS_ROCKS", rocksMined + rewardAmount)
// Calculate bonus gem chance while mining
if (!isEssence) {
@@ -136,7 +135,7 @@ class MiningListener : InteractionListener {
}
// Transform ore to depleted version
- if (!isEssence && resource!!.respawnRate != 0) {
+ if (!isEssence && resource!!.respawnRate != 0 && RandomFunction.roll(getDynLevel(player, Skills.MINING)*5/resource!!.respawnDuration + 1)) {
SceneryBuilder.replace(node as Scenery, Scenery(resource!!.emptyId, node.getLocation(), node.type, node.rotation), resource!!.respawnDuration)
node.setActive(false)
return true
diff --git a/Server/src/main/content/global/skill/gather/mining/MiningNode.java b/Server/src/main/content/global/skill/gather/mining/MiningNode.java
index 5f7f00cf3..d403ae49b 100644
--- a/Server/src/main/content/global/skill/gather/mining/MiningNode.java
+++ b/Server/src/main/content/global/skill/gather/mining/MiningNode.java
@@ -403,9 +403,6 @@ public enum MiningNode{
//Runite
RUNITE_ORE_0( 2107, 452, (byte) 12),
RUNITE_ORE_1( 2106, 450, (byte) 12),
- RUNITE_ORE_2( 6669, 21296, (byte) 12),
- RUNITE_ORE_3( 6671, 21298, (byte) 12),
- RUNITE_ORE_4( 6670, 21297, (byte) 12),
RUNITE_ORE_5( 14861,25373, (byte) 12),
RUNITE_ORE_6( 14860,25372, (byte) 12),
RUNITE_ORE_7( 14859,25371, (byte) 12),
@@ -437,8 +434,14 @@ public enum MiningNode{
GRANITE(10947,10945, (byte) 16),
//Rubium?
- RUBIUM(29746,29747, (byte) 17);
+ RUBIUM(29746,29747, (byte) 17),
+ //Magic stone (Tears of Guthix)
+ MAGIC_STONE_0( 6669, 21296, (byte) 18), // Was mistaken for RUNITE_ORE_2
+ MAGIC_STONE_1( 6671, 21298, (byte) 18), // Was mistaken for RUNITE_ORE_3
+ MAGIC_STONE_2( 6670, 21297, (byte) 18), // Was mistaken for RUNITE_ORE_4
+
+ ;
public static List gemRockGems = new ArrayList<>(20);
@@ -522,21 +525,21 @@ public enum MiningNode{
experience = 80.0;
rate = 0.70;
reward = 447;
- level = 55;
+ level = 50;
break;
case 11:
respawnRate = 400 | 800 << 16;
experience = 95.0;
rate = 0.85;
reward = 449;
- level = 70;
+ level = 60;
break;
case 12:
respawnRate = 1250 | 2500 << 16;
experience = 125.0;
rate = 0.95;
reward = 451;
- level = 85;
+ level = 70;
break;
case 13:
respawnRate = 166 | 175 << 16;
@@ -573,6 +576,13 @@ public enum MiningNode{
reward = 12630;
level = 46;
break;
+ case 18:
+ respawnRate = 100 | 200 << 16;
+ experience = 0.0;
+ rate = 0.3;
+ reward = 4703;
+ level = 20;
+ break;
}
}
private static HashMap NODE_MAP = new HashMap<>();
diff --git a/Server/src/main/content/global/skill/gather/mining/MiningSkillPulse.kt b/Server/src/main/content/global/skill/gather/mining/MiningSkillPulse.kt
index aa7ef70e6..58464672e 100644
--- a/Server/src/main/content/global/skill/gather/mining/MiningSkillPulse.kt
+++ b/Server/src/main/content/global/skill/gather/mining/MiningSkillPulse.kt
@@ -11,6 +11,7 @@ import core.game.node.entity.player.Player
import core.game.node.entity.player.link.diary.DiaryType
import core.game.node.entity.skill.Skills
import content.data.skill.SkillingTool
+import content.global.activity.shootingstar.StarBonus
import content.global.skill.skillcapeperks.SkillcapePerks
import core.game.node.item.ChanceItem
import core.game.node.scenery.Scenery
@@ -164,10 +165,9 @@ class MiningSkillPulse(private val player: Player, private val node: Node) : Pul
}
// Give the mining reward, increment 'rocks mined' attribute
- if(addItem(player, reward, rewardAmount)) {
- var rocksMined = getAttribute(player, "$STATS_BASE:$STATS_ROCKS", 0)
- setAttribute(player, "/save:$STATS_BASE:$STATS_ROCKS", ++rocksMined)
- }
+ addItemOrDrop(player, reward, rewardAmount)
+ var rocksMined = getAttribute(player, "$STATS_BASE:$STATS_ROCKS", 0)
+ setAttribute(player, "/save:$STATS_BASE:$STATS_ROCKS", rocksMined + rewardAmount)
// Calculate bonus gem chance while mining
if (!isMiningEssence) {
@@ -225,7 +225,7 @@ class MiningSkillPulse(private val player: Player, private val node: Node) : Pul
}
// If player has mining boost from Shooting Star, roll chance at extra ore
- if (player.hasActiveState("shooting-star")) {
+ if (hasTimerActive(player)) {
if (RandomFunction.getRandom(5) == 3) {
sendMessage(player, "...you manage to mine a second ore thanks to the Star Sprite.")
amount += 1
diff --git a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt
index c73b135b6..4ca385088 100644
--- a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt
+++ b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt
@@ -156,7 +156,7 @@ class WoodcuttingListener : InteractionListener {
//OSRS: https://oldschool.runescape.wiki/w/Woodcutting scroll down to the mechanics section
//RS3 : https://runescape.wiki/w/Woodcutting scroll down to the mechanics section, and expand the tree felling chances table
if (resource.getRespawnRate() > 0) {
- if (RandomFunction.roll(8) || listOf(1, 2, 3, 4, 6).contains(resource.identifier.toInt())){
+ if (RandomFunction.roll(8) || listOf(2, 3, 4, 6).contains(resource.identifier.toInt())){
if (resource.isFarming()) {
val fPatch = forObject(node.asScenery())
if (fPatch != null) {
diff --git a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingSkillPulse.java b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingSkillPulse.java
index 70bd09d38..bdb54f1fe 100644
--- a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingSkillPulse.java
+++ b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingSkillPulse.java
@@ -204,7 +204,7 @@ public class WoodcuttingSkillPulse extends Pulse {
if (resource.isFarming()) {
FarmingPatch fPatch = FarmingPatch.forObject(node.asScenery());
if(fPatch != null) {
- Patch patch = fPatch.getPatchFor(player);
+ Patch patch = fPatch.getPatchFor(player, true);
patch.setCurrentState(patch.getCurrentState() + 1);
}
return true;
diff --git a/Server/src/main/content/global/skill/herblore/FinishedPotion.java b/Server/src/main/content/global/skill/herblore/FinishedPotion.java
index e78d80432..38a71f84d 100644
--- a/Server/src/main/content/global/skill/herblore/FinishedPotion.java
+++ b/Server/src/main/content/global/skill/herblore/FinishedPotion.java
@@ -8,34 +8,34 @@ import org.rs09.consts.Items;
* @author 'Vexia
*/
public enum FinishedPotion {
- ATTACK_POTION(UnfinishedPotion.GUAM, new Item(221), 3, 25, new Item(121)),
- ANTIPOISON_POTION(UnfinishedPotion.MARRENTILL, new Item(235), 5, 37.5, new Item(175)),
- STRENGTH_POTION(UnfinishedPotion.TARROMIN, new Item(225), 12, 50, new Item(115)),
- RESTORE_POTION(UnfinishedPotion.HARRALANDER, new Item(223), 22, 62.5, new Item(127)),
- ENERGY_POTION(UnfinishedPotion.HARRALANDER, new Item(1975), 26, 67.5, new Item(3010)),
- DEFENCE_POTION(UnfinishedPotion.RANARR, new Item(239), 30, 45, new Item(133)),
- AGILITY_POTION(UnfinishedPotion.TOADFLAX, new Item(2152), 34, 80, new Item(3034)),
- COMBAT_POTION(UnfinishedPotion.HARRALANDER, new Item(9736), 36, 84, new Item(9741)),
- PRAYER_POTION(UnfinishedPotion.RANARR, new Item(231), 38, 87.5, new Item(139)),
- SUMMONING_POTION(UnfinishedPotion.SPIRIT_WEED, new Item(12109), 40, 92, new Item(12142)),
- SUPER_ATTACK(UnfinishedPotion.IRIT, new Item(221), 45, 100, new Item(145)),
- SUPER_ANTIPOISON(UnfinishedPotion.IRIT, new Item(235), 48, 106.3, new Item(181)),
- FISHING_POTION(UnfinishedPotion.AVANTOE, new Item(231), 50, 112.5, new Item(151)),
- SUPER_ENERGY(UnfinishedPotion.AVANTOE, new Item(2970), 52, 117.5, new Item(3018)),
- HUNTING_POTION(UnfinishedPotion.AVANTOE, new Item(Items.KEBBIT_TEETH_DUST_10111), 53, 120, new Item(10000)),
- SUPER_STRENGTH(UnfinishedPotion.KWUARM, new Item(225), 55, 125, new Item(157)),
+ ATTACK_POTION(UnfinishedPotion.GUAM, new Item(221), 3, 25, new Item(2428)),
+ ANTIPOISON_POTION(UnfinishedPotion.MARRENTILL, new Item(235), 5, 37.5, new Item(2446)),
+ STRENGTH_POTION(UnfinishedPotion.TARROMIN, new Item(225), 12, 50, new Item(113)),
+ RESTORE_POTION(UnfinishedPotion.HARRALANDER, new Item(223), 22, 62.5, new Item(2430)),
+ ENERGY_POTION(UnfinishedPotion.HARRALANDER, new Item(1975), 26, 67.5, new Item(3008)),
+ DEFENCE_POTION(UnfinishedPotion.RANARR, new Item(239), 30, 45, new Item(2432)),
+ AGILITY_POTION(UnfinishedPotion.TOADFLAX, new Item(2152), 34, 80, new Item(3032)),
+ COMBAT_POTION(UnfinishedPotion.HARRALANDER, new Item(9736), 36, 84, new Item(9739)),
+ PRAYER_POTION(UnfinishedPotion.RANARR, new Item(231), 38, 87.5, new Item(2434)),
+ SUMMONING_POTION(UnfinishedPotion.SPIRIT_WEED, new Item(12109), 40, 92, new Item(12140)),
+ SUPER_ATTACK(UnfinishedPotion.IRIT, new Item(221), 45, 100, new Item(2436)),
+ SUPER_ANTIPOISON(UnfinishedPotion.IRIT, new Item(235), 48, 106.3, new Item(2448)),
+ FISHING_POTION(UnfinishedPotion.AVANTOE, new Item(231), 50, 112.5, new Item(2438)),
+ SUPER_ENERGY(UnfinishedPotion.AVANTOE, new Item(2970), 52, 117.5, new Item(3016)),
+ HUNTING_POTION(UnfinishedPotion.AVANTOE, new Item(Items.KEBBIT_TEETH_DUST_10111), 53, 120, new Item(9998)),
+ SUPER_STRENGTH(UnfinishedPotion.KWUARM, new Item(225), 55, 125, new Item(2440)),
WEAPON_POISON(UnfinishedPotion.KWUARM, new Item(241), 60, 137.5, new Item(187)),
- SUPER_RESTORE(UnfinishedPotion.SNAPDRAGON, new Item(223), 63, 142.5, new Item(3026)),
- SUPER_DEFENCE(UnfinishedPotion.CADANTINE, new Item(239), 66, 160, new Item(163)),
- ANTIFIRE(UnfinishedPotion.LANTADYME, new Item(241), 69, 157.5, new Item(2454)),
- SUPER_RANGING_POTION(UnfinishedPotion.DWARF_WEED, new Item(245), 72, 162.5, new Item(169)),
- SUPER_MAGIC(UnfinishedPotion.LANTADYME, new Item(3138), 76, 172.5, new Item(3042)),
- ZAMORAK_BREW(UnfinishedPotion.TORSTOL, new Item(247), 78, 175, new Item(189)),
- SARADOMIN_BREW(UnfinishedPotion.TOADFLAX, GrindingItem.BIRDS_NEST.getProduct(), 81, 180, new Item(6687)),
+ SUPER_RESTORE(UnfinishedPotion.SNAPDRAGON, new Item(223), 63, 142.5, new Item(3024)),
+ SUPER_DEFENCE(UnfinishedPotion.CADANTINE, new Item(239), 66, 160, new Item(2442)),
+ ANTIFIRE(UnfinishedPotion.LANTADYME, new Item(241), 69, 157.5, new Item(2452)),
+ SUPER_RANGING_POTION(UnfinishedPotion.DWARF_WEED, new Item(245), 72, 162.5, new Item(2444)),
+ SUPER_MAGIC(UnfinishedPotion.LANTADYME, new Item(3138), 76, 172.5, new Item(3040)),
+ ZAMORAK_BREW(UnfinishedPotion.TORSTOL, new Item(247), 78, 175, new Item(2450)),
+ SARADOMIN_BREW(UnfinishedPotion.TOADFLAX, GrindingItem.BIRDS_NEST.getProduct(), 81, 180, new Item(6685)),
STRONG_WEAPON_POISON(UnfinishedPotion.STRONG_WEAPON_POISON, new Item(223), 73, 165, new Item(5937)),
SUPER_STRONG_WEAPON_POISON(UnfinishedPotion.SUPER_STRONG_WEAPON_POISON, new Item(6018), 82, 190, new Item(5940)),
- STRONG_ANTIPOISON(UnfinishedPotion.STRONG_ANTIPOISON, new Item(6049), 68, 155, new Item(5945)),
- SUPER_STRONG_ANTIPOISON(UnfinishedPotion.SUPER_STRONG_ANTIPOISON, new Item(6051), 79, 177.5, new Item(5954)),
+ STRONG_ANTIPOISON(UnfinishedPotion.STRONG_ANTIPOISON, new Item(6049), 68, 155, new Item(5943)),
+ SUPER_STRONG_ANTIPOISON(UnfinishedPotion.SUPER_STRONG_ANTIPOISON, new Item(6051), 79, 177.5, new Item(5952)),
BLAMISH_OIL(UnfinishedPotion.HARRALANDER, new Item(1581), 25, 80, new Item(1582));
/**
diff --git a/Server/src/main/content/global/skill/herblore/HerbCleanListener.kt b/Server/src/main/content/global/skill/herblore/HerbCleanListener.kt
index 7ba8cfe5a..9136cd3ed 100644
--- a/Server/src/main/content/global/skill/herblore/HerbCleanListener.kt
+++ b/Server/src/main/content/global/skill/herblore/HerbCleanListener.kt
@@ -6,6 +6,10 @@ import core.game.interaction.InteractionListener
import core.game.node.entity.skill.Skills
import core.game.node.item.Item
import java.util.*
+import content.data.Quests
+
+import core.game.system.task.Pulse
+
/**
* Dirty herb cleaning listener
@@ -15,7 +19,7 @@ class HerbCleanListener : InteractionListener {
override fun defineListeners() {
on(IntType.ITEM, "clean") { player, node ->
lock(player, 1)
- if (!requireQuest(player, "Druidic Ritual", "before you can use Herblore.")) return@on true
+ if (!requireQuest(player, Quests.DRUIDIC_RITUAL, "before you can use Herblore.")) return@on true
val herb: Herbs = Herbs.forItem(node as Item) ?: return@on true
if (getDynLevel(player, Skills.HERBLORE) < herb.level) {
@@ -24,11 +28,30 @@ class HerbCleanListener : InteractionListener {
}
val exp = herb.experience
+
+ player.pulseManager.run(object : Pulse() {
+ var counter = 0
+ override fun pulse(): Boolean {
+ if (amountInInventory(player, node.asItem().id) == 0 )
+ return true
+ if(removeItem(player, node.asItem().id)) {
+ addItem(player, herb.product.id)
+ rewardXP(player, Skills.HERBLORE, exp)
+ playAudio(player, 5153)
+ //sendMessage(player, "You clean the dirt from the " + herb.product.name.lowercase(Locale.getDefault()).replace("clean", "").trim { it <= ' ' } + " leaf.")
+ }
+ return false
+ }
+ })
+ return@on true
+
+ /* Vanilla actions, replaced by pulse above
replaceSlot(player, node.asItem().slot, herb.product, node.asItem())
rewardXP(player, Skills.HERBLORE, exp)
playAudio(player, 5153)
sendMessage(player, "You clean the dirt from the " + herb.product.name.lowercase(Locale.getDefault()).replace("clean", "").trim { it <= ' ' } + " leaf.")
return@on true
+ */
}
}
}
\ No newline at end of file
diff --git a/Server/src/main/content/global/skill/herblore/HerbTarPulse.java b/Server/src/main/content/global/skill/herblore/HerbTarPulse.java
index 45793be82..cbc66e0f8 100644
--- a/Server/src/main/content/global/skill/herblore/HerbTarPulse.java
+++ b/Server/src/main/content/global/skill/herblore/HerbTarPulse.java
@@ -5,6 +5,7 @@ import core.game.node.entity.skill.Skills;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.game.world.update.flag.context.Animation;
+import content.data.Quests;
/**
* Represents the pulse used to create herb tars.
@@ -25,7 +26,7 @@ public final class HerbTarPulse extends SkillPulse- {
/**
* Represents the swamp tar item.
*/
- private static final Item SWAMP_TAR = new Item(1939, 15);
+ private static final Item SWAMP_TAR = new Item(1939, 45);
/**
* Represents the tar to make.
@@ -52,7 +53,7 @@ public final class HerbTarPulse extends SkillPulse
- {
@Override
public boolean checkRequirements() {
- if (!player.getQuestRepository().isComplete("Druidic Ritual")) {
+ if (!player.getQuestRepository().isComplete(Quests.DRUIDIC_RITUAL)) {
player.getPacketDispatch().sendMessage("You must complete the Druidic Ritual quest before you can use Herblore.");
return false;
}
@@ -65,7 +66,7 @@ public final class HerbTarPulse extends SkillPulse
- {
return false;
}
if (!player.getInventory().containsItem(SWAMP_TAR)) {
- player.getPacketDispatch().sendMessage("You need at least 15 swamp tar in order to do this.");
+ player.getPacketDispatch().sendMessage("You need at least 45 swamp tar in order to do this.");
return false;
}
return true;
@@ -83,7 +84,7 @@ public final class HerbTarPulse extends SkillPulse
- {
return false;
}
if (player.getInventory().containsItem(SWAMP_TAR) && player.getInventory().containsItem(tar.getIngredient()) && player.getInventory().remove(SWAMP_TAR) && player.getInventory().remove(tar.getIngredient())) {
- final Item item = new Item(tar.getTar().getId(), 15);
+ final Item item = new Item(tar.getTar().getId(), 45);
player.getInventory().add(item);
player.getSkills().addExperience(Skills.HERBLORE, tar.getExperience(), true);
player.getPacketDispatch().sendMessage("You add the " + tar.getIngredient().getName().toLowerCase().replace("clean", "").trim() + " to the swamp tar.");
diff --git a/Server/src/main/content/global/skill/herblore/HerblorePulse.java b/Server/src/main/content/global/skill/herblore/HerblorePulse.java
index fbf1a8c73..0f859ad23 100644
--- a/Server/src/main/content/global/skill/herblore/HerblorePulse.java
+++ b/Server/src/main/content/global/skill/herblore/HerblorePulse.java
@@ -12,6 +12,7 @@ import core.tools.RandomFunction;
import org.rs09.consts.Sounds;
import static core.api.ContentAPIKt.playAudio;
+import content.data.Quests;
/**
@@ -69,7 +70,7 @@ public final class HerblorePulse extends SkillPulse
- {
@Override
public boolean checkRequirements() {
- if (!player.getQuestRepository().isComplete("Druidic Ritual")) {
+ if (!player.getQuestRepository().isComplete(Quests.DRUIDIC_RITUAL)) {
player.getPacketDispatch().sendMessage("You must complete the Druidic Ritual quest before you can use Herblore.");
return false;
}
diff --git a/Server/src/main/content/global/skill/herblore/Herbs.java b/Server/src/main/content/global/skill/herblore/Herbs.java
index 5ee4959eb..1973162f1 100644
--- a/Server/src/main/content/global/skill/herblore/Herbs.java
+++ b/Server/src/main/content/global/skill/herblore/Herbs.java
@@ -7,7 +7,7 @@ import core.game.node.item.Item;
* @author 'Vexia
*/
public enum Herbs {
- GUAM(new Item(199), 2.5, 3, new Item(249)), MARRENTILL(new Item(201), 3.8, 5, new Item(251)), TARROMIN(new Item(203), 5, 11, new Item(253)), HARRALANDER(new Item(205), 6.3, 20, new Item(255)), RANARR(new Item(207), 7.5, 25, new Item(257)), TOADFLAX(new Item(3049), 8, 30, new Item(2998)), SPIRIT_WEED(new Item(12174), 7.8, 35, new Item(12172)), IRIT(new Item(209), 8.8, 40, new Item(259)), AVANTOE(new Item(211), 10, 48, new Item(261)), KWUARM(new Item(213), 11.3, 54, new Item(263)), SNAPDRAGON(new Item(3051), 11.8, 59, new Item(3000)), CADANTINE(new Item(215), 12.5, 65, new Item(265)), LANTADYME(new Item(2485), 13.1, 67, new Item(2481)), DWARF_WEED(new Item(217), 13.8, 70, new Item(267)), TORSTOL(new Item(219), 15, 75, new Item(269)), SNAKE_WEED(new Item(1525), 2.5, 3, new Item(1526)), ARDRIGAL(new Item(1527), 2.5, 3, new Item(1528)), SITO_FOIL(new Item(1529), 2.5, 3, new Item(1530)), VOLENCIA_MOSS(new Item(1531), 2.5, 3, new Item(1532)), ROGUES_PUSE(new Item(1533), 2.5, 3, new Item(1534));
+ GUAM(new Item(199), 2.5, 3, new Item(249)), MARRENTILL(new Item(201), 3.8, 5, new Item(251)), TARROMIN(new Item(203), 5, 11, new Item(253)), HARRALANDER(new Item(205), 6.3, 20, new Item(255)), RANARR(new Item(207), 7.5, 25, new Item(257)), TOADFLAX(new Item(3049), 8, 30, new Item(2998)), SPIRIT_WEED(new Item(12174), 7.8, 35, new Item(12172)), IRIT(new Item(209), 8.8, 40, new Item(259)), AVANTOE(new Item(211), 10, 48, new Item(261)), KWUARM(new Item(213), 11.3, 54, new Item(263)), SNAPDRAGON(new Item(3051), 11.8, 59, new Item(3000)), CADANTINE(new Item(215), 12.5, 65, new Item(265)), LANTADYME(new Item(2485), 13.1, 67, new Item(2481)), DWARF_WEED(new Item(217), 13.8, 70, new Item(267)), TORSTOL(new Item(219), 15, 75, new Item(269)), SNAKE_WEED(new Item(1525), 2.5, 3, new Item(1526)), ARDRIGAL(new Item(1527), 2.5, 3, new Item(1528)), SITO_FOIL(new Item(1529), 2.5, 3, new Item(1530)), VOLENCIA_MOSS(new Item(1531), 2.5, 3, new Item(1532)), ROGUES_PURSE(new Item(1533), 0, 8, new Item(1534));
/**
* Represents the herb item.
diff --git a/Server/src/main/content/global/skill/herblore/UnfinishedPotion.java b/Server/src/main/content/global/skill/herblore/UnfinishedPotion.java
index 699a03b74..aa6e48d27 100644
--- a/Server/src/main/content/global/skill/herblore/UnfinishedPotion.java
+++ b/Server/src/main/content/global/skill/herblore/UnfinishedPotion.java
@@ -9,6 +9,7 @@ import core.game.node.item.Item;
public enum UnfinishedPotion {
GUAM(Herbs.GUAM.getProduct(), 3, new Item(91)),
MARRENTILL(Herbs.MARRENTILL.getProduct(), 5, new Item(93)),
+ ROGUES_PURSE(Herbs.ROGUES_PURSE.getProduct(), 5, new Item(4840)),
TARROMIN(Herbs.TARROMIN.getProduct(), 12, new Item(95)),
HARRALANDER(Herbs.HARRALANDER.getProduct(), 22, new Item(97)),
RANARR(Herbs.RANARR.getProduct(), 30, new Item(99)),
diff --git a/Server/src/main/content/global/skill/hunter/ImpBoxPlugin.java b/Server/src/main/content/global/skill/hunter/ImpBoxPlugin.java
index 800e342eb..a1cf25062 100644
--- a/Server/src/main/content/global/skill/hunter/ImpBoxPlugin.java
+++ b/Server/src/main/content/global/skill/hunter/ImpBoxPlugin.java
@@ -46,10 +46,16 @@ public class ImpBoxPlugin extends OptionHandler {
public boolean handle(Player player, Node node, String option) {
switch (option) {
case "bank":
+ int boxSlot = node.asItem().getSlot();
+ player.getInventory().replace(new Item(10025), boxSlot);
+ player.sendMessage("You free the imp in exchange for it taking some items to your bank.");
+ player.getBank().openDepositBox();
+ /* Snowscape Custom: the normal imp interface is broken, so we fixed/buffed it by making it act as a one-time-use deposit box instead.
Component component = new Component(478);
component.setPlugin(new ImpInterfaceHandler((Item) node));
player.getInterfaceManager().open(component);
PacketRepository.send(ContainerPacket.class, new ContainerContext(player, 478, 61, 91, player.getInventory(), true));
+ */
break;
case "talk-to":
player.getDialogueInterpreter().open("imp-box");
diff --git a/Server/src/main/content/global/skill/hunter/TrapSetting.java b/Server/src/main/content/global/skill/hunter/TrapSetting.java
index ec0f87ba3..73a69dbd8 100644
--- a/Server/src/main/content/global/skill/hunter/TrapSetting.java
+++ b/Server/src/main/content/global/skill/hunter/TrapSetting.java
@@ -20,6 +20,8 @@ import org.rs09.consts.Sounds;
import static core.api.ContentAPIKt.playAudio;
+import core.game.node.entity.npc.drop.NPCDropTables;
+
/**
* A setting for a trap type.
* @author Vexia
@@ -161,7 +163,13 @@ public class TrapSetting {
return;
}
addTool(player, wrapper, type);
- player.getInventory().add(wrapper.getItems().toArray(new Item[] {}));
+ // Snowscape modification: custom bonecrusher functionality extended to include hunter bones
+ //player.getInventory().add(wrapper.getItems().toArray(new Item[] {}));
+ for (Item item: wrapper.getItems().toArray(new Item[] {})) {
+ if (!NPCDropTables.handleBoneCrusher(player, item)) {
+ player.getInventory().add(item);
+ }
+ }
} else {
if (isObjectTrap() && !ground) {
player.getInventory().add(wrapper.getItems().toArray(new Item[] {}));
@@ -306,7 +314,7 @@ public class TrapSetting {
case 3:
handleCatch(counter, wrapper, node, npc, success);
if (success) {
- wrapper.setTicks(GameWorld.getTicks() + 100);
+ wrapper.setTicks(GameWorld.getTicks() + 1000);
wrapper.setReward(node);
wrapper.setObject(getFinalId(wrapper, node));
switch(wrapper.getType()) {
diff --git a/Server/src/main/content/global/skill/hunter/TrapWrapper.java b/Server/src/main/content/global/skill/hunter/TrapWrapper.java
index 4cbe32987..b596d864c 100644
--- a/Server/src/main/content/global/skill/hunter/TrapWrapper.java
+++ b/Server/src/main/content/global/skill/hunter/TrapWrapper.java
@@ -102,7 +102,7 @@ public final class TrapWrapper {
this.type = type;
this.object = object;
this.originalId = object.getId();
- this.ticks = GameWorld.getTicks() + (100);
+ this.ticks = GameWorld.getTicks() + (1000);
this.instance = HunterManager.getInstance(player);
this.object.getAttributes().setAttribute("trap-uid", instance.getUid());
}
diff --git a/Server/src/main/content/global/skill/hunter/Traps.java b/Server/src/main/content/global/skill/hunter/Traps.java
index f2151d660..e5e30ca34 100644
--- a/Server/src/main/content/global/skill/hunter/Traps.java
+++ b/Server/src/main/content/global/skill/hunter/Traps.java
@@ -21,12 +21,12 @@ import static core.api.ContentAPIKt.log;
*/
public enum Traps {
BIRD_SNARE(new TrapSetting(10006, new int[] { 19175 }, new int[] {}, "lay", 19174, Animation.create(5208), Animation.create(5207), 1),
- new TrapNode(new int[] { 5073 }, 1, 34, new int[] { 19179, 19180 }, new Item[] { new Item(10088, 8), new Item(9978), new Item(526) }),
- new TrapNode(new int[] { 5075 }, 5, 48, new int[] { 19183, 19184 }, new Item[] { new Item(10090, 8), new Item(9978), new Item(526) }),
- new TrapNode(new int[] { 5076 }, 9, 61, new int[] { 19185, 19186 }, new Item[] { new Item(10091, 8), new Item(9978), new Item(526) }),
- new TrapNode(new int[] { 5074 }, 11, 64.7, new int[] { 19181, 19182 }, new Item[] { new Item(10089, 8), new Item(9978), new Item(526) }),
- new TrapNode(new int[] { 5072 }, 19, 95.2, new int[] { 19177, 19178 }, new Item[] { new Item(10087, 8), new Item(9978), new Item(526) }),
- new TrapNode(new int[] { 7031 }, 39, 167, new int[] { 28931, 28930 }, new Item[] { new Item(11525, 8), new Item(9978), new Item(526) }) {
+ new TrapNode(new int[] { 5073 }, 1, 34, new int[] { 19179, 19180 }, new Item[] { new Item(10088, 60), new Item(9978), new Item(526) }),
+ new TrapNode(new int[] { 5075 }, 5, 48, new int[] { 19183, 19184 }, new Item[] { new Item(10090, 60), new Item(9978), new Item(526) }),
+ new TrapNode(new int[] { 5076 }, 9, 61, new int[] { 19185, 19186 }, new Item[] { new Item(10091, 60), new Item(9978), new Item(526) }),
+ new TrapNode(new int[] { 5074 }, 11, 64.7, new int[] { 19181, 19182 }, new Item[] { new Item(10089, 60), new Item(9978), new Item(526) }),
+ new TrapNode(new int[] { 5072 }, 19, 95.2, new int[] { 19177, 19178 }, new Item[] { new Item(10087, 60), new Item(9978), new Item(526) }),
+ new TrapNode(new int[] { 7031 }, 39, 167, new int[] { 28931, 28930 }, new Item[] { new Item(11525, 60), new Item(9978), new Item(526) }) {
@Override
public boolean canCatch(TrapWrapper wrapper, final NPC npc) {
return false;
diff --git a/Server/src/main/content/global/skill/magic/MagicAltarListener.kt b/Server/src/main/content/global/skill/magic/MagicAltarListener.kt
index 554dcab4f..eb4e61fc5 100644
--- a/Server/src/main/content/global/skill/magic/MagicAltarListener.kt
+++ b/Server/src/main/content/global/skill/magic/MagicAltarListener.kt
@@ -9,6 +9,7 @@ import core.game.node.entity.player.link.SpellBookManager.SpellBook
import core.game.node.entity.skill.Skills
import org.rs09.consts.Scenery
import org.rs09.consts.Sounds
+import content.data.Quests
class MagicAltarListener : InteractionListener {
override fun defineListeners() {
@@ -24,7 +25,7 @@ class MagicAltarListener : InteractionListener {
private fun meetsRequirements(player: Player, altar: Node): Boolean {
val level = if (altar.id == ANCIENT_ALTAR) 50 else 65
- if (!hasRequirement(player, if (altar.id == ANCIENT_ALTAR) "Desert Treasure" else "Lunar Diplomacy")) {
+ if (!hasRequirement(player, if (altar.id == ANCIENT_ALTAR) Quests.DESERT_TREASURE else Quests.LUNAR_DIPLOMACY)) {
return false
}
diff --git a/Server/src/main/content/global/skill/magic/SpellListener.kt b/Server/src/main/content/global/skill/magic/SpellListener.kt
index 64383b0a7..c9ba1b177 100644
--- a/Server/src/main/content/global/skill/magic/SpellListener.kt
+++ b/Server/src/main/content/global/skill/magic/SpellListener.kt
@@ -62,7 +62,12 @@ abstract class SpellListener(val bookName: String) : Listener {
}
fun removeRunes(player: Player,removeAttr: Boolean = true){
+ /* Snowscape modification: remove runes from the inventory or rune satchel
player.inventory.remove(*player.getAttribute("spell:runes",ArrayList
- ()).toTypedArray())
+ */
+ player.getAttribute("spell:runes",ArrayList
- ()).toTypedArray().forEach { rune ->
+ if (!player.inventory.remove(rune)) player.runeSatchel.remove(rune)
+ }
if(removeAttr) {
player.removeAttribute("spell:runes")
player.removeAttribute("tablet-spell")
diff --git a/Server/src/main/content/global/skill/magic/SpellUtils.kt b/Server/src/main/content/global/skill/magic/SpellUtils.kt
index a80d646a5..2f44a37e0 100644
--- a/Server/src/main/content/global/skill/magic/SpellUtils.kt
+++ b/Server/src/main/content/global/skill/magic/SpellUtils.kt
@@ -6,6 +6,7 @@ import core.game.node.entity.combat.spell.CombinationRune
import core.game.node.entity.combat.spell.MagicStaff
import core.game.node.entity.combat.spell.Runes
import core.game.node.item.Item
+import core.api.*
object SpellUtils {
fun usingStaff(p: Player, rune: Int): Boolean {
@@ -20,15 +21,54 @@ object SpellUtils {
return false
}
+ // Snowscape modifications: replaced entire "hasrune" function to only check the inventory once per rune, so the rune satchel has less overhead.
+ fun hasRune(p:Player,rune:Item):Boolean{
+ if(usingStaff(p,rune.id)) return true
+ val removeItems = p.getAttribute("spell:runes",ArrayList
- ())
+
+ val baseAmt = kotlin.math.max(p.inventory.getAmount(rune.id),(if (inEquipmentOrInventory(p, 10882)) p.runeSatchel.getAmount(rune.id) else 0))
+
+ if(baseAmt >= 0){
+ removeItems.add(Item(rune.getId(),kotlin.math.min(baseAmt,rune.getAmount())))
+ p.setAttribute("spell:runes",removeItems)
+ }
+
+ var amtRemaining = rune.amount - baseAmt
+ val possibleComboRunes = CombinationRune.eligibleFor(Runes.forId(rune.id))
+ for (r in possibleComboRunes) {
+ // Check if this combination rune was already added for a different element
+ for (alreadyListed in removeItems){
+ if (alreadyListed.getId() == r.id){
+ amtRemaining -= alreadyListed.getAmount()
+ }
+ }
+
+ val amt = kotlin.math.max(p.inventory.getAmount(r.id),(if (inEquipmentOrInventory(p, 10882)) p.runeSatchel.getAmount(r.id) else 0))
+ if (amt > 0 && amtRemaining > 0) {
+
+ if (amtRemaining <= amt) {
+ removeItems.add(Item(r.id,amtRemaining))
+ amtRemaining = 0
+ break
+ }
+ removeItems.add(Item(r.id,amt))
+ amtRemaining -= amt
+ }
+ }
+ p.setAttribute("spell:runes",removeItems)
+ return amtRemaining <= 0
+ }
+
+/* Snowscape: Original function left here for easier merging of updates.
fun hasRune(p:Player,rune:Item):Boolean{
val removeItems = p.getAttribute("spell:runes",ArrayList
- ())
if(usingStaff(p,rune.id)) return true
- if(p.inventory.containsItem(rune)){
+ if(p.inventory.containsItem(rune) || (inEquipmentOrInventory(p, 10882) && p.runeSatchel.containsItem(rune))){
removeItems.add(rune)
p.setAttribute("spell:runes",removeItems)
}
- val baseAmt = p.inventory.getAmount(rune.id)
+ val baseAmt = p.inventory.getAmount(rune.id) + (if (inEquipmentOrInventory(p, 10882)) p.runeSatchel.getAmount(rune.id) else 0)
var amtRemaining = rune.amount - baseAmt
val possibleComboRunes = CombinationRune.eligibleFor(Runes.forId(rune.id))
for (r in possibleComboRunes) {
@@ -49,9 +89,9 @@ object SpellUtils {
fun hasRune(p: Player, item: Item, toRemove: MutableList
, message: Boolean): Boolean {
if (!usingStaff(p, item.id)) {
- val hasBaseRune = p.inventory.contains(item.id, item.amount)
+ val hasBaseRune = p.inventory.contains(item.id, item.amount) || (inEquipmentOrInventory(p, 10882) && p.runeSatchel.contains(item.id, item.amount))
if (!hasBaseRune) {
- val baseAmt = p.inventory.getAmount(item.id)
+ val baseAmt = p.inventory.getAmount(item.id) + (if (inEquipmentOrInventory(p, 10882)) p.runeSatchel.getAmount(item.id) else 0)
if (baseAmt > 0) {
toRemove.add(Item(item.id, p.inventory.getAmount(item.id)))
}
@@ -81,7 +121,7 @@ object SpellUtils {
}
return true
}
-
+*/
fun attackableNPC(npc: NPC): Boolean{
return npc.definition.hasAction("attack")
}
diff --git a/Server/src/main/content/global/skill/magic/ancient/AncientTeleportPlugin.java b/Server/src/main/content/global/skill/magic/ancient/AncientTeleportPlugin.java
index 3944c3c7e..ec6c8999c 100644
--- a/Server/src/main/content/global/skill/magic/ancient/AncientTeleportPlugin.java
+++ b/Server/src/main/content/global/skill/magic/ancient/AncientTeleportPlugin.java
@@ -51,10 +51,12 @@ public final class AncientTeleportPlugin extends MagicSpell {
@Override
public boolean cast(Entity entity, Node target) {
+ /* Snowscape Custom to allow teleporting in wilderness. The teleport limitations are still checked later by the send() function, so this is not
if (entity.isTeleBlocked() || !super.meetsRequirements(entity, true, false)) {
entity.asPlayer().sendMessage("A magical force has stopped you from teleporting.");
return false;
}
+ */
if (entity.getTeleporter().send(location.transform(0, RandomFunction.random(3), 0), getSpellId() == 28 ? TeleportType.HOME : TeleportType.ANCIENT)) {
if (!super.meetsRequirements(entity, true, true)) {
entity.getTeleporter().getCurrentTeleport().stop();
diff --git a/Server/src/main/content/global/skill/magic/lunar/DreamSpell.java b/Server/src/main/content/global/skill/magic/lunar/DreamSpell.java
deleted file mode 100644
index e35542f0a..000000000
--- a/Server/src/main/content/global/skill/magic/lunar/DreamSpell.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package content.global.skill.magic.lunar;
-
-import core.game.node.entity.combat.spell.MagicSpell;
-import core.game.node.entity.combat.spell.Runes;
-import core.game.node.entity.skill.Skills;
-import core.game.node.Node;
-import core.game.node.entity.Entity;
-import core.game.node.entity.combat.spell.SpellType;
-import core.game.node.entity.player.Player;
-import core.game.node.entity.player.link.SpellBookManager.SpellBook;
-import core.game.node.item.Item;
-import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
-import core.game.world.update.flag.context.Animation;
-import core.game.world.update.flag.context.Graphics;
-import core.plugin.Initializable;
-import core.plugin.Plugin;
-
-/**
- * Represents the dream magic spell.
- * @author 'Vexia
- * @version 1.0
- */
-@Initializable
-public final class DreamSpell extends MagicSpell {
-
- /**
- * Represents the starting animation.
- */
- private static final Animation START = Animation.create(6295);
-
- /**
- * Represents the dreaming animation.
- */
- private static final Animation DREAMING = Animation.create(6296);
-
- /**
- * Represents the end animation.
- */
- private static final Animation END = Animation.create(6297);
-
- /**
- * Represents the graphics of this spell.
- */
- private static final Graphics GRAPHIC = new Graphics(1056);
-
- /**
- * Constructs a new {@code CureOtherSpell} {@code Object}.
- */
- public DreamSpell() {
- super(SpellBook.LUNAR, 79, 82, null, null, null, new Item[] { new Item(Runes.COSMIC_RUNE.getId(), 1), new Item(Runes.ASTRAL_RUNE.getId(), 2), new Item(Runes.BODY_RUNE.getId(), 5) });
- }
-
- @Override
- public Plugin newInstance(SpellType arg) throws Throwable {
- SpellBook.LUNAR.register(10, this);
- return this;
- }
-
- @Override
- public boolean cast(Entity entity, Node target) {
- final Player p = (Player) entity;
- if (p.getSkills().getLifepoints() == p.getSkills().getStaticLevel(Skills.HITPOINTS)) {
- p.getPacketDispatch().sendMessage("You have no need to cast this spell since your hitpoints are already full.");
- return false;
- }
- if (!meetsRequirements(entity, true, true)) {
- return false;
- }
- p.animate(START);
- p.lock();
- GameWorld.getPulser().submit(new Pulse(4, p) {
- @Override
- public boolean pulse() {
- p.animate(DREAMING);
- p.graphics(GRAPHIC);
- p.unlock();
- return true;
- }
-
- });
- p.getPulseManager().run(new Pulse(18, p) {
- @Override
- public boolean pulse() {
- p.graphics(GRAPHIC);
- p.getSkills().heal(1);
- if (p.getSkills().getLifepoints() == p.getSkills().getStaticLevel(Skills.HITPOINTS)) {
- stop();
- return true;
- }
- return false;
- }
-
- @Override
- public void stop() {
- super.stop();
- p.graphics(new Graphics(-1));
- p.animate(END);
- }
- });
- return true;
- }
-
-}
diff --git a/Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt b/Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt
index 6ed1cfebc..d88710205 100644
--- a/Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt
+++ b/Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt
@@ -9,6 +9,7 @@ import content.global.skill.magic.spellconsts.Lunar
import core.api.*
import core.game.component.CloseEvent
import core.game.component.Component
+import core.game.interaction.QueueStrength
import core.game.node.Node
import core.game.node.entity.combat.ImpactHandler
import core.game.node.entity.npc.NPC
@@ -92,7 +93,8 @@ class LunarListeners : SpellListener("lunar"), Commands {
onCast(Lunar.OURANIA_TELEPORT, NONE) { player, _ ->
requires(player, 71, arrayOf(Item(Items.ASTRAL_RUNE_9075, 2), Item(Items.LAW_RUNE_563, 1), Item(Items.EARTH_RUNE_557, 6)))
if (!player.isTeleBlocked) playGlobalAudio(player.location, Sounds.TELEPORT_ALL_200)
- sendTeleport(player, 69.0, Location.create(2469, 3247, 0))
+ //sendTeleport(player, 69.0, Location.create(2469, 3247, 0))
+ sendTeleport(player, 69.0, Location.create(3314, 4818, 0))
}
// Level 71
@@ -169,9 +171,10 @@ class LunarListeners : SpellListener("lunar"), Commands {
}
// Level 79
- /**
- * Dream
- */
+ onCast(Lunar.DREAM, NONE) { player, _ ->
+ requires(player, 79, arrayOf(Item(Items.ASTRAL_RUNE_9075, 2), Item(Items.BODY_RUNE_559, 5), Item(Items.COSMIC_RUNE_564, 1)))
+ dream(player)
+ }
// Level 80
onCast(Lunar.STRING_JEWELLERY, NONE) { player, _ ->
@@ -320,30 +323,38 @@ class LunarListeners : SpellListener("lunar"), Commands {
}
// Level 66
- fun curePlant(player: Player, obj: Scenery){
+ fun curePlant(player: Player, obj: Scenery) {
+ if (CompostBins.forObject(obj) != null) {
+ sendMessage(player, "Bins don't often get diseased.")
+ return
+ }
val fPatch = FarmingPatch.forObject(obj)
- if(fPatch == null){
- sendMessage(player, "You attempt to cast Cure Plant on ${obj.definition.name}!")
- sendMessage(player, "Nothing interesting happens.")
+ if (fPatch == null) {
+ sendMessage(player, "Umm... this spell won't cure that!")
return
}
val patch = fPatch.getPatchFor(player)
- if(!patch.isDiseased && !patch.isWeedy() && !patch.isEmptyAndWeeded()){
- sendMessage(player, "It is growing just fine.")
- return
- }
- if(patch.isWeedy()){
+ if (patch.isWeedy()) {
sendMessage(player, "The weeds are healthy enough already.")
return
}
- if(patch.isDead){
- sendMessage(player, "It says 'Cure' not 'Resurrect'. Although death may arise from disease, it is not in itself a disease and hence cannot be cured. So there.")
+ if (patch.isEmptyAndWeeded()) {
+ sendMessage(player, "There's nothing there to cure.")
return
}
- if(patch.isGrown()){
+ if (patch.isGrown()) {
sendMessage(player, "That's not diseased.")
return
}
+ if (patch.isDead) {
+ sendMessage(player, "It says 'Cure' not 'Resurrect'. Although death may arise from disease, it is not in itself a disease and hence cannot be cured. So there.")
+ return
+ }
+ if (!patch.isDiseased) {
+ sendMessage(player, "It is growing just fine.")
+ return
+ }
+
patch.cureDisease()
removeRunes(player)
addXP(player,60.0)
@@ -364,16 +375,26 @@ class LunarListeners : SpellListener("lunar"), Commands {
setDelay(player, false)
openSingleTab(player, Components.DREAM_MONSTER_STAT_522)
- setInterfaceText(player, "Monster name : ${npc.definition.name}", Components.DREAM_MONSTER_STAT_522, 0)
- setInterfaceText(player, "Combat Level : ${npc.definition.combatLevel}", Components.DREAM_MONSTER_STAT_522, 1)
- setInterfaceText(player, "Hitpoints : ${npc.definition.handlers[NPCConfigParser.LIFEPOINTS] ?: 0}", Components.DREAM_MONSTER_STAT_522, 2)
- setInterfaceText(player, "Max hit : ${npc.getSwingHandler(false).calculateHit(npc, player, 1.0)}", Components.DREAM_MONSTER_STAT_522, 3)
+ var bonuses = npc.properties.bonuses
+ setInterfaceText(player, "Monster name: ${npc.definition.name} (${npc.definition.combatLevel})", Components.DREAM_MONSTER_STAT_522, 0)
+ setInterfaceText(player, """
+Att:${npc.definition.handlers[NPCConfigParser.ATTACK_LEVEL] ?: 0}
+Str:${npc.definition.handlers[NPCConfigParser.STRENGTH_LEVEL] ?: 0}
+Ranged:${npc.definition.handlers[NPCConfigParser.RANGE_LEVEL] ?: 0}
+Magic:${npc.definition.handlers[NPCConfigParser.MAGIC_LEVEL] ?: 0}""", Components.DREAM_MONSTER_STAT_522, 1)
+ setInterfaceText(player, """
+Defence:${npc.definition.handlers[NPCConfigParser.DEFENCE_LEVEL] ?: 0}
+HP:${npc.definition.handlers[NPCConfigParser.LIFEPOINTS] ?: 0}
+Max-hit:${npc.getSwingHandler(false).calculateHit(npc, player, 1.0)}""", Components.DREAM_MONSTER_STAT_522, 2)
+ setInterfaceText(player, "${bonuses[0]},${bonuses[1]},${bonuses[2]},${bonuses[3]},${bonuses[4]}, ${bonuses[5]},${bonuses[6]},${bonuses[7]},${bonuses[8]},${bonuses[9]}", Components.DREAM_MONSTER_STAT_522, 3)
val poisonStatus = if(npc.definition.handlers.getOrDefault(NPCConfigParser.POISON_IMMUNE,false) == true){
- "This creature is immune to poison."
- } else "This creature is not immune to poison."
-
- setInterfaceText(player, poisonStatus, Components.DREAM_MONSTER_STAT_522, 4)
+ "Immune to poison. "
+ } else ""
+ val poisonStatus2 = if(npc.definition.handlers.getOrDefault(NPCConfigParser.POISONOUS,false) == true){
+ "Poisonous."
+ } else ""
+ setInterfaceText(player, poisonStatus + poisonStatus2, Components.DREAM_MONSTER_STAT_522, 4)
}
// Level 67
@@ -568,9 +589,38 @@ class LunarListeners : SpellListener("lunar"), Commands {
}
// Level 79
- /**
- * Dream
- */
+ private fun dream(player: Player) {
+ if(player.skills.lifepoints >= getStatLevel(player, Skills.HITPOINTS)) {
+ sendMessage(player, "You have no need to cast this spell since your hitpoints are already full.")
+ return
+ }
+
+ animate(player, Animations.LUNAR_SPELLBOOK_DREAM_START_6295)
+ delayEntity(player, 4)
+ queueScript(player, 4, QueueStrength.WEAK) { stage: Int ->
+ when(stage) {
+ 0 -> {
+ animate(player, Animations.LUNAR_SPELLBOOK_DREAM_MID_6296)
+ sendGraphics(Graphics.LUNAR_SPELLBOOK_DREAM_1056, player.location)
+ playAudio(player, Sounds.LUNAR_SLEEP_3619)
+ return@queueScript delayScript(player, 5)
+ }
+ else -> {
+ sendGraphics(Graphics.LUNAR_SPELLBOOK_DREAM_1056, player.location)
+ // This heals 2 HP every min. Naturally you heal 1 for a total of 3
+ // The script steps every 5 ticks and we want 50 ticks before a heal
+ if (stage.mod(10) == 0){
+ heal(player, 1)
+ if(player.skills.lifepoints >= getStatLevel(player, Skills.HITPOINTS)) {
+ animate(player, Animations.LUNAR_SPELLBOOK_DREAM_END_6297)
+ return@queueScript stopExecuting(player)
+ }
+ }
+ return@queueScript delayScript(player, 5)
+ }
+ }
+ }
+ }
private fun stringJewellery(player: Player) {
val playerJewellery = ArrayDeque- ()
@@ -659,6 +709,24 @@ class LunarListeners : SpellListener("lunar"), Commands {
sendMessage(player, "You need to use this spell on logs.")
return
}
+ player.pulseManager.run(object : Pulse() {
+ var counter = 0
+ override fun pulse(): Boolean {
+ removeAttribute(player, "spell:runes")
+ if (amountInInventory(player, item.id) == 0 )
+ return true
+ requires(player, 86, arrayOf(Item(Items.ASTRAL_RUNE_9075, 2), Item(Items.NATURE_RUNE_561, 1), Item(Items.EARTH_RUNE_557, 15)))
+ if(removeItem(player, item.id) && addItem(player, plankType.plank.id)) {
+ removeRunes(player, false)
+ if (counter % 6 == 0)
+ visualizeSpell(player, Animations.LUNAR_SPELLBOOK_PLANK_MAKE_6298, Graphics.LUNAR_SPELLBOOK_PLANK_MAKE_1063, 120, Sounds.LUNAR_MAKE_PLANK_3617)
+ addXP(player, 90.0)
+ }
+ counter++
+ return false
+ }
+ })
+ /* Vanilla Spell
if (amountInInventory(player, Items.COINS_995) < plankType.price || !removeItem(player, Item(Items.COINS_995, plankType.price))) {
sendMessage(player, "You need ${plankType.price} coins to convert that log into a plank.")
return
@@ -670,6 +738,7 @@ class LunarListeners : SpellListener("lunar"), Commands {
replaceSlot(player, item.slot, plankType.plank)
addXP(player, 90.0)
showMagicTab(player)
+ */
}
// Level 91
diff --git a/Server/src/main/content/global/skill/magic/modern/CrumbleUndead.java b/Server/src/main/content/global/skill/magic/modern/CrumbleUndead.java
index ec23e258f..0c9f896b1 100644
--- a/Server/src/main/content/global/skill/magic/modern/CrumbleUndead.java
+++ b/Server/src/main/content/global/skill/magic/modern/CrumbleUndead.java
@@ -17,6 +17,8 @@ import core.plugin.Initializable;
import core.plugin.Plugin;
import org.rs09.consts.Sounds;
+import static core.api.SnowscapeAPIKt.*;
+
/**
* Handles the crumble undead spell.
* @author Emperor
@@ -35,7 +37,7 @@ public final class CrumbleUndead extends CombatSpell {
@Override
public boolean cast(Entity entity, Node target) {
NPC npc = target instanceof NPC ? (NPC) target : null;
- if (npc == null || npc.getTask() == null || !npc.getTask().undead) {
+ if (npc == null || !isUndead(npc)) {
((Player) entity).getPacketDispatch().sendMessage("This spell only affects the undead.");
return false;
}
diff --git a/Server/src/main/content/global/skill/magic/modern/ModernData.kt b/Server/src/main/content/global/skill/magic/modern/ModernData.kt
index 793a757b5..4740bd02d 100644
--- a/Server/src/main/content/global/skill/magic/modern/ModernData.kt
+++ b/Server/src/main/content/global/skill/magic/modern/ModernData.kt
@@ -50,6 +50,15 @@ enum class ChargeOrbData(
Graphics(150, 90),
Sounds.CHARGE_AIR_ORB_116,
Items.AIR_ORB_573
+ ),
+ CHARGE_TELE_ORB(
+ 7171,
+ arrayOf(Item(Items.COSMIC_RUNE_564, 3), Item(Items.AIR_RUNE_556, 30), Item(Items.UNPOWERED_ORB_567)),
+ 66,
+ 76.0,
+ Graphics(150, 90),
+ Sounds.CHARGE_AIR_ORB_116,
+ 14534
);
companion object{
val spellMap = HashMap
()
diff --git a/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt b/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt
index 230fd75b1..8c0eb276f 100644
--- a/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt
+++ b/Server/src/main/content/global/skill/magic/modern/ModernListeners.kt
@@ -1,5 +1,6 @@
package content.global.skill.magic.modern
+import content.data.Quests
import content.global.skill.magic.SpellListener
import content.global.skill.magic.SpellUtils.hasRune
import content.global.skill.magic.TeleportMethod
@@ -22,6 +23,7 @@ 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.entity.skill.Skills
+import content.region.kandarin.ardougne.quest.plaguecity.PlagueCityListeners
import core.game.node.item.Item
import core.game.world.map.Location
import core.game.world.update.flag.context.Animation
@@ -30,6 +32,9 @@ import org.rs09.consts.Items
import org.rs09.consts.Scenery
import org.rs09.consts.Sounds
+import core.game.system.task.Pulse
+import core.game.world.repository.Repository
+
class ModernListeners : SpellListener("modern"){
override fun defineListeners() {
onCast(Modern.HOME_TELEPORT, NONE){ player, _ ->
@@ -65,28 +70,33 @@ class ModernListeners : SpellListener("modern"){
}
onCast(Modern.ARDOUGNE_TELEPORT, NONE){ player, _ ->
- if (!hasRequirement(player, "Plague City"))
- return@onCast
- requires(player,51, arrayOf(Item(Items.WATER_RUNE_555,2),Item(Items.LAW_RUNE_563,2)))
- sendTeleport(player,61.0, Location.create(2662, 3307, 0))
+ if (getAttribute(player, PlagueCityListeners.ARDOUGNE_TELE_ATTRIBUTE, false)){
+ requires(player,51, arrayOf(Item(Items.WATER_RUNE_555,2),Item(Items.LAW_RUNE_563,2)))
+ sendTeleport(player,61.0, Location.create(2662, 3307, 0))
+ }
+ else {
+ // source https://runescape.salmoneus.net/forums/topic/289818-ardougne-teleport-help/
+ sendDialogue(player, "You haven\'t learnt how to cast this spell yet")
+ }
+ return@onCast
}
onCast(Modern.WATCHTOWER_TELEPORT, NONE){ player, _ ->
- if (!hasRequirement(player, "Watchtower"))
+ if (!hasRequirement(player, Quests.WATCHTOWER))
return@onCast
requires(player,58, arrayOf(Item(Items.EARTH_RUNE_557,2),Item(Items.LAW_RUNE_563,2)))
sendTeleport(player,68.0, Location.create(2549, 3112, 0))
}
onCast(Modern.TROLLHEIM_TELEPORT, NONE){ player, _ ->
- if (!hasRequirement(player, "Eadgar's Ruse"))
+ if (!hasRequirement(player, Quests.EADGARS_RUSE))
return@onCast
requires(player,61, arrayOf(Item(Items.FIRE_RUNE_554,2),Item(Items.LAW_RUNE_563,2)))
sendTeleport(player,68.0, Location.create(2891, 3678, 0))
}
onCast(Modern.APE_ATOLL_TELEPORT, NONE){ player, _ ->
- if (!hasRequirement(player, "Monkey Madness"))
+ if (!hasRequirement(player, Quests.MONKEY_MADNESS))
return@onCast
requires(player,64, arrayOf(Item(Items.FIRE_RUNE_554,2),Item(Items.WATER_RUNE_555,2),Item(Items.LAW_RUNE_563,2),Item(Items.BANANA_1963)))
sendTeleport(player,74.0, Location.create(2754, 2784, 0))
@@ -129,6 +139,7 @@ class ModernListeners : SpellListener("modern"){
onCast(Modern.CHARGE_EARTH_ORB, OBJECT, Scenery.OBELISK_OF_EARTH_29415, 3, method = ::chargeOrb)
onCast(Modern.CHARGE_FIRE_ORB, OBJECT, Scenery.OBELISK_OF_FIRE_2153, 3, method = ::chargeOrb)
onCast(Modern.CHARGE_AIR_ORB, OBJECT, Scenery.OBELISK_OF_AIR_2152, 3, method = ::chargeOrb)
+ onCast(Modern.CHARGE_AIR_ORB, OBJECT, 7171, 3, method = ::chargeOrb)
}
private fun boneConvert(player: Player,bananas: Boolean){
@@ -183,21 +194,27 @@ class ModernListeners : SpellListener("modern"){
return
}
- var bar = Bar.forOre(item.id) ?: return
- if(bar == Bar.IRON && player.inventory.getAmount(Items.COAL_453) >= 2 && player.skills.getLevel(Skills.SMITHING) >= Bar.STEEL.level && player.inventory.contains(Items.IRON_ORE_441,1)) bar = Bar.STEEL
+ fun returnBar(player: Player,item: Item): Bar? {
+ // Loop through all metal bars starting with the highest tier
+ for (potentialBar in Bar.values().reversed()) {
+ // Check if the ore being cast on is needed for the current bar being considered
+ val inputOreInBar = potentialBar.ores.map{it.id}.contains(item.id)
+ // Check the player has all the required ores (and corresponding quantities) to make the current bar being considered
+ val playerHasNecessaryOres = potentialBar.ores.all{ore -> inInventory(player, ore.id, ore.amount)}
+ // If both tests pass return the current bar being considered as the one the spell should try to make
+ if (inputOreInBar && playerHasNecessaryOres) return potentialBar
+ }
+ // If none of the bars passed both tests the player must be missing a required ore
+ player.packetDispatch.sendMessage("You do not have the required ores to make this bar.")
+ return null
+ }
+ var bar = returnBar(player,item)?: return
if(player.skills.getLevel(Skills.SMITHING) < bar.level){
player.sendMessage("You need a smithing level of ${bar.level} to superheat that ore.")
return
}
- for (items in bar.ores) {
- if (!player.inventory.contains(items.id, items.amount)) {
- player.packetDispatch.sendMessage("You do not have the required ores to make this bar.")
- return
- }
- }
-
player.lock(3)
removeRunes(player)
addXP(player,53.0)
@@ -206,7 +223,8 @@ class ModernListeners : SpellListener("modern"){
player.pulseManager.run(SmeltingPulse(player, item, bar, 1, true))
setDelay(player,false)
}
-
+
+ // Snowscape: Alchemy spells have been modified. Spells now repeat, and low alchemy converts up to 100 items at a time for bulk pricing.
fun alchemize(player: Player, item: Item, high: Boolean, explorersRing: Boolean = false): Boolean {
if(item.name == "Coins") player.sendMessage("You can't alchemize something that's already gold!").also { return false }
if((!item.definition.isTradeable) && (!item.definition.isAlchemizable)) player.sendMessage("You can't cast this spell on something like that.").also { return false }
@@ -222,29 +240,72 @@ class ModernListeners : SpellListener("modern"){
return false
}
+ var loop = true
+
+ val ringOfWealth = intArrayOf(14646,14644,14642,14640,14638)
+ if(high && ringOfWealth.contains(item.id)){
+ if (getAttribute(player, "ringofwealth:unlocked", false)) {
+ player.sendMessage("You have already unlocked the permanent Wealth effect and can no longer ")
+ player.sendMessage("high alchemize this ring.")
+ return false
+ } else {
+ player.setAttribute("/save:ringofwealth:unlocked", true)
+ player.sendMessage("Combining the Alchemy spell with the Wealth enchantment causes a strange ")
+ player.sendMessage("interaction. You are now permanently enchanted with the Wealth effect and ")
+ player.sendMessage("no longer need to wear the ring to get the benefit of increased rare drops.")
+ loop = false
+ }
+ }
+
if (player.pulseManager.current !is MovementPulse) {
player.pulseManager.clear()
}
- if (explorersRing) {
- visualize(player, LOW_ALCH_ANIM, EXPLORERS_RING_GFX)
- } else {
- val weapon = getItemFromEquipment(player, EquipmentSlot.WEAPON)
- if (weapon != null && weapon.id in MagicStaff.FIRE_RUNE.staves) {
- visualize(player, if (high) HIGH_ALCH_STAFF_ANIM else LOW_ALCH_STAFF_ANIM, if (high) HIGH_ALCH_STAFF_GFX else LOW_ALCH_STAFF_GFX)
- } else {
- visualize(player, if (high) HIGH_ALCH_ANIM else LOW_ALCH_ANIM, if (high) HIGH_ALCH_GFX else LOW_ALCH_GFX)
+ player.setAttribute("alchemyspelltime", getWorldTicks() + 100)
+
+ player.pulseManager.run(object : Pulse(){
+ var counter = 0
+ override fun pulse(): Boolean {
+ if (amountInInventory(player, item.id) == 0 || getAttribute(player, "alchemyspelltime", 0) <= getWorldTicks())
+ return true
+
+ if (counter % (if (high) 5 else 2) == 0) {
+ if (explorersRing) {
+ visualize(player, LOW_ALCH_ANIM, EXPLORERS_RING_GFX)
+ } else {
+ val weapon = getItemFromEquipment(player, EquipmentSlot.WEAPON)
+ if (weapon != null && weapon.id in MagicStaff.FIRE_RUNE.staves) {
+ visualize(player, if (high) HIGH_ALCH_STAFF_ANIM else LOW_ALCH_STAFF_ANIM, if (high) HIGH_ALCH_STAFF_GFX else LOW_ALCH_STAFF_GFX)
+ } else {
+ visualize(player, if (high) HIGH_ALCH_ANIM else LOW_ALCH_ANIM, if (high) HIGH_ALCH_GFX else LOW_ALCH_GFX)
+ }
+ }
+ playAudio(player, if (high) Sounds.HIGH_ALCHEMY_97 else Sounds.LOW_ALCHEMY_98)
+ player.dispatch(ItemAlchemizationEvent(item.id, high))
+ if (!explorersRing) {
+ removeAttribute(player, "spell:runes")
+ if (high)
+ requires(player,55, arrayOf(Item(Items.FIRE_RUNE_554,5),Item(Items.NATURE_RUNE_561,1)))
+ else
+ requires(player,21, arrayOf(Item(Items.FIRE_RUNE_554,3),Item(Items.NATURE_RUNE_561)))
+ removeRunes(player, false)
+ addXP(player, if (high) 65.0 else 31.0)
+ }
+ val amount = if (high) 1 else kotlin.math.min(10, amountInInventory(player, item.id))
+ if (player.inventory.remove(Item(item.id, amount)) && coins.amount > 0) {
+ player.inventory.add(Item(coins.id, coins.amount * amount))
+ }
+ //showMagicTab(player)
+ //setDelay(player, 2)
+ }
+ if (loop && !explorersRing) {
+ counter++
+ return false
+ } else {
+ return true
+ }
}
- }
- playAudio(player, if (high) Sounds.HIGH_ALCHEMY_97 else Sounds.LOW_ALCHEMY_98)
- player.dispatch(ItemAlchemizationEvent(item.id, high))
- if (player.inventory.remove(Item(item.id, 1)) && coins.amount > 0) {
- player.inventory.add(coins)
- }
- removeRunes(player)
- addXP(player, if (high) 65.0 else 31.0)
- showMagicTab(player)
- setDelay(player, 5)
+ })
return true
}
@@ -272,17 +333,26 @@ class ModernListeners : SpellListener("modern"){
player.sendMessage("A magical force prevents you from teleporting.")
return
}
- val hasHouse = player.houseManager.location.exitLocation != null
- if(!hasHouse){
- player.sendMessage("You do not have a house you can teleport to.")
- return
+
+ //Snowscape: teleport to the last house you entered, if possible
+ var houseOwner: Player
+ val lastHouseOwner = Repository.getPlayerByName(player.getAttribute("lasthouseentered", null))
+ if (lastHouseOwner != null && !lastHouseOwner.getHouseManager().isLocked()) {
+ houseOwner = lastHouseOwner
+ } else {
+ val hasHouse = player.houseManager.location.exitLocation != null
+ if(!hasHouse){
+ player.sendMessage("You do not have a house you can teleport to.")
+ return
+ }
+ houseOwner = player
}
- player.houseManager.preEnter(player, false)
+ houseOwner.houseManager.preEnter(player, false)
val teleType = TeleportManager.TeleportType.NORMAL
- val loc = player.houseManager.getEnterLocation()
+ val loc = houseOwner.houseManager.getEnterLocation()
player.teleporter.send(loc, teleType)
- player.houseManager.postEnter(player, false) //this actually runs when the teleport is SUBMITTED rather than EXECUTED, but this is fine
+ houseOwner.houseManager.postEnter(player, false) //this actually runs when the teleport is SUBMITTED rather than EXECUTED, but this is fine
removeRunes(player)
addXP(player,30.0)
setDelay(player,true)
diff --git a/Server/src/main/content/global/skill/prayer/Bones.kt b/Server/src/main/content/global/skill/prayer/Bones.kt
index 755a8062b..0917df2cb 100644
--- a/Server/src/main/content/global/skill/prayer/Bones.kt
+++ b/Server/src/main/content/global/skill/prayer/Bones.kt
@@ -28,6 +28,7 @@ enum class Bones(
*/
val bonemealId: Int?,
) {
+ ASHES(Items.ASHES_592, 4.5, null), //Snowscape: added ashes so the bonecrusher feature gives prayer exp. Ashes cannot be bured normally.
BONES(Items.BONES_526, 4.5, Items.BONEMEAL_4255),
BONES_2(Items.BONES_2530, 4.5, Items.BONEMEAL_4255),
BONES_3(Items.BONES_3187, 4.5, Items.BONEMEAL_4255),
diff --git a/Server/src/main/content/global/skill/prayer/PrayerAltarListener.kt b/Server/src/main/content/global/skill/prayer/PrayerAltarListener.kt
index 8ca2c7467..71982f578 100644
--- a/Server/src/main/content/global/skill/prayer/PrayerAltarListener.kt
+++ b/Server/src/main/content/global/skill/prayer/PrayerAltarListener.kt
@@ -12,11 +12,12 @@ import core.game.node.entity.skill.Skills
import core.game.world.map.Location
import org.rs09.consts.Scenery
import org.rs09.consts.Sounds
+import content.data.Quests
class PrayerAltarListener : InteractionListener {
override fun defineListeners() {
on(altars, IntType.SCENERY, "pray", "pray-at") { player, node ->
- if (node.id == Scenery.TRIBAL_STATUE_3863 && !hasRequirement(player, "Tai Bwo Wannai Trio")) {
+ if (node.id == Scenery.TRIBAL_STATUE_3863 && !hasRequirement(player, Quests.TAI_BWO_WANNAI_TRIO)) {
// https://runescape.wiki/w/Tribal_Statue?oldid=1940922
return@on true
}
@@ -43,9 +44,9 @@ class PrayerAltarListener : InteractionListener {
}
on(Scenery.CHAOS_ALTAR_61, IntType.SCENERY, "check") { player, _ ->
- if (getQuestStage(player, "Merlin's Crystal") == 70) {
+ if (getQuestStage(player, Quests.MERLINS_CRYSTAL) == 70) {
sendDialogue(player, "You find a small inscription at the bottom of the altar. It reads: 'Snarthon Candtrick Termanto'.")
- setQuestStage(player, "Merlin's Crystal", 80)
+ setQuestStage(player, Quests.MERLINS_CRYSTAL, 80)
} else {
sendMessage(player, "An altar of the evil god Zamorak.")
}
diff --git a/Server/src/main/content/global/skill/runecrafting/Altar.java b/Server/src/main/content/global/skill/runecrafting/Altar.java
index 29cc03953..c31853789 100644
--- a/Server/src/main/content/global/skill/runecrafting/Altar.java
+++ b/Server/src/main/content/global/skill/runecrafting/Altar.java
@@ -5,6 +5,9 @@ import core.game.node.entity.player.Player;
import core.game.node.scenery.Scenery;
import static core.api.ContentAPIKt.hasRequirement;
+import content.data.Quests;
+
+import core.game.world.map.Location;
/**
* Represents an altar an it's relative information(corresponding ruin, etc)
@@ -72,24 +75,32 @@ public enum Altar {
*/
public void enterRift(Player player) {
if (this == ASTRAL) {
- if (!hasRequirement(player, "Lunar Diplomacy"))
+ if (!hasRequirement(player, Quests.LUNAR_DIPLOMACY))
return;
}
if (this == DEATH) {
- if (!hasRequirement(player, "Mourning's End Part II"))
+ if (!hasRequirement(player, Quests.MOURNINGS_END_PART_II))
return;
}
if (this == BLOOD) {
- if (!hasRequirement(player, "Legacy of Seergaze"))
+ if (!hasRequirement(player, Quests.LEGACY_OF_SEERGAZE))
return;
+ }
+ if (this == SOUL) {
+ if (player.getQuestRepository().isComplete(Quests.DRAGON_SLAYER)) {
+ player.getProperties().setTeleportLocation(Location.create(2836, 3285, 0));
+ } else {
+ player.sendMessage("You need to have completed the Dragon Slayer quest in order to do that.");
+ return;
+ }
}
if (this == LAW) {
if (!ItemDefinition.canEnterEntrana(player)) {
- player.sendMessage("You can't take weapons and armour into the law rift.");
+ player.sendMessage("The power of Saradomin prevents you from taking armour or weaponry to Entrana.");
return;
}
}
- if (this == COSMIC && !player.getQuestRepository().isComplete("Lost City")) {
+ if (this == COSMIC && !player.getQuestRepository().isComplete(Quests.LOST_CITY)) {
player.getPacketDispatch().sendMessage("You need to have completed the Lost City quest in order to do that.");
return;
}
diff --git a/Server/src/main/content/global/skill/runecrafting/CombinationRune.java b/Server/src/main/content/global/skill/runecrafting/CombinationRune.java
index 62760bfdc..e23a78f8b 100644
--- a/Server/src/main/content/global/skill/runecrafting/CombinationRune.java
+++ b/Server/src/main/content/global/skill/runecrafting/CombinationRune.java
@@ -7,11 +7,11 @@ import core.game.node.item.Item;
* @author 'Vexia
*/
public enum CombinationRune {
- MIST(new Item(4695), 6, 8.0, new Altar[] { Altar.WATER, Altar.AIR }, Rune.AIR, Rune.WATER),
- DUST(new Item(4696), 10, 8.3, new Altar[] { Altar.EARTH, Altar.AIR }, Rune.AIR, Rune.EARTH),
- MUD(new Item(4698), 13, 9.3, new Altar[] { Altar.EARTH, Altar.WATER }, Rune.WATER, Rune.EARTH),
- SMOKE(new Item(4697), 15, 8.5, new Altar[] { Altar.FIRE, Altar.AIR }, Rune.AIR, Rune.FIRE),
- STEAM(new Item(4694), 19, 9.3, new Altar[] { Altar.WATER, Altar.FIRE }, Rune.WATER, Rune.FIRE),
+ MIST(new Item(4695), 6, 10.0, new Altar[] { Altar.WATER, Altar.AIR }, Rune.AIR, Rune.WATER),
+ DUST(new Item(4696), 10, 10.0, new Altar[] { Altar.EARTH, Altar.AIR }, Rune.AIR, Rune.EARTH),
+ MUD(new Item(4698), 13, 10.0, new Altar[] { Altar.EARTH, Altar.WATER }, Rune.WATER, Rune.EARTH),
+ SMOKE(new Item(4697), 15, 10.0, new Altar[] { Altar.FIRE, Altar.AIR }, Rune.AIR, Rune.FIRE),
+ STEAM(new Item(4694), 19, 10.0, new Altar[] { Altar.WATER, Altar.FIRE }, Rune.WATER, Rune.FIRE),
LAVA(new Item(4699), 23, 10.0, new Altar[] { Altar.FIRE, Altar.EARTH }, Rune.EARTH, Rune.FIRE);
/**
diff --git a/Server/src/main/content/global/skill/runecrafting/MysteriousRuinListener.kt b/Server/src/main/content/global/skill/runecrafting/MysteriousRuinListener.kt
index 68fcf10c7..7bf55dd7f 100644
--- a/Server/src/main/content/global/skill/runecrafting/MysteriousRuinListener.kt
+++ b/Server/src/main/content/global/skill/runecrafting/MysteriousRuinListener.kt
@@ -1,5 +1,6 @@
package content.global.skill.runecrafting
+import content.data.Quests
import content.region.misthalin.varrock.diary.VarrockAchivementDiary.Companion.EasyTasks.ENTER_EARTH_ALTAR
import core.api.*
import core.game.container.impl.EquipmentContainer.SLOT_HAT
@@ -19,7 +20,7 @@ class MysteriousRuinListener : InteractionListener {
private val animation = Animation(827)
private val allowedUsed = arrayOf(1438, 1448, 1444, 1440, 1442, 5516, 1446, 1454, 1452, 1462, 1458, 1456, 1450, 1460).toIntArray()
private val allowedWith = allRuins()
- private val nothingInteresting = "Nothing interesting happens"
+ private val nothingInteresting = "Nothing interesting happens."
override fun defineListeners() {
onUseWith(IntType.SCENERY, allowedUsed, *allowedWith) { player, used, with ->
@@ -76,9 +77,9 @@ class MysteriousRuinListener : InteractionListener {
private fun checkQuestCompletion(player: Player, ruin: MysteriousRuin): Boolean {
return when (ruin) {
- MysteriousRuin.DEATH -> hasRequirement(player, QuestReq(MEP_2), true)
- MysteriousRuin.BLOOD -> hasRequirement(player, QuestReq(SEERGAZE), true)
- else -> hasRequirement(player, QuestReq(RUNE_MYSTERIES), true)
+ MysteriousRuin.DEATH -> hasRequirement(player, Quests.MOURNINGS_END_PART_II, true)
+ MysteriousRuin.BLOOD -> hasRequirement(player, Quests.LEGACY_OF_SEERGAZE, true)
+ else -> hasRequirement(player, Quests.RUNE_MYSTERIES, true)
}
}
@@ -102,4 +103,4 @@ class MysteriousRuinListener : InteractionListener {
})
}
-}
\ No newline at end of file
+}
diff --git a/Server/src/main/content/global/skill/runecrafting/PouchManager.kt b/Server/src/main/content/global/skill/runecrafting/PouchManager.kt
index 52aba0d4b..6bb4020f0 100644
--- a/Server/src/main/content/global/skill/runecrafting/PouchManager.kt
+++ b/Server/src/main/content/global/skill/runecrafting/PouchManager.kt
@@ -1,5 +1,6 @@
package content.global.skill.runecrafting
+import core.api.*
import core.game.container.Container
import core.game.node.entity.player.Player
import core.game.node.entity.skill.Skills
@@ -7,109 +8,131 @@ import core.game.node.item.Item
import org.json.simple.JSONArray
import org.json.simple.JSONObject
import org.rs09.consts.Items
-import core.tools.colorize
/**
* A class for managing rune pouches.
* @param player the player this manager instance belongs to.
- * @author Ceikry
+ * @author Ceikry, Player Name
*/
class PouchManager(val player: Player) {
-
val pouches = mapOf(
- Items.SMALL_POUCH_5509 to RCPouch(3,1),
- Items.MEDIUM_POUCH_5510 to RCPouch(6,25),
- Items.LARGE_POUCH_5512 to RCPouch(9,50),
- Items.GIANT_POUCH_5514 to RCPouch(12,75)
+ Items.SMALL_POUCH_5509 to RCPouch(3, 3, 1),
+ Items.MEDIUM_POUCH_5510 to RCPouch(6, 264, 25),
+ Items.LARGE_POUCH_5512 to RCPouch(9, 186, 50),
+ Items.GIANT_POUCH_5514 to RCPouch(12,140, 75)
)
/**
* Method to add essence to a pouch
- * @param pouchId the id of the pouch we are adding to
+ * @param itemId the item ID of the pouch we are adding to
* @param amount the amount of essence to add
* @param essence the ID of the essence item we are trying to add
- * @author Ceikry
+ * @author Ceikry, Player Name
*/
- fun addToPouch(pouchId: Int, amount: Int, essence: Int){
- if(!checkRequirement(pouchId)){
- player.sendMessage(colorize("%RYou lack the required level to use this pouch."))
+ fun addToPouch(itemId: Int, amount: Int, essence: Int, fromBank: Boolean = false) {
+ val pouchId = if (isDecayedPouch(itemId)) itemId - 1 else itemId
+ if (!checkRequirement(pouchId)) {
+ sendMessage(player, "You lack the required level to use this pouch.")
return
}
var amt = amount
val pouch = pouches[pouchId]
- val otherEssence = when(essence){
+ val otherEssence = when(essence) {
Items.RUNE_ESSENCE_1436 -> Items.PURE_ESSENCE_7936
Items.PURE_ESSENCE_7936 -> Items.RUNE_ESSENCE_1436
else -> 0
}
pouch ?: return
- if(amount > pouch.container.freeSlots()){
+ if (amount > pouch.container.freeSlots()) {
amt = pouch.container.freeSlots()
}
- if(amt == 0){
- player.sendMessage("This pouch is already full.")
+ if (amt == pouch.container.freeSlots()) {
+ sendMessage(player, "Your pouch is full.") //https://www.youtube.com/watch?v=wbYtRwODKTo
}
- if(pouch.container.contains(otherEssence,1)){
- player.sendMessage("You can only store one type of essence in each pouch.")
+ if (pouch.container.contains(otherEssence,1)) {
+ sendMessage(player, "You can only store one type of essence in each pouch.")
return
}
- player.inventory.remove(Item(essence,amt))
- pouch.container.add(Item(essence,amt))
- }
+ var disappeared = false
+ if (itemId != Items.SMALL_POUCH_5509) {
+ pouch.charges -= amt
+ }
+ if (pouch.charges <= 0) {
+ pouch.currentCap -= when (pouchId) {
+ Items.MEDIUM_POUCH_5510 -> 1
+ Items.LARGE_POUCH_5512 -> 2
+ Items.GIANT_POUCH_5514 -> 3
+ else /*small pouch*/ -> 0
+ }
+ if (pouch.currentCap <= 0) {
+ // The pouch will disappear: https://runescape.wiki/w/Runecrafting_pouches?oldid=708494, https://oldschool.runescape.wiki/w/Essence_pouch
+ // "Degraded pouches will continue to degrade and lose essence capacity until they disappear or are repaired." implies that this is the end result of a gradual decay process
+ if (removeItem(player, itemId)) {
+ disappeared = true
+ sendMessage(player, "Your pouch has degraded completely.")
+ // Reset the pouch for when the player obtains a new one
+ pouch.currentCap = pouch.capacity
+ pouch.charges = pouch.maxCharges
+ pouch.remakeContainer()
+ replaceAllItems(player, itemId, itemId - 1) //in case the player had more copies
+ }
+ } else {
+ if (!isDecayedPouch(itemId)) {
+ replaceAllItems(player, itemId, itemId + 1)
+ }
+ sendMessage(player, "Your pouch has decayed through use.") //https://www.youtube.com/watch?v=FUcPYrgPUlQ
+ pouch.charges = 9 * pouch.currentCap //implied by multiple contemporaneous sources, quantified only by https://oldschool.runescape.wiki/w/Large_pouch
+ pouch.remakeContainer()
+ if (amt > pouch.currentCap) {
+ amt = pouch.currentCap
+ }
+ }
+ }
+ val essItem = Item(essence, amt)
+ if (!disappeared && (fromBank && player.getBank().remove(essItem)) || removeItem(player, essItem)) {
+ pouch.container.add(essItem)
+ }
+ }
/**
* Method to withdraw rune essence from a pouch.
- * @param pouchId the item ID of the pouch to withdraw from
- * @author Ceikry
+ * @param itemId the item ID of the pouch to withdraw from
+ * @author Ceikry, Player Name
*/
- fun withdrawFromPouch(pouchId: Int){
+ fun withdrawFromPouch(itemId: Int) {
+ val pouchId = if (isDecayedPouch(itemId)) itemId - 1 else itemId
val pouch = pouches[pouchId]
pouch ?: return
- val playerFree = player.inventory.freeSlots()
+ val playerFree = freeSlots(player)
var amount = pouch.currentCap - pouch.container.freeSlots()
- if (amount > playerFree) amount = playerFree
- player.debug("$amount")
- if(amount == 0) return
- val essence = Item(pouch.container.get(0).id,amount)
- pouch.container.remove(essence)
- pouch.container.shift()
- player.inventory.add(essence)
- if(pouch.charges-- <= 0){
- pouch.currentCap -= when(pouchId){
- 5510 -> 1
- 5512 -> 2
- 5514 -> 3
- else -> 0
- }
- if(pouch.currentCap <= 0){
- player.inventory.remove(Item(pouchId))
- player.inventory.add(Item(pouchId + 1))
- player.sendMessage(colorize("%RYour ${Item(pouchId).name} has degraded completely."))
- }
- pouch.remakeContainer()
- pouch.charges = 10
- if(pouchId != 5509) {
- player.sendMessage(colorize("%RYour ${Item(pouchId).name.toLowerCase()} has degraded slightly from use."))
+ if (amount > playerFree) {
+ amount = playerFree
+ } else {
+ sendMessage(player, "Your pouch has no essence left in it.") //https://www.youtube.com/watch?v=wbYtRwODKTo
+ if (amount == 0) {
+ return
}
}
-
+ val essence = Item(pouch.container.get(0).id, amount)
+ pouch.container.remove(essence)
+ pouch.container.shift()
+ addItem(player, essence.id, essence.amount)
}
-
/**
* Method to save pouches to a root JSONObject
* @param root the JSONObject we are adding the "pouches" JSONArray to
* @author Ceikry
*/
- fun save(root: JSONObject){
+ fun save(root: JSONObject) {
val pouches = JSONArray()
- for(i in this.pouches){
+ for(i in this.pouches) {
val pouch = JSONObject()
pouch.put("id",i.key.toString())
val items = JSONArray()
- for(item in i.value.container.toArray()){
+ for(item in i.value.container.toArray()) {
item ?: continue
val it = JSONObject()
it.put("itemId",item.id.toString())
@@ -124,14 +147,13 @@ class PouchManager(val player: Player) {
root.put("pouches",pouches)
}
-
/**
* Method to parse save data from a JSONArray
* @param data the JSONArray that contains the data to parse
* @author Ceikry
*/
- fun parse(data: JSONArray){
- for(e in data){
+ fun parse(data: JSONArray) {
+ for (e in data){
val pouch = e as JSONObject
val id = pouch["id"].toString().toInt()
val p = pouches[id]
@@ -141,7 +163,7 @@ class PouchManager(val player: Player) {
p.charges = charges
p.currentCap = currentCap
p.remakeContainer()
- for(i in pouch["container"] as JSONArray){
+ for (i in pouch["container"] as JSONArray) {
val it = i as JSONObject
it["itemId"] ?: continue
val item = it["itemId"].toString().toInt()
@@ -151,33 +173,31 @@ class PouchManager(val player: Player) {
}
}
-
/**
* Method for checking the level requirement for a given pouch.
* @param pouchId the item ID of the pouch to check
* @author Ceikry
*/
- fun checkRequirement(pouchId: Int): Boolean{
+ fun checkRequirement(pouchId: Int): Boolean {
val p = pouches[pouchId]
p ?: return false
return player.skills.getLevel(Skills.RUNECRAFTING) >= p.levelRequirement
}
-
/**
* Method for sending the player a message about how much space is left in a pouch
- * @param pouchId the item ID of the pouch to check
- * @author Ceikry
+ * @param itemId the item ID of the pouch to check
+ * @author Ceikry, Player Name
*/
- fun checkAmount(pouchId: Int){
+ fun checkAmount(itemId: Int) {
+ val pouchId = if (isDecayedPouch(itemId)) itemId - 1 else itemId
val p = pouches[pouchId]
p ?: return
player.sendMessage("This pouch has space for ${p.container.freeSlots()} more essence.")
}
-
- fun isDecayedPouch(pouchId: Int): Boolean{
- if(pouchId == 5510) return false
+ fun isDecayedPouch(pouchId: Int): Boolean {
+ if (pouchId == Items.MEDIUM_POUCH_5510) return false
return pouches[pouchId - 1] != null
}
@@ -185,12 +205,12 @@ class PouchManager(val player: Player) {
* A class that represents a runecrafting pouch.
* @author Ceikry
*/
- class RCPouch(val capacity: Int, val levelRequirement: Int){
+ class RCPouch(val capacity: Int, val maxCharges: Int, val levelRequirement: Int) {
var container = Container(capacity)
var currentCap = capacity
- var charges = 10
- fun remakeContainer(){
+ var charges = maxCharges
+ fun remakeContainer() {
this.container = Container(currentCap)
}
}
-}
\ No newline at end of file
+}
diff --git a/Server/src/main/content/global/skill/runecrafting/Rune.java b/Server/src/main/content/global/skill/runecrafting/Rune.java
index 7736c579b..ef69a1d2f 100644
--- a/Server/src/main/content/global/skill/runecrafting/Rune.java
+++ b/Server/src/main/content/global/skill/runecrafting/Rune.java
@@ -11,9 +11,9 @@ import core.game.node.item.Item;
public enum Rune {
AIR(Runes.AIR_RUNE.transform(), 1, 5, new int[] { 1, 11, 22, 33, 44, 55, 66, 77, 88, 99, 110 }),
MIND(Runes.MIND_RUNE.transform(), 2, 5.5, new int[] { 1, 14, 28, 42, 56, 70, 84, 98, 112 }),
- WATER(Runes.WATER_RUNE.transform(), 5, 6, new int[] { 1, 19, 38, 57, 76, 95, 114 }),
- EARTH(Runes.EARTH_RUNE.transform(), 9, 6.5, new int[] { 1, 26, 52, 78, 104 }),
- FIRE(Runes.FIRE_RUNE.transform(), 14, 7, new int[] { 1, 35, 70, 105 }),
+ WATER(Runes.WATER_RUNE.transform(), 1, 5, new int[] { 1, 11, 22, 33, 44, 55, 66, 77, 88, 99, 110 }),
+ EARTH(Runes.EARTH_RUNE.transform(), 1, 5, new int[] { 1, 11, 22, 33, 44, 55, 66, 77, 88, 99, 110 }),
+ FIRE(Runes.FIRE_RUNE.transform(), 1, 5, new int[] { 1, 11, 22, 33, 44, 55, 66, 77, 88, 99, 110 }),
BODY(Runes.BODY_RUNE.transform(), 20, 7.5, new int[] { 1, 46, 92, 138 }),
COSMIC(Runes.COSMIC_RUNE.transform(), 27, 8, new int[] { 1, 59, 118 }),
CHAOS(Runes.CHAOS_RUNE.transform(), 35, 8.5, new int[] { 1, 74, 148 }),
@@ -22,7 +22,7 @@ public enum Rune {
LAW(Runes.LAW_RUNE.transform(), 54, 9.5, new int[] { 1, 110, }),
DEATH(Runes.DEATH_RUNE.transform(), 65, 10, new int[] { 1, 131 }),
BLOOD(Runes.BLOOD_RUNE.transform(), 77, 10.5, new int[] { 1, 154 }),
- SOUL(Runes.SOUL_RUNE.transform(), 90, 11);
+ SOUL(Runes.SOUL_RUNE.transform(), 90, 11, new int[] { 1, 179 });
/**
* Constructs a new {@code Rune} {@code Object}.
diff --git a/Server/src/main/content/global/skill/runecrafting/RuneCraftPulse.java b/Server/src/main/content/global/skill/runecrafting/RuneCraftPulse.java
index d32bea579..017efe99c 100644
--- a/Server/src/main/content/global/skill/runecrafting/RuneCraftPulse.java
+++ b/Server/src/main/content/global/skill/runecrafting/RuneCraftPulse.java
@@ -2,6 +2,7 @@ package content.global.skill.runecrafting;
import content.global.handlers.item.equipment.fistofguthixgloves.FOGGlovesManager;
import core.ServerConstants;
+import core.api.Container;
import core.game.container.impl.EquipmentContainer;
import core.game.node.entity.impl.Animator.Priority;
import core.game.node.entity.player.Player;
@@ -23,11 +24,13 @@ import org.rs09.consts.Sounds;
import java.util.ArrayList;
import java.util.Arrays;
+import content.data.Quests;
/**
* A class used to craft runes.
*
* @author Vexia
+ * @author Player Name
*/
public final class RuneCraftPulse extends SkillPulse- {
@@ -40,6 +43,7 @@ public final class RuneCraftPulse extends SkillPulse
- {
* Represents the pure essence item.
*/
private static final Item PURE_ESSENCE = new Item(7936);
+ private static final Item SOFT_CLAY = new Item(1761);
/**
* Represents the binding necklace item.
@@ -100,53 +104,53 @@ public final class RuneCraftPulse extends SkillPulse
- {
@Override
public boolean checkRequirements() {
if (altar == Altar.ASTRAL) {
- if (!hasRequirement(player, "Lunar Diplomacy"))
+ if (!hasRequirement(player, Quests.LUNAR_DIPLOMACY))
return false;
}
if (altar == Altar.DEATH) {
- if (!hasRequirement(player, "Mourning's End Part II"))
+ if (!hasRequirement(player, Quests.MOURNINGS_END_PART_II))
return false;
}
if (altar == Altar.BLOOD) {
- if (!hasRequirement(player, "Legacy of Seergaze"))
+ if (!hasRequirement(player, Quests.LEGACY_OF_SEERGAZE))
return false;
}
- if (!altar.isOurania() && player.getSkills().getLevel(Skills.RUNECRAFTING) < rune.getLevel()) {
- player.getPacketDispatch().sendMessage("You need a Runecrafting level of at least " + rune.getLevel() + " to craft this rune.");
+ if (!altar.isOurania() && getDynLevel(player, Skills.RUNECRAFTING) < rune.getLevel()) {
+ sendMessage(player, "You need a Runecrafting level of at least " + rune.getLevel() + " to craft this rune.");
return false;
}
- if (combination && !player.getInventory().containsItem(PURE_ESSENCE)) {
- player.getPacketDispatch().sendMessage("You need pure essence to craft this rune.");
+ if (combination && amountInInventory(player, PURE_ESSENCE.getId()) == 0) {
+ sendMessage(player, "You need pure essence to craft this rune.");
return false;
}
- if (!altar.isOurania() && !rune.isNormal() && !player.getInventory().containsItem(PURE_ESSENCE)) {
- player.getPacketDispatch().sendMessage("You need pure essence to craft this rune.");
+ if (!altar.isOurania() && !rune.isNormal() && amountInInventory(player, PURE_ESSENCE.getId()) == 0 && amountInInventory(player, SOFT_CLAY.getId()) == 0) {
+ sendMessage(player, "You need pure essence to craft this rune, or soft clay to craft teleport tablets.");
return false;
}
- if (!altar.isOurania() && rune.isNormal() && !player.getInventory().containsItem(PURE_ESSENCE) && !player.getInventory().containsItem(RUNE_ESSENCE)) {
- player.getPacketDispatch().sendMessage("You need rune essence or pure essence in order to craft this rune.");
+ if (!altar.isOurania() && rune.isNormal() && amountInInventory(player, PURE_ESSENCE.getId()) == 0 && amountInInventory(player, RUNE_ESSENCE.getId()) == 0 && amountInInventory(player, SOFT_CLAY.getId()) == 0) {
+ sendMessage(player, "You need rune or pure essence to craft this rune, or soft clay to craft teleport tablets.");
return false;
}
- if (altar.isOurania() && !player.getInventory().containsItem(PURE_ESSENCE)) {
- player.getPacketDispatch().sendMessage("You need pure essence to craft this rune.");
+ if (altar.isOurania() && amountInInventory(player, PURE_ESSENCE.getId()) == 0) {
+ sendMessage(player, "You need pure essence to craft this rune.");
return false;
}
- if (combination && player.getSkills().getLevel(Skills.RUNECRAFTING) < combo.getLevel()) {
- player.getPacketDispatch().sendMessage("You need a Runecrafting level of at least " + combo.getLevel() + " to combine this rune.");
+ if (combination && getDynLevel(player, Skills.RUNECRAFTING) < combo.getLevel()) {
+ sendMessage(player, "You need a Runecrafting level of at least " + combo.getLevel() + " to combine this rune.");
return false;
}
if (node != null) {
if (node.getName().contains("rune") && !hasSpellImbue()) {
final Rune r = Rune.forItem(node);
final Talisman t = Talisman.forName(r.name());
- if (!player.getInventory().containsItem(t.getTalisman())) {
- player.getPacketDispatch().sendMessage("You don't have the correct talisman to combine this rune.");
+ if (amountInInventory(player, t.getTalisman().getId()) == 0) {
+ sendMessage(player, "You don't have the correct talisman to combine this rune.");
return false;
}
talisman = t;
}
}
- player.lock(4);
+ player.lock(2);
return true;
}
@@ -159,33 +163,79 @@ public final class RuneCraftPulse extends SkillPulse
- {
@Override
public boolean reward() {
+ setDelay(5);
if (!combination) {
- craft();
+ if (amountInInventory(player, SOFT_CLAY.getId()) > 0) {
+ craftTablet();
+ } else {
+ craft();
+ }
} else {
combine();
}
- return true;
+ SnowscapePouchListener.Companion.emptyPouches(player);
+ return false;
}
+ private static final int[][] OuraniaTable = { //https://x.com/JagexAsh/status/1312893446395506688/photo/1
+ /*level up to 9*/ { 2, 7, 15, 30, 60, 105, 165, 250, 400, 700,1300,2500,5000,10000},
+ /*level up to 19*/ { 3, 9, 21, 45, 85, 145, 225, 400,1000,2200,4600,6700,8500,10000},
+ /*level up to 29*/ { 8, 23, 55, 110, 220, 430, 850,1650,3250,4750,6150,7500,8800,10000},
+ /*level up to 39*/ { 20, 60, 120, 250, 500,1000,2000,4000,5300,6500,7600,8500,9300,10000},
+ /*level up to 49*/ { 40, 120, 240, 500,1000,2000,4000,5500,6500,7300,8050,8750,9400,10000},
+ /*level up to 59*/ { 80, 250, 600,1300,2650,4150,5250,6250,7000,7700,8350,8950,9500,10000},
+ /*level up to 69*/ {100, 300, 700,1500,3050,4450,5500,6450,7200,7900,8500,9050,9550,10000},
+ /*level up to 79*/ {200, 700,1700,3500,5000,6200,7100,7800,8300,8700,9100,9400,9700,10000},
+ /*level up to 89*/ {400,1000,2450,3900,5250,6300,7100,7800,8400,8900,9300,9600,9800,10000},
+ /*level up to 98*/ {650,1650,3300,4750,6100,7100,7800,8400,8900,9300,9600,9800,9900,10000},
+ /*level up to 99*/ {900,2200,3750,5200,6550,7500,8100,8600,9000,9300,9600,9800,9900,10000}
+ };
+
/**
* Method used to craft runes.
*/
private void craft() {
- final Item item = new Item(getEssence().getId(), getEssenceAmount());
- int amount = player.getInventory().getAmount(item);
- if (!altar.isOurania()) {
+ final Item item = getEssenceItem();
+ //int amount = player.getInventory().getAmount(item);
+ int amount = 2;
+ if (altar.isOurania()) {
+ amount = 1;
+ if (removeItem(player, item, Container.INVENTORY)) {
+ sendMessage(player, "You bind the temple's power into runes.");
+ player.incrementAttribute("/save:" + STATS_BASE + ":" + STATS_RC, amount);
+
+ int[] OuraniaValues;
+ if (getDynLevel(player, Skills.RUNECRAFTING) == 99) {
+ OuraniaValues = OuraniaTable[10];
+ } else {
+ int index = getDynLevel(player, Skills.RUNECRAFTING) / 10;
+ OuraniaValues = OuraniaTable[index];
+ }
+ for (int i = 0; i < amount; i++) {
+ int roll = RandomFunction.random(10000);
+ Rune rune = null;
+ for (int j = 0; j < 14; j++) {
+ if (roll < OuraniaValues[j]) {
+ rune = Rune.values()[13 - j];
+ break;
+ }
+ }
+ rewardXP(player, Skills.RUNECRAFTING, rune.getExperience() * 4);
+ addItemOrDrop(player, rune.getRune().getId(), getMultiplier(rune));
+ }
+ }
+ } else {
int total = 0;
for(int j = 0; j < amount; j++) {
// since getMultiplier is stochastic, roll `amount` independent copies
- total += getMultiplier();
+ total += getMultiplier(rune);
}
- Item i = new Item(rune.getRune().getId(), total);
- if (player.getInventory().remove(item) && player.getInventory().hasSpaceFor(i)) {
- player.getPacketDispatch().sendMessage("You bind the temple's power into " + (combination ? combo.getRune().getName().toLowerCase() : rune.getRune().getName().toLowerCase()) + "s.");
- player.getInventory().add(i);
+ if (removeItem(player, item, Container.INVENTORY)) {
+ sendMessage(player, "You bind the temple's power into " + (combination ? combo.getRune().getName().toLowerCase() : rune.getRune().getName().toLowerCase()) + "s.");
+ addItemOrDrop(player, rune.getRune().getId(), total);
player.incrementAttribute("/save:" + STATS_BASE + ":" + STATS_RC, amount);
-
+
// Fist of guthix gloves
double xp = rune.getExperience() * amount;
if ((altar == Altar.AIR && inEquipment(player, Items.AIR_RUNECRAFTING_GLOVES_12863, 1))
@@ -193,7 +243,7 @@ public final class RuneCraftPulse extends SkillPulse
- {
|| (altar == Altar.EARTH && inEquipment(player, Items.EARTH_RUNECRAFTING_GLOVES_12865, 1))) {
xp += xp * FOGGlovesManager.updateCharges(player, amount) / amount;
}
- player.getSkills().addExperience(Skills.RUNECRAFTING, xp, true);
+ rewardXP(player, Skills.RUNECRAFTING, xp);
// Achievement Diary handling
// Craft some nature runes
@@ -201,7 +251,8 @@ public final class RuneCraftPulse extends SkillPulse
- {
player.getAchievementDiaryManager().finishTask(player, DiaryType.KARAMJA, 2, 3);
}
// Craft 196 or more air runes simultaneously
- if (altar == Altar.AIR && i.getAmount() >= 196) {
+ //Snowscape: since runecrafting is one essence at a time, you can't craft 196 at once. So just trigger when level 66 is reached.
+ if (altar == Altar.AIR && getDynLevel(player, Skills.RUNECRAFTING) >= 66) {
player.getAchievementDiaryManager().finishTask(player, DiaryType.FALADOR, 2, 2);
}
// Craft a water rune at the Water Altar
@@ -210,64 +261,77 @@ public final class RuneCraftPulse extends SkillPulse
- {
}
}
- } else {
- if (player.getInventory().remove(item)) {
- player.getPacketDispatch().sendMessage("You bind the temple's power into runes.");
- player.incrementAttribute("/save:" + STATS_BASE + ":" + STATS_RC, amount);
- for (int i = 0; i < amount; i++) {
- Rune rune = null;
- while (rune == null) {
- final Rune temp = Rune.values()[RandomFunction.random(Rune.values().length)];
- if (player.getSkills().getLevel(Skills.RUNECRAFTING) >= temp.getLevel()) {
- rune = temp;
- } else {
- if (RandomFunction.random(3) == 1) {
- rune = temp;
- }
- }
- }
- player.getSkills().addExperience(Skills.RUNECRAFTING, rune.getExperience() * 2, true);
- Item runeItem = rune.getRune();
- player.getInventory().add(runeItem);
- }
- }
}
}
/**
* Method used to combine runes.
*/
- private final void combine() {
+ private void combine() {
final Item remove = node.getName().contains("talisman") ? node : talisman != null ? talisman.getTalisman() : Talisman.forName(Rune.forItem(node).name()).getTalisman();
boolean imbued = hasSpellImbue();
- if (!imbued ? player.getInventory().remove(remove) : imbued) {
+ if (!imbued ? removeItem(player, remove, Container.INVENTORY) : imbued) {
int amount = 0;
- int essenceAmt = player.getInventory().getAmount(PURE_ESSENCE);
+ //int essenceAmt = player.getInventory().getAmount(PURE_ESSENCE);
+ int essenceAmt = 1;
+ int multiplier = getMultiplier(altar.getRune()) * 2;
final Item rune = node.getName().contains("rune") ? Rune.forItem(node).getRune() : Rune.forName(Talisman.forItem(node).name()).getRune();
int runeAmt = player.getInventory().getAmount(rune);
- if (essenceAmt > runeAmt) {
- amount = runeAmt;
- } else {
- amount = essenceAmt;
- }
- if (player.getInventory().remove(new Item(PURE_ESSENCE.getId(), amount)) && player.getInventory().remove(new Item(rune.getId(), amount))) {
+ amount = Math.min(multiplier, runeAmt);
+ if (removeItem(player, new Item(PURE_ESSENCE.getId(), essenceAmt), Container.INVENTORY) && removeItem(player, new Item(rune.getId(), amount), Container.INVENTORY)) {
+ rewardXP(player, Skills.RUNECRAFTING, combo.getExperience() * 2);
for (int i = 0; i < amount; i++) {
if (RandomFunction.random(1, 3) == 1 || hasBindingNecklace()) {
- player.getInventory().add(new Item(combo.getRune().getId(), 1));
- player.getSkills().addExperience(Skills.RUNECRAFTING, combo.getExperience(), true);
+ addItemOrDrop(player, combo.getRune().getId(), 1);
+ //rewardXP(player, Skills.RUNECRAFTING, combo.getExperience());
}
}
if (hasBindingNecklace()) {
player.getEquipment().get(EquipmentContainer.SLOT_AMULET).setCharge(player.getEquipment().get(EquipmentContainer.SLOT_AMULET).getCharge() - 1);
- if (1000 - player.getEquipment().get(EquipmentContainer.SLOT_AMULET).getCharge() > 14) {
- player.getEquipment().remove(BINDING_NECKLACE, true);
- player.getPacketDispatch().sendMessage("Your binding necklace crumbles into dust.");
+ if (1000 - player.getEquipment().get(EquipmentContainer.SLOT_AMULET).getCharge() >= 400) {
+ if (player.getEquipment().remove(BINDING_NECKLACE, true)) {
+ sendMessage(player, "
Your binding necklace crumbles into dust.");
+ playAudio(player, Sounds.DESTROY_OBJECT_2381);
+ }
}
+ } else {
+ sendMessage(player, "Some of the runes are destroyed, as you are not wearing a Binding Necklace.");
}
+ // Snowscape: adding the imbue effect after crafting so that a talisman isn't required for every essence
+ player.setAttribute("spell:imbue", GameWorld.getTicks() + 20);
}
}
}
+ /**
+ * Method used to craft tablets. Custom for Snowscape
+ */
+ private final void craftTablet() {
+ //int amount = player.getInventory().getAmount(new Item(1761));
+ int amount = 1;
+ Item clay = new Item(1761, amount);
+ Item tablet = null;
+ if (altar == Altar.AIR) { tablet = new Item(13599, amount); }
+ if (altar == Altar.MIND) { tablet = new Item(13600, amount); }
+ if (altar == Altar.WATER) { tablet = new Item(13601, amount); }
+ if (altar == Altar.EARTH) { tablet = new Item(13602, amount); }
+ if (altar == Altar.FIRE) { tablet = new Item(13603, amount); }
+ if (altar == Altar.BODY) { tablet = new Item(13604, amount); }
+ if (altar == Altar.COSMIC) { tablet = new Item(13605, amount); }
+ if (altar == Altar.CHAOS) { tablet = new Item(13606, amount); }
+ if (altar == Altar.ASTRAL) { tablet = new Item(13611, amount); }
+ if (altar == Altar.NATURE) { tablet = new Item(13607, amount); }
+ if (altar == Altar.LAW) { tablet = new Item(13608, amount); }
+ if (altar == Altar.DEATH) { tablet = new Item(13609, amount); }
+ if (altar == Altar.BLOOD) { tablet = new Item(13610, amount); }
+ if (altar == Altar.SOUL) { tablet = new Item(8022, amount); }
+ if (tablet != null && player.getInventory().remove(clay)) {
+ player.getInventory().add(tablet);
+ player.getSkills().addExperience(Skills.RUNECRAFTING, rune.getExperience() * amount * 2, true);
+ player.getPacketDispatch().sendMessage("You bind the temple's power into teleport tablets.");
+ }
+ }
+
/**
* Checks if the player has the spell imbue.
*
@@ -278,39 +342,25 @@ public final class RuneCraftPulse extends SkillPulse- {
}
/**
- * Gets the essence amount.
+ * Gets the rune essence item.
*
- * @return the amount of essence.
+ * @return the rune essence item.
*/
- private int getEssenceAmount() {
- if (altar.isOurania() && player.getInventory().containsItem(PURE_ESSENCE)) {
- return player.getInventory().getAmount(PURE_ESSENCE);
+ private Item getEssenceItem() {
+ if (altar.isOurania() && amountInInventory(player, PURE_ESSENCE.getId()) > 0) {
+ //return new Item(PURE_ESSENCE.getId(), amountInInventory(player, PURE_ESSENCE.getId()));
+ return new Item(PURE_ESSENCE.getId(), 1);
}
- if (!rune.isNormal() && player.getInventory().containsItem(PURE_ESSENCE)) {
- return player.getInventory().getAmount(PURE_ESSENCE);
- } else if (rune.isNormal() && player.getInventory().containsItem(PURE_ESSENCE)) {
- return player.getInventory().getAmount(PURE_ESSENCE);
- } else {
- return player.getInventory().getAmount(RUNE_ESSENCE);
+ if (!rune.isNormal() && amountInInventory(player, PURE_ESSENCE.getId()) > 0) {
+ //return new Item(PURE_ESSENCE.getId(), amountInInventory(player, PURE_ESSENCE.getId()));
+ return new Item(PURE_ESSENCE.getId(), 1);
}
- }
-
- /**
- * Gets the rune essence that needs to be defined.
- *
- * @return the item.
- */
- private Item getEssence() {
- if (altar.isOurania() && player.getInventory().containsItem(PURE_ESSENCE)) {
- return PURE_ESSENCE;
- }
- if (!rune.isNormal() && player.getInventory().containsItem(PURE_ESSENCE)) {
- return PURE_ESSENCE;
- } else if (rune.isNormal() && player.getInventory().containsItem(PURE_ESSENCE)) {
- return PURE_ESSENCE;
- } else {
- return RUNE_ESSENCE;
+ if (rune.isNormal() && amountInInventory(player, RUNE_ESSENCE.getId()) > 0) {
+ //return new Item(RUNE_ESSENCE.getId(), amountInInventory(player, RUNE_ESSENCE.getId()));
+ return new Item(RUNE_ESSENCE.getId(), 1);
}
+ //return new Item(PURE_ESSENCE.getId(), amountInInventory(player, PURE_ESSENCE.getId()));
+ return new Item(PURE_ESSENCE.getId(), 1);
}
/**
@@ -318,11 +368,11 @@ public final class RuneCraftPulse extends SkillPulse
- {
*
* @return the amount.
*/
- public int getMultiplier() {
- if (altar.isOurania()) {
- return 1;
- }
- int rcLevel = player.getSkills().getLevel(Skills.RUNECRAFTING);
+ public int getMultiplier(Rune rune) {
+ //if (altar.isOurania()) {
+ // return 1;
+ //}
+ int rcLevel = getDynLevel(player, Skills.RUNECRAFTING);
int runecraftingFormulaRevision = ServerConstants.RUNECRAFTING_FORMULA_REVISION;
boolean lumbridgeDiary = player.getAchievementDiaryManager().getDiary(DiaryType.LUMBRIDGE).isComplete(1);
return RuneCraftPulse.getMultiplier(rcLevel, rune, runecraftingFormulaRevision, lumbridgeDiary);
@@ -337,7 +387,7 @@ public final class RuneCraftPulse extends SkillPulse
- {
}
}
- if(multipleLevels.length > i && runecraftingFormulaRevision >= 573) {
+ if (multipleLevels.length > i && runecraftingFormulaRevision >= 573) {
int a = Math.max(multipleLevels[i-1], rune.getLevel());
int b = multipleLevels[i];
if(b <= 99 || runecraftingFormulaRevision >= 581) {
@@ -374,5 +424,4 @@ public final class RuneCraftPulse extends SkillPulse
- {
public Altar getAltar() {
return altar;
}
-
}
diff --git a/Server/src/main/content/global/skill/runecrafting/RunePouchPlugin.kt b/Server/src/main/content/global/skill/runecrafting/RunePouchPlugin.kt
index 41779cf1f..599ca05b0 100644
--- a/Server/src/main/content/global/skill/runecrafting/RunePouchPlugin.kt
+++ b/Server/src/main/content/global/skill/runecrafting/RunePouchPlugin.kt
@@ -11,7 +11,7 @@ import core.tools.colorize
/**
* Handles the rune pouches.
- * @author Ceikry
+ * @author Ceikry, Player Name
*/
class RunePouchPlugin : OptionHandler() {
@Throws(Throwable::class)
@@ -37,21 +37,11 @@ class RunePouchPlugin : OptionHandler() {
if(preferenceFlag == 0) rEssAmt else pEssAmt
)
-
- if(player.pouchManager.isDecayedPouch(node.id)){
- player.debug("E2")
- when(option) { //Handling for IF the pouch has already completely decayed
- "drop" -> player.dialogueInterpreter.open(9878,Item(node.id))
- else -> player.sendMessage(colorize("%RThis pouch has completely decayed and needs to be repaired."))
- }
- } else {
- player.debug("E")
- when (option) { //Normal handling
- "fill" -> player.pouchManager.addToPouch(node.id, essence.amount, essence.id)
- "empty" -> player.pouchManager.withdrawFromPouch(node.id)
- "check" -> player.pouchManager.checkAmount(node.id)
- "drop" -> player.dialogueInterpreter.open(9878,Item(node.id))
- }
+ when (option) {
+ "fill" -> player.pouchManager.addToPouch(node.id, essence.amount, essence.id)
+ "empty" -> player.pouchManager.withdrawFromPouch(node.id)
+ "check" -> player.pouchManager.checkAmount(node.id)
+ "drop" -> player.dialogueInterpreter.open(9878,Item(node.id))
}
return true
}
@@ -59,4 +49,4 @@ class RunePouchPlugin : OptionHandler() {
override fun isWalk(): Boolean {
return false
}
-}
\ No newline at end of file
+}
diff --git a/Server/src/main/content/global/skill/runecrafting/RunecraftingPlugin.java b/Server/src/main/content/global/skill/runecrafting/RunecraftingPlugin.java
index 6bb69109f..954948eaf 100644
--- a/Server/src/main/content/global/skill/runecrafting/RunecraftingPlugin.java
+++ b/Server/src/main/content/global/skill/runecrafting/RunecraftingPlugin.java
@@ -24,6 +24,7 @@ import core.plugin.Initializable;
import core.plugin.Plugin;
import static core.api.ContentAPIKt.hasRequirement;
+import content.data.Quests;
/**
* Handles runecraftign related options.
@@ -52,7 +53,7 @@ public class RunecraftingPlugin extends OptionHandler {
@Override
public boolean handle(final Player player, Node node, String option) {
- if (!player.getQuestRepository().isComplete("Rune Mysteries") && player.getDetails().getRights() != Rights.ADMINISTRATOR) {
+ if (!player.getQuestRepository().isComplete(Quests.RUNE_MYSTERIES) && player.getDetails().getRights() != Rights.ADMINISTRATOR) {
player.getPacketDispatch().sendMessage("You need to finish the Rune Mysteries Quest in order to do this.");
return true;
}
@@ -97,7 +98,7 @@ public class RunecraftingPlugin extends OptionHandler {
}
Altar a = Altar.forObject(((Scenery) node));
if (a == Altar.ASTRAL) {
- if (!hasRequirement(player, "Lunar Diplomacy"))
+ if (!hasRequirement(player, Quests.LUNAR_DIPLOMACY))
return true;
}
player.getPulseManager().run(new RuneCraftPulse(player, null, a, false, null));
diff --git a/Server/src/main/content/global/skill/runecrafting/SnowscapePouchListener.kt b/Server/src/main/content/global/skill/runecrafting/SnowscapePouchListener.kt
new file mode 100755
index 000000000..0c98a6268
--- /dev/null
+++ b/Server/src/main/content/global/skill/runecrafting/SnowscapePouchListener.kt
@@ -0,0 +1,91 @@
+package content.global.skill.runecrafting
+
+import core.api.*
+import core.game.node.Node
+import core.game.node.entity.player.Player
+import core.game.node.item.Item
+import core.game.interaction.InteractionListener
+import core.game.interaction.IntType
+import org.rs09.consts.Items
+import content.global.handlers.scenery.BankBoothListener
+import content.global.handlers.npc.BankerNPC
+import content.global.skill.summoning.familiar.BurdenBeast
+import content.global.skill.summoning.familiar.Forager
+
+/**
+ * Listener for using runecrafting pouches on banks for easier refilling.
+ * Using any pouch on a bank booth, chest, or banker will refill all the carried pouches as well as the familiar inventory.
+ * @author
+ */
+class SnowscapePouchListener : InteractionListener {
+
+ companion object {
+
+ val pouchIds = intArrayOf(5509,5510,5511,5512,5513,5514,5515)
+
+ // Called by the runecraft pulse
+ fun emptyPouches(player: Player) {
+ if (amountInInventory(player, Items.PURE_ESSENCE_7936) > 0 || amountInInventory(player, Items.RUNE_ESSENCE_1436) > 0) return
+
+ if (player.getFamiliarManager().hasFamiliar()) {
+ val familiar = player.getFamiliarManager().getFamiliar()
+ if (familiar.isBurdenBeast() && (familiar as BurdenBeast).getContainer().containsAtLeastOneItem(Items.PURE_ESSENCE_7936)) {
+ (familiar as BurdenBeast).transfer(Item(Items.PURE_ESSENCE_7936), 99, true)
+ }
+ }
+
+ for (pouchId in pouchIds) {
+ if (inInventory(player, pouchId, 1)) {
+ player.pouchManager.withdrawFromPouch(pouchId)
+ }
+ }
+ }
+ }
+
+ private fun fillPouchFromBank(player: Player) {
+ val playerBank = player.getBank()
+ for (pouchId in pouchIds) {
+ if (inInventory(player, pouchId, 1)) {
+ player.pouchManager.addToPouch(pouchId, playerBank.getAmount(Items.PURE_ESSENCE_7936), Items.PURE_ESSENCE_7936, true)
+ }
+ }
+
+ if (player.getFamiliarManager().hasFamiliar()) {
+ val familiar = player.getFamiliarManager().getFamiliar()
+ if (familiar.isBurdenBeast() && (familiar !is Forager)) {
+ val familiarContainer = (familiar as BurdenBeast).getContainer()
+ val amount = kotlin.math.min(familiarContainer.getMaximumAdd(Item(Items.PURE_ESSENCE_7936)), playerBank.getAmount(Item(Items.PURE_ESSENCE_7936)))
+ val item = Item(Items.PURE_ESSENCE_7936, amount)
+ if (playerBank.remove(item)) familiarContainer.add(item)
+ if (familiarContainer.freeSlots() == 0) sendMessage(player, "Your familiar is full.")
+
+ }
+ }
+
+ sendMessage(player, "There is ${player.getBank().getAmount(Items.PURE_ESSENCE_7936)} Pure Essence remaining in your bank.")
+ }
+
+
+
+ override fun defineListeners() {
+
+ // BankBoothListener values are public but BankChestListener values are not, so rather than edit the BankChestListener file I have copied the IDs here. 12309 is the Culinomancer's chest.
+ val bankChests = intArrayOf(3194,4483,10562,14382,16695,16696,21301,27662,27663)
+ val bankUseWiths = intArrayOf(*BankBoothListener.BANK_BOOTHS, 12309, *bankChests)
+
+ //6362 is the Ourania Altar banker.
+ val bankers = intArrayOf(*BankerNPC.NPC_IDS, *BankerNPC.SPECIAL_NPC_IDS, 6362)
+
+ onUseWith(IntType.SCENERY, pouchIds, *bankUseWiths) { player, used, with ->
+ fillPouchFromBank(player)
+ return@onUseWith true
+ }
+
+ onUseWith(IntType.NPC, pouchIds, *bankers) { player, used, with ->
+ fillPouchFromBank(player)
+ return@onUseWith true
+ }
+ }
+
+
+}
diff --git a/Server/src/main/content/global/skill/runecrafting/abyss/DarkMageDialogue.java b/Server/src/main/content/global/skill/runecrafting/abyss/DarkMageDialogue.java
index b7297429e..a7b6450cd 100644
--- a/Server/src/main/content/global/skill/runecrafting/abyss/DarkMageDialogue.java
+++ b/Server/src/main/content/global/skill/runecrafting/abyss/DarkMageDialogue.java
@@ -4,6 +4,9 @@ import core.game.dialogue.DialoguePlugin;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
+import org.rs09.consts.Items;
+
+import static core.api.ContentAPIKt.replaceAllItems;
/**
* Handles the dark mages dialogue.
@@ -140,26 +143,19 @@ public final class DarkMageDialogue extends DialoguePlugin {
private boolean repair() {
player.pouchManager.getPouches().forEach((id, pouch) -> {
pouch.setCurrentCap(pouch.getCapacity());
- pouch.setCharges(10);
- Item essence = null;
- if(!pouch.getContainer().isEmpty()){
- int ess = pouch.getContainer().get(0).getId();
- int amount = pouch.getContainer().getAmount(ess);
- essence = new Item(ess,amount);
+ pouch.setCharges(pouch.getMaxCharges());
+ Item essItem = null;
+ if (!pouch.getContainer().isEmpty()) {
+ int essence = pouch.getContainer().get(0).getId();
+ int amount = pouch.getContainer().getAmount(essence);
+ essItem = new Item(essence, amount);
}
pouch.remakeContainer();
- if(essence != null){
- pouch.getContainer().add(essence);
+ if (essItem != null) {
+ pouch.getContainer().add(essItem);
}
- if(id != 5509) {
- if (player.getInventory().contains(id + 1, 1)) {
- player.getInventory().remove(new Item(id + 1, 1));
- player.getInventory().add(new Item(id, 1));
- }
- if (player.getBank().contains(id + 1, 1)) {
- player.getBank().remove(new Item(id + 1, 1));
- player.getBank().add(new Item(id, 1));
- }
+ if (id != Items.SMALL_POUCH_5509) {
+ replaceAllItems(player, id + 1, id);
}
});
return true;
diff --git a/Server/src/main/content/global/skill/runecrafting/abyss/ZamorakMageDialogue.java b/Server/src/main/content/global/skill/runecrafting/abyss/ZamorakMageDialogue.java
index 1b46aa4e0..ab06e4843 100644
--- a/Server/src/main/content/global/skill/runecrafting/abyss/ZamorakMageDialogue.java
+++ b/Server/src/main/content/global/skill/runecrafting/abyss/ZamorakMageDialogue.java
@@ -7,6 +7,7 @@ import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import static core.api.ContentAPIKt.*;
+import content.data.Quests;
/**
@@ -51,7 +52,7 @@ public final class ZamorakMageDialogue extends DialoguePlugin {
public boolean open(Object... args) {
npc = (NPC) args[0];
varrockMage = npc.getId() == 2261 || npc.getId() == 2260;
- if (!player.getQuestRepository().isComplete("Rune Mysteries")) {
+ if (!player.getQuestRepository().isComplete(Quests.RUNE_MYSTERIES)) {
end();
player.sendMessage("The mage doesn't seem interested in talking to you.");
return true;
@@ -190,7 +191,7 @@ public final class ZamorakMageDialogue extends DialoguePlugin {
stage++;
break;
case 201:
- npc("And there is an ubundant supply of this 'essence' there", "you say?");
+ npc("And there is an abundant supply of this 'essence' there", "you say?");
stage++;
break;
case 202:
@@ -299,7 +300,7 @@ public final class ZamorakMageDialogue extends DialoguePlugin {
switch (stage) {
case 0:
if (!player.hasItem(ORBS[0]) && !player.getInventory().containsItem(ORBS[1])) {
- player("Uh...", "No...", "I kinda lost that orb thingy that you have me.");
+ player("Uh...", "No...", "I kinda lost that orb thingy that you gave me.");
stage++;
break;
}
@@ -313,14 +314,14 @@ public final class ZamorakMageDialogue extends DialoguePlugin {
break;
case 1:
player.getInventory().add(ORBS[0], player);
- npc("What?", "Incompetent fool. Take this.", "And do not make me refret allying myself with you.");
+ npc("What?", "Incompetent fool. Take this.", "And do not make me regret allying myself with you.");
stage++;
break;
case 2:
end();
break;
case 3:
- npc("I assume the task to be self-explainatory.", "What is it you wish to know?");
+ npc("I assume the task to be self-explanatory.", "What is it you wish to know?");
stage++;
break;
case 4:
@@ -328,7 +329,7 @@ public final class ZamorakMageDialogue extends DialoguePlugin {
stage++;
break;
case 5:
- npc("All I wish for you to do is to teleport to this 'rune", "essence' location from three different locations wile", "carrying the scrying orb I gave you.", "It will collect the data as you teleport.");
+ npc("All I wish for you to do is to teleport to this 'rune", "essence' location from three different locations while", "carrying the scrying orb I gave you.", "It will collect the data as you teleport.");
stage++;
break;
case 6:
diff --git a/Server/src/main/content/global/skill/skillcapeperks/SkillcapePerks.kt b/Server/src/main/content/global/skill/skillcapeperks/SkillcapePerks.kt
index 7ee273098..7dbc1992b 100644
--- a/Server/src/main/content/global/skill/skillcapeperks/SkillcapePerks.kt
+++ b/Server/src/main/content/global/skill/skillcapeperks/SkillcapePerks.kt
@@ -15,7 +15,9 @@ import core.ServerStore.Companion.getBoolean
import core.ServerStore.Companion.getInt
import core.api.*
import core.cache.def.impl.ItemDefinition
+import core.tools.END_DIALOGUE
import org.rs09.consts.Items
+import content.data.Quests
enum class SkillcapePerks(val attribute: String, val effect: ((Player) -> Unit)? = null) {
BAREFISTED_SMITHING("cape_perks:barefisted-smithing"),
@@ -47,7 +49,6 @@ enum class SkillcapePerks(val attribute: String, val effect: ((Player) -> Unit)?
player.dialogueInterpreter.sendDialogue("Your cape is still on cooldown.")
} else {
player.dialogueInterpreter.open(509871233)
- store[player.name] = used + 1
}
}),
SEED_ATTRACTION("cape_perks:seed_attract",{player ->
@@ -195,11 +196,11 @@ enum class SkillcapePerks(val attribute: String, val effect: ((Player) -> Unit)?
end()
if(spellbook != null){
if (spellbook == SpellBookManager.SpellBook.ANCIENT) {
- if (!hasRequirement(player, "Desert Treasure"))
+ if (!hasRequirement(player, Quests.DESERT_TREASURE))
return true
}
else if (spellbook == SpellBookManager.SpellBook.LUNAR) {
- if (!hasRequirement(player, "Lunar Diplomacy"))
+ if (!hasRequirement(player, Quests.LUNAR_DIPLOMACY))
return true
}
player.spellBookManager.setSpellBook(spellbook)
@@ -222,54 +223,69 @@ enum class SkillcapePerks(val attribute: String, val effect: ((Player) -> Unit)?
}
override fun open(vararg args: Any?): Boolean {
- options("Air","Mind","Water","Earth","More...")
+ altarList(0)
stage = 0
return true
}
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
- when(stage){
- 0 -> when(buttonId){
+ when(stage) {
+ 0 -> when(buttonId) {
1 -> sendAltar(player, Altar.AIR)
2 -> sendAltar(player, Altar.MIND)
3 -> sendAltar(player, Altar.WATER)
4 -> sendAltar(player, Altar.EARTH)
- 5 -> options("Fire","Body","Cosmic","Chaos","More...").also { stage++ }
+ 5 -> altarList(++stage)
}
- 1 -> when(buttonId){
- 1 -> sendAltar(player, Altar.FIRE)
- 2 -> sendAltar(player, Altar.BODY)
- 3 -> sendAltar(player, Altar.COSMIC)
- 4 -> sendAltar(player, Altar.CHAOS)
- 5 -> options("Astral","Nature","Law","Death","More...").also { stage++ }
+ 1 -> when(buttonId) {
+ 1 -> altarList(--stage)
+ 2 -> sendAltar(player, Altar.FIRE)
+ 3 -> sendAltar(player, Altar.BODY)
+ 4 -> sendAltar(player, Altar.COSMIC)
+ 5 -> altarList(++stage)
}
- 2 -> when(buttonId){
- 1 -> sendAltar(player, Altar.ASTRAL)
- 2 -> sendAltar(player, Altar.NATURE)
- 3 -> sendAltar(player, Altar.LAW)
- 4 -> sendAltar(player, Altar.DEATH)
- 5 -> options("Blood","Nevermind").also { stage++ }
+ 2 -> when(buttonId) {
+ 1 -> altarList(--stage)
+ 2 -> sendAltar(player, Altar.CHAOS)
+ 3 -> sendAltar(player, Altar.ASTRAL)
+ 4 -> sendAltar(player, Altar.NATURE)
+ 5 -> altarList(++stage)
}
- 3 -> when(buttonId){
- 1 -> sendAltar(player, Altar.BLOOD)
- 2 -> end()
+ 3 -> when(buttonId) {
+ 1 -> altarList(--stage)
+ 2 -> sendAltar(player, Altar.LAW)
+ 3 -> sendAltar(player, Altar.DEATH)
+ 4 -> sendAltar(player, Altar.BLOOD)
+ 5 -> altarList(0).also { stage = 0 }
}
}
return true
}
- fun sendAltar(player: Player,altar: Altar){
+ fun altarList(stage: Int) {
+ when (stage) {
+ 0 -> options("Air", "Mind", "Water", "Earth", "More...")
+ 1 -> options("Back...", "Fire", "Body", "Cosmic", "More...")
+ 2 -> options("Back...", "Chaos", "Astral", "Nature", "More...")
+ 3 -> options("Back...", "Law", "Death", "Blood", "More...")
+ }
+ }
+
+ fun sendAltar(player: Player,altar: Altar) {
end()
- if (altar == Altar.DEATH && !hasRequirement(player, "Mourning's End Part II")) return
- if (altar == Altar.ASTRAL && !hasRequirement(player, "Lunar Diplomacy")) return
- if (altar == Altar.BLOOD && !hasRequirement(player, "Legacy of Seergaze")) return
+ if (altar == Altar.DEATH && !hasRequirement(player, Quests.MOURNINGS_END_PART_II)) return
+ if (altar == Altar.ASTRAL && !hasRequirement(player, Quests.LUNAR_DIPLOMACY)) return
+ if (altar == Altar.BLOOD && !hasRequirement(player, Quests.LEGACY_OF_SEERGAZE)) return
if (altar == Altar.LAW && !ItemDefinition.canEnterEntrana(player)) {
- sendItemDialogue(player, Items.SARADOMIN_SYMBOL_8055, "No weapons or armour are permitted on holy Entrana.")
+ sendMessage(player, "The power of Saradomin prevents you from taking armour or weaponry to Entrana.");
return
}
var endLoc = if (altar == Altar.ASTRAL) Location.create(2151, 3864, 0) else altar.ruin.end
+ val store = ServerStore.getArchive("daily-abyss-warp")
+ val used = store.getInt(player.name,0)
+ store[player.name] = used + 1
player.teleporter.send(endLoc, TeleportManager.TeleportType.TELE_OTHER)
player.incrementAttribute("/save:cape_perks:abyssal_warp",-1)
}
diff --git a/Server/src/main/content/global/skill/slayer/FishingExplosivePlugin.java b/Server/src/main/content/global/skill/slayer/FishingExplosivePlugin.java
deleted file mode 100644
index 196a4c62d..000000000
--- a/Server/src/main/content/global/skill/slayer/FishingExplosivePlugin.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package content.global.skill.slayer;
-
-import core.cache.def.impl.SceneryDefinition;
-import core.game.interaction.NodeUsageEvent;
-import core.game.interaction.OptionHandler;
-import core.game.interaction.UseWithHandler;
-import core.game.node.Node;
-import core.game.node.entity.Entity;
-import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.ImpactHandler.HitsplatType;
-import core.game.node.entity.impl.Projectile;
-import core.game.node.entity.npc.AbstractNPC;
-import core.game.node.entity.npc.NPC;
-import core.game.node.entity.player.Player;
-import core.game.node.entity.player.link.HintIconManager;
-import core.game.node.entity.player.link.diary.DiaryType;
-import core.game.node.item.Item;
-import core.game.node.scenery.Scenery;
-import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
-import core.game.world.map.Direction;
-import core.game.world.map.Location;
-import core.game.world.update.flag.context.Animation;
-import core.game.world.update.flag.context.Graphics;
-import core.plugin.Initializable;
-import core.plugin.Plugin;
-import core.tools.RandomFunction;
-
-/**
- * Represents the plugin used to handle the fishing expolosive on a omnious
- * fishing spot.
- * @author 'Vexia
- */
-@Initializable
-public final class FishingExplosivePlugin extends OptionHandler {
-
- /**
- * Represents the ominous fishing spot ids.
- */
- private final static int[] IDS = new int[] { 10087, 10088, 10089 };
-
- @Override
- public Plugin
newInstance(Object arg) throws Throwable {
- for (int id : IDS) {
- SceneryDefinition.forId(id).getHandlers().put("option:lure", this);
- SceneryDefinition.forId(id).getHandlers().put("option:bait", this);
- }
- new FishingExplosiveHandler().newInstance(arg);
- new MogreNPC().newInstance(arg);
- return this;
- }
-
- @Override
- public boolean handle(Player player, Node node, String option) {
- player.getPacketDispatch().sendMessage("Something seems to have scared all the fishes away...");
- return true;
- }
-
- @Override
- public Location getDestination(Node node, Node n) {
- return node.getLocation();
- }
-
- /**
- * Represents the handler for the fishing expolsive on a fishing spot.
- * @author 'Vexia
- * @version 1.0
- */
- public static final class FishingExplosiveHandler extends UseWithHandler {
-
- /**
- * Represents the throwing animation.
- */
- private static final Animation ANIMATION = new Animation(385);
-
- /**
- * Represents the splashing graphics.
- */
- private static final Graphics SPLASH_GRAPHIC = new Graphics(68);
-
- /**
- * Represents the npc mogre id.
- */
- private static final int MOGRE_ID = 114;
-
- /**
- * Represents the messages used to send for the mogres.
- */
- private static final String[] MESSAGES = new String[] { "Da boom-boom kill all da fishies!", "I smack you good!", "Smash stupid human!", "Tasty human!", "Human hit me on the head!", "I get you!", "Human scare all da fishies!" };
-
- /**
- * Constructs a new {@code FishingExplosiveHandler} {@code Object}.
- */
- public FishingExplosiveHandler() {
- super(6664, 12633);
- }
-
- @Override
- public Plugin newInstance(Object arg) throws Throwable {
- for (int i : IDS) {
- addHandler(i, OBJECT_TYPE, this);
- }
- return this;
- }
-
- @Override
- public boolean handle(final NodeUsageEvent event) {
- final Player player = event.getPlayer();
- if (player.getAttributes().containsKey("hasMogre")) {
- player.getDialogueInterpreter().sendDialogues(player, null, "Sinister as that fishing spot is, why would I want to", "explode it?");
- return true;
- }
- if (!player.getInventory().remove(new Item(event.getUsedItem().getId(), 1))) {
- return true;
- }
- final int delay = (int) (2 + (player.getLocation().getDistance(event.getUsedWith().getLocation())) * 0.5);
- player.animate(ANIMATION);
- player.getPacketDispatch().sendMessage("You hurl the shuddering vial into the water...");
- sendProjectile(player, (Scenery) event.getUsedWith());
- GameWorld.getPulser().submit(new Pulse(delay, player) {
- @Override
- public boolean pulse() {
- Direction dir = event.getUsedWith().getDirection();
- NPC mogre = NPC.create(MOGRE_ID, event.getUsedWith().getLocation().transform(dir.getStepX() << 1, dir.getStepY() << 1, 0));
- mogre.init();
- mogre.moveStep();
- mogre.setRespawn(false);
- mogre.getProperties().getCombatPulse().attack(player);
- mogre.setAttribute("player", player);
- mogre.sendChat(MESSAGES[RandomFunction.random(MESSAGES.length)]);
- HintIconManager.registerHintIcon(player, mogre);
- if (event.getUsedItem().getId() == 12633) {
- mogre.getImpactHandler().manualHit(player, 15, HitsplatType.NORMAL);
- }
- player.setAttribute("hasMogre", true);
- mogre.graphics(SPLASH_GRAPHIC);
- player.getPacketDispatch().sendMessage("...and a Mogre appears!");
- return true;
- }
- });
- return true;
- }
-
- /**
- * Method used to send the fishign explosive projectile.
- * @param player the player.
- * @param object the object.
- */
- private void sendProjectile(final Player player, final Scenery object) {
- Projectile p = Projectile.create(player, null, 49, 30, 20, 30, Projectile.getSpeed(player, object.getLocation()));
- p.setEndLocation(object.getLocation());
- p.send();
- }
-
- @Override
- public Location getDestination(Player player, Node with) {
- return player.getLocation();
- }
- }
-
- /**
- * Represents a mogre npc.
- * @author 'Vexia
- * @version 1.0
- */
- public final class MogreNPC extends AbstractNPC {
-
- /**
- * Constructs a new {@code MogreNPC} {@code Object}.
- * @param id the id.
- * @param location the location.
- */
- public MogreNPC(int id, Location location) {
- super(id, location, true);
- }
-
- /**
- * Constructs a new {@code MogreNPC} {@code Object}.
- */
- public MogreNPC() {
- super(0, null);
- }
-
- @Override
- public void tick() {
- super.tick();
- final Player pl = getAttribute("player", null);
- if (pl == null || pl.getLocation().getDistance(getLocation()) > 15) {
- clear();
- }
- }
-
- @Override
- public void clear() {
- super.clear();
- final Player pl = getAttribute("player", null);
- if (pl != null) {
- pl.removeAttribute("hasMogre");
- }
- }
-
- @Override
- public boolean isAttackable(Entity entity, CombatStyle style, boolean message) {
- final Player pl = getAttribute("player", null);
- return pl != null && pl == entity && super.isAttackable(entity, style, message);
- }
-
- @Override
- public void finalizeDeath(final Entity killer) {
- super.finalizeDeath(killer);
- if (killer instanceof Player) {
- final Player player = killer.asPlayer();
- player.getAchievementDiaryManager().finishTask(player,DiaryType.FALADOR, 2, 7);
- }
- }
-
- @Override
- public AbstractNPC construct(int id, Location location, Object... objects) {
- return new MogreNPC(id, location);
- }
-
- @Override
- public int[] getIds() {
- return new int[] { 114 };
- }
-
- }
-}
diff --git a/Server/src/main/content/global/skill/slayer/Master.java b/Server/src/main/content/global/skill/slayer/Master.java
index 0a3d3619d..aad0fa5e4 100644
--- a/Server/src/main/content/global/skill/slayer/Master.java
+++ b/Server/src/main/content/global/skill/slayer/Master.java
@@ -10,36 +10,38 @@ import java.util.List;
/**
* A non-garbage way of representing slayer masters
+ * Source for task amounts: ...
+ * Need to add a source for weights
* @author ceik
+ * @author gregf
*/
public enum Master {
- TURAEL(8273, 0, 0, new int[]{15, 50}, new int[]{0, 0, 0},
+ TURAEL(8273, 3, 0, new int[]{15, 50}, new int[]{0, 0, 0},
new Task(Tasks.BANSHEE, 8),
new Task(Tasks.BATS, 7),
- new Task(Tasks.BIRDS, 6),
new Task(Tasks.BEARS, 7),
- new Task(Tasks.CAVE_BUG, 8),
+ new Task(Tasks.BIRDS, 6),
+ new Task(Tasks.CAVE_BUG, 8),
new Task(Tasks.CAVE_CRAWLERS, 8),
new Task(Tasks.CAVE_SLIMES, 8),
new Task(Tasks.COWS, 8),
new Task(Tasks.CRAWLING_HAND, 8),
+ new Task(Tasks.DESERT_LIZARDS, 8),
new Task(Tasks.DOG, 7),
new Task(Tasks.DWARF, 7),
new Task(Tasks.GHOSTS, 7),
new Task(Tasks.GOBLINS, 7),
new Task(Tasks.ICE_FIENDS, 8),
new Task(Tasks.KALPHITES, 6),
- new Task(Tasks.DESERT_LIZARDS, 8),
new Task(Tasks.MINOTAURS, 7),
new Task(Tasks.MONKEYS, 6),
- new Task(Tasks.RATS, 7),
- new Task(Tasks.SCORPIONS, 7),
+ new Task(Tasks.SCORPIONS, 7),
new Task(Tasks.SKELETONS, 7),
new Task(Tasks.SPIDERS, 6),
new Task(Tasks.WOLVES, 7),
new Task(Tasks.ZOMBIES, 7)),
- MAZCHNA(8274, 20, 0, new int[]{30, 70}, new int[]{2, 5, 15},
+ MAZCHNA(8274, 20, 0, new int[]{40, 70}, new int[]{2, 5, 15},
new Task(Tasks.BANSHEE, 8),
new Task(Tasks.BATS,7),
new Task(Tasks.BEARS,6),
@@ -59,221 +61,191 @@ public enum Master {
new Task(Tasks.HOBGOBLINS, 7),
new Task(Tasks.ICE_WARRIOR, 7),
new Task(Tasks.KALPHITES,6),
- //new Task(Tasks.KILLERWATTS, 6),
- //new Task(Tasks.MOGRES, 8),
+ new Task(Tasks.MOGRES, 8),
new Task(Tasks.PYREFIENDS, 8),
new Task(Tasks.ROCK_SLUGS,8),
- new Task(Tasks.SCORPIONS,7),
new Task(Tasks.SHADE,8),
new Task(Tasks.SKELETONS, 7),
new Task(Tasks.VAMPIRES, 6),
- //new Task(Tasks.WALL_BEASTS,7),
+ // new Task(Tasks.WALL_BEASTS,7),
new Task(Tasks.WOLVES, 7),
new Task(Tasks.ZOMBIES,7)),
- VANNAKA(1597, 40, 0, new int[]{30, 80}, new int[]{4, 20, 60},
+ VANNAKA(1597, 40, 0, new int[]{60, 120}, new int[]{4, 20, 60},
new Task(Tasks.ABERRANT_SPECTRES, 8),
- new Task(Tasks.ABYSSAL_DEMONS, 5),
new Task(Tasks.ANKOU,7),
new Task(Tasks.BANSHEE,6),
- new Task(Tasks.BASILISKS,8),
- new Task(Tasks.BLOODVELDS,8),
+ new Task(Tasks.BASILISKS,8),
new Task(Tasks.BLUE_DRAGONS,7),
+ new Task(Tasks.BLOODVELDS,8),
new Task(Tasks.BRINE_RATS,7),
- new Task(Tasks.BRONZE_DRAGONS,7),
new Task(Tasks.CAVE_BUG,7),
new Task(Tasks.CAVE_CRAWLERS,7),
new Task(Tasks.CAVE_SLIMES,7),
new Task(Tasks.COCKATRICES,8),
new Task(Tasks.CRAWLING_HAND,6),
- new Task(Tasks.CROCODILES,6),
- new Task(Tasks.DAGANNOTHS, 7),
+ new Task(Tasks.CROCODILES,6, new Integer[]{30, 60}),
+ new Task(Tasks.DAGANNOTHS, 7),
+ new Task(Tasks.DESERT_LIZARDS,7, new Integer[]{30, 60}),
new Task(Tasks.DUST_DEVILS,8),
- new Task(Tasks.EARTH_WARRIORS,6),
- new Task(Tasks.ELVES, 7),
+ new Task(Tasks.EARTH_WARRIORS,6, new Integer[]{30, 60}),
+ new Task(Tasks.ELVES, 7, new Integer[]{30, 60}),
//new Task(Tasks.FEVER_SPIDERS,7),
new Task(Tasks.FIRE_GIANTS,7),
- new Task(Tasks.GARGOYLES, 5),
new Task(Tasks.GHOULS,7),
- new Task(Tasks.GREEN_DRAGONS,6),
+ new Task(Tasks.GREEN_DRAGONS,6, new Integer[]{30, 60}),
new Task(Tasks.HARPIE_BUG_SWARMS,8),
new Task(Tasks.HELLHOUNDS,7),
new Task(Tasks.HILL_GIANTS,7),
- new Task(Tasks.HOBGOBLINS,7),
- new Task(Tasks.ICE_GIANTS,7),
+ new Task(Tasks.ICE_GIANTS,7, new Integer[]{30, 60}),
new Task(Tasks.ICE_WARRIOR,7),
new Task(Tasks.INFERNAL_MAGES,8),
new Task(Tasks.JELLIES,8),
new Task(Tasks.JUNGLE_HORRORS, 8),
new Task(Tasks.KALPHITES,7),
- //new Task(Tasks.KILLERWATTS,6),
+ // new Task(Tasks.KILLERWATTS,6),
new Task(Tasks.KURASKS,7),
- new Task(Tasks.DESERT_LIZARDS,7),
- new Task(Tasks.LESSER_DEMONS,7),
- //new Task(Tasks.MOGRES,7),
- //new Task(Tasks.MOLANISKS,7),
+ new Task(Tasks.LESSER_DEMONS,7),
+ new Task(Tasks.MOGRES,7),
+ // new Task(Tasks.MOLANISKS,7),
new Task(Tasks.MOSS_GIANTS,7),
- new Task(Tasks.NECHRYAELS, 5),
new Task(Tasks.OGRES,7),
new Task(Tasks.OTHERWORDLY_BEING,8),
new Task(Tasks.PYREFIENDS,8),
new Task(Tasks.ROCK_SLUGS,7),
+ // new Task(Tasks.SEA_SNAKES,6),
new Task(Tasks.SHADE,8),
- //new Task(Tasks.SEA_SNAKES,6),
- //new Task(Tasks.SHADOW_WARRIORS, 8),
- new Task(Tasks.SPIRTUAL_MAGES,3),
- new Task(Tasks.SPIRTUAL_RANGERS, 3),
- new Task(Tasks.SPIRTUAL_WARRIORS,3),
- //new Task(Tasks.TERROR_DOGS,6),
+ // new Task(Tasks.SHADOW_WARRIORS, 8),
new Task(Tasks.TROLLS,7),
new Task(Tasks.TUROTHS, 8),
new Task(Tasks.VAMPIRES,7),
- //new Task(Tasks.WALL_BEAST,6),
- new Task(Tasks.WEREWOLFS,7)),
+ // new Task(Tasks.WALL_BEASTS,6),
+ new Task(Tasks.WEREWOLVES,7)),
CHAELDAR(1598, 70, 0, new int[]{110, 170}, new int[]{10, 50, 150},
new Task(Tasks.ABERRANT_SPECTRES,8),
new Task(Tasks.ABYSSAL_DEMONS,12),
- new Task(Tasks.AVIANSIES,9),
new Task(Tasks.BANSHEE, 5),
new Task(Tasks.BASILISKS,7),
- new Task(Tasks.BLACK_DEMONS,10),
- new Task(Tasks.BLOODVELDS,8),
new Task(Tasks.BLUE_DRAGONS,8),
+ new Task(Tasks.BLOODVELDS,8),
new Task(Tasks.BRINE_RATS,7),
- new Task(Tasks.BRONZE_DRAGONS,11),
+ new Task(Tasks.BRONZE_DRAGONS,11, new Integer[]{30, 60}),
+ new Task(Tasks.CAVE_BUG, 5),
new Task(Tasks.CAVE_CRAWLERS, 5),
new Task(Tasks.CAVE_HORRORS,10),
new Task(Tasks.CAVE_SLIMES,6),
new Task(Tasks.COCKATRICES,6),
+ new Task(Tasks.CRAWLING_HAND, 5),
+ new Task(Tasks.CROCODILES, 5, new Integer[]{30, 60}),
new Task(Tasks.DAGANNOTHS,11),
+ new Task(Tasks.DESERT_LIZARDS, 5, new Integer[]{30, 60}),
new Task(Tasks.DUST_DEVILS,9),
- new Task(Tasks.ELVES,8),
+ new Task(Tasks.ELVES,8, new Integer[]{60, 90}),
//new Task(Tasks.FEVER_SPIDERS,7),
new Task(Tasks.FIRE_GIANTS, 12),
new Task(Tasks.GARGOYLES,11),
new Task(Tasks.GREATER_DEMONS,9),
new Task(Tasks.HARPIE_BUG_SWARMS,6),
- new Task(Tasks.HELLHOUNDS,9),
+ new Task(Tasks.HELLHOUNDS,9),
+ new Task(Tasks.IRON_DRAGONS,12, new Integer[]{30, 60}),
new Task(Tasks.INFERNAL_MAGES,7),
- new Task(Tasks.IRON_DRAGONS,12),
new Task(Tasks.JELLIES, 10),
new Task(Tasks.JUNGLE_HORRORS,10),
new Task(Tasks.KALPHITES,11),
new Task(Tasks.KURASKS, 12),
new Task(Tasks.LESSER_DEMONS,9),
- new Task(Tasks.DESERT_LIZARDS, 5),
- //new Task(Tasks.MOGRES,6),
- //new Task(Tasks.MOLANISKS,6),
- //new Task(Tasks.MUTATED_ZYGOMITES,7),
+ new Task(Tasks.MOGRES,6),
+ // new Task(Tasks.MOLANISKS,6),
+ //new Task(Tasks.MUTATED_ZYGOMITES,7, new Integer[]{30, 60}),
new Task(Tasks.NECHRYAELS, 12),
new Task(Tasks.PYREFIENDS,6),
new Task(Tasks.ROCK_SLUGS, 5),
- //new Task(Tasks.SHADOW_WARRIORS,8),
- new Task(Tasks.SKELETAL_WYVERN,7),
+ // new Task(Tasks.SHADOW_WARRIORS,8),
new Task(Tasks.SPIRTUAL_WARRIORS,4),
new Task(Tasks.SPIRTUAL_RANGERS,4),
new Task(Tasks.SPIRTUAL_MAGES,4),
- new Task(Tasks.STEEL_DRAGONS,9),
new Task(Tasks.TROLLS,11),
new Task(Tasks.TUROTHS, 10)),
- //new Task(Tasks.WALL_BEASTS,6),
+ // new Task(Tasks.WALL_BEASTS,6, new Integer[]{10, 20}),
+ // new Task(Tasks.WARPED_TERROR_BIRD, 5),
+ // new Task(Tasks.WARPED_TORTOISE, 5)
- SUMONA(7780, 90, 35, new int[]{50, 185}, new int[]{12, 60, 180},
+ SUMONA(7780, 85, 35, new int[]{120, 185}, new int[]{12, 60, 180},
new Task(Tasks.ABERRANT_SPECTRES, 15),
new Task(Tasks.ABYSSAL_DEMONS, 10),
- new Task(Tasks.AVIANSIES, 7),
+ new Task(Tasks.AVIANSIES, 10),
new Task(Tasks.BANSHEE, 15),
new Task(Tasks.BASILISKS, 15),
new Task(Tasks.BLACK_DEMONS, 10),
- new Task(Tasks.BLOODVELDS, 10),
new Task(Tasks.BLUE_DRAGONS, 5),
+ new Task(Tasks.BLOODVELDS, 10),
new Task(Tasks.CAVE_CRAWLERS, 15),
new Task(Tasks.CAVE_HORRORS, 15),
- new Task(Tasks.CROCODILES, 4),
new Task(Tasks.DAGANNOTHS, 10),
- new Task(Tasks.DESERT_LIZARDS, 4),
new Task(Tasks.DUST_DEVILS, 15),
- new Task(Tasks.ELVES, 10),
+ new Task(Tasks.ELVES, 10, new Integer[]{60, 90}),
new Task(Tasks.FIRE_GIANTS, 10),
new Task(Tasks.GARGOYLES, 10),
new Task(Tasks.GREATER_DEMONS, 10),
new Task(Tasks.HELLHOUNDS, 10),
- new Task(Tasks.IRON_DRAGONS, 7),
+ new Task(Tasks.IRON_DRAGONS, 7, new Integer[]{30, 60}),
new Task(Tasks.KALPHITES, 10),
new Task(Tasks.KURASKS, 15),
new Task(Tasks.NECHRYAELS, 10),
- // newTask(Tasks.RED_DRAGONS, 5),
- new Task(Tasks.SCORPIONS, 4),
+ new Task(Tasks.RED_DRAGONS, 5),
+ // new Task(Tasks.SCABARITES, 9, new Integer[]{30, 60}),
new Task(Tasks.SPIRTUAL_MAGES, 10),
new Task(Tasks.SPIRTUAL_WARRIORS, 10),
- // new Task(Tasks.TERROR_DOGS, 10),
+ // new Task(Tasks.TERROR_DOGS, 10, new Integer[]{30, 60}),
new Task(Tasks.TROLLS, 10),
- new Task(Tasks.TUROTHS, 15),
- new Task(Tasks.VAMPIRES, 10)),
- //new Task(Tasks.WARPED_TORTOISE, 15)),
+ new Task(Tasks.TUROTHS, 15)),
+ // new Task(Tasks.WARPED_TORTOISE, 15)),
- DURADEL(8275, 100, 50, new int[]{50, 199}, new int[]{15, 75, 225},
+ DURADEL(8275, 100, 50, new int[]{130, 200}, new int[]{15, 75, 225},
new Task(Tasks.ABERRANT_SPECTRES,7),
new Task(Tasks.ABYSSAL_DEMONS,12),
- new Task(Tasks.ANKOU,5),
- new Task(Tasks.AVIANSIES,8),
- new Task(Tasks.BLACK_DEMONS,8),
- new Task(Tasks.BLACK_DRAGONS,9),
+ new Task(Tasks.AVIANSIES, 10),
+ new Task(Tasks.BLACK_DEMONS,8),
+ new Task(Tasks.BLACK_DRAGONS,9, new Integer[]{40, 80}),
new Task(Tasks.BLOODVELDS,8),
- new Task(Tasks.BLUE_DRAGONS,4),
- new Task(Tasks.CAVE_HORRORS,4),
- new Task(Tasks.DAGANNOTHS,9),
+ new Task(Tasks.DAGANNOTHS,9),
new Task(Tasks.DARK_BEASTS,11),
new Task(Tasks.DUST_DEVILS,5),
- new Task(Tasks.ELVES,4),
- new Task(Tasks.FIRE_GIANTS,7),
+ new Task(Tasks.FIRE_GIANTS,7),
new Task(Tasks.GARGOYLES,8),
+ new Task(Tasks.GORAKS,9),
new Task(Tasks.GREATER_DEMONS,9),
new Task(Tasks.HELLHOUNDS, 10),
- new Task(Tasks.IRON_DRAGONS,5),
+ new Task(Tasks.IRON_DRAGONS,5, new Integer[]{40, 80}),
new Task(Tasks.KALPHITES,9),
- new Task(Tasks.KURASKS,4),
- new Task(Tasks.MITHRIL_DRAGONS,9),
+ new Task(Tasks.MITHRIL_DRAGONS,9, new Integer[]{4, 8}),
new Task(Tasks.NECHRYAELS,9),
- //new Task(Tasks.RED_DRAGONS,8),
- new Task(Tasks.SKELETAL_WYVERN,7),
+ // new Task(Tasks.SCABARITES, 9, new Integer[]{40, 80}),
+ new Task(Tasks.SKELETAL_WYVERN,7, new Integer[]{40, 80}),
new Task(Tasks.SPIRTUAL_MAGES,2),
- new Task(Tasks.SPIRTUAL_RANGERS,2),
- new Task(Tasks.SPIRTUAL_WARRIORS,2),
- new Task(Tasks.STEEL_DRAGONS,7),
- new Task(Tasks.SUQAHS,8),
- new Task(Tasks.TROLLS,6),
- new Task(Tasks.TZHAAR, 10),
- new Task(Tasks.VAMPIRES,8),
- // new Task(Tasks.WARPED_TERRORBIRD,8),
+ new Task(Tasks.STEEL_DRAGONS,7, new Integer[]{40, 80}),
+ new Task(Tasks.SUQAHS,8, new Integer[]{40, 80}),
+ // new Task(Tasks.WARPED_TERROR_BIRD,8),
new Task(Tasks.WATERFIENDS,2));
- //new Task(Tasks.MUTATED_ZYGOMITES,2),
- //Boss Tasks below this point - Crash
- //new Task(Tasks.JAD, 1),
- //new Task(Tasks.COMMANDER_ZILYANA,1),
- //new Task(Tasks.CHAOS_ELEMENTAL, 1),
- //new Task(Tasks.GENERAL_GRARDOOR,1),
- //new Task(Tasks.GIANT_MOLE,1),
- //new Task(Tasks.KING_BLACK_DRAGON,1),
- //new Task(Tasks.KRIL_TSUTSAROTH,1),
- //new Task(Tasks.KREE_ARRA,1));
- private static HashMap idMap = new HashMap<>();
+ private static final HashMap idMap = new HashMap<>();
static{
Arrays.stream(Master.values()).forEach(m -> idMap.putIfAbsent(m.npc_id, m));
}
- int npc_id,required_combat,required_slayer;
- public int[] assignment_range;
- int[] streakPoints;
- public List tasks;
- Master(int npc_id, int required_combat, int required_slayer, int[] assignment_range, int[] streakPoints, Task... tasks) {
+ final int npc_id;
+ final int required_combat;
+ final int required_slayer;
+ public final int[] default_assignment_range;
+ final int[] streakPoints;
+ public final List tasks;
+ Master(int npc_id, int required_combat, int required_slayer, int[] default_assignment_range, int[] streakPoints, Task... tasks) {
this.npc_id = npc_id;
this.required_combat = required_combat;
this.required_slayer = required_slayer;
- this.assignment_range = assignment_range;
+ this.default_assignment_range = default_assignment_range;
this.streakPoints = streakPoints;
this.tasks = new ArrayList<>(Arrays.asList(tasks));
}
@@ -301,9 +273,17 @@ public enum Master {
public static class Task{
public Tasks task;
public Integer weight;
- Task(Tasks task, Integer weight){
+ public Integer[] task_range;
+ public Task(Tasks task, Integer weight){
this.task = task;
this.weight = weight;
+ this.task_range = new Integer[]{null, null};
+ }
+
+ Task(Tasks task, Integer weight, Integer[] task_range){
+ this.task = task;
+ this.weight = weight;
+ this.task_range = task_range;
}
}
}
diff --git a/Server/src/main/content/global/skill/slayer/MogreNPC.kt b/Server/src/main/content/global/skill/slayer/MogreNPC.kt
new file mode 100644
index 000000000..c1f5fce49
--- /dev/null
+++ b/Server/src/main/content/global/skill/slayer/MogreNPC.kt
@@ -0,0 +1,33 @@
+package content.global.skill.slayer
+
+import core.game.node.entity.Entity
+import core.game.node.entity.npc.AbstractNPC
+import core.game.world.map.Location
+import org.rs09.consts.NPCs
+
+/**
+ * Represents a mogre npc.
+ * @author 'Vexia
+ * @author gregf36665
+ * @version 2.0
+ */
+class MogreNPC : AbstractNPC(NPCs.MOGRE_114, null) {
+
+ override fun tick() {
+ super.tick()
+ val victim = properties.combatPulse.getVictim()
+ if (victim != null) {
+ if (victim.location.getDistance(getLocation()) > 15) {
+ clear()
+ }
+ }
+ }
+
+ override fun construct(id: Int, location: Location?, vararg objects: Any?): AbstractNPC {
+ return MogreNPC()
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.MOGRE_114)
+ }
+}
diff --git a/Server/src/main/content/global/skill/slayer/SlayerEquipmentFlags.kt b/Server/src/main/content/global/skill/slayer/SlayerEquipmentFlags.kt
index c953bf9de..e8c5e01e6 100644
--- a/Server/src/main/content/global/skill/slayer/SlayerEquipmentFlags.kt
+++ b/Server/src/main/content/global/skill/slayer/SlayerEquipmentFlags.kt
@@ -72,7 +72,7 @@ object SlayerEquipmentFlags {
val isCape = SlayerManager.getInstance(player).flags.equipmentFlags == 0x3F
val hasMask = hasBlackMask(player)
- return if(hasMask) 1.15
+ return if(hasMask) 1.1667
else if(isCape) 1.075
else 1.0
}
diff --git a/Server/src/main/content/global/skill/slayer/SlayerManager.kt b/Server/src/main/content/global/skill/slayer/SlayerManager.kt
index 5542a7777..f0ff71ed5 100644
--- a/Server/src/main/content/global/skill/slayer/SlayerManager.kt
+++ b/Server/src/main/content/global/skill/slayer/SlayerManager.kt
@@ -13,6 +13,8 @@ import org.json.simple.JSONObject
import java.util.*
import org.rs09.consts.Items
+import content.global.skill.hunter.HunterNPC
+
/**
* Manages the players slayer data.
* @author Ceikry
@@ -101,9 +103,13 @@ class SlayerManager(val player: Player? = null) : LoginListener, PersistPlayer,
val player = entity as? Player ?: return
val slayer = getInstance(player)
val flags = slayer.flags
+ var xp = npc.skills.maximumLifepoints.toDouble()
+ //Snowscape custom: grant a third of the normal slayer exp on all kills (this stacks with the exp from on-task kills)
+ if (npc !is HunterNPC)
+ rewardXP(player, Skills.SLAYER, xp/3)
if (slayer.hasTask() && npc.id in slayer.task!!.npcs) {
- var xp = npc.skills.maximumLifepoints.toDouble()
+
if (slayer.task!!.dragon && inEquipment(player, Items.DRAGON_SLAYER_GLOVES_12862)) {
xp *= 1.15
FOGGlovesManager.updateCharges(player)
diff --git a/Server/src/main/content/global/skill/slayer/SlayerMasterDialogue.java b/Server/src/main/content/global/skill/slayer/SlayerMasterDialogue.java
index 25f059d22..cb6aa6570 100644
--- a/Server/src/main/content/global/skill/slayer/SlayerMasterDialogue.java
+++ b/Server/src/main/content/global/skill/slayer/SlayerMasterDialogue.java
@@ -15,7 +15,9 @@ import core.game.node.entity.player.link.quest.Quest;
import core.game.node.item.Item;
import core.plugin.Initializable;
+
import static core.tools.DialogueConstKt.END_DIALOGUE;
+import content.data.Quests;
/**
* Represents the dialogue plugin used for a slayer master.
@@ -98,7 +100,7 @@ public final class SlayerMasterDialogue extends DialoguePlugin {
npc = (NPC) args[0];
}
master = Master.forId(args[0] instanceof NPC ? ((NPC) args[0]).getId() : (int) args[0]);
- quest = player.getQuestRepository().getQuest("Animal Magnetism");
+ quest = player.getQuestRepository().getQuest(Quests.ANIMAL_MAGNETISM);
if (master == Master.DURADEL) {
if (Skillcape.isMaster(player, Skills.SLAYER)) {
@@ -349,7 +351,7 @@ public final class SlayerMasterDialogue extends DialoguePlugin {
if (player.getInventory().freeSlots() != 0) {
player.getInventory().add(GEM);
SlayerManager.getInstance(player).generate(master);
- interpreter.sendDialogues(master.getNpc(), getExpression(master), "We'll start you off hunting " + SlayerManager.getInstance(player).getTaskName() + "'s, you'll need to", "kill " + SlayerManager.getInstance(player).getAmount() + " of them.");
+ interpreter.sendDialogues(master.getNpc(), getExpression(master), "We'll start you off hunting " + SlayerUtils.pluralise(SlayerManager.getInstance(player).getTaskName()) + ", you'll need to", "kill " + SlayerManager.getInstance(player).getAmount() + " of them.");
stage = 510;
} else if (player.getInventory().freeSlots() == 0) {
player("Sorry, I don't have enough inventory space.");
@@ -485,7 +487,7 @@ public final class SlayerMasterDialogue extends DialoguePlugin {
if (SlayerManager.getInstance(player).getTask() == Tasks.JAD) {
interpreter.sendDialogues(master.getNpc(), getExpression(master), "Excellent, you're doing great. Your new task is to", "defeat the almighty TzTok-Jad.");
} else {
- interpreter.sendDialogues(master.getNpc(), getExpression(master), "Excellent, you're doing great. Your new task is to kill", "" + SlayerManager.getInstance(player).getAmount() + " " + SlayerManager.getInstance(player).getTaskName() + "s.");
+ interpreter.sendDialogues(master.getNpc(), getExpression(master), "Excellent, you're doing great. Your new task is to kill", "" + SlayerManager.getInstance(player).getAmount() + " " + SlayerUtils.pluralise(SlayerManager.getInstance(player).getTaskName()) + ".");
}
stage = 844;
break;
@@ -499,7 +501,7 @@ public final class SlayerMasterDialogue extends DialoguePlugin {
if (SlayerManager.getInstance(player).getTask() == Tasks.JAD) {
interpreter.sendDialogues(master.getNpc(), getExpression(master), "Excellent, you're doing great. Your new task is to", "defeat the almighty TzTok-Jad.");
} else {
- interpreter.sendDialogues(master.getNpc(), getExpression(master), "Excellent, you're doing great. Your new task is to kill", "" + SlayerManager.getInstance(player).getAmount() + " " + SlayerManager.getInstance(player).getTaskName() + "'s.");
+ interpreter.sendDialogues(master.getNpc(), getExpression(master), "Excellent, you're doing great. Your new task is to kill", "" + SlayerManager.getInstance(player).getAmount() + " " + SlayerUtils.pluralise(SlayerManager.getInstance(player).getTaskName()) + ".");
}
stage = 844;
}
diff --git a/Server/src/main/content/global/skill/slayer/SlayerPlugin.java b/Server/src/main/content/global/skill/slayer/SlayerPlugin.java
index 35d6a4544..53e426aa3 100644
--- a/Server/src/main/content/global/skill/slayer/SlayerPlugin.java
+++ b/Server/src/main/content/global/skill/slayer/SlayerPlugin.java
@@ -12,6 +12,7 @@ import core.plugin.Initializable;
import core.plugin.Plugin;
import static core.api.ContentAPIKt.hasRequirement;
+import content.data.Quests;
/**
* Handles related slayer nodes.
@@ -27,7 +28,6 @@ public class SlayerPlugin extends OptionHandler {
@Override
public Plugin newInstance(Object arg) throws Throwable {
- SceneryDefinition.forId(8783).getHandlers().put("option:open", this);
SceneryDefinition.forId(8785).getHandlers().put("option:climb-up", this);
SceneryDefinition.forId(23158).getHandlers().put("option:exit", this);
SceneryDefinition.forId(23157).getHandlers().put("option:exit", this);
@@ -52,9 +52,6 @@ public class SlayerPlugin extends OptionHandler {
@Override
public boolean handle(Player player, Node node, String option) {
switch (node.getId()) {
- case 8783:
- player.teleport(new Location(2044, 4649, 0));
- break;
case 8785:
player.teleport(new Location(2543, 3327, 0));
break;
@@ -63,7 +60,7 @@ public class SlayerPlugin extends OptionHandler {
player.teleport(new Location(2729, 3733, 0));
break;
case 15767:
- if (!hasRequirement(player, "Cabin Fever"))
+ if (!hasRequirement(player, Quests.CABIN_FEVER))
return true;
player.teleport(new Location(3748, 9373, 0));
break;
diff --git a/Server/src/main/content/global/skill/slayer/SlayerRewardPlugin.java b/Server/src/main/content/global/skill/slayer/SlayerRewardPlugin.java
index 84d54b18d..247e87b82 100644
--- a/Server/src/main/content/global/skill/slayer/SlayerRewardPlugin.java
+++ b/Server/src/main/content/global/skill/slayer/SlayerRewardPlugin.java
@@ -17,6 +17,7 @@ import core.plugin.Plugin;
import core.plugin.ClassScanner;
import static core.api.ContentAPIKt.hasRequirement;
+import content.data.Quests;
/**
* Handles the slayer reward interface plugin.
@@ -309,7 +310,7 @@ public class SlayerRewardPlugin extends ComponentPlugin {
@Override
public boolean handle(Player player, Node node, String option) {
- if (!hasRequirement(player, "Smoking Kills"))
+ if (!hasRequirement(player, Quests.SMOKING_KILLS))
return true;
openTab(player, BUY);
return true;
diff --git a/Server/src/main/content/global/skill/slayer/SlayerUtils.kt b/Server/src/main/content/global/skill/slayer/SlayerUtils.kt
index 34fc944c1..c034fc557 100644
--- a/Server/src/main/content/global/skill/slayer/SlayerUtils.kt
+++ b/Server/src/main/content/global/skill/slayer/SlayerUtils.kt
@@ -1,19 +1,16 @@
package content.global.skill.slayer
+import core.api.setVarp
import core.game.node.entity.combat.BattleState
import core.game.node.entity.player.Player
import core.game.node.entity.player.link.SpellBookManager.SpellBook
import core.game.node.entity.player.link.diary.DiaryType
import core.game.node.entity.skill.Skills
-import content.global.skill.slayer.Master
-import content.global.skill.slayer.Tasks
import core.tools.RandomFunction
import org.rs09.consts.Items
-import java.util.ArrayList
-import core.api.*
object SlayerUtils {
- fun generate(player: Player, master: Master): Tasks?
+ fun generate(player: Player, master: Master): Master.Task?
{
val tasks: MutableList = ArrayList(10)
val taskWeightSum = intArrayOf(0)
@@ -24,7 +21,7 @@ object SlayerUtils {
tasks.shuffle(RandomFunction.RANDOM)
var rnd = RandomFunction.random(taskWeightSum[0])
for (task in tasks) {
- if (rnd < task!!.weight) return task.task
+ if (rnd < task!!.weight) return task
rnd -= task.weight
}
return null
@@ -35,11 +32,14 @@ object SlayerUtils {
return player.getSkills().getLevel(Skills.SLAYER) >= task.levelReq && !SlayerManager.getInstance(player).flags.removed.contains(task) && task.hasQuestRequirements(player)
}
- fun assign(player: Player, task: Tasks, master: Master)
+ fun assign(player: Player, task: Master.Task, master: Master)
{
SlayerManager.getInstance(player).master = master
- SlayerManager.getInstance(player).task = task
- SlayerManager.getInstance(player).amount = RandomFunction.random(master.assignment_range[0], master.assignment_range[1])
+ SlayerManager.getInstance(player).task = task.task
+ if (task.task_range[0] == null)
+ SlayerManager.getInstance(player).amount = RandomFunction.random(master.default_assignment_range[0], master.default_assignment_range[1])
+ else
+ SlayerManager.getInstance(player).amount = RandomFunction.random(task.task_range[0], task.task_range[1])
if (master == Master.DURADEL) {
player.achievementDiaryManager.finishTask(player, DiaryType.KARAMJA, 2, 8)
} else if (master == Master.VANNAKA) {
@@ -57,4 +57,24 @@ object SlayerUtils {
.spellBook == SpellBook.MODERN.interfaceId
)
}
+
+ @JvmStatic
+ fun pluralise(str: String): String {
+ return when (str) {
+ "black bear" -> "bears"
+ "cyclops" -> "cyclopes"
+ "guard dog" -> "dogs"
+ "dwarf" -> "dwarves"
+ "elf warrior" -> "elves"
+ "jelly" -> "jellies"
+ "nechryael" -> str // the plural and singular is the same
+ "turoth" -> str // the plural and singular is the same
+ "tzhaar-mej" -> "tzHaar"
+ "werewolf" -> "werewolves"
+ "wolf" -> "wolves"
+ "kalphite worker" -> "kalphites"
+ "scarab swarm" -> "scabarites"
+ else -> str + "s"
+ }
+ }
}
diff --git a/Server/src/main/content/global/skill/slayer/Tasks.java b/Server/src/main/content/global/skill/slayer/Tasks.java
index 76f8c4fce..81a195f5a 100644
--- a/Server/src/main/content/global/skill/slayer/Tasks.java
+++ b/Server/src/main/content/global/skill/slayer/Tasks.java
@@ -8,104 +8,132 @@ import java.util.HashMap;
import core.game.node.entity.player.Player;
import static core.api.ContentAPIKt.hasRequirement;
+import content.data.Quests;
/**
* A non-garbage way of representing tasks
+ * Slayer level source: ...
+ * Combat level source: None
* @author ceik
+ * @author gregf
*/
public enum Tasks {
- ABERRANT_SPECTRES(65, new int[] { 1604, 1605, 1606, 1607, 7801, 7802, 7803, 7804 }, new String[] { "Aberrant spectres have an extremely potent stench that drains", "stats and life points. A nose peg, protects against the stench." }, 60, true, false),
- ABYSSAL_DEMONS(85, new int[] { 1615, 4230 }, new String[] { "Abyssal Demons are nasty creatures to deal with, they aren't really part, ", "of this realm, and are able to move very quickly to trap their prey"}, 85, false, false),
- ANKOU(40, new int[] { 4381, 4382, 4383 }, new String[] { "Neither skeleton nor ghost, but a combination of both." }, 1, true, false),
- AVIANSIES(60, new int[] { 6245, 6243, 6235, 6232, 6244, 6246, 6233, 6241, 6238, 6237, 6240, 6242, 6239, 6234 }, new String[] { "Graceful, bird-like creature." }, 1, false, false),
- BANSHEE(20, new int[] { 1612 }, new String[] { "Banshees use a piercing scream to shock their enemies", "you'll need some Earmuffs to protect yourself from them." }, 15, true, false),
- BASILISKS(40, new int[] { 1616, 1617, 4228 }, new String[] { "A mirror shield is much necessary when hunting", "these mad creatures." }, 40, false, false),
- BATS(5, new int[] { 412, 78, 1005, 2482, 3711, }, new String[] { "These little creatures are incredibly quick.", "make sure you keep your eye on them at all times." }, 1, false, false),
- BEARS(13, new int[] { 106, 105, 1195, 3645, 3664, 1326, 1327 }, new String[] { "A large animal with a crunching punch." }, 1, false, false),
- BIRDS(1, new int[] { 1475, 5120, 5121, 5122, 5123, 5133, 1475, 1476, 41, 951, 1017, 1401, 1402, 2313, 2314, 2315, 1016, 1550, 147, 1180, 1754, 1755, 1756, 2252, 4570, 4571, 1911, 6114, 46, 2693, 6113, 6112, 146, 149, 150, 450, 451, 1179, 1322, 1323, 1324, 1325, 1400, 2726, 2727, 3197, 138, 48, 4373, 4374, 4535, 139, 1751, 148, 1181, 6382, 2459, 2460, 2461, 2462, 2707, 2708, 6115, 6116, 3296, 6378, 1996, 3675, 3676, 6792, 6946, 7320, 7322, 7324, 7326, 7328, 1692, 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, 6294, 6295, 6322, 6323, 6324, 6325, 6326, 6327, 6328, 6329, 6330, 6331, 6332, 3476, 1018, 1403, }, new String[] { "Birds aren't the most intelligent of creatures, but watch out for their", "sharp, stabbing beaks." }, 1, false, false),
- BLACK_DEMONS(80, new int[] { 84, 677, 4702, 4703, 4704, 4705, 6208, }, new String[] { "Black Demons are magic creatures that are weak to magic attacks.", "They're the strongest demon and very dangerous." }, 1, false, false),
- BLACK_DRAGONS(80, new int[] {54, 4673, 4674, 4675, 4676, 3376, 50 }, new String[] { "Black dragons are the strongest dragons", "watch out for their fiery breath" }, 1, false, true, 40 | 80 << 16),
- BLOODVELDS(50, new int[] { 1618, 1619, 6215, 7643, 7642 }, new String[] { "Bloodvelds are strange demonic creatures, they use their long rasping tongue", "to feed on just about anything they can find." }, 50, false, false),
- BLUE_DRAGONS(65, new int[] { 55, 4681, 4682, 4683, 4684, 5178, 52, 4665, 4666, }, new String[] { "Blue dragons aren't as strong as other dragons but they're still", "very powerful, watch out for their fiery breath." }, 1, false, true),
- BRINE_RATS(45, new int[] { 3707 }, new String[] { "Small little creatures they are, yet so very", "powerful." }, 47, false, false),
- BRONZE_DRAGONS(75, new int[] { 1590 }, new String[] { "Bronze dragons aren't as strong as other dragons but they're still", "very powerful, watch out for their fiery breath." }, 1, false, true, 30 | 60 << 16),
- CATABLEPONS(35, new int[] { 4397, 4398, 4399, }, new String[] { "They use the magic spell Weaken to drain up to 15% of their", "opponent's maximum Strength level." }, 1, false, false),
- CAVE_BUG(1, new int[] { 1832, 5750, }, new String[] { "It regenerates life points quickly and seems to be a good", "herblore monster." }, 7, false, false),
- CAVE_CRAWLERS(10, new int[] { 1600, 1601, 1602, 1603, }, new String[] { "The poisonous parts of them are presumably removed." }, 10, false, false),
- CAVE_HORRORS(85, new int[] { 4353, 4354, 4355, 4356, 4357, }, new String[] { "A Cave horror wears a creepy mask, it is", "preferred to wear a witchwood icon." }, 58, "Cabin Fever"),
- CAVE_SLIMES(15, new int[] { 1831 }, new String[] { "These are lesser versions of jellies, watch out they can poison you." }, 17, false, false),
- COCKATRICES(25, new int[] { 1620, 1621, 4227, }, new String[] { "A Mirror shield is necessary when", "fighting these monsters." }, 25, false, false),
- COWS(5, new int[] { 1766, 1768, 2310, 81, 397, 955, 1767, 3309 }, new String[] { "Cow's may seem stupid, however they know more then", "you think. Don't under estimate them." }, 1, false, false),
+ ABERRANT_SPECTRES(65, new int[] { 1604, 1605, 1606, 1607, 7801, 7802, 7803, 7804 }, new String[] { "Aberrant Spectres are fetid, vile ghosts. The very", "smell of them will paralyse and harm you. A nose peg", "will help ignore their stink." }, 60, true, false),
+ ABYSSAL_DEMONS(85, new int[] { 1615 }, new String[] { "Abyssal Demons are nasty creatures to fight. They", "aren't really part of this realm, and are able to", "move very quickly to trap their prey."}, 85, false, false),
+ ANKOU(40, new int[] { 4381, 4382, 4383 }, new String[] { "Ankou are undead skeletal ghosts. They'll fight you", "up close but make sure to take advantage out of their", "limited defence." }, 1, true, false),
+ AVIANSIES(60, new int[] { 6245, 6243, 6235, 6232, 6244, 6246, 6233, 6241, 6238, 6237, 6240, 6242, 6239, 6234 }, new String[] { "Aviansies are bird-like creatures found in the icy", "dungeons of the north. Melee weapons can't reach them,", "so use Magic or Ranged attacks." }, 1, false, false),
+ BANSHEE(20, new int[] { 1612 }, new String[] { "Banshees use a piercing scream to shock their enemies.", "You'll need some earmuffs to protect yourself from them." }, 15, true, false),
+ BASILISKS(40, new int[] { 1616, 1617 }, new String[] { "Basilisks, like Cockatrice, have a gaze which will", "paralyse and harm their prey. You'll need a Mirror", "Shield to protect you." }, 40, false, false),
+ BATS(5, new int[] { 412, 78, 3711 }, new String[] { "Bats are rarely found on the ground, so you'll have", "to fight them while they're airborne, which won't be", "easy for melee." }, 1, false, false),
+ BEARS(13, new int[] { 106, 105, 1195, 3645, 3664, 1326, 1327 }, new String[] { "Bears are tough creatures and fierce fighters, watch", "out for their powerful claws." }, 1, false, false),
+ BIRDS(1, new int[] { 1475, 5120, 5121, 5122, 5123, 5133, 1475, 1476, 41, 951, 1017, 1401, 1402, 2313, 2314, 2315, 1016, 1550, 147, 1180, 1754, 1755, 1756, 2252, 4570, 4571, 1911, 6114, 46, 2693, 6113, 6112, 146, 149, 150, 450, 451, 1179, 1322, 1323, 1324, 1325, 1400, 2726, 2727, 3197, 138, 48, 4373, 4374, 4535, 139, 1751, 148, 1181, 6382, 2459, 2460, 2461, 2462, 2707, 2708, 6115, 6116, 3296, 6378, 1996, 3675, 3676, 6792, 6946, 7320, 7322, 7324, 7326, 7328, 1692, 6322, 3476, 1018, 1403, }, new String[] { "Birds aren't the most intelligent of creatures, but", "watch out for their sharp stabbing beaks." }, 1, false, false),
+ BLACK_DEMONS(80, new int[] { 84, 677, 4702, 4703, 4704, 4705, 6208, }, new String[] { "Black Demons are magic creatures that are weak", "to magic attacks. They're a very strong", "demon and very dangerous." }, 1, false, false),
+ BLACK_DRAGONS(80, new int[] {54, 4673, 4674, 4675, 4676, 3376, 50 }, new String[] { "Black dragons are the strongest dragons;", "watch out for their fiery breath." }, 1, false, true),
+ BLOODVELDS(50, new int[] { 1618, 1619, 6215, 7643, 7642 }, new String[] { "Bloodvelds are strange demonic creatures, they use their", "long rasping tongue to feed on just about", "anything they can find." }, 50, false, false),
+ BLUE_DRAGONS(65, new int[] { 55, 4681, 4682, 4683, 4684, 5178, 52, 4665, 4666, }, new String[] { "Blue dragons aren't as strong as other dragons but they're", "still very powerful, watch out for their fiery breath." }, 1, false, true),
+ BRINE_RATS(45, new int[] { 3707 }, new String[] { "Brine rats can be found in caves that are near the", "sea. They are hairless, bad-tempered and generally", "unfriendly." }, 47, Quests.OLAFS_QUEST),
+ BRONZE_DRAGONS(75, new int[] { 1590 }, new String[] { "Bronze Dragons are the weakest of the metallic", "dragons, their bronze scales are far thicker than", "normal bronze armour." }, 1, false, true),
+ CATABLEPONS(35, new int[] { 4397, 4398, 4399, }, new String[] { "Catablepon are mythical, cow like, magical creatures", "Beware their weakening glare." }, 1, false, false),
+ CAVE_BUG(1, new int[] { 1832, 5750, }, new String[] { "Cave Bugs are like Cave Crawlers, except smaller and", "easier to squish, though they still have a fondness", "for plants." }, 7, false, false),
+ CAVE_CRAWLERS(10, new int[] { 1600, 1601, 1602, 1603, }, new String[] { "Cave Crawlers are small and fast, often hiding in", "ambush. Avoid their barbed tongue or you'll", "get poisoned." }, 10, false, false),
+ CAVE_HORRORS(85, new int[] { 4353, 4354, 4355, 4356, 4357, }, new String[] { "Cave Horrors can be found under Mos Le'Harmless. You", "will need a Witchwood Icon to fight them effectively." }, 58, Quests.CABIN_FEVER),
+ CAVE_SLIMES(15, new int[] { 1831 }, new String[] { "Cave Slimes are the lesser cousins of Jellies, though", "don't be fooled they can still be dangerous as", "they're often poisonous." }, 17, false, false),
+ COCKATRICES(25, new int[] { 1620, 1621, 4227, }, new String[] { "Cockatrice, like Basilisks, have a gaze which will", "paralyse and harm their prey. You'll need a Mirror", "Shield to protect you." }, 25, false, false),
+ COWS(5, new int[] { 81, 1766, 1768, 2310, 397, 955, 1767, 3309 }, new String[] { "Cows are bigger than you, so they'll often hit fairly", "hard but are usually fairly slow to react." }, 1, false, false),
CRAWLING_HAND(1,new int[] { 1648, 1649, 1650, 1651, 1652, 1653, 1654, 1655, 1656, 1657, 4226, 7640, 7641 }, new String[] { "Crawling Hands are undead severed hands, fast and", "dexterous they claw their victims." }, 5, true, false),
- CROCODILES(50, new int[] { 1993, 6779 }, new String[] { "Crocodiles can be found near water and marshes in and near the Kharidian Desert." }, 1, false, false),
- CYCLOPES(25,new int[] { 116, 4291, 4292, 6078, 6079, 6080, 6081, 6269, 6270 }, new String[] { "Large one eyed creatures who normally wield a", "large mallet." }, 1, false, false),
- DAGANNOTHS(75, new int[] { 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 2454, 2455, 2456, 2881, 2882, 2883, 2887, 2888, 3591, }, new String[] { "There are many types of Dagannoth, the most powerful being the three Dagannoth Kings." }, 1, false, false),
- DARK_BEASTS(90, new int[] { 2783 }, new String[] { "A dark beast can attack using magic or melee." }, 90, false, false),
- DESERT_LIZARDS(15, new int[] { 2803, 2804, 2805, 2806, 2807 }, new String[] { "Desert lizards are big Slayer monsters found in the Kharidian Desert." }, 22, false, false),
- DOG(15, new int[] { 99, 3582, 6374, 1994, 1593, 1594, 3582 }, new String[] { "Dogs are much like Wolves, they are", "pack creatures which will hunt in groups." }, 1, false, false),
+ CROCODILES(50, new int[] { 1993, 6779 }, new String[] { "Crocodiles are large reptiles which live near water.", "You'll want to have a stabbing weapon handy for", "puncturing their thick scaly hides." }, 1, false, false),
+ DAGANNOTHS(75, new int[] { 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 2454, 2455, 2456, 2881, 2882, 2883, 2887, 2888, 3591, }, new String[] { "Dagannoth are large sea dwelling creatures which are", "very aggressive. You'll often find them in caves", "near sea water." }, 1, Quests.HORROR_FROM_THE_DEEP),
+ DARK_BEASTS(90, new int[] { 2783 }, new String[] { "Dark Beasts are large, dog-like predators.", "Their massively muscled bodies protect", "them from crushing weapons." }, 90, Quests.MOURNINGS_END_PART_II),
+ DESERT_LIZARDS(15, new int[] { 2803, 2804, 2805, 2806, 2807, 2808 }, new String[] { "Lizards are large reptiles with tough skin. Those", "found in the desert will need you to douse them with", "freezing water to finish them off after a tough battle." }, 22, false, false),
+ DOG(15, new int[] { 99, 3582, 1994, 1593, 1594, 3582 }, new String[] { "Dogs are much like Wolves, they are", "pack creatures which will hunt in groups." }, 1, false, false),
DUST_DEVILS(70, new int[] { 1624 }, new String[] { "Dust Devils use clouds of dust, sand, ash and whatever", "else they can inhale to blind and disorientate", "their victims." }, 65, false, false),
- DWARF(6, new int[] { 118, 120, 121, 382, 3219, 3220, 3221, 3268, 3269, 3270, 3271, 3272, 3273, 3274, 3275, 3294, 3295, 4316, 5880, 5881, 5882, 5883, 5884, 5885, 2130, 2131, 2132, 2133, 3276, 3277, 3278, 3279, 119, 2423 }, new String[] { "They are slightly resistant to Magic attacks", "and are not recommended for low levels." }, 1, false, false),
- EARTH_WARRIORS(35, new int[] { 124 }, new String[] { "An Earth warrior is a monster made of earth"," which fights using melee." }, 1, false, false),
- ELVES(70, new int[] { 1183, 1184, 2359, 2360, 2361, 2362, 7438, 7439, 7440, 7441 }, new String[]{"Elves are agile creatures."}, 1, false, false),
- FIRE_GIANTS(65, new int[] { 110, 1582, 1583, 1584, 1585, 1586, 7003, 7004 }, new String[] { "Like other giants, Fire Giants often wield large weapons", "learn to recognise what kind of weapon it is, and act accordingly." }, 1, false, false),
- FLESH_CRAWLERS(15, new int[] { 4389, 4390, 4391 }, new String[] { "Flesh crawlers are medium level monsters found on", "level 2 of the Stronghold of Security." }, 1, false, false),
- GARGOYLES(80, new int[] { 1610, 1611, 6389 }, new String[] { "Gargoyles are winged creatures of stone. You'll need to fight them to", "near death before breaking them apart with a rock hammer." }, 75, false, false),
- GHOSTS(13, new int[] { 103, 104, 491, 1541, 1549, 2716, 2931, 4387, 388, 5342, 5343, 5344, 5345, 5346, 5347, 5348, 1698, 5349, 5350, 5351, 5352, 5369, 5370, 5371, 5372, 5373, 5374, 5572, 6094, 6095, 6096, 6097, 6098, 6504, 13645, 13466, 13467, 13468, 13469, 13470, 13471, 13472, 13473, 13474, 13475, 13476, 13477, 13478, 13479, 13480, 13481 }, new String[] { "A Ghost is an undead monster that is found", "in various places and dungeons. " }, 1, false, false),
- GHOULS(25, new int[] { 1218, 3059 }, new String[] { "Ghouls are a humanoid race and the descendants of a long-dead society", "that degraded to the point that its people ate their dead." }, 1, false, false),
+ DWARF(6, new int[] { 118, 120, 121, 382, 3219, 3220, 3221, 3268, 3269, 3270, 3271, 3272, 3273, 3274, 3275, 3294, 3295, 4316, 5880, 5881, 5882, 5883, 5884, 5885, 2130, 2131, 2132, 2133, 3276, 3277, 3278, 3279, 119, 2423 }, new String[] { "Dwarves are a small but tough race of miners, often", "using pickaxes to pierce their opponents armour." }, 1, false, false),
+ EARTH_WARRIORS(35, new int[] { 124 }, new String[] { "Earth Warriors are a kind of earth elemental,", "grind them to dust with blunt weapons." }, 1, false, false),
+ ELVES(70, new int[] { 1183, 1184, 2359, 2360, 2361, 2362, 2373, 7438, 7439, 7440, 7441 }, new String[]{ "Elves are quick, agile, and vicious fighters which", "often favour bows and polearms."}, 1, Quests.REGICIDE),
+ // Waiting for either Rum Deal or Pirate Pete and Fever Spiders before adding this assignment
+ FEVER_SPIDER(1, new int[] { 2850 }, new String[] { "Fever Spiders are giant spiders that carry the deadly", "Spider Fever. If you don't want to catch it I suggest", "you wear Slayer Gloves to fight them." }, 42, Quests.RUM_DEAL),
+ FIRE_GIANTS(65, new int[] { 110, 1582, 1583, 1584, 1585, 1586, 7003, 7004 }, new String[] { "Like other giants, Fire Giants often wield large weapons", "learn to recognise what kind of weapon it is,", "and act accordingly." }, 1, false, false),
+ FLESH_CRAWLERS(15, new int[] { 4389, 4390, 4391 }, new String[] { "Flesh Crawlers are scavengers and will eat you - and", "anyone else, given the chance." }, 1, false, false),
+ GARGOYLES(80, new int[] { 1610, 6389 }, new String[] { "Gargoyles are winged creatures of stone. You'll need", "to fight them to near death before breaking them apart", "with a rock hammer." }, 75, false, false),
+ GHOSTS(13, new int[] { 103, 104, 491, 1541, 1549, 2716, 2931, 4387, 388, 5342, 5343, 5344, 5345, 5346, 5347, 5348, 1698, 5349, 5350, 5351, 5352, 5369, 5370, 5371, 5372, 5373, 5374, 5572, 6094, 6095, 6096, 6097, 6098, 6504, 13645, 13466, 13467, 13468, 13469, 13470, 13471, 13472, 13473, 13474, 13475, 13476, 13477, 13478, 13479, 13480, 13481 }, new String[] { "Ghosts are undead so magic is your best bet against", "them, there is even a spell specially for fighting", "the undead." }, 1, true, false),
+ GHOULS(25, new int[] { 1218, 3059 }, new String[] { "Ghouls aren't undead but they are stronger and", "tougher than they look. However they're also very", "cowardly and will run if they're losing a fight." }, 1, false, false),
GOBLINS(1, new int[] { 100, 101, 102, 444, 445, 489, 1769, 1770, 1771, 1772, 1773, 1774, 1775, 1776, 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2678, 2679, 2680, 2681, 3060, 3264, 3265, 3266, 3267, 3413, 3414, 3415, 3726, 4261, 4262, 4263, 4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271, 4272, 4273, 4274, 4275, 4276, 4407, 4408, 4409, 4410, 4411, 4412, 4479, 4480, 4481, 4482, 4483, 4484, 4485, 4486, 4487, 4488, 4489, 4490, 4491, 4492, 4499, 4633, 4634, 4635, 4636, 4637, 5786, 5824, 5855, 5856, 6125, 6126, 6132, 6133, 6279, 6280, 6281, 6282, 6283, 6402, 6403, 6404, 6405, 6406, 6407, 6408, 6409, 6410, 6411, 6412, 6413, 6414, 6415, 6416, 6417, 6418, 6419, 6420, 6421, 6422, 6423, 6424, 6425, 6426, 6427, 6428, 6429, 6430, 6431, 6432, 6433, 6434, 6435, 6436, 6437, 6438, 6439, 6440, 6441, 6442, 6443, 6444, 6445, 6446, 6447, 6448, 6449, 6450, 6451, 6452, 6453, 6454, 6455, 6456, 6457, 6458, 6459, 6460, 6461, 6462, 6463, 6464, 6465, 6466, 6467, 6490, 6491, 6492, 6493, 6494, 6495, 6496, 6497 }, new String[] { "Goblins are mostly just annoying, but they can be vicious.", "Watch out for the spears they sometimes carry." }, 1, false, false),
- GORAKS(70, new int[] { 4418, 6218 }, new String[] { "Goraks can be tough monsters to fight. Be prepared." }, 1, false, false),
- GREATER_DEMONS(75, new int[] { 83, 4698, 4699, 4700, 4701, 6204 }, new String[] { "Greater Demons are magic creatures so they are weak to magical attacks.", "They're the strongest demon and very dangerous." }, 1, false, false),
- GREEN_DRAGONS(52, new int[] { 941, 4677, 4678, 4679, 4680, 5362, 742 }, new String[] { "Green dragons are very powerful, they have fierce", "fiery breath." }, 1, false, true),
- HARPIE_BUG_SWARMS(45, new int[] { 3153 }, new String[] { "Harpie Bug Swarms are insectoid Slayer monsters." }, 33, false, false),
- HELLHOUNDS(75, new int[] { 49, 3586, 6210, }, new String[] { "Hellhounds are mid to high level demons." }, 1, false, false),
- HILL_GIANTS(25, new int[] { 117, 4689, 4690, 3058, 4691, 4692, 4693 }, new String[] { "Hill giants can hit up to 19 damage, and they only attack with Melee." }, 1, false, false),
- HOBGOBLINS(20, new int[] { 122, 123, 2685, 2686, 3061, 6608, 6642, 6661, 6684, 6710, 6722, 6727, 2687, 2688, 3583, 4898, 6275 }, new String[] { "Mysterious goblin like creatures." }, 1, false, false),
- ICE_FIENDS(20, new int[] { 3406, 6217, 7714, 7715, 7716 }, new String[] { "An Icefiend is a monster found on top of Ice Mountain." }, 1, false, false),
- ICE_GIANTS(50, new int[] { 111, 3072, 4685, 4686, 4687 }, new String[] { "Ice Giants often wield large weapons, learn to recognise", "what kind of weapon it is, and act accordingly" }, 1, false, false),
- ICE_WARRIOR(45, new int[] { 125, 145, 3073 }, new String[] { "Ice warriors, are cold majestic creatures." }, 1, false, false),
- INFERNAL_MAGES(40, new int[] { 1643, 1644, 1645, 1646, 1647 }, new String[] { "Infernal Mages are dangerous spell users, beware of their magic", "spells an go properly prepared" }, 45, false, false),
- IRON_DRAGONS(80, new int[] { 1591 }, new String[] { "Iron dragons aren't as strong as other dragons but they're still", "very powerful, watch out for their fiery breath." }, 1, false, true, 40 | 59 << 16),
+ GORAKS(70, new int[] { 4418, 6218 }, new String[] { "Goraks are extremely aggressive creatures. They have", "been imprisoned on an alternative plane, which is", "only accessible by using the fairyrings. Be extremely", "careful, their touch drains health as well as skills!" }, 1, Quests.FAIRYTALE_I_GROWING_PAINS),
+ GREATER_DEMONS(75, new int[] { 83, 4698, 4699, 4700, 4701, 6204 }, new String[] { "Greater Demons are magic creatures so they are weak", "to magical attacks. Though not the strongest demon,", "they are still dangerous." }, 1, false, false),
+ GREEN_DRAGONS(52, new int[] { 941, 4677, 4678, 4679, 4680, 5362, 742 }, new String[] { "Green Dragons are the weakest dragon but still very", "powerful, watch out for their fiery breath." }, 1, false, true),
+ HARPIE_BUG_SWARMS(45, new int[] { 3153 }, new String[] { "Harpie Bug Swarms are pesky critters that are hard to", "hit. You need a lit bug lantern to distract them with", "its hypnotic light." }, 33, false, false),
+ HELLHOUNDS(75, new int[] { 49, 3586, 6210, }, new String[] { "Hellhounds are a cross between Dogs and Demons, they", "are dangerous with a fierce bite." }, 1, false, false),
+ HILL_GIANTS(25, new int[] { 117, 4689, 4690, 3058, 4691, 4692, 4693 }, new String[] { "Hill Giants often wield large weapons, learn to", "recognise what kind of weapon it is and", "act accordingly." }, 1, false, false),
+ HOBGOBLINS(20, new int[] { 122, 123, 2685, 2686, 3061, 6608, 6642, 6661, 6684, 6710, 6722, 6727, 2687, 2688, 3583, 4898, 6275 }, new String[] { "Hobgoblins are sneaky underhanded creatures, they", "often wield spears and some times carry javelins too." }, 1, false, false),
+ ICE_FIENDS(20, new int[] { 3406, 6217, 7714, 7715, 7716 }, new String[] { "Icefiends are beings of ice and freezing rock, they're", "quick and agile so you'll want to be careful when", "getting close to them." }, 1, false, false),
+ ICE_GIANTS(50, new int[] { 111, 3072, 4685, 4686, 4687 }, new String[] { "Like other giants, Ice Giants often wield large", "weapons, learn to recognise what kind of weapon it is", "and act accordingly." }, 1, false, false),
+ ICE_WARRIOR(45, new int[] { 125, 145, 3073 }, new String[] { "Ice Warriors are a kind of ice elemental, shatter them", "with blunt weapons or melt them with fire." }, 1, false, false),
+ INFERNAL_MAGES(40, new int[] { 1643, 1644, 1645, 1646, 1647 }, new String[] { "Infernal Mages are dangerous spell users, beware of", "their magic spells and go properly prepared" }, 45, false, false),
+ IRON_DRAGONS(80, new int[] { 1591 }, new String[] { "Iron Dragons are some of the weaker metallic dragons,", "their iron scales are far thicker than normal", "iron armour." }, 1, false, true),
JELLIES(57, new int[] { 1637, 1638, 1639, 1640, 1641, 1642 }, new String[] { "Jellies are nasty cube-like gelatinous creatures which", "absorb everything they come across into themselves." }, 52, false, false),
- JUNGLE_HORRORS(65, new int[] { 4348, 4349, 4350, 4351, 4352 }, new String[] { "Jungle Horrors can be found all over Mos Le'Harmless.", "They are strong and aggressive, so watch out!" }, 1, false, false),
- KALPHITES(15, new int[] { 1153, 1154, 1155, 1156, 1157, 1159, 1160, 1161 }, new String[] { "Kalaphite are large insects which live in great hives under the desert sands." }, 1, false, false),
- KURASKS(65, new int[] { 1608, 1609, 4229, 7805, 7797 }, new String[] { "A kurask is a very quick creature." }, 70, false, false),
- LESSER_DEMONS(60, new int[] { 82, 6203, 3064, 4694, 4695, 6206, 3064, 4696, 4697, 6101 }, new String[] { "Lesser Demons are magic creatures so they are weak to magical attacks." }, 1, false, false),
- MITHRIL_DRAGONS(60, new int[] { 5363 }, new String[] { "Mithril dragons aren't as strong as other dragons but they're still", "very powerful, watch out for their fiery breath." }, 1, false, true, 5 | 9 << 16),
+ JUNGLE_HORRORS(65, new int[] { 4348, 4349, 4350, 4351, 4352 }, new String[] { "Jungle Horrors can be found all over Mos Le'Harmless.", "They are strong and aggressive, so watch out!" }, 1, Quests.CABIN_FEVER),
+ KALPHITES(15, new int[] { 1153, 1154, 1155, 1156, 1157, 1159, 1160, 1161 }, new String[] { "Kalphites are large insects which live in great hives", "under the desert sands." }, 1, false, false),
+ // Waiting for the killer watt plane to be implemented before adding to assignments
+ KILLERWATTS(1, new int[] { 3201 }, new String[] { "Killerwatts store huge amounts of energy in their", "bodies, which is released if they are touched. You'll", "need to wear heavily insulated boots to counter this", "shocking effect." }, 37, Quests.ERNEST_THE_CHICKEN),
+ KURASKS(65, new int[] { 1608, 1609, 4229, 7805, 7797 }, new String[] { "Kurasks are large brutal creatures with very thick", "hides. You'll need a Leaf-Tipped Spear Sword or", "Battle-axe, Broad Arrows, or a Magic Dart to harm them." }, 70, false, false),
+ LESSER_DEMONS(60, new int[] { 82, 6203, 3064, 4694, 4695, 6206, 3064, 4696, 4697, 6101 }, new String[] { "Lesser Demons are magic creatures so they are weak to", "magical attacks. Though they're relatively weak they", "are still dangerous." }, 1, false, false),
MINOTAURS(7, new int[] { 4404, 4405, 4406 }, new String[] { "Minotaurs are large manlike creatures but you'll", "want to be careful of their horns." }, 1, false, false),
- MONKEYS(1, new int[] { 132, 1463, 1464, 2301, 4344, 4363, 6943, 7211, 7213, 7215, 7217, 7219, 7221, 7223, 7225, 7227, 1455, 1459, 1460, 1456, 1457, 1458 }, new String[] { "Small agile creatures, watch out they pinch!" }, 1, false, false),
- MOSS_GIANTS(40, new int[] { 112, 1587, 1588, 1681, 4534, 4688, 4706 }, new String[] { "They are known to carry large sticks." }, 1, false, false),
- NECHRYAELS(85, new int[] { 1613 }, new String[] { "Nechryael are demons of decay which summon small winged beings which", "help them fight their victims." }, 80, false, false),
- OGRES(40, new int[] { 115, 374, 2044, 2045, 2046, 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057,2801, 3419, 7078, 7079, 7080, 7081, 7082 }, new String[] { "Ogres are brutal creatures, favouring large blunt maces and clubs", "they often attack without warning." }, 1, false, false),
- OTHERWORDLY_BEING(40, new int[] { 126 }, new String[] { "A creature filled with everlasting power." }, 1, false, false),
- PYREFIENDS(25, new int[] { 1633, 1634, 1635, 1636, 6216, 6631, 6641, 6660, 6668, 6683, 6709, 6721, }, new String[] { "A scorching hot creature, watch out!" }, 30, false, false),
- RATS(1, new int[] { 2682, 2980, 2981, 3007, 88, 224, 4928, 4929, 4936, 4937, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, 3018, 4396, 4415, 7202, 7204, 7417, 7461, 87, 446, 950, 4395, 4922, 4923, 4924, 4925, 4926, 4927, 4942, 4943, 4944, 4945, 86, 87, 446, 950, 4395, 4922, 4923, 4924, 4925, 4926, 4927, 4942, 4943, 4944, 4945 }, new String[] { "Quick little rodents!" }, 1, false, false),
- ROCK_SLUGS(20, new int[] { 1631, 1632 }, new String[] { "A rock slug can leave behind a trail of his presence.." }, 20, false, false),
- SCORPIONS(7, new int[] { 107, 1477, 4402, 4403, 144 }, new String[] { "A scorpion makes a piercing sound, watch out for", "its long sharp tail." }, 1, false, false),
- SHADE(30, new int[] { 3617, 1250, 1241, 1246, 1248, 1250, 428, 1240 }, new String[] { "Shades are dark and mysterious", "they hide in the shadows so be wary of ambushes." }, 1, true, false),
- SKELETONS(15, new int[] { 90, 91, 92, 93, 94, 459, 1471, 1575, 1973, 2036, 2037, 2715, 2717, 3065, 3151, 3291, 3581, 3697, 3698, 3699, 3700, 3701, 3702, 3703, 3704, 3705, 3844, 3850, 3851, 4384, 4385, 4386, 5332, 5333, 5334, 5335, 5336, 5337, 5338, 5339, 5340, 5341, 5359, 5365, 5366, 5367, 5368, 5381, 5384, 5385, 5386, 5387, 5388, 5389, 5390, 5391, 5392, 5411, 5412, 5422, 6091, 6092, 6093, 6103, 6104, 6105, 6106, 6107, 6764, 6765, 6766, 6767, 6768, 2050, 2056, 2057, 1539, 7640 }, new String[] { "Skeletons are undead monsters found in various locations." }, 1, true, false),
- SPIDERS(1, new int[] { 61, 1004, 1221, 1473, 1474, 63, 4401, 2034, 977, 7207, 134, 1009, 59, 60, 4400, 58, 62, 1478, 2491, 2492, 6376, 6377, }, new String[] { "Level 24 spiders are aggressive and can hit up to 60 life points." }, 1, false, false),
- SPIRTUAL_MAGES(60, new int[] { 6221, 6231, 6257, 6278 }, new String[] { "They are dangerous, they hit with mage." }, 83, false, false),
- SPIRTUAL_RANGERS(60, new int[] { 6220, 6230, 6256, 6276 }, new String[] { "They are dangerous, they hit with range." }, 63, false, false),
- SPIRTUAL_WARRIORS(60, new int[] { 6219, 6229, 6255, 6277, }, new String[] { "They are dangerous, they hit with melee." }, 68, false, false),
- STEEL_DRAGONS( 85,new int[] { 1592, 3590 }, new String[] { "Steel dragons aren't as strong as other dragons but they're still", "very powerful, watch out for their fiery breath." }, 1, false, true, 10 | 20 << 16),
- TROLLS(60, new int[] { 72, 3584, 1098, 1096, 1097, 1095, 1101, 1105, 1102, 1103, 1104, 1130, 1131, 1132, 1133, 1134, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1138, 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1935, 1936, 1937, 1938, 1939, 1940, 1941, 1942, 3840, 3841, 3842, 3843, 3845, 1933, 1934, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 391, 392, 393, 394, 395, 396}, new String[] { "Trolls have a crushing attack, it's bets to wear a high crushing defence." }, 1, false, false),
- TUROTHS(60, new int[] { 1611, 1622, 1623, 1626, 1627, 1628, 1629, 1630, 7800}, new String[] { "Turoths are Slayer monsters that require a Slayer level of 55 to kill" }, 55, false, false),
- TZHAAR(45, new int[] { 2591, 2592, 2593, 2745, 2594, 2595, 2596, 2597, 2604, 2605, 2606, 2607, 2608, 2609, 7755, 7753, 2598, 2599, 2600, 2601, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2624, 2617, 2618, 2625, 2602, 2603, 7754, 7767, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2624, 2625, 2627, 2628, 2629, 2630, 2631, 2632, 7746, 7747, 7748, 7749, 7750, 7751, 7752, 7753, 7754, 7755, 7756, 7757, 7758, 7759, 7760, 7761, 7762, 7763, 7764, 7765, 7766, 7767, 7768, 7769, 7770, 7771, 7747, 7747, 7748, 7749, 7750, 7751, 7752, 7753, 7757, 7765, 7769, 7768 }, new String[] { "Young Tzhaar's of the century are furious with your kind." }, 1, false, false),
- SUQAHS (65, new int[] { 4527, 4528, 4529, 4530, 4531, 4532, 4533 }, new String[] { "Suquah are big, angry folk that inhabit Lunar Isle." }, 1, "Lunar Diplomacy"),
- VAMPIRES(35, new int[] { 1023, 1220, 1223, 1225, 6214 }, new String[] { "Vampires are equipped with large fangs,", "they can do serious damage." }, 1, false, false),
- WATERFIENDS(75, new int[] { 5361 }, new String[] { "A waterfiend takes no damage from fire!" }, 1, false, false),
- WEREWOLFS(60, new int[] { 1665, 6006, 6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016, 6017, 6018, 6019, 6020, 6021, 6022, 6023, 6024, 6025, 6212, 6213, 6607, 6609, 6614, 6617, 6625, 6632, 6644, 6663, 6675, 6686, 6701, 6712, 6724, 6728, }, new String[] { "There temper is alot more nasty then a regular wolf!" }, 1, false, false),
- WOLVES(20, new int[] { 95, 96, 97, 141, 142, 143, 839, 1198, 1330, 1558, 1559, 1951, 1952, 1953, 1954, 1955, 1956, 4413, 4414, 6046, 6047, 6048, 6049, 6050, 6051, 6052, 6829, 6830, 7005 }, new String[] { "Wolves are more agressive then dog's." }, 1, false, false),
- ZOMBIES(10, new int[] { 73, 74, 75, 76, 2714, 2863, 2866, 2869, 2878, 3622, 4392, 4393, 4394, 5293, 5294, 5295, 5296, 5297, 5298, 5299, 5300, 5301, 5302, 5303, 5304, 5305, 5306, 5307, 5308, 5309, 5310, 5311, 5312, 5313, 5314, 5315, 5316, 5317, 5318, 5319, 5320, 5321, 5322, 5323, 5324, 5325, 5326, 5327, 5328, 5329, 5330, 5331, 5375, 5376, 5377, 5378, 5379, 5380, 5393, 5394, 5395, 5396, 5397, 5398, 5399, 5400, 5401, 5402, 5403, 5404, 5405, 5406, 5407, 5408, 5409, 5410, 6099, 6100, 6131, 8149, 8150, 8151, 8152, 8153, 8159, 8160, 8161, 8162, 8163, 8164, 2044, 2045, 2046, 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 7641, 1465, 1466, 1467, 2837, 2838, 2839, 2840, 2841, 2842, 5629, 5630, 5631, 5632, 5633, 5634, 5635, 5636, 5637, 5638, 5639, 5640, 5641, 5642, 5643, 5644, 5645, 5646, 5647, 5648, 5649, 5650, 5651, 5652, 5653, 5654, 5655, 5656, 5657, 5658, 5659, 5660, 5661, 5662, 5663, 5664, 5665, 2843, 2844, 2845, 2846, 2847, 2848}, new String[] { "Zombies are creatures with no brain, they do hit farley", "high though." }, 1, true, false),
- JAD(90, new int[] { }, new String[] { "TzTok-Jad is the king of the Fight Caves." }, 1, false, false, 1 | 1 << 16),
- CHAOS_ELEMENTAL(90, new int[] { 3200 }, new String[] { "The Chaos Elemental is located in the deep Wilderness." }, 1, false, false, 5 | 25 << 16),
- GIANT_MOLE(75, new int[] { 3340 }, new String[] { "Fighting the Giant Mole will require a light source." }, 1, false, false, 5 | 25 << 16),
- KING_BLACK_DRAGON(75, new int[] { 50 }, new String[] { "The King Black Dragon is located in the deep wilderness." }, 1, false, true, 5 | 25 << 16),
- COMMANDER_ZILYANA(90, new int[] { 6247 }, new String[] { "Commander Zilyana is one of the four Godwars bosses." }, 1, false, false, 5 | 25 << 16),
- GENERAL_GRARDOOR(90, new int[] { 6260 }, new String[] { "General Grardoor is one of the four Godwars bosses." }, 1, false, false, 5 | 25 << 16),
- KRIL_TSUTSAROTH(90, new int[] { 6203 }, new String[] { "Kril Tsutsaroth is one of the four Godwars bosses." }, 1, false, false, 5 | 25 << 16),
- KREE_ARRA(90, new int[] { 6222 }, new String[] { "Kree'arra is one of the four Godwars bosses." }, 1, false, false, 5 | 25 << 16),
- SKELETAL_WYVERN(70, new int[] { 3068, 3069, 3070, 3071 }, new String[] { "A skeletal wyvern requires an elemental, mirror", "or dragonfire shield." }, 72, false, false, 24 | 39 << 16);
+ MITHRIL_DRAGONS(60, new int[] { 5363 }, new String[] { "Mithril dragons are more vulnerable to magic and to", "stab-based melee attacks than to anything else." }, 1, false, true),
+ MOGRES(1, new int[] { 114 }, new String[] { "Mogres are a type of aquatic Ogre that is", "often mistaken for a giant mudskipper. You have to force", "them out of the water with a fishing explosive." }, 32, false, false),
+ // Waiting for molanisks transform to be implemented before adding this to assignments
+ MOLANISKS(1, new int[] { 5751 }, new String[] { "Molanisks are subterranean creatures. You can find", "them in caves deep below the ground. I heard that the", "goblins have recently had trouble with some, but they", "use a bell of some sort to deal with them."}, 39, Quests.DEATH_TO_THE_DORGESHUUN),
+ MONKEYS(1, new int[] { 132, 1463, 1464, 2301, 4344, 4363, 6943, 7211, 7213, 7215, 7217, 7219, 7221, 7223, 7225, 7227, 1455, 1459, 1460, 1456, 1457, 1458 }, new String[] { "Monkeys are tricky creatures, they are agile and", "fairly fast. Learn to anticipate their movements." }, 1, false, false),
+ MOSS_GIANTS(40, new int[] { 112, 1587, 1588, 1681, 4534, 4688, 4706 }, new String[] { "Like other giants, Moss Giants often wield large", "weapons, learn to recognise what kind of weapon it is", "and act accordingly." }, 1, false, false),
+ // Waiting for zygomite transform to be implemented before adding this to assignments
+ MUTATED_ZYGOMITES(1, new int[] { 3346, 3347 }, new String[] { "Mutated Zygomites are hard to destroy. They regenerate", "quickly so you will need to finish them with fungicide." }, 57, Quests.LOST_CITY),
+ NECHRYAELS(85, new int[] { 1613 }, new String[] { "Nechryael are demons of decay which summon small", "winged beings to help them fight their victims." }, 80, false, false),
+ OGRES(40, new int[] { 115, 374, 2044, 2045, 2046, 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2060, 2801, 3419, 7078, 7079, 7080, 7081, 7082 }, new String[] { "Ogres are brutal creatures, favouring large blunt", "maces and clubs they often attack without warning." }, 1, false, false),
+ OTHERWORDLY_BEING(40, new int[] { 126 }, new String[] { "Otherworldly Beings are ethereal beings making them", "weak to magical attack." }, 1, false, false),
+ PYREFIENDS(25, new int[] { 1633, 1634, 1635, 1636, 6216, 6631, 6641, 6660, 6668, 6683, 6709, 6721, }, new String[] { "Pyrefiends are beings of fire and molten rock,", "they're quick and agile so you'll want to be careful", "when getting close to them." }, 30, false, false),
+ RED_DRAGONS(1, new int[] { 53, 1589, 3588, 4667, 4668, 4669, 4670, 4671, 4672 }, new String[] { "Red Dragons are very powerful, stronger than most", "dragons, watch out for their fiery breath." }, 1, false, false),
+ ROCK_SLUGS(20, new int[] { 1631, 1632 }, new String[] { "Rockslugs are strange stoney slugs. You'll need to", "fight them to near death before finishing them off", "with Salt." }, 20, false, false),
+ // Seems to need Contact or the NPCs added to dungeons before adding this assignment as a task
+ SCABARITES(1, new int[] { 2001, 4500, 5251, 5252, 5255, 5256, 5250, 5254, 6777, 6778, 6774, 6780, 6781, 6773 }, new String[] {"Scabarites are insectoid creatures, found beyond the", "Kharidian deserts. They can be extremely dangerous."}, 1, Quests.CONTACT),
+ SCORPIONS(7, new int[] { 107, 1477, 4402, 4403, 144 }, new String[] { "Scorpions are almost always poisonous, their hard", "carapace makes them resistant to crushing and", "stabbing attacks." }, 1, false, false),
+ SEA_SNAKES(1, new int[] { 3939, 3940 }, new String[] { "Sea Snakes are long and slithery with a venomous bite.", "The larger ones are more poisonous, so keep an eye on", "your health." }, 1, Quests.ROYAL_TROUBLE),
+ SHADE(30, new int[] { 3617, 1250, 1241, 1246, 1248, 1250, 428, 1240 }, new String[] { "Shades are undead so magic is your best best against", "them, you can find Shades at Mort'ton." }, 1, true, false),
+ // Dungeon needs to be connected to the Legend's Guild before adding this assignment as a task
+ SHADOW_WARRIORS(1, new int[] { 158 }, new String[] { "Shadow Warriors are dark and mysterious, they hide in", "the shadows so be wary of ambushes." }, 1, Quests.LEGENDS_QUEST),
+ SKELETAL_WYVERN(70, new int[] { 3068, 3069, 3070, 3071 }, new String[] { "Skeletal Wyverns are extremely dangerous and they are", "hard to hit with arrows as they slip right through.", "To stand a good chance of surviving you'll need some", "elemental shielding from its icy breath." }, 72, false, false),
+ SKELETONS(15, new int[] { 90, 91, 92, 93, 94, 459, 1471, 1575, 1973, 2036, 2037, 2715, 2717, 3065, 3151, 3291, 3581, 3697, 3698, 3699, 3700, 3701, 3702, 3703, 3704, 3705, 3844, 3850, 3851, 4384, 4385, 4386, 5332, 5333, 5334, 5335, 5336, 5337, 5338, 5339, 5340, 5341, 5359, 5365, 5366, 5367, 5368, 5381, 5384, 5385, 5386, 5387, 5388, 5389, 5390, 5391, 5392, 5411, 5412, 5422, 6091, 6092, 6093, 6103, 6104, 6105, 6106, 6107, 6764, 6765, 6766, 6767, 6768, 2050, 2056, 2057, 1539, 7640 }, new String[] { "Skeletons are undead so magic is your best bet against", "them, there is even a spell specially for fighting the undead." }, 1, true, false),
+ SPIDERS(1, new int[] { 61, 1004, 1221, 1473, 1474, 63, 4401, 2034, 977, 7207, 134, 1009, 59, 60, 4400, 58, 62, 1478, 2491, 2492, 6376, 6377, }, new String[] { "Spiders are often poisonous, and many varieties are", "camouflaged too." }, 1, false, false),
+ SPIRTUAL_MAGES(60, new int[] { 6221, 6231, 6257, 6278 }, new String[] { "Spiritual mages can be found in the icy caverns near", "Trollheim, supporting the cause of their chosen god." }, 83, Quests.DEATH_PLATEAU),
+ SPIRTUAL_RANGERS(60, new int[] { 6220, 6230, 6256, 6276 }, new String[] { "Spiritual rangers can be found in the icy caverns near", "Trollheim, supporting the cause of their chosen god." }, 63, Quests.DEATH_PLATEAU),
+ SPIRTUAL_WARRIORS(60, new int[] { 6219, 6229, 6255, 6277, }, new String[] { "Spiritual warriors can be found in the icy caverns near", "Trollheim, supporting the cause of their chosen god." }, 68, Quests.DEATH_PLATEAU),
+ STEEL_DRAGONS( 85,new int[] { 1592, 3590 }, new String[] { "Steel dragons are dangerous and metallic, with steel", "scales that are far thicker than normal steel armour. As", "you are an accomplished slayer, I am sure you'll be", "able to deal with them easily."}, 1, false, true),
+ SUQAHS (65, new int[] { 4527, 4528, 4529, 4530, 4531, 4532, 4533 }, new String[] { "Suqahs can only be found on the mystical Lunar Isle.", "They are capable of melee and magic attacks and often", "drop hide, teeth and herbs!" }, 1, Quests.LUNAR_DIPLOMACY),
+ // No access to Lair of Tarn Razorlor but this should be added as a task when there is access
+ TERROR_DOGS(1, new int[] { 5417, 5418 }, new String[] { "Terror dogs are the personal pets of Tarn Razorlor.", "Wherever you find him, you will find them. They are", "bad-tempered and generally unfriendly." }, 40, Quests.HAUNTED_MINE),
+ TROLLS(60, new int[] { 72, 3584, 1098, 1096, 1097, 1095, 1101, 1105, 1102, 1103, 1104, 1130, 1131, 1132, 1133, 1134, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1138, 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1935, 1936, 1937, 1938, 1939, 1940, 1941, 1942, 3840, 3841, 3842, 3843, 3845, 1933, 1934, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 391, 392, 393, 394, 395, 396}, new String[] { "Trolls regenerate damage quickly but are still", "vulnerable to poisons, they usually use crushing", "weapons." }, 1, false, false),
+ TUROTHS(60, new int[] { 1622, 1611, 1623, 1626, 1627, 1628, 1629, 1630, 7800}, new String[] { "Turoth are large vicious creatures with thick hides.", "You'll need a Leaf-Tipped Spear Sword or Battle-axe,", "Broad Arrows, or a Magic Dart to harm them." }, 55, false, false),
+ VAMPIRES(35, new int[] { 1220, 1223, 1225, 6214 }, new String[] { "Vampires are extremely powerful beings. They feed on", "the blood of the living so watch out you don't", "get bitten." }, 1, false, false),
+ // Waiting for the wall beast movement bug to be fixed before adding this as a task
+ WALL_BEASTS(1, new int[] { 7823 }, new String[] { "Wall Beasts are really much larger creatures but", "you'll only see their arms. You'll want something", "sharp on your head to stop them grabbing you." }, 35, false, false ),
+ // No way to get to Poison Swamp Cave
+ // If a grapple is implemented from W Castle Wars to E Posion Swamps
+ // The dungeon connected and populated
+ // then these could be added as a task
+ WARPED_TERROR_BIRD(1, new int[] { 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, 6294, 6295, 6323, 6324, 6325, 6326, 6327, 6328, 6329, 6330, 6331, 6332, 6608 }, new String[] { "Warped Creatures can supposedly be found within a", "mysterious dungeon on the eastern edge of the Poison", "Waste. Be aware that to defeat them, you'll need to", "purify them in some way." },56, Quests.THE_PATH_OF_GLOUPHRIE),
+ WARPED_TORTOISE(1, new int[] { 6296, 6297 }, new String[] { "Warped Creatures can supposedly be found within a", "mysterious dungeon on the eastern edge of the Poison", "Waste. Be aware that to defeat them, you'll need to", "purify them in some way." },56, Quests.THE_PATH_OF_GLOUPHRIE),
+ WATERFIENDS(75, new int[] { 5361 }, new String[] { "Waterfiends are creatures of water, which live under", "the Baxtorian Lake. Their watery form is well defended", "against slashing and piercing weapons, so use", "something blunt." }, 1, false, false),
+ WEREWOLVES(60, new int[] { 6006, 6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016, 6017, 6018, 6019, 6020, 6021, 6022, 6023, 6024, 6025, 6212, 6213, 6607, 6609, 6614, 6617, 6625, 6632, 6644, 6663, 6675, 6686, 6701, 6712, 6724, 6728, }, new String[] { "Werewolves are feral creatures, they are strong and", "tough with sharp claws and teeth." }, 1, false, false),
+ WOLVES(20, new int[] { 95, 96, 97, 141, 142, 143, 839, 1198, 1330, 1558, 1559, 1951, 1952, 1953, 1954, 1955, 1956, 4413, 4414, 6046, 6047, 6048, 6049, 6050, 6051, 6052, 6829, 6830, 7005 }, new String[] { "Wolves are pack animals, so you'll always find them", "in groups. Watch out for their bite, it can be nasty." }, 1, false, false),
+ ZOMBIES(10, new int[] { 73, 74, 75, 76, 2060, 2714, 2863, 2866, 2869, 2878, 3622, 4392, 4393, 4394, 5293, 5294, 5295, 5296, 5297, 5298, 5299, 5300, 5301, 5302, 5303, 5304, 5305, 5306, 5307, 5308, 5309, 5310, 5311, 5312, 5313, 5314, 5315, 5316, 5317, 5318, 5319, 5320, 5321, 5322, 5323, 5324, 5325, 5326, 5327, 5328, 5329, 5330, 5331, 5375, 5376, 5377, 5378, 5379, 5380, 5393, 5394, 5395, 5396, 5397, 5398, 5399, 5400, 5401, 5402, 5403, 5404, 5405, 5406, 5407, 5408, 5409, 5410, 6099, 6100, 6131, 8149, 8150, 8151, 8152, 8153, 8159, 8160, 8161, 8162, 8163, 8164, 2044, 2045, 2046, 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 7641, 1465, 1466, 1467, 2837, 2838, 2839, 2840, 2841, 2842, 5629, 5630, 5631, 5632, 5633, 5634, 5635, 5636, 5637, 5638, 5639, 5640, 5641, 5642, 5643, 5644, 5645, 5646, 5647, 5648, 5649, 5650, 5651, 5652, 5653, 5654, 5655, 5656, 5657, 5658, 5659, 5660, 5661, 5662, 5663, 5664, 5665, 2843, 2844, 2845, 2846, 2847, 2848}, new String[] { "Zombies are undead so magic is your best bet against", "them, there is even a spell specially for", "fighting the undead." }, 1, true, false),
+ // Bosses need to be handled differently/have a source. They should probably be removed from here
+ JAD(90, new int[] { }, new String[] { "You must complete the entire fight cave, including", "TzTok-Jad. Beware, only those skilled in combat should", "attempt this and death will reset your task." }, 1, false, false),
+ CHAOS_ELEMENTAL(90, new int[] { 3200 }, new String[] { "The Chaos Elemental roams the deepest Wilderness. It", "can teleport you and make you unequip items randomly." }, 1, false, false),
+ GIANT_MOLE(75, new int[] { 3340 }, new String[] { "Dig on the mole-hills in Falador Park to enter the", "mole cave, and bring a lantern he can't extinguish." }, 1, false, false),
+ KING_BLACK_DRAGON(75, new int[] { 50 }, new String[] { "The King Black Dragon's cave is reached by pulling a", "lever in the Wilderness. An anti-fire shield is", "strongly recommended." }, 1, false, true),
+ COMMANDER_ZILYANA(90, new int[] { 6247 }, new String[] { "Commander Zilyana is in the God Wars Dungeon.", "She frequently uses magic attacks." }, 1, false, false),
+ GENERAL_GRARDOOR(90, new int[] { 6260 }, new String[] { "General Graardor is in the God Wars Dungeon.", "He uses melee and ranged attacks." }, 1, false, false),
+ KRIL_TSUTSAROTH(90, new int[] { 6203 }, new String[] { "K'ril Tsutsaroth is in the God Wars Dungeon.", "He's poisonous and he can hit through prayers." }, 1, false, false),
+ KREE_ARRA(90, new int[] { 6222 }, new String[] { "Kree'arra roosts in the God Wars Dungeon.", "Melee attacks don't work on flying creatures,", "and you'll need a grappling hook to get in." }, 1, false, false),
+ ;
static final HashMap taskMap = new HashMap<>();
static{
@@ -117,8 +145,7 @@ public enum Tasks {
public final int[] ids;
public boolean undead = false;
public boolean dragon = false;
- public int amtHash;
- public String questReq = "";
+ public Quests questReq = null;
Tasks(int combatCheck, int[] ids, String[] info, int levelReq, boolean undead, boolean dragon){
this.levelReq = levelReq;
this.ids = ids;
@@ -128,17 +155,7 @@ public enum Tasks {
this.combatCheck = combatCheck;
}
- Tasks(int combatCheck, int[] ids, String[] info, int levelReq, boolean undead, boolean dragon, int amtHash){
- this.levelReq = levelReq;
- this.ids = ids;
- this.info = info;
- this.undead = undead;
- this.dragon = dragon;
- this.amtHash = amtHash;
- this.combatCheck = combatCheck;
- }
-
- Tasks (int combatCheck, int[] ids, String[] info, int levelReq, String questReq) {
+ Tasks (int combatCheck, int[] ids, String[] info, int levelReq, Quests questReq) {
this.combatCheck = combatCheck;
this.ids = ids;
this.info = info;
@@ -155,7 +172,7 @@ public enum Tasks {
}
public boolean hasQuestRequirements (Player player) {
- return questReq.equals("") || hasRequirement(player, questReq, false);
+ return questReq == null || hasRequirement(player, questReq, false);
}
public static Tasks forId(int id){
diff --git a/Server/src/main/content/global/skill/slayer/dungeon/SmokeDungeon.java b/Server/src/main/content/global/skill/slayer/dungeon/SmokeDungeon.java
index edce0a909..3dec3dd92 100644
--- a/Server/src/main/content/global/skill/slayer/dungeon/SmokeDungeon.java
+++ b/Server/src/main/content/global/skill/slayer/dungeon/SmokeDungeon.java
@@ -132,7 +132,7 @@ public final class SmokeDungeon extends MapZone implements Plugin {
* @param player the player.
*/
private static void effect(Player player) {
- int hit = 2;
+ int hit = 10;
setDelay(player);
if (RandomFunction.random(2) == 1) {
player.sendChat(CHATS[RandomFunction.random(CHATS.length)]);
diff --git a/Server/src/main/content/global/skill/slayer/unused-tasks b/Server/src/main/content/global/skill/slayer/unused-tasks
deleted file mode 100644
index 03501f20e..000000000
--- a/Server/src/main/content/global/skill/slayer/unused-tasks
+++ /dev/null
@@ -1,92 +0,0 @@
- /*WALL_BEASTS(new Task(new int[] { 7823 }, new String[] { "A spiny helmet or equivalent is required to start fighting one " }, 35, new Master[] { Master.MAZCHNA }, false, Equipment.SPINY_HELMET) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),
- WARPED_TERRORBIRDS(new Task(new int[] { 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, 6294, 6295, 6322, 6323, 6324, 6325, 6326, 6327, 6328, 6329, 6330, 6331, 6332, }, new String[] { "They require 56 Slayer and a Crystal chime to be killed. " }, 56, new Master[] { Master.DURADEL }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),
- WARPED_TORTOISES(new Task(new int[] { 6296, 6297 }, new String[] { "A warped tortoise is not as slow as they look." }, 56, new Master[] { Master.DURADEL }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
-/*CERBERUS(new Task(new int[] {8632, 8634}, new String[] {"Cerberus is about the best guard dog there is!"}, 91, new Master[] {Master.VANNAKA, Master.CHAELDAR, Master.NIEVE, Master.DURADEL}, false, 20 | 25 << 16) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- })*/
-/*ZYGOMITES(new Task(new int[] { 3346, 3347 }, new String[] { "Mutated zygomites are monsters that appear as Fungi until provoked." }, 57, new Master[] { Master.CHAELDAR }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
-/*SUQAHS(new Task(new int[] { 4527, 4528, 4529, 4530, 4531, 4532, 4533 }, new String[] {}, 1, new Master[] { Master.DURADEL }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),
- TERROR_DOG(new Task(new int[] { 5417, 5418 }, new String[] { "Terror Dogs are much like Wolves, they are pack creatures which will hunt in groups." }, 1, new Master[] { Master.VANNAKA, Master.DURADEL }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
-/*SHADOW_WARRIORS(new Task(new int[] { 158 }, new String[] { "Shadow warriors are dark and mysterious, they hide in the shadows so be wary of ambushes." }, 1, new Master[] { Master.VANNAKA, Master.CHAELDAR }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
-//MOGRES(new Task(new int[] { 114 }, new String[] { "Mogres are Slayer monsters and require level 32 Slayer to kill. " }, 32, new Master[] { Master.MAZCHNA, Master.VANNAKA }, false)),
- /*MOLANISKS(new Task(new int[] { 5751 }, new String[] { "Molanisks are found attached to cave walls and must be lured", "off with a Slayer bell" }, 39, new Master[] { Master.VANNAKA }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
-
- /*RED_DRAGONS(new Task(new int[] { 53, 4669, 4670, 4671, 4672, 1589, 3588, 4667, 4668, }, new String[] { "Red dragons aren't as strong as other dragons but they're still", "very powerful, watch out for their firey breath." }, 1, new Master[] { Master.DURADEL }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
- /*SCABARITES(new Task(new int[] { 2009 }, new String[] { "The Scabarites are fairly strong monsters, and can hit pretty hard." }, 1, new Master[] { Master.CHAELDAR }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
- /*SEA_SNAKES(new Task(new int[] { 3943, 3939, }, new String[] { "They are quick, make sure you don't let your", "eye off of them for 1 second." }, 1, new Master[] { Master.VANNAKA }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
-/*ELVES(new Task(new int[] { 1184, 1183, 1185 }, new String[] { "Elves are quick, agile and vicious fighters which", "often favour bows and polearms." }, 1, new Master[] { Master.VANNAKA, Master.CHAELDAR, Master.NIEVE }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),
- FEVER_SPIDERS(new Task(new int[] { 2850 }, new String[] { "Fever Spiders are giant spiders that carry the deadly Spider Fever.", "If you don't want to catch it I suggest you wear Slayer Gloves to fight them." }, 1, new Master[] { Master.CHAELDAR, Master.DURADEL }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
- /*KILLERWATTS(new Task(new int[] { 3201, 3202 }, new String[] { "Vexia halfassed this... (this was shadow knight text)" }, 37, new Master[] { Master.VANNAKA }, false) {
- @Override
- public boolean isDisabled() {
- return true;
- }
- }),*/
\ No newline at end of file
diff --git a/Server/src/main/content/global/skill/smithing/Bars.java b/Server/src/main/content/global/skill/smithing/Bars.java
index 7514693fe..0c8c36181 100644
--- a/Server/src/main/content/global/skill/smithing/Bars.java
+++ b/Server/src/main/content/global/skill/smithing/Bars.java
@@ -26,122 +26,122 @@ public enum Bars {
/**
* Bronze Mace
*/
- BRONZE_MACE(BarType.BRONZE, SmithingType.TYPE_MACE, 1422, 2),
+ BRONZE_MACE(BarType.BRONZE, SmithingType.TYPE_MACE, 1422, 1),
/**
* Bronze Medium helm
*/
- BRONZE_MED_HELM(BarType.BRONZE, SmithingType.TYPE_MEDIUM_HELM, 1139, 3),
+ BRONZE_MED_HELM(BarType.BRONZE, SmithingType.TYPE_MEDIUM_HELM, 1139, 1),
/**
* Bronze Crossbow Bolt
*/
- BRONZE_CROSSBOW_BOLT(BarType.BRONZE, SmithingType.TYPE_CROSSBOW_BOLT, 9375, 3),
+ BRONZE_CROSSBOW_BOLT(BarType.BRONZE, SmithingType.TYPE_CROSSBOW_BOLT, 9375, 1),
/**
* Bronze Sword
*/
- BRONZE_SWORD(BarType.BRONZE, SmithingType.TYPE_SWORD, 1277, 4),
+ BRONZE_SWORD(BarType.BRONZE, SmithingType.TYPE_SWORD, 1277, 1),
/**
* Bronze Dart Tips
*/
- BRONZE_DART_TIPS(BarType.BRONZE, SmithingType.TYPE_DART_TIP, 819, 4),
+ BRONZE_DART_TIPS(BarType.BRONZE, SmithingType.TYPE_DART_TIP, 819, 1),
/**
* Bronze Nails
*/
- BRONZE_NAILS(BarType.BRONZE, SmithingType.TYPE_NAIL, 4819, 4),
+ BRONZE_NAILS(BarType.BRONZE, SmithingType.TYPE_NAIL, 4819, 1),
/**
* Bronze Wire
*/
- BRONZE_WIRE(BarType.BRONZE, SmithingType.TYPE_WIRE, 1794, 4),
+ BRONZE_WIRE(BarType.BRONZE, SmithingType.TYPE_WIRE, 1794, 1),
/**
* Bronze Arrow Tips
*/
- BRONZE_ARROW_TIPS(BarType.BRONZE, SmithingType.TYPE_ARROW_TIP, 39, 5),
+ BRONZE_ARROW_TIPS(BarType.BRONZE, SmithingType.TYPE_ARROW_TIP, 39, 1),
/**
* Bronze Scimitar
*/
- BRONZE_SCIMITAR(BarType.BRONZE, SmithingType.TYPE_SCIMITAR, 1321, 5),
+ BRONZE_SCIMITAR(BarType.BRONZE, SmithingType.TYPE_SCIMITAR, 1321, 1),
/**
* Bronze Crossbow Limbs
*/
- BRONZE_CROSSBOW_LIMBS(BarType.BRONZE, SmithingType.TYPE_CROSSBOW_LIMB, 9420, 6),
+ BRONZE_CROSSBOW_LIMBS(BarType.BRONZE, SmithingType.TYPE_CROSSBOW_LIMB, 9420, 1),
/**
* Bronze longsword
*/
- BRONZE_LONGSWORD(BarType.BRONZE, SmithingType.TYPE_LONGSWORD, 1291, 6),
+ BRONZE_LONGSWORD(BarType.BRONZE, SmithingType.TYPE_LONGSWORD, 1291, 1),
/**
* Bronze ThrowingKnife
*/
- BRONZE_THROWINGKNFIE(BarType.BRONZE, SmithingType.TYPE_THROWING_KNIFE, 864, 7),
+ BRONZE_THROWINGKNFIE(BarType.BRONZE, SmithingType.TYPE_THROWING_KNIFE, 864, 1),
/**
* Bronze Full helmet
*/
- BRONZE_FULL_HELM(BarType.BRONZE, SmithingType.TYPE_FULL_HELM, 1155, 7),
+ BRONZE_FULL_HELM(BarType.BRONZE, SmithingType.TYPE_FULL_HELM, 1155, 1),
/**
* Bronze Square Shield
*/
- BRONZE_SQUARE_SHIELD(BarType.BRONZE, SmithingType.TYPE_SQUARE_SHIELD, 1173, 8),
+ BRONZE_SQUARE_SHIELD(BarType.BRONZE, SmithingType.TYPE_SQUARE_SHIELD, 1173, 1),
/**
* Bronze Warhammer
*/
- BRONZE_WAR_HAMMER(BarType.BRONZE, SmithingType.TYPE_WARHAMMER, 1337, 9),
+ BRONZE_WAR_HAMMER(BarType.BRONZE, SmithingType.TYPE_WARHAMMER, 1337, 1),
/**
* Bronze BattleAxe
*/
- BRONZE_BATTLEAXE(BarType.BRONZE, SmithingType.TYPE_BATTLE_AXE, 1375, 10),
+ BRONZE_BATTLEAXE(BarType.BRONZE, SmithingType.TYPE_BATTLE_AXE, 1375, 1),
/**
* Bronze ChainBody
*/
- BRONZE_CHAINBODY(BarType.BRONZE, SmithingType.TYPE_CHAINBODY, 1103, 11),
+ BRONZE_CHAINBODY(BarType.BRONZE, SmithingType.TYPE_CHAINBODY, 1103, 1),
/**
* Bronze KitShield
*/
- BRONZE_KITESHIELD(BarType.BRONZE, SmithingType.TYPE_KITE_SHIELD, 1189, 12),
+ BRONZE_KITESHIELD(BarType.BRONZE, SmithingType.TYPE_KITE_SHIELD, 1189, 1),
/**
* Bronze Claws
*/
- BRONZE_CLAWS(BarType.BRONZE, SmithingType.TYPE_CLAWS, 3095, 13),
+ BRONZE_CLAWS(BarType.BRONZE, SmithingType.TYPE_CLAWS, 3095, 1),
/**
* Bronze 2h
*/
- BRONZE_TWO_HANDED(BarType.BRONZE, SmithingType.TYPE_TWO_HAND_SWORD, 1307, 14),
+ BRONZE_TWO_HANDED(BarType.BRONZE, SmithingType.TYPE_TWO_HAND_SWORD, 1307, 1),
/**
* Bronze PlateSkirt
*/
- BRONZE_PLATE_SKIRT(BarType.BRONZE, SmithingType.TYPE_PLATE_SKIRT, 1087, 16),
+ BRONZE_PLATE_SKIRT(BarType.BRONZE, SmithingType.TYPE_PLATE_SKIRT, 1087, 1),
/**
* Bronze PlateLegs
*/
- BRONZE_PLATELEGS(BarType.BRONZE, SmithingType.TYPE_PLATELEG, 1075, 16),
+ BRONZE_PLATELEGS(BarType.BRONZE, SmithingType.TYPE_PLATELEG, 1075, 1),
/**
* Bronze PlateBody
*/
- BRONZE_PLATEBODY(BarType.BRONZE, SmithingType.TYPE_PLATEBODY, 1117, 18),
+ BRONZE_PLATEBODY(BarType.BRONZE, SmithingType.TYPE_PLATEBODY, 1117, 1),
/**
* Bronze Pickaxe
*/
- BRONZE_PICKAXE(BarType.BRONZE, SmithingType.TYPE_PICKAXE, 1265, 5),
+ BRONZE_PICKAXE(BarType.BRONZE, SmithingType.TYPE_PICKAXE, 1265, 1),
/**
* Iron Dagger
@@ -151,131 +151,131 @@ public enum Bars {
/**
* Iron Hatchet
*/
- IRON_AXE(BarType.IRON, SmithingType.TYPE_AXE, 1349, 16),
+ IRON_AXE(BarType.IRON, SmithingType.TYPE_AXE, 1349, 15),
/**
* Iron Mace
*/
- IRON_MACE(BarType.IRON, SmithingType.TYPE_MACE, 1420, 17),
+ IRON_MACE(BarType.IRON, SmithingType.TYPE_MACE, 1420, 15),
/**
* Iron Med Helm
*/
- IRON_MED_HELM(BarType.IRON, SmithingType.TYPE_MEDIUM_HELM, 1137, 18),
+ IRON_MED_HELM(BarType.IRON, SmithingType.TYPE_MEDIUM_HELM, 1137, 15),
/**
* Iron Bolt
*/
- IRON_BOLT(BarType.IRON, SmithingType.TYPE_CROSSBOW_BOLT, 9377, 18),
+ IRON_BOLT(BarType.IRON, SmithingType.TYPE_CROSSBOW_BOLT, 9377, 15),
/**
* Iron Sword
*/
- IRON_SWORD(BarType.IRON, SmithingType.TYPE_SWORD, 1279, 19),
+ IRON_SWORD(BarType.IRON, SmithingType.TYPE_SWORD, 1279, 15),
/**
* Iron Dart Tips
*/
- IRON_DART_TIPS(BarType.IRON, SmithingType.TYPE_DART_TIP, 820, 19),
+ IRON_DART_TIPS(BarType.IRON, SmithingType.TYPE_DART_TIP, 820, 15),
/**
* Iron Nails
*/
- IRON_NAILS(BarType.IRON, SmithingType.TYPE_NAIL, 4820, 19),
+ IRON_NAILS(BarType.IRON, SmithingType.TYPE_NAIL, 4820, 15),
/**
* Iron Split
*/
- IRON_SPIT(BarType.IRON, SmithingType.TYPE_SPIT_IRON, 7225, 16),
+ IRON_SPIT(BarType.IRON, SmithingType.TYPE_SPIT_IRON, 7225, 15),
/**
* Iron Arrow Tips
*/
- IRON_ARROW_TIPS(BarType.IRON, SmithingType.TYPE_ARROW_TIP, 40, 20),
+ IRON_ARROW_TIPS(BarType.IRON, SmithingType.TYPE_ARROW_TIP, 40, 15),
/**
* Iron Scimitar
*/
- IRON_SCIMITAR(BarType.IRON, SmithingType.TYPE_SCIMITAR, 1323, 20),
+ IRON_SCIMITAR(BarType.IRON, SmithingType.TYPE_SCIMITAR, 1323, 15),
/**
* Iron Crossbow Limbs
*/
- IRON_CROSSBOW_LimbS(BarType.IRON, SmithingType.TYPE_CROSSBOW_LIMB, 9423, 23),
+ IRON_CROSSBOW_LimbS(BarType.IRON, SmithingType.TYPE_CROSSBOW_LIMB, 9423, 15),
/**
* Iron LongSword
*/
- IRON_LONGSWORD(BarType.IRON, SmithingType.TYPE_LONGSWORD, 1293, 21),
+ IRON_LONGSWORD(BarType.IRON, SmithingType.TYPE_LONGSWORD, 1293, 15),
/**
* Iron Knife
*/
- IRON_KNIFE(BarType.IRON, SmithingType.TYPE_THROWING_KNIFE, 863, 22),
+ IRON_KNIFE(BarType.IRON, SmithingType.TYPE_THROWING_KNIFE, 863, 15),
/**
* Iron Full Helm
*/
- IRON_FULL_HELM(BarType.IRON, SmithingType.TYPE_FULL_HELM, 1153, 22),
+ IRON_FULL_HELM(BarType.IRON, SmithingType.TYPE_FULL_HELM, 1153, 15),
/**
* Iron Square Shield
*/
- IRON_SQUARE_SHIELD(BarType.IRON, SmithingType.TYPE_SQUARE_SHIELD, 1175, 23),
+ IRON_SQUARE_SHIELD(BarType.IRON, SmithingType.TYPE_SQUARE_SHIELD, 1175, 15),
/**
* Oil Lantern Frame
*/
- OIL_LANTERN_FRAME(BarType.IRON, SmithingType.TYPE_OIL_LANTERN, 4540, 26),
+ OIL_LANTERN_FRAME(BarType.IRON, SmithingType.TYPE_OIL_LANTERN, 4540, 15),
/**
* Iron WarHammer
*/
- IRON_WARHAMMER(BarType.IRON, SmithingType.TYPE_WARHAMMER, 1335, 24),
+ IRON_WARHAMMER(BarType.IRON, SmithingType.TYPE_WARHAMMER, 1335, 15),
/**
* Iron Battleaxe
*/
- IRON_BATTLEAXE(BarType.IRON, SmithingType.TYPE_BATTLE_AXE, 1363, 25),
+ IRON_BATTLEAXE(BarType.IRON, SmithingType.TYPE_BATTLE_AXE, 1363, 15),
/**
* Iron ChainBody
*/
- IRON_CHAINBODY(BarType.IRON, SmithingType.TYPE_CHAINBODY, 1101, 26),
+ IRON_CHAINBODY(BarType.IRON, SmithingType.TYPE_CHAINBODY, 1101, 15),
/**
* Iron Kite Shield
*/
- IRON_KITE_SHIELD(BarType.IRON, SmithingType.TYPE_KITE_SHIELD, 1191, 27),
+ IRON_KITE_SHIELD(BarType.IRON, SmithingType.TYPE_KITE_SHIELD, 1191, 15),
/**
* Iron Claws
*/
- IRON_CLAWS(BarType.IRON, SmithingType.TYPE_CLAWS, 3096, 28),
+ IRON_CLAWS(BarType.IRON, SmithingType.TYPE_CLAWS, 3096, 15),
/**
* Iron 2H
*/
- IRON_TWO_HANDED_SWORD(BarType.IRON, SmithingType.TYPE_TWO_HAND_SWORD, 1309, 29),
+ IRON_TWO_HANDED_SWORD(BarType.IRON, SmithingType.TYPE_TWO_HAND_SWORD, 1309, 15),
/**
* Iron PlateSkirt
*/
- IRON_PLATESKIRT(BarType.IRON, SmithingType.TYPE_PLATE_SKIRT, 1081, 31),
+ IRON_PLATESKIRT(BarType.IRON, SmithingType.TYPE_PLATE_SKIRT, 1081, 15),
/**
* Iron PlateLegs
*/
- IRON_PLATELEGS(BarType.IRON, SmithingType.TYPE_PLATELEG, 1067, 31),
+ IRON_PLATELEGS(BarType.IRON, SmithingType.TYPE_PLATELEG, 1067, 15),
/**
* Iron PlateBody
*/
- IRON_PLATEBODY(BarType.IRON, SmithingType.TYPE_PLATEBODY, 1115, 33),
+ IRON_PLATEBODY(BarType.IRON, SmithingType.TYPE_PLATEBODY, 1115, 15),
/**
* Iron PickAxe
*/
- IRON_PICKAXE(BarType.IRON, SmithingType.TYPE_PICKAXE, 1267, 20),
+ IRON_PICKAXE(BarType.IRON, SmithingType.TYPE_PICKAXE, 1267, 15),
/**
* Steel Dagger
@@ -285,132 +285,132 @@ public enum Bars {
/**
* Steel Axe
*/
- STEEL_AXE(BarType.STEEL, SmithingType.TYPE_AXE, 1353, 31),
+ STEEL_AXE(BarType.STEEL, SmithingType.TYPE_AXE, 1353, 30),
/**
* Steel Mace
*/
- STEEL_MACE(BarType.STEEL, SmithingType.TYPE_MACE, 1424, 32),
+ STEEL_MACE(BarType.STEEL, SmithingType.TYPE_MACE, 1424, 30),
/**
* Steel Medium Helm
*/
- STEEL_MED_HELM(BarType.STEEL, SmithingType.TYPE_MEDIUM_HELM, 1141, 33),
+ STEEL_MED_HELM(BarType.STEEL, SmithingType.TYPE_MEDIUM_HELM, 1141, 30),
/**
* Steel CrossBow bolts
*/
- STEEL_CROSSBOW_BOLT(BarType.STEEL, SmithingType.TYPE_CROSSBOW_BOLT, 9378, 33),
+ STEEL_CROSSBOW_BOLT(BarType.STEEL, SmithingType.TYPE_CROSSBOW_BOLT, 9378, 30),
/**
* Steel Sword
*/
- STEEL_SWORD(BarType.STEEL, SmithingType.TYPE_SWORD, 1281, 34),
+ STEEL_SWORD(BarType.STEEL, SmithingType.TYPE_SWORD, 1281, 30),
/**
* Steel Dart Tips
*/
- STEEL_DART_TIPS(BarType.STEEL, SmithingType.TYPE_DART_TIP, 821, 34),
+ STEEL_DART_TIPS(BarType.STEEL, SmithingType.TYPE_DART_TIP, 821, 30),
/**
* Steel Nails
*/
- STEEL_NAILS(BarType.STEEL, SmithingType.TYPE_NAIL, 1539, 34),
+ STEEL_NAILS(BarType.STEEL, SmithingType.TYPE_NAIL, 1539, 30),
/**
* Steel ArrowTips
*/
- STEEL_ARROW_TIPS(BarType.STEEL, SmithingType.TYPE_ARROW_TIP, 41, 35),
+ STEEL_ARROW_TIPS(BarType.STEEL, SmithingType.TYPE_ARROW_TIP, 41, 30),
/**
* Steel Scimitar
*/
- STEEL_SCIMITAR(BarType.STEEL, SmithingType.TYPE_SCIMITAR, 1325, 35),
+ STEEL_SCIMITAR(BarType.STEEL, SmithingType.TYPE_SCIMITAR, 1325, 30),
/**
* Steel Crossbow Limbs
*/
- STEEL_CROSSBOW_LIMBS(BarType.STEEL, SmithingType.TYPE_CROSSBOW_LIMB, 9425, 36),
+ STEEL_CROSSBOW_LIMBS(BarType.STEEL, SmithingType.TYPE_CROSSBOW_LIMB, 9425, 30),
/**
* Steel LongSword
*/
- STEEL_LONGSWORD(BarType.STEEL, SmithingType.TYPE_LONGSWORD, 1295, 36),
+ STEEL_LONGSWORD(BarType.STEEL, SmithingType.TYPE_LONGSWORD, 1295, 30),
/**
* Steel Knife
*/
- STEEL_THROWING_KNIFE(BarType.STEEL, SmithingType.TYPE_THROWING_KNIFE, 865, 37),
+ STEEL_THROWING_KNIFE(BarType.STEEL, SmithingType.TYPE_THROWING_KNIFE, 865, 30),
/**
* Steel Full Helm
*/
- STEEL_FULL_HELM(BarType.STEEL, SmithingType.TYPE_FULL_HELM, 1157, 37),
+ STEEL_FULL_HELM(BarType.STEEL, SmithingType.TYPE_FULL_HELM, 1157, 30),
/**
* Steel Studs
*/
- STEEL_STUDS(BarType.STEEL, SmithingType.TYPE_STUDS, 2370, 36),
+ STEEL_STUDS(BarType.STEEL, SmithingType.TYPE_STUDS, 2370, 30),
/**
* Steel Square Shield
*/
- STEEL_SQUARE_SHIELD(BarType.STEEL, SmithingType.TYPE_SQUARE_SHIELD, 1177, 38),
+ STEEL_SQUARE_SHIELD(BarType.STEEL, SmithingType.TYPE_SQUARE_SHIELD, 1177, 30),
/**
* Steel Lantern
*/
- STEEL_BULLSEYE(BarType.STEEL, SmithingType.TYPE_BULLSEYE, 4544, 49),
+ STEEL_BULLSEYE(BarType.STEEL, SmithingType.TYPE_BULLSEYE, 4544, 30),
/**
* Steel WarHammer
*/
- STEEL_WARHAMMER(BarType.STEEL, SmithingType.TYPE_WARHAMMER, 1339, 39),
+ STEEL_WARHAMMER(BarType.STEEL, SmithingType.TYPE_WARHAMMER, 1339, 30),
/**
* Steel battle axe
*/
- STEEL_BATTLE_AXE(BarType.STEEL, SmithingType.TYPE_BATTLE_AXE, 1365, 40),
+ STEEL_BATTLE_AXE(BarType.STEEL, SmithingType.TYPE_BATTLE_AXE, 1365, 30),
/**
* Steel ChainBody
*/
- STEEL_CHAINBODY(BarType.STEEL, SmithingType.TYPE_CHAINBODY, 1105, 41),
+ STEEL_CHAINBODY(BarType.STEEL, SmithingType.TYPE_CHAINBODY, 1105, 30),
/**
* Steel Kite Shield
*/
- STEEL_KITE_SHIELD(BarType.STEEL, SmithingType.TYPE_KITE_SHIELD, 1193, 42),
+ STEEL_KITE_SHIELD(BarType.STEEL, SmithingType.TYPE_KITE_SHIELD, 1193, 30),
/**
* Steel Claws
*/
- STEEL_CLAWS(BarType.STEEL, SmithingType.TYPE_CLAWS, 3097, 43),
+ STEEL_CLAWS(BarType.STEEL, SmithingType.TYPE_CLAWS, 3097, 30),
/**
* Steel 2h
*/
- STEEL_TWO_HANDED_SWORD(BarType.STEEL, SmithingType.TYPE_TWO_HAND_SWORD, 1311, 44),
+ STEEL_TWO_HANDED_SWORD(BarType.STEEL, SmithingType.TYPE_TWO_HAND_SWORD, 1311, 30),
/**
* Steel plate skirt
*/
- STEEL_PLATE_SKIRT(BarType.STEEL, SmithingType.TYPE_PLATE_SKIRT, 1083, 46),
+ STEEL_PLATE_SKIRT(BarType.STEEL, SmithingType.TYPE_PLATE_SKIRT, 1083, 30),
/**
* Steel platelegs
*/
- STEEL_PLATELEGS(BarType.STEEL, SmithingType.TYPE_PLATELEG, 1069, 46),
+ STEEL_PLATELEGS(BarType.STEEL, SmithingType.TYPE_PLATELEG, 1069, 30),
/**
* Steel platebody
*/
- STEEL_PLATEBODY(BarType.STEEL, SmithingType.TYPE_PLATEBODY, 1119, 48),
+ STEEL_PLATEBODY(BarType.STEEL, SmithingType.TYPE_PLATEBODY, 1119, 30),
/**
* Steel pickaxe
*/
- STEEL_PICKAXE(BarType.STEEL, SmithingType.TYPE_PICKAXE, 1269, 35),
+ STEEL_PICKAXE(BarType.STEEL, SmithingType.TYPE_PICKAXE, 1269, 30),
/**
* Mithril Dagger
@@ -420,377 +420,377 @@ public enum Bars {
/**
* Mithril Hatchet
*/
- MITHRIL_HATCHET(BarType.MITHRIL, SmithingType.TYPE_AXE, 1355, 51),
+ MITHRIL_HATCHET(BarType.MITHRIL, SmithingType.TYPE_AXE, 1355, 50),
/**
* Mithril Mace
*/
- MITHRIL_MACE(BarType.MITHRIL, SmithingType.TYPE_MACE, 1428, 52),
+ MITHRIL_MACE(BarType.MITHRIL, SmithingType.TYPE_MACE, 1428, 50),
/**
* Mithril Med Helm
*/
- MITHRIL_MED_HELM(BarType.MITHRIL, SmithingType.TYPE_MEDIUM_HELM, 1143, 53),
+ MITHRIL_MED_HELM(BarType.MITHRIL, SmithingType.TYPE_MEDIUM_HELM, 1143, 50),
/**
* Mithril Crossbow Bolt
*/
- MITHRIL_CROSSBOW_BOLT(BarType.MITHRIL, SmithingType.TYPE_CROSSBOW_BOLT, 9379, 53),
+ MITHRIL_CROSSBOW_BOLT(BarType.MITHRIL, SmithingType.TYPE_CROSSBOW_BOLT, 9379, 50),
/**
* Mithril Sword
*/
- MITHRIL_SWORD(BarType.MITHRIL, SmithingType.TYPE_SWORD, 1285, 54),
+ MITHRIL_SWORD(BarType.MITHRIL, SmithingType.TYPE_SWORD, 1285, 50),
/**
* Mithril Dart Tips
*/
- MITHRIL_DART_TIPS(BarType.MITHRIL, SmithingType.TYPE_DART_TIP, 822, 54),
+ MITHRIL_DART_TIPS(BarType.MITHRIL, SmithingType.TYPE_DART_TIP, 822, 50),
/**
* Mithril Nails
*/
- MITHRIL_NAILS(BarType.MITHRIL, SmithingType.TYPE_NAIL, 4822, 54),
+ MITHRIL_NAILS(BarType.MITHRIL, SmithingType.TYPE_NAIL, 4822, 50),
/**
* Mithril Arrow Tips
*/
- MITHRIL_ARROW_TIPS(BarType.MITHRIL, SmithingType.TYPE_ARROW_TIP, 42, 55),
+ MITHRIL_ARROW_TIPS(BarType.MITHRIL, SmithingType.TYPE_ARROW_TIP, 42, 50),
/**
* Mithril Scimitar
*/
- MITHRIL_SCIMITAR(BarType.MITHRIL, SmithingType.TYPE_SCIMITAR, 1329, 55),
+ MITHRIL_SCIMITAR(BarType.MITHRIL, SmithingType.TYPE_SCIMITAR, 1329, 50),
/**
* Mithril Crossbow Limbs
*/
- MITHRIL_CROSSBOW_LIMBS(BarType.MITHRIL, SmithingType.TYPE_CROSSBOW_LIMB, 9427, 56),
+ MITHRIL_CROSSBOW_LIMBS(BarType.MITHRIL, SmithingType.TYPE_CROSSBOW_LIMB, 9427, 50),
/**
* Mithril LongSword
*/
- MITHRIL_LONGSWORD(BarType.MITHRIL, SmithingType.TYPE_LONGSWORD, 1299, 56),
+ MITHRIL_LONGSWORD(BarType.MITHRIL, SmithingType.TYPE_LONGSWORD, 1299, 50),
/**
* Mithril Knife
*/
- MITHRIL_KNIFE(BarType.MITHRIL, SmithingType.TYPE_THROWING_KNIFE, 866, 57),
+ MITHRIL_KNIFE(BarType.MITHRIL, SmithingType.TYPE_THROWING_KNIFE, 866, 50),
/**
* Mithril Full Helm
*/
- MITHRIL_FULL_HELM(BarType.MITHRIL, SmithingType.TYPE_FULL_HELM, 1159, 57),
+ MITHRIL_FULL_HELM(BarType.MITHRIL, SmithingType.TYPE_FULL_HELM, 1159, 50),
/**
* Mithril SquareShield
*/
- MITHRIL_SQUARE_SHIELD(BarType.MITHRIL, SmithingType.TYPE_SQUARE_SHIELD, 1181, 58),
+ MITHRIL_SQUARE_SHIELD(BarType.MITHRIL, SmithingType.TYPE_SQUARE_SHIELD, 1181, 50),
/**
* Mithril Grapple Tips
*/
- MITHRIL_GRAPPLE_TIPS(BarType.MITHRIL, SmithingType.TYPE_GRAPPLE_TIP, 9416, 59),
+ MITHRIL_GRAPPLE_TIPS(BarType.MITHRIL, SmithingType.TYPE_GRAPPLE_TIP, 9416, 50),
/**
* Mithril Warhammer
*/
- MITHRIL_WARHAMMER(BarType.MITHRIL, SmithingType.TYPE_WARHAMMER, 1343, 59),
+ MITHRIL_WARHAMMER(BarType.MITHRIL, SmithingType.TYPE_WARHAMMER, 1343, 50),
/**
* Mithril BattleAxe
*/
- MITHRIL_BATTLEAXE(BarType.MITHRIL, SmithingType.TYPE_BATTLE_AXE, 1369, 60),
+ MITHRIL_BATTLEAXE(BarType.MITHRIL, SmithingType.TYPE_BATTLE_AXE, 1369, 50),
/**
* Mithril ChainBody
*/
- MITHRIL_CHAINBODY(BarType.MITHRIL, SmithingType.TYPE_CHAINBODY, 1109, 61),
+ MITHRIL_CHAINBODY(BarType.MITHRIL, SmithingType.TYPE_CHAINBODY, 1109, 50),
/**
* Mithril KiteShield
*/
- MITHRIL_KITE_SHIELD(BarType.MITHRIL, SmithingType.TYPE_KITE_SHIELD, 1197, 62),
+ MITHRIL_KITE_SHIELD(BarType.MITHRIL, SmithingType.TYPE_KITE_SHIELD, 1197, 50),
/**
* Mithril Claws
*/
- MITHRIL_CLAWS(BarType.MITHRIL, SmithingType.TYPE_CLAWS, 3099, 63),
+ MITHRIL_CLAWS(BarType.MITHRIL, SmithingType.TYPE_CLAWS, 3099, 50),
/**
* Mithril 2H
*/
- MITHRIL_TWO_HANDED_SWORD(BarType.MITHRIL, SmithingType.TYPE_TWO_HAND_SWORD, 1315, 64),
+ MITHRIL_TWO_HANDED_SWORD(BarType.MITHRIL, SmithingType.TYPE_TWO_HAND_SWORD, 1315, 50),
/**
* Mithril PlateSkirt
*/
- MITHRIL_PLATESKIRT(BarType.MITHRIL, SmithingType.TYPE_PLATE_SKIRT, 1085, 66),
+ MITHRIL_PLATESKIRT(BarType.MITHRIL, SmithingType.TYPE_PLATE_SKIRT, 1085, 50),
/**
* Mithril PlateLegs
*/
- MITHRIL_PLATELEGS(BarType.MITHRIL, SmithingType.TYPE_PLATELEG, 1071, 66),
+ MITHRIL_PLATELEGS(BarType.MITHRIL, SmithingType.TYPE_PLATELEG, 1071, 50),
/**
* Mithril PlateBody
*/
- MITHRIL_PLATEBODY(BarType.MITHRIL, SmithingType.TYPE_PLATEBODY, 1121, 68),
+ MITHRIL_PLATEBODY(BarType.MITHRIL, SmithingType.TYPE_PLATEBODY, 1121, 50),
/**
* Mithril PickAxe
*/
- MITHRIL_PICKAXE(BarType.MITHRIL, SmithingType.TYPE_PICKAXE, 1273, 55),
+ MITHRIL_PICKAXE(BarType.MITHRIL, SmithingType.TYPE_PICKAXE, 1273, 50),
/**
* Adamant Dagger
*/
- ADAMANT_DAGGER(BarType.ADAMANT, SmithingType.TYPE_DAGGER, 1211, 70),
+ ADAMANT_DAGGER(BarType.ADAMANT, SmithingType.TYPE_DAGGER, 1211, 60),
/**
* Adamant Hatchet
*/
- ADAMANT_AXE(BarType.ADAMANT, SmithingType.TYPE_AXE, 1357, 71),
+ ADAMANT_AXE(BarType.ADAMANT, SmithingType.TYPE_AXE, 1357, 60),
/**
* Adamant Mace
*/
- ADAMANT_MACE(BarType.ADAMANT, SmithingType.TYPE_MACE, 1430, 72),
+ ADAMANT_MACE(BarType.ADAMANT, SmithingType.TYPE_MACE, 1430, 60),
/**
* Adamant Med Helm
*/
- ADAMANT_MEDIUM_HELM(BarType.ADAMANT, SmithingType.TYPE_MEDIUM_HELM, 1145, 73),
+ ADAMANT_MEDIUM_HELM(BarType.ADAMANT, SmithingType.TYPE_MEDIUM_HELM, 1145, 60),
/**
* Adamant Crossbow Bolt
*/
- ADAMANT_BOLT(BarType.ADAMANT, SmithingType.TYPE_CROSSBOW_BOLT, 9380, 73),
+ ADAMANT_BOLT(BarType.ADAMANT, SmithingType.TYPE_CROSSBOW_BOLT, 9380, 60),
/**
* Adamant Sword
*/
- ADAMANT_SWORD(BarType.ADAMANT, SmithingType.TYPE_SWORD, 1287, 74),
+ ADAMANT_SWORD(BarType.ADAMANT, SmithingType.TYPE_SWORD, 1287, 60),
/**
* Adamant Dart Tips
*/
- ADAMANT_DART_TIPS(BarType.ADAMANT, SmithingType.TYPE_DART_TIP, 823, 74),
+ ADAMANT_DART_TIPS(BarType.ADAMANT, SmithingType.TYPE_DART_TIP, 823, 60),
/**
* Adamant Nails
*/
- ADAMANT_NAILS(BarType.ADAMANT, SmithingType.TYPE_NAIL, 4823, 74),
+ ADAMANT_NAILS(BarType.ADAMANT, SmithingType.TYPE_NAIL, 4823, 60),
/**
* Adamant Arrow Tips
*/
- ADAMANT_ARROW_TIPS(BarType.ADAMANT, SmithingType.TYPE_ARROW_TIP, 43, 75),
+ ADAMANT_ARROW_TIPS(BarType.ADAMANT, SmithingType.TYPE_ARROW_TIP, 43, 60),
/**
* Adamant Scmitar
*/
- ADAMANT_SCIMITAR(BarType.ADAMANT, SmithingType.TYPE_SCIMITAR, 1331, 75),
+ ADAMANT_SCIMITAR(BarType.ADAMANT, SmithingType.TYPE_SCIMITAR, 1331, 60),
/**
* Adamant Crossbow Limbs
*/
- ADAMANT_LIMBS(BarType.ADAMANT, SmithingType.TYPE_CROSSBOW_LIMB, 9429, 76),
+ ADAMANT_LIMBS(BarType.ADAMANT, SmithingType.TYPE_CROSSBOW_LIMB, 9429, 60),
/**
* Adamant LongSword
*/
- ADAMANT_LONGSWORD(BarType.ADAMANT, SmithingType.TYPE_LONGSWORD, 1301, 76),
+ ADAMANT_LONGSWORD(BarType.ADAMANT, SmithingType.TYPE_LONGSWORD, 1301, 60),
/**
* Adamant Knife
*/
- ADAMANT_KNIFE(BarType.ADAMANT, SmithingType.TYPE_THROWING_KNIFE, 867, 77),
+ ADAMANT_KNIFE(BarType.ADAMANT, SmithingType.TYPE_THROWING_KNIFE, 867, 60),
/**
* Adamant Full Helm
*/
- ADAMANT_FULL_HELM(BarType.ADAMANT, SmithingType.TYPE_FULL_HELM, 1161, 77),
+ ADAMANT_FULL_HELM(BarType.ADAMANT, SmithingType.TYPE_FULL_HELM, 1161, 60),
/**
* Adamant Square Shield
*/
- ADAMANT_SQUARE_SHIELD(BarType.ADAMANT, SmithingType.TYPE_SQUARE_SHIELD, 1183, 78),
+ ADAMANT_SQUARE_SHIELD(BarType.ADAMANT, SmithingType.TYPE_SQUARE_SHIELD, 1183, 60),
/**
* Adamant Warhammer
*/
- ADAMANT_WARHAMMER(BarType.ADAMANT, SmithingType.TYPE_WARHAMMER, 1345, 79),
+ ADAMANT_WARHAMMER(BarType.ADAMANT, SmithingType.TYPE_WARHAMMER, 1345, 60),
/**
* Adamant BattleAxe
*/
- ADAMANT_BATTLEAXE(BarType.ADAMANT, SmithingType.TYPE_BATTLE_AXE, 1371, 80),
+ ADAMANT_BATTLEAXE(BarType.ADAMANT, SmithingType.TYPE_BATTLE_AXE, 1371, 60),
/**
* Adamant ChainBody
*/
- ADAMANT_CHAINBODY(BarType.ADAMANT, SmithingType.TYPE_CHAINBODY, 1111, 81),
+ ADAMANT_CHAINBODY(BarType.ADAMANT, SmithingType.TYPE_CHAINBODY, 1111, 60),
/**
* Adamant KiteShield
*/
- ADAMANT_KITESHIELD(BarType.ADAMANT, SmithingType.TYPE_KITE_SHIELD, 1199, 82),
+ ADAMANT_KITESHIELD(BarType.ADAMANT, SmithingType.TYPE_KITE_SHIELD, 1199, 60),
/**
* Adamant Claws
*/
- ADAMANT_CLAWS(BarType.ADAMANT, SmithingType.TYPE_CLAWS, 3100, 83),
+ ADAMANT_CLAWS(BarType.ADAMANT, SmithingType.TYPE_CLAWS, 3100, 60),
/**
* Adamant 2H
*/
- ADAMANT_TWO_HANDED_SWORD(BarType.ADAMANT, SmithingType.TYPE_TWO_HAND_SWORD, 1317, 84),
+ ADAMANT_TWO_HANDED_SWORD(BarType.ADAMANT, SmithingType.TYPE_TWO_HAND_SWORD, 1317, 60),
/**
* Adamant PlateSkirt
*/
- ADAMANT_PLATE_SKIRT(BarType.ADAMANT, SmithingType.TYPE_PLATE_SKIRT, 1091, 86),
+ ADAMANT_PLATE_SKIRT(BarType.ADAMANT, SmithingType.TYPE_PLATE_SKIRT, 1091, 60),
/**
* Adamant PlateLegs
*/
- ADAMANT_PLATE_LEGS(BarType.ADAMANT, SmithingType.TYPE_PLATELEG, 1073, 86),
+ ADAMANT_PLATE_LEGS(BarType.ADAMANT, SmithingType.TYPE_PLATELEG, 1073, 60),
/**
* Adamant PlateBody
*/
- ADAMANT_PLATE_BODY(BarType.ADAMANT, SmithingType.TYPE_PLATEBODY, 1123, 88),
+ ADAMANT_PLATE_BODY(BarType.ADAMANT, SmithingType.TYPE_PLATEBODY, 1123, 60),
/**
* Adamant PickAxe
*/
- ADAMANT_PICKAXE(BarType.ADAMANT, SmithingType.TYPE_PICKAXE, 1271, 75),
+ ADAMANT_PICKAXE(BarType.ADAMANT, SmithingType.TYPE_PICKAXE, 1271, 60),
/**
* Rune Dagger
*/
- RUNE_DAGGER(BarType.RUNITE, SmithingType.TYPE_DAGGER, 1213, 85),
+ RUNE_DAGGER(BarType.RUNITE, SmithingType.TYPE_DAGGER, 1213, 70),
/**
* Rune Hatchet
*/
- RUNITE_AXE(BarType.RUNITE, SmithingType.TYPE_AXE, 1359, 86),
+ RUNITE_AXE(BarType.RUNITE, SmithingType.TYPE_AXE, 1359, 70),
/**
* Rune Mace
*/
- RUNITE_MACE(BarType.RUNITE, SmithingType.TYPE_MACE, 1432, 87),
+ RUNITE_MACE(BarType.RUNITE, SmithingType.TYPE_MACE, 1432, 70),
/**
* Rune Med Helm
*/
- RUNITE_MEDIUM_HELM(BarType.RUNITE, SmithingType.TYPE_MEDIUM_HELM, 1147, 88),
+ RUNITE_MEDIUM_HELM(BarType.RUNITE, SmithingType.TYPE_MEDIUM_HELM, 1147, 70),
/**
* Rune Crossbow Bolt
*/
- RUNITE_BOLT(BarType.RUNITE, SmithingType.TYPE_CROSSBOW_BOLT, 9381, 88),
+ RUNITE_BOLT(BarType.RUNITE, SmithingType.TYPE_CROSSBOW_BOLT, 9381, 70),
/**
* Rune Sword
*/
- RUNITE_SWORD(BarType.RUNITE, SmithingType.TYPE_SWORD, 1289, 89),
+ RUNITE_SWORD(BarType.RUNITE, SmithingType.TYPE_SWORD, 1289, 70),
/**
* Rune Dart Tips
*/
- RUNITE_DART_TIPS(BarType.RUNITE, SmithingType.TYPE_DART_TIP, 824, 89),
+ RUNITE_DART_TIPS(BarType.RUNITE, SmithingType.TYPE_DART_TIP, 824, 70),
/**
* Rune Nails
*/
- RUNITE_NAILS(BarType.RUNITE, SmithingType.TYPE_NAIL, 4824, 89),
+ RUNITE_NAILS(BarType.RUNITE, SmithingType.TYPE_NAIL, 4824, 70),
/**
* Rune Arrow Tips
*/
- RUNITE_ARROW_TIPS(BarType.RUNITE, SmithingType.TYPE_ARROW_TIP, 44, 90),
+ RUNITE_ARROW_TIPS(BarType.RUNITE, SmithingType.TYPE_ARROW_TIP, 44, 70),
/**
* Rune Scmitar
*/
- RUNITE_SCIMITAR(BarType.RUNITE, SmithingType.TYPE_SCIMITAR, 1333, 90),
+ RUNITE_SCIMITAR(BarType.RUNITE, SmithingType.TYPE_SCIMITAR, 1333, 70),
/**
* Rune Crossbow Limbs
*/
- RUNITE_LIMBS(BarType.RUNITE, SmithingType.TYPE_CROSSBOW_LIMB, 9431, 91),
+ RUNITE_LIMBS(BarType.RUNITE, SmithingType.TYPE_CROSSBOW_LIMB, 9431, 70),
/**
* Rune LongSword
*/
- RUNITE_LONGSWORD(BarType.RUNITE, SmithingType.TYPE_LONGSWORD, 1303, 91),
+ RUNITE_LONGSWORD(BarType.RUNITE, SmithingType.TYPE_LONGSWORD, 1303, 70),
/**
* Rune Knife
*/
- RUNITE_KNIFE(BarType.RUNITE, SmithingType.TYPE_THROWING_KNIFE, 868, 92),
+ RUNITE_KNIFE(BarType.RUNITE, SmithingType.TYPE_THROWING_KNIFE, 868, 70),
/**
* Rune Full Helm
*/
- RUNITE_FULL_HELM(BarType.RUNITE, SmithingType.TYPE_FULL_HELM, 1163, 92),
+ RUNITE_FULL_HELM(BarType.RUNITE, SmithingType.TYPE_FULL_HELM, 1163, 70),
/**
* Rune Square Shield
*/
- RUNITE_SQUARE_SHIELD(BarType.RUNITE, SmithingType.TYPE_SQUARE_SHIELD, 1185, 93),
+ RUNITE_SQUARE_SHIELD(BarType.RUNITE, SmithingType.TYPE_SQUARE_SHIELD, 1185, 70),
/**
* Rune Warhammer
*/
- RUNITE_WARHAMMER(BarType.RUNITE, SmithingType.TYPE_WARHAMMER, 1347, 94),
+ RUNITE_WARHAMMER(BarType.RUNITE, SmithingType.TYPE_WARHAMMER, 1347, 70),
/**
* Rune BattleAxe
*/
- RUNITE_BATTLEAXE(BarType.RUNITE, SmithingType.TYPE_BATTLE_AXE, 1373, 95),
+ RUNITE_BATTLEAXE(BarType.RUNITE, SmithingType.TYPE_BATTLE_AXE, 1373, 70),
/**
* Rune ChainBody
*/
- RUNITE_CHAINBODY(BarType.RUNITE, SmithingType.TYPE_CHAINBODY, 1113, 96),
+ RUNITE_CHAINBODY(BarType.RUNITE, SmithingType.TYPE_CHAINBODY, 1113, 70),
/**
* Rune KiteShield
*/
- RUNITE_KITESHIELD(BarType.RUNITE, SmithingType.TYPE_KITE_SHIELD, 1201, 97),
+ RUNITE_KITESHIELD(BarType.RUNITE, SmithingType.TYPE_KITE_SHIELD, 1201, 70),
/**
* Rune Claws
*/
- RUNITE_CLAWS(BarType.RUNITE, SmithingType.TYPE_CLAWS, 3101, 98),
+ RUNITE_CLAWS(BarType.RUNITE, SmithingType.TYPE_CLAWS, 3101, 70),
/**
* Rune 2H
*/
- RUNITE_TWO_HANDED_SWORD(BarType.RUNITE, SmithingType.TYPE_TWO_HAND_SWORD, 1319, 99),
+ RUNITE_TWO_HANDED_SWORD(BarType.RUNITE, SmithingType.TYPE_TWO_HAND_SWORD, 1319, 70),
/**
* Rune PlateSkirt
*/
- RUNITE_PLATE_SKIRT(BarType.RUNITE, SmithingType.TYPE_PLATE_SKIRT, 1093, 99),
+ RUNITE_PLATE_SKIRT(BarType.RUNITE, SmithingType.TYPE_PLATE_SKIRT, 1093, 70),
/**
* Rune PlateLegs
*/
- RUNITE_PLATE_LEGS(BarType.RUNITE, SmithingType.TYPE_PLATELEG, 1079, 99),
+ RUNITE_PLATE_LEGS(BarType.RUNITE, SmithingType.TYPE_PLATELEG, 1079, 70),
/**
* Rune PlateBody
*/
- RUNITE_PLATE_BODY(BarType.RUNITE, SmithingType.TYPE_PLATEBODY, 1127, 99),
+ RUNITE_PLATE_BODY(BarType.RUNITE, SmithingType.TYPE_PLATEBODY, 1127, 70),
/**
* Rune PickAxe
*/
- RUNITE_PICKAXE(BarType.RUNITE, SmithingType.TYPE_PICKAXE, 1275, 90),
+ RUNITE_PICKAXE(BarType.RUNITE, SmithingType.TYPE_PICKAXE, 1275, 70),
/**
* Blurite CrossBow bolts
@@ -800,7 +800,7 @@ public enum Bars {
/**
* Blurite Crossbow Limbs
*/
- BLURITE_CROSSBOW_LIMBS(BarType.BLURITE, SmithingType.TYPE_CROSSBOW_LIMB, 9422, 13);
+ BLURITE_CROSSBOW_LIMBS(BarType.BLURITE, SmithingType.TYPE_CROSSBOW_LIMB, 9422, 8);
/**
* A map of object ids to primary ingredients.
diff --git a/Server/src/main/content/global/skill/smithing/DragonShieldDialogue.java b/Server/src/main/content/global/skill/smithing/DragonShieldDialogue.java
index 84d4e7edf..64833097c 100644
--- a/Server/src/main/content/global/skill/smithing/DragonShieldDialogue.java
+++ b/Server/src/main/content/global/skill/smithing/DragonShieldDialogue.java
@@ -1,55 +1,23 @@
package content.global.skill.smithing;
+import content.global.skill.skillcapeperks.SkillcapePerks;
+import core.api.Container;
import core.game.dialogue.DialoguePlugin;
import core.game.node.entity.skill.Skills;
import core.game.node.entity.player.Player;
-import core.game.node.item.Item;
import core.plugin.Initializable;
-import core.game.world.update.flag.context.Animation;
+import org.rs09.consts.Items;
+
+import static core.api.ContentAPIKt.*;
/**
* Represents the dialogue plugin used for making a dragon shield.
* @author 'Vexia
- * @version 1.0
+ * @author Player Name
+ * @version 1.1
*/
@Initializable
public final class DragonShieldDialogue extends DialoguePlugin {
-
- /**
- * Represents the item shield parts.
- */
- private static final Item[] SHIELD_PARTS = new Item[] { new Item(2366), new Item(2368) };
-
- /**
- * Represents th edraconic visage item.
- */
- private static final Item DRACONIC_VISAGE = new Item(11286);
-
- /**
- * Represents the anti dragon fire shield.
- */
- private static final Item ANTI_DRAGONSHIELD = new Item(1540);
-
- /**
- * Represents the dragon fire shield item.
- */
- private static final Item DRAGON_FIRESHIELD = new Item(11284);
-
- /**
- * Represents the shield item.
- */
- private static final Item SQ_SHIELD = new Item(1187);
-
- /**
- * Represents the hammering animation.
- */
- private static Animation ANIMATION = new Animation(898);
-
- /**
- * Represents the shield type.
- */
- private int type;
-
/**
* Constructs a new {@code DragonShieldDialogue} {@code Object}.
*/
@@ -74,11 +42,26 @@ public final class DragonShieldDialogue extends DialoguePlugin {
@Override
public boolean open(Object... args) {
- type = (int) args[0];
+ if (!inInventory(player, Items.HAMMER_2347, 1) && !SkillcapePerks.isActive(SkillcapePerks.BAREFISTED_SMITHING, player)) {
+ interpreter.sendDialogue("You need a hammer to work the metal with.");
+ }
+ int type = (int) args[0];
if (type == 1) {
- interpreter.sendDialogue("You set to work trying to fix the ancient shield. It's seen some", "heavy reward and needs some serious work doing to it.");
+ if (!(inInventory(player, Items.SHIELD_RIGHT_HALF_2368, 1) && inInventory(player, Items.SHIELD_LEFT_HALF_2366, 1))) {
+ interpreter.sendDialogue("You need the other half of the shield."); //todo authentic message
+ return false;
+ }
+ interpreter.sendDialogue("You set to work trying to fix the ancient shield. It's seen some", "heavy action and needs some serious work doing to it.");
stage = 0;
} else {
+ if (!inInventory(player, Items.ANTI_DRAGON_SHIELD_1540, 1)) {
+ interpreter.sendDialogue("You need an anti-dragon shield to attach the visage to."); //todo authentic message
+ return false;
+ }
+ if (!inInventory(player, Items.DRACONIC_VISAGE_11286, 1)) {
+ interpreter.sendDialogue("You don't have anything you could attach to the shield."); //todo authentic message
+ return false;
+ }
interpreter.sendDialogue("You set to work, trying to attach the ancient draconic", "visage to your anti-dragonbreath shield. It's not easy to", "work with the ancient artifact and it takes all of your", "skills as a master smith.");
stage = 10;
}
@@ -89,26 +72,26 @@ public final class DragonShieldDialogue extends DialoguePlugin {
public boolean handle(int interfaceId, int buttonId) {
switch (stage) {
case 0:
- player.lock(5);
- player.animate(ANIMATION);
- interpreter.sendDialogue("Even for an experienced armourer it is not an easy task, but", "eventually it is ready. You have restored the dragon square shield to", "its former glory.");
- if (player.getInventory().remove(SHIELD_PARTS)) {
- player.getInventory().add(SQ_SHIELD);
+ lock(player, 5);
+ animate(player, 898, false);
+ if (removeItem(player, Items.SHIELD_RIGHT_HALF_2368, Container.INVENTORY) && removeItem(player, Items.SHIELD_LEFT_HALF_2366, Container.INVENTORY)) {
+ interpreter.sendDialogue("Even for an experienced armourer it is not an easy task, but", "eventually it is ready. You have restored the dragon square shield to", "its former glory.");
+ addItem(player, Items.DRAGON_SQ_SHIELD_1187, 1, Container.INVENTORY);
+ rewardXP(player, Skills.SMITHING, 75);
}
- player.getSkills().addExperience(Skills.SMITHING, 75, true);
stage = 1;
break;
case 1:
end();
break;
case 10:
- player.lock(5);
- player.animate(ANIMATION);
- interpreter.sendDialogue("Even for an experienced armourer it is not an easy task, but", "eventually it is ready. You have crafted the", "draconic visage and anti-dragonbreath shield into a", "dragonfire shield.");
- if (player.getInventory().remove(DRACONIC_VISAGE, ANTI_DRAGONSHIELD)) {
- player.getInventory().add(DRAGON_FIRESHIELD);
+ lock(player, 5);
+ animate(player, 898, false);
+ if (removeItem(player, Items.ANTI_DRAGON_SHIELD_1540, Container.INVENTORY) && removeItem(player, Items.DRACONIC_VISAGE_11286, Container.INVENTORY)) {
+ interpreter.sendDialogue("Even for an experienced armourer it is not an easy task, but", "eventually it is ready. You have crafted the", "draconic visage and anti-dragonbreath shield into a", "dragonfire shield.");
+ addItem(player, Items.DRAGONFIRE_SHIELD_11284, 1, Container.INVENTORY);
+ rewardXP(player, Skills.SMITHING, 2000);
}
- player.getSkills().addExperience(Skills.SMITHING, 2000);
stage = 1;
break;
}
diff --git a/Server/src/main/content/global/skill/smithing/FurnaceOptionPlugin.java b/Server/src/main/content/global/skill/smithing/FurnaceOptionPlugin.java
index 1468549d2..e34e71cc7 100644
--- a/Server/src/main/content/global/skill/smithing/FurnaceOptionPlugin.java
+++ b/Server/src/main/content/global/skill/smithing/FurnaceOptionPlugin.java
@@ -19,6 +19,7 @@ import core.plugin.Plugin;
import java.util.ArrayList;
import java.util.List;
+import content.data.Quests;
/**
* Represents the plugin used for the furnace.
@@ -64,7 +65,7 @@ public final class FurnaceOptionPlugin extends OptionHandler {
private static void show(final Player player) {
player.getInterfaceManager().openChatbox(311);
player.getPacketDispatch().sendItemZoomOnInterface(2349, 150, 311, 4);
- if (player.getQuestRepository().isComplete("The Knight's Sword")) {
+ if (player.getQuestRepository().isComplete(Quests.THE_KNIGHTS_SWORD)) {
player.getPacketDispatch().sendString("Blurite", 311, 20);
}
player.getPacketDispatch().sendItemZoomOnInterface(Bar.BLURITE.getProduct().getId(), 150, 311, 5);
diff --git a/Server/src/main/content/global/skill/smithing/SmithingPulse.java b/Server/src/main/content/global/skill/smithing/SmithingPulse.java
index f9b7eec98..97a844d51 100644
--- a/Server/src/main/content/global/skill/smithing/SmithingPulse.java
+++ b/Server/src/main/content/global/skill/smithing/SmithingPulse.java
@@ -14,6 +14,7 @@ import core.tools.StringUtils;
import static core.api.ContentAPIKt.hasRequirement;
import static core.api.ContentAPIKt.sendDialogue;
+import content.data.Quests;
/**
* Represents the pulse used to smith a bar.
@@ -67,11 +68,11 @@ public class SmithingPulse extends SkillPulse- {
player.getDialogueInterpreter().sendDialogue("You need a hammer to work the metal with.");
return false;
}
- if (!player.getQuestRepository().isComplete("The Tourist Trap") && bar.getSmithingType() == SmithingType.TYPE_DART_TIP) {
+ if (!player.getQuestRepository().isComplete(Quests.THE_TOURIST_TRAP) && bar.getSmithingType() == SmithingType.TYPE_DART_TIP) {
player.getDialogueInterpreter().sendDialogue("You need to complete Tourist Trap to smith dart tips.");
return false;
}
- if (!hasRequirement(player, "Death Plateau", false) && bar.getSmithingType() == SmithingType.TYPE_CLAWS) {
+ if (!hasRequirement(player, Quests.DEATH_PLATEAU, false) && bar.getSmithingType() == SmithingType.TYPE_CLAWS) {
sendDialogue(player, "You need to complete Death Plateau to smith claws.");
return false;
}
diff --git a/Server/src/main/content/global/skill/smithing/SmithingType.java b/Server/src/main/content/global/skill/smithing/SmithingType.java
index fd38a6209..e4a05e640 100644
--- a/Server/src/main/content/global/skill/smithing/SmithingType.java
+++ b/Server/src/main/content/global/skill/smithing/SmithingType.java
@@ -32,7 +32,7 @@ public enum SmithingType {
/**
* Crossbow bolt
*/
- TYPE_CROSSBOW_BOLT(1, 50, 51, new int[] { 56, 55, 54, 53 }, 10),
+ TYPE_CROSSBOW_BOLT(1, 50, 51, new int[] { 56, 55, 54, 53 }, 30),
/**
* Sword
@@ -42,7 +42,7 @@ public enum SmithingType {
/**
* Dart tips
*/
- TYPE_DART_TIP(1, 66, 67, new int[] { 72, 71, 70, 69 }, 10),
+ TYPE_DART_TIP(1, 66, 67, new int[] { 72, 71, 70, 69 }, 30),
/**
* Nails
@@ -66,7 +66,7 @@ public enum SmithingType {
/**
* Arrow Tips
*/
- TYPE_ARROW_TIP(1, 106, 107, new int[] { 112, 111, 110, 109 }, 15),
+ TYPE_ARROW_TIP(1, 106, 107, new int[] { 112, 111, 110, 109 }, 45),
/**
* Scimitar
@@ -86,7 +86,7 @@ public enum SmithingType {
/**
* Throwing Knife
*/
- TYPE_THROWING_KNIFE(1, 138, 139, new int[] { 144, 143, 142, 141 }, 5),
+ TYPE_THROWING_KNIFE(1, 138, 139, new int[] { 144, 143, 142, 141 }, 15),
/**
* Full helm
diff --git a/Server/src/main/content/global/skill/smithing/smelting/Bar.java b/Server/src/main/content/global/skill/smithing/smelting/Bar.java
index 04177c11a..88b4eea74 100644
--- a/Server/src/main/content/global/skill/smithing/smelting/Bar.java
+++ b/Server/src/main/content/global/skill/smithing/smelting/Bar.java
@@ -15,8 +15,8 @@ public enum Bar {
STEEL(30, 17.5, new Item(2353, 1), new Item(453, 2), new Item(440, 1)),
GOLD(40, 22.5, new Item(2357, 1), new Item(444, 1)),
MITHRIL(50, 30, new Item(2359, 1), new Item(447, 1), new Item(453, 4)),
- ADAMANT(70, 37.5, new Item(2361, 1), new Item(449, 1), new Item(453, 6)),
- RUNITE(85, 50, new Item(2363, 1), new Item(451, 1), new Item(453, 8));
+ ADAMANT(60, 37.5, new Item(2361, 1), new Item(449, 1), new Item(453, 6)),
+ RUNITE(70, 50, new Item(2363, 1), new Item(451, 1), new Item(453, 8));
/**
* The ore required.
diff --git a/Server/src/main/content/global/skill/smithing/smelting/SmeltingPulse.java b/Server/src/main/content/global/skill/smithing/smelting/SmeltingPulse.java
index 06c55f1e1..fc5e01696 100644
--- a/Server/src/main/content/global/skill/smithing/smelting/SmeltingPulse.java
+++ b/Server/src/main/content/global/skill/smithing/smelting/SmeltingPulse.java
@@ -1,9 +1,11 @@
package content.global.skill.smithing.smelting;
import static core.api.ContentAPIKt.*;
-import core.api.EquipmentSlot;
+
+import core.api.Container;
import core.game.event.ResourceProducedEvent;
import core.game.container.impl.EquipmentContainer;
+import core.tools.Log;
import org.rs09.consts.Items;
import core.game.world.map.Location;
import core.game.node.entity.skill.SkillPulse;
@@ -16,6 +18,7 @@ import core.game.world.update.flag.context.Graphics;
import core.tools.RandomFunction;
import core.tools.StringUtils;
import org.rs09.consts.Sounds;
+import content.data.Quests;
/**
* Represents the pulse used to smelt.
@@ -87,7 +90,7 @@ public class SmeltingPulse extends SkillPulse
- {
if (bar == null || player == null) {
return false;
}
- if (bar == Bar.BLURITE && !player.getQuestRepository().isComplete("The Knight's Sword")) {
+ if (bar == Bar.BLURITE && !player.getQuestRepository().isComplete(Quests.THE_KNIGHTS_SWORD)) {
return false;
}
if (player.getSkills().getLevel(Skills.SMITHING) < bar.getLevel()) {
@@ -96,9 +99,12 @@ public class SmeltingPulse extends SkillPulse
- {
return false;
}
for (Item item : bar.getOres()) {
+ //Snowscape modification: check gold satchel for coal as well, if carried
if (!player.getInventory().contains(item.getId(), item.getAmount())) {
- player.getPacketDispatch().sendMessage("You do not have the required ores to make this bar.");
- return false;
+ if (!(item.getId() == Items.COAL_453 && inEquipmentOrInventory(player, 10881, 1) && player.goldSatchel.contains(item.getId(), item.getAmount()))) {
+ player.getPacketDispatch().sendMessage("You do not have the required ores to make this bar.");
+ return false;
+ }
}
}
return true;
@@ -125,7 +131,7 @@ public class SmeltingPulse extends SkillPulse
- {
player.getPacketDispatch().sendMessage("You place the required ores and attempt to create a bar of " + StringUtils.formatDisplayName(bar.toString().toLowerCase()) + ".");
}
for (Item i : bar.getOres()) {
- if (!player.getInventory().remove(i)) {
+ if (!(player.getInventory().remove(i) || player.goldSatchel.remove(i))) {
return true;
}
}
@@ -144,7 +150,8 @@ public class SmeltingPulse extends SkillPulse
- {
player.sendMessage("The magic of the Varrock armour enables you to smelt 2 bars at the same time.");
}
}
- player.getInventory().add(new Item(bar.getProduct().getId(), amt));
+ //player.getInventory().add(new Item(bar.getProduct().getId(), amt));
+ addItemOrDrop(player, bar.getProduct().getId(), amt);
player.dispatch(new ResourceProducedEvent(bar.getProduct().getId(), 1, player, -1));
double xp = bar.getExperience() * amt;
// Goldsmith gauntlets
@@ -174,16 +181,6 @@ public class SmeltingPulse extends SkillPulse
- {
return amount < 1;
}
- /**
- * Checks if the player has a ring of forging.
- *
- * @param player the player.
- * @return {@code True} if so.
- */
- public boolean hasForgingRing(Player player) {
- return player.getEquipment().containsItem(RING_OF_FORGING);
- }
-
/**
* Checks if the forging is a succes.
*
@@ -192,19 +189,21 @@ public class SmeltingPulse extends SkillPulse
- {
*/
public boolean success(Player player) {
if (bar == Bar.IRON && !superHeat) {
- if (hasForgingRing(player)) {
- Item ring = getItemFromEquipment(player, EquipmentSlot.RING);
- if(ring != null){
- if(getCharge(ring) == 1000) setCharge(ring, 140);
- adjustCharge(ring, -1);
- if(getCharge(ring) == 0){
- player.getEquipment().remove(ring);
+ if (inEquipment(player, Items.RING_OF_FORGING_2568, 1)) {
+ int charges = getAttribute(player, "ringOfForgingCharges", 140) - 1;
+ if (charges <= 0) {
+ if (removeItem(player, Items.RING_OF_FORGING_2568, Container.EQUIPMENT)) {
+ charges = 140;
sendMessage(player, "Your ring of forging uses up its last charge and disintegrates.");
+ } else {
+ log(this.getClass(), Log.ERR, "Failed to delete empty ring of forging for player " + player.getName());
+ return false; //unfair but prevents exploit if the impossible happens
}
}
+ setAttribute(player, "/save:ringOfForgingCharges", charges);
return true;
} else {
- return RandomFunction.getRandom(100) <= (player.getSkills().getLevel(Skills.SMITHING) >= 45 ? 80 : 50);
+ return RandomFunction.nextBool();
}
}
return true;
diff --git a/Server/src/main/content/global/skill/summoning/SummoningPouch.java b/Server/src/main/content/global/skill/summoning/SummoningPouch.java
index b91634318..90a502e6d 100644
--- a/Server/src/main/content/global/skill/summoning/SummoningPouch.java
+++ b/Server/src/main/content/global/skill/summoning/SummoningPouch.java
@@ -14,27 +14,27 @@ public enum SummoningPouch {
/**
* Represents a spirit wolf pouch.
*/
- SPIRIT_WOLF_POUCH(0, 12047, 1, 4.8, 6829, 0.1, 1, false, new Item(12158), new Item(12155), new Item(2859), new Item(12183, 7)),
+ SPIRIT_WOLF_POUCH(0, 12047, 1, 4.8, 6829, 0.1, 1, false, new Item(12158), new Item(12155), new Item(2859), new Item(12183, 1)),
/**
* Represents a dreadfowl pouch.
*/
- DREADFOWL_POUCH(1, 12043, 4, 9.3, 6825, 0.1, 1, false, new Item(12158), new Item(12155), new Item(2138), new Item(12183, 8)),
+ DREADFOWL_POUCH(1, 12043, 4, 9.3, 6825, 0.1, 1, false, new Item(12158), new Item(12155), new Item(2138), new Item(12183, 1)),
/**
* Represents a spirit spider pouch.
*/
- SPIRIT_SPIDER_POUCH(2, 12059, 10, 12.6, 6841, 0.2, 2, false, new Item(12158), new Item(12155), new Item(6291), new Item(12183, 8)),
+ SPIRIT_SPIDER_POUCH(2, 12059, 10, 12.6, 6841, 0.2, 2, false, new Item(12158), new Item(12155), new Item(6291), new Item(12183, 1)),
/**
* Represents a thorny snail pouch.
*/
- THORNY_SNAIL_POUCH(3, 12019, 13, 12.6, 6806, 0.2, 2, false, new Item(12158), new Item(12155), new Item(3363), new Item(12183, 9)),
+ THORNY_SNAIL_POUCH(3, 12019, 13, 12.6, 6806, 0.2, 2, false, new Item(12158), new Item(12155), new Item(3363), new Item(12183, 1)),
/**
* Represents a granite crab pouch.
*/
- GRANITE_CRAB_POUCH(4, 12009, 16, 21.6, 6796, 0.2, 2, false, new Item(12158), new Item(12155), new Item(440), new Item(12183, 7)),
+ GRANITE_CRAB_POUCH(4, 12009, 16, 21.6, 6796, 0.2, 2, false, new Item(12158), new Item(12155), new Item(440), new Item(12183, 1)),
/**
* Represents a spirit mosquito pouch.
@@ -44,97 +44,97 @@ public enum SummoningPouch {
/**
* Represents a desrrt wyrm pouch.
*/
- DESERT_WYRM_POUCH(6, 12049, 18, 31.2, 6831, 0.4, 1, false, new Item(12159), new Item(12155), new Item(1783), new Item(12183, 45)),
+ DESERT_WYRM_POUCH(6, 12049, 18, 31.2, 6831, 0.4, 1, false, new Item(12159), new Item(12155), new Item(1783), new Item(12183, 1)),
/**
* Represents a spirit scorpion pouch.
*/
- SPIRIT_SCORPION_POUCH(7, 12055, 19, 83.2, 6837, 0.9, 2, false, new Item(12160), new Item(12155), new Item(3095), new Item(12183, 57)),
+ SPIRIT_SCORPION_POUCH(7, 12055, 19, 83.2, 6837, 0.9, 2, false, new Item(12160), new Item(12155), new Item(3095), new Item(12183, 1)),
/**
* Represents a spirit tz-kih pouch.
*/
- SPIRIT_TZ_KIH_POUCH(8, 12808, 22, 96.8, 7361, 1.1, 3, false, new Item(12160), new Item(12168), new Item(12155), new Item(12183, 64)),
+ SPIRIT_TZ_KIH_POUCH(8, 12808, 22, 96.8, 7361, 1.1, 3, false, new Item(12160), new Item(12168), new Item(12155), new Item(12183, 1)),
/**
* Represents an albino rat pouch.
*/
- ALBINO_RAT_POUCH(9, 12067, 23, 202.4, 6847, 2.3, 1, false, new Item(12163), new Item(12155), new Item(2134), new Item(12183, 75)),
+ ALBINO_RAT_POUCH(9, 12067, 23, 202.4, 6847, 2.3, 1, false, new Item(12163), new Item(12155), new Item(2134), new Item(12183, 1)),
/**
* Represents a spirit kalphite pouch.
*/
- SPIRIT_KALPHITE_POUCH(10, 12063, 25, 220, 6994, 2.5, 3,false, new Item(12163), new Item(12155), new Item(3138), new Item(12183, 51)),
+ SPIRIT_KALPHITE_POUCH(10, 12063, 25, 220, 6994, 2.5, 3,false, new Item(12163), new Item(12155), new Item(3138), new Item(12183, 1)),
/**
* Represents a compost mound pouch.
*/
- COMPOST_MOUND_POUCH(11, 12091, 28, 49.8, 6871, 0.6, 6, false, new Item(12159), new Item(12155), new Item(6032), new Item(12183, 47)),
+ COMPOST_MOUND_POUCH(11, 12091, 28, 49.8, 6871, 0.6, 6, false, new Item(12159), new Item(12155), new Item(6032), new Item(12183, 1)),
/**
* Represents a giant chinchompa pouch.
*/
- GIANT_CHINCHOMPA_POUCH(12, 12800, 29, 255.2, 7353, 2.9, 1, false, new Item(12163), new Item(12155), new Item(10033), new Item(12183, 84)),
+ GIANT_CHINCHOMPA_POUCH(12, 12800, 29, 255.2, 7353, 2.9, 1, false, new Item(12163), new Item(12155), new Item(10033), new Item(12183, 1)),
/**
* Represents a vampire bat pouch.
*/
- VAMPIRE_BAT_POUCH(13, 12053, 31, 136, 6835, 1.5, 4, false, new Item(12160), new Item(12155), new Item(3325), new Item(12183, 81)),
+ VAMPIRE_BAT_POUCH(13, 12053, 31, 136, 6835, 1.5, 4, false, new Item(12160), new Item(12155), new Item(3325), new Item(12183, 1)),
/**
* Represents a honey badger pouch.
*/
- HONEY_BADGER_POUCH(14, 12065, 32, 140.8, 6845, 1.6, 4, false, new Item(12160), new Item(12155), new Item(12156), new Item(12183, 84)),
+ HONEY_BADGER_POUCH(14, 12065, 32, 140.8, 6845, 1.6, 4, false, new Item(12160), new Item(12155), new Item(12156), new Item(12183, 1)),
/**
* Represents a beaver pouch.
*/
- BEAVER_POUCH(15, 12021, 33, 57.6, 6808, 0.7, 4, true, new Item(12159), new Item(12155), new Item(1519), new Item(12183, 72)),
+ BEAVER_POUCH(15, 12021, 33, 57.6, 6808, 0.7, 4, true, new Item(12159), new Item(12155), new Item(1519), new Item(12183, 1)),
/**
* Represents a void ravager pouch.
*/
- VOID_RAVAGER_POUCH(16, 12818, 34, 59.6, 7370, 0.7, 4, false, new Item(12159), new Item(12164), new Item(12155), new Item(12183, 74)),
+ VOID_RAVAGER_POUCH(16, 12818, 34, 59.6, 7370, 0.7, 4, false, new Item(12159), new Item(12164), new Item(12155), new Item(12183, 1)),
/**
* Represents a void spinner pouch.
*/
- VOID_SPINNER_POUCH(17, 12780, 34, 59.6, 7333, 0.7, 4, true, new Item(12163), new Item(12166), new Item(12155), new Item(12183, 74)),
+ VOID_SPINNER_POUCH(17, 12780, 34, 59.6, 7333, 0.7, 4, true, new Item(12163), new Item(12166), new Item(12155), new Item(12183, 1)),
/**
* Represents a void torcher pouch.
*/
- VOID_TORCHER_POUCH(18, 12798, 34, 59.6, 7351, 0.7, 4, false, new Item(12163), new Item(12167), new Item(12155), new Item(12183, 74)),
+ VOID_TORCHER_POUCH(18, 12798, 34, 59.6, 7351, 0.7, 4, false, new Item(12163), new Item(12167), new Item(12155), new Item(12183, 1)),
/**
* Represents a void shifter pouch.
*/
- VOID_SHIFTER_POUCH(19, 12814, 34, 59.6, 7367, 0.7, 4, false, new Item(12163), new Item(12165), new Item(12155), new Item(12183, 74)),
+ VOID_SHIFTER_POUCH(19, 12814, 34, 59.6, 7367, 0.7, 4, false, new Item(12163), new Item(12165), new Item(12155), new Item(12183, 1)),
/**
* Represents a bronze minotaur pouch.
*/
- BRONZE_MINOTAUR_POUCH(64, 12073, 36, 316.8, 6853, 3.6, 3, false, new Item(12163), new Item(12155), new Item(2349), new Item(12183, 102)),
+ BRONZE_MINOTAUR_POUCH(64, 12073, 36, 316.8, 6853, 3.6, 3, false, new Item(12163), new Item(12155), new Item(2349), new Item(12183, 1)),
/**
* Represents an iron minotaur pouch.
*/
- IRON_MINOTAUR_POUCH(65, 12075, 46, 404.8, 6855, 4.6, 9, false, new Item(12163), new Item(12155), new Item(2351), new Item(12183, 125)),
+ IRON_MINOTAUR_POUCH(65, 12075, 46, 404.8, 6855, 4.6, 9, false, new Item(12163), new Item(12155), new Item(2351), new Item(12183, 1)),
/**
* Represents a steel minotaur pouch.
*/
- STEEL_MINOTAUR_POUCH(66, 12077, 56, 492.8, 6857, 5.6, 9, false, new Item(12163), new Item(12155), new Item(2353), new Item(12183, 141)),
+ STEEL_MINOTAUR_POUCH(66, 12077, 56, 492.8, 6857, 5.6, 9, false, new Item(12163), new Item(12155), new Item(2353), new Item(12183, 1)),
/**
* Represents a mithril minotaur pouch.
*/
- MITHRIL_MINOTAUR_POUCH(67, 12079, 66, 580.8, 6859, 6.6, 9,false, new Item(12163), new Item(12155), new Item(2359), new Item(12183, 152)),
+ MITHRIL_MINOTAUR_POUCH(67, 12079, 66, 580.8, 6859, 6.6, 9,false, new Item(12163), new Item(12155), new Item(2359), new Item(12183, 1)),
/**
* Represents an adamant minotaur pouch.
*/
- ADAMANT_MINOTAUR_POUCH(68, 12081, 76, 668.8, 6861, 7.6, 9, false, new Item(12163), new Item(12155), new Item(2361), new Item(12183, 144)),
+ ADAMANT_MINOTAUR_POUCH(68, 12081, 76, 668.8, 6861, 7.6, 9, false, new Item(12163), new Item(12155), new Item(2361), new Item(12183, 1)),
/**
* Represents a rune minotaur pouch.
@@ -144,132 +144,132 @@ public enum SummoningPouch {
/**
* Represents a bull ant pouch.
*/
- BULL_ANT_POUCH(20, 12087, 40, 52.8, 6867, 0.6, 5, false, new Item(12158), new Item(12155), new Item(6010), new Item(12183, 11)),
+ BULL_ANT_POUCH(20, 12087, 40, 52.8, 6867, 0.6, 5, false, new Item(12158), new Item(12155), new Item(6010), new Item(12183, 1)),
/**
* Represents a macaw pouch.
*/
- MACAW_POUCH(21, 12071, 41, 72.4, 6851, 0.8, 5, true, new Item(12159), new Item(12155), new Item(249), new Item(12183, 78)),
+ MACAW_POUCH(21, 12071, 41, 72.4, 6851, 0.8, 5, true, new Item(12159), new Item(12155), new Item(249), new Item(12183, 1)),
/**
* Represents an evil turnip pouch.
*/
- EVIL_TURNIP_POUCH(22, 12051, 42, 184.8, 6833, 2.1, 5, false, new Item(12160), new Item(12155), new Item(12153), new Item(12183, 104)),
+ EVIL_TURNIP_POUCH(22, 12051, 42, 184.8, 6833, 2.1, 5, false, new Item(12160), new Item(12155), new Item(12153), new Item(12183, 1)),
/**
* Represents a spirit cockatrice pouch.
*/
- SPIRIT_COCKATRICE_POUCH(23, 12095, 43, 75.2, 6875, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12109), new Item(12183, 88)),
+ SPIRIT_COCKATRICE_POUCH(23, 12095, 43, 75.2, 6875, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12109), new Item(12183, 1)),
/**
* Represents a spirit guthatrice pouch.
*/
- SPIRIT_GUTHATRICE_POUCH(24, 12097, 43, 75.2, 6877, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12111), new Item(12183, 88)),
+ SPIRIT_GUTHATRICE_POUCH(24, 12097, 43, 75.2, 6877, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12111), new Item(12183, 1)),
/**
* Represents a spirit saratrice pouch.
*/
- SPIRIT_SARATRICE_POUCH(25, 12099, 43, 75.2, 6879, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12113), new Item(12183, 88)),
+ SPIRIT_SARATRICE_POUCH(25, 12099, 43, 75.2, 6879, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12113), new Item(12183, 1)),
/**
* Represents a spirit zamatrice pouch.
*/
- SPIRIT_ZAMATRICE_POUCH(26, 12101, 43, 75.2, 6881, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12115), new Item(12183, 88)),
+ SPIRIT_ZAMATRICE_POUCH(26, 12101, 43, 75.2, 6881, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12115), new Item(12183, 1)),
/**
* Represents a spirit pengatrice pouch.
*/
- SPIRIT_PENGATRICE_POUCH(27, 12103, 43, 75.2, 6883, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12117), new Item(12183, 88)),
+ SPIRIT_PENGATRICE_POUCH(27, 12103, 43, 75.2, 6883, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12117), new Item(12183, 1)),
/**
* Represents a coraxatrice pouch.
*/
- SPIRIT_CORAXATRICE_POUCH(28, 12105, 43, 75.2, 6885, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12119), new Item(12183, 88)),
+ SPIRIT_CORAXATRICE_POUCH(28, 12105, 43, 75.2, 6885, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12119), new Item(12183, 1)),
/**
* Represents a vulatrice pouch.
*/
- SPIRIT_VULATRICE(29, 12107, 43, 75.2, 6887, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12121), new Item(12183, 88)),
+ SPIRIT_VULATRICE(29, 12107, 43, 75.2, 6887, 0.9, 5, false, new Item(12159), new Item(12155), new Item(12121), new Item(12183, 1)),
/**
* Represents a pyrelord pouch.
*/
- PYRELORD_POUCH(30, 12816, 46, 202.4, 7377, 2.3, 5, false, new Item(12160), new Item(12155), new Item(590), new Item(12183, 111)),
+ PYRELORD_POUCH(30, 12816, 46, 202.4, 7377, 2.3, 5, false, new Item(12160), new Item(12155), new Item(590), new Item(12183, 1)),
/**
* Represents a magpie pouch.
*/
- MAGPIE_POUCH(31, 12041, 47, 83.2, 6824, 0.9, 5, true, new Item(12159), new Item(12155), new Item(1635), new Item(12183, 88)),
+ MAGPIE_POUCH(31, 12041, 47, 83.2, 6824, 0.9, 5, true, new Item(12159), new Item(12155), new Item(1635), new Item(12183, 1)),
/**
* Represents a bloated leech pouch.
*/
- BLOATED_LEECH_POUCH(32, 12061, 49, 215.2, 6843, 2.4, 5, false, new Item(12160), new Item(12155), new Item(2132), new Item(12183, 117)),
+ BLOATED_LEECH_POUCH(32, 12061, 49, 215.2, 6843, 2.4, 5, false, new Item(12160), new Item(12155), new Item(2132), new Item(12183, 1)),
/**
* Represents a spirit terrorbird pouch.
*/
- SPIRIT_TERRORBIRD_POUCH(33, 12007, 52, 68.4, 6794, 0.8, 6, true, new Item(12158), new Item(12155), new Item(9978), new Item(12183, 12)),
+ SPIRIT_TERRORBIRD_POUCH(33, 12007, 52, 68.4, 6794, 0.8, 6, true, new Item(12158), new Item(12155), new Item(9978), new Item(12183, 1)),
/**
* Represents an abyssal parasite pouch.
*/
- ABYSSAL_PARASITE_POUCH(34, true,12035, 54, 94.8, 6818, 1.1, 6, false, new Item(12159), new Item(12155), new Item(12161), new Item(12183, 106)),
+ ABYSSAL_PARASITE_POUCH(34, true,12035, 54, 94.8, 6818, 1.1, 6, false, new Item(12159), new Item(12155), new Item(12161), new Item(12183, 1)),
/**
* Represents a spirit jelly pouch.
*/
- SPIRIT_JELLY_POUCH(35, 12027, 55, 484, 6992, 5.5, 6, false, new Item(12163), new Item(12155), new Item(1937), new Item(12183, 151)),
+ SPIRIT_JELLY_POUCH(35, 12027, 55, 484, 6992, 5.5, 6, false, new Item(12163), new Item(12155), new Item(1937), new Item(12183, 1)),
/**
* Represents an ibis pouch.
*/
- IBIS_POUCH(36, 12531, 56, 98.8, 6991, 1.1, 6, true, new Item(12159), new Item(12155), new Item(311), new Item(12183, 109)),
+ IBIS_POUCH(36, 12531, 56, 98.8, 6991, 1.1, 6, true, new Item(12159), new Item(12155), new Item(311), new Item(12183, 1)),
/**
* Represents a spirit kyatt pouch.
*/
- SPIRIT_KYATT_POUCH(37, 12812, 57, 501.6, 7365, 5.7, 6, false, new Item(12163), new Item(12155), new Item(10103), new Item(12183, 153)),
+ SPIRIT_KYATT_POUCH(37, 12812, 57, 501.6, 7365, 5.7, 6, false, new Item(12163), new Item(12155), new Item(10103), new Item(12183, 1)),
/**
* Represents a spirit larupia pouch.
*/
- SPIRIT_LARUPIA_POUCH(38, 12784, 57, 501.6, 7337, 5.7, 6, false, new Item(12163), new Item(12155), new Item(10095), new Item(12183, 155)),
+ SPIRIT_LARUPIA_POUCH(38, 12784, 57, 501.6, 7337, 5.7, 6, false, new Item(12163), new Item(12155), new Item(10095), new Item(12183, 1)),
/**
* Represents a spirit graahk pouch.
*/
- SPIRIT_GRAAHK_POUCH(39, 12810, 57, 501.6, 7363, 5.7, 6, false, new Item(12163), new Item(12155), new Item(10099), new Item(12183, 154)),
+ SPIRIT_GRAAHK_POUCH(39, 12810, 57, 501.6, 7363, 5.7, 6, false, new Item(12163), new Item(12155), new Item(10099), new Item(12183, 1)),
/**
* Represents a karamthulhu overlord pouch.
*/
- KARAMTHULHU_POUCH(40, 12023, 58, 510.4, 6809, 5.8, 6, false, new Item(12163), new Item(12155), new Item(6667), new Item(12183, 144)),
+ KARAMTHULHU_POUCH(40, 12023, 58, 510.4, 6809, 5.8, 6, false, new Item(12163), new Item(12155), new Item(6667), new Item(12183, 1)),
/**
* Represents a smoke devil pouch.
*/
- SMOKE_DEVIL_POUCH(41, 12085, 61, 268, 6865, 3, 7, false, new Item(12160), new Item(12155), new Item(9736), new Item(12183, 141)),
+ SMOKE_DEVIL_POUCH(41, 12085, 61, 268, 6865, 3, 7, false, new Item(12160), new Item(12155), new Item(9736), new Item(12183, 1)),
/**
* Represents an abyssal lurker pouch.
*/
- ABYSSAL_LUKRER(42, true,12037, 62, 109.6, 6820, 1.9, 9, false, new Item(12159), new Item(12155), new Item(12161), new Item(12183, 119)),
+ ABYSSAL_LUKRER(42, true,12037, 62, 109.6, 6820, 1.9, 9, false, new Item(12159), new Item(12155), new Item(12161), new Item(12183, 1)),
/**
* Represents a spirit cobra pouch.
*/
- SPIRIT_COBRA_POUCH(43, 12015, 63, 276.8, 6802, 3.1, 6, false, new Item(12160), new Item(12155), new Item(6287), new Item(12183, 116)),
+ SPIRIT_COBRA_POUCH(43, 12015, 63, 276.8, 6802, 3.1, 6, false, new Item(12160), new Item(12155), new Item(6287), new Item(12183, 1)),
/**
* Represents a stranger plant pouch.
*/
- STRANGER_PLANT_POUCH(44, 12045, 64, 281.6, 6827, 3.2, 6, false, new Item(12160), new Item(12155), new Item(8431), new Item(12183, 128)),
+ STRANGER_PLANT_POUCH(44, 12045, 64, 281.6, 6827, 3.2, 6, false, new Item(12160), new Item(12155), new Item(8431), new Item(12183, 1)),
/**
* Represents a barker toad pouch.
*/
- BARKER_TOAD_POUCH(45, 12123, 66, 87, 6889, 1, 7, false, new Item(12158), new Item(12155), new Item(2150), new Item(12183, 11)),
+ BARKER_TOAD_POUCH(45, 12123, 66, 87, 6889, 1, 7, false, new Item(12158), new Item(12155), new Item(2150), new Item(12183, 1)),
/**
* Represents a war tortoise pouch.
@@ -279,62 +279,62 @@ public enum SummoningPouch {
/**
* Represents a bunyip pouch.
*/
- BUNYIP_POUCH(47, 12029, 68, 119.2, 6813, 1.4, 7, true, new Item(12159), new Item(12155), new Item(383), new Item(12183, 110)),
+ BUNYIP_POUCH(47, 12029, 68, 119.2, 6813, 1.4, 7, true, new Item(12159), new Item(12155), new Item(383), new Item(12183, 1)),
/**
* Represents a fruit bat pouch.
*/
- FRUIT_BAT_POUCH(48, 12033, 69, 121.2, 6817, 1.4, 8, true, new Item(12159), new Item(12155), new Item(1963), new Item(12183, 130)),
+ FRUIT_BAT_POUCH(48, 12033, 69, 121.2, 6817, 1.4, 8, true, new Item(12159), new Item(12155), new Item(1963), new Item(12183, 1)),
/**
* Represents a ravenous locust pouch.
*/
- RAVENOUS_LOCUST_POUCH(49, 12820, 70, 132, 7372, 1.5, 4, false, new Item(12160), new Item(12155), new Item(1933), new Item(12183, 79)),
+ RAVENOUS_LOCUST_POUCH(49, 12820, 70, 132, 7372, 1.5, 4, false, new Item(12160), new Item(12155), new Item(1933), new Item(12183, 1)),
/**
* Represents an arctic bear pouch.
*/
- ARCTIC_BEAR_POUCH(50, 12057, 71, 93.2, 6839, 1.1, 8, false, new Item(12158), new Item(12155), new Item(10117), new Item(12183, 14)),
+ ARCTIC_BEAR_POUCH(50, 12057, 71, 93.2, 6839, 1.1, 8, false, new Item(12158), new Item(12155), new Item(10117), new Item(12183, 1)),
/**
* Represents a Phoenix
*/
- PHOENIX_POUCH(50, 14623, 72, 93.2, 8575, 1.1, 8, false, new Item(12160, 1), new Item(12183, 165), new Item(12155, 1), new Item(14616, 1)),
+ PHOENIX_POUCH(50, 14623, 72, 93.2, 8575, 1.1, 8, false, new Item(12160, 1), new Item(12183, 1), new Item(12155, 1), new Item(14616, 1)),
/**
* Represents an obsidian golem pouch.
*/
- OBSIDIAN_GOLEM_POUCH(51, 12792, 73, 642.4, 7345, 7.3, 8, false, new Item(12163), new Item(12155), new Item(12168), new Item(12183, 195)),
+ OBSIDIAN_GOLEM_POUCH(51, 12792, 73, 642.4, 7345, 7.3, 8, false, new Item(12163), new Item(12155), new Item(12168), new Item(12183, 1)),
/**
* Represents a granite lobster pouch.
*/
- GRANITE_LOBSTER_POUCH(52, 12069, 74, 325.6, 6849, 3.7, 8, false, new Item(12160), new Item(12155), new Item(6979), new Item(12183, 166)),
+ GRANITE_LOBSTER_POUCH(52, 12069, 74, 325.6, 6849, 3.7, 8, false, new Item(12160), new Item(12155), new Item(6979), new Item(12183, 1)),
/**
* Represents a praying mantis pouch.
*/
- PRAYING_MANTIS_POUCH(53, 12011, 75, 329.6, 6798, 3.6, 8, false, new Item(12160), new Item(12155), new Item(2460), new Item(12183, 168)),
+ PRAYING_MANTIS_POUCH(53, 12011, 75, 329.6, 6798, 3.6, 8, false, new Item(12160), new Item(12155), new Item(2460), new Item(12183, 1)),
/**
* Represents a forge regent pouch.
*/
- FORGE_REGENT_BEAST(54, 12782, 76, 134, 7335, 1.5, 9, false, new Item(12159), new Item(12155), new Item(10020), new Item(12183, 141)),
+ FORGE_REGENT_BEAST(54, 12782, 76, 134, 7335, 1.5, 9, false, new Item(12159), new Item(12155), new Item(10020), new Item(12183, 1)),
/**
* Represents a talon beast pouch.
*/
- TALON_BEAST_POUCH(55, 12794, 77, 1015.2, 7347, 3.8, 9, false, new Item(12160), new Item(12155), new Item(12162), new Item(12183, 174)),
+ TALON_BEAST_POUCH(55, 12794, 77, 1015.2, 7347, 3.8, 9, false, new Item(12160), new Item(12155), new Item(12162), new Item(12183, 1)),
/**
* Represents a giant ent pouch.
*/
- GIANT_ENT_POUCH(56, 12013, 78, 136.8, 6800, 1.6, 8, false, new Item(12159), new Item(5933), new Item(12155), new Item(12183, 124)),
+ GIANT_ENT_POUCH(56, 12013, 78, 136.8, 6800, 1.6, 8, false, new Item(12159), new Item(5933), new Item(12155), new Item(12183, 1)),
/**
* Represents a hydra pouch.
*/
- HYDRA_POUCH(60, 12025, 80, 140.8, 6811, 1.6, 9, false, new Item(12159), new Item(571), new Item(12155), new Item(12183, 128)),
+ HYDRA_POUCH(60, 12025, 80, 140.8, 6811, 1.6, 9, false, new Item(12159), new Item(571), new Item(12155), new Item(12183, 1)),
/**
* Represents a spirit dagannoth pouch.
@@ -344,62 +344,62 @@ public enum SummoningPouch {
/**
* Represents a unicorn stallion pouch.
*/
- UNICORN_STALLION_POUCH(70, 12039, 88, 154.4, 6822, 1.8, 9, true, new Item(12159), new Item(237), new Item(12155), new Item(12183, 140)),
+ UNICORN_STALLION_POUCH(70, 12039, 88, 154.4, 6822, 1.8, 9, true, new Item(12159), new Item(237), new Item(12155), new Item(12183, 1)),
/**
* Represents a wolpertinger pouch.
*/
- WOLPERTINGER_POUCH(72, 12089, 92, 404.8, 6869, 4.5, 10, false, new Item(12160), new Item(2859), new Item(3226), new Item(12155), new Item(12183, 203)),
+ WOLPERTINGER_POUCH(72, 12089, 92, 404.8, 6869, 4.5, 10, false, new Item(12160), new Item(2859), new Item(3226), new Item(12155), new Item(12183, 1)),
/**
* Represents a pack yak pouch.
*/
- PACK_YAK_POUCH(75, 12093, 96, 422.4, 6873, 4.8, 10, true, new Item(12160), new Item(10818), new Item(12155), new Item(12183, 211)),
+ PACK_YAK_POUCH(75, 12093, 96, 422.4, 6873, 4.8, 10, true, new Item(12160), new Item(10818), new Item(12155), new Item(12183, 1)),
/**
* Represents a fire titan pouch.
*/
- FIRE_TITAN_POUCH(57, 12802, 79, 695.2, 7355, 7.9, 9, false, new Item(12163), new Item(1442), new Item(12155), new Item(12183, 198)),
+ FIRE_TITAN_POUCH(57, 12802, 79, 695.2, 7355, 7.9, 9, false, new Item(12163), new Item(1442), new Item(12155), new Item(12183, 1)),
/**
* Represents a moss titan pouch.
*/
- MOSS_TITAN_POUCH(58, 12804, 79, 695.2, 7357, 7.9, 9, false, new Item(12163), new Item(1440), new Item(12155), new Item(12183, 198)),
+ MOSS_TITAN_POUCH(58, 12804, 79, 695.2, 7357, 7.9, 9, false, new Item(12163), new Item(1440), new Item(12155), new Item(12183, 1)),
/**
* Represents an ice titan pouch.
*/
- ICE_TITAN_POUCH(59, 12806, 79, 695.2, 7359, 7.9, 9, false, new Item(12163), new Item(1438), new Item(1444), new Item(12155), new Item(12183, 198)),
+ ICE_TITAN_POUCH(59, 12806, 79, 695.2, 7359, 7.9, 9, false, new Item(12163), new Item(1438), new Item(1444), new Item(12155), new Item(12183, 1)),
/**
* Represents a lava titan pouch.
*/
- LAVA_TITAN_POUCH(62, 12788, 83, 730.4, 7341, 8.3, 9, false, new Item(12163), new Item(12168), new Item(12155), new Item(12183, 219)),
+ LAVA_TITAN_POUCH(62, 12788, 83, 730.4, 7341, 8.3, 9, false, new Item(12163), new Item(12168), new Item(12155), new Item(12183, 1)),
/**
* Represents a swamp titan pouch.
*/
- SWAMP_TITAN_POUCH(63, 12776, 85, 373.6, 7329, 4.2, 9, false, new Item(12160), new Item(10149), new Item(12155), new Item(12183, 150)),
+ SWAMP_TITAN_POUCH(63, 12776, 85, 373.6, 7329, 4.2, 9, false, new Item(12160), new Item(10149), new Item(12155), new Item(12183, 1)),
/**
* Represents a geyser titan pouch.
*/
- GEYSER_TITAN_POUCH(71, 12786, 89, 783.2, 7339, 8.9, 9, false, new Item(12163), new Item(1444), new Item(12155), new Item(12183, 222)),
+ GEYSER_TITAN_POUCH(71, 12786, 89, 783.2, 7339, 8.9, 9, false, new Item(12163), new Item(1444), new Item(12155), new Item(12183, 1)),
/**
* Represents an abyssal titan pouch.
*/
- ABYSSAL_TITAN_POUCH(73, true,12796, 93, 163.2, 7349, 1.9, 10, false, new Item(12159), new Item(12161), new Item(12155), new Item(12183, 113)),
+ ABYSSAL_TITAN_POUCH(73, true,12796, 93, 163.2, 7349, 1.9, 10, false, new Item(12159), new Item(12161), new Item(12155), new Item(12183, 1)),
/**
* Represents an iron titan pouch.
*/
- IRON_TITAN_POUCH(74, 12822, 95, 417.6, 7375, 4.7, 10, false, new Item(12160), new Item(1115), new Item(12155), new Item(12183, 198)),
+ IRON_TITAN_POUCH(74, 12822, 95, 417.6, 7375, 4.7, 10, false, new Item(12160), new Item(1115), new Item(12155), new Item(12183, 1)),
/**
* Represents a steel titan pouch.
*/
- STEEL_TITAN_POUCH(76, 12790, 99, 435.2, 7343, 4.9, 10, false, new Item(12160), new Item(1119), new Item(12155), new Item(12183, 178)),
+ STEEL_TITAN_POUCH(76, 12790, 99, 435.2, 7343, 4.9, 10, false, new Item(12160), new Item(1119), new Item(12155), new Item(12183, 1)),
SACRED_CLAY_POUCH_1(-1, 14422, 1, 0, 8240, 0, 1, false, new Item(14182)),
SACRED_CLAY_POUCH_2(-1, 14424, 20, 0, 8242, 0, 3, false, new Item(14184)),
diff --git a/Server/src/main/content/global/skill/summoning/SummoningTabListener.kt b/Server/src/main/content/global/skill/summoning/SummoningTabListener.kt
index 2a8debf26..ee39b8470 100644
--- a/Server/src/main/content/global/skill/summoning/SummoningTabListener.kt
+++ b/Server/src/main/content/global/skill/summoning/SummoningTabListener.kt
@@ -4,6 +4,8 @@ import content.global.skill.summoning.pet.Pet
import core.api.sendMessage
import core.game.interaction.InterfaceListener
+import content.global.skill.summoning.familiar.SnowscapeFamiliarInterface
+
class SummoningTabListener : InterfaceListener {
override fun defineInterfaceListeners() {
on(662) { player, _, opcode, buttonID, _, _ ->
@@ -12,7 +14,8 @@ class SummoningTabListener : InterfaceListener {
if (player.familiarManager.hasFamiliar()) {
player.familiarManager.familiar.call()
} else {
- player.getPacketDispatch().sendMessage("You don't have a follower.")
+ SnowscapeFamiliarInterface.Companion.openInterface(player)
+ //player.getPacketDispatch().sendMessage("You don't have a follower.")
}
}
67 -> {
@@ -44,7 +47,7 @@ class SummoningTabListener : InterfaceListener {
// Dismiss now
if (player.getFamiliarManager().getFamiliar() is Pet) {
val pet = player.familiarManager.familiar as Pet
- player.familiarManager.removeDetails(pet.getItemIdHash())
+ player.familiarManager.removeDetails(pet.getItemId())
}
player.familiarManager.dismiss()
}
diff --git a/Server/src/main/content/global/skill/summoning/SummoningTrainingRoom.java b/Server/src/main/content/global/skill/summoning/SummoningTrainingRoom.java
index 68d038c0d..6296daef4 100644
--- a/Server/src/main/content/global/skill/summoning/SummoningTrainingRoom.java
+++ b/Server/src/main/content/global/skill/summoning/SummoningTrainingRoom.java
@@ -34,6 +34,7 @@ import core.plugin.Plugin;
import core.plugin.ClassScanner;
import static core.api.ContentAPIKt.*;
+import content.data.Quests;
/**
* Handles the summoning training room.
@@ -81,7 +82,7 @@ public final class SummoningTrainingRoom extends OptionHandler {
public boolean handle(final Player player, Node node, String option) {
Scenery object = (Scenery) node;
Location loc = null;
- Quest quest = player.getQuestRepository().getQuest("Wolf Whistle");
+ Quest quest = player.getQuestRepository().getQuest(Quests.WOLF_WHISTLE);
int questVal = quest.getStage(player) == 0 ? 0 : quest.getStage(player) > 0 && quest.getStage(player) < 100 ? 5 : 28893;
switch (option) {
case "close":
@@ -312,7 +313,7 @@ public final class SummoningTrainingRoom extends OptionHandler {
@Override
public boolean open(Object... args) {
cutscene = (CutscenePlugin) args[0];
- quest = player.getQuestRepository().getQuest("Wolf Whistle");
+ quest = player.getQuestRepository().getQuest(Quests.WOLF_WHISTLE);
fluffy = NPC.create(6990, cutscene.getBase().transform(41, 52, 1));
fluffy.init();
fluffy.faceTemporary(player, 1);
diff --git a/Server/src/main/content/global/skill/summoning/familiar/AbyssalLurkerNPC.java b/Server/src/main/content/global/skill/summoning/familiar/AbyssalLurkerNPC.java
index 9fb1effdc..b6184c4a8 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/AbyssalLurkerNPC.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/AbyssalLurkerNPC.java
@@ -28,7 +28,7 @@ public class AbyssalLurkerNPC extends BurdenBeast {
* @param id The id.
*/
public AbyssalLurkerNPC(Player owner, int id) {
- super(owner, id, 4100, 12037, 3, 7, WeaponInterface.STYLE_CAST);
+ super(owner, id, 4100, 12037, 3, 24, WeaponInterface.STYLE_CAST);
}
@Override
diff --git a/Server/src/main/content/global/skill/summoning/familiar/AbyssalParasiteNPC.java b/Server/src/main/content/global/skill/summoning/familiar/AbyssalParasiteNPC.java
index 795484722..551e2db9a 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/AbyssalParasiteNPC.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/AbyssalParasiteNPC.java
@@ -36,7 +36,7 @@ public class AbyssalParasiteNPC extends BurdenBeast {
* @param id The id.
*/
public AbyssalParasiteNPC(Player owner, int id) {
- super(owner, id, 3000, 12035, 1, 7);
+ super(owner, id, 3000, 12035, 1, 18);
}
@Override
diff --git a/Server/src/main/content/global/skill/summoning/familiar/AbyssalTitanNPC.kt b/Server/src/main/content/global/skill/summoning/familiar/AbyssalTitanNPC.kt
index a7ed47a6d..eaeb73b45 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/AbyssalTitanNPC.kt
+++ b/Server/src/main/content/global/skill/summoning/familiar/AbyssalTitanNPC.kt
@@ -21,7 +21,7 @@ import org.rs09.consts.NPCs
@Initializable
class AbyssalTitanNPC
constructor(owner: Player? = null, id: Int = NPCs.ABYSSAL_TITAN_7349) :
- BurdenBeast(owner, id, 3200, Items.ABYSSAL_TITAN_POUCH_12796, 6, 7, WeaponInterface.STYLE_ACCURATE) {
+ BurdenBeast(owner, id, 3200, Items.ABYSSAL_TITAN_POUCH_12796, 6, 30, WeaponInterface.STYLE_ACCURATE) {
override fun construct(owner: Player, id: Int): Familiar {
return AbyssalTitanNPC(owner, id)
}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/BabyChinchompaNPC.java b/Server/src/main/content/global/skill/summoning/familiar/BabyChinchompaNPC.java
deleted file mode 100644
index 66c03042b..000000000
--- a/Server/src/main/content/global/skill/summoning/familiar/BabyChinchompaNPC.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package content.global.skill.summoning.familiar;
-
-import core.game.dialogue.DialoguePlugin;
-import core.game.dialogue.FacialExpression;
-import core.game.node.entity.npc.Metamorphosis;
-import core.game.node.entity.npc.NPC;
-import core.game.node.entity.player.Player;
-import core.plugin.Initializable;
-import core.tools.RandomFunction;
-
-/**
- * Handles the baby chinchompa pet.
- * @author Empathy
- *
- */
-@Initializable
-public class BabyChinchompaNPC extends Metamorphosis {
-
- /**
- * The chinchompa ids.
- */
- private static final int[] CHINCHOMPA_IDS = new int[] { 8643, 8644, 8657, 8658 };
-
- /**
- * Constructs a new {@code BabyChinchompaNPC} object.
- */
- public BabyChinchompaNPC() {
- super(CHINCHOMPA_IDS);
- }
-
- @Override
- public DialoguePlugin getDialoguePlugin() {
- return new BabyChinchompaDialogue();
- }
-
- @Override
- public int getRandomNpcId() {
- int i = RandomFunction.getRandom(getIds().length - 1);
- if (getIds()[i] == 8658) {
- int x = RandomFunction.getRandom(30);
- if (x == 1) {
- return getIds()[i];
- } else {
- return getIds()[i-1];
- }
- }
- return getIds()[i];
- }
-
- /**
- * Handles the BabyChinchompa Dialogue.
- * @author Empathy
- *
- */
- public final class BabyChinchompaDialogue extends DialoguePlugin {
-
- /**
- * Constructs a new {@code BabyChinchompaDialogue} {@code Object}.
- */
- public BabyChinchompaDialogue() {
- /**
- * empty.
- */
- }
-
- /**
- * Constructs a new {@code BabyChinchompaDialogue} {@code Object}.
- *
- * @param player the player.
- */
- public BabyChinchompaDialogue(Player player) {
- super(player);
- }
-
- @Override
- public DialoguePlugin newInstance(Player player) {
- return new BabyChinchompaDialogue(player);
- }
-
- @Override
- public boolean open(Object... args) {
- npc = (NPC) args[0];
- interpreter.sendDialogues(npc, FacialExpression.OLD_NORMAL, npc.getId() != 8658 ? "Squeak! Squeak!" : "Squeaka! Squeaka!");
- stage = 0;
- return true;
- }
-
- @Override
- public boolean handle(int interfaceId, int buttonId) {
- switch (stage) {
- case 0:
- end();
- break;
- }
- return true;
- }
-
- @Override
- public int[] getIds() {
- return new int[] { 8643, 8644, 8657, 8658 };
- }
- }
-}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/BurdenBeast.java b/Server/src/main/content/global/skill/summoning/familiar/BurdenBeast.java
index d6a3100d0..628ff5077 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/BurdenBeast.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/BurdenBeast.java
@@ -83,6 +83,7 @@ public abstract class BurdenBeast extends Familiar {
* @return {@code True} if so.
*/
public boolean isAllowed(Player owner, Item item) {
+ /*
if (item.getValue() > 50000) {
owner.getPacketDispatch().sendMessage("This item is too valuable to trust to this familiar.");
return false;
@@ -95,6 +96,7 @@ public abstract class BurdenBeast extends Familiar {
owner.getPacketDispatch().sendMessage("You can't store " + item.getName().toLowerCase() + " in this familiar.");
return false;
}
+ */
if(SummoningPouch.get(this.getPouchId()).abyssal){
if(!item.getName().toLowerCase().contains("essence")) {
owner.getPacketDispatch().sendMessage("You can only give unnoted essence to this familiar.");
diff --git a/Server/src/main/content/global/skill/summoning/familiar/BurdenInterfacePlugin.java b/Server/src/main/content/global/skill/summoning/familiar/BurdenInterfacePlugin.java
index f9a8fd1a2..84de00f93 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/BurdenInterfacePlugin.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/BurdenInterfacePlugin.java
@@ -11,6 +11,8 @@ import core.plugin.Initializable;
import core.plugin.Plugin;
import kotlin.Unit;
+import content.global.handlers.item.SnowscapeSatchelListener;
+
/**
* Handles the beast of burden interface.
* @author Emperor
@@ -27,6 +29,14 @@ public final class BurdenInterfacePlugin extends ComponentPlugin {
@Override
public boolean handle(Player player, Component component, int opcode, int button, int slot, int itemId) {
+ if (getAttribute(player, "openSatchel", null) != null) {
+ SnowscapeSatchelListener.Companion.satchelInterfaceAction(player, component, opcode, button, slot, itemId);
+ return true;
+ }
+ if (getAttribute(player, "openSummonStorage", false)) {
+ SnowscapeFamiliarInterface.Companion.interfaceAction(player, component, opcode, button, slot, itemId);
+ return true;
+ }
if (!player.getFamiliarManager().hasFamiliar() || !player.getFamiliarManager().getFamiliar().isBurdenBeast()) {
return false;
}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/CockatriceFamiliarNPC.java b/Server/src/main/content/global/skill/summoning/familiar/CockatriceFamiliarNPC.java
index d1716b3d5..02564d7e1 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/CockatriceFamiliarNPC.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/CockatriceFamiliarNPC.java
@@ -34,6 +34,7 @@ public final class CockatriceFamiliarNPC implements Plugin
{
ClassScanner.definePlugin(new SpiritPengatrice());
ClassScanner.definePlugin(new SpiritCoraxatrice());
ClassScanner.definePlugin(new SpiritVulatrice());
+ ClassScanner.definePlugin(new SpiritSaratrice());
return this;
}
@@ -58,7 +59,11 @@ public final class CockatriceFamiliarNPC implements Plugin {
GameWorld.getPulser().submit(new Pulse(1, familiar.getOwner(), familiar, target) {
@Override
public boolean pulse() {
- target.getSkills().updateLevel(skill, -3, 0);
+ if(skill == 5) {
+ target.skills.decrementPrayerPoints(3);
+ }else {
+ target.getSkills().updateLevel(skill, -3, 0);
+ }
Projectile.magic(familiar, target, 1468, 40, 36, 71, 10).send();
familiar.sendFamiliarHit(target, 10, Graphics.create(1469));
return true;
@@ -297,4 +302,43 @@ public final class CockatriceFamiliarNPC implements Plugin {
}
}
+
+ /**
+ * Represents the Spirit Saratrice familiar.
+ * @author Aero - DeadlyGenga
+ */
+ public class SpiritSaratrice extends Forager {
+
+ /**
+ * Constructs a new {@code SpiritSaratriceNPC} {@code Object}.
+ */
+ public SpiritSaratrice() {
+ this(null, 6879);
+ }
+
+ /**
+ * Constructs a new {@code SpiritSaratriceNPC} {@code Object}.
+ * @param owner The owner.
+ * @param id The id.
+ */
+ public SpiritSaratrice(Player owner, int id) {
+ super(owner, id, 3600, 12099, 3, WeaponInterface.STYLE_CAST, COCKATRICE_EGG);
+ }
+
+ @Override
+ public Familiar construct(Player owner, int id) {
+ return new SpiritSaratrice(owner, id);
+ }
+
+ @Override
+ protected boolean specialMove(FamiliarSpecial special) {
+ return petrifyingGaze(this, special, Skills.PRAYER);
+ }
+
+ @Override
+ public int[] getIds() {
+ return new int[] { 6879, 6880 };
+ }
+
+ }
}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/DismissDialoguePlugin.java b/Server/src/main/content/global/skill/summoning/familiar/DismissDialoguePlugin.java
index ff053a5da..b369bf4d6 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/DismissDialoguePlugin.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/DismissDialoguePlugin.java
@@ -55,7 +55,7 @@ public final class DismissDialoguePlugin extends DialoguePlugin {
if (player.getFamiliarManager().getFamiliar() instanceof Pet) {
interpreter.sendDialogues(player, null, "Run along; I'm setting you free.");
Pet pet = (Pet) player.getFamiliarManager().getFamiliar();
- player.getFamiliarManager().removeDetails(pet.getItemIdHash());
+ player.getFamiliarManager().removeDetails(pet.getItemId());
} else {
end();
}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/Familiar.java b/Server/src/main/content/global/skill/summoning/familiar/Familiar.java
index b74f15e6b..636787050 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/Familiar.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/Familiar.java
@@ -27,7 +27,6 @@ import core.tools.Log;
import core.tools.RandomFunction;
import core.game.node.entity.combat.CombatPulse;
import core.game.node.entity.combat.CombatSwingHandler;
-import core.tools.SystemLogger;
import core.game.world.GameWorld;
import content.global.skill.summoning.SummoningPouch;
import org.rs09.consts.Sounds;
@@ -37,6 +36,8 @@ import java.util.List;
import static core.api.ContentAPIKt.*;
+import core.game.component.Component;
+
/**
* Represents a familiar.
* @author Emperor
@@ -81,7 +82,7 @@ public abstract class Familiar extends NPC implements Plugin {
/**
* The amount of special points left.
*/
- protected int specialPoints = 60;
+ protected int specialPoints = 0;
/**
* The pouch id.
@@ -120,7 +121,30 @@ public abstract class Familiar extends NPC implements Plugin {
*/
private final int attackStyle;
- private boolean firstCall = true;
+ /**
+ * The amount of points to drain every tick.
+ * This is a constant depending on the familiar's level req and time remaining (GL #1903).
+ * https://runescape.wiki/w/Summoning_points?oldid=2171795: "Over the life of the familiar, the number of summoning
+ * points drained will be equal to the level required to summon the familiar (unless you run out of summoning
+ * points). This means that if a player summons a bunyip with 75 Summoning points remaining, 7 points will be
+ * drained immediately, and 61 more will be drained over the life the bunyip, for a total of 68 points (the level of
+ * the bunyip)."
+ */
+ private final double pointsPerTick;
+
+ /**
+ * Keeps track of the fractional pointsPerTick that have been drained already. If >1.0, drain a point and subtract
+ * 1.0. Note that this means that we will never drain a point on the final tick (unless pointsPerTick turned out to
+ * be integer, but this case is handled by the 'ticks > 0' check in handleTickActions()). This is intentional; it
+ * allows us to, correctly, artificially extend the interval by one so that the drain events are evenly spaced
+ * throughout the lifetime of the summon (refer to the dreadfowl example below).
+ */
+ private double fracDrain = 0.0;
+
+ /**
+ * Whether this is the first call (i.e. not a renew summon).
+ */
+ private boolean firstCall = true;
/**
* Constructs a new {@code Familiar} {@code Object}.
@@ -141,6 +165,25 @@ public abstract class Familiar extends NPC implements Plugin {
this.specialCost = specialCost;
this.combatFamiliar = NPCDefinition.forId(getOriginalId() + 1).getName().equals(getName());
this.attackStyle = attackStyle;
+ /* The initial points are drained on summon. Then, the remaining points are drained over an interval.
+ * To prevent the last point from being drained only very late, we artificially extend the interval by one.
+ * Example: a dreadfowl drains 1 point on summon, and then needs to drain 3 points over 400 ticks. Naively
+ * draining a point on ticks 133, 266, and 399 allows players to save a point at the expense of just one tick.
+ * Instead, we drain on ticks 100, 200, and 300.
+ * Example 2: a spirit tz-kih drains 3 points on summon, then needs to drain 19 more points over 1800 ticks.
+ * This means it needs to drain a point every 90 ticks, since the 0th tick remaining will not drain.
+ * Example 3: a vampire bat needs to drain 27 points over 3300 ticks. It hence drains a point every ~118 ticks.
+ * Example 4: an abyssal titan drains 10 points on summon, then needs to drain 83 more points over 3200 ticks.
+ * This means it needs to drain a point every ~34 ticks.
+ */
+ if (pouchId == -1) {
+ this.pointsPerTick = 0.0;
+ } else {
+ //int drain = pouch.getLevelRequired() - pouch.getSummonCost() + 1;
+ // Snowscape: removing the initial drain and making it drain over the life of the familiar. Removing the +1 makes the final drain happen on the last tick of the familiar's life. That works for our new system.
+ int drain = pouch.getLevelRequired();
+ this.pointsPerTick = (double) drain / maximumTicks;
+ }
}
/**
@@ -176,17 +219,28 @@ public abstract class Familiar extends NPC implements Plugin {
transform();
}
}
-
- @Override
+
+ @Override
public void init() {
init(getSpawnLocation(), true);
}
@Override
public void handleTickActions() {
- if (ticks-- % 50 == 0) {
- updateSpecialPoints(-15);
+ //Snowscape: ticks are calculated from the summoning points (including fractional drain), so the familiar will despawn when points reach zero, but the timer goes up if points are restored
+ //ticks--;
+ ticks = Double.valueOf(maximumTicks*(owner.getSkills().getLevel(Skills.SUMMONING)-fracDrain)/pouch.getLevelRequired()).intValue();
+ if (getWorldTicks() % 100 == 0) {
+ owner.getSkills().addExperience(Skills.SUMMONING, pouch.getLevelRequired()+10, true);
+ }
+
+ fracDrain += pointsPerTick;
+ if (fracDrain > 1.0) {
+ fracDrain -= 1.0;
owner.getSkills().updateLevel(Skills.SUMMONING, -1, 0);
+ }
+ if (getWorldTicks() % 3 == 0) {
+ updateSpecialPoints(-1);
if (!getText().isEmpty()) {
super.sendChat(getText());
}
@@ -205,6 +259,7 @@ public abstract class Familiar extends NPC implements Plugin {
} else {
owner.getPacketDispatch().sendMessage("Your familiar has vanished.");
}
+ playAudio(owner, Sounds.PRAYER_DRAIN_2672);
dismiss();
return;
}
@@ -231,7 +286,7 @@ public abstract class Familiar extends NPC implements Plugin {
@Override
public boolean isAttackable(Entity entity, CombatStyle style, boolean message) {
if (entity == owner) {
- if(message) {
+ if (message) {
owner.getPacketDispatch().sendMessage("You can't just betray your own familiar like that!");
}
return false;
@@ -243,13 +298,13 @@ public abstract class Familiar extends NPC implements Plugin {
}
if (!getProperties().isMultiZone()) {
if (entity instanceof Player && !((Player) entity).getProperties().isMultiZone()) {
- if(message) {
+ if (message) {
((Player) entity).getPacketDispatch().sendMessage("You have to be in multicombat to attack a player's familiar.");
}
return false;
}
if (entity instanceof Player) {
- if(message) {
+ if (message) {
((Player) entity).getPacketDispatch().sendMessage("This familiar is not in the a multicombat zone.");
}
}
@@ -257,13 +312,13 @@ public abstract class Familiar extends NPC implements Plugin {
}
if (entity instanceof Player) {
if (!((Player) entity).getSkullManager().isWilderness()) {
- if(message) {
+ if (message) {
((Player) entity).getPacketDispatch().sendMessage("You have to be in the wilderness to attack a player's familiar.");
}
return false;
}
if (!owner.getSkullManager().isWilderness()) {
- if(message) {
+ if (message) {
((Player) entity).getPacketDispatch().sendMessage("This familiar's owner is not in the wilderness.");
}
return false;
@@ -340,8 +395,8 @@ public abstract class Familiar extends NPC implements Plugin {
private void sendTimeRemaining() {
int minutes = ticks / 100;
int centiminutes = ticks % 100;
- setVarbit(owner, 4534, minutes);
- setVarbit(owner, 4290, centiminutes > 49 ? 1 : 0);
+ setVarbit(owner, 4534, minutes);
+ setVarbit(owner, 4290, centiminutes > 49 ? 1 : 0);
}
/**
@@ -542,9 +597,9 @@ public abstract class Familiar extends NPC implements Plugin {
* Sends the familiar packets.
*/
public void sendConfiguration() {
- setVarp(owner, 448, getPouchId());
- setVarp(owner, 1174, getOriginalId());
- setVarp(owner, 1175, specialCost << 23);
+ setVarp(owner, 448, getPouchId());
+ setVarp(owner, 1174, getOriginalId());
+ setVarp(owner, 1175, specialCost << 23);
sendTimeRemaining();
updateSpecialPoints(0);
}
@@ -565,13 +620,13 @@ public abstract class Familiar extends NPC implements Plugin {
if (isInvisible()) return true;
getProperties().setTeleportLocation(destination);
if (!(this instanceof Pet)) {
- if(firstCall) {
+ if (firstCall) {
// TODO: Each familiar has its own initial summon sound that needs to be implemented at some point
- playAudio(owner, Sounds.SUMMON_NPC_188);
- firstCall = false;
- } else {
- playAudio(owner, Sounds.SUMMON_NPC_188);
- }
+ playAudio(owner, Sounds.SUMMON_NPC_188);
+ firstCall = false;
+ } else {
+ playAudio(owner, Sounds.SUMMON_NPC_188);
+ }
if (size() > 1) {
graphics(LARGE_SUMMON_GRAPHIC);
} else {
@@ -607,12 +662,13 @@ public abstract class Familiar extends NPC implements Plugin {
getPulseManager().clear();
owner.getInterfaceManager().removeTabs(7);
owner.getFamiliarManager().setFamiliar(null);
- setVarp(owner, 448, -1);
- setVarp(owner, 1176, 0);
- setVarp(owner, 1175, 182986);
- setVarp(owner, 1174, -1);
+ setVarp(owner, 448, -1);
+ setVarp(owner, 1176, 0);
+ setVarp(owner, 1175, 182986);
+ setVarp(owner, 1174, -1);
owner.getAppearance().sync();
- owner.getInterfaceManager().setViewedTab(3);
+ owner.getInterfaceManager().openTab(new Component(662));
+ owner.getInterfaceManager().setViewedTab(7);
}
/**
@@ -624,14 +680,14 @@ public abstract class Familiar extends NPC implements Plugin {
if (specialPoints > 60) {
specialPoints = 60;
}
- setVarp(owner, 1177, specialPoints);
+ setVarp(owner, 1177, specialPoints);
}
@Override
public Plugin newInstance(Object arg) throws Throwable {
for (int id : getIds()) {
if (FamiliarManager.getFamiliars().containsKey(id)) {
- log(this.getClass(), Log.ERR, "Familiar " + id + " was already registered!");
+ log(this.getClass(), Log.ERR, "Familiar " + id + " was already registered!");
return null;
}
FamiliarManager.getFamiliars().put(id, this);
diff --git a/Server/src/main/content/global/skill/summoning/familiar/FamiliarManager.java b/Server/src/main/content/global/skill/summoning/familiar/FamiliarManager.java
index f6a4b8f90..6b5064acb 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/FamiliarManager.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/FamiliarManager.java
@@ -4,7 +4,6 @@ import content.global.skill.summoning.pet.Pet;
import content.global.skill.summoning.pet.Pets;
import core.cache.def.impl.ItemDefinition;
import core.game.component.Component;
-import core.game.container.Container;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import core.game.node.entity.skill.Skills;
@@ -20,7 +19,6 @@ import core.game.world.update.flag.context.Animation;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import static core.api.ContentAPIKt.*;
@@ -38,9 +36,9 @@ public final class FamiliarManager {
private static final Map FAMILIARS = new HashMap<>();
/**
- * The pet details mapping, sorted by item id.
+ * The pet details mapping.
*/
- private final Map petDetails = new HashMap();
+ private final Map> petDetails = new HashMap<>();
/**
* The player.
@@ -70,50 +68,74 @@ public final class FamiliarManager {
this.player = player;
}
- public final void parse(JSONObject familiarData) {
+ public void parse(JSONObject familiarData) {
int currentPet = -1;
if (familiarData.containsKey("currentPet")) {
currentPet = Integer.parseInt(familiarData.get("currentPet").toString());
}
- JSONArray petDetails = (JSONArray) familiarData.get("petDetails");
- for (int i = 0; i < petDetails.size(); i++) {
- JSONObject detail = (JSONObject) petDetails.get(i);
- PetDetails details = new PetDetails(0);
- details.updateHunger(Double.parseDouble(detail.get("hunger").toString()));
- details.updateGrowth(Double.parseDouble(detail.get("growth").toString()));
- int itemIdHash = Integer.parseInt(detail.get("petId").toString());
- // The below is for migrating legacy saves, which stored baby item IDs + growth stages
- if (detail.containsKey("stage")) {
- // The "itemIdHash" is actually the baby item ID. The "stage" gives the actual pet stage we want.
- int babyItemId = itemIdHash;
- int itemId = babyItemId;
- int stage = Integer.parseInt(detail.get("stage").toString());
- if (stage > 0) {
- Pets pets = Pets.forId(babyItemId);
- itemId = pets.getNextStageItemId(itemId);
- if (stage > 1) {
- itemId = pets.getNextStageItemId(itemId);
+ if (player.version < 2) { //migrate the v1 format
+ for (Pets pet : Pets.values()) {
+ for (int id : new int[]{pet.getBabyItemId(), pet.getGrownItemId(), pet.getOvergrownItemId()}) {
+ if (id != -1) {
+ petDetails.put(id, new ArrayList());
}
}
- Item item = new Item(itemId);
- item.setCharge(1000); //this is the default value that will correspond to the player's item
- itemIdHash = item.getIdHash();
- if (currentPet != -1 && currentPet == babyItemId) {
- currentPet = itemIdHash;
+ }
+
+ JSONArray petDetails = (JSONArray) familiarData.get("petDetails");
+ for (Object petDetail : petDetails) {
+ JSONObject detail = (JSONObject) petDetail;
+ PetDetails details = new PetDetails(0);
+ details.updateHunger(Double.parseDouble(detail.get("hunger").toString()));
+ details.updateGrowth(Double.parseDouble(detail.get("growth").toString()));
+ int itemId;
+ int itemIdHash = Integer.parseInt(detail.get("petId").toString());
+ // The below is for migrating the v0 format, which stored baby item IDs + growth stages
+ if (detail.containsKey("stage")) {
+ // The itemIdHash is actually the baby item ID. The "stage" gives the actual pet stage we want.
+ int babyItemId = itemIdHash;
+ itemId = babyItemId;
+ int stage = Integer.parseInt(detail.get("stage").toString());
+ if (stage > 0) {
+ Pets pets = Pets.forId(babyItemId);
+ itemId = pets.getNextStageItemId(itemId);
+ if (stage > 1) {
+ itemId = pets.getNextStageItemId(itemId);
+ }
+ }
+ } else {
+ itemId = itemIdHash >> 16 & 0xFFFF; //in the legacy v1 format, was hash rather than item id
+ }
+ this.petDetails.get(itemId).add(details);
+ }
+ if (currentPet > 65536) {
+ currentPet = currentPet >> 16 & 0xFFFF; //in the legacy v1 format, was hash rather than item id
+ }
+ } else {
+ JSONObject petDetails = (JSONObject) familiarData.get("petDetails");
+ for (Object key : petDetails.keySet()) {
+ int itemId = Integer.parseInt(key.toString());
+ this.petDetails.put(itemId, new ArrayList<>());
+ JSONArray values = (JSONArray) petDetails.get(key.toString());
+ for (Object petDetail : values) {
+ JSONObject detail = (JSONObject) petDetail;
+ PetDetails details = new PetDetails(0);
+ details.updateHunger(Double.parseDouble(detail.get("hunger").toString()));
+ details.updateGrowth(Double.parseDouble(detail.get("growth").toString()));
+ this.petDetails.get(itemId).add(details);
}
}
- this.petDetails.put(itemIdHash, details);
}
-
if (currentPet != -1) {
- PetDetails details = this.petDetails.get(currentPet);
- int itemId = currentPet >> 16 & 0xFFFF;
- Pets pets = Pets.forId(itemId);
- if (details == null) {
- details = new PetDetails(pets.getGrowthRate() == 0.0 ? 100.0 : 0.0);
- this.petDetails.put(currentPet, details);
+ int last = this.petDetails.get(currentPet).size() - 1;
+ PetDetails details;
+ if (last < 0) { //missing data in save due to historical bug (see GL !2077)
+ details = new PetDetails(0);
+ } else {
+ details = this.petDetails.get(currentPet).get(last);
}
- familiar = new Pet(player, details, itemId, pets.getNpcId(itemId));
+ Pets pets = Pets.forId(currentPet);
+ familiar = new Pet(player, details, currentPet, pets.getNpcId(currentPet));
} else if (familiarData.containsKey("familiar")) {
JSONObject currentFamiliar = (JSONObject) familiarData.get("familiar");
int familiarId = Integer.parseInt( currentFamiliar.get("originalId").toString());
@@ -125,7 +147,13 @@ public final class FamiliarManager {
((BurdenBeast) familiar).container.parse(famInv);
}
familiar.setAttribute("hp",Integer.parseInt( currentFamiliar.get("lifepoints").toString()));
- }
+ } else {
+ //Snowscape: Copied from Familiar.dismiss(), this clears the fields on the summoning tab if no familiar is loaded
+ setVarp(player, 448, -1);
+ setVarp(player, 1176, 0);
+ setVarp(player, 1175, 182986);
+ setVarp(player, 1174, -1);
+ }
}
/**
@@ -147,12 +175,12 @@ public final class FamiliarManager {
public void summon(Item item, boolean pet, boolean deleteItem) {
boolean renew = false;
if (hasFamiliar()) {
- if(familiar.getPouchId() == item.getId()) {
- renew = true;
- } else {
+ //if (familiar.getPouchId() == item.getId()) {
+ // renew = true;
+ //} else {
player.getPacketDispatch().sendMessage("You already have a follower.");
return;
- }
+ //}
}
if (player.getZoneMonitor().isRestricted(ZoneRestriction.FOLLOWERS) && !player.getLocks().isLocked("enable_summoning")) {
player.getPacketDispatch().sendMessage("This is a Summoning-free area.");
@@ -170,17 +198,23 @@ public final class FamiliarManager {
player.getPacketDispatch().sendMessage("You need a Summoning level of " + pouch.getLevelRequired() + " to summon this familiar.");
return;
}
+ /* Snowscape: removing the drain on summon. This drain will instead be added to the gradual drain over the familiar's life.
if (player.getSkills().getLevel(Skills.SUMMONING) < pouch.getSummonCost()) {
player.getPacketDispatch().sendMessage("You need at least " + pouch.getSummonCost() + " Summoning points to summon this familiar.");
return;
}
+ */
+ if (player.getSkills().getLevel(Skills.SUMMONING) < 1) {
+ player.getPacketDispatch().sendMessage("You need at least one Summoning point to summon this familiar.");
+ return;
+ }
final int npcId = pouch.getNpcId();
Familiar fam = !renew ? FAMILIARS.get(npcId) : familiar;
if (fam == null) {
player.getPacketDispatch().sendMessage("Invalid familiar " + npcId + " - report on 2009Scape GitLab");
return;
}
- if(!renew) {
+ if (!renew) {
fam = fam.construct(player, npcId);
if (fam.getSpawnLocation() == null) {
player.getPacketDispatch().sendMessage("The spirit in this pouch is too big to summon here. You will need to move to a larger");
@@ -188,12 +222,12 @@ public final class FamiliarManager {
return;
}
}
- if (!player.getInventory().remove(item)) {
- return;
- }
- player.getSkills().updateLevel(Skills.SUMMONING, -pouch.getSummonCost(), 0);
- player.getSkills().addExperience(Skills.SUMMONING, pouch.getSummonExperience());
- if(!renew) {
+ //if (!player.getInventory().remove(item)) {
+ // return;
+ //}
+ //player.getSkills().updateLevel(Skills.SUMMONING, -pouch.getSummonCost(), 0);
+ //player.getSkills().addExperience(Skills.SUMMONING, pouch.getSummonExperience());
+ if (!renew) {
familiar = fam;
spawnFamiliar();
} else {
@@ -217,11 +251,10 @@ public final class FamiliarManager {
* @param deleteItem the item.
* @param location the location.
*/
- public void morphPet(final Item item, boolean deleteItem, Location location) {
- if (hasFamiliar()) {
- familiar.dismiss();
- }
- summonPet(item, deleteItem, true, location);
+ public void morphPet(final Item item, boolean deleteItem, Location location, double hunger, double growth) {
+ int hasWarned = ((Pet) familiar).getHasWarned();
+ familiar.dismiss();
+ summonPet(item, deleteItem, true, location, hasWarned, hunger, growth);
}
/**
@@ -230,7 +263,7 @@ public final class FamiliarManager {
* @param deleteItem the item.
*/
private boolean summonPet(final Item item, boolean deleteItem) {
- return summonPet(item, deleteItem, false, null);
+ return summonPet(item, deleteItem, false, null, 0, -1, -1);
}
/**
@@ -238,9 +271,8 @@ public final class FamiliarManager {
* @param item the item.
* @param morph the pet.
*/
- private boolean summonPet(final Item item, boolean deleteItem, boolean morph, Location location) {
+ private boolean summonPet(final Item item, boolean deleteItem, boolean morph, Location location, int hasWarned, double hunger, double growth) {
final int itemId = item.getId();
- int itemIdHash = item.getIdHash();
if (itemId > 8850 && itemId < 8900) {
return false;
}
@@ -252,52 +284,27 @@ public final class FamiliarManager {
player.getDialogueInterpreter().sendDialogue("You need a summoning level of " + pets.getSummoningLevel() + " to summon this.");
return false;
}
-
- // If this pet does not have an individual ID yet, we need to find it an available one.
- // If it does, we need to verify that this ID is not already used for a different pet. This is needed to correct a historical bug that allowed multiple pets to be assigned the same individual ID (the historical code only checked the *current* stage item ID, failing to realize that we also need to account for *future* stage item IDs, in case the current pet grows up, resulting in a clash when it did). Saves affected by that bug will have multiple copies of the same item pointing to the same pet, which we have an opportunity to rectify now.
- ArrayList taken = new ArrayList();
- Container[] searchSpace = {player.getInventory(), player.getBankPrimary(), player.getBankSecondary()};
- for (int checkId = pets.getBabyItemId(); checkId != -1; checkId = pets.getNextStageItemId(checkId)) {
- Item check = new Item(checkId, 1);
- for (Container container : searchSpace) {
- for (Item i : container.getAll(check)) {
- taken.add(i.getCharge());
- }
- }
+ if (!this.petDetails.containsKey(itemId)) {
+ petDetails.put(itemId, new ArrayList());
}
- PetDetails details = petDetails.get(itemIdHash);
- int individual = item.getCharge();
- if (details != null) { //we have this pet on file, but we need to check that it wasn't affected by the historical bug mentioned above
- details.setIndividual(individual);
- int count = 0;
- for (int i : taken) {
- if (i == individual) {
- count++;
- }
- }
- if (count > 1) { //this pet is sadly conjoined with another individual of its kind; untangle it by initializing it anew (which is what should have happened in the first place, save the minor detail of hunger propagation from the previous stage, which we no longer have any record of)
- details = null;
- }
- }
- if (details == null) { //init new pet
- details = new PetDetails(pets.getGrowthRate() == 0.0 ? 100.0 : 0.0);
- for (individual = 0; taken.contains(individual) && individual < 0xFFFF; individual++) {}
- details.setIndividual(individual);
- // Make a copy of the item to extract what the item's idHash will be when including the individual ID as a "charge" value.
- // The copy is necessary since the player's inventory still contains the default-charged item, which we will be removing only later.
- Item newItem = item.copy();
- newItem.setCharge(individual);
- petDetails.put(newItem.getIdHash(), details);
+ int last = this.petDetails.get(itemId).size() - 1;
+ if (last < 0) { //new pet
+ last = 0;
+ PetDetails details = new PetDetails(pets.getGrowthRate() == 0.0 ? 100.0 : 0.0);
+ this.petDetails.get(itemId).add(details);
}
+ PetDetails details = this.petDetails.get(itemId).get(last);
int npcId = pets.getNpcId(itemId);
if (npcId > 0) {
familiar = new Pet(player, details, itemId, npcId);
+ ((Pet) familiar).setHasWarned(hasWarned);
+ if (hunger != -1) ((Pet) familiar).getDetails().setHunger(hunger);
+ if (growth != -1) ((Pet) familiar).getDetails().setGrowth(growth);
if (deleteItem) {
player.animate(new Animation(827));
- // We cannot use player().getInventory().remove(item), because that will remove the first pet item it sees, rather than the specific one (with the specific charge value) the player clicked.
- // Instead, find the specific item the player dropped by slot, and remove that specific one.
- int slot = player.getInventory().getSlotHash(item);
- player.getInventory().remove(item, slot, true);
+ if (!player.getInventory().remove(item, true)) {
+ return false;
+ }
}
if (morph) {
morphFamiliar(location);
@@ -364,11 +371,7 @@ public final class FamiliarManager {
return;
}
Pet pet = ((Pet) familiar);
- PetDetails details = pet.getDetails();
- Item petItem = new Item(pet.getItemId());
- petItem.setCharge(details.getIndividual());
- if (player.getInventory().add(petItem)) {
- petDetails.put(pet.getItemIdHash(),details);
+ if (player.getInventory().add(new Item(pet.getItemId()))) {
player.animate(Animation.create(827));
player.getFamiliarManager().dismiss();
}
@@ -423,11 +426,26 @@ public final class FamiliarManager {
}
/**
- * Removes the details for this pet.
- * @param itemIdHash The item id hash of the pet.
+ * Adds pet details for a new pet to that pet's stack.
+ * @param itemId The item id of the pet.
+ * @param details The new pet details.
*/
- public void removeDetails(int itemIdHash) {
- petDetails.remove(itemIdHash);
+ public void addDetails(int itemId, PetDetails details) {
+ if (petDetails.get(itemId) == null) {
+ petDetails.put(itemId, new ArrayList<>());
+ }
+ petDetails.get(itemId).add(details);
+ }
+
+ /**
+ * Removes the details for this pet.
+ * @param itemId The item id of the pet.
+ */
+ public void removeDetails(int itemId) {
+ int last = petDetails.get(itemId).size() - 1;
+ if (last >= 0) {
+ petDetails.get(itemId).remove(last);
+ }
}
/**
@@ -521,7 +539,7 @@ public final class FamiliarManager {
}
- public Map getPetDetails() {
+ public Map> getPetDetails() {
return petDetails;
}
}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/HydraNPC.java b/Server/src/main/content/global/skill/summoning/familiar/HydraNPC.java
index 1cc985a30..04ba4c6bc 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/HydraNPC.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/HydraNPC.java
@@ -43,7 +43,7 @@ public class HydraNPC extends Familiar {
Scenery scenery = (Scenery)node;
FarmingPatch farmingPatch = FarmingPatch.forObject(scenery);
if(farmingPatch != null) {
- Patch patch = farmingPatch.getPatchFor(owner);
+ Patch patch = farmingPatch.getPatchFor(owner, true);
patch.regrowIfTreeStump();
return true;
}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/IbisNPC.java b/Server/src/main/content/global/skill/summoning/familiar/IbisNPC.java
index 43fc3702a..7e0c82d73 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/IbisNPC.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/IbisNPC.java
@@ -40,7 +40,7 @@ public class IbisNPC extends Forager {
* @param id The id.
*/
public IbisNPC(Player owner, int id) {
- super(owner, id, 3800, 12531, 12, new Item(361), new Item(373));
+ super(owner, id, 3800, 12531, 12, new Item(359), new Item(371));
boosts.add(new SkillBonus(Skills.FISHING, 3));
}
@@ -54,7 +54,7 @@ public class IbisNPC extends Forager {
@Override
public boolean produceItem(Item item) {
if (super.produceItem(item)) {
- if (item.getId() == 373) {
+ if (item.getId() == 371) {
owner.getSkills().addExperience(Skills.FISHING, 10);
}
return true;
diff --git a/Server/src/main/content/global/skill/summoning/familiar/KalphiteNPC.java b/Server/src/main/content/global/skill/summoning/familiar/KalphiteNPC.java
deleted file mode 100644
index 62b5020a0..000000000
--- a/Server/src/main/content/global/skill/summoning/familiar/KalphiteNPC.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package content.global.skill.summoning.familiar;
-
-import core.plugin.Initializable;
-import core.game.dialogue.DialoguePlugin;
-import core.game.dialogue.FacialExpression;
-import core.game.node.entity.npc.Metamorphosis;
-import core.game.node.entity.npc.NPC;
-import core.game.node.entity.player.Player;
-
-/**
- * Handles the kalphite princess pet.
- * @author Empathy
- *
- */
-@Initializable
-public class KalphiteNPC extends Metamorphosis {
-
- /**
- * The kalphite ids.
- */
- private static final int[] KALPHITE_IDS = new int[] { 8602, 8603 };
-
- /**
- * Constructs a new {@code KalphiteNPC} object.
- */
- public KalphiteNPC() {
- super(KALPHITE_IDS);
- }
-
-
- @Override
- public DialoguePlugin getDialoguePlugin() {
- return new KalphitePrincessDialogue();
- }
-
- /**
- * Handles the KalphitePrincess dialogue.
- * @author Empathy
- *
- */
- public final class KalphitePrincessDialogue extends DialoguePlugin {
-
- /**
- * Constructs a new {@code KalphitePrincessDialogue} {@code Object}.
- */
- public KalphitePrincessDialogue() {
- /**
- * empty.
- */
- }
-
- /**
- * Constructs a new {@code KalphitePrincessDialogue} {@code Object}.
- *
- * @param player the player.
- */
- public KalphitePrincessDialogue(Player player) {
- super(player);
- }
-
- @Override
- public DialoguePlugin newInstance(Player player) {
- return new KalphitePrincessDialogue(player);
- }
-
- @Override
- public boolean open(Object... args) {
- npc = (NPC) args[0];
- interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "What is it with your kind and potato cactus?");
- stage = 0;
- return true;
- }
-
- @Override
- public boolean handle(int interfaceId, int buttonId) {
- switch (stage) {
- case 0:
- interpreter.sendDialogues(npc, FacialExpression.OLD_NORMAL, "Truthfully?");
- stage = 1;
- break;
- case 1:
- interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Yeah, please.");
- stage = 2;
- break;
- case 2:
- interpreter.sendDialogues(npc, FacialExpression.OLD_NORMAL, "Soup. We make a fine soup with it.");
- stage = 3;
- break;
- case 3:
- interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Kalphites can cook?");
- stage = 4;
- break;
- case 4:
- interpreter.sendDialogues(npc, FacialExpression.OLD_NORMAL, "Nah, we just collect it and put it there because we", "know fools like yourself will come down looking for it", "then inevitably be killed by my mother.");
- stage = 5;
- break;
- case 5:
- interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Evidently not, that's how I got you!");
- stage = 6;
- break;
- case 6:
- interpreter.sendDialogues(npc, FacialExpression.OLD_NORMAL, "Touch�.");
- stage = 7;
- break;
- case 7:
- end();
- break;
- }
- return true;
- }
-
- @Override
- public int[] getIds() {
- return new int[] { 8602, 8603 };
- }
- }
-}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/PyreLordNPC.java b/Server/src/main/content/global/skill/summoning/familiar/PyreLordNPC.java
index c4672b643..1e96d0229 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/PyreLordNPC.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/PyreLordNPC.java
@@ -23,6 +23,8 @@ import core.game.world.update.flag.context.Animation;
import core.game.world.update.flag.context.Graphics;
import core.plugin.Plugin;
import core.plugin.ClassScanner;
+import org.rs09.consts.Items;
+import static core.api.ContentAPIKt.inInventory;
/**
* Represents the Pyrelord familiar.
@@ -117,30 +119,41 @@ public class PyreLordNPC extends Familiar {
player.getPacketDispatch().sendMessage("You can't light a fire here.");
return false;
}
- familiar.lock(ticks);
- familiar.animate(FIREMAKE_ANIMATION);
- if (player.getInventory().remove(event.getUsedItem())) {
- final GroundItem ground = GroundItemManager.create(event.getUsedItem(), familiar.getLocation(), player);
+ if (player.getSkills().getLevel(Skills.FIREMAKING) < log.getLevel()) {
+ player.getPacketDispatch().sendMessage("You need a firemaking level of " + log.getLevel() + " to light this log.");
+ return false;
+ }
+ familiar.lock(ticks);
+ familiar.animate(FIREMAKE_ANIMATION);
+ // Snowscape: reworked this pulse to repeat
GameWorld.getPulser().submit(new Pulse(ticks, player, familiar) {
@Override
public boolean pulse() {
- if (!ground.isActive()) {
- return true;
- }
- final Scenery object = new Scenery(log.getFireId(), familiar.getLocation());
- familiar.moveStep();
- GroundItemManager.destroy(ground);
- player.getSkills().addExperience(Skills.FIREMAKING, log.getXp() + 10);
- familiar.faceLocation(object.getFaceLocation(familiar.getLocation()));
- SceneryBuilder.add(object, log.getLife(), FireMakingPulse.getAsh(player, log, object));
- if (player.getViewport().getRegion().getId() == 10806) {
- player.getAchievementDiaryManager().finishTask(player, DiaryType.SEERS_VILLAGE, 1, 9);
- }
- return true;
+ if (player.getInventory().remove(event.getUsedItem())) {
+ //familiar.lock(ticks-1);
+ familiar.animate(FIREMAKE_ANIMATION);
+ //final GroundItem ground = GroundItemManager.create(event.getUsedItem(), familiar.getLocation(), player);
+ //if (!ground.isActive()) {
+ // return false;
+ //}
+ final Scenery object = new Scenery(log.getFireId(), familiar.getLocation());
+ //familiar.moveStep();
+ //GroundItemManager.destroy(ground);
+ player.getSkills().addExperience(Skills.FIREMAKING, log.getXp() + 10);
+ familiar.faceLocation(object.getFaceLocation(familiar.getLocation()));
+ SceneryBuilder.add(object, log.getLife(), FireMakingPulse.getAsh(player, log, object));
+ if (player.getViewport().getRegion().getId() == 10806) {
+ player.getAchievementDiaryManager().finishTask(player, DiaryType.SEERS_VILLAGE, 1, 9);
+ }
+ if (inInventory(player, Items.TINDERBOX_590, 1)) {
+ return false;
+ }
+ }
+ return true;
}
});
- }
return true;
+
}
}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/SnakelingNPC.java b/Server/src/main/content/global/skill/summoning/familiar/SnakelingNPC.java
deleted file mode 100644
index cd6372f62..000000000
--- a/Server/src/main/content/global/skill/summoning/familiar/SnakelingNPC.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package content.global.skill.summoning.familiar;
-
-import core.plugin.Initializable;
-import core.game.dialogue.DialoguePlugin;
-import core.game.dialogue.FacialExpression;
-import core.game.node.entity.npc.Metamorphosis;
-import core.game.node.entity.npc.NPC;
-import core.game.node.entity.player.Player;
-
-/**
- * Handles the metamorphosis of the zulrah pet.
- * @author Empathy
- *
- */
-@Initializable
-public class SnakelingNPC extends Metamorphosis {
-
- /**
- * The snakeling ids.
- */
- public static final int[] SNAKELING_IDS = new int[] { 8626, 8627, 8628 };
-
- /**
- *
- * Constructs a new {@code SnakelingNPC} object.
- */
- public SnakelingNPC() {
- super(SNAKELING_IDS);
- }
-
- @Override
- public DialoguePlugin getDialoguePlugin() {
- return new PetSnakelingDialogue();
- }
-
- /**
- * Handles the pet snakeling dialogue.
- * @author Empathy
- *
- */
- public final class PetSnakelingDialogue extends DialoguePlugin {
-
- /**
- * Constructs a new {@code PetSnakelingDialogue} {@code Object}.
- */
- public PetSnakelingDialogue() {
- /**
- * empty.
- */
- }
-
- /**
- * Constructs a new {@code PetSnakelingDialogue} {@code Object}.
- *
- * @param player the player.
- */
- public PetSnakelingDialogue(Player player) {
- super(player);
- }
-
- @Override
- public DialoguePlugin newInstance(Player player) {
- return new PetSnakelingDialogue(player);
- }
-
- @Override
- public boolean open(Object... args) {
- npc = (NPC) args[0];
- player("Hey little snake!");
- stage = 0;
- return true;
- }
-
- @Override
- public boolean handle(int interfaceId, int buttonId) {
- switch (stage) {
- case 0:
- npc(FacialExpression.OLD_NORMAL, "Soon, Zulrah shall establish dominion over this plane.");
- stage = 1;
- break;
- case 1:
- player("Wanna play fetch?");
- stage = 2;
- break;
- case 2:
- npc(FacialExpression.OLD_NORMAL, "Submit to the almighty Zulrah.");
- stage = 3;
- break;
- case 3:
- player("Walkies? Or slidies...?");
- stage = 4;
- break;
- case 4:
- npc(FacialExpression.OLD_NORMAL, "Zulrah's wilderness as a God will soon be demonstrated.");
- stage = 5;
- break;
- case 5:
- player("I give up...");
- stage = 6;
- break;
- case 6:
- end();
- break;
- }
- return true;
- }
-
- @Override
- public int[] getIds() {
- return SNAKELING_IDS;
- }
- }
-
-}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/SnowscapeFamiliarInterface.kt b/Server/src/main/content/global/skill/summoning/familiar/SnowscapeFamiliarInterface.kt
new file mode 100644
index 000000000..388b746a0
--- /dev/null
+++ b/Server/src/main/content/global/skill/summoning/familiar/SnowscapeFamiliarInterface.kt
@@ -0,0 +1,96 @@
+package content.global.skill.summoning.familiar
+
+import core.api.*
+import core.game.container.Container
+import content.global.skill.summoning.familiar.BurdenContainerListener
+//import core.game.node.Node
+import core.game.node.entity.player.Player
+import core.game.node.item.Item
+//import core.game.interaction.InteractionListener
+//import core.game.interaction.IntType
+//import org.json.simple.JSONArray
+//import org.json.simple.JSONObject
+//import org.json.simple.parser.JSONParser
+import org.rs09.consts.Items
+
+import core.game.component.Component
+import core.game.component.CloseEvent
+import core.game.container.access.InterfaceContainer
+
+/* Custom Snowscape class. Allows storing summoning pouches in a special storage that can be accessed by using the "call familiar" button when no familiars are summoned.
+* Familiars can be summoned from this storage.
+* Designed around the snowscape summoning rework, where pouches are not consumed when summoning
+*/
+
+class SnowscapeFamiliarInterface {
+ companion object {
+
+
+ //Function to handle constructing the interface
+ public fun openInterface(player: Player) {
+ val storage = player.summoningPouches
+ if (storage.getListeners().count() < 1) storage.register(BurdenContainerListener(player))
+
+ player.getInterfaceManager().open(Component(671)).setCloseEvent(CloseEvent { player, component ->
+ player.getInterfaceManager().closeSingleTab()
+ removeAttribute(player, "openSummonStorage")
+ //Summoning tab cannot be interacted with until it's closed and re-opened for some reason
+ player.getInterfaceManager().removeTabs(7)
+ player.getInterfaceManager().openTab(Component(662))
+ player.getInterfaceManager().setViewedTab(7)
+ return@CloseEvent true
+ }
+ )
+ setAttribute(player, "openSummonStorage", true)
+ storage.shift()
+ player.getInterfaceManager().openSingleTab(Component(665))
+ InterfaceContainer.generateItems(player, player.getInventory().toArray(), arrayOf("Add"),665,0,7,4,93)
+ InterfaceContainer.generateItems(player, storage.toArray(), arrayOf("Remove","Summon"),671,27,5,6,30)
+ }
+
+
+ fun interfaceAction(player: Player, component: Component, opcode: Int, button: Int, slot: Int, itemId: Int) {
+ val inventory = component.getId() == 665
+ val container = if (inventory) player.getInventory() else player.summoningPouches
+ val item = if (slot >= 0 && slot < container.capacity()) container.get(slot) else null
+ if (item == null && button != 29) return
+
+ if (opcode == 9) player.sendMessage(item!!.getDefinition().getExamine())
+
+ if (inventory) {
+ when (opcode) {
+ 155 -> addPouch(player, item!!)
+ }
+ } else {
+ when (opcode) {
+ 155 -> if (button != 29) summonPouch(player, item!!)
+ 196 -> removePouch(player, item!!)
+ }
+ }
+ }
+
+ private fun addPouch(player: Player, item: Item) {
+ if (!hasOption(item, "Summon")){
+ sendMessage(player, "You can only add summoning pouches.")
+ return
+ } else if (player.summoningPouches.containsItem(item)) {
+ sendMessage(player, "You have already added this familiar's pouch.")
+ return
+ } else if (player.summoningPouches.add(item)) {
+ player.getInventory().remove(item)
+ }
+ }
+
+ private fun removePouch(player: Player, item: Item) {
+ if (player.getInventory().add(item)) {
+ player.summoningPouches.remove(item)
+ }
+ }
+
+ private fun summonPouch(player: Player, item: Item) {
+ player.getInterfaceManager().close()
+ SummonFamiliarPlugin().handle(player, item, "summon")
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/skill/summoning/familiar/SpiritCobraNPC.java b/Server/src/main/content/global/skill/summoning/familiar/SpiritCobraNPC.java
index 83f1d21ae..18d4946b2 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/SpiritCobraNPC.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/SpiritCobraNPC.java
@@ -56,7 +56,7 @@ public class SpiritCobraNPC extends Familiar {
* @author Vexia
*/
public enum Egg {
- COCKATRICE(new Item(1944), new Item(12109)), SARATRICE(new Item(10533), new Item(12113)), ZAMATRICE(new Item(10532), new Item(12115)), GUTHATRICE(new Item(10531), new Item(12111)), CORACATRICE(new Item(11964), new Item(12119)), PENGATRICE(new Item(12483), new Item(12117)), VULATRICE(new Item(11695), new Item(12121));
+ COCKATRICE(new Item(1944), new Item(12109)), SARATRICE(new Item(5077), new Item(12113)), ZAMATRICE(new Item(5076), new Item(12115)), GUTHATRICE(new Item(5078), new Item(12111)), CORACATRICE(new Item(11964), new Item(12119)), PENGATRICE(new Item(12483), new Item(12117)), VULATRICE(new Item(11965), new Item(12121));
/**
* The egg item.
diff --git a/Server/src/main/content/global/skill/summoning/familiar/SpiritKalphiteNPC.java b/Server/src/main/content/global/skill/summoning/familiar/SpiritKalphiteNPC.java
index 3768df594..09a83505c 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/SpiritKalphiteNPC.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/SpiritKalphiteNPC.java
@@ -44,30 +44,31 @@ public class SpiritKalphiteNPC extends BurdenBeast {
@Override
protected boolean specialMove(FamiliarSpecial special) {
- if (!isOwnerAttackable()) {
- return false;
- }
- final List entitys = RegionManager.getLocalEntitys(owner, 6);
- visualize(Animation.create(8517), Graphics.create(1350));
- GameWorld.getPulser().submit(new Pulse(1, owner) {
- @Override
- public boolean pulse() {
- int count = 0;
- for (Entity entity : entitys) {
- if (count > 5) {
- return true;
- }
- if (!canCombatSpecial(entity)) {
- continue;
- }
- Projectile.magic(SpiritKalphiteNPC.this, entity, 1349, 40, 36, 50, 5).send();
- sendFamiliarHit(entity, 20);
- count++;
- }
- return true;
- }
- });
- return false;
+ return false; ///bodge this for now, until someone fixes this abomination.
+// if (!isOwnerAttackable()) {
+// return false;
+// }
+// final List entitys = RegionManager.getLocalEntitys(owner, 6);
+// visualize(Animation.create(8517), Graphics.create(1350));
+// GameWorld.getPulser().submit(new Pulse(1, owner) {
+// @Override
+// public boolean pulse() {
+// int count = 0;
+// for (Entity entity : entitys) {
+// if (count > 5) {
+// return true;
+// }
+// if (!canCombatSpecial(entity)) {
+// continue;
+// }
+// Projectile.magic(SpiritKalphiteNPC.this, entity, 1349, 40, 36, 50, 5).send();
+// sendFamiliarHit(entity, 20);
+// count++;
+// }
+// return true;
+// }
+// });
+// return false;
}
@Override
diff --git a/Server/src/main/content/global/skill/summoning/familiar/SummonFamiliarPlugin.java b/Server/src/main/content/global/skill/summoning/familiar/SummonFamiliarPlugin.java
index 8f6a407d8..ee216033e 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/SummonFamiliarPlugin.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/SummonFamiliarPlugin.java
@@ -9,6 +9,7 @@ import core.game.node.item.Item;
import core.game.world.map.zone.ZoneBorders;
import core.plugin.Initializable;
import core.plugin.Plugin;
+import content.data.Quests;
/**
* Handles summoning a familiar.
@@ -26,7 +27,7 @@ public final class SummonFamiliarPlugin extends OptionHandler {
@Override
public boolean handle(Player player, Node node, String option) {
Item item = (Item) node;
- if (!player.getQuestRepository().isComplete("Wolf Whistle") && player.getAttribute("in-cutscene", null) == null) {
+ if (!player.getQuestRepository().isComplete(Quests.WOLF_WHISTLE) && player.getAttribute("in-cutscene", null) == null) {
player.getPacketDispatch().sendMessage("You have to complete Wolf Whistle before you can summon a familiar.");
return true;
}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/VetionNPC.java b/Server/src/main/content/global/skill/summoning/familiar/VetionNPC.java
deleted file mode 100644
index f939260f2..000000000
--- a/Server/src/main/content/global/skill/summoning/familiar/VetionNPC.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package content.global.skill.summoning.familiar;
-
-import core.plugin.Initializable;
-import core.game.dialogue.DialoguePlugin;
-import core.game.node.entity.npc.Metamorphosis;
-
-/**
- * Handles the metamorphosis of Vet'ion Jr.
- * @author Empathy
- *
- */
-@Initializable
-public class VetionNPC extends Metamorphosis {
-
- /**
- * The Vet'ion Ids.
- */
- public static final int[] VETION_IDS = new int[] { 8600, 8654 };
-
- /**
- *
- * Constructs a new{@code VetionNPC} object.
- */
- public VetionNPC() {
- super(VETION_IDS);
- }
-
- @Override
- public DialoguePlugin getDialoguePlugin() {
- return null;
- }
-
-}
diff --git a/Server/src/main/content/global/skill/summoning/familiar/VoidFamiliarNPC.java b/Server/src/main/content/global/skill/summoning/familiar/VoidFamiliarNPC.java
index 4f8d3fab5..817b0501c 100644
--- a/Server/src/main/content/global/skill/summoning/familiar/VoidFamiliarNPC.java
+++ b/Server/src/main/content/global/skill/summoning/familiar/VoidFamiliarNPC.java
@@ -195,8 +195,9 @@ public final class VoidFamiliarNPC implements Plugin {
public void handleFamiliarTick() {
super.handleFamiliarTick();
if (healDelay < GameWorld.getTicks()) {
- getSkills().heal(1);
+ owner.getSkills().heal(1);
healDelay = GameWorld.getTicks() + 25;
+ owner.graphics(Graphics.create(1507), 1);
}
}
diff --git a/Server/src/main/content/global/skill/summoning/pet/IncubatorHandler.kt b/Server/src/main/content/global/skill/summoning/pet/IncubatorHandler.kt
index 79ef7c12d..edb11ca18 100644
--- a/Server/src/main/content/global/skill/summoning/pet/IncubatorHandler.kt
+++ b/Server/src/main/content/global/skill/summoning/pet/IncubatorHandler.kt
@@ -1,11 +1,8 @@
package content.global.skill.summoning.pet
import core.api.*
-import core.cache.def.impl.SceneryDefinition
import core.game.node.Node
import core.game.node.entity.player.Player
-import core.game.node.entity.skill.Skills
-import core.game.node.item.GroundItemManager
import core.game.interaction.*
import core.tools.StringUtils
diff --git a/Server/src/main/content/global/skill/summoning/pet/IncubatorTimer.kt b/Server/src/main/content/global/skill/summoning/pet/IncubatorTimer.kt
index 6395a79eb..899deee2a 100644
--- a/Server/src/main/content/global/skill/summoning/pet/IncubatorTimer.kt
+++ b/Server/src/main/content/global/skill/summoning/pet/IncubatorTimer.kt
@@ -42,6 +42,13 @@ class IncubatorTimer : PersistTimer (500, "incubation") {
root["eggs"] = arr
}
+ override fun onRegister(entity: Entity) {
+ if (entity !is Player) return
+ for ((region, _) in incubatingEggs) {
+ setVarbit(entity.asPlayer(), varbitForRegion(region), 1, true)
+ }
+ }
+
override fun run (entity: Entity) : Boolean {
if (entity !is Player) return false
for ((_, egg) in incubatingEggs) {
@@ -60,14 +67,14 @@ class IncubatorTimer : PersistTimer (500, "incubation") {
}
companion object {
- val TAVERLY_REGION = 11573
- val TAVERLY_VARBIT = 4277
+ val TAVERLEY_REGION = 11573
+ val TAVERLEY_VARBIT = 4277
val YANILLE_REGION = 10288
val YANILLE_VARBIT = 4221
fun varbitForRegion (region: Int) : Int {
return when (region) {
- TAVERLY_REGION -> TAVERLY_VARBIT
+ TAVERLEY_REGION -> TAVERLEY_VARBIT
YANILLE_REGION -> YANILLE_VARBIT
else -> -1
}
diff --git a/Server/src/main/content/global/skill/summoning/pet/KittenInteractDialogue.java b/Server/src/main/content/global/skill/summoning/pet/KittenInteractDialogue.java
index ebeb5b477..8925c4c42 100644
--- a/Server/src/main/content/global/skill/summoning/pet/KittenInteractDialogue.java
+++ b/Server/src/main/content/global/skill/summoning/pet/KittenInteractDialogue.java
@@ -117,8 +117,8 @@ public final class KittenInteractDialogue extends DialoguePlugin {
player.sendChat("Shoo cat!");
Pet currentPet = (Pet) player.getFamiliarManager().getFamiliar();
player.getFamiliarManager().getFamiliar().sendChat("Miaow!");
- player.getFamiliarManager().removeDetails(currentPet.getItemIdHash());
player.getFamiliarManager().getFamiliar().dismiss();
+ player.getFamiliarManager().removeDetails(currentPet.getItemId());
player.getPacketDispatch().sendMessage("The cat has run away.");
}
end();
diff --git a/Server/src/main/content/global/skill/summoning/pet/Pet.java b/Server/src/main/content/global/skill/summoning/pet/Pet.java
index e4812dac1..99048c140 100644
--- a/Server/src/main/content/global/skill/summoning/pet/Pet.java
+++ b/Server/src/main/content/global/skill/summoning/pet/Pet.java
@@ -30,7 +30,7 @@ public final class Pet extends Familiar {
/**
* The growth rate of the pet.
*/
- private double growthRate;
+ private final double growthRate;
/**
* The pets type.
@@ -86,8 +86,8 @@ public final class Pet extends Familiar {
hasWarned = 2;
}
if (hunger >= 100.0 && growthRate != 0 && pet.getFood().length != 0) {
- owner.getFamiliarManager().removeDetails(this.getItemIdHash());
owner.getFamiliarManager().dismiss();
+ owner.getFamiliarManager().removeDetails(getItemId());
owner.getFamiliarManager().setFamiliar(null);
setVarp(owner, 1175, 0);
owner.sendMessage("Your pet has run away.");
@@ -126,16 +126,13 @@ public final class Pet extends Familiar {
// then this pet is already overgrown
return;
}
- owner.getFamiliarManager().removeDetails(this.getItemIdHash());
- owner.getFamiliarManager().dismiss();
+ if (pet.isKitten(itemId)) {
+ owner.incrementAttribute("/save:stats_manager:cats_raised");
+ }
+ owner.getFamiliarManager().addDetails(newItemId, details);
+ owner.getFamiliarManager().removeDetails(getItemId());
+ owner.getFamiliarManager().morphPet(new Item(newItemId), false, location, details.getHunger(), 0);
owner.getPacketDispatch().sendMessage("Your pet has grown larger.");
- int npcId = pet.getNpcId(newItemId);
- details.updateGrowth(-100.0);
- Pet newPet = new Pet(owner, details, newItemId, npcId);
- newPet.growthRate = growthRate;
- newPet.hasWarned = hasWarned;
- owner.getFamiliarManager().setFamiliar(newPet);
- owner.getFamiliarManager().spawnFamiliar();
}
@Override
@@ -161,16 +158,6 @@ public final class Pet extends Familiar {
return itemId;
}
- /**
- * Gets the itemId with the individual hashed in.
- * @return The itemIdHash.
- */
- public int getItemIdHash() {
- Item item = new Item(itemId);
- item.setCharge(details.getIndividual());
- return item.getIdHash();
- }
-
/**
* Gets the details.
* @return The details.
@@ -187,9 +174,36 @@ public final class Pet extends Familiar {
return pet;
}
+ /**
+ * Gets the hunger level.
+ */
+ public double getHunger() {
+ return details.getHunger();
+ }
+
+ /**
+ * Gets the growth level.
+ */
+ public double getGrowth() {
+ return details.getGrowth();
+ }
+
+ /**
+ * Gets the hunger warning level.
+ */
+ public int getHasWarned() {
+ return hasWarned;
+ }
+
+ /**
+ * Sets the hunger warning level.
+ */
+ public void setHasWarned(int value) {
+ this.hasWarned = value;
+ }
+
@Override
public int[] getIds() {
return new int[] { 761, 762, 763, 764, 765, 766, 3505, 3598, 6969, 7259, 7260, 6964, 7249, 7251, 6960, 7241, 7243, 6962, 7245, 7247, 6966, 7253, 7255, 6958, 7237, 7239, 6915, 7277, 7278, 7279, 7280, 7018, 7019, 7020, 6908, 7313, 7316, 6947, 7293, 7295, 7297, 7299, 6911, 7261, 7263, 7265, 7267, 7269, 6919, 7301, 7303, 7305, 7307, 6949, 6952, 6955, 6913, 7271, 7273, 6945, 7319, 7321, 7323, 7325, 7327, 6922, 6942, 7210, 7212, 7214, 7216, 7218, 7220, 7222, 7224, 7226, 6900, 6902, 6904, 6906, 768, 769, 770, 771, 772, 773, 3504, 6968, 7257, 7258, 6965, 7250, 7252, 6961, 7242, 7244, 6963, 7246, 7248, 6967, 7254, 7256, 6859, 7238, 7240, 6916, 7281, 7282, 7283, 7284, 7015, 7016, 7017, 6909, 7314, 7317, 6948, 7294, 7296, 7298, 7300, 6912, 7262, 7264, 7266, 7268, 7270, 6920, 7302, 7304, 7306, 7308, 6950, 6953, 6956, 6914, 7272, 7274, 6946, 7320, 7322, 7324, 7326, 7328, 6923, 6943, 7211, 7213, 7215, 7217, 7219, 7221, 7223, 7225, 7227, 6901, 6903, 6905, 6907, 774, 775, 776, 777, 778, 779, 3503, 6951, 6954, 6957 };
}
-
}
diff --git a/Server/src/main/content/global/skill/summoning/pet/PetDetails.java b/Server/src/main/content/global/skill/summoning/pet/PetDetails.java
index b3e01c869..b3b0b8f05 100644
--- a/Server/src/main/content/global/skill/summoning/pet/PetDetails.java
+++ b/Server/src/main/content/global/skill/summoning/pet/PetDetails.java
@@ -19,11 +19,6 @@ public final class PetDetails {
*/
private double growth = 0.0;
- /**
- * The individual, an in principle arbitrary integer read off of the item's charge slot.
- */
- private int individual;
-
/**
* Constructs a new {@code PetDetails} {@code Object}.
* @param growth The growth value.
@@ -64,6 +59,13 @@ public final class PetDetails {
return hunger;
}
+ /**
+ * Sets the hunger. (You probably want to use updateHunger() instead.)
+ */
+ public void setHunger(double value) {
+ this.hunger = value;
+ }
+
/**
* Gets the growth.
* @return The growth.
@@ -73,18 +75,9 @@ public final class PetDetails {
}
/**
- * Sets the individual.
- * @param individual The individual to set.
+ * Sets the growth. (You probably want to use updateGrowth() instead.)
*/
- public void setIndividual(int individual) {
- this.individual = individual;
- }
-
- /**
- * Gets the individual.
- * @return The individual.
- */
- public int getIndividual() {
- return individual;
+ public void setGrowth(double value) {
+ this.growth = value;
}
}
diff --git a/Server/src/main/content/global/skill/summoning/pet/Pets.java b/Server/src/main/content/global/skill/summoning/pet/Pets.java
index 843075d28..263d04aef 100644
--- a/Server/src/main/content/global/skill/summoning/pet/Pets.java
+++ b/Server/src/main/content/global/skill/summoning/pet/Pets.java
@@ -18,7 +18,7 @@ public enum Pets {
/**
* A cat/kitten pet.
*/
- CAT(1555, 1561, 1567, 761, 768, 774, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_1(1556, 1562, 1568, 762, 769, 775, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_2(1557, 1563, 1569, 763, 770, 776, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_3(1558, 1564, 1570, 764, 771, 777, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_4(1559, 1565, 1571, 765, 772, 778, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_5(1560, 1566, 1572, 766, 773, 779, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), HELLCAT(7583, 7582, 7581, 3505, 3504, 3503, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_7(14089, 14090, 15092, 8217, 8214, 8216, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927),
+ CAT(1555, 1561, 1567, 761, 768, 774, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_1(1556, 1562, 1568, 762, 769, 775, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_2(1557, 1563, 1569, 763, 770, 776, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_3(1558, 1564, 1570, 764, 771, 777, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_4(1559, 1565, 1571, 765, 772, 778, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_5(1560, 1566, 1572, 766, 773, 779, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), HELLCAT(7583, 7582, 7581, 3505, 3504, 3503, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927), CAT_6(14089, 14090, 15092, 8217, 8214, 8216, 0.0154320987654321, 0, 321, 319, 363, 365, 341, 339, 15264, 345, 347, 377, 379, 353, 355, 389, 391, 7944, 7946, 349, 351, 331, 329, 327, 325, 395, 397, 383, 385, 317, 315, 371, 373, 335, 333, 359, 361, 15264, 15270, 1927),
/**
* A clockwork cat.
@@ -180,61 +180,6 @@ public enum Pets {
*/
BABY_DRAGON(12469, 12470, -1, 6900, 6901, -1, 0.0052, 99, 2132, 2134, 2136, 2138, 10816, 9986, 9978, 321, 363, 341, 15264, 345, 377, 353, 389, 7944, 349, 331, 327, 395, 383, 317, 371, 335, 359, 15264, 15270), BABY_DRAGON_1(12471, 12472, -1, 6902, 6903, -1, 0.0052, 99, 2132, 2134, 2136, 2138, 10816, 9986, 9978, 321, 363, 341, 15264, 345, 377, 353, 389, 7944, 349, 331, 327, 395, 383, 317, 371, 335, 359, 15264, 15270), BABY_DRAGON_2(12473, 12474, -1, 6904, 6905, -1, 0.0052, 99, 2132, 2134, 2136, 2138, 10816, 9986, 9978, 321, 363, 341, 15264, 345, 377, 353, 389, 7944, 349, 331, 327, 395, 383, 317, 371, 335, 359, 15264, 15270), BABY_DRAGON_3(12475, 12476, -1, 6906, 6907, -1, 0.0052, 99, 2132, 2134, 2136, 2138, 10816, 9986, 9978, 321, 363, 341, 15264, 345, 377, 353, 389, 7944, 349, 331, 327, 395, 383, 317, 371, 335, 359, 15264, 15270);
-
-// /**
-// * Emperor's pets (that's right, MY pet"S").
-// */
-// GIANT_WOLPERTINGER(8888, -1, -1, 6990, -1, -1, 0.0, 99), DRAKAN(8889, -1, -1, 4794, -1, -1, 0.0, 99), DILL(8890, -1, -1, 7770, -1, -1, 0.0, 99),
-
-// /**
-// * Vexias pet.
-// */
-// IMP(9952, -1, -1, 1531, -1, -1, 0.0, 99), BIG_GUY(9951, -1, -1, 3101, -1, -1, 0.0, 99), LITTLE_GUY(8887, -1, -1, 5805, -1, -1, 0.0, 99),
-//
-// /**
-// * Godwars boss pets.
-// */
-// KRIL_JR(14648, -1, -1, 8591, -1, -1, 0.0, 1), KREE_JR(14645, -1, -1, 8592, -1, -1, 0.0, 1), ZILYANA_JR(14647, -1, -1, 8593, -1, -1, 0.0, 1), GRAARDOOR_JR(14646, -1, -1, 8594, -1, -1, 0.0, 1),
-//
-// /**
-// * Classic boss pets.
-// */
-// CHAOS_ELE_JR(14638, -1, -1, 8595, -1, -1, 0.0, 1), PRINCE_BLACK_DRAGON(14649, -1, -1, 8596, -1, -1, 0.0, 1), BABY_MOLE(14642, -1, -1, 8601, -1, -1, 0.0, 1), KQ_FORM_1(14643, -1, -1, 8602, -1, -1, 0.0, 1), KQ_FORM_2(14650, -1, -1, 8603, -1, -1, 0.0, 1), DARK_CORE(14653, -1, -1, 8630, -1, -1, 0.0, 1),
-//
-// /**
-// * The boss pets for the Dagannoths
-// */
-// DAGANNOTH_SUPREME(14639, -1, -1, 8605, -1, -1, 0.0, 1), DAGANNOTH_PRIME(14640, -1, -1, 8606, -1, -1, 0.0, 1), DAGANNOTH_REX(14641, -1, -1, 8607, -1, -1, 0.0, 1),
-// /**
-// * The new OSRS bosses.
-// */
-// CALLISTO_CUB(14658, -1, -1, 8597, -1, -1, 0.0, 1),
-// SCORPIA_JR(14661, -1, -1, 8598, -1, -1, 0.0, 1),
-// VENENATIS_JR(14657, -1, -1, 8654, -1, -1, 0.0, 1),
-// VETION_JR(14659, -1, -1, 8600, -1, -1, 0.0, 1),
-// VETION_JR_2(14660, -1, -1, 8654, -1, -1, 0.0, 1),
-// RELEASE_THE_KRAKEN(14651, -1, -1, 8608, -1, -1, 0.0, 1),
-// SMOKE_DEVIL(14644, -1, -1, 8609, -1, -1, 0.0, 1),
-// SNAKELING_YELLOW(14654, -1, -1, 8626, -1, -1, 0.0, 1),
-// SNAKELING_ORANGE(14655, -1, -1, 8627, -1, -1, 0.0, 1),
-// SNAKELING_PURPLE(14656, -1, -1, 8628, -1, -1, 0.0, 1),
-// /**
-// * The boss pet representing the likeness of the Penance Queen
-// */
-// DRAMA_QUEEN(14652, -1, -1, 8604, -1, -1, 0.0, 1),
-// /**
-// * The skilling pets
-// */
-// BEAVER(14821, -1, -1, 8635, -1, -1, 0.0, 1),
-// ROCK_GOLEM(14822, -1, -1, 8637, -1, -1, 0.0, 1),
-// BABY_RED_CHINCHOMPA(14823, -1, -1, 8643, -1, -1, 0.0, 1),
-// BABY_GREY_CHINCHOMPA(14824, -1, -1, 8644, -1, -1, 0.0, 1),
-// BABY_BLACK_CHINCHOMPA(14825, -1, -1, 8657, -1, -1, 0.0, 1),
-// BABY_GOLD_CHINCHOMPA(14826, -1, -1, 8658, -1, -1, 0.0, 1),
-// HERON(14827, -1, -1, 8647, -1, -1, 0.0, 1),
-// TZREK_JAD(14828, -1, -1, 8650, -1, -1, 0.0, 1);
-
-
/**
* The baby pets mapping.
*/
@@ -481,4 +426,24 @@ public enum Pets {
}
return -1;
}
-}
\ No newline at end of file
+
+ /**
+ * Checks if this pet is a kitten
+ * @return a boolean, true if the pet is a kitten
+ */
+ public boolean isKitten(int id) {
+ switch (this) {
+ case CAT:
+ case CAT_1:
+ case CAT_2:
+ case CAT_3:
+ case CAT_4:
+ case CAT_5:
+ case CAT_6:
+ case HELLCAT:
+ return id == babyItemId;
+ default:
+ return false;
+ }
+ }
+}
diff --git a/Server/src/main/content/global/skill/thieving/Pickpockets.kt b/Server/src/main/content/global/skill/thieving/Pickpockets.kt
index 4580f2518..e4c1eda77 100644
--- a/Server/src/main/content/global/skill/thieving/Pickpockets.kt
+++ b/Server/src/main/content/global/skill/thieving/Pickpockets.kt
@@ -122,6 +122,7 @@ enum class Pickpockets(val ids: IntArray, val requiredLevel: Int, val low: Doubl
WeightedItem(Items.TARROMIN_SEED_5293,1,1,50.0),
WeightedItem(Items.HARRALANDER_SEED_5294,1,1,25.0),
WeightedItem(Items.RANARR_SEED_5295,1,1,8.0),
+ WeightedItem(Items.SPIRIT_WEED_SEED_12176,1,1,8.0),
WeightedItem(Items.TOADFLAX_SEED_5296,1,1,8.0),
WeightedItem(Items.IRIT_SEED_5297,1,1,8.0),
WeightedItem(Items.AVANTOE_SEED_5298,1,1,8.0),
diff --git a/Server/src/main/content/global/skill/thieving/StallThiefPulse.java b/Server/src/main/content/global/skill/thieving/StallThiefPulse.java
index 280f2cdcb..b08185335 100644
--- a/Server/src/main/content/global/skill/thieving/StallThiefPulse.java
+++ b/Server/src/main/content/global/skill/thieving/StallThiefPulse.java
@@ -10,14 +10,13 @@ import core.game.node.item.Item;
import core.game.node.scenery.Scenery;
import core.game.node.scenery.SceneryBuilder;
import core.game.world.GameWorld;
-import core.game.world.map.Direction;
-import core.game.world.map.Location;
import core.game.world.map.RegionManager;
import core.game.world.update.flag.context.Animation;
import core.tools.RandomFunction;
import core.tools.StringUtils;
import static core.api.ContentAPIKt.*;
+import content.data.Quests;
/**
* Represents the pulse used to thieve a stall.
@@ -74,12 +73,12 @@ public final class StallThiefPulse extends SkillPulse {
player.getPacketDispatch().sendMessage("You don't have enough inventory space.");
return false;
}
- if (player.getLocation().isInRegion(10553) && !isQuestComplete(player, "Fremennik Trials") && stall.full_ids.contains(4278)) {
+ if (player.getLocation().isInRegion(10553) && !isQuestComplete(player, Quests.THE_FREMENNIK_TRIALS) && stall.full_ids.contains(4278)) {
sendDialogue(player, "The fur trader is staring at you suspiciously. You cannot steal from his stall while he distrusts you.");
return false;
}
- if (player.getLocation().isInRegion(10553) && !isQuestComplete(player, "Fremennik Trials") && stall.full_ids.contains(4277)) {
+ if (player.getLocation().isInRegion(10553) && !isQuestComplete(player, Quests.THE_FREMENNIK_TRIALS) && stall.full_ids.contains(4277)) {
sendDialogue(player, "The fishmonger is staring at you suspiciously. You cannot steal from his stall while he distrusts you.");
return false;
}
diff --git a/Server/src/main/content/global/skill/thieving/ThievingListeners.kt b/Server/src/main/content/global/skill/thieving/ThievingListeners.kt
index d6123fcda..c01ef2e6c 100644
--- a/Server/src/main/content/global/skill/thieving/ThievingListeners.kt
+++ b/Server/src/main/content/global/skill/thieving/ThievingListeners.kt
@@ -15,6 +15,9 @@ import core.game.node.entity.player.Player
import core.game.node.item.Item
import org.rs09.consts.Sounds
+import core.game.interaction.InteractionListeners
+import core.game.world.GameWorld
+
class ThievingListeners : InteractionListener {
companion object {
@@ -64,6 +67,9 @@ class ThievingListeners : InteractionListener {
player.sendMessage("You don't have enough inventory space to do that.")
return@on true
}
+
+ //Custom portion. Repeat pickpocket, only proceed if it has been long enough since the last pickpocket action
+ if (getAttribute(player, "pickpockettick", 0) <= GameWorld.ticks) {
player.animator.animate(PICKPOCKET_ANIM)
val lootTable = pickpocketRoll(player, pickpocketData.low, pickpocketData.high, pickpocketData.table)
@@ -73,18 +79,28 @@ class ThievingListeners : InteractionListener {
playHurtAudio(player, 20)
- stun(player, pickpocketData.stunTime)
+ //stun(player, pickpocketData.stunTime)
+ stun(player, 0)
+ setAttribute(player, "pickpockettick", GameWorld.ticks + pickpocketData.stunTime)
player.impactHandler.manualHit(node.asNpc(),RandomFunction.random(pickpocketData.stunDamageMin,pickpocketData.stunDamageMax),ImpactHandler.HitsplatType.NORMAL)
node.asNpc().face(null)
} else {
playAudio(player, Sounds.PICK_2581)
- player.lock(2)
+ //player.lock(2)
+ setAttribute(player, "pickpockettick", GameWorld.ticks + 2)
lootTable.forEach { player.inventory.add(it) }
player.skills.addExperience(Skills.THIEVING,pickpocketData.experience)
}
-
+ }
+ //pickpocket again.
+ if (player.skills.lifepoints > pickpocketData.stunDamageMax) {
+ InteractionListeners.run(node.id, IntType.NPC,"Pickpocket",player,node)
+ } else {
+ player.sendMessage("It's probably not a good idea to continue with your injuries.")
+ }
+
return@on true
}
}
diff --git a/Server/src/main/content/global/travel/glider/CaptainDalburDialogue.java b/Server/src/main/content/global/travel/glider/CaptainDalburDialogue.java
index 3af68e890..67f0cbaa0 100644
--- a/Server/src/main/content/global/travel/glider/CaptainDalburDialogue.java
+++ b/Server/src/main/content/global/travel/glider/CaptainDalburDialogue.java
@@ -1,6 +1,6 @@
package content.global.travel.glider;
-import content.region.kandarin.quest.grandtree.TheGrandTree;
+import content.data.Quests;
import core.game.component.Component;
import core.game.dialogue.DialoguePlugin;
import core.game.dialogue.FacialExpression;
@@ -58,7 +58,7 @@ public final class CaptainDalburDialogue extends DialoguePlugin {
stage = 1;
break;
case 1:
- if(!isQuestComplete(player, TheGrandTree.questName)){
+ if(!isQuestComplete(player, Quests.THE_GRAND_TREE)){
interpreter.sendDialogues(npc, FacialExpression.ANNOYED, "I only fly friends of the gnomes!");
stage = END_DIALOGUE;
}
diff --git a/Server/src/main/content/global/travel/glider/GliderPlugin.java b/Server/src/main/content/global/travel/glider/GliderPlugin.java
index c62e404d9..b3cbe634c 100644
--- a/Server/src/main/content/global/travel/glider/GliderPlugin.java
+++ b/Server/src/main/content/global/travel/glider/GliderPlugin.java
@@ -1,6 +1,6 @@
package content.global.travel.glider;
-import content.region.kandarin.quest.grandtree.TheGrandTree;
+import content.data.Quests;
import core.api.ContentAPIKt;
import core.cache.def.impl.NPCDefinition;
import core.game.component.Component;
@@ -31,7 +31,7 @@ public final class GliderPlugin extends OptionHandler {
@Override
public boolean handle(Player player, Node node, String option) {
- if(isQuestComplete(player, TheGrandTree.questName)){
+ if(isQuestComplete(player, Quests.THE_GRAND_TREE)){
player.getInterfaceManager().open(new Component(138));
Gliders.sendConfig(node.asNpc(), player);
} else {
diff --git a/Server/src/main/content/global/travel/ship/SeamanDialoguePlugin.java b/Server/src/main/content/global/travel/ship/SeamanDialoguePlugin.java
index f7782c200..41b226d36 100644
--- a/Server/src/main/content/global/travel/ship/SeamanDialoguePlugin.java
+++ b/Server/src/main/content/global/travel/ship/SeamanDialoguePlugin.java
@@ -11,6 +11,7 @@ import core.game.node.entity.player.link.diary.DiaryType;
import core.game.node.item.Item;
import static core.api.ContentAPIKt.*;
+import content.data.Quests;
/**
* Represents the dialogue used to handle the sailing from and to karamja.
@@ -46,7 +47,7 @@ public class SeamanDialoguePlugin extends DialoguePlugin {
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
- if (args.length > 1 && player.getQuestRepository().isComplete("Pirate's Treasure")) {
+ if (args.length > 1 && player.getQuestRepository().isComplete(Quests.PIRATES_TREASURE)) {
if (player.getEquipment().get(EquipmentContainer.SLOT_RING) != null && player.getEquipment().get(EquipmentContainer.SLOT_RING).getId() == Items.RING_OF_CHAROSA_6465) {
travel();
} else if (player.getAchievementDiaryManager().getDiary(DiaryType.KARAMJA).isComplete(0)) {
diff --git a/Server/src/main/content/global/travel/ship/ShipCharter.java b/Server/src/main/content/global/travel/ship/ShipCharter.java
index 99121e375..9e04a8878 100644
--- a/Server/src/main/content/global/travel/ship/ShipCharter.java
+++ b/Server/src/main/content/global/travel/ship/ShipCharter.java
@@ -17,6 +17,7 @@ import java.util.ArrayList;
import java.util.List;
import static core.api.ContentAPIKt.*;
+import content.data.Quests;
/**
* Represents a class used to charter ships.
@@ -84,7 +85,10 @@ public final class ShipCharter {
*/
public static int getCost(final Player player, Destination destination) {
int cost = destination.getCost(player, destination);
- if (player.getEquipment().containsItem(RING_OF_CHAROS)) {// TODO: cabin fever quest
+ if (player.getQuestRepository().isComplete(Quests.CABIN_FEVER)) {
+ cost -= Math.round((cost / 2.));
+ }
+ if (player.getEquipment().containsItem(RING_OF_CHAROS)) {
cost -= Math.round((cost / 2.));
}
return cost;
@@ -96,12 +100,10 @@ public final class ShipCharter {
* @return the hidden childs.
*/
public static int[] getHiddenComponents(final Player player, Destination base) {
- final Destination[] restrictions = new Destination[] { /**
- *
- * Destination.MOS_LE_HARMLESS,
- */
- Destination.OO_GLOG, Destination.SHIPYARD, /* Destination.PORT_TYRAS, */
- Destination.CRANDOR };
+ final Destination[] restrictions = new Destination[] { /* Destination.MOS_LE_HARMLESS, */
+ Destination.OO_GLOG, Destination.SHIPYARD, /* Destination.PORT_TYRAS, */
+ Destination.CRANDOR
+ };
List childs = new ArrayList<>(20);
for (Destination destination : restrictions) {
childs.add(destination.getXChild());
@@ -141,10 +143,15 @@ public final class ShipCharter {
PORT_PHASMATYS(Location.create(3705, 3503, 1), 24, new int[] { 3650, 3250, 1850, 0, 0, 0, 2050, 1850, 3200, 1100 }, Location.create(3702, 3502, 0), 2, 13) {
@Override
public boolean checkTravel(Player player) {
- return requireQuest(player, "Priest in Peril", "to go there");
+ return requireQuest(player, Quests.PRIEST_IN_PERIL, "to go there.");
+ }
+ },
+ CRANDOR(Location.create(2792, 3417, 1), 32, new int[] { 0, 480, 480, 925, 400, 3650, 1600, 400, 3200, 3800 }, null, 10, 21) {
+ @Override
+ public boolean checkTravel(Player player) {
+ return requireQuest(player, Quests.DRAGON_SLAYER, "to go there.");
}
},
- CRANDOR(new Location(2792, 3417, 1), 32, new int[] { 0, 480, 480, 925, 400, 3650, 1600, 400, 3200, 3800 }, null, 10, 21),
BRIMHAVEN(Location.create(2763, 3238, 1), 28, new int[] { 0, 480, 480, 925, 400, 3650, 1600, 400, 3200, 3800 }, Location.create(2760, 3238, 0), 6, 17){
@Override
public int getCost(Player player, Destination destination) {
@@ -161,7 +168,13 @@ public final class ShipCharter {
return super.getCost(player, destination);
}
},
- PORT_TYRAS(Location.create(2142, 3122, 0), 23, new int[] { 3200, 3200, 3200, 1600, 3200, 3200, 3200, 3200, 0, 3200 }, Location.create(2143, 3122, 0), 1, 12),
+ PORT_TYRAS(Location.create(2142, 3122, 0), 23, new int[] { 3200, 3200, 3200, 1600, 3200, 3200, 3200, 3200, 0, 3200 }, Location.create(2143, 3122, 0), 1, 12) {
+ @Override
+ public boolean checkTravel(Player player) {
+ return hasRequirement(player, Quests.REGICIDE);
+ }
+
+ },
KARAMJA(Location.create(2957, 3158, 1), 27, new int[] { 200, 480, 0, 225, 400, 1850, 0, 200, 3200, 2000 }, Location.create(2954, 3156, 0), 5, 16) {
@Override
public int getCost(Player player, Destination destination) {
@@ -178,9 +191,19 @@ public final class ShipCharter {
return super.getCost(player, destination);
}
},
- SHIPYARD(Location.create(3001, 3032, 0), 26, new int[] { 400, 1600, 200, 225, 720, 1850, 400, 0, 3200, 900 }, Location.create(3001, 3032, 0), 4, 15),
+ SHIPYARD(Location.create(3001, 3032, 0), 26, new int[] { 400, 1600, 200, 225, 720, 1850, 400, 0, 3200, 900 }, Location.create(3001, 3032, 0), 4, 15) {
+ @Override
+ public boolean checkTravel(Player player) {
+ return requireQuest(player, Quests.THE_GRAND_TREE, "to go there.");
+ }
+ },
OO_GLOG(Location.create(2623, 2857, 0), 33, new int[] { 300, 3400, 2000, 550, 5000, 2800, 1400, 900, 3200, 0}, Location.create(2622, 2857, 0), 11, 22),
- MOS_LE_HARMLESS(Location.create(3671, 2931, 0), 31, new int[] { 725, 625, 1025, 0, 1025, 0, 325, 275, 1600, 500 }, Location.create(3671, 2933, 0), 9, 20);
+ MOS_LE_HARMLESS(Location.create(3671, 2931, 0), 31, new int[] { 725, 625, 1025, 0, 1025, 0, 325, 275, 1600, 500 }, Location.create(3671, 2933, 0), 9, 20) {
+ @Override
+ public boolean checkTravel(Player player) {
+ return hasRequirement(player, Quests.CABIN_FEVER);
+ }
+ };
/**
* Constructs a new {@code ShipCharter} {@code Object}.
diff --git a/Server/src/main/content/global/travel/trees/GnomeSpiritTreeListener.kt b/Server/src/main/content/global/travel/trees/GnomeSpiritTreeListener.kt
index 494a79e12..838473c20 100644
--- a/Server/src/main/content/global/travel/trees/GnomeSpiritTreeListener.kt
+++ b/Server/src/main/content/global/travel/trees/GnomeSpiritTreeListener.kt
@@ -12,12 +12,12 @@ import core.game.world.map.Location
import core.game.world.update.flag.context.Animation
import core.game.world.update.flag.context.Graphics
import org.rs09.consts.NPCs
-import content.region.kandarin.quest.tree.TreeGnomeVillage
import core.game.dialogue.DialogueFile
import core.game.interaction.InteractionListener
import core.game.interaction.IntType
import core.game.world.GameWorld.Pulser
import core.tools.END_DIALOGUE
+import content.data.Quests
class GnomeSpiritTreeListener: InteractionListener {
val spiritTrees = intArrayOf(1317,1293,1294)
@@ -46,7 +46,7 @@ class GnomeSpiritTreeTeleportDialogue: DialogueFile() {
private val GRAPHICS = arrayOf(Graphics(1228), Graphics(1229))
fun hasQuestCompleted(player: Player): Boolean {
- if (!isQuestComplete(player, TreeGnomeVillage.questName)) {
+ if (!isQuestComplete(player, Quests.TREE_GNOME_VILLAGE)) {
sendDialogue(player, "The tree doesn't feel like talking.")
stage = END_DIALOGUE
return false
diff --git a/Server/src/main/content/minigame/allfiredup/AFUBeaconHandler.kt b/Server/src/main/content/minigame/allfiredup/AFUBeaconHandler.kt
index 08d059bcf..cd50cb9bf 100644
--- a/Server/src/main/content/minigame/allfiredup/AFUBeaconHandler.kt
+++ b/Server/src/main/content/minigame/allfiredup/AFUBeaconHandler.kt
@@ -10,6 +10,7 @@ import org.rs09.consts.Items
import core.game.interaction.InteractionListener
import core.game.interaction.IntType
import core.game.world.GameWorld
+import content.data.Quests
private val VALID_LOGS = intArrayOf(Items.LOGS_1511, Items.OAK_LOGS_1521,Items.WILLOW_LOGS_1519,Items.MAPLE_LOGS_1517,Items.YEW_LOGS_1515,Items.MAGIC_LOGS_1513)
private val FILL_ANIM = Animation(9136)
@@ -24,8 +25,8 @@ class AFUBeaconListeners : InteractionListener {
override fun defineListeners() {
on(IntType.SCENERY,"add-logs","light"){ player, node ->
val beacon = AFUBeacon.forLocation(node.location)
- val questComplete = player.questRepository.isComplete("All Fired Up")
- val questStage = player.questRepository.getStage("All Fired Up")
+ val questComplete = player.questRepository.isComplete(Quests.ALL_FIRED_UP)
+ val questStage = player.questRepository.getStage(Quests.ALL_FIRED_UP)
if ((beacon != AFUBeacon.RIVER_SALVE && beacon != AFUBeacon.RAG_AND_BONE && !questComplete)
|| (beacon == AFUBeacon.RIVER_SALVE && questStage < 20 && !questComplete)
@@ -68,7 +69,7 @@ class AFUBeaconListeners : InteractionListener {
}
AFUBeacon.GOBLIN_VILLAGE -> {
- if(!player.questRepository.isComplete("Lost Tribe")){
+ if(!player.questRepository.isComplete(Quests.THE_LOST_TRIBE)){
player.dialogueInterpreter.sendDialogues(NPC(beacon.keeper).getShownNPC(player), core.game.dialogue.FacialExpression.THINKING,"We no trust you outsider. You no light our beacon.","(Complete Lost Tribe to use this beacon.)")
return
}
@@ -151,7 +152,7 @@ class AFUBeaconListeners : InteractionListener {
experience += session?.getBonusExperience() ?: 0.0
player.skills.addExperience(Skills.FIREMAKING,experience)
} else {
- player.questRepository.getQuest("All Fired Up").setStage(player, player.questRepository.getStage("All Fired Up") + 10)
+ player.questRepository.getQuest(Quests.ALL_FIRED_UP).setStage(player, player.questRepository.getStage(Quests.ALL_FIRED_UP) + 10)
}
}
2 -> player.unlock().also { return true }
@@ -183,7 +184,7 @@ class AFUBeaconListeners : InteractionListener {
if(questComplete){
session?.refreshTimer(beacon,logs.id)
} else {
- player.questRepository.getQuest("All Fired Up").setStage(player, 80)
+ player.questRepository.getQuest(Quests.ALL_FIRED_UP).setStage(player, 80)
}
}
2 -> player.unlock().also { return true }
diff --git a/Server/src/main/content/minigame/allfiredup/AFURepairClimbHandler.kt b/Server/src/main/content/minigame/allfiredup/AFURepairClimbHandler.kt
index ac6017994..f95dfb1d9 100644
--- a/Server/src/main/content/minigame/allfiredup/AFURepairClimbHandler.kt
+++ b/Server/src/main/content/minigame/allfiredup/AFURepairClimbHandler.kt
@@ -1,5 +1,6 @@
package content.minigame.allfiredup
+import content.data.Quests
import core.game.node.entity.impl.ForceMovement
import core.game.node.entity.player.Player
import core.game.node.entity.skill.Skills
@@ -26,27 +27,74 @@ class AFURepairClimbHandler : InteractionListener {
override fun defineListeners() {
on(repairIDs, IntType.SCENERY, "repair"){ player, _ ->
- var rco: RepairClimbObject = RepairClimbObject.GWD
- for(ent in RepairClimbObject.values()) if(ent.destinationDown?.withinDistance(player.location,2) == true || ent.destinationUp?.withinDistance(player.location,2) == true) rco = ent
- repair(player,rco)
- return@on true
+ if (hasRequirement(player, Quests.ALL_FIRED_UP)){
+ val rco: RepairClimbObject? = getClimbingObject(player)
+ repair(player,rco!!)
+ return@on true
+ }
+ return@on false
}
on(climbIDs, IntType.SCENERY, "climb"){ player, node ->
- var rco: RepairClimbObject = RepairClimbObject.GWD
- for(ent in RepairClimbObject.values()) if(ent.destinationDown?.withinDistance(player.location,2) == true || ent.destinationUp?.withinDistance(player.location,2) == true) rco = ent
- climb(player,rco,node.location)
+ val rco: RepairClimbObject? = getClimbingObject(player)
+ climb(player,rco!!,node.location)
return@on true
}
}
+ private fun getClimbingObject(player: Player): RepairClimbObject?{
+ for(ent in RepairClimbObject.values())
+ if(ent.destinationDown?.withinDistance(player.location,2) == true ||
+ ent.destinationUp?.withinDistance(player.location,2) == true){
+ return ent
+ }
+ return null
+ }
+
private fun repair(player: Player,rco: RepairClimbObject){
+ if (rco == RepairClimbObject.TEMPLE){
+ // You can do this 2 different ways
+ val hasSmithingLevel = getDynLevel(player, Skills.SMITHING) >= 70
+ val hasConstructionLevel = getDynLevel(player, Skills.CONSTRUCTION) >= 59
+
+ if (!hasConstructionLevel && !hasSmithingLevel){
+ sendDialogue(player, "You need level 70 smithing or 59 construction for this.")
+ return
+ }
+
+ val hasHammer = inInventory(player, Items.HAMMER_2347)
+ val hasSmithingItems = hasHammer && inInventory(player, Items.IRON_BAR_2351, 2)
+ val hasConstructionItems = hasHammer && inInventory(player, Items.PLANK_960, 2)
+
+ if (hasSmithingLevel && hasSmithingItems){
+ if (removeItem(player,Item(Items.IRON_BAR_2351, 2))) {
+ setVarbit(player, rco.varbit, 1, true)
+ return
+ }
+ }
+ // Only check this if the smithing repair didn't work
+ if (hasConstructionLevel && hasConstructionItems){
+ val nails = NailType.get(player, 4)
+ if (nails != null){
+ if (removeItem(player, Item(Items.PLANK_960, 2)) && removeItem(player, Item(nails.itemId, 4))) {
+ setVarbit(player, rco.varbit, 1, true)
+ return
+ }
+ }
+ }
+
+ var msg = "You need "
+ msg += if (hasSmithingLevel) "a hammer and 2 iron bars" else ""
+ msg += if (hasSmithingLevel && hasConstructionLevel) " or " else ""
+ msg += if (hasConstructionLevel) "a hammer, 2 planks and 4 nails for this." else " for this."
+ sendDialogue(player, msg)
+ return
+ }
val skill = rco.levelRequirement?.first ?: 0
val level = rco.levelRequirement?.second ?: 0
if(player.skills.getLevel(skill) < level){
player.dialogueInterpreter.sendDialogue("You need level $level ${Skills.SKILL_NAME[skill]} for this.")
- return
}
var requiresNeedle = false
@@ -64,10 +112,7 @@ class AFURepairClimbHandler : InteractionListener {
requiresNeedle = true
arrayOf(Item(Items.JUTE_FIBRE_5931,3))
}
-
- RepairClimbObject.TEMPLE -> {
- arrayOf(Item(Items.IRON_BAR_2351,2))
- }
+ else -> return
}
if(requiresNeedle){
@@ -75,7 +120,7 @@ class AFURepairClimbHandler : InteractionListener {
player.inventory.remove(*requiredItems)
if (Random().nextBoolean()) player.inventory.remove(Item(Items.NEEDLE_1733))
} else {
- player.dialogueInterpreter.sendDialogue("You need a needle and ${requiredItems.map { "${it.amount} ${it.name.toLowerCase()}s" }.toString().replace("[","").replace("]","")} for this.")
+ player.dialogueInterpreter.sendDialogue("You need a needle and ${requiredItems.map { "${it.amount} ${it.name.lowercase()}s" }.toString().replace("[","").replace("]","")} for this.")
return
}
} else {
@@ -89,11 +134,10 @@ class AFURepairClimbHandler : InteractionListener {
}
player.inventory.remove(*requiredItems)
} else {
- player.dialogueInterpreter.sendDialogue("You need a hammer and ${requiredItems.map { "${it.amount} ${it.name.toLowerCase()}s" }.toString().replace("[","").replace("]","")} for this.")
+ player.dialogueInterpreter.sendDialogue("You need a hammer and ${requiredItems.map { "${it.amount} ${it.name.lowercase()}s" }.toString().replace("[","").replace("]","")} for this.")
return
}
}
-
setVarbit(player, rco.varbit, 1, true)
}
@@ -105,7 +149,7 @@ class AFURepairClimbHandler : InteractionListener {
DEATH_PLATEAU(5161,Location.create(2949, 3623, 0),Location.create(2954, 3623, 0), Pair(Skills.CONSTRUCTION,42)),
BURTHORPE(5160,Location.create(2941, 3563, 0),Location.create(2934, 3563, 0),Pair(Skills.SMITHING,56)),
GWD(5163,null,null,Pair(Skills.CRAFTING,60)),
- TEMPLE(5164,Location.create(2949, 3835, 0),Location.create(2956, 3835, 0),Pair(Skills.SMITHING,64));
+ TEMPLE(5164,Location.create(2949, 3835, 0),Location.create(2956, 3835, 0),Pair(0,0)); // This needs to be handled specially so don't have levels here
fun getOtherLocation(player: Player): Location?{
if(player.location == destinationDown) return destinationUp
diff --git a/Server/src/main/content/minigame/blastfurnace/BlastFurnace.kt b/Server/src/main/content/minigame/blastfurnace/BlastFurnace.kt
index 5bbdedef1..7c8386596 100644
--- a/Server/src/main/content/minigame/blastfurnace/BlastFurnace.kt
+++ b/Server/src/main/content/minigame/blastfurnace/BlastFurnace.kt
@@ -166,8 +166,32 @@ class BlastFurnace : MapArea, PersistPlayer, TickListener {
maxAmt = maxAmt.coerceAtMost(amount).coerceAtLeast(0)
if (maxAmt == 0) continue
- if (removeItem(p, Item(oreId, maxAmt)))
+ if (removeItem(p, Item(oreId, maxAmt))) {
+ sendMessage(p, "You place ${maxAmt} ${Item(oreId).getName()} on the conveyor belt.")
+ addCoalSecondary(p, oreId, maxAmt) //The belt renders the most recent ore, so add the coal first
addOreToBelt(p, oreId, maxAmt)
+ }
+ }
+ }
+
+ //Snowscape feature: coal stored in the gold satchel is automatically added to the belt with ores that require coal.
+ fun addCoalSecondary (p: Player, oreId: Int, amount: Int) {
+ if (!inEquipmentOrInventory(p, Items.GOLD_SATCHEL_10881)) return
+
+ var coalAmount = 0
+ when(oreId) {
+ Items.IRON_ORE_440 -> coalAmount = amount
+ Items.MITHRIL_ORE_447 -> coalAmount = amount * 2
+ Items.ADAMANTITE_ORE_449 -> coalAmount = amount * 3
+ Items.RUNITE_ORE_451 -> coalAmount = amount * 4
+ else -> return
+ }
+
+ coalAmount = coalAmount.coerceAtMost(getOreContainer(p).getAvailableSpace(Items.COAL_453) - getAmountOnBelt(p, Items.COAL_453))
+
+ if (coalAmount > 0 && p.goldSatchel.remove(Item(Items.COAL_453, coalAmount))){
+ addOreToBelt(p, Items.COAL_453, coalAmount)
+ sendMessage(p, "You take ${coalAmount} Coal from your gold satchel and place it on the belt.")
}
}
diff --git a/Server/src/main/content/minigame/blastfurnace/BlastFurnaceListeners.kt b/Server/src/main/content/minigame/blastfurnace/BlastFurnaceListeners.kt
index deaaae199..627f57d77 100644
--- a/Server/src/main/content/minigame/blastfurnace/BlastFurnaceListeners.kt
+++ b/Server/src/main/content/minigame/blastfurnace/BlastFurnaceListeners.kt
@@ -6,6 +6,7 @@ import core.game.dialogue.DialogueFile
import core.game.dialogue.Topic
import core.game.interaction.IntType
import core.game.interaction.InteractionListener
+import core.game.interaction.InteractionListeners
import core.game.node.entity.skill.Skills
import core.game.system.task.Pulse
import core.game.world.map.Location
@@ -128,6 +129,10 @@ class BlastFurnaceListeners : InteractionListener {
lockInteractions(player,1)
animate(player, 2441)
}
+ queueScript(player, 0) {
+ val node = getScenery(1948,4963,0)
+ InteractionListeners.run(node!!.getId(), SCENERY, "refuel", player, node)
+ }
} else {
sendMessage(player, "You need a spade to do this!")
}
@@ -163,6 +168,10 @@ class BlastFurnaceListeners : InteractionListener {
}
}
})
+ queueScript(player, 0) {
+ val node = getScenery(1950,4964,0)
+ InteractionListeners.run(node!!.getId(), SCENERY, "collect", player, node)
+ }
} else {
sendMessage(player,"You need some coke to do that!")
}
diff --git a/Server/src/main/content/minigame/bountyhunter/UnimplementedCraterArea.kt b/Server/src/main/content/minigame/bountyhunter/UnimplementedCraterArea.kt
new file mode 100644
index 000000000..60050f9c7
--- /dev/null
+++ b/Server/src/main/content/minigame/bountyhunter/UnimplementedCraterArea.kt
@@ -0,0 +1,75 @@
+package content.minigame.bountyhunter.handlers
+
+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.system.task.Pulse
+import core.game.world.map.Location
+import core.game.world.map.zone.ZoneBorders
+import org.rs09.consts.NPCs
+import core.game.dialogue.DialogueFile
+import core.game.world.GameWorld
+
+class UnimplementedCraterArea : MapArea {
+ override fun defineAreaBorders(): Array {
+ return arrayOf(
+ ZoneBorders(3200, 5632, 3391, 5823)
+ )
+ }
+
+ override fun areaEnter(entity: Entity) {
+ if (entity is Player && (
+ defineAreaBorders()[0].insideBorder(entity)
+ )) {
+ kickThemOut(entity)
+ }
+ }
+
+ private fun kickThemOut(entity: Player) {
+ val watchdog = NPC(NPCs.BANKER_6538)
+ watchdog.isNeverWalks = true
+ watchdog.isWalks = false
+ watchdog.location = entity.location
+ watchdog.init()
+ entity.lock()
+
+ runTask(watchdog, 1) {
+ watchdog.moveStep()
+ watchdog.face(entity)
+ openDialogue(entity, UnimplementedCraterDialogue(), watchdog)
+ GameWorld.Pulser.submit(object : Pulse() {
+ override fun pulse(): Boolean {
+ if (getAttribute(entity, "teleporting-away", false))
+ return true
+ if (!entity.isActive)
+ poofClear(watchdog)
+ if (entity.dialogueInterpreter.dialogue == null || entity.dialogueInterpreter.dialogue.file == null)
+ openDialogue(entity, UnimplementedCraterDialogue(), watchdog)
+ return !watchdog.isActive || !entity.isActive
+ }
+ })
+ }
+ }
+
+ class UnimplementedCraterDialogue : DialogueFile() {
+ override fun handle(componentID: Int, buttonID: Int) {
+ when(stage) {
+ 0 -> npcl(core.game.dialogue.FacialExpression.WORRIED, "This is unimplemented content, and you are now stuck. Don't worry, I'll get you out of here!").also { stage++ }
+ 1 -> {
+ end()
+ visualize(npc!!, 1818, 343)
+ sendGraphics(342, player!!.location)
+ setAttribute(player!!, "teleporting-away", true)
+ runTask(player!!, 3) {
+ poofClear(npc!!)
+ teleport(player!!, Location.create(3179, 3685, 0))
+ unlock(player!!)
+ removeAttribute(player!!, "teleporting-away")
+ }
+ }
+ }
+ }
+ }
+}
+
diff --git a/Server/src/main/content/minigame/castlewars/CastleWarsListeners.kt b/Server/src/main/content/minigame/castlewars/CastleWarsListeners.kt
index eed986625..24fdb55cc 100644
--- a/Server/src/main/content/minigame/castlewars/CastleWarsListeners.kt
+++ b/Server/src/main/content/minigame/castlewars/CastleWarsListeners.kt
@@ -18,7 +18,6 @@ import core.game.world.update.flag.context.Animation
import org.rs09.consts.Items
import org.rs09.consts.Sounds
import rs09.game.content.activity.castlewars.areas.CastleWarsWaitingArea
-import java.util.*
@Suppress("unused")
class CastleWarsListeners : InteractionListener {
diff --git a/Server/src/main/content/minigame/castlewars/areas/CastleWarsArea.kt b/Server/src/main/content/minigame/castlewars/areas/CastleWarsArea.kt
index ab1089bdc..c6b336c55 100644
--- a/Server/src/main/content/minigame/castlewars/areas/CastleWarsArea.kt
+++ b/Server/src/main/content/minigame/castlewars/areas/CastleWarsArea.kt
@@ -65,7 +65,6 @@ abstract class CastleWarsArea : MapArea, LogoutListener, InteractionListener {
defineAreaBorders().forEach { border ->
if (border.insideBorder(player)) {
sendMessage(player, "You can't remove your team's colours")
- // TODO: Equipping a cape or helmet causes issues
return@onUnequip false
}
}
diff --git a/Server/src/main/content/minigame/duel/DuelSession.java b/Server/src/main/content/minigame/duel/DuelSession.java
index e28c9bfab..51b4a6d9b 100644
--- a/Server/src/main/content/minigame/duel/DuelSession.java
+++ b/Server/src/main/content/minigame/duel/DuelSession.java
@@ -263,7 +263,7 @@ public final class DuelSession extends ComponentPlugin {
Player o = getOpposite(p);
o.getImpactHandler().setDisabledTicks(6);
o.teleport(RandomFunction.getRandomElement(DuelArea.RESPAWN_LOCATIONS));
- boolean victory = type == 0 || type == 2 || type == 1 && p.getImpactHandler().getImpactLog().containsKey(o);
+ boolean victory = type == 0 || type == 2 || type == 1 && p.getImpactHandler().getPlayerImpactLog().containsKey(o.getDetails().getUid());
fightState = 2;
p.removeExtension(DuelSession.class);
end();
diff --git a/Server/src/main/content/minigame/fishingtrawler/TrawlerLoot.kt b/Server/src/main/content/minigame/fishingtrawler/TrawlerLoot.kt
index 8511a1810..87ed06dbe 100644
--- a/Server/src/main/content/minigame/fishingtrawler/TrawlerLoot.kt
+++ b/Server/src/main/content/minigame/fishingtrawler/TrawlerLoot.kt
@@ -1,8 +1,12 @@
package content.minigame.fishingtrawler
import content.global.skill.fishing.Fish
+import core.api.Container
+import core.api.addItem
+import core.api.addItemOrDrop
import core.api.splitLines
import core.game.node.entity.player.Player
+import core.game.node.entity.player.link.IronmanMode
import core.game.node.item.GroundItemManager
import core.game.node.item.Item
import core.game.node.item.WeightedChanceItem
@@ -57,25 +61,34 @@ object TrawlerLoot {
@JvmStatic
fun addLootAndMessage(player: Player, fishLevel: Int, rolls: Int, skipJunk: Boolean) {
if (rolls < 1) return
- val frequencyList = listOf>(HashMap(), HashMap(), HashMap())
+ val frequencyList = listOf>(HashMap(), HashMap(), HashMap())
getLoot(fishLevel, rolls, skipJunk).forEach {
- if (!player.bank.add(it)) GroundItemManager.create(it, player)
when (it.id) {
- in trawlerFishIds -> frequencyList[0].merge(it.name, 1, Int::plus)
- in trawlerMisc -> frequencyList[1].merge(it.name, 1, Int::plus)
- in junkItems -> frequencyList[2].merge(it.name, 1, Int::plus)
+ in trawlerFishIds -> frequencyList[0].merge(it.id, 1, Int::plus)
+ in trawlerMisc -> frequencyList[1].merge(it.id, 1, Int::plus)
+ in junkItems -> frequencyList[2].merge(it.id, 1, Int::plus)
}
}
- player.sendMessage(colorize("%RYour reward has been sent to your bank:"))
- // Extract and join each frequency maps entries as string. Split based on length, then send each line as message.
+ // Extract and join each frequency map's entries as items
frequencyList.forEachIndexed { idx, fMap ->
if (fMap.isNotEmpty()) {
+ // Give reward
+ fMap.forEach {
+ if (player.ironmanManager.mode == IronmanMode.ULTIMATE || !addItem(player, it.key, it.value, Container.BANK)) {
+ val notedIdIfFish = if (idx == 0) it.key + 1 else it.key
+ addItemOrDrop(player, notedIdIfFish, it.value)
+ }
+ }
+ // Split based on length, then send each line as message
splitLines(
- fMap.entries.joinToString(prefix = if (idx == 0) "Fish: " else if (idx == 1) "Misc: " else "Junk: ", postfix = ".") { "${it.key}: ${it.value}" },
+ fMap.entries.joinToString(prefix = if (idx == 0) "Fish: " else if (idx == 1) "Misc: " else "Junk: ", postfix = ".") { "${Item(it.key).name}: ${it.value}" },
85
).forEach { player.sendMessage(it) }
}
}
+ if (player.ironmanManager.mode != IronmanMode.ULTIMATE) {
+ player.sendMessage(colorize("%RYour reward has been sent to your bank:"))
+ }
}
private val lootTable = arrayOf(
diff --git a/Server/src/main/content/minigame/mta/EnchantSpell.kt b/Server/src/main/content/minigame/mta/EnchantSpell.kt
index d6df04fe8..07cebf2a6 100644
--- a/Server/src/main/content/minigame/mta/EnchantSpell.kt
+++ b/Server/src/main/content/minigame/mta/EnchantSpell.kt
@@ -14,6 +14,7 @@ import core.game.world.update.flag.context.Animation
import core.game.world.update.flag.context.Graphics
import core.plugin.Plugin
import org.rs09.consts.Items
+import core.api.*
/**
* Represents the enchant spells.
@@ -46,11 +47,12 @@ class EnchantSpell : MagicSpell {
if (target !is Item || entity !is Player) {
return false
}
- entity.interfaceManager.setViewedTab(6)
+ //entity.interfaceManager.setViewedTab(6)
val enchanted = jewellery?.getOrDefault(target.id,null)
if (enchanted == null) {
entity.packetDispatch.sendMessage("You can't use this spell on this item.")
+ entity.interfaceManager.setViewedTab(6)
return false
}
if (!meetsRequirements(entity, true, true)) {
@@ -89,6 +91,13 @@ class EnchantSpell : MagicSpell {
content.minigame.mta.impl.EnchantingZone.ZONE.incrementPoints(entity, MTAType.ENCHANTERS.ordinal, pizazz)
}
}
+
+ // Snowscape: if there are more items to enchant, run the spell again
+ if (entity.inventory.containsAtLeastOneItem(target)) {
+ runTask(entity, 2){
+ castSpell(entity as Player, super.book, super.spellId, target)
+ }
+ }
return true
}
@@ -113,6 +122,7 @@ class EnchantSpell : MagicSpell {
Items.SAPPHIRE_NECKLACE_1656 to Item(Items.GAMES_NECKLACE8_3853),
Items.SAPPHIRE_AMULET_1694 to Item(Items.AMULET_OF_MAGIC_1727),
Items.SAPPHIRE_BRACELET_11072 to Item(Items.BRACELET_OF_CLAY_11074),
+ Items.BLUE_DRAGONHIDE_1751 to Item(Items.PLAIN_SATCHEL_10877),
//Begin MTA-specific enchantments
Items.CUBE_6899 to Item(Items.ORB_6902),
Items.CYLINDER_6898 to Item(Items.ORB_6902),
@@ -132,6 +142,7 @@ class EnchantSpell : MagicSpell {
Items.EMERALD_NECKLACE_1658 to Item(Items.BINDING_NECKLACE_5521),
Items.EMERALD_AMULET_1696 to Item(Items.AMULET_OF_DEFENCE_1729),
Items.EMERALD_BRACELET_11076 to Item(Items.CASTLEWAR_BRACE3_11079),
+ Items.GREEN_DRAGONHIDE_1753 to Item(Items.GREEN_SATCHEL_10878),
//Begin MTA-Specific Enchantments
Items.CUBE_6899 to Item(Items.ORB_6902),
Items.CYLINDER_6898 to Item(Items.ORB_6902),
@@ -151,6 +162,7 @@ class EnchantSpell : MagicSpell {
Items.RUBY_NECKLACE_1660 to Item(Items.DIGSITE_PENDANT_5_11194),
Items.RUBY_AMULET_1698 to Item(Items.AMULET_OF_STRENGTH_1725),
Items.RUBY_BRACELET_11085 to Item(Items.INOCULATION_BRACE_11088),
+ Items.RED_DRAGONHIDE_1749 to Item(Items.RED_SATCHEL_10879),
//Begin MTA-Specific Enchantments
Items.CUBE_6899 to Item(Items.ORB_6902),
Items.CYLINDER_6898 to Item(Items.ORB_6902),
@@ -169,6 +181,7 @@ class EnchantSpell : MagicSpell {
Items.DIAMOND_NECKLACE_1662 to Item(Items.PHOENIX_NECKLACE_11090),
Items.DIAMOND_AMULET_1700 to Item(Items.AMULET_OF_POWER_1731),
Items.DIAMOND_BRACELET_11092 to Item(Items.FORINTHRY_BRACE5_11095),
+ Items.DAGANNOTH_HIDE_6155 to Item(Items.GOLD_SATCHEL_10881),
//Begin MTA-Specific Enchantments
Items.CUBE_6899 to Item(Items.ORB_6902),
Items.CYLINDER_6898 to Item(Items.ORB_6902),
@@ -188,6 +201,7 @@ class EnchantSpell : MagicSpell {
Items.DRAGON_NECKLACE_1664 to Item(Items.SKILLS_NECKLACE4_11105),
Items.DRAGONSTONE_AMMY_1702 to Item(Items.AMULET_OF_GLORY4_1712),
Items.DRAGON_BRACELET_11115 to Item(Items.COMBAT_BRACELET4_11118),
+ Items.SUQAH_HIDE_9080 to Item(Items.RUNE_SATCHEL_10882),
//Begin MTA-Specific Enchantments
Items.CUBE_6899 to Item(Items.ORB_6902),
Items.CYLINDER_6898 to Item(Items.ORB_6902),
@@ -207,6 +221,7 @@ class EnchantSpell : MagicSpell {
Items.ONYX_NECKLACE_6577 to Item(Items.BERSERKER_NECKLACE_11128),
Items.ONYX_AMULET_6581 to Item(Items.AMULET_OF_FURY_6585),
Items.ONYX_BRACELET_11130 to Item(Items.REGEN_BRACELET_11133),
+ Items.BLACK_DRAGONHIDE_1747 to Item(Items.BLACK_SATCHEL_10880),
//Begin MTA-Specific Enchantments
Items.CUBE_6899 to Item(Items.ORB_6902),
Items.CYLINDER_6898 to Item(Items.ORB_6902),
diff --git a/Server/src/main/content/minigame/mta/MTAShop.java b/Server/src/main/content/minigame/mta/MTAShop.java
index beb64a1b2..d8db649a8 100644
--- a/Server/src/main/content/minigame/mta/MTAShop.java
+++ b/Server/src/main/content/minigame/mta/MTAShop.java
@@ -32,8 +32,8 @@ public class MTAShop {
/**
* The prices.
*/
- private static final int[][] PRICES = new int[][] { { 30, 30, 300, 30 }, { 60, 60, 600, 60 }, { 150, 200, 1500, 150 }, { 240, 240, 2400, 240 }, { 400, 450, 4000, 400 }, { 350, 400, 3000, 350 }, { 120, 120, 1200, 120 }, { 175, 225, 1500, 175 }, { 450, 500, 5000, 450 }, { 500, 550, 6000, 500 }, { 200, 300, 2000, 200 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 0, 0, 5, 0 }, { 0, 1, 5, 1 }, { 0, 1, 0, 1 }, { 2, 1, 20, 1 }, { 2, 0, 0, 0 }, { 2, 2, 25, 2 }, { 2, 2, 25, 2 } };
-
+ private static final int[][] PRICES = new int[][] { { 6, 6, 60, 6 }, { 12, 12, 120, 12 }, { 30, 40, 300, 30 }, { 48, 48, 480, 48 }, { 80, 90, 800, 80 }, { 70, 80, 600, 70 }, { 24, 24, 240, 24 }, { 35, 45, 300, 35 }, { 90, 100, 1000, 90 }, { 100, 110, 1200, 100 }, { 40, 60, 400, 40 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 1, 1, 15, 1 }, { 0, 0, 5, 0 }, { 0, 1, 5, 1 }, { 0, 1, 0, 1 }, { 2, 1, 20, 1 }, { 2, 0, 0, 0 }, { 2, 2, 25, 2 }, { 2, 2, 25, 2 } };
+
/**
* The container.
*/
diff --git a/Server/src/main/content/minigame/mta/TelekineticGrabSpell.java b/Server/src/main/content/minigame/mta/TelekineticGrabSpell.java
index e2d496492..9c3174d1f 100644
--- a/Server/src/main/content/minigame/mta/TelekineticGrabSpell.java
+++ b/Server/src/main/content/minigame/mta/TelekineticGrabSpell.java
@@ -4,6 +4,7 @@ import content.minigame.mta.impl.TelekineticZone;
import core.game.interaction.SpecialGroundItems;
import core.game.node.Node;
import core.game.node.entity.Entity;
+import core.game.node.entity.combat.CombatSwingHandler;
import core.game.node.entity.combat.spell.SpellType;
import core.game.node.entity.combat.spell.SpellBlocks;
import core.game.node.entity.impl.Projectile;
@@ -24,7 +25,10 @@ import core.game.global.action.PickupHandler;
import core.game.world.GameWorld;
import org.rs09.consts.Sounds;
-import static core.api.ContentAPIKt.playAudio;
+import core.game.world.map.Location;
+import core.game.interaction.MovementPulse;
+
+import static core.api.ContentAPIKt.*;
/**
* Represents the telekenitic grab spell.
@@ -105,9 +109,22 @@ public final class TelekineticGrabSpell extends MagicSpell {
if (!canCast(entity, ground)) {
return false;
}
+
+ //Snowscape: pick up all items of the target type within a square centered on the target
+ int radius = 10;
+ for (int x = target.getLocation().getX() - radius; x <= target.getLocation().getX() + radius; x++) {
+ for (int y = target.getLocation().getY() - radius; y <= target.getLocation().getY() + radius; y++) {
+ GroundItem targetItem = GroundItemManager.get(target.getId(), new Location(x,y), (Player) entity);
+ if (targetItem != null) {
+ GameWorld.getPulser().submit(getGrabPulse(entity, targetItem));
+ visualize(entity, targetItem);
+ }
+ }
+ }
+
entity.lock(2);
- visualize(entity, target);
- GameWorld.getPulser().submit(getGrabPulse(entity, ground));
+ //visualize(entity, target);
+ //GameWorld.getPulser().submit(getGrabPulse(entity, ground));
return true;
}
@@ -148,11 +165,15 @@ public final class TelekineticGrabSpell extends MagicSpell {
}
playAudio(player, Sounds.VULNERABILITY_IMPACT_3008);
if (!teleZone) {
- player.getInventory().add(new Item(g.getId(), g.getAmount(), g.getCharge()));
+ if (hasSpaceFor(player, g)) {
+ player.getInventory().add(new Item(g.getId(), g.getAmount(), g.getCharge()));
+ } else {
+ return true;
+ }
} else {
TelekineticZone zone = TelekineticZone.getZone(player);
zone.moveStatue();
- player.lock(getDelay());
+ //player.lock(getDelay());
}
player.getPacketDispatch().sendPositionedGraphics(END_GRAPHIC, ground.getLocation());
}
@@ -176,8 +197,32 @@ public final class TelekineticGrabSpell extends MagicSpell {
}
if (entity instanceof Player) {
final Player player = (Player) entity;
- if (!player.getInventory().hasSpaceFor(((Item) item))) {
- player.getPacketDispatch().sendMessage("You don't have enough inventory space.");
+ if (!CombatSwingHandler.isProjectileClipped(player, item, false)) {
+ //Move to the target, stopping and recasting when within line of sight.
+ player.getPulseManager().run(new MovementPulse(player, item) {
+ @Override
+ public boolean pulse() {
+ castSpell(player, SpellBook.MODERN, SPELL_ID, item);
+ return true;
+ }
+
+ @Override
+ public boolean update() {
+ if (CombatSwingHandler.isProjectileClipped(player, item, false)) {
+ player.getWalkingQueue().reset();
+ pulse();
+ stop();
+ return true;
+ }
+ return super.update();
+ }
+ });
+
+ //sendMessage(player, "I can't reach that."); //TODO authentic message?
+ return false;
+ }
+ if (!hasSpaceFor(player, item)) {
+ sendMessage(player, "You don't have enough inventory space.");
return false;
}
if (!PickupHandler.canTake(player, item, 1)) {
diff --git a/Server/src/main/content/minigame/pestcontrol/PCLanderZone.java b/Server/src/main/content/minigame/pestcontrol/PCLanderZone.java
index 21cc7fce5..5ace493bb 100644
--- a/Server/src/main/content/minigame/pestcontrol/PCLanderZone.java
+++ b/Server/src/main/content/minigame/pestcontrol/PCLanderZone.java
@@ -80,7 +80,7 @@ public final class PCLanderZone extends MapZone {
for (PestControlActivityPlugin a : activities) {
if (a.getWaitingPlayers().remove(e)) {
if (logout) {
- e.getProperties().setTeleportLocation(a.getLeaveLocation());
+ e.setLocation(a.getLeaveLocation());
}
break;
}
diff --git a/Server/src/main/content/minigame/pestcontrol/PestControlActivityPlugin.java b/Server/src/main/content/minigame/pestcontrol/PestControlActivityPlugin.java
index f1fb680a0..396d22355 100644
--- a/Server/src/main/content/minigame/pestcontrol/PestControlActivityPlugin.java
+++ b/Server/src/main/content/minigame/pestcontrol/PestControlActivityPlugin.java
@@ -133,14 +133,14 @@ public final class PestControlActivityPlugin extends ActivityPlugin {
// type,
// default
} else if (success && p.getAttribute("pc_zeal", 0) >= 50) {
- int amount = type.ordinal() + 2;
+ int amount = type.ordinal() == 0 ? 10 : type.ordinal() == 1 ? 15 : 25;
p.getSavedData().getActivityData().increasePestPoints(amount);
Item coins = new Item(995, p.getProperties().getCurrentCombatLevel() * 10);
if (!p.getInventory().add(coins)) {
GroundItemManager.create(coins, p);
}
// default, type, name
- p.getDialogueInterpreter().open(3781, true, 1, type.ordinal() == 0 ? "two" : type.ordinal() == 1 ? "three" : "four");
+ p.getDialogueInterpreter().open(3781, true, 1, type.ordinal() == 0 ? "ten" : type.ordinal() == 1 ? "fifteen" : "twenty-five");
} else {
// default type, default
p.getDialogueInterpreter().open(3781, true, 2, true);
diff --git a/Server/src/main/content/minigame/pestcontrol/reward/PCRewardInterface.java b/Server/src/main/content/minigame/pestcontrol/reward/PCRewardInterface.java
index 9dc6aab16..b2896ea5b 100644
--- a/Server/src/main/content/minigame/pestcontrol/reward/PCRewardInterface.java
+++ b/Server/src/main/content/minigame/pestcontrol/reward/PCRewardInterface.java
@@ -15,6 +15,8 @@ import core.game.node.item.Item;
import core.plugin.Plugin;
import core.tools.RandomFunction;
+import static core.api.ContentAPIKt.getStatLevel;
+
/**
* Represents the pest control reward interface.
* @author 'Vexia
@@ -185,20 +187,36 @@ public final class PCRewardInterface extends ComponentPlugin {
}
/**
- * Method used to calculate the experience the player can recieve in this
- * skill.
+ * Method used to calculate the experience the player can receive in this skill.
* @param player the player.
* @return the experience as an integer.
*/
- public static double calculateExperience(final Player player, final int skillId) {
- int level = player.getSkills().getStaticLevel(skillId);
- double divideBy = 30;//17.5-33 ideal range
- if (skillId == Skills.PRAYER) {
- divideBy = 67;// 34-75 ideal range
- } else if (skillId == Skills.MAGIC || skillId == Skills.RANGE) {
- divideBy = 29;//19.1-31 ideal range
+ public static int calculateExperience(final Player player, final int skillId, final int points) {
+ int level = getStatLevel(player, skillId);
+ int N = 0;
+ switch (skillId) {
+ case Skills.PRAYER:
+ N = 18;
+ break;
+ case Skills.MAGIC:
+ case Skills.RANGE:
+ N = 32;
+ break;
+ case Skills.ATTACK:
+ case Skills.STRENGTH:
+ case Skills.DEFENCE:
+ case Skills.HITPOINTS:
+ N = 35;
+ break;
}
- return (int) ((level * level) / divideBy) * (player.getSkills().experienceMultiplier / 2);
+ int xpPerPoint = (int) ((double) (level * level) / 600) * N;
+ double bonus = 1.0;
+ if (points >= 100) {
+ bonus = 1.1;
+ } else if (points >= 10) {
+ bonus = 1.01;
+ }
+ return (int) (points * xpPerPoint * bonus) / 5;
}
/**
@@ -207,7 +225,7 @@ public final class PCRewardInterface extends ComponentPlugin {
* @param skillId the skillId.
* @return the string to send.
*/
- public static final String getSkillCondition(final Player player, final int skillId) {
+ public static String getSkillCondition(final Player player, final int skillId) {
if (player.getSkills().getStaticLevel(skillId) < 25) {
return RED + "Must reach level 25 first.";
}
@@ -221,7 +239,7 @@ public final class PCRewardInterface extends ComponentPlugin {
* @return the string.
*/
public static String getSkillXp(final Player player, int skillId) {
- return Skills.SKILL_NAME[skillId] + " - " + (int) calculateExperience(player, skillId) + " xp";
+ return Skills.SKILL_NAME[skillId] + " - " + calculateExperience(player, skillId, 1) + " xp";
}
/**
@@ -229,7 +247,7 @@ public final class PCRewardInterface extends ComponentPlugin {
* @param skill the skill index.
* @return the skill child id.
*/
- public static final int getSkillChild(final int skill) {
+ public static int getSkillChild(final int skill) {
return SKILL_HEADER[skill];
}
@@ -264,7 +282,7 @@ public final class PCRewardInterface extends ComponentPlugin {
* Method used to confirm the reward.
* @param player the player.
*/
- public final void confirm(final Player player) {
+ public void confirm(final Player player) {
if (!hasReward(player)) {
player.getPacketDispatch().sendMessage("Please choose a reward.");
return;
@@ -281,9 +299,9 @@ public final class PCRewardInterface extends ComponentPlugin {
if (player.getSavedData().getActivityData().getPestPoints() >= points) {
player.getSavedData().getActivityData().decreasePestPoints(points);
if (reward.isSkillReward()) {
- final double experience = ((int) calculateExperience(player, reward.getSkill()) * points);
+ int experience = calculateExperience(player, reward.getSkill(), points);
player.getSkills().addExperience(reward.getSkill(), experience);
- message = "The Void Knight has granted you " + (int) (experience * player.getSkills().experienceMultiplier) + " " + reward.getName() + ".";
+ message = "The Void Knight has granted you " + experience + " " + reward.getName() + ".";
} else {
if (!reward.checkItemRequirement(player, option)) {
return;
diff --git a/Server/src/main/content/minigame/pyramidplunder/PharaohSceptre.kt b/Server/src/main/content/minigame/pyramidplunder/PharaohSceptre.kt
index b54f8dd36..a295a8795 100644
--- a/Server/src/main/content/minigame/pyramidplunder/PharaohSceptre.kt
+++ b/Server/src/main/content/minigame/pyramidplunder/PharaohSceptre.kt
@@ -13,6 +13,7 @@ import org.rs09.consts.Items
import core.game.dialogue.DialogueFile
import core.game.interaction.InteractionListener
import core.game.interaction.IntType
+import content.data.Quests
/**
* Adds functionality to the pharoah's scepter
@@ -23,7 +24,7 @@ class PharaohSceptre : InteractionListener {
val SCEPTRES = intArrayOf(Items.PHARAOHS_SCEPTRE_9044, Items.PHARAOHS_SCEPTRE_9046, Items.PHARAOHS_SCEPTRE_9048, Items.PHARAOHS_SCEPTRE_9050)
on(SCEPTRES, IntType.ITEM, "teleport", "operate"){ player, node ->
- if (!hasRequirement(player, "Icthlarin's Little Helper"))
+ if (!hasRequirement(player, Quests.ICTHLARINS_LITTLE_HELPER))
return@on true
val sceptre = node.asItem()
diff --git a/Server/src/main/content/minigame/sorceress/GardenObjectsPlugin.kt b/Server/src/main/content/minigame/sorceress/GardenObjectsPlugin.kt
index 4739bf5c2..53eb47fa9 100644
--- a/Server/src/main/content/minigame/sorceress/GardenObjectsPlugin.kt
+++ b/Server/src/main/content/minigame/sorceress/GardenObjectsPlugin.kt
@@ -23,6 +23,7 @@ import core.game.interaction.InteractionListener
import core.game.interaction.IntType
import core.game.world.GameWorld
import core.plugin.ClassScanner
+import content.data.Quests
class GardenObjectsPlugin : InteractionListener {
@@ -503,7 +504,7 @@ class GardenObjectsPlugin : InteractionListener {
override fun open(vararg args: Any): Boolean {
npc = args[0] as NPC
- quest = player.questRepository.getQuest("Prince Ali Rescue")
+ quest = player.questRepository.getQuest(Quests.PRINCE_ALI_RESCUE)
when (quest!!.getStage(player)) {
100 -> {
interpreter.sendDialogues(player, null, "I'd like to talk about sq'irks.")
diff --git a/Server/src/main/content/minigame/sorceress/SorceressApprenticeDialogue.java b/Server/src/main/content/minigame/sorceress/SorceressApprenticeDialogue.java
index 4e6be91c4..bc3aa169b 100644
--- a/Server/src/main/content/minigame/sorceress/SorceressApprenticeDialogue.java
+++ b/Server/src/main/content/minigame/sorceress/SorceressApprenticeDialogue.java
@@ -11,6 +11,7 @@ import core.game.world.map.Location;
import core.game.world.update.flag.context.Graphics;
import static core.api.ContentAPIKt.hasRequirement;
+import content.data.Quests;
/**
* Dialogue for Sorceress Apprentice
@@ -238,7 +239,7 @@ public class SorceressApprenticeDialogue extends DialoguePlugin {
}
public static void teleport(final NPC npc, final Player player) {
- if (!hasRequirement(player, "Prince Ali Rescue"))
+ if (!hasRequirement(player, Quests.PRINCE_ALI_RESCUE))
return;
npc.faceTemporary(player, 4);
npc.graphics(new Graphics(108));
diff --git a/Server/src/main/content/minigame/vinesweeper/Vinesweeper.kt b/Server/src/main/content/minigame/vinesweeper/Vinesweeper.kt
index 031d86d02..9fe119605 100644
--- a/Server/src/main/content/minigame/vinesweeper/Vinesweeper.kt
+++ b/Server/src/main/content/minigame/vinesweeper/Vinesweeper.kt
@@ -3,8 +3,21 @@ package content.minigame.vinesweeper
import BlinkinDialogue
import FarmerDialogue.Companion.FARMER_FLAG_LINES
import WinkinDialogue
+import content.minigame.vinesweeper.Vinesweeper.Companion.FARMERS
+import content.minigame.vinesweeper.Vinesweeper.Companion.FARMER_CLEAR_RADIUS
+import content.minigame.vinesweeper.Vinesweeper.Companion.HOLES
+import content.minigame.vinesweeper.Vinesweeper.Companion.NUMBERS
+import content.minigame.vinesweeper.Vinesweeper.Companion.RABBITS
+import content.minigame.vinesweeper.Vinesweeper.Companion.SEED_LOCS
+import content.minigame.vinesweeper.Vinesweeper.Companion.populateSeeds
+import content.minigame.vinesweeper.Vinesweeper.Companion.scheduleNPCs
+import content.minigame.vinesweeper.Vinesweeper.Companion.sendPoints
import core.api.*
+import core.cache.def.impl.ItemDefinition
import core.game.component.Component
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.interaction.InterfaceListener
import core.game.interaction.MovementPulse
import core.game.node.entity.Entity
import core.game.node.entity.combat.DeathTask
@@ -18,6 +31,8 @@ import core.game.node.item.Item
import core.game.node.scenery.Scenery
import core.game.node.scenery.SceneryBuilder
import core.game.system.task.Pulse
+import core.game.world.GameWorld
+import core.game.world.GameWorld.ticks
import core.game.world.map.Location
import core.game.world.map.RegionManager
import core.game.world.map.zone.ZoneBorders
@@ -25,21 +40,8 @@ import core.game.world.update.flag.context.Animation
import core.game.world.update.flag.context.Graphics
import core.plugin.Initializable
import core.tools.RandomFunction
-import content.minigame.vinesweeper.Vinesweeper.Companion.FARMERS
-import content.minigame.vinesweeper.Vinesweeper.Companion.FARMER_CLEAR_RADIUS
-import content.minigame.vinesweeper.Vinesweeper.Companion.HOLES
-import content.minigame.vinesweeper.Vinesweeper.Companion.NUMBERS
-import content.minigame.vinesweeper.Vinesweeper.Companion.RABBITS
-import content.minigame.vinesweeper.Vinesweeper.Companion.SEED_LOCS
-import content.minigame.vinesweeper.Vinesweeper.Companion.populateSeeds
-import content.minigame.vinesweeper.Vinesweeper.Companion.scheduleNPCs
-import content.minigame.vinesweeper.Vinesweeper.Companion.sendPoints
-import core.game.interaction.InteractionListener
-import core.game.interaction.IntType
-import core.game.interaction.InterfaceListener
-import core.game.world.GameWorld
-import core.game.world.GameWorld.ticks
import org.rs09.consts.*
+import kotlin.math.max
import kotlin.math.min
import org.rs09.consts.Graphics as Gfx
import org.rs09.consts.Scenery as Sceneries
@@ -83,7 +85,12 @@ class Vinesweeper : InteractionListener, InterfaceListener, MapArea {
on(Sceneries.PORTAL_29534, IntType.SCENERY, "enter") { player, _ ->
val x = player.getAttribute("vinesweeper:return-tele:x", 3052)
val y = player.getAttribute("vinesweeper:return-tele:y", 3304)
- teleport(player, Location(x, y))
+ val loc = Location(x, y)
+ if (ZoneBorders.forRegion(11060).insideBorder(loc) && !ItemDefinition.canEnterEntrana(player)) {
+ sendMessage(player, "The power of Saradomin prevents you from taking armour or weaponry to Entrana.");
+ return@on true
+ }
+ teleport(player, loc)
return@on true
}
on(SIGNS, IntType.SCENERY, "read") { player, node ->
@@ -211,7 +218,7 @@ class Vinesweeper : InteractionListener, InterfaceListener, MapArea {
player.packetDispatch.sendInterfaceConfig(686, 60, true)
val level = player.skills.getStaticLevel(Skills.FARMING)
// TODO: more precise formula
- val points_per_xp = if (level < 40) { 2.0*(40.0 - level.toDouble())/10.0 } else { 1.0 }
+ val points_per_xp = if (level < 40) { max(1.0, 2.0*(40.0 - level.toDouble())/10.0) } else { 1.0 }
val points = player.getAttribute("vinesweeper:points", 0)
val xp = points / points_per_xp
player.skills.addExperience(Skills.FARMING, xp)
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/AchiettiesDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/AchiettiesDialogue.kt
deleted file mode 100644
index a4585b87e..000000000
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/AchiettiesDialogue.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-import core.api.openDialogue
-import core.game.dialogue.DialogueBuilder
-import core.game.dialogue.DialogueBuilderFile
-import core.game.dialogue.DialoguePlugin
-import core.game.dialogue.FacialExpression
-import core.game.node.entity.player.Player
-import core.plugin.Initializable
-import org.rs09.consts.NPCs
-
-/**
- * @author qmqz
- * @author Trident101
- */
-
-@Initializable
-class AchiettiesDialogue(player: Player? = null) : DialoguePlugin(player){
-
- override fun handle(interfaceId: Int, buttonId: Int): Boolean {
- openDialogue(player, AchiettiesDialogueFile(), npc)
- return true
- }
-
- override fun newInstance(player: Player?): DialoguePlugin {
- return AchiettiesDialogue(player)
- }
-
- override fun getIds(): IntArray {
- return intArrayOf(NPCs.ACHIETTIES_796)
- }
-}
-
-class AchiettiesDialogueFile : DialogueBuilderFile() {
-
- override fun create(b: DialogueBuilder) {
- b.defaultDialogue().npcl(FacialExpression.FRIENDLY,
- "Greetings. Welcome to the Heroes' Guild."
- )
- }
-}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/BernaldDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/BernaldDialogue.kt
index 7984ceed8..2e1ca6b44 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/BernaldDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/BernaldDialogue.kt
@@ -20,8 +20,8 @@ class BernaldDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
// // Garden of Tranquility has not been implemented.
-// if(hasRequirement(player!!, "Garden of Tranquility")) {
-// if (isQuestComplete(player!!, DeathPlateau.questName)) {
+// if(hasRequirement(player!!, Quests.GARDEN_OF_TRANQUILITY)) {
+// if (isQuestComplete(player!!, Quests.DEATH_PLATEAU)) {
// when (stage) {
// 0 -> playerl(FacialExpression.FRIENDLY, "How are your grapes coming along?").also { stage++ }
// 1 -> npc(FacialExpression.FRIENDLY, "Marvellous, thanks to your help, " + player.username + "!").also { stage = END_DIALOGUE }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/BreocaDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/BreocaDialogue.kt
index ca982ff6c..8a885cd94 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/BreocaDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/BreocaDialogue.kt
@@ -9,6 +9,7 @@ import core.plugin.Initializable
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
import org.rs09.consts.NPCs
+import content.data.Quests
/**
* Breoca Dialogue
@@ -18,7 +19,7 @@ import org.rs09.consts.NPCs
@Initializable
class BreocaDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int) : Boolean {
- if(isQuestComplete(player!!, "Death Plateau")) {
+ if(isQuestComplete(player!!, Quests.DEATH_PLATEAU)) {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage = (1..3).toIntArray().random() }
1 -> npcl(FacialExpression.HAPPY, "I heard about what you did, thank you!").also { stage = END_DIALOGUE }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/CeolburgDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/CeolburgDialogue.kt
index 6eae6fa18..006641ebd 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/CeolburgDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/CeolburgDialogue.kt
@@ -9,6 +9,7 @@ import core.plugin.Initializable
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
import org.rs09.consts.NPCs
+import content.data.Quests
/**
* Ceolburg Dialogue
@@ -18,7 +19,7 @@ import org.rs09.consts.NPCs
@Initializable
class CeolburgDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int) : Boolean {
- if(isQuestComplete(player!!, "Death Plateau")) {
+ if(isQuestComplete(player!!, Quests.DEATH_PLATEAU)) {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage = (1..3).toIntArray().random() }
1 -> npcl(FacialExpression.HAPPY, "I heard about what you did, thank you!").also { stage = END_DIALOGUE }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DenulthDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DenulthDialogue.kt
index 430da5566..2724f9c19 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DenulthDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DenulthDialogue.kt
@@ -1,8 +1,7 @@
package content.region.asgarnia.burthorpe.dialogue
-import content.region.asgarnia.burthorpe.quest.deathplateau.DeathPlateau
+import content.data.Quests
import content.region.asgarnia.burthorpe.quest.deathplateau.DenulthDialogueFile
-import content.region.asgarnia.burthorpe.quest.trollstronghold.TrollStronghold
import core.api.isQuestComplete
import core.api.isQuestInProgress
import core.api.openDialogue
@@ -25,7 +24,7 @@ class DenulthDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
// When Troll Stronghold is complete
- if (isQuestComplete(player!!, TrollStronghold.questName)) {
+ if (isQuestComplete(player!!, Quests.TROLL_STRONGHOLD)) {
when(stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hello!").also { stage++ }
1 -> npcl(FacialExpression.HAPPY, "Welcome back friend!").also { stage++ }
@@ -49,13 +48,13 @@ class DenulthDialogue(player: Player? = null) : DialoguePlugin(player) {
}
// Troll Stronghold in progress
- if (isQuestInProgress(player!!, TrollStronghold.questName, 1, 99)) {
+ if (isQuestInProgress(player!!, Quests.TROLL_STRONGHOLD, 1, 99)) {
openDialogue(player!!, content.region.asgarnia.burthorpe.quest.trollstronghold.DenulthDialogueFile(), npc)
return true
}
// When Death Plateau is completed, start Troll Stronghold
- if (isQuestComplete(player!!, DeathPlateau.questName)) {
+ if (isQuestComplete(player!!, Quests.DEATH_PLATEAU)) {
when(stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hello!").also { stage++ }
1 -> npcl(FacialExpression.HAPPY, "Welcome back friend!").also { stage++ }
@@ -78,7 +77,7 @@ class DenulthDialogue(player: Player? = null) : DialoguePlugin(player) {
)
16 -> npcl(FacialExpression.HAPPY, "God speed friend! I would send some of my men with you, but none of them are brave enough to follow.").also {
stage = END_DIALOGUE
- setQuestStage(player!!, TrollStronghold.questName, 1)
+ setQuestStage(player!!, Quests.TROLL_STRONGHOLD, 1)
}
20 -> npcl(FacialExpression.ANGRY, "You are right citizen. The White Knights have taken advantage of the old and weak king, they control most of Asgarnia, including Falador. However they do not control Burthorpe!").also { stage++ }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DunstanDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DunstanDialogue.kt
index 6346fc9f6..73759083a 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DunstanDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/DunstanDialogue.kt
@@ -1,15 +1,16 @@
package content.region.asgarnia.burthorpe.dialogue
-import content.region.asgarnia.burthorpe.quest.deathplateau.DeathPlateau
-import content.region.asgarnia.burthorpe.quest.trollstronghold.TrollStronghold
+import content.data.Quests
import core.api.*
import core.game.dialogue.DialoguePlugin
import core.game.dialogue.FacialExpression
import core.game.dialogue.Topic
import core.game.node.entity.player.Player
+import core.game.node.item.Item
import core.plugin.Initializable
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
+import org.rs09.consts.Items
import org.rs09.consts.NPCs
/**
@@ -24,11 +25,12 @@ class DunstanDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
// When Troll Stronghold is complete
- if (isQuestComplete(player!!, TrollStronghold.questName)) {
+ if (isQuestComplete(player!!, Quests.TROLL_STRONGHOLD)) {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage++ }
1 -> npcl(FacialExpression.FRIENDLY, "Hi! What can I do for you?").also { stage++ }
2 -> showTopics(
+ Topic(FacialExpression.THINKING, "Can you put some spikes on my Climbing boots?", 30),
Topic(FacialExpression.THINKING, "Is it OK if I use your anvil?", 10),
Topic(FacialExpression.FRIENDLY, "Nothing, thanks.", END_DIALOGUE),
Topic(FacialExpression.FRIENDLY, "How is your son getting on?", 15),
@@ -42,22 +44,54 @@ class DunstanDialogue(player: Player? = null) : DialoguePlugin(player) {
15 -> npcl(FacialExpression.FRIENDLY, "He is getting on fine! He has just been promoted to Sergeant! I'm really proud of him!").also { stage++ }
16 -> playerl(FacialExpression.FRIENDLY, "I'm happy for you!").also { stage++ }
17 -> npcl(FacialExpression.FRIENDLY, "Anything else before I get on with my work?").also { stage = 2 }
+ 30 -> playerl(FacialExpression.FRIENDLY, "Can you put some spikes on my Climbing boots?").also { stage++ }
+ 31 -> npcl(FacialExpression.NEUTRAL,"For you, no problem.").also { stage++ }
+ 32 -> npc(FacialExpression.THINKING, "Do you realise that you can only use the Climbing", "boots right now? The Spiked boots can only be used in", "the Icelands but no ones been able to get there for", "years!").also { stage++ }
+ 33 -> showTopics(
+ Topic(FacialExpression.NEUTRAL, "Yes, but I still want them.", 40, true),
+ Topic(FacialExpression.NEUTRAL, "Oh OK, I'll leave them thanks.", 43),
+ )
+ 40 -> {
+ if (inInventory(player!!, Items.CLIMBING_BOOTS_3105) && inInventory(player!!, Items.IRON_BAR_2351)) {
+ sendDoubleItemDialogue(player!!, Items.IRON_BAR_2351, Items.CLIMBING_BOOTS_3105, "You give Dunstan an Iron bar and the climbing boots.")
+ sendMessage(player!!, "You give Dunstan an Iron bar and the climbing boots.")
+ if (removeItem(player!!, Item(Items.CLIMBING_BOOTS_3105)) && removeItem(player!!, Item(Items.IRON_BAR_2351))) {
+ addItemOrDrop(player!!, Items.SPIKED_BOOTS_3107)
+ stage++
+ } else {
+ stage = END_DIALOGUE
+ }
+ } else if (inInventory(player!!, Items.CLIMBING_BOOTS_3105)){
+ npcl(FacialExpression.NEUTRAL,"Sorry, I'll need an iron bar to make the spikes.")
+ stage = 2
+ } else {
+ playerl(FacialExpression.NEUTRAL,"I don't have them on me.")
+ stage = 2
+ }
+ }
+ 41 -> sendItemDialogue(player!!, Items.SPIKED_BOOTS_3107, "Dunstan has given you the spiked boots.").also { stage++
+ sendMessage(player!!, "Dunstan has given you the spiked boots.")
+ }
+ 43 -> npcl(FacialExpression.FRIENDLY, "Anything else before I get on with my work?").also {
+ stage = 2
+ }
}
return true
}
// Troll Stronghold in progress
- if (isQuestInProgress(player!!, TrollStronghold.questName, 1, 99)) {
+ if (isQuestInProgress(player!!, Quests.TROLL_STRONGHOLD, 1, 99)) {
openDialogue(player!!, content.region.asgarnia.burthorpe.quest.trollstronghold.DunstanDialogueFile(), npc)
return true
}
// When Death Plateau is complete
- if (isQuestComplete(player!!, DeathPlateau.questName)) {
+ if (isQuestComplete(player!!, Quests.DEATH_PLATEAU)) {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage++ }
1 -> npcl(FacialExpression.FRIENDLY, "Hi! What can I do for you?").also { stage++ }
2 -> showTopics(
+ Topic(FacialExpression.THINKING, "Can you put some spikes on my Climbing boots?", 30),
Topic(FacialExpression.THINKING, "Is it OK if I use your anvil?", 10),
Topic(FacialExpression.FRIENDLY, "Nothing, thanks.", END_DIALOGUE),
Topic(FacialExpression.FRIENDLY, "How is your son getting on?", 15),
@@ -70,12 +104,43 @@ class DunstanDialogue(player: Player? = null) : DialoguePlugin(player) {
15 -> npcl(FacialExpression.SAD, "He was captured by those cursed trolls! I don't know what to do. Even the imperial guard are too afraid to go rescue him.").also { stage++ }
16 -> playerl(FacialExpression.ASKING, "What happened?").also { stage++ }
17 -> npcl(FacialExpression.SAD, "Talk to Denulth, he can tell you all about it. Anything else before I get on with my work?").also { stage = 2 }
+ 30 -> npcl(FacialExpression.NEUTRAL,"For you, no problem.").also { stage++ }
+ 31 -> npc(FacialExpression.THINKING, "Do you realise that you can only use the Climbing", "boots right now? The Spiked boots can only be used in", "the Icelands but no ones been able to get there for", "years!").also { stage++ }
+ 32 -> showTopics(
+ Topic(FacialExpression.NEUTRAL, "Yes, but I still want them.", 40, true),
+ Topic(FacialExpression.NEUTRAL, "Oh OK, I'll leave them thanks.", 43),
+ )
+ 40 -> {
+ if (inInventory(player!!, Items.CLIMBING_BOOTS_3105) && inInventory(player!!, Items.IRON_BAR_2351)) {
+ sendDoubleItemDialogue(player!!, Items.IRON_BAR_2351, Items.CLIMBING_BOOTS_3105, "You give Dunstan an Iron bar and the climbing boots.")
+ sendMessage(player!!, "You give Dunstan an Iron bar and the climbing boots.")
+ if (removeItem(player!!, Item(Items.CLIMBING_BOOTS_3105)) && removeItem(player!!, Item(Items.IRON_BAR_2351))) {
+ addItemOrDrop(player!!, Items.SPIKED_BOOTS_3107)
+ stage++
+ } else {
+ stage = END_DIALOGUE
+ }
+ } else if (inInventory(player!!, Items.CLIMBING_BOOTS_3105)){
+ npcl(FacialExpression.NEUTRAL,"Sorry, I'll need an iron bar to make the spikes.")
+ stage = 2
+ } else {
+ playerl(FacialExpression.NEUTRAL,"I don't have them on me.")
+ stage = 2
+ }
+ }
+ 41 -> sendItemDialogue(player!!, Items.SPIKED_BOOTS_3107, "Dunstan has given you the spiked boots.").also {
+ stage = 43
+ sendMessage(player!!, "Dunstan has given you the spiked boots.")
+ }
+ 43 -> npcl(FacialExpression.FRIENDLY, "Anything else before I get on with my work?").also {
+ stage = 2
+ }
}
return true
}
// Death Plateau in progress
- if (isQuestInProgress(player!!, DeathPlateau.questName, 21, 24)) {
+ if (isQuestInProgress(player!!, Quests.DEATH_PLATEAU, 21, 24)) {
// Call the dialogue file for Dunstan from the deathplateau quest folder.
openDialogue(player!!, content.region.asgarnia.burthorpe.quest.deathplateau.DunstanDialogueFile(), npc)
return true
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/EohricDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/EohricDialogue.kt
index e9ccfc492..4fb041be6 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/EohricDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/EohricDialogue.kt
@@ -1,6 +1,6 @@
package content.region.asgarnia.burthorpe.dialogue
-import content.region.asgarnia.burthorpe.quest.deathplateau.DeathPlateau
+import content.data.Quests
import content.region.asgarnia.burthorpe.quest.deathplateau.EohricDialogueFile
import core.api.getQuestStage
import core.api.openDialogue
@@ -19,7 +19,7 @@ import org.rs09.consts.NPCs
@Initializable
class EohricDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
- if (getQuestStage(player!!, DeathPlateau.questName) >= 5) {
+ if (getQuestStage(player!!, Quests.DEATH_PLATEAU) >= 5) {
// Call the dialogue file for Eohric from the deathplateau quest folder.
openDialogue(player!!, EohricDialogueFile(), npc)
return true
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HaroldDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HaroldDialogue.kt
index b98a66184..62d510ac1 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HaroldDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HaroldDialogue.kt
@@ -1,14 +1,12 @@
package content.region.asgarnia.burthorpe.dialogue
-import content.region.asgarnia.burthorpe.quest.deathplateau.DeathPlateau
+import content.data.Quests
import content.region.asgarnia.burthorpe.quest.deathplateau.HaroldDialogueFile
import core.api.*
import core.game.dialogue.DialoguePlugin
import core.game.dialogue.FacialExpression
-import core.game.node.entity.npc.NPC
import core.game.node.entity.player.Player
import core.game.world.update.flag.context.Animation
-import core.game.world.update.flag.context.Graphics
import core.plugin.Initializable
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
@@ -23,7 +21,7 @@ import org.rs09.consts.NPCs
@Initializable
class HaroldDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
- if (isQuestInProgress(player!!, DeathPlateau.questName, 10, 29)) {
+ if (isQuestInProgress(player!!, Quests.DEATH_PLATEAU, 10, 29)) {
// Call the dialogue file for Harold from the deathplateau quest folder.
openDialogue(player!!, HaroldDialogueFile(), npc)
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HelemosDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HelemosDialogue.kt
new file mode 100644
index 000000000..aede4cd5f
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HelemosDialogue.kt
@@ -0,0 +1,47 @@
+package content.region.asgarnia.burthorpe.dialogue
+
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.NPCs
+
+@Initializable
+class HelemosDialogue(player: Player? = null) : DialoguePlugin(player){
+
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, HelemosDialogueFile(), npc)
+ return true
+ }
+
+ override fun newInstance(player: Player?): DialoguePlugin {
+ return HelemosDialogue(player)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.HELEMOS_797)
+ }
+}
+class HelemosDialogueFile : DialogueBuilderFile() {
+
+ override fun create(b: DialogueBuilder) {
+
+ b.onPredicate { _ -> true }
+ .npc("Welcome to the Heroes' Guild!")
+ .options()
+ .let { optionBuilder ->
+ optionBuilder.option("So do you sell anything here?")
+ .playerl("So do you sell anything good here?")
+ .npcl("Why yes! We DO run an exclusive shop for our members!")
+ .endWith { _, player ->
+ openNpcShop(player, NPCs.HELEMOS_797)
+ end()
+ }
+ optionBuilder.option_playerl("So what can I do here?")
+ .npcl("Look around... there are all sorts of things to keep our guild members entertained!")
+ .end()
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HildDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HildDialogue.kt
index b8361c40a..6b0116cd3 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HildDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HildDialogue.kt
@@ -9,6 +9,7 @@ import core.plugin.Initializable
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
import org.rs09.consts.NPCs
+import content.data.Quests
/**
* Hild Dialogue
@@ -18,7 +19,7 @@ import org.rs09.consts.NPCs
@Initializable
class HildDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int) : Boolean {
- if(isQuestComplete(player!!, "Death Plateau")) {
+ if(isQuestComplete(player!!, Quests.DEATH_PLATEAU)) {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage = (1..3).toIntArray().random() }
1 -> npcl(FacialExpression.HAPPY, "I heard about what you did, thank you!").also { stage = END_DIALOGUE }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HygdDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HygdDialogue.kt
index 2a7f3f280..3e3b73b90 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HygdDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/HygdDialogue.kt
@@ -9,6 +9,7 @@ import core.plugin.Initializable
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
import org.rs09.consts.NPCs
+import content.data.Quests
/**
* Hygd Dialogue
@@ -18,7 +19,7 @@ import org.rs09.consts.NPCs
@Initializable
class HygdDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int) : Boolean {
- if(isQuestComplete(player!!, "Death Plateau")) {
+ if(isQuestComplete(player!!, Quests.DEATH_PLATEAU)) {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage = (1..3).toIntArray().random() }
1 -> npcl(FacialExpression.HAPPY, "I heard about what you did, thank you!").also { stage = END_DIALOGUE }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/OcgaDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/OcgaDialogue.kt
index 514035edc..0606c4542 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/OcgaDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/OcgaDialogue.kt
@@ -9,6 +9,7 @@ import core.plugin.Initializable
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
import org.rs09.consts.NPCs
+import content.data.Quests
/**
@@ -19,7 +20,7 @@ import org.rs09.consts.NPCs
@Initializable
class OcgaDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int) : Boolean {
- if(isQuestComplete(player!!, "Death Plateau")) {
+ if(isQuestComplete(player!!, Quests.DEATH_PLATEAU)) {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage = (1..3).toIntArray().random() }
1 -> npcl(FacialExpression.HAPPY, "I heard about what you did, thank you!").also { stage = END_DIALOGUE }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/PendaDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/PendaDialogue.kt
index 4cd42579c..0570a0d24 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/PendaDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/PendaDialogue.kt
@@ -9,6 +9,7 @@ import core.plugin.Initializable
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
import org.rs09.consts.NPCs
+import content.data.Quests
/**
* Penda Dialogue
@@ -18,7 +19,7 @@ import org.rs09.consts.NPCs
@Initializable
class PendaDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int) : Boolean {
- if(isQuestComplete(player!!, "Death Plateau")) {
+ if(isQuestComplete(player!!, Quests.DEATH_PLATEAU)) {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage = (1..5).toIntArray().random() }
1 -> npcl(FacialExpression.HAPPY, "I heard about what you did, thank you!").also { stage = END_DIALOGUE }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/UnferthDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/UnferthDialogue.kt
index 84b26124e..5c0a23214 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/dialogue/UnferthDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/dialogue/UnferthDialogue.kt
@@ -8,9 +8,8 @@ import core.game.dialogue.DialoguePlugin
import core.game.dialogue.FacialExpression
import core.game.node.entity.player.Player
import core.plugin.Initializable
-import core.tools.END_DIALOGUE
-import core.tools.START_DIALOGUE
import org.rs09.consts.NPCs
+import content.data.Quests
/**
* Unferth Dialogue
@@ -37,7 +36,7 @@ class UnferthDialogue(player: Player? = null) : DialoguePlugin(player) {
class UnferthDialogueFile : DialogueBuilderFile() {
override fun create(b: DialogueBuilder) {
- b.onPredicate { player -> isQuestComplete(player, "A Tail of Two Cats") }.playerl(
+ b.onPredicate { player -> isQuestComplete(player, Quests.A_TAIL_OF_TWO_CATS) }.playerl(
FacialExpression.FRIENDLY, "Hi Unferth. How are you doing?"
).npcl(
FacialExpression.GUILTY, "It's just not the same without Bob around."
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/handlers/HeroGuildPlugin.java b/Server/src/main/content/region/asgarnia/burthorpe/handlers/HeroGuildPlugin.java
index 5c3900341..cc4e8fb62 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/handlers/HeroGuildPlugin.java
+++ b/Server/src/main/content/region/asgarnia/burthorpe/handlers/HeroGuildPlugin.java
@@ -18,6 +18,7 @@ import core.plugin.Initializable;
import core.plugin.ClassScanner;
import static core.api.ContentAPIKt.hasRequirement;
+import content.data.Quests;
/**
* Represents the hero guild.
@@ -42,7 +43,7 @@ public final class HeroGuildPlugin extends OptionHandler {
switch (id) {
case 2624:
case 2625:
- if (!hasRequirement(player, "Heroes' Quest"))
+ if (!hasRequirement(player, Quests.HEROES_QUEST))
return true;
DoorActionHandler.handleAutowalkDoor(player, (Scenery) node);
break;
@@ -82,15 +83,15 @@ public final class HeroGuildPlugin extends OptionHandler {
@Override
public boolean handle(NodeUsageEvent event) {
final Player player = event.getPlayer();
- if (!hasRequirement(player, "Heroes' Quest"))
+ if (!hasRequirement(player, Quests.HEROES_QUEST))
return true;
final EnchantedJewellery jewellery;
assert event.getUsedItem() != null;
jewellery = EnchantedJewellery.Companion.getIdMap().get(event.getUsedItem().getId());
- if (!hasRequirement(player, "Heroes' Quest"))
+ if (!hasRequirement(player, Quests.HEROES_QUEST))
return true;
if (jewellery == EnchantedJewellery.COMBAT_BRACELET || jewellery == EnchantedJewellery.SKILLS_NECKLACE)
- if (!hasRequirement(player, "Legend's Quest"))
+ if (!hasRequirement(player, Quests.LEGENDS_QUEST))
return true;
if (jewellery == null && event.getUsedItem().getId() != 2572) {
return true;
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateau.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateau.kt
index b6b31939f..24e3f6cbc 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateau.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateau.kt
@@ -5,9 +5,9 @@ import core.api.getAttribute
import core.game.node.entity.player.Player
import core.game.node.entity.player.link.quest.Quest
import core.game.node.entity.skill.Skills
-import core.game.world.map.Location
import core.plugin.Initializable
import org.rs09.consts.Items
+import content.data.Quests
/**
* Death Plateau Quest
@@ -15,16 +15,13 @@ import org.rs09.consts.Items
* @author ovenbread
*/
@Initializable
-class DeathPlateau : Quest("Death Plateau",44, 43, 1, 314, 0, 1, 80) {
- companion object {
- const val questName = "Death Plateau"
- }
+class DeathPlateau : Quest(Quests.DEATH_PLATEAU,44, 43, 1, 314, 0, 1, 80) {
override fun drawJournal(player: Player?, stage: Int) {
super.drawJournal(player, stage)
var line = 12
var stage = getStage(player)
- var started = player?.questRepository?.getStage(questName)!! > 0
+ var started = player?.questRepository?.getStage(Quests.DEATH_PLATEAU)!! > 0
if(!started){
line(player, "I can start this quest by speaking to !!Denulth?? who is in his", line++)
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauDoorDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauDoorDialogueFile.kt
index e0db1a73d..64c29cec7 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauDoorDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauDoorDialogueFile.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.burthorpe.quest.deathplateau
+import content.data.Quests
import core.api.getQuestStage
import core.api.getScenery
import core.api.sendDialogue
@@ -26,7 +27,7 @@ class DeathPlateauDoorDialogueFile(val door: Int) : DialogueFile() {
if(door == 2) {
npc = NPC(NPCs.TENZING_1071)
- when (getQuestStage(player!!, DeathPlateau.questName)) {
+ when (getQuestStage(player!!, Quests.DEATH_PLATEAU)) {
in 0 .. 19 -> {
when (stage) {
0 -> sendDialogue(player!!, "You knock on the door.").also { stage++ }
@@ -53,7 +54,7 @@ class DeathPlateauDoorDialogueFile(val door: Int) : DialogueFile() {
}
if(door == 3) {
npc = NPC(NPCs.TENZING_1071)
- when (getQuestStage(player!!, DeathPlateau.questName)) {
+ when (getQuestStage(player!!, Quests.DEATH_PLATEAU)) {
in 0..24 -> {
when (stage) {
0 -> npcl(FacialExpression.FRIENDLY, "Where do you think you're going? This is private property!").also { stage = END_DIALOGUE }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt
index ed6850780..01a253ad4 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DeathPlateauInteractionListener.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.burthorpe.quest.deathplateau
+import content.data.Quests
import core.api.*
import core.game.global.action.DoorActionHandler
import core.game.interaction.IntType
@@ -24,22 +25,19 @@ class DeathPlateauInteractionListener : InteractionListener {
)
}
override fun defineListeners() {
- on(Scenery.DOOR_3747, SCENERY, "open") { player, _ ->
- // Harold's Door
- if (player.location == location(2906, 3543, 1)) {
- openDialogue(player, DeathPlateauDoorDialogueFile(1))
- } else {
- DoorActionHandler.handleAutowalkDoor(player, getScenery(2906, 3543, 1))
+ on(Scenery.DOOR_3747, SCENERY, "open") { player, node ->
+ // Harold's door
+ when (player.location) {
+ location(2906, 3543, 1), location(2905, 3543, 1), location(2907, 3543, 1) -> openDialogue(player, DeathPlateauDoorDialogueFile(1))
+ else -> DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
}
return@on true
}
on(Scenery.DOOR_3745, SCENERY, "open") { player, node ->
- if (node.location == location(2823, 3555, 0)) {
- // 1st Door to Tenzing
- openDialogue(player, DeathPlateauDoorDialogueFile(2))
- } else if (node.location == location(2820, 3558, 0)) {
- // 2nd Door to chicken pen
- openDialogue(player, DeathPlateauDoorDialogueFile(3))
+ when (node.location) {
+ location(2823, 3555, 0) -> openDialogue(player, DeathPlateauDoorDialogueFile(2)) //1st door to Tenzing
+ location(2820, 3558, 0) -> openDialogue(player, DeathPlateauDoorDialogueFile(3)) //2nd door to chicken pen
+ else -> DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
}
return@on true
}
@@ -77,16 +75,16 @@ class DeathPlateauInteractionListener : InteractionListener {
GroundItemManager.get(Items.STONE_BALL_3111, location(2895, 3562, 0), player) != null &&
GroundItemManager.get(Items.STONE_BALL_3112, location(2895, 3563, 0), player) != null &&
GroundItemManager.get(Items.STONE_BALL_3113, location(2895, 3564, 0), player) != null) {
- if (getQuestStage(player, DeathPlateau.questName) == 16) {
+ if (getQuestStage(player, Quests.DEATH_PLATEAU) == 16) {
sendMessage(player, "The equipment room door has unlocked.")
- setQuestStage(player, DeathPlateau.questName, 19)
+ setQuestStage(player, Quests.DEATH_PLATEAU, 19)
}
}
return@onUseWith true
}
on(Scenery.LARGE_DOOR_3743, SCENERY, "open") { player, node ->
- if (getQuestStage(player, DeathPlateau.questName) > 16) {
+ if (getQuestStage(player, Quests.DEATH_PLATEAU) > 16) {
DoorActionHandler.handleAutowalkDoor(player, node as core.game.node.scenery.Scenery)
} else {
sendMessage(player, "The door is locked.")
@@ -94,4 +92,4 @@ class DeathPlateauInteractionListener : InteractionListener {
return@on true
}
}
-}
\ No newline at end of file
+}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DenulthDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DenulthDialogueFile.kt
index 7838a6c5c..2046cf51a 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DenulthDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DenulthDialogueFile.kt
@@ -1,14 +1,13 @@
package content.region.asgarnia.burthorpe.quest.deathplateau
+import content.data.Quests
import core.api.*
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
import core.game.dialogue.Topic
-import core.game.node.entity.npc.NPC
import core.game.node.item.Item
import core.tools.END_DIALOGUE
import org.rs09.consts.Items
-import org.rs09.consts.NPCs
/**
@@ -20,7 +19,7 @@ import org.rs09.consts.NPCs
class DenulthDialogueFile : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
- when (getQuestStage(player!!, DeathPlateau.questName)) {
+ when (getQuestStage(player!!, Quests.DEATH_PLATEAU)) {
in 0..4 -> {
when (stage) {
0 -> playerl(FacialExpression.FRIENDLY, "Hello!").also { stage++ }
@@ -54,7 +53,7 @@ class DenulthDialogueFile : DialogueFile() {
309 -> playerl(FacialExpression.FRIENDLY, "A stone what...?!").also { stage++ }
310 -> npcl(FacialExpression.FRIENDLY, "Well citizen, the Prince is fond of puzzles. Why we couldn't just have a key is beyond me!").also { stage++ }
311 -> playerl(FacialExpression.SUSPICIOUS, "I'll get on it right away!").also {
- setQuestStage(player!!, DeathPlateau.questName, 5)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 5)
stage = END_DIALOGUE
}
}
@@ -104,7 +103,7 @@ class DenulthDialogueFile : DialogueFile() {
}
11 -> npcl(FacialExpression.FRIENDLY, "This certificate proves that we have accepted Dunstan's son for training in the Imperial Guard!").also { stage++ }
12 -> playerl(FacialExpression.FRIENDLY, "Thank you Denulth, I shall be back shortly!").also {
- setQuestStage(player!!, DeathPlateau.questName, 23)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 23)
stage = END_DIALOGUE
}
}
@@ -155,7 +154,7 @@ class DenulthDialogueFile : DialogueFile() {
stage = 8
}
}
- 7 -> playerl(FacialExpression.FRIENDLY, "I have opened the door but I don't have the combination on me.").also { stage++ }
+ 7 -> playerl(FacialExpression.FRIENDLY, "I have opened the door but I don't have the combination on me.").also { stage = END_DIALOGUE }
8 -> playerl(FacialExpression.FRIENDLY, "Yes! The door is open and here is the combination.").also { stage++ }
9 -> sendItemDialogue(player!!, Items.COMBINATION_3102, "You give Denulth the combination to the equipment room.").also {
if (removeItem(player!!, Item(Items.COMBINATION_3102))) {
@@ -169,7 +168,7 @@ class DenulthDialogueFile : DialogueFile() {
12 -> npcl(FacialExpression.FRIENDLY, "You are now an honourary member of the Imperial Guard!").also { stage++ }
13 -> {
stage = END_DIALOGUE
- finishQuest(player!!, DeathPlateau.questName)
+ finishQuest(player!!, Quests.DEATH_PLATEAU)
}
}
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DunstanDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DunstanDialogueFile.kt
index 2567c54c8..6cf2eabf4 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DunstanDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/DunstanDialogueFile.kt
@@ -3,17 +3,16 @@ package content.region.asgarnia.burthorpe.quest.deathplateau
import core.api.*
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
-import core.game.node.entity.npc.NPC
import core.game.node.item.Item
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
import org.rs09.consts.Items
-import org.rs09.consts.NPCs
+import content.data.Quests
class DunstanDialogueFile : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
- when (getQuestStage(player!!, DeathPlateau.questName)) {
+ when (getQuestStage(player!!, Quests.DEATH_PLATEAU)) {
21 -> {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hi!").also { stage++ }
@@ -29,7 +28,7 @@ class DunstanDialogueFile : DialogueFile() {
10 -> npcl(FacialExpression.FRIENDLY, "My son has just turned 16 and I'd very much like him to join the Imperial Guard. The Prince's elite forces are invite only so it's very unlikely he'll get in. If you can arrange that you have a deal!").also { stage++ }
11 -> playerl(FacialExpression.FRIENDLY, "That won't be a problem as I'm helping out the Imperial Guard!").also { stage++ }
12 -> npcl(FacialExpression.FRIENDLY, "Excellent! You'll need to bring an Iron bar for the spikes!").also {
- setQuestStage(player!!, "Death Plateau", 22)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 22)
stage = END_DIALOGUE
}
}
@@ -60,7 +59,7 @@ class DunstanDialogueFile : DialogueFile() {
5 -> npcl(FacialExpression.FRIENDLY, "Thank you!").also {
// Jumps to the next stage immediately in one continuous dialogue (questStage 24, stage 2).
- setQuestStage(player!!, "Death Plateau", 24)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 24)
stage = 2
}
}
@@ -84,15 +83,17 @@ class DunstanDialogueFile : DialogueFile() {
4 -> playerl(FacialExpression.FRIENDLY, "I don't have the climbing boots.").also { stage = END_DIALOGUE }
5 -> playerl(FacialExpression.FRIENDLY, "I don't have the iron bar or the climbing boots.").also { stage = END_DIALOGUE }
- 7 -> sendDoubleItemDialogue(player!!, Items.IRON_BAR_2351, Items.CLIMBING_BOOTS_3105, "You give Dunstan an iron bar and the climbing boots.").also {
+ 7 -> sendDoubleItemDialogue(player!!, Items.IRON_BAR_2351, Items.CLIMBING_BOOTS_3105, "You give Dunstan an Iron bar and the climbing boots.").also {
+ sendMessage(player!!, "You give Dunstan an Iron bar and the climbing boots.")
if (removeItem(player!!, Item(Items.CLIMBING_BOOTS_3105)) && removeItem(player!!, Item(Items.IRON_BAR_2351))) {
+ addItemOrDrop(player!!, Items.SPIKED_BOOTS_3107)
stage++
} else {
stage = END_DIALOGUE
}
}
8 -> sendItemDialogue(player!!, Items.SPIKED_BOOTS_3107, "Dunstan has given you the spiked boots.").also { stage++
- addItemOrDrop(player!!, Items.SPIKED_BOOTS_3107)
+ sendMessage(player!!, "Dunstan has given you the spiked boots.")
}
9 -> playerl(FacialExpression.FRIENDLY, "Thank you!").also { stage++ }
10 -> npcl(FacialExpression.FRIENDLY, "No problem.").also {
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/EohricDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/EohricDialogueFile.kt
index 426f4846a..8e0d5f0a6 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/EohricDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/EohricDialogueFile.kt
@@ -4,10 +4,9 @@ import core.api.*
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
import core.game.dialogue.Topic
-import core.game.node.entity.npc.NPC
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
-import org.rs09.consts.NPCs
+import content.data.Quests
/**
* Eohric sub dialogue file for death plateau.
@@ -17,7 +16,7 @@ import org.rs09.consts.NPCs
*/
class EohricDialogueFile : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
- when (getQuestStage(player!!, DeathPlateau.questName)) {
+ when (getQuestStage(player!!, Quests.DEATH_PLATEAU)) {
in 5..9 -> {
when (stage) {
START_DIALOGUE -> player(FacialExpression.FRIENDLY, "Hi!").also { stage++ }
@@ -31,7 +30,7 @@ class EohricDialogueFile : DialogueFile() {
11 -> player(FacialExpression.FRIENDLY, "Do you know where he is staying?").also { stage++ }
12 -> npc(FacialExpression.FRIENDLY, "Harold is staying at the Toad and Chicken.").also { stage++ }
13 -> player(FacialExpression.FRIENDLY, "Thanks!").also {
- setQuestStage(player!!, "Death Plateau", 10)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 10)
HaroldDialogueFile.resetNpc(player!!)
stage = END_DIALOGUE
}
@@ -58,7 +57,7 @@ class EohricDialogueFile : DialogueFile() {
2 -> playerl(FacialExpression.HALF_GUILTY, "I found Harold but he won't talk to me!.").also { stage++ }
3 -> npcl(FacialExpression.THINKING, "Hmm. Harold has got in trouble a few over his drinking and gambling. Perhaps he'd open up after a drink?").also { stage++ }
4 -> playerl(FacialExpression.FRIENDLY, "Thanks, I'll try that!").also {
- setQuestStage(player!!, "Death Plateau", 12)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 12)
stage = END_DIALOGUE
}
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/HaroldDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/HaroldDialogueFile.kt
index 810b427b1..e4242212b 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/HaroldDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/HaroldDialogueFile.kt
@@ -11,6 +11,7 @@ import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
import org.rs09.consts.Animations
import org.rs09.consts.Items
+import content.data.Quests
/**
* Harold sub dialogue file for death plateau.
@@ -38,7 +39,7 @@ class HaroldDialogueFile : DialogueFile() {
setAttribute(player!!, ATTRIBUTE_JUMPSTAGE, 0)
}
println(getAttribute(player!!, ATTRIBUTE_HAROLD_MONEY, -1))
- when (getQuestStage(player!!, DeathPlateau.questName)) {
+ when (getQuestStage(player!!, Quests.DEATH_PLATEAU)) {
10 -> { // First time meeting.
when (stage) {
START_DIALOGUE -> player(FacialExpression.FRIENDLY, "Hello there.").also { stage++ }
@@ -47,7 +48,7 @@ class HaroldDialogueFile : DialogueFile() {
3 -> npcl(FacialExpression.FRIENDLY, "Yeah.").also { stage++ }
4 -> playerl(FacialExpression.HAPPY, "Denulth said that you lost the combination to the equipment room ?").also { stage++ }
5 -> npcl(FacialExpression.FRIENDLY, "I don't want to talk about it!").also {
- setQuestStage(player!!, "Death Plateau", 11)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 11)
stage = END_DIALOGUE
}
}
@@ -71,7 +72,7 @@ class HaroldDialogueFile : DialogueFile() {
4 -> {
if (inInventory(player!!, Items.ASGARNIAN_ALE_1905, 1)) {
removeItem(player!!, Items.ASGARNIAN_ALE_1905)
- setQuestStage(player!!, "Death Plateau", 12)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 12)
sendMessage(player!!, "You give Harold an Asgarnian Ale.")
setAttribute(player!!, ATTRIBUTE_HAROLD_MONEY, 200)
sendItemDialogue(player!!, Items.ASGARNIAN_ALE_1905, "You give Harold an Asgarnian Ale.").also { stage++ }
@@ -81,7 +82,7 @@ class HaroldDialogueFile : DialogueFile() {
}
5 -> {
end()
- setQuestStage(player!!, "Death Plateau", 13)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 13)
animate(npc!!, Animations.HUMAN_EATTING_829)
runTask(npc!!, 5) {
npcl(FacialExpression.FRIENDLY, "Arrh. That hit the spot!").also { stage = END_DIALOGUE }
@@ -108,19 +109,16 @@ class HaroldDialogueFile : DialogueFile() {
21 -> playerl(FacialExpression.ASKING, "What?").also { stage++ }
22 -> npcl(FacialExpression.FRIENDLY, "I really fancy one of those Blurberry Specials. I never get over to the Gnome Stronghold so I haven't had one for ages!").also { stage++ }
23 -> {
- if (removeItem(player!!, Items.BLURBERRY_SPECIAL_2064)) {
+ if (removeItem(player!!, Items.BLURBERRY_SPECIAL_2064) || removeItem(player!!, Items.PREMADE_BLURB_SP_2028)) {
sendMessage(player!!, "You give Harold a Blurberry Special.")
sendItemDialogue(player!!, Items.BLURBERRY_SPECIAL_2064, "You give Harold a Blurberry Special.").also { stage++ }
- } else if (removeItem(player!!, Items.PREMADE_BLURB_SP_2028)) {
- sendMessage(player!!, "You give Harold a Blurberry Special.")
- sendItemDialogue(player!!, Items.PREMADE_BLURB_SP_2028, "You give Harold a Blurberry Special.").also { stage++ }
} else {
player(FacialExpression.FRIENDLY, "I'll go and get you one.").also { stage = END_DIALOGUE }
}
}
24 -> {
end()
- setQuestStage(player!!, DeathPlateau.questName, 14)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 14)
npc!!.isWalks = false
animate(npc!!, Animations.HUMAN_EATTING_829)
runTask(npc!!, 4) {
@@ -204,7 +202,7 @@ class HaroldDialogueFile : DialogueFile() {
37 -> npcl(FacialExpression.FRIENDLY, "I'll write you out an IOU for the rest.").also { stage++ }
38 -> {
addItemOrDrop(player!!, Items.IOU_3103)
- setQuestStage(player!!, DeathPlateau.questName, 15)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 15)
sendMessage(player!!, "Harold has given you an IOU scribbled on some paper.")
sendItemDialogue(player!!, Items.IOU_3103, "Harold has given you an IOU scribbled on some paper.").also {stage = END_DIALOGUE}
}
@@ -292,7 +290,7 @@ class HaroldDialogueFile : DialogueFile() {
34 -> npcl(FacialExpression.DRUNK, "I owe you the resht!").also { stage++ }
35 -> {
addItemOrDrop(player!!, Items.IOU_3103)
- setQuestStage(player!!, DeathPlateau.questName, 15)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 15)
sendMessage(player!!, "Harold has given you an IOU scribbled on some paper.")
sendItemDialogue(player!!, Items.IOU_3103, "Harold has given you an IOU scribbled on some paper.").also {stage = END_DIALOGUE}
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/IOUNoteDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/IOUNoteDialogueFile.kt
index 0d44bc767..4a4531422 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/IOUNoteDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/IOUNoteDialogueFile.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.burthorpe.quest.deathplateau
+import content.data.Quests
import core.api.*
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
@@ -9,7 +10,7 @@ import org.rs09.consts.Items
class IOUNoteDialogueFile : DialogueFile() {
var a = 0
override fun handle(componentID: Int, buttonID: Int) {
- when (getQuestStage(player!!, DeathPlateau.questName)) {
+ when (getQuestStage(player!!, Quests.DEATH_PLATEAU)) {
in 15..16 -> {
when (stage) {
0 -> player(FacialExpression.NEUTRAL, "The IOU says that Harold owes me some money.").also { stage++ }
@@ -18,7 +19,7 @@ class IOUNoteDialogueFile : DialogueFile() {
3 -> {
if (removeItem(player!!, Items.IOU_3103)) {
addItemOrDrop(player!!, Items.COMBINATION_3102)
- setQuestStage(player!!, DeathPlateau.questName, 16)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 16)
sendItemDialogue(player!!, Items.COMBINATION_3102, "You have found the combination!").also { stage++ }
}
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SabaDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SabaDialogueFile.kt
index 3c1c90632..820fdf26e 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SabaDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SabaDialogueFile.kt
@@ -5,11 +5,12 @@ import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
import core.game.dialogue.Topic
import core.tools.END_DIALOGUE
+import content.data.Quests
class SabaDialogueFile : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
- when (getQuestStage(player!!, DeathPlateau.questName)) {
+ when (getQuestStage(player!!, Quests.DEATH_PLATEAU)) {
19 -> {
when (stage) {
0 -> player(FacialExpression.FRIENDLY, "Hello!").also { stage++ }
@@ -34,7 +35,7 @@ class SabaDialogueFile : DialogueFile() {
29 -> npcl(FacialExpression.HALF_GUILTY,"Before the trolls came there used to be a nettlesome Sherpa that took humans exploring or something equally stupid. Perhaps he'd know another way.").also { stage++ }
30 -> playerl(FacialExpression.FRIENDLY, "Where does this Sherpa live?").also { stage++ }
31 -> npcl(FacialExpression.ANNOYED,"I don't know but it can't be far as he used to be around all the time!").also {
- setQuestStage(player!!, "Death Plateau", 20)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 20)
stage = END_DIALOGUE }
}
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SecretWayLocation.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SecretWayLocation.kt
index 3a078a77d..96d821a9f 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SecretWayLocation.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/SecretWayLocation.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.burthorpe.quest.deathplateau
+import content.data.Quests
import core.api.*
import core.game.node.entity.Entity
import core.game.node.entity.player.Player
@@ -11,9 +12,9 @@ class SecretWayLocation : MapArea {
}
override fun areaEnter(entity: Entity) {
- if (entity is Player && getQuestStage(entity, DeathPlateau.questName) == 25) {
+ if (entity is Player && getQuestStage(entity, Quests.DEATH_PLATEAU) == 25) {
sendPlayerDialogue(entity, "I think this is far enough, I can see Death Plateau and it looks like the trolls haven't found the path. I'd better go and tell Denulth.")
- setQuestStage(entity, DeathPlateau.questName, 26)
+ setQuestStage(entity, Quests.DEATH_PLATEAU, 26)
}
}
}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/TenzingDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/TenzingDialogueFile.kt
index aacba1673..c69cb4a94 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/TenzingDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/deathplateau/TenzingDialogueFile.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.burthorpe.quest.deathplateau
+import content.data.Quests
import core.api.*
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
@@ -12,7 +13,7 @@ import org.rs09.consts.Items
class TenzingDialogueFile : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
- when (getQuestStage(player!!, DeathPlateau.questName)) {
+ when (getQuestStage(player!!, Quests.DEATH_PLATEAU)) {
20 -> {
when (stage) {
START_DIALOGUE -> playerl(FacialExpression.FRIENDLY, "Hello!").also { stage++ }
@@ -34,7 +35,7 @@ class TenzingDialogueFile : DialogueFile() {
20 -> npcl(FacialExpression.FRIENDLY, "Thank you traveller!").also { stage++ }
21 -> sendItemDialogue(player!!, Items.CLIMBING_BOOTS_3105, "Tenzing has given you his Climbing boots.").also {
addItemOrDrop(player!!, Items.CLIMBING_BOOTS_3105, 1)
- setQuestStage(player!!, DeathPlateau.questName, 21)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 21)
stage = END_DIALOGUE
}
30 -> npcl(FacialExpression.ANNOYED, "Hmph.").also { stage = END_DIALOGUE }
@@ -104,7 +105,7 @@ class TenzingDialogueFile : DialogueFile() {
9 -> npcl(FacialExpression.FRIENDLY, "I don't think the Trolls have found the secret way yet, if they had I would've been attacked by now.").also { stage++ }
10 -> playerl(FacialExpression.FRIENDLY, "OK thanks but I think I'd better check the path. I don't want to send the Imperial Guards to their death!").also { stage++ }
11 -> npcl(FacialExpression.FRIENDLY, "You are wise for one so young.").also {
- setQuestStage(player!!, DeathPlateau.questName, 25)
+ setQuestStage(player!!, Quests.DEATH_PLATEAU, 25)
stage = END_DIALOGUE
}
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/AchiettiesDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/AchiettiesDialogue.kt
new file mode 100644
index 000000000..be02fd712
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/AchiettiesDialogue.kt
@@ -0,0 +1,180 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+@Initializable
+class AchiettiesDialogue(player: Player? = null) : DialoguePlugin(player){
+
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, AchiettiesDialogueFile(), npc)
+ return true
+ }
+
+ override fun newInstance(player: Player?): DialoguePlugin {
+ return AchiettiesDialogue(player)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.ACHIETTIES_796)
+ }
+}
+
+class AchiettiesDialogueFile : DialogueBuilderFile() {
+
+ override fun create(b: DialogueBuilder) {
+
+ b.onQuestStages(Quests.HEROES_QUEST, 0,1)
+ .branch { player ->
+ return@branch getQuestStage(player, Quests.HEROES_QUEST)
+ }.let{ branch ->
+ branch.onValue(0)
+ .npcl(FacialExpression.FRIENDLY, "Greetings. Welcome to the Heroes' Guild.")
+ .npcl("Only the greatest heroes of this land may gain entrance to this guild.")
+ // - If the player's skill levels are lower than the quest requirements. (I think this is after 2009)
+ // linel("Before starting this quest, be aware that one or more of your skill levels are lower than what is required to fully complete it.")
+ .options()
+ .let { optionBuilder ->
+ optionBuilder.option("I'm a hero, may I apply to join?")
+ .playerl("I'm a hero. May I apply to join?")
+ .branch { player ->
+ return@branch if (HeroesQuest.hasRequirements(player)) {
+ 1
+ } else {
+ 0
+ }
+ }.let { branch ->
+ branch.onValue(0)
+ .npcl("You're a hero? I've never heard of YOU. You are required to possess at least 55 quest points to file an application.")
+ .npcl("Additionally you must have completed the Shield of Arrav, Lost City, Merlin's Crystal and Dragon Slayer quests.")
+ .end()
+ return@let branch
+ }.onValue(1)
+ .betweenStage { df, player, _, _ ->
+ if(getQuestStage(player, Quests.HEROES_QUEST) == 0) {
+ setQuestStage(player, Quests.HEROES_QUEST, 1)
+ }
+ }
+ .npcl("Well you seem to meet our initial requirements, so you may now begin the tasks to earn membership in the Heroes' Guild.")
+ .npcl("The three items required for entrance are: An Entranan Firebird feather, a Master Thieves' armband, and a cooked Lava Eel.")
+ .options()
+ .let { optionBuilder2 ->
+ optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
+ .npcl("I'm sure you have the relevant contacts to find out about that.")
+ .end()
+ optionBuilder2.option_playerl("Any hints on getting the feather?")
+ .npcl("Not really - other than Entranan firebirds tend to live on Entrana.")
+ .end()
+ optionBuilder2.option_playerl("Any hints on getting the eel?")
+ .npcl("Maybe go and find someone who knows a lot about fishing?")
+ .end()
+ optionBuilder2.option_playerl("I'll start looking for all those things then.")
+ .npcl("Good luck with that.")
+ .end()
+ }
+
+ optionBuilder.option_playerl("Good for the foremost heroes of the land.")
+ .npcl("Yes. Yes it is.")
+ .end()
+ }
+ branch.onValue(1)
+ .npcl("Greetings. Welcome to the Heroes' Guild.")
+ .npcl("How goes thy quest adventurer?")
+ .playerl("It's tough. I've not done it yet.")
+ .npcl("Remember, the items you need to enter are:")
+ .npcl("An Entranan Firebirds' feather, A Master Thieves armband, and a cooked Lava Eel.")
+ .options()
+ .let { optionBuilder2 ->
+ optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
+ .npcl("I'm sure you have the relevant contacts to find out about that.")
+ .end()
+ optionBuilder2.option_playerl("Any hints on getting the feather?")
+ .npcl("Not really - other than Entranan firebirds tend to live on Entrana.")
+ .end()
+ optionBuilder2.option_playerl("Any hints on getting the eel?")
+ .npcl("Maybe go and find someone who knows a lot about fishing?")
+ .end()
+ optionBuilder2.option_playerl("I'll start looking for all those things then.")
+ .npcl("Good luck with that.")
+ .end()
+ }
+ }
+
+ b.onQuestStages(Quests.HEROES_QUEST, 2, 3, 4)
+ .npcl("Greetings. Welcome to the Heroes' Guild.")
+ .npcl("How goes thy quest adventurer?")
+ .playerl("It's tough. I've not done it yet.")
+ .npcl("Remember, the items you need to enter are:")
+ .npcl("An Entranan Firebirds' feather, A Master Thieves armband, and a cooked Lava Eel.")
+ .options()
+ .let { optionBuilder2 ->
+ optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
+ .npcl("I'm sure you have the relevant contacts to find out about that.")
+ .end()
+ optionBuilder2.option_playerl("Any hints on getting the feather?")
+ .npcl("Not really - other than Entranan firebirds tend to live on Entrana.")
+ .end()
+ optionBuilder2.option_playerl("Any hints on getting the eel?")
+ .npcl("Maybe go and find someone who knows a lot about fishing?")
+ .end()
+ optionBuilder2.option_playerl("I'll start looking for all those things then.")
+ .npcl("Good luck with that.")
+ .end()
+ }
+
+ b.onQuestStages(Quests.HEROES_QUEST, 6)
+ .npcl("Greetings. Welcome to the Heroes' Guild.")
+ .npcl("How goes thy quest adventurer?")
+ .branch { player ->
+ return@branch if (HeroesQuest.allItemsInInventory(player)) { 1 } else { 0 }
+ }.let { branch ->
+ branch.onValue(0)
+ .playerl("It's tough. I've not done it yet.")
+ .npcl("Remember, the items you need to enter are:")
+ .npcl("An Entranan Firebirds' feather, A Master Thieves armband, and a cooked Lava Eel.")
+ .options()
+ .let { optionBuilder2 ->
+ optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
+ .npcl("I'm sure you have the relevant contacts to find out about that.")
+ .end()
+ optionBuilder2.option_playerl("Any hints on getting the feather?")
+ .npcl("Not really - other than Entranan firebirds tend to live on Entrana.")
+ .end()
+ optionBuilder2.option_playerl("Any hints on getting the eel?")
+ .npcl("Maybe go and find someone who knows a lot about fishing?")
+ .end()
+ optionBuilder2.option_playerl("I'll start looking for all those things then.")
+ .npcl("Good luck with that.")
+ .end()
+ }
+
+ branch.onValue(1)
+ .playerl("I have all the required items.")
+ .npcl("I see that you have. Well done. Now, to complete the quest, and gain entry to the Heroes' Guild in your final task all that you have to do is...")
+ .playerl("W-what? What do you mean? There's MORE?")
+ .npcl("I'm sorry, I was just having a little fun with you. Just a little Heroes' Guild humour there. What I really meant was")
+ .npcl("Congratulations! You have completed the Heroes' Guild entry requirements! You will find the door now open for you! Enter, Hero! And take this reward!")
+ .endWith { _, player ->
+ if (HeroesQuest.allItemsInInventory(player)) {
+ removeItem(player, Items.FIRE_FEATHER_1583)
+ removeItem(player, Items.LAVA_EEL_2149)
+ removeItem(player, Items.THIEVES_ARMBAND_1579)
+ if (getQuestStage(player, Quests.HEROES_QUEST) == 6) {
+ finishQuest(player, Quests.HEROES_QUEST)
+ }
+ }
+ }
+ }
+
+ b.onQuestStages(Quests.HEROES_QUEST, 100)
+ .npcl("Greetings. Welcome to the Heroes' Guild.")
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/AlfonseTheWaiterDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/AlfonseTheWaiterDialogue.kt
new file mode 100644
index 000000000..efb262b09
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/AlfonseTheWaiterDialogue.kt
@@ -0,0 +1,62 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.getQuestStage
+import core.api.openDialogue
+import core.api.openNpcShop
+import core.api.setQuestStage
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.NPCs
+
+@Initializable
+class AlfonseTheWaiterDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun newInstance(player: Player): DialoguePlugin {
+ return AlfonseTheWaiterDialogue(player)
+ }
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, AlfonseTheWaiterDialogueFile(), npc)
+ return false
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.ALFONSE_THE_WAITER_793)
+ }
+}
+class AlfonseTheWaiterDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+
+ b.onPredicate { _ -> true }
+ .npc("Welcome to the Shrimp and Parrot.", "Would you like to order, sir?")
+ .options()
+ .let { optionBuilder ->
+ optionBuilder.option_playerl("Yes please.")
+ .endWith { _, player ->
+ openNpcShop(player, npc!!.id)
+ }
+
+ optionBuilder.option_playerl("No thank you.")
+ .end()
+
+ optionBuilder.optionIf("Do you sell Gherkins?"){ player -> return@optionIf getQuestStage(
+ player,
+ Quests.HEROES_QUEST
+ ) >= 2 && HeroesQuest.isPhoenix(player) }
+ .playerl("Do you sell Gherkins?")
+ .npc("Hmmmm Gherkins eh? Ask Charlie the cook, round the", "back. He may have some 'gherkins' for you!")
+ .linel("Alfonse winks at you.")
+ .endWith { _, player ->
+ if(getQuestStage(player, Quests.HEROES_QUEST) == 2) {
+ setQuestStage(player, Quests.HEROES_QUEST, 3)
+ }
+ }
+
+ optionBuilder.option("Where do you get your Karambwan from?")
+ .npc("We buy directly off Lubufu, a local fisherman. He", "seems to have a monopoly over Karambwan sales.")
+ .end()
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/CharlieTheCookDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/CharlieTheCookDialogue.kt
new file mode 100644
index 000000000..2bd65f817
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/CharlieTheCookDialogue.kt
@@ -0,0 +1,84 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.getQuestStage
+import core.api.openDialogue
+import core.api.setQuestStage
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.NPCs
+
+@Initializable
+class CharlieTheCookDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun newInstance(player: Player): DialoguePlugin {
+ return CharlieTheCookDialogue(player)
+ }
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, CharlieTheCookDialogueFile(), npc)
+ return false
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.CHARLIE_THE_COOK_794)
+ }
+}
+class CharlieTheCookDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { _ -> true }
+ .npc(FacialExpression.ANGRY, "Hey! What are you doing back here?")
+ .options()
+ .let { optionBuilder ->
+ val continuePath = b.placeholder()
+
+ optionBuilder.optionIf("I'm looking for a gherkin...") { player -> return@optionIf getQuestStage(player, Quests.HEROES_QUEST) >= 3 && HeroesQuest.isPhoenix(player) }
+ .playerl("I'm looking for a gherkin...")
+ .goto(continuePath)
+
+ optionBuilder.optionIf("I'm a fellow member of the Phoenix Gang.") { player -> return@optionIf getQuestStage(player, Quests.HEROES_QUEST) >= 3 && HeroesQuest.isPhoenix(player) }
+ .playerl("I'm a fellow member of the Phoenix Gang.")
+ .goto(continuePath)
+
+ optionBuilder.option_playerl("Just exploring.")
+ .npcl(FacialExpression.ANGRY, "Well, get out! This kitchen isn't for exploring. It's a private establishment! It's out of bounds to customers!")
+ .end()
+
+ return@let continuePath.builder()
+ }
+ .npcl("Ah, a fellow Phoenix! So, tell me compadre... What brings you to sunny Brimhaven?")
+ .options()
+ .let { optionBuilder ->
+ optionBuilder.option_playerl("Sun, sand, and the fresh sea air!")
+ .playerl("Sun, sand, and the fresh sea air!")
+ .npcl("Well, can't say I blame you, compadre. I used to be a city boy myself, but have to admit it's a lot nicer living here nowadays. Brimhaven's certainly good for it.")
+ .playerl("I also want to steal Scarface Pete's candlesticks.")
+ .npcl("Ah yes, of course. The candlesticks. Well, I have to be honest with you, compadre, we haven't made much progress in that task ourselves so far.")
+ .npcl("We can however offer a little assistance. Setting up this restaurant was the start of things; we have a secret door out the back of here that leads through the back of Cap'n Arnav's garden.")
+ .npcl("Now, at the other side of Cap'n Arnav's garden, is an old side entrance to Scarface Pete's mansion. It seems to have been blocked off from the rest of the mansion some years ago and we can't seem to find a way through.")
+ .npcl("We're positive this is the key to entering the house undetected, however, and I promise to let you know if we find anything there.")
+ .playerl("Mind if I check it out for myself?")
+ .npcl("Not at all! The more minds we have working on the problem, the quicker we get that loot!")
+ .endWith { _, player ->
+ if (getQuestStage(player, Quests.HEROES_QUEST) == 3) {
+ setQuestStage(player, Quests.HEROES_QUEST, 4)
+ }
+ }
+
+ optionBuilder.option_playerl("I want to steal Scarface Pete's candlesticks.")
+ .npcl("Ah yes, of course. The candlesticks. Well, I have to be honest with you, compadre, we haven't made much progress in that task ourselves so far.")
+ .npcl("We can however offer a little assistance. Setting up this restaurant was the start of things; we have a secret door out the back of here that leads through the back of Cap'n Arnav's garden.")
+ .npcl("Now, at the other side of Cap'n Arnav's garden, is an old side entrance to Scarface Pete's mansion. It seems to have been blocked off from the rest of the mansion some years ago and we can't seem to find a way through.")
+ .npcl("We're positive this is the key to entering the house undetected, however, and I promise to let you know if we find anything there.")
+ .playerl("Mind if I check it out for myself?")
+ .npcl("Not at all! The more minds we have working on the problem, the quicker we get that loot!")
+ .endWith { _, player ->
+ if (getQuestStage(player, Quests.HEROES_QUEST) == 3) {
+ setQuestStage(player, Quests.HEROES_QUEST, 4)
+ }
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GarvDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GarvDialogue.kt
new file mode 100644
index 000000000..dc9433443
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GarvDialogue.kt
@@ -0,0 +1,72 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.*
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+@Initializable
+class GarvDialogue(player: Player? = null) : DialoguePlugin(player){
+
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, GarvDialogueFile(), npc)
+ return true
+ }
+
+ override fun newInstance(player: Player?): DialoguePlugin {
+ return GarvDialogue(player)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.GARV_788)
+ }
+}
+
+class GarvDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ // Technically this won't happen since you have to get past Grubor.
+ b.onQuestStages(Quests.HEROES_QUEST, 0, 1, 2)
+ .npcl("Hello. What do you want?")
+ .options()
+ .let { optionBuilder ->
+ optionBuilder.option_playerl("Can I go in there?")
+ .npcl("No. In there is private.")
+ .end()
+ optionBuilder.option_playerl("I want for nothing!")
+ .npcl("You're one of a very lucky few then.")
+ .end()
+ }
+
+ b.onQuestStages(Quests.HEROES_QUEST, 3, 4, 5, 6, 100)
+ // .npcl("Oi! Where do you think you're going pal?") - When you click on the door instead of Garv.
+ .npcl("Hello. What do you want?")
+ .playerl("Hi. I'm Hartigen. I've come to work here.")
+ .branch { player ->
+ return@branch if (inEquipment(player, Items.BLACK_FULL_HELM_1165) && inEquipment(player, Items.BLACK_PLATEBODY_1125) && inEquipment(player, Items.BLACK_PLATELEGS_1077)) { 1 } else { 0 }
+ }.let { branch ->
+ branch.onValue(1)
+ .npcl("I assume you have your I.D. papers then?")
+ .branch { player ->
+ return@branch if (inInventory(player, Items.ID_PAPERS_1584)) { 1 } else { 0 }
+ }.let { branch2 ->
+ branch2.onValue(1)
+ .npcl("You'd better come in then, Grip will want to talk to you.")
+ .endWith { _, player ->
+ if(getQuestStage(player, Quests.HEROES_QUEST) == 3) {
+ setQuestStage(player, Quests.HEROES_QUEST, 4)
+ }
+ }
+ branch2.onValue(0)
+ .playerl("Uh... Yeah. About that...I must have left them in my other suit of armour.")
+ .end()
+ }
+ branch.onValue(0)
+ .npcl("Hartigen the Black Knight? I don't think so. He doesn't dress like that.")
+ .end()
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GerrantDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GerrantDialogue.kt
new file mode 100644
index 000000000..c106acdec
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GerrantDialogue.kt
@@ -0,0 +1,66 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+@Initializable
+class GerrantDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun newInstance(player: Player): DialoguePlugin {
+ return GerrantDialogue(player)
+ }
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, GerrantDialogueFile(), npc)
+ return false
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.GERRANT_558)
+ }
+}
+class GerrantDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+
+ b.onPredicate { _ -> true }
+ .npc(FacialExpression.HAPPY, "Welcome! You can buy fishing equipment at my store.", "We'll also buy anything you catch off you.")
+ .options()
+ .let { optionBuilder ->
+ optionBuilder.option_playerl("Let's see what you've got then.")
+ .endWith { _, player ->
+ openNpcShop(player, npc!!.id)
+ }
+
+ optionBuilder.option_playerl("Sorry, I'm not interested.")
+ .end()
+
+ optionBuilder.optionIf("I want to find out how to catch a lava eel.") { player -> return@optionIf getQuestStage(player, Quests.HEROES_QUEST) >= 1 }
+ .playerl("I want to find out how to catch a lava eel.")
+ .npcl("Lava eels, eh? That's a tricky one, that is. You'll need a lava-proof fishing rod. The method for making this would be to take an ordinary fishing rod, and then cover it with fire-proof blamish oil.")
+ .branch { player ->
+ return@branch if (inInventory(player, Items.BLAMISH_SNAIL_SLIME_1581)) { 1 } else { 0 }
+ }.let { branch ->
+ branch.onValue(1)
+ .npcl("Of course, you knew that already.")
+ .playerl("So where can I fish lava eels?")
+ .npcl("Taverley dungeon or the lava maze in the Wilderness.")
+ .end()
+
+ branch.onValue(0)
+ .npcl("You know... thinking about it... I may have a jar of blamish slime around here somewhere. Now where did I put it?")
+ .linel("Gerrant searches around a bit.")
+ .betweenStage { df, player, _, _ ->
+ addItemOrDrop(player, Items.BLAMISH_SNAIL_SLIME_1581)
+ }
+ .npcl("Aha! Here it is! Take this slime, mix it with some Harralander and water and you'll have the blamish oil you need to treat your fishing rod.")
+ .end()
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GripBehavior.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GripBehavior.kt
new file mode 100644
index 000000000..62d72dc0d
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GripBehavior.kt
@@ -0,0 +1,59 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.DialogueFile
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.CombatStyle
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.npc.NPCBehavior
+import core.game.node.entity.player.Player
+import core.game.node.item.GroundItem
+import core.game.node.item.GroundItemManager
+import core.game.node.item.Item
+import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+class GripBehavior : NPCBehavior(NPCs.GRIP_792) {
+ // Attacking Grip
+ override fun canBeAttackedBy(self: NPC, attacker: Entity, style: CombatStyle, shouldSendMessage: Boolean): Boolean {
+ // You cannot attack if you are a black arm gang member.
+ if (attacker is Player && HeroesQuest.isBlackArm(attacker)) {
+ openDialogue(attacker, object : DialogueFile() {
+ override fun handle(componentID: Int, buttonID: Int) {
+ when (stage) {
+ //"I can't attack the head guard here! There are too", "many witnesses around to see me do it! I'd have the", "whole of Brimhaven after me! Besides, if he dies I want", "the promotion!"
+ START_DIALOGUE -> sendPlayerDialogue(attacker, "I can't attack the head guard here! There are too many witnesses around to see me do it! I'd have the whole of Brimhaven after me! Besides, if he dies I want the promotion!") .also { stage++ }
+ 1 -> sendDialogueLines(attacker, "Perhaps you need another player's help...?").also {
+ stage = END_DIALOGUE
+ }
+ }
+ }
+ })
+ return false
+ }
+ return true
+ }
+
+ override fun onDeathFinished(self: NPC, killer: Entity) {
+ if (killer is Player) {
+ if (getQuestStage(killer, Quests.HEROES_QUEST) == 4) {
+ setQuestStage(killer, Quests.HEROES_QUEST, 5)
+ }
+
+ val gi = GroundItem(
+ Item(Items.GRIPS_KEY_RING_1588),
+ self.location,
+ 5000,
+ null,
+ )
+ gi.forceVisible = true
+ gi.isRemainPrivate = false
+
+ val gim = GroundItemManager.create(gi)
+ gim.isRemainPrivate = false
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GripDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GripDialogue.kt
new file mode 100644
index 000000000..4146b03e6
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GripDialogue.kt
@@ -0,0 +1,118 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+@Initializable
+class GripDialogue(player: Player? = null) : DialoguePlugin(player){
+
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, GripDialogueFile(), npc)
+ return true
+ }
+
+ override fun newInstance(player: Player?): DialoguePlugin {
+ return GripDialogue(player)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.GRIP_792)
+ }
+}
+
+class GripDialogueFile : DialogueBuilderFile() {
+
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { _ -> true }
+ .branch { player ->
+ return@branch if (getAttribute(player, HeroesQuest.attributeGripTookPapers, false)) { 1 } else { 0 }
+ }.let { branch ->
+ val continuePath = b.placeholder()
+ branch.onValue(1)
+ .goto(continuePath)
+ branch.onValue(0)
+ .playerl("Hi there. I am Hartigen, reporting for duty as your new deputy sir!")
+ .npcl("Ah good, at last. You took your time getting here! Now let me see...")
+ .npcl("I'll get your hours and duty roster sorted out in a while. Oh, and do you have your I.D. papers with you? Internal security is almost as important as external security for a guard.")
+ .branch { player ->
+ return@branch if (inInventory(player, Items.ID_PAPERS_1584)) { 1 } else { 0 }
+ }.let { branch ->
+ val continuePath2 = b.placeholder()
+ branch.onValue(1)
+ .playerl("Right here sir!")
+ .linel("You hand the ID papers over to Grip.")
+ .betweenStage { df, player, _, _ ->
+ if (removeItem(player, Items.ID_PAPERS_1584)) {
+ setAttribute(player, HeroesQuest.attributeGripTookPapers, true)
+ }
+ }
+ .goto(continuePath2)
+ branch.onValue(0)
+ .playerl("Oh, dear. I don't have that with me any more.")
+ .npcl("Well, that's no good! Go get them immediately, then report back for duty.")
+ .end()
+ return@let continuePath2.builder()
+ }
+ .goto(continuePath)
+ return@let continuePath.builder()
+ }
+ .options()
+ .let { optionBuilder ->
+ val returnJoin = b.placeholder()
+
+ optionBuilder.option_playerl("So can I please guard the treasure room please?")
+ .npcl("Well, I might post you outside it sometimes. I prefer to be the only one allowed inside however.")
+ .npcl("There's some pretty valuable artefacts in there! Those keys stay ONLY with the head guard and Scarface Pete.")
+ .goto(returnJoin)
+
+ optionBuilder.optionIf("So what do my duties involve?") { player ->
+ return@optionIf !getAttribute(player, HeroesQuest.attributeGripSaidDuties, false)
+ }
+ .betweenStage { _, player, _, _ ->
+ setAttribute(player, HeroesQuest.attributeGripSaidDuties, true)
+ }
+ .playerl("So what do my duties involve?")
+ .npcl("You'll have various guard related duties on various shifts. I'll assign specific duties as they are required as and when they become necessary. Just so you know, if anything happens to me")
+ .npcl("you'll need to take over as head guard here. You'll find important keys to the treasure room and Pete's quarters inside my jacket - although I doubt anything bad's going to happen to")
+ .npcl("me anytime soon!")
+ .linel("Grip laughs to himself at the thought.")
+ .goto(returnJoin)
+
+ optionBuilder.option_playerl("Well, I'd better sort my new room out.")
+ .npcl("Yeah, I'll give you time to settle in. Better get a good night's sleep, I expect you to report for duty at oh five hundred hours tomorrow on the dot!")
+ .end()
+
+
+ optionBuilder.optionIf("Anything I can do now?") { player ->
+ return@optionIf getAttribute(player, HeroesQuest.attributeGripSaidDuties, false)
+ }
+ .playerl("Anything I can do now?")
+ .branch { player ->
+ return@branch if (inInventory(player, Items.MISCELLANEOUS_KEY_1586)) {
+ 1
+ } else {
+ 0
+ }
+ }.let { branch ->
+ branch.onValue(1)
+ .npcl("Can't think of anything right now.")
+ .end()
+
+ branch.onValue(0)
+ .npcl("Hmm. Well, you could find out what this key opens for me. Apparently it's for something in this building, but for the life of me I can't find what.")
+ .linel("Grip hands you a key.")
+ .endWith { _, player ->
+ addItemOrDrop(player, Items.MISCELLANEOUS_KEY_1586)
+ }
+ }
+
+ returnJoin.builder()
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GruborDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GruborDialogue.kt
new file mode 100644
index 000000000..958d893b5
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/GruborDialogue.kt
@@ -0,0 +1,87 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.NPCs
+
+@Initializable
+class GruborDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun newInstance(player: Player): DialoguePlugin {
+ return GruborDialogue(player)
+ }
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, GruborDialogueFile(), npc)
+ return false
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.GRUBOR_789)
+ }
+}
+
+class GruborDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+
+ b.onPredicate { player ->
+ getQuestStage(player, Quests.HEROES_QUEST) >= 2 &&
+ getAttribute(player, HeroesQuest.attributeGruborLetsYouIn, false) &&
+ HeroesQuest.isBlackArm(player)
+ }
+ .playerl("Hi.")
+ .npcl("Hi, I'm a little busy right now.")
+ .end()
+
+ b.onPredicate { player ->
+ getQuestStage(player, Quests.HEROES_QUEST) >= 2 &&
+ !getAttribute(player, HeroesQuest.attributeGruborLetsYouIn, false) &&
+ HeroesQuest.isBlackArm(player)
+ }
+ .npcl(FacialExpression.THINKING, "Yes? What do you want?")
+ .options()
+ .let { optionBuilder ->
+
+ optionBuilder.option_playerl("Rabbit's foot.")
+ .npcl("Eh? What are you on about? Go away!")
+ .end()
+
+ optionBuilder.option_playerl("Four leaved clover.")
+ .npcl("Oh you're one of the gang are you? Ok, hold up a second, I'll just let you in through here.")
+ .linel("You hear the door being unbarred from inside.")
+ .endWith { _, player ->
+ setAttribute(player, HeroesQuest.attributeGruborLetsYouIn, true)
+ }
+
+ optionBuilder.option_playerl("Lucky horseshoe.")
+ .npcl("Eh? What are you on about? Go away!")
+ .end()
+
+ optionBuilder.option_playerl("Black cat.")
+ .npcl("Eh? What are you on about? Go away!")
+ .end()
+ }
+
+
+ b.onPredicate { _ -> true }
+ .npcl(FacialExpression.THINKING, "Yes? What do you want?")
+ .options()
+ .let { optionBuilder ->
+
+ optionBuilder.option_playerl("Would you like your hedges trimming?")
+ .npcl("Eh? Don't be daft! We don't even HAVE any hedges!")
+ .end()
+
+ optionBuilder.option_playerl("I want to come in.")
+ .npcl("No, go away.")
+ .end()
+
+ optionBuilder.option_playerl("Do you want to trade?")
+ .npcl("No, I'm busy.")
+ .end()
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/HeroesQuest.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/HeroesQuest.kt
new file mode 100644
index 000000000..7eadbf5e5
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/HeroesQuest.kt
@@ -0,0 +1,262 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import content.region.misthalin.varrock.quest.shieldofarrav.ShieldofArrav
+import core.api.*
+import core.game.node.entity.player.Player
+import core.game.node.entity.player.link.quest.Quest
+import core.game.node.entity.skill.Skills
+import core.plugin.Initializable
+import org.rs09.consts.Items
+
+/**
+ * Heroes' Quest
+ */
+@Initializable
+class HeroesQuest : Quest(Quests.HEROES_QUEST,75, 74, 1, 188, 0, 1, 15) {
+ /**
+ * Do note: "other players can help you even if they have already finished Heroes' Quest"
+ * 1 - Talked to Achietties to start the quest
+ *
+ * PHOENIX
+ * 2 - Talked to Katrine
+ * 3 - Talked to Alfonse
+ * 4 - Talked to Charlie
+ * 5 - HIDDEN Killed Grip (You need key from Black Arm Friend)
+ * 6 - Talked to Katrine with Candlestick
+ * BLACK ARM
+ * 2 - Talked to Straven
+ * 3 - Talked to Trobert
+ * 4 - Talked to Garv
+ * 5 - HIDDEN Unlocked Chest (You need Grip killed from Phoenix Friend)
+ * 6 - Talked to Katrine with Candlestick
+ *
+ * 100 - Achiettes with all the items
+ */
+
+ companion object {
+ const val attributeGruborLetsYouIn = "/save:quest:heroesquest-gruborletsyouin"
+ const val attributeGripTookPapers = "/save:quest:heroesquest-griptookpapers"
+ const val attributeGripSaidDuties = "/save:quest:heroesquest-gripsaidduties"
+ const val attributeHasOpenedBackdoor = "/save:quest:heroesquest-hasopenedbackdoor"
+ const val attributeHasOpenedChestDoor = "/save:quest:heroesquest-hasopenedchestdoor"
+
+ fun checkQuestsAreComplete(player: Player): Boolean {
+ return isQuestComplete(player, Quests.SHIELD_OF_ARRAV) &&
+ isQuestComplete(player, Quests.LOST_CITY) &&
+ isQuestComplete(player, Quests.MERLINS_CRYSTAL) &&
+ isQuestComplete(player, Quests.DRAGON_SLAYER) &&
+ getQuestPoints(player) >= 55
+ }
+
+ /** Abstraction of Shield of Arrav isPhoenix function */
+ fun isPhoenix(player: Player): Boolean {
+ return ShieldofArrav.isPhoenix(player)
+ }
+
+ /** Abstraction of Shield of Arrav isBlackArm function */
+ fun isBlackArm(player: Player): Boolean {
+ return ShieldofArrav.isBlackArm(player)
+ }
+
+ fun hasRequirements(player: Player): Boolean {
+ return arrayOf(
+ hasLevelStat(player, Skills.HERBLORE, 25),
+ hasLevelStat(player, Skills.MINING, 50),
+ hasLevelStat(player, Skills.FISHING, 53),
+ hasLevelStat(player, Skills.COOKING, 53),
+ isQuestComplete(player, Quests.SHIELD_OF_ARRAV),
+ isQuestComplete(player, Quests.LOST_CITY),
+ isQuestComplete(player, Quests.MERLINS_CRYSTAL),
+ isQuestComplete(player, Quests.DRAGON_SLAYER),
+ getQuestPoints(player) >= 55,
+ ).all { it }
+ }
+
+ fun allItemsInInventory(player: Player): Boolean {
+ return inInventory(player, Items.FIRE_FEATHER_1583) &&
+ inInventory(player, Items.LAVA_EEL_2149) &&
+ inInventory(player, Items.THIEVES_ARMBAND_1579)
+ }
+ }
+
+ override fun drawJournal(player: Player?, stage: Int) {
+ super.drawJournal(player, stage)
+ var line = 12
+ var stage = getStage(player)
+
+ var started = getQuestStage(player!!, Quests.HEROES_QUEST) > 0
+
+ if(!started){
+ if (checkQuestsAreComplete(player)) {
+ line(player, "I can start this quest by speaking to !!Achietties?? at the", line++)
+ line(player, "!!Heroes' Guild?? located !!North?? of !!Taverly??", line++)
+ line(player, "as all required quests are complete, and I have enough QP.", line++)
+ } else {
+ line(player, "I can start this quest by speaking to !!Achietties?? at the", line++)
+ line(player, "!!Heroes' Guild?? located !!North?? of !!Taverly?? after completing", line++)
+ line(player, "!!The Shield of Arrav??", line++, isQuestComplete(player, Quests.SHIELD_OF_ARRAV))
+ line(player, "!!The Lost City??", line++, isQuestComplete(player, Quests.LOST_CITY))
+ line(player, "!!Merlin's Crystal??", line++, isQuestComplete(player, Quests.MERLINS_CRYSTAL))
+ line(player, "!!The Dragon Slayer??", line++, isQuestComplete(player, Quests.DRAGON_SLAYER))
+ line(player, "!!and gaining 55 Quest Points??", line++, getQuestPoints(player) >= 55)
+ }
+ line(player, "To complete this quest I need:", line++, false)
+ line(player, "!!Level 25 Herblore??", line++, hasLevelStat(player, Skills.HERBLORE, 25))
+ line(player, "!!Level 50 Mining??", line++, hasLevelStat(player, Skills.MINING, 50))
+ line(player, "!!Level 53 Fishing??", line++, hasLevelStat(player, Skills.FISHING, 53))
+ line(player, "!!Level 53 Cooking??", line++, hasLevelStat(player, Skills.COOKING, 53))
+ } else if (stage < 100) {
+ line(player, "!!Achietties?? will let me into the !!Heroes' Guild?? if I can get:", line++)
+
+ // This is completely dependent on what you have in your inventory.
+ if (inInventory(player, Items.FIRE_FEATHER_1583)) {
+ line(player, "An Entranan Firebird Feather - I now have one on me!", line++, true)
+ } else {
+ line(player, "An !!Entranan Firebird Feather?? - I should check on !!Entrana??", line++)
+ }
+
+ // This is completely dependent on what you have in your inventory.
+ if (inInventory(player, Items.LAVA_EEL_2149)) {
+ line(player, "A cooked lava eel - I now have one on me!", line++, true)
+ } else {
+ line(player, "A !!cooked lava eel?? - I should speak to a !!Fishing Expert??", line++)
+ }
+
+ if (isPhoenix(player)) {
+ if (inInventory(player, Items.THIEVES_ARMBAND_1579)) {
+ line(player, "A Master Thieves Armband - I now have one on me!", line++, true)
+ } else {
+ line(player, "A !!Master Thieves Armband?? - the !!Phoenix Gang can help me??", line++)
+ }
+
+ if (!inInventory(player, Items.THIEVES_ARMBAND_1579)) {
+ if (stage >= 2) {
+ line(player, "I spoke to Straven about the Master Thieves Armband.", line++, true)
+ }
+
+ if (stage >= 3) {
+ line(player, "Then I told Alfonse the password 'Gherkin'.", line++, true)
+ } else if (stage >= 2) {
+ line(player, "He told me I can get one by stealing !!Pete's Candlestick??", line++)
+ line(player, "I should use the password he gave me at !!Brimhaven??", line++)
+ }
+
+ if (stage >= 4) {
+ line(player, "Charlie told me about a secret door into Scarface Pete's", line++, true)
+ line(player, "hideout, but he couldn't find a way of getting through it.", line++, true)
+ } else if (stage >= 3) {
+ line(player, "He said, secretly speak to !!Charlie?? round the back.", line++)
+ }
+
+ if (stage >= 6) {
+ line(player, "A rival gang member collected a candlestick for me after I", line++, true)
+ line(player, "killed Grip and got the Treasure Room key for them.", line++, true)
+ line(player, "I gave Straven Scarface Pete's candlestick, and in reward", line++, true)
+ line(player, "he gave me a Master Thieves Armband to prove my skills.", line++, true)
+ } else if (stage >= 4) {
+ line(player, "Maybe !!another player?? can help to get through this !!door???.", line++)
+ }
+ }
+ }
+ if (isBlackArm(player)) {
+ if (inInventory(player, Items.THIEVES_ARMBAND_1579)) {
+ line(player, "A Master Thieves Armband - I now have one on me!", line++, true)
+ } else {
+ line(player, "A !!Master Thieves Armband?? - the !!Black Arms can help me??", line++)
+ }
+
+ if (!inInventory(player, Items.THIEVES_ARMBAND_1579)) {
+ if (stage >= 2) {
+ line(player, "I spoke to Katrine about the Master Thieves Armband.", line++, true)
+ }
+
+ if (stage >= 3) {
+ line(player, "I used the Black Arm password to enter the Brimhaven HQ.", line++, true)
+ } else if (stage >= 2) {
+ line(player, "She told me I can get one by stealing !!Pete's Candlestick??", line++)
+ line(player, "I should use the password she gave me at !!Brimhaven??", line++)
+ }
+
+ if (stage >= 4) {
+ line(player, "I managed to pass myself off as Hartigen and enter the", line++, true)
+ line(player, "HQ.", line++, true)
+ } else if (stage >= 3) {
+ line(player, "I need to disguise myself as !!Hartigen the Black Knight?? in", line++)
+ line(player, "order to get inside !!Scarface Pete's hideout??", line++)
+ }
+
+ if (stage >= 6) {
+ line(player, "I collected the candlesticks with the Treasure Room key", line++, true)
+ line(player, "after a rival gang member killed Grip.", line++, true)
+ line(player, "I gave Katrine Scarface Pete's candlestick, and in reward", line++, true)
+ line(player, "she gave me a Master Thieves Armband to prove my skills.", line++, true)
+ } else if (stage >= 4) {
+ line(player, "I can move around the hideout, but now I need Grips keys", line++)
+ line(player, "to get into the treasure room and get the candlesticks.", line++)
+ line(player, "I need !!another player's help?? with this, as it's so risky.", line++)
+ }
+ }
+ }
+
+ if (allItemsInInventory(player)) {
+ line(player, "Now that I have !!all the required items??, I should go and speak to", line++)
+ line(player, "!!Achietties?? and give them to her", line++)
+ }
+ } else {
+ // Everything above is replaced by this.
+ line(player, "I gave Achietties an Entranan Firebird Feather, A cooked", line++, true)
+ line(player, "lava eel from a dangerous fishing spot and after some", line++, true)
+ line(player, "difficulty, a Master Thief Armband.", line++, true)
+ line(player, "Once I had handed these over to Achietties I had proved", line++, true)
+ line(player, "myself worthy of entrance to the Heroes' Guild.", line++, true)
+ line++
+ line++
+ line(player,"QUEST COMPLETE!", line)
+ }
+ }
+
+ override fun reset(player: Player) {
+ if (getQuestStage(player, Quests.HEROES_QUEST) == 0) {
+ removeAttribute(player, attributeGruborLetsYouIn)
+ removeAttribute(player, attributeGripTookPapers)
+ removeAttribute(player, attributeGripSaidDuties)
+ removeAttribute(player, attributeHasOpenedBackdoor)
+ removeAttribute(player, attributeHasOpenedChestDoor)
+
+ // For testing: if you set quest stage to 0, it will switch your gang (blackarm <-> phoenix)
+ // Remember to set stage to 0 twice to keep your gang.
+ println("Swapping gang for Heroes Quest.")
+ ShieldofArrav.swapGang(player)
+ }
+ }
+
+ override fun finish(player: Player) {
+ var ln = 10
+ super.finish(player)
+ player.packetDispatch.sendString("You have completed the Heroes Quest!", 277, 4)
+ player.packetDispatch.sendItemZoomOnInterface(Items.DRAGON_BATTLEAXE_1377, 240, 277, 5)
+
+ drawReward(player,"1 Quest Point", ln++)
+ drawReward(player,"Access to the Heroes' Guild", ln++)
+ drawReward(player,"A total of 29,232 XP spread", ln++)
+ drawReward(player,"over twelve skills", ln++)
+
+ rewardXP(player, Skills.ATTACK, 3075.0)
+ rewardXP(player, Skills.DEFENCE, 3075.0)
+ rewardXP(player, Skills.STRENGTH, 3075.0)
+ rewardXP(player, Skills.HITPOINTS, 3075.0)
+ rewardXP(player, Skills.RANGE, 2075.0)
+ rewardXP(player, Skills.FISHING, 2725.0)
+ rewardXP(player, Skills.COOKING, 2825.0)
+ rewardXP(player, Skills.WOODCUTTING, 1575.0)
+ rewardXP(player, Skills.FIREMAKING, 1575.0)
+ rewardXP(player, Skills.SMITHING, 2725.0)
+ rewardXP(player, Skills.MINING, 2575.0)
+ rewardXP(player, Skills.HERBLORE, 1325.0)
+ }
+
+ override fun newInstance(`object`: Any?): Quest {
+ return this
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/HeroesQuestListener.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/HeroesQuestListener.kt
new file mode 100644
index 000000000..8764e7ba2
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/HeroesQuestListener.kt
@@ -0,0 +1,155 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.DialogueFile
+import core.game.dialogue.FacialExpression
+import core.game.dialogue.Topic
+import core.game.global.action.DoorActionHandler
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.combat.ImpactHandler
+import core.game.node.entity.npc.NPC
+import core.game.node.item.GroundItem
+import core.game.world.map.Location
+import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+import org.rs09.consts.Scenery
+
+class HeroesQuestListener: InteractionListener {
+
+ override fun defineListeners() {
+ // Black arm gang office door.
+ on(Scenery.DOOR_2626, IntType.SCENERY, "open") { player, node ->
+ if (getQuestStage(player, Quests.HEROES_QUEST) >= 2 &&
+ getAttribute(player, HeroesQuest.attributeGruborLetsYouIn, false) &&
+ HeroesQuest.isBlackArm(player)) {
+ DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
+ } else {
+ openDialogue(player, GruborDialogueFile(), NPC(NPCs.GRUBOR_789))
+ }
+ return@on true
+ }
+
+ // Kitchen entrance
+ on(Scenery.DOOR_2628, IntType.SCENERY, "open") { player, node ->
+ if (getQuestStage(player, Quests.HEROES_QUEST) >= 3 && HeroesQuest.isPhoenix(player)) {
+ DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
+ } else {
+ sendDialogue(player, "This door is locked.")
+ }
+ return@on true
+ }
+
+ // Kitchen wall
+ on(Scenery.WALL_2629, IntType.SCENERY, "push") { player, node ->
+ if (getQuestStage(player, Quests.HEROES_QUEST) >= 4 && HeroesQuest.isPhoenix(player)) {
+ DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
+ } else {
+ openDialogue(player, CharlieTheCookDialogueFile(), NPC(NPCs.CHARLIE_THE_COOK_794))
+ }
+ return@on true
+ }
+
+ // Mansion frontdoor
+ on(Scenery.DOOR_2627, IntType.SCENERY, "open") { player, node ->
+ if (getQuestStage(player, Quests.HEROES_QUEST) >= 4 && HeroesQuest.isBlackArm(player)) {
+ DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
+ } else {
+ openDialogue(player, GarvDialogueFile(), NPC(NPCs.GARV_788))
+ }
+ return@on true
+ }
+
+ // Cupboard
+
+ on(Scenery.CUPBOARD_2636, IntType.SCENERY, "search") { player, node ->
+ openDialogue(player, object : DialogueFile() {
+ override fun handle(componentID: Int, buttonID: Int) {
+ when (stage) {
+ START_DIALOGUE -> sendNPCDialogue(player, NPCs.PIRATE_GUARD_799, "I don't think Mr Grip will like you opening that. That's his private drinks cabinet.") .also { stage++ }
+ 1 -> showTopics(
+ Topic(FacialExpression.NEUTRAL, "He won't notice me having a quick look.", 2),
+ Topic(FacialExpression.NEUTRAL, "Ok, I'll leave it.", END_DIALOGUE)
+ )
+ 2 -> end().also {
+ val gripNpc = findNPC(NPCs.GRIP_792)
+ sendChat(gripNpc!!, "Stay out of my drinks cabinet!")
+ forceWalk(gripNpc, Location(2777, 3198, 0), "smart")
+ }
+ }
+ }
+ })
+ return@on true
+ }
+
+ // Mansion backdoor
+ on(Scenery.DOOR_2622, IntType.SCENERY, "open") { player, node ->
+ if (getAttribute(player, HeroesQuest.attributeHasOpenedBackdoor, false)) {
+ DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
+ } else {
+ sendDialogue(player, "This door is locked.")
+ }
+ return@on true
+ }
+ onUseWith(IntType.SCENERY, Items.MISCELLANEOUS_KEY_1586, Scenery.DOOR_2622) { player, used, with ->
+ setAttribute(player, HeroesQuest.attributeHasOpenedBackdoor, true)
+ DoorActionHandler.handleAutowalkDoor(player, with.asScenery())
+ return@onUseWith true
+ }
+
+ // Chest door
+ on(Scenery.DOOR_2621, IntType.SCENERY, "open") { player, node ->
+ if (getAttribute(player, HeroesQuest.attributeHasOpenedChestDoor, false)) {
+ DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
+ } else {
+ sendDialogue(player, "This door is locked.")
+ }
+ return@on true
+ }
+ onUseWith(IntType.SCENERY, Items.GRIPS_KEY_RING_1588, Scenery.DOOR_2621) { player, used, with ->
+ setAttribute(player, HeroesQuest.attributeHasOpenedChestDoor, true)
+ DoorActionHandler.handleAutowalkDoor(player, with.asScenery())
+ return@onUseWith true
+ }
+
+ // Chest
+ on(Scenery.CHEST_2632, IntType.SCENERY, "open"){ player, node ->
+ replaceScenery(node as core.game.node.scenery.Scenery, Scenery.CHEST_2633, -1)
+ return@on true
+ }
+ on(Scenery.CHEST_2633, IntType.SCENERY, "close"){ player, node ->
+ replaceScenery(node as core.game.node.scenery.Scenery, Scenery.CHEST_2632, -1)
+ return@on true
+ }
+ on(Scenery.CHEST_2633, IntType.SCENERY, "search"){ player, node ->
+ if (inInventory(player, Items.PETES_CANDLESTICK_1577)) {
+ sendMessage(player, "You search the chest but find nothing.")
+ } else {
+ if (getQuestStage(player, Quests.HEROES_QUEST) == 4) {
+ setQuestStage(player, Quests.HEROES_QUEST, 5)
+ }
+ sendDialogue(player, "You find two candlesticks in the chest. So that will be one for you, and one for the person who killed Grip for you.")
+ addItemOrDrop(player, Items.PETES_CANDLESTICK_1577, 2)
+ }
+ return@on true
+ }
+
+ //
+ on(Items.FIRE_FEATHER_1583, IntType.GROUNDITEM, "take") { player, groundItem ->
+ if (inEquipment(player, Items.ICE_GLOVES_1580)) {
+ addItem(player, Items.FIRE_FEATHER_1583)
+ removeGroundItem(groundItem as GroundItem)
+ } else {
+ sendChat(player, "Ouch!")
+ player.impactHandler.manualHit(player, 9, ImpactHandler.HitsplatType.NORMAL)
+ sendMessage(player, "It is too hot to take. You need something cold to pick it up with.")
+ }
+ return@on true
+ }
+
+ // OilFishingRodListener.kt + DrinkBlamishOilListener.kt + FinishedPotion.java
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/KatrineDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/KatrineDialogueFile.kt
new file mode 100644
index 000000000..f5c3f1d56
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/KatrineDialogueFile.kt
@@ -0,0 +1,127 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.*
+import org.rs09.consts.Items
+
+class KatrineDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ // 0 is handled by default in the old KatrineDialogue.
+ b.onQuestStages(Quests.HEROES_QUEST, 1)
+ .playerl("Hey.")
+ .npcl("Hey.")
+ .options()
+ .let { optionBuilder ->
+
+ optionBuilder.option_playerl("Who are all those people in there?")
+ .npcl("They're just various rogues and thieves.")
+ .playerl("They don't say a lot...")
+ .npcl("Nope.")
+ .end()
+
+ optionBuilder.option_playerl("Is there any way I can get the rank of master thief?")
+ .npcl("Master thief? Ain't we the ambitious one!")
+ .npcl("Well, you're gonna have to do something pretty amazing.")
+ .playerl("Anything you can suggest?")
+ .npcl("Well, some of the MOST coveted prizes in thiefdom right now are in the pirate town of Brimhaven on Karamja.")
+ .npcl("The pirate leader Scarface Pete has a pair of extremely valuable candlesticks.")
+ .npcl("His security is VERY good.")
+ .npcl("We, of course, have gang members in a town like Brimhaven who may be able to help you.")
+ .npcl("Visit our hideout in the alleyway on palm street.")
+ .npcl("To get in you will need to tell them the secret password 'four leaved clover'.")
+ .endWith { _, player ->
+ if(getQuestStage(player, Quests.HEROES_QUEST) == 1) {
+ setQuestStage(player, Quests.HEROES_QUEST, 2)
+ }
+ }
+
+ }
+
+ // This is not authentic, she falls back to a boring default conversation, but I guess people might need help during the quest
+ b.onQuestStages(Quests.HEROES_QUEST, 2, 3, 4)
+ .playerl("What am I supposed to be doing again?")
+ .npcl("You told me you wanted to get the rank of master thief! Now pay attention.")
+ .npcl("Some of the MOST coveted prizes in thiefdom right now are in the pirate town of Brimhaven on Karamja.")
+ .npcl("The pirate leader Scarface Pete has a pair of extremely valuable candlesticks.")
+ .npcl("His security is VERY good.")
+ .npcl("We, of course, have gang members in a town like Brimhaven who may be able to help you.")
+ .npcl("Visit our hideout in the alleyway on palm street.")
+ .npcl("To get in you will need to tell them the secret password 'four leaved clover'.")
+ .end()
+
+ // As FYI, the fallback for 2,3,4 is
+ /**
+ * .options()
+ * .let { optionBuilder ->
+ * optionBuilder.option_playerl("Who are all those people in there?")
+ * .npcl("They're just various rogues and thieves.")
+ * .playerl("They don't say a lot...")
+ * .npcl("Nope.")
+ * .end()
+ * optionBuilder.option("Teach me to be a top class criminal!")
+ * .playerl("Teach me to be a top class criminal.")
+ * .npcl("Teach yourself.")
+ * .end()
+ *
+ *
+ *
+ * Player:
+ * I have a candlestick now!
+ * Katrine:
+ * Good for you. I'll give a master thief's armband to the one who retrieved that. I know it wasn't you.
+ */
+
+
+ b.onQuestStages(Quests.HEROES_QUEST, 5)
+ .branch { player ->
+ return@branch if (inInventory(player, Items.PETES_CANDLESTICK_1577)) { 1 } else { 0 }
+ }.let { branch ->
+ branch.onValue(1)
+ .options()
+ .let { optionBuilder ->
+ optionBuilder.option_playerl("Who are all those people in there?")
+ .npcl("They're just various rogues and thieves.")
+ .playerl("They don't say a lot...")
+ .npcl("Nope.")
+ .end()
+ optionBuilder.option("I have a candlestick now.")
+ .playerl("I have a candlestick now!")
+ .npcl("Wow... is... it REALLY it?")
+ .npcl("This really is a FINE bit of thievery.")
+ .npcl("Us thieves have been trying to get hold of this one for a while!")
+ .npc("You wanted to be ranked as a master thief didn't you?", "Well, I guess this just about ranks as good enough!")
+ .linel("Katrine gives you a master thief armband.")
+ .endWith { _, player ->
+ if (removeItem(player, Items.PETES_CANDLESTICK_1577)) {
+ addItemOrDrop(player, Items.THIEVES_ARMBAND_1579)
+ if (getQuestStage(player, Quests.HEROES_QUEST) == 5) {
+ setQuestStage(player, Quests.HEROES_QUEST, 6)
+ }
+ }
+ }
+
+ branch.onValue(0)
+ .playerl("What am I supposed to be doing again?")
+ .npcl("You told me you wanted to get the rank of master thief! Now pay attention.")
+ .npcl("Some of the MOST coveted prizes in thiefdom right now are in the pirate town of Brimhaven on Karamja.")
+ .npcl("The pirate leader Scarface Pete keeps an extremely valuable candlesticks.")
+ .npcl("His security is VERY good.")
+ .npcl("We, of course, have gang members in a town like Brimhaven who may be able to help you.")
+ .npcl("Visit our hideout in the alleyway on palm street.")
+ .npcl("To get in you will need to tell them the secret password 'four leaved clover'.")
+ .end()
+ }
+ }
+
+ // I lost the armband and some stupid default shit.
+ b.onQuestStages(Quests.HEROES_QUEST, 6)
+ .playerl("I have lost my master thief's armband...")
+ .npcl("Lucky I 'ave a spare ain't it? Don't lose it again.")
+ .endWith { _, player ->
+ addItemOrDrop(player, Items.THIEVES_ARMBAND_1579)
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/StravenDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/StravenDialogueFile.kt
new file mode 100644
index 000000000..68d236905
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/StravenDialogueFile.kt
@@ -0,0 +1,73 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.*
+import org.rs09.consts.Items
+
+class StravenDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ // 0 is handled by default in the old StravenDialogue.
+ b.onQuestStages(Quests.HEROES_QUEST, 1)
+ .playerl("How would I go about getting a Master Thief armband?")
+ .npcl("Ooh... tricky stuff. Took me YEARS to get that rank.")
+ .npcl("Well, what some of the more aspiring thieves in our gang are working on right now is to steal some very valuable candlesticks from Scarface Pete - the pirate leader on Karamja.")
+ .npcl("His security is excellent, and the target very valuable so that might be enough to get you the rank.")
+ .npcl("Go talk to our man Alfonse, the waiter in the Shrimp and Parrot.")
+ .npcl("Use the secret word 'gherkin' to show you're one of us.")
+ .endWith { _, player ->
+ if(getQuestStage(player, Quests.HEROES_QUEST) == 1) {
+ setQuestStage(player, Quests.HEROES_QUEST, 2)
+ }
+ }
+
+ b.onQuestStages(Quests.HEROES_QUEST, 2, 3, 4)
+ .playerl("What am I supposed to be doing again?")
+ .npcl("You told me you wanted to get a Master thief's armband! Now pay attention.")
+ .npcl("Some of the more aspiring thieves in our gang are working on right now is to steal some very valuable candlesticks from Scarface Pete - the pirate leader on Karamja.")
+ .npcl("His security is excellent, and the target very valuable so that might be enough to get you the rank.")
+ .npcl("Go talk to our man Alfonse, the waiter in the Shrimp and Parrot.")
+ .npcl("Use the secret word 'gherkin' to show you're one of us.")
+ .end()
+
+
+ b.onQuestStages(Quests.HEROES_QUEST, 5)
+ .branch { player ->
+ return@branch if (inInventory(player, Items.PETES_CANDLESTICK_1577)) { 1 } else { 0 }
+ }.let { branch ->
+ branch.onValue(1)
+ .playerl("I have retrieved a candlestick!")
+ .npcl("Hmmm. Not bad, not bad. Let's see it, make sure it's genuine.")
+ .linel("You hand Straven the candlestick.")
+ .playerl("So is this enough to get me a Master Thief armband?")
+ .npcl("Hmm... I dunno... Aww, go on then. I suppose I'm in a generous mood today.")
+ .linel("Straven hands you a Master Thief armband.")
+ .endWith { _, player ->
+ if (removeItem(player, Items.PETES_CANDLESTICK_1577)) {
+ addItemOrDrop(player, Items.THIEVES_ARMBAND_1579)
+ if (getQuestStage(player, Quests.HEROES_QUEST) == 5) {
+ setQuestStage(player, Quests.HEROES_QUEST, 6)
+ }
+ }
+ }
+
+ branch.onValue(0)
+ .playerl("What am I supposed to be doing again?")
+ .npcl("You told me you wanted to get a Master thief's armband! Now pay attention.")
+ .npcl("Some of the more aspiring thieves in our gang are working on right now is to steal some very valuable candlesticks from Scarface Pete - the pirate leader on Karamja.")
+ .npcl("His security is excellent, and the target very valuable so that might be enough to get you the rank.")
+ .npcl("Go talk to our man Alfonse, the waiter in the Shrimp and Parrot.")
+ .npcl("Use the secret word 'gherkin' to show you're one of us.")
+ .end()
+ }
+
+ // I lost the armband and some stupid default shit.
+ b.onQuestStages(Quests.HEROES_QUEST, 6)
+ .playerl("I'm afraid I've lost my master thief's armband.")
+ .npcl("Lucky for you I have a spare. Don't lose it again!")
+ .endWith { _, player ->
+ addItemOrDrop(player, Items.THIEVES_ARMBAND_1579)
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/TrobertDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/TrobertDialogue.kt
new file mode 100644
index 000000000..12561ad44
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/heroesquest/TrobertDialogue.kt
@@ -0,0 +1,92 @@
+package content.region.asgarnia.burthorpe.quest.heroesquest
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.*
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+
+@Initializable
+class TrobertDialogue(player: Player? = null) : DialoguePlugin(player){
+
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, TrobertDialogueFile(), npc)
+ return true
+ }
+
+ override fun newInstance(player: Player?): DialoguePlugin {
+ return TrobertDialogue(player)
+ }
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.TROBERT_1884)
+ }
+}
+
+class TrobertDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ // Technically this won't happen since you have to get past Grubor.
+ b.onQuestStages(Quests.HEROES_QUEST, 0, 1)
+ .npcl("Welcome to our Brimhaven headquarters. I'm Trobert and I'm in charge here.")
+ .playerl("Pleased to meet you.")
+ .npcl("Likewise.")
+ .end()
+
+ b.onQuestStages(Quests.HEROES_QUEST, 2)
+ .npcl("Welcome to our Brimhaven headquarters. I'm Trobert and I'm in charge here.")
+ .options()
+ .let { optionBuilder ->
+ val continuePath = b.placeholder()
+ optionBuilder.option("So can you help me get Scarface Pete's candlesticks?")
+ .goto(continuePath)
+ optionBuilder.option_playerl("Pleased to meet you.")
+ .npcl("Likewise.")
+ .goto(continuePath)
+ return@let continuePath.builder()
+ }
+ .playerl("So can you help me get Scarface Pete's candlesticks?")
+ .npcl("Well, we have made some progress there. We know that one of the only keys to Pete's treasure room is carried by Grip, the head guard, so we thought it might be good to get close to him somehow.")
+ .npcl("Grip was taking on a new deputy called Hartigen, an Asgarnian Black Knight who was deserting the Black Knight Fortress and seeking new employment here on Brimhaven.")
+ .npcl("We managed to waylay him on the journey here, and steal his I.D. papers. Now all we need is to find somebody willing to impersonate him and take the deputy role to get that key for us.")
+ .options()
+ .let { optionBuilder ->
+
+ optionBuilder.option_playerl("I volunteer to undertake that mission!")
+ .npcl("Good good. Well, here's the ID papers, take them and introduce yourself to the guards at Scarface Pete's mansion, we'll have that treasure in no time.")
+ .endWith { _, player ->
+ addItemOrDrop(player, Items.ID_PAPERS_1584)
+ if(getQuestStage(player, Quests.HEROES_QUEST) == 2) {
+ setQuestStage(player, Quests.HEROES_QUEST, 3)
+ }
+ }
+
+ optionBuilder.option_playerl("Well, good luck then.")
+ .npcl("Someone will show up eventually.")
+ .end()
+ }
+
+ b.onQuestStages(Quests.HEROES_QUEST, 3, 4, 5)
+ .branch { player ->
+ return@branch if (inInventory(player, Items.ID_PAPERS_1584)) { 1 } else { 0 }
+ }.let { branch ->
+ branch.onValue(1)
+ .npcl("How's it going?")
+ .playerl("Fine, thanks.")
+ .end()
+ branch.onValue(0)
+ .playerl("I have lost Hartigen's ID papers.")
+ .npcl("Well, that was careless of you, wasn't it? Fortunately for you, he had a spare. Take this one, but please try to be more careful with this one.")
+ .endWith { _, player ->
+ addItemOrDrop(player, Items.ID_PAPERS_1584)
+ }
+ }
+
+ b.onQuestStages(Quests.HEROES_QUEST, 6, 100)
+ .npcl("How's it going?")
+ .playerl("Fine, thanks.")
+ .end()
+
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/BerryNpc.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/BerryNpc.kt
index 116a95063..0b04d9ba1 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/BerryNpc.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/BerryNpc.kt
@@ -1,8 +1,8 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
+import content.data.Quests
import core.api.isQuestInProgress
import core.api.produceGroundItem
-import core.api.transformNpc
import core.game.node.entity.Entity
import core.game.node.entity.combat.CombatStyle
import core.game.node.entity.npc.AbstractNPC
@@ -44,7 +44,7 @@ class BerryNpc(id: Int = 0, location: Location? = null) : AbstractNPC(id, locati
}
override fun finalizeDeath(killer: Entity?) {
- if (isQuestInProgress(killer as Player, TrollStronghold.questName, 8, 10)) {
+ if (isQuestInProgress(killer as Player, Quests.TROLL_STRONGHOLD, 8, 10)) {
produceGroundItem(killer, Items.CELL_KEY_2_3137, 1, this.location)
}
super.finalizeDeath(killer)
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadDialogue.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadDialogue.kt
index 2a2b2df0a..a1d76a63e 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadDialogue.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
+import content.data.Quests
import core.api.*
import core.game.dialogue.DialoguePlugin
import core.game.dialogue.FacialExpression
@@ -13,7 +14,7 @@ import org.rs09.consts.NPCs
@Initializable
class DadDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
- when (getQuestStage(player!!, TrollStronghold.questName)) {
+ when (getQuestStage(player!!, Quests.TROLL_STRONGHOLD)) {
in 3..4 -> {
when (stage) {
START_DIALOGUE -> npcl(FacialExpression.OLD_HAPPY, "What tiny human do in troll arena? Dad challenge human to fight!").also { stage++ }
@@ -27,7 +28,7 @@ class DadDialogue(player: Player? = null) : DialoguePlugin(player) {
3 -> npcl(FacialExpression.OLD_HAPPY, "Tiny human brave. Dad squish!").also { stage++ }
4 -> npc!!.attack(player).also {
npc!!.skills.lifepoints = npc!!.skills.maximumLifepoints // Reset dad to max hitpoints.
- setQuestStage(player!!, TrollStronghold.questName, 4)
+ setQuestStage(player!!, Quests.TROLL_STRONGHOLD, 4)
stage = END_DIALOGUE
}
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadDialogueFile.kt
index 69b9d5334..4428bf902 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadDialogueFile.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
+import content.data.Quests
import core.api.setQuestStage
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
@@ -13,14 +14,14 @@ class DadDialogueFile(private val dialogueNum: Int = 0) : DialogueFile() {
1 -> when (stage) {
START_DIALOGUE -> npcl(FacialExpression.OLD_HAPPY, "No human pass through arena without defeating Dad!").also {
stage = END_DIALOGUE
- setQuestStage(player!!, TrollStronghold.questName, 3)
+ setQuestStage(player!!, Quests.TROLL_STRONGHOLD, 3)
}
}
2 -> when (stage) {
START_DIALOGUE -> npcl(FacialExpression.OLD_NORMAL, "Tiny human brave. Dad squish!").also { stage++ }
1 -> npc!!.attack(player).also {
npc!!.skills.lifepoints = npc!!.skills.maximumLifepoints // Reset dad to max hitpoints.
- setQuestStage(player!!, TrollStronghold.questName, 4)
+ setQuestStage(player!!, Quests.TROLL_STRONGHOLD, 4)
stage = END_DIALOGUE
}
}
@@ -31,7 +32,7 @@ class DadDialogueFile(private val dialogueNum: Int = 0) : DialogueFile() {
Topic(FacialExpression.ANGRY_WITH_SMILE, "I'm not done yet! Prepare to die!", 2)
)
2 -> player!!.attack(npc).also {
- setQuestStage(player!!, TrollStronghold.questName, 5)
+ setQuestStage(player!!, Quests.TROLL_STRONGHOLD, 5)
stage = END_DIALOGUE
}
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadNpc.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadNpc.kt
index d7c5e58cd..f489aa1ed 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadNpc.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DadNpc.kt
@@ -1,7 +1,7 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
+import content.data.Quests
import core.api.*
-import core.game.node.Node
import core.game.node.entity.Entity
import core.game.node.entity.combat.BattleState
import core.game.node.entity.combat.CombatStyle
@@ -27,7 +27,7 @@ class DadNpc(id: Int = 0, location: Location? = null) : AbstractNPC(id, location
val player = entity.asPlayer()
// Attack Dad. If quest is done, you cannot attack Dad.
- when (getQuestStage(player, TrollStronghold.questName)) {
+ when (getQuestStage(player, Quests.TROLL_STRONGHOLD)) {
3 -> openDialogue(player, DadDialogueFile(2), this.asNpc()).also { return false }
4 -> { return attackable }
in 5 .. 100 -> sendMessage(player, "You don't need to fight him again.").also { return false }
@@ -44,8 +44,8 @@ class DadNpc(id: Int = 0, location: Location? = null) : AbstractNPC(id, location
if (opponent.skills.lifepoints < 30) {
player.properties.combatPulse.stop()
opponent.properties.combatPulse.stop()
- if (getQuestStage(player!!.asPlayer(), TrollStronghold.questName) == 4){
- setQuestStage(player!!.asPlayer(), TrollStronghold.questName, 5)
+ if (getQuestStage(player!!.asPlayer(), Quests.TROLL_STRONGHOLD) == 4){
+ setQuestStage(player!!.asPlayer(), Quests.TROLL_STRONGHOLD, 5)
}
submitWorldPulse(object : Pulse(){
var counter = 0
@@ -64,8 +64,8 @@ class DadNpc(id: Int = 0, location: Location? = null) : AbstractNPC(id, location
override fun finalizeDeath(killer: Entity?) {
// In case Dad gets one shotted to death.
super.finalizeDeath(killer)
- if (getQuestStage(killer!!.asPlayer(), TrollStronghold.questName) == 4){
- setQuestStage(killer!!.asPlayer(), TrollStronghold.questName, 5)
+ if (getQuestStage(killer!!.asPlayer(), Quests.TROLL_STRONGHOLD) == 4){
+ setQuestStage(killer!!.asPlayer(), Quests.TROLL_STRONGHOLD, 5)
}
}
override fun handleTickActions() {
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DenulthDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DenulthDialogueFile.kt
index 45318ea53..2575fc4b6 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DenulthDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DenulthDialogueFile.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
+import content.data.Quests
import core.api.*
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
@@ -14,7 +15,7 @@ import org.rs09.consts.Items
*/
class DenulthDialogueFile : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
- when (getQuestStage(player!!, TrollStronghold.questName)) {
+ when (getQuestStage(player!!, Quests.TROLL_STRONGHOLD)) {
in 1..7 -> {
when (stage) {
START_DIALOGUE -> npcl(FacialExpression.FRIENDLY, "How are you getting on with rescuing Godric?").also { stage++ }
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DunstanDialogueFile.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DunstanDialogueFile.kt
index aa9615ea7..4cd3a3f1a 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DunstanDialogueFile.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/DunstanDialogueFile.kt
@@ -1,30 +1,65 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
-import core.api.finishQuest
-import core.api.getQuestStage
+import content.data.Quests
+import core.api.*
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
import core.game.dialogue.Topic
+import core.game.node.item.Item
import core.tools.END_DIALOGUE
import core.tools.START_DIALOGUE
+import org.rs09.consts.Items
class DunstanDialogueFile : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
- when (getQuestStage(player!!, TrollStronghold.questName)) {
+ when (getQuestStage(player!!, Quests.TROLL_STRONGHOLD)) {
in 1..10 -> {
when (stage) {
START_DIALOGUE -> npcl(FacialExpression.FRIENDLY, "Have you managed to rescue Godric yet?").also { stage++ }
1 -> playerl(FacialExpression.FRIENDLY, "Not yet.").also { stage++ }
2 -> npcl(FacialExpression.FRIENDLY, "Please hurry! Who knows what they will do to him? Is there anything I can do in the meantime?").also { stage++ }
3 -> showTopics(
+ Topic(FacialExpression.THINKING, "Can you put some spikes on my Climbing boots?", 30),
Topic(FacialExpression.THINKING, "Is it OK if I use your anvil?", 10),
- Topic(FacialExpression.FRIENDLY, "Nothing, thanks.", END_DIALOGUE),
+ Topic(FacialExpression.NEUTRAL, "Nothing, thanks.", 20),
)
10 -> npcl(FacialExpression.FRIENDLY, "So you're a smithy are you?").also { stage++ }
11 -> playerl(FacialExpression.FRIENDLY, "I dabble.").also { stage++ }
12 -> npcl(FacialExpression.FRIENDLY, "A fellow smith is welcome to use my anvil!").also { stage++ }
13 -> playerl(FacialExpression.FRIENDLY, "Thanks!").also { stage++ }
14 -> npcl(FacialExpression.FRIENDLY, "Anything else before I get on with my work?").also { stage = 3 }
+ 20 -> npcl(FacialExpression.NEUTRAL, "All right. Speak to you later then.").also { stage = END_DIALOGUE }
+ 30 -> playerl("Can you put some spikes on my Climbing boots?").also { stage++ }
+ 31 -> npcl("For you, no problem.").also { stage++ }
+ 32 -> npc("Do you realise that you can only use the Climbing", "boots right now? The Spiked boots can only be used in", "the Icelands but no ones been able to get there for", "years!").also { stage++ }
+ 33 -> showTopics(
+ Topic(FacialExpression.NEUTRAL, "Yes, but I still want them.", 40, true),
+ Topic(FacialExpression.NEUTRAL, "Oh OK, I'll leave them thanks.", 43),
+ )
+ 40 -> {
+ if (inInventory(player!!, Items.CLIMBING_BOOTS_3105) && inInventory(player!!, Items.IRON_BAR_2351)) {
+ sendDoubleItemDialogue(player!!, Items.IRON_BAR_2351, Items.CLIMBING_BOOTS_3105, "You give Dunstan an Iron bar and the climbing boots.")
+ sendMessage(player!!, "You give Dunstan an Iron bar and the climbing boots.")
+ if (removeItem(player!!, Item(Items.CLIMBING_BOOTS_3105)) && removeItem(player!!, Item(Items.IRON_BAR_2351))) {
+ addItemOrDrop(player!!, Items.SPIKED_BOOTS_3107)
+ stage++
+ } else {
+ stage = END_DIALOGUE
+ }
+ } else if (inInventory(player!!, Items.CLIMBING_BOOTS_3105)){
+ npcl("Sorry, I'll need an iron bar to make the spikes.")
+ stage = 3
+ } else {
+ playerl("I don't have them on me.")
+ stage = 3
+ }
+ }
+ 41 -> sendItemDialogue(player!!, Items.SPIKED_BOOTS_3107, "Dunstan has given you the spiked boots.").also { stage++
+ sendMessage(player!!, "Dunstan has given you the spiked boots.")
+ }
+ 43 -> npcl(FacialExpression.FRIENDLY, "Anything else before I get on with my work?").also {
+ stage = 3
+ }
}
}
11 -> {
@@ -35,7 +70,7 @@ class DunstanDialogueFile : DialogueFile() {
3 -> npcl(FacialExpression.FRIENDLY, "I have very little to offer you by way of thanks, but perhaps you will accept these family heirlooms. They were found by my great-great-grandfather, but we still don't have any idea what they do.").also { stage++ }
4 -> {
stage = END_DIALOGUE
- finishQuest(player!!, TrollStronghold.questName)
+ finishQuest(player!!, Quests.TROLL_STRONGHOLD)
}
}
}
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollGeneralsNpc.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollGeneralsNpc.kt
index 1a0488e69..cee11ddfc 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollGeneralsNpc.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollGeneralsNpc.kt
@@ -1,10 +1,7 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
-import content.region.kandarin.quest.grandtree.ForemanDialogue
-import content.region.kandarin.quest.grandtree.TheGrandTree
+import content.data.Quests
import core.api.*
-import core.game.interaction.IntType
-import core.game.interaction.InteractionListener
import core.game.node.entity.Entity
import core.game.node.entity.npc.AbstractNPC
import core.game.node.entity.player.Player
@@ -25,7 +22,7 @@ class TrollGeneralsNpc(id: Int = 0, location: Location? = null) : AbstractNPC(id
}
override fun finalizeDeath(killer: Entity?) {
- if(isQuestInProgress(killer as Player, TrollStronghold.questName, 1, 7)) {
+ if(isQuestInProgress(killer as Player, Quests.TROLL_STRONGHOLD, 1, 7)) {
produceGroundItem(killer, Items.PRISON_KEY_3135, 1, this.location)
}
super.finalizeDeath(killer)
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollStronghold.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollStronghold.kt
index 971e7f392..6630bfa14 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollStronghold.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollStronghold.kt
@@ -1,51 +1,37 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
-import content.region.asgarnia.burthorpe.quest.deathplateau.DeathPlateau
import core.api.*
import core.game.node.entity.player.Player
import core.game.node.entity.player.link.quest.Quest
import core.game.node.entity.skill.Skills
import core.plugin.Initializable
import org.rs09.consts.Items
+import content.data.Quests
/**
* Troll Stronghold Quest
* @author ovenbread
*/
@Initializable
-class TrollStronghold : Quest("Troll Stronghold",128, 127, 1, 317, 0, 1, 50) {
+class TrollStronghold : Quest(Quests.TROLL_STRONGHOLD,128, 127, 1, 317, 0, 1, 50) {
- /**
- * 1 - Talked to Denulth to start the quest
- * 3 - Enter the Arena with Dad
- * 4 - Start fighting Dad
- * 5 - Dad surrenders or gets killed, allowed to exit the Arena
- * 8 - Unlocks Prison Gate
- * 9 - Unlocked Mad Eadgar's cell
- * 10 - Unlocked Godric's cell
- * 11 - Unlocked both Mad Eadgar's and Godric's cell
- * 100 - Finish at Dunstan
- */
- companion object {
- const val questName = "Troll Stronghold"
- }
override fun drawJournal(player: Player?, stage: Int) {
super.drawJournal(player, stage)
var line = 12
var stage = getStage(player)
- var started = getQuestStage(player!!, questName) > 0
+ var started = getQuestStage(player!!, Quests.TROLL_STRONGHOLD) > 0
if(!started){
line(player, "I can start this quest by speaking to !!Denulth?? in his tent at", line++)
line(player, "the !!Imperial Guard camp?? in !!Burthorpe?? after completing the", line++)
- line(player, "!!Death Plateau Quest??", line++, isQuestComplete(player, DeathPlateau.questName))
+ line(player, "!!Death Plateau Quest??", line++, isQuestComplete(player, Quests.DEATH_PLATEAU))
line++
line(player, "To complete this quest I need:", line++)
line(player, "Level 15 Agility.", line++, hasLevelStat(player, Skills.AGILITY, 15))
line(player, "I also need to be able to defeat a !!level 113 Troll??.", line++)
line(player, "Level 30 Thieving might be useful.", line++, hasLevelStat(player, Skills.THIEVING, 30))
- if (isQuestComplete(player, DeathPlateau.questName) && hasLevelStat(player, Skills.AGILITY, 15) && hasLevelStat(player, Skills.THIEVING, 30)) {
+ if (isQuestComplete(player, Quests.DEATH_PLATEAU) && hasLevelStat(player, Skills.AGILITY, 15) && hasLevelStat(player, Skills.THIEVING, 30)) {
line(player, "I have all the requirements to start this quest.", line++)
}
} else {
@@ -61,10 +47,12 @@ class TrollStronghold : Quest("Troll Stronghold",128, 127, 1, 317, 0, 1, 50) {
if (stage >= 5) {
line(player, "I have defeated the !!Troll Champion??", line++, true)
} else if (stage >= 3) {
- line(player, "I have to defeat the !!Troll Champion??", line++)
+ line(player, "I have accepted the !!Troll Champion's?? challenge.", line++)
}
- if (stage in 5..7) {
- line++
+ line++
+ if (stage >= 7) {
+ line(player, "I found my way into the Troll Stronghold", line++, true)
+ } else if (stage >= 5) {
line(player, "I have to find a way to get into the !!Troll Stronghold??", line++)
}
line++
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollStrongholdListener.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollStrongholdListener.kt
index 9e03991ab..f276b3944 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollStrongholdListener.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TrollStrongholdListener.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
+import content.data.Quests
import core.api.*
import core.game.global.action.DoorActionHandler
import core.game.interaction.IntType
@@ -22,12 +23,12 @@ class TrollStrongholdListener: InteractionListener {
// Entrance to arena with Dad in it.
on(intArrayOf(Scenery.ARENA_ENTRANCE_3782, Scenery.ARENA_ENTRANCE_3783), IntType.SCENERY, "open"){ player, node ->
// Only get the dialogue once.
- if (getQuestStage(player, TrollStronghold.questName) == 1) {
+ if (getQuestStage(player, Quests.TROLL_STRONGHOLD) == 1) {
openDialogue(player, DadDialogueFile(1), findNPC(NPCs.DAD_1125)!!)
}
// Only allow players through when they start Troll Stronghold.
// No one is allowed to go to GWD unless they start the Troll Stronghold quest.
- if (getQuestStage(player, TrollStronghold.questName) > 0) {
+ if (getQuestStage(player, Quests.TROLL_STRONGHOLD) > 0) {
DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
} else {
sendMessage(player, "You need to start the Troll Stronghold quest.")
@@ -37,7 +38,7 @@ class TrollStrongholdListener: InteractionListener {
// Not allowed to exit arena into the troll stronghold until Dad is defeated.
on(intArrayOf(Scenery.ARENA_EXIT_3785, Scenery.ARENA_EXIT_3786), IntType.SCENERY, "open"){ player, node ->
- if (getQuestStage(player, TrollStronghold.questName) < 5){
+ if (getQuestStage(player, Quests.TROLL_STRONGHOLD) < 5){
openDialogue(player, DadDialogueFile(1), findNPC(NPCs.DAD_1125)!!)
} else {
DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
@@ -47,12 +48,12 @@ class TrollStrongholdListener: InteractionListener {
// Key to unlock the prison door
on(Scenery.PRISON_DOOR_3780, IntType.SCENERY, "unlock"){ player, node ->
- if (getQuestStage(player, TrollStronghold.questName) >= 8){
+ if (getQuestStage(player, Quests.TROLL_STRONGHOLD) >= 8){
DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
} else {
if (inInventory(player, Items.PRISON_KEY_3135)) {
- if (getQuestStage(player, TrollStronghold.questName) == 5) {
- setQuestStage(player, TrollStronghold.questName, 8)
+ if (getQuestStage(player, Quests.TROLL_STRONGHOLD) == 5) {
+ setQuestStage(player, Quests.TROLL_STRONGHOLD, 8)
}
if (removeItem(player, Items.PRISON_KEY_3135)) {
DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
@@ -84,7 +85,7 @@ class TrollStrongholdListener: InteractionListener {
3 -> {
val success: Boolean = success(player, Skills.THIEVING)
if(success){
- if(isQuestInProgress(player, TrollStronghold.questName, 8, 10)) {
+ if(isQuestInProgress(player, Quests.TROLL_STRONGHOLD, 8, 10)) {
addItem(player, Items.CELL_KEY_1_3136)
sendMessage(player, "You find a small key on Twig.")
} else {
@@ -124,7 +125,7 @@ class TrollStrongholdListener: InteractionListener {
3 -> {
val success: Boolean = success(player, Skills.THIEVING)
if(success){
- if(isQuestInProgress(player, TrollStronghold.questName, 8, 10)) {
+ if(isQuestInProgress(player, Quests.TROLL_STRONGHOLD, 8, 10)) {
addItem(player, Items.CELL_KEY_2_3137)
sendMessage(player, "You find a small key on Berry.")
} else {
@@ -149,10 +150,10 @@ class TrollStrongholdListener: InteractionListener {
fun unlockMadEadgarCellDoor(player: Player, node: Node) {
if (inInventory(player, Items.CELL_KEY_1_3136)){
sendMessage(player, "You unlock the cell door.")
- if (getQuestStage(player, TrollStronghold.questName) == 8) {
- setQuestStage(player, TrollStronghold.questName, 9)
- } else if (getQuestStage(player, TrollStronghold.questName) == 10) {
- setQuestStage(player, TrollStronghold.questName, 11)
+ if (getQuestStage(player, Quests.TROLL_STRONGHOLD) == 8) {
+ setQuestStage(player, Quests.TROLL_STRONGHOLD, 9)
+ } else if (getQuestStage(player, Quests.TROLL_STRONGHOLD) == 10) {
+ setQuestStage(player, Quests.TROLL_STRONGHOLD, 11)
}
// Animate Mad Eadgar leaving cell.
val npc = findNPC(NPCs.EADGAR_1113)!!
@@ -219,10 +220,10 @@ class TrollStrongholdListener: InteractionListener {
fun unlockGodricCellDoor(player: Player, node: Node) {
if (inInventory(player, Items.CELL_KEY_2_3137)){
sendMessage(player, "You unlock the cell door.")
- if (getQuestStage(player, TrollStronghold.questName) == 8) {
- setQuestStage(player, TrollStronghold.questName, 10)
- } else if (getQuestStage(player, TrollStronghold.questName) == 9) {
- setQuestStage(player, TrollStronghold.questName, 11)
+ if (getQuestStage(player, Quests.TROLL_STRONGHOLD) == 8) {
+ setQuestStage(player, Quests.TROLL_STRONGHOLD, 10)
+ } else if (getQuestStage(player, Quests.TROLL_STRONGHOLD) == 9) {
+ setQuestStage(player, Quests.TROLL_STRONGHOLD, 11)
}
// Animate Godric leaving cell.
val npc = findNPC(NPCs.GODRIC_1114)!!
@@ -292,7 +293,7 @@ class TrollStrongholdListener: InteractionListener {
// Reentry Secret Door
on(Scenery.SECRET_DOOR_3762, IntType.SCENERY, "open"){ player, _ ->
- if (getQuestStage(player, TrollStronghold.questName) >= 8) {
+ if (getQuestStage(player, Quests.TROLL_STRONGHOLD) >= 8) {
player.properties.teleportLocation = Location.create(2824, 10050, 0)
} else {
sendMessage(player, "The door is locked.")
diff --git a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TwigNpc.kt b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TwigNpc.kt
index 97e253d71..deb316aeb 100644
--- a/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TwigNpc.kt
+++ b/Server/src/main/content/region/asgarnia/burthorpe/quest/trollstronghold/TwigNpc.kt
@@ -1,16 +1,14 @@
package content.region.asgarnia.burthorpe.quest.trollstronghold
-import core.api.getQuestStage
+import content.data.Quests
import core.api.isQuestInProgress
import core.api.produceGroundItem
-import core.api.transformNpc
import core.game.node.entity.Entity
import core.game.node.entity.combat.CombatStyle
import core.game.node.entity.npc.AbstractNPC
import core.game.node.entity.player.Player
import core.game.world.map.Location
import core.plugin.Initializable
-import core.tools.RandomFunction
import org.rs09.consts.Items
import org.rs09.consts.NPCs
@@ -46,7 +44,7 @@ class TwigNpc(id: Int = 0, location: Location? = null) : AbstractNPC(id, locatio
}
override fun finalizeDeath(killer: Entity?) {
- if (isQuestInProgress(killer as Player, TrollStronghold.questName, 8, 10)) {
+ if (isQuestInProgress(killer as Player, Quests.TROLL_STRONGHOLD, 8, 10)) {
produceGroundItem(killer, Items.CELL_KEY_1_3136, 1, this.location)
}
super.finalizeDeath(killer)
diff --git a/Server/src/main/content/region/asgarnia/dialogue/OracleDialogue.java b/Server/src/main/content/region/asgarnia/dialogue/OracleDialogue.java
index a4a58570c..b811dbc74 100644
--- a/Server/src/main/content/region/asgarnia/dialogue/OracleDialogue.java
+++ b/Server/src/main/content/region/asgarnia/dialogue/OracleDialogue.java
@@ -5,6 +5,7 @@ import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.plugin.Initializable;
import core.game.node.entity.player.link.quest.Quest;
+import content.data.Quests;
/**
* Represents the oracle dialogue plugin related to dragon slayer.
@@ -43,7 +44,7 @@ public final class OracleDialogue extends DialoguePlugin {
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
- quest = player.getQuestRepository().getQuest("Dragon Slayer");
+ quest = player.getQuestRepository().getQuest(Quests.DRAGON_SLAYER);
switch (quest.getStage(player)) {
case 20:
player("I seek a piece of the map to the island of Crandor.");
diff --git a/Server/src/main/content/region/asgarnia/dialogue/ThuroDialogue.java b/Server/src/main/content/region/asgarnia/dialogue/ThuroDialogue.java
index 761c0977c..af9e253f3 100644
--- a/Server/src/main/content/region/asgarnia/dialogue/ThuroDialogue.java
+++ b/Server/src/main/content/region/asgarnia/dialogue/ThuroDialogue.java
@@ -8,6 +8,7 @@ import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.quest.Quest;
import core.plugin.Initializable;
import core.game.node.item.Item;
+import content.data.Quests;
/**
* Represents the dialogue plugin used for thurgo.
@@ -77,7 +78,7 @@ public final class ThuroDialogue extends DialoguePlugin {
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
- quest = player.getQuestRepository().getQuest("The Knight's Sword");
+ quest = player.getQuestRepository().getQuest(Quests.THE_KNIGHTS_SWORD);
player.removeAttribute("thurgo:1");
switch (quest.getStage(player)) {
default:
diff --git a/Server/src/main/content/region/asgarnia/falador/dialogue/DoricDialogue.kt b/Server/src/main/content/region/asgarnia/falador/dialogue/DoricDialogue.kt
index a829c840b..0d8e029eb 100644
--- a/Server/src/main/content/region/asgarnia/falador/dialogue/DoricDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/falador/dialogue/DoricDialogue.kt
@@ -16,12 +16,13 @@ import core.game.world.map.Location
import core.plugin.Initializable
import core.tools.END_DIALOGUE
import org.rs09.consts.NPCs
+import content.data.Quests
@Initializable
class DoricDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun open(vararg args: Any?): Boolean {
npc = args[0] as NPC
- val qStage = getQuestStage(player, "Doric's Quest")
+ val qStage = getQuestStage(player, Quests.DORICS_QUEST)
if(qStage == 0) {
npcl(FacialExpression.OLD_NORMAL, "Hello traveller, what brings you to my humble smithy?").also { stage = 0 }
} else if(qStage in 1..99) {
diff --git a/Server/src/main/content/region/asgarnia/falador/dialogue/FaladorSquireDialogue.java b/Server/src/main/content/region/asgarnia/falador/dialogue/FaladorSquireDialogue.java
index 5d026893d..8fe25153e 100644
--- a/Server/src/main/content/region/asgarnia/falador/dialogue/FaladorSquireDialogue.java
+++ b/Server/src/main/content/region/asgarnia/falador/dialogue/FaladorSquireDialogue.java
@@ -10,6 +10,7 @@ import core.game.node.entity.player.link.quest.Quest;
import core.game.node.item.Item;
import core.plugin.Initializable;
import core.game.world.GameWorld;
+import content.data.Quests;
/**
* Represents the falador squire dialogue plugin.
@@ -59,7 +60,7 @@ public final class FaladorSquireDialogue extends DialoguePlugin {
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
- quest = player.getQuestRepository().getQuest("The Knight's Sword");
+ quest = player.getQuestRepository().getQuest(Quests.THE_KNIGHTS_SWORD);
interpreter.sendOptions("What do you want to do?", "Chat", "Talk about the Falador Achievement Diary");
stage = -1;
replacementReward = AchievementDiary.canReplaceReward(player, DiaryType.FALADOR, level);
diff --git a/Server/src/main/content/region/asgarnia/falador/dialogue/SirTiffyCashienDialogue.java b/Server/src/main/content/region/asgarnia/falador/dialogue/SirTiffyCashienDialogue.java
deleted file mode 100644
index 0332c725b..000000000
--- a/Server/src/main/content/region/asgarnia/falador/dialogue/SirTiffyCashienDialogue.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package content.region.asgarnia.falador.dialogue;
-
-import core.game.dialogue.DialoguePlugin;
-import core.game.dialogue.FacialExpression;
-import core.game.node.entity.npc.NPC;
-import core.plugin.Initializable;
-import core.game.node.entity.player.Player;
-
-/**
- * Represents the dialogue used for sir tiffy.
- * @author 'Vexia
- * @version 1.0
- */
-@Initializable
-public final class SirTiffyCashienDialogue extends DialoguePlugin {
-
- /**
- * Constructs a new {@code SirTiffyCashienDialogue} {@code Object}.
- */
- public SirTiffyCashienDialogue() {
- /**
- * empty.
- */
- }
-
- /**
- * Constructs a new {@code SirTiffyCashienDialogue} {@code Object}.
- * @param player the player.
- */
- public SirTiffyCashienDialogue(Player player) {
- super(player);
- }
-
- @Override
- public DialoguePlugin newInstance(Player player) {
- return new SirTiffyCashienDialogue(player);
- }
-
- @Override
- public boolean open(Object... args) {
- npc = (NPC) args[0];
- interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Hello.");
- stage = 0;
- return true;
- }
-
- @Override
- public boolean handle(int interfaceId, int buttonId) {
- switch (stage) {
- case 0:
- interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "What ho, sirrag.", "Spiffing day for a walk in the park, what?");
- stage = 1;
- break;
- case 1:
- interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Spiffing?");
- stage = 2;
- break;
- case 2:
- interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Absolutely, top-hole!", "Well, can't stay and chat all day, dontchaknow!", "Ta-ta for now!");
- stage = 10;
- break;
- case 3:
- interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Erm...goodbye.");
- stage = 4;
- break;
- case 4:
- end();
- break;
- case 10:
- npc("Would you like to look at my wares?");
- stage++;
- break;
- case 11:
- player("Yes, please.");
- stage++;
- break;
- case 12:
- npc.openShop(player);
- end();
- break;
- }
- return true;
- }
-
- @Override
- public int[] getIds() {
- return new int[] { 2290 };
- }
-}
diff --git a/Server/src/main/content/region/asgarnia/falador/dialogue/SirTiffyCashienDialogue.kt b/Server/src/main/content/region/asgarnia/falador/dialogue/SirTiffyCashienDialogue.kt
new file mode 100644
index 000000000..70abbe778
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/dialogue/SirTiffyCashienDialogue.kt
@@ -0,0 +1,120 @@
+package content.region.asgarnia.falador.dialogue
+
+import content.data.Quests
+import content.region.asgarnia.falador.quest.recruitmentdrive.SirTiffyCashienDialogueFile
+import core.ServerConstants
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.node.entity.player.Player
+import core.game.world.map.Location
+import core.plugin.Initializable
+import core.tools.END_DIALOGUE
+import core.tools.START_DIALOGUE
+import org.rs09.consts.NPCs
+
+@Initializable
+class SirTiffyCashienDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+
+ // Completed Recruitment Drive & Start Wanted!! Quest
+ if (isQuestComplete(player!!, Quests.RECRUITMENT_DRIVE)) {
+ openDialogue(player, SirTiffyCashienAfterRecruitmentDriveQuestDialogueFile(), npc)
+ return true
+ }
+
+ // Recruitment Drive Quest
+ if (isQuestInProgress(player!!, Quests.RECRUITMENT_DRIVE, 1, 99)) {
+ openDialogue(player, SirTiffyCashienDialogueFile(), npc)
+ return true
+ }
+
+ // Fallback to default.
+ when (stage) {
+ START_DIALOGUE -> player("Hello.").also { stage++ }
+ 1 -> npc(FacialExpression.FRIENDLY, "What ho, ${if (player.isMale) "sirrah" else "milady"}.", "Spiffing day for a walk in the park, what?").also { stage++ }
+ 2 -> player(FacialExpression.THINKING, "Spiffing?").also { stage++ }
+ 3 -> npc(FacialExpression.FRIENDLY, "Absolutely, top-hole!", "Well, can't stay and chat all day, dontchaknow!", "Ta-ta for now!").also { stage++ }
+ 4 -> player(FacialExpression.THINKING, "Erm...goodbye.").also { stage = END_DIALOGUE }
+ }
+
+ return true
+ }
+ override fun newInstance(player: Player): DialoguePlugin {
+ return SirTiffyCashienDialogue(player)
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.SIR_TIFFY_CASHIEN_2290)
+ }
+}
+
+// Move this to Wanted!! Quest.
+class SirTiffyCashienAfterRecruitmentDriveQuestDialogueFile : DialogueBuilderFile() {
+ private fun dialogueChangeSpawnPoint(builder: DialogueBuilder, place: String, location: Location, tiffyLine1: String, tiffyLine2: String): DialogueBuilder {
+ return builder.npcl("${tiffyLine1} Are you sure?")
+ .options().let { optionBuilder ->
+ optionBuilder.option("Yes, I want to respawn in $place.")
+ .playerl("Yes, I want to respawn in $place.")
+ .npcl(tiffyLine2)
+ .endWith { _, player ->
+ setAttribute(player, "/save:spawnLocation", location)
+ player.properties.spawnLocation = location
+ }
+ optionBuilder.option("Actually, no thanks. I like my respawn point.")
+ .playerl("Actually, no thanks. I like my respawn point.")
+ .npcl("As you wish, what? Ta-ta for now.")
+ }
+ }
+
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { _ -> true }
+ .npc(FacialExpression.HAPPY, "What ho, @g[sirrah,milady].", "Jolly good show on the old training grounds thingy,", "what?")
+ .options().let { optionBuilder ->
+ optionBuilder.option_playerl("Do you have any jobs for me yet?")
+ .npcl("Sorry dear @g[boy,gal] but we are still in the process of organising.")
+ .npcl("I'm sure that we will have something for you soon, so please feel free to check back later.")
+ // Started of Wanted! quest
+ .end()
+ optionBuilder.option("Can you explain the Gaze of Saradomin to me?")
+ .playerl("I don't really understand this 'Gaze of Saradomin' thing... Do you think you could explain what it does for me?")
+ .npcl("Certainly @g[sirrah,milady]! As you know, we Temple Knights are personally favoured by Saradomin himself.")
+ .npcl("And when I say personally favoured, I don't mean that sometime off in the future he's going to buy us all a drink!")
+ .npcl("He watches over each of us, and when we die he catches us as we fall, and ensures we arrive back at Falador castle safe and sound.")
+ .npcl("We usually lose some equipment when he does so, but it's a small price to pay to be hale and hearty again, what?")
+ .npcl("Some lucky fellows have a similar system going already, but when they die they spawn in that squalid little swamp village Lumbridge.")
+ .playerl("Yeah, what kind of person would want to spawn there... Certainly not me, and I never have! Honest!")
+ .npcl("Well, you should be glad that we offer you a step up then! Falador is clearly a far superior town to spend your time in!")
+ .npcl("Was there something else you wanted to ask good old Tiffy, @g[sirrah,milady]?")
+ .end()
+ optionBuilder.option("Can I buy some armour?")
+ .playerl("Can I buy some armour?")
+ // Recruitment Drive -> Initiate level, Slug Menace -> Proselyte level
+ .npcl("Of course dear @g[boy,gal]. I can sell you up to Initiate level items only I'm afraid.")
+ .endWith { _, player ->
+ openNpcShop(player, npc!!.id)
+ }
+ optionBuilder.option("Can I switch respawns please?")
+ .branch { player -> if (player.properties.spawnLocation == ServerConstants.HOME_LOCATION) { 1 } else { 0 } }
+ .let { branch ->
+ dialogueChangeSpawnPoint(
+ branch.onValue(1),
+ "Falador", Location(2971, 3340, 0), //https://www.youtube.com/watch?v=Mm15dHuIaVg
+ "Ah, so you'd like to respawn in Falador, the good old homestead!",
+ "Top-hole, what? Good old Fally is definitely the hot-spot nowadays!"
+ )
+ dialogueChangeSpawnPoint(
+ branch.onValue(0),
+ "Lumbridge", ServerConstants.HOME_LOCATION ?: Location(3222, 3218, 0),
+ "What? You're saying you want to respawn in Lumbridge?",
+ "Why anyone would want to visit that smelly little swamp village of oiks is quite beyond me, I'm afraid, but the deed is done now."
+ )
+ }
+ optionBuilder.option("Goodbye.")
+ .playerl("Well, see you around Tiffy.")
+ .npcl(FacialExpression.HAPPY,"Ta-ta for now, old bean!")
+ .end()
+ }
+ }
+}
diff --git a/Server/src/main/content/region/asgarnia/falador/dialogue/WysonTheGardenerDialogue.kt b/Server/src/main/content/region/asgarnia/falador/dialogue/WysonTheGardenerDialogue.kt
index 4d42d5d9f..1d2592ad8 100644
--- a/Server/src/main/content/region/asgarnia/falador/dialogue/WysonTheGardenerDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/falador/dialogue/WysonTheGardenerDialogue.kt
@@ -121,7 +121,7 @@ class WysonTheGardenerDialogue : core.game.dialogue.DialoguePlugin {
}
133 -> end()
140 -> {
- npc("Thanks for being generous", "here's an extra woad leave.")
+ npc("Thanks for being generous", "here's an extra woad leaf.")
stage = 141
}
141 -> if (player.inventory.contains(995, 20)) {
diff --git a/Server/src/main/content/region/asgarnia/falador/diary/FaladorAchievementDiary.kt b/Server/src/main/content/region/asgarnia/falador/diary/FaladorAchievementDiary.kt
index 7d9d2f483..4831afd9c 100644
--- a/Server/src/main/content/region/asgarnia/falador/diary/FaladorAchievementDiary.kt
+++ b/Server/src/main/content/region/asgarnia/falador/diary/FaladorAchievementDiary.kt
@@ -212,6 +212,9 @@ class FaladorAchievementDiary : DiaryEventHookBase(DiaryType.FALADOR) {
)
}
}
+ if (event.npc.id == NPCs.MOGRE_114){
+ finishTask(player, DiaryLevel.HARD, HardTasks.MUDSKIPPER_POINT_KILL_MOGRE)
+ }
}
override fun onItemPurchasedFromShop(player: Player, event: ItemShopPurchaseEvent) {
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/TheKnightsSword.java b/Server/src/main/content/region/asgarnia/falador/quest/TheKnightsSword.java
index 535885464..70ca79515 100644
--- a/Server/src/main/content/region/asgarnia/falador/quest/TheKnightsSword.java
+++ b/Server/src/main/content/region/asgarnia/falador/quest/TheKnightsSword.java
@@ -5,6 +5,7 @@ import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.quest.Quest;
import core.plugin.Initializable;
import core.game.node.item.Item;
+import content.data.Quests;
/**
* Represents The KnightSword quest.
@@ -23,7 +24,7 @@ public class TheKnightsSword extends Quest {
* Constructs a new {@code TheKnightsSword} {@code Object}.
*/
public TheKnightsSword() {
- super("The Knight's Sword", 22, 21, 1, 122, 0, 1, 7);
+ super(Quests.THE_KNIGHTS_SWORD, 22, 21, 1, 122, 0, 1, 7);
}
@Override
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BKCabbagePlugin.java b/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BKCabbagePlugin.java
index 36684ff28..1fdcd3565 100644
--- a/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BKCabbagePlugin.java
+++ b/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BKCabbagePlugin.java
@@ -5,6 +5,7 @@ import core.game.interaction.UseWithHandler;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.quest.Quest;
import core.plugin.Plugin;
+import content.data.Quests;
/**
* Represents the plugin used to send the cabbage down the hole.
@@ -29,7 +30,7 @@ public class BKCabbagePlugin extends UseWithHandler {
@Override
public boolean handle(NodeUsageEvent event) {
final Player player = event.getPlayer();
- final Quest quest = player.getQuestRepository().getQuest("Black Knights' Fortress");
+ final Quest quest = player.getQuestRepository().getQuest(Quests.BLACK_KNIGHTS_FORTRESS);
if (quest.getStage(player) == 20) {
if (event.getUsedItem().getId() == 1967) {
player.getDialogueInterpreter().sendDialogue("This is the wrong sort of cabbage!");
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BKListenDialogue.java b/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BKListenDialogue.java
index df55f800b..b8d4dd509 100644
--- a/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BKListenDialogue.java
+++ b/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BKListenDialogue.java
@@ -6,6 +6,7 @@ import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.plugin.Initializable;
import core.game.world.update.flag.context.Animation;
+import content.data.Quests;
/**
* Represents the dialogue of listening throug a grill during the black knights'
@@ -117,7 +118,7 @@ public final class BKListenDialogue extends DialoguePlugin {
stage = 8;
break;
case 8:
- player.getQuestRepository().getQuest("Black Knights' Fortress").setStage(player, 20);
+ player.getQuestRepository().getQuest(Quests.BLACK_KNIGHTS_FORTRESS).setStage(player, 20);
end();
break;
case 10:
@@ -142,7 +143,7 @@ public final class BKListenDialogue extends DialoguePlugin {
break;
case 15:
if (player.getInventory().remove(CABBAGE)) {
- player.getQuestRepository().getQuest("Black Knights' Fortress").setStage(player, 30);
+ player.getQuestRepository().getQuest(Quests.BLACK_KNIGHTS_FORTRESS).setStage(player, 30);
interpreter.sendDialogues(player, FacialExpression.HAPPY, "Looks like my work here is done. Seems like that's", "successfully sabotaged their little secret weapon plan.");
stage = 16;
}
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BlackKnightsFortress.java b/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BlackKnightsFortress.java
index 6e5da0e7d..a3a1bf405 100644
--- a/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BlackKnightsFortress.java
+++ b/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/BlackKnightsFortress.java
@@ -5,6 +5,7 @@ import core.game.node.entity.player.link.quest.Quest;
import core.game.node.item.Item;
import core.plugin.Initializable;
import core.plugin.ClassScanner;
+import content.data.Quests;
/**
* Represents the black knights fortress quest.
@@ -23,7 +24,7 @@ public final class BlackKnightsFortress extends Quest {
* Constructs a new {@Code BlackKnightsFortress} {@Code Object}
*/
public BlackKnightsFortress() {
- super("Black Knights' Fortress", 14, 13, 3, 130, 0, 1, 4);
+ super(Quests.BLACK_KNIGHTS_FORTRESS, 14, 13, 3, 130, 0, 1, 4);
}
@Override
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/SirAmikVarzeDialogue.java b/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/SirAmikVarzeDialogue.java
index 33f2a41c5..93901c19e 100644
--- a/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/SirAmikVarzeDialogue.java
+++ b/Server/src/main/content/region/asgarnia/falador/quest/blackknightsfortress/SirAmikVarzeDialogue.java
@@ -1,5 +1,6 @@
package content.region.asgarnia.falador.quest.blackknightsfortress;
+import content.region.asgarnia.falador.quest.recruitmentdrive.SirAmikVarzeDialogueFile;
import core.game.dialogue.DialoguePlugin;
import core.game.dialogue.FacialExpression;
import core.game.node.entity.npc.NPC;
@@ -8,6 +9,9 @@ import core.game.node.entity.player.link.quest.Quest;
import core.game.node.item.GroundItemManager;
import core.game.node.item.Item;
+import static core.api.ContentAPIKt.openDialogue;
+import content.data.Quests;
+
/**
* Represents the sir amik varze dialogue.
* @author Vexia
@@ -45,7 +49,7 @@ public class SirAmikVarzeDialogue extends DialoguePlugin {
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
- quest = player.getQuestRepository().getQuest("Black Knights' Fortress");
+ quest = player.getQuestRepository().getQuest(Quests.BLACK_KNIGHTS_FORTRESS);
switch (quest.getStage(player)) {
case 30:
interpreter.sendDialogues(player, FacialExpression.HAPPY, "I have ruined the Black Knights' invincibility potion.");
@@ -72,35 +76,7 @@ public class SirAmikVarzeDialogue extends DialoguePlugin {
public boolean handle(int interfaceId, int buttonId) {
switch (quest.getStage(player)) {
case 100:
- switch (stage) {
- case 0:
- interpreter.sendDialogues(npc, FacialExpression.FRIENDLY, "Hello, friend!");
- stage = 1;
- break;
- case 1:
- interpreter.sendDialogues(player, FacialExpression.HALF_ASKING, "Do you have any other quests for me to do?");
- stage = 2;
- break;
- case 2:
- interpreter.sendDialogues(npc, FacialExpression.HALF_THINKING, "Quests, eh?", "Well, I don't have anything on the go at the moment,", "but there is an organisation that is always looking for", "capable adventurers to assist them.");
- stage = 3;
- break;
- case 3:
- interpreter.sendDialogues(npc, FacialExpression.HAPPY, "Your excellent work sorting out those Black Knights", "means I will happily write you a letter of", "recommendation.");
- stage = 4;
- break;
- case 4:
- interpreter.sendDialogues(npc, FacialExpression.HALF_ASKING, "Would you like me to put your name forwards to", "them?");
- stage = 5;
- break;
- case 5:
- interpreter.sendDialogues(player, FacialExpression.NEUTRAL, "No thanks.");
- stage = 6;
- break;
- case 6:
- end();
- break;
- }
+ openDialogue(player, new SirAmikVarzeDialogueFile(), npc);
break;
case 30:
switch (stage) {
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/doricsquest/DoricDoricsQuestDialogue.kt b/Server/src/main/content/region/asgarnia/falador/quest/doricsquest/DoricDoricsQuestDialogue.kt
index 9857961b6..3c34fca1f 100644
--- a/Server/src/main/content/region/asgarnia/falador/quest/doricsquest/DoricDoricsQuestDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/falador/quest/doricsquest/DoricDoricsQuestDialogue.kt
@@ -4,12 +4,11 @@ import core.api.*
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
import core.game.dialogue.Topic
-import core.game.node.entity.npc.NPC
import core.game.node.entity.player.Player
import core.game.node.item.Item
import core.tools.END_DIALOGUE
import org.rs09.consts.Items
-import org.rs09.consts.NPCs
+import content.data.Quests
class DoricDoricsQuestDialogue(private val dStage: Int) : DialogueFile() {
override fun handle(componentID: Int, buttonID: Int) {
@@ -40,7 +39,7 @@ class DoricDoricsQuestDialogue(private val dStage: Int) : DialogueFile() {
40 -> npc(FacialExpression.OLD_NORMAL, "Clay is what I use more than anything, to make casts.", "Could you get me 6 clay, 4 copper ore, and 2 iron ore,", "please? I could pay a little, and let you use my anvils.", "Take this pickaxe with you just in case you need it.").also { stage++ }
41 -> {
playerl(FacialExpression.FRIENDLY, "Certainly, I'll be right back!")
- startQuest(player, "Doric's Quest")
+ startQuest(player, Quests.DORICS_QUEST)
if(!inInventory(player, Items.BRONZE_PICKAXE_1265)) addItemOrDrop(player, Items.BRONZE_PICKAXE_1265)
stage = END_DIALOGUE
}
@@ -65,7 +64,7 @@ class DoricDoricsQuestDialogue(private val dStage: Int) : DialogueFile() {
3 -> {
if(removeItem(player, Item(Items.CLAY_434, 6)) && removeItem(player, Item(Items.COPPER_ORE_436, 4)) && removeItem(player, Item(Items.IRON_ORE_440, 2))) {
sendItemDialogue(player, Items.COPPER_ORE_436, "You hand the clay, copper, and iron to Doric.")
- finishQuest(player, "Doric's Quest")
+ finishQuest(player, Quests.DORICS_QUEST)
stage = END_DIALOGUE
}
}
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/doricsquest/DoricsQuest.kt b/Server/src/main/content/region/asgarnia/falador/quest/doricsquest/DoricsQuest.kt
index 5c04c3983..0bc49f173 100644
--- a/Server/src/main/content/region/asgarnia/falador/quest/doricsquest/DoricsQuest.kt
+++ b/Server/src/main/content/region/asgarnia/falador/quest/doricsquest/DoricsQuest.kt
@@ -7,26 +7,32 @@ import core.game.node.entity.skill.Skills
import core.plugin.Initializable
import org.rs09.consts.Components
import org.rs09.consts.Items
+import content.data.Quests
@Initializable
-class DoricsQuest : Quest("Doric's Quest", 17, 16, 1, 31, 0, 1, 100) {
+class DoricsQuest : Quest(Quests.DORICS_QUEST, 17, 16, 1, 31, 0, 1, 100) {
override fun newInstance(`object`: Any?): Quest { return this }
override fun drawJournal(player: Player?, stage: Int) {
super.drawJournal(player, stage)
player ?: return
- var line = 11
+ var line = 12
if(stage == 0) {
line(player, "I can start this quest by speaking to !!Doric?? who is !!North of??", line++)
line(player, "!!Falador??.", line++)
+ line++
line(player, "There aren't any requirements but !!Level 15 Mining?? will help.", line++)
} else {
if(stage in 1..99) {
- line(player, "I have spoken to !!Doric??.", line++)
- line(player, "I need to collect some items and bring them to !!Doric??:", line++)
- line(player, "6 Clay", line++, inInventory(player, Items.CLAY_434, 6))
- line(player, "4 Copper Ore", line++, inInventory(player, Items.COPPER_ORE_436, 4))
- line(player, "2 Iron Ore", line++, inInventory(player, Items.IRON_ORE_440, 2))
+ // https://www.youtube.com/watch?v=vm4BEXtMoO0
+ line(player, "I have spoken to Doric. He agreed to let me use his anvils", line++, true)
+ line(player, "if I bring him some materials.", line++, true)
+ line++
+ line(player, "I need to collect the following materials and bring them all", line++)
+ line(player, "to !!Doric??:", line++)
+ line(player, "!!6 Clay.??", line++, inInventory(player, Items.CLAY_434, 6))
+ line(player, "!!4 Copper Ore.??", line++, inInventory(player, Items.COPPER_ORE_436, 4))
+ line(player, "!!2 Iron Ore.??", line++, inInventory(player, Items.IRON_ORE_440, 2))
}
if(stage == 100) {
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/AlchemicalNotes.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/AlchemicalNotes.kt
new file mode 100644
index 000000000..56eaa77d1
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/AlchemicalNotes.kt
@@ -0,0 +1,248 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import content.global.handlers.iface.BookInterface
+import content.global.handlers.iface.BookLine
+import content.global.handlers.iface.Page
+import content.global.handlers.iface.PageSet
+import core.api.setAttribute
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.Items
+
+// https://www.youtube.com/watch?v=o-bAoxIYT-A 7:27
+@Initializable
+class AlchemicalNotes : InteractionListener {
+ companion object {
+ private val TITLE = "Alchemical Reactions Study"
+ private val CONTENTS = arrayOf(
+ PageSet(
+ Page(
+ BookLine("Acetic acid and Cupric", 55),
+ BookLine("Sulphate:", 56),
+ BookLine("Endothermic.", 57),
+ BookLine("The Cupric is in ", 58),
+ BookLine("insufficient quantities to", 59),
+ BookLine("cause any noticeable", 60),
+ BookLine("reaction.", 61),
+ ),
+ Page(
+ BookLine("Acetic acid and Gypsum:", 66),
+ BookLine("Endothermic.", 67),
+ BookLine("Made a particularly bad", 68),
+ BookLine("smell, but little else that", 69),
+ BookLine("was productive.", 70),
+ )
+ ),
+ PageSet(
+ Page(
+ BookLine("Acetic acid and Sodium", 55),
+ BookLine("Chloride:", 56),
+ BookLine("Endothermic.", 57),
+ BookLine("Very tasty when", 58),
+ BookLine("combined with fried", 59),
+ BookLine("potatoes at room", 60),
+ BookLine("temperature.", 61),
+ ),
+ Page(
+ BookLine("Acetic acid and", 66),
+ BookLine("Dihydrogen Monoxide:", 67),
+ BookLine("Endothermic.", 68),
+ BookLine("The Dihydrogen", 69),
+ BookLine("Monoxide served only to", 70),
+ BookLine("dilute the Acetic acid at", 71),
+ BookLine("room temperature.", 72),
+ )
+ ),
+ PageSet(
+ Page(
+ BookLine("Acetic acid and Cupric", 55),
+ BookLine("Ore Powder:", 56),
+ BookLine("Endothermic.", 57),
+ BookLine("The powdered form of", 58),
+ BookLine("Cupric Ore allowed a", 59),
+ BookLine("lower than usual melting", 60),
+ BookLine("temperature, but the end", 61),
+ BookLine("product was non-usable.", 62),
+ ),
+ Page(
+ BookLine("Acetic acid and Tin Ore", 66),
+ BookLine("powder:", 67),
+ BookLine("Endothermic.", 68),
+ BookLine("Similar results to those", 69),
+ BookLine("made using Cupric Ore.", 70),
+ )
+ ),
+ PageSet(
+ Page(
+ BookLine("Cupric Sulphate and", 55),
+ BookLine("Dihyrdogen Monoxide:", 56),
+ BookLine("Exothermic.", 57),
+ BookLine("A blue compound was", 58),
+ BookLine("produced, along with heat.", 59),
+ ),
+ Page(
+ BookLine("Cupric Sulphate and", 66),
+ BookLine("Gypsum:", 67),
+ BookLine("Endothermic.", 68),
+ BookLine("At room temperature, no", 69),
+ BookLine("useful product was", 70),
+ BookLine("created.", 71),
+ )
+ ),
+ PageSet(
+ Page(
+ BookLine("Cupric Sulphate and", 55),
+ BookLine("Sodium Chloride:", 56),
+ BookLine("Endothermic.", 57),
+ BookLine("A pungent odour was", 58),
+ BookLine("released when combined.", 59),
+ ),
+ Page(
+ BookLine("Cupric Sulphate and", 66),
+ BookLine("Cupric Ore powder:", 67),
+ BookLine("Endothermic.", 68),
+ BookLine("The Cupric did not react", 69),
+ BookLine("with each other at room", 70),
+ BookLine("temperature.", 71),
+ )
+ ),
+ PageSet(
+ Page(
+ BookLine("Cupric Sulphate and Tin", 55),
+ BookLine("Ore powder:", 56),
+ BookLine("Endothermic.", 57),
+ BookLine("Similar results to those", 58),
+ BookLine("shown with Cupric Ore,", 59),
+ BookLine("despite the increased", 60),
+ BookLine("solubility involved with", 61),
+ BookLine("the powdered form.", 62),
+ ),
+ Page(
+ BookLine("Gypsum and Dihydrogen", 66),
+ BookLine("Monoxide:", 67),
+ BookLine("Exothermic.", 68),
+ BookLine("A white liquid compound", 69),
+ BookLine("was formed, that quickly", 70),
+ BookLine("cooled at room", 71),
+ BookLine("temperature to a white", 72),
+ BookLine("heat resistant solid very", 73),
+ BookLine("similar to plaster.", 74),
+ BookLine("Heat was also produced,", 75),
+ BookLine("although not in the same", 76),
+ )
+ ),
+ PageSet(
+ Page(
+ BookLine("quantity as Cupric", 55),
+ BookLine("Sulphate with Dihydrogen", 56),
+ BookLine("Monoxide", 57),
+ ),
+ Page(
+ BookLine("Gypsum and Sodium", 66),
+ BookLine("Chloride:", 67),
+ BookLine("Endothermic.", 68),
+ BookLine("The two did not seem to", 69),
+ BookLine("noticably mix together at", 70),
+ BookLine("room temperature.", 71),
+ )
+ ),
+ PageSet(
+ Page(
+ BookLine("Gypsum and Culpric Ore:", 55),
+ BookLine("Endothermic.", 56),
+ BookLine("The gypsum seems quite", 57),
+ BookLine("resistant to most", 58),
+ BookLine("compounds at normal", 59),
+ BookLine("room temperature.", 60),
+ ),
+ Page(
+ BookLine("Gypsum and Tin Ore:", 66),
+ BookLine("Endothermic.", 67),
+ BookLine("Again, very similar results", 68),
+ BookLine("as those shown with", 69),
+ BookLine("Cupric Ore.", 70),
+ )
+ ),
+
+ PageSet(
+ Page(
+ BookLine("Sodium Chloride and", 55),
+ BookLine("Dihydrogen Monoxide:", 56),
+ BookLine("Endothermic.", 57),
+ BookLine("At room temperature, the", 58),
+ BookLine("Sodium Chloride dissolves", 59),
+ BookLine("quite easily. Dissolution is", 60),
+ BookLine("faster at higher", 61),
+ BookLine("temperatures.", 62),
+ ),
+ Page(
+ BookLine("Sodium Chloride and", 66),
+ BookLine("Cupric Ore:", 67),
+ BookLine("Endothermic.", 68),
+ BookLine("No visible combination at", 69),
+ BookLine("room temperature.", 70),
+ )
+ ),
+ PageSet(
+ Page(
+ BookLine("Sodium Chloride and Tin", 55),
+ BookLine("Ore:", 56),
+ BookLine("Endothermic.", 57),
+ BookLine("Another very similar ", 58),
+ BookLine("result as with Cupric Ore.", 59),
+ ),
+ Page(
+ BookLine("Cupric Ore Powder and", 66),
+ BookLine("Tin Ore Powder:", 67),
+ BookLine("Endothermic.", 68),
+ BookLine("When both ores are in", 69),
+ BookLine("particulate form, a much", 70),
+ BookLine("lower than usual bonding", 71),
+ BookLine("temperature can be", 72),
+ BookLine("obtained.", 73),
+ BookLine("When combined at a", 74),
+ BookLine("moderate heat, (my", 75),
+ BookLine("laboratory heating", 76),
+ )
+ ),
+ PageSet(
+ Page(
+ BookLine("apparatus) I was able to", 55),
+ BookLine("form liquid Bronze quite", 56),
+ BookLine("easily, which cooled to", 57),
+ BookLine("form a standard Bronze", 58),
+ BookLine("Bar at a temperature far", 60),
+ BookLine("lower than that required", 61),
+ BookLine("to produce in mass at a", 62),
+ BookLine("furnace.", 63),
+ ),
+ Page(
+ BookLine("Nitrous Monoxide:", 66),
+ BookLine("Was not able to perform", 67),
+ BookLine("an experimentation using", 68),
+ BookLine("this substance, as the", 69),
+ BookLine("gaseous form would", 70),
+ BookLine("always escape when the", 71),
+ BookLine("vial was opened.", 72),
+ )
+ )
+ )
+ }
+
+ private fun display(player:Player, pageNum: Int, buttonID: Int) : Boolean {
+ BookInterface.pageSetup(player, BookInterface.FANCY_BOOK_3_49, TITLE, CONTENTS)
+ return true
+ }
+
+
+ override fun defineListeners() {
+ on(Items.ALCHEMICAL_NOTES_5588, IntType.ITEM, "read") { player, _ ->
+ setAttribute(player, "bookInterfaceCallback", ::display)
+ setAttribute(player, "bookInterfaceCurrentPage", 0)
+ display(player, 0, 0)
+ return@on true
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/LadyTableDialogue.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/LadyTableDialogue.kt
new file mode 100644
index 000000000..b1386266f
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/LadyTableDialogue.kt
@@ -0,0 +1,114 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.system.task.Pulse
+import org.rs09.consts.Components
+import org.rs09.consts.NPCs
+
+class LadyTableDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, LadyTableDialogueFile(), npc)
+ return true
+ }
+ override fun newInstance(player: Player): DialoguePlugin {
+ return LadyTableDialogue(player)
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.LADY_TABLE_2283)
+ }
+}
+
+class LadyTableDialogueFile(private val dialogueNum: Int = 0) : DialogueBuilderFile(), InteractionListener {
+ companion object {
+ const val statueVarbit = 658
+ const val attributeStatueStateNumber = "quest:recruitmentdrive-statuestatenumber"
+ val statueArray = intArrayOf(0, 7308, 7307, 7306, 7305, 7304, 7303, 7312, 7313, 7314, 7311, 7310, 7309)
+ }
+
+ override fun defineListeners() {
+
+ on(statueArray, IntType.SCENERY, "touch") { player, node ->
+ if( node.id == statueArray[getAttribute(player, attributeStatueStateNumber, 0)]) {
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 0) {
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, 1)
+ sendNPCDialogueLines(player, NPCs.LADY_TABLE_2283, FacialExpression.NEUTRAL, false, "Excellent work, @name.", "Please step through the portal to meet your next", "challenge.")
+ return@on true
+ }
+ } else {
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 0) {
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, -1)
+ openDialogue(player, LadyTableDialogueFile(2), NPC(NPCs.LADY_TABLE_2283))
+ return@on true
+ }
+ }
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 1) {
+ sendNPCDialogueLines(player, NPCs.LADY_TABLE_2283, FacialExpression.NEUTRAL, false, "Please step through the portal to meet your next", "challenge.")
+ }
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == -1) {
+ openDialogue(player, LadyTableDialogueFile(2), NPC(NPCs.LADY_TABLE_2283))
+ }
+ return@on true
+ }
+
+ }
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { player -> dialogueNum == 1 }
+ .endWith { _, player ->
+ submitWorldPulse(object : Pulse() {
+ var counter = 0
+ override fun pulse(): Boolean {
+ when (counter++) {
+ 0 -> {
+ lock(player, 15)
+ setAttribute(player, attributeStatueStateNumber, (1..12).random())
+ setVarbit(player, statueVarbit, getAttribute(player, attributeStatueStateNumber, 0))
+ sendNPCDialogueLines(player, NPCs.LADY_TABLE_2283, FacialExpression.NEUTRAL, true,"Welcome, @name.", "This room will test your observation skills.")
+ }
+ 5 -> {
+ sendNPCDialogueLines(player, NPCs.LADY_TABLE_2283, FacialExpression.NEUTRAL, true, "Study the statues closely.", "There is one missing statue in this room.")
+ }
+ 10 -> {
+ sendNPCDialogueLines(player, NPCs.LADY_TABLE_2283, FacialExpression.NEUTRAL, true, "We will also mix the order up a little, to make things", "interesting for you!")
+ }
+ 15 -> {
+ sendNPCDialogueLines(player, NPCs.LADY_TABLE_2283, FacialExpression.NEUTRAL, true,"You have 10 seconds to memorise the statues... starting", "NOW!")
+ }
+ 20 -> {
+ closeDialogue(player)
+ }
+ 31 -> { // From 15 -> 16 * 600ms = 10 seconds
+ openOverlay(player,Components.FADE_TO_BLACK_120)
+ sendNPCDialogueLines(player, NPCs.LADY_TABLE_2283, FacialExpression.NEUTRAL, true,"We will now dim the lights and bring the missing statue", "back in.")
+ }
+ 34 -> { // From 15 -> 16 * 600ms = 10 seconds
+ setVarbit(player, statueVarbit, 0)
+ openOverlay(player,Components.FADE_FROM_BLACK_170)
+ sendNPCDialogueLines(player, NPCs.LADY_TABLE_2283, FacialExpression.NEUTRAL, true,"Please touch the statue you think has been added.")
+ return true
+ }
+ }
+ return false
+ }
+ })
+ }
+
+ b.onPredicate { player -> dialogueNum == 2 || (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == -1) }
+ .betweenStage { _, player, _, _ ->
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, -1)
+ }
+ .npc(FacialExpression.SAD, "No... I am very sorry.", "Apparently you are not up to the challenge.", "I will return you where you came from, better luck in the", "future.")
+ .endWith { _, player ->
+ removeAttribute(player, attributeStatueStateNumber)
+ removeAttribute(player, RecruitmentDrive.attributeStagePassFailState)
+ RecruitmentDriveListeners.FailTestCutscene(player).start()
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/MissCheeversDialogue.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/MissCheeversDialogue.kt
new file mode 100644
index 000000000..21fed50ba
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/MissCheeversDialogue.kt
@@ -0,0 +1,512 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+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.player.Player
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+import org.rs09.consts.Scenery
+
+@Initializable
+class MissCheeversDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, MissCheeversDialogueFile(), npc)
+ return true
+ }
+ override fun newInstance(player: Player): DialoguePlugin {
+ return MissCheeversDialogue(player)
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.MISS_CHEEVERS_2288)
+ }
+}
+
+class MissCheeversDialogueFile(private val dialogueNum: Int = 0) : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { _ -> dialogueNum == 0 }
+ .playerl(FacialExpression.FRIENDLY,"Can you give me any help?")
+ .npcl(FacialExpression.FRIENDLY,"No, I am sorry, but that is forbidden by our rules.")
+ .npcl(FacialExpression.FRIENDLY,"If you are having a particularly tough time of it, I suggest you leave and come back later when you are in a more receptive frame of mind.")
+ .npcl(FacialExpression.FRIENDLY,"Sometimes a break from concentration will yield fresh insight. Our aim is to test you, but not to the point of frustration!")
+ .playerl(FacialExpression.FRIENDLY,"Okay, thanks!")
+ .end()
+
+
+ b.onPredicate { _ -> dialogueNum == 1 }
+ .betweenStage { _, player, _, _ ->
+ setVarbit(player, MissCheeversRoomListeners.doorVarbit, 0)
+ removeAttribute(player, MissCheeversRoomListeners.attributebook)
+ removeAttribute(player, MissCheeversRoomListeners.attributemagnet)
+ removeAttribute(player, MissCheeversRoomListeners.attributeKnife)
+ removeAttribute(player, MissCheeversRoomListeners.attributeShears)
+ removeAttribute(player, MissCheeversRoomListeners.attributeTin)
+ removeAttribute(player, MissCheeversRoomListeners.attributeChisel)
+ removeAttribute(player, MissCheeversRoomListeners.attributeWire)
+
+ removeAttribute(player, MissCheeversRoomListeners.attribute3VialsOfLiquid)
+
+ MissCheeversRoomListeners.Companion.Vials.vialMap.map {
+ removeAttribute(player, it.value.attribute)
+ }
+
+ MissCheeversRoomListeners.Companion.DoorVials.doorVialsRequiredMap.map {
+ removeAttribute(player, it.value.attribute)
+ }
+ }
+ .npcl(FacialExpression.FRIENDLY,"Greetings, @name. Welcome to my challenge.")
+ .npcl(FacialExpression.FRIENDLY,"All you need to do is leave from the opposite door to where you came in by.")
+ .npcl(FacialExpression.FRIENDLY,"I will warn you that this is more complicated than it may at first appear.")
+ .npcl(FacialExpression.FRIENDLY,"I should also warn you that there are limited supplies of the items in this room, so think carefully before using them, you may find yourself stuck and have to leave to start again!")
+ .npcl(FacialExpression.FRIENDLY,"Best of luck!")
+ .end()
+ }
+}
+
+class MissCheeversRoomListeners : InteractionListener {
+ companion object {
+
+ const val doorVarbit = 686
+
+ const val attributebook = "quest:recruitmentdrive-book"
+ const val attributemagnet = "quest:recruitmentdrive-magnet"
+ const val attributeKnife = "quest:recruitmentdrive-knife"
+ const val attributeShears = "quest:recruitmentdrive-shears"
+ const val attributeTin = "quest:recruitmentdrive-tin"
+ const val attributeChisel = "quest:recruitmentdrive-chisel"
+ const val attributeWire = "quest:recruitmentdrive-wire"
+
+ const val attribute3VialsOfLiquid = "quest:recruitmentdrive-3vialsofliquid"
+
+ /** Enums to map canoes to related properties. */
+ enum class Vials(val itemId: Int, val attribute: String) {
+ CUPRIC_SULPHATE_5577(Items.CUPRIC_SULPHATE_5577, "quest:recruitmentdrive-cupricsulphate"),
+ ACETIC_ACID_5578(Items.ACETIC_ACID_5578, "quest:recruitmentdrive-aceticacid"),
+ GYPSUM_5579(Items.GYPSUM_5579, "quest:recruitmentdrive-gypsum"),
+ SODIUM_CHLORIDE_5580(Items.SODIUM_CHLORIDE_5580, "quest:recruitmentdrive-sodiumchloride"),
+ NITROUS_OXIDE_5581(Items.NITROUS_OXIDE_5581, "quest:recruitmentdrive-nitrousoxide"),
+ VIAL_OF_LIQUID_5582(Items.VIAL_OF_LIQUID_5582, "quest:recruitmentdrive-vialofliquid"),
+ TIN_ORE_POWDER_5583(Items.TIN_ORE_POWDER_5583, "quest:recruitmentdrive-tinorepowder"),
+ CUPRIC_ORE_POWDER_5584(Items.CUPRIC_ORE_POWDER_5584, "quest:recruitmentdrive-cupricorepowder");
+
+ companion object {
+ @JvmField
+ val vialMap = Vials.values().associateBy { it.itemId }
+ }
+ }
+
+
+ /** Enums to map canoes to related properties. */
+ enum class DoorVials(val itemId: Int, val attribute: String) {
+ CUPRIC_SULPHATE_5577(Items.CUPRIC_SULPHATE_5577, "quest:recruitmentdrive-doorcupricsulphate"),
+ ACETIC_ACID_5578(Items.ACETIC_ACID_5578, ""),
+ SODIUM_CHLORIDE_5580(Items.SODIUM_CHLORIDE_5580, ""),
+ VIAL_OF_LIQUID_5582(Items.VIAL_OF_LIQUID_5582, "quest:recruitmentdrive-doorvialofliquid");
+
+ companion object {
+ @JvmField
+ val doorVialsArray = DoorVials.values().map { it.itemId }.toIntArray()
+ val doorVialsMap = DoorVials.values().associateBy { it.itemId }
+ val doorVialsRequiredMap = DoorVials.values().associateBy { it.itemId }.filter { it.value.attribute != "" }
+ }
+ }
+
+
+ fun searchingHelper(player: Player, attributeCheck: String, item: Int, searchingDescription: String, objectDescription: String) {
+ queueScript(player, 0, QueueStrength.WEAK) { stage: Int ->
+ when (stage) {
+ 0 -> {
+ sendMessage(player, searchingDescription)
+ return@queueScript delayScript(player, 2)
+ }
+ 1 -> {
+ if (attributeCheck != "" && !getAttribute(player, attributeCheck, false)) {
+ setAttribute(player, attributeCheck, true)
+ addItem(player, item)
+ sendMessage(player, objectDescription)
+ } else {
+ sendMessage(player, "You don't find anything interesting.")
+ }
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
+ }
+ }
+ }
+
+ override fun defineListeners() {
+
+ /** Obtainable Items */
+
+ on(Scenery.OLD_BOOKSHELF_7327, IntType.SCENERY, "search") { player, _ ->
+ searchingHelper(player, attributemagnet, Items.MAGNET_5604, "You search the bookshelves...", "Hidden amongst the books you find a magnet.")
+ return@on true
+ }
+
+ on(Scenery.OLD_BOOKSHELF_7328, IntType.SCENERY, "search") { player, _ ->
+ searchingHelper(player, attributebook, Items.ALCHEMICAL_NOTES_5588, "You search the bookshelves...", "You find a book that looks like it might be helpful.")
+ return@on true
+ }
+
+ on(Scenery.OLD_BOOKSHELF_7329, IntType.SCENERY, "search") { player, _ ->
+ searchingHelper(player, attributeKnife, Items.KNIFE_5605, "You search the bookshelves...", "Hidden amongst the books you find a knife.")
+ return@on true
+ }
+
+ on(Scenery.OLD_BOOKSHELF_7330, IntType.SCENERY, "search") { player, _ ->
+ searchingHelper(player, "", 0, "You search the bookshelves...", "")
+ return@on true
+ }
+
+ on(Scenery.SHELVES_7333, IntType.SCENERY, "search") { player, _ ->
+ val vialList = ArrayList()
+ if (!getAttribute(player, Vials.vialMap[Items.ACETIC_ACID_5578]!!.attribute, false)) { vialList.add(Items.ACETIC_ACID_5578) }
+ if (!getAttribute(player, Vials.vialMap[Items.VIAL_OF_LIQUID_5582]!!.attribute, false)) { vialList.add(Items.VIAL_OF_LIQUID_5582) }
+ openDialogue(player, VialShelfDialogueFile(vialList.toIntArray()))
+ return@on true
+ }
+
+ on(Scenery.SHELVES_7334, IntType.SCENERY, "search") { player, _ ->
+ val vialList = ArrayList()
+ if (!getAttribute(player, Vials.vialMap[Items.CUPRIC_SULPHATE_5577]!!.attribute, false)) { vialList.add(Items.CUPRIC_SULPHATE_5577) }
+ openDialogue(player, VialShelfDialogueFile(vialList.toIntArray()))
+ return@on true
+ }
+
+ on(Scenery.SHELVES_7335, IntType.SCENERY, "search") { player, _ ->
+ val vialList = ArrayList()
+ if (!getAttribute(player, Vials.vialMap[Items.GYPSUM_5579]!!.attribute, false)) { vialList.add(Items.GYPSUM_5579) }
+ openDialogue(player, VialShelfDialogueFile(vialList.toIntArray()))
+ return@on true
+ }
+
+ on(Scenery.SHELVES_7336, IntType.SCENERY, "search") { player, _ ->
+ val vialList = ArrayList()
+ if (!getAttribute(player, Vials.vialMap[Items.SODIUM_CHLORIDE_5580]!!.attribute, false)) { vialList.add(Items.SODIUM_CHLORIDE_5580) }
+ openDialogue(player, VialShelfDialogueFile(vialList.toIntArray()))
+ return@on true
+ }
+
+ on(Scenery.SHELVES_7337, IntType.SCENERY, "search") { player, _ ->
+ val vialList = ArrayList()
+ if (!getAttribute(player, Vials.vialMap[Items.NITROUS_OXIDE_5581]!!.attribute, false)) { vialList.add(Items.NITROUS_OXIDE_5581) }
+ openDialogue(player, VialShelfDialogueFile(vialList.toIntArray()))
+ return@on true
+ }
+
+ on(Scenery.SHELVES_7338, IntType.SCENERY, "search") { player, _ ->
+ val vialList = ArrayList()
+ if (!getAttribute(player, Vials.vialMap[Items.TIN_ORE_POWDER_5583]!!.attribute, false)) { vialList.add(Items.TIN_ORE_POWDER_5583) }
+ openDialogue(player, VialShelfDialogueFile(vialList.toIntArray()))
+ return@on true
+ }
+
+ on(Scenery.SHELVES_7339, IntType.SCENERY, "search") { player, _ ->
+ val vialList = ArrayList()
+ if (!getAttribute(player, Vials.vialMap[Items.CUPRIC_ORE_POWDER_5584]!!.attribute, false)) { vialList.add(Items.CUPRIC_ORE_POWDER_5584) }
+ openDialogue(player, VialShelfDialogueFile(vialList.toIntArray()))
+ return@on true
+ }
+
+ on(Scenery.SHELVES_7340, IntType.SCENERY, "search") { player, _ ->
+ val vialList = ArrayList()
+ val total = getAttribute(player, attribute3VialsOfLiquid, 3)
+ for (i in 1..total) { vialList.add(Items.VIAL_OF_LIQUID_5582) }
+ openDialogue(player, VialShelfDialogueFile(vialList.toIntArray(), attribute3VialsOfLiquid))
+ return@on true
+ }
+
+ on(Scenery.CRATE_7347, IntType.SCENERY, "search") { player, node ->
+ if (node.location == Location(2476, 4943)) {
+ searchingHelper(player, attributeTin, Items.TIN_5600, "You search the crate...", "Inside the crate you find a tin.")
+ } else {
+ searchingHelper(player, "", 0, "You search the crate...", "")
+ }
+ return@on true
+ }
+
+ on(Scenery.CRATE_7348, IntType.SCENERY, "search") { player, node ->
+ if (node.location == Location(2476, 4937)) {
+ searchingHelper(player, attributeChisel, Items.CHISEL_5601, "You search the crate...", "Inside the crate you find a chisel.")
+ } else {
+ searchingHelper(player, "", 0, "You search the crate...", "")
+ }
+ return@on true
+ }
+
+ on(Scenery.CRATE_7349, IntType.SCENERY, "search") { player, node ->
+ if (node.location == Location(2475, 4943)) {
+ searchingHelper(player, attributeWire, Items.BRONZE_WIRE_5602, "You search the crate...", "Inside the crate you find some wire.")
+ } else {
+ searchingHelper(player, "", 0, "You search the crate...", "")
+ }
+ return@on true
+ }
+
+ on(Scenery.CLOSED_CHEST_7350, IntType.SCENERY, "open") { player, node ->
+ replaceScenery(node as core.game.node.scenery.Scenery, Scenery.OPEN_CHEST_7351, 100)
+ return@on true
+ }
+
+ on(Scenery.OPEN_CHEST_7351, IntType.SCENERY, "search") { player, _ ->
+ searchingHelper(player, attributeShears, Items.SHEARS_5603, "You search the chest...", "Inside the chest you find some shears.")
+ return@on true
+ }
+
+ on(Scenery.OPEN_CHEST_7351, IntType.SCENERY, "close") { player, node ->
+ replaceScenery(node as core.game.node.scenery.Scenery, Scenery.CLOSED_CHEST_7350, -1)
+ return@on true
+ }
+
+ /** Combining Items the correct way */
+
+ onUseWith(ITEM, Items.TIN_5600, Items.GYPSUM_5579) { player, used, with ->
+ if(removeItem(player, used.id) && removeItem(player, with.id)) {
+ sendMessage(player, "You empty the vial into the tin.")
+ addItemOrDrop(player, Items.TIN_5592)
+ addItemOrDrop(player, Items.VIAL_229)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(ITEM, Items.TIN_5592, Items.VIAL_OF_LIQUID_5582) { player, used, with ->
+ if(removeItem(player, used.id) && removeItem(player, with.id)) {
+ sendMessage(player, "You empty the vial into the tin.")
+ sendMessage(player, "You notice the tin gets quite warm as you do this.")
+ sendMessage(player, "A lumpy white mixture is made, that seems to be hardening.")
+ addItemOrDrop(player, Items.TIN_5593)
+ addItemOrDrop(player, Items.VIAL_229)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(SCENERY, Items.TIN_5593, Scenery.KEY_7346) { player, used, _ ->
+ if(removeItem(player, used.id)) {
+ sendMessage(player, "You make an impression of the key as the white mixture hardens.")
+ addItemOrDrop(player, Items.TIN_5594)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(ITEM, Items.TIN_5594, Items.TIN_ORE_POWDER_5583) { player, used, with ->
+ if(removeItem(player, used.id) && removeItem(player, with.id)) {
+ sendMessage(player, "You pour the vial into the impression of the key.")
+ addItemOrDrop(player, Items.TIN_5595)
+ addItemOrDrop(player, Items.VIAL_229)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(ITEM, Items.TIN_5595, Items.CUPRIC_ORE_POWDER_5584) { player, used, with ->
+ if(removeItem(player, used.id) && removeItem(player, with.id)) {
+ sendMessage(player, "You pour the vial into the impression of the key.")
+ addItemOrDrop(player, Items.TIN_5597)
+ addItemOrDrop(player, Items.VIAL_229)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(ITEM, Items.TIN_5594, Items.CUPRIC_ORE_POWDER_5584) { player, used, with ->
+ if(removeItem(player, used.id) && removeItem(player, with.id)) {
+ sendMessage(player, "You pour the vial into the impression of the key.")
+ addItemOrDrop(player, Items.TIN_5596)
+ addItemOrDrop(player, Items.VIAL_229)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(ITEM, Items.TIN_5596, Items.TIN_ORE_POWDER_5583) { player, used, with ->
+ if(removeItem(player, used.id) && removeItem(player, with.id)) {
+ sendMessage(player, "You pour the vial into the impression of the key.")
+ addItemOrDrop(player, Items.TIN_5597)
+ addItemOrDrop(player, Items.VIAL_229)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(SCENERY, Items.TIN_5597, Scenery.BUNSEN_BURNER_7332) { player, used, _ ->
+ if(removeItem(player, used.id)) {
+ sendMessage(player, "You heat the two powdered ores together in the tin.")
+ sendMessage(player, "You make a duplicate of the key in bronze.")
+ addItemOrDrop(player, Items.TIN_5598)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(ITEM, Items.TIN_5598, Items.BRONZE_WIRE_5602, Items.CHISEL_5601, Items.KNIFE_5605) { player, used, with ->
+ if(removeItem(player, used.id)) {
+ sendMessage(player, "You prise the duplicate key out of the tin.")
+ addItemOrDrop(player, Items.TIN_5594)
+ addItemOrDrop(player, Items.BRONZE_KEY_5585)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(SCENERY, Items.METAL_SPADE_5586, Scenery.BUNSEN_BURNER_7332) { player, used, _ ->
+ if(removeItem(player, used.id)) {
+ sendMessage(player, "You burn the wooden handle away from the spade...")
+ sendMessage(player, "...and are left with a metal spade with no handle.")
+ addItemOrDrop(player, Items.ASHES_592)
+ addItemOrDrop(player, Items.METAL_SPADE_5587)
+ }
+ return@onUseWith true
+ }
+
+
+ on(Scenery.STONE_DOOR_7343, SCENERY, "study") { player, node ->
+ sendDialogueLines(player, "There is a stone slab here obstructing the door.", "There is a small hole in the slab that looks like it might be for a handle.")
+ sendMessage(player, "It's nearly a perfect fit!")
+ return@on true
+ }
+
+ onUseWith(SCENERY, Items.METAL_SPADE_5587, Scenery.STONE_DOOR_7343) { player, used, _ ->
+ if(removeItem(player, used.id)) {
+ sendMessage(player, "You slide the spade into the hole in the stone...")
+ sendMessage(player, "It's nearly a perfect fit!")
+ setVarbit(player, doorVarbit, 1)
+ }
+ return@onUseWith true
+ }
+
+ onUseWith(SCENERY, DoorVials.doorVialsArray, Scenery.STONE_DOOR_7344) { player, used, _ ->
+ if(removeItem(player, used.id)) {
+ setAttribute(player, DoorVials.doorVialsMap[used.id]!!.attribute, true)
+ sendMessage(player, "You pour the vial onto the flat part of the spade.")
+ }
+ if (DoorVials.doorVialsRequiredMap.all { getAttribute(player, it.value.attribute, false) }) {
+ sendMessage(player, "Something caused a reaction when mixed!")
+ sendMessage(player, "The spade gets hotter, and expands slightly.")
+ setVarbit(player, doorVarbit, 2)
+ }
+ return@onUseWith true
+ }
+
+ on(Scenery.STONE_DOOR_7344, SCENERY, "pull-spade") { player, node ->
+ if (DoorVials.doorVialsRequiredMap.all { getAttribute(player, it.value.attribute, false) }) {
+ sendMessage(player, "You pull on the spade...")
+ sendMessage(player, "It works as a handle, and you swing the stone door open.")
+ setVarbit(player, doorVarbit, 3)
+ } else {
+ sendMessage(player, "You pull on the spade...")
+ sendMessage(player, "It comes loose, and slides out of the hole in the stone.")
+ addItemOrDrop(player, Items.METAL_SPADE_5587)
+ setVarbit(player, doorVarbit, 0)
+ }
+ return@on true
+ }
+
+ on(Scenery.OPEN_DOOR_7345, SCENERY, "walk-through") { player, node ->
+ if(player.location.x <= 2477) {
+ player.walkingQueue.addPath(2477, 4940)
+ player.walkingQueue.addPath(2478, 4940)
+ } else {
+ player.walkingQueue.addPath(2477, 4940)
+ }
+ return@on true
+ }
+
+
+ }
+
+}
+
+private class VialShelfDialogueFile(private val flaskIdsArray: IntArray, private val specialAttribute: String? = null) : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { _ -> true }.branch { _ -> flaskIdsArray.size }.let { branch ->
+
+ branch.onValue(3)
+ // This is the only shelf with 3 vials of water.
+ .line("There are three vials on this shelf.")
+ .options("Take the vials?").let { optionBuilder ->
+ optionBuilder.option("Take one vial.")
+ .endWith { _, player ->
+ addItemOrDrop(player, flaskIdsArray[0])
+ if (specialAttribute != null) {
+ setAttribute(player, specialAttribute, getAttribute(player, specialAttribute, 3) - 1)
+ print(getAttribute(player, specialAttribute, 3))
+ }
+ }
+ optionBuilder.option("Take two vials.")
+ .endWith { _, player ->
+ addItemOrDrop(player, flaskIdsArray[0])
+ addItemOrDrop(player, flaskIdsArray[1])
+ if (specialAttribute != null) {
+ setAttribute(player, specialAttribute, getAttribute(player, specialAttribute, 3) - 2)
+ }
+ }
+ optionBuilder.option("Take all three vials.")
+ .endWith { _, player ->
+ addItemOrDrop(player, flaskIdsArray[0])
+ addItemOrDrop(player, flaskIdsArray[1])
+ addItemOrDrop(player, flaskIdsArray[2])
+ if (specialAttribute != null) {
+ setAttribute(player, specialAttribute, getAttribute(player, specialAttribute, 3) - 3)
+ }
+ }
+ optionBuilder.option("Don't take a vial.")
+ .end()
+ }
+ branch.onValue(2)
+ .line("There are two vials on this shelf.")
+ .options("Take the vials?").let { optionBuilder ->
+ optionBuilder.option("Take the first vial.")
+ .endWith { _, player ->
+ addItemOrDrop(player, flaskIdsArray[0])
+ if (specialAttribute != null) {
+ setAttribute(player, specialAttribute, getAttribute(player, specialAttribute, 2) - 1)
+ } else {
+ setAttribute(player, MissCheeversRoomListeners.Companion.Vials.vialMap[flaskIdsArray[0]]!!.attribute, true)
+ }
+ }
+ optionBuilder.option("Take the second vial.")
+ .endWith { _, player ->
+ addItemOrDrop(player, flaskIdsArray[1])
+ if (specialAttribute != null) {
+ setAttribute(player, specialAttribute, getAttribute(player, specialAttribute, 2) - 1)
+ } else {
+ setAttribute(player, MissCheeversRoomListeners.Companion.Vials.vialMap[flaskIdsArray[1]]!!.attribute, true)
+ }
+ }
+ optionBuilder.option("Take both vials.")
+ .endWith { _, player ->
+ addItemOrDrop(player, flaskIdsArray[0])
+ addItemOrDrop(player, flaskIdsArray[1])
+ if (specialAttribute != null) {
+ setAttribute(player, specialAttribute, getAttribute(player, specialAttribute, 2) - 2)
+ } else {
+ setAttribute(player, MissCheeversRoomListeners.Companion.Vials.vialMap[flaskIdsArray[0]]!!.attribute, true)
+ setAttribute(player, MissCheeversRoomListeners.Companion.Vials.vialMap[flaskIdsArray[1]]!!.attribute, true)
+ }
+ }
+ }
+
+ branch.onValue(1)
+ .line("There is a vial on this shelf.")
+ .options("Take the vial?").let { optionBuilder ->
+ optionBuilder.option("YES")
+ .endWith { _, player ->
+ addItemOrDrop(player, flaskIdsArray[0])
+ if (specialAttribute != null) {
+ setAttribute(player, specialAttribute, getAttribute(player, specialAttribute, 1) - 1)
+ } else {
+ setAttribute(player, MissCheeversRoomListeners.Companion.Vials.vialMap[flaskIdsArray[0]]!!.attribute, true)
+ }
+ }
+ optionBuilder.option("NO")
+ .end()
+ }
+
+ branch.onValue(0)
+ .line("There is nothing of interest on these shelves.")
+ }
+ }
+}
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/MsHynnTerprettDialogue.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/MsHynnTerprettDialogue.kt
new file mode 100644
index 000000000..91be2f7a7
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/MsHynnTerprettDialogue.kt
@@ -0,0 +1,154 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import org.rs09.consts.NPCs
+
+@Initializable
+class MsHynnTerprettDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, MsHynnTerprettDialogueFile(), npc)
+ return true
+ }
+ override fun newInstance(player: Player): DialoguePlugin {
+ return MsHynnTerprettDialogue(player)
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.MS_HYNN_TERPRETT_2289)
+ }
+}
+
+class MsHynnTerprettDialogueFile(private val dialogueNum: Int = 0) : DialogueBuilderFile() {
+ companion object {
+ const val attributeRandomRiddle = "quest:recruitmentdrive-randomriddle"
+ const val attributeRecentlyCorrect = "quest:recruitmentdrive-recentlycorrect"
+ }
+
+ override fun create(b: DialogueBuilder) {
+
+ b.onPredicate { player -> true }.branch { player ->
+ if (getAttribute(player, attributeRecentlyCorrect, false)) {
+ return@branch 3
+ } else if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == -1) {
+ return@branch 2
+ } else if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 1) {
+ return@branch 1
+ } else {
+ return@branch 0
+ }
+ }.let { branch ->
+ /** Failed Branch */
+ val failedStage = b.placeholder()
+ failedStage.builder()
+ .npc(FacialExpression.SAD, "No... I am very sorry.", "Apparently you are not up to the challenge.", "I will return you where you came from, better luck in the", "future.")
+ .endWith { _, player ->
+ removeAttribute(player, attributeRandomRiddle)
+ removeAttribute(player, attributeRecentlyCorrect)
+ removeAttribute(player, RecruitmentDrive.attributeStagePassFailState)
+ RecruitmentDriveListeners.FailTestCutscene(player).start()
+ }
+ /** Passed Branch */
+ val passedStage = b.placeholder()
+ passedStage.builder()
+ .betweenStage { _, player, _, _ ->
+ removeAttribute(player, attributeRandomRiddle)
+ removeAttribute(player, attributeRecentlyCorrect)
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 0) {
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, 1)
+ }
+ }
+ .npc("Excellent work, @name.", "Please step through the portal to meet your next", "challenge.")
+ .end()
+
+ branch.onValue(3) // Passed stage
+ .goto(passedStage)
+ branch.onValue(2) // Failed stage
+ .goto(failedStage)
+ branch.onValue(1) // Already passed stage
+ .npc("You certainly have the wits to be a Temple Knight.", "Pass on through the portal to find your next challenge.")
+ .end()
+ branch.onValue(0)
+ .betweenStage { _, player, _, _ ->
+ if (getAttribute(player, attributeRandomRiddle, -1) !in 0..4) {
+ setAttribute(player, attributeRandomRiddle, (0..4).random())
+ }
+ }
+ .npc("Greetings, @name.", "I am here to test your wits with a simple riddle.")
+ .branch { player -> getAttribute(player, attributeRandomRiddle, 0) }
+ .let { branch ->
+ branch.onValue(0)
+ .npc(FacialExpression.THINKING, "Here is my riddle:", "I estimate there to be one million inhabitants in the world", "of @servername, creatures and people both.")
+ .npc(FacialExpression.THINKING, "What number would you get if you multiply", "the number of fingers on everything's left hand, to the", "nearest million?")
+ .manualStage { _, player, _, _ ->
+ sendInputDialogue(player, false, "Enter the amount:") { value: Any ->
+ if(value == "0") {
+ setAttribute(player, attributeRecentlyCorrect, true)
+ } else {
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, -1)
+ }
+ openDialogue(player, MsHynnTerprettDialogueFile(), NPC(NPCs.MS_HYNN_TERPRETT_2289))
+ return@sendInputDialogue
+ }
+ }
+ .end()
+
+ branch.onValue(1)
+ .npc(FacialExpression.THINKING, "Here is my riddle:", "Which of the following statements is true?")
+ .options().let { optionBuilder ->
+ optionBuilder.option("The number of false statements here is one.").goto(failedStage)
+ optionBuilder.option("The number of false statements here is two.").goto(failedStage)
+ optionBuilder.option("The number of false statements here is three.").goto(passedStage)
+ optionBuilder.option("The number of false statements here is four.").goto(failedStage)
+ }
+
+ branch.onValue(2)
+ .npc(FacialExpression.THINKING, "Here is my riddle:", "I have both a husband and daughter.")
+ .npc(FacialExpression.THINKING, "My husband is four times older than my daughter. ", "In twenty years time, he will be twice as old as my", "daughter.")
+ .npc(FacialExpression.THINKING, "How old is my daughter now?")
+ .manualStage { _, player, _, _ ->
+ sendInputDialogue(player, true, "Enter the amount:") { value: Any ->
+ if(value == 10) {
+ setAttribute(player, attributeRecentlyCorrect, true)
+ } else {
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, -1)
+ }
+ openDialogue(player, MsHynnTerprettDialogueFile(), NPC(NPCs.MS_HYNN_TERPRETT_2289))
+ return@sendInputDialogue
+ }
+ }
+ .end()
+
+ branch.onValue(3)
+ .npc(FacialExpression.THINKING, "Here is my riddle:", "Imagine that you have been captured by an enemy.", "You are to be killed, but in a moment of mercy, the", "enemy has allowed you to pick your own demise.")
+ .npc(FacialExpression.THINKING, "Your first choice is to be drowned in a lake of acid.")
+ .npc(FacialExpression.THINKING, "Your second choice is to be burned on a fire.")
+ .npc(FacialExpression.THINKING, "Your third choice is to be thrown to a pack of wolves", "that have not been fed in over a month.")
+ .npc(FacialExpression.THINKING, "Your final choice of fate is to be thrown from the walls", "of a castle, many hundreds of feet high.")
+ .npc(FacialExpression.THINKING, "Which fate would you be wise to choose?")
+ .options().let { optionBuilder ->
+ optionBuilder.option("The lake of acid.").goto(failedStage)
+ optionBuilder.option("The large fire.").goto(failedStage)
+ optionBuilder.option("The wolves.").goto(passedStage)
+ optionBuilder.option("The castle walls.").goto(failedStage)
+ }
+
+ branch.onValue(4)
+ .npc(FacialExpression.THINKING, "Here is my riddle:", "I dropped four identical stones, into four identical", "buckets, each containing an identical amount of water.")
+ .npc(FacialExpression.THINKING, "The first bucket's water was at 32 degrees Fahrenheit,", "the second was at 33 degrees, the third at 34 and the", "fourth was at 35 degrees.")
+ .npc(FacialExpression.THINKING, "Which bucket's stone dropped to the bottom of the bucket", "last?")
+ .options().let { optionBuilder ->
+ optionBuilder.option("Bucket A (32 degrees)").goto(passedStage)
+ optionBuilder.option("Bucket B (33 degrees)").goto(failedStage)
+ optionBuilder.option("Bucket C (34 degrees)").goto(failedStage)
+ optionBuilder.option("Bucket D (35 degrees)").goto(failedStage)
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/RecruitmentDrive.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/RecruitmentDrive.kt
new file mode 100644
index 000000000..709256772
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/RecruitmentDrive.kt
@@ -0,0 +1,135 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.node.entity.player.Player
+import core.game.node.entity.player.link.quest.Quest
+import core.game.node.entity.skill.Skills
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import content.data.Quests
+
+/**
+ * Recruitment Drive Quest
+ *
+ * https://www.youtube.com/watch?v=0yvFREeXNn0 - Quest start log only.
+ * https://www.youtube.com/watch?v=lNlSiUvPL1o - Very good
+ * https://www.youtube.com/watch?v=OGWpX1WqpKM 10:12 - Final congrats page.
+ * https://www.youtube.com/watch?v=nu4OAswRcGg - Speaking to Tiffy after the quest (IMPORTANT!)
+ * https://www.youtube.com/watch?v=srFMJa4nuX0 1:47 blur ass quest log again
+ * https://www.youtube.com/watch?v=L7NdDTWa-1Q HAZEEL's CULT
+ * 1 - Speak to Sir Amik Varze.
+ * 2 - Sent to secret training ground.
+ * 3 - Finish all stages.
+ * 100 - Finish by talking to Tiffy.
+ */
+@Initializable
+class RecruitmentDrive : Quest(Quests.RECRUITMENT_DRIVE, 103, 102, 1, 496, 0, 1, 2) {
+ companion object {
+ const val attributeOriginalGender = "/save:quest:recruitmentdrive-originalgender"
+
+ // Stage state: (0: reset), (1: passed), (-1: failed)
+ const val attributeStagePassFailState = "/save:quest:recruitmentdrive-stagestate"
+ const val attributeCurrentStage = "/save:quest:recruitmentdrive-currentstage"
+ const val attributeStage1 = "/save:quest:recruitmentdrive-stage1"
+ const val attributeStage2 = "/save:quest:recruitmentdrive-stage2"
+ const val attributeStage3 = "/save:quest:recruitmentdrive-stage3"
+ const val attributeStage4 = "/save:quest:recruitmentdrive-stage4"
+ const val attributeStage5 = "/save:quest:recruitmentdrive-stage5"
+ val attributeStageArray = arrayOf(attributeStage1, attributeStage2, attributeStage3, attributeStage4, attributeStage5)
+ }
+
+ override fun drawJournal(player: Player, stage: Int) {
+ super.drawJournal(player, stage)
+ var line = 12
+ var stage = getStage(player)
+
+ var started = getQuestStage(player, Quests.RECRUITMENT_DRIVE) > 0
+
+ if(!started){
+ line(player, "I can start this quest by speaking to !!Sir Amik Varze??,", line++)
+ line(player, "upstairs in !!Falador Castle,??", line++)
+ if (isQuestComplete(player, Quests.DRUIDIC_RITUAL)) {
+ line(player, "with the Druidic Ritual Quest completed,", line++, true)
+ } else {
+ line(player, "with the !!Druidic Ritual Quest?? completed,", line++)
+ }
+ if (isQuestComplete(player, Quests.BLACK_KNIGHTS_FORTRESS)) {
+ line(player, "and since I have completed the Black Knights' Fortress", line++, true)
+ line(player, "Quest.", line++, true)
+ } else {
+ line(player, "and after I have completed the !!Black Knights' Fortress??", line++)
+ line(player, "Quest.", line++)
+ }
+ } else {
+ line(player, "Sir Amik Varze told me that he had put my name forward as", line++, true)
+ line(player, "a potential member of some mysterious organisation.", line++, true)
+
+ if (stage >= 2) {
+ } else if (stage >= 1) {
+ line(player, "I should head to !!Falador Park?? to meet my !!Contact?? so that I", line++, false)
+ line(player, "can begin my !!testing for the job??", line++, false)
+ }
+
+ if (stage >= 3) {
+ line(player, "I went to Falador Park, and met a strange old man named", line++, true)
+ line(player, "Tiffy.", line++, true)
+ line(player, "He sent me to a secret training ground, where my wits", line++, true)
+ line(player, "were thoroughly tested.", line++, true)
+ line(player, "Luckily, I was too smart to fall for any of their little tricks,", line++, true)
+ line(player, "and passed the test with flying colours.", line++, true)
+ } else if (stage >= 2) {
+ // http://youtu.be/Otc7ATq3tik 4:17 - I guess this is why no one opens their quest log
+ line(player, "A man named !!Tiffy?? brought me !!here, to the secret training??", line++, false)
+ line(player, "!!grounds?? so that I could be tested for the job.", line++, false)
+ line++
+ line(player, "I should !!work out?? what I am supposed to do to complete", line++, false)
+ line(player, "these rooms...", line++, false)
+ }
+
+ if (stage >= 4) {
+ line(player, "I am now an official member of the Temple Knights,", line++, true)
+ line(player, "although I have to wait for the paperwork to go through", line++, true)
+ line(player, "before I can commence working for them.", line++, true)
+ } else if (stage >= 3) {
+ line(player, "I should talk to !!Tiffy?? to become a Temple Knight.", line++, false)
+ }
+ if (stage >= 100) {
+ line++
+ line(player,"QUEST COMPLETE!", line)
+ }
+ }
+ }
+
+ override fun reset(player: Player) {
+ removeAttribute(player, attributeOriginalGender)
+ removeAttribute(player, attributeStagePassFailState)
+ removeAttribute(player, attributeCurrentStage)
+ removeAttribute(player, attributeStage1)
+ removeAttribute(player, attributeStage2)
+ removeAttribute(player, attributeStage3)
+ removeAttribute(player, attributeStage4)
+ removeAttribute(player, attributeStage5)
+ }
+
+ override fun finish(player: Player) {
+ var ln = 10
+ super.finish(player)
+ player.packetDispatch.sendString("You have passed the Recruitment Drive!", 277, 4)
+ player.packetDispatch.sendItemZoomOnInterface(Items.INITIATE_SALLET_5574, 230, 277, 5)
+
+ drawReward(player, "1 Quest Point", ln++)
+ drawReward(player, "1000 Prayer, Herblore and", ln++)
+ drawReward(player, "Agility XP", ln++)
+ drawReward(player, "Gaze of Saradomin", ln++)
+ drawReward(player, "Temple Knight's Initiate Helm", ln)
+
+ rewardXP(player, Skills.PRAYER, 1000.0)
+ rewardXP(player, Skills.HERBLORE, 1000.0)
+ rewardXP(player, Skills.AGILITY, 1000.0)
+ addItem(player, Items.INITIATE_SALLET_5574)
+ }
+
+ override fun newInstance(`object`: Any?): Quest {
+ return this
+ }
+}
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/RecruitmentDriveListeners.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/RecruitmentDriveListeners.kt
new file mode 100644
index 000000000..39afdf1f4
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/RecruitmentDriveListeners.kt
@@ -0,0 +1,316 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import content.data.Quests
+import core.api.*
+import core.game.activity.Cutscene
+import core.game.dialogue.FacialExpression
+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.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 core.net.packet.PacketRepository
+import core.net.packet.context.MinimapStateContext
+import core.net.packet.out.MinimapState
+import org.rs09.consts.*
+
+class RecruitmentDriveListeners : InteractionListener {
+ companion object {
+
+ enum class Stages(val npc: Int, val startLocation: Location, val startWalkLocation: Location, val quitPortal: Int, val successDoor: Int) {
+ SIR_SPISHYUS(NPCs.SIR_SPISHYUS_2282, Location(2490, 4972), Location(2489, 4972), Scenery.PORTAL_7272, Scenery.DOOR_7274),
+ LADY_TABLE(NPCs.LADY_TABLE_2283, Location(2460, 4979), Location(2459, 4979), Scenery.PORTAL_7288, Scenery.DOOR_7302),
+ SIR_KUAM_FERENTSE(NPCs.SIR_KUAM_FERENTSE_2284, Location(2455, 4964), Location(2456, 4964), Scenery.PORTAL_7315, Scenery.DOOR_7317),
+ SIR_TINLEY(NPCs.SIR_TINLEY_2286, Location(2471, 4956), Location(2472, 4956), Scenery.PORTAL_7318, Scenery.DOOR_7320),
+ SIR_REN_ITCHOOD(NPCs.SIR_REN_ITCHOOD_2287, Location(2439, 4956), Location(2440, 4956), Scenery.PORTAL_7321, Scenery.DOOR_7323),
+ MISS_CHEEVERS(NPCs.MISS_CHEEVERS_2288, Location(2467, 4940), Location(2468, 4940), Scenery.PORTAL_7324, Scenery.DOOR_7326),
+ MS_HYNN_TERPRETT(NPCs.MS_HYNN_TERPRETT_2289, Location(2451, 4935), Location(2451, 4936), Scenery.PORTAL_7352, Scenery.DOOR_7354);
+
+ companion object {
+ @JvmField
+ val indexMap = Stages.values().associateBy { it.ordinal }
+ val indexArray = Stages.indexMap.keys.map { it }
+ val quitPortalArray = Stages.indexMap.values.map { it.quitPortal }.toIntArray()
+ val successDoorArray = Stages.indexMap.values.map { it.successDoor }.toIntArray()
+ }
+ }
+
+ fun shuffleStages(player: Player) {
+ // Obtain an array to shuffle. Must be at least [5] long.
+ val stagesArrayToShuffle = intArrayOf(0,1,2,3,4,5,6) // Stages.indexArray.toIntArray()
+ stagesArrayToShuffle.shuffle()
+ setAttribute(player, RecruitmentDrive.attributeStage1, stagesArrayToShuffle[0])
+ setAttribute(player, RecruitmentDrive.attributeStage2, stagesArrayToShuffle[1])
+ setAttribute(player, RecruitmentDrive.attributeStage3, stagesArrayToShuffle[2])
+ setAttribute(player, RecruitmentDrive.attributeStage4, stagesArrayToShuffle[3])
+ setAttribute(player, RecruitmentDrive.attributeStage5, stagesArrayToShuffle[4])
+ setAttribute(player, RecruitmentDrive.attributeCurrentStage, 0)
+ removeAttribute(player, RecruitmentDrive.attributeStagePassFailState)
+ }
+
+ fun callStartingDialogues (player: Player, npc: Int) {
+ when (npc) {
+ NPCs.SIR_SPISHYUS_2282 -> openDialogue(player, SirSpishyusDialogueFile(1), NPC(npc))
+ NPCs.LADY_TABLE_2283 -> openDialogue(player, LadyTableDialogueFile(1), NPC(npc))
+ NPCs.SIR_KUAM_FERENTSE_2284 -> openDialogue(player, SirKuamFerentseDialogueFile(1), NPC(npc))
+ NPCs.SIR_TINLEY_2286 -> openDialogue(player, SirTinleyDialogueFile(1), NPC(npc))
+ NPCs.SIR_REN_ITCHOOD_2287 -> openDialogue(player, SirRenItchwoodDialogueFile(1), NPC(npc))
+ NPCs.MISS_CHEEVERS_2288 -> openDialogue(player, MissCheeversDialogueFile(1), NPC(npc))
+ NPCs.MS_HYNN_TERPRETT_2289 -> openDialogue(player, MsHynnTerprettDialogueFile(1), NPC(npc))
+ }
+ }
+ }
+
+ override fun defineListeners() {
+
+ on(Stages.quitPortalArray, IntType.SCENERY, "use") { player, node ->
+ FailTestCutscene(player).start()
+ return@on true
+ }
+
+ on(Stages.successDoorArray, IntType.SCENERY, "open") { player, node ->
+ // This is specially for Miss Cheevers
+ if (inInventory(player, Items.BRONZE_KEY_5585)) {
+ sendMessage(player, "You use the duplicate key you made to unlock the door.")
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, 1)
+ }
+ // Success Door
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 1) {
+ removeAttribute(player, RecruitmentDrive.attributeStagePassFailState)
+ setAttribute(player, RecruitmentDrive.attributeCurrentStage, getAttribute(player, RecruitmentDrive.attributeCurrentStage, 0) + 1)
+ DoorActionHandler.handleAutowalkDoor(player, node as core.game.node.scenery.Scenery)
+ val currentLevel = getAttribute(player, RecruitmentDrive.attributeCurrentStage, 0)
+ if (currentLevel >= 5) {
+ CompleteTestCutscene(player).start()
+ return@on true
+ }
+ val currentStage = getAttribute(player, RecruitmentDrive.attributeStageArray[currentLevel], 0)
+ val currentStageEnum = Stages.indexMap[currentStage]!!
+ closeDialogue(player)
+
+ // This is specifically for Sir Spishyus to reset the fox, chicken, grain
+ SirSpishyusRoomListeners.resetStage(player)
+
+ queueScript(player, 0, QueueStrength.SOFT) { stage: Int ->
+ when (stage) {
+ 0 -> {
+ player.inventory.clear()
+ player.equipment.clear()
+ openOverlay(player, Components.FADE_TO_BLACK_120)
+ return@queueScript delayScript(player, 6)
+ }
+ 1 -> {
+ teleport(player, currentStageEnum.startLocation)
+ return@queueScript delayScript(player, 2)
+ }
+ 2 -> {
+ openOverlay(player, Components.FADE_FROM_BLACK_170)
+ return@queueScript delayScript(player, 2)
+ }
+ 3 -> {
+ forceWalk(player, currentStageEnum.startWalkLocation, "dumb")
+ return@queueScript delayScript(player, 2)
+ }
+ 4 -> {
+ callStartingDialogues(player, currentStageEnum.npc)
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
+ }
+ } else {
+ if(node.id == Scenery.DOOR_7323) {
+ // This is specifically for SirRenItchwood
+ openInterface(player, Components.RD_COMBOLOCK_285)
+ } else {
+ sendMessage(player, "You have not completed this room's puzzle yet.")
+ }
+ }
+ return@on true
+ }
+ }
+
+ /** Starting Recruitment Drive test cutscene */
+ class StartTestCutscene(player: Player) : Cutscene(player) {
+ override fun setup() {
+ loadRegion(9805)
+ val currentStage = getAttribute(player, RecruitmentDrive.attributeStageArray[0], 0)
+ setExit(Stages.indexMap[currentStage]!!.startLocation)
+ }
+
+ override fun runStage(stage: Int) {
+ when (stage) {
+ 0 -> {
+ fadeToBlack()
+ PacketRepository.send(MinimapState::class.java, MinimapStateContext(player, 2))
+ timedUpdate(6)
+ }
+ 1 -> {
+ dialogueLinesUpdate(NPCs.SIR_TIFFY_CASHIEN_2290, FacialExpression.HAPPY, "Here we go!", "Mind your head!")
+ timedUpdate(3)
+ }
+ 2 -> {
+ dialogueLinesUpdate(NPCs.SIR_TIFFY_CASHIEN_2290, FacialExpression.HAPPY, "Oops. Ignore the smell!", "Nearly there!")
+ timedUpdate(3)
+ }
+ 3 -> {
+ dialogueLinesUpdate(NPCs.SIR_TIFFY_CASHIEN_2290, FacialExpression.HAPPY, "And...", "Here we are!", "Best of luck!")
+ timedUpdate(3)
+ }
+ 4 -> {
+ player.inventory.clear()
+ player.equipment.clear()
+ PacketRepository.send(MinimapState::class.java, MinimapStateContext(player, 0))
+ dialogueClose()
+ endWithoutFade {
+ val currentStage = getAttribute(player, RecruitmentDrive.attributeStageArray[0], 0)
+ val firstStage = Stages.indexMap[currentStage]!!
+
+ // This is specifically for Sir Spishyus to reset the fox, chicken, grain
+ SirSpishyusRoomListeners.resetStage(player)
+
+ queueScript(player, 0, QueueStrength.SOFT) { stage: Int ->
+ when (stage) {
+ 0 -> {
+ fadeFromBlack()
+ return@queueScript delayScript(player, 2)
+ }
+ 1 -> {
+ forceWalk(player, firstStage.startWalkLocation, "dumb")
+ return@queueScript delayScript(player, 2)
+ }
+ 2 -> {
+ callStartingDialogues(player, firstStage.npc)
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
+ }
+
+ }
+ }
+ }
+ }
+ }
+
+ /** Failed Recruitment Drive test cutscene */
+ class FailTestCutscene(player: Player) : Cutscene(player) {
+ override fun setup() {
+ loadRegion(9805)
+ setExit(Location(2997, 3374))
+ }
+
+ override fun runStage(stage: Int) {
+ when (stage) {
+ 0 -> {
+ closeDialogue(player)
+ fadeToBlack()
+ PacketRepository.send(MinimapState::class.java, MinimapStateContext(player, 2))
+ timedUpdate(6)
+ }
+ 1 -> {
+ var clearBoss = getAttribute(player, SirKuamFerentseDialogueFile.attributeGeneratedSirLeye, NPC(0))
+ if (clearBoss.id != 0) {
+ clearBoss.clear()
+ }
+ player.inventory.clear()
+ player.equipment.clear()
+ queueScript(player, 0, QueueStrength.SOFT) { stage: Int ->
+ when (stage) {
+ 0 -> {
+ fadeFromBlack()
+ return@queueScript delayScript(player, 2)
+ }
+ 1 -> {
+ PacketRepository.send(MinimapState::class.java, MinimapStateContext(player, 0))
+ openDialogue(player, SirTiffyCashienFailedDialogueFile(), NPC(NPCs.SIR_TIFFY_CASHIEN_2290))
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
+ }
+ endWithoutFade {
+ face(player, Location(2997, 3373))
+ fadeFromBlack()
+ }
+ }
+ }
+ }
+ }
+
+ /** Complete Recruitment Drive test cutscene */
+ class CompleteTestCutscene(player: Player) : Cutscene(player) {
+ override fun setup() {
+ loadRegion(9805)
+ setExit(Location(2996, 3375))
+ }
+
+ override fun runStage(stage: Int) {
+ when (stage) {
+ 0 -> {
+ if (getQuestStage(player, Quests.RECRUITMENT_DRIVE) == 2) {
+ setQuestStage(player, Quests.RECRUITMENT_DRIVE, 3)
+ }
+ closeDialogue(player)
+ fadeToBlack()
+ PacketRepository.send(MinimapState::class.java, MinimapStateContext(player, 2))
+ timedUpdate(6)
+ }
+ 1 -> {
+ player.inventory.clear()
+ player.equipment.clear()
+ PacketRepository.send(MinimapState::class.java, MinimapStateContext(player, 0))
+ queueScript(player, 0, QueueStrength.SOFT) { stage: Int ->
+ when (stage) {
+ 0 -> {
+ fadeFromBlack()
+ return@queueScript delayScript(player, 2)
+ }
+ 1 -> {
+ openDialogue(player, SirTiffyCashienDialogueFile(), NPC(NPCs.SIR_TIFFY_CASHIEN_2290))
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
+ }
+ endWithoutFade {
+ face(player, Location(2997, 3373))
+ fadeFromBlack()
+ }
+ }
+ }
+ }
+ }
+
+ class LogoutRecruitmentDrive : MapArea {
+ override fun defineAreaBorders(): Array {
+ return arrayOf(getRegionBorders(9805))
+ }
+
+ override fun getRestrictions(): Array {
+ return arrayOf(ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.CANNON, ZoneRestriction.FOLLOWERS)
+ }
+
+ override fun areaLeave(entity: Entity, logout: Boolean) {
+ if (entity is Player) {
+ // This is specifically for Sir Spishyus to reset the fox, chicken, grain
+ SirSpishyusRoomListeners.resetStage(entity)
+ // Clear inventory whenever you leave the recruitment drive area
+ entity.inventory.clear()
+ entity.equipment.clear()
+ // Restore player normal tabs on leave
+ entity.interfaceManager.openDefaultTabs()
+ // Teleport you out if you log out. You should do this in one sitting.
+ if (logout) {
+ PacketRepository.send(MinimapState::class.java, MinimapStateContext(entity, 0))
+ teleport(entity, Location(2996, 3375))
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirAmikVarzeDialogueFile.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirAmikVarzeDialogueFile.kt
new file mode 100644
index 000000000..a9aacdc6b
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirAmikVarzeDialogueFile.kt
@@ -0,0 +1,75 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.dialogue.*
+import content.data.Quests
+
+class SirAmikVarzeDialogueFile : DialogueBuilderFile() {
+
+ override fun create(b: DialogueBuilder) {
+ b.onQuestStages(Quests.RECRUITMENT_DRIVE, 0)
+ .npcl(FacialExpression.FRIENDLY,"Hello, friend!")
+ .playerl(FacialExpression.THINKING, "Do you have any other quests for me to do?")
+ .branch { player -> if(isQuestComplete(player, Quests.BLACK_KNIGHTS_FORTRESS) && isQuestComplete(player, Quests.DRUIDIC_RITUAL)) { 1 } else { 0 } }
+ .let{ branch ->
+ // Failure branch
+ branch.onValue(0)
+ .npcl(FacialExpression.THINKING, "A quest? Alas I do not have any quests I can offer you at this time.")
+ .end()
+ return@let branch // Return DialogueBranchBuilder instead of DialogueBuilder to forward the success branch.
+ }.onValue(1) // Success branch
+ .npc("Quests, eh?", "Well, I don't have anything on the go at the moment,", "but there is an organisation that is always looking for", "capable adventurers to assist them.")
+ .npc(FacialExpression.FRIENDLY,"Your excellent work sorting out those Black Knights", "means I will happily write you a letter of", "recommendation.")
+ .npc("Would you like me to put your name forwards to", "them?")
+ .options().let { optionBuilder ->
+ optionBuilder.option ("Yes please")
+ .playerl("Sure thing Sir Amik, sign me up!")
+ .npc(FacialExpression.SUSPICIOUS,"Erm, well, this is a little embarrassing, I already HAVE", "put you forward as a potential member.")
+ .npc("They are the Temple Knights, and you are to", "meet Sir Tiffy Cashien in Falador park for testing", "immediately.")
+ .playerl("Okey dokey, I'll go do that then.")
+ .endWith { _, player ->
+ if(getQuestStage(player, Quests.RECRUITMENT_DRIVE) == 0) {
+ setAttribute(player, RecruitmentDrive.attributeOriginalGender, player.isMale)
+ setQuestStage(player, Quests.RECRUITMENT_DRIVE, 1)
+ }
+ }
+ optionBuilder.option_playerl("No thanks")
+ .end()
+ optionBuilder.option("Tell me about this organization...")
+ .npc(FacialExpression.SUSPICIOUS,"I cannot tell you much...", "They are called the Temple Knights, and are an", "organisation that was founded by Saradomin personally", "many centuries ago.")
+ .npc("There are many rumours and fables about their works and", "actions, but official records of their presence are non-", "existent.")
+ .npc("It is a secret organisation of extraordinary power and", "resourcefulness...")
+ .npc("Let me put it this way:", "Should you decide to take them up on their generous", "offer to join, you will find yourself in an advantageous", "position that many in this world would envy, and that few")
+ .npc("are called to occupy.")
+ .playerl("Well, that wasn't quite as helpful as I thought it would be...but thanks anyway, I guess.")
+ .end()
+ }
+
+ b.onQuestStages(Quests.RECRUITMENT_DRIVE, 1, 2, 3, 4)
+ .npcl(FacialExpression.FRIENDLY,"Hello, friend!")
+ .playerl(FacialExpression.THINKING, "Can I just skip the test to become a Temple Knight?")
+ .npcl("No, I'm afraid not. I suggest you go meet Sir Tiffy in Falador Park, he will be expecting you.")
+ .end()
+
+ // This should be after the Wanted Quest, but is the placeholder until that quest is implemented.
+ b.onQuestStages(Quests.RECRUITMENT_DRIVE, 100)
+ .npcl(FacialExpression.FRIENDLY,"Hello, friend!")
+ .npcl(FacialExpression.FRIENDLY,"Well @name, now that you are a White Knight, I expect you should be out there hunting Black Knights for us!")
+ .options().let { optionBuilder ->
+ optionBuilder.option_playerl("Can you explain the White Knight honour system again?")
+ .npcl("Sadly we are not as rich as we once were, and there are many White Knights who foolishly lose their combat equipment.")
+ .npcl("We do not think it fair to make a profit from our brethren, so we will sell you equipment at cost, and rebuy it at the same cost, but we will only sell equipment to those we consider responsible enough to")
+ .npcl("wield it correctly.")
+ .npcl("By killing Black Knights, you will increase your reputation with us, by killing White Knights we will obviously think less of you.")
+ .npcl("You can check your White Knight reputation level by looking at your quest journal for the Wanted! Quest, or Sir Vyvin will let you know what level you are at when you go to purchase equipment.")
+ .npcl("Sir Vyvin can be found in Falador Castle, and he will sell you any equipment appropriate to your reputation level.")
+ .npcl("Have fun, and go kill some Black Knights for me!")
+ .playerl("Okay Amik, thanks for explaining!")
+ .end()
+
+ optionBuilder.option("Okay, bye!")
+ .playerl("Okay, 'bye then Amik!")
+ .end()
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirKuamFerentseDialogue.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirKuamFerentseDialogue.kt
new file mode 100644
index 000000000..055845ca2
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirKuamFerentseDialogue.kt
@@ -0,0 +1,58 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.NPCs
+
+@Initializable
+class SirKuamFerentseDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, SirKuamFerentseDialogueFile(), npc)
+ return true
+ }
+ override fun newInstance(player: Player): DialoguePlugin {
+ return SirKuamFerentseDialogue(player)
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.SIR_KUAM_FERENTSE_2284)
+ }
+}
+
+class SirKuamFerentseDialogueFile(private val dialogueNum: Int = 0) : DialogueBuilderFile() {
+ companion object {
+ const val attributeGeneratedSirLeye = "quest:recruitmentdrive-generatedsirleye"
+ }
+
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { player -> getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 1 }
+ .npc(FacialExpression.FRIENDLY, "Excellent work, @name.", "Please step through the portal to meet your next", "challenge.")
+ .end()
+
+ // You can't fail unless you quit the room.
+ b.onPredicate { _ -> true }
+ .npc("Ah, @name, you're finally here.", "Your task for this room is to defeat Sir Leye.", "He has been blessed by Saradomin to be undefeatable", "by any man, so it should be quite the challenge for you.")
+ .npc("If you are having problems, remember", "A true warrior uses his wits as much as his brawn.", "Fight smarter, not harder.")
+ .endWith { _, player ->
+ var boss = getAttribute(player, attributeGeneratedSirLeye, NPC(0))
+ if (boss.id != 0) {
+ boss.clear()
+ }
+ boss = NPC(NPCs.SIR_LEYE_2285, player.location)
+ setAttribute(player, attributeGeneratedSirLeye, boss)
+ boss.isRespawn = false
+ boss.isAggressive = false
+ boss.isWalks = true
+ boss.location = Location(2460, 4963)
+ boss.init()
+ registerHintIcon(player, boss)
+ sendChat(boss, "No man may defeat me!")
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirLeyeBehavior.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirLeyeBehavior.kt
new file mode 100644
index 000000000..3f91752f7
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirLeyeBehavior.kt
@@ -0,0 +1,49 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.node.entity.Entity
+import core.game.node.entity.combat.BattleState
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.npc.NPCBehavior
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+import org.rs09.consts.NPCs
+
+class SirLeyeBehavior : NPCBehavior(NPCs.SIR_LEYE_2285) {
+ var clearTime = 0
+
+ override fun tick(self: NPC): Boolean {
+ // You have 400 ticks to kill Sir Leye
+ if (clearTime++ > 400) {
+ clearTime = 0
+ poofClear(self)
+ }
+ return true
+ }
+
+ override fun beforeDamageReceived(self: NPC, attacker: Entity, state: BattleState) {
+ val lifepoints = self.skills.lifepoints
+ if (attacker is Player) {
+ // If you are male, Sir Leye will recover to full health.
+ if (attacker.isMale) {
+ if (state.estimatedHit + Integer.max(state.secondaryHit, 0) > lifepoints - 1) {
+ self.skills.lifepoints = self.getSkills().getStaticLevel(Skills.HITPOINTS)
+ }
+ }
+ }
+ }
+
+ override fun onDeathFinished(self: NPC, killer: Entity) {
+ if (killer is Player) {
+ clearHintIcon(killer)
+ setAttribute(killer, RecruitmentDrive.attributeStagePassFailState, 1)
+ removeAttribute(killer, SirKuamFerentseDialogueFile.attributeGeneratedSirLeye)
+ }
+ }
+
+ // No xp from attacking this dude.
+ override fun getXpMultiplier(self: NPC, attacker: Entity): Double {
+ return 0.0
+ }
+
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirRenItchwoodDialogue.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirRenItchwoodDialogue.kt
new file mode 100644
index 000000000..d5ddd45a0
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirRenItchwoodDialogue.kt
@@ -0,0 +1,199 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.interaction.InterfaceListener
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.world.map.Location
+import core.plugin.Initializable
+import org.rs09.consts.Components
+import org.rs09.consts.NPCs
+
+@Initializable
+class SirRenItchwoodDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, SirRenItchwoodDialogueFile(), npc)
+ return true
+ }
+ override fun newInstance(player: Player): DialoguePlugin {
+ return SirRenItchwoodDialogue(player)
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.SIR_REN_ITCHOOD_2287)
+ }
+}
+
+class SirRenItchwoodDialogueFile(private val dialogueNum: Int = 0) : DialogueBuilderFile() {
+ companion object {
+ const val attributeClueNumber = "quest:recruitmentdrive-cluenumber"
+ }
+
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { player -> dialogueNum in 0..1 && getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) != -1 }
+ .betweenStage { _, player, _, _ ->
+ if (getAttribute(player, attributeClueNumber, -1) !in 0..5) {
+ setAttribute(player, attributeClueNumber, (0..5).random())
+ }
+ }
+ .npc("Greetings friend, and welcome here,", "you'll find my puzzle not so clear.", "Hidden amongst my words, it's true,", "the password for the door as a clue.")
+ .options().let { optionBuilder ->
+ optionBuilder.option_playerl ("Can I have the clue for the door?")
+ .branch { player -> getAttribute(player, attributeClueNumber, 0) }
+ .let{ branch ->
+ // Note: all the "I" in here are written in small case "i" (sic)
+ branch.onValue(0)
+ .npc("Better than me, you'll not find", "In rhyming and in puzzles.", "This clue so clear will tax your mind", "Entirely as it confuzzles!")
+ .end()
+ branch.onValue(1)
+ .npc("Feel the aching of your mind", "In puzzlement, confused.", "See the clue hidden behind", "His words, as you perused.")
+ .end()
+ branch.onValue(2)
+ .npc("Look closely at the words i speak;", "And study closely every part.", "See for yourself the word you seek", "Trapped for you if you're smart.")
+ .end()
+ branch.onValue(3)
+ .npc("More than words, i have not for you", "Except the things i say today.", "Aware are you, this is a clue?", "Take note of what i say!")
+ .end()
+ branch.onValue(4)
+ .npc("Rare it is that you will see", "A puzzle such as this!", "In many ways it tickles me", "Now, watching you hit and miss!")
+ .end()
+ branch.onValue(5)
+ .npc("This riddle of mine may confuse,", "I am quite sure of that.", "Mayhap you should closely peruse", "Every word i have spat?")
+ .end()
+ }
+ return@let optionBuilder.option("Can I have a different clue?")
+ .player("I don't get that riddle...", "Can I have a different one?")
+ .branch { player -> getAttribute(player, attributeClueNumber, 0) }
+ .let{ branch ->
+ branch.onValue(0)
+ .npc("Before you hurry through that door", "Inspect the words i spoke.", "There is a simple hidden flaw", "Ere you think my rhyme a joke.")
+ .end()
+ branch.onValue(1)
+ .npc("First my clue you did not see,", "I really wish you had.", "Such puzzling wordplay devilry", "Has left you kind of mad!")
+ .end()
+ branch.onValue(2)
+ .npc("Last time my puzzle did not help", "Apparently, so you've bidden.", "Study my speech carefully, whelp", "To find the answer, hidden.")
+ .end()
+ branch.onValue(3)
+ .npc("Many types have passed through here", "Even such as you amongst their sort.", "And in the end, the puzzles clear;", "The hidden word you saught.")
+ .end()
+ branch.onValue(4)
+ .npc("Repetition, once again", "Against good sense it goes.", "In my words, the answers plain", "Now that you see rhyme flows.")
+ .end()
+ branch.onValue(5)
+ .npc("Twice it is now, i have stated", "In a rhyme, what is the pass.", "Maybe my words obfuscated", "Entirely beyond your class.")
+ .end()
+ }
+ /*
+ // I'm too goddamned lazy to implement the final clue dialogue
+ return@let optionBuilder.option("Can I have the final clue?")
+ .branch { player -> getAttribute(player, attributeClueNumber, 0) }
+ .let{ branch ->
+ branch.onValue(0)
+ .npc("Betrayed by words the answer is", "In that what i say is the key", "There is no more help after this", "Especially no more from me.")
+ .end()
+ branch.onValue(1)
+ .npc("For the last time i will state", "In simple words, the clue.", "Such tricky words make you irate", "Having no idea what to do...")
+ .end()
+ branch.onValue(2)
+ .npc("Lo! my final speech is now", "Attended to by you.", "Study my words, and find out how", "To understand my clue!")
+ .end()
+ branch.onValue(3)
+ .npc("Many types have passed through here", "Even such as you amongst their sort.", "And in the end, the puzzles clear;", "The hidden word you saught.")
+ .end()
+ branch.onValue(4)
+ .npc("Repetition, once again", "Against good sense it goes.", "In my words, the answers plain", "Now that you see rhyme flows.")
+ .end()
+ branch.onValue(5)
+ .npc("Twice it is now, i have stated", "In a rhyme, what is the pass.", "Maybe my words obfuscated", "Entirely beyond your class.")
+ .end()
+ }
+ */
+
+ }
+ b.onPredicate { player -> dialogueNum == 2 || getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == -1 }
+ .betweenStage { _, player, _, _ ->
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, -1)
+ }
+ .npc(FacialExpression.SAD, "It's sad to say,", "this test beat you.", "I'll send you to Tiffy,", "what to do?")
+ .endWith { _, player ->
+ removeAttribute(player, attributeClueNumber)
+ removeAttribute(player, RecruitmentDrive.attributeStagePassFailState)
+ RecruitmentDriveListeners.FailTestCutscene(player).start()
+ }
+
+ }
+}
+
+class DoorLockPuzzleInterfaceListener : InterfaceListener {
+
+ companion object {
+ const val temp = Components.RD_COMBOLOCK_285
+ const val attributeLock1 = "quest:recruitmentdrive-lock1"
+ const val attributeLock2 = "quest:recruitmentdrive-lock2"
+ const val attributeLock3 = "quest:recruitmentdrive-lock3"
+ const val attributeLock4 = "quest:recruitmentdrive-lock4"
+ val lockArray = arrayOf(attributeLock1, attributeLock2, attributeLock3, attributeLock4)
+ val answers = arrayOf("BITE", "FISH", "LAST", "MEAT", "RAIN", "TIME")
+ }
+
+ override fun defineInterfaceListeners() {
+
+ onOpen(Components.RD_COMBOLOCK_285) { player, _ ->
+ setAttribute(player, attributeLock1, 65)
+ setAttribute(player, attributeLock2, 65)
+ setAttribute(player, attributeLock3, 65)
+ setAttribute(player, attributeLock4, 65)
+ return@onOpen true
+ }
+
+ onClose(Components.RD_COMBOLOCK_285) { player, _ ->
+ removeAttribute(player, attributeLock1)
+ removeAttribute(player, attributeLock2)
+ removeAttribute(player, attributeLock3)
+ removeAttribute(player, attributeLock4)
+ return@onClose true
+ }
+
+ on(Components.RD_COMBOLOCK_285) { player, component, opcode, buttonID, slot, itemID ->
+ // Child IDs for respective locks:
+ // 6 7 8 9
+ // 10 < Lock1 > 11 12 < Lock2 > 13 14 < Lock3 > 15 16 < Lock4 > 17
+ if (buttonID in 10..17) {
+ val position = (buttonID - 10) / 2
+ val backForth = (buttonID - 10) % 2
+ var newValue = getAttribute(player, lockArray[position], 65) + (if (backForth == 0) { -1 } else { 1 })
+ if (newValue < 65) { newValue = 90 } // If char number is under A(65), loop back to Z(90)
+ if (newValue > 90) { newValue = 65 } // If char number is over Z(90), loop back to A(65)
+ setAttribute(player, lockArray[position], newValue)
+ setInterfaceText(player, newValue.toChar().toString(), Components.RD_COMBOLOCK_285, position + 6)
+ }
+ // Enter Button
+ if (buttonID == 18) {
+ val lock1 = getAttribute(player, attributeLock1, 65).toChar()
+ val lock2 = getAttribute(player, attributeLock2, 65).toChar()
+ val lock3 = getAttribute(player, attributeLock3, 65).toChar()
+ val lock4 = getAttribute(player, attributeLock4, 65).toChar()
+ val answer = arrayOf(lock1, lock2, lock3, lock4).joinToString("")
+ closeInterface(player)
+ if (answers[getAttribute(player, SirRenItchwoodDialogueFile.attributeClueNumber, 0)] == answer){
+ removeAttribute(player, SirRenItchwoodDialogueFile.attributeClueNumber)
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) != -1) {
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, 1)
+ }
+ sendNPCDialogue(player, NPCs.SIR_REN_ITCHOOD_2287, "Your wit is sharp, your brains quite clear; You solved my puzzle with no fear. At puzzles I rank you quite the best, now enter the portal for your next test.")
+ } else {
+ removeAttribute(player, SirRenItchwoodDialogueFile.attributeClueNumber)
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 0) {
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, -1)
+ openDialogue(player, SirRenItchwoodDialogueFile(2), NPC(NPCs.SIR_REN_ITCHOOD_2287))
+ }
+ }
+ }
+ return@on true
+ }
+ }
+}
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirSpishyusDialogue.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirSpishyusDialogue.kt
new file mode 100644
index 000000000..8f6df7708
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirSpishyusDialogue.kt
@@ -0,0 +1,221 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.container.impl.EquipmentContainer
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.interaction.InteractionListener
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.node.item.Item
+import core.game.world.map.zone.ZoneBorders
+import core.plugin.Initializable
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+import org.rs09.consts.Scenery
+
+@Initializable
+class SirSpishyusDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, SirSpishyusDialogueFile(), npc)
+ return true
+ }
+ override fun newInstance(player: Player): DialoguePlugin {
+ return SirSpishyusDialogue(player)
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.SIR_SPISHYUS_2282)
+ }
+}
+
+class SirSpishyusDialogueFile(private val dialogueNum: Int = 0) : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { player -> getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 1 }
+ .npc(FacialExpression.FRIENDLY, "Excellent work, @name.", "Please step through the portal to meet your next", "challenge.")
+ .end()
+
+ b.onPredicate { player -> dialogueNum == 2 || getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == -1 }
+ .betweenStage { _, player, _, _ ->
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, -1)
+ }
+ .npc(FacialExpression.SAD, "No... I am very sorry.", "Apparently you are not up to the challenge.", "I will return you where you came from, better luck in the", "future.")
+ .endWith { _, player ->
+ removeAttribute(player, SirTinleyDialogueFile.attributeDoNotMove)
+ removeAttribute(player, RecruitmentDrive.attributeStagePassFailState)
+ RecruitmentDriveListeners.FailTestCutscene(player).start()
+ }
+ b.onPredicate { _ -> true }
+ .npcl(FacialExpression.FRIENDLY, "Ah, welcome @name.")
+ .playerl(FacialExpression.FRIENDLY, "Hello there." + " What am I supposed to be doing in this room?")
+ .npcl(FacialExpression.FRIENDLY, "Well, your task is to take this fox, this chicken and this bag of grain across that bridge there to the other side of the room.")
+ .npcl(FacialExpression.FRIENDLY, "When you have done that, your task is complete.")
+ .playerl(FacialExpression.FRIENDLY, "Is that it?")
+ .npcl(FacialExpression.FRIENDLY, "Well, it is not quite as simple as that may sound.")
+ .npcl(FacialExpression.FRIENDLY, "Firstly, you may only carry one of the objects across the room at a time, for the bridge is old and fragile.")
+ .npcl(FacialExpression.FRIENDLY, "Secondly, the fox wants to eat the chicken, and the chicken wants to eat the grain. Should you ever leave the fox unattended with the chicken, or the grain unattended with the chicken, then")
+ .npcl(FacialExpression.FRIENDLY, "one of them will be eaten, and you will be unable to complete the test.")
+ .playerl(FacialExpression.FRIENDLY, "Okay, I'll see what I can do.")
+ .end()
+ }
+}
+class SirSpishyusRoomListeners : InteractionListener {
+ companion object {
+ const val foxFromVarbit = 680
+ const val foxToVarbit = 681
+ const val chickenFromVarbit = 682
+ const val chickenToVarbit = 683
+ const val grainFromVarbit = 684
+ const val grainToVarbit = 685
+
+ val fromZoneBorder = ZoneBorders(2479, 4967, 2490, 4977)
+ val toZoneBorder = ZoneBorders(2471, 4967, 2478, 4977)
+
+ fun countEquipmentItems(player: Player): Int {
+ var count = 0
+ if(inEquipment(player, Items.GRAIN_5607)) { count++ }
+ if(inEquipment(player, Items.FOX_5608)) { count++ }
+ if(inEquipment(player, Items.CHICKEN_5609)) { count++ }
+ return count
+ }
+
+ fun checkFinished(player: Player) {
+ if (getVarbit(player, foxToVarbit) == 1 && getVarbit(player, chickenToVarbit) == 1 && getVarbit(player, grainToVarbit) == 1) {
+ sendMessage(player, "Congratulations! You have solved this room's puzzle!")
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, 1)
+ }
+ }
+
+ fun checkFail(player: Player): Boolean {
+ return ((getVarbit(player, foxFromVarbit) == 0 && getVarbit(player, chickenFromVarbit) == 0 && getVarbit(player, grainFromVarbit) == 1) ||
+ (getVarbit(player, foxFromVarbit) == 1 && getVarbit(player, chickenFromVarbit) == 0 && getVarbit(player, grainFromVarbit) == 0) ||
+ (getVarbit(player, foxToVarbit) == 1 && getVarbit(player, chickenToVarbit) == 1 && getVarbit(player, grainToVarbit) == 0) ||
+ (getVarbit(player, foxToVarbit) == 0 && getVarbit(player, chickenToVarbit) == 1 && getVarbit(player, grainToVarbit) == 1))
+ }
+
+ fun resetStage(player: Player) {
+ setVarbit(player, foxFromVarbit, 0)
+ setVarbit(player, chickenFromVarbit, 0)
+ setVarbit(player, grainFromVarbit, 0)
+ setVarbit(player, foxToVarbit, 0)
+ setVarbit(player, chickenToVarbit, 0)
+ setVarbit(player, grainToVarbit, 0)
+ removeItem(player, Items.GRAIN_5607, Container.EQUIPMENT)
+ removeItem(player, Items.FOX_5608, Container.EQUIPMENT)
+ removeItem(player, Items.CHICKEN_5609, Container.EQUIPMENT)
+ }
+ }
+
+ override fun defineListeners() {
+ on(Scenery.PRECARIOUS_BRIDGE_7286, SCENERY, "cross") { player, node ->
+ if (countEquipmentItems(player) > 1) {
+ sendDialogue(player, "I really don't think I should be carrying more than 5Kg across that rickety bridge...")
+ } else if (checkFail(player)) {
+ openDialogue(player, SirTinleyDialogueFile(2), NPC(NPCs.SIR_SPISHYUS_2282)) // Fail
+ } else {
+ lock(player, 5)
+ sendMessage(player, "You carefully walk across the rickety bridge...")
+ player.walkingQueue.reset()
+ player.walkingQueue.addPath(2476, 4972)
+ }
+ return@on true
+ }
+
+ on(Scenery.PRECARIOUS_BRIDGE_7287, SCENERY, "cross") { player, node ->
+ if (countEquipmentItems(player) > 1) {
+ sendDialogue(player, "I really don't think I should be carrying more than 5Kg across that rickety bridge...")
+ } else if (checkFail(player)) {
+ openDialogue(player, SirTinleyDialogueFile(2), NPC(NPCs.SIR_SPISHYUS_2282)) // Fail
+ } else {
+ lock(player, 5)
+ sendMessage(player, "You carefully walk across the rickety bridge...")
+ player.walkingQueue.reset()
+ player.walkingQueue.addPath(2484, 4972)
+ }
+ return@on true
+ }
+
+ on(Scenery.GRAIN_7284, SCENERY, "pick-up") { player, _ ->
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 0) {
+ if (fromZoneBorder.insideBorder(player)) {
+ replaceSlot(player, EquipmentSlot.CAPE.ordinal, Item(Items.GRAIN_5607), null, Container.EQUIPMENT)
+ setVarbit(player, grainFromVarbit, 1)
+ }
+ if (toZoneBorder.insideBorder(player)) {
+ replaceSlot(player, EquipmentSlot.CAPE.ordinal, Item(Items.GRAIN_5607), null, Container.EQUIPMENT)
+ setVarbit(player, grainToVarbit, 0)
+ }
+ }
+ return@on true
+ }
+ onUnequip(Items.GRAIN_5607) { player, _ ->
+ if (fromZoneBorder.insideBorder(player)) {
+ removeItem(player, Items.GRAIN_5607, Container.EQUIPMENT)
+ setVarbit(player, grainFromVarbit, 0)
+ }
+ if (toZoneBorder.insideBorder(player)) {
+ removeItem(player, Items.GRAIN_5607, Container.EQUIPMENT)
+ setVarbit(player, grainToVarbit, 1)
+ checkFinished(player)
+ }
+ return@onUnequip true
+ }
+
+
+ on(Scenery.FOX_7277, SCENERY, "pick-up") { player, _ ->
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 0) {
+ if (fromZoneBorder.insideBorder(player)) {
+ replaceSlot(player, EquipmentSlot.WEAPON.ordinal, Item(Items.FOX_5608), null, Container.EQUIPMENT)
+ setVarbit(player, foxFromVarbit, 1)
+ }
+ if (toZoneBorder.insideBorder(player)) {
+ replaceSlot(player, EquipmentSlot.WEAPON.ordinal, Item(Items.FOX_5608), null, Container.EQUIPMENT)
+ setVarbit(player, foxToVarbit, 0)
+ }
+ }
+ return@on true
+ }
+ onUnequip(Items.FOX_5608) { player, _ ->
+ if (fromZoneBorder.insideBorder(player)) {
+ removeItem(player, Items.FOX_5608, Container.EQUIPMENT)
+ setVarbit(player, foxFromVarbit, 0)
+ }
+ if (toZoneBorder.insideBorder(player)) {
+ removeItem(player, Items.FOX_5608, Container.EQUIPMENT)
+ setVarbit(player, foxToVarbit, 1)
+ checkFinished(player)
+ }
+ return@onUnequip true
+ }
+
+
+ on(Scenery.CHICKEN_7281, SCENERY, "pick-up") { player, _ ->
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 0) {
+ if (fromZoneBorder.insideBorder(player)) {
+ replaceSlot(player, EquipmentSlot.SHIELD.ordinal, Item(Items.CHICKEN_5609), null, Container.EQUIPMENT)
+ setVarbit(player, chickenFromVarbit, 1)
+ }
+ if (toZoneBorder.insideBorder(player)) {
+ replaceSlot(player, EquipmentSlot.SHIELD.ordinal, Item(Items.CHICKEN_5609), null, Container.EQUIPMENT)
+ setVarbit(player, chickenToVarbit, 0)
+ }
+ }
+ return@on true
+ }
+ onUnequip(Items.CHICKEN_5609) { player, _ ->
+ if (fromZoneBorder.insideBorder(player)) {
+ removeItem(player, Items.CHICKEN_5609, Container.EQUIPMENT)
+ setVarbit(player, chickenFromVarbit, 0)
+ }
+ if (toZoneBorder.insideBorder(player)) {
+ removeItem(player, Items.CHICKEN_5609, Container.EQUIPMENT)
+ setVarbit(player, chickenToVarbit, 1)
+ checkFinished(player)
+ }
+ return@onUnequip true
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirTiffyCashienDialogueFile.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirTiffyCashienDialogueFile.kt
new file mode 100644
index 000000000..9bd2ecf93
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirTiffyCashienDialogueFile.kt
@@ -0,0 +1,140 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.FacialExpression
+import org.rs09.consts.Items
+
+class SirTiffyCashienDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ b.onQuestStages(Quests.RECRUITMENT_DRIVE, 1)
+ .player(FacialExpression.FRIENDLY, "Sir Amik Varze sent me to meet you here for some", "sort of testing...")
+ .npc(FacialExpression.FRIENDLY, "Ah, @name!", "Amik told me all about you, dontchaknow!", "Spliffing job you you did with the old Black Knights there,", "absolutely first class.")
+ .playerl(FacialExpression.GUILTY, "...Thanks I think.")
+ // .npcl(FacialExpression.FRIENDLY, "Well, not in those exact words, but you get my point, what?")
+ .npc(FacialExpression.FRIENDLY, "Well, a top-notch filly like yourself is just the right sort", "we've been looking for for our organisation.")
+ .npcl(FacialExpression.FRIENDLY, "So, are you ready to begin testing?")
+ .let { path ->
+ val originalPath = b.placeholder()
+ path.goto(originalPath)
+ return@let originalPath.builder().options().let { optionBuilder ->
+ val continuePath = b.placeholder()
+ optionBuilder.option("Testing..?")
+ .playerl(FacialExpression.FRIENDLY, "Testing? What exactly do you mean by testing?")
+ .npcl(FacialExpression.FRIENDLY, "Jolly bad show! Varze was supposed to have informed you about all this before sending you here!")
+ .npcl(FacialExpression.FRIENDLY, "Well, not your fault I suppose, what? Anywho, our organisation is looking for a certain specific type of person to join.")
+ .playerl(FacialExpression.FRIENDLY, "So... You want me to go kill some monster or something for you?")
+ .npcl(FacialExpression.FRIENDLY, "Not at all, old bean. There's plenty of warriors around should we require dumb muscle.")
+ .npcl(FacialExpression.FRIENDLY, "That's really not the kind of thing our organisation is after, what?")
+ .playerl(FacialExpression.FRIENDLY, "So you want me to go and fetch you some kind of common item, and then take it for delivery somewhere on the other side of the country?")
+ .playerl(FacialExpression.FRIENDLY, "Because I really hate doing that!")
+ .npcl(FacialExpression.FRIENDLY, "Haw, haw, haw! What a dull thing to ask of someone, what?")
+ .npcl(FacialExpression.FRIENDLY, "I know what you mean, though. I did my fair share of running errands when I was a young adventurer, myself!")
+ .playerl(FacialExpression.FRIENDLY, "So what exactly will this test consist of?")
+ .npcl(FacialExpression.FRIENDLY, "Can't let just any old riff-raff in, what? The mindless thugs and bully boys are best left in the White Knights or the city guard. We look for the top-shelf brains to join us.")
+ .playerl(FacialExpression.FRIENDLY, "So you want to test my brains? Will it hurt?")
+ .npcl(FacialExpression.FRIENDLY, "Haw, haw, haw! That's a good one!")
+ .npcl(FacialExpression.FRIENDLY, "Not in the slightest.. Well, maybe a bit, but we all have to make sacrifices occasionally, what?")
+ .playerl(FacialExpression.FRIENDLY, "What do you want me to do then?")
+ .npcl(FacialExpression.FRIENDLY, "It's a test of wits, what? I'll take you to our secret training grounds, and you will have to pass through a series of five separate intelligence test to prove you're our sort of adventurer.")
+ .npcl(FacialExpression.FRIENDLY, "Standard puzzle room rules will apply.")
+ .playerl(FacialExpression.THINKING, "Erm... What are standard puzzle room rules exactly?")
+ .npcl(FacialExpression.HAPPY, "Never done this sort of thing before, what?")
+ .npc("The simple rules are:", "No items or equipment to be brought with you.", "Each room is a self-contained puzzle.", "You may quit at any time.")
+ .npcl(FacialExpression.HAPPY, "Of course, if you quit a room, then all your progress up to that point will be cleared, and you'll have to start again from scratch.")
+ .npc(FacialExpression.HAPPY, "Our organisation manages to filter all the top-notch", "adventurers this way.", "So, are you ready to go?")
+ .goto(originalPath)
+ optionBuilder.option("Organisation?")
+ .playerl(FacialExpression.THINKING, "This organisation you keep mentioning.. Perhaps you could tell me a little about it?")
+ .npcl(FacialExpression.FRIENDLY, "Oh, that Amik! Jolly bad form. Did he not tell you anything that he was supposed to?")
+ .playerl(FacialExpression.FRIENDLY, "No. He didn't really tell me anything except to come here and meet you.")
+ .npcl(FacialExpression.FRIENDLY, "Well, now, old sport, let me give you the heads up and the low down, what?")
+ .npcl(FacialExpression.FRIENDLY, "I represent the Temple Knights. We are the premier order of Knights in Asgarnia, if not the world. Saradomin himself personally founded our order centuries ago, and we answer only to him.")
+ .npcl(FacialExpression.FRIENDLY, "Only the very best of the best are permitted to join, and the powers we command are formidable indeed.")
+ .npcl(FacialExpression.FRIENDLY, "You might say that we are the front line of defence for the entire kingdom!")
+ .playerl(FacialExpression.THINKING, "So what's the difference between you and the White Knights?")
+ .npcl(FacialExpression.FRIENDLY, "Well, in simple terms, we're better! Any fool with a sword can manage to get into the White Knights, which is mostly the reason they are so very, very incompetent, what?")
+ .npcl(FacialExpression.FRIENDLY, "The Temple Knights, on the other hand, have to be smarter, stronger and better than all others. We are the elite. No man controls us, for our orders come directly from Saradomin himself!")
+ .npcl(FacialExpression.FRIENDLY, "According to Sir Vey Lance, our head of operations, that is. He claims that everything he tells us to do is done with Saradomin's implicit permission.")
+ .npcl(FacialExpression.FRIENDLY, "It's not every job where you have more authority than the king, though, is it?")
+ .playerl(FacialExpression.THINKING, "Wait... You can order the King around?")
+ .npcl(FacialExpression.FRIENDLY, "Well, not me personally. I'm only in the recruitment side of things, dontchaknow, but the higher ranking members of the organisation have almost absolute power over the kingdom.")
+ .npcl(FacialExpression.FRIENDLY, "Plus a few others, so I hear...")
+ .npcl(FacialExpression.FRIENDLY, "Anyway, this is why we keep our organisation shrouded in secrecy, and why we demand such rigorous testing for all potential recruits. Speaking of which, are you ready to begin your testing?")
+ .goto(originalPath)
+ optionBuilder.option("Yes, let's go!")
+ .player(FacialExpression.FRIENDLY, "Yeah. this sounds right up my street.", "Let's go!")
+ .branch { player -> if(player.inventory.isEmpty && player.equipment.isEmpty && !player.familiarManager.hasFamiliar()) { 1 } else { 0 } }
+ .let { branch ->
+ branch.onValue(0)
+ .npcl(FacialExpression.NEUTRAL, "Well, bad luck, old @g[guy,gal]. You'll need to have a completely empty inventory and you can't be wearing any equipment before we can accurately test you.")
+ .npcl(FacialExpression.HAPPY, "Don't want people cheating by smuggling stuff in, what? That includes things carried by familiars, too! Come and see me again after you've been to the old bank to drop your stuff off, what?")
+ .end()
+ return@let branch
+ }
+ .onValue(1)
+ .npc(FacialExpression.HAPPY, "Jolly good show!", "Now the training grounds location is a secret, so...")
+ .goto(continuePath)
+ optionBuilder.option("No, I've changed my mind.")
+ .player("No, I've changed my mind.")
+ .end()
+
+ return@let continuePath.builder()
+ }
+
+ }.endWith { _, player ->
+ if (getQuestStage(player, Quests.RECRUITMENT_DRIVE) == 1) {
+ setQuestStage(player, Quests.RECRUITMENT_DRIVE, 2)
+ }
+ RecruitmentDriveListeners.shuffleStages(player)
+ RecruitmentDriveListeners.StartTestCutscene(player).start()
+ }
+ b.onQuestStages(Quests.RECRUITMENT_DRIVE, 2)
+ .npc(FacialExpression.FRIENDLY, "Ah, what ho!", "Back for another go at the old testing, what?")
+ .options().let { optionBuilder ->
+ val continuePath = b.placeholder()
+ optionBuilder.option("Yes, let's go!")
+ .player(FacialExpression.FRIENDLY, "Yeah. this sounds right up my street.", "Let's go!")
+ .branch { player -> if(player.inventory.isEmpty && player.equipment.isEmpty && !player.familiarManager.hasFamiliar()) { 1 } else { 0 } }
+ .let { branch ->
+ branch.onValue(0)
+ .npcl(FacialExpression.NEUTRAL, "Well, bad luck, old @g[guy,gal]. You'll need to have a completely empty inventory and you can't be wearing any equipment before we can accurately test you.")
+ .npcl(FacialExpression.HAPPY, "Don't want people cheating by smuggling stuff in, what? That includes things carried by familiars, too! Come and see me again after you've been to the old bank to drop your stuff off, what?")
+ .end()
+ return@let branch
+ }
+ .onValue(1)
+ .npc(FacialExpression.FRIENDLY, "Jolly good show!", "Now the training grounds location is a secret, so...")
+ .endWith { _, player ->
+ RecruitmentDriveListeners.shuffleStages(player)
+ RecruitmentDriveListeners.StartTestCutscene(player).start()
+ }
+ optionBuilder.option("No, I've changed my mind.")
+ .player("No, I've changed my mind.")
+ .end()
+ return@let continuePath.builder()
+ }
+ b.onQuestStages(Quests.RECRUITMENT_DRIVE, 3)
+ .npc(FacialExpression.HAPPY, "Oh, jolly well done!", "Your performance will need to be evaluated by Sir Vey", "personally, but I don't think it's going too far ahead of", "myself to welcome you to the team!")
+ .endWith { _, player ->
+ // Get a voucher and $3000 to change gender if you did do it during the quest.
+ if (getAttribute(player, RecruitmentDrive.attributeOriginalGender, true) != player.isMale) {
+ addItemOrDrop(player, Items.MAKEOVER_VOUCHER_5606)
+ addItemOrDrop(player, Items.COINS_995, 3000)
+ }
+ removeAttribute(player, RecruitmentDrive.attributeOriginalGender)
+ finishQuest(player, Quests.RECRUITMENT_DRIVE)
+ }
+ }
+}
+
+class SirTiffyCashienFailedDialogueFile : DialogueBuilderFile() {
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate { _ -> true }
+ .npc(FacialExpression.SAD, "Oh, jolly bad luck, what?", "Not quite the brainbox you thought you were, eh?")
+ .npc(FacialExpression.HAPPY, "Well, never mind!", "You have an open invitation to join our organization, so", "when you're feeling a little smarter, come back and talk", "to me again.")
+
+ }
+}
diff --git a/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirTinleyDialogue.kt b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirTinleyDialogue.kt
new file mode 100644
index 000000000..d00cae73a
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/falador/quest/recruitmentdrive/SirTinleyDialogue.kt
@@ -0,0 +1,100 @@
+package content.region.asgarnia.falador.quest.recruitmentdrive
+
+import core.api.*
+import core.game.dialogue.DialogueBuilder
+import core.game.dialogue.DialogueBuilderFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.interaction.QueueStrength
+import core.game.node.entity.Entity
+import core.game.node.entity.impl.Projectile
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.system.task.Pulse
+import core.game.world.map.Location
+import core.game.world.map.zone.ZoneBorders
+import core.game.world.update.flag.context.Graphics
+import core.plugin.Initializable
+import org.rs09.consts.NPCs
+import org.rs09.consts.Sounds
+
+@Initializable
+class SirTinleyDialogue (player: Player? = null) : DialoguePlugin(player) {
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, SirTinleyDialogueFile(), npc)
+ return true
+ }
+ override fun newInstance(player: Player): DialoguePlugin {
+ return SirTinleyDialogue(player)
+ }
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.SIR_TINLEY_2286)
+ }
+}
+
+class SirTinleyDialogueFile(private val dialogueNum: Int = 0) : DialogueBuilderFile(), MapArea {
+ companion object {
+ const val attributeDoNotMove = "quest:recruitmentdrive-donotmove"
+ }
+
+ override fun create(b: DialogueBuilder) {
+ b.onPredicate {player -> dialogueNum == 0 && !getAttribute(player, attributeDoNotMove, false) && getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 0 }
+ .npc("Ah, welcome @name.", "I have but one clue for you to pass this room's puzzle:", "'Patience'.")
+ .endWith { _, player ->
+ setAttribute(player, attributeDoNotMove, true)
+ queueScript(player, 0, QueueStrength.NORMAL) { stage: Int ->
+ when (stage) {
+ 0 -> {
+ return@queueScript delayScript(player, 15)
+ }
+ 1 -> {
+ if (getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) != -1) {
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, 1)
+ setAttribute(player, attributeDoNotMove, false)
+ npc(FacialExpression.FRIENDLY, "Excellent work, @name.", "Please step through the portal to meet your next", "challenge.")
+ }
+ return@queueScript stopExecuting(player)
+ }
+ else -> return@queueScript stopExecuting(player)
+ }
+ }
+ }
+
+ b.onPredicate {player -> dialogueNum == 0 && !getAttribute(player, attributeDoNotMove, false) && getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == 1 }
+ .npc(FacialExpression.FRIENDLY, "Excellent work, @name.", "Please step through the portal to meet your next", "challenge.")
+ .end()
+
+ // If you talk to him before time is up, you fail.
+ b.onPredicate { player -> dialogueNum == 0 && getAttribute(player, attributeDoNotMove, false) || dialogueNum == 2 || getAttribute(player, RecruitmentDrive.attributeStagePassFailState, 0) == -1 }
+ .betweenStage { _, player, _, _ ->
+ setAttribute(player, RecruitmentDrive.attributeStagePassFailState, -1)
+ }
+ .npc(FacialExpression.SAD, "No... I am very sorry.", "Apparently you are not up to the challenge.", "I will return you where you came from, better luck in the", "future.")
+ .endWith { _, player ->
+ removeAttribute(player, attributeDoNotMove)
+ removeAttribute(player, RecruitmentDrive.attributeStagePassFailState)
+ RecruitmentDriveListeners.FailTestCutscene(player).start()
+ }
+
+ b.onPredicate { _ -> dialogueNum == 1 }
+ .npc("Ah, @name, you have arrived.", "Speak to me to begin your task.")
+ .endWith { _, player ->
+ setAttribute(player, attributeDoNotMove, false)
+ }
+ }
+
+
+ override fun defineAreaBorders(): Array {
+ return arrayOf(ZoneBorders(2474, 4959, 2478, 4957))
+ }
+
+ override fun entityStep(entity: Entity, location: Location, lastLocation: Location) {
+ if (entity is Player) {
+ if(getAttribute(entity, attributeDoNotMove, false)) {
+ setAttribute(entity, attributeDoNotMove, false)
+ setAttribute(entity, RecruitmentDrive.attributeStagePassFailState, -1)
+ openDialogue(entity, SirTinleyDialogueFile(2), NPC(NPCs.SIR_TINLEY_2286))
+ }
+ }
+ }
+}
diff --git a/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GDiplomacyCutscene.java b/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GDiplomacyCutscene.java
index 487467ae2..3743a5c2c 100644
--- a/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GDiplomacyCutscene.java
+++ b/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GDiplomacyCutscene.java
@@ -1,5 +1,6 @@
package content.region.asgarnia.goblinvillage.quest.goblindiplomacy;
+import content.data.Quests;
import core.game.component.Component;
import core.game.node.entity.player.link.emote.Emotes;
import core.game.activity.ActivityManager;
@@ -54,7 +55,7 @@ public final class GDiplomacyCutscene extends CutscenePlugin {
@Override
public boolean start(final Player player, final boolean login, Object... args) {
- Quest quest = player.getQuestRepository().getQuest(GoblinDiplomacy.NAME);
+ Quest quest = player.getQuestRepository().getQuest(Quests.GOBLIN_DIPLOMACY);
final NPC grubfoot = NPC.create(quest.getStage(player) == 10 ? 4495 : quest.getStage(player) == 20 ? 4497 : quest.getStage(player) == 30 ? 4498 : 4496, getBase().transform(10, 55, 0));
grubfoot.setWalks(false);
npcs.add(grubfoot);
@@ -182,8 +183,8 @@ public final class GDiplomacyCutscene extends CutscenePlugin {
type = GrubFoot.forConfig(player);
dialIndex = RandomFunction.random(DIALOGUES.length);
other = Repository.findNPC(npc.getId() == 4494 ? 4493 : 4494);
- quest = player.getQuestRepository().getQuest(GoblinDiplomacy.NAME);
- if(player.getQuestRepository().getQuest("Lost Tribe").getStage(player) == 43){
+ quest = player.getQuestRepository().getQuest(Quests.GOBLIN_DIPLOMACY);
+ if(player.getQuestRepository().getQuest(Quests.THE_LOST_TRIBE).getStage(player) == 43){
player("Have you heard of the Dorgeshuun?");
stage = 5000;
return true;
@@ -367,8 +368,8 @@ public final class GDiplomacyCutscene extends CutscenePlugin {
player.setAttribute("/save:tlt-goblin-emotes",true);
player.getEmoteManager().unlock(Emotes.GOBLIN_BOW);
player.getEmoteManager().unlock(Emotes.GOBLIN_SALUTE);
- setVarbit(player, 532, 7, true);
- player.getQuestRepository().getQuest("Lost Tribe").setStage(player,44);
+ setVarbit(player, 532, 7, true);
+ player.getQuestRepository().getQuest(Quests.THE_LOST_TRIBE).setStage(player,44);
stage++;
break;
case 5055:
diff --git a/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GoblinDiplomacy.java b/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GoblinDiplomacy.java
index a3e744b86..a85d815cb 100644
--- a/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GoblinDiplomacy.java
+++ b/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GoblinDiplomacy.java
@@ -7,6 +7,7 @@ import core.game.node.entity.player.link.quest.Quest;
import core.game.node.item.GroundItemManager;
import core.game.node.item.Item;
import core.plugin.ClassScanner;
+import content.data.Quests;
/**
* Represents the demon slayer quest.
@@ -15,12 +16,6 @@ import core.plugin.ClassScanner;
*/
@Initializable
public class GoblinDiplomacy extends Quest {
-
- /**
- * The name of the quest.
- */
- public static final String NAME = "Goblin Diplomacy";
-
/**
* Represents the orange goblin mail.
*/
@@ -45,7 +40,7 @@ public class GoblinDiplomacy extends Quest {
* Constructs a new {@Code GoblinDiplomacy} {@Code Object}
*/
public GoblinDiplomacy() {
- super("Goblin Diplomacy", 20, 19, 5);
+ super(Quests.GOBLIN_DIPLOMACY, 20, 19, 5);
}
@Override
diff --git a/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GrubfootDialogue.java b/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GrubfootDialogue.java
index 0eaed3038..ca562e9c6 100644
--- a/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GrubfootDialogue.java
+++ b/Server/src/main/content/region/asgarnia/goblinvillage/quest/goblindiplomacy/GrubfootDialogue.java
@@ -1,5 +1,6 @@
package content.region.asgarnia.goblinvillage.quest.goblindiplomacy;
+import content.data.Quests;
import core.game.dialogue.DialoguePlugin;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
@@ -42,7 +43,7 @@ public final class GrubfootDialogue extends DialoguePlugin {
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
- quest = player.getQuestRepository().getQuest(GoblinDiplomacy.NAME);
+ quest = player.getQuestRepository().getQuest(Quests.GOBLIN_DIPLOMACY);
switch (quest.getStage(player)) {
case 100:
npc("Me lonely.");
diff --git a/Server/src/main/content/region/asgarnia/mudskipperpoint/MudSkipperPointListeners.kt b/Server/src/main/content/region/asgarnia/mudskipperpoint/MudSkipperPointListeners.kt
new file mode 100644
index 000000000..eed56b4bf
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/mudskipperpoint/MudSkipperPointListeners.kt
@@ -0,0 +1,151 @@
+package content.region.asgarnia.mudskipperpoint
+
+import content.global.skill.slayer.MogreNPC
+import content.region.asgarnia.mudskipperpoint.dialogue.SkippyBootDialogue
+import content.region.asgarnia.mudskipperpoint.dialogue.SkippyBucketDialogue
+import core.api.*
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.entity.impl.Projectile
+import core.game.node.entity.player.Player
+import core.game.node.item.Item
+import core.game.world.map.Location
+import core.game.world.update.flag.context.Animation
+import core.game.world.update.flag.context.Graphics
+import core.plugin.Initializable
+import core.tools.RandomFunction
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+import org.rs09.consts.Scenery
+import org.rs09.consts.Vars
+
+@Initializable
+class MudSkipperPointListeners : InteractionListener {
+
+ companion object {
+ private val MESSAGES = arrayOf(
+ "Da boom-boom kill all da fishies!",
+ "I smack you good!",
+ "Smash stupid human!",
+ "Tasty human!",
+ "Human hit me on the head!",
+ "I get you!",
+ "Human scare all da fishies!"
+ )
+
+ private val FISHING_SPOTS = intArrayOf(
+ Scenery.OMINOUS_FISHING_SPOT_10087,
+ Scenery.OMINOUS_FISHING_SPOT_10088,
+ Scenery.OMINOUS_FISHING_SPOT_10089
+ )
+ }
+
+ private fun handleExplosives(player: Player, explosives: Item, target: Location): Boolean{
+ // Check if the player has unlocked the ability to summon Mogres
+ if (getVarbit(player, Vars.VARBIT_MINI_QUEST_MOGRE) != SkippyBucketDialogue.DONE_QUEST){
+ sendDialogueLines(player, "Sinister as that fishing spot is, why would I want to", "explode it?")
+ return false
+ }
+ val distance = player.location.getDistance(target)
+ if (distance < 5){
+ //too close
+ sendPlayerDialogue(player, "If this thing explodes, I think I should stand a liiiiitle further away.")
+ return false
+ }
+ if (distance > 14){
+ // too far
+ sendPlayerDialogue(player, "I can't throw that far.")
+ return false
+ }
+ removeItem(player, explosives.id)
+ animate(player, Animation(385)) // Throw the vial
+ sendMessage(player, "You hurl the shuddering vial into the water...")
+ val projectile = Projectile.create(player, null, 49, 30, 20, 30, Projectile.getSpeed(player, target.location))
+ projectile.endLocation = target.location
+ projectile.send()
+
+ val delay = (2+ distance * 0.5).toInt()
+ queueScript(player, delay){
+ val mogre = MogreNPC()
+ val xOffset = (player.location.x - target.location.x) % 2
+ val yOffset = (player.location.y - target.location.y) % 2
+ mogre.location = Location.create(target.location.x + xOffset, target.location.y + yOffset)
+ mogre.init()
+ mogre.moveStep()
+ mogre.isRespawn = false
+ mogre.attack(player)
+ registerHintIcon(player, mogre)
+ mogre.sendChat(MESSAGES[RandomFunction.random(MESSAGES.size)])
+ if (explosives.id == Items.SUPER_FISHING_EXPLOSIVE_12633){
+ impact(mogre, 15)
+ }
+ mogre.graphics(Graphics(68))
+ sendMessage(player, "...and a Mogre appears!")
+ return@queueScript stopExecuting(player)
+ }
+ return true
+ }
+
+ private fun soberSkippy(player: Player): Boolean {
+ if (getVarbit(player, Vars.VARBIT_MINI_QUEST_MOGRE) > SkippyBucketDialogue.DRUNK){
+ sendDialogue(player, "I think he's sober enough. And I don't want to use another bucket of water.")
+ return false
+ }
+ else{
+ if (hasAnItem(player, Items.BUCKET_OF_WATER_1929).exists()) {
+ openDialogue(player, SkippyBucketDialogue())
+ return true
+ }
+ else{
+ sendDialogue(player, "You know, I could shock him out of it if I could find some cold water...")
+ return false
+ }
+ }
+ }
+
+ override fun defineListeners() {
+
+ onUseWith(IntType.SCENERY, Items.FISHING_EXPLOSIVE_6664, *FISHING_SPOTS) { player, used, with ->
+ handleExplosives(player, used.asItem(), with.location)
+ }
+
+ onUseWith(IntType.SCENERY, Items.SUPER_FISHING_EXPLOSIVE_12633, *FISHING_SPOTS) { player, used, with ->
+ handleExplosives(player, used.asItem(), with.location)
+ }
+
+ on(FISHING_SPOTS, IntType.SCENERY, "Lure", "Bait") { player, _ ->
+ sendMessage(player, "Something seems to have scared all the fishes away...")
+ return@on true
+ }
+
+ on(Scenery.SIGNPOST_10090, IntType.SCENERY, "read") { player, _ ->
+ setInterfaceText(player, "Mudskipper Point.", 220, 2)
+ setInterfaceText(player, "WARNING! BEWARE OF THE MUDSKIPPERS!", 220, 4)
+ openInterface(player, 220)
+ return@on true
+ }
+
+ // For some reason the 2795 wrapper does not work for sober-up
+ on(intArrayOf(NPCs.SKIPPY_2796, NPCs.SKIPPY_2797, NPCs.SKIPPY_2798, NPCs.SKIPPY_2799),
+ IntType.NPC, "sober-up") { player, _ ->
+ return@on soberSkippy(player)
+ }
+
+ onUseWith(IntType.NPC, Items.BUCKET_OF_WATER_1929, NPCs.SKIPPY_2795) { player, _, _ ->
+ return@onUseWith soberSkippy(player)
+ }
+
+ onUseWith(IntType.NPC, Items.FORLORN_BOOT_6663, NPCs.SKIPPY_2795){ player, _, _ ->
+ openDialogue(player, SkippyBootDialogue())
+ return@onUseWith true
+ }
+ }
+
+ override fun defineDestinationOverrides() {
+
+ // Don't run towards the fishing spots when trying to lure or bait or throw explosives
+ setDest(IntType.SCENERY, FISHING_SPOTS, "Lure", "Bait", "use"){ entity, _ ->
+ return@setDest entity.location
+ }
+ }
+}
diff --git a/Server/src/main/content/region/asgarnia/mudskipperpoint/dialogue/SkippyDialogue.kt b/Server/src/main/content/region/asgarnia/mudskipperpoint/dialogue/SkippyDialogue.kt
new file mode 100644
index 000000000..2106d6856
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/mudskipperpoint/dialogue/SkippyDialogue.kt
@@ -0,0 +1,267 @@
+package content.region.asgarnia.mudskipperpoint.dialogue
+
+import content.data.Quests
+import core.api.*
+import core.game.dialogue.DialogueFile
+import core.game.dialogue.DialoguePlugin
+import core.game.dialogue.FacialExpression
+import core.game.dialogue.Topic
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.plugin.Initializable
+import core.tools.END_DIALOGUE
+import core.tools.RandomFunction
+import org.rs09.consts.Items
+import org.rs09.consts.NPCs
+import org.rs09.consts.Vars
+
+
+@Initializable
+class SkippyDialogue(player: Player? = null) : DialoguePlugin(player) {
+
+ override fun handle(interfaceId: Int, buttonId: Int): Boolean {
+ openDialogue(player, SkippyBucketDialogue(0, getVarbit(player, Vars.VARBIT_MINI_QUEST_MOGRE)))
+ return true
+ }
+
+
+ override fun getIds(): IntArray {
+ return intArrayOf(NPCs.SKIPPY_2795)
+ }
+
+}
+
+
+class SkippyBucketDialogue(override var stage: Int = 0, val questStage: Int = 0) : DialogueFile() {
+
+ companion object{
+ // Skippy will progress through these stages as you help him
+ const val DRUNK = 0
+ const val TENDER = 1
+ const val HUNGOVER = 2
+ const val DONE_QUEST = 3
+
+ // Dialogue branches
+ const val THROW_WATER = 10
+ const val DRUNK_RAMBLING = 30
+ const val CRAZY_PEOPLE = 40
+ const val WHO_ARE_THEY = 50
+ // Tea state
+ const val LEARN_RECIPE = 170
+ const val PLAGUE_CITY_RECIPE = 180
+ const val NO_TEA = 190
+ // Hangover cure state
+ const val CURE = 220
+ const val NO_CURE = 250
+ const val RECIPE = 260
+ const val NAME_ORIGIN = 270
+
+ const val ALL_DONE = 300
+ }
+
+ override fun handle(componentID: Int, buttonID: Int) {
+ npc = NPC(NPCs.SKIPPY_2796)
+ when (questStage){
+ DRUNK -> when (stage) {
+ 0 -> if(hasAnItem(player!!, Items.BUCKET_OF_WATER_1929).exists()){
+ playerl(FacialExpression.THINKING, "Well, I could dump this bucket of water over him. That would sober him up a little.").also { stage = THROW_WATER }
+ }
+ else {
+ playerl(FacialExpression.ASKING, "Are you all right? You seem a little...incoherent.").also { stage = DRUNK_RAMBLING }
+ }
+ THROW_WATER -> showTopics(
+ Topic("Throw the water!", THROW_WATER+ 1, true),
+ Topic("I think I'll leave it for now.", END_DIALOGUE)
+ )
+ THROW_WATER + 1 -> playerl(FacialExpression.NEUTRAL, "Hey, Skippy!").also { stage++ }
+ THROW_WATER + 2 -> npcl(FacialExpression.DRUNK, "What?").also {
+ stage = END_DIALOGUE
+ queueScript(player!!, 1){ animationStage : Int ->
+ when(animationStage){
+ 1 -> {
+ // todo get the right animation
+ animate(player!!, 2283)
+ removeItem(player!!, Items.BUCKET_OF_WATER_1929)
+ addItem(player!!, Items.BUCKET_1925)
+ setVarbit(player!!, Vars.VARBIT_MINI_QUEST_MOGRE, TENDER, true)
+ return@queueScript delayScript(player!!, 1)
+ }
+ 2 -> {
+ openDialogue(player!!, SkippyBucketDialogue(THROW_WATER + 4))
+ return@queueScript delayScript(player!!, 1)
+ }
+ 3 -> return@queueScript stopExecuting(player!!)
+ else -> return@queueScript delayScript(player!!, 1)
+ }
+ } }
+ THROW_WATER + 4 -> npcl(FacialExpression.ANGRY, "Ahhhhhhhhhhgh! That's cold! Are you trying to kill me?").also { stage++ }
+ THROW_WATER + 5 -> playerl(FacialExpression.NEUTRAL, "Nope. Just sober you up. Memory coming back yet?").also { stage++ }
+ THROW_WATER + 6 -> npcl(FacialExpression.ANGRY, "No. But I could do with a bowl of tea to warm myself up a bit. Go grab me one and we'll talk.").also { stage++ }
+ THROW_WATER + 7 -> playerl(FacialExpression.ASKING, "Any particular type of tea?").also { stage++ }
+ THROW_WATER + 8 -> npcl(FacialExpression.ANGRY, "Nettle for preference. Just make sure it's hot.").also { stage++ }
+ THROW_WATER + 9 -> npcl(FacialExpression.ANGRY, "And don't throw it at me!").also { stage++ }
+ THROW_WATER + 10 -> playerl(FacialExpression.HALF_GUILTY, "What's your problem? You're all clean now.").also { stage = END_DIALOGUE }
+
+
+ DRUNK_RAMBLING -> npcl(FacialExpression.DRUNK, "Inc'hearnt? Inc'herant! You...you...with yer fancy book- lernin' words. You'd be more than inc'herant if youd seen...").also { stage++ }
+ DRUNK_RAMBLING + 1 -> npcl(FacialExpression.DRUNK, "(Dramatic pause)").also { stage++ }
+ DRUNK_RAMBLING + 2 -> npcl(FacialExpression.DRUNK, "THEM!").also { stage++ }
+ DRUNK_RAMBLING + 3 -> showTopics(
+ Topic("I'm sure I would as well.", CRAZY_PEOPLE),
+ Topic("Who are (Dramatic pause) THEY?", WHO_ARE_THEY, true)
+ )
+
+ CRAZY_PEOPLE -> playerl(FacialExpression.NEUTRAL, "I'm going over here to talk to non-crazy people now.").also { stage++ }
+ CRAZY_PEOPLE + 1 -> npcl(FacialExpression.DRUNK, "Yeah? Yeah? Well when THEY come floppin' into your house and eat your furniture you'll be sorry!").also { stage = END_DIALOGUE }
+
+ WHO_ARE_THEY -> playerl(FacialExpression.NEUTRAL, "Who are").also { stage++ }
+ WHO_ARE_THEY + 1 -> playerl(FacialExpression.NEUTRAL, "(Dramatic pause)").also { stage++ }
+ WHO_ARE_THEY + 2 -> playerl(FacialExpression.NEUTRAL, "THEY?").also { stage++ }
+ WHO_ARE_THEY + 3 -> npcl(FacialExpression.DRUNK, "They! Those bloodthirsty, flesh-tearing devils! They are the reason I'm out here every day hurlin' bottles into the sea!").also { stage++ }
+ WHO_ARE_THEY + 4 -> npcl(FacialExpression.DRUNK, "They are the reason I've lost everything, except the horrifying memory of what THEY look like...").also { stage++ }
+ WHO_ARE_THEY + 5 -> playerl(FacialExpression.ASKING, "And what do THEY look like?").also { stage++ }
+ WHO_ARE_THEY + 6 -> npcl(FacialExpression.DRUNK, "Mudskippers!").also { stage++ }
+ WHO_ARE_THEY + 7 -> playerl(FacialExpression.ASKING, "Mudskippers?").also { stage++ }
+ WHO_ARE_THEY + 8 -> npcl(FacialExpression.DRUNK, "Aye, Mudskippers! Those ferocious, ravening, evil, beady-eyed terrors of the deep!").also { stage++ }
+ WHO_ARE_THEY + 9 -> playerl(FacialExpression.SUSPICIOUS, "I...see...").also{ stage++ }
+ WHO_ARE_THEY + 10 -> npcl(FacialExpression.DRUNK, " I was ambushed by them way back, see. They got the drop on me...I can't remember where, somewhere around here though.").also { stage++ }
+ WHO_ARE_THEY + 11 -> playerl(FacialExpression.ASKING, "These would be the mudskippers, right?").also{ stage++ }
+ WHO_ARE_THEY + 12 -> npcl(FacialExpression.DRUNK, "Aye! The mudskippers! Huge they were! Ten feet of glistening, muddy flesh floppin' towards me with white foam flying from their gnashing fangs!").also { stage++ }
+ WHO_ARE_THEY + 13 -> npcl(FacialExpression.DRUNK, "I fought them up and down the beach, with the tide rising and more of them leaping towards me with cutlasses drawn!").also { stage++ }
+ WHO_ARE_THEY + 14 -> playerl(FacialExpression.HALF_GUILTY, "This is fascinating, but I have to be...").also{ stage++ }
+ WHO_ARE_THEY + 15 -> npcl(FacialExpression.DRUNK, "Shut yer' word-hole and listen! I can't remember all the details, as I'm sure they must have hit me quite hard, but the last thing I remember before it all went black...").also { stage++ }
+ WHO_ARE_THEY + 16 -> npcl(FacialExpression.DRUNK, "...was one of those devils rearing over me, its eyes glowin' red with the fires of hell!").also { stage++ }
+ WHO_ARE_THEY + 17 -> playerl(FacialExpression.ROLLING_EYES, "Fires of hell...right. I believe you.").also { stage++ }
+ WHO_ARE_THEY + 18 -> npcl(FacialExpression.DRUNK, "No you don't! You think I'm crazy, like all the rest! Well, if I'm crazy, how did I get these?").also { stage++ }
+ WHO_ARE_THEY + 19 -> playerl(FacialExpression.ASKING, "Get what?").also { stage++ }
+ WHO_ARE_THEY + 20 -> sendDialogue(player!!, "Skippy shows you what appears to be massive bite scars on his legs. You're no expert, but they look like... giant mudskipper bites!").also { stage++ }
+ WHO_ARE_THEY + 21 -> playerl(FacialExpression.ASKING, "Giant mudskipper bites! Where did you get those?").also { stage++ }
+ WHO_ARE_THEY + 22 -> npcl(FacialExpression.DRUNK, "I can't remember... I've been drinking to forget the horror, and all I seem to have forgotten is where it all happened...").also { stage++ }
+ WHO_ARE_THEY + 23 -> playerl(FacialExpression.THINKING, "Hmmm...I suppose if I sober you up you may well start to recall.").also{ stage++ }
+ WHO_ARE_THEY + 24 -> npcl(FacialExpression.DRUNK, "You'll have a job. I've been drinking this for a week.").also { stage++ }
+ WHO_ARE_THEY + 25 -> playerl(FacialExpression.ASKING, "'Captain Braindeath's Extra Strength Rum/Drain Cleaner. Now 50% more debilitating'?").also { stage++ }
+ WHO_ARE_THEY + 26 -> npcl(FacialExpression.DRUNK, "It's the extra sheep tranquilizers that gives it that added kick!").also { stage++ }
+ WHO_ARE_THEY + 27 -> playerl(FacialExpression.NEUTRAL, "Stay here and I'll be right back. Try not to move. Or go near any open flames.").also { stage = END_DIALOGUE }
+ }
+
+ TENDER -> when(stage){
+ 0 -> playerl(FacialExpression.HAPPY, "Hey, Skippy!").also { stage++ }
+ 1 -> npcl(FacialExpression.PANICKED, "Gaah! Don't drench me again!").also { stage++ }
+ 2 -> playerl(FacialExpression.HALF_GUILTY, "Hey! I only did that once! Try not to be such a big baby!").also { stage++ }
+ 3 -> npcl(FacialExpression.HALF_THINKING, "So what are you here for then?").also { stage = if (hasAnItem(player!!, Items.NETTLE_TEA_4239).exists()) 4 else NO_TEA }
+ 4 -> playerl(FacialExpression.HAPPY, "I've come to give you your tea.").also { stage++ }
+ 5 -> npcl(FacialExpression.HAPPY, "Excellent! I was thinking I was going to freeze out here!").also { stage++ }
+ 6 -> sendItemDialogue(player!!, Items.NETTLE_TEA_4239, "Skippy drinks the tea and clutches his forehead in pain.").also {
+ stage++
+ removeItem(player!!, Items.NETTLE_TEA_4239)
+ setVarbit(player!!, Vars.VARBIT_MINI_QUEST_MOGRE, HUNGOVER, true)
+ }
+ 7 -> npcl(FacialExpression.ANNOYED, "Ohhhhh...").also { stage++ }
+ 8 -> playerl(FacialExpression.ASKING, "What? What's wrong?").also { stage++ }
+ 9 -> npcl(FacialExpression.ANNOYED, "Not so loud...I think I have a hangover...").also { stage++ }
+ 10 -> playerl(FacialExpression.HALF_WORRIED, "Great...Well, I doubt you can remember anything through a hangover. What a waste of nettle tea...").also { stage++ }
+ 11 -> npcl(FacialExpression.FURIOUS, "Hey! A little sympathy here?").also { stage++ }
+ 12 -> npcl(FacialExpression.ANNOYED, "Owwowwoww... must remember not to shout...").also { stage++ }
+ 13 -> npcl(FacialExpression.ASKING, "Look, I do know a hangover cure. If you can get me a bucket of the stuff I think I'll be okay.").also { stage = if(getQuestStage(player!!, Quests.PLAGUE_CITY) >= 14 ) PLAGUE_CITY_RECIPE else LEARN_RECIPE }
+
+ PLAGUE_CITY_RECIPE -> playerl(FacialExpression.HALF_THINKING, "Wait... is this cure a bucket of chocolate milk and snape grass?").also { stage++ }
+ PLAGUE_CITY_RECIPE + 1 -> npcl(FacialExpression.HAPPY, "Yes! That's the stuff!").also { stage++ }
+ PLAGUE_CITY_RECIPE + 2 -> playerl(FacialExpression.HALF_THINKING, "Ahhh. Yes, I've made some of that stuff before. I should be able to get you some, no problem.").also { stage = END_DIALOGUE }
+
+ LEARN_RECIPE -> playerl(FacialExpression.ASKING, "So what is it you need?").also { stage++ }
+ LEARN_RECIPE + 1 -> npcl(FacialExpression.NEUTRAL, "A bucket of milk with chocolate ground into it, with a handful of snape grass thrown in on top.").also { stage++ }
+ LEARN_RECIPE + 2 -> playerl(FacialExpression.ASKING, "What? Run that past me again?").also { stage ++ }
+ LEARN_RECIPE + 3 -> npcl(FacialExpression.NEUTRAL, "Take a bucket of milk, a bar of chocolate and some snape grass.").also { stage++ }
+ LEARN_RECIPE + 4 -> npcl(FacialExpression.NEUTRAL, "Grind the chocolate with a mortar and pestle.").also { stage++ }
+ LEARN_RECIPE + 5 -> npcl(FacialExpression.NEUTRAL, "Add the chocolate powder to the milk, then add the snape grass.").also { stage++ }
+ LEARN_RECIPE + 6 -> npcl(FacialExpression.NEUTRAL, "Then bring it here and I will drink it.").also { stage++ }
+ LEARN_RECIPE + 7 -> npcl(FacialExpression.NEUTRAL, "The end, and we all live happily ever after. Got it?").also { stage = END_DIALOGUE }
+
+ NO_TEA -> playerl(FacialExpression.HALF_GUILTY, "No real reason. I just thought I would check up on you is all.").also { stage++ }
+ NO_TEA + 1 -> npcl(FacialExpression.ANGRY, "Well, I'm still wet, still cold and still waiting on that nettle tea.").also { stage = END_DIALOGUE }
+ }
+ HUNGOVER -> when(stage){
+ 0 -> playerl(FacialExpression.HAPPY, "Hey, Skippy!").also{ stage++ }
+ 1 -> npcl(FacialExpression.ANNOYED, "Egad! Don't you know not to shout around a guy with a hangover?").also { stage++ }
+ 2 -> npcl(FacialExpression.HALF_GUILTY, "Ahhhhhg...No more shouting for me...").also { stage++ }
+ 3 -> npcl(FacialExpression.ASKING, "What is it anyway?").also { stage = if (hasAnItem(player!!, Items.HANGOVER_CURE_1504).exists()) CURE else NO_CURE }
+
+ CURE -> playerl(FacialExpression.HAPPY, "Well Skippy, you will no doubt be glad to hear that I got you your hangover cure!").also { stage++ }
+ CURE + 1 ->npcl(FacialExpression.HAPPY, "Gimme!").also { stage++ }
+ CURE + 2 -> sendDialogue(player!!, "Skippy chugs the hangover cure... very impressive.").also {
+ removeItem(player!!, Items.HANGOVER_CURE_1504)
+ stage++
+ setVarbit(player!!, 1344, DONE_QUEST, true)
+ }
+ CURE + 3 -> npcl(FacialExpression.HAPPY, "Ahhhhhhhhhhhhhhh...").also { stage ++ }
+ CURE + 4 -> npcl(FacialExpression.HAPPY, "Much better...").also { stage ++ }
+ CURE + 5 -> playerl(FacialExpression.ASKING, "Feeling better?").also { stage ++ }
+ CURE + 6 -> npcl(FacialExpression.HAPPY, "Considerably.").also { stage ++ }
+ CURE + 7 -> playerl(FacialExpression.ASKING, "Then tell me where the mudskippers are!").also { stage++ }
+ CURE + 8 -> npcl(FacialExpression.NEUTRAL, "I wish you wouldn't go looking for them. Those vicious killers will tear you apart.").also { stage ++ }
+ CURE + 9 -> npcl(FacialExpression.HALF_THINKING, "It's all becoming clear to me now...").also { stage ++ }
+ CURE + 10 -> npcl(FacialExpression.HAPPY, "I was fishing using a Fishing Explosive...").also { stage ++ }
+ CURE + 11 -> playerl(FacialExpression.ASKING, "A Fishing Explosive?").also { stage++ }
+ CURE + 12 -> npcl(FacialExpression.NEUTRAL, "Well, Slayer Masters sell these highly volatile potions for killing underwater creatures.").also { stage ++ }
+ CURE + 13 -> npcl(FacialExpression.NEUTRAL, "If you don't feel like lobbing a net about all day you can use them to fish with...").also { stage ++ }
+ CURE + 14 -> npcl(FacialExpression.NEUTRAL, "But this time I was startled by what I thought was a giant mudskipper.").also { stage ++ }
+ CURE + 15 -> npcl(FacialExpression.NEUTRAL, "What it was, in fact, was a...").also { stage ++ }
+ CURE + 16 -> npcl(FacialExpression.NEUTRAL, "Dramatic Pause...").also { stage ++ }
+ CURE + 17 -> npcl(FacialExpression.PANICKED, "A Mogre!").also { stage ++ }
+ CURE + 18 -> playerl(FacialExpression.ASKING, "What exactly is a Mogre?").also { stage++ }
+ CURE + 19 -> npcl(FacialExpression.NEUTRAL, "A Mogre is a type of Ogre that spends most of its time underwater.").also { stage ++ }
+ CURE + 20 -> npcl(FacialExpression.NEUTRAL, "They hunt giant mudskippers by wearing their skins and swimming close until they can attack them.").also { stage ++ }
+ CURE + 21 -> npcl(FacialExpression.NEUTRAL, "When I used the Fishing Explosive I scared off all the fish, and so the Mogre got out of the water to express its extreme displeasure.").also { stage ++ }
+ CURE + 22 -> npcl(FacialExpression.NEUTRAL, "With an iron mace.").also { stage ++ }
+ CURE + 23 -> playerl(FacialExpression.ASKING, "I take it the head injury is responsible for the staggering and yelling?").also { stage++ }
+ CURE + 24 -> npcl(FacialExpression.NEUTRAL, "No, no.").also { stage ++ }
+ CURE + 25 -> npcl(FacialExpression.NEUTRAL, "My addiction to almost-lethal alcohol did that.").also { stage ++ }
+ CURE + 26 -> npcl(FacialExpression.NEUTRAL, "But if you are set on finding these Mogres just head south from here until you find Mudskipper Point.").also { stage ++ }
+ CURE + 27 -> playerl(FacialExpression.ASKING, "The mudskipper-eating monsters are to be found at Mudskipper point?").also { stage++ }
+ CURE + 28 -> playerl(FacialExpression.ROLLING_EYES, "Shock!").also { stage++ }
+ CURE + 29 -> playerl(FacialExpression.NEUTRAL, "Thanks. I'll be careful.").also { stage = END_DIALOGUE }
+
+ NO_CURE -> playerl(FacialExpression.HALF_GUILTY, "I just came back to ask you something.").also { stage++ }
+ NO_CURE + 1 -> npcl(FacialExpression.ANNOYED, "What?").also { stage++ }
+ NO_CURE + 2 -> showTopics(
+ Topic("How do I make that hangover cure again?", RECIPE),
+ Topic("Why do they call you 'Skippy'?", NAME_ORIGIN)
+ )
+
+ RECIPE -> npcl(FacialExpression.ANGRY, "Give me strength...Here's what you do. Pay attention!").also { stage++ }
+ RECIPE + 1 -> npcl(FacialExpression.ANGRY, "You take a bucket of milk, a bar of chocolate and some snape grass.").also { stage++ }
+ RECIPE + 2 -> npcl(FacialExpression.ANGRY, "Grind the chocolate with a pestle and mortar.").also { stage++ }
+ RECIPE + 3 -> npcl(FacialExpression.ANGRY, "Add the chocolate powder to the milk, then add the snape grass.").also { stage++ }
+ RECIPE + 4 -> npcl(FacialExpression.ANGRY, "Then bring it here and I will drink it.").also { stage++ }
+ RECIPE + 5 -> npcl(FacialExpression.ANGRY, "Are you likely to remember that or should I go get some crayons and draw you a picture?").also { stage++ }
+ RECIPE + 6 -> playerl(FacialExpression.ANGRY, "Hey! I remember it now, ok! See you in a bit.").also { stage = END_DIALOGUE }
+
+ NAME_ORIGIN -> npcl(FacialExpression.THINKING, "I think it may have something to do with my near- constant raving about mudskippers.").also { stage++ }
+ NAME_ORIGIN + 1 -> npcl(FacialExpression.THINKING, "That or it's something to do with that time with the dress and the field full of daisies...").also { stage = END_DIALOGUE }
+ }
+ DONE_QUEST -> when(stage){
+ 0 -> playerl(FacialExpression.NEUTRAL, "Hey, Skippy.").also { stage++ }
+ 1 -> npcl(FacialExpression.HAPPY, "Hey you!").also { stage++ }
+ 2 -> playerl(FacialExpression.ASKING, "How do I annoy the Mogres again?").also { stage++ }
+ 3 -> npcl(FacialExpression.HAPPY, "Go south to Mudskipper Point and lob a Fishing Explosive into the sea. You can grab them from the Slayer masters.").also { stage++ }
+ 4 -> playerl(FacialExpression.ASKING, "Thanks! So, what are you going to do now?").also { stage++ }
+ 5 -> npcl(FacialExpression.HAPPY, "Well, I was planning on continuing my hobby of wandering up and down this bit of coastline, bellowing random threats and throwing bottles.").also { stage++ }
+ 6 -> npcl(FacialExpression.ASKING, "And you?").also { stage++ }
+ 7 -> playerl(FacialExpression.NEUTRAL, "I was planning on wandering up and down the landscape, bugging people to see if they had mindblowingly dangerous quests for me to undertake.").also { stage++ }
+ 8 -> npcl(FacialExpression.HAPPY, "Well, good luck with that!").also { stage++ }
+ 9 -> playerl(FacialExpression.HAPPY, "You too!").also { stage++ }
+ 10 -> npcl(FacialExpression.ROLLING_EYES, "Weirdo...").also { stage++ }
+ 11 -> playerl(FacialExpression.ROLLING_EYES, "Loony..").also { stage = END_DIALOGUE }
+ }
+ }
+ }
+}
+
+class SkippyBootDialogue: DialogueFile(){
+ override fun handle(componentID: Int, buttonID: Int) {
+ npc = NPC(NPCs.SKIPPY_2796)
+ val expression = if (getVarbit(player!!, Vars.VARBIT_MINI_QUEST_MOGRE) > SkippyBucketDialogue.DRUNK) FacialExpression.ROLLING_EYES else FacialExpression.DRUNK
+ npcl(expression, "Thanks! Now I have two right boots!").also { stage = END_DIALOGUE }
+ }
+
+}
diff --git a/Server/src/main/content/region/asgarnia/portsarim/dialogue/AhabDialogue.java b/Server/src/main/content/region/asgarnia/portsarim/dialogue/AhabDialogue.java
index 493bc1973..5f5446083 100644
--- a/Server/src/main/content/region/asgarnia/portsarim/dialogue/AhabDialogue.java
+++ b/Server/src/main/content/region/asgarnia/portsarim/dialogue/AhabDialogue.java
@@ -5,6 +5,7 @@ import core.game.dialogue.FacialExpression;
import core.game.node.entity.npc.NPC;
import core.plugin.Initializable;
import core.game.node.entity.player.Player;
+import content.data.Quests;
/**
* Represents the dialogue plugin used for the npc Ahav.
@@ -117,7 +118,7 @@ public final class AhabDialogue extends DialoguePlugin {
stage = 28;
break;
case 28:
- if (player.getQuestRepository().isComplete("Dragon Slayer")) {
+ if (player.getQuestRepository().isComplete(Quests.DRAGON_SLAYER)) {
player("Well, I do have a ship that I'm not using.", "It's the Lady Lumbridge.");
stage = 29;
} else {
diff --git a/Server/src/main/content/region/asgarnia/portsarim/dialogue/GerrantDialogue.java b/Server/src/main/content/region/asgarnia/portsarim/dialogue/GerrantDialogue.java
deleted file mode 100644
index 1d00b97d0..000000000
--- a/Server/src/main/content/region/asgarnia/portsarim/dialogue/GerrantDialogue.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package content.region.asgarnia.portsarim.dialogue;
-
-import core.game.dialogue.DialoguePlugin;
-import core.game.dialogue.FacialExpression;
-import core.game.node.entity.npc.NPC;
-import core.plugin.Initializable;
-import core.game.node.entity.player.Player;
-
-/**
- * Represents the dialogue plugin used for the gerrant npc.
- * @author 'Vexia
- * @version 1.0
- */
-@Initializable
-public final class GerrantDialogue extends DialoguePlugin {
-
- /**
- * Constructs a new {@code GerrantDialogue} {@code Object}.
- */
- public GerrantDialogue() {
- /**
- * empty.
- */
- }
-
- /**
- * Constructs a new {@code GerrantDialogue} {@code Object}.
- * @param player the player.
- */
- public GerrantDialogue(Player player) {
- super(player);
- }
-
- @Override
- public DialoguePlugin newInstance(Player player) {
- return new GerrantDialogue(player);
- }
-
- @Override
- public boolean open(Object... args) {
- npc = (NPC) args[0];
- interpreter.sendDialogues(npc, FacialExpression.HAPPY, "Welcome! You can buy fishing equipment at my store.", "We'll also buy anything you catch off you.");
- stage = 0;
- return true;
- }
-
- @Override
- public boolean handle(int interfaceId, int buttonId) {
- switch (stage) {
- case 0:
- interpreter.sendOptions("Choose an option:", "Let's see what you've got then.", "Sorry, I'm not interested.");
- stage = 1;
- break;
- case 1:
- switch (buttonId) {
- case 1:
- interpreter.sendDialogues(player, FacialExpression.HAPPY, "Let's see what you've got then.");
- stage = 10;
- break;
- case 2:
- interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Sorry, I'm not interested.");
- stage = 20;
- break;
-
- }
- break;
- case 10:
- end();
- npc.openShop(player);
- break;
- case 20:
- end();
- break;
- }
- return true;
- }
-
- @Override
- public int[] getIds() {
- return new int[] { 558 };
- }
-}
diff --git a/Server/src/main/content/region/asgarnia/portsarim/dialogue/KlarenseDialogue.java b/Server/src/main/content/region/asgarnia/portsarim/dialogue/KlarenseDialogue.java
index e09ea0149..6c5e14b1e 100644
--- a/Server/src/main/content/region/asgarnia/portsarim/dialogue/KlarenseDialogue.java
+++ b/Server/src/main/content/region/asgarnia/portsarim/dialogue/KlarenseDialogue.java
@@ -7,6 +7,7 @@ import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.quest.Quest;
import core.plugin.Initializable;
import core.game.node.item.Item;
+import content.data.Quests;
/**
* Represents the dialogue used for the klarense npc.
@@ -51,7 +52,7 @@ public final class KlarenseDialogue extends DialoguePlugin {
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
- quest = player.getQuestRepository().getQuest("Dragon Slayer");
+ quest = player.getQuestRepository().getQuest(Quests.DRAGON_SLAYER);
if (args.length > 1) {
interpreter.sendDialogues(npc, FacialExpression.ANGRY, "Hey, stay off my ship! That's private property!");
stage = 0;
diff --git a/Server/src/main/content/region/asgarnia/portsarim/dialogue/MonkOfEntranaDialogue.java b/Server/src/main/content/region/asgarnia/portsarim/dialogue/MonkOfEntranaDialogue.java
index 884ce1c00..e8c921159 100644
--- a/Server/src/main/content/region/asgarnia/portsarim/dialogue/MonkOfEntranaDialogue.java
+++ b/Server/src/main/content/region/asgarnia/portsarim/dialogue/MonkOfEntranaDialogue.java
@@ -41,6 +41,11 @@ public final class MonkOfEntranaDialogue extends DialoguePlugin {
return new MonkOfEntranaDialogue(player);
}
+ public void sail(Player player, Ships ship) {
+ ship.sail(player);
+ playJingle(player, 172);
+ }
+
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
@@ -98,7 +103,7 @@ public final class MonkOfEntranaDialogue extends DialoguePlugin {
stage = 25;
break;
case 23:
- interpreter.sendDialogues(npc, null, "Do not try and decieve us again. Come back when you", "have liad down your Zamorakian instruments of death.");
+ interpreter.sendDialogues(npc, null, "Do not try to deceive us again. Come back when you", "have laid down your Zamorakian instruments of death.");
stage = 24;
break;
case 24:
@@ -106,8 +111,7 @@ public final class MonkOfEntranaDialogue extends DialoguePlugin {
break;
case 25:
end();
- Ships.PORT_SARIM_TO_ENTRANA.sail(player);
- playJingle(player, 172);
+ sail(player, Ships.PORT_SARIM_TO_ENTRANA);
if (!player.getAchievementDiaryManager().getDiary(DiaryType.FALADOR).isComplete(0, 14)) {
player.getAchievementDiaryManager().getDiary(DiaryType.FALADOR).updateTask(player, 0, 14, true);
}
@@ -133,9 +137,7 @@ public final class MonkOfEntranaDialogue extends DialoguePlugin {
stage = 511;
break;
case 511:
- end();
- Ships.ENTRANA_TO_PORT_SARIM.sail(player);
- playJingle(player, 172);
+ sail(player, Ships.ENTRANA_TO_PORT_SARIM);
break;
case 520:
end();
diff --git a/Server/src/main/content/region/asgarnia/portsarim/dialogue/RedbeardFrankDialogue.java b/Server/src/main/content/region/asgarnia/portsarim/dialogue/RedbeardFrankDialogue.java
index 214b5f9f4..e3a46166c 100644
--- a/Server/src/main/content/region/asgarnia/portsarim/dialogue/RedbeardFrankDialogue.java
+++ b/Server/src/main/content/region/asgarnia/portsarim/dialogue/RedbeardFrankDialogue.java
@@ -12,6 +12,7 @@ import core.plugin.Initializable;
import core.game.node.item.Item;
import static core.tools.DialogueConstKt.END_DIALOGUE;
+import content.data.Quests;
/**
* Represents the dialogue to handle Rebeard Frank.
@@ -59,7 +60,7 @@ public class RedbeardFrankDialogue extends DialoguePlugin {
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
- quest = player.getQuestRepository().getQuest("Pirate's Treasure");
+ quest = player.getQuestRepository().getQuest(Quests.PIRATES_TREASURE);
npc("Arr, Matey!");
stage = 0;
replacementReward = AchievementDiary.canReplaceReward(player, DiaryType.FALADOR, level);
diff --git a/Server/src/main/content/region/asgarnia/portsarim/handlers/PortSarimPlugin.java b/Server/src/main/content/region/asgarnia/portsarim/handlers/PortSarimPlugin.java
index 47df99e03..8746b7e93 100644
--- a/Server/src/main/content/region/asgarnia/portsarim/handlers/PortSarimPlugin.java
+++ b/Server/src/main/content/region/asgarnia/portsarim/handlers/PortSarimPlugin.java
@@ -15,6 +15,7 @@ import core.game.world.update.flag.context.Animation;
import core.plugin.Plugin;
import core.plugin.Initializable;
import core.tools.RandomFunction;
+import content.data.Quests;
/**
* Represents the port sarim plugin.
@@ -72,7 +73,7 @@ public final class PortSarimPlugin extends OptionHandler {
player.getDialogueInterpreter().open(238284);
break;
case "attack":
- if (player.getQuestRepository().getQuest("Dragon Slayer").getStage(player) != 20) {
+ if (player.getQuestRepository().getQuest(Quests.DRAGON_SLAYER).getStage(player) != 20) {
player.getPacketDispatch().sendMessage("The goblin is already in prison. You have no reason to attack him.");
} else {
player.getProperties().getCombatPulse().attack(node);
diff --git a/Server/src/main/content/region/asgarnia/portsarim/handlers/PortsObjectPlugin.java b/Server/src/main/content/region/asgarnia/portsarim/handlers/PortsObjectPlugin.java
index 206b3860c..7f45a94f4 100644
--- a/Server/src/main/content/region/asgarnia/portsarim/handlers/PortsObjectPlugin.java
+++ b/Server/src/main/content/region/asgarnia/portsarim/handlers/PortsObjectPlugin.java
@@ -11,6 +11,7 @@ import core.game.world.repository.Repository;
import core.game.world.update.flag.context.Animation;
import core.plugin.Initializable;
import core.plugin.Plugin;
+import content.data.Quests;
/**
* Represents the option handler for port sarim.
@@ -206,7 +207,7 @@ public class PortsObjectPlugin extends OptionHandler {
player.getPacketDispatch().sendMessage("You disembark the ship.");
break;
case 2593:
- if (player.getQuestRepository().getQuest("Dragon Slayer").getStage(player) == 100) {
+ if (player.getQuestRepository().getQuest(Quests.DRAGON_SLAYER).getStage(player) == 100) {
player.getDialogueInterpreter().open(744, Repository.findNPC(744), true);// lady
// lumbridge.
return true;
diff --git a/Server/src/main/content/region/asgarnia/portsarim/quest/piratestreasure/PiratesTreasure.java b/Server/src/main/content/region/asgarnia/portsarim/quest/piratestreasure/PiratesTreasure.java
index ae22be400..65ab84c0e 100644
--- a/Server/src/main/content/region/asgarnia/portsarim/quest/piratestreasure/PiratesTreasure.java
+++ b/Server/src/main/content/region/asgarnia/portsarim/quest/piratestreasure/PiratesTreasure.java
@@ -7,6 +7,7 @@ import core.game.node.item.GroundItemManager;
import core.game.node.item.Item;
import core.plugin.Initializable;
import core.plugin.ClassScanner;
+import content.data.Quests;
/**
* Represents the pirates treasure quest.
@@ -50,7 +51,7 @@ public final class PiratesTreasure extends Quest {
* Constructs a new {@Code PiratesTreasure} {@Code Object}
*/
public PiratesTreasure() {
- super("Pirate's Treasure", 23, 22, 2, 71, 0, 1, 4);
+ super(Quests.PIRATES_TREASURE, 23, 22, 2, 71, 0, 1, 4);
}
@Override
diff --git a/Server/src/main/content/region/asgarnia/portsarim/quest/piratestreasure/PiratesTreasurePlugin.java b/Server/src/main/content/region/asgarnia/portsarim/quest/piratestreasure/PiratesTreasurePlugin.java
index a4f64a4dc..ce41de603 100644
--- a/Server/src/main/content/region/asgarnia/portsarim/quest/piratestreasure/PiratesTreasurePlugin.java
+++ b/Server/src/main/content/region/asgarnia/portsarim/quest/piratestreasure/PiratesTreasurePlugin.java
@@ -15,6 +15,7 @@ import core.game.node.item.Item;
import core.game.node.scenery.Scenery;
import core.game.world.map.Location;
import core.plugin.Plugin;
+import content.data.Quests;
/**
* Represents the pirates treasure plugin.
@@ -92,7 +93,7 @@ public final class PiratesTreasurePlugin extends OptionHandler {
@Override
public void run(Player player) {
- final Quest quest = player.getQuestRepository().getQuest("Pirate's Treasure");
+ final Quest quest = player.getQuestRepository().getQuest(Quests.PIRATES_TREASURE);
player.lock(2);
if (quest.getStage(player) == 20) {
if (player.getSavedData().getQuestData().isGardenerAttack()) {
diff --git a/Server/src/main/content/region/asgarnia/rimmington/dialogue/HettyDialogue.kt b/Server/src/main/content/region/asgarnia/rimmington/dialogue/HettyDialogue.kt
index 5f9d41e3f..39a15588a 100644
--- a/Server/src/main/content/region/asgarnia/rimmington/dialogue/HettyDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/rimmington/dialogue/HettyDialogue.kt
@@ -1,7 +1,7 @@
package content.region.asgarnia.rimmington.dialogue
+import content.data.Quests
import content.region.asgarnia.rimmington.quest.witchpotion.HettyWitchsPotionDialogue
-import content.region.asgarnia.rimmington.quest.witchpotion.WitchsPotion
import core.api.*
import core.game.dialogue.DialoguePlugin
import core.game.dialogue.FacialExpression
@@ -20,7 +20,7 @@ class HettyDialogue(player: Player? = null) : DialoguePlugin(player) {
override fun open(vararg args: Any?): Boolean {
npc = args[0] as NPC
- val questStage = getQuestStage(player, WitchsPotion.QUEST_NAME)
+ val questStage = getQuestStage(player, Quests.WITCHS_POTION)
when(questStage) {
0 -> npcl(FacialExpression.NEUTRAL, "What could you want with an old woman like me?").also { stage = 0 }
diff --git a/Server/src/main/content/region/asgarnia/rimmington/handler/RimmingtonListeners.kt b/Server/src/main/content/region/asgarnia/rimmington/handler/RimmingtonListeners.kt
new file mode 100644
index 000000000..5dc727594
--- /dev/null
+++ b/Server/src/main/content/region/asgarnia/rimmington/handler/RimmingtonListeners.kt
@@ -0,0 +1,29 @@
+package content.region.asgarnia.rimmington.handler
+
+import core.api.*
+import core.game.interaction.IntType
+import core.game.interaction.InteractionListener
+import core.game.node.item.Item
+import core.game.node.scenery.Scenery
+import org.rs09.consts.Items
+import org.rs09.consts.Sounds
+
+/**
+ * @author Player Name
+ */
+
+class RimmingtonListeners : InteractionListener {
+ override fun defineListeners() {
+ on(9662, IntType.SCENERY, "take") { player, node ->
+ if (!hasSpaceFor(player, Item(Items.SPADE_952))) {
+ sendMessage(player, "You don't have enough inventory space to hold that item.")
+ return@on true
+ }
+ animate(player, 535)
+ playAudio(player, Sounds.PICK2_2582)
+ addItem(player, Items.SPADE_952)
+ replaceScenery(node as Scenery, 0, 50)
+ return@on true
+ }
+ }
+}
diff --git a/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/HettyWitchsPotionDialogue.kt b/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/HettyWitchsPotionDialogue.kt
index 2cc4ca2fd..50169689b 100644
--- a/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/HettyWitchsPotionDialogue.kt
+++ b/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/HettyWitchsPotionDialogue.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.rimmington.quest.witchpotion
+import content.data.Quests
import core.api.*
import core.game.dialogue.DialogueFile
import core.game.dialogue.FacialExpression
@@ -30,8 +31,8 @@ class HettyWitchsPotionDialogue(private val dStage: Int) : DialogueFile() {
3 -> npcl(FacialExpression.NEUTRAL, "You need an eye of newt, a rat's tail, an onion... Oh and a piece of burnt meat.").also { stage++ }
4 -> {
playerl(FacialExpression.HAPPY, "Great, I'll go and get them.")
- startQuest(player, WitchsPotion.QUEST_NAME)
- setQuestStage(player, WitchsPotion.QUEST_NAME, 20)
+ startQuest(player, Quests.WITCHS_POTION)
+ setQuestStage(player, Quests.WITCHS_POTION, 20)
stage = END_DIALOGUE
}
}
@@ -67,7 +68,7 @@ class HettyWitchsPotionDialogue(private val dStage: Int) : DialogueFile() {
removeItem(player, Item(Items.BURNT_MEAT_2146, 1)) &&
removeItem(player, Item(Items.EYE_OF_NEWT_221, 1))) {
npcl(FacialExpression.HAPPY, "Ok, now drink from the cauldron.")
- setQuestStage(player, WitchsPotion.QUEST_NAME, 40)
+ setQuestStage(player, Quests.WITCHS_POTION, 40)
stage = END_DIALOGUE
}
}
diff --git a/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/WitchsPotion.kt b/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/WitchsPotion.kt
index 3f002ff85..0ada42b79 100644
--- a/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/WitchsPotion.kt
+++ b/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/WitchsPotion.kt
@@ -7,15 +7,13 @@ import core.game.node.entity.skill.Skills
import core.plugin.Initializable
import org.rs09.consts.Components
import org.rs09.consts.Items
+import content.data.Quests
/**
* Represents the Witch's Potion Quest
*/
@Initializable
-class WitchsPotion : Quest(QUEST_NAME, 31, 30, 1, 67, 0, 1, 3) {
- companion object {
- const val QUEST_NAME = "Witch's Potion"
- }
+class WitchsPotion : Quest(Quests.WITCHS_POTION, 31, 30, 1, 67, 0, 1, 3) {
override fun drawJournal(player: Player?, stage: Int) {
super.drawJournal(player, stage)
diff --git a/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/WitchsPotionListeners.kt b/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/WitchsPotionListeners.kt
index 1c6ccc15a..0d00cee47 100644
--- a/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/WitchsPotionListeners.kt
+++ b/Server/src/main/content/region/asgarnia/rimmington/quest/witchpotion/WitchsPotionListeners.kt
@@ -1,5 +1,6 @@
package content.region.asgarnia.rimmington.quest.witchpotion
+import content.data.Quests
import core.api.*
import core.game.interaction.IntType
import core.game.interaction.InteractionListener
@@ -13,9 +14,9 @@ class WitchsPotionListener : InteractionListener {
override fun defineListeners() {
on(Scenery.CAULDRON_2024, IntType.SCENERY, "drink from") { player, node ->
- if (getQuestStage(player, WitchsPotion.QUEST_NAME) == 40) {
+ if (getQuestStage(player, Quests.WITCHS_POTION) == 40) {
sendDialogue(player, "You drink from the cauldron, it tastes horrible! You feel yourself imbued with power.")
- finishQuest(player, WitchsPotion.QUEST_NAME)
+ finishQuest(player, Quests.WITCHS_POTION)
} else {
sendDialogue(player, "As nice as that looks I think I'll give it a miss for now.")
}
diff --git a/Server/src/main/content/region/asgarnia/taverley/dialogue/KaqemeexDialogue.java b/Server/src/main/content/region/asgarnia/taverley/dialogue/KaqemeexDialogue.java
index e5ab79fd7..487939a33 100644
--- a/Server/src/main/content/region/asgarnia/taverley/dialogue/KaqemeexDialogue.java
+++ b/Server/src/main/content/region/asgarnia/taverley/dialogue/KaqemeexDialogue.java
@@ -7,6 +7,7 @@ import core.plugin.Initializable;
import core.game.node.entity.skill.Skills;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
+import content.data.Quests;
/**
* Represents the kaqemeex dialogue plugin.
@@ -55,17 +56,17 @@ public final class KaqemeexDialogue extends DialoguePlugin {
public boolean handle(int interfaceId, int buttonId) {
switch (stage) {
case 0:
- if (player.getQuestRepository().isComplete("Druidic Ritual")) {
+ if (player.getQuestRepository().isComplete(Quests.DRUIDIC_RITUAL)) {
interpreter.sendDialogues(npc, null, "Hello again. How is the Herblore going?");
stage = 600;
break;
}
- if (player.getQuestRepository().getQuest("Druidic Ritual").getStage(player) == 10) {
+ if (player.getQuestRepository().getQuest(Quests.DRUIDIC_RITUAL).getStage(player) == 10) {
interpreter.sendDialogues(npc, FacialExpression.FRIENDLY, "Hello again.");
stage = 40;
break;
}
- if (player.getQuestRepository().getQuest("Druidic Ritual").getStage(player) == 99) {
+ if (player.getQuestRepository().getQuest(Quests.DRUIDIC_RITUAL).getStage(player) == 99) {
interpreter.sendDialogues(npc, FacialExpression.FRIENDLY, "I have word from Sanfew that you have been very", "helpful in assisting him with his preparations for the", "purification ritual. As promised I will now teach you the", "ancient arts of Herblore.");
stage = 200;
break;
@@ -74,7 +75,7 @@ public final class KaqemeexDialogue extends DialoguePlugin {
stage = 1;
break;
case 1:
- if (player.getQuestRepository().getQuest("Druidic Ritual").isStarted(player)) {
+ if (player.getQuestRepository().getQuest(Quests.DRUIDIC_RITUAL).isStarted(player)) {
if (Skillcape.isMaster(player, Skills.HERBLORE)) {
interpreter.sendOptions("Select an Option", "Can I buy a Skillcape of Herblore?", "Who are you?", "Did you build this?");
stage = 800;
@@ -164,7 +165,7 @@ public final class KaqemeexDialogue extends DialoguePlugin {
stage = 13;
break;
case 26:
- player.getQuestRepository().getQuest("Druidic Ritual").start(player);
+ player.getQuestRepository().getQuest(Quests.DRUIDIC_RITUAL).start(player);
interpreter.sendDialogues(npc, FacialExpression.HAPPY, "Excellent. Go to the village south of this place and speak", "to my fellow Sanfew who is working on the purification", "ritual. He knows better than I what is required to", "complete it.");
stage = 27;
break;
@@ -184,7 +185,7 @@ public final class KaqemeexDialogue extends DialoguePlugin {
break;
case 200:
end();
- player.getQuestRepository().getQuest("Druidic Ritual").finish(player);
+ player.getQuestRepository().getQuest(Quests.DRUIDIC_RITUAL).finish(player);
break;
case 500:
switch (buttonId) {
diff --git a/Server/src/main/content/region/asgarnia/taverley/dialogue/PikkupstixDialogue.java b/Server/src/main/content/region/asgarnia/taverley/dialogue/PikkupstixDialogue.java
index 3162dbdf1..f953d2783 100644
--- a/Server/src/main/content/region/asgarnia/taverley/dialogue/PikkupstixDialogue.java
+++ b/Server/src/main/content/region/asgarnia/taverley/dialogue/PikkupstixDialogue.java
@@ -11,6 +11,7 @@ import core.plugin.Initializable;
import core.game.node.item.Item;
import static core.api.ContentAPIKt.*;
+import content.data.Quests;
/**
* Handles the PikkupstixDialogue dialogue.
@@ -85,7 +86,7 @@ public final class PikkupstixDialogue extends DialoguePlugin {
@Override
public boolean open(Object... args) {
npc = (NPC) args[0];
- quest = player.getQuestRepository().getQuest("Wolf Whistle");
+ quest = player.getQuestRepository().getQuest(Quests.WOLF_WHISTLE);
switch (quest.getStage(player)) {
case 0:
npc("You there! What are you doing here, as if I didn't have", "enough troubles?");
diff --git a/Server/src/main/content/region/asgarnia/taverley/dialogue/SanfewDialogue.java b/Server/src/main/content/region/asgarnia/taverley/dialogue/SanfewDialogue.java
index acf1f9f8b..0c5d09444 100644
--- a/Server/src/main/content/region/asgarnia/taverley/dialogue/SanfewDialogue.java
+++ b/Server/src/main/content/region/asgarnia/taverley/dialogue/SanfewDialogue.java
@@ -6,6 +6,7 @@ import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.plugin.Initializable;
import core.game.node.item.Item;
+import content.data.Quests;
/**
* Handles the SanfewDialogue dialogue.
@@ -40,12 +41,12 @@ public class SanfewDialogue extends DialoguePlugin {
public boolean handle(int interfaceId, int buttonId) {
switch (stage) {
case 0:
- if (player.getQuestRepository().getQuest("Druidic Ritual").getStage(player) == 20) {
+ if (player.getQuestRepository().getQuest(Quests.DRUIDIC_RITUAL).getStage(player) == 20) {
interpreter.sendDialogues(npc, FacialExpression.HALF_ASKING, "Did you bring me the required ingredients for the", "potion?");
stage = 100;
break;
}
- if (player.getQuestRepository().getQuest("Druidic Ritual").getStage(player) == 10) {
+ if (player.getQuestRepository().getQuest(Quests.DRUIDIC_RITUAL).getStage(player) == 10) {
interpreter.sendOptions("Select an Option", "I've been sent to help purify the Varrock stone circle.", "Actually, I don't need to speak to you.");
stage = 2;
break;
@@ -89,7 +90,7 @@ public class SanfewDialogue extends DialoguePlugin {
break;
case 8:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "It is located somewhere in the mysterious underground", "halls which are located somewhere in the woods just", "South of here. They are too dangerous for me to go", "myself however.");
- player.getQuestRepository().getQuest("Druidic Ritual").setStage(player, 20);
+ player.getQuestRepository().getQuest(Quests.DRUIDIC_RITUAL).setStage(player, 20);
stage = 9;
break;
case 9:
@@ -129,7 +130,7 @@ public class SanfewDialogue extends DialoguePlugin {
break;
case 202:
player.getInventory().remove(new Item(522, 1), new Item(523, 1), new Item(524, 1), new Item(525, 1));
- player.getQuestRepository().getQuest("Druidic Ritual").setStage(player, 99);
+ player.getQuestRepository().getQuest(Quests.DRUIDIC_RITUAL).setStage(player, 99);
player.getQuestRepository().syncronizeTab(player);
interpreter.sendDialogues(npc, null, "Now go and talk to Kaqemeex and he will introduce", "you to the wonderful world of herblore and potion", "making!");
stage = 203;
diff --git a/Server/src/main/content/region/asgarnia/taverley/quest/DruidicRitual.kt b/Server/src/main/content/region/asgarnia/taverley/quest/DruidicRitual.kt
index af35cb386..15440a4bd 100644
--- a/Server/src/main/content/region/asgarnia/taverley/quest/DruidicRitual.kt
+++ b/Server/src/main/content/region/asgarnia/taverley/quest/DruidicRitual.kt
@@ -1,6 +1,5 @@
package content.region.asgarnia.taverley.quest
-import content.region.asgarnia.taverley.dialogue.KaqemeexDialogue
import core.api.*
import core.game.component.Component
import core.game.interaction.QueueStrength
@@ -10,23 +9,20 @@ import core.game.node.entity.player.link.quest.Quest
import core.game.node.entity.skill.Skills
import core.plugin.Initializable
import org.rs09.consts.Items
-import org.rs09.consts.NPCs
+import content.data.Quests
/**
* Druidic Ritual Quest
*/
@Initializable
-class DruidicRitual : Quest("Druidic Ritual", 48, 47, 4, 80, 0, 3, 4) {
+class DruidicRitual : Quest(Quests.DRUIDIC_RITUAL, 48, 47, 4, 80, 0, 3, 4) {
- companion object {
- const val questName = "Druidic Ritual"
- }
override fun drawJournal(player: Player, stage: Int) {
super.drawJournal(player, stage)
var line = 12
var stage = getStage(player)
- var started = getQuestStage(player, questName) > 0
+ var started = getQuestStage(player, Quests.DRUIDIC_RITUAL) > 0
if (!started) {
line(player, "I can start this quest by speaking to !!Kaqemeex?? who is at", line++)
diff --git a/Server/src/main/content/region/asgarnia/taverley/quest/WolfWhistle.java b/Server/src/main/content/region/asgarnia/taverley/quest/WolfWhistle.java
index a9aeecf48..ec4661ccf 100644
--- a/Server/src/main/content/region/asgarnia/taverley/quest/WolfWhistle.java
+++ b/Server/src/main/content/region/asgarnia/taverley/quest/WolfWhistle.java
@@ -5,8 +5,10 @@ import core.game.node.entity.skill.Skills;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.quest.Quest;
import core.game.node.item.Item;
+import org.rs09.consts.Items;
import static core.api.ContentAPIKt.*;
+import content.data.Quests;
/**
@@ -25,38 +27,128 @@ public class WolfWhistle extends Quest {
* Constructs a new {@code WolfWhistle} {@code Object}.
*/
public WolfWhistle() {
- super("Wolf Whistle", 146, 145, 1);
+ super(Quests.WOLF_WHISTLE, 146, 145, 1);
}
@Override
public void drawJournal(Player player, int stage) {
super.drawJournal(player, stage);
- switch (stage) {
- case 0:
- line(player, BLUE + "I can begin this quest by talking to " + RED + "Pikkupstix" + BLUE + ", who lives in", 4+ 7);
- line(player, RED + "Taverley.", 5+ 7);
- break;
- case 10:
- line(player, "Having spoken to Pikkupstix, it seems that all I have to dois get rid of the little rabbit upstairs in his house.", 4+ 7);
- break;
- case 20:
- line(player, "Having spoken to Pikkupstix, it seems that all I have to dois get rid of the little rabbit upstairs in his house.It appears that I have underestimated the rabbit in thiscase; it is some huge rabbit-wolf-monster-bird-thing. Ithink I should speak to Pikkupstix to find out what is goingon.", 4+ 7);
- break;
- case 30:
- line(player, "Having spoken to Pikkupstix, it seems that all I have to dois get rid of the little rabbit upstairs in his house.It appears that I have underestimated the rabbit in thiscase; it is some huge rabbit-wolf-monster-bird-thing. Ithink I should speak to Pikkupstix to find out what is goingon.I have spoken to Pikkupstix, who has promised to teach methe secrets of Summoning if I can help dismiss the giantwolpertinger. To do this, I need to bring him 2 lots of wolfbones." : "") + "I need to get 2 lots of wolf bones.", 4+ 7);
- break;
- case 40:
- line(player, "Having spoken to Pikkupstix, it seems that all I have to dois get rid of the little rabbit upstairs in his house.It appears that I have underestimated the rabbit in thiscase; it is some huge rabbit-wolf-monster-bird-thing. Ithink I should speak to Pikkupstix to find out what is goingon.I have spoken to Pikkupstix, who has promised to teach methe secrets of Summoning if I can help dismiss the giantwolpertinger. To do this, I need to bring him 2 lots of wolfbones.I have given Pikkupstix all of the items he requested.Pikkupstix has given me some gold charms, spirit shardsand pouches, with which to make a spirit wolf pouch andsome Howl scrolls. I will then be able to use them to dismissthe giant wolpertinger.I need to open the trapdoor with the trapdoor key that Ihave been given. ", 4+ 7);
- break;
- case 50:
- line(player, "Having spoken to Pikkupstix, it seems that all I have to dois get rid of the little rabbit upstairs in his house.It appears that I have underestimated the rabbit in thiscase; it is some huge rabbit-wolf-monster-bird-thing. Ithink I should speak to Pikkupstix to find out what is goingon.I have spoken to Pikkupstix, who has promised to teach methe secrets of Summoning if I can help dismiss the giantwolpertinger. To do this, I need to bring him 2 lots of wolfbones.Pikkupstix has given me some gold charms, spirit shardsand pouches, with which to make a spirit wolf pouch and 
-
-