Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some changes #34

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/love/conf.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
------------------------------------------------------------------------------]]
local metaFile = require "meta" -- this is needed cause conf.lua gets loaded before main.lua

function love.conf(t)
t.identity = "funkin-rewritten"
t.version = "11.3"
--t.console = true

t.window.title = "Friday Night Funkin' Rewritten v1.1.0 beta 2"
t.window.title = "Friday Night Funkin' Rewritten " .. version
end
Binary file modified src/love/images/dds/menu/logo.dds
Binary file not shown.
731 changes: 731 additions & 0 deletions src/love/images/dds/menu/logo.pdn

Large diffs are not rendered by default.

Binary file added src/love/images/istock-183380744.webp
Binary file not shown.
731 changes: 731 additions & 0 deletions src/love/images/png/menu/logo.pdn

Large diffs are not rendered by default.

Binary file modified src/love/images/png/menu/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/love/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.

------------------------------------------------------------------------------]]

metaFile = require "meta"

credits = credits -- this just makes the credits variable (from meta.lua) global
version = version -- this just makes the version variable (from meta.lua) global

function love.load()
local curOS = love.system.getOS()

Expand Down
25 changes: 25 additions & 0 deletions src/love/meta.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--[[----------------------------------------------------------------------------
Friday Night Funkin' Rewritten v1.1.0 beta 2

Copyright (C) 2021 HTV04

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
------------------------------------------------------------------------------]]
version = "v1.1.1 beta 3"

credits = version .. [[
Developed by HTV04
Original game by Funkin' Crew, in association with Newgrounds
Thanks to all Github contributors! <3
]]
30 changes: 11 additions & 19 deletions src/love/states/menu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
------------------------------------------------------------------------------]]

local leftFunc, rightFunc, confirmFunc, backFunc, drawFunc

local menuState
Expand All @@ -32,13 +31,14 @@ local logo = graphics.newImage(love.graphics.newImage(graphics.imagePath("menu/l

local girlfriendTitle = love.filesystem.load("sprites/menu/girlfriend-title.lua")()

local menuNames = {
local menuNames = { -- all of the menu items are here
"Story Mode",
"Freeplay",
"Credits",
"Options"
}

local weekMeta = {
local weekMeta = { -- meta for all of the weeks (switches between them in menu)
{
"Tutorial",
{
Expand Down Expand Up @@ -105,11 +105,13 @@ local confirmSound = love.audio.newSource("sounds/menu/confirm.ogg", "static")

local music = love.audio.newSource("music/menu/menu.ogg", "stream")

local function switchMenu(menu)
if menu == 4 then
local function switchMenu(menu) -- actual code for the menu options
if menu == 5 then
love.window.showMessageBox("lol", "Not implemented yet :P")

return switchMenu(1)
elseif menu == 4 then
love.window.showMessageBox("Credits", credits)
elseif menu == 3 then
function leftFunc()
if menuState == 3 then
Expand Down Expand Up @@ -270,21 +272,13 @@ local function switchMenu(menu)
graphics.setColor(1, 1, 0)
love.graphics.printf("< " .. menuNames[menuNum] .. " >", -640, 285, 853, "center", nil, 1.5, 1.5)
graphics.setColor(1, 1, 1)

if input:getActiveDevice() == "joy" then
love.graphics.printf("Left Stick/D-Pad: Select | A: Confirm | B: Exit", -640, 350, 1280, "center", nil, 1, 1)
else
love.graphics.printf("Arrow Keys: Select | Enter: Confirm | Escape: Exit", -640, 350, 1280, "center", nil, 1, 1)
end
end
end

menuState = 1
end

logo.x, logo.y = -350, -125

girlfriendTitle.x, girlfriendTitle.y = 300, -75
logo.x, logo.y = 0, -55

music:setLooping(true)

Expand Down Expand Up @@ -338,15 +332,13 @@ return {

logo:draw()

girlfriendTitle:draw()

love.graphics.printf(
"v1.1.0 beta 2\n" ..
"Developed by HTV04\n\n" ..
"Original game by Funkin' Crew, in association with Newgrounds",
-525,
90,
450,
0,
0,
0,
"right",
nil,
1,
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0-beta.2
1.1.1-beta.3