From 2207907a95193bd1be691acf408eddac3985b1ce Mon Sep 17 00:00:00 2001 From: JustKekc Date: Thu, 14 Dec 2023 22:08:22 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BE=D1=87=D0=B8=D1=89=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D0=B8=D0=BD?= =?UTF-8?q?=20=D0=B1=D0=B5=D0=B7=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?= =?UTF-8?q?=D0=B4=D0=BE=D0=B2.=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D1=8E=D1=89=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Consumable/Food/mandarin.yml | 48 ++++++++++++++---- .../Hydroponics/mandarin.rsi/meta.json | 3 ++ .../Hydroponics/mandarin.rsi/peeledprod.png | Bin 0 -> 388 bytes 3 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Specific/Hydroponics/mandarin.rsi/peeledprod.png diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml index fec4d43e71f..ae9cbf36c61 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml @@ -2,16 +2,20 @@ # плод - type: entity name: mandarin - parent: FoodLemon + parent: FoodProduceBase id: ADTFoodMandarin description: Healthy, very orange. suffix: NewYear components: - - type: FlavorProfile - flavors: - - ADTmandarin - - type: Food - trash: ADTTrashMandarinPeel + - type: SolutionContainerManager + solutions: + food: + maxVol: 9 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi - type: Produce @@ -21,9 +25,28 @@ reagents: - ReagentId: ADTJuiceMandarin Quantity: 10 - - type: SliceableFood - count: 5 - slice: ADTFoodMandarinSlice + - type: SpawnItemsOnUse + items: + - id: ADTFoodMandarinPeeled + - id: ADTTrashMandarinPeel + - type: Tag + tags: + - Fruit + +- type: entity + name: mandarin + parent: ADTFoodMandarin + id: ADTFoodMandarinPeeled + description: Peeled mandarin. Is it holidays already? + suffix: NewYear + components: + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + state: peeledprod + - type: SpawnItemsOnUse + items: + - id: ADTFoodMandarinSlice + uses: 9 - type: Tag tags: - Fruit @@ -31,7 +54,7 @@ # кожура - type: entity name: mandarin peel - parent: TrashBananaPeel + parent: BaseItem id: ADTTrashMandarinPeel suffix: NewYear components: @@ -41,7 +64,10 @@ - type: Item sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi heldPrefix: peel - + - type: Tag + tags: + - Trash + - type: SpaceGarbage # долька - type: entity diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/mandarin.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Hydroponics/mandarin.rsi/meta.json index cab68e5eac5..0ef79d331d5 100644 --- a/Resources/Textures/ADT/Objects/Specific/Hydroponics/mandarin.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Specific/Hydroponics/mandarin.rsi/meta.json @@ -16,6 +16,9 @@ { "name": "produce" }, + { + "name": "peeledprod" + }, { "name": "peel" }, diff --git a/Resources/Textures/ADT/Objects/Specific/Hydroponics/mandarin.rsi/peeledprod.png b/Resources/Textures/ADT/Objects/Specific/Hydroponics/mandarin.rsi/peeledprod.png new file mode 100644 index 0000000000000000000000000000000000000000..3bed2c4b8d6a0a661988faabe72304db7daf536e GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq_xR z)5S3)qV?_Njb4WxWR8D)Z_g<;J7JOD)iI$Th`7eNTE&B|u`+jSITq?Q zt?qJOV{2%bJ9&?N!x z8UBQRxw6%0tPg*=lqRT8*msptOld}qW2nO&L#<3Pg~|q_|IryMmOZF2_{Vac zz0mM)*u0DHGPxc#UVC7=;KVEL(=yX;FYx|RVWO3Jh4H2MAs5GQd>`ZPGBW5ld`*_< zpYU0Hv6zH^;}`DEIyQ~{+y~wMzB(!z!uIjySD)lukVmfS=fnl<+ZQX@Rm be0>?TfNTyR27yb#lR=cHtDnm{r-UW|=Q5n| literal 0 HcmV?d00001 From dfd8f9e0a1d2a2b3425d449be96cbc284200d7bf Mon Sep 17 00:00:00 2001 From: JustKekc Date: Fri, 15 Dec 2023 00:06:43 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=B8=20=D0=B4=D0=BE=D0=BF=D0=B8=D0=BB=D0=B8=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/newYear/mandarin.ftl | 5 ++++ .../Objects/Consumable/Food/mandarin.yml | 25 ++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/newYear/mandarin.ftl b/Resources/Locale/ru-RU/ADT/newYear/mandarin.ftl index 5d1cd621574..42e8c5e4e43 100644 --- a/Resources/Locale/ru-RU/ADT/newYear/mandarin.ftl +++ b/Resources/Locale/ru-RU/ADT/newYear/mandarin.ftl @@ -4,6 +4,11 @@ ent-ADTFoodMandarin = мандарин .desc = Полезный, оранжевый. .suffix = Новый год +# очищенный плод. +ent-ADTFoodMandarinPeeled = очищенный мандарин + .desc = Освобождённый от шкурки мандарин. Что, уже праздники? + .suffix = Новый год + # кожура ent-ADTTrashMandarinPeel = мандариновая кожура .desc = Пахнет новым годом. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml index ae9cbf36c61..5d3c396dbc1 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml @@ -27,15 +27,16 @@ Quantity: 10 - type: SpawnItemsOnUse items: - - id: ADTFoodMandarinPeeled - id: ADTTrashMandarinPeel + - id: ADTFoodMandarinPeeled - type: Tag tags: - Fruit - + + #очищенный плод. - type: entity name: mandarin - parent: ADTFoodMandarin + parent: BaseItem id: ADTFoodMandarinPeeled description: Peeled mandarin. Is it holidays already? suffix: NewYear @@ -43,10 +44,26 @@ - type: Sprite sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi state: peeledprod + - type: Produce + seedId: ADTmandarin + - type: SolutionContainerManager + solutions: + food: + maxVol: 9 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTJuiceMandarin + Quantity: 10 - type: SpawnItemsOnUse items: - id: ADTFoodMandarinSlice - uses: 9 + uses: 8 - type: Tag tags: - Fruit From 0698f7ddc17bf1c8bdc0c5f59509301d3bedc0dd Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Fri, 15 Dec 2023 00:11:09 +0300 Subject: [PATCH 3/3] Update ChangelogADT.yml --- Resources/Changelog/ChangelogADT.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 76ac0cbf3bb..bb936ca34ce 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -805,3 +805,9 @@ Entries: - {message: Добавлен тяжелый боец ОБР и снаряжение для него, type: Add} id: 55631 #костыль отображения в Обновлениях time: '2023-12-14T07:20:00.0000000+00:00' + +- author: JustKekc + changes: + - {message: Теперь нажав на мандарин он очистится и от него можно отделять дольки, type: Tweak} + id: 55632 #костыль отображения в Обновлениях + time: '2023-12-15T07:20:00.0000000+00:00'