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

(3dc4135ce) v0.9.5.1

Browse Source
This commit is contained in:
Regalis
2019-11-21 18:22:25 +01:00
parent b39922a074
commit 5c95c53118
287 changed files with 12655 additions and 5048 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/GameSettings.cs
+29 -17
View File
@@ -51,6 +51,8 @@ namespace Barotrauma
public bool VoipAttenuationEnabled { get; set; }
public bool UseDirectionalVoiceChat { get; set; }
public IList<string> CaptureDeviceNames;
public enum VoiceMode
{
Disabled,
@@ -69,7 +71,7 @@ namespace Barotrauma
private LosMode losMode;
public List<string> jobPreferences;
public List<Pair<string, int>> jobPreferences;
private bool useSteamMatchmaking;
private bool requireSteamAuthentication;
@@ -119,7 +121,7 @@ namespace Barotrauma
}
}
public List<string> JobPreferences
public List<Pair<string, int>> JobPreferences
{
get { return jobPreferences; }
set { jobPreferences = value; }
@@ -211,12 +213,13 @@ namespace Barotrauma
}
}
public const float MaxMicrophoneVolume = 10.0f;
public float MicrophoneVolume
{
get { return microphoneVolume; }
set
{
microphoneVolume = MathHelper.Clamp(value, 0.2f, 10.0f);
microphoneVolume = MathHelper.Clamp(value, 0.2f, MaxMicrophoneVolume);
}
}
public string Language
@@ -232,6 +235,7 @@ namespace Barotrauma
if (!SelectedContentPackages.Contains(contentPackage))
{
SelectedContentPackages.Add(contentPackage);
contentPackage.NeedsRestart |= contentPackage.HasMultiplayerIncompatibleContent;
ContentPackage.SortContentPackages();
}
}
@@ -241,6 +245,7 @@ namespace Barotrauma
if (SelectedContentPackages.Contains(contentPackage))
{
SelectedContentPackages.Remove(contentPackage);
contentPackage.NeedsRestart |= contentPackage.HasMultiplayerIncompatibleContent;
ContentPackage.SortContentPackages();
}
}
@@ -442,11 +447,7 @@ namespace Barotrauma
GraphicsHeight = 768;
MasterServerUrl = "";
SelectContentPackage(ContentPackage.List.Any() ? ContentPackage.List[0] : new ContentPackage(""));
jobPreferences = new List<string>();
foreach (string job in JobPrefab.List.Keys)
{
jobPreferences.Add(job);
}
jobPreferences = new List<Pair<string, int>>();
return;
}
@@ -570,9 +571,12 @@ namespace Barotrauma
var gameplay = new XElement("gameplay");
var jobPreferences = new XElement("jobpreferences");
foreach (string jobName in JobPreferences)
foreach (Pair<string, int> job in JobPreferences)
{
jobPreferences.Add(new XElement("job", new XAttribute("identifier", jobName)));
XElement jobElement = new XElement("job");
jobElement.Add(new XAttribute("identifier", job.First));
jobElement.Add(new XAttribute("variant", job.Second));
jobPreferences.Add(jobElement);
}
gameplay.Add(jobPreferences);
doc.Root.Add(gameplay);
@@ -890,9 +894,12 @@ namespace Barotrauma
var gameplay = new XElement("gameplay");
var jobPreferences = new XElement("jobpreferences");
foreach (string jobName in JobPreferences)
foreach (Pair<string, int> job in JobPreferences)
{
jobPreferences.Add(new XElement("job", new XAttribute("identifier", jobName)));
XElement jobElement = new XElement("job");
jobElement.Add(new XAttribute("identifier", job.First));
jobElement.Add(new XAttribute("variant", job.Second));
jobPreferences.Add(jobElement);
}
gameplay.Add(jobPreferences);
doc.Root.Add(gameplay);
@@ -972,14 +979,19 @@ namespace Barotrauma
CampaignDisclaimerShown = doc.Root.GetAttributeBool("campaigndisclaimershown", CampaignDisclaimerShown);
EditorDisclaimerShown = doc.Root.GetAttributeBool("editordisclaimershown", EditorDisclaimerShown);
XElement gameplayElement = doc.Root.Element("gameplay");
jobPreferences = new List<Pair<string, int>>();
if (gameplayElement != null)
{
jobPreferences = new List<string>();
foreach (XElement ele in gameplayElement.Element("jobpreferences").Elements("job"))
var preferencesElement = gameplayElement.Element("jobpreferences");
if (preferencesElement != null)
{
string jobIdentifier = ele.GetAttributeString("identifier", "");
if (string.IsNullOrEmpty(jobIdentifier)) continue;
jobPreferences.Add(jobIdentifier);
foreach (XElement ele in preferencesElement.Elements("job"))
{
string jobIdentifier = ele.GetAttributeString("identifier", "");
int outfitVariant = ele.GetAttributeInt("variant", 1);
if (string.IsNullOrEmpty(jobIdentifier)) continue;
jobPreferences.Add(new Pair<string, int>(jobIdentifier, outfitVariant));
}
}
}