Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 08:07:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

section shit

Browse source
This commit is contained in:
Cameron Taylor 2021-02-02 04:13:28 -05:00
parent cddb67d984
commit 518ee235d1
2 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/Character.hx
View file

@ -251,8 +251,6 @@ class Character extends FlxSprite
animation.addByPrefix('singUPmiss', 'pico Up note miss', 24);
animation.addByPrefix('singDOWNmiss', 'Pico Down Note MISS', 24);
playAnim('idle');
addOffset('idle');
addOffset("singUP", -29, 27);
addOffset("singRIGHT", -68, -7);
@ -302,6 +300,8 @@ class Character extends FlxSprite
addOffset('deathConfirm', 37, 69);
addOffset('scared', -4);
playAnim('idle');
flipX = true;
case 'bf-christmas':
@ -329,6 +329,8 @@ class Character extends FlxSprite
addOffset("singDOWNmiss", -11, -19);
addOffset("hey", 7, 4);
playAnim('idle');
flipX = true;
case 'bf-car':
var tex = FlxAtlasFrames.fromSparrow('assets/images/bfCar.png', 'assets/images/bfCar.xml');
@ -352,6 +354,7 @@ class Character extends FlxSprite
addOffset("singRIGHTmiss", -30, 21);
addOffset("singLEFTmiss", 12, 24);
addOffset("singDOWNmiss", -11, -19);
playAnim('idle');
flipX = true;
case 'bf-pixel':
@ -379,6 +382,8 @@ class Character extends FlxSprite
setGraphicSize(Std.int(width * 6));
updateHitbox();
playAnim('idle');
width -= 100;
height -= 100;
@ -417,6 +422,8 @@ class Character extends FlxSprite
addOffset("singLEFT", 40);
addOffset("singDOWN", 14);
playAnim('idle');
setGraphicSize(Std.int(width * 6));
updateHitbox();
@ -434,6 +441,7 @@ class Character extends FlxSprite
addOffset("singRIGHT");
addOffset("singLEFT", 40);
addOffset("singDOWN", 14);
playAnim('idle');
setGraphicSize(Std.int(width * 6));
updateHitbox();
@ -485,9 +493,11 @@ class Character extends FlxSprite
addOffset("singRIGHT-alt", -1, -24);
addOffset("singLEFT-alt", -30, 15);
addOffset("singDOWN-alt", -30, -27);
playAnim('idle');
}
playAnim('singUP');
dance();
if (isPlayer)
{
@ -618,6 +628,8 @@ class Character extends FlxSprite
{
offset.set(daOffset[0], daOffset[1]);
}
else
offset.set(0, 0);
if (curCharacter == 'gf')
{

32
source/PlayState.hx
View file

@ -16,6 +16,7 @@ import flixel.addons.effects.FlxTrail;
import flixel.addons.effects.FlxTrailArea;
import flixel.addons.effects.chainable.FlxEffectSprite;
import flixel.addons.effects.chainable.FlxWaveEffect;
import flixel.addons.transition.FlxTransitionableState;
import flixel.graphics.atlas.FlxAtlas;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.group.FlxGroup.FlxTypedGroup;
@ -64,6 +65,9 @@ class PlayState extends MusicBeatState
private var curSection:Int = 0;
private var camFollow:FlxObject;
private static var prevCamFollow:FlxObject;
private var strumLineNotes:FlxTypedGroup<FlxSprite>;
private var playerStrums:FlxTypedGroup<FlxSprite>;
@ -403,7 +407,9 @@ class PlayState extends MusicBeatState
bgGirls.scrollFactor.set(0.9, 0.9);
if (SONG.song.toLowerCase() == 'roses')
{
bgGirls.getScared();
}
bgGirls.setGraphicSize(Std.int(bgGirls.width * daPixelZoom));
bgGirls.updateHitbox();
@ -636,6 +642,13 @@ class PlayState extends MusicBeatState
camFollow = new FlxObject(0, 0, 1, 1);
camFollow.setPosition(camPos.x, camPos.y);
if (prevCamFollow != null)
{
camFollow = prevCamFollow;
prevCamFollow = null;
}
add(camFollow);
FlxG.camera.follow(camFollow, LOCKON, 0.04);
@ -750,6 +763,9 @@ class PlayState extends MusicBeatState
black.scrollFactor.set();
add(black);
if (isStoryMode && SONG.song.toLowerCase() == 'roses')
remove(black);
new FlxTimer().start(0.3, function(tmr:FlxTimer)
{
black.alpha -= 0.15;
@ -1530,8 +1546,10 @@ class PlayState extends MusicBeatState
if (!inCutscene)
keyShit();
// if (FlxG.keys.justPressed.ONE)
// endSong();
#if debug
if (FlxG.keys.justPressed.ONE)
endSong();
#end
}
function endSong():Void
@ -1594,10 +1612,20 @@ class PlayState extends MusicBeatState
FlxG.sound.play('assets/sounds/Lights_Shut_off' + TitleState.soundExt);
}
if (SONG.song.toLowerCase() == 'senpai')
{
transIn = null;
transOut = null;
prevCamFollow = camFollow;
}
PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + difficulty, PlayState.storyPlaylist[0]);
FlxG.sound.music.stop();
FlxG.switchState(new PlayState());
transIn = FlxTransitionableState.defaultTransIn;
transOut = FlxTransitionableState.defaultTransOut;
}
}
else