Skip to content

Commit

Permalink
(Alliance)[Update] アライアンス所属モンスターの同族召喚の仕様変更。
Browse files Browse the repository at this point in the history
  • Loading branch information
@sikabane-works
sikabane-works committed Jul 7, 2024
1 parent 2911d72 commit bece63d
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 61 deletions.
148 changes: 87 additions & 61 deletions src/mspell/mspell-summon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,25 @@ static MONSTER_NUMBER summon_Kin(PlayerType *player_ptr, POSITION y, POSITION x,
return count;
}

/*!
* @brief 救援召喚の同アライアンス処理。同じアライアンスのモンスターを召喚する。 /
* @param player_ptr プレイヤーへの参照ポインタ
* @param y 対象の地点のy座標
* @param x 対象の地点のx座標
* @param rlev 呪文を唱えるモンスターのレベル
* @param m_idx 呪文を唱えるモンスターID
* @return 召喚したモンスターの数を返す。
*/
static MONSTER_NUMBER summon_Alliance(PlayerType *player_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx)
{
int count = 0;
for (int k = 0; k < 4; k++) {
count += summon_specific(player_ptr, m_idx, y, x, rlev, SUMMON_ALLIANCE, PM_ALLOW_GROUP);
}

return count;
}

static void decide_summon_kin_caster(
PlayerType *player_ptr, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int target_type, concptr m_name, concptr m_poss, const bool known)
{
Expand Down Expand Up @@ -147,67 +166,74 @@ MonsterSpellResult spell_RF6_S_KIN(PlayerType *player_ptr, POSITION y, POSITION

decide_summon_kin_caster(player_ptr, m_idx, t_idx, target_type, m_name.data(), m_poss.data(), known);
int count = 0;
switch (m_ptr->r_idx) {
case MonsterRaceId::MENELDOR:
case MonsterRaceId::GWAIHIR:
case MonsterRaceId::THORONDOR:
count += summon_EAGLE(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::BULLGATES:
count += summon_EDGE(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::SERPENT:
case MonsterRaceId::ZOMBI_SERPENT:
count += summon_guardian(player_ptr, y, x, rlev, m_idx, t_idx, target_type);
break;
case MonsterRaceId::TIAMAT:
count += summon_HIGHEST_DRAGON(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::CALDARM:
count += summon_LOCKE_CLONE(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::LOUSY:
count += summon_LOUSE(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::VAIF:
count += summon_MOAI(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::DESLAYER_SENIOR:
count += summon_DEMON_SLAYER(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::ALDUIN:
count += summon_HIGHEST_DRAGON(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::MIRAAK:
count += summon_APOCRYPHA(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::IMHOTEP:
count += summon_PYRAMID(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::JOBZ:
count += summon_EYE_PHORN(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::QUEEN_VESPOID:
count += summon_VESPOID(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::YENDOR_WIZARD_1:
count += summon_YENDER_WIZARD(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::LEE_QIEZI:
msg_print(_("しかし、誰も来てくれなかった…。", "However, no one answered the call..."));
break;
case MonsterRaceId::THUNDERS:
count += summon_THUNDERS(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::OOTSUKI:
count += summon_PLASMA(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::LAFFEY_II:
count += summon_LAFFEY_II(player_ptr, Pos2D(y, x), m_idx);
break;
default:
count += summon_Kin(player_ptr, y, x, rlev, m_idx);
break;

auto alliance_id = monraces_info[m_ptr->r_idx].alliance_idx;

if (alliance_id == AllianceType::NONE) {
switch (m_ptr->r_idx) {
case MonsterRaceId::MENELDOR:
case MonsterRaceId::GWAIHIR:
case MonsterRaceId::THORONDOR:
count += summon_EAGLE(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::BULLGATES:
count += summon_EDGE(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::SERPENT:
case MonsterRaceId::ZOMBI_SERPENT:
count += summon_guardian(player_ptr, y, x, rlev, m_idx, t_idx, target_type);
break;
case MonsterRaceId::TIAMAT:
count += summon_HIGHEST_DRAGON(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::CALDARM:
count += summon_LOCKE_CLONE(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::LOUSY:
count += summon_LOUSE(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::VAIF:
count += summon_MOAI(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::DESLAYER_SENIOR:
count += summon_DEMON_SLAYER(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::ALDUIN:
count += summon_HIGHEST_DRAGON(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::MIRAAK:
count += summon_APOCRYPHA(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::IMHOTEP:
count += summon_PYRAMID(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::JOBZ:
count += summon_EYE_PHORN(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::QUEEN_VESPOID:
count += summon_VESPOID(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::YENDOR_WIZARD_1:
count += summon_YENDER_WIZARD(player_ptr, y, x, m_idx);
break;
case MonsterRaceId::LEE_QIEZI:
msg_print(_("しかし、誰も来てくれなかった…。", "However, no one answered the call..."));
break;
case MonsterRaceId::THUNDERS:
count += summon_THUNDERS(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::OOTSUKI:
count += summon_PLASMA(player_ptr, y, x, rlev, m_idx);
break;
case MonsterRaceId::LAFFEY_II:
count += summon_LAFFEY_II(player_ptr, Pos2D(y, x), m_idx);
break;
default:
count += summon_Kin(player_ptr, y, x, rlev, m_idx);
break;
}
} else {
count += summon_Alliance(player_ptr, y, x, rlev, m_idx);
}

if (player_ptr->effects()->blindness()->is_blind() && count && (target_type == MONSTER_TO_PLAYER)) {
Expand Down
4 changes: 4 additions & 0 deletions src/mspell/summon-checker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
bool check_summon_specific(PlayerType *player_ptr, MonsterRaceId summoner_idx, MonsterRaceId r_idx, summon_type type)
{
const auto &monrace = monraces_info[r_idx];
const auto &smonrace = monraces_info[summoner_idx];
switch (type) {
case SUMMON_ANT:
return monrace.d_char == 'a';
Expand Down Expand Up @@ -157,6 +158,9 @@ bool check_summon_specific(PlayerType *player_ptr, MonsterRaceId summoner_idx, M
case SUMMON_DEAD_UNIQUE: {
return monrace.kind_flags.has(MonsterKindType::UNIQUE) && monrace.mob_num == 0;
}
case SUMMON_ALLIANCE: {
return (monrace.alliance_idx == smonrace.alliance_idx);
}

default:
return false;
Expand Down
1 change: 1 addition & 0 deletions src/spell/summon-types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,5 @@ enum summon_type : int {
SUMMON_POWERFUL_EYE_SENIOR = 72, /*!< 召喚タイプ: 目力先輩 */
SUMMON_TURBAN_KID = 73, /*!< 召喚タイプ: ターバンのガキ */
SUMMON_DEAD_UNIQUE = 74, /*!< 召喚タイプ: 撃破済みユニーク */
SUMMON_ALLIANCE = 75, /*!< 召喚タイプ: 同アライアンス */
};

0 comments on commit bece63d

Please sign in to comment.