Skip to content

Commit 831270d

Browse files
YoshiCrafter29YoshiCrafter29
committed
sustain fix
1 parent 82b0f2c commit 831270d

6 files changed

Lines changed: 92 additions & 94 deletions

File tree

‎art/flashFiles/NOTE_assets.fla‎

-645 KB
Binary file not shown.

‎assets/images/game/NOTE_assets.png‎

77.8 KB
Loading

‎assets/images/game/NOTE_assets.xml‎

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2,91 +2,91 @@
22
<TextureAtlas imagePath="NOTE_assets.png">
33
<!-- Created with Adobe Animate version 21.0.1.37179 -->
44
<!-- http://www.adobe.com/products/animate.html -->
5-
<SubTexture name="arrowDOWN0000" x="2" y="2" width="157" height="154" pivotX="0.05" pivotY="0.05"/>
6-
<SubTexture name="arrowLEFT0000" x="161" y="2" width="154" height="157" pivotX="-1.35" pivotY="1.45"/>
7-
<SubTexture name="arrowRIGHT0000" x="317" y="2" width="154" height="156" pivotX="-1.45" pivotY="1.65"/>
8-
<SubTexture name="arrowUP0000" x="473" y="2" width="157" height="154" pivotX="0" pivotY="0"/>
9-
<SubTexture name="blue0000" x="632" y="2" width="157" height="154" pivotX="0" pivotY="0"/>
10-
<SubTexture name="blue hold end0000" x="791" y="2" width="50" height="64" pivotX="0" pivotY="0"/>
11-
<SubTexture name="blue hold piece0000" x="843" y="2" width="50" height="44" pivotX="0" pivotY="0"/>
12-
<SubTexture name="down confirm0000" x="895" y="2" width="238" height="235" pivotX="31.15" pivotY="37.3"/>
13-
<SubTexture name="down confirm0001" x="1135" y="2" width="238" height="235"/>
14-
<SubTexture name="down confirm0002" x="1375" y="2" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
15-
<SubTexture name="down confirm0003" x="1375" y="2" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
16-
<SubTexture name="down press0000" x="1597" y="2" width="142" height="140" pivotX="0" pivotY="0" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
17-
<SubTexture name="down press0001" x="1597" y="2" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
18-
<SubTexture name="down press0002" x="1741" y="2" width="149" height="146"/>
19-
<SubTexture name="down press0003" x="1741" y="2" width="149" height="146"/>
20-
<SubTexture name="green0000" x="2" y="239" width="157" height="154" pivotX="0" pivotY="0"/>
21-
<SubTexture name="green hold end0000" x="161" y="239" width="50" height="64" pivotX="0" pivotY="0"/>
22-
<SubTexture name="green hold piece0000" x="213" y="239" width="50" height="44" pivotX="0" pivotY="0"/>
23-
<SubTexture name="left confirm0000" x="265" y="239" width="228" height="231" pivotX="31.3" pivotY="31"/>
24-
<SubTexture name="left confirm0001" x="495" y="239" width="218" height="221" frameX="-5" frameY="-5" frameWidth="228" frameHeight="231"/>
25-
<SubTexture name="left confirm0002" x="715" y="239" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
26-
<SubTexture name="left confirm0003" x="715" y="239" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
27-
<SubTexture name="left press0000" x="942" y="239" width="140" height="142" pivotX="0" pivotY="0" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
28-
<SubTexture name="left press0001" x="942" y="239" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
29-
<SubTexture name="left press0002" x="1084" y="239" width="146" height="149"/>
30-
<SubTexture name="left press0003" x="1084" y="239" width="146" height="149"/>
31-
<SubTexture name="left press0004" x="1084" y="239" width="146" height="149"/>
32-
<SubTexture name="left press0005" x="1084" y="239" width="146" height="149"/>
33-
<SubTexture name="left press0006" x="1084" y="239" width="146" height="149"/>
34-
<SubTexture name="left press0007" x="1084" y="239" width="146" height="149"/>
35-
<SubTexture name="left press0008" x="1084" y="239" width="146" height="149"/>
36-
<SubTexture name="left press0009" x="1084" y="239" width="146" height="149"/>
37-
<SubTexture name="left press0010" x="1084" y="239" width="146" height="149"/>
38-
<SubTexture name="left press0011" x="1084" y="239" width="146" height="149"/>
39-
<SubTexture name="left press0012" x="1084" y="239" width="146" height="149"/>
40-
<SubTexture name="left press0013" x="1084" y="239" width="146" height="149"/>
41-
<SubTexture name="left press0014" x="1084" y="239" width="146" height="149"/>
42-
<SubTexture name="left press0015" x="1084" y="239" width="146" height="149"/>
43-
<SubTexture name="left press0016" x="1084" y="239" width="146" height="149"/>
44-
<SubTexture name="left press0017" x="1084" y="239" width="146" height="149"/>
45-
<SubTexture name="left press0018" x="1084" y="239" width="146" height="149"/>
46-
<SubTexture name="left press0019" x="1084" y="239" width="146" height="149"/>
47-
<SubTexture name="pruple end hold0000" x="1232" y="239" width="50" height="64" pivotX="0" pivotY="0"/>
48-
<SubTexture name="purple0000" x="1284" y="239" width="154" height="157" pivotX="0" pivotY="0"/>
49-
<SubTexture name="purple hold piece0000" x="1440" y="239" width="50" height="44" pivotX="0" pivotY="0"/>
50-
<SubTexture name="red0000" x="1492" y="239" width="154" height="157" pivotX="0" pivotY="0"/>
51-
<SubTexture name="red hold end0000" x="1648" y="239" width="50" height="64" pivotX="0" pivotY="0"/>
52-
<SubTexture name="red hold piece0000" x="1700" y="239" width="50" height="44" pivotX="0" pivotY="0"/>
53-
<SubTexture name="right confirm0000" x="1752" y="239" width="223" height="226" pivotX="30.9" pivotY="31" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
54-
<SubTexture name="right confirm0001" x="2" y="472" width="223" height="226" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
55-
<SubTexture name="right confirm0002" x="227" y="472" width="226" height="230"/>
56-
<SubTexture name="right confirm0003" x="227" y="472" width="226" height="230"/>
57-
<SubTexture name="right press0000" x="455" y="472" width="138" height="141" pivotX="0" pivotY="0" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
58-
<SubTexture name="right press0001" x="455" y="472" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
59-
<SubTexture name="right press0002" x="595" y="472" width="148" height="151"/>
60-
<SubTexture name="right press0003" x="595" y="472" width="148" height="151"/>
61-
<SubTexture name="right press0004" x="595" y="472" width="148" height="151"/>
62-
<SubTexture name="right press0005" x="595" y="472" width="148" height="151"/>
63-
<SubTexture name="right press0006" x="595" y="472" width="148" height="151"/>
64-
<SubTexture name="right press0007" x="595" y="472" width="148" height="151"/>
65-
<SubTexture name="right press0008" x="595" y="472" width="148" height="151"/>
66-
<SubTexture name="right press0009" x="595" y="472" width="148" height="151"/>
67-
<SubTexture name="right press0010" x="595" y="472" width="148" height="151"/>
68-
<SubTexture name="right press0011" x="595" y="472" width="148" height="151"/>
69-
<SubTexture name="right press0012" x="595" y="472" width="148" height="151"/>
70-
<SubTexture name="right press0013" x="595" y="472" width="148" height="151"/>
71-
<SubTexture name="right press0014" x="595" y="472" width="148" height="151"/>
72-
<SubTexture name="right press0015" x="595" y="472" width="148" height="151"/>
73-
<SubTexture name="right press0016" x="595" y="472" width="148" height="151"/>
74-
<SubTexture name="right press0017" x="595" y="472" width="148" height="151"/>
75-
<SubTexture name="right press0018" x="595" y="472" width="148" height="151"/>
76-
<SubTexture name="right press0019" x="595" y="472" width="148" height="151"/>
77-
<SubTexture name="right press0020" x="595" y="472" width="148" height="151"/>
78-
<SubTexture name="right press0021" x="595" y="472" width="148" height="151"/>
79-
<SubTexture name="right press0022" x="595" y="472" width="148" height="151"/>
80-
<SubTexture name="right press0023" x="595" y="472" width="148" height="151"/>
81-
<SubTexture name="right press0024" x="595" y="472" width="148" height="151"/>
82-
<SubTexture name="right press0025" x="595" y="472" width="148" height="151"/>
83-
<SubTexture name="right press0026" x="595" y="472" width="148" height="151"/>
84-
<SubTexture name="up confirm0000" x="745" y="472" width="236" height="232" pivotX="35" pivotY="34.95"/>
85-
<SubTexture name="up confirm0001" x="983" y="472" width="236" height="232"/>
86-
<SubTexture name="up confirm0002" x="1221" y="472" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
87-
<SubTexture name="up confirm0003" x="1221" y="472" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
88-
<SubTexture name="up press0000" x="1437" y="472" width="144" height="141" pivotX="0" pivotY="0" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
89-
<SubTexture name="up press0001" x="1437" y="472" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
90-
<SubTexture name="up press0002" x="1583" y="472" width="153" height="150"/>
91-
<SubTexture name="up press0003" x="1583" y="472" width="153" height="150"/>
5+
<SubTexture name="arrowDOWN0000" x="862" y="600" width="157" height="154"/>
6+
<SubTexture name="arrowLEFT0000" x="1289" y="2" width="154" height="156"/>
7+
<SubTexture name="arrowRIGHT0000" x="1289" y="160" width="154" height="156"/>
8+
<SubTexture name="arrowUP0000" x="862" y="444" width="157" height="154"/>
9+
<SubTexture name="blue0000" x="703" y="600" width="157" height="154"/>
10+
<SubTexture name="blue hold end0000" x="1075" y="215" width="50" height="64"/>
11+
<SubTexture name="blue hold piece0000" x="1445" y="180" width="50" height="87"/>
12+
<SubTexture name="down confirm0000" x="2" y="2" width="238" height="235"/>
13+
<SubTexture name="down confirm0001" x="2" y="239" width="238" height="235"/>
14+
<SubTexture name="down confirm0002" x="697" y="225" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
15+
<SubTexture name="down confirm0003" x="697" y="225" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
16+
<SubTexture name="down press0000" x="1167" y="617" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
17+
<SubTexture name="down press0001" x="1167" y="617" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
18+
<SubTexture name="down press0002" x="1225" y="318" width="149" height="146"/>
19+
<SubTexture name="down press0003" x="1225" y="318" width="149" height="146"/>
20+
<SubTexture name="green0000" x="703" y="444" width="157" height="154"/>
21+
<SubTexture name="green hold end0000" x="919" y="374" width="50" height="64"/>
22+
<SubTexture name="green hold piece0000" x="1445" y="91" width="50" height="87"/>
23+
<SubTexture name="left confirm0000" x="242" y="2" width="228" height="231"/>
24+
<SubTexture name="left confirm0001" x="697" y="2" width="218" height="221" frameX="-5" frameY="-5" frameWidth="228" frameHeight="231"/>
25+
<SubTexture name="left confirm0002" x="470" y="235" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
26+
<SubTexture name="left confirm0003" x="470" y="235" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
27+
<SubTexture name="left press0000" x="1169" y="466" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
28+
<SubTexture name="left press0001" x="1169" y="466" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
29+
<SubTexture name="left press0002" x="1021" y="466" width="146" height="149"/>
30+
<SubTexture name="left press0003" x="1021" y="466" width="146" height="149"/>
31+
<SubTexture name="left press0004" x="1021" y="466" width="146" height="149"/>
32+
<SubTexture name="left press0005" x="1021" y="466" width="146" height="149"/>
33+
<SubTexture name="left press0006" x="1021" y="466" width="146" height="149"/>
34+
<SubTexture name="left press0007" x="1021" y="466" width="146" height="149"/>
35+
<SubTexture name="left press0008" x="1021" y="466" width="146" height="149"/>
36+
<SubTexture name="left press0009" x="1021" y="466" width="146" height="149"/>
37+
<SubTexture name="left press0010" x="1021" y="466" width="146" height="149"/>
38+
<SubTexture name="left press0011" x="1021" y="466" width="146" height="149"/>
39+
<SubTexture name="left press0012" x="1021" y="466" width="146" height="149"/>
40+
<SubTexture name="left press0013" x="1021" y="466" width="146" height="149"/>
41+
<SubTexture name="left press0014" x="1021" y="466" width="146" height="149"/>
42+
<SubTexture name="left press0015" x="1021" y="466" width="146" height="149"/>
43+
<SubTexture name="left press0016" x="1021" y="466" width="146" height="149"/>
44+
<SubTexture name="left press0017" x="1021" y="466" width="146" height="149"/>
45+
<SubTexture name="left press0018" x="1021" y="466" width="146" height="149"/>
46+
<SubTexture name="left press0019" x="1021" y="466" width="146" height="149"/>
47+
<SubTexture name="pruple end hold0000" x="478" y="693" width="50" height="64"/>
48+
<SubTexture name="purple0000" x="1133" y="2" width="154" height="157"/>
49+
<SubTexture name="purple hold piece0000" x="1445" y="269" width="50" height="87"/>
50+
<SubTexture name="red0000" x="919" y="215" width="154" height="157"/>
51+
<SubTexture name="red hold end0000" x="1021" y="374" width="50" height="64"/>
52+
<SubTexture name="red hold piece0000" x="1445" y="2" width="50" height="87"/>
53+
<SubTexture name="right confirm0000" x="472" y="2" width="223" height="226" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
54+
<SubTexture name="right confirm0001" x="478" y="465" width="223" height="226" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
55+
<SubTexture name="right confirm0002" x="242" y="235" width="226" height="230"/>
56+
<SubTexture name="right confirm0003" x="242" y="235" width="226" height="230"/>
57+
<SubTexture name="right press0000" x="1311" y="466" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
58+
<SubTexture name="right press0001" x="1311" y="466" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
59+
<SubTexture name="right press0002" x="1075" y="313" width="148" height="151"/>
60+
<SubTexture name="right press0003" x="1075" y="313" width="148" height="151"/>
61+
<SubTexture name="right press0004" x="1075" y="313" width="148" height="151"/>
62+
<SubTexture name="right press0005" x="1075" y="313" width="148" height="151"/>
63+
<SubTexture name="right press0006" x="1075" y="313" width="148" height="151"/>
64+
<SubTexture name="right press0007" x="1075" y="313" width="148" height="151"/>
65+
<SubTexture name="right press0008" x="1075" y="313" width="148" height="151"/>
66+
<SubTexture name="right press0009" x="1075" y="313" width="148" height="151"/>
67+
<SubTexture name="right press0010" x="1075" y="313" width="148" height="151"/>
68+
<SubTexture name="right press0011" x="1075" y="313" width="148" height="151"/>
69+
<SubTexture name="right press0012" x="1075" y="313" width="148" height="151"/>
70+
<SubTexture name="right press0013" x="1075" y="313" width="148" height="151"/>
71+
<SubTexture name="right press0014" x="1075" y="313" width="148" height="151"/>
72+
<SubTexture name="right press0015" x="1075" y="313" width="148" height="151"/>
73+
<SubTexture name="right press0016" x="1075" y="313" width="148" height="151"/>
74+
<SubTexture name="right press0017" x="1075" y="313" width="148" height="151"/>
75+
<SubTexture name="right press0018" x="1075" y="313" width="148" height="151"/>
76+
<SubTexture name="right press0019" x="1075" y="313" width="148" height="151"/>
77+
<SubTexture name="right press0020" x="1075" y="313" width="148" height="151"/>
78+
<SubTexture name="right press0021" x="1075" y="313" width="148" height="151"/>
79+
<SubTexture name="right press0022" x="1075" y="313" width="148" height="151"/>
80+
<SubTexture name="right press0023" x="1075" y="313" width="148" height="151"/>
81+
<SubTexture name="right press0024" x="1075" y="313" width="148" height="151"/>
82+
<SubTexture name="right press0025" x="1075" y="313" width="148" height="151"/>
83+
<SubTexture name="right press0026" x="1075" y="313" width="148" height="151"/>
84+
<SubTexture name="up confirm0000" x="2" y="476" width="236" height="232"/>
85+
<SubTexture name="up confirm0001" x="240" y="476" width="236" height="232"/>
86+
<SubTexture name="up confirm0002" x="917" y="2" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
87+
<SubTexture name="up confirm0003" x="917" y="2" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
88+
<SubTexture name="up press0000" x="1021" y="617" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
89+
<SubTexture name="up press0001" x="1021" y="617" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
90+
<SubTexture name="up press0002" x="1133" y="161" width="153" height="150"/>
91+
<SubTexture name="up press0003" x="1133" y="161" width="153" height="150"/>
9292
</TextureAtlas>

