OSDN Git Service
deskull [Sun, 31 Jan 2021 02:22:47 +0000 (11:22 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-English-Bugs' into develop
deskull [Sun, 31 Jan 2021 02:00:57 +0000 (11:00 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Dungeon-Quest-BGM' into develop
deskull [Sun, 31 Jan 2021 01:47:39 +0000 (10:47 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Calc-To-Hit' into develop
Eric Branlund [Thu, 28 Jan 2021 16:08:31 +0000 (08:08 -0800)]
Make subject ("I") explicit in an English message.
Eric Branlund [Thu, 28 Jan 2021 16:06:51 +0000 (08:06 -0800)]
To be more idiomatic, use "to" rather than "for" in an English message.
Eric Branlund [Sat, 30 Jan 2021 20:02:53 +0000 (12:02 -0800)]
In English enter menu, use "out-of-date" rather than "obsoleted" as the warning on the help entry since the former seems clearer.
Eric Branlund [Thu, 28 Jan 2021 16:36:56 +0000 (08:36 -0800)]
In English knowledge menu label, replace "having defeated" with "defeated" to be more idiomatic.
Eric Branlund [Thu, 28 Jan 2021 16:33:41 +0000 (08:33 -0800)]
In English birth option header, "affect" rather than "effect" is appropriate. Also rearrange parentheses for clarity and drop "s" after "(*)" since it didn't add anything.
Eric Branlund [Thu, 28 Jan 2021 16:22:48 +0000 (08:22 -0800)]
To be more idiomatic, make "record" plural in English delete all message.
Eric Branlund [Thu, 28 Jan 2021 22:53:12 +0000 (14:53 -0800)]
Reworded English tip for the smithing enhance mode: replaced "an equipment" with "an item" and removed leading "the" in the second sentence.
Eric Branlund [Thu, 28 Jan 2021 22:46:06 +0000 (14:46 -0800)]
Corrected English spelling mistake for same label in essence_info[] and essence_name[].
Eric Branlund [Thu, 28 Jan 2021 22:17:52 +0000 (14:17 -0800)]
To hopefully be clearer, reworded English message about no available items for use with the remove essence option.
Eric Branlund [Thu, 28 Jan 2021 22:12:46 +0000 (14:12 -0800)]
Corrected English spelling mistake.
Eric Branlund [Thu, 28 Jan 2021 22:11:55 +0000 (14:11 -0800)]
Correct English spelling mistake.
Hourier [Sun, 31 Jan 2021 01:02:21 +0000 (10:02 +0900)]
[Refactor] #41363 In English version, adjusted the descriptions of Eldritch Horror. Thanks a lot for backwardsEric!
Eric Branlund [Fri, 29 Jan 2021 22:14:44 +0000 (14:14 -0800)]
Follow hourier's suggestion by replacing "soul-crushing" with "overwhelming".
Eric Branlund [Thu, 28 Jan 2021 19:23:22 +0000 (11:23 -0800)]
Adjust English eldritch horror phrases so they work better as a prelude to the horror's name. This is a response to the hengbandforosx support request, https://osdn.net/projects/hengbandforosx/ticket/41357 .
Hourier [Sat, 30 Jan 2021 15:00:45 +0000 (00:00 +0900)]
[Refactor] #41383 Doxygenコメントを追加 / Added Doxygen comment to sound-of-music.c
Hourier [Sat, 30 Jan 2021 14:59:36 +0000 (23:59 +0900)]
[Fix] #41383 個別にフロアクエスト用BGMを設定せず、Basic BGM (クエスト)のみを設定した場合、通常ダンジョン用のBGMしか流れない不具合を解消した / Resolved the issue that only BGM for normal dungeon was played when only Basic BGM (quest) was set without setting BGM for floor quest individually
Habu [Sat, 30 Jan 2021 08:11:41 +0000 (17:11 +0900)]
[refactor] 右手/左手に関する関数名を変更
左利き設定を考慮し、関数名のright_handをmain_hand、left_handをsub_handとする。
また、has_right_hand_weaponはその関数名と裏腹に素手攻撃が可能でもTRUEとなり
現実に即していないので、can_attack_with_main_hand と挙動通りの名称にする。
Habu [Sat, 30 Jan 2021 07:20:14 +0000 (16:20 +0900)]
[delete] 未使用ファイルを削除
src/player/selfinfo.c に INVEN_RARM の定義が残っていたが、
別の場所に移動した後の残骸なので削除する。
また、これに関連して src/mutation/mutation.c も使用されていないので合わせて削除する。
Eric Branlund [Sat, 30 Jan 2021 01:08:51 +0000 (17:08 -0800)]
Added English version of prompt for "Interact with Wisuals" menu. At some point between version 1.6.2 and 2.2.1, that prompt had been dropped leaving only the Japanese version, even if compiled for English.
Hourier [Sat, 30 Jan 2021 02:47:44 +0000 (11:47 +0900)]
[Fix] #41358 Add the description to ignore English-Realease/ directory into .gitignore
Hourier [Fri, 29 Jan 2021 12:09:32 +0000 (21:09 +0900)]
[Refactor] Fixed a typo in English version
Hourier [Fri, 29 Jan 2021 12:00:50 +0000 (21:00 +0900)]
[Fix] #41365 英語版において、SLAY_ANIMALとKILL_EVILが逆になっていたのを修正 / Resolved the issue that TR_KILL_EVIL appears after TR_KILL_ANIMAL in the English version
Eric Branlund [Wed, 27 Jan 2021 19:08:17 +0000 (11:08 -0800)]
For readability, inserted a definite article in the English messages about angry summons that did not already have the article.
Eric Branlund [Wed, 27 Jan 2021 19:05:39 +0000 (11:05 -0800)]
Correct subject-verb agreement in English message.
Eric Branlund [Wed, 27 Jan 2021 20:16:10 +0000 (12:16 -0800)]
Correct subject-verb agreement in English message ("nothing" is singular).
Eric Branlund [Wed, 27 Jan 2021 20:13:55 +0000 (12:13 -0800)]
In English message, inserted a definite article to be more idiomatic.
Eric Branlund [Wed, 27 Jan 2021 20:10:11 +0000 (12:10 -0800)]
For readability, change English dismount message to present tense and change the verb used.
Eric Branlund [Wed, 27 Jan 2021 19:55:43 +0000 (11:55 -0800)]
For readability of an English message, replaced "do" followed by a gerund with a simple verb.
Eric Branlund [Wed, 27 Jan 2021 02:58:24 +0000 (18:58 -0800)]
Use "deleted" rather than "delete" for English future perfect tense.
Eric Branlund [Wed, 27 Jan 2021 02:54:33 +0000 (18:54 -0800)]
Corrected English spelling mistake.
Eric Branlund [Wed, 27 Jan 2021 02:51:21 +0000 (18:51 -0800)]
"junk" (as in useless stuff) is a collective noun and doesn't need a "s" to be plural.
dis- [Sat, 30 Jan 2021 05:33:35 +0000 (14:33 +0900)]
[Refactor] 名称の変更 RARM/LARM/HANDS -> MAIN_HAND/SUB_HAND/ARMS
RIGHT/LEFT -> MAIN_RING/SUB_RING
get_default_hand -> main_attack_hand
dis- [Sat, 30 Jan 2021 04:55:44 +0000 (13:55 +0900)]
[Fix] 素手ボーナスが二重に適用されている
重複分の削除と該当箇所の条件を整理。
dis- [Sat, 30 Jan 2021 02:16:48 +0000 (11:16 +0900)]
[Refactor] 無駄な空白、改行の削除、includeのソート
直近変更のあったコードに対してコード整形ツールを使用して整理した。
dis- [Sat, 30 Jan 2021 01:05:04 +0000 (10:05 +0900)]
Merge branch 'feature/Fix-Calc-Slaying' into develop
deskull [Sat, 30 Jan 2021 00:46:20 +0000 (09:46 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Seen-Msg' into develop
deskull [Sat, 30 Jan 2021 00:33:43 +0000 (09:33 +0900)]
Merge branch 'feature/english-release' into develop
Eric Branlund [Wed, 27 Jan 2021 00:09:20 +0000 (16:09 -0800)]
Include English version of alpha version title for splash screen.
(cherry picked from commit
898e9aaeda2073e039e3690c200e6384210d4261)
Habu [Fri, 29 Jan 2021 15:35:21 +0000 (00:35 +0900)]
[fix] マージによりコンパイルエラーが発生
c9ad62aea1854ec46e8e7c33ca01e80f47210fbc のマージにより
リファクタリング前の変数使用によるコンパイルエラーが発生している。
リファクタリングに合わせた変数に修正する。
deskull [Fri, 29 Jan 2021 15:15:36 +0000 (00:15 +0900)]
Merge branch 'feature/apply-martial-arts-to-h' into feature/Fix-Calc-Slaying
deskull [Fri, 29 Jan 2021 15:11:57 +0000 (00:11 +0900)]
[Fix] #41190 マーシャルアーツの技能値が命中率に反映されない不具合修正 /
Fixed a bug that martial arts skill was not reflected in the hit rate.
deskull [Fri, 29 Jan 2021 13:56:29 +0000 (22:56 +0900)]
[Implement] #41358 English-Release ビルドをプロジェクトファイルに追加. / Add Englise-Release build in vcxproj file.
deskull [Fri, 29 Jan 2021 13:41:19 +0000 (22:41 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Expand-File-Read-Buffer' into develop
deskull [Fri, 29 Jan 2021 13:28:28 +0000 (22:28 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-sweep_hiding_candidate' into develop
deskull [Fri, 29 Jan 2021 13:14:26 +0000 (22:14 +0900)]
Merge branch 'feature/fix-ring-slaying-bonus' into feature/Fix-Calc-Slaying
deskull [Fri, 29 Jan 2021 12:56:09 +0000 (21:56 +0900)]
Merge pull request #41337 (taotao/hengband/feature/RefreshMonList into develop).
deskull [Fri, 29 Jan 2021 12:41:13 +0000 (21:41 +0900)]
Merge remote-tracking branch 'remotes/origin/feature-Fix-Home-Stack' into develop
deskull [Fri, 29 Jan 2021 12:30:00 +0000 (21:30 +0900)]
Merge branch 'feature/Fix-Auto-More' into develop
deskull [Fri, 29 Jan 2021 11:44:42 +0000 (20:44 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-BGM-Switch' into develop
deskull [Fri, 29 Jan 2021 11:38:46 +0000 (20:38 +0900)]
Merge pull request #41351 (taotao/hengband/fix-dungeon_quest_bgm into develop).
Hourier [Fri, 29 Jan 2021 11:38:24 +0000 (20:38 +0900)]
[Fix] #41360 我が家にアイテムを100個以上スタックする時に99個で打ち止めになる不具合を修正 / Resolved the issue that 99 items was last order when stacking 100 or more items
dis- [Fri, 29 Jan 2021 09:36:09 +0000 (18:36 +0900)]
[Fix] #41361 auto-moreオプションが効いていない場合がある
該当の処理部を整理し挙動を修正した。
dis- [Fri, 29 Jan 2021 03:53:34 +0000 (12:53 +0900)]
[Refactor] 列挙値の接頭詞を統一、右手/左手を列挙値に変更
dis- [Fri, 29 Jan 2021 03:07:45 +0000 (12:07 +0900)]
[Fix] 殺戮修正の計算がおかしい
とてもbuggyなのでナイーブに列挙した。いずれRefactorしたい。
dis- [Thu, 28 Jan 2021 13:13:55 +0000 (22:13 +0900)]
[Fix] #41359 ハウンドの挙動が以前と異なる
該当箇所の条件式を以前のものと等価に修正した
dis- [Thu, 28 Jan 2021 08:36:26 +0000 (17:36 +0900)]
[Implement] #41338 長いマクロを使えるようにする
ファイルから文字列を取得するバッファサイズを拡張し、長文マクロに対応した。
deskull [Wed, 27 Jan 2021 22:16:32 +0000 (07:16 +0900)]
[Fix] #41264 WIP,calc_to_damage()再整理中.
dis- [Wed, 27 Jan 2021 14:15:10 +0000 (23:15 +0900)]
[Fix] #41182 光源範囲外のモンスターにテレポアウェイしたときのメッセージ修正
単にプレイヤーから視認可能か判断するべきところで射線判定が使用されていた。
該当箇所を視認可能フラグに変更。
deskull [Wed, 27 Jan 2021 12:39:18 +0000 (21:39 +0900)]
[Fix] #41340 修行僧が軽装で加速しない不具合を修正. / Fixed monks wouldn't accelerate in light arming.
Hourier [Wed, 27 Jan 2021 10:34:43 +0000 (19:34 +0900)]
[Fix] #41351 BGMが切り替わらない問題を修正 (WIP、根本的には inside_quest の更新処理を見直すべき) / Resolved the issue that BGM wasn't switched
Hourier [Wed, 27 Jan 2021 11:14:55 +0000 (20:14 +0900)]
Merge branch 'feature/fix-calc-status' into develop
taotao54321 [Wed, 27 Jan 2021 09:53:55 +0000 (18:53 +0900)]
[Fix] ダンジョン内クエストBGMに切り替わらない問題を修正
https://osdn.net/projects/hengband/ticket/41134
Hourier [Wed, 27 Jan 2021 09:56:22 +0000 (18:56 +0900)]
Merge branch 'feature/Fix-Fresh-After' into develop
dis- [Wed, 27 Jan 2021 08:41:15 +0000 (17:41 +0900)]
[Fix] GF_STAR_HEALの処理でclone monsterが実行される
該当のswitchの処理を修正
deskull [Tue, 26 Jan 2021 23:23:09 +0000 (08:23 +0900)]
[Fix] #41342 忍者の盾なし隠密加算が全職に入っていた不具合を修正. / Fix Ninja's stealth bonus added to all classes.
* if文で一度忍者かどうかを囲わないといけなかった。
dis- [Tue, 26 Jan 2021 10:35:29 +0000 (19:35 +0900)]
[Fix] fresh-afterコマンドの修正
コマンド自動繰り返しにのみ効いていたfresh-afterをマクロ全般に拡張した。
Hourier [Tue, 26 Jan 2021 14:36:43 +0000 (23:36 +0900)]
Merge branch 'feature/Fix-Class-Table' into develop
dis- [Tue, 26 Jan 2021 14:17:48 +0000 (23:17 +0900)]
Merge branch 'feature/Fix-Stealth-Pval-Description' into develop
dis- [Tue, 26 Jan 2021 14:12:55 +0000 (23:12 +0900)]
Merge branch 'feature/Fix-Potion-Shatter' into develop
dis- [Tue, 26 Jan 2021 14:01:51 +0000 (23:01 +0900)]
Merge branch 'feature/bounty-endless-loop' into develop
dis- [Tue, 26 Jan 2021 13:49:05 +0000 (22:49 +0900)]
[Fix] 攻撃回数の上限がおかしい
職業テーブルの値に誤りがあったため、修正。
deskull [Tue, 26 Jan 2021 13:36:09 +0000 (22:36 +0900)]
[Fix] #41316 賞金首生成時に判明したget_mon_num_prep(), get_mon_num()のバグ修正 / Fix get_mon_num_prep(), get_mon_num() found by process bounty selection.
* get_mon_num_prep()時、条件を通った後ダンジョンごとのMONSTER_DIV修正でprop値が0になる部分を最低1保証.
* 最低階層処理をget_mon_num()に回したことに伴う、prep値とtotal値の食い違いを修正.
deskull [Tue, 26 Jan 2021 12:40:19 +0000 (21:40 +0900)]
[Fix] #41316 get_mon_num() の最小生成階範囲処理ミスを修正. / Fix min level range of get_mon_num().
Hourier [Tue, 26 Jan 2021 12:39:38 +0000 (21:39 +0900)]
[Fix] #41341 攻撃回数と隠密が両方加算される装備品の表記が狂っていたのを修正した / Resolved the issue that the notation of equipment that adds both the number of attacks and stealth was incorrect
deskull [Tue, 26 Jan 2021 12:22:07 +0000 (21:22 +0900)]
[Fix] #41316 モンスター生成候補デバッグメッセージ追加. / Added monster generation candidate debug message.
deskull [Mon, 25 Jan 2021 22:43:37 +0000 (07:43 +0900)]
[Fix] #41316 get_mon_num() に最小生成階範囲追加. / Add min level range to get_mon_num().
* 将来の拡張と、whileループでget_mon_num()の内容繰り返すのは問題と判断したため.
Hourier [Mon, 25 Jan 2021 14:59:23 +0000 (23:59 +0900)]
[Fix] #41335 薬が壁に当たっても割れない不具合を修正した / Resolved the issue that a potion wasn't shattered when it attacks to wall
deskull [Mon, 25 Jan 2021 14:09:26 +0000 (23:09 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Spell-Info-Garbled' into develop
taotao54321 [Mon, 25 Jan 2021 11:53:43 +0000 (20:53 +0900)]
[Feature] モンスターリスト自動更新
勝手版と同じ仕様、のはず。
Habu [Mon, 25 Jan 2021 10:04:07 +0000 (19:04 +0900)]
[Fix] #41334 Linux版で魔法一覧を表示した時に文字化け
例によって.hファイルはUTF-8→EUCの変換の対象になっていないのが原因。
defineマクロによる定数ではなくconcptrの変数宣言に置き換え、
変数定義はcmd-spell.cで行うようにする。
Hourier [Sun, 24 Jan 2021 23:56:18 +0000 (08:56 +0900)]
Merge branch 'release/3.0.0Alpha3' into develop
deskull [Sun, 24 Jan 2021 22:20:10 +0000 (07:20 +0900)]
[Version] 3.0.0Alpha3
* #41330 反感フラグ処理が逆になっている
deskull [Sun, 24 Jan 2021 22:03:17 +0000 (07:03 +0900)]
Merge remote-tracking branch 'remotes/origin/hotfix/Fix-Aggravation' into develop
dis- [Sun, 24 Jan 2021 16:18:52 +0000 (01:18 +0900)]
[Fix] 反感フラグが反転している
該当の条件節を修正。
Hourier [Sun, 24 Jan 2021 12:41:27 +0000 (21:41 +0900)]
Merge branch 'develop'
deskull [Sun, 24 Jan 2021 12:08:03 +0000 (21:08 +0900)]
Merge branch 'release/3.0.0Alpha2' into develop
deskull [Sun, 24 Jan 2021 11:38:23 +0000 (20:38 +0900)]
[Version] #41230 #41230 3.0.0Alpha2 セーブデータの互換を取るために以下の改変
* object_type->xtra2の保存サイズを16bitに
* object_type->name1の保存サイズを16bitに
deskull [Sun, 24 Jan 2021 11:37:04 +0000 (20:37 +0900)]
Merge branch 'feature/fix-sound-include' into develop
deskull [Sun, 24 Jan 2021 11:34:16 +0000 (20:34 +0900)]
[Fix] #41324 sound()関数の参照先なし警告修正./ Fix clang (12.0.0) compiler error from recent change: implicit declaration for sound().
deskull [Sun, 24 Jan 2021 10:48:00 +0000 (19:48 +0900)]
Merge branch 'feature/fix-ninja-freeaction' into develop
deskull [Sun, 24 Jan 2021 10:47:47 +0000 (19:47 +0900)]
Merge remote-tracking branch 'remotes/origin/Feature/Fix-Brief-Monster' into develop
deskull [Sun, 24 Jan 2021 10:43:48 +0000 (19:43 +0900)]
[Fix] #41174 忍者が盾装備時に表示上も正しく麻痺知らずを失うよう修正. /
Fixed Ninja to lose free-action correctly on display when equipped with a shield.
Hourier [Sun, 24 Jan 2021 10:42:45 +0000 (19:42 +0900)]
[Fix] #41325 モンスターの名前やACが見切れる事象全般を修正した / Resolved tthe issue that various info in brief-monsters-spoiler was cut off in the middle
Hourier [Sun, 24 Jan 2021 10:20:56 +0000 (19:20 +0900)]
[Fix] #41325 簡易スポイラーのVisual Info欄が見切れないように修正した / Resolved the issue that the Visual Info in brief-monsters-spoiler was cut off in the middle
deskull [Sun, 24 Jan 2021 08:10:01 +0000 (17:10 +0900)]
Merge branch 'Feature/Version-Expression' into develop
deskull [Sun, 24 Jan 2021 08:09:23 +0000 (17:09 +0900)]
[Feature] #41179 テキスト出力上のバージョン表記は全てput_version()に統一。 /
All version notations on the output are unified to put_version ().
deskull [Sun, 24 Jan 2021 06:59:32 +0000 (15:59 +0900)]
Merge commit 'remotes/origin/feature/Fix-BufferOverRun-spoil_out' into Feature/Version-Expression