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

fixed some todos

Browse Source
This commit is contained in:
Yoshman29
2022-11-02 03:38:42 +01:00
parent 56c14b6b51
commit 83cc681251
13 changed files with 40 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/characters/gf-christmas.xml
+1 -21
View File
@@ -8,24 +8,4 @@
<anim name="danceLeft" anim="GF Dancing Beat" fps="24" loop="false" x="0" y="-9" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
<anim name="danceRight" anim="GF Dancing Beat" fps="24" loop="false" x="0" y="-9" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
<anim name="scared" anim="GF FEAR" fps="24" loop="true" x="-2" y="-17" />
</character>
<!--
// TODO:
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
} -->
<!--
switch (curCharacter)
{
case 'gf':
if (animation.curAnim.name == 'hairFall' && animation.curAnim.finished)
playAnim('danceRight');
} -->
</character>
assets/data/characters/gf.xml
+1 -21
View File
@@ -10,24 +10,4 @@
<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" fps="24" loop="false" x="45" y="-8" indices="0,1,2,3" />
<anim name="hairFall" anim="GF Dancing Beat Hair Landing" fps="24" loop="false" x="0" y="-9" indices="0,1,2,3,4,5,6,7,8,9,10,11" />
<anim name="scared" anim="GF FEAR" fps="24" loop="true" x="-2" y="-17" />
</character>
<!--
// TODO:
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
} -->
<!--
switch (curCharacter)
{
case 'gf':
if (animation.curAnim.name == 'hairFall' && animation.curAnim.finished)
playAnim('danceRight');
} -->
</character>
buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
970
971
latest/windows/bin/assets/data/characters/gf-christmas.xml
+1 -21
View File
@@ -8,24 +8,4 @@
<anim name="danceLeft" anim="GF Dancing Beat" fps="24" loop="false" x="0" y="-9" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
<anim name="danceRight" anim="GF Dancing Beat" fps="24" loop="false" x="0" y="-9" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
<anim name="scared" anim="GF FEAR" fps="24" loop="true" x="-2" y="-17" />
</character>
<!--
// TODO:
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
} -->
<!--
switch (curCharacter)
{
case 'gf':
if (animation.curAnim.name == 'hairFall' && animation.curAnim.finished)
playAnim('danceRight');
} -->
</character>
latest/windows/bin/assets/data/characters/gf.xml
+1 -21
View File
@@ -10,24 +10,4 @@
<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" fps="24" loop="false" x="45" y="-8" indices="0,1,2,3" />
<anim name="hairFall" anim="GF Dancing Beat Hair Landing" fps="24" loop="false" x="0" y="-9" indices="0,1,2,3,4,5,6,7,8,9,10,11" />
<anim name="scared" anim="GF FEAR" fps="24" loop="true" x="-2" y="-17" />
</character>
<!--
// TODO:
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
} -->
<!--
switch (curCharacter)
{
case 'gf':
if (animation.curAnim.name == 'hairFall' && animation.curAnim.finished)
playAnim('danceRight');
} -->
</character>
source/funkin/game/Note.hx
-1
View File
@@ -212,7 +212,6 @@ class Note extends FlxSprite
}
public function setClipRect(rect:FlxRect) {
// TODO: Shader ClipRect like in Yoshi Engine for smoother sustains
this.clipRect = rect;
}
}
source/funkin/game/PlayState.hx
+1 -7
View File
@@ -279,7 +279,6 @@ class PlayState extends MusicBeatState
FlxG.worldBounds.set(0, 0, FlxG.width, FlxG.height);
// TODO: cool healthbar
healthBarBG = new FlxSprite(0, FlxG.height * 0.9).loadGraphic(Paths.image('game/healthBar'));
healthBarBG.screenCenter(X);
healthBarBG.scrollFactor.set();
@@ -591,7 +590,6 @@ class PlayState extends MusicBeatState
override function openSubState(SubState:FlxSubState)
{
// TODO: Cancellable substate opening.
var event = scripts.event("onSubstateOpen", new SubstateEvent(SubState));
if (event.cancelled) return;
@@ -613,7 +611,6 @@ class PlayState extends MusicBeatState
override function closeSubState()
{
// TODO: Cancellable substate opening.
var event = scripts.event("onSubstateClose", new SubstateEvent(subState));
if (event.cancelled) return;
@@ -755,7 +752,6 @@ class PlayState extends MusicBeatState
// FlxG.watch.addQuick('VOL', vocals.amplitudeLeft);
// FlxG.watch.addQuick('VOLRight', vocals.amplitudeRight);
// TODO: FPS-compatible lerping
iconP1.scale.set(lerp(iconP1.scale.x, 1, 0.33), lerp(iconP1.scale.y, 1, 0.33));
iconP2.scale.set(lerp(iconP2.scale.x, 1, 0.33), lerp(iconP2.scale.y, 1, 0.33));
@@ -957,9 +953,8 @@ class PlayState extends MusicBeatState
}
if (event.__autoCPUHit && !daNote.mustPress && !daNote.wasGoodHit && daNote.strumTime <= Conductor.songPosition) goodNoteHit(daNote);
// TODO: FIXED STEP CROCHET PER NOTES FOR BPM CHANGES
if (daNote.wasGoodHit && daNote.isSustainNote && daNote.strumTime + (Conductor.stepCrochet) < Conductor.songPosition) {
if (daNote.wasGoodHit && daNote.isSustainNote && daNote.strumTime + (daNote.stepLength) < Conductor.songPosition) {
deleteNote(daNote);
return;
}
@@ -1013,7 +1008,6 @@ class PlayState extends MusicBeatState
if (storyPlaylist.length <= 0)
{
FlxG.sound.playMusic(Paths.music('freakyMenu'));
transIn = FlxTransitionableState.defaultTransIn;
transOut = FlxTransitionableState.defaultTransOut;
source/funkin/menus/MainMenuState.hx
+1 -4
View File
@@ -47,10 +47,7 @@ class MainMenuState extends MusicBeatState
transIn = FlxTransitionableState.defaultTransIn;
transOut = FlxTransitionableState.defaultTransOut;
if (FlxG.sound.music == null || !FlxG.sound.music.playing)
{
FlxG.sound.playMusic(Paths.music('freakyMenu'));
}
CoolUtil.playMenuSong();
persistentUpdate = persistentDraw = true;
source/funkin/menus/StoryMenuState.hx
+1 -5
View File
@@ -76,11 +76,7 @@ class StoryMenuState extends MusicBeatState
override function create()
{
if (FlxG.sound.music != null)
{
if (!FlxG.sound.music.playing)
FlxG.sound.playMusic(Paths.music('freakyMenu'));
}
CoolUtil.playMenuSong();
persistentUpdate = persistentDraw = true;
source/funkin/menus/TitleState.hx
+1 -5
View File
@@ -59,12 +59,8 @@ class TitleState extends MusicBeatState
function startIntro()
{
if (!initialized)
{
FlxG.sound.playMusic(Paths.music('freakyMenu'), 0);
FlxG.sound.music.fadeIn(4, 0, 0.7);
}
CoolUtil.playMenuSong(true);
Conductor.changeBPM(102);
persistentUpdate = true;
loadXML();
source/funkin/system/CoolUtil.hx
+12
View File
@@ -104,6 +104,18 @@ class CoolUtil
return null;
}
public static function playMenuSong(fadeIn:Bool) {
if (FlxG.sound.music == null || !FlxG.sound.music.playing)
{
Conductor.reset();
// TODO: bpm from config
Conductor.changeBPM(102);
FlxG.sound.playMusic(Paths.music('freakyMenu'), fadeIn ? 0 : 1);
if (fadeIn)
FlxG.sound.music.fadeIn(4, 0, 0.7);
}
}
/**
* Plays a specified Menu SFX.
* @param menuSFX Menu SFX to play
source/funkin/system/Main.hx
+18 -13
View File
@@ -106,9 +106,6 @@ class Main extends Sprite
public function loadGameSettings() {
funkin.options.PlayerSettings.init();
FlxG.save.bind('Save');
Highscore.load();
// TODO: Mod switching
ModsFolder.init();
@@ -127,16 +124,31 @@ class Main extends Sprite
File.saveContent("./../../../../buildnumber.txt", Std.string(buildNum));
}
#end
FlxG.fixedTimestep = false;
// FlxG.autoPause = false;
funkin.options.PlayerSettings.init();
FlxG.save.bind('Save');
Options.load();
Highscore.load();
FlxG.fixedTimestep = false;
Conductor.init();
AudioSwitchFix.init();
WindowsAPI.setDarkMode(true);
#if desktop
DiscordClient.initialize();
Application.current.onExit.add (function (exitCode) {
DiscordClient.shutdown();
});
#end
initTransition();
}
public static function initTransition() {
var diamond:FlxGraphic = FlxGraphic.fromClass(GraphicTransTileDiamond);
diamond.persist = true;
diamond.destroyOnNoUse = false;
@@ -146,12 +158,5 @@ class Main extends Sprite
FlxTransitionableState.defaultTransOut = new TransitionData(FADE, 0xFF000000, 0.7, new FlxPoint(0, 1),
{asset: diamond, width: 32, height: 32}, new FlxRect(-200, -200, FlxG.width * 1.4, FlxG.height * 1.4));
#if desktop
DiscordClient.initialize();
Application.current.onExit.add (function (exitCode) {
DiscordClient.shutdown();
});
#end
}
}
source/openfl/media/Sound.hx
+1 -1
View File
@@ -439,7 +439,7 @@ class Sound extends EventDispatcher
#if lime
#if (js && html5)
var defaultLibrary = lime.utils.Assets.getLibrary("default"); // TODO: Improve this
var defaultLibrary = lime.utils.Assets.getLibrary("default");
if (defaultLibrary != null && defaultLibrary.cachedAudioBuffers.exists(url))
{