Drinks cartons return (#343)

* Drinks cartons return * Fix * apple juice update * sprite update * updete * big update интересный факт пока я делал этот коминт у меня пк крашнул 5 раз :catdespair: * Big juce update * fix * Update juice * Meh * Weh * Wut --------- Co-authored-by: MilenVolf <[email protected]>
Workbench-Team · May 27, 2024 · 9e8fbbf · 9e8fbbf
1 parent 8edb16a
commit 9e8fbbf
Show file tree

Hide file tree

Showing 32 changed files with 408 additions and 5 deletions.
diff --git a/Resources/Locale/en-US/starshine/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/starshine/flavors/flavor-profiles.ftl
@@ -0,0 +1,3 @@
+## Generic flavors.
+
+flavor-buzz = like bzzz
diff --git a/Resources/Locale/en-US/starshine/reagents/meta/fun.ftl b/Resources/Locale/en-US/starshine/reagents/meta/fun.ftl
@@ -0,0 +1,2 @@
+reagent-name-buzz = juice that makes you Bzzz
+reagent-desc-buzz = Pure essence of moth plush. Makes you Bzzz!
diff --git a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
@@ -1,4 +1,4 @@
-flavor-profile = На вкус { $flavor }.
+flavor-profile = На вкус { $flavor }.
 flavor-profile-multiple = На вкус { $flavors } и { $lastFlavor }.
 flavor-profile-unknown = Вкус неописуем.
 

diff --git a/Resources/Locale/ru-RU/reagents/meta/fun.ftl b/Resources/Locale/ru-RU/reagents/meta/fun.ftl
@@ -1,4 +1,4 @@
-reagent-name-carpetium = ковриний
+reagent-name-carpetium = ковриний
 reagent-desc-carpetium = Таинственный химикат, обычно поставляемый с планеты клоунов, который покрывает ковром все, на что попадёт.
 reagent-name-fiber = волокно
 reagent-desc-fiber = Сырье, обычно извлекаемое из шерсти или других тканых изделий.

diff --git a/...ces/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/...ces/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
@@ -1,4 +1,4 @@
-ent-DrinkCartonBaseFull = { ent-DrinkBase }
+ent-DrinkCartonBaseFull = { ent-DrinkBase }
     .desc = { ent-DrinkBase.desc }
     .suffix = Полная
 ent-DrinkCartonBaseLargeFull = { ent-DrinkCartonBaseFull }

diff --git a/Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl
@@ -0,0 +1,3 @@
+## Generic flavors.
+
+flavor-buzz = как бззз
diff --git a/Resources/Locale/ru-RU/starshine/reagents/meta/fun.ftl b/Resources/Locale/ru-RU/starshine/reagents/meta/fun.ftl
@@ -0,0 +1,2 @@
+reagent-name-buzz = сок, заставляющий говорить Бззз
+reagent-desc-buzz = Чистая сущность плюшевого моли. Заставляет вас говорить Бззз!
diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/consumable/drinks-cartons.ftl
@@ -0,0 +1,24 @@
+ent-DrinkJuiceAppleCarton = яблочный сок
+    .desc = Сок выпуска 3023 года, свежего кислотного-отжима, с добавлением экстракта из семечек яблок и донк-ароматизаторов.
+ent-DrinkJuiceCarrotCarton = морковный сок
+    .desc = Богат витамином А и имеет необычный вкус. Люди, работающие за терминалами, являются их главными клиентами.
+ent-DrinkJuiceBerryCarton = ягодный сок
+    .desc = Любимый сок сладкоежек, как жаль, что его производство упало в связи с уменьшением количества потребителей на станциях НТ. Однако поговаривают, что особый ингредиент позволяет им оставаться на рынке и продавать более половины товара в неизвестные сектора.
+ent-DrinkJuiceBananaCarton = банановый сок
+    .desc = Почуствуй вкус бананового сока! Стань клоуном! Стань робастом!
+ent-DrinkJuicePineappleCarton = ананасовый сок
+    .desc = Это освежающий напиток, который  обладает ярким и свежим вкусом. Каждая капля этого сока словно маленькая звезда, приносящая радость и удовольствие после трудового дня в открытом космосе. Его аромат наполняет кабинеты станции нотками тропических фруктов, создавая атмосферу уюта и комфорта даже в условиях далекого космоса.
+ent-DrinkJuiceSyndicateCarton = cинди сок
+    .desc = Сок "Космическое Оружие" — это напиток, который станет тайным оружием каждого агента синдиката. Его яркий вкус  сочетается с нотками экзотических специй, создавая взрывной вкусовой опыт, способный зарядить энергией на самые сложные миссии. Каждая капля этого сока — это заряд адреналина, готовый вдохновить на подвиги и победы.
+ent-DrinkJuiceWehCarton = унати сок
+    .desc = Для унатхов 3 лет и сстаршше!
+ent-DrinkJuiceCatDespairCarton = cat despair juice
+    .desc = Чем больше вы вглядываетесь в сок, тем больше вы хотите закрыть это окно осмотра. Погодите, окно осмотра?
+ent-DrinkJuiceMoffCarton = мофф сок
+    .desc = Рекомендуется всеми мофф. Бззз!
+ent-DrinkJuicelemonCarton = лимонный сок
+    .desc = Это напиток, который не только освежает, но и переносит вас в удивительные дали космоса. Его ярко-жёлтый цвет напоминает о солнечных лучах, а свежесть лимона добавляет нотки кислоты и энергии.
+ent-DrinkJuiceWatermelonCarton = арбузный сок
+    .desc = Это удивительный напиток, который сочетает в себе сладость спелого арбуза и таинственную энергию космоса. Его ярко-красный цвет напоминает о красоте красных планет, а сладкий вкус арбуза дарит ощущение летнего солнца и свежести.
+ent-DrinkJuiceSecCarton = сок службы безопасности
+    .desc = Это освежающий и бодрящий сок, специально разработанный для служб безопасности и охраны. Уникальное сочетание натуральных ингредиентов помогает поддерживать высокий уровень бдительности и энергии в течение дня.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -45,5 +45,18 @@
     DrinkSakeBottleFull: 3
     DrinkBeerCan: 5
     DrinkWineCan: 5
+# Starshine-start
+    DrinkJuiceAppleCarton: 3
+    DrinkJuiceCarrotCarton: 3
+    DrinkJuiceBerryCarton: 3
+    DrinkJuiceBananaCarton: 3
+    DrinkJuicePineappleCarton: 3
+    DrinkJuiceLemonCarton: 3
+    DrinkJuiceWatermelonCarton: 3
+    DrinkJuiceWehCarton: 1
+    DrinkJuiceMoffCarton: 1
+    DrinkJuiceSecCarton: 1
+# Starshine-end
   emaggedInventory:
     DrinkPoisonWinebottleFull: 2
+    DrinkJuiceSyndicateCarton: 1
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: DrinkBase
   id: DrinkCartonBaseFull
   abstract: true

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1,4 +1,4 @@
-## Plushies
+## Plushies
 
 - type: entity
   parent: BaseItem
@@ -773,6 +773,20 @@
     requiresSpecialDigestion: true
     useSound:
       path: /Audio/Voice/Moth/moth_scream.ogg
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceThatMakesYouBuzz
+        Quantity: 30
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 10
+        - ReagentId: JuiceThatMakesYouBuzz
+          Quantity: 10
 
 ## Cheapo Figurines
 

diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Consumable/drinks-cartons.yml b/Resources/Prototypes/Starshine/Entities/Objects/Consumable/drinks-cartons.yml
@@ -0,0 +1,238 @@
+- type: entity
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  id: DrinkJuiceCartonBase
+  name: apple juice
+  description: Juice release 3023, fresh acid-pressed, with added apple seed extract and donk flavours.
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Starshine/Objects/Consumable/Drinks/cardboardjuiceboxes.rsi
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceAppleCarton
+  name: apple juice
+  description: Juice release 3023, fresh acid-pressed, with added apple seed extract and donk flavours.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceApple
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-apple
+  - type: Label
+    currentLabel: Яблочный сок полон сахара и вкуса! Сделан из спелых и сочных яблок!
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceCarrotCarton
+  name: carrot juice
+  description: Rich in vitamin A and has an unusual flavour. People working at terminals are their main customers.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceCarrot
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-carrot
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceBerryCarton
+  name: berry juice
+  description: A favourite juice of the sweet tooth, what a pity that its production has fallen off due to the decreasing number of consumers in NT stations. However, it is said that a special ingredient allows them to stay in the market and sell more than half of the product to unknown sectors.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceBerry
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-berry
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceBananaCarton
+  name: banana juice
+  description: Taste the flavour of banana juice! Become a clown! Become robust!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceBanana
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-banana
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuicePineappleCarton
+  name: pineapple juice
+  description: This is a refreshing drink that has a bright and fresh flavour. Each drop of this juice is like a small star, bringing joy and pleasure after a hard day's work in outer space. Its flavour fills the station's offices with notes of tropical fruits, creating an atmosphere of coziness and comfort even in the conditions of distant space.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuicePineapple
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-pineapple
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceSyndicateCarton
+  name: syndicate juice
+  description: Space Weapon Juice is a drink that will become the secret weapon of every syndicate agent. Its bright flavour combines with notes of exotic spices to create an explosive taste experience that can energise you for the most challenging missions. Every drop of this juice is a charge of adrenaline, ready to inspire feats and victories.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Stimulants
+          Quantity: 5
+        - ReagentId: DoctorsDelight
+          Quantity: 25
+        - ReagentId: Tricordrazine
+          Quantity: 20
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-syndi
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceWehCarton
+  name: weh juice
+  description: For Lizards 3 years and older!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceThatMakesYouWeh
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-weh
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceCatDespairCarton
+  name: cat despair juice
+  description: The more you gaze into the juice, the more you want to close that examine window. Wait, examine window?
+  suffix: DO NOT MAP, Admeme
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: MuteToxin
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-catdespair
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceMoffCarton
+  name: moff juice
+  description: Recommended by all moffs. Bzzzz!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceThatMakesYouBuzz
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-moff
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceLemonCarton
+  name: lemon juice
+  description: This is a drink that not only refreshes you, but also transports you to the amazing reaches of space. Its bright yellow colour reminds you of sunlight, while the freshness of lemon adds notes of acidity and energy.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceLemon
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-lemon
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceWatermelonCarton
+  name: watermelon juice
+  description: This is an amazing drink that combines the sweetness of ripe watermelon and the mysterious energy of the cosmos. Its bright red colour reminds of the beauty of the red planets, and the sweet taste of watermelon gives a feeling of summer sunshine and freshness.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceWatermelon
+          Quantity: 50
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-watermelon
+
+- type: entity
+  parent: DrinkJuiceCartonBase
+  id: DrinkJuiceSecCarton
+  name: sec juice
+  description: This is a refreshing and invigorating juice specially formulated for security and safety services. The unique combination of natural ingredients helps maintain high levels of alertness and energy throughout the day.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Bicaridine
+          Quantity: 3
+        - ReagentId: Tricordrazine
+          Quantity: 7
+        - ReagentId: Nutriment
+          Quantity: 20
+        - ReagentId: Saline
+          Quantity: 20
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+      - state: label-sec
diff --git a/Resources/Prototypes/Starshine/Flavors/flavors.yml b/Resources/Prototypes/Starshine/Flavors/flavors.yml
@@ -0,0 +1,4 @@
+- type: flavor
+  id: buzz
+  flavorType: Base
+  description: flavor-buzz
diff --git a/Resources/Prototypes/Starshine/Reagents/fun.yml b/Resources/Prototypes/Starshine/Reagents/fun.yml
@@ -0,0 +1,16 @@
+- type: reagent
+  id: JuiceThatMakesYouBuzz
+  name: reagent-name-buzz
+  group: Toxins
+  desc: reagent-desc-buzz
+  physicalDesc: reagent-physical-desc-vibrant
+  flavor: buzz
+  color: "#fbec5d"
+  metabolisms:
+    Poison:
+      metabolismRate: 0.25
+      effects:
+      - !type:Emote
+        emote: Buzzing
+        showInChat: true
+        probability: 0.5
diff --git a/Resources/Prototypes/Starshine/Voice/speech_emotes.yml b/Resources/Prototypes/Starshine/Voice/speech_emotes.yml
@@ -0,0 +1,6 @@
+- type: emote
+  id: Buzzing
+  name: chat-emote-name-buzz
+  category: Vocal
+  icon: Interface/Emotes/buzz.png
+  chatMessages: [chat-emote-msg-buzz]