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

Switch to Barotrauma & too many misc changes to remember

Browse Source
This commit is contained in:
Regalis
2015-10-16 18:11:58 +03:00
parent 2bb5d41836
commit 838022fcd5
203 changed files with 540 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Subsurface/Source/Items/Components/Power/PowerContainer.cs
View File

@@ -3,7 +3,7 @@ using System.Xml.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class PowerContainer : Powered
{
@@ -92,9 +92,6 @@ namespace Subsurface.Items.Components
//if (item.linkedTo.Count == 0) return;
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
foreach (Connection c in item.Connections)
{
foreach (Connection c2 in c.Recipients)
@@ -106,23 +103,14 @@ namespace Subsurface.Items.Components
}
}
//foreach (MapEntity e in item.linkedTo)
//{
// Item it = e as Item;
// if (it == null) continue;
// PowerTransfer pt = it.GetComponent<PowerTransfer>();
// if (pt==null) continue;
// //gridPower -= pt.PowerConsumption;
// gridLoad += pt.PowerLoad;
// //gridPower = -jb.PowerConsumption;
// //gridLoad = jb.load;
// break;
//}
float gridRate = voltage;
if (gridRate>minVoltage)
{
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
}
//recharge
if (gridRate >= chargeRate)
{

2
Subsurface/Source/Items/Components/Power/PowerTransfer.cs
View File

@@ -5,7 +5,7 @@ using Microsoft.Xna.Framework.Graphics;
using System;
using System.Globalization;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class PowerTransfer : Powered
{

2
Subsurface/Source/Items/Components/Power/Powered.cs
View File

@@ -3,7 +3,7 @@ using System.Globalization;
using System.IO;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Powered : ItemComponent
{