From d9d0efeaba371bbf7199ff68c6f90a8d5c21a3e3 Mon Sep 17 00:00:00 2001 From: Joalor64 Date: Fri, 28 Jun 2024 23:58:50 -0400 Subject: [PATCH] some wip stuff i might have to scrap a few things --- TODO | 2 +- assets/images/NOTE_assets.xml | 104 ++++++++++---------- assets/images/noteSplashes.xml | 72 +++++++------- assets/images/pixelUI/NOTE_assets.png | Bin 3337 -> 547 bytes assets/images/pixelUI/NOTE_assetsENDS.png | Bin 202 -> 194 bytes source/Main.hx | 6 +- source/import.hx | 8 +- source/meta/ArtemisIntegration.hx | 7 -- source/meta/data/alphabet/AlphabetOld.hx | 2 - source/meta/data/alphabet/TypedAlphabet.hx | 2 - source/meta/data/options/OptionsSubState.hx | 67 +++++++++++-- source/meta/state/FreeplayState.hx | 1 - source/meta/state/MinigamesState.hx | 18 ++-- source/meta/state/ModDownloadState.hx | 2 - source/meta/state/ModsMenuState.hx | 2 - source/meta/state/OutdatedState.hx | 2 +- source/meta/state/PlayState.hx | 4 +- source/minigames/C.hx | 22 +++++ source/minigames/Card.hx | 43 ++++++++ source/{backend => unused}/CrashHandler.hx | 2 +- 20 files changed, 233 insertions(+), 133 deletions(-) create mode 100644 source/minigames/C.hx create mode 100644 source/minigames/Card.hx rename source/{backend => unused}/CrashHandler.hx (99%) diff --git a/TODO b/TODO index 758a2046..00b28049 100644 --- a/TODO +++ b/TODO @@ -2,7 +2,6 @@ - Nothing yet [HIGH PRIORITY] -- Custom Noteskins/Notesplashes - Move character with mouse in Character Editor - Extra Notes (for real this time) - Add data for languages @@ -10,6 +9,7 @@ [LOW PRIORITY] - Fix Modchart Editor +- Custom Noteskins/Notesplashes - Week 8 (or Weekend 1, whatever) - New stage code from Psych 0.7 - Psych UI (from v1.0b) diff --git a/assets/images/NOTE_assets.xml b/assets/images/NOTE_assets.xml index 3f124d49..8d3f0222 100644 --- a/assets/images/NOTE_assets.xml +++ b/assets/images/NOTE_assets.xml @@ -1,53 +1,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/noteSplashes.xml b/assets/images/noteSplashes.xml index 902f8050..b779c7f7 100644 --- a/assets/images/noteSplashes.xml +++ b/assets/images/noteSplashes.xml @@ -1,37 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/pixelUI/NOTE_assets.png b/assets/images/pixelUI/NOTE_assets.png index 645685edc5a708855f6f30356cfa6b46ac0b5c25..55924362d5517682796af9d5c37fc3a970f2cb41 100644 GIT binary patch delta 533 zcmeB_TFf#*vYwfNf#JCOrhPz)CEd~2k%3`jKlh(RRv@3TILO_JVcj{Imq3n0fKP}k z!+(Yo4CeoVT!#N546o}M8Uh&B13Afyp0EQcj*=k1;QtW7aIbl9Bv6dAz$3Dlfr0NZ z2s0kfUy%YdxWUuKF(l&f+c3xaJQhWs;x~~${`Xf)v~e1S>c3t2CUI$}jIhvgroG?q zSu-&F{d@KOKGq%vHvsOy6@oCp~6j5LoLgW+RhRKk3Mh z-!D>g&c3^`>W9(QyEk(SBcr0T z??1Z#adNWP@hN?pvcXo%N_<|Lk-E2G(}li={VMkCdnU>3_>=HX z3+$r4uSb?8AHLDM+UIy_(x!rkGyKfD?s9DLxFJ&Q^K#FWbKVf5-{&RwwX>ee`yKg? Rbpa!Z!PC{xWt~$(699VfDw|KiBu1`D43-Qo|@iPxQ+bEC4Anz&3r}w zHoF(aFjUcL%dn7kL))qFGAc0KK#(~Y|=`L+KQF==eJi6@9d|Bt{<(=&0VMm{cgIRp`Z~9ZG?rTLu3G)q( zuG9V>@wWcQ9R)N$5hPzDN?&x800HA5a?A0Oi1&muMmYw61H$prU^{iVU%M>;s3x<5 z{^WSeh8iNJfU>lnx-kr3+>Vk&i*IxPw1^t4YBG0yPv@d42JnJgcq0yC2!3FcRX!=X9mU6(GD!vy|A# zV8ZNx-o66h^MlP@+heK=R!ZBf)J#9f11Rzuc#iqML|8hLYW+ImEkE(&mUJ~uO$It~ zo+=ut1&2A4kS88Q{lSt}9YxGMz2#2!`nNB)f2c+L?CZ~YH>@jD<3=345E8z;EOdp9 zS`SK&CLgo4hSvFLOB3&9iUwn z7F<~CWgGFPsQdK-(%^c>^_6+sO)#y?@4L3tQVZWtVuVq^U8eFllar*|ZqTJ$S3FqV5KL zvYEj}>^a#h)jGF;cihcCu$Cy8lqam>m(srXK?h1J zMNc27R65G!Y4r)!QfE3qrmspq54ez4+?o#dsrm_K?+uxee(H+4W;44+@ z7n_E?2(92n!oIVLTN~IX9-81kKw#6Rr#eyAy^$95irf#eThi6u@X)!ihJlMt~QA@ zCK7#d!NCR{TJ__d%4eTr=BmeBI^eWPAe=^#Dzm*fg&chCt2PzbrHa<(k@Oa7T4>lC zkqS6)Y>3OG+gU$yOF|4ljJv~aVVL&fEqPU!8q5rmRWxHWfSrtFUTY~AR4-RZ(&^)5 z9)LRv>$eyIm!ak>_@$mRG8BaGMdhxCpO+$SSyAZYhXcDIZbnBF>aQ;XUBzJ(=L(b~ zSd56njh}kyOZx^2MLiz`iPuvOvc3V3I^lfI6J&C_@haW1n_n1R z^b1F=^%$B|Xj^Gxcb(2vQ_nBE$NjXe{!SoLhnF%!ipfor2!I}lS3rhX{_6fN^(&RC z(!(%I_0E*S)Q{NlFbu;h9jz@|sozIQ=e3D-gKA|iTgZ=bof|Ed}RZmw* z5p9$Az&{1U)56=0){9b33gznt=B}@!nq}D175t8lGljTIEetkrle*qj-1JX==_8@M z77�uN=%tXJmeO-be!IHY9~jMOv(gI3#aO*~b}offZvAv~Vb7v5`Y^z%>%u_OB!Mq9@;J9M`CN(j01aSuDcoZ+xV)8xx|!tb
  • py!}RxYfZO2++B-oOzi73T{~BY^?Lpgbj8nguK2WS>tej2GMHx~D5xy~o$I?5sG7fx zP~Du5r2xn@9nu`Xg5T$a%*emn+R`|lpDO0a?)1exYaKW^4QFRRIw9k#)Qv>>%9hV7 zlrF!(9!vy&)?%oEJ<+Lb5Cu@@%*$0kZDBs9h;}#ny_DS=VS4#FRsrC$ueideR6INq26ZD7tQYJOl1FcxcXI$@FK(D67o_;Z zi$5tfFdOQl6oO)1^)~kTopn^t)$h!a&M1KV#mn7ultKRruToDukI&@0$?puR=Cm;u z>-OqQN>@Q8iluss#{U>wwx=c2XO&@VOVOb$W+4bfIQUr%;Qy(8>&w%6-Q8QbZ9lt} z_BdFV$G@&~A54g`S}xPIq-IZE`-?iM4;$=Y8)R%}J{z!8-w*z+hXoDELY(0#yH>AE zsvx(QvqER2lQhGB7s}rB0d*a8u;rod!<}py7|4;BntxQr_7(>hTyasO&w|C#Z#k=WH?$O@E#!Pkn9YU_TJH5liFU6BL+uKJAdLCN zWhj+`4+A&~x3Db%hIV05LCXdKae32qy~ok)z)M2>S7+gVRot{&Ak}yKl9>i6-)1n6 z!zXX-P`T@_uONX+{N2DjuCGVnDT-34dtv;LF{h1>Ay7@pNGOFYMY!1BVil{mm5cEv zH}0%+;zjADP`Al!XiAM-xlqmIQtnq}yt0UvI#iFR9njn$|&n0$E zu)Qz$c;jwc%%5(vW$M&(Nd~dXc)oxT!Dw6i0fHG(+Etxeyp6t;q&pc3}3H@;4@PzAyGgFR`xcNnS9`zCO7j!)CYN-E7o69Ezz@tWEGa!`8N(L zJytaI4}v~R(Ge_W-iWW6@M2abVXjM-piZdIkFR#mo8Z}`$OV-hr5SyX4~*{%z|8o% KQKg}C%zpp`L|9+| diff --git a/assets/images/pixelUI/NOTE_assetsENDS.png b/assets/images/pixelUI/NOTE_assetsENDS.png index 1530744b398ebf7700ee26b623c4b2cf1f0bbd70..5f3d5f4b04e46b842bddcc5f8a2bcc16cf36ad60 100644 GIT binary patch delta 177 zcmX@bc!+U=WIZzj1A`l@t}T#aNq6*hWMJ6X&;2Kn7072S4sv&5Sa(k5C6L1(;1lA? z@E^$f4O>_%)r2R7=#&*=dVZs3Tk`0 zIEF}EzI)P;k->oHu)%T7`ZLNGw1jRfbrvvv^Jj|M$A(pV85U^!G@d)f%o)o#_hRbz QIG{cTPgg&ebxsLQ0KtMe2><{9 delta 170 zcmX@ac#3g?q$nE$14H5MyZk_ku{g-xiDBJ2nU@n4h3h#BJR*x382Ao>Fr%o3R|8N< zyr+v}h=qT0O2Uu-^B>wPa~x!RTra`M5;85hso*8Mo9+@TiLDb}G0frr&#W2ojgc|n zALBD6j@hS*66CFpG=H{}Y5rm0P-^+RVgbA3QeG*x&dW}GtCtpVDlAwh!_3T(mA|Y$ VtNC~x0|OTWgQu&X%Q~loCIF}aI*b4S diff --git a/source/Main.hx b/source/Main.hx index 65ba7521..dd116553 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -22,9 +22,7 @@ import haxe.io.Path; #if linux @:cppInclude('./external/gamemode_client.h') -@:cppFileCode(' - #define GAMEMODE_AUTO -') +@:cppFileCode('#define GAMEMODE_AUTO') #end class Main extends Sprite @@ -177,6 +175,8 @@ class Main extends Sprite if (FlxG.sound.music != null) FlxG.sound.music.stop(); + FlxG.sound.play(Paths.sound('crash')); + DiscordClient.shutdown(); Lib.application.window.alert(msg + '\n\nIf you think this shouldn\'t have happened, report this error to GitHub repository! Please? Thanks :)\nhttps://github.com/Joalor64GH/Joalor64-Engine-Rewrite/issues', 'Error!'); diff --git a/source/import.hx b/source/import.hx index c2502155..13cd7b79 100644 --- a/source/import.hx +++ b/source/import.hx @@ -16,6 +16,7 @@ import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxSpriteGroup; import flixel.input.keyboard.FlxKey; import flixel.sound.FlxSound; +import flixel.ui.FlxButton; import flixel.ui.FlxBar; import flixel.text.FlxText; import flixel.tweens.FlxEase; @@ -34,9 +35,9 @@ import openfl.display.Sprite; import openfl.text.TextField; import openfl.text.TextFormat; -import haxe.Json; -import haxe.Http; +import haxe.*; import haxe.io.Path; +import Type.ValueType; import hscript.*; @@ -45,6 +46,8 @@ import sys.io.File; import sys.FileSystem; #elseif js import js.html.*; +#else +import openfl.utils.Assets; #end // Joalor64 Engine Imports @@ -91,6 +94,7 @@ import llua.Lua; using Globals; using StringTools; using meta.CoolUtil; +using meta.CoolUtil.MapUtil; #if !debug @:noDebug diff --git a/source/meta/ArtemisIntegration.hx b/source/meta/ArtemisIntegration.hx index 727ad8e1..dbd1e9cc 100644 --- a/source/meta/ArtemisIntegration.hx +++ b/source/meta/ArtemisIntegration.hx @@ -3,13 +3,6 @@ package meta; -#if sys -import haxe.Http; -import haxe.io.Path; -import sys.FileSystem; -import sys.io.File; -#end - class ArtemisIntegration { private static inline var ArtemisAPIUrlDirectoryName:String = "Artemis"; private static inline var ArtemisAPIUrlFile:String = "./webserver.txt"; diff --git a/source/meta/data/alphabet/AlphabetOld.hx b/source/meta/data/alphabet/AlphabetOld.hx index 89e28bd7..4d984d98 100644 --- a/source/meta/data/alphabet/AlphabetOld.hx +++ b/source/meta/data/alphabet/AlphabetOld.hx @@ -1,7 +1,5 @@ package meta.data.alphabet; -import flixel.graphics.frames.FlxAtlasFrames; -import flixel.sound.FlxSound; import openfl.media.Sound; /** diff --git a/source/meta/data/alphabet/TypedAlphabet.hx b/source/meta/data/alphabet/TypedAlphabet.hx index 096374ba..deb743c5 100644 --- a/source/meta/data/alphabet/TypedAlphabet.hx +++ b/source/meta/data/alphabet/TypedAlphabet.hx @@ -1,7 +1,5 @@ package meta.data.alphabet; -import flixel.graphics.frames.FlxAtlasFrames; -import flixel.system.FlxSound; import openfl.media.Sound; class TypedAlphabet extends Alphabet diff --git a/source/meta/data/options/OptionsSubState.hx b/source/meta/data/options/OptionsSubState.hx index 34de7159..c07fdb3d 100644 --- a/source/meta/data/options/OptionsSubState.hx +++ b/source/meta/data/options/OptionsSubState.hx @@ -568,6 +568,12 @@ class DeleteSavesSubState extends MusicBeatSubstate class GameplaySubState extends BaseOptionsMenu { + var windowBar:FlxSprite; + var windowOptions:Array