1.38.1 lol

Fixed Popups not disappearing correctly if Combo Stacking was turned on Opponent note hits no longer count twice Alt Animations (or notes with an anim suffix) now work
JordanSantiagoYT · Nov 16, 2024 · 354d151 · 354d151
1 parent a7a6701
commit 354d151
Show file tree

Hide file tree

Showing 5 changed files with 213 additions and 200 deletions.
diff --git a/assets/preload/characters/parents-christmas.json b/assets/preload/characters/parents-christmas.json
@@ -1,285 +1,267 @@
 {
 	"animations": [
 		{
-			"loop": false,
 			"offsets": [
 				2,
 				0
 			],
-			"fps": 24,
+			"loop": false,
 			"anim": "idle",
-			"indices": [],
-			"name": "Parent Christmas Idle"
+			"fps": 24,
+			"name": "Parent Christmas Idle",
+			"indices": []
 		},
 		{
-			"loop": false,
 			"offsets": [
 				-47,
 				24
 			],
-			"fps": 24,
+			"loop": false,
 			"anim": "singUP",
-			"indices": [],
-			"name": "Parent Up Note Dad"
+			"fps": 24,
+			"name": "Parent Up Note Dad",
+			"indices": []
 		},
 		{
-			"loop": false,
 			"offsets": [
 				-31,
 				-29
 			],
-			"fps": 24,
+			"loop": false,
 			"anim": "singDOWN",
-			"indices": [],
-			"name": "Parent Down Note Dad"
+			"fps": 24,
+			"name": "Parent Down Note Dad",
+			"indices": []
 		},
 		{
-			"loop": false,
 			"offsets": [
-				0,
-				0
+				-30,
+				16
 			],
-			"fps": 24,
+			"loop": false,
 			"anim": "singLEFT",
-			"indices": [],
-			"name": "Parent Left Note Dad"
+			"fps": 24,
+			"name": "Parent Left Note Dad",
+			"indices": []
 		},
 		{
-			"loop": false,
 			"offsets": [
 				-1,
 				-23
 			],
-			"fps": 24,
+			"loop": false,
 			"anim": "singRIGHT",
-			"indices": [],
-			"name": "Parent Right Note Dad"
+			"fps": 24,
+			"name": "Parent Right Note Dad",
+			"indices": []
 		},
 		{
-			"loop": false,
 			"offsets": [
-				0,
-				0
+				-1,
+				-24
 			],
-			"fps": 24,
+			"loop": false,
 			"anim": "singRIGHT-alt",
-			"indices": [],
-			"name": "Parent Right Note Mom"
+			"fps": 24,
+			"name": "Parent Right Note Mom",
+			"indices": []
 		},
 		{
-			"loop": false,
 			"offsets": [
 				-30,
 				-27
 			],
-			"fps": 24,
+			"loop": false,
 			"anim": "singDOWN-alt",
-			"indices": [],
-			"name": "Parent Down Note Mom"
+			"fps": 24,
+			"name": "Parent Down Note Mom",
+			"indices": []
 		},
 		{
-			"loop": false,
 			"offsets": [
 				-30,
 				15
 			],
-			"fps": 24,
+			"loop": false,
 			"anim": "singLEFT-alt",
-			"indices": [],
-			"name": "Parent Left Note Mom"
+			"fps": 24,
+			"name": "Parent Left Note Mom",
+			"indices": []
 		},
 		{
-			"loop": false,
 			"offsets": [
 				-47,
 				24
 			],
-			"fps": 24,
+			"loop": false,
 			"anim": "singUP-alt",
-			"indices": [],
-			"name": "Parent Up Note Mom"
+			"fps": 24,
+			"name": "Parent Up Note Mom",
+			"indices": []
 		},
 		{
-			"loop": true,
 			"offsets": [
 				2,
 				0
 			],
-			"anim": "idle-loop",
-			"fps": 24,
-			"name": "Parent Christmas Idle",
 			"indices": [
 				10,
 				11,
 				12,
 				13
-			]
+			],
+			"fps": 24,
+			"anim": "idle-loop",
+			"loop": true,
+			"name": "Parent Christmas Idle"
 		},
 		{
-			"loop": true,
 			"offsets": [
 				-47,
 				24
 			],
-			"anim": "singUP-loop",
-			"fps": 24,
-			"name": "Parent Up Note Dad",
 			"indices": [
 				10,
 				11,
 				12,
 				13
-			]
+			],
+			"fps": 24,
+			"anim": "singUP-loop",
+			"loop": true,
+			"name": "Parent Up Note Dad"
 		},
 		{
-			"loop": true,
 			"offsets": [
 				-30,
 				16
 			],
-			"anim": "singLEFT-loop",
-			"fps": 24,
-			"name": "Parent Left Note Dad",
 			"indices": [
 				12,
 				13,
 				14,
 				15
-			]
+			],
+			"fps": 24,
+			"anim": "singLEFT-loop",
+			"loop": true,
+			"name": "Parent Left Note Dad"
 		},
 		{
-			"loop": true,
 			"offsets": [
 				-31,
 				-29
 			],
-			"anim": "singDOWN-loop",
-			"fps": 24,
-			"name": "Parent Down Note Dad",
 			"indices": [
 				11,
 				12,
 				13,
 				14
-			]
+			],
+			"fps": 24,
+			"anim": "singDOWN-loop",
+			"loop": true,
+			"name": "Parent Down Note Dad"
 		},
 		{
-			"loop": true,
 			"offsets": [
 				-1,
 				-23
 			],
-			"anim": "singRIGHT-loop",
-			"fps": 24,
-			"name": "Parent Right Note Dad",
 			"indices": [
 				12,
 				13,
 				14,
 				15
-			]
+			],
+			"fps": 24,
+			"anim": "singRIGHT-loop",
+			"loop": true,
+			"name": "Parent Right Note Dad"
 		},
 		{
-			"loop": true,
 			"offsets": [
 				-1,
 				-24
 			],
-			"anim": "singRIGHT-alt-loop",
-			"fps": 24,
-			"name": "Parent Right Note Mom",
 			"indices": [
 				11,
 				12,
 				13,
 				14
-			]
+			],
+			"fps": 24,
+			"anim": "singRIGHT-alt-loop",
+			"loop": true,
+			"name": "Parent Right Note Mom"
 		},
 		{
-			"loop": true,
 			"offsets": [
 				-47,
 				24
 			],
-			"anim": "singUP-alt-loop",
-			"fps": 24,
-			"name": "Parent Up Note Mom",
 			"indices": [
 				10,
 				11,
 				12,
 				13
-			]
+			],
+			"fps": 24,
+			"anim": "singUP-alt-loop",
+			"loop": true,
+			"name": "Parent Up Note Mom"
 		},
 		{
-			"loop": true,
 			"offsets": [
 				-30,
 				15
 			],
-			"anim": "singLEFT-alt-loop",
-			"fps": 24,
-			"name": "Parent Left Note Mom",
 			"indices": [
 				11,
 				12,
 				13,
 				14
-			]
+			],
+			"fps": 24,
+			"anim": "singLEFT-alt-loop",
+			"loop": true,
+			"name": "Parent Left Note Mom"
 		},
 		{
-			"loop": true,
 			"offsets": [
 				-30,
 				-27
 			],
-			"anim": "singDOWN-alt-loop",
-			"fps": 24,
-			"name": "Parent Down Note Mom",
 			"indices": [
 				11,
 				12,
 				13,
 				14
-			]
+			],
+			"fps": 24,
+			"anim": "singDOWN-alt-loop",
+			"loop": true,
+			"name": "Parent Down Note Mom"
 		}
 	],
 	"vocals_file": "parents-christmas",
