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

- fixed "signal loops" causing StackOverFlowExceptions (now the signals can only take 10 "steps" between components per frame)

Browse Source 
- parameter for changing the output value of And/Or components when the input conditions aren't met
- or components work properly now
- a limited number of signals (100) can be queued in a delay component
This commit is contained in:
Regalis
2016-04-02 02:25:44 +03:00
parent 3ac8139fc7
commit 5f05db7ca4
24 changed files with 107 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Components/Machines/Controller.cs
+5 -5
View File
@@ -137,7 +137,7 @@ namespace Barotrauma.Items.Components
return false;
}
item.SendSignal("1", "trigger_out");
item.SendSignal(0, "1", "trigger_out");
ApplyStatusEffects(ActionType.OnUse, 1.0f, activator);
@@ -173,7 +173,7 @@ namespace Barotrauma.Items.Components
if (focusTarget == null)
{
item.SendSignal(ToolBox.Vector2ToString(character.CursorWorldPosition), "position_out");
item.SendSignal(0, ToolBox.Vector2ToString(character.CursorWorldPosition), "position_out");
return;
}
@@ -185,13 +185,13 @@ namespace Barotrauma.Items.Components
if (!character.IsNetworkPlayer || character.ViewTarget == focusTarget)
{
item.SendSignal(ToolBox.Vector2ToString(character.CursorWorldPosition), "position_out");
item.SendSignal(0, ToolBox.Vector2ToString(character.CursorWorldPosition), "position_out");
}
}
public override bool Pick(Character picker)
{
item.SendSignal("1", "signal_out");
item.SendSignal(0, "1", "signal_out");
PlaySound(ActionType.OnUse, item.WorldPosition);
@@ -237,7 +237,7 @@ namespace Barotrauma.Items.Components
IsActive = true;
}
item.SendSignal("1", "signal_out");
item.SendSignal(0, "1", "signal_out");
return true;
}
Subsurface/Source/Items/Components/Machines/Engine.cs
+2 -2
View File
@@ -124,9 +124,9 @@ namespace Barotrauma.Items.Components
force = MathHelper.Lerp(force, 0.0f, 0.1f);
}
public override void ReceiveSignal(string signal, Connection connection, Item sender, float power=0.0f)
public override void ReceiveSignal(int stepsTaken, string signal, Connection connection, Item sender, float power=0.0f)
{
base.ReceiveSignal(signal, connection, sender, power);
base.ReceiveSignal(stepsTaken, signal, connection, sender, power);
if (connection.Name == "set_force")
{
Subsurface/Source/Items/Components/Machines/Pump.cs
+2 -2
View File
@@ -163,9 +163,9 @@ namespace Barotrauma.Items.Components
}
public override void ReceiveSignal(string signal, Connection connection, Item sender, float power=0.0f)
public override void ReceiveSignal(int stepsTaken, string signal, Connection connection, Item sender, float power=0.0f)
{
base.ReceiveSignal(signal, connection, sender, power);
base.ReceiveSignal(stepsTaken, signal, connection, sender, power);
if (connection.Name == "toggle")
{
Subsurface/Source/Items/Components/Machines/Reactor.cs
+2 -2
View File
@@ -315,7 +315,7 @@ namespace Barotrauma.Items.Components
ExtraCooling = 0.0f;
AvailableFuel = 0.0f;
item.SendSignal(((int)temperature).ToString(), "temperature_out");
item.SendSignal(0, ((int)temperature).ToString(), "temperature_out");
sendUpdateTimer = Math.Max(sendUpdateTimer - deltaTime, 0.0f);
@@ -519,7 +519,7 @@ namespace Barotrauma.Items.Components
GUI.DrawLine(spriteBatch, prevPoint, lastPoint, color);
}
public override void ReceiveSignal(string signal, Connection connection, Item sender, float power)
public override void ReceiveSignal(int stepsTaken, string signal, Connection connection, Item sender, float power)
{
switch (connection.Name)
{
Subsurface/Source/Items/Components/Machines/Steering.cs
+4 -4
View File
@@ -135,13 +135,13 @@ namespace Barotrauma.Items.Components
UpdateAutoPilot(deltaTime);
}
item.SendSignal(targetVelocity.X.ToString(CultureInfo.InvariantCulture), "velocity_x_out");
item.SendSignal(0, targetVelocity.X.ToString(CultureInfo.InvariantCulture), "velocity_x_out");
float targetLevel = -targetVelocity.Y;
targetLevel += (neutralBallastLevel - 0.5f) * 100.0f;
item.SendSignal(targetLevel.ToString(CultureInfo.InvariantCulture), "velocity_y_out");
item.SendSignal(0, targetLevel.ToString(CultureInfo.InvariantCulture), "velocity_y_out");
voltage -= deltaTime;
@@ -299,7 +299,7 @@ namespace Barotrauma.Items.Components
return true;
}
public override void ReceiveSignal(string signal, Connection connection, Item sender, float power=0.0f)
public override void ReceiveSignal(int stepsTaken, string signal, Connection connection, Item sender, float power=0.0f)
{
if (connection.Name == "velocity_in")
{
@@ -307,7 +307,7 @@ namespace Barotrauma.Items.Components
}
else
{
base.ReceiveSignal(signal, connection, sender, power);
base.ReceiveSignal(stepsTaken, signal, connection, sender, power);
}
}