Skip to content

Commit

Permalink
We back^2
Browse files Browse the repository at this point in the history
  • Loading branch information
@poec987
poec987 committed Sep 12, 2024
1 parent 589671f commit 64190ce
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 5 deletions.
1 change: 1 addition & 0 deletions assets/preload/data/scopophobia/scopophobia.json
View file

Large diffs are not rendered by default.

Binary file modified assets/preload/images/iconGrid.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/characters/foundation/VYST_GF_assets.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions assets/shared/images/characters/foundation/VYST_GF_assets.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="VYST_GF_assets.png">
<!-- Created with Adobe Animate version 22.0.0.93 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="VYST IDLE DANCE0000" x="0" y="0" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0001" x="0" y="0" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0002" x="663" y="0" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0003" x="663" y="0" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0004" x="1326" y="0" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0005" x="1326" y="0" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0006" x="0" y="619" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0007" x="0" y="619" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0008" x="0" y="619" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0009" x="0" y="619" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0010" x="0" y="619" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0011" x="0" y="619" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0012" x="0" y="619" width="663" height="619"/>
<SubTexture name="VYST IDLE DANCE0013" x="0" y="619" width="663" height="619"/>
<SubTexture name="VYST MEOW0000" x="663" y="619" width="663" height="623"/>
<SubTexture name="VYST MEOW0001" x="663" y="619" width="663" height="623"/>
<SubTexture name="VYST MEOW0002" x="1326" y="619" width="663" height="623"/>
<SubTexture name="VYST MEOW0003" x="1326" y="619" width="663" height="623"/>
<SubTexture name="VYST MEOW0004" x="0" y="1242" width="663" height="623"/>
<SubTexture name="VYST MEOW0005" x="0" y="1242" width="663" height="623"/>
<SubTexture name="VYST MEOW0006" x="663" y="1242" width="663" height="623"/>
<SubTexture name="VYST MEOW0007" x="663" y="1242" width="663" height="623"/>
<SubTexture name="VYST MEOW0008" x="663" y="1242" width="663" height="623"/>
<SubTexture name="VYST MEOW0009" x="663" y="1242" width="663" height="623"/>
<SubTexture name="VYST MEOW0010" x="663" y="1242" width="663" height="623"/>
<SubTexture name="VYST MEOW0011" x="663" y="1242" width="663" height="623"/>
<SubTexture name="VYST MEOW0012" x="663" y="1242" width="663" height="623"/>
<SubTexture name="VYST MEOW0013" x="663" y="1242" width="663" height="623"/>
</TextureAtlas>
Binary file added assets/shared/images/noteTypes/Vyst Meow.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions source/Character.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,17 @@ class Character extends FlxSprite
addOffset('scared', -2, -17);

playAnim('danceRight');
case 'vyst-gf':
// GIRLFRIEND CODE
tex = Paths.getSparrowAtlas('characters/foundation/VYST_GF_assets');
frames = tex;
animation.addByPrefix('idle', 'VYST IDLE DANCE', 24, false);
animation.addByPrefix('meow', 'VYST MEOW', 24, false);

addOffset('meow');
addOffset('idle');

playAnim('idle');
case 'gogfgo':
// GIRLFRIEND CODE
tex = Paths.getSparrowAtlas('characters/gogirlfriendgo');
Expand Down
1 change: 1 addition & 0 deletions source/ChartingState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ class ChartingState extends MusicBeatState
"Change Character",
"Play Video",
"Laugh",
"Vyst Meow",
"Monster Leave",
"Kill Santa",
"Kill",
Expand Down
4 changes: 3 additions & 1 deletion source/FreeplayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ class FreeplayState extends MusicBeatState
newSong("Do-You-Get-The-Refrance", "Do You Get The Refrance?", 1, "bean", true),
newSong("dotdotdot", "dotdotdot", 1, "sonicexe", true),
newSong("bopcityfansong", "bopcityfansong", 1, "blocku", true),
newSong("celebrate", "Celebrate", 1, "afton")
newSong("celebrate", "Celebrate", 1, "afton"),
newSong("scopophobia", "Scopophobia", 1, "scopguy"),
newSong("stop-right-there-criminal-scum", "SRTCS", 1, "dave")
],
"Extras");

Expand Down
1 change: 1 addition & 0 deletions source/HealthIcon.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class HealthIcon extends FlxSprite
animation.add('evilblocku', [36, 37], 0, false, isPlayer);
animation.add('niceblocku', [36, 37], 0, false, isPlayer);
animation.add('afton', [38, 39], 0, false, isPlayer);
animation.add('scopguy', [43, 44], 0, false, isPlayer);
animation.add('lock', [33, 33], 0, false, isPlayer);

if (!animation.exists(char)) {
Expand Down
21 changes: 20 additions & 1 deletion source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ class PlayState extends MusicBeatState
bg.antialiasing = true;
bg.scrollFactor.set(0.9, 0.9);
bg.active = false;
bg.setGraphicSize(Std.int(bg.width * 1.1));
bg.setGraphicSize(Std.int(bg.width * 1.5));
bg.updateHitbox();
add(bg);
default:
Expand Down Expand Up @@ -866,6 +866,8 @@ class PlayState extends MusicBeatState
gfVersion = 'gf-pixelgroove';
case 'schoolEvil':
gfVersion = 'gf-pixel';
case 'foundation':
gfVersion = 'vyst-gf';

}
if (curStage == 'limo')
Expand Down Expand Up @@ -948,6 +950,8 @@ class PlayState extends MusicBeatState
dad.x -= 450;
dad.y -= 100;
camPos.set(dad.getGraphicMidpoint().x + 200, dad.getGraphicMidpoint().y - 200);
case 'scopguy':
camPos.y + 500;
}


Expand Down Expand Up @@ -1000,6 +1004,15 @@ class PlayState extends MusicBeatState

gf.visible = false;
boyfriend.x += 150;
case 'foundation':
boyfriend.x += 200;
boyfriend.y += 100;

dad.x += 200;
dad.y += 100;

gf.x += 200;
gf.y += 100;
}

switch (SONG.player1)
Expand Down Expand Up @@ -2027,6 +2040,8 @@ class PlayState extends MusicBeatState
camFollow.y = dad.getMidpoint().y + 30;
case 'niceblocku':
camFollow.y = dad.getMidpoint().y + 30;
case 'scopguy':
camFollow.y = dad.getMidpoint().y + 200;
}


Expand Down Expand Up @@ -3024,6 +3039,8 @@ class PlayState extends MusicBeatState
endSong();
});
}
case "Vyst Meow":
gf.animation.play("meow", true);
case "Change Character":
var params:Array<String> = noteTypeParam.trim().split(",");
var pos:Vector2;
Expand Down Expand Up @@ -3064,6 +3081,8 @@ class PlayState extends MusicBeatState
dad.animation.play(noteTypeParam, true);
else
boyfriend.animation.play(noteTypeParam, true);
case "Vyst Meow":
gf.animation.play("meow", true);
case "Pico Shoot":
picoShoot.visible = true;
dad.visible = false;
Expand Down
3 changes: 0 additions & 3 deletions vscode-project.hxml
View file

This file was deleted.

0 comments on commit 64190ce

Please sign in to comment.