Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TGUI] Loadout #27026

Merged
merged 18 commits into from
Nov 9, 2024
Merged

[TGUI] Loadout #27026

merged 18 commits into from
Nov 9, 2024

Conversation

AyIong
Copy link
Contributor

@AyIong AyIong commented Oct 8, 2024

What Does This PR Do

Loadout now use TGUI, finally.
Removed the Loadout tab because it is now a separate UI
Loadout now opens from Character Settings Tab, screenshot bellow. If you have some better idea when i can put this button, will be glad to hear it

ImageButton slightly tweaked, buttonsAlt now accept nodes instead only boolean value, that means, you can use buttons and buttonsAlt at the same time, which allow you to make more informative compact buttons

Dimmer and tooltip have increased z-index, so that they cover everything (Dimmer did not cover the ImageButton before, lol)

Loadout button

image

Loadout Tweaks (by @ROdenFL )

That's how you can add tweaks on item

/datum/gear/accessory/scarf/white
	display_name = "Scarf, white"
	path = /obj/item/clothing/accessory/scarf/white

/datum/gear/accessory/scarf/white/New()
	..()
	gear_tweaks |= new /datum/gear_tweak/rename
	gear_tweaks |= new /datum/gear_tweak/color

And that's how it will look in UI

UI
08-10-2024_17.57.14.mp4

Why It's Good For The Game

Finally a user-friendly Loadout, with images
Now you will not be rolled back to the beginning of the page when selecting an item
All selected items are shown on the left, and you can quickly put them away to get something new, instead of looking for where you don't want or need it

Also, sorting features inspired by Mining Vendor UI. Search and Tweaks implementation by @ROdenFL (Not implemented to any item, but works now)

Standard sorting by Donor TIer

Images of changes

Images
Clean No free points Almost all points used Selected Items Donor Tab
image image image image image
Video
08-10-2024_17.40.19.mp4

Testing

Tested a lot on local server, also with DB connected (I had never used DB before)
Loadouts won't break after old loadout, even with tweaks

Also TestMerged here - ss220club#1573
For a 7+ days and until it get merged :D (Or closed :c)
UPD. TM is gone, I'm tired of doing TGUI rebuilds. It was from 3.10 to 6.11 (More than 30 days). No issues founded/reported


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑 Aylong, ROdenFL
add: Loadout transfered from tab to separate TGUI window. With images, searching, sorting and more info
wip: Added support for loadout items tweaks, ain't used anywhere for now
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally TGUI This PR modifies TGUI, will conflict labels Oct 8, 2024
@silverplatedelta silverplatedelta added the Feature This PR is a new addition to the game label Oct 8, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally -Status: Awaiting approval This PR is waiting for approval internally labels Oct 9, 2024
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Oct 10, 2024
@S34NW S34NW added the Needs detailed review This PR needs a little more love before it can be merged label Oct 11, 2024
@ROdenFL
Copy link
Contributor

ROdenFL commented Oct 11, 2024

image
remember this pr young

@Henri215
Copy link
Contributor

Tested and it did look good, now pray for someone that is good with TGUI to review this 😃

@AyIong
Copy link
Contributor Author

AyIong commented Oct 22, 2024

Tested and it did look good, now pray for someone that is good with TGUI to review this 😃

SEEEEEEEEEEEEEAN!!!

@ROdenFL
Copy link
Contributor

ROdenFL commented Oct 22, 2024

I'm some kind of "someone that is good with tgui" Soooo

@AyIong
Copy link
Contributor Author

AyIong commented Oct 22, 2024

I'm some kind of "someone that is good with tgui" Soooo

Who are you?

code/__HELPERS/global_lists.dm Show resolved Hide resolved
code/__HELPERS/global_lists.dm Outdated Show resolved Hide resolved
code/modules/client/preference/loadout/gear_tweaks.dm Outdated Show resolved Hide resolved
code/modules/client/preference/loadout/gear_tweaks.dm Outdated Show resolved Hide resolved
code/modules/client/preference/loadout/loadout_tgui.dm Outdated Show resolved Hide resolved
@AyIong
Copy link
Contributor Author

AyIong commented Nov 6, 2024

TM on downstream is gone.
I'm tired of doing TGUI rebuilds.
It was from 3.10 to 6.11 (More than 30 days).
No issues founded/reported

Copy link
Member

@Burzah Burzah left a comment

Choose a reason for hiding this comment

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

I see no outstanding issues. Spoke about this PR as well with the author in Discord. This change has been tested on the downstream for an extended period of time with no issues.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Nov 8, 2024
@Burzah Burzah enabled auto-merge November 9, 2024 08:03
@Burzah Burzah added this pull request to the merge queue Nov 9, 2024
Merged via the queue into ParadiseSS13:master with commit ca50656 Nov 9, 2024
12 checks passed
@AyIong AyIong deleted the loadout branch November 9, 2024 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Feature This PR is a new addition to the game Merge Conflict This PR is merge conflicted Needs detailed review This PR needs a little more love before it can be merged TGUI This PR modifies TGUI, will conflict
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants