Little rework of existing yaml flatpacks (#24814)

* Little rework of existing yaml flatpacks * comit 2 * 55 * 66 * 77 * WRAAAA * done mr sloth * Update flatpack.yml * fix?? (cherry picked from commit 326b89031809a88c7c6a0a5ecb2b1b2a23b082f1)
2024-02-22 03:44:22 +01:00 · 2024-02-22 03:44:22 +01:00 · b4dc5351fb
parent 85f003da2f
commit b4dc5351fb
20 changed files with 62 additions and 88 deletions
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@ -198,3 +198,8 @@ YellowOxygenTankFilled: OxygenTankFilled
 Drone: null
 # SpawnMobDrone: null
 Onestar: null # I dont think this is even mapped, but just in case
+
+# 2024-02-22
+SolarAssemblyPart: SolarAssemblyFlatpack
+AmePart: AmePartFlatpack
+AmePartStealObjective: AmePartFlatpackStealObjective
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@ -63,8 +63,8 @@
 - type: cargoProduct
  id: EngineSolar
  icon:
-    sprite: Objects/Power/solar_parts.rsi
-    state: solar_assembly_parts
+    sprite: Objects/Devices/flatpack.rsi
+    state: solar-assembly-part
  product: CrateEngineeringSolar
  cost: 500
  category: Engineering
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@ -8,7 +8,7 @@
  components:
  - type: StorageFill
    contents:
-      - id: AmePart
+      - id: AmePartFlatpack
        amount: 9

 - type: entity
@ -123,7 +123,7 @@
  components:
  - type: StorageFill
    contents:
-      - id: SolarAssemblyPart
+      - id: SolarAssemblyFlatpack
        amount: 6

 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@ -35,3 +35,35 @@
      cpu_supply: "#A46106"
  - type: StaticPrice
    price: 250
+
+- type: entity
+  parent: BaseFlatpack
+  id: SolarAssemblyFlatpack
+  name: solar assembly flatpack
+  description: A flatpack used for constructing a solar assembly.
+  components:
+  - type: Flatpack
+    entity: SolarAssembly
+  - type: Sprite
+    layers:
+    - state: solar-assembly-part
+  - type: StaticPrice
+    price: 75
+
+- type: entity
+  parent: BaseFlatpack
+  id: AmePartFlatpack
+  name: AME flatpack
+  description: A flatpack used for constructing an antimatter engine reactor.
+  components:
+  - type: Sprite
+    layers:
+    - state: ame-part
+  - type: Flatpack
+    entity: AmeShielding
+  - type: StaticPrice
+    price: 500
+  - type: GuideHelp
+    guides: [ AME, Power ]
+  - type: StealTarget
+    stealGroup: AmePartFlatpack
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
@ -1,20 +0,0 @@
- type: entity
-  parent: BaseItem
-  id: AmePart
-  name: AME flatpack
-  description: A flatpack used for constructing an antimatter engine reactor.
-  components:
-  - type: Item
-    size: Normal
-    sprite: Objects/Power/AME/ame_part.rsi
-  - type: Sprite
-    sprite: Objects/Power/AME/ame_part.rsi
-    state: box
-  - type: Flatpack
-    entity: AmeShielding
-  - type: StaticPrice
-    price: 500
-  - type: GuideHelp
-    guides: [ AME, Power ]
-  - type: StealTarget
-    stealGroup: AmePart
--- a/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
@ -1,13 +0,0 @@
- type: entity
-  parent: BaseItem
-  id: SolarAssemblyPart
-  name: solar assembly flatpack
-  description: A flatpack used for constructing a solar assembly.
-  components:
-  - type: Item
-    size: Normal
-  - type: Flatpack
-    entity: SolarAssembly
-  - type: Sprite
-    sprite: Objects/Power/solar_parts.rsi
-    state: solar_assembly_parts
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@ -92,7 +92,7 @@
    MedicalTechFabCircuitboardStealObjective: 1
    ClothingHeadsetAltMedicalStealObjective: 1
    FireAxeStealObjective: 1                            #eng
-    AmePartStealObjective: 1
+    AmePartFlatpackStealObjective: 1
    ExpeditionsCircuitboardStealObjective: 1            #sup
    CargoShuttleCircuitboardStealObjective: 1
    SalvageShuttleCircuitboardStealObjective: 1
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@ -215,11 +215,11 @@
    state: icon

 - type: stealTargetGroup
-  id: AmePart
+  id: AmePartFlatpack
  name: AME part
  sprite:
-    sprite: Objects/Power/AME/ame_part.rsi
-    state: box
+    sprite: Objects/Devices/flatpack.rsi
+    state: ame-part

 - type: stealTargetGroup
  id: SalvageExpeditionsComputerCircuitboard
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@ -260,12 +260,12 @@
 - type: entity
  noSpawn: true
  parent: BaseThiefStealObjective
-  id: AmePartStealObjective
+  id: AmePartFlatpackStealObjective
  components:
  - type: NotJobRequirement
    job: StationEngineer
  - type: StealCondition
-    stealGroup: AmePart
+    stealGroup: AmePartFlatpack
  - type: Objective
    difficulty: 1

--- a/Resources/Prototypes/Parallaxes/test.yml
+++ b/Resources/Prototypes/Parallaxes/test.yml
@ -17,7 +17,7 @@
      scale: "3, 3"
    - texture:
        !type:ImageParallaxTextureSource
-        path: "/Textures/Objects/Power/AME/ame_part.rsi/box.png"
+        path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png"
      slowness: 0.995
      tiled: false
      controlHomePosition: "-128, -128"
@ -38,7 +38,7 @@
      scale: "1, 1"
    - texture:
        !type:ImageParallaxTextureSource
-        path: "/Textures/Objects/Power/AME/ame_part.rsi/box.png"
+        path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png"
      slowness: 0.0
      tiled: false
      controlHomePosition: "0, 32"
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
@ -12,7 +12,7 @@
            - !type:AdminLog  # I don't like logging it like this. The log should include the user, AMEShielding EntityID, and AMEPart EntityID, and there should also be a start of attempt log.
              message: "An AME shielding was deconstructed"
            - !type:SpawnPrototype
-              prototype: AmePart
+              prototype: AmePartFlatpack
              amount: 1
            - !type:DeleteEntity
          steps:
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
@ -6,11 +6,11 @@
      edges:
        - to: solarassembly
          steps:
-            - tag: SolarAssemblyPart
+            - tag: SolarAssemblyFlatpack
              name: Solar Assembly Parts
              icon:
-                sprite: Objects/Power/solar_parts.rsi
-                state: solar_assembly_parts
+                sprite: Objects/Devices/flatpack.rsi
+                state: solar-assembly-part
              doAfter: 1

    - node: solarassembly
@ -19,7 +19,7 @@
        - to: start
          completed:
            - !type:SpawnPrototype
-              prototype: SolarAssemblyPart
+              prototype: SolarAssemblyFlatpack
              amount: 1
            - !type:DeleteEntity {}
          steps:
--- a/Resources/ServerInfo/Guidebook/Engineering/AME.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/AME.xml
@ -7,7 +7,7 @@ The AME is one of the simplest engines available. You put together the multi-til
 <Box>Required parts:</Box>
 <Box>
 <GuideEntityEmbed Entity="AmeController"/>
-<GuideEntityEmbed Entity="AmePart"/>
+<GuideEntityEmbed Entity="AmePartFlatpack"/>
 <GuideEntityEmbed Entity="AmeJar"/>
 </Box>

--- a/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png
+++ b/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png
--- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14",
+    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041",
    "size": {
        "x": 32,
        "y": 32
@ -15,6 +15,12 @@
        },
        {
            "name": "icon-default"
+        },
+        {
+            "name": "solar-assembly-part"
+        },
+        {
+            "name": "ame-part"
        }
    ]
 }
--- a/Resources/Textures/Objects/Power/solar_parts.rsi/solar_assembly_parts.png
+++ b/Resources/Textures/Objects/Power/solar_parts.rsi/solar_assembly_parts.png
--- a/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-left.png
+++ b/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-left.png
--- a/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-right.png
+++ b/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-right.png
--- a/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json
+++ b/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json
@ -1,22 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "box"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
--- a/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json
@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "solar_assembly_parts"
-    }
-  ]
-}