From c11eb643fe6d0fadf847e5ae479673b251df197c Mon Sep 17 00:00:00 2001
From: AndresE55 <80334192+Leander-0@users.noreply.github.com>
Date: Thu, 25 Nov 2021 01:16:17 -0400
Subject: [PATCH] Fix Breaking Bottles (#5492)

* Fix Breaking Bottles

* remove quotes and lower empthy bottle damage

* nerfed bottle throwing damage

Co-authored-by: AndresE55 <17-10757@usb.ve>
---
 .../Objects/Consumable/drinks_bottles.yml     |  6 +--
 .../Objects/Consumable/trash_drinks.yml       | 39 +++++++++++++------
 .../Entities/Objects/Misc/broken_bottle.yml   | 21 ++++++++++
 3 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
index c5e74f26d4..689c5eab1a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
@@ -25,7 +25,7 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Blunt: 10
+        Blunt: 4
   - type: Spillable
     solution: drink
   - type: Damageable
@@ -42,9 +42,9 @@
       - !type:SpillBehavior { }
       - !type:SpawnEntitiesBehavior
         spawn:
-          ShardGlass:
+          BrokenBottle:
             min: 1
-            max: 2
+            max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
index 580264f84e..462c99ccc1 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
@@ -11,7 +11,7 @@
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 10
+        maxVol: 50
   - type: SolutionTransfer
     canChangeTransferAmount: true
     maxTransferAmount: 5
@@ -23,7 +23,33 @@
     interfaces:
     - key: enum.TransferAmountUiKey.Key
       type: TransferAmountBoundUserInterface
-
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 4
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpillBehavior { }
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          BrokenBottle:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
 
 
 # Containers
@@ -63,15 +89,6 @@
     sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi
 
 
-- type: entity
-  name: broken bottle
-  parent: DrinkBottleBaseEmpty  # Can't hold liquids
-  id: DrinkBrokenBottle
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/broken_bottle.rsi
-
-
 - type: entity
   name: cognac bottle
   parent: DrinkBottleBaseEmpty
diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
new file mode 100644
index 0000000000..00e613990d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -0,0 +1,21 @@
+- type: entity
+  name: broken bottle
+  parent: BaseItem 
+  id: BrokenBottle
+  description: In Space Glasgow this is called a conversation starter
+  components:
+  - type: ItemCooldown
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 7
+    hitSound:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: Sprite
+    sprite: Objects/Consumable/TrashDrinks/broken_bottle.rsi
+    state: icon
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 2
+