diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs index 35d0abf43a..b3e602f853 100644 --- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs @@ -5,6 +5,7 @@ using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Controls.FancyTree; using Content.Client.UserInterface.Systems.Info; using Content.Shared.Guidebook; +using Content.Shared.Localizations; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; @@ -168,6 +169,8 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler foreach (var entry in GetSortedEntries(roots)) { if (!entry.CrystallPunkAllowed) continue; //CrystallPunk guidebook filter + if (entry.LocFilter is not null && entry.LocFilter != ContentLocalizationManager.Culture) continue; //CrystallPunk guidebook filter + AddEntry(entry.Id, parent, addedEntries); } diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 87a4916d09..a223631989 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -614,7 +614,7 @@ namespace Content.Shared.CCVar */ public static readonly CVarDef UIDefaultInterfaceTheme = - CVarDef.Create("interface.default_theme", "CP14DefaultTheme", CVar.CLIENTONLY); + CVarDef.Create("interface.default_theme", "SS14DefaultTheme", CVar.CLIENTONLY); public static readonly CVarDef UIClickSound = CVarDef.Create("interface.click_sound", "/Audio/UserInterface/click.ogg", CVar.REPLICATED); diff --git a/Content.Shared/Guidebook/GuideEntry.cs b/Content.Shared/Guidebook/GuideEntry.cs index d39e6c9315..f7bfb4f973 100644 --- a/Content.Shared/Guidebook/GuideEntry.cs +++ b/Content.Shared/Guidebook/GuideEntry.cs @@ -49,4 +49,10 @@ public class GuideEntry [DataField] public bool CrystallPunkAllowed = false; + + /// + /// ability to disable guidebooks in the wrong language. Use "ru-RU" or "en-US" for example, check ContentLocalizationManager.Culture + /// + [DataField] + public string? LocFilter; } diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index f5fd324f99..7e0acc2d5f 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Localizations [Dependency] private readonly ILocalizationManager _loc = default!; // If you want to change your codebase's language, do it here. - private const string Culture = "ru-RU"; // CrystallPunk-Localization. "ru-RU" or "en-US" + public const string Culture = "ru-RU"; // CrystallPunk-Localization. "ru-RU" or "en-US" /// /// Custom format strings used for parsing and displaying minutes:seconds timespans. diff --git a/Resources/Audio/_CP14/Lobby/attributions.yml b/Resources/Audio/_CP14/Lobby/attributions.yml index d4ef478331..4374407ec4 100644 --- a/Resources/Audio/_CP14/Lobby/attributions.yml +++ b/Resources/Audio/_CP14/Lobby/attributions.yml @@ -11,9 +11,4 @@ - files: ["arcane_winds.ogg"] license: "CC-BY-SA-3.0" copyright: "'Arcane Winds' by LINK, created for CrystallPunk14" - source: "https://github.com/crystallpunk-14/crystall-punk-14" - -- files: ["the_way.ogg"] - license: "CC-BY-SA-3.0" - copyright: "'The Ways' by R1VKX, created for CrystallPunk14" source: "https://github.com/crystallpunk-14/crystall-punk-14" \ No newline at end of file diff --git a/Resources/Audio/_CP14/Lobby/the_way.ogg b/Resources/Audio/_CP14/Lobby/the_way.ogg deleted file mode 100644 index 0c67699cba..0000000000 Binary files a/Resources/Audio/_CP14/Lobby/the_way.ogg and /dev/null differ diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl index 44bd7e85aa..900ec88a2d 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl @@ -7,6 +7,9 @@ cp14-reagent-desc-blood-tiefling = The life energy of a fire-blooded creature. cp14-reagent-name-blood-elf = Elf blood cp14-reagent-desc-blood-elf = The life energy of a magical creature. +cp14-reagent-name-blood-goblin = Goblin blood +cp14-reagent-desc-blood-goblin = The life energy of green-skinned creatures. + cp14-reagent-name-bloodgrasssap = Bloodgrass sap cp14-reagent-desc-bloodgrasssap = A squeeze from the ubiquitous blood grass. It has no particular remarkable qualities, but with proper skill can be prepared into a nutritious food. diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl index 03a4d5b026..eab5eb12a3 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl @@ -7,6 +7,9 @@ cp14-reagent-desc-blood-tiefling = Жизненная энергия огнек cp14-reagent-name-blood-elf = Кровь эльфа cp14-reagent-desc-blood-elf = Жизненная энергия волшебного существа. +cp14-reagent-name-blood-goblin = Кровь гоблина +cp14-reagent-desc-blood-goblin = Жизненная энергия зеленокожих существ. + cp14-reagent-name-bloodgrasssap = Сок кровьтравы cp14-reagent-desc-bloodgrasssap = Выжимка из повсеместно растущей кровьтравы. Не имеет особых примечательных качеств, но при должной сноровке может быть приготовлена в питательную пищу. diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index 9d937bd812..6310c5616b 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -25,7 +25,7 @@ prototype: CP14Human requiredLegs: 2 - type: Bloodstream - bloodReagent: CP14Blood + bloodReagent: CP14BloodGoblin - type: Hands handDisplacement: sizeMaps: diff --git a/Resources/Prototypes/_CP14/Guidebook/entry.yml b/Resources/Prototypes/_CP14/Guidebook/entry.yml index 918a419a4f..2532ca91a6 100644 --- a/Resources/Prototypes/_CP14/Guidebook/entry.yml +++ b/Resources/Prototypes/_CP14/Guidebook/entry.yml @@ -1,5 +1,6 @@ - type: guideEntry crystallPunkAllowed: true + locFilter: "en-US" id: CP14_EN name: cp14-guide-entry-english text: "/ServerInfo/_CP14/Guidebook_EN/Welcome.xml" @@ -8,6 +9,7 @@ - type: guideEntry crystallPunkAllowed: true + locFilter: "ru-RU" id: CP14_RU name: cp14-guide-entry-russian text: "/ServerInfo/_CP14/Guidebook_RU/Welcome.xml" diff --git a/Resources/Prototypes/_CP14/Reagents/Biological/blood.yml b/Resources/Prototypes/_CP14/Reagents/Biological/blood.yml index 4f8f9a4b68..959fbe2fe4 100644 --- a/Resources/Prototypes/_CP14/Reagents/Biological/blood.yml +++ b/Resources/Prototypes/_CP14/Reagents/Biological/blood.yml @@ -38,6 +38,21 @@ recognizable: true physicalDesc: cp14-reagent-physical-desc-ferrous slippery: false + footstepSound: + collection: FootstepBlood + params: + volume: 6 + +- type: reagent + id: CP14BloodGoblin + group: CP14Biological + desc: cp14-reagent-desc-blood-goblin + name: cp14-reagent-name-blood-goblin + flavor: CP14Metallic + color: "#576e35" + recognizable: true + physicalDesc: cp14-reagent-physical-desc-ferrous + slippery: false footstepSound: collection: FootstepBlood params: diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml index 13c9d42705..cf5b99a229 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml @@ -55,5 +55,24 @@ CP14BasicEffectSatiateHunger: 0.25 CP14BasicEffectHealPoison: 0.25 effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -250 + +- type: reaction + id: CP14BloodGrassBrewingBloodGoblin + minTemp: 500 + priority: 2 + reactants: + CP14BloodGoblin: + amount: 0.5 + CP14BloodGrassSap: + amount: 0.5 + CP14GroundQuartz: + amount: 0.5 + products: + CP14BasicEffectEmpty: 0.75 + CP14BasicEffectRainbow: 0.25 + CP14BasicEffectVomit: 0.25 + effects: - !type:CP14AffectSolutionTemperature addTemperature: -250 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/SoundCollections/lobby.yml b/Resources/Prototypes/_CP14/SoundCollections/lobby.yml index 8f5b55e01c..6544d3f831 100644 --- a/Resources/Prototypes/_CP14/SoundCollections/lobby.yml +++ b/Resources/Prototypes/_CP14/SoundCollections/lobby.yml @@ -3,5 +3,4 @@ files: - /Audio/_CP14/Lobby/crystal.ogg - /Audio/_CP14/Lobby/eldermourne.ogg - - /Audio/_CP14/Lobby/the_way.ogg - /Audio/_CP14/Lobby/arcane_winds.ogg \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/hud.yml b/Resources/Prototypes/_CP14/hud.yml deleted file mode 100644 index f13082d24e..0000000000 --- a/Resources/Prototypes/_CP14/hud.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: hudTheme - id: CP14DefaultTheme - name: ui-options-hud-theme-default - path: Default - order: -1 diff --git a/Resources/Prototypes/_CP14/themes.yml b/Resources/Prototypes/_CP14/themes.yml deleted file mode 100644 index 7589aceb55..0000000000 --- a/Resources/Prototypes/_CP14/themes.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: uiTheme - id: CP14DefaultTheme - path: /Textures//Interface/CrystallPunk/ - colors: - whiteText: "#FFF5EE" - slotSelectedGold: "#e6b812" - slotColor: "#0f1215" - slotOutline: "#4a3930" - slotText: "#503b33" - nanoGold: "#A88B5E" - goodGreenFore: "#31843E" - concerningOrangeFore: "#A5762F" - dangerousRedFore: "#BB3232" - disabledFore: "#5A5A5A" \ No newline at end of file diff --git a/Resources/Prototypes/hud.yml b/Resources/Prototypes/hud.yml index 16780b2a01..bb60629c68 100644 --- a/Resources/Prototypes/hud.yml +++ b/Resources/Prototypes/hud.yml @@ -1,11 +1,13 @@ -# Они не будут работать с новыми слотами -# А так же они не подходят под нашу атмосферу +# Эта тема отредактирована -# - type: hudTheme -# id: SS14DefaultTheme -# name: ui-options-hud-theme-default -# path: Default -# order: -1 + - type: hudTheme + id: SS14DefaultTheme + name: ui-options-hud-theme-default + path: Default + order: -1 + +# А остальные не будут работать с новыми слотами +# А так же они не подходят под нашу атмосферу # - type: hudTheme # id: SS14PlasmafireTheme diff --git a/Resources/Prototypes/themes.yml b/Resources/Prototypes/themes.yml index 3952687255..1ed7850efc 100644 --- a/Resources/Prototypes/themes.yml +++ b/Resources/Prototypes/themes.yml @@ -1,12 +1,12 @@ - type: uiTheme id: SS14DefaultTheme - path: /Textures/Interface/Default/ + path: /Textures/Interface/CrystallPunk/ #Edited for CP14 colors: whiteText: "#FFF5EE" slotSelectedGold: "#e6b812" slotColor: "#0f1215" - slotOutline: "#333850" - slotText: "#333850" + slotOutline: "#4a3930" #Edited CP14 + slotText: "#503b33" #Edited CP14 nanoGold: "#A88B5E" goodGreenFore: "#31843E" concerningOrangeFore: "#A5762F"