-
Notifications
You must be signed in to change notification settings - Fork 43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Подсветка текста в фильтрах QOL #14
Conversation
highlight full word only background to TextEdit
это нам надо |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Поверхностно прошел по ЦВарам и тому что код не обернут в тэги, потом посмотрю сам код
CVarDef<string> cVar, | ||
OptionColorSlider slider) | ||
{ | ||
return AddOption(new OptionColorSliderCVar(this, _cfg, cVar, slider)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
в Corvax CVars
@@ -17,6 +17,8 @@ public AccessibilityTab() | |||
Control.AddOptionCheckBox(CCVars.ReducedMotion, ReducedMotionCheckBox); | |||
Control.AddOptionPercentSlider(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider); | |||
Control.AddOptionPercentSlider(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider); | |||
Control.AddOptionCheckBox(CCVars.ChatAutoFillHighlights, AutoFillHighlightsCheckBox); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
в Corvax CVars, закрой тэгами корвакса
@@ -17,6 +17,8 @@ public AccessibilityTab() | |||
Control.AddOptionCheckBox(CCVars.ReducedMotion, ReducedMotionCheckBox); | |||
Control.AddOptionPercentSlider(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider); | |||
Control.AddOptionPercentSlider(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider); | |||
Control.AddOptionCheckBox(CCVars.ChatAutoFillHighlights, AutoFillHighlightsCheckBox); | |||
Control.AddOptionColorSlider(CCVars.ChatHighlightsColor, HighlightsColorSlider); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
в Corvax CVars
@@ -120,6 +120,19 @@ public OptionSliderFloatCVar AddOptionPercentSlider( | |||
{ | |||
return AddOption(new OptionSliderFloatCVar(this, _cfg, cVar, slider, min, max, scale, FormatPercent)); | |||
} | |||
|
|||
/// <summary> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
закрой тэгами по типу // Corvax-Highlights-Start // Corvax-Highlights-End // Corvax-Highlights
@@ -518,6 +531,58 @@ private void UpdateLabelValue() | |||
} | |||
} | |||
|
|||
/// <summary> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
закрой тэгами корвакса
@@ -1,10 +1,21 @@ | |||
<controls:ChannelFilterPopup | |||
xmlns="https://spacestation14.io" | |||
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
закрывай изменения тэгами корвакса
@@ -1,8 +1,12 @@ | |||
using Content.Shared.Chat; | |||
using Content.Shared.CCVar; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
в Corvax CVars, закрывай изменения в файле тэгами
using Content.Client.UserInterface.Systems.Chat.Controls; | ||
using Content.Shared.Chat; | ||
using Content.Shared.Input; | ||
using Content.Shared.CCVar; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
тоже самое, Corvax CVars, изменения с тэгами
Content.Shared/CCVar/CCVars.cs
Outdated
@@ -1809,6 +1809,24 @@ public static readonly CVarDef<int> | |||
public static readonly CVarDef<string> MOTD = | |||
CVarDef.Create("chat.motd", "", CVar.SERVER | CVar.SERVERONLY | CVar.ARCHIVE, "A message broadcast to each player that joins the lobby."); | |||
|
|||
/// <summary> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Перенеси в Corvax CVars.
highlights-head-of-personnel = Глава персонала, "ГП", Сервис, Командование | ||
highlights-chief-engineer = Старший инженер, "СИ", Инженер, "Инж", Командование | ||
highlights-chief-medical-officer = Главный врач, "ГВ", Медицинский, "Мед", Командование | ||
highlights-head-of-security = Глава Службы Безопасности, "ГСБ", Безопасность, "Охрана", Командование |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
думаю так правильнее
highlights-head-of-security = Глава Службы Безопасности, "ГСБ", Безопасность, "Охрана", Командование | |
highlights-head-of-security = Глава Службы Безопасности, "ГСБ", Безопасности, "СБ", Командование |
За исключением мелочей выше код выглядит нормально |
Это сейчас имеет смысл? Данный PR ещё открыт у визардов, смысл заниматся ранним мерджем, до закрытия и окончательного ревью? |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
на будущее улучшение: можно добавить возможность проигрывать звук (при галочке) и выбор цвета выделения |
Я когда брал он не был в обсуждении у мейнтейнеров. Они очень быстро за ПР взялись |
* [Port] Xenowears (space-syndicate#12) * Xenowears (space-syndicate#519) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Add a bit of clothing specie related and some tiny misc changes. Normally i wanted to add the spooders changes here but with the other spider specie coming in il hold myself for now. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Add clothings - [x] Loadouts/Vending machines --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/47865d65-754d-4b70-9c10-19bc9aa55ac6) </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Xenowears! new non-human related clothings. --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * ooopsie --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * [Port] Plushie (space-syndicate#11) * Plushie Update! (space-syndicate#654) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/643e6c65-bba0-4eef-8e8e-d3510922e51e) </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (space-syndicate#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p> ![ArchnePlush](https://github.com/Simple-Station/Einstein-Engines/assets/114866135/1ec47181-4827-49f9-8605-9a16764dba89) </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]> * [Fix] EE Migration (space-syndicate#14) * [Tweak] Add Einstein Engines Folders (space-syndicate#17) * [Tweak] EE Prototypes Folder * [Tweak] EE RU FTL * fix dublicate * yaml fixes --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: CodedCrow <[email protected]>
Описание PR
Подсветка в окне чата и пузырях сообщений слов выбранных для фильтра пользователем. Также доступна опция, автоматического заполнения подсветки в зависимости от роли и имени игрока (по умолчанию отключена, находится во вкладке параметров доступности, где также можно изменить цвет подсветки).
Слова, которые нужно подсвечивать, можно обернуть в кавычки " " для учета пробелов (или целых слов). Например, при вводе "Дек":
"Дек, приходи в бар" будет подсвечено. "Дектую свои правила" не будет подсвечено.
Взято с PR 31442.
Почему / Баланс
Это. Просто. Имба.
Функция давно присутствует на многих серверах SS13 и значительно улучшает читаемость сообщений, помогая отделам и отдельным игрокам быстрее понимать, когда их вызывают по радио.
Технические детали
За деталями смотреть в первоисточник PR 31442.
Медиа
Настройки подсветки находятся в Параметры > доступность. Можно изменить цвет подсветки Цвет и другие параметры.
text-highlight.2024-10-30.mp4
Требования
Критические изменения
Список изменений
🆑