From fe766dcf1989db022880df50025bfbc35fdd214c Mon Sep 17 00:00:00 2001 From: FN <37689533+FireNameFN@users.noreply.github.com> Date: Sun, 1 Dec 2024 06:37:45 +0700 Subject: [PATCH 1/6] Fix locale directory (#101) * Try to fix * Delete Resources/Locale/ru-RU/_CorvaxNext directory --- .../ru-RU/{_CorvaxNext => _corvaxnext}/abilitties/agillity.ftl | 0 .../Locale/ru-RU/{_CorvaxNext => _corvaxnext}/accent/ohio.ftl | 0 .../{_CorvaxNext => _corvaxnext}/accessories/resomi-hair.ftl | 0 .../Locale/ru-RU/{_CorvaxNext => _corvaxnext}/markings/resomi.ftl | 0 .../ru-RU/{_CorvaxNext => _corvaxnext}/reagents/biological.ftl | 0 .../{_CorvaxNext => _corvaxnext}/surgery/surgery-borg-modules.ftl | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/{_CorvaxNext => _corvaxnext}/abilitties/agillity.ftl (100%) rename Resources/Locale/ru-RU/{_CorvaxNext => _corvaxnext}/accent/ohio.ftl (100%) rename Resources/Locale/ru-RU/{_CorvaxNext => _corvaxnext}/accessories/resomi-hair.ftl (100%) rename Resources/Locale/ru-RU/{_CorvaxNext => _corvaxnext}/markings/resomi.ftl (100%) rename Resources/Locale/ru-RU/{_CorvaxNext => _corvaxnext}/reagents/biological.ftl (100%) rename Resources/Locale/ru-RU/{_CorvaxNext => _corvaxnext}/surgery/surgery-borg-modules.ftl (100%) diff --git a/Resources/Locale/ru-RU/_CorvaxNext/abilitties/agillity.ftl b/Resources/Locale/ru-RU/_corvaxnext/abilitties/agillity.ftl similarity index 100% rename from Resources/Locale/ru-RU/_CorvaxNext/abilitties/agillity.ftl rename to Resources/Locale/ru-RU/_corvaxnext/abilitties/agillity.ftl diff --git a/Resources/Locale/ru-RU/_CorvaxNext/accent/ohio.ftl b/Resources/Locale/ru-RU/_corvaxnext/accent/ohio.ftl similarity index 100% rename from Resources/Locale/ru-RU/_CorvaxNext/accent/ohio.ftl rename to Resources/Locale/ru-RU/_corvaxnext/accent/ohio.ftl diff --git a/Resources/Locale/ru-RU/_CorvaxNext/accessories/resomi-hair.ftl b/Resources/Locale/ru-RU/_corvaxnext/accessories/resomi-hair.ftl similarity index 100% rename from Resources/Locale/ru-RU/_CorvaxNext/accessories/resomi-hair.ftl rename to Resources/Locale/ru-RU/_corvaxnext/accessories/resomi-hair.ftl diff --git a/Resources/Locale/ru-RU/_CorvaxNext/markings/resomi.ftl b/Resources/Locale/ru-RU/_corvaxnext/markings/resomi.ftl similarity index 100% rename from Resources/Locale/ru-RU/_CorvaxNext/markings/resomi.ftl rename to Resources/Locale/ru-RU/_corvaxnext/markings/resomi.ftl diff --git a/Resources/Locale/ru-RU/_CorvaxNext/reagents/biological.ftl b/Resources/Locale/ru-RU/_corvaxnext/reagents/biological.ftl similarity index 100% rename from Resources/Locale/ru-RU/_CorvaxNext/reagents/biological.ftl rename to Resources/Locale/ru-RU/_corvaxnext/reagents/biological.ftl diff --git a/Resources/Locale/ru-RU/_CorvaxNext/surgery/surgery-borg-modules.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-borg-modules.ftl similarity index 100% rename from Resources/Locale/ru-RU/_CorvaxNext/surgery/surgery-borg-modules.ftl rename to Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-borg-modules.ftl From d3b3bc2964eb9092c8e977b731e9911a5b696cdc Mon Sep 17 00:00:00 2001 From: csqrb <56765288+CaptainSqrBeard@users.noreply.github.com> Date: Sun, 1 Dec 2024 05:37:57 +0600 Subject: [PATCH 2/6] =?UTF-8?q?=D0=A1=D1=83=D0=BF=D0=B5=D1=80=20=D0=BC?= =?UTF-8?q?=D0=B5=D0=BB=D0=BA=D0=B8=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B0=D1=87=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20(#96)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * the * Capitalize --- .../_corvaxnext/interaction/offer-item-system.ftl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl b/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl index 94dbe640ef8..549d419f628 100644 --- a/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl +++ b/Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl @@ -2,12 +2,12 @@ offer-item-empty-hand = У вас в руках ничего нет! offer-item-full-hand = Ваши руки заняты! -offer-item-try-give = Вы предлагаете {THE($item)} {$target} -offer-item-try-give-target = {$user} предлагает вам {THE($item)} +offer-item-try-give = Вы предлагаете {$item} {$target} +offer-item-try-give-target = {CAPITALIZE($user)} предлагает вам {$item} -offer-item-give = Вы отдали {THE($item)} {$target} -offer-item-give-other = {$user} отдал {THE($item)} {$target} -offer-item-give-target = {$user} отдал вам {THE($item)} +offer-item-give = Вы отдали {$item} {$target} +offer-item-give-other = {CAPITALIZE($user)} отдал {$item} {$target} +offer-item-give-target = {CAPITALIZE($user)} отдал вам {$item} -offer-item-no-give = Вы перестаёте предлагать {THE($item)} {$target} -offer-item-no-give-target = {$user} больше не предлагает вам {THE($item)} +offer-item-no-give = Вы перестаёте предлагать {$item} {$target} +offer-item-no-give-target = {CAPITALIZE($user)} больше не предлагает вам {$item} From e7ec45450eced12b042241ee46e1a134df0a4505 Mon Sep 17 00:00:00 2001 From: csqrb <56765288+CaptainSqrBeard@users.noreply.github.com> Date: Sun, 1 Dec 2024 05:40:02 +0600 Subject: [PATCH 3/6] =?UTF-8?q?=D0=92=D1=8F=D0=B7=D0=BA=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D1=80=D0=B5=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=20=D1=81=D0=BB=D0=B5=D0=B4=D0=BE=D0=B2=20=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=BD=D0=B5=20=D0=B2=D0=BB=D0=B8=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=20=D0=BD=D0=B0=20=D1=81=D0=BA=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20(#99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * no viscosity for footprints * // Corvax-Next-Footsteps * footprintsteps --- Content.Server/Fluids/EntitySystems/PuddleSystem.cs | 9 +++++++-- Content.Shared/Fluids/Components/PuddleComponent.cs | 5 +++++ .../Prototypes/_CorvaxNext/Entities/Effects/footstep.yml | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index 3889be11743..ef06b9f2d99 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -340,7 +340,7 @@ private void OnSolutionUpdate(Entity entity, ref SolutionContai _deletionQueue.Remove(entity); UpdateSlip(entity, entity.Comp, args.Solution); - UpdateSlow(entity, args.Solution); + UpdateSlow(entity, args.Solution, entity.Comp); // Corvax-Next-Footprints UpdateEvaporation(entity, args.Solution); UpdateAppearance(entity, entity.Comp); } @@ -421,8 +421,13 @@ private void UpdateSlip(EntityUid entityUid, PuddleComponent component, Solution } } - private void UpdateSlow(EntityUid uid, Solution solution) + private void UpdateSlow(EntityUid uid, Solution solution, PuddleComponent component) // Corvax-Next-Footprints { + // Corvax-Next-Footprints-Start + if (!component.ViscosityAffectsMovement) + return; + // Corvax-Next-Footprints-End + var maxViscosity = 0f; foreach (var (reagent, _) in solution.Contents) { diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs index b8a6fe0cb88..3e08a725841 100644 --- a/Content.Shared/Fluids/Components/PuddleComponent.cs +++ b/Content.Shared/Fluids/Components/PuddleComponent.cs @@ -21,5 +21,10 @@ public sealed partial class PuddleComponent : Component [DataField("solutionRef")] public Entity? Solution; + + // Corvax-Next-Footprints-Start + [DataField] + public bool ViscosityAffectsMovement = true; + // Corvax-Next-Footprints-End } } diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Effects/footstep.yml b/Resources/Prototypes/_CorvaxNext/Entities/Effects/footstep.yml index 5753d2cb057..8369a040070 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Effects/footstep.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Effects/footstep.yml @@ -34,6 +34,7 @@ - type: Footprint - type: Puddle solution: step + viscosityAffectsMovement: false - type: Appearance - type: ExaminableSolution solution: step From e2b45ebb676d8f102a87b15164eebe14272114eb Mon Sep 17 00:00:00 2001 From: Token <56667933+TokenStyle@users.noreply.github.com> Date: Sun, 1 Dec 2024 04:41:16 +0500 Subject: [PATCH 4/6] [Port] ohio accent port fixes (#95) * important ohio accent fixes for admemes and some folder moving and namespace renaming * no brainrot * fix errors * remove ftl locale --- .../Speech/Components/OhioAccentComponent.cs | 4 +- .../Speech/EntitySystems/OhioAccentSystem.cs | 21 +- .../accent/accents.ftl | 0 .../_CorvaxNext/Accents/word_replacements.yml | 269 ++++++++++-------- 4 files changed, 163 insertions(+), 131 deletions(-) rename Content.Server/{Goobstation => _CorvaxNext}/Speech/Components/OhioAccentComponent.cs (52%) rename Content.Server/{Goobstation => _CorvaxNext}/Speech/EntitySystems/OhioAccentSystem.cs (61%) rename Resources/Locale/en-US/{Goobstation => _corvaxnext}/accent/accents.ftl (100%) diff --git a/Content.Server/Goobstation/Speech/Components/OhioAccentComponent.cs b/Content.Server/_CorvaxNext/Speech/Components/OhioAccentComponent.cs similarity index 52% rename from Content.Server/Goobstation/Speech/Components/OhioAccentComponent.cs rename to Content.Server/_CorvaxNext/Speech/Components/OhioAccentComponent.cs index c76c3c516b8..6f28363dcb5 100644 --- a/Content.Server/Goobstation/Speech/Components/OhioAccentComponent.cs +++ b/Content.Server/_CorvaxNext/Speech/Components/OhioAccentComponent.cs @@ -1,6 +1,6 @@ -using Content.Server.Speech.EntitySystems; +using Content.Server._CorvaxNext.Speech.EntitySystems; -namespace Content.Server.Speech.Components; +namespace Content.Server._CorvaxNext.Speech.Components; [RegisterComponent] [Access(typeof(OhioAccentSystem))] diff --git a/Content.Server/Goobstation/Speech/EntitySystems/OhioAccentSystem.cs b/Content.Server/_CorvaxNext/Speech/EntitySystems/OhioAccentSystem.cs similarity index 61% rename from Content.Server/Goobstation/Speech/EntitySystems/OhioAccentSystem.cs rename to Content.Server/_CorvaxNext/Speech/EntitySystems/OhioAccentSystem.cs index 3ad0e2c9a6b..4d1c84622c5 100644 --- a/Content.Server/Goobstation/Speech/EntitySystems/OhioAccentSystem.cs +++ b/Content.Server/_CorvaxNext/Speech/EntitySystems/OhioAccentSystem.cs @@ -1,8 +1,9 @@ -using System.Text.RegularExpressions; -using Content.Server.Speech.Components; +using Content.Server._CorvaxNext.Speech.Components; +using Content.Server.Speech; +using Content.Server.Speech.EntitySystems; using Robust.Shared.Random; -namespace Content.Server.Speech.EntitySystems; +namespace Content.Server._CorvaxNext.Speech.EntitySystems; public sealed class OhioAccentSystem : EntitySystem { @@ -15,11 +16,15 @@ public override void Initialize() SubscribeLocalEvent(OnAccent); } - private void OnAccent(EntityUid uid, OhioAccentComponent component, AccentGetEvent args) + private void OnAccent(EntityUid uid, OhioAccentComponent component, ref AccentGetEvent args) { + args.Message = Accentuate("ohio", "accent-ohio-prefix-", "accent-ohio-suffix-", args); + } + + private string Accentuate(string accentName, string prefix, string suffix, AccentGetEvent args) { var message = args.Message; - message = _replacement.ApplyReplacements(message, "ohio"); + message = _replacement.ApplyReplacements(message, accentName); // Prefix if (_random.Prob(0.15f)) @@ -28,7 +33,7 @@ private void OnAccent(EntityUid uid, OhioAccentComponent component, AccentGetEve // Reverse sanitize capital message = message[0].ToString().ToLower() + message.Remove(0, 1); - message = Loc.GetString($"accent-ohio-prefix-{pick}") + " " + message; + message = Loc.GetString(prefix + pick) + " " + message; } // Sanitize capital again, in case we substituted a word that should be capitalized @@ -38,9 +43,9 @@ private void OnAccent(EntityUid uid, OhioAccentComponent component, AccentGetEve if (_random.Prob(0.3f)) { var pick = _random.Next(1, 13); - message += Loc.GetString($"accent-ohio-suffix-{pick}"); + message += Loc.GetString(suffix + pick); } - args.Message = message; + return message; } }; diff --git a/Resources/Locale/en-US/Goobstation/accent/accents.ftl b/Resources/Locale/en-US/_corvaxnext/accent/accents.ftl similarity index 100% rename from Resources/Locale/en-US/Goobstation/accent/accents.ftl rename to Resources/Locale/en-US/_corvaxnext/accent/accents.ftl diff --git a/Resources/Prototypes/_CorvaxNext/Accents/word_replacements.yml b/Resources/Prototypes/_CorvaxNext/Accents/word_replacements.yml index 56ae521da4a..ede3fa75009 100644 --- a/Resources/Prototypes/_CorvaxNext/Accents/word_replacements.yml +++ b/Resources/Prototypes/_CorvaxNext/Accents/word_replacements.yml @@ -17,124 +17,151 @@ accent-ohio-words-14: accent-ohio-words-replace-14 accent-ohio-words-15: accent-ohio-words-replace-15 accent-ohio-words-16: accent-ohio-words-replace-16 - accent-ohio-words-17: accent-ohio-words-replace-17 - accent-ohio-words-18: accent-ohio-words-replace-18 - accent-ohio-words-19: accent-ohio-words-replace-19 - accent-ohio-words-20: accent-ohio-words-replace-20 - accent-ohio-words-21: accent-ohio-words-replace-21 - accent-ohio-words-22: accent-ohio-words-replace-22 - accent-ohio-words-23: accent-ohio-words-replace-23 - accent-ohio-words-24: accent-ohio-words-replace-24 - accent-ohio-words-25: accent-ohio-words-replace-25 - accent-ohio-words-26: accent-ohio-words-replace-26 - accent-ohio-words-27: accent-ohio-words-replace-27 - accent-ohio-words-28: accent-ohio-words-replace-28 - accent-ohio-words-29: accent-ohio-words-replace-29 - accent-ohio-words-30: accent-ohio-words-replace-30 - accent-ohio-words-31: accent-ohio-words-replace-31 - accent-ohio-words-32: accent-ohio-words-replace-32 - accent-ohio-words-33: accent-ohio-words-replace-33 - accent-ohio-words-34: accent-ohio-words-replace-34 - accent-ohio-words-35: accent-ohio-words-replace-35 - accent-ohio-words-36: accent-ohio-words-replace-36 - accent-ohio-words-37: accent-ohio-words-replace-37 - accent-ohio-words-38: accent-ohio-words-replace-38 - accent-ohio-words-39: accent-ohio-words-replace-39 - accent-ohio-words-40: accent-ohio-words-replace-40 - accent-ohio-words-41: accent-ohio-words-replace-41 - accent-ohio-words-42: accent-ohio-words-replace-42 - accent-ohio-words-43: accent-ohio-words-replace-43 - accent-ohio-words-44: accent-ohio-words-replace-44 - accent-ohio-words-45: accent-ohio-words-replace-45 - accent-ohio-words-46: accent-ohio-words-replace-46 - accent-ohio-words-47: accent-ohio-words-replace-47 - accent-ohio-words-48: accent-ohio-words-replace-48 - accent-ohio-words-49: accent-ohio-words-replace-49 - accent-ohio-words-50: accent-ohio-words-replace-50 - accent-ohio-words-51: accent-ohio-words-replace-51 - accent-ohio-words-52: accent-ohio-words-replace-52 - accent-ohio-words-53: accent-ohio-words-replace-53 - accent-ohio-words-54: accent-ohio-words-replace-54 - accent-ohio-words-55: accent-ohio-words-replace-55 - accent-ohio-words-56: accent-ohio-words-replace-56 - accent-ohio-words-57: accent-ohio-words-replace-57 - accent-ohio-words-58: accent-ohio-words-replace-58 - accent-ohio-words-59: accent-ohio-words-replace-59 - accent-ohio-words-60: accent-ohio-words-replace-60 - accent-ohio-words-61: accent-ohio-words-replace-61 - accent-ohio-words-62: accent-ohio-words-replace-62 - accent-ohio-words-63: accent-ohio-words-replace-63 - accent-ohio-words-64: accent-ohio-words-replace-64 - accent-ohio-words-65: accent-ohio-words-replace-65 - accent-ohio-words-66: accent-ohio-words-replace-66 - accent-ohio-words-67: accent-ohio-words-replace-67 - accent-ohio-words-68: accent-ohio-words-replace-68 - accent-ohio-words-69: accent-ohio-words-replace-69 - accent-ohio-words-70: accent-ohio-words-replace-70 - accent-ohio-words-71: accent-ohio-words-replace-71 - accent-ohio-words-72: accent-ohio-words-replace-72 - accent-ohio-words-73: accent-ohio-words-replace-73 - accent-ohio-words-74: accent-ohio-words-replace-74 - accent-ohio-words-75: accent-ohio-words-replace-75 - accent-ohio-words-76: accent-ohio-words-replace-76 - accent-ohio-words-77: accent-ohio-words-replace-77 - accent-ohio-words-78: accent-ohio-words-replace-78 - accent-ohio-words-79: accent-ohio-words-replace-79 - accent-ohio-words-80: accent-ohio-words-replace-80 - accent-ohio-words-81: accent-ohio-words-replace-81 - accent-ohio-words-82: accent-ohio-words-replace-82 - accent-ohio-words-83: accent-ohio-words-replace-83 - accent-ohio-words-84: accent-ohio-words-replace-84 - accent-ohio-words-85: accent-ohio-words-replace-85 - accent-ohio-words-86: accent-ohio-words-replace-86 - accent-ohio-words-87: accent-ohio-words-replace-87 - accent-ohio-words-88: accent-ohio-words-replace-88 - accent-ohio-words-89: accent-ohio-words-replace-89 - accent-ohio-words-90: accent-ohio-words-replace-90 - accent-ohio-words-91: accent-ohio-words-replace-91 - accent-ohio-words-92: accent-ohio-words-replace-92 - accent-ohio-words-93: accent-ohio-words-replace-93 - accent-ohio-words-94: accent-ohio-words-replace-94 - accent-ohio-words-95: accent-ohio-words-replace-95 - accent-ohio-words-96: accent-ohio-words-replace-96 - accent-ohio-words-97: accent-ohio-words-replace-97 - accent-ohio-words-98: accent-ohio-words-replace-98 - accent-ohio-words-99: accent-ohio-words-replace-99 - accent-ohio-words-100: accent-ohio-words-replace-100 - accent-ohio-words-101: accent-ohio-words-replace-101 - accent-ohio-words-102: accent-ohio-words-replace-102 - accent-ohio-words-103: accent-ohio-words-replace-103 - accent-ohio-words-104: accent-ohio-words-replace-104 - accent-ohio-words-105: accent-ohio-words-replace-105 - accent-ohio-words-106: accent-ohio-words-replace-106 - accent-ohio-words-107: accent-ohio-words-replace-107 - accent-ohio-words-108: accent-ohio-words-replace-108 - accent-ohio-words-109: accent-ohio-words-replace-109 - accent-ohio-words-110: accent-ohio-words-replace-110 - accent-ohio-words-111: accent-ohio-words-replace-111 - accent-ohio-words-112: accent-ohio-words-replace-112 - accent-ohio-words-113: accent-ohio-words-replace-113 - accent-ohio-words-114: accent-ohio-words-replace-114 - accent-ohio-words-115: accent-ohio-words-replace-115 - accent-ohio-words-116: accent-ohio-words-replace-116 - accent-ohio-words-117: accent-ohio-words-replace-117 - accent-ohio-words-118: accent-ohio-words-replace-118 - accent-ohio-words-119: accent-ohio-words-replace-119 - accent-ohio-words-120: accent-ohio-words-replace-120 - accent-ohio-words-121: accent-ohio-words-replace-121 - accent-ohio-words-122: accent-ohio-words-replace-122 - accent-ohio-words-123: accent-ohio-words-replace-123 - accent-ohio-words-124: accent-ohio-words-replace-124 - accent-ohio-words-125: accent-ohio-words-replace-125 - accent-ohio-words-126: accent-ohio-words-replace-126 - accent-ohio-words-127: accent-ohio-words-replace-127 - accent-ohio-words-128: accent-ohio-words-replace-128 - accent-ohio-words-129: accent-ohio-words-replace-129 - accent-ohio-words-130: accent-ohio-words-replace-130 - accent-ohio-words-131: accent-ohio-words-replace-131 - accent-ohio-words-132: accent-ohio-words-replace-132 - accent-ohio-words-133: accent-ohio-words-replace-133 - accent-ohio-words-134: accent-ohio-words-replace-134 - accent-ohio-words-135: accent-ohio-words-replace-135 - accent-ohio-words-136: accent-ohio-words-replace-136 - accent-ohio-words-137: accent-ohio-words-replace-137 + +- type: accent + id: ohioBrainrot + wordReplacements: + accent-ohio-brainrot-words-1: accent-ohio-brainrot-words-replace-1 + accent-ohio-brainrot-words-2: accent-ohio-brainrot-words-replace-2 + accent-ohio-brainrot-words-3: accent-ohio-brainrot-words-replace-3 + accent-ohio-brainrot-words-4: accent-ohio-brainrot-words-replace-4 + accent-ohio-brainrot-words-5: accent-ohio-brainrot-words-replace-5 + accent-ohio-brainrot-words-6: accent-ohio-brainrot-words-replace-6 + accent-ohio-brainrot-words-7: accent-ohio-brainrot-words-replace-7 + accent-ohio-brainrot-words-8: accent-ohio-brainrot-words-replace-8 + accent-ohio-brainrot-words-9: accent-ohio-brainrot-words-replace-9 + accent-ohio-brainrot-words-10: accent-ohio-brainrot-words-replace-10 + accent-ohio-brainrot-words-11: accent-ohio-brainrot-words-replace-11 + accent-ohio-brainrot-words-12: accent-ohio-brainrot-words-replace-12 + accent-ohio-brainrot-words-13: accent-ohio-brainrot-words-replace-13 + accent-ohio-brainrot-words-14: accent-ohio-brainrot-words-replace-14 + accent-ohio-brainrot-words-15: accent-ohio-brainrot-words-replace-15 + accent-ohio-brainrot-words-16: accent-ohio-brainrot-words-replace-16 + accent-ohio-brainrot-words-17: accent-ohio-brainrot-words-replace-17 + accent-ohio-brainrot-words-18: accent-ohio-brainrot-words-replace-18 + accent-ohio-brainrot-words-19: accent-ohio-brainrot-words-replace-19 + accent-ohio-brainrot-words-20: accent-ohio-brainrot-words-replace-20 + accent-ohio-brainrot-words-21: accent-ohio-brainrot-words-replace-21 + accent-ohio-brainrot-words-22: accent-ohio-brainrot-words-replace-22 + accent-ohio-brainrot-words-23: accent-ohio-brainrot-words-replace-23 + accent-ohio-brainrot-words-24: accent-ohio-brainrot-words-replace-24 + accent-ohio-brainrot-words-25: accent-ohio-brainrot-words-replace-25 + accent-ohio-brainrot-words-26: accent-ohio-brainrot-words-replace-26 + accent-ohio-brainrot-words-27: accent-ohio-brainrot-words-replace-27 + accent-ohio-brainrot-words-28: accent-ohio-brainrot-words-replace-28 + accent-ohio-brainrot-words-29: accent-ohio-brainrot-words-replace-29 + accent-ohio-brainrot-words-30: accent-ohio-brainrot-words-replace-30 + accent-ohio-brainrot-words-31: accent-ohio-brainrot-words-replace-31 + accent-ohio-brainrot-words-32: accent-ohio-brainrot-words-replace-32 + accent-ohio-brainrot-words-33: accent-ohio-brainrot-words-replace-33 + accent-ohio-brainrot-words-34: accent-ohio-brainrot-words-replace-34 + accent-ohio-brainrot-words-35: accent-ohio-brainrot-words-replace-35 + accent-ohio-brainrot-words-36: accent-ohio-brainrot-words-replace-36 + accent-ohio-brainrot-words-37: accent-ohio-brainrot-words-replace-37 + accent-ohio-brainrot-words-38: accent-ohio-brainrot-words-replace-38 + accent-ohio-brainrot-words-39: accent-ohio-brainrot-words-replace-39 + accent-ohio-brainrot-words-40: accent-ohio-brainrot-words-replace-40 + accent-ohio-brainrot-words-41: accent-ohio-brainrot-words-replace-41 + accent-ohio-brainrot-words-42: accent-ohio-brainrot-words-replace-42 + accent-ohio-brainrot-words-43: accent-ohio-brainrot-words-replace-43 + accent-ohio-brainrot-words-44: accent-ohio-brainrot-words-replace-44 + accent-ohio-brainrot-words-45: accent-ohio-brainrot-words-replace-45 + accent-ohio-brainrot-words-46: accent-ohio-brainrot-words-replace-46 + accent-ohio-brainrot-words-47: accent-ohio-brainrot-words-replace-47 + accent-ohio-brainrot-words-48: accent-ohio-brainrot-words-replace-48 + accent-ohio-brainrot-words-49: accent-ohio-brainrot-words-replace-49 + accent-ohio-brainrot-words-50: accent-ohio-brainrot-words-replace-50 + accent-ohio-brainrot-words-51: accent-ohio-brainrot-words-replace-51 + accent-ohio-brainrot-words-52: accent-ohio-brainrot-words-replace-52 + accent-ohio-brainrot-words-53: accent-ohio-brainrot-words-replace-53 + accent-ohio-brainrot-words-54: accent-ohio-brainrot-words-replace-54 + accent-ohio-brainrot-words-55: accent-ohio-brainrot-words-replace-55 + accent-ohio-brainrot-words-56: accent-ohio-brainrot-words-replace-56 + accent-ohio-brainrot-words-57: accent-ohio-brainrot-words-replace-57 + accent-ohio-brainrot-words-58: accent-ohio-brainrot-words-replace-58 + accent-ohio-brainrot-words-59: accent-ohio-brainrot-words-replace-59 + accent-ohio-brainrot-words-60: accent-ohio-brainrot-words-replace-60 + accent-ohio-brainrot-words-61: accent-ohio-brainrot-words-replace-61 + accent-ohio-brainrot-words-62: accent-ohio-brainrot-words-replace-62 + accent-ohio-brainrot-words-63: accent-ohio-brainrot-words-replace-63 + accent-ohio-brainrot-words-64: accent-ohio-brainrot-words-replace-64 + accent-ohio-brainrot-words-65: accent-ohio-brainrot-words-replace-65 + accent-ohio-brainrot-words-66: accent-ohio-brainrot-words-replace-66 + accent-ohio-brainrot-words-67: accent-ohio-brainrot-words-replace-67 + accent-ohio-brainrot-words-68: accent-ohio-brainrot-words-replace-68 + accent-ohio-brainrot-words-69: accent-ohio-brainrot-words-replace-69 + accent-ohio-brainrot-words-70: accent-ohio-brainrot-words-replace-70 + accent-ohio-brainrot-words-71: accent-ohio-brainrot-words-replace-71 + accent-ohio-brainrot-words-72: accent-ohio-brainrot-words-replace-72 + accent-ohio-brainrot-words-73: accent-ohio-brainrot-words-replace-73 + accent-ohio-brainrot-words-74: accent-ohio-brainrot-words-replace-74 + accent-ohio-brainrot-words-75: accent-ohio-brainrot-words-replace-75 + accent-ohio-brainrot-words-76: accent-ohio-brainrot-words-replace-76 + accent-ohio-brainrot-words-77: accent-ohio-brainrot-words-replace-77 + accent-ohio-brainrot-words-78: accent-ohio-brainrot-words-replace-78 + accent-ohio-brainrot-words-79: accent-ohio-brainrot-words-replace-79 + accent-ohio-brainrot-words-80: accent-ohio-brainrot-words-replace-80 + accent-ohio-brainrot-words-81: accent-ohio-brainrot-words-replace-81 + accent-ohio-brainrot-words-82: accent-ohio-brainrot-words-replace-82 + accent-ohio-brainrot-words-83: accent-ohio-brainrot-words-replace-83 + accent-ohio-brainrot-words-84: accent-ohio-brainrot-words-replace-84 + accent-ohio-brainrot-words-85: accent-ohio-brainrot-words-replace-85 + accent-ohio-brainrot-words-86: accent-ohio-brainrot-words-replace-86 + accent-ohio-brainrot-words-87: accent-ohio-brainrot-words-replace-87 + accent-ohio-brainrot-words-88: accent-ohio-brainrot-words-replace-88 + accent-ohio-brainrot-words-89: accent-ohio-brainrot-words-replace-89 + accent-ohio-brainrot-words-90: accent-ohio-brainrot-words-replace-90 + accent-ohio-brainrot-words-91: accent-ohio-brainrot-words-replace-91 + accent-ohio-brainrot-words-92: accent-ohio-brainrot-words-replace-92 + accent-ohio-brainrot-words-93: accent-ohio-brainrot-words-replace-93 + accent-ohio-brainrot-words-94: accent-ohio-brainrot-words-replace-94 + accent-ohio-brainrot-words-95: accent-ohio-brainrot-words-replace-95 + accent-ohio-brainrot-words-96: accent-ohio-brainrot-words-replace-96 + accent-ohio-brainrot-words-97: accent-ohio-brainrot-words-replace-97 + accent-ohio-brainrot-words-98: accent-ohio-brainrot-words-replace-98 + accent-ohio-brainrot-words-99: accent-ohio-brainrot-words-replace-99 + accent-ohio-brainrot-words-100: accent-ohio-brainrot-words-replace-100 + accent-ohio-brainrot-words-101: accent-ohio-brainrot-words-replace-101 + accent-ohio-brainrot-words-102: accent-ohio-brainrot-words-replace-102 + accent-ohio-brainrot-words-103: accent-ohio-brainrot-words-replace-103 + accent-ohio-brainrot-words-104: accent-ohio-brainrot-words-replace-104 + accent-ohio-brainrot-words-105: accent-ohio-brainrot-words-replace-105 + accent-ohio-brainrot-words-106: accent-ohio-brainrot-words-replace-106 + accent-ohio-brainrot-words-107: accent-ohio-brainrot-words-replace-107 + accent-ohio-brainrot-words-108: accent-ohio-brainrot-words-replace-108 + accent-ohio-brainrot-words-109: accent-ohio-brainrot-words-replace-109 + accent-ohio-brainrot-words-110: accent-ohio-brainrot-words-replace-110 + accent-ohio-brainrot-words-111: accent-ohio-brainrot-words-replace-111 + accent-ohio-brainrot-words-112: accent-ohio-brainrot-words-replace-112 + accent-ohio-brainrot-words-113: accent-ohio-brainrot-words-replace-113 + accent-ohio-brainrot-words-114: accent-ohio-brainrot-words-replace-114 + accent-ohio-brainrot-words-115: accent-ohio-brainrot-words-replace-115 + accent-ohio-brainrot-words-116: accent-ohio-brainrot-words-replace-116 + accent-ohio-brainrot-words-117: accent-ohio-brainrot-words-replace-117 + accent-ohio-brainrot-words-118: accent-ohio-brainrot-words-replace-118 + accent-ohio-brainrot-words-119: accent-ohio-brainrot-words-replace-119 + accent-ohio-brainrot-words-120: accent-ohio-brainrot-words-replace-120 + accent-ohio-brainrot-words-121: accent-ohio-brainrot-words-replace-121 + accent-ohio-brainrot-words-122: accent-ohio-brainrot-words-replace-122 + accent-ohio-brainrot-words-123: accent-ohio-brainrot-words-replace-123 + accent-ohio-brainrot-words-124: accent-ohio-brainrot-words-replace-124 + accent-ohio-brainrot-words-125: accent-ohio-brainrot-words-replace-125 + accent-ohio-brainrot-words-126: accent-ohio-brainrot-words-replace-126 + accent-ohio-brainrot-words-127: accent-ohio-brainrot-words-replace-127 + accent-ohio-brainrot-words-128: accent-ohio-brainrot-words-replace-128 + accent-ohio-brainrot-words-129: accent-ohio-brainrot-words-replace-129 + accent-ohio-brainrot-words-130: accent-ohio-brainrot-words-replace-130 + accent-ohio-brainrot-words-131: accent-ohio-brainrot-words-replace-131 + accent-ohio-brainrot-words-132: accent-ohio-brainrot-words-replace-132 + accent-ohio-brainrot-words-133: accent-ohio-brainrot-words-replace-133 + accent-ohio-brainrot-words-134: accent-ohio-brainrot-words-replace-134 + accent-ohio-brainrot-words-135: accent-ohio-brainrot-words-replace-135 + accent-ohio-brainrot-words-136: accent-ohio-brainrot-words-replace-136 + accent-ohio-brainrot-words-137: accent-ohio-brainrot-words-replace-137 + accent-ohio-brainrot-words-138: accent-ohio-brainrot-words-replace-138 + accent-ohio-brainrot-words-139: accent-ohio-brainrot-words-replace-139 + accent-ohio-brainrot-words-140: accent-ohio-brainrot-words-replace-140 + accent-ohio-brainrot-words-141: accent-ohio-brainrot-words-replace-141 + accent-ohio-brainrot-words-142: accent-ohio-brainrot-words-replace-142 + accent-ohio-brainrot-words-143: accent-ohio-brainrot-words-replace-143 + accent-ohio-brainrot-words-144: accent-ohio-brainrot-words-replace-144 From 5cda653509394dae78d10896686d89185904519c Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 1 Dec 2024 14:44:19 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=90=D0=BD=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=20=D1=81=D0=B5=D0=BC=D1=8F=D0=BD=20=D0=B8=20?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D1=82=D0=B5=D0=BD=D0=B8=D0=B9=20(#102)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * AnalPlant * LittleFixes * LittleFixes2 --- .../UI/PlantAnalyzerBoundUserInterface.cs | 53 ++++ .../PlantAnalyzer/UI/PlantAnalyzerWindow.xaml | 50 ++++ .../UI/PlantAnalyzerWindow.xaml.cs | 203 ++++++++++++++ .../Components/PlantAnalyzerComponent.cs | 33 +++ .../Botany/Systems/PlantAnalyzerSystem.cs | 259 ++++++++++++++++++ .../PlantAnalyzerDoAfterEvent.cs | 9 + ...lantAnalyzerScannedSeedPlantInformation.cs | 93 +++++++ .../PlantAnalyzer/PlantAnalyzerUiKey.cs | 9 + .../plantanalyzer/plantanalyzer.ftl | 53 ++++ .../plantanalyzer/plantanalyzer.ftl | 53 ++++ .../objects/devices/plant_analyzer.ftl | 10 + .../VendingMachines/Inventories/nutri.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Research/civilianservices.yml | 1 + .../Objects/Devices/plant_analyzer.yml | 65 +++++ .../_CorvaxNext/Recipes/Lathes/botany.yml | 9 + .../_CorvaxNext/Recipes/Lathes/devices.yml | 9 + .../Devices/plant_analyzer.rsi/icon.png | Bin 0 -> 2189 bytes .../Devices/plant_analyzer.rsi/meta.json | 40 +++ .../plant_analyzer.rsi/plantanalyzer.png | Bin 0 -> 364 bytes .../Devices/plant_analyzer.rsi/unlit.png | Bin 0 -> 1181 bytes 21 files changed, 951 insertions(+) create mode 100644 Content.Client/_CorvaxNext/PlantAnalyzer/UI/PlantAnalyzerBoundUserInterface.cs create mode 100644 Content.Client/_CorvaxNext/PlantAnalyzer/UI/PlantAnalyzerWindow.xaml create mode 100644 Content.Client/_CorvaxNext/PlantAnalyzer/UI/PlantAnalyzerWindow.xaml.cs create mode 100644 Content.Server/_CorvaxNext/Botany/Components/PlantAnalyzerComponent.cs create mode 100644 Content.Server/_CorvaxNext/Botany/Systems/PlantAnalyzerSystem.cs create mode 100644 Content.Shared/_CorvaxNext/PlantAnalyzer/PlantAnalyzerDoAfterEvent.cs create mode 100644 Content.Shared/_CorvaxNext/PlantAnalyzer/PlantAnalyzerScannedSeedPlantInformation.cs create mode 100644 Content.Shared/_CorvaxNext/PlantAnalyzer/PlantAnalyzerUiKey.cs create mode 100644 Resources/Locale/en-US/_corvaxnext/plantanalyzer/plantanalyzer.ftl create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/plantanalyzer/plantanalyzer.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/devices/plant_analyzer.ftl create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/plant_analyzer.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Recipes/Lathes/botany.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Recipes/Lathes/devices.yml create mode 100644 Resources/Textures/_CorvaxNext/Objects/Devices/plant_analyzer.rsi/icon.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Devices/plant_analyzer.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxNext/Objects/Devices/plant_analyzer.rsi/plantanalyzer.png create mode 100644 Resources/Textures/_CorvaxNext/Objects/Devices/plant_analyzer.rsi/unlit.png diff --git a/Content.Client/_CorvaxNext/PlantAnalyzer/UI/PlantAnalyzerBoundUserInterface.cs b/Content.Client/_CorvaxNext/PlantAnalyzer/UI/PlantAnalyzerBoundUserInterface.cs new file mode 100644 index 00000000000..8c8d571e7a7 --- /dev/null +++ b/Content.Client/_CorvaxNext/PlantAnalyzer/UI/PlantAnalyzerBoundUserInterface.cs @@ -0,0 +1,53 @@ +using Content.Shared._CorvaxNext.PlantAnalyzer; +using JetBrains.Annotations; + +namespace Content.Client._CorvaxNext.PlantAnalyzer.UI; + +[UsedImplicitly] +public sealed class PlantAnalyzerBoundUserInterface : BoundUserInterface +{ + [ViewVariables] + private PlantAnalyzerWindow? _window; + + public PlantAnalyzerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) + { + } + + protected override void Open() + { + base.Open(); + _window = new PlantAnalyzerWindow(this) + { + Title = Loc.GetString("plant-analyzer-interface-title"), + }; + _window.OnClose += Close; + _window.OpenCenteredLeft(); + } + + protected override void ReceiveMessage(BoundUserInterfaceMessage message) + { + if (_window == null) + return; + + if (message is not PlantAnalyzerScannedSeedPlantInformation cast) + return; + _window.Populate(cast); + } + + public void AdvPressed(bool scanMode) + { + SendMessage(new PlantAnalyzerSetMode(scanMode)); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + if (_window != null) + _window.OnClose -= Close; + + _window?.Dispose(); + } +} \ No newline at end of file diff --git a/Content.Client/_CorvaxNext/PlantAnalyzer/UI/PlantAnalyzerWindow.xaml b/Content.Client/_CorvaxNext/PlantAnalyzer/UI/PlantAnalyzerWindow.xaml new file mode 100644 index 00000000000..5405a858d89 --- /dev/null +++ b/Content.Client/_CorvaxNext/PlantAnalyzer/UI/PlantAnalyzerWindow.xaml @@ -0,0 +1,50 @@ + + + + +