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

Some cleanup using ReSharper (mostly removing redundancies)

Browse Source
This commit is contained in:
Regalis
2016-03-12 15:32:34 +02:00
parent ae4e4d8f34
commit d1580328ed
99 changed files with 197 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/AI/CrewCommander.cs
+4 -10
View File
@@ -1,10 +1,7 @@
using Barotrauma.Items.Components;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Barotrauma
{
@@ -137,7 +134,7 @@ namespace Barotrauma
List<GUIComponent> prevCharacterFrames = new List<GUIComponent>();
foreach (GUIComponent child in frame.children)
{
if (child.UserData as Character == null) continue;
if (!(child.UserData is Character)) continue;
prevCharacterFrames.Add(child);
}
@@ -155,8 +152,6 @@ namespace Barotrauma
int spacing = 5;
int rows = (int)Math.Ceiling((double)aliveCharacters.Count / charactersPerRow);
int i = 0;
foreach (Character character in aliveCharacters)
{
@@ -164,7 +159,7 @@ namespace Barotrauma
//if (i >= aliveCharacters.Count - charactersPerRow && aliveCharacters.Count % charactersPerRow > 0) rowCharacterCount = aliveCharacters.Count % charactersPerRow;
// rowCharacterCount = Math.Min(rowCharacterCount, aliveCharacters.Count - i);
int startX = (int)-(150 * rowCharacterCount + spacing * (rowCharacterCount - 1)) / 2;
int startX = -(150 * rowCharacterCount + spacing * (rowCharacterCount - 1)) / 2;
int x = startX + (150 + spacing) * (i % Math.Min(charactersPerRow, aliveCharacters.Count));
@@ -229,7 +224,6 @@ namespace Barotrauma
{
Order order = userData as Order;
List<Character> selectedCharacters = new List<Character>();
foreach (GUIComponent child in frame.children)
{
var characterButton = child as GUIButton;
@@ -258,7 +252,7 @@ namespace Barotrauma
var humanAi = character.AIController as HumanAIController;
if (humanAi == null) return;
var existingOrder = characterFrame.children.Find(c => c.UserData as Order != null);
var existingOrder = characterFrame.children.Find(c => c.UserData is Order);
if (existingOrder != null) characterFrame.RemoveChild(existingOrder);
var orderFrame = new GUIFrame(new Rectangle(-5, characterFrame.Rect.Height, characterFrame.Rect.Width, 30 + order.Options.Length * 15), null, characterFrame);
Subsurface/Source/Characters/AI/EnemyAIController.cs
+2 -2
View File
@@ -71,7 +71,7 @@ namespace Barotrauma
targetMemories = new Dictionary<AITarget, AITargetMemory>();
XDocument doc = ToolBox.TryLoadXml(file);
if (doc == null) return;
if (doc == null || doc.Root == null) return;
XElement aiElement = doc.Root.Element("ai");
if (aiElement == null) return;
@@ -474,7 +474,7 @@ namespace Barotrauma
}
else if (closestStructure!=null)
{
valueModifier = valueModifier / (closestStructure as IDamageable).Health;
valueModifier = valueModifier / ((IDamageable)closestStructure).Health;
}
else
{
Subsurface/Source/Characters/AI/HumanAIController.cs
+1 -5
View File
@@ -1,9 +1,5 @@
using FarseerPhysics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Barotrauma
{
Subsurface/Source/Characters/AI/IndoorsSteeringManager.cs
-3
View File
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Microsoft.Xna.Framework;
using FarseerPhysics;
using Barotrauma.Items.Components;
namespace Barotrauma
Subsurface/Source/Characters/AI/Objectives/AIObjectiveCombat.cs
+1 -1
View File
@@ -66,7 +66,7 @@ namespace Barotrauma
}
var pickedBody = Submarine.PickBody(character.SimPosition, enemy.SimPosition, ignoredBodies);
if (pickedBody != null && pickedBody.UserData as Limb == null) return;
if (pickedBody != null && !(pickedBody.UserData is Limb)) return;
weapon.Use(deltaTime, character);
}
Subsurface/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs
+2 -9
View File
@@ -1,9 +1,6 @@
using Barotrauma.Items.Components;
using Microsoft.Xna.Framework;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Barotrauma
{
@@ -59,10 +56,6 @@ namespace Barotrauma
}
else
{
var pathSteering = character.AIController.SteeringManager as IndoorsSteeringManager;
Hull bestHull = null;
float bestValue = currenthullSafety;
@@ -75,7 +68,7 @@ namespace Barotrauma
hullValue -= (float)Math.Sqrt(Math.Abs(character.Position.X- hull.Position.X));
hullValue -= (float)Math.Sqrt(Math.Abs(character.Position.Y - hull.Position.Y)*2.0f);
if (bestHull==null || hullValue > bestValue)
if (bestHull == null || hullValue > bestValue)
{
bestHull = hull;
bestValue = hullValue;
Subsurface/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs
-2
View File
@@ -1,8 +1,6 @@
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Barotrauma
{
Subsurface/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs
-3
View File
@@ -2,9 +2,6 @@
using FarseerPhysics;
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Barotrauma
{
Subsurface/Source/Characters/AI/Objectives/AIObjectiveIdle.cs
+1 -3
View File
@@ -1,8 +1,6 @@
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Barotrauma
{
@@ -119,7 +117,7 @@ namespace Barotrauma
public override bool IsDuplicate(AIObjective otherObjective)
{
return (otherObjective as AIObjectiveIdle != null);
return (otherObjective is AIObjectiveIdle);
}
}
}
Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs
+1 -4
View File
@@ -1,8 +1,5 @@
using Barotrauma.Items.Components;
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Barotrauma
{
Subsurface/Source/Characters/AI/Order.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace Barotrauma
PrefabList = new List<Order>();
XDocument doc = ToolBox.TryLoadXml(ConfigFile);
if (doc == null) return;
if (doc == null || doc.Root == null) return;
foreach (XElement orderElement in doc.Root.Elements())
{
Subsurface/Source/Characters/AI/PathFinder.cs
+8 -8
View File
@@ -1,5 +1,4 @@
using FarseerPhysics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework;
using System.Collections.Generic;
using System.Linq;
@@ -80,7 +79,7 @@ namespace Barotrauma
public delegate float? GetNodePenaltyHandler(PathNode node, PathNode prevNode);
public GetNodePenaltyHandler GetNodePenalty;
List<PathNode> nodes;
private List<PathNode> nodes;
private bool insideSubmarine;
@@ -181,12 +180,13 @@ namespace Barotrauma
endNode = node;
if (startNode != null) break;
}
}
if (startNode==null || endNode==null)
{
DebugConsole.ThrowError("Pathfinding error, couldn't find matching pathnodes to waypoints");
return new SteeringPath();
}
if (startNode == null || endNode == null)
{
DebugConsole.ThrowError("Pathfinding error, couldn't find matching pathnodes to waypoints");
return new SteeringPath();
}
return FindPath(startNode, endNode);
Subsurface/Source/Characters/AI/SteeringManager.cs
+1 -1
View File
@@ -151,7 +151,7 @@ namespace Barotrauma
}
else if (closestBody.UserData is Item)
{
Item item = closestBody.UserData as Item;
Item item = (Item)closestBody.UserData;
avoidSteering = Vector2.Normalize(Submarine.LastPickedPosition - item.SimPosition);
}
else
Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
+3 -2
View File
@@ -747,12 +747,13 @@ namespace Barotrauma
torso.body.ApplyForce((climbForce * 40.0f + subSpeed*50.0f) * torso.Mass);
head.body.SmoothRotate(0.0f);
Rectangle trigger = character.SelectedConstruction.Prefab.Triggers.FirstOrDefault();
if (trigger == null)
if (!character.SelectedConstruction.Prefab.Triggers.Any())
{
character.SelectedConstruction = null;
return;
}
Rectangle trigger = character.SelectedConstruction.Prefab.Triggers.FirstOrDefault();
trigger = character.SelectedConstruction.TransformTrigger(trigger);
bool notClimbing = false;
Subsurface/Source/Characters/Animation/Ragdoll.cs
+2 -2
View File
@@ -301,7 +301,7 @@ namespace Barotrauma
{
Structure structure = f2.Body.UserData as Structure;
if (f2.Body.UserData as Submarine != null && character.Submarine == f2.Body.UserData as Submarine) return false;
if (f2.Body.UserData is Submarine && character.Submarine == (Submarine)f2.Body.UserData) return false;
//always collides with bodies other than structures
if (structure == null)
@@ -385,7 +385,7 @@ namespace Barotrauma
avgVelocity = avgVelocity / Limbs.Count();
if (character.Submarine == null && f2.Body.UserData is Submarine) avgVelocity -= (f2.Body.UserData as Submarine).Velocity;
if (character.Submarine == null && f2.Body.UserData is Submarine) avgVelocity -= ((Submarine)f2.Body.UserData).Velocity;
float impact = Vector2.Dot(avgVelocity, -normal);
Subsurface/Source/Characters/Attack.cs
-13
View File
@@ -128,19 +128,6 @@ namespace Barotrauma
public AttackResult DoDamage(IDamageable attacker, IDamageable target, Vector2 worldPosition, float deltaTime, bool playSound = true)
{
float damageAmount = 0.0f;
//DamageSoundType damageSoundType = DamageSoundType.None;
if (target as Character == null)
{
damageAmount = structureDamage;
}
else
{
damageAmount = damage;
}
if (particleEmitterPrefab != null)
{
particleEmitterPrefab.Emit(worldPosition);
Subsurface/Source/Characters/BackgroundSprite/BackgroundCreaturePrefab.cs
+1 -5
View File
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml.Linq;
using System.Xml.Linq;
namespace Barotrauma
{
Subsurface/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs
-3
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Barotrauma
Subsurface/Source/Characters/Character.cs
+8 -18
View File
@@ -365,11 +365,6 @@ namespace Barotrauma
public delegate void OnDeathHandler(Character character, CauseOfDeath causeOfDeath);
public OnDeathHandler OnDeath;
public static Character Create(string file, Vector2 position)
{
return Create(file, position, null);
}
public static Character Create(CharacterInfo characterInfo, Vector2 position, bool isNetworkPlayer = false, bool hasAi=true)
{
return Create(characterInfo.File, position, characterInfo, isNetworkPlayer, hasAi);
@@ -387,23 +382,18 @@ namespace Barotrauma
return enemyCharacter;
}
else
if (hasAi && !isNetworkPlayer)
{
if (hasAi && !isNetworkPlayer)
{
var character = new AICharacter(file, position, characterInfo, isNetworkPlayer);
var ai = new HumanAIController(character);
character.SetAI(ai);
var character = new AICharacter(file, position, characterInfo, isNetworkPlayer);
var ai = new HumanAIController(character);
character.SetAI(ai);
return character;
return character;
}
else
{
return new Character(file, position, characterInfo, isNetworkPlayer);
}
}
return new Character(file, position, characterInfo, isNetworkPlayer);
}
protected Character(string file, Vector2 position, CharacterInfo characterInfo = null, bool isNetworkPlayer = false)
Subsurface/Source/Characters/CharacterInfo.cs
+1 -1
View File
@@ -187,7 +187,7 @@ namespace Barotrauma
public GUIFrame CreateInfoFrame(GUIFrame frame)
{
GUIImage image = new GUIImage(new Rectangle(0,0,30,30), HeadSprite, Alignment.TopLeft, frame);
new GUIImage(new Rectangle(0,0,30,30), HeadSprite, Alignment.TopLeft, frame);
SpriteFont font = frame.Rect.Width<280 ? GUI.SmallFont : GUI.Font;
Subsurface/Source/Characters/DelayedEffect.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using Microsoft.Xna.Framework;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Xml.Linq;
namespace Barotrauma
Subsurface/Source/Characters/Jobs/Job.cs
+2 -5
View File
@@ -1,8 +1,5 @@
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Barotrauma
@@ -10,7 +7,7 @@ namespace Barotrauma
class Job
{
private JobPrefab prefab;
private readonly JobPrefab prefab;
private Dictionary<string, Skill> skills;
Subsurface/Source/Characters/Jobs/JobPrefab.cs
+1 -1
View File
@@ -160,7 +160,7 @@ namespace Barotrauma
foreach (string filePath in filePaths)
{
XDocument doc = ToolBox.TryLoadXml(filePath);
if (doc == null) return;
if (doc == null || doc.Root == null) return;
foreach (XElement element in doc.Root.Elements())
{
Subsurface/Source/Characters/Jobs/SkillPrefab.cs
+2 -6
View File
@@ -1,17 +1,13 @@
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml.Linq;
namespace Barotrauma
{
class SkillPrefab
{
string name;
private string name;
string description;
private string description;
private Vector2 levelRange;
Subsurface/Source/Characters/StatusEffect.cs
+4 -5
View File
@@ -1,5 +1,4 @@
using FarseerPhysics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -274,20 +273,20 @@ namespace Barotrauma
Type type = value.GetType();
if (type == typeof(float) ||
(type == typeof(int) && property.GetValue().GetType() == typeof(float)))
(type == typeof(int) && property.GetValue() is float))
{
float floatValue = Convert.ToSingle(value) * deltaTime;
if (!setValue) floatValue += (float)property.GetValue();
property.TrySetValue(floatValue);
}
else if (type == typeof(int) && value.GetType()==typeof(int))
else if (type == typeof(int) && value is int)
{
int intValue = (int)((int)value * deltaTime);
if (!setValue) intValue += (int)property.GetValue();
property.TrySetValue(intValue);
}
else if (type == typeof(bool) && value.GetType() == typeof(bool))
else if (type == typeof(bool) && value is bool)
{
property.TrySetValue((bool)value);
}