Merge pull request #1 from mayo78/devawesome

Devawesome

.gitignore

@@ -27,3 +27,8 @@ tools/funkin-xna/*
 !tools/funkin-json-sniff/funkin-json-sniff.py
 !tools/funkin-xml/funkin-xml.py
 !tools/funkin-xna/funkin-xna.py
+
+# i imported exclusive bf as a test since they have very specific offsets and its easy to tell when the offset system isnt working
+src/love/images/png/characters/*
+src/love/characters/exclusive-bf.json
+src/love/images/png/dave/icons/exclusive-bf-pixel.png

CHANGELOG.md

@@ -0,0 +1,16 @@
+# v0.1.1 (wip)
+note: this version uses a new version of love.elf, so donwload it from the new source as listed in the thing :)
+### Gameplay
+- Controls can be bounded now to any button
+- Confirm and back buttons are swapped
+- Warning screen for flashing lights
+- Changable langauges
+- Optimized note updating and drawing (Splitathon and Interdimensional run at 60 fps now!)
+- Fixed note animations sticking when swapping between shape and normal notes
+### Porting
+- Greetings cutscene
+- Spotlight event added
+- Exploitation knows your nickname now
+- OST and Credits menus (+ end credits)
+### Other
+- Added a thing where the game checks online the current verison, not sure if this works so i'll jsut wait til i release the next version of this! hahahahahahahhahahahahahah

README.md

@@ -19,8 +19,6 @@ hi
 TODOS:
 - finish porting extra songs
 - add playable characters
-- fix interdimensional lag
-- add greetings cutscene
-- add credits and end credits
 - figure out a way to unlock 7 stuff
 - fix any bugs that come in
+- Fix offsets ONCE AND FOR ALL

resources/switch/dependencies.txt

@@ -1,2 +1,2 @@
-love-nx 11.3-nx4: https://github.com/retronx-team/love-nx/releases/download/11.3-nx4/love.elf
+love-nx 11.3-nx4: https://github.com/mayo78/love-nx/releases/download/v1.0.0/love.elf
 	Download it to .

src/love/data/djSonglist.txt

@@ -1,15 +1,15 @@
 internal,warmup,dave,good
 internal,house,dave,good
 internal,insanity,dave,bad
-external,im-angey,dave-angey,bad
-internal,polygonized,dave-angey,bad
+external,im-angey,dave-angey-pixel,bad
+internal,polygonized,dave-angey-pixel,bad
 internal,blocked,bambi,bad
 internal,corn-theft,bambi,bad
 internal,maze,bambi,good
 internal,splitathon,the-duo,good
 internal,shredder,bambi,good
 internal,greetings,tristan,good
-internal,interdimensional,dave-festival-3d,good
+internal,interdimensional,dave-festival-3d-pixel,good
 internal,rano,dave-festival,good
 internal,bonus-song,dave,good
 internal,indignancy,bambi-angey,good

src/love/files.lua

@@ -1,10 +1,11 @@
 --precahces the tables of every json and xml file, doesnt take that long but should save a bit of time between different whatyevers
-local function checkFolder(folder, check)
+local export = {}
+local function checkFolder(folder, check, e)
 	for _,file in pairs(love.filesystem.getDirectoryItems(folder)) do
 		if love.filesystem.getInfo(folder..'/'..file).type ~= 'directory' then
 			check(folder, file)
 		else 
-			checkFolder(folder..'/'..file, check)
+			checkFolder(folder..'/'..file, check, e)
 		end
 	end
 end
@@ -20,26 +21,33 @@ checkFolder('images/png', function(folder, file)
 			table.insert(xmlFinal, c.attrs)
 		end
 		precachedData[(folder:lower())..'/'..(file:lower())] = xmlFinal
+		return true
 	end
 end)
 checkFolder('characters', function(folder, file)
 	if file:endsWith('.json') then
 		--print('adding this to the list!', folder..'/'..file)
 		precachedData[folder..'/'..(file:lower())] = json.decode(love.filesystem.read(folder..'/'..file))
+		return true
 	end
 end)
 checkFolder('data', function(folder, file)
 	if file:endsWith('.json') then
 		--print('adding this to the list!', folder..'/'..file)
 		precachedData[folder..'/'..(file:lower())] = json.decode(love.filesystem.read(folder..'/'..file))
+		return true
 	end
 end)
 checkFolder('locale', function(folder, file)
 	if file:endsWith('.json') then
 		--print('adding this to the list!', folder..'/'..file)
 		precachedData[folder..'/'..(file:lower())] = json.decode(love.filesystem.read(folder..'/'..file))
+		return true
 	end
 end)
+checkFolder('', function(folder, file)
+	export[folder:sub(2, #folder)..'/'..file] = file
+end)
 
 --[=[
 	
@@ -53,5 +61,17 @@ checkFolder('images/png', function(folder, file)
 end)
 print(table.concat(imgs, '\n'))
 --]=]
+--this was for when i was trying to get this to run on the wii which couldn't tellif a file existed or not so i just had a table of all the files that existed so you could do if fileList["file.png"] then
+--local final = 'return {'
+--local function yeah(tab)
+--	for k,v in pairs(tab) do
+--		if not k:startsWith '/' then
+--			final = final..'\n["'..k..'"] = [=====['..v..']=====],'
+--		end
+--	end
+--end
+--yeah(export)
+--final = final..'}'
+--love.filesystem.write('rawfiles', final)
 
 return precachedData

src/love/gamestrings.lua

@@ -18,4 +18,14 @@ end
 function l:checkFile(key)
 	return love.filesystem.getInfo('locale/'..self.language..'/'..key)
 end
+local languageData = love.filesystem.read 'locale/languages.txt'
+l.languageArray = {}
+for _,line in pairs(languageData:split'\n') do
+	local hi = line:split ':'
+	table.insert(l.languageArray, {
+		name = hi[1],
+		language = hi[2],
+		color = hi[3]
+	})
+end
 return l