diff --git a/assets/preload/data/stages/limo.json b/assets/preload/data/stages/limo.json index b2b0488..250bb8e 100644 --- a/assets/preload/data/stages/limo.json +++ b/assets/preload/data/stages/limo.json @@ -6,7 +6,7 @@ "boyfriend": [1025, -145], "girlfriend": [400, 130], "opponent": [100, 100], - "p4": [-300, -1200], + "p4": [0, 0], "hide_girlfriend": false, "camera_boyfriend": [-200, 0], diff --git a/assets/preload/data/stages/mall.json b/assets/preload/data/stages/mall.json index 641460e..cc3026b 100644 --- a/assets/preload/data/stages/mall.json +++ b/assets/preload/data/stages/mall.json @@ -6,7 +6,7 @@ "boyfriend": [970, 100], "girlfriend": [400, 130], "opponent": [100, 100], - "p4": [-300, -1200], + "p4": [0, 0], "hide_girlfriend": false, "camera_boyfriend": [0, -100], diff --git a/assets/preload/data/stages/mallEvil.json b/assets/preload/data/stages/mallEvil.json index 95ea5f4..0b0e525 100644 --- a/assets/preload/data/stages/mallEvil.json +++ b/assets/preload/data/stages/mallEvil.json @@ -6,7 +6,7 @@ "boyfriend": [1090, 100], "girlfriend": [400, 130], "opponent": [100, 20], - "p4": [-300, -1200], + "p4": [0, 0], "hide_girlfriend": false, "camera_boyfriend": [0, 0], diff --git a/assets/preload/data/stages/philly.json b/assets/preload/data/stages/philly.json index 2344c25..8e6c0fb 100644 --- a/assets/preload/data/stages/philly.json +++ b/assets/preload/data/stages/philly.json @@ -6,7 +6,7 @@ "boyfriend": [770, 100], "girlfriend": [400, 130], "opponent": [100, 100], - "p4": [-300, -1200], + "p4": [0, 0], "hide_girlfriend": false, "camera_boyfriend": [0, 0], diff --git a/assets/preload/data/stages/school.json b/assets/preload/data/stages/school.json index 42fd0f5..4bb1a44 100644 --- a/assets/preload/data/stages/school.json +++ b/assets/preload/data/stages/school.json @@ -6,7 +6,7 @@ "boyfriend": [1032, 300], "girlfriend": [642, 432], "opponent": [126, 54], - "p4": [-300, -1200], + "p4": [0, 0], "hide_girlfriend": false, "camera_boyfriend": [-208, -114], diff --git a/assets/preload/data/stages/schoolEvil.json b/assets/preload/data/stages/schoolEvil.json index e0ee15a..b21be7a 100644 --- a/assets/preload/data/stages/schoolEvil.json +++ b/assets/preload/data/stages/schoolEvil.json @@ -6,7 +6,7 @@ "boyfriend": [972, 318], "girlfriend": [582, 432], "opponent": [102, 102], - "p4": [-300, -1200], + "p4": [0, 0], "hide_girlfriend": false, "camera_boyfriend": [-132, -102], diff --git a/assets/preload/data/stages/spooky.json b/assets/preload/data/stages/spooky.json index 3a3f776..2ce8212 100644 --- a/assets/preload/data/stages/spooky.json +++ b/assets/preload/data/stages/spooky.json @@ -6,7 +6,7 @@ "boyfriend": [770, 100], "girlfriend": [400, 130], "opponent": [100, 100], - "p4": [-300, -1200], + "p4": [0, 0], "hide_girlfriend": false, "camera_boyfriend": [0, 0], diff --git a/assets/preload/data/stages/stage.json b/assets/preload/data/stages/stage.json index 796af23..8908d67 100644 --- a/assets/preload/data/stages/stage.json +++ b/assets/preload/data/stages/stage.json @@ -6,7 +6,7 @@ "boyfriend": [770, 100], "girlfriend": [400, 130], "opponent": [100, 100], - "p4": [-300, -1200], + "p4": [0, 0], "hide_girlfriend": false, "camera_boyfriend": [0, 0], diff --git a/assets/preload/data/stages/streetlight.json b/assets/preload/data/stages/streetlight.json index e2a07a8..61fa966 100644 --- a/assets/preload/data/stages/streetlight.json +++ b/assets/preload/data/stages/streetlight.json @@ -6,7 +6,7 @@ "boyfriend": [1330, 250], "girlfriend": [1330, 250], "opponent": [340, 250], - "p4": [-300, -1200], + "p4": [0, 0], "hide_girlfriend": true, "camera_boyfriend": [100, 60], diff --git a/assets/preload/images/menuBGHexL6.png b/assets/preload/images/menuBGHexL6.png index 47debab..a415445 100644 Binary files a/assets/preload/images/menuBGHexL6.png and b/assets/preload/images/menuBGHexL6.png differ diff --git a/assets/preload/scripts/modcharts/none.hscript b/assets/preload/scripts/modcharts/none.hscript new file mode 100644 index 0000000..6eb4c14 --- /dev/null +++ b/assets/preload/scripts/modcharts/none.hscript @@ -0,0 +1,28 @@ +var PlayState = require("PlayState"); +var FlxTypedGroup = require("flixel.group.FlxGroup.FlxTypedGroup"); +var StrumNote = require("Note.StrumNote"); +var Note = require("Note"); + +var strum:FlxTypedGroup; +var strumNum:Int = 0; + +function onStartModchart(str) { + strum = PlayState.instance.thirdStrums; + strumNum = str; +} + +function onUpdatePost(elapsed) { + strum.forEach(function(spr:StrumNote) + { + switch(PlayState.mania) { + case 0 | 1 | 2: + spr.x = (PlayState.instance.player4.x) + (spr.width * spr.noteData) + (5 * spr.noteData); + case 3: + spr.x = (PlayState.instance.player4.x) + (Note.swagWidth * spr.noteData) + (5 * spr.noteData); + default: + spr.x = (PlayState.instance.player4.x) + ((spr.width - Note.lessX[PlayState.mania]) * spr.noteData) + (5 * spr.noteData); + } + spr.x -= 10; + spr.y = (PlayState.instance.player4.y) - 110; + }); +} \ No newline at end of file diff --git a/assets/preload/update/tracking/GitVer.txt b/assets/preload/update/tracking/GitVer.txt index 7c58df9..43f7227 100644 --- a/assets/preload/update/tracking/GitVer.txt +++ b/assets/preload/update/tracking/GitVer.txt @@ -1 +1 @@ -0.8.0b \ No newline at end of file +0.8.0d \ No newline at end of file diff --git a/plugins/plugins/access/libaccess_attachment_plugin.dll b/plugins/plugins/access/libaccess_attachment_plugin.dll deleted file mode 100644 index d1666c0..0000000 Binary files a/plugins/plugins/access/libaccess_attachment_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_bd_plugin.dll b/plugins/plugins/access/libaccess_bd_plugin.dll deleted file mode 100644 index 5167337..0000000 Binary files a/plugins/plugins/access/libaccess_bd_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_ftp_plugin.dll b/plugins/plugins/access/libaccess_ftp_plugin.dll deleted file mode 100644 index 1df7963..0000000 Binary files a/plugins/plugins/access/libaccess_ftp_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_http_plugin.dll b/plugins/plugins/access/libaccess_http_plugin.dll deleted file mode 100644 index 3ac28d6..0000000 Binary files a/plugins/plugins/access/libaccess_http_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_imem_plugin.dll b/plugins/plugins/access/libaccess_imem_plugin.dll deleted file mode 100644 index d96a119..0000000 Binary files a/plugins/plugins/access/libaccess_imem_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_mms_plugin.dll b/plugins/plugins/access/libaccess_mms_plugin.dll deleted file mode 100644 index d51412b..0000000 Binary files a/plugins/plugins/access/libaccess_mms_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_rar_plugin.dll b/plugins/plugins/access/libaccess_rar_plugin.dll deleted file mode 100644 index 802dc00..0000000 Binary files a/plugins/plugins/access/libaccess_rar_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_realrtsp_plugin.dll b/plugins/plugins/access/libaccess_realrtsp_plugin.dll deleted file mode 100644 index 4eeb136..0000000 Binary files a/plugins/plugins/access/libaccess_realrtsp_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_smb_plugin.dll b/plugins/plugins/access/libaccess_smb_plugin.dll deleted file mode 100644 index bbe563e..0000000 Binary files a/plugins/plugins/access/libaccess_smb_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_tcp_plugin.dll b/plugins/plugins/access/libaccess_tcp_plugin.dll deleted file mode 100644 index 2d2c45c..0000000 Binary files a/plugins/plugins/access/libaccess_tcp_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_udp_plugin.dll b/plugins/plugins/access/libaccess_udp_plugin.dll deleted file mode 100644 index 3a1f894..0000000 Binary files a/plugins/plugins/access/libaccess_udp_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libaccess_vdr_plugin.dll b/plugins/plugins/access/libaccess_vdr_plugin.dll deleted file mode 100644 index 9630733..0000000 Binary files a/plugins/plugins/access/libaccess_vdr_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libcdda_plugin.dll b/plugins/plugins/access/libcdda_plugin.dll deleted file mode 100644 index 4213d2e..0000000 Binary files a/plugins/plugins/access/libcdda_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libdshow_plugin.dll b/plugins/plugins/access/libdshow_plugin.dll deleted file mode 100644 index cf7bfc1..0000000 Binary files a/plugins/plugins/access/libdshow_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libdtv_plugin.dll b/plugins/plugins/access/libdtv_plugin.dll deleted file mode 100644 index 3eef6e1..0000000 Binary files a/plugins/plugins/access/libdtv_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libdvdnav_plugin.dll b/plugins/plugins/access/libdvdnav_plugin.dll deleted file mode 100644 index b9b0bca..0000000 Binary files a/plugins/plugins/access/libdvdnav_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libdvdread_plugin.dll b/plugins/plugins/access/libdvdread_plugin.dll deleted file mode 100644 index 1ef24aa..0000000 Binary files a/plugins/plugins/access/libdvdread_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libfilesystem_plugin.dll b/plugins/plugins/access/libfilesystem_plugin.dll deleted file mode 100644 index d97b601..0000000 Binary files a/plugins/plugins/access/libfilesystem_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libidummy_plugin.dll b/plugins/plugins/access/libidummy_plugin.dll deleted file mode 100644 index 19a9eda..0000000 Binary files a/plugins/plugins/access/libidummy_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/liblibbluray_plugin.dll b/plugins/plugins/access/liblibbluray_plugin.dll deleted file mode 100644 index 3f029a7..0000000 Binary files a/plugins/plugins/access/liblibbluray_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/liblive555_plugin.dll b/plugins/plugins/access/liblive555_plugin.dll deleted file mode 100644 index 674f417..0000000 Binary files a/plugins/plugins/access/liblive555_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/librtp_plugin.dll b/plugins/plugins/access/librtp_plugin.dll deleted file mode 100644 index e467b26..0000000 Binary files a/plugins/plugins/access/librtp_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libscreen_plugin.dll b/plugins/plugins/access/libscreen_plugin.dll deleted file mode 100644 index 06f4ffd..0000000 Binary files a/plugins/plugins/access/libscreen_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libsdp_plugin.dll b/plugins/plugins/access/libsdp_plugin.dll deleted file mode 100644 index a4732f4..0000000 Binary files a/plugins/plugins/access/libsdp_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libshm_plugin.dll b/plugins/plugins/access/libshm_plugin.dll deleted file mode 100644 index 2d77458..0000000 Binary files a/plugins/plugins/access/libshm_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libstream_filter_rar_plugin.dll b/plugins/plugins/access/libstream_filter_rar_plugin.dll deleted file mode 100644 index a838afc..0000000 Binary files a/plugins/plugins/access/libstream_filter_rar_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libtimecode_plugin.dll b/plugins/plugins/access/libtimecode_plugin.dll deleted file mode 100644 index 285f1bd..0000000 Binary files a/plugins/plugins/access/libtimecode_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libvcd_plugin.dll b/plugins/plugins/access/libvcd_plugin.dll deleted file mode 100644 index 1680e2f..0000000 Binary files a/plugins/plugins/access/libvcd_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access/libzip_plugin.dll b/plugins/plugins/access/libzip_plugin.dll deleted file mode 100644 index 13f8b8c..0000000 Binary files a/plugins/plugins/access/libzip_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access_output/libaccess_output_dummy_plugin.dll b/plugins/plugins/access_output/libaccess_output_dummy_plugin.dll deleted file mode 100644 index 8ae288f..0000000 Binary files a/plugins/plugins/access_output/libaccess_output_dummy_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access_output/libaccess_output_file_plugin.dll b/plugins/plugins/access_output/libaccess_output_file_plugin.dll deleted file mode 100644 index 077d94b..0000000 Binary files a/plugins/plugins/access_output/libaccess_output_file_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access_output/libaccess_output_http_plugin.dll b/plugins/plugins/access_output/libaccess_output_http_plugin.dll deleted file mode 100644 index 90e8f1f..0000000 Binary files a/plugins/plugins/access_output/libaccess_output_http_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access_output/libaccess_output_livehttp_plugin.dll b/plugins/plugins/access_output/libaccess_output_livehttp_plugin.dll deleted file mode 100644 index 9f1fa24..0000000 Binary files a/plugins/plugins/access_output/libaccess_output_livehttp_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access_output/libaccess_output_shout_plugin.dll b/plugins/plugins/access_output/libaccess_output_shout_plugin.dll deleted file mode 100644 index c890304..0000000 Binary files a/plugins/plugins/access_output/libaccess_output_shout_plugin.dll and /dev/null differ diff --git a/plugins/plugins/access_output/libaccess_output_udp_plugin.dll b/plugins/plugins/access_output/libaccess_output_udp_plugin.dll deleted file mode 100644 index 57f2c38..0000000 Binary files a/plugins/plugins/access_output/libaccess_output_udp_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/liba52tofloat32_plugin.dll b/plugins/plugins/audio_filter/liba52tofloat32_plugin.dll deleted file mode 100644 index a056814..0000000 Binary files a/plugins/plugins/audio_filter/liba52tofloat32_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/liba52tospdif_plugin.dll b/plugins/plugins/audio_filter/liba52tospdif_plugin.dll deleted file mode 100644 index 1009f6c..0000000 Binary files a/plugins/plugins/audio_filter/liba52tospdif_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libaudio_format_plugin.dll b/plugins/plugins/audio_filter/libaudio_format_plugin.dll deleted file mode 100644 index 45778b6..0000000 Binary files a/plugins/plugins/audio_filter/libaudio_format_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libaudiobargraph_a_plugin.dll b/plugins/plugins/audio_filter/libaudiobargraph_a_plugin.dll deleted file mode 100644 index 9ec9f2b..0000000 Binary files a/plugins/plugins/audio_filter/libaudiobargraph_a_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libchorus_flanger_plugin.dll b/plugins/plugins/audio_filter/libchorus_flanger_plugin.dll deleted file mode 100644 index fe5601e..0000000 Binary files a/plugins/plugins/audio_filter/libchorus_flanger_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libcompressor_plugin.dll b/plugins/plugins/audio_filter/libcompressor_plugin.dll deleted file mode 100644 index dc50d8c..0000000 Binary files a/plugins/plugins/audio_filter/libcompressor_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libdolby_surround_decoder_plugin.dll b/plugins/plugins/audio_filter/libdolby_surround_decoder_plugin.dll deleted file mode 100644 index b8fdd8a..0000000 Binary files a/plugins/plugins/audio_filter/libdolby_surround_decoder_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libdtstofloat32_plugin.dll b/plugins/plugins/audio_filter/libdtstofloat32_plugin.dll deleted file mode 100644 index 476fa8f..0000000 Binary files a/plugins/plugins/audio_filter/libdtstofloat32_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libdtstospdif_plugin.dll b/plugins/plugins/audio_filter/libdtstospdif_plugin.dll deleted file mode 100644 index 3f0b908..0000000 Binary files a/plugins/plugins/audio_filter/libdtstospdif_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libequalizer_plugin.dll b/plugins/plugins/audio_filter/libequalizer_plugin.dll deleted file mode 100644 index e85941e..0000000 Binary files a/plugins/plugins/audio_filter/libequalizer_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libgain_plugin.dll b/plugins/plugins/audio_filter/libgain_plugin.dll deleted file mode 100644 index e068e78..0000000 Binary files a/plugins/plugins/audio_filter/libgain_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libheadphone_channel_mixer_plugin.dll b/plugins/plugins/audio_filter/libheadphone_channel_mixer_plugin.dll deleted file mode 100644 index 44dab97..0000000 Binary files a/plugins/plugins/audio_filter/libheadphone_channel_mixer_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libkaraoke_plugin.dll b/plugins/plugins/audio_filter/libkaraoke_plugin.dll deleted file mode 100644 index a79d370..0000000 Binary files a/plugins/plugins/audio_filter/libkaraoke_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libmono_plugin.dll b/plugins/plugins/audio_filter/libmono_plugin.dll deleted file mode 100644 index 0c25a75..0000000 Binary files a/plugins/plugins/audio_filter/libmono_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libmpgatofixed32_plugin.dll b/plugins/plugins/audio_filter/libmpgatofixed32_plugin.dll deleted file mode 100644 index 141fc19..0000000 Binary files a/plugins/plugins/audio_filter/libmpgatofixed32_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libnormvol_plugin.dll b/plugins/plugins/audio_filter/libnormvol_plugin.dll deleted file mode 100644 index 23cdf21..0000000 Binary files a/plugins/plugins/audio_filter/libnormvol_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libparam_eq_plugin.dll b/plugins/plugins/audio_filter/libparam_eq_plugin.dll deleted file mode 100644 index 78adea3..0000000 Binary files a/plugins/plugins/audio_filter/libparam_eq_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libremap_plugin.dll b/plugins/plugins/audio_filter/libremap_plugin.dll deleted file mode 100644 index 1bd6262..0000000 Binary files a/plugins/plugins/audio_filter/libremap_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libsamplerate_plugin.dll b/plugins/plugins/audio_filter/libsamplerate_plugin.dll deleted file mode 100644 index fc02252..0000000 Binary files a/plugins/plugins/audio_filter/libsamplerate_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libscaletempo_plugin.dll b/plugins/plugins/audio_filter/libscaletempo_plugin.dll deleted file mode 100644 index b7e9c86..0000000 Binary files a/plugins/plugins/audio_filter/libscaletempo_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libsimple_channel_mixer_plugin.dll b/plugins/plugins/audio_filter/libsimple_channel_mixer_plugin.dll deleted file mode 100644 index 9e9b106..0000000 Binary files a/plugins/plugins/audio_filter/libsimple_channel_mixer_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libspatializer_plugin.dll b/plugins/plugins/audio_filter/libspatializer_plugin.dll deleted file mode 100644 index 4edaf3c..0000000 Binary files a/plugins/plugins/audio_filter/libspatializer_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libspeex_resampler_plugin.dll b/plugins/plugins/audio_filter/libspeex_resampler_plugin.dll deleted file mode 100644 index eff89b1..0000000 Binary files a/plugins/plugins/audio_filter/libspeex_resampler_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libstereo_widen_plugin.dll b/plugins/plugins/audio_filter/libstereo_widen_plugin.dll deleted file mode 100644 index 89821a0..0000000 Binary files a/plugins/plugins/audio_filter/libstereo_widen_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libtrivial_channel_mixer_plugin.dll b/plugins/plugins/audio_filter/libtrivial_channel_mixer_plugin.dll deleted file mode 100644 index c9c3d00..0000000 Binary files a/plugins/plugins/audio_filter/libtrivial_channel_mixer_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_filter/libugly_resampler_plugin.dll b/plugins/plugins/audio_filter/libugly_resampler_plugin.dll deleted file mode 100644 index b7be19e..0000000 Binary files a/plugins/plugins/audio_filter/libugly_resampler_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_mixer/libfloat_mixer_plugin.dll b/plugins/plugins/audio_mixer/libfloat_mixer_plugin.dll deleted file mode 100644 index 3749556..0000000 Binary files a/plugins/plugins/audio_mixer/libfloat_mixer_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_mixer/libinteger_mixer_plugin.dll b/plugins/plugins/audio_mixer/libinteger_mixer_plugin.dll deleted file mode 100644 index 1eff839..0000000 Binary files a/plugins/plugins/audio_mixer/libinteger_mixer_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_output/libadummy_plugin.dll b/plugins/plugins/audio_output/libadummy_plugin.dll deleted file mode 100644 index d9dd7a1..0000000 Binary files a/plugins/plugins/audio_output/libadummy_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_output/libafile_plugin.dll b/plugins/plugins/audio_output/libafile_plugin.dll deleted file mode 100644 index 971944d..0000000 Binary files a/plugins/plugins/audio_output/libafile_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_output/libamem_plugin.dll b/plugins/plugins/audio_output/libamem_plugin.dll deleted file mode 100644 index 1ddd0b9..0000000 Binary files a/plugins/plugins/audio_output/libamem_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_output/libdirectsound_plugin.dll b/plugins/plugins/audio_output/libdirectsound_plugin.dll deleted file mode 100644 index a335368..0000000 Binary files a/plugins/plugins/audio_output/libdirectsound_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_output/libmmdevice_plugin.dll b/plugins/plugins/audio_output/libmmdevice_plugin.dll deleted file mode 100644 index d35bc90..0000000 Binary files a/plugins/plugins/audio_output/libmmdevice_plugin.dll and /dev/null differ diff --git a/plugins/plugins/audio_output/libwaveout_plugin.dll b/plugins/plugins/audio_output/libwaveout_plugin.dll deleted file mode 100644 index 5cddc0a..0000000 Binary files a/plugins/plugins/audio_output/libwaveout_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/liba52_plugin.dll b/plugins/plugins/codec/liba52_plugin.dll deleted file mode 100644 index bc9f610..0000000 Binary files a/plugins/plugins/codec/liba52_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libadpcm_plugin.dll b/plugins/plugins/codec/libadpcm_plugin.dll deleted file mode 100644 index 9e0cc30..0000000 Binary files a/plugins/plugins/codec/libadpcm_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libaes3_plugin.dll b/plugins/plugins/codec/libaes3_plugin.dll deleted file mode 100644 index 82265c6..0000000 Binary files a/plugins/plugins/codec/libaes3_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libaraw_plugin.dll b/plugins/plugins/codec/libaraw_plugin.dll deleted file mode 100644 index 07ef69f..0000000 Binary files a/plugins/plugins/codec/libaraw_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libavcodec_plugin.dll b/plugins/plugins/codec/libavcodec_plugin.dll deleted file mode 100644 index fde848d..0000000 Binary files a/plugins/plugins/codec/libavcodec_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libcc_plugin.dll b/plugins/plugins/codec/libcc_plugin.dll deleted file mode 100644 index 3bb59de..0000000 Binary files a/plugins/plugins/codec/libcc_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libcdg_plugin.dll b/plugins/plugins/codec/libcdg_plugin.dll deleted file mode 100644 index a304873..0000000 Binary files a/plugins/plugins/codec/libcdg_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libcrystalhd_plugin.dll b/plugins/plugins/codec/libcrystalhd_plugin.dll deleted file mode 100644 index a47a487..0000000 Binary files a/plugins/plugins/codec/libcrystalhd_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libcvdsub_plugin.dll b/plugins/plugins/codec/libcvdsub_plugin.dll deleted file mode 100644 index 969773b..0000000 Binary files a/plugins/plugins/codec/libcvdsub_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libddummy_plugin.dll b/plugins/plugins/codec/libddummy_plugin.dll deleted file mode 100644 index 23e190c..0000000 Binary files a/plugins/plugins/codec/libddummy_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libdmo_plugin.dll b/plugins/plugins/codec/libdmo_plugin.dll deleted file mode 100644 index b32c0e3..0000000 Binary files a/plugins/plugins/codec/libdmo_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libdts_plugin.dll b/plugins/plugins/codec/libdts_plugin.dll deleted file mode 100644 index 57c7d21..0000000 Binary files a/plugins/plugins/codec/libdts_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libdvbsub_plugin.dll b/plugins/plugins/codec/libdvbsub_plugin.dll deleted file mode 100644 index 53d2ab8..0000000 Binary files a/plugins/plugins/codec/libdvbsub_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libdxva2_plugin.dll b/plugins/plugins/codec/libdxva2_plugin.dll deleted file mode 100644 index 646eba2..0000000 Binary files a/plugins/plugins/codec/libdxva2_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libedummy_plugin.dll b/plugins/plugins/codec/libedummy_plugin.dll deleted file mode 100644 index 15b033a..0000000 Binary files a/plugins/plugins/codec/libedummy_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libfaad_plugin.dll b/plugins/plugins/codec/libfaad_plugin.dll deleted file mode 100644 index be7d50a..0000000 Binary files a/plugins/plugins/codec/libfaad_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libflac_plugin.dll b/plugins/plugins/codec/libflac_plugin.dll deleted file mode 100644 index 7194f5e..0000000 Binary files a/plugins/plugins/codec/libflac_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libg711_plugin.dll b/plugins/plugins/codec/libg711_plugin.dll deleted file mode 100644 index f8ade17..0000000 Binary files a/plugins/plugins/codec/libg711_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libkate_plugin.dll b/plugins/plugins/codec/libkate_plugin.dll deleted file mode 100644 index e2c4d13..0000000 Binary files a/plugins/plugins/codec/libkate_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/liblibass_plugin.dll b/plugins/plugins/codec/liblibass_plugin.dll deleted file mode 100644 index 3de46ce..0000000 Binary files a/plugins/plugins/codec/liblibass_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/liblibmpeg2_plugin.dll b/plugins/plugins/codec/liblibmpeg2_plugin.dll deleted file mode 100644 index 2972d43..0000000 Binary files a/plugins/plugins/codec/liblibmpeg2_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/liblpcm_plugin.dll b/plugins/plugins/codec/liblpcm_plugin.dll deleted file mode 100644 index 088c33b..0000000 Binary files a/plugins/plugins/codec/liblpcm_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libmpeg_audio_plugin.dll b/plugins/plugins/codec/libmpeg_audio_plugin.dll deleted file mode 100644 index b57545a..0000000 Binary files a/plugins/plugins/codec/libmpeg_audio_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libopus_plugin.dll b/plugins/plugins/codec/libopus_plugin.dll deleted file mode 100644 index 6e4f2f1..0000000 Binary files a/plugins/plugins/codec/libopus_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libpng_plugin.dll b/plugins/plugins/codec/libpng_plugin.dll deleted file mode 100644 index ef41bff..0000000 Binary files a/plugins/plugins/codec/libpng_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libquicktime_plugin.dll b/plugins/plugins/codec/libquicktime_plugin.dll deleted file mode 100644 index 3210d30..0000000 Binary files a/plugins/plugins/codec/libquicktime_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/librawvideo_plugin.dll b/plugins/plugins/codec/librawvideo_plugin.dll deleted file mode 100644 index a89428a..0000000 Binary files a/plugins/plugins/codec/librawvideo_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libschroedinger_plugin.dll b/plugins/plugins/codec/libschroedinger_plugin.dll deleted file mode 100644 index d6abd7b..0000000 Binary files a/plugins/plugins/codec/libschroedinger_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libscte27_plugin.dll b/plugins/plugins/codec/libscte27_plugin.dll deleted file mode 100644 index 3c4ece2..0000000 Binary files a/plugins/plugins/codec/libscte27_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libspeex_plugin.dll b/plugins/plugins/codec/libspeex_plugin.dll deleted file mode 100644 index db18766..0000000 Binary files a/plugins/plugins/codec/libspeex_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libspudec_plugin.dll b/plugins/plugins/codec/libspudec_plugin.dll deleted file mode 100644 index a787d11..0000000 Binary files a/plugins/plugins/codec/libspudec_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libstl_plugin.dll b/plugins/plugins/codec/libstl_plugin.dll deleted file mode 100644 index 9f835c7..0000000 Binary files a/plugins/plugins/codec/libstl_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libsubsdec_plugin.dll b/plugins/plugins/codec/libsubsdec_plugin.dll deleted file mode 100644 index bc4be7e..0000000 Binary files a/plugins/plugins/codec/libsubsdec_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libsubsusf_plugin.dll b/plugins/plugins/codec/libsubsusf_plugin.dll deleted file mode 100644 index 37f4336..0000000 Binary files a/plugins/plugins/codec/libsubsusf_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libsvcdsub_plugin.dll b/plugins/plugins/codec/libsvcdsub_plugin.dll deleted file mode 100644 index 7f52308..0000000 Binary files a/plugins/plugins/codec/libsvcdsub_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libt140_plugin.dll b/plugins/plugins/codec/libt140_plugin.dll deleted file mode 100644 index b788248..0000000 Binary files a/plugins/plugins/codec/libt140_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libtheora_plugin.dll b/plugins/plugins/codec/libtheora_plugin.dll deleted file mode 100644 index cb0ce2e..0000000 Binary files a/plugins/plugins/codec/libtheora_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libtwolame_plugin.dll b/plugins/plugins/codec/libtwolame_plugin.dll deleted file mode 100644 index adaa1e8..0000000 Binary files a/plugins/plugins/codec/libtwolame_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libuleaddvaudio_plugin.dll b/plugins/plugins/codec/libuleaddvaudio_plugin.dll deleted file mode 100644 index 563c55a..0000000 Binary files a/plugins/plugins/codec/libuleaddvaudio_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libvorbis_plugin.dll b/plugins/plugins/codec/libvorbis_plugin.dll deleted file mode 100644 index 4f8de34..0000000 Binary files a/plugins/plugins/codec/libvorbis_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libx264_plugin.dll b/plugins/plugins/codec/libx264_plugin.dll deleted file mode 100644 index 259a630..0000000 Binary files a/plugins/plugins/codec/libx264_plugin.dll and /dev/null differ diff --git a/plugins/plugins/codec/libzvbi_plugin.dll b/plugins/plugins/codec/libzvbi_plugin.dll deleted file mode 100644 index 7f55511..0000000 Binary files a/plugins/plugins/codec/libzvbi_plugin.dll and /dev/null differ diff --git a/plugins/plugins/plugins.dat b/plugins/plugins/plugins.dat deleted file mode 100644 index 13d198e..0000000 Binary files a/plugins/plugins/plugins.dat and /dev/null differ diff --git a/plugins/plugins/video_chroma/libgrey_yuv_plugin.dll b/plugins/plugins/video_chroma/libgrey_yuv_plugin.dll deleted file mode 100644 index 6c6b85f..0000000 Binary files a/plugins/plugins/video_chroma/libgrey_yuv_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_chroma/libi420_rgb_plugin.dll b/plugins/plugins/video_chroma/libi420_rgb_plugin.dll deleted file mode 100644 index b65000c..0000000 Binary files a/plugins/plugins/video_chroma/libi420_rgb_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_chroma/libi420_yuy2_plugin.dll b/plugins/plugins/video_chroma/libi420_yuy2_plugin.dll deleted file mode 100644 index 5606f6b..0000000 Binary files a/plugins/plugins/video_chroma/libi420_yuy2_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_chroma/libi422_i420_plugin.dll b/plugins/plugins/video_chroma/libi422_i420_plugin.dll deleted file mode 100644 index 59d0967..0000000 Binary files a/plugins/plugins/video_chroma/libi422_i420_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_chroma/libi422_yuy2_plugin.dll b/plugins/plugins/video_chroma/libi422_yuy2_plugin.dll deleted file mode 100644 index c5b905b..0000000 Binary files a/plugins/plugins/video_chroma/libi422_yuy2_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_chroma/librv32_plugin.dll b/plugins/plugins/video_chroma/librv32_plugin.dll deleted file mode 100644 index 2e29a08..0000000 Binary files a/plugins/plugins/video_chroma/librv32_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_chroma/libyuy2_i420_plugin.dll b/plugins/plugins/video_chroma/libyuy2_i420_plugin.dll deleted file mode 100644 index cb9eb53..0000000 Binary files a/plugins/plugins/video_chroma/libyuy2_i420_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_chroma/libyuy2_i422_plugin.dll b/plugins/plugins/video_chroma/libyuy2_i422_plugin.dll deleted file mode 100644 index 96bc3c4..0000000 Binary files a/plugins/plugins/video_chroma/libyuy2_i422_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libadjust_plugin.dll b/plugins/plugins/video_filter/libadjust_plugin.dll deleted file mode 100644 index 97a0b05..0000000 Binary files a/plugins/plugins/video_filter/libadjust_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libalphamask_plugin.dll b/plugins/plugins/video_filter/libalphamask_plugin.dll deleted file mode 100644 index 34b9efc..0000000 Binary files a/plugins/plugins/video_filter/libalphamask_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libanaglyph_plugin.dll b/plugins/plugins/video_filter/libanaglyph_plugin.dll deleted file mode 100644 index 2177ec0..0000000 Binary files a/plugins/plugins/video_filter/libanaglyph_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libantiflicker_plugin.dll b/plugins/plugins/video_filter/libantiflicker_plugin.dll deleted file mode 100644 index d4fcf7c..0000000 Binary files a/plugins/plugins/video_filter/libantiflicker_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libatmo_plugin.dll b/plugins/plugins/video_filter/libatmo_plugin.dll deleted file mode 100644 index 1cc9175..0000000 Binary files a/plugins/plugins/video_filter/libatmo_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libaudiobargraph_v_plugin.dll b/plugins/plugins/video_filter/libaudiobargraph_v_plugin.dll deleted file mode 100644 index 29cedc6..0000000 Binary files a/plugins/plugins/video_filter/libaudiobargraph_v_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libball_plugin.dll b/plugins/plugins/video_filter/libball_plugin.dll deleted file mode 100644 index 249b837..0000000 Binary files a/plugins/plugins/video_filter/libball_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libblend_plugin.dll b/plugins/plugins/video_filter/libblend_plugin.dll deleted file mode 100644 index b79b65e..0000000 Binary files a/plugins/plugins/video_filter/libblend_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libblendbench_plugin.dll b/plugins/plugins/video_filter/libblendbench_plugin.dll deleted file mode 100644 index a9b0be4..0000000 Binary files a/plugins/plugins/video_filter/libblendbench_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libbluescreen_plugin.dll b/plugins/plugins/video_filter/libbluescreen_plugin.dll deleted file mode 100644 index c7197ff..0000000 Binary files a/plugins/plugins/video_filter/libbluescreen_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libcanvas_plugin.dll b/plugins/plugins/video_filter/libcanvas_plugin.dll deleted file mode 100644 index 417001b..0000000 Binary files a/plugins/plugins/video_filter/libcanvas_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libchain_plugin.dll b/plugins/plugins/video_filter/libchain_plugin.dll deleted file mode 100644 index e3adfaa..0000000 Binary files a/plugins/plugins/video_filter/libchain_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libclone_plugin.dll b/plugins/plugins/video_filter/libclone_plugin.dll deleted file mode 100644 index fdc9ce7..0000000 Binary files a/plugins/plugins/video_filter/libclone_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libcolorthres_plugin.dll b/plugins/plugins/video_filter/libcolorthres_plugin.dll deleted file mode 100644 index de0e2d6..0000000 Binary files a/plugins/plugins/video_filter/libcolorthres_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libcroppadd_plugin.dll b/plugins/plugins/video_filter/libcroppadd_plugin.dll deleted file mode 100644 index b8ade70..0000000 Binary files a/plugins/plugins/video_filter/libcroppadd_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libdeinterlace_plugin.dll b/plugins/plugins/video_filter/libdeinterlace_plugin.dll deleted file mode 100644 index 9d5aa0a..0000000 Binary files a/plugins/plugins/video_filter/libdeinterlace_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/liberase_plugin.dll b/plugins/plugins/video_filter/liberase_plugin.dll deleted file mode 100644 index 2d72f69..0000000 Binary files a/plugins/plugins/video_filter/liberase_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libextract_plugin.dll b/plugins/plugins/video_filter/libextract_plugin.dll deleted file mode 100644 index 282e3ae..0000000 Binary files a/plugins/plugins/video_filter/libextract_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libgaussianblur_plugin.dll b/plugins/plugins/video_filter/libgaussianblur_plugin.dll deleted file mode 100644 index 5eeec2b..0000000 Binary files a/plugins/plugins/video_filter/libgaussianblur_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libgradfun_plugin.dll b/plugins/plugins/video_filter/libgradfun_plugin.dll deleted file mode 100644 index 8bc7b5d..0000000 Binary files a/plugins/plugins/video_filter/libgradfun_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libgradient_plugin.dll b/plugins/plugins/video_filter/libgradient_plugin.dll deleted file mode 100644 index eea4fdc..0000000 Binary files a/plugins/plugins/video_filter/libgradient_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libgrain_plugin.dll b/plugins/plugins/video_filter/libgrain_plugin.dll deleted file mode 100644 index efa7540..0000000 Binary files a/plugins/plugins/video_filter/libgrain_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libhqdn3d_plugin.dll b/plugins/plugins/video_filter/libhqdn3d_plugin.dll deleted file mode 100644 index 087e013..0000000 Binary files a/plugins/plugins/video_filter/libhqdn3d_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libinvert_plugin.dll b/plugins/plugins/video_filter/libinvert_plugin.dll deleted file mode 100644 index e0c4497..0000000 Binary files a/plugins/plugins/video_filter/libinvert_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/liblogo_plugin.dll b/plugins/plugins/video_filter/liblogo_plugin.dll deleted file mode 100644 index 1744044..0000000 Binary files a/plugins/plugins/video_filter/liblogo_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libmagnify_plugin.dll b/plugins/plugins/video_filter/libmagnify_plugin.dll deleted file mode 100644 index 6154c98..0000000 Binary files a/plugins/plugins/video_filter/libmagnify_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libmarq_plugin.dll b/plugins/plugins/video_filter/libmarq_plugin.dll deleted file mode 100644 index 0fbaa71..0000000 Binary files a/plugins/plugins/video_filter/libmarq_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libmirror_plugin.dll b/plugins/plugins/video_filter/libmirror_plugin.dll deleted file mode 100644 index 9569df9..0000000 Binary files a/plugins/plugins/video_filter/libmirror_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libmosaic_plugin.dll b/plugins/plugins/video_filter/libmosaic_plugin.dll deleted file mode 100644 index e57fe47..0000000 Binary files a/plugins/plugins/video_filter/libmosaic_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libmotionblur_plugin.dll b/plugins/plugins/video_filter/libmotionblur_plugin.dll deleted file mode 100644 index 8fa5582..0000000 Binary files a/plugins/plugins/video_filter/libmotionblur_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libmotiondetect_plugin.dll b/plugins/plugins/video_filter/libmotiondetect_plugin.dll deleted file mode 100644 index e0ba02c..0000000 Binary files a/plugins/plugins/video_filter/libmotiondetect_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libpanoramix_plugin.dll b/plugins/plugins/video_filter/libpanoramix_plugin.dll deleted file mode 100644 index 7f5ffc0..0000000 Binary files a/plugins/plugins/video_filter/libpanoramix_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libposterize_plugin.dll b/plugins/plugins/video_filter/libposterize_plugin.dll deleted file mode 100644 index e65acab..0000000 Binary files a/plugins/plugins/video_filter/libposterize_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libpostproc_plugin.dll b/plugins/plugins/video_filter/libpostproc_plugin.dll deleted file mode 100644 index fb23462..0000000 Binary files a/plugins/plugins/video_filter/libpostproc_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libpsychedelic_plugin.dll b/plugins/plugins/video_filter/libpsychedelic_plugin.dll deleted file mode 100644 index 7c6c97b..0000000 Binary files a/plugins/plugins/video_filter/libpsychedelic_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libpuzzle_plugin.dll b/plugins/plugins/video_filter/libpuzzle_plugin.dll deleted file mode 100644 index b469907..0000000 Binary files a/plugins/plugins/video_filter/libpuzzle_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libremoteosd_plugin.dll b/plugins/plugins/video_filter/libremoteosd_plugin.dll deleted file mode 100644 index 7434a0d..0000000 Binary files a/plugins/plugins/video_filter/libremoteosd_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libripple_plugin.dll b/plugins/plugins/video_filter/libripple_plugin.dll deleted file mode 100644 index 214717e..0000000 Binary files a/plugins/plugins/video_filter/libripple_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/librotate_plugin.dll b/plugins/plugins/video_filter/librotate_plugin.dll deleted file mode 100644 index fa75aae..0000000 Binary files a/plugins/plugins/video_filter/librotate_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/librss_plugin.dll b/plugins/plugins/video_filter/librss_plugin.dll deleted file mode 100644 index 48f1398..0000000 Binary files a/plugins/plugins/video_filter/librss_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libscale_plugin.dll b/plugins/plugins/video_filter/libscale_plugin.dll deleted file mode 100644 index e5644c1..0000000 Binary files a/plugins/plugins/video_filter/libscale_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libscene_plugin.dll b/plugins/plugins/video_filter/libscene_plugin.dll deleted file mode 100644 index c97416d..0000000 Binary files a/plugins/plugins/video_filter/libscene_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libsepia_plugin.dll b/plugins/plugins/video_filter/libsepia_plugin.dll deleted file mode 100644 index 1e38bb6..0000000 Binary files a/plugins/plugins/video_filter/libsepia_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libsharpen_plugin.dll b/plugins/plugins/video_filter/libsharpen_plugin.dll deleted file mode 100644 index 464cd51..0000000 Binary files a/plugins/plugins/video_filter/libsharpen_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libsubsdelay_plugin.dll b/plugins/plugins/video_filter/libsubsdelay_plugin.dll deleted file mode 100644 index e53ba81..0000000 Binary files a/plugins/plugins/video_filter/libsubsdelay_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libswscale_plugin.dll b/plugins/plugins/video_filter/libswscale_plugin.dll deleted file mode 100644 index 43c0f22..0000000 Binary files a/plugins/plugins/video_filter/libswscale_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libtransform_plugin.dll b/plugins/plugins/video_filter/libtransform_plugin.dll deleted file mode 100644 index 1fb5aa2..0000000 Binary files a/plugins/plugins/video_filter/libtransform_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libwall_plugin.dll b/plugins/plugins/video_filter/libwall_plugin.dll deleted file mode 100644 index 7a7ecf1..0000000 Binary files a/plugins/plugins/video_filter/libwall_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libwave_plugin.dll b/plugins/plugins/video_filter/libwave_plugin.dll deleted file mode 100644 index 0579156..0000000 Binary files a/plugins/plugins/video_filter/libwave_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_filter/libyuvp_plugin.dll b/plugins/plugins/video_filter/libyuvp_plugin.dll deleted file mode 100644 index 0ddf564..0000000 Binary files a/plugins/plugins/video_filter/libyuvp_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libcaca_plugin.dll b/plugins/plugins/video_output/libcaca_plugin.dll deleted file mode 100644 index 852f892..0000000 Binary files a/plugins/plugins/video_output/libcaca_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libdirect2d_plugin.dll b/plugins/plugins/video_output/libdirect2d_plugin.dll deleted file mode 100644 index 72774e2..0000000 Binary files a/plugins/plugins/video_output/libdirect2d_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libdirect3d_plugin.dll b/plugins/plugins/video_output/libdirect3d_plugin.dll deleted file mode 100644 index b96698f..0000000 Binary files a/plugins/plugins/video_output/libdirect3d_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libdirectdraw_plugin.dll b/plugins/plugins/video_output/libdirectdraw_plugin.dll deleted file mode 100644 index 0f0c5bd..0000000 Binary files a/plugins/plugins/video_output/libdirectdraw_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libdrawable_plugin.dll b/plugins/plugins/video_output/libdrawable_plugin.dll deleted file mode 100644 index 068113e..0000000 Binary files a/plugins/plugins/video_output/libdrawable_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libglwin32_plugin.dll b/plugins/plugins/video_output/libglwin32_plugin.dll deleted file mode 100644 index e02011a..0000000 Binary files a/plugins/plugins/video_output/libglwin32_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libvdummy_plugin.dll b/plugins/plugins/video_output/libvdummy_plugin.dll deleted file mode 100644 index da2939c..0000000 Binary files a/plugins/plugins/video_output/libvdummy_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libvmem_plugin.dll b/plugins/plugins/video_output/libvmem_plugin.dll deleted file mode 100644 index 0e89e62..0000000 Binary files a/plugins/plugins/video_output/libvmem_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libwingdi_plugin.dll b/plugins/plugins/video_output/libwingdi_plugin.dll deleted file mode 100644 index ae1664b..0000000 Binary files a/plugins/plugins/video_output/libwingdi_plugin.dll and /dev/null differ diff --git a/plugins/plugins/video_output/libyuv_plugin.dll b/plugins/plugins/video_output/libyuv_plugin.dll deleted file mode 100644 index 2a76fdf..0000000 Binary files a/plugins/plugins/video_output/libyuv_plugin.dll and /dev/null differ diff --git a/source/CharacterSelectSubstate.hx b/source/CharacterSelectSubstate.hx index f7bc7ce..991c373 100644 --- a/source/CharacterSelectSubstate.hx +++ b/source/CharacterSelectSubstate.hx @@ -104,13 +104,16 @@ class CharacterSelectSubstate extends MusicBeatSubstate Paths.setModsDirectoryFromType(NONE, '', true); } + var blockInput:Bool = false; override function update(elapsed:Float) { super.update(elapsed); if (FlxG.sound.music != null) Conductor.songPosition = FlxG.sound.music.time; + if (blockInput) return; if (controls.ACCEPT) { + blockInput = true; Paths.clearUnusedCache(); character.skipDance = true; if (character != null) { @@ -128,6 +131,7 @@ class CharacterSelectSubstate extends MusicBeatSubstate leEpicTween(); } if (controls.BACK) { + blockInput = true; Paths.clearUnusedCache(); character.skipDance = true; FlxG.sound.play(Paths.sound('cancelMenu'), 1); @@ -136,23 +140,28 @@ class CharacterSelectSubstate extends MusicBeatSubstate if (controls.NOTE_DOWN_P) { if(character != null && character.animOffsets.exists('singDOWN')) { character.playAnim('singDOWN', true); + canDance = false; } } if (controls.NOTE_LEFT_P) { if(character != null && character.animOffsets.exists('singLEFT')) { character.playAnim('singLEFT', true); + canDance = false; } } if (controls.NOTE_RIGHT_P) { if(character != null && character.animOffsets.exists('singRIGHT')) { character.playAnim('singRIGHT', true); + canDance = false; } } if (controls.NOTE_UP_P) { if(character != null && character.animOffsets.exists('singUP')) { character.playAnim('singUP', true); + canDance = false; } } + if (controls.NOTE_DOWN_R || controls.NOTE_LEFT_R || controls.NOTE_RIGHT_R || controls.NOTE_UP_R) canDance = true; if (controls.UI_LEFT_P) { changeSelection(-1); } @@ -173,10 +182,11 @@ class CharacterSelectSubstate extends MusicBeatSubstate super.destroy(); } + var canDance = true; override function beatHit() { super.beatHit(); - if (character != null) character.dance(); + if (character != null && canDance) character.dance(); } var dummyTween:FlxTween = null; @@ -234,10 +244,7 @@ class CharacterSelectSubstate extends MusicBeatSubstate Paths.setModsDirectoryFromType(NONE, '', true); } - var alreadyDoingExit:Bool = false; function leEpicTween() { - if (alreadyDoingExit) return; - alreadyDoingExit = true; FlxTween.tween(bg, {alpha: 0}, 0.7, { onComplete: function(_) { bg.kill(); @@ -253,6 +260,6 @@ class CharacterSelectSubstate extends MusicBeatSubstate } }); } - new FlxTimer().start(0.75, function(_){ close(); }); + new FlxTimer().start(0.75, _ -> close()); } } \ No newline at end of file diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 871892d..fc2b198 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -72,7 +72,7 @@ class FreeplayState extends MusicBeatState override function create() { Paths.clearUnusedCache(); - Paths.refreshModsMaps(); + Paths.refreshModsMaps(false, true, true); instance = this; persistentUpdate = true; diff --git a/source/FunkinLua.hx b/source/FunkinLua.hx index 69a528b..afbd9dd 100644 --- a/source/FunkinLua.hx +++ b/source/FunkinLua.hx @@ -1318,10 +1318,7 @@ class FunkinLua { } else if(PlayState.instance.members.indexOf(PlayState.instance.dadGroup) < position) { position = PlayState.instance.members.indexOf(PlayState.instance.dadGroup); } - if (PlayState.instance.addedCharaGroups) - PlayState.instance.insert(position, sprite); - else - getInstance().add(sprite); + PlayState.instance.insert(position, sprite); } } sprite.wasAdded = true; diff --git a/source/GameplayChangersSubstate.hx b/source/GameplayChangersSubstate.hx index 1a1e874..60bec7b 100644 --- a/source/GameplayChangersSubstate.hx +++ b/source/GameplayChangersSubstate.hx @@ -30,6 +30,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate option.scrollSpeed = 2.0; option.minValue = 0.35; option.changeValue = 0.05; + option.slowChangeValue = 0.01; option.decimals = 2; if (goption.getValue() != "constant") { @@ -39,13 +40,14 @@ class GameplayChangersSubstate extends MusicBeatSubstate else { option.displayFormat = "%v"; - option.maxValue = 6; + option.maxValue = 10; } optionsArray.push(option); var option:GameplayOption = new GameplayOption('Playback Rate', 'songspeed', 'float', 1); option.scrollSpeed = 2; option.changeValue = 0.25; + option.slowChangeValue = 0.05; option.minValue = 0.1; option.maxValue = 10; //peeps wanted 10x speed option.displayFormat = '%vX'; @@ -57,6 +59,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate option.minValue = 0; option.maxValue = 5; option.changeValue = 0.1; + option.slowChangeValue = 0.1; option.displayFormat = '%vX'; optionsArray.push(option); @@ -65,6 +68,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate option.minValue = 0.5; option.maxValue = 5; option.changeValue = 0.1; + option.slowChangeValue = 0.1; option.displayFormat = '%vX'; optionsArray.push(option); @@ -249,7 +253,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate if(pressed) { var add:Dynamic = null; if(curOption.type != 'string') { - add = controls.UI_LEFT ? -curOption.changeValue : curOption.changeValue; + add = (controls.UI_LEFT ? (FlxG.keys.pressed.CONTROL ? -curOption.slowChangeValue : -curOption.changeValue) : (FlxG.keys.pressed.CONTROL ? curOption.slowChangeValue : curOption.changeValue)); } switch(curOption.type) @@ -292,7 +296,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate if (curOption.getValue() == "constant") { oOption.displayFormat = "%v"; - oOption.maxValue = 6; + oOption.maxValue = 10; } else { @@ -471,6 +475,7 @@ class GameplayOption public var curOption:Int = 0; //Don't change this public var options:Array = null; //Only used in string type public var changeValue:Dynamic = 1; //Only used in int/float/percent type, how much is changed when you PRESS + public var slowChangeValue:Dynamic = 1; public var minValue:Dynamic = null; //Only used in int/float/percent type public var maxValue:Dynamic = null; //Only used in int/float/percent type public var decimals:Int = 1; //Only used in float/percent type @@ -518,6 +523,7 @@ class GameplayOption case 'percent': displayFormat = '%v%'; + slowChangeValue = 0.01; changeValue = 0.01; minValue = 0; maxValue = 1; diff --git a/source/InitState.hx b/source/InitState.hx index 6cb750d..55aa942 100644 --- a/source/InitState.hx +++ b/source/InitState.hx @@ -76,7 +76,7 @@ class InitState extends FlxState //why does the fps shit fail to work Main.toggleFPS(ClientPrefs.settings.get("showFPS")); - Paths.refreshModsMaps(); + Paths.refreshModsMaps(true, true, true); #if HSCRIPT_ALLOWED final foldersToCheck:Array = ["classes", "states", "substates"]; @@ -109,7 +109,7 @@ class InitState extends FlxState parseClasses(["classes"], [H_CLASS]);*/ //Reparse classes with hInit on to do any stuff that needs to be done after all classes have been parsed once!! #end - #if HSCRIPT_ALLOWED + #if (HSCRIPT_ALLOWED && HSCRIPT_DEBUG) trace(InitState.scriptStaticVars); #end } diff --git a/source/Main.hx b/source/Main.hx index 418a580..e569216 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -60,7 +60,7 @@ class Main extends Sprite * * Use `debugVersion` to get the version with build date. */ - public static final denpaEngineVersion:GameVersion = new GameVersion(0, 8, 0, 'c'); + public static final denpaEngineVersion:GameVersion = new GameVersion(0, 8, 0, 'd'); public static var fpsCounter:FramerateDisplay; public static var ramCount:DebugDisplay; diff --git a/source/Modcharts.hx b/source/Modcharts.hx index 7214a57..b4ddc2f 100644 --- a/source/Modcharts.hx +++ b/source/Modcharts.hx @@ -3,11 +3,10 @@ package; import haxescript.Hscript; class Modcharts { - public var hscript:Hscript; public var strum:Int; public function new(name:String = 'none', strumNum:Int = 0) { - if (name != 'none' && strumNum < 2) + if (strumNum > 1 || (name != 'none' && strumNum < 2)) hscript = new Hscript(Paths.hscript('scripts/modcharts/$name'), true); this.strum = strumNum; if (hscript == null) return; @@ -21,7 +20,7 @@ class Modcharts { hscript.stop(); hscript = null; } - if (newName != 'none' && strum < 2) + if (strum > 1 || (newName != 'none' && strum < 2)) hscript = new Hscript(Paths.hscript('scripts/modcharts/$newName'), true); if (hscript == null) return; PlayState.instance.hscripts.push(hscript); diff --git a/source/Note.hx b/source/Note.hx index ae20bf2..e2bbb57 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -110,6 +110,7 @@ class Note extends FlxSprite public var copyVisible:Bool = true; public var copyScale:Bool = false; public var scaleHackHitbox:Bool = true; + public var spawnTimeMult:Float = 1; public var hitHealth:Float = 0.023; public var missHealth:Float = 0.0475; @@ -156,6 +157,7 @@ class Note extends FlxSprite gfNote = true; case 'Third Strum': strum = 2; + spawnTimeMult = 2; #if MODS_ALLOWED case '' | 'Hey!' | 'Cross Fade' | 'Alt Animation' | 'Normal': //do nothing dumbass @@ -220,28 +222,12 @@ class Note extends FlxSprite updateHitbox(); offsetX -= width / 2; - if (flipY) { - if (!PlayState.isPixelStage) { - //this is harder to get right than it looks - offset.y -= (18 * Note.pixelScales[mania]) * PlayState.instance.songSpeed * (PlayState.instance.songSpeed/3); - } else { - offsetY += (15 * Note.pixelScales[mania]) * PlayState.instance.songSpeed * PlayState.instance.songSpeed; - } - } if (PlayState.isPixelStage) offsetX += 30 * Note.pixelScales[mania]; if (prevNote.isSustainNote) { prevNote.animation.play('${Note.keysShit.get(mania).get('letters')[prevNote.noteData]} hold'); - - if (flipY) { - if (!PlayState.isPixelStage) { - prevNote.offset.y += (18 * Note.pixelScales[mania]) * PlayState.instance.songSpeed * (PlayState.instance.songSpeed/3); - } else { - prevNote.offsetY -= (15 * Note.pixelScales[mania]) * PlayState.instance.songSpeed * PlayState.instance.songSpeed; - } - } prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.05; if(PlayState.instance != null) prevNote.scale.y *= PlayState.instance.songSpeed; @@ -340,16 +326,12 @@ class Note extends FlxSprite { if(isSustainNote) { for (i=>letter in gfxLetter) { - if (i == noteData % Note.ammo[mania]) { - animation.add('$letter hold', [i]); - animation.add('$letter tail', [i + 9]); - } + animation.add('$letter hold', [i]); + animation.add('$letter tail', [i + 9]); } } else { for (i=>letter in gfxLetter) { - if (i == noteData % Note.ammo[mania]) { - animation.add(letter, [i + 9]); - } + animation.add(letter, [i + 9]); } } } @@ -616,10 +598,8 @@ class NoteSplash extends FlxSprite colorSwap.saturation = satColor; colorSwap.brightness = brtColor; - //im not redoing all of these nuh uh - final offsets = [[-25, -15], [-20, -13], [-15, -11], [-22, -15], [-12, -9], [-12, -8], [-12, -8], [-12, -7], [-8, -5]]; - offset.set(offsets[PlayState.mania][0], offsets[PlayState.mania][1]); - if (PlayState.isPixelStage || texture != 'splashes/noteSplashes') offset.set(12,12); + offset.set(-34 * Note.scales[PlayState.mania], -23 * Note.scales[PlayState.mania]); + if (PlayState.isPixelStage || texture != 'splashes/noteSplashes') offset.set(14 / Note.scales[PlayState.mania], 14 / Note.scales[PlayState.mania]); var fps:Int = (texture == 'splashes/pixelSplashes' ? 42 : 24); animation.play('note' + Note.keysShit.get(PlayState.mania).get('pixelAnimIndex')[note] + '${(texture == 'splashes/noteSplashes' ? '-${FlxG.random.int(1,2)}' : '')}', true, false); diff --git a/source/Paths.hx b/source/Paths.hx index e0437a0..b66ab44 100644 --- a/source/Paths.hx +++ b/source/Paths.hx @@ -467,10 +467,21 @@ class Paths } } - public static function refreshModsMaps() { - characterMap.clear(); - iconsMap.clear(); - for (a in FileSystem.readDirectory('mods')) { + static var cachedFolderList:Array = []; + public static function refreshModsMaps(force:Bool = false, includePreload:Bool = false, clear:Bool = false) { + var curFolderList = FileSystem.readDirectory('mods'); + if (!force && curFolderList.toString() == cachedFolderList.toString()) //cant compare arrays directly??? + return; + + cachedFolderList = curFolderList; + + if (clear) { + characterMap.clear(); + iconsMap.clear(); + stageMap.clear(); + } + + for (a in curFolderList) { if (ignoreModFolders.contains(a) || a.contains('.')) continue; if (FileSystem.exists('mods/$a/data/characters')) { for (b in FileSystem.readDirectory('mods/$a/data/characters')) { @@ -491,18 +502,7 @@ class Paths } } } - for (a in FileSystem.readDirectory('assets/data/characters')) { - if (!a.endsWith('.json')) continue; - characterMap.set(a.substr(0, a.length - 5), ''); - } - for (a in FileSystem.readDirectory('assets/images/icons')) { - if (!a.endsWith('.png')) continue; - iconsMap.set(a.substr(0, a.length - 4).replace('icon-', ''), ''); - } - for (a in FileSystem.readDirectory('assets/data/stages')) { - if (!a.endsWith('.json')) continue; - stageMap.set(a.substr(0, a.length - 5), ''); - } + if (FileSystem.exists('mods/data/characters')) { for (a in FileSystem.readDirectory('mods/data/characters')) { if (!a.endsWith('.json')) continue; @@ -521,6 +521,20 @@ class Paths iconsMap.set(a.substr(0, a.length - 4).replace('icon-', ''), ''); } } + + if (!includePreload) return; + for (a in FileSystem.readDirectory('assets/data/characters')) { + if (!a.endsWith('.json')) continue; + characterMap.set(a.substr(0, a.length - 5), ''); + } + for (a in FileSystem.readDirectory('assets/images/icons')) { + if (!a.endsWith('.png')) continue; + iconsMap.set(a.substr(0, a.length - 4).replace('icon-', ''), ''); + } + for (a in FileSystem.readDirectory('assets/data/stages')) { + if (!a.endsWith('.json')) continue; + stageMap.set(a.substr(0, a.length - 5), ''); + } } #end } diff --git a/source/PlayState.hx b/source/PlayState.hx index 07a1082..a2c350d 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -83,7 +83,6 @@ class PlayState extends MusicBeatState public var modchartTexts:Map = new Map(); public var modchartSaves:Map = new Map(); public var modchartBackdrops:Map = new Map(); - public var addedCharaGroups:Bool = false; //json sprites (can be used in lua as well) public var jsonSprites:Map = new Map(); public var jsonSprGrp:FlxTypedGroup; @@ -1001,23 +1000,7 @@ class PlayState extends MusicBeatState gfCrossFade = new FlxTypedGroup(3); grpBFCrossFade = new FlxTypedGroup(4); - // STAGE SCRIPTS - #if (MODS_ALLOWED && LUA_ALLOWED) - var doPush:Bool = false; - var luaFile:String = 'scripts/stages/' + curStage + '.lua'; - if(FileSystem.exists(Paths.modFolders(luaFile))) { - luaFile = Paths.modFolders(luaFile); - doPush = true; - } else { - luaFile = Paths.getPreloadPath(luaFile); - if(FileSystem.exists(luaFile)) { - doPush = true; - } - } - - if(doPush) luaArray.push(new FunkinLua(luaFile)); - #end - + // STAGE SCRIPTS (Hscript) #if HSCRIPT_ALLOWED addHscript('stages/$curStage'); //lol? #end @@ -1045,8 +1028,6 @@ class PlayState extends MusicBeatState add(boyfriendGroup); add(jsonSprGrpFront); - addedCharaGroups = true; - switch(curStage) { case 'school': add(halloweenWhite); case 'tank': add(foregroundSprites); @@ -1112,6 +1093,23 @@ class PlayState extends MusicBeatState } #end + //LUA STAGES + #if (MODS_ALLOWED && LUA_ALLOWED) + var doPush:Bool = false; + var luaFile:String = 'scripts/stages/' + curStage + '.lua'; + if(FileSystem.exists(Paths.modFolders(luaFile))) { + luaFile = Paths.modFolders(luaFile); + doPush = true; + } else { + luaFile = Paths.getPreloadPath(luaFile); + if(FileSystem.exists(luaFile)) { + doPush = true; + } + } + + if(doPush) luaArray.push(new FunkinLua(luaFile)); + #end + //in case of null var gfVersion:String = SONG.assets.gfVersion; if(gfVersion == null || gfVersion.length < 1) { @@ -3357,7 +3355,7 @@ class PlayState extends MusicBeatState { final spawnTime:Float = (1750/songSpeed)/(FlxMath.bound(camHUD.zoom, null, 1)); //spawns within [time] ms (btw this BARELY edges close enough to the screen to not be too far ahead and not spawning on screen) - while (unspawnNotes.length > 0 && unspawnNotes[0].strumTime - Conductor.songPosition < spawnTime) + while (unspawnNotes.length > 0 && unspawnNotes[0].strumTime - Conductor.songPosition < spawnTime * unspawnNotes[0].spawnTimeMult) { var dunceNote:Note = unspawnNotes[0]; //dunceNote.active = false; @@ -3433,7 +3431,7 @@ class PlayState extends MusicBeatState //Jesus fuck this took me so much mother fucking time AAAAAAAAAA if(strumGroup.members[daNote.noteData].downScroll) { - if (daNote.animation.curAnim.name.endsWith('end')) { + if (daNote.animation.curAnim.name.endsWith('tail')) { daNote.y += 10.5 * (fakeCrochet / 400) * 1.5 * songSpeed + (46 * (songSpeed - 1)); daNote.y -= 46 * (1 - (fakeCrochet / 600)) * songSpeed; daNote.y += (isPixelStage ? 8 + (6 - daNote.originalHeightForCalcs) * PlayState.daPixelZoom : -19); @@ -5360,7 +5358,7 @@ class PlayState extends MusicBeatState gf.playAnim('scared', true); var time:Float = 0.15; - if(note.isSustainNote && note.animation.curAnim != null && !note.animation.curAnim.name.endsWith('end')) time += 0.15; + if(note.isSustainNote && note.animation.curAnim != null && !note.animation.curAnim.name.endsWith('tail')) time += 0.15; strumPlayAnim(p4 ? note.strum : 0, Std.int(Math.abs(note.noteData)) % Note.ammo[mania], time); @@ -5504,7 +5502,7 @@ class PlayState extends MusicBeatState if(cpuControlled) { var time:Float = 0.15; - if(note.isSustainNote && !note.animation.curAnim.name.endsWith('end')) time += 0.15; + if(note.isSustainNote && !note.animation.curAnim.name.endsWith('tail')) time += 0.15; strumPlayAnim(1, Std.int(Math.abs(note.noteData)) % Note.ammo[mania], time); } else { diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 8b51c59..d145833 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -52,7 +52,7 @@ class StoryMenuState extends MusicBeatState override function create() { Paths.clearUnusedCache(); - Paths.refreshModsMaps(); + Paths.refreshModsMaps(false, true, true); instance = this; PlayState.isStoryMode = true; diff --git a/source/editors/CharacterEditorState.hx b/source/editors/CharacterEditorState.hx index 7fcb053..5b5667b 100644 --- a/source/editors/CharacterEditorState.hx +++ b/source/editors/CharacterEditorState.hx @@ -111,7 +111,7 @@ class CharacterEditorState extends MusicBeatState override function create() { Paths.clearUnusedCache(); - Paths.refreshModsMaps(); + Paths.refreshModsMaps(false, true, true); if (PlayState.curStage != null && PlayState.curStage != '') currentStage = PlayState.curStage; music = new EditorMusic(); diff --git a/source/editors/ChartingState.hx b/source/editors/ChartingState.hx index 2c7a7e1..b2c2351 100644 --- a/source/editors/ChartingState.hx +++ b/source/editors/ChartingState.hx @@ -301,7 +301,7 @@ class ChartingState extends MusicBeatState { for(listener in mouse_listeners) FlxG.stage.addEventListener(listener, handleMouseInput); Paths.clearUnusedCache(); - Paths.refreshModsMaps(); + Paths.refreshModsMaps(false, true, true); if (PlayState.SONG != null) _song = PlayState.SONG; @@ -804,7 +804,7 @@ class ChartingState extends MusicBeatState { _song.assets.enablePlayer4 = check_enablePlayer4.checked; }; - + var characters:Array = []; for (key in Paths.characterMap.keys()) { characters.push(key); diff --git a/source/haxescript/Hscript.hx b/source/haxescript/Hscript.hx index 553be67..3619309 100644 --- a/source/haxescript/Hscript.hx +++ b/source/haxescript/Hscript.hx @@ -124,7 +124,7 @@ class Hscript try { final rawClass = Type.resolveClass(name); if(rawClass == null) { - trace('failed state switch: $name is not a valid hscript- or base class!'); + #if HSCRIPT_DEBUG trace('failed state switch: $name is not a valid hscript- or base class!'); #end return; } @@ -132,11 +132,11 @@ class Hscript MusicBeatState.switchState(state); } catch(e) { - trace('$e : Unspecified result for opening state "$name", could not switch states!'); + #if HSCRIPT_DEBUG trace('$e : Unspecified result for opening state "$name", could not switch states!'); #end return; } } - trace('switched to state: $name'); + #if HSCRIPT_DEBUG trace('switched to state: $name'); #end }); interpreter.variables.set("openSubState", (name:String, args:Array) -> { @@ -152,7 +152,7 @@ class Hscript try { final rawClass = Type.resolveClass(name); if(rawClass == null) { - trace('failed to open substate: $name is not a valid hscript- or base class!'); + #if HSCRIPT_DEBUG trace('failed to open substate: $name is not a valid hscript- or base class!'); #end return; } //Did a lil oopsie, now it should work fine!! @@ -160,11 +160,11 @@ class Hscript MusicBeatState.curInstance.openSubState(substate); } catch(e) { - trace('$e : Unspecified result for opening substate "$name", could not be opened!'); + #if HSCRIPT_DEBUG trace('$e : Unspecified result for opening substate "$name", could not be opened!'); #end return; } } - trace('Opened substate: $name'); + #if HSCRIPT_DEBUG trace('Opened substate: $name'); #end }); #end @@ -176,7 +176,7 @@ class Hscript try { if (file != 'trace("No script found");') { - trace('Loading hscript of type $parseType: $path'); + #if HSCRIPT_DEBUG trace('Loading hscript of type $parseType: $path'); #end activeScripts.push(this); FlxG.signals.preStateSwitch.add(() -> { activeScripts.remove(this); }); @@ -187,7 +187,7 @@ class Hscript call("onCreate", []); return; } - trace('$path hscript file doesnt exist!! (Loading Error)'); + #if HSCRIPT_DEBUG trace('$path hscript file doesnt exist!! (Loading Error)'); #end } catch(e) { //Truly the variable naming ever, like at least be a little bit concise if (e.toString() == "Null Object Reference") { diff --git a/source/haxescript/HscriptClass.hx b/source/haxescript/HscriptClass.hx index 802787d..b976e7c 100644 --- a/source/haxescript/HscriptClass.hx +++ b/source/haxescript/HscriptClass.hx @@ -72,7 +72,7 @@ class HscriptClass extends ExtendClass { vars: interpRef.trackedVars, funcs: interpRef.trackedFuncs }; - trace(classContainer); + #if HSCRIPT_DEBUG trace(classContainer); #end } //Check post-parse related things for(name=>variable in classContainer.vars) { diff --git a/source/hscript/Interp.hx b/source/hscript/Interp.hx index 98ed32b..8e15f19 100644 --- a/source/hscript/Interp.hx +++ b/source/hscript/Interp.hx @@ -493,7 +493,7 @@ class Interp { switch( Tools.expr(e) ) { case EField(e,f): var obj = expr(e); - trace(e); + #if HSCRIPT_DEBUG trace(e); #end if( obj == null ) error(EInvalidAccess(f)); return fcall(obj,f,args); default: