stuff for week 7

This commit is contained in:
Cameron Taylor 2021-03-04 03:00:48 -05:00
parent 958bc23c4c
commit 451e7f7d7a
19 changed files with 224 additions and 6 deletions

View File

@ -57,6 +57,7 @@
<library name="week4" preload="true" />
<library name="week5" preload="true" />
<library name="week6" preload="true" />
<library name="week7" preload="true" />
</section>
<section if="NO_PRELOAD_ALL">
@ -69,6 +70,7 @@
<library name="week4" preload="false" />
<library name="week5" preload="false" />
<library name="week6" preload="false" />
<library name="week7" preload="false" />
</section>
<assets path="assets/songs" library="songs" exclude="*.ogg" if="web"/>
@ -89,6 +91,8 @@
<assets path="assets/week5" library="week5" exclude="*.mp3" unless="web"/>
<assets path="assets/week6" library="week6" exclude="*.ogg" if="web"/>
<assets path="assets/week6" library="week6" exclude="*.mp3" unless="web"/>
<assets path="assets/week7" library="week7" exclude="*.ogg" if="web"/>
<assets path="assets/week7" library="week7" exclude="*.mp3" unless="web"/>
<assets path='example_mods' rename='mods' embed='false'/>
<assets path='art/readme.txt' rename='do NOT readme.txt' />

View File

@ -14,4 +14,5 @@ monster
bf-pixel
senpai
senpai-angry
spirit
spirit
tankman

File diff suppressed because one or more lines are too long

View File

@ -19,5 +19,6 @@ Etika
Foamymuffin (insert travis scott lyrics here)
SiIvaGunner
Masaya Matsuura
Mackenzie Mckee
BIT BOY - MIKE WELSH

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 833 KiB

View File

@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="tankmanCaptain.png">
<!-- Created with Adobe Animate version 21.0.0.35450 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Tankman DOWN note0000" x="0" y="0" width="565" height="452" frameX="-10" frameY="-20" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0001" x="0" y="0" width="565" height="452" frameX="-10" frameY="-20" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0002" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0003" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0004" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0005" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0006" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0007" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0008" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0009" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note MISS0000" x="0" y="0" width="565" height="452" frameX="-13" frameY="-18" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note MISS0001" x="0" y="0" width="565" height="452" frameX="-13" frameY="-18" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note MISS0002" x="1164" y="0" width="585" height="468" frameX="-3" frameY="0" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0003" x="1164" y="0" width="585" height="468" frameX="-3" frameY="0" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0004" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0005" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0006" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0007" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0008" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0009" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0010" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0011" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0012" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0013" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0014" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman Idle Dance0000" x="2360" y="0" width="425" height="553" frameX="-1" frameY="-19" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0001" x="2360" y="0" width="425" height="553" frameX="-1" frameY="-19" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0002" x="2795" y="0" width="427" height="556" frameX="0" frameY="-17" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0003" x="2795" y="0" width="427" height="556" frameX="0" frameY="-17" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0004" x="3232" y="0" width="425" height="561" frameX="-4" frameY="-12" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0005" x="3232" y="0" width="425" height="561" frameX="-4" frameY="-12" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0006" x="3667" y="0" width="428" height="572" frameX="-3" frameY="-1" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0007" x="0" y="582" width="429" height="572" frameX="-2" frameY="-1" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0008" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0009" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0010" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0011" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0012" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0013" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Note Left0000" x="878" y="582" width="500" height="525" frameX="0" frameY="-15" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0001" x="878" y="582" width="500" height="525" frameX="0" frameY="-15" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0002" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0003" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0004" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0005" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0006" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0007" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left MISS0000" x="878" y="582" width="500" height="525" frameX="0" frameY="-16" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left MISS0001" x="1883" y="582" width="494" height="543" frameX="-16" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0002" x="1883" y="582" width="494" height="543" frameX="-16" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0003" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0004" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0005" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0006" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0007" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0008" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0009" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Right Note0000" x="2893" y="582" width="484" height="558" frameX="-11" frameY="-3" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0001" x="2893" y="582" width="484" height="558" frameX="-11" frameY="-3" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0002" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0003" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0004" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0005" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0006" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0007" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0008" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0009" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0000" x="2893" y="582" width="484" height="558" frameX="-21" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0001" x="0" y="1165" width="489" height="560" frameX="0" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0002" x="0" y="1165" width="489" height="560" frameX="0" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0003" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0004" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0005" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0006" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0007" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0008" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman UP note0000" x="998" y="1165" width="491" height="619" frameX="0" frameY="0" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0001" x="998" y="1165" width="491" height="619" frameX="0" frameY="0" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0002" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0003" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0004" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0005" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0006" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0007" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0008" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0009" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note MISS0000" x="998" y="1165" width="491" height="619" frameX="0" frameY="0" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note MISS0001" x="2006" y="1165" width="491" height="601" frameX="-2" frameY="-19" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0002" x="2006" y="1165" width="491" height="601" frameX="-2" frameY="-19" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0003" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0004" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0005" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0006" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0007" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0008" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0009" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0010" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0011" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0012" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0013" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0014" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
</TextureAtlas>

View File

