Commit Graph
100 Commits
Author SHA1 Message Date
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
Tomas Slusny c54eded215 Merge pull request #6011 from mattec92/fix/hot-cold-clue-location
Fix ASGARNIA_MIAZRQA Hot-Cold clue location.
2018-10-14 18:38:25 +02:00
Tomas Slusny 3b389c7266 Merge pull request #6003 from deathbeam/make-cryptics-robust
Make 3 step cryptic clues more robust
2018-10-14 18:37:13 +02:00
Tomas Slusny 72bf82348a Fix punctionation in "Fiendish cooks" cryptic clue
Closes #5968

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-14 18:13:59 +02:00
Tomas Slusny 636aa2f079 Null-check location for multi-location clues
Sometimes it can be null.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-14 18:13:59 +02:00
Tomas Slusny ecfcd6d67b Make 3 step cryptic clues more robust (better splitting)
- Instead of depending on specific formatting and size of clue text, just
split and parse everything stripping all tags when needed.
- Exit early on size < 3 to prevent NPEs and ArrayOutOfBounds

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-14 18:13:39 +02:00
Tomas Slusny fb1c2f4b02 Merge pull request #6001 from NathenSample/debugClues
Log error when encountering an unmatched clue string
2018-10-14 14:30:26 +02:00
Tomas Slusny 6236ba0de2 Merge pull request #5992 from deathbeam/discord-raids
Add raiding activity to Discord plugin
2018-10-14 02:59:52 +02:00
Tomas Slusny ba30827e77 Merge pull request #6000 from trimbe/cryptic-clue-fix
Fix lava maze dungeon cryptic clue
2018-10-14 02:37:55 +02:00
Tomas Slusny 631e3e7c4f Add raiding activity to Discord plugin
- Add support for Varbit triggers to Discord plugin
- Add Chambers Of Xeric and Theatre of Blood to Discord plugin
- Put these two to separate category because according to wiki they are
separate

