Commit Graph

1267 Commits

Author SHA1 Message Date
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
Ceikry 849c5e957a Merge branch 'superglassmake-yield' into 'master'
Superglass Make has a 30% chance of yielding 2 molten glass.

See merge request 2009scape/2009scape!267
2021-09-22 21:08:37 +00:00
Avi Weinstock 91657296dd Superglass Make has a 30% chance of yielding 2 molten glass. 2021-09-22 16:11:31 -04:00
Avi Weinstock 65aa4a82c3 Fix null dereference in bunyip special (the cooking map is keyed by raw food, not cooked food). 2021-09-22 15:31:02 -04:00
Avi Weinstock 849273ecb5 Fix xp of multitarget attacks (like chinchompas, dragon claw/halberd spec) and fix chinchompa attack pattern (square instead of plus). 2021-09-22 15:10:49 -04:00
ceikry 9c18af8f8d Possible fix for needing kicks 2021-09-17 13:01:35 -05:00
Ceikry 0ed25421f8 Merge branch 'add-pitfall-traps' into 'master'
Implement pitfall trapping for larupias, graahks, and kyatts.

See merge request 2009scape/2009scape!263
2021-09-16 19:59:48 +00:00
Avi Weinstock 45dd084f5c Implement pitfall trapping for larupias, graahks, and kyatts. 2021-09-16 15:54:14 -04:00
Ceikry 71e7b33942 Merge branch 'special-attack-types' into 'master'
Special attacks now have proper types (so they no longer ignore prayer) and give experience.

See merge request 2009scape/2009scape!261
2021-09-15 21:09:48 +00:00
Avi Weinstock d85b7223db Special attacks now have proper types (so they no longer ignore prayer) and give experience.
Also add "::infinitespecial" admin command for testing special attacks.
2021-09-15 13:18:00 -04:00
Ceikry a5e35f137d Merge branch 'add-tds-roar' into 'master'
Add the roar animation each time TDs change attack styles.

See merge request 2009scape/2009scape!260
2021-09-15 01:50:06 +00:00
Avi Weinstock c1021dac4e Add the roar animation each time TDs change attack styles. 2021-09-14 21:45:18 -04:00
Ceikry bee2d26de2 Merge branch 'thessalia-change-clothes' into 'master'
Thessalia change-clothes bug-fix option and migrate to kotlin

See merge request 2009scape/2009scape!257
2021-09-14 22:38:43 +00:00
Ceikry c421f43aa9 Merge branch 'charm-data' into 'master'
Make charm drop rates more accurate.

See merge request 2009scape/2009scape!258
2021-09-14 22:37:27 +00:00
Ceikry 5033df9417 Merge branch 'fix-tds-melee' into 'master'
Explicitly set the combat style from the NPC config instead of assuming the default is melee.

See merge request 2009scape/2009scape!259
2021-09-14 22:36:37 +00:00
Avi Weinstock 4039ce65f1 Explicitly set the combat style from the NPC config instead of assuming the default is melee.
Previously, TDs would just keep their previous style when switching to a state that had melee defined.
2021-09-14 15:37:27 -04:00
Avi Weinstock e9749e7144 Make charm drop rates more accurate. 2021-09-13 21:03:15 -04:00
Ceikry 6a3d1858d3 Merge branch 'fix-tds-retaliation' into 'master'
Tormented demons now correctly retaliate if attacked while non-aggressive.

See merge request 2009scape/2009scape!256
2021-09-13 22:14:04 +00:00
Ceikry 4ae2d74b79 Merge branch 'jsonify-empty-charms' into 'master'
Move the global 1/15 chance to not drop charms from code to data.

See merge request 2009scape/2009scape!242
2021-09-13 22:13:47 +00:00
downthecrop 0182b93bc2 Fixes right-click change-clothes option and migrate the file to kotlin 2021-09-13 15:04:05 -07:00