From 326b89031809a88c7c6a0a5ecb2b1b2a23b082f1 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 22 Feb 2024 03:44:22 +0100 Subject: [PATCH] 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?? --- .../Catalog/Cargo/cargo_engines.yml | 6 ++-- .../Catalog/Fills/Crates/engines.yml | 4 +-- .../Entities/Objects/Devices/flatpack.yml | 32 ++++++++++++++++++ .../Objects/Power/antimatter_part.yml | 20 ----------- .../Entities/Objects/Power/solar_parts.yml | 13 ------- .../Prototypes/Objectives/objectiveGroups.yml | 2 +- .../Objectives/stealTargetGroups.yml | 6 ++-- Resources/Prototypes/Objectives/thief.yml | 4 +-- Resources/Prototypes/Parallaxes/test.yml | 4 +-- .../Graphs/utilities/ame_shielding.yml | 2 +- .../Graphs/utilities/solarpanel.yml | 8 ++--- .../ServerInfo/Guidebook/Engineering/AME.xml | 2 +- .../flatpack.rsi/ame-part.png} | Bin .../Objects/Devices/flatpack.rsi/meta.json | 8 ++++- .../flatpack.rsi/solar-assembly-part.png} | Bin .../Power/AME/ame_part.rsi/inhand-left.png | Bin 197 -> 0 bytes .../Power/AME/ame_part.rsi/inhand-right.png | Bin 213 -> 0 bytes .../Objects/Power/AME/ame_part.rsi/meta.json | 22 ------------ .../Objects/Power/solar_parts.rsi/meta.json | 14 -------- Resources/migration.yml | 5 +++ 20 files changed, 63 insertions(+), 89 deletions(-) delete mode 100644 Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Power/solar_parts.yml rename Resources/Textures/Objects/{Power/AME/ame_part.rsi/box.png => Devices/flatpack.rsi/ame-part.png} (100%) rename Resources/Textures/Objects/{Power/solar_parts.rsi/solar_assembly_parts.png => Devices/flatpack.rsi/solar-assembly-part.png} (100%) delete mode 100644 Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/solar_parts.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index 0ae1468bfa..1efa3973e5 100644 --- 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 @@ -89,7 +89,7 @@ cost: 1200 category: Engineering group: market - + - type: cargoProduct id: EngineTeslaGroundingRod icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index 3129e28b72..315c4dda2c 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml index 39e9401832..5ac66affdf 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml deleted file mode 100644 index 9aa6014066..0000000000 --- a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml b/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml deleted file mode 100644 index de8aef6518..0000000000 --- a/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index aa443781cf..7100fc34f3 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -84,7 +84,7 @@ MedicalTechFabCircuitboardStealObjective: 1 ClothingHeadsetAltMedicalStealObjective: 1 FireAxeStealObjective: 1 #eng - AmePartStealObjective: 1 + AmePartFlatpackStealObjective: 1 ExpeditionsCircuitboardStealObjective: 1 #sup CargoShuttleCircuitboardStealObjective: 1 SalvageShuttleCircuitboardStealObjective: 1 diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index c6f6e6c8ca..028c7c1939 100644 --- 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 diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index db1eb3111e..5ee8bd25d1 100644 --- 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 diff --git a/Resources/Prototypes/Parallaxes/test.yml b/Resources/Prototypes/Parallaxes/test.yml index b38182849f..8a7a6e8310 100644 --- 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" diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml index 98a4857be6..cf2bf9aaf7 100644 --- 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: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml index cf6d75f46d..0914ae46e5 100644 --- 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: diff --git a/Resources/ServerInfo/Guidebook/Engineering/AME.xml b/Resources/ServerInfo/Guidebook/Engineering/AME.xml index a0bcb44a44..202ed16d3d 100644 --- 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 Required parts: - + diff --git a/Resources/Textures/Objects/Power/AME/ame_part.rsi/box.png b/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png similarity index 100% rename from Resources/Textures/Objects/Power/AME/ame_part.rsi/box.png rename to Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json index 6381b5c80b..8e573c2ade 100644 --- 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" } ] } diff --git a/Resources/Textures/Objects/Power/solar_parts.rsi/solar_assembly_parts.png b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png similarity index 100% rename from Resources/Textures/Objects/Power/solar_parts.rsi/solar_assembly_parts.png rename to Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png diff --git a/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-left.png b/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-left.png deleted file mode 100644 index a45ce6c6938fb01f35cef1f86abbd91f7ef8eb4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=J)SO(Ar*7p-rC4}SV4p(Kq$4_ zo~e36{b7zXj#1?knQkc7mfu$!+f}aP&|UhaW5y&=!Ie`s zt!a75y2k3wsynLs3F_-_Hm=<|{~R+&14F~?s+ih_d>M1*t=AS>=lr&o5e(kOd|Rx* rWRud*ZYH-o`x;&{cW##OV_;Z(FVRN!pRShnB#=f=S3j3^P6V1@9@k z5{Doi>|$1^-(=lMCA|%k>|`+eR_J-qm;Fqw(gatRSrn4UT#4cI$qBPmSc8 zTRJVx@|S0<^Z6K$va63b?~|&0{^>ol-u{Mn)(Ox4%P}Y@J>q0)Rp4d(zgrHZ*VEO{ JWt~$(696HMRa5`~ diff --git a/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json b/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json deleted file mode 100644 index c36b2d3284..0000000000 --- a/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json +++ /dev/null @@ -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 - } - ] -} diff --git a/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json b/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json deleted file mode 100644 index 5379dae116..0000000000 --- a/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json +++ /dev/null @@ -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" - } - ] -} diff --git a/Resources/migration.yml b/Resources/migration.yml index e2ef8c0c69..09a2fdd70c 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -219,3 +219,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 -- 2.51.2