新增清扫者强化并接入累计消行充能机制

TODO.md

@@ -163,7 +163,7 @@
 
 - [x] Hold 功能改造成可解锁能力，而不是默认启用
 - [ ] 扩展更多预览块显示
-- [ ] 清扫者：累计消行触发底部清除
+- [x] 清扫者：累计消行触发底部清除
 - [ ] 爆破方块：生成特殊方块并实现 3x3 清除
 - [x] 减压：升级后清除最高占用行
 - [ ] 稳定结构：小概率自动填补邻近空洞

src/include/Tetris.h

@@ -51,6 +51,8 @@ struct PlayerStats
     int lastChanceUpgradeLevel;
     int holdUnlocked;
     int pressureReliefLevel;
+    int sweeperLevel;
+    int sweeperCharge;
 };
 
 struct UpgradeOption

src/source/TetrisLogic.cpp

@@ -32,7 +32,8 @@ enum UpgradeId
     UPGRADE_PREVIEW_PLUS_ONE = 4,
     UPGRADE_LAST_CHANCE = 5,
     UPGRADE_HOLD_UNLOCK = 6,
-    UPGRADE_PRESSURE_RELIEF = 7
+    UPGRADE_PRESSURE_RELIEF = 7,
+    UPGRADE_SWEEPER = 8
 };
 
 static const UpgradeEntry kUpgradePool[] =
@@ -44,7 +45,8 @@ static const UpgradeEntry kUpgradePool[] =
     { UPGRADE_EXP_MULTIPLIER, -1, true, _T("\u7ecf\u9a8c\u5f3a\u5316"), _T("\u6210\u957f"), _T("\u540e\u7eed\u6d88\u884c\u83b7\u5f97 EXP \u63d0\u9ad8 25%\u3002") },
     { UPGRADE_LAST_CHANCE, 1, false, _T("\u6700\u540e\u4e00\u640f"), _T("\u4fdd\u547d"), _T("\u9996\u6b21\u9876\u6b7b\u65f6\u81ea\u52a8\u6e05\u9664\u5e95\u90e8 3 \u884c\u5e76\u7ee7\u7eed\u6e38\u620f\u3002") },
     { UPGRADE_HOLD_UNLOCK, 1, false, _T("Hold \u89e3\u9501"), _T("\u7279\u6b8a"), _T("\u89e3\u9501 Hold \u69fd\uff0c\u5bf9\u5c40\u4e2d\u53ef\u7528 C \u6216 Shift \u6682\u5b58\u65b9\u5757\u3002") },
-    { UPGRADE_PRESSURE_RELIEF, -1, true, _T("\u51cf\u538b"), _T("\u7279\u6b8a"), _T("\u7acb\u5373\u6e05\u9664\u5f53\u524d\u6700\u9ad8\u5360\u7528\u884c\uff0c\u4e3a\u76d8\u9762\u817e\u51fa\u547c\u5438\u7a7a\u95f4\u3002") }
+    { UPGRADE_PRESSURE_RELIEF, -1, true, _T("\u51cf\u538b"), _T("\u7279\u6b8a"), _T("\u7acb\u5373\u6e05\u9664\u5f53\u524d\u6700\u9ad8\u5360\u7528\u884c\uff0c\u4e3a\u76d8\u9762\u817e\u51fa\u547c\u5438\u7a7a\u95f4\u3002") },
+    { UPGRADE_SWEEPER, -1, true, _T("\u6e05\u626b\u8005"), _T("\u7279\u6b8a"), _T("\u7d2f\u8ba1\u6d88\u884c\u5145\u80fd\uff0c\u6536\u6ee1\u540e\u81ea\u52a8\u6e05\u9664\u5e95\u90e8 1 \u884c\u3002") }
 };
 
 static constexpr int kUpgradePoolSize = sizeof(kUpgradePool) / sizeof(kUpgradePool[0]);
@@ -197,6 +199,8 @@ static void ResetPlayerStats(PlayerStats& stats, bool useRogueRules)
     stats.lastChanceUpgradeLevel = 0;
     stats.holdUnlocked = 0;
     stats.pressureReliefLevel = 0;
