Skip to content

Commit 821607a

Browse files
Z11CodingZ11Coding
committed
fixes galore!
1 parent 6aaebe9 commit 821607a

File tree

15 files changed

+253
-69
lines changed

15 files changed

+253
-69
lines changed

‎assets/shared/images/pixelUI/noteskins/strums.png‎

5.85 KB
Loading

‎assets/shared/images/pixelUI/noteskins/strumsENDS.png‎

435 Bytes
Loading

‎setup/windows.bat‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,22 @@ haxelib install hscript-iris 1.1.3
1313
haxelib install tjson 1.4.0
1414
haxelib install hxdiscord_rpc 1.2.4
1515
haxelib install hxvlc 2.0.1 --skip-dependencies
16+
haxelib install helder.set 0.3.1
17+
haxelib install yaml 2.0.1
18+
haxelib install hxWebSockets 1.4.0
19+
haxelib install haxe-concurrent 5.1.3
20+
haxelib install actuate 1.9.0
1621
haxelib set lime 8.1.2
1722
haxelib set openfl 9.3.3
1823
haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
1924
haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
2025
haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
2126
haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
27+
haxelib git haxeui-core https://github.com/haxeui/haxeui-core 51c23588614397089a5ce182cddea729f0be6fa0
28+
haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel da27e833947f32ef007ed11f523aa5524f5a5d54
29+
haxelib git flixel-text-input https://github.com/FunkinCrew/flixel-text-input 951a0103a17bfa55eed86703ce50b4fb0d7590bc
30+
haxelib git tentools https://github.com/TentaRJ/tentools.git
31+
haxelib git systools https://github.com/haya3218/systools
32+
haxelib run lime rebuild systools windows
2233
echo Finished!
2334
pause

‎source/objects/VideoSprite.hx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,14 @@ class VideoSprite extends FlxSpriteGroup {
8686

8787
if(FlxG.state != null)
8888
{
89-
if(FlxG.state.members.contains(this))
90-
FlxG.state.remove(this);
89+
try {
90+
if(FlxG.state.members.contains(this))
91+
FlxG.state.remove(this);
9192

92-
if(FlxG.state.subState != null && FlxG.state.subState.members.contains(this))
93-
FlxG.state.subState.remove(this);
93+
if(FlxG.state.subState != null && FlxG.state.subState.members.contains(this))
94+
FlxG.state.subState.remove(this);
95+
}
96+
catch(e) {trace("There was nothing to delete?");}
9497
}
9598
super.destroy();
9699
alreadyDestroyed = true;

‎source/objects/charting/ChartingNote.hx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -587,13 +587,13 @@ class ChartingNote extends FlxSprite
587587
if(PlayState.isPixelStage) {
588588
if(isSustainNote) {
589589
var graphic = Paths.image('pixelUI/' + skinPixel + 'ENDS' + skinPostfix);
590-
loadGraphic(graphic, true, Math.floor(graphic.width / 4), Math.floor(graphic.height / 2));
590+
loadGraphic(graphic, true, Math.floor(graphic.width / Note.pixelNotesDivisionValue[1]), Math.floor(graphic.height / 2));
591591
originalHeight = graphic.height / 2;
592592
} else {
593593
var graphic = Paths.image('pixelUI/' + skinPixel + skinPostfix);
594-
loadGraphic(graphic, true, Math.floor(graphic.width / 4), Math.floor(graphic.height / 5));
594+
loadGraphic(graphic, true, Math.floor(graphic.width / Note.pixelNotesDivisionValue[1]), Math.floor(graphic.height / 5));
595595
}
596-
setGraphicSize(Std.int(width * PlayState.daPixelZoom));
596+
setGraphicSize(Std.int(width * PlayState.daPixelZoom * Note.pixelScales[PlayState.mania]));
597597
loadPixelNoteAnims();
598598
antialiasing = false;
599599

@@ -660,11 +660,12 @@ class ChartingNote extends FlxSprite
660660
if (colArray[noteData] == null)
661661
return;
662662

663+
var daFrames:Array<Int> = Note.keysShit.get(PlayState.mania).get('pixelAnimIndex');
663664
if(isSustainNote)
664665
{
665-
animation.add(colArray[noteData] + 'holdend', [noteData + 4], 24, true);
666-
animation.add(colArray[noteData] + 'hold', [noteData], 24, true);
667-
} else animation.add(colArray[noteData] + 'Scroll', [noteData + 4], 24, true);
666+
animation.add(colArray[noteData] + 'holdend', [daFrames[noteData] + 4], 24, true);
667+
animation.add(colArray[noteData] + 'hold', [daFrames[noteData]], 24, true);
668+
} else animation.add(colArray[noteData] + 'Scroll', [daFrames[noteData] + 4], 24, true);
668669
}
669670

