[ENHANCEMENT] Set Character Event

preload/scripts/characters/bf-christmas.hxc

@@ -2,7 +2,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import flixel.FlxG;
 import funkin.audio.FunkinSound;
 import funkin.play.character.MultiSparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.GameOverSubState;
 
 class BoyfriendChristmasCharacter extends MultiSparrowCharacter {
@@ -17,7 +16,7 @@ function onNoteHit(event:HitNoteScriptEvent)
 			return;
 		}
 
-		if (event.note.noteData.getMustHitNote() && characterType == CharacterType.BF) {
+		if (event.note.noteData.getMustHitNote() && characterType == 'bf') {
 			// Override the hit note animation.
 			switch(event.note.kind) {
 				case "censor":

preload/scripts/characters/bf-dark.hxc

@@ -5,7 +5,6 @@ import funkin.play.character.SparrowCharacter;
 import funkin.play.GameOverSubState;
 import funkin.play.character.BaseCharacter;
 import funkin.play.character.CharacterDataParser;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import funkin.play.character.MultiSparrowCharacter;
 

preload/scripts/characters/darnell.hxc

@@ -1,5 +1,4 @@
 import funkin.play.character.SparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import funkin.audio.FunkinSound;
 import funkin.Conductor;
@@ -12,7 +11,7 @@ class DarnellCharacter extends SparrowCharacter {
 
 	function onNoteHit(event:HitNoteScriptEvent)
 	{
-		if (!event.note.noteData.getMustHitNote() && characterType == CharacterType.DAD) {
+		if (!event.note.noteData.getMustHitNote() && characterType == 'dad') {
 			// Override the hit note animation.
 			switch(event.note.kind) {
 				case "weekend-1-lightcan":
@@ -31,7 +30,7 @@ class DarnellCharacter extends SparrowCharacter {
 	}
 
 	function onNoteIncoming(event:NoteScriptEvent) {
-		if (!event.note.noteData.getMustHitNote() && characterType == CharacterType.DAD) {
+		if (!event.note.noteData.getMustHitNote() && characterType == 'dad') {
 			// Get how long until it's time to strum the note.
 			var msTilStrum = event.note.strumTime - Conductor.instance.songPosition;
 

preload/scripts/characters/gf-dark.hxc

@@ -5,7 +5,6 @@ import funkin.play.character.SparrowCharacter;
 import funkin.play.GameOverSubState;
 import funkin.play.character.BaseCharacter;
 import funkin.play.character.CharacterDataParser;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 
 class GirlfriendDarkCharacter extends SparrowCharacter {

preload/scripts/characters/gf.hxc

@@ -1,5 +1,4 @@
 import funkin.play.character.SparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import flixel.addons.effects.FlxTrail;
 
@@ -9,7 +8,7 @@ class GirlfriendCharacter extends SparrowCharacter {
 	}
 
 	override function onAdd() {
-		if (!debug && this.characterType == CharacterType.DAD) {
+		if (!debug && this.characterType == 'dad') {
       // If Girlfriend is the opponent, set her position to the stage's assigned Girlfriend position,
       // while maintaining her status as an opponent. This allows the Girlfriend character to use a shared
       // character file without weird offsets.
@@ -32,4 +31,4 @@ class GirlfriendCharacter extends SparrowCharacter {
 
 		super.dance(force);
 	}
-}
+}

preload/scripts/characters/nene-dark.hxc

@@ -11,7 +11,6 @@ import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.audio.visualize.ABotVis;
 import funkin.play.character.BaseCharacter;
 import funkin.play.character.CharacterDataParser;
-import funkin.play.character.CharacterType;
 import funkin.graphics.shaders.TextureSwap;
 import openfl.display.BitmapData;
 import funkin.util.FlxColorUtil;

preload/scripts/characters/otis-speaker.hxc

@@ -1,6 +1,5 @@
 
 import funkin.play.character.SparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import flixel.FlxG;
 import flixel.FlxSprite;

preload/scripts/characters/parents-christmas.hxc

@@ -1,5 +1,4 @@
 import funkin.play.character.SparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 
 class ParentsChristmasCharacter extends SparrowCharacter {
@@ -9,7 +8,7 @@ class ParentsChristmasCharacter extends SparrowCharacter {
 
 	function onNoteHit(event:HitNoteScriptEvent)
 	{
-		if (!event.note.noteData.getMustHitNote() && characterType == CharacterType.DAD) {
+		if (!event.note.noteData.getMustHitNote() && characterType == 'dad') {
 			// Override the hit note animation.
 			switch(event.note.kind) {
 				case "mom":

preload/scripts/characters/pico-christmas.hxc

@@ -1,5 +1,4 @@
 import funkin.play.character.MultiSparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import funkin.play.GameOverSubState;
 import funkin.graphics.adobeanimate.FlxAtlasSprite;

preload/scripts/characters/pico-dark.hxc

@@ -6,7 +6,6 @@ import funkin.play.character.SparrowCharacter;
 import funkin.play.GameOverSubState;
 import funkin.play.character.BaseCharacter;
 import funkin.play.character.CharacterDataParser;
-import funkin.play.character.CharacterType;
 import funkin.graphics.FunkinSprite;
 import funkin.play.PauseSubState;
 import funkin.play.PlayState;
@@ -32,7 +31,7 @@ class PicoDarkCharacter extends MultiSparrowCharacter {
 	{
 		super.onNoteHit(event);
 
-		if (!event.note.noteData.getMustHitNote() && characterType == CharacterType.BF) {
+		if (!event.note.noteData.getMustHitNote() && characterType == 'bf') {
 			// Override the hit note animation.
 			switch(event.note.kind) {
 				case "cheer":

preload/scripts/characters/pico-holding-nene.hxc

@@ -1,5 +1,4 @@
 import funkin.play.character.SparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import funkin.play.GameOverSubState;
 import funkin.graphics.adobeanimate.FlxAtlasSprite;

preload/scripts/characters/pico-playable.hxc

@@ -1,5 +1,4 @@
 import funkin.play.character.MultiSparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import funkin.play.GameOverSubState;
 import funkin.graphics.adobeanimate.FlxAtlasSprite;
@@ -80,7 +79,7 @@ class PicoPlayerCharacter extends MultiSparrowCharacter {
 			return;
 		}
 
-		if (event.note.noteData.getMustHitNote() && characterType == CharacterType.BF) {
+		if (event.note.noteData.getMustHitNote() && characterType == 'bf') {
 			// Override the hit note animation.
 			switch(event.note.kind) {
 				case "censor":

preload/scripts/characters/pico-speaker.hxc

@@ -1,6 +1,5 @@
 
 import funkin.play.character.SparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import flixel.FlxG;
 import flixel.FlxSprite;

preload/scripts/characters/spooky-dark.hxc

@@ -5,7 +5,6 @@ import funkin.play.character.SparrowCharacter;
 import funkin.play.GameOverSubState;
 import funkin.play.character.BaseCharacter;
 import funkin.play.character.CharacterDataParser;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 
 class SpookyDarkCharacter extends SparrowCharacter {
@@ -31,7 +30,7 @@ class SpookyDarkCharacter extends SparrowCharacter {
 	{
 		super.onNoteHit(event);
 
-		if (!event.note.noteData.getMustHitNote() && characterType == CharacterType.DAD) {
+		if (!event.note.noteData.getMustHitNote() && characterType == 'dad') {
 			// Override the hit note animation.
 			switch(event.note.kind) {
 				case "cheer":

preload/scripts/characters/tankman-atlas.hxc

@@ -1,5 +1,4 @@
 import funkin.play.character.AnimateAtlasCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 
 /**
@@ -12,7 +11,7 @@ class TankmanAtlasCharacter extends AnimateAtlasCharacter {
 
 	function onNoteHit(event:HitNoteScriptEvent)
 	{
-		if (!event.note.noteData.getMustHitNote() && characterType == CharacterType.DAD) {
+		if (!event.note.noteData.getMustHitNote() && characterType == 'dad') {
 			// Override the hit note animation.
 			switch(event.note.kind) {
 				case "ugh":

preload/scripts/characters/tankman-bloody.hxc

@@ -1,5 +1,4 @@
 import funkin.play.character.MultiSparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import flixel.FlxG;
 
@@ -30,7 +29,7 @@ class TankmanBloodyCharacter extends MultiSparrowCharacter {
 	{
 		super.onNoteHit(event);
 
-		if (!event.note.noteData.getMustHitNote() && characterType == CharacterType.DAD) {
+		if (!event.note.noteData.getMustHitNote() && characterType == 'dad') {
 			// Override the hit note animation.
 			switch(event.note.kind) {
 				case "ugh":

preload/scripts/characters/tankman.hxc

@@ -1,5 +1,4 @@
 import funkin.play.character.MultiSparrowCharacter;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 
 class TankmanCharacter extends MultiSparrowCharacter {
@@ -11,7 +10,7 @@ class TankmanCharacter extends MultiSparrowCharacter {
 	{
 		super.onNoteHit(event);
 
-		if (!event.note.noteData.getMustHitNote() && characterType == CharacterType.DAD) {
+		if (!event.note.noteData.getMustHitNote() && characterType == 'dad') {
 			// Override the hit note animation.
 			switch(event.note.kind) {
 				case "ugh":

preload/scripts/stages/schoolErect.hxc

@@ -1,6 +1,5 @@
 import funkin.play.PlayState;
 import funkin.play.stage.Stage;
-import funkin.play.character.CharacterType;
 import funkin.graphics.shaders.DropShadowShader;
 
 class SchoolErectStage extends Stage
@@ -35,7 +34,7 @@ class SchoolErectStage extends Stage
 		rim.distance = 5;
 
 		switch(charType){
-			case CharacterType.BF:
+			case 'bf':
 
 				rim.angle = 90;
 				character.shader = rim;
@@ -51,7 +50,7 @@ class SchoolErectStage extends Stage
 					}
     		};
 
-			case CharacterType.GF:
+			case 'gf':
 
 				rim.setAdjustColor(-42, -10, 5, -25);
 				rim.angle = 90;
@@ -67,7 +66,7 @@ class SchoolErectStage extends Stage
       		rim.updateFrameInfo(getGirlfriend().frame);
     		};
 
-			case CharacterType.DAD:
+			case 'dad':
 
 				rim.angle = 90;
 				character.shader = rim;

preload/scripts/stages/schoolPico.hxc

@@ -1,7 +1,6 @@
 import funkin.play.PlayState;
 import funkin.play.stage.Stage;
 import funkin.graphics.shaders.DropShadowShader;
-import funkin.play.character.CharacterType;
 
 class SchoolPicoStage extends Stage
 {
@@ -35,7 +34,7 @@ class SchoolPicoStage extends Stage
 		rim.distance = 5;
 
 		switch(charType){
-			case CharacterType.BF:
+			case 'bf':
 
 				rim.angle = 90;
 				character.shader = rim;
@@ -51,7 +50,7 @@ class SchoolPicoStage extends Stage
 					}
     		};
 
-			case CharacterType.GF:
+			case 'gf':
 
 				rim.angle = 90;
 				character.shader = rim;
@@ -66,7 +65,7 @@ class SchoolPicoStage extends Stage
       		rim.updateFrameInfo(getGirlfriend().frame);
     		};
 
-			case CharacterType.DAD:
+			case 'dad':
 
 				rim.angle = 90;
 				character.shader = rim;

preload/scripts/stages/spookyMansionErect.hxc

@@ -8,7 +8,6 @@ import funkin.util.FlxTweenUtil;
 import flixel.util.FlxTimer;
 import funkin.play.character.BaseCharacter;
 import funkin.play.character.CharacterDataParser;
-import funkin.play.character.CharacterType;
 import funkin.play.PlayState;
 import funkin.graphics.shaders.RuntimeRainShader;
 

preload/scripts/stages/tankmanBattlefieldErect.hxc

@@ -3,7 +3,6 @@ import flixel.math.FlxAngle;
 import funkin.play.PlayState;
 import funkin.play.stage.Stage;
 import funkin.graphics.shaders.DropShadowShader;
-import funkin.play.character.CharacterType;
 import openfl.display.BitmapData;
 import flixel.graphics.FlxGraphic;
 
@@ -38,7 +37,7 @@ class TankmanBattlefieldErectStage extends Stage
 		// character.animation.callback = rim.onAttachedFrame;
 
 		switch(charType){
-			case CharacterType.BF:
+			case 'bf':
 
 				rim.angle = 90;
 
@@ -49,7 +48,7 @@ class TankmanBattlefieldErectStage extends Stage
 					}
     		};
 
-			case CharacterType.GF:
+			case 'gf':
 
 				rim.angle = 90;
 
@@ -63,7 +62,7 @@ class TankmanBattlefieldErectStage extends Stage
 					rim.useAltMask = true;
 				}
 
-			case CharacterType.DAD:
+			case 'dad':
 
 				rim.angle = 135;
 				rim.threshold = 0.3;