From f35a0d34e9f4cbd0c00dfd1e94fcdf93b33ee8dd Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 19 Aug 2019 01:45:20 +0900
Subject: [PATCH] [Room] Add some furnitures

---
 locales/ja-JP.yml                             |  2 ++
 .../app/common/scripts/room/furnitures.json5  | 20 +++++++++++++++++++
 .../assets/room/furnitures/sofa/sofa.blend    |  3 +++
 .../assets/room/furnitures/sofa/sofa.glb      |  3 +++
 .../room/furnitures/spiral/spiral.blend       |  3 +++
 .../assets/room/furnitures/spiral/spiral.glb  |  3 +++
 6 files changed, 34 insertions(+)
 create mode 100644 src/client/assets/room/furnitures/sofa/sofa.blend
 create mode 100644 src/client/assets/room/furnitures/sofa/sofa.glb
 create mode 100644 src/client/assets/room/furnitures/spiral/spiral.blend
 create mode 100644 src/client/assets/room/furnitures/spiral/spiral.glb

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 8a34ea935..4c40eea95 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2344,3 +2344,5 @@ room:
     rubik-cube: "ルービックキューブ"
     poster-h: "ポスター(横長)"
     poster-v: "ポスター(縦長)"
+    sofa: "ソファ"
+    spiral: "螺旋階段"
diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5
index d88228ca3..9fe7811f6 100644
--- a/src/client/app/common/scripts/room/furnitures.json5
+++ b/src/client/app/common/scripts/room/furnitures.json5
@@ -321,4 +321,24 @@
 			},
 		},
 	},
+	{
+		id: "sofa",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Sofa: 'color'
+		}
+	},
+	{
+		id: "spiral",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Step: 'color'
+		}
+	},
 ]
diff --git a/src/client/assets/room/furnitures/sofa/sofa.blend b/src/client/assets/room/furnitures/sofa/sofa.blend
new file mode 100644
index 000000000..d6ce7a7a8
--- /dev/null
+++ b/src/client/assets/room/furnitures/sofa/sofa.blend
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b9d07ae7ca263c52232bf88ae917c2f49ed9f38a247175171e6e693d02e406e
+size 711488
diff --git a/src/client/assets/room/furnitures/sofa/sofa.glb b/src/client/assets/room/furnitures/sofa/sofa.glb
new file mode 100644
index 000000000..a25da2d85
--- /dev/null
+++ b/src/client/assets/room/furnitures/sofa/sofa.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9908f4ff53f1496c2209b01b346db4577016b059d43d906a4affe9b114871dde
+size 37656
diff --git a/src/client/assets/room/furnitures/spiral/spiral.blend b/src/client/assets/room/furnitures/spiral/spiral.blend
new file mode 100644
index 000000000..6e38f7a7e
--- /dev/null
+++ b/src/client/assets/room/furnitures/spiral/spiral.blend
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86eebb0e8f9234badf1756144f048995e790e16d54847b25018efa05a0eb410c
+size 1241416
diff --git a/src/client/assets/room/furnitures/spiral/spiral.glb b/src/client/assets/room/furnitures/spiral/spiral.glb
new file mode 100644
index 000000000..310d37443
--- /dev/null
+++ b/src/client/assets/room/furnitures/spiral/spiral.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d2aff8f090a1ce393ccc37b9efbd9504cddc71d2e82453a3d5cf84d6c7ce851
+size 251788