mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-10 03:35:10 +00:00
In CheerReaders.cs, quotation marks were aptly added, and references … (#506)
* Update issue template to include .riq/.zip info (#483) Co-authored-by: patata <patataofcourse@gmail.com> * Pull release 1 (#484) * Squashed commit of the following: commita6ce193ce5Merge:6105bb4f9b24ac48Author: minenice55 <star.elementa@gmail.com> Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit9b24ac4838Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit6105bb4f64Merge:576b4a008df235a8Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit576b4a0017Merge:9980445710f8fa7fAuthor: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit10f8fa7f5aAuthor: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit118cd4993dMerge:1c1c731d99804457Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit8df235a85bAuthor: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit9980445723Merge:aff1e3d82f595824Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit2f59582460Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commitaff1e3d889Merge:b40ec128c9accfa5Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commitc9accfa52dAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commitb40ec128a5Merge:9f953d5095c9b346Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit95c9b34695Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit0debf55391Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit6eac745eaeAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit349867d983Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commitd469c6c3faAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commitdd290b3331Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit757e1c2c5eAuthor: minenice55 <star.elementa@gmail.com> Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit8ce1d8276bAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commitaf0d9bae19Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commitdb21d51673Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit41157a038cAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit7d754f5706Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commitc196947251Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit9f953d505fMerge:2a8d8d6fce3e6f2dAuthor: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit2a8d8d6fd2Merge:9e3e594213adf5b0Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit13adf5b07bAuthor: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit9e3e594209Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit1c1c731dd1Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit210be54ba3Merge:67b6658caf8395fbAuthor: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commitaf8395fb6aMerge:81eafec9afc665edAuthor: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit81eafec986Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit67b6658cd3Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commita4b66367fdMerge:08a664baafc665edAuthor: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit08a664ba2aMerge:faf3fbf92b0ced2fAuthor: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commitfaf3fbf97cAuthor: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commitbb2ae74339Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Squashed commit of the following: commite782e3a5b4Merge:5b8cfef1ce74719cAuthor: minenice55 <star.elementa@gmail.com> Date: Sat Jun 17 16:40:52 2023 +0000 Merge pull request #478 from evdial/working-dough Working Dough Tweaks commitce74719c1aMerge:9c61b7605b8cfef1Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 17 12:40:06 2023 -0400 Merge branch 'release_1' into pr/478 commit5b8cfef1b0Author: patata <patataofcourse@gmail.com> Date: Sat Jun 17 17:20:15 2023 +0200 Update issue template to include .riq/.zip info commit9c61b760bbAuthor: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 15:05:07 2023 -0400 assbuns commitae7451e9d3Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:56:40 2023 +0200 made small idle not crazy commit4c5c95237cAuthor: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:33:57 2023 -0400 fsd commit083d916238Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:16:38 2023 -0400 anim commitb3664e01b3Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:13:11 2023 +0200 Fixed stuff also scaled now yippee commit71e3a0ce6bAuthor: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 13:50:10 2023 -0400 many commit37b80a33c7Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:28:21 2023 -0400 Squashed commit of the following: (#474) commita6ce193ce5Merge:6105bb4f9b24ac48Author: minenice55 <star.elementa@gmail.com> Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit9b24ac4838Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit6105bb4f64Merge:576b4a008df235a8Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit576b4a0017Merge:9980445710f8fa7fAuthor: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit10f8fa7f5aAuthor: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit118cd4993dMerge:1c1c731d99804457Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit8df235a85bAuthor: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit9980445723Merge:aff1e3d82f595824Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit2f59582460Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commitaff1e3d889Merge:b40ec128c9accfa5Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commitc9accfa52dAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commitb40ec128a5Merge:9f953d5095c9b346Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit95c9b34695Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit0debf55391Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit6eac745eaeAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit349867d983Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commitd469c6c3faAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commitdd290b3331Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit757e1c2c5eAuthor: minenice55 <star.elementa@gmail.com> Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit8ce1d8276bAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commitaf0d9bae19Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commitdb21d51673Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit41157a038cAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit7d754f5706Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commitc196947251Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit9f953d505fMerge:2a8d8d6fce3e6f2dAuthor: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit2a8d8d6fd2Merge:9e3e594213adf5b0Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit13adf5b07bAuthor: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit9e3e594209Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit1c1c731dd1Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit210be54ba3Merge:67b6658caf8395fbAuthor: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commitaf8395fb6aMerge:81eafec9afc665edAuthor: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit81eafec986Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit67b6658cd3Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commita4b66367fdMerge:08a664baafc665edAuthor: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit08a664ba2aMerge:faf3fbf92b0ced2fAuthor: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commitfaf3fbf97cAuthor: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commitbb2ae74339Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing commita6ce193ce5Merge:6105bb4f9b24ac48Author: minenice55 <star.elementa@gmail.com> Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit9b24ac4838Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit6105bb4f64Merge:576b4a008df235a8Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit576b4a0017Merge:9980445710f8fa7fAuthor: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit10f8fa7f5aAuthor: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit118cd4993dMerge:1c1c731d99804457Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit8df235a85bAuthor: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit9980445723Merge:aff1e3d82f595824Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit2f59582460Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commitaff1e3d889Merge:b40ec128c9accfa5Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commitc9accfa52dAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commitb40ec128a5Merge:9f953d5095c9b346Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit95c9b34695Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit0debf55391Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit6eac745eaeAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit349867d983Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commitd469c6c3faAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commitdd290b3331Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit757e1c2c5eAuthor: minenice55 <star.elementa@gmail.com> Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit8ce1d8276bAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commitaf0d9bae19Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commitdb21d51673Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit41157a038cAuthor: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit7d754f5706Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commitc196947251Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit9f953d505fMerge:2a8d8d6fce3e6f2dAuthor: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit2a8d8d6fd2Merge:9e3e594213adf5b0Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit13adf5b07bAuthor: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit9e3e594209Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit1c1c731dd1Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit210be54ba3Merge:67b6658caf8395fbAuthor: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commitaf8395fb6aMerge:81eafec9afc665edAuthor: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit81eafec986Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit67b6658cd3Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commita4b66367fdMerge:08a664baafc665edAuthor: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit08a664ba2aMerge:faf3fbf92b0ced2fAuthor: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commitfaf3fbf97cAuthor: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commitbb2ae74339Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Editor Additions (#479) * favoriting and pick block favoriting needs to not break after previewing (maybe make it persistent in the settings file?) pick block needs to pick the icon, too. and preferably scroll to it as well * final star anim + automatic icon game switching before i make any more changes im making a checkpoint here cuz i know it works * i want to add a way to specify which event SwitchGame() will switch to (because that's a cool feature for pick block) * i'll have to figure out how to auto scroll to the game when the icon is selected * the star now fully works, even between preview switches 👍 * fix the rest of the stuff the event name gets colored correctly and hidden games are skipped over, but still loaded. also i built mm ass buns * tweaks + zoom and sorting this stuff will be in the pr desc so it doesn't matter * oop one more thing * icons look better now :D mipmaps to the rescue * double date fix * Merge pull request #486 from RHeavenStudio/actions_rework Rework GitHub Actions and build script * add ab meta to gitignore (#489) * Sound Scheduling Improvements (#491) * port conductor adjustments * scheduled sounds prebake * allow aiff files to be imported add vbr mp3 warning to readme * improve wording * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * Games fixes/reworks patch (#501) * ghosts are scaled now * Lockstep fully reworked * mr. bach has been implemented * Space dance fixes * oops * Tap trial rework part 1 * tap trial rework part 2 * oopsie * Gramps Talk Update * Space Dance Voice Offsets * Giraffe done! (Except miss anim) * bg is not showing up for some reason * bg not rendering fixed + giraffe fixed * scrolling done * fixed space dance and space soccer bg scrolls * fixed rockers bugs * adjustment * fixed el inaccuracies * particle fix * changed pitch and volume of monkey tap * miss anim * megamix face for girl * Proper miss anim implementation * Added force stepping event * miss anim fix --------- Co-authored-by: saladplainzone <chocolate2890mail@gmail.com> Co-authored-by: ev <85412919+evdial@users.noreply.github.com> * In CheerReaders.cs, quotation marks were aptly added, and references to the girls were more-so neutralized. Consider this my cheer. * revert capitalization and quotations while keeping grammar changes --------- Co-authored-by: minenice55 <star.elementa@gmail.com> Co-authored-by: patata <patataofcourse@gmail.com> Co-authored-by: AstrlJelly <bdlawson115@gmail.com> Co-authored-by: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Co-authored-by: saladplainzone <chocolate2890mail@gmail.com> Co-authored-by: ev <85412919+evdial@users.noreply.github.com>
This commit is contained in:
Xylon
minenice55
parent
68b2999337
commit
33cc77f69d
1 changed files with 134 additions and 134 deletions
|
|
@ -19,7 +19,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
{
|
||||
return new Minigame("cheerReaders", "Cheer Readers", "ffffde", false, false, new List<GameAction>()
|
||||
{
|
||||
new GameAction("oneTwoThree", "One Two Three!")
|
||||
new GameAction("oneTwoThree", "One! Two! Three!")
|
||||
{
|
||||
function = delegate {var e = eventCaller.currentEntity; CheerReaders.instance.OneTwoThree(e.beat, e["solo"]); CheerReaders.instance.SetIsDoingCue(e.beat, e.length);},
|
||||
defaultLength = 3f,
|
||||
|
|
@ -46,7 +46,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("solo", CheerReaders.WhoSpeaks.Both, "Who Speaks", "Who should say the voice line?")
|
||||
}
|
||||
},
|
||||
new GameAction("rahRahSisBoomBaBoom", "Rah-Rah Sis Boom Bah-Boom!")
|
||||
new GameAction("rahRahSisBoomBaBoom", "Rah-Rah Sis Boom Bah-BOOM!")
|
||||
{
|
||||
function = delegate {var e = eventCaller.currentEntity; CheerReaders.instance.RahRahSisBoomBaBoom(e.beat, e["solo"], e["consecutive"]); CheerReaders.instance.SetIsDoingCue(e.beat, e.length);},
|
||||
defaultLength = 4f,
|
||||
|
|
@ -56,7 +56,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("consecutive", false, "Consecutive", "Is this cue using the alternate consecutive version?")
|
||||
}
|
||||
},
|
||||
new GameAction("okItsOn", "OK It's On!")
|
||||
new GameAction("okItsOn", "OK, It's On!")
|
||||
{
|
||||
function = delegate {var e = eventCaller.currentEntity; CheerReaders.instance.OkItsOnStretchable(e.beat, e.length, e["solo"], e["toggle"], e["poster"], e["happy"]); CheerReaders.instance.SetIsDoingCue(e.beat, e.length, false);},
|
||||
defaultLength = 4f,
|
||||
|
|
@ -64,11 +64,11 @@ namespace HeavenStudio.Games.Loaders
|
|||
{
|
||||
new Param("solo", CheerReaders.WhoSpeaks.Both, "Who Speaks", "Who should say the voice line?"),
|
||||
new Param("toggle", true, "Whistle", "Should the whistle sound play?"),
|
||||
new Param("poster", CheerReaders.PosterToChoose.Random, "Poster", "Which image should the cheer readers display?"),
|
||||
new Param("happy", true, "Do Happy Face?", "Will the cheer readers do a happy smile 2 beats after showing off their books?")
|
||||
new Param("poster", CheerReaders.PosterToChoose.Random, "Poster", "Which image should the School Library Pep Squad display?"),
|
||||
new Param("happy", true, "Make Happy Face?", "Will the School Library Pep Squad smile happily 2 beats after flipping their books?")
|
||||
}
|
||||
},
|
||||
new GameAction("okItsOnStretch", "OK It's On! (Stretchable)")
|
||||
new GameAction("okItsOnStretch", "OK, It's On! (Stretchable)")
|
||||
{
|
||||
function = delegate {var e = eventCaller.currentEntity; CheerReaders.instance.OkItsOnStretchable(e.beat, e.length, e["solo"], e["toggle"], e["poster"], e["happy"]); CheerReaders.instance.SetIsDoingCue(e.beat, e.length, false); },
|
||||
defaultLength = 4f,
|
||||
|
|
@ -77,11 +77,11 @@ namespace HeavenStudio.Games.Loaders
|
|||
{
|
||||
new Param("solo", CheerReaders.WhoSpeaks.Both, "Who Speaks", "Who should say the voice line?"),
|
||||
new Param("toggle", true, "Whistle", "Should the whistle sound play?"),
|
||||
new Param("poster", CheerReaders.PosterToChoose.Random, "Poster", "Which image should the cheer readers display?"),
|
||||
new Param("happy", true, "Do Happy Face?", "Will the cheer readers do a happy smile 2 beats after showing off their books?")
|
||||
new Param("poster", CheerReaders.PosterToChoose.Random, "Poster", "Which image should the School Library Pep Squad display?"),
|
||||
new Param("happy", true, "Do Happy Face?", "Will the School Library Pep Squad smile happily 2 beats after showing off their books?")
|
||||
}
|
||||
},
|
||||
new GameAction("yay", "Yay")
|
||||
new GameAction("yay", "Yay!")
|
||||
{
|
||||
function = delegate {CheerReaders.instance.Yay(eventCaller.currentEntity["solo"]); },
|
||||
defaultLength = 0.5f,
|
||||
|
|
@ -96,8 +96,8 @@ namespace HeavenStudio.Games.Loaders
|
|||
resizable = true,
|
||||
parameters = new List<Param>()
|
||||
{
|
||||
new Param("toggle", true, "Should bop?", "Should the nerds bop?"),
|
||||
new Param("toggle2", false, "Should auto bop?", "Should the nerds auto bop?")
|
||||
new Param("toggle", true, "Should bop?", "Should the girls bop?"),
|
||||
new Param("toggle2", false, "Should auto bop?", "Should the girls bop automatically?")
|
||||
}
|
||||
},
|
||||
new GameAction("resetPose", "Reset Pose")
|
||||
|
|
@ -344,9 +344,9 @@ namespace HeavenStudio.Games
|
|||
{
|
||||
canBop = true;
|
||||
player.ResetPose();
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ResetPose();
|
||||
girl.ResetPose();
|
||||
}
|
||||
foreach (var mask in topMasks)
|
||||
{
|
||||
|
|
@ -402,24 +402,24 @@ namespace HeavenStudio.Games
|
|||
case (int)WhoSpeaks.Solo:
|
||||
SoundByte.PlayOneShotGame("cheerReaders/Solo/yayS");
|
||||
player.Yay(true);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.Yay(true);
|
||||
girl.Yay(true);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
SoundByte.PlayOneShotGame("cheerReaders/Girls/yayGirls");
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.Yay(true);
|
||||
girl.Yay(true);
|
||||
}
|
||||
player.Yay(false);
|
||||
break;
|
||||
default:
|
||||
SoundByte.PlayOneShotGame("cheerReaders/All/yay");
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.Yay(true);
|
||||
girl.Yay(true);
|
||||
}
|
||||
player.Yay(true);
|
||||
break;
|
||||
|
|
@ -448,17 +448,17 @@ namespace HeavenStudio.Games
|
|||
{
|
||||
if (canBop)
|
||||
{
|
||||
foreach (var nerd in firstRow)
|
||||
foreach (var girl in firstRow)
|
||||
{
|
||||
nerd.Bop();
|
||||
girl.Bop();
|
||||
}
|
||||
foreach (var nerd in secondRow)
|
||||
foreach (var girl in secondRow)
|
||||
{
|
||||
nerd.Bop();
|
||||
girl.Bop();
|
||||
}
|
||||
foreach (var nerd in thirdRow)
|
||||
foreach (var girl in thirdRow)
|
||||
{
|
||||
nerd.Bop();
|
||||
girl.Bop();
|
||||
}
|
||||
player.Bop();
|
||||
}
|
||||
|
|
@ -485,7 +485,7 @@ namespace HeavenStudio.Games
|
|||
public void OneTwoThree(double beat, int whoSpeaks)
|
||||
{
|
||||
canBop = false;
|
||||
ScheduleInput(beat, 2, InputType.STANDARD_DOWN, JustFlip, MissFlip, Nothing);
|
||||
ScheduleInput(beat, 2, InputType.STANDARD_DOWN, JustFlip, MissFlip, None);
|
||||
List<MultiSound.Sound> soundsToPlay = new List<MultiSound.Sound>()
|
||||
{
|
||||
new MultiSound.Sound("cheerReaders/bookHorizontal", beat),
|
||||
|
|
@ -527,9 +527,9 @@ namespace HeavenStudio.Games
|
|||
{
|
||||
new BeatAction.Action(beat, delegate
|
||||
{
|
||||
foreach (var nerd in firstRow)
|
||||
foreach (var girl in firstRow)
|
||||
{
|
||||
nerd.FlipBook();
|
||||
girl.FlipBook();
|
||||
}
|
||||
switch (whoSpeaks)
|
||||
{
|
||||
|
|
@ -537,25 +537,25 @@ namespace HeavenStudio.Games
|
|||
player.OneTwoThree(1);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.OneTwoThree(1);
|
||||
girl.OneTwoThree(1);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.OneTwoThree(1);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.OneTwoThree(1);
|
||||
girl.OneTwoThree(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}),
|
||||
new BeatAction.Action(beat + 1, delegate
|
||||
{
|
||||
foreach (var nerd in secondRow)
|
||||
foreach (var girl in secondRow)
|
||||
{
|
||||
nerd.FlipBook();
|
||||
girl.FlipBook();
|
||||
}
|
||||
switch (whoSpeaks)
|
||||
{
|
||||
|
|
@ -563,25 +563,25 @@ namespace HeavenStudio.Games
|
|||
player.OneTwoThree(2);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.OneTwoThree(2);
|
||||
girl.OneTwoThree(2);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.OneTwoThree(2);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.OneTwoThree(2);
|
||||
girl.OneTwoThree(2);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}),
|
||||
new BeatAction.Action(beat + 2, delegate
|
||||
{
|
||||
foreach (var nerd in thirdRow)
|
||||
foreach (var girl in thirdRow)
|
||||
{
|
||||
nerd.FlipBook();
|
||||
girl.FlipBook();
|
||||
}
|
||||
switch (whoSpeaks)
|
||||
{
|
||||
|
|
@ -589,16 +589,16 @@ namespace HeavenStudio.Games
|
|||
player.OneTwoThree(3);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.OneTwoThree(3);
|
||||
girl.OneTwoThree(3);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.OneTwoThree(3);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.OneTwoThree(3);
|
||||
girl.OneTwoThree(3);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -613,7 +613,7 @@ namespace HeavenStudio.Games
|
|||
public void ItsUpToYou(double beat, int whoSpeaks)
|
||||
{
|
||||
canBop = false;
|
||||
ScheduleInput(beat, 2, InputType.STANDARD_DOWN, JustFlip, MissFlip, Nothing);
|
||||
ScheduleInput(beat, 2, InputType.STANDARD_DOWN, JustFlip, MissFlip, None);
|
||||
List<MultiSound.Sound> soundsToPlay = new List<MultiSound.Sound>()
|
||||
{
|
||||
new MultiSound.Sound("cheerReaders/bookVertical", beat),
|
||||
|
|
@ -673,16 +673,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(1);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(1);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -698,16 +698,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(2);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(2);
|
||||
girl.ItsUpToYou(2);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(2);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(2);
|
||||
girl.ItsUpToYou(2);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -723,16 +723,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(3);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(3);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -747,16 +747,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(4);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(4);
|
||||
girl.ItsUpToYou(4);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(4);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(4);
|
||||
girl.ItsUpToYou(4);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -771,7 +771,7 @@ namespace HeavenStudio.Games
|
|||
public void LetsGoReadABunchaBooks(double beat, int whoSpeaks)
|
||||
{
|
||||
canBop = false;
|
||||
ScheduleInput(beat, 2, InputType.STANDARD_DOWN, JustFlip, MissFlip, Nothing);
|
||||
ScheduleInput(beat, 2, InputType.STANDARD_DOWN, JustFlip, MissFlip, None);
|
||||
List<MultiSound.Sound> soundsToPlay = new List<MultiSound.Sound>()
|
||||
{
|
||||
new MultiSound.Sound("cheerReaders/letsGoRead", beat),
|
||||
|
|
@ -846,16 +846,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(1);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(1);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -874,16 +874,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(1);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(1);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -906,16 +906,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(3);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(3);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -933,16 +933,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(3);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(3);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -957,7 +957,7 @@ namespace HeavenStudio.Games
|
|||
public void RahRahSisBoomBaBoom(double beat, int whoSpeaks, bool consecutive)
|
||||
{
|
||||
canBop = false;
|
||||
ScheduleInput(beat, 2.5f, InputType.STANDARD_DOWN, JustFlipBoom, MissFlip, Nothing);
|
||||
ScheduleInput(beat, 2.5f, InputType.STANDARD_DOWN, JustFlipBoom, MissFlip, None);
|
||||
List<MultiSound.Sound> soundsToPlay = new List<MultiSound.Sound>()
|
||||
{
|
||||
new MultiSound.Sound("cheerReaders/bookDiagonal", beat + 0.5f),
|
||||
|
|
@ -1023,16 +1023,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(1);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(1);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1047,16 +1047,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(3);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(3);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1072,16 +1072,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(1);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(1);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1097,16 +1097,16 @@ namespace HeavenStudio.Games
|
|||
player.OneTwoThree(2);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.OneTwoThree(2);
|
||||
girl.OneTwoThree(2);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.OneTwoThree(2);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.OneTwoThree(2);
|
||||
girl.OneTwoThree(2);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1121,16 +1121,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(3);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(3);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1143,16 +1143,16 @@ namespace HeavenStudio.Games
|
|||
player.Boom();
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.Boom();
|
||||
girl.Boom();
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.Boom();
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.Boom();
|
||||
girl.Boom();
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1168,8 +1168,8 @@ namespace HeavenStudio.Games
|
|||
{
|
||||
canBop = false;
|
||||
float actualLength = length * 0.25f;
|
||||
ScheduleInput(beat, 2 * actualLength, InputType.STANDARD_ALT_DOWN, JustHoldSpin, MissFlip, Nothing);
|
||||
ScheduleInput(beat, 3 * actualLength, InputType.STANDARD_ALT_UP, JustReleaseSpin, MissFlip, Nothing);
|
||||
ScheduleInput(beat, 2 * actualLength, InputType.STANDARD_ALT_DOWN, JustHoldSpin, MissFlip, None);
|
||||
ScheduleInput(beat, 3 * actualLength, InputType.STANDARD_ALT_UP, JustReleaseSpin, MissFlip, None);
|
||||
List<MultiSound.Sound> soundsToPlay = new List<MultiSound.Sound>();
|
||||
if (whistle)
|
||||
{
|
||||
|
|
@ -1228,16 +1228,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(3);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(3);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1250,33 +1250,33 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(1);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(1);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(1);
|
||||
girl.ItsUpToYou(1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}),
|
||||
new BeatAction.Action(beat + 2f * actualLength, delegate
|
||||
{
|
||||
foreach (var nerd in firstRow)
|
||||
foreach (var girl in firstRow)
|
||||
{
|
||||
nerd.StartSpinBook();
|
||||
girl.StartSpinBook();
|
||||
}
|
||||
foreach (var nerd in secondRow)
|
||||
foreach (var girl in secondRow)
|
||||
{
|
||||
nerd.StartSpinBook();
|
||||
girl.StartSpinBook();
|
||||
}
|
||||
foreach (var nerd in thirdRow)
|
||||
foreach (var girl in thirdRow)
|
||||
{
|
||||
nerd.StartSpinBook();
|
||||
girl.StartSpinBook();
|
||||
}
|
||||
switch (whoSpeaks)
|
||||
{
|
||||
|
|
@ -1284,16 +1284,16 @@ namespace HeavenStudio.Games
|
|||
player.ItsUpToYou(3);
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(3);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1301,17 +1301,17 @@ namespace HeavenStudio.Games
|
|||
new BeatAction.Action(beat + 3f * actualLength, delegate
|
||||
{
|
||||
SetPosterImage(posterToChoose);
|
||||
foreach (var nerd in firstRow)
|
||||
foreach (var girl in firstRow)
|
||||
{
|
||||
nerd.StopSpinBook();
|
||||
girl.StopSpinBook();
|
||||
}
|
||||
foreach (var nerd in secondRow)
|
||||
foreach (var girl in secondRow)
|
||||
{
|
||||
nerd.StopSpinBook();
|
||||
girl.StopSpinBook();
|
||||
}
|
||||
foreach (var nerd in thirdRow)
|
||||
foreach (var girl in thirdRow)
|
||||
{
|
||||
nerd.StopSpinBook();
|
||||
girl.StopSpinBook();
|
||||
}
|
||||
switch (whoSpeaks)
|
||||
{
|
||||
|
|
@ -1326,9 +1326,9 @@ namespace HeavenStudio.Games
|
|||
}
|
||||
break;
|
||||
case (int)WhoSpeaks.Girls:
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
if (shouldHappyFace)
|
||||
{
|
||||
|
|
@ -1337,9 +1337,9 @@ namespace HeavenStudio.Games
|
|||
break;
|
||||
case (int)WhoSpeaks.Both:
|
||||
player.ItsUpToYou(3);
|
||||
foreach (var nerd in allGirls)
|
||||
foreach (var girl in allGirls)
|
||||
{
|
||||
nerd.ItsUpToYou(3);
|
||||
girl.ItsUpToYou(3);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1450,6 +1450,6 @@ namespace HeavenStudio.Games
|
|||
}
|
||||
}
|
||||
|
||||
void Nothing(PlayerActionEvent caller) {}
|
||||
void Void(PlayerActionEvent caller) {}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue