Skip to content

Commit

Permalink
bugs that I encountered fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheRealJake12
TheRealJake12 committed Nov 12, 2023
1 parent d2e14ce commit 1569409
Show file tree
Hide file tree
Showing 10 changed files with 75 additions and 85 deletions.
Binary file modified assets/preload/images/mainmenu/menu_donate.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 13 additions & 13 deletions assets/preload/images/mainmenu/menu_donate.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="menu_donate.png">
<!-- Created with Adobe Animate version 21.0.1.37179 -->
<!-- Created with Adobe Animate version 22.0.2.168 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="donate basic0000" x="4" y="4" width="444" height="117" pivotX="10.5" pivotY="14.85"/>
<SubTexture name="donate basic0001" x="4" y="4" width="444" height="117"/>
<SubTexture name="donate basic0002" x="4" y="4" width="444" height="117"/>
<SubTexture name="donate basic0003" x="448" y="4" width="444" height="117"/>
<SubTexture name="donate basic0004" x="448" y="4" width="444" height="117"/>
<SubTexture name="donate basic0005" x="448" y="4" width="444" height="117"/>
<SubTexture name="donate basic0006" x="4" y="121" width="444" height="117"/>
<SubTexture name="donate basic0007" x="4" y="121" width="444" height="117"/>
<SubTexture name="donate basic0008" x="4" y="121" width="444" height="117"/>
<SubTexture name="donate white0000" x="4" y="238" width="590" height="157" pivotX="18.2" pivotY="23.95" frameX="0" frameY="-2" frameWidth="590" frameHeight="159"/>
<SubTexture name="donate white0001" x="4" y="395" width="587" height="154" frameX="-1" frameY="-5" frameWidth="590" frameHeight="159"/>
<SubTexture name="donate white0002" x="4" y="549" width="585" height="155" frameX="-3" frameY="0" frameWidth="590" frameHeight="159"/>
<SubTexture name="donate basic0000" x="0" y="487" width="444" height="117"/>
<SubTexture name="donate basic0001" x="0" y="487" width="444" height="117"/>
<SubTexture name="donate basic0002" x="0" y="487" width="444" height="117"/>
<SubTexture name="donate basic0003" x="0" y="611" width="444" height="117"/>
<SubTexture name="donate basic0004" x="0" y="611" width="444" height="117"/>
<SubTexture name="donate basic0005" x="0" y="611" width="444" height="117"/>
<SubTexture name="donate basic0006" x="0" y="735" width="444" height="117"/>
<SubTexture name="donate basic0007" x="0" y="735" width="444" height="117"/>
<SubTexture name="donate basic0008" x="0" y="735" width="444" height="117"/>
<SubTexture name="donate white0000" x="0" y="0" width="590" height="157" frameX="0" frameY="-2" frameWidth="590" frameHeight="159"/>
<SubTexture name="donate white0001" x="0" y="326" width="587" height="154" frameX="-1" frameY="-5" frameWidth="590" frameHeight="159"/>
<SubTexture name="donate white0002" x="0" y="164" width="585" height="155" frameX="-3" frameY="0" frameWidth="590" frameHeight="159"/>
</TextureAtlas>
Binary file modified assets/preload/images/mainmenu/menu_freeplay.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 13 additions & 13 deletions assets/preload/images/mainmenu/menu_freeplay.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="menu_freeplay.png">
<!-- Created with Adobe Animate version 21.0.1.37179 -->
<!-- Created with Adobe Animate version 22.0.2.168 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="freeplay basic0000" x="4" y="4" width="484" height="122" pivotX="7.65" pivotY="10.55"/>
<SubTexture name="freeplay basic0001" x="4" y="4" width="484" height="122"/>
<SubTexture name="freeplay basic0002" x="4" y="4" width="484" height="122"/>
<SubTexture name="freeplay basic0003" x="488" y="4" width="484" height="122"/>
<SubTexture name="freeplay basic0004" x="488" y="4" width="484" height="122"/>
<SubTexture name="freeplay basic0005" x="488" y="4" width="484" height="122"/>
<SubTexture name="freeplay basic0006" x="4" y="126" width="484" height="122"/>
<SubTexture name="freeplay basic0007" x="4" y="126" width="484" height="122"/>
<SubTexture name="freeplay basic0008" x="4" y="126" width="484" height="122"/>
<SubTexture name="freeplay white0000" x="4" y="248" width="627" height="169" pivotX="15" pivotY="17.15" frameX="0" frameY="0" frameWidth="635" frameHeight="174"/>
<SubTexture name="freeplay white0001" x="4" y="417" width="632" height="170" frameX="-3" frameY="-1" frameWidth="635" frameHeight="174"/>
<SubTexture name="freeplay white0002" x="4" y="587" width="629" height="173" frameX="-4" frameY="-1" frameWidth="635" frameHeight="174"/>
<SubTexture name="freeplay basic0000" x="0" y="533" width="484" height="122"/>
<SubTexture name="freeplay basic0001" x="0" y="533" width="484" height="122"/>
<SubTexture name="freeplay basic0002" x="0" y="533" width="484" height="122"/>
<SubTexture name="freeplay basic0003" x="0" y="662" width="484" height="122"/>
<SubTexture name="freeplay basic0004" x="0" y="662" width="484" height="122"/>
<SubTexture name="freeplay basic0005" x="0" y="662" width="484" height="122"/>
<SubTexture name="freeplay basic0006" x="0" y="791" width="484" height="122"/>
<SubTexture name="freeplay basic0007" x="0" y="791" width="484" height="122"/>
<SubTexture name="freeplay basic0008" x="0" y="791" width="484" height="122"/>
<SubTexture name="freeplay white0000" x="0" y="357" width="627" height="169" frameX="0" frameY="0" frameWidth="635" frameHeight="174"/>
<SubTexture name="freeplay white0001" x="0" y="180" width="632" height="170" frameX="-3" frameY="-1" frameWidth="635" frameHeight="174"/>
<SubTexture name="freeplay white0002" x="0" y="0" width="629" height="173" frameX="-4" frameY="-1" frameWidth="635" frameHeight="174"/>
</TextureAtlas>
Binary file modified assets/preload/images/mainmenu/menu_options.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 13 additions & 13 deletions assets/preload/images/mainmenu/menu_options.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="menu_options.png">
<!-- Created with Adobe Animate version 21.0.1.37179 -->
<!-- Created with Adobe Animate version 22.0.2.168 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="options basic0000" x="4" y="4" width="487" height="111" pivotX="14.15" pivotY="11.95"/>
<SubTexture name="options basic0001" x="4" y="4" width="487" height="111"/>
<SubTexture name="options basic0002" x="4" y="4" width="487" height="111"/>
<SubTexture name="options basic0003" x="491" y="4" width="487" height="111"/>
<SubTexture name="options basic0004" x="491" y="4" width="487" height="111"/>
<SubTexture name="options basic0005" x="491" y="4" width="487" height="111"/>
<SubTexture name="options basic0006" x="4" y="115" width="487" height="111"/>
<SubTexture name="options basic0007" x="4" y="115" width="487" height="111"/>
<SubTexture name="options basic0008" x="4" y="115" width="487" height="111"/>
<SubTexture name="options white0000" x="4" y="226" width="606" height="155" pivotX="18.2" pivotY="23.95" frameX="-2" frameY="-1" frameWidth="610" frameHeight="163"/>
<SubTexture name="options white0001" x="4" y="381" width="607" height="158" frameX="-3" frameY="-1" frameWidth="610" frameHeight="163"/>
<SubTexture name="options white0002" x="4" y="539" width="610" height="163"/>
<SubTexture name="options basic0000" x="0" y="497" width="487" height="111"/>
<SubTexture name="options basic0001" x="0" y="497" width="487" height="111"/>
<SubTexture name="options basic0002" x="0" y="497" width="487" height="111"/>
<SubTexture name="options basic0003" x="0" y="615" width="487" height="111"/>
<SubTexture name="options basic0004" x="0" y="615" width="487" height="111"/>
<SubTexture name="options basic0005" x="0" y="615" width="487" height="111"/>
<SubTexture name="options basic0006" x="0" y="733" width="487" height="111"/>
<SubTexture name="options basic0007" x="0" y="733" width="487" height="111"/>
<SubTexture name="options basic0008" x="0" y="733" width="487" height="111"/>
<SubTexture name="options white0000" x="0" y="335" width="606" height="155" frameX="-2" frameY="-1" frameWidth="610" frameHeight="163"/>
<SubTexture name="options white0001" x="0" y="170" width="607" height="158" frameX="-3" frameY="-1" frameWidth="610" frameHeight="163"/>
<SubTexture name="options white0002" x="0" y="0" width="610" height="163"/>
</TextureAtlas>
Binary file modified assets/preload/images/mainmenu/menu_story mode.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions assets/preload/images/mainmenu/menu_story mode.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<TextureAtlas imagePath="menu_story mode.png">
<!-- Created with Adobe Animate version 22.0.2.168 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="story mode basic0000" x="0" y="528" width="615" height="122"/>
<SubTexture name="story mode basic0001" x="0" y="528" width="615" height="122"/>
<SubTexture name="story mode basic0002" x="0" y="528" width="615" height="122"/>
<SubTexture name="story mode basic0003" x="0" y="650" width="615" height="122"/>
<SubTexture name="story mode basic0004" x="0" y="650" width="615" height="122"/>
<SubTexture name="story mode basic0005" x="0" y="650" width="615" height="122"/>
<SubTexture name="story mode basic0006" x="0" y="772" width="615" height="122"/>
<SubTexture name="story mode basic0007" x="0" y="772" width="615" height="122"/>
<SubTexture name="story mode basic0008" x="0" y="772" width="615" height="122"/>
<SubTexture name="story mode white0000" x="0" y="355" width="796" height="173" frameX="0" frameY="-3" frameWidth="796" frameHeight="181"/>
<SubTexture name="story mode white0001" x="0" y="181" width="794" height="174" frameX="-2" frameY="-2" frameWidth="796" frameHeight="181"/>
<SubTexture name="story mode basic0000" x="0" y="549" width="615" height="122"/>
<SubTexture name="story mode basic0001" x="0" y="549" width="615" height="122"/>
<SubTexture name="story mode basic0002" x="0" y="549" width="615" height="122"/>
<SubTexture name="story mode basic0003" x="0" y="678" width="615" height="122"/>
<SubTexture name="story mode basic0004" x="0" y="678" width="615" height="122"/>
<SubTexture name="story mode basic0005" x="0" y="678" width="615" height="122"/>
<SubTexture name="story mode basic0006" x="0" y="807" width="615" height="122"/>
<SubTexture name="story mode basic0007" x="0" y="807" width="615" height="122"/>
<SubTexture name="story mode basic0008" x="0" y="807" width="615" height="122"/>
<SubTexture name="story mode white0000" x="0" y="369" width="796" height="173" frameX="0" frameY="-3" frameWidth="796" frameHeight="181"/>
<SubTexture name="story mode white0001" x="0" y="188" width="794" height="174" frameX="-2" frameY="-2" frameWidth="796" frameHeight="181"/>
<SubTexture name="story mode white0002" x="0" y="0" width="794" height="181" frameX="0" frameY="0" frameWidth="796" frameHeight="181"/>
</TextureAtlas>
59 changes: 25 additions & 34 deletions source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2592,8 +2592,11 @@ class PlayState extends MusicBeatState
vocalsEnemy = new FlxSound().loadEmbedded(Paths.voices(SONG.audioFile, 'E'));
}
else
{
vocalsEnemy = new FlxSound();
vocalsPlayer = new FlxSound();
vocalsEnemy = new FlxSound();
}

