OSDN Git Service

hengbandforosx/hengbandosx.git
2 years ago[Release] 3.0.0Alpha36
Deskull [Sun, 22 Aug 2021 09:49:22 +0000 (18:49 +0900)]
[Release] 3.0.0Alpha36

2 years agoMerge pull request #1399 from Hourier/feature/Refactor-Race-Xtra
Hourier [Sun, 22 Aug 2021 08:38:16 +0000 (17:38 +0900)]
Merge pull request #1399 from Hourier/feature/Refactor-Race-Xtra

確認ありがとうございました!

2 years ago[Refactor] #1395 Removed r_xtra2
Hourier [Sun, 22 Aug 2021 05:20:40 +0000 (14:20 +0900)]
[Refactor] #1395 Removed r_xtra2

2 years ago[Refactor] #1395 Renamed r_xtra1 to r_can_evolve and changed type from byte to bool
Hourier [Sun, 22 Aug 2021 05:03:34 +0000 (14:03 +0900)]
[Refactor] #1395 Renamed r_xtra1 to r_can_evolve and changed type from byte to bool

2 years agoMerge pull request #1391 from Slimebreath6078/feature/Enhance_sniper_FIRE_and_COLD
火炎の飛竜 [Sat, 21 Aug 2021 10:47:59 +0000 (19:47 +0900)]
Merge pull request #1391 from Slimebreath6078/feature/Enhance_sniper_FIRE_and_COLD

[Feature]スナイパーの火炎/冷気の矢が弱点の敵に対して更に高倍率に

2 years ago[Feature]エゴ矢の倍率を参考に、弱点の場合小数切り捨てで更に1.5倍になるように
Slimebreath6078 [Mon, 16 Aug 2021 11:13:35 +0000 (20:13 +0900)]
[Feature]エゴ矢の倍率を参考に、弱点の場合小数切り捨てで更に1.5倍になるように

2 years agoMerge pull request #1388 from habu1010/feature/fix-prevent-second-black-market
Habu [Sat, 21 Aug 2021 05:21:26 +0000 (14:21 +0900)]
Merge pull request #1388 from habu1010/feature/fix-prevent-second-black-market

[Fix] ブラックマーケットが複数生成されないようにするコードが機能していない

2 years ago[Refactor] 2軒目以降のブラックマーケットを生成しないようにするコードを削除
Habu [Sat, 21 Aug 2021 05:12:18 +0000 (14:12 +0900)]
[Refactor] 2軒目以降のブラックマーケットを生成しないようにするコードを削除

今後とも地下街を同一フロアに2つ以上生成する事はなさそうなので、
ブラックマーケットが2軒生成される事は無いと判断し当該コードを削除する。

2 years ago[Fix] ブラックマーケットが複数生成されないようにするコードが機能していない
Habu [Sat, 21 Aug 2021 04:49:21 +0000 (13:49 +0900)]
[Fix] ブラックマーケットが複数生成されないようにするコードが機能していない

ダンジョンで地下街が生成された時にブラックマーケットがすでに存在する
場合は2軒目以降のブラックマーケットを生成しないようにする事を意図した
コードが存在するが、誤って f_info のインデックスと地形特性フラグを
比較しているため機能していない。
正しく f_info[].flags の内容をチェックするようにする。

なお、生成する部屋を選択するところで地下街が選択された場合は2つ目
以降の地下街の生成自体が抑制されるため、修正しても現状ではこの
コードが機能することはない。

2 years agoMerge pull request #1386 from sikabane-works/feature/refactor-enum-mind_kind_type
Deskull [Sat, 21 Aug 2021 04:43:37 +0000 (13:43 +0900)]
Merge pull request #1386 from sikabane-works/feature/refactor-enum-mind_kind_type

mind_kind_type を enum class 化して各型を矯正.

