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

4
Subsurface/Source/Items/CharacterInventory.cs
View File

@@ -3,7 +3,7 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
namespace Subsurface
namespace Barotrauma
{
[Flags]
public enum LimbSlot
@@ -279,7 +279,7 @@ namespace Subsurface
{
DropItem(draggingItem);
new Networking.NetworkEvent(Subsurface.Networking.NetworkEventType.DropItem, draggingItem.ID, true);
new Networking.NetworkEvent(Barotrauma.Networking.NetworkEventType.DropItem, draggingItem.ID, true);
//draggingItem = null;
}
}

4
Subsurface/Source/Items/Components/Door.cs
View File

@@ -6,9 +6,9 @@ using FarseerPhysics.Dynamics;
using FarseerPhysics.Factories;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Subsurface.Lights;
using Barotrauma.Lights;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Door : ItemComponent
{

2
Subsurface/Source/Items/Components/Holdable/Holdable.cs
View File

@@ -3,7 +3,7 @@ using FarseerPhysics;
using Microsoft.Xna.Framework;
using System.Collections.Generic;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Holdable : Pickable
{

6
Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs
View File

@@ -4,7 +4,7 @@ using FarseerPhysics.Dynamics.Contacts;
using Microsoft.Xna.Framework;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class MeleeWeapon : Holdable
{
@@ -74,7 +74,7 @@ namespace Subsurface.Items.Components
hitting = true;
IsActive = true;
return true;
return false;
}
public override void Drop(Character dropper)
@@ -187,6 +187,8 @@ namespace Subsurface.Items.Components
RestoreCollision();
hitting = false;
ApplyStatusEffects(ActionType.OnUse, 1.0f, picker);
return true;
}
}

