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

Online quest mode, fixed bug when swimming from hull to another, monitors with editable text, choosing exe in content package, monster quests, misc bugfixes

Browse Source
This commit is contained in:
Regalis
2015-07-30 18:52:20 +03:00
parent 5d0a453e23
commit c7dd6e55f0
53 changed files with 3477 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Items/Components/Holdable/Holdable.cs
+49 -42
View File
@@ -1,6 +1,7 @@
using System.Xml.Linq;
using FarseerPhysics;
using Microsoft.Xna.Framework;
using System.Collections.Generic;
namespace Subsurface.Items.Components
{
@@ -8,6 +9,10 @@ namespace Subsurface.Items.Components
{
//the position(s) in the item that the character grabs
protected Vector2[] handlePos;
private List<RelatedItem> prevRequiredItems;
string prevMsg;
//protected Character picker;
@@ -83,29 +88,20 @@ namespace Subsurface.Items.Components
canBePicked = true;
if (attachable)
{
prevRequiredItems = new List<RelatedItem>(requiredItems);
prevMsg = Msg;
requiredItems.Clear();
Msg = "";
}
//holdAngle = ToolBox.GetAttributeFloat(element, "holdangle", 0.0f);
//holdAngle = MathHelper.ToRadians(holdAngle);
}
//public override void Equip(Character picker)
//{
// if (picker == null) return;
// if (picker.Inventory == null) return;
// this.picker = picker;
// for (int i = item.linkedTo.Count - 1; i >= 0; i--)
// item.linkedTo[i].RemoveLinked((MapEntity)item);
// item.linkedTo.Clear();
// System.Diagnostics.Debug.WriteLine("picked item");
// //this.picker = picker;
// picker.SelectedItem = item;
// isActive = true;
//}
public override void Drop(Character dropper)
{
if (picker == null)
@@ -147,27 +143,31 @@ namespace Subsurface.Items.Components
if (picker == null) return;
picker.DeselectItem(item);
item.body.Enabled = false;
isActive = false;
}
public override bool Pick(Character picker)
{
if (!base.Pick(picker)) return false;
if (!attachable)
{
return base.Pick(picker);
}
if (!attachable) return false;
if (!base.Pick(picker))
{
return false;
}
else
{
requiredItems.Clear();
Msg = "";
}
//if (item.body==null)
//{
// DebugConsole.ThrowError("Item " + item + " must have a physics body component to be attachable!");
// return false;
//}
//if (attached) return false;
item.body = body;
item.body.Enabled = true;
attached = false;
if (body!=null) item.body = body;
//item.body.Enabled = true;
return true;
}
@@ -180,6 +180,9 @@ namespace Subsurface.Items.Components
item.body.Enabled = false;
item.body = null;
requiredItems = new List<RelatedItem>(prevRequiredItems);
Msg = prevMsg;
attached = true;
return true;
@@ -191,15 +194,7 @@ namespace Subsurface.Items.Components
}
public override void Update(float deltaTime, Camera cam)
{
//if (picker == null)// || picker.animController.selectedItem != item)
//{
// System.Diagnostics.Debug.WriteLine("drop");
// //picker = null;
// isActive = false;
// return;
//}
{
if (!item.body.Enabled) return;
if (!picker.HasSelectedItem(item)) isActive = false;
@@ -209,6 +204,8 @@ namespace Subsurface.Items.Components
AnimController ac = picker.AnimController;
item.sprite.Depth = picker.AnimController.GetLimb(LimbType.RightHand).sprite.Depth + 0.01f;
ac.HoldItem(deltaTime, cam, item, handlePos, holdPos, aimPos, holdAngle);
}
@@ -221,7 +218,17 @@ namespace Subsurface.Items.Components
public override void OnMapLoaded()
{
if (attached) Use(1.0f);
//prevRequiredItems = new List<RelatedItem>(requiredItems);
if (attached)
{
Use(1.0f);
}
else
{
requiredItems.Clear();
Msg = "";
}
}
}
}