/*
+ * Whether daytime or not
+ */
+bool is_daytime(void)
+{
+ s32b len = TURNS_PER_TICK * TOWN_DAWN;
+ if ((turn % len) < (len / 2))
+ return TRUE;
+ else
+ return FALSE;
+}
+
+/*
+ * Extract day, hour, min
+ */
+void extract_day_hour_min(int *day, int *hour, int *min)
+{
+ s32b len = TURNS_PER_TICK * TOWN_DAWN;
+ s32b tick = turn % len + len / 4;
+
+ if ((p_ptr->prace == RACE_VAMPIRE) ||
+ (p_ptr->prace == RACE_SKELETON) ||
+ (p_ptr->prace == RACE_ZOMBIE) ||
+ (p_ptr->prace == RACE_SPECTRE))
+ *day = (turn - (TURNS_PER_TICK * TOWN_DAWN *3/4)) / len + 1;
+ else
+ *day = (turn + (TURNS_PER_TICK * TOWN_DAWN /4))/ len + 1;
+ *hour = (24 * tick / len) % 24;
+ *min = (1440 * tick / len) % 60;
+}
+
+/*
* Print time
*/
void prt_time(void)
{
- s32b len = 20L * TOWN_DAWN;
- s32b tick = turn % len + len / 4;
+ int day, hour, min;
/* Dump 13 spaces to clear */
c_put_str(TERM_WHITE, " ", ROW_DAY, COL_DAY);
+ extract_day_hour_min(&day, &hour, &min);
+
/* Dump the info itself */
c_put_str(TERM_WHITE, format(
#ifdef JP
#else
"Day %-2d",
#endif
- ((p_ptr->prace == RACE_VAMPIRE) ||
- (p_ptr->prace == RACE_SKELETON) ||
- (p_ptr->prace == RACE_ZOMBIE) ||
- (p_ptr->prace == RACE_SPECTRE))
- ? (turn - (15L * TOWN_DAWN)) / len + 1
- : (turn + (5L * TOWN_DAWN))/ len + 1),
- ROW_DAY, COL_DAY);
+ day), ROW_DAY, COL_DAY);
- c_put_str(TERM_WHITE, format("%2d:%02d",
- (24 * tick / len) % 24,
- (1440 * tick / len) % 60),
- ROW_DAY, COL_DAY+7);
+ c_put_str(TERM_WHITE, format("%2d:%02d", hour, min), ROW_DAY, COL_DAY+7);
}
}
-/* Show status bar */
+/*
+ * Data structure for status bar
+ */
+#define BAR_TSUYOSHI 0
+#define BAR_HALLUCINATION 1
+#define BAR_BLINDNESS 2
+#define BAR_PARALYZE 3
+#define BAR_CONFUSE 4
+#define BAR_POISONED 5
+#define BAR_AFRAID 6
+#define BAR_LEVITATE 7
+#define BAR_REFLECTION 8
+#define BAR_PASSWALL 9
+#define BAR_WRAITH 10
+#define BAR_PROTEVIL 11
+#define BAR_KAWARIMI 12
+#define BAR_MAGICDEFENSE 13
+#define BAR_EXPAND 14
+#define BAR_STONESKIN 15
+#define BAR_MULTISHADOW 16
+#define BAR_REGMAGIC 17
+#define BAR_ULTIMATE 18
+#define BAR_INVULN 19
+#define BAR_IMMACID 20
+#define BAR_RESACID 21
+#define BAR_IMMELEC 22
+#define BAR_RESELEC 23
+#define BAR_IMMFIRE 24
+#define BAR_RESFIRE 25
+#define BAR_IMMCOLD 26
+#define BAR_RESCOLD 27
+#define BAR_RESPOIS 28
+#define BAR_RESNETH 29
+#define BAR_RESTIME 30
+#define BAR_DUSTROBE 31
+#define BAR_SHFIRE 32
+#define BAR_TOUKI 33
+#define BAR_SHHOLY 34
+#define BAR_EYEEYE 35
+#define BAR_BLESSED 36
+#define BAR_HEROISM 37
+#define BAR_BERSERK 38
+#define BAR_ATTKFIRE 39
+#define BAR_ATTKCOLD 40
+#define BAR_ATTKELEC 41
+#define BAR_ATTKACID 42
+#define BAR_ATTKPOIS 43
+#define BAR_ATTKCONF 44
+#define BAR_SENSEUNSEEN 45
+#define BAR_TELEPATHY 46
+#define BAR_REGENERATION 47
+#define BAR_INFRAVISION 48
+#define BAR_STEALTH 49
+#define BAR_SUPERSTEALTH 50
+#define BAR_RECALL 51
+
+
+static struct {
+ byte attr;
+ cptr sstr;
+ cptr lstr;
+} bar[]
+#ifdef JP
+= {
+ {TERM_YELLOW, "¤Ä", "¤Ä¤è¤·"},
+ {TERM_VIOLET, "¸¸", "¸¸³Ð"},
+ {TERM_L_DARK, "ÌÕ", "ÌÕÌÜ"},
+ {TERM_RED, "áã", "Ëãáã"},
+ {TERM_VIOLET, "Íð", "º®Íð"},
+ {TERM_GREEN, "ÆÇ", "ÆÇ"},
+ {TERM_BLUE, "¶²", "¶²ÉÝ"},
+ {TERM_L_BLUE, "Éâ", "ÉâÍ·"},
+ {TERM_SLATE, "È¿", "È¿¼Í"},
+ {TERM_SLATE, "ÊÉ", "ÊÉÈ´¤±"},
+ {TERM_L_DARK, "Í©", "Í©ÂÎ"},
+ {TERM_SLATE, "¼Ù", "ËɼÙ"},
+ {TERM_VIOLET, "ÊÑ", "ÊѤï¤ê¿È"},
+ {TERM_YELLOW, "Ëâ", "ËâË¡³»"},
+ {TERM_L_UMBER, "¿", "¿¤Ó"},
+ {TERM_WHITE, "ÀÐ", "ÀÐÈ©"},
+ {TERM_L_BLUE, "ʬ", "ʬ¿È"},
+ {TERM_SLATE, "ËÉ", "ËâË¡Ëɸæ"},
+ {TERM_YELLOW, "µæ", "µæ¶Ë"},
+ {TERM_YELLOW, "̵", "̵Ũ"},
+ {TERM_L_GREEN, "»À", "»ÀÌȱÖ"},
+ {TERM_GREEN, "»À", "ÂÑ»À"},
+ {TERM_L_BLUE, "ÅÅ", "ÅÅÌȱÖ"},
+ {TERM_BLUE, "ÅÅ", "ÂÑÅÅ"},
+ {TERM_L_RED, "²Ð", "²ÐÌȱÖ"},
+ {TERM_RED, "²Ð", "ÂѲÐ"},
+ {TERM_WHITE, "Îä", "ÎäÌȱÖ"},
+ {TERM_SLATE, "Îä", "ÂÑÎä"},
+ {TERM_GREEN, "ÆÇ", "ÂÑÆÇ"},
+ {TERM_L_DARK, "¹ö", "ÂÑÃϹö"},
+ {TERM_L_BLUE, "»þ", "ÂÑ»þ´Ö"},
+ {TERM_L_DARK, "¶À", "¶À¥ª¡¼¥é"},
+ {TERM_L_RED, "¥ª", "²Ð¥ª¡¼¥é"},
+ {TERM_WHITE, "Æ®", "Æ®µ¤"},
+ {TERM_WHITE, "À»", "À»¥ª¡¼¥é"},
+ {TERM_VIOLET, "ÌÜ", "ÌܤˤÏÌÜ"},
+ {TERM_WHITE, "½Ë", "½ËÊ¡"},
+ {TERM_WHITE, "ͦ", "ͦ"},
+ {TERM_RED, "¶¸", "¶¸Íð"},
+ {TERM_L_RED, "²Ð", "Ëâ·õ²Ð"},
+ {TERM_WHITE, "Îä", "Ëâ·õÎä"},
+ {TERM_L_BLUE, "ÅÅ", "Ëâ·õÅÅ"},
+ {TERM_SLATE, "»À", "Ëâ·õ»À"},
+ {TERM_L_GREEN, "ÆÇ", "Ëâ·õÆÇ"},
+ {TERM_RED, "Íð", "º®ÍðÂÇ·â"},
+ {TERM_L_BLUE, "»ë", "Æ©ÌÀ»ë"},
+ {TERM_ORANGE, "¥Æ", "¥Æ¥ì¥Ñ¥·"},
+ {TERM_L_BLUE, "²ó", "²óÉü"},
+ {TERM_L_RED, "ÀÖ", "ÀÖ³°"},
+ {TERM_UMBER, "±£", "±£Ì©"},
+ {TERM_YELLOW, "±£", "Ķ±£Ì©"},
+ {TERM_WHITE, "µ¢", "µ¢´Ô"},
+ {0, NULL, NULL}
+};
+#else
+= {
+ {TERM_YELLOW, "Ts", "Tsuyoshi"},
+ {TERM_VIOLET, "Hu", "Hullc"},
+ {TERM_L_DARK, "Bl", "Blind"},
+ {TERM_RED, "Pa", "Paralyzed"},
+ {TERM_VIOLET, "Cf", "Confused"},
+ {TERM_GREEN, "Po", "Poisoned"},
+ {TERM_BLUE, "Af", "Afraid"},
+ {TERM_L_BLUE, "Lv", "Levit"},
+ {TERM_SLATE, "Rf", "Reflect"},
+ {TERM_SLATE, "Pw", "PassWall"},
+ {TERM_L_DARK, "Wr", "Wraith"},
+ {TERM_SLATE, "Ev", "PrtEvl"},
+ {TERM_VIOLET, "Kw", "Kawarimi"},
+ {TERM_YELLOW, "Md", "MgcArm"},
+ {TERM_L_UMBER, "Eh", "Expand"},
+ {TERM_WHITE, "Ss", "StnSkn"},
+ {TERM_L_BLUE, "Ms", "MltShdw"},
+ {TERM_SLATE, "Rm", "ResMag"},
+ {TERM_YELLOW, "Ul", "Ultima"},
+ {TERM_YELLOW, "Iv", "Invuln"},
+ {TERM_L_GREEN, "IAc", "ImmAcid"},
+ {TERM_GREEN, "Ac", "Acid"},
+ {TERM_L_BLUE, "IEl", "ImmElec"},
+ {TERM_BLUE, "El", "Elec"},
+ {TERM_L_RED, "IFi", "ImmFire"},
+ {TERM_RED, "Fi", "Fire"},
+ {TERM_WHITE, "ICo", "ImmCold"},
+ {TERM_SLATE, "Co", "Cold"},
+ {TERM_GREEN, "Po", "Pois"},
+ {TERM_L_DARK, "Nt", "Nthr"},
+ {TERM_L_BLUE, "Ti", "Time"},
+ {TERM_L_DARK, "Mr", "Mirr"},
+ {TERM_L_RED, "SFi", "SFire"},
+ {TERM_WHITE, "Fo", "Force"},
+ {TERM_WHITE, "Ho", "Holy"},
+ {TERM_VIOLET, "Ee", "EyeEye"},
+ {TERM_WHITE, "Bs", "Bless"},
+ {TERM_WHITE, "He", "Hero"},
+ {TERM_RED, "Br", "Berserk"},
+ {TERM_L_RED, "BFi", "BFire"},
+ {TERM_WHITE, "BCo", "BCold"},
+ {TERM_L_BLUE, "BEl", "BElec"},
+ {TERM_SLATE, "BAc", "BAcid"},
+ {TERM_L_GREEN, "BPo", "BPois"},
+ {TERM_RED, "TCf", "TchCnf"},
+ {TERM_L_BLUE, "Se", "SInv"},
+ {TERM_ORANGE, "Te", "Telepa"},
+ {TERM_L_BLUE, "Rg", "Regen"},
+ {TERM_L_RED, "If", "Infr"},
+ {TERM_UMBER, "Sl", "Stealth"},
+ {TERM_YELLOW, "Stlt", "Stealth"},
+ {TERM_WHITE, "Rc", "Recall"},
+ {0, NULL, NULL}
+};
+#endif
+
+#define ADD_FLG(FLG) (bar_flags[FLG / 32] |= (1L << (FLG % 32)))
+#define IS_FLG(FLG) (bar_flags[FLG / 32] & (1L << (FLG % 32)))
+
+/*
+ * Show status bar
+ */
static void prt_status(void)
{
- int wid, hgt, row_statbar;
+ u32b bar_flags[2];
+ int wid, hgt, row_statbar, max_col_statbar;
+ int i, col = 0, num = 0;
+ int space = 2;
Term_get_size(&wid, &hgt);
- row_statbar = hgt - 1;
+ row_statbar = hgt + ROW_STATBAR;
+ max_col_statbar = wid + MAX_COL_STATBAR;
+
+ Term_erase(0, row_statbar, max_col_statbar);
+
+ bar_flags[0] = bar_flags[1] = 0L;
/* Tsuyoshi */
- if (p_ptr->tsuyoshi)
- {
-#ifdef JP
- c_put_str(TERM_YELLOW, "¤Ä", row_statbar, COL_STATBAR);
-#else
- c_put_str(TERM_YELLOW, "Ts", row_statbar, COL_STATBAR);
-#endif
- }
+ if (p_ptr->tsuyoshi) ADD_FLG(BAR_TSUYOSHI);
/* Hallucinating */
- else if (p_ptr->image)
- {
-#ifdef JP
- c_put_str(TERM_VIOLET, "¸¸", row_statbar, COL_STATBAR);
-#else
- c_put_str(TERM_VIOLET, "Hu", row_statbar, COL_STATBAR);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR);
- }
+ if (p_ptr->image) ADD_FLG(BAR_HALLUCINATION);
/* Blindness */
- if (p_ptr->blind)
- {
-#ifdef JP
- c_put_str(TERM_L_DARK, "ÌÕ", row_statbar, COL_STATBAR+2);
-#else
- c_put_str(TERM_L_DARK, "Bl", row_statbar, COL_STATBAR+2);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+2);
- }
+ if (p_ptr->blind) ADD_FLG(BAR_BLINDNESS);
/* Paralysis */
- if (p_ptr->paralyzed)
- {
-#ifdef JP
- c_put_str(TERM_RED, "áã", row_statbar, COL_STATBAR+4);
-#else
- c_put_str(TERM_RED, "Pa", row_statbar, COL_STATBAR+4);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+4);
- }
+ if (p_ptr->paralyzed) ADD_FLG(BAR_PARALYZE);
/* Confusion */
- if (p_ptr->confused)
- {
-#ifdef JP
- c_put_str(TERM_VIOLET, "Íð", row_statbar, COL_STATBAR+6);
-#else
- c_put_str(TERM_VIOLET, "Cf", row_statbar, COL_STATBAR+6);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+6);
- }
+ if (p_ptr->confused) ADD_FLG(BAR_CONFUSE);
- /* Afraid */
- if (p_ptr->poisoned)
- {
-#ifdef JP
- c_put_str(TERM_GREEN, "ÆÇ", row_statbar, COL_STATBAR+8);
-#else
- c_put_str(TERM_GREEN, "Po", row_statbar, COL_STATBAR+8);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+8);
- }
+ /* Posioned */
+ if (p_ptr->poisoned) ADD_FLG(BAR_POISONED);
/* Times see-invisible */
- if (p_ptr->tim_invis)
- {
-#ifdef JP
- c_put_str(TERM_L_BLUE, "ȑ", row_statbar, COL_STATBAR+10);
-#else
- c_put_str(TERM_L_BLUE, "Se", row_statbar, COL_STATBAR+10);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+10);
- }
+ if (p_ptr->tim_invis) ADD_FLG(BAR_SENSEUNSEEN);
/* Timed esp */
- if (p_ptr->tim_esp || music_singing(MUSIC_MIND))
- {
-#ifdef JP
- c_put_str(TERM_ORANGE, "¥Æ", row_statbar, COL_STATBAR+12);
-#else
- c_put_str(TERM_ORANGE, "Te", row_statbar, COL_STATBAR+12);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+12);
- }
+ if (p_ptr->tim_esp || music_singing(MUSIC_MIND)) ADD_FLG(BAR_TELEPATHY);
/* Timed regenerate */
- if (p_ptr->tim_regen)
- {
-#ifdef JP
- c_put_str(TERM_L_BLUE, "²ó", row_statbar, COL_STATBAR+14);
-#else
- c_put_str(TERM_L_BLUE, "Rg", row_statbar, COL_STATBAR+14);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+14);
- }
+ if (p_ptr->tim_regen) ADD_FLG(BAR_REGENERATION);
/* Timed infra-vision */
- if (p_ptr->tim_infra)
- {
-#ifdef JP
- c_put_str(TERM_L_RED, "ÀÖ", row_statbar, COL_STATBAR+16);
-#else
- c_put_str(TERM_L_RED, "If", row_statbar, COL_STATBAR+16);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+16);
- }
+ if (p_ptr->tim_infra) ADD_FLG(BAR_INFRAVISION);
/* Protection from evil */
- if (p_ptr->protevil)
- {
-#ifdef JP
- c_put_str(TERM_SLATE, "¼Ù", row_statbar, COL_STATBAR+18);
-#else
- c_put_str(TERM_SLATE, "Ev", row_statbar, COL_STATBAR+18);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+18);
- }
+ if (p_ptr->protevil) ADD_FLG(BAR_PROTEVIL);
/* Invulnerability */
- if (p_ptr->invuln || music_singing(MUSIC_INVULN))
- {
-#ifdef JP
- c_put_str(TERM_YELLOW, "̵", row_statbar, COL_STATBAR+20);
-#else
- c_put_str(TERM_YELLOW, "Iv", row_statbar, COL_STATBAR+20);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+20);
- }
+ if (p_ptr->invuln || music_singing(MUSIC_INVULN)) ADD_FLG(BAR_INVULN);
/* Wraith form */
- if (p_ptr->wraith_form)
- {
-#ifdef JP
- c_put_str(TERM_L_DARK, "ͩ", row_statbar, COL_STATBAR+22);
-#else
- c_put_str(TERM_L_DARK, "Gh", row_statbar, COL_STATBAR+22);
-#endif
- }
+ if (p_ptr->wraith_form) ADD_FLG(BAR_WRAITH);
+
/* Kabenuke */
- else if (p_ptr->kabenuke)
- {
-#ifdef JP
- c_put_str(TERM_SLATE, "ÊÉ", row_statbar, COL_STATBAR+22);
-#else
- c_put_str(TERM_SLATE, "Wp", row_statbar, COL_STATBAR+22);
-#endif
- }
- else if (p_ptr->tim_reflect)
- {
-#ifdef JP
- c_put_str(TERM_SLATE, "ȿ", row_statbar, COL_STATBAR+22);
-#else
- c_put_str(TERM_SLATE, "Rf", row_statbar, COL_STATBAR+22);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+22);
- }
+ if (p_ptr->kabenuke) ADD_FLG(BAR_PASSWALL);
+
+ if (p_ptr->tim_reflect) ADD_FLG(BAR_REFLECTION);
/* Heroism */
- if (p_ptr->hero || music_singing(MUSIC_HERO) || music_singing(MUSIC_SHERO))
- {
-#ifdef JP
- c_put_str(TERM_WHITE, "ͦ", row_statbar, COL_STATBAR+24);
-#else
- c_put_str(TERM_WHITE, "He", row_statbar, COL_STATBAR+24);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+24);
- }
+ if (p_ptr->hero || music_singing(MUSIC_HERO) || music_singing(MUSIC_SHERO)) ADD_FLG(BAR_HEROISM);
/* Super Heroism / berserk */
- if (p_ptr->shero)
- {
-#ifdef JP
- c_put_str(TERM_RED, "¶¸", row_statbar, COL_STATBAR+26);
-#else
- c_put_str(TERM_RED, "Br", row_statbar, COL_STATBAR+26);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+26);
- }
+ if (p_ptr->shero) ADD_FLG(BAR_BERSERK);
/* Blessed */
- if (p_ptr->blessed || music_singing(MUSIC_BLESS))
- {
-#ifdef JP
- c_put_str(TERM_WHITE, "½Ë", row_statbar, COL_STATBAR+28);
-#else
- c_put_str(TERM_WHITE, "Bs", row_statbar, COL_STATBAR+28);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+28);
- }
+ if (p_ptr->blessed || music_singing(MUSIC_BLESS)) ADD_FLG(BAR_BLESSED);
/* Shield */
- if (p_ptr->magicdef)
- {
-#ifdef JP
- c_put_str(TERM_YELLOW, "Ëâ", row_statbar, COL_STATBAR+30);
-#else
- c_put_str(TERM_YELLOW, "Md", row_statbar, COL_STATBAR+30);
-#endif
- }
- else if (p_ptr->tsubureru)
- {
-#ifdef JP
- c_put_str(TERM_L_UMBER, "¿", row_statbar, COL_STATBAR+30);
-#else
- c_put_str(TERM_L_UMBER, "Eh", row_statbar, COL_STATBAR+30);
-#endif
- }
- else if (p_ptr->shield)
- {
-#ifdef JP
- c_put_str(TERM_WHITE, "ÀÐ", row_statbar, COL_STATBAR+30);
-#else
- c_put_str(TERM_WHITE, "Ss", row_statbar, COL_STATBAR+30);
-#endif
- }
- else if (p_ptr->special_defense & NINJA_KAWARIMI)
- {
-#ifdef JP
- c_put_str(TERM_VIOLET, "ÊÑ", row_statbar, COL_STATBAR+30);
-#else
- c_put_str(TERM_VIOLET, "Qa", row_statbar, COL_STATBAR+30);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+30);
- }
+ if (p_ptr->magicdef) ADD_FLG(BAR_MAGICDEFENSE);
+
+ if (p_ptr->tsubureru) ADD_FLG(BAR_EXPAND);
+
+ if (p_ptr->shield) ADD_FLG(BAR_STONESKIN);
+
+ if (p_ptr->special_defense & NINJA_KAWARIMI) ADD_FLG(BAR_KAWARIMI);
/* Oppose Acid */
- if (p_ptr->special_defense & DEFENSE_ACID)
- {
-#ifdef JP
- c_put_str(TERM_L_GREEN, "»À", row_statbar, COL_STATBAR+32);
-#else
- c_put_str(TERM_L_GREEN, "Ac", row_statbar, COL_STATBAR+32);
-#endif
- }
- else if (p_ptr->oppose_acid || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
- {
-#ifdef JP
- c_put_str(TERM_GREEN, "»À", row_statbar, COL_STATBAR+32);
-#else
- c_put_str(TERM_GREEN, "Ac", row_statbar, COL_STATBAR+32);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+32);
- }
+ if (p_ptr->special_defense & DEFENSE_ACID) ADD_FLG(BAR_IMMACID);
+ if (p_ptr->oppose_acid || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU)) ADD_FLG(BAR_RESACID);
/* Oppose Lightning */
- if (p_ptr->special_defense & DEFENSE_ELEC)
- {
-#ifdef JP
- c_put_str(TERM_L_BLUE, "ÅÅ", row_statbar, COL_STATBAR+34);
-#else
- c_put_str(TERM_L_BLUE, "El", row_statbar, COL_STATBAR+34);
-#endif
- }
- else if (p_ptr->oppose_elec || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
- {
-#ifdef JP
- c_put_str(TERM_BLUE, "ÅÅ", row_statbar, COL_STATBAR+34);
-#else
- c_put_str(TERM_BLUE, "El", row_statbar, COL_STATBAR+34);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+34);
- }
+ if (p_ptr->special_defense & DEFENSE_ELEC) ADD_FLG(BAR_IMMELEC);
+ if (p_ptr->oppose_elec || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU)) ADD_FLG(BAR_RESELEC);
/* Oppose Fire */
- if (p_ptr->special_defense & DEFENSE_FIRE)
- {
-#ifdef JP
- c_put_str(TERM_L_RED, "²Ð", row_statbar, COL_STATBAR+36);
-#else
- c_put_str(TERM_L_RED, "Fi", row_statbar, COL_STATBAR+36);
-#endif
- }
- else if (p_ptr->oppose_fire || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
- {
-#ifdef JP
- c_put_str(TERM_RED, "²Ð", row_statbar, COL_STATBAR+36);
-#else
- c_put_str(TERM_RED, "Fi", row_statbar, COL_STATBAR+36);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+36);
- }
+ if (p_ptr->special_defense & DEFENSE_FIRE) ADD_FLG(BAR_IMMFIRE);
+ if (p_ptr->oppose_fire || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU)) ADD_FLG(BAR_RESFIRE);
/* Oppose Cold */
- if (p_ptr->special_defense & DEFENSE_COLD)
- {
-#ifdef JP
- c_put_str(TERM_WHITE, "Îä", row_statbar, COL_STATBAR+38);
-#else
- c_put_str(TERM_WHITE, "Co", row_statbar, COL_STATBAR+38);
-#endif
- }
- else if (p_ptr->oppose_cold || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
- {
-#ifdef JP
- c_put_str(TERM_SLATE, "Îä", row_statbar, COL_STATBAR+38);
-#else
- c_put_str(TERM_SLATE, "Co", row_statbar, COL_STATBAR+38);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+38);
- }
+ if (p_ptr->special_defense & DEFENSE_COLD) ADD_FLG(BAR_IMMCOLD);
+ if (p_ptr->oppose_cold || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU)) ADD_FLG(BAR_RESCOLD);
/* Oppose Poison */
- if (p_ptr->oppose_pois || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
- {
-#ifdef JP
- c_put_str(TERM_GREEN, "ÆÇ", row_statbar, COL_STATBAR+40);
-#else
- c_put_str(TERM_GREEN, "Po", row_statbar, COL_STATBAR+40);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+40);
- }
+ if (p_ptr->oppose_pois || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU)) ADD_FLG(BAR_RESPOIS);
/* Word of Recall */
- if (p_ptr->word_recall)
- {
-#ifdef JP
- c_put_str(TERM_WHITE, "µ¢", row_statbar, COL_STATBAR+42);
-#else
- c_put_str(TERM_WHITE, "Wr", row_statbar, COL_STATBAR+42);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+42);
- }
+ if (p_ptr->word_recall) ADD_FLG(BAR_RECALL);
/* Afraid */
- if (p_ptr->afraid)
- {
-#ifdef JP
- c_put_str(TERM_BLUE, "¶²", row_statbar, COL_STATBAR+44);
-#else
- c_put_str(TERM_BLUE, "Fe", row_statbar, COL_STATBAR+44);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+44);
- }
+ if (p_ptr->afraid) ADD_FLG(BAR_AFRAID);
- /* Blindness */
- if (p_ptr->tim_res_time)
- {
-#ifdef JP
- c_put_str(TERM_L_BLUE, "»þ", row_statbar, COL_STATBAR+46);
-#else
- c_put_str(TERM_L_BLUE, "Ti", row_statbar, COL_STATBAR+46);
-#endif
- }
- else if (p_ptr->multishadow)
- {
-#ifdef JP
- c_put_str(TERM_L_BLUE, "ʬ", row_statbar, COL_STATBAR+46);
-#else
- c_put_str(TERM_L_BLUE, "Ms", row_statbar, COL_STATBAR+46);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+46);
- }
+ /* Resist time */
+ if (p_ptr->tim_res_time) ADD_FLG(BAR_RESTIME);
+
+ if (p_ptr->multishadow) ADD_FLG(BAR_MULTISHADOW);
/* Confusing Hands */
- if (p_ptr->special_attack & ATTACK_CONFUSE)
- {
-#ifdef JP
- c_put_str(TERM_RED, "Íð", row_statbar, COL_STATBAR+48);
-#else
- c_put_str(TERM_RED, "Cf", row_statbar, COL_STATBAR+48);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+48);
- }
+ if (p_ptr->special_attack & ATTACK_CONFUSE) ADD_FLG(BAR_ATTKCONF);
- if (p_ptr->resist_magic)
- {
-#ifdef JP
- c_put_str(TERM_SLATE, "ËÉ", row_statbar, COL_STATBAR+50);
-#else
- c_put_str(TERM_SLATE, "Rm", row_statbar, COL_STATBAR+50);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+50);
- }
+ if (p_ptr->resist_magic) ADD_FLG(BAR_REGMAGIC);
/* Ultimate-resistance */
- if (p_ptr->ult_res)
- {
-#ifdef JP
- c_put_str(TERM_YELLOW, "µæ", row_statbar, COL_STATBAR+52);
-#else
- c_put_str(TERM_YELLOW, "Ul", row_statbar, COL_STATBAR+52);
-#endif
- }
+ if (p_ptr->ult_res) ADD_FLG(BAR_ULTIMATE);
+
/* tim levitation */
- else if (p_ptr->tim_ffall)
- {
-#ifdef JP
- c_put_str(TERM_L_BLUE, "Éâ", row_statbar, COL_STATBAR+52);
-#else
- c_put_str(TERM_L_BLUE, "Lv", row_statbar, COL_STATBAR+52);
-#endif
- }
- else if (p_ptr->tim_res_nether)
- {
-#ifdef JP
- c_put_str(TERM_L_DARK, "¹ö", row_statbar, COL_STATBAR+52);
-#else
- c_put_str(TERM_L_DARK, "Nt", row_statbar, COL_STATBAR+52);
-#endif
- }
- else if (p_ptr->dustrobe)
- {
-#ifdef JP
- c_put_str(TERM_L_DARK, "¶À", row_statbar, COL_STATBAR+52);
-#else
- c_put_str(TERM_L_DARK, "Am", row_statbar, COL_STATBAR+52);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+52);
- }
+ if (p_ptr->tim_ffall) ADD_FLG(BAR_LEVITATE);
+
+ if (p_ptr->tim_res_nether) ADD_FLG(BAR_RESNETH);
+
+ if (p_ptr->dustrobe) ADD_FLG(BAR_DUSTROBE);
/* Mahouken */
- if (p_ptr->special_attack & ATTACK_FIRE)
- {
-#ifdef JP
- c_put_str(TERM_L_RED, "²Ð", row_statbar, COL_STATBAR+54);
-#else
- c_put_str(TERM_L_RED, "Fi", row_statbar, COL_STATBAR+54);
-#endif
- }
- else if (p_ptr->special_attack & ATTACK_COLD)
- {
-#ifdef JP
- c_put_str(TERM_WHITE, "Îä", row_statbar, COL_STATBAR+54);
-#else
- c_put_str(TERM_WHITE, "Co", row_statbar, COL_STATBAR+54);
-#endif
- }
- else if (p_ptr->special_attack & ATTACK_ELEC)
- {
-#ifdef JP
- c_put_str(TERM_L_BLUE, "ÅÅ", row_statbar, COL_STATBAR+54);
-#else
- c_put_str(TERM_L_BLUE, "El", row_statbar, COL_STATBAR+54);
-#endif
- }
- else if (p_ptr->special_attack & ATTACK_ACID)
- {
-#ifdef JP
- c_put_str(TERM_SLATE, "»À", row_statbar, COL_STATBAR+54);
-#else
- c_put_str(TERM_SLATE, "Ac", row_statbar, COL_STATBAR+54);
-#endif
- }
- else if (p_ptr->special_attack & ATTACK_POIS)
- {
-#ifdef JP
- c_put_str(TERM_L_GREEN, "ÆÇ", row_statbar, COL_STATBAR+54);
-#else
- c_put_str(TERM_L_GREEN, "Po", row_statbar, COL_STATBAR+54);
-#endif
- }
- else if (p_ptr->special_defense & NINJA_S_STEALTH)
- {
-#ifdef JP
- c_put_str(TERM_YELLOW, "Ķ", row_statbar, COL_STATBAR+54);
-#else
- c_put_str(TERM_YELLOW, "St", row_statbar, COL_STATBAR+54);
-#endif
- }
- else
- {
- put_str(" ", row_statbar, COL_STATBAR+54);
- }
+ if (p_ptr->special_attack & ATTACK_FIRE) ADD_FLG(BAR_ATTKFIRE);
+ if (p_ptr->special_attack & ATTACK_COLD) ADD_FLG(BAR_ATTKCOLD);
+ if (p_ptr->special_attack & ATTACK_ELEC) ADD_FLG(BAR_ATTKELEC);
+ if (p_ptr->special_attack & ATTACK_ACID) ADD_FLG(BAR_ATTKACID);
+ if (p_ptr->special_attack & ATTACK_POIS) ADD_FLG(BAR_ATTKPOIS);
+ if (p_ptr->special_defense & NINJA_S_STEALTH) ADD_FLG(BAR_SUPERSTEALTH);
/* tim stealth */
- if (p_ptr->tim_sh_fire)
- {
-#ifdef JP
- c_put_str(TERM_L_RED, "¥ª", row_statbar, COL_STATBAR+56);
-#else
- c_put_str(TERM_L_RED, "Sf", row_statbar, COL_STATBAR+56);
-#endif
- }
- else if (p_ptr->tim_stealth || music_singing(MUSIC_STEALTH))
- {
-#ifdef JP
- c_put_str(TERM_UMBER, "±£", row_statbar, COL_STATBAR+56);
-#else
- c_put_str(TERM_UMBER, "Sl", row_statbar, COL_STATBAR+56);
-#endif
- }
- else if (p_ptr->special_defense & NINJA_S_STEALTH)
+ if (p_ptr->tim_sh_fire) ADD_FLG(BAR_SHFIRE);
+
+ if (p_ptr->tim_stealth || music_singing(MUSIC_STEALTH)) ADD_FLG(BAR_STEALTH);
+
+ if (p_ptr->tim_sh_touki) ADD_FLG(BAR_TOUKI);
+
+ /* Holy aura */
+ if (p_ptr->tim_sh_holy) ADD_FLG(BAR_SHHOLY);
+
+ /* An Eye for an Eye */
+ if (p_ptr->tim_eyeeye) ADD_FLG(BAR_EYEEYE);
+
+ /* Calcurate length */
+ for (i = 0; bar[i].sstr; i++)
{
-#ifdef JP
- c_put_str(TERM_YELLOW, "±£", row_statbar, COL_STATBAR+56);
-#else
- c_put_str(TERM_YELLOW, "lt", row_statbar, COL_STATBAR+56);
-#endif
+ if (IS_FLG(i))
+ {
+ col += strlen(bar[i].lstr) + 1;
+ num++;
+ }
}
- else if (p_ptr->tim_sh_touki)
+
+ /* If there are not excess spaces for long strings, use short one */
+ if (col - 1 > max_col_statbar)
{
-#ifdef JP
- c_put_str(TERM_WHITE, "Ʈ", row_statbar, COL_STATBAR+56);
-#else
- c_put_str(TERM_WHITE, "Ae", row_statbar, COL_STATBAR+56);
-#endif
+ space = 0;
+ col = 0;
+
+ for (i = 0; bar[i].sstr; i++)
+ {
+ if (IS_FLG(i))
+ {
+ col += strlen(bar[i].sstr);
+ }
+ }
+
+ /* If there are excess spaces for short string, use more */
+ if (col - 1 <= max_col_statbar - (num-1))
+ {
+ space = 1;
+ col += num - 1;
+ }
}
- else
+
+
+ /* Centering display column */
+ col = (max_col_statbar - col) / 2;
+
+ /* Display status bar */
+ for (i = 0; bar[i].sstr; i++)
{
- put_str(" ", row_statbar, COL_STATBAR+56);
+ if (IS_FLG(i))
+ {
+ cptr str;
+ if (space == 2) str = bar[i].lstr;
+ else str = bar[i].sstr;
+
+ c_put_str(bar[i].attr, str, row_statbar, col);
+ col += strlen(str);
+ if (space > 0) col++;
+ if (col > max_col_statbar) break;
+ }
}
}
char str[14];
/* Wizard */
- if (wizard)
+ if (p_ptr->wizard)
{
#ifdef JP
/* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½ ¾Î¹æ */
}
/* Winner */
- else if (total_winner || (p_ptr->lev > PY_MAX_LEVEL))
+ else if (p_ptr->total_winner || (p_ptr->lev > PY_MAX_LEVEL))
{
if ((p_ptr->arena_number > MAX_ARENA_MONS+2) && (p_ptr->arena_number < 99))
{
/* Normal */
else
{
-#ifdef JP
- mb_strlcpy(str, player_title[p_ptr->pclass][(p_ptr->lev - 1) / 5], 14);
-#else
- strncpy(str, player_title[p_ptr->pclass][(p_ptr->lev - 1) / 5], 13);
- str[13] = '\0';
-#endif
+ my_strcpy(str, player_title[p_ptr->pclass][(p_ptr->lev - 1) / 5], sizeof(str));
p = str;
}
{
char out_val[32];
- if ((p_ptr->prace == RACE_ANDROID) && !cheat_xtra)
- (void)strcpy(out_val, "*******");
- else
#ifdef JP
(void)sprintf(out_val, "%7ld", (long)p_ptr->exp);
#else
if (p_ptr->exp >= p_ptr->max_exp)
{
#ifdef JP
- put_str("·Ð¸³ ", ROW_EXP, 0);
+ if (p_ptr->prace == RACE_ANDROID) put_str("¶¯²½ ", ROW_EXP, 0);
+ else put_str("·Ð¸³ ", ROW_EXP, 0);
c_put_str(TERM_L_GREEN, out_val, ROW_EXP, COL_EXP + 5);
#else
- put_str("EXP ", ROW_EXP, 0);
+ if (p_ptr->prace == RACE_ANDROID) put_str("Cst ", ROW_EXP, 0);
+ else put_str("EXP ", ROW_EXP, 0);
c_put_str(TERM_L_GREEN, out_val, ROW_EXP, COL_EXP + 4);
#endif
static void prt_depth(void)
{
char depths[32];
- int wid, hgt, row_depth;
+ int wid, hgt, row_depth, col_depth;
Term_get_size(&wid, &hgt);
- row_depth = hgt - 1;
+ col_depth = wid + COL_DEPTH;
+ row_depth = hgt + ROW_DEPTH;
if (!dun_level)
{
}
/* Right-Adjust the "depth", and clear old values */
- prt(format("%7s", depths), row_depth, COL_DEPTH);
+ prt(format("%7s", depths), row_depth, col_depth);
}
byte attr = TERM_WHITE;
char buf[32] = "";
- int wid, hgt, row_speed;
+ int wid, hgt, row_speed, col_speed;
Term_get_size(&wid, &hgt);
- row_speed = hgt - 1;
+ col_speed = wid + COL_SPEED;
+ row_speed = hgt + ROW_SPEED;
/* Hack -- Visually "undo" the Search Mode Slowdown */
if (p_ptr->action == ACTION_SEARCH) i += 10;
}
/* Display the speed */
- c_put_str(attr, format("%-9s", buf), row_speed, COL_SPEED);
+ c_put_str(attr, format("%-9s", buf), row_speed, col_speed);
}
static void prt_study(void)
{
- int wid, hgt, row_study;
+ int wid, hgt, row_study, col_study;
Term_get_size(&wid, &hgt);
- row_study = hgt - 1;
+ col_study = wid + COL_STUDY;
+ row_study = hgt + ROW_STUDY;
if (p_ptr->new_spells)
{
#ifdef JP
- put_str("³Ø½¬", row_study, COL_STUDY);
+ put_str("³Ø½¬", row_study, col_study);
#else
- put_str("Stud", row_study, COL_STUDY);
+ put_str("Stud", row_study, col_study);
#endif
}
else
{
- put_str(" ", row_study, COL_STUDY);
+ put_str(" ", row_study, col_study);
}
}
static void prt_mane(void)
{
- int wid, hgt, row_study;
+ int wid, hgt, row_study, col_study;
Term_get_size(&wid, &hgt);
- row_study = hgt - 1;
+ col_study = wid + COL_STUDY;
+ row_study = hgt + ROW_STUDY;
if (p_ptr->pclass == CLASS_IMITATOR)
{
- if (mane_num)
+ if (p_ptr->mane_num)
{
byte attr;
if (new_mane) attr = TERM_L_RED;
else attr = TERM_WHITE;
#ifdef JP
- c_put_str(attr, "¤Þ¤Í", row_study, COL_STUDY);
+ c_put_str(attr, "¤Þ¤Í", row_study, col_study);
#else
- c_put_str(attr, "Mane", row_study, COL_STUDY);
+ c_put_str(attr, "Mane", row_study, col_study);
#endif
}
else
{
- put_str(" ", row_study, COL_STUDY);
+ put_str(" ", row_study, col_study);
}
}
}
prt_field(mimic_info[p_ptr->mimic_form].title, ROW_RACE, COL_RACE);
else
{
-#ifdef JP
char str[14];
- mb_strlcpy(str, rp_ptr->title, 14);
+ my_strcpy(str, rp_ptr->title, sizeof(str));
prt_field(str, ROW_RACE, COL_RACE);
-#else
- prt_field(rp_ptr->title, ROW_RACE, COL_RACE);
-#endif
}
/* prt_field(cp_ptr->title, ROW_CLASS, COL_CLASS); */
/* prt_field(ap_ptr->title, ROW_SEIKAKU, COL_SEIKAKU); */
for (j = 0; j < 8; j++)
{
term *old = Term;
+ int wid, hgt;
/* No window */
if (!angband_term[j]) continue;
/* Activate */
Term_activate(angband_term[j]);
- /* Redraw map */
- display_map(&cy, &cx);
+ /* Full map in too small window is useless */
+ Term_get_size(&wid, &hgt);
+ if (wid > COL_MAP + 2 && hgt > ROW_MAP + 2)
+ {
+ /* Redraw map */
+ display_map(&cy, &cx);
- /* Fresh */
- Term_fresh();
+ /* Fresh */
+ Term_fresh();
+ }
/* Restore */
Term_activate(old);
int num_boukyaku = 0;
magic_type *s_ptr;
- int use_realm1 = p_ptr->realm1 - 1;
- int use_realm2 = p_ptr->realm2 - 1;
int which;
int bonus = 0;
{
/* Count known spells */
if ((j < 32) ?
- (spell_forgotten1 & (1L << j)) :
- (spell_forgotten2 & (1L << (j - 32))))
+ (p_ptr->spell_forgotten1 & (1L << j)) :
+ (p_ptr->spell_forgotten2 & (1L << (j - 32))))
{
num_boukyaku++;
}
for (i = 63; i >= 0; i--)
{
/* Efficiency -- all done */
- if (!spell_learned1 && !spell_learned2) break;
+ if (!p_ptr->spell_learned1 && !p_ptr->spell_learned2) break;
/* Access the spell */
- j = spell_order[i];
+ j = p_ptr->spell_order[i];
/* Skip non-spells */
if (j >= 99) continue;
/* Get the spell */
- if (!is_magic(((j < 32) ? use_realm1 : use_realm2)+1))
+ if (!is_magic((j < 32) ? p_ptr->realm1 : p_ptr->realm2))
{
if (j < 32)
- s_ptr = &technic_info[use_realm1 - MIN_TECHNIC][j];
+ s_ptr = &technic_info[p_ptr->realm1 - MIN_TECHNIC][j];
else
- s_ptr = &technic_info[use_realm2 - MIN_TECHNIC][j%32];
+ s_ptr = &technic_info[p_ptr->realm2 - MIN_TECHNIC][j%32];
}
else if (j < 32)
- s_ptr = &mp_ptr->info[use_realm1][j];
+ s_ptr = &mp_ptr->info[p_ptr->realm1-1][j];
else
- s_ptr = &mp_ptr->info[use_realm2][j%32];
+ s_ptr = &mp_ptr->info[p_ptr->realm2-1][j%32];
/* Skip spells we are allowed to know */
if (s_ptr->slevel <= p_ptr->lev) continue;
/* Is it known? */
if ((j < 32) ?
- (spell_learned1 & (1L << j)) :
- (spell_learned2 & (1L << (j - 32))))
+ (p_ptr->spell_learned1 & (1L << j)) :
+ (p_ptr->spell_learned2 & (1L << (j - 32))))
{
/* Mark as forgotten */
if (j < 32)
{
- spell_forgotten1 |= (1L << j);
- which = use_realm1;
+ p_ptr->spell_forgotten1 |= (1L << j);
+ which = p_ptr->realm1;
}
else
{
- spell_forgotten2 |= (1L << (j - 32));
- which = use_realm2;
+ p_ptr->spell_forgotten2 |= (1L << (j - 32));
+ which = p_ptr->realm2;
}
/* No longer known */
if (j < 32)
{
- spell_learned1 &= ~(1L << j);
- which = use_realm1;
+ p_ptr->spell_learned1 &= ~(1L << j);
+ which = p_ptr->realm1;
}
else
{
- spell_learned2 &= ~(1L << (j - 32));
- which = use_realm2;
+ p_ptr->spell_learned2 &= ~(1L << (j - 32));
+ which = p_ptr->realm2;
}
/* Message */
#ifdef JP
msg_format("%s¤Î%s¤ò˺¤ì¤Æ¤·¤Þ¤Ã¤¿¡£",
- spell_names[technic2magic(which+1)-1][j%32], p );
+ spell_names[technic2magic(which)-1][j%32], p );
#else
msg_format("You have forgotten the %s of %s.", p,
- spell_names[technic2magic(which+1)-1][j%32]);
+ spell_names[technic2magic(which)-1][j%32]);
#endif
if (p_ptr->new_spells >= 0) break;
/* Efficiency -- all done */
- if (!spell_learned1 && !spell_learned2) break;
+ if (!p_ptr->spell_learned1 && !p_ptr->spell_learned2) break;
/* Get the (i+1)th spell learned */
- j = spell_order[i];
+ j = p_ptr->spell_order[i];
/* Skip unknown spells */
if (j >= 99) continue;
/* Forget it (if learned) */
if ((j < 32) ?
- (spell_learned1 & (1L << j)) :
- (spell_learned2 & (1L << (j - 32))))
+ (p_ptr->spell_learned1 & (1L << j)) :
+ (p_ptr->spell_learned2 & (1L << (j - 32))))
{
/* Mark as forgotten */
if (j < 32)
{
- spell_forgotten1 |= (1L << j);
- which = use_realm1;
+ p_ptr->spell_forgotten1 |= (1L << j);
+ which = p_ptr->realm1;
}
else
{
- spell_forgotten2 |= (1L << (j - 32));
- which = use_realm2;
+ p_ptr->spell_forgotten2 |= (1L << (j - 32));
+ which = p_ptr->realm2;
}
/* No longer known */
if (j < 32)
{
- spell_learned1 &= ~(1L << j);
- which = use_realm1;
+ p_ptr->spell_learned1 &= ~(1L << j);
+ which = p_ptr->realm1;
}
else
{
- spell_learned2 &= ~(1L << (j - 32));
- which = use_realm2;
+ p_ptr->spell_learned2 &= ~(1L << (j - 32));
+ which = p_ptr->realm2;
}
/* Message */
#ifdef JP
msg_format("%s¤Î%s¤ò˺¤ì¤Æ¤·¤Þ¤Ã¤¿¡£",
- spell_names[technic2magic(which+1)-1][j%32], p );
+ spell_names[technic2magic(which)-1][j%32], p );
#else
msg_format("You have forgotten the %s of %s.", p,
- spell_names[technic2magic(which+1)-1][j%32]);
+ spell_names[technic2magic(which)-1][j%32]);
#endif
if (p_ptr->new_spells <= 0) break;
/* Efficiency -- all done */
- if (!spell_forgotten1 && !spell_forgotten2) break;
+ if (!p_ptr->spell_forgotten1 && !p_ptr->spell_forgotten2) break;
/* Get the next spell we learned */
- j = spell_order[i];
+ j = p_ptr->spell_order[i];
/* Skip unknown spells */
if (j >= 99) break;
/* Access the spell */
- if (!is_magic(((j < 32) ? use_realm1 : use_realm2)+1))
+ if (!is_magic((j < 32) ? p_ptr->realm1 : p_ptr->realm2))
{
if (j < 32)
- s_ptr = &technic_info[use_realm1 - MIN_TECHNIC][j];
+ s_ptr = &technic_info[p_ptr->realm1 - MIN_TECHNIC][j];
else
- s_ptr = &technic_info[use_realm2 - MIN_TECHNIC][j%32];
+ s_ptr = &technic_info[p_ptr->realm2 - MIN_TECHNIC][j%32];
}
else if (j<32)
- s_ptr = &mp_ptr->info[use_realm1][j];
+ s_ptr = &mp_ptr->info[p_ptr->realm1-1][j];
else
- s_ptr = &mp_ptr->info[use_realm2][j%32];
+ s_ptr = &mp_ptr->info[p_ptr->realm2-1][j%32];
/* Skip spells we cannot remember */
if (s_ptr->slevel > p_ptr->lev) continue;
/* First set of spells */
if ((j < 32) ?
- (spell_forgotten1 & (1L << j)) :
- (spell_forgotten2 & (1L << (j - 32))))
+ (p_ptr->spell_forgotten1 & (1L << j)) :
+ (p_ptr->spell_forgotten2 & (1L << (j - 32))))
{
/* No longer forgotten */
if (j < 32)
{
- spell_forgotten1 &= ~(1L << j);
- which = use_realm1;
+ p_ptr->spell_forgotten1 &= ~(1L << j);
+ which = p_ptr->realm1;
}
else
{
- spell_forgotten2 &= ~(1L << (j - 32));
- which = use_realm2;
+ p_ptr->spell_forgotten2 &= ~(1L << (j - 32));
+ which = p_ptr->realm2;
}
/* Known once more */
if (j < 32)
{
- spell_learned1 |= (1L << j);
- which = use_realm1;
+ p_ptr->spell_learned1 |= (1L << j);
+ which = p_ptr->realm1;
}
else
{
- spell_learned2 |= (1L << (j - 32));
- which = use_realm2;
+ p_ptr->spell_learned2 |= (1L << (j - 32));
+ which = p_ptr->realm2;
}
/* Message */
#ifdef JP
msg_format("%s¤Î%s¤ò»×¤¤½Ð¤·¤¿¡£",
- spell_names[technic2magic(which+1)-1][j%32], p );
+ spell_names[technic2magic(which)-1][j%32], p );
#else
msg_format("You have remembered the %s of %s.",
- p, spell_names[technic2magic(which+1)-1][j%32]);
+ p, spell_names[technic2magic(which)-1][j%32]);
#endif
/* Count spells that can be learned */
for (j = 0; j < 32; j++)
{
- if (!is_magic(use_realm1+1)) s_ptr = &technic_info[use_realm1-MIN_TECHNIC][j];
- else s_ptr = &mp_ptr->info[use_realm1][j];
+ if (!is_magic(p_ptr->realm1)) s_ptr = &technic_info[p_ptr->realm1-MIN_TECHNIC][j];
+ else s_ptr = &mp_ptr->info[p_ptr->realm1-1][j];
/* Skip spells we cannot remember */
if (s_ptr->slevel > p_ptr->lev) continue;
/* Skip spells we already know */
- if (spell_learned1 & (1L << j))
+ if (p_ptr->spell_learned1 & (1L << j))
{
continue;
}
/* Redraw Study Status */
p_ptr->redraw |= (PR_STUDY);
+
+ /* Redraw object recall */
+ p_ptr->window |= (PW_OBJECT);
}
}
/* Only mages are affected */
if (mp_ptr->spell_xtra & MAGIC_GLOVE_REDUCE_MANA)
{
- u32b f1, f2, f3;
+ u32b flgs[TR_FLAG_SIZE];
/* Assume player is not encumbered by gloves */
p_ptr->cumber_glove = FALSE;
o_ptr = &inventory[INVEN_HANDS];
/* Examine the gloves */
- object_flags(o_ptr, &f1, &f2, &f3);
+ object_flags(o_ptr, flgs);
/* Normal gloves hurt mage-type spells */
if (o_ptr->k_idx &&
- !(f2 & (TR2_FREE_ACT)) &&
- !(f1 & (TR1_MAGIC_MASTERY)) &&
- !((f1 & (TR1_DEX)) && (o_ptr->pval > 0)))
+ !(have_flag(flgs, TR_FREE_ACT)) &&
+ !(have_flag(flgs, TR_MAGIC_MASTERY)) &&
+ !(have_flag(flgs, TR_DEX)) && (o_ptr->pval > 0))
{
/* Encumbered */
p_ptr->cumber_glove = TRUE;
bonus = ((int)(adj_con_mhp[p_ptr->stat_ind[A_CON]]) - 128) * p_ptr->lev / 4;
/* Calculate hitpoints */
- mhp = player_hp[p_ptr->lev - 1];
+ mhp = p_ptr->player_hp[p_ptr->lev - 1];
if (p_ptr->mimic_form)
{
if (mhp < p_ptr->lev + 1) mhp = p_ptr->lev + 1;
/* Factor in the hero / superhero settings */
- if (p_ptr->hero || music_singing(MUSIC_HERO) || music_singing(MUSIC_SHERO))
- if (p_ptr->shero) mhp += 30;
+ if (p_ptr->hero || music_singing(MUSIC_HERO) || music_singing(MUSIC_SHERO)) mhp += 10;
+ if (p_ptr->shero && (p_ptr->pclass != CLASS_BERSERKER)) mhp += 30;
if (p_ptr->tsuyoshi) mhp += 50;
/* New maximum hitpoints */
{
int i;
object_type *o_ptr;
- u32b f1, f2, f3;
+ u32b flgs[TR_FLAG_SIZE];
/* Assume no light */
p_ptr->cur_lite = 0;
if (!o_ptr->k_idx) continue;
/* Extract the flags */
- object_flags(o_ptr, &f1, &f2, &f3);
+ object_flags(o_ptr, flgs);
/* does this item glow? */
- if (f3 & TR3_LITE)
+ if (have_flag(flgs, TR_LITE))
{
if ((o_ptr->name2 == EGO_DARK) || (o_ptr->name1 == ART_NIGHT)) p_ptr->cur_lite--;
else p_ptr->cur_lite++;
/* see cave.c:update_lite() and defines.h:LITE_MAX */
if (d_info[dungeon_type].flags1 & DF1_DARKNESS && p_ptr->cur_lite > 1)
p_ptr->cur_lite = 1;
- if (p_ptr->cur_lite > 5) p_ptr->cur_lite = 5;
+ if (p_ptr->cur_lite > 14) p_ptr->cur_lite = 14;
if (p_ptr->cur_lite < 0) p_ptr->cur_lite = 0;
/* check if the player doesn't have a lite source, */
{
int i, j, hold, neutral[2];
int old_speed;
- int old_telepathy;
+ bool old_telepathy;
+ bool old_esp_animal;
+ bool old_esp_undead;
+ bool old_esp_demon;
+ bool old_esp_orc;
+ bool old_esp_troll;
+ bool old_esp_giant;
+ bool old_esp_dragon;
+ bool old_esp_human;
+ bool old_esp_evil;
+ bool old_esp_good;
+ bool old_esp_nonliving;
+ bool old_esp_unique;
int old_see_inv;
int old_dis_ac;
int old_dis_to_a;
int extra_blows[2];
int extra_shots;
object_type *o_ptr;
- u32b f1, f2, f3;
+ u32b flgs[TR_FLAG_SIZE];
bool omoi = FALSE;
bool yoiyami = FALSE;
bool down_saving = FALSE;
/* Save the old vision stuff */
old_telepathy = p_ptr->telepathy;
+ old_esp_animal = p_ptr->esp_animal;
+ old_esp_undead = p_ptr->esp_undead;
+ old_esp_demon = p_ptr->esp_demon;
+ old_esp_orc = p_ptr->esp_orc;
+ old_esp_troll = p_ptr->esp_troll;
+ old_esp_giant = p_ptr->esp_giant;
+ old_esp_dragon = p_ptr->esp_dragon;
+ old_esp_human = p_ptr->esp_human;
+ old_esp_evil = p_ptr->esp_evil;
+ old_esp_good = p_ptr->esp_good;
+ old_esp_nonliving = p_ptr->esp_nonliving;
+ old_esp_unique = p_ptr->esp_unique;
+
old_see_inv = p_ptr->see_inv;
/* Save the old armor class */
p_ptr->ffall = FALSE;
p_ptr->hold_life = FALSE;
p_ptr->telepathy = FALSE;
+ p_ptr->esp_animal = FALSE;
+ p_ptr->esp_undead = FALSE;
+ p_ptr->esp_demon = FALSE;
+ p_ptr->esp_orc = FALSE;
+ p_ptr->esp_troll = FALSE;
+ p_ptr->esp_giant = FALSE;
+ p_ptr->esp_dragon = FALSE;
+ p_ptr->esp_human = FALSE;
+ p_ptr->esp_evil = FALSE;
+ p_ptr->esp_good = FALSE;
+ p_ptr->esp_nonliving = FALSE;
+ p_ptr->esp_unique = FALSE;
p_ptr->lite = FALSE;
p_ptr->sustain_str = FALSE;
p_ptr->sustain_int = FALSE;
if (!o_ptr->k_idx) continue;
/* Extract the item flags */
- object_flags(o_ptr, &f1, &f2, &f3);
+ object_flags(o_ptr, flgs);
p_ptr->cursed |= (o_ptr->curse_flags & (0xFFFFFFF0L));
if (o_ptr->name1 == ART_CHAINSWORD) p_ptr->cursed |= TRC_CHAINSWORD;
/* Affect stats */
- if (f1 & (TR1_STR)) p_ptr->stat_add[A_STR] += o_ptr->pval;
- if (f1 & (TR1_INT)) p_ptr->stat_add[A_INT] += o_ptr->pval;
- if (f1 & (TR1_WIS)) p_ptr->stat_add[A_WIS] += o_ptr->pval;
- if (f1 & (TR1_DEX)) p_ptr->stat_add[A_DEX] += o_ptr->pval;
- if (f1 & (TR1_CON)) p_ptr->stat_add[A_CON] += o_ptr->pval;
- if (f1 & (TR1_CHR)) p_ptr->stat_add[A_CHR] += o_ptr->pval;
+ if (have_flag(flgs, TR_STR)) p_ptr->stat_add[A_STR] += o_ptr->pval;
+ if (have_flag(flgs, TR_INT)) p_ptr->stat_add[A_INT] += o_ptr->pval;
+ if (have_flag(flgs, TR_WIS)) p_ptr->stat_add[A_WIS] += o_ptr->pval;
+ if (have_flag(flgs, TR_DEX)) p_ptr->stat_add[A_DEX] += o_ptr->pval;
+ if (have_flag(flgs, TR_CON)) p_ptr->stat_add[A_CON] += o_ptr->pval;
+ if (have_flag(flgs, TR_CHR)) p_ptr->stat_add[A_CHR] += o_ptr->pval;
- if (f1 & (TR1_MAGIC_MASTERY)) p_ptr->skill_dev += 8*o_ptr->pval;
+ if (have_flag(flgs, TR_MAGIC_MASTERY)) p_ptr->skill_dev += 8*o_ptr->pval;
/* Affect stealth */
- if (f1 & (TR1_STEALTH)) p_ptr->skill_stl += o_ptr->pval;
+ if (have_flag(flgs, TR_STEALTH)) p_ptr->skill_stl += o_ptr->pval;
/* Affect searching ability (factor of five) */
- if (f1 & (TR1_SEARCH)) p_ptr->skill_srh += (o_ptr->pval * 5);
+ if (have_flag(flgs, TR_SEARCH)) p_ptr->skill_srh += (o_ptr->pval * 5);
/* Affect searching frequency (factor of five) */
- if (f1 & (TR1_SEARCH)) p_ptr->skill_fos += (o_ptr->pval * 5);
+ if (have_flag(flgs, TR_SEARCH)) p_ptr->skill_fos += (o_ptr->pval * 5);
/* Affect infravision */
- if (f1 & (TR1_INFRA)) p_ptr->see_infra += o_ptr->pval;
+ if (have_flag(flgs, TR_INFRA)) p_ptr->see_infra += o_ptr->pval;
/* Affect digging (factor of 20) */
- if (f1 & (TR1_TUNNEL)) p_ptr->skill_dig += (o_ptr->pval * 20);
+ if (have_flag(flgs, TR_TUNNEL)) p_ptr->skill_dig += (o_ptr->pval * 20);
/* Affect speed */
- if (f1 & (TR1_SPEED)) p_ptr->pspeed += o_ptr->pval;
+ if (have_flag(flgs, TR_SPEED)) p_ptr->pspeed += o_ptr->pval;
/* Affect blows */
- if (f1 & (TR1_BLOWS))
+ if (have_flag(flgs, TR_BLOWS))
{
if((i == INVEN_RARM || i == INVEN_RIGHT) && !p_ptr->ryoute) extra_blows[0] += o_ptr->pval;
else if((i == INVEN_LARM || i == INVEN_LEFT) && !p_ptr->ryoute) extra_blows[1] += o_ptr->pval;
}
/* Hack -- cause earthquakes */
- if (f1 & (TR1_IMPACT)) p_ptr->impact[(i == INVEN_RARM) ? 0 : 1] = TRUE;
+ if (have_flag(flgs, TR_IMPACT)) p_ptr->impact[(i == INVEN_RARM) ? 0 : 1] = TRUE;
/* Boost shots */
- if (f3 & (TR3_XTRA_SHOTS)) extra_shots++;
+ if (have_flag(flgs, TR_XTRA_SHOTS)) extra_shots++;
/* Various flags */
- if (f3 & (TR3_AGGRAVATE)) p_ptr->cursed |= TRC_AGGRAVATE;
- if (f3 & (TR3_DRAIN_EXP)) p_ptr->cursed |= TRC_DRAIN_EXP;
- if (f3 & (TR3_TY_CURSE)) p_ptr->cursed |= TRC_TY_CURSE;
- if (f3 & (TR3_DEC_MANA)) p_ptr->dec_mana = TRUE;
- if (f3 & (TR3_BLESSED)) p_ptr->bless_blade = TRUE;
- if (f3 & (TR3_XTRA_MIGHT)) p_ptr->xtra_might = TRUE;
- if (f3 & (TR3_SLOW_DIGEST)) p_ptr->slow_digest = TRUE;
- if (f3 & (TR3_REGEN)) p_ptr->regenerate = TRUE;
- if (f3 & (TR3_TELEPATHY)) p_ptr->telepathy = TRUE;
- if (f3 & (TR3_SEE_INVIS)) p_ptr->see_inv = TRUE;
- if (f3 & (TR3_FEATHER)) p_ptr->ffall = TRUE;
- if (f2 & (TR2_FREE_ACT)) p_ptr->free_act = TRUE;
- if (f2 & (TR2_HOLD_LIFE)) p_ptr->hold_life = TRUE;
- if (f3 & (TR3_WARNING)){
+ if (have_flag(flgs, TR_AGGRAVATE)) p_ptr->cursed |= TRC_AGGRAVATE;
+ if (have_flag(flgs, TR_DRAIN_EXP)) p_ptr->cursed |= TRC_DRAIN_EXP;
+ if (have_flag(flgs, TR_TY_CURSE)) p_ptr->cursed |= TRC_TY_CURSE;
+ if (have_flag(flgs, TR_DEC_MANA)) p_ptr->dec_mana = TRUE;
+ if (have_flag(flgs, TR_BLESSED)) p_ptr->bless_blade = TRUE;
+ if (have_flag(flgs, TR_XTRA_MIGHT)) p_ptr->xtra_might = TRUE;
+ if (have_flag(flgs, TR_SLOW_DIGEST)) p_ptr->slow_digest = TRUE;
+ if (have_flag(flgs, TR_REGEN)) p_ptr->regenerate = TRUE;
+ if (have_flag(flgs, TR_TELEPATHY)) p_ptr->telepathy = TRUE;
+ if (have_flag(flgs, TR_ESP_ANIMAL)) p_ptr->esp_animal = TRUE;
+ if (have_flag(flgs, TR_ESP_UNDEAD)) p_ptr->esp_undead = TRUE;
+ if (have_flag(flgs, TR_ESP_DEMON)) p_ptr->esp_demon = TRUE;
+ if (have_flag(flgs, TR_ESP_ORC)) p_ptr->esp_orc = TRUE;
+ if (have_flag(flgs, TR_ESP_TROLL)) p_ptr->esp_troll = TRUE;
+ if (have_flag(flgs, TR_ESP_GIANT)) p_ptr->esp_giant = TRUE;
+ if (have_flag(flgs, TR_ESP_DRAGON)) p_ptr->esp_dragon = TRUE;
+ if (have_flag(flgs, TR_ESP_HUMAN)) p_ptr->esp_human = TRUE;
+ if (have_flag(flgs, TR_ESP_EVIL)) p_ptr->esp_evil = TRUE;
+ if (have_flag(flgs, TR_ESP_GOOD)) p_ptr->esp_good = TRUE;
+ if (have_flag(flgs, TR_ESP_NONLIVING)) p_ptr->esp_nonliving = TRUE;
+ if (have_flag(flgs, TR_ESP_UNIQUE)) p_ptr->esp_unique = TRUE;
+
+ if (have_flag(flgs, TR_SEE_INVIS)) p_ptr->see_inv = TRUE;
+ if (have_flag(flgs, TR_FEATHER)) p_ptr->ffall = TRUE;
+ if (have_flag(flgs, TR_FREE_ACT)) p_ptr->free_act = TRUE;
+ if (have_flag(flgs, TR_HOLD_LIFE)) p_ptr->hold_life = TRUE;
+ if (have_flag(flgs, TR_WARNING)){
if (!o_ptr->inscription || !(strchr(quark_str(o_ptr->inscription),'$')))
p_ptr->warning = TRUE;
}
- if (f3 & (TR3_TELEPORT))
+ if (have_flag(flgs, TR_TELEPORT))
{
if (cursed_p(o_ptr)) p_ptr->cursed |= TRC_TELEPORT;
else if (!o_ptr->inscription || !(strchr(quark_str(o_ptr->inscription),'.')))
}
/* Immunity flags */
- if (f2 & (TR2_IM_FIRE)) p_ptr->immune_fire = TRUE;
- if (f2 & (TR2_IM_ACID)) p_ptr->immune_acid = TRUE;
- if (f2 & (TR2_IM_COLD)) p_ptr->immune_cold = TRUE;
- if (f2 & (TR2_IM_ELEC)) p_ptr->immune_elec = TRUE;
+ if (have_flag(flgs, TR_IM_FIRE)) p_ptr->immune_fire = TRUE;
+ if (have_flag(flgs, TR_IM_ACID)) p_ptr->immune_acid = TRUE;
+ if (have_flag(flgs, TR_IM_COLD)) p_ptr->immune_cold = TRUE;
+ if (have_flag(flgs, TR_IM_ELEC)) p_ptr->immune_elec = TRUE;
/* Resistance flags */
- if (f2 & (TR2_RES_ACID)) p_ptr->resist_acid = TRUE;
- if (f2 & (TR2_RES_ELEC)) p_ptr->resist_elec = TRUE;
- if (f2 & (TR2_RES_FIRE)) p_ptr->resist_fire = TRUE;
- if (f2 & (TR2_RES_COLD)) p_ptr->resist_cold = TRUE;
- if (f2 & (TR2_RES_POIS)) p_ptr->resist_pois = TRUE;
- if (f2 & (TR2_RES_FEAR)) p_ptr->resist_fear = TRUE;
- if (f2 & (TR2_RES_CONF)) p_ptr->resist_conf = TRUE;
- if (f2 & (TR2_RES_SOUND)) p_ptr->resist_sound = TRUE;
- if (f2 & (TR2_RES_LITE)) p_ptr->resist_lite = TRUE;
- if (f2 & (TR2_RES_DARK)) p_ptr->resist_dark = TRUE;
- if (f2 & (TR2_RES_CHAOS)) p_ptr->resist_chaos = TRUE;
- if (f2 & (TR2_RES_DISEN)) p_ptr->resist_disen = TRUE;
- if (f2 & (TR2_RES_SHARDS)) p_ptr->resist_shard = TRUE;
- if (f2 & (TR2_RES_NEXUS)) p_ptr->resist_nexus = TRUE;
- if (f2 & (TR2_RES_BLIND)) p_ptr->resist_blind = TRUE;
- if (f2 & (TR2_RES_NETHER)) p_ptr->resist_neth = TRUE;
-
- if (f2 & (TR2_REFLECT)) p_ptr->reflect = TRUE;
- if (f3 & (TR3_SH_FIRE)) p_ptr->sh_fire = TRUE;
- if (f3 & (TR3_SH_ELEC)) p_ptr->sh_elec = TRUE;
- if (f3 & (TR3_SH_COLD)) p_ptr->sh_cold = TRUE;
- if (f3 & (TR3_NO_MAGIC)) p_ptr->anti_magic = TRUE;
- if (f3 & (TR3_NO_TELE)) p_ptr->anti_tele = TRUE;
+ if (have_flag(flgs, TR_RES_ACID)) p_ptr->resist_acid = TRUE;
+ if (have_flag(flgs, TR_RES_ELEC)) p_ptr->resist_elec = TRUE;
+ if (have_flag(flgs, TR_RES_FIRE)) p_ptr->resist_fire = TRUE;
+ if (have_flag(flgs, TR_RES_COLD)) p_ptr->resist_cold = TRUE;
+ if (have_flag(flgs, TR_RES_POIS)) p_ptr->resist_pois = TRUE;
+ if (have_flag(flgs, TR_RES_FEAR)) p_ptr->resist_fear = TRUE;
+ if (have_flag(flgs, TR_RES_CONF)) p_ptr->resist_conf = TRUE;
+ if (have_flag(flgs, TR_RES_SOUND)) p_ptr->resist_sound = TRUE;
+ if (have_flag(flgs, TR_RES_LITE)) p_ptr->resist_lite = TRUE;
+ if (have_flag(flgs, TR_RES_DARK)) p_ptr->resist_dark = TRUE;
+ if (have_flag(flgs, TR_RES_CHAOS)) p_ptr->resist_chaos = TRUE;
+ if (have_flag(flgs, TR_RES_DISEN)) p_ptr->resist_disen = TRUE;
+ if (have_flag(flgs, TR_RES_SHARDS)) p_ptr->resist_shard = TRUE;
+ if (have_flag(flgs, TR_RES_NEXUS)) p_ptr->resist_nexus = TRUE;
+ if (have_flag(flgs, TR_RES_BLIND)) p_ptr->resist_blind = TRUE;
+ if (have_flag(flgs, TR_RES_NETHER)) p_ptr->resist_neth = TRUE;
+
+ if (have_flag(flgs, TR_REFLECT)) p_ptr->reflect = TRUE;
+ if (have_flag(flgs, TR_SH_FIRE)) p_ptr->sh_fire = TRUE;
+ if (have_flag(flgs, TR_SH_ELEC)) p_ptr->sh_elec = TRUE;
+ if (have_flag(flgs, TR_SH_COLD)) p_ptr->sh_cold = TRUE;
+ if (have_flag(flgs, TR_NO_MAGIC)) p_ptr->anti_magic = TRUE;
+ if (have_flag(flgs, TR_NO_TELE)) p_ptr->anti_tele = TRUE;
/* Sustain flags */
- if (f2 & (TR2_SUST_STR)) p_ptr->sustain_str = TRUE;
- if (f2 & (TR2_SUST_INT)) p_ptr->sustain_int = TRUE;
- if (f2 & (TR2_SUST_WIS)) p_ptr->sustain_wis = TRUE;
- if (f2 & (TR2_SUST_DEX)) p_ptr->sustain_dex = TRUE;
- if (f2 & (TR2_SUST_CON)) p_ptr->sustain_con = TRUE;
- if (f2 & (TR2_SUST_CHR)) p_ptr->sustain_chr = TRUE;
+ if (have_flag(flgs, TR_SUST_STR)) p_ptr->sustain_str = TRUE;
+ if (have_flag(flgs, TR_SUST_INT)) p_ptr->sustain_int = TRUE;
+ if (have_flag(flgs, TR_SUST_WIS)) p_ptr->sustain_wis = TRUE;
+ if (have_flag(flgs, TR_SUST_DEX)) p_ptr->sustain_dex = TRUE;
+ if (have_flag(flgs, TR_SUST_CON)) p_ptr->sustain_con = TRUE;
+ if (have_flag(flgs, TR_SUST_CHR)) p_ptr->sustain_chr = TRUE;
if (o_ptr->name2 == EGO_YOIYAMI) yoiyami = TRUE;
if (o_ptr->name2 == EGO_2WEAPON) easy_2weapon = TRUE;
p_ptr->update |= (PU_MONSTERS);
}
+ if ((p_ptr->esp_animal != old_esp_animal) ||
+ (p_ptr->esp_undead != old_esp_undead) ||
+ (p_ptr->esp_demon != old_esp_demon) ||
+ (p_ptr->esp_orc != old_esp_orc) ||
+ (p_ptr->esp_troll != old_esp_troll) ||
+ (p_ptr->esp_giant != old_esp_giant) ||
+ (p_ptr->esp_dragon != old_esp_dragon) ||
+ (p_ptr->esp_human != old_esp_human) ||
+ (p_ptr->esp_evil != old_esp_evil) ||
+ (p_ptr->esp_good != old_esp_good) ||
+ (p_ptr->esp_nonliving != old_esp_nonliving) ||
+ (p_ptr->esp_unique != old_esp_unique))
+ {
+ p_ptr->update |= (PU_MONSTERS);
+ }
+
/* Hack -- See Invis Change */
if (p_ptr->see_inv != old_see_inv)
{
if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM))
{
- p_ptr->to_h[0] += (skill_exp[GINOU_SUDE]-4000)/200;
- p_ptr->dis_to_h[0] += (skill_exp[GINOU_SUDE]-4000)/200;
+ p_ptr->to_h[0] += (p_ptr->skill_exp[GINOU_SUDE]-4000)/200;
+ p_ptr->dis_to_h[0] += (p_ptr->skill_exp[GINOU_SUDE]-4000)/200;
}
if (buki_motteruka(INVEN_RARM) && buki_motteruka(INVEN_LARM))
{
int penalty1, penalty2;
- penalty1 = ((100-skill_exp[GINOU_NITOURYU]/160) - (130-inventory[INVEN_RARM].weight)/8);
- penalty2 = ((100-skill_exp[GINOU_NITOURYU]/160) - (130-inventory[INVEN_LARM].weight)/8);
+ penalty1 = ((100-p_ptr->skill_exp[GINOU_NITOURYU]/160) - (130-inventory[INVEN_RARM].weight)/8);
+ penalty2 = ((100-p_ptr->skill_exp[GINOU_NITOURYU]/160) - (130-inventory[INVEN_LARM].weight)/8);
if ((inventory[INVEN_RARM].name1 == ART_QUICKTHORN) && (inventory[INVEN_LARM].name1 == ART_TINYTHORN))
{
penalty1 = penalty1 / 2 - 5;
{
penalty1 = MIN(0, penalty1);
penalty2 = MIN(0, penalty2);
+ p_ptr->to_a += 10;
+ p_ptr->dis_to_a += 10;
+ }
+ else
+ {
+ if ((inventory[INVEN_RARM].name1 == ART_MUSASI_KATANA) && (penalty1 > 0))
+ penalty1 /= 2;
+ if ((inventory[INVEN_LARM].name1 == ART_MUSASI_WAKIZASI) && (penalty2 > 0))
+ penalty2 /= 2;
}
if (inventory[INVEN_RARM].tval == TV_POLEARM) penalty1 += 10;
if (inventory[INVEN_LARM].tval == TV_POLEARM) penalty2 += 10;
int speed = m_list[p_ptr->riding].mspeed;
if (m_list[p_ptr->riding].mspeed > 110)
{
- p_ptr->pspeed = 110 + (s16b)((speed-110)*(skill_exp[GINOU_RIDING]*3 + p_ptr->lev*160L - 10000L)/(22000L));
+ p_ptr->pspeed = 110 + (s16b)((speed-110)*(p_ptr->skill_exp[GINOU_RIDING]*3 + p_ptr->lev*160L - 10000L)/(22000L));
if (p_ptr->pspeed < 110) p_ptr->pspeed = 110;
}
else
if (r_info[m_list[p_ptr->riding].r_idx].flags7 & RF7_CAN_FLY) p_ptr->ffall = TRUE;
if (r_info[m_list[p_ptr->riding].r_idx].flags7 & (RF7_CAN_SWIM | RF7_AQUATIC)) p_ptr->can_swim = TRUE;
- if (skill_exp[GINOU_RIDING] < 2000) j += (p_ptr->wt*3*(2000 - skill_exp[GINOU_RIDING]))/2000;
+ if (p_ptr->skill_exp[GINOU_RIDING] < 2000) j += (p_ptr->wt*3*(2000 - p_ptr->skill_exp[GINOU_RIDING]))/2000;
i = 3000 + r_info[m_list[p_ptr->riding].r_idx].level * 50;
}
/* Examine the "main weapon" */
o_ptr = &inventory[INVEN_RARM+i];
- object_flags(o_ptr, &f1, &f2, &f3);
+ object_flags(o_ptr, flgs);
/* Assume not heavy */
p_ptr->heavy_wield[i] = FALSE;
num = 5; wgt = 70; mul = 3; break;
case CLASS_CAVALRY:
- if ((p_ptr->riding) && (f2 & TR2_RIDING)) {num = 5; wgt = 70; mul = 4;}
+ if ((p_ptr->riding) && (have_flag(flgs, TR_RIDING))) {num = 5; wgt = 70; mul = 4;}
else {num = 5; wgt = 100; mul = 3;}
break;
/* Assume okay */
/* Priest weapon penalty for non-blessed edged weapons */
- if ((p_ptr->pclass == CLASS_PRIEST) && (!(f3 & (TR3_BLESSED))) &&
+ if ((p_ptr->pclass == CLASS_PRIEST) && (!(have_flag(flgs, TR_BLESSED))) &&
((o_ptr->tval == TV_SWORD) || (o_ptr->tval == TV_POLEARM)))
{
/* Reduce the real bonuses */
p_ptr->to_h[i] +=15;
p_ptr->dis_to_h[i] +=15;
}
- else if (!(f2 & TR2_RIDING))
+ else if (!(have_flag(flgs, TR_RIDING)))
{
int penalty;
if ((p_ptr->pclass == CLASS_BEASTMASTER) || (p_ptr->pclass == CLASS_CAVALRY))
}
else
{
- penalty = r_info[m_list[p_ptr->riding].r_idx].level - skill_exp[GINOU_RIDING] / 80;
+ penalty = r_info[m_list[p_ptr->riding].r_idx].level - p_ptr->skill_exp[GINOU_RIDING] / 80;
penalty += 30;
if (penalty < 30) penalty = 30;
}
}
else
{
- penalty = r_info[m_list[p_ptr->riding].r_idx].level - skill_exp[GINOU_RIDING] / 80;
+ penalty = r_info[m_list[p_ptr->riding].r_idx].level - p_ptr->skill_exp[GINOU_RIDING] / 80;
penalty += 30;
if (penalty < 30) penalty = 30;
}
int tval = inventory[INVEN_RARM+i].tval - TV_BOW;
int sval = inventory[INVEN_RARM+i].sval;
- p_ptr->to_h[i] += (weapon_exp[tval][sval]-4000)/200;
- p_ptr->dis_to_h[i] += (weapon_exp[tval][sval]-4000)/200;
+ p_ptr->to_h[i] += (p_ptr->weapon_exp[tval][sval]-4000)/200;
+ p_ptr->dis_to_h[i] += (p_ptr->weapon_exp[tval][sval]-4000)/200;
if ((p_ptr->pclass == CLASS_MONK) && !(s_info[CLASS_MONK].w_max[tval][sval]))
{
p_ptr->to_h[i] -= 40;
if (p_ptr->ryoute && !omoi)
{
int bonus_to_h=0, bonus_to_d=0;
- bonus_to_d = ((int)(adj_str_td[p_ptr->stat_ind[A_STR]]) - 128);
+ bonus_to_d = ((int)(adj_str_td[p_ptr->stat_ind[A_STR]]) - 128)/2;
bonus_to_h = ((int)(adj_str_th[p_ptr->stat_ind[A_STR]]) - 128) + ((int)(adj_dex_th[p_ptr->stat_ind[A_DEX]]) - 128);
p_ptr->to_h[0] += MAX(bonus_to_h,1);
#ifdef JP
msg_print("¤³¤ÎÉð´ï¤Ï¾èÇÏÃæ¤Ë»È¤¦¤Ë¤Ï¤à¤«¤Ê¤¤¤è¤¦¤À¡£");
#else
- msg_print("This weapon is not suitable for riding.");
+ msg_print("This weapon is not suitable for use while riding.");
#endif
}
#ifdef JP
msg_print("¤³¤ÎÉð´ï¤ÏÅÌÊâ¤Ç»È¤¤¤ä¤¹¤¤¡£");
#else
- msg_print("This weapon was not suitable for riding.");
+ msg_print("This weapon was not suitable for use while riding.");
#endif
}
#ifdef JP
msg_print("¤³¤ì¤Ê¤é¾èÇÏÃæ¤Ë¤Ô¤Ã¤¿¤ê¤À¡£");
#else
- msg_print("This weapon is suitable for riding.");
+ msg_print("This weapon is suitable for use while riding.");
#endif
}
else if (p_ptr->vir_types[i] == V_JUSTICE) p_ptr->align += (p_ptr->virtues[i]*2);
else if (p_ptr->vir_types[i] != V_CHANCE) p_ptr->align += p_ptr->virtues[i];
}
+ if ((inventory[INVEN_RARM].name1 == ART_IRON_BALL) || (inventory[INVEN_LARM].name1 == ART_IRON_BALL)) p_ptr->align -= 1000;
+ if (prace_is_(RACE_ANGEL)) p_ptr->align += 200;
+ if ((prace_is_(RACE_DEMON)) || (p_ptr->mimic_form == MIMIC_DEMON_LORD) || (p_ptr->mimic_form == MIMIC_DEMON)) p_ptr->align -= 200;
while (j)
{
j--;
if (p_ptr->align > 0) p_ptr->align = 0;
}
}
- if ((inventory[INVEN_RARM].name1 == ART_IRON_BALL) || (inventory[INVEN_LARM].name1 == ART_IRON_BALL)) p_ptr->align -= 1000;
- if (prace_is_(RACE_ANGEL)) p_ptr->align += 200;
- if ((prace_is_(RACE_DEMON)) || (p_ptr->mimic_form == MIMIC_DEMON_LORD) || (p_ptr->mimic_form == MIMIC_DEMON)) p_ptr->align -= 200;
have_dd_s = FALSE;
have_dd_t = FALSE;
update_flow();
}
- if (p_ptr->update & (PU_MON_LITE))
- {
- p_ptr->update &= ~(PU_MON_LITE);
- update_mon_lite();
- }
-
if (p_ptr->update & (PU_DISTANCE))
{
p_ptr->update &= ~(PU_DISTANCE);
- p_ptr->update &= ~(PU_MONSTERS);
+
+ /* Still need to call update_monsters(FALSE) after update_mon_lite() */
+ /* p_ptr->update &= ~(PU_MONSTERS); */
+
update_monsters(TRUE);
}
+ if (p_ptr->update & (PU_MON_LITE))
+ {
+ p_ptr->update &= ~(PU_MON_LITE);
+ update_mon_lite();
+ }
+
if (p_ptr->update & (PU_MONSTERS))
{
p_ptr->update &= ~(PU_MONSTERS);
OSDN Git Service
