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

Progress on tutorial

Browse Source
This commit is contained in:
Regalis
2015-08-11 20:23:48 +03:00
parent f248ef528b
commit 5771bc7e02
34 changed files with 528 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Components/Machines/Radar.cs
+7 -34
View File
@@ -148,43 +148,16 @@ namespace Subsurface.Items.Components
screenOverlay.Draw(spriteBatch, center, 0.0f, rect.Width/screenOverlay.size.X);
}
//if (Level.Loaded != null)
//{
if (Game1.GameSession == null) return;
// for (int i = 0; i < 2; i++)
// {
// Vector2 targetPos = (i == 0) ? Level.Loaded.StartPosition : Level.Loaded.EndPosition;
// targetPos += Level.Loaded.Position;
// float dist = targetPos.Length();
DrawMarker(spriteBatch,
(Game1.GameSession.Map == null) ? "Start" : Game1.GameSession.Map.CurrentLocation.Name,
(Level.Loaded.StartPosition + Level.Loaded.Position), displayScale, center, (rect.Width * 0.55f));
// targetPos.Y = -targetPos.Y;
// Vector2 markerPos = Vector2.Normalize(targetPos) * (rect.Width * 0.55f);
// markerPos += center;
// GUI.DrawRectangle(spriteBatch, new Rectangle((int)markerPos.X, (int)markerPos.Y, 5, 5), Color.LightGreen);
// string label;
// if (Game1.GameSession.Map!=null)
// {
// label = (i == 0) ? Game1.GameSession.Map.CurrentLocation.Name : Game1.GameSession.Map.SelectedLocation.Name;
// }
// else
// {
// label = (i == 0) ? "Start" : "End";
// }
// spriteBatch.DrawString(GUI.SmallFont, label, new Vector2(markerPos.X + 10, markerPos.Y), Color.LightGreen);
// spriteBatch.DrawString(GUI.SmallFont, (int)(dist / 80.0f) + " m", new Vector2(markerPos.X + 10, markerPos.Y + 15), Color.LightGreen);
// }
DrawMarker(spriteBatch,
(Game1.GameSession.Map == null) ? "Start" : Game1.GameSession.Map.CurrentLocation.Name,
(Level.Loaded.StartPosition + Level.Loaded.Position), displayScale, center, (rect.Width * 0.55f));
DrawMarker(spriteBatch,
(Game1.GameSession.Map == null) ? "End" : Game1.GameSession.Map.SelectedLocation.Name,
(Level.Loaded.EndPosition + Level.Loaded.Position), displayScale, center, (rect.Width * 0.55f));
DrawMarker(spriteBatch,
(Game1.GameSession.Map == null) ? "End" : Game1.GameSession.Map.SelectedLocation.Name,
(Level.Loaded.EndPosition + Level.Loaded.Position), displayScale, center, (rect.Width * 0.55f));
if (Game1.GameSession.Quest != null)
{
Subsurface/Source/Items/Components/Machines/Reactor.cs
+10
View File
@@ -88,10 +88,20 @@ namespace Subsurface.Items.Components
return (temperature > 0.0f);
}
public bool AutoTemp
{
get { return autoTemp; }
}
public float ExtraCooling { get; set; }
public float AvailableFuel { get; set; }
public float ShutDownTemp
{
get { return shutDownTemp; }
}
public Reactor(Item item, XElement element)
: base(item, element)
{
Subsurface/Source/Items/Components/Machines/Steering.cs
+5
View File
@@ -57,6 +57,11 @@ namespace Subsurface.Items.Components
}
}
public Vector2 CurrTargetVelocity
{
get { return targetVelocity; }
}
public Steering(Item item, XElement element)
: base(item, element)
{
Subsurface/Source/Items/Components/Power/PowerTransfer.cs
+1 -1
View File
@@ -135,7 +135,7 @@ namespace Subsurface.Items.Components
{
base.ReceiveSignal(signal, connection, sender, power);
if (connection.Name == "signal")
if (connection.Name.Length>5 && connection.Name.Substring(0, 6).ToLower() == "signal")
{
connection.SendSignal(signal, sender, 0.0f);
}
Subsurface/Source/Items/Components/Signal/Connection.cs
+1 -16
View File
@@ -132,21 +132,6 @@ namespace Subsurface.Items.Components
Wires[index] = wire;
}
//public bool AddLink(Item connectedItem, Connection otherConnection)
//{
// if (linked.Contains(connectedItem)) return false;
// for (int i = 0; i<MaxLinked; i++)
// {
// if (linked[i]!=null) continue;
// linked[i] = connectedItem;
// return true;
// }
// return false;
//}
public void SendSignal(string signal, Item sender, float power)
{
for (int i = 0; i<MaxLinked; i++)
@@ -159,7 +144,7 @@ namespace Subsurface.Items.Components
foreach (ItemComponent ic in recipient.item.components)
{
ic.ReceiveSignal(signal, recipient, sender, power);
ic.ReceiveSignal(signal, recipient, this.item, power);
}
foreach (StatusEffect effect in recipient.effects)