Skip to content

Commit

Permalink
a
Browse files Browse the repository at this point in the history
  • Loading branch information
@DidgieDeez
DidgieDeez committed Sep 14, 2024
1 parent 8f87438 commit a406f1a
Show file tree
Hide file tree
Showing 18 changed files with 178 additions and 4 deletions.
1 change: 1 addition & 0 deletions assets/preload/data/andy/andy.json
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions assets/preload/data/andy/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"songName": "Andy",
"songAuthor": "Didgie"
}
4 changes: 3 additions & 1 deletion assets/preload/data/characterList.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ afton
bean
dad-test
scopguy
scpboyfriend
scpboyfriend
andy
picy
3 changes: 2 additions & 1 deletion assets/preload/data/stageList.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ bopcity
fnaf
among
ikea
foundation
foundation
andy
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/preload/images/walker.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.
10 changes: 10 additions & 0 deletions assets/preload/images/walker.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="walker.png">
<!-- Created with Adobe Animate version 22.0.0.93 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="walker0000" x="0" y="0" width="343" height="628" frameX="0" frameY="0" frameWidth="343" frameHeight="672"/>
<SubTexture name="walker0001" x="343" y="0" width="327" height="637" frameX="-5" frameY="-1" frameWidth="343" frameHeight="672"/>
<SubTexture name="walker0002" x="670" y="0" width="313" height="647" frameX="-10" frameY="0" frameWidth="343" frameHeight="672"/>
<SubTexture name="walker0003" x="983" y="0" width="294" height="650" frameX="-24" frameY="-1" frameWidth="343" frameHeight="672"/>
<SubTexture name="walker0004" x="1277" y="0" width="280" height="672" frameX="-38" frameY="0" frameWidth="343" frameHeight="672"/>
</TextureAtlas>
Binary file added assets/shared/images/characters/andy/andy.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.
34 changes: 34 additions & 0 deletions assets/shared/images/characters/andy/andy.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="andy.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="338" height="642" frameX="0" frameY="-20" frameWidth="338" frameHeight="664"/>
<SubTexture name="Down0001" x="339" y="0" width="316" height="640" frameX="-12" frameY="-11" frameWidth="338" frameHeight="664"/>
<SubTexture name="Down0002" x="656" y="0" width="294" height="653" frameX="-24" frameY="0" frameWidth="338" frameHeight="664"/>
<SubTexture name="Down0003" x="951" y="0" width="274" height="664" frameX="-36" frameY="0" frameWidth="338" frameHeight="664"/>
<SubTexture name="Idle0000" x="1226" y="0" width="316" height="672" frameX="-16" frameY="0" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0001" x="1543" y="0" width="343" height="657" frameX="-12" frameY="-1" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0002" x="1887" y="0" width="331" height="659" frameX="-18" frameY="0" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0003" x="2219" y="0" width="258" height="677" frameX="-40" frameY="-1" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0004" x="2478" y="0" width="250" height="650" frameX="-42" frameY="0" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0005" x="2729" y="0" width="250" height="662" frameX="-42" frameY="0" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0006" x="2980" y="0" width="296" height="665" frameX="-16" frameY="-1" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0007" x="0" y="678" width="315" height="674" frameX="0" frameY="0" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0008" x="316" y="678" width="284" height="657" frameX="-21" frameY="-1" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0009" x="601" y="678" width="250" height="664" frameX="-42" frameY="0" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0010" x="852" y="678" width="250" height="660" frameX="-42" frameY="0" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0011" x="1103" y="678" width="270" height="658" frameX="-40" frameY="-1" frameWidth="355" frameHeight="678"/>
<SubTexture name="Idle0012" x="1374" y="678" width="312" height="659" frameX="-27" frameY="0" frameWidth="355" frameHeight="678"/>
<SubTexture name="Left0000" x="1687" y="678" width="293" height="661" frameX="0" frameY="0" frameWidth="301" frameHeight="664"/>
<SubTexture name="Left0001" x="1981" y="678" width="278" height="661" frameX="-17" frameY="-1" frameWidth="301" frameHeight="664"/>
<SubTexture name="Left0002" x="2260" y="678" width="263" height="663" frameX="-34" frameY="0" frameWidth="301" frameHeight="664"/>
<SubTexture name="Left0003" x="2524" y="678" width="267" height="664" frameX="-34" frameY="0" frameWidth="301" frameHeight="664"/>
<SubTexture name="Right0000" x="2792" y="678" width="480" height="673" frameX="0" frameY="-8" frameWidth="480" frameHeight="681"/>
<SubTexture name="Right0001" x="0" y="1353" width="451" height="674" frameX="-15" frameY="-5" frameWidth="480" frameHeight="681"/>
<SubTexture name="Right0002" x="452" y="1353" width="421" height="678" frameX="-32" frameY="0" frameWidth="480" frameHeight="681"/>
<SubTexture name="Right0003" x="874" y="1353" width="391" height="676" frameX="-48" frameY="0" frameWidth="480" frameHeight="681"/>
<SubTexture name="Up0000" x="1266" y="1353" width="462" height="719" frameX="-44" frameY="0" frameWidth="514" frameHeight="726"/>
<SubTexture name="Up0001" x="1729" y="1353" width="477" height="699" frameX="-30" frameY="-15" frameWidth="514" frameHeight="726"/>
<SubTexture name="Up0002" x="2207" y="1353" width="494" height="690" frameX="-15" frameY="-27" frameWidth="514" frameHeight="726"/>
<SubTexture name="Up0003" x="2702" y="1353" width="514" height="699" frameX="0" frameY="-27" frameWidth="514" frameHeight="726"/>
</TextureAtlas>
Binary file added assets/shared/images/characters/andy/picy.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.
50 changes: 50 additions & 0 deletions assets/shared/images/characters/andy/picy.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="picy.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="514" height="496" frameX="0" frameY="-11" frameWidth="530" frameHeight="507"/>
<SubTexture name="Down0001" x="515" y="0" width="505" height="498" frameX="-14" frameY="-8" frameWidth="530" frameHeight="507"/>
<SubTexture name="Down0002" x="1021" y="0" width="497" height="502" frameX="-27" frameY="-4" frameWidth="530" frameHeight="507"/>
<SubTexture name="Down0003" x="1519" y="0" width="491" height="505" frameX="-39" frameY="0" frameWidth="530" frameHeight="507"/>
<SubTexture name="Idle0000" x="2011" y="0" width="476" height="543" frameX="-6" frameY="0" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0001" x="2488" y="0" width="494" height="529" frameX="-7" frameY="-13" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0002" x="2983" y="0" width="511" height="519" frameX="-8" frameY="-26" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0003" x="3495" y="0" width="530" height="509" frameX="-8" frameY="-39" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0004" x="0" y="544" width="513" height="501" frameX="-5" frameY="-47" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0005" x="514" y="544" width="509" height="494" frameX="-2" frameY="-55" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0006" x="1024" y="544" width="513" height="487" frameX="0" frameY="-63" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0007" x="514" y="544" width="509" height="494" frameX="-2" frameY="-55" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0008" x="0" y="544" width="513" height="501" frameX="-5" frameY="-47" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0009" x="3495" y="0" width="530" height="509" frameX="-8" frameY="-39" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0010" x="1024" y="544" width="513" height="487" frameX="0" frameY="-63" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0011" x="1538" y="544" width="486" height="514" frameX="-3" frameY="-31" frameWidth="538" frameHeight="550"/>
<SubTexture name="Idle0012" x="2011" y="0" width="476" height="543" frameX="-6" frameY="0" frameWidth="538" frameHeight="550"/>
<SubTexture name="Left0000" x="2025" y="544" width="432" height="526" frameX="0" frameY="0" frameWidth="523" frameHeight="526"/>
<SubTexture name="Left0001" x="2458" y="544" width="445" height="506" frameX="-17" frameY="-13" frameWidth="523" frameHeight="526"/>
<SubTexture name="Left0002" x="2904" y="544" width="457" height="493" frameX="-35" frameY="-26" frameWidth="523" frameHeight="526"/>
<SubTexture name="Left0003" x="3362" y="544" width="471" height="481" frameX="-52" frameY="-39" frameWidth="523" frameHeight="526"/>
<SubTexture name="MISSDown0000" x="0" y="0" width="514" height="496" frameX="0" frameY="0" frameWidth="530" frameHeight="507"/>
<SubTexture name="MISSDown0001" x="0" y="1071" width="394" height="198" frameX="-43" frameY="-282" frameWidth="514" frameHeight="496"/>
<SubTexture name="MISSDown0002" x="740" y="1071" width="364" height="124" frameX="-44" frameY="-343" frameWidth="480" frameHeight="542"/>
<SubTexture name="MISSDown0003" x="740" y="1071" width="364" height="124" frameX="-44" frameY="-343" frameWidth="480" frameHeight="542"/>
<SubTexture name="MISSLeft0000" x="2025" y="544" width="432" height="526" frameX="0" frameY="0" frameWidth="523" frameHeight="526"/>
<SubTexture name="MISSLeft0001" x="395" y="1071" width="344" height="178" frameX="-59" frameY="-356" frameWidth="480" frameHeight="542"/>
<SubTexture name="MISSLeft0002" x="740" y="1071" width="364" height="124" frameX="-116" frameY="-418" frameWidth="480" frameHeight="542"/>
<SubTexture name="MISSLeft0003" x="740" y="1071" width="364" height="124" frameX="-116" frameY="-418" frameWidth="480" frameHeight="542"/>
<SubTexture name="MISSRight0000" x="2265" y="1071" width="506" height="540" frameX="-53" frameY="0" frameWidth="524" frameHeight="540"/>
<SubTexture name="MISSRight0001" x="1105" y="1071" width="431" height="182" frameX="-30" frameY="-349" frameWidth="559" frameHeight="540"/>
<SubTexture name="MISSRight0002" x="1537" y="1071" width="364" height="124" frameX="0" frameY="-408" frameWidth="559" frameHeight="540"/>
<SubTexture name="MISSRight0003" x="1537" y="1071" width="364" height="124" frameX="0" frameY="-408" frameWidth="559" frameHeight="540"/>
<SubTexture name="MISSUp0000" x="507" y="1612" width="439" height="609" frameX="0" frameY="0" frameWidth="485" frameHeight="609"/>
<SubTexture name="MISSUp0001" x="1902" y="1071" width="362" height="292" frameX="-41" frameY="-308" frameWidth="439" frameHeight="609"/>
<SubTexture name="MISSUp0002" x="740" y="1071" width="364" height="124" frameX="-7" frameY="-468" frameWidth="480" frameHeight="542"/>
<SubTexture name="MISSUp0003" x="740" y="1071" width="364" height="124" frameX="-7" frameY="-468" frameWidth="480" frameHeight="542"/>
<SubTexture name="Right0000" x="2265" y="1071" width="506" height="540" frameX="-18" frameY="0" frameWidth="524" frameHeight="540"/>
<SubTexture name="Right0001" x="2772" y="1071" width="504" height="520" frameX="-12" frameY="-10" frameWidth="524" frameHeight="540"/>
<SubTexture name="Right0002" x="3277" y="1071" width="505" height="508" frameX="-6" frameY="-20" frameWidth="524" frameHeight="540"/>
<SubTexture name="Right0003" x="0" y="1612" width="506" height="504" frameX="0" frameY="-29" frameWidth="524" frameHeight="540"/>
<SubTexture name="Up0000" x="507" y="1612" width="439" height="609" frameX="0" frameY="0" frameWidth="485" frameHeight="609"/>
<SubTexture name="Up0001" x="947" y="1612" width="453" height="587" frameX="-1" frameY="-18" frameWidth="485" frameHeight="609"/>
<SubTexture name="Up0002" x="1401" y="1612" width="468" height="569" frameX="-2" frameY="-34" frameWidth="485" frameHeight="609"/>
<SubTexture name="Up0003" x="1870" y="1612" width="483" height="552" frameX="-2" frameY="-50" frameWidth="485" frameHeight="609"/>
</TextureAtlas>
Binary file added assets/shared/images/stages/andy/andy.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/songs/andy/Inst.ogg
View file
Binary file not shown.
Binary file added assets/songs/andy/Voices.ogg
View file
Binary file not shown.
43 changes: 43 additions & 0 deletions source/Character.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,49 @@ class Character extends FlxSprite
addOffset("singDOWN",50,-40);

