From ec9efc53d2637296ae73286e7b81494e157fedf1 Mon Sep 17 00:00:00 2001 From: nebulazorua Date: Fri, 5 Apr 2024 02:02:41 +0800 Subject: [PATCH] bunch of commits i never pushed --- Project.xml | 2 +- art/flashFiles/NOTE_assets.fla | Bin 441092 -> 441102 bytes assets/preload/images/numNegative.png | Bin 1514 -> 0 bytes assets/preload/images/numpoint.png | Bin 677 -> 0 bytes source/Options.hx | 14 +++++++------- source/ScoreUtils.hx | 2 +- source/modchart/modifiers/BounceModifier.hx | 1 - source/states/PlayState.hx | 3 --- source/ui/Note.hx | 2 +- 9 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 assets/preload/images/numNegative.png delete mode 100644 assets/preload/images/numpoint.png diff --git a/Project.xml b/Project.xml index 9fe7106f..652f118c 100644 --- a/Project.xml +++ b/Project.xml @@ -128,7 +128,7 @@ - + diff --git a/art/flashFiles/NOTE_assets.fla b/art/flashFiles/NOTE_assets.fla index e8eb575de64e12ba45a31eedabdc93e893502f97..5e6899c4836edc37229f0cec19d6143bb018ba80 100644 GIT binary patch delta 16459 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 QY5)KL07*qoM6N<$f)m5qE&u=k diff --git a/assets/preload/images/numpoint.png b/assets/preload/images/numpoint.png deleted file mode 100644 index 45e855377fae6747019cde94234e851e45e69d89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 677 zcmV;W0$TlvP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TUuNSy5hLVvI3?3P>o3kc|lh1ot@KXLi5I z-0ZEnyWJ%eyvdWDox7WP_xrw?*-P$qSJf-8(}>@sB@aq6^%nw^L=P;-_Jik|2=g+_3@Q8cUS_xnkfWyxSL zNQT4V#6+?V%up{xry|_#2n(U7se-XC%PXt$vse>OVMHu%T?zvx+mD>$iTwv1iTQ{K z8ks9L()PX)i@F%A*ofczJ5m^hk%x|ra4=1!q84Y;$lT!#h4i;*POe^W=4{p)!32lW zZ3y?Z#oBd!#QN{5nK|JTDjwh8$41UX*JeyC40c+l*vPKn3%8M`Yf)>2w=<$*XM$6n z=k&E98S`_%z64?;7770f zhuE}cMei@+j%RJm{VJM;Vj~nP(co|j2WU&75$e%vTx$4()P@Nrt4j<0zCKV~3wwgX zeB):Dynamic{ - remove(text); - text = new Alphabet(0, (70 * curSelected) + 30, name, true, false); - text.movementType = "list"; - text.isMenuItem = true; + remove(text); + text = new Alphabet(0, (70 * curSelected) + 30, name, true, false); + text.movementType = "list"; + text.isMenuItem = true; text.offsetX = 145; text.gotoTargetPosition(); checkbox.tracker = text; - add(text); - return text; - } + add(text); + return text; + } public override function accept():Bool{ Reflect.setField(OptionUtils.options,property,!Reflect.field(OptionUtils.options,property)); diff --git a/source/ScoreUtils.hx b/source/ScoreUtils.hx index b9c0c250..bfa55f55 100644 --- a/source/ScoreUtils.hx +++ b/source/ScoreUtils.hx @@ -79,7 +79,7 @@ class ScoreUtils } public static function GetMaxAccuracy(noteCounters:Map):Float{ // ITG-like system - var points:Float = 0; + var points:Float = 0; var topJudge = PlayState.judgeMan.getHighestAccJudgement(); for(i in 0...noteCounters.get("taps")){ points += PlayState.judgeMan.getJudgementAccuracy(topJudge); diff --git a/source/modchart/modifiers/BounceModifier.hx b/source/modchart/modifiers/BounceModifier.hx index 3a43c1b3..15f897bc 100644 --- a/source/modchart/modifiers/BounceModifier.hx +++ b/source/modchart/modifiers/BounceModifier.hx @@ -9,7 +9,6 @@ class BounceModifier extends Modifier { // https://github.com/stepmania/stepmania/blob/984dc8668f1fedacf553f279a828acdebffc5625/src/ArrowEffects.cpp override function getPath(visualDiff:Float, pos:Vector3, data:Int, player:Int, timeDiff:Float){ if(getPercent(player)==0)return pos; - // https://github.com/stepmania/stepmania/blob/984dc8668f1fedacf553f279a828acdebffc5625/src/ArrowEffects.cpp var offset = getSubmodPercent("bounceOffset",player)*100; var bounce:Float = Math.abs( FlxMath.fastSin( ( (visualDiff + (1 * (offset) ) ) / diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx index 9086b77a..4ce0b2c8 100644 --- a/source/states/PlayState.hx +++ b/source/states/PlayState.hx @@ -2932,7 +2932,6 @@ class PlayState extends MusicBeatState else if(daNote.isSustainNote){ if(daNote.parent.unhitTail.contains(daNote)) daNote.parent.unhitTail.remove(daNote); - } @@ -3555,8 +3554,6 @@ class PlayState extends MusicBeatState hitNote.tripTimer = 1; playAnimationNote(boyfriend, hitNote, ""); } - - }else{ if((currentOptions.hitsoundType==1 || currentOptions.hitsoundType==2)) FlxG.sound.play(Paths.sound('Ghost_Hit'),currentOptions.hitsoundVol/100); diff --git a/source/ui/Note.hx b/source/ui/Note.hx index 1a3d73b6..7b5ebd3b 100644 --- a/source/ui/Note.hx +++ b/source/ui/Note.hx @@ -329,7 +329,7 @@ class Note extends NoteGraphic else canBeHit = false; } - }else{ + }else{ canBeHit=false; } }