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

(3f015888d) Implement manual doors that can be opened simply by clicking on them. Add a test sub (not added in the project -> have to manually place in the local bin folder to test it).

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-10 13:21:25 +03:00
parent 3093515600
commit 25453018fc
4 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs
+16 -5
View File
@@ -10,6 +10,7 @@ using System.Xml.Linq;
#if CLIENT
using Barotrauma.Lights;
#endif
using Barotrauma.Extensions;
namespace Barotrauma.Items.Components
{
@@ -210,12 +211,13 @@ namespace Barotrauma.Items.Components
#endif
}
public override bool HasRequiredItems(Character character, bool addMessage)
private string text = TextManager.Get("DoorMsgCannotOpen");
public override bool HasRequiredItems(Character character, bool addMessage, string msg = null)
{
if (item.Condition <= RepairThreshold) return true; //For repairing
//this is a bit pointless atm because if canBePicked is false it won't allow you to do Pick() anyway, however it's still good for future-proofing.
return requiredItems.Any() ? base.HasRequiredItems(character, addMessage) : canBePicked;
return requiredItems.Any() ? base.HasRequiredItems(character, addMessage, msg ?? text) : canBePicked;
}
public override bool Pick(Character picker)
@@ -226,18 +228,27 @@ namespace Barotrauma.Items.Components
public override bool OnPicked(Character picker)
{
if (item.Condition <= RepairThreshold) return true; //repairs
if (requiredItems.Any())
{
ForceOpen(ActionType.OnPicked);
}
return false;
}
private void ForceOpen(ActionType actionType)
{
SetState(PredictedState == null ? !isOpen : !PredictedState.Value, false, true); //crowbar function
#if CLIENT
PlaySound(ActionType.OnPicked, item.WorldPosition, picker);
PlaySound(actionType, item.WorldPosition, picker);
#endif
return false;
}
public override bool Select(Character character)
{
//can only be selected if the item is broken
return item.Condition <= RepairThreshold;
if (item.Condition <= RepairThreshold) return true; //repairs
ForceOpen(ActionType.OnUse);
return false;
}
public override void Update(float deltaTime, Camera cam)