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

Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

Browse Source
This commit is contained in:
EvilFactory
2025-04-16 18:08:37 -03:00
parent 3ac4ae992c 6203171b6d
commit 5e321a5abd
20 changed files with 106 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Steering.cs
+23 -11
View File
@@ -89,19 +89,10 @@ namespace Barotrauma.Items.Components
#endif
if (autoPilot)
{
if (pathFinder == null)
{
pathFinder = new PathFinder(WayPoint.WayPointList, false)
{
GetNodePenalty = GetNodePenalty
};
}
MaintainPos = true;
if (posToMaintain == null)
{
posToMaintain = controlledSub != null ?
controlledSub.WorldPosition :
item.Submarine == null ? item.WorldPosition : item.Submarine.WorldPosition;
RefreshPosToMaintain();
}
}
else
@@ -266,6 +257,24 @@ namespace Barotrauma.Items.Components
return true;
}
/// <summary>
/// Sets the position the autopilot tries to maintain to the current position of the sub.
/// </summary>
public void RefreshPosToMaintain()
{
posToMaintain = controlledSub != null ?
controlledSub.WorldPosition :
item.Submarine == null ? item.WorldPosition : item.Submarine.WorldPosition;
}
public override void OnMapLoaded()
{
if (MaintainPos)
{
RefreshPosToMaintain();
}
}
public override void Update(float deltaTime, Camera cam)
{
if (!searchedConnectedDockingPort)
@@ -628,7 +637,10 @@ namespace Barotrauma.Items.Components
if (pathFinder == null)
{
pathFinder = new PathFinder(WayPoint.WayPointList, false);
pathFinder = new PathFinder(WayPoint.WayPointList, false)
{
GetNodePenalty = GetNodePenalty
};
}
Vector2 target;
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs
+3
View File
@@ -397,6 +397,9 @@ namespace Barotrauma.Items.Components
if (Item.Removed) { return; }
launchPos = simPosition;
LaunchSub = item.Submarine;
//set the rotation of the projectile again because dropping the projectile in Use
//resets the rotation and moves it to the position of the parent item
Item.SetTransform(simPosition, rotation + (Item.body.Dir * LaunchRotationRadians), findNewHull: false);
if (DeactivationTime > 0)
{
deactivationTimer = DeactivationTime;
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/LightComponent.cs
+22 -15
View File
@@ -312,8 +312,7 @@ namespace Barotrauma.Items.Components
(IsActiveConditionals == null || IsActiveConditionals.Count == 0))
{
PhysicsBody body = ParentBody ?? item.body;
if ((body == null || !body.Enabled) &&
(item.FindParentInventory(static it => it is ItemInventory { Container.HideItems: true }) != null))
if ((body == null || !body.Enabled) && !IsVisibleInInventory())
{
lightBrightness = 0.0f;
SetLightSourceState(false, 0.0f);
@@ -336,6 +335,24 @@ namespace Barotrauma.Items.Components
}
}
/// <summary>
/// Is the item currently in an inventory, and visible in that inventory? E.g. held by a character or on a shelf that shows the contained items.
/// </summary>
/// <returns></returns>
private bool IsVisibleInInventory()
{
if (item.GetRootInventoryOwner() is Character ownerCharacter && item.RootContainer?.GetComponent<Holdable>() is not { IsActive: true })
{
//if the item is in a character inventory, the light should only be visible if the character is holding the item
//(not if it's e.q. inside a wearable item, or in a rifle worn on the back)
return false;
}
else
{
return item.FindParentInventory(static it => it is ItemInventory { Container.HideItems: true }) == null;
}
}
public override void Update(float deltaTime, Camera cam)
{
if (item.AiTarget != null)
@@ -351,20 +368,10 @@ namespace Barotrauma.Items.Components
#endif
bool visibleInContainer;
bool isVisibleInInventory = IsVisibleInInventory();
var ownerCharacter = item.GetRootInventoryOwner() as Character;
if (ownerCharacter != null && item.RootContainer?.GetComponent<Holdable>() is not { IsActive: true })
{
//if the item is in a character inventory, the light should only be visible if the character is holding the item
//(not if it's e.q. inside a wearable item, or in a rifle worn on the back)
visibleInContainer = false;
}
else
{
visibleInContainer = item.FindParentInventory(static it => it is ItemInventory { Container.HideItems: true }) == null;
}
if ((item.Container != null && !visibleInContainer && ownerCharacter == null) ||
if ((item.Container != null && !isVisibleInInventory && ownerCharacter == null) ||
(ownerCharacter != null && ownerCharacter.InvisibleTimer > 0.0f))
{
lightBrightness = 0.0f;
@@ -374,7 +381,7 @@ namespace Barotrauma.Items.Components
SetLightSourceTransformProjSpecific();
PhysicsBody body = ParentBody ?? item.body;
if ((body == null || !body.Enabled) && !visibleInContainer)
if ((body == null || !body.Enabled) && !isVisibleInInventory)
{
lightBrightness = 0.0f;
SetLightSourceState(false, 0.0f);