From f4bbb7a7bba9afb49ea16bee4380467480a69695 Mon Sep 17 00:00:00 2001
From: Charlie U <52503242+cpurules@users.noreply.github.com>
Date: Wed, 30 Sep 2020 11:12:48 -0400
Subject: [PATCH] Resolve Villager Import Bug (#403)

* Add missing not operator

* Fix backwards conversions
---
 NHSE.Core/Structures/Villager/VillagerConverter.cs | 4 ++--
 NHSE.WinForms/Controls/VillagerEditor.cs           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NHSE.Core/Structures/Villager/VillagerConverter.cs b/NHSE.Core/Structures/Villager/VillagerConverter.cs
index 77c97b8..eed30be 100644
--- a/NHSE.Core/Structures/Villager/VillagerConverter.cs
+++ b/NHSE.Core/Structures/Villager/VillagerConverter.cs
@@ -24,8 +24,8 @@ public static byte[] GetCompatible(byte[] data, int expect)
 
             return expect switch
             {
-                Villager1.SIZE when data.Length == Villager2.SIZE => Convert12(data),
-                Villager2.SIZE when data.Length == Villager1.SIZE => Convert21(data),
+                Villager1.SIZE when data.Length == Villager2.SIZE => Convert21(data),
+                Villager2.SIZE when data.Length == Villager1.SIZE => Convert12(data),
                 _ => data
             };
         }
diff --git a/NHSE.WinForms/Controls/VillagerEditor.cs b/NHSE.WinForms/Controls/VillagerEditor.cs
index af28ae4..969e9ea 100644
--- a/NHSE.WinForms/Controls/VillagerEditor.cs
+++ b/NHSE.WinForms/Controls/VillagerEditor.cs
@@ -132,7 +132,7 @@ private void B_LoadVillager_Click(object sender, EventArgs e)
             var path = ofd.FileName;
             var expectLength = SAV.Offsets.VillagerSize;
             var fi = new FileInfo(path);
-            if (VillagerConverter.IsCompatible((int)fi.Length, expectLength))
+            if (!VillagerConverter.IsCompatible((int)fi.Length, expectLength))
             {
                 WinFormsUtil.Error(string.Format(MessageStrings.MsgDataSizeMismatchImport, fi.Length, expectLength), path);
                 return;