2 years agoMerge pull request #1385 from habu1010/feature/refactor-feature-flag-type
Habu [Sat, 21 Aug 2021 04:37:34 +0000 (13:37 +0900)]
Merge pull request #1385 from habu1010/feature/refactor-feature-flag-type

[Refactor] feature_flag_type の enum class 化

2 years ago[Fix] Switch-Default 抜け警告修正.
deskull [Sat, 21 Aug 2021 04:32:51 +0000 (13:32 +0900)]
[Fix] Switch-Default 抜け警告修正.

2 years ago[Refactor] mind_kind_type を enum class 化して各型を矯正.
deskull [Sat, 21 Aug 2021 03:58:16 +0000 (12:58 +0900)]
[Refactor] mind_kind_type を enum class 化して各型を矯正.

2 years ago[Refactor] feature_flag_type の enum class 化
Habu [Fri, 20 Aug 2021 19:54:51 +0000 (04:54 +0900)]
[Refactor] feature_flag_type の enum class 化

enum feature_flag_type を enum class FF に置き換える。
それに伴い、feature_flag_type 型フラグを扱っていた
feature_type::flags を BIT_FLAGS の配列型から
EnumClassFlagGroup 型に置き換え、フラグ演算を扱い
やすくする。

2 years agoMerge pull request #1380 from Hourier/feature/Unite-Command-Throw
Hourier [Sat, 21 Aug 2021 01:57:38 +0000 (10:57 +0900)]
Merge pull request #1380 from Hourier/feature/Unite-Command-Throw

確認ありがとうございました!

2 years agoMerge branch 'develop' into feature/Unite-Command-Throw
Hourier [Fri, 20 Aug 2021 15:04:50 +0000 (00:04 +0900)]
Merge branch 'develop' into feature/Unite-Command-Throw

2 years agoMerge pull request #1374 from habu1010/feature/refactor-tr-flags-alias
Habu [Fri, 20 Aug 2021 14:21:23 +0000 (23:21 +0900)]
Merge pull request #1374 from habu1010/feature/refactor-tr-flags-alias

[Refactor] TRフラグ変数の配列型を型エイリアス化

2 years ago[Refactor] TRフラグ変数の配列型を型エイリアス化
Habu [Fri, 20 Aug 2021 13:26:19 +0000 (22:26 +0900)]
[Refactor] TRフラグ変数の配列型を型エイリアス化

TRフラグを持つ変数は BIT_FLAGS flags[TR_FLAG_SIZE] のように
宣言されているが、 読みやすさ・扱いやすさの両面を考慮して
TrFlags = BIT_FLAGS[TR_FLAG_SIZE] の型エイリアスを用意し、
TrFlags flags のように変数宣言できるようにする。

また、これらの変数を受け取る関数は引数をBIT_FLAGS型の
ポインタからTrFlagsの参照で受け取るように変更する。
f(BIT_FLAGS* flags) → f(TrFlag &flags)

2 years agoMerge pull request #1369 from Hourier/feature/Remove-Type-Definitions-Alpha36-Remain...
Hourier [Fri, 20 Aug 2021 12:34:02 +0000 (21:34 +0900)]
Merge pull request #1369 from Hourier/feature/Remove-Type-Definitions-Alpha36-Remain-Stdint

確認ありがとうございました
マージします
個人的には「short damage」とか「int magic_power」等と言った形に寄せていく他、Doxygen コメントも活用していきたいと思っています
\# 具体的にはエラーコードが実質マジックナンバーであるものが散見され、返り値がerrrであることでエラーコードである旨が分かる……等。返り値を受け取った側がswitchしていることもあまりなかったり。こういう場合はenumの方が適切
\# 今はかなり減ったが、未だに「int k」「char *t」が数百行レベルの広範囲スコープで使われているのも結構な問題と思われ

2 years agoMerge pull request #1375 from shimitei/feature/fix_1340
shimitei [Fri, 20 Aug 2021 10:59:55 +0000 (19:59 +0900)]
Merge pull request #1375 from shimitei/feature/fix_1340

