Commit graph

1154 commits

Author SHA1 Message Date
Ceikry
d78b550a76 Merge branch 'fix-decanting-supers' into 'master'
Fix decanting 4-dose super {attack, strength, defense} into 2-dose potions.

See merge request 2009scape/2009scape!320
2021-10-27 19:07:52 +00:00
Ceikry
370636b96b Merge branch 'aggro-fixes' into 'master'
Fixes to NPC stacking and aggression:

See merge request 2009scape/2009scape!321
2021-10-27 19:07:43 +00:00
Avi Weinstock
ff950f1587 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
Avi Weinstock
f7f8ed6775 Fix decanting 4-dose super {attack, strength, defense} into 2-dose potions. 2021-10-24 20:21:59 -04:00
Ceikry
456a45f9d3 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
28cc1add11 Merge branch 'master' into 'master'
JSON: Pet Shop, misc examines and fixes

See merge request 2009scape/2009scape!316
2021-10-22 19:38:45 +00:00
skelsoft
24f6cf96c9 JSON: Pet Shop, misc examines and fixes 2021-10-22 19:38:45 +00:00
Ceikry
e41f6a2b48 Merge branch 'summoning-fixes' into 'master'
Some summoning-related fixes:

See merge request 2009scape/2009scape!315
2021-10-22 19:38:26 +00:00
Ceikry
40531d5a72 Merge branch 'herb-sfx' into 'master'
Add sound effects for cleaning herbs.

See merge request 2009scape/2009scape!317
2021-10-22 19:37:22 +00:00
Ceikry
aabb433106 Merge branch 'CatOnArdyCivilian' into 'master'
Ardy Civilians Give 100 Death Runes for a Cat

See merge request 2009scape/2009scape!318
2021-10-22 19:37:08 +00:00
downthecrop
a0826ba9be Add using cat on Ardy civilians interaction 2021-10-22 12:30:46 -07:00
ceikry
b34f0c454f This should probably be done too 2021-10-22 13:55:27 -05:00
ceikry
b265803271 Merge remote-tracking branch 'origin/master' 2021-10-22 13:54:33 -05:00
ceikry
5a6657e243 Fix non-fatal NPE in networking code 2021-10-22 13:54:28 -05:00
Avi Weinstock
2498b3177f Add sound effects for cleaning herbs. 2021-10-21 20:33:42 -04:00
Avi Weinstock
cb7133a233 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
Ceikry
63e3b17b51 Merge branch 'clue2' into 'master'
various clue loot fixes

See merge request 2009scape/2009scape!312
2021-10-21 20:58:15 +00:00
vk
30b391520e various clue loot fixes 2021-10-21 20:58:14 +00:00
Ceikry
19e40759fc Merge branch 'diary' into 'master'
change 50 kudos diary to 50 quest points

See merge request 2009scape/2009scape!313
2021-10-21 20:57:29 +00:00
vk
665df24bce change 50 kudos diary to 50 quest points 2021-10-21 20:57:29 +00:00
Ceikry
75425eb953 Merge branch 'edgeville-gate' into 'master'
Edgeville Dungeon Gate

See merge request 2009scape/2009scape!314
2021-10-21 20:55:48 +00:00
downthecrop
1e35173fcc Edgeville Dungeon Gate 2021-10-21 20:55:48 +00:00
Ceikry
a2c1953010 Merge branch 'master' into 'master'
Add: Adventure Bot Dialogue Expansion Pak

See merge request 2009scape/2009scape!311
2021-10-21 00:27:22 +00:00
skelsoft
474a35a8db Add: Adventure Bot Dialogue Expansion Pak 2021-10-21 00:27:21 +00:00
Ceikry
48c9c2be74 Merge branch 'fix-newspaper' into 'master'
Fix varrock newspaper interface indicies, and fix a syntax error in `npc_spawns.json`.

