Commit graph

1154 commits

Author SHA1 Message Date
ceikry
12ca3c272f Fix stackable consumable bug 2021-08-25 16:28:54 -05:00
Ceikry
55e898f180 Merge branch 'fix-slayer-streak' into 'master'
Give the correct amount of slayer task points on streaks that are a multiple of 50.

See merge request 2009scape/2009scape!235
2021-08-24 12:05:41 +00:00
Avi Weinstock
d7853c2b07 Give the correct amount of slayer task points on streaks that are a multiple of 50. 2021-08-24 00:21:09 -04:00
Ceikry
235b4aba34 Merge branch 'master' into 'master'
Nature Spirit Grotto Bridge Agility

See merge request 2009scape/2009scape!233
2021-08-24 03:41:00 +00:00
downthecrop
80c3643248 Nature Spirit Grotto Bridge Agility 2021-08-24 03:41:00 +00:00
Ceikry
625408024e Merge branch 'master' into 'master'
Fix: Taverley Dungeon QA Pass 1, misc fixes

See merge request 2009scape/2009scape!234
2021-08-24 02:37:43 +00:00
skelsoft
7b8b53b71f Fix: Taverley Dungeon QA Pass 1, misc fixes 2021-08-24 02:37:43 +00:00
skelsoft
ca3d2cb5f9 Fix: Taverley Dungeon QA Pass 1, misc fixes
- Chaos Druid (ID 181) stats corrected
- Chaos Druid correct respawn rate of 15 seconds
- Added all Chaos Druid spawns to Taverley Dungeon (6 Chaos Druids)
- Magic Axe (ID 127) stats corrected
- Magic Axe correct respawn rate of 18 seconds
- Added all Magic Axe spawns to Taverley Dungeon (7 Magic Axes)
- Poison Scorpion (ID 108) stats corrected
- Poison Scorpion correct respawn rate of 15 seconds
- Added all Poison Scorpion spawns to Taverley Dungeon (5 Poison Scorpions)
- Correctly added Sample Bottle to the Canifis General Store. This is required to create Oily fishing rods
- Added the Jail key to the Jailer's drop table
- Added 3 Rat spawns to Taverley Dungeon, near the jail cells
- Added 2 Dwarf spawns to the north jail cells in Taverley Dungeon
- Added Velrak the Explorer to the Taverley Dungeon 
- Added Crate, Barrel, Painting (bad King), Standard (Taverley Dungeon), Bed, and Suit of armour object examines
- Removed Falador Sheepdog from the SheepNPC.java (it's a dog not a sheep Arios...)
2021-08-24 12:00:45 +10:00
skelsoft
2ee72c83c1 Merge remote-tracking branch 'upstream/master' 2021-08-24 06:08:35 +10:00
ceikry
7fb72a0589 Merge remote-tracking branch 'origin/master' 2021-08-22 16:53:09 -05:00
ceikry
6878657059 Add independent sendGraphics method to ContentAPI. 2021-08-22 16:42:35 -05:00
ceikry
90df723c24 lil tweak 2021-08-20 20:56:01 -05:00
ceikry
761c4f80a1 fix graphical prayer bug 2021-08-20 20:54:52 -05:00
Ceikry
01734bbd2f Merge branch 'master' into 'master'
Fix: Morytania QA Pass 1, misc fixes

See merge request 2009scape/2009scape!231
2021-08-21 00:48:42 +00:00
skelsoft
53c9c5541a Fix: Morytania QA Pass 1, misc fixes 2021-08-21 00:48:42 +00:00
ceikry
f5aab8c9c4 Fixed a bug with slayer. 2021-08-20 19:33:33 -05:00
skelsoft
9d24efdce0 Fix: Morytania QA Pass 1, misc fixes
Drezel (IDs 1049, 7690, 7707) examine added.
Ulizius (ID 1054) examine added.
Hiylik Myna (ID 1514) examine added.
Filiman Tarlock (ID 1050) examine added.
Nature Spirit (ID 1051) examine added.
Wall underneath Paterdormus temple (ID 30532) examine added.
Gravestone (IDs 30671, 30672) examine added.
Gravestone (IDs 30667, 30669) examine added.
Wishing well (ID 28715) examine added.
Inert obelisk (IDs 28720, 28721) examine added.
Druid pouch (empty) (ID 2957) examine corrected.
Ghoul (ID 1218) stats corrected.
Ghoul correct respawn delay of 21 seconds.
Ghoul Champion (ID 3059) stats corrected.
Myre Blamish Snail (IDs 1227, 1232) stats corrected.
Blood Blamish Snail (IDs 1228, 1233) stats corrected.
Corrected spawn locations of Blood Blamish Snails.
Ochre Blamish Snail (IDs 1229, 1234) stats corrected.
Bruise Blamish Snail (IDs 1230, 1235) stats corrected.
Bark Blamish Snail (ID 1231) stats corrected.
Corrected spawn locations of Bark Blamish Snails.
All snails are correctly aggressive, and have correct respawn delays of 30 seconds.
Added the Falador Farm Sheepdog. The most important change of this PR.
2021-08-20 12:40:00 +10:00
skelsoft
81309304c9 Merge remote-tracking branch 'upstream/master' 2021-08-20 06:34:48 +10:00
Ceikry
ec4f62d4f8 Merge branch 'master' into 'master'
Priest in Peril dialogue accuracy and 'null' npc chatbox

See merge request 2009scape/2009scape!229
2021-08-19 02:45:59 +00:00
Ceikry
eea8095643 Merge branch 'master' into 'master'
Turoth drop table corrections

See merge request 2009scape/2009scape!230
2021-08-19 02:42:28 +00:00
Woahscam
e514d78c91 Turoth drop table corrections 2021-08-19 02:42:28 +00:00
downthecrop
bfd74bbcee dialogue accuracy and 'null' npc chatbox 2021-08-18 16:41:08 -07:00
ceikry
476291f14b Corrected scroll exchange rate 2021-08-17 10:08:10 -05:00
ceikry
4e38a76b0b Fixed a bug with bogrog 2021-08-17 09:36:17 -05:00
skelsoft
bd930b037d Merge remote-tracking branch 'upstream/master' 2021-08-17 06:06:32 +10:00
ceikry
df9c5a6f1b Add check for NS completion for silver sickle 2021-08-16 06:59:44 -05:00
Ceikry
050fced0ea Merge branch 'funny-spirit-quest' into 'master'
Nature Spirit quest

See merge request 2009scape/2009scape!228
2021-08-16 02:22:10 +00:00
Ceikry
11963ede80 Nature Spirit quest 2021-08-16 02:22:10 +00:00
ceikry
54da219240 Clear + disable prayers (more cleanup) 2021-08-13 17:24:36 -05:00
ceikry
eedaa95a16 finalized prayer changes 2021-08-13 17:08:33 -05:00
ceikry
5efa040405 Wrap up prayer changes 2021-08-13 17:03:53 -05:00
ceikry
96ae9b35f8 Refactor prayer changes into a more organized location 2021-08-13 17:00:36 -05:00
ceikry
38a280d0a1 Fixed an exploit with prayer point decrementing 2021-08-13 16:56:22 -05:00
ceikry
c376997fe2 Merge remote-tracking branch 'origin/master' 2021-08-13 12:08:29 -05:00
ceikry
c0cdf6910a Fixed a bug with clipping assignment 2021-08-13 12:08:24 -05:00
Ceikry
c7159bf727 Merge branch 'master' into 'master'
Turoth spawn and config fixes

See merge request 2009scape/2009scape!227
2021-08-13 14:51:57 +00:00
Woahscam
0c3adc88af Turoth spawn and config fixes 2021-08-13 14:51:57 +00:00
Ceikry
82f1c171b4 Merge branch 'master' into 'master'
Changes to ExaminePacket.java

See merge request 2009scape/2009scape!226
2021-08-13 13:29:45 +00:00
Woahscam
369ac84f4d Changes to ExaminePacket.java 2021-08-13 13:29:45 +00:00
ceikry
8fb567bfa6 Merge remote-tracking branch 'origin/master' 2021-08-13 07:50:04 -05:00
ceikry
1d41ef242b Poisoning items without free inventory space should no longer nuke the product from existence 2021-08-13 07:49:57 -05:00
Ceikry
f8ab8e9a66 Merge branch 'master' into 'master'
Examine: Pizzas, Pies, Barrows Gear and Damaged Books

See merge request 2009scape/2009scape!225
2021-08-13 12:40:06 +00:00
skelsoft
6562d5a000 Examine: Pizzas, Pies, Barrows Gear and Damaged Books 2021-08-13 12:40:05 +00:00
skelsoft
3b62fb2eb9 Examine: Pizzas, Pies, Barrows Gear and Damaged Books
- All pizzas, and half-eaten pizzas now have corrected examine text
- Burnt pizza correct examine text

- Cooked slimy eel is now correctly droppable (why the hell did it have a destroy option in the first place?)

- All crayfish (burnt, raw, cooked) and the Crayfish cage now correctly tradeable and droppable

- All crayfish (incl Crayfish Cage) now have correct examine text

- All Damaged God Books (Guthix, Saradomin, Zamorak) now have correct examine text

- All pies (incl. partly-made Mud/Fish/Wild/Admiral/Garden/Summer pies, Burnt pie and noted pies) have correct examine text

- All Ahrim's equipment corrected examine text.
- All Dharok's equipment corrected examine text.
- All Guthan's equipment corrected examine text.
- All Karil's equipment corrected examine text.
- All Torag's equipment corrected examine text.
- All Verac's equipment corrected examine text.
2021-08-13 10:04:22 +10:00
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