From 1499dce5f7726983d469c36fda118831e9d85390 Mon Sep 17 00:00:00 2001
From: Hiraoka <kakkokakko@gmail.com>
Date: Sat, 20 Jul 2024 14:59:17 +0900
Subject: [PATCH] Bump version of unofficial release to patched074_240720b

---
 unofficial_release/Makefile       | 19 +++++++++++--------
 unofficial_release/README.html    | 14 ++++++++------
 unofficial_release/README_ja.html | 12 +++++++-----
 unofficial_release/config.txt     |  8 ++++----
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/unofficial_release/Makefile b/unofficial_release/Makefile
index 58ba501e..f9d94a1d 100644
--- a/unofficial_release/Makefile
+++ b/unofficial_release/Makefile
@@ -1,21 +1,24 @@
-VERSION = 231231a
+VERSION = 240720b
 ZIP_NAME = tmp_Lizzie-patched-0.7.4_$(VERSION).zip
 FILES = Lizzie.vbs README.html README_ja.html config.txt jar jre katago
 
 KATA_DIR = katago
-KATA_URL1 = https://github.com/lightvector/KataGo/releases/download/v1.14.0/katago-v1.14.0-eigen-windows-x64.zip
-KATA_URL2 = https://github.com/lightvector/KataGo/releases/download/v1.14.0/katago-v1.14.0-eigenavx2-windows-x64.zip
-KATA_URL3 = https://github.com/lightvector/KataGo/releases/download/v1.14.0/katago-v1.14.0-opencl-windows-x64.zip
-KATA_MODEL_URL = https://media.katagotraining.org/uploaded/networks/models/kata1/kata1-b15c192-s1672170752-d466197061.txt.gz
+# KATA_URL1 = https://github.com/lightvector/KataGo/releases/download/v1.15.1/katago-v1.15.1-eigen-windows-x64.zip
+KATA_URL2 = https://github.com/lightvector/KataGo/releases/download/v1.15.1/katago-v1.15.1-eigenavx2-windows-x64.zip
+KATA_URL3 = https://github.com/lightvector/KataGo/releases/download/v1.15.1/katago-v1.15.1-opencl-windows-x64.zip
+KATA_MODEL_URL = https://media.katagotraining.org/uploaded/networks/models/kata1/kata1-b18c384nbt-s9996604416-d4316597426.bin.gz
+KATA_HUMANMODEL_URL = https://github.com/lightvector/KataGo/releases/download/v1.15.0/b18c384nbt-humanv0.bin.gz
 
 zip:
 	zip -r $(ZIP_NAME) $(FILES)
 
 kata:
-	\wget -O tmp_kata1.zip $(KATA_URL1)
+	mkdir -p $(KATA_DIR)
+#	\wget -O tmp_kata1.zip $(KATA_URL1)
 	\wget -O tmp_kata2.zip $(KATA_URL2)
 	\wget -O tmp_kata3.zip $(KATA_URL3)
-	cd $(KATA_DIR); unzip -o ../tmp_kata1.zip; mv katago.exe katago-eigen.exe
+#	cd $(KATA_DIR); unzip -o ../tmp_kata1.zip; mv katago.exe katago-eigen.exe
 	cd $(KATA_DIR); unzip -o ../tmp_kata2.zip; mv katago.exe katago-eigenavx2.exe
 	cd $(KATA_DIR); unzip -o ../tmp_kata3.zip; mv katago.exe katago-opencl.exe
-	cd $(KATA_DIR); \wget -O default_model.txt.gz $(KATA_MODEL_URL)
+	cd $(KATA_DIR); \wget -O default_model.bin.gz $(KATA_MODEL_URL)
+	cd $(KATA_DIR); \wget -O human_model.bin.gz $(KATA_HUMANMODEL_URL)
diff --git a/unofficial_release/README.html b/unofficial_release/README.html
index 08f5a974..c508ee7a 100644
--- a/unofficial_release/README.html
+++ b/unofficial_release/README.html
@@ -15,19 +15,20 @@ <h1>Lizzie patched-0.7.4</h1>
 <h2>Contents</h2>
 
 <ul>
