Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity
910 commits 2 branches 53 tags 893 MiB
Commit graph

910 commits

This branch
This branch
All branches
Author SHA1 Message Date
skelsoft
993d8eedfa Merge remote-tracking branch 'upstream/master' 2021-08-13 08:08:03 +10:00
ceikry
721000c491 Merge remote-tracking branch 'origin/master' 2021-08-12 10:11:11 -05:00
ceikry
e54b20581b New content api method 2021-08-12 10:11:05 -05:00
Ceikry
c553b7961d Merge branch 'master' into 'master' 
Fix: Cooking Overhaul, Draynor Seed Market, and Port Sarim Examines

See merge request 2009scape/2009scape!224
 2021-08-11 23:43:50 +00:00
skelsoft
cb8661d7fc Fix: Cooking Overhaul, Draynor Seed Market, and Port Sarim Examines 2021-08-11 23:43:50 +00:00
skelsoft
96a597b1f7 Fix: Cooking Overhaul, Draynor Seed Market, and Port Sarim Examines 
- Most object examines in Port Sarim have been accounted for and added
- Stuffed Swordfish, Shelf, Barrel, Fish Barrel, Large Table, Crate, Crate (stacked), Plant, Clock, Chest, Small Table, Counter, two Ladders, three Crates, Painting (Landscape), Drawers, Chair, Bookcase, Bed, Dresser, Range, Candles, Cabinet, Axe Cabinet, Staircase, Charms and Mirror objects located within Port Sarim now have the proper examine text added

- Draynor Seed Market shop name correction
- Draynor Seed Market shop stock correction (can now correctly buy some low-level Farming seeds)

- Cooking Overhaul:
- Removed stinky OSRS Dark Crab from the CookableItems.java
- Can now correctly cook Crayfish
- Can now correctly consume Cooked Crayfish for 2HP.
- Can now correctly cook Mud pies
- Correct burn levels for Shrimp, Crayfish, Karambwanji, Salmon, Tuna, Cave Eel, Bass, Karambwan, Chicken, Ugthanki Meat, Rabbit, Crab Meat, Thin Snail, Lean Snail, Fat Snail, Bread, Cake, Beef, Rat Meat, Yak Meat, Bear Meat, Plain Pizza, Cooked Chompy, Roast Bird, Roast Rabbit, Redberry Pie, Meat Pie, Mud Pie, Apple Pie, Garden Pie, Fish Pie, Admiral Pie, Scrambled Egg, Fried Onions, Fried Mushrooms
- Cooking EXP corrections:
- Cooking Shrimp EXP corrected from 45 EXP -> 30 EXP
- Cooking Salmon EXP corrected from 58 EXP -> 90 EXP
- Cooking Karambwan EXP corrected from 80 -> 190 EXP
- Cooking Roast Beast meat EXP corrected from 82 EXP -> 99 EXP
- Cooking Roast Rabbit EXP corrected from 70 EXP -> 72 EXP
- Cooking Fried Mushrooms EXP corrected from 120 EXP -> 60 EXP
 2021-08-12 09:33:44 +10:00
skelsoft
d2b3e9251a Merge remote-tracking branch 'upstream/master' 2021-08-12 07:01:57 +10:00
ceikry
9edb5cd8c4 Fixed potential exploit with the bonegrinder 2021-08-11 15:48:10 -05:00
ceikry
b2fa44c0bf I swear to god Arios... 2021-08-11 15:35:20 -05:00
ceikry
f24d6f44f7 Fixed a bug with slayer 2021-08-11 10:05:20 -05:00
ceikry
fdc060cbc1 Improved MS security 2021-08-10 22:16:48 -05:00
ceikry
d0a1bd3007 Arios does it again part 4124571293: euh 2021-08-10 09:15:28 -05:00
ceikry
b5e3216399 Why was this not ignored intellij? 2021-08-10 09:07:56 -05:00
ceikry
1bd5cb44d8 More junk management server code cleanup 2021-08-10 09:06:11 -05:00
ceikry
d23b53ba6f Trying to patch up some junky code in the management server 2021-08-10 00:02:47 -05:00
ceikry
5c8774de89 Cleanup CTZ/ServerStore 2021-08-09 19:03:09 -05:00
Ceikry
1affefbe81 Merge branch 'bork_daily_reset' into 'master' 
Changed Bork to use daily reset.

See merge request 2009scape/2009scape!220
 2021-08-10 00:02:05 +00:00
Ceikry
24b2fd7e6a Merge branch 'wiz_guild_fix' into 'master' 
Code Cleanup - Wizards Guild uses ContentAPI now.

