quieter trailer and GF doin shit
This commit is contained in:
Cameron Taylor
parent
7149b586ac
commit
a518562806
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 MiB After Width: | Height: | Size: 3.1 MiB |
|
|
@ -2,34 +2,69 @@
|
|||
<TextureAtlas imagePath="gfTankmen.png">
|
||||
<!-- Created with Adobe Animate version 21.0.0.35450 -->
|
||||
<!-- http://www.adobe.com/products/animate.html -->
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10000" x="2745" y="2579" width="909" height="635" frameX="-2" frameY="-14" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10001" x="913" y="2581" width="909" height="635" frameX="-2" frameY="-14" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10002" x="2736" y="3218" width="906" height="633" frameX="-4" frameY="-16" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10003" x="910" y="3220" width="906" height="633" frameX="-4" frameY="-16" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10004" x="2749" y="1939" width="912" height="636" frameX="-1" frameY="-13" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10005" x="916" y="1941" width="912" height="636" frameX="-1" frameY="-13" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10006" x="917" y="1299" width="912" height="638" frameX="-1" frameY="-11" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10007" x="917" y="0" width="913" height="648" frameX="0" frameY="-1" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10008" x="917" y="0" width="913" height="648" frameX="0" frameY="-1" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10009" x="917" y="0" width="913" height="648" frameX="0" frameY="-1" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10010" x="0" y="0" width="913" height="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10011" x="0" y="0" width="913" height="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10012" x="0" y="0" width="913" height="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10013" x="1834" y="0" width="913" height="648" frameX="0" frameY="-1" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10014" x="1834" y="0" width="913" height="648" frameX="0" frameY="-1" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10015" x="1832" y="1941" width="909" height="637" frameX="-2" frameY="-12" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10016" x="0" y="1942" width="909" height="637" frameX="-2" frameY="-12" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10017" x="1826" y="2582" width="906" height="637" frameX="-4" frameY="-12" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10018" x="0" y="2583" width="906" height="637" frameX="-4" frameY="-12" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10019" x="1833" y="1299" width="912" height="638" frameX="-1" frameY="-11" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10020" x="0" y="1300" width="912" height="638" frameX="-1" frameY="-11" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10021" x="2751" y="1296" width="912" height="639" frameX="-1" frameY="-10" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10022" x="2751" y="0" width="913" height="644" frameX="0" frameY="-5" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10023" x="2751" y="0" width="913" height="644" frameX="0" frameY="-5" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10024" x="2751" y="648" width="913" height="644" frameX="0" frameY="-5" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10025" x="917" y="652" width="913" height="643" frameX="0" frameY="-6" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10026" x="917" y="652" width="913" height="643" frameX="0" frameY="-6" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10027" x="1834" y="652" width="913" height="643" frameX="0" frameY="-6" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10028" x="0" y="653" width="913" height="643" frameX="0" frameY="-6" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint instance 10029" x="0" y="653" width="913" height="643" frameX="0" frameY="-6" frameWidth="913" frameHeight="649"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0000" x="1824" y="1926" width="911" height="625" frameX="0" frameY="-5" frameWidth="911" frameHeight="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0001" x="1824" y="1926" width="911" height="625" frameX="0" frameY="-5" frameWidth="911" frameHeight="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0002" x="0" y="1925" width="911" height="629" frameX="0" frameY="-1" frameWidth="911" frameHeight="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0003" x="0" y="1925" width="911" height="629" frameX="0" frameY="-1" frameWidth="911" frameHeight="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0004" x="4569" y="1288" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0005" x="4569" y="1288" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0006" x="0" y="1291" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0007" x="0" y="1291" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0008" x="915" y="1292" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0009" x="915" y="1292" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0010" x="4569" y="1922" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0011" x="4569" y="1922" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0012" x="4569" y="1288" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0013" x="4569" y="1288" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0014" x="0" y="1291" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0015" x="0" y="1291" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0016" x="915" y="1292" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0017" x="915" y="1292" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0018" x="4569" y="1922" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0019" x="4569" y="1922" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0020" x="4569" y="1288" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0021" x="4569" y="1288" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0022" x="0" y="1291" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0023" x="0" y="1291" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0024" x="915" y="1292" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0025" x="915" y="1292" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0026" x="4569" y="1922" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0027" x="4569" y="1922" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0028" x="4569" y="1288" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0029" x="4569" y="1288" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0030" x="0" y="1291" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0031" x="0" y="1291" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0032" x="915" y="1292" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0033" x="915" y="1292" width="911" height="630"/>
|
||||
<SubTexture name="GF Crying at Gunpoint 0034" x="4569" y="1922" width="911" height="630"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0000" x="6399" y="1287" width="907" height="634" frameX="-2" frameY="-14" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0001" x="2737" y="1288" width="907" height="634" frameX="-2" frameY="-14" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0002" x="6399" y="1925" width="905" height="632" frameX="-3" frameY="-16" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0003" x="915" y="1926" width="905" height="632" frameX="-3" frameY="-16" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0004" x="3660" y="647" width="911" height="635" frameX="0" frameY="-13" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0005" x="0" y="652" width="911" height="635" frameX="0" frameY="-13" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0006" x="5490" y="646" width="911" height="637" frameX="0" frameY="-11" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0007" x="0" y="0" width="911" height="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0008" x="0" y="0" width="911" height="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0009" x="0" y="0" width="911" height="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0010" x="915" y="0" width="911" height="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0011" x="915" y="0" width="911" height="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0012" x="915" y="0" width="911" height="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0013" x="1830" y="0" width="911" height="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0014" x="1830" y="0" width="911" height="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0015" x="915" y="652" width="907" height="636" frameX="-2" frameY="-12" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0016" x="1826" y="652" width="907" height="636" frameX="-2" frameY="-12" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0017" x="3660" y="1286" width="905" height="636" frameX="-3" frameY="-12" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0018" x="5490" y="1287" width="905" height="636" frameX="-3" frameY="-12" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0019" x="6405" y="646" width="911" height="637" frameX="0" frameY="-11" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0020" x="2745" y="647" width="911" height="637" frameX="0" frameY="-11" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0021" x="4575" y="646" width="911" height="638" frameX="0" frameY="-10" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0022" x="2745" y="0" width="911" height="643" frameX="0" frameY="-5" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0023" x="2745" y="0" width="911" height="643" frameX="0" frameY="-5" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0024" x="3660" y="0" width="911" height="643" frameX="0" frameY="-5" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0025" x="4575" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0026" x="4575" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0027" x="5490" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0028" x="6405" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
|
||||
<SubTexture name="GF Dancing at Gunpoint0029" x="6405" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
|
||||
</TextureAtlas>
|
||||
|
|
|
|||
|
|
@ -73,6 +73,14 @@ class Character extends FlxSprite
|
|||
loadOffsetFile(curCharacter);
|
||||
|
||||
playAnim('danceRight');
|
||||
case 'gf-tankmen':
|
||||
frames = Paths.getSparrowAtlas('characters/gfTankmen');
|
||||
animation.addByIndices('sad', 'GF Crying at Gunpoint', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], "", 24, true);
|
||||
animation.addByIndices('danceLeft', 'GF Dancing at Gunpoint', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false);
|
||||
animation.addByIndices('danceRight', 'GF Dancing at Gunpoint', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
|
||||
|
||||
loadOffsetFile('gf');
|
||||
playAnim('danceRight');
|
||||
|
||||
case 'bf-holding-gf':
|
||||
frames = Paths.getSparrowAtlas('characters/bfAndGF');
|
||||
|
|
@ -614,7 +622,7 @@ class Character extends FlxSprite
|
|||
{
|
||||
switch (curCharacter)
|
||||
{
|
||||
case 'gf' | 'gf-christmas' | 'gf-car' | 'gf-pixel':
|
||||
case 'gf' | 'gf-christmas' | 'gf-car' | 'gf-pixel' | 'gf-tankmen':
|
||||
if (!animation.curAnim.name.startsWith('hair'))
|
||||
{
|
||||
danced = !danced;
|
||||
|
|
|
|||
|
|
@ -543,14 +543,14 @@ class PlayState extends MusicBeatState
|
|||
tankWatchtower = new BGSprite('tankWatchtower', 100, 50, 0.5, 0.5, ['watchtower gradient color']);
|
||||
add(tankWatchtower);
|
||||
|
||||
tankmanRun = new FlxTypedGroup<TankmenBG>();
|
||||
add(tankmanRun);
|
||||
|
||||
var tankGround:BGSprite = new BGSprite('tankGround', -420, -150);
|
||||
tankGround.setGraphicSize(Std.int(tankGround.width * 1.15));
|
||||
tankGround.updateHitbox();
|
||||
add(tankGround);
|
||||
|
||||
tankmanRun = new FlxTypedGroup<TankmenBG>();
|
||||
add(tankmanRun);
|
||||
|
||||
// smokeLeft.screenCenter();
|
||||
|
||||
var fgTank0:BGSprite = new BGSprite('tank0', -500, 650, 1.7, 1.5, ['fg']);
|
||||
|
|
@ -609,6 +609,8 @@ class PlayState extends MusicBeatState
|
|||
gfVersion = 'gf-pixel';
|
||||
case 'schoolEvil':
|
||||
gfVersion = 'gf-pixel';
|
||||
case 'tank':
|
||||
gfVersion = 'gf-tankmen';
|
||||
}
|
||||
|
||||
if (SONG.song.toLowerCase() == 'stress')
|
||||
|
|
@ -625,9 +627,9 @@ class PlayState extends MusicBeatState
|
|||
|
||||
for (i in 0...TankmenBG.animationNotes.length)
|
||||
{
|
||||
if (FlxG.random.bool(50))
|
||||
if (FlxG.random.bool(16))
|
||||
{
|
||||
var tankman:TankmenBG = new TankmenBG(500, 200 + FlxG.random.int(0, 150), TankmenBG.animationNotes[i][1] < 2);
|
||||
var tankman:TankmenBG = new TankmenBG(500, 200 + FlxG.random.int(50, 100), TankmenBG.animationNotes[i][1] < 2);
|
||||
tankman.strumTime = TankmenBG.animationNotes[i][0];
|
||||
tankmanRun.add(tankman);
|
||||
}
|
||||
|
|
@ -721,17 +723,17 @@ class PlayState extends MusicBeatState
|
|||
gf.x += 180;
|
||||
gf.y += 300;
|
||||
case "tank":
|
||||
gf.y += 10;
|
||||
gf.x -= 30;
|
||||
gf.y -= 65;
|
||||
gf.x -= 110;
|
||||
boyfriend.x += 40;
|
||||
boyfriend.y += 0;
|
||||
dad.y += 60;
|
||||
dad.x -= 80;
|
||||
|
||||
if (gfVersion != 'pico-speaker')
|
||||
if (gfVersion == 'gf-tankmen')
|
||||
{
|
||||
gf.x -= 80;
|
||||
gf.y -= 75;
|
||||
gf.x += 80;
|
||||
// gf.y -= 75;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -903,8 +905,8 @@ class PlayState extends MusicBeatState
|
|||
switch (curSong.toLowerCase())
|
||||
{
|
||||
// REMOVE THIS LATER
|
||||
case 'stress':
|
||||
stressIntro();
|
||||
// case 'stress':
|
||||
// stressIntro();
|
||||
|
||||
default:
|
||||
startCountdown();
|
||||
|
|
@ -2310,7 +2312,9 @@ class PlayState extends MusicBeatState
|
|||
noteSplash.cameras = [camHUD];
|
||||
}
|
||||
|
||||
songScore += score;
|
||||
// Only add the score if you're not on practice mode
|
||||
if (!practiceMode)
|
||||
songScore += score;
|
||||
|
||||
/* if (combo > 60)
|
||||
daRating = 'sick';
|
||||
|
|
@ -2619,7 +2623,8 @@ class PlayState extends MusicBeatState
|
|||
}
|
||||
combo = 0;
|
||||
|
||||
songScore -= 10;
|
||||
if (!practiceMode)
|
||||
songScore -= 10;
|
||||
|
||||
FlxG.sound.play(Paths.soundRandom('missnote', 1, 3), FlxG.random.float(0.1, 0.2));
|
||||
// FlxG.sound.play(Paths.sound('missnote1'), 1, false);
|
||||
|
|
|
|||
|
|
@ -31,6 +31,11 @@ class TankmenBG extends FlxSprite
|
|||
goingRight = isGoingRight;
|
||||
endingOffset = FlxG.random.float(50, 200);
|
||||
|
||||
updateHitbox();
|
||||
|
||||
setGraphicSize(Std.int(width * 0.8));
|
||||
updateHitbox();
|
||||
|
||||
tankSpeed = FlxG.random.float(0.6, 1);
|
||||
|
||||
if (goingRight)
|
||||
|
|
|
|||
|
|
@ -157,6 +157,7 @@ class TitleState extends MusicBeatState
|
|||
|
||||
video.width = video.videoWidth;
|
||||
video.height = video.videoHeight;
|
||||
// video.
|
||||
}
|
||||
|
||||
private function netStream_onAsyncError(event:AsyncErrorEvent):Void
|
||||
|
|
@ -179,7 +180,10 @@ class TitleState extends MusicBeatState
|
|||
|
||||
private function overlay_onMouseDown(event:MouseEvent):Void
|
||||
{
|
||||
netStream.soundTransform.volume = 0.2;
|
||||
netStream.soundTransform.pan = -1;
|
||||
netStream.play(Paths.file('music/kickstarterTrailer.mp4'));
|
||||
|
||||
FlxG.stage.removeChild(overlay);
|
||||
}
|
||||
|
||||
|
|
@ -431,6 +435,7 @@ class TitleState extends MusicBeatState
|
|||
FlxG.stage.removeChild(video);
|
||||
|
||||
startIntro();
|
||||
skipIntro();
|
||||
}
|
||||
#end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue