More objects

common/src/comp/body/object.rs

@@ -28,6 +28,17 @@ pub enum Body {
     PotionRed,
     Crate,
     Tent,
+    WindowSpooky,
+    DoorSpooky,
+    Anvil,
+    Gravestone1,
+    Gravestone2,
+    Bench,
+    Chair,
+    Table,
+    Drawer,
+    BedBlue,
+    Carpet1,
 }
 
 impl Body {
@@ -37,7 +48,7 @@ impl Body {
     }
 }
 
-const ALL_OBJECTS: [Body; 26] = [
+const ALL_OBJECTS: [Body; 37] = [
     Body::Bomb,
     Body::Scarecrow,
     Body::Cauldron,
@@ -64,4 +75,15 @@ const ALL_OBJECTS: [Body; 26] = [
     Body::PotionGreen,
     Body::Crate,
     Body::Tent,
+    Body::WindowSpooky,
+    Body::DoorSpooky,
+    Body::Anvil,
+    Body::Gravestone1,
+    Body::Gravestone2,
+    Body::Bench,
+    Body::Chair,
+    Body::Table,
+    Body::Drawer,
+    Body::BedBlue,
+    Body::Carpet1,
 ];

server/src/cmd.rs

@@ -487,6 +487,16 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action:
             Some("Crate") => comp::object::Body::Crate,
             Some("Tent") => comp::object::Body::Tent,
             Some("Bomb") => comp::object::Body::Bomb,
+            Some("Window_Spooky") => comp::object::Body::WindowSpooky,
+            Some("Carpet_1") => comp::object::Body::Carpet1,
+            Some("Table") => comp::object::Body::Table,
+            Some("Drawer") => comp::object::Body::Drawer,
+            Some("Bed_Blue") => comp::object::Body::BedBlue,
+            Some("Anvil") => comp::object::Body::Anvil,
+            Some("Gravestone_1") => comp::object::Body::Gravestone1,
+            Some("Gravestone_2") => comp::object::Body::Gravestone2,
+            Some("Chair") => comp::object::Body::Chair,
+            Some("Bench") => comp::object::Body::Bench,
             _ => {
                 return server
                     .clients

voxygen/src/scene/figure.rs

@@ -548,6 +548,17 @@ impl FigureModelCache {
             object::Body::PotionGreen => ("object/potion_green.vox", Vec3::new(-2.0, -2.0, 0.0)),
             object::Body::Crate => ("object/crate.vox", Vec3::new(-7.0, -7.0, 0.0)),
             object::Body::Tent => ("object/tent.vox", Vec3::new(-18.5, -19.5, 0.0)),
+            object::Body::WindowSpooky => ("object/window_spooky.vox", Vec3::new(-15.0, -1.5, 0.0)),
+            object::Body::DoorSpooky => ("object/door_spooky.vox", Vec3::new(-15.0, -4.5, 0.0)),
+            object::Body::Table => ("object/table.vox", Vec3::new(-15.0, -4.5, 0.0)),
+            object::Body::Drawer => ("object/drawer.vox", Vec3::new(-15.0, -4.5, 0.0)),
+            object::Body::BedBlue => ("object/bed_blue.vox", Vec3::new(-15.0, -4.5, 0.0)),
+            object::Body::Anvil => ("object/anvil.vox", Vec3::new(-15.0, -4.5, 0.0)),
+            object::Body::Gravestone1 => ("object/gravestone1.vox", Vec3::new(-15.0, -4.5, 0.0)),
+            object::Body::Gravestone2 => ("object/gravestone2.vox", Vec3::new(-15.0, -4.5, 0.0)),
+            object::Body::Chair => ("object/chair.vox", Vec3::new(-15.0, -4.5, 0.0)),
+            object::Body::Bench => ("object/bench.vox", Vec3::new(-15.0, -4.5, 0.0)),
+            object::Body::Carpet1 => ("object/carpet1.vox", Vec3::new(-14.0, -14.0, -0.5)),
         };
         Self::load_mesh(name, offset)
     }