Simplified bullet handling.

frontend/assets/resources/animation/Monk/InAirAtk1.anim

@@ -48,13 +48,13 @@
             }
           },
           {
-            "frame": 0.45,
+            "frame": 0.4,
             "value": {
               "__uuid__": "487b65c3-44e3-4b0e-9350-e0d1c952785b"
             }
           },
           {
-            "frame": 0.5,
+            "frame": 0.4166666666666667,
             "value": {
               "__uuid__": "9a5357ae-a160-4198-a6d5-cc9631fde754"
             }

frontend/assets/scenes/offline_map.fire

@@ -547,7 +547,7 @@
       "array": [
         0,
         0,
-        216.50635094610968,
+        216.05530045313827,
         0,
         0,
         0,

frontend/assets/scripts/Map.js

@@ -1306,7 +1306,7 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
     }
     for (let k in rdf.MeleeBullets) {
       const meleeBullet = rdf.MeleeBullets[k];
-      const isExploding = (window.BULLET_STATE.Exploding == meleeBullet.BlState);
+      const isExploding = (window.BULLET_STATE.Exploding == meleeBullet.BlState && meleeBullet.FramesInBlState < meleeBullet.Bullet.ExplosionFrames);
       if (isExploding) {
         let pqNode = self.cachedFireballs.popAny(meleeBullet.BattleAttr.BulletLocalId);
         let speciesName = `MeleeExplosion`;

frontend/assets/scripts/modules/jsexport.js.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.5",
-  "uuid": "171e2c96-28b4-4225-bdcc-5e464f07d91a",
+  "uuid": "eeaa56f4-bd6c-4208-bec4-6ab1aa39ca93",
   "isPlugin": true,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

jsexport/battle/battle.go

@@ -716,7 +716,7 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 				} else if stoppingFromWalking {
 					thatPlayerInNextFrame.FramesToRecover = chConfig.InertiaFramesToRecover
 				} else {
-					thatPlayerInNextFrame.FramesToRecover = (chConfig.InertiaFramesToRecover >> 1)
+					thatPlayerInNextFrame.FramesToRecover = ((chConfig.InertiaFramesToRecover >> 1) + (chConfig.InertiaFramesToRecover >> 2))
 				}
 			} else {
 				thatPlayerInNextFrame.CapturedByInertia = false
@@ -757,8 +757,19 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		if 0 >= thatPlayerInNextFrame.Hp && 0 == thatPlayerInNextFrame.FramesToRecover {
 			// Revive from Dying
 			newVx, newVy = currPlayerDownsync.RevivalVirtualGridX, currPlayerDownsync.RevivalVirtualGridY
-			thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
+			thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_GET_UP1
+			thatPlayerInNextFrame.FramesInChState = ATK_CHARACTER_STATE_GET_UP1
+			thatPlayerInNextFrame.FramesToRecover = chConfig.GetUpFramesToRecover
+			thatPlayerInNextFrame.FramesInvinsible = chConfig.GetUpInvinsibleFrames
 			thatPlayerInNextFrame.Hp = currPlayerDownsync.MaxHp
+			// Hardcoded initial character orientation/facing
+			if 0 == (thatPlayerInNextFrame.JoinIndex % 2) {
+				thatPlayerInNextFrame.DirX = -2
+				thatPlayerInNextFrame.DirY = 0
+			} else {
+				thatPlayerInNextFrame.DirX = +2
+				thatPlayerInNextFrame.DirY = 0
+			}
 		}
 		if jumpedOrNotList[i] {
 			// We haven't proceeded with "OnWall" calculation for "thatPlayerInNextFrame", thus use "currPlayerDownsync.OnWall" for checking
@@ -899,8 +910,12 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		if collision := playerCollider.Check(0, 0); nil != collision {
 			for _, obj := range collision.Objects {
 				isBarrier, isAnotherPlayer, isBullet := false, false, false
-				switch obj.Data.(type) {
+				switch v := obj.Data.(type) {
 				case *PlayerDownsync:
+					if ATK_CHARACTER_STATE_DYING == v.CharacterState {
+						// ignore collision with dying player
+						continue
+					}
 					isAnotherPlayer = true
 				case *MeleeBullet, *FireballBullet:
 					isBullet = true
@@ -912,6 +927,7 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 					// ignore bullets for this step
 					continue
 				}
+
 				bShape := obj.Shape.(*resolv.ConvexPolygon)
 				overlapped, pushbackX, pushbackY, overlapResult := calcPushbacks(0, 0, playerShape, bShape)
 				if !overlapped {
@@ -1013,113 +1029,83 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		collision := bulletCollider.Check(0, 0)
 		bulletCollider.Space.Remove(bulletCollider) // Make sure that the bulletCollider is always removed for each renderFrame
 		exploded := false
-		if nil != collision {
+		explodedOnAnotherPlayer := false
+		if nil == collision {
+			continue
+		}
+
+		var bulletStaticAttr *BulletConfig = nil
+		var bulletBattleAttr *BulletBattleAttr = nil
 		switch v := bulletCollider.Data.(type) {
 		case *MeleeBullet:
-				bulletShape := bulletCollider.Shape.(*resolv.ConvexPolygon)
+			bulletStaticAttr = v.Bullet
-				offender := currRenderFrame.PlayersArr[v.BattleAttr.OffenderJoinIndex-1]
+			bulletBattleAttr = v.BattleAttr
-				for _, obj := range collision.Objects {
-					defenderShape := obj.Shape.(*resolv.ConvexPolygon)
-					switch t := obj.Data.(type) {
-					case *PlayerDownsync:
-						if v.BattleAttr.OffenderJoinIndex == t.JoinIndex {
-							continue
-						}
-						overlapped, _, _, _ := calcPushbacks(0, 0, bulletShape, defenderShape)
-						if !overlapped {
-							continue
-						}
-						exploded = true
-						if _, existent := invinsibleSet[t.CharacterState]; existent {
-							continue
-						}
-						if 0 < t.FramesInvinsible {
-							continue
-						}
-						xfac := int32(1) // By now, straight Punch offset doesn't respect "y-axis"
-						if 0 > offender.DirX {
-							xfac = -xfac
-						}
-						atkedPlayerInNextFrame := nextRenderFramePlayers[t.JoinIndex-1]
-						atkedPlayerInNextFrame.Hp -= v.Bullet.Damage
-						if 0 >= atkedPlayerInNextFrame.Hp {
-							// [WARNING] We don't have "dying in air" animation for now, and for better graphical recognition, play the same dying animation even in air
-							atkedPlayerInNextFrame.Hp = 0
-							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_DYING
-							atkedPlayerInNextFrame.FramesToRecover = DYING_FRAMES_TO_RECOVER
-						} else {
-							pushbackVelX, pushbackVelY := xfac*v.Bullet.PushbackVelX, v.Bullet.PushbackVelY
-							atkedPlayerInNextFrame.VelX = pushbackVelX
-							atkedPlayerInNextFrame.VelY = pushbackVelY
-							if v.Bullet.BlowUp {
-								atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_BLOWN_UP1
-							} else {
-								atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_ATKED1
-							}
-							oldFramesToRecover := nextRenderFramePlayers[t.JoinIndex-1].FramesToRecover
-							if v.Bullet.HitStunFrames > oldFramesToRecover {
-								atkedPlayerInNextFrame.FramesToRecover = v.Bullet.HitStunFrames
-							}
-						}
-					}
-				}
 		case *FireballBullet:
+			bulletStaticAttr = v.Bullet
+			bulletBattleAttr = v.BattleAttr
+		}
+
 		bulletShape := bulletCollider.Shape.(*resolv.ConvexPolygon)
-				offender := currRenderFrame.PlayersArr[v.BattleAttr.OffenderJoinIndex-1]
+		offender := currRenderFrame.PlayersArr[bulletBattleAttr.OffenderJoinIndex-1]
 		for _, obj := range collision.Objects {
 			defenderShape := obj.Shape.(*resolv.ConvexPolygon)
 			switch t := obj.Data.(type) {
 			case *PlayerDownsync:
-						if v.BattleAttr.OffenderJoinIndex == t.JoinIndex {
+				if bulletBattleAttr.OffenderJoinIndex == t.JoinIndex {
 					continue
 				}
 				overlapped, _, _, _ := calcPushbacks(0, 0, bulletShape, defenderShape)
 				if !overlapped {
 					continue
 				}
-						exploded = true
 				if _, existent := invinsibleSet[t.CharacterState]; existent {
 					continue
 				}
 				if 0 < t.FramesInvinsible {
 					continue
 				}
+				exploded = true
+				explodedOnAnotherPlayer = true
 				xfac := int32(1) // By now, straight Punch offset doesn't respect "y-axis"
 				if 0 > offender.DirX {
 					xfac = -xfac
 				}
 				atkedPlayerInNextFrame := nextRenderFramePlayers[t.JoinIndex-1]
-						atkedPlayerInNextFrame.Hp -= v.Bullet.Damage
+				atkedPlayerInNextFrame.Hp -= bulletStaticAttr.Damage
 				if 0 >= atkedPlayerInNextFrame.Hp {
 					// [WARNING] We don't have "dying in air" animation for now, and for better graphical recognition, play the same dying animation even in air
 					atkedPlayerInNextFrame.Hp = 0
 					atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_DYING
 					atkedPlayerInNextFrame.FramesToRecover = DYING_FRAMES_TO_RECOVER
 				} else {
-							pushbackVelX, pushbackVelY := xfac*v.Bullet.PushbackVelX, v.Bullet.PushbackVelY
+					pushbackVelX, pushbackVelY := xfac*bulletStaticAttr.PushbackVelX, bulletStaticAttr.PushbackVelY
 					atkedPlayerInNextFrame.VelX = pushbackVelX
 					atkedPlayerInNextFrame.VelY = pushbackVelY
-							if v.Bullet.BlowUp {
+					if bulletStaticAttr.BlowUp {
 						atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_BLOWN_UP1
 					} else {
 						atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_ATKED1
 					}
 					oldFramesToRecover := nextRenderFramePlayers[t.JoinIndex-1].FramesToRecover
-							if v.Bullet.HitStunFrames > oldFramesToRecover {
+					if bulletStaticAttr.HitStunFrames > oldFramesToRecover {
-								atkedPlayerInNextFrame.FramesToRecover = v.Bullet.HitStunFrames
+						atkedPlayerInNextFrame.FramesToRecover = bulletStaticAttr.HitStunFrames
 					}
 				}
 			default:
 				exploded = true
 			}
 		}
-			}
+
-		}
 		if exploded {
 			switch v := bulletCollider.Data.(type) {
 			case *MeleeBullet:
 				v.BlState = BULLET_EXPLODING
+				if explodedOnAnotherPlayer {
 					v.FramesInBlState = 0
+				} else {
+					// When hitting a barrier, don't play explosion anim
+					v.FramesInBlState = v.Bullet.ExplosionFrames + 1
+				}
 				//fmt.Printf("melee exploded @currRenderFrame.Id=%d, bulletLocalId=%d, blState=%d\n", currRenderFrame.Id, v.BattleAttr.BulletLocalId, v.BlState)
 			case *FireballBullet:
 				v.BlState = BULLET_EXPLODING

jsexport/battle/characterConfig.go

@@ -538,7 +538,7 @@ var skills = map[int]*Skill{
 					HitboxSizeX:     int32(float64(64) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:     int32(float64(48) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					BlowUp:          false,
-					ExplosionFrames: 10,
+					ExplosionFrames: 30,
 					SpeciesId:       int32(1),
 				},
 			},
@@ -781,10 +781,10 @@ var skills = map[int]*Skill{
 		Hits: []interface{}{
 			&MeleeBullet{
 				Bullet: &BulletConfig{
-					StartupFrames:   int32(3),
+					StartupFrames:   int32(4),
 					ActiveFrames:    int32(20),
-					HitStunFrames:   int32(18),
+					HitStunFrames:   int32(9),
-					BlockStunFrames: int32(9),
+					BlockStunFrames: int32(5),
 					Damage:          int32(5),
 					SelfLockVelX:    NO_LOCK_VEL,
 					SelfLockVelY:    NO_LOCK_VEL,