#end

if (FlxG.save.data.gen)
Expand Down Expand Up @@ -4347,17 +4350,10 @@ class PlayState extends MusicBeatState
iconP2.animation.curAnim.curFrame = 0;
}

if (camZooming)
if (songStarted)
{
var bpmRatio = Conductor.bpm / 100;

if (PlayStateChangeables.zoom < 0.8)
PlayStateChangeables.zoom = 0.8;

if (PlayStateChangeables.zoom > 1.2)
PlayStateChangeables.zoom = 1.2;

// this motherfucker fucks me so much.
FlxG.camera.zoom = FlxMath.lerp(zoomForTweens, FlxG.camera.zoom,
CoolUtil.boundTo(1 - (elapsed * 3.125 * bpmRatio * songMultiplier * zoomMultiplier), 0, 1));
camHUD.zoom = FlxMath.lerp(PlayStateChangeables.zoom * zoomForHUDTweens, camHUD.zoom,
Expand Down Expand Up @@ -5538,17 +5534,6 @@ class PlayState extends MusicBeatState
else
dad.playAnim('sing' + dataSuffix[singData] + altAnim, true);
}
#if FEATURE_LUAMODCHART
if (luaModchart != null)
if (!PlayStateChangeables.opponentMode)
luaModchart.executeState('playerTwoSing', [Math.abs(daNote.noteData), Conductor.songPosition]);
else
luaModchart.executeState('playerOneSing', [Math.abs(daNote.noteData), Conductor.songPosition]);
#end

#if FEATURE_HSCRIPT
scripts.executeAllFunc("opponentNoteHit", [daNote]);
#end

if (FlxG.save.data.cpuStrums)
{
Expand Down Expand Up @@ -5585,13 +5570,7 @@ class PlayState extends MusicBeatState
spawnNoteSplashOnNoteDad(daNote);
}
}
#if FEATURE_LUAMODCHART
if (luaModchart != null)
if (!PlayStateChangeables.opponentMode)
luaModchart.executeState('playerTwoSing', [Math.abs(daNote.noteData), Conductor.songPosition]);
else
luaModchart.executeState('playerOneSing', [Math.abs(daNote.noteData), Conductor.songPosition]);
#end


