Commit graph

775 commits

Author SHA1 Message Date
Ceikry
02df79a4d3 Merge branch 'farming-fixes' into 'master'
Farming fixes:

See merge request 2009scape/2009scape!268
2021-09-22 23:46:26 +00:00
Avi Weinstock
91bc263856 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
1568f92d7c 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
176453bba4 Fix broad bolts on turroths and kurasks 2021-09-22 21:09:53 +00:00
Ceikry
2844ead13e 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
2a2f43a66a 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
Avi Weinstock
863d880bb4 Superglass Make has a 30% chance of yielding 2 molten glass. 2021-09-22 16:11:31 -04:00
Avi Weinstock
961581e33d 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
ba550fb0a8 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
8f83fd5e13 Possible fix for needing kicks 2021-09-17 13:01:35 -05:00
Avi Weinstock
34febc9f8a Implement pitfall trapping for larupias, graahks, and kyatts. 2021-09-16 15:54:14 -04:00
Avi Weinstock
0a5051a3cd 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
Avi Weinstock
48b7883ac9 Add the roar animation each time TDs change attack styles. 2021-09-14 21:45:18 -04:00
Ceikry
19c8a502fd 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
4a63b822db 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
Avi Weinstock
8369ba73e5 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
030769f959 Make charm drop rates more accurate. 2021-09-13 21:03:15 -04:00
Ceikry
fc0418e6ba 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
80c863a4a5 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
d109a31b1c Fixes right-click change-clothes option and migrate the file to kotlin 2021-09-13 15:04:05 -07:00
Avi Weinstock
62da15aff2 Tormented demons now correctly retaliate if attacked while non-aggressive. 2021-09-13 16:56:17 -04:00
Avi Weinstock
1b4b1463c0 Improve NPC usage of protection prayers.
- `NPC.hasProtectionPrayer` now accurately reflects protection prayers defined in `npc_configs.json`.
- NPC protection prayers now block 100% of the damage when attacked by a player in `Entity.getFormattedHit` instead of only blocking 40%.
2021-09-12 21:21:36 -04:00
Avi Weinstock
0bfcf2c200 Fix bunyip health formula and NPC id. 2021-09-11 19:43:05 -04:00
Ceikry
e29831ccd5 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
1d9f0ef86f 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
36beb5f935 Fly fishing rainbow fish now consumes stripy feathers instead of normal feathers. 2021-09-09 23:41:46 -04:00
Ceikry
7f8031b391 Merge branch 'red-topaz-machete' into 'master'
Red Topaz Machete Animations

See merge request 2009scape/2009scape!248
2021-09-10 01:54:15 +00:00
Ceikry
11c3f25095 Merge branch 'master' into 'master'
Fix: Taverley Dungeon QA Pass 6

