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

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
{

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;
}
}

View File

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

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
{

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
{

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
{