v1.1.0 beta 2: electric boogaloo

.gitattributes

@@ -1,6 +1,7 @@
 * text=auto eol=crlf
 
 *.sh text eol=lf
+*.py text eol=lf
 
 LICENSE text eol=lf
 Makefile text eol=lf

.gitignore

@@ -9,16 +9,17 @@ build/*
 
 # Dependencies
 resources/macos/love.app/*
-resources/switch/LOVEPotion.elf
-resources/switch/romfs/*
+resources/switch/love.elf
 resources/win32/love/*
 resources/win64/love/*
 
 # Tools
 tools/funkin-json/*
+tools/funkin-json-sniff/*
 tools/funkin-xml/*
 tools/funkin-xna/*
 
 !tools/funkin-json/funkin-json.py
+!tools/funkin-json-sniff/funkin-json-sniff.py
 !tools/funkin-xml/funkin-xml.py
 !tools/funkin-xna/funkin-xna.py

Makefile

@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------------
-# Friday Night Funkin' Rewritten Makefile v1.2
+# Friday Night Funkin' Rewritten Makefile v1.3
 #
 # Copyright (C) 2021  HTV04
 #
@@ -17,12 +17,22 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # --------------------------------------------------------------------------------
 
+all: lovefile desktop console
+
+desktop: lovefile win64 win32 macos
+
+console: lovefile switch
+
 lovefile:
 	@rm -rf build/lovefile
 	@mkdir -p build/lovefile
 
 	@cd src/love; zip -r -9 ../../build/lovefile/funkin-rewritten.love .
 
+	@mkdir -p build/release
+	@rm -f build/release/funkin-rewritten-lovefile.zip
+	@cd build/lovefile; zip -9 -r ../release/funkin-rewritten-lovefile.zip .
+
 win64: lovefile
 	@rm -rf build/win64
 	@mkdir -p build/win64
@@ -38,6 +48,10 @@ win64: lovefile
 
 	@cat resources/win64/love/love.exe build/lovefile/funkin-rewritten.love > build/win64/funkin-rewritten.exe
 
+	@mkdir -p build/release
+	@rm -f build/release/funkin-rewritten-win64.zip
+	@cd build/win64; zip -9 -r ../release/funkin-rewritten-win64.zip .
+
 win32: lovefile
 	@rm -rf build/win32
 	@mkdir -p build/win32
@@ -53,6 +67,10 @@ win32: lovefile
 
 	@cat resources/win32/love/love.exe build/lovefile/funkin-rewritten.love > build/win32/funkin-rewritten.exe
 
+	@mkdir -p build/release
+	@rm -f build/release/funkin-rewritten-win32.zip
+	@cd build/win32; zip -9 -r ../release/funkin-rewritten-win32.zip .
+
 macos: lovefile
 	@rm -rf build/macos
 	@mkdir -p "build/macos/Friday Night Funkin' Rewritten.app"
@@ -61,18 +79,27 @@ macos: lovefile
 
 	@cp build/lovefile/funkin-rewritten.love "build/macos/Friday Night Funkin' Rewritten.app/Contents/Resources"
 
-release: lovefile win64 win32 macos
 	@mkdir -p build/release
-
-	@rm -f build/release/funkin-rewritten-lovefile.zip
-	@rm -f build/release/funkin-rewritten-win64.zip
-	@rm -f build/release/funkin-rewritten-win32.zip
 	@rm -f build/release/funkin-rewritten-macos.zip
-
-	@cd build/lovefile; zip -9 -r ../release/funkin-rewritten-lovefile.zip .
-	@cd build/win64; zip -9 -r ../release/funkin-rewritten-win64.zip .
-	@cd build/win32; zip -9 -r ../release/funkin-rewritten-win32.zip .
 	@cd build/macos; zip -9 -r ../release/funkin-rewritten-macos.zip .
 
+switch: lovefile
+	@rm -rf build/switch
+	@mkdir -p build/switch/switch/funkin-rewritten
+
+	@nacptool --create "Friday Night Funkin' Rewritten" HTV04 "$(shell cat version.txt)" build/switch/funkin-rewritten.nacp
+
+	@mkdir build/switch/romfs
+	@cp build/lovefile/funkin-rewritten.love build/switch/romfs/game.love
+
+	@elf2nro resources/switch/love.elf build/switch/switch/funkin-rewritten/funkin-rewritten.nro --icon=resources/switch/icon.jpg --nacp=build/switch/funkin-rewritten.nacp --romfsdir=build/switch/romfs
+
+	@rm -r build/switch/romfs
+	@rm build/switch/funkin-rewritten.nacp
+
+	@mkdir -p build/release
+	@rm -f build/release/funkin-rewritten-switch.zip
+	@cd build/switch; zip -9 -r ../release/funkin-rewritten-switch.zip .
+
 clean:
 	@rm -rf build

README.md

@@ -1,7 +1,7 @@
 # ![Logo](images/logo.png)
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/HTV04/funkin-rewritten?style=flat-square)](https://github.com/HTV04/funkin-rewritten/releases/latest) [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/HTV04/funkin-rewritten?include_prereleases&style=flat-square)](https://github.com/HTV04/funkin-rewritten/releases) [![GitHub all releases](https://img.shields.io/github/downloads/HTV04/funkin-rewritten/total?style=flat-square)](https://github.com/HTV04/funkin-rewritten/releases) [![GitHub issues](https://img.shields.io/github/issues/HTV04/funkin-rewritten?style=flat-square)](https://github.com/HTV04/funkin-rewritten/issues) [![GitHub](https://img.shields.io/github/license/HTV04/funkin-rewritten?style=flat-square)](https://github.com/HTV04/funkin-rewritten/blob/main/LICENSE) [![Discord](https://img.shields.io/discord/852658576577003550?style=flat-square)](https://discord.gg/tQGzN2Wu48)
 
-Friday Night Funkin' Rewritten is a rewrite of [Friday Night Funkin'](https://ninja-muffin24.itch.io/funkin) built on [LÖVE](https://love2d.org/) and [LÖVE Potion](https://github.com/lovebrew/LovePotion) for Windows, macOS, and Linux, as well as previously unsupported platforms, like the Nintendo Switch!
+Friday Night Funkin' Rewritten is a rewrite of [Friday Night Funkin'](https://ninja-muffin24.itch.io/funkin) built on [LÖVE](https://love2d.org/) and [LÖVE Potion](https://github.com/lovebrew/LovePotion) for Windows, macOS, Linux, and Web platforms, as well as previously unsupported platforms, like the Nintendo Switch!
 
 Friday Night Funkin' Rewritten features:
 * A rewritten engine focused on performance and playability
@@ -74,46 +74,61 @@ The settings file can be found in the following places on the following systems:
 Also, derivative works (mods, forks, etc.) of FNF Rewritten must be open-source. The build methods shown in this README technically make one's code open-source anyway, but uploading it to GitHub or a similar platform is advised.
 
 # Building
-To build the Nintendo Switch version of FNF Rewritten, switch to the `switch` branch and follow the instructions in the README.
+Web build instructions coming soon! Current method isn't that portable right now, but I'm working on something.
 
 ## Unix-like (macOS, Linux, etc.)
-### LOVE file
-* Run `make`
+After running a build method, its release ZIP will be located at `./build/release`.
 
-Results are in `./build/lovefile`.
+### LOVE file
+* Run `make lovefile`
 
 ### Windows (64-bit)
 * Set up dependencies shown in `./resources/win64/dependencies.txt`
 * Run `make win64`
 
-Results are in `./build/win64`.
-
 ### Windows (32-bit)
 * Set up dependencies shown in `./resources/win32/dependencies.txt`
 * Run `make win32`
 
-Results are in `./build/win32`.
-
 ### macOS
 * Set up dependencies shown in `./resources/macos/dependencies.txt`
 * Run `make macos`
 
-Results are in `./build/macos`.
+### Nintendo Switch
+* Set up [devkitPro](https://devkitpro.org/wiki/Getting_Started)
+  * Install the `switch-dev` package
+* Set up dependencies shown in `./resources/switch/dependencies.txt`
+* Run `make switch`
 
-### Release ZIPs
+### Desktop Platforms
 * Set up dependencies shown in `./resources/win64/dependencies.txt`
 * Set up dependencies shown in `./resources/win32/dependencies.txt`
 * Set up dependencies shown in `./resources/macos/dependencies.txt`
-* Run `make release`
+* Run `make desktop`
 
-Results are in `./build/release`.
+### Console Platforms
+* Set up [devkitPro](https://devkitpro.org/wiki/Getting_Started)
+  * Install the `switch-dev` package
+* Set up dependencies shown in `./resources/switch/dependencies.txt`
+* Run `make console`
+
+## All Platforms
+* Set up dependencies shown in `./resources/win64/dependencies.txt`
+* Set up dependencies shown in `./resources/win32/dependencies.txt`
+* Set up dependencies shown in `./resources/macos/dependencies.txt`
+* Set up [devkitPro](https://devkitpro.org/wiki/Getting_Started)
+  * Install the `switch-dev` package
+* Set up dependencies shown in `./resources/switch/dependencies.txt`
+* Run `make`
 
 ## Other
 Follow the official instructions for LÖVE game distribution for your platform: https://love2d.org/wiki/Game_Distribution
 
 # Special Thanks
 * KadeDev for [FNFDataAPI](https://github.com/KadeDev/FNFDataAPI), which was refrenced while developing the chart-reading system
 * The developers of [BeatFever Mania](https://github.com/Sulunia/beatfever) for their music time interpolation code
-* The developers of the [LÖVE](https://love2d.org/) framework
-* TurtleP for his work on [LÖVE Potion](https://github.com/lovebrew/LovePotion)
+* The developers of the [LÖVE](https://love2d.org/) framework, for making Funkin' Rewritten possible
+* p-sam for developing [love-nx](https://github.com/retronx-team/love-nx), used for the Nintendo Switch version of the game
+* Davidobot for developing [love.js](https://github.com/Davidobot/love.js), used for the Web version of the game
+* TurtleP for developing [LÖVE Potion](https://github.com/lovebrew/LovePotion), originally used for the Nintendo Switch version of the game
 * Funkin' Crew (ninjamuffin99, PhantomArcade, kawaisprite, and evilsk8er), for making such an awesome game!

resources/switch/dependencies.txt

@@ -0,0 +1,2 @@
+love-nx 11.3-nx3: https://github.com/retronx-team/love-nx/releases/download/11.3-nx3/love.elf
+	Download it to .

src/love/charts/tutorial/tutorial-easy.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1,
 	{
 		mustHitSection = true,
+		bpm = 100,
 		sectionNotes = {}
 	},
 	{

src/love/charts/tutorial/tutorial-hard.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1,
 	{
 		mustHitSection = true,
+		bpm = 100,
 		sectionNotes = {}
 	},
 	{
@@ -507,7 +508,6 @@ return {
 	},
 	{
 		mustHitSection = true,
-		bpm = 100,
 		sectionNotes = {}
 	}
 }

src/love/charts/tutorial/tutorial.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1,
 	{
 		mustHitSection = true,
+		bpm = 100,
 		sectionNotes = {}
 	},
 	{

src/love/charts/week1/bopeebo-easy.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1.0,
 	{
 		mustHitSection = false,
+		bpm = 100.0,
 		sectionNotes = {
 			{
 				noteTime = 0.0,

src/love/charts/week1/bopeebo-hard.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1.3,
 	{
 		mustHitSection = false,
+		bpm = 100.0,
 		sectionNotes = {
 			{
 				noteTime = 0.0,

src/love/charts/week1/bopeebo.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1.0,
 	{
 		mustHitSection = false,
+		bpm = 100.0,
 		sectionNotes = {
 			{
 				noteTime = 0.0,

src/love/charts/week1/dadbattle-easy.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1.3,
 	{
 		mustHitSection = true,
+		bpm = 180.0,
 		sectionNotes = {}
 	},
 	{

src/love/charts/week1/dadbattle-hard.lua

@@ -22,6 +22,7 @@ return {
 	speed = 2.3,
 	{
 		mustHitSection = true,
+		bpm = 180.0,
 		sectionNotes = {}
 	},
 	{

src/love/charts/week1/dadbattle.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1.5,
 	{
 		mustHitSection = true,
+		bpm = 180.0,
 		sectionNotes = {}
 	},
 	{

src/love/charts/week1/fresh-easy.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1.0,
 	{
 		mustHitSection = false,
+		bpm = 120.0,
 		sectionNotes = {
 			{
 				noteTime = 0.0,

src/love/charts/week1/fresh-hard.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1.8,
 	{
 		mustHitSection = false,
+		bpm = 120.0,
 		sectionNotes = {
 			{
 				noteTime = 0.0,

src/love/charts/week1/fresh.lua

@@ -22,6 +22,7 @@ return {
 	speed = 1.3,
 	{
 		mustHitSection = false,
+		bpm = 120.0,
 		sectionNotes = {
 			{
 				noteTime = 0.0,