diff --git a/TODO.md b/TODO.md index af0524c..adbf48d 100644 --- a/TODO.md +++ b/TODO.md @@ -165,13 +165,13 @@ - [ ] 扩展更多预览块显示 - [ ] 清扫者：累计消行触发底部清除 - [ ] 爆破方块：生成特殊方块并实现 3x3 清除 -- [ ] 减压：升级后清除最高占用行 +- [x] 减压：升级后清除最高占用行 - [ ] 稳定结构：小概率自动填补邻近空洞 - [ ] 双倍成长 / 赌徒 / 方块改运等特殊强化 完成标准： -- [ ] 至少 2 个特殊机制能稳定跑通 +- [x] 至少 2 个特殊机制能稳定跑通 - [ ] 不会明显破坏基础俄罗斯方块节奏 ## 阶段 9：界面补全与反馈 diff --git a/src/include/Tetris.h b/src/include/Tetris.h index 49a62f2..21393a6 100644 --- a/src/include/Tetris.h +++ b/src/include/Tetris.h @@ -50,6 +50,7 @@ struct PlayerStats int previewUpgradeLevel; int lastChanceUpgradeLevel; int holdUnlocked; + int pressureReliefLevel; }; struct UpgradeOption diff --git a/src/source/TetrisLogic.cpp b/src/source/TetrisLogic.cpp index 2252ccd..668684e 100644 --- a/src/source/TetrisLogic.cpp +++ b/src/source/TetrisLogic.cpp @@ -31,7 +31,8 @@ enum UpgradeId UPGRADE_COMBO_BONUS = 3, UPGRADE_PREVIEW_PLUS_ONE = 4, UPGRADE_LAST_CHANCE = 5, - UPGRADE_HOLD_UNLOCK = 6 + UPGRADE_HOLD_UNLOCK = 6, + UPGRADE_PRESSURE_RELIEF = 7 }; static const UpgradeEntry kUpgradePool[] = @@ -42,7 +43,8 @@ static const UpgradeEntry kUpgradePool[] = { UPGRADE_PREVIEW_PLUS_ONE, 3, false, _T("\u989d\u5916\u9884\u89c8"), _T("\u89c6\u91ce"), _T("\u4e0b\u4e00\u4e2a\u65b9\u5757\u9884\u89c8 +1\uff0c\u6700\u591a 3 \u4e2a\u3002") }, { 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_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") } }; static constexpr int kUpgradePoolSize = sizeof(kUpgradePool) / sizeof(kUpgradePool[0]); @@ -194,6 +196,7 @@ static void ResetPlayerStats(PlayerStats& stats, bool useRogueRules) stats.previewUpgradeLevel = 0; stats.lastChanceUpgradeLevel = 0; stats.holdUnlocked = 0; + stats.pressureReliefLevel = 0; } static int GetNextPreviewLimit() @@ -234,6 +237,8 @@ static int GetUpgradeCurrentLevel(int upgradeId) return rogueStats.lastChanceUpgradeLevel; case UPGRADE_HOLD_UNLOCK: return rogueStats.holdUnlocked; + case UPGRADE_PRESSURE_RELIEF: + return rogueStats.pressureReliefLevel; default: return 0; } @@ -290,6 +295,22 @@ static bool IsPiecePlacementValid(int pieceType, int pieceState, Point position) return true; } +static int GetTopOccupiedRow() +{ + for (int i = 0; i < nGameHeight; i++) + { + for (int j = 0; j < nGameWidth; j++) + { + if (workRegion[i][j] != 0) + { + return i; + } + } + } + + return -1; +} + static void ResetNextQueue() { for (int i = 0; i < 3; i++) @@ -418,6 +439,21 @@ static void ApplyUpgradeById(int upgradeId) case UPGRADE_HOLD_UNLOCK: rogueStats.holdUnlocked = 1; break; + case UPGRADE_PRESSURE_RELIEF: + { + rogueStats.pressureReliefLevel++; + int topOccupiedRow = GetTopOccupiedRow(); + if (topOccupiedRow >= 0) + { + DeleteOneLine(topOccupiedRow); + SetFeedbackMessage(_T("\u51cf\u538b\u751f\u6548"), _T("\u5df2\u7acb\u5373\u6e05\u9664\u5f53\u524d\u6700\u9ad8\u5360\u7528\u884c\u3002"), 12); + } + else + { + SetFeedbackMessage(_T("\u51cf\u538b\u751f\u6548"), _T("\u5f53\u524d\u76d8\u9762\u8fd8\u5f88\u7a7a\uff0c\u672c\u6b21\u6ca1\u6709\u989d\u5916\u6e05\u9664\u884c\u3002"), 12); + } + break; + } default: break; } diff --git a/src/source/TetrisRender.cpp b/src/source/TetrisRender.cpp index 36776a6..1010a53 100644 --- a/src/source/TetrisRender.cpp +++ b/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\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("\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, @@ -718,6 +718,10 @@ void TDrawScreen(HDC hdc, HWND hWnd) { _stprintf_s(upgradeSummary + lstrlen(upgradeSummary), 512 - lstrlen(upgradeSummary), _T("\u6700\u540e\u4e00\u640f Lv.1 \u5269\u4f59 %d \u6b21\r\n"), rogueStats.lastChanceCount); } + if (rogueStats.pressureReliefLevel > 0) + { + _stprintf_s(upgradeSummary + lstrlen(upgradeSummary), 512 - lstrlen(upgradeSummary), _T("\u51cf\u538b Lv.%d\r\n"), rogueStats.pressureReliefLevel); + } 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"));