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
[Refactor] #37353 ペット処理を cmd4.c から cmd-pet.c/h へ分離。
[hengband/hengband.git]
/
src
/
racial.c
diff --git
a/src/racial.c
b/src/racial.c
index
2427da7
..
5c5d28a
100644
(file)
--- a/
src/racial.c
+++ b/
src/racial.c
@@
-11,6
+11,9
@@
*/
#include "angband.h"
*/
#include "angband.h"
+#include "cmd-magiceat.h"
+#include "cmd-zapwand.h"
+#include "cmd-pet.h"
/*!
* @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/
/*!
* @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/
@@
-1001,11
+1004,11
@@
static bool cmd_racial_power_aux(s32b command)
if (command == -3)
{
if (!get_aim_dir(&dir)) return FALSE;
if (command == -3)
{
if (!get_aim_dir(&dir)) return FALSE;
- (void)fire_ball_hide(GF_C
ONTROL
_LIVING, dir, p_ptr->lev, 0);
+ (void)fire_ball_hide(GF_C
HARM
_LIVING, dir, p_ptr->lev, 0);
}
else if (command == -4)
{
}
else if (command == -4)
{
- project_hack(GF_C
ONTROL
_LIVING, p_ptr->lev);
+ project_hack(GF_C
HARM
_LIVING, p_ptr->lev);
}
break;
}
}
break;
}
@@
-1233,7
+1236,7
@@
static bool cmd_racial_power_aux(s32b command)
msg_format("You breathe %s.",((type == GF_NETHER) ? "nether" : "fire"));
#endif
msg_format("You breathe %s.",((type == GF_NETHER) ? "nether" : "fire"));
#endif
- fire_b
all(type, dir, plev * 3, -(plev / 15) -
1);
+ fire_b
reath(type, dir, plev * 3, (plev / 15) +
1);
break;
}
case MIMIC_VAMPIRE:
break;
}
case MIMIC_VAMPIRE:
@@
-1555,8
+1558,7
@@
static bool cmd_racial_power_aux(s32b command)
ratial_stop_mouth();
msg_format(_("あなたは%sのブレスを吐いた。", "You breathe %s."), Type_desc);
ratial_stop_mouth();
msg_format(_("あなたは%sのブレスを吐いた。", "You breathe %s."), Type_desc);
- fire_ball(Type, dir, plev * 2,
- -(plev / 15) - 1);
+ fire_breath(Type, dir, plev * 2, (plev / 15) + 1);
}
break;
}
break;
@@
-1662,7
+1664,7
@@
static bool cmd_racial_power_aux(s32b command)
msg_format("You breathe %s.",((type == GF_NETHER) ? "nether" : "fire"));
#endif
msg_format("You breathe %s.",((type == GF_NETHER) ? "nether" : "fire"));
#endif
- fire_b
all(type, dir, plev * 3, -(plev / 15) -
1);
+ fire_b
reath(type, dir, plev * 3, (plev / 15) +
1);
}
break;
}
break;
@@
-2093,7
+2095,7
@@
void do_cmd_racial_power(void)
power_desc[num++].number = -1;
break;
case MIMIC_VAMPIRE:
power_desc[num++].number = -1;
break;
case MIMIC_VAMPIRE:
- strcpy(power_desc[num].name, _("
生命力吸収", "Drain Life
"));
+ strcpy(power_desc[num].name, _("
吸血", "Vampiric Drain
"));
power_desc[num].level = 2;
power_desc[num].cost = 1 + (lvl / 3);
power_desc[num].stat = A_CON;
power_desc[num].level = 2;
power_desc[num].cost = 1 + (lvl / 3);
power_desc[num].stat = A_CON;
@@
-2291,7
+2293,7
@@
void do_cmd_racial_power(void)
power_desc[num++].number = -1;
break;
case RACE_VAMPIRE:
power_desc[num++].number = -1;
break;
case RACE_VAMPIRE:
- strcpy(power_desc[num].name, _("
生命力吸収", "Drain Life
"));
+ strcpy(power_desc[num].name, _("
吸血", "Vampiric Drain
"));
power_desc[num].level = 2;
power_desc[num].cost = 1 + (lvl / 3);
power_desc[num].stat = A_CON;
power_desc[num].level = 2;
power_desc[num].cost = 1 + (lvl / 3);
power_desc[num].stat = A_CON;
@@
-2442,7
+2444,7
@@
void do_cmd_racial_power(void)
if (p_ptr->muta1 & MUT1_VAMPIRISM)
{
if (p_ptr->muta1 & MUT1_VAMPIRISM)
{
- strcpy(power_desc[num].name, _("吸血
ドレイン
", "Vampiric Drain"));
+ strcpy(power_desc[num].name, _("吸血", "Vampiric Drain"));
power_desc[num].level = 2;
power_desc[num].cost = (1 + (lvl / 3));
power_desc[num].stat = A_CON;
power_desc[num].level = 2;
power_desc[num].cost = (1 + (lvl / 3));
power_desc[num].stat = A_CON;