diff --git a/.gitignore b/.gitignore index 5b48ec9..f6bbe44 100644 --- a/.gitignore +++ b/.gitignore @@ -24,20 +24,24 @@ Old/CWX-AirDrop/bin Old/CWX-AirDrop/obj ## Live -Live/CWX-BushWhacker/BushWhacker/bin -Live/CWX-BushWhacker/BushWhacker/obj +Live/CWX_BushWhacker/bin +Live/CWX_BushWhacker/obj -Live/CWX-DeSharpener/project/bin -Live/CWX-DeSharpener/project/obj +Live/CWX_DeSharpener/bin +Live/CWX_DeSharpener/obj -Live/CWX-MasterKey/CWX-MasterKey/bin -Live/CWX-MasterKey/CWX-MasterKey/obj +Live/CWX_MasterKey/bin +Live/CWX_MasterKey/obj -Live/CWX-VoiceAdder/VoiceAdd/bin -Live/CWX-VoiceAdder/VoiceAdd/obj +Live/CWX_VoiceAdder/bin +Live/CWX_VoiceAdder/obj -Live/CWX-WeatherPatcher/EFT.WeatherEditor/bin -Live/CWX-WeatherPatcher/EFT.WeatherEditor/obj +Live/CWX_WeatherPatcher/bin +Live/CWX_WeatherPatcher/obj + +Live/Shared/AKI +Live/Shared/BepInEx +Live/Shared/EFT ## WIP WIP/CWX-BackpackReload/CWX-BackpackReload/bin diff --git a/Live/CWX-BushWhacker/BushWhacker/BushWhacker.sln b/Live/CWX-BushWhacker/BushWhacker/BushWhacker.sln deleted file mode 100644 index 1e7f1c8..0000000 --- a/Live/CWX-BushWhacker/BushWhacker/BushWhacker.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32407.343 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BushWhacker", "BushWhacker.csproj", "{FBA1D35B-1115-4333-8A6F-6F5884BD47D9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FBA1D35B-1115-4333-8A6F-6F5884BD47D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBA1D35B-1115-4333-8A6F-6F5884BD47D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBA1D35B-1115-4333-8A6F-6F5884BD47D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBA1D35B-1115-4333-8A6F-6F5884BD47D9}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3C6E5DA0-E29A-467D-BF01-8B1DA4310A87} - EndGlobalSection -EndGlobal diff --git a/Live/CWX-BushWhacker/BushWhacker/shared/Aki.Common.dll b/Live/CWX-BushWhacker/BushWhacker/shared/Aki.Common.dll deleted file mode 100644 index 5de967d..0000000 Binary files a/Live/CWX-BushWhacker/BushWhacker/shared/Aki.Common.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/BushWhacker/shared/Aki.Reflection.dll b/Live/CWX-BushWhacker/BushWhacker/shared/Aki.Reflection.dll deleted file mode 100644 index 5b93eeb..0000000 Binary files a/Live/CWX-BushWhacker/BushWhacker/shared/Aki.Reflection.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/BushWhacker/shared/Assembly-CSharp.dll b/Live/CWX-BushWhacker/BushWhacker/shared/Assembly-CSharp.dll deleted file mode 100644 index 05417db..0000000 Binary files a/Live/CWX-BushWhacker/BushWhacker/shared/Assembly-CSharp.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/BushWhacker/shared/BepInEx.dll b/Live/CWX-BushWhacker/BushWhacker/shared/BepInEx.dll deleted file mode 100644 index 8aedff0..0000000 Binary files a/Live/CWX-BushWhacker/BushWhacker/shared/BepInEx.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/BushWhacker/shared/Comfort.dll b/Live/CWX-BushWhacker/BushWhacker/shared/Comfort.dll deleted file mode 100644 index 87df637..0000000 Binary files a/Live/CWX-BushWhacker/BushWhacker/shared/Comfort.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/BushWhacker/shared/Newtonsoft.Json.dll b/Live/CWX-BushWhacker/BushWhacker/shared/Newtonsoft.Json.dll deleted file mode 100644 index 6aa69df..0000000 Binary files a/Live/CWX-BushWhacker/BushWhacker/shared/Newtonsoft.Json.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/BushWhacker/shared/UnityEngine.AssetBundleModule.dll b/Live/CWX-BushWhacker/BushWhacker/shared/UnityEngine.AssetBundleModule.dll deleted file mode 100644 index ebe4176..0000000 Binary files a/Live/CWX-BushWhacker/BushWhacker/shared/UnityEngine.AssetBundleModule.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/BushWhacker/shared/UnityEngine.CoreModule.dll b/Live/CWX-BushWhacker/BushWhacker/shared/UnityEngine.CoreModule.dll deleted file mode 100644 index 7d585db..0000000 Binary files a/Live/CWX-BushWhacker/BushWhacker/shared/UnityEngine.CoreModule.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/BushWhacker/shared/UnityEngine.dll b/Live/CWX-BushWhacker/BushWhacker/shared/UnityEngine.dll deleted file mode 100644 index 6ff1d0f..0000000 Binary files a/Live/CWX-BushWhacker/BushWhacker/shared/UnityEngine.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/bepInEx/plugins/CWX-BushWhacker.dll b/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/bepInEx/plugins/CWX-BushWhacker.dll deleted file mode 100644 index 29a94ae..0000000 Binary files a/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/bepInEx/plugins/CWX-BushWhacker.dll and /dev/null differ diff --git a/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/user/mods/CWX-BushWhacker 1.0.0/LICENSE.txt b/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/user/mods/CWX-BushWhacker 1.0.0/LICENSE.txt deleted file mode 100644 index cc68bd7..0000000 --- a/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/user/mods/CWX-BushWhacker 1.0.0/LICENSE.txt +++ /dev/null @@ -1,35 +0,0 @@ -University of Illinois/NCSA Open Source License - -Copyright (c) [year] [fullname]. All rights reserved. - -Developed by: - [CWX] - [https://github.com/CWXDEV/CWX-DeSharpener] - [https://hub.sp-tarkov.com/files/file/455-cwx-desharpener/] - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal with the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - -* Neither the names of [fullname], [project] nor the names of its - contributors may be used to endorse or promote products derived from - this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -THE SOFTWARE. \ No newline at end of file diff --git a/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/user/mods/CWX-BushWhacker 1.0.0/package.js b/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/user/mods/CWX-BushWhacker 1.0.0/package.js deleted file mode 100644 index f07f715..0000000 --- a/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/user/mods/CWX-BushWhacker 1.0.0/package.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -class ModMain { - constructor() { - const mod = require("./package.json"); - this.modName = `${mod.author}-${mod.name}`; - - Logger.info(`Loading: ${this.modName} : ${mod.version}`); - } -} - -module.exports = new ModMain(); \ No newline at end of file diff --git a/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/user/mods/CWX-BushWhacker 1.0.0/package.json b/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/user/mods/CWX-BushWhacker 1.0.0/package.json deleted file mode 100644 index 235a770..0000000 --- a/Live/CWX-BushWhacker/CWX-BushWhacker 1.0.0/user/mods/CWX-BushWhacker 1.0.0/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "BUSHWHACKER", - "author": "CWX", - "version": "1.0.0", - "license": "NCSA", - "main": "package.js", - "akiVersion": "2.3.1" -} - diff --git a/Live/CWX-BushWhacker/LICENSE.txt b/Live/CWX-BushWhacker/LICENSE.txt deleted file mode 100644 index cc68bd7..0000000 --- a/Live/CWX-BushWhacker/LICENSE.txt +++ /dev/null @@ -1,35 +0,0 @@ -University of Illinois/NCSA Open Source License - -Copyright (c) [year] [fullname]. All rights reserved. - -Developed by: - [CWX] - [https://github.com/CWXDEV/CWX-DeSharpener] - [https://hub.sp-tarkov.com/files/file/455-cwx-desharpener/] - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal with the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - -* Neither the names of [fullname], [project] nor the names of its - contributors may be used to endorse or promote products derived from - this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -THE SOFTWARE. \ No newline at end of file diff --git a/Live/CWX-BushWhacker/README.md b/Live/CWX-BushWhacker/README.md deleted file mode 100644 index 80d4d89..0000000 --- a/Live/CWX-BushWhacker/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# BushWhacker -## CWX-BushWhacker for EFT - SPT-AKI -### CURRENT AKI VERSION: 2.3.1 -### GAMEVERSION: 0.12.12.17349 -### USING BEPINEX diff --git a/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/bepInEx/plugins/CWX-DeSharpener.dll b/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/bepInEx/plugins/CWX-DeSharpener.dll deleted file mode 100644 index df90b38..0000000 Binary files a/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/bepInEx/plugins/CWX-DeSharpener.dll and /dev/null differ diff --git a/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/user/mods/CWX-DeSharpener 1.2.1/LICENSE.txt b/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/user/mods/CWX-DeSharpener 1.2.1/LICENSE.txt deleted file mode 100644 index cc68bd7..0000000 --- a/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/user/mods/CWX-DeSharpener 1.2.1/LICENSE.txt +++ /dev/null @@ -1,35 +0,0 @@ -University of Illinois/NCSA Open Source License - -Copyright (c) [year] [fullname]. All rights reserved. - -Developed by: - [CWX] - [https://github.com/CWXDEV/CWX-DeSharpener] - [https://hub.sp-tarkov.com/files/file/455-cwx-desharpener/] - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal with the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - -* Neither the names of [fullname], [project] nor the names of its - contributors may be used to endorse or promote products derived from - this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -THE SOFTWARE. \ No newline at end of file diff --git a/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/user/mods/CWX-DeSharpener 1.2.1/package.js b/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/user/mods/CWX-DeSharpener 1.2.1/package.js deleted file mode 100644 index f07f715..0000000 --- a/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/user/mods/CWX-DeSharpener 1.2.1/package.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -class ModMain { - constructor() { - const mod = require("./package.json"); - this.modName = `${mod.author}-${mod.name}`; - - Logger.info(`Loading: ${this.modName} : ${mod.version}`); - } -} - -module.exports = new ModMain(); \ No newline at end of file diff --git a/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/user/mods/CWX-DeSharpener 1.2.1/package.json b/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/user/mods/CWX-DeSharpener 1.2.1/package.json deleted file mode 100644 index beed395..0000000 --- a/Live/CWX-DeSharpener/CWX-DeSharpener 1.2.1/user/mods/CWX-DeSharpener 1.2.1/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "DESHARPENER", - "author": "CWX", - "version": "1.2.1", - "license": "NCSA", - "main": "package.js", - "akiVersion": "2.3.1" -} - diff --git a/Live/CWX-DeSharpener/LICENSE.txt b/Live/CWX-DeSharpener/LICENSE.txt deleted file mode 100644 index cc68bd7..0000000 --- a/Live/CWX-DeSharpener/LICENSE.txt +++ /dev/null @@ -1,35 +0,0 @@ -University of Illinois/NCSA Open Source License - -Copyright (c) [year] [fullname]. All rights reserved. - -Developed by: - [CWX] - [https://github.com/CWXDEV/CWX-DeSharpener] - [https://hub.sp-tarkov.com/files/file/455-cwx-desharpener/] - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal with the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - -* Neither the names of [fullname], [project] nor the names of its - contributors may be used to endorse or promote products derived from - this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -THE SOFTWARE. \ No newline at end of file diff --git a/Live/CWX-DeSharpener/README.md b/Live/CWX-DeSharpener/README.md deleted file mode 100644 index 66a98bb..0000000 --- a/Live/CWX-DeSharpener/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# DeSharpener -## CWX-DESHARPENER for EFT - SPT-AKI -### CURRENT AKI VERSION: 2.3.0 -### GAMEVERSION: 0.12.12.16909 -### USING BEPINEX diff --git a/Live/CWX-DeSharpener/project/DeSharpener.sln b/Live/CWX-DeSharpener/project/DeSharpener.sln deleted file mode 100644 index 37fa2ae..0000000 --- a/Live/CWX-DeSharpener/project/DeSharpener.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31919.166 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeSharpener", "DeSharpener.csproj", "{42C0189E-B147-4111-94A1-E10F28F38870}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {42C0189E-B147-4111-94A1-E10F28F38870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42C0189E-B147-4111-94A1-E10F28F38870}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42C0189E-B147-4111-94A1-E10F28F38870}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42C0189E-B147-4111-94A1-E10F28F38870}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4C134147-3E4F-456D-BAB7-90D04E1C6FDB} - EndGlobalSection -EndGlobal diff --git a/Live/CWX-DeSharpener/project/Key.snk b/Live/CWX-DeSharpener/project/Key.snk deleted file mode 100644 index 884fe35..0000000 Binary files a/Live/CWX-DeSharpener/project/Key.snk and /dev/null differ diff --git a/Live/CWX-DeSharpener/project/shared/Aki.Common.dll b/Live/CWX-DeSharpener/project/shared/Aki.Common.dll deleted file mode 100644 index 5de967d..0000000 Binary files a/Live/CWX-DeSharpener/project/shared/Aki.Common.dll and /dev/null differ diff --git a/Live/CWX-DeSharpener/project/shared/Aki.Reflection.dll b/Live/CWX-DeSharpener/project/shared/Aki.Reflection.dll deleted file mode 100644 index 5b93eeb..0000000 Binary files a/Live/CWX-DeSharpener/project/shared/Aki.Reflection.dll and /dev/null differ diff --git a/Live/CWX-DeSharpener/project/shared/Assembly-CSharp.dll b/Live/CWX-DeSharpener/project/shared/Assembly-CSharp.dll deleted file mode 100644 index aa2d4dc..0000000 Binary files a/Live/CWX-DeSharpener/project/shared/Assembly-CSharp.dll and /dev/null differ diff --git a/Live/CWX-DeSharpener/project/shared/BepInEx.dll b/Live/CWX-DeSharpener/project/shared/BepInEx.dll deleted file mode 100644 index 8aedff0..0000000 Binary files a/Live/CWX-DeSharpener/project/shared/BepInEx.dll and /dev/null differ diff --git a/Live/CWX-DeSharpener/project/shared/ConfigurationManager.dll b/Live/CWX-DeSharpener/project/shared/ConfigurationManager.dll deleted file mode 100644 index bc5c017..0000000 Binary files a/Live/CWX-DeSharpener/project/shared/ConfigurationManager.dll and /dev/null differ diff --git a/Live/CWX-DeSharpener/project/shared/Newtonsoft.Json.dll b/Live/CWX-DeSharpener/project/shared/Newtonsoft.Json.dll deleted file mode 100644 index 6aa69df..0000000 Binary files a/Live/CWX-DeSharpener/project/shared/Newtonsoft.Json.dll and /dev/null differ diff --git a/Live/CWX-DeSharpener/project/shared/UnityEngine.CoreModule.dll b/Live/CWX-DeSharpener/project/shared/UnityEngine.CoreModule.dll deleted file mode 100644 index 7d585db..0000000 Binary files a/Live/CWX-DeSharpener/project/shared/UnityEngine.CoreModule.dll and /dev/null differ diff --git a/Live/CWX-DeSharpener/project/shared/UnityEngine.dll b/Live/CWX-DeSharpener/project/shared/UnityEngine.dll deleted file mode 100644 index 6ff1d0f..0000000 Binary files a/Live/CWX-DeSharpener/project/shared/UnityEngine.dll and /dev/null differ diff --git a/Live/CWX-MasterKey/CWX-MasterKey/CWX-MasterKey.csproj b/Live/CWX-MasterKey/CWX-MasterKey/CWX-MasterKey.csproj deleted file mode 100644 index 3ac05c1..0000000 --- a/Live/CWX-MasterKey/CWX-MasterKey/CWX-MasterKey.csproj +++ /dev/null @@ -1,40 +0,0 @@ - - - - net472 - CWX_MasterKey - CWX-MasterKey - 1.1.0 - - - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\BepInEx\core\0Harmony.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\Aki.Common.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\Aki.Reflection.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\Assembly-CSharp.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\BepInEx\core\BepInEx.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\Comfort.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\Newtonsoft.Json.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\UnityEngine.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\UnityEngine.CoreModule.dll - - - - diff --git a/Live/CWX-MasterKey/CWX-MasterKey/CWX-MasterKey.sln b/Live/CWX-MasterKey/CWX-MasterKey/CWX-MasterKey.sln deleted file mode 100644 index a6ab999..0000000 --- a/Live/CWX-MasterKey/CWX-MasterKey/CWX-MasterKey.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32228.430 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CWX-MasterKey", "CWX-MasterKey.csproj", "{40BE277F-55BE-4579-9535-D1F5ED9CC549}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {40BE277F-55BE-4579-9535-D1F5ED9CC549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40BE277F-55BE-4579-9535-D1F5ED9CC549}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40BE277F-55BE-4579-9535-D1F5ED9CC549}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40BE277F-55BE-4579-9535-D1F5ED9CC549}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {49967406-5073-428C-9A97-54A9CC1419D8} - EndGlobalSection -EndGlobal diff --git a/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/bepInEx/plugins/CWX-MasterKey.dll b/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/bepInEx/plugins/CWX-MasterKey.dll deleted file mode 100644 index 3ebc93d..0000000 Binary files a/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/bepInEx/plugins/CWX-MasterKey.dll and /dev/null differ diff --git a/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/user/mods/CWX-MasterKeys 1.1.2/LICENSE.txt b/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/user/mods/CWX-MasterKeys 1.1.2/LICENSE.txt deleted file mode 100644 index 9c5cb23..0000000 --- a/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/user/mods/CWX-MasterKeys 1.1.2/LICENSE.txt +++ /dev/null @@ -1,35 +0,0 @@ -University of Illinois/NCSA Open Source License - -Copyright (c) [year] [fullname]. All rights reserved. - -Developed by: - [CWX] - [https://github.com/CWXDEV/CWX-MasterKey] - [] - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal with the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - -* Neither the names of [fullname], [project] nor the names of its - contributors may be used to endorse or promote products derived from - this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -THE SOFTWARE. \ No newline at end of file diff --git a/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/user/mods/CWX-MasterKeys 1.1.2/package.js b/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/user/mods/CWX-MasterKeys 1.1.2/package.js deleted file mode 100644 index f07f715..0000000 --- a/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/user/mods/CWX-MasterKeys 1.1.2/package.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -class ModMain { - constructor() { - const mod = require("./package.json"); - this.modName = `${mod.author}-${mod.name}`; - - Logger.info(`Loading: ${this.modName} : ${mod.version}`); - } -} - -module.exports = new ModMain(); \ No newline at end of file diff --git a/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/user/mods/CWX-MasterKeys 1.1.2/package.json b/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/user/mods/CWX-MasterKeys 1.1.2/package.json deleted file mode 100644 index 66208aa..0000000 --- a/Live/CWX-MasterKey/CWX_MasterKey 1.1.2/user/mods/CWX-MasterKeys 1.1.2/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MASTERKEY", - "author": "CWX", - "version": "1.1.2", - "license": "NCSA", - "main": "package.js", - "akiVersion": "2.3.1" -} - diff --git a/Live/CWX-MasterKey/LICENSE.txt b/Live/CWX-MasterKey/LICENSE.txt deleted file mode 100644 index 9c5cb23..0000000 --- a/Live/CWX-MasterKey/LICENSE.txt +++ /dev/null @@ -1,35 +0,0 @@ -University of Illinois/NCSA Open Source License - -Copyright (c) [year] [fullname]. All rights reserved. - -Developed by: - [CWX] - [https://github.com/CWXDEV/CWX-MasterKey] - [] - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal with the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - -* Neither the names of [fullname], [project] nor the names of its - contributors may be used to endorse or promote products derived from - this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -THE SOFTWARE. \ No newline at end of file diff --git a/Live/CWX-MasterKey/README.md b/Live/CWX-MasterKey/README.md deleted file mode 100644 index 14777a2..0000000 --- a/Live/CWX-MasterKey/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# MasterKey -## CWX-MASTERKEY for EFT - SPT-AKI -### CURRENT AKI VERSION: 2.3.0 -### GAMEVERSION: 0.12.12.16909 -### USING BEPINEX diff --git a/Live/CWX-VoiceAdder/LICENSE.txt b/Live/CWX-VoiceAdder/LICENSE.txt deleted file mode 100644 index 91951c9..0000000 --- a/Live/CWX-VoiceAdder/LICENSE.txt +++ /dev/null @@ -1,35 +0,0 @@ -University of Illinois/NCSA Open Source License - -Copyright (c) [year] [fullname]. All rights reserved. - -Developed by: - [CWX] - [https://github.com/CWXDEV/CWX-VoiceAdder] - [] - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal with the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - -* Neither the names of [fullname], [project] nor the names of its - contributors may be used to endorse or promote products derived from - this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -THE SOFTWARE. \ No newline at end of file diff --git a/Live/CWX-VoiceAdder/README.md b/Live/CWX-VoiceAdder/README.md deleted file mode 100644 index 12fc1a9..0000000 --- a/Live/CWX-VoiceAdder/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# VOICEADD -## CWX-VOICEADD for EFT - SPT-AKI -### CURRENT AKI VERSION: 2.3.0 -### GAMEVERSION: 0.12.12.16909 -### USING BEPINEX - - -### two version, test build is a coremod approach, where it can be a standalone mod and people add a Key:value to the json -### VoiceAdd is a standalone version you add to your own mod, compile with you mods folder path \ No newline at end of file diff --git a/Live/CWX-VoiceAdder/VoiceAdd/VoiceAdd.sln b/Live/CWX-VoiceAdder/VoiceAdd/VoiceAdd.sln deleted file mode 100644 index df36a51..0000000 --- a/Live/CWX-VoiceAdder/VoiceAdd/VoiceAdd.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoiceAdder", "VoiceAdder.csproj", "{0D952FD6-5529-4645-A97C-7F2C8CE09B48}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2785F010-1CDA-4009-880B-75F47A8B9553} - EndGlobalSection -EndGlobal diff --git a/Live/CWX-VoiceAdder/VoiceAdd/VoiceAdder.csproj b/Live/CWX-VoiceAdder/VoiceAdd/VoiceAdder.csproj deleted file mode 100644 index 39f4eeb..0000000 --- a/Live/CWX-VoiceAdder/VoiceAdd/VoiceAdder.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - net472 - VoiceAdder - - - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\BepInEx\core\0Harmony.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\Aki.Reflection.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\Assembly-CSharp.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\BepInEx\core\BepInEx.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\AKI 2.3.0 17107 Bepin\EscapeFromTarkov_Data\Managed\Newtonsoft.Json.dll - - - ..\..\Valens-HasThePower\ValensHasThePower\shared\UnityEngine.dll - - - ..\..\Valens-HasThePower\ValensHasThePower\shared\UnityEngine.CoreModule.dll - - - - diff --git a/Live/CWX-VoiceAdder/test build/VoiceAdd.csproj b/Live/CWX-VoiceAdder/test build/VoiceAdd.csproj deleted file mode 100644 index 6f15033..0000000 --- a/Live/CWX-VoiceAdder/test build/VoiceAdd.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - net472 - module - - - - - ..\..\..\..\..\..\..\AKI PROJECT\2.2.3 build - client 16909\EscapeFromTarkov_Data\Managed\0Harmony.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\2.2.3 build - client 16909\EscapeFromTarkov_Data\Managed\Aki.Common.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\2.2.3 build - client 16909\EscapeFromTarkov_Data\Managed\Aki.Reflection.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\2.2.3 build - client 16909\EscapeFromTarkov_Data\Managed\Assembly-CSharp.dll - - - ..\..\..\..\..\..\..\AKI PROJECT\2.2.3 build - client 16909\EscapeFromTarkov_Data\Managed\Newtonsoft.Json.dll - - - - diff --git a/Live/CWX-VoiceAdder/test build/VoiceAdd.sln b/Live/CWX-VoiceAdder/test build/VoiceAdd.sln deleted file mode 100644 index c03ef06..0000000 --- a/Live/CWX-VoiceAdder/test build/VoiceAdd.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoiceAdd", "VoiceAdd.csproj", "{0D952FD6-5529-4645-A97C-7F2C8CE09B48}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2785F010-1CDA-4009-880B-75F47A8B9553} - EndGlobalSection -EndGlobal diff --git a/Live/CWX-VoiceAdder/test build/VoicePatch.cs b/Live/CWX-VoiceAdder/test build/VoicePatch.cs deleted file mode 100644 index 9dc6cc7..0000000 --- a/Live/CWX-VoiceAdder/test build/VoicePatch.cs +++ /dev/null @@ -1,52 +0,0 @@ -using Aki.Common.Utils; -using Aki.Reflection.Patching; -using Aki.Reflection.Utils; -using HarmonyLib; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; - -namespace VoiceAdd -{ - public class VoicePatch : ModulePatch - { - private static Type _targetType; - public static string CurrentDirectory { get; set; } - - public VoicePatch() - { - _targetType = PatchConstants.EftTypes.Single(IsTargetType); - } - - private bool IsTargetType(Type type) - { - return type.GetMethod("TakePhrasePath") != null; - } - - protected override MethodBase GetTargetMethod() - { - return _targetType.GetMethod("TakePhrasePath"); - } - - [PatchPrefix] - private static void PatchPrefix() - { - var currentDirectory = System.IO.Directory.GetCurrentDirectory(); - var modDirectory = currentDirectory + "/user/mods/CWX_VoiceAdder/"; - string json = new StreamReader(modDirectory + "voices.json").ReadToEnd(); - - Dictionary voices = JsonConvert.DeserializeObject>(json); - Dictionary value = Traverse.Create(_targetType).Field>("dictionary_0").Value; - - foreach (var voicename in voices.Keys) - { - voices.TryGetValue(voicename, out var voicebundle); - if (!value.ContainsKey(voicename)) - value.Add(voicename, voicebundle); - } - } - } -} diff --git a/Live/CWX-VoiceAdder/test build/program.cs b/Live/CWX-VoiceAdder/test build/program.cs deleted file mode 100644 index 9c6e7be..0000000 --- a/Live/CWX-VoiceAdder/test build/program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Aki.Common.Utils; - -namespace VoiceAdd -{ - public class Program - { - static void Main(string[] args) - { - Log.Info("Loading: CWX-VoiceAdd"); - new VoicePatch().Enable(); - } - } -} diff --git a/Live/CWX-VoiceAdder/test build/readme.txt b/Live/CWX-VoiceAdder/test build/readme.txt deleted file mode 100644 index 9023327..0000000 --- a/Live/CWX-VoiceAdder/test build/readme.txt +++ /dev/null @@ -1 +0,0 @@ -allows a "coreMod" approach \ No newline at end of file diff --git a/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/BepInEx/plugins/CWX-WeatherPatcher.dll b/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/BepInEx/plugins/CWX-WeatherPatcher.dll deleted file mode 100644 index e269562..0000000 Binary files a/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/BepInEx/plugins/CWX-WeatherPatcher.dll and /dev/null differ diff --git a/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/user/mods/CWX-WeatherPatcher 2.2.3/package.js b/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/user/mods/CWX-WeatherPatcher 2.2.3/package.js deleted file mode 100644 index f07f715..0000000 --- a/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/user/mods/CWX-WeatherPatcher 2.2.3/package.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; - -class ModMain { - constructor() { - const mod = require("./package.json"); - this.modName = `${mod.author}-${mod.name}`; - - Logger.info(`Loading: ${this.modName} : ${mod.version}`); - } -} - -module.exports = new ModMain(); \ No newline at end of file diff --git a/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/user/mods/CWX-WeatherPatcher 2.2.3/package.json b/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/user/mods/CWX-WeatherPatcher 2.2.3/package.json deleted file mode 100644 index 3c8405a..0000000 --- a/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/user/mods/CWX-WeatherPatcher 2.2.3/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "WEATHERPATCHER", - "author": "CWX", - "version": "2.2.3", - "license": "NCSA", - "main": "package.js", - "akiVersion": "2.3.1" -} - diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/EFT.WeatherEditor.sln b/Live/CWX-WeatherPatcher/EFT.WeatherEditor/EFT.WeatherEditor.sln deleted file mode 100644 index e248ac7..0000000 --- a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/EFT.WeatherEditor.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31702.278 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CWX_WeatherPatch", "CWX_WeatherPatch.csproj", "{0E6813D8-8989-4643-9D11-138F21CE4963}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0E6813D8-8989-4643-9D11-138F21CE4963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E6813D8-8989-4643-9D11-138F21CE4963}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E6813D8-8989-4643-9D11-138F21CE4963}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E6813D8-8989-4643-9D11-138F21CE4963}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E84BA04F-3B5F-41C9-AFCA-13430F58937A} - EndGlobalSection -EndGlobal diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/Key.snk b/Live/CWX-WeatherPatcher/EFT.WeatherEditor/Key.snk deleted file mode 100644 index 884fe35..0000000 Binary files a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/Key.snk and /dev/null differ diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Aki.Common.dll b/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Aki.Common.dll deleted file mode 100644 index 5de967d..0000000 Binary files a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Aki.Common.dll and /dev/null differ diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Aki.Reflection.dll b/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Aki.Reflection.dll deleted file mode 100644 index 5b93eeb..0000000 Binary files a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Aki.Reflection.dll and /dev/null differ diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Assembly-CSharp.dll b/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Assembly-CSharp.dll deleted file mode 100644 index 05417db..0000000 Binary files a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Assembly-CSharp.dll and /dev/null differ diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/BepInEx.dll b/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/BepInEx.dll deleted file mode 100644 index 8aedff0..0000000 Binary files a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/BepInEx.dll and /dev/null differ diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Newtonsoft.Json.dll b/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Newtonsoft.Json.dll deleted file mode 100644 index 6aa69df..0000000 Binary files a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/Newtonsoft.Json.dll and /dev/null differ diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/UnityEngine.CoreModule.dll b/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/UnityEngine.CoreModule.dll deleted file mode 100644 index 7d585db..0000000 Binary files a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/UnityEngine.CoreModule.dll and /dev/null differ diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/UnityEngine.dll b/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/UnityEngine.dll deleted file mode 100644 index 6ff1d0f..0000000 Binary files a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/shared/UnityEngine.dll and /dev/null differ diff --git a/Live/CWX-WeatherPatcher/LICENSE.txt b/Live/CWX-WeatherPatcher/LICENSE.txt deleted file mode 100644 index 6979e6f..0000000 --- a/Live/CWX-WeatherPatcher/LICENSE.txt +++ /dev/null @@ -1,35 +0,0 @@ -University of Illinois/NCSA Open Source License - -Copyright (c) [year] [fullname]. All rights reserved. - -Developed by: - [CWX] - [https://github.com/CWXDEV/CWX-WeatherPatcher] - [https://hub.sp-tarkov.com/files/file/319-cwx-weatherpatcher/] - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal with the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - -* Neither the names of [fullname], [project] nor the names of its - contributors may be used to endorse or promote products derived from - this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -THE SOFTWARE. \ No newline at end of file diff --git a/Live/CWX-BushWhacker/BushWhacker/BushWhacker.csproj b/Live/CWX_BushWhacker/CWX_BushWhacker.csproj similarity index 57% rename from Live/CWX-BushWhacker/BushWhacker/BushWhacker.csproj rename to Live/CWX_BushWhacker/CWX_BushWhacker.csproj index cdba06d..7941a3a 100644 --- a/Live/CWX-BushWhacker/BushWhacker/BushWhacker.csproj +++ b/Live/CWX_BushWhacker/CWX_BushWhacker.csproj @@ -7,31 +7,31 @@ - shared\Aki.Common.dll + ..\Shared\AKI\Aki.Common.dll - shared\Aki.Reflection.dll + ..\Shared\AKI\Aki.Reflection.dll - shared\Assembly-CSharp.dll + ..\Shared\EFT\Assembly-CSharp.dll - shared\BepInEx.dll + ..\Shared\BepInEx\BepInEx.dll - shared\Comfort.dll + ..\Shared\EFT\Comfort.dll - shared\Newtonsoft.Json.dll + ..\Shared\EFT\Newtonsoft.Json.dll - shared\UnityEngine.dll + ..\Shared\EFT\UnityEngine.dll - shared\UnityEngine.AssetBundleModule.dll + ..\Shared\EFT\UnityEngine.AssetBundleModule.dll - shared\UnityEngine.CoreModule.dll + ..\Shared\EFT\UnityEngine.CoreModule.dll diff --git a/Live/CWX-BushWhacker/BushWhacker/Patch.cs b/Live/CWX_BushWhacker/Patch.cs similarity index 73% rename from Live/CWX-BushWhacker/BushWhacker/Patch.cs rename to Live/CWX_BushWhacker/Patch.cs index e6d20da..d9e2975 100644 --- a/Live/CWX-BushWhacker/BushWhacker/Patch.cs +++ b/Live/CWX_BushWhacker/Patch.cs @@ -9,9 +9,7 @@ namespace BushWhacker { protected override MethodBase GetTargetMethod() { - var result = typeof(GameWorld).GetMethod("OnGameStarted", BindingFlags.Public | BindingFlags.Instance); - - return result; + return typeof(GameWorld).GetMethod("OnGameStarted", BindingFlags.Public | BindingFlags.Instance); } [PatchPostfix] public static void PatchPostFix() diff --git a/Live/CWX-BushWhacker/BushWhacker/Plugin.cs b/Live/CWX_BushWhacker/Plugin.cs similarity index 100% rename from Live/CWX-BushWhacker/BushWhacker/Plugin.cs rename to Live/CWX_BushWhacker/Plugin.cs diff --git a/Live/CWX-DeSharpener/project/DeSharpener.csproj b/Live/CWX_DeSharpener/CWX_DeSharpener.csproj similarity index 59% rename from Live/CWX-DeSharpener/project/DeSharpener.csproj rename to Live/CWX_DeSharpener/CWX_DeSharpener.csproj index 476b684..900a18c 100644 --- a/Live/CWX-DeSharpener/project/DeSharpener.csproj +++ b/Live/CWX_DeSharpener/CWX_DeSharpener.csproj @@ -8,25 +8,25 @@ - shared\Aki.Common.dll + ..\Shared\AKI\Aki.Common.dll - shared\Aki.Reflection.dll + ..\Shared\AKI\Aki.Reflection.dll - shared\Assembly-CSharp.dll + ..\Shared\EFT\Assembly-CSharp.dll - shared\BepInEx.dll + ..\Shared\BepInEx\BepInEx.dll - shared\ConfigurationManager.dll + ..\Shared\BepInEx\ConfigurationManager.dll - shared\UnityEngine.dll + ..\Shared\EFT\UnityEngine.dll - shared\UnityEngine.CoreModule.dll + ..\Shared\EFT\UnityEngine.CoreModule.dll diff --git a/Live/CWX-DeSharpener/project/DeSharpener.cs b/Live/CWX_DeSharpener/DeSharpener.cs similarity index 99% rename from Live/CWX-DeSharpener/project/DeSharpener.cs rename to Live/CWX_DeSharpener/DeSharpener.cs index 1782eb1..83b2d3c 100644 --- a/Live/CWX-DeSharpener/project/DeSharpener.cs +++ b/Live/CWX_DeSharpener/DeSharpener.cs @@ -8,9 +8,8 @@ namespace DeSharpener { public class DeSharpener : ModulePatch { - private static Type _targetType; - + public DeSharpener() { _targetType = PatchConstants.EftTypes.Single(IsTargetType); diff --git a/Live/CWX_DeSharpener/GlobalSuppressions.cs b/Live/CWX_DeSharpener/GlobalSuppressions.cs new file mode 100644 index 0000000..af5c519 --- /dev/null +++ b/Live/CWX_DeSharpener/GlobalSuppressions.cs @@ -0,0 +1,8 @@ +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:DeSharpener.DeSharpener.PatchPrefix~System.Boolean")] diff --git a/Live/CWX-DeSharpener/project/Program.cs b/Live/CWX_DeSharpener/Program.cs similarity index 100% rename from Live/CWX-DeSharpener/project/Program.cs rename to Live/CWX_DeSharpener/Program.cs diff --git a/Live/CWX_MasterKey/CWX_MasterKey.csproj b/Live/CWX_MasterKey/CWX_MasterKey.csproj new file mode 100644 index 0000000..cbb1b09 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey.csproj @@ -0,0 +1,37 @@ + + + + net472 + CWX_MasterKey + CWX-MasterKey + 1.1.0 + + + + + ..\Shared\AKI\Aki.Common.dll + + + ..\Shared\AKI\Aki.Reflection.dll + + + ..\Shared\EFT\Assembly-CSharp.dll + + + ..\Shared\BepInEx\BepInEx.dll + + + ..\Shared\EFT\Comfort.dll + + + ..\Shared\EFT\Newtonsoft.Json.dll + + + ..\Shared\EFT\UnityEngine.dll + + + ..\Shared\EFT\UnityEngine.CoreModule.dll + + + + diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/GlobalSuppressions.cs b/Live/CWX_MasterKey/GlobalSuppressions.cs similarity index 61% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/GlobalSuppressions.cs rename to Live/CWX_MasterKey/GlobalSuppressions.cs index 2f0d5c4..2d3145b 100644 --- a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/GlobalSuppressions.cs +++ b/Live/CWX_MasterKey/GlobalSuppressions.cs @@ -5,4 +5,4 @@ using System.Diagnostics.CodeAnalysis; -[assembly: SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "", Scope = "member", Target = "~M:EFT.WeatherPatch.Program.Main(System.String[])")] +[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_MasterKey.Patch.PatchPostFix")] diff --git a/Live/CWX-MasterKey/CWX-MasterKey/MasterKey.cs b/Live/CWX_MasterKey/MasterKey.cs similarity index 100% rename from Live/CWX-MasterKey/CWX-MasterKey/MasterKey.cs rename to Live/CWX_MasterKey/MasterKey.cs diff --git a/Live/CWX-MasterKey/CWX-MasterKey/Patch.cs b/Live/CWX_MasterKey/Patch.cs similarity index 66% rename from Live/CWX-MasterKey/CWX-MasterKey/Patch.cs rename to Live/CWX_MasterKey/Patch.cs index 8839c3f..effd229 100644 --- a/Live/CWX-MasterKey/CWX-MasterKey/Patch.cs +++ b/Live/CWX_MasterKey/Patch.cs @@ -1,6 +1,5 @@ using System.Reflection; using Aki.Reflection.Patching; -using Aki.Reflection.Utils; using EFT; namespace CWX_MasterKey @@ -9,9 +8,7 @@ namespace CWX_MasterKey { protected override MethodBase GetTargetMethod() { - var result = typeof(MainApplication).GetMethod("method_41", PatchConstants.PrivateFlags); - - return result; + return typeof(GameWorld).GetMethod("OnGameStarted", BindingFlags.Public | BindingFlags.Instance); } [PatchPostfix] diff --git a/Live/CWX-MasterKey/CWX-MasterKey/program.cs b/Live/CWX_MasterKey/program.cs similarity index 100% rename from Live/CWX-MasterKey/CWX-MasterKey/program.cs rename to Live/CWX_MasterKey/program.cs diff --git a/Live/CWX_Mods.sln b/Live/CWX_Mods.sln new file mode 100644 index 0000000..265998e --- /dev/null +++ b/Live/CWX_Mods.sln @@ -0,0 +1,49 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32407.343 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CWX_WeatherPatch", "CWX_WeatherPatcher\CWX_WeatherPatch.csproj", "{0E6813D8-8989-4643-9D11-138F21CE4963}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CWX_BushWhacker", "CWX_BushWhacker\CWX_BushWhacker.csproj", "{FBA1D35B-1115-4333-8A6F-6F5884BD47D9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CWX_DeSharpener", "CWX_DeSharpener\CWX_DeSharpener.csproj", "{42C0189E-B147-4111-94A1-E10F28F38870}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CWX_MasterKey", "CWX_MasterKey\CWX_MasterKey.csproj", "{40BE277F-55BE-4579-9535-D1F5ED9CC549}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CWX_VoiceAdder", "CWX_VoiceAdder\CWX_VoiceAdder.csproj", "{0D952FD6-5529-4645-A97C-7F2C8CE09B48}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E6813D8-8989-4643-9D11-138F21CE4963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E6813D8-8989-4643-9D11-138F21CE4963}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E6813D8-8989-4643-9D11-138F21CE4963}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E6813D8-8989-4643-9D11-138F21CE4963}.Release|Any CPU.Build.0 = Release|Any CPU + {FBA1D35B-1115-4333-8A6F-6F5884BD47D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FBA1D35B-1115-4333-8A6F-6F5884BD47D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FBA1D35B-1115-4333-8A6F-6F5884BD47D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FBA1D35B-1115-4333-8A6F-6F5884BD47D9}.Release|Any CPU.Build.0 = Release|Any CPU + {42C0189E-B147-4111-94A1-E10F28F38870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42C0189E-B147-4111-94A1-E10F28F38870}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42C0189E-B147-4111-94A1-E10F28F38870}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42C0189E-B147-4111-94A1-E10F28F38870}.Release|Any CPU.Build.0 = Release|Any CPU + {40BE277F-55BE-4579-9535-D1F5ED9CC549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {40BE277F-55BE-4579-9535-D1F5ED9CC549}.Debug|Any CPU.Build.0 = Debug|Any CPU + {40BE277F-55BE-4579-9535-D1F5ED9CC549}.Release|Any CPU.ActiveCfg = Release|Any CPU + {40BE277F-55BE-4579-9535-D1F5ED9CC549}.Release|Any CPU.Build.0 = Release|Any CPU + {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D952FD6-5529-4645-A97C-7F2C8CE09B48}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3EC1C761-E61A-4A88-92CB-9DF792C05BD5} + EndGlobalSection +EndGlobal diff --git a/Live/CWX_VoiceAdder/CWX_VoiceAdder.csproj b/Live/CWX_VoiceAdder/CWX_VoiceAdder.csproj new file mode 100644 index 0000000..78c5d6a --- /dev/null +++ b/Live/CWX_VoiceAdder/CWX_VoiceAdder.csproj @@ -0,0 +1,35 @@ + + + + net472 + VoiceAdder + + + + + ..\Shared\BepInEx\0Harmony.dll + + + ..\Shared\AKI\Aki.Common.dll + + + ..\Shared\AKI\Aki.Reflection.dll + + + ..\Shared\EFT\Assembly-CSharp.dll + + + ..\Shared\BepInEx\BepInEx.dll + + + ..\Shared\EFT\Newtonsoft.Json.dll + + + ..\Shared\EFT\UnityEngine.dll + + + ..\Shared\EFT\UnityEngine.CoreModule.dll + + + + diff --git a/Live/CWX_VoiceAdder/GlobalSuppressions.cs b/Live/CWX_VoiceAdder/GlobalSuppressions.cs new file mode 100644 index 0000000..61bfef1 --- /dev/null +++ b/Live/CWX_VoiceAdder/GlobalSuppressions.cs @@ -0,0 +1,8 @@ +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:VoiceAdd.VoicePatch.PatchPrefix")] diff --git a/Live/CWX-VoiceAdder/VoiceAdd/ReadMe.txt b/Live/CWX_VoiceAdder/ReadMe.txt similarity index 100% rename from Live/CWX-VoiceAdder/VoiceAdd/ReadMe.txt rename to Live/CWX_VoiceAdder/ReadMe.txt diff --git a/Live/CWX-VoiceAdder/VoiceAdd/VoicePatch.cs b/Live/CWX_VoiceAdder/VoicePatch.cs similarity index 100% rename from Live/CWX-VoiceAdder/VoiceAdd/VoicePatch.cs rename to Live/CWX_VoiceAdder/VoicePatch.cs diff --git a/Live/CWX-VoiceAdder/VoiceAdd/program.cs b/Live/CWX_VoiceAdder/program.cs similarity index 100% rename from Live/CWX-VoiceAdder/VoiceAdd/program.cs rename to Live/CWX_VoiceAdder/program.cs diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_JsonConverter.cs b/Live/CWX_WeatherPatcher/CWX_JsonConverter.cs similarity index 89% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_JsonConverter.cs rename to Live/CWX_WeatherPatcher/CWX_JsonConverter.cs index 5f2b841..f42f19c 100644 --- a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_JsonConverter.cs +++ b/Live/CWX_WeatherPatcher/CWX_JsonConverter.cs @@ -1,6 +1,4 @@ - - -namespace CWX_WeatherPatch +namespace CWX_WeatherPatch { public class JSONClass { diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch.csproj b/Live/CWX_WeatherPatcher/CWX_WeatherPatch.csproj similarity index 71% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch.csproj rename to Live/CWX_WeatherPatcher/CWX_WeatherPatch.csproj index e301a4e..f79da1b 100644 --- a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch.csproj +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatch.csproj @@ -2,7 +2,7 @@ net472 - true + False Key.snk false 3.0.0 @@ -11,25 +11,22 @@ - shared\Aki.Common.dll + ..\Shared\AKI\Aki.Common.dll - shared\Aki.Reflection.dll + ..\Shared\AKI\Aki.Reflection.dll - shared\Assembly-CSharp.dll + ..\Shared\EFT\Assembly-CSharp.dll - shared\BepInEx.dll - - - shared\Newtonsoft.Json.dll + ..\Shared\BepInEx\BepInEx.dll - shared\UnityEngine.dll + ..\Shared\EFT\UnityEngine.dll - shared\UnityEngine.CoreModule.dll + ..\Shared\EFT\UnityEngine.CoreModule.dll diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch1.cs b/Live/CWX_WeatherPatcher/CWX_WeatherPatch1.cs similarity index 89% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch1.cs rename to Live/CWX_WeatherPatcher/CWX_WeatherPatch1.cs index 95832aa..a47cbee 100644 --- a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch1.cs +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatch1.cs @@ -1,8 +1,4 @@ -using Aki.Common.Utils; using Aki.Reflection.Patching; -using CWX_WeatherPatch; -using Newtonsoft.Json; -using System.IO; using System.Reflection; namespace CWX_WeatherPatcher @@ -10,7 +6,7 @@ namespace CWX_WeatherPatcher class CWX_WeatherPatch1 : ModulePatch // MAKES CHANGES TO GClass1694 SMETHOD_0 { protected override MethodBase GetTargetMethod() - { + { return typeof(GClass1691).GetMethod("smethod_0", BindingFlags.NonPublic | BindingFlags.Static); } @@ -26,9 +22,7 @@ namespace CWX_WeatherPatcher __result.GlobalFogDensity = 0; __result.GlobalFogHeight = 0; - Logger.LogMessage("MADE CHANGES TO GClass1694 SMETHOD_0!"); - } } } diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch2.cs b/Live/CWX_WeatherPatcher/CWX_WeatherPatch2.cs similarity index 99% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch2.cs rename to Live/CWX_WeatherPatcher/CWX_WeatherPatch2.cs index c3b292d..4b40821 100644 --- a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch2.cs +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatch2.cs @@ -5,7 +5,6 @@ namespace CWX_WeatherPatcher { class CWX_WeatherPatch2 : ModulePatch // MAKES CHANGES TO CUSTOMGLOBALFOG { - protected override MethodBase GetTargetMethod() { return typeof(CustomGlobalFog).GetMethod("Start", BindingFlags.NonPublic | BindingFlags.Instance); diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch3.cs b/Live/CWX_WeatherPatcher/CWX_WeatherPatch3.cs similarity index 100% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch3.cs rename to Live/CWX_WeatherPatcher/CWX_WeatherPatch3.cs diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch4.cs b/Live/CWX_WeatherPatcher/CWX_WeatherPatch4.cs similarity index 100% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch4.cs rename to Live/CWX_WeatherPatcher/CWX_WeatherPatch4.cs diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch5.cs b/Live/CWX_WeatherPatcher/CWX_WeatherPatch5.cs similarity index 70% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch5.cs rename to Live/CWX_WeatherPatcher/CWX_WeatherPatch5.cs index f8bf5a1..d9ac299 100644 --- a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/CWX_WeatherPatch5.cs +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatch5.cs @@ -1,6 +1,5 @@ using System.Reflection; using Aki.Reflection.Patching; -using Aki.Reflection.Utils; using CWX_WeatherPatcher; using EFT; @@ -10,9 +9,7 @@ namespace CWX_WeatherPatch { protected override MethodBase GetTargetMethod() { - var result = typeof(MainApplication).GetMethod("method_41", PatchConstants.PrivateFlags); - - return result; + return typeof(GameWorld).GetMethod("OnGameStarted", BindingFlags.Public | BindingFlags.Instance); } [PatchPostfix] diff --git a/Live/CWX_WeatherPatcher/GlobalSuppressions.cs b/Live/CWX_WeatherPatcher/GlobalSuppressions.cs new file mode 100644 index 0000000..f802835 --- /dev/null +++ b/Live/CWX_WeatherPatcher/GlobalSuppressions.cs @@ -0,0 +1,13 @@ +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.CWX_WeatherPatch2.PostFixPatch(CustomGlobalFog@)")] +[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.CWX_WeatherPatch3.PostFixPatch(LevelSettings@)")] +[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.CWX_WeatherPatch4.PostFixPatch(TOD_Scattering@)")] +[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatch.CWX_WeatherPatch5.PatchPostFix")] +[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.Plugin.Awake")] +[assembly: SuppressMessage("Roslynator", "RCS1213:Remove unused member declaration.", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.Plugin.Awake")] diff --git a/Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/user/mods/CWX-WeatherPatcher 2.2.3/LICENSE.txt b/Live/CWX_WeatherPatcher/LICENSE.txt similarity index 100% rename from Live/CWX-WeatherPatcher/CWX_WeatherPatcher 2.2.3/user/mods/CWX-WeatherPatcher 2.2.3/LICENSE.txt rename to Live/CWX_WeatherPatcher/LICENSE.txt diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/Program.cs b/Live/CWX_WeatherPatcher/Program.cs similarity index 96% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/Program.cs rename to Live/CWX_WeatherPatcher/Program.cs index 3b95052..053f104 100644 --- a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/Program.cs +++ b/Live/CWX_WeatherPatcher/Program.cs @@ -32,6 +32,7 @@ namespace CWX_WeatherPatcher debug.Fog = 0f; debug.Rain = 0f; debug.LightningThunderProbability = 0f; + debug.WindMagnitude = 0f; } } } diff --git a/Live/CWX-WeatherPatcher/README.md b/Live/CWX_WeatherPatcher/README.md similarity index 100% rename from Live/CWX-WeatherPatcher/README.md rename to Live/CWX_WeatherPatcher/README.md diff --git a/Live/CWX-WeatherPatcher/EFT.WeatherEditor/config.json b/Live/CWX_WeatherPatcher/config.json similarity index 100% rename from Live/CWX-WeatherPatcher/EFT.WeatherEditor/config.json rename to Live/CWX_WeatherPatcher/config.json diff --git a/Live/README.md b/Live/README.md new file mode 100644 index 0000000..a17e92c --- /dev/null +++ b/Live/README.md @@ -0,0 +1,12 @@ +### Live +- CWX-BushWhacker +- CWX-DeSharpener +- CWX-MasterKey +- CWX-VoiceAdder +- CWX-WeatherPatcher + +##For the Projects Dependencies to work: +- please place all Dll's from `EFT/EscapeFromTarkov_Data/Managed` into `Shared/EFT` +- place `ConfigurationManager.dll` from `BepInEx/Plugins` folder into `Shared/BepInEx` +- place `0Harmony.dll` and `BepInEx.dll` from `BepInEx/Core` folder into `Shared/BepInEx` +- place `Aki.Common.dll` and `Aki.Reflection.dll` from `EFT/EscapeFromTarkov_Data/Managed` into `Shared/AKI`