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

Recommended crew experience is saved using text tags instead of the actual text (-> experience texts can be translated without the translation showing up in sub files).

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-08-15 12:06:22 +03:00
parent b1f8de887c
commit c2f9e1481f
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Map/Submarine.cs
+1 -1
View File
@@ -146,7 +146,7 @@ namespace Barotrauma
"", frame, GUI.SmallFont); "", frame, GUI.SmallFont);
new GUITextBlock(new Rectangle(246, 100, 100, 20), new GUITextBlock(new Rectangle(246, 100, 100, 20),
TextManager.Get("RecommendedCrewExperience") + ": " + (string.IsNullOrEmpty(RecommendedCrewExperience) ? TextManager.Get("unknown") : RecommendedCrewExperience), TextManager.Get("RecommendedCrewExperience") + ": " + (string.IsNullOrEmpty(RecommendedCrewExperience) ? TextManager.Get("unknown") : TextManager.Get(RecommendedCrewExperience)),
"", frame, GUI.SmallFont); "", frame, GUI.SmallFont);
new GUITextBlock(new Rectangle(246, 120, 0, 20), new GUITextBlock(new Rectangle(246, 120, 0, 20),
Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs
+14 -10
View File
@@ -15,9 +15,9 @@ namespace Barotrauma
{ {
private static string[] crewExperienceLevels = new string[] private static string[] crewExperienceLevels = new string[]
{ {
TextManager.Get("CrewExperienceLow"), "CrewExperienceLow",
TextManager.Get("CrewExperienceMid"), "CrewExperienceMid",
TextManager.Get("CrewExperienceHigh") "CrewExperienceHigh"
}; };
private Camera cam; private Camera cam;
@@ -587,23 +587,26 @@ namespace Barotrauma
var toggleExpRight = new GUIButton(new Rectangle(350, y, 20, 20), ">", "", saveFrame); var toggleExpRight = new GUIButton(new Rectangle(350, y, 20, 20), ">", "", saveFrame);
var experienceText = new GUITextBlock(new Rectangle(250, y, 100, 20), crewExperienceLevels[0], "", Alignment.TopLeft, Alignment.Center, saveFrame); var experienceText = new GUITextBlock(new Rectangle(250, y, 100, 20), crewExperienceLevels[0], "", Alignment.TopLeft, Alignment.Center, saveFrame);
toggleExpLeft.OnClicked += (btn, userData) => toggleExpLeft.OnClicked += (btn, userData) =>
{ {
int currentIndex = Array.IndexOf(crewExperienceLevels, experienceText.Text); int currentIndex = Array.IndexOf(crewExperienceLevels, (string)experienceText.UserData);
currentIndex--; currentIndex--;
if (currentIndex < 0) currentIndex = crewExperienceLevels.Length - 1; if (currentIndex < 0) currentIndex = crewExperienceLevels.Length - 1;
experienceText.Text = crewExperienceLevels[currentIndex]; experienceText.UserData = crewExperienceLevels[currentIndex];
Submarine.MainSub.RecommendedCrewExperience = experienceText.Text; experienceText.Text = TextManager.Get(crewExperienceLevels[currentIndex]);
Submarine.MainSub.RecommendedCrewExperience = (string)experienceText.UserData;
return true; return true;
}; };
toggleExpRight.OnClicked += (btn, userData) => toggleExpRight.OnClicked += (btn, userData) =>
{ {
int currentIndex = Array.IndexOf(crewExperienceLevels, experienceText.Text); int currentIndex = Array.IndexOf(crewExperienceLevels, (string)experienceText.UserData);
currentIndex++; currentIndex++;
if (currentIndex >= crewExperienceLevels.Length) currentIndex = 0; if (currentIndex >= crewExperienceLevels.Length) currentIndex = 0;
experienceText.Text = crewExperienceLevels[currentIndex]; experienceText.UserData = crewExperienceLevels[currentIndex];
Submarine.MainSub.RecommendedCrewExperience = experienceText.Text; experienceText.Text = TextManager.Get(crewExperienceLevels[currentIndex]);
Submarine.MainSub.RecommendedCrewExperience = (string)experienceText.UserData;
return true; return true;
}; };
@@ -613,8 +616,9 @@ namespace Barotrauma
int max = Submarine.MainSub.RecommendedCrewSizeMax; int max = Submarine.MainSub.RecommendedCrewSizeMax;
crewSizeMin.IntValue = min; crewSizeMin.IntValue = min;
crewSizeMax.IntValue = max; crewSizeMax.IntValue = max;
experienceText.Text = string.IsNullOrEmpty(Submarine.MainSub.RecommendedCrewExperience) ? experienceText.UserData = string.IsNullOrEmpty(Submarine.MainSub.RecommendedCrewExperience) ?
crewExperienceLevels[0] : Submarine.MainSub.RecommendedCrewExperience; crewExperienceLevels[0] : Submarine.MainSub.RecommendedCrewExperience;
experienceText.Text = TextManager.Get((string)experienceText.UserData);
} }
var saveButton = new GUIButton(new Rectangle(-90, 0, 80, 20), TextManager.Get("SaveSubButton"), Alignment.Right | Alignment.Bottom, "", saveFrame); var saveButton = new GUIButton(new Rectangle(-90, 0, 80, 20), TextManager.Get("SaveSubButton"), Alignment.Right | Alignment.Bottom, "", saveFrame);
Barotrauma/BarotraumaShared/Source/Map/Submarine.cs
+9
View File
@@ -296,6 +296,15 @@ namespace Barotrauma
RecommendedCrewSizeMin = doc.Root.GetAttributeInt("recommendedcrewsizemin", 0); RecommendedCrewSizeMin = doc.Root.GetAttributeInt("recommendedcrewsizemin", 0);
RecommendedCrewSizeMax = doc.Root.GetAttributeInt("recommendedcrewsizemax", 0); RecommendedCrewSizeMax = doc.Root.GetAttributeInt("recommendedcrewsizemax", 0);
RecommendedCrewExperience = doc.Root.GetAttributeString("recommendedcrewexperience", "Unknown"); RecommendedCrewExperience = doc.Root.GetAttributeString("recommendedcrewexperience", "Unknown");
//backwards compatibility (use text tags instead of the actual text)
if (RecommendedCrewExperience == "Beginner")
RecommendedCrewExperience = "CrewExperienceLow";
else if (RecommendedCrewExperience == "Intermediate")
RecommendedCrewExperience = "CrewExperienceMid";
else if (RecommendedCrewExperience == "Experienced")
RecommendedCrewExperience = "CrewExperienceHigh";
string[] contentPackageNames = doc.Root.GetAttributeStringArray("compatiblecontentpackages", new string[0]); string[] contentPackageNames = doc.Root.GetAttributeStringArray("compatiblecontentpackages", new string[0]);
foreach (string contentPackageName in contentPackageNames) foreach (string contentPackageName in contentPackageNames)
{ {