See merge request 2009scape/2009scape!221
 2021-08-10 00:00:36 +00:00
Ceikry
37d5922df6 Merge branch 'server_run_fix' into 'master' 
Removed space causing parser error.

See merge request 2009scape/2009scape!222
 2021-08-09 23:59:50 +00:00
NixWigton
880e2ba4e1 Removed space causing parser error. 2021-08-09 18:52:04 -05:00
NixWigton
8f9af6b4c4 Code Cleanup - Wizards Guild uses ContentAPI now. 2021-08-09 18:41:12 -05:00
NixWigton
2f1fdde80b Changed Bork to use daily reset. 2021-08-09 18:34:56 -05:00
Ceikry
0b0f4f81ac Merge branch 'wiz_guild_fix' into 'master' 
Allow boosts to be used to enter wizard's guild.

See merge request 2009scape/2009scape!219
 2021-08-09 23:32:43 +00:00
Ceikry
34a88f9879 Merge branch 'master' into 'master' 
Fix: Rats, Shades and their Robes, misc fixes

See merge request 2009scape/2009scape!215
 2021-08-09 23:31:10 +00:00
skelsoft
6593b430d9 Fix: Rats, Shades and their Robes, misc fixes 2021-08-09 23:31:10 +00:00
Ceikry
9781777874 Merge branch 'cutscene_fix' into 'master' 
Fixed issue where interface options disappear after cutscenes.

See merge request 2009scape/2009scape!218
 2021-08-09 23:29:22 +00:00
NixWigton
6d181b439e Fixed issue where interface options disappear after cutscenes. 2021-08-09 16:34:39 -05:00
NixWigton
befb0bf4e1 Allow boosts to be used to enter wizard's guild. 2021-08-09 16:30:15 -05:00
ceikry
ed722c9e41 Massive varp/varbit related refactoring + new client command 2021-08-09 13:20:07 -05:00
ceikry
e4811e32e3 Remove potentially problematic while loops 2021-08-08 23:40:14 -05:00
ceikry
0d0f5e0e69 Slight code cleanup 2021-08-08 23:28:27 -05:00
ceikry
1f8073354d Change update worker to dedicated thread 2021-08-08 23:27:49 -05:00
ceikry
eb2517ef3e Added + handled varbit packet 2021-08-08 23:15:18 -05:00
ceikry
2a1e082485 Server will create a thread dump on a heartbeat death 2021-08-08 22:22:03 -05:00
ceikry
f8950359a2 Remove 10x and 20x options from Hans. 2021-08-08 12:02:18 -05:00
ceikry
32d2c842b7 Corrected combat level formula 2021-08-07 18:22:45 -05:00
ceikry
9bb7508d24 Merge remote-tracking branch 'origin/master' 2021-08-07 15:11:46 -05:00
ceikry
e8945be28b Corrected dragonslayer-locked equipment 2021-08-07 15:11:42 -05:00
Ceikry
793574910b Merge branch 'tree_spirit_fix' into 'master' 
Fixed tree spirit spawning issue.

See merge request 2009scape/2009scape!217
 2021-08-06 20:59:07 +00:00
NixWigton
62d72891a4 Fixed tree spirit spawning issue. 2021-08-06 15:58:01 -05:00
ceikry
c106f68665 Merge remote-tracking branch 'origin/master' 2021-08-06 14:53:48 -05:00
ceikry
7be1861af9 Ironman restricted to own house 2021-08-06 14:53:41 -05:00
Ceikry
f7ea93748a Merge branch 'simon_templeton_debug_message' into 'master' 
Removed random message when talking to Simon Templeton.

See merge request 2009scape/2009scape!216
 2021-08-06 19:31:19 +00:00
NixWigton
2ce801c77b Removed random message when talking to Simon Templeton. 2021-08-06 14:28:53 -05:00
ceikry
e34a6a1d4e Purged bill. 2021-08-06 09:52:45 -05:00
ceikry
76c01f2d2e Convert shop class to kotlin 2021-08-06 08:10:22 -05:00
ceikry
8f09081151 Rename .java to .kt 2021-08-06 08:10:22 -05:00
ceikry
73dc0370c8 I quit 2021-08-06 07:22:43 -05:00
ceikry
b2254fb318 Fixed a bug with slayer 2021-08-05 21:23:30 -05:00
ceikry
9ebcbe56e2 I wish I could exist for a single day without getting a migraine from very stupid issues. 2021-08-05 20:12:40 -05:00