9c5dd57b63
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
b519afd1ed
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
39a8ad43d8
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
8568241cfa
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
0d3cf38d4d
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
d1404924d4
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
bd08682ef9
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
2dc4ac49f4
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
14a9f08644
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
2af1a6c2fd
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
0962af29a8
Merge branch 'farming-fixes' into 'master'
...
Farming fixes:
See merge request 2009scape/2009scape!268
2021-09-22 23:46:26 +00:00
c2a6aafed8
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
009fdde1c7
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
a0c6522fbc
Fix broad bolts on turroths and kurasks
2021-09-22 21:09:53 +00:00
9cdd121a8d
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
bf0376c4fa
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
849c5e957a
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
91657296dd
Superglass Make has a 30% chance of yielding 2 molten glass.
2021-09-22 16:11:31 -04:00
65aa4a82c3
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
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
9c18af8f8d
Possible fix for needing kicks
2021-09-17 13:01:35 -05:00
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
45dd084f5c
Implement pitfall trapping for larupias, graahks, and kyatts.
2021-09-16 15:54:14 -04:00
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
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
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
c1021dac4e
Add the roar animation each time TDs change attack styles.
2021-09-14 21:45:18 -04:00
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
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
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
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
e9749e7144
Make charm drop rates more accurate.
2021-09-13 21:03:15 -04:00
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
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
0182b93bc2
Fixes right-click change-clothes option and migrate the file to kotlin
2021-09-13 15:04:05 -07:00
24e417619e
Tormented demons now correctly retaliate if attacked while non-aggressive.
2021-09-13 16:56:17 -04:00
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
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
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
b4bd9d7f08
Fix bunyip health formula and NPC id.
2021-09-11 19:43:05 -04:00
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
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
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
0c818ba752
Fly fishing rainbow fish now consumes stripy feathers instead of normal feathers.
2021-09-09 23:41:46 -04:00
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
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
1cfd58528b
Fix: Taverley Dungeon QA Pass 6
2021-09-10 01:53:53 +00:00
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
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
e4419a4951
Improve mechanics relating to Tormented Demons.
2021-09-10 01:52:49 +00:00
Ceikry
vk
Avi Weinstock
vk
downthecrop
skelsoft