Merge pull request #220 from JustKekc/newyeartheii

Мандарин+
AdventureTimeSS14 · Dec 15, 2023 · 5aca7fd · 5aca7fd
2 parents 01517ef + 0698f7d
commit 5aca7fd
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 11 deletions.
diff --git 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'
diff --git 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
@@ -2,36 +2,76 @@
 # плод
 - 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
+    seedId: ADTmandarin
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: ADTJuiceMandarin
+        Quantity: 10
+  - type: SpawnItemsOnUse
+    items:
+      - id: ADTTrashMandarinPeel  
+      - id: ADTFoodMandarinPeeled
+  - type: Tag
+    tags:
+    - Fruit
+
+ #очищенный плод.
+- type: entity
+  name: mandarin
+  parent: BaseItem
+  id: ADTFoodMandarinPeeled
+  description: Peeled mandarin. Is it holidays already?
+  suffix: NewYear
+  components:
   - 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: SliceableFood
-    count: 5
-    slice: ADTFoodMandarinSlice
+  - type: SpawnItemsOnUse
+    items:
+      - id: ADTFoodMandarinSlice
+    uses: 8
   - type: Tag
     tags:
     - Fruit
 
 # кожура
 - type: entity
   name: mandarin peel
-  parent: TrashBananaPeel
+  parent: BaseItem
   id: ADTTrashMandarinPeel
   suffix: NewYear
   components:
@@ -41,7 +81,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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,9 @@ @@
         {
           "name": "produce"
         },
+        {
+          "name": "peeledprod"
+        },
         {
           "name": "peel"
         },
@@ Expand Down @@