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

add amplify icon and support for scheme_amplify #266

Merged
merged 2 commits into from
Feb 22, 2025

Conversation

mmougy
Copy link

@mmougy mmougy commented Dec 31, 2024

this should fix #250
and should fix #196

the source of the new font is:
from the Marvel Champions LCG Homebrew discord server
in the drive that contains templates

for consistency, card_schema.json should be updated in marvelsdb-json-data repo (zzorba/marvelsdb-json-data#574)

this has been tested in local env, as you can see on the following screen shots:

image
image
image
image
image
image

I am not a font specialist, so do not hesitate to propose improvments :)

@jordanweiler
Copy link
Contributor

I just commented on the issue that I think the original proposal for scheme_amplify was misguided based on following the same pattern of scheme_acceleration, scheme_crisis, and scheme_hazard. The amplify icon isn't tied to just the scheme card types nor is it solely used when scheming so using scheme_ as the prefix for the property doesn't make a lot of sense. I think this new property should just be amplify and I think it should be a number.

I have a guess that the other three properties used scheme_ as a prefix because in the core set only side_scheme card types used those properties. At the time, it was probably believed it would be limited to just those card types. Again, just my guess here. I wasn't involved at that time and I don't know the full history. There are lots of other types of cards that can add those three icons to the board state now so those property names haven't aged well.

I know you've already merged changes to converge the JSON repo to use scheme_amplify instead of scheme_boost and I know I've added my fair share of new packs to the JSON repo using scheme_amplify as the assumed property that would eventually be implemented on the backend. It should be easy to do a find/replace though to update that repo.

I think in this repo, we should make sure we add a property that is future-proof and makes sense and I think the name that best exemplifies that is amplify.

Copy link
Contributor

@jordanweiler jordanweiler left a comment

Choose a reason for hiding this comment

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

Thanks for taking on the effort to add the icon! I tried to look at adding the icon a several weeks ago and couldn't figure out how to create the new svg for the icon. Glad you got further than I did.

@@ -879,6 +882,7 @@ protected function importSideSchemeData(Card $card, $data)
'escalation_threat_star',
'scheme_acceleration',
'scheme_crisis',
'scheme_amplify',
Copy link
Contributor

Choose a reason for hiding this comment

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

I spent some effort making sure these keys are all alphabetical. Can you ensure they remain that way in this file? This looks to be out of order but if the name gets simplified to just amplify we should make sure all of these end up in the new correct order.

@@ -78,6 +78,7 @@ public function serialize() {
$optionalFields[] = 'resource_wild';
$optionalFields[] = 'scheme_acceleration';
$optionalFields[] = 'scheme_crisis';
$optionalFields[] = 'scheme_amplify';
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe we also want to add this to the ally case below because those cards (https://marvelcdb.com/card/44016) use this new property too

Copy link
Author

Choose a reason for hiding this comment

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

I'm not sure adding "$optionalFields[] = 'scheme_amplify';" in Card.php is relevant
(although it is necessary in ImportStdCommand.php)

Lady Deadpool is well displayed in my local devenv as is:
image

Comment on lines -3 to -7
src: url('../fonts/marvel-icons.eot?4fzpq9');
src: url('../fonts/marvel-icons.eot?4fzpq9#iefix') format('embedded-opentype'),
url('../fonts/marvel-icons.ttf?4fzpq9') format('truetype'),
url('../fonts/marvel-icons.woff?4fzpq9') format('woff'),
url('../fonts/marvel-icons.svg?4fzpq9#marvel-icons') format('svg');
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't know enough about these type of font files but if we delete these files here, they are orphaned in the repo and should probably get deleted.

I am curious though why we needed them in the first place (or if we still need them and shouldn't delete them) since this new ttf format matches the existing marvel-icons.ttf format and we still used eot, woof, and svg files before. Again, not a font file expert so I'm unfamiliar with the nuances of those types of files.

url('../fonts/marvel-icons.woff?4fzpq9') format('woff'),
url('../fonts/marvel-icons.svg?4fzpq9#marvel-icons') format('svg');

src: url('../fonts/ChampionsIcons.ttf?') format('truetype');
Copy link
Contributor

Choose a reason for hiding this comment

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

I would think if we have a new icon that needs to get added we would replace the existing marvel-icons.ttf with this new file instead of creating a new file with a new name.

Copy link
Author

Choose a reason for hiding this comment

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

I kept the exact name of the file from the homebrew server in case it is updated
Also changing the name of the file might help to force the upload if the previous file is in some cache

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.

Add amplify icon and support for amplify card property Amplify Icon not displayed
3 participants