Commit Graph

1613 Commits

Author SHA1 Message Date
Ceikry 12b6c95168 Merge branch 'master' into 'master'
Fix: Misc fixes, examine cleanup

See merge request 2009scape/2009scape!236
2021-08-26 21:57:38 +00:00
skelsoft 060ce6e549 Fix: Misc fixes, examine cleanup 2021-08-26 21:57:38 +00:00
ceikry d0b532ef29 Flip the check order to make more sense for useWith interactions 2021-08-25 21:56:54 -05:00
skelsoft d70aae89fc Fix: Misc fixes, examine cleanup
- Added Blamish oil to FinishedPotion.java, enabling the ability to mix Blamish snail slime and an unfinished Harralander potion into Blamish oil. This is a necessary component in creating Oily Fishing rods.
- Added Blamish oil to Consumables.java, as it is authentically a fake consumable, printing text in the chatbox that the player would rather not drink this.
- Corrected Zamorak chick, bird, and hawk examines.
- Corrected Guthix chick, bird, and raptor examines.
- Corrected Saradomin chick, bird, and owl examines.
- Corrected a typo with some dialogue in GodBookPlugin.java
- Added the correct Poison Scorpion spawns to North Brimhaven mine (7 Poison Scorpions)
- Fixed some small typo errors in my previous examine PR.
2021-08-26 12:12:38 +10:00
skelsoft 2ae13e9878 Merge remote-tracking branch 'upstream/master' 2021-08-26 12:11:26 +10:00
ceikry 88466e94d6 Add dest override support to use with listeners 2021-08-25 20:17:38 -05:00
ceikry 0dc59c29ba Add entity passthrough to destination overrides 2021-08-25 17:55:42 -05:00
skelsoft 455bf21acc Merge remote-tracking branch 'upstream/master' 2021-08-26 08:00:10 +10:00
ceikry cea00a6998 Merge remote-tracking branch 'origin/master' 2021-08-25 16:29:00 -05:00
ceikry 39cd30eac1 Fix stackable consumable bug 2021-08-25 16:28:54 -05:00
Ceikry 58c5165179 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 b94b14b20d 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 5fb7972535 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 ff81deb59e Nature Spirit Grotto Bridge Agility 2021-08-24 03:41:00 +00:00
Ceikry c3fa00dc37 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 2119dacbc5 Fix: Taverley Dungeon QA Pass 1, misc fixes 2021-08-24 02:37:43 +00:00
skelsoft cb21e0aca6 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 005a946c51 Merge remote-tracking branch 'upstream/master' 2021-08-24 06:08:35 +10:00
ceikry 7d9562476c Merge remote-tracking branch 'origin/master' 2021-08-22 16:53:09 -05:00
ceikry 9e23e0d243 Add independent sendGraphics method to ContentAPI. 2021-08-22 16:42:35 -05:00
ceikry c95d86e0f4 lil tweak 2021-08-20 20:56:01 -05:00
ceikry d9fbb49e51 fix graphical prayer bug 2021-08-20 20:54:52 -05:00
Ceikry c9124497af 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 2787a757f6 Fix: Morytania QA Pass 1, misc fixes 2021-08-21 00:48:42 +00:00
ceikry 55dbedb1ba Fixed a bug with slayer. 2021-08-20 19:33:33 -05:00
skelsoft 6e0ac5a792 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 32d37a0f82 Merge remote-tracking branch 'upstream/master' 2021-08-20 06:34:48 +10:00
Ceikry 7d13bf4036 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 ef5ecedaff Merge branch 'master' into 'master'
Turoth drop table corrections

See merge request 2009scape/2009scape!230
2021-08-19 02:42:28 +00:00
Woahscam 3af8c85863 Turoth drop table corrections 2021-08-19 02:42:28 +00:00
downthecrop 7b477b780a dialogue accuracy and 'null' npc chatbox 2021-08-18 16:41:08 -07:00
ceikry f9d4cf83a3 Corrected scroll exchange rate 2021-08-17 10:08:10 -05:00
ceikry b53c005b0f Fixed a bug with bogrog 2021-08-17 09:36:17 -05:00
skelsoft 679b5025cc Merge remote-tracking branch 'upstream/master' 2021-08-17 06:06:32 +10:00
ceikry 8d16b3d4e4 Add check for NS completion for silver sickle 2021-08-16 06:59:44 -05:00
Ceikry ab17195f16 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 b23aa7bc0d Nature Spirit quest 2021-08-16 02:22:10 +00:00
ceikry 0e2f51f851 Clear + disable prayers (more cleanup) 2021-08-13 17:24:36 -05:00
ceikry aa1e6f9ea0 finalized prayer changes 2021-08-13 17:08:33 -05:00
ceikry a27008fd37 Wrap up prayer changes 2021-08-13 17:03:53 -05:00
ceikry 54c2ae11f6 Refactor prayer changes into a more organized location 2021-08-13 17:00:36 -05:00
ceikry 6f175869e7 Fixed an exploit with prayer point decrementing 2021-08-13 16:56:22 -05:00
ceikry f24af733ca Merge remote-tracking branch 'origin/master' 2021-08-13 12:08:29 -05:00
ceikry 3135f14e7a Fixed a bug with clipping assignment 2021-08-13 12:08:24 -05:00
Ceikry 222c6fda52 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 c072f9e1f9 Turoth spawn and config fixes 2021-08-13 14:51:57 +00:00
Ceikry a938319f49 Merge branch 'master' into 'master'
Changes to ExaminePacket.java

See merge request 2009scape/2009scape!226
2021-08-13 13:29:45 +00:00
Woahscam 18c052fe7c Changes to ExaminePacket.java 2021-08-13 13:29:45 +00:00
ceikry 73550a50ef Merge remote-tracking branch 'origin/master' 2021-08-13 07:50:04 -05:00
ceikry 2f6a65012f Poisoning items without free inventory space should no longer nuke the product from existence 2021-08-13 07:49:57 -05:00