OSDN Git Service
(root)
/
hengband
/
hengband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#37287 #37353 (2.2.0.89) FEAT_POWER 型を定義し、型の置換を継続中。 / Define FEAT_POWER, ongoing...
[hengband/hengband.git]
/
src
/
mspells3.c
diff --git
a/src/mspells3.c
b/src/mspells3.c
index
cac77a3
..
6eebf3b
100644
(file)
--- a/
src/mspells3.c
+++ b/
src/mspells3.c
@@
-44,7
+44,6
@@
void set_bluemage_damage(int SPELL_NUM, int plev, cptr msg, char* tmp)
static void learned_info(char *p, int power)
{
int plev = pseudo_plev();
static void learned_info(char *p, int power)
{
int plev = pseudo_plev();
- int hp = p_ptr->chp;
#ifdef JP
cptr s_dam = " 損傷:%s";
#ifdef JP
cptr s_dam = " 損傷:%s";
@@
-200,7
+199,7
@@
static void learned_info(char *p, int power)
* when you run it. It's probably easy to fix but I haven't tried,\n
* sorry.\n
*/
* when you run it. It's probably easy to fix but I haven't tried,\n
* sorry.\n
*/
-static int get_learned_power(
int
*sn)
+static int get_learned_power(
SPELL_IDX
*sn)
{
int i = 0;
int num = 0;
{
int i = 0;
int num = 0;
@@
-539,7
+538,7
@@
static int get_learned_power(int *sn)
ask = isupper(choice);
/* Lowercase */
ask = isupper(choice);
/* Lowercase */
- if (ask) choice = tolower(choice);
+ if (ask) choice =
(char)
tolower(choice);
/* Extract request */
i = (islower(choice) ? A2I(choice) : -1);
/* Extract request */
i = (islower(choice) ? A2I(choice) : -1);
@@
-609,7
+608,6
@@
static bool cast_learned_spell(int spell, bool success)
int dir;
int plev = pseudo_plev();
int summon_lev = p_ptr->lev * 2 / 3 + randint1(p_ptr->lev/2);
int dir;
int plev = pseudo_plev();
int summon_lev = p_ptr->lev * 2 / 3 + randint1(p_ptr->lev/2);
- int hp = p_ptr->chp;
int damage = 0;
bool pet = success;
bool no_trump = FALSE;
int damage = 0;
bool pet = success;
bool no_trump = FALSE;
@@
-639,13
+637,13
@@
static bool cast_learned_spell(int spell, bool success)
break;
case MS_DISPEL:
{
break;
case MS_DISPEL:
{
-
int
m_idx;
+
MONSTER_IDX
m_idx;
if (!target_set(TARGET_KILL)) return FALSE;
m_idx = cave[target_row][target_col].m_idx;
if (!m_idx) break;
if (!player_has_los_bold(target_row, target_col)) break;
if (!target_set(TARGET_KILL)) return FALSE;
m_idx = cave[target_row][target_col].m_idx;
if (!m_idx) break;
if (!player_has_los_bold(target_row, target_col)) break;
- if (!projectable(p
y, p
x, target_row, target_col)) break;
+ if (!projectable(p
_ptr->y, p_ptr->
x, target_row, target_col)) break;
dispel_monster_status(m_idx);
break;
}
dispel_monster_status(m_idx);
break;
}
@@
-658,8
+656,6
@@
static bool cast_learned_spell(int spell, bool success)
break;
case MS_SHOOT:
{
break;
case MS_SHOOT:
{
- object_type *o_ptr = NULL;
-
if (!get_aim_dir(&dir)) return FALSE;
msg_print(_("矢を放った。", "You fire an arrow."));
if (!get_aim_dir(&dir)) return FALSE;
msg_print(_("矢を放った。", "You fire an arrow."));
@@
-776,7
+772,7
@@
static bool cast_learned_spell(int spell, bool success)
msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
damage = monspell_bluemage_damage((MS_BR_INERTIA), plev, DAM_ROLL);
msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
damage = monspell_bluemage_damage((MS_BR_INERTIA), plev, DAM_ROLL);
- fire_ball(GF_INERTIA, dir, damage, (plev > 40 ? -3 : -2));
+ fire_ball(GF_INERTIA
L
, dir, damage, (plev > 40 ? -3 : -2));
break;
case MS_BR_GRAVITY:
if (!get_aim_dir(&dir)) return FALSE;
break;
case MS_BR_GRAVITY:
if (!get_aim_dir(&dir)) return FALSE;
@@
-1104,7
+1100,7
@@
static bool cast_learned_spell(int spell, bool success)
if (!target_set(TARGET_KILL)) return FALSE;
if (!cave[target_row][target_col].m_idx) break;
if (!player_has_los_bold(target_row, target_col)) break;
if (!target_set(TARGET_KILL)) return FALSE;
if (!cave[target_row][target_col].m_idx) break;
if (!player_has_los_bold(target_row, target_col)) break;
- if (!projectable(p
y, p
x, target_row, target_col)) break;
+ if (!projectable(p
_ptr->y, p_ptr->
x, target_row, target_col)) break;
m_ptr = &m_list[cave[target_row][target_col].m_idx];
r_ptr = &r_info[m_ptr->r_idx];
monster_desc(m_name, m_ptr, 0);
m_ptr = &m_list[cave[target_row][target_col].m_idx];
r_ptr = &r_info[m_ptr->r_idx];
monster_desc(m_name, m_ptr, 0);
@@
-1124,7
+1120,7
@@
static bool cast_learned_spell(int spell, bool success)
}
}
msg_format(_("%sを引き戻した。", "You command %s to return."), m_name);
}
}
msg_format(_("%sを引き戻した。", "You command %s to return."), m_name);
- teleport_monster_to(cave[target_row][target_col].m_idx, p
y, p
x, 100, TELEPORT_PASSIVE);
+ teleport_monster_to(cave[target_row][target_col].m_idx, p
_ptr->y, p_ptr->
x, 100, TELEPORT_PASSIVE);
break;
}
case MS_TELE_AWAY:
break;
}
case MS_TELE_AWAY:
@@
-1134,7
+1130,7
@@
static bool cast_learned_spell(int spell, bool success)
break;
case MS_TELE_LEVEL:
{
break;
case MS_TELE_LEVEL:
{
-
int
target_m_idx;
+
MONSTER_IDX
target_m_idx;
monster_type *m_ptr;
monster_race *r_ptr;
char m_name[80];
monster_type *m_ptr;
monster_race *r_ptr;
char m_name[80];
@@
-1143,7
+1139,7
@@
static bool cast_learned_spell(int spell, bool success)
target_m_idx = cave[target_row][target_col].m_idx;
if (!target_m_idx) break;
if (!player_has_los_bold(target_row, target_col)) break;
target_m_idx = cave[target_row][target_col].m_idx;
if (!target_m_idx) break;
if (!player_has_los_bold(target_row, target_col)) break;
- if (!projectable(p
y, p
x, target_row, target_col)) break;
+ if (!projectable(p
_ptr->y, p_ptr->
x, target_row, target_col)) break;
m_ptr = &m_list[target_m_idx];
r_ptr = &r_info[m_ptr->r_idx];
monster_desc(m_name, m_ptr, 0);
m_ptr = &m_list[target_m_idx];
r_ptr = &r_info[m_ptr->r_idx];
monster_desc(m_name, m_ptr, 0);
@@
-1180,7
+1176,7
@@
static bool cast_learned_spell(int spell, bool success)
break;
case MS_RAISE_DEAD:
msg_print(_("死者復活の呪文を唱えた。", "You cast a animate dead."));
break;
case MS_RAISE_DEAD:
msg_print(_("死者復活の呪文を唱えた。", "You cast a animate dead."));
- (void)animate_dead(0, p
y, p
x);
+ (void)animate_dead(0, p
_ptr->y, p_ptr->
x);
break;
case MS_S_KIN:
{
break;
case MS_S_KIN:
{
@@
-1189,7
+1185,7
@@
static bool cast_learned_spell(int spell, bool success)
msg_print(_("援軍を召喚した。", "You summon minions."));
for (k = 0;k < 1; k++)
{
msg_print(_("援軍を召喚した。", "You summon minions."));
for (k = 0;k < 1; k++)
{
- if (summon_kin_player(summon_lev, p
y, p
x, (pet ? PM_FORCE_PET : 0L)))
+ if (summon_kin_player(summon_lev, p
_ptr->y, p_ptr->
x, (pet ? PM_FORCE_PET : 0L)))
{
if (!pet) msg_print(_("召喚された仲間は怒っている!", "Summoned fellows are angry!"));
}
{
if (!pet) msg_print(_("召喚された仲間は怒っている!", "Summoned fellows are angry!"));
}
@@
-1206,7
+1202,7
@@
static bool cast_learned_spell(int spell, bool success)
msg_print(_("サイバーデーモンを召喚した!", "You summon a Cyberdemon!"));
for (k = 0 ;k < 1 ; k++)
msg_print(_("サイバーデーモンを召喚した!", "You summon a Cyberdemon!"));
for (k = 0 ;k < 1 ; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_CYBER, p_mode))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_CYBER, p_mode))
{
if (!pet)
msg_print(_("召喚されたサイバーデーモンは怒っている!", "The summoned Cyberdemon are angry!"));
{
if (!pet)
msg_print(_("召喚されたサイバーデーモンは怒っている!", "The summoned Cyberdemon are angry!"));
@@
-1222,7
+1218,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("仲間を召喚した。", "You summon help."));
for (k = 0;k < 1; k++)
int k;
msg_print(_("仲間を召喚した。", "You summon help."));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, 0, p_mode))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, 0, p_mode))
{
if (!pet)
msg_print(_("召喚されたモンスターは怒っている!", "The summoned monster is angry!"));
{
if (!pet)
msg_print(_("召喚されたモンスターは怒っている!", "The summoned monster is angry!"));
@@
-1238,7
+1234,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("モンスターを召喚した!", "You summon monsters!"));
for (k = 0;k < plev / 15 + 2; k++)
int k;
msg_print(_("モンスターを召喚した!", "You summon monsters!"));
for (k = 0;k < plev / 15 + 2; k++)
- if(summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, 0, (p_mode | u_mode)))
+ if(summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, 0, (p_mode | u_mode)))
{
if (!pet)
msg_print(_("召喚されたモンスターは怒っている!", "The summoned monsters are angry!"));
{
if (!pet)
msg_print(_("召喚されたモンスターは怒っている!", "The summoned monsters are angry!"));
@@
-1254,7
+1250,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("アリを召喚した。", "You summon ants."));
for (k = 0;k < 1; k++)
int k;
msg_print(_("アリを召喚した。", "You summon ants."));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_ANT, (PM_ALLOW_GROUP | p_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_ANT, (PM_ALLOW_GROUP | p_mode)))
{
if (!pet)
msg_print(_("召喚されたアリは怒っている!", "The summoned ants are angry!"));
{
if (!pet)
msg_print(_("召喚されたアリは怒っている!", "The summoned ants are angry!"));
@@
-1270,7
+1266,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("蜘蛛を召喚した。", "You summon spiders."));
for (k = 0;k < 1; k++)
int k;
msg_print(_("蜘蛛を召喚した。", "You summon spiders."));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_SPIDER, (PM_ALLOW_GROUP | p_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_SPIDER, (PM_ALLOW_GROUP | p_mode)))
{
if (!pet)
msg_print(_("召喚された蜘蛛は怒っている!", "Summoned spiders are angry!"));
{
if (!pet)
msg_print(_("召喚された蜘蛛は怒っている!", "Summoned spiders are angry!"));
@@
-1286,7
+1282,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("ハウンドを召喚した。", "You summon hounds."));
for (k = 0;k < 1; k++)
int k;
msg_print(_("ハウンドを召喚した。", "You summon hounds."));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_HOUND, (PM_ALLOW_GROUP | p_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_HOUND, (PM_ALLOW_GROUP | p_mode)))
{
if (!pet)
msg_print(_("召喚されたハウンドは怒っている!", "Summoned hounds are angry!"));
{
if (!pet)
msg_print(_("召喚されたハウンドは怒っている!", "Summoned hounds are angry!"));
@@
-1302,7
+1298,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("ヒドラを召喚した。", "You summon a hydras."));
for (k = 0;k < 1; k++)
int k;
msg_print(_("ヒドラを召喚した。", "You summon a hydras."));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_HYDRA, (g_mode | p_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_HYDRA, (g_mode | p_mode)))
{
if (!pet)
msg_print(_("召喚されたヒドラは怒っている!", "Summoned hydras are angry!"));
{
if (!pet)
msg_print(_("召喚されたヒドラは怒っている!", "Summoned hydras are angry!"));
@@
-1318,7
+1314,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("天使を召喚した!", "You summon an angel!"));
for (k = 0;k < 1; k++)
int k;
msg_print(_("天使を召喚した!", "You summon an angel!"));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_ANGEL, (g_mode | p_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_ANGEL, (g_mode | p_mode)))
{
if (!pet)
msg_print(_("召喚された天使は怒っている!", "Summoned angels are angry!"));
{
if (!pet)
msg_print(_("召喚された天使は怒っている!", "Summoned angels are angry!"));
@@
-1334,7
+1330,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("混沌の宮廷から悪魔を召喚した!", "You summon a demon from the Courts of Chaos!"));
for (k = 0;k < 1; k++)
int k;
msg_print(_("混沌の宮廷から悪魔を召喚した!", "You summon a demon from the Courts of Chaos!"));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_DEMON, (g_mode | p_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_DEMON, (g_mode | p_mode)))
{
if (!pet)
msg_print(_("召喚されたデーモンは怒っている!", "Summoned demons are angry!"));
{
if (!pet)
msg_print(_("召喚されたデーモンは怒っている!", "Summoned demons are angry!"));
@@
-1350,7
+1346,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("アンデッドの強敵を召喚した!", "You summon an undead adversary!"));
for (k = 0;k < 1; k++)
int k;
msg_print(_("アンデッドの強敵を召喚した!", "You summon an undead adversary!"));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_UNDEAD, (g_mode | p_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_UNDEAD, (g_mode | p_mode)))
{
if (!pet)
msg_print(_("召喚されたアンデッドは怒っている!", "Summoned undeads are angry!"));
{
if (!pet)
msg_print(_("召喚されたアンデッドは怒っている!", "Summoned undeads are angry!"));
@@
-1366,7
+1362,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("ドラゴンを召喚した!", "You summon a dragon!"));
for (k = 0;k < 1; k++)
int k;
msg_print(_("ドラゴンを召喚した!", "You summon a dragon!"));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_DRAGON, (g_mode | p_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_DRAGON, (g_mode | p_mode)))
{
if (!pet)
msg_print(_("召喚されたドラゴンは怒っている!", "Summoned dragons are angry!"));
{
if (!pet)
msg_print(_("召喚されたドラゴンは怒っている!", "Summoned dragons are angry!"));
@@
-1382,7
+1378,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("強力なアンデッドを召喚した!", "You summon a greater undead!"));
for (k = 0;k < 1; k++)
int k;
msg_print(_("強力なアンデッドを召喚した!", "You summon a greater undead!"));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_HI_UNDEAD, (g_mode | p_mode | u_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_HI_UNDEAD, (g_mode | p_mode | u_mode)))
{
if (!pet)
msg_print(_("召喚された上級アンデッドは怒っている!", "Summoned greater undeads are angry!"));
{
if (!pet)
msg_print(_("召喚された上級アンデッドは怒っている!", "Summoned greater undeads are angry!"));
@@
-1398,7
+1394,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("古代ドラゴンを召喚した!", "You summon an ancient dragon!"));
for (k = 0;k < 1; k++)
int k;
msg_print(_("古代ドラゴンを召喚した!", "You summon an ancient dragon!"));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_HI_DRAGON, (g_mode | p_mode | u_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_HI_DRAGON, (g_mode | p_mode | u_mode)))
{
if (!pet)
msg_print(_("召喚された古代ドラゴンは怒っている!", "Summoned ancient dragons are angry!"));
{
if (!pet)
msg_print(_("召喚された古代ドラゴンは怒っている!", "Summoned ancient dragons are angry!"));
@@
-1414,7
+1410,7
@@
static bool cast_learned_spell(int spell, bool success)
int k;
msg_print(_("アンバーの王族を召喚した!", "You summon a Lord of Amber!"));
for (k = 0;k < 1; k++)
int k;
msg_print(_("アンバーの王族を召喚した!", "You summon a Lord of Amber!"));
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_AMBERITES, (g_mode | p_mode | u_mode)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_AMBERITES, (g_mode | p_mode | u_mode)))
{
if (!pet)
msg_print(_("召喚されたアンバーの王族は怒っている!", "Summoned Lords of Amber are angry!"));
{
if (!pet)
msg_print(_("召喚されたアンバーの王族は怒っている!", "Summoned Lords of Amber are angry!"));
@@
-1428,20
+1424,20
@@
static bool cast_learned_spell(int spell, bool success)
case MS_S_UNIQUE:
{
int k, count = 0;
case MS_S_UNIQUE:
{
int k, count = 0;
- msg_print(_("特別な強敵を召喚した!", "You summon a special opponent!"));
+
msg_print(_("特別な強敵を召喚した!", "You summon a special opponent!"));
for (k = 0;k < 1; k++)
for (k = 0;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_UNIQUE, (g_mode | p_mode | PM_ALLOW_UNIQUE)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_UNIQUE, (g_mode | p_mode | PM_ALLOW_UNIQUE)))
{
count++;
{
count++;
- if (!pet)
- msg_print(_("召喚されたユニーク・モンスターは怒っている!", "Summoned special opponents are angry!"));
+
if (!pet)
+
msg_print(_("召喚されたユニーク・モンスターは怒っている!", "Summoned special opponents are angry!"));
}
for (k = count;k < 1; k++)
}
for (k = count;k < 1; k++)
- if (summon_specific((pet ? -1 : 0), p
y, p
x, summon_lev, SUMMON_HI_UNDEAD, (g_mode | p_mode | PM_ALLOW_UNIQUE)))
+ if (summon_specific((pet ? -1 : 0), p
_ptr->y, p_ptr->
x, summon_lev, SUMMON_HI_UNDEAD, (g_mode | p_mode | PM_ALLOW_UNIQUE)))
{
count++;
{
count++;
- if (!pet)
- msg_print(_("召喚された上級アンデッドは怒っている!", "Summoned greater undeads are angry!"));
+
if (!pet)
+
msg_print(_("召喚された上級アンデッドは怒っている!", "Summoned greater undeads are angry!"));
}
if (!count)
{
}
if (!count)
{
@@
-1467,7
+1463,7
@@
static bool cast_learned_spell(int spell, bool success)
*/
bool do_cmd_cast_learned(void)
{
*/
bool do_cmd_cast_learned(void)
{
-
int
n = 0;
+
SPELL_IDX
n = 0;
int chance;
int minfail = 0;
int plev = p_ptr->lev;
int chance;
int minfail = 0;
int plev = p_ptr->lev;
@@
-1593,7
+1589,7
@@
bool do_cmd_cast_learned(void)
}
/* Take a turn */
}
/* Take a turn */
- energy_use = 100;
+
p_ptr->
energy_use = 100;
/* Window stuff */
p_ptr->redraw |= (PR_MANA);
/* Window stuff */
p_ptr->redraw |= (PR_MANA);