Commit graph

1236 commits

Author SHA1 Message Date
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
Ceikry
39a8ad43d8 Merge branch 'farm2' into 'master'
bugfix: make FarmingPatch.TROLL_STRONGHOLD_HERB diease-free

See merge request 2009scape/2009scape!272
2021-09-25 13:17:22 +00:00
vk
8568241cfa bugfix: make FarmingPatch.TROLL_STRONGHOLD_HERB diease-free
The original change to add FarmingPatch.TROLL_STRONGHOLD_HERB to isFlowerProtected() was introduced a few days ago in order to attempt to make the troll patch disease-free.. however, it doesnt work.
The reason is that Patch.isFlowerProtected():297 has a check for `patch.type` to be `PatchType.ALLOTMENT`. That chech will return false before the when statement is ever executed.
I moved the check for TROLL_STRONGHOLD_HERB up a level since "isFlowerProtected" didnt seem like a right place for it anyway since it is not a flower protection.
2021-09-25 01:21:18 -07:00
Ceikry
0d3cf38d4d Merge branch 'farm' into 'master'
fix infinite farming yield from evil turnips (and maybe others)

See merge request 2009scape/2009scape!271
2021-09-25 01:39:27 +00:00
vk
d1404924d4 fix infinite farming yield from evil turnips (and maybe others)
Currently, a grown evil turnip has infinite yeild. This happens because of the return statemnt in the `else` calse of `chance` definition in `Patch.rollLivesDecrement()`.
Because of the return, the method exists before `cropLives` is decremented.
2021-09-24 18:01:05 -07:00
Ceikry
bd08682ef9 Merge branch 'iron' into 'master'
ironman drop fix: get drop if npcs delt damage.

See merge request 2009scape/2009scape!270
2021-09-24 23:23:50 +00:00
vk
2dc4ac49f4 ironman drop fix: get drop if npcs delt damage.
Currenly the check is done against the entire ImpactLog, which includes NPC damage.
This becomes very annoying when it comes to places like god wars where npcs constantly attach each other.
This change makes the loot check only look at other players, and not npcs.
The ironman player in question still has to do the most damage (including npcs) to get the drop.
2021-09-23 12:47:33 -07:00
Ceikry
14a9f08644 Merge branch 'combat-farming-bugfixes' into 'master'
Bugfixes for combat and farming:

See merge request 2009scape/2009scape!269
2021-09-23 17:02:25 +00:00
Avi Weinstock
2af1a6c2fd Bugfixes for combat and farming:
- Uncomposted patches no longer get lives incremented as if composted.
- Pitfall NPCs use the proper machinery for being not-attackable (so aviansies are no longer meleeable).
2021-09-23 13:00:20 -04:00
Ceikry
0962af29a8 Merge branch 'farming-fixes' into 'master'
Farming fixes:

See merge request 2009scape/2009scape!268
2021-09-22 23:46:26 +00:00
Avi Weinstock
c2a6aafed8 Farming fixes:
- Compost and supercompost now properly affect minimum herb yield.
- Troll stronghold herb patch is now disease-free.
- Mushroom patch west of Canifis now allows growing bittercap mushrooms.
- White lillies now grant protection to allotments.
2021-09-22 19:36:55 -04:00
Ceikry
009fdde1c7 Merge branch 'bolts' into 'master'
Fix broad bolts on turroths and kurasks

See merge request 2009scape/2009scape!264
2021-09-22 21:09:53 +00:00
vk
a0c6522fbc Fix broad bolts on turroths and kurasks 2021-09-22 21:09:53 +00:00
Ceikry
9cdd121a8d Merge branch 'fix-multitarget-xp' into 'master'
Fix xp of multitarget attacks (like chinchompas, dragon claw/halberd spec) and...

See merge request 2009scape/2009scape!265
2021-09-22 21:09:31 +00:00
Ceikry
bf0376c4fa Merge branch 'fix-bunyip-nullderef' into 'master'
Fix null dereference in bunyip special (the cooking map is keyed by raw food, not cooked food).

See merge request 2009scape/2009scape!266
2021-09-22 21:08:54 +00:00