Adds click attacks

Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs

@@ -29,53 +29,41 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
 
         public override string Name => "MeleeWeapon";
         private TimeSpan _lastAttackTime;
+        private TimeSpan _cooldownEnd;
 
-        private int _damage;
-        private float _range;
-        private float _arcWidth;
-        private string _arc;
         private string _hitSound;
-        public float CooldownTime => _cooldownTime;
-        private float _cooldownTime = 1f;
+        private string _missSound;
+        public float ArcCooldownTime { get; private set; } = 1f;
+        public float CooldownTime { get; private set; } = 0.5f;
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public string Arc
-        {
-            get => _arc;
-            set => _arc = value;
-        }
+        public string Arc { get; set; }
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public float ArcWidth
-        {
-            get => _arcWidth;
-            set => _arcWidth = value;
-        }
+        public float ArcWidth { get; set; }
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public float Range
-        {
-            get => _range;
-            set => _range = value;
-        }
+        public float Range { get; set; }
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public int Damage
-        {
-            get => _damage;
-            set => _damage = value;
-        }
+        public int Damage { get; set; }
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public DamageType DamageType { get; set; }
 
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
 
-            serializer.DataField(ref _damage, "damage", 5);
-            serializer.DataField(ref _range, "range", 1);
-            serializer.DataField(ref _arcWidth, "arcwidth", 90);
-            serializer.DataField(ref _arc, "arc", "default");
-            serializer.DataField(ref _hitSound, "hitSound", "/Audio/Weapons/genhit1.ogg");
-            serializer.DataField(ref _cooldownTime, "cooldownTime", 1f);
+            serializer.DataField(this, x => x.Damage, "damage", 5);
+            serializer.DataField(this, x => x.Range, "range", 1);
+            serializer.DataField(this, x => x.ArcWidth, "arcwidth", 90);
+            serializer.DataField(this, x => x.Arc, "arc", "default");
+            serializer.DataField(this, x => x._hitSound, "hitSound", "/Audio/Weapons/genhit1.ogg");
+            serializer.DataField(this, x => x._missSound, "hitSound", "/Audio/Weapons/punchmiss.ogg");
+            serializer.DataField(this, x => x.ArcCooldownTime, "arcCooldownTime", 1f);
+            serializer.DataField(this, x => x.CooldownTime, "cooldownTime", 1f);
+            serializer.DataField(this, x => x.DamageType, "damageType", DamageType.Blunt);
         }
 
         protected virtual bool OnHitEntities(IReadOnlyList<IEntity> entities, AttackEventArgs eventArgs)
@@ -83,13 +71,15 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
             return true;
         }
 
-        void IAttack.Attack(AttackEventArgs eventArgs)
+        bool IAttack.WideAttack(AttackEventArgs eventArgs)
         {
+            if (!eventArgs.WideAttack) return true;
+
             var curTime = IoCManager.Resolve<IGameTiming>().CurTime;
-            var span = curTime - _lastAttackTime;
-            if(span.TotalSeconds < _cooldownTime) {
-                return;
-            }
+
+            if(curTime < _cooldownEnd)
+                return true;
+
             var location = eventArgs.User.Transform.GridPosition;
             var angle = new Angle(eventArgs.ClickLocation.ToMapPos(_mapManager) - location.ToMapPos(_mapManager));
 
@@ -103,7 +93,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
             }
             else
             {
-                audioSystem.PlayFromEntity("/Audio/Weapons/punchmiss.ogg", eventArgs.User);
+                audioSystem.PlayFromEntity(_missSound, eventArgs.User);
             }
 
             var hitEntities = new List<IEntity>();
@@ -114,12 +104,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
 
                 if (entity.TryGetComponent(out IDamageableComponent damageComponent))
                 {
-                    damageComponent.ChangeDamage(DamageType.Blunt, Damage, false, Owner);
+                    damageComponent.ChangeDamage(DamageType, Damage, false, Owner);
                     hitEntities.Add(entity);
                 }
             }
 
-            if(!OnHitEntities(hitEntities, eventArgs)) return;
+            if(!OnHitEntities(hitEntities, eventArgs)) return true;
 
             if (Arc != null)
             {
@@ -127,13 +117,64 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
                 sys.SendAnimation(Arc, angle, eventArgs.User, hitEntities);
             }
 
-            _lastAttackTime = IoCManager.Resolve<IGameTiming>().CurTime;
+            _lastAttackTime = curTime;
+            _cooldownEnd = _lastAttackTime + TimeSpan.FromSeconds(ArcCooldownTime);
 
             if (Owner.TryGetComponent(out ItemCooldownComponent cooldown))
             {
                 cooldown.CooldownStart = _lastAttackTime;
-                cooldown.CooldownEnd = _lastAttackTime + TimeSpan.FromSeconds(_cooldownTime);
+                cooldown.CooldownEnd = _cooldownEnd;
             }
+
+            return true;
+        }
+
+        bool IAttack.ClickAttack(AttackEventArgs eventArgs)
+        {
+            if (eventArgs.WideAttack) return false;
+
+            var curTime = IoCManager.Resolve<IGameTiming>().CurTime;
+
+            if(curTime < _cooldownEnd || !eventArgs.Target.IsValid())
+                return true;
+
+            var target = eventArgs.TargetEntity;
+
+            var location = eventArgs.User.Transform.GridPosition;
+            var angle = new Angle(eventArgs.ClickLocation.ToMapPos(_mapManager) - location.ToMapPos(_mapManager));
+
+            var audioSystem = EntitySystem.Get<AudioSystem>();
+            if (target != null)
+            {
+                audioSystem.PlayFromEntity( _hitSound, target);
+            }
+            else
+            {
+                audioSystem.PlayFromEntity(_missSound, eventArgs.User);
+                return true;
+            }
+
+            if (target.TryGetComponent(out IDamageableComponent damageComponent))
+            {
+                damageComponent.ChangeDamage(DamageType, Damage, false, Owner);
+            }
+
+            if (!OnHitEntities(new[] {target}, eventArgs))
+                return true;
+
+            var sys = _entitySystemManager.GetEntitySystem<MeleeWeaponSystem>();
+            sys.SendAnimation(angle, eventArgs.User, target);
+
+            _lastAttackTime = curTime;
+            _cooldownEnd = _lastAttackTime + TimeSpan.FromSeconds(CooldownTime);
+
+            if (Owner.TryGetComponent(out ItemCooldownComponent cooldown))
+            {
+                cooldown.CooldownStart = _lastAttackTime;
+                cooldown.CooldownEnd = _cooldownEnd;
+            }
+
+            return true;
         }
 
         private HashSet<IEntity> ArcRayCast(Vector2 position, Angle angle, IEntity ignore)
@@ -149,7 +190,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
             for (var i = 0; i < increments; i++)
             {
                 var castAngle = new Angle(baseAngle + increment * i);
-                var res = _physicsManager.IntersectRay(mapId, new CollisionRay(position, castAngle.ToVec(), 23), _range, ignore).FirstOrDefault();
+                var res = _physicsManager.IntersectRay(mapId, new CollisionRay(position, castAngle.ToVec(), 23), Range, ignore).FirstOrDefault();
                 if (res.HitEntity != null)
                 {
                     resSet.Add(res.HitEntity);