Misc fixes.

2025-10-09 00:26:39 +00:00 · 2023-01-05 10:20:01 +08:00
parent 2d04363d69
commit e2191f9d13
15 changed files with 387 additions and 6758 deletions
--- a/jsexport/battle/battle.go
+++ b/jsexport/battle/battle.go
@@ -438,29 +438,28 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 	// Make a copy first
 	for i, currPlayerDownsync := range currRenderFrame.PlayersArr {
 		nextRenderFramePlayers[i] = &PlayerDownsync{
-			Id:                currPlayerDownsync.Id,
-			VirtualGridX:      currPlayerDownsync.VirtualGridX,
-			VirtualGridY:      currPlayerDownsync.VirtualGridY,
-			DirX:              currPlayerDownsync.DirX,
-			DirY:              currPlayerDownsync.DirY,
-			VelX:              currPlayerDownsync.VelX,
-			VelY:              currPlayerDownsync.VelY,
-			CharacterState:    currPlayerDownsync.CharacterState,
-			InAir:             true,
-			Speed:             currPlayerDownsync.Speed,
-			BattleState:       currPlayerDownsync.BattleState,
-			Score:             currPlayerDownsync.Score,
-			Removed:           currPlayerDownsync.Removed,
-			JoinIndex:         currPlayerDownsync.JoinIndex,
-			Hp:                currPlayerDownsync.Hp,
-			MaxHp:             currPlayerDownsync.MaxHp,
-			FramesToRecover:   currPlayerDownsync.FramesToRecover - 1,
-			FramesInChState:   currPlayerDownsync.FramesInChState + 1,
-			ActiveSkillId:     currPlayerDownsync.ActiveSkillId,
-			ActiveSkillHit:    currPlayerDownsync.ActiveSkillHit,
-			FramesInvinsible:  currPlayerDownsync.FramesInvinsible - 1,
-			FramesSelfLockVel: currPlayerDownsync.FramesSelfLockVel - 1,
-			ColliderRadius:    currPlayerDownsync.ColliderRadius,
+			Id:               currPlayerDownsync.Id,
+			VirtualGridX:     currPlayerDownsync.VirtualGridX,
+			VirtualGridY:     currPlayerDownsync.VirtualGridY,
+			DirX:             currPlayerDownsync.DirX,
+			DirY:             currPlayerDownsync.DirY,
+			VelX:             currPlayerDownsync.VelX,
+			VelY:             currPlayerDownsync.VelY,
+			CharacterState:   currPlayerDownsync.CharacterState,
+			InAir:            true,
+			Speed:            currPlayerDownsync.Speed,
+			BattleState:      currPlayerDownsync.BattleState,
+			Score:            currPlayerDownsync.Score,
+			Removed:          currPlayerDownsync.Removed,
+			JoinIndex:        currPlayerDownsync.JoinIndex,
+			Hp:               currPlayerDownsync.Hp,
+			MaxHp:            currPlayerDownsync.MaxHp,
+			FramesToRecover:  currPlayerDownsync.FramesToRecover - 1,
+			FramesInChState:  currPlayerDownsync.FramesInChState + 1,
+			ActiveSkillId:    currPlayerDownsync.ActiveSkillId,
+			ActiveSkillHit:   currPlayerDownsync.ActiveSkillHit,
+			FramesInvinsible: currPlayerDownsync.FramesInvinsible - 1,
+			ColliderRadius:   currPlayerDownsync.ColliderRadius,
 		}
 		if nextRenderFramePlayers[i].FramesToRecover < 0 {
 			nextRenderFramePlayers[i].FramesToRecover = 0
@@ -468,9 +467,6 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		if nextRenderFramePlayers[i].FramesInvinsible < 0 {
 			nextRenderFramePlayers[i].FramesInvinsible = 0
 		}
-		if nextRenderFramePlayers[i].FramesSelfLockVel < 0 {
-			nextRenderFramePlayers[i].FramesSelfLockVel = 0
-		}
 	}

 	nextRenderFrameMeleeBullets := make([]*MeleeBullet, 0, len(currRenderFrame.MeleeBullets)) // Is there any better way to reduce malloc/free impact, e.g. smart prediction for fixed memory allocation?
@@ -512,12 +508,10 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 						xfac = -xfac
 					}
 					thatPlayerInNextFrame.VelX = xfac * v.SelfLockVelX
