Merge branch 'bugfix-1.18.5' into develop

showa-yojyo · Sep 26, 2024 · 341dfa0 · 341dfa0
2 parents 172b60c + fbf4e1b
commit 341dfa0
Show file tree

Hide file tree

Showing 74 changed files with 634 additions and 501 deletions.
diff --git a/.github/workflows/build-docbook.yml b/.github/workflows/build-docbook.yml
@@ -0,0 +1,57 @@
+name: Build and deploy dqbook
+on:
+  push:
+    branches: [master, develop]
+  pull_request:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository }}
+          token: ${{ github.token }}
+
+      - name: Set up Pages
+        id: pages
+        uses: actions/configure-pages@v5
+
+      - name: Set up DocBook
+        run: |
+          sudo apt update
+          sudo apt install -y docbook-xml docbook-xsl libxml2-utils xsltproc
+
+      - name: Build document
+        run: make -C ./src/jp html-chunk
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: ./build/jp/html-chunk
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,3 @@
-html-chunk/
+build/
 www/
-
-*.pdf
-*.html
-*.tar.bz2
-*.xls
-*.zip
-
 version.xml
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,7 +6,7 @@
         {
             "label": "Build (jp)",
             "type": "shell",
-            "command": "make -C ${workspaceFolder}/src/jp html-chunk",
+            "command": "make -C ${workspaceFolder}/src/jp html-chunk XSLTPROC=/usr/bin/xsltproc XMLLINT=/usr/bin/xmllint",
             "group": {
                 "kind": "build",
                 "isDefault": true

diff --git a/README.md b/README.md
@@ -1,41 +1,51 @@
 # ドラクエ命
 
-This is a book that describes how the data structure and program of
-Dragon Quest series are.
+This is a book that describes how the data structure and program of Dragon Quest
+series are.
 
 ## How to Build
 
-For example, do as follows:
-
 ```console
-bash$ git clone https://github.com/showa-yojyo/dqbook.git
-bash$ git clone --single-branch --branch https://github.com/showa-yojyo/dqbook.git dqbook-gh-pages # developers only
-bash$ cd dqbook/src/jp
-bash$ make html-chunk
-bash$ src/tools/gh-pages.sh # developers only
+$ git clone https://github.com/showa-yojyo/dqbook.git
+...
+$ git clone --single-branch --branch https://github.com/showa-yojyo/dqbook.git dqbook-gh-pages # developers only
+...
+$ cd dqbook
+$ make -C /src/jp html-chunk
+...
+$ ./src/tools/gh-pages.sh # developers only
+...
 ```
 
-If you don't use Git, you have to download the repository archive file from
-the project page.
-
-The document will be generated in the directory `dqbook/src/jp/book/html-chunk`.
+The document will be generated in the directory `dqbook/build/jp/html-chunk`.
 
 ### Requirements
 
+To set up the build environment, run the following command:
+
+```console
+$ sudo apt update
+...
+$ sudo apt install make docbook-xml docbook-xsl libxml2-utils xsltproc fop
+```
+
 * [Docbook][1] (version 4.5; docbook, docbook-xsl)
-* Make tool
-* Xsltproc tool
-* `xmllint` program (libxml2-utils)
+* [GNU Make][2] tool
+* [Xsltproc][3] program
+* `xmllint` program
 
 ## License
 
-See the ``LICENSE`` file under the installation directory.
+See the [LICENSE](./LICENSE) file.
 
 ## Authors
 
 * プレハブ小屋
-  * Web site (GitHub): [プレハブ小屋](https://github.com/showa-yojyo/)
-  * E-mail: [email protected]
-  * Twitter: [@showa_yojyo](https://twitter.com/showa_yojyo)
+  * GitHub: [showa-yojyo](https://github.com/showa-yojyo/)
+  * Docker Hub: [showayojyo](https://hub.docker.com/u/showayojyo)
+  * E-mail: <[email protected]>
+  * Twitter: [showa_yojyo](https://twitter.com/showa_yojyo)
 
 [1]: http://www.docbook.org/ "Docbook"
+[2]: https://www.gnu.org/software/make/ "GNU Make"
+[3]: http://xmlsoft.org/XSLT/xsltproc2.html "xsltproc"
diff --git a/src/jp/book/appendix_b.xml b/src/jp/book/appendix_b.xml
@@ -45,7 +45,7 @@
   </listitem>
   <listitem>
     <para>
-      値がメモリアドレス、ビットマスク、配列インデックスのどれかを表すものならば、十六進数表記とする。
+      値がメモリーアドレス、ビットマスク、配列インデックスのどれかを表すものならば、十六進数表記とする。
       この場合、<literal>0x</literal> や <literal>#$</literal> 等の接頭辞を付したり付さなかったりする。
     </para>
   </listitem>

diff --git a/src/jp/book/appendix_dq4.xml b/src/jp/book/appendix_dq4.xml
@@ -10,13 +10,10 @@
 放置状態。
 </para>
 <simplelist type="vert" columns="1">
-  <member><ulink url="./data/dq7_act.txt"><filename>dq7_act.txt</filename></ulink></member>
-  <member><ulink url="./data/dq7_ch2.txt"><filename>dq7_ch2.txt</filename></ulink></member>
-  <member><ulink url="./data/dq7_kiefer_talk_b.txt"><filename>dq7_kiefer_talk_b.txt</filename></ulink></member>
-  <member><ulink url="./data/dq7_rura1.txt"><filename>dq7_rura1.txt</filename></ulink></member>
-  <member><ulink url="./data/dq7_r.txt"><filename>dq7_r.txt</filename></ulink></member>
-  <member><ulink url="./data/dq7_imm.txt"><filename>dq7_imm.txt</filename></ulink></member>
-  <member><ulink url="./data/dq7_item.txt"><filename>dq7_item.txt</filename></ulink></member>
-  <member><ulink url="./data/dq7_monster_parameter.txt"><filename>dq7_monster_parameter.txt</filename></ulink></member>
+  <member><ulink url="./data/dq4_act.txt"><filename>dq4_act.txt</filename></ulink></member>
+  <member><ulink url="./data/dq4_imm.txt"><filename>dq4_imm.txt</filename></ulink></member>
+  <member><ulink url="./data/dq4_item.txt"><filename>dq4_item.txt</filename></ulink></member>
+  <member><ulink url="./data/dq4_level.txt"><filename>dq4_level.txt</filename></ulink></member>
+  <member><ulink url="./data/dq4_monster.txt"><filename>dq4_monster.txt</filename></ulink></member>
 </simplelist>
 </simplesect> <!-- appendix.b.dq4 -->
diff --git a/src/jp/book/appendix_dq7.xml b/src/jp/book/appendix_dq7.xml
@@ -10,10 +10,13 @@
 放置状態。
 </para>
 <simplelist type="vert" columns="1">
-  <member><ulink url="./data/dq4_act.txt"><filename>dq4_act.txt</filename></ulink></member>
-  <member><ulink url="./data/dq4_imm.txt"><filename>dq4_imm.txt</filename></ulink></member>
-  <member><ulink url="./data/dq4_item.txt"><filename>dq4_item.txt</filename></ulink></member>
-  <member><ulink url="./data/dq4_level.txt"><filename>dq4_level.txt</filename></ulink></member>
-  <member><ulink url="./data/dq4_monster.txt"><filename>dq4_monster.txt</filename></ulink></member>
+  <member><ulink url="./data/dq7_act.txt"><filename>dq7_act.txt</filename></ulink></member>
+  <member><ulink url="./data/dq7_ch2.txt"><filename>dq7_ch2.txt</filename></ulink></member>
+  <member><ulink url="./data/dq7_kiefer_talk_b.txt"><filename>dq7_kiefer_talk_b.txt</filename></ulink></member>
+  <member><ulink url="./data/dq7_rura1.txt"><filename>dq7_rura1.txt</filename></ulink></member>
+  <member><ulink url="./data/dq7_r.txt"><filename>dq7_r.txt</filename></ulink></member>
+  <member><ulink url="./data/dq7_imm.txt"><filename>dq7_imm.txt</filename></ulink></member>
+  <member><ulink url="./data/dq7_item.txt"><filename>dq7_item.txt</filename></ulink></member>
+  <member><ulink url="./data/dq7_monster_parameter.txt"><filename>dq7_monster_parameter.txt</filename></ulink></member>
 </simplelist>
 </simplesect> <!-- appendix.b.dq7 -->
diff --git a/src/jp/book/data/dq5_238000_monsters.txt b/src/jp/book/data/dq5_238000_monsters.txt
@@ -124,7 +124,7 @@
 ベロゴンロード:48:95:40:110:0:180:35:0:0:0:4:0:0:0:0:58:0:0:0:0:0:0:2:1:1:1:2:1:0:3:3:1:0:0:1:1:メッセージ５:なめまわし:メッセージ５:たたかう:なめまわし:たたかう:かしこさのたね:n/a
 ジェリーマン:120:95:30:400:30:550:85:0:2:0:4:0:0:0:0:53:0:0:0:0:1:1:0:1:2:2:1:1:1:3:2:1:0:1:2:2:モシャス:モシャス:たたかう:モシャス:たたかう:モシャス:ちいさなメダル:n/a
 のろいのマスク:65:90:90:70:0:210:40:0:1:0:3:0:1:0:0:21:0:0:2:2:2:3:2:1:2:2:1:1:0:3:3:2:0:2:3:0:たたかう:（動きを呪う）:たたかう:（HP を呪う）:たたかう:（動きを呪う）:てっかめん:n/a
-オークキング:60:110:65:85:20:235:65:0:2:0:2:5:1:0:0:20:0:0:0:1:2:1:0:1:3:1:2:2:1:2:0:2:0:1:2:3:たたかう:ザオラル:たたかう:ザオラル:たたかう:たたかう:けがわのマント:キングオーク
+オークキング:60:110:65:85:20:235:65:0:2:0:2:5:1:0:0:20:0:0:0:1:2:1:0:1:3:1:2:2:1:2:0:2:0:1:2:3:たたかう:ザオラル:たたかう:ザオラル:たたかう:たたかう:けがわのマント:オークキング
 ダミー１７:35:75:116:180:255:0:0:1:0:0:7:0:0:0:0:9:0:0:0:0:0:0:0:0:3:3:3:3:3:3:3:3:3:3:3:3:たたかう:たたかう:ラリホーマ:たたかう:たたかう:ラリホーマ:ちからのたね:n/a
 ガボット:52:105:62:100:0:190:55:0:0:0:3:0:1:0:0:20:0:0:1:1:1:0:0:0:1:1:1:1:1:3:3:0:0:1:2:1:たたかう:もうどくのきり:たたかう:もうどくのきり:たたかう:（逃げる）:どくけしそう:n/a
 シールドヒッポ:45:105:120:90:0:202:60:0:0:0:2:0:0:0:0:0:0:0:1:2:2:2:2:1:2:2:1:2:0:3:3:1:0:1:1:1:たたかう:みをまもる２:たたかう:みをまもる２:たたかう:みをまもる２:てつのたて:n/a

diff --git a/src/jp/book/data/dq5_239E41_human_progression.txt b/src/jp/book/data/dq5_239E41_human_progression.txt
@@ -1,12 +1,12 @@
-Name:Section:FirstExp:Level0:Level1:Level2:Level3:Level4:Level5:Level6:ExpA0:ExpB0:ExpA1:ExpB1:ExpA2:ExpB2:ExpA3:ExpB3:ExpA4:ExpB4:ExpA5:ExpB5:ExpA6:ExpB6:ExpA7:ExpB7:MHP0:MHP1:MHP2:MHP3:MHP4:MHP5:MHP6:MHP7:MHP8:MMP0:MMP1:MMP2:MMP3:MMP4:MMP5:MMP6:MMP7:MMP8:STR0:STR1:STR2:STR3:STR4:STR5:STR6:STR7:STR8:AGL0:AGL1:AGL2:AGL3:AGL4:AGL5:AGL6:AGL7:AGL8:DEF0:DEF1:DEF2:DEF3:DEF4:DEF5:DEF6:DEF7:DEF8:INT0:INT1:INT2:INT3:INT4:INT5:INT6:INT7:INT8:LCK0:LCK1:LCK2:LCK3:LCK4:LCK5:LCK6:LCK7:LCK8
-主人公:7:19:5:10:15:20:30:45:60:2:2:1:18:1:10:1:6:1:4:1:3:1:0:1:0:24:20:38:58:78:118:170:214:255:0:7:14:23:31:60:85:125:250:11:23:38:49:65:105:149:185:255:5:11:21:35:55:75:102:150:200:6:10:21:33:45:52:72:90:180:4:4:4:8:31:61:94:121:242:3:6:11:16:22:34:45:65:130
-クーパー:7:175:5:10:15:20:30:45:60:2:14:1:3:1:1:1:6:1:6:1:3:1:0:1:0:50:37:59:65:90:102:162:200:255:5:6:14:24:32:52:90:110:220:15:35:51:62:73:99:123:160:255:20:44:52:60:71:83:95:120:255:10:25:25:30:50:65:70:88:170:13:23:29:34:41:52:82:100:200:12:22:26:30:38:42:50:65:130
-アニー:7:200:5:10:15:20:30:45:60:2:19:1:1:1:3:1:6:1:4:1:4:1:0:1:0:40:33:47:63:92:106:135:165:255:6:12:15:27:36:70:95:155:255:2:8:19:33:40:47:50:85:170:20:60:72:77:85:90:115:200:255:10:30:30:47:68:100:130:210:255:10:31:50:50:70:90:132:200:255:4:18:30:43:57:61:75:90:180
-ビアンカ:7:18:5:10:15:20:30:45:60:1:19:1:15:1:8:1:13:1:2:1:5:1:0:1:0:18:16:30:42:62:95:145:175:255:0:9:23:25:32:60:145:186:255:3:11:21:30:45:50:55:70:140:10:18:28:45:70:95:120:181:255:20:28:34:50:72:95:115:148:255:2:8:23:30:40:65:145:189:255:5:9:14:20:49:62:68:75:150
-ビアンカ:7:18:5:10:15:20:30:45:60:1:19:1:15:1:8:1:13:1:2:1:5:1:0:1:0:18:16:30:42:62:95:145:175:255:0:9:23:25:32:60:145:186:255:3:11:21:30:45:50:55:70:140:10:18:28:45:70:95:120:181:255:20:28:34:50:72:95:115:148:255:2:8:23:30:40:65:145:189:255:5:9:14:20:49:62:68:75:150
-サンチョ:7:20:5:10:15:20:30:45:60:1:24:1:15:1:6:1:12:1:4:1:3:1:1:1:0:1:0:0:52:107:165:200:225:255:0:0:0:7:12:25:40:55:110:6:20:30:54:74:114:130:190:255:5:13:23:33:35:40:43:60:120:5:9:14:25:31:31:44:65:130:3:7:12:18:21:60:72:105:210:1:5:10:17:20:28:30:60:120
-ピピン:7:244:5:10:15:20:30:45:60:1:26:1:3:1:4:1:3:1:6:1:4:1:0:1:0:80:50:65:75:101:140:160:190:255:0:0:0:0:0:0:0:0:0:40:50:52:66:82:123:154:179:255:35:37:40:45:50:67:83:103:210:20:25:32:38:40:50:67:84:150:15:21:21:26:30:37:41:67:135:29:29:30:33:35:38:42:55:110
-フローラ:7:180:5:10:15:20:30:45:60:2:18:1:0:1:4:1:4:1:6:1:3:1:1:1:0:72:42:50:65:75:100:155:180:255:35:24:28:36:50:75:150:193:255:25:30:35:37:39:40:48:70:130:28:40:50:63:85:107:125:191:255:35:40:47:53:68:110:150:165:255:23:23:23:40:45:50:125:143:255:31:38:45:50:55:70:90:110:170
-パパス:7:12:5:10:20:30:40:60:80:1:25:1:14:1:11:1:3:1:5:1:0:1:1:0:31:26:21:41:91:153:233:255:255:255:0:0:0:0:0:0:0:0:0:7:19:34:74:124:184:209:230:248:4:8:13:23:33:43:63:83:102:1:1:6:16:26:31:31:31:31:2:6:11:21:31:41:61:81:100:4:8:13:23:33:43:63:83:102
-ヘンリー:6:18:5:10:15:20:30:50:50:4:12:1:2:1:14:1:5:1:4:1:2:1:0:0:0:50:31:42:50:61:90:110:110:110:14:14:22:32:35:40:49:49:49:25:29:35:47:58:75:150:150:150:10:15:25:36:52:99:200:200:200:20:26:30:40:50:73:130:130:130:16:20:28:30:47:100:170:170:170:12:15:18:22:28:56:123:123:123
-ベラ:7:20:5:10:20:30:40:60:80:2:0:1:16:1:11:1:2:1:5:1:1:1:0:0:31:18:17:27:47:67:87:130:150:169:7:17:21:41:61:81:130:134:153:4:12:22:42:62:84:130:151:169:4:12:22:42:60:70:108:188:255:6:14:24:44:69:99:159:219:255:6:18:33:67:93:123:143:163:182:4:12:22:42:60:70:108:188:255
+Name:Section:FirstExp:Level0:Level1:Level2:Level3:Level4:Level5:Level6:ExpA0:ExpB0:ExpA1:ExpB1:ExpA2:ExpB2:ExpA3:ExpB3:ExpA4:ExpB4:ExpA5:ExpB5:ExpA6:ExpB6:ExpA7:ExpB7:MHP0:MHP1:MHP2:MHP3:MHP4:MHP5:MHP6:MHP7:MHP8:MMP0:MMP1:MMP2:MMP3:MMP4:MMP5:MMP6:MMP7:MMP8:STR0:STR1:STR2:STR3:STR4:STR5:STR6:STR7:STR8:AGL0:AGL1:AGL2:AGL3:AGL4:AGL5:AGL6:AGL7:AGL8:INT0:INT1:INT2:INT3:INT4:INT5:INT6:INT7:INT8:LCK0:LCK1:LCK2:LCK3:LCK4:LCK5:LCK6:LCK7:LCK8:DEF0:DEF1:DEF2:DEF3:DEF4:DEF5:DEF6:DEF7:DEF8
+主人公:7:19:5:10:15:20:30:45:60:2:2:1:18:1:10:1:6:1:4:1:3:1:0:1:0:24:20:38:58:78:118:170:214:255:0:7:14:23:31:60:85:125:250:11:23:38:49:65:105:149:185:255:5:11:21:35:55:75:102:150:200:4:4:4:8:31:61:94:121:242:3:6:11:16:22:34:45:65:130:6:10:21:33:45:52:72:90:180
+クーパー:7:175:5:10:15:20:30:45:60:2:14:1:3:1:1:1:6:1:6:1:3:1:0:1:0:50:37:59:65:90:102:162:200:255:5:6:14:24:32:52:90:110:220:15:35:51:62:73:99:123:160:255:20:44:52:60:71:83:95:120:255:13:23:29:34:41:52:82:100:200:12:22:26:30:38:42:50:65:130:10:25:25:30:50:65:70:88:170
+アニー:7:200:5:10:15:20:30:45:60:2:19:1:1:1:3:1:6:1:4:1:4:1:0:1:0:40:33:47:63:92:106:135:165:255:6:12:15:27:36:70:95:155:255:2:8:19:33:40:47:50:85:170:20:60:72:77:85:90:115:200:255:10:31:50:50:70:90:132:200:255:4:18:30:43:57:61:75:90:180:10:30:30:47:68:100:130:210:255
+ビアンカ:7:18:5:10:15:20:30:45:60:1:19:1:15:1:8:1:13:1:2:1:5:1:0:1:0:18:16:30:42:62:95:145:175:255:0:9:23:25:32:60:145:186:255:3:11:21:30:45:50:55:70:140:10:18:28:45:70:95:120:181:255:2:8:23:30:40:65:145:189:255:5:9:14:20:49:62:68:75:150:20:28:34:50:72:95:115:148:255
+ビアンカ:7:18:5:10:15:20:30:45:60:1:19:1:15:1:8:1:13:1:2:1:5:1:0:1:0:18:16:30:42:62:95:145:175:255:0:9:23:25:32:60:145:186:255:3:11:21:30:45:50:55:70:140:10:18:28:45:70:95:120:181:255:2:8:23:30:40:65:145:189:255:5:9:14:20:49:62:68:75:150:20:28:34:50:72:95:115:148:255
+サンチョ:7:20:5:10:15:20:30:45:60:1:24:1:15:1:6:1:12:1:4:1:3:1:1:1:0:1:0:0:52:107:165:200:225:255:0:0:0:7:12:25:40:55:110:6:20:30:54:74:114:130:190:255:5:13:23:33:35:40:43:60:120:3:7:12:18:21:60:72:105:210:1:5:10:17:20:28:30:60:120:5:9:14:25:31:31:44:65:130
+ピピン:7:244:5:10:15:20:30:45:60:1:26:1:3:1:4:1:3:1:6:1:4:1:0:1:0:80:50:65:75:101:140:160:190:255:0:0:0:0:0:0:0:0:0:40:50:52:66:82:123:154:179:255:35:37:40:45:50:67:83:103:210:15:21:21:26:30:37:41:67:135:29:29:30:33:35:38:42:55:110:20:25:32:38:40:50:67:84:150
+フローラ:7:180:5:10:15:20:30:45:60:2:18:1:0:1:4:1:4:1:6:1:3:1:1:1:0:72:42:50:65:75:100:155:180:255:35:24:28:36:50:75:150:193:255:25:30:35:37:39:40:48:70:130:28:40:50:63:85:107:125:191:255:23:23:23:40:45:50:125:143:255:31:38:45:50:55:70:90:110:170:35:40:47:53:68:110:150:165:255
+パパス:7:12:5:10:20:30:40:60:80:1:25:1:14:1:11:1:3:1:5:1:0:1:1:0:31:26:21:41:91:153:233:255:255:255:0:0:0:0:0:0:0:0:0:7:19:34:74:124:184:209:230:248:4:8:13:23:33:43:63:83:102:2:6:11:21:31:41:61:81:100:4:8:13:23:33:43:63:83:102:1:1:6:16:26:31:31:31:31
+ヘンリー:6:18:5:10:15:20:30:50:50:4:12:1:2:1:14:1:5:1:4:1:2:1:0:0:0:50:31:42:50:61:90:110:110:110:14:14:22:32:35:40:49:49:49:25:29:35:47:58:75:150:150:150:10:15:25:36:52:99:200:200:200:16:20:28:30:47:100:170:170:170:12:15:18:22:28:56:123:123:123:20:26:30:40:50:73:130:130:130
+ベラ:7:20:5:10:20:30:40:60:80:2:0:1:16:1:11:1:2:1:5:1:1:1:0:0:31:18:17:27:47:67:87:130:150:169:7:17:21:41:61:81:130:134:153:4:12:22:42:62:84:130:151:169:4:12:22:42:60:70:108:188:255:6:18:33:67:93:123:143:163:182:4:12:22:42:60:70:108:188:255:6:14:24:44:69:99:159:219:255