From 9e845da1bbc5f669d2ffe13c7f002b5684344da4 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 19 Oct 2024 20:12:36 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/escape-menu/ui/options-menu.ftl | 1 + Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index b03439ad11..0ed7962815 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -175,6 +175,7 @@ ui-options-function-open-crafting-menu = Open crafting menu ui-options-function-open-inventory-menu = Open inventory ui-options-function-open-a-help = Open admin help ui-options-function-open-abilities-menu = Open action menu +ui-options-function-open-emotes-menu = Open emotes menu ui-options-function-toggle-round-end-summary-window = Toggle round end summary window ui-options-function-open-entity-spawn-window = Open entity spawn menu ui-options-function-open-sandbox-window = Open sandbox menu diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl index f47019e5ec..d73ad715d8 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl @@ -75,6 +75,7 @@ ui-options-hud-theme-clockwork = Механизм ui-options-hud-theme-retro = Ретро ui-options-hud-theme-minimalist = Минимализм ui-options-hud-theme-eris = Эрис +ui-options-hud-theme-ashen = Пепельный ui-options-vp-stretch = Растянуть изображение для соответствия окну игры ui-options-vp-scale = Фиксированный масштаб окна игры: x{ $scale } ui-options-vp-integer-scaling = Предпочитать целочисленное масштабирование (может привести к появлению черных полос / отсечению) @@ -83,6 +84,10 @@ ui-options-vp-integer-scaling-tooltip = целочисленного значения в конкретных разрешениях экрана. Хотя в результате получается четкая текстура, также часто черные полосы могут появиться в верхней/нижней части экрана. +ui-options-vp-vertical-fit = Вертикальная подгонка области просмотра +ui-options-vp-vertical-fit-tooltip = Если включено, основная область просмотра будет полностью игнорировать горизонтальную + ось при подгонке под ваш экран. Если ваш экран меньше области просмотра, то это + приведет к обрезанию области просмотра по горизонтальной оси. ui-options-vp-low-res = Изображение низкого разрешения ui-options-parallax-low-quality = Низкокачественный параллакс (фон) ui-options-fps-counter = Показать счетчик FPS @@ -175,6 +180,8 @@ ui-options-function-open-crafting-menu = Открыть меню строите ui-options-function-open-inventory-menu = Открыть снаряжение ui-options-function-open-a-help = Открыть админ помощь ui-options-function-open-abilities-menu = Открыть меню действий +ui-options-function-open-emotes-menu = Открыть меню эмоций +ui-options-function-toggle-round-end-summary-window = Открыть итоги раунда ui-options-function-open-entity-spawn-window = Открыть меню спавна сущностей ui-options-function-open-sandbox-window = Открыть меню песочницы ui-options-function-open-tile-spawn-window = Открыть меню спавна тайлов From 57a7d97688bbc6775df0b939015d8883c7516756 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Mon, 23 Dec 2024 23:42:53 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=BE=D1=82=D0=B5=D1=80=D1=8F=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B7=D0=B3=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BA=D0=BB?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=BA=20-=20=D0=B3=D0=B0=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_White/AuthPanel/AuthPanelSystem.cs | 31 ++++++++++--------- .../ERTRecruitment/ERTRecruitmentRule.cs | 23 +++++++++++--- .../GhostRecruitmentSystem.cs | 3 +- .../Prototypes/_White/event_prototypes.yml | 2 +- 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/Content.Server/_White/AuthPanel/AuthPanelSystem.cs b/Content.Server/_White/AuthPanel/AuthPanelSystem.cs index adbe272363..73822ad222 100644 --- a/Content.Server/_White/AuthPanel/AuthPanelSystem.cs +++ b/Content.Server/_White/AuthPanel/AuthPanelSystem.cs @@ -33,13 +33,15 @@ public sealed class AuthPanelSystem : EntitySystem public static int MaxCount = 2; + public static int RandomAcceptRate = 8; + private TimeSpan? _delay; public override void Initialize() { - SubscribeLocalEvent(OnButtonPressed); - SubscribeLocalEvent(OnPerformAction); - SubscribeLocalEvent(OnReason); + SubscribeLocalEvent(OnButtonPressed); + SubscribeLocalEvent(OnPerformAction); + SubscribeLocalEvent(OnReason); SubscribeLocalEvent(OnRestart); } @@ -61,7 +63,7 @@ public sealed class AuthPanelSystem : EntitySystem { if (args.Action is AuthPanelAction.ERTRecruit) { - if (_random.Next(10) < 2) + if (_random.Next(10) < RandomAcceptRate) { _gameTicker.AddGameRule(ERTRecruitmentRuleComponent.EventName); } @@ -71,6 +73,7 @@ public sealed class AuthPanelSystem : EntitySystem if (station != null) _ert.DeclineERT(station.Value); + _adminLogger.Add(LogType.EventStarted, LogImpact.High, $"ERT Declined - due to random"); } foreach (var entities in Counter.Values) @@ -91,7 +94,7 @@ public sealed class AuthPanelSystem : EntitySystem if (!access.Contains("Command")) { _popup.PopupEntity(Loc.GetString("auth-panel-no-access"), - args.Actor,args.Actor); + args.Actor, args.Actor); return; } @@ -112,22 +115,22 @@ public sealed class AuthPanelSystem : EntitySystem if (!Counter.TryGetValue(args.Button, out var hashSet)) { hashSet = new HashSet(); - Counter.Add(args.Button,hashSet); + Counter.Add(args.Button, hashSet); } - if(hashSet.Count == MaxCount) + if (hashSet.Count == MaxCount) return; if (!CardIndexes.TryGetValue(args.Button, out var cardSet)) { cardSet = new HashSet(); - CardIndexes.Add(args.Button,cardSet); + CardIndexes.Add(args.Button, cardSet); } if (cardSet.Contains(access.Count)) { _popup.PopupEntity(Loc.GetString("auth-panel-used-ID"), - args.Actor,args.Actor); + args.Actor, args.Actor); return; } @@ -148,19 +151,19 @@ public sealed class AuthPanelSystem : EntitySystem if (hashSet.Count == MaxCount) { var ev = new AuthPanelPerformActionEvent(args.Button); - RaiseLocalEvent(uid,ev); + RaiseLocalEvent(uid, ev); } } public void UpdateUserInterface(AuthPanelAction rawaction) { - if(!Counter.TryGetValue(rawaction,out var hashSet)) + if (!Counter.TryGetValue(rawaction, out var hashSet)) return; - var action = new AuthPanelConfirmationAction(rawaction, hashSet.Count, MaxCount,Reason); + var action = new AuthPanelConfirmationAction(rawaction, hashSet.Count, MaxCount, Reason); var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid,out _)) + while (query.MoveNext(out var uid, out _)) { if (!_ui.HasUi(uid, AuthPanelUiKey.Key)) return; @@ -168,7 +171,7 @@ public sealed class AuthPanelSystem : EntitySystem var state = new AuthPanelConfirmationActionState(action); _ui.SetUiState(uid, AuthPanelUiKey.Key, state); - _appearance.SetData(uid,AuthPanelVisualLayers.Confirm,true); + _appearance.SetData(uid, AuthPanelVisualLayers.Confirm, true); } } diff --git a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs index 67aa919416..f493c36b1c 100644 --- a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs +++ b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs @@ -7,6 +7,8 @@ using Content.Server.GameTicking.Rules.Components; using Content.Server.StationEvents.Events; using Content.Server._White.GhostRecruitment; using Content.Server.GameTicking.Components; +using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared._White; using Content.Shared._White.GhostRecruitment; using JetBrains.Annotations; @@ -29,6 +31,7 @@ public sealed class ERTRecruitmentRule : StationEventSystem(); - var check1 = component.IsBlocked; + var check1 = component.IsBlocked || ertsys.IsDisabled; var check2 = _recruitment.GetAllRecruited(ERTRecruitmentRuleComponent.EventName).Count() < component.MinPlayer; - if (check1 || check2) + if (check1) { if (component.TargetStation != null) DeclineERT(component.TargetStation.Value); + _adminLogger.Add(LogType.EventStarted, LogImpact.High, $"ERT Declined - Event disabled"); + _recruitment.Cleanup(ERTRecruitmentRuleComponent.EventName); + return; + } + if (check2) + { + if (component.TargetStation != null) + DeclineERT(component.TargetStation.Value); + _adminLogger.Add(LogType.EventStarted, LogImpact.High, $"ERT Declined - Not enough ghosts willing to play ERT"); _recruitment.Cleanup(ERTRecruitmentRuleComponent.EventName); return; } @@ -127,7 +141,6 @@ public sealed class ERTRecruitmentRule : StationEventSystem(); ertsys.IsDisabled = true; } diff --git a/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs b/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs index 2564b3c533..a7ed4e92a6 100644 --- a/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs +++ b/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs @@ -63,8 +63,7 @@ public sealed class GhostRecruitmentSystem : EntitySystem var count = 0; - //var maxCount = Math.Max(3, _playerManager.PlayerCount / 8); - var maxCount = 1; + var maxCount = Math.Max(3, _playerManager.PlayerCount / 8); var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var ghostRecruitedComponent)) diff --git a/Resources/Prototypes/_White/event_prototypes.yml b/Resources/Prototypes/_White/event_prototypes.yml index 1cdb0b0c01..7f403f51d8 100644 --- a/Resources/Prototypes/_White/event_prototypes.yml +++ b/Resources/Prototypes/_White/event_prototypes.yml @@ -5,7 +5,7 @@ components: - type: StationEvent weight: 0 - duration: 20 + duration: 30 - type: ERTRecruitmentRule minPlayer: 4 earliestStart: 30 From db9a16b9aaa3a69f5517bab7b6376ed1467c5a14 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Wed, 25 Dec 2024 12:52:39 +0300 Subject: [PATCH 3/3] Update pistols.yml --- .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 37bc46f623..49a65828d6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -260,7 +260,7 @@ startingItem: MagazinePistolRubber insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 + priority: 4 whitelist: tags: - MagazinePistol