See merge request 2009scape/2009scape!307
2021-10-19 21:14:30 +00:00
Ceikry
2dc242cf2c Merge branch 'master' into 'master'
Fix: Kurious Kalphites

See merge request 2009scape/2009scape!308
2021-10-19 21:14:13 +00:00
skelsoft
908cd28adc Fix: Kurious Kalphites 2021-10-19 21:14:13 +00:00
Ceikry
7ad8855bae Merge branch 'fancier-stats' into 'master'
Make use of the next/previous arrows in the interface used for `::stats`,...

See merge request 2009scape/2009scape!309
2021-10-19 21:13:54 +00:00
Ceikry
bafd8454db Merge branch 'lava2' into 'master'
add lava titan's mining boost

See merge request 2009scape/2009scape!310
2021-10-19 21:11:58 +00:00
vk
bba2de414a add lava titan's mining boost
lava titan should give an invisible +10 mining level boost.
2021-10-18 19:21:34 -07:00
Avi Weinstock
79084de3bd 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
Avi Weinstock
9f273ea02c Fix varrock newspaper interface indicies, and fix a syntax error in npc_spawns.json. 2021-10-18 13:48:27 -04:00
Ceikry
370870656e Merge branch 'master' into 'master'
Add: Genie Random Event

See merge request 2009scape/2009scape!305
2021-10-18 02:52:12 +00:00
skelsoft
062f4cb85c Add: Genie Random Event 2021-10-18 02:52:12 +00:00
Ceikry
322ceb1dc2 Merge branch 'master' into 'master'
Dragon Drop Tables

See merge request 2009scape/2009scape!306
2021-10-18 00:35:13 +00:00
Geoff
d91bacf7e7 Dragon Drop Tables 2021-10-18 00:35:13 +00:00
ceikry
d4359ccc60 Halloween Event 2021 2021-10-17 11:23:21 -05:00
Ceikry
9ed4282635 Merge branch 'master' into 'master'
Add: Corporeal Beast Drop Table Restoration

See merge request 2009scape/2009scape!302
2021-10-15 11:18:30 +00:00
skelsoft
eb69f7416f Add: Corporeal Beast Drop Table Restoration 2021-10-15 11:18:30 +00:00
Ceikry
697d136238 Merge branch 'dump-sfx' into 'master'
Add "dumpsfx" command to dump sound effects to wav files.

See merge request 2009scape/2009scape!301
2021-10-15 11:18:01 +00:00
Ceikry
f12885eb7a Merge branch 'misc-sfx' into 'master'
Add sound effects for chivalry, piety, potionmaking, and pouchmaking.

See merge request 2009scape/2009scape!300
2021-10-15 11:17:54 +00:00
vk
8bb0de73fe fix jewelry for replacing wrong items. 2021-10-14 21:04:39 -07:00
Avi Weinstock
758b15eeca Add "dumpsfx" command to dump sound effects to wav files. 2021-10-14 21:28:55 -04:00
Avi Weinstock
a91fc0e7ca Add sound effects for chivalry, piety, potionmaking, and pouchmaking. 2021-10-14 16:51:23 -04:00
ceikry
e7515d404b Merge remote-tracking branch 'origin/master' 2021-10-14 07:03:17 -05:00
ceikry
ba7c5f4f83 Not spamclicking????? IMPOSSIBLE! 2021-10-14 07:03:11 -05:00
Ceikry
c0d2daee0f Merge branch 'master' into 'master'
Fix: Tying up some loose ends from Monolith

See merge request 2009scape/2009scape!299
2021-10-14 03:02:01 +00:00
skelsoft
8b9b36f96a Fix: Tying up some loose ends from Monolith 2021-10-14 03:02:00 +00:00
Ceikry
eaaeb04069 Merge branch 'master' into 'master'
Add: JSON Monolith #1

See merge request 2009scape/2009scape!298
2021-10-13 02:05:56 +00:00
skelsoft
badec11be7 Add: JSON Monolith #1 2021-10-13 02:05:56 +00:00