Skip to content

Commit

Permalink
So much stuff... 2.5.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@krypto5863
krypto5863 committed Apr 7, 2022
1 parent 81195ae commit 026404d
Show file tree
Hide file tree
Showing 9 changed files with 311 additions and 77 deletions.
53 changes: 34 additions & 19 deletions #CMI.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "COM Modular Installer"
#define MyAppVersion "2.5.7"
#define MyAppVersion "2.5.11"
#define MyAppURL "https://github.com/krypto5863/COM-Modular-Installer"
#define MinimumVersion 20900
#define CRStartVersion 30900
#define CRStartVersion 31300

#define CRMinimumVersion 30100

Expand Down Expand Up @@ -127,7 +127,11 @@ Name:"none"; Description:{cm:TypeNone};
Name: Loader; Description: {cm:ModLoader}; Types: full compact;
Name: Loader/bepinEX; Description: {cm:BepinEx}; Types: full notr compact eng pic self hen; Flags:Exclusive checkablealone

Name: Loader/bepinEX/addyot; Description: AddYotogiSliderSE2; Types: Full compact eng notr hen self;

Name: Loader/bepinEX/AdvMatMod; Description: AdvancedMaterialModifier; Types: self; Flags: dontinheritcheck;

Name: Loader/bepinEX/autosave; Description: AutoSave; Types: Full eng notr hen self;

Name: Loader/bepinEX/cameracon; Description:CameraControlEx; Types:full pic eng notr self;

Expand All @@ -150,6 +154,8 @@ Name: Loader; Description: {cm:ModLoader}; Types: full compact;
Name: Loader/bepinEX/FPSCount; Description: FPSCounter; Types: self; Flags: dontinheritcheck;

Name: Loader/bepinEX/FPSUn; Description: FPSUnlock; Types: self; Flags: dontinheritcheck;

Name: Loader/bepinEX/GearFix; Description: GearMenuFix; Types:full notr compact eng pic self hen; Flags: dontinheritcheck;

Name: Loader/bepinEX/InBlock; Description: InputHotkeyBlock; Types: full notr compact eng pic self hen; Flags: dontinheritcheck;

Expand All @@ -165,9 +171,17 @@ Name: Loader; Description: {cm:ModLoader}; Types: full compact;
Name: Loader/bepinEX/scriptloader; Description: ScriptLoader; Types: Full notr compact eng pic self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/oldsubs; Description: Add Subs to Old Yotogi Script; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/allprivate; Description: All Maids In Private Mode Script; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/charactersortredux; Description: Character Edit Sort Redux Script; Types: Full notr eng self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/dumpinfo; Description: DumpGameInfo Script; Types: Full notr compact eng pic self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/blinkstop; Description: EditBlinkStop Script; Types: Full notr eng pic self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/editname; Description: EditableNames Script; Types: Full notr compact eng pic self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/enascout; Description: Enable Scout Mode Script; Types: Full notr eng pic self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/enascout; Description: Enable Scout Mode Script; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/fastfade; Description: FastFade Script; Types: Full notr eng pic self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/forceschedule; Description: ForceScheduleEvents Script; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/unlockmemories; Description: MemoriesModeUnlock Script; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/nameext; Description: NameExtender Script; Types: Full compact eng notr pic self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/savesettings; Description: SaveSettingsInGame Script; Types: Full compact eng notr pic self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/skiplogo; Description: SkipStartLogo Script; Types: Full notr compact eng pic self hen; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/thumbs; Description: Load Small Thumbs Script; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/quickedit; Description: Quick Edit Scene Script; Flags: dontinheritcheck;
Name: Loader/bepinEX/scriptloader/redupe; Description: Report Dupes Script; Types: Full compact eng notr pic self hen; Flags: dontinheritcheck;
Expand All @@ -186,23 +200,25 @@ Name: Loader; Description: {cm:ModLoader}; Types: full compact;

Name: Loader/bepinEX/OptIMGUI; Description: OptimizeIMGUI; Types: Full notr compact eng pic self hen; Flags: dontinheritcheck;

