Merge branch 'master' of https://github.com/bbepis/BepisPlugins

IllusionMods · Nov 8, 2019 · fd40616 · fd40616
2 parents 848362e + fcdea72
commit fd40616
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/src/AI_ConfigurationManager/AI.ConfigurationManager.cs b/src/AI_ConfigurationManager/AI.ConfigurationManager.cs
@@ -42,6 +42,14 @@ private void Update()
  _manager.DisplayingWindow = !_manager.DisplayingWindow;
  }
 
+ [HarmonyPrefix]
+ [HarmonyPatch(typeof(CharaCustom.CustomControl), "Update")]
+ private static void ConfigScene_Toggle()
+ {
+ if (Input.GetKeyDown(KeyCode.F1) && !Manager.Scene.Instance.IsNowLoadingFade)
+ _manager.DisplayingWindow = !_manager.DisplayingWindow;
+ }
+
  [HarmonyPostfix]
  [HarmonyPatch(typeof(ConfigWindow), "Open")]
  private static void OnOpen(ConfigWindow __instance, ref Button[] ___buttons)

diff --git a/src/AI_ConfigurationManager/AI_ConfigurationManager.csproj b/src/AI_ConfigurationManager/AI_ConfigurationManager.csproj
@@ -19,7 +19,7 @@
  <DebugType>none</DebugType>
  <Optimize>false</Optimize>
  <OutputPath>..\..\bin\BepInEx\plugins\AI_BepisPlugins\</OutputPath>
- <DefineConstants>TRACE;DEBUG;KK</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;AI</DefineConstants>
  <ErrorReport>prompt</ErrorReport>
  <WarningLevel>4</WarningLevel>
  <Prefer32Bit>false</Prefer32Bit>
@@ -28,7 +28,7 @@
  <DebugType>none</DebugType>
  <Optimize>true</Optimize>
  <OutputPath>..\..\bin\BepInEx\plugins\AI_BepisPlugins\</OutputPath>
- <DefineConstants>TRACE;KK</DefineConstants>
+ <DefineConstants>TRACE;AI</DefineConstants>
  <ErrorReport>prompt</ErrorReport>
  <WarningLevel>4</WarningLevel>
  <DebugSymbols>false</DebugSymbols>
@@ -88,6 +88,6 @@
  <Import Project="..\Shared\Shared.projitems" Label="Shared" />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
- <PostBuildEvent>IF EXIST $(SolutionDir)PostBuild.bat CALL "$(SolutionDir)PostBuild.bat" $(TargetPath) KK</PostBuildEvent>
+ <PostBuildEvent>IF EXIST $(SolutionDir)PostBuild.bat CALL "$(SolutionDir)PostBuild.bat" $(TargetPath) AI</PostBuildEvent>
  </PropertyGroup>
 </Project>
diff --git a/src/Core_Sideloader_Studio/Core.Sideloader.Studio.ListLoader.cs b/src/Core_Sideloader_Studio/Core.Sideloader.Studio.ListLoader.cs
@@ -35,7 +35,7 @@ internal static StudioListData LoadStudioCSV(Stream stream, string fileName)
 
  bool CategoryOrGroup = false;
  if (fileNameStripped.Contains("_"))
- if (Sideloader.CategoryAndGroupList.Contains(fileNameStripped.Split('_')[0].ToLower()))
+ if (Sideloader.StudioListResolveBlacklist.Contains(fileNameStripped.Split('_')[0].ToLower()))
  CategoryOrGroup = true;
 
  using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))

diff --git a/src/Core_Sideloader_Studio/Core.Sideloader.Studio.cs b/src/Core_Sideloader_Studio/Core.Sideloader.Studio.cs
@@ -4,14 +4,15 @@ namespace Sideloader
 {
  public partial class Sideloader
  {
- internal static readonly HashSet<string> CategoryAndGroupList = new HashSet<string>()
+ internal static readonly HashSet<string> StudioListResolveBlacklist = new HashSet<string>()
  {
  "itemcategory",
  "animecategory",
  "voicecategory",
  "itemgroup",
  "animegroup",
- "voicegroup"
+ "voicegroup",
+ "bone"
  };
  }
 }
diff --git a/src/Core_Sideloader_Studio/UniversalAutoResolver/Core.UAR.Studio.cs b/src/Core_Sideloader_Studio/UniversalAutoResolver/Core.UAR.Studio.cs
@@ -45,7 +45,7 @@ internal static void GenerateStudioResolutionInfo(Manifest manifest, Lists.Studi
  entry[0] = newSlot.ToString();
  }
  }
- else if (Sideloader.CategoryAndGroupList.Contains(StudioListType))
+ else if (Sideloader.StudioListResolveBlacklist.Contains(StudioListType))
  {
  foreach (List<string> entry in data.Entries)
  {