Make hair styles conform to using variants for colors

[furran]

Summary

Bugfixes "Make hair styles conform to using variants for colors"

Purpose of change

The purpose of this change is to make all hairstyles conform to using variants for color

Describe the solution

• Made all hairstyles use variants for coloring
• Made the necessary migration as to avoid throwing errors at the player and making them bald in the process
• Edited the jsons that used the old hairstyles to use the new hairstyle ids and variants
• Edited the tile_config files for every tileset to use the new hairstyle ids and variants

Describe alternatives you've considered

Considered doing the opposite and undoing variant for hairstyles and eye_color, but that felt like going backwards.

Testing

Save file from 0.G: Debug-trimmed.tar.gz

Made a few tests:

1. Created a new character and selected one of the hairstyles that now conform to the variants color style ('fro black) and checked in game through @ and the sprite (tileset used: GiantDays).

2. Created a character in the stable 0.G version with the black 'fro hairstyle and exported the save to this build. Loaded the save, observed if there were any error messages related to the changes ( there were some unrelated) and checked if my character still had the same hairstyle. Tested the same thing with the hairstyle short_no_fringe black variant.

Additional context

Some observations:

• Some tilesets have sprites for some hairstyles while others don't. Keep that in mind if testing that.
• mutation migrations don't seem to support "from_variant", so if the player character is using a re-identified hairstyle that had variants the migration will default the player hair color to black.

[github-actions]

Auto-requesting reviews from non-collaborators: @GuardianDll

[AMurkin]

I suggest some way of indication of menu items which will prompt for a variant.
Something like this:

diff --git a/src/mutation.cpp b/src/mutation.cpp
index 19451fc063..cafb3fb023 100644
--- a/src/mutation.cpp
+++ b/src/mutation.cpp
@@ -2363,13 +2363,9 @@ void Character::customize_appearance( customize_appearance_choice choice )
                 current_trait = trait;
                 char_has_trait = true;
             }
-
-            const std::string &entry_name = mutation_name( trait );
-
-            amenu.addentry(
-                i, true, MENU_AUTOASSIGN,
-                char_has_trait ? entry_name + " *" : entry_name
-            );
+            amenu.addentry( i, true, MENU_AUTOASSIGN,
+                            ( trait->variants.empty() ? mutation_name( trait ) : string_format( _( "Variant of %s… " ),
+                                    trait->name() ) ) + ( char_has_trait ? " *" : "" ) );
         }
     };

[furran]

I suggest some way of indication of menu items which will prompt for a variant. Something like this:

diff --git a/src/mutation.cpp b/src/mutation.cpp
index 19451fc063..cafb3fb023 100644
--- a/src/mutation.cpp
+++ b/src/mutation.cpp
@@ -2363,13 +2363,9 @@ void Character::customize_appearance( customize_appearance_choice choice )
                 current_trait = trait;
                 char_has_trait = true;
             }
-
-            const std::string &entry_name = mutation_name( trait );
-
-            amenu.addentry(
-                i, true, MENU_AUTOASSIGN,
-                char_has_trait ? entry_name + " *" : entry_name
-            );
+            amenu.addentry( i, true, MENU_AUTOASSIGN,
+                            ( trait->variants.empty() ? mutation_name( trait ) : string_format( _( "Variant of %s… " ),
+                                    trait->name() ) ) + ( char_has_trait ? " *" : "" ) );
         }
     };

I don't know, I feel like it feels cleaner and clearer without it. But I probably should follow your example and use trait->name if it has variants.

A	B

[ehughsbaird]

I don't think tilesets are updated here, they're updated at https://github.com/I-am-Erk/CDDA-Tilesets

It would probably better if changing the hair to use variants and the fix to the customization were in separate PRs - they're not really related, and one of them is really big.

[furran]

I don't think tilesets are updated here, they're updated at https://github.com/I-am-Erk/CDDA-Tilesets

I thought changes to the tileset sprites/images are made at https://github.com/I-am-Erk/CDDA-Tilesets but changes to things like tile_config.json are made here? I might be wrong though

It would probably better if changing the hair to use variants and the fix to the customization were in separate PRs - they're not really related, and one of them is really big.

You are right. I'm moving the customization fix to it's own PR

[ehughsbaird]

I don't think tilesets are updated here, they're updated at https://github.com/I-am-Erk/CDDA-Tilesets

I thought changes to the tileset sprites/images are made at https://github.com/I-am-Erk/CDDA-Tilesets but changes to things like tile_config.json are made here? I might be wrong though

The tile configs seem to be completely overwritten in #69886

[furran]

@ehughsbaird ouch. You are right. Gonna open an issue in that repo informing them of these changes to hair id.