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

v0.11.0.9

Browse Source
This commit is contained in:
Joonas Rikkonen
2020-12-09 16:34:16 +02:00
parent bbf06f0984
commit f433a7ba10
325 changed files with 13947 additions and 3652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs
+42 -35
View File
@@ -11,6 +11,8 @@ using System.Globalization;
using System.Linq;
using System.Xml.Linq;
using Barotrauma.Extensions;
using Barotrauma.MapCreatures.Behavior;
#if CLIENT
using Microsoft.Xna.Framework.Graphics;
#endif
@@ -27,7 +29,7 @@ namespace Barotrauma
private HashSet<string> tags;
private bool isWire;
private bool isWire, isLogic;
private Hull currentHull;
public Hull CurrentHull
@@ -409,11 +411,9 @@ namespace Barotrauma
get { return condition; }
set
{
#if CLIENT
if (GameMain.Client != null) return;
#endif
if (!MathUtils.IsValid(value)) return;
if (Indestructible) return;
if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }
if (!MathUtils.IsValid(value)) { return; }
if (Indestructible) { return; }
float prev = condition;
bool wasInFullCondition = IsFullCondition;
@@ -426,7 +426,7 @@ namespace Barotrauma
{
ic.PlaySound(ActionType.OnBroken);
}
if (Screen.Selected == GameMain.SubEditorScreen) return;
if (Screen.Selected == GameMain.SubEditorScreen) { return; }
#endif
ApplyStatusEffects(ActionType.OnBroken, 1.0f, null);
}
@@ -626,6 +626,8 @@ namespace Barotrauma
get { return Prefab.Linkable; }
}
public BallastFloraBranch Infector { get; set; }
public override string ToString()
{
#if CLIENT
@@ -640,14 +642,15 @@ namespace Barotrauma
{
get { return allPropertyObjects; }
}
public Item(ItemPrefab itemPrefab, Vector2 position, Submarine submarine)
public Item(ItemPrefab itemPrefab, Vector2 position, Submarine submarine, ushort id = Entity.NullEntityID)
: this(new Rectangle(
(int)(position.X - itemPrefab.sprite.size.X / 2 * itemPrefab.Scale),
(int)(position.Y + itemPrefab.sprite.size.Y / 2 * itemPrefab.Scale),
(int)(itemPrefab.sprite.size.X * itemPrefab.Scale),
(int)(itemPrefab.sprite.size.Y * itemPrefab.Scale)),
itemPrefab, submarine)
itemPrefab, submarine, id: id)
{
}
@@ -656,8 +659,8 @@ namespace Barotrauma
/// Creates a new item
/// </summary>
/// <param name="callOnItemLoaded">Should the OnItemLoaded methods of the ItemComponents be called. Use false if the item needs additional initialization before it can be considered fully loaded (e.g. when loading an item from a sub file or cloning an item).</param>
public Item(Rectangle newRect, ItemPrefab itemPrefab, Submarine submarine, bool callOnItemLoaded = true)
: base(itemPrefab, submarine)
public Item(Rectangle newRect, ItemPrefab itemPrefab, Submarine submarine, bool callOnItemLoaded = true, ushort id = Entity.NullEntityID)
: base(itemPrefab, submarine, id)
{
spriteColor = prefab.SpriteColor;
@@ -737,6 +740,8 @@ namespace Barotrauma
case "upgrademodule":
case "upgradeoverride":
case "minimapicon":
case "infectedsprite":
case "damagedinfectedsprite":
break;
case "staticbody":
StaticBodyConfig = subElement;
@@ -834,7 +839,8 @@ namespace Barotrauma
DebugConsole.Log("Created " + Name + " (" + ID + ")");
if (Components.All(ic => ic is Wire || ic is Holdable)) { isWire = true; }
if (Components.Any() && Components.All(ic => ic is Wire || ic is Holdable)) { isWire = true; }
if (HasTag("logic")) { isLogic = true; }
}
partial void InitProjSpecific();
@@ -1172,6 +1178,23 @@ namespace Barotrauma
return rootContainer;
}
/// <summary>
/// Is the item or any of its containers of the item set to be ignored?
/// </summary>
public bool IsThisOrAnyContainerIgnoredByAI()
{
if (IgnoreByAI) { return true; }
if (Container == null) { return false; }
if (Container.IgnoreByAI) { return true; }
var container = Container;
while (container.Container != null)
{
container = container.Container;
if (container.IgnoreByAI) { return true; }
}
return false;
}
public bool IsOwnedBy(Entity entity) => FindParentInventory(i => i.Owner == entity) != null;
@@ -1419,6 +1442,7 @@ namespace Barotrauma
if (!isActive) { return; }
ApplyStatusEffects(ActionType.Always, deltaTime, character: (parentInventory as CharacterInventory)?.Owner as Character);
ApplyStatusEffects(parentInventory == null ? ActionType.OnNotContained : ActionType.OnContained, deltaTime, character: (parentInventory as CharacterInventory)?.Owner as Character);
for (int i = 0; i < updateableComponents.Count; i++)
{
@@ -1451,8 +1475,6 @@ namespace Barotrauma
#endif
ic.WasUsed = false;
ic.ApplyStatusEffects(parentInventory == null ? ActionType.OnNotContained : ActionType.OnContained, deltaTime, character: (parentInventory as CharacterInventory)?.Owner as Character);
if (ic.IsActive)
{
if (condition <= 0.0f)
@@ -1884,11 +1906,6 @@ namespace Barotrauma
yield return CoroutineStatus.Success;
}
public float GetDrawDepth()
{
return SpriteDepth + ((ID % 255) * 0.000001f);
}
public bool IsInsideTrigger(Vector2 worldPosition)
{
return IsInsideTrigger(worldPosition, out _);
@@ -2481,9 +2498,9 @@ namespace Barotrauma
partial void UpdateNetPosition(float deltaTime);
public static Item Load(XElement element, Submarine submarine)
public static Item Load(XElement element, Submarine submarine, IdRemap idRemap)
{
return Load(element, submarine, createNetworkEvent: false);
return Load(element, submarine, createNetworkEvent: false, idRemap: idRemap);
}
/// <summary>
@@ -2493,7 +2510,7 @@ namespace Barotrauma
/// <param name="submarine">The submarine to spawn the item in (can be null)</param>
/// <param name="createNetworkEvent">Should an EntitySpawner event be created to notify clients about the item being created.</param>
/// <returns></returns>
public static Item Load(XElement element, Submarine submarine, bool createNetworkEvent)
public static Item Load(XElement element, Submarine submarine, bool createNetworkEvent, IdRemap idRemap)
{
string name = element.Attribute("name").Value;
string identifier = element.GetAttributeString("identifier", "");
@@ -2512,13 +2529,11 @@ namespace Barotrauma
rect.Height = (int)(prefab.Size.Y * prefab.Scale);
}
Item item = new Item(rect, prefab, submarine, callOnItemLoaded: false)
Item item = new Item(rect, prefab, submarine, callOnItemLoaded: false, id: idRemap.GetOffsetId(element))
{
Submarine = submarine,
ID = (ushort)int.Parse(element.Attribute("ID").Value),
linkedToID = new List<ushort>()
};
item.OriginalID = item.ID;
#if SERVER
if (createNetworkEvent)
@@ -2543,15 +2558,7 @@ namespace Barotrauma
if (shouldBeLoaded) { property.TrySetValue(item, attribute.Value); }
}
string linkedToString = element.GetAttributeString("linked", "");
if (linkedToString != "")
{
string[] linkedToIds = linkedToString.Split(',');
for (int i = 0; i < linkedToIds.Length; i++)
{
item.linkedToID.Add((ushort)int.Parse(linkedToIds[i]));
}
}
item.ParseLinks(element, idRemap);
bool thisIsOverride = element.GetAttributeBool("isoverride", false);
@@ -2583,7 +2590,7 @@ namespace Barotrauma
{
ItemComponent component = unloadedComponents.Find(x => x.Name == subElement.Name.ToString());
if (component == null) { continue; }
component.Load(subElement, usePrefabValues);
component.Load(subElement, usePrefabValues, idRemap);
unloadedComponents.Remove(component);
break;
}