juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes (#494)

Browse Source 
* minor loadout tweaks

* wooden counter

* fix parry predicting

* tables crafting simplify
This commit is contained in:
Ed
2024-10-16 17:32:41 +03:00
committed by GitHub
parent 5b4a7f6edc
commit ebca84d28f
16 changed files with 240 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeParrySystem.cs
View File

@@ -24,10 +24,10 @@ public sealed class CP14MeleeParrySystem : EntitySystem
base.Initialize();
SubscribeLocalEvent<CP14MeleeParryComponent, MeleeHitEvent>(OnMeleeHit);
SubscribeLocalEvent<CP14MeleeParriableComponent, AttemptMeleeEvent>(OnMeleeParriableHitAttmpt);
SubscribeLocalEvent<CP14MeleeParriableComponent, AttemptMeleeEvent>(OnMeleeParriableHitAttempt);
}
private void OnMeleeParriableHitAttmpt(Entity<CP14MeleeParriableComponent> ent, ref AttemptMeleeEvent args)
private void OnMeleeParriableHitAttempt(Entity<CP14MeleeParriableComponent> ent, ref AttemptMeleeEvent args)
{
ent.Comp.LastMeleeHit = _timing.CurTime;
}
@@ -57,7 +57,8 @@ public sealed class CP14MeleeParrySystem : EntitySystem
_hands.TryDrop(target, parriedWeapon);
_throwing.TryThrow(parriedWeapon, _random.NextAngle().ToWorldVec(), ent.Comp.ParryPower, target);
_popup.PopupPredicted( Loc.GetString("cp14-successful-parry"), args.User, args.User);
_audio.PlayPredicted(meleeParriable.ParrySound, parriedWeapon, args.User);
_popup.PopupEntity( Loc.GetString("cp14-successful-parry"), args.User, args.User);
_popup.PopupEntity( Loc.GetString("cp14-successful-parry"), args.HitEntities[0], args.HitEntities[0]);
_audio.PlayPvs(meleeParriable.ParrySound, parriedWeapon);
}
}