*fixed for 1.1

BattletechModders · Jun 19, 2018 · e6c3d86 · e6c3d86
1 parent 98a98c3
commit e6c3d86
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/ClassLibrary2/CommanderPortraitLoader.csproj b/ClassLibrary2/CommanderPortraitLoader.csproj
@@ -31,12 +31,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony, Version=1.0.9.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="0Harmony, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\BATTLETECH\BattleTech_Data\Managed\0Harmony.dll</HintPath>
     </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>D:\SteamLibrary\steamapps\common\BATTLETECH\BattleTech_Data\Managed\Assembly-CSharp.dll</HintPath>
+    <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\BATTLETECH\BattleTech_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
@@ -50,11 +51,9 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="UnityEngine">
-      <HintPath>D:\SteamLibrary\steamapps\common\BATTLETECH\BattleTech_Data\Managed\UnityEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>D:\SteamLibrary\steamapps\common\BATTLETECH\BattleTech_Data\Managed\UnityEngine.UI.dll</HintPath>
+    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\BATTLETECH\BattleTech_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/ClassLibrary2/Patch.cs b/ClassLibrary2/Patch.cs
@@ -311,8 +311,13 @@ public static IEnumerable<CodeInstruction> Transpiler(ILGenerator ilGenerator, I
     [HarmonyPatch(typeof(SGCharacterCreationNamePanel), "LoadOptions")]
     public static class SGCharacterCreationNamePanel_LoadOptions_Patch
     {
+        static bool Prefix() {
+            return false;
+        }
+
         static void Postfix(ref SGCharacterCreationNamePanel __instance)
         {
+            ReflectionHelper.SetPrivateField(__instance, "nameWasBlank", (bool)ReflectionHelper.InvokePrivateMethode(__instance, "get_NameIsBlank",null));
             __instance.pronounSelector.SetOptions(new string[]
             {
                 "Female Pro",
@@ -356,6 +361,7 @@ public static bool Prefix(ref SGCharacterCreationNamePanel __instance, ref Gende
         }
         public static void Postfix(ref SGCharacterCreationNamePanel __instance, ref Gender __result)
         {
+
             bool lastVOWasLight = false;
             WwiseManager.PostEvent(AudioEventList_vo.vo_stop_pilots, WwiseManager.GlobalAudioObject, null, null);
             NewVoice.newVoice = string.Empty;