+    stats.sweeperLevel = 0;
+    stats.sweeperCharge = 0;
 }
 
 static int GetNextPreviewLimit()
@@ -239,6 +243,8 @@ static int GetUpgradeCurrentLevel(int upgradeId)
         return rogueStats.holdUnlocked;
     case UPGRADE_PRESSURE_RELIEF:
         return rogueStats.pressureReliefLevel;
+    case UPGRADE_SWEEPER:
+        return rogueStats.sweeperLevel;
     default:
         return 0;
     }
@@ -311,6 +317,13 @@ static int GetTopOccupiedRow()
     return -1;
 }
 
+static int GetSweeperThreshold()
+{
+    int reduction = (rogueStats.sweeperLevel - 1) * 2;
+    int threshold = 8 - reduction;
+    return threshold < 3 ? 3 : threshold;
+}
+
 static void ResetNextQueue()
 {
     for (int i = 0; i < 3; i++)
@@ -454,6 +467,10 @@ static void ApplyUpgradeById(int upgradeId)
         }
         break;
     }
+    case UPGRADE_SWEEPER:
+        rogueStats.sweeperLevel++;
+        SetFeedbackMessage(_T("\u6e05\u626b\u8005\u5df2\u52a0\u5165"), _T("\u7d2f\u8ba1\u6d88\u884c\u540e\u5c06\u81ea\u52a8\u6e05\u7406\u5e95\u90e8\u79ef\u538b\u3002"), 12);
+        break;
     default:
         break;
     }
@@ -493,22 +510,61 @@ static void ApplyLineClearResult(int linesCleared)
     rogueStats.totalLinesCleared += linesCleared;
     rogueStats.score += scoreGain;
     rogueStats.exp += expGain;
+
+    if (rogueStats.sweeperLevel > 0)
+    {
+        rogueStats.sweeperCharge += linesCleared;
+        int sweeperThreshold = GetSweeperThreshold();
+        int clearedBySweeper = 0;
+
+        while (rogueStats.sweeperCharge >= sweeperThreshold)
+        {
+            rogueStats.sweeperCharge -= sweeperThreshold;
+            DeleteOneLine(nGameHeight - 1);
+            clearedBySweeper++;
+        }
+
+        if (clearedBySweeper > 0)
+        {
+            TCHAR sweeperDetail[128];
+            _stprintf_s(
+                sweeperDetail,
+                _T("\u81ea\u52a8\u6e05\u7406\u5e95\u90e8 %d \u884c   \u5269\u4f59\u5145\u80fd %d/%d"),
+                clearedBySweeper,
+                rogueStats.sweeperCharge,
+                sweeperThreshold);
+            SetFeedbackMessage(_T("\u6e05\u626b\u8005\u89e6\u53d1"), sweeperDetail, 12);
+        }
+    }
+
     int levelUps = ApplyLevelProgress(rogueStats);
     upgradeUiState.pendingCount += levelUps;
     tScore = rogueStats.score;
 
     TCHAR feedbackTitle[64];
     TCHAR feedbackDetail[128];
