Wallpaper update + paper folder (#495)

* paper folders

* Update CP14WorkbenchSystem.cs

* wallpaper update

* Update walls.yml

* remove cable sprites

* Update migration.yml

Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs

@@ -30,7 +30,6 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
-
     private EntityQuery<MetaDataComponent> _metaQuery;
     private EntityQuery<StackComponent> _stackQuery;
 
@@ -86,6 +85,7 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem
         }
 
         var resultEntity = Spawn(_proto.Index(args.Recipe).Result);
+        _stack.TryMergeToContacts(resultEntity);
 
         _solutionContainer.TryGetSolution(resultEntity, recipe.Solution, out var resultSoln, out var resultSolution);
         if (recipe.TryMergeSolutions && resultSoln is not null)

Resources/Locale/en-US/_CP14/stack/materials.ftl

@@ -6,4 +6,6 @@ cp14-stack-cloth = rolls of fabric
 
 cp14-stack-copper-bars = copper bars
 cp14-stack-iron-bars = iron bars
-cp14-stack-gold-bars = gold bars
+cp14-stack-gold-bars = gold bars
+
+cp14-stack-wallpaper = rolls of wallpaper

Resources/Locale/en-US/_CP14/stack/wallpaper.ftl

@@ -1,2 +0,0 @@
-cp14-stack-wallpaper-pink = rolls of pink wallpaper
-cp14-stack-wallpaper-green = rolls of green wallpaper

Resources/Locale/ru-RU/_CP14/stack/materials.ftl

@@ -6,4 +6,6 @@ cp14-stack-cloth = рулоны ткани
 
 cp14-stack-copper-bars = медные слитки
 cp14-stack-iron-bars = железные слитки
-cp14-stack-gold-bars = золотые слитки
+cp14-stack-gold-bars = золотые слитки
+
+cp14-stack-wallpaper = рулон розоев

Resources/Locale/ru-RU/_CP14/stack/wallpaper.ftl

@@ -1,2 +0,0 @@
-cp14-stack-wallpaper-pink = рулоны розовых обоев
-cp14-stack-wallpaper-green = рулоны зеленых обоев

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml

@@ -0,0 +1,53 @@
+- type: entity
+  id: CP14PaperFolderBase
+  abstract: true
+  parent: BaseStorageItem
+  categories: [ ForkFiltered ]
+  name: folder
+  description: A folder filled with some paperwork.
+  components:
+  - type: Item
+    size: Small
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,4,3
+    whitelist:
+      tags:
+        - Document
+  - type: Tag
+    tags:
+    - Folder
+  - type: StorageFill
+    contents:
+      - id: CP14Paper
+        prob: 1
+      - id: CP14Paper
+        prob: 1
+      - id: CP14Paper
+        prob: 0.8
+      - id: CP14Paper
+        prob: 0.6
+      - id: CP14Paper
+        prob: 0.4
+      - id: CP14Paper
+        prob: 0.2
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+
+- type: entity
+  id: CP14PaperFolderBlue
+  parent: CP14PaperFolderBase
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Bureaucracy/paper.rsi
+    state: folder_blue
+
+- type: entity
+  id: CP14PaperFolderRed
+  parent: CP14PaperFolderBase
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Bureaucracy/paper.rsi
+    state: folder_red

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml

@@ -56,6 +56,9 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 1
+  - type: Tag
+    tags:
+    - Document
 
 - type: entity
   parent: CP14BasePaper

Resources/Prototypes/_CP14/Entities/Objects/wallpaper.yml

@@ -9,34 +9,25 @@
     size: Normal
   - type: Sprite
     sprite: _CP14/Structures/Wallpaper/icons.rsi
-
-- type: entity
-  id: CP14WallpaperPurple1
-  parent: CP14BaseWallpaper
-  name: purple wallpaper
-  suffix: 1
-  components:
-  - type: Sprite
-    state: purple
-  - type: CP14Wallpaper
-    rsiPath: _CP14/Structures/Wallpaper/wallpaper_purple.rsi
-  - type: Stack
-    stackType: CP14WallpaperPurple
-    count: 1
-
-- type: entity
-  id: CP14WallpaperPurple30
-  parent: CP14WallpaperPurple1
-  suffix: 30
-  components:
   - type: Stack
     count: 30
 
 - type: entity
