diff --git a/osu.Game.Rulesets.Vitaru/Objects/Characters/VitaruPlayer.cs b/osu.Game.Rulesets.Vitaru/Objects/Characters/VitaruPlayer.cs index 80c35f2637..cc345067dd 100644 --- a/osu.Game.Rulesets.Vitaru/Objects/Characters/VitaruPlayer.cs +++ b/osu.Game.Rulesets.Vitaru/Objects/Characters/VitaruPlayer.cs @@ -1568,6 +1568,9 @@ namespace osu.Game.Rulesets.Vitaru.Objects.Characters private readonly Bindable familiar = VitaruSettings.VitaruConfigManager.GetBindable(VitaruSetting.Familiar); private int familiarity; + private readonly Bindable late = VitaruSettings.VitaruConfigManager.GetBindable(VitaruSetting.Late); + private int time; + private readonly Bindable lastDance = VitaruSettings.VitaruConfigManager.GetBindable(VitaruSetting.LastDance); private int dance; @@ -1661,7 +1664,16 @@ namespace osu.Game.Rulesets.Vitaru.Objects.Characters } } - if (workingBeatmap.Value.BeatmapInfo.OnlineBeatmapID == 114716 && currentCharacter == Characters.FlandreScarlet && insane && playerList.Count == 1) + if (workingBeatmap.Value.BeatmapInfo.OnlineBeatmapID == 0 && currentCharacter == Characters.SakuyaIzayoi && !late && playerList.Count == 1) + { + if (Time.Current >= 0 && time == 0) + { + Speak("Can't be late. . ."); + time++; + } + } + + if (workingBeatmap.Value.BeatmapInfo.OnlineBeatmapID == 114716 && currentCharacter == Characters.FlandreScarlet && late && insane && playerList.Count == 1) { if (Time.Current >= 760 && insanity == 0) { @@ -1681,7 +1693,7 @@ namespace osu.Game.Rulesets.Vitaru.Objects.Characters } } - if (workingBeatmap.Value.BeatmapInfo.OnlineBeatmapID == 114716 && currentCharacter == Characters.FlandreScarlet && !insane && playerList.Count == 1) + if (workingBeatmap.Value.BeatmapInfo.OnlineBeatmapID == 114716 && currentCharacter == Characters.FlandreScarlet && late && !insane && playerList.Count == 1) { if (Time.Current >= 760 && insanity == 0) { @@ -1830,7 +1842,6 @@ namespace osu.Game.Rulesets.Vitaru.Objects.Characters public enum Characters { - //Alex, [System.ComponentModel.Description("Reimu Hakurei")] ReimuHakurei = 1, [System.ComponentModel.Description("Marisa Kirisame")] diff --git a/osu.Game.Rulesets.Vitaru/Settings/VitaruConfigManager.cs b/osu.Game.Rulesets.Vitaru/Settings/VitaruConfigManager.cs index 3070817641..fa7702fe15 100644 --- a/osu.Game.Rulesets.Vitaru/Settings/VitaruConfigManager.cs +++ b/osu.Game.Rulesets.Vitaru/Settings/VitaruConfigManager.cs @@ -51,11 +51,13 @@ namespace osu.Game.Rulesets.Vitaru.Settings //Touhosu Set(VitaruSetting.Familiar, false); + Set(VitaruSetting.Late, false); Set(VitaruSetting.LastDance, false); Set(VitaruSetting.Insane, true); Set(VitaruSetting.Awoken, false); Set(VitaruSetting.Sacred, false); Set(VitaruSetting.Resurrected, false); + Set(VitaruSetting.Bonded, false); Set(VitaruSetting.Revenge, false); //Online Multiplayer @@ -105,6 +107,7 @@ namespace osu.Game.Rulesets.Vitaru.Settings //Touhosu Familiar, + Late, LastDance, Insane, Awoken, diff --git a/osu.Game.Rulesets.Vitaru/Wiki/Sections/GameplaySection.cs b/osu.Game.Rulesets.Vitaru/Wiki/Sections/GameplaySection.cs index 8b831b5ea3..e5d7bbecd2 100644 --- a/osu.Game.Rulesets.Vitaru/Wiki/Sections/GameplaySection.cs +++ b/osu.Game.Rulesets.Vitaru/Wiki/Sections/GameplaySection.cs @@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Vitaru.Wiki.Sections private Bindable selectedCharacter; private Bindable familiar; + private Bindable late; private Bindable lastDance; private Bindable insane; private Bindable awoken; @@ -48,6 +49,7 @@ namespace osu.Game.Rulesets.Vitaru.Wiki.Sections selectedCharacter = VitaruSettings.VitaruConfigManager.GetBindable(VitaruSetting.Characters); familiar = VitaruSettings.VitaruConfigManager.GetBindable(VitaruSetting.Familiar); + late = VitaruSettings.VitaruConfigManager.GetBindable(VitaruSetting.Late); lastDance = VitaruSettings.VitaruConfigManager.GetBindable(VitaruSetting.LastDance); insane = VitaruSettings.VitaruConfigManager.GetBindable(VitaruSetting.Insane); awoken = VitaruSettings.VitaruConfigManager.GetBindable(VitaruSetting.Awoken); @@ -264,7 +266,7 @@ namespace osu.Game.Rulesets.Vitaru.Wiki.Sections "\nDifficulty: Time Freeze" + "\nAbility (passive): Leader (WIP)"; - if (false)//selectedGamemode.Value == VitaruGamemode.Touhosu) + if (selectedGamemode.Value == VitaruGamemode.Touhosu && late) stats = stats + "\n\nHong was your typical war hero. She fought valiantly, saved allies, showed no mercy against the enemy. " + "She didn't really care for all the medals or attention though, now that the war was over she just wanted to retire to her mansion.\n\n" + "Upon returning home she met with the Scarlet sisters she had entrusted the house with, ony to find they are different. " +