cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 23:46:45 +00:00
Code Issues Releases Wiki Activity

Merge pull request #84 from FunkinCrew/bugfix/songeventscriptevent

Browse source 
Fixed an issue where SongEventScriptEvent would not be dispatched
This commit is contained in:
Cameron Taylor 2023-04-20 16:56:05 -04:00 committed by GitHub
parent 084a371a41 337802a6bf
commit 03f48289e1
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hmm.json
View file

@ -104,7 +104,7 @@
"name": "polymod", "name": "polymod",
"type": "git", "type": "git",
"dir": null, "dir": null,
"ref": "4e5b4b3", "ref": "6594dd8",
"url": "https://github.com/larsiusprime/polymod" "url": "https://github.com/larsiusprime/polymod"
}, },
{ {

6
source/funkin/modding/events/ScriptEvent.hx
View file

@ -385,12 +385,6 @@ class SongEventScriptEvent extends ScriptEvent
*/ */
public var event(default, null):funkin.play.song.SongData.SongEventData; public var event(default, null):funkin.play.song.SongData.SongEventData;
/**
* The combo count as it is with this event.
* Will be (combo) on miss events and (combo + 1) on hit events (the stored combo count won't update if the event is cancelled).
*/
public var comboCount(default, null):Int;
public function new(event:funkin.play.song.SongData.SongEventData):Void public function new(event:funkin.play.song.SongData.SongEventData):Void
{ {
super(ScriptEvent.SONG_EVENT, true); super(ScriptEvent.SONG_EVENT, true);

6
source/funkin/modding/events/ScriptEventDispatcher.hx
View file

@ -72,6 +72,9 @@ class ScriptEventDispatcher
case ScriptEvent.RESUME: case ScriptEvent.RESUME:
t.onResume(event); t.onResume(event);
return; return;
case ScriptEvent.SONG_EVENT:
t.onSongEvent(cast event);
return;
case ScriptEvent.COUNTDOWN_START: case ScriptEvent.COUNTDOWN_START:
t.onCountdownStart(cast event); t.onCountdownStart(cast event);
return; return;
@ -118,7 +121,8 @@ class ScriptEventDispatcher
return; return;
} }
throw "No function called for event type: " + event.type; // If you get a crash on this line, that means ERIC FUCKED UP!
throw 'No function called for event type: ${event.type}';
} }
public static function callEventOnAllTargets(targets:Iterator<IScriptedClass>, event:ScriptEvent):Void public static function callEventOnAllTargets(targets:Iterator<IScriptedClass>, event:ScriptEvent):Void

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

@ -1770,11 +1770,17 @@ class PlayState extends MusicBeatState
{ {
trace('Found ${songEventsToActivate.length} event(s) to activate.'); trace('Found ${songEventsToActivate.length} event(s) to activate.');
for (event in songEventsToActivate) for (event in songEventsToActivate)
{
var eventEvent:SongEventScriptEvent = new SongEventScriptEvent(event);
dispatchEvent(eventEvent);
// Calling event.cancelEvent() skips the event. Neat!
if (!eventEvent.eventCanceled)
{ {
SongEventParser.handleEvent(event); SongEventParser.handleEvent(event);
} }
} }
} }
}
if (!isInCutscene && !isInDialog && !disableKeys) keyShit(true); if (!isInCutscene && !isInDialog && !disableKeys) keyShit(true);
if (isInCutscene && !disableKeys) handleCutsceneKeys(); if (isInCutscene && !disableKeys) handleCutsceneKeys();
@ -2674,10 +2680,6 @@ class PlayState extends MusicBeatState
// Dispatch event to character script(s). // Dispatch event to character script(s).
if (currentStage != null) currentStage.dispatchToCharacters(event); if (currentStage != null) currentStage.dispatchToCharacters(event);
// TODO: Dispatch event to song script
// TODO: Dispatch event to note script
} }
/** /**

1
source/funkin/play/character/CharacterData.hx
View file

@ -83,6 +83,7 @@ class CharacterDataParser
try try
{ {
var character:SparrowCharacter = ScriptedSparrowCharacter.init(charCls, DEFAULT_CHAR_ID); var character:SparrowCharacter = ScriptedSparrowCharacter.init(charCls, DEFAULT_CHAR_ID);
trace(' Initialized character ${character.characterName}');
characterScriptedClass.set(character.characterId, charCls); characterScriptedClass.set(character.characterId, charCls);
} }
catch (e) catch (e)