Commit graph

964 commits

Author SHA1 Message Date
skelsoft
d1c33de0a2 Merge remote-tracking branch 'upstream/master' 2021-08-27 13:42:36 +10:00
Ceikry
15cc641f63 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
90fa641788 Fix: Misc fixes, examine cleanup 2021-08-26 21:57:38 +00:00
ceikry
546d57aa8e Flip the check order to make more sense for useWith interactions 2021-08-25 21:56:54 -05:00
skelsoft
908e1e6c5f 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
e3d250fd1f Merge remote-tracking branch 'upstream/master' 2021-08-26 12:11:26 +10:00
ceikry
de9e37ffab Add dest override support to use with listeners 2021-08-25 20:17:38 -05:00
ceikry
0cb1e53f67 Add entity passthrough to destination overrides 2021-08-25 17:55:42 -05:00
skelsoft
0c17ef4ef3 Merge remote-tracking branch 'upstream/master' 2021-08-26 08:00:10 +10:00
ceikry
cd641fdaaf Merge remote-tracking branch 'origin/master' 2021-08-25 16:29:00 -05:00
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