Closes #4223
Closes #4224

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-14 01:47:25 +02:00
Tomas Slusny 7c67445bf8 Merge pull request #5995 from deathbeam/sort-options-by-name-as-well
Sort config panel options by name as well
2018-10-14 00:37:31 +02:00
Tomas Slusny a8f42ab007 Sort config panel options by name as well
In addition to sorting config panel options by position, sort them also
by name to remove need of setting positions everywhere for consistent
order.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 23:13:18 +02:00
Tomas Slusny 3c1f841510 Add toggle for displaying username in title
Closes #1918

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 22:24:38 +02:00
Tomas Slusny bbd9667304 Merge pull request #4805 from ConnorVG/discord-raids-mlm-events
DiscordPlugin: Add MLM
2018-10-13 21:43:39 +02:00
Tomas Slusny 0ca38735d2 Add option to choose interface (layoutable) overlay font
Closes #1716

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 19:31:07 +02:00
Tomas Slusny 4f5fb62667 Merge pull request #5982 from deathbeam/skill-lookup-varbit
Move local player hiscore type check to client thread
2018-10-13 19:26:29 +02:00
Tomas Slusny d42ceeb98c Merge pull request #5981 from deathbeam/varbit-stuff
Move ChatMessageManager#refreshAll to client thread
2018-10-13 18:23:06 +02:00
Tomas Slusny 01ce193e9c Merge pull request #5986 from ellscape/mystic-mist-buy-limit
Mystic Mist Staff buy limit corrected from 6 to 8
2018-10-13 14:57:09 +02:00
Tomas Slusny 8759423f07 Move local player hiscore type check to client thread
Closes #5896

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 12:05:01 +02:00
Tomas Slusny 71091d4aae Move ChatMessageManager#refreshAll to client thread
Closes #5897

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 11:58:05 +02:00
Tomas Slusny 9828dd047a Merge pull request #5898 from deathbeam/fix-corrupted-settings
Implement locking and corrupted file sanitization to ConfigManager
2018-10-13 11:54:15 +02:00
Tomas Slusny 189e59e972 Merge pull request #5975 from Nightfirecat/combat-bracelet-slayer-update
slayer: Add combat bracelet task update handling
2018-10-13 03:15:07 +02:00
Tomas Slusny b77fbc1f8c Merge pull request #5967 from Nightfirecat/simulate-npc-spawns
GameEventManager: Simulate Actor spawn events
2018-10-13 00:50:21 +02:00
Tomas Slusny ceb85907a5 Merge pull request #5973 from deathbeam/widget-bounds-limit
Limit widget overlay bounds to parent
2018-10-12 23:59:00 +02:00
Tomas Slusny 176ac567b5 Limit widget overlay bounds to parent
Add limiting of widget overlay bounds to parent bounds in order to not
get out of sync with actual overlay position and drawn overlay position.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 22:39:22 +02:00
Tomas Slusny a61afb2f0c Merge pull request #5969 from deathbeam/swap-stuff
Disable bury and harpoon swaps by default
2018-10-12 21:42:32 +02:00
Tomas Slusny 307fe9e1c7 Merge pull request #5965 from deathbeam/quick-pass
Properly reorder menu entry config & add swaps for quick pass/travel/start
2018-10-12 21:15:00 +02:00
Tomas Slusny 5558b6bf03 Disable bury and harpoon swaps by default
Even though the swapper plugin is disabled by default, many people
enable it and these defaults are very niche and annoying in some
scenarios.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 20:26:33 +02:00
Tomas Slusny 61d08d54a6 Add quick pass/travel/start menu entry swapping
Closes #2226
Closes #1459

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 20:25:04 +02:00
Tomas Slusny 8b40f71c41 Merge pull request #5640 from deathbeam/bounty-hunter-layoutable
Make bounty hunter stats widget layoutable
2018-10-12 20:15:30 +02:00
Tomas Slusny 643a89223c Reorder menu swaps again by name
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 18:49:05 +02:00
Tomas Slusny 33954ccf67 Lock configuration file when writing to filesystem
Use OS-wide exclusive lock when writing configuration file to filesystem
to prevent config file corruption when multiple concurrent writers try
to write to same config file at same time.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 16:41:13 +02:00
Tomas Slusny 85c9ec890b Use UTF-8 instead of ISO 8859-1 when loading/saving config
In order to prevent failures on reading/writing incorrectly escaped
characters or writing special UTF-8 characters on save as gibberish,
explicitly specify UTF-8 encoding when loading and writing properties.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 16:41:13 +02:00
Tomas Slusny 4a5e4491c9 Remove invalid properties from map on property load
In order to not have config file flooded with invalid and corrupted
properties in case of file corruption, remove all these invalid
properties from property map on configuration load.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 16:41:13 +02:00
Tomas Slusny b0fbc09013 Merge pull request #5960 from deathbeam/fix-kraken-boss
Fix cave kraken boss task name
2018-10-12 15:20:02 +02:00
Tomas Slusny b14c0726b8 Add optional "the" when checking slayer task progress message
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 14:30:13 +02:00
Tomas Slusny 0b87e2e8f9 Fix cave kraken boss task name
Closes #5958

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 13:31:33 +02:00
Tomas Slusny 400d34d563 Merge pull request #5873 from raiyni/recent-chats
Add recent clan chats to clan chat plugin
2018-10-12 10:41:55 +02:00
Tomas Slusny 417991210a Merge pull request #5907 from deathbeam/fix-slayer-counter
Correctly parse slayer task with the and breaks in npc name
2018-10-12 10:23:49 +02:00
Tomas Slusny 3a340fc2d1 Merge pull request #5949 from deathbeam/remember-tag-tab
Add option to remember last opened tag tab
2018-10-12 09:09:29 +02:00
Tomas Slusny 429e7b53ac Merge pull request #5946 from Nightfirecat/remove-deprecated-farming-config-migration
time tracking: Remove deprecated config migration
2018-10-12 08:19:47 +02:00
Tomas Slusny e9fdd5b6a4 Merge pull request #5905 from deathbeam/raid-scouter-simplify
Move raid scouter layout to title
2018-10-12 08:01:21 +02:00
Tomas Slusny 45fa78ce28 Merge pull request #5910 from raiyni/search-limit
Don't limit bank search and title explicitly to 15 characters
2018-10-12 07:58:59 +02:00
Tomas Slusny e93ba9d51f Merge pull request #5947 from deathbeam/gout-tuber-heal
Add Gout Tuber heal info to Item Stats plugin
2018-10-12 00:42:37 +02:00
Tomas Slusny 8318e42589 Merge pull request #5944 from deathbeam/fix-patches-naming
Remove duplicate "Patches" from time track overview
2018-10-12 00:13:28 +02:00
Tomas Slusny 2ce79b1ae8 Add option to remember last opened tag tab
Closes #5936

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 00:05:01 +02:00
Tomas Slusny 11cef7d0a1 Add Gout Tuber heal info to Item Stats plugin
It heals 12 hp.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-11 23:46:46 +02:00
Tomas Slusny da35086a13 Remove duplicate "Patches" from time track overview
Closes #5943

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-11 21:27:44 +02:00
Tomas Slusny 150737d18b Merge pull request #5935 from Kamielvf/raidsoverlay-fix
Fix raid scout overlay not rendering at bank
2018-10-11 20:09:30 +02:00
Tomas Slusny bdcb1ea444 Merge pull request #5926 from deathbeam/fix-equipment-checks
Do not reset equipment/inventory in clues croll plugin each tick
2018-10-11 20:06:12 +02:00
Tomas Slusny 114cd0c5b9 Merge pull request #5934 from raiyni/fix-changeicon
Don't fetch itemid of Change Icon menu option on tabs
2018-10-11 20:05:17 +02:00
Tomas Slusny 728e1c40c0 Do not reset equipment/inventory in clues croll plugin each tick
Because it is now updated from changed events, this will simply make the
item reqs not work.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-11 14:42:16 +02:00
Tomas Slusny f82c984973 Merge pull request #5915 from deathbeam/fix-tabs
Properly reset search when deleting active tag tab
2018-10-11 00:37:58 +02:00
Tomas Slusny 2b71a13049 Properly reset search when deleting active tag tab
Closes #5913

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-11 00:18:18 +02:00
Tomas Slusny 8d7e569b19 Merge pull request #5906 from raiyni/tag-bugs
Fix tags resetting when bank window is closed and active tab matching for long tags
2018-10-10 22:11:57 +02:00