[Fix] #1340 で引数のxyの順番を間違えていた

2 years ago[Fix] 引数のxyが逆だった
shimitei [Fri, 20 Aug 2021 10:35:33 +0000 (19:35 +0900)]
[Fix] 引数のxyが逆だった

2 years ago[Refactor] #1370 Moved throw-util.cpp/h to throw-execution.cpp/h
Hourier [Fri, 20 Aug 2021 01:59:30 +0000 (10:59 +0900)]
[Refactor] #1370 Moved throw-util.cpp/h to throw-execution.cpp/h

2 years ago[Refactor] #1370 Reshaped cmd-throw.cpp
Hourier [Fri, 20 Aug 2021 01:53:19 +0000 (10:53 +0900)]
[Refactor] #1370 Reshaped cmd-throw.cpp

2 years ago[Refactor] #1370 Reshaped throw-util.cpp
Hourier [Fri, 20 Aug 2021 01:49:23 +0000 (10:49 +0900)]
[Refactor] #1370 Reshaped throw-util.cpp

2 years ago[Refactor] #1370 Removed unused headers in cmd-throw.cpp
Hourier [Fri, 20 Aug 2021 01:33:13 +0000 (10:33 +0900)]
[Refactor] #1370 Removed unused headers in cmd-throw.cpp

2 years ago[Refactor] #1370 Made parameters private in ObjectThrowEntity
Hourier [Fri, 20 Aug 2021 01:29:34 +0000 (10:29 +0900)]
[Refactor] #1370 Made parameters private in ObjectThrowEntity

2 years ago[Refactor] #1370 Renamed it_type to ObjectThrowEntity
Hourier [Fri, 20 Aug 2021 01:20:37 +0000 (10:20 +0900)]
[Refactor] #1370 Renamed it_type to ObjectThrowEntity

2 years ago[Refactor] #1370 Moved drop_thrown_item() from cmd-throw.cpp to throw-util.cpp/h
Hourier [Fri, 20 Aug 2021 01:18:08 +0000 (10:18 +0900)]
[Refactor] #1370 Moved drop_thrown_item() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved process_boomerang_back() from cmd-throw.cpp to throw-util...
Hourier [Fri, 20 Aug 2021 01:16:19 +0000 (10:16 +0900)]
[Refactor] #1370 Moved process_boomerang_back() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved check_boomerang_throw() from cmd-throw.cpp to throw-util.cpp/h
Hourier [Fri, 20 Aug 2021 01:14:57 +0000 (10:14 +0900)]
[Refactor] #1370 Moved check_boomerang_throw() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved display_potion_throw() from cmd-throw.cpp to throw-util.cpp/h
Hourier [Thu, 19 Aug 2021 16:10:34 +0000 (01:10 +0900)]
[Refactor] #1370 Moved display_potion_throw() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved display_figurine_throw() from cmd-throw.cpp to throw-util...
Hourier [Thu, 19 Aug 2021 16:03:36 +0000 (01:03 +0900)]
[Refactor] #1370 Moved display_figurine_throw() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved exe_throw() from cmd-throw.cpp to throw-util.cpp/h
Hourier [Thu, 19 Aug 2021 15:58:29 +0000 (00:58 +0900)]
[Refactor] #1370 Moved exe_throw() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved set_racial_chance() from cmd-throw.cpp to throw-util.cpp/h
Hourier [Thu, 19 Aug 2021 15:36:07 +0000 (00:36 +0900)]
[Refactor] #1370 Moved set_racial_chance() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved set_class_specific_throw_params() from cmd-throw.cpp to throw...
Hourier [Thu, 19 Aug 2021 15:30:48 +0000 (00:30 +0900)]
[Refactor] #1370 Moved set_class_specific_throw_params() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved reflect_inventory_by_throw() from cmd-throw.cpp to throw-util...
Hourier [Thu, 19 Aug 2021 15:28:09 +0000 (00:28 +0900)]
[Refactor] #1370 Moved reflect_inventory_by_throw() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved calc_throw_grid() from cmd-throw.cpp to throw-util.cpp/h
Hourier [Thu, 19 Aug 2021 15:23:34 +0000 (00:23 +0900)]
[Refactor] #1370 Moved calc_throw_grid() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved calc_throw_range() from cmd-throw.cpp to throw-util.cpp/h
Hourier [Thu, 19 Aug 2021 15:20:27 +0000 (00:20 +0900)]
[Refactor] #1370 Moved calc_throw_range() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Moved check_can_throw() from cmd-throw.cpp to throw-util.cpp/h
Hourier [Thu, 19 Aug 2021 15:15:49 +0000 (00:15 +0900)]
[Refactor] #1370 Moved check_can_throw() from cmd-throw.cpp to throw-util.cpp/h

