more engraveable items, system "fixes"

new-frontiers-14 · Dec 28, 2024 · bf62afd · bf62afd
1 parent 382c837
commit bf62afd
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 deletions.
diff --git a/Content.Server/_CD/Engraving/EngraveableComponent.cs b/Content.Server/_CD/Engraving/EngraveableComponent.cs
@@ -16,17 +16,17 @@ public sealed partial class EngraveableComponent : Component
     ///     The inspect text to use when there is no engraving
     /// </summary>
     [DataField]
-    public LocId NoEngravingText = "engraving-dogtags-no-message";
+    public LocId NoEngravingText = "engraving-generic-no-message"; // Frontier: "dogtags"<"generic"
 
     /// <summary>
     ///     The message to use when successfully engraving the item
     /// </summary>
     [DataField]
-    public LocId EngraveSuccessMessage = "engraving-dogtags-succeed";
+    public LocId EngraveSuccessMessage = "engraving-generic-succeed"; // Frontier: "dogtags"<"generic"
 
     /// <summary>
     ///     The inspect text to use when there is an engraving. The message will be shown seperately afterwards.
     /// </summary>
     [DataField]
-    public LocId HasEngravingText = "engraving-dogtags-has-message";
+    public LocId HasEngravingText = "engraving-generic-has-message"; // Frontier: "dogtags"<"generic"
 }
diff --git a/Content.Server/_CD/Engraving/EngraveableSystem.cs b/Content.Server/_CD/Engraving/EngraveableSystem.cs
@@ -27,12 +27,12 @@ public override void Initialize()
     private void OnExamined(Entity<EngraveableComponent> ent, ref ExaminedEvent args)
     {
         var msg = new FormattedMessage();
-        msg.AddMarkupOrThrow(Loc.GetString(ent.Comp.EngravedMessage == string.Empty
-            ? ent.Comp.NoEngravingText
-            : ent.Comp.HasEngravingText));
-
-        if (ent.Comp.EngravedMessage != string.Empty)
-            msg.AddMarkupPermissive(Loc.GetString(ent.Comp.EngravedMessage));
+        // Frontier: don't localize the message, use args in fluent entries
+        if (ent.Comp.EngravedMessage == string.Empty)
+            msg.AddMarkupOrThrow(Loc.GetString(ent.Comp.NoEngravingText, ("object", ent)));
+        else
+            msg.AddMarkupOrThrow(Loc.GetString(ent.Comp.HasEngravingText, ("object", ent), ("message", ent.Comp.EngravedMessage)));
+        // End Frontier
 
         args.PushMessage(msg, 1);
     }
@@ -66,7 +66,7 @@ private void AddEngraveVerb(Entity<EngraveableComponent> ent, ref GetVerbsEvent<
                             return;
 
                         ent.Comp.EngravedMessage = message;
-                        _popup.PopupEntity(Loc.GetString(ent.Comp.EngraveSuccessMessage),
+                        _popup.PopupEntity(Loc.GetString(ent.Comp.EngraveSuccessMessage, ("object", ent)),
                             actor.PlayerSession.AttachedEntity.Value,
                             actor.PlayerSession,
                             PopupType.Medium);

diff --git a/Resources/Locale/en-US/_CD/engraving/engraving.ftl b/Resources/Locale/en-US/_CD/engraving/engraving.ftl
@@ -1,6 +1,7 @@
 engraving-verb-engrave = Engrave
 engraving-popup-ui-message = Description
 
-engraving-dogtags-no-message = The dogtags don't seem to have any kind of engraving.
-engraving-dogtags-has-message = The dogtags are engraved with a message that reads:{" "}
-engraving-dogtags-succeed = You successfully engrave the dogtags with your message.
+# Frontier: generic engraving messages
+engraving-generic-no-message = There isn't anything engraved on {THE($object)}.
+engraving-generic-has-message = There's a message engraved on {THE($object)}. It reads: {$message}
+engraving-generic-succeed = You successfully engrave {THE($object)} with your message.
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -74,6 +74,7 @@
         Gold: 200 # 2 bars
     - type: StaticPrice
       price: 300
+    - type: Engraveable # Frontier - base rings may not be metallic
 
 - type: entity
   abstract: true
@@ -86,3 +87,4 @@
         Silver: 200 # 2 bars
     - type: StaticPrice
       price: 275
+    - type: Engraveable # Frontier - base rings may not be metallic
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -18,6 +18,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shinyflask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -46,6 +47,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/detflask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -55,6 +57,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hosflask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -64,6 +67,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -73,6 +77,7 @@
   components:
     - type: Sprite
       sprite: Objects/Consumable/Drinks/barflask.rsi
+    - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -82,6 +87,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask_old.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase
@@ -91,6 +97,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lithiumflask.rsi
+  - type: Engraveable # Frontier
 
 - type: entity
   parent: FlaskBase

diff --git a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml
@@ -57,3 +57,4 @@
     sprite: Objects/Devices/goldwatch.rsi
   - type: StaticPrice
     price: 500 #if you ever increase the price of kidneys, increase this too.
+  - type: Engraveable # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -212,6 +212,7 @@
   - type: UseDelay
   - type: IgnitionSource
     ignited: false
+  - type: Engraveable # Frontier
 
 - type: entity
   name: flippo engraved lighter