etc
/
HeavenStudioPlus
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweezers: Allowed inputting via arrow keys. Editor: Remix files now saved as .tengoku files (.rhmania files can still be opened via the editor).

This commit is contained in:
Jenny Crowe 2022-02-21 22:43:31 -07:00
parent 36dccd0a21
commit d9550afaec
5 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Games/RhythmTweezers/Hair.cs
View File

@ -28,7 +28,7 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
float stateBeat = Conductor.instance.GetPositionFromMargin(createBeat + game.tweezerBeatOffset + game.beatInterval, 1f);
StateCheck(stateBeat);
if (PlayerInput.Pressed())
if (PlayerInput.Pressed(true))
{
if (state.perfect)
{

4
Assets/Scripts/Games/RhythmTweezers/LongHair.cs
View File

@ -39,7 +39,7 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
stateBeat = Conductor.instance.GetPositionFromMargin(createBeat + game.tweezerBeatOffset + game.beatInterval, 1f);
StateCheck(stateBeat);
if (PlayerInput.Pressed())
if (PlayerInput.Pressed(true))
{
if (state.perfect)
{
@ -60,7 +60,7 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
stateBeat = Conductor.instance.GetPositionFromMargin(createBeat + game.tweezerBeatOffset + game.beatInterval + 0.5f, 1f);
StateCheck(stateBeat);
if (PlayerInput.PressedUp())
if (PlayerInput.PressedUp(true))
{
// It's possible to release earlier than earlyTime,
// and the hair will automatically be released before lateTime,

2
Assets/Scripts/Games/RhythmTweezers/Tweezers.cs
View File

@ -28,7 +28,7 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
private void LateUpdate()
{
if (PlayerInput.Pressed())
if (PlayerInput.Pressed(true))
{
if (!pluckingThisFrame) // Did you do a successful pluck earlier in the frame?
{

4
Assets/Scripts/LevelEditor/Editor.cs
View File

@ -281,7 +281,7 @@ namespace RhythmHeavenMania.Editor
{
var extensions = new[]
{
new ExtensionFilter("Rhythm Heaven Mania Remix File", "rhmania")
new ExtensionFilter("Heaven Studio Remix File", "tengoku")
};
StandaloneFileBrowser.SaveFilePanelAsync("Save Remix As", "", "remix_level", extensions, (string path) =>
@ -323,7 +323,7 @@ namespace RhythmHeavenMania.Editor
{
var extensions = new[]
{
new ExtensionFilter("Rhythm Heaven Mania Remix File", "rhmania")
new ExtensionFilter("Heaven Studio Remix File", new string[] { "tengoku", "rhmania" })
};
StandaloneFileBrowser.OpenFilePanelAsync("Open Remix", "", extensions, false, (string[] paths) =>

42
Assets/Scripts/PlayerInput.cs
View File

@ -6,19 +6,22 @@ namespace RhythmHeavenMania
{
public class PlayerInput
{
public static bool Pressed()
public static bool Pressed(bool includeDPad = false)
{
return Input.GetKeyDown(KeyCode.Z) && !GameManager.instance.autoplay && Conductor.instance.isPlaying;
bool keyDown = Input.GetKeyDown(KeyCode.Z) || (includeDPad && GetAnyDirectionDown());
return keyDown && !GameManager.instance.autoplay && Conductor.instance.isPlaying;
}
public static bool PressedUp()
public static bool PressedUp(bool includeDPad = false)
{
return Input.GetKeyUp(KeyCode.Z) && !GameManager.instance.autoplay && Conductor.instance.isPlaying;
bool keyUp = Input.GetKeyUp(KeyCode.Z) || (includeDPad && GetAnyDirectionUp());
return keyUp && !GameManager.instance.autoplay && Conductor.instance.isPlaying;
}
public static bool Pressing()
public static bool Pressing(bool includeDPad = false)
{
return Input.GetKey(KeyCode.Z) && !GameManager.instance.autoplay && Conductor.instance.isPlaying;
bool pressing = Input.GetKey(KeyCode.Z) || (includeDPad && GetAnyDirection());
return pressing && !GameManager.instance.autoplay && Conductor.instance.isPlaying;
}
@ -36,5 +39,32 @@ namespace RhythmHeavenMania
{
return Input.GetKey(KeyCode.X) && !GameManager.instance.autoplay && Conductor.instance.isPlaying;
}
public static bool GetAnyDirectionDown()
{
return Input.GetKeyDown(KeyCode.UpArrow)
|| Input.GetKeyDown(KeyCode.DownArrow)
|| Input.GetKeyDown(KeyCode.LeftArrow)
|| Input.GetKeyDown(KeyCode.RightArrow);
}
public static bool GetAnyDirectionUp()
{
return Input.GetKeyUp(KeyCode.UpArrow)
|| Input.GetKeyUp(KeyCode.DownArrow)
|| Input.GetKeyUp(KeyCode.LeftArrow)
|| Input.GetKeyUp(KeyCode.RightArrow);
}
public static bool GetAnyDirection()
{
return Input.GetKey(KeyCode.UpArrow)
|| Input.GetKey(KeyCode.DownArrow)
|| Input.GetKey(KeyCode.LeftArrow)
|| Input.GetKey(KeyCode.RightArrow);
}
}
}