birdulon
/
RhythmGame
1
0
Fork 0
Code Issues 11 Pull Requests Releases 1 Wiki Activity

Fix break stars

This commit is contained in:
Luke Hubmayer-Werner 2021-01-21 18:31:02 +10:30
parent 4deb5f416f
commit 372e72c82e
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
singletons/FileLoader.gd
View File

@ -323,28 +323,26 @@ class RGT:
n = n.substr(2) n = n.substr(2)
match ntype: match ntype:
't': # tap 't', 'b': # tap
note_hits.append(Note.NoteTap.new(time, column)) note_hits.append(Note.NoteTap.new(time, column, ntype=='b'))
num_taps += 1
'b': # break
note_hits.append(Note.NoteTap.new(time, column, true))
num_taps += 1 num_taps += 1
'h': # hold 'h': # hold
var duration = float(n) * beats_per_measure var duration = float(n) * beats_per_measure
note_hits.append(Note.NoteHold.new(time, column, duration)) note_hits.append(Note.NoteHold.new(time, column, duration))
num_holds += 1 num_holds += 1
's': # slide star 's', 'x': # slide star
var star = Note.NoteStar.new(time, column) var star = Note.NoteStar.new(time, column, ntype=='z')
note_hits.append(star) note_hits.append(star)
last_star[column] = star
var slide_type = n[0] # hex digit
var slide_id = int(n.substr(1))
if slide_id > 0:
slide_stars[slide_id] = star
var slide = Note.NoteSlide.new(time, column)
slide_ids[slide_id] = slide
note_nonhits.append(slide)
num_slides += 1 num_slides += 1
last_star[column] = star
if len(n) > 1: # Not all stars have proper slide info
var slide_type = n[0] # hex digit
var slide_id = int(n.substr(1))
if slide_id > 0:
slide_stars[slide_id] = star
var slide = Note.NoteSlide.new(time, column)
slide_ids[slide_id] = slide
note_nonhits.append(slide)
'e': # slide end 'e': # slide end
var slide_type = n[0] # numeric digit, left as str just in case var slide_type = n[0] # numeric digit, left as str just in case
var slide_id = int(n.substr(1)) var slide_id = int(n.substr(1))
@ -389,8 +387,8 @@ class RGT:
var note = Note.NoteSlide.new(time, column) var note = Note.NoteSlide.new(time, column)
slide_ids[slide_id] = note slide_ids[slide_id] = note
note_nonhits.append(note) note_nonhits.append(note)
'x': # not sure '_':
pass print_debug('Unknown note type: ', ntype)
if len(note_hits) > 1: if len(note_hits) > 1:
for note in note_hits: # Set multihit on each one for note in note_hits: # Set multihit on each one