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

Unstable 1.1.14.0

Browse Source
This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs
+78 -47
View File
@@ -17,9 +17,24 @@ namespace Barotrauma
CONVERSATION_SELECTED_OPTION,
STATUSEFFECT,
MISSION,
UNLOCKPATH
UNLOCKPATH,
EVENTLOG,
EVENTOBJECTIVE,
}
[NetworkSerialize]
public readonly record struct NetEventLogEntry(Identifier EventPrefabId, Identifier LogEntryId, string Text) : INetSerializableStruct;
[NetworkSerialize]
public readonly record struct NetEventObjective(
EventObjectiveAction.SegmentActionType Type,
Identifier Identifier,
Identifier ObjectiveTag,
Identifier TextTag,
Identifier ParentObjectiveId,
bool CanBeCompleted) : INetSerializableStruct;
const float IntensityUpdateInterval = 5.0f;
const float CalculateDistanceTraveledInterval = 5.0f;
@@ -95,7 +110,7 @@ namespace Barotrauma
get { return musicIntensity; }
}
public List<Event> ActiveEvents
public IEnumerable<Event> ActiveEvents
{
get { return activeEvents; }
}
@@ -119,6 +134,8 @@ namespace Barotrauma
private readonly List<TimeStamp> timeStamps = new List<TimeStamp>();
public void AddTimeStamp(Event e) => timeStamps.Add(new TimeStamp(e));
public readonly EventLog EventLog = new EventLog();
public EventManager()
{
isClient = GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient;
@@ -198,7 +215,7 @@ namespace Barotrauma
if (unlockPathEventPrefab != null)
{
var newEvent = unlockPathEventPrefab.CreateInstance();
ActiveEvents.Add(newEvent);
activeEvents.Add(newEvent);
}
else
{
@@ -256,7 +273,18 @@ namespace Barotrauma
CumulativeMonsterStrengthWrecks = 0;
CumulativeMonsterStrengthCaves = 0;
}
public void ActivateEvent(Event newEvent)
{
activeEvents.Add(newEvent);
newEvent.Init();
}
public void ClearEvents()
{
activeEvents.Clear();
}
private void SelectSettings()
{
if (!EventManagerSettings.Prefabs.Any())
@@ -364,6 +392,14 @@ namespace Barotrauma
}
}
public void TriggerOnEndRoundActions()
{
foreach (var ev in activeEvents)
{
(ev as ScriptedEvent)?.OnRoundEndAction?.Update(1.0f);
}
}
public void EndRound()
{
pendingEventSets.Clear();
@@ -478,14 +514,6 @@ namespace Barotrauma
}
}
bool isPrefabSuitable(EventPrefab e) =>
(e.BiomeIdentifier.IsEmpty || e.BiomeIdentifier == level.LevelData?.Biome?.Identifier) &&
!level.LevelData.NonRepeatableEvents.Contains(e.Identifier) &&
isFactionSuitable(e.Faction);
bool isFactionSuitable(Identifier factionId) =>
factionId.IsEmpty || factionId == level.StartLocation?.Faction?.Prefab.Identifier || factionId == level.StartLocation?.SecondaryFaction?.Prefab.Identifier;
foreach (var subEventPrefab in eventSet.EventPrefabs)
{
foreach (Identifier missingId in subEventPrefab.GetMissingIdentifiers())
@@ -495,7 +523,7 @@ namespace Barotrauma
}
var suitablePrefabSubsets = eventSet.EventPrefabs.Where(
e => isFactionSuitable(e.Faction) && e.EventPrefabs.Any(isPrefabSuitable)).ToArray();
e => IsFactionSuitable(e.Faction, level) && e.EventPrefabs.Any(ep => IsSuitable(ep, level))).ToArray();
for (int i = 0; i < applyCount; i++)
{
@@ -512,7 +540,7 @@ namespace Barotrauma
(IEnumerable<EventPrefab> eventPrefabs, float commonness, float probability) = subEventPrefab;
if (eventPrefabs != null && random.NextDouble() <= probability)
{
var eventPrefab = ToolBox.SelectWeightedRandom(eventPrefabs.Where(isPrefabSuitable), e => e.Commonness, random);
var eventPrefab = ToolBox.SelectWeightedRandom(eventPrefabs.Where(e => IsSuitable(e, level)), e => e.Commonness, random);
var newEvent = eventPrefab.CreateInstance();
if (newEvent == null) { continue; }
newEvent.RandomSeed = randomSeed;
@@ -529,10 +557,25 @@ namespace Barotrauma
}
if (eventSet.ChildSets.Any())
{
var newEventSet = SelectRandomEvents(eventSet.ChildSets, random: random);
if (newEventSet != null)
int setCount = eventSet.SubSetCount;
if (setCount > 1)
{
CreateEvents(newEventSet);
var unusedSets = eventSet.ChildSets.ToList();
for (int j = 0; j < setCount; j++)
{
var newEventSet = SelectRandomEvents(unusedSets, random: random);
if (newEventSet == null) { break; }
unusedSets.Remove(newEventSet);
CreateEvents(newEventSet);
}
}
else
{
var newEventSet = SelectRandomEvents(eventSet.ChildSets, random: random);
if (newEventSet != null)
{
CreateEvents(newEventSet);
}
}
}
}
@@ -542,7 +585,7 @@ namespace Barotrauma
{
if (random.NextDouble() > probability) { continue; }
var eventPrefab = ToolBox.SelectWeightedRandom(eventPrefabs.Where(isPrefabSuitable), e => e.Commonness, random);
var eventPrefab = ToolBox.SelectWeightedRandom(eventPrefabs.Where(e => IsSuitable(e, level)), e => e.Commonness, random);
var newEvent = eventPrefab.CreateInstance();
if (newEvent == null) { continue; }
if (!selectedEvents.ContainsKey(eventSet))
@@ -636,6 +679,23 @@ namespace Barotrauma
return null;
}
public static bool IsSuitable(EventPrefab e, Level level)
{
return IsLevelSuitable(e, level) && IsFactionSuitable(e.Faction, level);
}
public static bool IsLevelSuitable(EventPrefab e, Level level)
{
return
(e.BiomeIdentifier.IsEmpty || e.BiomeIdentifier == level.LevelData?.Biome?.Identifier) &&
!level.LevelData.NonRepeatableEvents.Contains(e.Identifier);
}
private static bool IsFactionSuitable(Identifier factionId, Level level)
{
return factionId.IsEmpty || factionId == level.StartLocation?.Faction?.Prefab.Identifier || factionId == level.StartLocation?.SecondaryFaction?.Prefab.Identifier;
}
private static bool IsValidForLevel(EventSet eventSet, Level level)
{
return
@@ -1031,35 +1091,6 @@ namespace Barotrauma
}
}
/// <summary>
/// Finds all actions in a ScriptedEvent
/// </summary>
private static List<Tuple<int, EventAction>> FindActions(ScriptedEvent scriptedEvent)
{
var list = new List<Tuple<int, EventAction>>();
foreach (EventAction eventAction in scriptedEvent.Actions)
{
list.AddRange(FindActionsRecursive(eventAction));
}
return list;
static List<Tuple<int, EventAction>> FindActionsRecursive(EventAction eventAction, int ident = 1)
{
var eventActions = new List<Tuple<int, EventAction>> { Tuple.Create(ident, eventAction) };
ident++;
foreach (var action in eventAction.GetSubActions())
{
eventActions.AddRange(FindActionsRecursive(action, ident));
}
return eventActions;
}
}
/// <summary>
/// Get the entity that should be used in determining how far the player has progressed in the level.
/// = The submarine or player character that has progressed the furthest.