admin cmd fix, new mail types, const cleanup

new-frontiers-14 · Jun 8, 2024 · e956cbb · e956cbb
1 parent 0248975
commit e956cbb
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 9 deletions.
diff --git a/Content.Server/Nyanotrasen/Mail/MailCommands.cs b/Content.Server/Nyanotrasen/Mail/MailCommands.cs
@@ -59,7 +59,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
 
         // Frontier: Large Mail
         bool isLarge = false;
-        if (args.Length >= 4 && !Boolean.TryParse(args[4], out isLarge))
+        if (args.Length > 4 && !Boolean.TryParse(args[4], out isLarge))
         {
             shell.WriteError(Loc.GetString("shell-invalid-bool"));
             return;
@@ -115,7 +115,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
 
         mailComponent.IsFragile = isFragile;
         mailComponent.IsPriority = isPriority;
-        mailComponent.IsPriority = isPriority;
+        mailComponent.IsLarge = isLarge;
 
         _mailSystem.SetupMail(mailUid, teleporterComponent, recipient.Value);
 

diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
@@ -245,13 +245,14 @@ private void OnAfterInteractUsing(EntityUid uid, MailComponent component, AfterI
 
         private void OnExamined(EntityUid uid, MailComponent component, ExaminedEvent args)
         {
+            MailEntityStrings mailEntityStrings = component.IsLarge ? MailConstants.MailLarge : MailConstants.Mail; //Frontier: mail types stored per type (large mail)
             if (!args.IsInDetailsRange)
             {
-                args.PushMarkup(Loc.GetString(component.IsLarge ? "mail-large-desc-far" : "mail-desc-far")); // Frontier: IsLarge switch
+                args.PushMarkup(Loc.GetString(mailEntityStrings.DescFar)); // Frontier: mail constants struct
                 return;
             }
 
-            args.PushMarkup(Loc.GetString(component.IsLarge ? "mail-large-desc-close" : "mail-desc-close", ("name", component.Recipient), ("job", component.RecipientJob), ("station", component.RecipientStation))); // Frontier: IsLarge switch
+            args.PushMarkup(Loc.GetString(mailEntityStrings.DescClose, ("name", component.Recipient), ("job", component.RecipientJob), ("station", component.RecipientStation))); // Frontier: mail constants struct
 
             if (component.IsFragile)
                 args.PushMarkup(Loc.GetString("mail-desc-fragile"));
@@ -470,6 +471,7 @@ public void SetupMail(EntityUid uid, MailTeleporterComponent component, MailReci
             mailComp.RecipientStation = recipient.Ship; // Frontier
 
             // Frontier: Large mail bonus
+            MailEntityStrings mailEntityStrings = mailComp.IsLarge ? MailConstants.MailLarge : MailConstants.Mail;
             if (mailComp.IsLarge)
             {
                 mailComp.Bounty += component.LargeBonus;
@@ -499,7 +501,7 @@ public void SetupMail(EntityUid uid, MailTeleporterComponent component, MailReci
 
             _appearanceSystem.SetData(uid, MailVisuals.JobIcon, recipient.JobIcon);
 
-            _metaDataSystem.SetEntityName(uid, Loc.GetString(mailComp.IsLarge ? "mail-large-item-name-addressed" : "mail-item-name-addressed", // Frontier: IsLarge switch
+            _metaDataSystem.SetEntityName(uid, Loc.GetString(mailEntityStrings.NameAddressed, // Frontier: move constant to MailEntityString
                 ("recipient", recipient.Name)));
 
             var accessReader = EnsureComp<AccessReaderComponent>(uid);

diff --git a/Content.Server/_NF/Mail/MailConstants.cs b/Content.Server/_NF/Mail/MailConstants.cs
@@ -0,0 +1,38 @@
+namespace Content.Server.Mail
+{
+    /// <summary>
+    /// A set of localized strings related to mail entities
+    /// </summary>
+    public struct MailEntityStrings
+    {
+        public string NameAddressed;
+        public string DescClose;
+        public string DescFar;
+    }
+
+    /// <summary>
+    /// Constants related to mail.
+    /// </summary>
+    public sealed class MailConstants : EntitySystem
+    {
+        /// <summary>
+        /// Locale strings related to small parcels.
+        /// <summary>
+        public static readonly MailEntityStrings Mail = new()
+        {
+            NameAddressed = "mail-item-name-addressed",
+            DescClose = "mail-desc-close",
+            DescFar = "mail-desc-far"
+        };
+
+        /// <summary>
+        /// Locale strings related to large packages.
+        /// <summary>
+        public static readonly MailEntityStrings MailLarge = new()
+        {
+            NameAddressed = "mail-large-item-name-addressed",
+            DescClose = "mail-large-desc-close",
+            DescFar = "mail-large-desc-far"
+        };
+    }
+}
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
@@ -500,6 +500,7 @@
     state: white
 
 # Rubber Throngler.
+# Essentially a rubber hammer but with explosion noises and RSI
 - type: entity
   name: The Throngler
   parent: BaseItem

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Mail/base_mail_large.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Mail/base_mail_large.yml
@@ -17,8 +17,8 @@
       map: ["enum.MailVisualLayers.FragileStamp"]
       visible: false
     - map: ["enum.MailVisualLayers.JobStamp"]
-      scale: 0.75, 0.75
-      offset: 0.230, 0.035
+      scale: 0.8, 0.8
+      offset: 0.235, -0.01
     - state: locked
       map: ["enum.MailVisualLayers.Lock"]
     - state: priority

diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml
@@ -1520,3 +1520,16 @@
   - type: Mail
     contents:
       - id: PowerCellMicroreactor
+
+- type: entity
+  noSpawn: true
+  parent: BaseMailLarge
+  id: MailStationRepNFStationPet
+  suffix: station pet
+  components:
+  - type: Mail
+    - isFragile: true
+    contents:
+      - id: MaterialWoodPlank10
+      - id: PaperMailNFIkea
+      - id: DelayedPetCarrierNPCEmotionalSupportSafe
diff --git a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml
@@ -92,7 +92,8 @@
   jobs:
     StationRepresentative:
       MailNFGoldCigars: 0.45
+      MailStationRepNFStationPet: 1
     Sheriff:
       MailSecurityNonlethalsKit: 2
       MailNFGoldCigars: 0.45
-
+      MailStationRepNFStationPet: 1 # Don't see the harm in this with Smile and Cappy around
diff --git a/Resources/Prototypes/_NF/Mail/mail_specific_items.yml b/Resources/Prototypes/_NF/Mail/mail_specific_items.yml
@@ -4,11 +4,23 @@
   parent: BaseItem
   noSpawn: true
   name: delayed smoke
-  suffix: "Smoke (10s, delayed)"
+  suffix: "(10s)"
   components:
   - type: DelayedItem
     item: AdminInstantEffectSmoke10
 
+# Miscellaneous Items
+
+# Delay the emotional support pet so they don't suffocate.
+- type: entity
+  id: DelayedPetCarrierNPCEmotionalSupportSafe
+  parent: BaseItem
+  noSpawn: true
+  name: delayed emotional support pet
+  components:
+  - type: DelayedItem
+    item: PetCarrierNPCEmotionalSupportSafe
+
 # Papers (letters, ad copy)
 - type: entity
   id: PaperMailNFPowerTool
@@ -329,3 +341,19 @@
             [head=3]Sincerely,
                [italic]The Frontier Paper Pusher's Club[/italic][/head]
 
+- type: entity
+  id: PaperMailNFPetBedAssemblyManual
+  # noSpawn: true
+  suffix: "pet bed assembly manual"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+
+      [head=1]HÖGANÄS[/head]
+
+      [head=2](There is a black and white picture of a pet bed on the first page.)[/head]
+
+      [head=3](On the next few pages, you see a list of materials and a happy stick figure assembling furniture.)[/head]
+
+      [head=3](On the pages after that, you see a set of instructions to assemble a pet bed.  You're sure you don't need them, how hard could it be?)[/head]