Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-02-16 20:01:49 -05:00
Code Issues Projects Releases Packages Wiki Activity

leaves lol!

Browse source
This commit is contained in:
Cameron Taylor 2021-01-31 09:17:56 -05:00
parent 224d8ea029
commit 5ad361ecaa
3 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/Character.hx
View file

@ -392,10 +392,11 @@ class Character extends FlxSprite
animation.addByPrefix('deathLoop', "Retry Loop", 24, true);
animation.addByPrefix('deathConfirm', "RETRY CONFIRM", 24, false);
animation.play('firstDeath');
addOffset('firstDeath');
addOffset('deathLoop');
addOffset('deathConfirm');
addOffset('firstDeath');
addOffset('deathLoop', -37);
addOffset('deathConfirm', -37);
playAnim('firstDeath');
// pixel bullshit
setGraphicSize(Std.int(width * 6));
updateHitbox();

46
source/PlayState.hx
View file

@ -331,7 +331,7 @@ class PlayState extends MusicBeatState
evilSnow.antialiasing = true;
add(evilSnow);
}
else if (SONG.song.toLowerCase() == 'senpai' || SONG.song.toLowerCase() == 'roses')
else if (SONG.song.toLowerCase() == 'senpai' || SONG.song.toLowerCase() == 'roses' || SONG.song.toLowerCase() == 'thorns')
{
curStage = 'school';
@ -343,37 +343,50 @@ class PlayState extends MusicBeatState
var repositionShit = -200;
var bgSchool:FlxSprite = new FlxSprite(repositionShit).loadGraphic('assets/images/weeb/weebSchool.png');
bgSchool.scrollFactor.set(0.6, 0.6);
var bgSchool:FlxSprite = new FlxSprite(repositionShit, 0).loadGraphic('assets/images/weeb/weebSchool.png');
bgSchool.scrollFactor.set(0.6, 0.90);
add(bgSchool);
var bgStreet:FlxSprite = new FlxSprite(repositionShit).loadGraphic('assets/images/weeb/weebStreet.png');
bgStreet.scrollFactor.set(0.95, 0.95);
add(bgStreet);
var bgTrees:FlxSprite = new FlxSprite(repositionShit).loadGraphic('assets/images/weeb/weebTreesBack.png');
var fgTrees:FlxSprite = new FlxSprite(repositionShit + 170, 130).loadGraphic('assets/images/weeb/weebTreesBack.png');
fgTrees.scrollFactor.set(0.9, 0.9);
add(fgTrees);
var bgTrees:FlxSprite = new FlxSprite(repositionShit - 380, -800);
var treetex = FlxAtlasFrames.fromSpriteSheetPacker('assets/images/weeb/weebTrees.png', 'assets/images/weeb/weebTrees.txt');
bgTrees.frames = treetex;
bgTrees.animation.add('treeLoop', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18], 12);
bgTrees.animation.play('treeLoop');
bgTrees.scrollFactor.set(0.85, 0.85);
add(bgTrees);
var fgTrees:FlxSprite = new FlxSprite(repositionShit).loadGraphic('assets/images/weeb/weebTrees.png');
fgTrees.scrollFactor.set(0.9, 0.9);
add(fgTrees);
var treeLeaves:FlxSprite = new FlxSprite(repositionShit, -40);
treeLeaves.frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/petals.png', 'assets/images/weeb/petals.xml');
treeLeaves.animation.addByPrefix('leaves', 'PETALS ALL', 24, true);
treeLeaves.animation.play('leaves');
treeLeaves.scrollFactor.set(0.85, 0.85);
add(treeLeaves);
var widShit = Std.int(bgSky.width * 6);
bgSky.setGraphicSize(widShit);
bgSchool.setGraphicSize(widShit);
bgStreet.setGraphicSize(widShit);
bgTrees.setGraphicSize(widShit);
fgTrees.setGraphicSize(widShit);
bgTrees.setGraphicSize(Std.int(widShit * 1.4));
fgTrees.setGraphicSize(Std.int(widShit * 0.8));
treeLeaves.setGraphicSize(widShit);
fgTrees.updateHitbox();
bgSky.updateHitbox();
bgSchool.updateHitbox();
bgStreet.updateHitbox();
bgTrees.updateHitbox();
treeLeaves.updateHitbox();
bgGirls = new BackgroundGirls(-100, 120);
bgGirls = new BackgroundGirls(-100, 190);
bgGirls.scrollFactor.set(0.9, 0.9);
bgGirls.setGraphicSize(Std.int(bgGirls.width * daPixelZoom));
@ -466,7 +479,8 @@ class PlayState extends MusicBeatState
dad.x -= 500;
case 'senpai':
dad.x += 150;
dad.y += 300;
dad.y += 360;
camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y);
}
boyfriend = new Boyfriend(770, 450, SONG.player1);
@ -489,10 +503,10 @@ class PlayState extends MusicBeatState
boyfriend.x += 320;
dad.y -= 80;
case 'school':
boyfriend.x += 170;
boyfriend.y += 120;
gf.x += 100;
gf.y += 200;
boyfriend.x += 200;
boyfriend.y += 220;
gf.x += 180;
gf.y += 300;
}
var doof:DialogueBox = new DialogueBox(false, dialogue);
@ -525,6 +539,7 @@ class PlayState extends MusicBeatState
FlxG.camera.follow(camFollow, LOCKON, 0.04);
// FlxG.camera.setScrollBounds(0, FlxG.width, 0, FlxG.height);
FlxG.camera.zoom = defaultCamZoom;
FlxG.camera.focusOn(camFollow.getPosition());
FlxG.worldBounds.set(0, 0, FlxG.width, FlxG.height);
@ -1185,6 +1200,7 @@ class PlayState extends MusicBeatState
camFollow.y = boyfriend.getMidpoint().y - 200;
case 'school':
camFollow.x = boyfriend.getMidpoint().x - 200;
camFollow.y = boyfriend.getMidpoint().y - 200;
}
if (SONG.song.toLowerCase() == 'tutorial')

4
source/TitleState.hx
View file

@ -398,10 +398,6 @@ class TitleState extends MusicBeatState
FlxG.camera.flash(FlxColor.WHITE, 4);
remove(credGroup);
skippedIntro = true;
var image = Assets.getBitmapData('assets/images/alphabet.png');
var money = new FlxSprite(0, 0, image);
add(money);
}
}
}