playAnim('idle');
case 'andy':
tex = Paths.getSparrowAtlas('characters/andy/andy');
frames = tex;
animation.addByPrefix('singUP', 'Up', 30, false);
animation.addByPrefix('singDOWN', 'Down', 30, false);
animation.addByPrefix('singLEFT', 'Left', 30, false);
animation.addByPrefix('singRIGHT', 'Right', 30, false);
animation.addByPrefix('idle', 'Idle', 30, true);

addOffset('idle');

addOffset("singUP", 119, 44);
addOffset("singRIGHT", 32, 0);
addOffset("singLEFT", 27, 0);
addOffset("singDOWN", 4, -10);

playAnim('idle');
case 'picy':
frames = Paths.getSparrowAtlas('characters/andy/picy');
animation.addByPrefix('idle', 'Idle', 30, true);
animation.addByPrefix('singUP', 'Up', 30, false);
animation.addByPrefix('singLEFT', 'Left', 30, false);
animation.addByPrefix('singRIGHT', 'Right', 30, false);
animation.addByPrefix('singDOWN', 'Down', 30, false);
animation.addByPrefix('singUPmiss', 'MISSUp', 30, false);
animation.addByPrefix('singLEFTmiss', 'MISSLeft', 30, false);
animation.addByPrefix('singRIGHTmiss', 'MISSRight', 30, false);
animation.addByPrefix('singDOWNmiss', 'MISSDown', 30, false);


