Skip to content

Commit dbe669c

Browse files
committed
Add support for pre yotogi talk dress code
1 parent f68054a commit dbe669c

5 files changed

Lines changed: 19 additions & 4 deletions

File tree

COM3D2.DressCode.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<LangVersion>10</LangVersion>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<Product>DressCode</Product>
8-
<Version>1.1.0</Version>
8+
<Version>1.2.0</Version>
99
<Authors>Perdition</Authors>
1010
<PackageProjectUrl>https://github.com/Perdition-117/COM3D2.DressCode</PackageProjectUrl>
1111
<RepositoryUrl>https://github.com/Perdition-117/COM3D2.DressCode.git</RepositoryUrl>

CostumeScene.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ public enum CostumeScene {
77
Yotogi,
88
PrivateMode,
99
Honeymoon,
10+
YotogiTalk,
1011
}

DressCode.cs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,20 +410,31 @@ private static void CharacterMgr_OnDeactivate(CharacterMgr __instance, int f_nAc
410410
}
411411
}
412412

413+
// use character selection menu as trigger for certain scenes
413414
[HarmonyPatch(typeof(CharacterSelectMain), nameof(CharacterSelectMain.OnFinish))]
414415
[HarmonyPostfix]
415416
private static void CharacterSelectMain_OnFinish(CharacterSelectMain __instance) {
416-
// honeymoon scene starts on initial character selection
417-
if (__instance.scene_chara_select_.select_type == SceneCharacterSelect.SelectType.HoneymoonMode && __instance.select_maid_ != null && _activeCostumeScene != CostumeScene.Honeymoon) {
417+
if (__instance.select_maid_ == null) {
418+
return;
419+
}
420+
421+
switch (__instance.scene_chara_select_.select_type) {
422+
case SceneCharacterSelect.SelectType.Yotogi:
423+
_activeCostumeScene = CostumeScene.YotogiTalk;
424+
LogDebug($"{_activeCostumeScene} scene started.");
425+
SetCostume(__instance.select_maid_, CostumeScene.YotogiTalk, true);
426+
break;
427+
case SceneCharacterSelect.SelectType.HoneymoonMode:
428+
if (_activeCostumeScene != CostumeScene.Honeymoon) {
418429
_activeCostumeScene = CostumeScene.Honeymoon;
419-
if (PersistentCostumeScenes.Contains(_activeCostumeScene)) {
420430
LogDebug($"{_activeCostumeScene} scene started.");
421431
foreach (var mpn in CostumeEdit.CostumeMpn) {
422432
var prop = __instance.select_maid_.GetProp(mpn);
423433
__instance.select_maid_.ResetProp(prop);
424434
}
425435
SetCostume(__instance.select_maid_, CostumeScene.Honeymoon, true);
426436
}
437+
break;
427438
}
428439
}
429440

Panels/SceneList.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ internal class SceneList : ButtonScrollList<CostumeScene> {
1010
new("SceneDance", CostumeScene.Dance),
1111
new("ScenePoleDance", CostumeScene.PoleDance),
1212
new("SceneYotogi", CostumeScene.Yotogi),
13+
new("SceneYotogiTalk", CostumeScene.YotogiTalk),
1314
new("ScenePrivateMode", CostumeScene.PrivateMode),
1415
new("SceneHoneymoon", CostumeScene.Honeymoon),
1516
};

localization/DressCode.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<Term Key="SceneDance" Translation="Dance" />
1010
<Term Key="ScenePoleDance" Translation="Pole dance" />
1111
<Term Key="SceneYotogi" Translation="Yotogi" />
12+
<Term Key="SceneYotogiTalk" Translation="Yotogi (talk)" />
1213
<Term Key="ScenePrivateMode" Translation="Private mode" />
1314
<Term Key="SceneHoneymoon" Translation="Honeymoon" />
1415

@@ -30,6 +31,7 @@
3031
<Term Key="SceneDance" Translation="ダンス" />
3132
<Term Key="ScenePoleDance" Translation="ポールダンス" />
3233
<Term Key="SceneYotogi" Translation="夜伽" />
34+
<Term Key="SceneYotogiTalk" Translation="夜伽(会話する)" />
3335
<Term Key="ScenePrivateMode" Translation="プライベートモード" />
3436
<Term Key="SceneHoneymoon" Translation="ハネムーン" />
3537

0 commit comments

Comments
 (0)