-<li>Lizzie: <a href="https://github.com/featurecat/lizzie/issues/798">patched-0.7.4</a> on 2023-12-31 (Major bugs in Lizzie 0.7.4 are fixed.)</li>
-<li>KataGo: <a href="https://github.com/lightvector/KataGo/releases/tag/v1.14.0">1.14.0</a> + <a href="https://katagotraining.org/networks/">15 blocks network</a> (kata1-b15c192-s1672)</li>
+<li>Lizzie: <a href="https://github.com/featurecat/lizzie/issues/798">patched-0.7.4</a> on 2024-07-20 (Major bugs in Lizzie 0.7.4 are fixed.)</li>
+<li>KataGo: <a href="https://github.com/lightvector/KataGo/releases/tag/v1.15.1">1.15.1</a> + <a href="https://katagotraining.org/networks/">18 block network</a> (kata1-b18c384nbt-s9996) + human SL model (b18c384nbt-humanv0)</li>
 <li>Java: minimum runtime environment for Lizzie (from <a href="http://openjdk.java.net/">OpenJDK 11</a>)
 </li>
 </ul>
 
 <h2>Usage</h2>
 
-<font color="red">Right-click the downloaded file to UNZIP it (Never double-click the zip file directly to open it).</font> Then just double-click "Lizzie" (Lizzie.vbs) in it. Hit SPACE key to stop/start analysis. You may want to switch the rule from "Analyze" menu. You can also switch three AIs from "Engine" menu:
+<font color="red">Right-click the downloaded file to UNZIP it (Never double-click the zip file directly to open it).</font> Then just double-click "Lizzie" (Lizzie.vbs) in it. Press SPACE key to stop/start analysis. You may want to switch the rule from "Analyze" menu. You can also switch among four AIs from "Engine" menu:
 <ul>
-<li>KataGo (CPU): slow but safe for old/low-end PC</li>
-<li>KataGo (Modern CPU): faster</li>
-<li>KataGo (GPU): much faster if your GPU works successfully. Note that it takes long time for initial tuning at the first run.</li>
+<li>KataGo (CPU): Slow but simple to use</li>
+<li>KataGo (GPU): Faster if your GPU works properly. Note that the initial tuning takes a long time on the first run.</li>
+<li>Human-like (CPU): Play against human-like AI. You can set the humanSL profile, e.g., "rank_5k" (5 kyu) or "proyear_1960" (professional style in 1960), from the Game menu. This doesn't affect the analysis; it only impacts the gameplay.</li>
+<li>Human-like (GPU): Same as above.</li>
 </ul>
 
 <h2>Original feature</h2>
@@ -53,6 +54,7 @@ <h2>License</h2>
 <h2>Changes</h2>
 
 <ul>
+<li>240720a: KataGo 1.15.1, human-like play, removed old CPU support</li>
 <li>231231a: KataGo 1.14.0, stone entropy plot, minor fixes</li>
 <li>220510a: KataGo 1.11.0, fix of flicker in auto-analysis</li>
 <li>211211b: workaround for non-ASCII path names again (thx &gt; Eba san)</li>
diff --git a/unofficial_release/README_ja.html b/unofficial_release/README_ja.html
index 57d2dfb3..b1b74f6f 100644
--- a/unofficial_release/README_ja.html
+++ b/unofficial_release/README_ja.html
@@ -15,19 +15,20 @@ <h1>Lizzie patched-0.7.4</h1>
 <h2>内容</h2>
 
 <ul>
-<li>Lizzie: <a href="https://github.com/featurecat/lizzie/issues/798">patched-0.7.4</a> 2023-12-31版 (Lizzie 0.7.4の大バグも修正済)</li>
-<li>KataGo: <a href="https://github.com/lightvector/KataGo/releases/tag/v1.14.0">1.14.0</a> + <a href="https://katagotraining.org/networks/">15ブロックネットワーク</a> (kata1-b15c192-s1672)</li>
+<li>Lizzie: <a href="https://github.com/featurecat/lizzie/issues/798">patched-0.7.4</a> 2024-07-20版 (Lizzie 0.7.4の大バグも修正済)</li>
+<li>KataGo: <a href="https://github.com/lightvector/KataGo/releases/tag/v1.15.1">1.15.1</a> + <a href="https://katagotraining.org/networks/">18ブロックネットワーク</a> (kata1-b18c384nbt-s9996) + 人間風モデル (b18c384nbt-humanv0)</li>
 <li>Java: Lizzieに必要な最低限の実行環境入り (<a href="http://openjdk.java.net/">OpenJDK 11</a>より)
 </li>
 </ul>
 
 <h2>使い方</h2>
 
