fixed #62 (#40, #25, #55, #52), fixed #60 fixed #58

Monitor221hz · Jan 3, 2024 · 46691ff · 46691ff
1 parent 1a75892
commit 46691ff
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 271 deletions.
diff --git a/PandoraPlus/MVVM/ViewModel/EngineViewModel.cs b/PandoraPlus/MVVM/ViewModel/EngineViewModel.cs
@@ -81,11 +81,12 @@ public EngineViewModel(IModInfoProvider modinfoProvider)
  CultureInfo.CurrentCulture = culture;
 
  preloadTask = Task.Run(Engine.PreloadAsync);
-
  }
  public async Task LoadAsync()
  {
- List<IModInfo> modInfos = new List<IModInfo>();
+
+
+ List<IModInfo> modInfos = new List<IModInfo>();
 #if DEBUG
  modInfos = await modinfoProvider?.GetInstalledMods("C:\\Games\\Skyrim Modding\\Creation Tools\\Skyrim.Behavior.Tool\\PandoraTEST\\Pandora_Engine\\mod")!;
 #endif
@@ -112,7 +113,7 @@ public async Task LoadAsync()
  modInfos = modInfos.OrderBy(m => m.Priority == 0).ThenBy(m => m.Priority).ToList();
 
  foreach(var modInfo in modInfos) { Mods.Add(modInfo); }
-
+ await WriteLogBoxLine("Mods loaded.");
  }
 
  public void Exit(object? p)
@@ -212,6 +213,18 @@ private async void LaunchEngine(object? parameter)
  await preloadTask;
  List<IModInfo> activeMods = GetActiveModsByPriority();
 
+ IModInfo? baseModInfo = Mods.Where(m => m.Code == "pandora").FirstOrDefault();
+
+ if (baseModInfo == null) { await WriteLogBoxLine("FATAL ERROR: Pandora Base does not exist. Ensure the engine was installed properly and data is not corrupted."); return; }
+ if (!baseModInfo.Active)
+ {
+ baseModInfo.Active = true;
+ activeMods.Add(baseModInfo);
+ }
+ baseModInfo.Priority = uint.MaxValue;
+
+
+
  Stopwatch timer = Stopwatch.StartNew();
 
  await Task.Run(async() => { await Engine.LaunchAsync(activeMods); }); 

diff --git a/PandoraPlus/Nemesis_Engine/mod/colis/magicbehavior/#0077.txt b/PandoraPlus/Nemesis_Engine/mod/colis/magicbehavior/#0077.txt
diff --git a/PandoraPlus/PandoraPlus.csproj b/PandoraPlus/PandoraPlus.csproj
@@ -65,7 +65,6 @@
 
  <ItemGroup>
  <Folder Include="MVVM\Model\Interface\" />
- <Folder Include="Nemesis_Engine\mod\colis\magicbehavior\" />
  <Folder Include="Pandora_Engine\Skyrim\Process\" />
  <Folder Include="Patch\Havok\" />
  <Folder Include="Patch\Patchers\Interface\Variants\" />
@@ -84,15 +83,6 @@
  </ItemGroup>
 
  <ItemGroup>
- <None Update="Nemesis_Engine\mod\colis\magicbehavior\#0077.txt">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Nemesis_Engine\mod\evfmgo\magicbehavior\#0077.txt">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Nemesis_Engine\mod\tdmv\magicbehavior\#0077.txt">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
  <None Update="NLog.config">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </None>
@@ -123,6 +113,12 @@
  <None Update="Pandora_Engine\mod\pandora\info.ini">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </None>
+ <None Update="Pandora_Engine\mod\pandora\magicbehavior\#0077.txt">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Update="Pandora_Engine\mod\pandora\magicmountedbehavior\#0071.txt">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
  <None Update="Pandora_Engine\Skyrim\Template\actors\ambient\chicken\behaviors\chickenbehavior.hkx">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </None>

diff --git a/PandoraPlus/Pandora_Engine/mod/pandora/info.ini b/PandoraPlus/Pandora_Engine/mod/pandora/info.ini
@@ -1,5 +1,5 @@
-name=Pandora Base
-author=Shikyo Kira & Monitor144hz
+name=Pandora Base (REQUIRED)
+author=Monitor144hz
 site=null
 auto=null
 hidden=true
diff --git a/...Engine/mod/evfmgo/magicbehavior/#0077.txt → ...ngine/mod/pandora/magicbehavior/#0077.txt b/...Engine/mod/evfmgo/magicbehavior/#0077.txt → ...ngine/mod/pandora/magicbehavior/#0077.txt
@@ -97,9 +97,6 @@
  <hkcstring>arrowDetach</hkcstring>
  <hkcstring>attackStop</hkcstring>
  <hkcstring>SneakSprintStartRoll</hkcstring>
-<!-- MOD_CODE ~evfmgo~ OPEN -->
- <hkcstring>PIE</hkcstring>
-<!-- CLOSE -->
  </hkparam>
  <hkparam name="attributeNames" numelements="0"></hkparam>
  <hkparam name="variableNames" numelements="81">
@@ -134,7 +131,11 @@
  <hkcstring>IsShouting</hkcstring>
  <hkcstring>iState</hkcstring>
  <hkcstring>iState_NPCDefault</hkcstring>
+<!-- MOD_CODE ~pandora~ OPEN -->
+ <hkcstring> iState_NPCSneaking</hkcstring>
+<!-- ORIGINAL -->
  <hkcstring> iState_NPCSneaking</hkcstring>