2 years ago[Refactor] #1370 Replaced initialize_it_type() to it_type::it_type()
Hourier [Thu, 19 Aug 2021 15:05:49 +0000 (00:05 +0900)]
[Refactor] #1370 Replaced initialize_it_type() to it_type::it_type()

2 years ago[Refactor] #1370 Defined constructor in it_type
Hourier [Thu, 19 Aug 2021 14:59:16 +0000 (23:59 +0900)]
[Refactor] #1370 Defined constructor in it_type

2 years ago[Refactor] #1370 Made cmd-throw class
Hourier [Thu, 19 Aug 2021 14:47:00 +0000 (23:47 +0900)]
[Refactor] #1370 Made cmd-throw class

2 years ago[Refactor] #1366 Removed type alias 'VAULT_IDX'
Hourier [Thu, 19 Aug 2021 05:12:31 +0000 (14:12 +0900)]
[Refactor] #1366 Removed type alias 'VAULT_IDX'

2 years ago[Refactor] #1366 Removed type alias 'ESSENCE_IDX'
Hourier [Thu, 19 Aug 2021 05:12:04 +0000 (14:12 +0900)]
[Refactor] #1366 Removed type alias 'ESSENCE_IDX'

2 years ago[Refactor] #1366 Removed type alias 'ROOM_IDX'
Hourier [Thu, 19 Aug 2021 05:10:36 +0000 (14:10 +0900)]
[Refactor] #1366 Removed type alias 'ROOM_IDX'

2 years ago[Refactor] #1366 Removed type alias 'REALM_IDX'
Hourier [Thu, 19 Aug 2021 05:02:25 +0000 (14:02 +0900)]
[Refactor] #1366 Removed type alias 'REALM_IDX'

2 years ago[Refactor] #1366 Removed type aliases 'BACT_IDX' and 'BACT_RESTRICT_IDX'
Hourier [Thu, 19 Aug 2021 04:57:56 +0000 (13:57 +0900)]
[Refactor] #1366 Removed type aliases 'BACT_IDX' and 'BACT_RESTRICT_IDX'

2 years ago[Fix] #1366 Resolved compilation erros
Hourier [Wed, 18 Aug 2021 15:10:04 +0000 (00:10 +0900)]
[Fix] #1366 Resolved compilation erros

2 years ago[Refactor] #1366 Removed type alias 'PET_COMMAND_IDX'
Hourier [Wed, 18 Aug 2021 13:06:57 +0000 (22:06 +0900)]
[Refactor] #1366 Removed type alias 'PET_COMMAND_IDX'

2 years ago[Refactor] #1366 Removed type alias 'QUEST_TYPE' and 'QUEST_STATUS'
Hourier [Wed, 18 Aug 2021 12:58:41 +0000 (21:58 +0900)]
[Refactor] #1366 Removed type alias 'QUEST_TYPE' and 'QUEST_STATUS'

