Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
pofitlo-Git committed Nov 25, 2024
1 parent a0e1528 commit 6d52602
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 25 deletions.
11 changes: 0 additions & 11 deletions Content.Server/Chat/ChatComponent.cs

This file was deleted.

6 changes: 2 additions & 4 deletions Content.Server/Chat/Systems/ChatSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -537,14 +537,12 @@ private void SendEntityWhisper(
continue;
listener = session.AttachedEntity.Value;

var listenerComp = CompOrNull<ChatComponent>(listener); //Corvax-Next-Resomi modifaer for whisper range

if (MessageRangeCheck(session, data, range) != MessageRangeCheckResult.Full)
continue; // Won't get logged to chat, and ghosts are too far away to see the pop-up, so we just won't send it to them.

if ((listenerComp != null && data.Range <= listenerComp.WhisperPersonalRange)
|| (listenerComp == null && data.Range <= WhisperClearRange)) //Corvax-Next-Resomi modifaer for whisper range
if (data.Range <= (TryComp<ChatModifierComponent>(listener, out var modifier) ? modifier.WhisperListeningRange : WhisperClearRange)) //Corvax-Next-Resomi
_chatManager.ChatMessageToOne(ChatChannel.Whisper, message, wrappedMessage, source, false, session.Channel);

//If listener is too far, they only hear fragments of the message
else if (_examineSystem.InRangeUnOccluded(source, listener, WhisperMuffledRange))
_chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedobfuscatedMessage, source, false, session.Channel);
Expand Down
10 changes: 10 additions & 0 deletions Content.Shared/Chat/ChatModifierComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace Content.Shared.Chat;
/// <summary>
/// Corvax-Next-Resomi
/// </summary>
[RegisterComponent]
public sealed partial class ChatModifierComponent : Component
{
[DataField("whisperListeningRange")]
public int WhisperListeningRange = SharedChatSystem.WhisperClearRange;
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ public override void Initialize()

private void DoJump(Entity<AgillitySkillComponent> ent, ref StartCollideEvent args)
{
if (!ent.Comp.Active || !ent.Comp.JumpEnabled
|| args.OurFixture.CollisionMask != BaseCollisionGroup
|| args.OtherFixture.CollisionMask != (int)CollisionGroup.TableMask) //fix it.... maybe.... -_-.... or idk
if (!ent.Comp.Active || !ent.Comp.JumpEnabled)
return;
if (args.OurFixture.CollisionMask != BaseCollisionGroup)
return;
if (args.OtherFixture.CollisionMask != (int)CollisionGroup.TableMask)
return;

_stamina.TryTakeStamina(ent.Owner, ent.Comp.StaminaDamageOnJump);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ namespace Content.Shared._CorvaxNext.Resomi.Abilities;

/// <summary>
/// It does not allow you to fire a weapon that requires two hands.
/// increases the spread, as if shooting was conducted from one hand
/// Increases the spread, as if shooting was conducted from one hand.
/// </summary>
[RegisterComponent]
public sealed partial class WeaponsUseInabilityComponent : Component
{
}
public sealed partial class WeaponsUseInabilityComponent : Component;
3 changes: 2 additions & 1 deletion Resources/Locale/ru-RU/species/species.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ species-name-moth = Ниан
species-name-skeleton = Скелет
species-name-vox = Вокс
snail-hurt-by-salt-popup = Солевой раствор жжёт как кислота!
#CorvaxNext
# Corvax-Next-Resomi-Start
species-name-resomi = Резоми
# Corvax-Next-Resomi-End
4 changes: 2 additions & 2 deletions Resources/Prototypes/_CorvaxNext/Entities/Species/resomi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
components:
- type: WeaponsUseInability
- type: AgillitySkill
- type: Chat
whisperPersonalRange: 4
- type: ChatModifier
whisperListeningRange: 4
- type: ResomiAccent
- type: FootprintVisualizer
- type: DamageVisuals
Expand Down

0 comments on commit 6d52602

Please sign in to comment.