AAC tablet changes 1: headings and more phrases (#1634)

* add: group heading * tweak: move these phrase locales to "locations" why were they uncategorized? wtf * tweak: make phrase group headings big * tweak: fix up group names * add: relative location phrases * tweak: remove safety status phrase group name appears at top * add: more subject phrases * newlines * add: machine phrase * add: more pronoun phrases * add: safety/temperature phrases * add: "darkness" phrase * add: color phrases * add: flavor and common plant phrases * add: more colors * add: blood * add: "skeleton" phrase * Revert "add: "skeleton" phrase" This reverts commit bc49e47b3e. I ACTUALLY FORGOT I HAD ONE ALREADY LOL
2024-08-16 16:34:47 -04:00 · 2024-08-16 16:34:47 -04:00 · 9a12eb05d3
parent cb624ff621
commit 9a12eb05d3
16 changed files with 401 additions and 13 deletions
--- a/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml.cs
+++ b/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml.cs
@ -72,13 +72,28 @@ public sealed partial class AACWindow : FancyWindow

        foreach (var group in groups)
        {
+            var header = CreateHeaderForGroup(group.Key);
            var buttonContainer = CreateButtonContainerForGroup(group.Value);
+            boxContainer.AddChild(header);
            boxContainer.AddChild(buttonContainer);
        }

        return boxContainer;
    }

