From 456a2f7f8d20279e633dce503e110275953772b1 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Thu, 20 Apr 2023 19:35:58 +0200 Subject: [PATCH] PROGRESS?? HOW DARE YOU --- .../images/editors/charter/event-spr-add.png | Bin 0 -> 4738 bytes .../images/editors/charter/event-spr-add.xml | 23 +++++++++++ assets/songs/dadbattle/charts/hard.json | 2 +- source/funkin/editors/charter/Charter.hx | 33 +++++++++++++++ source/funkin/editors/charter/CharterEvent.hx | 6 ++- .../funkin/editors/charter/CharterEventAdd.hx | 38 ++++++++++++++++++ 6 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 assets/images/editors/charter/event-spr-add.png create mode 100644 assets/images/editors/charter/event-spr-add.xml create mode 100644 source/funkin/editors/charter/CharterEventAdd.hx diff --git a/assets/images/editors/charter/event-spr-add.png b/assets/images/editors/charter/event-spr-add.png new file mode 100644 index 0000000000000000000000000000000000000000..034433d86f874239a7d089bd13c39a47fce0e77c GIT binary patch literal 4738 zcmV-|5`FE7P)pXG)Y83RCwCWT6>TkWtIQ+*N^+my?16vGLy*!6il?%s@)B#)vDcf ztz9fjTuX386p&>F9C>W13$en(GF!5guCM{(3keAU641!g@F>I;BM)H_vk-|U3W1PG zG9izdWM-0?JGb|o^L=0UcYE$kGVCANQ#akWZ$HlOoZoqUCmw)N`h<9Ux8X1h7mkjO z{(ibQdKSPb%l{T{9^Qv~V^sg(dGLK7ivD=>2_v0??%0o;i`CFjubpc%$ z!}IC>IHc=6Ij{IU_?b#x8~O#TJ^wCOmdym>Gy<_@x&W5Z=S%$Mq^sv)&>uj9{z6X~ zu_M~W8c;(Er|7(|e8dDGq&;te3ZPd4q@-~mo@ExHaqLORJ!OcT> zc-bRXo)_XcK6zRI2=$3$V`CfXxLi0T!sxTNYB@MwjBK+*U+_r7l@@8AX|w6m;DlEmb&o#>fhkir(U%(Jya+Z&K({e-gis@ z2r<9pHah-iK2cec!{FEv7(R%$h)D^6&Lt*&E!%{8Ir~V2-p`$+JJs%p)K7!-xty_fROD%0Ao7ulOou%Ir=L{HFOs{ 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 QMgRZ+07*qoM6N<$g2P)HzyJUM literal 0 HcmV?d00001 diff --git a/assets/images/editors/charter/event-spr-add.xml b/assets/images/editors/charter/event-spr-add.xml new file mode 100644 index 00000000..92cd0504 --- /dev/null +++ b/assets/images/editors/charter/event-spr-add.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/songs/dadbattle/charts/hard.json b/assets/songs/dadbattle/charts/hard.json index 3b8e0eae..773c1788 100644 --- a/assets/songs/dadbattle/charts/hard.json +++ b/assets/songs/dadbattle/charts/hard.json @@ -1 +1 @@ -{"events":[{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":[0],"time":0,"type":1},{"params":[0],"time":10666.6666666667,"type":1},{"params":[1],"time":13333.3333333333,"type":1},{"params":[0],"time":16000,"type":1},{"params":[1],"time":18666.6666666667,"type":1},{"params":[0],"time":21333.3333333333,"type":1},{"params":[1],"time":26666.6666666667,"type":1},{"params":[0],"time":32000,"type":1},{"params":[1],"time":42666.6666666667,"type":1},{"params":[0],"time":53333.3333333334,"type":1},{"params":[1],"time":56000,"type":1},{"params":[0],"time":58666.6666666667,"type":1},{"params":[1],"time":61333.3333333334,"type":1},{"params":[0],"time":64000,"type":1},{"params":[1],"time":69333.3333333334,"type":1},{"params":[0],"time":74666.6666666667,"type":1},{"params":[1],"time":77333.3333333333,"type":1},{"params":[0],"time":80000,"type":1},{"params":[1],"time":82666.6666666667,"type":1}],"strumLines":[{"notes":[{"id":2,"sLen":0,"time":10666.667,"type":0},{"id":0,"sLen":0,"time":11000,"type":0},{"id":1,"sLen":0,"time":11166.667,"type":0},{"id":2,"sLen":0,"time":11333.334,"type":0},{"id":0,"sLen":0,"time":11666.667,"type":0},{"id":3,"sLen":0,"time":11833.334,"type":0},{"id":2,"sLen":0,"time":12000,"type":0},{"id":3,"sLen":0,"time":12166.667,"type":0},{"id":0,"sLen":0,"time":12333.334,"type":0},{"id":1,"sLen":0,"time":12500,"type":0},{"id":2,"sLen":0,"time":12666.667,"type":0},{"id":0,"sLen":0,"time":13000,"type":0},{"id":3,"sLen":0,"time":13166.667,"type":0},{"id":1,"sLen":0,"time":16000,"type":0},{"id":0,"sLen":0,"time":16333.334,"type":0},{"id":3,"sLen":0,"time":16500,"type":0},{"id":1,"sLen":0,"time":16666.668,"type":0},{"id":2,"sLen":0,"time":17000,"type":0},{"id":1,"sLen":0,"time":17333.334,"type":0},{"id":0,"sLen":0,"time":17666.668,"type":0},{"id":0,"sLen":0,"time":17833.334,"type":0},{"id":3,"sLen":0,"time":18000,"type":0},{"id":3,"sLen":0,"time":18166.668,"type":0},{"id":3,"sLen":0,"time":18333.334,"type":0},{"id":3,"sLen":0,"time":18500,"type":0},{"id":2,"sLen":0,"time":21666.668,"type":0},{"id":1,"sLen":0,"time":21833.334,"type":0},{"id":3,"sLen":0,"time":22000,"type":0},{"id":1,"sLen":0,"time":22833.334,"type":0},{"id":3,"sLen":0,"time":23000,"type":0},{"id":0,"sLen":0,"time":23333.334,"type":0},{"id":2,"sLen":0,"time":24333.334,"type":0},{"id":1,"sLen":0,"time":24666.668,"type":0},{"id":0,"sLen":0,"time":25000,"type":0},{"id":1,"sLen":0,"time":25166.668,"type":0},{"id":2,"sLen":0,"time":25333.334,"type":0},{"id":3,"sLen":0,"time":25500,"type":0},{"id":0,"sLen":0,"time":25666.668,"type":0},{"id":3,"sLen":0,"time":25833.334,"type":0},{"id":2,"sLen":0,"time":26000,"type":0},{"id":0,"sLen":0,"time":30666.668,"type":0},{"id":1,"sLen":0,"time":30833.334,"type":0},{"id":2,"sLen":0,"time":31000,"type":0},{"id":3,"sLen":0,"time":31166.668,"type":0},{"id":2,"sLen":0,"time":31333.334,"type":0},{"id":1,"sLen":0,"time":31500,"type":0},{"id":0,"sLen":0,"time":31666.668,"type":0},{"id":1,"sLen":0,"time":31833.334,"type":0},{"id":0,"sLen":0,"time":32166.668,"type":0},{"id":3,"sLen":0,"time":32333.334,"type":0},{"id":2,"sLen":0,"time":32500.002,"type":0},{"id":1,"sLen":0,"time":32666.668,"type":0},{"id":0,"sLen":0,"time":33000,"type":0},{"id":2,"sLen":0,"time":33500,"type":0},{"id":3,"sLen":0,"time":33666.668,"type":0},{"id":1,"sLen":0,"time":33833.3359,"type":0},{"id":2,"sLen":0,"time":34000,"type":0},{"id":0,"sLen":0,"time":34333.3359,"type":0},{"id":0,"sLen":0,"time":34666.668,"type":0},{"id":1,"sLen":0,"time":35000,"type":0},{"id":3,"sLen":0,"time":35333.3359,"type":0},{"id":1,"sLen":0,"time":35666.668,"type":0},{"id":2,"sLen":0,"time":36000,"type":0},{"id":3,"sLen":0,"time":36333.3359,"type":0},{"id":0,"sLen":0,"time":36666.668,"type":0},{"id":1,"sLen":0,"time":36666.668,"type":0},{"id":1,"sLen":0,"time":37500,"type":0},{"id":3,"sLen":0,"time":37666.668,"type":0},{"id":2,"sLen":0,"time":37833.3359,"type":0},{"id":0,"sLen":0,"time":38000,"type":0},{"id":2,"sLen":0,"time":38166.668,"type":0},{"id":1,"sLen":0,"time":38333.3359,"type":0},{"id":0,"sLen":0,"time":38666.668,"type":0},{"id":3,"sLen":0,"time":38750,"type":0},{"id":0,"sLen":0,"time":38833.3359,"type":0},{"id":1,"sLen":0,"time":39000,"type":0},{"id":0,"sLen":0,"time":39166.668,"type":0},{"id":2,"sLen":0,"time":39333.3359,"type":0},{"id":3,"sLen":0,"time":39500,"type":0},{"id":1,"sLen":0,"time":39666.668,"type":0},{"id":0,"sLen":0,"time":40166.668,"type":0},{"id":3,"sLen":0,"time":40333.3359,"type":0},{"id":1,"sLen":0,"time":40500,"type":0},{"id":2,"sLen":0,"time":40666.668,"type":0},{"id":3,"sLen":0,"time":40833.3359,"type":0},{"id":1,"sLen":0,"time":41000,"type":0},{"id":3,"sLen":0,"time":41166.668,"type":0},{"id":0,"sLen":0,"time":41333.3359,"type":0},{"id":1,"sLen":0,"time":41500,"type":0},{"id":0,"sLen":0,"time":41666.668,"type":0},{"id":3,"sLen":0,"time":41833.3359,"type":0},{"id":2,"sLen":0,"time":42000,"type":0},{"id":3,"sLen":0,"time":42333.3359,"type":0},{"id":2,"sLen":0,"time":53333.3359,"type":0},{"id":0,"sLen":0,"time":53666.668,"type":0},{"id":1,"sLen":0,"time":53833.3359,"type":0},{"id":2,"sLen":0,"time":54000,"type":0},{"id":0,"sLen":0,"time":54333.3359,"type":0},{"id":3,"sLen":0,"time":54500,"type":0},{"id":2,"sLen":0,"time":54666.668,"type":0},{"id":3,"sLen":0,"time":54833.3359,"type":0},{"id":0,"sLen":0,"time":55000,"type":0},{"id":1,"sLen":0,"time":55166.668,"type":0},{"id":2,"sLen":0,"time":55333.3359,"type":0},{"id":0,"sLen":0,"time":55666.668,"type":0},{"id":3,"sLen":0,"time":55833.3359,"type":0},{"id":1,"sLen":0,"time":58666.668,"type":0},{"id":0,"sLen":0,"time":59000,"type":0},{"id":3,"sLen":0,"time":59166.668,"type":0},{"id":1,"sLen":0,"time":59333.3359,"type":0},{"id":2,"sLen":0,"time":59666.668,"type":0},{"id":1,"sLen":0,"time":60000,"type":0},{"id":0,"sLen":0,"time":60333.3359,"type":0},{"id":0,"sLen":0,"time":60500,"type":0},{"id":3,"sLen":0,"time":60666.668,"type":0},{"id":3,"sLen":0,"time":60833.3359,"type":0},{"id":3,"sLen":0,"time":61000,"type":0},{"id":3,"sLen":0,"time":61166.668,"type":0},{"id":0,"sLen":0,"time":62666.668,"type":0},{"id":1,"sLen":0,"time":62833.3359,"type":0},{"id":2,"sLen":0,"time":63000,"type":0},{"id":3,"sLen":0,"time":63166.668,"type":0},{"id":2,"sLen":0,"time":63333.3359,"type":0},{"id":1,"sLen":0,"time":63500,"type":0},{"id":0,"sLen":0,"time":63666.668,"type":0},{"id":1,"sLen":333.333343999999,"time":63833.3359,"type":0},{"id":2,"sLen":0,"time":64333.3359,"type":0},{"id":1,"sLen":0,"time":64500.0039,"type":0},{"id":3,"sLen":0,"time":64666.668,"type":0},{"id":1,"sLen":0,"time":65500.0039,"type":0},{"id":3,"sLen":0,"time":65666.67,"type":0},{"id":0,"sLen":0,"time":66000,"type":0},{"id":2,"sLen":0,"time":67000,"type":0},{"id":1,"sLen":0,"time":67333.3359,"type":0},{"id":0,"sLen":0,"time":67666.67,"type":0},{"id":1,"sLen":0,"time":67833.3359,"type":0},{"id":2,"sLen":0,"time":68000,"type":0},{"id":3,"sLen":0,"time":68166.67,"type":0},{"id":0,"sLen":0,"time":68333.3359,"type":0},{"id":3,"sLen":0,"time":68500,"type":0},{"id":2,"sLen":0,"time":68666.67,"type":0},{"id":2,"sLen":0,"time":74666.67,"type":0},{"id":0,"sLen":0,"time":75000,"type":0},{"id":1,"sLen":0,"time":75166.67,"type":0},{"id":2,"sLen":0,"time":75333.3359,"type":0},{"id":0,"sLen":0,"time":75666.67,"type":0},{"id":3,"sLen":0,"time":75833.3359,"type":0},{"id":2,"sLen":0,"time":76000,"type":0},{"id":3,"sLen":0,"time":76166.67,"type":0},{"id":0,"sLen":0,"time":76333.3359,"type":0},{"id":1,"sLen":0,"time":76500,"type":0},{"id":2,"sLen":0,"time":76666.67,"type":0},{"id":2,"sLen":0,"time":77000,"type":0},{"id":1,"sLen":0,"time":80000,"type":0},{"id":0,"sLen":0,"time":80333.3359,"type":0},{"id":3,"sLen":0,"time":80500,"type":0},{"id":1,"sLen":0,"time":80666.67,"type":0},{"id":2,"sLen":0,"time":81000,"type":0},{"id":1,"sLen":0,"time":81333.3359,"type":0},{"id":1,"sLen":0,"time":81666.67,"type":0},{"id":1,"sLen":0,"time":82000,"type":0}],"position":"dad","type":0,"characters":["dad"]},{"notes":[{"id":2,"sLen":0,"time":13333.334,"type":0},{"id":0,"sLen":0,"time":13666.667,"type":0},{"id":1,"sLen":0,"time":13833.334,"type":0},{"id":2,"sLen":0,"time":14000,"type":0},{"id":0,"sLen":0,"time":14333.334,"type":0},{"id":3,"sLen":0,"time":14500,"type":0},{"id":2,"sLen":0,"time":14666.667,"type":0},{"id":3,"sLen":0,"time":14833.334,"type":0},{"id":0,"sLen":0,"time":15000,"type":0},{"id":1,"sLen":0,"time":15166.667,"type":0},{"id":2,"sLen":0,"time":15333.334,"type":0},{"id":0,"sLen":0,"time":15666.667,"type":0},{"id":3,"sLen":0,"time":15833.334,"type":0},{"id":1,"sLen":0,"time":18666.668,"type":0},{"id":0,"sLen":0,"time":19000,"type":0},{"id":3,"sLen":0,"time":19166.668,"type":0},{"id":1,"sLen":0,"time":19333.334,"type":0},{"id":2,"sLen":0,"time":19666.668,"type":0},{"id":1,"sLen":0,"time":20000,"type":0},{"id":0,"sLen":0,"time":20333.334,"type":0},{"id":0,"sLen":0,"time":20500,"type":0},{"id":3,"sLen":0,"time":20666.668,"type":0},{"id":3,"sLen":0,"time":20833.334,"type":0},{"id":3,"sLen":0,"time":21000,"type":0},{"id":3,"sLen":0,"time":21166.668,"type":0},{"id":2,"sLen":0,"time":27000,"type":0},{"id":1,"sLen":0,"time":27166.668,"type":0},{"id":3,"sLen":0,"time":27333.334,"type":0},{"id":1,"sLen":0,"time":28166.668,"type":0},{"id":3,"sLen":0,"time":28333.334,"type":0},{"id":0,"sLen":0,"time":28666.668,"type":0},{"id":2,"sLen":0,"time":29666.668,"type":0},{"id":1,"sLen":0,"time":30000,"type":0},{"id":0,"sLen":0,"time":30333.334,"type":0},{"id":1,"sLen":0,"time":30500,"type":0},{"id":2,"sLen":0,"time":30666.668,"type":0},{"id":3,"sLen":0,"time":30833.334,"type":0},{"id":0,"sLen":0,"time":31000,"type":0},{"id":3,"sLen":0,"time":31166.668,"type":0},{"id":2,"sLen":0,"time":31333.334,"type":0},{"id":0,"sLen":0,"time":41333.3359,"type":0},{"id":1,"sLen":0,"time":41500,"type":0},{"id":2,"sLen":0,"time":41666.668,"type":0},{"id":3,"sLen":0,"time":41833.3359,"type":0},{"id":2,"sLen":0,"time":42000,"type":0},{"id":1,"sLen":0,"time":42166.668,"type":0},{"id":0,"sLen":0,"time":42333.3359,"type":0},{"id":1,"sLen":0,"time":42500,"type":0},{"id":0,"sLen":0,"time":42833.3359,"type":0},{"id":3,"sLen":0,"time":43000,"type":0},{"id":2,"sLen":0,"time":43166.668,"type":0},{"id":1,"sLen":0,"time":43333.3359,"type":0},{"id":0,"sLen":0,"time":43666.668,"type":0},{"id":2,"sLen":0,"time":44166.668,"type":0},{"id":3,"sLen":0,"time":44333.3359,"type":0},{"id":1,"sLen":0,"time":44500,"type":0},{"id":2,"sLen":0,"time":44666.668,"type":0},{"id":0,"sLen":0,"time":45000,"type":0},{"id":0,"sLen":0,"time":45333.3359,"type":0},{"id":1,"sLen":0,"time":45666.668,"type":0},{"id":3,"sLen":0,"time":46000,"type":0},{"id":1,"sLen":0,"time":46333.3359,"type":0},{"id":2,"sLen":0,"time":46666.668,"type":0},{"id":3,"sLen":0,"time":47000,"type":0},{"id":0,"sLen":0,"time":47333.3359,"type":0},{"id":1,"sLen":0,"time":47333.3359,"type":0},{"id":1,"sLen":0,"time":48166.668,"type":0},{"id":3,"sLen":0,"time":48333.3359,"type":0},{"id":2,"sLen":0,"time":48500,"type":0},{"id":0,"sLen":0,"time":48666.668,"type":0},{"id":2,"sLen":0,"time":48833.3359,"type":0},{"id":1,"sLen":0,"time":49000,"type":0},{"id":0,"sLen":0,"time":49333.3359,"type":0},{"id":3,"sLen":0,"time":49416.668,"type":0},{"id":0,"sLen":0,"time":49500,"type":0},{"id":1,"sLen":0,"time":49666.668,"type":0},{"id":0,"sLen":0,"time":49833.3359,"type":0},{"id":2,"sLen":0,"time":50000,"type":0},{"id":3,"sLen":0,"time":50166.668,"type":0},{"id":1,"sLen":0,"time":50333.3359,"type":0},{"id":0,"sLen":0,"time":50833.3359,"type":0},{"id":3,"sLen":0,"time":51000,"type":0},{"id":1,"sLen":0,"time":51166.668,"type":0},{"id":2,"sLen":0,"time":51333.3359,"type":0},{"id":3,"sLen":0,"time":51500,"type":0},{"id":1,"sLen":0,"time":51666.668,"type":0},{"id":3,"sLen":0,"time":51833.3359,"type":0},{"id":0,"sLen":0,"time":52000,"type":0},{"id":0,"sLen":0,"time":52166.668,"type":0},{"id":2,"sLen":0,"time":52333.3359,"type":0},{"id":2,"sLen":0,"time":52500,"type":0},{"id":3,"sLen":0,"time":52666.668,"type":0},{"id":1,"sLen":0,"time":53000,"type":0},{"id":3,"sLen":0,"time":53000,"type":0},{"id":2,"sLen":0,"time":56000,"type":0},{"id":0,"sLen":0,"time":56333.3359,"type":0},{"id":1,"sLen":0,"time":56500,"type":0},{"id":2,"sLen":0,"time":56666.668,"type":0},{"id":0,"sLen":0,"time":57000,"type":0},{"id":3,"sLen":0,"time":57166.668,"type":0},{"id":2,"sLen":0,"time":57333.3359,"type":0},{"id":3,"sLen":0,"time":57500,"type":0},{"id":0,"sLen":0,"time":57666.668,"type":0},{"id":1,"sLen":0,"time":57833.3359,"type":0},{"id":2,"sLen":0,"time":58000,"type":0},{"id":0,"sLen":0,"time":58333.3359,"type":0},{"id":3,"sLen":0,"time":58500,"type":0},{"id":1,"sLen":0,"time":61333.3359,"type":0},{"id":0,"sLen":0,"time":61666.668,"type":0},{"id":3,"sLen":0,"time":61833.3359,"type":0},{"id":1,"sLen":0,"time":62000,"type":0},{"id":2,"sLen":0,"time":62333.3359,"type":0},{"id":1,"sLen":0,"time":62666.668,"type":0},{"id":0,"sLen":0,"time":63000,"type":0},{"id":0,"sLen":0,"time":63166.668,"type":0},{"id":3,"sLen":0,"time":63333.3359,"type":0},{"id":3,"sLen":0,"time":63500,"type":0},{"id":3,"sLen":0,"time":63666.668,"type":0},{"id":3,"sLen":0,"time":63833.3359,"type":0},{"id":0,"sLen":0,"time":68000,"type":0},{"id":1,"sLen":0,"time":68166.67,"type":0},{"id":2,"sLen":0,"time":68333.3359,"type":0},{"id":3,"sLen":0,"time":68500,"type":0},{"id":2,"sLen":0,"time":68666.67,"type":0},{"id":1,"sLen":0,"time":68833.3359,"type":0},{"id":0,"sLen":0,"time":69000,"type":0},{"id":1,"sLen":333.333343999999,"time":69166.67,"type":0},{"id":2,"sLen":0,"time":69666.67,"type":0},{"id":1,"sLen":0,"time":69833.3359,"type":0},{"id":3,"sLen":0,"time":70000,"type":0},{"id":1,"sLen":0,"time":70833.3359,"type":0},{"id":3,"sLen":0,"time":71000,"type":0},{"id":0,"sLen":0,"time":71333.3359,"type":0},{"id":2,"sLen":0,"time":72333.3359,"type":0},{"id":1,"sLen":0,"time":72666.67,"type":0},{"id":0,"sLen":0,"time":73000,"type":0},{"id":1,"sLen":0,"time":73166.67,"type":0},{"id":2,"sLen":0,"time":73333.3359,"type":0},{"id":3,"sLen":0,"time":73500,"type":0},{"id":0,"sLen":0,"time":73666.67,"type":0},{"id":3,"sLen":0,"time":73833.3359,"type":0},{"id":2,"sLen":0,"time":74000,"type":0},{"id":2,"sLen":0,"time":77333.3359,"type":0},{"id":0,"sLen":0,"time":77666.67,"type":0},{"id":1,"sLen":0,"time":77833.3359,"type":0},{"id":2,"sLen":0,"time":78000,"type":0},{"id":0,"sLen":0,"time":78333.3359,"type":0},{"id":3,"sLen":0,"time":78500,"type":0},{"id":2,"sLen":0,"time":78666.67,"type":0},{"id":3,"sLen":0,"time":78833.3359,"type":0},{"id":0,"sLen":0,"time":79000,"type":0},{"id":1,"sLen":0,"time":79166.67,"type":0},{"id":2,"sLen":0,"time":79333.3359,"type":0},{"id":2,"sLen":0,"time":79666.67,"type":0},{"id":1,"sLen":0,"time":82666.67,"type":0},{"id":0,"sLen":0,"time":83000,"type":0},{"id":3,"sLen":0,"time":83166.67,"type":0},{"id":1,"sLen":0,"time":83333.3359,"type":0},{"id":2,"sLen":0,"time":83666.67,"type":0},{"id":1,"sLen":0,"time":84000,"type":0},{"id":1,"sLen":0,"time":84333.3359,"type":0},{"id":1,"sLen":0,"time":84666.67,"type":0}],"position":"boyfriend","type":1,"characters":["bf"]},{"notes":[],"visible":false,"position":"girlfriend","strumLinePos":0.5,"type":2,"characters":["gf"]}],"codenameChart":true,"scrollSpeed":2.3,"noteTypes":[]} \ No newline at end of file +{"events":[{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":["cock", ["super", "cock"]],"time":0,"type":-1},{"params":[0],"time":0,"type":1},{"params":[0],"time":10666.6666666667,"type":1},{"params":[1],"time":13333.3333333333,"type":1},{"params":[0],"time":16000,"type":1},{"params":[1],"time":18666.6666666667,"type":1},{"params":[0],"time":21333.3333333333,"type":1},{"params":[1],"time":26666.6666666667,"type":1},{"params":[0],"time":32000,"type":1},{"params":[1],"time":42666.6666666667,"type":1},{"params":[0],"time":53333.3333333334,"type":1},{"params":[1],"time":56000,"type":1},{"params":[0],"time":58666.6666666667,"type":1},{"params":[1],"time":61333.3333333334,"type":1},{"params":[0],"time":64000,"type":1},{"params":[1],"time":69333.3333333334,"type":1},{"params":[0],"time":74666.6666666667,"type":1},{"params":[1],"time":77333.3333333333,"type":1},{"params":[0],"time":80000,"type":1},{"params":[1],"time":82666.6666666667,"type":1}],"strumLines":[{"notes":[{"id":2,"sLen":0,"time":10666.667,"type":0},{"id":0,"sLen":0,"time":11000,"type":0},{"id":1,"sLen":0,"time":11166.667,"type":0},{"id":2,"sLen":0,"time":11333.334,"type":0},{"id":0,"sLen":0,"time":11666.667,"type":0},{"id":3,"sLen":0,"time":11833.334,"type":0},{"id":2,"sLen":0,"time":12000,"type":0},{"id":3,"sLen":0,"time":12166.667,"type":0},{"id":0,"sLen":0,"time":12333.334,"type":0},{"id":1,"sLen":0,"time":12500,"type":0},{"id":2,"sLen":0,"time":12666.667,"type":0},{"id":0,"sLen":0,"time":13000,"type":0},{"id":3,"sLen":0,"time":13166.667,"type":0},{"id":1,"sLen":0,"time":16000,"type":0},{"id":0,"sLen":0,"time":16333.334,"type":0},{"id":3,"sLen":0,"time":16500,"type":0},{"id":1,"sLen":0,"time":16666.668,"type":0},{"id":2,"sLen":0,"time":17000,"type":0},{"id":1,"sLen":0,"time":17333.334,"type":0},{"id":0,"sLen":0,"time":17666.668,"type":0},{"id":0,"sLen":0,"time":17833.334,"type":0},{"id":3,"sLen":0,"time":18000,"type":0},{"id":3,"sLen":0,"time":18166.668,"type":0},{"id":3,"sLen":0,"time":18333.334,"type":0},{"id":3,"sLen":0,"time":18500,"type":0},{"id":2,"sLen":0,"time":21666.668,"type":0},{"id":1,"sLen":0,"time":21833.334,"type":0},{"id":3,"sLen":0,"time":22000,"type":0},{"id":1,"sLen":0,"time":22833.334,"type":0},{"id":3,"sLen":0,"time":23000,"type":0},{"id":0,"sLen":0,"time":23333.334,"type":0},{"id":2,"sLen":0,"time":24333.334,"type":0},{"id":1,"sLen":0,"time":24666.668,"type":0},{"id":0,"sLen":0,"time":25000,"type":0},{"id":1,"sLen":0,"time":25166.668,"type":0},{"id":2,"sLen":0,"time":25333.334,"type":0},{"id":3,"sLen":0,"time":25500,"type":0},{"id":0,"sLen":0,"time":25666.668,"type":0},{"id":3,"sLen":0,"time":25833.334,"type":0},{"id":2,"sLen":0,"time":26000,"type":0},{"id":0,"sLen":0,"time":30666.668,"type":0},{"id":1,"sLen":0,"time":30833.334,"type":0},{"id":2,"sLen":0,"time":31000,"type":0},{"id":3,"sLen":0,"time":31166.668,"type":0},{"id":2,"sLen":0,"time":31333.334,"type":0},{"id":1,"sLen":0,"time":31500,"type":0},{"id":0,"sLen":0,"time":31666.668,"type":0},{"id":1,"sLen":0,"time":31833.334,"type":0},{"id":0,"sLen":0,"time":32166.668,"type":0},{"id":3,"sLen":0,"time":32333.334,"type":0},{"id":2,"sLen":0,"time":32500.002,"type":0},{"id":1,"sLen":0,"time":32666.668,"type":0},{"id":0,"sLen":0,"time":33000,"type":0},{"id":2,"sLen":0,"time":33500,"type":0},{"id":3,"sLen":0,"time":33666.668,"type":0},{"id":1,"sLen":0,"time":33833.3359,"type":0},{"id":2,"sLen":0,"time":34000,"type":0},{"id":0,"sLen":0,"time":34333.3359,"type":0},{"id":0,"sLen":0,"time":34666.668,"type":0},{"id":1,"sLen":0,"time":35000,"type":0},{"id":3,"sLen":0,"time":35333.3359,"type":0},{"id":1,"sLen":0,"time":35666.668,"type":0},{"id":2,"sLen":0,"time":36000,"type":0},{"id":3,"sLen":0,"time":36333.3359,"type":0},{"id":0,"sLen":0,"time":36666.668,"type":0},{"id":1,"sLen":0,"time":36666.668,"type":0},{"id":1,"sLen":0,"time":37500,"type":0},{"id":3,"sLen":0,"time":37666.668,"type":0},{"id":2,"sLen":0,"time":37833.3359,"type":0},{"id":0,"sLen":0,"time":38000,"type":0},{"id":2,"sLen":0,"time":38166.668,"type":0},{"id":1,"sLen":0,"time":38333.3359,"type":0},{"id":0,"sLen":0,"time":38666.668,"type":0},{"id":3,"sLen":0,"time":38750,"type":0},{"id":0,"sLen":0,"time":38833.3359,"type":0},{"id":1,"sLen":0,"time":39000,"type":0},{"id":0,"sLen":0,"time":39166.668,"type":0},{"id":2,"sLen":0,"time":39333.3359,"type":0},{"id":3,"sLen":0,"time":39500,"type":0},{"id":1,"sLen":0,"time":39666.668,"type":0},{"id":0,"sLen":0,"time":40166.668,"type":0},{"id":3,"sLen":0,"time":40333.3359,"type":0},{"id":1,"sLen":0,"time":40500,"type":0},{"id":2,"sLen":0,"time":40666.668,"type":0},{"id":3,"sLen":0,"time":40833.3359,"type":0},{"id":1,"sLen":0,"time":41000,"type":0},{"id":3,"sLen":0,"time":41166.668,"type":0},{"id":0,"sLen":0,"time":41333.3359,"type":0},{"id":1,"sLen":0,"time":41500,"type":0},{"id":0,"sLen":0,"time":41666.668,"type":0},{"id":3,"sLen":0,"time":41833.3359,"type":0},{"id":2,"sLen":0,"time":42000,"type":0},{"id":3,"sLen":0,"time":42333.3359,"type":0},{"id":2,"sLen":0,"time":53333.3359,"type":0},{"id":0,"sLen":0,"time":53666.668,"type":0},{"id":1,"sLen":0,"time":53833.3359,"type":0},{"id":2,"sLen":0,"time":54000,"type":0},{"id":0,"sLen":0,"time":54333.3359,"type":0},{"id":3,"sLen":0,"time":54500,"type":0},{"id":2,"sLen":0,"time":54666.668,"type":0},{"id":3,"sLen":0,"time":54833.3359,"type":0},{"id":0,"sLen":0,"time":55000,"type":0},{"id":1,"sLen":0,"time":55166.668,"type":0},{"id":2,"sLen":0,"time":55333.3359,"type":0},{"id":0,"sLen":0,"time":55666.668,"type":0},{"id":3,"sLen":0,"time":55833.3359,"type":0},{"id":1,"sLen":0,"time":58666.668,"type":0},{"id":0,"sLen":0,"time":59000,"type":0},{"id":3,"sLen":0,"time":59166.668,"type":0},{"id":1,"sLen":0,"time":59333.3359,"type":0},{"id":2,"sLen":0,"time":59666.668,"type":0},{"id":1,"sLen":0,"time":60000,"type":0},{"id":0,"sLen":0,"time":60333.3359,"type":0},{"id":0,"sLen":0,"time":60500,"type":0},{"id":3,"sLen":0,"time":60666.668,"type":0},{"id":3,"sLen":0,"time":60833.3359,"type":0},{"id":3,"sLen":0,"time":61000,"type":0},{"id":3,"sLen":0,"time":61166.668,"type":0},{"id":0,"sLen":0,"time":62666.668,"type":0},{"id":1,"sLen":0,"time":62833.3359,"type":0},{"id":2,"sLen":0,"time":63000,"type":0},{"id":3,"sLen":0,"time":63166.668,"type":0},{"id":2,"sLen":0,"time":63333.3359,"type":0},{"id":1,"sLen":0,"time":63500,"type":0},{"id":0,"sLen":0,"time":63666.668,"type":0},{"id":1,"sLen":333.333343999999,"time":63833.3359,"type":0},{"id":2,"sLen":0,"time":64333.3359,"type":0},{"id":1,"sLen":0,"time":64500.0039,"type":0},{"id":3,"sLen":0,"time":64666.668,"type":0},{"id":1,"sLen":0,"time":65500.0039,"type":0},{"id":3,"sLen":0,"time":65666.67,"type":0},{"id":0,"sLen":0,"time":66000,"type":0},{"id":2,"sLen":0,"time":67000,"type":0},{"id":1,"sLen":0,"time":67333.3359,"type":0},{"id":0,"sLen":0,"time":67666.67,"type":0},{"id":1,"sLen":0,"time":67833.3359,"type":0},{"id":2,"sLen":0,"time":68000,"type":0},{"id":3,"sLen":0,"time":68166.67,"type":0},{"id":0,"sLen":0,"time":68333.3359,"type":0},{"id":3,"sLen":0,"time":68500,"type":0},{"id":2,"sLen":0,"time":68666.67,"type":0},{"id":2,"sLen":0,"time":74666.67,"type":0},{"id":0,"sLen":0,"time":75000,"type":0},{"id":1,"sLen":0,"time":75166.67,"type":0},{"id":2,"sLen":0,"time":75333.3359,"type":0},{"id":0,"sLen":0,"time":75666.67,"type":0},{"id":3,"sLen":0,"time":75833.3359,"type":0},{"id":2,"sLen":0,"time":76000,"type":0},{"id":3,"sLen":0,"time":76166.67,"type":0},{"id":0,"sLen":0,"time":76333.3359,"type":0},{"id":1,"sLen":0,"time":76500,"type":0},{"id":2,"sLen":0,"time":76666.67,"type":0},{"id":2,"sLen":0,"time":77000,"type":0},{"id":1,"sLen":0,"time":80000,"type":0},{"id":0,"sLen":0,"time":80333.3359,"type":0},{"id":3,"sLen":0,"time":80500,"type":0},{"id":1,"sLen":0,"time":80666.67,"type":0},{"id":2,"sLen":0,"time":81000,"type":0},{"id":1,"sLen":0,"time":81333.3359,"type":0},{"id":1,"sLen":0,"time":81666.67,"type":0},{"id":1,"sLen":0,"time":82000,"type":0}],"position":"dad","type":0,"characters":["dad"]},{"notes":[{"id":2,"sLen":0,"time":13333.334,"type":0},{"id":0,"sLen":0,"time":13666.667,"type":0},{"id":1,"sLen":0,"time":13833.334,"type":0},{"id":2,"sLen":0,"time":14000,"type":0},{"id":0,"sLen":0,"time":14333.334,"type":0},{"id":3,"sLen":0,"time":14500,"type":0},{"id":2,"sLen":0,"time":14666.667,"type":0},{"id":3,"sLen":0,"time":14833.334,"type":0},{"id":0,"sLen":0,"time":15000,"type":0},{"id":1,"sLen":0,"time":15166.667,"type":0},{"id":2,"sLen":0,"time":15333.334,"type":0},{"id":0,"sLen":0,"time":15666.667,"type":0},{"id":3,"sLen":0,"time":15833.334,"type":0},{"id":1,"sLen":0,"time":18666.668,"type":0},{"id":0,"sLen":0,"time":19000,"type":0},{"id":3,"sLen":0,"time":19166.668,"type":0},{"id":1,"sLen":0,"time":19333.334,"type":0},{"id":2,"sLen":0,"time":19666.668,"type":0},{"id":1,"sLen":0,"time":20000,"type":0},{"id":0,"sLen":0,"time":20333.334,"type":0},{"id":0,"sLen":0,"time":20500,"type":0},{"id":3,"sLen":0,"time":20666.668,"type":0},{"id":3,"sLen":0,"time":20833.334,"type":0},{"id":3,"sLen":0,"time":21000,"type":0},{"id":3,"sLen":0,"time":21166.668,"type":0},{"id":2,"sLen":0,"time":27000,"type":0},{"id":1,"sLen":0,"time":27166.668,"type":0},{"id":3,"sLen":0,"time":27333.334,"type":0},{"id":1,"sLen":0,"time":28166.668,"type":0},{"id":3,"sLen":0,"time":28333.334,"type":0},{"id":0,"sLen":0,"time":28666.668,"type":0},{"id":2,"sLen":0,"time":29666.668,"type":0},{"id":1,"sLen":0,"time":30000,"type":0},{"id":0,"sLen":0,"time":30333.334,"type":0},{"id":1,"sLen":0,"time":30500,"type":0},{"id":2,"sLen":0,"time":30666.668,"type":0},{"id":3,"sLen":0,"time":30833.334,"type":0},{"id":0,"sLen":0,"time":31000,"type":0},{"id":3,"sLen":0,"time":31166.668,"type":0},{"id":2,"sLen":0,"time":31333.334,"type":0},{"id":0,"sLen":0,"time":41333.3359,"type":0},{"id":1,"sLen":0,"time":41500,"type":0},{"id":2,"sLen":0,"time":41666.668,"type":0},{"id":3,"sLen":0,"time":41833.3359,"type":0},{"id":2,"sLen":0,"time":42000,"type":0},{"id":1,"sLen":0,"time":42166.668,"type":0},{"id":0,"sLen":0,"time":42333.3359,"type":0},{"id":1,"sLen":0,"time":42500,"type":0},{"id":0,"sLen":0,"time":42833.3359,"type":0},{"id":3,"sLen":0,"time":43000,"type":0},{"id":2,"sLen":0,"time":43166.668,"type":0},{"id":1,"sLen":0,"time":43333.3359,"type":0},{"id":0,"sLen":0,"time":43666.668,"type":0},{"id":2,"sLen":0,"time":44166.668,"type":0},{"id":3,"sLen":0,"time":44333.3359,"type":0},{"id":1,"sLen":0,"time":44500,"type":0},{"id":2,"sLen":0,"time":44666.668,"type":0},{"id":0,"sLen":0,"time":45000,"type":0},{"id":0,"sLen":0,"time":45333.3359,"type":0},{"id":1,"sLen":0,"time":45666.668,"type":0},{"id":3,"sLen":0,"time":46000,"type":0},{"id":1,"sLen":0,"time":46333.3359,"type":0},{"id":2,"sLen":0,"time":46666.668,"type":0},{"id":3,"sLen":0,"time":47000,"type":0},{"id":0,"sLen":0,"time":47333.3359,"type":0},{"id":1,"sLen":0,"time":47333.3359,"type":0},{"id":1,"sLen":0,"time":48166.668,"type":0},{"id":3,"sLen":0,"time":48333.3359,"type":0},{"id":2,"sLen":0,"time":48500,"type":0},{"id":0,"sLen":0,"time":48666.668,"type":0},{"id":2,"sLen":0,"time":48833.3359,"type":0},{"id":1,"sLen":0,"time":49000,"type":0},{"id":0,"sLen":0,"time":49333.3359,"type":0},{"id":3,"sLen":0,"time":49416.668,"type":0},{"id":0,"sLen":0,"time":49500,"type":0},{"id":1,"sLen":0,"time":49666.668,"type":0},{"id":0,"sLen":0,"time":49833.3359,"type":0},{"id":2,"sLen":0,"time":50000,"type":0},{"id":3,"sLen":0,"time":50166.668,"type":0},{"id":1,"sLen":0,"time":50333.3359,"type":0},{"id":0,"sLen":0,"time":50833.3359,"type":0},{"id":3,"sLen":0,"time":51000,"type":0},{"id":1,"sLen":0,"time":51166.668,"type":0},{"id":2,"sLen":0,"time":51333.3359,"type":0},{"id":3,"sLen":0,"time":51500,"type":0},{"id":1,"sLen":0,"time":51666.668,"type":0},{"id":3,"sLen":0,"time":51833.3359,"type":0},{"id":0,"sLen":0,"time":52000,"type":0},{"id":0,"sLen":0,"time":52166.668,"type":0},{"id":2,"sLen":0,"time":52333.3359,"type":0},{"id":2,"sLen":0,"time":52500,"type":0},{"id":3,"sLen":0,"time":52666.668,"type":0},{"id":1,"sLen":0,"time":53000,"type":0},{"id":3,"sLen":0,"time":53000,"type":0},{"id":2,"sLen":0,"time":56000,"type":0},{"id":0,"sLen":0,"time":56333.3359,"type":0},{"id":1,"sLen":0,"time":56500,"type":0},{"id":2,"sLen":0,"time":56666.668,"type":0},{"id":0,"sLen":0,"time":57000,"type":0},{"id":3,"sLen":0,"time":57166.668,"type":0},{"id":2,"sLen":0,"time":57333.3359,"type":0},{"id":3,"sLen":0,"time":57500,"type":0},{"id":0,"sLen":0,"time":57666.668,"type":0},{"id":1,"sLen":0,"time":57833.3359,"type":0},{"id":2,"sLen":0,"time":58000,"type":0},{"id":0,"sLen":0,"time":58333.3359,"type":0},{"id":3,"sLen":0,"time":58500,"type":0},{"id":1,"sLen":0,"time":61333.3359,"type":0},{"id":0,"sLen":0,"time":61666.668,"type":0},{"id":3,"sLen":0,"time":61833.3359,"type":0},{"id":1,"sLen":0,"time":62000,"type":0},{"id":2,"sLen":0,"time":62333.3359,"type":0},{"id":1,"sLen":0,"time":62666.668,"type":0},{"id":0,"sLen":0,"time":63000,"type":0},{"id":0,"sLen":0,"time":63166.668,"type":0},{"id":3,"sLen":0,"time":63333.3359,"type":0},{"id":3,"sLen":0,"time":63500,"type":0},{"id":3,"sLen":0,"time":63666.668,"type":0},{"id":3,"sLen":0,"time":63833.3359,"type":0},{"id":0,"sLen":0,"time":68000,"type":0},{"id":1,"sLen":0,"time":68166.67,"type":0},{"id":2,"sLen":0,"time":68333.3359,"type":0},{"id":3,"sLen":0,"time":68500,"type":0},{"id":2,"sLen":0,"time":68666.67,"type":0},{"id":1,"sLen":0,"time":68833.3359,"type":0},{"id":0,"sLen":0,"time":69000,"type":0},{"id":1,"sLen":333.333343999999,"time":69166.67,"type":0},{"id":2,"sLen":0,"time":69666.67,"type":0},{"id":1,"sLen":0,"time":69833.3359,"type":0},{"id":3,"sLen":0,"time":70000,"type":0},{"id":1,"sLen":0,"time":70833.3359,"type":0},{"id":3,"sLen":0,"time":71000,"type":0},{"id":0,"sLen":0,"time":71333.3359,"type":0},{"id":2,"sLen":0,"time":72333.3359,"type":0},{"id":1,"sLen":0,"time":72666.67,"type":0},{"id":0,"sLen":0,"time":73000,"type":0},{"id":1,"sLen":0,"time":73166.67,"type":0},{"id":2,"sLen":0,"time":73333.3359,"type":0},{"id":3,"sLen":0,"time":73500,"type":0},{"id":0,"sLen":0,"time":73666.67,"type":0},{"id":3,"sLen":0,"time":73833.3359,"type":0},{"id":2,"sLen":0,"time":74000,"type":0},{"id":2,"sLen":0,"time":77333.3359,"type":0},{"id":0,"sLen":0,"time":77666.67,"type":0},{"id":1,"sLen":0,"time":77833.3359,"type":0},{"id":2,"sLen":0,"time":78000,"type":0},{"id":0,"sLen":0,"time":78333.3359,"type":0},{"id":3,"sLen":0,"time":78500,"type":0},{"id":2,"sLen":0,"time":78666.67,"type":0},{"id":3,"sLen":0,"time":78833.3359,"type":0},{"id":0,"sLen":0,"time":79000,"type":0},{"id":1,"sLen":0,"time":79166.67,"type":0},{"id":2,"sLen":0,"time":79333.3359,"type":0},{"id":2,"sLen":0,"time":79666.67,"type":0},{"id":1,"sLen":0,"time":82666.67,"type":0},{"id":0,"sLen":0,"time":83000,"type":0},{"id":3,"sLen":0,"time":83166.67,"type":0},{"id":1,"sLen":0,"time":83333.3359,"type":0},{"id":2,"sLen":0,"time":83666.67,"type":0},{"id":1,"sLen":0,"time":84000,"type":0},{"id":1,"sLen":0,"time":84333.3359,"type":0},{"id":1,"sLen":0,"time":84666.67,"type":0}],"position":"boyfriend","type":1,"characters":["bf"]},{"notes":[],"visible":false,"position":"girlfriend","strumLinePos":0.5,"type":2,"characters":["gf"]}],"codenameChart":true,"scrollSpeed":2.3,"noteTypes":[]} \ No newline at end of file diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index 348e0dd5..d420a67b 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -46,6 +46,7 @@ class Charter extends UIState { public var topMenuSpr:UITopMenu; public var gridBackdrop:CharterBackdrop; public var eventsBackdrop:FlxBackdrop; + public var addEventSpr:CharterEventAdd; public var beatSeparator:FlxBackdrop; public var sectionSeparator:FlxBackdrop; public var gridBackdropDummy:CharterBackdropDummy; @@ -376,12 +377,17 @@ class Charter extends UIState { strumlineInfoBG.cameras = [charterCamera]; strumLines.cameras = [charterCamera]; + + addEventSpr = new CharterEventAdd(); + addEventSpr.alpha = 0; + addEventSpr.cameras = [charterCamera]; // adds grid and notes so that they're ALWAYS behind the UI add(gridBackdrop); add(sectionSeparator); add(beatSeparator); + add(addEventSpr); add(eventsGroup); add(notesGroup); add(topLimit); @@ -611,6 +617,33 @@ class Charter extends UIState { if (FlxG.mouse.justReleasedRight) openContextMenu(topMenu[1].childs); } + + + if (gridActionType == NONE && mousePos.x < 0) { + addEventSpr.incorporeal = false; + addEventSpr.sprAlpha = lerp(addEventSpr.sprAlpha, 0.75, 0.25); + var event = getHoveredEvent(mousePos.y); + if (event != null) { + addEventSpr.updateEdit(event); + } else { + addEventSpr.updatePos(mousePos.y); + } + } else { + addEventSpr.incorporeal = true; + addEventSpr.sprAlpha = lerp(addEventSpr.sprAlpha, 0, 0.25); + } + } + + public function getHoveredEvent(y:Float) { + var eventHovered:CharterEvent = null; + eventsGroup.forEach(function(e) { + if (eventHovered != null) + return; + + if (e.hovered || (y >= e.y && y < (e.y + e.bHeight))) + eventHovered = e; + }); + return eventHovered; } public function deleteNote(note:CharterNote, addToUndo:Bool = true):CharterNote { diff --git a/source/funkin/editors/charter/CharterEvent.hx b/source/funkin/editors/charter/CharterEvent.hx index c0c10d02..0f21248d 100644 --- a/source/funkin/editors/charter/CharterEvent.hx +++ b/source/funkin/editors/charter/CharterEvent.hx @@ -29,12 +29,14 @@ class CharterEvent extends UISliceSprite { super(-100, (step * 40) - 17, 100, 34, 'editors/charter/event-spr'); this.step = step; this.events = events.getDefault([]); + + cursor = BUTTON; } public override function update(elapsed:Float) { super.update(elapsed); for(k=>i in icons) { - i.follow(this, (k * 22) + 23 - (i.width / 2), (bHeight - i.height) / 2); + i.follow(this, (k * 22) + 30 - (i.width / 2), (bHeight - i.height) / 2); } } @@ -69,7 +71,7 @@ class CharterEvent extends UISliceSprite { f(event.type); } } - x = -(bWidth = 32 + (icons.length * 22)); + x = -(bWidth = 37 + (icons.length * 22)); } } diff --git a/source/funkin/editors/charter/CharterEventAdd.hx b/source/funkin/editors/charter/CharterEventAdd.hx new file mode 100644 index 00000000..888fe739 --- /dev/null +++ b/source/funkin/editors/charter/CharterEventAdd.hx @@ -0,0 +1,38 @@ +package funkin.editors.charter; + +class CharterEventAdd extends UISliceSprite { + var text:UIText; + public var sprAlpha:Float = 0; + + public function new() { + super(0, 0, 100, 34, 'editors/charter/event-spr-add'); + + text = new UIText(0, 0, 0, ""); + members.push(text); + + cursor = BUTTON; + + } + + public override function update(elapsed:Float) { + super.update(elapsed); + + text.follow(this, 20, (bHeight - text.height) / 2); + alpha = sprAlpha * 0.75; + text.alpha = sprAlpha; + } + + public function updatePos(y:Float) { + this.y = (FlxG.keys.pressed.SHIFT ? y : 40 * (Math.floor((y + 20) / 40))) - (bHeight / 2); + text.text = "Add event"; + framesOffset = 0; + x = -(bWidth = 37 + Math.ceil(text.width)); + } + + public function updateEdit(event:CharterEvent) { + this.y = event.y; + text.text = "Edit"; + framesOffset = 9; + x = -(bWidth = 27 + Math.ceil(text.width) + event.bWidth); + } +} \ No newline at end of file