Merge branch 'feat/languages' of https://github.com/Mnemotechnician/f…

…rontier-station-14 into pr/671
new-frontiers-14 · Dec 18, 2023 · 1f2aa4c · 1f2aa4c
2 parents 5c4eff7 + 731f3ee
commit 1f2aa4c
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 10 deletions.
diff --git a/Content.Server/Language/LanguageSystem.cs b/Content.Server/Language/LanguageSystem.cs
@@ -31,7 +31,7 @@ private void OnInitLanguageSpeaker(EntityUid uid, LanguageSpeakerComponent compo
     {
         if (string.IsNullOrEmpty(component.CurrentLanguage))
         {
-            component.CurrentLanguage = component.SpokenLanguages.FirstOrDefault(Universal.ID);
+            component.CurrentLanguage = component.SpokenLanguages.FirstOrDefault(UniversalPrototype);
         }
     }
 
@@ -135,7 +135,7 @@ public bool CanUnderstand(EntityUid listener,
         LanguagePrototype language,
         LanguageSpeakerComponent? listenerLanguageComp = null)
     {
-        if (language.ID == Universal.ID || HasComp<UniversalLanguageSpeakerComponent>(listener))
+        if (language.ID == UniversalPrototype || HasComp<UniversalLanguageSpeakerComponent>(listener))
             return true;
 
         var listenerLanguages = GetLanguages(listener, listenerLanguageComp)?.UnderstoodLanguages;
@@ -240,7 +240,7 @@ private static bool IsSentenceEnd(char ch)
         RaiseLocalEvent(speaker, ev, true);
 
         if (ev.CurrentLanguage.Length == 0)
-            ev.CurrentLanguage = comp?.CurrentLanguage ?? Universal.ID; // Fall back to account for admemes like admins possessing a bread
+            ev.CurrentLanguage = !string.IsNullOrEmpty(comp.CurrentLanguage) ? comp.CurrentLanguage : UniversalPrototype; // Fall back to account for admemes like admins possessing a bread
         return ev;
     }
 
@@ -269,7 +269,7 @@ public void EnsureValidLanguage(EntityUid entity, LanguageSpeakerComponent? comp
 
         if (langs != null && !langs.SpokenLanguages.Contains(comp!.CurrentLanguage, StringComparer.Ordinal))
         {
-            comp.CurrentLanguage = langs.SpokenLanguages.FirstOrDefault(Universal.ID);
+            comp.CurrentLanguage = langs.SpokenLanguages.FirstOrDefault(UniversalPrototype);
         }
     }
 

diff --git a/Content.Shared/Language/Systems/SharedLanguageSystem.cs b/Content.Shared/Language/Systems/SharedLanguageSystem.cs
@@ -7,19 +7,22 @@ namespace Content.Shared.Language.Systems;
 
 public abstract class SharedLanguageSystem : EntitySystem
 {
+    [ValidatePrototypeId<LanguagePrototype>]
+    public static readonly string GalacticCommonPrototype = "GalacticCommon";
+    [ValidatePrototypeId<LanguagePrototype>]
+    public static readonly string UniversalPrototype = "Universal";
+    public static LanguagePrototype GalacticCommon { get; private set; } = default!;
+    public static LanguagePrototype Universal { get; private set; } = default!;
+
     [Dependency] private readonly SharedActionsSystem _action = default!;
-    private static LanguagePrototype? _galacticCommon;
-    private static LanguagePrototype? _universal;
-    public static LanguagePrototype GalacticCommon { get => _galacticCommon!; }
-    public static LanguagePrototype Universal { get => _universal!; }
     [Dependency] protected readonly IPrototypeManager _prototype = default!;
     [Dependency] protected readonly IRobustRandom _random = default!;
     protected ISawmill _sawmill = default!;
 
     public override void Initialize()
     {
-        _galacticCommon = _prototype.Index<LanguagePrototype>("GalacticCommon");
-        _universal = _prototype.Index<LanguagePrototype>("Universal");
+        GalacticCommon = _prototype.Index<LanguagePrototype>("GalacticCommon");
+        Universal = _prototype.Index<LanguagePrototype>("Universal");
         _sawmill = Logger.GetSawmill("language");
 
         SubscribeLocalEvent<LanguageSpeakerComponent, MapInitEvent>(OnInit);

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -127,6 +127,7 @@
       task: SimpleHostileCompound
   - type: Puller
     needsHands: true
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Bee
@@ -221,6 +222,9 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
+  # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: chicken
   - type: LanguageSpeaker
     speaks:
     - Chicken
@@ -321,6 +325,9 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
+  # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: duck
   - type: LanguageSpeaker
     speaks:
     - Duck
@@ -514,6 +521,7 @@
   - type: GuideHelp
     guides:
     - Chef
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Cow
@@ -650,6 +658,7 @@
   - type: HTN
     rootTask:
       task: RuminantHostileCompound
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Sheep
@@ -703,6 +712,7 @@
   - type: NpcFactionMember
     factions:
     - Passive
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Duck
@@ -762,6 +772,7 @@
     rootTask:
       task: SimpleHostileCompound
   - type: Puller
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Monkey
@@ -798,6 +809,9 @@
   - type: Inventory
     speciesId: kangaroo
     templateId: kangaroo
+    # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: kangaroo
   - type: LanguageSpeaker
     speaks:
     - Kangaroo
@@ -950,6 +964,8 @@
     spawned:
     - id: FoodMeat
       amount: 3
+  # Frontier - languages mechanic
+#  - type: MonkeyAccent
   - type: LanguageSpeaker
     speaks:
     - Monkey
@@ -1084,6 +1100,9 @@
     spawned:
     - id: FoodMeatRat
       amount: 1
+    # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: mouse
   - type: LanguageSpeaker
     speaks:
     - Mouse
@@ -1588,6 +1607,7 @@
     spawned:
     - id: FoodMeat
       amount: 3
+#  - type: MonkeyAccent
   - type: Puller
   - type: CanHostGuardian
   - type: NpcFactionMember
@@ -1610,6 +1630,7 @@
   - type: AutoTraitor
     giveUplink: false
     giveObjectives: false
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Monkey
@@ -1728,6 +1749,9 @@
   - type: MeleeChemicalInjector
     transferAmount: 0.75
     solution: melee
+  # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: xeno
   - type: LanguageSpeaker
     speaks:
     - Xeno
@@ -1984,6 +2008,7 @@
   - type: Tag
     tags:
     - VimPilot
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Dog
@@ -2035,6 +2060,9 @@
     spawned:
     - id: FoodMeat
       amount: 2
+    # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: dog
   - type: LanguageSpeaker
     speaks:
     - Dog
@@ -2189,6 +2217,9 @@
     spawned:
     - id: FoodMeat
       amount: 3
+    # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: cat
   - type: LanguageSpeaker
     speaks:
     - Cat
@@ -2283,6 +2314,9 @@
     spawned:
     - id: FoodMeat
       amount: 3
+    # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: cat
   - type: LanguageSpeaker
     speaks:
     - Cat
@@ -2432,6 +2466,7 @@
   - type: Tag
     tags:
     - VimPilot
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Dog
@@ -2526,6 +2561,9 @@
     spawned:
     - id: FoodMeat
       amount: 1
+    # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: mouse
   - type: LanguageSpeaker
     speaks:
     - Mouse
@@ -2635,6 +2673,9 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Animals/pig_oink.ogg
+    # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: pig
   - type: LanguageSpeaker
     speaks:
     - Pig

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -189,6 +189,7 @@
     - type: HTN
       rootTask:
         task: DragonCarpCompound
+  # Frontier - languages mechanic
     - type: LanguageSpeaker
       speaks:
       - GalacticCommon

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -379,6 +379,9 @@
     spawned:
     - id: FoodMeat
       amount: 3
+  # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: dog
   - type: LanguageSpeaker
     speaks:
     - Dog
@@ -595,6 +598,9 @@
       types:
         Piercing: 8
         Poison: 8
+  # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: xeno
   - type: LanguageSpeaker
     speaks:
     - Xeno
@@ -742,6 +748,7 @@
     attributes:
       proper: true
       gender: male
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Monkey

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -273,6 +273,7 @@
   - type: GuideHelp
     guides:
     - MinorAntagonists
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - Mouse

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -292,6 +292,9 @@
   - type: MeleeChemicalInjector
     solution: melee
     transferAmount: 3
+  # Frontier - languages mechanic
+#  - type: ReplacementAccent
+#    accent: xeno
   - type: LanguageSpeaker
     speaks:
     - Xeno

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -244,6 +244,7 @@
   - type: Tag
     tags:
     - CannotSuicide
+  # Frontier - languages mechanic
   - type: LanguageSpeaker
     speaks:
     - GalacticCommon

diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -170,6 +170,7 @@
           map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
           color: "#40a7d7"
           shader: unshaded
+    # Frontier - languages mechanic
     - type: LanguageSpeaker
       speaks:
       - GalacticCommon
@@ -255,6 +256,7 @@
     - type: HTN
       rootTask:
         task: SimpleHumanoidHostileCompound
+    # Frontier - languages mechanic
     - type: LanguageSpeaker
       speaks:
       - GalacticCommon