+    private Label CreateHeaderForGroup(string groupName)
+    {
+        var header = new Label
+        {
+            HorizontalExpand = true,
+            Text = groupName,
+            Margin = new Thickness(10, 10, 10, 0),
+            StyleClasses = { "LabelBig" }
+        };
+
+        return header;
+    }
+
    private GridContainer CreateButtonContainerForGroup(List<QuickPhrasePrototype> phrases)
    {
        var loc = IoCManager.Resolve<ILocalizationManager>();
--- a/Resources/Locale/en-US/deltav/phrases/common.ftl
+++ b/Resources/Locale/en-US/deltav/phrases/common.ftl
@ -90,3 +90,7 @@ phrase-stack = stack
 phrase-hour = hour
 phrase-minute = minute
 phrase-second = second
+phrase-i-am = I am
+phrase-you-are = You are
+phrase-mine = Mine
+phrase-yours = Yours
--- a/Resources/Locale/en-US/deltav/phrases/locations.ftl
+++ b/Resources/Locale/en-US/deltav/phrases/locations.ftl
@ -0,0 +1,23 @@
+phrase-location-ats = ATS
+phrase-location-shipyard = Shipyard
+phrase-location-boxing-ring = Boxing Ring
+phrase-location-outpost = Outpost
+phrase-location-escape-shuttle = Escape shuttle
+phrase-location-shuttle = Shuttle
+phrase-location-maintenance = Maintenance
+
+# relative
+phrase-location-near = near
+phrase-location-far = far
+phrase-location-inside = inside
+phrase-location-outside = outside
+
+## compass
+phrase-location-north = north
+phrase-location-east = east
+phrase-location-south = south
+phrase-location-west = west
+phrase-location-northeast = northeast
+phrase-location-southeast = southeast
+phrase-location-southwest = southwest
+phrase-location-northwest = northwest
--- a/Resources/Locale/en-US/deltav/phrases/subjects.ftl
+++ b/Resources/Locale/en-US/deltav/phrases/subjects.ftl
@ -193,3 +193,40 @@ phrase-salt = salt
 phrase-artifact-fragment = artifact fragment
 phrase-bluespace-crystal = bluespace
 phrase-diamond = diamond
+phrase-chemicals = chemicals
+phrase-box = box
+phrase-locker = locker
+phrase-machine = machine
+phrase-blood = blood
+
+# colors
+phrase-color-red = red
+phrase-color-orange = orange
+phrase-color-yellow = yellow
+phrase-color-green = green
+phrase-color-blue = blue
+phrase-color-purple = purple
+phrase-color-pink = pink
+phrase-color-black = black
+phrase-color-white = white
+phrase-color-bright = bright
+phrase-color-light = light
+phrase-color-dark = dark
+phrase-color-rainbow = rainbow
+phrase-color-brown = brown
+phrase-color-gray = gray
+
+# flavors
+phrase-sweet = sweet
+phrase-sour = sour
+phrase-spicy = spicy
+phrase-savory = savory
+phrase-bitter = bitter
+
+# plants
+phrase-tomato = tomato
+phrase-potato = potato
+phrase-onion = onion
+phrase-aloe = aloe
+phrase-poppy = poppy
+phrase-galaxythistle = galaxythistle
--- a/Resources/Locale/en-US/deltav/phrases/threats.ftl
+++ b/Resources/Locale/en-US/deltav/phrases/threats.ftl
@ -2,7 +2,7 @@ phrase-hazard-space = spaced
 phrase-hazard-low-presure = low pressure
 phrase-hazard-high-presure = high pressure
 phrase-hazard-heat = overheating
-phrase-hazard-cold = freezing
+phrase-hazard-cold = cold
 phrase-hazard-gas-leak = gas leak
 phrase-hazard-explosion = explosion
 phrase-hazard-radiation = radiation
@ -50,3 +50,8 @@ phrase-safety-how-to-help = How can I help?
 phrase-safety-evac = Let's evacuate
 phrase-safety-not = not
 phrase-safety-lost = lost
+phrase-hazard-hot = hot
+phrase-hazard-freezing = freezing
+phrase-hazard-burning = burning
+phrase-hazard-bad-temperature = bad temperature
+phrase-hazard-darkness = darkness
--- a/Resources/Locale/en-US/deltav/phrases/uncategorized.ftl
+++ b/Resources/Locale/en-US/deltav/phrases/uncategorized.ftl
@ -1,7 +0,0 @@
-phrase-location-ats = ATS
-phrase-location-shipyard = Shipyard
-phrase-location-boxing-ring = Boxing Ring
-phrase-location-outpost = Outpost
-phrase-location-escape-shuttle = Escape shuttle
-phrase-location-shuttle = Shuttle
-phrase-location-maintenance = Maintenance
--- a/Resources/Prototypes/DeltaV/QuickPhrases/Common/commands.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/Common/commands.yml
@ -1,7 +1,7 @@
 - type: quickPhrase
  id: BaseImperativePhrase
  parent: BaseCommonPhrase
-  group: Command
+  group: Commands and Requests
  abstract: true

 - type: quickPhrase
--- a/Resources/Prototypes/DeltaV/QuickPhrases/Common/numbers.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/Common/numbers.yml
@ -1,7 +1,7 @@
 - type: quickPhrase
  id: BaseNumberPhrase
  parent: BaseCommonPhrase
-  group: Numbers
+  group: Numbers and Units
  abstract: true

 - type: quickPhrase
--- a/Resources/Prototypes/DeltaV/QuickPhrases/Common/pronouns.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/Common/pronouns.yml
@ -1,7 +1,7 @@
 - type: quickPhrase
  id: BaseNounsPhrase
  parent: BaseCommonPhrase
-  group: Nouns
+  group: Nouns and Pronouns
  abstract: true

 - type: quickPhrase
@ -63,3 +63,23 @@
  id: MePhrase
  parent: BaseNounsPhrase
  text: phrase-me
+
+- type: quickPhrase
+  id: IAmPhrase
+  parent: BaseNounsPhrase
+  text: phrase-i-am
+
+- type: quickPhrase
+  id: YouArePhrase
+  parent: BaseNounsPhrase
+  text: phrase-you-are
+
+- type: quickPhrase
+  id: MinePhrase
+  parent: BaseNounsPhrase
+  text: phrase-mine
+
+- type: quickPhrase
+  id: YoursPhrase
+  parent: BaseNounsPhrase
+  text: phrase-yours
--- a/Resources/Prototypes/DeltaV/QuickPhrases/Common/qualitative.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/Common/qualitative.yml
@ -1,7 +1,7 @@
 - type: quickPhrase
  id: BaseQualitativePhrase
  parent: BaseCommonPhrase
-  group: Quantity or Quality
+  group: Quantity and Quality
  abstract: true

 - type: quickPhrase
--- a/Resources/Prototypes/DeltaV/QuickPhrases/Subjects/generic.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/Subjects/generic.yml
@ -163,6 +163,33 @@
  parent: BaseSubjectPhrase
  text: phrase-bag

+- type: quickPhrase
+  id: LockerPhrase
+  parent: BaseSubjectPhrase
+  text: phrase-locker
+
+- type: quickPhrase
+  id: BoxPhrase
+  parent: BaseSubjectPhrase
+  text: phrase-box
+
+- type: quickPhrase
+  id: ChemicalsPhrase
+  parent: BaseSubjectPhrase
+  text: phrase-chemicals
+
+- type: quickPhrase
+  id: MachinePhrase
+  parent: BaseSubjectPhrase
+  text: phrase-machine
+
+- type: quickPhrase
+  id: BloodPhrase
+  parent: BaseSubjectPhrase
+  text: phrase-blood
+
+# Materials
+
 - type: quickPhrase
  id: BaseMaterialPhrase
  parent: BaseSubjectPhrase
@ -228,3 +255,86 @@
  id: BluespacePhrase
  parent: BaseMaterialPhrase
  text: phrase-bluespace
+
+# Colors
+
+- type: quickPhrase
+  id: BaseColorPhrase
+  parent: BaseSubjectPhrase
+  group: Colors
+  abstract: true
+
+- type: quickPhrase
+  id: ColorRedPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-red
+
+- type: quickPhrase
+  id: ColorOrangePhrase
+  parent: BaseColorPhrase
+  text: phrase-color-orange
+
+- type: quickPhrase
+  id: ColorYellowPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-yellow
+
+- type: quickPhrase
+  id: ColorGreenPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-green
+
+- type: quickPhrase
+  id: ColorBluePhrase
+  parent: BaseColorPhrase
+  text: phrase-color-blue
+
+- type: quickPhrase
+  id: ColorPurplePhrase
+  parent: BaseColorPhrase
+  text: phrase-color-purple
+
+- type: quickPhrase
+  id: ColorPinkPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-pink
+
+- type: quickPhrase
+  id: ColorBlackPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-black
+
+- type: quickPhrase
+  id: ColorWhitePhrase
+  parent: BaseColorPhrase
+  text: phrase-color-white
+
+- type: quickPhrase
+  id: ColorBrightPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-bright
+
+- type: quickPhrase
+  id: ColorDarkPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-dark
+
+- type: quickPhrase
+  id: ColorRainbowPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-rainbow
+
+- type: quickPhrase
+  id: ColorLightPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-light
+
+- type: quickPhrase
+  id: ColorBrownPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-brown
+
+- type: quickPhrase
+  id: ColorGrayPhrase
+  parent: BaseColorPhrase
+  text: phrase-color-gray
--- a/Resources/Prototypes/DeltaV/QuickPhrases/Subjects/medical.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/Subjects/medical.yml
@ -177,3 +177,8 @@
  id: HealthyPhrase
  parent: BaseMedicinePhrase
  text: phrase-healthy
+
+- type: quickPhrase
+  id: MedicalChemicalsPhrase
+  parent: BaseMedicinePhrase
+  text: phrase-chemicals
--- a/Resources/Prototypes/DeltaV/QuickPhrases/Subjects/service.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/Subjects/service.yml
@ -142,3 +142,58 @@
  id: GrillPhrase
  parent: BaseServiceSubjectPhrase
  text: phrase-grill
+
+- type: quickPhrase
+  id: SweetPhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-sweet
+
+- type: quickPhrase
+  id: SourPhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-sour
+
+- type: quickPhrase
+  id: SpicyPhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-spicy
+
+- type: quickPhrase
+  id: SavoryPhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-savory
+
+- type: quickPhrase
+  id: BitterPhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-bitter
+
+- type: quickPhrase
+  id: TomatoPhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-tomato
+
+- type: quickPhrase
+  id: PotatoPhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-potato
+
+- type: quickPhrase
+  id: OnionPhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-onion
+
+- type: quickPhrase
+  id: AloePhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-aloe
+
+- type: quickPhrase
+  id: PoppyPhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-poppy
+
+- type: quickPhrase
+  id: GalaxyThistlePhrase
+  parent: BaseServiceSubjectPhrase
+  text: phrase-galaxythistle
--- a/Resources/Prototypes/DeltaV/QuickPhrases/Threats/hazards.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/Threats/hazards.yml
@ -104,3 +104,33 @@
  id: HazardBrokenEquipmentPhrase
  parent: BaseHazardThreatPhrase
  text: phrase-hazard-broken-equipment
+
+- type: quickPhrase
+  id: HazardHotPhrase
+  parent: BaseHazardThreatPhrase
+  text: phrase-hazard-hot
+
+- type: quickPhrase
+  id: HazardBurningPhrase
+  parent: BaseHazardThreatPhrase
+  text: phrase-hazard-burning
+
+- type: quickPhrase
+  id: HazardBadTemperaturePhrase
+  parent: BaseHazardThreatPhrase
+  text: phrase-hazard-bad-temperature
+
+- type: quickPhrase
+  id: HazardFreezingPhrase
+  parent: BaseHazardThreatPhrase
+  text: phrase-hazard-freezing
+
+- type: quickPhrase
+  id: HazardDarknessPhrase
+  parent: BaseHazardThreatPhrase
+  text: phrase-hazard-darkness
+
+- type: quickPhrase
+  id: HazardBloodPhrase
+  parent: BaseHazardThreatPhrase
+  text: phrase-blood
--- a/Resources/Prototypes/DeltaV/QuickPhrases/Threats/status.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/Threats/status.yml
@ -1,7 +1,6 @@
 - type: quickPhrase
  id: BaseSafetyStatusPhrase
  parent: BaseThreatPhrase
-  group: '! Status'
  abstract: true

 - type: quickPhrase
@ -106,3 +105,13 @@
  id: SafetyLostPhrase
  parent: BaseSafetyStatusPhrase
  text: phrase-safety-lost
+
+- type: quickPhrase
+  id: SafetyIAmPhrase
+  parent: BaseSafetyStatusPhrase
+  text: phrase-i-am
+
+- type: quickPhrase
+  id: SafetyYouArePhrase
+  parent: BaseSafetyStatusPhrase
+  text: phrase-you-are
--- a/Resources/Prototypes/DeltaV/QuickPhrases/locations.yml
+++ b/Resources/Prototypes/DeltaV/QuickPhrases/locations.yml
@ -43,6 +43,72 @@
  id: BaseServiceLocationPhrase
  abstract: true

+# Relative (ungrouped, so it's at the top)
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationNearPhrase
+  text: phrase-location-near
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationFarPhrase
+  text: phrase-location-far
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationInsidePhrase
+  text: phrase-location-inside
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationOutsidePhrase
+  text: phrase-location-outside
+
+## Compass directions
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationNorthPhrase
+  text: phrase-location-north
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationEastPhrase
+  text: phrase-location-east
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationSouthPhrase
+  text: phrase-location-south
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationWestPhrase
+  text: phrase-location-west
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationNorthEastPhrase
+  text: phrase-location-northeast
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationSouthEastPhrase
+  text: phrase-location-southeast
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationSouthWestPhrase
+  text: phrase-location-southwest
+
+- type: quickPhrase
+  parent: BaseLocationPhrase
+  id: LocationNorthWestPhrase
+  text: phrase-location-northwest
+
+# Command
+
 - type: quickPhrase
  parent: BaseCommandLocationPhrase
  id: LocationCommandPhrase
@ -73,6 +139,8 @@
  id: LocationConferenceRoomPhrase
  text: station-beacon-conference-room

+# Engineering
+
 - type: quickPhrase
  parent: BaseEngineeringLocationPhrase
  id: LocationEngineeringPhrase
@ -128,6 +196,8 @@
  id: LocationTechVaultPhrase
  text: station-beacon-tech-vault

+# Epistemics
+
 - type: quickPhrase
  parent: BaseEpistemicsLocationPhrase
  id: LocationEpistemicsPhrase
@ -168,6 +238,8 @@
  id: LocationServerPhrase
  text: station-beacon-research-server

+# Justice
+
 - type: quickPhrase
  parent: BaseJusticeLocationPhrase
  id: LocationCourtroomPhrase
@ -193,6 +265,8 @@
  id: LocationClerkPhrase
  text: station-beacon-clerk

+# Logistics
+
 - type: quickPhrase
  parent: BaseLogisticsLocationPhrase
  id: LocationLogisticsPhrase
@ -228,6 +302,8 @@
  id: LocationShipyardPhrase
  text: phrase-location-shipyard

+# Medical
+
 - type: quickPhrase
  parent: BaseMedicalLocationPhrase
  id: LocationMedicalPhrase
@ -263,6 +339,8 @@
  id: LocationSurgeryPhrase
  text: station-beacon-surgery

+# Security
+
 - type: quickPhrase
  parent: BaseSecurityLocationPhrase
  id: LocationSecurityPhrase
@ -308,6 +386,8 @@
  id: LocationCorpsmanPhrase
  text: station-beacon-corpsman

+# Service
+
 - type: quickPhrase
  parent: BaseServiceLocationPhrase
  id: LocationServicePhrase
@ -353,6 +433,8 @@
  id: LocationTheaterPhrase
  text: station-beacon-theater

+# Civilian
+
 - type: quickPhrase
  parent: BaseCivilianLocationPhrase
  id: LocationLibraryPhrase