Commit Graph

2800 Commits

Author SHA1 Message Date
Ceikry 1bd086cfc5 Merge branch 'weeds-bug-fix' into 'master'
Reset nextGrowth on farming patch clear

See merge request 2009scape/2009scape!297
2021-10-10 21:11:16 +00:00
downthecrop 3c1a7223ed Reset nextGrowth on clear patch 2021-10-10 13:56:53 -07:00
Ceikry ad1806f7c3 Merge branch 'misc-fixes' into 'master'
Fix Seaweed, Ectofuntus Pot Filling, and Quest Typos

See merge request 2009scape/2009scape!296
2021-10-07 21:42:32 +00:00
downthecrop 70cf5bbcfc Fix Seaweed, Ectofuntus Pot Filling, and Quest Typos 2021-10-07 21:42:32 +00:00
Ceikry 4fb06680f1 Merge branch 'vinesweeper' into 'master'
Implement vinesweeper

See merge request 2009scape/2009scape!295
2021-10-07 00:25:16 +00:00
Avi Weinstock 28f198cb72 Implement vinesweeper 2021-10-07 00:25:15 +00:00
Ceikry c3086f9b27 Merge branch 'fix-slayerdart-purchase' into 'master'
Give the correct amount of mind runes when purchasing 250 slayer dart casts.

See merge request 2009scape/2009scape!294
2021-10-03 23:20:13 +00:00
Avi Weinstock d0a76522bd Give the correct amount of mind runes when purchasing 250 slayer dart casts. 2021-10-03 18:44:24 -04:00
Ceikry ff6aab2fec Merge branch 'fix-dairy-churn' into 'master'
Dairy churning fixes:

See merge request 2009scape/2009scape!293
2021-10-03 21:24:24 +00:00
Avi Weinstock 07a0c1cd31 Dairy churning fixes:
- It's now possible to churn cream/butter into the subsequent stages.
- Churning milk with a full inventory drops the buckets.
2021-10-03 16:50:48 -04:00
Ceikry 2679d300a3 Merge branch 'titan2' into 'master'
add lava titan teleport to lava maze (near kbd lair)

See merge request 2009scape/2009scape!290
2021-10-03 20:12:32 +00:00
vk 5b6338f5bb add lava titan teleport to lava maze (near kbd lair) 2021-10-03 20:12:31 +00:00
Ceikry fba5deb371 Merge branch 'zanaris-fountains' into 'master'
Make Zanaris fairy fountains count as a water source.

See merge request 2009scape/2009scape!292
2021-10-03 20:12:03 +00:00
Avi Weinstock 71802ce604 Make Zanaris fairy fountains count as a water source. 2021-10-03 15:38:38 -04:00
Ceikry 8bb0940f8d Merge branch 'titan' into 'master'
implement fire, ice and moss titan summoning scrolls

See merge request 2009scape/2009scape!289
2021-10-03 03:13:48 +00:00
vk 60c7a270f8 implement fire, ice and moss titan summoning scrolls 2021-10-03 03:13:48 +00:00
Ceikry 1cce6a3e89 Merge branch 'Canoe-Animations' into 'master'
Canoe Animations & Travel Interface

See merge request 2009scape/2009scape!288
2021-10-03 01:21:46 +00:00
downthecrop e3d4c8eebe Canoe Animations & Travel Interface 2021-10-03 01:21:46 +00:00
Ceikry e0086c8e80 Merge branch 'master' into 'master'
Fix: Blue Partyhat from the credits shop should be the correct item

See merge request 2009scape/2009scape!287
2021-10-02 21:57:11 +00:00
skelsoft b1d8d9bb93 Fix: Blue Partyhat from the credits shop should be the correct item 2021-10-02 21:57:11 +00:00
Ceikry dcd45ebb15 Merge branch 'add-sfx' into 'master'
Add protect from summoning and antifire/antipoison 30 second ticking sounds.

See merge request 2009scape/2009scape!286
2021-10-01 02:39:49 +00:00
Ceikry 1c4dbe181c Merge branch 'fix-sapphire-lanterns' into 'master'
Lighting sapphire lanterns requires filling them with lamp oil first.

See merge request 2009scape/2009scape!285
2021-10-01 02:39:34 +00:00
Ceikry f6e50eb5b3 Merge branch 'teclyn-leprechaun' into 'master'
Teclyn (the elf near the Lletya fruit tree patch) should function as a tool leprechaun.

See merge request 2009scape/2009scape!284
2021-10-01 02:39:19 +00:00
Ceikry 4852ac4cce Merge branch 'fix-crystal-recharge' into 'master'
Fixes to crystal equipment:

See merge request 2009scape/2009scape!283
2021-10-01 02:38:54 +00:00
Ceikry 881ab07a48 Merge branch 'ardougne-spice-stall' into 'master'
Fix broken Ardougne spice stall

See merge request 2009scape/2009scape!282
2021-10-01 02:38:25 +00:00
Ceikry f2bb078c67 Merge branch 'dumpcontainer-fix-kt' into 'master'
Fix hang when depositing inventory or equipped items

