gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

sustain fix

Browse Source
This commit is contained in:
Yoshman29
2023-01-15 15:19:40 +01:00
parent 82b0f2c9e4
commit 831270de2c
6 changed files with 92 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
art/flashFiles/NOTE_assets.fla
BIN
View File
Binary file not shown.
assets/images/game/NOTE_assets.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 620 KiB

After

Width:  |  Height:  |  Size: 698 KiB

assets/images/game/NOTE_assets.xml
+87 -87
View File
@@ -2,91 +2,91 @@
<TextureAtlas imagePath="NOTE_assets.png">
<!-- Created with Adobe Animate version 21.0.1.37179 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="arrowDOWN0000" x="2" y="2" width="157" height="154" pivotX="0.05" pivotY="0.05"/>
<SubTexture name="arrowLEFT0000" x="161" y="2" width="154" height="157" pivotX="-1.35" pivotY="1.45"/>
<SubTexture name="arrowRIGHT0000" x="317" y="2" width="154" height="156" pivotX="-1.45" pivotY="1.65"/>
<SubTexture name="arrowUP0000" x="473" y="2" width="157" height="154" pivotX="0" pivotY="0"/>
<SubTexture name="blue0000" x="632" y="2" width="157" height="154" pivotX="0" pivotY="0"/>
<SubTexture name="blue hold end0000" x="791" y="2" width="50" height="64" pivotX="0" pivotY="0"/>
<SubTexture name="blue hold piece0000" x="843" y="2" width="50" height="44" pivotX="0" pivotY="0"/>
<SubTexture name="down confirm0000" x="895" y="2" width="238" height="235" pivotX="31.15" pivotY="37.3"/>
<SubTexture name="down confirm0001" x="1135" y="2" width="238" height="235"/>
<SubTexture name="down confirm0002" x="1375" y="2" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
<SubTexture name="down confirm0003" x="1375" y="2" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
<SubTexture name="down press0000" x="1597" y="2" width="142" height="140" pivotX="0" pivotY="0" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0001" x="1597" y="2" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0002" x="1741" y="2" width="149" height="146"/>
<SubTexture name="down press0003" x="1741" y="2" width="149" height="146"/>
<SubTexture name="green0000" x="2" y="239" width="157" height="154" pivotX="0" pivotY="0"/>
<SubTexture name="green hold end0000" x="161" y="239" width="50" height="64" pivotX="0" pivotY="0"/>
<SubTexture name="green hold piece0000" x="213" y="239" width="50" height="44" pivotX="0" pivotY="0"/>
<SubTexture name="left confirm0000" x="265" y="239" width="228" height="231" pivotX="31.3" pivotY="31"/>
<SubTexture name="left confirm0001" x="495" y="239" width="218" height="221" frameX="-5" frameY="-5" frameWidth="228" frameHeight="231"/>
<SubTexture name="left confirm0002" x="715" y="239" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
<SubTexture name="left confirm0003" x="715" y="239" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
<SubTexture name="left press0000" x="942" y="239" width="140" height="142" pivotX="0" pivotY="0" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0001" x="942" y="239" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0002" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0003" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0004" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0005" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0006" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0007" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0008" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0009" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0010" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0011" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0012" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0013" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0014" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0015" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0016" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0017" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0018" x="1084" y="239" width="146" height="149"/>
<SubTexture name="left press0019" x="1084" y="239" width="146" height="149"/>
<SubTexture name="pruple end hold0000" x="1232" y="239" width="50" height="64" pivotX="0" pivotY="0"/>
<SubTexture name="purple0000" x="1284" y="239" width="154" height="157" pivotX="0" pivotY="0"/>
<SubTexture name="purple hold piece0000" x="1440" y="239" width="50" height="44" pivotX="0" pivotY="0"/>
<SubTexture name="red0000" x="1492" y="239" width="154" height="157" pivotX="0" pivotY="0"/>
<SubTexture name="red hold end0000" x="1648" y="239" width="50" height="64" pivotX="0" pivotY="0"/>
<SubTexture name="red hold piece0000" x="1700" y="239" width="50" height="44" pivotX="0" pivotY="0"/>
<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"/>
<SubTexture name="right confirm0001" x="2" y="472" width="223" height="226" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
<SubTexture name="right confirm0002" x="227" y="472" width="226" height="230"/>
<SubTexture name="right confirm0003" x="227" y="472" width="226" height="230"/>
<SubTexture name="right press0000" x="455" y="472" width="138" height="141" pivotX="0" pivotY="0" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0001" x="455" y="472" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0002" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0003" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0004" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0005" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0006" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0007" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0008" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0009" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0010" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0011" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0012" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0013" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0014" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0015" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0016" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0017" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0018" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0019" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0020" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0021" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0022" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0023" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0024" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0025" x="595" y="472" width="148" height="151"/>
<SubTexture name="right press0026" x="595" y="472" width="148" height="151"/>
<SubTexture name="up confirm0000" x="745" y="472" width="236" height="232" pivotX="35" pivotY="34.95"/>
<SubTexture name="up confirm0001" x="983" y="472" width="236" height="232"/>
<SubTexture name="up confirm0002" x="1221" y="472" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
<SubTexture name="up confirm0003" x="1221" y="472" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
<SubTexture name="up press0000" x="1437" y="472" width="144" height="141" pivotX="0" pivotY="0" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0001" x="1437" y="472" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0002" x="1583" y="472" width="153" height="150"/>
<SubTexture name="up press0003" x="1583" y="472" width="153" height="150"/>
<SubTexture name="arrowDOWN0000" x="862" y="600" width="157" height="154"/>
<SubTexture name="arrowLEFT0000" x="1289" y="2" width="154" height="156"/>
<SubTexture name="arrowRIGHT0000" x="1289" y="160" width="154" height="156"/>
<SubTexture name="arrowUP0000" x="862" y="444" width="157" height="154"/>
<SubTexture name="blue0000" x="703" y="600" width="157" height="154"/>
<SubTexture name="blue hold end0000" x="1075" y="215" width="50" height="64"/>
<SubTexture name="blue hold piece0000" x="1445" y="180" width="50" height="87"/>
<SubTexture name="down confirm0000" x="2" y="2" width="238" height="235"/>
<SubTexture name="down confirm0001" x="2" y="239" width="238" height="235"/>
<SubTexture name="down confirm0002" x="697" y="225" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
<SubTexture name="down confirm0003" x="697" y="225" width="220" height="217" frameX="-6" frameY="-12" frameWidth="238" frameHeight="235"/>
<SubTexture name="down press0000" x="1167" y="617" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0001" x="1167" y="617" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0002" x="1225" y="318" width="149" height="146"/>
<SubTexture name="down press0003" x="1225" y="318" width="149" height="146"/>
<SubTexture name="green0000" x="703" y="444" width="157" height="154"/>
<SubTexture name="green hold end0000" x="919" y="374" width="50" height="64"/>
<SubTexture name="green hold piece0000" x="1445" y="91" width="50" height="87"/>
<SubTexture name="left confirm0000" x="242" y="2" width="228" height="231"/>
<SubTexture name="left confirm0001" x="697" y="2" width="218" height="221" frameX="-5" frameY="-5" frameWidth="228" frameHeight="231"/>
<SubTexture name="left confirm0002" x="470" y="235" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
<SubTexture name="left confirm0003" x="470" y="235" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
<SubTexture name="left press0000" x="1169" y="466" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0001" x="1169" y="466" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0002" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0003" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0004" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0005" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0006" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0007" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0008" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0009" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0010" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0011" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0012" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0013" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0014" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0015" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0016" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0017" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0018" x="1021" y="466" width="146" height="149"/>
<SubTexture name="left press0019" x="1021" y="466" width="146" height="149"/>
<SubTexture name="pruple end hold0000" x="478" y="693" width="50" height="64"/>
<SubTexture name="purple0000" x="1133" y="2" width="154" height="157"/>
<SubTexture name="purple hold piece0000" x="1445" y="269" width="50" height="87"/>
<SubTexture name="red0000" x="919" y="215" width="154" height="157"/>
<SubTexture name="red hold end0000" x="1021" y="374" width="50" height="64"/>
<SubTexture name="red hold piece0000" x="1445" y="2" width="50" height="87"/>
<SubTexture name="right confirm0000" x="472" y="2" width="223" height="226" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
<SubTexture name="right confirm0001" x="478" y="465" width="223" height="226" frameX="-1" frameY="-3" frameWidth="226" frameHeight="230"/>
<SubTexture name="right confirm0002" x="242" y="235" width="226" height="230"/>
<SubTexture name="right confirm0003" x="242" y="235" width="226" height="230"/>
<SubTexture name="right press0000" x="1311" y="466" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0001" x="1311" y="466" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0002" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0003" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0004" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0005" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0006" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0007" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0008" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0009" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0010" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0011" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0012" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0013" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0014" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0015" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0016" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0017" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0018" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0019" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0020" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0021" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0022" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0023" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0024" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0025" x="1075" y="313" width="148" height="151"/>
<SubTexture name="right press0026" x="1075" y="313" width="148" height="151"/>
<SubTexture name="up confirm0000" x="2" y="476" width="236" height="232"/>
<SubTexture name="up confirm0001" x="240" y="476" width="236" height="232"/>
<SubTexture name="up confirm0002" x="917" y="2" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
<SubTexture name="up confirm0003" x="917" y="2" width="214" height="211" frameX="-11" frameY="-10" frameWidth="236" frameHeight="232"/>
<SubTexture name="up press0000" x="1021" y="617" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0001" x="1021" y="617" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0002" x="1133" y="161" width="153" height="150"/>
<SubTexture name="up press0003" x="1133" y="161" width="153" height="150"/>
</TextureAtlas>
buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
2052
2058
source/funkin/game/Note.hx
+3 -6
View File
@@ -161,6 +161,7 @@ class Note extends FlxSprite
public var lastScrollSpeed:Null<Float> = null;
public var angleOffsets:Bool = true;
public var useAntialiasingFix:Bool = false;
/**
* Whenever the position of the note should be relative to the strum position or not.
@@ -173,8 +174,6 @@ class Note extends FlxSprite
@:privateAccess if (__strumCameras != null) FlxCamera._defaultCameras = __strumCameras;
var negativeScroll = isSustainNote && nextSustain != null && lastScrollSpeed < 0;
if (antialiasing && nextSustain == null)
rotOffset.y += 2;
if (negativeScroll) offset.y *= -1;
if (__strum != null && strumRelativePos) {
@@ -201,8 +200,6 @@ class Note extends FlxSprite
}
if (negativeScroll) offset.y *= -1;
if (antialiasing && nextSustain == null)
rotOffset.y -= 2;
@:privateAccess FlxCamera._defaultCameras = oldDefaultCameras;
}
@@ -223,9 +220,9 @@ class Note extends FlxSprite
scale.y = (stepLength * (0.45 * FlxMath.roundDecimal(scrollSpeed, 2))) / frameHeight;
updateHitbox();
if (antialiasing && !FlxG.forceNoAntialiasing) {
if (useAntialiasingFix) {
// dumbass antialiasing
scale.y += 3 / frameHeight;
scale.y += 1 / frameHeight;
}
}
source/funkin/system/CommandLineHandler.hx
+1
View File
@@ -40,6 +40,7 @@ class CommandLineHandler {
Sys.exit(0);
}
#end
case "-livereload"
default:
Sys.println("Unknown command");
}