OSDN Git Service
deskull [Thu, 4 Feb 2021 13:55:23 +0000 (22:55 +0900)]
Merge remote-tracking branch 'remotes/hengbandosx/english-knowledge-edits' into feature/english-correction
deskull [Thu, 4 Feb 2021 13:50:28 +0000 (22:50 +0900)]
Merge remote-tracking branch 'remotes/hengbandosx/english-monster-floor-edits' into feature/english-correction
deskull [Thu, 4 Feb 2021 13:46:57 +0000 (22:46 +0900)]
Merge branch 'feature/english-correction' into develop
deskull [Thu, 4 Feb 2021 13:33:06 +0000 (22:33 +0900)]
Merge remote-tracking branch 'remotes/hengbandosx/english-io-edits' into feature/english-correction
deskull [Thu, 4 Feb 2021 12:32:31 +0000 (21:32 +0900)]
Merge branch 'feature/maze-secret-door-in-wall' into develop
deskull [Thu, 4 Feb 2021 12:29:39 +0000 (21:29 +0900)]
[Fix] #41396 迷宮の隠しドア生成率を0%にする。 / Labyrinth hidden door generation rate to 0%
* 隠しドアがあっても大したゲーム性にならないし、縦横奇数にできないダンジョンシステムを直すのも難しい。
* よって外壁に不自然な隠しドアが埋め込まれるを防ぐ方を重視で。
Eric Branlund [Wed, 3 Feb 2021 22:02:50 +0000 (14:02 -0800)]
To be more idiomatic, drop "was" from English message for death of dragon centipedes.
Eric Branlund [Wed, 3 Feb 2021 21:59:17 +0000 (13:59 -0800)]
To be more idiomatic, reworded the English message for Rolento's death.
Eric Branlund [Wed, 3 Feb 2021 21:35:14 +0000 (13:35 -0800)]
Since it will always precede an adjective that starts with a consonant, use "a" rather than "an" in an English message.
deskull [Wed, 3 Feb 2021 17:03:20 +0000 (02:03 +0900)]
Merge branch 'feature/music-debug-files' into develop
deskull [Wed, 3 Feb 2021 16:47:29 +0000 (01:47 +0900)]
[Implement] #41415 music_debug.cfg の優先読み込み機能追加と music フォルダ内の .gitignore 追加. /
Added priority loading function for music_debug.cfg and added .gitignore in music folder.
deskull [Wed, 3 Feb 2021 16:06:12 +0000 (01:06 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/windows-release-package-build-script' into develop
deskull [Wed, 3 Feb 2021 15:59:34 +0000 (00:59 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Psy-Spear' into develop
deskull [Wed, 3 Feb 2021 15:51:09 +0000 (00:51 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Term-Fresh' into develop
Habu [Wed, 3 Feb 2021 12:36:44 +0000 (21:36 +0900)]
[fix] #41436 光の剣のダメージがまた0になっている
リファクタリングの成果をマージした時に、
7d20eb7d0c5fbc5360df0e477bde5ca348134f2e
で行った修正が戻ってしまった模様。
再度同じ修正を行う。
dis- [Tue, 2 Feb 2021 09:57:14 +0000 (18:57 +0900)]
[Fix] 不要なincludeの削除
デバッグ中の作業が一部混入した。削除。
dis- [Tue, 2 Feb 2021 09:47:11 +0000 (18:47 +0900)]
[Fix] #41426 fresh-afterオフ時のターゲットの挙動がおかしい
\e\e\et1*のように、マクロの最後の入力を*にしたときターゲット取得の挙動が変化する。
本来はprojectableな対象のみを+などでハイライトするはずが、あらゆる対象を追ってしまうようになっていた。
この現象がfresh-afterオフのときのみ発生することから原因箇所を特定した。
fix_monster_listをfresh-afterの範囲外に出すことでバグ発生を回避できる。
いずれ根本的に対処した方が良い。
deskull [Mon, 1 Feb 2021 22:39:58 +0000 (07:39 +0900)]
Merge pull request #41416 (taotao/hengband/fix-x11_term_key into develop).
Eric Branlund [Mon, 1 Feb 2021 18:16:41 +0000 (10:16 -0800)]
Made "whistle" plural to match the other entries that aren't collective nouns.
Eric Branlund [Mon, 1 Feb 2021 18:15:45 +0000 (10:15 -0800)]
Since "junk" is a collective noun, don't add "s" for plural.
Eric Branlund [Mon, 1 Feb 2021 18:14:28 +0000 (10:14 -0800)]
Corrected English spelling for plural of "box".
Eric Branlund [Mon, 1 Feb 2021 16:31:16 +0000 (08:31 -0800)]
Corrected English spelling mistakes ("address").
taotao54321 [Mon, 1 Feb 2021 14:49:14 +0000 (23:49 +0900)]
[Fix] X11版でマクロで物を買うとアイテムウィンドウが更新されないのを修正
fresh_after が off のときに発生していた。
X11 版は入力キューの扱いが元々正しくなくて、それが macro_running() の判定にも影響していた。
入力キューの扱いを Windows 版に合わせることで解決。
同時に、長い日本語を入力した際に化ける現象も解決したはず。
deskull [Mon, 1 Feb 2021 14:13:25 +0000 (23:13 +0900)]
Merge remote-tracking branch 'remotes/hengbandosx/english-3.0.0.4-lost-spelling-correction' into feature/english-correction
Habu [Mon, 1 Feb 2021 11:54:07 +0000 (20:54 +0900)]
[implement] Windows版バイナリパッケージを生成するスクリプト
Windows版のバイナリパッケージを準備するのを容易にするため、ビルドから
パッケージ生成までを自動的に行うPowerShellスクリプトを作成した。
リポジトリのトップディレクトリで Build-Windows-Release-Package.ps1 を
実行すると、リリースバージョンを聞かれ、入力したバージョンを付加した
Windows版バイナリパッケージが日本語版・英語版ともにトップディレクトリに生成される。
生成されるパッケージ名:
* Hengband-{Version}-jp.zip
* Hengband-{Version}-en.zip
将来的には、Hengband.exe に --version オプションを付けて実行すると
バージョンを出力するようにし、自動的にパッケージに付与するバージョン名を
決定する機能なども考えたい。
また、GitHubに移行後はGitHub Actionsで自動的にバイナリパッケージを
生成・アップロードするWorkflowを作るとさらにリリース作業が楽になると思われる。
deskull [Mon, 1 Feb 2021 13:54:09 +0000 (22:54 +0900)]
Merge remote-tracking branch 'remotes/hengbandosx/english-floor-edits' into feature/english-correction
deskull [Mon, 1 Feb 2021 13:16:14 +0000 (22:16 +0900)]
Merge remote-tracking branch 'remotes/hengbandosx/english-effect-edits' into feature/english-correction
deskull [Mon, 1 Feb 2021 13:13:58 +0000 (22:13 +0900)]
Merge remote-tracking branch 'remotes/hengbandosx/english-game-option-edits' into feature/english-correction
deskull [Mon, 1 Feb 2021 13:07:28 +0000 (22:07 +0900)]
Merge remote-tracking branch 'remotes/hengbandosx/english-inventory-edits' into feature/english-correction
deskull [Mon, 1 Feb 2021 12:46:15 +0000 (21:46 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Auto-More' into develop
dis- [Mon, 1 Feb 2021 11:05:01 +0000 (20:05 +0900)]
[Fix] #41412 Auto-Moreオフの時のESCの挙動が以前と異なる
5a1faa0419cab1398e312323d41bc9912e07a74dの修正で、Auto-Moreオフのときの挙動が正常でなかった。
従来の挙動を調査し、ESCで全メッセージを流すように修正。
また、メッセージウィンドウがある場合一画面ずつ流す処理も正常動作するよう修正した。
dis- [Mon, 1 Feb 2021 09:12:07 +0000 (18:12 +0900)]
[Fix] #41382 delay=0のとき魔法が描写される
#41382の修正と同様に魔法の描写もdelay=0のときは行わないように統一した。
ほぼ同一ロジックの処理が複数存在するため、いずれ整理することが望ましい。
dis- [Mon, 1 Feb 2021 08:47:27 +0000 (17:47 +0900)]
[Fix] #41403 マクロ以外の連続行動にFresh-Afterを適用
39984e016dabe4287f65f671bab3fbff350d6a3eの変更を他の連続行動に適用した。
shift+移動のrunning、トラベルコマンドの移動、Rest、釣り、コマンド繰り返しが該当する。
z-term.cにプレイヤーの情報を持ち込んでしまっているため将来的には分離するべき。
Eric Branlund [Mon, 1 Feb 2021 08:10:35 +0000 (00:10 -0800)]
For readability, use active voice for English message displayed when a teleport curse triggers.
Eric Branlund [Mon, 1 Feb 2021 08:06:14 +0000 (00:06 -0800)]
Changed "an" to "a" since it precedes "dragon".
Eric Branlund [Mon, 1 Feb 2021 06:35:04 +0000 (22:35 -0800)]
Fully spell out "highlight" in English options list.
Eric Branlund [Sun, 31 Jan 2021 21:56:51 +0000 (13:56 -0800)]
Switched "is" to "are" to match "some monsters".
Eric Branlund [Sun, 31 Jan 2021 21:49:41 +0000 (13:49 -0800)]
In English message, inserted a missing "to" for an infinitive.
Eric Branlund [Sun, 31 Jan 2021 21:08:29 +0000 (13:08 -0800)]
For clarity, replaced "is drawn" with synonymous "is drained" in English message.
Eric Branlund [Sun, 31 Jan 2021 19:59:39 +0000 (11:59 -0800)]
Replaced "stare into" with "stare at" to be more idiomatic.
Eric Branlund [Sun, 31 Jan 2021 19:15:27 +0000 (11:15 -0800)]
Restore English spelling correction lost in 3.0.0.4 merges.
deskull [Sun, 31 Jan 2021 12:33:20 +0000 (21:33 +0900)]
[Version] 3.0.0Alpha4
deskull [Sun, 31 Jan 2021 12:29:53 +0000 (21:29 +0900)]
Merge branch 'develop' of git.osdn.net:/gitroot/hengband/hengband into develop
deskull [Sun, 31 Jan 2021 12:29:22 +0000 (21:29 +0900)]
[Fix] 英語版ソースに余計な,がついていたので修正. / Fix an extra comma in The English source.
deskull [Sun, 31 Jan 2021 06:01:28 +0000 (15:01 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Refactor-Monsters-3.0.0Alpha4' into develop
Hourier [Sun, 31 Jan 2021 05:59:43 +0000 (14:59 +0900)]
[Refactor] #41042 『Q』の感知範囲を100フィートから200フィートに広げた / Expanded Q's sensing area from 100 to 200
deskull [Sun, 31 Jan 2021 05:51:31 +0000 (14:51 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-English-Bugs' into develop
Hourier [Sun, 31 Jan 2021 04:58:19 +0000 (13:58 +0900)]
[Refactor] #41042 デイドラDのドロップを若干上昇させた / Increased the number of drop items for daedra dragons
Hourier [Sun, 31 Jan 2021 04:54:56 +0000 (13:54 +0900)]
[Refactor] #41042 『ゾート』の痛恨打撃を粉砕打撃に変更 / Changed the blow type in ZOTE from SUPERHURT to SHATTER
Hourier [Sun, 31 Jan 2021 04:34:57 +0000 (13:34 +0900)]
[Refactor] #41042 『閻魔大王』に盲目魔法を追加した / Added BLIND magic to Yama
Hourier [Sun, 31 Jan 2021 04:17:58 +0000 (13:17 +0900)]
Merge branch 'feature/Fix-Term-Fresh' into develop (#41382)
dis- [Sun, 31 Jan 2021 04:07:03 +0000 (13:07 +0900)]
[Fix] delay=0のとき射撃/魔法の描写をカット
delay=0のときに不要な再描写がかかり動作を重くしていた。
該当の場合に画面再描写をキャンセルし挙動を軽快にする。
dis- [Sun, 31 Jan 2021 03:35:31 +0000 (12:35 +0900)]
[Fix] 矢の軌跡に残像が残る
39984e016dabe4287f65f671bab3fbff350d6a3eにて過剰に処理をカットしていたのが原因。
矢の軌跡はfresh-afterの有無ではなくdelayの値で描写有無を決めるべき。
不要な条件節をカットした。
deskull [Sun, 31 Jan 2021 02:22:47 +0000 (11:22 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-English-Bugs' into develop
Habu [Sun, 31 Jan 2021 02:14:28 +0000 (11:14 +0900)]
[fix] コンパイルエラーの修正
836f2629d82092a62f799d7364f2c27bf1b48481 のコミットで
余計なカンマが入っているためコンパイルエラーになっていたので修正。
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 も使用されていないので合わせて削除する。
Hourier [Thu, 28 Jan 2021 11:43:01 +0000 (20:43 +0900)]
[Refactor] #41042 『迷宮のミノタウロス』のレベルを40から18に変更した / Changed the level of The Minotaur of the Labyrinth from 40 to 18
Hourier [Thu, 28 Jan 2021 11:41:13 +0000 (20:41 +0900)]
[Implement] #41042 マイクロンフトの興亡クエストにて、インターネット・エクスプローダーをエッヂに変更した / Changed monsters placed in The Rise and Fall of Micro from Internet Exploder to Chronium edge
Hourier [Wed, 27 Jan 2021 15:12:32 +0000 (00:12 +0900)]
[Refactor] #41042 一部ユニークの経験値修正 / Adjusted some unique monsters
Hourier [Wed, 27 Jan 2021 10:37:46 +0000 (19:37 +0900)]
[Implement] #41042 シヴァ靴に重力ブレスと重力耐性を追加した / Added BR_GRAV and RES_GRAV flags to Shiva boots
Hourier [Wed, 27 Jan 2021 09:22:06 +0000 (18:22 +0900)]
[Implement] #41042 ファッキントッシュとSM-DOSの仁義なき戦いについてセリフを追加した / Added dialogs about the battle between Fuckintosh and SM-DOS
Hourier [Tue, 26 Jan 2021 10:07:47 +0000 (19:07 +0900)]
[Refactor] #41042 『閻魔大王』と『ソラリス』の打撃を調整した / Adjusted the parameters of Yama and Solaris
Hourier [Sun, 24 Jan 2021 15:45:59 +0000 (00:45 +0900)]
[Fix] #41042 『パーサーナックス』のドロップが上質かつ金も落としていたのを高級品オンリーに修正した / Resolved the issue that Paarthurnax drops good items/golds to great items
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