2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Compare commits

base: 2006-Scape/2006Scape:1.04
Branches Tags
2006-Scape/2006Scape:master 2006-Scape/2006Scape:devcontainer 2006-Scape/2006Scape:dependabot/maven/2006Scape-Server/com.squareup.okio-okio-3.4.0 2006-Scape/2006Scape:dependabot/maven/2006Scape-Server/org.json-json-20230227 2006-Scape/2006Scape:dialogue-plugins 2006-Scape/2006Scape:dependabot/maven/2006Scape-Server/com.thoughtworks.xstream-xstream-1.4.19 2006-Scape/2006Scape:plugins_dialogue 2006-Scape/2006Scape:misc 2006-Scape/2006Scape:fix-running 2006-Scape/2006Scape:mrextremez-funstuff 2006-Scape/2006Scape:converitemdef 2006-Scape/2006Scape:fix_item_spawn_crash 2006-Scape/2006Scape:fix_music
2006-Scape/2006Scape:v1.10 2006-Scape/2006Scape:v1.09 2006-Scape/2006Scape:v1.08 2006-Scape/2006Scape:1.07 2006-Scape/2006Scape:1.06 2006-Scape/2006Scape:1.05 2006-Scape/2006Scape:1.04 2006-Scape/2006Scape:1.03 2006-Scape/2006Scape:1.02 2006-Scape/2006Scape:1.01 2006-Scape/2006Scape:2.00
...
compare: 2006-Scape/2006Scape:misc
Branches Tags
2006-Scape/2006Scape:devcontainer 2006-Scape/2006Scape:master 2006-Scape/2006Scape:dependabot/maven/2006Scape-Server/com.squareup.okio-okio-3.4.0 2006-Scape/2006Scape:dependabot/maven/2006Scape-Server/org.json-json-20230227 2006-Scape/2006Scape:dialogue-plugins 2006-Scape/2006Scape:dependabot/maven/2006Scape-Server/com.thoughtworks.xstream-xstream-1.4.19 2006-Scape/2006Scape:plugins_dialogue 2006-Scape/2006Scape:misc 2006-Scape/2006Scape:fix-running 2006-Scape/2006Scape:mrextremez-funstuff 2006-Scape/2006Scape:converitemdef 2006-Scape/2006Scape:fix_item_spawn_crash 2006-Scape/2006Scape:fix_music
2006-Scape/2006Scape:v1.10 2006-Scape/2006Scape:v1.09 2006-Scape/2006Scape:v1.08 2006-Scape/2006Scape:1.07 2006-Scape/2006Scape:1.06 2006-Scape/2006Scape:1.05 2006-Scape/2006Scape:1.04 2006-Scape/2006Scape:1.03 2006-Scape/2006Scape:1.02 2006-Scape/2006Scape:1.01 2006-Scape/2006Scape:2.00

351 Commits
1.04 ... misc

Author SHA1 Message Date
Dark98 f98de298c8 Properly Update Client Title Logo 
If The Cache Has Already Been Downloaded You Will Need To Delete It & Let The Client ReDownload It
 2021-11-01 01:17:52 +00:00
Dark98 2629186cc0 Only Print Loaded Plugins When Debug Enabled 2021-10-31 02:48:29 +00:00
Dark98 156d864bfd Update NPC Plugins Layout To Put Click Actions Per NPC Plugin 2021-10-31 02:42:38 +00:00
Dark98 7a2a6d362b Revert "Update Client Title Logo" 
woops this broke the cache
This reverts commit 97f1eb72e4.
 2021-10-31 02:18:19 +00:00