670671
function attemptToAddAnimationByPrefix(name:String, prefix:String, framerate:Float = 24, doLoop:Bool = true)

‎source/objects/charting/ChartingStrumNote.hx‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ class ChartingStrumNote extends FlxSprite
9999
var customSkin:String = skin + Note.getNoteSkinPostfix();
100100
if(Paths.fileExists('images/$customSkin.png', IMAGE)) skin = customSkin;
101101
}
102-
else skin = 'noteskins/strums';
102+
else {
103+
var customSkin:String = 'NOTE_assets' + Note.getNoteSkinPostfix();
104+
skin = 'noteskins/' + (PlayState.isPixelStage ? customSkin : 'strums');
105+
}
103106

104107
texture = skin; //Load texture and anims
105108
scrollFactor.set();
@@ -123,41 +126,40 @@ class ChartingStrumNote extends FlxSprite
123126
animationArray[0] = Note.keysShit.get(PlayState.mania).get('strumAnims')[noteData];
124127
animationArray[1] = Note.keysShit.get(PlayState.mania).get('letters')[noteData];
125128
animationArray[2] = Note.keysShit.get(PlayState.mania).get('letters')[noteData]; //jic
126-
var pxDV:Int = Note.pixelNotesDivisionValue[0];
129+
var pxDV:Int = Note.pixelNotesDivisionValue[1];
127130

