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

sc2: Adding larva command card submenu for advanced strains #331

Merged
merged 8 commits into from
Dec 6, 2024

Conversation

MatthewMarinets
Copy link
Contributor

@MatthewMarinets MatthewMarinets commented Dec 4, 2024

also moving pygalisks to larva

Made description and logic changes to pygalisk in client PR #364

Tentative new layout:
image
(scourge hotkey changed locally S -> X, the rest should all be default)

The submenu is sticky, so multiple advanced morphs can be built after opening the submenu once.
larva_submenus

I hope this opens the door to more basic morphs, and possibly some "morph the advanced unit straight from larva" upgrades, particularly for banelings (AI gets them sometimes, would get me to build them more) and Vipers (melee-style).

TODO

  • Update Pygalisk unlock trigger to give spawning pool and not give predator nest / merc upgrades
  • Investigate larva cancel smart command card; if it never works, remove it and move submenu controls to 0,4 instead of 0,3

@MatthewMarinets
Copy link
Contributor Author

Added the gamestrings for the submenu buttons. Note the submenu buttons are available immediately, even if no advanced morphs are unlocked.
image
image

@MatthewMarinets MatthewMarinets marked this pull request as ready for review December 4, 2024 19:26
@MatthewMarinets
Copy link
Contributor Author

Added a flag so the advanced morphs subtab only shows up if you have a unit in there.
image
image

Unfortunately, it greys the submenu out if you don't have the requirements for any unit in the subtab :/
image

@MatthewMarinets
Copy link
Contributor Author

Fixed the greyed-out submenu button issue.
image
image
image

It involved manually adding all advanced morphs to a requirement, which is unfortunate as it's an easy thing to forget if adding new advanced morphs in future. I think it's easy enough to spot and fix if we do add more, though

@@ -196,6 +196,8 @@ Button/Hotkey/AP_K5Leviathan=V
Button/Hotkey/AP_KerriganUltimateAbilites=U
Button/Hotkey/AP_KhaydarinMonolith=D
Button/Hotkey/AP_Lair=L
Button/Hotkey/AP_LarvaAdvancedMorphs=X
Button/Hotkey/AP_LarvaBasicMorphs=B
Copy link
Owner

Choose a reason for hiding this comment

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

Escape should be the default hotkey for exiting a submenu

@Ziktofel Ziktofel merged commit 411aac5 into Ziktofel:sc2-next Dec 6, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants