OSDN Git Service
Hourier [Wed, 27 Jan 2021 11:14:55 +0000 (20:14 +0900)]
Merge branch 'feature/fix-calc-status' into develop
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
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
deskull [Sun, 24 Jan 2021 04:21:52 +0000 (13:21 +0900)]
Merge remote-tracking branch 'remotes/origin/Feature/Fix-Sorcerer-Icky-Wield' into develop
Hourier [Sun, 24 Jan 2021 04:16:28 +0000 (13:16 +0900)]
[Fix] #41320 スペルマスターとプリーストで素手が相応しくない武器として扱われる不具合を修正 / Resolved the issue that bare hands are treated as icky weapon when player's class is sorcerer or priest
deskull [Sun, 24 Jan 2021 04:16:18 +0000 (13:16 +0900)]
Merge remote-tracking branch 'remotes/origin/Feature/Refactor-Drain-Staff-Wand' into develop
deskull [Sun, 24 Jan 2021 04:12:56 +0000 (13:12 +0900)]
Merge remote-tracking branch 'remotes/origin/Feature/Refactor-Artifacts' into develop
deskull [Sun, 24 Jan 2021 04:06:04 +0000 (13:06 +0900)]
Merge remote-tracking branch 'remotes/origin/Feature/Refactor-Monsters-3.0.0Alpha2' into develop
deskull [Sun, 24 Jan 2021 02:09:42 +0000 (11:09 +0900)]
Merge remote-tracking branch 'remotes/origin/Feature/Fix-English-Bugs' into develop
Hourier [Thu, 21 Jan 2021 11:08:00 +0000 (20:08 +0900)]
[Refactor] #41073 『エスカリボルグ』のパラメータを調整した / Adjusted the parameters of Excaliborg
Hourier [Tue, 19 Jan 2021 12:30:28 +0000 (21:30 +0900)]
[Refactor] #41073 運命のオーブで英語の説明文が表示されていたのを修正した / Resolved the issue an English description was displayed in the Orb of Fate
Hourier [Sun, 17 Jan 2021 08:01:39 +0000 (17:01 +0900)]
[Fix] #41073 『ドン・キホーテのヘヴィ・ランス』で電撃免疫が耐性になっていたのを修正 / Resolved the issue that the heavy lance of Don Quixote has RES_ELEC instead of IM_ELEC
Hourier [Sun, 24 Jan 2021 00:10:57 +0000 (09:10 +0900)]
[Fix] #41042 万色ワイアームがグレート万色ワイアームに進化しない事象を修正した / Resolved the issue that Wyrm of Many Colours didn't evolve to Great Wyrm of Many Colours
deskull [Sat, 23 Jan 2021 15:40:27 +0000 (00:40 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-BufferOverRun-spoil_out' into develop
Hourier [Sat, 23 Jan 2021 14:07:03 +0000 (23:07 +0900)]
[Refactor] #41042 モンスターフラグの微調整 (内容変更なし) / Adjusted the monster flags (contents wasn't changed)
Hourier [Sat, 23 Jan 2021 13:29:34 +0000 (22:29 +0900)]
[Refactor] #41042 新規zのパラメータ調整 / Adjusted the parameters of new comers of 'z'
Hourier [Sat, 23 Jan 2021 03:44:54 +0000 (12:44 +0900)]
[WIP] [Refacor] #41042 泡と龍虫が分裂した時に効果音を出すようにした (注:後処理が不足している) / Added sound effect when auqa illusion and dragon centipedes (Note: Insufficient post-process of summoning)
Hourier [Fri, 22 Jan 2021 13:33:39 +0000 (22:33 +0900)]
[Refactor] #41042 クリスタル・キューブのHP調整 / Adjusted HP of Crystal cube
Hourier [Fri, 22 Jan 2021 13:12:28 +0000 (22:12 +0900)]
[Refactor] #41042 古代万色DのHPを修正 / Changed Ancient multi-hued dragon's HP
Hourier [Fri, 22 Jan 2021 09:24:07 +0000 (18:24 +0900)]
[Implement] #41042 『ダーネヴィール』と『アルドゥイン』に打撃を追加した。その他微調整いくつか / Added blows to Durnehviir and Alduin, and changed some monsters' parameters
Hourier [Fri, 22 Jan 2021 09:10:06 +0000 (18:10 +0900)]
[Implement] #41042 ミミックnestに登場していなかったミミック達を追加した / Added mimics for mimic nest that doesn't appear
Hourier [Fri, 22 Jan 2021 09:04:48 +0000 (18:04 +0900)]
[Refactor] #41052 Reshaped rooms-pit-nest.c automatically
Hourier [Fri, 22 Jan 2021 09:04:38 +0000 (18:04 +0900)]
[Refactor] #41052 Reshaped rooms-pit-nest.c
Hourier [Thu, 21 Jan 2021 13:22:29 +0000 (22:22 +0900)]
[Refactor] #41042 r_infoのフォーマット調整、内容は変更せず / Adjusted the format of r_info.txt, not changed any parameter
Hourier [Thu, 21 Jan 2021 12:27:44 +0000 (21:27 +0900)]
[Refactor] #41268 DROP_GREATフラグを持つモンスター情報からDROP_GOODフラグを削除した / Deleted DROP_GOOD flag from monsters that has DROP_GREAT flag
Hourier [Thu, 21 Jan 2021 12:08:48 +0000 (21:08 +0900)]
[Implement] #41042 技術系モンスターのセリフを追加・修正した / Added/changed dialogs of technical monsters
Hourier [Thu, 21 Jan 2021 10:55:49 +0000 (19:55 +0900)]
[Implement] #41042 スティーブンのセリフを英訳した / Added English dialog for Steven
Hourier [Thu, 21 Jan 2021 10:55:06 +0000 (19:55 +0900)]
[Fix] #41042 スティーブンが召喚するモンスターが誤っていたので差し替え / Changed S_KIN monster of Steven from Edge to Eye phorn
Hourier [Wed, 20 Jan 2021 10:25:45 +0000 (19:25 +0900)]
[Fix] #41042 ユニコーンのフレーバーテキストを日本語だけ表示するように修正 / Resolved the issue that the flavor text of Unicorn displays in both Japanese and English
Hourier [Tue, 19 Jan 2021 12:25:07 +0000 (21:25 +0900)]
[Fix] #41042 DROP_GREATを持ち、かつDROP_GOODを持たないモンスターにDROP_GOODを追加した / Added DROP_GOOD flag to monsters that doesn't have it but has DROP_GREAT
Hourier [Mon, 18 Jan 2021 14:21:03 +0000 (23:21 +0900)]
[Refactor] #41042 グレート・インフェルノ・ドレイクのHPをクリスタル&ロアに揃えた / Uniformed the HP of Great Inferno Drake into Crystal and Roar
Hourier [Mon, 18 Jan 2021 12:30:39 +0000 (21:30 +0900)]
[Refactor] #41042 泡のPOWERFULフラグを削除した (元々マジックミサイルでは無意味だがフレーバー的に) / Removed the flag of POWERFUL from aqua illusions
Hourier [Mon, 18 Jan 2021 12:24:23 +0000 (21:24 +0900)]
[Refactor] #41042 『サーロクニル』と『オダハヴィーング』の加速値を変更した / Changed speed of 'Sahloknir' and 'Odahviing'
Hourier [Sun, 17 Jan 2021 15:06:45 +0000 (00:06 +0900)]
[Refactor] #41042 『アポロ』に個性を出すため加速を付けた / Added Apollo's spped from +0 to +10
Hourier [Sun, 17 Jan 2021 06:57:44 +0000 (15:57 +0900)]
[Refactor] #40412 グレーター・ファルメル・スクルカーがPOWERFULフラグを持っていた事象を修正 / Resolved the issue that the greater falmer skullker has POWERFUL flag
Hourier [Sun, 17 Jan 2021 05:56:28 +0000 (14:56 +0900)]
[Fix] #41042 『アポロ』が射撃をしない不具合を修正 / Resolved the issue that Apollo doesn't shoot any arrow
Hourier [Sun, 17 Jan 2021 05:50:59 +0000 (14:50 +0900)]
[Refactor] #41042 クリスタル・キューブの出現頻度を少し低下させた / Decreased the possibility of appearance of crystal cube
Hourier [Sun, 17 Jan 2021 05:49:16 +0000 (14:49 +0900)]
[Refactor] #41042 泡の出現頻度を少し低下させた / Decreased the possibility of appearance of aqua illusions
Hourier [Sun, 17 Jan 2021 05:41:17 +0000 (14:41 +0900)]
[Refactor] #41042 殺人イタチのシンボルをfからrに戻した / Falled back the symbol of killer weasel from f to r
Eric Branlund [Mon, 11 Jan 2021 16:58:09 +0000 (08:58 -0800)]
Bring version number in configure.ac into agreement with the one in system/angband-version.h.
Eric Branlund [Mon, 18 Jan 2021 23:53:49 +0000 (15:53 -0800)]
Implement workaround to resolve https://osdn.net/projects/hengband/ticket/41161 and part of https://osdn.net/projects/hengbandforosx/ticket/41228 . Move macro definitions from autopick-editor-table.h to autopick-menu-data-table.c so the preprocessing with nkf on Linux and Mac can change the encoding for Japanese. Remove autopick-editor-table.h. Change the macros in autopick-keys-table.h to be pointers to constant strings. Initialize those strings in autopick-menu-data-table.c so the initializing strings can be shared with the initializers for menu_data and so the preprocessing with nkf can change the encoding for Japanese.
Eric Branlund [Wed, 20 Jan 2021 00:20:19 +0000 (16:20 -0800)]
The change to use concptr for the KEY_* constants rather than explicit string constants has to be matched with a corresponding change to the length calculation in the MATCH_KEY and MATCH_KEY2 macros.
Eric Branlund [Fri, 22 Jan 2021 00:51:12 +0000 (16:51 -0800)]
Fixed two instances where search/replace left it_ptr-> in English messages.
Eric Branlund [Thu, 21 Jan 2021 00:47:30 +0000 (16:47 -0800)]
Fix for English version so quest information is displayed when a quest is accepted from a building menu (i.e. the mayor's office or inn in Outpost).
Eric Branlund [Wed, 20 Jan 2021 23:51:39 +0000 (15:51 -0800)]
Change listed keys in the English version of knowledge menu so they match with the Japanese and correspond to what needs to be pressed to access the given menu item.
Habu [Sat, 23 Jan 2021 02:01:26 +0000 (11:01 +0900)]
[fix] #41312 spoil_out 関数におけるバッファオーバーラン
参照するフラグを誤っているため、2バイト文字の2バイト目を1バイト目として処理してしまっている。
文字列の最後('\0'の前)が2バイト文字だった場合、バッファの範囲外にアクセスする可能性がある。
正しいフラグを参照するように修正する。
Hourier [Fri, 22 Jan 2021 13:15:45 +0000 (22:15 +0900)]
[Refactor #41192 魔道具吸収によるHPの回復量を調整した / Adjusted the recovery of monster when it attacks drain magic item
deskull [Fri, 22 Jan 2021 12:18:52 +0000 (21:18 +0900)]
Merge remote-tracking branch 'remotes/origin/Feature/Fix-Choose-Nothing' into develop
Hourier [Fri, 22 Jan 2021 11:17:28 +0000 (20:17 +0900)]
[Fix] #41192 魔道具能力向上がないのに魔道具の吸収量が減衰していたのを修正 / Resolved the issue that the quantity of magic drain was decreased even when player doesn't equip magic mastery
dis- [Fri, 22 Jan 2021 08:51:16 +0000 (17:51 +0900)]
[Fix] #41308 一定条件下で無を選択する不具合を修正
タグを使用してアイテムを選択しているとき、コマンド繰り返しの挙動が正しくなかった。
個数0のときの条件を貫通していたので、該当の条件節を訂正。
deskull [Thu, 21 Jan 2021 15:49:33 +0000 (00:49 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Resist-Shard-HalfGiant' into develop
Habu [Thu, 21 Jan 2021 11:03:47 +0000 (20:03 +0900)]
[Fix] #41297 破片耐性の傷無効が効かない
has_resist_shard() で種族による耐性の判定で半巨人であるべき所が半タイタンになってしまっている。
例によってキャラクタ情報表示用の add_race_flags() は正しいので実際に得ている耐性と齟齬が生じていた。
ただしく半巨人で破片耐性が得られるようにし、半タイタンでは破片耐性は得られないようにする。
Habu [Thu, 21 Jan 2021 08:37:27 +0000 (17:37 +0900)]
[Fix] #41295 狂戦士で地震を撃ったら画面中の敵以外のマスが@で埋め尽くされる
earthquake() の処理で、地震によりモンスターの居るマスの移動が発生した時に
update_monster() に地震により移動したモンスターのモンスターIDではなく
地震を発生させたモンスターのモンスターIDを誤って渡しているのが原因。
プレイヤーが地震を発生させた時はモンスターIDとして 0 が渡されるため、
update_monster() で想定外の処理が発生している。
正しく地震により移動したモンスターのモンスターIDを渡すようにする。
deskull [Wed, 20 Jan 2021 23:25:59 +0000 (08:25 +0900)]
Merge branch 'Feature/Fix-ESP-target' into develop
deskull [Wed, 20 Jan 2021 23:25:32 +0000 (08:25 +0900)]
[Fix] #41299 has_esp_nonliving()の判定基準が TR_ESP_GOOD になっていた不具合を修正. / Fixed a bug that the criterion of has_esp_nonliving() was TR_ESP_GOOD.
deskull [Wed, 20 Jan 2021 23:15:37 +0000 (08:15 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Monster-OutOfArrayAccess' into develop
deskull [Wed, 20 Jan 2021 23:08:20 +0000 (08:08 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Update-gitignore' into develop
Habu [Wed, 20 Jan 2021 21:36:34 +0000 (06:36 +0900)]
[Fix] 英語バージョン用のビルドフォルダを .gitignore に追加
デフォルトの Visual Studio の .gitignore で上書きしたため、
英語バージョンの構成でビルドする時の
ビルドフォルダ English-Debug/ が消えていた。
また上書きで消えてしまわないように別の場所へ追加しておく。
Hourier [Wed, 20 Jan 2021 13:47:50 +0000 (22:47 +0900)]
[Fix] #41266 モンスター名が80バイトしか確保されていない箇所を全て160バイトに変更した (つもり、要チェック) / Changed from 80 bytes to 160 bytes for the size of array in order not to violate access
deskull [Wed, 20 Jan 2021 13:50:01 +0000 (22:50 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Ring-Activation' into develop
deskull [Wed, 20 Jan 2021 13:15:17 +0000 (22:15 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Update-gitignore' into develop
deskull [Wed, 20 Jan 2021 13:14:40 +0000 (22:14 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Lore-OutOfArrayAccess' into develop
deskull [Wed, 20 Jan 2021 12:56:52 +0000 (21:56 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-BlueMage-TurnlessFire' into develop
deskull [Wed, 20 Jan 2021 12:46:50 +0000 (21:46 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Aggravate-S_Fairy' into develop
dis- [Wed, 20 Jan 2021 11:51:25 +0000 (20:51 +0900)]
[Fix] 青魔法成功時ターンとMPの消費がない
switch_cast_blue_magicの判定が反転していた
dis- [Wed, 20 Jan 2021 04:18:05 +0000 (13:18 +0900)]
[Refactor] has_*でboolでないため修正
deskull [Tue, 19 Jan 2021 22:17:18 +0000 (07:17 +0900)]
Merge remote-tracking branch 'remotes/origin/feature/Fix-Aggravate-S_Fairy' into develop
dis- [Tue, 19 Jan 2021 15:47:14 +0000 (00:47 +0900)]
[Fix] include漏れを修正