h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-17 02:22:35 +08:00
Code Issues Releases Wiki Activity

commit!

Browse Source
This commit is contained in:
Shawdooow
2018-03-22 09:13:58 -04:00
Unverified
parent 37afeeb6a8
commit 3ac0705bc7
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Rulesets.Vitaru/Objects/Characters/VitaruPlayer.cs
+14 -3
View File
@@ -1568,6 +1568,9 @@ namespace osu.Game.Rulesets.Vitaru.Objects.Characters
private readonly Bindable<bool> familiar = VitaruSettings.VitaruConfigManager.GetBindable<bool>(VitaruSetting.Familiar);
private int familiarity;
private readonly Bindable<bool> late = VitaruSettings.VitaruConfigManager.GetBindable<bool>(VitaruSetting.Late);
private int time;
private readonly Bindable<bool> lastDance = VitaruSettings.VitaruConfigManager.GetBindable<bool>(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")]
osu.Game.Rulesets.Vitaru/Settings/VitaruConfigManager.cs
+3
View File
@@ -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,
osu.Game.Rulesets.Vitaru/Wiki/Sections/GameplaySection.cs
+3 -1
View File
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Vitaru.Wiki.Sections
private Bindable<Characters> selectedCharacter;
private Bindable<bool> familiar;
private Bindable<bool> late;
private Bindable<bool> lastDance;
private Bindable<bool> insane;
private Bindable<bool> awoken;
@@ -48,6 +49,7 @@ namespace osu.Game.Rulesets.Vitaru.Wiki.Sections
selectedCharacter = VitaruSettings.VitaruConfigManager.GetBindable<Characters>(VitaruSetting.Characters);
familiar = VitaruSettings.VitaruConfigManager.GetBindable<bool>(VitaruSetting.Familiar);
late = VitaruSettings.VitaruConfigManager.GetBindable<bool>(VitaruSetting.Late);
lastDance = VitaruSettings.VitaruConfigManager.GetBindable<bool>(VitaruSetting.LastDance);
insane = VitaruSettings.VitaruConfigManager.GetBindable<bool>(VitaruSetting.Insane);
awoken = VitaruSettings.VitaruConfigManager.GetBindable<bool>(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. " +