Dark98 546669ead0 Add Plugins/Kotlin Support To Maven 2021-10-31 02:03:21 +00:00
Danial 669573c660 Make file server optional if cache already downloaded (#514) 2021-10-31 01:53:47 +00:00
Danial 1fe76d739e 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
 2021-10-31 01:53:31 +00:00
Qweqker 6deaa4162a 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
 2021-10-31 01:53:15 +00:00
dginovker 0e1edb79b6 Fix UNIX file path replace for plugins 2021-10-30 21:22:17 -04:00
Dark98 97f1eb72e4 Update Client Title Logo 
If The Cache Has Already Been Downloaded You Will Need To Delete It & Let The Client ReDownload It
 2021-10-28 22:41:19 +01:00
Josh Shippam c2f325b4e7 Plugins Fixup / Conversion(#511) 
* Server: Ripped PluginService From Astreaus-V2

This Removes The Need For Plugin MetaData

* Plugins: Handle Emote Tab Run Buttons

* Add Some Settings Button Plugins

Brightness Buttons
Music Volume Buttons
Walk/Run Buttons
Toggle SplitPrivate-Chat

* Fix Player Still Running With 0 Energy

Fixes Players Continuing To Run For The Rest Of Their Current Movement Task Even If They Run Out Of Energy
 2021-10-26 04:47:33 +01:00
Josh Shippam 7d64e2298f Plugins System (#510) 
* Started Ripping Plugin System From Astraeus

*Currently only ClickingButtons Support
*Also Started Using The Logout Button Plugin From Astraeus

* NpcFirstClickEvent setup for plugins

also made Man & Women chat work through this

* Server: Add Google Collect Lib

* Server: NpcSecondClickEvent setup for plugins

also handle pickpocketing npc clicking through plugin

* Server: NpcThirdClickEvent setup for plugins

* Server: Remove conflicting action for Secondclicking npc id 3

* Server: ItemFirstClickEvent setup for plugins

Also Handle Yo-Yo First Click Through This

* Server: ItemOnItemEvent setup for plugins

Also Handle Black Candle Lighting With Tinderbox Through this

* Server: ItemOnNpcEvent setup for plugins

* Server: ItemOnObjectEvent setup for plugins

Also Handle Fillable Items Through This

* Server: ItemSecondClickEvent & ItemThirdClickEvent setup for plugins

Also Handle Yo-Yo Actions Through This

* Server: ObjectFirstClickEvent setup for plugins

Also Handle FirstClick Mining Actions Through This

* Server: ObjectSecondClickEvent setup for plugins

Also Handle Stall Thieving Actions Through This

* Server: ObjectThirdClickEvent setup for plugins

* Server: ObjectFourthClickEvent setup for plugins

Also Handle Fourth Click Farming Object Actions Through This

* Server: MagicOnItemEvent setup for plugins

Also Handle SuperHeat Through This

* More mage training arena (#509)

* Fixup points display

* Only allow players to deposit up to 12k at one time

* Apple damage and play animation

* Update order or prices

* Update Telekinetic.java

(cherry picked from commit ab3b1e9731)

Co-authored-by: RedSparr0w <RedSparr0w@users.noreply.github.com>
Co-authored-by: Danial <admin@redsparr0w.com>
 2021-10-09 00:20:57 +01:00
Dark98 a693615e2e Server:JavaCord: Allow Displaying PlayerCount Or Server Website 2021-10-06 02:46:48 +01:00
Danial ab3b1e9731 More mage training arena (#509) 
* Fixup points display

* Only allow players to deposit up to 12k at one time

* Apple damage and play animation

* Update order or prices

* Update Telekinetic.java
 2021-10-06 02:22:42 +01:00
Danial 2d8ae82086 Telekinetic grab and stuff (#508) 
* tidy up

* Tidy up check for space

* Telekinetic base

* Don't allow player to pickup statue

* Tidy up item pickup

* fixup, statue spawn

* Update telekinetic grab

* 2nd option for guardian statue

* handle telegrab on statue

* Allow picking up global drops with telekinetic grab

* Check if player can see/reach item

* Update PickupItem.java

* Allow pasting into chatbox

* camera stuff

* fixup clipboard stuff

* Update PlayerAssistant.java

* Update Commands.java

* Add mazes initial

* Tidy up the clipboard pasting

* Update mazes

* Calculate new position of statue

* fixup telegrab

* More tidy up, remove constant running of container

* more tidy up..

* Handle moving statues

* remove the statue from global drops

* Update MagicOnFloorItems.java

* Show telekinetic interface

* Make public accessable

* Only show items to player that are on the same height level

* Moving statues around, Spawning

* Reward exp, points, law runes

* Show points, mazes completed

* Add comment

* Add observable statue (still needs work)

* Fixup where camera focuses

* Load items when player changes level

* Graveyard base

* Add a couple more checks

* Update Player.java

* Update Commands.java

* Make sure statue is visible when player appears at maze

* [Mage training arena] Graveyard

* Update MageTrainingArena.java

* Update MageTrainingArena.java

* Update ItemHandler.java
 2021-10-05 04:01:16 +01:00
Danial c526aa5f4d [Mage Training Arena] Enchanting, and some other stuff (#507) 
* Handle some more stairs...

* Remove message sent to player

* Bolts/Tips making

* Tidy up

* Free alchs occasionally within training arena

* [Mage Training Arena] Enchanting

* Remove enchanting room specific items when leaving area
 2021-10-02 17:38:45 +00:00
Danial 865ef4ed29 Process client arguments, Auto login option (#506) 
* Process client arguments, Auto login

1st argument = server IP
2nd argument = username
3rd argument = password

* Simplify

* Fixup server XP rate
 2021-10-02 17:38:17 +00:00
Danial bbe1587e20 Mage Training Arena and stuff (#504) 
* Fixup door/stairs in mage training arena

* Fixup bedsheets, should be worn on head, not weapon slot

* [Mage Training Arena] spawn rewards guardian

* [Mage Training Arena] Add arena teleports (non functioning)

* Just adding some comments

* [Mage Training Arena] Basic mage training arena stuff

* [Mage Training Arena] Allow shop to open and show items correctly

* [Mage Training Arena] Show shop prices when clicked

* noclip

* [Mage Training Arena] Add 2nd option handler (filler)

* [Mage Training Arena] Be able to purchase stuff, lock bones to peaches

* Update MageArena.java

* [Mage Training Arena] setup boundary

* Readability

* Tidy up enchanting

* MageArena -> MageTrainingArena

* Create Alchemy.java

* Update RSInterface.java

* [Mage Training Arena] Spawn entrance npcs

* [Mage Training Arena] Initial Alchemy

* [Mage Training Arena]  Add comments

* [Mage Training Arena] Handle alchemy while in arena

* [Mage Training Arena] Show interface for alchemy room

* [Mage Training Arena] Display values, Search cupboards

* [Mage Training Arena] Don't allow the player to wear items from the Alchemy game

* [Mage Training Arena] Announce when items are changing

* Don't allow the player to bring any coins with them

* Sort by values

* [Mage Training Arena] Allow alching items etc

* Update method name

* Show magic tab after using alch even if can't alch

* [Mage Training Arena] Coin collector - temp

* [Mage Training Arena] Give player points, take items, add bonus xp, add bank items

* [Mage Training Arena] Remove items when player leaves the alchemy training area

* Fixup staffs for runes, Tidy up checks

Was missing all Mystic staff
 2021-09-30 22:25:48 +01:00
Danial 8589277ece Implement Party Room, A bunch of client side changes, Other stuff (#503) 
* Fixup Discord links

* Fix required level to chop Dramen tree

* More Discord link fixes

* Show bots as (store)

* Fixup port

move to port 8080 as used by file server

* Fixup report handler

* Some client changes

* minor changes

Show mod status

* Show item value on ground

* Mark stores and players differently on mini map

* Some tidy up

* default to world 1

* Update trade with text

* revert nodeID changes

* Update RS Guide name

* Remove some command aliases

* Log bots and players differently

* Fixup

* minor changes

* Fixup colors

* Update RSInterface.java

* Settings for controlling options

* Add memory command

* Update server skill magic numbers

* Update server skill magic numbers

* Update colors for ground item text

* Update .gitignore

* Update player health value more often

* Add in game item/NPC/object search

* Item amounts and value displayed

* Update examine text

* Start with volume off

* Fixup tab 7 still showing with other interfaces

* Fixup search

* Fixup entering numbers after letter in amounts

* minor fixup

* fix indentation

* change type of value

* Fixup values shown

* Fix when clicking while tab 7 open

* Fixup negative amounts

* Update some method names

* Fixup method name

* tidy up method values

* Initial move for overlays

* Update more method names, variables

* Update debug menu

* Update experience info area

* Update Signlink.java

* more refactoring/deob

* Tidy up

* refresh skills

* Update method name, debug display

* fixup

* Show wrench icon on custom settings tab

* alignment

* Modify zoom

* Use smaller numbers for exp/h

* Update interface command

* tidy up

* Fixup tele location

* Fixup if interface doesn't exist

* Add some interface options

* Update checks

* Open bank interface for item search

TODO:
change title
maybe not display in chat
change options for items?
change command to searchitem - open the bank interface, open a text input interface

* re-fix

* Show open interface ID

* Update bank string shown

* Update search function

* Scroll zooming

* Only fill chat with search if not searching for an item

* add comments

* Change system update message

* Remove fps command

* Increase draw distance

* fixup

* Draw distance option

* [Party Room] Fix party room stairs

* Add new free slots method to check for stackable items counting as a free slot

* [Party Room] Deposit/Withdraw items all working

* [Party Room] Fully working

* [Party Room] Don't spawn balloons on the table

Players cannot pickup the items

* Fixup boundary

* Drop items in random amounts up to 4 stacks

* Update swampy boat to work

* Minor fixup

* Update Game.java

* Move player name up slightly

* Update some naming

* Tidy up

* Add ectoplasm agility shortcuts

* Update ObjectsActions.java

* Ectofuntus stuff

* fixup

* Ectofuntus bone grinder get status

* auto worship

* Allow claiming ecto-tokens

* change variable

* fixup

* Make use of GameConstants.WORLD

* Randomize bot passwords

* Don't show player shops as online

* Update opening oysters

* Update GemCutting.java

* Dragontooth island transport

* Ectofuntus stuff

* More constants

* Bill teach travel to Mos Le'Harmless and back

Also able to explore the whole ship

* Use better looking buttons

* Update .gitignore
 2021-09-28 23:40:34 +01:00
Danial d30e833dd8 Update server skill magic numbers (#502) 2021-09-23 08:34:58 -04:00
Danial 06b509c4d0 Update how player shop is handled (#501) 
* Update how player shop is handled

* Squashed commit of the following:

commit 5be0778dc9
Author: Danial <admin@redsparr0w.com>
Date:   Sun Sep 19 14:24:12 2021 +1200

    minor fixup

commit ef3b63b54f
Author: Danial <admin@redsparr0w.com>
Date:   Sun Sep 19 14:11:27 2021 +1200

    Add docker compose file for running servers in containers

* Update DialogueHandler.java

* Fix for models out of bounds

* Revert "Squashed commit of the following:"

This reverts commit d27d3c357c.

* Other shop tidy up

Show shops as combat level 0
Remove items from shop when shop logs off
 2021-09-20 13:18:40 +01:00
Danial 8cceeeddd4 Add docker compose file for running servers in containers (#500) 
* Add docker compose file for running servers in containers

* minor fixup
 2021-09-19 18:06:16 +00:00
Daniel Ginovker d7f0ce9877 Create LICENSE 2021-08-27 12:04:20 -04:00
dependabot[bot] 2f020a9688 Bump jackson-databind from 2.10.1 to 2.10.5.1 in /2006Scape Server (#479) 
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.10.1 to 2.10.5.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-06-13 23:48:23 +01:00
dependabot[bot] 84332d7851 Bump xstream from 1.4.10-java7 to 1.4.17 in /2006Scape file_server (#496) 
Bumps [xstream](https://github.com/x-stream/xstream) from 1.4.10-java7 to 1.4.17.
- [Release notes](https://github.com/x-stream/xstream/releases)
- [Commits](https://github.com/x-stream/xstream/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-06-13 23:48:07 +01:00
dependabot[bot] fddf797bf1 Merge pull request #497 
* Bump xstream from 1.4.11.1 to 1.4.17 in /2006Scape Server
 2021-06-13 23:47:06 +01:00
Dark98 ace41cddb0 Server: Use JavaCord 3.1.1 2021-06-13 23:28:09 +01:00
coco-bandicoot 3f2295a4d3 Food Update: All stews, gnomish foods, and some misc foods/drinks (#494) 
- Adds all stew food items to the Food class

- Adds all gnomish food items(including the premade ones!) to the Food class

- Added Fruit Blast and Pineapple Punch (including premade versions) to the Food class (the rest boost stats like beers/pots so did not add)

- Added Rabbit, Ugthanki meat, Roast Bird meat, Thin Snail meat, Spider on stick, Spider on shaft, Roast Rabbit, Lean snail meat, Roast beast meat, Fat snail meat, Cooked slimy eel, Cooked chompy, Cooked fishcake, Rainbow fish, Cave eel, Cooked jubbly, Lava eel, Banana stew and Chocolatey milk to the Food class

- Chocolate bomb unique eat text

- "It heals some health." text added to default food items without unique eating text
 2021-05-13 13:16:37 +01:00
Jeremy e1fde5c1d3 Replace get npc name associate array method to indexed array method (#493) 2021-04-23 17:03:04 +01:00
Olivier 48d7b09bdd Easter Event + Ectotokens (#492) 
* New NPC Spawns for Port Phasmatys

Added most NPCs in Port Phasmatys including the ghost villagers, sailors, guards, Robin, Ak-Haranu, and more.

* ObjectActions for Ectofuntus and Energy Barrier

The Ectofuntus is now fully accessible and Port Phasmatys can be accessed through the energy barrier.

* Added Ak-Haranu's Exotic Shop

Ak-Haranu now sells Bolt Racks.

* Fixed Ectofuntus Worship

Fixed minor issue with Ectofuntus Worship

* Gravingas Exclamations

Gravingas exclaims different messages while protesting Necrovarus in Port Phasmatys.

* Easter Event Updates

- Added Easter Bunny
- Added temporary Easter Quest
- Added Dialogues between player and Easter Bunny
- Added player save data for Ecto-tokens (Port Phasmatys) and data for the easter event (easterEvent)

* Delete .DS_Store

* Delete .DS_Store

* Delete .DS_Store

* Adding DS_Store to .gitignore
 2021-04-06 18:51:04 +01:00
dark98 7261568e2d Added Player Morphing to Ring Of Stone & Easter Ring 2021-04-02 23:01:48 +01:00
Olivier d5b74825d4 Port Phasmatys Update I (#485) 
* New NPC Spawns for Port Phasmatys

Added most NPCs in Port Phasmatys including the ghost villagers, sailors, guards, Robin, Ak-Haranu, and more.

* ObjectActions for Ectofuntus and Energy Barrier

The Ectofuntus is now fully accessible and Port Phasmatys can be accessed through the energy barrier.

* Added Ak-Haranu's Exotic Shop

Ak-Haranu now sells Bolt Racks.

* Fixed Ectofuntus Worship

Fixed minor issue with Ectofuntus Worship

* Gravingas Exclamations

Gravingas exclaims different messages while protesting Necrovarus in Port Phasmatys.
 2021-03-31 00:57:35 +01:00
Nathan Aclander a52832348a Fix typo pointing to incorrect Client dir (#481) 2021-03-16 12:41:59 +00:00
dark98 22db0c22f4 Add a toggle for Total Characters Registered kn Website 2021-03-15 23:45:38 +00:00
dark98 3bf473129d Rename & Repackage 2021-03-11 00:30:16 +00:00
dark98 caa4625efa Ignore Build Jars 2021-03-10 22:53:32 +00:00
Josh Shippam 5da2ebcffe Update README.md 2021-03-08 03:21:58 +00:00
Olivier f22b9553c6 Added Random Dialogue for Man and Woman NPCs (#476) 
* Update DialogueHandler.java

* Update NpcActions.java

* Update DialogueHandler.java
 2021-02-15 11:17:51 -05:00
Nick Gal 440a559c64 Fix gem check being rolled twice. (#474) 2021-02-05 18:25:46 -05:00
Olivier b65ab89a53 Dialogue Action for High Priest (#471) 
- Added Dialogue Action for High Priest (Entrana)
 2021-02-05 18:25:25 -05:00
Nick Gal 15ab625349 Fix bug where leveling up while Smelting would consume ores. (#473) 
* Fix bug where leveling up while Smelting would consume ores.

* Making sending message before adding skill xp more consistent.
If you level up while smelting iron, playerSkillProp[13] gets cleared and getItemName will fallback to Unarmed
 2021-02-03 20:32:34 -05:00
Nick Gal fa167bacd3 Fix call to NpcAggressive.isAggressive (#472) 2021-01-29 01:43:30 -05:00
Olivier 12951be954 Added Lost City Dialogues + Entrana Dialogues (#470) 
Added Dialogue for the following NPCs
- High Priest (Entrana)
- Warrior, Wizard, Monk and Archer (Lost City)
- Shamus (Lost City)
 2020-12-31 16:06:07 -05:00
Daniel Ginovker 2a4d7ebd22 Create second dialogue (#469) 
* Add fix for maven encoding on Linux machines

* Fix dialoguehandler length
 2020-12-31 13:52:44 -05:00
Olivier 4ff45dd6c5 Added Npcs on Entrana (#468) 
- Added Fishing Spots
- Added High Priest
- Added Monks
- Added Firebird of Entrana
- Added Chickens
 2020-12-31 12:59:14 -05:00
Olivier efb450fc60 Added GFX for Dark Wizard Spell (#466) 
Dark Wizards now cast the correct spell
 2020-12-30 22:02:54 -05:00
Olivier aca32c72c5 Added Level Up Songs (#465) 
- Each skill has a corresponding level up song
- Some skills (Attack, Magic, Cooking) have multiple level up songs (Milestones like 99 or 10, 20, 30 etc.)
 2020-12-30 22:02:47 -05:00
Olivier 6bbf8f1b09 Added SFX for Dark Wizard (#467) 
-Adds block sound and attack sound for wizards
 2020-12-30 22:02:09 -05:00
Olivier 108af403d8 Combat Sound Fixes (#462) 
* Combat Sound Fixes

- Added all sounds for chickens
- Added proper sounds for sword and dagger
- Added some sounds for thief and farmer
- Fixed dds sound effect

* Update CombatSounds.java
 2020-12-30 13:06:36 -05:00
Olivier f5306da6e4 Fixed Player Unarmed Animations (#463) 
- Player now correctly blocks attacks when unarmed
- Player now has correct animations for all fight modes
 2020-12-30 13:06:18 -05:00
Olivier 5559d10037 Added Death Song (#464) 
- Plays the death song when you respawn after dying
 2020-12-30 13:06:06 -05:00
Arisu c0b33add46 Fixed firemaking log duplication & deletion (#456) 2020-12-29 12:15:26 -05:00
Olivier af98c46371 Added Animations for Guard NPC (#459) 
Guard NPC now has proper animations..
 2020-12-29 11:58:56 -05:00
Arisu 90b36be5ae Fixed users being able to make blank passwords (#458) 2020-12-29 11:58:37 -05:00
Arisu 3ade7141a6 Fixed wrong smelting response when trading & made full iron helm use 2 bars (#457) 2020-12-29 11:58:24 -05:00
Arisu 6040241343 Added cheese and tomato to consumables (#455) 2020-12-29 11:56:26 -05:00
Olivier 39096c403d Re: Guard SFX (#461) 
Added SFX for Guard attack and block
 2020-12-29 11:56:05 -05:00
Olivier 3b74dd2a0c Added SFX when player takes damage (#454) 
Player makes sound when he takes damage
 2020-12-28 15:36:01 -05:00
Olivier 27c6c91fcb Fixed SFX for Unarmed Melee (#453) 
Fixed a glitch where the player would make a strange axe sound instead of the actual punch/kick sound.
 2020-12-28 15:35:27 -05:00
Olivier ca36e516ad Added PNPC Command for Admins (#449) 
- Admins can now turn into NPCs using the following commands "playnpc" or "pnpc".
 2020-12-18 08:41:12 -05:00
Olivier 8819a0b9f9 NPC Interaction (lostCity) (#445) 
- Players can now properly interact with Monk, Archer, Wizard and Warrior
- Player can now interact with Shamus
 2020-12-17 09:01:22 -05:00
Olivier e524b2fa0b Added Dialogue Options (lostCity) (#446) 
- Added Dialogue Options for Warrior and Shamus
 2020-12-17 09:00:58 -05:00
Mr Extremez ec7a4b0b74 Quick fix for monkey gree gree's (#447) 2020-12-17 09:00:31 -05:00
Daniel Ginovker 953419b33a Add fix for maven encoding on Linux machines (#448) 2020-12-17 08:55:02 -05:00
Olivier 3065b682e3 Lost City Progress Saves (#443) 
- Added lostCity to playersave.java
 2020-12-16 15:10:14 -05:00
JohnsonMichaels123 2e1ad6c205 Populated Taverley (Kaqemeex, Sanfew and Druids) (#442) 
- Druids now spawn all around Taverley
- Kaqemeex spawns at the Druidic Circle (Druidic Ritual Quest)
- Sanfew spawn near Herblore Shop (Druidic Ritual Quest)
 2020-12-15 15:09:43 -05:00
JohnsonMichaels123 93b811bcaa Lost City Required for Dragon Longsword / Dagger (#441) 
- Lost City completion is required to equip dragon longsword and dragon dagger
 2020-12-15 08:00:33 -05:00
JohnsonMichaels123 06ae65534c Added Quest Completion Condition for Lost City (#440) 
- Teleporting through Lumbridge Swamp Shed completes Lost City
- Reward is given (3QP + Access to Zanaris)
 2020-12-15 08:00:05 -05:00
JohnsonMichaels123 59b9dbf460 Updated Actions for Spirit Tree and Leprechaun (#435) 
- Leprechaun spawns at tree w/ sfx and quest conditions
- Tree Spirit spawns at tree w/ sfx and quest conditions
 2020-12-14 15:33:38 -05:00
JohnsonMichaels123 252171c209 Added integer for leprechaunSpawned (lostCity) (#436) 
- An integer checks if leprechaun is spawned (Lost City)
 2020-12-14 15:25:02 -05:00
JohnsonMichaels123 169602b62b Updated Lost City Progression and Max Quest Points (#437) 
- Lost City progression can be opened
- Changed Max Quest Points
 2020-12-14 15:24:48 -05:00
dginovker b718346b4a Move Lostcity to correct loc 2020-12-14 15:22:11 -05:00
dginovker 0cba36b2f7 Merge branch 'master' of https://github.com/2006rebotted/2006rebotted 2020-12-14 15:21:21 -05:00
Daniel Ginovker 0c94fbedc8 Add Jognson's Lost City (#434) 2020-12-13 19:22:42 -05:00
dginovker 5ef14d6a9d Add Jognson's Lost City 2020-12-13 19:21:54 -05:00
JohnsonMichaels123 aa57744d2a Lost City Rewards Added (#433) 
Lost City Reward gives the player 3 quest points and access to Zanaris.
 2020-12-13 18:27:24 -05:00
JohnsonMichaels123 38b4dbcf00 Level Up Fireworks GFX (#429) 
When player levels up, makes the fireworks effect.
 2020-12-13 15:56:24 -05:00
JohnsonMichaels123 aea9ebbf0e Added NPCs for Lost City Quest (#430) 
Added NPCs Monk, Wizard, Archer and Warrior west of Lumbridge swamp for quest "Lost City".
 2020-12-13 15:56:15 -05:00
JohnsonMichaels123 f9bc9d2dff Lost City Value for Quest Progression (#431) 
Added an int to store the progression of Lost City (lostCity).
 2020-12-13 15:55:59 -05:00
JohnsonMichaels123 935a172b68 Fixed Rasolo The Merchant's Shop (#432) 
Fixed an issue where Rasolo the Merchant would open up the Fishing Guild Shop instead of his own.
 2020-12-13 15:55:45 -05:00
JohnsonMichaels123 d3146dffb5 Spade Animation / SFX (#428) 
- Spade now plays animation and sound.
 2020-12-13 15:55:26 -05:00
JohnsonMichaels123 c239af25ad Sound Effects for Protection Prayers (#427) 
- Adds Sound Effects for Protection Prayers
- Adds Sound Effect when Protection Prayers are disabled
 2020-12-11 08:29:03 -05:00
JohnsonMichaels123 34ec942adc Song when player levels up a skill (#426) 
Just plays a short song when a player levels up his skill.
 2020-12-11 08:28:13 -05:00
Daniel Ginovker dcf09b2a41 Fixcrashesnov2020 (#425) 
* Trycatch Discord Activity

* Another exception catch
 2020-11-17 21:51:16 -05:00
Daniel Ginovker 09437f5b4e Trycatch Discord Activity (#424) 2020-11-17 21:37:08 -05:00
Josh Shippam e3b98a53c0 Welcome Interface Fixup (#421) 
Fixed last logged in from IP
Various other changes/fixes
 2020-11-09 14:34:36 -05:00
Peter Farber ebd55e6e8d Mining Fixes | Yell Command Fix (#420) 
* Fixed Yell Command

* Added Mining Sounds. Fixed Addy and Mith Pickages.
 2020-09-29 11:57:10 -04:00
Daniel Ginovker dbb96f1257 Revert "[BUGFIX] Running in 1-tick (#414)" (#419) 
This reverts commit 605a434edf.
 2020-09-04 20:14:44 -04:00
dginovker 64b422adeb Fix for bootleg fix 2020-09-04 09:01:36 -04:00
dginovker fd0bfda8a7 Bootleg fix for NPC aggro crash 2020-09-04 08:57:03 -04:00
Daniel Ginovker 9011688d2a Update README.md 2020-09-01 10:30:02 -04:00
Sandro Coutinho 8a6cf6f1ae [FEATURE] Data will now use json (#417) 
* [FEATURE] Item data is now loaded from json

* [TASK] Renamed the old method into it's new use

* [TASK] Removed unused code

* [FEATURE] Added some more json's

* [CLEANUP] Code cleanup

* [FEATURE] NPC drops are now in json

* [CLEANUP] Removed testing class
 2020-08-13 12:50:04 -04:00
Sandro Coutinho 09343c6a8c [BUGFIX] Al-Kharid & Shantay Pass banks, fixed waterskins (4) (#418) 2020-08-09 19:45:16 -04:00
Daniel Ginovker d9c91bb616 Make it build all submodules, not just server 2020-08-05 14:27:53 -04:00
Sandro Coutinho 0e63e0fa4e Npc aggression fix (#416) 
* [BUGFIX] Running in 1-tick

* [BUGFIX] Fixed NPC Aggression
 2020-08-04 20:04:57 -04:00
Daniel Ginovker dc397ba8d4 Create maven.yml 2020-08-04 19:44:22 -04:00
dependabot[bot] 057e92300f Bump mysql-connector-java in /2006Redone file_server (#413) 
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.23 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.23...8.0.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-04 19:22:22 -04:00
dependabot[bot] 9facf855a1 Bump xstream from 1.4.1 to 1.4.10-java7 in /2006Redone file_server (#412) 
Bumps [xstream](https://github.com/x-stream/xstream) from 1.4.1 to 1.4.10-java7.
- [Release notes](https://github.com/x-stream/xstream/releases)
- [Commits](https://github.com/x-stream/xstream/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-04 19:22:16 -04:00
Daniel Ginovker 4bd24204fc Update client IP (#415) 2020-08-04 19:21:34 -04:00
Sandro Coutinho 605a434edf [BUGFIX] Running in 1-tick (#414) 2020-08-04 18:50:08 -04:00
Daniel Ginovker e10ad156a9 Update README.md 2020-08-04 18:11:00 -04:00
Daniel Ginovker eebc60084f Make project setup easier with Maven (#411) 
* Remove a bunch of .ideas and class files to see if it makes the setup easier

* remove some .idea's and imkls

* Remove a ton of .class files

* [TASK] Switched to maven instead of gradle

* [TASK] Added target to gitignore

* Remove ignored files

* [TASK] Fixed file_server source

* [TASK] Fixed client source

* [BUGFIX] Main Class

* [BUGFIX] Fixed SLF4J

* [TASK] Server Libs cleanup

* Update setup guide/debug

* Maven cli compile instructions

* [TASK] Jar building

* Update runServer and runFileServer.sh

Co-authored-by: Sandro Coutinho <sandro@farrelltech.org>
 2020-08-04 17:57:19 -04:00
Daniel Ginovker 6684364b64 Fix passing through gate to training grounds + make ::shop bots tele to current loc first try (#410) 2020-08-04 13:27:24 -04:00
Daniel Ginovker d2e8945578 Fix old player shops not appearing (#409) 
* Add check that players are over total level 50, but shop items check is broken

* Bots now only appear when they meet reqs! Woot!

* Fix old bots not appearing
 2020-08-03 13:59:02 -04:00
Daniel Ginovker 1a911f1ad0 Non-spammy player shops (#407) 
* Add check that players are over total level 50, but shop items check is broken

* Bots now only appear when they meet reqs! Woot!
 2020-08-03 13:28:43 -04:00
Daniel Ginovker 707783552f Make ::players show everyone, even for non-mods (#406) 2020-08-03 11:05:45 -04:00
Daniel Ginovker c1df673033 Make bots stay after restart (#405) 2020-08-03 10:52:16 -04:00
Damion 6085111d7c Region factory (#404) 
* Split region loading and object population to factory class

* Implement changes, disable CommandConsole

* You guys don't omit /build/
 2020-06-16 21:43:41 -04:00
Daniel Ginovker 5725a64abc Add gameplay image 2020-06-11 20:44:56 -04:00
Josh Shippam cd690fe31d Misc Fixes (#403) 
* Fixed Ghostly Cape Equipping in Cape Slot

* Fixed Jumping Out Of Varrock Lumber Yard

* Changed All Quests To addOrDropItem

* Fixed Right Click in Java 10
 2020-05-22 20:57:31 -04:00
Mr Extremez af578c400a Few small changes (#402) 
- Fixed dragon battleaxe special
- Fixed banks in canifis and al kharid
- Added battlestaff enchanting
- Made fight caves entrance spawn at correct coords
- Did some small cleanup
 2020-05-07 18:34:51 -04:00
dginovker 3387cd5f07 Fix conflicts 2020-05-07 18:33:56 -04:00
Mr Extremez b4371d3129 A few things (#401) 
- Can't attack players or npcs through doors/walls anymore
- Cleaned up a few small bits of code
- Added a few new boundaries to the boundary system
- Removed dialogue asking are you sure you want to empty your inventory for admins
 2020-04-10 20:03:28 -04:00
Mr Extremez 43f4b14dbf Various thing (#400) 
- Nearly perfected fight caves now (should fix wave spawning, some dialogue bugs, instance issues)
- Added fully working monkey gree grees
- Fixed somes skill interface typos
- Added ability to dye goblin mails
- Fixed restless ghost quest interface typo
- Clarified herb cleaning required level message
 2020-03-24 13:46:01 -04:00
dginovker a55a0fdefb latest compile 2020-03-18 10:05:56 -04:00
Mr Extremez 774d05f1e3 Update ItemData.java (#399) 
Should fix the bank note bug hopefully
 2020-03-18 10:02:02 -04:00
dginovker a9afe18014 Latest server compile 2020-03-13 20:53:10 -04:00
Mr Extremez 5706bc9853 Some quick patches (#398) 
- Bank all should now work for all items again
- Fixed al kharid gate not functioning
- Added unique cabbage pickable for Falador
- Fixed desert disguise wrongly being noted
- Reformatted some of the food code

Closes #397
Closes #395

(I also included @Qweqker changes so that will fix lumbridge bank boundary and adds his new cabbage effect)

Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
 2020-03-13 20:36:20 -04:00
Qweqker f9a9eae356 Bank Adjustment, Cabbage Patch (Pun intended) (#396) 
* Added Cabbage ID for the cabbage that is supposed to spawn south of falador
Moved unique food dialogue inside the text handler to avoid duplicate messages
Added unique message for south of falador cabbage

* Adjusted Lumbridge Bank Boundary

Co-authored-by: Qweqker <qweqker@mail.com>
 2020-03-13 20:33:52 -04:00
dginovker 801525fb0c update website urls 2020-03-12 19:42:04 -04:00
Mr Extremez cb65d89297 Update (#394) 
Closes #393
- Sophanem city gates now functioning
Closes #392
- Improved rug travel, added missing travel options
Closes #391
- Added those curtains, along with many more curtains and other functional objects
Closes #390
- Dramen branch now untradeable/same with staff
Closes #389
- Lumbridge door should no longer get stuck, should fix other doors aswell
Closes #388
- Added Rasolo npc spawn
Closes #385
- Added missing fishing guild spawns
Closes #384
- Added missing port khazard npcs and a few other missing npcs too
Closes #379
- Added smelt x option
Closes #334
- Fixed dragon dagger store price and fixed high alch/low alch value for it
Closes #278
- Fixed strange numbers on runecrafting interface
Closes #244
-These were previously fixed

Also included:
- Added recieving random gems when mining (thanks to ben for pointing this out)
- Reduced door usage delay
- Random cleanup and deleted some unsued files/code
- Fixed many npc item drop names (thanks to iizyy for pointing them out)
- Fixed a few wizard tower doors
- Did more cleanup with the some of the old boundary methods
- Tidied up the discord commands and added the proper urls for them
 2020-03-12 19:13:22 -04:00
Qweqker db58bc868b Player Death and Level Up Sounds, Cutscene Support (#383) 
* Added Player death Sound
Added a ton of Level Up Sounds (Some I do not know)

* Added command to play "quicksongs"

* adjusted chat message to properly name the command

* Added Camera functionality for cutscenes
Added Camera shake functionality for cutscenes/barrows/anything else
Added Camera reset functionality to return the player to the normal player view
Added some details on what each added method does
Refactored some of the method names for uniformity

* Added some commands to test the cutscene/camera features that were added in PlayerAssistant.java

Co-authored-by: Qweqker <qweqker@mail.com>
Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
 2020-03-06 18:53:53 -05:00
Mr Extremez e5799200d7 A few things (#382) 
- Added a distance check for item on object packet
- Added cook x functionality
- Removed a fair amount of dead code
- Did some renaming and fixed some typos
- Cleaned up a lot of the smithing code
- Added a new boundary system to reduce code clutter
- Fixed a firemaking bug
 2020-03-06 18:52:10 -05:00
nocommento 804ceae886 Fix for issue #364 - staffs are now supported when enchanting jewellery (#381) 
* Added staff support when enchanting (issue #364)

* Added staff support when enchanting (issue #364)
 2020-02-28 17:51:05 -05:00
Daniel Ginovker 174bdf5bfd Make farming not nuke & latest build (#378) 
* Farming Skill, Orb Charging, Battle Staff Creation, etc

- Farming Skill Added
- Orb charging implemented
- Battle staff creation implemented
- Cleaned up some code
- Stuck command will now tele you from further out in wildy if you are not in combat
- Fixed an issue with amulet of glory
- Added forcechats for npcs at Gnome Agility Course, and for Cows, Ducks and Sheeps just like in actual osrs
- Added base for God Book preaching

* Remove setting farm level to 1

* Fix runServer.sh, patch farming skill nuke and latest build :)

Co-authored-by: Mr Extremez <aeggers90@hotmail.com>
 2020-02-19 08:46:42 -05:00
Mr Extremez ef6968b283 Farming Skill, Orb Charging, Battle Staff Creation, etc (#377) 
- Farming Skill Added
- Orb charging implemented
- Battle staff creation implemented
- Cleaned up some code
- Stuck command will now tele you from further out in wildy if you are not in combat
- Fixed an issue with amulet of glory
- Added forcechats for npcs at Gnome Agility Course, and for Cows, Ducks and Sheeps just like in actual osrs
- Added base for God Book preaching
 2020-02-19 08:46:00 -05:00
Damion 9b220ec47c Implemented Command Processor (#375) 
* Added CommandConsole and CommandProcessor Interface

* Added two commands, ListPlayers and Stop

* Registered commands with CommandConsole

* Added request for console from main.

Made help prompt not print after requesting help...

* Moved some files around

You didn't see anything

* Bug fix

* swap `break;` for `continue;`

* *cough* bug fix
 2020-02-15 13:47:56 -05:00
Danial 02c7c30582 Misc changes (#376) 
* Allow shop spawn anywhere if develop account + misc

* update client

* Update localhost client

* fixup
 2020-02-14 07:57:26 -05:00
dginovker 34a1fe0e04 Merge branch 'mrextremez-newchanges' 2020-02-11 20:01:37 -05:00
dginovker 56e2c43251 New setup instructions + server jar 2020-02-11 19:59:49 -05:00
dginovker dc4edd3c32 Easier setup 2020-02-11 19:59:47 -05:00
dbrownidau 73da47ad18 Move shutdown call outside for loop. 2020-02-11 19:59:47 -05:00
dbrownidau 71256292eb Added block on main thread until tick scheduler shutdown. 2020-02-11 19:59:47 -05:00
dbrownidau 91c0da9932 Fix doco 2020-02-11 19:59:46 -05:00
dbrownidau 2dee7d2d2b Adjust formatting 2020-02-11 19:59:46 -05:00
dbrownidau 20568c8aaf Synchronization lock not required for scheduleAtFixedRate(new Runnable(){}) https://stackoverflow.com/a/35498230 2020-02-11 19:59:46 -05:00
dbrownidau 5faa526cf2 Moved main loop into FixedRate scheduler. Added sync lock on runnable. 2020-02-11 19:59:46 -05:00
dginovker c4160a3eba New setup instructions + server jar 2020-02-11 19:47:39 -05:00
dginovker 4a134a819e Easier setup 2020-02-11 18:53:00 -05:00
dginovker 95cdf3a029 Merge branch 'dbrownidau-fixedratetickloop' 2020-02-11 18:26:22 -05:00
dginovker e20cf57adf Merge branch 'fixedratetickloop' of https://github.com/dbrownidau/2006rebotted into dbrownidau-fixedratetickloop 2020-02-11 18:24:45 -05:00
Mr Extremez 217f341d7d quick 
- removed some extra warnings lol
 2020-02-10 00:42:02 -06:00
Mr Extremez 5ab79b1128 Range/Specials/Clean up 
- Added correct range distance for all range weapons
- Fixed whip special attack when using on npcs
- Removed some warnings
- Refactored combat some
- Fixed a few typos
- Deleted some dead code
- Fixed bug where you could kill players with auto retaliate outside of the wilderness if you were already fighting them when they ran out

Closes #146
Closes #352

Also from a previous patch
Closes #329
 2020-02-10 00:40:21 -06:00
dbrownidau 1d95da80b7 Move shutdown call outside for loop. 2020-02-10 14:09:56 +11:00
dbrownidau b665504c4b Added block on main thread until tick scheduler shutdown. 2020-02-10 10:35:19 +11:00
dbrownidau b855a98842 Fix doco 2020-02-10 01:35:40 +11:00
dbrownidau 00efcbbde9 Adjust formatting 2020-02-10 01:31:12 +11:00
dbrownidau fb1321c8e0 Synchronization lock not required for scheduleAtFixedRate(new Runnable(){}) https://stackoverflow.com/a/35498230 2020-02-10 01:29:57 +11:00
dbrownidau 3eb6e87019 Moved main loop into FixedRate scheduler. Added sync lock on runnable. 2020-02-10 00:38:52 +11:00
dginovker 2bef5158c4 readd runserver.sh 2020-02-06 02:59:29 +00:00
Daniel Ginovker e5e1495b4d [WIP] New setup (#371) 
* Cleanup

* Add build file

* The great migration

* Restore MINA to 1.1.7

* Removed .gradle

* Added flatdir for libs with no artifact repository

* Add README.md, rename Implementation-Title

* New setup ease

* Update reademe and modules.xml

Co-authored-by: Damion <the@dbrown.id.au>
 2020-02-03 17:40:24 -05:00
Damion 02b4df2666 Implementation of Gradle build framework (#369) 
* Cleanup

* Add build file

* The great migration

* Restore MINA to 1.1.7

* Removed .gradle

* Added flatdir for libs with no artifact repository

* Add README.md, rename Implementation-Title
 2020-02-03 17:13:57 -05:00
Daniel Ginovker 54f42aaf8a Convert item definitions into JSON form and fix shop prices (#367) 
* Created itemdef.json with same content as itemdefs.gsu. Still need to read from it

* Converted a lot of IDs, not all

* All the runelocus shop items are in realshopvalues.json, all the old ones are in the regular json. Keeping this commit just in case something goes horribly, horribly wrong.

* Verified shop values are correct
 2020-02-01 10:52:28 -05:00
Mr Extremez cbb7c7ba10 Various things enjoy! (#368) 
* Various things enjoy!

- Added dairy churning
- Fixed soft clay so it uses 1 at a time
- Fixed spinning so it uses 1 at a time
- Added working cooking gloves
- Fixed mining animation glitch
- Fixed rune essence spam
- Added fix for tanning saying you do not have enough coins when you did
- Added working ecofuntus prayer training
- Added tiara binding and usage
- Added proper locate on rune talismans
- Can no longer pickpocket npc as it is dying
- No longer thieve men when trying to talk to them
- Improved birds nest to match accurately to rs
- Added desert heating system
- Cleaned up dialogue handler some
- Added chat emotes for dialogues
- Did some cleaning up
- Every possible item that has an empty option can now be emptied
- Cleaned up sheep shearing and improved it
- Added man npc dialogue
- Added back npc facing
- Added random messages when logging in on login screen
- Added player and staff player count for discord and ingame commands
- Improving the hopping stones at lighthouse, better, but not perfect
- You will no longer ever login and be at 0, 0 coordinates you will be automically moved to lumbridge
- Added a few new npc definitions
- Disabled rune mist requirement for admins
- Added getId command for admins to easily find item item ids
- Added working global chat
[::yell, ::hideyell will hide yells, 30 second delay for regular players, can not yell if you are muted or if word is blocked by filter, includes saving]
- Made a few changes to weight (should hopefully fix some of the weight bugs)

closes #366
closes #358
closes #331
closes #356
closes #234
closes #270
closes #309

* quick patch

- welcome screen bug fixed

* Cooking distance patch

- Cooking distance patch
 2020-01-27 08:02:43 -05:00
dginovker 1d86d055a5 Merge commit w. Mr Extremez 2020-01-27 08:02:18 -05:00
Mr Extremez e2c675c392 Woodcutting animation fix (#363) 
- Shouldn't copy other players anim anymore if more than 1 person is woodcutting

closes #173
 2020-01-14 07:28:34 -05:00
dginovker eafe99af0a Latest compile 2020-01-13 07:53:55 -05:00
Mr Extremez 60239a38cf A few changes (#362) 
- Stalls now dissapear when thieving them
- Added the missing coal rock in barbarian village
- Added some height level checks for object spawns
 2020-01-13 07:53:18 -05:00
Daniel Ginovker 85a0406d9b Add rogues bank (#361) 2020-01-11 21:45:16 -05:00
dginovker dded6b8fd0 2.0 client notif 2020-01-10 18:15:01 -05:00
Mr Extremez db1f5ed785 Some fixes (#359) 
- Added message of the week to welcome screen interface
- Added face north when clicking compass
- Disabled the blank tab on game frame
- Fixed all of the dialogue issues I could find in rune mysteries
- Fixed a few typos and did a very minor clean up in the dialogue file still a lot more planned soon
- Disabled resizable on the client seeing as it doesnt work correct currently anyways
 2020-01-08 18:27:59 -05:00
Gptaqbc b1eaacf93c Door fix to facilitate Rune Mysteries script (#350) 
Now some doors doesnt have forcemove anymore.
 2020-01-07 17:57:08 -05:00
MitchvanWijngaarden c48b2575e9 fixed essence mining when multiple people are mining (#349) 2020-01-07 17:56:53 -05:00
dginovker cad66fdcc8 Latest compile 2020-01-06 07:41:36 -05:00
Daniel Ginovker d3a15b1aad Update README.md 2020-01-03 17:23:16 -05:00
Mr Extremez fdbb05597a A few fun fixes (#348) 
- Ranging guild now works
- Fletching should no longer randomly stop if more than on person is doing it
- Added dragon longsword special attack

Closes #346
Closes #216
Closes #245
 2020-01-03 09:12:09 -05:00
Gptaqbc 6b9d1d5881 Resolved couple special attacks issues(Whip, magic long bows, draggon daggers) (#347) 
Resolved couple special attacks issues(Whip, magic long bows, draggon daggers)

I also discovered some issues about the special attack. There is no delay between the special attack and the next hit and the dragon longsword special attack doesnt work at all.
 2020-01-02 18:35:04 -05:00
dginovker e3e74a6a25 Track github discord invites 2020-01-01 21:21:46 -05:00
dginovker 9272195db6 Merge branch 'master' of https://github.com/dginovker/2006rebotted 2020-01-01 17:58:04 -05:00
dginovker 3437877fb2 Made creating a new acc more obvious 2020-01-01 17:57:42 -05:00
MitchvanWijngaarden 33ef596bd3 Closes #343. Allows multiple players to steal from a stall at the same tick. (#344) 2020-01-01 12:51:12 -05:00
Mr Extremez d1c2150c60 Random stuff (#342) 
- added poison arrows to usable arrows
- cleaned up some code
- changed ardougne tele to correct coords
- enabled pest control (although it needs a lot of work still)
- fixed some typos
- made beads drop a bit more often, so its more accurate like real rs
 2019-12-31 12:42:53 -05:00
dginovker e8bfe7f88a Fix ::Stuck & stacktrace (regression) 2019-12-30 23:47:23 -05:00
Gptaqbc e88c5eaca8 Fixed the delay on banking a non stackable item (#341) 
Brought back old code as what I previously did affected the time it takes to bank items.
 2019-12-30 23:25:01 -05:00
DavidVarbit 1b5f185944 * Fix: Runes are consumed even if you cant tele from wildy after level 20 #337 (#340) 
* Cleaned up Spell teleports
 2019-12-30 18:53:09 -05:00
Gptaqbc c27e629da2 Bank stuff (#339) 
* Fixed dcing on picking up items when inventory is full that I introduced

* Added Shantay Pass bank area and changed Jukats shop stock
 2019-12-30 15:37:27 -05:00
dginovker bd97bdca3c Quick compile 2019-12-30 13:48:25 -05:00
Gptaqbc 6ce09f3091 Fixed dcing on picking up items when inventory is full that I introduced (#338) 2019-12-30 13:45:05 -05:00
dginovker e6e18efe34 December 30th update early :) 2019-12-29 20:28:42 -05:00
Daniel Ginovker c87f135e97 Fixed some items dcing client (#330) 2019-12-27 12:47:56 -05:00
dginovker 54dc827dfa Tee output so we can see if there's a server crash 2019-12-27 12:46:34 -05:00
dginovker 094c3f79dc Merge branch 'master' of https://github.com/dginovker/2006rebotted 2019-12-26 00:44:51 -05:00
dginovker 8e68d9739c update readme 2019-12-26 00:44:41 -05:00
Daniel Ginovker 43a0f3e9f1 Gptaqbc new stuff 6 (#328) 
* Some stuff on weight

Some stuff on weight

* Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

* removed a shitload of '== true'

I did a search and replace but I manually checked the changes that were made so there shouldn't be any issue with that.

* Fixed drop issue

* Fixed duel arena, changed some chat message so they are all the same, changed Additem

Fixed duel arena:
> 98% completed duel (the winning duel sound is still missing)
> Added forfeiting
> Added checks to prevent tbing, teleothers, teleport and logout from duel
> Remove the check for same IP to disable duel

Item Assistant:
> Changed the AddItem method so it now drops items on the ground if inventory is full

Cleaned some stuff while I was at it...

* Update ItemAssistant.java

Oupsie

* Resolving my issues

* Allow walking during movement

* Why won't commit work

Co-authored-by: Gptaqbc <56596815+Gptaqbc@users.noreply.github.com>
 2019-12-26 00:33:18 -05:00
Daniel Ginovker e8685c97d0 Remove prices.txt, which isn't used anymore it seems (#326) 
* Remove prices.txt, which isn't used anymore it seems

* Actually git rm the file too...
 2019-12-25 21:31:32 -05:00
dginovker b79103ed79 Add link to PR guide 2019-12-25 20:28:36 -05:00
Gptaqbc aa6b9a9aa0 New stuff 6 (#325) 
* Some stuff on weight

Some stuff on weight

* Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

* removed a shitload of '== true'

I did a search and replace but I manually checked the changes that were made so there shouldn't be any issue with that.

* Fixed drop issue
 2019-12-25 16:09:25 -05:00
Gptaqbc 5f500280b2 New stuff 6 (#324) 
* Some stuff on weight

Some stuff on weight

* Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

* removed a shitload of '== true'

I did a search and replace but I manually checked the changes that were made so there shouldn't be any issue with that.
 2019-12-25 13:01:24 -05:00
dginovker 1c2deaacb6 Make setup instructions easier 2019-12-24 19:58:26 -05:00
Gptaqbc 287018346b Some stuff on weight (#323) 
* Some stuff on weight

Some stuff on weight

* Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog
 2019-12-24 13:40:50 -05:00
Gptaqbc 850b09e6fc New stuff 5 (#322) 
* Refactored smithing and added cannonball making in there too (?) as the interface have an option for it.

Refactored smithing and added cannonball making in there too (?) as the interface have an option for it.

* Added check for hammer when smithing

Added check for hammer when smithing
 2019-12-24 12:57:01 -05:00
dginovker 9759d004eb latest compile 2019-12-23 22:42:22 -05:00
Gptaqbc 10070843e6 New stuff 4 (#319) 
* Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk

Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk

* Commented clipping server side check so we can work on it

Commented and brought back the old code so gates works while we work in the clipping check server side.

* Added Canifis bank to the bank boolean

* Fixed the drops problem

* Added cannonball making, fixed some typos, added some command for admin to get 999k hp and prayer points(usefull for debugging)

New feature:
- Cannonball making
New Commands:
- ::hp
- ::pray

* Update DwarfCannon.java
 2019-12-23 22:38:24 -05:00
Gptaqbc b1b06e9cb9 Refactored smithing and added cannonball making in there too (?) as the interface have an option for it. (#320) 
Refactored smithing and added cannonball making in there too (?) as the interface have an option for it.
 2019-12-23 22:37:55 -05:00
Daniel Ginovker 1702a9b726 Make 8 spaces 4 (#317) 2019-12-23 12:54:42 -05:00
Mr Extremez 32bbf1e003 Quick patch (#316) 
- Fixed npc drops/anims
- Fixed some combat sounds that were not working
- Made Kalphite Queen a multi area
 2019-12-23 12:23:04 -05:00
dginovker bc4320ee68 fix drops 2019-12-22 17:35:10 -05:00
Gptaqbc b07dd8cfb7 New stuff 4 (#315) 
* Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk

Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk

* Commented clipping server side check so we can work on it

Commented and brought back the old code so gates works while we work in the clipping check server side.

* Added Canifis bank to the bank boolean

* Fixed the drops problem
 2019-12-22 17:34:35 -05:00
dginovker 7f7e00788e latest compile 2019-12-22 16:03:42 -05:00
Gptaqbc 2790decd44 Added some sound, refactored fletching and arrowmaking a bit... I've … (#314) 
* Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk

Added some sound, refactored fletching and arrowmaking a bit... I've maybe fixed the issue with fletching.. idk

* Commented clipping server side check so we can work on it

Commented and brought back the old code so gates works while we work in the clipping check server side.

* Added Canifis bank to the bank boolean
 2019-12-22 15:59:32 -05:00
Mr Extremez c5c1c2fc35 Cats/kalphite queen/random (#313) 
- Did some work with the kalphite queen
 2019-12-22 15:59:26 -05:00
Gptaqbc 17e5e7ea5c Random stuff 3 (#312) 
* Make ::update automatically restart server as well

* Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it

* Fix noclip (NEEDS TESTING)

* Revert "Fix noclip  (#302)"

This reverts commit 521ae52e4c.

* ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon

-Removed the clip command from the client;
-Fixed a typo in a dialogue;
-Fixed mud battlestaff nto working as runes (water and earth);
-Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot;

* Snow improvement

Nothing major

* Fixed Click to teleport command

Fixed Click to teleport command;

* cleaned stuff

* Update Commands.java

* Fixed picking up items requiring 2 clicks when not standing on/near it. Fixed the sound so it doesnt repeat itself anymore if spamclicked.

Fixed picking up items requiring 2 clicks when not standing on/near it. Fixed the sound so it doesnt repeat itself anymore if spamclicked.

Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
 2019-12-22 00:05:59 -05:00
Gptaqbc bda71ee34a Random stuff 3 (#311) 
* Make ::update automatically restart server as well

* Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it

* Fix noclip (NEEDS TESTING)

* Revert "Fix noclip  (#302)"

This reverts commit 521ae52e4c.

* ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon

-Removed the clip command from the client;
-Fixed a typo in a dialogue;
-Fixed mud battlestaff nto working as runes (water and earth);
-Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot;

* Snow improvement

Nothing major

* Fixed Click to teleport command

Fixed Click to teleport command;

* cleaned stuff

* Update Commands.java

Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
 2019-12-21 18:46:34 -05:00
Gptaqbc f6e8f2d851 Random stuff 3 (#308) 
* Make ::update automatically restart server as well

* Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it

* Fix noclip (NEEDS TESTING)

* Revert "Fix noclip  (#302)"

This reverts commit 521ae52e4c.

* ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon

-Removed the clip command from the client;
-Fixed a typo in a dialogue;
-Fixed mud battlestaff nto working as runes (water and earth);
-Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot;

* Snow improvement

Nothing major

* Fixed Click to teleport command

Fixed Click to teleport command;

* cleaned stuff

Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
 2019-12-21 12:49:54 -05:00
dginovker 7157020ac6 Latest compile 2019-12-20 12:46:05 -05:00
dginovker 5ce95df4ea Merge branch 'master' of https://github.com/dginovker/2006rebotted 2019-12-20 12:35:40 -05:00
dginovker 13977992d7 Fix most of the clipping (minor stuff with doors left) 2019-12-20 12:35:12 -05:00
Gptaqbc 2005be0948 Random stuff 3 (#307) 
* Make ::update automatically restart server as well

* Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it

* Fix noclip (NEEDS TESTING)

* Revert "Fix noclip  (#302)"

This reverts commit 521ae52e4c.

* ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon

-Removed the clip command from the client;
-Fixed a typo in a dialogue;
-Fixed mud battlestaff nto working as runes (water and earth);
-Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot;

* Snow improvement

Nothing major

Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
 2019-12-20 11:42:15 -05:00
MitchvanWijngaarden 0842e2bc9c Added in ::prayer and ::energy commands, semi-closes #305 (#306) 
* Added in ::prayer and ::energy commands, closes #305

* Added in message prefix 'Run energy: ' and 'Prayer points: ' to ::prayer and ::energy commands.
 2019-12-20 11:41:18 -05:00
Gptaqbc a27b9e22f9 Random stuff 3 (#304) 
* Make ::update automatically restart server as well

* Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it

* Fix noclip (NEEDS TESTING)

* Revert "Fix noclip  (#302)"

This reverts commit 521ae52e4c.

* ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon

-Removed the clip command from the client;
-Fixed a typo in a dialogue;
-Fixed mud battlestaff nto working as runes (water and earth);
-Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot;

Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
 2019-12-19 22:50:15 -05:00
dginovker 00500a072b Noclip fix thanks to ethan 2019-12-19 21:47:27 -05:00
Daniel Ginovker cfa59f4a4d Revert "Fix noclip (#302)" (#303) 
This reverts commit 521ae52e4c.
 2019-12-18 20:02:13 -05:00
Daniel Ginovker 521ae52e4c Fix noclip (#302) 
* Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it

* Fix noclip (NEEDS TESTING)
 2019-12-18 17:35:12 -05:00
Daniel Ginovker 62a22f8857 Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it (#301) 2019-12-17 15:19:39 -05:00
Daniel Ginovker 223c3194a8 Fix bank packet exploit + fishing guild banking (#300) 2019-12-17 15:11:59 -05:00
Daniel Ginovker 0653db8ad1 Fix some shop item prices (#296) 2019-12-16 15:03:03 -05:00
dginovker e0d795323b Dec 15th update 2019-12-15 19:38:25 -05:00
dginovker a16311ba15 Merge branch 'fix_packet_exploits' 2019-12-15 19:37:14 -05:00
Daniel Ginovker f12181140b Fix 32-bit java (#289) 2019-12-15 19:33:23 -05:00
Daniel Ginovker 6bf8d407e0 Make ::update automatically restart server as well (#291) 2019-12-15 19:33:16 -05:00
Gptaqbc 9ed0acfb04 Random fixes 2 (#294) 
* Make ::update automatically restart server as well

* Added toggeable snow(only activable in december), added walking queue reset when using objects changing Z, made it so the wildy warning interface is appearing when entering in wildy

For some reason the resetWalkingQueue added to the execute method wasnt doing anything so I manually added it to every interaction possible... LOL

Wildy warning interface was appearing when clicking with player in wildy. I made it so it appears straight when walking 1 tile in wildy zone. Wont appears if player logs in wildy as he already knows this shit.
 2019-12-15 19:33:03 -05:00
Mr Extremez 87eaaed36f Fixes (#293) 
- Added ROL for player and npcs
- Fixed Redemption now works for players and NPCs
- Fixed prayer not updating on prayer tab when it goes down in points
- Fixed not being able to use glories after trading them
- Fixed item spawn crash (only affected some people such as myself and a few others)
 2019-12-14 23:46:05 -05:00
dginovker 06d40b9a98 Fix banking packet exploit, & setup for a future of preventing packet exploits 2019-12-13 13:46:29 -05:00
dginovker 37322d4874 Latest updates 2019-12-12 23:11:24 -05:00
Josh Shippam b94157f01b Remove Accidentally Added Import (#285) 2019-12-13 02:34:23 +00:00
Danial c1a5cf449c Shop fixes (#284) 
* Update ShopAssistant.java

* Fixup fish selling/buying

* fixup

* tidy up

* fixup 0 stock items being removed
 2019-12-13 01:07:44 +00:00
Josh Shippam 23951e9af6 Implement Ring Of Forging (#283) 2019-12-13 01:05:25 +00:00
Danial 2d58593be9 Fixup smelting (#281) 
* Fixup smelting

* Move iron fail check, show message

* revert

* More smithing refactoring
 2019-12-13 00:37:13 +00:00
Danial 9b160452ad Update Commands (#280) 
* Show commands in interface

* Update players command, add playershops command

* Remove null command

* Update Commands.class
 2019-12-13 00:36:18 +00:00
dginovker f39993e3d9 Latest compile + jars 2019-12-12 04:54:04 -05:00
Mr Extremez 6ad9d1f7e9 Random fixes (#273) 
- Cant open nest if you do not have space
- Added working yo yo
- Added monks robe spawns
- Added ability to make god pages
- Removed a few warnings

closes #265
closes #262
closes #259
closes #243
 2019-12-12 04:32:56 -05:00
Danial 8ec8a92d20 Fix for boots of lightness (#272) 2019-12-12 04:32:06 -05:00
Gptaqbc c891e4741e Added Winter theme and fixed couple items that werent wore in the correct slot (#271) 
Added Winter theme and fixed couple items that werent wore in the correct slot
 2019-12-12 04:31:21 -05:00
Daniel Ginovker 64ae22188f Small shop QoL (#267) 
* Shop command clarification

* small syntax
 2019-12-11 00:43:58 -05:00
Daniel Ginovker f3b47bb0d6 Added warning for 32-bit and > 1.8 Java versions (#264) 
* Added warning for 32-bit and > 1.8 Java versions

* Clarify why
 2019-12-10 19:21:45 -05:00
Daniel Ginovker dc4694c24c Remove rare protection, add all NPCs to a static list (#254) 2019-12-09 22:59:54 -05:00
Daniel Ginovker a9d720fbae Remove some perma aggro monsters (#252) 2019-12-09 18:50:39 -05:00
dginovker ba7daa72d5 Latest compile 2019-12-07 21:19:44 -05:00
Gptaqbc 55a35a26b2 A lot of fixes (#242) 
* Fixed stuff related to shop trading

> Refactored stuff to facilitate resolving an issue regarding sellnig item to a full shop
> Removed double value message in shop

* Fixed some stuff related to agility

-Removed a useless obstacle in wilderness course that alowed insane xp gains;
-Added some 'flexibility' to some obstacles at agility pyramid;
-Removed useless vars;
-Added proper xp to obstacles;
-Added bonus xp for completing agility pyramid
-Most likely more;

***Animations still missing: Crossing gaps and jumping gaps***

* resolve conflicts

* delete old files

* A lot of fixes

Christmas Cracker (anim other player & text & admin right & rare protection)
Added check in stack value when withdrawing from bank to prevent losing items when max int value is reached
fixed double message on pickpocketing when in combat
Renamed methods
Removed unused methods
Removed admin restriction when trying to use the cannon
Cleaned KBD drops
Boots of lightness weight reduction is fixed
More...
 2019-12-07 21:16:18 -05:00
Mr Extremez 8e524cdcda Couple quick fixes (#240) 
- Fix global drops at KQ
- Should fix pickpocketing crash hopefully

closes #236
closes #233
 2019-12-06 16:12:48 -05:00
dginovker 9c21669609 Merge branch 'misc2' of https://github.com/RedSparr0w/2006rebotted 2019-12-05 23:08:25 -05:00
dginovker 06798c5e90 Merge branch 'RedSparr0w-misc2' 2019-12-05 23:06:30 -05:00
RedSparr0w 8317f3f031 check player has completed tutorial island 2019-12-06 15:14:31 +13:00
dginovker d9d450f61e Latest compile 2019-12-05 12:58:10 -05:00
Mr Extremez 8af938548b More fixes (#235) 
- Dwarf cannon can now be seen by anyone and not just the person who sets it down (they can also see the rotation now)
- Fixed doors being removed when clicking them
- Removed banking command for regular players
- Fixed nulodion now only gives if you have space
- Updated nulodion message so it doesnt say to find him at home
- Npcs wont follow you if you turn on the cantAttack comamand (for admins
- Fixed gate at KBD
- Fixed the gates at Ice giants in wildy

#closes 132
#closes 203
#closes 211
#closes 6

also this one should be closed from previous patch

#closes 219
 2019-12-05 12:55:25 -05:00
dginovker 9fb110bb41 Latest compile, hopefully fix bug 2019-12-04 22:24:07 -05:00
Mr Extremez 402d732975 Some fixes (#231) 
* Some fixes

- Changed lumbridge teleport to require 31 magic instead of 32
- Added back gaining items from thieving stalls
- Fixed dialgoue issue after leveling up skill (such as smithing)
- Made god capes untradable
- Removed cannon balls from shop (they werent supposed to be in there)

* refactor pickpocketing slightly

* more refactoring, actual random

* refactor, each stall has it's own respawn timer

* refactor argument names

* Update Stalls.java
 2019-12-04 21:13:47 -05:00
RedSparr0w 199df17cf9 bots don't drop items 2019-12-02 21:00:16 +13:00
dginovker 256452114c latest compile 2019-12-01 19:08:27 -05:00
Gptaqbc e2cf6d2998 Agility fixes (#224) 
* Fixed stuff related to shop trading

> Refactored stuff to facilitate resolving an issue regarding sellnig item to a full shop
> Removed double value message in shop

* Fixed some stuff related to agility

-Removed a useless obstacle in wilderness course that alowed insane xp gains;
-Added some 'flexibility' to some obstacles at agility pyramid;
-Removed useless vars;
-Added proper xp to obstacles;
-Added bonus xp for completing agility pyramid
-Most likely more;

***Animations still missing: Crossing gaps and jumping gaps***

* resolve conflicts

* delete old files
 2019-12-01 19:03:29 -05:00
Danial 705f624a2b Add message showing how many coins you collected from your shop (#227) 2019-12-01 19:03:04 -05:00
dginovker fdac3e1422 Latest compile 2019-12-01 13:58:48 -05:00
dginovker 414c9c3d0d New .sh script paths 2019-12-01 13:55:30 -05:00
Danial bbb33d243e Fixup, Add new command (#226) 
* refactor saving

* add command to change password

* cleanup
 2019-12-01 13:40:54 -05:00
dginovker 930bc8d37b class cleanup + latest compile 2019-11-29 20:27:51 -05:00
Danial d4b16a25aa Fixup being able to kill monsters without correct slayer level (#220) 
* Cannon only fire at npcs on same height level.

* Cannon cannot kill monsters if you do not have the slayer level
 2019-11-29 00:04:53 -05:00
Danial 680a0c2ee0 Add more shop definitions, Add legends guild stores (#217) 
* remove trailing \t add legends guil shop

* Add missing shops

* remove out of scope items (non 317)

* fix item id

* Add legends guild shop npc

* Add Legends Guild General Store.

* Update ShopHandler.java
 2019-11-28 11:49:14 -05:00
Mr Extremez 68256e41d8 Some more minor clean up (#215) 
* General clean up

- Reduced woodcutting code by alot, reverted the array to an enum
- Moved the login player method to the packet sender
- Deleted some dead code/cleaned up

* More random cleanup/refractoring

- Moved combat constants to combatconstants.java
- Moved dialogue options to dialogueoptions.java
- Deleted more dead code

* Replaced some poorly written methods

- refreshSkill, levelUp, and getTotalLevel all used way too much code for such a simple function so cleaned it up
- deleted a few other bits of dead code

* Fight caves

- Should fix fight caves npcs nulling out in the middle of your waves if they are too far away
- Also removed some unneeded scynchronization in itemassistant.java

* Gates

- Started cleaning up gate system, still can be improved a lot more
 2019-11-28 11:47:06 -05:00
Daniel Ginovker 20303071de Updated setup guide for new refactor (#214) 2019-11-25 12:33:43 -05:00
Mr Extremez d876a923b9 Cleanup part 1 (#213) 
* Clean up part 1

- Removed lots of dead code
- Removed unncessary files not in use
- Cleaned up small bits of code
- Removed a few warnings
- Server.java ---> GameEngine.java
- Constants.java ---> GameConstants.java

* Cape Dye

Rewrote cape dying

* Packaging

- redone ----> com.rebotted

* PacketSender/clean up

- ActionSender ---> PacketSender
- Moved many more packets to packetsender
- Cleaned up more dead code

* Merge Client/Player

- Merged Client.java with Player.java (both were doing same thing so redundant to have both)
- Removed some more dead code
- Tidy a few small things up

* Quests/more clean up

- Removed more dead code
- Made quests static in order to clean them up a bit

* More cleanup

- Removed some more of the dead quest code
- Correcting naming of some of the shop variables
 2019-11-25 12:08:56 -05:00
Danial 3d1ae1b288 remove deleteItem2 → deleteItem (#212) 2019-11-24 23:07:52 -05:00
dginovker f1ea4810dd Merge fix: 2019-11-24 14:09:18 -05:00
dginovker c9c3888c20 runserver.sh loop update 2019-11-24 14:04:38 -05:00
dginovker a50f7d548b Merge branch 'RedSparr0w-bot' 2019-11-24 14:00:35 -05:00
dginovker fd31f57f5d Merged: 2019-11-24 13:59:52 -05:00
mikeysasse2 3650170a84 Fixed random trees everywhere (#209) 
* Fixed random trees everywhere

* Npcs will no longer face southwest every time they take a step.
Added a fixed for walking forever after teleporting/region change (only tested that walking still works, never tested if the fix would resolve the issue).
You can now only click an object once per tick.
 2019-11-24 13:48:02 -05:00
RedSparr0w 4e8832cded tidy up 2019-11-24 23:47:47 +13:00
RedSparr0w 4b78f6c136 give slayer xp on kill 2019-11-24 23:41:43 +13:00
dginovker 8393c0c928 Pmods can run ;:update 2019-11-24 01:00:38 -05:00
RedSparr0w 564f400007 check un noted version for buy price etc 2019-11-24 17:50:34 +13:00
RedSparr0w c3f4e831a3 trim the excess tabs 2019-11-24 16:43:02 +13:00
RedSparr0w 9d57cb6d1a Buy noted items from player owned stores 2019-11-24 16:37:03 +13:00
RedSparr0w ab57946a01 items are un noted when sold to shop 2019-11-24 16:28:31 +13:00
RedSparr0w f7d719c811 refactor saving 2019-11-24 16:27:10 +13:00
RedSparr0w 2498cff188 Only un note items if its not player owned 2019-11-24 15:38:46 +13:00
RedSparr0w 209b3b3bf3 Update HighscoresHandler.java 2019-11-24 13:16:10 +13:00
RedSparr0w 4f5c808298 Fixup highscores, ignore admin dev and bots 2019-11-24 13:02:53 +13:00
RedSparr0w 8920ff512a Face bot random direction 2019-11-24 00:13:17 +13:00
RedSparr0w 66cc2e47fe dont count bots toward player count, add playerBotCount 2019-11-23 21:22:48 +13:00
RedSparr0w e110ba296e Exclude bots from player counts 2019-11-23 21:08:51 +13:00
RedSparr0w 2104fd9918 Bots use normal chat, with effects 2019-11-23 20:40:56 +13:00
RedSparr0w 576bee32c3 lowercase item name 2019-11-23 17:39:38 +13:00
RedSparr0w c91027f25f lowercase metric 2019-11-23 17:32:12 +13:00
RedSparr0w 64ce050d10 add gp to lower prices 2019-11-23 17:25:19 +13:00
RedSparr0w bda929229e Fixup free space check 2019-11-23 17:07:13 +13:00
RedSparr0w 05a3a912f6 Add comments 2019-11-23 17:05:25 +13:00
RedSparr0w 4c42557332 Tidy up number formating 2019-11-23 17:01:18 +13:00
RedSparr0w f4ea14f2bf Fixup rounding for millions 2019-11-23 16:47:32 +13:00
RedSparr0w e42394fdbe Update ShopHandler.class 2019-11-23 16:26:06 +13:00
RedSparr0w 28b7163c6d Add another check to not remove items 2019-11-23 16:25:48 +13:00
RedSparr0w ded7cd28b8 Set currencyName 2019-11-23 16:13:24 +13:00
RedSparr0w 626d237a8e reset workspace 2019-11-23 15:53:01 +13:00
RedSparr0w 4445fc0871 Update workspace.xml 2019-11-23 15:05:30 +13:00
RedSparr0w e519d1b00b Fixup buying too many items 2019-11-23 14:58:44 +13:00
RedSparr0w 2b93d72a15 Add trade zones 2019-11-23 14:32:16 +13:00
RedSparr0w 2683ab888b Make it so bots cannot be attacked by npcs 2019-11-23 14:05:58 +13:00
RedSparr0w 3a4895590e fixup close shop, re-open shop 2019-11-23 14:01:42 +13:00
RedSparr0w a1ff2458f1 update close shop method 2019-11-23 13:48:46 +13:00
RedSparr0w 5a520fa316 Add close shop command 2019-11-23 13:29:17 +13:00
RedSparr0w aa61fc5cbf add ability to withdraw your profits 2019-11-23 12:38:41 +13:00
RedSparr0w b920549af0 don't charge player to withdraw items from their store 2019-11-23 12:02:22 +13:00
RedSparr0w 10c7adf74d fixup ordering of shop items 2019-11-23 11:39:03 +13:00
RedSparr0w d2cf6fac12 Take players appearance 2019-11-23 11:17:40 +13:00
RedSparr0w b940e8e859 Set custom prices 2019-11-23 11:05:43 +13:00
RedSparr0w e0925538c7 Remove items from players store/bank 2019-11-23 02:20:06 +13:00
RedSparr0w ca12809861 Semi functional player shops 2019-11-23 01:44:57 +13:00
RedSparr0w 3afb44615e Update shops.cfg 2019-11-23 01:43:52 +13:00
RedSparr0w bff9e44d8f remove logging 2019-11-22 21:25:57 +13:00
RedSparr0w d6ec93b199 Fixup shops 2019-11-22 21:23:36 +13:00
RedSparr0w abc3a9859f Merge remote-tracking branch 'upstream/master' into bot 2019-11-22 20:48:03 +13:00
RedSparr0w ae883964af Check if shop owned by player to sell items 2019-11-22 20:47:36 +13:00
RedSparr0w d62e5a8d70 increase total stores, decrease total items 2019-11-22 20:47:18 +13:00
RedSparr0w 544f266c8f Open player shop 2019-11-22 20:46:39 +13:00
RedSparr0w 23081c0eac Update ShopHandler.java 2019-11-22 20:45:58 +13:00
RedSparr0w 8b4969a882 Update bot properName 2019-11-22 20:45:42 +13:00
RedSparr0w e282778f22 Update BotHandler.java 2019-11-22 20:45:26 +13:00
RedSparr0w b6a590d44f Update PlayerAssistant.java 2019-11-22 20:45:18 +13:00
RedSparr0w 7627ed80eb Give bot same stats as player 2019-11-22 19:39:51 +13:00
RedSparr0w 0543919ed1 empty bots inventory 2019-11-22 19:26:26 +13:00
RedSparr0w a91dc597e9 update bots handling, spawn bot on player 2019-11-22 19:11:03 +13:00
RedSparr0w 07472a9a90 more stuff 2019-11-22 17:28:14 +13:00
RedSparr0w 6e3f76329a force logout on timeout 2019-11-22 16:40:18 +13:00
dginovker 03721c5c1a Emergency fix 2019-11-21 21:23:11 -05:00
dginovker 3c332cd653 Latest compile 2019-11-21 21:11:28 -05:00
Mr Extremez 34f2665858 Redemption Prayer/Fixes/Clues/Tidying up/Rares (#207) 
- closes #205
- closes #197
- closes #145

Does the followiwng
- Adds functional redemption prayer
- Fixes max stack deletion when trading
- Adds toggle for clue scrolls, currently set on disabled until someone gets the time to finish clue scrolls
- Cleans up a few minor things
- Removes a few bits of dead code
- Re enables rare detection
 2019-11-21 21:09:17 -05:00
RedSparr0w 447fc738d9 initial bots 2019-11-22 13:03:02 +13:00
Danial 4b3bb7ade7 Random slayer task amounts, Move unequiped item to same slot as weapon you are equiping (#206) 
* tidy up

* Update DialogueHandler.java

* Slayer master gives specific difficulty tasks

* int

* tidy up

* replace difficulty int, with variable

* Dragons give lower amount needed to kill

* vail -> vial

* Update ObjectsActions.java

* tidy up

* tidy up

* tidy up

* Assign random amounts

* tidy up, remove magic numbers

* move rebinding of equip slot

* tidy up and move unequiped items to same inventory slot

* Drop castlewars flag when equiping a weapon

* vars

* tidy up
 2019-11-21 14:10:30 -05:00
dginovker 92688def31 noip, thanks @Dark98 :) 2019-11-19 23:24:45 -05:00
Gptaqbc c0c6b40387 Fixed stuff related to shop trading (#202) 
> Refactored stuff to facilitate resolving an issue regarding sellnig item to a full shop
> Removed double value message in shop
 2019-11-19 13:11:16 -05:00
dginovker 820c6fafba Latest compile + crash fix 2019-11-18 16:31:10 -05:00
Danial 27b5f075bc bunch o changes (#200) 
* Create cluescrolls.txt

* tidy up

* fixup ::item command

* tidy up

* fixup fight caves checker
 2019-11-18 16:28:00 -05:00
dginovker 925c91406d Latest compile 2019-11-18 12:09:13 -05:00
Danial e5a0f84fcc Update Slayer (#196) 
* tidy up

* Update DialogueHandler.java

* Slayer master gives specific difficulty tasks

* int

* tidy up
 2019-11-18 12:01:03 -05:00
Danial 26ff191af3 Update drop handling, Allow rares, Remove some logging (#193) 
* Fix local Parabot instructions

* Add kick command, and force logout function

* Allow rare items (phats etc)

* remove random server logging

* implement random drop amount

* fixup random events message
 2019-11-17 19:31:18 -05:00
Mr Extremez 2b6ff7db02 Global drops/monks/al kharid furnance (#192) 
closes #177
closes #136 (hp restoring works, couldn't find the anim tho)
closes #178 (should fix all the issues, let me know for sure)
Also removed the object does not exist message ingame for non admins and got rid of the isBotting code when clicking objects
 2019-11-17 18:30:08 -05:00
dginovker 855f4b9ab7 Red's compile 2019-11-17 15:34:30 -05:00
Danial 4a2358945c Update Scrolls (#191) 
* Fix local Parabot instructions

* Add kick command, and force logout function

* Update scroll handling
 2019-11-17 15:33:10 -05:00
dginovker 92c5ac1f7e Latest compile 2019-11-17 14:59:20 -05:00
Gptaqbc e28bada221 New stuff again (#190) 
* Fixes some agreesive monsters that should be unaggressive

Fixes some agreesive monsters that should be unaggressive

* more items

more items

* Update Item.java

* Fixed some items visual bugs - Helmet

Fixed some items visual bugs - Helmet

* Fixed trading issues.

Fuck up players couldnt trade because they were considered busy. Also fixed the trade screen that stays opened even when other player is out of it.

* removed shit that occured while fixing the conflict.

removed shit that occured while fixing the conflict.
 2019-11-17 14:38:33 -05:00
Danial 8570b5f531 Minor tidy up, Update specials stats (#189) 
* Fix local Parabot instructions

* Add kick command, and force logout function

* fixup abyss

* fixup tokkull selling

* tidy up

* update abyssal whip special accuracy

* update specials from wiki

* eh

* remove system log
 2019-11-17 14:23:28 -05:00
dginovker 9dcc1eee0b Latest compile 2019-11-17 01:50:36 -05:00
Gptaqbc 9ed8ea8ae7 Next branch again (#187) 
* Faster shop restocking - Brought back normal stack of items in shops - Added chat message to camoe transport system

Faster shop restocking - Brought back normal stack of items in shops - Added chat message to camoe transport system

* Fixed typo

Fixed typo

* Fixed item fuck up when wearing them. For example full helm trimmed and robes trimmed

Fixed item fuck up when wearing them. For example full helm trimmed and robes trimmed
 2019-11-17 01:45:48 -05:00
Gptaqbc e8cbb975bc Fixes some agreesive monsters that should be unaggressive (#188) 
Fixes some agreesive monsters that should be unaggressive
 2019-11-17 01:45:10 -05:00
dginovker 3592cb7af9 Latest compile 2019-11-16 20:51:28 -05:00
Danial b13fa89de2 Fix Abyss, Fix selling for tokkull (#186) 
* Fix local Parabot instructions

* Add kick command, and force logout function

* fixup abyss

* fixup tokkull selling
 2019-11-16 20:50:13 -05:00
Daniel Ginovker 165f156814 Fix dark wizzies aggro, add more togglerender commands and add it to ::commands itself, fixed spam clicking tree gives a ton of logs (#185) 
* Finish #167

* Fix #182

* Fixed #183
 2019-11-16 18:17:54 -05:00
dginovker 7366de67e1 Fix localhost/live serv parabot jars 2019-11-14 13:39:08 -05:00
dginovker 982ae74d37 gitignore update 2019-11-11 15:49:24 -05:00
mikeysasse c827d46ca0 Projectile clipping, PassDoor fix (#176) 
* Numbered packet sizes.
Corrected sound packet length to 6 from 5.
Corrected sound packet in server.
Teleport sound now plays correctly.
Corrected modern teleport animation playthrough.
Removed redundant teleport delay.

* Changed sendSound packet size back to 5 and removed type attribute to maintain compatibility with Parabot.

* After running around an object to attack the player will no longer wait a number of ticks to start attacking again.
Fixed an issue where walkTo being called from CycleEvents would not execute correctly.
Player will no longer face a killed npc after it respawns.
Added projectile clipping.
Added a new algorithm for player->player/npc following that accounts for projectile clipping.
 2019-11-11 15:20:02 -05:00
dginovker a4e4b89d99 Latest compile! 2019-11-11 00:30:09 -05:00
Mr Extremez d14f4e5044 Changesftw (#172) 
* Npc definitions/npc aggressiveness

Let me know how it works

* Error fix

fixes error
 2019-11-11 00:26:47 -05:00
4724 changed files with 809578 additions and 150475 deletions
Expand all files Collapse all files
.github/workflows/maven.yml
+24
View File
@@ -0,0 +1,24 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
name: Java CI with Maven
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build with Maven
run: mvn -B clean install
.gitignore
+12 -1
View File
@@ -1,3 +1,14 @@
2006Redone\ Server/data/characters/
2006Scape\ Server/data/characters/
.idea/
.idea/workspace.xml
**/.idea/workspace.xml
**/.idea/*
*/*.jar
*.iml
.DS_Store
2006Scape Server/data/logs
*.class
*.project
2006Scape Client/bin/
*.prefs
*.classpath
.idea/$PRODUCT_WORKSPACE_FILE$
Generated
-19
View File
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.7</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>
.idea/.gitignore
Generated
-2
View File
@@ -1,2 +0,0 @@
# Default ignored files
/workspace.xml
.idea/2006rebotted.iml
Generated
-178
View File
@@ -1,178 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/2006Redone Server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/2006Redone file_server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/2006Redone Client/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/commons-lang3-3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/javac++.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/mina.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/slf4j-nop.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/slf4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/xpp3-1.1.4c.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone Server/libs/xstream-1.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/netty-3.6.6.Final.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/commons-lang3-3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/javac++.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/mina.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/slf4j-nop.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/slf4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/xpp3-1.1.4c.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/2006Redone file_server/libs/xstream-1.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/2006Redone Server/libs" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/2006Redone Server/libs" recursive="false" />
</library>
</orderEntry>
<orderEntry type="library" name="libs" level="project" />
<orderEntry type="library" name="commons-lang3-3.1" level="project" />
</component>
</module>
.idea/artifacts/2006rebotted_jar.xml
Generated
-11
View File
@@ -1,11 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="2006rebotted:jar">
<output-path>$PROJECT_DIR$/CompiledServer/artifacts/2006rebotted_jar</output-path>
<root id="archive" name="2006rebotted.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="2006rebotted" />
</root>
</artifact>
</component>
.idea/artifacts/localhost_2006rebotted_jar.xml
Generated
-11
View File
@@ -1,11 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="localhost_2006rebotted:jar">
<output-path>$PROJECT_DIR$/CompiledServer/artifacts/localhost_2006rebotted_jar</output-path>
<root id="archive" name="localhost_2006rebotted.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/2006Redone Client/METAs/Local Client Meta/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="2006rebotted" />
</root>
</artifact>
</component>
.idea/libraries/commons_lang3_3_1.xml
Generated
-17
View File
@@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="commons-lang3-3.1">
<CLASSES>
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/commons-lang3-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/javac++.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/mina.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/netty-3.6.6.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/slf4j-nop.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/slf4j.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/xpp3-1.1.4c.jar!/" />
<root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/xstream-1.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/libs.xml
Generated
-7
View File
@@ -1,7 +0,0 @@
<component name="libraryTable">
<library name="libs">
<CLASSES />
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/misc.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/CompiledServer" />
</component>
</project>
.idea/modules.xml
Generated
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/2006rebotted.iml" filepath="$PROJECT_DIR$/.idea/2006rebotted.iml" />
</modules>
</component>
</project>
.idea/vcs.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
.idea/workspace.xml
Generated
-242
View File
@@ -1,242 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ArtifactsWorkspaceSettings">
<artifacts-to-build>
<artifact name="localhost_2006rebotted:jar" />
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/data/logs/shopbuying/bot.txt" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/data/logs/shopbuying/bot.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/shops/ShopAssistant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="618">
<caret line="396" column="115" selection-start-line="396" selection-start-column="115" selection-end-line="396" selection-end-column="115" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="2066" column="71" selection-start-line="2066" selection-start-column="71" selection-end-line="2066" selection-end-column="71" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/players/Trading.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="404">
<caret line="74" column="108" lean-forward="true" selection-start-line="74" selection-start-column="108" selection-end-line="74" selection-end-column="108" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/util/Misc.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>math.sq</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java" />
</list>
</option>
</component>
<component name="ProjectId" id="1Sr1PyvKre5eWJ6XgOrqWrHM5hp" />
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Application.Server">
<configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Client" />
<module name="2006rebotted" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="FileServer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="org.apollo.jagcached.FileServer" />
<module name="2006rebotted" />
<option name="WORKING_DIRECTORY" value="2006Redone file_server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.apollo.jagcached.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="redone.Server" />
<module name="2006rebotted" />
<option name="WORKING_DIRECTORY" value="2006Redone Server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="redone.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="Application.FileServer" />
<item itemvalue="Application.Server" />
<item itemvalue="Application.Client" />
</list>
<recent_temporary>
<list>
<item itemvalue="Application.Server" />
<item itemvalue="Application.FileServer" />
<item itemvalue="Application.Client" />
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="e34c4650-a3c9-498e-b05e-c1cbb72d0ad7" name="Default Changelist" comment="" />
<created>1572306880139</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1572306880139</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="0" width="974" height="1047" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.25" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
<window_info id="UI Designer" order="4" />
<window_info id="Capture Tool" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.032822758" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Messages" order="10" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
<window_info anchor="right" id="Palette" order="2" />
<window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
<window_info anchor="right" id="Maven" order="4" />
<window_info anchor="right" id="Theme Preview" order="5" />
<window_info anchor="right" id="Capture Analysis" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" />
</layout>
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER" />
</State>
</value>
</entry>
</map>
</option>
<option name="RECENT_FILTERS">
<map>
<entry key="Branch">
<value>
<list />
</value>
</entry>
<entry key="User">
<value>
<list />
</value>
</entry>
</map>
</option>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/players/Trading.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="404">
<caret line="74" column="108" lean-forward="true" selection-start-line="74" selection-start-column="108" selection-end-line="74" selection-end-column="108" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="2066" column="71" selection-start-line="2066" selection-start-column="71" selection-end-line="2066" selection-end-column="71" />
</state>
</provider>
</entry>
</component>
</project>
2006Redone Client/.classpath
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2006Redone Client/.gradle/4.10/fileChanges/last-build.bin
BIN
View File
Binary file not shown.
2006Redone Client/.gradle/4.10/fileHashes/fileHashes.bin
BIN
View File
Binary file not shown.
2006Redone Client/.gradle/4.10/fileHashes/fileHashes.lock
BIN
View File
Binary file not shown.
2006Redone Client/.gradle/4.10/gc.properties
View File
2006Redone Client/.gradle/4.10/taskHistory/taskHistory.bin
BIN
View File
Binary file not shown.
2006Redone Client/.gradle/4.10/taskHistory/taskHistory.lock
BIN
View File
Binary file not shown.
2006Redone Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock
BIN
View File
Binary file not shown.
2006Redone Client/.gradle/buildOutputCleanup/cache.properties
-2
View File
@@ -1,2 +0,0 @@
#Tue Jun 18 15:12:25 EDT 2019
gradle.version=4.10
2006Redone Client/.gradle/buildOutputCleanup/outputFiles.bin
BIN
View File
Binary file not shown.
2006Redone Client/.gradle/vcs-1/gc.properties
View File
2006Redone Client/.project
-17
View File
@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>RS2006</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
2006Redone Client/.settings/org.eclipse.jdt.core.prefs
-11
View File
@@ -1,11 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
2006Redone Client/2006Redone Client.iml
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
2006Redone Client/METAs/Client Meta/META-INF/MANIFEST.MF
-3
View File
@@ -1,3 +0,0 @@
Manifest-Version: 1.0
Main-Class: Main
2006Redone Client/METAs/Local Client Meta/META-INF/MANIFEST.MF
-3
View File
@@ -1,3 +0,0 @@
Manifest-Version: 1.0
Main-Class: Client
2006Redone Client/bin/Animable.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Animable_Sub3.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Animable_Sub4.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Animable_Sub5.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Animation.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Background.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Censor.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class11.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class13.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class18.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class21.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class29.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class30_Sub1.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class32.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class33.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class36.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class39.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class4.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class40.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class43.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class47.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class56.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class56_Sub1.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class56_Sub1_Sub1.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class56_Sub1_Sub2.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Class6.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/ClientSettings.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/CollisionMap.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Decompressor.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/DrawingArea.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/DummyClass.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Entity.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/EntityDef.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Flo.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Game.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Ground.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/IDK.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/ISAACRandomGen.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/InputStream_Sub1.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Item.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/ItemDef.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/MRUNodes.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Main.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Midi.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Model.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/MouseDetection.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/NPC.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Node.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/NodeCache.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/NodeList.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/NodeSub.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/NodeSubList.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Object1.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Object2.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Object3.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Object4.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Object5.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/ObjectDef.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/ObjectManager.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/OnDemandData.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/OnDemandFetcher.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/OnDemandFetcherParent.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Player.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/RSApplet.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/RSFrame.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/RSImageProducer.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/RSInterface.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/RSSocket.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Runnable_Impl1.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Signlink$Position.class
BIN
View File
Binary file not shown.
2006Redone Client/bin/Signlink.class
BIN
View File
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More