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

Timer for deattaching items, more reliable door syncing, some new splash sounds

Browse Source
This commit is contained in:
Regalis
2016-02-13 21:25:59 +02:00
parent 9b5e78fce4
commit 9b6dd5da00
30 changed files with 252 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Components/Holdable/Holdable.cs
+19 -16
View File
@@ -13,7 +13,7 @@ namespace Barotrauma.Items.Components
private List<RelatedItem> prevRequiredItems;
string prevMsg;
//the distance from the holding characters elbow to center of the physics body of the item
protected Vector2 holdPos;
@@ -72,7 +72,7 @@ namespace Barotrauma.Items.Components
[HasDefaultValue(0.0f, false)]
public float HoldAngle
{
get { return MathHelper.ToDegrees(holdAngle); }
get { return MathHelper.ToDegrees(holdAngle); }
set { holdAngle = MathHelper.ToRadians(value); }
}
@@ -101,7 +101,7 @@ namespace Barotrauma.Items.Components
Msg = "";
}
if (attachedByDefault || (Screen.Selected == GameMain.EditMapScreen && Submarine.Loaded!=null)) Use(1.0f);
if (attachedByDefault || (Screen.Selected == GameMain.EditMapScreen && Submarine.Loaded != null)) Use(1.0f);
//holdAngle = ToolBox.GetAttributeFloat(element, "holdangle", 0.0f);
@@ -110,12 +110,15 @@ namespace Barotrauma.Items.Components
public override void Drop(Character dropper)
{
if (body != null) item.body = body;
if (item.body != null) item.body.Enabled = true;
IsActive = false;
if (picker == null)
{
if (dropper==null) return;
if (dropper == null) return;
picker = dropper;
}
if (picker.Inventory == null) return;
@@ -138,7 +141,7 @@ namespace Barotrauma.Items.Components
if (item.body == null)
{
if (body!=null)
if (body != null)
{
item.body = body;
}
@@ -151,7 +154,7 @@ namespace Barotrauma.Items.Components
if (!item.body.Enabled)
{
Limb rightHand = picker.AnimController.GetLimb(LimbType.RightHand);
item.SetTransform(rightHand.SimPosition, 0.0f);
item.SetTransform(rightHand.SimPosition, 0.0f);
}
if (picker.TrySelectItem(item))
@@ -166,7 +169,7 @@ namespace Barotrauma.Items.Components
if (picker == null) return;
picker.DeselectItem(item);
item.body.Enabled = false;
IsActive = false;
}
@@ -189,7 +192,7 @@ namespace Barotrauma.Items.Components
}
attached = false;
if (body!=null) item.body = body;
if (body != null) item.body = body;
//item.body.Enabled = true;
return true;
@@ -197,13 +200,13 @@ namespace Barotrauma.Items.Components
public override bool Use(float deltaTime, Character character = null)
{
if (!attachable || item.body==null) return true;
if (!attachable || item.body == null) return true;
if (character != null && !character.IsKeyDown(InputType.Aim)) return false;
item.Drop();
var containedItems = item.ContainedItems;
if (containedItems!=null)
if (containedItems != null)
{
foreach (Item contained in containedItems)
{
@@ -231,12 +234,12 @@ namespace Barotrauma.Items.Components
}
public override void Update(float deltaTime, Camera cam)
{
{
if (!item.body.Enabled) return;
if (!picker.HasSelectedItem(item)) IsActive = false;
ApplyStatusEffects(ActionType.OnActive, deltaTime, picker);
if (item.body.Dir != picker.AnimController.Dir) Flip(item);
AnimController ac = picker.AnimController;
@@ -246,8 +249,8 @@ namespace Barotrauma.Items.Components
//item.sprite.Depth = picker.AnimController.GetLimb(LimbType.RightHand).sprite.Depth + 0.01f;
ac.HoldItem(deltaTime, item, handlePos, holdPos, aimPos, picker.IsKeyDown(InputType.Aim), holdAngle);
}
}
protected void Flip(Item item)
{
handlePos[0].X = -handlePos[0].X;
@@ -267,7 +270,7 @@ namespace Barotrauma.Items.Components
}
else
{
if (item.Inventory!=null)
if (item.Inventory != null)
{
if (body != null)
{
@@ -300,7 +303,7 @@ namespace Barotrauma.Items.Components
}
catch
{
{
return;
}
Subsurface/Source/Items/Components/Holdable/Pickable.cs
+99 -7
View File
@@ -1,4 +1,7 @@
using System;
using Barotrauma.Networking;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System;
using System.Collections.Generic;
using System.Xml.Linq;
@@ -10,6 +13,9 @@ namespace Barotrauma.Items.Components
protected List<LimbSlot> allowedSlots;
private float pickTimer;
public List<LimbSlot> AllowedSlots
{
get { return allowedSlots; }
@@ -50,20 +56,49 @@ namespace Barotrauma.Items.Components
public override bool Pick(Character picker)
{
if (picker == null) return false;
if (picker.Inventory == null) return false;
//return if someone is already trying to pick the item
if (pickTimer>0.0f) return false;
if (picker == null || picker.Inventory == null) return false;
if (picker.Inventory.TryPutItem(item, allowedSlots, picker==Character.Controlled))
if (PickingTime>0.0f)
{
if (!picker.HasSelectedItem(item) && item.body!=null) item.body.Enabled = false;
CoroutineManager.StartCoroutine(WaitForPick(picker, PickingTime));
//create a networkevent here, because the item doesn't count as picked yet and the character won't create one
new NetworkEvent(NetworkEventType.PickItem, picker.ID, true,
new int[]
{
item.ID,
picker.IsKeyHit(InputType.Select) ? 1 : 0,
picker.IsKeyHit(InputType.Use) ? 1 : 0
});
return false;
}
else
{
return OnPicked(picker);
}
}
private bool OnPicked(Character picker)
{
if (picker.Inventory.TryPutItem(item, allowedSlots, picker == Character.Controlled))
{
if (!picker.HasSelectedItem(item) && item.body != null) item.body.Enabled = false;
this.picker = picker;
for (int i = item.linkedTo.Count - 1; i >= 0; i--)
{
item.linkedTo[i].RemoveLinked(item);
}
item.linkedTo.Clear();
var connectionPanel = item.GetComponent<ConnectionPanel>();
if (connectionPanel!=null)
if (connectionPanel != null)
{
foreach (Connection c in connectionPanel.Connections)
{
@@ -72,7 +107,7 @@ namespace Barotrauma.Items.Components
if (w == null) continue;
w.Item.Drop(picker);
w.Item.SetTransform(item.SimPosition, 0.0f);
w.Item.SetTransform(picker.SimPosition, 0.0f);
}
}
}
@@ -90,6 +125,63 @@ namespace Barotrauma.Items.Components
return false;
}
private IEnumerable<object> WaitForPick(Character picker, float requiredTime)
{
var leftHand = picker.AnimController.GetLimb(LimbType.LeftHand);
var rightHand = picker.AnimController.GetLimb(LimbType.RightHand);
pickTimer = 0.0f;
while (pickTimer < requiredTime)
{
if (picker.IsKeyHit(InputType.Aim) || !item.IsInPickRange(picker.WorldPosition))
{
StopPicking(picker);
yield return CoroutineStatus.Success;
}
picker.AnimController.Anim = AnimController.Animation.UsingConstruction;
picker.AnimController.TargetMovement = Vector2.Zero;
leftHand.Disabled = true;
leftHand.pullJoint.Enabled = true;
leftHand.pullJoint.WorldAnchorB = item.SimPosition + Vector2.UnitY * (float)Math.Sin(pickTimer*10.0f)*0.1f;
rightHand.Disabled = true;
rightHand.pullJoint.Enabled = true;
rightHand.pullJoint.WorldAnchorB = item.SimPosition + Vector2.UnitY * (float)Math.Sin(pickTimer*10.0f) * 0.1f;
pickTimer += CoroutineManager.DeltaTime;
yield return CoroutineStatus.Running;
}
StopPicking(picker);
OnPicked(picker);
yield return CoroutineStatus.Success;
}
private void StopPicking(Character picker)
{
picker.AnimController.Anim = AnimController.Animation.None;
pickTimer = 0.0f;
}
public override void Draw(SpriteBatch spriteBatch, bool editing = false)
{
if (pickTimer <= 0.0f) return;
float progressBarWidth = 100.0f;
GUI.DrawProgressBar(spriteBatch, item.DrawPosition + new Vector2(-progressBarWidth/2.0f, 50.0f), new Vector2(progressBarWidth, 15.0f),
pickTimer / PickingTime,
Color.Lerp(Color.Red, Color.Green, pickTimer / PickingTime));
}
public override void Drop(Character dropper)
{
if (picker == null)