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

Button&door sounds, sound looping bugfixes, positional sound bugfixes + low pass filter on distant sounds, submarine collision improvements, controller trigger bugfix, humans walk/run more slowly in water

Browse Source
This commit is contained in:
Regalis
2015-10-04 14:49:05 +03:00
parent 46e862216b
commit 0be4ad4f84
66 changed files with 317 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Components/Holdable/Holdable.cs
+4 -4
View File
@@ -118,7 +118,7 @@ namespace Subsurface.Items.Components
if (picker.Inventory == null) return;
item.body.Enabled = true;
isActive = false;
IsActive = false;
//item.Unequip();
@@ -140,7 +140,7 @@ namespace Subsurface.Items.Components
if (picker.TrySelectItem(item))
{
item.body.Enabled = true;
isActive = true;
IsActive = true;
}
}
@@ -151,7 +151,7 @@ namespace Subsurface.Items.Components
picker.DeselectItem(item);
item.body.Enabled = false;
isActive = false;
IsActive = false;
}
public override bool Pick(Character picker)
@@ -213,7 +213,7 @@ namespace Subsurface.Items.Components
public override void Update(float deltaTime, Camera cam)
{
if (!item.body.Enabled) return;
if (!picker.HasSelectedItem(item)) isActive = false;
if (!picker.HasSelectedItem(item)) IsActive = false;
ApplyStatusEffects(ActionType.OnActive, deltaTime, picker);
Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs
+2 -2
View File
@@ -73,7 +73,7 @@ namespace Subsurface.Items.Components
hitting = true;
isActive = true;
IsActive = true;
return true;
}
@@ -93,7 +93,7 @@ namespace Subsurface.Items.Components
public override void Update(float deltaTime, Camera cam)
{
if (!item.body.Enabled) return;
if (!picker.HasSelectedItem(item)) isActive = false;
if (!picker.HasSelectedItem(item)) IsActive = false;
if (!picker.GetInputState(InputType.SecondaryHeld) && !hitting) hitPos = 0.0f;
Subsurface/Source/Items/Components/Holdable/RangedWeapon.cs
+2 -2
View File
@@ -46,7 +46,7 @@ namespace Subsurface.Items.Components
if (reload < 0.0f)
{
reload = 0.0f;
isActive = false;
IsActive = false;
}
}
@@ -54,7 +54,7 @@ namespace Subsurface.Items.Components
{
if (character == null) return false;
if (!character.GetInputState(InputType.SecondaryHeld) || reload > 0.0f) return false;
isActive = true;
IsActive = true;
reload = 1.0f;
List<Body> limbBodies = new List<Body>();
Subsurface/Source/Items/Components/Holdable/RepairTool.cs
+3 -3
View File
@@ -106,7 +106,7 @@ namespace Subsurface.Items.Components
//if (DoesUseFail(character)) return false;
isActive = true;
IsActive = true;
Vector2 targetPosition = item.body.SimPosition;
//targetPosition = targetPosition.X, -targetPosition.Y);
@@ -200,7 +200,7 @@ namespace Subsurface.Items.Components
public override void Draw(SpriteBatch spriteBatch, bool editing)
{
if (!isActive) return;
if (!IsActive) return;
//Vector2 particleSpeed = new Vector2(
// (float)Math.Cos(item.body.Rotation),
@@ -219,7 +219,7 @@ namespace Subsurface.Items.Components
//GUI.DrawLine(spriteBatch, startPos, endPos, Color.Orange, 0.0f);
isActive = false;
IsActive = false;
}
Subsurface/Source/Items/Components/Holdable/Throwable.cs
+2 -2
View File
@@ -48,7 +48,7 @@ namespace Subsurface.Items.Components
throwing = true;
isActive = true;
IsActive = true;
return true;
}
@@ -73,7 +73,7 @@ namespace Subsurface.Items.Components
public override void Update(float deltaTime, Camera cam)
{
if (!item.body.Enabled) return;
if (!picker.HasSelectedItem(item)) isActive = false;
if (!picker.HasSelectedItem(item)) IsActive = false;
if (!picker.GetInputState(InputType.SecondaryHeld) && !throwing) throwPos = 0.0f;