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

Railgun HUD (shows supercapacitor charge & how many shells there are left)

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-11-27 19:34:57 +02:00
parent f4f58622e1
commit 51fe7df481
10 changed files with 189 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Controller.cs
+19 -20
View File
@@ -18,7 +18,7 @@ namespace Barotrauma.Items.Components
}
}
class Controller : ItemComponent
partial class Controller : ItemComponent
{
//where the limbs of the user should be positioned when using the controller
private List<LimbPos> limbPositions;
@@ -167,26 +167,9 @@ namespace Barotrauma.Items.Components
character = null;
return;
}
if (character == null) return;
Entity focusTarget = null;
if (character == null) return;
foreach (Connection c in item.Connections)
{
if (c.Name != "position_out") continue;
foreach (Connection c2 in c.Recipients)
{
if (c2 == null || c2.Item == null || !c2.Item.Prefab.FocusOnSelected) continue;
focusTarget = c2.Item;
break;
}
}
Entity focusTarget = GetFocusTarget();
if (focusTarget == null)
{
item.SendSignal(0, XMLExtensions.Vector2ToString(character.CursorWorldPosition), "position_out", character);
@@ -210,6 +193,22 @@ namespace Barotrauma.Items.Components
}
}
private Item GetFocusTarget()
{
foreach (Connection c in item.Connections)
{
if (c.Name != "position_out") continue;
foreach (Connection c2 in c.Recipients)
{
if (c2 == null || c2.Item == null || !c2.Item.Prefab.FocusOnSelected) continue;
return c2.Item;
}
}
return null;
}
public override bool Pick(Character picker)
{
item.SendSignal(0, "1", "signal_out", picker);
Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs
+52 -9
View File
@@ -87,6 +87,25 @@ namespace Barotrauma.Items.Components
barrelSpritePath,
element.GetAttributeVector2("origin", Vector2.Zero));
}
#if CLIENT
foreach (XElement subElement in element.Elements())
{
string texturePath = subElement.GetAttributeString("texture", "");
switch (subElement.Name.ToString().ToLowerInvariant())
{
case "crosshair":
crosshairSprite = new Sprite(subElement, texturePath.Contains("/") ? "" : Path.GetDirectoryName(item.Prefab.ConfigFile));
break;
case "disabledcrosshair":
disabledCrossHairSprite = new Sprite(subElement, texturePath.Contains("/") ? "" : Path.GetDirectoryName(item.Prefab.ConfigFile));
break;
}
}
int barWidth = 200;
powerIndicator = new GUIProgressBar(new Rectangle(GameMain.GraphicsWidth / 2 - barWidth / 2, 20, barWidth, 30 ), Color.White, 0.0f);
#endif
}
public override void Update(float deltaTime, Camera cam)
@@ -296,6 +315,19 @@ namespace Barotrauma.Items.Components
return availablePower;
}
private void GetAvailablePower(out float availableCharge, out float availableCapacity)
{
var batteries = item.GetConnectedComponents<PowerContainer>();
availableCharge = 0.0f;
availableCapacity = 0.0f;
foreach (PowerContainer battery in batteries)
{
availableCharge += battery.Charge;
availableCapacity += battery.Capacity;
}
}
protected override void RemoveComponentSpecific()
{
base.RemoveComponentSpecific();
@@ -303,7 +335,7 @@ namespace Barotrauma.Items.Components
if (barrelSprite != null) barrelSprite.Remove();
}
private List<Projectile> GetLoadedProjectiles(bool returnFirst = false)
private List<Projectile> GetLoadedProjectiles(bool returnFirst = false, bool returnNull = false)
{
List<Projectile> projectiles = new List<Projectile>();
@@ -312,16 +344,27 @@ namespace Barotrauma.Items.Components
var projectileContainer = e as Item;
if (projectileContainer == null) continue;
var containedItems = projectileContainer.ContainedItems;
if (containedItems == null) continue;
for (int i = 0; i < containedItems.Length; i++)
if (returnNull)
{
var projectileComponent = containedItems[i].GetComponent<Projectile>();
if (projectileComponent != null)
var itemContainer = projectileContainer.GetComponent<ItemContainer>();
for (int i = 0; i < itemContainer.Inventory.Items.Length; i++)
{
projectiles.Add(projectileComponent);
if (returnFirst) return projectiles;
projectiles.Add(itemContainer.Inventory.Items[i]?.GetComponent<Projectile>());
}
}
else
{
var containedItems = projectileContainer.ContainedItems;
if (containedItems == null) continue;
for (int i = 0; i < containedItems.Length; i++)
{
var projectileComponent = containedItems[i].GetComponent<Projectile>();
if (projectileComponent != null)
{
projectiles.Add(projectileComponent);
if (returnFirst) return projectiles;
}
}
}
}