-  id: CP14WallpaperGreen1
+  id: CP14WallpaperBlack
   parent: CP14BaseWallpaper
-  name: green wallpaper
-  suffix: 1
+  name: wallpaper "inkwell black"
+  components:
+  - type: Sprite
+    state: black
+  - type: CP14Wallpaper
+    rsiPath: _CP14/Structures/Wallpaper/wallpaper_black.rsi
+  - type: Stack
+    stackType: CP14WallpaperBlack
+
+- type: entity
+  id: CP14WallpaperGreen
+  parent: CP14BaseWallpaper
+  name: wallpaper "green orthogonality"
   components:
   - type: Sprite
     state: green
@@ -44,12 +35,63 @@
     rsiPath: _CP14/Structures/Wallpaper/wallpaper_green.rsi
   - type: Stack
     stackType: CP14WallpaperGreen
-    count: 1
 
 - type: entity
-  id: CP14WallpaperGreen30
-  parent: CP14WallpaperGreen1
-  suffix: 30
+  id: CP14WallpaperPurple
+  parent: CP14BaseWallpaper
+  name: wallpaper "purple glory"
   components:
+  - type: Sprite
+    state: purple
+  - type: CP14Wallpaper
+    rsiPath: _CP14/Structures/Wallpaper/wallpaper_purple.rsi
   - type: Stack
-    count: 30
+    stackType: CP14WallpaperPurple
+
+- type: entity
+  id: CP14WallpaperRed
+  parent: CP14BaseWallpaper
+  name: wallpaper "burgundy"
+  components:
+  - type: Sprite
+    state: red
+  - type: CP14Wallpaper
+    rsiPath: _CP14/Structures/Wallpaper/wallpaper_red.rsi
+  - type: Stack
+    stackType: CP14WallpaperRed
+
+- type: entity
+  id: CP14WallpaperWhite
+  parent: CP14BaseWallpaper
+  name: wallpaper "flowers on white"
+  components:
+  - type: Sprite
+    state: white
+  - type: CP14Wallpaper
+    rsiPath: _CP14/Structures/Wallpaper/wallpaper_white.rsi
+  - type: Stack
+    stackType: CP14WallpaperWhite
+
+- type: entity
+  id: CP14WallpaperWhite2
+  parent: CP14BaseWallpaper
+  name: wallpaper "pure white"
+  components:
+  - type: Sprite
+    state: white2
+  - type: CP14Wallpaper
+    rsiPath: _CP14/Structures/Wallpaper/wallpaper_white2.rsi
+  - type: Stack
+    stackType: CP14WallpaperWhite2
+
+- type: entity
+  id: CP14WallpaperYellow
+  parent: CP14BaseWallpaper
+  name: wallpaper "solar rhythm"
+  components:
+  - type: Sprite
+    state: yellow
+  - type: CP14Wallpaper
+    rsiPath: _CP14/Structures/Wallpaper/wallpaper_yellow.rsi
+  - type: Stack
+    stackType: CP14WallpaperYellow

Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml

@@ -63,6 +63,7 @@
     sprite: _CP14/Structures/Walls/whitebricks_stone_wall.rsi
   - type: IconSmooth
     base: stonebricks
+  - type: CP14WallpaperHolder
 
 - type: entity
   id: CP14WallBrownbrick

Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml

@@ -260,3 +260,71 @@
     CP14BloodFlower: 2
     CP14FlowersYellow: 2
   result: CP14ClothingHeadWreath
