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

Fixes to holdable items again: items can be attached outside hulls in the sub editor, but not in-game

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-07-09 20:23:14 +03:00
parent f2d603d2f0
commit e0c10860ba
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs
View File

@@ -93,18 +93,36 @@ namespace Barotrauma.Items.Components
}
canBePicked = true;
prevRequiredItems = new List<RelatedItem>(requiredItems);
if (attachable)
{
prevMsg = Msg;
prevPickKey = PickKey;
prevRequiredItems = new List<RelatedItem>(requiredItems);
DeattachFromWall();
}
if ((Screen.Selected == GameMain.EditMapScreen)) Use(1.0f);
if (item.Submarine != null)
{
if (item.Submarine.Loading)
{
AttachToWall();
attached = false;
}
else //the submarine is not being loaded, which means we're either in the sub editor or the item has been spawned mid-round
{
if (Screen.Selected == GameMain.EditMapScreen && attachedByDefault)
{
//in the sub editor, attach
AttachToWall();
}
else
{
//spawned mid-round, deattach
DeattachFromWall();
}
}
}
}
}
public override void Drop(Character dropper)
@@ -237,7 +255,7 @@ namespace Barotrauma.Items.Components
}
}
item.body.Enabled = false;
body.Enabled = false;
item.body = null;
Msg = prevMsg;
@@ -265,6 +283,7 @@ namespace Barotrauma.Items.Components
if (character != null)
{
if (!character.IsKeyDown(InputType.Aim)) return false;
if (character.CurrentHull == null) return false;
if (character != null && GameMain.Server != null)
{
item.CreateServerEvent(this);
@@ -309,13 +328,11 @@ namespace Barotrauma.Items.Components
public override void OnMapLoaded()
{
prevRequiredItems = new List<RelatedItem>(requiredItems);
if (!attachable) return;
if (Attached)
{
Use(1.0f);
AttachToWall();
}
else
{
@@ -327,8 +344,6 @@ namespace Barotrauma.Items.Components
body.Enabled = false;
}
}
attached = false;
DeattachFromWall();
}
}