From 4bcc62f01a7bafa3af4e244c11cdab58cf229bba Mon Sep 17 00:00:00 2001 From: Qi-huanye <2728290997@qq.com> Date: Fri, 24 Apr 2026 21:32:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B5=8C=E5=BE=92=E5=BC=BA?= =?UTF-8?q?=E5=8C=96=E5=92=8C=E6=96=B9=E5=9D=97=E6=94=B9=E8=BF=90=E5=B9=B6?= =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=94=B6=E7=9B=8A=E6=B3=A2=E5=8A=A8=E6=9C=BA?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TODO.md | 2 +- src/include/Tetris.h | 2 + src/source/TetrisLogic.cpp | 84 +++++++++++++++++++++++++++++++++++-- src/source/TetrisRender.cpp | 29 ++++++++++++- 4 files changed, 111 insertions(+), 6 deletions(-) diff --git a/TODO.md b/TODO.md index 91a7161..02fd9ca 100644 --- a/TODO.md +++ b/TODO.md @@ -167,7 +167,7 @@ - [x] 爆破方块：生成特殊方块并实现 3x3 清除 - [x] 减压：升级后清除最高占用行 - [x] 稳定结构：小概率自动填补邻近空洞 -- [ ] 双倍成长 / 赌徒 / 方块改运等特殊强化 +- [x] 双倍成长 / 赌徒 / 方块改运等特殊强化 完成标准： diff --git a/src/include/Tetris.h b/src/include/Tetris.h index 5775e74..dd1b039 100644 --- a/src/include/Tetris.h +++ b/src/include/Tetris.h @@ -56,6 +56,8 @@ struct PlayerStats int explosiveLevel; int stableStructureLevel; int doubleGrowthLevel; + int luckyRollLevel; + int gamblerLevel; }; struct UpgradeOption diff --git a/src/source/TetrisLogic.cpp b/src/source/TetrisLogic.cpp index 5335bd6..5f5f68f 100644 --- a/src/source/TetrisLogic.cpp +++ b/src/source/TetrisLogic.cpp @@ -37,7 +37,9 @@ enum UpgradeId UPGRADE_SWEEPER = 8, UPGRADE_EXPLOSIVE_PIECE = 9, UPGRADE_STABLE_STRUCTURE = 10, - UPGRADE_DOUBLE_GROWTH = 11 + UPGRADE_DOUBLE_GROWTH = 11, + UPGRADE_LUCKY_ROLL = 12, + UPGRADE_GAMBLER = 13 }; static const UpgradeEntry kUpgradePool[] = @@ -53,7 +55,9 @@ static const UpgradeEntry kUpgradePool[] = { 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") }, { UPGRADE_EXPLOSIVE_PIECE, -1, true, _T("\u7206\u7834\u65b9\u5757"), _T("\u7279\u6b8a"), _T("\u63d0\u9ad8\u7206\u7834\u65b9\u5757\u51fa\u73b0\u6982\u7387\uff0c\u843d\u5730\u65f6\u89e6\u53d1 3x3 \u6e05\u9664\u3002") }, { UPGRADE_STABLE_STRUCTURE, -1, true, _T("\u7a33\u5b9a\u7ed3\u6784"), _T("\u7279\u6b8a"), _T("\u843d\u5730\u540e\u5c0f\u6982\u7387\u81ea\u52a8\u586b\u8865\u90bb\u8fd1\u7a7a\u6d1e\uff0c\u63d0\u9ad8\u76d8\u9762\u7ed3\u6784\u7a33\u5b9a\u6027\u3002") }, - { UPGRADE_DOUBLE_GROWTH, -1, true, _T("\u53cc\u500d\u6210\u957f"), _T("\u7279\u6b8a"), _T("\u989d\u5916\u63d0\u9ad8\u6d88\u884c\u5f97\u5206\u4e0e EXP \u6536\u76ca\uff0c\u6bcf\u5c42\u518d\u8ffd\u52a0 15%\u3002") } + { UPGRADE_DOUBLE_GROWTH, -1, true, _T("\u53cc\u500d\u6210\u957f"), _T("\u7279\u6b8a"), _T("\u989d\u5916\u63d0\u9ad8\u6d88\u884c\u5f97\u5206\u4e0e EXP \u6536\u76ca\uff0c\u6bcf\u5c42\u518d\u8ffd\u52a0 15%\u3002") }, + { UPGRADE_LUCKY_ROLL, -1, true, _T("\u65b9\u5757\u6539\u8fd0"), _T("\u7279\u6b8a"), _T("\u4f18\u5316 Next \u961f\u5217\uff0c\u964d\u4f4e\u8fde\u7eed\u91cd\u590d\u65b9\u5757\u51fa\u73b0\u7684\u6982\u7387\u3002") }, + { UPGRADE_GAMBLER, -1, true, _T("\u8d4c\u5f92"), _T("\u7279\u6b8a"), _T("\u6d88\u884c\u6536\u76ca\u4f1a\u989d\u5916\u968f\u673a\u6ce2\u52a8\uff0c\u5c42\u6570\u8d8a\u9ad8\u6ce2\u52a8\u8d8a\u5927\u3002") } }; static constexpr int kUpgradePoolSize = sizeof(kUpgradePool) / sizeof(kUpgradePool[0]); @@ -211,6 +215,8 @@ static void ResetPlayerStats(PlayerStats& stats, bool useRogueRules) stats.explosiveLevel = 0; stats.stableStructureLevel = 0; stats.doubleGrowthLevel = 0; + stats.luckyRollLevel = 0; + stats.gamblerLevel = 0; } static int GetNextPreviewLimit() @@ -261,6 +267,10 @@ static int GetUpgradeCurrentLevel(int upgradeId) return rogueStats.stableStructureLevel; case UPGRADE_DOUBLE_GROWTH: return rogueStats.doubleGrowthLevel; + case UPGRADE_LUCKY_ROLL: + return rogueStats.luckyRollLevel; + case UPGRADE_GAMBLER: + return rogueStats.gamblerLevel; default: return 0; } @@ -378,6 +388,46 @@ static int ClearExplosiveAreaAt(int centerY, int centerX) return clearedCellCount; } +static int RollNextPieceType() +{ + int candidate = rand() % 7; + + if (currentMode != MODE_ROGUE || rogueStats.luckyRollLevel <= 0) + { + return candidate; + } + + int rerollCount = rogueStats.luckyRollLevel; + if (rerollCount > 3) + { + rerollCount = 3; + } + + for (int attempt = 0; attempt < rerollCount; attempt++) + { + bool matchesCurrent = (candidate == type); + bool matchesQueue = false; + + for (int i = 0; i < 3; i++) + { + if (nextTypes[i] == candidate) + { + matchesQueue = true; + break; + } + } + + if (!matchesCurrent && !matchesQueue) + { + break; + } + + candidate = rand() % 7; + } + + return candidate; +} + static int TryStabilizeBoard() { if (currentMode != MODE_ROGUE || rogueStats.stableStructureLevel <= 0) @@ -429,7 +479,7 @@ static void ResetNextQueue() { for (int i = 0; i < 3; i++) { - nextTypes[i] = rand() % 7; + nextTypes[i] = RollNextPieceType(); } } @@ -438,7 +488,7 @@ static int ConsumeNextType() int nextType = nextTypes[0]; nextTypes[0] = nextTypes[1]; nextTypes[1] = nextTypes[2]; - nextTypes[2] = rand() % 7; + nextTypes[2] = RollNextPieceType(); return nextType; } @@ -584,6 +634,14 @@ static void ApplyUpgradeById(int upgradeId) rogueStats.doubleGrowthLevel++; SetFeedbackMessage(_T("\u53cc\u500d\u6210\u957f\u5df2\u53e0\u52a0"), _T("\u540e\u7eed\u6d88\u884c\u7684\u5f97\u5206\u548c EXP \u6536\u76ca\u4f1a\u66f4\u9ad8\u3002"), 12); break; + case UPGRADE_LUCKY_ROLL: + rogueStats.luckyRollLevel++; + SetFeedbackMessage(_T("\u65b9\u5757\u6539\u8fd0\u5df2\u5f3a\u5316"), _T("Next \u961f\u5217\u4f1a\u66f4\u5c11\u51fa\u73b0\u8fde\u7eed\u91cd\u590d\u5757\u578b\u3002"), 12); + break; + case UPGRADE_GAMBLER: + rogueStats.gamblerLevel++; + SetFeedbackMessage(_T("\u8d4c\u5f92\u5df2\u53e0\u52a0"), _T("\u540e\u7eed\u6d88\u884c\u7684\u5206\u6570\u548c EXP \u4f1a\u989d\u5916\u968f\u673a\u6ce2\u52a8\u3002"), 12); + break; default: break; } @@ -621,6 +679,20 @@ static void ApplyLineClearResult(int linesCleared) expGain = expGain * growthMultiplierPercent / 100; } + int gamblerBonusPercent = 0; + if (rogueStats.gamblerLevel > 0) + { + int variance = 20 + (rogueStats.gamblerLevel - 1) * 10; + if (variance > 50) + { + variance = 50; + } + + gamblerBonusPercent = (rand() % (variance * 2 + 1)) - variance; + scoreGain = scoreGain * (100 + gamblerBonusPercent) / 100; + expGain = expGain * (100 + gamblerBonusPercent) / 100; + } + rogueStats.comboChain++; if (rogueStats.comboBonusStacks > 0 && rogueStats.comboChain > 1) { @@ -679,6 +751,10 @@ static void ApplyLineClearResult(int linesCleared) rogueStats.sweeperCharge, GetSweeperThreshold()); } + else if (rogueStats.gamblerLevel > 0) + { + _stprintf_s(feedbackDetail, _T("\u6d88\u884c %d \u8d4c\u5f92\u6ce2\u52a8 %+d%%"), linesCleared, gamblerBonusPercent); + } else { _stprintf_s(feedbackDetail, _T("\u6d88\u884c %d \u8fde\u51fb %d"), linesCleared, rogueStats.comboChain); diff --git a/src/source/TetrisRender.cpp b/src/source/TetrisRender.cpp index 9590c0f..6a3d039 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\u3001\u51cf\u538b\u3001\u6e05\u626b\u8005\u3001\u7206\u7834\u65b9\u5757\u3001\u7a33\u5b9a\u7ed3\u6784\u3001\u53cc\u500d\u6210\u957f\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\u3001\u7206\u7834\u65b9\u5757\u3001\u7a33\u5b9a\u7ed3\u6784\u3001\u53cc\u500d\u6210\u957f\u3001\u65b9\u5757\u6539\u8fd0\u3001\u8d4c\u5f92\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, @@ -699,6 +699,25 @@ void TDrawScreen(HDC hdc, HWND hWnd) TextOut(hdc, combatRect.left + SS(18), combatRect.top + SS(178), growthText, lstrlen(growthText)); } + if (rogueStats.luckyRollLevel > 0) + { + TCHAR luckyText[96]; + _stprintf_s(luckyText, _T("\u6539\u8fd0\u91cd\u63b7 %d \u6b21"), rogueStats.luckyRollLevel > 3 ? 3 : rogueStats.luckyRollLevel); + TextOut(hdc, combatRect.left + SS(18), combatRect.top + SS(210), luckyText, lstrlen(luckyText)); + } + + if (rogueStats.gamblerLevel > 0) + { + TCHAR gamblerText[96]; + int variance = 20 + (rogueStats.gamblerLevel - 1) * 10; + if (variance > 50) + { + variance = 50; + } + _stprintf_s(gamblerText, _T("\u8d4c\u5f92\u6ce2\u52a8 \u00b1%d%%"), variance); + TextOut(hdc, combatRect.left + SS(18), combatRect.top + SS(242), gamblerText, lstrlen(gamblerText)); + } + RECT upgradeListRect = { panelRect.left + SS(20), @@ -769,6 +788,14 @@ void TDrawScreen(HDC hdc, HWND hWnd) { _stprintf_s(upgradeSummary + lstrlen(upgradeSummary), 512 - lstrlen(upgradeSummary), _T("\u53cc\u500d\u6210\u957f Lv.%d\r\n"), rogueStats.doubleGrowthLevel); } + if (rogueStats.luckyRollLevel > 0) + { + _stprintf_s(upgradeSummary + lstrlen(upgradeSummary), 512 - lstrlen(upgradeSummary), _T("\u65b9\u5757\u6539\u8fd0 Lv.%d\r\n"), rogueStats.luckyRollLevel); + } + if (rogueStats.gamblerLevel > 0) + { + _stprintf_s(upgradeSummary + lstrlen(upgradeSummary), 512 - lstrlen(upgradeSummary), _T("\u8d4c\u5f92 Lv.%d\r\n"), rogueStats.gamblerLevel); + } 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"));