From dc612bda137e30e8a85b6bba399143464250f82c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 23 Aug 2019 06:52:42 +0900
Subject: [PATCH] [Room] Add energy drink

---
 locales/ja-JP.yml                                             | 1 +
 src/client/app/common/scripts/room/furnitures.json5           | 4 ++++
 .../assets/room/furnitures/energy-drink/energy-drink.blend    | 3 +++
 .../assets/room/furnitures/energy-drink/energy-drink.glb      | 3 +++
 .../assets/room/furnitures/energy-drink/texture.afdesign      | 3 +++
 src/client/assets/room/furnitures/energy-drink/texture.png    | 3 +++
 src/client/assets/room/furnitures/energy-drink/uv.png         | 3 +++
 7 files changed, 20 insertions(+)
 create mode 100644 src/client/assets/room/furnitures/energy-drink/energy-drink.blend
 create mode 100644 src/client/assets/room/furnitures/energy-drink/energy-drink.glb
 create mode 100644 src/client/assets/room/furnitures/energy-drink/texture.afdesign
 create mode 100644 src/client/assets/room/furnitures/energy-drink/texture.png
 create mode 100644 src/client/assets/room/furnitures/energy-drink/uv.png

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 70192a55c..456443086 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2353,3 +2353,4 @@ room:
     bin: "ゴミ箱"
     cup-noodle: "カップ麺"
     holo-display: "ホログラフィックディスプレイ"
+    energy-drink: "エナジードリンク"
diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5
index b6ddd5c2b..b469ff5a8 100644
--- a/src/client/app/common/scripts/room/furnitures.json5
+++ b/src/client/app/common/scripts/room/furnitures.json5
@@ -381,5 +381,9 @@
 				},
 			},
 		},
+	},
+	{
+		id: 'energy-drink',
+		place: "floor",
 	}
 ]
diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend
new file mode 100644
index 000000000..ca586fe11
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bce900486f2ec4b146ba783aa367e97ba726945cc03c55ec61cc808f9313e7fc
+size 724764
diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb
new file mode 100644
index 000000000..f07d2f696
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2dada764e73fa2ad36f8687bd8a723bb4975564ef7133051fdd08d25be7e8daf
+size 145836
diff --git a/src/client/assets/room/furnitures/energy-drink/texture.afdesign b/src/client/assets/room/furnitures/energy-drink/texture.afdesign
new file mode 100644
index 000000000..0cdabe2a0
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/texture.afdesign
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d866ba40bdf8d3003e5d3a8513380c1fdabd50e3e48133d9da75493152d4bf07
+size 824566
diff --git a/src/client/assets/room/furnitures/energy-drink/texture.png b/src/client/assets/room/furnitures/energy-drink/texture.png
new file mode 100644
index 000000000..41956382f
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/texture.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1276fa7989fce26b53c3e46856f4b7e5578b7b9ebce58e9b882c92b2901ba3c8
+size 127510
diff --git a/src/client/assets/room/furnitures/energy-drink/uv.png b/src/client/assets/room/furnitures/energy-drink/uv.png
new file mode 100644
index 000000000..03789d28e
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/uv.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e104f38826828dd785bd793da10faae58bafd98a96b0f4ae4a2ecf97063fd8be
+size 22142