Commit Graph

456 Commits

Author SHA1 Message Date
downthecrop c858fdcdba Add type param to replaced Scenery 2021-10-27 14:44:44 -07:00
Ceikry d38820e032 Merge branch 'master' into 'master'
Fix: Crop Noting, misc JSON

See merge request 2009scape/2009scape!319
2021-10-27 19:08:02 +00:00
skelsoft c45fafe8bc Fix: Crop Noting, misc JSON 2021-10-27 19:08:02 +00:00
Avi Weinstock 8c2873e668 Fixes to NPC stacking and aggression:
- NPCs marked as `setAllowTolerance(false)` now properly do not become tolerant.
- NPCs now stack by default in multicombat zones, and this can be controlled more cleanly with `shouldPreventStacking`.
- Rock crabs/lobsters no longer revert to rock form when safespotted.
- Pest Control Brawlers now grant participation points when damaged.
- It is no longer possible to walk underneath Pest Control portals.
- Bursts/Barrages now target a square instead of a plus.
2021-10-26 02:32:14 -04:00
Ceikry 1404222819 Merge branch 'glory' into 'master'
fix jewelry for replacing wrong items.

See merge request 2009scape/2009scape!303
2021-10-23 12:57:37 +00:00
Ceikry 8c43154b21 Merge branch 'summoning-fixes' into 'master'
Some summoning-related fixes:

See merge request 2009scape/2009scape!315
2021-10-22 19:38:26 +00:00
downthecrop fddb96f0b0 Add using cat on Ardy civilians interaction 2021-10-22 12:30:46 -07:00
Avi Weinstock 7b74b2eb7f Some summoning-related fixes:
- Add sound effects for scroll, call, summon, point recharge (also ectophial refill sfx).
- Fix the check for summoning/calling a size > 1 familiar into an enclosed space.
- Fix some combat interactions with multi-square npcs.
2021-10-21 19:17:31 -04:00
skelsoft 587dd05e9e Add: Adventure Bot Dialogue Expansion Pak 2021-10-21 00:27:21 +00:00
Avi Weinstock b9328d40f4 Make use of the next/previous arrows in the interface used for ::stats, tracking all npc kills and tracking drops of items tagged with "rare_item": "true", and displaying a curated subset of them. 2021-10-18 22:02:01 -04:00
skelsoft 0619c577e9 Add: Genie Random Event 2021-10-18 02:52:12 +00:00
ceikry bf497bae36 Halloween Event 2021 2021-10-17 11:23:21 -05:00
vk 849444c9db fix jewelry for replacing wrong items. 2021-10-14 21:04:39 -07:00
Avi Weinstock 8f0ce1f7a2 Add sound effects for chivalry, piety, potionmaking, and pouchmaking. 2021-10-14 16:51:23 -04:00
skelsoft f53dfc0fab Add: JSON Monolith #1 2021-10-13 02:05:56 +00:00
ceikry c712cd50d7 Vinesweeper hotfix 2021-10-12 20:29:27 -05:00
ceikry de98152b4d Vinesweeper hotfix 2021-10-12 20:15:24 -05:00
ceikry 0093b225da Let the squish commence 2021-10-12 15:58:59 -05:00
downthecrop 3c1a7223ed Reset nextGrowth on clear patch 2021-10-10 13:56:53 -07:00
downthecrop 70cf5bbcfc Fix Seaweed, Ectofuntus Pot Filling, and Quest Typos 2021-10-07 21:42:32 +00:00
Avi Weinstock 28f198cb72 Implement vinesweeper 2021-10-07 00:25:15 +00:00
downthecrop e3d4c8eebe Canoe Animations & Travel Interface 2021-10-03 01:21:46 +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 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 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 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
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
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
Avi Weinstock 6a118b3a32 Fix sound effects for bind/snare/entangle, and also the essence mine teleport. 2021-09-27 20:44:51 -04: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
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
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
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
Avi Weinstock 45dd084f5c Implement pitfall trapping for larupias, graahks, and kyatts. 2021-09-16 15:54:14 -04: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 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 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
Ceikry 2849f55087 Merge branch 'more-tds-fixes' into 'master'
Increase tds aggro range and add proper music for the Ancient Guthix Temple.

See merge request 2009scape/2009scape!253
2021-09-11 01:52:05 +00:00
Avi Weinstock 07a7541a26 More TDs fixes:
- Increase TDs aggro range
- Add proper music for the Ancient Guthix Temple.
- Add a kill counter for TDs, and replace Bork with it in `::stats`.
2021-09-10 21:28:49 -04:00
Avi Weinstock 0c818ba752 Fly fishing rainbow fish now consumes stripy feathers instead of normal feathers. 2021-09-09 23:41:46 -04:00
Avi Weinstock e4419a4951 Improve mechanics relating to Tormented Demons. 2021-09-10 01:52:49 +00:00