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
1166 commits 27 branches 56 tags 837 MiB
Commit graph

1166 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ceikry
b39d811dd0 Merge branch 'improve-trees' into 'master' 
Improve farming trees:

See merge request 2009scape/2009scape!324
 2021-10-29 21:47:53 +00:00
Avi Weinstock
469934fc70 Improve farming trees: 
- Trees regrow from their stumps over time, or from Hydra's regrowth scrolls.
- Diseased trees can be cured with secateurs.
- Willow branches can be harvested from willow trees.
- Giant ent improves yields of certain patch types by 50%.
 2021-10-29 17:46:13 -04:00
Ceikry
36f3e0ae88 Update README to reflect new template requirements 2021-10-28 13:14:46 +00:00
ceikry
80b6a5b9db Fixed 2021-10-28 08:10:20 -05:00
ceikry
5ebaa55f5b This should probably be done too 2021-10-28 08:09:00 -05:00
Ceikry
989839a04d Add new file 2021-10-28 13:05:02 +00:00
Ceikry
caad58be5f ADD MR TEMPLATE DIR 2021-10-28 13:01:26 +00:00
Ceikry
70e0039421 Add CHANGELOG 2021-10-28 12:58:02 +00:00
Ceikry
d0688cd7f1 Merge branch 'MiningNode-Type' into 'master' 
Add 'type' param to replaced Mining Scenery

See merge request 2009scape/2009scape!322
 2021-10-28 01:41:50 +00:00
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
Ceikry
6db51b8901 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
a2c957a934 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
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
Avi Weinstock
98786f71e6 Fix decanting 4-dose super {attack, strength, defense} into 2-dose potions. 2021-10-24 20:21:59 -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
37fd17b131 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
d49c8a3498 JSON: Pet Shop, misc examines and fixes 2021-10-22 19:38:45 +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
Ceikry
5d8b25df03 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
a7369edd12 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
fddb96f0b0 Add using cat on Ardy civilians interaction 2021-10-22 12:30:46 -07:00
ceikry
82ea666014 This should probably be done too 2021-10-22 13:55:27 -05:00
ceikry
d72718b705 Merge remote-tracking branch 'origin/master' 2021-10-22 13:54:33 -05:00
ceikry
b8ae0254c2 Fix non-fatal NPE in networking code 2021-10-22 13:54:28 -05:00
Avi Weinstock
f464251657 Add sound effects for cleaning herbs. 2021-10-21 20:33:42 -04: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
Ceikry
a3632c0331 Merge branch 'clue2' into 'master' 
various clue loot fixes

See merge request 2009scape/2009scape!312
 2021-10-21 20:58:15 +00:00
vk
f67605d742 various clue loot fixes 2021-10-21 20:58:14 +00:00
Ceikry
2261e90c04 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
f954ec8fd2 change 50 kudos diary to 50 quest points 2021-10-21 20:57:29 +00:00
Ceikry
8c0e1a5f39 Merge branch 'edgeville-gate' into 'master' 
Edgeville Dungeon Gate

See merge request 2009scape/2009scape!314
 2021-10-21 20:55:48 +00:00
downthecrop
cb60f2bc85 Edgeville Dungeon Gate 2021-10-21 20:55:48 +00:00
Ceikry
bdc68680cf 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
587dd05e9e Add: Adventure Bot Dialogue Expansion Pak 2021-10-21 00:27:21 +00:00
Ceikry
64c7f1ae5f 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
fd8f4eed79 Merge branch 'master' into 'master' 
Fix: Kurious Kalphites

See merge request 2009scape/2009scape!308
 2021-10-19 21:14:13 +00:00
skelsoft
69f73378dc Fix: Kurious Kalphites 2021-10-19 21:14:13 +00:00
Ceikry
fb3931fbf4 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
3f58fbdc1d 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
b371c89d0c 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
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
Avi Weinstock
ee17d4592e Fix varrock newspaper interface indicies, and fix a syntax error in npc_spawns.json. 2021-10-18 13:48:27 -04:00
Ceikry
1cd298b14c Merge branch 'master' into 'master' 
Add: Genie Random Event

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

See merge request 2009scape/2009scape!306
 2021-10-18 00:35:13 +00:00
Geoff
2a59243542 Dragon Drop Tables 2021-10-18 00:35:13 +00:00
ceikry
bf497bae36 Halloween Event 2021 2021-10-17 11:23:21 -05:00
Ceikry
4c96da1fd3 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