juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some issues (#452)

Browse Source 
* possible UI theming fix

* gob blood

* filter guidebooks by Culture settings

* deleted lobby track
This commit is contained in:
Ed
2024-09-23 18:34:04 +03:00
committed by GitHub
parent ecdb02650b
commit 468e3c9f69
17 changed files with 66 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
View File

@@ -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);
}

2
Content.Shared/CCVar/CCVars.cs
View File

@@ -614,7 +614,7 @@ namespace Content.Shared.CCVar
*/
public static readonly CVarDef<string> UIDefaultInterfaceTheme =
CVarDef.Create("interface.default_theme", "CP14DefaultTheme", CVar.CLIENTONLY);
CVarDef.Create("interface.default_theme", "SS14DefaultTheme", CVar.CLIENTONLY);
public static readonly CVarDef<string> UIClickSound =
CVarDef.Create("interface.click_sound", "/Audio/UserInterface/click.ogg", CVar.REPLICATED);

6
Content.Shared/Guidebook/GuideEntry.cs
View File

@@ -49,4 +49,10 @@ public class GuideEntry
[DataField]
public bool CrystallPunkAllowed = false;
/// <summary>
/// ability to disable guidebooks in the wrong language. Use "ru-RU" or "en-US" for example, check ContentLocalizationManager.Culture
/// </summary>
[DataField]
public string? LocFilter;
}

2
Content.Shared/Localizations/ContentLocalizationManager.cs
View File

@@ -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"
/// <summary>
/// Custom format strings used for parsing and displaying minutes:seconds timespans.

5
Resources/Audio/_CP14/Lobby/attributions.yml
View File

@@ -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"

BIN
Resources/Audio/_CP14/Lobby/the_way.ogg
View File

Binary file not shown.

3
Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl
View File

@@ -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.

3
Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl
View File

@@ -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 = Выжимка из повсеместно растущей кровьтравы. Не имеет особых примечательных качеств, но при должной сноровке может быть приготовлена в питательную пищу.

2
Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
View File

@@ -25,7 +25,7 @@
prototype: CP14Human
requiredLegs: 2
- type: Bloodstream
bloodReagent: CP14Blood
bloodReagent: CP14BloodGoblin
- type: Hands
handDisplacement:
sizeMaps:

2
Resources/Prototypes/_CP14/Guidebook/entry.yml
View File

@@ -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"

15
Resources/Prototypes/_CP14/Reagents/Biological/blood.yml
View File

@@ -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:

19
Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml
View File

@@ -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

1
Resources/Prototypes/_CP14/SoundCollections/lobby.yml
View File

@@ -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

5
Resources/Prototypes/_CP14/hud.yml
View File

@@ -1,5 +0,0 @@
- type: hudTheme
id: CP14DefaultTheme
name: ui-options-hud-theme-default
path: Default
order: -1

14
Resources/Prototypes/_CP14/themes.yml
View File

@@ -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"

16
Resources/Prototypes/hud.yml
View File

@@ -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

6
Resources/Prototypes/themes.yml
View File

@@ -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"