+<!-- CLOSE -->
  <hkcstring>InDualMagicState</hkcstring>
  <hkcstring>iDualMagicState</hkcstring>
  <hkcstring>bMLh_Ready</hkcstring>

diff --git a/...s_Engine/mod/tdmv/magicbehavior/#0077.txt → ...od/pandora/magicmountedbehavior/#0071.txt b/...s_Engine/mod/tdmv/magicbehavior/#0077.txt → ...od/pandora/magicmountedbehavior/#0071.txt
@@ -1,11 +1,9 @@
- <hkobject name="#0077" class="hkbBehaviorGraphStringData" signature="0xc713064e">
- <hkparam name="eventNames" numelements="97">
+ <hkobject name="#0071" class="hkbBehaviorGraphStringData" signature="0xc713064e">
+ <hkparam name="eventNames" numelements="95">
  <hkcstring>staggerStop</hkcstring>
  <hkcstring>MRh_Equipped_Event</hkcstring>
  <hkcstring>shoutStop</hkcstring>
  <hkcstring>shoutStart</hkcstring>
- <hkcstring>moveStop</hkcstring>
- <hkcstring>moveStart</hkcstring>
  <hkcstring>SneakStop</hkcstring>
  <hkcstring>SneakStart</hkcstring>
  <hkcstring>turnStop</hkcstring>
@@ -91,15 +89,15 @@
  <hkcstring>BeginCastVoice</hkcstring>
  <hkcstring>NPCshoutStart</hkcstring>
  <hkcstring>bowZoomStart</hkcstring>
- <hkcstring>Event00</hkcstring>
  <hkcstring>SoundPlay.WPNBowZoomIn</hkcstring>
  <hkcstring>bowReset</hkcstring>
  <hkcstring>arrowDetach</hkcstring>
  <hkcstring>attackStop</hkcstring>
  <hkcstring>SneakSprintStartRoll</hkcstring>
+ <hkcstring>MC_shoutStart</hkcstring>
  </hkparam>
  <hkparam name="attributeNames" numelements="0"></hkparam>
- <hkparam name="variableNames" numelements="81">
+ <hkparam name="variableNames" numelements="79">
  <hkcstring>blendDefault</hkcstring>
  <hkcstring>blendMove1stP</hkcstring>
  <hkcstring>blendMoveStop</hkcstring>
@@ -120,7 +118,6 @@
  <hkcstring>i1stPerson</hkcstring>
  <hkcstring>iSyncSprintState</hkcstring>
  <hkcstring>iIsInSneak</hkcstring>
- <hkcstring>iSyncIdleLocomotion</hkcstring>
  <hkcstring>bMRh_Ready</hkcstring>
  <hkcstring>staggerMagnitude</hkcstring>
  <hkcstring>IsStaggering</hkcstring>
@@ -131,7 +128,11 @@
  <hkcstring>IsShouting</hkcstring>
  <hkcstring>iState</hkcstring>
  <hkcstring>iState_NPCDefault</hkcstring>
+<!-- MOD_CODE ~pandora~ OPEN -->
  <hkcstring> iState_NPCSneaking</hkcstring>
+<!-- ORIGINAL -->
+ <hkcstring> iState_NPCSneaking</hkcstring>
+<!-- CLOSE -->
  <hkcstring>InDualMagicState</hkcstring>
  <hkcstring>iDualMagicState</hkcstring>
  <hkcstring>bMLh_Ready</hkcstring>
@@ -180,19 +181,11 @@
  <hkcstring>Pitch</hkcstring>
  <hkcstring>BowAimOffsetHeading</hkcstring>
  <hkcstring>BowAimOffsetPitch</hkcstring>
- <hkcstring>bVoiceReady</hkcstring>
-<!-- MOD_CODE ~tdmv~ OPEN -->
- <hkcstring>tdmHeadtrackingBehavior</hkcstring>
- <hkcstring>TDM_LockRotation</hkcstring>
-<!-- CLOSE -->
  </hkparam>
- <hkparam name="characterPropertyNames" numelements="7">
+ <hkparam name="characterPropertyNames" numelements="4">
  <hkcstring>LeftArm</hkcstring>
- <hkcstring>UpperBody</hkcstring>
- <hkcstring>ExcludeRootAndCamera</hkcstring>
- <hkcstring>Hands</hkcstring>
  <hkcstring>MRhFavorBoneSwitch</hkcstring>
  <hkcstring>MLhFavorBoneSwitch</hkcstring>
  <hkcstring>RightArm</hkcstring>
  </hkparam>
- </hkobject>
+ </hkobject>
diff --git a/PandoraPlus/Patch/Patchers/Skyrim/AnimSetData/AnimSetDataManager.cs b/PandoraPlus/Patch/Patchers/Skyrim/AnimSetData/AnimSetDataManager.cs
@@ -78,6 +78,7 @@ public void SplitAnimSetDataSingleFile()
  public void MergeAnimSetDataSingleFile()
  {
  if (outputAnimSetDataSingleFile.Exists) { outputAnimSetDataSingleFile.Delete(); }
+ if (outputAnimSetDataSingleFile.Directory != null && !outputAnimSetDataSingleFile.Directory.Exists) { outputAnimSetDataSingleFile.Directory.Create(); }
 
  using (var writeStream = outputAnimSetDataSingleFile.OpenWrite())
  {