-                    thatPlayerInNextFrame.FramesSelfLockVel = v.FramesSelfLockVel
 				}
 				if NO_LOCK_VEL != v.SelfLockVelY {
 					hasLockVel = true
 					thatPlayerInNextFrame.VelY = v.SelfLockVelY
-                    thatPlayerInNextFrame.FramesSelfLockVel = v.FramesSelfLockVel
 				}
 				if false == hasLockVel {
 					if false == currPlayerDownsync.InAir {
@@ -656,29 +650,32 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 			thatPlayerInNextFrame.InAir = false
 			if currPlayerDownsync.InAir && 0 >= currPlayerDownsync.VelY {
 				// fallStopping
-				thatPlayerInNextFrame.VelX = 0
 				thatPlayerInNextFrame.VelY = 0
-				if ATK_CHARACTER_STATE_BLOWN_UP1 == thatPlayerInNextFrame.CharacterState {
-					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_LAY_DOWN1
-					thatPlayerInNextFrame.FramesToRecover = chConfig.LayDownFramesToRecover
-				} else {
-					halfColliderWidthDiff, halfColliderHeightDiff := int32(0), currPlayerDownsync.ColliderRadius
-					_, halfColliderWorldHeightDiff := VirtualGridToWorldPos(halfColliderWidthDiff, halfColliderHeightDiff)
-					effPushbacks[joinIndex-1].Y -= halfColliderWorldHeightDiff // To prevent bouncing due to abrupt change of collider shape
-					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
-					thatPlayerInNextFrame.FramesToRecover = 0
+				thatPlayerInNextFrame.VelX = 0
+				if _, existent := nonAttackingSet[thatPlayerInNextFrame.CharacterState]; existent {
+					if ATK_CHARACTER_STATE_BLOWN_UP1 == thatPlayerInNextFrame.CharacterState {
+						thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_LAY_DOWN1
+						thatPlayerInNextFrame.FramesToRecover = chConfig.LayDownFramesToRecover
+					} else {
+						halfColliderWidthDiff, halfColliderHeightDiff := int32(0), currPlayerDownsync.ColliderRadius
+						_, halfColliderWorldHeightDiff := VirtualGridToWorldPos(halfColliderWidthDiff, halfColliderHeightDiff)
+						effPushbacks[joinIndex-1].Y -= halfColliderWorldHeightDiff // To prevent bouncing due to abrupt change of collider shape
+						thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
+					}
 				}
 			} else {
-				// not fallStopping, could be in LayDown or GetUp
-				if ATK_CHARACTER_STATE_LAY_DOWN1 == thatPlayerInNextFrame.CharacterState {
-					if 0 == thatPlayerInNextFrame.FramesToRecover {
-						thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_GET_UP1
-						thatPlayerInNextFrame.FramesToRecover = chConfig.GetUpFramesToRecover
-					}
-				} else if ATK_CHARACTER_STATE_GET_UP1 == thatPlayerInNextFrame.CharacterState {
-					if 0 == thatPlayerInNextFrame.FramesToRecover {
-						thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
-						thatPlayerInNextFrame.FramesInvinsible = chConfig.GetUpInvinsibleFrames
+				if _, existent := nonAttackingSet[thatPlayerInNextFrame.CharacterState]; existent {
+					// not fallStopping, could be in LayDown or GetUp
+					if ATK_CHARACTER_STATE_LAY_DOWN1 == thatPlayerInNextFrame.CharacterState {
+						if 0 == thatPlayerInNextFrame.FramesToRecover {
+							thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_GET_UP1
+							thatPlayerInNextFrame.FramesToRecover = chConfig.GetUpFramesToRecover
+						}
+					} else if ATK_CHARACTER_STATE_GET_UP1 == thatPlayerInNextFrame.CharacterState {
+						if 0 == thatPlayerInNextFrame.FramesToRecover {
+							thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
+							thatPlayerInNextFrame.FramesInvinsible = chConfig.GetUpInvinsibleFrames
+						}
 					}
 				}
 			}
--- a/jsexport/battle/characterConfig.go
+++ b/jsexport/battle/characterConfig.go
@@ -176,9 +176,9 @@ var skills = map[int]*Skill{
 		},
 	},
 	3: &Skill{
-		RecoveryFrames:        int32(70),
-		RecoveryFramesOnBlock: int32(70),
-		RecoveryFramesOnHit:   int32(70),
+		RecoveryFrames:        int32(50),
+		RecoveryFramesOnBlock: int32(50),
+		RecoveryFramesOnHit:   int32(50),
 		ReleaseTriggerType:    int32(1),
 		BoundChState:          ATK_CHARACTER_STATE_ATK3,
 		Hits: []interface{}{
@@ -189,8 +189,8 @@ var skills = map[int]*Skill{
 					HitStunFrames:   MAX_INT32,
 					BlockStunFrames: int32(9),
 					Damage:          int32(10),
-					SelfLockVelX:    NO_LOCK_VEL,
-					SelfLockVelY:    NO_LOCK_VEL,
+					SelfLockVelX:    int32(float64(0.5) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					SelfLockVelY:    int32(float64(5) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					PushbackVelX:    int32(float64(2) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					PushbackVelY:    int32(float64(7) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxOffsetX:   int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
@@ -267,16 +267,16 @@ var skills = map[int]*Skill{
 		},
 	},
 	6: &Skill{
-		RecoveryFrames:        int32(60),
-		RecoveryFramesOnBlock: int32(60),
-		RecoveryFramesOnHit:   int32(60),
+		RecoveryFrames:        int32(45),
+		RecoveryFramesOnBlock: int32(45),
+		RecoveryFramesOnHit:   int32(45),
 		ReleaseTriggerType:    int32(1),
 		BoundChState:          ATK_CHARACTER_STATE_ATK3,
 		Hits: []interface{}{
 			&MeleeBullet{
 				Bullet: Bullet{
 					StartupFrames:   int32(15),
-					ActiveFrames:    int32(40),
+					ActiveFrames:    int32(28),
 					HitStunFrames:   MAX_INT32,
 					BlockStunFrames: int32(9),
 					Damage:          int32(10),
@@ -294,9 +294,9 @@ var skills = map[int]*Skill{
 		},
 	},
 	255: &Skill{
-		RecoveryFrames:        int32(34),
-		RecoveryFramesOnBlock: int32(34),
-		RecoveryFramesOnHit:   int32(34),
+		RecoveryFrames:        int32(30),
+		RecoveryFramesOnBlock: int32(30),
+		RecoveryFramesOnHit:   int32(30),
 		ReleaseTriggerType:    int32(1),
 		BoundChState:          ATK_CHARACTER_STATE_INAIR_ATK1,
 		Hits: []interface{}{
@@ -320,17 +320,17 @@ var skills = map[int]*Skill{
 		},
 	},
 	256: &Skill{
-		RecoveryFrames:        int32(34),
-		RecoveryFramesOnBlock: int32(34),
-		RecoveryFramesOnHit:   int32(34),
+		RecoveryFrames:        int32(20),
+		RecoveryFramesOnBlock: int32(20),
+		RecoveryFramesOnHit:   int32(20),
 		ReleaseTriggerType:    int32(1),
 		BoundChState:          ATK_CHARACTER_STATE_INAIR_ATK1,
 		Hits: []interface{}{
 			&MeleeBullet{
 				Bullet: Bullet{
 					StartupFrames:   int32(3),
-					ActiveFrames:    int32(20),
-					HitStunFrames:   int32(18),
+					ActiveFrames:    int32(10),
+					HitStunFrames:   int32(15),
 					BlockStunFrames: int32(9),
 					Damage:          int32(5),
 					SelfLockVelX:    NO_LOCK_VEL,
--- a/jsexport/battle/room_downsync_frame.go
+++ b/jsexport/battle/room_downsync_frame.go
@@ -37,8 +37,7 @@ type PlayerDownsync struct {
 	ActiveSkillId  int32
 	ActiveSkillHit int32

-	FramesInvinsible  int32
-	FramesSelfLockVel int32
+	FramesInvinsible int32
 }

 type InputFrameDecoded struct {
@@ -73,9 +72,8 @@ type Bullet struct {
 	PushbackVelY    int32
 	Damage          int32

-	SelfLockVelX      int32
-	SelfLockVelY      int32
-	FramesSelfLockVel int32
+	SelfLockVelX int32
+	SelfLockVelY int32

 	HitboxOffsetX int32
 	HitboxOffsetY int32
--- a/jsexport/main.go
+++ b/jsexport/main.go
@@ -42,7 +42,7 @@ func NewBarrierJs(boundary *Polygon2D) *js.Object {
 	})
 }

-func NewPlayerDownsyncJs(id, virtualGridX, virtualGridY, dirX, dirY, velX, velY, framesToRecover, framesInChState, activeSkillId, activeSkillHit, framesInvinsible, framesSelfLockVel, speed, battleState, characterState, joinIndex, hp, maxHp, colliderRadius int32, inAir bool) *js.Object {
+func NewPlayerDownsyncJs(id, virtualGridX, virtualGridY, dirX, dirY, velX, velY, framesToRecover, framesInChState, activeSkillId, activeSkillHit, framesInvinsible, speed, battleState, characterState, joinIndex, hp, maxHp, colliderRadius int32, inAir bool) *js.Object {
 	return js.MakeWrapper(&PlayerDownsync{
 		Id:               id,
 		VirtualGridX:     virtualGridX,
@@ -67,7 +67,7 @@ func NewPlayerDownsyncJs(id, virtualGridX, virtualGridY, dirX, dirY, velX, velY,
 	})
 }

-func NewMeleeBulletJs(originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, framesSelfLockVel, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY int32, blowUp bool) *js.Object {
+func NewMeleeBulletJs(originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY int32, blowUp bool) *js.Object {
 	return js.MakeWrapper(&MeleeBullet{
 		Bullet: Bullet{
 			OriginatedRenderFrameId: originatedRenderFrameId,
@@ -84,9 +84,8 @@ func NewMeleeBulletJs(originatedRenderFrameId, offenderJoinIndex, startupFrames,
 			PushbackVelY:    pushbackVelY,
 			Damage:          damage,

-			SelfLockVelX:      selfLockVelX,
-			SelfLockVelY:      selfLockVelY,
-			FramesSelfLockVel: framesSelfLockVel,
+			SelfLockVelX: selfLockVelX,
+			SelfLockVelY: selfLockVelY,

 			HitboxOffsetX: hitboxOffsetX,
 			HitboxOffsetY: hitboxOffsetY,