Revert "refactor: make ghost notes hardcoded"

This reverts commit be452bf.

Author: HomuHomu833

assets/shared/scripts/GhostNotes.lua

@@ -0,0 +1,132 @@
+local boyfriendGhostData = {}
+local dadGhostData = {}
+local gfGhostData = {}
+local sarahGhostData = {}
+
+function goodNoteHit(id, direction, noteType, isSustainNote)
+    local strumTime = getPropertyFromGroup('notes', id, 'strumTime')
+    local noteType = getPropertyFromGroup('notes', id, 'noteType')
+
+    local isGF = getPropertyFromGroup('notes', id, 'gfNote') or noteType == 'Gf Sing'
+    local isSarah = getPropertyFromGroup('notes', id, 'sarahNote') or noteType == 'Sarah Sing'
+
+    -- BOYFRIEND or DAD
+    if not isSustainNote and not isGF and not isSarah then
+        if strumTime == boyfriendGhostData.strumTime then
+            createGhost(getProperty('characterPlayingAsDad') and 'dad' or 'boyfriend')
+        end
+
+        boyfriendGhostData.strumTime = strumTime
+        updateGData(getProperty('characterPlayingAsDad') and 'dad' or 'boyfriend')
+    end
+
+    -- GF
+    if not isSustainNote and isGF and not isSarah then
+        if strumTime == gfGhostData.strumTime then
+            createGhost('gf')
+        end
+
+        gfGhostData.strumTime = strumTime
+        updateGData('gf')
+    end
+
+    -- SARAH
+    if not isSustainNote and isSarah then
+        if strumTime == sarahGhostData.strumTime then
+            createGhost('sarah')
+        end
+
+        sarahGhostData.strumTime = strumTime
+        updateGData('sarah')
+    end
+end
+
+function opponentNoteHit(id, direction, noteType, isSustainNote)
+    local strumTime = getPropertyFromGroup('notes', id, 'strumTime')
+    local noteType = getPropertyFromGroup('notes', id, 'noteType')
+
+    local isGF = getPropertyFromGroup('notes', id, 'gfNote') or noteType == 'Gf Sing'
+    local isSarah = getPropertyFromGroup('notes', id, 'sarahNote') or noteType == 'Sarah Sing'
+
+    -- DAD or BOYFRIEND
+    if not isSustainNote and not isGF and not isSarah then
+        if strumTime == dadGhostData.strumTime then
+            createGhost(getProperty('characterPlayingAsDad') and 'boyfriend' or 'dad')
+        end
+
+        dadGhostData.strumTime = strumTime
+        updateGData(getProperty('characterPlayingAsDad') and 'boyfriend' or 'dad')
+    end
+
+    -- GF
+    if not isSustainNote and isGF and not isSarah then
+        if strumTime == gfGhostData.strumTime then
+            createGhost('gf')
+        end
+
+        gfGhostData.strumTime = strumTime
+        updateGData('gf')
+    end
+
+    -- SARAH
+    if not isSustainNote and isSarah then
+        if strumTime == sarahGhostData.strumTime then
+            createGhost('sarah')
+        end
+
+        sarahGhostData.strumTime = strumTime
+        updateGData('sarah')
+    end
+end
+
+function createGhost(char)
+    local songPos = math.floor(math.abs(getSongPosition()))
+    local imageFile = getProperty(char .. '.imageFile')
+    local animName = getProperty(char .. '.animation.curAnim.name')
+    local isMultiAtlas = getProperty(char .. '.isMultiAtlas')
+    local newPath = isMultiAtlas and (imageFile:match("(.+)/[^/]+$") or imageFile) .. '/' .. animName or imageFile
+
+    local ghostTag = char .. 'Ghost' .. songPos
+    makeAnimatedLuaSprite(ghostTag, newPath, getProperty(char .. '.x'), getProperty(char .. '.y'))
+    addLuaSprite(ghostTag, false)
+
+    setProperty(ghostTag .. '.scale.x', getProperty(char .. '.scale.x'))
+    setProperty(ghostTag .. '.scale.y', getProperty(char .. '.scale.y'))
+    setProperty(ghostTag .. '.flipX', getProperty(char .. '.flipX'))
+    if getProperty('inSilhouette') then
+        setProperty(ghostTag .. '.color', 0x000000)
+    end
+    setProperty(ghostTag .. '.alpha', 1)
+    doTweenAlpha(ghostTag .. 'delete', ghostTag, 0, 0.4)
+
+    local data = getGhostData(char)
+    setProperty(ghostTag .. '.animation.frameName', data.frameName)
+    setProperty(ghostTag .. '.offset.x', data.offsetX)
+    setProperty(ghostTag .. '.offset.y', data.offsetY)
+    setObjectOrder(ghostTag, getObjectOrder(char .. 'Group') - 1)
+end
+
+function onTweenCompleted(tag)
+    if tag:sub(-6) == 'delete' then
+        removeLuaSprite(tag:sub(1, -7), true)
+    end
+end
+
+function updateGData(char)
+    local data = getGhostData(char)
+    data.frameName = getProperty(char .. '.animation.frameName')
+    data.offsetX = getProperty(char .. '.offset.x')
+    data.offsetY = getProperty(char .. '.offset.y')
+end
+
+function getGhostData(char)
+    if char == 'boyfriend' then
+        return boyfriendGhostData
+    elseif char == 'dad' then
+        return dadGhostData
+    elseif char == 'gf' then
+        return gfGhostData
+    elseif char == 'sarah' then
+        return sarahGhostData
+    end
+end

source/engine/backend/Conductor.hx

@@ -20,31 +20,11 @@ class Conductor
 	public static var songPosition:Float = 0;
 	public static var offset:Float = 0;
 
-	public static var ROWS_PER_BEAT = 48; // from Stepmania
-	public static var BEATS_PER_MEASURE = 4; // TODO: time sigs
-	public static var ROWS_PER_MEASURE = ROWS_PER_BEAT * BEATS_PER_MEASURE; // from Stepmania
-	public static var MAX_NOTE_ROW = 1 << 30; // from Stepmania
-	
-	public inline static function beatToRow(beat:Float):Int return Math.round(beat * ROWS_PER_BEAT);
-	
-	public inline static function rowToBeat(row:Int):Float return row / ROWS_PER_BEAT;
-	
-	public inline static function secsToRow(sex:Float):Int return Math.round(getBeat(sex) * ROWS_PER_BEAT);
-
+	// public static var safeFrames:Int = 10;
 	public static var safeZoneOffset:Float = 0; // is calculated in create(), is safeFrames in milliseconds
 
 	public static var bpmChangeMap:Array<BPMChangeEvent> = [];
 
-	inline public static function beatToNoteRow(beat:Float):Int
-	{
-		return Math.round(beat * Conductor.ROWS_PER_BEAT);
-	}
-	
-	inline public static function noteRowToBeat(row:Float):Float
-	{
-		return row / Conductor.ROWS_PER_BEAT;
-	}
-
 	public static function judgeNote(arr:Array<Rating>, diff:Float = 0):Rating // die
 	{
 		var data:Array<Rating> = arr;