Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-20 00:46:34 +00:00
Code Issues Activity

Fixes status names for echoes (#654)

Browse source 
Fixes issue where status names did not display for echoes because their statuses often use their parent characters' (Wolf included in that)
This commit is contained in:
Zarek Syed 2023-11-03 09:19:13 -04:00 committed by GitHub
parent 8203e54430
commit 3130b5ad30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/common/consts.rs
View file

@ -9296,16 +9296,34 @@ fn character_pairs() -> [(i32, Character); 97] {
] ]
} }
fn get_parent_character(fighter: Character) -> Character {
use Character::*;
return match fighter {
Chrom => Roy,
Daisy => Peach,
Ken => Ryu,
Lucina => Marth,
Pitb => Pit,
Richter => Simon,
Samusd => Samus,
Wolf => Fox, //Pseudo-echo
_ => fighter,
};
}
pub fn kind_to_char(kind: i32) -> Character { pub fn kind_to_char(kind: i32) -> Character {
*KIND_TO_CHAR.get(&kind).unwrap_or(&Character::None) *KIND_TO_CHAR.get(&kind).unwrap_or(&Character::None)
} }
pub fn status_display_name(fighter_kind: i32, status: i32) -> String { pub fn status_display_name(fighter_kind: i32, status: i32) -> String {
let character = kind_to_char(fighter_kind); let character = kind_to_char(fighter_kind);
let parent = get_parent_character(character);
let common_status_kind_identifier = "FIGHTER_STATUS_KIND_"; let common_status_kind_identifier = "FIGHTER_STATUS_KIND_";
let character_status_kind_identifier = let character_status_kind_identifier =
format!("FIGHTER_{:#?}_STATUS_KIND_", character).to_uppercase(); format!("FIGHTER_{:#?}_STATUS_KIND_", character).to_uppercase();
let parent_character_status_kind_identifier =
format!("FIGHTER_{:#?}_STATUS_KIND_", parent).to_uppercase();
let matching_statuses = STATUS_DISPLAY let matching_statuses = STATUS_DISPLAY
.iter() .iter()
.filter(|(_, val)| status == **val) .filter(|(_, val)| status == **val)
@ -9321,12 +9339,13 @@ pub fn status_display_name(fighter_kind: i32, status: i32) -> String {
.to_case(Case::Pascal); .to_case(Case::Pascal);
} }
if let Some(character_status_name) = matching_statuses if let Some(character_status_name) = matching_statuses.iter().find(|status| {
.iter() status.starts_with(&character_status_kind_identifier)
.find(|status| status.starts_with(&character_status_kind_identifier)) || status.starts_with(&parent_character_status_kind_identifier)
{ }) {
return character_status_name return character_status_name
.replace(&character_status_kind_identifier, "") .replace(&character_status_kind_identifier, "")
.replace(&parent_character_status_kind_identifier, "")
.to_case(Case::Pascal); .to_case(Case::Pascal);
} }