‎buildnumber.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2052
1+
2058

‎source/funkin/game/Note.hx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ class Note extends FlxSprite
161161

162162
public var lastScrollSpeed:Null<Float> = null;
163163
public var angleOffsets:Bool = true;
164+
public var useAntialiasingFix:Bool = false;
164165

165166
/**
166167
* Whenever the position of the note should be relative to the strum position or not.
@@ -173,8 +174,6 @@ class Note extends FlxSprite
173174
@:privateAccess if (__strumCameras != null) FlxCamera._defaultCameras = __strumCameras;
174175

175176
var negativeScroll = isSustainNote && nextSustain != null && lastScrollSpeed < 0;
176-
if (antialiasing && nextSustain == null)
177-
rotOffset.y += 2;
178177
if (negativeScroll) offset.y *= -1;
179178

180179
if (__strum != null && strumRelativePos) {
@@ -201,8 +200,6 @@ class Note extends FlxSprite
201200
}
202201

203202
if (negativeScroll) offset.y *= -1;
204-
if (antialiasing && nextSustain == null)
205-
rotOffset.y -= 2;
206203
@:privateAccess FlxCamera._defaultCameras = oldDefaultCameras;
207204
}
208205

@@ -223,9 +220,9 @@ class Note extends FlxSprite
223220

224221
scale.y = (stepLength * (0.45 * FlxMath.roundDecimal(scrollSpeed, 2))) / frameHeight;
225222
updateHitbox();
226-
if (antialiasing && !FlxG.forceNoAntialiasing) {
223+
if (useAntialiasingFix) {
227224
// dumbass antialiasing
228-
scale.y += 3 / frameHeight;
225+
scale.y += 1 / frameHeight;
229226
}
230227
}
231228

‎source/funkin/system/CommandLineHandler.hx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class CommandLineHandler {
4040
Sys.exit(0);
4141
}
4242
#end
43+
case "-livereload"
4344
default:
4445
Sys.println("Unknown command");
4546
}

0 commit comments

Comments
 (0)