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

Unstable 0.17.0.0

Browse Source
This commit is contained in:
Markus Isberg
2022-02-26 02:43:01 +09:00
parent a83f375681
commit 3974067915
913 changed files with 32472 additions and 32364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/Events/EventActions/ConversationAction.cs
+1 -1
View File
@@ -80,7 +80,7 @@ namespace Barotrauma
partial void ShowDialog(Character speaker, Character targetCharacter)
{
targetClients.Clear();
if (!string.IsNullOrEmpty(TargetTag))
if (!TargetTag.IsEmpty)
{
IEnumerable<Entity> entities = ParentEvent.GetTargets(TargetTag);
foreach (Entity e in entities)
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/AbandonedOutpostMission.cs
+2 -2
View File
@@ -15,7 +15,7 @@ namespace Barotrauma
msg.Write((ushort)spawnedItems.Count);
foreach (Item item in spawnedItems)
{
item.WriteSpawnData(msg, item.ID, Entity.NullEntityID, 0);
item.WriteSpawnData(msg, item.ID, Entity.NullEntityID, 0, -1);
}
msg.Write((byte)characters.Count);
@@ -27,7 +27,7 @@ namespace Barotrauma
msg.Write((ushort)characterItems[character].Count());
foreach (Item item in characterItems[character])
{
item.WriteSpawnData(msg, item.ID, item.ParentInventory?.Owner?.ID ?? Entity.NullEntityID, 0);
item.WriteSpawnData(msg, item.ID, item.ParentInventory?.Owner?.ID ?? Entity.NullEntityID, 0, item.ParentInventory?.FindIndex(item) ?? -1);
}
}
}
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/CargoMission.cs
+2 -1
View File
@@ -13,7 +13,8 @@ namespace Barotrauma
item.WriteSpawnData(msg,
item.ID,
parentInventoryIDs.ContainsKey(item) ? parentInventoryIDs[item] : Entity.NullEntityID,
parentItemContainerIndices.ContainsKey(item) ? parentItemContainerIndices[item] : (byte)0);
parentItemContainerIndices.ContainsKey(item) ? parentItemContainerIndices[item] : (byte)0,
inventorySlotIndices.ContainsKey(item) ? inventorySlotIndices[item] : -1);
}
}
}
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/CombatMission.cs
+2 -2
View File
@@ -11,11 +11,11 @@ namespace Barotrauma
private bool initialized = false;
public override string Description
public override LocalizedString Description
{
get
{
if (descriptions == null) return "";
if (descriptions == null) { return ""; }
//non-team-specific description
return descriptions[0];
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/EscortMission.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace Barotrauma
msg.Write((ushort)characterItems[character].Count());
foreach (Item item in characterItems[character])
{
item.WriteSpawnData(msg, item.ID, item.ParentInventory?.Owner?.ID ?? Entity.NullEntityID, 0);
item.WriteSpawnData(msg, item.ID, item.ParentInventory?.Owner?.ID ?? Entity.NullEntityID, 0, item.ParentInventory?.FindIndex(item) ?? -1);
}
}
}
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/MineralMission.cs
+2 -2
View File
@@ -16,11 +16,11 @@ namespace Barotrauma
foreach (var kvp in spawnedResources)
{
msg.Write((byte)kvp.Value.Count);
var rotation = resourceClusters[kvp.Key].rotation;
var rotation = resourceClusters[kvp.Key].Rotation;
msg.Write(rotation);
foreach (var r in kvp.Value)
{
r.WriteSpawnData(msg, r.ID, Entity.NullEntityID, 0);
r.WriteSpawnData(msg, r.ID, Entity.NullEntityID, 0, -1);
}
}
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/Mission.cs
+4 -4
View File
@@ -7,13 +7,13 @@ namespace Barotrauma
partial void ShowMessageProjSpecific(int missionState)
{
int messageIndex = missionState - 1;
if (messageIndex >= Headers.Count && messageIndex >= Messages.Count) { return; }
if (messageIndex >= Headers.Length && messageIndex >= Messages.Length) { return; }
if (messageIndex < 0) { return; }
string header = messageIndex < Headers.Count ? Headers[messageIndex] : "";
string message = messageIndex < Messages.Count ? Messages[messageIndex] : "";
LocalizedString header = messageIndex < Headers.Length ? Headers[messageIndex] : "";
LocalizedString message = messageIndex < Messages.Length ? Messages[messageIndex] : "";
GameServer.Log(TextManager.Get("MissionInfo") + ": " + header + " - " + message, ServerLog.MessageType.ServerMessage);
GameServer.Log($"{TextManager.Get("MissionInfo")}: {header} - {message}", ServerLog.MessageType.ServerMessage);
}
public virtual void ServerWriteInitial(IWriteMessage msg, Client c)
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/NestMission.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace Barotrauma
msg.Write((ushort)items.Count);
foreach (Item item in items)
{
item.WriteSpawnData(msg, item.ID, Entity.NullEntityID, 0);
item.WriteSpawnData(msg, item.ID, Entity.NullEntityID, 0, -1);
}
}
}
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/PirateMission.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace Barotrauma
msg.Write((ushort)characterItems[character].Count());
foreach (Item item in characterItems[character])
{
item.WriteSpawnData(msg, item.ID, item.ParentInventory?.Owner?.ID ?? Entity.NullEntityID, 0);
item.WriteSpawnData(msg, item.ID, item.ParentInventory?.Owner?.ID ?? Entity.NullEntityID, 0, item.ParentInventory?.FindIndex(item) ?? -1);
}
}
}
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/SalvageMission.cs
+2 -1
View File
@@ -10,6 +10,7 @@ namespace Barotrauma
private UInt16 originalInventoryID;
private byte originalItemContainerIndex;
private int originalSlotIndex;
private readonly List<Pair<int, int>> executedEffectIndices = new List<Pair<int, int>>();
@@ -24,7 +25,7 @@ namespace Barotrauma
}
else
{
item.WriteSpawnData(msg, item.ID, originalInventoryID, originalItemContainerIndex);
item.WriteSpawnData(msg, item.ID, originalInventoryID, originalItemContainerIndex, originalSlotIndex);
}
msg.Write((byte)executedEffectIndices.Count);
Barotrauma/BarotraumaServer/ServerSource/Events/Missions/ScanMission.cs
+2 -1
View File
@@ -13,7 +13,8 @@ namespace Barotrauma
item.WriteSpawnData(msg,
item.ID,
parentInventoryIDs.ContainsKey(item) ? parentInventoryIDs[item] : Entity.NullEntityID,
parentItemContainerIndices.ContainsKey(item) ? parentItemContainerIndices[item] : (byte)0);
parentItemContainerIndices.ContainsKey(item) ? parentItemContainerIndices[item] : (byte)0,
inventorySlotIndices.ContainsKey(item) ? inventorySlotIndices[item] : -1);
}
ServerWriteScanTargetStatus(msg);
}