cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Melee special examine (#11168) 

Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
This commit is contained in:
rolfero 2022-09-11 08:39:36 +02:00 committed by GitHub
parent 895841ade3
commit 4b23521af5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 101 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Abilities/Boxer/BoxingSystem.cs
View File

@ -20,7 +20,7 @@ namespace Content.Server.Abilities.Boxer
{
base.Initialize();
SubscribeLocalEvent<BoxerComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<BoxerComponent, MeleeHitEvent>(ApplyBoxerModifiers);
SubscribeLocalEvent<BoxerComponent, ItemMeleeDamageEvent>(GetDamageModifiers);
SubscribeLocalEvent<BoxingGlovesComponent, StaminaMeleeHitEvent>(OnStamHit);
}
@ -29,7 +29,7 @@ namespace Content.Server.Abilities.Boxer
if (TryComp<MeleeWeaponComponent>(uid, out var meleeComp))
meleeComp.Range *= boxer.RangeBonus;
}
private void ApplyBoxerModifiers(EntityUid uid, BoxerComponent component, MeleeHitEvent args)
private void GetDamageModifiers(EntityUid uid, BoxerComponent component, ItemMeleeDamageEvent args)
{
if (component.UnarmedModifiers == default!)
{

4
Content.Server/Stunnable/Systems/StunbatonSystem.cs
View File

@ -33,10 +33,10 @@ namespace Content.Server.Stunnable.Systems
SubscribeLocalEvent<StunbatonComponent, UseInHandEvent>(OnUseInHand);
SubscribeLocalEvent<StunbatonComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<StunbatonComponent, StaminaDamageOnHitAttemptEvent>(OnStaminaHitAttempt);
SubscribeLocalEvent<StunbatonComponent, MeleeHitEvent>(OnMeleeHit);
SubscribeLocalEvent<StunbatonComponent, ItemMeleeDamageEvent>(OnMeleeHit);
}
private void OnMeleeHit(EntityUid uid, StunbatonComponent component, MeleeHitEvent args)
private void OnMeleeHit(EntityUid uid, StunbatonComponent component, ItemMeleeDamageEvent args)
{
if (!component.Activated) return;

4
Content.Server/Tools/ToolSystem.Welder.cs
View File

@ -37,10 +37,10 @@ namespace Content.Server.Tools
SubscribeLocalEvent<WelderComponent, ToolUseFinishAttemptEvent>(OnWelderToolUseFinishAttempt);
SubscribeLocalEvent<WelderComponent, ComponentShutdown>(OnWelderShutdown);
SubscribeLocalEvent<WelderComponent, ComponentGetState>(OnWelderGetState);
SubscribeLocalEvent<WelderComponent, MeleeHitEvent>(OnMeleeHit);
SubscribeLocalEvent<WelderComponent, ItemMeleeDamageEvent>(OnMeleeHit);
}
private void OnMeleeHit(EntityUid uid, WelderComponent component, MeleeHitEvent args)
private void OnMeleeHit(EntityUid uid, WelderComponent component, ItemMeleeDamageEvent args)
{
if (!args.Handled && component.Lit)
args.BonusDamage += component.LitMeleeDamageBonus;

4
Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs
View File

@ -47,6 +47,10 @@ namespace Content.Server.Weapon.Melee.Components
[DataField("clickAttackEffect")]
public bool ClickAttackEffect { get; set; } = true;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("hidden")]
public bool HideFromExamine { get; set; } = false;
public TimeSpan LastAttackTime;
public TimeSpan CooldownEnd;

6
Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs
View File

@ -15,6 +15,12 @@ namespace Content.Server.Weapon.Melee.EnergySword
[DataField("isSharp")]
public bool IsSharp = true;
/// <summary>
/// Does this become hidden when deactivated
/// </summary>
[DataField("secret")]
public bool Secret { get; set; } = false;
/// <summary>
/// RGB cycle rate for hacked e-swords.
/// </summary>

12
Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs
View File

@ -26,7 +26,7 @@ namespace Content.Server.Weapon.Melee.EnergySword
base.Initialize();
SubscribeLocalEvent<EnergySwordComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<EnergySwordComponent, MeleeHitEvent>(OnMeleeHit);
SubscribeLocalEvent<EnergySwordComponent, ItemMeleeDamageEvent>(OnMeleeHit);
SubscribeLocalEvent<EnergySwordComponent, UseInHandEvent>(OnUseInHand);
SubscribeLocalEvent<EnergySwordComponent, InteractUsingEvent>(OnInteractUsing);
SubscribeLocalEvent<EnergySwordComponent, IsHotEvent>(OnIsHotEvent);
@ -38,7 +38,7 @@ namespace Content.Server.Weapon.Melee.EnergySword
comp.BladeColor = _random.Pick(comp.ColorOptions);
}
private void OnMeleeHit(EntityUid uid, EnergySwordComponent comp, MeleeHitEvent args)
private void OnMeleeHit(EntityUid uid, EnergySwordComponent comp, ItemMeleeDamageEvent args)
{
if (!comp.Activated) return;
@ -80,7 +80,11 @@ namespace Content.Server.Weapon.Melee.EnergySword
}
if(TryComp<MeleeWeaponComponent>(comp.Owner, out var weaponComp))
{
weaponComp.HitSound = comp.OnHitOff;
if (comp.Secret)
weaponComp.HideFromExamine = true;
}
if (comp.IsSharp)
RemComp<SharpComponent>(comp.Owner);
@ -104,7 +108,11 @@ namespace Content.Server.Weapon.Melee.EnergySword
EnsureComp<SharpComponent>(comp.Owner);
if(TryComp<MeleeWeaponComponent>(comp.Owner, out var weaponComp))
{
weaponComp.HitSound = comp.OnHitOn;
if (comp.Secret)
weaponComp.HideFromExamine = false;
}
SoundSystem.Play(comp.ActivateSound.GetSound(), Filter.Pvs(comp.Owner, entityManager: EntityManager), comp.Owner);

