Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-02-17 04:11:23 -05:00
Code Issues Projects Releases Packages Wiki Activity

pico offsets

Browse source
This commit is contained in:
Cameron Taylor 2021-04-08 20:48:11 -04:00
parent 11d9998539
commit f696c0909c
4 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/CutsceneAnimTestState.hx
View file

@ -16,11 +16,11 @@ class CutsceneAnimTestState extends FlxState
'GF STARTS TO TURN PART 2',
'PICO ARRIVES PART 1',
'PICO ARRIVES PART 2',
'PICO ARRIVES PART 2 POINT FIVE'
'PICO ARRIVES PART 2 POINT FIVE',
'PICO ARRIVES PART 3',
'Pico Dual Wield on Speaker'
];
var coolPosition:FlxPoint = FlxPoint.get(0, 100);
var cutsceneGroup:CutsceneCharacter;
var curSelected:Int = 0;
@ -34,7 +34,7 @@ class CutsceneAnimTestState extends FlxState
gridBG.scrollFactor.set(0.5, 0.5);
add(gridBG);
debugTxt = new FlxText(1000, 20, 0, "", 24);
debugTxt = new FlxText(900, 20, 0, "", 20);
debugTxt.color = FlxColor.BLUE;
add(debugTxt);
@ -47,7 +47,7 @@ class CutsceneAnimTestState extends FlxState
dummyLoader.y = FlxG.height - 20;
}
cutsceneGroup = new CutsceneCharacter(0, 100, 'gfHoldup');
cutsceneGroup = new CutsceneCharacter(0, 0, 'gfHoldup');
add(cutsceneGroup);
// createCutscene(0);
@ -65,6 +65,11 @@ class CutsceneAnimTestState extends FlxState
curSelected -= 1;
if (FlxG.keys.justPressed.DOWN)
curSelected += 1;
if (curSelected < 0)
curSelected = cutsceneGroup.members.length - 1;
if (curSelected >= cutsceneGroup.members.length)
curSelected = 0;
}
else
{
@ -85,12 +90,6 @@ class CutsceneAnimTestState extends FlxState
debugTxt.text = curSelected + " : " + cutsceneGroup.members[curSelected].getPosition();
if (curSelected < 0)
curSelected = animShit.length - 1;
if (curSelected >= animShit.length)
curSelected = 0;
super.update(elapsed);
}
}

6
source/CutsceneCharacter.hx
View file

@ -35,6 +35,8 @@ class CutsceneCharacter extends FlxTypedGroup<FlxSprite>
{
var xAndY:FlxPoint = FlxPoint.get();
var dumbSplit:Array<String> = i.split('---')[1].trim().split(' ');
trace('cool split: ' + i.split('---')[1]);
trace(dumbSplit);
xAndY.set(Std.parseFloat(dumbSplit[0]), Std.parseFloat(dumbSplit[1]));
animShit.set(i.split('---')[0].trim(), xAndY);
@ -54,8 +56,8 @@ class CutsceneCharacter extends FlxTypedGroup<FlxSprite>
cutScene.animation.finishCallback = function(anim:String)
{
cutScene.kill();
cutScene.destroy();
// cutScene.kill();
// cutScene.destroy();
if (daNum + 1 < arrayLMFAOOOO.length)
createCutscene(daNum + 1);

21
source/PlayState.hx
View file

@ -1021,6 +1021,15 @@ class PlayState extends MusicBeatState
dad.visible = false;
gf.visible = false;
var gfTankmen:FlxSprite = new FlxSprite(210, 70);
gfTankmen.frames = Paths.getSparrowAtlas('characters/gfTankmen');
gfTankmen.animation.addByPrefix('loop', 'GF Dancing at Gunpoint', 24, true);
gfTankmen.animation.play('loop');
gfTankmen.antialiasing = true;
gfCutsceneLayer.add(gfTankmen);
var tankCutscene:FlxSprite = new FlxSprite(20, 320);
tankCutscene.frames = Paths.getSparrowAtlas('cutsceneStuff/tankTalkSong3');
tankCutscene.animation.addByPrefix('tankyguy', 'GodEffing', 24, false);
@ -1031,6 +1040,11 @@ class PlayState extends MusicBeatState
camFollow.setPosition(gf.x + 350, gf.y + 560);
boyfriend.visible = false;
var fakeBF:Character = new Character(boyfriend.x, boyfriend.y, 'bf', true);
gfCutsceneLayer.add(fakeBF);
var bfCatchGf:FlxSprite = new FlxSprite(boyfriend.x - 10, boyfriend.y - 90);
bfCatchGf.frames = Paths.getSparrowAtlas('cutsceneStuff/bfCatchesGF');
bfCatchGf.animation.addByPrefix('catch', 'BF catches GF', 24, false);
@ -1109,6 +1123,9 @@ class PlayState extends MusicBeatState
boyfriend.visible = false;
bfCatchGf.visible = true;
bfCatchGf.animation.play('catch');
gfCutsceneLayer.remove(fakeBF);
bfCatchGf.animation.finishCallback = function(anim:String)
{
bfCatchGf.visible = false;
@ -1118,7 +1135,7 @@ class PlayState extends MusicBeatState
camFollow.x -= 200;
};
new FlxTimer().start(2, function(weedShitBaby:FlxTimer)
new FlxTimer().start(3, function(weedShitBaby:FlxTimer)
{
camFollow.y += 180;
camFollow.x -= 80;
@ -1133,6 +1150,8 @@ class PlayState extends MusicBeatState
gf.visible = false;
var cutsceneShit:CutsceneCharacter = new CutsceneCharacter(210, 70, 'gfHoldup');
gfCutsceneLayer.add(cutsceneShit);
gfCutsceneLayer.remove(gfTankmen);
// add(cutsceneShit);
new FlxTimer().start(20, function(alsoTmr:FlxTimer)
{

3
source/TitleState.hx
View file

@ -1,6 +1,7 @@
package;
import flixel.FlxG;
import flixel.FlxGame;
import flixel.FlxSprite;
import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
import flixel.addons.transition.FlxTransitionableState;
@ -56,6 +57,8 @@ class TitleState extends MusicBeatState
// FlxG.bitmap.clearCache();
#end
FlxG.game.focusLostFramerate = 60;
swagShader = new ColorSwap();
FlxG.sound.muteKeys = [ZERO];