-<font color="red">ダウンロードしたzipファイルをまず右クリックして「展開」します（展開せずにそのままダブルクリックで開いてはいけません）。</font>あとはその中の「Lizzie」(Lizzie.vbs)をダブルクリックするだけ。分析の停止・再開はスペースキー。ルールを切りかえたければ「分析」メニューから。「エンジン」メニューでは3種類のAIを選べます。
+<font color="red">ダウンロードしたzipファイルをまず右クリックして「展開」します（展開せずにそのままダブルクリックで開いてはいけません）。</font>あとはその中の「Lizzie」(Lizzie.vbs)をダブルクリックするだけ。分析の停止・再開はスペースキー。ルールを切りかえたければ「分析」メニューから。「エンジン」メニューでは4種類のAIを選べます。
 <ul>
-<li>KataGo (CPU): 遅いけれど、古めで性能低めのPCでも動くかも</li>
-<li>KataGo (Modern CPU): こちらのほうが速い</li>
+<li>KataGo (CPU): 遅いけれど手軽</li>
 <li>KataGo (GPU): GPUがうまく動けば圧倒的に速い。ただし、初回は長時間のチューニングが必要。</li>
+ <li>Human-like (CPU): 人間風AIとの対戦用。「対局」メニューの「人間風設定」から、「rank_5k」（5級）や「proyear_1960」（1960年のプロ）などを選べる。この設定は対戦専用なので、解析には影響しない。</li>
+<li>Human-like (GPU): 同上</li>
 </ul>
 
 <h2>独自機能</h2>
@@ -53,6 +54,7 @@ <h2>ライセンス</h2>
 <h2>更新履歴</h2>
 
 <ul>
+<li>240720a: KataGo 1.15.1, 人間風の打ち方, 古いCPUのサポートを廃止</li>
 <li>231231a: KataGo 1.14.0, 石の生死のあいまいさをプロット, その他微修正</li>
 <li>220510a: KataGo 1.11.0, 自動解析時のちらつきを修正</li>
 <li>211211b: 日本語フォルダ名でのエラーを再回避 (thx &gt; 江場さん)</li>
diff --git a/unofficial_release/config.txt b/unofficial_release/config.txt
index 7bad1bba..3bde4549 100644
--- a/unofficial_release/config.txt
+++ b/unofficial_release/config.txt
@@ -12,9 +12,9 @@
       false
     ],
     "engine-command-list": [
-      "<KataGo (Modern CPU)> katago/katago-eigenavx2 gtp -config katago/default_gtp.cfg -model katago/default_model.txt.gz",
-      "<KataGo (GPU)> katago/katago-opencl gtp -config katago/default_gtp.cfg -model katago/default_model.txt.gz",
-      "",
+      "<KataGo (GPU)> katago/katago-opencl gtp -config katago/default_gtp.cfg -model katago/default_model.bin.gz",
+      "<Human-like (CPU)> katago/katago-eigenavx2 gtp -config katago/gtp_human5k_example.cfg -model katago/default_model.bin.gz -human-model katago/human_model.bin.gz",
+      "<Human-like (GPU)> katago/katago-opencl gtp -config katago/gtp_human5k_example.cfg -model katago/default_model.bin.gz -human-model katago/human_model.bin.gz",
       "",
       "",
       "",
@@ -29,7 +29,7 @@
     "max-game-thinking-time-seconds": 2,
     "engine-start-location": ".",
     "avoid-keep-variations": 30,
-    "engine-command": "<KataGo (CPU)> katago/katago-eigen gtp -config katago/default_gtp.cfg -model katago/default_model.txt.gz",
+    "engine-command": "<KataGo (CPU)> katago/katago-eigenavx2 gtp -config katago/default_gtp.cfg -model katago/default_model.bin.gz",
     "print-comms": false,
     "show-lcb-winrate": false
   },