+    if (feedbackState.visibleTicks <= 0)
+    {
         _stprintf_s(feedbackTitle, _T("+%d Score   +%d EXP"), scoreGain, expGain);
         if (levelUps > 0)
         {
             _stprintf_s(feedbackDetail, _T("Level Up x%d   \u5f53\u524d Lv.%d"), levelUps, rogueStats.level);
         }
+        else if (rogueStats.sweeperLevel > 0)
+        {
+            _stprintf_s(
+                feedbackDetail,
+                _T("\u6d88\u884c %d   \u6e05\u626b\u8005 %d/%d"),
+                linesCleared,
+                rogueStats.sweeperCharge,
+                GetSweeperThreshold());
+        }
         else
         {
             _stprintf_s(feedbackDetail, _T("\u6d88\u884c %d   \u8fde\u51fb %d"), linesCleared, rogueStats.comboChain);
         }
         SetFeedbackMessage(feedbackTitle, feedbackDetail, 10);
+    }
 
     if (upgradeUiState.pendingCount > 0)
     {

src/source/TetrisRender.cpp

@@ -362,7 +362,7 @@ void TDrawScreen(HDC hdc, HWND hWnd)
             hdc,
             _T("\u7ecf\u5178\u6a21\u5f0f\uff1a\u4fdd\u6301\u539f\u7248\u4fc4\u7f57\u65af\u65b9\u5757\u73a9\u6cd5\uff0c\u4ee5\u6d88\u884c\u548c\u751f\u5b58\u4e3a\u4e3b\u3002\r\n\r\n")
             _T("Rogue \u6a21\u5f0f\uff1a\u6d88\u884c\u540e\u9664\u4e86\u83b7\u5f97\u5206\u6570\uff0c\u8fd8\u4f1a\u83b7\u5f97 EXP\u3002EXP \u8fbe\u5230\u9608\u503c\u540e\u89e6\u53d1\u5347\u7ea7\uff0c\u4ece\u4e09\u4e2a\u5f3a\u5316\u4e2d\u9009\u4e00\u4e2a\u3002\r\n\r\n")
-            _T("\u5f53\u524d\u5df2\u63a5\u5165\uff1a\u5206\u6570\u500d\u7387\u3001EXP \u500d\u7387\u3001\u6162\u901f\u4e0b\u843d\u3001Hold \u89e3\u9501\u3001\u51cf\u538b\u3002\r\n\r\n")
+            _T("\u5f53\u524d\u5df2\u63a5\u5165\uff1a\u5206\u6570\u500d\u7387\u3001EXP \u500d\u7387\u3001\u6162\u901f\u4e0b\u843d\u3001Hold \u89e3\u9501\u3001\u51cf\u538b\u3001\u6e05\u626b\u8005\u3002\r\n\r\n")
             _T("\u63d0\u793a\uff1a\u6682\u505c\u3001\u5931\u8d25\u548c\u5347\u7ea7\u4f1a\u8fdb\u5165\u4e0d\u540c\u754c\u9762\uff0c\u8bf7\u6839\u636e\u5c4f\u5e55\u63d0\u793a\u64cd\u4f5c\u3002"),
             -1,
             &rulesBody,
@@ -668,6 +668,18 @@ void TDrawScreen(HDC hdc, HWND hWnd)
             upgradeUiState.totalChosenCount);
         TextOut(hdc, combatRect.left + SS(18), combatRect.top + SS(82), summaryText, lstrlen(summaryText));
 
+        if (rogueStats.sweeperLevel > 0)
+        {
+            TCHAR sweeperText[96];
+            int sweeperThreshold = 8 - (rogueStats.sweeperLevel - 1) * 2;
+            if (sweeperThreshold < 3)
+            {
+                sweeperThreshold = 3;
+            }
+            _stprintf_s(sweeperText, _T("\u6e05\u626b\u8005  %d / %d"), rogueStats.sweeperCharge, sweeperThreshold);
+            TextOut(hdc, combatRect.left + SS(18), combatRect.top + SS(114), sweeperText, lstrlen(sweeperText));
+        }
+
         RECT upgradeListRect =
         {
             panelRect.left + SS(20),
@@ -722,6 +734,10 @@ void TDrawScreen(HDC hdc, HWND hWnd)
         {
             _stprintf_s(upgradeSummary + lstrlen(upgradeSummary), 512 - lstrlen(upgradeSummary), _T("\u51cf\u538b Lv.%d\r\n"), rogueStats.pressureReliefLevel);
         }
+        if (rogueStats.sweeperLevel > 0)
+        {
+            _stprintf_s(upgradeSummary + lstrlen(upgradeSummary), 512 - lstrlen(upgradeSummary), _T("\u6e05\u626b\u8005 Lv.%d\r\n"), rogueStats.sweeperLevel);
+        }
         if (lstrlen(upgradeSummary) == 0)
         {
             _stprintf_s(upgradeSummary, _T("\u6682\u672a\u9009\u62e9\u4efb\u4f55\u5f3a\u5316\u3002\r\n\u5347\u7ea7\u540e\u4f1a\u5728\u8fd9\u91cc\u7d2f\u79ef\u663e\u793a\u3002"));