bunch of commits i never pushed

nebulazorua · Apr 4, 2024 · ec9efc5 · ec9efc5
1 parent 364adf9
commit ec9efc5
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 14 deletions.
diff --git a/Project.xml b/Project.xml
@@ -128,7 +128,7 @@
 	<assets path="assets/fonts"/>
 	<!-- _______________________________ Libraries ______________________________ -->
 
-	<haxelib name="flixel" />
+	<haxelib name="flixel" version="4.11.0" />
 	<haxedev set='webgl' />
 
 	<!--In case you want to use the addons package-->

diff --git a/art/flashFiles/NOTE_assets.fla b/art/flashFiles/NOTE_assets.fla
diff --git a/assets/preload/images/numNegative.png b/assets/preload/images/numNegative.png
diff --git a/assets/preload/images/numpoint.png b/assets/preload/images/numpoint.png
diff --git a/source/Options.hx b/source/Options.hx
@@ -289,16 +289,16 @@ class ToggleOption extends Option
 	}
 
 	public override function createOptionText(curSelected:Int,optionText:FlxTypedGroup<Option>):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
@@ -79,7 +79,7 @@ class ScoreUtils
 	}
 
 	public static function GetMaxAccuracy(noteCounters:Map<String,Int>):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
@@ -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
@@ -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
@@ -329,7 +329,7 @@ class Note extends NoteGraphic
 					else
 						canBeHit = false;
 				}
-			}else{
+			}else{	
 				canBeHit=false;
 			}
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -329,7 +329,7 @@ class Note extends NoteGraphic @@
     					else
     						canBeHit = false;
     				}
-    			}else{
+    			}else{
     				canBeHit=false;
     			}
     		}
@@ Expand Down @@