From ff98037854ccfcbd748d936bd8ea5378bbf46ec7 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 15 Mar 2025 20:12:38 +0300 Subject: [PATCH] English OBT + Bugfixes (#1029) * ts * Test - without spawning at all * Update coffin.yml * Update CP14UniqueLootSystem.cs --- .../_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs | 5 ----- .../_CP14/UniqueLoot/CP14UniqueLootSystem.cs | 8 ++++++-- .../Localizations/ContentLocalizationManager.cs | 10 +++++----- Resources/ConfigPresets/_CP14/Dev.toml | 8 ++++---- .../Entities/Structures/Storage/Crates/coffin.yml | 4 ++-- .../Prototypes/_CP14/ModularCraft/Blade/dagger.yml | 4 ++++ .../Prototypes/_CP14/ModularCraft/Blade/sickle.yml | 9 ++++++--- Resources/Prototypes/_CP14/Roles/Antags/vampire.yml | 2 +- 8 files changed, 28 insertions(+), 22 deletions(-) diff --git a/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs b/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs index 2a199a091e..730bffc2f0 100644 --- a/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs +++ b/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs @@ -50,11 +50,6 @@ public sealed partial class CP14RoundEndSystem _ticker.TogglePause(); } - if (nowMoscow.Hour == 17 && nowMoscow.Minute == 45) - { - _consoleHost.ExecuteCommand("shutdown"); //Restart server, load updates and other - } - if (nowMoscow.Hour == 20 && nowMoscow.Minute == 45) { _chatSystem.DispatchGlobalAnnouncement("ВНИМАНИЕ: Сервер автоматически завершит раунд через 15 минут", announcementSound: new SoundPathSpecifier("/Audio/Effects/beep1.ogg"), sender: "Сервер"); diff --git a/Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs b/Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs index 1f51f54d1a..cf44fd44a4 100644 --- a/Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs +++ b/Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs @@ -32,8 +32,12 @@ public sealed partial class CP14UniqueLootSystem : EntitySystem if (loot == null) return; - if (!Deleted(ent)) - SpawnAtPosition(loot, Transform(ent).Coordinates); + if (TerminatingOrDeleted(ent) || !Exists(ent)) + return; + + var coords = Transform(ent).Coordinates; + + EntityManager.SpawnEntity(loot, coords); } diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index d1ab35aa4e..cdfeca62dc 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -10,8 +10,8 @@ namespace Content.Shared.Localizations [Dependency] private readonly ILocalizationManager _loc = default!; // If you want to change your codebase's language, do it here. - //public const string Culture = "en-US"; - public const string Culture = "ru-RU"; + public const string Culture = "en-US"; + //public const string Culture = "ru-RU"; /// /// Custom format strings used for parsing and displaying minutes:seconds timespans. @@ -29,9 +29,9 @@ namespace Content.Shared.Localizations var culture = new CultureInfo(Culture); _loc.LoadCulture(culture); // Uncomment for Ru localization - var fallbackCulture = new CultureInfo("en-US"); - _loc.LoadCulture(fallbackCulture); - _loc.SetFallbackCluture(fallbackCulture); + //var fallbackCulture = new CultureInfo("en-US"); + //_loc.LoadCulture(fallbackCulture); + //_loc.SetFallbackCluture(fallbackCulture); // _loc.AddFunction(culture, "PRESSURE", FormatPressure); diff --git a/Resources/ConfigPresets/_CP14/Dev.toml b/Resources/ConfigPresets/_CP14/Dev.toml index 5a52f1e5a5..dc797e4d27 100644 --- a/Resources/ConfigPresets/_CP14/Dev.toml +++ b/Resources/ConfigPresets/_CP14/Dev.toml @@ -1,5 +1,5 @@ [whitelist] -enabled = true +enabled = false [log] path = "logs" @@ -14,13 +14,13 @@ bindto = "::,0.0.0.0" max_connections = 100 [game] -hostname = "⚔️ CrystallEdge Alpha [RU] ⚔️ Status: Whitelist only" +hostname = "⚔️ CrystallEdge [EN] ⚔️ Status: Open Playtest" desc = "History of the City of Sword and Magic. A social economic sandbox reinventing the Space Station 14 concept in fantasy style" lobbyenabled = true soft_max_players = 40 maxplayers = 80 lobbyduration = 300 -role_timers = true +role_timers = false [server] rules_file = "CP14SandboxRU" @@ -61,4 +61,4 @@ enable_during_round = true [cp14] discord_auth_enabled = true -closet_beta_test = true \ No newline at end of file +closet_beta_test = false \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml index 8bf7d1b01f..46cfee65bc 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml @@ -32,8 +32,8 @@ - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 1 - max: 4 + min: 2 + max: 3 - !type:DoActsBehavior acts: [ "Destruction" ] - type: Construction diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml index 2c3c78f206..8711971a84 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml @@ -24,6 +24,10 @@ types: Slash: 4 Piercing: 3 + - !type:EditIncreaseDamageOnWield + bonusDamage: + types: + Piercing: 3 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml index 69331a9230..73351af14f 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml @@ -1,6 +1,5 @@ #Concept: -# Copy of dagger with lesser damage -# But can gather grass from world +# Copy of dagger with bigger damage, but without throwing - type: modularPart id: BaseBladeSickle modifiers: @@ -13,7 +12,11 @@ attackRateMultiplier: 1.5 bonusDamage: types: - Slash: 4 + Slash: 8 + - !type:EditIncreaseDamageOnWield + bonusDamage: + types: + Slash: 3 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/Roles/Antags/vampire.yml b/Resources/Prototypes/_CP14/Roles/Antags/vampire.yml index 7d4772c9df..8608c130ed 100644 --- a/Resources/Prototypes/_CP14/Roles/Antags/vampire.yml +++ b/Resources/Prototypes/_CP14/Roles/Antags/vampire.yml @@ -2,7 +2,7 @@ id: CP14Vampire name: cp14-roles-antag-vampire-name antagonist: true - setPreference: true + setPreference: false #Impossible and boring gameplay ATM objective: cp14-roles-antag-vampire-objective requirements: - !type:OverallPlaytimeRequirement