diff --git a/NHSE.Sprites/Properties/Resources.Designer.cs b/NHSE.Sprites/Properties/Resources.Designer.cs
index 29429f8..23e11ba 100644
--- a/NHSE.Sprites/Properties/Resources.Designer.cs
+++ b/NHSE.Sprites/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace NHSE.Sprites.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -790,6 +790,16 @@ internal class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap brd20 {
+ get {
+ object obj = ResourceManager.GetObject("brd20", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -1890,6 +1900,16 @@ internal class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap der12 {
+ get {
+ object obj = ResourceManager.GetObject("der12", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -9620,6 +9640,26 @@ internal class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap squ19 {
+ get {
+ object obj = ResourceManager.GetObject("squ19", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap squ20 {
+ get {
+ object obj = ResourceManager.GetObject("squ20", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/NHSE.Sprites/Properties/Resources.resx b/NHSE.Sprites/Properties/Resources.resx
index ad0b950..596d39b 100644
--- a/NHSE.Sprites/Properties/Resources.resx
+++ b/NHSE.Sprites/Properties/Resources.resx
@@ -337,6 +337,9 @@
..\Resources\Villagers\brd18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Villagers\brd20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\MenuIcon\Bridge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -667,6 +670,9 @@
..\Resources\Villagers\der11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Villagers\der12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\Villagers\dga.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -2986,6 +2992,12 @@
..\Resources\Villagers\squ18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Villagers\squ19.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\Villagers\squ20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\Villagers\squ21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/NHSE.Sprites/Resources/Villagers/brd20.png b/NHSE.Sprites/Resources/Villagers/brd20.png
new file mode 100644
index 0000000..a7053fd
Binary files /dev/null and b/NHSE.Sprites/Resources/Villagers/brd20.png differ
diff --git a/NHSE.Sprites/Resources/Villagers/der12.png b/NHSE.Sprites/Resources/Villagers/der12.png
new file mode 100644
index 0000000..d6bb096
Binary files /dev/null and b/NHSE.Sprites/Resources/Villagers/der12.png differ
diff --git a/NHSE.Sprites/Resources/Villagers/squ19.png b/NHSE.Sprites/Resources/Villagers/squ19.png
new file mode 100644
index 0000000..ffa04d3
Binary files /dev/null and b/NHSE.Sprites/Resources/Villagers/squ19.png differ
diff --git a/NHSE.Sprites/Resources/Villagers/squ20.png b/NHSE.Sprites/Resources/Villagers/squ20.png
new file mode 100644
index 0000000..d57a1fe
Binary files /dev/null and b/NHSE.Sprites/Resources/Villagers/squ20.png differ
diff --git a/NHSE.Villagers/Properties/Resources.Designer.cs b/NHSE.Villagers/Properties/Resources.Designer.cs
index 4309d66..5696236 100644
--- a/NHSE.Villagers/Properties/Resources.Designer.cs
+++ b/NHSE.Villagers/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace NHSE.Villagers.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -800,6 +800,26 @@ internal class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] brd20H {
+ get {
+ object obj = ResourceManager.GetObject("brd20H", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] brd20V {
+ get {
+ object obj = ResourceManager.GetObject("brd20V", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Byte[].
///
@@ -2380,6 +2400,26 @@ internal class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] der12H {
+ get {
+ object obj = ResourceManager.GetObject("der12H", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] der12V {
+ get {
+ object obj = ResourceManager.GetObject("der12V", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Byte[].
///
@@ -7940,6 +7980,46 @@ internal class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] squ19H {
+ get {
+ object obj = ResourceManager.GetObject("squ19H", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] squ19V {
+ get {
+ object obj = ResourceManager.GetObject("squ19V", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] squ20H {
+ get {
+ object obj = ResourceManager.GetObject("squ20H", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] squ20V {
+ get {
+ object obj = ResourceManager.GetObject("squ20V", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Byte[].
///
diff --git a/NHSE.Villagers/Properties/Resources.resx b/NHSE.Villagers/Properties/Resources.resx
index 6cc6711..3d76989 100644
--- a/NHSE.Villagers/Properties/Resources.resx
+++ b/NHSE.Villagers/Properties/Resources.resx
@@ -340,6 +340,12 @@
..\Resources\Villagers\brd18V.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\Resources\Houses\brd20H.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\Resources\Villagers\brd20V.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
..\Resources\Houses\bul00H.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -814,6 +820,12 @@
..\Resources\Villagers\der11V.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\Resources\Houses\der12H.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\Resources\Villagers\der12V.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
..\Resources\Houses\dog00H.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -2482,6 +2494,18 @@
..\Resources\Villagers\squ18V.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\Resources\Houses\squ19H.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\Resources\Villagers\squ19V.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\Resources\Houses\squ20H.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\Resources\Villagers\squ20V.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
..\Resources\Houses\squ21H.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
diff --git a/NHSE.Villagers/Resources/Houses/brd20H.bin b/NHSE.Villagers/Resources/Houses/brd20H.bin
new file mode 100644
index 0000000..d7dadd5
Binary files /dev/null and b/NHSE.Villagers/Resources/Houses/brd20H.bin differ
diff --git a/NHSE.Villagers/Resources/Houses/der12H.bin b/NHSE.Villagers/Resources/Houses/der12H.bin
new file mode 100644
index 0000000..8f1760d
Binary files /dev/null and b/NHSE.Villagers/Resources/Houses/der12H.bin differ
diff --git a/NHSE.Villagers/Resources/Houses/squ19H.bin b/NHSE.Villagers/Resources/Houses/squ19H.bin
new file mode 100644
index 0000000..fd907f3
Binary files /dev/null and b/NHSE.Villagers/Resources/Houses/squ19H.bin differ
diff --git a/NHSE.Villagers/Resources/Houses/squ20H.bin b/NHSE.Villagers/Resources/Houses/squ20H.bin
new file mode 100644
index 0000000..334456d
Binary files /dev/null and b/NHSE.Villagers/Resources/Houses/squ20H.bin differ
diff --git a/NHSE.Villagers/Resources/Villagers/brd20V.bin b/NHSE.Villagers/Resources/Villagers/brd20V.bin
new file mode 100644
index 0000000..68bf61a
Binary files /dev/null and b/NHSE.Villagers/Resources/Villagers/brd20V.bin differ
diff --git a/NHSE.Villagers/Resources/Villagers/der12V.bin b/NHSE.Villagers/Resources/Villagers/der12V.bin
new file mode 100644
index 0000000..f3454b8
Binary files /dev/null and b/NHSE.Villagers/Resources/Villagers/der12V.bin differ
diff --git a/NHSE.Villagers/Resources/Villagers/squ19V.bin b/NHSE.Villagers/Resources/Villagers/squ19V.bin
new file mode 100644
index 0000000..6456a4d
Binary files /dev/null and b/NHSE.Villagers/Resources/Villagers/squ19V.bin differ
diff --git a/NHSE.Villagers/Resources/Villagers/squ20V.bin b/NHSE.Villagers/Resources/Villagers/squ20V.bin
new file mode 100644
index 0000000..8324c2f
Binary files /dev/null and b/NHSE.Villagers/Resources/Villagers/squ20V.bin differ
diff --git a/NHSE.WinForms/Main.Designer.cs b/NHSE.WinForms/Main.Designer.cs
index 52ed0c1..c6ca91f 100644
--- a/NHSE.WinForms/Main.Designer.cs
+++ b/NHSE.WinForms/Main.Designer.cs
@@ -28,37 +28,37 @@ protected override void Dispose(bool disposing)
///
private void InitializeComponent()
{
- this.B_Open = new System.Windows.Forms.Button();
- this.SuspendLayout();
+ B_Open = new System.Windows.Forms.Button();
+ SuspendLayout();
//
// B_Open
//
- this.B_Open.Dock = System.Windows.Forms.DockStyle.Fill;
- this.B_Open.Location = new System.Drawing.Point(0, 0);
- this.B_Open.Name = "B_Open";
- this.B_Open.Size = new System.Drawing.Size(306, 121);
- this.B_Open.TabIndex = 0;
- this.B_Open.Text = "Open main.dat\r\n\r\nOr...\r\n\r\nDrag&&Drop folder here!";
- this.B_Open.UseVisualStyleBackColor = true;
- this.B_Open.Click += new System.EventHandler(this.Menu_Open);
+ B_Open.Dock = System.Windows.Forms.DockStyle.Fill;
+ B_Open.Location = new System.Drawing.Point(0, 0);
+ B_Open.Name = "B_Open";
+ B_Open.Size = new System.Drawing.Size(306, 121);
+ B_Open.TabIndex = 0;
+ B_Open.Text = "Open main.dat\r\n\r\nOr...\r\n\r\nDrag && Drop folder here!";
+ B_Open.UseVisualStyleBackColor = true;
+ B_Open.Click += Menu_Open;
//
// Main
//
- this.AllowDrop = true;
- this.ClientSize = new System.Drawing.Size(306, 121);
- this.Controls.Add(this.B_Open);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
- this.Icon = global::NHSE.WinForms.Properties.Resources.icon;
- this.KeyPreview = true;
- this.MaximizeBox = false;
- this.MinimizeBox = false;
- this.Name = "Main";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "NHSE";
- this.DragDrop += new System.Windows.Forms.DragEventHandler(this.Main_DragDrop);
- this.DragEnter += new System.Windows.Forms.DragEventHandler(this.Main_DragEnter);
- this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Main_KeyDown);
- this.ResumeLayout(false);
+ AllowDrop = true;
+ ClientSize = new System.Drawing.Size(306, 121);
+ Controls.Add(B_Open);
+ FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+ Icon = Properties.Resources.icon;
+ KeyPreview = true;
+ MaximizeBox = false;
+ MinimizeBox = false;
+ Name = "Main";
+ StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ Text = "NHSE";
+ DragDrop += Main_DragDrop;
+ DragEnter += Main_DragEnter;
+ KeyDown += Main_KeyDown;
+ ResumeLayout(false);
}
diff --git a/NHSE.WinForms/Main.resx b/NHSE.WinForms/Main.resx
index 1af7de1..8b2ff64 100644
--- a/NHSE.WinForms/Main.resx
+++ b/NHSE.WinForms/Main.resx
@@ -1,17 +1,17 @@
-