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

Improved level generation algorithm, fixed invisible hulls, turret projectile fix, fabricators work in mp

Browse Source
This commit is contained in:
Regalis
2016-02-11 21:37:37 +02:00
parent 5a38c4b1ef
commit 4f54e04c8c
32 changed files with 435 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
View File

@@ -789,6 +789,8 @@ namespace Barotrauma
public override void DragCharacter(Character target)
{
if (target == null) return;
Limb leftHand = GetLimb(LimbType.LeftHand);
Limb rightHand = GetLimb(LimbType.RightHand);

55
Subsurface/Source/Characters/BackgroundSprite/BackgroundCreature.cs
View File

@@ -39,7 +39,7 @@ namespace Barotrauma
public Vector2 SimPosition
{
get { return position; }
get { return FarseerPhysics.ConvertUnits.ToSimUnits(position); }
}
public Vector2 Velocity
@@ -81,29 +81,51 @@ namespace Barotrauma
depth = MathHelper.Clamp(depth + velocity.Z * deltaTime, 0.0f, MaxDepth);
checkWallsTimer -= deltaTime;
if (checkWallsTimer<=0.0f && Level.Loaded!=null)
if (checkWallsTimer <= 0.0f && Level.Loaded != null)
{
checkWallsTimer = CheckWallsInterval;
obstacleDiff = Vector2.Zero;
var cells = Level.Loaded.GetCells(position, 1);
if (cells.Count > 0)
if (position.Y > Level.Loaded.Size.Y)
{
foreach (Voronoi2.VoronoiCell cell in cells)
{
obstacleDiff += cell.Center - position;
}
obstacleDiff = Vector2.Normalize(obstacleDiff) * prefab.Speed;
obstacleDiff = Vector2.UnitY;
}
}
else if (position.Y < 0.0f)
{
obstacleDiff = -Vector2.UnitY;
}
else if (position.X < 0.0f)
{
obstacleDiff = Vector2.UnitX;
}
else if (position.X > Level.Loaded.Size.X)
{
obstacleDiff = -Vector2.UnitX;
}
else
{
var cells = Level.Loaded.GetCells(position, 1);
if (cells.Count > 0)
{
foreach (Voronoi2.VoronoiCell cell in cells)
{
obstacleDiff += cell.Center - position;
}
obstacleDiff /= cells.Count;
obstacleDiff = Vector2.Normalize(obstacleDiff) * prefab.Speed;
}
}
}
if (Swarm!=null)
{
Vector2 midPoint = Swarm.MidPoint();
float midPointDist = Vector2.Distance(position, midPoint);
float midPointDist = Vector2.Distance(SimPosition, midPoint);
if (midPointDist > Swarm.MaxDistance)
{
@@ -116,9 +138,12 @@ namespace Barotrauma
steeringManager.SteeringWander(prefab.Speed);
}
//Level.Loaded.Size
if (obstacleDiff != Vector2.Zero)
{
steeringManager.SteeringSeek(-obstacleDiff, prefab.Speed);
steeringManager.SteeringSeek(SimPosition-obstacleDiff, prefab.Speed*2.0f);
}
steeringManager.Update(prefab.Speed);

6
Subsurface/Source/Characters/Character.cs
View File

@@ -918,10 +918,10 @@ namespace Barotrauma
if (!(AnimController is FishAnimController))
{
bool protectedFromPressure = PressureProtection > 0.0f;
if (Submarine.Loaded!=null && Level.Loaded !=null)
if (Submarine.Loaded != null && Level.Loaded != null)
{
protectedFromPressure = protectedFromPressure && Position.Y > SubmarineBody.DamageDepth;
protectedFromPressure = protectedFromPressure && WorldPosition.Y > SubmarineBody.DamageDepth;
}
if (!protectedFromPressure &&

10
Subsurface/Source/Characters/Limb.cs
View File

@@ -532,6 +532,7 @@ namespace Barotrauma
break;
}
}
spriteBatch.Draw(
bodyShapeTexture,
new Vector2(body.DrawPosition.X, -body.DrawPosition.Y),
@@ -546,7 +547,14 @@ namespace Barotrauma
{
sprite.Remove();
body.Remove();
if (hitSound!=null) hitSound.Remove();
if (bodyShapeTexture != null)
{
bodyShapeTexture.Dispose();
}
if (hitSound != null) hitSound.Remove();
}
}
}