From 9e2c8e9e2843c21ba65860454060a78e706e8fe3 Mon Sep 17 00:00:00 2001 From: Hero010h <163765999+Hero010h@users.noreply.github.com> Date: Fri, 20 Dec 2024 22:50:59 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=93=D1=80=D1=8F=D0=B4=D0=BA=D0=B0.=20?= =?UTF-8?q?=D0=9D=D0=B5=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0.=20=D0=9D?= =?UTF-8?q?=D0=B0=D0=B4=D0=BE=20=D1=87=D0=B8=D0=BD=D0=B8=D1=82=D1=8C...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/_White/Catalog/Cargo/cargo.yml | 10 +++ .../Entities/Objects/CargoCrates/misc.yml | 9 ++ .../Entities/Objects/Misc/packed_soil.yml | 14 ++++ .../_White/Entities/Structures/GrowingPot.yml | 84 +++++++++++++++++++ .../Construction/Graphs/growingPot.yml | 56 +++++++++++++ .../Recipes/Construction/GrowingPot.yml | 16 ++++ Resources/Prototypes/tags.yml | 3 + 7 files changed, 192 insertions(+) create mode 100644 Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml create mode 100644 Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml create mode 100644 Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml create mode 100644 Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml create mode 100644 Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml diff --git a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index 99241a6c00..a982f2e2e2 100644 --- a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -296,3 +296,13 @@ cost: 2000 category: Security group: market + + - type: cargoProduct + id: cargoPackedSoil + icon: + sprite: White/Objects/Weapons/Guns/Shotguns/rubber_pump.rsi + state: icon + product: CratePackedSoil + cost: 2000 + 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 new file mode 100644 index 0000000000..f2513e1f02 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml @@ -0,0 +1,9 @@ +- type: entity + parent: CrateHydroponics + id: CratePackedSoil + name: ящик с почвой + components: + - type: StorageFill + contents: + - id: packedSoil + amount: 3 \ 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 new file mode 100644 index 0000000000..f1721c7d02 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml @@ -0,0 +1,14 @@ +- type: entity + name: упаковка почвы + description: Можно засыпать в каркас грядки. + id: packedSoil + parent: BaseItem + components: + - type: Item + size: Small + - type: Sprite + sprite: Clothing/OuterClothing/Misc/apronbar.rsi + state: icon + - type: Tag + tags: + - PackedSoil \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml b/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml new file mode 100644 index 0000000000..800e1af171 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml @@ -0,0 +1,84 @@ +- type: entity + name: самодельная грядка + parent: [GrowingPotNoSoil, hydroponicsSoil] + id: GrowingPot + description: Позволяет выращивать различные культуры. + components: + - type: Transform + anchored: true + - type: Construction + graph: growingPot + node: GrowingPot + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank1: + min: 5 + max: 10 + +- type: entity + id: GrowingPotEmpty + parent: GrowingPot + suffix: Empty + components: + - type: PlantHolder + waterLevel: 0 + nutritionLevel: 0 + +- type: entity + name: каркас самодельной грядки + id: GrowingPotNoSoil + parent: BaseStructure + placement: + mode: SnapgridCenter + description: Позволяет выращивать различные культуры, однако не хватает земли... + components: + - type: Tag + tags: + - Structure + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.1" + density: 60 + hard: true + mask: + - MachineMask + - type: Appearance + - type: Clickable + - type: Transform + noRot: true + - type: Sprite + sprite: Structures/Hydroponics/misc.rsi + state: soil + noRot: true + - type: Construction + graph: growingPot + node: GrowingPotNoSoil + - type: Anchorable + - type: Damageable + DamageContainer: StructuralInorganic + DamageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank1: + min: 5 + max: 10 + - !type:DoActsBehavior + acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml b/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml new file mode 100644 index 0000000000..7a9535e1cf --- /dev/null +++ b/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml @@ -0,0 +1,56 @@ +- type: constructionGraph + id: growingPot + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: GrowingPotNoSoil + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WoodPlank + amount: 15 + doAfter: 1 + - material: MetalRod + amount: 4 + doAfter: 1 + + - node: GrowingPotNoSoil + entity: GrowingPotNoSoil + edges: + - to: GrowingPot + completed: + - !type:SnapToGrid + southRotation: true + steps: + - tag: PackedSoil + name: упаковка почвы + icon: + sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeStraight + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 15 + - !type:SpawnPrototype + prototype: PartRodMetal1 + amount: 4 + steps: + - tool: Screwing + doAfter: 1 + + - node: GrowingPot + entity: GrowingPotEmpty + edges: + - to: GrowingPotNoSoil + completed: + - !type:SpawnPrototype + prototype: packedSoil + amount: 1 + steps: + - tool: Prying + doAfter: 1 diff --git a/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml new file mode 100644 index 0000000000..76ee7accef --- /dev/null +++ b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml @@ -0,0 +1,16 @@ +- type: construction + id: GrowingPot + name: самодельная грядка + description: Деревнянная грядка для выращивания. + graph: growingPot + startNode: start + targetNode: GrowingPot + category: construction-category-furniture + icon: + sprite: Structures/Furniture/furniture.rsi + state: bed + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index baea3b07c5..0bcfd7ab49 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -948,6 +948,9 @@ - type: Tag id: Ore +- type: Tag + id: PackedSoil # WD edit + - type: Tag id: Packet From fb93ea4ecc96fe09dfb04c021d9d25b768b666a1 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Fri, 20 Dec 2024 23:10:43 +0300 Subject: [PATCH 2/7] =?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 --- Resources/Locale/ru-RU/_white/structures/growingpot.ftl | 2 ++ Resources/Prototypes/_White/Catalog/Cargo/cargo.yml | 4 ++-- .../Prototypes/_White/Recipes/Construction/GrowingPot.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/ru-RU/_white/structures/growingpot.ftl diff --git a/Resources/Locale/ru-RU/_white/structures/growingpot.ftl b/Resources/Locale/ru-RU/_white/structures/growingpot.ftl new file mode 100644 index 0000000000..fcea7f4a72 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/structures/growingpot.ftl @@ -0,0 +1,2 @@ +ent-GrowingPot = самодельная грядка + .desc = Деревнянная грядка для выращивания. diff --git a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index a982f2e2e2..58d776bd25 100644 --- a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -296,8 +296,8 @@ cost: 2000 category: Security group: market - - - type: cargoProduct + +- type: cargoProduct id: cargoPackedSoil icon: sprite: White/Objects/Weapons/Guns/Shotguns/rubber_pump.rsi diff --git a/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml index 76ee7accef..56cf94a9fc 100644 --- a/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml +++ b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml @@ -4,7 +4,7 @@ description: Деревнянная грядка для выращивания. graph: growingPot startNode: start - targetNode: GrowingPot + targetNode: growingPot category: construction-category-furniture icon: sprite: Structures/Furniture/furniture.rsi From 7f20dd1b5a599257030876c72d0fa42fcd29af66 Mon Sep 17 00:00:00 2001 From: Hero010h <163765999+Hero010h@users.noreply.github.com> Date: Sat, 28 Dec 2024 01:24:24 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=96=D0=B4=D1=91=D0=BC=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BA=D1=81=D1=82=D1=83=D1=80=D1=8B=20=D0=B3=D1=80=D1=8F=D0=B4?= =?UTF-8?q?=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_White/Entities/Structures/GrowingPot.yml | 16 ++++++++++------ .../Recipes/Construction/Graphs/growingPot.yml | 10 +++++----- .../_White/Recipes/Construction/GrowingPot.yml | 4 ++-- .../Hydroponics/growingpot.rsi/meta.json | 17 +++++++++++++++++ .../Hydroponics/growingpot.rsi/pot_empty.png | Bin 0 -> 424 bytes .../Hydroponics/growingpot.rsi/pot_filled.png | Bin 0 -> 687 bytes 6 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 Resources/Textures/Structures/Hydroponics/growingpot.rsi/meta.json create mode 100644 Resources/Textures/Structures/Hydroponics/growingpot.rsi/pot_empty.png create mode 100644 Resources/Textures/Structures/Hydroponics/growingpot.rsi/pot_filled.png diff --git a/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml b/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml index 800e1af171..084a6f6dbb 100644 --- a/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml +++ b/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml @@ -4,11 +4,14 @@ id: GrowingPot description: Позволяет выращивать различные культуры. components: + - type: Sprite + sprite: Structures/Hydroponics/growingpot.rsi + state: pot_filled - type: Transform anchored: true - type: Construction graph: growingPot - node: GrowingPot + node: growingPot - type: Destructible thresholds: - trigger: @@ -38,6 +41,11 @@ mode: SnapgridCenter description: Позволяет выращивать различные культуры, однако не хватает земли... components: + - type: InteractionOutline + - type: Sprite + sprite: Structures/Hydroponics/growingpot.rsi + state: pot_empty + noRot: true - type: Tag tags: - Structure @@ -55,13 +63,9 @@ - type: Clickable - type: Transform noRot: true - - type: Sprite - sprite: Structures/Hydroponics/misc.rsi - state: soil - noRot: true - type: Construction graph: growingPot - node: GrowingPotNoSoil + node: growingPotNoSoil - type: Anchorable - type: Damageable DamageContainer: StructuralInorganic diff --git a/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml b/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml index 7a9535e1cf..3eab17542b 100644 --- a/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml +++ b/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml @@ -6,7 +6,7 @@ actions: - !type:DestroyEntity {} edges: - - to: GrowingPotNoSoil + - to: growingPotNoSoil completed: - !type:SnapToGrid southRotation: true @@ -18,10 +18,10 @@ amount: 4 doAfter: 1 - - node: GrowingPotNoSoil + - node: growingPotNoSoil entity: GrowingPotNoSoil edges: - - to: GrowingPot + - to: growingPot completed: - !type:SnapToGrid southRotation: true @@ -43,10 +43,10 @@ - tool: Screwing doAfter: 1 - - node: GrowingPot + - node: growingPot entity: GrowingPotEmpty edges: - - to: GrowingPotNoSoil + - to: growingPotNoSoil completed: - !type:SpawnPrototype prototype: packedSoil diff --git a/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml index 56cf94a9fc..4a9924fbc9 100644 --- a/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml +++ b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml @@ -7,8 +7,8 @@ targetNode: growingPot category: construction-category-furniture icon: - sprite: Structures/Furniture/furniture.rsi - state: bed + sprite: Structures\Hydroponics\growingpot.rsi + state: pot_filled objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false diff --git a/Resources/Textures/Structures/Hydroponics/growingpot.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/growingpot.rsi/meta.json new file mode 100644 index 0000000000..eb9976840e --- /dev/null +++ b/Resources/Textures/Structures/Hydroponics/growingpot.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "dosharus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pot_filled" + }, + { + "name": "pot_empty" + } + ] +} diff --git a/Resources/Textures/Structures/Hydroponics/growingpot.rsi/pot_empty.png b/Resources/Textures/Structures/Hydroponics/growingpot.rsi/pot_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..d7635f977441fbdbb6132a41b59d6c9e55ff5976 GIT binary patch literal 424 zcmV;Z0ayNsP)Px$Vo5|nR9J=Wl}%5=KoExCrMpxhCSVjl2nX@w;{X3M8Zm(Y3Pehg(ssA42WnfE zwgI7D+~?HY*_nA~X0rtp3WY+UP$>R81ORR>&Vxp+vfiOAGM-ke2ParqR=f~A`kXCS z7*3{y0zjiy!OLKDaI$@PXkBAC0Vn{Nwgs09T%FY+gjZ-{N;SNH8Zhm3XG%$<%SEBd z0pQEBHw7gZj^H2xDO|*s0M8?My6A=4LE_1U^>Q5&%%96k2ILnT0uz z9CSwI7!gj+=yXP*OHFmS015n90Am{baKq+qYM`Z)nIo4hKgP6J0Oua6Cpwz#4vbMR zwc5NYWn7Vcw%P7r-0#A&omjvR#;CWIEGt-<#;&qpd7X?m?sqqA(FnLFz`fn8OrHJC zc%%^o2;k%P?h(ev06==>$*R-XrCasO7T#W;LBb~}`WNh7!VwrwrhohBr11?^1BPx%X-PyuR9J=Wl}%4mQ4ofoIrpnAA_go{u#FTjBqS35fD3=RE4P{$iBZs2N^L2$ zrMM5`8$X^6ulwM83OV0&HfV>eWn|i&jMS(q$!MO*nZ$glQ<2GY+Pq z$gMr*s8naakfrB`q#cXh%~gP*fUXw+3=X>=&{V39A=Z!{ThqAP8fwTpvRTDcdBIvQZ)^0i_g534-AIA*FhY z_n*t`ZRPm%y(}g`+jDtac+OF&j%^9OAf(glw|~Eo=ti0E@v_i^5B*0-Z;B#wSmD1L?`sze&cM@#89dq*lrC2u3I<@ zKaA$yIhKht)l@%>5S@$)uq=aQaNvc(%tT#(?i;r Date: Sun, 29 Dec 2024 16:19:04 +0300 Subject: [PATCH 4/7] =?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 Date: Wed, 1 Jan 2025 23:47:36 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B0=D0=B9=D1=82=20?= =?UTF-8?q?=D0=B7=D0=B5=D0=BC=D0=BB=D0=B8=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Structures/growingpot.rsi/packed_soil.png | Bin 646 -> 646 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png b/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png index f5a2d47abde5ffcccd04b9059ed139aae5e7a70f..4ed659ebbe932e0fb8eb845ce81962be1b50899a 100644 GIT binary patch delta 565 zcmV-50?Pe{1%?HXI)A}y({L2WKb9eivfiXq1SPu(mL^vbS~Bq<%Fe~>{0}C0@>CEe z^Cl=ePUu~sl#oF1Vo5t9^CHVU6q1ujD|*>zJd}i_Ce1Ig!jyeazhCn5-sk=Dd+(RP zss1HRCdd9{a_leC=Te^Fj&l%>v+M&~07+T}pj28qGi&$Tg?}_zR?nAZ8C9vFRL-(; z{U-g-PR!=%%U7|0Q5Z>DO#~2L0bMtcWf`r%hpNFz=bl!KaK702e z_T1Li^F*JyUVnkE8#Eeq0AyLtgw=H;oNsPEPK+hA0+!YD%jIPnje5-KJn6c@`uc-# z?s=ZSz5Sy29)M}qS(!&|AzlqhD&+zA8~XnNW_!Xy0n{hA+2}OGaS;gvBxRztOb*Q< z8=WRv%Pa(tSp}BWOYHkW=D-w!W;l+*IL-m1(HPhDihltBl*`NEIBls9&0)+Y3bDKU zCe^nPKy>-FmWis==Gq6XI>;WN-EJp#!a|!c?O@5ew=jUTKzV~h&Q`pLfU`Q;oiI2B zizw?55(4;BjYeZ^+fMBPAh-vDY_j@#)E2GdxJ zVB2cr?5IeqH@C@GL&lVAcS DUp*E_ delta 565 zcmV-50?Pe{1%?HXI)AZ?(@-48KbAuj<+@2vL6qDkSemRNG(>R_<>umg`WKv_i;JC3 z&P`BmJfXY8Q9=qCOPV8cE^;}CLNbZ8qRSnPLrF+#(!9h9r`&gXuleQo`~2Q}zu!yY zRR5ADljC4AISv--bE!yh*FA{FdG?_#fF!K~P^m1PnYH`vhkq$|OJTt>nGX_@G4lS6aJ z`fdxoZI%MatpdyHr}q6Yb6^TVD;mdPT=#&{XpHCi<$nMGs@3IaoVC=4<}hIshuGP9 zpXpl&Ain&1+eA|ubM3=c9cB;E>2y*%VW~ryb+P02~#b?tuc|gxlNig#M81?|;Jc{M^h>bz<}jb8+kdS|c7vlVAcS DCjb}6 From b5f012e21094083270d8dee24d76fd31a6348208 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Thu, 2 Jan 2025 20:18:55 +0300 Subject: [PATCH 6/7] =?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 | 6 ++- .../Entities/Objects/CargoCrates/misc.yml | 4 +- .../Entities/Objects/Misc/packed_soil.yml | 4 +- Resources/Prototypes/_White/tags.yml | 3 ++ Resources/Prototypes/tags.yml | 3 -- .../White/Structures/growingpot.rsi/meta.json | 36 +++++++++--------- .../Structures/growingpot.rsi/packed_soil.png | Bin 646 -> 1934 bytes 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index d78bf4c8eb..eb0d6fac72 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -123,8 +123,6 @@ components: - type: StorageFill contents: - - id: PackedSoil - prob: 0.10 - id: Lantern prob: 0.20 - id: Wirecutter @@ -188,6 +186,8 @@ prob: 0.10 - id: BarberScissors prob: 0.05 + - id: PackedSoil # WD + prob: 0.05 # Syndicate loot - id: null prob: 0.95 @@ -596,6 +596,8 @@ prob: 0.10 - id: BarberScissors prob: 0.05 + - id: PackedSoil # WD + prob: 0.05 # Syndicate loot - id: null prob: 0.95 diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml index a2cb16f2ed..986229067a 100644 --- a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml @@ -2,9 +2,9 @@ parent: CrateHydroponics id: CratePackedSoil name: ящик с почвой - description: Ящик, содержащий три упаковки с почвой + description: Ящик, содержащий пять упаковок с почвой. components: - type: StorageFill contents: - id: PackedSoil - amount: 5 \ No newline at end of file + amount: 5 diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml index fca3f60b0c..74b9712e62 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml @@ -5,7 +5,7 @@ parent: BaseItem components: - type: Item - size: Small + size: Normal - type: Sprite sprite: White/Structures/growingpot.rsi state: packed_soil @@ -13,4 +13,4 @@ tags: - PackedSoilTag - type: StaticPrice - price: 50 \ No newline at end of file + price: 10 diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml index de4f84d435..7fd259942a 100644 --- a/Resources/Prototypes/_White/tags.yml +++ b/Resources/Prototypes/_White/tags.yml @@ -150,3 +150,6 @@ - type: Tag id: MagazineKalashLightRifleBox + +- type: Tag + id: PackedSoilTag diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 60979abde5..baea3b07c5 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -948,9 +948,6 @@ - type: Tag id: Ore -- type: Tag - id: PackedSoilTag # WD edit - - type: Tag id: Packet diff --git a/Resources/Textures/White/Structures/growingpot.rsi/meta.json b/Resources/Textures/White/Structures/growingpot.rsi/meta.json index 3104bcb7f2..cc817e7473 100644 --- a/Resources/Textures/White/Structures/growingpot.rsi/meta.json +++ b/Resources/Textures/White/Structures/growingpot.rsi/meta.json @@ -1,20 +1,20 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "dosharus", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "pot_filled" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "dosharus", + "size": { + "x": 32, + "y": 32 }, - { - "name": "pot_empty" - }, - { - "name": "packed_soil" - } - ] -} + "states": [ + { + "name": "pot_filled" + }, + { + "name": "pot_empty" + }, + { + "name": "packed_soil" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png b/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png index 4ed659ebbe932e0fb8eb845ce81962be1b50899a..9368408eebe88e9e6d681dce5c388439c18212c2 100644 GIT binary patch literal 1934 zcmbVN3s4kg9A8uzj)yve$YANRP=a{3d&}Ly?QjZm=v{HB$E9e7F1vfj!rkq0yLb=8 z2bh_ejU$$Ts0r%e6sb*-5L#K;*cc85>NrW}gM45qiUw+Z%i~5HtI3_&-EVh)-|zqb z{a^d$+^pH5K~X^v1cmB#S|hl_;u#nKuDsWK2iznM-9jFMg2Tkq531T02|=T7vZfp% z$B;=-oJ~g3TplBH+Z+H5K`Arb4w5Ql1UQeeuyzgdTk{bFW@!zwKxx1Xj&vrU)p?yv zwl~W}c?&5ujm(%1r??3~U}FRlcH69Wo^WfB0bT;E#n&hT4?u)M4U#4rgmVmY;dIW) zz-pOXN@18BP68{13Qtz6r@=UeC!&}N#g$SVBQQCkRKi0C0?avSGhx)u8Zri+G)TT6 zI0zJVxm+?=qKtD|P`O&IMll@4aVbDZd5>Kn-BLRrGt8i6c*@B-1eUYIA|si{6$=^! zxH_o8=J3(l`Jp(0h@o!Mfy!l=sA&L5Q$C!d*l8UwPE#mjWo(RH-~m?d!#eUgf#dVJ zf1vh#e!>8Vt-;{4@l;=IHlGPz$XEts3utWmG z2B8LyX3d_bLX!yv{sa`%3{48;e}ZX>Fmp~D2?Vn?(!!t)y9I%LVI`m zUKk97-p&i8onrJ_4FWXFSe7PmGo?`GB?8}-3ZQ{e$fe101ui9Nm0F1@R0=hP5AWA< zRI!-Z;r;ag+&{<3g4QCf&&(q>oLCZsj^#nJJVPCk%@hr-tSmfG1q4Zn)vZA&F|7=Z z483NbIRb;Uu6zcN{!6+CVLWFRT%?mpvw&#*XE~w3c~tDfK^^GdB@TRhtY?SeU=WB) z-v|N^z9Gig!Q^s+5jF98Su_NVn5EaInQ~tL>Alv%u(a@FGhWRI-+f5GYr@Oku&9HF zf+h7+=6OfwUSD!DaC?gX8gE3!q=d80GbP{4E}5IE5AM#5JvS-n>}DO}jb~EUyq44* z+aFU<)_E$VzsA#<)N{VNasAjbPafOQF(K`X_EoVO~Y2>1=UA5tX`* zztE(CZvWA)JKP%D!+b>r@9!>sf8W%0<0fNo)S)fP8|cl*uFKVp#?=kyVs+p(^sf}am`d?hX z+TJ*E9pvuYKeKl&T+%gta%N3i%ehPQJATg^?YVpF)S0I4?$cIVJKA0OYf#A1I%E9E zo%;&va*krdg1d+FBMmG zO<$gyJdxg765aQwzjpkGm7`2cQkL=`MQk_)e+pGj@z$Ow>aRG_66LL}c`22SS~P$5 zqPXR)t2YG}e3?A$+v1Xtfb_mnv<6z0X;w$hA+BBQy&5@XTAu6P!>?N?N#Nuo=kv3r z&Z@h4=I;8&NRC8Q?k?wxfBT4y$1826JJV+qh{Pbh* z27WURO9&{B-gq(d1HZ9}0d1<;qc>Nm>P< zR9ZSSYxmoQG+9>9mt`4Msi9QPvU2?<{m)L!=IP5%SYU!3wU3@0igBw68#DT01O6$5CY)god%Wj zK9$Qicxz}V*MBY{-MTw;-gmA(d-oys+}76fM4!1{fvy`g8g&3ktwG_*0EWV{F?_?ExUT2ZC&}`g+tBz_x9= zT`jc)g=PSPI)>?2PE<*+Cu$Gr^)Ccq+jeYTtybp-n|-F+)#kYea(ol+?7SBGA=%&m zgzI{lnV;&!=odMC>i{SzkYE4+01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX Hu0mjfY$_wq From 634f83e08dc2babbe6f97c2cc7214dbcda46eee0 Mon Sep 17 00:00:00 2001 From: Hero010h <163765999+Hero010h@users.noreply.github.com> Date: Wed, 8 Jan 2025 00:39:13 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82=D0=B0?= =?UTF-8?q?=20=D1=81=D0=B0=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=B3=D1=80=D1=8F=D0=B4=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Structures/growingpot.rsi/pot_empty.png | Bin 424 -> 367 bytes .../Structures/growingpot.rsi/pot_filled.png | Bin 687 -> 580 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/White/Structures/growingpot.rsi/pot_empty.png b/Resources/Textures/White/Structures/growingpot.rsi/pot_empty.png index d7635f977441fbdbb6132a41b59d6c9e55ff5976..b06810c9a461639cc5e8da8c7fff886d97d980b2 100644 GIT binary patch delta 327 zcmV-N0l5CC1MdQmF@GsZL_t(oh3%8OPQySDMbGTRHZqE7Xj0Ho)AIinEfqaQ3Q&*| z5#l(zUJA?Wyl5~M&7R6$ukT#VoqOfB-SZ+O4rqHU3z^L}zK<&b$5#(mjUVL8YKtGv>Tkx{n{n-}uTBlo( Z_y!(+fTWKBHMjr(002ovPDHLkV1ifbpOF9n delta 384 zcmV-`0e}AQ0;mI!F@Iu7L_t(oh3%D1Pr^VDhTo;TR3Ii`6h8kgQ0GPG~mwyXfoz)?PS7>5NHN1Zs zFzt0`N=c*3MWM+7;LEZ%1tk}b;2;4hT*Q_D&m(xc?`#>5aR~wGB8JT7W-NdNK33Ke z08pkBT4_C*g*lHLbVlVE5l+tNbVi{|O?9{c3H(?9V;cN$!{%;kprw$*R-XrCasO7T#W;LBb~}`WNh7!Vwrw erhohBr11?^1B*MbaZrdbaeb@WPNx) z>iKK?9DsLw1Gcsz0BY}vqkycaFj^r3X%e} z7LAEDNmev*nWt#2(Kq>(^LRiI-oAOUYVpa8&>E7P{Fgfe0FG|HuTb~jz=v0{AH|l) z2wCO1EF9Z`CNdkhkKwLXR(YmL$)}^FJ%Uke8TBo(6@PN)IlhGPw#A5`)$f1sCtMAc z-)MzeNJ`(j(-?@1FbEY|z^GN#u~kjGAB6_z+ge5m^X!2)P}QEZW!1{R8~+WrwW@m4 zg~otULa0?Uf?4W_t$LCX%u>f7P-wLpfl>8+16k$&=?Frz(VkvE(1B@E0<^Z^+bn;w hEm&)BohCC3xB#R zx0)DeWn|i&jMS(q$!M zO*nZ$glQ<2GY+Pq$gMr*s8naakfrB`q#cXh%~gP*fUXw+3=X>=&{V39A=Z!{ThqAP8fwTpvRTDcdBIvQZ)^ z0i_g534-AIA%CTMi}#<)>}}=v^t~)5K-+V9TX@b$iWukmYB+g&3AObjWx>EMt=lxEFA0>Z#XVzG7s|LmFwO(yKJ?A!3abr^xS^q zY}3S0svp>H4Fj%QI14|F=H5A$i8IwyKa3Eaj0&(UgJf{vg~7~3U4QNyw=yrzvW!sy zVHlH1Ie)C@i!{$lGu7Uva+)BT@4KEaQY#4K;2@qD%N z@xlIE{dV7Bsc)w8%ux1K!P;^f;Gg#Mxn^#29- lmhb>n>gWIdqw^