57
Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
View File

@ -55,12 +55,20 @@ namespace Content.Server.Weapon.Melee
private void OnMeleeExaminableVerb(EntityUid uid, MeleeWeaponComponent component, GetVerbsEvent<ExamineVerb> args)
{
if (!args.CanInteract || !args.CanAccess)
if (!args.CanInteract || !args.CanAccess || component.HideFromExamine)
return;
var getDamage = new ItemMeleeDamageEvent(component.Damage);
RaiseLocalEvent(uid, getDamage, false);
var damageSpec = GetDamage(component);
if (damageSpec == null)
damageSpec = new DamageSpecifier();
damageSpec += getDamage.BonusDamage;
if (damageSpec.Total == FixedPoint2.Zero)
return;
var verb = new ExamineVerb()
@ -125,7 +133,7 @@ namespace Content.Server.Weapon.Melee
if (args.Target is {Valid: true} target)
{
// Raise event before doing damage so we can cancel damage if the event is handled
// Raising a melee hit event which may handle combat for us
var hitEvent = new MeleeHitEvent(new List<EntityUid>() { target }, args.User, comp.Damage);
RaiseLocalEvent(owner, hitEvent, false);
@ -134,9 +142,15 @@ namespace Content.Server.Weapon.Melee
var targets = new[] { target };
SendAnimation(comp.ClickArc, angle, args.User, owner, targets, comp.ClickAttackEffect, false);
// Raising a GetMeleeDamage event which gets our damage
var getDamageEvent = new ItemMeleeDamageEvent(comp.Damage);
RaiseLocalEvent(owner, getDamageEvent, false);
RaiseLocalEvent(target, new AttackedEvent(args.Used, args.User, args.ClickLocation), true);
var modifiedDamage = DamageSpecifier.ApplyModifierSets(comp.Damage + hitEvent.BonusDamage, hitEvent.ModifiersList);
var modifiersList = getDamageEvent.ModifiersList;
modifiersList.AddRange(hitEvent.ModifiersList);
var modifiedDamage = DamageSpecifier.ApplyModifierSets(comp.Damage + hitEvent.BonusDamage + getDamageEvent.BonusDamage, modifiersList);
var damageResult = _damageable.TryChangeDamage(target, modifiedDamage);
if (damageResult != null && damageResult.Total > FixedPoint2.Zero)
@ -218,15 +232,19 @@ namespace Content.Server.Weapon.Melee
hitEntities.Add(entity);
}
}
// Raise event before doing damage so we can cancel damage if handled
// Raising a melee hit event which may handle combat for us
var hitEvent = new MeleeHitEvent(hitEntities, args.User, comp.Damage);
RaiseLocalEvent(owner, hitEvent, false);
SendAnimation(comp.Arc, angle, args.User, owner, hitEntities);
if (!hitEvent.Handled)
{
var modifiedDamage = DamageSpecifier.ApplyModifierSets(comp.Damage + hitEvent.BonusDamage, hitEvent.ModifiersList);
var getDamageEvent = new ItemMeleeDamageEvent(comp.Damage);
RaiseLocalEvent(owner, getDamageEvent, false);
var modifiersList = getDamageEvent.ModifiersList;
modifiersList.AddRange(hitEvent.ModifiersList);
var modifiedDamage = DamageSpecifier.ApplyModifierSets(comp.Damage + hitEvent.BonusDamage + getDamageEvent.BonusDamage, modifiersList);
var appliedDamage = new DamageSpecifier();
foreach (var entity in hitEntities)
@ -423,6 +441,33 @@ namespace Content.Server.Weapon.Melee
}
}
public sealed class ItemMeleeDamageEvent : HandledEntityEventArgs
{
/// <summary>
/// The base amount of damage dealt by the melee hit.
/// </summary>
public readonly DamageSpecifier BaseDamage = new();
/// <summary>
/// Modifier sets to apply to the damage when it's all said and done.
/// This should be modified by adding a new entry to the list.
/// </summary>
public List<DamageModifierSet> ModifiersList = new();
/// <summary>
/// Damage to add to the default melee weapon damage. Applied before modifiers.
/// </summary>
/// <remarks>
/// This might be required as damage modifier sets cannot add a new damage type to a DamageSpecifier.
/// </remarks>
public DamageSpecifier BonusDamage = new();
public ItemMeleeDamageEvent(DamageSpecifier baseDamage)
{
BaseDamage = baseDamage;
}
}
/// <summary>
/// Raised directed on the melee weapon entity used to attack something in combat mode,
/// whether through a click attack or wide attack.

