Skip to content

Commit 49ead43

Browse files
krypto5863krypto5863
committed
Big ole update
1 parent 3ca11ca commit 49ead43

File tree

7 files changed

+103
-116
lines changed

7 files changed

+103
-116
lines changed

‎.gitignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
Compiled_EXE/
33
Installer Files/Documentation/
44
Installer Files/UI/
5-
Installer Files/CR Components/Loader/
6-
Installer Files/CR Components/Patchers/
7-
Installer Files/CR Components/Plugins/
5+
Installer Files/CR Components/Bepinex/
6+
Installer Files/CR Components/UnityInjector/
87
Installer Files/Components/
98
Old

‎CMI.iss

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "COM Modular Installer"
5-
#define MyAppVersion "2.6.3"
5+
#define MyAppVersion "2.6.4"
66
#define MyAppURL "https://krypto5863.github.io/COM-Modular-Installer/"
77
#define MyAppUpdates "https://github.com/krypto5863/COM-Modular-Installer/releases"
88
#define MyAppSupport "https://github.com/krypto5863/COM-Modular-Installer/issues"
99

1010
#define MinimumVersion 23400
11-
#define CRMinimumVersion 33400
11+
#define CRMinimumVersion 34100
1212
#define CRStartVersion 30000
1313

1414
#define JapRegistry "Software\KISS\カスタムオーダーメイド3D2"
@@ -110,15 +110,12 @@ Name:"core"; Description:{cm:TypeCore}
110110

111111
[Components]
112112

113-
Name: ModExt; Description: Modding Extensions;
114-
Name: ModExt/MaidLoader; Description: MaidLoader; Flags: exclusive; Types: full compact eng notr pic hen self;
115-
;Name: ModExt/modloader; Description: ModLoader; Flags: exclusive;
116-
117113
Name: bepinexPlugs; Description: BepInEx Plugins;
118114
Name: bepinexPlugs/addyot; Description: AddYotogiSliderSE2; Types: Full compact eng notr hen self;
119115
Name: bepinexPlugs/AdvMatMod; Description: AdvancedMaterialModifier; Types: self;
120116
Name: bepinexPlugs/autosave; Description: AutoSave; Types: Full eng notr hen self;
121-
Name: bepinexPlugs/cameracon; Description:CameraControlEx; Types:full pic eng notr self;
117+
Name: bepinexPlugs/bodycat; Description: BodyCategoryAdd 2.5; Types: full compact eng notr pic self hen;
118+
;Name: bepinexPlugs/cameracon; Description:CameraControlEx; Types:full pic eng notr self;
122119
Name: bepinexPlugs/cheatMenu; Description:CheatMenu;
123120
Name: bepinexPlugs/choosypreset; Description:ChoosyPreset; Types:full pic eng notr self;
124121
Name: bepinexPlugs/colorpresetnum; Description:ColorPresetNum;
@@ -132,6 +129,7 @@ Name: bepinexPlugs; Description: BepInEx Plugins;
132129
Name: bepinexPlugs/FPSUn; Description: FPSUnlock; Types: self;
133130
Name: bepinexPlugs/GearFix; Description: GearMenuFix; Types:full notr compact eng pic self hen;
134131
Name: bepinexPlugs/InBlock; Description: InputHotkeyBlock; Types: full notr compact eng pic self hen;
132+
Name: bepinexPlugs/MaidLoader; Description: MaidLoader; Types: full compact eng notr pic hen self;
135133
Name: bepinexPlugs/meidophoto; Description: MeidoPhotoStudio; Types: full notr eng pic self;
136134
Name: bepinexPlugs/meidophoto/Poses; Description: 1900 Poses for MPS; Flags: dontinheritcheck;
137135
Name: bepinexPlugs/modref; Description: ModRefresh;
@@ -149,7 +147,9 @@ Name: bepinexPlugs; Description: BepInEx Plugins;
149147
Name: bepinexPlugs/Translations/resredir; Description: Resource Redirector;
150148
Name: bepinexPlugs/Translations/resredir/xuat; Description: XUnity AutoTranslator; Types: full compact pic self hen;
151149

152-
Name: bepinexPlugs/TimeDependentPhysics; Description: TimeDependentPhysics; Types: Full notr compact eng pic self hen;
150+
151+
Name: bepinexPlugs/SliderDelimiter; Description: SliderDelimiter; Types: full notr compact eng pic self hen;
152+
Name: bepinexPlugs/TimeDependentPhysics; Description: TimeDependentPhysics; Types: Full notr compact eng pic self hen;
153153
Name: bepinexPlugs/UndressUtil; Description: UndressUtil; Types: Full notr compact eng pic self hen;
154154