See merge request 2009scape/2009scape!249
2021-09-10 01:53:54 +00:00
skelsoft
67f3460749 Fix: Taverley Dungeon QA Pass 6 2021-09-10 01:53:53 +00:00
Avi Weinstock
ac88483978 Improve mechanics relating to Tormented Demons. 2021-09-10 01:52:49 +00:00
downthecrop
9b1ff29aa5 Animations 2021-09-06 17:00:27 -07:00
skelsoft
8a61aba178 Fix: Taverley Dungeon QA Pass 5 2021-09-06 13:30:44 +00:00
ceikry
c8c1a49c05 Merge branch 'skelsoft/2009scape-master' 2021-09-04 16:30:12 -05:00
skelsoft
3bd5d12928 Fix: Taverley Dungeon QA Pass 4
- Corrected all Tormented Demon spawns inside the AGT (6 Tormented Demons)
- The gnarlier WGS model variant of Tormented Demon will also be able to spawn in the AGT (ID 8358)
- Fixed punctuation error in lantern making dialogue (LanternCrafting.kt)
- Coffin (ID 32290) and Altar Slab (ID 32289) object examines added
- Added all Poison Spider spawns to Taverley Dungeon (8 Poison Spiders)
- Added all lvl-45 Monk of Zamorak spawns to Taverley Dungeon (6 Monks of Zamorak)
- Corrected both Black Dragon spawns in Taverley Dungeon with their correct model variants
- Fernahei's Fishing Hut shop stock correction
2021-09-03 11:44:02 +10:00
downthecrop
caa80d7748 blocked teleports still using runes while spam clicking 2021-09-02 13:38:14 -07:00
skelsoft
123e228e22 Fix: Wizards' Guild Portals and more Taverley Dungeon work 2021-09-02 11:38:51 +00:00
skelsoft
932b1b93d6 Fix: Wizards' Guild Portals, more Taverley Dungeon, misc
- Corrected the exact teleport coordinates for all 3 Wizards' Guild portals (WizardGuildPortals.kt)
- Correct text printed in the chatbox when using one of the Wizards' Guild portals
- added knife ground item spawn inside Sorceror's Tower
- Thormac (ID 389) NPC examine added.
- spawned Zandar Horfyre NPC (ID 3308) in his correct location at the top of Dark Wizards' Tower
- Added all correct Hellhound spawns in Taverley Dungeon (13 Hellhounds!)
2021-09-02 12:54:05 +10:00
skelsoft
8f0088739a Fix: Taverley Dungeon QA Pass 3 2021-08-30 15:28:43 +00:00
skelsoft
f0ac494b64 Fix: Taverley Dungeon QA Pass 3
- Fishing Guild Shop stock corrections
- Fishing Guild Shop name correction
- Shantay Pass Shop stock corrections
- Grud's Herblore stall name correction
- Frincos' Fabulous Herb Store name correction
- Frincos' Fabulous Herb Store stock corrections
- level-19 Ghost examine text corrected
- Correct respawn rate of lvl-22 Skeletons at 70 ticks
- Correct respawn rate of lvl-25 Skeleton at 60 ticks
- Sapphire lantern (unfilled), Sapphire lantern (unlit) and Sapphire lantern (lit) now have correct examine text.
- Fishing spot (Barbarian fishing) and the Small Net/Bait Fishing spot near Barbarian Outpost now have correct examine text.
- Added all correct Hill Giant spawns to Taverley Dungeon (5 Hill Giants)
- Added all correct Giant Bat spawns to Taverley Dungeon (9 Giant Bats)
- Added all correct Ghost spawns to Taverley Dungeon (14 Ghosts)
- Added all correct Skeleton spawns to Taverley Dungeon (7 Skeletons)
- All monsters in the first half of Taverley Dungeon that have variant models, can now correctly spawn as variants (Lesser Demon, Hill Giant, Ghost, Skeleton)
2021-08-30 12:26:09 +10:00
ceikry
38f2579089 Refactor more old object naming to scenery 2021-08-28 21:56:33 -05:00
ceikry
0a6a929c2f Refactor more old object naming to scenery 2021-08-28 21:53:12 -05:00
Avi Weinstock
6f1467e765 Move the global 1/15 chance to not drop charms from code to data. 2021-08-28 17:26:39 -04:00
ceikry
94ebeca1d4 Charm table population no longer uses heuristics 2021-08-28 16:19:03 -05:00
ceikry
bde54cf208 Merge remote-tracking branch 'origin/master' 2021-08-28 13:54:18 -05:00
ceikry
417d53fc69 Fixed barcrawl 2021-08-28 13:54:08 -05:00
Avi Weinstock
f09ff04e61 Make "What Lies Below" completable by fixing Zaff's dialog. 2021-08-28 13:39:23 -04:00
ceikry
ba11798b1f Corrected the morytania swamp gate behavior 2021-08-28 12:26:41 -05:00
ceikry
549109ddb7 Gnome stronghold gate no longer restores run energy 2021-08-28 11:59:33 -05:00
ceikry
abb4953e08 Fixed fire orb charging 2021-08-28 11:53:53 -05:00
ceikry
e01399c701 Add the dusty key "mini-quest" 2021-08-28 11:46:48 -05:00