2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-21 09:02:07 -07:00
Code Issues Projects Releases Packages Wiki Activity
1133 commits 27 branches 56 tags 837 MiB
Commit graph

1133 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Avi Weinstock
24e417619e Tormented demons now correctly retaliate if attacked while non-aggressive. 2021-09-13 16:56:17 -04:00
Ceikry
57cd36a4d1 Merge branch 'fix-npc-protect-prayers' into 'master' 
Improve NPC usage of protection prayers.

See merge request 2009scape/2009scape!255
 2021-09-13 15:44:46 +00:00
Avi Weinstock
e9f7b4e515 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
Ceikry
cde9c69fdf Merge branch 'fix-bunyip' into 'master' 
Fix bunyip health formula and NPC id.

See merge request 2009scape/2009scape!254
 2021-09-11 23:49:16 +00:00
Avi Weinstock
b4bd9d7f08 Fix bunyip health formula and NPC id. 2021-09-11 19:43:05 -04: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
Ceikry
f608908bce Merge branch 'fix-rainbow-fish' into 'master' 
Fly fishing rainbow fish now consumes stripy feathers instead of normal feathers.

See merge request 2009scape/2009scape!252
 2021-09-11 01:51:56 +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
Ceikry
34053f7078 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
fde5c42fc6 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
1cfd58528b Fix: Taverley Dungeon QA Pass 6 2021-09-10 01:53:53 +00:00
Ceikry
d16bcee272 Merge branch 'fishing-trawler-wiki' into 'master' 
Move Fishing Trawler Solo-player Guide to Wiki

See merge request 2009scape/2009scape!250
 2021-09-10 01:53:30 +00:00
Ceikry
f104aaf1e7 Merge branch 'fix-multitarget-protects' into 'master' 
Improve mechanics relating to Tormented Demons.

See merge request 2009scape/2009scape!251
 2021-09-10 01:52:49 +00:00
Avi Weinstock
e4419a4951 Improve mechanics relating to Tormented Demons. 2021-09-10 01:52:49 +00:00
downthecrop
8d5bd26591 Move Fishing Trawler Solo-player Guide to wiki article 2021-09-08 22:12:56 -07:00
downthecrop
6853210ceb Animations 2021-09-06 17:00:27 -07:00
Ceikry
edcb359acb Merge branch 'master' into 'master' 
Fix: Taverley Dungeon QA Pass 5

See merge request 2009scape/2009scape!247
 2021-09-06 13:30:44 +00:00
skelsoft
42bac3233b Fix: Taverley Dungeon QA Pass 5 2021-09-06 13:30:44 +00:00
ceikry
7dc6862395 Merge branch 'skelsoft/2009scape-master' 2021-09-04 16:30:12 -05:00
skelsoft
e2a1ca7712 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
Ceikry
15729a9d2a Merge branch 'master' into 'master' 
blocked teleports still using runes while spam clicking

See merge request 2009scape/2009scape!245
 2021-09-02 22:07:08 +00:00
skelsoft
130d0350b0 Merge remote-tracking branch 'upstream/master' 2021-09-03 07:59:16 +10:00
downthecrop
75e8930e9b blocked teleports still using runes while spam clicking 2021-09-02 13:38:14 -07:00
Ceikry
6d577df8d9 Merge branch 'master' into 'master' 
Fix: Wizards' Guild Portals and more Taverley Dungeon work

See merge request 2009scape/2009scape!244
 2021-09-02 11:38:51 +00:00
skelsoft
56a2be9aec Fix: Wizards' Guild Portals and more Taverley Dungeon work 2021-09-02 11:38:51 +00:00
skelsoft
1951aa1739 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
a5627343f0 Merge remote-tracking branch 'upstream/master' 2021-09-02 07:55:45 +10:00
Ceikry
1673c0e5b4 Merge branch 'master' into 'master' 
Fix: Taverley Dungeon QA Pass 3

See merge request 2009scape/2009scape!243
 2021-08-30 15:28:43 +00:00
skelsoft
02b2ff6d38 Fix: Taverley Dungeon QA Pass 3 2021-08-30 15:28:43 +00:00
skelsoft
4760725b0f 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
skelsoft
18670ea753 Merge remote-tracking branch 'upstream/master' 2021-08-30 08:22:24 +10:00
ceikry
711d2b25ab Refactor more old object naming to scenery 2021-08-28 21:56:33 -05:00
ceikry
72c426a466 Refactor more old object naming to scenery 2021-08-28 21:53:12 -05:00