if (FlxG.save.data.cpuStrums)
{
Expand All @@ -5614,6 +5593,18 @@ class PlayState extends MusicBeatState
}
}

#if FEATURE_LUAMODCHART
if (luaModchart != null)
if (!PlayStateChangeables.opponentMode)
luaModchart.executeState('playerTwoSing', [Math.abs(daNote.noteData), Conductor.songPosition]);
else
luaModchart.executeState('playerOneSing', [Math.abs(daNote.noteData), Conductor.songPosition]);
#end

#if FEATURE_HSCRIPT
scripts.executeAllFunc("opponentNoteHit", [daNote]);
#end

destroyNote(daNote);
}

Expand Down Expand Up @@ -6262,9 +6253,8 @@ class PlayState extends MusicBeatState
else
healthBar.createFilledBar(0xFFFF0000, 0xFF66FF33);
healthBar.updateBar();

if (!isStoryMode)
PlayStateChangeables.botPlay = FlxG.save.data.botplay;

PlayStateChangeables.botPlay = FlxG.save.data.botplay;

for (i in uiGroup)
{
Expand All @@ -6290,17 +6280,14 @@ class PlayState extends MusicBeatState
bar.alpha = 1;
}
}

if (!isStoryMode)
{

botPlayState.kill();
uiGroup.remove(botPlayState);
if (PlayStateChangeables.botPlay)
{
botPlayState.revive();
uiGroup.add(botPlayState);
}
}

if (FlxG.save.data.judgementCounter)
{
Expand Down Expand Up @@ -6411,6 +6398,10 @@ class PlayState extends MusicBeatState
script.set("health", health);
script.set("Stage", Stage);
script.set("CoolUtil", CoolUtil);
script.set("SONG", SONG);
script.set("PlayStateChangeables", PlayStateChangeables);
script.set("downScroll", PlayStateChangeables.useDownscroll);
script.set("middleScroll", PlayStateChangeables.middleScroll);

// FUNCTIONS

Expand Down
1 change: 0 additions & 1 deletion source/StoryMenuState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ class StoryMenuState extends MusicBeatState
}

PlayStateChangeables.modchart = true;
PlayStateChangeables.botPlay = false;
PlayStateChangeables.opponentMode = false;
PlayStateChangeables.mirrorMode = false;
PlayStateChangeables.holds = true;
Expand Down

0 comments on commit 1569409

Please sign in to comment.