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

Attachable items aren't automatically attached when loading a sub in edit screen, bunch of new item sprites, Aegir Mark II, client reconnect bugfixes

Browse Source
This commit is contained in:
Regalis
2015-09-27 15:46:55 +03:00
parent da00b083ed
commit c8ee9e085f
30 changed files with 249 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Item.cs
+26 -21
View File
@@ -27,8 +27,7 @@ namespace Subsurface
protected ItemPrefab prefab;
private List<string> tags;
public Hull CurrentHull;
//components that determine the functionality of the item
@@ -79,6 +78,22 @@ namespace Subsurface
get { return prefab.PickDistance; }
}
protected Color spriteColor;
[Editable, HasDefaultValue("1.0,1.0,1.0,1.0", true)]
public string SpriteColor
{
get { return ToolBox.Vector4ToString(spriteColor.ToVector4()); }
set
{
spriteColor = new Color(ToolBox.ParseToVector4(value));
}
}
public Color Color
{
get { return spriteColor; }
}
public float Condition
{
get { return condition; }
@@ -104,22 +119,6 @@ namespace Subsurface
get { return condition; }
}
private Color spriteColor;
[Editable, HasDefaultValue("1.0,1.0,1.0,1.0", true)]
public string SpriteColor
{
get { return ToolBox.Vector4ToString(spriteColor.ToVector4()); }
set
{
spriteColor = new Color(ToolBox.ParseToVector4(value));
}
}
public Color Color
{
get { return spriteColor; }
}
[Editable, HasDefaultValue("", true)]
public string Tags
{
@@ -242,6 +241,8 @@ namespace Subsurface
{
prefab = itemPrefab;
spriteColor = prefab.SpriteColor;
linkedTo = new ObservableCollection<MapEntity>();
components = new List<ItemComponent>();
FixRequirements = new List<FixRequirement>();
@@ -323,11 +324,15 @@ namespace Subsurface
}
public void SetTransform(Vector2 position, float rotation)
public void SetTransform(Vector2 simPosition, float rotation)
{
body.SetTransform(position, rotation);
if (body != null)
{
body.SetTransform(simPosition, rotation);
}
Vector2 displayPos = ConvertUnits.ToDisplayUnits(body.SimPosition);
Vector2 displayPos = ConvertUnits.ToDisplayUnits(simPosition);
rect.X = (int)(displayPos.X - rect.Width / 2.0f);
rect.Y = (int)(displayPos.Y + rect.Height / 2.0f);