4
Content.Server/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
View File

@ -5,7 +5,7 @@ namespace Content.Server.Wieldable.Components
[RegisterComponent, Access(typeof(WieldableSystem))]
public sealed class IncreaseDamageOnWieldComponent : Component
{
[DataField("modifiers", required: true)]
public DamageModifierSet Modifiers = default!;
[DataField("damage", required: true)]
public DamageSpecifier BonusDamage = default!;
}
}

6
Content.Server/Wieldable/WieldableSystem.cs
View File

@ -37,7 +37,7 @@ namespace Content.Server.Wieldable
SubscribeLocalEvent<WieldableComponent, GetVerbsEvent<InteractionVerb>>(AddToggleWieldVerb);
SubscribeLocalEvent<WieldableComponent, DisarmAttemptEvent>(OnDisarmAttemptEvent);
SubscribeLocalEvent<IncreaseDamageOnWieldComponent, MeleeHitEvent>(OnMeleeHit);
SubscribeLocalEvent<IncreaseDamageOnWieldComponent, ItemMeleeDamageEvent>(OnMeleeHit);
}
private void OnDisarmAttemptEvent(EntityUid uid, WieldableComponent component, DisarmAttemptEvent args)
@ -233,7 +233,7 @@ namespace Content.Server.Wieldable
AttemptUnwield(args.BlockingEntity, component, args.User);
}
private void OnMeleeHit(EntityUid uid, IncreaseDamageOnWieldComponent component, MeleeHitEvent args)
private void OnMeleeHit(EntityUid uid, IncreaseDamageOnWieldComponent component, ItemMeleeDamageEvent args)
{
if (EntityManager.TryGetComponent<WieldableComponent>(uid, out var wield))
{
@ -243,7 +243,7 @@ namespace Content.Server.Wieldable
if (args.Handled)
return;
args.ModifiersList.Add(component.Modifiers);
args.BonusDamage += component.BonusDamage;
}
}

7
Content.Shared/Damage/Systems/DamageableSystem.cs
View File

@ -41,8 +41,11 @@ namespace Content.Shared.Damage
foreach (var damage in damageSpecifier.DamageDict)
{
msg.PushNewline();
msg.AddMarkup(Loc.GetString("damage-value", ("type", damage.Key), ("amount", damage.Value)));
if (damage.Value != FixedPoint2.Zero)
{
msg.PushNewline();
msg.AddMarkup(Loc.GetString("damage-value", ("type", damage.Key), ("amount", damage.Value)));
}
}
return msg;

8
Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
View File

@ -74,10 +74,10 @@
Slash: 8
- type: Wieldable
- type: IncreaseDamageOnWield #they don't call it an axe for nothing
modifiers:
flatReductions:
Blunt: -2
Slash: -6
damage:
types:
Blunt: 2
Slash: 6
- type: entity
parent: BaseHandheldInstrument

2
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
View File

@ -58,6 +58,7 @@
description: 'A dark ink pen.'
components:
- type: EnergySword
secret: true
litDamageBonus:
types:
Slash: 7.5
@ -74,6 +75,7 @@
shader: unshaded
map: [ "blade" ]
- type: MeleeWeapon
hidden: true
damage:
types:
Blunt: 1

10
Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
View File

@ -20,11 +20,11 @@
Structural: 5
- type: Wieldable
- type: IncreaseDamageOnWield
modifiers:
flatReductions:
Blunt: -2 # negative reductions = increases
Slash: -8
Structural: -45
damage:
types:
Blunt: 2
Slash: 8
Structural: 45
- type: Item
size: 150
- type: Clothing

6
Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
View File

@ -45,9 +45,9 @@
maxTransferAmount: 5
- type: Wieldable
- type: IncreaseDamageOnWield
modifiers:
flatReductions:
Piercing: -7
damage:
types:
Piercing: 7
- type: Damageable
damageContainer: Inorganic
- type: Destructible