Launcher error messageboxes, more easily controllable & better looking swimming, oxygen tank bugfixes, loading screen coroutine bugfix

This commit is contained in:
Regalis
2015-10-03 17:19:14 +03:00
parent a285b00eb9
commit 46e862216b
29 changed files with 184 additions and 149 deletions
@@ -38,7 +38,8 @@ namespace Subsurface.Items.Components
/// <summary>
/// The base class for components holding the different functionalities of the item
/// </summary>
class ItemComponent : IPropertyObject
class
ItemComponent : IPropertyObject
{
protected Item item;
@@ -86,8 +87,7 @@ namespace Subsurface.Items.Components
{
if (!value && isActive)
{
StopSounds(ActionType.OnActive);
StopSounds(ActionType.OnUse);
StopSounds(ActionType.OnActive);
}
isActive = value;
@@ -181,7 +181,10 @@ namespace Subsurface.Items.Components
// initableProperty.TrySetValue(value);
//}
if (item.Name=="Welding Tool")
{
int a = 1;
}
properties = ObjectProperty.InitProperties(this, element);
@@ -81,8 +81,6 @@ namespace Subsurface.Items.Components
//ApplyStatusEffects(ActionType.OnUse, 1.0f, character);
Debug.WriteLine(item.body.Rotation);
Launch(new Vector2(
(float)Math.Cos(item.body.Rotation),
(float)Math.Sin(item.body.Rotation)) * launchImpulse * item.body.Mass);