addOffset('idle');
addOffset("singUP", 36, 55);
addOffset("singRIGHT", -50, 2);
addOffset("singLEFT", 146, -10);
addOffset("singDOWN", 20, -41);
addOffset("singUPmiss", 36, 55);
addOffset("singRIGHTmiss", -50, 2);
addOffset("singLEFTmiss", 146, -10);
addOffset("singDOWNmiss", 20, -41);

playAnim('idle');

flipX = false;
case 'scopguy':
frames = Paths.getSparrowAtlas('characters/foundation/scopguy');

Expand Down
1 change: 1 addition & 0 deletions source/FreeplayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ class FreeplayState extends MusicBeatState
newSong("bopcityfansong", "bopcityfansong", 1, "blocku", true),
newSong("celebrate", "Celebrate", 1, "afton"),
newSong("scopophobia", "Scopophobia", 1, "scopguy"),
newSong("andy", "andy", 1, "andy"),
newSong("stop-right-there-criminal-scum", "SRTCS", 1, "dave")
],
"Extras");
Expand Down
2 changes: 2 additions & 0 deletions source/HealthIcon.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ class HealthIcon extends FlxSprite
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('andy', [45, 45], 0, false, isPlayer);
animation.add('picy', [46, 46], 0, false, isPlayer);
animation.add('lock', [33, 33], 0, false, isPlayer);