155155
Name: Scripts; Description: ScriptLoader Scripts;
@@ -168,6 +168,7 @@ Name: Scripts; Description: ScriptLoader Scripts;
168168
Name: Scripts/unlockmemories; Description: MemoriesModeUnlock Script;
169169
Name: Scripts/morenames; Description: MoreRandomNames Script; Types: Full eng hen;
170170
Name: Scripts/nameext; Description: NameExtender Script; Types: Full compact eng notr pic self hen;
171+
Name: Scripts/ntrlight; Description: NTRLight Script;
171172
Name: Scripts/nomoansubs; Description: NoMoanSubs Script; Types: Full eng notr self hen;
172173
Name: Scripts/savesettings; Description: SaveSettingsInGame Script; Types: Full compact eng notr pic self hen;
173174
Name: Scripts/skiplogo; Description: SkipStartLogo Script; Types: Full notr compact eng pic self hen;
@@ -187,11 +188,9 @@ Name: Patchers; Description: Sybaris Plugins;
187188
Name: Patchers/extsave/maidvoice; Description: MaidVoicePitch; Types: full self pic eng notr hen; Flags: checkablealone;
188189
Name: Patchers/extsave/maidvoice/addmod; Description: AddModsSlider; Types: full self pic eng notr hen; Flags: checkablealone;
189190
Name: Patchers/extsave/maidvoice/addmod/distort; Description: DistortCorrect; Types:full self pic eng notr hen; Flags: checkablealone;
190-
Name: Patchers/facetype; Description: FaceType; Types:full compact self pic eng notr hen;
191191
Name: Patchers/imgui; Description: IMGUITranslationLoader; types: full compact eng pic hen; Flags: checkablealone;
192192
Name: Patchers/imgui/translations; Description: {cm:IMGUITrans}; Types:full compact eng pic self hen;
193193
Name: Patchers/neighuncen; Description: NeighUncensor; Types: full compact eng notr pic self hen;
194-
Name: Patchers/ntrlight; Description: NTRLight; Types:;
195194
Name: Patchers/rgbpal; Description: RGBPalette;
196195

197196
Name: plugins; Description: Unityinjector Plugins;
@@ -211,7 +210,7 @@ Name: plugins; Description: Unityinjector Plugins;
211210
Name: plugins/limitBreak; Description:LimitBreak2; Flags:dontinheritcheck
212211
Name: plugins/lookmaid; Description:LookAtYourMaid; Flags:dontinheritcheck
213212
Name: plugins/lookmaster; Description:LookAtYourMaster; Flags:dontinheritcheck
214-
Name: plugins/manualmaidsort; Description:Manual Maid Sort;
213+
Name: plugins/manualmaidsort; Description:ManualMaidSort;
215214
Name: plugins/mirror; Description:Mirror Props; Types:full eng notr;
216215
Name: plugins/mtacc; Description: MtAccelerator;
217216
Name: plugins/mtacc/AllScene; Description: AllScene Version;
@@ -346,10 +345,11 @@ Type:filesandordirs; Name: "{app}\OldInstall*";
346345

347346
[Run]
348347
;Filename: "https://forms.gle/PrXjqck2dQYMHvyY8"; Flags: shellexec runasoriginaluser postinstall; Description: {cm:Survey}
349-
FileName: "https://discord.gg/custommaid"; Flags: shellexec runasoriginaluser postinstall; Description: Join Custom Maid Discord!
348+
FileName: "https://discord.gg/custommaid"; Flags: shellexec runasoriginaluser postinstall unchecked; Description: Join Custom Maid Discord!
350349
//Honeycome is worse than koi but the joke must go on...
351350
FileName: "https://www.illgames.jp/product/honeycome/"; Flags: shellexec runasoriginaluser postinstall; Description: Get a better game!; Check: GetRandAbove(100, 9)
352351
Filename: "https://krypto5863.github.io/COM-Modular-Installer/"; Flags: shellexec runasoriginaluser postinstall unchecked; Description: {cm:OfficialPage}
352+
Filename: "https://patreon.com/krypto5863"; Flags: shellexec runasoriginaluser postinstall unchecked; Description: {cm:Patreon}
353353

354354
[Registry]
355355
Root: HKCU; Subkey: "{#JapRegistry}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"; Check: NOT IsEmptyFolder() AND NOT GetIsCR() AND NOT GetIsEngSimple(ExpandConstant('{app}')); Tasks:reg

‎COM3D2Helpers.iss

