Commit Graph

607 Commits

Author SHA1 Message Date
Dark98 997ccce97f Update Readme For Local Bot Client Use 2022-10-26 04:22:31 +01:00
dependabot[bot] cb3686a9f5 Bump jackson-databind from 2.10.5.1 to 2.13.4.1 in /2006Scape Server
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.10.5.1 to 2.13.4.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-26 04:22:30 +01:00
dependabot[bot] 374b03a691 Bump gson from 2.8.6 to 2.8.9 in /2006Scape Server
Bumps [gson](https://github.com/google/gson) from 2.8.6 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.6...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-26 04:22:30 +01:00
Dark98 7bc2b8bf7a Setup GH Actions For Windows Single-Player 2022-10-26 04:22:30 +01:00
Josh Shippam fab3c3eac7 Various Changes (#533)
* Add Shield Blocking Emote For Two NPC's

* Fix KARAMBWAN HP Restore Amount

* Add Link Command To Discord Bot

* Github Actions Update
2022-10-26 04:22:30 +01:00
Olivier f254773b39 Merge pull request #527
* Various Fixes

* Sea Turtle can be cooked, fixed xp received when cooking Manta Ray
* Al kharid warrior has correct emote when fighting
* Drop tables only roll once for items that do not have 100% drop rate (Prevents multiple items from rolling and dropping on same npc)
* Nerfed Tree Spirit (Lost City) max hit (From 20 to 10)
* Nerfed Abyssal Demon max hit (From 16 to 8)
2022-10-26 04:22:30 +01:00
darkaidz98@gmail.com 0481b9327d Revert Library Updates To Fix Server 2022-10-26 04:22:30 +01:00
Josh Shippam 860adc8194 Various Changes (#523)
* Discord Bot Update

Updated JavaCord To Latest
Changed Some Commands To No Longer Be World Specific
Added An "AdminCommands" Command

* Update Some Server Libs

* Added Purge & Pin/Un-Pin To Commands Discord Bot

* Fixed -dev & -no-crc Client Args

* Add Discord User ID Linking Support(Useless For Now)

* Added Support For User's Kicking Own Accounts Through Discord Bot

* Merge Website Integration Stuff Into One Var
2022-10-26 04:22:30 +01:00
Teddy 8b3bdc8045 East falador staircase was falling into the last if which was teleporting the player to a void (#522)
Co-authored-by: Sad Emu <wcpro111@gmail.com>
2022-10-26 04:22:30 +01:00
Teddy d061f18128 Added jad ranged attack projectile (#521)
Co-authored-by: Sad Emu <wcpro111@gmail.com>
2022-10-26 04:22:30 +01:00
Dark98 3e00708936 Added Current World To Client Title 2022-10-26 04:22:30 +01:00
Dark98 315d103f01 Added/Fixed Right Click Banking For Fadli(Duel Arena Banker) 2022-10-26 04:22:30 +01:00
Dark98 5f4a5ef8b6 Fix Discord Bot Derp 2022-10-26 04:22:30 +01:00
Dark98 3c61ba69f3 Small Update
* Disabled The Old Dialogue System
* Converted CooksAssistant/Lumbridge Cook Dialogue
* Only Show Log Info For New Dialogue System When Server Is In Debug Mode
2021-12-15 02:08:54 +00:00
Dark98 8d0000de0b Update NPC Plugins Layout To Put Click Actions Per NPC Plugin
(cherry picked from commit 156d864bfd)
2021-12-14 05:53:59 +00:00
Qweqker 8ee88848a3 Astraeus Dialogue System Port (#512)
* - Marked As Deprecated
- Reorganized DialogueOptions.java so that option buttons are grouped with each interface
- Added temporary Dialogue Executor to make new Dialogue System function
- Remove Man, Woman, and Banker Dialogue and Dialogue Options

* - Refactored Dialogue.java into DialoguePacket.java
- Moved DialoguePacket.java into impl packets package
- Added Astraeus dialogue executor

* - Removed useless file
- Reorganized the Misc.java file

* - Ported Astraeus Dialogue System
- Rewrote Man, Woman, and Banker Dialogues
- Added line splitter in AstraeusDialogueFactory.java

* - Renamed Astraeus* classes to *Plugin
- Fixed an issue where the Dialogue Option buttons were not executed through the Kotlin file

(cherry picked from commit 6deaa4162a)
2021-12-14 05:53:33 +00:00
Dark98 3aaf413bc7 Cleanup Unused GameConstants Vars & Add More Vars To ConfigLoader 2021-12-14 04:00:49 +00:00
Josh Shippam d3f5ebc7a2 Fix More Var Descriptions 2021-12-14 02:42:51 +00:00
Dark98 736b3b0ea3 Make CHECK_CRC Description More Descriptive 2021-12-14 01:59:45 +00:00
Dark98 24e5ad9415 Fix Naming For Some Vars 2021-12-14 01:55:27 +00:00
Dark98 79357215c7 Add -no-crc & -dev Arguments To Client 2021-12-14 01:42:16 +00:00
Dark98 6d23a5b536 Fix Cache CRC Checks For The Client(Allows Cache To Actually Check For Updates) 2021-12-14 01:34:53 +00:00
Dark98 790cc51d81 Properly Update Client Title Logo
If The Cache Has Already Been Downloaded You Will Need To Delete It & Let The Client ReDownload It
2021-12-14 01:28:13 +00:00
Dark98 49a2810e3e Allow Loading VARIABLE_XP_RATES & PLAYER_XP_RATES From Config 2021-12-14 00:31:37 +00:00
Dark98 c7a6cb2811 Fixed Abusive Client Command Privileges & Added myxprate/checkxprate 2021-12-13 01:43:28 +00:00
Dark98 c47d9a4b15 Create/Use PLAYER_XP_RATES For Easier Rate Changes 2021-12-13 01:21:44 +00:00
Dark98 83eb0be61a Use Either VARIABLE_SKILL_RATE OR XP_RATE Not Both
TODO(Convert Player.xpRate Into An Array For Easier Rate Changes)
2021-12-11 22:26:28 +00:00
Dark98 8761116b9b Fix XP Rate Multiplier & add ::xprate to cooamnds list if enabled 2021-12-10 19:32:58 +00:00
Danial c15722c766 43597 → 43598 2021-12-10 21:52:22 +13:00
Danial 5ed9394f44 Minor fixup 2021-12-10 21:50:52 +13:00
Dark98 375cc1ac6f More Discord Commands(GameKick, MoveHome & Update)
*GameKick kicks A player if their client froze but acc stayed logged in
*MoveHome removes the need for ::stuck which removes potential for abuse
*Update schedules A server update
2021-12-10 01:44:08 +00:00
Dark98 2fc416c3e1 Small Fixup For World 2
Renamed BOT_WORLD to VARIABLE_XP_RATE
Fixed Dialogue/Message grammar
Added a check for VARIABLE_XP_RATES to ::xprate command
2021-12-06 07:01:25 +00:00
Dark98 f64b0469c2 Create/Use commandPrefix Var For Discord Bot 2021-12-06 01:59:31 +00:00
Dark98 5c02c34569 Add Kick Command To Discord Bot & Fix Type In ConfigLoader 2021-12-06 01:45:31 +00:00
Dark98 d2faea6f71 More Multi World Stuff
Update Integrations(Discord Bot/Website Stuff) For Multiple Worlds
Added More XP Rate Dialogue Stuff
2021-12-06 01:20:48 +00:00
Dark98 38140d8665 Add XP Rate Multiplier For Non-Bot Worlds 2021-12-05 23:47:49 +00:00
Dark98 8a10201637 Add -w/-world arg to client 2021-11-23 01:15:32 +00:00
Dark98 bdd5297a94 Add xpRate Var & Include With XPRate Calculations 2021-11-23 01:08:13 +00:00
Dark98 8ab31771b3 Set Server Port After Loading Config 2021-11-23 00:46:46 +00:00
Dark98 8fc1e17a25 Merge branch 'master' into world2
# Conflicts:
#	2006Scape Server/src/main/java/com/rs2/GameConstants.java
2021-11-23 00:32:57 +00:00
Josh Shippam 1c5b400f00 Merge The File&Game Servers Into One Module (#519)
* Merge The File&Game Servers Into One Module

* Make SettingsLoader A GameConstants ConfigLoader
If A Config File Isn't Used, The Server Will Fall Back To The Defaults Set In GameConstants.java

Config Files Can Be Loaded With The "-c/-config configfilelocation.json"
Added A Default Prefilled ServerConfig.json

* Update ConfigLoader

* Bring Back Independant "Secrets" Loader For External Password Stuff
* Added A Bunch More Vars To The ConfigLoader
* Included A Sample "Server Config"
* Also Updated README.md As Parabot Is No Longer Maintained & We No Longer Have A FileServer Module

* Bundle FileServer with Server (docker)

* Remove /udp and http port

* Update .gitignore

* Move FileServer from `org.apollo.jagcached` → `org/apollo/jagcached`

* Tidy GameConstants & Add More Vars To ConfigLoader

* Organised Up GameConstants A Little To Separate ConfigLoader Vars From The Rest
* Added Some More Variables To Be Loaded Through The ConfigLoader

* Fix A Derp Caused By Laziness

* Add -c/-config arg to README.md

* Enable FileServer By Default

Co-authored-by: Danial <admin@redsparr0w.com>
2021-11-23 00:29:25 +00:00
Dark98 00932b82ee Woops Wrong Ports 2021-11-14 23:02:53 +00:00
Dark98 ccc0353bad Small Cleanup For World 2 Support
Calculate Port For World Based On World Number
Use Existing World int For World In Server
2021-11-14 22:58:29 +00:00
Dark98 45450dbb9c Start Setting Up Second World
Added World Number To Login Message
Added World Number To Login Interface
Made World 2 Listen On Different Port
Made Client Connect To 43597 For World 2
2021-11-12 02:57:31 +00:00
Dark98 ba7f84fc45 Only Print Loaded Plugins When Debug Enabled
(cherry picked from commit 2629186cc0)
2021-11-09 02:07:21 +00:00
Dark98 f30a936ff6 Revert "Update Client Title Logo"
woops this broke the cache
This reverts commit 97f1eb72e4.

(cherry picked from commit 7a2a6d362b)
2021-11-09 02:06:54 +00:00
Dark98 abe34d86b1 Add Plugins/Kotlin Support To Maven
(cherry picked from commit 546669ead0)
2021-11-09 02:06:49 +00:00
Danial d23b176a28 Make file server optional if cache already downloaded (#514)
(cherry picked from commit 669573c660)
2021-11-09 02:06:46 +00:00
Danial c1202e8989 Couple of fixups (#513)
* Show preference state

* Fixup multiple of the same item on the ground.

* Fixup combat

* Fixup yell, decrease delay

* Tidy up yell

* use jdk8

(cherry picked from commit 1fe76d739e)
2021-11-09 02:06:42 +00:00
dginovker 0e1edb79b6 Fix UNIX file path replace for plugins 2021-10-30 21:22:17 -04:00