Further enhanced frontend input processing and fixed frame data logging.

frontend/assets/scenes/login.fire

@@ -440,7 +440,7 @@
       "array": [
         0,
         0,
-        216.50635094610968,
+        210.57636167057314,
         0,
         0,
         0,

frontend/assets/scenes/offline_map.fire

@@ -464,7 +464,7 @@
       "array": [
         0,
         0,
-        216.50635094610968,
+        210.57636167057314,
         0,
         0,
         0,

frontend/assets/scripts/Map.js

@@ -152,7 +152,6 @@ cc.Class({
       prefabbedInputList[k] = (prefabbedInputList[k] & 15);
     }
     currSelfInput = self.ctrl.getEncodedInput(); // When "null == existingInputFrame", it'd be safe to say that the realtime "self.ctrl.getEncodedInput()" is for the requested "inputFrameId"
-    //console.log(`@rdf.Id=${self.renderFrameId}, currSelfInput=${currSelfInput}`);
     prefabbedInputList[(joinIndex - 1)] = currSelfInput;
     while (self.recentInputCache.EdFrameId <= inputFrameId) {
       // Fill the gap
@@ -924,6 +923,12 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
           [prevSelfInput, currSelfInput] = self.getOrPrefabInputFrameUpsync(noDelayInputFrameId);
         }
 
+        const delayedInputFrameId = gopkgs.ConvertToDelayedInputFrameId(self.renderFrameId);
+        if (null == self.recentInputCache.GetByFrameId(delayedInputFrameId)) {
+          // Possible edge case after resync
+          self.getOrPrefabInputFrameUpsync(delayedInputFrameId);
+        }
+
         let t0 = performance.now();
         if (self.shouldSendInputFrameUpsyncBatch(prevSelfInput, currSelfInput, self.lastUpsyncInputFrameId, noDelayInputFrameId)) {
           // TODO: Is the following statement run asynchronously in an implicit manner? Should I explicitly run it asynchronously?
@@ -1196,7 +1201,25 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
         throw `Couldn't find renderFrame for i=${i} to rollback (are you using Firefox?), self.renderFrameId=${self.renderFrameId}, lastAllConfirmedInputFrameId=${self.lastAllConfirmedInputFrameId}, might've been interruptted by onRoomDownsyncFrame`;
       }
       const j = gopkgs.ConvertToDelayedInputFrameId(i);
-      const delayedInputFrame = self.getOrPrefabInputFrameUpsync(j);
+      const delayedInputFrame = self.recentInputCache.GetByFrameId(j);
+      /*
+      const prevJ = gopkgs.ConvertToDelayedInputFrameId(i - 1);
+      const prevDelayedInputFrame = self.recentInputCache.GetByFrameId(prevJ);
+      const prevBtnALevel = (null == prevDelayedInputFrame ? 0 : ((prevDelayedInputFrame.InputList[self.selfPlayerInfo.JoinIndex - 1] >> 4) & 1));
+      const btnALevel = ((delayedInputFrame.InputList[self.selfPlayerInfo.JoinIndex - 1] >> 4) & 1);
+      if (
+          ATK_CHARACTER_STATE.Atk1[0] == currRdf.PlayersArr[self.selfPlayerInfo.JoinIndex - 1].CharacterState
+          ||
+          ATK_CHARACTER_STATE.Atk2[0] == currRdf.PlayersArr[self.selfPlayerInfo.JoinIndex - 1].CharacterState
+        ) {
+          console.log(`rdf.Id=${i}, (btnALevel,j)=(${btnALevel},${j}), (prevBtnALevel,prevJ) is (${prevBtnALevel},${prevJ}), in cancellable atk!`);
+      } 
+      if (btnALevel > 0) {
+        if (btnALevel > prevBtnALevel) {
+          console.log(`rdf.Id=${i}, rising edge of btnA triggered`);
+        }
+      }  
+      */
 
       if (self.frameDataLoggingEnabled) {
         const actuallyUsedInputClone = delayedInputFrame.InputList.slice();

frontend/assets/scripts/OfflineMap.js

@@ -94,7 +94,7 @@ cc.Class({
       const p2Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[1].x, boundaryObjs.playerStartingPositions[1].y);
       const colliderRadiusV = gopkgs.WorldToVirtualGridPos(12.0, 0);
 
-      const speciesIdList = [4096, 1];
+      const speciesIdList = [1, 4096];
       const chConfigsOrderedByJoinIndex = gopkgs.GetCharacterConfigsOrderedByJoinIndex(speciesIdList);
 
       const startRdf = window.pb.protos.RoomDownsyncFrame.create({

jsexport/battle/battle.go

@@ -23,7 +23,7 @@ const (
 	GRAVITY_Y = -int32(float64(0.5) * WORLD_TO_VIRTUAL_GRID_RATIO) // makes all "playerCollider.Y" a multiple of 0.5 in all cases
 
 	INPUT_DELAY_FRAMES = int32(4)  // in the count of render frames
-	INPUT_SCALE_FRAMES = uint32(3) // inputDelayedAndScaledFrameId = ((originalFrameId - InputDelayFrames) >> InputScaleFrames)
+	INPUT_SCALE_FRAMES = uint32(2) // inputDelayedAndScaledFrameId = ((originalFrameId - InputDelayFrames) >> InputScaleFrames)
 	NST_DELAY_FRAMES   = int32(16) // network-single-trip delay in the count of render frames, proposed to be (InputDelayFrames >> 1) because we expect a round-trip delay to be exactly "InputDelayFrames"
 
 	SP_ATK_LOOKUP_FRAMES = int32(5)
@@ -489,15 +489,19 @@ func deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame *PlayerDownsync,
 	}
 
 	patternId := PATTERN_ID_NO_OP
-	if decodedInput.BtnALevel > prevBtnALevel {
+    if 0 < decodedInput.BtnALevel {
-		if 0 > effDy {
+        if decodedInput.BtnALevel > prevBtnALevel {
-			patternId = 3
+            if 0 > effDy {
-		} else if 0 < effDy {
+                patternId = 3
-			patternId = 2
+            } else if 0 < effDy {
-		} else {
+                patternId = 2
-			patternId = 1
+            } else {
-		}
+                patternId = 1
-	}
+            }
+        } else {
+            patternId = 4 // Holding
+        }
+    }
 
 	return patternId, jumpedOrNot, effDx, effDy
 }