+31-64
Original file line numberDiff line numberDiff line change
@@ -77,69 +77,35 @@ begin
7777
7878
if IsCR then begin
7979
NonCR := [
80-
'1900 Poses for MPS',
81-
'AddModsSlider',
82-
'AddYotogiSliderSE2',
83-
'AdvancedMaterialModifier',
84-
'AllScene Version',
85-
'AlwaysColorChangeEX',
86-
'AutoConverter',
87-
'AutoEraseOutline',
88-
'BodyCategoryAdd',
89-
'ChoosyPreset',
90-
'ColorPaletteHelper',
91-
'ColorPresetNum',
92-
'DistortCorrect',
93-
'DressDamage',
94-
'EditBlinkStop Script',
95-
'EditBodyLoadFix',
96-
'EditMenuFilter',
97-
'EditMenuSelectedAnime',
98-
'EditModeHighlights',
99-
'EditSceneUndo',
100-
'ExtendedPresetManagement',
101-
'ExternalSaveData',
102-
'FaceType',
103-
'HalfUnDressing',
104-
'InOutAnimation',
105-
'LimitBreak2',
106-
'LoMobChara',
107-
'LoadEditedNPCs Script',
108-
'LookAtYourMaid',
109-
'LookAtYourMaster',
110-
'MaidLoader',
111-
'MaidVoicePitch',
112-
'MeidoPhotoStudio',
113-
'Mirror Props',
114-
'ModLoader',
115-
'ModRefresh',
116-
'Modding Extensions',
117-
'ModExt',
118-
'MoreRandomNames Script',
119-
'MtAccelerator',
120-
'PersonalizedEditSceneSettings',
121-
'Quick Edit Scene Script',
122-
'RGBPalette',
123-
'SlimeShader',
124-
'SKAccelerator',
125-
'ShapeAnimator',
126-
'ShapekeyMaster',
127-
'ShaderServant',
128-
'ShiftClickExplorer',
129-
'ShortMenuLoader',
130-
'ShortMenuVanillaDatabase',
131-
'ShortStartLoader',
132-
'VibeYourMaid',
133-
'VoiceNormalizer',
134-
'Wrap Mode Extend Script',
135-
'XTFutaAccessories',
136-
'XTFutaBody',
137-
'XTMasterSlave+',
138-
'YotogiUtil',
139-
CustomMessage('AddMoreBG'),
140-
CustomMessage('ExtraUncensorMale'),
141-
CustomMessage('Uncensor'),
142-
CustomMessage('UncensorMale')
80+
'BodyCategoryAdd',
81+
'AdvancedMaterialModifier',
82+
'MeidoPhotoStudio',
83+
'1900 Poses for MPS',
84+
'ShortMenuVanillaDatabase',
85+
'ShortStartLoader',
86+
'MaidVoicePitch',
87+
'AddModsSlider',
88+
'DistortCorrect',
89+
'ConsistentWindowPosition',
90+
'DressDamage',
91+
'LimitBreak2',
92+
'LookAtYourMaid',
93+
'LookAtYourMaster',
94+
'ManualMaidSort',
95+
'Mirror Props',
96+
'MtAccelerator',
97+
'AllScene Version',
98+
'PNGPlacement',
99+
'More PNGs',
100+
'SceneCapture',
101+
'Modified Pmats',
102+
'VR Ini File',
103+
'ShaderChange',
104+
'SlimeShader',
105+
'TextureLoader',
106+
'PosterLoader',
107+
'ToukaScreenshot',
108+
'HalfUndressing'
143109
];
144110
145111
UncheckDisableComponents(NonCR);
@@ -149,7 +115,8 @@ begin
149115
150116
//Otherwise if not CR
151117
CRComps := [
152-
'GearMenuFix'
118+
'BodyCategoryAdd 2.5',
119+
'SliderDelimiter'
153120
];
154121
155122
UncheckDisableComponents(CRComps);

‎Installer Files/CRFiles.iss

+32-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,42 @@
1-
#define iCRPlugin "Installer Files\CR Components\Plugins"
2-
#define iCRbep 'Installer Files\CR Components\Loader\BepinEX'
1+
#define iCRPlugin "Installer Files\CR Components\UnityInjector"
2+
#define iCRBep 'Installer Files\CR Components\BepInEx'
33

44
[Registry]
55

66
Root: HKCU; Subkey: "{#JapRegistryCR}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"; Check: NOT IsEmptyFolder() AND GetIsCR() AND NOT GetIsEngSimple(ExpandConstant('{app}')); Tasks:reg
77
Root: HKCU; Subkey: "{#EnglishRegistryCR}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"; Check: NOT IsEmptyFolder() AND GetIsCR() AND GetIsEngSimple(ExpandConstant('{app}')); Tasks:reg
88