+
+# Wallpaper (TODO: Move to separate workbench?)
+
+- type: CP14Recipe
+  id: CP14WallpaperBlack
+  tag: CP14RecipeSewing
+  craftTime: 2
+  stacks:
+    CP14Cloth: 10
+  entities:
+    CP14DyeBlack: 1
+  result: CP14WallpaperBlack
+
+- type: CP14Recipe
+  id: CP14WallpaperGreen
+  tag: CP14RecipeSewing
+  craftTime: 2
+  stacks:
+    CP14Cloth: 10
+  entities:
+    CP14DyeGreen: 1
+  result: CP14WallpaperGreen
+
+- type: CP14Recipe
+  id: CP14WallpaperPurple
+  tag: CP14RecipeSewing
+  craftTime: 2
+  stacks:
+    CP14Cloth: 10
+  entities:
+    CP14DyePurple: 1
+  result: CP14WallpaperPurple
+
+- type: CP14Recipe
+  id: CP14WallpaperRed
+  tag: CP14RecipeSewing
+  craftTime: 2
+  stacks:
+    CP14Cloth: 10
+  entities:
+    CP14DyeRed: 1
+  result: CP14WallpaperRed
+
+- type: CP14Recipe
+  id: CP14WallpaperWhite
+  tag: CP14RecipeSewing
+  craftTime: 2
+  stacks:
+    CP14Cloth: 10
+  result: CP14WallpaperWhite
+
+- type: CP14Recipe
+  id: CP14WallpaperWhite2
+  tag: CP14RecipeSewing
+  craftTime: 2
+  stacks:
+    CP14Cloth: 10
+  result: CP14WallpaperWhite2
+
+- type: CP14Recipe
+  id: CP14WallpaperYellow
+  tag: CP14RecipeSewing
+  craftTime: 2
+  stacks:
+    CP14Cloth: 10
+  entities:
+    CP14DyeYellow: 1
+  result: CP14WallpaperYellow

Resources/Prototypes/_CP14/Stacks/wallpapers.yml

@@ -1,13 +1,48 @@
 - type: stack
-  id: CP14WallpaperPurple
-  name: cp14-stack-wallpaper-purple
-  spawn: CP14WallpaperPurple1
-  icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: purple }
+  id: CP14WallpaperBlack
+  name: cp14-stack-wallpaper
+  spawn: CP14WallpaperBlack
+  icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: black }
   maxCount: 30
 
 - type: stack
   id: CP14WallpaperGreen
-  name: cp14-stack-wallpaper-green
-  spawn: CP14WallpaperGreen1
+  name: cp14-stack-wallpaper
+  spawn: CP14WallpaperGreen
   icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: green }
   maxCount: 30
+
+- type: stack
+  id: CP14WallpaperPurple
+  name: cp14-stack-wallpaper
+  spawn: CP14WallpaperPurple
+  icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: purple }
+  maxCount: 30
+
+- type: stack
+  id: CP14WallpaperRed
+  name: cp14-stack-wallpaper
+  spawn: CP14WallpaperRed
+  icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: red }
+  maxCount: 30
+
+- type: stack
+  id: CP14WallpaperWhite
+  name: cp14-stack-wallpaper
+  spawn: CP14WallpaperWhite
+  icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: white }
+  maxCount: 30
+
+- type: stack
+  id: CP14WallpaperWhite2
+  name: cp14-stack-wallpaper
+  spawn: CP14WallpaperWhite2
+  icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: white2 }
+  maxCount: 30
+
+- type: stack
+  id: CP14WallpaperYellow
+  name: cp14-stack-wallpaper
+  spawn: CP14WallpaperYellow
+  icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: yellow }
+  maxCount: 30

Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json

@@ -1,12 +1,18 @@
 {
   "version": 1,
   "license": "CLA",
-  "copyright": "Created by Max Gab for CrystallPunk",
+  "copyright": "Created by Max Gab for CrystallPunk, folders by TheShuEd",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
+    {
+      "name": "folder_blue"
+    },
+    {
+      "name": "folder_red"
+    },
     {
       "name": "paper"
     },

Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/meta.json

@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "license": "CLA",
-  "copyright": "by TheShuEd for CrystallPunk",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "lv_coil10"
-    },
-    {
-      "name": "lv_coil20"
-    },
-    {
-      "name": "lv_coil30"
-    }
-  ]
-}

Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/meta.json

