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

- Hitscan projectiles, projectiles can be set to disappear after hitting something.

Browse Source 
- Option to adjust ranged weapon spread (separate values for "normal spread" and when being used by an unskilled character).
- Option to disable explosion flashes.
This commit is contained in:
Joonas Rikkonen
2017-10-18 23:48:25 +03:00
parent 142920d704
commit 6bfca5f7fe
4 changed files with 144 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RangedWeapon.cs
+20 -10
View File
@@ -27,6 +27,20 @@ namespace Barotrauma.Items.Components
set { reload = Math.Max(value, 0.0f); }
}
[HasDefaultValue(0.0f, false)]
public float Spread
{
get;
set;
}
[HasDefaultValue(0.0f, false)]
public float UnskilledSpread
{
get;
set;
}
public Vector2 TransformedBarrelPos
{
get
@@ -41,8 +55,6 @@ namespace Barotrauma.Items.Components
public RangedWeapon(Item item, XElement element)
: base(item, element)
{
//barrelPos = ToolBox.GetAttributeVector2(element, "barrelpos", Vector2.Zero);
//barrelPos = ConvertUnits.ToSimUnits(barrelPos);
}
public override void Update(float deltaTime, Camera cam)
@@ -90,13 +102,16 @@ namespace Barotrauma.Items.Components
Projectile projectileComponent= projectile.GetComponent<Projectile>();
if (projectileComponent == null) continue;
float rotation = ((item.body.Dir == 1.0f) ? item.body.Rotation : item.body.Rotation - MathHelper.Pi) + Rand.Range(-degreeOfFailure, degreeOfFailure);
float spread = MathHelper.ToRadians(MathHelper.Lerp(Spread, UnskilledSpread, degreeOfFailure));
float rotation = (item.body.Dir == 1.0f) ? item.body.Rotation : item.body.Rotation - MathHelper.Pi;
rotation += spread * Rand.Range(-0.5f, 0.5f);
projectile.body.ResetDynamics();
projectile.SetTransform(TransformedBarrelPos, rotation);
projectileComponent.User = character;
projectileComponent.IgnoredBodies = new List<Body>(limbBodies);
projectile.Use(deltaTime);
projectileComponent.User = character;
projectile.body.ApplyTorque(projectile.body.Mass * degreeOfFailure * Rand.Range(-10.0f, 10.0f));
@@ -105,9 +120,7 @@ namespace Barotrauma.Items.Components
//recoil
item.body.ApplyLinearImpulse(
new Vector2((float)Math.Cos(projectile.body.Rotation), (float)Math.Sin(projectile.body.Rotation)) * item.body.Mass * -50.0f);
projectileComponent.IgnoredBodies = limbBodies;
new Vector2((float)Math.Cos(projectile.body.Rotation), (float)Math.Sin(projectile.body.Rotation)) * item.body.Mass * -50.0f);
item.RemoveContained(projectile);
@@ -118,9 +131,6 @@ namespace Barotrauma.Items.Components
}
}
return true;
}