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

(d9829ac) v0.9.4.0

Browse Source
This commit is contained in:
Regalis
2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Events/ArtifactEvent.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace Barotrauma
var itemContainer = it.GetComponent<Items.Components.ItemContainer>();
if (itemContainer == null) continue;
if (itemContainer.Combine(item)) break; // Placement successful
if (itemContainer.Combine(item, user: null)) break; // Placement successful
}
if (GameSettings.VerboseLogging)
Barotrauma/BarotraumaShared/Source/Events/EventManager.cs
+10 -7
View File
@@ -8,7 +8,7 @@ namespace Barotrauma
{
const float IntensityUpdateInterval = 5.0f;
private List<ScriptedEvent> events;
private readonly List<ScriptedEvent> events;
private Level level;
@@ -33,7 +33,7 @@ namespace Barotrauma
private float roundDuration;
private List<ScriptedEventSet> selectedEventSets;
private readonly List<ScriptedEventSet> selectedEventSets;
private EventManagerSettings settings;
@@ -168,14 +168,17 @@ namespace Barotrauma
if (eventSet.EventPrefabs.Count > 0)
{
MTRandom rand = new MTRandom(ToolBox.StringToInt(level.Seed));
var newEvent = eventSet.EventPrefabs[rand.NextInt32() % eventSet.EventPrefabs.Count].CreateInstance();
newEvent.Init(true);
DebugConsole.Log("Initialized event " + newEvent.ToString());
events.Add(newEvent);
var eventPrefab = ToolBox.SelectWeightedRandom(eventSet.EventPrefabs, eventSet.EventPrefabs.Select(e => e.Commonness).ToList(), rand);
if (eventPrefab != null)
{
var newEvent = eventPrefab.CreateInstance();
newEvent.Init(true);
DebugConsole.Log("Initialized event " + newEvent.ToString());
events.Add(newEvent);
}
}
if (eventSet.ChildSets.Count > 0)
{
MTRandom rand = new MTRandom(ToolBox.StringToInt(level.Seed));
var newEventSet = SelectRandomEvents(eventSet.ChildSets);
if (newEventSet != null) selectedEventSets.Add(newEventSet);
}
Barotrauma/BarotraumaShared/Source/Events/EventManagerSettings.cs
+34 -9
View File
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Collections.Generic;
using System.Xml.Linq;
using System.Linq;
using System;
using Microsoft.Xna.Framework;
namespace Barotrauma
{
@@ -28,17 +28,42 @@ namespace Barotrauma
static EventManagerSettings()
{
Load(Path.Combine("Content", "EventManagerSettings.xml"));
foreach (string file in GameMain.Instance.GetFilesOfType(ContentType.EventManagerSettings))
{
Load(file);
}
}
private static void Load(string file)
{
XDocument doc = XMLExtensions.TryLoadXml(file);
if (doc == null || doc.Root == null) return;
foreach (XElement subElement in doc.Root.Elements())
if (doc == null) { return; }
var mainElement = doc.Root;
bool allowOverriding = false;
if (doc.Root.IsOverride())
{
List.Add(new EventManagerSettings(subElement));
mainElement = doc.Root.FirstElement();
allowOverriding = true;
}
foreach (XElement subElement in mainElement.Elements())
{
var element = subElement.IsOverride() ? subElement.FirstElement() : subElement;
string name = element.Name.ToString();
var duplicate = List.FirstOrDefault(e => e.Name.ToString().Equals(name, StringComparison.OrdinalIgnoreCase));
if (duplicate != null)
{
if (allowOverriding || subElement.IsOverride())
{
DebugConsole.NewMessage($"Overriding the existing preset '{name}' in the event manager settings using the file '{file}'", Color.Yellow);
List.Remove(duplicate);
}
else
{
DebugConsole.ThrowError($"Error in '{file}': Another element with the name '{name}' found! Each element must have a unique name. Use <override></override> tags if you want to override an existing preset.");
continue;
}
}
List.Add(new EventManagerSettings(element));
}
}
Barotrauma/BarotraumaShared/Source/Events/Missions/CargoMission.cs
+1 -1
View File
@@ -94,7 +94,7 @@ namespace Barotrauma
items.Add(item);
if (parent != null) parent.Combine(item);
if (parent != null) parent.Combine(item, user: null);
foreach (XElement subElement in element.Elements())
{
Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs
+6 -6
View File
@@ -32,7 +32,7 @@ namespace Barotrauma
if (Winner == Character.TeamType.None || string.IsNullOrEmpty(base.SuccessMessage)) { return ""; }
//disable success message for now if it hasn't been translated
if (!TextManager.ContainsTag("MissionSuccess." + Prefab.Identifier)) { return ""; }
if (!TextManager.ContainsTag("MissionSuccess." + Prefab.TextIdentifier)) { return ""; }
var loser = Winner == Character.TeamType.Team1 ?
Character.TeamType.Team2 :
@@ -49,9 +49,9 @@ namespace Barotrauma
{
descriptions = new string[]
{
TextManager.Get("MissionDescriptionNeutral." + prefab.Identifier, true) ?? prefab.ConfigElement.GetAttributeString("descriptionneutral", ""),
TextManager.Get("MissionDescription1." + prefab.Identifier, true) ?? prefab.ConfigElement.GetAttributeString("description1", ""),
TextManager.Get("MissionDescription2." + prefab.Identifier, true) ?? prefab.ConfigElement.GetAttributeString("description2", "")
TextManager.Get("MissionDescriptionNeutral." + prefab.TextIdentifier, true) ?? prefab.ConfigElement.GetAttributeString("descriptionneutral", ""),
TextManager.Get("MissionDescription1." + prefab.TextIdentifier, true) ?? prefab.ConfigElement.GetAttributeString("description1", ""),
TextManager.Get("MissionDescription2." + prefab.TextIdentifier, true) ?? prefab.ConfigElement.GetAttributeString("description2", "")
};
for (int i = 0; i < descriptions.Length; i++)
@@ -64,8 +64,8 @@ namespace Barotrauma
teamNames = new string[]
{
TextManager.Get("MissionTeam1." + prefab.Identifier, true) ?? prefab.ConfigElement.GetAttributeString("teamname1", "Team A"),
TextManager.Get("MissionTeam2." + prefab.Identifier, true) ?? prefab.ConfigElement.GetAttributeString("teamname2", "Team B")
TextManager.Get("MissionTeam1." + prefab.TextIdentifier, true) ?? prefab.ConfigElement.GetAttributeString("teamname1", "Team A"),
TextManager.Get("MissionTeam2." + prefab.TextIdentifier, true) ?? prefab.ConfigElement.GetAttributeString("teamname2", "Team B")
};
}
Barotrauma/BarotraumaShared/Source/Events/Missions/MissionPrefab.cs
+44 -12
View File
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Reflection;
using System.Xml.Linq;
using Microsoft.Xna.Framework;
namespace Barotrauma
{
@@ -15,7 +16,7 @@ namespace Barotrauma
Combat
}
class MissionPrefab
partial class MissionPrefab
{
public static readonly List<MissionPrefab> List = new List<MissionPrefab>();
@@ -27,7 +28,7 @@ namespace Barotrauma
{ MissionType.Combat, typeof(CombatMission) },
};
private ConstructorInfo constructor;
private readonly ConstructorInfo constructor;
public readonly MissionType type;
@@ -35,6 +36,8 @@ namespace Barotrauma
public readonly string Identifier;
public readonly string TextIdentifier;
public readonly string Name;
public readonly string Description;
public readonly string SuccessMessage;
@@ -61,10 +64,34 @@ namespace Barotrauma
foreach (string file in files)
{
XDocument doc = XMLExtensions.TryLoadXml(file);
if (doc?.Root == null) continue;
foreach (XElement element in doc.Root.Elements())
if (doc == null) { continue; }
bool allowOverride = false;
var mainElement = doc.Root;
if (mainElement.IsOverride())
{
allowOverride = true;
mainElement = mainElement.FirstElement();
}
foreach (XElement sourceElement in mainElement.Elements())
{
var element = sourceElement.IsOverride() ? sourceElement.FirstElement() : sourceElement;
var identifier = element.GetAttributeString("identifier", string.Empty);
var duplicate = List.Find(m => m.Identifier == identifier);
if (duplicate != null)
{
if (allowOverride || sourceElement.IsOverride())
{
DebugConsole.NewMessage($"Overriding a mission with the identifier '{identifier}' using the file '{file}'", Color.Yellow);
List.Remove(duplicate);
}
else
{
DebugConsole.ThrowError($"Duplicate mission found with the identifier '{identifier}' in file '{file}'! Add <override></override> tags as the parent of the mission definition to allow overriding.");
// TODO: Don't allow adding duplicates when the issue with multiple missions is solved.
//continue;
}
}
List.Add(new MissionPrefab(element));
}
}
@@ -75,15 +102,16 @@ namespace Barotrauma
ConfigElement = element;
Identifier = element.GetAttributeString("identifier", "");
TextIdentifier = element.GetAttributeString("textidentifier", null) ?? Identifier;
Name = TextManager.Get("MissionName." + Identifier, true) ?? element.GetAttributeString("name", "");
Description = TextManager.Get("MissionDescription." + Identifier, true) ?? element.GetAttributeString("description", "");
Name = TextManager.Get("MissionName." + TextIdentifier, true) ?? element.GetAttributeString("name", "");
Description = TextManager.Get("MissionDescription." + TextIdentifier, true) ?? element.GetAttributeString("description", "");
Reward = element.GetAttributeInt("reward", 1);
Commonness = element.GetAttributeInt("commonness", 1);
SuccessMessage = TextManager.Get("MissionSuccess." + Identifier, true) ?? element.GetAttributeString("successmessage", "Mission completed successfully");
FailureMessage = TextManager.Get("MissionFailure." + Identifier, true) ?? "";
SuccessMessage = TextManager.Get("MissionSuccess." + TextIdentifier, true) ?? element.GetAttributeString("successmessage", "Mission completed successfully");
FailureMessage = TextManager.Get("MissionFailure." + TextIdentifier, true) ?? "";
if (string.IsNullOrEmpty(FailureMessage) && TextManager.ContainsTag("missionfailed"))
{
FailureMessage = TextManager.Get("missionfailed", returnNull: true) ?? "";
@@ -93,7 +121,7 @@ namespace Barotrauma
FailureMessage = element.GetAttributeString("failuremessage", "");
}
SonarLabel = TextManager.Get("MissionSonarLabel." + Identifier, true) ?? element.GetAttributeString("sonarlabel", "");
SonarLabel = TextManager.Get("MissionSonarLabel." + TextIdentifier, true) ?? element.GetAttributeString("sonarlabel", "");
MultiplayerOnly = element.GetAttributeBool("multiplayeronly", false);
SingleplayerOnly = element.GetAttributeBool("singleplayeronly", false);
@@ -110,8 +138,8 @@ namespace Barotrauma
case "message":
int index = Messages.Count;
Headers.Add(TextManager.Get("MissionHeader" + index + "." + Identifier, true) ?? subElement.GetAttributeString("header", ""));
Messages.Add(TextManager.Get("MissionMessage" + index + "." + Identifier, true) ?? subElement.GetAttributeString("text", ""));
Headers.Add(TextManager.Get("MissionHeader" + index + "." + TextIdentifier, true) ?? subElement.GetAttributeString("header", ""));
Messages.Add(TextManager.Get("MissionMessage" + index + "." + TextIdentifier, true) ?? subElement.GetAttributeString("text", ""));
break;
case "locationtype":
AllowedLocationTypes.Add(new Pair<string, string>(
@@ -139,7 +167,11 @@ namespace Barotrauma
}
constructor = missionClasses[type].GetConstructor(new[] { typeof(MissionPrefab), typeof(Location[]) });
InitProjSpecific(element);
}
partial void InitProjSpecific(XElement element);
public bool IsAllowed(Location from, Location to)
{
Barotrauma/BarotraumaShared/Source/Events/Missions/SalvageMission.cs
+1 -1
View File
@@ -80,7 +80,7 @@ namespace Barotrauma
var itemContainer = it.GetComponent<Items.Components.ItemContainer>();
if (itemContainer == null) continue;
if (itemContainer.Combine(item)) break; // Placement successful
if (itemContainer.Combine(item, user: null)) break; // Placement successful
}
}
}
Barotrauma/BarotraumaShared/Source/Events/ScriptedEventPrefab.cs
+4
View File
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Xml.Linq;
@@ -12,6 +13,8 @@ namespace Barotrauma
public readonly string MusicType;
public float Commonness;
public ScriptedEventPrefab(XElement element)
{
ConfigElement = element;
@@ -30,6 +33,7 @@ namespace Barotrauma
{
DebugConsole.ThrowError("Could not find an event class of the type \"" + ConfigElement.Name + "\".");
}
Commonness = element.GetAttributeFloat("commonness", 1.0f);
}
public ScriptedEvent CreateInstance()
Barotrauma/BarotraumaShared/Source/Events/ScriptedEventSet.cs
+13 -5
View File
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml.Linq;
using Microsoft.Xna.Framework;
namespace Barotrauma
{
@@ -85,8 +85,9 @@ namespace Barotrauma
public float GetCommonness(Level level)
{
return Commonness.ContainsKey(level.GenerationParams.Name) ?
Commonness[level.GenerationParams.Name] : Commonness[""];
string key = level.GenerationParams?.Name ?? "";
return Commonness.ContainsKey(key) ?
Commonness[key] : Commonness[""];
}
public static void LoadPrefabs()
@@ -103,12 +104,19 @@ namespace Barotrauma
foreach (string configFile in configFiles)
{
XDocument doc = XMLExtensions.TryLoadXml(configFile);
if (doc == null) continue;
if (doc == null) { continue; }
var mainElement = doc.Root.IsOverride() ? doc.Root.FirstElement() : doc.Root;
if (doc.Root.IsOverride())
{
DebugConsole.NewMessage($"Overriding all random events using the file {configFile}", Color.Yellow);
List.Clear();
}
int i = 0;
foreach (XElement element in doc.Root.Elements())
{
if (element.Name.ToString().ToLowerInvariant() != "eventset") continue;
if (element.Name.ToString().ToLowerInvariant() != "eventset") { continue; }
List.Add(new ScriptedEventSet(element, i.ToString()));
i++;
}