2 years ago[Refactor] #1366 Reshaped process_monster_attack_hungry()
Hourier [Wed, 18 Aug 2021 12:54:33 +0000 (21:54 +0900)]
[Refactor] #1366 Reshaped process_monster_attack_hungry()

2 years ago[Refactor] #1366 Removed type alias 'FEED'
Hourier [Wed, 18 Aug 2021 12:54:12 +0000 (21:54 +0900)]
[Refactor] #1366 Removed type alias 'FEED'

2 years ago[Refactor] #1366 Removed type alias 'ACTIVATION_IDX'
Hourier [Wed, 18 Aug 2021 12:52:07 +0000 (21:52 +0900)]
[Refactor] #1366 Removed type alias 'ACTIVATION_IDX'

2 years ago[Refactor] #1366 Removed type alias 'ACTION_IDX'
Hourier [Wed, 18 Aug 2021 12:49:43 +0000 (21:49 +0900)]
[Refactor] #1366 Removed type alias 'ACTION_IDX'

2 years ago[Refactor] #1366 Removed definition MIMIC_FLAGS
Hourier [Wed, 18 Aug 2021 12:44:56 +0000 (21:44 +0900)]
[Refactor] #1366 Removed definition MIMIC_FLAGS

2 years ago[Refactor] #1366 Removed type alias 'MIMIC_RACE_IDX'
Hourier [Wed, 18 Aug 2021 12:39:32 +0000 (21:39 +0900)]
[Refactor] #1366 Removed type alias 'MIMIC_RACE_IDX'

2 years ago[Refactor] #1366 Added todo comment to type alias 'concptr'
Hourier [Wed, 18 Aug 2021 12:38:03 +0000 (21:38 +0900)]
[Refactor] #1366 Added todo comment to type alias 'concptr'

2 years ago[Refactor] #1366 Removed type alias 'TOWN_IDX'
Hourier [Wed, 18 Aug 2021 12:36:28 +0000 (21:36 +0900)]
[Refactor] #1366 Removed type alias 'TOWN_IDX'

2 years ago[Refactor] #1366 Removed type alias 'SEX_IDX'
Hourier [Wed, 18 Aug 2021 11:43:17 +0000 (20:43 +0900)]
[Refactor] #1366 Removed type alias 'SEX_IDX'

2 years ago[Refactor] #1366 各プリミティブ型のエイリアスを統一した / Unified type aliases of primitive types
Hourier [Thu, 19 Aug 2021 04:40:36 +0000 (13:40 +0900)]
[Refactor] #1366 各プリミティブ型のエイリアスを統一した / Unified type aliases of primitive types

2 years ago[Refactor] #1366 Removed type alias 'u32b' and replaced them all to 'uint32_t'
Hourier [Thu, 19 Aug 2021 04:11:42 +0000 (13:11 +0900)]
[Refactor] #1366 Removed type alias 'u32b' and replaced them all to 'uint32_t'

2 years ago[Refactor] #1366 Removed type alias 's32b' and replaced them all to 'int32_t'
Hourier [Thu, 19 Aug 2021 04:08:07 +0000 (13:08 +0900)]
[Refactor] #1366 Removed type alias 's32b' and replaced them all to 'int32_t'

2 years ago[Refactor] #1366 Removed type alias 'u16b' and replaced them all to 'uint16_t'
Hourier [Thu, 19 Aug 2021 05:30:49 +0000 (14:30 +0900)]
[Refactor] #1366 Removed type alias 'u16b' and replaced them all to 'uint16_t'

2 years ago[Refactor] #1366 Removed type alias 's16b' and replaced them all to 'int16_t'
Hourier [Thu, 19 Aug 2021 05:28:55 +0000 (14:28 +0900)]
[Refactor] #1366 Removed type alias 's16b' and replaced them all to 'int16_t'