2
Subsurface/Source/Items/Components/Holdable/Pickable.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Pickable : ItemComponent
{

2
Subsurface/Source/Items/Components/Holdable/RangedWeapon.cs
View File

@@ -6,7 +6,7 @@ using FarseerPhysics;
using FarseerPhysics.Dynamics;
using Microsoft.Xna.Framework;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class RangedWeapon : ItemComponent
{

4
Subsurface/Source/Items/Components/Holdable/RepairTool.cs
View File

@@ -5,9 +5,9 @@ using FarseerPhysics;
using FarseerPhysics.Dynamics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Subsurface.Particles;
using Barotrauma.Particles;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class RepairTool : ItemComponent
{

2
Subsurface/Source/Items/Components/Holdable/Throwable.cs
View File

@@ -2,7 +2,7 @@
using Microsoft.Xna.Framework;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Throwable : Holdable
{

6
Subsurface/Source/Items/Components/ItemComponent.cs
View File

@@ -6,11 +6,11 @@ using System.Xml.Linq;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Subsurface.Networking;
using Barotrauma.Networking;
using System.IO;
using System.Globalization;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class ItemSound
{
@@ -644,7 +644,7 @@ namespace Subsurface.Items.Components
try
{
// Get the type of a specified class.
t = Type.GetType("Subsurface.Items.Components." + type + "", false, true);
t = Type.GetType("Barotrauma.Items.Components." + type + "", false, true);
if (t == null)
{
if (errorMessages) DebugConsole.ThrowError("Could not find the component ''" + type + "'' (" + file + ")");

2
Subsurface/Source/Items/Components/ItemContainer.cs
View File

@@ -5,7 +5,7 @@ using FarseerPhysics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class ItemContainer : ItemComponent
{

2
Subsurface/Source/Items/Components/ItemLabel.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class ItemLabel : ItemComponent
{

2
Subsurface/Source/Items/Components/Ladder.cs
View File

@@ -1,6 +1,6 @@
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Ladder : ItemComponent
{

11
Subsurface/Source/Items/Components/Machines/Controller.cs
View File

@@ -5,7 +5,7 @@ using FarseerPhysics;
using FarseerPhysics.Dynamics.Joints;
using Microsoft.Xna.Framework;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
struct LimbPos
{
@@ -163,15 +163,6 @@ namespace Subsurface.Items.Components
break;
}
}
//foreach (MapEntity e in item.linkedTo)
//{
// Item linkedItem = e as Item;
// if (linkedItem == null) continue;
// linkedItem.SecondaryUse(deltaTime, character);
//}
}
public override bool Pick(Character picker)

2
Subsurface/Source/Items/Components/Machines/Engine.cs
View File

@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Engine : Powered
{

2
Subsurface/Source/Items/Components/Machines/Fabricator.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class FabricableItem
{

2
Subsurface/Source/Items/Components/Machines/MiniMap.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 MiniMap : Powered
{

4
Subsurface/Source/Items/Components/Machines/OxygenGenerator.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class OxygenGenerator : Powered
{
@@ -60,6 +60,8 @@ namespace Subsurface.Items.Components
powerDownTimer = 0.0f;
}
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
running = true;
CurrFlow = Math.Min(voltage, 1.0f) * 50000.0f;

4
Subsurface/Source/Items/Components/Machines/Pump.cs
View File

@@ -5,7 +5,7 @@ using System.Collections.Specialized;
using System.Globalization;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Pump : Powered
{
@@ -78,6 +78,8 @@ namespace Subsurface.Items.Components
if (voltage < minVoltage) return;
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
if (hull2 == null && hull1 == null) return;
float powerFactor = (currPowerConsumption==0.0f) ? 1.0f : voltage;

2
Subsurface/Source/Items/Components/Machines/Radar.cs
View File

@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Radar : Powered
{

9
Subsurface/Source/Items/Components/Machines/Reactor.cs
View File

@@ -4,9 +4,9 @@ using System.Xml.Linq;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Subsurface.Networking;
using Barotrauma.Networking;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Reactor : Powered
{
@@ -106,6 +106,7 @@ namespace Subsurface.Items.Components
public bool AutoTemp
{
get { return autoTemp; }
set { autoTemp = value; }
}
public float ExtraCooling { get; set; }
@@ -115,7 +116,7 @@ namespace Subsurface.Items.Components
public float ShutDownTemp
{
get { return shutDownTemp; }
private set { shutDownTemp = MathHelper.Clamp(value, 0.0f, 10000.0f); }
set { shutDownTemp = MathHelper.Clamp(value, 0.0f, 10000.0f); }
}
public Reactor(Item item, XElement element)
@@ -137,7 +138,7 @@ namespace Subsurface.Items.Components
public override void Update(float deltaTime, Camera cam)
{
//ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
fissionRate = Math.Min(fissionRate, AvailableFuel);

2
Subsurface/Source/Items/Components/Machines/Steering.cs
View File

@@ -8,7 +8,7 @@ using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Steering : Powered
{

2
Subsurface/Source/Items/Components/Machines/Vent.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Vent : ItemComponent
{

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
{

2
Subsurface/Source/Items/Components/Projectile.cs
View File

@@ -8,7 +8,7 @@ using FarseerPhysics.Dynamics.Contacts;
using FarseerPhysics.Dynamics.Joints;
using Microsoft.Xna.Framework;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Projectile : ItemComponent
{

2
Subsurface/Source/Items/Components/Rope.cs
View File

@@ -11,7 +11,7 @@ using FarseerPhysics.Factories;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Rope : ItemComponent
{

2
Subsurface/Source/Items/Components/Signal/AndComponent.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class AndComponent : ItemComponent
{

2
Subsurface/Source/Items/Components/Signal/Connection.cs
View File

@@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Connection

2
Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
View File

@@ -4,7 +4,7 @@ using System;
using System.Collections.Generic;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class ConnectionPanel : ItemComponent
{

4
Subsurface/Source/Items/Components/Signal/LightComponent.cs
View File

@@ -1,12 +1,12 @@
using FarseerPhysics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Subsurface.Lights;
using Barotrauma.Lights;
using System;
using System.IO;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class LightComponent : Powered
{

2
Subsurface/Source/Items/Components/Signal/NotComponent.cs
View File

@@ -1,6 +1,6 @@
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class NotComponent : ItemComponent
{

2
Subsurface/Source/Items/Components/Signal/OrComponent.cs
View File

@@ -1,6 +1,6 @@
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class OrComponent : AndComponent
{

2
Subsurface/Source/Items/Components/Signal/OxygenDetector.cs
View File

@@ -1,6 +1,6 @@
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class OxygenDetector : ItemComponent
{

2
Subsurface/Source/Items/Components/Signal/RegExFindComponent.cs
View File

@@ -1,7 +1,7 @@
using System.Xml.Linq;
using System.Text.RegularExpressions;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class RegExFindComponent : ItemComponent
{

2
Subsurface/Source/Items/Components/Signal/SignalCheckComponent.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class SignalCheckComponent : ItemComponent
{

2
Subsurface/Source/Items/Components/Signal/WifiComponent.cs
View File

@@ -3,7 +3,7 @@ using System;
using System.Collections.Generic;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class WifiComponent : ItemComponent
{

2
Subsurface/Source/Items/Components/Signal/Wire.cs
View File

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

2
Subsurface/Source/Items/Components/Turret.cs
View File

@@ -6,7 +6,7 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using FarseerPhysics;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class Turret : Powered
{

2
Subsurface/Source/Items/Components/Wearable.cs
View File

@@ -4,7 +4,7 @@ using System.IO;
using System.Linq;
using System.Xml.Linq;
namespace Subsurface.Items.Components
namespace Barotrauma.Items.Components
{
class WearableSprite
{

2
Subsurface/Source/Items/FixRequirement.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Subsurface
namespace Barotrauma
{
class FixRequirement
{

4
Subsurface/Source/Items/Inventory.cs
View File

@@ -3,10 +3,10 @@ using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using Subsurface.Networking;
using Barotrauma.Networking;
using System;
namespace Subsurface
namespace Barotrauma
{
class Inventory : Entity
{

56
Subsurface/Source/Items/Item.cs
View File

@@ -6,14 +6,14 @@ using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using Subsurface.Networking;
using Barotrauma.Networking;
using System;
using Subsurface.Items.Components;
using Barotrauma.Items.Components;
using System.ComponentModel;
using System.Collections.ObjectModel;
using FarseerPhysics.Dynamics;
namespace Subsurface
namespace Barotrauma
{
public enum ActionType
@@ -429,7 +429,17 @@ namespace Subsurface
foreach (Item containedItem in containedItems)
{
if (containedItem == null) continue;
if (effect.TargetNames != null && !effect.TargetNames.Contains(containedItem.Name)) continue;
if (effect.TargetNames != null && !effect.TargetNames.Contains(containedItem.Name))
{
bool tagFound = false;
foreach (string targetName in effect.TargetNames)
{
if (!containedItem.HasTag(targetName)) continue;
tagFound = true;
break;
}
if (!tagFound) continue;
}
hasTargets = true;
targets.Add(containedItem);
@@ -440,30 +450,30 @@ namespace Subsurface
}
if (hasTargets)
if (!hasTargets) return;
if (effect.Targets.HasFlag(StatusEffect.TargetType.This))
{
if (effect.Targets.HasFlag(StatusEffect.TargetType.This))
foreach (var pobject in AllPropertyObjects)
{
foreach (var pobject in AllPropertyObjects)
{
targets.Add(pobject);
}
targets.Add(pobject);
}
//effect.Apply(type, deltaTime, this);
//ApplyStatusEffect(effect, type, deltaTime, this);
}
//effect.Apply(type, deltaTime, this);
//ApplyStatusEffect(effect, type, deltaTime, this);
if (effect.Targets.HasFlag(StatusEffect.TargetType.Character)) targets.Add(character);
//effect.Apply(type, deltaTime, null, character);
//ApplyStatusEffect(effect, type, deltaTime, null, character, limb);
if (effect.Targets.HasFlag(StatusEffect.TargetType.Character)) targets.Add(character);
//effect.Apply(type, deltaTime, null, character);
//ApplyStatusEffect(effect, type, deltaTime, null, character, limb);
if (container != null && effect.Targets.HasFlag(StatusEffect.TargetType.Parent)) targets.Add(container);
//{
// effect.Apply(type, deltaTime, container);
// //container.ApplyStatusEffect(effect, type, deltaTime, container);
//}
if (container != null && effect.Targets.HasFlag(StatusEffect.TargetType.Parent)) targets.Add(container);
//{
// effect.Apply(type, deltaTime, container);
// //container.ApplyStatusEffect(effect, type, deltaTime, container);
//}
effect.Apply(type, deltaTime, this, targets);
}
effect.Apply(type, deltaTime, this, targets);
}
@@ -497,7 +507,7 @@ namespace Subsurface
ic.Update(deltaTime, cam);
ic.PlaySound(ActionType.OnActive, Position);
ic.ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
//ic.ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
}
else
{

4
Subsurface/Source/Items/ItemInventory.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.Xna.Framework;
using Subsurface.Items.Components;
using Barotrauma.Items.Components;
namespace Subsurface
namespace Barotrauma
{
class ItemInventory : Inventory
{

2
Subsurface/Source/Items/ItemPrefab.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
namespace Subsurface
namespace Barotrauma
{
class ItemPrefab : MapEntityPrefab
{

2
Subsurface/Source/Items/RelatedItem.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Xml.Linq;
namespace Subsurface
namespace Barotrauma
{
class RelatedItem
{