if (!animation.exists(char)) {
Expand Down
30 changes: 28 additions & 2 deletions source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ class PlayState extends MusicBeatState
"bopcity" => -1,
"fnaf" => -1,
"ikea" => -1,
"foundation" => -1
"foundation" => -1,
"andy" => -1
];

var songTimer:SongTimer;
Expand Down Expand Up @@ -846,6 +847,17 @@ class PlayState extends MusicBeatState
bg.setGraphicSize(Std.int(bg.width * 1.5));
bg.updateHitbox();
add(bg);
case "andy":
defaultCamZoom = 0.9;
curStage = 'andy';

var bg:FlxSprite = new FlxSprite(-300, 0).loadGraphic(Paths.image('stages/andy/andy'));
bg.antialiasing = true;
bg.scrollFactor.set(0.9, 0.9);
bg.active = false;
bg.setGraphicSize(Std.int(bg.width * 1.5));
bg.updateHitbox();
add(bg);
default:
defaultCamZoom = 0.9;
curStage = 'stage';
Expand Down Expand Up @@ -951,6 +963,10 @@ class PlayState extends MusicBeatState
dad.x += 100;
dad.y += 330;
camPos.set(dad.getGraphicMidpoint().x + 200, dad.getGraphicMidpoint().y - 200);
case 'andy':
dad.x += 100;
dad.y += 330;
camPos.set(dad.getGraphicMidpoint().x + 200, dad.getGraphicMidpoint().y - 200);
case 'blocku':
dad.y += 150;
camPos.set(dad.getGraphicMidpoint().x + 200, dad.getGraphicMidpoint().y - 200);
Expand Down Expand Up @@ -1034,6 +1050,14 @@ class PlayState extends MusicBeatState

gf.x += 200;
gf.y += 100;
case 'andy':
boyfriend.x += 450;
boyfriend.y += 200;

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

gf.visible = false;
}

switch (SONG.player1)
Expand Down Expand Up @@ -2055,6 +2079,8 @@ class PlayState extends MusicBeatState
camFollow.x = dad.getMidpoint().x - 100;
case 'sonicexe':
camFollow.y = dad.getMidpoint().y + 30;
case 'andy':
camFollow.y = dad.getMidpoint().y + 30;
case 'blocku':
camFollow.y = dad.getMidpoint().y + 30;
case 'evilblocku':
Expand Down Expand Up @@ -3543,4 +3569,4 @@ class PlayState extends MusicBeatState
}

var curLight:Int = 0;
}
}

0 comments on commit a406f1a

Please sign in to comment.