Merge branch 'main' of https://github.com/poec987/FNF-V3

poec987 · Jun 29, 2024 · 291b78e · 291b78e
2 parents e7b89a1 + 51e3e8a
commit 291b78e
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 16 deletions.
diff --git a/assets/shared/images/characters/weeb/sigmio.png b/assets/shared/images/characters/weeb/sigmio.png
diff --git a/assets/shared/images/characters/weeb/sigmio.xml b/assets/shared/images/characters/weeb/sigmio.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="sigmio.png">
+	<!-- Created with Adobe Animate version 22.0.0.93 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="Down0000" x="0" y="0" width="321" height="257"/>
+	<SubTexture name="Down0001" x="0" y="0" width="321" height="257"/>
+	<SubTexture name="Down0002" x="321" y="0" width="321" height="257"/>
+	<SubTexture name="Down0003" x="321" y="0" width="321" height="257"/>
+	<SubTexture name="Down0004" x="321" y="0" width="321" height="257"/>
+	<SubTexture name="Down0005" x="321" y="0" width="321" height="257"/>
+	<SubTexture name="Down0006" x="321" y="0" width="321" height="257"/>
+	<SubTexture name="Left0000" x="642" y="0" width="321" height="257"/>
+	<SubTexture name="Left0001" x="642" y="0" width="321" height="257"/>
+	<SubTexture name="Left0002" x="963" y="0" width="321" height="257"/>
+	<SubTexture name="Left0003" x="963" y="0" width="321" height="257"/>
+	<SubTexture name="Left0004" x="963" y="0" width="321" height="257"/>
+	<SubTexture name="Left0005" x="963" y="0" width="321" height="257"/>
+	<SubTexture name="Left0006" x="963" y="0" width="321" height="257"/>
+	<SubTexture name="Right0000" x="1284" y="0" width="321" height="257"/>
+	<SubTexture name="Right0001" x="1284" y="0" width="321" height="257"/>
+	<SubTexture name="Right0002" x="1605" y="0" width="321" height="257"/>
+	<SubTexture name="Right0003" x="1605" y="0" width="321" height="257"/>
+	<SubTexture name="Right0004" x="1605" y="0" width="321" height="257"/>
+	<SubTexture name="Right0005" x="1605" y="0" width="321" height="257"/>
+	<SubTexture name="Right0006" x="1605" y="0" width="321" height="257"/>
+	<SubTexture name="Up0000" x="0" y="257" width="321" height="257"/>
+	<SubTexture name="Up0001" x="0" y="257" width="321" height="257"/>
+	<SubTexture name="Up0002" x="321" y="257" width="321" height="257"/>
+	<SubTexture name="Up0003" x="321" y="257" width="321" height="257"/>
+	<SubTexture name="Up0004" x="321" y="257" width="321" height="257"/>
+	<SubTexture name="Up0005" x="321" y="257" width="321" height="257"/>
+	<SubTexture name="Up0006" x="321" y="257" width="321" height="257"/>
+	<SubTexture name="danceLeft0000" x="642" y="257" width="321" height="257"/>
+	<SubTexture name="danceLeft0001" x="642" y="257" width="321" height="257"/>
+	<SubTexture name="danceLeft0002" x="642" y="257" width="321" height="257"/>
+	<SubTexture name="danceLeft0003" x="642" y="257" width="321" height="257"/>
+	<SubTexture name="danceLeft0004" x="642" y="257" width="321" height="257"/>
+	<SubTexture name="danceRight0000" x="963" y="257" width="321" height="257"/>
+	<SubTexture name="danceRight0001" x="963" y="257" width="321" height="257"/>
+	<SubTexture name="danceRight0002" x="963" y="257" width="321" height="257"/>
+	<SubTexture name="danceRight0003" x="963" y="257" width="321" height="257"/>
+	<SubTexture name="danceRight0004" x="963" y="257" width="321" height="257"/>
+</TextureAtlas>
diff --git a/source/Character.hx b/source/Character.hx
@@ -506,22 +506,24 @@ class Character extends FlxSprite
 				flipX = true;
 
 			case 'senpai':
-				frames = Paths.getSparrowAtlas('characters/weeb/senpai');
-				animation.addByPrefix('idle', 'Senpai Idle', 24, false);
-				animation.addByPrefix('singUP', 'SENPAI UP NOTE', 24, false);
-				animation.addByPrefix('singLEFT', 'SENPAI LEFT NOTE', 24, false);
-				animation.addByPrefix('singRIGHT', 'SENPAI RIGHT NOTE', 24, false);
-				animation.addByPrefix('singDOWN', 'SENPAI DOWN NOTE', 24, false);
+				frames = Paths.getSparrowAtlas('characters/weeb/sigmio');
+				animation.addByPrefix('danceLeft', 'danceLeft', 30, false);
+				animation.addByPrefix('danceRight', 'danceRight', 30, false);
+				animation.addByPrefix('singUP', 'Right', 30, false);
+				animation.addByPrefix('singLEFT', 'Left', 30, false);
+				animation.addByPrefix('singRIGHT', 'Up', 30, false);
+				animation.addByPrefix('singDOWN', 'Down', 30, false);
 
-				addOffset('idle');
-				addOffset("singUP", 5, 37);
+				addOffset('danceLeft');
+				addOffset('danceRight');
+				addOffset("singUP");
 				addOffset("singRIGHT");
-				addOffset("singLEFT", 40);
-				addOffset("singDOWN", 14);
+				addOffset("singLEFT");
+				addOffset("singDOWN");
 
-				playAnim('idle');
+				playAnim('danceRight');
 
-				setGraphicSize(Std.int(width * 6));
+				setGraphicSize(Std.int(width * 3));
 				updateHitbox();
 
 				antialiasing = false;
@@ -748,6 +750,16 @@ class Character extends FlxSprite
 						else
 							playAnim('danceLeft');
 					}
+				case 'senpai':
+					if (!animation.curAnim.name.startsWith('hair'))
+					{
+						danced = !danced;
+
+						if (danced)
+							playAnim('danceRight');
+						else
+							playAnim('danceLeft');
+					}
 				default:
 					playAnim('idle');
 			}

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -725,9 +725,8 @@ class PlayState extends MusicBeatState
 			case 'parents-christmas':
 				dad.x -= 500;
 			case 'senpai':
-				dad.x += 150;
-				dad.y += 360;
-				camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y);
+				dad.y += 250;
+				camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y;
 			case 'senpai-angry':
 				dad.x += 150;
 				dad.y += 360;
@@ -1702,7 +1701,7 @@ class PlayState extends MusicBeatState
 					case 'mom':
 						camFollow.y = dad.getMidpoint().y;
 					case 'senpai':
-						camFollow.y = dad.getMidpoint().y - 430;
+						camFollow.y = dad.getMidpoint().y - 200;
 						camFollow.x = dad.getMidpoint().x - 100;
 					case 'senpai-angry':
 						camFollow.y = dad.getMidpoint().y - 430;