Compare commits

...

129 Commits

Author SHA1 Message Date
dginovker 9efafdff47 Removed all java.awt.* 2019-12-13 12:30:07 -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
3146 changed files with 224407 additions and 83335 deletions
+2
View File
@@ -1,3 +1,5 @@
2006Redone\ Server/data/characters/
.idea/
.idea/workspace.xml
**/.idea/workspace.xml
**/.idea/*
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CheckStyle-IDEA">
<option name="configuration">
<map>
<entry key="checkstyle-version" value="8.25" />
<entry key="copy-libs" value="true" />
<entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
<entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
<entry key="scan-before-checkin" value="false" />
<entry key="scanscope" value="JavaOnly" />
<entry key="suppress-errors" value="false" />
</map>
</option>
</component>
</project>
+11 -113
View File
@@ -7,13 +7,7 @@
</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" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -21,46 +15,6 @@
<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>
@@ -69,12 +23,10 @@
<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 name="ProjectFrameBounds">
<option name="x" value="-7" />
<option name="width" value="1294" />
<option name="height" value="1407" />
</component>
<component name="ProjectId" id="1Sr1PyvKre5eWJ6XgOrqWrHM5hp" />
<component name="PropertiesComponent">
@@ -96,7 +48,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Application.Server">
<component name="RunManager" selected="Application.GameEngine">
<configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Client" />
<module name="2006rebotted" />
@@ -118,8 +70,8 @@
<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" />
<configuration name="GameEngine" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.rebotted.GameEngine" />
<module name="2006rebotted" />
<option name="WORKING_DIRECTORY" value="2006Redone Server" />
<extension name="coverage">
@@ -134,12 +86,12 @@
</configuration>
<list>
<item itemvalue="Application.FileServer" />
<item itemvalue="Application.Server" />
<item itemvalue="Application.GameEngine" />
<item itemvalue="Application.Client" />
</list>
<recent_temporary>
<list>
<item itemvalue="Application.Server" />
<item itemvalue="Application.GameEngine" />
<item itemvalue="Application.FileServer" />
<item itemvalue="Application.Client" />
</list>
@@ -150,7 +102,7 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="e34c4650-a3c9-498e-b05e-c1cbb72d0ad7" name="Default Changelist" comment="" />
<changelist id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="" />
<created>1572306880139</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
@@ -158,50 +110,12 @@
</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>
@@ -223,20 +137,4 @@
</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>
+2
View File
@@ -0,0 +1,2 @@
/Client.class
/LocalGame.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+7
View File
@@ -0,0 +1,7 @@
/* AUTOMATICALLY GENERATED ON Tue Apr 16 17:20:59 EDT 2002*/
/* DO NOT EDIT */
grant {
permission java.security.AllPermission;
};
+4 -4
View File
@@ -18,12 +18,11 @@ public class ClientSettings {
/**
* The Servers Ip
*
* You dont have to change this, the client will automatically connect to the server
* on localhost
* You don't have to change this, the client will automatically connect to the server
* on localhost (Assuming you're running Client and LocalGame respectively)
*
*/
//public static String SERVER_IP = "35.226.247.68"; //NOW SET IN Main,java
public static String SERVER_IP = "127.0.0.1";
public static String SERVER_IP = "2006rebotted.hopto.org";
/**
* The Npc Bits for the Server
*/
@@ -36,5 +35,6 @@ public class ClientSettings {
public static final BigInteger RSA_MODULUS = new BigInteger("91553247461173033466542043374346300088148707506479543786501537350363031301992107112953015516557748875487935404852620239974482067336878286174236183516364787082711186740254168914127361643305190640280157664988536979163450791820893999053469529344247707567448479470137716627440246788713008490213212272520901741443");
public static final BigInteger RSA_EXPONENT = new BigInteger("65537");
public final static Boolean SNOW = true;
}
+3
View File
@@ -25,6 +25,9 @@ public final class Flo {
return;
} else if (i == 1) {
anInt390 = stream.read3Bytes();
if (ClientSettings.SNOW) {
anInt390 = 0xffffff;
}
method262(anInt390);
} else if (i == 2) {
anInt391 = stream.readUnsignedByte();
+22 -6
View File
@@ -3,11 +3,13 @@
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
*/
import javax.swing.*;
import java.applet.AppletContext;
import java.awt.Color;
//import java.awt.*;
import java.awt.Component;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Color;
import java.awt.Font;
import java.awt.event.KeyEvent;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
@@ -4771,7 +4773,7 @@ public class Game extends RSApplet {
inputTaken = true;
}
if ((j == 13 || j == 10) && inputString.length() > 0) {
if (inputString.equals("::gfxtgl") || inputString.equals("::tglgfx")) {
if (inputString.equals("::gfxtgl") || inputString.equals("::tglgfx") || inputString.equals("::togglerender") || inputString.equals("::togglegfx")) {
graphicsEnabled = !graphicsEnabled;
}
if (myPrivilege == 2) {
@@ -9774,8 +9776,10 @@ public class Game extends RSApplet {
int j13 = stream.readUnsignedByte();
int k15 = anInt1268 + (j13 >> 4 & 7);
int l16 = anInt1269 + (j13 & 7);
if (k15 >= 0 && l16 >= 0 && k15 < 104 && l16 < 104)
if (k15 >= 0 && l16 >= 0 && k15 < 104 && l16 < 104) {
method130(-1, -1, j8, i11, l16, k5, plane, k15, 0);
}
return;
}
if (j == 151) {
@@ -9787,6 +9791,7 @@ public class Game extends RSApplet {
int i15 = k12 >> 2;
int k16 = k12 & 3;
int l17 = anIntArray1177[i15];
//System.out.println("id: " + j10 + " x:" + (this.baseX + anInt1268) + " y:" + (this.baseY + anInt1269));
if (l4 >= 0 && k7 >= 0 && l4 < 104 && k7 < 104)
method130(-1, j10, k16, l17, k7, i15, plane, l4, 0);
return;
@@ -10645,7 +10650,7 @@ public class Game extends RSApplet {
}
if (pktType == 174) {
int id = inStream.readUnsignedWord();
int type = inStream.readUnsignedByte();
int type = /*inStream.readUnsignedByte()*/1;
int delay = inStream.readUnsignedWord();
int volume = inStream.readUnsignedByte();
sound[currentSound] = id;
@@ -11420,6 +11425,7 @@ public class Game extends RSApplet {
Signlink.reporterror(s2);
resetLogout();
exception.printStackTrace();
}
return true;
}
@@ -11533,6 +11539,16 @@ public class Game extends RSApplet {
}
public Game() {
//Test if they're on 32-bit, warn them if they are
if (!System.getProperty("os.arch").contains("64"))
{
JOptionPane.showMessageDialog(null, "You're running 32-bit java. This will definitely cause problems.\nYou can get the right Java 8 at AdoptOpenJDK.net", "You're running 32-bit Java!", JOptionPane.INFORMATION_MESSAGE);
System.out.println("Please upgrade to 64-bit java to avoid problems! (AdoptOpenJDK.net)");
}
if (Double.parseDouble(System.getProperty("java.specification.version")) >= 1.9) {
JOptionPane.showMessageDialog(null, "You're not running Java 8. If you're using Parabot, this will cause problems!\nYou can get Java 8 from AdoptOpenJDK.net", "You're not running Java 8!", JOptionPane.INFORMATION_MESSAGE);
System.out.println("Please downgrade to Java 8 to avoid problems! (AdoptOpenJDK.net)");
}
server = ClientSettings.SERVER_IP;
anIntArrayArray825 = new int[104][104];
friendsNodeIDs = new int[200];
@@ -12167,7 +12183,7 @@ public class Game extends RSApplet {
this.anInt1187 += (j << 1);
}
public final void keyPressed(KeyEvent keyevent)
public void keyPressed(KeyEvent keyevent)
{
super.keyPressed(keyevent);
switch (keyevent.getKeyCode())
+1 -13
View File
@@ -3,18 +3,6 @@
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
*/
import java.applet.AppletContext;
import java.awt.*;
import java.awt.event.KeyEvent;
import java.io.*;
import java.net.InetAddress;
import java.net.Socket;
import java.net.URL;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Calendar;
import java.util.Date;
/**
* NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
* THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
@@ -23,6 +11,6 @@ import java.util.Date;
public class LocalGame extends Game {
public LocalGame() {
super();
server = ClientSettings.SERVER_IP;
server = "127.0.0.1";
}
}
+1 -1
View File
@@ -16,7 +16,7 @@ public final class Main {
*/
public static void main(String[] args) {
ClientSettings.SERVER_IP = "35.226.247.68";
ClientSettings.SERVER_IP = "2006rebotted.hopto.org";
if (args.length > 1)
{
System.out.println("Running local");
+8 -2
View File
@@ -4,7 +4,13 @@
import javax.swing.*;
import java.applet.Applet;
import java.awt.*;
//import java.awt.*;
import java.awt.Component;
import java.awt.Graphics;
import java.awt.Color;
import java.awt.Font;
import java.awt.Insets;
import java.awt.FontMetrics;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.KeyEvent;
@@ -284,7 +290,7 @@ public class RSApplet extends Applet implements Runnable, MouseListener, MouseMo
}
@Override
public final void mouseMoved(MouseEvent mouseevent) {
public void mouseMoved(MouseEvent mouseevent) {
int i = mouseevent.getX();
int j = mouseevent.getY();
if (gameFrame != null) {
+9 -1
View File
@@ -2,7 +2,15 @@
// Jad home page: http://www.kpdus.com/jad.html
// Decompiler options: packimports(3)
import java.awt.*;
//import java.awt.*;
import java.awt.Component;
import java.awt.Graphics;
import java.awt.Color;
import java.awt.Font;
import java.awt.Insets;
import java.awt.FontMetrics;
import java.awt.Frame;
import java.awt.Dimension;
@SuppressWarnings("serial")
final class RSFrame extends Frame {
+26 -26
View File
@@ -34,31 +34,31 @@ final class SizeConstants {
173, 228, 121, 83, 133, 68, 0
};
public static final int[] packetSizes = {
0, 0, 0, 0, 6, 0, 0, 0, 4, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, -2, 4, 3, 0, 0, 0,
0, 0, 0, 0, 5, 0, 0, 6, 0, 0,
9, 0, 0, -2, 0, 0, 0, 0, 0, 0,
-2, 1, 0, 0, 2, -2, 0, 0, 0, 0,
6, 3, 2, 4, 2, 4, 0, 0, 0, 4,
0, -2, 0, 0, 7, 2, 0, 6, 0, 0,
0, 0, 0, 0, 0, 0, 0, 2, 0, 1,
0, 2, 0, 0, -1, 4, 1, 0, 0, 0,
1, 0, 0, 0, 2, 0, 0, 15, 0, 0,
0, 4, 4, 0, 0, 0, -2, 0, 0, 0,
0, 0, 0, 0, 6, 0, 0, 0, 0, 0,
0, 0, 2, 0, 0, 0, 0, 14, 0, 0,
0, 4, 0, 0, 0, 0, 3, 0, 0, 0,
4, 0, 0, 0, 2, 0, 6, 0, 0, 0,
0, 3, 0, 0, 5, 0, 10, 6, 0, 0,
0, 0, 0, 0, 0, 2, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -1, 0, 0, 0,
4, 0, 0, 0, 0, 0, 3, 0, 2, 0,
0, 0, 0, 0, -2, 7, 0, 0, 2, 0,
0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
2, -2, 0, 0, 0, 0, 6, 0, 4, 3,
0, 0, 0, -1, 6, 0, 0
0, 0, 0, 0, 6, 0, 0, 0, 4, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //10
0, 0, 0, 0, 1, 0, 0, 0, 0, 0, //20
0, 0, 0, 0, -2, 4, 3, 0, 0, 0, //30
0, 0, 0, 0, 5, 0, 0, 6, 0, 0, //40
9, 0, 0, -2, 0, 0, 0, 0, 0, 0, //50
-2, 1, 0, 0, 2, -2, 0, 0, 0, 0, //60
6, 3, 2, 4, 2, 4, 0, 0, 0, 4, //70
0, -2, 0, 0, 7, 2, 0, 6, 0, 0, //80
0, 0, 0, 0, 0, 0, 0, 2, 0, 1, //90
0, 2, 0, 0, -1, 4, 1, 0, 0, 0, //100
1, 0, 0, 0, 2, 0, 0, 15, 0, 0, //110
0, 4, 4, 0, 0, 0, -2, 0, 0, 0, //120
0, 0, 0, 0, 6, 0, 0, 0, 0, 0, //130
0, 0, 2, 0, 0, 0, 0, 14, 0, 0, //140
0, 4, 0, 0, 0, 0, 3, 0, 0, 0, //150
4, 0, 0, 0, 2, 0, 6, 0, 0, 0, //160
0, 3, 0, 0, 5, 0, 10, 6, 0, 0, //170
0, 0, 0, 0, 0, 2, 0, 0, 0, 0, //180
0, 0, 0, 0, 0, 0, -1, 0, 0, 0, //190
4, 0, 0, 0, 0, 0, 3, 0, 2, 0, //200
0, 0, 0, 0, -2, 7, 0, 0, 2, 0, //210
0, 1, 0, 0, 0, 0, 0, 0, 0, 0, //220
8, 0, 0, 0, 0, 0, 0, 0, 0, 0, //230
2, -2, 0, 0, 0, 0, 6, 0, 4, 3, //240
0, 0, 0, -1, 6, 0, 0//250
};
}
Binary file not shown.
Binary file not shown.
Binary file not shown.

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