Switch to Barotrauma & too many misc changes to remember

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
+1 -1
View File
@@ -2,7 +2,7 @@
using Microsoft.Xna.Framework;
using System;
namespace Subsurface
namespace Barotrauma
{
class MonsterEvent : ScriptedEvent
{
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Subsurface
namespace Barotrauma
{
class PropertyTask : Task
{
@@ -6,12 +6,10 @@ using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Subsurface
namespace Barotrauma
{
class MonsterQuest : Quest
{
//string monsterName;
string monsterFile;
Character monster;
@@ -33,7 +31,7 @@ namespace Subsurface
monster = new AICharacter(monsterFile, ConvertUnits.ToSimUnits(position+level.Position));
}
public override void End()
{
if (!monster.IsDead)
+2 -2
View File
@@ -6,7 +6,7 @@ using System.Reflection;
using System.Text;
using System.Xml.Linq;
namespace Subsurface
namespace Barotrauma
{
class Quest
{
@@ -104,7 +104,7 @@ namespace Subsurface
try
{
t = Type.GetType("Subsurface." + type, true, true);
t = Type.GetType("Barotrauma." + type, true, true);
if (t == null)
{
DebugConsole.ThrowError("Error in " + configFile + "! Could not find a quest class of the type ''" + type + "''.");
@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Subsurface
namespace Barotrauma
{
class SalvageQuest : Quest
{
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Subsurface
namespace Barotrauma
{
class RepairTask : Task
{
+2 -2
View File
@@ -4,7 +4,7 @@ using System.Linq;
using System.Reflection;
using System.Xml.Linq;
namespace Subsurface
namespace Barotrauma
{
class ScriptedEvent
{
@@ -137,7 +137,7 @@ namespace Subsurface
try
{
t = Type.GetType("Subsurface." + type, true, true);
t = Type.GetType("Barotrauma." + type, true, true);
if (t == null)
{
DebugConsole.ThrowError("Error in " + configFile + "! Could not find an event class of the type ''" + type + "''.");
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Subsurface
namespace Barotrauma
{
class ScriptedTask : Task
{
+1 -1
View File
@@ -1,5 +1,5 @@
namespace Subsurface
namespace Barotrauma
{
class Task
{
+1 -1
View File
@@ -3,7 +3,7 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System;
namespace Subsurface
namespace Barotrauma
{
class TaskManager
{