From 526f91fe5f62a441cf580e1c02bbe9a91a014d12 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 29 Mar 2021 10:24:49 -0700 Subject: [PATCH] pico in progress --- assets/preload/data/stress/picospeaker.json | 1 + source/Character.hx | 44 ++++++++++++++++++++- source/PlayState.hx | 4 +- 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 assets/preload/data/stress/picospeaker.json diff --git a/assets/preload/data/stress/picospeaker.json b/assets/preload/data/stress/picospeaker.json new file mode 100644 index 000000000..d6a6d4e68 --- /dev/null +++ b/assets/preload/data/stress/picospeaker.json @@ -0,0 +1 @@ +{"song":{"song":"Stress","bpm":178,"needsVoices":true,"player1":"bf-holding-gf","player2":"tankman","speed":1.75,"notes":[{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[0,0,0],[168.53932584269666,3,0],[252.80898876404495,3,0],[421.3483146067416,3,0],[589.8876404494382,0,0],[758.4269662921349,3,0],[842.6966292134832,3,0],[1011.2359550561798,0,0],[1179.7752808988764,0,0],[1264.0449438202247,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[2359.550561797753,0,0],[1348.314606741573,3,0],[1516.8539325842696,0,0],[1601.123595505618,0,0],[1853.932584269663,3,0],[2022.4719101123596,0,0],[2106.741573033708,3,0],[2191.0112359550562,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[2696.629213483146,0,0],[2865.1685393258426,3,0],[2949.438202247191,3,0],[3117.9775280898875,3,0],[3286.516853932584,0,0],[3455.0561797752807,3,0],[3539.3258426966295,3,0],[3707.865168539326,0,0],[3876.4044943820227,0,0],[3960.6741573033705,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[4044.9438202247193,3,0],[4213.483146067416,0,0],[4297.752808988764,0,0],[4550.561797752809,3,0],[4719.101123595506,0,0],[4803.370786516854,3,0],[4887.640449438202,3,0],[5056.179775280899,0,0],[5140.449438202248,0,0],[5224.7191011235955,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[5393.258426966292,0,0],[5561.797752808989,3,0],[5646.067415730337,3,0],[5814.606741573034,3,0],[5983.146067415731,0,0],[6151.685393258427,3,0],[6235.955056179775,3,0],[6404.494382022472,0,0],[6573.033707865168,0,0],[6657.303370786517,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[7752.808988764045,0,0],[6741.573033707865,3,0],[6910.112359550561,0,0],[6994.38202247191,0,0],[7247.191011235955,3,0],[7415.730337078652,0,0],[7500,3,0],[7584.269662921348,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[8089.887640449439,0,0],[8258.426966292134,3,0],[8342.696629213482,3,0],[8511.23595505618,3,0],[8679.775280898877,0,0],[8848.314606741573,3,0],[8932.584269662922,3,0],[9101.123595505618,0,0],[9269.662921348314,0,0],[9353.932584269663,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[9438.202247191011,3,0],[9606.741573033709,0,0],[9691.011235955055,0,0],[9943.8202247191,3,0],[10112.359550561798,0,0],[10196.629213483146,3,0],[10280.898876404495,3,0],[10449.438202247191,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[21235.955056179777,0,0],[21320.224719101123,3,0],[21404.494382022473,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[21573.03370786517,0,0],[21910.112359550563,3,0],[22247.191011235955,0,0],[22584.26966292135,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[22921.34831460674,0,0],[23258.426966292136,0,0],[23595.505617977527,3,0],[23932.584269662922,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[24269.662921348314,0,0],[24606.74157303371,3,0],[24943.8202247191,0,0],[25280.898876404495,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[25617.977528089887,0,0],[25955.05617977528,0,0],[26292.134831460673,3,0],[26629.213483146068,3,0],[26713.483146067414,3,0],[26797.752808988764,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[27303.370786516854,0,0],[27977.52808988764,3,0],[26966.29213483146,3,0],[27640.449438202246,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[28651.685393258427,0,0],[29325.842696629214,0,0],[28314.606741573032,3,0],[28988.76404494382,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[29662.921348314605,0,0],[30000,0,0],[30337.07865168539,3,0],[30674.157303370786,3,0],[29831.4606741573,0,0],[30168.539325842696,3,0],[30505.617977528087,3,0],[30842.696629213482,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[31011.235955056178,0,0],[31348.314606741573,3,0],[31853.93258426966,0,0],[31685.393258426964,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[32359.550561797754,0,0],[32696.629213483146,3,0],[33370.786516853936,3,0],[33202.247191011236,0,0],[33033.70786516854,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[33707.86516853933,0,0],[34044.94382022472,3,0],[34719.10112359551,3,0],[34550.56179775281,0,0],[34382.02247191012,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[35056.1797752809,0,0],[35393.25842696629,3,0],[36067.41573033708,3,0],[35898.87640449438,0,0],[35730.33707865169,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[36404.49438202247,0,0],[36741.573033707864,3,0],[37415.730337078654,3,0],[37247.191011235955,0,0],[37078.65168539326,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[37752.808988764045,0,0],[38089.88764044944,3,0],[38764.04494382023,3,0],[38595.50561797753,0,0],[38426.966292134835,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[39101.12359550562,0,0],[39438.20224719101,3,0],[40112.3595505618,3,0],[39943.8202247191,0,0],[39775.28089887641,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[40449.43820224719,0,0],[40786.51685393258,3,0],[41460.67415730337,3,0],[41292.13483146067,0,0],[41123.59550561798,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[41797.752808988764,0,0],[42808.988764044945,3,0],[42640.449438202246,0,0],[42134.831460674155,0,0],[42471.910112359554,0,0],[42977.52808988764,3,0],[42893.25842696629,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[43146.06741573034,0,0],[43483.14606741573,3,0],[44157.30337078652,3,0],[43988.76404494382,0,0],[43820.22471910113,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[44494.38202247191,0,0],[44831.4606741573,3,0],[45505.61797752809,3,0],[45337.07865168539,0,0],[45168.5393258427,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[45842.69662921348,0,0],[46179.77528089887,3,0],[46853.93258426966,3,0],[46685.393258426964,0,0],[46516.85393258427,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[47191.011235955055,0,0],[47528.089887640446,3,0],[48202.247191011236,3,0],[48033.70786516854,0,0],[47865.168539325845,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[48539.32584269663,0,0],[48876.40449438202,3,0],[49550.56179775281,3,0],[49382.02247191011,0,0],[49213.48314606742,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[49887.6404494382,0,0],[50224.71910112359,3,0],[50898.87640449438,3,0],[50730.33707865168,0,0],[50561.79775280899,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[51235.95505617977,0,0],[51573.033707865165,3,0],[52247.191011235955,3,0],[52078.651685393255,0,0],[51910.11235955056,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[52584.269662921346,0,0],[53595.50561797753,3,0],[53426.96629213483,0,0],[52921.34831460674,0,0],[53258.426966292136,0,0],[53764.04494382022,3,0],[53679.77528089887,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[53932.58426966292,0,0],[54101.12359550562,3,0],[54185.393258426964,3,0],[54353.93258426966,3,0],[54522.471910112356,0,0],[54691.011235955055,3,0],[54775.2808988764,3,0],[54943.8202247191,0,0],[55112.35955056179,0,0],[55196.629213483146,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[56292.13483146067,0,0],[55280.89887640449,3,0],[55449.43820224719,0,0],[55533.70786516854,0,0],[55786.51685393258,3,0],[55955.05617977528,0,0],[56039.32584269663,3,0],[56123.595505617974,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[56629.213483146064,0,0],[56797.752808988764,3,0],[56882.02247191011,3,0],[57050.56179775281,3,0],[57219.1011235955,0,0],[57387.6404494382,3,0],[57471.91011235955,3,0],[57640.449438202246,0,0],[57808.988764044945,0,0],[57893.25842696629,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[57977.52808988764,3,0],[58146.06741573034,0,0],[58230.33707865168,0,0],[58483.14606741573,3,0],[58651.68539325843,0,0],[58735.95505617977,3,0],[58820.22471910112,3,0],[58988.76404494382,0,0],[59073.033707865165,0,0],[59157.30337078651,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[59325.84269662921,0,0],[59494.38202247191,3,0],[59578.651685393255,3,0],[59747.191011235955,3,0],[59915.73033707865,0,0],[60084.269662921346,3,0],[60168.53932584269,3,0],[60337.07865168539,0,0],[60505.61797752809,0,0],[60589.88764044944,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[61685.393258426964,0,0],[60674.15730337078,3,0],[60842.69662921348,0,0],[60926.96629213483,0,0],[61179.77528089887,3,0],[61348.31460674157,0,0],[61432.58426966292,3,0],[61516.853932584265,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[62022.471910112356,0,0],[62191.011235955055,3,0],[62275.2808988764,3,0],[62443.8202247191,3,0],[62612.3595505618,0,0],[62780.89887640449,3,0],[62865.16853932584,3,0],[63033.70786516854,0,0],[63202.247191011236,0,0],[63286.51685393258,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[63370.78651685393,3,0],[63539.32584269663,0,0],[63623.595505617974,0,0],[63876.40449438202,3,0],[64044.94382022472,0,0],[64129.213483146064,3,0],[64213.48314606742,3,0],[64382.02247191011,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[64719.1011235955,3,0],[65056.17977528089,0,0],[65393.25842696629,0,0],[65730.33707865168,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[66067.41573033707,0,0],[66404.49438202247,3,0],[66741.57303370786,3,0],[67078.65168539326,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[67415.73033707865,3,0],[67752.80898876404,0,0],[68089.88764044944,0,0],[68426.96629213482,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[68764.04494382022,0,0],[69101.12359550562,3,0],[69438.202247191,3,0],[69775.2808988764,3,0],[69859.55056179776,3,0],[69943.82022471911,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[70112.3595505618,3,0],[70449.43820224718,0,0],[70786.51685393258,0,0],[71123.59550561797,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[71460.67415730337,0,0],[71797.75280898876,3,0],[72134.83146067415,3,0],[72471.91011235955,3,0],[72556.1797752809,3,0],[72640.44943820225,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[72808.98876404495,3,0],[73146.06741573033,0,0],[73483.14606741573,0,0],[73820.22471910111,0,0],[72893.25842696632,3,0],[73230.33707865172,0,0],[73567.4157303371,0,0],[73904.4943820225,0,0],[72977.52808988767,3,0],[73314.60674157306,0,0],[73651.68539325846,0,0],[73988.76404494385,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[74157.30337078655,0,0],[74241.5730337079,0,0],[74325.84269662925,0,0],[74410.11235955059,0,0],[74494.38202247195,3,0],[74578.6516853933,3,0],[74662.92134831465,3,0],[74747.19101123599,3,0],[74831.46067415734,0,0],[74915.73033707868,0,0],[75000.00000000004,0,0],[75084.26966292139,0,0],[75168.53932584274,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[75505.61797752813,0,0],[75842.69662921353,3,0],[76179.77528089892,0,0],[76516.85393258432,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[76853.93258426971,3,0],[77191.01123595511,3,0],[77528.0898876405,0,0],[77865.1685393259,3,0],[78033.70786516859,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[78202.2471910113,0,0],[78539.3258426967,0,0],[78876.40449438208,3,0],[79213.48314606748,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[79550.56179775287,0,0],[79887.64044943827,3,0],[80140.44943820231,0,0],[80224.71910112366,0,0],[80308.988764045,0,0],[80477.52808988771,0,0],[80730.33707865175,3,84.26966292134831]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[80898.87640449445,0,0],[81067.41573033715,3,0],[81235.95505617985,0,0],[81404.49438202255,3,0],[81573.03370786524,0,0],[81741.57303370794,3,0],[81910.11235955064,0,0],[82078.65168539333,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[82247.19101123603,3,0],[82415.73033707873,0,0],[82584.26966292143,3,0],[82752.80898876413,0,0],[82921.34831460682,3,0],[83089.88764044952,0,0],[83258.42696629222,3,0],[83426.96629213491,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[83595.50561797761,0,0],[83764.0449438203,0,0],[83932.58426966301,0,0],[84269.6629213484,3,0],[84606.7415730338,3,0],[84775.28089887649,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[84943.8202247192,3,0],[85280.8988764046,3,0],[85617.97752808998,0,0],[85702.24719101132,0,0],[85870.78651685403,3,0],[86039.32584269672,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[86292.13483146067,0,0],[86629.21348314607,3,0],[87303.37078651685,3,0],[87134.83146067415,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[87640.44943820225,0,0],[87977.52808988765,3,0],[88651.68539325843,3,0],[88483.14606741573,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[88988.76404494383,0,0],[89325.84269662923,3,0],[90000.00000000001,3,0],[89831.46067415731,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[90337.07865168541,0,0],[90674.15730337081,3,0],[91348.3146067416,3,0],[91179.77528089889,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[91685.393258427,0,0],[92022.47191011239,3,0],[92696.62921348317,3,0],[92528.08988764047,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[93033.70786516857,0,0],[93370.78651685397,3,0],[94044.94382022475,3,0],[93876.40449438205,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[94382.02247191015,0,0],[94719.10112359555,3,0],[95393.25842696633,3,0],[95224.71910112363,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[95730.33707865168,0,0],[96741.57303370786,3,0],[96573.03370786516,0,0],[96067.41573033707,0,0],[96404.49438202247,0,0],[96910.11235955055,3,0],[96825.8426966292,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[97078.65168539326,0,0],[97415.73033707865,3,0],[98089.88764044944,3,0],[97921.34831460673,0,0],[97752.80898876404,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[98426.96629213484,0,0],[98764.04494382022,3,0],[99438.20224719102,3,0],[99269.66292134831,0,0],[99101.12359550562,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[99775.2808988764,0,0],[100112.35955056178,3,0],[100786.51685393258,3,0],[100617.97752808989,0,0],[100449.4382022472,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[101123.59550561797,0,0],[101460.67415730337,3,0],[102134.83146067415,3,0],[101966.29213483146,0,0],[101797.75280898876,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[102471.91011235955,0,0],[102808.98876404495,3,0],[103483.14606741573,3,0],[103314.60674157302,0,0],[103146.06741573033,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[103820.22471910113,0,0],[104157.30337078651,3,0],[104831.46067415731,3,0],[104662.9213483146,0,0],[104494.38202247191,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[105168.53932584269,0,0],[105505.61797752808,3,0],[106179.77528089887,3,0],[106011.23595505618,0,0],[105842.69662921349,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[106516.85393258426,0,0],[107528.08988764044,3,0],[106853.93258426966,0,0],[107191.01123595505,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[107865.16853932606,0,0],[108202.24719101145,0,0],[108539.32584269684,0,0],[108876.40449438224,0,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[109213.48314606764,3,0],[109550.56179775303,3,0],[109887.64044943842,3,0],[110224.71910112382,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[110561.79775280922,0,0],[110898.87640449461,0,0],[110730.33707865191,0,0],[111235.95505618,3,0],[111573.0337078654,3,0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[111910.1123595508,3,0],[112247.1910112362,3,0],[112584.26966292158,0,0],[112921.34831460698,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[113258.42696629238,0,0],[113932.58426966316,3,0],[114269.66292134856,0,0],[114438.20224719125,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[114606.74157303396,0,0],[114943.82022471935,3,0],[115280.89887640474,0,0],[115617.97752809014,3,0],[115786.51685393283,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[115955.05617977554,0,0],[116123.59550561823,3,0],[116292.13483146093,0,0],[116629.21348314632,0,0],[116966.29213483172,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[117303.37078651712,3,0],[117640.44943820252,0,0],[117977.5280898879,3,0],[118061.79775280925,3,0],[118314.6067415733,0,0],[118398.87640449464,3,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[118651.68539325842,0,0],[118820.22471910111,3,0],[118904.49438202247,3,0],[119073.03370786516,3,0],[119241.57303370786,0,0],[119410.11235955055,3,0],[119494.38202247191,3,0],[119662.9213483146,0,0],[119831.4606741573,0,0],[119915.73033707864,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[120000,3,0],[120168.53932584269,0,0],[120252.80898876404,0,0],[120505.61797752808,3,0],[120674.15730337078,0,0],[120758.42696629213,3,0],[120842.69662921347,3,0],[121011.23595505617,0,0],[121095.50561797753,0,0],[121179.77528089887,0,0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"bpm":178,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0,"altAnim":false},{"lengthInSteps":16,"bpm":178,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0,"altAnim":false},{"lengthInSteps":16,"bpm":178,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0,"altAnim":false}],"validScore":true}} \ No newline at end of file diff --git a/source/Character.hx b/source/Character.hx index ef8c3d96b..fcb1be91d 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -1,5 +1,6 @@ package; +import Section.SwagSection; import flixel.FlxG; import flixel.FlxSprite; import flixel.animation.FlxBaseAnimation; @@ -18,6 +19,8 @@ class Character extends FlxSprite public var holdTimer:Float = 0; + public var animationNotes:Array = []; + public function new(x:Float, y:Float, ?character:String = "bf", ?isPlayer:Bool = false) { super(x, y); @@ -287,6 +290,8 @@ class Character extends FlxSprite loadOffsetFile(curCharacter); playAnim('shoot1'); + loadMappedAnims(); + case 'bf': var tex = Paths.getSparrowAtlas('characters/BOYFRIEND'); frames = tex; @@ -563,6 +568,23 @@ class Character extends FlxSprite } } + public function loadMappedAnims() + { + var swagshit = Song.loadFromJson('picospeaker', 'stress'); + + var notes = swagshit.notes; + + for (section in notes) + { + for (idk in section.sectionNotes) + { + animationNotes.push(idk); + } + } + + trace(animationNotes); + } + function quickAnimAdd(name:String, prefix:String) { animation.addByPrefix(name, prefix, 24, false); @@ -604,6 +626,25 @@ class Character extends FlxSprite case 'gf': if (animation.curAnim.name == 'hairFall' && animation.curAnim.finished) playAnim('danceRight'); + case "pico-speaker": + // for pico?? + if (animationNotes.length > 0) + { + if (Conductor.songPosition > animationNotes[0][0]) + { + trace('played shoot anim' + animationNotes[0][1]); + + var shootAnim:Int = 1; + + if (animationNotes[0][1] >= 2) + shootAnim = 3; + + shootAnim += FlxG.random.int(0, 1); + + playAnim('shoot' + shootAnim, true); + animationNotes.shift(); + } + } } super.update(elapsed); @@ -663,7 +704,8 @@ class Character extends FlxSprite playAnim('danceLeft'); } case 'pico-speaker': - playAnim('shoot' + FlxG.random.int(1, 4), true); + // lol weed + // playAnim('shoot' + FlxG.random.int(1, 4), true); case 'spooky': danced = !danced; diff --git a/source/PlayState.hx b/source/PlayState.hx index 86d2e87f1..6dbad2a19 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -710,7 +710,7 @@ class PlayState extends MusicBeatState // startCountdown(); - generateSong(SONG.song); + generateSong(); // add(strumLine); @@ -1084,7 +1084,7 @@ class PlayState extends MusicBeatState var debugNum:Int = 0; - private function generateSong(dataPath:String):Void + private function generateSong():Void { // FlxG.log.add(ChartParser.parse());