See merge request 2009scape/2009scape!281
2021-10-01 02:38:15 +00:00
ceikry 7eb12f5607 Merge remote-tracking branch 'origin/master' 2021-09-30 21:35:31 -05:00
ceikry f9df84d7ec Patch out old hween event 2021-09-30 21:35:25 -05:00
Avi Weinstock 3d7322e4f9 Add protect from summoning and antifire/antipoison 30 second ticking sounds. 2021-09-30 15:46:11 -04:00
Avi Weinstock e7b08dcf75 Lighting sapphire lanterns requires filling them with lamp oil first. 2021-09-30 15:30:47 -04:00
Avi Weinstock d785f12626 Teclyn (the elf near the Lletya fruit tree patch) should function as a tool leprechaun. 2021-09-30 14:48:28 -04:00
Avi Weinstock 232bc463c6 Fixes to crystal equipment:
- The price of recharging bows/shields decreases by 180k per recharge, to a minimum of 180k.
- The price of a new bow/shield is always 900k.
- Elven teleport crystals similarly decrease from 750 to 150 by 150, using a separate recharge counter.
- Eluned doesn't sell additional teleport crystals, only recharges them.
- Removed custom functionality from teleport crystals that allowed teleporting into unallocated instances.
2021-09-30 14:31:24 -04:00
James Triantafylos cfe95c1a19 Fix broken Ardougne spice stall
This commit allows players to theive from the Ardougne spice stall as
they should be able to.

It also corrects the theiving XP from 16 to 81 as it should be.
2021-09-30 14:27:09 -04:00
James Triantafylos 4cf4545cf8 Fix hang when depositing inventory or equipped items
This commit fixes an issue where the DumpContainer dialogue hangs when
a player attempts to deposit their inventory or equipped items when they
do not have any items in their inventory or are not wearing any items.

This commit also converts the DumpContainer dialogue plugin from Java to
Kotlin to work towards converting the 2009scape codebase to Kotlin.
2021-09-30 13:09:21 -04:00
Ceikry e3bc99513d Merge branch 'master' into 'master'
Fix: Proselyte Tasset

See merge request 2009scape/2009scape!280
2021-09-30 03:09:13 +00:00
skelsoft 2bfb705858 Fix: Proselyte Tasset 2021-09-30 03:09:13 +00:00
Ceikry c4ea03bd28 Merge branch 'fix-states' into 'master'
Fixes to things using the PlayerState machinery:

See merge request 2009scape/2009scape!279
2021-09-29 03:13:24 +00:00
Avi Weinstock 1365b612ba Fixes to things using the PlayerState machinery:
- Charge now clears the state when it finishes, allowing consecutive uses without relogging.
- Ava's device clears the state when unequipped, allong it to be equipped again later.
- (Unrelated to states) Binding necklace now uses amulet-slot degradation instead of degrading your hat.
2021-09-28 16:15:13 -04:00
Ceikry 732af62e8c Merge branch 'prayer-sfx' into 'master'
Add proper sound effect for running out of prayer, and clear the overhead icon when that happens.

See merge request 2009scape/2009scape!275
2021-09-28 13:48:37 +00:00
Ceikry fc4959dc4b Merge branch 'runecrafting-sfx' into 'master'
Add proper sound effects for crafting runes and antifire/antiposion expiration.

See merge request 2009scape/2009scape!276
2021-09-28 13:48:18 +00:00
Ceikry 888eaa12eb Merge branch 'bind-sfx-1' into 'master'
Fix sound effects for bind/snare/entangle, and also the essence mine teleport.

See merge request 2009scape/2009scape!277
2021-09-28 13:48:08 +00:00
Ceikry f15d0d3357 Merge branch 'clues' into 'master'
fix clue scroll drops.

See merge request 2009scape/2009scape!278
2021-09-28 13:47:27 +00:00
vk d027728c7f fix clue scroll drops.
There is a fairly significant bug with clue scrolls. The only npcs that drops clue scrolls right now are hellhonds (that is because their ids are hard-coded in TreasureTrailPlugin.createDrop()). All other npcs do not drop clues due to a bug in `NPCDropTables`.

`NPCDropTables` has two separate ways to access the actual table: one is though `List<WeightedChanceItem> defaultTable`, ` List<WeightedChanceItem> charmTable`, and `List<WeightedChanceItem> mainTable`; And the other is though a combined table `NPCDropTable table`. The problem is that only `NPCDropTable table` is set properly--the other 3 tables are always empty.

The reason clues were bugged was because `TreasureTrailPlugin.createDrop()` has a check for `npc.getDefinition().getDropTables().getMainTable().size() < 3`, which always fails. I really do not see the point in this check to begin with, so i am going to remove it. The hard-coded check for hellounds is pointless as well and should be removed.
I am also going to remove the 3 empty tables from `NPCDropTables` to avoid and similar bugs in the future.

Alternatively, it is possible to make changes to `DropTableParser` and keep those tables, then add post-parsing step to populate `NPCDropTable table` from them. However that would just duplicate all the data in all drops table, and since nothing else was using these individual tables, i just opted for removing them.
2021-09-28 01:44:09 -07:00
Avi Weinstock 6a118b3a32 Fix sound effects for bind/snare/entangle, and also the essence mine teleport. 2021-09-27 20:44:51 -04:00
Avi Weinstock a7ff35c9d2 Add proper sound effects for crafting runes and antifire/antiposion expiration. 2021-09-27 16:56:40 -04:00
Avi Weinstock eed3b4d880 Add proper sound effect for running out of prayer, and clear the overhead icon when that happens. 2021-09-27 14:57:37 -04:00
Ceikry 4124ebdef3 Merge branch 'pc' into 'master'
pc improvement - implement priority

See merge request 2009scape/2009scape!274
2021-09-26 22:21:49 +00:00
vk 6589d73ef8 pc improvement - implement priority 2021-09-26 22:21:49 +00:00
Ceikry 9c5dd57b63 Merge branch 'shops' into 'master'
use item.value instead of item.maxValue as base shop price

See merge request 2009scape/2009scape!273
2021-09-25 22:05:52 +00:00
vk b519afd1ed use item.value instead of item.maxValue as base shop price
This fixes the issue of all shop prices being 5% more than they are supposed to (like dlong/d skimmy being 105k insread of 100k, and even spirit shards being 26 ea instead of 25 ea).
2021-09-25 13:25:48 -07:00