diff --git a/client/etc/font/scape.eot b/client/etc/font/scape.eot
new file mode 100644
index 0000000..162e443
Binary files /dev/null and b/client/etc/font/scape.eot differ
diff --git a/client/etc/font/scape.svg b/client/etc/font/scape.svg
new file mode 100644
index 0000000..950f09f
--- /dev/null
+++ b/client/etc/font/scape.svg
@@ -0,0 +1,308 @@
+
+
+
\ No newline at end of file
diff --git a/client/etc/font/scape.ttf b/client/etc/font/scape.ttf
new file mode 100644
index 0000000..7ce7b1a
Binary files /dev/null and b/client/etc/font/scape.ttf differ
diff --git a/client/etc/font/scape.woff b/client/etc/font/scape.woff
new file mode 100644
index 0000000..6726e5f
Binary files /dev/null and b/client/etc/font/scape.woff differ
diff --git a/client/etc/font/scape.woff2 b/client/etc/font/scape.woff2
new file mode 100644
index 0000000..dc42e72
Binary files /dev/null and b/client/etc/font/scape.woff2 differ
diff --git a/client/style.css b/client/style.css
index 1f073d8..3c3211d 100644
--- a/client/style.css
+++ b/client/style.css
@@ -1,3 +1,15 @@
+@font-face {
+ font-family: 'Scape';
+ src: url('etc/font/scape.eot');
+ src: url('etc/font/scape.eot?#iefix') format('embedded-opentype'),
+ url('etc/font/scape.woff2') format('woff2'),
+ url('etc/font/scape.woff') format('woff'),
+ url('etc/font/scape.ttf') format('truetype'),
+ url('etc/font/scape.svg#fontload') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
body {
background: #000;
margin: 0;
diff --git a/server/DAL/Item.cs b/server/DAL/Item.cs
new file mode 100644
index 0000000..ea816f9
--- /dev/null
+++ b/server/DAL/Item.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SockScape.DAL {
+ class Item {
+ public ulong Id { get; set; }
+
+
+ }
+}
diff --git a/server/DAL/ItemMaster.cs b/server/DAL/ItemMaster.cs
new file mode 100644
index 0000000..357220b
--- /dev/null
+++ b/server/DAL/ItemMaster.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SockScape.DAL {
+ class ItemMaster {
+ public int Id { get; set; }
+
+ [Required, MaxLength(64)]
+ public string Name { get; set; }
+ [Required, MaxLength(256)]
+ public string Description { get; set; }
+
+ [Required, DefaultValue(false)]
+ public bool Stackable { get; set; }
+ [Required, DefaultValue(UInt32.MaxValue)]
+ public uint MaxStack { get; set; }
+ [Required, DefaultValue(true)]
+ public bool Droppable { get; set; }
+
+ [Required, MaxLength(64)]
+ public string Sheet { get; set; }
+ [Required]
+ public ushort Row { get; set; }
+ [Required]
+ public ushort Column { get; set; }
+
+ [MaxLength(64)]
+ public string Object { get; set; }
+ }
+}
diff --git a/server/DAL/ScapeDb.cs b/server/DAL/ScapeDb.cs
index 5b24c7a..b9d475b 100644
--- a/server/DAL/ScapeDb.cs
+++ b/server/DAL/ScapeDb.cs
@@ -31,9 +31,16 @@ namespace SockScape.DAL {
public DbSet Users { get; set; }
public DbSet Origins { get; set; }
public DbSet Sessions { get; set; }
+ public DbSet ItemMaster { get; set; }
+ public DbSet- Items { get; set; }
protected override void OnModelCreating(DbModelBuilder builder) {
base.OnModelCreating(builder);
+
+ builder.Properties()
+ .Configure(s => s.HasMaxLength(256).HasColumnType("varchar"));
+
+ builder.Entity().ToTable("ItemMaster");
}
}
}
diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs
index acb42e8..d16510d 100644
--- a/server/Entrypoint.cs
+++ b/server/Entrypoint.cs
@@ -17,7 +17,6 @@ namespace SockScape {
static void Main(string[] args) {
DbConfiguration.SetConfiguration(new MySqlEFConfiguration());
var db = new DAL.ScapeDb();
- var a = db.Users.ToList();
Dictionary servers
= new Dictionary();