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

OBT/1.2.0(Spring Update)

Browse Source 
Sync with Upstream
This commit is contained in:
NotAlwaysTrue
2026-04-25 13:25:41 +08:00
committed by GitHub
parent 5207b381b7
commit 59bc21973a
421 changed files with 24090 additions and 11391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs
+31 -29
View File
@@ -1,20 +1,23 @@
using Barotrauma.Items.Components;
using Barotrauma.Abilities;
using Barotrauma.Extensions;
using Barotrauma.Items.Components;
using Barotrauma.LuaCs.Events;
using Barotrauma.MapCreatures.Behavior;
using Barotrauma.Networking;
using FarseerPhysics;
using FarseerPhysics.Dynamics;
using FarseerPhysics.Dynamics.Contacts;
using Microsoft.Xna.Framework;
using MoonSharp.Interpreter;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Globalization;
using System.Linq;
using System.Xml.Linq;
using Barotrauma.Extensions;
using Barotrauma.MapCreatures.Behavior;
using MoonSharp.Interpreter;
using System.Collections.Immutable;
using Barotrauma.Abilities;
using static Barotrauma.CharacterHealth;
using static Barotrauma.MedicalClinic;
#if CLIENT
using Microsoft.Xna.Framework.Graphics;
@@ -263,6 +266,8 @@ namespace Barotrauma
/// </summary>
public Character Equipper;
public Inventory PreviousParentInventory { get; set; }
//the inventory in which the item is contained in
public Inventory ParentInventory
{
@@ -278,9 +283,7 @@ namespace Barotrauma
Container = parentInventory.Owner as Item;
RemoveFromDroppedStack(allowClientExecute: false);
}
#if SERVER
PreviousParentInventory = value;
#endif
}
}
@@ -561,6 +564,8 @@ namespace Barotrauma
set;
} = float.PositiveInfinity;
public Sprite OverrideInventorySprite { get; set; }
protected Color spriteColor;
[Editable, Serialize("1.0,1.0,1.0,1.0", IsPropertySaveable.Yes)]
public Color SpriteColor
@@ -1103,7 +1108,7 @@ namespace Barotrauma
public override string ToString()
{
return Name + " (ID: " + ID + ")";
return (Name.IsNullOrEmpty() ? Prefab.Identifier : Name) + " (ID: " + ID + ")";
}
private readonly List<ISerializableEntity> allPropertyObjects = new List<ISerializableEntity>();
@@ -1411,8 +1416,6 @@ namespace Barotrauma
if (Components.Any(ic => ic is Wire) && Components.All(ic => ic is Wire || ic is Holdable)) { isWire = true; }
if (HasTag(Barotrauma.Tags.LogicItem)) { isLogic = true; }
GameMain.LuaCs.Hook.Call("item.created", this);
ApplyStatusEffects(ActionType.OnSpawn, 1.0f);
// Set max condition multipliers from campaign settings for RecalculateConditionValues()
@@ -1793,7 +1796,8 @@ namespace Barotrauma
ic.Move(amount, ignoreContacts);
}
if (body != null && (Submarine == null || !Submarine.Loading) || Screen.Selected is { IsEditor: true }) { FindHull(); }
// Refresh items without a body in editors so vents (or other static items that do something with hulls) know which hull they are in after being moved
if ((body != null || Screen.Selected is { IsEditor: true }) && Submarine is not { Loading: true }) { FindHull(); }
}
public Rectangle TransformTrigger(Rectangle trigger, bool world = false)
@@ -2073,6 +2077,12 @@ namespace Barotrauma
}
}
public IEnumerable<StatusEffect> GetStatusEffectsOfType(ActionType type)
{
if (!hasStatusEffectsOfType[(int)type]) { return Enumerable.Empty<StatusEffect>(); }
return statusEffectLists[type];
}
/// <summary>
/// Executes all StatusEffects of the specified type. Note that condition checks are ignored here: that should be handled by the code calling the method.
/// </summary>
@@ -3258,7 +3268,9 @@ namespace Barotrauma
bool showUiMsg = false;
#if CLIENT
if (!ic.HasRequiredSkills(user, out Skill tempRequiredSkill)) { hasRequiredSkills = false; skillMultiplier = ic.GetSkillMultiplier(); }
showUiMsg = user == Character.Controlled && Screen.Selected != GameMain.SubEditorScreen;
showUiMsg = user == Character.Controlled && Screen.Selected != GameMain.SubEditorScreen &&
// Only show the UI message of the component that we actually want to interact with
(pickHit && ic.CanBePicked || selectHit && ic.CanBeSelected);
#endif
if (!ignoreRequiredItems && !ic.HasRequiredItems(user, showUiMsg)) { continue; }
if ((ic.CanBePicked && pickHit && ic.Pick(user)) ||
@@ -3364,10 +3376,6 @@ namespace Barotrauma
}
if (condition <= 0.0f) { return; }
var should = GameMain.LuaCs.Hook.Call<bool?>("item.use", new object[] { this, user, targetLimb, useTarget });
if (should != null && should.Value) { return; }
bool remove = false;
@@ -3400,11 +3408,6 @@ namespace Barotrauma
{
if (condition <= 0.0f) { return; }
var should = GameMain.LuaCs.Hook.Call<bool?>("item.secondaryUse", this, character);
if (should != null && should.Value)
return;
bool remove = false;
foreach (ItemComponent ic in components)
@@ -3902,9 +3905,9 @@ namespace Barotrauma
}
}
var result = GameMain.LuaCs.Hook.Call<bool?>("item.readPropertyChange", this, property, parentObject, allowEditing, sender);
if (result != null && result.Value)
return;
bool? should = null;
LuaCsSetup.Instance.EventService.PublishEvent<IEventItemReadPropertyChange>(x => should = x.OnItemReadPropertyChange(this, property, parentObject, allowEditing, sender) ?? should);
if (should != null && should.Value) { return; }
Type type = property.PropertyType;
string logValue = "";
@@ -4370,6 +4373,9 @@ namespace Barotrauma
Rotation = Rotation
};
if (FlippedX) { newItem.FlipX(relativeToSub: false); }
if (FlippedY) { newItem.FlipY(relativeToSub: false); }
float scaleRelativeToPrefab = Scale / Prefab.Scale;
newItem.Scale *= scaleRelativeToPrefab;
@@ -4621,8 +4627,6 @@ namespace Barotrauma
body.Remove();
body = null;
}
GameMain.LuaCs.Hook.Call("item.removed", this);
}
public override void Remove()
@@ -4707,8 +4711,6 @@ namespace Barotrauma
}
RemoveProjSpecific();
GameMain.LuaCs.Hook.Call("item.removed", this);
}
private void RemoveFromLists()