From a2117f6519912514044c460a531260e4b7008817 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Tue, 25 Feb 2020 10:40:52 -0500
Subject: [PATCH] Add beer bottles

---
 media/attribution.js          |  1 +
 media/objects/beer-bottle.svg |  8 ++++++++
 presets/objects.js            | 17 ++++++++++++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 media/objects/beer-bottle.svg

diff --git a/media/attribution.js b/media/attribution.js
index 88335b36..c7b83248 100644
--- a/media/attribution.js
+++ b/media/attribution.js
@@ -564,6 +564,7 @@ const attributionData = {
             files: [
                 { name: "nail-polish.svg", source: null },
                 { name: "shot-glass.svg", source: null },
+                { name: "beer-bottle.svg", source: null },
             ],
             authors: [
                 "chemicalcrux"
diff --git a/media/objects/beer-bottle.svg b/media/objects/beer-bottle.svg
new file mode 100644
index 00000000..f6c6f61a
--- /dev/null
+++ b/media/objects/beer-bottle.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 192 743" style="enable-background:new 0 0 192 743;" xml:space="preserve">
+<path d="M176,264c-15-20-23-31-25-39s-2-39-5-49S131,53.06,131,45c0-2,5-2,5-2l-6-27c0,0,0-4,2-4c6.08,0-4-12-4-12H96H64
+	c0,0-10.08,12-4,12c2,0,2,4,2,4l-6,27c0,0,5,0,5,2c0,8.06-12,121-15,131s-3,41-5,49s-10,19-25,39C1.48,283.37,0,298,0,298v378v30
+	c0,0,3,19,15,28s81,9,81,9s69,0,81-9s15-28,15-28v-30V298C192,298,190.52,283.37,176,264z"/>
+</svg>
diff --git a/presets/objects.js b/presets/objects.js
index 5e2c690d..937f3f88 100644
--- a/presets/objects.js
+++ b/presets/objects.js
@@ -121,7 +121,7 @@ function makeObjects() {
         constructor: () => makeObject(
             "Shot Glass",
             {
-                bottle: {
+                glass: {
                     height: math.unit(2 + 3/8, "inches"),
                     mass: math.unit(75, "g"),
                     image: { source: "./media/objects/shot-glass.svg" },
@@ -130,6 +130,21 @@ function makeObjects() {
             }
         )
     });
+
+    results.push({
+        name: "Beer Bottle",
+        constructor: () => makeObject(
+            "Beer Bottle",
+            {
+                longneck: {
+                    height: math.unit(9, "inches"),
+                    mass: math.unit(200, "g"),
+                    image: { source: "./media/objects/beer-bottle.svg" },
+                    name: "Longneck Bottle"
+                }
+            }
+        )
+    });
     
     results.sort((b1, b2) => {
         e1 = b1.constructor();