etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-13 21:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #48 from CarsonKompon/mr-upbeat-prepare

Browse source 
Mr. Upbeat now starts on the go no matter what
This commit is contained in:
Jenny Crowe 2022-03-11 19:08:13 -07:00 committed by GitHub
commit eadfc4244c
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs
View file

@ -1,5 +1,6 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using UnityEngine; using UnityEngine;
using System; using System;
using Starpelly; using Starpelly;
@ -20,6 +21,8 @@ namespace RhythmHeavenMania.Games.MrUpbeat
public bool canGo = false; public bool canGo = false;
public int beatCount = 0; public int beatCount = 0;
public float beatOffset = 0f;
public static MrUpbeat instance; public static MrUpbeat instance;
private void Awake() private void Awake()
@ -34,6 +37,14 @@ namespace RhythmHeavenMania.Games.MrUpbeat
SetInterval(0); SetInterval(0);
var pos = Conductor.instance.songPositionInBeats; var pos = Conductor.instance.songPositionInBeats;
StartCoroutine(Upbeat(pos - Mathf.Round(pos))); StartCoroutine(Upbeat(pos - Mathf.Round(pos)));
List<float> gos = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "mrUpbeat/go").Select(c => c.beat).ToList();
if (gos.Count > 0)
{
var nextInterval = gos.IndexOf(Mathp.GetClosestInList(gos, Conductor.instance.songPositionInBeats));
beatOffset = gos[nextInterval];
}
} }
private void Update() private void Update()
@ -53,7 +64,8 @@ namespace RhythmHeavenMania.Games.MrUpbeat
if (canGo) if (canGo)
{ {
metronome.transform.eulerAngles = new Vector3(0, 0, 270 - Mathf.Cos(Mathf.PI * Conductor.instance.songPositionInBeats) * 75); var songPos = Conductor.instance.songPositionInBeats - beatOffset;
metronome.transform.eulerAngles = new Vector3(0, 0, 270 - Mathf.Cos(Mathf.PI * songPos) * 75);
} }
if (Conductor.instance.ReportBeat(ref beat.lastReportedBeat)) if (Conductor.instance.ReportBeat(ref beat.lastReportedBeat))
@ -121,6 +133,7 @@ namespace RhythmHeavenMania.Games.MrUpbeat
_beat.SetActive(true); _beat.SetActive(true);
UpbeatStep s = _beat.GetComponent<UpbeatStep>(); UpbeatStep s = _beat.GetComponent<UpbeatStep>();
s.startBeat = beat; s.startBeat = beat;
s.beatOffset = beatOffset;
} }
private IEnumerator Upbeat(float offset = 0) private IEnumerator Upbeat(float offset = 0)

3
Assets/Scripts/Games/MrUpbeat/UpbeatStep.cs
View file

@ -12,6 +12,7 @@ namespace RhythmHeavenMania.Games.MrUpbeat
{ {
public float startBeat; public float startBeat;
private bool passedFirst = false; private bool passedFirst = false;
public float beatOffset = 0;
private void Start() private void Start()
{ {
@ -27,7 +28,7 @@ namespace RhythmHeavenMania.Games.MrUpbeat
{ {
if (Conductor.instance.GetPositionFromBeat(startBeat, 0.35f) >= 1 && !passedFirst) if (Conductor.instance.GetPositionFromBeat(startBeat, 0.35f) >= 1 && !passedFirst)
{ {
if(MrUpbeat.instance.man.stepTimes % 2 != startBeat % 2) if(MrUpbeat.instance.man.stepTimes % 2 != Math.Round(startBeat - beatOffset) % 2)
Hit(false); Hit(false);
passedFirst = true; passedFirst = true;
} }