diff --git a/src/love/data/songs/test/test.json b/src/love/data/songs/test/test.json index 28980af0..76f36ac5 100644 --- a/src/love/data/songs/test/test.json +++ b/src/love/data/songs/test/test.json @@ -1,881 +1 @@ -{ - "song": { - "player2": "bf-pixel", - "player1": "bf", - "notes": { - "normal": [ - { - "sectionNotes": [], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [12800, 0, 0], - [13199.999, 1, 0], - [13599.999, 2, 0], - [13999.999, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [14399.999, 0, 0], - [14799.999, 1, 0], - [15199.999, 2, 0], - [15599.999, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [15999.999, 0, 0], - [16199.999, 0, 0], - [16400, 1, 0], - [16600, 1, 0], - [16800, 2, 0], - [17000, 2, 0], - [17200, 3, 0], - [17400, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [17600, 0, 0], - [17800, 0, 0], - [18000, 1, 0], - [18200, 1, 0], - [18400, 2, 0], - [18600, 2, 0], - [18800, 3, 0], - [19000, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [19200, 0, 300], - [19600, 1, 300], - [20000, 2, 300], - [20400, 3, 300] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [20800, 0, 300], - [21200, 1, 300], - [21600, 2, 300], - [22000, 3, 300] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [22400, 0, 700], - [22800, 1, 300], - [23200, 2, 700], - [23600, 3, 300] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [24000, 0, 700], - [24400, 1, 300], - [24800, 2, 700], - [25200, 3, 300] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [25600, 0, 0], - [25600, 1, 0], - [26399.998, 3, 0], - [26399.998, 2, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [27199.998, 0, 0], - [27199.998, 2, 0], - [27599.998, 0, 0], - [27599.998, 2, 0], - [27999.998, 3, 0], - [27999.998, 1, 0], - [28199.998, 1, 0], - [28199.998, 3, 0], - [28399.998, 3, 0], - [28399.998, 1, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [28799.998, 0, 0], - [28799.998, 1, 0], - [29599.998, 3, 0], - [29599.998, 2, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [30399.998, 0, 0], - [30399.998, 2, 0], - [30799.998, 0, 0], - [30799.998, 2, 0], - [31199.998, 3, 0], - [31199.998, 1, 0], - [31399.998, 1, 0], - [31399.998, 3, 0], - [31599.998, 3, 0], - [31599.998, 1, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [31999.998, 0, 0], - [32099.998, 1, 0], - [32199.998, 0, 100], - [32399.998, 3, 0], - [32499.998, 2, 0], - [32599.998, 3, 100], - [32800, 0, 0], - [32900, 1, 0], - [33000, 0, 100], - [33200, 3, 0], - [33300, 2, 0], - [33400, 3, 100] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [33600, 2, 0], - [33700, 3, 0], - [33800, 2, 100], - [34000, 1, 0], - [34100, 0, 0], - [34200, 1, 100], - [34400, 2, 0], - [34500, 3, 0], - [34600, 2, 100], - [34800, 1, 0], - [34900, 0, 0], - [35000, 1, 100] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [35200, 0, 0], - [35300, 1, 0], - [35400, 0, 100], - [35600, 3, 0], - [35700, 2, 0], - [35800, 3, 100], - [36000, 0, 0], - [36100, 1, 0], - [36200, 0, 100], - [36400, 3, 0], - [36500, 2, 0], - [36600, 3, 100] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [36800, 2, 0], - [36900, 3, 0], - [37000, 2, 100], - [37200, 1, 0], - [37300, 0, 0], - [37400, 1, 100], - [37600, 2, 0], - [37700, 3, 0], - [37800, 2, 100], - [38000, 1, 0], - [38100, 0, 0], - [38200, 1, 100] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [38400, 0, 0], - [38600, 3, 0], - [38800, 1, 0], - [38900, 2, 0], - [39000, 1, 0], - [39100, 2, 0], - [39200, 0, 0], - [39400, 3, 0], - [39600, 1, 0], - [39700, 2, 0], - [39800, 1, 0], - [39900, 2, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [40000, 3, 0], - [40200, 0, 0], - [40400, 1, 0], - [40600, 3, 0], - [40800, 0, 0], - [41000, 2, 0], - [41200, 3, 0], - [41400, 0, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [41600, 0, 0], - [41800, 3, 0], - [42000, 1, 0], - [42100, 2, 0], - [42200, 1, 0], - [42300, 2, 0], - [42400, 0, 0], - [42600, 3, 0], - [42800, 1, 0], - [42900, 2, 0], - [43000, 1, 0], - [43100, 2, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [43200, 3, 0], - [43400, 0, 0], - [43600, 1, 0], - [43800, 3, 0], - [44000, 0, 0], - [44200, 2, 0], - [44400, 3, 0], - [44600, 0, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [44800, 0, 0], - [45066.6641, 0, 0], - [45333.332, 0, 0], - [45600, 3, 0], - [45866.6641, 3, 0], - [46133.332, 3, 0], - [46266.6641, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [46400, 1, 100], - [46800, 1, 200], - [47200, 1, 300], - [47600, 1, 400] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [48000, 0, 0], - [48266.6641, 0, 0], - [48533.332, 0, 0], - [48800, 3, 0], - [49066.6641, 3, 0], - [49333.332, 3, 0], - [49466.6641, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [49600, 1, 100], - [50000, 1, 200], - [50400, 1, 300], - [50800, 1, 400] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [51200, 0, 800], - [51200, 1, 800], - [52599.9961, 1, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [52799.9961, 3, 800], - [52799.9961, 1, 800], - [53599.9961, 4, 700], - [53799.9961, 5, 499.999969], - [53999.9961, 6, 300], - [53999.9961, 1, 0], - [53999.9961, 2, 0], - [54199.9961, 7, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [54399.9961, 7, 800], - [54399.9961, 6, 800], - [54399.9961, 5, 800], - [54399.9961, 4, 800], - [54399.9961, 2, 800], - [54399.9961, 0, 800], - [55799.9961, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [55999.9961, 2, 800], - [55999.9961, 3, 800], - [57199.9961, 2, 0], - [57199.9961, 1, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [57599.9961, 1, 800], - [57599.9961, 0, 800], - [58999.9961, 1, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [59199.9961, 3, 800], - [59199.9961, 1, 800], - [59999.9961, 4, 700], - [60199.9961, 5, 499.999969], - [60399.9961, 6, 300], - [60399.9961, 1, 0], - [60399.9961, 2, 0], - [60599.9961, 7, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [60799.9961, 7, 800], - [60799.9961, 6, 800], - [60799.9961, 5, 800], - [60799.9961, 4, 800], - [60799.9961, 0, 800], - [60799.9961, 2, 800], - [62199.9961, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [62399.9961, 2, 800], - [62399.9961, 3, 800], - [63199.9961, 6, 0], - [63299.9961, 7, 0], - [63399.9961, 6, 0], - [63499.9961, 7, 0], - [63599.9961, 4, 0], - [63599.9961, 2, 0], - [63599.9961, 1, 0], - [63649.9961, 5, 0], - [63699.9961, 6, 0], - [63749.9961, 7, 0], - [63799.9961, 6, 0], - [63849.9961, 5, 0], - [63899.9961, 4, 0], - [63949.9961, 5, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [63999.9961, 3, 0], - [64199.9961, 2, 0], - [64399.9961, 0, 0], - [64599.9961, 3, 499.999969], - [65199.9961, 3, 0], - [65399.9961, 0, 400] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [66000, 0, 0], - [66200, 1, 0], - [66400, 0, 0], - [66666.6641, 3, 0], - [66933.33, 2, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [67200, 3, 0], - [67300, 2, 0], - [67800, 2, 0], - [67850, 0, 449.999969], - [68400, 3, 100], - [68600, 2, 0], - [68700, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [68800, 0, 0], - [69000, 1, 0], - [69200, 0, 0], - [69400, 3, 0], - [69600, 2, 0], - [69800, 3, 300], - [70200, 0, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [70400, 4, 0], - [70400, 3, 0], - [70600, 6, 0], - [70600, 2, 0], - [70800, 7, 0], - [70800, 0, 0], - [71000, 4, 499.999969], - [71000, 3, 499.999969], - [71600, 4, 0], - [71600, 3, 0], - [71800, 7, 400], - [71800, 0, 400] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [72400, 7, 0], - [72400, 0, 0], - [72600, 5, 0], - [72600, 1, 0], - [72800, 7, 0], - [72800, 0, 0], - [73066.6641, 4, 0], - [73066.6641, 3, 0], - [73333.33, 6, 0], - [73333.33, 2, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [73600, 4, 0], - [73600, 3, 0], - [73700, 6, 0], - [73700, 2, 0], - [74200, 6, 0], - [74200, 2, 0], - [74250, 7, 449.999969], - [74250, 0, 449.999969], - [74800, 4, 100], - [74800, 3, 100], - [75000, 6, 0], - [75000, 2, 0], - [75100, 4, 0], - [75100, 3, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [75200, 7, 0], - [75200, 0, 0], - [75400, 5, 0], - [75400, 1, 0], - [75600, 7, 0], - [75600, 0, 0], - [75800, 4, 0], - [75800, 3, 0], - [76000, 6, 0], - [76000, 2, 0], - [76200, 4, 300], - [76200, 3, 300], - [76600, 0, 0], - [76600, 7, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [76800, 3, 0], - [76900, 2, 0], - [77000, 3, 0], - [77100, 2, 0], - [77200, 0, 0], - [77300, 2, 0], - [77400, 0, 0], - [77500, 2, 0], - [77600, 4, 700], - [77600, 3, 0], - [77700, 2, 0], - [77800, 3, 0], - [77900, 2, 0], - [78000, 0, 0], - [78100, 2, 0], - [78200, 0, 0], - [78300, 2, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [78400, 7, 700], - [78400, 3, 0], - [78500, 1, 0], - [78600, 3, 0], - [78700, 1, 0], - [78800, 0, 0], - [78900, 1, 0], - [79000, 0, 0], - [79100, 1, 0], - [79200, 5, 400], - [79200, 3, 0], - [79300, 1, 0], - [79400, 3, 0], - [79500, 1, 0], - [79600, 0, 0], - [79700, 1, 0], - [79800, 0, 0], - [79900, 1, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [80000, 3, 0], - [80100, 2, 0], - [80200, 3, 0], - [80300, 2, 0], - [80400, 0, 0], - [80500, 2, 0], - [80600, 0, 0], - [80700, 2, 0], - [80800, 7, 700], - [80800, 3, 0], - [80900, 2, 0], - [81000, 3, 0], - [81100, 2, 0], - [81200, 0, 0], - [81300, 2, 0], - [81400, 0, 0], - [81500, 2, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [81600, 4, 700], - [81600, 3, 0], - [81700, 1, 0], - [81800, 3, 0], - [81900, 1, 0], - [82000, 0, 0], - [82100, 1, 0], - [82200, 0, 0], - [82300, 1, 0], - [82400, 5, 400], - [82400, 3, 0], - [82500, 1, 0], - [82600, 3, 0], - [82700, 1, 0], - [82800, 0, 0], - [82900, 1, 0], - [83000, 0, 0], - [83100, 1, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [83200, 2, 0], - [83300, 2, 0], - [83400, 2, 0], - [83500, 2, 0], - [83600, 0, 0], - [83700, 0, 0], - [83800, 0, 0], - [83900, 0, 0], - [84000, 3, 0], - [84100, 3, 0], - [84200, 3, 0], - [84300, 3, 0], - [84400, 1, 0], - [84500, 1, 0], - [84600, 1, 0], - [84700, 1, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [84800, 0, 0], - [84933.33, 0, 0], - [85066.6641, 0, 0], - [85200, 2, 0], - [85333.33, 2, 0], - [85466.6641, 2, 0], - [85600, 3, 0], - [85733.33, 3, 0], - [85866.6641, 3, 0], - [86000, 0, 0], - [86133.33, 0, 0], - [86266.6641, 0, 0] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [86400, 6, 600], - [86400, 2, 0], - [86500, 2, 0], - [86600, 2, 0], - [86700, 2, 0], - [86800, 0, 0], - [86900, 0, 0], - [87000, 0, 0], - [87100, 0, 0], - [87200, 4, 600], - [87200, 3, 0], - [87300, 3, 0], - [87400, 3, 0], - [87500, 3, 0], - [87600, 1, 0], - [87700, 1, 0], - [87800, 1, 0], - [87900, 1, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [88000, 7, 600], - [88000, 0, 0], - [88133.33, 0, 0], - [88266.6641, 0, 0], - [88400, 2, 0], - [88533.33, 2, 0], - [88666.6641, 2, 0], - [88800, 5, 600], - [88800, 3, 0], - [88933.33, 3, 0], - [89066.6641, 3, 0], - [89200, 0, 0], - [89333.33, 0, 0], - [89466.6641, 0, 0] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [89600, 0, 3200], - [90000, 3, 300], - [90400, 2, 300], - [90800, 1, 300] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [91200, 2, 0], - [91400, 3, 0], - [91600, 2, 0], - [91800, 1, 0], - [92000, 2, 300], - [92400, 3, 300] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [92800, 0, 3200], - [93200, 3, 300], - [93600, 2, 300], - [94000, 1, 300] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [94400, 2, 0], - [94600, 3, 0], - [94800, 2, 0], - [95000, 1, 0], - [95200, 2, 300], - [95600, 3, 300] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [96000, 0, 2300], - [96400, 3, 300], - [96800, 2, 300], - [97200, 1, 300] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [97600, 2, 0], - [97800, 3, 0], - [98000, 2, 0], - [98200, 1, 0], - [98400, 1, 700], - [98400, 2, 300], - [98800, 3, 300] - ], - "lengthInSteps": 16, - "mustHitSection": false - }, - { - "sectionNotes": [ - [99200, 2, 300], - [99200, 0, 700], - [99600, 2, 0], - [99800, 2, 0], - [100000, 3, 300], - [100000, 1, 300], - [100400, 2, 300], - [100400, 0, 300] - ], - "lengthInSteps": 16, - "mustHitSection": true - }, - { - "sectionNotes": [ - [100800, 3, 300], - [100800, 1, 700], - [101200, 2, 300], - [101600, 3, 300], - [101600, 1, 700], - [102000, 2, 300] - ], - "lengthInSteps": 16, - "mustHitSection": true - } - ] - }, - "hasDialogueFile": false, - "voiceList": ["BF", "BF-pixel"], - "needsVoices": true, - "song": "Test", - "bpm": 150, - "stageDefault": "stage", - "speed": { - "normal": 1.6 - } - }, - "version": "FNF SongConverter 0.1.0", - "generatedBy": "SNIFF ver.6" -} +{"song":{"notes":[{"mustHitSection":false,"sectionNotes":[],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[12800,0,0],[13199.999,1,0],[13599.999,2,0],[13999.999,3,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[14399.999,0,0],[14799.999,1,0],[15199.999,2,0],[15599.999,3,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[15999.999,0,0],[16199.999,0,0],[16400,1,0],[16600,1,0],[16800,2,0],[17000,2,0],[17200,3,0],[17400,3,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[17600,0,0],[17800,0,0],[18000,1,0],[18200,1,0],[18400,2,0],[18600,2,0],[18800,3,0],[19000,3,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[19200,0,300],[19600,1,300],[20000,2,300],[20400,3,300],[19600,4,1200,false],[19600,5,1200,false],[19600,7,1200,false],[19800,2,100,false],[19900,2,100,false],[20100,2,100,false],[20200,2,100,false],[20300,2,100,false],[20300,1,100,false],[20200,1,100,false],[20100,1,100,false],[20000,1,100,false],[19900,1,100,false],[19800,1,100,false],[19700,1,100,false],[19600,0,100,false],[19700,0,400,false],[19600,3,100,false],[19700,3,100,false],[19700,2,100,false],[19600,2,100,false],[19800,3,100,false],[19900,3,100,false],[19600,6,1200,false]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[20800,0,300],[21200,1,300],[21600,2,300],[22000,3,300],[21600,5,0,false],[21400,4,0,false],[21300,6,0,false],[21600,7,0,false],[21600,6,0,false],[21500,6,0,false],[21500,7,0,false],[21400,7,0,false],[21300,7,0,false],[21900,7,0,false],[22000,7,0,false],[22100,7,0,false],[22200,7,0,false],[22300,7,0,false],[22400,7,0,false],[21800,7,0,false],[21700,7,0,false]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[22400,0,700],[22800,1,300],[23200,2,700],[23600,3,300]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[24000,0,700],[24400,1,300],[24800,2,700],[25200,3,300]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[25600,0,0],[25600,1,0],[26399.998,3,0],[26399.998,2,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[27199.998,0,0],[27199.998,2,0],[27599.998,0,0],[27599.998,2,0],[27999.998,3,0],[27999.998,1,0],[28199.998,1,0],[28199.998,3,0],[28399.998,3,0],[28399.998,1,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[28799.998,0,0],[28799.998,1,0],[29599.998,3,0],[29599.998,2,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[30399.998,0,0],[30399.998,2,0],[30799.998,0,0],[30799.998,2,0],[31199.998,3,0],[31199.998,1,0],[31399.998,1,0],[31399.998,3,0],[31599.998,3,0],[31599.998,1,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[31999.998,0,0],[32099.998,1,0],[32199.998,0,100],[32399.998,3,0],[32499.998,2,0],[32599.998,3,100],[32800,0,0],[32900,1,0],[33000,0,100],[33200,3,0],[33300,2,0],[33400,3,100]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[33600,2,0],[33700,3,0],[33800,2,100],[34000,1,0],[34100,0,0],[34200,1,100],[34400,2,0],[34500,3,0],[34600,2,100],[34800,1,0],[34900,0,0],[35000,1,100]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[35200,0,0],[35300,1,0],[35400,0,100],[35600,3,0],[35700,2,0],[35800,3,100],[36000,0,0],[36100,1,0],[36200,0,100],[36400,3,0],[36500,2,0],[36600,3,100]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[36800,2,0],[36900,3,0],[37000,2,100],[37200,1,0],[37300,0,0],[37400,1,100],[37600,2,0],[37700,3,0],[37800,2,100],[38000,1,0],[38100,0,0],[38200,1,100]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[38400,0,0],[38600,3,0],[38800,1,0],[38900,2,0],[39000,1,0],[39100,2,0],[39200,0,0],[39400,3,0],[39600,1,0],[39700,2,0],[39800,1,0],[39900,2,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[40000,3,0],[40200,0,0],[40400,1,0],[40600,3,0],[40800,0,0],[41000,2,0],[41200,3,0],[41400,0,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[41600,0,0],[41800,3,0],[42000,1,0],[42100,2,0],[42200,1,0],[42300,2,0],[42400,0,0],[42600,3,0],[42800,1,0],[42900,2,0],[43000,1,0],[43100,2,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[43200,3,0],[43400,0,0],[43600,1,0],[43800,3,0],[44000,0,0],[44200,2,0],[44400,3,0],[44600,0,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[44800,0,0],[45066.6641,0,0],[45333.332,0,0],[45600,3,0],[45866.6641,3,0],[46133.332,3,0],[46266.6641,3,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[46400,1,100],[46800,1,200],[47200,1,300],[47600,1,400]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[48000,0,0],[48266.6641,0,0],[48533.332,0,0],[48800,3,0],[49066.6641,3,0],[49333.332,3,0],[49466.6641,3,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[49600,1,100],[50000,1,200],[50400,1,300],[50800,1,400]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[51200,0,800],[51200,1,800],[52599.9961,1,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[52799.9961,3,800],[52799.9961,1,800],[53599.9961,4,700],[53799.9961,5,499.999969],[53999.9961,6,300],[53999.9961,1,0],[53999.9961,2,0],[54199.9961,7,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[54399.9961,7,800],[54399.9961,6,800],[54399.9961,5,800],[54399.9961,4,800],[54399.9961,2,800],[54399.9961,0,800],[55799.9961,3,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[55999.9961,2,800],[55999.9961,3,800],[57199.9961,2,0],[57199.9961,1,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[57599.9961,1,800],[57599.9961,0,800],[58999.9961,1,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[59199.9961,3,800],[59199.9961,1,800],[59999.9961,4,700],[60199.9961,5,499.999969],[60399.9961,6,300],[60399.9961,1,0],[60399.9961,2,0],[60599.9961,7,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[60799.9961,7,800],[60799.9961,6,800],[60799.9961,5,800],[60799.9961,4,800],[60799.9961,0,800],[60799.9961,2,800],[62199.9961,3,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[62399.9961,2,800],[62399.9961,3,800],[63199.9961,6,0],[63299.9961,7,0],[63399.9961,6,0],[63499.9961,7,0],[63599.9961,4,0],[63599.9961,2,0],[63599.9961,1,0],[63649.9961,5,0],[63699.9961,6,0],[63749.9961,7,0],[63799.9961,6,0],[63849.9961,5,0],[63899.9961,4,0],[63949.9961,5,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[63999.9961,3,0],[64199.9961,2,0],[64399.9961,0,0],[64599.9961,3,499.999969],[65199.9961,3,0],[65399.9961,0,400]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[66000,0,0],[66200,1,0],[66400,0,0],[66666.6641,3,0],[66933.33,2,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[67200,3,0],[67300,2,0],[67800,2,0],[67850,0,449.999969],[68400,3,100],[68600,2,0],[68700,3,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[68800,0,0],[69000,1,0],[69200,0,0],[69400,3,0],[69600,2,0],[69800,3,300],[70200,0,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[70400,4,0],[70400,3,0],[70600,6,0],[70600,2,0],[70800,7,0],[70800,0,0],[71000,4,499.999969],[71000,3,499.999969],[71600,4,0],[71600,3,0],[71800,7,400],[71800,0,400]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[72400,7,0],[72400,0,0],[72600,5,0],[72600,1,0],[72800,7,0],[72800,0,0],[73066.6641,4,0],[73066.6641,3,0],[73333.33,6,0],[73333.33,2,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[73600,4,0],[73600,3,0],[73700,6,0],[73700,2,0],[74200,6,0],[74200,2,0],[74250,7,449.999969],[74250,0,449.999969],[74800,4,100],[74800,3,100],[75000,6,0],[75000,2,0],[75100,4,0],[75100,3,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[75200,7,0],[75200,0,0],[75400,5,0],[75400,1,0],[75600,7,0],[75600,0,0],[75800,4,0],[75800,3,0],[76000,6,0],[76000,2,0],[76200,4,300],[76200,3,300],[76600,0,0],[76600,7,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[76800,3,0],[76900,2,0],[77000,3,0],[77100,2,0],[77200,0,0],[77300,2,0],[77400,0,0],[77500,2,0],[77600,4,700],[77600,3,0],[77700,2,0],[77800,3,0],[77900,2,0],[78000,0,0],[78100,2,0],[78200,0,0],[78300,2,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[78400,7,700],[78400,3,0],[78500,1,0],[78600,3,0],[78700,1,0],[78800,0,0],[78900,1,0],[79000,0,0],[79100,1,0],[79200,5,400],[79200,3,0],[79300,1,0],[79400,3,0],[79500,1,0],[79600,0,0],[79700,1,0],[79800,0,0],[79900,1,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[80000,3,0],[80100,2,0],[80200,3,0],[80300,2,0],[80400,0,0],[80500,2,0],[80600,0,0],[80700,2,0],[80800,7,700],[80800,3,0],[80900,2,0],[81000,3,0],[81100,2,0],[81200,0,0],[81300,2,0],[81400,0,0],[81500,2,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[81600,4,700],[81600,3,0],[81700,1,0],[81800,3,0],[81900,1,0],[82000,0,0],[82100,1,0],[82200,0,0],[82300,1,0],[82400,5,400],[82400,3,0],[82500,1,0],[82600,3,0],[82700,1,0],[82800,0,0],[82900,1,0],[83000,0,0],[83100,1,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[83200,2,0],[83300,2,0],[83400,2,0],[83500,2,0],[83600,0,0],[83700,0,0],[83800,0,0],[83900,0,0],[84000,3,0],[84100,3,0],[84200,3,0],[84300,3,0],[84400,1,0],[84500,1,0],[84600,1,0],[84700,1,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[84800,0,0],[84933.33,0,0],[85066.6641,0,0],[85200,2,0],[85333.33,2,0],[85466.6641,2,0],[85600,3,0],[85733.33,3,0],[85866.6641,3,0],[86000,0,0],[86133.33,0,0],[86266.6641,0,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[86400,6,600],[86400,2,0],[86500,2,0],[86600,2,0],[86700,2,0],[86800,0,0],[86900,0,0],[87000,0,0],[87100,0,0],[87200,4,600],[87200,3,0],[87300,3,0],[87400,3,0],[87500,3,0],[87600,1,0],[87700,1,0],[87800,1,0],[87900,1,0]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[88000,7,600],[88000,0,0],[88133.33,0,0],[88266.6641,0,0],[88400,2,0],[88533.33,2,0],[88666.6641,2,0],[88800,5,600],[88800,3,0],[88933.33,3,0],[89066.6641,3,0],[89200,0,0],[89333.33,0,0],[89466.6641,0,0]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[89600,0,3200],[90000,3,300],[90400,2,300],[90800,1,300]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[91200,2,0],[91400,3,0],[91600,2,0],[91800,1,0],[92000,2,300],[92400,3,300]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[92800,0,3200],[93200,3,300],[93600,2,300],[94000,1,300]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[94400,2,0],[94600,3,0],[94800,2,0],[95000,1,0],[95200,2,300],[95600,3,300]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[96000,0,2300],[96400,3,300],[96800,2,300],[97200,1,300]],"lengthInSteps":16},{"mustHitSection":false,"sectionNotes":[[97600,2,0],[97800,3,0],[98000,2,0],[98200,1,0],[98400,1,700],[98400,2,300],[98800,3,300]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[99200,2,300],[99200,0,700],[99600,2,0],[99800,2,0],[100000,3,300],[100000,1,300],[100400,2,300],[100400,0,300]],"lengthInSteps":16},{"mustHitSection":true,"sectionNotes":[[100800,3,300],[100800,1,700],[101200,2,300],[101600,3,300],[101600,1,700],[102000,2,300]],"lengthInSteps":16},{"mustHitSection":true,"lengthInSteps":16,"changeBPM":false,"typeOfSection":0,"altAnim":false,"bpm":150,"sectionNotes":[]},{"mustHitSection":true,"sectionNotes":[],"changeBPM":false,"typeOfSection":0,"altAnim":false,"bpm":150,"lengthInSteps":16}],"needsVoices":true,"speed":1.6,"player1":"bf","song":"test","bpm":150,"player2":"bf-pixel-opponent"},"GeneratedBy":"Vanilla Engine"} \ No newline at end of file diff --git a/src/love/main.lua b/src/love/main.lua index 54f09092..3d39bcea 100644 --- a/src/love/main.lua +++ b/src/love/main.lua @@ -111,98 +111,6 @@ function borderedText(text,x,y,r,sx,sy,ox,oy,kx,ky,alpha) love.graphics.print(text,x,y,r,sx,sy,a,ox,oy,kx,ky) end mainDrawing = true -function saveSettings(menu) - local menu = menu == nil and true or menu - if settings.hardwareCompression ~= settingdata.hardwareCompression then - settingdata = {} - if settings.hardwareCompression then - imageTyppe = "dds" - else - imageTyppe = "png" - end - settingdata = { - hardwareCompression = settings.hardwareCompression, - downscroll = settings.downscroll, - ghostTapping = settings.ghostTapping, - showDebug = settings.showDebug, - setImageType = imageTyppe, - sideJudgements = settings.sideJudgements, - botPlay = settings.botPlay, - middleScroll = settings.middleScroll, - randomNotePlacements = settings.randomNotePlacements, - practiceMode = settings.practiceMode, - noMiss = settings.noMiss, - customScrollSpeed = settings.customScrollSpeed, - keystrokes = settings.keystrokes, - scrollUnderlayTrans = settings.scrollUnderlayTrans, - Hitsounds = settings.Hitsounds, - vocalsVol = settings.vocalsVol, - instVol = settings.instVol, - hitsoundVol = settings.hitsoundVol, - noteSkins = settings.noteSkins, - flashinglights = settings.flashinglights, - window = settings.window, - fpsCap = settings.fpsCap, - customBindDown = customBindDown, - customBindUp = customBindUp, - customBindLeft = customBindLeft, - customBindRight = customBindRight, - settingsVer = settingsVer - } - serialized = lume.serialize(settingdata) - love.filesystem.write("settings", serialized) - love.window.showMessageBox("Settings Saved!", "Settings saved. Vanilla Engine will now restart to make sure your settings saved") - love.event.quit("restart") - else - settingdata = {} - if settings.hardwareCompression then - imageTyppe = "dds" - else - imageTyppe = "png" - end - settingdata = { - hardwareCompression = settings.hardwareCompression, - downscroll = settings.downscroll, - ghostTapping = settings.ghostTapping, - showDebug = settings.showDebug, - setImageType = settings.setImageType, - sideJudgements = settings.sideJudgements, - botPlay = settings.botPlay, - middleScroll = settings.middleScroll, - randomNotePlacements = settings.randomNotePlacements, - practiceMode = settings.practiceMode, - noMiss = settings.noMiss, - customScrollSpeed = settings.customScrollSpeed, - keystrokes = settings.keystrokes, - scrollUnderlayTrans = settings.scrollUnderlayTrans, - Hitsounds = settings.Hitsounds, - vocalsVol = settings.vocalsVol, - instVol = settings.instVol, - hitsoundVol = settings.hitsoundVol, - noteSkins = settings.noteSkins, - flashinglights = settings.flashinglights, - window = settings.window, - fpsCap = settings.fpsCap, - - customBindDown = customBindDown, - customBindUp = customBindUp, - customBindLeft = customBindLeft, - customBindRight = customBindRight, - settingsVer = settingsVer - } - serialized = lume.serialize(settingdata) - love.filesystem.write("settings", serialized) - if menu then - graphics:fadeOutWipe( - 0.7, - function() - Gamestate.switch(menuSelect) - status.setLoading(false) - end - ) - end - end -end require "modules.overrides" @@ -231,14 +139,13 @@ function love.load() util = require "modules.util" cutscene = require "modules.cutscene" dialogue = require "modules.dialogue" - settings = require "settings" Group = require "modules.Group" require "modules.savedata" require "modules.Alphabet" Option = require "modules.Option" CONSTANTS = require "modules.constants" loadSavedata() - + -- XML Modules Sprite = require "modules.xml.Sprite" xmlcamera = require "modules.xml.camera" @@ -246,100 +153,6 @@ function love.load() playMenuMusic = true - if love.filesystem.getInfo("settings") then - settingsdata = lume.deserialize(love.filesystem.read("settings")) - - settings = settingsdata - - customBindLeft = settings.customBindLeft - customBindRight = settings.customBindRight - customBindUp = settings.customBindUp - customBindDown = settings.customBindDown - - settingsVer = settings.settingsVer - - settingdata = { - hardwareCompression = settings.hardwareCompression, - downscroll = settings.downscroll, - ghostTapping = settings.ghostTapping, - showDebug = settings.showDebug, - setImageType = settings.setImageType, - sideJudgements = settings.sideJudgements, - botPlay = settings.botPlay, - middleScroll = settings.middleScroll, - practiceMode = settings.practiceMode, - noMiss = settings.noMiss, - customScrollSpeed = settings.customScrollSpeed, - keystrokes = settings.keystrokes, - scrollUnderlayTrans = settings.scrollUnderlayTrans, - customBindDown = customBindDown, - customBindUp = customBindUp, - customBindLeft = customBindLeft, - customBindRight = customBindRight, - window = settings.window, - fpsCap = settings.fpsCap, - settingsVer = settingsVer - } - serialized = lume.serialize(settingdata) - love.filesystem.write("settings", serialized) - end - if settingsVer ~= 3 then - love.window.showMessageBox("Uh Oh!", "Settings have been reset.", "warning") - love.filesystem.remove("settings") - end - if not love.filesystem.getInfo("settings") or settingsVer ~= 3 then - settings.hardwareCompression = true - graphics.setImageType("dds") - settings.setImageType = "dds" - settings.downscroll = false - settings.middleScroll = false - settings.ghostTapping = true - settings.showDebug = false - settings.sideJudgements = false - settings.botPlay = false - settings.practiceMode = false - settings.noMiss = false - settings.customScrollSpeed = 1 - settings.keystrokes = false - settings.scrollUnderlayTrans = 0 - settings.window = false - settings.fpsCap = 60 - --settings.noteSkins = 1 - customBindLeft = "a" - customBindRight = "d" - customBindUp = "w" - customBindDown = "s" - - settings.flashinglights = false - settingsVer = 3 - settingdata = {} - settingdata = { - hardwareCompression = settings.hardwareCompression, - downscroll = settings.downscroll, - ghostTapping = settings.ghostTapping, - showDebug = settings.showDebug, - setImageType = settings.setImageType, - sideJudgements = settings.sideJudgements, - botPlay = settings.botPlay, - middleScroll = settings.middleScroll, - practiceMode = settings.practiceMode, - noMiss = settings.noMiss, - customScrollSpeed = settings.customScrollSpeed, - keystrokes = settings.keystrokes, - scrollUnderlayTrans = settings.scrollUnderlayTrans, - fpsCap = settings.fpsCap, - - customBindLeft = "a", - customBindRight = "d", - customBindUp = "w", - customBindDown = "s", - - settingsVer = settingsVer - } - serialized = lume.serialize(settingdata) - love.filesystem.write("settings", serialized) - end - -- disable vsync love.window.setVSync(0) diff --git a/src/love/modules/savedata.lua b/src/love/modules/savedata.lua index af52cc60..a12a9e69 100644 --- a/src/love/modules/savedata.lua +++ b/src/love/modules/savedata.lua @@ -1,3 +1,4 @@ +settings = require "settings" savedata = {} function loadSavedata() @@ -9,6 +10,193 @@ function loadSavedata() end end +if love.filesystem.getInfo("settings") then + settingsdata = lume.deserialize(love.filesystem.read("settings")) + + settings = settingsdata + + customBindLeft = settings.customBindLeft + customBindRight = settings.customBindRight + customBindUp = settings.customBindUp + customBindDown = settings.customBindDown + + settingsVer = settings.settingsVer + + settingdata = { + hardwareCompression = settings.hardwareCompression, + downscroll = settings.downscroll, + ghostTapping = settings.ghostTapping, + showDebug = settings.showDebug, + setImageType = settings.setImageType, + sideJudgements = settings.sideJudgements, + botPlay = settings.botPlay, + middleScroll = settings.middleScroll, + practiceMode = settings.practiceMode, + noMiss = settings.noMiss, + customScrollSpeed = settings.customScrollSpeed, + keystrokes = settings.keystrokes, + scrollUnderlayTrans = settings.scrollUnderlayTrans, + customBindDown = customBindDown, + customBindUp = customBindUp, + customBindLeft = customBindLeft, + customBindRight = customBindRight, + window = settings.window, + fpsCap = settings.fpsCap, + settingsVer = settingsVer + } + serialized = lume.serialize(settingdata) + love.filesystem.write("settings", serialized) +end +if settingsVer ~= 3 then + love.window.showMessageBox("Uh Oh!", "Settings have been reset.", "warning") + love.filesystem.remove("settings") +end +if not love.filesystem.getInfo("settings") or settingsVer ~= 3 then + settings.hardwareCompression = true + graphics.setImageType("dds") + settings.setImageType = "dds" + settings.downscroll = false + settings.middleScroll = false + settings.ghostTapping = true + settings.showDebug = false + settings.sideJudgements = false + settings.botPlay = false + settings.practiceMode = false + settings.noMiss = false + settings.customScrollSpeed = 1 + settings.keystrokes = false + settings.scrollUnderlayTrans = 0 + settings.window = false + settings.fpsCap = 60 + --settings.noteSkins = 1 + customBindLeft = "a" + customBindRight = "d" + customBindUp = "w" + customBindDown = "s" + + settings.flashinglights = false + settingsVer = 3 + settingdata = {} + settingdata = { + hardwareCompression = settings.hardwareCompression, + downscroll = settings.downscroll, + ghostTapping = settings.ghostTapping, + showDebug = settings.showDebug, + setImageType = settings.setImageType, + sideJudgements = settings.sideJudgements, + botPlay = settings.botPlay, + middleScroll = settings.middleScroll, + practiceMode = settings.practiceMode, + noMiss = settings.noMiss, + customScrollSpeed = settings.customScrollSpeed, + keystrokes = settings.keystrokes, + scrollUnderlayTrans = settings.scrollUnderlayTrans, + fpsCap = settings.fpsCap, + + customBindLeft = "a", + customBindRight = "d", + customBindUp = "w", + customBindDown = "s", + + settingsVer = settingsVer + } + serialized = lume.serialize(settingdata) + love.filesystem.write("settings", serialized) +end + +function saveSettings(menu) + local menu = menu == nil and true or menu + if settings.hardwareCompression ~= settingdata.hardwareCompression then + settingdata = {} + if settings.hardwareCompression then + imageTyppe = "dds" + else + imageTyppe = "png" + end + settingdata = { + hardwareCompression = settings.hardwareCompression, + downscroll = settings.downscroll, + ghostTapping = settings.ghostTapping, + showDebug = settings.showDebug, + setImageType = imageTyppe, + sideJudgements = settings.sideJudgements, + botPlay = settings.botPlay, + middleScroll = settings.middleScroll, + randomNotePlacements = settings.randomNotePlacements, + practiceMode = settings.practiceMode, + noMiss = settings.noMiss, + customScrollSpeed = settings.customScrollSpeed, + keystrokes = settings.keystrokes, + scrollUnderlayTrans = settings.scrollUnderlayTrans, + Hitsounds = settings.Hitsounds, + vocalsVol = settings.vocalsVol, + instVol = settings.instVol, + hitsoundVol = settings.hitsoundVol, + noteSkins = settings.noteSkins, + flashinglights = settings.flashinglights, + window = settings.window, + fpsCap = settings.fpsCap, + customBindDown = customBindDown, + customBindUp = customBindUp, + customBindLeft = customBindLeft, + customBindRight = customBindRight, + settingsVer = settingsVer + } + serialized = lume.serialize(settingdata) + love.filesystem.write("settings", serialized) + love.window.showMessageBox("Settings Saved!", "Settings saved. Vanilla Engine will now restart to make sure your settings saved") + love.event.quit("restart") + else + settingdata = {} + if settings.hardwareCompression then + imageTyppe = "dds" + else + imageTyppe = "png" + end + settingdata = { + hardwareCompression = settings.hardwareCompression, + downscroll = settings.downscroll, + ghostTapping = settings.ghostTapping, + showDebug = settings.showDebug, + setImageType = settings.setImageType, + sideJudgements = settings.sideJudgements, + botPlay = settings.botPlay, + middleScroll = settings.middleScroll, + randomNotePlacements = settings.randomNotePlacements, + practiceMode = settings.practiceMode, + noMiss = settings.noMiss, + customScrollSpeed = settings.customScrollSpeed, + keystrokes = settings.keystrokes, + scrollUnderlayTrans = settings.scrollUnderlayTrans, + Hitsounds = settings.Hitsounds, + vocalsVol = settings.vocalsVol, + instVol = settings.instVol, + hitsoundVol = settings.hitsoundVol, + noteSkins = settings.noteSkins, + flashinglights = settings.flashinglights, + window = settings.window, + fpsCap = settings.fpsCap, + + customBindDown = customBindDown, + customBindUp = customBindUp, + customBindLeft = customBindLeft, + customBindRight = customBindRight, + settingsVer = settingsVer + } + serialized = lume.serialize(settingdata) + love.filesystem.write("settings", serialized) + if menu then + graphics:fadeOutWipe( + 0.7, + function() + Gamestate.switch(menuSelect) + status.setLoading(false) + end + ) + end + end +end + function saveSavedata() -- write savedata with lume love.filesystem.write("savedata", lume.serialize(savedata)) diff --git a/src/love/weeks/test.lua b/src/love/weeks/test.lua index 7a66175a..ea75bed0 100644 --- a/src/love/weeks/test.lua +++ b/src/love/weeks/test.lua @@ -28,7 +28,8 @@ return { stages["stage"]:load() inst = love.audio.newSource("songs/test/Inst.ogg", "stream") - voices = love.audio.newSource("songs/test/Voices.ogg", "stream") + voicesBF = love.audio.newSource("songs/test/Voices-bf.ogg", "stream") + voicesEnemy = love.audio.newSource("songs/test/Voices-bf-pixel.ogg", "stream") -- override of the weeks.lua function function updateNotePos() @@ -102,7 +103,7 @@ return { initUI = function(self) weeks:initUI() - weeks:generateNotes("data/test/test.json") + weeks:legacyGenerateNotes("data/songs/test/test.json") end, update = function(self, dt)