@@ -1,75 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-	"license": "CLA",
-	"copyright": "Created by TheShuEd for CrystallPunk",
-    "states": [
-        {
-            "name": "cable_0",
-            "directions": 4
-        },
-        {
-            "name": "cable_1",
-            "directions": 4
-        },
-        {
-            "name": "cable_2",
-            "directions": 4
-        },
-        {
-            "name": "cable_3",
-            "directions": 4
-        },
-        {
-            "name": "cable_4",
-            "directions": 4
-        },
-        {
-            "name": "cable_5",
-            "directions": 4
-        },
-        {
-            "name": "cable_6",
-            "directions": 4
-        },
-        {
-            "name": "cable_7",
-            "directions": 4
-        },
-        {
-            "name": "cable_8",
-            "directions": 4
-        },
-        {
-            "name": "cable_9",
-            "directions": 4
-        },
-        {
-            "name": "cable_10",
-            "directions": 4
-        },
-        {
-            "name": "cable_11",
-            "directions": 4
-        },
-        {
-            "name": "cable_12",
-            "directions": 4
-        },
-        {
-            "name": "cable_13",
-            "directions": 4
-        },
-        {
-            "name": "cable_14",
-            "directions": 4
-        },
-        {
-            "name": "cable_15",
-            "directions": 4
-        }
-    ]
-}

Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/meta.json

@@ -8,10 +8,25 @@
   },
   "states": [
     {
-      "name": "purple"
+      "name": "black"
     },
     {
       "name": "green"
+    },
+    {
+      "name": "purple"
+    },
+    {
+      "name": "red"
+    },
+    {
+      "name": "white"
+    },
+    {
+      "name": "white2"
+    },
+    {
+      "name": "yellow"
     }
   ]
 }

Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "Created by Max Gab (discord) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "bottom",
+      "directions": 4
+    },
+    {
+      "name": "top",
+      "directions": 4
+    },
+    {
+      "name": "left",
+      "directions": 4
+    },
+    {
+      "name": "right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "Created by Max Gab (discord) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "bottom",
+      "directions": 4
+    },
+    {
+      "name": "top",
+      "directions": 4
+    },
+    {
+      "name": "left",
+      "directions": 4
+    },
+    {
+      "name": "right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "Created by Max Gab (discord) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "bottom",
+      "directions": 4
+    },
+    {
+      "name": "top",
+      "directions": 4
+    },
+    {
+      "name": "left",
+      "directions": 4
+    },
+    {
+      "name": "right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "Created by Max Gab (discord) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "bottom",
+      "directions": 4
+    },
+    {
+      "name": "top",
+      "directions": 4
+    },
+    {
+      "name": "left",
+      "directions": 4
+    },
+    {
+      "name": "right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "Created by Max Gab (discord) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "bottom",
+      "directions": 4
+    },
+    {
+      "name": "top",
+      "directions": 4
+    },
+    {
+      "name": "left",
+      "directions": 4
+    },
+    {
+      "name": "right",
+      "directions": 4
+    }
+  ]
+}

Resources/migration.yml

@@ -75,7 +75,7 @@ CP14WoodenDoorTavernDorms5: CP14WoodenDoorTavernDorms
 CP14WoodenDoorTavernAlchemyLocked: CP14WoodenDoorTavernAlchemy
 
 #2024-09-24
-CP14WallpaperPink30: CP14WallpaperPurple30
+CP14WallpaperPink30: CP14WallpaperPurple
 
 #2024-09-25
 CP14IronGrilleStraight: CP14FenceIronGrilleStraight
@@ -104,6 +104,14 @@ CP14BarrelBloodGrassSap: CP14BarrelBloodFlowerSap
 
 #2024-10-11
 CP14WoodenDresser: CP14WoodenCabinet
+
+#2024-10-17
+CP14WallpaperPurple1: CP14WallpaperPurple
+CP14WallpaperPurple30: CP14WallpaperPurple
+CP14WallpaperGreen1: CP14WallpaperGreen
+CP14WallpaperGreen30: CP14WallpaperGreen
+
+
 # <---> CrystallPunk migration zone end