Цветы

space-sunrise · Nov 6, 2024 · 19aa613 · 19aa613
1 parent 9e38ce3
commit 19aa613
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 3 deletions.
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/flowers.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/flowers.ftl
@@ -0,0 +1,4 @@
+ent-RedFlowers = букет красных цветов
+    .desc = Красиво уложенный букет кроваво-красных цветов. Приятно пахнет.
+ent-BlueFlowers = букет голубых цветов
+    .desc = Красиво уложенный букет голубых, словно небо, цветов. Приятно пахнет.
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/bouquet.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/bouquet.ftl
@@ -1,2 +1,2 @@
-ent-bouquet = Букет
-    .desc = Букет душистых цветов.
+ent-Bouquet = букет кровавых цветов
+    .desc = Букет цветов, окрашенных в кровавые оттенки. Выглядит завораживающе. Вкусно пахнет.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -23,6 +23,8 @@
     BoxCandleSmall: 2
     Urn: 5
     Bible: 1
+    RedFlowers: 3 # Sunrise
+    BlueFlowers: 3 # Sunrise
   emaggedInventory:
     ClothingOuterArmorCult: 1
     ClothingHeadHelmetCult: 1

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/flowers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/flowers.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: BaseItem
+  id: RedFlowers
+  name: red flower bouquet
+  description: A beautifully arranged bouquet of blood-red flowers. Smells good.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Fun/red_flowers.rsi
+    state: item
+
+- type: entity
+  parent: BaseItem
+  id: BlueFlowers
+  name: red flower bouquet
+  description: A beautifully arranged bouquet of sky-blue flowers. Smells good.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Fun/blue_flowers.rsi
+    state: item
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/bouquet.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/bouquet.yml
@@ -1,7 +1,8 @@
 - type: entity
   parent: BaseItem
   id: Bouquet
-  name: bouquet
+  name: blood flowers bouquet
+  description: A bouquet of blood-colored flowers. It looks fascinating and smells delicious.
   components:
   - type: Sprite
     sprite: _Sunrise/Objects/Misc/bouquet.rsi

diff --git a/Resources/Textures/_Sunrise/Objects/Fun/blue_flowers.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Fun/blue_flowers.rsi/inhand-left.png
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/blue_flowers.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Fun/blue_flowers.rsi/inhand-right.png
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/blue_flowers.rsi/item.png b/Resources/Textures/_Sunrise/Objects/Fun/blue_flowers.rsi/item.png
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/blue_flowers.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Fun/blue_flowers.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by tg @Salko_f",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "item"
+    }
+  ]
+}
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/red_flowers.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Fun/red_flowers.rsi/inhand-left.png
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/red_flowers.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Fun/red_flowers.rsi/inhand-right.png
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/red_flowers.rsi/item.png b/Resources/Textures/_Sunrise/Objects/Fun/red_flowers.rsi/item.png
diff --git a/Resources/Textures/_Sunrise/Objects/Fun/red_flowers.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Fun/red_flowers.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by tg @Salko_f",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "item"
+    }
+  ]
+}