Skip to content
This repository has been archived by the owner on Aug 8, 2024. It is now read-only.

feat: custom trade market sell amount buttons #584

Merged
merged 8 commits into from
Sep 21, 2022
Merged

feat: custom trade market sell amount buttons #584

merged 8 commits into from
Sep 21, 2022

Conversation

byBackfish
Copy link
Contributor

Implements add-more-options-in-the-selling-menu-of-tm

Adds 3 buttons to the trade market gui, pressing them will automatically put the set amount (in the config) into the chat.
Fixes various bugs
TradeMarketOverlay now uses the nbt tag to determine the amount of the item to sell

@byBackfish
Copy link
Contributor Author

image

kristofbolyai
kristofbolyai reviewed Sep 16, 2022
View reviewed changes
Copy link
Member

@kristofbolyai kristofbolyai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, was the bug fixed where the sell all button inputted numbers even when the user did not press the button?

src/main/java/com/wynntils/modules/utilities/configs/UtilitiesConfig.java Show resolved Hide resolved
@byBackfish
Copy link
Contributor Author

yea, that bug was fixed already

@kristofbolyai kristofbolyai requested a review from a team September 16, 2022 18:15
kristofbolyai
kristofbolyai previously approved these changes Sep 16, 2022
View reviewed changes
@kristofbolyai kristofbolyai requested a review from a team September 16, 2022 19:02
@byBackfish byBackfish requested a review from HighCrit September 18, 2022 10:41
@ryanzhoudev
Copy link
Member

I think the button and text for this is rather large, is the settings text necessary?
image

@ryanzhoudev
Copy link
Member

I think the button and text for this is rather large, is the settings text necessary?

Also, I think the "Click to sell all items in your inventory" shouldn't be there

