• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision1cc2d765f1c08eb7f879d7d8da9db89f65759047 (tree)
Time2016-04-27 22:18:24
AuthorDeskull <desull@user...>
CommiterDeskull

Log Message

襲撃を受けた時(ambush)、通常クエストをクリアした時(quest_clear)、最終クエストをクリアした時(final_quest_clear)それぞれにBGM変更処理を追加。 / Add music change points to when ambushed, complete normal quests and the final quest.

Change Summary

Incremental Difference

--- a/lib/xtra/music/music.cfg
+++ b/lib/xtra/music/music.cfg
@@ -30,6 +30,9 @@ type = MPEGVideo
3030 # quest クエスト
3131 # arena アリーナで決闘時
3232 # battle カジノの闘技場時
33+# quest_clear クエストをクリアした時からフロアを移る時まで
34+# final_quest_clear 最終クエスト(*勝利*条件)をクリアした時からフロアを移る時まで
35+# ambush 襲撃を受けてフロアを移る時まで
3336 [Basic]
3437 gameover =
3538 exit =
@@ -48,6 +51,9 @@ wild =
4851 quest =
4952 arena =
5053 battle =
54+quest_clear =
55+final_quest_clear =
56+ambush =
5157
5258 # [Town]項目
5359 # 町の個別BGMを指定します
--- a/src/defines.h
+++ b/src/defines.h
@@ -4453,7 +4453,10 @@ extern int PlayerUID;
44534453 #define MUSIC_BASIC_QUEST 15
44544454 #define MUSIC_BASIC_ARENA 16
44554455 #define MUSIC_BASIC_BATTLE 17
4456-#define MUSIC_BASIC_MAX 18 /*!< BGM定義の最大数 */
4456+#define MUSIC_BASIC_QUEST_CLEAR 18
4457+#define MUSIC_BASIC_FINAL_QUEST_CLEAR 19
4458+#define MUSIC_BASIC_AMBUSH 20
4459+#define MUSIC_BASIC_MAX 21 /*!< BGM定義の最大数 */
44574460
44584461 /*** Sound constants ***/
44594462
--- a/src/util.c
+++ b/src/util.c
@@ -1727,6 +1727,12 @@ void select_floor_music()
17271727 /* No sound */
17281728 if (!use_music) return;
17291729
1730+ if(ambush_flag)
1731+ {
1732+ play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_AMBUSH);
1733+ return;
1734+ }
1735+
17301736 if(p_ptr->wild_mode)
17311737 {
17321738 play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_WILD);
--- a/src/variable.c
+++ b/src/variable.c
@@ -673,6 +673,9 @@ const cptr angband_music_basic_name[MUSIC_BASIC_MAX] =
673673 "quest",
674674 "arena",
675675 "battle",
676+ "quest_clear",
677+ "final_quest_clear",
678+ "ambush",
676679 };
677680
678681
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -420,6 +420,7 @@ void complete_quest(int quest_num)
420420
421421 if (!(q_ptr->flags & QUEST_FLAG_SILENT))
422422 {
423+ play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_QUEST_CLEAR);
423424 msg_print(_("クエストを達成した!", "You just completed your quest!"));
424425 msg_print(NULL);
425426 }
@@ -1404,6 +1405,8 @@ void monster_death(int m_idx, bool drop_item)
14041405 /* Redraw the "title" */
14051406 p_ptr->redraw |= (PR_TITLE);
14061407
1408+ play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FINAL_QUEST_CLEAR);
1409+
14071410 do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("見事に変愚蛮怒の勝利者となった!", "become *WINNER* of Hengband finely!"));
14081411
14091412 if ((p_ptr->pclass == CLASS_CHAOS_WARRIOR) || (p_ptr->muta2 & MUT2_CHAOS_GIFT))
Show on old repository browser