cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-02 19:53:15 +00:00
Code Issues Releases Wiki Activity

Merge pull request #206 from FunkinCrew/bugfix/senpai-naughty

Browse source 
Fixes to Week 6 (script fixes and naughtyness)
This commit is contained in:
Cameron Taylor 2023-11-16 02:02:19 -05:00 committed by GitHub
parent 6a58e38077 270a527602
commit e424418658
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/funkin/play/PlayState.hx
View file

@ -1572,6 +1572,9 @@ class PlayState extends MusicBeatSubState
regenNoteData();
var event:ScriptEvent = new ScriptEvent(CREATE, false);
ScriptEventDispatcher.callEvent(currentSong, event);
generatedMusic = true;
}

13
source/funkin/play/cutscene/dialogue/Conversation.hx
View file

@ -581,6 +581,19 @@ class Conversation extends FlxSpriteGroup implements IDialogueScriptedClass
}
}
/**
* Calls `kill()` on the group's members and then on the group itself.
* You can revive this group later via `revive()` after this.
*/
public override function kill():Void
{
_skipTransformChildren = true;
alive = false;
exists = false;
_skipTransformChildren = false;
if (group != null) group.kill();
}
public override function toString():String
{
return 'Conversation($conversationId)';