Port Magic Crayon From Frontier (DeltaV-Station#2410)

* ART

* Update clown.yml

* Loadout fixes, time req

* loadout bgone

* Fixes, moved things

* fixoneoops

* More fixes

* CRAFTING WORKS!

* Flipped slashes

* UNTOUCHED! AT LAST

* Fix comment

* Mailladd

* Webedit ops

Signed-off-by: Avalon <[email protected]>

* untroll indent

Signed-off-by: deltanedas <[email protected]>

---------

Signed-off-by: Avalon <[email protected]>
Signed-off-by: deltanedas <[email protected]>
Co-authored-by: deltanedas <[email protected]>

Content.Client/Crayon/CrayonSystem.cs

@@ -57,6 +57,17 @@ protected override void FrameUpdate(FrameEventArgs args)
             }
 
             _parent.UIUpdateNeeded = false;
+
+            // Frontier: unlimited crayon, Delta V Port
+            if (_parent.Capacity == int.MaxValue)
+            {
+                _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label-unlimited",
+                    ("color", _parent.Color),
+                    ("state", _parent.SelectedState)));
+                return;
+            }
+            // End Frontier, Delta V Port
+
             _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label",
                 ("color",_parent.Color),
                 ("state",_parent.SelectedState),

Content.Server/Crayon/CrayonSystem.cs

@@ -73,9 +73,14 @@ private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, Aft
         if (component.UseSound != null)
             _audio.PlayPvs(component.UseSound, uid, AudioParams.Default.WithVariation(0.125f));
 
-        // Decrease "Ammo"
-        component.Charges--;
-        Dirty(uid, component);
+        // Frontier: check if crayon is infinite, Delta V Port
+        if (component.Charges != int.MaxValue)
+        {
+            // Decrease "Ammo"
+            component.Charges--;
+            Dirty(uid, component);
+        }
+        // End Frontier, Delta V Port
 
         _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{EntityManager.ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}");
         args.Handled = true;

Resources/Locale/en-US/_NF/crayon/crayon-component.ftl

@@ -0,0 +1,5 @@
+
+## Entity
+
+crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color]
+

Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml

@@ -85,6 +85,8 @@
       amount: 2 
     - id: CrayonMime
     - id: CrayonRainbow
+    - id: CrayonMagic # Delta V - A construction graph was made, but still can find in the wild
+      prob: .10
 
 - type: entity
   id: ToolboxMechanicalFilled

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -134,6 +134,8 @@
     children:
     - id: StrangePill
       prob: 0.20
+    - id: CrayonMagic # Delta V - Just another way to get it
+      prob: .01
     # Tools
     - !type:NestedSelector
       tableId: MaintToolsTable

Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml

@@ -1555,6 +1555,8 @@
   - type: Mail
     contents:
     - id: CrayonBox
+    - id: CrayonMagic
+    - prob: .10
 
 - type: entity
   parent: BaseMail

Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail_civilian.yml

@@ -178,6 +178,8 @@
     - id: CrayonBox
     - id: Paper
       maxAmount: 3
+    - id: CrayonMagic
+    - prob: .2
 
 - type: entity
   parent: BaseMail

Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml

@@ -0,0 +1,31 @@
+- type: entity
+  parent: CrayonRainbow
+  id: CrayonMagic
+  name: magic crayon
+  description: Specially blended with bluespace crystals and certified non-toxic.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Fun/magic_crayon.rsi
+    state: icon
+  - type: Item
+    sprite: _NF/Objects/Fun/magic_crayon.rsi
+    heldPrefix: icon
+  - type: Tag # Removing trash & recyclable
+    tags:
+    - Write
+    - Crayon
+  - type: Crayon
+    capacity: 2147483647 # int.MaxValue, infinite charges
+  - type: FlavorProfile
+    flavors:
+    - chewy
+    - magical
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nothing
+          Quantity: 100
+  - type: Construction
+    graph: magic_crayon
+    node: magicCrayon

Resources/Prototypes/_NF/Recipes/Crafting/Graphs/magic_crayon.yml

@@ -0,0 +1,28 @@
+- type: constructionGraph
+  id: magic_crayon
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: magicCrayon
+          steps:
+            - material: Bluespace
+              amount: 1
+            - tag: CrayonRed
+              name: red crayon
+              icon:
+                sprite: Objects/Fun/crayons.rsi
+                state: red
+            - tag: CrayonGreen
+              name: green crayon
+              icon:
+                sprite: Objects/Fun/crayons.rsi
+                state: green
+            - tag: CrayonBlue
+              name: blue crayon
+              icon:
+                sprite: Objects/Fun/crayons.rsi
+                state: blue
+              doAfter: 5
+    - node: magicCrayon
+      entity: CrayonMagic

Resources/Prototypes/_NF/Recipes/Crafting/magic_crayon.yml

@@ -0,0 +1,10 @@
+- type: construction
+  name: Magic Crayon
+  id: CrayonMagic
+  graph: magic_crayon
+  startNode: start
+  targetNode: magicCrayon
+  category: construction-category-misc
+  description: A crayon that lasts forever! Pretty too
+  icon: { sprite: _NF/Objects/Fun/magic_crayon.rsi, state: icon }
+  objectType: Item

Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json

@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, tweaked by Ubaser and whatston3 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "icon-inhand-left",
+            "directions": 4,
+            "delays": [
+                [ 0.2, 0.2, 0.2 ],
+                [ 0.2, 0.2, 0.2 ],
+                [ 0.2, 0.2, 0.2 ],
+                [ 0.2, 0.2, 0.2 ]
+            ]
+        },
+        {
+            "name": "icon-inhand-right",
+            "directions": 4,
+            "delays": [
+                [ 0.2, 0.2, 0.2 ],
+                [ 0.2, 0.2, 0.2 ],
+                [ 0.2, 0.2, 0.2 ],
+                [ 0.2, 0.2, 0.2 ]
+            ]
+        }
+    ]
+}
+