From cc60c74ffb0e1692a5d764d466aa41e5c2830c9f Mon Sep 17 00:00:00 2001 From: mam0nt222 <142056810+mam0nt222@users.noreply.github.com> Date: Sat, 11 Jan 2025 21:20:22 +0500 Subject: [PATCH 1/3] Gamemode: Planetary Warfare Not all --- Content.Server/_WH14K/Altar/AltarComponent.cs | 11 ++ Content.Server/_WH14K/Altar/AltarSystem.cs | 18 +++ .../PlanetaryWarfare/IGCommandComponent.cs | 9 ++ .../PlanetaryWarfareRuleComponent.cs | 18 +++ .../PlanetaryWarfareRuleSystem.cs | 135 ++++++++++++++++++ .../_WH14K/WarpShtorm/WarpShtormComponent.cs | 8 ++ .../_WH14K/WarpShtorm/WarpShtormSystem.cs | 17 +++ Resources/Locale/en-US/_WH14K/pw.ftl | 11 ++ .../_WH14K/GameRules/roundstart.yml | 5 + Resources/Prototypes/_WH14K/game_presets.yml | 7 + 10 files changed, 239 insertions(+) create mode 100644 Content.Server/_WH14K/Altar/AltarComponent.cs create mode 100644 Content.Server/_WH14K/Altar/AltarSystem.cs create mode 100644 Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/IGCommandComponent.cs create mode 100644 Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleComponent.cs create mode 100644 Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleSystem.cs create mode 100644 Content.Server/_WH14K/WarpShtorm/WarpShtormComponent.cs create mode 100644 Content.Server/_WH14K/WarpShtorm/WarpShtormSystem.cs create mode 100644 Resources/Locale/en-US/_WH14K/pw.ftl create mode 100644 Resources/Prototypes/_WH14K/GameRules/roundstart.yml create mode 100644 Resources/Prototypes/_WH14K/game_presets.yml diff --git a/Content.Server/_WH14K/Altar/AltarComponent.cs b/Content.Server/_WH14K/Altar/AltarComponent.cs new file mode 100644 index 00000000000..d15ae2c5bec --- /dev/null +++ b/Content.Server/_WH14K/Altar/AltarComponent.cs @@ -0,0 +1,11 @@ + + +namespace Content.Server._WH14K.Altar; + +[RegisterComponent] +public sealed partial class AltarComponent : Component +{ + // TODO: Это бред полнейший, нужно переделать как-нибудь + [DataField] + public bool Exploded = false; +} diff --git a/Content.Server/_WH14K/Altar/AltarSystem.cs b/Content.Server/_WH14K/Altar/AltarSystem.cs new file mode 100644 index 00000000000..a54f1b761d1 --- /dev/null +++ b/Content.Server/_WH14K/Altar/AltarSystem.cs @@ -0,0 +1,18 @@ +using Content.Server._WH14K.GameTicking.Rules; + +namespace Content.Server._WH14K.Altar; + +public sealed partial class AltarSystem : EntitySystem +{ + [Dependency] private readonly PlanetaryWarfareRuleSystem _pw = default!; + public override void Initialize() + { + base.Initialize(); + } + + public void AltarExploded(AltarComponent component) + { + component.Exploded = true; + _pw.CheckRoundShouldEnd(); + } +} diff --git a/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/IGCommandComponent.cs b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/IGCommandComponent.cs new file mode 100644 index 00000000000..1a194adb278 --- /dev/null +++ b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/IGCommandComponent.cs @@ -0,0 +1,9 @@ + + +namespace Content.Server._WH14K.GameTicking.Rules; + +[RegisterComponent] +public sealed partial class IGCommandComponent : Component +{ + +} diff --git a/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleComponent.cs b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleComponent.cs new file mode 100644 index 00000000000..a4a70cc3f03 --- /dev/null +++ b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleComponent.cs @@ -0,0 +1,18 @@ + + +namespace Content.Server._WH14K.GameTicking.Rules; + +[RegisterComponent, Access(typeof(PlanetaryWarfareRuleSystem))] +public sealed partial class PlanetaryWarfareRuleComponent : Component +{ + [DataField] + public WinTypePW WinTypePW = WinTypePW.Neutral; +} + +public enum WinTypePW : byte +{ + AllCommandDead, + WarpShtormSummoned, + Neutral, + AllAltarExploded +} diff --git a/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleSystem.cs b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleSystem.cs new file mode 100644 index 00000000000..d01b2a72962 --- /dev/null +++ b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleSystem.cs @@ -0,0 +1,135 @@ +using Content.Server.Antag; +using Content.Server.Communications; +using Content.Server.GameTicking; +using Content.Server.GameTicking.Rules; +using Content.Server.RoundEnd; +using Content.Server.GameTicking.Rules.Components; +using Content.Server.Popups; +using Content.Server._WH14K.WarpShtorm; +using Content.Server._WH14K.Altar; +using Content.Shared.Mobs; +using Content.Shared.Mobs.Components; +using Content.Shared.GameTicking.Components; +using Robust.Shared.Utility; +using Robust.Shared.Map.Components; +using Content.Shared.Mind; +using Robust.Server.Player; + +namespace Content.Server._WH14K.GameTicking.Rules; + +public sealed partial class PlanetaryWarfareRuleSystem : GameRuleSystem +{ + [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; + [Dependency] private readonly IPlayerManager _player = default!; + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnComponentRemove); + SubscribeLocalEvent(OnMobStateChanged); + } + + protected override void AppendRoundEndText(EntityUid uid, PlanetaryWarfareRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent args) + { + if (component.WinTypePW == WinTypePW.WarpShtormSummoned || component.WinTypePW == WinTypePW.AllCommandDead) + args.AddLine(Loc.GetString("pw-chaos-win")); + + else if (component.WinTypePW == WinTypePW.AllAltarExploded) + args.AddLine(Loc.GetString("pw-ig-win")); + + if (component.WinTypePW == WinTypePW.AllCommandDead) + args.AddLine(Loc.GetString("pw-all-command-dead-desc")); + + else if (component.WinTypePW == WinTypePW.AllAltarExploded) + args.AddLine(Loc.GetString("pw-all-altars-exploded-desc")); + + else if (component.WinTypePW == WinTypePW.WarpShtormSummoned) + args.AddLine(Loc.GetString("pw-all-warp-shtorm-summoned-desc")); + + var IG = EntityQuery(true); + foreach (var i in IG) + { + if (i.Item2 == null || i.Item2.CharacterName == null || i.Item2.OriginalOwnerUserId == null ) + return; + + _player.TryGetPlayerData(i.Item2.OriginalOwnerUserId.Value, out var data); + + if (data == null) + return; + args.AddLine(Loc.GetString("ig-command-list-start")); + + args.AddLine(Loc.GetString("ig-command-list-name-user", ("name", i.Item2.CharacterName), ("user", data.UserName))); + } + } + + private void OnComponentRemove(EntityUid uid, IGCommandComponent component, ComponentRemove args) + { + CheckRoundShouldEnd(); + } + + private void OnMobStateChanged(EntityUid uid, IGCommandComponent component, MobStateChangedEvent ev) + { + if (ev.NewMobState == MobState.Dead) + CheckRoundShouldEnd(); + } + + public void CheckRoundShouldEnd() + { + var query = QueryActiveRules(); + while (query.MoveNext(out var uid, out _, out var pw, out _)) + { + AllCommandDead((uid, pw)); + AllAltarExploded((uid, pw)); + OnWarpShtormSummoned((uid, pw)); + } + } + + private void AllCommandDead(Entity ent) + { + var IG = EntityQuery(true); + + foreach (var i in IG) + { + if (i.Item2.CurrentState == MobState.Alive) + { + return; + } + } + + ent.Comp.WinTypePW = WinTypePW.AllCommandDead; + _roundEndSystem.EndRound(); + } + + private void AllAltarExploded(Entity ent) + { + var Altar = EntityQuery(true); + + foreach (var a in Altar) + { + if (!a.Exploded) + { + return; + } + } + + ent.Comp.WinTypePW = WinTypePW.AllAltarExploded; + _roundEndSystem.EndRound(); + } + + private void OnWarpShtormSummoned(Entity ent) + { + var WarpShtorm = EntityQuery(); + foreach (var ws in WarpShtorm) + { + var mapQuery = EntityQueryEnumerator(); + while (mapQuery.MoveNext(out var uid, out var map)) + { + map.AmbientLightColor = Color.FromHex("#e82a2a"); + Dirty(uid, map); + } + + ent.Comp.WinTypePW = WinTypePW.WarpShtormSummoned; + _roundEndSystem.EndRound(); + } + } +} diff --git a/Content.Server/_WH14K/WarpShtorm/WarpShtormComponent.cs b/Content.Server/_WH14K/WarpShtorm/WarpShtormComponent.cs new file mode 100644 index 00000000000..475f3bf9111 --- /dev/null +++ b/Content.Server/_WH14K/WarpShtorm/WarpShtormComponent.cs @@ -0,0 +1,8 @@ + + +namespace Content.Server._WH14K.WarpShtorm; + +[RegisterComponent] +public sealed partial class WarpShtormComponent : Component +{ +} diff --git a/Content.Server/_WH14K/WarpShtorm/WarpShtormSystem.cs b/Content.Server/_WH14K/WarpShtorm/WarpShtormSystem.cs new file mode 100644 index 00000000000..7ed12f1c3e3 --- /dev/null +++ b/Content.Server/_WH14K/WarpShtorm/WarpShtormSystem.cs @@ -0,0 +1,17 @@ +using Content.Server._WH14K.GameTicking.Rules; + +namespace Content.Server._WH14K.WarpShtorm; + +public sealed partial class WarpShtormSystem : EntitySystem +{ + [Dependency] private readonly PlanetaryWarfareRuleSystem _pw = default!; + public override void Initialize() + { + base.Initialize(); + } + + private void Summon() + { + _pw.CheckRoundShouldEnd(); + } +} diff --git a/Resources/Locale/en-US/_WH14K/pw.ftl b/Resources/Locale/en-US/_WH14K/pw.ftl new file mode 100644 index 00000000000..6f00ce76d2f --- /dev/null +++ b/Resources/Locale/en-US/_WH14K/pw.ftl @@ -0,0 +1,11 @@ +pw-title = Планетарное Сражение +pw-description = режим + +pw-ig-win = [color=gold][font size=16][bold]Победа Империума[/bold][/font][/color] +pw-chaos-win = [color=#9B2D30][font size=16][bold]Победа Хаоса[/bold][/font][/color] + +pw-all-command-dead-desc = Хаос смог захватить крейсер Имперской Гвардии, что вкупе с орудиями планетарной обороны позволит еретикам укрепить свое влияние в секторе. +pw-all-altars-exploded-desc = Силы Империума сумели уничтожить все алтари Темных Богов, предотвратив Варп-Шторм. Это спасло миллиарды жизней, но это только одна из тысяч планет под угрозой. +pw-all-warp-shtorm-summoned-desc = Катастрофа космического масштаба, разразившаяся в центре этой планеты, погубила триллионы жизней + +ig-command-list-start = Командирами Империума были: diff --git a/Resources/Prototypes/_WH14K/GameRules/roundstart.yml b/Resources/Prototypes/_WH14K/GameRules/roundstart.yml new file mode 100644 index 00000000000..0157f2f961b --- /dev/null +++ b/Resources/Prototypes/_WH14K/GameRules/roundstart.yml @@ -0,0 +1,5 @@ +- type: entity + parent: BaseGameRule + id: PlanetaryWarfareRule + components: + - type: PlanetaryWarfareRule diff --git a/Resources/Prototypes/_WH14K/game_presets.yml b/Resources/Prototypes/_WH14K/game_presets.yml new file mode 100644 index 00000000000..010a055ed51 --- /dev/null +++ b/Resources/Prototypes/_WH14K/game_presets.yml @@ -0,0 +1,7 @@ +- type: gamePreset + id: PlanetaryWarfare + name: pw-title + showInVote: true + description: pw-description + rules: + - PlanetaryWarfareRule From 03494580d0dd77b9d431836b94d6f3f6a56505cd Mon Sep 17 00:00:00 2001 From: mam0nt222 <142056810+mam0nt222@users.noreply.github.com> Date: Sun, 12 Jan 2025 18:02:46 +0500 Subject: [PATCH 2/3] fix for PR --- Content.Server/_WH14K/Altar/AltarComponent.cs | 2 +- Content.Server/_WH14K/Altar/AltarSystem.cs | 2 +- ...mandComponent.cs => CommandIGComponent.cs} | 4 +- .../PlanetaryWarfareRuleComponent.cs | 4 +- .../PlanetaryWarfareRuleSystem.cs | 71 ++++++++++--------- ...tormComponent.cs => WarpStormComponent.cs} | 4 +- ...WarpShtormSystem.cs => WarpStormSystem.cs} | 2 +- Resources/Locale/en-US/_WH14K/pw.ftl | 2 +- 8 files changed, 44 insertions(+), 47 deletions(-) rename Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/{IGCommandComponent.cs => CommandIGComponent.cs} (55%) rename Content.Server/_WH14K/WarpShtorm/{WarpShtormComponent.cs => WarpStormComponent.cs} (52%) rename Content.Server/_WH14K/WarpShtorm/{WarpShtormSystem.cs => WarpStormSystem.cs} (84%) diff --git a/Content.Server/_WH14K/Altar/AltarComponent.cs b/Content.Server/_WH14K/Altar/AltarComponent.cs index d15ae2c5bec..f21948a5278 100644 --- a/Content.Server/_WH14K/Altar/AltarComponent.cs +++ b/Content.Server/_WH14K/Altar/AltarComponent.cs @@ -5,7 +5,7 @@ namespace Content.Server._WH14K.Altar; [RegisterComponent] public sealed partial class AltarComponent : Component { - // TODO: Это бред полнейший, нужно переделать как-нибудь + // TODO: this is shit, remake it soon [DataField] public bool Exploded = false; } diff --git a/Content.Server/_WH14K/Altar/AltarSystem.cs b/Content.Server/_WH14K/Altar/AltarSystem.cs index a54f1b761d1..b43a98398b0 100644 --- a/Content.Server/_WH14K/Altar/AltarSystem.cs +++ b/Content.Server/_WH14K/Altar/AltarSystem.cs @@ -10,7 +10,7 @@ public override void Initialize() base.Initialize(); } - public void AltarExploded(AltarComponent component) + private void AltarExploded(AltarComponent component) { component.Exploded = true; _pw.CheckRoundShouldEnd(); diff --git a/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/IGCommandComponent.cs b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/CommandIGComponent.cs similarity index 55% rename from Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/IGCommandComponent.cs rename to Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/CommandIGComponent.cs index 1a194adb278..5cbb07d31dc 100644 --- a/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/IGCommandComponent.cs +++ b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/CommandIGComponent.cs @@ -1,9 +1,7 @@ - - namespace Content.Server._WH14K.GameTicking.Rules; [RegisterComponent] -public sealed partial class IGCommandComponent : Component +public sealed partial class CommandIGComponent : Component { } diff --git a/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleComponent.cs b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleComponent.cs index a4a70cc3f03..927f971fb6a 100644 --- a/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleComponent.cs +++ b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleComponent.cs @@ -1,5 +1,3 @@ - - namespace Content.Server._WH14K.GameTicking.Rules; [RegisterComponent, Access(typeof(PlanetaryWarfareRuleSystem))] @@ -12,7 +10,7 @@ public sealed partial class PlanetaryWarfareRuleComponent : Component public enum WinTypePW : byte { AllCommandDead, - WarpShtormSummoned, + WarpStormSummoned, Neutral, AllAltarExploded } diff --git a/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleSystem.cs b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleSystem.cs index d01b2a72962..63a0ee95126 100644 --- a/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleSystem.cs +++ b/Content.Server/_WH14K/GameTicking/Rules/PlanetaryWarfare/PlanetaryWarfareRuleSystem.cs @@ -25,49 +25,52 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnComponentRemove); - SubscribeLocalEvent(OnMobStateChanged); + SubscribeLocalEvent(OnComponentRemove); + SubscribeLocalEvent(OnMobStateChanged); } protected override void AppendRoundEndText(EntityUid uid, PlanetaryWarfareRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent args) { - if (component.WinTypePW == WinTypePW.WarpShtormSummoned || component.WinTypePW == WinTypePW.AllCommandDead) - args.AddLine(Loc.GetString("pw-chaos-win")); - - else if (component.WinTypePW == WinTypePW.AllAltarExploded) - args.AddLine(Loc.GetString("pw-ig-win")); - - if (component.WinTypePW == WinTypePW.AllCommandDead) - args.AddLine(Loc.GetString("pw-all-command-dead-desc")); - - else if (component.WinTypePW == WinTypePW.AllAltarExploded) - args.AddLine(Loc.GetString("pw-all-altars-exploded-desc")); - - else if (component.WinTypePW == WinTypePW.WarpShtormSummoned) - args.AddLine(Loc.GetString("pw-all-warp-shtorm-summoned-desc")); + switch (component.WinTypePW) + { + case WinTypePW.WarpStormSummoned: + args.AddLine(Loc.GetString("pw-chaos-win")); + args.AddLine(Loc.GetString("pw-warp-storm-summoned-desc")); + break; + case WinTypePW.AllCommandDead: + args.AddLine(Loc.GetString("pw-chaos-win")); + args.AddLine(Loc.GetString("pw-all-command-dead-desc")); + break; + case WinTypePW.AllAltarExploded: + args.AddLine(Loc.GetString("pw-ig-win")); + args.AddLine(Loc.GetString("pw-all-altars-exploded-desc")); + break; + default: + break; + } - var IG = EntityQuery(true); - foreach (var i in IG) + var igCommand = EntityQuery(true); + foreach (var (ig, mind) in igCommand) { - if (i.Item2 == null || i.Item2.CharacterName == null || i.Item2.OriginalOwnerUserId == null ) + if (mind is null || mind.CharacterName is null || mind.OriginalOwnerUserId is null) return; - _player.TryGetPlayerData(i.Item2.OriginalOwnerUserId.Value, out var data); + _player.TryGetPlayerData(mind.OriginalOwnerUserId.Value, out var data); if (data == null) return; args.AddLine(Loc.GetString("ig-command-list-start")); - args.AddLine(Loc.GetString("ig-command-list-name-user", ("name", i.Item2.CharacterName), ("user", data.UserName))); + args.AddLine(Loc.GetString("ig-command-list-name-user", ("name", mind.CharacterName), ("user", data.UserName))); } } - private void OnComponentRemove(EntityUid uid, IGCommandComponent component, ComponentRemove args) + private void OnComponentRemove(EntityUid uid, CommandIGComponent component, ComponentRemove args) { CheckRoundShouldEnd(); } - private void OnMobStateChanged(EntityUid uid, IGCommandComponent component, MobStateChangedEvent ev) + private void OnMobStateChanged(EntityUid uid, CommandIGComponent component, MobStateChangedEvent ev) { if (ev.NewMobState == MobState.Dead) CheckRoundShouldEnd(); @@ -78,19 +81,19 @@ public void CheckRoundShouldEnd() var query = QueryActiveRules(); while (query.MoveNext(out var uid, out _, out var pw, out _)) { + WarpStormSummoned((uid, pw)); AllCommandDead((uid, pw)); AllAltarExploded((uid, pw)); - OnWarpShtormSummoned((uid, pw)); } } private void AllCommandDead(Entity ent) { - var IG = EntityQuery(true); + var igCommand = EntityQuery(true); - foreach (var i in IG) + foreach (var (ig, igMobState) in igCommand) { - if (i.Item2.CurrentState == MobState.Alive) + if (igMobState.CurrentState == MobState.Alive) { return; } @@ -102,11 +105,11 @@ private void AllCommandDead(Entity ent) private void AllAltarExploded(Entity ent) { - var Altar = EntityQuery(true); + var altars = EntityQuery(true); - foreach (var a in Altar) + foreach (var altar in altars) { - if (!a.Exploded) + if (!altar.Exploded) { return; } @@ -116,10 +119,10 @@ private void AllAltarExploded(Entity ent) _roundEndSystem.EndRound(); } - private void OnWarpShtormSummoned(Entity ent) + private void WarpStormSummoned(Entity ent) { - var WarpShtorm = EntityQuery(); - foreach (var ws in WarpShtorm) + var warpStorms = EntityQuery(); + foreach (var warpStorm in warpStorms) { var mapQuery = EntityQueryEnumerator(); while (mapQuery.MoveNext(out var uid, out var map)) @@ -128,7 +131,7 @@ private void OnWarpShtormSummoned(Entity ent) Dirty(uid, map); } - ent.Comp.WinTypePW = WinTypePW.WarpShtormSummoned; + ent.Comp.WinTypePW = WinTypePW.WarpStormSummoned; _roundEndSystem.EndRound(); } } diff --git a/Content.Server/_WH14K/WarpShtorm/WarpShtormComponent.cs b/Content.Server/_WH14K/WarpShtorm/WarpStormComponent.cs similarity index 52% rename from Content.Server/_WH14K/WarpShtorm/WarpShtormComponent.cs rename to Content.Server/_WH14K/WarpShtorm/WarpStormComponent.cs index 475f3bf9111..28c9e4b617c 100644 --- a/Content.Server/_WH14K/WarpShtorm/WarpShtormComponent.cs +++ b/Content.Server/_WH14K/WarpShtorm/WarpStormComponent.cs @@ -1,8 +1,6 @@ - - namespace Content.Server._WH14K.WarpShtorm; [RegisterComponent] -public sealed partial class WarpShtormComponent : Component +public sealed partial class WarpStormComponent : Component { } diff --git a/Content.Server/_WH14K/WarpShtorm/WarpShtormSystem.cs b/Content.Server/_WH14K/WarpShtorm/WarpStormSystem.cs similarity index 84% rename from Content.Server/_WH14K/WarpShtorm/WarpShtormSystem.cs rename to Content.Server/_WH14K/WarpShtorm/WarpStormSystem.cs index 7ed12f1c3e3..3ec035b4b65 100644 --- a/Content.Server/_WH14K/WarpShtorm/WarpShtormSystem.cs +++ b/Content.Server/_WH14K/WarpShtorm/WarpStormSystem.cs @@ -2,7 +2,7 @@ namespace Content.Server._WH14K.WarpShtorm; -public sealed partial class WarpShtormSystem : EntitySystem +public sealed partial class WarpStormSystem : EntitySystem { [Dependency] private readonly PlanetaryWarfareRuleSystem _pw = default!; public override void Initialize() diff --git a/Resources/Locale/en-US/_WH14K/pw.ftl b/Resources/Locale/en-US/_WH14K/pw.ftl index 6f00ce76d2f..43b6e2c1cc0 100644 --- a/Resources/Locale/en-US/_WH14K/pw.ftl +++ b/Resources/Locale/en-US/_WH14K/pw.ftl @@ -6,6 +6,6 @@ pw-chaos-win = [color=#9B2D30][font size=16][bold]Победа Хаоса[/bold] pw-all-command-dead-desc = Хаос смог захватить крейсер Имперской Гвардии, что вкупе с орудиями планетарной обороны позволит еретикам укрепить свое влияние в секторе. pw-all-altars-exploded-desc = Силы Империума сумели уничтожить все алтари Темных Богов, предотвратив Варп-Шторм. Это спасло миллиарды жизней, но это только одна из тысяч планет под угрозой. -pw-all-warp-shtorm-summoned-desc = Катастрофа космического масштаба, разразившаяся в центре этой планеты, погубила триллионы жизней +pw-warp-storm-summoned-desc = Катастрофа космического масштаба, разразившаяся в центре этой планеты, погубила триллионы жизней ig-command-list-start = Командирами Империума были: From f12afd818e08afc1f4303e7380305e017a137de8 Mon Sep 17 00:00:00 2001 From: mam0nt222 <142056810+mam0nt222@users.noreply.github.com> Date: Sun, 12 Jan 2025 18:11:11 +0500 Subject: [PATCH 3/3] fucking space's in AltarComponent.cs --- Content.Server/_WH14K/Altar/AltarComponent.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Content.Server/_WH14K/Altar/AltarComponent.cs b/Content.Server/_WH14K/Altar/AltarComponent.cs index f21948a5278..84f55575a81 100644 --- a/Content.Server/_WH14K/Altar/AltarComponent.cs +++ b/Content.Server/_WH14K/Altar/AltarComponent.cs @@ -1,5 +1,3 @@ - - namespace Content.Server._WH14K.Altar; [RegisterComponent]