From 228c16d9709f008c466f128f6d5386d045fec8f0 Mon Sep 17 00:00:00 2001 From: HTV04 <53527582+HTV04@users.noreply.github.com> Date: Thu, 22 Jul 2021 10:12:07 -0400 Subject: [PATCH] More v1.0.0 stuff or something --- Makefile | 12 ++++++++---- README.md | 19 ++++++++++++------- src/love/debug-menu.lua | 8 ++++++-- src/love/main.lua | 6 +++--- src/love/menu.lua | 2 +- src/love/weeks.lua | 6 +++--- src/love/weeks/week5.lua | 4 ++-- 7 files changed, 35 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index fb9f0362..926146d6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------------- -# Friday Night Funkin' Rewritten Makefile v1.0 +# Friday Night Funkin' Rewritten Makefile v1.1 # # Copyright (C) 2021 HTV04 # @@ -55,17 +55,21 @@ win32: lovefile macos: lovefile @rm -rf build/macos - @mkdir -p build/macos + @mkdir -p "build/macos/Friday Night Funkin' Rewritten.app" - @cp -r dependencies/macos/love.app "build/macos/Friday Night Funkin' Rewritten.app" + @cp -r dependencies/macos/love.app/. "build/macos/Friday Night Funkin' Rewritten.app" @cp dependencies/macos/Info.plist "build/macos/Friday Night Funkin' Rewritten.app/Contents" @cp build/lovefile/funkin-rewritten.love "build/macos/Friday Night Funkin' Rewritten.app/Contents/Resources" release: lovefile win64 win32 macos - @rm -rf build/release @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 . diff --git a/README.md b/README.md index 94eac31d..15a5bac2 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ # ![Logo](images/logo.png) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/HTV04/funkin-rewritten?style=flat-square) ![GitHub all releases](https://img.shields.io/github/downloads/HTV04/funkin-rewritten/total?style=flat-square) ![GitHub issues](https://img.shields.io/github/issues/HTV04/funkin-rewritten?style=flat-square) ![GitHub](https://img.shields.io/github/license/HTV04/funkin-rewritten?style=flat-square) ![Discord](https://img.shields.io/discord/852658576577003550?style=flat-square) -*Friday Night Funkin' Rewritten* is a rewrite of [*Friday Night Funkin'*](https://ninja-muffin24.itch.io/funkin) using [LÖVE](https://love2d.org/) for Windows, macOS, Linux. +Friday Night Funkin' Rewritten is a rewrite of [Friday Night Funkin'](https://ninja-muffin24.itch.io/funkin) built on [LÖVE](https://love2d.org/) for Windows, macOS, and Linux, as well as previously unsupported platforms, like the Nintendo Switch! -*Friday Night Funkin' Rewritten* features: +Friday Night Funkin' Rewritten features: * A rewritten engine focused on performance and playability -* MUCH less memory usage than the original game -* Better fullscreen support +* Much less memory usage than the original game * Controller support +* Other cool features, like downscroll * And more to come! Join the Discord server for updates: https://discord.gg/tQGzN2Wu48 # Controls -If using a controller, a controller with an Xbox button layout is recommended. Controller buttons will be remappable in a future update. +If using a controller on a PC, a controller with an Xbox button layout is recommended. Controller buttons will be remappable in a future update. ## Menus ### Keyboard @@ -37,7 +37,7 @@ If using a controller, a controller with an Xbox button layout is recommended. C * A - Confirm (Game Over) * Start - Exit -## Debug +## Debug (PC only) ### Keyboard * 6 - Take screenshot * Screenshot paths: @@ -51,6 +51,7 @@ The settings file can be found in the following places on the following systems: * Windows - `%APPDATA%\funkin-rewritten\settings.ini` * macOS - `~/Library/Application Support/funkin-rewritten/settings.ini` * Linux - `~/.local/share/love/funkin-rewritten/settings.ini` +* Nintendo Switch - `/switch/funkin-rewritten-switch/save/settings.ini` # Progress **Menus** - 50% Complete @@ -73,6 +74,8 @@ 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. + ## Unix-like (macOS, Linux, etc.) ### LOVE file * Run `make` @@ -110,5 +113,7 @@ Follow the official instructions for LÖVE game distribution for your platform: # Special Thanks * KadeDev for [FNFDataAPI](https://github.com/KadeDev/FNFDataAPI), which was refrenced while developing the chart-reading system -* The devs of [BeatFever Mania](https://github.com/Sulunia/beatfever) for their music time interpolation code +* 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) * Funkin' Crew (ninjamuffin99, PhantomArcade, kawaisprite, and evilsk8er), for making such an awesome game! diff --git a/src/love/debug-menu.lua b/src/love/debug-menu.lua index a391c5c7..19029fc7 100644 --- a/src/love/debug-menu.lua +++ b/src/love/debug-menu.lua @@ -21,7 +21,7 @@ local menuID, selection local curDir, dirTable local sprite, spriteAnims, overlaySprite -debugMenu = { +return { spriteViewerSearch = function(self, dir) svMode = 1 @@ -53,6 +53,10 @@ debugMenu = { }, {2} } + + graphics.cancelTimer() + graphics.fade[1] = 0 + graphics.fadeIn(0.5) end, keypressed = function(self, key) @@ -160,7 +164,7 @@ debugMenu = { end if input:pressed("back") then - graphics.fadeOut(1, love.event.quit) + graphics.fadeOut(0.5, love.event.quit) end end, diff --git a/src/love/main.lua b/src/love/main.lua index 6e825a43..fc70e793 100644 --- a/src/love/main.lua +++ b/src/love/main.lua @@ -150,9 +150,9 @@ settingsVer=3 end -- Load engine - require "debug-menu" - require "menu" - require "weeks" + debugMenu = require "debug-menu" + menu = require "menu" + weeks = require "weeks" -- Load week data weekData = { diff --git a/src/love/menu.lua b/src/love/menu.lua index 5071ffa7..4439a005 100644 --- a/src/love/menu.lua +++ b/src/love/menu.lua @@ -76,7 +76,7 @@ girlfriendTitle.x, girlfriendTitle.y = 300, -75 music:setLooping(true) -menu = { +return { enter = function(self) gameOver = false storyMode = false diff --git a/src/love/weeks.lua b/src/love/weeks.lua index beb7f061..3fb511ed 100644 --- a/src/love/weeks.lua +++ b/src/love/weeks.lua @@ -34,7 +34,7 @@ local inputList = { local ratingTimers = {} -weeks = { +return { enter = function(self) useAltAnims = false @@ -429,7 +429,7 @@ weeks = { for j = 2, #enemyNotes[i] do local index = j - offset - if enemyNotes[i][index].anim.name == "on" and enemyNotes[i][index - 1].anim.name == "on" and enemyNotes[i][index].y - enemyNotes[i][index - 1].y <= 10 then + if enemyNotes[i][index].anim.name == "on" and enemyNotes[i][index - 1].anim.name == "on" and ((settings.downscroll and enemyNotes[i][index].y - enemyNotes[i][index - 1].y >= -10) or (not settings.downscroll and enemyNotes[i][index].y - enemyNotes[i][index - 1].y <= 10)) then table.remove(enemyNotes[i], index) offset = offset + 1 @@ -442,7 +442,7 @@ weeks = { for j = 2, #boyfriendNotes[i] do local index = j - offset - if boyfriendNotes[i][index].anim.name == "on" and boyfriendNotes[i][index - 1].anim.name == "on" and boyfriendNotes[i][index].y - boyfriendNotes[i][index - 1].y <= 10 then + if boyfriendNotes[i][index].anim.name == "on" and boyfriendNotes[i][index - 1].anim.name == "on" and ((settings.downscroll and boyfriendNotes[i][index].y - boyfriendNotes[i][index - 1].y >= -10) or (not settings.downscroll and boyfriendNotes[i][index].y - boyfriendNotes[i][index - 1].y <= 10)) then table.remove(boyfriendNotes[i], index) offset = offset + 1 diff --git a/src/love/weeks/week5.lua b/src/love/weeks/week5.lua index 85f0e410..a3981eb8 100644 --- a/src/love/weeks/week5.lua +++ b/src/love/weeks/week5.lua @@ -126,8 +126,6 @@ return { graphics.cancelTimer() graphics.fade[1] = 1 - - audio.playSound(sounds["lights on"]) else cam.sizeX, cam.sizeY = 0.9, 0.9 end @@ -171,6 +169,8 @@ return { weeks:voicesPlay() end ) + + audio.playSound(sounds["lights on"]) else inst:play() weeks:voicesPlay()