From db2aabb523a1949d50e11b2649d36de91097f57d Mon Sep 17 00:00:00 2001 From: Michael Day Date: Tue, 10 May 2022 16:35:26 -0700 Subject: [PATCH] update character appearance panel to default to HumanMale and HumanFemale instead of legacy DCS versions --- .../Characters/BaseClasses/UMAModelController.cs | 2 +- .../System/Scripts/Interactables/MusicPlayerProps.cs | 2 +- .../UI/CloseableWindows/CharacterAppearancePanel.cs | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/AnyRPG/Core/System/Scripts/Characters/BaseClasses/UMAModelController.cs b/Assets/AnyRPG/Core/System/Scripts/Characters/BaseClasses/UMAModelController.cs index 6227b5180..c8f40c07f 100644 --- a/Assets/AnyRPG/Core/System/Scripts/Characters/BaseClasses/UMAModelController.cs +++ b/Assets/AnyRPG/Core/System/Scripts/Characters/BaseClasses/UMAModelController.cs @@ -91,7 +91,7 @@ private void CheckAvatarDefinition() { avatarDefinition = new AvatarDefinition(); // avatarDefintion is a struct so needs to have its properties set to something other than null - avatarDefinition.RaceName = "HumanMaleDCS"; + avatarDefinition.RaceName = "HumanMale"; avatarDefinition.Wardrobe = new string[0]; avatarDefinition.Dna = new DnaDef[0]; avatarDefinition.Colors = new SharedColorDef[0]; diff --git a/Assets/AnyRPG/Core/System/Scripts/Interactables/MusicPlayerProps.cs b/Assets/AnyRPG/Core/System/Scripts/Interactables/MusicPlayerProps.cs index 7284f1124..7d7280cb6 100644 --- a/Assets/AnyRPG/Core/System/Scripts/Interactables/MusicPlayerProps.cs +++ b/Assets/AnyRPG/Core/System/Scripts/Interactables/MusicPlayerProps.cs @@ -47,7 +47,7 @@ public override void SetupScriptableObjects(SystemGameManager systemGameManager) if (tmpAudioProfile != null) { audioProfileList.Add(tmpAudioProfile); } else { - Debug.LogError("MusicPlayerCompoennt.SetupScriptableObjects(): COULD NOT FIND AUDIO PROFILE: " + audioProfileName + " while initializing"); + Debug.LogError("MusicPlayerComponent.SetupScriptableObjects(): COULD NOT FIND AUDIO PROFILE: " + audioProfileName + " while initializing"); } } } diff --git a/Assets/AnyRPG/Core/System/Scripts/UI/CloseableWindows/CharacterAppearancePanel.cs b/Assets/AnyRPG/Core/System/Scripts/UI/CloseableWindows/CharacterAppearancePanel.cs index a5104a7f1..404201b15 100644 --- a/Assets/AnyRPG/Core/System/Scripts/UI/CloseableWindows/CharacterAppearancePanel.cs +++ b/Assets/AnyRPG/Core/System/Scripts/UI/CloseableWindows/CharacterAppearancePanel.cs @@ -448,13 +448,13 @@ public void SetMale() { //maleButton.HighlightBackground(); if (maleRecipe != string.Empty) { //Debug.Log("CharacterCreatorPanel.SetFemale(): maleRecipe != string.Empty"); - characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.DynamicCharacterAvatar.ChangeRace("HumanMaleDCS"); + characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.DynamicCharacterAvatar.ChangeRace("HumanMale"); //characterCreatorManager.PreviewUnitController.UnitModelController.LoadSavedAppearanceSettings(maleRecipe, true); characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.SetAppearance(maleRecipe); } else { //Debug.Log("CharacterCreatorPanel.SetMale(): maleRecipe == string.Empty"); - //characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.DynamicCharacterAvatar.ChangeRace("HumanMaleDCS"); - characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.SetAvatarDefinitionRace("HumanMaleDCS"); + //characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.DynamicCharacterAvatar.ChangeRace("HumanMale"); + characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.SetAvatarDefinitionRace("HumanMale"); characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.PreloadEquipmentModels(true); characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.ReloadAvatarDefinition(); } @@ -475,13 +475,13 @@ public void SetFemale() { //femaleButton.Select(); if (femaleRecipe != string.Empty) { //Debug.Log("CharacterCreatorPanel.SetFemale(): femaleRecipe != string.Empty"); - characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.DynamicCharacterAvatar.ChangeRace("HumanFemaleDCS"); + characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.DynamicCharacterAvatar.ChangeRace("HumanFemale"); //characterCreatorManager.PreviewUnitController.UnitModelController.LoadSavedAppearanceSettings(femaleRecipe, true); characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.SetAppearance(femaleRecipe); } else { //Debug.Log("CharacterCreatorPanel.SetFemale(): femaleRecipe == string.Empty"); - //characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.DynamicCharacterAvatar.ChangeRace("HumanFemaleDCS"); - characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.SetAvatarDefinitionRace("HumanFemaleDCS"); + //characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.DynamicCharacterAvatar.ChangeRace("HumanFemale"); + characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.SetAvatarDefinitionRace("HumanFemale"); characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.PreloadEquipmentModels(true); characterCreatorManager.PreviewUnitController.UnitModelController.UMAModelController.ReloadAvatarDefinition(); }