Commit Graph
100 Commits
Author SHA1 Message Date
Tomas Slusny 56ad7f5991 Merge pull request #6393 from deathbeam/add-ammo-to-equipment-idx
Add AMMO(13) to EquipmentInventorySlot
2018-11-08 18:38:38 +01:00
Tomas Slusny 257ae31db9 Add AMMO(13) to EquipmentInventorySlot
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-11-08 15:37:23 +01:00
Tomas Slusny e187a34e3c Merge pull request #6145 from raiyni/tags-chatbox
Bank Tags: refactor to use new ChatboxPanelManager
2018-11-06 17:04:31 +01:00
Tomas Slusny ed5fb05a51 Add support for kills left, kills done and kills/hr to XpTrackerPlugin (#6163)
- Move NPC health data to NPCManager
- Extract action-related data from skill experience snapshots to separate class
- Add possibility for snapshot to hold multiple types of actions
- Add support for ACTOR_HEALTH action type that shows kills left, kills done and kills/hr in XP tracker sidebar

Preview:
![preview](https://media.discordapp.net/attachments/419891709883973642/504650896672555009/screenie.png)

Fixes #1594
Closes #4015
2018-11-06 14:57:31 +01:00
Tomas Slusny a97b4384f6 Add support for kills left to XpTrackerPlugin
Fixes #1594
Closes #4015

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-11-06 14:05:36 +01:00
Tomas Slusny 74a2313449 Create different action types for XpTracker plugin
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-11-06 14:04:31 +01:00
Tomas Slusny 1f13c27a6a Create NPC manager that can return HP for NPC
- Create NPC manager and move logic from opponent info there for getting
NPC HP based on combat level and name
- Make opponent info use NPC manager instead of its own implementation

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-11-06 14:04:31 +01:00
Tomas Slusny 9173c6a048 Merge pull request #6366 from raiyni/zerker-neck
Add BERSERKER_NECKLACE prayer bonus
2018-11-06 08:09:44 +01:00
Tomas Slusny 3f50f01e39 Merge pull request #6311 from deathbeam/item-variations-json
Convert item variations to json and add support for trident, slayer helm and same-name different id items
2018-11-05 10:15:26 +01:00
Tomas Slusny 185fa52a20 Merge pull request #6292 from WooxSolo/fix-tile-outline
Fix localToCanvas on fixed screen
2018-11-03 19:04:01 +01:00
Tomas Slusny 44934690ae Merge pull request #5797 from deathbeam/add-native-open-sidebar-button
Add support for hiding/showing sidebar button with custom chrome disabled
2018-11-03 18:59:24 +01:00
Tomas Slusny 28170af13c Add support for hiding/showing sidebar button
Draw hide/show sidebar button in top-right corner using Game's draw
hook. This will not work in Vanilla and so it is disabled in it.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-11-03 18:52:15 +01:00
Tomas Slusny 7eb09d45af Cleanup SwingUtil
- Remove unused code
- Remove hardcoded size for icons

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-11-03 18:51:48 +01:00
Tomas Slusny 91dd07f405 Make ItemVariationsMapping use generated json
This adds support for many new variations (mostly slayer helmets,
tridents and items with different ids but same names).

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-11-03 18:30:55 +01:00
Tomas Slusny 1983abd5c4 Merge pull request #6293 from Hydrox6/chat-colour-twitch-fix
Make Twitch messages respect custom Chat Colours
2018-11-03 15:02:32 +01:00
Tomas Slusny 3f904d3804 Merge pull request #6244 from deathbeam/idle-notifier-fixes
Properly update last action times in Idle Notifier
2018-11-03 12:44:30 +01:00
Tomas Slusny c1e32f4e89 Merge pull request #6183 from Nightfirecat/configure-inventory-tags-menumanager
Update Inventory tags plugin to use MenuManager
2018-11-03 10:53:06 +01:00
Tomas Slusny 0c3577b914 Merge pull request #6296 from WooxSolo/fix-hovered-tile
Improve hovered tile accuracy
2018-11-03 10:47:33 +01:00
Tomas Slusny 5df481361d Merge pull request #6295 from devLotto/issue-6294
stretchedmode: fix size not being reset on plugin disable
2018-11-03 10:34:14 +01:00
Tomas Slusny 9733482a31 Merge pull request #6298 from raiyni/tags-startswith
Bank tags: tag search should be startsWith not contains
2018-11-02 18:32:26 +01:00
Tomas Slusny 85965958c3 Merge pull request #6275 from deathbeam/event-bus-fixes
Fix event bus subscriber naming and recursion
2018-11-01 11:25:16 +01:00
Tomas Slusny df83351956 Correct event subscriber methods naming
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-31 23:37:28 +01:00
Tomas Slusny 2496e9e2a7 Merge pull request #6252 from deathbeam/shift-click-charges
Add support for configuring shift-click for variation items
2018-10-31 12:20:54 +01:00
Tomas Slusny e9bad727eb Add support for configuring shift-click for variation items
Depends on #5972
Closes #2034

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-31 11:56:01 +01:00
Tomas Slusny 56b38d2b5b Merge pull request #5972 from raiyni/tag-charges
Bank tags: tag charge/degradable items
2018-10-31 11:54:51 +01:00
Tomas Slusny efe25c54cd Merge pull request #6246 from deathbeam/notifier-chatmessage-manager
Use ChatMessageManager to send game messages in Notifier
2018-10-30 05:00:54 +01:00
Tomas Slusny 96676b6387 Merge pull request #6251 from deathbeam/anagram-clue-juno
Correctly highlight Juna for cryptic clue step
2018-10-29 19:25:20 +01:00
Tomas Slusny 415a51dc78 Correctly highlight Juna for cryptic clue step
Juna is actually object and not NPC, so highlight it properly.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-29 14:10:43 +01:00
Tomas Slusny 2ba20c1859 Merge pull request #6203 from deathbeam/remove-full-description
Remove full clue description from Hot/Cold and Cryptic Clues
2018-10-29 14:05:00 +01:00
Tomas Slusny a879b503eb Use ChatMessageManager to send game messages in Notifier
Supersedes/closes #6168

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-29 12:58:36 +01:00
Tomas Slusny 5481151e3c Merge pull request #6247 from deathbeam/fix-double-trouble-test
Fix slayer plugin combat brace test after double trouble addition + move SlayerUnlock to net.runelite.api.vars
2018-10-29 12:54:15 +01:00
Tomas Slusny 2c7f15cfed Move SlayerUnlock to net.runelite.api.vars
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-29 12:40:59 +01:00
Tomas Slusny 4800560dee Fix combat brace slayer test after double trouble addition
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-29 12:39:42 +01:00
Tomas Slusny 4e8df5f6f2 Merge pull request #6164 from deathbeam/fix-combat-brace-race-condition
Fix combat brace slayer task race condition
2018-10-29 12:23:24 +01:00
Tomas Slusny 13ae50a4b4 Merge pull request #5993 from Farmour/issue-5938
Apply PM chat recolor for PMODs in loadColors
2018-10-29 12:23:03 +01:00
Tomas Slusny a94cb6583e Merge pull request #6220 from deathbeam/fix-hidden-check
Add back check for widget.isHidden() to TabInterface
2018-10-29 12:21:55 +01:00
Tomas Slusny 1842612b28 Add support for lastCombatCountdown to combat idle
In case user has combat idle set to 0, this ensures that the idle notif
will not fire right away.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-29 11:58:13 +01:00
Tomas Slusny 6515174e18 Properly update last action times in Idle Notifier
- Properly update last action times in Idle Notifier right after the
action is changed/updated.
- Do not reset lastCombatCountdown in resetTimers()

Supersedes/closes #6241
Extracted from #5369

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-29 11:58:13 +01:00
Tomas Slusny 7c0b29b69c Merge pull request #6173 from 15987632/clue-fix2
Add support for objects to anagram clues
2018-10-27 20:43:24 +02:00
Tomas Slusny 319d8af0b1 Add support for impostors to clue scroll plugin
Add support for object impostors to clue scroll plugin.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-27 20:34:48 +02:00
Tomas Slusny b6af8dc4db Export ObjectComposition ID
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-27 20:34:48 +02:00
Tomas Slusny f1b2b0df4a Add back check for widget.isHidden() to TabInterface
This check is still required, because in rare circumstances the bank
widget is simply not nulled.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-27 20:28:38 +02:00
Tomas Slusny 3a46b8efb2 Remove full clue description for Hot/Cold clue
This is not useful as the clue tells you to speak to Jorral to receive
strange device right below.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-26 23:11:54 +02:00
Tomas Slusny a74cb9ce3b Remove full clue description from CrypticClue
This info is literally useless when we provide solution right below it
and we do not do this for other types of clues.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-26 23:09:34 +02:00
Tomas Slusny 978ea05cbe Merge pull request #6180 from deathbeam/swap-poh-perks
Swap "Perks" option with "Admire" for mounted max cape
2018-10-26 10:32:32 +02:00
Tomas Slusny feb7876563 Merge pull request #6169 from Abextm/druid-circle-occlusion
cluescrolls: Move Druids' circle clue to the stash
2018-10-26 10:15:20 +02:00
Tomas Slusny f079398f8c Merge pull request #6193 from Abextm/clue-trollheim-location
cluescrolls: Move trollheim emote clue to Trollheim
2018-10-26 10:14:53 +02:00
Tomas Slusny c476ca7cbf Merge pull request #6189 from Gamer1120/abyssal-sire-stun-timer
Add consistency to capitalization of timer in Timers settings
2018-10-26 10:09:27 +02:00
Tomas Slusny 92f9575a55 Merge pull request #6186 from Alexsuperfly/Capitalize_XP
XPglobes: capitalize XP in globe tooltip
2018-10-26 10:09:05 +02:00
Tomas Slusnyandthesnell 4ed7029340 Swap "Perks" option with "Admire" for mounted max cape
Co-authored-by: thesnell <hcimsnell@gmail.com>
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-25 17:55:50 +02:00
Tomas Slusny 338794f8f3 Fix combat brace slayer task race condition
Apparently combat bracelet message is sent before XP drop is received,
so task updates to correct amount and then is substracted by 1. To
combat this, virtually increase amount by 1 so the xp drop will
substract to correct amount.

Closes #6091

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-24 17:22:29 +02:00
Tomas Slusny 6310f26086 Merge pull request #6156 from deathbeam/prevent-npe
Prevent NPE in recent clan chats when var is null
2018-10-24 12:21:33 +02:00
Tomas Slusny a0dc0e97da Prevent NPE in recent clan chats when var is null
RECENT_CLAN_CHAT can be null when reset, so move the jagex name
sanitization to updateRecentChat method (after null check).

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-24 12:03:00 +02:00
Tomas Slusny b899a4b675 Calculate total count/value from loot records instead of boxes
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-24 09:15:07 +02:00
Tomas Slusny f3c820669a Merge pull request #6144 from deathbeam/widget-overlay-always-under
Keep WidgetOverlay always on UNDER_WIDGETS layer
2018-10-23 16:16:07 +02:00
Tomas Slusny 79cfb8ce9e Merge pull request #6074 from raiyni/issue-6069
Force clan chat names to a specific format
2018-10-23 16:14:48 +02:00
Tomas Slusny ee7c8919f6 Keep WidgetOverlay always on UNDER_WIDGETS layer
The update needs to be done ALWAYS before widgets are drawn

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-23 12:14:28 +02:00
Tomas Slusny d30a0d286b Merge pull request #6082 from deathbeam/xp-globes-correct-vars
XpGlobes: Use correct target XP
2018-10-23 11:36:32 +02:00
Tomas Slusny 83798a5e7f Use startGoalXp and endGoalXp for goals in XP globes
- Make current progress (%) use start, currend and end goal XP
- Rename XP to level to XP left and make it use end goal XP

This ensures that current fields shown in XP globe will be consistent
with actions left there (as that one is based on goals, but rest is not)
and adds consistent support for target goals to XP globes.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-23 11:15:10 +02:00
Tomas Slusny e213641e9f Add startGoalXp and endGoalXp to XpTrackerService
Expose startGoalXp and endGoalXp from XpTrackerService and cleanup wrong
JavaDocs.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-23 11:05:18 +02:00
Tomas Slusny 14eaa88f66 Merge pull request #5359 from deathbeam/make-wasd-enable-on-double-thing
Make colon (":") enter chat in WASD mode
2018-10-23 10:19:48 +02:00
Tomas Slusny 0b2976f0cb Merge pull request #6117 from Nightfirecat/fix-mta-worldpoint-localpoint-comparison
mta telekinetic room: Fix finish point comparison
2018-10-23 00:47:49 +02:00
Tomas Slusny cc8994bac3 Merge pull request #6131 from deathbeam/quick-pass2
Swap also "quick pass" in Cerb lair
2018-10-22 23:33:50 +02:00
Tomas Slusny c167f8d3c5 Swap also "quick pass" in Cerb lair
In cerb lair the option is "Quick Pass" not "Quick-pass" like in Raids
1.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-22 21:54:27 +02:00
Tomas Slusny 3b2bc01366 Merge pull request #6105 from devLotto/puzzlesolver-blank_value
puzzlesolver: break out blank tile value into a constant
2018-10-22 19:29:29 +02:00
Tomas Slusny 3d39a358fe Add POH incense burner timers 2018-10-21 14:38:24 -04:00
Tomas Slusny 8c9be8f372 Add missing dot to "She's small" cryptic
Closes #6090

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-20 17:20:23 +02:00
Tomas Slusny c1ee9d2351 Prevent tag tab scrolling to scroll bank interface
Closes #6076

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-19 17:29:17 +02:00
Tomas Slusny 0ab26ff3a0 Make HiScore lookup always deprioritized
It is super annoying to accidentally have left-click option on stuff
that never has one.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-19 17:28:46 +02:00
Tomas Slusny 1595492ed7 Merge pull request #5817 from raiyni/clue-tags
Bank tags: Search current clue items
2018-10-19 10:09:30 +02:00
Tomas Slusny ef9013faa8 Add swap for "Admire" and "Teleport/Spellbook" for mounted capes (#5994)
Add swap that swaps "Admire" with either "Teleport" or "Spellbook" (for
magic) for mounted POH skill capes.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-19 10:01:16 +02:00
Tomas Slusny 66e09665e2 Merge pull request #6031 from deathbeam/special-ids
Make special attack counter respect ids and npc deaths
2018-10-19 08:57:48 +02:00
Tomas Slusny ee5b95c94e Merge pull request #6071 from deathbeam/sort-menu-swapper-by-name
Remove position config from menu entry swapper
2018-10-19 08:53:43 +02:00
Tomas Slusny 64db9ab1ad Merge pull request #6070 from deathbeam/cleanup-timers-config
Merge common config options in Timers config together + sort by name
2018-10-19 08:53:29 +02:00
Tomas Slusny 93aec0057a Merge pull request #5725 from oharace/issue5679_fix_quick_hop_bug_in_clan_chat
Allow hop-to option in clan chat menu when target player is a friend and their private chat is off
2018-10-19 08:53:13 +02:00
Tomas Slusny 898f2d8361 Merge pull request #6072 from devLotto/usernameInTitle-rename
Change 'username' to 'display name' in usernameInTitle
2018-10-19 08:49:13 +02:00
Tomas Slusny b6a6e831b4 Remove position config from menu entry swapper
As now the config options are sorted by name, and that was the only
purpose of having the positions set in menu entry swapper config, remove
them.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-18 23:39:11 +02:00
Tomas Slusny 4b1c7fbc88 Merge common configs in Timers plugin
Merge all similar config options in Timers plugin to common groups.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-18 23:36:56 +02:00
Tomas Slusny de21ff40c9 Remove positions from Timers plugin config
Just let it be sorted alphabetically, easier to navigate in.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-18 23:29:14 +02:00
Tomas Slusny 514a0362ee Filter > 0 when tagging inventory/equipment
Closes #6060

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-18 17:52:42 +02:00
Tomas Slusny 6c514033f7 Update active tag tab containing edited tag
Closes #6061

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-18 17:42:32 +02:00
Tomas Slusny edb09e3081 Merge pull request #6050 from deathbeam/also-clear-hint-arrow
Clear hint arrow when switching 3 step NPCs
2018-10-17 09:27:49 +02:00
Tomas Slusny d5a0a0a90f Clear hint arrow when switching 3 step NPCs
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-17 09:16:26 +02:00
Tomas Slusny c3dce4da57 Merge pull request #6017 from deathbeam/3-step-reset
Properly update 3 step cryptic clues on step completion
2018-10-17 00:24:32 +02:00
Tomas Slusny e079e7648b Merge pull request #6043 from deathbeam/game-event-client
Invoke GameEventManager events on ClientThread
2018-10-17 00:04:10 +02:00
Tomas Slusny 2eca81e2ba Invoke GameEventManager events on ClientThread
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-16 21:42:33 +02:00
Tomas Slusny c438c5467a Merge pull request #2756 from Kamielvf/examine-info
Add examine info to dev tools
2018-10-16 13:47:42 +02:00
Tomas Slusny 9457868257 Make special attack counter respect ids and npc deaths
Closes #6009

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-16 12:59:51 +02:00
Tomas Slusny 4a0593c11b Merge pull request #6038 from deathbeam/make-zeah-mess-hall-widget-la
Make Zeah Mess Hall display layoutable
2018-10-16 12:58:54 +02:00
Tomas Slusny 48b1fa5d06 Make Zeah Mess Hall display layoutable
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-16 12:45:52 +02:00
Tomas Slusny 0c3f75cfbc Merge pull request #6037 from deathbeam/tag-placeholders
Unify calls for getting real item id for bank tag
2018-10-16 12:37:44 +02:00
Tomas Slusny 532a2cd6d2 Unify calls for getting real item id for bank tag
Instead of trying to tag and find notes and placeholders, find real item
ids.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-16 11:51:46 +02:00
Tomas Slusny 3cec6f2a4c Merge pull request #6024 from deathbeam/tag-tabs-import-export
Add ability to import/export tag tabs with clipboard
2018-10-16 11:40:39 +02:00
Tomas Slusny 57a198d3f2 Merge pull request #4465 from deathbeam/add-username-to-title
Add toggle for displaying username in title
2018-10-16 09:07:34 +02:00
Tomas Slusny 337e35c400 Merge pull request #3641 from deathbeam/use-terminal-notifier-if-available
Use terminal-notifier when available for OSX
2018-10-15 23:45:55 +02:00
Tomas Slusny 5db0d3806b Use terminal-notifier when available for OSX
This will allow for icons for OSX notifications and its usually pretty
standard library to have. Also allows grouping of notifications and
click-to-activate.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-15 22:07:58 +02:00
Tomas Slusny b49f8a7b03 Properly update 3 step cryptic clues on step completion
- Reset NPCs
- Reset Object ids
- Reset locations

Closes #5923

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-15 21:06:19 +02:00
Tomas Slusny 5cd32c17c6 Add ability to import/export tag tabs with clipboard
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-15 17:43:35 +02:00
Tomas Slusny b071f8c9a3 Merge pull request #5990 from deathbeam/overlay-font
Add option to choose interface (layoutable) overlay font
2018-10-15 10:36:47 +02:00
Tomas Slusny fbe5421f6a Merge pull request #6023 from forsco/revert-5989
Revert #5989
2018-10-15 10:35:47 +02:00