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

Show UnitTypes in Civilopedia #8729

Merged
merged 3 commits into from
Feb 25, 2023
Merged

Conversation

SomeTroglodyte
Copy link
Collaborator

@SomeTroglodyte SomeTroglodyte commented Feb 22, 2023

Tentative draft may resolve #8453
(gh is obstinate today - screenie elsewhere)

Testers may open the branch in Studio or try a jar (on PicaDrop for 15 days) or a debug apk

Issues:

  • Needs better choices for icons (category header, movementType)
  • Really show uniques here or better on each unit? Submarine looks strange.
  • I'm not convinced it's worth it
  • No time to polish/maintain this - anybody is welcome to take over
  • "Can carry 2 Missiles" and similar on units could now link

@Caballero-Arepa
Copy link
Contributor

Yeah! I tried it and played around, moving back and forward and all looks good.
I didn't encounter any issue
I also loaded Deciv redux, and it also worked.
imagen

@Caballero-Arepa
Copy link
Contributor

Caballero-Arepa commented Feb 24, 2023

Really show uniques here or better on each unit? Submarine looks strange.

Nah, if you show the unitType uniques on the unit, then the types become almost empty.
It's mainly so you can see a list of all the units that are of the type, to know for example if Ambush promo will be useful for you or not.

Overall I think it's great, thank you.

@SomeTroglodyte
Copy link
Collaborator Author

So, to polish this, getting four better icons would be enough? Category / Land/Air/Water... For the movement type I have clear ideas, but the cat header?

@SomeTroglodyte
Copy link
Collaborator Author

Still need a good icon for the category header - This one:
UnitTypes.zip
...comes out real 💩ty

@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@SomeTroglodyte
Copy link
Collaborator Author

The new commit includes:

  • Unit Type icons can be modded in
  • Movement domains get Pedia entries listing the associated Unit Types
  • Movement domain icons separately moddable
  • Icons for movement domains repainted from source - 50x50 didn't cut it - (Terrain now 100x100 everywhere but the promotions are in another atlas, so I left them)
  • Translatability
  • Duplicate credits removed
  • "Can carry missiles" now links (Remember: Automatic links from Unique parameters cannot differentiate RulesetObject subclass, so they prioritize - Submarine will prefer the Unit, not the Type - unitFilters on the other hand will allow the Type and can't specify the Submarine selectively).
vidi non veni

image
image

Now to fervently hope a local merge will be accepted by gh...

# Conflicts:
#	android/assets/jsons/translations/German.properties
@github-actions
Copy link

Conflicts have been resolved.

@SomeTroglodyte SomeTroglodyte marked this pull request as ready for review February 25, 2023 16:56
@yairm210 yairm210 merged commit 5d80f50 into yairm210:master Feb 25, 2023
@SomeTroglodyte SomeTroglodyte deleted the PediaUnitTypes branch February 25, 2023 19:37
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.

Show unit types on Civilopedia
3 participants