Merge remote-tracking branch 'origin/auto' into auto

# Conflicts:
#	src/main/kotlin/dev/robothanzo/werewolf/game/steps/NightStep.kt

Author: RobotHanzo

src/dashboard/src/constants/gameData.ts

@@ -190,6 +190,13 @@ export const GAME_ROLES: Record<string, GameEntityConfig> = {
     translationKey: 'roles.labels.DARK_MERCHANT',
     camp: 'GOD',
   },
+  MIRACLE_MERCHANT: {
+    id: 'MIRACLE_MERCHANT',
+    color: '#f59e0b', // Amber-500
+    icon: ShoppingBag,
+    translationKey: 'roles.labels.MIRACLE_MERCHANT',
+    camp: 'GOD',
+  },
   HIDDEN: {
     id: 'HIDDEN',
     color: '#64748b', // Slate-500
@@ -254,6 +261,12 @@ export const GAME_ACTIONS: Record<string, GameEntityConfig> = {
     icon: ShoppingBag,
     translationKey: 'roles.actions.DARK_MERCHANT_TRADE',
   },
+  MIRACLE_MERCHANT_TRADE_GUARD: {
+    id: 'MIRACLE_MERCHANT_TRADE_GUARD',
+    color: '#f59e0b',
+    icon: Shield,
+    translationKey: 'roles.actions.MIRACLE_MERCHANT_TRADE_GUARD',
+  },
   MERCHANT_SEER_CHECK: {
     id: 'MERCHANT_SEER_CHECK',
     color: '#06b6d4',
@@ -272,6 +285,12 @@ export const GAME_ACTIONS: Record<string, GameEntityConfig> = {
     icon: Crosshair,
     translationKey: 'roles.actions.MERCHANT_GUN',
   },
+  MERCHANT_GUARD_PROTECT: {
+    id: 'MERCHANT_GUARD_PROTECT',
+    color: '#f59e0b',
+    icon: Shield,
+    translationKey: 'roles.actions.MERCHANT_GUARD_PROTECT',
+  },
   DREAM_WEAVER_LINK: {
     id: 'DREAM_WEAVER_LINK',
     color: '#ec4899',
@@ -321,6 +340,7 @@ export const getRoleConfig = (roleName: string): GameEntityConfig => {
   if (roleName.includes('魔術師')) return GAME_ROLES.MAGICIAN;
   if (roleName.includes('平民') || roleName.includes('村民')) return GAME_ROLES.VILLAGER;
   if (roleName.includes('黑市')) return GAME_ROLES.DARK_MERCHANT;
+  if (roleName.includes('奇蹟')) return GAME_ROLES.MIRACLE_MERCHANT;
   if (roleName.includes('複製')) return GAME_ROLES.CLONE;
 
   return GAME_ROLES.HIDDEN;

src/dashboard/src/locales/zh-TW.json

@@ -216,6 +216,7 @@
       "HUNTER": "獵人",
       "VILLAGER": "平民",
       "DARK_MERCHANT": "黑市商人",
+      "MIRACLE_MERCHANT": "奇蹟商人",
       "WOLF_KING": "狼王",
       "WOLF_YOUNGER_BROTHER": "狼弟",
       "WOLF_BROTHER": "狼兄",
@@ -244,9 +245,11 @@
       "HUNTER_REVENGE": "獵人開槍",
       "WOLF_KING_REVENGE": "狼王開槍",
       "DARK_MERCHANT_TRADE": "黑市商人交易",
+      "MIRACLE_MERCHANT_TRADE_GUARD": "奇蹟商人交易 (給予守護)",
       "MERCHANT_SEER_CHECK": "商人技能：查驗",
       "MERCHANT_POISON": "商人技能：毒藥",
       "MERCHANT_GUN": "商人技能：開槍",
+      "MERCHANT_GUARD_PROTECT": "商人技能：守護",
       "DREAM_WEAVER_LINK": "攝夢人：攝夢",
       "NIGHTMARE_FEAR": "夢魘：恐懼",
       "DEATH": "角色死亡",

src/main/kotlin/dev/robothanzo/werewolf/audio/Audio.kt

@@ -1,9 +1,11 @@
 package dev.robothanzo.werewolf.audio
 
 import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler
+import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason
 import dev.robothanzo.werewolf.WerewolfApplication
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel
 import org.slf4j.LoggerFactory
@@ -12,13 +14,36 @@ import java.util.*
 object Audio {
     private val log = LoggerFactory.getLogger(Audio::class.java)
 
-    fun VoiceChannel.play(resource: Resource) {
+    fun VoiceChannel.play(resource: Resource, onFinished: (() -> Unit)? = null) {
         val resourcePath = "sounds/$resource.mp3"
         log.info("Attempting to play audio resource: {} in channel: {}", resourcePath, this.name)
         try {
             val audioManager = this.guild.audioManager
             val player = WerewolfApplication.playerManager.createPlayer()
 
+            if (onFinished != null) {
+                player.addListener(object : AudioEventAdapter() {
+                    override fun onTrackEnd(
+                        player: com.sedmelluq.discord.lavaplayer.player.AudioPlayer,
+                        track: AudioTrack,
+                        endReason: AudioTrackEndReason
+                    ) {
+                        if (endReason.mayStartNext) {
+                            onFinished()
+                        }
+                    }
+
+                    override fun onTrackException(
+                        player: com.sedmelluq.discord.lavaplayer.player.AudioPlayer,
+                        track: AudioTrack,
+                        exception: FriendlyException
+                    ) {
+                        log.error("Track exception for audio resource: {}. Error: {}", resourcePath, exception.message)
+                        onFinished()
+                    }
+                })
+            }
+
             // Always set/update the sending handler to the player we just created for this clip
             audioManager.sendingHandler = AudioPlayerSendHandler(player)
 
@@ -36,25 +61,32 @@ object Audio {
 
                     override fun playlistLoaded(playlist: AudioPlaylist) {
                         log.debug("Playlist loaded (unexpected for single clip): {}", resourceName(resource))
+                        onFinished?.invoke()
                     }
 
                     override fun noMatches() {
                         log.warn("No matches found for audio resource: {}", resourcePath)
+                        onFinished?.invoke()
                     }
 
                     override fun loadFailed(exception: FriendlyException) {
                         log.error("Load failed for audio resource: {}. Error: {}", resourcePath, exception.message)
+                        onFinished?.invoke()
                     }
                 })
         } catch (e: Exception) {
             log.error("Error while trying to play sound resource: {}", resourcePath, e)
+            onFinished?.invoke()
         }
     }
 
     private fun resourceName(resource: Resource): String = resource.toString()
 
     enum class Resource {
-        EXPEL_POLL, POLICE_ENROLL, POLICE_POLL, TIMER_ENDED, ENROLL_10S_REMAINING, POLL_10S_REMAINING, TIMER_30S_REMAINING;
+        MORNING, NIGHT,
+        EXPEL_POLL, POLL_10S_REMAINING,
+        ENROLL_10S_REMAINING, POLICE_ENROLL, POLICE_POLL,
+        TIMER_ENDED, TIMER_30S_REMAINING;
 
         override fun toString(): String {
             return super.toString().lowercase(Locale.ROOT)

src/main/kotlin/dev/robothanzo/werewolf/commands/Game.kt

@@ -3,7 +3,11 @@ package dev.robothanzo.werewolf.commands
 import dev.robothanzo.jda.interactions.annotations.slash.Command
 import dev.robothanzo.jda.interactions.annotations.slash.Subcommand
 import dev.robothanzo.werewolf.WerewolfApplication
+import dev.robothanzo.werewolf.database.documents.LogType
 import dev.robothanzo.werewolf.game.model.DeathCause
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 @Command
@@ -35,9 +39,26 @@ class Game {
                 return@withLockedSession
             }
 
+            if (player.roles.contains("夢魘")) {
+                event.hook.editOriginal(":x: 夢魘不可自爆").queue()
+                return@withLockedSession
+            }
+
             // Execute detonation
-            session.addLog(dev.robothanzo.werewolf.database.documents.LogType.SYSTEM, "${player.nickname} 選擇自爆")
-            player.died(DeathCause.EXPEL, allowLastWords = false)
+            session.addLog(LogType.SYSTEM, "${player.nickname} 選擇自爆")
+            player.markDead(DeathCause.EXPEL)
+
+            // Launch async death events (Last Words etc)
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch {
+                try {
+                    val currentSession = WerewolfApplication.gameSessionService.getSession(guildId).orElse(null)
+                    val p = currentSession?.getPlayer(player.id)
+                    p?.runDeathEvents(allowLastWords = true)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
 
             // End the current phase (usually day speech)
             WerewolfApplication.gameStateService.nextStep(session)

src/main/kotlin/dev/robothanzo/werewolf/controller/GameController.kt

@@ -1,8 +1,12 @@
 package dev.robothanzo.werewolf.controller
 
-import dev.robothanzo.werewolf.controller.dto.*
+import dev.robothanzo.werewolf.controller.dto.ApiResponse
+import dev.robothanzo.werewolf.controller.dto.GameRequests
+import dev.robothanzo.werewolf.controller.dto.GuildMembersResponse
+import dev.robothanzo.werewolf.controller.dto.StateActionResponse
 import dev.robothanzo.werewolf.database.documents.LogType
 import dev.robothanzo.werewolf.database.documents.UserRole
+import dev.robothanzo.werewolf.game.model.DeathCause
 import dev.robothanzo.werewolf.security.annotations.CanManageGuild
 import dev.robothanzo.werewolf.security.annotations.CanViewGuild
 import dev.robothanzo.werewolf.service.*
@@ -12,6 +16,9 @@ import io.swagger.v3.oas.annotations.media.Content
 import io.swagger.v3.oas.annotations.media.Schema
 import io.swagger.v3.oas.annotations.responses.ApiResponses
 import io.swagger.v3.oas.annotations.tags.Tag
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.springframework.context.annotation.Lazy
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
@@ -246,8 +253,18 @@ class GameController(
     ): ResponseEntity<ApiResponse> {
         val session = gameSessionService.getSession(guildId.toLong())
             .orElseThrow { Exception("Session not found") }
-        gameActionService.markPlayerDead(session, playerId, lastWords)
-        return ResponseEntity.ok(ApiResponse.ok(message = "Player marked as dead"))
+        val player = session.getPlayer(playerId) ?: throw Exception("Player not found")
+
+        @OptIn(DelicateCoroutinesApi::class)
+        GlobalScope.launch {
+            try {
+                player.processDeath(DeathCause.UNKNOWN, lastWords)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+
+        return ResponseEntity.ok(ApiResponse.ok(message = "Player death processing started"))
     }
 
     @Operation(summary = "Revive Player", description = "Revives a dead player.")