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

1154 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ceikry
9b72e609a5 Merge branch 'pc' into 'master' 
pc improvement - implement priority

See merge request 2009scape/2009scape!274
 2021-09-26 22:21:49 +00:00
vk
e1edd1bf90 pc improvement - implement priority 2021-09-26 22:21:49 +00:00
Ceikry
8d383bad19 Merge branch 'shops' into 'master' 
use item.value instead of item.maxValue as base shop price

See merge request 2009scape/2009scape!273
 2021-09-25 22:05:52 +00:00
vk
030476c244 use item.value instead of item.maxValue as base shop price 
This fixes the issue of all shop prices being 5% more than they are supposed to (like dlong/d skimmy being 105k insread of 100k, and even spirit shards being 26 ea instead of 25 ea).
 2021-09-25 13:25:48 -07:00
Ceikry
c1192c2331 Merge branch 'farm2' into 'master' 
bugfix: make FarmingPatch.TROLL_STRONGHOLD_HERB diease-free

See merge request 2009scape/2009scape!272
 2021-09-25 13:17:22 +00:00
vk
c70a8040f1 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
Ceikry
6dfa48e93b Merge branch 'farm' into 'master' 
fix infinite farming yield from evil turnips (and maybe others)

See merge request 2009scape/2009scape!271
 2021-09-25 01:39:27 +00:00
vk
65d00fe48f 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
Ceikry
b17908b275 Merge branch 'iron' into 'master' 
ironman drop fix: get drop if npcs delt damage.

See merge request 2009scape/2009scape!270
 2021-09-24 23:23:50 +00:00
vk
21e2851d1b ironman drop fix: get drop if npcs delt damage. 
Currenly the check is done against the entire ImpactLog, which includes NPC damage.
This becomes very annoying when it comes to places like god wars where npcs constantly attach each other.
This change makes the loot check only look at other players, and not npcs.
The ironman player in question still has to do the most damage (including npcs) to get the drop.
 2021-09-23 12:47:33 -07:00
Ceikry
4c073b8534 Merge branch 'combat-farming-bugfixes' into 'master' 
Bugfixes for combat and farming:

See merge request 2009scape/2009scape!269
 2021-09-23 17:02:25 +00:00
Avi Weinstock
2d61f5a411 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
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
Ceikry
027e75c3ab Merge branch 'superglassmake-yield' into 'master' 
Superglass Make has a 30% chance of yielding 2 molten glass.

See merge request 2009scape/2009scape!267
 2021-09-22 21:08:37 +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
Ceikry
69eb5e8e25 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
34febc9f8a Implement pitfall trapping for larupias, graahks, and kyatts. 2021-09-16 15:54:14 -04:00
Ceikry
4716c35c6a 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
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
Ceikry
47b38f5fbe 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
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
Ceikry
dbc0fc756a 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
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
Ceikry
716eba245c 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
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
Ceikry
9882443afc 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
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
Ceikry
69f353f3a8 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
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
Ceikry
fa48631752 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