Name: Loader/Sybaris; Description:{cm:Sybaris} ;Flags: Exclusive checkablealone
Name: Loader/bepinEX/UndressUtil; Description: UndressUtil; Types: Full notr compact eng pic self hen; Flags: dontinheritcheck;

;Name: Loader/Sybaris; Description:{cm:Sybaris} ;Flags: Exclusive checkablealone

Name: Loader/Sybaris/Translations; Description:{cm:TranslationPlugs} (Syb); Flags: dontinheritcheck
;Name: Loader/Sybaris/Translations; Description:{cm:TranslationPlugs} (Syb); Flags: dontinheritcheck
//Name: Loader/Sybaris/Translations/i18nEx; Description: i18nEx (Syb);
//Name:Loader/Sybaris/Translations/i18nEx/extrans; Description:{cm:ExtraTrans} (Syb); Flags: dontinheritcheck;
Name: Loader/Sybaris/Translations/xuat; Description: XUnity AutoTranslator (Syb);
Name: Loader/Sybaris/cacheedit; Description: CacheEditMenu;
Name: Loader/Sybaris/CCfix; Description: CreatorSaveFix;
Name: Loader/Sybaris/quickedit; Description: QuickEditStart;
;Name: Loader/Sybaris/Translations/xuat; Description: XUnity AutoTranslator (Syb);
;Name: Loader/Sybaris/cacheedit; Description: CacheEditMenu;
;Name: Loader/Sybaris/CCfix; Description: CreatorSaveFix;
;Name: Loader/Sybaris/quickedit; Description: QuickEditStart;


Name: Patchers; Description: Patchers; types: full compact eng pic self hen;

Name: Patchers/addscreen; Description: AddScreenSize; Types: full eng notr self ;
;Name: Patchers/addscreen; Description: AddScreenSize; Types: full eng notr self ;
Name: Patchers/autocon; Description: AutoConverter; Types: full compact eng notr pic self hen;
Name: Patchers/bodycat; Description: BodyCategoryAdd; Types: full compact eng notr pic self hen;
Name: Patchers/blinkstop; Description: EditBlinkStop; Types: full eng notr pic self hen;
//Name: Patchers/blinkstop; Description: EditBlinkStop; Types: full eng notr pic self hen;
Name: Patchers/extsave; Description: ExternalSaveData; Types: Full self pic eng notr hen; Flags: checkablealone;
Name: Patchers/extsave/vibemaid; Description:VibeYourMaid;
Name: Patchers/extsave/maidvoice; Description: MaidVoicePitch; Types: full self pic eng notr hen; Flags: checkablealone;
Expand All @@ -211,22 +227,21 @@ Name: Patchers; Description: Patchers; types: full compact eng pic self hen;
Name: Patchers/extsave/maidvoice/addmod/eyelashesalpha; Description:EyelashesAlpha; Types:; Flags: checkablealone;
Name: Patchers/extsave/maidvoice/addmod/seperateeye; Description:SeperateEyeParams; Types:full self pic eng notr hen; Flags: checkablealone;
Name: Patchers/facetype; Description: FaceType; Types:full compact self pic eng notr hen;
Name: Patchers/fastfade; Description: FastFade; Types: self pic;
//Name: Patchers/fastfade; Description: FastFade; Types: self pic;
Name: Patchers/imgui; Description: IMGUITranslationLoader; types: full compact eng pic hen; Flags: checkablealone;
Name:Patchers/imgui/translations; Description: {cm:IMGUITrans}; Types:full compact eng pic self hen;
Name: Patchers/modloader; Description: ModLoader; types: full compact eng notr pic self hen;
Name: Patchers/namext; Description: NameExtender; Types: full compact self pic eng notr hen;
//Name: Patchers/namext; Description: NameExtender; Types: full compact self pic eng notr hen;
Name: Patchers/neighuncen; Description: NeighUncensor; Types: full compact eng notr pic self hen;
Name: Patchers/ntrlight; Description: NTRLight; Types:;
Name: Patchers/rgbpal; Description: RGBPalette;
Name: Patchers/saveset; Description: SaveSettingsInGame; Types: full compact self pic eng notr hen;
//Name: Patchers/saveset; Description: SaveSettingsInGame; Types: full compact self pic eng notr hen;