2 years ago[Refactor] #1366 今時stdint.h のない環境もないので左記ヘッダの存在をコンパイル成功の前提とする / Since there is no...
Hourier [Thu, 19 Aug 2021 05:26:32 +0000 (14:26 +0900)]
[Refactor] #1366 今時stdint.h のない環境もないので左記ヘッダの存在をコンパイル成功の前提とする / Since there is no environment without stdint.h at this time, the existence of the header is a prerequisite for successful compilation

2 years ago[Refactor] #1366 Added the check of OS environment
Hourier [Wed, 18 Aug 2021 10:52:39 +0000 (19:52 +0900)]
[Refactor] #1366 Added the check of OS environment

2 years agoMerge pull request #1345 from sikabane-works/feature/refactor-cfm_type-comment
Deskull [Thu, 19 Aug 2021 06:18:50 +0000 (15:18 +0900)]
Merge pull request #1345 from sikabane-works/feature/refactor-cfm_type-comment

[Add] cfm_type をDoxygenコメントに置換し、確認調整.

2 years ago[Refactor] #1366 Renamed type alias 'huge' to 'ulong'
Hourier [Wed, 18 Aug 2021 10:43:52 +0000 (19:43 +0900)]
[Refactor] #1366 Renamed type alias 'huge' to 'ulong'

2 years agoMerge pull request #1365 from sikabane-works/feature/refactor-doxygen-comment-autopick
Deskull [Wed, 18 Aug 2021 22:27:51 +0000 (07:27 +0900)]
Merge pull request #1365 from sikabane-works/feature/refactor-doxygen-comment-autopick

[Refactor] autopick内の関数コメントをDoxygen向けに整形.

2 years ago[Fix] 未使用定義 "CFM_LONG_STAIRS" 改名
Deskull [Wed, 18 Aug 2021 22:25:14 +0000 (07:25 +0900)]
[Fix] 未使用定義 "CFM_LONG_STAIRS" 改名

2 years agoMerge pull request #1363 from backwardsEric/Pakuman-English
Deskull [Wed, 18 Aug 2021 14:54:55 +0000 (23:54 +0900)]
Merge pull request #1363 from backwardsEric/Pakuman-English

Edit the English description of Pakuman for clarity

2 years agoEdit the English description of Pakuman for clarity. According to sikabane-works...
Eric Branlund [Wed, 18 Aug 2021 14:44:22 +0000 (07:44 -0700)]
Edit the English description of Pakuman for clarity.  According to sikabane-works, Pakuman makes a mess of things and does them in the wrong order.

2 years agoMerge pull request #1344 from sikabane-works/feature/refactor-player_race_type
Deskull [Wed, 18 Aug 2021 14:41:33 +0000 (23:41 +0900)]
Merge pull request #1344 from sikabane-works/feature/refactor-player_race_type

[Refactor] player_race_type を enum から enum class に置換
HabuさんはDiscordでリプライかけてまで問題ないと言及してくれていたのでそのままマージします。ありがとうございました。

2 years agoMerge pull request #1340 from shimitei/feature/#1339_mute_noise_sound
shimitei [Wed, 18 Aug 2021 13:01:44 +0000 (22:01 +0900)]
Merge pull request #1340 from shimitei/feature/#1339_mute_noise_sound

[Fix] プレイヤーが感知不能な場面の効果音を制限する

2 years ago[Refactor] autopick内の関数コメントをDoxygen向けに整形.
Deskull [Tue, 17 Aug 2021 12:07:15 +0000 (21:07 +0900)]
[Refactor] autopick内の関数コメントをDoxygen向けに整形.

2 years agoMerge pull request #1362 from backwardsEric/Nezumi-Kozou-English
Deskull [Mon, 16 Aug 2021 10:18:04 +0000 (19:18 +0900)]
Merge pull request #1362 from backwardsEric/Nezumi-Kozou-English

Edit the English description of Nezumi-Kozou

2 years agoMerge pull request #1360 from backwardsEric/RBE_HUNGRY-English-lore
Deskull [Mon, 16 Aug 2021 10:16:11 +0000 (19:16 +0900)]
Merge pull request #1360 from backwardsEric/RBE_HUNGRY-English-lore

