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

38f1ddb...178a853: v0.8.9.1, removed content folder

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-18 19:46:58 +02:00
parent 38f1ddb6fe
commit 6c0679c297
1054 changed files with 151673 additions and 144931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Map/Gap.cs
+96 -38
View File
@@ -8,6 +8,14 @@ namespace Barotrauma
{
private float particleTimer;
public override bool SelectableInEditor
{
get
{
return ShowGaps;
}
}
public override void Draw(SpriteBatch sb, bool editing, bool back = true)
{
if (GameMain.DebugDraw)
@@ -28,9 +36,31 @@ namespace Barotrauma
GUI.DrawRectangle(
sb, new Rectangle(WorldRect.X, -WorldRect.Y, rect.Width, rect.Height),
clr * 0.5f, true,
depth,
(int)Math.Max((1.5f / GameScreen.Selected.Cam.Zoom), 1.0f));
clr * 0.2f, true, depth);
int lineWidth = 5;
if (IsHorizontal)
{
GUI.DrawLine(sb,
new Vector2(WorldRect.X, -WorldRect.Y + lineWidth / 2),
new Vector2(WorldRect.Right, -WorldRect.Y + lineWidth / 2),
clr * 0.6f, width: lineWidth);
GUI.DrawLine(sb,
new Vector2(WorldRect.X, -WorldRect.Y + rect.Height - lineWidth / 2),
new Vector2(WorldRect.Right, -WorldRect.Y + rect.Height - lineWidth / 2),
clr * 0.6f, width: lineWidth);
}
else
{
GUI.DrawLine(sb,
new Vector2(WorldRect.X + lineWidth / 2, -WorldRect.Y),
new Vector2(WorldRect.X + lineWidth / 2, -WorldRect.Y + rect.Height),
clr * 0.6f, width: lineWidth);
GUI.DrawLine(sb,
new Vector2(WorldRect.Right - lineWidth / 2, -WorldRect.Y),
new Vector2(WorldRect.Right - lineWidth / 2, -WorldRect.Y + rect.Height),
clr * 0.6f, width: lineWidth);
}
for (int i = 0; i < linkedTo.Count; i++)
{
@@ -39,12 +69,17 @@ namespace Barotrauma
: new Vector2(0.0f, Math.Sign((linkedTo[i].Rect.Y - linkedTo[i].Rect.Height / 2.0f) - (rect.Y - rect.Height / 2.0f)));
Vector2 arrowPos = new Vector2(WorldRect.Center.X, -(WorldRect.Y - WorldRect.Height / 2));
arrowPos += new Vector2(dir.X * (WorldRect.Width / 2 + 10), dir.Y * (WorldRect.Height / 2 + 10));
arrowPos += new Vector2(dir.X * (WorldRect.Width / 2), dir.Y * (WorldRect.Height / 2));
float arrowWidth = 32.0f;
float arrowSize = 15.0f;
GUI.Arrow.Draw(sb,
arrowPos, clr * 0.8f,
GUI.Arrow.Origin, MathUtils.VectorToAngle(dir) + MathHelper.PiOver2,
IsHorizontal ? new Vector2(rect.Height / 16.0f, 1.0f) : new Vector2(rect.Width / 16.0f, 1.0f),
IsHorizontal ?
new Vector2(Math.Min(rect.Height, arrowWidth) / GUI.Arrow.size.X, arrowSize / GUI.Arrow.size.Y) :
new Vector2(Math.Min(rect.Width, arrowWidth) / GUI.Arrow.size.X, arrowSize / GUI.Arrow.size.Y),
SpriteEffects.None, depth);
}
@@ -64,8 +99,6 @@ namespace Barotrauma
{
if (flowTargetHull == null) return;
particleTimer += deltaTime;
Vector2 pos = Position;
if (IsHorizontal)
{
@@ -80,7 +113,8 @@ namespace Barotrauma
//light dripping
if (open < 0.2f && LerpedFlowForce.LengthSquared() > 100.0f)
{
float particlesPerSec = open * 1000.0f;
particleTimer += deltaTime;
float particlesPerSec = open * 100.0f;
float emitInterval = 1.0f / particlesPerSec;
while (particleTimer > emitInterval)
{
@@ -106,70 +140,94 @@ namespace Barotrauma
"bubbles",
(Submarine == null ? pos : pos + Submarine.Position),
velocity, 0, flowTargetHull);
particleTimer = 0.0f;
particleTimer -= emitInterval;
}
}
//heavy flow -> strong waterfall type of particles
else if (LerpedFlowForce.LengthSquared() > 20000.0f)
{
particleTimer += deltaTime;
if (IsHorizontal)
{
Vector2 velocity = new Vector2(
float particlesPerSec = open * rect.Height * 0.1f;
float emitInterval = 1.0f / particlesPerSec;
while (particleTimer > emitInterval)
{
Vector2 velocity = new Vector2(
MathHelper.Clamp(flowForce.X, -5000.0f, 5000.0f) * Rand.Range(0.5f, 0.7f),
flowForce.Y * Rand.Range(0.5f, 0.7f));
if (flowTargetHull.WaterVolume < flowTargetHull.Volume)
{
var particle = GameMain.ParticleManager.CreateParticle(
"watersplash",
(Submarine == null ? pos : pos + Submarine.Position) - Vector2.UnitY * Rand.Range(0.0f, 10.0f),
velocity, 0, flowTargetHull);
if (particle != null)
if (flowTargetHull.WaterVolume < flowTargetHull.Volume * 0.95f)
{
particle.Size = particle.Size * Math.Min(Math.Abs(flowForce.X / 1000.0f), 5.0f);
var particle = GameMain.ParticleManager.CreateParticle(
"watersplash",
(Submarine == null ? pos : pos + Submarine.Position) - Vector2.UnitY * Rand.Range(0.0f, 10.0f),
velocity, 0, flowTargetHull);
if (particle != null)
{
particle.Size = particle.Size * Math.Min(Math.Abs(flowForce.X / 1000.0f), 5.0f);
}
}
}
if (Math.Abs(flowForce.X) > 300.0f)
{
pos.X += Math.Sign(flowForce.X) * 10.0f;
pos.Y = Rand.Range(lowerSurface, rect.Y - rect.Height);
GameMain.ParticleManager.CreateParticle(
"bubbles",
Submarine == null ? pos : pos + Submarine.Position,
flowForce / 10.0f, 0, flowTargetHull);
if (Math.Abs(flowForce.X) > 300.0f)
{
pos.X += Math.Sign(flowForce.X) * 10.0f;
if (rect.Height < 32)
{
pos.Y = rect.Y - rect.Height / 2;
}
else
{
float bottomY = rect.Y - rect.Height + 16;
float topY = MathHelper.Clamp(lowerSurface, bottomY, rect.Y - 16);
pos.Y = Rand.Range(bottomY, topY);
}
GameMain.ParticleManager.CreateParticle(
"bubbles",
Submarine == null ? pos : pos + Submarine.Position,
flowForce / 10.0f, 0, flowTargetHull);
}
particleTimer -= emitInterval;
}
}
else
{
if (Math.Sign(flowTargetHull.Rect.Y - rect.Y) != Math.Sign(lerpedFlowForce.Y)) return;
for (int i = 0; i < rect.Width; i += Rand.Range(80, 100))
float particlesPerSec = open * rect.Width * 0.3f;
float emitInterval = 1.0f / particlesPerSec;
while (particleTimer > emitInterval)
{
pos.X = Rand.Range(rect.X, rect.X + rect.Width);
Vector2 velocity = new Vector2(
lerpedFlowForce.X * Rand.Range(0.5f, 0.7f),
MathHelper.Clamp(lerpedFlowForce.Y, -500.0f, 1000.0f) * Rand.Range(0.5f, 0.7f));
var splash = GameMain.ParticleManager.CreateParticle(
if (flowTargetHull.WaterVolume < flowTargetHull.Volume * 0.95f)
{
var splash = GameMain.ParticleManager.CreateParticle(
"watersplash",
Submarine == null ? pos : pos + Submarine.Position,
velocity, 0, FlowTargetHull);
if (splash != null) splash.Size = splash.Size * MathHelper.Clamp(rect.Width / 50.0f, 0.8f, 4.0f);
GameMain.ParticleManager.CreateParticle(
if (splash != null) splash.Size = splash.Size * MathHelper.Clamp(rect.Width / 50.0f, 0.8f, 4.0f);
}
if (Math.Abs(flowForce.Y) > 190.0f && Rand.Range(0.0f, 1.0f) < 0.3f)
{
GameMain.ParticleManager.CreateParticle(
"bubbles",
Submarine == null ? pos : pos + Submarine.Position,
flowForce / 2.0f, 0, FlowTargetHull);
}
particleTimer -= emitInterval;
}
}
}
}
else
{
particleTimer = 0.0f;
}
}
}
}