Adds more sources for sheet paper material (#21364)

* Moves sheetifier research unlock from civilian services to industrial

* Makes wood insertable into the sheetifier and makes paper a lathable material

* Adds a paper crate to the cargo catalog

* Adds localizations

diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index abd61d1065f0a913117d531057cf1295dce112e1..d515479a0e4396a45a65a5abea7b82c251971590 100644 (file)
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -18,6 +18,7 @@ materials-durathread = durathread
 materials-plasma = plasma
 materials-plastic = plastic
 materials-wood = wood
+materials-paper = paper
 materials-uranium = uranium
 materials-bananium = bananium
 materials-meat = meat

diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl
index 802b71eda9b883bbcd49635316469438ed993430..88e58b647e87fda5562cd4e6f78674c2c97b2ac2 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl
@@ -19,6 +19,9 @@ ent-MaterialPlasma = { ent-CrateMaterialPlasma }
 ent-CardboardMaterial = { ent-CrateMaterialCardboard }
     .desc = { ent-CrateMaterialCardboard.desc }
 
+ent-PaperMaterial = { ent-CrateMaterialPaper }
+    .desc = { ent-CrateMaterialPaper.desc }
+
 ent-MaterialFuelTank = { ent-WeldingFuelTankFull }
     .desc = { ent-WeldingFuelTankFull.desc }
 

diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl
index 505220730fe7d29a92f83a5194282bc426a060dd..c204215474ae2c35d802aa5c3ca481fad0536e6d 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl
@@ -21,3 +21,6 @@ ent-CrateMaterialPlasma = Solid plasma crate
 
 ent-CrateMaterialCardboard = Cardboard crate
     .desc = 60 pieces of cardboard.
+
+ent-CrateMaterialPaper = Paper crate
+    .desc = 90 sheets of paper.

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
index 98dc8671de160085d183ba847c0eb49d060bef95..bebc3fc3075d9a75326e6b6e7bc5ffdd1a7c990d 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -68,6 +68,16 @@
   category: Materials
   group: market
 
+- type: cargoProduct
+  id: PaperMaterial
+  icon:
+    sprite: Objects/Materials/Sheets/other.rsi
+    state: paper_3
+  product: CrateMaterialPaper
+  cost: 1000
+  category: Materials
+  group: market
+
 - type: cargoProduct
   id: MaterialFuelTank
   icon:
@@ -86,4 +96,4 @@
   product: WaterTankFull
   cost: 1000
   category: Materials
-  group: market
\ No newline at end of file
+  group: market

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index fd49ec339c17e9318f3734edb3e290659980248d..dc73a5106a9858ea7b9ce6b3f1ca8a8ef15574d1 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -70,6 +70,15 @@
       - id: MaterialCardboard
         amount: 2
 
+- type: entity
+  id: CrateMaterialPaper
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetPaper
+        amount: 3
+
 #- type: entity
 #  id: CrateMaterialHFuelTank
 #  name:  fueltank crate

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index ed1a1e3da0c871a6492de71b0386feeff8494cb3..31fefb681efb33aca4ed796609cb66f5d5ccce88 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -37,6 +37,10 @@
     - paper
     - paper_2
     - paper_3
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Paper: 100
   - type: Sprite
     state: paper_3
     layers:

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 4af2886c24554a0c03530c6c1c4fd1ae5ad0bc91..c74bec6a061970a5b154eb59c494a1c705b49ea1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -223,6 +223,11 @@
   - type: Appearance
   - type: Item
     heldPrefix: wood
+  - type: Tag
+    tags:
+    - Wooden
+    - DroneUsable
+    - RawMaterial
 
 - type: entity
   parent: MaterialWoodPlank

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index fbd19d5fd070f674fe1b93071b14130a652ea637..38839d9f9fce1803df36971824ca295208caf6dc 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -887,9 +887,11 @@
     whitelist:
       tags:
       - Raw
+      - Wooden
   - type: Lathe
     idleState: base_machine
     runningState: base_machine_processing
     canEjectStoredMaterials: false
     staticRecipes:
     - MaterialSheetMeat
+    - SheetPaper

diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
index e9a0cad37df8e7c71e020a507060f07db144bd42..a8fc1744b3b5f22a67011d132ca670b47c267065 100644 (file)
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -34,6 +34,14 @@
   color: "#8291a1"
   price: 0.15 # 1-1 mix of plastic and cloth.
 
+- type: material
+  id: Paper
+  stackEntity: SheetPaper1
+  name: materials-paper
+  icon: { sprite: Objects/Materials/Sheets/other.rsi, state: paper }
+  color: "#d9d9d9"
+  price: 0.05 #same as wood
+
 - type: material
   id: Plasma
   stackEntity: SheetPlasma1
@@ -98,4 +106,4 @@
   unit: materials-unit-piece
   icon: { sprite: Objects/Materials/materials.rsi, state: bones }
   color: "#896f5e"
-  price: 0
\ No newline at end of file
+  price: 0

diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index cbfc0ca4527f203f5f1634ae216149520eb414fb..f724b96bc08176ccc2ab1a10c4d3a4ebab3a7931 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -139,3 +139,10 @@
   completetime: 6.4
   materials:
     Meaterial: 200
+
+- type: latheRecipe
+  id: SheetPaper
+  result: SheetPaper1
+  completetime: 1
+  materials:
+    Wood: 50

diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 9208775094470763b7ac52cea431c9914cb3257b..d82090719e133806bc1de2ffe86a57e5a53c2d31 100644 (file)
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -157,7 +157,6 @@
   cost: 5000
   recipeUnlocks:
   - FatExtractorMachineCircuitboard
-  - SheetifierMachineCircuitboard
 
 - type: technology
   id: HONKMech

diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 58ff346e0eff6fe53908dfe8549baf0d07eab6d4..797ec2b7b7b33811515cef58d0ecc9ed23fe6b5b 100644 (file)
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -1,4 +1,4 @@
-# Tier 1
+# Tier 1
 
 - type: technology
   id: SalvageEquipment
@@ -54,6 +54,7 @@
   - AutolatheMachineCircuitboard
   - CircuitImprinterMachineCircuitboard
   - MaterialReclaimerMachineCircuitboard
+  - SheetifierMachineCircuitboard
 
 - type: technology
   id: PowerGeneration