Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Transform refactor. (#139)

Browse Source 
space-wizards/space-station-14#725
This commit is contained in:
Pieter-Jan Briers
2019-01-18 11:40:30 +01:00
committed by GitHub
parent e8e1c9dd1f
commit 415b7e96fd
30 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
View File

@@ -32,11 +32,11 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
serializer.DataField(ref ArcWidth, "arcwidth", 90);
}
void IAfterAttack.Afterattack(IEntity user, GridLocalCoordinates clicklocation, IEntity attacked)
void IAfterAttack.Afterattack(IEntity user, GridCoordinates clicklocation, IEntity attacked)
{
var location = user.GetComponent<ITransformComponent>().LocalPosition;
var location = user.GetComponent<ITransformComponent>().GridPosition;
var angle = new Angle(clicklocation.ToWorld().Position - location.ToWorld().Position);
var entities = IoCManager.Resolve<IServerEntityManager>().GetEntitiesInArc(user.GetComponent<ITransformComponent>().LocalPosition, Range, angle, ArcWidth);
var entities = IoCManager.Resolve<IServerEntityManager>().GetEntitiesInArc(user.GetComponent<ITransformComponent>().GridPosition, Range, angle, ArcWidth);
foreach (var entity in entities)
{

4
Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan
rangedWeapon.FireHandler = Fire;
}
private void Fire(IEntity user, GridLocalCoordinates clickLocation)
private void Fire(IEntity user, GridCoordinates clickLocation)
{
var userPosition = user.Transform.WorldPosition; //Remember world positions are ephemeral and can only be used instantaneously
var angle = new Angle(clickLocation.Position - userPosition);
@@ -72,7 +72,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan
Born = time,
DeathTime = time + TimeSpan.FromSeconds(1),
Size = new Vector2(dist, 1f),
Coordinates = user.Transform.LocalPosition.Translated(offset),
Coordinates = user.Transform.GridPosition.Translated(offset),
//Rotated from east facing
Rotation = (float) angle.Theta,
ColorDelta = new Vector4(0, 0, 0, -1500f),

4
Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs
View File

@@ -59,9 +59,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
serializer.DataField(ref _spreadStdDev, "spreadstddev", 3);
}
private void Fire(IEntity user, GridLocalCoordinates clickLocation)
private void Fire(IEntity user, GridCoordinates clickLocation)
{
var userPosition = user.Transform.LocalPosition; //Remember world positions are ephemeral and can only be used instantaneously
var userPosition = user.Transform.GridPosition; //Remember world positions are ephemeral and can only be used instantaneously
var angle = new Angle(clickLocation.Position - userPosition.Position);
if (Spread)

6
Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
public Func<bool> WeaponCanFireHandler;
public Func<IEntity, bool> UserCanFireHandler;
public Action<IEntity, GridLocalCoordinates> FireHandler;
public Action<IEntity, GridCoordinates> FireHandler;
private const int MaxFireDelayAttempts = 2;
@@ -33,7 +33,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
return UserCanFireHandler == null || UserCanFireHandler(user);
}
private void Fire(IEntity user, GridLocalCoordinates clickLocation)
private void Fire(IEntity user, GridCoordinates clickLocation)
{
_lastFireTime = IoCManager.Resolve<IGameTiming>().CurTime;
FireHandler?.Invoke(user, clickLocation);
@@ -60,7 +60,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
}
}
private void _tryFire(IEntity user, GridLocalCoordinates coordinates, int attemptCount)
private void _tryFire(IEntity user, GridCoordinates coordinates, int attemptCount)
{
if (!user.TryGetComponent(out HandsComponent hands) || hands.GetActiveHand.Owner != Owner)
{