-	"losing_colors": [
-		196,
-		94,
-		174
-	],
-	"isPlayer": false,
 	"no_antialiasing": false,
 	"image": "characters/mom_dad_christmas_assets",
-	"shake_duration": 0,
 	"position": [
 		-500,
 		0
 	],
-	"health_drain": false,
-	"shake_intensity": 0,
 	"healthicon": "parents",
-	"shake_screen": false,
-	"drain_floor": 0,
 	"flip_x": false,
 	"healthbar_colors": [
 		196,
 		94,
 		174
 	],
-	"drain_amount": 0,
 	"camera_position": [
 		0,
 		0
 	],
 	"sing_duration": 4,
-	"noteskin": null,
-	"winning_colors": [
-		196,
-		94,
-		174
-	],
 	"scale": 1
 }
diff --git a/source/CreditsState.hx b/source/CreditsState.hx
@@ -88,7 +88,7 @@ class CreditsState extends MusicBeatState
 			[''],
 			['Other Special Thanks'],
 			['Denpa Engine',			'denpeak',				'The crossfade code used for this engine\n(Currently not implemented yet!)',								'https://github.com/UmbratheUmbreon/PublicDenpaEngine',			'FF9300'],
-			['HRK. EXEX',			'hrk',				'Created the Old Video Rendering Mode for FNF & the Note Skipping idea',								'https://www.youtube.com/@HRK_EXEX/featured',			'01F8FF'],
+			['HRK. EXEX',			'hrk',				'Created the Old Video Rendering Mode for FNF & the Note Skipping idea,\nalong with the Rating Popup recycling idea thing',								'https://www.youtube.com/@HRK_EXEX/featured',			'01F8FF'],
 			['cabfile',			'cabfile',				'Created the new Video Rendering Mode for FNF',								'https://github.com/cabfile',			'DDDDDD'],
 			['SomeGuyWhoLovesCoding',			'sgwlc',				'Rewrote the chart loading system and ported the new Rendering Mode to source',								'https://www.youtube.com/channel/UCMSusVA3DY-4EtiGP4zKAJA',			'FFBD40'],
 			['Betopia', 'nothing', 'Freeplay Search bar creator', 'https://www.youtube.com/channel/UCfjyz9xRhZiRbLMteQloVeg', 'FFFFFF'],

diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
@@ -23,7 +23,7 @@ using StringTools;
 
 class MainMenuState extends MusicBeatState
 {
-	public static var psychEngineJSVersion:String = '1.38.0'; //This is also used for Discord RPC
+	public static var psychEngineJSVersion:String = '1.38.1'; //This is also used for Discord RPC
 	public static var psychEngineVersion:String = '0.6.3'; //This is also used for Discord RPC
 	public static var curSelected:Int = 0;