128131
if(PlayState.isPixelStage)
129132
{
130133
loadGraphic(Paths.image('pixelUI/' + texture));
131-
width = width / 4;
134+
width = width / pxDV;
132135
height = height / 5;
136+
antialiasing = false;
133137
loadGraphic(Paths.image('pixelUI/' + texture), true, Math.floor(width), Math.floor(height));
138+
var daFrames:Array<Int> = Note.keysShit.get(PlayState.mania).get('pixelAnimIndex');
134139

140+
setGraphicSize(Std.int(width * PlayState.daPixelZoom * Note.pixelScales[PlayState.mania]));
141+
updateHitbox();
135142
antialiasing = false;
136-
setGraphicSize(Std.int(width * PlayState.daPixelZoom));
137-
138-
animation.add('green', [6]);
139-
animation.add('red', [7]);
140-
animation.add('blue', [5]);
141-
animation.add('purple', [4]);
142-
switch (Math.abs(noteData) % 4)
143+
switch (Math.abs(noteData))
143144
{
144145
case 0:
145-
animation.add('static', [0]);
146-
animation.add('pressed', [4, 8], 12, false);
147-
animation.add('confirm', [12, 16], 24, false);
146+
animation.add('static', [daFrames[0]]);
147+
animation.add('pressed', [daFrames[0] + pxDV, daFrames[0] + (pxDV * 2)], 12, false);
148+
animation.add('confirm', [daFrames[0] + (pxDV * 3), daFrames[0] + (pxDV * 4)], 24, false);
148149
case 1:
149-
animation.add('static', [1]);
150-
animation.add('pressed', [5, 9], 12, false);
151-
animation.add('confirm', [13, 17], 24, false);
150+
animation.add('static', [daFrames[1]]);
151+
animation.add('pressed', [daFrames[1] + pxDV, daFrames[1] + (pxDV * 2)], 12, false);
152+
animation.add('confirm', [daFrames[1] + (pxDV * 3), daFrames[1] + (pxDV * 4)], 24, false);
152153
case 2:
153-
animation.add('static', [2]);
154-
animation.add('pressed', [6, 10], 12, false);
155-
animation.add('confirm', [14, 18], 12, false);
154+
animation.add('static', [daFrames[2]]);
155+
animation.add('pressed', [daFrames[2] + pxDV, daFrames[2] + (pxDV * 2)], 12, false);
156+
animation.add('confirm', [daFrames[2] + (pxDV * 3), daFrames[2] + (pxDV * 4)], 24, false);
156157
case 3:
157-
animation.add('static', [3]);
158-
animation.add('pressed', [7, 11], 12, false);
159-
animation.add('confirm', [15, 19], 24, false);
158+
animation.add('static', [daFrames[3]]);
159+
animation.add('pressed', [daFrames[3] + pxDV, daFrames[3] + (pxDV * 2)], 12, false);
160+
animation.add('confirm', [daFrames[3] + (pxDV * 3), daFrames[3] + (pxDV * 4)], 24, false);
160161
}
162+
//i used windows calculator
161163
}
162164
else
163165
{

‎source/objects/playfields/NoteField.hx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class NoteField extends FieldBase
128128
var drawMod = modManager.get("drawDistance");
129129
var drawDist = drawMod == null ? FlxG.height : drawMod.getValue(modNumber);
130130
var multAllowed = modManager.get("disableDrawDistMult");
131-
var alwaysDraw = modManager.get("alwaysDraw").getValue(modNumber) != 0; // Forces notes to draw, no matter the draw distance
131+
var alwaysDraw = try{ modManager.get("alwaysDraw").getValue(modNumber) != 0;} catch(e) {false;} // Forces notes to draw, no matter the draw distance
132132
if (multAllowed == null || multAllowed.getValue(modNumber) == 0)
133133
drawDist *= drawDistMod;
134134
var lookAheadTime = modManager.getValue("lookAheadTime", modNumber);
@@ -143,7 +143,7 @@ class NoteField extends FieldBase
143143
var speed = modManager.getNoteSpeed(daNote, modNumber, songSpeed);
144144
var visPos = -((Conductor.visualPosition - daNote.visualTime) * speed);
145145

146-
if (visPos > drawDist || (daNote.wasGoodHit && daNote.sustainLength > 0))
146+
if ((visPos > drawDist && !alwaysDraw) || (daNote.wasGoodHit && daNote.sustainLength > 0))
147147
continue; // don't draw
148148

149149
if (!daNote.copyX && !daNote.copyY) {

‎source/options/GameplaySettingsSubState.hx‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,6 @@ class GameplaySettingsSubState extends BaseOptionsMenu
2020
BOOL);
2121
addOption(option);
2222

23-
var option:Option = new Option('Input System',
24-
"The input system you wish to use.",
25-
'inputSystem',
26-
STRING,
27-
[
28-
"Native",
29-
"BEAT! Engine",
30-
"Kade Engine",
31-
"ZoroForce EK",
32-
"Mic'ed Up Engine",
33-
"Andromeda Engine (legacy)",
34-
"YoshiEngine",
35-
"Kade Engine Community",
36-
"Rhythm"
37-
]);
38-
addOption(option);
39-
option.displayFormat = '< %v >';
40-
4123
var option:Option = new Option('Opponent Notes',
4224
'If unchecked, opponent notes get hidden.',
4325
'opponentStrums',
@@ -61,13 +43,13 @@ class GameplaySettingsSubState extends BaseOptionsMenu
6143
'If unchecked, turns off the mechanics for songs that have them.',
6244
'gimmicksAllowed',
6345
'bool');
64-
addOption(option);
46+
addOption(option);
6547

66-
var option:Option = new Option('Allow Modcharts',
67-
'If unchecked, turns off the modcharts for songs that have them.',
68-
'modcharts',
69-
'bool');
70-
addOption(option);
48+
var option:Option = new Option('Allow Modcharts',
49+
'If unchecked, turns off the modcharts for songs that have them.',
50+
'modcharts',
51+
'bool');
52+
addOption(option);
7153

7254
var option:Option = new Option('Disable Reset Button',
7355
"If checked, pressing Reset won't do anything.",

‎source/options/MixtapeSettingsSubState.hx‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,25 @@ class MixtapeSettingsSubState extends BaseOptionsMenu
2828
"Random (NA)",
2929
]);
3030
addOption(option);
31+
option.displayFormat = '< %v >';
32+
33+
var option:Option = new Option('Input System',
34+
"The input system you wish to use.",
35+
'inputSystem',
36+
STRING,
37+
[
38+
"Native",
39+
"BEAT! Engine",
40+
"Kade Engine",
41+
"ZoroForce EK",
42+
"Mic'ed Up Engine",
43+
"Andromeda Engine (legacy)",
44+
"YoshiEngine",
45+
"Kade Engine Community",
46+
"Rhythm"
47+
]);
48+
addOption(option);
49+
option.displayFormat = '< %v >';
3150

3251
super();
3352
}

‎source/options/NotesColorSubState.hx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,7 @@ class NotesColorSubState extends MusicBeatSubstate
635635
{
636636
ChartingNote.initializeGlobalRGBShader(i);
637637
var newNote:ChartingStrumNote = new ChartingStrumNote(150 + (480 / dataArray.length * i), 200, i, 0);
638+
if (PlayState.isPixelStage) newNote.texture = 'noteskins/NOTE_assets';
638639
newNote.useRGBShader = true;
639640
newNote.setGraphicSize(102);
640641
newNote.updateHitbox();

0 commit comments

Comments
 (0)