finished credits stuff and fixed main menu music coming back in somet…

…imes (also slightly edited charts by ethan)
Fyrid19 · Feb 12, 2024 · 4533157 · 4533157
1 parent a2aefd8
commit 4533157
Show file tree

Hide file tree

Showing 9 changed files with 4,518 additions and 7,532 deletions.
diff --git a/assets/preload/images/credits/mod/avery.png b/assets/preload/images/credits/mod/avery.png
diff --git a/assets/preload/images/credits/mod/boo.png b/assets/preload/images/credits/mod/boo.png
diff --git a/assets/preload/images/credits/mod/mare.png b/assets/preload/images/credits/mod/mare.png
diff --git a/assets/preload/music/freakyMenu.ogg b/assets/preload/music/freakyMenu.ogg
diff --git a/example_mods/data/joeseph/joeseph.json b/example_mods/data/joeseph/joeseph.json
diff --git a/example_mods/data/joever/joever.json b/example_mods/data/joever/joever.json
diff --git a/example_mods/data/porphyrophobia/porphyrophobia.json b/example_mods/data/porphyrophobia/porphyrophobia.json
diff --git a/source/CreditsState.hx b/source/CreditsState.hx
@@ -80,15 +80,16 @@ class CreditsState extends MusicBeatState
 		}
 		#end
 
-		var pisspoop:Array<Array<String>> = [ //Name - Icon name - Description - Link - BG Color
+		var pisspoop:Array<Array<String>> = [ //Name - Icon name - Description - Link - BG Color - Quote (coding in a later version)
 			['Vs Joeseph DEMO'],
-			['ethanlolcat3', 		'mod/ethan', 	'Director, Artist, Composer, Charter', 		'https://twitter.com/ethanlolcat3', 						'FFAA00'],
-			['FyriDev', 			'mod/ray', 		'Director, Artist, Coder, Charter', 		'https://twitter.com/FyriDev', 								'5B16CA'],
-			['BoxHaze', 			'mod/hazel', 	'Composer', 								'https://twitter.com/BoxJosh03', 							'FFABF9'],
-			['BringOutTheDead', 	'mod/boo', 		'Artist', 									'https://twitter.com/out_thedead', 							'73E8C3'],
-			['ZoipTheMinion', 		'mod/zoip', 	'Charter', 									'https://www.youtube.com/channel/UCZPZymCX98uP2LgQPWNnMVg', '298BF4'],
-			['AVeryCringeUser', 	'mod/avery', 	'Charter', 									'https://twitter.com/aver_av1',								'3147EA'],
-			['no707', 				'mod/707', 		'Charter', 									'https://twitter.com/n07O7', 								'9C1212'],
+			['ethanlolcat3', 		'mod/ethan', 	'Director, Artist, Composer, Charter', 		'https://twitter.com/ethanlolcat3', 							'FFAA00'],
+			['FyriDev', 			'mod/ray', 		'Director, Artist, Coder, Charter', 		'https://twitter.com/FyriDev', 									'5B16CA'],
+			['BoxHaze', 			'mod/hazel', 	'Composer', 								'https://twitter.com/BoxJosh03', 								'FFABF9'],
+			['BringOutTheDead', 	'mod/boo', 		'Artist', 									'https://twitter.com/out_thedead', 								'73E8C3'],
+			['Virusmare', 			'mod/mare', 	'Artist', 									'https://www.youtube.com/@Virusmare', 							'D6EAF3'],
+			['ZoipTheMinion', 		'mod/zoip', 	'Charter', 									'https://www.youtube.com/channel/UCZPZymCX98uP2LgQPWNnMVg', 	'298BF4'],
+			['AVeryCringeUser', 	'mod/avery', 	'Charter', 									'https://twitter.com/aver_av1',									'3147EA'],
+			['no707', 				'mod/707', 		'Charter', 									'https://twitter.com/n07O7', 									'9C1212'],
 			[''],
 			['Psych Engine Team'],
 			['Shadow Mario',		'shadowmario',		'Main Programmer of Psych Engine',								'https://twitter.com/Shadow_Mario_',	'444444'],

diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx
@@ -118,7 +118,7 @@ class GameOverSubstate extends MusicBeatSubstate
 			else
 				MusicBeatState.switchState(new FreeplayState());
 
-			FlxG.sound.playMusic(Paths.music('freakyMenu'));
+			FlxG.sound.playMusic(Paths.music('joeMenu'));
 			PlayState.instance.callOnLuas('onGameOverConfirm', [false]);
 		}