OSDN Git Service
deskull [Fri, 15 Jan 2021 14:01:24 +0000 (23:01 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Steal-And-Run' into develop/3.0.0.1Alpha
deskull [Fri, 15 Jan 2021 13:57:18 +0000 (22:57 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Arena-Gift' into develop/3.0.0.1Alpha
deskull [Fri, 15 Jan 2021 13:55:01 +0000 (22:55 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Evolution-Table' into develop/3.0.0.1Alpha
deskull [Fri, 15 Jan 2021 13:50:49 +0000 (22:50 +0900)]
Merge branch 'Feature/Fix-Recharge' into develop/3.0.0.1Alpha
deskull [Fri, 15 Jan 2021 13:45:37 +0000 (22:45 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Teleport-Away' into develop/3.0.0.1Alpha
deskull [Fri, 15 Jan 2021 13:41:29 +0000 (22:41 +0900)]
Merge branch 'release/3.0.0Alpha' into master
deskull [Thu, 14 Jan 2021 15:26:03 +0000 (00:26 +0900)]
[Fix] #41157 魔力充填の破壊判定後の分岐が逆になっていたために破壊が頻発していた不具合を修正. / Fixed a bug that broken frequently because the branch after the destruction judgment of recharge was reversed.
Hourier [Thu, 14 Jan 2021 14:02:22 +0000 (23:02 +0900)]
[Fix] #41132 盗み逃げ打撃でモンスターが逃げなかったのを修正 / Resolved the issue that monster doesn't execute teleport when it steal item/gold from player
Hourier [Thu, 14 Jan 2021 12:19:43 +0000 (21:19 +0900)]
[Fix] #41162 アリーナの景品を正しいものに修正した / Fixed the issue that the gift of arena became the scroll of amusement
Hourier [Thu, 14 Jan 2021 12:13:50 +0000 (21:13 +0900)]
[Refactor] #41042 モンスターのフレーバーテキストを微修正 / Fixed flavor text of various monsters a little
Hourier [Thu, 14 Jan 2021 12:11:37 +0000 (21:11 +0900)]
[Fix] #41155 teleport_player_aux() の引数順ミスを修正 / Fixed the issue that the order of arguments for teleport_player_aux() is incorrected
Hourier [Thu, 14 Jan 2021 12:07:02 +0000 (21:07 +0900)]
[Fix] #41165 紅衣の修行僧の進化先を紅衣の上級修行僧に修正した / Resolved the issue that Crimson monk doesn't evolve to High crimson monk
deskull [Thu, 14 Jan 2021 09:40:06 +0000 (18:40 +0900)]
[Refactor] #41156 Conflict 対策に have_flag() を has_flag() へ / Rename have_flag() to has_flag() for conflict counter.
deskull [Tue, 12 Jan 2021 14:21:55 +0000 (23:21 +0900)]
Merge branch 'release/3.0.0Alpha' of git.osdn.net:/gitroot/hengband/hengband into release/3.0.0Alpha
deskull [Tue, 12 Jan 2021 14:12:56 +0000 (23:12 +0900)]
[Fix] #41137 狂戦士の「怒り」が狂戦士化で使用不能になっている本末転倒を修正 / Fixed Berserker's skill becoming unusable by super hero mode.
deskull [Tue, 12 Jan 2021 14:12:56 +0000 (23:12 +0900)]
[Fix] #41137 狂戦士の「怒り」が狂戦士化で使用不能になっている本末転倒を修正 / Fixed Berserker's skill becoming unusable by super hero mode.
deskull [Mon, 11 Jan 2021 09:38:56 +0000 (18:38 +0900)]
[Version] 3.0.0.0Alpha.
deskull [Mon, 11 Jan 2021 06:02:48 +0000 (15:02 +0900)]
[Refactor] #40514 player_type の kill_wall 変数を廃止. / Abolished kill_wall variable in player_type.
deskull [Mon, 11 Jan 2021 05:47:54 +0000 (14:47 +0900)]
[Refactor] #40514 player_type の pass_wall 変数を廃止. / Abolished pass_wall variable in player_type.
deskull [Mon, 11 Jan 2021 05:32:36 +0000 (14:32 +0900)]
[Refactor] #40514 player_type の sustain_chr 変数を廃止. / Abolished sustain_chr variable in player_type.
deskull [Mon, 11 Jan 2021 05:30:05 +0000 (14:30 +0900)]
[Refactor] #40514 player_type の sustain_con 変数を廃止. / Abolished sustain_con variable in player_type.
deskull [Mon, 11 Jan 2021 05:27:39 +0000 (14:27 +0900)]
[Refactor] #40514 player_type の sustain_dex 変数を廃止. / Abolished sustain_dex variable in player_type.
deskull [Mon, 11 Jan 2021 05:25:11 +0000 (14:25 +0900)]
[Refactor] #40514 player_type の sustain_wis 変数を廃止. / Abolished sustain_wis variable in player_type.
deskull [Mon, 11 Jan 2021 05:22:30 +0000 (14:22 +0900)]
[Refactor] #40514 player_type の sustain_int 変数を廃止. / Abolished sustain_int variable in player_type.
deskull [Mon, 11 Jan 2021 05:18:25 +0000 (14:18 +0900)]
[Refactor] #40514 player_type の sustain_str 変数を廃止. / Abolished sustain_str variable in player_type.
deskull [Mon, 11 Jan 2021 05:11:25 +0000 (14:11 +0900)]
[Refactor] #40514 player_type の sh_elec 変数を廃止. / Abolished sh_elec variable in player_type.
deskull [Mon, 11 Jan 2021 05:09:28 +0000 (14:09 +0900)]
[Refactor] #40514 player_type の sh_cold 変数を廃止. / Abolished sh_cold variable in player_type.
deskull [Mon, 11 Jan 2021 05:07:40 +0000 (14:07 +0900)]
[Refactor] #40514 player_type の sh_fire 変数を廃止. / Abolished sh_fire variable in player_type.
deskull [Mon, 11 Jan 2021 05:04:04 +0000 (14:04 +0900)]
[Refactor] #40514 player_type の reflect 変数を廃止. / Abolished reflect variable in player_type.
deskull [Mon, 11 Jan 2021 04:59:55 +0000 (13:59 +0900)]
[Refactor] #40514 player_type の resist_water 変数を廃止. / Abolished resist_water variable in player_type.
deskull [Mon, 11 Jan 2021 04:57:04 +0000 (13:57 +0900)]
[Refactor] #40514 player_type の resist_time 変数を廃止. / Abolished resist_time variable in player_type.
deskull [Mon, 11 Jan 2021 04:54:29 +0000 (13:54 +0900)]
[Refactor] #40514 player_type の resist_fear 変数を廃止. / Abolished resist_fear variable in player_type.
deskull [Mon, 11 Jan 2021 04:49:43 +0000 (13:49 +0900)]
[Refactor] #40514 player_type の resist_neth 変数を廃止. / Abolished resist_neth variable in player_type.
deskull [Mon, 11 Jan 2021 04:44:55 +0000 (13:44 +0900)]
[Refactor] #40514 player_type の resist_blind 変数を廃止. / Abolished resist_blind variable in player_type.
deskull [Mon, 11 Jan 2021 04:37:54 +0000 (13:37 +0900)]
[Refactor] #40514 player_type の resist_nexus 変数を廃止. / Abolished resist_nexus variable in player_type.
deskull [Mon, 11 Jan 2021 04:29:02 +0000 (13:29 +0900)]
[Refactor] #40514 player_type の resist_shard 変数を廃止. / Abolished the resist_shard variable in player_type.
deskull [Mon, 11 Jan 2021 04:22:03 +0000 (13:22 +0900)]
[Refactor] #40514 player_type の resist_disen 変数を廃止. / Abolished the resist_disen variable in player_type.
deskull [Mon, 11 Jan 2021 04:18:20 +0000 (13:18 +0900)]
[Refactor] #40514 player_type の resist_chaos, resist_dark 変数を廃止. / Abolished the resist_chaos, resist_dark variable in player_type.
deskull [Mon, 11 Jan 2021 01:43:34 +0000 (10:43 +0900)]
[Refactor] #40514 player_type の resist_lite 変数を廃止. / Abolished the resist_lite variable in player_type.
deskull [Mon, 11 Jan 2021 01:31:45 +0000 (10:31 +0900)]
[Refactor] #40514 player_type の resist_sound 変数を廃止. / Abolished the resist_sound variable in player_type.
deskull [Mon, 11 Jan 2021 01:24:18 +0000 (10:24 +0900)]
[Refactor] #40514 player_type の resist_conf 変数を廃止. / Abolished the resist_conf variable in player_type.
deskull [Mon, 11 Jan 2021 00:40:36 +0000 (09:40 +0900)]
[Refactor] #40514 player_type の resist_pois 変数を廃止. / Abolished the resist_pois variable in player_type.
deskull [Sun, 10 Jan 2021 16:27:33 +0000 (01:27 +0900)]
[Refactor] #40514 player_type の resist_cold 変数を廃止. / Abolished the resist_cold variable in player_type.
deskull [Sun, 10 Jan 2021 16:20:35 +0000 (01:20 +0900)]
[Refactor] #40514 player_type の resist_elec 変数を廃止. / Abolished the resist_elec variable in player_type.
deskull [Sun, 10 Jan 2021 16:08:16 +0000 (01:08 +0900)]
[Refactor] #40514 player_type の resist_acid 変数を廃止. / Abolished the resist_acid variable in player_type.
deskull [Sun, 10 Jan 2021 16:01:09 +0000 (01:01 +0900)]
[Refactor] #40514 player_type の resist_fire 変数を廃止. / Abolished the resist_fire variable in player_type.
deskull [Sat, 9 Jan 2021 16:34:58 +0000 (01:34 +0900)]
[Refactor] #40520 select_ring_slot を player_type に取り込む. / Incorporate select_ring_slot into player_type.
deskull [Fri, 8 Jan 2021 12:50:52 +0000 (21:50 +0900)]
[Fix] #41104 リファクタリングの置換処理ミスにより鍛冶師銘の表示フォーマットが崩れていた / The blacksmith's inscription display format was corrupted due to a refactoring replacement error.
deskull [Fri, 8 Jan 2021 12:30:42 +0000 (21:30 +0900)]
[Feature] #40463 WindowsのためのHTCLOSEによるプリプロセッサ分岐を削除. / Removed preprocessor branch by HTCLOSE for Windows.
deskull [Fri, 8 Jan 2021 12:07:28 +0000 (21:07 +0900)]
[Feature] #40463 FD_SETによるプリプロセッサ分岐を削除. / Removed preprocessor branch by FD_SET.
deskull [Fri, 8 Jan 2021 11:37:57 +0000 (20:37 +0900)]
[Feature] #40463 NULL未定義の定義プリプロセッサを削除. / Delete NULL definition for environment undefined NULL.
deskull [Fri, 8 Jan 2021 11:17:58 +0000 (20:17 +0900)]
[Fix] #40463 h-system.h内の多重インクルードと思われる箇所をlinuxプリプロセッサと共に削除. / Deleted the part that seems to be multiple include in h-system.h together with '#ifdef linux'.
deskull [Fri, 8 Jan 2021 10:36:12 +0000 (19:36 +0900)]
[Fix] #41061 clangの警告修正ミスに対応. / Respond to clang warning correction mistakes.
deskull [Thu, 7 Jan 2021 23:17:09 +0000 (08:17 +0900)]
Merge remote-tracking branch 'remotes/OSX/release/3.0.0Alpha-clang-extraneous-paren' into release/3.0.0Alpha
deskull [Wed, 6 Jan 2021 23:24:14 +0000 (08:24 +0900)]
[Fix] #41061 clangで報告された以下2種の警告に対応. / Two troublesome warnings from clang.
* wild.c の is_winner の判定処理が常に TRUE になる。
* within_char_util() の引数型が u16b のため同関数中で負数を扱う判定が常に TRUE になる。
deskull [Wed, 6 Jan 2021 14:47:02 +0000 (23:47 +0900)]
[Feature] #40463 HANDLE_SIGNALS プリプロセッサの廃止. / Abolition of HANDLE_SIGNALS.
十分安定した機能である上、POSIX準拠を外れた環境を想定することは今後考えないので常にTRUEとする。
deskull [Wed, 6 Jan 2021 03:36:47 +0000 (12:36 +0900)]
[Feature] #40463 COMPLEX_WALL_ILLUMINATION プリプロセッサの廃止. / Abolition of COMPLEX_WALL_ILLUMINATION.
「照明状態を壁により影響を受ける、より複雑な判定に切り替えるマクロ」とのことだがこれまでTRUEを適用し続けたのでFALSE側は廃止。
deskull [Tue, 5 Jan 2021 10:37:27 +0000 (19:37 +0900)]
Hourier [Fri, 1 Jan 2021 06:00:58 +0000 (15:00 +0900)]
[Refactor] #41091 一部モンスターの名称とフレーバーを修正した / Corrected flavor text of some monsters
Hourier [Sun, 20 Dec 2020 12:22:54 +0000 (21:22 +0900)]
[Refactor] #41091 一部モンスターのフレーバーを修正した / Corrected flavor text of some monsters
Habu [Tue, 29 Dec 2020 15:33:16 +0000 (00:33 +0900)]
[fix] Ticket #41080
muta3フラグの真偽チェックの誤りのため、
突然変異があるにも関わらず関数を抜けてしまい、
突然変異による修正値の反映がされていなかったのが原因。
そもそも突然変異による変化が無い時は、
直後の compensation == 0 の判定で抜けるので、
該当のmuta3の判定部分は削除する。
Habu [Tue, 29 Dec 2020 14:47:54 +0000 (23:47 +0900)]
[fix] Ticket #41081
calc_num_fireの関数内でcreature_ptr->num_fire = 100;としてしまっている。
calc_bonusesでは戻り値をcreature_ptr->num_fireに代入しているので問題ないが、
別の関数(具体的にはdescribe_bow)から呼び出されるとnum_fireが100に固定されてしまう。
その結果、アイテムおよび職業による射撃回数ボーナスがすべて無効となってしまっている。
該当部分を削除することで修正する。
Habu [Mon, 28 Dec 2020 14:27:28 +0000 (23:27 +0900)]
[fix] Ticket #41079
耐酸・耐電・耐火・耐冷のエゴ盾を発動した時、
一時耐性を付ける前に酸・電撃・火炎・氷の指輪の判定を行い
違う時は関数を抜けているため耐性を得ることができていなかった。
耐性を得た上で指輪の場合のみ追加でボール魔法を発動するのが意図した動作なので、
一時耐性の取得を先に行ってから指輪かどうかの判定を行うようにする。
Eric Branlund [Fri, 18 Dec 2020 18:01:55 +0000 (10:01 -0800)]
Changed to avoid clang's "equality comparison with extraneous parentheses" warnings.
Hourier [Wed, 16 Dec 2020 09:28:44 +0000 (18:28 +0900)]
[Fix] #40940 Resolved the issue that a parenthesis was missing
deskull [Tue, 15 Dec 2020 23:25:09 +0000 (08:25 +0900)]
Merge remote-tracking branch 'remotes/origin/Unification-Utf8' into release/3.0.0Alpha
deskull [Tue, 15 Dec 2020 23:24:30 +0000 (08:24 +0900)]
Merge remote-tracking branch 'remotes/origin/Integration-art-definition-artifact' into release/3.0.0Alpha
Hourier [Tue, 15 Dec 2020 13:19:47 +0000 (22:19 +0900)]
[Refactor] #40865 Changed character encoding from SHIFT-JIS to UTF-8 (without BOM) in music.cfg and xtra/sound/readme.txt
Hourier [Tue, 15 Dec 2020 13:09:34 +0000 (22:09 +0900)]
[Refactor] #41053 Renamed artifact_kind_type to fixed_artifact_type
Hourier [Tue, 15 Dec 2020 13:07:11 +0000 (22:07 +0900)]
[Refactor] #41053 Moved art-definition/*.h to artifact/
Hourier [Tue, 15 Dec 2020 13:02:59 +0000 (22:02 +0900)]
[Refactor] #41052 Unified Japanese and English resources in object-group-table.c
Hourier [Tue, 15 Dec 2020 13:02:23 +0000 (22:02 +0900)]
[Refactor] #41052 Reshaped knowledge/ automatically
Hourier [Tue, 15 Dec 2020 13:01:53 +0000 (22:01 +0900)]
[Refactor] #41052 Reshaped knowledge-monsters.c automatically
iks [Sat, 12 Dec 2020 19:30:36 +0000 (04:30 +0900)]
Fix: コンパイルエラーの修正 / Fix compile error.
Makefile.amで \ の入れ忘れがあり、コンパイル対象に含まれないコードが発生した。
iks [Sat, 12 Dec 2020 18:06:23 +0000 (03:06 +0900)]
Merge branch 'For3.0.0-Monster-Adjustment' into release/3.0.0Alpha
Hourier [Sat, 12 Dec 2020 13:05:39 +0000 (22:05 +0900)]
[Fix] #37285 r_infoの誤記を修正 / Resolved the invalid description in r_info
Hourier [Sat, 12 Dec 2020 01:30:59 +0000 (10:30 +0900)]
[Implement] #37285 モンスターのフレーバーテキストを加筆修正した / Adjusted flavor text of various monsters
Hourier [Fri, 11 Dec 2020 13:13:08 +0000 (22:13 +0900)]
[Implement] #37324 一部アーティファクトのフレーバー修正 / Fixed the flavor text of some artifacts
Hourier [Fri, 11 Dec 2020 12:25:52 +0000 (21:25 +0900)]
[Implement] #40911 充填魔力吸収料の計算式を修正した / Corrected the formula for magical capacity absorption
deskull [Fri, 11 Dec 2020 03:36:02 +0000 (12:36 +0900)]
[Refactor] #40943 player-status-flags の判定式を簡略化する. / Simplify the judgment formula of player-status-flags.
deskull [Fri, 11 Dec 2020 11:57:32 +0000 (20:57 +0900)]
Merge branch 'Release-3.0.0Alpha' into release/3.0.0Alpha
Hourier [Fri, 11 Dec 2020 11:27:22 +0000 (20:27 +0900)]
[Implement] #37285 紅衣の修行僧を追加した / Added crimson monks
deskull [Fri, 11 Dec 2020 11:32:26 +0000 (20:32 +0900)]
Merge branch 'Release-3.0.0Alpha' into release/3.0.0Alpha
Hourier [Fri, 11 Dec 2020 11:06:25 +0000 (20:06 +0900)]
[Refactor] #40906 Reshaped automatically
Hourier [Fri, 11 Dec 2020 11:03:15 +0000 (20:03 +0900)]
[Refactor] #40906 art-*.h をfixed-art-types.h に統合した / Unified art-*.h into fixed-art-types.h
Hourier [Fri, 11 Dec 2020 10:54:56 +0000 (19:54 +0900)]
[Refactor] #40906 ハードコードされたアーティファクトの一覧を掃除した / Cleaned up the list of artifacts
Hourier [Fri, 11 Dec 2020 10:54:17 +0000 (19:54 +0900)]
[Implement] #40906 『ドン・キホーテのヘヴィ・ランス』を騎兵における古い城の報酬にした / Changed the reward of Old Castle from Spear of GaeBolg to Heavy Lance of Don Quixote
Hourier [Fri, 11 Dec 2020 10:30:57 +0000 (19:30 +0900)]
[Implement] #40907 Iユニークの出現階層を28Fから34Fへ移した / Moved Insect unique from 28F to 34F
Hourier [Fri, 11 Dec 2020 10:25:11 +0000 (19:25 +0900)]
[Implement] #40909 配管工の兄弟に無敵化を追加した / Added invulner magic to the plumber brothers
Hourier [Fri, 11 Dec 2020 10:23:56 +0000 (19:23 +0900)]
[Refactor] #37324 Adjusted the positions of white space
deskull [Wed, 9 Dec 2020 23:18:54 +0000 (08:18 +0900)]
[Merge] #40881 流れ上ブランチが孤立するとまずいので、名目的に今の時点で 'hradish-autoroller' を 'release/3.0.0Alpha' に空マージします。何か不都合があれば別途対処します。 Merge branch 'hradish-autoroller' into release/3.0.0Alpha
deskull [Sun, 6 Dec 2020 21:31:45 +0000 (06:31 +0900)]
Merge branch 'release/3.0.0Alpha' of git.osdn.net:/gitroot/hengband/hengband into release/3.0.0Alpha
deskull [Sun, 6 Dec 2020 21:27:19 +0000 (06:27 +0900)]
[Refactor] monster_type のDoxygenコメント追加. / Add Doxygen comments in monster_type.
Habu [Thu, 3 Dec 2020 14:06:36 +0000 (23:06 +0900)]
[cleanup] GCCの警告に対応
GCCによる警告に対応した修正を行う。
GCCのバージョン:GCC 10.2.0
警告関連オプション:-Wall -Wno-switch -Wno-format-overflow
- 未使用変数の削除
- 代入のみで使用していない変数の削除
- 条件式における&&と||の組み合わせに対し()を付けて優先順位を明確にする
- .cファイルでの #pragma once を削除
- if文の連続は{}を付けてifに対応するelseを明確にする
- 変数の使いまわしによる型の不一致を避ける
- 未使用の引数は(void)にキャストする文でVisual Studioでの警告を避ける
- term_exchange()はstaticではなく外部に公開する
deskull [Wed, 2 Dec 2020 23:16:21 +0000 (08:16 +0900)]
[Refactor] #39077 fixed-artifacts-spoiler.c 中の一部型定義とキャストをより正確に変更. / Changed some type definitions and casts during fixed-artifacts-spoiler more accurately.
deskull [Wed, 2 Dec 2020 23:14:16 +0000 (08:14 +0900)]
[Refactor] #39077 target-describer.c 中の一部型定義とキャストをより正確に変更. / Changed some type definitions and casts during target-describer.c more accurately.
deskull [Wed, 2 Dec 2020 23:08:25 +0000 (08:08 +0900)]
[Refactor] #39077 knowledge-items.c/h 中の一部型定義とキャストをより正確に変更. / Changed some type definitions and casts during knowledge-items.c/h more accurately.
deskull [Wed, 2 Dec 2020 21:53:12 +0000 (06:53 +0900)]
[Refactor] #39077 パーサ処理中の一部型定義とキャストをより正確に変更. / Changed some type definitions and casts during parser processing more accurately.
Habu [Fri, 27 Nov 2020 10:12:13 +0000 (19:12 +0900)]
[fix] フロア移動時のペット配置のバグ
リファクタリングのミスにより、set_pet_paramsの引数として
渡しているmonster_race型の変数m_raceの値が更新されていない。
そのため、m_raceの値が不定の状態で判定を行っている。
monster_raceを指すポインタのアドレスを渡して、
ポインタの値をset_pet_paramsで更新するようにする。
Habu [Thu, 26 Nov 2020 15:15:02 +0000 (00:15 +0900)]
[fix] モンスター召喚数の決定方法を修正
カオスパトロンの報酬でモンスターの召喚が発生した時、
ループの毎に召喚されるモンスターの数を乱数で決定していた。
意図した処理ではないと思われるので、最初に1度だけ乱数で
召喚されるモンスターの数を決定する。