stress cutscene progress
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
<!DOCTYPE codename-engine-character>
|
||||
<character isPlayer="false" flipX="false" isGF="true" x="175" y="325">
|
||||
<anim name="danceLeft" anim="GF Dancing at Gunpoint" fps="24" loop="false" x="0" y="0" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
|
||||
<anim name="danceRight" anim="GF Dancing at Gunpoint" fps="24" loop="false" x="0" y="0" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
|
||||
<anim name="sad" anim="GF Crying at Gunpoint" fps="24" loop="true" x="0" y="0" indices="0,1,2,3,4,5,6,7,8,9,10,11,12"/>
|
||||
<character isPlayer="false" flipX="false" isGF="true" x="100" y="275">
|
||||
<anim name="danceLeft" anim="GF Dancing at Gunpoint" fps="24" loop="false" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
|
||||
<anim name="danceRight" anim="GF Dancing at Gunpoint" fps="24" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
|
||||
<anim name="dance-cutscene" anim="GF Dancing at Gunpoint" fps="24" loop="true" />
|
||||
<anim name="sad" anim="GF Crying at Gunpoint" fps="24" loop="true" indices="0,1,2,3,4,5,6,7,8,9,10,11,12"/>
|
||||
</character>
|
||||
@@ -14,6 +14,6 @@ function onPlaySingAnim(event) {
|
||||
}
|
||||
|
||||
function update(elapsed) {
|
||||
if (animation.curAnim == null || (animation.curAnim.name.substr(0, 5) == "shoot" && animation.curAnim.finished))
|
||||
if (getAnimName() == null || (getAnimName().substr(0, 5) == "shoot" && isAnimFinished()))
|
||||
dance();
|
||||
}
|
||||
@@ -1,16 +1,16 @@
|
||||
<!DOCTYPE codename-engine-character>
|
||||
<character isPlayer="false" flipX="false" icon="pico" x="140" y="-125">
|
||||
<character isPlayer="false" flipX="false" icon="pico" x="-50" y="-120" camx="195" camy="365">
|
||||
<!-- Left Animations -->
|
||||
<anim name="shoot1" anim="Pico shoot 1" fps="24" loop="false" indices="0,1,2,3" />
|
||||
<anim name="idle1" anim="Pico shoot 1" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" />
|
||||
|
||||
<anim name="shoot2" anim="Pico shoot 2" fps="24" loop="false" indices="0,1,2,3" />
|
||||
<anim name="idle2" anim="Pico shoot 2" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" x="-1" y="-128" />
|
||||
<anim name="idle2" anim="Pico shoot 2" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" />
|
||||
|
||||
<!-- Right Animations-->
|
||||
<anim name="shoot3" anim="Pico shoot 3" fps="24" loop="false" indices="0,1,2,3" />
|
||||
<anim name="idle3" anim="Pico shoot 3" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" x="412" y="-64" />
|
||||
<anim name="idle3" anim="Pico shoot 3" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" />
|
||||
|
||||
<anim name="shoot4" anim="Pico shoot 4" fps="24" loop="false" indices="0,1,2,3" />
|
||||
<anim name="idle4" anim="Pico shoot 4" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" x="439" y="-19" />
|
||||
<anim name="idle4" anim="Pico shoot 4" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" />
|
||||
</character>
|
||||
@@ -1,3 +1,3 @@
|
||||
function update(elapsed)
|
||||
if (FlxG.keys.justPressed.ONE)
|
||||
FlxG.state.endSong();
|
||||
if (FlxG.keys.justPressed.F5)
|
||||
FlxG.resetState();
|
||||
@@ -16,7 +16,7 @@
|
||||
<sprite name="tankGround" x="-420" y="-150" sprite="tankGround" scale="1.15" updateHitbox="true" zoomfactor="1.0"/>
|
||||
|
||||
<!-- CHARACTERS -->
|
||||
<girlfriend x="230" y="55"/>
|
||||
<girlfriend x="305" y="105"/>
|
||||
<dad x="20" y="160"/>
|
||||
<boyfriend x="810"/>
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,60 @@
|
||||
{"ATLAS": {"SPRITES":[
|
||||
{"SPRITE" : {"name": "0000","x":4076,"y":2,"w":9,"h":12,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0001","x":1957,"y":2,"w":524,"h":501,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0002","x":716,"y":2,"w":721,"h":621,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0003","x":2331,"y":505,"w":139,"h":109,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0004","x":3244,"y":725,"w":303,"h":170,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0005","x":1691,"y":516,"w":248,"h":277,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0006","x":2495,"y":843,"w":173,"h":229,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0007","x":2,"y":642,"w":262,"h":221,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0008","x":2331,"y":616,"w":118,"h":117,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0009","x":3549,"y":865,"w":261,"h":139,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0010","x":3209,"y":897,"w":202,"h":122,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0011","x":580,"y":913,"w":202,"h":122,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0012","x":2831,"y":304,"w":45,"h":42,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0013","x":1957,"y":505,"w":372,"h":311,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0014","x":1439,"y":516,"w":250,"h":325,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0015","x":716,"y":625,"w":235,"h":286,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0016","x":953,"y":625,"w":245,"h":249,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0017","x":3644,"y":373,"w":136,"h":133,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0018","x":2331,"y":735,"w":150,"h":91,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0019","x":3644,"y":508,"w":151,"h":95,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0020","x":784,"y":913,"w":140,"h":90,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0021","x":3644,"y":605,"w":149,"h":92,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0022","x":2670,"y":932,"w":144,"h":87,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0023","x":2670,"y":843,"w":152,"h":87,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0024","x":4087,"y":2,"w":1,"h":4,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0025","x":2831,"y":373,"w":411,"h":352,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0026","x":3244,"y":373,"w":398,"h":350,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0027","x":266,"y":642,"w":329,"h":162,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0028","x":597,"y":642,"w":90,"h":103,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0029","x":1200,"y":625,"w":211,"h":236,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0030","x":2831,"y":727,"w":208,"h":235,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0031","x":2483,"y":2,"w":738,"h":300,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0032","x":2483,"y":304,"w":346,"h":537,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0033","x":2,"y":865,"w":235,"h":158,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0034","x":3812,"y":865,"w":216,"h":141,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0035","x":2000,"y":818,"w":299,"h":155,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0036","x":1200,"y":863,"w":179,"h":208,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0037","x":1691,"y":818,"w":307,"h":154,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0038","x":3644,"y":702,"w":320,"h":161,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0039","x":266,"y":806,"w":312,"h":155,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0040","x":239,"y":963,"w":224,"h":108,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0041","x":3223,"y":2,"w":580,"h":369,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0042","x":3805,"y":2,"w":269,"h":698,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0043","x":1413,"y":843,"w":205,"h":222,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0044","x":3041,"y":727,"w":166,"h":292,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0045","x":953,"y":876,"w":203,"h":137,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0046","x":1439,"y":2,"w":516,"h":512,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0047","x":2,"y":2,"w":712,"h":638,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0048","x":2301,"y":843,"w":192,"h":227,"rotated": false}}
|
||||
]},
|
||||
"meta": {
|
||||
"app": "Adobe Animate",
|
||||
"version": "21.0.1.37179",
|
||||
"image": "spritemap1.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {"w":4090,"h":1074},
|
||||
"resolution": "1"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 562 KiB |
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,145 @@
|
||||
{"ATLAS": {"SPRITES":[
|
||||
{"SPRITE" : {"name": "0000","x":2847,"y":969,"w":327,"h":397,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0001","x":2441,"y":894,"w":110,"h":159,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0002","x":1709,"y":1631,"w":197,"h":185,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0003","x":408,"y":1773,"w":92,"h":155,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0004","x":236,"y":1639,"w":274,"h":132,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0005","x":3427,"y":1495,"w":133,"h":74,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0006","x":3270,"y":540,"w":121,"h":162,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0007","x":359,"y":649,"w":518,"h":294,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0008","x":1957,"y":2,"w":775,"h":483,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0009","x":1014,"y":2,"w":941,"h":607,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0010","x":2,"y":2,"w":1010,"h":645,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0011","x":4059,"y":2,"w":20,"h":142,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0012","x":4035,"y":616,"w":40,"h":83,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0013","x":2755,"y":1508,"w":64,"h":57,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0014","x":3176,"y":1171,"w":91,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0015","x":3245,"y":1737,"w":88,"h":41,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0016","x":3064,"y":1368,"w":109,"h":93,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0017","x":3402,"y":2,"w":655,"h":434,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0018","x":1957,"y":487,"w":626,"h":405,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0019","x":3402,"y":438,"w":631,"h":438,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0020","x":1170,"y":1211,"w":393,"h":287,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0021","x":2847,"y":540,"w":421,"h":427,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0022","x":2734,"y":2,"w":666,"h":536,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0023","x":542,"y":1480,"w":224,"h":221,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0024","x":3657,"y":1736,"w":186,"h":175,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0025","x":4035,"y":764,"w":56,"h":52,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0026","x":502,"y":1876,"w":126,"h":104,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0027","x":1709,"y":1818,"w":135,"h":104,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0028","x":2,"y":1440,"w":232,"h":236,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0029","x":3938,"y":1437,"w":139,"h":109,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0030","x":2755,"y":1627,"w":235,"h":158,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0031","x":1147,"y":1500,"w":198,"h":233,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0032","x":2,"y":1860,"w":118,"h":117,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0033","x":1565,"y":1398,"w":262,"h":221,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0034","x":3845,"y":1736,"w":222,"h":145,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0035","x":979,"y":1480,"w":166,"h":292,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0036","x":3657,"y":1592,"w":276,"h":142,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0037","x":925,"y":1774,"w":203,"h":138,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0038","x":236,"y":1467,"w":304,"h":170,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0039","x":4081,"y":2,"w":1,"h":4,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0040","x":2441,"y":1055,"w":135,"h":127,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0041","x":2,"y":1678,"w":195,"h":180,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0042","x":2751,"y":1787,"w":160,"h":144,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0043","x":713,"y":945,"w":243,"h":261,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0044","x":2375,"y":1508,"w":378,"h":121,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0045","x":3064,"y":1495,"w":361,"h":128,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0046","x":713,"y":1211,"w":455,"h":267,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0047","x":2,"y":1112,"w":272,"h":326,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0048","x":3710,"y":878,"w":249,"h":557,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0049","x":2585,"y":540,"w":260,"h":701,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0050","x":1014,"y":611,"w":291,"h":598,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0051","x":1307,"y":611,"w":315,"h":540,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0052","x":2,"y":649,"w":355,"h":461,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0053","x":359,"y":945,"w":352,"h":373,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0054","x":3064,"y":1625,"w":347,"h":110,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0055","x":2039,"y":1248,"w":379,"h":216,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0056","x":2827,"y":1368,"w":235,"h":257,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0057","x":2100,"y":1879,"w":140,"h":92,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0058","x":776,"y":1886,"w":119,"h":79,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0059","x":1565,"y":1249,"w":434,"h":147,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0060","x":276,"y":1320,"w":433,"h":145,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0061","x":3270,"y":878,"w":438,"h":342,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0062","x":3176,"y":1222,"w":385,"h":271,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0063","x":3563,"y":1437,"w":373,"h":153,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0064","x":3245,"y":1786,"w":202,"h":122,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0065","x":3449,"y":1786,"w":202,"h":122,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0066","x":3064,"y":1861,"w":150,"h":91,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0067","x":3938,"y":1548,"w":151,"h":95,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0068","x":3845,"y":1883,"w":140,"h":90,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0069","x":2913,"y":1861,"w":149,"h":92,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0070","x":630,"y":1886,"w":144,"h":87,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0071","x":3935,"y":1645,"w":152,"h":87,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0072","x":2441,"y":1243,"w":384,"h":263,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0073","x":1624,"y":611,"w":248,"h":277,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0074","x":1624,"y":894,"w":413,"h":353,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0075","x":2039,"y":894,"w":400,"h":352,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0076","x":1829,"y":1466,"w":330,"h":163,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0077","x":3987,"y":1883,"w":90,"h":103,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0078","x":2161,"y":1466,"w":212,"h":238,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0079","x":768,"y":1480,"w":209,"h":236,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0080","x":2242,"y":1879,"w":86,"h":84,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0081","x":879,"y":649,"w":126,"h":148,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0082","x":1908,"y":1631,"w":216,"h":168,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0083","x":2575,"y":1631,"w":174,"h":192,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0084","x":1130,"y":1901,"w":106,"h":75,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0085","x":3961,"y":1367,"w":129,"h":63,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0086","x":1829,"y":1398,"w":158,"h":60,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0087","x":3270,"y":704,"w":123,"h":148,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0088","x":3961,"y":878,"w":123,"h":148,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0089","x":199,"y":1773,"w":207,"h":142,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0090","x":1238,"y":1901,"w":91,"h":53,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0091","x":276,"y":1112,"w":65,"h":96,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0092","x":276,"y":1210,"w":65,"h":96,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0093","x":2518,"y":1825,"w":136,"h":102,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0094","x":1537,"y":1857,"w":136,"h":102,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0095","x":3427,"y":1592,"w":228,"h":192,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0096","x":1541,"y":1621,"w":166,"h":234,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0097","x":512,"y":1703,"w":205,"h":171,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0098","x":2126,"y":1706,"w":205,"h":171,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0099","x":719,"y":1718,"w":204,"h":166,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0100","x":1147,"y":1735,"w":206,"h":164,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0101","x":1874,"y":611,"w":79,"h":185,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0102","x":3176,"y":969,"w":83,"h":200,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0103","x":3563,"y":1222,"w":86,"h":180,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0104","x":3961,"y":1028,"w":89,"h":186,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0105","x":2375,"y":1631,"w":198,"h":183,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0106","x":1908,"y":1801,"w":190,"h":120,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0107","x":2656,"y":1825,"w":86,"h":145,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0108","x":1355,"y":1724,"w":180,"h":170,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0109","x":3961,"y":1216,"w":111,"h":149,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0110","x":4035,"y":516,"w":39,"h":98,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0111","x":1307,"y":1153,"w":118,"h":47,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0112","x":1427,"y":1153,"w":120,"h":43,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0113","x":2441,"y":1184,"w":120,"h":41,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0114","x":3216,"y":1910,"w":95,"h":33,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0115","x":3563,"y":1404,"w":95,"h":31,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0116","x":3563,"y":1404,"w":95,"h":31,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0117","x":2330,"y":1906,"w":95,"h":34,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0118","x":2585,"y":487,"w":131,"h":47,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0119","x":4059,"y":258,"w":31,"h":18,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0120","x":1355,"y":1896,"w":122,"h":66,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0121","x":2992,"y":1737,"w":251,"h":122,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0122","x":879,"y":799,"w":114,"h":133,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0123","x":1347,"y":1500,"w":192,"h":222,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0124","x":4035,"y":818,"w":39,"h":34,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0125","x":4035,"y":701,"w":50,"h":61,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0126","x":1874,"y":798,"w":64,"h":78,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0127","x":4035,"y":438,"w":52,"h":76,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0128","x":958,"y":934,"w":46,"h":63,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0129","x":4059,"y":146,"w":30,"h":41,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0130","x":4059,"y":189,"w":23,"h":35,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0131","x":4059,"y":226,"w":20,"h":30,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0132","x":4059,"y":278,"w":17,"h":22,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0133","x":2333,"y":1816,"w":183,"h":88,"rotated": false}}
|
||||
]},
|
||||
"meta": {
|
||||
"app": "Adobe Animate",
|
||||
"version": "21.0.1.37179",
|
||||
"image": "spritemap1.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {"w":4093,"h":1988},
|
||||
"resolution": "1"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1020 KiB |
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,109 @@
|
||||
{"ATLAS": {"SPRITES":[
|
||||
{"SPRITE" : {"name": "0000","x":560,"y":841,"w":216,"h":155,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0001","x":1149,"y":828,"w":144,"h":211,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0002","x":2,"y":901,"w":179,"h":159,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0003","x":1030,"y":362,"w":90,"h":117,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0004","x":1910,"y":926,"w":123,"h":133,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0005","x":2,"y":2,"w":375,"h":424,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0006","x":1744,"y":926,"w":164,"h":164,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0007","x":1420,"y":344,"w":90,"h":118,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0008","x":778,"y":841,"w":137,"h":202,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0009","x":1534,"y":753,"w":208,"h":202,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0010","x":1125,"y":2,"w":385,"h":340,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0011","x":1800,"y":296,"w":221,"h":194,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0012","x":737,"y":2,"w":386,"h":358,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0013","x":1800,"y":2,"w":228,"h":292,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0014","x":379,"y":2,"w":356,"h":399,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0015","x":1744,"y":753,"w":214,"h":171,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0016","x":1960,"y":834,"w":83,"h":38,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0017","x":284,"y":428,"w":80,"h":73,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0018","x":1960,"y":753,"w":84,"h":38,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0019","x":1030,"y":481,"w":89,"h":62,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0020","x":1132,"y":1098,"w":100,"h":21,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0021","x":662,"y":466,"w":70,"h":54,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0022","x":476,"y":915,"w":81,"h":36,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0023","x":183,"y":901,"w":89,"h":37,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0024","x":940,"y":701,"w":78,"h":45,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0025","x":112,"y":1078,"w":109,"h":41,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0026","x":662,"y":599,"w":276,"h":240,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0027","x":1512,"y":263,"w":286,"h":246,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0028","x":1420,"y":511,"w":279,"h":240,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0029","x":379,"y":403,"w":281,"h":240,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0030","x":1030,"y":586,"w":278,"h":240,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0031","x":2,"y":428,"w":280,"h":240,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0032","x":737,"y":362,"w":291,"h":235,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0033","x":1125,"y":344,"w":293,"h":240,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0034","x":1512,"y":2,"w":285,"h":259,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0035","x":1572,"y":1063,"w":104,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0036","x":1910,"y":1061,"w":104,"h":50,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0037","x":1140,"y":1041,"w":104,"h":55,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0038","x":662,"y":403,"w":68,"h":61,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0039","x":1982,"y":669,"w":54,"h":52,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0040","x":413,"y":1064,"w":104,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0041","x":2,"y":1062,"w":108,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0042","x":596,"y":1060,"w":112,"h":47,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0043","x":223,"y":1078,"w":115,"h":31,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0044","x":560,"y":747,"w":99,"h":45,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0045","x":940,"y":649,"w":81,"h":50,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0046","x":596,"y":998,"w":121,"h":60,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0047","x":1458,"y":1063,"w":112,"h":45,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0048","x":1036,"y":1002,"w":102,"h":59,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0049","x":1246,"y":1062,"w":104,"h":49,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0050","x":300,"y":1022,"w":111,"h":54,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0051","x":476,"y":998,"w":118,"h":64,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0052","x":1982,"y":492,"w":61,"h":61,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0053","x":1982,"y":612,"w":52,"h":55,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0054","x":1352,"y":1062,"w":104,"h":49,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0055","x":917,"y":1002,"w":117,"h":59,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0056","x":183,"y":1022,"w":115,"h":54,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0057","x":1678,"y":1092,"w":111,"h":27,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0058","x":1310,"y":586,"w":100,"h":63,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0059","x":940,"y":599,"w":85,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0060","x":1295,"y":945,"w":185,"h":115,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0061","x":1960,"y":874,"w":82,"h":37,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0062","x":933,"y":1063,"w":101,"h":50,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0063","x":1701,"y":511,"w":279,"h":240,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0064","x":276,"y":876,"w":198,"h":144,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0065","x":940,"y":828,"w":207,"h":172,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0066","x":1310,"y":753,"w":222,"h":190,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0067","x":284,"y":503,"w":90,"h":47,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0068","x":1651,"y":1000,"w":57,"h":47,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0069","x":183,"y":992,"w":88,"h":28,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0070","x":476,"y":953,"w":79,"h":35,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0071","x":662,"y":522,"w":72,"h":49,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0072","x":2,"y":670,"w":272,"h":229,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0073","x":284,"y":645,"w":274,"h":229,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0074","x":560,"y":794,"w":94,"h":44,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0075","x":560,"y":645,"w":100,"h":49,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0076","x":1310,"y":651,"w":107,"h":58,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0077","x":1982,"y":555,"w":55,"h":55,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0078","x":340,"y":1078,"w":47,"h":49,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0079","x":1036,"y":1063,"w":94,"h":44,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0080","x":719,"y":1045,"w":106,"h":53,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0081","x":827,"y":1063,"w":104,"h":49,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0082","x":1791,"y":1092,"w":101,"h":25,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0083","x":940,"y":748,"w":77,"h":43,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0084","x":1482,"y":957,"w":167,"h":104,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0085","x":519,"y":1064,"w":74,"h":34,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0086","x":284,"y":552,"w":91,"h":45,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0087","x":1030,"y":545,"w":87,"h":39,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0088","x":284,"y":599,"w":86,"h":41,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0089","x":1420,"y":464,"w":84,"h":43,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0090","x":183,"y":940,"w":56,"h":50,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0091","x":719,"y":998,"w":44,"h":43,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0092","x":1960,"y":793,"w":81,"h":39,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0093","x":1310,"y":711,"w":95,"h":39,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0094","x":940,"y":793,"w":86,"h":29,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0095","x":476,"y":876,"w":81,"h":37,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0096","x":1651,"y":957,"w":66,"h":41,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0097","x":560,"y":696,"w":99,"h":49,"rotated": false}}
|
||||
]},
|
||||
"meta": {
|
||||
"app": "Adobe Animate",
|
||||
"version": "21.0.1.37179",
|
||||
"image": "spritemap1.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {"w":2046,"h":1129},
|
||||
"resolution": "1"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 311 KiB |
@@ -10,7 +10,7 @@ function create() {
|
||||
tankman = new FunkinSprite(game.dad.x + game.dad.globalOffset.x + 520, game.dad.y + game.dad.globalOffset.y + 225);
|
||||
tankman.antialiasing = true;
|
||||
tankman.loadSprite(Paths.image('game/cutscenes/tank/guns-tankman'));
|
||||
tankman.animateAtlas.anim.addBySymbol('tank', 'TANK TALK 2', 24, false);
|
||||
tankman.animateAtlas.anim.addBySymbol('tank', 'TANK TALK 2', 0, false);
|
||||
|
||||
game.insert(game.members.indexOf(game.dad), tankman);
|
||||
game.dad.visible = false;
|
||||
@@ -32,7 +32,7 @@ function create() {
|
||||
{
|
||||
FlxTween.tween(FlxG.camera, {zoom: game.defaultCamZoom * 1.4}, 0.4, {ease: FlxEase.quadOut});
|
||||
FlxTween.tween(FlxG.camera, {zoom: game.defaultCamZoom * 1.3}, 0.7, {ease: FlxEase.quadInOut, startDelay: 0.45});
|
||||
game.gf.playAnim('sad');
|
||||
game.gf.playAnim('sad', false, "DANCE");
|
||||
});
|
||||
|
||||
new FlxTimer().start(11, function(tmr:FlxTimer)
|
||||
@@ -56,9 +56,6 @@ function focusOn(char) {
|
||||
}
|
||||
|
||||
function update(elapsed:Float) {
|
||||
if (FlxG.keys.justPressed.F5)
|
||||
FlxG.resetState();
|
||||
|
||||
lipSync(tankTalk);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
import lime.app.Application;
|
||||
import funkin.system.FunkinSprite;
|
||||
import funkin.options.Options;
|
||||
|
||||
var tankman, pico:FunkinSprite;
|
||||
var gf:Character;
|
||||
var stressCutscene:FlxSound;
|
||||
var step:Int = 0;
|
||||
|
||||
function create() {
|
||||
FlxG.camera.zoom = 1;
|
||||
game.camHUD.visible = false;
|
||||
game.persistentUpdate = true;
|
||||
|
||||
game.gf.visible = false;
|
||||
gf = new Character(game.gf.x, game.gf.y, "gf-tankmen");
|
||||
gf.scrollFactor.set(0.95, 0.95);
|
||||
gf.playAnim("dance-cutscene");
|
||||
game.insert(game.members.indexOf(game.gf), gf);
|
||||
|
||||
stressCutscene = FlxG.sound.load(Paths.sound(Options.naughtyness ? 'cutscenes/tank/stress' : 'cutscenes/tank/stress-censor'));
|
||||
|
||||
stressCutscene.play();
|
||||
stressCutscene.onComplete = function() {
|
||||
for(spr in [gf, tankman, pico]) {
|
||||
spr.destroy();
|
||||
game.remove(spr);
|
||||
}
|
||||
game.camHUD.visible = game.dad.visible = game.gf.visible = true;
|
||||
close();
|
||||
};
|
||||
|
||||
tankman = new FunkinSprite(game.dad.x + game.dad.globalOffset.x + 520, game.dad.y + game.dad.globalOffset.y + 225);
|
||||
tankman.antialiasing = true;
|
||||
tankman.loadSprite(Paths.image('game/cutscenes/tank/stress-tankman'));
|
||||
tankman.animateAtlas.anim.addBySymbol('p1', 'TANK TALK 3 P1 UNCUT', 0, false);
|
||||
tankman.animateAtlas.anim.addBySymbol('p2', 'TANK TALK 3 P2 UNCUT', 0, false);
|
||||
tankman.playAnim('p1');
|
||||
|
||||
pico = new FunkinSprite(game.gf.x + game.gf.globalOffset.x + 150, game.gf.y + game.gf.globalOffset.y + 395);
|
||||
pico.antialiasing = true;
|
||||
pico.loadSprite(Paths.image('game/cutscenes/tank/stress-pico'));
|
||||
pico.animateAtlas.anim.addBySymbol('die', 'GF Time to Die sequence', 24, false);
|
||||
pico.animateAtlas.anim.addBySymbol('saves', 'Pico Saves them sequence', 24, false);
|
||||
pico.animateAtlas.anim.addBySymbol('idle', 'Pico Dual Wield on Speaker idle', 24, true);
|
||||
pico.scrollFactor.set(0.95, 0.95);
|
||||
pico.playAnim("idle");
|
||||
pico.visible = false;
|
||||
game.insert(game.members.indexOf(game.gf), pico);
|
||||
|
||||
game.insert(game.members.indexOf(game.dad), tankman);
|
||||
|
||||
game.dad.visible = false;
|
||||
|
||||
focusOn(game.dad);
|
||||
}
|
||||
function update(elapsed) {
|
||||
if (FlxG.keys.justPressed.F5)
|
||||
FlxG.resetState();
|
||||
switch(step) {
|
||||
case 0:
|
||||
lipSync(tankman, 0, 16750);
|
||||
if (stressCutscene.time > 15100) {
|
||||
step = 1;
|
||||
focusOn(game.gf);
|
||||
pico.visible = true;
|
||||
pico.playAnim('die', true);
|
||||
|
||||
// removes old gf to free ram
|
||||
game.remove(gf);
|
||||
gf.destroy();
|
||||
|
||||
FlxTween.tween(FlxG.camera, {zoom: FlxG.camera.zoom * 1.3}, 2.1, {ease: FlxEase.quadInOut});
|
||||
}
|
||||
case 1:
|
||||
lipSync(tankman, 0, 16750);
|
||||
if (stressCutscene.time > 17300) {
|
||||
FlxG.camera.zoom = 0.8;
|
||||
step = 2;
|
||||
pico.playAnim('saves', true);
|
||||
}
|
||||
case 2:
|
||||
if (stressCutscene.time > 19600) {
|
||||
tankman.playAnim('p2', true);
|
||||
step = 3;
|
||||
}
|
||||
case 3:
|
||||
lipSync(tankman, 19500, stressCutscene.length);
|
||||
if (stressCutscene.time > 20300) {
|
||||
game.camFollow.y += 180;
|
||||
game.camFollow.x -= 80;
|
||||
step = 4;
|
||||
}
|
||||
case 4:
|
||||
lipSync(tankman, 19500, stressCutscene.length);
|
||||
if (pico.isAnimFinished() && pico.getAnimName() == "saves")
|
||||
pico.playAnim("idle");
|
||||
}
|
||||
}
|
||||
|
||||
function lipSync(char:FunkinSprite, begin:Float, end:Float) {
|
||||
char.animateAtlas.anim.curFrame = Std.int(FlxMath.remapToRange(stressCutscene.time, begin, end, 0, char.animateAtlas.anim.length-1));
|
||||
}
|
||||
|
||||
function focusOn(char) {
|
||||
var camPos = char.getCameraPosition();
|
||||
game.camFollow.setPosition(camPos.x, camPos.y);
|
||||
camPos.put();
|
||||
}
|
||||
@@ -1,30 +1,25 @@
|
||||
import openfl.utils.Assets;
|
||||
|
||||
function onNoteCreation(event) {
|
||||
if (event.noteType != null || event.note.noteTypeID > 0) {
|
||||
// event.note.visible = false;
|
||||
event.note.strumLineID = 2;
|
||||
}
|
||||
function onPostGenerateStrums() {
|
||||
strumLine = new StrumLine([gf], -1, true, controls);
|
||||
players.push(strumLine);
|
||||
strumLine.generateStrums();
|
||||
}
|
||||
|
||||
function onNoteCreation(event)
|
||||
if (event.noteType != null || event.note.noteTypeID > 0)
|
||||
event.note.strumLineID = 2;
|
||||
|
||||
var strumLine:StrumLine;
|
||||
|
||||
function postCreate() {
|
||||
strumLine = new StrumLine([gf], 0.5, true, controls);
|
||||
players.push(strumLine);
|
||||
strumLine.generateStrums();
|
||||
generateNotes(CoolUtil.parseJson(Paths.chart('stress', 'picospeaker')).song);
|
||||
|
||||
for(s in cpuStrums)
|
||||
s.x -= FlxG.width * 0.125;
|
||||
for(s in playerStrums)
|
||||
s.x += FlxG.width * 0.125;
|
||||
}
|
||||
|
||||
function update(elapsed) {
|
||||
camHUD.zoom /= 0.75;
|
||||
}
|
||||
function postUpdate(elapsed) {
|
||||
camHUD.zoom *= 0.75;
|
||||
function onStrumCreation(event) {
|
||||
if (event.player == 3) {
|
||||
event.cancelAnimation();
|
||||
event.strum.alpha = 0;
|
||||
event.strum.visible = false;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1 +1 @@
|
||||
2216
|
||||
2219
|
||||
@@ -680,7 +680,7 @@ class PlayState extends MusicBeatState
|
||||
super.create();
|
||||
}
|
||||
public override function createPost() {
|
||||
startCutscene();
|
||||
startCutscene("", cutscene);
|
||||
super.createPost();
|
||||
|
||||
updateDiscordPresence();
|
||||
@@ -692,41 +692,44 @@ class PlayState extends MusicBeatState
|
||||
DiscordUtil.changeSongPresence(detailsText, (paused ? "Paused - " : "") + SONG.song + " (" + difficulty + ")", inst, getIconRPC());
|
||||
}
|
||||
|
||||
public function startCutscene(prefix:String = "") {
|
||||
public function startCutscene(prefix:String = "", ?cutsceneScriptPath:String, ?callback:Void->Void) {
|
||||
if (callback == null)
|
||||
callback = startCountdown;
|
||||
|
||||
if (playCutscenes) {
|
||||
inCutscene = true;
|
||||
var videoCutscene = Paths.video('${PlayState.SONG.song.toLowerCase()}-${prefix}cutscene');
|
||||
var videoCutsceneAlt = Paths.file('songs/${PlayState.SONG.song.toLowerCase()}/${prefix}cutscene.mp4');
|
||||
var dialogue = Paths.file('songs/${PlayState.SONG.song.toLowerCase()}/${prefix}dialogue.xml');
|
||||
persistentUpdate = true;
|
||||
if (cutscene != null) {
|
||||
openSubState(new ScriptedCutscene(cutscene, function() {
|
||||
startCountdown();
|
||||
if (cutsceneScriptPath != null) {
|
||||
openSubState(new ScriptedCutscene(cutsceneScriptPath, function() {
|
||||
callback();
|
||||
}));
|
||||
} else if (Assets.exists(dialogue)) {
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
openSubState(new DialogueCutscene(dialogue, function() {
|
||||
startCountdown();
|
||||
callback();
|
||||
}));
|
||||
} else if (Assets.exists(videoCutsceneAlt)) {
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
persistentUpdate = false;
|
||||
openSubState(new VideoCutscene(videoCutsceneAlt, function() {
|
||||
startCountdown();
|
||||
callback();
|
||||
}));
|
||||
persistentDraw = false;
|
||||
} else if (Assets.exists(videoCutscene)) {
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
persistentUpdate = false;
|
||||
openSubState(new VideoCutscene(videoCutscene, function() {
|
||||
startCountdown();
|
||||
callback();
|
||||
}));
|
||||
persistentDraw = false;
|
||||
} else {
|
||||
startCountdown();
|
||||
callback();
|
||||
}
|
||||
} else
|
||||
startCountdown();
|
||||
callback();
|
||||
}
|
||||
|
||||
public function startCountdown():Void
|
||||
@@ -735,11 +738,13 @@ class PlayState extends MusicBeatState
|
||||
_startCountdownCalled = true;
|
||||
inCutscene = false;
|
||||
|
||||
var e = scripts.event("onStartCountdown", new CancellableEvent());
|
||||
if (e.cancelled) return;
|
||||
if (scripts.event("onStartCountdown", new CancellableEvent()).cancelled) return;
|
||||
}
|
||||
|
||||
generateStrums();
|
||||
if (!scripts.event("onPreGenerateStrums", new CancellableEvent()).cancelled) {
|
||||
generateStrums();
|
||||
scripts.call("onPostGenerateStrums");
|
||||
}
|
||||
|
||||
startedCountdown = true;
|
||||
Conductor.songPosition = 0;
|
||||
@@ -752,6 +757,7 @@ class PlayState extends MusicBeatState
|
||||
{
|
||||
countdown(swagCounter++);
|
||||
}, introLength);
|
||||
scripts.call("onPostStartCountdown");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1321,7 +1327,7 @@ class PlayState extends MusicBeatState
|
||||
#end
|
||||
}
|
||||
|
||||
startCutscene("end-");
|
||||
startCutscene("end-", endCutscene, nextSong);
|
||||
}
|
||||
|
||||
public function nextSong() {
|
||||
|
||||
Reference in New Issue
Block a user