(3dc4135ce) v0.9.5.1

This commit is contained in:
Regalis
2019-11-21 18:22:25 +01:00
parent b39922a074
commit 5c95c53118
287 changed files with 12655 additions and 5048 deletions
@@ -332,7 +332,7 @@ namespace Barotrauma
string spriteFolder = "";
string textureElement = element.GetAttributeString("texture", "");
// TODO: parse and create?
if (textureElement.Contains("[GENDER]") || textureElement.Contains("[HEADID]") || textureElement.Contains("[RACE]")) { return; }
if (textureElement.Contains("[GENDER]") || textureElement.Contains("[HEADID]") || textureElement.Contains("[RACE]") || textureElement.Contains("[VARIANT]")) { return; }
if (!textureElement.Contains("/"))
{
var parsedPath = element.ParseContentPathFromUri();
@@ -428,42 +428,23 @@ namespace Barotrauma
viewAreaOffset += moveSpeed.ToPoint();
}
}
if (PlayerInput.KeyHit(Keys.Left))
if (GUI.KeyboardDispatcher.Subscriber == null)
{
foreach (var sprite in selectedSprites)
Point moveAmount = Point.Zero;
if (PlayerInput.KeyHit(Keys.Left)) { moveAmount.X--; }
if (PlayerInput.KeyHit(Keys.Right)) { moveAmount.X++; }
if (PlayerInput.KeyHit(Keys.Up)) { moveAmount.Y--; }
if (PlayerInput.KeyHit(Keys.Down)) { moveAmount.Y++; }
if (moveAmount != Point.Zero)
{
var newRect = sprite.SourceRect;
newRect.X--;
UpdateSourceRect(sprite, newRect);
foreach (var sprite in selectedSprites)
{
var newRect = sprite.SourceRect;
newRect.Location += moveAmount;
UpdateSourceRect(sprite, newRect);
}
}
}
if (PlayerInput.KeyHit(Keys.Right))
{
foreach (var sprite in selectedSprites)
{
var newRect = sprite.SourceRect;
newRect.X++;
UpdateSourceRect(sprite, newRect);
}
}
if (PlayerInput.KeyHit(Keys.Down))
{
foreach (var sprite in selectedSprites)
{
var newRect = sprite.SourceRect;
newRect.Y++;
UpdateSourceRect(sprite, newRect);
}
}
if (PlayerInput.KeyHit(Keys.Up))
{
foreach (var sprite in selectedSprites)
{
var newRect = sprite.SourceRect;
newRect.Y--;
UpdateSourceRect(sprite, newRect);
}
}
}
}
public override void Draw(double deltaTime, GraphicsDevice graphics, SpriteBatch spriteBatch)