ryanzhoudev
ryanzhoudev previously approved these changes Sep 20, 2022
View reviewed changes
magicus
magicus previously approved these changes Sep 21, 2022
View reviewed changes
@kristofbolyai kristofbolyai merged commit ca0ef1f into Wynntils:development Sep 21, 2022
@byBackfish byBackfish deleted the feature/custom-sell-amount branch September 22, 2022 12:56
DevScyu pushed a commit that referenced this pull request Oct 11, 2022
@byBackfish @magicus
@kristofbolyai @DevScyu
feat: custom trade market sell amount buttons (#584)
00dbb73 
* feat: Adds 3 custom sell amount buttons to the trade market sell gui, pressing them will put the amount set in the config instantly in chat. Also remade most of the `TradeMarketOverlay`. Fixes various bugs

* fix: add empty line before the custom sell amount info

* fix: remove debug & set the item count to the correct amount (visually)

* fix: save the parsed int instead of parsing it twice

* fix: change the lore to fit the custom sell buttons better

* make the custom buttons appear even if only 1 of the item in your inventory

Co-authored-by: byBackfish <maik@bybackifsh.de>
Co-authored-by: Magnus Ihse Bursie <mag@icus.se>
Co-authored-by: Kristof Kovacs <49001742+kristofbolyai@users.noreply.github.com>
DevScyu added a commit that referenced this pull request Oct 11, 2022
@DevScyu @ryanzhoudev
@magicus @byBackfish @kristofbolyai @HighCrit @TheAvonian @Incompleteusern
update branch (#608)
59ea392 
* chore: upgrade gradle to 7.5.1 (#591)

* fix: rework party management gui (#590)

Co-authored-by: Magnus Ihse Bursie <mag@icus.se>

* feat: add focus bar (#586)

Co-authored-by: byBackfish <maik@bybackifsh.de>
Co-authored-by: Magnus Ihse Bursie <mag@icus.se>
Co-authored-by: Kristof Kovacs <49001742+kristofbolyai@users.noreply.github.com>

* feat: custom trade market sell amount buttons (#584)

* feat: Adds 3 custom sell amount buttons to the trade market sell gui, pressing them will put the amount set in the config instantly in chat. Also remade most of the `TradeMarketOverlay`. Fixes various bugs

* fix: add empty line before the custom sell amount info

* fix: remove debug & set the item count to the correct amount (visually)

* fix: save the parsed int instead of parsing it twice

* fix: change the lore to fit the custom sell buttons better

* make the custom buttons appear even if only 1 of the item in your inventory

Co-authored-by: byBackfish <maik@bybackifsh.de>
Co-authored-by: Magnus Ihse Bursie <mag@icus.se>
Co-authored-by: Kristof Kovacs <49001742+kristofbolyai@users.noreply.github.com>

* feat: ability tree navigation using scroll wheel (#582)

* feat: add ability to scroll to navigate through ability tree

* fix: add ability to invert controls

* Fix formatting

* Fix formatting again

* fix: add `ABILITY_TREE_PATTERN` to properly check if the gui is the ability tree, fix order of the settings

* fix: extract slot numbers, change config order to not have duplicates

* fix: remove `/ 120`

* fix: change to non-capturing regex group

* fix: use `ScrollDirection` as type for the `abilityScrollDirection` config option

* make the `shouldAbitlityScroll` config option default to true

Co-authored-by: byBackfish <maik@bybackifsh.de>
Co-authored-by: Magnus Ihse Bursie <mag@icus.se>
Co-authored-by: Ryan <57310593+DonkeyBlaster@users.noreply.github.com>

* feat: add currently active shaman mask display (#577)

* feat: add current mask overlay

* fix: refactor, fix location

* fix: mask not resetting correctly if only one mask ability is equipped

* fix: add option to change display text for each mask individually

* fix: implement reviews

* fix: change the tabulation

* fix: simplify mask detection

* fix: add spaces after `ìf`

* fix: save the current shaman mask in `CharacterData.java` instead of in `CurrentMaskOverlay.java`

* fix: extract mask parsing from CurrentMaskOverlay to OverlayEvents

* add empty line at the end of the file

Co-authored-by: byBackfish <maik@bybackifsh.de>
Co-authored-by: Magnus Ihse Bursie <mag@icus.se>
Co-authored-by: Kristof Kovacs <49001742+kristofbolyai@users.noreply.github.com>
Co-authored-by: Ryan <57310593+DonkeyBlaster@users.noreply.github.com>

* ci: update releases (#592)

* ci: update releases

* ci: allow version update in stable to automatically be pushed to development (untested)

* chore(release): v1.12.1-beta.0 [skip ci]

* ci: fix release names [skip ci]

* fix: mythic detection & /guild list spam (#594)

* fix: make the mythic detection work again, filter out the results of `/gu list` when wynntils runs it automatically

* fix: fix imports

* fix: simplify `AIR` check

* fix: add comment describing the mythic found code

Co-authored-by: byBackfish <maik@bybackifsh.de>

* chore(release): v1.12.1-beta.1 [skip ci]

* feat: add corrupted bar (#595)

* feat: add corrupted bar

* fix: change symbol, add hide default bar

Co-authored-by: byBackfish <maik@bybackifsh.de>
Co-authored-by: Magnus Ihse Bursie <mag@icus.se>

* chore(release): v1.12.1-beta.2 [skip ci]

* fix: ObjectivesOverlay: Fix patterns (#601)

* chore(release): v1.12.1-beta.3 [skip ci]

* fix: hide token during registration process (#603)

* chore(release): v1.12.1-beta.4 [skip ci]

* refactor: applying minor caching of variables in a few files. (#599)

* refactor: applying minor caching of variables in a few files.

* refactor: fixing spacing issues and changing generic data names

* chore(release): v1.12.1-beta.5 [skip ci]

* fix: Fix log spam (#600)

* Fix log spam

* Better fix?

* Update src/main/java/com/wynntils/webapi/WebManager.java

Co-authored-by: Scyu_ <scyu@scyu.dev>

* chore(release): v1.12.1-beta.6 [skip ci]

Co-authored-by: Ryan <57310593+DonkeyBlaster@users.noreply.github.com>
Co-authored-by: Magnus Ihse Bursie <mag@icus.se>
Co-authored-by: byBackfish <38255215+byBackfish@users.noreply.github.com>
Co-authored-by: byBackfish <maik@bybackifsh.de>
Co-authored-by: Kristof Kovacs <49001742+kristofbolyai@users.noreply.github.com>
Co-authored-by: Conventional Changelog Action <conventional.changelog.action@github.com>
Co-authored-by: HighCrit <35771251+HighCrit@users.noreply.github.com>
Co-authored-by: Aven <29378966+TheAvonian@users.noreply.github.com>
Co-authored-by: Incompleteusern <58920010+Incompleteusern@users.noreply.github.com>
DevScyu pushed a commit that referenced this pull request Oct 13, 2022
@byBackfish @magicus
@kristofbolyai @DevScyu
feat: custom trade market sell amount buttons (#584)
4b2dda8 
* feat: Adds 3 custom sell amount buttons to the trade market sell gui, pressing them will put the amount set in the config instantly in chat. Also remade most of the `TradeMarketOverlay`. Fixes various bugs

* fix: add empty line before the custom sell amount info

* fix: remove debug & set the item count to the correct amount (visually)

* fix: save the parsed int instead of parsing it twice

* fix: change the lore to fit the custom sell buttons better

* make the custom buttons appear even if only 1 of the item in your inventory

Co-authored-by: byBackfish <maik@bybackifsh.de>
Co-authored-by: Magnus Ihse Bursie <mag@icus.se>
Co-authored-by: Kristof Kovacs <49001742+kristofbolyai@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@kristofbolyai kristofbolyai kristofbolyai approved these changes

@magicus magicus magicus approved these changes

@ryanzhoudev ryanzhoudev ryanzhoudev left review comments

@HighCrit HighCrit Awaiting requested review from HighCrit

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@byBackfish @ryanzhoudev @magicus @HighCrit @kristofbolyai