From 78812085c9a5633ddb41a93a3853f5e5fa8a0b9a Mon Sep 17 00:00:00 2001 From: Deskull Date: Sat, 16 Aug 2014 20:04:26 +0900 Subject: [PATCH] Fix definition of summon type. --- src/cmd5.c | 6 +++--- src/defines.h | 12 ++++++------ src/do-spell.c | 14 +++++++------- src/melee2.c | 2 +- src/monster2.c | 16 +++++----------- src/mutation.c | 2 +- 6 files changed, 23 insertions(+), 29 deletions(-) diff --git a/src/cmd5.c b/src/cmd5.c index 9ed78facd..211839b5a 100644 --- a/src/cmd5.c +++ b/src/cmd5.c @@ -946,10 +946,10 @@ void do_cmd_study(void) static void wild_magic(int spell) { int counter = 0; - int type = SUMMON_BIZARRE1 + randint0(6); + int type = SUMMON_MOLD + randint0(6); - if (type < SUMMON_BIZARRE1) type = SUMMON_BIZARRE1; - else if (type > SUMMON_BIZARRE6) type = SUMMON_BIZARRE6; + if (type < SUMMON_MOLD) type = SUMMON_MOLD; + else if (type > SUMMON_MIMIC) type = SUMMON_MIMIC; switch (randint1(spell) + randint1(8) + 1) { diff --git a/src/defines.h b/src/defines.h index f2d5af14f..3e35dba6c 100644 --- a/src/defines.h +++ b/src/defines.h @@ -2945,12 +2945,12 @@ #define SUMMON_HI_DEMON 23 /*!< 召喚タイプ: 上級デーモン */ #define SUMMON_AMBERITES 31 /*!< 召喚タイプ: アンバーの王族 */ #define SUMMON_UNIQUE 32 /*!< 召喚タイプ: ユニーク */ -#define SUMMON_BIZARRE1 33 /*!< 召喚タイプ: カビ */ -#define SUMMON_BIZARRE2 34 /*!< 召喚タイプ: コウモリ */ -#define SUMMON_BIZARRE3 35 /*!< 召喚タイプ: クイルスルグ */ -#define SUMMON_BIZARRE4 36 /*!< 召喚タイプ: ボルテックス */ -#define SUMMON_BIZARRE5 37 /*!< 召喚タイプ: クリーピング・コイン */ -#define SUMMON_BIZARRE6 38 /*!< 召喚タイプ: ミミック */ +#define SUMMON_MOLD 33 /*!< 召喚タイプ: カビ */ +#define SUMMON_BAT 34 /*!< 召喚タイプ: コウモリ */ +#define SUMMON_QUYLTHULG 35 /*!< 召喚タイプ: クイルスルグ */ +#define SUMMON_XXX1 36 /*!< 召喚タイプ: 未使用 */ +#define SUMMON_COIN_MIMIC 37 /*!< 召喚タイプ: クリーピング・コイン */ +#define SUMMON_MIMIC 38 /*!< 召喚タイプ: ミミック */ #define SUMMON_CYBER 39 /*!< 召喚タイプ: サイバーデーモン */ #define SUMMON_KIN 40 /*!< 召喚タイプ: 召喚者の同族 */ #define SUMMON_DAWN 41 /*!< 召喚タイプ: 暁の戦士 */ diff --git a/src/do-spell.c b/src/do-spell.c index 83a8c56e9..8a750ec9c 100644 --- a/src/do-spell.c +++ b/src/do-spell.c @@ -490,10 +490,10 @@ static void cast_invoke_spirits(int dir) static void wild_magic(int spell) { int counter = 0; - int type = SUMMON_BIZARRE1 + randint0(6); + int type = SUMMON_MOLD + randint0(6); - if (type < SUMMON_BIZARRE1) type = SUMMON_BIZARRE1; - else if (type > SUMMON_BIZARRE6) type = SUMMON_BIZARRE6; + if (type < SUMMON_MOLD) type = SUMMON_MOLD; + else if (type > SUMMON_MIMIC) type = SUMMON_MIMIC; switch (randint1(spell) + randint1(8) + 1) { @@ -706,22 +706,22 @@ static void cast_shuffle(void) else if (die < 82) { msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster.")); - trump_summoning(1, TRUE, py, px, (dun_level * 3 / 2), SUMMON_BIZARRE1, 0L); + trump_summoning(1, TRUE, py, px, (dun_level * 3 / 2), SUMMON_MOLD, 0L); } else if (die < 84) { msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster.")); - trump_summoning(1, TRUE, py, px, (dun_level * 3 / 2), SUMMON_BIZARRE2, 0L); + trump_summoning(1, TRUE, py, px, (dun_level * 3 / 2), SUMMON_BAT, 0L); } else if (die < 86) { msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster.")); - trump_summoning(1, TRUE, py, px, (dun_level * 3 / 2), SUMMON_BIZARRE4, 0L); + trump_summoning(1, TRUE, py, px, (dun_level * 3 / 2), SUMMON_VORTEX, 0L); } else if (die < 88) { msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster.")); - trump_summoning(1, TRUE, py, px, (dun_level * 3 / 2), SUMMON_BIZARRE5, 0L); + trump_summoning(1, TRUE, py, px, (dun_level * 3 / 2), SUMMON_COIN_MIMIC, 0L); } else if (die < 96) { diff --git a/src/melee2.c b/src/melee2.c index d54bf08fc..1044589c5 100644 --- a/src/melee2.c +++ b/src/melee2.c @@ -2430,7 +2430,7 @@ static void process_monster(int m_idx) for (k = 0; k < 6; k++) { - if (summon_specific(m_idx, m_ptr->fy, m_ptr->fx, rlev, SUMMON_BIZARRE1, (PM_ALLOW_GROUP | p_mode))) + if (summon_specific(m_idx, m_ptr->fy, m_ptr->fx, rlev, SUMMON_MOLD, (PM_ALLOW_GROUP | p_mode))) { if (m_list[hack_m_idx_ii].ml) count++; } diff --git a/src/monster2.c b/src/monster2.c index 0d708c912..23049f074 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -761,35 +761,29 @@ static bool summon_specific_aux(int r_idx) break; } - case SUMMON_BIZARRE1: + case SUMMON_MOLD: { okay = (r_ptr->d_char == 'm'); break; } - case SUMMON_BIZARRE2: + case SUMMON_BAT: { okay = (r_ptr->d_char == 'b'); break; } - case SUMMON_BIZARRE3: + case SUMMON_QUYLTHULG: { okay = (r_ptr->d_char == 'Q'); break; } - case SUMMON_BIZARRE4: - { - okay = (r_ptr->d_char == 'v'); - break; - } - - case SUMMON_BIZARRE5: + case SUMMON_COIN_MIMIC: { okay = (r_ptr->d_char == '$'); break; } - case SUMMON_BIZARRE6: + case SUMMON_MIMIC: { okay = ((r_ptr->d_char == '!') || (r_ptr->d_char == '?') || diff --git a/src/mutation.c b/src/mutation.c index 84261c797..c41367eb2 100644 --- a/src/mutation.c +++ b/src/mutation.c @@ -2326,7 +2326,7 @@ bool mutation_power_aux(u32b power) int i; for (i = 0; i < 8; i++) { - summon_specific(-1, py, px, lvl, SUMMON_BIZARRE1, PM_FORCE_PET); + summon_specific(-1, py, px, lvl, SUMMON_MOLD, PM_FORCE_PET); } } break; -- 2.11.0