diff --git a/Project.xml b/Project.xml
index 6b0e4a44..02c206ac 100644
--- a/Project.xml
+++ b/Project.xml
@@ -49,8 +49,10 @@
-
+
+
+
@@ -62,8 +64,7 @@
-
-
+
diff --git a/assets/preload/videos/commercials/boyfriend everywhere.mp4 b/assets/preload/videos/commercials/boyfriend everywhere.mp4
new file mode 100644
index 00000000..31c1aa70
Binary files /dev/null and b/assets/preload/videos/commercials/boyfriend everywhere.mp4 differ
diff --git a/assets/preload/videos/commercials/erectSamplers.mp4 b/assets/preload/videos/commercials/erectSamplers.mp4
deleted file mode 100644
index a808cc88..00000000
Binary files a/assets/preload/videos/commercials/erectSamplers.mp4 and /dev/null differ
diff --git a/assets/preload/videos/commercials/kickstarterTrailer.mp4 b/assets/preload/videos/commercials/kickstarterTrailer.mp4
index 28c69455..1b9cc3e3 100644
Binary files a/assets/preload/videos/commercials/kickstarterTrailer.mp4 and b/assets/preload/videos/commercials/kickstarterTrailer.mp4 differ
diff --git a/source/Paths.hx b/source/Paths.hx
index a9703e4b..22b71a6a 100644
--- a/source/Paths.hx
+++ b/source/Paths.hx
@@ -576,11 +576,7 @@ class Paths
public static function readDirectory(directory:String):Array
{
#if MODS_ALLOWED
- var dirs:Array = [];
- for(dir in FileSystem.readDirectory(directory)){
- dirs.push(directory+"/"+dir);
- }
- return dirs;
+ return FileSystem.readDirectory(directory);
#else
var dirs:Array = [];
for(dir in Assets.list().filter(folder -> folder.startsWith(directory)))
diff --git a/source/mikolka/vslice/freeplay/pslice/BPMCache.hx b/source/mikolka/vslice/freeplay/pslice/BPMCache.hx
index d4738e27..a5b4918b 100644
--- a/source/mikolka/vslice/freeplay/pslice/BPMCache.hx
+++ b/source/mikolka/vslice/freeplay/pslice/BPMCache.hx
@@ -19,11 +19,16 @@ class BPMCache {
return 0;
}
var chartFiles = Paths.readDirectory(sngDataPath);
+ #if MODS_ALLOWED
+ chartFiles = chartFiles.filter(s -> s.toLowerCase().startsWith(fileSngName) && s.endsWith(".json"));
+ var chosenChartToScrap = sngDataPath+"/"+chartFiles[0];
+ #else
var regexSongName = fileSngName.replace("(","\\(").replace(")","\\)");
chartFiles = chartFiles.filter(s -> new EReg('\\/$regexSongName\\/$regexSongName.*\\.json',"").match(s));
- //s.toLowerCase().startsWith(fileSngName) && s.endsWith(".json"));
-
var chosenChartToScrap = chartFiles[0];
+ #end
+
+
if(exists(chosenChartToScrap)){
var bpmFinder = ~/"bpm": *([0-9]+)/g; //TODO fix this regex