#include "angband.h"
#include "cmd-pet.h"
-#include "monster-hook.h"
+#include "monsterrace-hook.h"
#include "monster-status.h"
+#include "projection.h"
+#include "monster.h"
+#include "spells-summon.h"
+#include "quest.h"
#define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する？ */
#define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する？ */
* @var horror_desc
* @brief ELDRITCH HORROR効果時のモンスターの形容メッセージ（通常時）
*/
-cptr horror_desc[MAX_SAN_HORROR] =
+concptr horror_desc[MAX_SAN_HORROR] =
{
#ifdef JP
"忌まわしい",
* @var funny_desc
* @brief ELDRITCH HORROR効果時のモンスターの形容メッセージ(幻覚状態時)
*/
-cptr funny_desc[MAX_SAN_FUNNY] =
+concptr funny_desc[MAX_SAN_FUNNY] =
{
#ifdef JP
"間抜けな",
* @var funny_comments
* @brief ELDRITCH HORROR効果時の幻覚時間延長を示す錯乱表現
*/
-cptr funny_comments[MAX_SAN_COMMENT] =
+concptr funny_comments[MAX_SAN_COMMENT] =
{
#ifdef JP
/* nuke me */
*/
monster_race *real_r_ptr(monster_type *m_ptr)
{
+ return &r_info[real_r_idx(m_ptr)];
+}
+
+MONRACE_IDX real_r_idx(monster_type *m_ptr)
+{
monster_race *r_ptr = &r_info[m_ptr->r_idx];
/* Extract real race */
if (m_ptr->mflag2 & MFLAG2_CHAMELEON)
{
if (r_ptr->flags1 & RF1_UNIQUE)
- return &r_info[MON_CHAMELEON_K];
+ return MON_CHAMELEON_K;
else
- return &r_info[MON_CHAMELEON];
+ return MON_CHAMELEON;
}
else
{
- return r_ptr;
+ return m_ptr->r_idx;
}
}
monster_race *r_ptr = &r_info[m_ptr->r_idx];
OBJECT_IDX this_o_idx, next_o_idx = 0;
- /* Get location */
y = m_ptr->fy;
x = m_ptr->fx;
if (MON_MONFEAR(m_ptr)) (void)set_monster_monfear(i, 0);
if (MON_INVULNER(m_ptr)) (void)set_monster_invulner(i, 0, FALSE);
-
/* Hack -- remove target monster */
if (i == target_who) target_who = 0;
if (p_ptr->riding == i) p_ptr->riding = 0;
/* Monster is gone */
- cave[y][x].m_idx = 0;
-
+ grid_array[y][x].m_idx = 0;
- /* Delete objects */
for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
*/
void delete_monster(POSITION y, POSITION x)
{
- cave_type *c_ptr;
+ grid_type *g_ptr;
/* Paranoia */
if (!in_bounds(y, x)) return;
/* Check the grid */
- c_ptr = &cave[y][x];
+ g_ptr = &grid_array[y][x];
/* Delete the monster (if any) */
- if (c_ptr->m_idx) delete_monster_idx(c_ptr->m_idx);
+ if (g_ptr->m_idx) delete_monster_idx(g_ptr->m_idx);
}
{
POSITION y, x;
int i;
- cave_type *c_ptr;
+ grid_type *g_ptr;
monster_type *m_ptr;
OBJECT_IDX this_o_idx, next_o_idx = 0;
x = m_ptr->fx;
/* Cave grid */
- c_ptr = &cave[y][x];
+ g_ptr = &grid_array[y][x];
- /* Update the cave */
- c_ptr->m_idx = i2;
+ /* Update the grid_array */
+ g_ptr->m_idx = i2;
/* Repair objects being carried by monster */
for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
{
- char m_name[80];
+ GAME_TEXT m_name[MAX_NLEN];
monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
}
if (!m_ptr->r_idx) continue;
/* Monster is gone */
- cave[m_ptr->fy][m_ptr->fx].m_idx = 0;
+ grid_array[m_ptr->fy][m_ptr->fx].m_idx = 0;
/* Wipe the Monster */
(void)WIPE(m_ptr, monster_type);
break;
}
-
case SUMMON_KIN:
{
okay = ((r_ptr->d_char == summon_kin_type) && (r_idx != MON_HAGURE));
case SUMMON_HI_DRAGON_LIVING:
{
- okay = ((r_ptr->d_char == 'D') && monster_living(r_ptr));
+ okay = ((r_ptr->d_char == 'D') && monster_living(r_idx));
break;
}
case SUMMON_LIVING:
{
- okay = monster_living(r_ptr);
+ okay = monster_living(r_idx);
break;
}
for (i = 0; i < 4; i++)
if (r_ptr->blow[i].method == RBM_EXPLODE) okay = TRUE;
- okay = (okay && monster_living(r_ptr));
+ okay = (okay && monster_living(r_idx));
break;
}
*/
static bool restrict_monster_to_dungeon(MONRACE_IDX r_idx)
{
- dungeon_info_type *d_ptr = &d_info[dungeon_type];
+ dungeon_type *d_ptr = &d_info[p_ptr->dungeon_idx];
monster_race *r_ptr = &r_info[r_idx];
byte a;
* @param monster_hook2 制限関数2
* @return エラーコード
*/
-errr get_mon_num_prep(monster_hook_type monster_hook,
- monster_hook_type monster_hook2)
+errr get_mon_num_prep(monsterrace_hook_type monster_hook,
+ monsterrace_hook_type monster_hook2)
{
int i;
/* Scan the allocation table */
for (i = 0; i < alloc_race_size; i++)
{
- monster_race *r_ptr;
+ monster_race *r_ptr;
/* Get the entry */
alloc_entry *entry = &alloc_race_table[i];
if (dun_level && (!p_ptr->inside_quest || is_fixed_quest_idx(p_ptr->inside_quest)) && !restrict_monster_to_dungeon(entry->index) && !p_ptr->inside_battle)
{
- int hoge = entry->prob2 * d_info[dungeon_type].special_div;
+ int hoge = entry->prob2 * d_info[p_ptr->dungeon_idx].special_div;
entry->prob2 = hoge / 64;
if (randint0(64) < (hoge & 0x3f)) entry->prob2++;
}
return (0);
}
-/*!
- * @brief 平方根を切り捨て整数で返す
- * @param n 数値
- * @return 平方根
- */
-static int mysqrt(int n)
-{
- int tmp = n>>1;
- int tasu = 10;
- int kaeriti = 1;
-
- if (!tmp)
- {
- if (n) return 1;
- else return 0;
- }
-
- while(tmp)
- {
- if ((n/tmp) < tmp)
- {
- tmp >>= 1;
- }
- else break;
- }
- kaeriti = tmp;
- while(tasu)
- {
- if ((n/tmp) < tmp)
- {
- tasu--;
- tmp = kaeriti;
- }
- else
- {
- kaeriti = tmp;
- tmp += tasu;
- }
- }
- return kaeriti;
-}
/*!
* @brief 生成モンスター種族を1種生成テーブルから選択する
*/
MONRACE_IDX get_mon_num(DEPTH level)
{
- int i, j, p;
- int r_idx;
- long value, total;
- monster_race *r_ptr;
- alloc_entry *table = alloc_race_table;
+ int i, j, p;
+ MONRACE_IDX r_idx;
+ long value, total;
+ monster_race *r_ptr;
+ alloc_entry *table = alloc_race_table;
int pls_kakuritu, pls_level;
int delay = mysqrt(level * 10000L) + 400L;
- if (level > MAX_DEPTH - 1) level = MAX_DEPTH - 1;
-
pls_kakuritu = MAX(NASTY_MON_MAX, NASTY_MON_BASE - ((dungeon_turn / (TURNS_PER_TICK * 5000L) - delay / 10)));
pls_level = MIN(NASTY_MON_PLUS_MAX, 3 + dungeon_turn / (TURNS_PER_TICK * 40000L) - delay / 40 + MIN(5, level / 10)) ;
- if (d_info[dungeon_type].flags1 & DF1_MAZE)
+ if (d_info[p_ptr->dungeon_idx].flags1 & DF1_MAZE)
{
pls_kakuritu = MIN(pls_kakuritu / 2, pls_kakuritu - 10);
if (pls_kakuritu < 2) pls_kakuritu = 2;
}
/* Boost the level */
- if (!p_ptr->inside_battle && !(d_info[dungeon_type].flags1 & DF1_BEGINNER))
+ if (!p_ptr->inside_battle && !(d_info[p_ptr->dungeon_idx].flags1 & DF1_BEGINNER))
{
/* Nightmare mode allows more out-of depth monsters */
if (ironman_nightmare && !randint0(pls_kakuritu))
}
}
+ if (level > MAX_DEPTH - 1) level = MAX_DEPTH - 1;
+ if (level < 0) level = 0;
+
/* Reset total */
total = 0L;
*/
void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode)
{
- cptr res;
+ concptr res;
monster_race *r_ptr;
- cptr name;
+ concptr name;
char buf[128];
- char silly_name[1024];
+ GAME_TEXT silly_name[1024];
bool seen, pron;
bool named = FALSE;
if (!necro && m_ptr)
{
- char m_name[80];
+ GAME_TEXT m_name[MAX_NLEN];
monster_race *r_ptr = &r_info[m_ptr->ap_r_idx];
power = r_ptr->level / 2;
if (p_ptr->image)
{
/* Something silly happens... */
-#ifdef JP
- msg_format("%s%sの顔を見てしまった！",
- funny_desc[randint0(MAX_SAN_FUNNY)], m_name);
-#else
- msg_format("You behold the %s visage of %s!",
+ msg_format(_("%s%sの顔を見てしまった！", "You behold the %s visage of %s!"),
funny_desc[randint0(MAX_SAN_FUNNY)], m_name);
-#endif
if (one_in_(3))
{
}
/* Something frightening happens... */
-#ifdef JP
- msg_format("%s%sの顔を見てしまった！",
- horror_desc[randint0(MAX_SAN_HORROR)], m_name);
-#else
- msg_format("You behold the %s visage of %s!",
+ msg_format(_("%s%sの顔を見てしまった！", "You behold the %s visage of %s!"),
horror_desc[randint0(MAX_SAN_HORROR)], m_name);
-#endif
r_ptr->r_flags2 |= RF2_ELDRITCH_HORROR;
else if(!necro)
{
monster_race *r_ptr;
- char m_name[80];
- cptr desc;
+ GAME_TEXT m_name[MAX_NLEN];
+ concptr desc;
get_mon_num_prep(get_nightmare, NULL);
get_mon_num_prep(NULL, NULL);
- /* Describe it */
#ifndef JP
if (!(r_ptr->flags1 & RF1_UNIQUE))
sprintf(m_name, "%s %s", (is_a_vowel(desc[0]) ? "an" : "a"), desc);
bool easy = FALSE;
/* Non-Ninja player in the darkness */
- bool in_darkness = (d_info[dungeon_type].flags1 & DF1_DARKNESS) && !p_ptr->see_nocto;
+ bool in_darkness = (d_info[p_ptr->dungeon_idx].flags1 & DF1_DARKNESS) && !p_ptr->see_nocto;
/* Do disturb? */
if (disturb_high)
/* Handle "cold blooded" monsters */
if ((r_ptr->flags2 & (RF2_COLD_BLOOD | RF2_AURA_FIRE)) == RF2_COLD_BLOOD)
{
- /* Take note */
do_cold_blood = TRUE;
}
/* Handle "invisible" monsters */
if (r_ptr->flags2 & (RF2_INVISIBLE))
{
- /* Take note */
do_invisible = TRUE;
/* See invisible */
if ((r_ptr->blow[0].method == RBM_EXPLODE) || (r_ptr->blow[1].method == RBM_EXPLODE) || (r_ptr->blow[2].method == RBM_EXPLODE) || (r_ptr->blow[3].method == RBM_EXPLODE))
return FALSE;
- if (!monster_can_cross_terrain(cave[m_ptr->fy][m_ptr->fx].feat, r_ptr, 0)) return FALSE;
+ if (!monster_can_cross_terrain(grid_array[m_ptr->fy][m_ptr->fx].feat, r_ptr, 0)) return FALSE;
/* Not born */
if (!(old_r_ptr->flags7 & RF7_CHAMELEON))
if ((r_ptr->blow[0].method == RBM_EXPLODE) || (r_ptr->blow[1].method == RBM_EXPLODE) || (r_ptr->blow[2].method == RBM_EXPLODE) || (r_ptr->blow[3].method == RBM_EXPLODE))
return FALSE;
- if (!monster_can_cross_terrain(cave[m_ptr->fy][m_ptr->fx].feat, r_ptr, 0)) return FALSE;
+ if (!monster_can_cross_terrain(grid_array[m_ptr->fy][m_ptr->fx].feat, r_ptr, 0)) return FALSE;
/* Not born */
if (!(old_r_ptr->flags7 & RF7_CHAMELEON))
int oldmaxhp;
monster_type *m_ptr = &m_list[m_idx];
monster_race *r_ptr;
- char old_m_name[80];
+ char old_m_name[MAX_NLEN];
bool old_unique = FALSE;
int old_r_idx = m_ptr->r_idx;
else
level = dun_level;
- if (d_info[dungeon_type].flags1 & DF1_CHAMELEON) level+= 2+randint1(3);
+ if (d_info[p_ptr->dungeon_idx].flags1 & DF1_CHAMELEON) level+= 2+randint1(3);
r_idx = get_mon_num(level);
r_ptr = &r_info[r_idx];
if (m_idx == p_ptr->riding)
{
- char m_name[80];
+ GAME_TEXT m_name[MAX_NLEN];
monster_desc(m_name, m_ptr, 0);
msg_format(_("突然%sが変身した。", "Suddenly, %s transforms!"), old_m_name);
if (!(r_ptr->flags7 & RF7_RIDING))
static IDX initial_r_appearance(MONRACE_IDX r_idx)
{
int attempts = 1000;
-
IDX ap_r_idx;
DEPTH min = MIN(base_level-5, 50);
+ if (p_ptr->pseikaku == SEIKAKU_CHARGEMAN)
+ {
+ if (base_level == 0 || one_in_(5)) return MON_ALIEN_JURAL;
+ }
+
if (!(r_info[r_idx].flags7 & RF7_TANUKI))
return r_idx;
static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode)
{
/* Access the location */
- cave_type *c_ptr = &cave[y][x];
+ grid_type *g_ptr = &grid_array[y][x];
monster_type *m_ptr;
monster_race *r_ptr = &r_info[r_idx];
- cptr name = (r_name + r_ptr->name);
+ concptr name = (r_name + r_ptr->name);
int cmi;
/* Count all quest monsters */
for (i2 = 0; i2 < cur_wid; ++i2)
for (j2 = 0; j2 < cur_hgt; j2++)
- if (cave[j2][i2].m_idx > 0)
- if (m_list[cave[j2][i2].m_idx].r_idx == quest[hoge].r_idx)
+ if (grid_array[j2][i2].m_idx > 0)
+ if (m_list[grid_array[j2][i2].m_idx].r_idx == quest[hoge].r_idx)
number_mon++;
if(number_mon + quest[hoge].cur_num >= quest[hoge].max_num)
return FALSE;
}
}
- if (is_glyph_grid(c_ptr))
+ if (is_glyph_grid(g_ptr))
{
if (randint1(BREAK_GLYPH) < (r_ptr->level+20))
{
/* Describe observable breakage */
- if (c_ptr->info & CAVE_MARK)
+ if (g_ptr->info & CAVE_MARK)
{
msg_print(_("守りのルーンが壊れた！", "The rune of protection is broken!"));
}
/* Forget the rune */
- c_ptr->info &= ~(CAVE_MARK);
+ g_ptr->info &= ~(CAVE_MARK);
/* Break the rune */
- c_ptr->info &= ~(CAVE_OBJECT);
- c_ptr->mimic = 0;
+ g_ptr->info &= ~(CAVE_OBJECT);
+ g_ptr->mimic = 0;
note_spot(y, x);
}
if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL) || (r_ptr->level < 10)) mode &= ~PM_KAGE;
/* Make a new monster */
- c_ptr->m_idx = m_pop();
- hack_m_idx_ii = c_ptr->m_idx;
+ g_ptr->m_idx = m_pop();
+ hack_m_idx_ii = g_ptr->m_idx;
/* Mega-Hack -- catch "failure" */
- if (!c_ptr->m_idx) return (FALSE);
+ if (!g_ptr->m_idx) return (FALSE);
/* Get a new monster record */
- m_ptr = &m_list[c_ptr->m_idx];
+ m_ptr = &m_list[g_ptr->m_idx];
/* Save the race */
m_ptr->r_idx = r_idx;
if (r_ptr->flags7 & RF7_CHAMELEON)
{
- choose_new_monster(c_ptr->m_idx, TRUE, 0);
+ choose_new_monster(g_ptr->m_idx, TRUE, 0);
r_ptr = &r_info[m_ptr->r_idx];
m_ptr->mflag2 |= MFLAG2_CHAMELEON;
if ((mode & PM_ALLOW_SLEEP) && r_ptr->sleep && !ironman_nightmare)
{
int val = r_ptr->sleep;
- (void)set_monster_csleep(c_ptr->m_idx, (val * 2) + randint1(val * 10));
+ (void)set_monster_csleep(g_ptr->m_idx, (val * 2) + randint1(val * 10));
}
/* Assign maximal hitpoints */
/* Extract the monster base speed */
m_ptr->mspeed = get_mspeed(r_ptr);
- if (mode & PM_HASTE) (void)set_monster_fast(c_ptr->m_idx, 100);
+ if (mode & PM_HASTE) (void)set_monster_fast(g_ptr->m_idx, 100);
/* Give a random starting energy */
if (!ironman_nightmare)
}
/* Hack -- see "process_monsters()" */
- if (c_ptr->m_idx < hack_m_idx)
+ if (g_ptr->m_idx < hack_m_idx)
{
/* Monster is still being born */
m_ptr->mflag |= (MFLAG_BORN);
p_ptr->update |= (PU_MON_LITE);
else if ((r_ptr->flags7 & RF7_HAS_LD_MASK) && !MON_CSLEEP(m_ptr))
p_ptr->update |= (PU_MON_LITE);
- update_monster(c_ptr->m_idx, TRUE);
+ update_monster(g_ptr->m_idx, TRUE);
/* Count the monsters on the level */
{
if (r_ptr->flags1 & RF1_UNIQUE)
{
- cptr color;
+ concptr color;
object_type *o_ptr;
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
if (r_ptr->level > p_ptr->lev + 30)
color = _("黒く", "black");
}
}
- if (is_explosive_rune_grid(c_ptr))
+ if (is_explosive_rune_grid(g_ptr))
{
/* Break the ward */
if (randint1(BREAK_MINOR_GLYPH) > r_ptr->level)
{
/* Describe observable breakage */
- if (c_ptr->info & CAVE_MARK)
+ if (g_ptr->info & CAVE_MARK)
{
msg_print(_("ルーンが爆発した！", "The rune explodes!"));
project(0, 2, y, x, 2 * (p_ptr->lev + damroll(7, 7)), GF_MANA, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
}
/* Forget the rune */
- c_ptr->info &= ~(CAVE_MARK);
+ g_ptr->info &= ~(CAVE_MARK);
/* Break the rune */
- c_ptr->info &= ~(CAVE_OBJECT);
- c_ptr->mimic = 0;
+ g_ptr->info &= ~(CAVE_OBJECT);
+ g_ptr->mimic = 0;
note_spot(y, x);
lite_spot(y, x);
#define MON_SCAT_MAXD 10 /*!< mon_scatter()関数によるモンスター配置で許される中心からの最大距離 */
/*!
- * @brief モンスター1体を目標地点に可能ながり近い位置に生成する / improved version of scatter() for place monster
+ * @brief モンスター1体を目標地点に可能な限り近い位置に生成する / improved version of scatter() for place monster
* @param r_idx 生成モンスター種族
* @param yp 結果生成位置y座標
* @param xp 結果生成位置x座標
*/
static bool mon_scatter(MONRACE_IDX r_idx, POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION max_dist)
{
- int place_x[MON_SCAT_MAXD];
- int place_y[MON_SCAT_MAXD];
+ POSITION place_x[MON_SCAT_MAXD];
+ POSITION place_y[MON_SCAT_MAXD];
int num[MON_SCAT_MAXD];
int i;
- int nx, ny;
+ POSITION nx, ny;
if (max_dist >= MON_SCAT_MAXD)
return FALSE;
/* Require empty grids */
if (!cave_empty_bold2(ny, nx)) continue;
-
- /* Prepare allocation table */
get_mon_num_prep(place_monster_can_escort, get_monster_hook2(ny, nx));
/* Pick a random race */
bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode)
{
MONRACE_IDX r_idx;
-
- /* Prepare allocation table */
get_mon_num_prep(get_monster_hook(), get_monster_hook2(y, x));
/* Pick a monster */
int attempts = 1000;
POSITION cy = y;
POSITION cx = x;
-
- /* Prepare allocation table */
get_mon_num_prep(get_monster_hook(), get_monster_hook2(y, x));
while (--attempts)
if (attempts < 1) return FALSE;
- m_idx = cave[y][x].m_idx;
+ m_idx = grid_array[y][x].m_idx;
if (m_list[m_idx].mflag2 & MFLAG2_CHAMELEON) r_ptr = &r_info[m_list[m_idx].r_idx];
- summon_kin_type = r_ptr->d_char;
for (attempts = randint1(10) + 5; attempts; attempts--)
{
scatter(&cy, &cx, y, x, 5, 0);
- (void)summon_specific(m_idx, cy, cx, dun_level + 5, SUMMON_KIN, PM_ALLOW_GROUP);
+ (void)summon_specific(m_idx, cy, cx, dun_level + 5, SUMMON_KIN, PM_ALLOW_GROUP, r_ptr->d_char);
y = cy;
x = cx;
}
+ if (cheat_hear) msg_format(_("モンスターの大群(%c)", "Monster horde (%c)."), r_ptr->d_char);
return TRUE;
}
*/
bool alloc_guardian(bool def_val)
{
- MONRACE_IDX guardian = d_info[dungeon_type].final_guardian;
+ MONRACE_IDX guardian = d_info[p_ptr->dungeon_idx].final_guardian;
- if (guardian && (d_info[dungeon_type].maxdepth == dun_level) && (r_info[guardian].cur_num < r_info[guardian].max_num))
+ if (guardian && (d_info[p_ptr->dungeon_idx].maxdepth == dun_level) && (r_info[guardian].cur_num < r_info[guardian].max_num))
{
- int oy;
- int ox;
+ POSITION oy;
+ POSITION ox;
int try_count = 4000;
/* Find a good position */
ox = randint1(cur_wid - 4) + 2;
/* Is it a good spot ? */
- if (cave_empty_bold2(oy, ox) && monster_can_cross_terrain(cave[oy][ox].feat, &r_info[guardian], 0))
+ if (cave_empty_bold2(oy, ox) && monster_can_cross_terrain(grid_array[oy][ox].feat, &r_info[guardian], 0))
{
/* Place the guardian */
if (place_monster_aux(0, oy, ox, guardian, (PM_ALLOW_GROUP | PM_NO_KAGE | PM_NO_PET))) return TRUE;
*/
bool alloc_monster(POSITION dis, BIT_FLAGS mode)
{
- int y = 0, x = 0;
+ POSITION y = 0, x = 0;
int attempts_left = 10000;
/* Put the Guardian */
{
if (alloc_horde(y, x))
{
- if (cheat_hear) msg_format(_("モンスターの大群(%c)", "Monster horde (%c)."), summon_kin_type);
return (TRUE);
}
}
monster_has_hostile_align(NULL, 10, -10, r_ptr))
return FALSE;
- if ((r_ptr->flags7 & RF7_CHAMELEON) && (d_info[dungeon_type].flags1 & DF1_CHAMELEON)) return TRUE;
+ if ((r_ptr->flags7 & RF7_CHAMELEON) && (d_info[p_ptr->dungeon_idx].flags1 & DF1_CHAMELEON)) return TRUE;
return (summon_specific_aux(r_idx));
}
*
* Note that this function may not succeed, though this is very rare.
*/
-bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int type, BIT_FLAGS mode)
+bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int type, BIT_FLAGS mode, SYMBOL_CODE symbol)
{
POSITION x, y;
MONRACE_IDX r_idx;
/* Save the "summon" type */
summon_specific_type = type;
- summon_unique_okay = (mode & PM_ALLOW_UNIQUE) ? TRUE : FALSE;
+ summon_kin_type = symbol;
- /* Prepare allocation table */
+ summon_unique_okay = (mode & PM_ALLOW_UNIQUE) ? TRUE : FALSE;
get_mon_num_prep(summon_specific_okay, get_monster_hook2(y, x));
/* Pick a monster, using the level calculation */
* @param mode 生成オプション
* @return 召喚できたらtrueを返す
*/
-bool summon_named_creature (MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_IDX r_idx, BIT_FLAGS mode)
+bool summon_named_creature(MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_IDX r_idx, BIT_FLAGS mode)
{
POSITION x, y;
*/
bool multiply_monster(MONSTER_IDX m_idx, bool clone, BIT_FLAGS mode)
{
- monster_type *m_ptr = &m_list[m_idx];
-
+ monster_type *m_ptr = &m_list[m_idx];
POSITION y, x;
if (!mon_scatter(m_ptr->r_idx, &y, &x, m_ptr->fy, m_ptr->fx, 1))
*/
void message_pain(MONSTER_IDX m_idx, HIT_POINT dam)
{
- long oldhp, newhp, tmp;
- int percentage;
+ HIT_POINT oldhp, newhp;
+ HIT_POINT tmp;
+ PERCENTAGE percentage;
monster_type *m_ptr = &m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
- char m_name[80];
+ GAME_TEXT m_name[MAX_NLEN];
- /* Get the monster name */
monster_desc(m_name, m_ptr, 0);
if(dam == 0) // Notice non-damage
}
/* Note -- subtle fix -CFT */
- newhp = (long)(m_ptr->hp);
- oldhp = newhp + (long)(dam);
+ newhp = m_ptr->hp;
+ oldhp = newhp + dam;
tmp = (newhp * 100L) / oldhp;
- percentage = (int)(tmp);
+ percentage = tmp;
if(my_strchr(",ejmvwQ", r_ptr->d_char)) // Mushrooms, Eyes, Jellies, Molds, Vortices, Worms, Quylthulgs
{
void update_smart_learn(MONSTER_IDX m_idx, int what)
{
monster_type *m_ptr = &m_list[m_idx];
-
monster_race *r_ptr = &r_info[m_ptr->r_idx];
-
/* Not allowed to learn */
if (!smart_learn) return;
/* Not intelligent, only learn sometimes */
if (!(r_ptr->flags2 & (RF2_SMART)) && (randint0(100) < 50)) return;
-
-
/* Analyze the knowledge */
switch (what)
{
/*!
- * @brief プレイヤーを指定座標に配置する / Place the player in the dungeon XXX XXX
- * @param x 配置先X座標
- * @param y 配置先Y座標
- * @return 配置に成功したらTRUE
- */
-bool player_place(POSITION y, POSITION x)
-{
- /* Paranoia XXX XXX */
- if (cave[y][x].m_idx != 0) return FALSE;
-
- /* Save player location */
- p_ptr->y = y;
- p_ptr->x = x;
-
- /* Success */
- return TRUE;
-}
-
-
-/*!
* @brief モンスターが盗みや拾いで確保していたアイテムを全てドロップさせる / Drop all items carried by a monster
* @param m_ptr モンスター参照ポインタ
* @return なし
OSDN Git Service