@ -0,0 +1,9 @@
idle 0 0
singUP 24 56
singRIGHT -1 -7
singLEFT 100 -14
singDOWN 98 -90
singUPmiss 53 84
singRIGHTmiss -1 -23
singLEFTmiss -30 16
singDOWNmiss -31 -29

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
assets/songs/ugh/Inst.mp3 Normal file

Binary file not shown.

BIN
assets/songs/ugh/Inst.ogg Normal file

Binary file not shown.

BIN
assets/songs/ugh/Voices.mp3 Normal file

Binary file not shown.

BIN
assets/songs/ugh/Voices.ogg Normal file

Binary file not shown.

View File

@ -8,6 +8,11 @@ import flixel.addons.display.FlxGridOverlay;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.text.FlxText;
import flixel.util.FlxColor;
import openfl.events.Event;
import openfl.events.IOErrorEvent;
import openfl.net.FileReference;
using StringTools;
/**
*DEBUG MODE
@ -190,6 +195,65 @@ class AnimationDebug extends FlxState
char.playAnim(animList[curAnim]);
}
if (FlxG.keys.justPressed.ESCAPE)
{
var outputString:String = "";
for (swagAnim in animList)
{
outputString += swagAnim + " " + char.animOffsets.get(swagAnim)[0] + " " + char.animOffsets.get(swagAnim)[1] + "\n";
}
outputString.trim();
saveOffsets(outputString);
}
super.update(elapsed);
}
var _file:FileReference;
private function saveOffsets(saveString:String)
{
if ((saveString != null) && (saveString.length > 0))
{
_file = new FileReference();
_file.addEventListener(Event.COMPLETE, onSaveComplete);
_file.addEventListener(Event.CANCEL, onSaveCancel);
_file.addEventListener(IOErrorEvent.IO_ERROR, onSaveError);
_file.save(saveString, daAnim + "Offsets.txt");
}
}
function onSaveComplete(_):Void
{
_file.removeEventListener(Event.COMPLETE, onSaveComplete);
_file.removeEventListener(Event.CANCEL, onSaveCancel);
_file.removeEventListener(IOErrorEvent.IO_ERROR, onSaveError);
_file = null;
FlxG.log.notice("Successfully saved LEVEL DATA.");
}
/**
* Called when the save file dialog is cancelled.
*/
function onSaveCancel(_):Void
{
_file.removeEventListener(Event.COMPLETE, onSaveComplete);
_file.removeEventListener(Event.CANCEL, onSaveCancel);
_file.removeEventListener(IOErrorEvent.IO_ERROR, onSaveError);
_file = null;
}
/**
* Called if there is an error while saving the gameplay recording.
*/
function onSaveError(_):Void
{
_file.removeEventListener(Event.COMPLETE, onSaveComplete);
_file.removeEventListener(Event.CANCEL, onSaveCancel);
_file.removeEventListener(IOErrorEvent.IO_ERROR, onSaveError);
_file = null;
FlxG.log.error("Problem saving Level data");
}
}

View File

@ -495,6 +495,31 @@ class Character extends FlxSprite
addOffset("singDOWN-alt", -30, -27);
playAnim('idle');
case 'tankman':
frames = Paths.getSparrowAtlas('characters/tankmanCaptain');
animation.addByPrefix('idle', "Tankman Idle Dance", 24, false);
animation.addByPrefix('singUP', 'Tankman UP note0', 24, false);
animation.addByPrefix('singDOWN', 'Tankman DOWN note0', 24, false);
animation.addByPrefix('singLEFT', 'Tankman Note Left0', 24, false);
animation.addByPrefix('singRIGHT', 'Tankman Right Note0', 24, false);
animation.addByPrefix('singUPmiss', 'Tankman UP note MISS', 24, false);
animation.addByPrefix('singDOWNmiss', 'Tankman DOWN note MISS', 24, false);
animation.addByPrefix('singLEFTmiss', 'Tankman Note Left MISS', 24, false);
animation.addByPrefix('singRIGHTmiss', 'Tankman Right Note MISS', 24, false);
addOffset('idle');
addOffset("singUP", 24, 56);
addOffset("singRIGHT", -1, -7);
addOffset("singLEFT", 100, -14);
addOffset("singDOWN", 98, -90);
addOffset("singUPmiss", 24, 56);
addOffset("singRIGHTmiss", -1, -7);
addOffset("singLEFTmiss", 100, -14);
addOffset("singDOWNmiss", 98, -90);
playAnim('idle');
flipX = true;
}
dance();
@ -522,6 +547,11 @@ class Character extends FlxSprite
}
}
private function loadOffsetFile(offsetCharacter:String)
{
var daFile:String = Paths.file("characters/" + offsetCharacter + "Offsets.txt");
}
override function update(elapsed:Float)
{
if (!curCharacter.startsWith('bf'))

View File

@ -75,6 +75,9 @@ class FreeplayState extends MusicBeatState
if (StoryMenuState.weekUnlocked[6] || isDebug)
addWeek(['Senpai', 'Roses', 'Thorns'], 6, ['senpai', 'senpai', 'spirit']);
if (StoryMenuState.weekUnlocked[7] || isDebug)
addWeek(['Ugh', 'Guns', 'Stress'], 7, ['tankman']);
// LOAD MUSIC
// LOAD CHARACTERS