vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(628aa768f) Fix characters always being created in the default folder (#1330).

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-26 17:09:35 +02:00
parent 8537234b75
commit 93f2dfb185
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs
+7 -8
View File
@@ -1226,7 +1226,7 @@ namespace Barotrauma
Cam.Position = character.WorldPosition; Cam.Position = character.WorldPosition;
} }
private bool CreateCharacter(string name, bool isHumanoid, params object[] ragdollConfig) private bool CreateCharacter(string name, string mainFolder, bool isHumanoid, params object[] ragdollConfig)
{ {
var contentPackage = GameMain.Config.SelectedContentPackages.LastOrDefault(); var contentPackage = GameMain.Config.SelectedContentPackages.LastOrDefault();
if (contentPackage == null) if (contentPackage == null)
@@ -1245,17 +1245,16 @@ namespace Barotrauma
#endif #endif
string speciesName = name; string speciesName = name;
string mainFolder = $"Content/Characters/{speciesName}";
// Config file // Config file
string configFilePath = $"{mainFolder}/{speciesName}.xml"; string configFilePath = Path.Combine(mainFolder, $"{speciesName}.xml").Replace(@"\", @"/");
if (ContentPackage.GetFilesOfType(GameMain.SelectedPackages, ContentType.Character).None(path => path.Contains(speciesName))) if (ContentPackage.GetFilesOfType(GameMain.SelectedPackages, ContentType.Character).None(path => path.Contains(speciesName)))
{ {
// Create the config file // Create the config file
XElement mainElement = new XElement("Character", XElement mainElement = new XElement("Character",
new XAttribute("name", speciesName), new XAttribute("name", speciesName),
new XAttribute("humanoid", isHumanoid), new XAttribute("humanoid", isHumanoid),
new XElement("ragdolls"), new XElement("ragdolls", new XAttribute("folder", Path.Combine(mainFolder, $"Ragdolls/").Replace(@"\", @"/"))),
new XElement("animations"), new XElement("animations", new XAttribute("folder", Path.Combine(mainFolder, $"Animations/").Replace(@"\", @"/"))),
new XElement("health"), new XElement("health"),
new XElement("ai")); new XElement("ai"));
XDocument doc = new XDocument(mainElement); XDocument doc = new XDocument(mainElement);
@@ -1270,13 +1269,13 @@ namespace Barotrauma
DebugConsole.NewMessage(GetCharacterEditorTranslation("ContentPackageSaved").Replace("[path]", contentPackage.Path)); DebugConsole.NewMessage(GetCharacterEditorTranslation("ContentPackageSaved").Replace("[path]", contentPackage.Path));
} }
// Ragdoll // Ragdoll
string ragdollFolder = RagdollParams.GetDefaultFolder(speciesName); string ragdollFolder = RagdollParams.GetFolder(speciesName);
string ragdollPath = RagdollParams.GetDefaultFile(speciesName); string ragdollPath = RagdollParams.GetDefaultFile(speciesName);
RagdollParams ragdollParams = isHumanoid RagdollParams ragdollParams = isHumanoid
? RagdollParams.CreateDefault<HumanRagdollParams>(ragdollPath, speciesName, ragdollConfig) ? RagdollParams.CreateDefault<HumanRagdollParams>(ragdollPath, speciesName, ragdollConfig)
: RagdollParams.CreateDefault<FishRagdollParams>(ragdollPath, speciesName, ragdollConfig) as RagdollParams; : RagdollParams.CreateDefault<FishRagdollParams>(ragdollPath, speciesName, ragdollConfig) as RagdollParams;
// Animations // Animations
string animFolder = AnimationParams.GetDefaultFolder(speciesName); string animFolder = AnimationParams.GetFolder(speciesName);
foreach (AnimationType animType in Enum.GetValues(typeof(AnimationType))) foreach (AnimationType animType in Enum.GetValues(typeof(AnimationType)))
{ {
if (animType != AnimationType.NotDefined) if (animType != AnimationType.NotDefined)
@@ -4663,7 +4662,7 @@ namespace Barotrauma
LimbXElements.Values, LimbXElements.Values,
JointXElements JointXElements
}; };
if (CharacterEditorScreen.instance.CreateCharacter(Name, IsHumanoid, ragdollParams)) if (CharacterEditorScreen.instance.CreateCharacter(Name, Path.GetDirectoryName(XMLPath), IsHumanoid, ragdollParams))
{ {
GUI.AddMessage(GetCharacterEditorTranslation("CharacterCreated").Replace("[name]", Name), Color.Green, font: GUI.Font); GUI.AddMessage(GetCharacterEditorTranslation("CharacterCreated").Replace("[name]", Name), Color.Green, font: GUI.Font);
} }
Barotrauma/BarotraumaShared/Source/Characters/Animation/Params/Animation/AnimationParams.cs
+1 -1
View File
@@ -99,7 +99,7 @@ namespace Barotrauma
public static string GetDefaultFolder(string speciesName) => $"Content/Characters/{speciesName.CapitaliseFirstInvariant()}/Animations/"; public static string GetDefaultFolder(string speciesName) => $"Content/Characters/{speciesName.CapitaliseFirstInvariant()}/Animations/";
public static string GetDefaultFile(string speciesName, AnimationType animType) => $"{GetFolder(speciesName)}{GetDefaultFileName(speciesName, animType)}.xml"; public static string GetDefaultFile(string speciesName, AnimationType animType) => $"{GetFolder(speciesName)}{GetDefaultFileName(speciesName, animType)}.xml";
protected static string GetFolder(string speciesName) public static string GetFolder(string speciesName)
{ {
var folder = XMLExtensions.TryLoadXml(Character.GetConfigFile(speciesName))?.Root?.Element("animations")?.GetAttributeString("folder", string.Empty); var folder = XMLExtensions.TryLoadXml(Character.GetConfigFile(speciesName))?.Root?.Element("animations")?.GetAttributeString("folder", string.Empty);
if (string.IsNullOrEmpty(folder) || folder.ToLowerInvariant() == "default") if (string.IsNullOrEmpty(folder) || folder.ToLowerInvariant() == "default")
Barotrauma/BarotraumaShared/Source/Characters/Animation/Params/Ragdoll/RagdollParams.cs
+1 -1
View File
@@ -79,7 +79,7 @@ namespace Barotrauma
new XAttribute("sourcerect", $"0, 0, 1, 1"))) new XAttribute("sourcerect", $"0, 0, 1, 1")))
}; };
protected static string GetFolder(string speciesName) public static string GetFolder(string speciesName)
{ {
var folder = XMLExtensions.TryLoadXml(Character.GetConfigFile(speciesName))?.Root?.Element("ragdolls")?.GetAttributeString("folder", string.Empty); var folder = XMLExtensions.TryLoadXml(Character.GetConfigFile(speciesName))?.Root?.Element("ragdolls")?.GetAttributeString("folder", string.Empty);
if (string.IsNullOrEmpty(folder) || folder.ToLowerInvariant() == "default") if (string.IsNullOrEmpty(folder) || folder.ToLowerInvariant() == "default")