organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support Skill Level (WIP)

This commit is contained in:
Calcitem 2021-02-17 01:06:54 +08:00
parent ed30ba8b80
commit 0a3a9caf45
10 changed files with 71 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mills.cpp
View File

@ -523,10 +523,32 @@ Depth getSearchDepth(const Position *pos)
}
}
// For debugging
if (unlikely(d > reduce)) {
d -= reduce;
}
assert(d <= 32);
// Make sure opening is OK
if (d <= 4) {
return d;
}
// Adjust depth for Skill Level
if (gameOptions.getSkillLevel() < 20) { // TODO
d -= gameOptions.getSkillLevel();
}
if (gameOptions.getSkillLevel() > 20) { // TODO
d += (gameOptions.getSkillLevel() - 25);
}
// Do not too weak
if (d <= 4) {
d == 4;
}
d += DEPTH_ADJUST;
d = d >= 1 ? d : 1;

11
src/option.h
View File

@ -24,6 +24,16 @@
class GameOptions
{
public:
void setSkillLevel(int val) noexcept
{
skillLevel = val;
}
int getSkillLevel() const noexcept
{
return skillLevel;
}
void setAutoRestart(bool enabled) noexcept
{
isAutoRestart = enabled;
@ -140,6 +150,7 @@ public:
protected:
private:
int skillLevel { 20 };
bool isAutoRestart { false };
bool isAutoChangeFirstMove { false };
bool resignIfMostLose { false };

7
src/ucioption.cpp
View File

@ -60,6 +60,11 @@ void on_threads(const Option &o)
Threads.set((size_t)o);
}
void on_skill_level(const Option &o)
{
gameOptions.setSkillLevel((int)o);
}
void on_random_move(const Option &o)
{
gameOptions.setShufflingEnabled((bool)o);
@ -145,7 +150,7 @@ void init(OptionsMap &o)
o["Clear Hash"] << Option(on_clear_hash);
o["Ponder"] << Option(false);
o["MultiPV"] << Option(1, 1, 500);
o["Skill Level"] << Option(20, 0, 20);
o["SkillLevel"] << Option(20, 0, 20, on_skill_level);
o["Move Overhead"] << Option(10, 0, 5000);
o["Slow Mover"] << Option(100, 10, 1000);
o["nodestime"] << Option(0, 0, 10000);

6
src/ui/flutter/lib/common/config.dart
View File

@ -25,7 +25,7 @@ class Config {
static bool toneEnabled = true;
static int thinkingTime = 5000;
static bool aiMovesFirst = false;
static int skillLevel = 20;
static bool isAutoRestart = false;
static bool isAutoChangeFirstMove = false;
static bool resignIfMostLose = false;
@ -55,7 +55,7 @@ class Config {
Config.toneEnabled = profile['tone-enabled'] ?? true;
Config.thinkingTime = profile['thinking-time'] ?? 5000;
Config.aiMovesFirst = profile['ai-moves-first'] ?? false;
Config.skillLevel = profile['skillLevel'] ?? 20;
Config.isAutoRestart = profile['isAutoRestart'] ?? false;
Config.isAutoChangeFirstMove = profile['isAutoChangeFirstMove'] ?? false;
Config.resignIfMostLose = profile['resignIfMostLose'] ?? false;
@ -99,7 +99,7 @@ class Config {
profile['tone-enabled'] = Config.toneEnabled;
profile['thinking-time'] = Config.thinkingTime;
profile['ai-moves-first'] = Config.aiMovesFirst;
profile['skillLevel'] = Config.skillLevel;
profile['isAutoRestart'] = Config.isAutoRestart;
profile['isAutoChangeFirstMove'] = Config.isAutoChangeFirstMove;
profile['resignIfMostLose'] = Config.resignIfMostLose;

1
src/ui/flutter/lib/engine/native_engine.dart
View File

@ -102,6 +102,7 @@ class NativeEngine extends AiEngine {
}
Future<void> setOptions() async {
await send('setoption name SkillLevel value ${Config.skillLevel}');
await send('setoption name Shuffling value ${Config.shufflingEnabled}');
await send('setoption name piecesCount value ${Config.piecesCount}');
await send(

6
src/ui/flutter/lib/l10n/intl_en.arb
View File

@ -244,9 +244,9 @@
"@settings": {
"description": "Settings"
},
"level": "Level",
"@level": {
"description": "Level"
"skillLevel": "skill Level",
"@skillLevel": {
"description": "skillLevel"
},
"sound": "Sound",
"@sound": {

2
src/ui/flutter/lib/l10n/intl_zh.arb
View File

@ -61,7 +61,7 @@
"chessRoad": "ChessRoad (棋路) by He Zhaoyun",
"nineChess": "NineChess (九联棋) by liuweilhy",
"settings": "游戏设置",
"level": "游戏难度",
"skillLevel": "游戏难度",
"sound": "声音",
"tone": "提示音效",
"leaderBoard": "排行榜",

28
src/ui/flutter/lib/widgets/settings_page.dart
View File

@ -51,14 +51,14 @@ class _SettingsPageState extends State<SettingsPage> {
});
}
changeDifficult() {
setSkillLevel() async {
//
callback(int thinkingTime) async {
callback(int skillLevel) async {
//
Navigator.of(context).pop();
setState(() {
Config.thinkingTime = thinkingTime;
Config.skillLevel = skillLevel;
});
Config.save();
@ -73,24 +73,24 @@ class _SettingsPageState extends State<SettingsPage> {
RadioListTile(
activeColor: UIColors.primaryColor,
title: Text('L1'),
groupValue: Config.thinkingTime,
value: 5000,
groupValue: Config.skillLevel,
value: 10,
onChanged: callback,
),
Divider(),
RadioListTile(
activeColor: UIColors.primaryColor,
title: Text('L2'),
groupValue: Config.thinkingTime,
value: 15000,
groupValue: Config.skillLevel,
value: 20,
onChanged: callback,
),
Divider(),
RadioListTile(
activeColor: UIColors.primaryColor,
title: Text('L3'),
groupValue: Config.thinkingTime,
value: 30000,
groupValue: Config.skillLevel,
value: 30,
onChanged: callback,
),
Divider(),
@ -488,7 +488,7 @@ class _SettingsPageState extends State<SettingsPage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
const SizedBox(height: 10.0),
Text(S.of(context).level, style: headerStyle),
Text(S.of(context).skillLevel, style: headerStyle),
const SizedBox(height: 10.0),
Card(
color: UIColors.boardBackgroundColor,
@ -497,18 +497,18 @@ class _SettingsPageState extends State<SettingsPage> {
child: Column(
children: <Widget>[
ListTile(
title: Text(S.of(context).level, style: itemStyle),
title: Text(S.of(context).skillLevel, style: itemStyle),
trailing:
Row(mainAxisSize: MainAxisSize.min, children: <Widget>[
Text(Config.thinkingTime <= 5000
Text(Config.skillLevel == 10
? 'L1'
: Config.thinkingTime <= 15000
: Config.skillLevel == 20
? 'L2'
: 'L3'),
Icon(Icons.keyboard_arrow_right,
color: UIColors.secondaryColor),
]),
onTap: changeDifficult,
onTap: setSkillLevel,
),
],
),

7
src/ui/qt/game.cpp
View File

@ -133,6 +133,7 @@ void Game::loadSettings()
setFixWindowSize(empty ? false : settings->value("Options/FixWindowSize").toBool());
setSound(empty ? true : settings->value("Options/Sound").toBool());
setAnimation(empty ? true : settings->value("Options/Animation").toBool());
setSkillLevel(empty ? true : settings->value("Options/SkillLevel").toInt());
setShuffling(empty ? true : settings->value("Options/Shuffling").toBool());
setResignIfMostLose(empty ? false : settings->value("Options/ResignIfMostLose").toBool());
setOpeningBook(empty ? false : settings->value("Options/OpeningBook").toBool());
@ -566,6 +567,12 @@ void Game::playSound(GameSound soundType, Color c)
#endif /* ! DONOT_PLAY_SOUND */
}
void Game::setSkillLevel(int val)
{
gameOptions.setSkillLevel(val);
settings->setValue("Options/SkillLevel", val);
}
void Game::setResignIfMostLose(bool enabled)
{
gameOptions.setResignIfMostLose(enabled);

3
src/ui/qt/game.h
View File

@ -233,6 +233,9 @@ public slots:
// Play the sound
static void playSound(GameSound soundType, Color c);
// Skill Level
void setSkillLevel(int val);
// Do you admit defeat when you lose
void setResignIfMostLose(bool enabled);