From 5aefcb95bf58ec02640ac437914fe730c0c06049 Mon Sep 17 00:00:00 2001 From: Hero010h <163765999+Hero010h@users.noreply.github.com> Date: Sun, 29 Dec 2024 16:19:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 2 ++ .../VendingMachines/Inventories/nutri.yml | 1 + .../Prototypes/_White/Catalog/Cargo/cargo.yml | 6 +++--- .../Entities/Objects/CargoCrates/misc.yml | 5 +++-- .../Entities/Objects/Misc/packed_soil.yml | 10 ++++++---- .../_White/Entities/Structures/GrowingPot.yml | 4 ++-- .../Recipes/Construction/Graphs/growingPot.yml | 17 +++++++++++------ .../_White/Recipes/Construction/GrowingPot.yml | 2 +- Resources/Prototypes/tags.yml | 2 +- .../Structures}/growingpot.rsi/meta.json | 3 +++ .../Structures/growingpot.rsi/packed_soil.png | Bin 0 -> 646 bytes .../Structures}/growingpot.rsi/pot_empty.png | Bin .../Structures}/growingpot.rsi/pot_filled.png | Bin 13 files changed, 33 insertions(+), 19 deletions(-) rename Resources/Textures/{Structures/Hydroponics => White/Structures}/growingpot.rsi/meta.json (83%) create mode 100644 Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png rename Resources/Textures/{Structures/Hydroponics => White/Structures}/growingpot.rsi/pot_empty.png (100%) rename Resources/Textures/{Structures/Hydroponics => White/Structures}/growingpot.rsi/pot_filled.png (100%) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 9dd4c37ca2..d78bf4c8eb 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -123,6 +123,8 @@ components: - type: StorageFill contents: + - id: PackedSoil + prob: 0.10 - id: Lantern prob: 0.20 - id: Wirecutter diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml index 1dd893507d..9d0d364bb5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml @@ -18,6 +18,7 @@ HandheldSeedAnalyzer: 2 EZNutrientChemistryBottle: 3 Eftpos: 4 + PackedSoil: 5 #WD edit emaggedInventory: Left4ZedChemistryBottle: 1 diff --git a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index 58d776bd25..0cae35282b 100644 --- a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -300,9 +300,9 @@ - type: cargoProduct id: cargoPackedSoil icon: - sprite: White/Objects/Weapons/Guns/Shotguns/rubber_pump.rsi - state: icon + sprite: White/Structures/growingpot.rsi + state: packed_soil product: CratePackedSoil - cost: 2000 + cost: 500 category: cargoproduct-category-name-hydroponics group: market diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml index f2513e1f02..a2cb16f2ed 100644 --- a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml @@ -2,8 +2,9 @@ parent: CrateHydroponics id: CratePackedSoil name: ящик с почвой + description: Ящик, содержащий три упаковки с почвой components: - type: StorageFill contents: - - id: packedSoil - amount: 3 \ No newline at end of file + - id: PackedSoil + amount: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml index f1721c7d02..fca3f60b0c 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml @@ -1,14 +1,16 @@ - type: entity name: упаковка почвы description: Можно засыпать в каркас грядки. - id: packedSoil + id: PackedSoil parent: BaseItem components: - type: Item size: Small - type: Sprite - sprite: Clothing/OuterClothing/Misc/apronbar.rsi - state: icon + sprite: White/Structures/growingpot.rsi + state: packed_soil - type: Tag tags: - - PackedSoil \ No newline at end of file + - PackedSoilTag + - type: StaticPrice + price: 50 \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml b/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml index 084a6f6dbb..83ec7ba420 100644 --- a/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml +++ b/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml @@ -5,7 +5,7 @@ description: Позволяет выращивать различные культуры. components: - type: Sprite - sprite: Structures/Hydroponics/growingpot.rsi + sprite: White/Structures/growingpot.rsi state: pot_filled - type: Transform anchored: true @@ -43,7 +43,7 @@ components: - type: InteractionOutline - type: Sprite - sprite: Structures/Hydroponics/growingpot.rsi + sprite: White/Structures/growingpot.rsi state: pot_empty noRot: true - type: Tag diff --git a/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml b/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml index 3eab17542b..1b3f921780 100644 --- a/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml +++ b/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml @@ -13,7 +13,7 @@ steps: - material: WoodPlank amount: 15 - doAfter: 1 + doAfter: 4 - material: MetalRod amount: 4 doAfter: 1 @@ -22,15 +22,17 @@ entity: GrowingPotNoSoil edges: - to: growingPot + conditions: + - !type:EntityAnchored completed: - !type:SnapToGrid southRotation: true steps: - - tag: PackedSoil + - tag: PackedSoilTag name: упаковка почвы icon: - sprite: Structures/Piping/Atmospherics/pipe.rsi - state: pipeStraight + sprite: White/Structures/growingpot.rsi + state: packed_soil - to: start completed: - !type:SpawnPrototype @@ -47,10 +49,13 @@ entity: GrowingPotEmpty edges: - to: growingPotNoSoil + conditions: + - !type:EntityAnchored completed: - !type:SpawnPrototype - prototype: packedSoil + prototype: PackedSoil amount: 1 + - !type:EmptyAllContainers steps: - tool: Prying - doAfter: 1 + doAfter: 5 diff --git a/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml index 4a9924fbc9..3b76e3e1e0 100644 --- a/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml +++ b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml @@ -7,7 +7,7 @@ targetNode: growingPot category: construction-category-furniture icon: - sprite: Structures\Hydroponics\growingpot.rsi + sprite: White/Structures/growingpot.rsi state: pot_filled objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 0bcfd7ab49..60979abde5 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -949,7 +949,7 @@ id: Ore - type: Tag - id: PackedSoil # WD edit + id: PackedSoilTag # WD edit - type: Tag id: Packet diff --git a/Resources/Textures/Structures/Hydroponics/growingpot.rsi/meta.json b/Resources/Textures/White/Structures/growingpot.rsi/meta.json similarity index 83% rename from Resources/Textures/Structures/Hydroponics/growingpot.rsi/meta.json rename to Resources/Textures/White/Structures/growingpot.rsi/meta.json index eb9976840e..3104bcb7f2 100644 --- a/Resources/Textures/Structures/Hydroponics/growingpot.rsi/meta.json +++ b/Resources/Textures/White/Structures/growingpot.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "pot_empty" + }, + { + "name": "packed_soil" } ] } diff --git a/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png b/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png new file mode 100644 index 0000000000000000000000000000000000000000..f5a2d47abde5ffcccd04b9059ed139aae5e7a70f GIT binary patch literal 646 zcmV;10(t$3P)Px%CP_p=R9J=Wm$8e}P#niUmO~Wfx=Bw#l-wp*nyex;L~#)1=Hhz#7o4Dri=9r+ zO;Bz;p}WITLJAp6nj>;9ayf@WGKsXJ%N>nFNl0qayu=Ep+;@7f`Q`Wf{N8)N-%H_C z|B@z?<6ts54i@QisYr0wJ&4A6_Mt6+B&`BasVtqDwfpUdELm1RkYyQ7X`s~3vU2?< zgU@cl=Ea-0iGXn!Nm@+>5MBYp=poB8`d|-DX|QrM4SwZfh3`LpG7ir1_`w|j?l(33 zFCX!aF5rLt27o@;OZ6)Z0ASm81Of2qu1f8EK<)AkKJ;{yYnPC2-5Wl6{_<*kn{3-= zbMsZI&q7;Z7(GZkVoFmqrEK`R=^VO;ls(P)h4`Q-ors@3IaoVC=4<}hIshuGP9pXpl& zAin&1+eA|ubM3=c9cB;E>2y*%VW~ryb+P0