Change English description for HUNGRY blows

2 years agoMerge pull request #1359 from backwardsEric/monster-damage-english-edits
Deskull [Mon, 16 Aug 2021 10:14:07 +0000 (19:14 +0900)]
Merge pull request #1359 from backwardsEric/monster-damage-english-edits

Fix some verbs in English death messages

2 years agoMerge pull request #1364 from backwardsEric/enchant-error-english
Deskull [Mon, 16 Aug 2021 10:06:35 +0000 (19:06 +0900)]
Merge pull request #1364 from backwardsEric/enchant-error-english

Change whitespace and capitalization in English armor enchantment message

2 years agoChange whitespace and capitalization in English armor enchantment message.
Eric Branlund [Sun, 15 Aug 2021 18:07:35 +0000 (11:07 -0700)]
Change whitespace and capitalization in English armor enchantment message.

2 years agoEdit the English description of Nezumi-Kozou: primarily for more consistent verb...
Eric Branlund [Sun, 15 Aug 2021 17:41:59 +0000 (10:41 -0700)]
Edit the English description of Nezumi-Kozou:  primarily for more consistent verb tenses and subject-verb agreement.

2 years agoChange English description for HUNGRY blows to avoid spelling mistake and imply an...
Eric Branlund [Sat, 14 Aug 2021 17:53:33 +0000 (10:53 -0700)]
Change English description for HUNGRY blows to avoid spelling mistake and imply an action rather than a state.

2 years agoFix some verbs in English death messages. Resolves https://github.com/hengband/hengb...
Eric Branlund [Sat, 14 Aug 2021 17:21:14 +0000 (10:21 -0700)]
Fix some verbs in English death messages.  Resolves https://github.com/hengband/hengband/issues/1348 .

2 years agoMerge pull request #1357 from daradarach/feature/famine
Habu [Sat, 14 Aug 2021 16:48:38 +0000 (01:48 +0900)]
Merge pull request #1357 from daradarach/feature/famine

空腹進行殴りを追加し、第三の乗り手『フェミン』のEAT_FOODを空腹進行に変更

2 years agoテストプレイで、PY_FOOD_ALERTを下回ったタイミングで空腹になることを確認したため、空腹警告で一旦止まるように変更。PY_FOOD_FAINTは下回ると麻痺し得...
daradarach [Sat, 14 Aug 2021 15:58:43 +0000 (00:58 +0900)]
テストプレイで、PY_FOOD_ALERTを下回ったタイミングで空腹になることを確認したため、空腹警告で一旦止まるように変更。PY_FOOD_FAINTは下回ると麻痺し得るためあくまでPY_FOOD_FAINTで止めるままとした

2 years ago複数回登場する"target_ptr->food - monap_ptr->damage"を一時変数に投入。
daradarach [Sat, 14 Aug 2021 15:54:03 +0000 (00:54 +0900)]
複数回登場する"target_ptr->food - monap_ptr->damage"を一時変数に投入。

2 years agoフェミンの空腹進行について、殴りから触れるように変更。空腹進行値を8d60→1500d1に変更。ただし空腹
daradarach [Sat, 14 Aug 2021 14:52:24 +0000 (23:52 +0900)]
フェミンの空腹進行について、殴りから触れるように変更。空腹進行値を8d60→1500d1に変更。ただし空腹
衰弱の前にセーフティを設置

2 years ago空腹進行殴りを追加し、第三の乗り手『フェミン』のEAT_FOODを空腹進行に変更
daradarach [Sat, 14 Aug 2021 13:29:51 +0000 (22:29 +0900)]
空腹進行殴りを追加し、第三の乗り手『フェミン』のEAT_FOODを空腹進行に変更

