From a8746e6086bae8607ebeb2e24211ce93f79f2863 Mon Sep 17 00:00:00 2001
From: Bluefissure <Bluefissure@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:48:15 -0500
Subject: [PATCH] CN EW Update (#105)

* Update for CN 6.0

* Bump version to v2.0.15.4
---
 ConceptMatrix/OffsetSettingsCN.json      | 130 +++++++++++------------
 ConceptMatrix/Properties/AssemblyInfo.cs |   4 +-
 2 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/ConceptMatrix/OffsetSettingsCN.json b/ConceptMatrix/OffsetSettingsCN.json
index 69a9a32..f7f5228 100644
--- a/ConceptMatrix/OffsetSettingsCN.json
+++ b/ConceptMatrix/OffsetSettingsCN.json
@@ -1,12 +1,12 @@
 {
-  "Version": "5.5.8.0",
+  "Version": "6.0.0.1",
   "Character": {
     "Name": "30",
     "ActorID": "74",
     "FCTag": "18B2",
     "Title": "1960",
-    "JobIco": "1E2",
-    "Voices": "1DC",
+    "JobIco": "1E0",
+    "Voices": "19BE",
     "Body": {
       "Base": "F0",
       "Position": {
@@ -35,43 +35,43 @@
       "MuscleTone": "240,28,20,C",
       "TailSize": "148,74"
     },
-    "MovingTime": "1608",
+    "MovingTime": "1770",
     "Weather": "20",
     "ForceWeather": "27",
     "Music": "C0,116",
     "Music2": "C0,114",
     "NameHeight": "164",
     "RenderToggle": "104",
-    "Transparency": "182C",
+    "Transparency": "18B8",
     "EntityType": "8C",
     "EntitySub": "8D",
     "ModelType": "1B4",
-    "Race": "1898",
-    "Gender": "1899",
-    "BodyType": "189A",
-    "RHeight": "189B",
-    "Clan": "189C",
-    "Head": "189D",
-    "Hair": "189E",
-    "Highlights": "189F",
-    "Skintone": "18A0",
-    "RightEye": "18A1",
-    "HairTone": "18A2",
-    "HighlightTone": "18A3",
-    "FacialFeatures": "18A4",
-    "LimbalEyes": "18A5",
-    "EyeBrowType": "18A6",
-    "LeftEye": "18A7",
-    "Eye": "18A8",
-    "Nose": "18A9",
-    "Jaw": "18AA",
-    "Lips": "18AB",
-    "LipsTone": "18AC",
-    "TailorMuscle": "18AD",
-    "TailType": "18AE",
-    "RBust": "18AF",
-    "FacePaint": "18B0",
-    "FacePaintColor": "18B1",
+    "Race": "DD8",
+    "Gender": "DD9",
+    "BodyType": "DDA",
+    "RHeight": "DDB",
+    "Clan": "DDC",
+    "Head": "DDD",
+    "Hair": "DDE",
+    "Highlights": "DDF",
+    "Skintone": "DE0",
+    "RightEye": "DE1",
+    "HairTone": "DE2",
+    "HighlightTone": "DE3",
+    "FacialFeatures": "DE4",
+    "LimbalEyes": "DE5",
+    "EyeBrowType": "DE6",
+    "LeftEye": "DE7",
+    "Eye": "DE8",
+    "Nose": "DE9",
+    "Jaw": "DEA",
+    "Lips": "DEB",
+    "LipsTone": "DEC",
+    "TailorMuscle": "DED",
+    "TailType": "DEE",
+    "RBust": "DEF",
+    "FacePaint": "DF0",
+    "FacePaintColor": "DF1",
     "CamAngleX": "130",
     "CamAngleY": "134",
     "CamPanX": "150",
@@ -97,45 +97,45 @@
     "CameraUpDown": "218",
     "EmoteIsPlayerFrozen": "7C4",
     "AltCheckPlayerFrozen": "DA4",
-    "Emote": "CC0",
+    "Emote": "F30",
     "DataPath": "F0,938",
     "DataHead": "F0,93C",
     "NPCName": "1870",
     "NPCModel": "18F8",
     "StatusEffect": "19F8",
-    "Job": "F08", // MAIN HAND
-    "WeaponBase": "F0A",
-    "WeaponV": "F0C",
-    "WeaponDye": "F0E",
-    "Offhand": "F70",
-    "OffhandBase": "F72",
-    "OffhandV": "F74",
-    "OffhandDye": "F76",
-    "HeadPiece": "1040",
-    "HeadV": "1042",
-    "HeadDye": "1043",
-    "Chest": "1044",
-    "ChestV": "1046",
-    "ChestDye": "1047",
-    "Arms": "1048",
-    "ArmsV": "104A",
-    "ArmsDye": "104B",
-    "Legs": "104C",
-    "LegsV": "104E",
-    "LegsDye": "104F",
-    "Feet": "1050",
-    "FeetVa": "1052",
-    "FeetDye": "1053",
-    "Ear": "1054",
-    "EarVa": "1056",
-    "Neck": "1058",
-    "NeckVa": "105A",
-    "Wrist": "105C",
-    "WristVa": "105E",
-    "RFinger": "1060",
-    "RFingerVa": "1062",
-    "LFinger": "1064",
-    "LFingerVa": "1066",
+    "Job": "C78", // MAIN HAND
+    "WeaponBase": "C7A",
+    "WeaponV": "C7C",
+    "WeaponDye": "C7E",
+    "Offhand": "CE0",
+    "OffhandBase": "CE2",
+    "OffhandV": "CE4",
+    "OffhandDye": "CE6",
+    "HeadPiece": "DB0",
+    "HeadV": "DB2",
+    "HeadDye": "DB3",
+    "Chest": "DB4",
+    "ChestV": "DB6",
+    "ChestDye": "DB7",
+    "Arms": "DB8",
+    "ArmsV": "DBA",
+    "ArmsDye": "DBB",
+    "Legs": "DBC",
+    "LegsV": "DBE",
+    "LegsDye": "DBF",
+    "Feet": "DC0",
+    "FeetVa": "DC2",
+    "FeetDye": "DC3",
+    "Ear": "DC4",
+    "EarVa": "DC6",
+    "Neck": "DC8",
+    "NeckVa": "DCA",
+    "Wrist": "DCC",
+    "WristVa": "DCE",
+    "RFinger": "DD0",
+    "RFingerVa": "DD2",
+    "LFinger": "DD4",
+    "LFingerVa": "DD6",
     "WeaponX": "F0,30,70",
     "WeaponY": "F0,30,74",
     "WeaponZ": "F0,30,78",
diff --git a/ConceptMatrix/Properties/AssemblyInfo.cs b/ConceptMatrix/Properties/AssemblyInfo.cs
index dc85816..78c499f 100644
--- a/ConceptMatrix/Properties/AssemblyInfo.cs
+++ b/ConceptMatrix/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.15.3")]
-[assembly: AssemblyFileVersion("2.0.15.3")]
+[assembly: AssemblyVersion("2.0.15.4")]
+[assembly: AssemblyFileVersion("2.0.15.4")]