Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3559ab4d2f | |||
|
3a0db52215 | ||
|
|
a895a09822 | ||
|
|
265f93fff3 | ||
| 954f0c9319 | |||
|
|
4edcccee71 | ||
|
|
dd256b9fde | ||
|
|
7312753e35 | ||
|
|
3eb18586e4 | ||
|
|
268a15c788 | ||
|
|
9139e39397 | ||
|
|
f94c4aec2e | ||
| c7db36d9b6 | |||
|
|
92b845d5b7 | ||
|
|
edbe51194d | ||
|
|
64940b00da | ||
|
|
d596772b91 | ||
|
|
60b6f7311a | ||
|
|
6c888427ec | ||
|
|
5767fb57c6 | ||
|
|
fae6db2d2e |
137
README.md
137
README.md
@ -1,152 +1,47 @@
|
|||||||
[![AGPL-3.0 License][license-shield]][license-url]
|
|
||||||
|
|
||||||
<br />
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://gitlab.com/2009scape/2009scape">
|
<a href="https://gitlab.com/emoscape/emoscape">
|
||||||
<img src="https://i.imgur.com/RsfVfkB.png" alt="Logo" width="300" height="67">
|
<img src="https://emoscape.org/emologo.png" alt="Logo" width="300" height="263">
|
||||||
</a>
|
</a>
|
||||||
<h3 align="center">An open source MMORPG emulation server</h3>
|
<h3 align="center">An open source MMORPG emulation server, made with love and passion</h3>
|
||||||
|
|
||||||
<h1 align="center"><a href="https://2009scape.org/"><strong>Play the live server »</strong></a></h1>
|
<h1 align="center"><a href="https://emoscape.org/"><strong>Play the live server »</strong></a></h1>
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<br />
|
<br />
|
||||||
<br />
|
<br />
|
||||||
<a href="https://2009scape.org/">Community Hosted Server</a>
|
<a href="https://emoscape.org/">Community Hosted Server</a>
|
||||||
·
|
· <a href="https://git.emoscape.org">Report Bug</a>
|
||||||
<a href="https://discord.gg/43YPGND">Discord Invite</a>
|
|
||||||
· <a href="https://gitlab.com/2009scape/2009scape/-/issues">Report Bug</a>
|
|
||||||
</p>
|
</p>
|
||||||
<h3>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.</h3>
|
|
||||||
|
|
||||||
## Table of Contents
|
## Table of Contents
|
||||||
|
|
||||||
* [Live Server Information](#live-server-information)
|
* [Live Server Information](#live-server-information)
|
||||||
* [History of this Codebase](#history-of-this-codebase)
|
* [History of this Codebase](#history-of-this-codebase)
|
||||||
* [Our Core Values](#our-core-values)
|
* [Why the Fork?](#why-the-fork)
|
||||||
* [Contributing](#contributing)
|
* [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)
|
* [License](#license)
|
||||||
* [Contact](#contact)
|
|
||||||
|
|
||||||
|
|
||||||
## Live Server Information
|
## 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.
|
If you just want to play the game click [here](https://emoscape.org). Clients for various operating systems will be provided here
|
||||||
|
|
||||||
## History of this Codebase
|
## 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 code is simply a fork of 2009scape, which in itself has a long history. Go to the [2009Scape project GitLab](https://gitlab.com/2009scape) if you want to read more about the history of this project
|
||||||
|
|
||||||
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.
|
## Why the Fork
|
||||||
|
|
||||||
## Our Core Values
|
This is a personal pet project of Emo (IGN Emo Boy from 2009Scape). I personally have a great deal of appreciation for the various developers and other volunteers and contributors of the 2009Scape project, and indeed this code base will continue to maintain a mirror of the 2009Scape code in the form of its 2009Scape branch. I share in many of the core values (eg running an RSPS out of passion and love for a game, not for profit).
|
||||||
|
|
||||||
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:
|
However, while the 2009Scape project is focused on absolute authenticity of the 530 release of RS2, I am inclined to prioritize fun over dogma. While I do not anticipate adding much custom content to this game, I am not going to rule out small QoLs or cosmetic adjustments, and see where the game goes. After all, just as Jagex decided to take RS2 in a certain direction, there is no reason to think we can’t have fun in advancing 2009Scape. TLDR: While the 2009Scape project is focused on recreating the game of my middle school years, letter for letter, this project will be an expression of the fun and sense of adventure we had in those days.
|
||||||
|
|
||||||
* **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.
|
Another way to think of it: in the open source model, imagine 2009Scape as the Linux Kernel, and this project being a “distro” with more custom features (namely stuff I think adds to the game).
|
||||||
|
|
||||||
|
|
||||||
* **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
|
## 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.**
|
I would strongly recommend contributing code to the [2009Scape project](https://gitlab.com/2009scape).
|
||||||
|
|
||||||
**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/).**
|
## License
|
||||||
|
|
||||||
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.
|
Like 2009Scape, this is AGPLv3. This is, in my opinion, the only proper license for an open source RSPS. The key term of the license being if you wish to use this code to host your own server, you must also offer the source code for people to inspect and use, and allow them to make modifications to it as I did with 2009Scape's code.
|
||||||
|
|
||||||
* **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.
|
|
||||||
@ -48,7 +48,7 @@
|
|||||||
"Nice Armor @name!",
|
"Nice Armor @name!",
|
||||||
"Nice Weapon @name!",
|
"Nice Weapon @name!",
|
||||||
"Venezuela #1",
|
"Venezuela #1",
|
||||||
"2009scape and chill @name?",
|
"EmoScape and chill @name?",
|
||||||
"@name is my girlfriend",
|
"@name is my girlfriend",
|
||||||
"Buying gf",
|
"Buying gf",
|
||||||
"Bank sale pm me for info",
|
"Bank sale pm me for info",
|
||||||
@ -69,7 +69,7 @@
|
|||||||
"Yes, Im botting. And?",
|
"Yes, Im botting. And?",
|
||||||
"ERROR: BOTSCRIPT 404. REPORT TO BOT OWNER (Evilwaffles)",
|
"ERROR: BOTSCRIPT 404. REPORT TO BOT OWNER (Evilwaffles)",
|
||||||
"Flash2:wave: FUCK",
|
"Flash2:wave: FUCK",
|
||||||
"I love 2009Scape!",
|
"I love EmoScape!",
|
||||||
"Ja Ja Ja Ja",
|
"Ja Ja Ja Ja",
|
||||||
"This is fun!",
|
"This is fun!",
|
||||||
"Ironman or youre a scrub @name.",
|
"Ironman or youre a scrub @name.",
|
||||||
@ -181,6 +181,10 @@
|
|||||||
"@name have you met Ceikry?",
|
"@name have you met Ceikry?",
|
||||||
"@name have you met Woah?",
|
"@name have you met Woah?",
|
||||||
"@name have you met Bushtail?",
|
"@name have you met Bushtail?",
|
||||||
|
"@name have you met Emo?",
|
||||||
|
"I'm just a kid, and life is a nightmare",
|
||||||
|
"And its all downhill from here",
|
||||||
|
"I'm sorry I can't be perfect",
|
||||||
"Wanna chill at my poh?",
|
"Wanna chill at my poh?",
|
||||||
"Whats the best place to train attack?",
|
"Whats the best place to train attack?",
|
||||||
"Good Waffles > Evil Waffles",
|
"Good Waffles > Evil Waffles",
|
||||||
@ -196,7 +200,7 @@
|
|||||||
"I dont use discord @name",
|
"I dont use discord @name",
|
||||||
"I dont use the CC @name",
|
"I dont use the CC @name",
|
||||||
"Why should i use discord?",
|
"Why should i use discord?",
|
||||||
"2009Scape is life",
|
"EmoScape is life",
|
||||||
"Brb gotta make dinner",
|
"Brb gotta make dinner",
|
||||||
"I need to go to the GE",
|
"I need to go to the GE",
|
||||||
"@name can i have a ge tele?",
|
"@name can i have a ge tele?",
|
||||||
@ -294,14 +298,14 @@
|
|||||||
"Ur nuts @name",
|
"Ur nuts @name",
|
||||||
"Lootshare go brr",
|
"Lootshare go brr",
|
||||||
"Partay with froggay",
|
"Partay with froggay",
|
||||||
"Know what else is lame? Not being able to play 2009scape right now",
|
"Know what else is lame? Not being able to play EmoScape right now",
|
||||||
"Can you even grind on osrs",
|
"Can you even grind on osrs",
|
||||||
"I botted to 88 fishing",
|
"I botted to 88 fishing",
|
||||||
"Do not forget to vote in running polls!",
|
"Do not forget to vote in running polls!",
|
||||||
"Always check announcments",
|
"Always check announcments",
|
||||||
"We thrivin",
|
"We thrivin",
|
||||||
"Ship @name",
|
"Ship @name",
|
||||||
"Dont forget to vote 2009scape!",
|
"Dont forget to vote EmoScape!",
|
||||||
"Kermit is too legit 2 quit",
|
"Kermit is too legit 2 quit",
|
||||||
"Out here on the range we are having fun",
|
"Out here on the range we are having fun",
|
||||||
"I am hank steel",
|
"I am hank steel",
|
||||||
@ -393,9 +397,8 @@
|
|||||||
"Fluff",
|
"Fluff",
|
||||||
"Bwuh",
|
"Bwuh",
|
||||||
"I'm literally just mothin' bro",
|
"I'm literally just mothin' bro",
|
||||||
"Certified 2009Scape Classic.",
|
"Certified EmoScape Classic.",
|
||||||
"Make sure to like, comment and subscribe @name it really helps",
|
"Make sure to like, comment and subscribe @name it really helps",
|
||||||
"Real 2009scape hours!!! Murder that like if you up!!!!",
|
|
||||||
"W00t!",
|
"W00t!",
|
||||||
"Owned!",
|
"Owned!",
|
||||||
"Pwned!",
|
"Pwned!",
|
||||||
@ -410,7 +413,7 @@
|
|||||||
"Yall got any deez?",
|
"Yall got any deez?",
|
||||||
"Deez nuts",
|
"Deez nuts",
|
||||||
"When she give you that yoinky sploinky",
|
"When she give you that yoinky sploinky",
|
||||||
"Sir, this is a 2009Scape.",
|
"Sir, this is a EmoScape.",
|
||||||
"Oh dear! You are dead!",
|
"Oh dear! You are dead!",
|
||||||
"Cor blimey, mate! What are ye doing in me pockets?",
|
"Cor blimey, mate! What are ye doing in me pockets?",
|
||||||
"Yeah i got funnies",
|
"Yeah i got funnies",
|
||||||
@ -431,7 +434,7 @@
|
|||||||
"Who's lone?",
|
"Who's lone?",
|
||||||
"Who *is* he?",
|
"Who *is* he?",
|
||||||
"Hi @name, I'm Dad!",
|
"Hi @name, I'm Dad!",
|
||||||
"Anyone wanna play melty blood after I high alch these bows?",
|
"Baroo!",
|
||||||
"Buru nyaaaa",
|
"Buru nyaaaa",
|
||||||
"Number 15, Taverley Dungeon Black Dragons.",
|
"Number 15, Taverley Dungeon Black Dragons.",
|
||||||
"House party at Rimmington! Host: @name!",
|
"House party at Rimmington! Host: @name!",
|
||||||
@ -444,13 +447,12 @@
|
|||||||
":D",
|
":D",
|
||||||
"Die screaming",
|
"Die screaming",
|
||||||
"Only on Tuesdays",
|
"Only on Tuesdays",
|
||||||
"We stan 2009scape",
|
|
||||||
"There is no spoon",
|
"There is no spoon",
|
||||||
"Where's the cow level?",
|
"Where's the cow level?",
|
||||||
"Join 2009scape Clan Chat!",
|
"Join EmoScape Clan Chat!",
|
||||||
"Join 2009scape Cc!",
|
"Join EmoScape Cc!",
|
||||||
"Chop chop!",
|
"Chop chop!",
|
||||||
"2009Scape rox my sox!!!!!!1",
|
"EmoScape rox my sox!!!!!!1",
|
||||||
"Type ::scripts for all 99s",
|
"Type ::scripts for all 99s",
|
||||||
"Help I just died to Evil Chicken and I lost my stuff!",
|
"Help I just died to Evil Chicken and I lost my stuff!",
|
||||||
"Can you fight Bandos in this game?",
|
"Can you fight Bandos in this game?",
|
||||||
@ -467,7 +469,7 @@
|
|||||||
"With this character's death, the thread of prophecy is severed.",
|
"With this character's death, the thread of prophecy is severed.",
|
||||||
"You must gather your party before venturing forth.",
|
"You must gather your party before venturing forth.",
|
||||||
"Praise Andrew Gower",
|
"Praise Andrew Gower",
|
||||||
"Please help me I can't stop playing 2009scape",
|
"Please help me I can't stop playing EmoScape",
|
||||||
"Are you ignoring me, @name?!",
|
"Are you ignoring me, @name?!",
|
||||||
"I agree with this rfc can we put it in the game please",
|
"I agree with this rfc can we put it in the game please",
|
||||||
"@name, we've been trying to reach you about your car's extended warranty",
|
"@name, we've been trying to reach you about your car's extended warranty",
|
||||||
@ -788,7 +790,6 @@
|
|||||||
"@name likes pickles and dipped in mayo",
|
"@name likes pickles and dipped in mayo",
|
||||||
"Lmaaooooooo",
|
"Lmaaooooooo",
|
||||||
"Bruh she said she loved me...",
|
"Bruh she said she loved me...",
|
||||||
"I caught @name rizzing a mewing teacher",
|
|
||||||
"What that mouth do bb",
|
"What that mouth do bb",
|
||||||
"Ayo tf he say",
|
"Ayo tf he say",
|
||||||
"Ayo",
|
"Ayo",
|
||||||
|
|||||||
@ -46,23 +46,23 @@ enum class RandomEvents(val npc: RandomEventNPC, val loot: WeightBasedTable? = n
|
|||||||
WeightedItem(Items.TOOTH_HALF_OF_A_KEY_985,1,1,0.1),
|
WeightedItem(Items.TOOTH_HALF_OF_A_KEY_985,1,1,0.1),
|
||||||
WeightedItem(Items.LOOP_HALF_OF_A_KEY_987,1,1,0.1)
|
WeightedItem(Items.LOOP_HALF_OF_A_KEY_987,1,1,0.1)
|
||||||
)),
|
)),
|
||||||
MAZE(npc = MazeNPC()),
|
// MAZE(npc = MazeNPC()),
|
||||||
DRILL_DEMON(npc = SergeantDamienNPC()),
|
DRILL_DEMON(npc = SergeantDamienNPC()),
|
||||||
EVIL_CHICKEN(npc = EvilChickenNPC()),
|
EVIL_CHICKEN(npc = EvilChickenNPC()),
|
||||||
STRANGE_PLANT(npc = StrangePlantNPC()),
|
// STRANGE_PLANT(npc = StrangePlantNPC()),
|
||||||
SWARM(npc = SwarmNPC()),
|
// SWARM(npc = SwarmNPC()),
|
||||||
EVIL_BOB(npc = EvilBobNPC(), skillIds = intArrayOf(Skills.FISHING, Skills.MAGIC)),
|
// EVIL_BOB(npc = EvilBobNPC(), skillIds = intArrayOf(Skills.FISHING, Skills.MAGIC)),
|
||||||
DRUNKEN_DWARF(npc = DrunkenDwarfNPC()),
|
DRUNKEN_DWARF(npc = DrunkenDwarfNPC()),
|
||||||
RICK_TURPENTINE(npc = RickTurpentineNPC(), loot = CERTER.loot),
|
RICK_TURPENTINE(npc = RickTurpentineNPC(), loot = CERTER.loot),
|
||||||
SURPRISE_EXAM(npc = MysteriousOldManNPC(), type = "sexam"),
|
SURPRISE_EXAM(npc = MysteriousOldManNPC(), type = "sexam"),
|
||||||
FREAKY_FORESTER(npc = FreakyForesterNPC(), skillIds = intArrayOf(Skills.WOODCUTTING)),
|
FREAKY_FORESTER(npc = FreakyForesterNPC(), skillIds = intArrayOf(Skills.WOODCUTTING)),
|
||||||
PILLORY(npc = PilloryNPC(), skillIds = intArrayOf(Skills.THIEVING)),
|
// PILLORY(npc = PilloryNPC(), skillIds = intArrayOf(Skills.THIEVING)),
|
||||||
TREE_SPIRIT(npc = TreeSpiritRENPC(), skillIds = intArrayOf(Skills.WOODCUTTING)),
|
TREE_SPIRIT(npc = TreeSpiritRENPC(), skillIds = intArrayOf(Skills.WOODCUTTING)),
|
||||||
QUIZ_MASTER(npc = QuizMasterNPC()),
|
QUIZ_MASTER(npc = QuizMasterNPC()),
|
||||||
RIVER_TROLL(RiverTrollRENPC(), skillIds = intArrayOf(Skills.FISHING)),
|
RIVER_TROLL(RiverTrollRENPC(), skillIds = intArrayOf(Skills.FISHING)),
|
||||||
ROCK_GOLEM(RockGolemRENPC(), skillIds = intArrayOf(Skills.MINING)),
|
// ROCK_GOLEM(RockGolemRENPC(), skillIds = intArrayOf(Skills.MINING)),
|
||||||
SHADE(ShadeRENPC(), skillIds = intArrayOf(Skills.PRAYER)),
|
SHADE(ShadeRENPC(), skillIds = intArrayOf(Skills.PRAYER));
|
||||||
ZOMBIE(ZombieRENPC(), skillIds = intArrayOf(Skills.PRAYER));
|
// ZOMBIE(ZombieRENPC(), skillIds = intArrayOf(Skills.PRAYER));
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
@JvmField
|
@JvmField
|
||||||
|
|||||||
@ -7,23 +7,23 @@ import core.game.interaction.InterfaceListener
|
|||||||
|
|
||||||
object RulesAndInfo {
|
object RulesAndInfo {
|
||||||
val RULES = arrayOf(
|
val RULES = arrayOf(
|
||||||
"<col=ffffff>1. Be respectful to your fellow players.</col>",
|
"<col=ffffff>1. Basically just don't be an asshole</col>",
|
||||||
" -No harassment, etc.",
|
" -No spamming, harassment, or other",
|
||||||
" -Keep arguments private.",
|
" disruptive behaviors",
|
||||||
"<col=ffffff>2. Do not exploit bugs.</col>",
|
"<col=ffffff>2. No exploitation of bugs.</col>",
|
||||||
" -Zero tolerance. Can result in account deletion.",
|
" -Zero tolerance. Can result in account deletion.",
|
||||||
" -If you discover a bug, report it on our Gitlab.",
|
" -If you discover a bug, report it to Emo/admins.",
|
||||||
"<col=ffffff>3. Do not discuss or advertise other servers.</col>",
|
"<col=ffffff>3. Discuss or Advertising.</col>",
|
||||||
" -Discussion of the live jagex games is fine.",
|
" -Discussion of the live jagex games is fine.",
|
||||||
" -Discussion of open source projects is fine.",
|
" -Discussion of open source projects is fine.",
|
||||||
|
" -No advertising of non-open source RSPSs.",
|
||||||
"<col=ffffff>4. No unfair advantages.</col>",
|
"<col=ffffff>4. No unfair advantages.</col>",
|
||||||
" -This includes autoclickers, autohotkey, etc.",
|
" -No botting, autoclickers, AHKing, etc...",
|
||||||
" -Exception: 1-to-1 inputs, such as mousekeys.",
|
" -Again, just don't be an asshole."
|
||||||
" -Includes training methods that bypass AFK limits."
|
|
||||||
)
|
)
|
||||||
val SEPARATOR = "<str> </str>"
|
val SEPARATOR = "<str> </str>"
|
||||||
val INFO = arrayOf(
|
val INFO = arrayOf(
|
||||||
"<col=6bcdfa>Join the forums! forum.2009scape.org </col>"
|
"<col=6bcdfa>Visit emoscape.org for more info </col>"
|
||||||
)
|
)
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
|
|||||||
@ -128,7 +128,12 @@ public final class FamiliarManager {
|
|||||||
}
|
}
|
||||||
if (currentPet != -1) {
|
if (currentPet != -1) {
|
||||||
int last = this.petDetails.get(currentPet).size() - 1;
|
int last = this.petDetails.get(currentPet).size() - 1;
|
||||||
PetDetails details = this.petDetails.get(currentPet).get(last);
|
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);
|
||||||
|
}
|
||||||
Pets pets = Pets.forId(currentPet);
|
Pets pets = Pets.forId(currentPet);
|
||||||
familiar = new Pet(player, details, currentPet, pets.getNpcId(currentPet));
|
familiar = new Pet(player, details, currentPet, pets.getNpcId(currentPet));
|
||||||
} else if (familiarData.containsKey("familiar")) {
|
} else if (familiarData.containsKey("familiar")) {
|
||||||
@ -414,6 +419,9 @@ public final class FamiliarManager {
|
|||||||
* @param details The new pet details.
|
* @param details The new pet details.
|
||||||
*/
|
*/
|
||||||
public void addDetails(int itemId, PetDetails details) {
|
public void addDetails(int itemId, PetDetails details) {
|
||||||
|
if (petDetails.get(itemId) == null) {
|
||||||
|
petDetails.put(itemId, new ArrayList<>());
|
||||||
|
}
|
||||||
petDetails.get(itemId).add(details);
|
petDetails.get(itemId).add(details);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -129,8 +129,8 @@ public final class Pet extends Familiar {
|
|||||||
if (pet.isKitten(itemId)) {
|
if (pet.isKitten(itemId)) {
|
||||||
owner.incrementAttribute("/save:stats_manager:cats_raised");
|
owner.incrementAttribute("/save:stats_manager:cats_raised");
|
||||||
}
|
}
|
||||||
owner.getFamiliarManager().removeDetails(getItemId());
|
|
||||||
owner.getFamiliarManager().addDetails(newItemId, details);
|
owner.getFamiliarManager().addDetails(newItemId, details);
|
||||||
|
owner.getFamiliarManager().removeDetails(getItemId());
|
||||||
owner.getFamiliarManager().morphPet(new Item(newItemId), false, location, details.getHunger(), 0);
|
owner.getFamiliarManager().morphPet(new Item(newItemId), false, location, details.getHunger(), 0);
|
||||||
owner.getPacketDispatch().sendMessage("<col=ff0000>Your pet has grown larger.</col>");
|
owner.getPacketDispatch().sendMessage("<col=ff0000>Your pet has grown larger.</col>");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,9 +10,14 @@ import core.game.node.entity.player.Player
|
|||||||
import core.plugin.Initializable
|
import core.plugin.Initializable
|
||||||
import org.rs09.consts.Items
|
import org.rs09.consts.Items
|
||||||
import org.rs09.consts.NPCs
|
import org.rs09.consts.NPCs
|
||||||
|
import core.game.node.item.Item
|
||||||
|
|
||||||
@Initializable
|
@Initializable
|
||||||
class AchiettiesDialogue(player: Player? = null) : DialoguePlugin(player){
|
class AchiettiesDialogue(player: Player? = null) : DialoguePlugin(player) {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val BRIBE_PRICE = 1_000_000
|
||||||
|
}
|
||||||
|
|
||||||
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
|
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
|
||||||
openDialogue(player, AchiettiesDialogueFile(), npc)
|
openDialogue(player, AchiettiesDialogueFile(), npc)
|
||||||
@ -32,34 +37,32 @@ class AchiettiesDialogueFile : DialogueBuilderFile() {
|
|||||||
|
|
||||||
override fun create(b: DialogueBuilder) {
|
override fun create(b: DialogueBuilder) {
|
||||||
|
|
||||||
b.onQuestStages(Quests.HEROES_QUEST, 0,1)
|
b.onQuestStages(Quests.HEROES_QUEST, 0, 1)
|
||||||
.branch { player ->
|
.branch { player ->
|
||||||
return@branch getQuestStage(player, Quests.HEROES_QUEST)
|
// Return the current quest stage.
|
||||||
}.let{ branch ->
|
getQuestStage(player, Quests.HEROES_QUEST)
|
||||||
|
}
|
||||||
|
.let { branch ->
|
||||||
branch.onValue(0)
|
branch.onValue(0)
|
||||||
.npcl(FacialExpression.FRIENDLY, "Greetings. Welcome to the Heroes' Guild.")
|
.npcl(FacialExpression.FRIENDLY, "Greetings. Welcome to the Heroes' Guild.")
|
||||||
.npcl("Only the greatest heroes of this land may gain entrance to this 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()
|
.options()
|
||||||
.let { optionBuilder ->
|
.let { optionBuilder ->
|
||||||
optionBuilder.option("I'm a hero, may I apply to join?")
|
optionBuilder.option("I'm a hero, may I apply to join?")
|
||||||
.playerl("I'm a hero. May I apply to join?")
|
.playerl("I'm a hero. May I apply to join?")
|
||||||
.branch { player ->
|
.branch { player ->
|
||||||
return@branch if (HeroesQuest.hasRequirements(player)) {
|
if (HeroesQuest.hasRequirements(player)) 1 else 0
|
||||||
1
|
|
||||||
} else {
|
|
||||||
0
|
|
||||||
}
|
}
|
||||||
}.let { branch ->
|
.let { branch ->
|
||||||
branch.onValue(0)
|
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("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.")
|
.npcl("Additionally you must have completed the Shield of Arrav, Lost City, Merlin's Crystal and Dragon Slayer quests.")
|
||||||
.end()
|
.end()
|
||||||
return@let branch
|
branch
|
||||||
}.onValue(1)
|
}
|
||||||
|
.onValue(1)
|
||||||
.betweenStage { df, player, _, _ ->
|
.betweenStage { df, player, _, _ ->
|
||||||
if(getQuestStage(player, Quests.HEROES_QUEST) == 0) {
|
if (getQuestStage(player, Quests.HEROES_QUEST) == 0) {
|
||||||
setQuestStage(player, Quests.HEROES_QUEST, 1)
|
setQuestStage(player, Quests.HEROES_QUEST, 1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -79,8 +82,30 @@ class AchiettiesDialogueFile : DialogueBuilderFile() {
|
|||||||
optionBuilder2.option_playerl("I'll start looking for all those things then.")
|
optionBuilder2.option_playerl("I'll start looking for all those things then.")
|
||||||
.npcl("Good luck with that.")
|
.npcl("Good luck with that.")
|
||||||
.end()
|
.end()
|
||||||
|
optionBuilder2.option_playerl("Or perhaps the guild needs a bit of financing?")
|
||||||
|
.npcl("Perhaps a small 'Loan' of 1 million coins?")
|
||||||
|
// Bribery branch
|
||||||
|
.options()
|
||||||
|
.let { optionBuilder3 ->
|
||||||
|
optionBuilder3.option_playerl("That sounds good")
|
||||||
|
.branch { player ->
|
||||||
|
if (inInventory(player!!, 995, AchiettiesDialogue.BRIBE_PRICE)) 1 else 0
|
||||||
|
}
|
||||||
|
.let { branch ->
|
||||||
|
branch.onValue(1)
|
||||||
|
.playerl(FacialExpression.FRIENDLY, "Here you go!")
|
||||||
|
.endWith { _, player ->
|
||||||
|
removeItem(player, Item(995, AchiettiesDialogue.BRIBE_PRICE), Container.INVENTORY)
|
||||||
|
finishQuest(player, Quests.HEROES_QUEST)
|
||||||
|
}
|
||||||
|
branch.onValue(0)
|
||||||
|
.playerl(FacialExpression.HALF_GUILTY, "Actually, I don't have that much.")
|
||||||
|
.end()
|
||||||
|
}
|
||||||
|
optionBuilder3.option_playerl("1 million coins for this dump? No way")
|
||||||
|
.end()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
optionBuilder.option_playerl("Good for the foremost heroes of the land.")
|
optionBuilder.option_playerl("Good for the foremost heroes of the land.")
|
||||||
.npcl("Yes. Yes it is.")
|
.npcl("Yes. Yes it is.")
|
||||||
.end()
|
.end()
|
||||||
@ -90,7 +115,7 @@ class AchiettiesDialogueFile : DialogueBuilderFile() {
|
|||||||
.npcl("How goes thy quest adventurer?")
|
.npcl("How goes thy quest adventurer?")
|
||||||
.playerl("It's tough. I've not done it yet.")
|
.playerl("It's tough. I've not done it yet.")
|
||||||
.npcl("Remember, the items you need to enter are:")
|
.npcl("Remember, the items you need to enter are:")
|
||||||
.npcl("An Entranan Firebirds' feather, A Master Thieves armband, and a cooked Lava Eel.")
|
.npcl("An Entranan Firebird's feather, A Master Thieves' armband, and a cooked Lava Eel.")
|
||||||
.options()
|
.options()
|
||||||
.let { optionBuilder2 ->
|
.let { optionBuilder2 ->
|
||||||
optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
|
optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
|
||||||
@ -105,6 +130,29 @@ class AchiettiesDialogueFile : DialogueBuilderFile() {
|
|||||||
optionBuilder2.option_playerl("I'll start looking for all those things then.")
|
optionBuilder2.option_playerl("I'll start looking for all those things then.")
|
||||||
.npcl("Good luck with that.")
|
.npcl("Good luck with that.")
|
||||||
.end()
|
.end()
|
||||||
|
optionBuilder2.option_playerl("Or perhaps the guild needs a bit of financing?")
|
||||||
|
.npcl("Perhaps a small 'Loan' of 1 million coins?")
|
||||||
|
// Bribery branch
|
||||||
|
.options()
|
||||||
|
.let { optionBuilder3 ->
|
||||||
|
optionBuilder3.option_playerl("That sounds good")
|
||||||
|
.branch { player ->
|
||||||
|
if (inInventory(player!!, 995, AchiettiesDialogue.BRIBE_PRICE)) 1 else 0
|
||||||
|
}
|
||||||
|
.let { branch ->
|
||||||
|
branch.onValue(1)
|
||||||
|
.playerl(FacialExpression.FRIENDLY, "Here you go!")
|
||||||
|
.endWith { _, player ->
|
||||||
|
removeItem(player, Item(995, AchiettiesDialogue.BRIBE_PRICE), Container.INVENTORY)
|
||||||
|
finishQuest(player, Quests.HEROES_QUEST)
|
||||||
|
}
|
||||||
|
branch.onValue(0)
|
||||||
|
.playerl(FacialExpression.HALF_GUILTY, "Actually, I don't have that much.")
|
||||||
|
.end()
|
||||||
|
}
|
||||||
|
optionBuilder3.option_playerl("1 million coins for this dump? No way")
|
||||||
|
.end()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -113,14 +161,14 @@ class AchiettiesDialogueFile : DialogueBuilderFile() {
|
|||||||
.npcl("How goes thy quest adventurer?")
|
.npcl("How goes thy quest adventurer?")
|
||||||
.playerl("It's tough. I've not done it yet.")
|
.playerl("It's tough. I've not done it yet.")
|
||||||
.npcl("Remember, the items you need to enter are:")
|
.npcl("Remember, the items you need to enter are:")
|
||||||
.npcl("An Entranan Firebirds' feather, A Master Thieves armband, and a cooked Lava Eel.")
|
.npcl("An Entranan Firebird's feather, A Master Thieves' armband, and a cooked Lava Eel.")
|
||||||
.options()
|
.options()
|
||||||
.let { optionBuilder2 ->
|
.let { optionBuilder2 ->
|
||||||
optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
|
optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
|
||||||
.npcl("I'm sure you have the relevant contacts to find out about that.")
|
.npcl("I'm sure you have the relevant contacts to find out about that.")
|
||||||
.end()
|
.end()
|
||||||
optionBuilder2.option_playerl("Any hints on getting the feather?")
|
optionBuilder2.option_playerl("Any hints on getting the feather?")
|
||||||
.npcl("Not really - other than Entranan firebirds tend to live on Entrana.")
|
.npcl("Not really - other than Entranan Firebirds tend to live on Entrana.")
|
||||||
.end()
|
.end()
|
||||||
optionBuilder2.option_playerl("Any hints on getting the eel?")
|
optionBuilder2.option_playerl("Any hints on getting the eel?")
|
||||||
.npcl("Maybe go and find someone who knows a lot about fishing?")
|
.npcl("Maybe go and find someone who knows a lot about fishing?")
|
||||||
@ -128,25 +176,49 @@ class AchiettiesDialogueFile : DialogueBuilderFile() {
|
|||||||
optionBuilder2.option_playerl("I'll start looking for all those things then.")
|
optionBuilder2.option_playerl("I'll start looking for all those things then.")
|
||||||
.npcl("Good luck with that.")
|
.npcl("Good luck with that.")
|
||||||
.end()
|
.end()
|
||||||
|
optionBuilder2.option_playerl("Or perhaps the guild needs a bit of financing?")
|
||||||
|
.npcl("Perhaps a small 'Loan' of 1 million coins?")
|
||||||
|
// Bribery branch
|
||||||
|
.options()
|
||||||
|
.let { optionBuilder3 ->
|
||||||
|
optionBuilder3.option_playerl("That sounds good")
|
||||||
|
.branch { player ->
|
||||||
|
if (inInventory(player!!, 995, AchiettiesDialogue.BRIBE_PRICE)) 1 else 0
|
||||||
|
}
|
||||||
|
.let { branch ->
|
||||||
|
branch.onValue(1)
|
||||||
|
.playerl(FacialExpression.FRIENDLY, "Here you go!")
|
||||||
|
.endWith { _, player ->
|
||||||
|
removeItem(player, Item(995, AchiettiesDialogue.BRIBE_PRICE), Container.INVENTORY)
|
||||||
|
finishQuest(player, Quests.HEROES_QUEST)
|
||||||
|
}
|
||||||
|
branch.onValue(0)
|
||||||
|
.playerl(FacialExpression.HALF_GUILTY, "Actually, I don't have that much.")
|
||||||
|
.end()
|
||||||
|
}
|
||||||
|
optionBuilder3.option_playerl("1 million coins for this dump? No way")
|
||||||
|
.end()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
b.onQuestStages(Quests.HEROES_QUEST, 6)
|
b.onQuestStages(Quests.HEROES_QUEST, 6)
|
||||||
.npcl("Greetings. Welcome to the Heroes' Guild.")
|
.npcl("Greetings. Welcome to the Heroes' Guild.")
|
||||||
.npcl("How goes thy quest adventurer?")
|
.npcl("How goes thy quest adventurer?")
|
||||||
.branch { player ->
|
.branch { player ->
|
||||||
return@branch if (HeroesQuest.allItemsInInventory(player)) { 1 } else { 0 }
|
if (HeroesQuest.allItemsInInventory(player)) 1 else 0
|
||||||
}.let { branch ->
|
}
|
||||||
|
.let { branch ->
|
||||||
branch.onValue(0)
|
branch.onValue(0)
|
||||||
.playerl("It's tough. I've not done it yet.")
|
.playerl("It's tough. I've not done it yet.")
|
||||||
.npcl("Remember, the items you need to enter are:")
|
.npcl("Remember, the items you need to enter are:")
|
||||||
.npcl("An Entranan Firebirds' feather, A Master Thieves armband, and a cooked Lava Eel.")
|
.npcl("An Entranan Firebird's feather, A Master Thieves' armband, and a cooked Lava Eel.")
|
||||||
.options()
|
.options()
|
||||||
.let { optionBuilder2 ->
|
.let { optionBuilder2 ->
|
||||||
optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
|
optionBuilder2.option_playerl("Any hints on getting the thieves armband?")
|
||||||
.npcl("I'm sure you have the relevant contacts to find out about that.")
|
.npcl("I'm sure you have the relevant contacts to find out about that.")
|
||||||
.end()
|
.end()
|
||||||
optionBuilder2.option_playerl("Any hints on getting the feather?")
|
optionBuilder2.option_playerl("Any hints on getting the feather?")
|
||||||
.npcl("Not really - other than Entranan firebirds tend to live on Entrana.")
|
.npcl("Not really - other than Entranan Firebirds tend to live on Entrana.")
|
||||||
.end()
|
.end()
|
||||||
optionBuilder2.option_playerl("Any hints on getting the eel?")
|
optionBuilder2.option_playerl("Any hints on getting the eel?")
|
||||||
.npcl("Maybe go and find someone who knows a lot about fishing?")
|
.npcl("Maybe go and find someone who knows a lot about fishing?")
|
||||||
@ -154,8 +226,30 @@ class AchiettiesDialogueFile : DialogueBuilderFile() {
|
|||||||
optionBuilder2.option_playerl("I'll start looking for all those things then.")
|
optionBuilder2.option_playerl("I'll start looking for all those things then.")
|
||||||
.npcl("Good luck with that.")
|
.npcl("Good luck with that.")
|
||||||
.end()
|
.end()
|
||||||
|
optionBuilder2.option_playerl("Or perhaps the guild needs a bit of financing?")
|
||||||
|
.npcl("Perhaps a small 'Loan' of 1 million coins?")
|
||||||
|
// Bribery branch
|
||||||
|
.options()
|
||||||
|
.let { optionBuilder3 ->
|
||||||
|
optionBuilder3.option_playerl("That sounds good")
|
||||||
|
.branch { player ->
|
||||||
|
if (inInventory(player!!, 995, AchiettiesDialogue.BRIBE_PRICE)) 1 else 0
|
||||||
|
}
|
||||||
|
.let { branch ->
|
||||||
|
branch.onValue(1)
|
||||||
|
.playerl(FacialExpression.FRIENDLY, "Here you go!")
|
||||||
|
.endWith { _, player ->
|
||||||
|
removeItem(player, Item(995, AchiettiesDialogue.BRIBE_PRICE), Container.INVENTORY)
|
||||||
|
finishQuest(player, Quests.HEROES_QUEST)
|
||||||
|
}
|
||||||
|
branch.onValue(0)
|
||||||
|
.playerl(FacialExpression.HALF_GUILTY, "Actually, I don't have that much.")
|
||||||
|
.end()
|
||||||
|
}
|
||||||
|
optionBuilder3.option_playerl("1 million coins for this dump? No way")
|
||||||
|
.end()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
branch.onValue(1)
|
branch.onValue(1)
|
||||||
.playerl("I have all the required items.")
|
.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...")
|
.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...")
|
||||||
|
|||||||
@ -124,6 +124,7 @@ class CivilianDialogue(player: Player? = null) : DialoguePlugin(player) {
|
|||||||
if (removeItem(player, cat)){
|
if (removeItem(player, cat)){
|
||||||
player.familiarManager.removeDetails(cat)
|
player.familiarManager.removeDetails(cat)
|
||||||
addItem(player, Items.DEATH_RUNE_560, 100)
|
addItem(player, Items.DEATH_RUNE_560, 100)
|
||||||
|
player.incrementAttribute("/save:stats_manager:cats_sold");
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -172,6 +173,7 @@ class CatTrade : InteractionListener{
|
|||||||
// Remove the cat
|
// Remove the cat
|
||||||
player.familiarManager.removeDetails(used.id)
|
player.familiarManager.removeDetails(used.id)
|
||||||
addItem(player, Items.DEATH_RUNE_560, 100)
|
addItem(player, Items.DEATH_RUNE_560, 100)
|
||||||
|
player.incrementAttribute("/save:stats_manager:cats_sold");
|
||||||
openDialogue(player, dialogue, with as NPC)
|
openDialogue(player, dialogue, with as NPC)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,22 +1,22 @@
|
|||||||
package content.region.misc.tutisland.dialogue
|
package content.region.misc.tutisland.dialogue
|
||||||
|
|
||||||
import content.global.handlers.iface.RulesAndInfo
|
|
||||||
import content.region.misc.tutisland.handlers.*
|
import content.region.misc.tutisland.handlers.*
|
||||||
import core.ServerConstants
|
|
||||||
import core.api.*
|
import core.api.*
|
||||||
import core.game.node.entity.npc.NPC
|
import core.game.node.entity.npc.NPC
|
||||||
import core.game.node.entity.player.Player
|
import core.game.node.entity.player.Player
|
||||||
import core.game.node.entity.player.link.IronmanMode
|
import core.game.node.entity.player.link.IronmanMode
|
||||||
import core.game.node.entity.player.link.TeleportManager
|
import core.game.node.entity.player.link.TeleportManager
|
||||||
import core.game.node.item.Item
|
import core.game.node.item.Item
|
||||||
import core.game.world.GameWorld
|
|
||||||
import core.game.world.map.Location
|
import core.game.world.map.Location
|
||||||
import core.plugin.Initializable
|
import core.plugin.Initializable
|
||||||
import core.tools.END_DIALOGUE
|
|
||||||
import core.worker.ManagementEvents
|
|
||||||
import org.rs09.consts.Items
|
import org.rs09.consts.Items
|
||||||
import org.rs09.consts.NPCs
|
import org.rs09.consts.NPCs
|
||||||
import proto.management.JoinClanRequest
|
import proto.management.JoinClanRequest
|
||||||
|
import core.ServerConstants
|
||||||
|
import content.global.handlers.iface.RulesAndInfo
|
||||||
|
import core.game.world.GameWorld
|
||||||
|
import core.tools.END_DIALOGUE
|
||||||
|
import core.worker.ManagementEvents
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles the magic tutor's dialogue
|
* Handles the magic tutor's dialogue
|
||||||
@ -44,20 +44,29 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
|
|||||||
Item(557, 4),
|
Item(557, 4),
|
||||||
Item(559, 2)
|
Item(559, 2)
|
||||||
)
|
)
|
||||||
private val STARTER_BANK = arrayOf(Item(995, 25))
|
private val STARTER_BANK = arrayOf(Item(995, 2500))
|
||||||
|
// Helper function to convert a numeric XP rate to a descriptive string.
|
||||||
|
private fun xpRateText(rate: Double): String {
|
||||||
|
return when(rate) {
|
||||||
|
1.0 -> "Normal (100%)"
|
||||||
|
2.5 -> "2.5x"
|
||||||
|
5.0 -> "5x"
|
||||||
|
10.0 -> "10x"
|
||||||
|
0.1 -> "Scale up to 10x at level 99"
|
||||||
|
0.2 -> "Scale up to 5x at level 99"
|
||||||
|
else -> "${rate}x"
|
||||||
|
}
|
||||||
|
}
|
||||||
override fun newInstance(player: Player?): core.game.dialogue.DialoguePlugin {
|
override fun newInstance(player: Player?): core.game.dialogue.DialoguePlugin {
|
||||||
return TutorialMagicTutorDialogue(player)
|
return TutorialMagicTutorDialogue(player)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun open(vararg args: Any?): Boolean {
|
override fun open(vararg args: Any?): Boolean {
|
||||||
npc = args[0] as NPC
|
npc = args[0] as NPC
|
||||||
when(getAttribute(player, "tutorial:stage", 0))
|
when(getAttribute(player, "tutorial:stage", 0)) {
|
||||||
{
|
|
||||||
67 -> playerl(core.game.dialogue.FacialExpression.FRIENDLY, "Hello.")
|
67 -> playerl(core.game.dialogue.FacialExpression.FRIENDLY, "Hello.")
|
||||||
69 -> npcl(core.game.dialogue.FacialExpression.FRIENDLY, "Good. This is a list of your spells. Currently you can only cast one offensive spell called Wind Strike. Let's try it out on one of those chickens.")
|
69 -> npcl(core.game.dialogue.FacialExpression.FRIENDLY, "Good. This is a list of your spells. Currently you can only cast one offensive spell called Wind Strike. Let's try it out on one of those chickens.")
|
||||||
70 -> if(!inInventory(player, Items.AIR_RUNE_556) && !inInventory(player, Items.MIND_RUNE_558))
|
70 -> if(!inInventory(player, Items.AIR_RUNE_556) && !inInventory(player, Items.MIND_RUNE_558)) {
|
||||||
{
|
|
||||||
player.dialogueInterpreter.sendDoubleItemMessage(Items.AIR_RUNE_556, Items.MIND_RUNE_558, "You receive some spare runes.")
|
player.dialogueInterpreter.sendDoubleItemMessage(Items.AIR_RUNE_556, Items.MIND_RUNE_558, "You receive some spare runes.")
|
||||||
addItem(player, Items.AIR_RUNE_556, 15)
|
addItem(player, Items.AIR_RUNE_556, 15)
|
||||||
addItem(player, Items.MIND_RUNE_558, 15)
|
addItem(player, Items.MIND_RUNE_558, 15)
|
||||||
@ -70,8 +79,7 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
|
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
|
||||||
when(getAttribute(player, "tutorial:stage", 0))
|
when(getAttribute(player, "tutorial:stage", 0)) {
|
||||||
{
|
|
||||||
67 -> when(stage++){
|
67 -> when(stage++){
|
||||||
0 -> npcl(core.game.dialogue.FacialExpression.FRIENDLY, "Good day, newcomer. My name is Terrova. I'm here to tell you about Magic. Let's start by opening your spell list.")
|
0 -> npcl(core.game.dialogue.FacialExpression.FRIENDLY, "Good day, newcomer. My name is Terrova. I'm here to tell you about Magic. Let's start by opening your spell list.")
|
||||||
1 -> {
|
1 -> {
|
||||||
@ -92,43 +100,45 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
|
|||||||
TutorialStage.load(player, 70)
|
TutorialStage.load(player, 70)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
71 -> when(stage){
|
71 -> when(stage) {
|
||||||
0 -> options("Set Ironman Mode (current: ${player.ironmanManager.mode.name})", "Change XP Rate (current: ${player.skills.experienceMultiplier}x)", "I'm ready now.").also { stage++ }
|
0 -> options(
|
||||||
1 -> when(buttonId){
|
"Set Ironman Mode (current: ${player.ironmanManager.mode.name})",
|
||||||
1 -> options("None","Standard","Ultimate","Nevermind.").also { stage = 10 }
|
"Change XP Rate (current: ${xpRateText(player.skills.experienceMultiplier)})",
|
||||||
2 -> options("1.0x","2.5x","5.0x").also { stage = 20 }
|
"I'm ready now."
|
||||||
|
).also { stage++ }
|
||||||
|
1 -> when(buttonId) {
|
||||||
|
1 -> options("None", "Standard", "Hardcore (Permadeath!)", "Ultimate", "Nevermind.").also { stage = 10 }
|
||||||
|
2 -> options("Flat XP Rate Multiplier", "Scaled XP Rate Multiplier", "Back").also { stage = 21 }
|
||||||
3 -> npcl(core.game.dialogue.FacialExpression.FRIENDLY, "Well, you're all finished here now. I'll give you a reasonable number of starting items when you leave.").also { stage = 30 }
|
3 -> npcl(core.game.dialogue.FacialExpression.FRIENDLY, "Well, you're all finished here now. I'll give you a reasonable number of starting items when you leave.").also { stage = 30 }
|
||||||
}
|
}
|
||||||
|
// Modified submenu branch for XP rate options
|
||||||
|
21 -> when(buttonId) {
|
||||||
|
1 -> options("1.0x", "2.5x", "5.0x", "10x").also { stage = 22 }
|
||||||
|
2 -> options("1.0x", "Scale to 10x", "Scale to 5x").also { stage = 23 }
|
||||||
|
3 -> options(
|
||||||
|
"Set Ironman Mode (current: ${player.ironmanManager.mode.name})",
|
||||||
|
"Change XP Rate (current: ${xpRateText(player.skills.experienceMultiplier)})",
|
||||||
|
"I'm ready now."
|
||||||
|
).also { stage = 1 }
|
||||||
|
else -> return false
|
||||||
|
}
|
||||||
10 -> {
|
10 -> {
|
||||||
stage = 0
|
stage = 0
|
||||||
if(buttonId < 5)
|
if(buttonId < 5) {
|
||||||
{
|
val mode = IronmanMode.values()[buttonId - 1]
|
||||||
val mode = when (buttonId - 1)
|
|
||||||
{
|
|
||||||
0 -> IronmanMode.NONE
|
|
||||||
1 -> IronmanMode.STANDARD
|
|
||||||
2 -> IronmanMode.ULTIMATE
|
|
||||||
else -> IronmanMode.NONE
|
|
||||||
}
|
|
||||||
if (mode != IronmanMode.NONE) stage = 11
|
|
||||||
player.dialogueInterpreter.sendDialogue("You set your ironman mode to: ${mode.name}.")
|
player.dialogueInterpreter.sendDialogue("You set your ironman mode to: ${mode.name}.")
|
||||||
player.ironmanManager.mode = mode
|
player.ironmanManager.mode = mode
|
||||||
if (player.skills.experienceMultiplier == 10.0) player.skills.experienceMultiplier = 5.0
|
if (player.skills.experienceMultiplier == 10.0 && mode != IronmanMode.HARDCORE)
|
||||||
}
|
player.skills.experienceMultiplier = 5.0
|
||||||
else
|
} else {
|
||||||
{
|
|
||||||
handle(interfaceId, 0)
|
handle(interfaceId, 0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
11 -> player.dialogueInterpreter.sendPlainMessage(false, *splitLines("WARNING: You have selected an ironman mode. This is an uncompromising mode that WILL completely restrict your ability to trade. This MAY leave you unable to complete certain content, including quests.")).also { stage = 0 }
|
22 -> {
|
||||||
|
val rates = arrayOf(1.0, 2.5, 5.0, 10.0)
|
||||||
20 -> {
|
|
||||||
val rates = arrayOf(1.0,2.5,5.0)
|
|
||||||
val rate = rates[buttonId - 1]
|
val rate = rates[buttonId - 1]
|
||||||
if(rate == 10.0) {
|
if(rate == 10.0 && player.ironmanManager.mode != IronmanMode.HARDCORE) {
|
||||||
player.dialogueInterpreter.sendDialogue("10.0x is no longer available!")
|
player.dialogueInterpreter.sendDialogue("10.0x is only available to Hardcore Ironmen!")
|
||||||
player.skills.experienceMultiplier = 5.0
|
|
||||||
stage = 0
|
stage = 0
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@ -136,14 +146,24 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
|
|||||||
player.skills.experienceMultiplier = rate
|
player.skills.experienceMultiplier = rate
|
||||||
stage = 0
|
stage = 0
|
||||||
}
|
}
|
||||||
|
23 -> {
|
||||||
|
val rates = arrayOf(1.0, 0.1, 0.2)
|
||||||
|
val rate = rates[buttonId - 1]
|
||||||
|
if(rate == 0.1) {
|
||||||
|
player.dialogueInterpreter.sendDialogue("You set your XP rate to scale to be 10x at level 99.")
|
||||||
|
} else if (rate == 0.2) {
|
||||||
|
player.dialogueInterpreter.sendDialogue("You set your XP rate to scale to be 5x at level 99.")
|
||||||
|
} else {
|
||||||
|
player.dialogueInterpreter.sendDialogue("You set your XP rate to: ${rate}x.")
|
||||||
|
}
|
||||||
|
player.skills.experienceMultiplier = rate
|
||||||
|
stage = 0
|
||||||
|
}
|
||||||
30 -> player.dialogueInterpreter.sendOptions("Leave Tutorial Island?", "Yes, I'm ready.", "No, not yet.").also { stage++ }
|
30 -> player.dialogueInterpreter.sendOptions("Leave Tutorial Island?", "Yes, I'm ready.", "No, not yet.").also { stage++ }
|
||||||
31 -> when(buttonId)
|
31 -> when(buttonId) {
|
||||||
{
|
|
||||||
1 -> playerl(core.game.dialogue.FacialExpression.FRIENDLY, "I'm ready to go now, thank you.").also { stage = 40 }
|
1 -> playerl(core.game.dialogue.FacialExpression.FRIENDLY, "I'm ready to go now, thank you.").also { stage = 40 }
|
||||||
2 -> playerl(core.game.dialogue.FacialExpression.FRIENDLY, "I'm not quite ready to go yet, thank you.").also { stage = END_DIALOGUE }
|
2 -> playerl(core.game.dialogue.FacialExpression.FRIENDLY, "I'm not quite ready to go yet, thank you.").also { stage = END_DIALOGUE }
|
||||||
}
|
}
|
||||||
|
|
||||||
40 -> {
|
40 -> {
|
||||||
setAttribute(player, "/save:tutorial:complete", true)
|
setAttribute(player, "/save:tutorial:complete", true)
|
||||||
setVarbit(player, 3756, 0)
|
setVarbit(player, 3756, 0)
|
||||||
@ -159,14 +179,13 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
|
|||||||
player.inventory.add(*STARTER_PACK)
|
player.inventory.add(*STARTER_PACK)
|
||||||
player.bank.add(*STARTER_BANK)
|
player.bank.add(*STARTER_BANK)
|
||||||
|
|
||||||
if(player.skills.experienceMultiplier == 10.0)
|
if(player.ironmanManager.mode == IronmanMode.HARDCORE) {
|
||||||
{
|
setAttribute(player, "/save:permadeath", true)
|
||||||
|
} else if(player.skills.experienceMultiplier == 10.0) {
|
||||||
player.skills.experienceMultiplier = 5.0
|
player.skills.experienceMultiplier = 5.0
|
||||||
}
|
}
|
||||||
|
|
||||||
//This overwrites the stuck dialogue after teleporting to Lumbridge for some reason
|
// Overwrites the stuck dialogue after teleporting to Lumbridge
|
||||||
//Dialogue from 2007 or thereabouts
|
|
||||||
//Original is five lines, but if the same is done here it will break. Need to find another way of showing all this information.
|
|
||||||
interpreter.sendDialogue(
|
interpreter.sendDialogue(
|
||||||
"Welcome to Lumbridge! To get more help, simply click on the",
|
"Welcome to Lumbridge! To get more help, simply click on the",
|
||||||
"Lumbridge Guide or one of the Tutors - these can be found by looking",
|
"Lumbridge Guide or one of the Tutors - these can be found by looking",
|
||||||
@ -194,7 +213,6 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
|
|||||||
ManagementEvents.publish(clanJoin.build())
|
ManagementEvents.publish(clanJoin.build())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
12 -> {
|
12 -> {
|
||||||
player.setAttribute("close_c_", true)
|
player.setAttribute("close_c_", true)
|
||||||
end()
|
end()
|
||||||
@ -207,5 +225,4 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
|
|||||||
override fun getIds(): IntArray {
|
override fun getIds(): IntArray {
|
||||||
return intArrayOf(NPCs.MAGIC_INSTRUCTOR_946)
|
return intArrayOf(NPCs.MAGIC_INSTRUCTOR_946)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -41,7 +41,7 @@ class KingRoaldDialogue(player: Player? = null) : DialoguePlugin(player) {
|
|||||||
addOption("Priest in Peril", KingRoaldPIPDialogue(player.questRepository.getStage(Quests.PRIEST_IN_PERIL)))
|
addOption("Priest in Peril", KingRoaldPIPDialogue(player.questRepository.getStage(Quests.PRIEST_IN_PERIL)))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.questRepository.getQuest(Quests.SHIELD_OF_ARRAV).isStarted(player) && !player.questRepository.getQuest(Quests.SHIELD_OF_ARRAV).isCompleted(player)) {
|
if (!player.questRepository.getQuest(Quests.SHIELD_OF_ARRAV).isCompleted(player)) {
|
||||||
addOption("Shield of Arrav", KingRoaldArravDialogue())
|
addOption("Shield of Arrav", KingRoaldArravDialogue())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -6,12 +6,20 @@ import core.game.dialogue.DialogueFile
|
|||||||
import core.tools.END_DIALOGUE
|
import core.tools.END_DIALOGUE
|
||||||
import core.tools.START_DIALOGUE
|
import core.tools.START_DIALOGUE
|
||||||
import content.data.Quests
|
import content.data.Quests
|
||||||
|
import core.game.dialogue.FacialExpression
|
||||||
|
import core.api.Container
|
||||||
|
import core.api.inInventory
|
||||||
|
import core.api.removeItem
|
||||||
|
import core.game.dialogue.DialoguePlugin
|
||||||
|
|
||||||
|
|
||||||
private val CERTIFICATE = Item(769)
|
private val CERTIFICATE = Item(769)
|
||||||
|
|
||||||
|
|
||||||
class KingRoaldArravDialogue() : DialogueFile() {
|
class KingRoaldArravDialogue() : DialogueFile() {
|
||||||
|
companion object {
|
||||||
|
const val BRIBE_PRICE = 6000
|
||||||
|
}
|
||||||
override fun handle(componentID: Int, buttonID: Int) {
|
override fun handle(componentID: Int, buttonID: Int) {
|
||||||
|
|
||||||
if (player!!.inventory.containsItem(ShieldofArrav.PHOENIX_SHIELD) || player!!.inventory.containsItem(ShieldofArrav.BLACKARM_SHIELD)) {
|
if (player!!.inventory.containsItem(ShieldofArrav.PHOENIX_SHIELD) || player!!.inventory.containsItem(ShieldofArrav.BLACKARM_SHIELD)) {
|
||||||
@ -54,7 +62,29 @@ class KingRoaldArravDialogue() : DialogueFile() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
else {
|
else {
|
||||||
abandonFile()
|
when (stage) {
|
||||||
|
START_DIALOGUE -> player("I would like to contribute to one of", "your Political Action Committees").also{ stage++ }
|
||||||
|
1 -> npcl("Which one?").also { stage++ }
|
||||||
|
2 -> playerl("The Citizens Who Can't Be Bothered To Do Shield of Arrav").also { stage++ }
|
||||||
|
3 -> npcl(FacialExpression.HALF_THINKING, "I see... that will be 6,000 coins").also { stage++ }
|
||||||
|
4 -> options("Here you go!", "Nevermind.").also { stage++ }
|
||||||
|
5 -> when (buttonID) {
|
||||||
|
1 -> {
|
||||||
|
if (inInventory(player!!, 995, BRIBE_PRICE))
|
||||||
|
playerl(FacialExpression.FRIENDLY, "Here you go!").also { stage = 20 }
|
||||||
|
else
|
||||||
|
playerl(FacialExpression.HALF_GUILTY, "Actually, I don't have that much.").also { stage = END_DIALOGUE }
|
||||||
|
}
|
||||||
|
2 -> playerl(FacialExpression.FRIENDLY, "On second thought, never mind.").also { stage = END_DIALOGUE }
|
||||||
|
}
|
||||||
|
20 -> {
|
||||||
|
npcl("Thank you so much, dear donor. The government of Varrock now has higher priorities than the Shield of Arrav.")
|
||||||
|
if (removeItem(player!!, Item(995, BRIBE_PRICE), Container.INVENTORY)) {
|
||||||
|
player!!.questRepository.getQuest(Quests.SHIELD_OF_ARRAV).finish(player)
|
||||||
|
}
|
||||||
|
stage = END_DIALOGUE
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -41,7 +41,7 @@ public final class Skills {
|
|||||||
/**
|
/**
|
||||||
* Represents the constant modifier of experience.
|
* Represents the constant modifier of experience.
|
||||||
*/
|
*/
|
||||||
public double experienceMultiplier = 5.0;
|
public double experienceMultiplier = 0.1; // Note in EmoScape this sets the default to be the scaling to 10x at 99
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The maximum experience multiplier.
|
* The maximum experience multiplier.
|
||||||
@ -287,9 +287,30 @@ public final class Skills {
|
|||||||
* @return The experience mod.
|
* @return The experience mod.
|
||||||
*/
|
*/
|
||||||
private double getExperienceMod(int slot, double experience, boolean playerMod, boolean multiplyer) {
|
private double getExperienceMod(int slot, double experience, boolean playerMod, boolean multiplyer) {
|
||||||
|
// Emo has hijacked this method to enable the scaling of the exp multiplier
|
||||||
//Keywords for people ctrl + Fing the project
|
//Keywords for people ctrl + Fing the project
|
||||||
//xprate xp rate xp multiplier skilling rate
|
//xprate xp rate xp multiplier skilling rate
|
||||||
|
if (experienceMultiplier == 0.1) { // exp multiplier placeholder for 10x at 100
|
||||||
|
double mult = (1 + ((this.experience[slot] * 9) / 13034431)); // 13034431 is the exp for 99, meaning this formula hits 10x at 99
|
||||||
|
if (mult < 1.0) {
|
||||||
|
return 1.0;
|
||||||
|
} else if (mult > 10.0) {
|
||||||
|
return 10.0;
|
||||||
|
} else {
|
||||||
|
return mult;
|
||||||
|
}
|
||||||
|
} else if (experienceMultiplier == 0.2) { // exp multiplier placeholder for 5x at 100
|
||||||
|
double mult = (1 + ((this.experience[slot] * 4) / 13034431)); // 13034431 is the exp for 99, meaning this formula hits 5x at 99
|
||||||
|
if (mult < 1.0) {
|
||||||
|
return 1.0;
|
||||||
|
} else if (mult > 5.0) {
|
||||||
|
return 5.0;
|
||||||
|
} else {
|
||||||
|
return mult;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
return experienceMultiplier;
|
return experienceMultiplier;
|
||||||
|
}
|
||||||
/*if (!(entity instanceof Player)) {
|
/*if (!(entity instanceof Player)) {
|
||||||
return 1.0;
|
return 1.0;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ const val STATS_ROCKS = "rocks_mined"
|
|||||||
const val STATS_RC = "essence_crafted"
|
const val STATS_RC = "essence_crafted"
|
||||||
const val STATS_FOOD_COOKED = "food_cooked"
|
const val STATS_FOOD_COOKED = "food_cooked"
|
||||||
const val STATS_CATS_RAISED = "cats_raised"
|
const val STATS_CATS_RAISED = "cats_raised"
|
||||||
|
const val STATS_CATS_SOLD = "cats_sold"
|
||||||
const val STATS_PK_KILLS = "player_kills"
|
const val STATS_PK_KILLS = "player_kills"
|
||||||
const val STATS_PK_DEATHS = "player_deaths"
|
const val STATS_PK_DEATHS = "player_deaths"
|
||||||
const val STATS_ALKHARID_GATE = "alkharid_gate"
|
const val STATS_ALKHARID_GATE = "alkharid_gate"
|
||||||
|
|||||||
@ -62,7 +62,7 @@ class StatsCommandSet : CommandSet(Privilege.STANDARD) {
|
|||||||
72 -> sendLine(player,"Quest Points: ${queryPlayer.questRepository.points}",i)
|
72 -> sendLine(player,"Quest Points: ${queryPlayer.questRepository.points}",i)
|
||||||
73 -> sendLine(player,"Ironman Mode: ${queryPlayer.ironmanManager.mode.name.lowercase(Locale.getDefault())}",i)
|
73 -> sendLine(player,"Ironman Mode: ${queryPlayer.ironmanManager.mode.name.lowercase(Locale.getDefault())}",i)
|
||||||
74 -> sendLine(player,"Deaths: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_DEATHS",0)}",i)
|
74 -> sendLine(player,"Deaths: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_DEATHS",0)}",i)
|
||||||
75 -> sendLine(player, SPACER,i)
|
75 -> sendLine(player, "Cats Sold: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_CATS_SOLD", 0)}", i)
|
||||||
76 -> sendLine(player,"Logs Chopped: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_LOGS",0)}",i)
|
76 -> sendLine(player,"Logs Chopped: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_LOGS",0)}",i)
|
||||||
77 -> sendLine(player,"Rocks Mined: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_ROCKS",0)}",i)
|
77 -> sendLine(player,"Rocks Mined: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_ROCKS",0)}",i)
|
||||||
78 -> sendLine(player,"Fish Caught: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_FISH",0)}",i)
|
78 -> sendLine(player,"Fish Caught: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_FISH",0)}",i)
|
||||||
|
|||||||
@ -11,25 +11,25 @@ secret_key = "2009scape_development"
|
|||||||
write_logs = true
|
write_logs = true
|
||||||
msip = "127.0.0.1"
|
msip = "127.0.0.1"
|
||||||
#preload the map (Increases memory usage by 2GB but makes game ticks smoother)
|
#preload the map (Increases memory usage by 2GB but makes game ticks smoother)
|
||||||
preload_map = false
|
preload_map = true
|
||||||
#--------Note: If both of the below are false, no database is required to run the server.--------------
|
#--------Note: If both of the below are false, no database is required to run the server.--------------
|
||||||
#true = login requires password to be correct, passwords are hashed before stored. false = login does not care about the correctness of a password.
|
#true = login requires password to be correct, passwords are hashed before stored. false = login does not care about the correctness of a password.
|
||||||
use_auth = false #NOTE: THIS MUST BE SET TO TRUE IN PRODUCTION!
|
use_auth = true #NOTE: THIS MUST BE SET TO TRUE IN PRODUCTION!
|
||||||
#true - account data (credits, playtime, etc) is persisted, false - account data is purely temporary
|
#true - account data (credits, playtime, etc) is persisted, false - account data is purely temporary
|
||||||
#NOTE: this does not affect actual save data, like stats, inventory, etc.
|
#NOTE: this does not affect actual save data, like stats, inventory, etc.
|
||||||
persist_accounts = false #NOTE: THIS MUST BE SET TO TRUE IN PRODUCTION!
|
persist_accounts = true #NOTE: THIS MUST BE SET TO TRUE IN PRODUCTION!
|
||||||
noauth_default_admin = true #NOTE: If we are not using auth, this determines whether or not players are admins by default.
|
noauth_default_admin = false #NOTE: If we are not using auth, this determines whether or not players are admins by default.
|
||||||
#------------------------------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------------------------------
|
||||||
#The limit on how many different accounts a player can log into per day.
|
#The limit on how many different accounts a player can log into per day.
|
||||||
daily_accounts_per_ip = 3
|
daily_accounts_per_ip = 3
|
||||||
watchdog_enabled = true
|
watchdog_enabled = true
|
||||||
connectivity_check_url = "https://google.com,https://2009scape.org"
|
connectivity_check_url = "https://google.com,https://emoscape.org"
|
||||||
connectivity_timeout = 500
|
connectivity_timeout = 500
|
||||||
|
|
||||||
[database]
|
[database]
|
||||||
database_name = "global"
|
database_name = "global"
|
||||||
database_username = "root"
|
database_username = "scape"
|
||||||
database_password = ""
|
database_password = "TestPass"
|
||||||
database_address = "127.0.0.1"
|
database_address = "127.0.0.1"
|
||||||
database_port = "3306"
|
database_port = "3306"
|
||||||
|
|
||||||
@ -44,11 +44,11 @@ grafana_log_ttl_days = 7
|
|||||||
|
|
||||||
|
|
||||||
[world]
|
[world]
|
||||||
name = "2009Scape"
|
name = "EmoScape"
|
||||||
#name used for announcements of bots selling items on the GE
|
#name used for announcements of bots selling items on the GE
|
||||||
name_ge = "2009Scape"
|
name_ge = "EmoScape"
|
||||||
debug = true
|
debug = false
|
||||||
dev = true
|
dev = false
|
||||||
start_gui = false
|
start_gui = false
|
||||||
daily_restart = false
|
daily_restart = false
|
||||||
#world number
|
#world number
|
||||||
@ -56,7 +56,7 @@ world_id = "1"
|
|||||||
country_id = "0"
|
country_id = "0"
|
||||||
members = true
|
members = true
|
||||||
#activity as displayed on the world list
|
#activity as displayed on the world list
|
||||||
activity = "2009Scape Classic."
|
activity = "EmoScape Classic."
|
||||||
pvp = false
|
pvp = false
|
||||||
default_xp_rate = 5.0
|
default_xp_rate = 5.0
|
||||||
allow_slayer_reroll = false
|
allow_slayer_reroll = false
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user