99
[Files]
10+
Source: "{#iCRBep}\Core\*"; DestDir: "{app}"; Flags: {#stdFlags}; Check: GetIsCR()
11+
Source: "{#iCRBep}\GearFix\*"; DestDir: "{#beppa}"; Flags: {#stdFlags}; Check: GetIsCR()
1012

11-
Source: "{#iCRbep}\GearFix\*"; DestDir: "{#beppa}"; Components:bepinexPlugs/GearFix; Flags: {#stdFlags}; Check: GetIsCR()
13+
Source: "{#iCRbep}\BodyCategoryAdd\*"; DestDir: "{#bepp}"; Components: bepinexPlugs/bodycat; Flags: {#stdFlags}
1214

13-
Source: "{#ICRPlugin}\scenecap\Norm\*"; DestDir: "{#syb}"; Components: plugins/scenecap; Flags: {#stdFlags}; Check: GetIsCR()
14-
Source: "{#ICRPlugin}\partsedit\*"; DestDir: "{#syb}"; Components: plugins/partsedit; Flags: {#stdFlags}; Check: GetIsCR()
15+
Source: "{#iCRbep}\CMIUpdateChecker\*"; DestDir: "{#bepp}"; Components:bepinexPlugs/UpCheck; Flags: {#stdFlags}; Check: GetIsCR()
16+
17+
Source: "{#iCRbep}\i18nEx\core\*"; DestDir: "{app}"; Components:bepinexPlugs/Translations/i18nEx; Flags: {#stdFlags}; Check: GetIsCR()
18+
Source: "{#iCRbep}\i18nEx\extraTranslations\*"; DestDir: "{app}\i18nEx"; Components:bepinexPlugs/Translations/i18nEx/extrans; Flags: {#stdFlags}; Check: GetIsCR()
19+
20+
21+
Source: "{#ICRBep}\ExtendedErrorHandling\*"; DestDir: "{#bepp}"; Components: bepinexPlugs/ExErrorHandle; Flags: {#stdFlags}; Check: GetIsCR()
22+
23+
Source: "{#ICRBep}\MaidLoader\*"; DestDir: "{#bepp}"; Components: bepinexPlugs/MaidLoader; Flags: {#stdFlags}; Check: GetIsCR()
24+
25+
Source: "{#ICRBep}\ShaderServant\*"; DestDir: "{#bepp}"; Components: bepinexPlugs/ShaderServant; Flags: {#stdFlags}; Check: GetIsCR()
26+
27+
Source: "{#ICRBep}\ShortMenuLoader\*"; DestDir: "{#bepp}"; Components: bepinexPlugs/ShaderServant; Flags: {#stdFlags}; Check: GetIsCR()
28+
29+
Source: "{#iCRbep}\SliderDelimiter\*"; DestDir: "{#bepp}"; Components: bepinexPlugs/SliderDelimiter; Flags: {#stdFlags}
30+
31+
Source: "{#ICRBep}\TimeDependentPhysics\*"; DestDir: "{#bepp}"; Components:bepinexPlugs/TimeDependentPhysics; Flags: {#stdFlags}; Check: GetIsCR()
32+
33+
34+
Source: "{#ICRPlugin}\AlwaysColorChange\*"; DestDir: "{#plug}"; Components: plugins/accex; Flags: {#stdFlags}; Check: GetIsCR()
35+
Source: "{#ICRPlugin}\NormalizeExcite\*"; DestDir: "{#plug}"; Components: plugins/normexcite; Flags: {#stdFlags}; Check: GetIsCR()
36+
Source: "{#ICRPlugin}\EditSceneUndo\*"; DestDir: "{#plug}"; Components: plugins/editundo; Flags: {#stdFlags}; Check: GetIsCR()
37+
Source: "{#ICRPlugin}\ExtendRenderingRange"; DestDir: "{#plug}"; Components: plugins/extendrender; Flags: {#stdFlags}; Check: GetIsCR()
38+
Source: "{#ICRPlugin}\PartsEdit\*"; DestDir: "{#plug}"; Components: plugins/partsedit; Flags: {#stdFlags}; Check: GetIsCR()
39+
Source: "{#ICRPlugin}\PluginManager\*"; DestDir: "{#plug}"; Components: plugins/plugmanage; Flags: {#stdFlags}; Check: GetIsCR()
40+
Source: "{#ICRPlugin}\ObjectExplorer\*"; DestDir: "{#plug}"; Components: plugins/objexp; Flags: {#stdFlags}; Check: GetIsCR()
41+
Source: "{#ICRPlugin}\YotogiUtil\*"; DestDir: "{#plug}"; Components: plugins/yotutil; Flags: {#stdFlags}; Check: GetIsCR()
1542
[/Files]

0 commit comments

Comments
 (0)