2 years agoMerge pull request #1353 from habu1010/feature/bit-flags-calculator-macro-to-function
Habu [Sat, 14 Aug 2021 04:10:54 +0000 (13:10 +0900)]
Merge pull request #1353 from habu1010/feature/bit-flags-calculator-macro-to-function

[Refactor] ビットフラグ操作マクロ群を関数に変更

2 years ago[Refactor] ビットフラグ操作マクロ群を関数に変更
Habu [Sat, 14 Aug 2021 03:49:57 +0000 (12:49 +0900)]
[Refactor] ビットフラグ操作マクロ群を関数に変更

なるべくマクロの使用は避けるべきなので、ビットフラグ操作
マクロを関数に変更する。
対象: set_bits, reset_bits, any_bits, all_bits, none_bits, match_bits

また、関数化にあたり追加した引数型のアサーションにより
見つかったビットフラグとして扱っている符号付き変数を、
符号無し変数に変更する。

2 years agoMerge pull request #1351 from habu1010/feature/fix-bless-weapon-reset-feeling
Habu [Sat, 14 Aug 2021 03:49:24 +0000 (12:49 +0900)]
Merge pull request #1351 from habu1010/feature/fix-bless-weapon-reset-feeling

[Fix] 武器祝福で簡易鑑定状態がリセットされない

2 years ago[Fix] 不足しているキャストに追加対応.
Deskull [Sat, 14 Aug 2021 03:21:24 +0000 (12:21 +0900)]
[Fix] 不足しているキャストに追加対応.

2 years ago[Refactor] player_race_type の RACE_* 表記が冗長になったので削除.
Deskull [Sat, 14 Aug 2021 03:05:42 +0000 (12:05 +0900)]
[Refactor] player_race_type の RACE_* 表記が冗長になったので削除.

2 years ago[Refactor] player_race_type を enum から enum class に置換.キャストはstatic_cast<>を利用.
Deskull [Sat, 14 Aug 2021 03:03:07 +0000 (12:03 +0900)]
[Refactor] player_race_type を enum から enum class に置換.キャストはstatic_cast<>を利用.

2 years ago[Fix] 武器祝福で簡易鑑定状態がリセットされない
Habu [Sat, 14 Aug 2021 02:53:33 +0000 (11:53 +0900)]
[Fix] 武器祝福で簡易鑑定状態がリセットされない

ビットフラグでない変数に対しビット操作を誤って行っており
簡易鑑定状態がリセットされないので、武器祝福が成功しても
簡易鑑定状態が「呪われている」のままとなってしまう。
ビット操作ではなく代入に修正する。

2 years agoMerge pull request #1341 from sikabane-works/feature/fix-monspeak-Spawn-of-Yog
Deskull [Fri, 13 Aug 2021 15:28:58 +0000 (00:28 +0900)]
Merge pull request #1341 from sikabane-works/feature/fix-monspeak-Spawn-of-Yog

[Fix] ヨグ=ソトートの落とし子の日本語版の通常monspeakが死に際になっていたのを修正.

2 years agoMerge pull request #1342 from sikabane-works/feature/refactor-recall-random-quest...
Deskull [Fri, 13 Aug 2021 15:12:01 +0000 (00:12 +0900)]
Merge pull request #1342 from sikabane-works/feature/refactor-recall-random-quest-failure

Feature/refactor recall random quest failure

2 years ago[Refactor] さらに整形.
Deskull [Fri, 13 Aug 2021 14:48:18 +0000 (23:48 +0900)]
[Refactor] さらに整形.

2 years agocheck_random_quest_auto_failure()修正
Deskull [Fri, 13 Aug 2021 14:23:52 +0000 (23:23 +0900)]
check_random_quest_auto_failure()修正

2 years agoMerge pull request #1323 from backwardsEric/functional-include-debian
Hourier [Fri, 13 Aug 2021 13:16:02 +0000 (22:16 +0900)]
Merge pull request #1323 from backwardsEric/functional-include-debian

Fix Debian Buster compilation for std::function