rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Нерф и фикс баннихопа

Browse source
This commit is contained in:
Vigers Ray 2025-01-06 23:48:07 +03:00
parent 4c9c6988b8
commit ee21d08199
4 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
View file

@ -16,7 +16,7 @@
VerticalAlignment="Bottom"
HorizontalAlignment="Center">
<SplitContainer Name="ScreenContainer" HorizontalExpand="True" VerticalExpand="True" SplitWidth="0" StretchDirection="TopLeft">
<LayoutContainer Name="ViewportContainer" HorizontalExpand="True" VerticalExpand="True">
<LayoutContainer Name="ViewportContainer" SizeFlagsStretchRatio="6" HorizontalExpand="True" VerticalExpand="True">
<controls:MainViewport Name="MainViewport"/>
<widgets:GhostGui Name="Ghost" Access="Protected" />
<inventory:InventoryGui Name="Inventory" Access="Protected"/>
@ -27,7 +27,7 @@
</BoxContainer>
<alerts:AlertsUI Name="Alerts" Access="Protected" />
</LayoutContainer>
<PanelContainer Name="SeparatedChatPanel" MinWidth="500"> <!-- Sunrise-Edit -->
<PanelContainer Name="SeparatedChatPanel" SizeFlagsStretchRatio="4" MinWidth="300"> <!-- Sunrise-Edit -->
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BackgroundColor="#2B2C3B" />
</PanelContainer.PanelOverride>

10
Content.Shared/_Sunrise/Jump/SharedJumpSystem.cs
View file

@ -1,10 +1,11 @@
using Content.Shared.Chat;
using Content.Shared.Chat.Prototypes;
using Content.Shared.Climbing.Systems;
using Content.Shared.Damage.Systems;
using Content.Shared.Gravity;
using Content.Shared.Mobs.Systems;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Systems;
using Content.Shared.Physics;
using Content.Shared.Standing;
using Content.Shared.StatusEffect;
@ -28,7 +29,6 @@ public abstract class SharedJumpSystem : EntitySystem
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
[Dependency] private readonly SharedGravitySystem _gravity = default!;
[Dependency] private readonly StaminaSystem _staminaSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly SharedStandingStateSystem _standingStateSystem = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
@ -37,6 +37,7 @@ public abstract class SharedJumpSystem : EntitySystem
[Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly ClimbSystem _climbSystem = default!;
[Dependency] private readonly PullingSystem _pullingSystem = default!;
private EntityQuery<PhysicsComponent> _physicsQuery;
private EntityQuery<FixturesComponent> _fixturesQuery;
@ -183,6 +184,9 @@ public abstract class SharedJumpSystem : EntitySystem
if (!BunnyHopEnable)
return;
if (TryComp<PullerComponent>(ent, out var pull) && _pullingSystem.IsPulling(ent, pull))
return;
var currentSpeed = body.LinearVelocity.Length();
if (currentSpeed < _bunnyHopMinSpeedThreshold)
@ -205,7 +209,7 @@ public abstract class SharedJumpSystem : EntitySystem
!_fixturesQuery.TryGetComponent(ent.Owner, out var fixtures))
return;
RemComp<CanMoveInAirComponent>(ent.Owner);
RemCompDeferred<CanMoveInAirComponent>(ent.Owner);
_physics.SetBodyStatus(ent.Owner, body, BodyStatus.OnGround);
foreach (var (id, fixture) in fixtures.Fixtures)
{

6
Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
View file

@ -337,16 +337,16 @@ public sealed class SunriseCCVars
CVarDef.Create("bunny_hop.enable", true, CVar.SERVER | CVar.REPLICATED);
public static readonly CVarDef<float> BunnyHopSpeedUpPerJump =
CVarDef.Create("bunny_hop.speed_up_per_jump", 0.01f, CVar.SERVER | CVar.REPLICATED);
CVarDef.Create("bunny_hop.speed_up_per_jump", 0.005f, CVar.SERVER | CVar.REPLICATED);
public static readonly CVarDef<float> BunnyHopSpeedLimit =
CVarDef.Create("bunny_hop.speed_limit", 3.0f, CVar.SERVER | CVar.REPLICATED);
CVarDef.Create("bunny_hop.speed_limit", 2.0f, CVar.SERVER | CVar.REPLICATED);
public static readonly CVarDef<float> BunnyHopMinSpeedThreshold =
CVarDef.Create("bunny_hop.min_speed_threshold", 4.0f, CVar.SERVER | CVar.REPLICATED);
public static readonly CVarDef<float> BunnyHopSpeedBoostWindow =
CVarDef.Create("bunny_hop.speed_boost_window", 0.620f, CVar.SERVER | CVar.REPLICATED);
CVarDef.Create("bunny_hop.speed_boost_window", 0.610f, CVar.SERVER | CVar.REPLICATED);
/**
* Flip

12
Resources/Changelog/ChangelogSunrise.yml
View file

@ -9815,3 +9815,15 @@
type: Tweak
id: 682
time: '2025-01-06T20:41:56.367578+00:00'
- author: VigersRay
changes:
- message: "\u041D\u0435\u0440\u0444 \u0431\u0430\u043D\u043D\u0438\u0445\u043E\u043F\
\u0430."
type: Tweak
- message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
\ \u0431\u0430\u043D\u0438\u0445\u043E\u043F\u0438\u0442\u044C \u0442\u0430\u0449\
\u0430 \u043E\u0431\u044C\u0435\u043A\u0442 \u0437\u0430 \u0441\u043E\u0431\u043E\
\u0439."
type: Fix
id: 683
time: '2025-01-06T20:47:56.149553+00:00'