From a73f8e3113aa0b91c567c1b377f742297dd67322 Mon Sep 17 00:00:00 2001 From: Alexsey Bezyuk <41479614+PhantornRU@users.noreply.github.com> Date: Wed, 21 May 2025 19:41:22 +1000 Subject: [PATCH] Seed sack and craft (#1287) * seed_sack * full seed sack * seed sack sprite * name and description --- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 7 ++ .../Objects/Specific/Farming/sack.yml | 61 ++++++++++++++++++ .../Objects/Specific/Farming/seeds.yml | 3 + .../Recipes/Workbench/CookingTable/seeds.yml | 1 + .../_CP14/Recipes/Workbench/sewing_table.yml | 12 ++++ Resources/Prototypes/_CP14/tags.yml | 3 + .../_CP14/Objects/Storage/sack.rsi/meta.json | 7 +- .../_CP14/Objects/Storage/sack.rsi/seed.png | Bin 0 -> 2020 bytes .../last_launch_result/result.json | 14 ++++ 9 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_CP14/Objects/Storage/sack.rsi/seed.png diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 9100e0b6cd..b3355c0239 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -3157,6 +3157,13 @@ ent-CP14SackFarmingWheat = { ent-CP14SackFarming } .desc = { ent-CP14SackFarming.desc } .suffix = Пшеница +ent-CP14SackFarmingSeed = мешочек для семян + .desc = Мешочек для хранения семян растений. + +ent-CP14SackFarmingSeedFull = { ent-CP14SackFarmingSeed } + .desc = { ent-CP14SackFarmingSeed.desc } + .suffix = Полный + ent-CP14SeedWheat = семена пшеницы .desc = Маленькие семена пшеницы. Что вы будете с ними делать? Размолоть в муку или посадить снова? diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml index a8048a39e4..1c887e1361 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml @@ -63,6 +63,8 @@ - type: entity id: CP14SackFarmingWheat + name: seed sack + description: Sack for various plant seeds. parent: CP14SackFarming suffix: Wheat components: @@ -76,3 +78,62 @@ - id: CP14Wheat amount: 5 prob: 0.4 + +- type: entity + id: CP14SackFarmingSeed + parent: CP14SackFarming + suffix: Seed + components: + - type: Sprite + sprite: _CP14/Objects/Storage/sack.rsi + state: seed + - type: Item + size: Small + - type: Storage + maxItemSize: Tiny + grid: + - 0,0,6,3 + quickInsert: true + areaInsert: true + whitelist: + tags: + - CP14FarmSeed + +- type: entity + id: CP14SackFarmingSeedFull + parent: CP14SackFarmingSeed + suffix: Full + components: + - type: StorageFill + contents: + - id: CP14SeedWheat + amount: 4 + - id: CP14SeedWheat + amount: 2 + prob: 0.6 + - id: CP14SeedWheat + amount: 1 + prob: 0.4 + - id: CP14SeedPumpkin + amount: 3 + - id: CP14SeedPumpkin + amount: 1 + prob: 0.4 + - id: CP14SeedCucumber + amount: 3 + - id: CP14SeedTomato + amount: 3 + - id: CP14SeedCabbage + amount: 2 + - id: CP14SeedPepper + amount: 2 + - id: CP14SeedSage + amount: 2 + - id: CP14SeedSage + amount: 1 + prob: 0.4 + - id: CP14SeedCotton + amount: 2 + - id: CP14SeedCotton + amount: 1 + prob: 0.4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml index 3929a26da7..5f245d429a 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml @@ -9,6 +9,9 @@ - type: Sprite sprite: _CP14/Objects/Specific/Farming/seeds.rsi - type: CP14Seed + - type: Tag + tags: + - CP14FarmSeed - type: entity id: CP14SeedWheat diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml index 1e6355b4b4..ad271ca5b5 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/seeds.yml @@ -7,6 +7,7 @@ protoId: CP14Wheat count: 1 result: CP14SeedWheat + resultCount: 3 - type: CP14Recipe id: CP14SeedTomato diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index 32a5376ad1..48d6276203 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -255,6 +255,18 @@ count: 4 result: CP14SackFarming +- type: CP14Recipe + id: CP14SackFarmingSeed + tag: CP14RecipeSewing + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14String + - !type:StackResource + stack: CP14Cloth + count: 2 + result: CP14SackFarmingSeed + # Wallpaper (TODO: Move to separate workbench?) - type: CP14Recipe diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 382354c162..681ae5251e 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -112,6 +112,9 @@ - type: Tag id: CP14FarmFood +- type: Tag + id: CP14FarmSeed + - type: Tag id: CP14AlchemicalHerbals diff --git a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json index c57e82414c..c807edc953 100644 --- a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json @@ -1,14 +1,17 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by Artista", + "copyright": "Created by Artista. Seed sack By Ell_Good", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon" + }, + { + "name": "seed" } ] } diff --git a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/seed.png b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..ebbb5485b19a0234744a73424d47fc081a0523bf GIT binary patch literal 2020 zcmbVN3sBQ`7!RO`D2T!)3Lc^C1W((fEw5&FJX)kM3+15#&XY7vOQcO=5}+WCIw#1) z2TmrNC^EL4$mGsD-^jqJ%=Z*@=%$0Y+fxTRbla)Z{ac`?o0~UtN&8Ro`~SZ0`+bj8 z>QWNDJg0g>5agAlQKy4{*nWAqgI~U+ zeS7jzonJ+JK*I5c`5xE%*w8ec`O=Z9q=j$6SR1@0ZDfK1y~A$!!fFgI9Z=Z|`bymySBKy?%+$1Y1+emk~ax zu}z!r2k1PxM^N&qyQMyhZC7|@P?e%%Jh#|o?zBbuww#UL7qbU4PwynNyZWccy|jMJ zyX(%$4+d3KCi`BxkT&_mfLpFK$Q(88;QYNGx7{s!sGQg{NYeF*9l{V^hf9S|X3 zDH=*>mR1L=7>YLIuwJ2b<)!OuuecR#EP?sRD#-LasUm46UP>CW`}VDfskg>Lec^c zuu>N8$p*WipI;BvZN(mtk3?LmZsQjE%^sF+ZM%f-=hLMAqn z2EELvH-^iiqeu3u8KS_R*^&K*|G7Vvqd;rn=I7?IH=MmBFb&0nWEBs0LC>DQ_roy5N%N&2}u7V-9s>*F$zUEN5+|eTF)#e1UQe_`*0`@ z`Uhe0yoYfM$%w%abQFxO)qEwUzF@5bzElFs$Vw6ym~a&zq8&i z*ekR$;bic!)V^HS_e|~C85zbH+e+TO;&s=h0y_~a*uBL&e)O2MoqW{jlW7;q%P;>F zsL!v#4yRR~YU{qXtZZBFHRbP1(vvq$sY$=|g3VP2wY%h&AL`3BWfU^B3se=L`F8x> z?|0Alvz59Ho(uGk>Nv0>;S;FSOTA+8fx0CL$+s^&+*f*F*{92|s-~Kv+ivO$s44pM ziH+UUugwXb5ZJ${?`L)2y$2I3&wq0<5Q=T={vy67Wb5jiE5dGlcPht=syni$Irp%u zyyg9`&D6ph0bSenYVKFNK=4{QN>_c=cv+cWeO6QQ27rHXOY>mnoLOz&8=y%I?fGRl zABDyKSkkqpqJG_$-+V3xK|b2rdYMWjtd4sWk-wJjkk6}k->@df_j)(KX}dLcnQxu@ vJD-nTw0@LshhLfL!7gS85 >g*X&M9UACaVl6m?5{?i+sru+_?p literal 0 HcmV?d00001 diff --git a/Tools/_CP14/LocalizationHelper/last_launch_result/result.json b/Tools/_CP14/LocalizationHelper/last_launch_result/result.json index 1bb305cfd5..32d1f439d3 100644 --- a/Tools/_CP14/LocalizationHelper/last_launch_result/result.json +++ b/Tools/_CP14/LocalizationHelper/last_launch_result/result.json @@ -7307,6 +7307,20 @@ "parent": "CP14SackFarming", "suffix": "Wheat" }, + "CP14SackFarmingSeed": { + "id": "CP14SackFarmingSeed", + "name": "seed sack", + "description": "Sack for various plant seeds.", + "parent": "CP14SackFarming", + "suffix": null + }, + "CP14SackFarmingSeedFull": { + "id": "CP14SackFarmingSeedFull", + "name": null, + "description": null, + "parent": "CP14SackFarming", + "suffix": "Full" + }, "CP14BaseSeed": { "id": "CP14BaseSeed", "name": null,