diff options
Diffstat (limited to 'code/pawn/component')
4 files changed, 29 insertions, 23 deletions
diff --git a/code/pawn/component/camera/BaseCameraComponent.cs b/code/pawn/component/camera/BaseCameraComponent.cs index 029586a..401d702 100644 --- a/code/pawn/component/camera/BaseCameraComponent.cs +++ b/code/pawn/component/camera/BaseCameraComponent.cs @@ -20,16 +20,27 @@ public class BaseCameraComponent : EntityComponent<Player>, ISingletonComponent public virtual InventoryComponent GetObservedInventory()
{
- return null;
+ return Entity.Inventory;
}
public virtual float GetObservedHealth()
{
- return 0;
+ return Entity.Health;
}
public virtual Team GetObservedTeam()
{
- return Team.Spectator;
+ return Entity.Team;
+ }
+
+ public virtual string GetObservedName()
+ {
+ var characterName = Entity.CharacterName;
+ return string.IsNullOrWhiteSpace( characterName ) ? Entity.Client.Name : characterName;
+ }
+
+ public virtual string GetObservedColour()
+ {
+ return Entity.HexColor;
}
}
diff --git a/code/pawn/component/camera/PlayerCameraComponent.cs b/code/pawn/component/camera/PlayerCameraComponent.cs index 702f0c8..5ec9f7b 100644 --- a/code/pawn/component/camera/PlayerCameraComponent.cs +++ b/code/pawn/component/camera/PlayerCameraComponent.cs @@ -43,21 +43,5 @@ public class PlayerCameraComponent : BaseCameraComponent var pl = Entity as Player;
var viewAngles = (pl.ViewAngles + Input.AnalogLook).Normal;
pl.ViewAngles = viewAngles.WithPitch( viewAngles.pitch.Clamp( -89f, 89f ) );
- return;
- }
-
- public override InventoryComponent GetObservedInventory()
- {
- return Entity.Inventory;
- }
-
- public override float GetObservedHealth()
- {
- return Entity.Health;
- }
-
- public override Team GetObservedTeam()
- {
- return Entity.CurrentTeam;
}
}
diff --git a/code/pawn/component/camera/SpectatorCameraComponent.cs b/code/pawn/component/camera/SpectatorCameraComponent.cs index fba33a5..3baf1a9 100644 --- a/code/pawn/component/camera/SpectatorCameraComponent.cs +++ b/code/pawn/component/camera/SpectatorCameraComponent.cs @@ -47,7 +47,7 @@ public partial class SpectatorCameraComponent : BaseCameraComponent private List<IClient> GetTargets()
{
- return Game.Clients.Where(c => c.Pawn is Player player && player.CurrentTeam != Team.Spectator && player.LifeState == LifeState.Alive).ToList();
+ return Game.Clients.Where(c => c.Pawn is Player player && player.Team != Team.Spectator && player.LifeState == LifeState.Alive).ToList();
}
private void FindNextTarget(List<IClient> targets, bool backwards)
@@ -70,11 +70,22 @@ public partial class SpectatorCameraComponent : BaseCameraComponent public override float GetObservedHealth()
{
- return Target?.Health ?? Entity.Health;
+ return Target?.Health ?? base.GetObservedHealth();
}
public override Team GetObservedTeam()
{
- return Target?.CurrentTeam ?? Entity.CurrentTeam;
+ return Target?.Team ?? base.GetObservedTeam();
+ }
+
+ public override string GetObservedName()
+ {
+ var characterName = Entity.CharacterName;
+ return string.IsNullOrWhiteSpace( characterName ) ? (Target?.Client.Name ?? "Unknown") : characterName;
+ }
+
+ public override string GetObservedColour()
+ {
+ return Target?.HexColor ?? base.GetObservedColour();
}
}
diff --git a/code/pawn/component/movement/WalkControllerComponent.cs b/code/pawn/component/movement/WalkControllerComponent.cs index 765437c..da4ad5b 100644 --- a/code/pawn/component/movement/WalkControllerComponent.cs +++ b/code/pawn/component/movement/WalkControllerComponent.cs @@ -10,7 +10,7 @@ public partial class WalkControllerComponent : BaseControllerComponent {
get
{
- return TeamCapabilities.CanSprint( Entity.CurrentTeam );
+ return TeamCapabilities.CanSprint( Entity.Team );
}
}
[Net] public float SprintSpeed { get; set; } = 320.0f;
|