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

MeleeChemicalInjectorComponent (#2645)

Browse Source 
* MeleeWeaponComponent OnHittingEntities event

* MeleeChemicalInjectorComponent

* Moves melee onhit action to EventBus

* serialization fix

* prototype fix

* redid chem transfer logic

* MeleeChemicalinjector uses ComponentMessages

* divide by 0 fix

* Update Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml

Co-authored-by: py01 <pyronetics01@gmail.com>
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
py01
2020-12-08 05:57:47 -06:00
committed by GitHub
parent 89e853d8e2
commit cc26218060
4 changed files with 96 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
var curTime = _gameTiming.CurTime;
if(curTime < _cooldownEnd)
if (curTime < _cooldownEnd)
return true;
var location = eventArgs.User.Transform.Coordinates;
@@ -95,7 +95,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
var audioSystem = EntitySystem.Get<AudioSystem>();
if (entities.Count != 0)
{
audioSystem.PlayFromEntity( _hitSound, entities.First());
audioSystem.PlayFromEntity(_hitSound, entities.First());
}
else
{
@@ -114,8 +114,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
hitEntities.Add(entity);
}
}
SendMessage(new MeleeHitMessage(hitEntities));
if(!OnHitEntities(hitEntities, eventArgs)) return false;
if (!OnHitEntities(hitEntities, eventArgs)) return false;
if (Arc != null)
{
@@ -141,7 +142,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
var curTime = _gameTiming.CurTime;
if(curTime < _cooldownEnd || !eventArgs.Target.IsValid())
if (curTime < _cooldownEnd || !eventArgs.Target.IsValid())
return true;
var target = eventArgs.TargetEntity;
@@ -152,7 +153,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
var audioSystem = EntitySystem.Get<AudioSystem>();
if (target != null)
{
audioSystem.PlayFromEntity( _hitSound, target);
audioSystem.PlayFromEntity(_hitSound, target);
}
else
{
@@ -164,8 +165,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
{
damageComponent.ChangeDamage(DamageType, Damage, false, Owner);
}
SendMessage(new MeleeHitMessage(new List<IEntity> { target }));
var targets = new[] {target};
var targets = new[] { target };
if (!OnHitEntities(targets, eventArgs))
return false;
@@ -211,4 +213,14 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
return resSet;
}
}
public class MeleeHitMessage : ComponentMessage
{
public readonly List<IEntity> HitEntities;
public MeleeHitMessage(List<IEntity> hitEntities)
{
HitEntities = hitEntities;
}
}
}