Skip to content

Commit 0ffa0fd

Browse files
committed
remove botmod as its in SPT now, fix up for 4.0.0
1 parent 32d4854 commit 0ffa0fd

24 files changed

Lines changed: 876 additions & 698 deletions
-12 KB
Binary file not shown.

src/Build/CWX_MegaMod.zip

8.48 MB
Binary file not shown.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CRepos_005CMegaMod_005Cshared_005CFidelityFX_002EFSR_002Edll/@EntryIndexedValue">True</s:Boolean>
3+
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CRepos_005CMegaMod_005Cshared_005CUnityEngine_002EAssetBundleModule_002Edll/@EntryIndexedValue">True</s:Boolean>
4+
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CRepos_005CMegaMod_005Cshared_005CUnity_002EPostprocessing_002ERuntime_002Edll/@EntryIndexedValue">True</s:Boolean>
5+
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABaseLocalGame_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003FCWX_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fad47400a25db462cbf0a531df654c3c3f29c00_003Ff3_003F085b3014_003FBaseLocalGame_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
6+
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFsr3UpscalerAssets_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003FCWX_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fce73c52ac53241d1a36e5c5726772faff800_003Faa_003Fe9eaf6a5_003FFsr3UpscalerAssets_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
7+
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ALocalGame_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003FCWX_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fad47400a25db462cbf0a531df654c3c3f29c00_003F41_003Fc57599ec_003FLocalGame_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
8+
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ALocationSettingsClass_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003FCWX_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fad47400a25db462cbf0a531df654c3c3f29c00_003Fdf_003Fb1fd2319_003FLocationSettingsClass_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
9+
<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
10+
&lt;Assembly Path="C:\Repos\MegaMod\shared\BepInEx.dll" /&gt;&#xD;
11+
&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>

src/CWX-MegaMod/AlarmChanger/AlarmChanger.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public async void Awake()
2727

2828
if (!Directory.Exists(AppDomain.CurrentDomain.BaseDirectory + "/BepInEx/plugins/CWX/Sounds/"))
2929
{
30+
MegaMod.Logger.LogWarning("Directory not found for sounds, destroying script.");
3031
Destroy(this);
3132
}
3233

src/CWX-MegaMod/BotMonitor/BotMonitorScript.cs

Lines changed: 0 additions & 188 deletions
This file was deleted.

src/CWX-MegaMod/BotMonitor/Helpers/EnumExtensions.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/CWX-MegaMod/BotMonitor/Models/BotRoleAndDiffClass.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/CWX-MegaMod/BotMonitor/Models/EMonitorMode.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/CWX-MegaMod/CWX-MegaMod.csproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22

33
<PropertyGroup>
44
<AssemblyName>CWX_MegaMod</AssemblyName>
5-
<TargetFramework>net471</TargetFramework>
6-
<Version>1.5.0</Version>
5+
<TargetFramework>netstandard2.1</TargetFramework>
6+
<Version>4.0.0</Version>
7+
<LangVersion>latest</LangVersion>
78
</PropertyGroup>
89

910
<ItemGroup>
1011
<Reference Include="0Harmony">
1112
<HintPath>..\..\shared\0Harmony.dll</HintPath>
1213
</Reference>
14+
<Reference Include="FidelityFX.FSR">
15+
<HintPath>..\..\shared\FidelityFX.FSR.dll</HintPath>
16+
</Reference>
1317
<Reference Include="spt-Common">
1418
<HintPath>..\..\shared\spt-Common.dll</HintPath>
1519
</Reference>
@@ -34,6 +38,9 @@
3438
<Reference Include="UnityEngine">
3539
<HintPath>..\..\shared\UnityEngine.dll</HintPath>
3640
</Reference>
41+
<Reference Include="UnityEngine.AssetBundleModule">
42+
<HintPath>..\..\shared\UnityEngine.AssetBundleModule.dll</HintPath>
43+
</Reference>
3744
<Reference Include="UnityEngine.CoreModule">
3845
<HintPath>..\..\shared\UnityEngine.CoreModule.dll</HintPath>
3946
</Reference>

src/CWX-MegaMod/LootLoss/LootLossPatch.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ protected override MethodBase GetTargetMethod()
1616
[PatchPrefix]
1717
public static void PatchPrefix(ref LocalRaidSettings raidSettings)
1818
{
19-
if (MegaMod.LootLoss.Value)
19+
if (!MegaMod.LootLoss.Value)
2020
{
21-
raidSettings.selectedLocation.containers = new Dictionary<string, LocationSettingsClass.Location.GClass1350>();
22-
raidSettings.selectedLocation.Loot = new GClass1333();
21+
return;
2322
}
23+
24+
raidSettings.selectedLocation.containers = new Dictionary<string, LocationSettingsClass.Location.GClass1421>();
25+
raidSettings.selectedLocation.Loot = new GClass1404();
2426
}
2527
}
2628
}

0 commit comments

Comments
 (0)