Name: plugins; Description: Unityinjector Plugins; Types: full compact;
Name: plugins/addyot; Description: AddYotogiSliderSE; Types: Full compact eng notr hen self;
Name: plugins/accex; Description: AlwaysColorChangeEX; Types: full self pic eng notr hen;
Name: plugins/eraseout; Description: AutoEraseOutline; types: full pic eng notr hen;
Name: plugins/camerautil; Description: CameraUtility; Types: Full pic self eng notr hen;
Name: plugins/hudclock; Description:ClockHud;
;Name: plugins/hudclock; Description:ClockHud;
Name: plugins/colorhelp; Description: ColorPaletteHelper; Types:full self pic eng notr hen;
Name: plugins/conwindow; Description:ConsistentWindowPosition; Types:full self pic eng notr hen;
Name: plugins/nyou; Description:CustomNyou(Why...);
Expand All @@ -240,8 +255,8 @@ Name: plugins; Description: Unityinjector Plugins; Types: full compact;
Name: plugins/emoears/mod; Description:{cm:EmoEarsMod}; Types:self; Flags:dontinheritcheck
Name: plugins/extendrender; Description:ExtendRenderingRange; Types:full eng notr self pic;
Name: plugins/extendrender/config; Description:x10 Extend Config; Types:self; Flags:dontinheritcheck
Name: plugins/facecon; Description:FaceControl; Types:pic;
Name: plugins/freedress; Description:FreeModeDressKeeper; Types:full self eng notr hen;
;Name: plugins/facecon; Description:FaceControl; Types:pic;
;Name: plugins/freedress; Description:FreeModeDressKeeper; Types:full self eng notr hen;
Name: plugins/inout; Description:InOutAnimation; Types:full eng notr self hen;
Name: plugins/mirror; Description:Mirror Props; Types:full eng notr;
Name: plugins/mtacc; Description: MtAccelerator;
Expand All @@ -256,7 +271,7 @@ Name: plugins; Description: Unityinjector Plugins; Types: full compact;
Name: plugins/personaledit; Description:PersonalizedEditSceneSettings; Types:full pic self eng notr hen;
Name: plugins/plugmanage; Description:PluginManager; Types:full pic eng notr;
Name: plugins/PluginExt; Description:{cm:PluginExt}; Types:full compact pic self eng notr compact;
Name: plugins/PluginExt/freeapp; Description:FreeModeApp; Types:full self eng notr hen; Flags:dontinheritcheck
//Name: plugins/PluginExt/freeapp; Description:FreeModeApp; Types:full self eng notr hen; Flags:dontinheritcheck
Name: plugins/PluginExt/halfundress; Description:HalfUnDressing; Types:full eng notr hen; Flags:dontinheritcheck;
Name: plugins/PluginExt/lookmaid; Description:LookAtYourMaid; Flags:dontinheritcheck
Name: plugins/PluginExt/lookmaster; Description:LookAtYourMaster; Flags:dontinheritcheck
Expand Down
42 changes: 29 additions & 13 deletions AssetDownloadHandler.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,22 @@ var
suf : WideString;
dlink: WideString;
links: TListOfAssets;
I: integer;
I: integer;
downloadDone: boolean;
begin
DownloadPage.Clear();
//These have more conditions and require version specific links and care.
AddToListOfAssets(links , 'Loader/bepinEX/MuteBack', 'BepInEx/BepInEx.Utility', '' ,'MuteInBackground.zip', true, 'MuteInBackground', '');
AddToListOfAssets(links , 'Loader/bepinEX/RunUniEdit', 'ManlyMarco/RuntimeUnityEditor', '' ,'RuntimeUnityEditor.zip', true, 'RuntimeUnityEditor', '');
AddToListOfAssets(links , 'Loader/bepinEX/OptIMGUI', 'BepInEx/BepInEx.Utility', '' ,' BepInEx.OptimizeIMGUI.v1.0.zip', true, 'OptimizeIMGUI', '');
AddToListOfAssets(links , 'Loader/bepinEX/OptIMGUI', 'BepInEx/BepInEx.Utility', '' ,'BepInEx.OptimizeIMGUI.v1.0.zip', true, 'OptimizeIMGUI', '');
#if LMMT == false
AddToListOfAssets(links , 'Loader/bepinEX/COM3D2API', 'DeathWeasel1337/COM3D2_Plugins', '' ,'COM3D2.API.v1.0.zip', true, 'COM3D2.API', '');
AddToListOfAssets(links , 'Loader/bepinEX/CM3D2Toolkit', 'JustAGuest4168/CM3D2.Toolkit', 'BepInEx\plugins\' ,'CM3D2.Toolkit.Guest4168Branch.dll', true, 'CM3D2.Toolkit', '');
AddToListOfAssets(links , 'Loader/bepinEX/InBlock', 'DeathWeasel1337/COM3D2_Plugins', '' ,'InputHotkeyBlock.zip', true, 'InputHotkeyBlock', '');
AddToListOfAssets(links , 'Loader/bepinEX/FixEyeMov', '01010101lzy/gettapped/releases', '' ,'FixEyeMov.zip', true, 'FixEyeMov', '');
//These can be fetched straight from the latest releases.
AddToListOfAssets(links , 'Loader/bepinEX/addyot', 'Vin-meido/COM3D2.AddYotogiSliderSE.Plugin', '' ,'COM3D2.AddYotogiSliderSE2.Plugin.zip', false, 'COM3D2.AddYotogiSliderSE2.Plugin.zip', '');
AddToListOfAssets(links , 'Loader/bepinEX/autosave', 'Pain-Brioche/COM3D2.AutoSave', 'BepInEx\plugins\' ,'COM3D2.AutoSave.dll', false, '', '');
AddToListOfAssets(links , 'Loader/bepinEX/ConfigMan', 'BepInEx/BepInEx.ConfigurationManager', '' ,'ConfigManager.zip', false, '', '');
AddToListOfAssets(links , 'Loader/bepinEX/FPSCount', 'ManlyMarco/FPSCounter', '' ,'FPSCounter.zip', false, '', '');
AddToListOfAssets(links , 'Loader/bepinEX/ShiftClick', 'krypto5863/COM3D2.ShiftClickExplorer', 'BepInEx\plugins\' ,'COM3D2.ShiftClickExplorer.dll', false, '', '');
Expand All @@ -70,8 +73,10 @@ begin
AddToListOfAssets(links , 'Loader/bepinEX/CM3D2Toolkit/ShortVanilla', 'krypto5863/COM3D2.ShortMenuVanillaDatabase', '' ,'ShortMenuVanillaDatabase.zip', false, '', '');
AddToListOfAssets(links , 'Loader/bepinEX/ExErrorHandle', 'krypto5863/COM3D2.ExtendedErrorHandling', 'BepInEx\plugins\' ,'COM3D2.ExtendedErrorHandling.dll', false, '', '');
AddToListOfAssets(links , 'Loader/bepinEX/ExPresetMan', 'krypto5863/COM3D2.ExtendedPresetManagement', 'BepInEx\plugins\' ,'COM3D2.ExtendedPresetManagement.dll', false, '', '');
AddToListOfAssets(links , 'Loader/bepinEX/UndressUtil', 'Vin-meido/COM3D2.UndressUtil', '' ,'COM3D2.UndressUtil.zip', false, 'COM3D2.UndressUtil.zip', '');
AddToListOfAssets(links , 'ext/dlccheck', 'krypto5863/COM3D2_DLC_Checker', '' ,'COM3D2 DLC Checker.exe', false, '', '');
AddToListOfAssets(links , 'ext/maidfiddle', 'denikson/COM3D2.MaidFiddler', '' ,'MFInstall.exe', false, '', '');
if IsCR then
begin
Expand All @@ -93,24 +98,35 @@ begin
end
else
begin
FetchLRelease(links[i].Link, links[i].SearchString , dlink);
FetchDRelease(links[i].Link, links[i].SearchString, '' , dlink);
end;
DownloadPage.Add(dlink, links[i].Output + links[i].File, '');
end;
end;
DownloadPage.Show;
try
try
DownloadPage.Download;
except
MsgBox(CustomMessage('AssetDownloadFailed'), mbInformation, MB_OK);
//SuppressibleMsgBox(AddPeriod(GetExceptionMessage), mbCriticalError, MB_OK, IDOK);
end;
finally
DownloadPage.Hide;
end;
while downloadDone = false do
begin
try
try
DownloadPage.Download;
DownloadDone := true
except
if SuppressibleMsgBox(CustomMessage('AssetDownloadFailed'), mbError, MB_YESNO, IDNO) = IDNO then
begin
DownloadDone := true
end
else
begin
DownloadDone := false
end
end;
finally
DownloadPage.Hide;
end
end;
for i := 0 to GetArrayLength(links) - 1 do
begin
Expand Down
22 changes: 18 additions & 4 deletions CMI/CMIExclusive.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Function FixComponents(): Boolean;
var
NonCR: Array of string;
NonEng: Array of string;
CRComps: Array of string;
I: Integer;
begin
//If english version is detected, run the below code.
Expand Down Expand Up @@ -76,15 +77,17 @@ begin
CustomMessage('EmoEarsAhoge'),
'EmotionalEars(and tails)',
'EditSceneUndo',
'SaveSettingsInGame',
'VibeYourMaid',
'BodyCategoryAdd',
'Wrap Mode Extend Script',
'Error Texture Placeholder Script',
'MeidoPhotoStudio',
'1900 Poses for MPS',
'ExtendedErrorHandling',
'ShapekeyMaster'
//'ExtendedErrorHandling',
//'ShapekeyMaster',
//'ShortMenuLoader',
'AlwaysColorChangeEX',
'AdvancedMaterialModifier'
];
for I := 0 to GetArrayLength(NonCR)-1 do
Expand All @@ -94,7 +97,18 @@ begin
if (Wizardform.ComponentsList.Checked[GetComponentIndex('ShapeAnimator')]) then
Wizardform.ComponentsList.CheckItem(GetComponentIndex('Standard SA'), coCheck);
end
end
else//Not CR
begin
CRComps := [
'GearMenuFix'
];
for I := 0 to GetArrayLength(CRComps)-1 do
begin
RemoveComponent(CRComps[I]);
end;
end
end;
Function HandleSer(const GamePath: String): Boolean;
Expand Down
4 changes: 2 additions & 2 deletions CMI/Messages/English.isl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ TypeEng=Non-Japanese Localizations AIO-Like
TypeNoTr=No Translations AIO-Like
TypePic=I just take pictures
TypeHen=I just play, I don't take pictures
TypeSelf=My Selections
TypeSelf=Doc's Selections
TypeCustom=Okay, make your own choices
TypePreset=Custom Preset
TypeNone=I want nothing!
Expand Down Expand Up @@ -112,7 +112,7 @@ MoveOldExcep=An exception was tossed while trying to move the old installation t
MoveOldModExcep=An exception was tossed while trying to move the old mods to the old folder! Ensure that no game application is open and that none of the files or folders are open anywhere!! We are quitting to keep your data safe! Refer to the readme for troubleshooting steps!!!
CannotRenameOld=The OldInstall folder could not be renamed but the installation is already complete. As a result, we will not abort as the error is harmless. It should be automatically renamed the next time CMI is run.
AssetDownloadFailed=We failed to download files for some of the components selected. Please ensure that you are connected to the internet and have a functioning connection before trying again. Otherwise, you can continue the installation, the missing assets simply will not be installed.
AssetDownloadFailed=We failed to download files for some of the components selected. Please ensure that you are connected to the internet and have a functioning connection before trying again. Select YES to re-attempt the download. Otherwise press no and you can continue the installation, the missing assets simply will not be installed.
SerializePrompt=We noticed you have a file that causes save data to be placed in the user Documents directory (serialize_storage_config.cfg). Normally this is removed, but it does not hurt to leave it. Shall we remove this file and place your savedata back in the game folder?'
SerializeDeleteFail=Failed to delete the file at %1\serialize_storage_config.cfg for an unknown reason!
Expand Down
Loading

0 comments on commit 026404d

Please sign in to comment.