*/
void one_low_esp(object_type *o_ptr)
{
- switch (randint1(9))
- {
- case 1: add_flag(o_ptr->art_flags, TR_ESP_ANIMAL); break;
- case 2: add_flag(o_ptr->art_flags, TR_ESP_UNDEAD); break;
- case 3: add_flag(o_ptr->art_flags, TR_ESP_DEMON); break;
- case 4: add_flag(o_ptr->art_flags, TR_ESP_ORC); break;
- case 5: add_flag(o_ptr->art_flags, TR_ESP_TROLL); break;
- case 6: add_flag(o_ptr->art_flags, TR_ESP_GIANT); break;
- case 7: add_flag(o_ptr->art_flags, TR_ESP_DRAGON); break;
- case 8: add_flag(o_ptr->art_flags, TR_ESP_HUMAN); break;
- case 9: add_flag(o_ptr->art_flags, TR_ESP_GOOD); break;
- }
+ switch (randint1(9))
+ {
+ case 1: add_flag(o_ptr->art_flags, TR_ESP_ANIMAL); break;
+ case 2: add_flag(o_ptr->art_flags, TR_ESP_UNDEAD); break;
+ case 3: add_flag(o_ptr->art_flags, TR_ESP_DEMON); break;
+ case 4: add_flag(o_ptr->art_flags, TR_ESP_ORC); break;
+ case 5: add_flag(o_ptr->art_flags, TR_ESP_TROLL); break;
+ case 6: add_flag(o_ptr->art_flags, TR_ESP_GIANT); break;
+ case 7: add_flag(o_ptr->art_flags, TR_ESP_DRAGON); break;
+ case 8: add_flag(o_ptr->art_flags, TR_ESP_HUMAN); break;
+ case 9: add_flag(o_ptr->art_flags, TR_ESP_GOOD); break;
+ }
}
case 7: add_flag(o_ptr->art_flags, TR_HOLD_LIFE); break;
case 8:
case 9:
- one_low_esp(o_ptr);
+ one_low_esp(o_ptr);
break;
}
}
else if (IS_FLG(FLG_GLOVES)) ADD_KEY2(KEY_GLOVES);
else if (IS_FLG(FLG_BOOTS)) ADD_KEY2(KEY_BOOTS);
- /* You don't need sepalator after adjective */
- /* 'artifact' is not true adjective */
+ /* You don't need sepalator after adjective */
+ /* 'artifact' is not true adjective */
else if (!IS_FLG(FLG_ARTIFACT))
sepa_flag = FALSE;
if (entry->name && entry->name[0])
{
- int i, j = 0;
+ int i, j = 0;
if (sepa_flag) strcat(buf, ":");
- i = strlen(buf);
- while (entry->name[j] && i < MAX_LINELEN - 2 - 1)
- {
+ i = strlen(buf);
+ while (entry->name[j] && i < MAX_LINELEN - 2 - 1)
+ {
#ifdef JP
- if (iskanji(entry->name[j]))
- buf[i++] = entry->name[j++];
+ if (iskanji(entry->name[j]))
+ buf[i++] = entry->name[j++];
#endif
- buf[i++] = entry->name[j++];
- }
- buf[i] = '\0';
+ buf[i++] = entry->name[j++];
+ }
+ buf[i] = '\0';
}
if (entry->insc)
{
- int i, j = 0;
+ int i, j = 0;
strcat(buf, "#");
- i = strlen(buf);
+ i = strlen(buf);
- while (entry->insc[j] && i < MAX_LINELEN - 2)
- {
+ while (entry->insc[j] && i < MAX_LINELEN - 2)
+ {
#ifdef JP
- if (iskanji(entry->insc[j]))
- buf[i++] = entry->insc[j++];
+ if (iskanji(entry->insc[j]))
+ buf[i++] = entry->insc[j++];
#endif
- buf[i++] = entry->insc[j++];
- }
- buf[i] = '\0';
+ buf[i++] = entry->insc[j++];
+ }
+ buf[i] = '\0';
}
return string_make(buf);
*/
static cptr autopick_line_from_entry_kill(autopick_type *entry)
{
- cptr ptr = autopick_line_from_entry(entry);
+ cptr ptr = autopick_line_from_entry(entry);
- /* Free memory for original entry */
- autopick_free_entry(entry);
+ /* Free memory for original entry */
+ autopick_free_entry(entry);
- return ptr;
+ return ptr;
}
if (*buf == 0) return FALSE;
ptr = prev_ptr = buf;
- old_ptr = NULL;
-
- while (old_ptr != ptr)
- {
- /* Save current location */
- old_ptr = ptr;
-
- if (MATCH_KEY(KEY_ALL)) ADD_FLG(FLG_ALL);
- if (MATCH_KEY(KEY_COLLECTING)) ADD_FLG(FLG_COLLECTING);
- if (MATCH_KEY(KEY_UNIDENTIFIED)) ADD_FLG(FLG_UNIDENTIFIED);
- if (MATCH_KEY(KEY_IDENTIFIED)) ADD_FLG(FLG_IDENTIFIED);
- if (MATCH_KEY(KEY_STAR_IDENTIFIED)) ADD_FLG(FLG_STAR_IDENTIFIED);
- if (MATCH_KEY(KEY_BOOSTED)) ADD_FLG(FLG_BOOSTED);
-
- /*** Weapons whose dd*ds is more than nn ***/
- if (MATCH_KEY2(KEY_MORE_THAN))
- {
- int k = 0;
- entry->dice = 0;
-
- /* Drop leading spaces */
- while (' ' == *ptr) ptr++;
-
- /* Read number */
- while ('0' <= *ptr && *ptr <= '9')
- {
- entry->dice = 10 * entry->dice + (*ptr - '0');
- ptr++;
- k++;
- }
-
- if (k > 0 && k <= 2)
- {
- (void)MATCH_KEY(KEY_DICE);
- ADD_FLG(FLG_MORE_THAN);
- }
- else
- ptr = prev_ptr;
- }
-
- /*** Items whose magical bonus is more than n ***/
- if (MATCH_KEY2(KEY_MORE_BONUS))
- {
- int k = 0;
- entry->bonus = 0;
-
- /* Drop leading spaces */
- while (' ' == *ptr) ptr++;
-
- /* Read number */
- while ('0' <= *ptr && *ptr <= '9')
- {
- entry->bonus = 10 * entry->bonus + (*ptr - '0');
- ptr++;
- k++;
- }
-
- if (k > 0 && k <= 2)
- {
- (void)MATCH_KEY(KEY_MORE_BONUS2);
- ADD_FLG(FLG_MORE_BONUS);
- }
- else
- ptr = prev_ptr;
- }
-
- if (MATCH_KEY(KEY_WORTHLESS)) ADD_FLG(FLG_WORTHLESS);
- if (MATCH_KEY(KEY_EGO)) ADD_FLG(FLG_EGO);
- if (MATCH_KEY(KEY_NAMELESS)) ADD_FLG(FLG_NAMELESS);
- if (MATCH_KEY(KEY_UNAWARE)) ADD_FLG(FLG_UNAWARE);
- if (MATCH_KEY(KEY_WANTED)) ADD_FLG(FLG_WANTED);
- if (MATCH_KEY(KEY_UNIQUE)) ADD_FLG(FLG_UNIQUE);
- if (MATCH_KEY(KEY_HUMAN)) ADD_FLG(FLG_HUMAN);
- if (MATCH_KEY(KEY_UNREADABLE)) ADD_FLG(FLG_UNREADABLE);
- if (MATCH_KEY(KEY_REALM1)) ADD_FLG(FLG_REALM1);
- if (MATCH_KEY(KEY_REALM2)) ADD_FLG(FLG_REALM2);
- if (MATCH_KEY(KEY_FIRST)) ADD_FLG(FLG_FIRST);
- if (MATCH_KEY(KEY_SECOND)) ADD_FLG(FLG_SECOND);
- if (MATCH_KEY(KEY_THIRD)) ADD_FLG(FLG_THIRD);
- if (MATCH_KEY(KEY_FOURTH)) ADD_FLG(FLG_FOURTH);
- }
+ old_ptr = NULL;
+
+ while (old_ptr != ptr)
+ {
+ /* Save current location */
+ old_ptr = ptr;
+
+ if (MATCH_KEY(KEY_ALL)) ADD_FLG(FLG_ALL);
+ if (MATCH_KEY(KEY_COLLECTING)) ADD_FLG(FLG_COLLECTING);
+ if (MATCH_KEY(KEY_UNIDENTIFIED)) ADD_FLG(FLG_UNIDENTIFIED);
+ if (MATCH_KEY(KEY_IDENTIFIED)) ADD_FLG(FLG_IDENTIFIED);
+ if (MATCH_KEY(KEY_STAR_IDENTIFIED)) ADD_FLG(FLG_STAR_IDENTIFIED);
+ if (MATCH_KEY(KEY_BOOSTED)) ADD_FLG(FLG_BOOSTED);
+
+ /*** Weapons whose dd*ds is more than nn ***/
+ if (MATCH_KEY2(KEY_MORE_THAN))
+ {
+ int k = 0;
+ entry->dice = 0;
+
+ /* Drop leading spaces */
+ while (' ' == *ptr) ptr++;
+
+ /* Read number */
+ while ('0' <= *ptr && *ptr <= '9')
+ {
+ entry->dice = 10 * entry->dice + (*ptr - '0');
+ ptr++;
+ k++;
+ }
+
+ if (k > 0 && k <= 2)
+ {
+ (void)MATCH_KEY(KEY_DICE);
+ ADD_FLG(FLG_MORE_THAN);
+ }
+ else
+ ptr = prev_ptr;
+ }
+
+ /*** Items whose magical bonus is more than n ***/
+ if (MATCH_KEY2(KEY_MORE_BONUS))
+ {
+ int k = 0;
+ entry->bonus = 0;
+
+ /* Drop leading spaces */
+ while (' ' == *ptr) ptr++;
+
+ /* Read number */
+ while ('0' <= *ptr && *ptr <= '9')
+ {
+ entry->bonus = 10 * entry->bonus + (*ptr - '0');
+ ptr++;
+ k++;
+ }
+
+ if (k > 0 && k <= 2)
+ {
+ (void)MATCH_KEY(KEY_MORE_BONUS2);
+ ADD_FLG(FLG_MORE_BONUS);
+ }
+ else
+ ptr = prev_ptr;
+ }
+
+ if (MATCH_KEY(KEY_WORTHLESS)) ADD_FLG(FLG_WORTHLESS);
+ if (MATCH_KEY(KEY_EGO)) ADD_FLG(FLG_EGO);
+ if (MATCH_KEY(KEY_NAMELESS)) ADD_FLG(FLG_NAMELESS);
+ if (MATCH_KEY(KEY_UNAWARE)) ADD_FLG(FLG_UNAWARE);
+ if (MATCH_KEY(KEY_WANTED)) ADD_FLG(FLG_WANTED);
+ if (MATCH_KEY(KEY_UNIQUE)) ADD_FLG(FLG_UNIQUE);
+ if (MATCH_KEY(KEY_HUMAN)) ADD_FLG(FLG_HUMAN);
+ if (MATCH_KEY(KEY_UNREADABLE)) ADD_FLG(FLG_UNREADABLE);
+ if (MATCH_KEY(KEY_REALM1)) ADD_FLG(FLG_REALM1);
+ if (MATCH_KEY(KEY_REALM2)) ADD_FLG(FLG_REALM2);
+ if (MATCH_KEY(KEY_FIRST)) ADD_FLG(FLG_FIRST);
+ if (MATCH_KEY(KEY_SECOND)) ADD_FLG(FLG_SECOND);
+ if (MATCH_KEY(KEY_THIRD)) ADD_FLG(FLG_THIRD);
+ if (MATCH_KEY(KEY_FOURTH)) ADD_FLG(FLG_FOURTH);
+ }
/* Not yet found any noun */
prev_flg = -1;
*/
static bool is_autopick_aux(object_type *o_ptr, autopick_type *entry, cptr o_name)
{
- int j;
- cptr ptr = entry->name;
-
- /*** Unidentified ***/
- if (IS_FLG(FLG_UNIDENTIFIED)
- && (object_known_p(o_ptr) || (o_ptr->ident & IDENT_SENSE)))
- return FALSE;
-
- /*** Identified ***/
- if (IS_FLG(FLG_IDENTIFIED) && !object_known_p(o_ptr))
- return FALSE;
-
- /*** *Identified* ***/
- if (IS_FLG(FLG_STAR_IDENTIFIED) &&
- (!object_known_p(o_ptr) || !(o_ptr->ident & IDENT_MENTAL)))
- return FALSE;
-
- /*** Dice boosted (weapon of slaying) ***/
- if (IS_FLG(FLG_BOOSTED))
- {
- object_kind *k_ptr = &k_info[o_ptr->k_idx];
+ int j;
+ cptr ptr = entry->name;
+
+ /*** Unidentified ***/
+ if (IS_FLG(FLG_UNIDENTIFIED)
+ && (object_known_p(o_ptr) || (o_ptr->ident & IDENT_SENSE)))
+ return FALSE;
+
+ /*** Identified ***/
+ if (IS_FLG(FLG_IDENTIFIED) && !object_known_p(o_ptr))
+ return FALSE;
+
+ /*** *Identified* ***/
+ if (IS_FLG(FLG_STAR_IDENTIFIED) &&
+ (!object_known_p(o_ptr) || !(o_ptr->ident & IDENT_MENTAL)))
+ return FALSE;
+
+ /*** Dice boosted (weapon of slaying) ***/
+ if (IS_FLG(FLG_BOOSTED))
+ {
+ object_kind *k_ptr = &k_info[o_ptr->k_idx];
- switch( o_ptr->tval )
- {
- case TV_HAFTED:
- case TV_POLEARM:
- case TV_SWORD:
- case TV_DIGGING:
- if ((o_ptr->dd != k_ptr->dd) || (o_ptr->ds != k_ptr->ds))
- break;
- else
- return FALSE;
- default:
- return FALSE;
- }
- }
-
- /*** Weapons which dd*ds is more than nn ***/
- if (IS_FLG(FLG_MORE_THAN))
- {
- if (o_ptr->dd * o_ptr->ds < entry->dice)
- return FALSE;
- }
+ switch( o_ptr->tval )
+ {
+ case TV_HAFTED:
+ case TV_POLEARM:
+ case TV_SWORD:
+ case TV_DIGGING:
+ if ((o_ptr->dd != k_ptr->dd) || (o_ptr->ds != k_ptr->ds))
+ break;
+ else
+ return FALSE;
+ default:
+ return FALSE;
+ }
+ }
+
+ /*** Weapons which dd*ds is more than nn ***/
+ if (IS_FLG(FLG_MORE_THAN))
+ {
+ if (o_ptr->dd * o_ptr->ds < entry->dice)
+ return FALSE;
+ }
- /*** Weapons whic dd*ds is more than nn ***/
- if (IS_FLG(FLG_MORE_BONUS))
- {
- if (!object_known_p(o_ptr)) return FALSE;
-
- if (o_ptr->pval)
- {
- if (o_ptr->pval < entry->bonus) return FALSE;
- }
- else
- {
- if (o_ptr->to_h < entry->bonus &&
- o_ptr->to_d < entry->bonus &&
- o_ptr->to_a < entry->bonus &&
- o_ptr->pval < entry->bonus)
- return FALSE;
- }
- }
+ /*** Weapons whic dd*ds is more than nn ***/
+ if (IS_FLG(FLG_MORE_BONUS))
+ {
+ if (!object_known_p(o_ptr)) return FALSE;
+
+ if (o_ptr->pval)
+ {
+ if (o_ptr->pval < entry->bonus) return FALSE;
+ }
+ else
+ {
+ if (o_ptr->to_h < entry->bonus &&
+ o_ptr->to_d < entry->bonus &&
+ o_ptr->to_a < entry->bonus &&
+ o_ptr->pval < entry->bonus)
+ return FALSE;
+ }
+ }
- /*** Worthless items ***/
- if (IS_FLG(FLG_WORTHLESS) && object_value(o_ptr) > 0)
- return FALSE;
-
- /*** Artifact object ***/
- if (IS_FLG(FLG_ARTIFACT))
- {
- if (!object_known_p(o_ptr) || (!o_ptr->name1 && !o_ptr->art_name))
- return FALSE;
- }
-
- /*** Ego object ***/
- if (IS_FLG(FLG_EGO))
- {
- if (!object_known_p(o_ptr) || !o_ptr->name2)
- return FALSE;
- }
-
- /*** Nameless ***/
- if (IS_FLG(FLG_NAMELESS))
- {
- switch (o_ptr->tval)
- {
- case TV_WHISTLE:
- case TV_SHOT: case TV_ARROW: case TV_BOLT: case TV_BOW:
- case TV_DIGGING: case TV_HAFTED: case TV_POLEARM: case TV_SWORD:
- case TV_BOOTS: case TV_GLOVES: case TV_HELM: case TV_CROWN:
- case TV_SHIELD: case TV_CLOAK:
- case TV_SOFT_ARMOR: case TV_HARD_ARMOR: case TV_DRAG_ARMOR:
- case TV_LITE: case TV_AMULET: case TV_RING: case TV_CARD:
- if ((!object_known_p(o_ptr) || o_ptr->inscription
- || o_ptr->name1 || o_ptr->name2 || o_ptr->art_name))
- return FALSE;
- break;
- default:
- /* don't match */
- return FALSE;
- }
- }
-
- /*** Unaware items ***/
- if (IS_FLG(FLG_UNAWARE) && object_aware_p(o_ptr))
- return FALSE;
-
- /*** Wanted monster's corpse/skeletons ***/
- if (IS_FLG(FLG_WANTED) &&
- (o_ptr->tval != TV_CORPSE || !object_is_shoukinkubi(o_ptr)))
- return FALSE;
-
- /*** Unique monster's corpse/skeletons/statues ***/
- if (IS_FLG(FLG_UNIQUE) &&
- ((o_ptr->tval != TV_CORPSE && o_ptr->tval != TV_STATUE) ||
- !(r_info[o_ptr->pval].flags1 & RF1_UNIQUE)))
- return FALSE;
-
- /*** Human corpse/skeletons (for Daemon magic) ***/
- if (IS_FLG(FLG_HUMAN) &&
- (o_ptr->tval != TV_CORPSE ||
- !strchr("pht", r_info[o_ptr->pval].d_char)))
- return FALSE;
-
- /*** Unreadable spellbooks ***/
- if (IS_FLG(FLG_UNREADABLE) &&
- (o_ptr->tval < TV_LIFE_BOOK ||
- check_book_realm(o_ptr->tval, o_ptr->sval)))
- return FALSE;
-
- /*** First realm spellbooks ***/
- if (IS_FLG(FLG_REALM1) &&
- (REALM1_BOOK != o_ptr->tval ||
- p_ptr->pclass == CLASS_SORCERER ||
- p_ptr->pclass == CLASS_RED_MAGE))
- return FALSE;
-
- /*** Second realm spellbooks ***/
- if (IS_FLG(FLG_REALM2) &&
- (REALM2_BOOK != o_ptr->tval ||
- p_ptr->pclass == CLASS_SORCERER ||
- p_ptr->pclass == CLASS_RED_MAGE))
- return FALSE;
-
- /*** First rank spellbooks ***/
- if (IS_FLG(FLG_FIRST) &&
- (o_ptr->tval < TV_LIFE_BOOK || 0 != o_ptr->sval))
- return FALSE;
-
- /*** Second rank spellbooks ***/
- if (IS_FLG(FLG_SECOND) &&
- (o_ptr->tval < TV_LIFE_BOOK || 1 != o_ptr->sval))
- return FALSE;
-
- /*** Third rank spellbooks ***/
- if (IS_FLG(FLG_THIRD) &&
- (o_ptr->tval < TV_LIFE_BOOK || 2 != o_ptr->sval))
- return FALSE;
-
- /*** Fourth rank spellbooks ***/
- if (IS_FLG(FLG_FOURTH) &&
- (o_ptr->tval < TV_LIFE_BOOK || 3 != o_ptr->sval))
- return FALSE;
-
- /*** Items ***/
- if (IS_FLG(FLG_WEAPONS))
- {
- switch(o_ptr->tval)
- {
- case TV_BOW: case TV_HAFTED: case TV_POLEARM:
- case TV_SWORD: case TV_DIGGING:
- break;
- default: return FALSE;
- }
- }
- else if (IS_FLG(FLG_ARMORS))
- {
- switch(o_ptr->tval)
- {
- case TV_BOOTS: case TV_GLOVES: case TV_CLOAK: case TV_CROWN:
- case TV_HELM: case TV_SHIELD: case TV_SOFT_ARMOR:
- case TV_HARD_ARMOR: case TV_DRAG_ARMOR:
- break;
- default: return FALSE;
- }
- }
- else if (IS_FLG(FLG_MISSILES))
- {
- switch(o_ptr->tval)
- {
- case TV_SHOT: case TV_BOLT: case TV_ARROW:
- break;
- default: return FALSE;
- }
- }
- else if (IS_FLG(FLG_DEVICES))
- {
- switch(o_ptr->tval)
- {
- case TV_SCROLL: case TV_STAFF: case TV_WAND: case TV_ROD:
- break;
- default: return FALSE;
- }
- }
- else if (IS_FLG(FLG_LIGHTS))
- {
- if (!(o_ptr->tval == TV_LITE))
- return FALSE;
- }
- else if (IS_FLG(FLG_JUNKS))
- {
- switch(o_ptr->tval)
- {
- case TV_SKELETON: case TV_BOTTLE:
- case TV_JUNK: case TV_STATUE:
- break;
- default: return FALSE;
- }
- }
- else if (IS_FLG(FLG_SPELLBOOKS))
- {
- if (!(o_ptr->tval >= TV_LIFE_BOOK))
- return FALSE;
- }
- else if (IS_FLG(FLG_HAFTED))
- {
- if (!(o_ptr->tval == TV_HAFTED))
- return FALSE;
- }
- else if (IS_FLG(FLG_SHIELDS))
- {
- if (!(o_ptr->tval == TV_SHIELD))
- return FALSE;
- }
- else if (IS_FLG(FLG_BOWS))
- {
- if (!(o_ptr->tval == TV_BOW))
- return FALSE;
- }
- else if (IS_FLG(FLG_RINGS))
- {
- if (!(o_ptr->tval == TV_RING))
- return FALSE;
- }
- else if (IS_FLG(FLG_AMULETS))
- {
- if (!(o_ptr->tval == TV_AMULET))
- return FALSE;
- }
- else if (IS_FLG(FLG_SUITS))
- {
- if (!(o_ptr->tval == TV_DRAG_ARMOR ||
- o_ptr->tval == TV_HARD_ARMOR ||
- o_ptr->tval == TV_SOFT_ARMOR))
- return FALSE;
- }
- else if (IS_FLG(FLG_CLOAKS))
- {
- if (!(o_ptr->tval == TV_CLOAK))
- return FALSE;
- }
- else if (IS_FLG(FLG_HELMS))
- {
- if (!(o_ptr->tval == TV_CROWN || o_ptr->tval == TV_HELM))
- return FALSE;
- }
- else if (IS_FLG(FLG_GLOVES))
- {
- if (!(o_ptr->tval == TV_GLOVES))
- return FALSE;
- }
- else if (IS_FLG(FLG_BOOTS))
- {
- if (!(o_ptr->tval == TV_BOOTS))
- return FALSE;
- }
-
- /* Keyword don't match */
- if (*ptr == '^')
- {
- ptr++;
- if (strncmp(o_name, ptr, strlen(ptr))) return FALSE;
- }
- else
- {
+ /*** Worthless items ***/
+ if (IS_FLG(FLG_WORTHLESS) && object_value(o_ptr) > 0)
+ return FALSE;
+
+ /*** Artifact object ***/
+ if (IS_FLG(FLG_ARTIFACT))
+ {
+ if (!object_known_p(o_ptr) || (!o_ptr->name1 && !o_ptr->art_name))
+ return FALSE;
+ }
+
+ /*** Ego object ***/
+ if (IS_FLG(FLG_EGO))
+ {
+ if (!object_known_p(o_ptr) || !o_ptr->name2)
+ return FALSE;
+ }
+
+ /*** Nameless ***/
+ if (IS_FLG(FLG_NAMELESS))
+ {
+ switch (o_ptr->tval)
+ {
+ case TV_WHISTLE:
+ case TV_SHOT: case TV_ARROW: case TV_BOLT: case TV_BOW:
+ case TV_DIGGING: case TV_HAFTED: case TV_POLEARM: case TV_SWORD:
+ case TV_BOOTS: case TV_GLOVES: case TV_HELM: case TV_CROWN:
+ case TV_SHIELD: case TV_CLOAK:
+ case TV_SOFT_ARMOR: case TV_HARD_ARMOR: case TV_DRAG_ARMOR:
+ case TV_LITE: case TV_AMULET: case TV_RING: case TV_CARD:
+ if ((!object_known_p(o_ptr) || o_ptr->inscription
+ || o_ptr->name1 || o_ptr->name2 || o_ptr->art_name))
+ return FALSE;
+ break;
+ default:
+ /* don't match */
+ return FALSE;
+ }
+ }
+
+ /*** Unaware items ***/
+ if (IS_FLG(FLG_UNAWARE) && object_aware_p(o_ptr))
+ return FALSE;
+
+ /*** Wanted monster's corpse/skeletons ***/
+ if (IS_FLG(FLG_WANTED) &&
+ (o_ptr->tval != TV_CORPSE || !object_is_shoukinkubi(o_ptr)))
+ return FALSE;
+
+ /*** Unique monster's corpse/skeletons/statues ***/
+ if (IS_FLG(FLG_UNIQUE) &&
+ ((o_ptr->tval != TV_CORPSE && o_ptr->tval != TV_STATUE) ||
+ !(r_info[o_ptr->pval].flags1 & RF1_UNIQUE)))
+ return FALSE;
+
+ /*** Human corpse/skeletons (for Daemon magic) ***/
+ if (IS_FLG(FLG_HUMAN) &&
+ (o_ptr->tval != TV_CORPSE ||
+ !strchr("pht", r_info[o_ptr->pval].d_char)))
+ return FALSE;
+
+ /*** Unreadable spellbooks ***/
+ if (IS_FLG(FLG_UNREADABLE) &&
+ (o_ptr->tval < TV_LIFE_BOOK ||
+ check_book_realm(o_ptr->tval, o_ptr->sval)))
+ return FALSE;
+
+ /*** First realm spellbooks ***/
+ if (IS_FLG(FLG_REALM1) &&
+ (REALM1_BOOK != o_ptr->tval ||
+ p_ptr->pclass == CLASS_SORCERER ||
+ p_ptr->pclass == CLASS_RED_MAGE))
+ return FALSE;
+
+ /*** Second realm spellbooks ***/
+ if (IS_FLG(FLG_REALM2) &&
+ (REALM2_BOOK != o_ptr->tval ||
+ p_ptr->pclass == CLASS_SORCERER ||
+ p_ptr->pclass == CLASS_RED_MAGE))
+ return FALSE;
+
+ /*** First rank spellbooks ***/
+ if (IS_FLG(FLG_FIRST) &&
+ (o_ptr->tval < TV_LIFE_BOOK || 0 != o_ptr->sval))
+ return FALSE;
+
+ /*** Second rank spellbooks ***/
+ if (IS_FLG(FLG_SECOND) &&
+ (o_ptr->tval < TV_LIFE_BOOK || 1 != o_ptr->sval))
+ return FALSE;
+
+ /*** Third rank spellbooks ***/
+ if (IS_FLG(FLG_THIRD) &&
+ (o_ptr->tval < TV_LIFE_BOOK || 2 != o_ptr->sval))
+ return FALSE;
+
+ /*** Fourth rank spellbooks ***/
+ if (IS_FLG(FLG_FOURTH) &&
+ (o_ptr->tval < TV_LIFE_BOOK || 3 != o_ptr->sval))
+ return FALSE;
+
+ /*** Items ***/
+ if (IS_FLG(FLG_WEAPONS))
+ {
+ switch(o_ptr->tval)
+ {
+ case TV_BOW: case TV_HAFTED: case TV_POLEARM:
+ case TV_SWORD: case TV_DIGGING:
+ break;
+ default: return FALSE;
+ }
+ }
+ else if (IS_FLG(FLG_ARMORS))
+ {
+ switch(o_ptr->tval)
+ {
+ case TV_BOOTS: case TV_GLOVES: case TV_CLOAK: case TV_CROWN:
+ case TV_HELM: case TV_SHIELD: case TV_SOFT_ARMOR:
+ case TV_HARD_ARMOR: case TV_DRAG_ARMOR:
+ break;
+ default: return FALSE;
+ }
+ }
+ else if (IS_FLG(FLG_MISSILES))
+ {
+ switch(o_ptr->tval)
+ {
+ case TV_SHOT: case TV_BOLT: case TV_ARROW:
+ break;
+ default: return FALSE;
+ }
+ }
+ else if (IS_FLG(FLG_DEVICES))
+ {
+ switch(o_ptr->tval)
+ {
+ case TV_SCROLL: case TV_STAFF: case TV_WAND: case TV_ROD:
+ break;
+ default: return FALSE;
+ }
+ }
+ else if (IS_FLG(FLG_LIGHTS))
+ {
+ if (!(o_ptr->tval == TV_LITE))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_JUNKS))
+ {
+ switch(o_ptr->tval)
+ {
+ case TV_SKELETON: case TV_BOTTLE:
+ case TV_JUNK: case TV_STATUE:
+ break;
+ default: return FALSE;
+ }
+ }
+ else if (IS_FLG(FLG_SPELLBOOKS))
+ {
+ if (!(o_ptr->tval >= TV_LIFE_BOOK))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_HAFTED))
+ {
+ if (!(o_ptr->tval == TV_HAFTED))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_SHIELDS))
+ {
+ if (!(o_ptr->tval == TV_SHIELD))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_BOWS))
+ {
+ if (!(o_ptr->tval == TV_BOW))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_RINGS))
+ {
+ if (!(o_ptr->tval == TV_RING))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_AMULETS))
+ {
+ if (!(o_ptr->tval == TV_AMULET))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_SUITS))
+ {
+ if (!(o_ptr->tval == TV_DRAG_ARMOR ||
+ o_ptr->tval == TV_HARD_ARMOR ||
+ o_ptr->tval == TV_SOFT_ARMOR))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_CLOAKS))
+ {
+ if (!(o_ptr->tval == TV_CLOAK))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_HELMS))
+ {
+ if (!(o_ptr->tval == TV_CROWN || o_ptr->tval == TV_HELM))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_GLOVES))
+ {
+ if (!(o_ptr->tval == TV_GLOVES))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_BOOTS))
+ {
+ if (!(o_ptr->tval == TV_BOOTS))
+ return FALSE;
+ }
+
+ /* Keyword don't match */
+ if (*ptr == '^')
+ {
+ ptr++;
+ if (strncmp(o_name, ptr, strlen(ptr))) return FALSE;
+ }
+ else
+ {
#ifdef JP
- if (!strstr_j(o_name, ptr)) return FALSE;
+ if (!strstr_j(o_name, ptr)) return FALSE;
#else
- if (!strstr(o_name, ptr)) return FALSE;
+ if (!strstr(o_name, ptr)) return FALSE;
#endif
- }
-
- /* TRUE when it need not to be 'collecting' */
- if (!IS_FLG(FLG_COLLECTING)) return TRUE;
-
- /* Check if there is a same item */
- for (j = 0; j < INVEN_PACK; j++)
- {
- /*
- * 'Collecting' means the item must be absorbed
- * into an inventory slot.
- * But an item can not be absorbed into itself!
- */
- if ((&inventory[j] != o_ptr) &&
- object_similar(&inventory[j], o_ptr))
- return TRUE;
- }
-
- /* Not collecting */
- return FALSE;
+ }
+
+ /* TRUE when it need not to be 'collecting' */
+ if (!IS_FLG(FLG_COLLECTING)) return TRUE;
+
+ /* Check if there is a same item */
+ for (j = 0; j < INVEN_PACK; j++)
+ {
+ /*
+ * 'Collecting' means the item must be absorbed
+ * into an inventory slot.
+ * But an item can not be absorbed into itself!
+ */
+ if ((&inventory[j] != o_ptr) &&
+ object_similar(&inventory[j], o_ptr))
+ return TRUE;
+ }
+
+ /* Not collecting */
+ return FALSE;
}
{
autopick_type *entry = &autopick_list[i];
- if (is_autopick_aux(o_ptr, entry, o_name)) return i;
+ if (is_autopick_aux(o_ptr, entry, o_name)) return i;
}
- /* No matching entry */
+ /* No matching entry */
return -1;
}
/* Artifact? */
if (!can_player_destroy_object(o_ptr))
{
- char o_name[MAX_NLEN];
+ char o_name[MAX_NLEN];
- /* Describe the object (with {terrible/special}) */
- object_desc(o_name, o_ptr, TRUE, 3);
+ /* Describe the object (with {terrible/special}) */
+ object_desc(o_name, o_ptr, TRUE, 3);
/* Message */
#ifdef JP
}
/* Record name of destroyed item */
- COPY(&autopick_last_destroyed_object, o_ptr, object_type);
+ COPY(&autopick_last_destroyed_object, o_ptr, object_type);
- /* Destroy Later */
- o_ptr->marked |= OM_AUTODESTROY;
- p_ptr->notice |= PN_AUTODESTROY;
+ /* Destroy Later */
+ o_ptr->marked |= OM_AUTODESTROY;
+ p_ptr->notice |= PN_AUTODESTROY;
return TRUE;
}
*/
static void delayed_auto_destroy_aux(int item)
{
- object_type *o_ptr;
+ object_type *o_ptr;
/* Get the item (in the pack) */
if (item >= 0) o_ptr = &inventory[item];
/* Get the item (on the floor) */
else o_ptr = &o_list[0 - item];
- if (o_ptr->k_idx && o_ptr->marked & OM_AUTODESTROY)
- {
- char o_name[MAX_NLEN];
+ if (o_ptr->k_idx && o_ptr->marked & OM_AUTODESTROY)
+ {
+ char o_name[MAX_NLEN];
- /* Describe the object (with {terrible/special}) */
- object_desc(o_name, o_ptr, TRUE, 3);
+ /* Describe the object (with {terrible/special}) */
+ object_desc(o_name, o_ptr, TRUE, 3);
- /* Eliminate the item (from the pack) */
- if (item >= 0)
- {
- inven_item_increase(item, -(o_ptr->number));
- inven_item_optimize(item);
- }
+ /* Eliminate the item (from the pack) */
+ if (item >= 0)
+ {
+ inven_item_increase(item, -(o_ptr->number));
+ inven_item_optimize(item);
+ }
- /* Eliminate the item (from the floor) */
- else
- {
- delete_object_idx(0 - item);
- }
+ /* Eliminate the item (from the floor) */
+ else
+ {
+ delete_object_idx(0 - item);
+ }
- /* Print a message */
+ /* Print a message */
#ifdef JP
- msg_format("%s¤ò¼«Æ°Ç˲õ¤·¤Þ¤¹¡£", o_name);
+ msg_format("%s¤ò¼«Æ°Ç˲õ¤·¤Þ¤¹¡£", o_name);
#else
- msg_format("Auto-destroying %s.", o_name);
+ msg_format("Auto-destroying %s.", o_name);
#endif
- }
+ }
}
int item;
/*
- * Scan inventry in reverse order to prevent
- * skipping after inven_item_optimize()
- */
+ * Scan inventry in reverse order to prevent
+ * skipping after inven_item_optimize()
+ */
for (item = INVEN_TOTAL - 1; item >= 0 ; item--)
- delayed_auto_destroy_aux(item);
+ delayed_auto_destroy_aux(item);
/* Scan the pile of objects */
- item = cave[py][px].o_idx;
- while (item)
- {
- int next = o_list[item].next_o_idx;
- delayed_auto_destroy_aux(-item);
- item = next;
- }
+ item = cave[py][px].o_idx;
+ while (item)
+ {
+ int next = o_list[item].next_o_idx;
+ delayed_auto_destroy_aux(-item);
+ item = next;
+ }
}
char out_val[MAX_NLEN+20];
char o_name[MAX_NLEN];
- if (o_ptr->marked & OM_NO_QUERY)
- {
- /* Already answered as 'No' */
- continue;
- }
+ if (o_ptr->marked & OM_NO_QUERY)
+ {
+ /* Already answered as 'No' */
+ continue;
+ }
/* Describe the object */
object_desc(o_name, o_ptr, TRUE, 3);
#ifdef JP
- sprintf(out_val, "%s¤ò½¦¤¤¤Þ¤¹¤«? ", o_name);
+ sprintf(out_val, "%s¤ò½¦¤¤¤Þ¤¹¤«? ", o_name);
#else
- sprintf(out_val, "Pick up %s? ", o_name);
+ sprintf(out_val, "Pick up %s? ", o_name);
#endif
if (!get_check(out_val))
}
if (insc)
- {
+ {
strncat(buff, format("¤Ë¡Ö%s¡×", insc), 80);
- if (strstr(insc, "%%all"))
- strcat(buff, "(%%all¤ÏÁ´Ç½ÎϤòɽ¤¹±Ñ»ú¤Îµ¹æ¤ÇÃÖ´¹)");
- else if (strstr(insc, "%all"))
- strcat(buff, "(%all¤ÏÁ´Ç½ÎϤòɽ¤¹µ¹æ¤ÇÃÖ´¹)");
- else if (strstr(insc, "%%"))
- strcat(buff, "(%%¤ÏÄɲÃǽÎϤòɽ¤¹±Ñ»ú¤Îµ¹æ¤ÇÃÖ´¹)");
- else if (strstr(insc, "%"))
- strcat(buff, "(%¤ÏÄɲÃǽÎϤòɽ¤¹µ¹æ¤ÇÃÖ´¹)");
+ if (strstr(insc, "%%all"))
+ strcat(buff, "(%%all¤ÏÁ´Ç½ÎϤòɽ¤¹±Ñ»ú¤Îµ¹æ¤ÇÃÖ´¹)");
+ else if (strstr(insc, "%all"))
+ strcat(buff, "(%all¤ÏÁ´Ç½ÎϤòɽ¤¹µ¹æ¤ÇÃÖ´¹)");
+ else if (strstr(insc, "%%"))
+ strcat(buff, "(%%¤ÏÄɲÃǽÎϤòɽ¤¹±Ñ»ú¤Îµ¹æ¤ÇÃÖ´¹)");
+ else if (strstr(insc, "%"))
+ strcat(buff, "(%¤ÏÄɲÃǽÎϤòɽ¤¹µ¹æ¤ÇÃÖ´¹)");
strcat(buff, "¤È¹ï¤ó¤Ç");
- }
+ }
else
strcat(buff, "¤ò");
/* Auto-insctiption */
if (insc)
- {
+ {
strncat(buff, format("and inscribe \"%s\"", insc), 80);
- if (strstr(insc, "%all"))
- strcat(buff, ", replacing %all with code string representing all abilities,");
- else if (strstr(insc, "%"))
- strcat(buff, ", replacing % with code string representing extra random abilities,");
+ if (strstr(insc, "%all"))
+ strcat(buff, ", replacing %all with code string representing all abilities,");
+ else if (strstr(insc, "%"))
+ strcat(buff, ", replacing % with code string representing extra random abilities,");
strcat(buff, " on ");
- }
+ }
/* Adjective */
if (!before_n)
#else
lines_list = read_text_lines("pickpref.prf", TRUE);
#endif
- *filename_mode_p = PT_DEFAULT;
+ *filename_mode_p = PT_DEFAULT;
}
if (!lines_list)
#else
lines_list = read_text_lines("pickpref.prf", FALSE);
#endif
- *filename_mode_p = PT_WITH_PNAME;
+ *filename_mode_p = PT_WITH_PNAME;
}
if (!lines_list)
/* Allocate list of pointers */
C_MAKE(lines_list, MAX_LINES, cptr);
lines_list[0] = string_make("");
- *filename_mode_p = PT_WITH_PNAME;
+ *filename_mode_p = PT_WITH_PNAME;
}
return lines_list;
}
q = "Entry which item? ";
s = "You have nothing to entry.";
#endif
- o_ptr = choose_object(q, s);
+ o_ptr = choose_object(q, s);
if (!o_ptr) return FALSE;
autopick_entry_from_object(entry, o_ptr);
*/
static bool get_string_for_search(object_type **o_handle, cptr *search_strp)
{
- int pos = 0;
+ int pos = 0;
cptr q, s;
- char buf[MAX_NLEN+20];
+ char buf[MAX_NLEN+20];
#ifdef JP
- int k_flag[MAX_NLEN+20];
- char prompt[] = "¸¡º÷(^I:»ý¤Áʪ ^L:Ç˲õ¤µ¤ì¤¿Êª): ";
+ int k_flag[MAX_NLEN+20];
+ char prompt[] = "¸¡º÷(^I:»ý¤Áʪ ^L:Ç˲õ¤µ¤ì¤¿Êª): ";
#else
- char prompt[] = "Search key(^I:inven ^L:destroyed): ";
+ char prompt[] = "Search key(^I:inven ^L:destroyed): ";
#endif
- int col = sizeof(prompt) - 1;
+ int col = sizeof(prompt) - 1;
- if (*search_strp) strcpy(buf, *search_strp);
- else buf[0] = '\0';
+ if (*search_strp) strcpy(buf, *search_strp);
+ else buf[0] = '\0';
/* Display prompt */
prt(prompt, 0, 0);
/* Display the default answer */
- Term_erase(col, 0, 255);
+ Term_erase(col, 0, 255);
Term_putstr(col, 0, -1, TERM_YELLOW, buf);
/* Process input */
while (1)
{
- object_type *o_ptr;
- int i;
+ object_type *o_ptr;
+ int i;
- /* Place cursor */
+ /* Place cursor */
Term_gotoxy(col + pos, 0);
/* Do not process macros except special keys */
case '\n':
case '\r':
- if (!pos && *o_handle) return TRUE;
- string_free(*search_strp);
- *search_strp = string_make(buf);
- *o_handle = NULL;
- return TRUE;
-
- case KTRL('i'):
- /* Get an item */
+ if (!pos && *o_handle) return TRUE;
+ string_free(*search_strp);
+ *search_strp = string_make(buf);
+ *o_handle = NULL;
+ return TRUE;
+
+ case KTRL('i'):
+ /* Get an item */
#ifdef JP
- q = "¤É¤Î¥¢¥¤¥Æ¥à¤ò¸¡º÷¤·¤Þ¤¹¤«? ";
- s = "¥¢¥¤¥Æ¥à¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¡£";
+ q = "¤É¤Î¥¢¥¤¥Æ¥à¤ò¸¡º÷¤·¤Þ¤¹¤«? ";
+ s = "¥¢¥¤¥Æ¥à¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¡£";
#else
- q = "Entry which item? ";
- s = "You have nothing to entry.";
+ q = "Entry which item? ";
+ s = "You have nothing to entry.";
#endif
- o_ptr = choose_object(q, s);
- if (!o_ptr) return FALSE;
+ o_ptr = choose_object(q, s);
+ if (!o_ptr) return FALSE;
- *o_handle = o_ptr;
+ *o_handle = o_ptr;
- string_free(*search_strp);
- object_desc(buf, *o_handle, FALSE, 3);
- *search_strp = string_make(format("<%s>", buf));
- return TRUE;
+ string_free(*search_strp);
+ object_desc(buf, *o_handle, FALSE, 3);
+ *search_strp = string_make(format("<%s>", buf));
+ return TRUE;
- case KTRL('l'):
- if (!autopick_last_destroyed_object.k_idx) break;
- *o_handle = &autopick_last_destroyed_object;
+ case KTRL('l'):
+ if (!autopick_last_destroyed_object.k_idx) break;
+ *o_handle = &autopick_last_destroyed_object;
- string_free(*search_strp);
- object_desc(buf, *o_handle, FALSE, 3);
- *search_strp = string_make(format("<%s>", buf));
- return TRUE;
+ string_free(*search_strp);
+ object_desc(buf, *o_handle, FALSE, 3);
+ *search_strp = string_make(format("<%s>", buf));
+ return TRUE;
case 0x7F:
case '\010':
#ifdef JP
- if (pos > 0)
- {
- pos--;
- if (k_flag[pos]) pos--;
- }
+ if (pos > 0)
+ {
+ pos--;
+ if (k_flag[pos]) pos--;
+ }
#else
if (pos > 0) pos--;
#endif
default:
#ifdef JP
- if (iskanji(i))
- {
- int next;
-
- inkey_base = TRUE;
- next = inkey ();
- if (pos + 1 < MAX_NLEN)
- {
- buf[pos++] = i;
- buf[pos] = next;
- k_flag[pos++] = 1;
- }
- else bell();
- }
- else if (pos < MAX_NLEN && isprint(i))
- {
- buf[pos] = i;
- k_flag[pos++] = 0;
- }
- else bell();
+ if (iskanji(i))
+ {
+ int next;
+
+ inkey_base = TRUE;
+ next = inkey ();
+ if (pos + 1 < MAX_NLEN)
+ {
+ buf[pos++] = i;
+ buf[pos] = next;
+ k_flag[pos++] = 1;
+ }
+ else bell();
+ }
+ else if (pos < MAX_NLEN && isprint(i))
+ {
+ buf[pos] = i;
+ k_flag[pos++] = 0;
+ }
+ else bell();
#else
if (pos < MAX_NLEN && isprint(i)) buf[pos++] = i;
else bell();
break;
}
- /* Terminate */
- buf[pos] = '\0';
+ /* Terminate */
+ buf[pos] = '\0';
- /* Update the entry */
- Term_erase(col, 0, 255);
- Term_putstr(col, 0, -1, TERM_WHITE, buf);
+ /* Update the entry */
+ Term_erase(col, 0, 255);
+ Term_putstr(col, 0, -1, TERM_WHITE, buf);
}
- /* Never reached */
+ /* Never reached */
}
*/
static bool search_for_object(cptr *lines_list, object_type *o_ptr, int *cxp, int *cyp, bool forward)
{
- int i;
+ int i;
autopick_type an_entry, *entry = &an_entry;
char o_name[MAX_NLEN];
o_name[i] = tolower(o_name[i]);
}
- i = *cyp;
-
- while (1)
- {
- if (forward)
- {
- if (!lines_list[++i]) break;
- }
- else
- {
- if (--i < 0) break;
- }
-
- if (!autopick_new_entry(entry, lines_list[i])) continue;
-
- if (is_autopick_aux(o_ptr, entry, o_name))
- {
- *cxp = 0;
- *cyp = i;
- return TRUE;
- }
- }
-
- return FALSE;
+ i = *cyp;
+
+ while (1)
+ {
+ if (forward)
+ {
+ if (!lines_list[++i]) break;
+ }
+ else
+ {
+ if (--i < 0) break;
+ }
+
+ if (!autopick_new_entry(entry, lines_list[i])) continue;
+
+ if (is_autopick_aux(o_ptr, entry, o_name))
+ {
+ *cxp = 0;
+ *cyp = i;
+ return TRUE;
+ }
+ }
+
+ return FALSE;
}
*/
static bool search_for_string(cptr *lines_list, cptr search_str, int *cxp, int *cyp, bool forward)
{
- int i = *cyp;
-
- while (1)
- {
- cptr pos;
-
- if (forward)
- {
- if (!lines_list[++i]) break;
- }
- else
- {
- if (--i < 0) break;
- }
+ int i = *cyp;
+
+ while (1)
+ {
+ cptr pos;
+
+ if (forward)
+ {
+ if (!lines_list[++i]) break;
+ }
+ else
+ {
+ if (--i < 0) break;
+ }
#ifdef JP
- pos = strstr_j(lines_list[i], search_str);
+ pos = strstr_j(lines_list[i], search_str);
#else
pos = strstr(lines_list[i], search_str);
#endif
- if (pos)
- {
- *cxp = (int)(pos - lines_list[i]);
- *cyp = i;
- return TRUE;
- }
- }
-
- return FALSE;
+ if (pos)
+ {
+ *cxp = (int)(pos - lines_list[i]);
+ *cyp = i;
+ return TRUE;
+ }
+ }
+
+ return FALSE;
}
if(!strcmp(entry.name, autopick_list[i].name)
&& entry.flag[0] == autopick_list[i].flag[0]
&& entry.flag[1] == autopick_list[i].flag[1]
- && entry.dice == autopick_list[i].dice
- && entry.bonus == autopick_list[i].bonus) return 0;
+ && entry.dice == autopick_list[i].dice
+ && entry.bonus == autopick_list[i].bonus) return 0;
autopick_list[max_autopick++] = entry;
return 0;
"^A ^E ¹Ô¤ÎÀèƬ¡¢½ªÃ¼",
"^Q ÆþÎÏ/¥³¥Þ¥ó¥É¥â¡¼¥ÉÀÚ¤êÂؤ¨",
"^R Êѹ¹¤òÁ´¤Æ¼è¤ê¾Ã¤·¤Æ¸µ¤ËÌ᤹",
- "------------------------------------",
- "^I »ý¤Áʪ/ÁõÈ÷¤«¤éÁªÂò",
+ "------------------------------------",
+ "^I »ý¤Áʪ/ÁõÈ÷¤«¤éÁªÂò",
"^L",
"^K ¥«¡¼¥½¥ë¤«¤é½ªÃ¼¤Þ¤Çºï½ü",
"^Y ºï½ü(^K)¤·¤¿¹Ô¤òÁÞÆþ",
"^C ¼ï²¡¢¿¦¶È¤Î¾ò·ï¼°¤òÁÞÆþ",
- "------------------------------------",
+ "------------------------------------",
"^S Êѹ¹ (!Ç˲õ/~ÊüÃÖ/½¦¤¦)",
"^G \"(\" Á´ÂΥޥåפÇɽ¼¨¤·¤Ê¤¤",
"^O \"#\" ¼«Æ°¹ï¤ß",
- "------------------------------------",
+ "------------------------------------",
"^U ̤´ÕÄê/̤ȽÌÀ/´ÕÄê/*´ÕÄê*",
"^W \"̵²ÁÃͤÎ\"",
"^X ̵ÌÃ/¥¨¥´/¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È",
"^A ^E Beginning and End of Line",
"^Q Toggle Insert/Command mode",
"^R Revert to Original File",
- "------------------------------------",
- "^I Object in Inventry/Equipment",
+ "------------------------------------",
+ "^I Object in Inventry/Equipment",
"^L",
"^K Kill Rest of Line",
"^Y Insert killed(^K) text",
"^C Insert conditional expression",
- "------------------------------------",
+ "------------------------------------",
"^S Toggle(!Destroy/~Leave/Pick)",
"^G \"(\" No display in the 'M'ap",
"^O \"#\" Auto-Inscribe",
- "------------------------------------",
+ "------------------------------------",
"^U Toggle 'identified' state",
"^W \"worthless\"",
"^X Toggle nameless/ego/artifact",
static int cx = 0, cy = 0;
static int upper = 0, left = 0;
- object_type *search_o_ptr = NULL;
- cptr search_str = NULL;
- cptr last_destroyed = NULL;
+ object_type *search_o_ptr = NULL;
+ cptr search_str = NULL;
+ cptr last_destroyed = NULL;
char last_destroyed_command[WID_DESC+3];
char yank_buf[MAX_YANK];
char classrace[80];
autopick_type an_entry, *entry = &an_entry;
char buf[MAX_LINELEN];
cptr *lines_list;
- int filename_mode = PT_WITH_PNAME;
+ int filename_mode = PT_WITH_PNAME;
int i, j, k, len;
int old_upper = -1, old_left = -1;
int old_cy = -1;
int key = -1, old_key;
- bool repeated_clearing = FALSE;
+ bool repeated_clearing = FALSE;
bool edit_mode = FALSE;
byte dirty_flags = DIRTY_ALL | DIRTY_COMMAND | DIRTY_MODE;
int wid, hgt, old_wid = -1, old_hgt = -1;
- static s32b old_autosave_turn = 0L;
+ static s32b old_autosave_turn = 0L;
- /* Autosave */
- if (turn > old_autosave_turn + 100L)
- {
- do_cmd_save_game(TRUE);
- old_autosave_turn = turn;
- }
+ /* Autosave */
+ if (turn > old_autosave_turn + 100L)
+ {
+ do_cmd_save_game(TRUE);
+ old_autosave_turn = turn;
+ }
- /* HACK -- Reset start_time to stop counting playtime while edit */
- update_playtime();
+ /* HACK -- Reset start_time to stop counting playtime while edit */
+ update_playtime();
/* Free old entries */
init_autopicker();
/* Command Description of the 'Last Destroyed Item' */
- if (autopick_last_destroyed_object.k_idx)
- {
- autopick_entry_from_object(entry, &autopick_last_destroyed_object);
- last_destroyed = autopick_line_from_entry_kill(entry);
+ if (autopick_last_destroyed_object.k_idx)
+ {
+ autopick_entry_from_object(entry, &autopick_last_destroyed_object);
+ last_destroyed = autopick_line_from_entry_kill(entry);
my_strcpy(last_destroyed_command, format("^L \"%s\"", last_destroyed), sizeof(last_destroyed_command));
}
Term_erase(0, hgt - 3 + 2, wid);
/* Display information */
- if (dirty_flags & DIRTY_NOT_FOUND)
- {
+ if (dirty_flags & DIRTY_NOT_FOUND)
+ {
#ifdef JP
prt(format("¥Ñ¥¿¡¼¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s", search_str), hgt - 3 + 1, 0);
#else
prt(format("Pattern not found: %s", search_str), hgt - 3 + 1, 0);
#endif
- }
- else if (dirty_flags & DIRTY_NO_SEARCH)
- {
+ }
+ else if (dirty_flags & DIRTY_NO_SEARCH)
+ {
#ifdef JP
prt("¸¡º÷Ãæ¤Î¥Ñ¥¿¡¼¥ó¤¬¤¢¤ê¤Þ¤»¤ó('/'¤Ç¸¡º÷)¡£", hgt - 3 + 1, 0);
#else
prt("No pattern to search. (Press '/' to search.)", hgt - 3 + 1, 0);
#endif
- }
+ }
else if (lines_list[cy][0] == '#')
{
#ifdef JP
/* Add a character */
#ifdef JP
- if (iskanji(key))
+ if (iskanji(key))
{
- int next;
+ int next;
- inkey_base = TRUE;
- next = inkey();
- if (j+2 < MAX_LINELEN)
+ inkey_base = TRUE;
+ next = inkey();
+ if (j+2 < MAX_LINELEN)
{
- buf[j++] = key;
- buf[j++] = next;
+ buf[j++] = key;
+ buf[j++] = next;
cx += 2;
- }
+ }
else
- bell();
- }
+ bell();
+ }
else
#endif
{
- if (j+1 < MAX_LINELEN)
+ if (j+1 < MAX_LINELEN)
buf[j++] = key;
cx++;
}
break;
case '~':
if (!autopick_new_entry(entry, lines_list[cy]))
- {
- if (old_key != key) repeated_clearing = FALSE;
+ {
+ if (old_key != key) repeated_clearing = FALSE;
- /* Next line */
- if (lines_list[cy + 1]) cy++;
- cx = 0;
+ /* Next line */
+ if (lines_list[cy + 1]) cy++;
+ cx = 0;
break;
- }
+ }
string_free(lines_list[cy]);
- if (old_key != key)
- {
- if (entry->action & DONT_AUTOPICK)
- repeated_clearing = TRUE;
- else
- repeated_clearing = FALSE;
- }
+ if (old_key != key)
+ {
+ if (entry->action & DONT_AUTOPICK)
+ repeated_clearing = TRUE;
+ else
+ repeated_clearing = FALSE;
+ }
entry->action &= ~DO_AUTODESTROY;
entry->action &= ~DO_QUERY_AUTOPICK;
/* Now dirty */
dirty_line = cy;
- /* Next line */
- if (lines_list[cy + 1]) cy++;
- cx = 0;
+ /* Next line */
+ if (lines_list[cy + 1]) cy++;
+ cx = 0;
break;
case '!':
if (!autopick_new_entry(entry, lines_list[cy]))
- {
- if (old_key != key) repeated_clearing = FALSE;
+ {
+ if (old_key != key) repeated_clearing = FALSE;
- /* Next line */
- if (lines_list[cy + 1]) cy++;
- cx = 0;
+ /* Next line */
+ if (lines_list[cy + 1]) cy++;
+ cx = 0;
break;
- }
+ }
string_free(lines_list[cy]);
- if (old_key != key)
- {
- if (entry->action & DO_AUTODESTROY)
- repeated_clearing = TRUE;
- else
- repeated_clearing = FALSE;
- }
+ if (old_key != key)
+ {
+ if (entry->action & DO_AUTODESTROY)
+ repeated_clearing = TRUE;
+ else
+ repeated_clearing = FALSE;
+ }
entry->action &= ~DONT_AUTOPICK;
entry->action &= ~DO_QUERY_AUTOPICK;
/* Now dirty */
dirty_line = cy;
- /* Next line */
- if (lines_list[cy + 1]) cy++;
- cx = 0;
+ /* Next line */
+ if (lines_list[cy + 1]) cy++;
+ cx = 0;
break;
case ';':
if (!autopick_new_entry(entry, lines_list[cy]))
- {
- if (old_key != key) repeated_clearing = FALSE;
+ {
+ if (old_key != key) repeated_clearing = FALSE;
- /* Next line */
- if (lines_list[cy + 1]) cy++;
- cx = 0;
+ /* Next line */
+ if (lines_list[cy + 1]) cy++;
+ cx = 0;
break;
- }
+ }
string_free(lines_list[cy]);
- if (old_key != key)
- {
- if (entry->action & DO_QUERY_AUTOPICK)
- repeated_clearing = TRUE;
- else
- repeated_clearing = FALSE;
- }
+ if (old_key != key)
+ {
+ if (entry->action & DO_QUERY_AUTOPICK)
+ repeated_clearing = TRUE;
+ else
+ repeated_clearing = FALSE;
+ }
entry->action &= ~DO_AUTODESTROY;
entry->action &= ~DONT_AUTOPICK;
/* Now dirty */
dirty_line = cy;
- /* Next line */
- if (lines_list[cy + 1]) cy++;
- cx = 0;
+ /* Next line */
+ if (lines_list[cy + 1]) cy++;
+ cx = 0;
break;
case '(':
- /* Toggle display on the 'M'ap */
- if (!autopick_new_entry(entry, lines_list[cy]))
- {
- if (old_key != key) repeated_clearing = FALSE;
-
- /* Next line */
- if (lines_list[cy + 1]) cy++;
- cx = 0;
- break;
- }
- string_free(lines_list[cy]);
-
- if (old_key != key)
- {
- if (entry->action & DO_DISPLAY)
- repeated_clearing = TRUE;
- else
- repeated_clearing = FALSE;
- }
+ /* Toggle display on the 'M'ap */
+ if (!autopick_new_entry(entry, lines_list[cy]))
+ {
+ if (old_key != key) repeated_clearing = FALSE;
+
+ /* Next line */
+ if (lines_list[cy + 1]) cy++;
+ cx = 0;
+ break;
+ }
+ string_free(lines_list[cy]);
+
+ if (old_key != key)
+ {
+ if (entry->action & DO_DISPLAY)
+ repeated_clearing = TRUE;
+ else
+ repeated_clearing = FALSE;
+ }
if (!repeated_clearing)
- entry->action |= DO_DISPLAY;
- else
- entry->action &= ~DO_DISPLAY;
+ entry->action |= DO_DISPLAY;
+ else
+ entry->action &= ~DO_DISPLAY;
- lines_list[cy] = autopick_line_from_entry_kill(entry);
+ lines_list[cy] = autopick_line_from_entry_kill(entry);
- /* Now dirty */
- dirty_line = cy;
+ /* Now dirty */
+ dirty_line = cy;
- /* Next line */
- if (lines_list[cy + 1]) cy++;
- cx = 0;
+ /* Next line */
+ if (lines_list[cy + 1]) cy++;
+ cx = 0;
break;
case '#':
case '{':
dirty_flags |= DIRTY_MODE;
}
break;
- case '/':
+ case '/':
/* Become dirty because of item/equip menu */
dirty_flags |= DIRTY_SCREEN;
- if (!get_string_for_search(&search_o_ptr, &search_str))
- break;
-
- /* fall through */
- case 'n':
- if (search_o_ptr)
- {
- if (!search_for_object(lines_list, search_o_ptr, &cx, &cy, TRUE)) dirty_flags |= DIRTY_NOT_FOUND;
- }
- else if (search_str)
- {
- if (!search_for_string(lines_list, search_str, &cx, &cy, TRUE)) dirty_flags |= DIRTY_NOT_FOUND;
- }
- else
- {
- dirty_flags |= DIRTY_NO_SEARCH;
- }
- break;
- case 'N':
- if (search_o_ptr)
- {
- if (!search_for_object(lines_list, search_o_ptr, &cx, &cy, FALSE)) dirty_flags |= DIRTY_NOT_FOUND;
- }
- else if (search_str)
- {
- if (!search_for_string(lines_list, search_str, &cx, &cy, FALSE)) dirty_flags |= DIRTY_NOT_FOUND;
- }
- else
- {
- dirty_flags |= DIRTY_NO_SEARCH;
- }
- break;
+ if (!get_string_for_search(&search_o_ptr, &search_str))
+ break;
+
+ /* fall through */
+ case 'n':
+ if (search_o_ptr)
+ {
+ if (!search_for_object(lines_list, search_o_ptr, &cx, &cy, TRUE)) dirty_flags |= DIRTY_NOT_FOUND;
+ }
+ else if (search_str)
+ {
+ if (!search_for_string(lines_list, search_str, &cx, &cy, TRUE)) dirty_flags |= DIRTY_NOT_FOUND;
+ }
+ else
+ {
+ dirty_flags |= DIRTY_NO_SEARCH;
+ }
+ break;
+ case 'N':
+ if (search_o_ptr)
+ {
+ if (!search_for_object(lines_list, search_o_ptr, &cx, &cy, FALSE)) dirty_flags |= DIRTY_NOT_FOUND;
+ }
+ else if (search_str)
+ {
+ if (!search_for_string(lines_list, search_str, &cx, &cy, FALSE)) dirty_flags |= DIRTY_NOT_FOUND;
+ }
+ else
+ {
+ dirty_flags |= DIRTY_NO_SEARCH;
+ }
+ break;
}
}
break;
}
- insert_return_code(lines_list, 0, cy);
+ insert_return_code(lines_list, 0, cy);
string_free(lines_list[cy]);
- lines_list[cy] = autopick_line_from_entry_kill(entry);
- cx = 0;
+ lines_list[cy] = autopick_line_from_entry_kill(entry);
+ cx = 0;
- /* Now dirty because of item/equip menu */
- dirty_flags |= DIRTY_SCREEN;
+ /* Now dirty because of item/equip menu */
+ dirty_flags |= DIRTY_SCREEN;
break;
case KTRL('l'):
if (last_destroyed)
{
insert_return_code(lines_list, 0, cy);
- string_free(lines_list[cy]);
+ string_free(lines_list[cy]);
lines_list[cy] = string_make(last_destroyed);
cx = 0;
/* Paste killed text */
if (strlen(yank_buf))
{
- bool ret = FALSE;
+ bool ret = FALSE;
for (j = 0; yank_buf[j]; j += strlen(yank_buf + j) + 1)
{
- if (ret && '\n' == yank_buf[j])
- {
- ret = FALSE;
- continue;
- }
+ if (ret && '\n' == yank_buf[j])
+ {
+ ret = FALSE;
+ continue;
+ }
/* Split current line */
insert_return_code(lines_list, cx, cy);
buf[i] = lines_list[cy][i];
/* Paste yank buffer */
- if ('\n' != yank_buf[j])
- {
- int k = j;
- while (yank_buf[k] && i < MAX_LINELEN-1)
- buf[i++] = yank_buf[k++];
- ret = TRUE;
- }
+ if ('\n' != yank_buf[j])
+ {
+ int k = j;
+ while (yank_buf[k] && i < MAX_LINELEN-1)
+ buf[i++] = yank_buf[k++];
+ ret = TRUE;
+ }
buf[i] = '\0';
case KTRL('k'):
/* Kill rest of line */
if ((uint)cx > strlen(lines_list[cy]))
- cx = (int)strlen(lines_list[cy]);
+ cx = (int)strlen(lines_list[cy]);
- /* Save preceding string */
- for (i = 0; lines_list[cy][i] && i < cx; i++)
- {
+ /* Save preceding string */
+ for (i = 0; lines_list[cy][i] && i < cx; i++)
+ {
#ifdef JP
- if (iskanji(lines_list[cy][i]))
- {
- buf[i] = lines_list[cy][i];
- i++;
- }
+ if (iskanji(lines_list[cy][i]))
+ {
+ buf[i] = lines_list[cy][i];
+ i++;
+ }
#endif
- buf[i] = lines_list[cy][i];
- }
- buf[i] = '\0';
-
- j = 0;
- if (old_key == key)
- while (yank_buf[j])
- j += strlen(yank_buf + j) + 1;
-
- /* Copy following to yank buffer */
- if (lines_list[cy][i])
- {
- while (lines_list[cy][i] && j < MAX_YANK - 2)
- yank_buf[j++] = lines_list[cy][i++];
- i = TRUE;
- }
- else
- {
- if (j < MAX_YANK - 2)
- yank_buf[j++] = '\n';
- i = FALSE;
- }
- yank_buf[j++] = '\0';
- yank_buf[j] = '\0';
-
- /* Replace current line with 'preceding string' */
- string_free(lines_list[cy]);
- lines_list[cy] = string_make(buf);
-
- if (i)
- {
- /* Now dirty */
- dirty_line = cy;
- break;
- }
+ buf[i] = lines_list[cy][i];
+ }
+ buf[i] = '\0';
+
+ j = 0;
+ if (old_key == key)
+ while (yank_buf[j])
+ j += strlen(yank_buf + j) + 1;
+
+ /* Copy following to yank buffer */
+ if (lines_list[cy][i])
+ {
+ while (lines_list[cy][i] && j < MAX_YANK - 2)
+ yank_buf[j++] = lines_list[cy][i++];
+ i = TRUE;
+ }
+ else
+ {
+ if (j < MAX_YANK - 2)
+ yank_buf[j++] = '\n';
+ i = FALSE;
+ }
+ yank_buf[j++] = '\0';
+ yank_buf[j] = '\0';
+
+ /* Replace current line with 'preceding string' */
+ string_free(lines_list[cy]);
+ lines_list[cy] = string_make(buf);
+
+ if (i)
+ {
+ /* Now dirty */
+ dirty_line = cy;
+ break;
+ }
/* fall through */
case KTRL('d'):
/* Restore the screen */
screen_load();
- switch (filename_mode)
- {
- case PT_DEFAULT:
+ switch (filename_mode)
+ {
+ case PT_DEFAULT:
#ifdef JP
- strcpy(buf, "picktype.prf");
+ strcpy(buf, "picktype.prf");
#else
- strcpy(buf, "pickpref.prf");
+ strcpy(buf, "pickpref.prf");
#endif
- break;
+ break;
- case PT_WITH_PNAME:
+ case PT_WITH_PNAME:
#ifdef JP
- sprintf(buf, "picktype-%s.prf", player_name);
+ sprintf(buf, "picktype-%s.prf", player_name);
#else
- sprintf(buf, "pickpref-%s.prf", player_name);
+ sprintf(buf, "pickpref-%s.prf", player_name);
#endif
- break;
- }
+ break;
+ }
write_text_lines(buf, lines_list);
free_text_lines(lines_list);
/* Reload autopick pref */
process_pickpref_file(buf);
- /* HACK -- reset start_time so that playtime is not increase while edit */
- start_time = time(NULL);
+ /* HACK -- reset start_time so that playtime is not increase while edit */
+ start_time = time(NULL);
}
{
switch (randint1(29))
{
- case 1: case 2: case 3:
- type = V_SACRIFICE;
- break;
- case 4: case 5: case 6:
- type = V_COMPASSION;
- break;
- case 7: case 8: case 9: case 10: case 11: case 12:
- type = V_VALOUR;
- break;
- case 13: case 14: case 15: case 16: case 17:
- type = V_HONOUR;
- break;
- case 18: case 19: case 20: case 21:
- type = V_JUSTICE;
- break;
- case 22: case 23:
- type = V_TEMPERANCE;
- break;
- case 24: case 25:
- type = V_HARMONY;
- break;
- case 26: case 27: case 28:
- type = V_PATIENCE;
- break;
- default:
- type = V_DILIGENCE;
+ case 1: case 2: case 3:
+ type = V_SACRIFICE;
+ break;
+ case 4: case 5: case 6:
+ type = V_COMPASSION;
+ break;
+ case 7: case 8: case 9: case 10: case 11: case 12:
+ type = V_VALOUR;
+ break;
+ case 13: case 14: case 15: case 16: case 17:
+ type = V_HONOUR;
+ break;
+ case 18: case 19: case 20: case 21:
+ type = V_JUSTICE;
+ break;
+ case 22: case 23:
+ type = V_TEMPERANCE;
+ break;
+ case 24: case 25:
+ type = V_HARMONY;
+ break;
+ case 26: case 27: case 28:
+ type = V_PATIENCE;
+ break;
+ default:
+ type = V_DILIGENCE;
}
}
{
switch(p_ptr->realm1)
{
- case REALM_LIFE:
- if (virtue_number(V_VITALITY))
- p_ptr->vir_types[i++] = V_TEMPERANCE;
- else p_ptr->vir_types[i++] = V_VITALITY;
- break;
- case REALM_SORCERY:
- if (virtue_number(V_KNOWLEDGE))
- p_ptr->vir_types[i++] = V_ENCHANT;
- else p_ptr->vir_types[i++] = V_KNOWLEDGE;
- break;
- case REALM_NATURE:
- if (virtue_number(V_NATURE))
- p_ptr->vir_types[i++] = V_HARMONY;
- else p_ptr->vir_types[i++] = V_NATURE;
- break;
- case REALM_CHAOS:
- if (virtue_number(V_CHANCE))
- p_ptr->vir_types[i++] = V_INDIVIDUALISM;
- else p_ptr->vir_types[i++] = V_CHANCE;
- break;
- case REALM_DEATH:
- p_ptr->vir_types[i++] = V_UNLIFE;
- break;
- case REALM_TRUMP:
- p_ptr->vir_types[i++] = V_KNOWLEDGE;
- break;
- case REALM_ARCANE:
- break;
- case REALM_ENCHANT:
- if (virtue_number(V_ENCHANT))
- p_ptr->vir_types[i++] = V_INDIVIDUALISM;
- else p_ptr->vir_types[i++] = V_ENCHANT;
- break;
- case REALM_DAEMON:
- if (virtue_number(V_JUSTICE))
- p_ptr->vir_types[i++] = V_FAITH;
- else p_ptr->vir_types[i++] = V_JUSTICE;
- break;
- case REALM_CRUSADE:
- if (virtue_number(V_JUSTICE))
- p_ptr->vir_types[i++] = V_HONOUR;
- else p_ptr->vir_types[i++] = V_JUSTICE;
- break;
+ case REALM_LIFE:
+ if (virtue_number(V_VITALITY))
+ p_ptr->vir_types[i++] = V_TEMPERANCE;
+ else p_ptr->vir_types[i++] = V_VITALITY;
+ break;
+ case REALM_SORCERY:
+ if (virtue_number(V_KNOWLEDGE))
+ p_ptr->vir_types[i++] = V_ENCHANT;
+ else p_ptr->vir_types[i++] = V_KNOWLEDGE;
+ break;
+ case REALM_NATURE:
+ if (virtue_number(V_NATURE))
+ p_ptr->vir_types[i++] = V_HARMONY;
+ else p_ptr->vir_types[i++] = V_NATURE;
+ break;
+ case REALM_CHAOS:
+ if (virtue_number(V_CHANCE))
+ p_ptr->vir_types[i++] = V_INDIVIDUALISM;
+ else p_ptr->vir_types[i++] = V_CHANCE;
+ break;
+ case REALM_DEATH:
+ p_ptr->vir_types[i++] = V_UNLIFE;
+ break;
+ case REALM_TRUMP:
+ p_ptr->vir_types[i++] = V_KNOWLEDGE;
+ break;
+ case REALM_ARCANE:
+ break;
+ case REALM_ENCHANT:
+ if (virtue_number(V_ENCHANT))
+ p_ptr->vir_types[i++] = V_INDIVIDUALISM;
+ else p_ptr->vir_types[i++] = V_ENCHANT;
+ break;
+ case REALM_DAEMON:
+ if (virtue_number(V_JUSTICE))
+ p_ptr->vir_types[i++] = V_FAITH;
+ else p_ptr->vir_types[i++] = V_JUSTICE;
+ break;
+ case REALM_CRUSADE:
+ if (virtue_number(V_JUSTICE))
+ p_ptr->vir_types[i++] = V_HONOUR;
+ else p_ptr->vir_types[i++] = V_JUSTICE;
+ break;
};
}
{
switch(p_ptr->realm2)
{
- case REALM_LIFE:
- if (virtue_number(V_VITALITY))
- p_ptr->vir_types[i++] = V_TEMPERANCE;
- else p_ptr->vir_types[i++] = V_VITALITY;
- break;
- case REALM_SORCERY:
- if (virtue_number(V_ENCHANT))
- p_ptr->vir_types[i++] = V_KNOWLEDGE;
- else p_ptr->vir_types[i++] = V_ENCHANT;
- break;
- case REALM_NATURE:
- if (virtue_number(V_NATURE))
- p_ptr->vir_types[i++] = V_HARMONY;
- else p_ptr->vir_types[i++] = V_NATURE;
- break;
- case REALM_CHAOS:
- if (virtue_number(V_CHANCE))
- p_ptr->vir_types[i++] = V_INDIVIDUALISM;
- else p_ptr->vir_types[i++] = V_CHANCE;
- break;
- case REALM_DEATH:
- p_ptr->vir_types[i++] = V_UNLIFE;
- break;
- case REALM_TRUMP:
- p_ptr->vir_types[i++] = V_KNOWLEDGE;
- break;
- case REALM_ARCANE:
- break;
- case REALM_ENCHANT:
- if (virtue_number(V_ENCHANT))
+ case REALM_LIFE:
+ if (virtue_number(V_VITALITY))
+ p_ptr->vir_types[i++] = V_TEMPERANCE;
+ else p_ptr->vir_types[i++] = V_VITALITY;
+ break;
+ case REALM_SORCERY:
+ if (virtue_number(V_ENCHANT))
+ p_ptr->vir_types[i++] = V_KNOWLEDGE;
+ else p_ptr->vir_types[i++] = V_ENCHANT;
+ break;
+ case REALM_NATURE:
+ if (virtue_number(V_NATURE))
+ p_ptr->vir_types[i++] = V_HARMONY;
+ else p_ptr->vir_types[i++] = V_NATURE;
+ break;
+ case REALM_CHAOS:
+ if (virtue_number(V_CHANCE))
+ p_ptr->vir_types[i++] = V_INDIVIDUALISM;
+ else p_ptr->vir_types[i++] = V_CHANCE;
+ break;
+ case REALM_DEATH:
+ p_ptr->vir_types[i++] = V_UNLIFE;
+ break;
+ case REALM_TRUMP:
+ p_ptr->vir_types[i++] = V_KNOWLEDGE;
+ break;
+ case REALM_ARCANE:
+ break;
+ case REALM_ENCHANT:
+ if (virtue_number(V_ENCHANT))
p_ptr->vir_types[i++] = V_INDIVIDUALISM;
- else p_ptr->vir_types[i++] = V_ENCHANT;
- break;
- case REALM_DAEMON:
- if (virtue_number(V_JUSTICE))
- p_ptr->vir_types[i++] = V_FAITH;
- else p_ptr->vir_types[i++] = V_JUSTICE;
- break;
- case REALM_CRUSADE:
- if (virtue_number(V_JUSTICE))
- p_ptr->vir_types[i++] = V_HONOUR;
- else p_ptr->vir_types[i++] = V_JUSTICE;
- break;
+ else p_ptr->vir_types[i++] = V_ENCHANT;
+ break;
+ case REALM_DAEMON:
+ if (virtue_number(V_JUSTICE))
+ p_ptr->vir_types[i++] = V_FAITH;
+ else p_ptr->vir_types[i++] = V_JUSTICE;
+ break;
+ case REALM_CRUSADE:
+ if (virtue_number(V_JUSTICE))
+ p_ptr->vir_types[i++] = V_HONOUR;
+ else p_ptr->vir_types[i++] = V_JUSTICE;
+ break;
};
}
for (i = 0; i < 8; i++)
{
- if (p_ptr->vir_types[i] == virtue)
- {
- if (amount > 0)
- {
- if ((amount + p_ptr->virtues[i] > 50) && one_in_(2))
+ if (p_ptr->vir_types[i] == virtue)
+ {
+ if (amount > 0)
+ {
+ if ((amount + p_ptr->virtues[i] > 50) && one_in_(2))
{
p_ptr->virtues[i] = MAX(p_ptr->virtues[i], 50);
return;
}
- if ((amount + p_ptr->virtues[i] > 80) && one_in_(2))
+ if ((amount + p_ptr->virtues[i] > 80) && one_in_(2))
{
p_ptr->virtues[i] = MAX(p_ptr->virtues[i], 80);
return;
}
- if ((amount + p_ptr->virtues[i] > 100) && one_in_(2))
+ if ((amount + p_ptr->virtues[i] > 100) && one_in_(2))
{
p_ptr->virtues[i] = MAX(p_ptr->virtues[i], 100);
return;
}
- if (amount + p_ptr->virtues[i] > 125)
- p_ptr->virtues[i] = 125;
- else
- p_ptr->virtues[i] = p_ptr->virtues[i] + amount;
- }
- else
- {
- if ((amount + p_ptr->virtues[i] < -50) && one_in_(2))
+ if (amount + p_ptr->virtues[i] > 125)
+ p_ptr->virtues[i] = 125;
+ else
+ p_ptr->virtues[i] = p_ptr->virtues[i] + amount;
+ }
+ else
+ {
+ if ((amount + p_ptr->virtues[i] < -50) && one_in_(2))
{
p_ptr->virtues[i] = MIN(p_ptr->virtues[i], -50);
return;
}
- if ((amount + p_ptr->virtues[i] < -80) && one_in_(2))
+ if ((amount + p_ptr->virtues[i] < -80) && one_in_(2))
{
p_ptr->virtues[i] = MIN(p_ptr->virtues[i], -80);
return;
}
- if ((amount + p_ptr->virtues[i] < -100) && one_in_(2))
+ if ((amount + p_ptr->virtues[i] < -100) && one_in_(2))
{
p_ptr->virtues[i] = MIN(p_ptr->virtues[i], -100);
return;
}
- if (amount + p_ptr->virtues[i] < -125)
- p_ptr->virtues[i] = -125;
- else
- p_ptr->virtues[i] = p_ptr->virtues[i] + amount;
- }
+ if (amount + p_ptr->virtues[i] < -125)
+ p_ptr->virtues[i] = -125;
+ else
+ p_ptr->virtues[i] = p_ptr->virtues[i] + amount;
+ }
p_ptr->update |= (PU_BONUS);
- return;
- }
+ return;
+ }
}
}
for (i = 0; i < 8; i++)
{
- if (p_ptr->vir_types[i] == virtue)
- {
+ if (p_ptr->vir_types[i] == virtue)
+ {
p_ptr->virtues[i] = amount;
return;
}
if (!OutFile) return;
- for (v_nr = 0; v_nr < 8; v_nr++)
- {
- char v_name [20];
+ for (v_nr = 0; v_nr < 8; v_nr++)
+ {
+ char v_name [20];
- int tester = p_ptr->virtues[v_nr];
+ int tester = p_ptr->virtues[v_nr];
- strcpy(v_name, virtue[(p_ptr->vir_types[v_nr])-1]);
+ strcpy(v_name, virtue[(p_ptr->vir_types[v_nr])-1]);
- if (p_ptr->vir_types[v_nr] == 0 || p_ptr->vir_types[v_nr] >
- MAX_VIRTUE)
+ if (p_ptr->vir_types[v_nr] == 0 || p_ptr->vir_types[v_nr] >
+ MAX_VIRTUE)
#ifdef JP
- fprintf(OutFile, "¤ª¤Ã¤È¡£%s¤Î¾ðÊó¤Ê¤·¡£", v_name);
+ fprintf(OutFile, "¤ª¤Ã¤È¡£%s¤Î¾ðÊó¤Ê¤·¡£", v_name);
#else
- fprintf(OutFile, "Oops. No info about %s.", v_name);
+ fprintf(OutFile, "Oops. No info about %s.", v_name);
#endif
- else if (tester < -100)
+ else if (tester < -100)
#ifdef JP
- fprintf(OutFile, "[%s]¤ÎÂжË",
+ fprintf(OutFile, "[%s]¤ÎÂжË",
#else
- fprintf(OutFile, "You are the polar opposite of %s.",
+ fprintf(OutFile, "You are the polar opposite of %s.",
#endif
- v_name);
- else if (tester < -80)
+ v_name);
+ else if (tester < -80)
#ifdef JP
- fprintf(OutFile, "[%s]¤ÎÂçŨ",
+ fprintf(OutFile, "[%s]¤ÎÂçŨ",
#else
- fprintf(OutFile, "You are an arch-enemy of %s.",
+ fprintf(OutFile, "You are an arch-enemy of %s.",
#endif
- v_name);
- else if (tester < -60)
+ v_name);
+ else if (tester < -60)
#ifdef JP
- fprintf(OutFile, "[%s]¤Î¶¯Å¨",
+ fprintf(OutFile, "[%s]¤Î¶¯Å¨",
#else
- fprintf(OutFile, "You are a bitter enemy of %s.",
+ fprintf(OutFile, "You are a bitter enemy of %s.",
#endif
- v_name);
- else if (tester < -40)
+ v_name);
+ else if (tester < -40)
#ifdef JP
- fprintf(OutFile, "[%s]¤ÎŨ",
+ fprintf(OutFile, "[%s]¤ÎŨ",
#else
- fprintf(OutFile, "You are an enemy of %s.",
+ fprintf(OutFile, "You are an enemy of %s.",
#endif
- v_name);
- else if (tester < -20)
+ v_name);
+ else if (tester < -20)
#ifdef JP
- fprintf(OutFile, "[%s]¤Îºá¼Ô",
+ fprintf(OutFile, "[%s]¤Îºá¼Ô",
#else
- fprintf(OutFile, "You have sinned against %s.",
+ fprintf(OutFile, "You have sinned against %s.",
#endif
- v_name);
- else if (tester < 0)
+ v_name);
+ else if (tester < 0)
#ifdef JP
- fprintf(OutFile, "[%s]¤ÎÌÂÆ»¼Ô",
+ fprintf(OutFile, "[%s]¤ÎÌÂÆ»¼Ô",
#else
- fprintf(OutFile, "You have strayed from the path of %s.",
+ fprintf(OutFile, "You have strayed from the path of %s.",
#endif
- v_name);
- else if (tester == 0)
+ v_name);
+ else if (tester == 0)
#ifdef JP
- fprintf(OutFile,"[%s]¤ÎÃæΩ¼Ô",
+ fprintf(OutFile,"[%s]¤ÎÃæΩ¼Ô",
#else
- fprintf(OutFile,"You are neutral to %s.",
+ fprintf(OutFile,"You are neutral to %s.",
#endif
- v_name);
- else if (tester < 20)
+ v_name);
+ else if (tester < 20)
#ifdef JP
- fprintf(OutFile,"[%s]¤Î¾®ÆÁ¼Ô",
+ fprintf(OutFile,"[%s]¤Î¾®ÆÁ¼Ô",
#else
- fprintf(OutFile,"You are somewhat virtuous in %s.",
+ fprintf(OutFile,"You are somewhat virtuous in %s.",
#endif
- v_name);
- else if (tester < 40)
+ v_name);
+ else if (tester < 40)
#ifdef JP
- fprintf(OutFile,"[%s]¤ÎÃæÆÁ¼Ô",
+ fprintf(OutFile,"[%s]¤ÎÃæÆÁ¼Ô",
#else
- fprintf(OutFile,"You are virtuous in %s.",
+ fprintf(OutFile,"You are virtuous in %s.",
#endif
- v_name);
- else if (tester < 60)
+ v_name);
+ else if (tester < 60)
#ifdef JP
- fprintf(OutFile,"[%s]¤Î¹âÆÁ¼Ô",
+ fprintf(OutFile,"[%s]¤Î¹âÆÁ¼Ô",
#else
- fprintf(OutFile,"You are very virtuous in %s.",
+ fprintf(OutFile,"You are very virtuous in %s.",
#endif
- v_name);
- else if (tester < 80)
+ v_name);
+ else if (tester < 80)
#ifdef JP
- fprintf(OutFile,"[%s]¤ÎÇƼÔ",
+ fprintf(OutFile,"[%s]¤ÎÇƼÔ",
#else
- fprintf(OutFile,"You are a champion of %s.",
+ fprintf(OutFile,"You are a champion of %s.",
#endif
- v_name);
- else if (tester < 100)
+ v_name);
+ else if (tester < 100)
#ifdef JP
- fprintf(OutFile,"[%s]¤Î°ÎÂç¤ÊÇƼÔ",
+ fprintf(OutFile,"[%s]¤Î°ÎÂç¤ÊÇƼÔ",
#else
- fprintf(OutFile,"You are a great champion of %s.",
+ fprintf(OutFile,"You are a great champion of %s.",
#endif
- v_name);
- else
+ v_name);
+ else
#ifdef JP
- fprintf(OutFile,"[%s]¤Î¶ñ¸½¼Ô",
+ fprintf(OutFile,"[%s]¤Î¶ñ¸½¼Ô",
#else
- fprintf(OutFile,"You are the living embodiment of %s.",
+ fprintf(OutFile,"You are the living embodiment of %s.",
#endif
- v_name);
+ v_name);
- fprintf(OutFile, "\n");
- }
+ fprintf(OutFile, "\n");
+ }
}
#ifdef JP
- {"»³ÍÓ¤ÎÄý¤¬¤¢¤ê¤Þ¤¹¡£", 50, 133, 0, 50 },
- {"¿Í´Ö¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 75, 133, 0, 50 },
- {"Ä»¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 85, 133, 0, 50 },
- {"à¨ÃîÎà¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£",90, 133, 0, 50 },
- {"µí¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 95, 133, 0, 50 },
- {"ǤΤ¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 97, 133, 0, 50 },
- {"¸¤¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 100, 133, 0, 50 },
+ {"»³ÍÓ¤ÎÄý¤¬¤¢¤ê¤Þ¤¹¡£", 50, 133, 0, 50 },
+ {"¿Í´Ö¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 75, 133, 0, 50 },
+ {"Ä»¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 85, 133, 0, 50 },
+ {"à¨ÃîÎà¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£",90, 133, 0, 50 },
+ {"µí¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 95, 133, 0, 50 },
+ {"ǤΤ¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 97, 133, 0, 50 },
+ {"¸¤¤Î¤¬À¸¤¨¤Æ¤¤¤Þ¤¹¡£", 100, 133, 0, 50 },
- {"¤¢¤Ê¤¿¤Ï", 100, 134, 120, 50 },
+ {"¤¢¤Ê¤¿¤Ï", 100, 134, 120, 50 },
#else
{"and the hooves of a goat.", 50, 133, 0, 50 },
{"and human feet.", 75, 133, 0, 50 },
screen_save();
/* Peruse the help file */
- (void)show_file(TRUE, helpfile, NULL, 0, 0);
+ (void)show_file(TRUE, helpfile, NULL, 0, 0);
/* Load screen */
screen_load();
}
else k = -1;
if (c == '?')
- {
+ {
#ifdef JP
- show_help("jmagic.txt#MagicRealms");
+ show_help("jmagic.txt#MagicRealms");
#else
- show_help("magic.txt#MagicRealms");
+ show_help("magic.txt#MagicRealms");
#endif
- }
+ }
else if (c == '=')
{
screen_save();
*/
static bool get_player_realms(void)
{
- int i, count;
+ int i, count;
/* Clean up infomation of modifications */
put_str(" ", 3, 40);
(void)inkey();
prt("", 0, 0);
break;
- }
+ }
else
#ifdef JP
- if (get_check("¤è¤í¤·¤¤¤Ç¤¹¤«¡©")) break;
+ if (get_check("¤è¤í¤·¤¤¤Ç¤¹¤«¡©")) break;
#else
- if (get_check("Are you sure? ")) break;
+ if (get_check("Are you sure? ")) break;
#endif
}
#ifdef JP
else if (get_check("¤è¤í¤·¤¤¤Ç¤¹¤«¡©")) break;
#else
- else if (get_check("Are you sure? ")) break;
+ else if (get_check("Are you sure? ")) break;
#endif
}
if (p_ptr->realm2)
while ((n > 0) && (s[n-1] == ' ')) s[--n] = '\0';
{
- char temp[64*4];
- roff_to_buf(s, 60, temp);
- t = temp;
- for(i=0 ; i<4 ; i++){
- if(t[0]==0)break;
- else {strcpy(p_ptr->history[i], t);t += strlen(t)+1;}
- }
+ char temp[64*4];
+ roff_to_buf(s, 60, temp);
+ t = temp;
+ for(i=0 ; i<4 ; i++){
+ if(t[0]==0)break;
+ else {strcpy(p_ptr->history[i], t);t += strlen(t)+1;}
+ }
}
}
/* Assume no cheating */
p_ptr->noscore = 0;
- p_ptr->wizard = FALSE;
+ p_ptr->wizard = FALSE;
/* Not waiting to report score */
p_ptr->wait_report_score = FALSE;
p_ptr->pet_follow_distance = PET_FOLLOW_DIST;
p_ptr->pet_extra_flags = (PF_TELEPORT | PF_ATTACK_SPELL | PF_SUMMON_SPELL);
- /* Wipe the recall depths */
- for (i = 0; i < max_d_idx; i++)
- {
+ /* Wipe the recall depths */
+ for (i = 0; i < max_d_idx; i++)
+ {
max_dlv[i] = 0;
- }
+ }
p_ptr->visit = 1;
- /* Reset wild_mode to FALSE */
- p_ptr->wild_mode = FALSE;
+ /* Reset wild_mode to FALSE */
+ p_ptr->wild_mode = FALSE;
for (i = 0; i < 108; i++)
{
}
else k = -1;
if (c == '?')
- {
+ {
#ifdef JP
- show_help("jraceclas.txt#TheRaces");
+ show_help("jraceclas.txt#TheRaces");
#else
- show_help("raceclas.txt#TheRaces");
+ show_help("raceclas.txt#TheRaces");
#endif
- }
+ }
else if (c == '=')
{
screen_save();
}
else k = -1;
if (c == '?')
- {
+ {
#ifdef JP
- show_help("jraceclas.txt#TheClasses");
+ show_help("jraceclas.txt#TheClasses");
#else
- show_help("raceclas.txt#TheClasses");
+ show_help("raceclas.txt#TheClasses");
#endif
- }
+ }
else if (c == '=')
{
screen_save();
}
else k = -1;
if (c == '?')
- {
+ {
#ifdef JP
- show_help("jraceclas.txt#ThePersonalities");
+ show_help("jraceclas.txt#ThePersonalities");
#else
- show_help("raceclas.txt#ThePersonalities");
+ show_help("raceclas.txt#ThePersonalities");
#endif
- }
+ }
else if (c == '=')
{
screen_save();
c = inkey();
switch ( c ){
case 'Q':
- birth_quit();
+ birth_quit();
break;
case 'S':
- return (FALSE);
+ return (FALSE);
break;
case ESCAPE:
- break;
+ break;
case ' ':
case '\r':
case '\n':
}
break;
case '?':
- {
+ {
#ifdef JP
- show_help("jbirth.txt#AutoRoller");
+ show_help("jbirth.txt#AutoRoller");
#else
- show_help("birth.txt#AutoRoller");
+ show_help("birth.txt#AutoRoller");
#endif
- }
+ }
break;
case '=':
screen_save();
screen_load();
break;
default:
- bell();
+ bell();
break;
}
if(c == ESCAPE || ((c == ' ' || c == '\r' || c == '\n') && cs == 6))break;
break;
case '?':
#ifdef JP
- show_help("jbirth.txt#AutoRoller");
+ show_help("jbirth.txt#AutoRoller");
#else
- show_help("birth.txt#AutoRoller");
+ show_help("birth.txt#AutoRoller");
#endif
break;
case '=':
*/
static void edit_history(void)
{
- char old_history[4][60];
+ char old_history[4][60];
char c;
int y = 0, x = 0;
int i, j;
- /* Edit character background */
- for (i = 0; i < 4; i++)
- {
- sprintf(old_history[i], "%s", p_ptr->history[i]);
- }
- /* Turn 0 to space */
+ /* Edit character background */
+ for (i = 0; i < 4; i++)
+ {
+ sprintf(old_history[i], "%s", p_ptr->history[i]);
+ }
+ /* Turn 0 to space */
for (i = 0; i < 4; i++)
{
for (j = 0; p_ptr->history[i][j]; j++) /* loop */;
for (; j < 59; j++) p_ptr->history[i][j] = ' ';
p_ptr->history[i][59] = '\0';
}
- display_player(1);
+ display_player(1);
#ifdef JP
- c_put_str(TERM_L_GREEN, "(¥¥ã¥é¥¯¥¿¡¼¤ÎÀ¸¤¤Î©¤Á - ÊÔ½¸¥â¡¼¥É)", 11, 20);
+ c_put_str(TERM_L_GREEN, "(¥¥ã¥é¥¯¥¿¡¼¤ÎÀ¸¤¤Î©¤Á - ÊÔ½¸¥â¡¼¥É)", 11, 20);
#else
- c_put_str(TERM_L_GREEN, "(Character Background - Edit Mode)", 11, 20);
+ c_put_str(TERM_L_GREEN, "(Character Background - Edit Mode)", 11, 20);
#endif
- while (TRUE)
- {
- for (i = 0; i < 4; i++)
- {
- put_str(p_ptr->history[i], i + 12, 10);
- }
+ while (TRUE)
+ {
+ for (i = 0; i < 4; i++)
+ {
+ put_str(p_ptr->history[i], i + 12, 10);
+ }
#ifdef JP
if (iskanji2(p_ptr->history[y], x))
c_put_str(TERM_L_BLUE, format("%c%c", p_ptr->history[y][x],p_ptr->history[y][x+1]), y + 12, x + 10);
else
#endif
- c_put_str(TERM_L_BLUE, format("%c", p_ptr->history[y][x]), y + 12, x + 10);
+ c_put_str(TERM_L_BLUE, format("%c", p_ptr->history[y][x]), y + 12, x + 10);
/* Place cursor just after cost of current stat */
- Term_gotoxy(x + 10, y + 12);
+ Term_gotoxy(x + 10, y + 12);
- c = inkey();
+ c = inkey();
- if (c == '8')
- {
- y--;
- if (y < 0) y = 3;
+ if (c == '8')
+ {
+ y--;
+ if (y < 0) y = 3;
#ifdef JP
if ((x > 0) && (iskanji2(p_ptr->history[y], x-1))) x--;
#endif
- }
- else if (c == '2')
- {
- y++;
- if (y > 3) y = 0;
+ }
+ else if (c == '2')
+ {
+ y++;
+ if (y > 3) y = 0;
#ifdef JP
if ((x > 0) && (iskanji2(p_ptr->history[y], x-1))) x--;
#endif
- }
- else if (c == '6')
- {
+ }
+ else if (c == '6')
+ {
#ifdef JP
if (iskanji2(p_ptr->history[y], x)) x++;
#endif
- x++;
- if (x > 58)
+ x++;
+ if (x > 58)
{
x = 0;
if (y < 3) y++;
}
- }
- else if (c == '4')
- {
- x--;
+ }
+ else if (c == '4')
+ {
+ x--;
if (x < 0)
{
if (y)
#ifdef JP
if ((x > 0) && (iskanji2(p_ptr->history[y], x-1))) x--;
#endif
- }
- else if (c == '\r')
- {
- break;
- }
- else if (c == ESCAPE)
- {
- for (i = 0; i < 4; i++)
- {
- sprintf(p_ptr->history[i], "%s", old_history[i]);
- put_str(p_ptr->history[i], i + 12, 10);
- }
- break;
- }
+ }
+ else if (c == '\r')
+ {
+ break;
+ }
+ else if (c == ESCAPE)
+ {
+ for (i = 0; i < 4; i++)
+ {
+ sprintf(p_ptr->history[i], "%s", old_history[i]);
+ put_str(p_ptr->history[i], i + 12, 10);
+ }
+ break;
+ }
else if (c == '\010')
{
x--;
else x = 0;
}
- p_ptr->history[y][x] = ' ';
+ p_ptr->history[y][x] = ' ';
#ifdef JP
if ((x > 0) && (iskanji2(p_ptr->history[y], x - 1)))
{
#ifdef JP
else if (iskanji(c) || isprint(c))
#else
- else if (isprint(c)) /* BUGFIX */
+ else if (isprint(c)) /* BUGFIX */
#endif
- {
+ {
#ifdef JP
if (iskanji2(p_ptr->history[y], x))
{
c = inkey();
}
#endif
- p_ptr->history[y][x++] = c;
+ p_ptr->history[y][x++] = c;
if (x > 58)
{
x = 0;
y++;
if (y > 3) y = 0;
}
- }
- } /* while (TRUE) */
+ }
+ } /* while (TRUE) */
}
/* 0 to 10 random quests */
number_of_quests = randint0(11);
}
- else if (inp[0] == '?')
- {
+ else if (inp[0] == '?')
+ {
#ifdef JP
- show_help("jbirth.txt#RandomQuests");
+ show_help("jbirth.txt#RandomQuests");
#else
- show_help("birth.txt#RandomQuests");
+ show_help("birth.txt#RandomQuests");
#endif
- continue;
- }
+ continue;
+ }
else
{
number_of_quests = atoi(inp);
/* Roll for age/height/weight */
get_ahw();
- /* Roll for social class */
+ /* Roll for social class */
get_history();
break;
if (c == '?')
{
#ifdef JP
- show_help("jbirth.txt#AutoRoller");
+ show_help("jbirth.txt#AutoRoller");
#else
- show_help("birth.txt#AutoRoller");
+ show_help("birth.txt#AutoRoller");
#endif
continue;
}
*/
static bool ask_quick_start(void)
{
- /* Doesn't have previous data */
+ /* Doesn't have previous data */
if (!previous_char.quick_ok) return FALSE;
/* Clear screen */
Term_clear();
- /* Extra info */
+ /* Extra info */
#ifdef JP
- put_str("¥¯¥¤¥Ã¥¯¡¦¥¹¥¿¡¼¥È¤ò»È¤¦¤È°ÊÁ°¤ÈÁ´¤¯Æ±¤¸¥¥ã¥é¥¯¥¿¡¼¤Ç»Ï¤á¤é¤ì¤Þ¤¹¡£", 11, 5);
+ put_str("¥¯¥¤¥Ã¥¯¡¦¥¹¥¿¡¼¥È¤ò»È¤¦¤È°ÊÁ°¤ÈÁ´¤¯Æ±¤¸¥¥ã¥é¥¯¥¿¡¼¤Ç»Ï¤á¤é¤ì¤Þ¤¹¡£", 11, 5);
#else
- put_str("Do you want to use the quick start function(same character as your last one).", 11, 2);
+ put_str("Do you want to use the quick start function(same character as your last one).", 11, 2);
#endif
- /* Choose */
- while (1)
- {
- char c;
+ /* Choose */
+ while (1)
+ {
+ char c;
#ifdef JP
- put_str("¥¯¥¤¥Ã¥¯¡¦¥¹¥¿¡¼¥È¤ò»È¤¤¤Þ¤¹¤«¡©[y/n]", 14, 10);
+ put_str("¥¯¥¤¥Ã¥¯¡¦¥¹¥¿¡¼¥È¤ò»È¤¤¤Þ¤¹¤«¡©[y/n]", 14, 10);
#else
- put_str("Use quick start? [y/n]", 14, 10);
+ put_str("Use quick start? [y/n]", 14, 10);
#endif
- c = inkey();
+ c = inkey();
- if (c == 'Q') quit(NULL);
- else if (c == 'S') return (FALSE);
- else if (c == '?')
- {
+ if (c == 'Q') quit(NULL);
+ else if (c == 'S') return (FALSE);
+ else if (c == '?')
+ {
#ifdef JP
- show_help("jbirth.txt#QuickStart");
+ show_help("jbirth.txt#QuickStart");
#else
- show_help("birth.txt#QuickStart");
+ show_help("birth.txt#QuickStart");
#endif
- }
- else if ((c == 'y') || (c == 'Y'))
- {
- /* Yes */
- break;
- }
- else
- {
- /* No */
- return FALSE;
- }
- }
+ }
+ else if ((c == 'y') || (c == 'Y'))
+ {
+ /* Yes */
+ break;
+ }
+ else
+ {
+ /* No */
+ return FALSE;
+ }
+ }
- load_prev_data(FALSE);
- init_dungeon_quests(previous_char.quests);
- init_turn();
+ load_prev_data(FALSE);
+ init_dungeon_quests(previous_char.quests);
+ init_turn();
- sp_ptr = &sex_info[p_ptr->psex];
- rp_ptr = &race_info[p_ptr->prace];
- cp_ptr = &class_info[p_ptr->pclass];
- mp_ptr = &m_info[p_ptr->pclass];
- ap_ptr = &seikaku_info[p_ptr->pseikaku];
+ sp_ptr = &sex_info[p_ptr->psex];
+ rp_ptr = &race_info[p_ptr->prace];
+ cp_ptr = &class_info[p_ptr->pclass];
+ mp_ptr = &m_info[p_ptr->pclass];
+ ap_ptr = &seikaku_info[p_ptr->pseikaku];
- /* Calc hitdie, but don't roll */
- get_extra(FALSE);
+ /* Calc hitdie, but don't roll */
+ get_extra(FALSE);
- /* Calculate the bonuses and hitpoints */
- p_ptr->update |= (PU_BONUS | PU_HP);
+ /* Calculate the bonuses and hitpoints */
+ p_ptr->update |= (PU_BONUS | PU_HP);
- /* Update stuff */
- update_stuff();
+ /* Update stuff */
+ update_stuff();
- /* Fully healed */
- p_ptr->chp = p_ptr->mhp;
+ /* Fully healed */
+ p_ptr->chp = p_ptr->mhp;
- /* Fully rested */
- p_ptr->csp = p_ptr->msp;
+ /* Fully rested */
+ p_ptr->csp = p_ptr->msp;
- /* Process the player name */
- process_player_name(FALSE);
+ /* Process the player name */
+ process_player_name(FALSE);
- return TRUE;
+ return TRUE;
}
int i, j;
char buf[80];
- playtime = 0;
+ playtime = 0;
/*
* Wipe monsters in old dungeon
*/
wipe_m_list();
- /* Wipe the player */
- player_wipe();
+ /* Wipe the player */
+ player_wipe();
/* Create a new character */
- /* Quick start? */
- if (!ask_quick_start())
- {
- /* No, normal start */
- while (1)
- {
- /* Roll up a new character */
- if (player_birth_aux()) break;
-
- /* Wipe the player */
- player_wipe();
- }
- }
+ /* Quick start? */
+ if (!ask_quick_start())
+ {
+ /* No, normal start */
+ while (1)
+ {
+ /* Roll up a new character */
+ if (player_birth_aux()) break;
+
+ /* Wipe the player */
+ player_wipe();
+ }
+ }
/* Note player birth in the message recall */
message_add(" ");
joker_is_used = FALSE;
for (i = 0; i < 5; i++)
{
- if (!find_card_num(lowest + i)){
+ if (!find_card_num(lowest + i)){
if( have_joker() && !joker_is_used )
joker_is_used = TRUE;
else
power = r_ptr->level + 10;
#ifdef JP
- if (0)
+ if (0)
#else
if (!(r_ptr->flags1 & RF1_UNIQUE))
#endif
if (saving_throw(p_ptr->skill_sav * 100 / power))
{
#ifdef JP
- msg_format("Ì´¤ÎÃæ¤Ç%s¤ËÄɤ¤¤«¤±¤é¤ì¤¿¡£", m_name);
+ msg_format("Ì´¤ÎÃæ¤Ç%s¤ËÄɤ¤¤«¤±¤é¤ì¤¿¡£", m_name);
#else
- msg_format("%^s chases you through your dreams.", m_name);
+ msg_format("%^s chases you through your dreams.", m_name);
#endif
* the current +dam of the player.
*/
static void compare_weapon_aux2(object_type *o_ptr, int numblows,
- int r, int c, int mult, cptr attr,
+ int r, int c, int mult, cptr attr,
byte color)
{
char tmp_str[80];
static bool eval_ac(int iAC)
{
#ifdef JP
- const char memo[] =
- "¥À¥á¡¼¥¸·Ú¸ºÎ¨¤È¤Ï¡¢Å¨¤Î¹¶·â¤¬Åö¤¿¤Ã¤¿»þ¤½¤Î¥À¥á¡¼¥¸¤ò\n"
- "²¿¥Ñ¡¼¥»¥ó¥È·Ú¸º¤¹¤ë¤«¤ò¼¨¤·¤Þ¤¹¡£\n"
- "¥À¥á¡¼¥¸·Ú¸º¤ÏÄ̾ï¤ÎľÀܹ¶·â(¼ïÎब¡Ö¹¶·â¤¹¤ë¡×¤È¡ÖÊ´ºÕ¤¹¤ë¡×¤Îʪ)\n"
- "¤ËÂФ·¤Æ¤Î¤ß¸ú²Ì¤¬¤¢¤ê¤Þ¤¹¡£\n \n"
- "Ũ¤Î¥ì¥Ù¥ë¤È¤Ï¡¢¤½¤ÎŨ¤¬Ä̾ﲿ³¬¤Ë¸½¤ì¤ë¤«¤ò¼¨¤·¤Þ¤¹¡£\n \n"
- "²óÈòΨ¤ÏŨ¤ÎľÀܹ¶·â¤ò²¿¥Ñ¡¼¥»¥ó¥È¤Î³ÎΨ¤ÇÈò¤±¤ë¤«¤ò¼¨¤·¡¢\n"
- "Ũ¤Î¥ì¥Ù¥ë¤È¤¢¤Ê¤¿¤ÎAC¤Ë¤è¤Ã¤Æ·èÄꤵ¤ì¤Þ¤¹¡£\n \n"
- "¥À¥á¡¼¥¸´üÂÔÃͤȤϡ¢Å¨¤Î£±£°£°¥Ý¥¤¥ó¥È¤ÎÄ̾ﹶ·â¤ËÂФ·¡¢\n"
- "²óÈòΨ¤È¥À¥á¡¼¥¸·Ú¸ºÎ¨¤ò¹Íθ¤·¤¿¥À¥á¡¼¥¸¤Î´üÂÔÃͤò¼¨¤·¤Þ¤¹¡£\n";
-#else
- const char memo[] =
- "'Protection Rate' means how much damage is reduced by your armor.\n"
- "Note that the Protection rate is effective only against normal "
- "'attack' and 'shatter' type melee attacks, "
- "and has no effect against any other types such as 'poison'.\n \n"
- "'Dodge Rate' indicates the success rate on dodging the "
- "monster's melee attacks. "
- "It is depend on the level of the monster and your AC.\n \n"
- "'Average Damage' indicates the expected amount of damage "
- "when you are attacked by normal melee attacks with power=100.";
-#endif
-
- int protection;
- int col, row = 2;
- int lvl, i;
- char buf[80*20], *t;
+ const char memo[] =
+ "¥À¥á¡¼¥¸·Ú¸ºÎ¨¤È¤Ï¡¢Å¨¤Î¹¶·â¤¬Åö¤¿¤Ã¤¿»þ¤½¤Î¥À¥á¡¼¥¸¤ò\n"
+ "²¿¥Ñ¡¼¥»¥ó¥È·Ú¸º¤¹¤ë¤«¤ò¼¨¤·¤Þ¤¹¡£\n"
+ "¥À¥á¡¼¥¸·Ú¸º¤ÏÄ̾ï¤ÎľÀܹ¶·â(¼ïÎब¡Ö¹¶·â¤¹¤ë¡×¤È¡ÖÊ´ºÕ¤¹¤ë¡×¤Îʪ)\n"
+ "¤ËÂФ·¤Æ¤Î¤ß¸ú²Ì¤¬¤¢¤ê¤Þ¤¹¡£\n \n"
+ "Ũ¤Î¥ì¥Ù¥ë¤È¤Ï¡¢¤½¤ÎŨ¤¬Ä̾ﲿ³¬¤Ë¸½¤ì¤ë¤«¤ò¼¨¤·¤Þ¤¹¡£\n \n"
+ "²óÈòΨ¤ÏŨ¤ÎľÀܹ¶·â¤ò²¿¥Ñ¡¼¥»¥ó¥È¤Î³ÎΨ¤ÇÈò¤±¤ë¤«¤ò¼¨¤·¡¢\n"
+ "Ũ¤Î¥ì¥Ù¥ë¤È¤¢¤Ê¤¿¤ÎAC¤Ë¤è¤Ã¤Æ·èÄꤵ¤ì¤Þ¤¹¡£\n \n"
+ "¥À¥á¡¼¥¸´üÂÔÃͤȤϡ¢Å¨¤Î£±£°£°¥Ý¥¤¥ó¥È¤ÎÄ̾ﹶ·â¤ËÂФ·¡¢\n"
+ "²óÈòΨ¤È¥À¥á¡¼¥¸·Ú¸ºÎ¨¤ò¹Íθ¤·¤¿¥À¥á¡¼¥¸¤Î´üÂÔÃͤò¼¨¤·¤Þ¤¹¡£\n";
+#else
+ const char memo[] =
+ "'Protection Rate' means how much damage is reduced by your armor.\n"
+ "Note that the Protection rate is effective only against normal "
+ "'attack' and 'shatter' type melee attacks, "
+ "and has no effect against any other types such as 'poison'.\n \n"
+ "'Dodge Rate' indicates the success rate on dodging the "
+ "monster's melee attacks. "
+ "It is depend on the level of the monster and your AC.\n \n"
+ "'Average Damage' indicates the expected amount of damage "
+ "when you are attacked by normal melee attacks with power=100.";
+#endif
+
+ int protection;
+ int col, row = 2;
+ int lvl, i;
+ char buf[80*20], *t;
+
+ /* AC lower than zero has no effect */
+ if (iAC < 0) iAC = 0;
+
+ /* ¥À¥á¡¼¥¸·Ú¸ºÎ¨¤ò·×»» */
+ protection = 100 * MIN(iAC, 150) / 250;
- /* AC lower than zero has no effect */
- if (iAC < 0) iAC = 0;
-
- /* ¥À¥á¡¼¥¸·Ú¸ºÎ¨¤ò·×»» */
- protection = 100 * MIN(iAC, 150) / 250;
-
- screen_save();
- clear_bldg(0, 22);
+ screen_save();
+ clear_bldg(0, 22);
#ifdef JP
- put_str(format("¤¢¤Ê¤¿¤Î¸½ºß¤ÎAC: %3d", iAC), row++, 0);
- put_str(format("¥À¥á¡¼¥¸·Ú¸ºÎ¨ : %3d%%", protection), row++, 0);
- row++;
+ put_str(format("¤¢¤Ê¤¿¤Î¸½ºß¤ÎAC: %3d", iAC), row++, 0);
+ put_str(format("¥À¥á¡¼¥¸·Ú¸ºÎ¨ : %3d%%", protection), row++, 0);
+ row++;
- put_str("Ũ¤Î¥ì¥Ù¥ë :", row + 0, 0);
- put_str("²óÈòΨ :", row + 1, 0);
- put_str("¥À¥á¡¼¥¸´üÂÔÃÍ :", row + 2, 0);
+ put_str("Ũ¤Î¥ì¥Ù¥ë :", row + 0, 0);
+ put_str("²óÈòΨ :", row + 1, 0);
+ put_str("¥À¥á¡¼¥¸´üÂÔÃÍ :", row + 2, 0);
#else
- put_str(format("Your current AC : %3d", iAC), row++, 0);
- put_str(format("Protection rate : %3d%%", protection), row++, 0);
- row++;
+ put_str(format("Your current AC : %3d", iAC), row++, 0);
+ put_str(format("Protection rate : %3d%%", protection), row++, 0);
+ row++;
- put_str("Level of Monster:", row + 0, 0);
- put_str("Dodge Rate :", row + 1, 0);
- put_str("Average Damage :", row + 2, 0);
+ put_str("Level of Monster:", row + 0, 0);
+ put_str("Dodge Rate :", row + 1, 0);
+ put_str("Average Damage :", row + 2, 0);
#endif
- for (col = 17 + 1, lvl = 0; lvl <= 100; lvl += 10, col += 5)
- {
- int quality = 60 + lvl * 3; /* attack quality with power 60 */
- int dodge; /* ²óÈòΨ(%) */
- int average; /* ¥À¥á¡¼¥¸´üÂÔÃÍ */
- float rateA,rateR=0.0;
- float damage;
- char tmp_str[100];
-
- put_str(format("%3d", lvl), row + 0, col);
-
- /* ²óÈòΨ¤ò·×»» */
- dodge = 5 + (MIN(100, 100 * (iAC * 3 / 4) / quality) * 9 + 5) / 10;
- put_str(format("%3d%%", dodge), row + 1, col);
-
- /* 100ÅÀ¤Î¹¶·â¤ËÂФ·¤Æ¤Î¥À¥á¡¼¥¸´üÂÔÃͤò·×»» */
- average = (100 - dodge) * (100 - protection) / 100;
- put_str(format("%3d", average), row + 2, col);
- }
+ for (col = 17 + 1, lvl = 0; lvl <= 100; lvl += 10, col += 5)
+ {
+ int quality = 60 + lvl * 3; /* attack quality with power 60 */
+ int dodge; /* ²óÈòΨ(%) */
+ int average; /* ¥À¥á¡¼¥¸´üÂÔÃÍ */
+ float rateA,rateR=0.0;
+ float damage;
+ char tmp_str[100];
+
+ put_str(format("%3d", lvl), row + 0, col);
+
+ /* ²óÈòΨ¤ò·×»» */
+ dodge = 5 + (MIN(100, 100 * (iAC * 3 / 4) / quality) * 9 + 5) / 10;
+ put_str(format("%3d%%", dodge), row + 1, col);
+
+ /* 100ÅÀ¤Î¹¶·â¤ËÂФ·¤Æ¤Î¥À¥á¡¼¥¸´üÂÔÃͤò·×»» */
+ average = (100 - dodge) * (100 - protection) / 100;
+ put_str(format("%3d", average), row + 2, col);
+ }
- /* Display note */
- roff_to_buf(memo, 70, buf);
- for (t = buf; t[0]; t += strlen(t) + 1)
- put_str(t, (row++) + 4, 4);
+ /* Display note */
+ roff_to_buf(memo, 70, buf);
+ for (t = buf; t[0]; t += strlen(t) + 1)
+ put_str(t, (row++) + 4, 4);
#ifdef JP
- prt("¸½ºß¤Î¤¢¤Ê¤¿¤ÎÁõÈ÷¤«¤é¤¹¤ë¤È¡¢¤¢¤Ê¤¿¤ÎËɸæÎϤÏ"
- "¤³¤ì¤¯¤é¤¤¤Ç¤¹:", 0, 0);
+ prt("¸½ºß¤Î¤¢¤Ê¤¿¤ÎÁõÈ÷¤«¤é¤¹¤ë¤È¡¢¤¢¤Ê¤¿¤ÎËɸæÎϤÏ"
+ "¤³¤ì¤¯¤é¤¤¤Ç¤¹:", 0, 0);
#else
- prt("Defense abilities from your current Armor Class are evaluated below.", 0, 0);
+ prt("Defense abilities from your current Armor Class are evaluated below.", 0, 0);
#endif
- flush();
- (void)inkey();
- screen_load();
+ flush();
+ (void)inkey();
+ screen_load();
- /* Done */
- return (TRUE);
+ /* Done */
+ return (TRUE);
}
charges = get_quantity(format("Add how many charges for %d gold? ",
#endif
- price), MIN(p_ptr->au / price, max_charges));
+ price), MIN(p_ptr->au / price, max_charges));
/* Do nothing */
if (charges < 1) return;
/* Display some info */
- msg_flag = FALSE;
+ msg_flag = FALSE;
clear_bldg(4, 18);
#ifdef JP
prt(" ºÆ½¼Å¶¤ÎÈñÍѤϥ¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤ê¤Þ¤¹¡£", 6, 0);
{
/* Unique */
- /* Hack -- "unique" monsters must be "unique" */
- if ((r_ptr->flags1 & RF1_UNIQUE) &&
- (0 == r_ptr->max_num))
- {
+ /* Hack -- "unique" monsters must be "unique" */
+ if ((r_ptr->flags1 & RF1_UNIQUE) &&
+ (0 == r_ptr->max_num))
+ {
#ifdef JP
- msg_print("¤³¤Î³¬¤Ï°ÊÁ°¤Ï狼¤Ë¤è¤Ã¤Æ¼é¤é¤ì¤Æ¤¤¤¿¤è¤¦¤À¡Ä¡£");
+ msg_print("¤³¤Î³¬¤Ï°ÊÁ°¤Ï狼¤Ë¤è¤Ã¤Æ¼é¤é¤ì¤Æ¤¤¤¿¤è¤¦¤À¡Ä¡£");
#else
- msg_print("It seems that this level was protected by someone before...");
+ msg_print("It seems that this level was protected by someone before...");
#endif
- /* The unique is already dead */
- quest[q_idx].status = QUEST_STATUS_FINISHED;
- }
- else
- {
+ /* The unique is already dead */
+ quest[q_idx].status = QUEST_STATUS_FINISHED;
+ }
+ else
+ {
#ifdef JP
- msg_format("Ãí°Õ¤»¤è¡ª¤³¤Î³¬¤Ï%s¤Ë¤è¤Ã¤Æ¼é¤é¤ì¤Æ¤¤¤ë¡ª", name);
+ msg_format("Ãí°Õ¤»¤è¡ª¤³¤Î³¬¤Ï%s¤Ë¤è¤Ã¤Æ¼é¤é¤ì¤Æ¤¤¤ë¡ª", name);
#else
- msg_format("Beware, this level is protected by %s!", name);
+ msg_format("Beware, this level is protected by %s!", name);
#endif
- }
+ }
}
else
{
case FEAT_TRAP_SLEEP:
case FEAT_TRAP_TRAPS:
case FEAT_TRAP_ALARM:
- case FEAT_TRAP_OPEN:
- case FEAT_TRAP_ARMAGEDDON:
- case FEAT_TRAP_PIRANHA:
+ case FEAT_TRAP_OPEN:
+ case FEAT_TRAP_ARMAGEDDON:
+ case FEAT_TRAP_PIRANHA:
{
/* A trap */
return (TRUE);
*/
bool is_known_trap(cave_type *c_ptr)
{
- if (!c_ptr->mimic && is_trap(c_ptr->feat)) return TRUE;
- else return FALSE;
+ if (!c_ptr->mimic && is_trap(c_ptr->feat)) return TRUE;
+ else return FALSE;
}
*/
bool is_closed_door(int feat)
{
- return (feat >= FEAT_DOOR_HEAD && feat <= FEAT_DOOR_TAIL);
+ return (feat >= FEAT_DOOR_HEAD && feat <= FEAT_DOOR_TAIL);
}
*/
bool is_hidden_door(cave_type *c_ptr)
{
- if (c_ptr->mimic &&
- is_closed_door(c_ptr->feat))
- return TRUE;
- else
- return FALSE;
+ if (c_ptr->mimic &&
+ is_closed_door(c_ptr->feat))
+ return TRUE;
+ else
+ return FALSE;
}
/* Use "dark gray" */
a = TERM_L_DARK;
}
- }
+ }
/* Handle "torch-lit" grids */
else if (c_ptr->info & (CAVE_LITE | CAVE_MNLT))
{
- /* Torch lite */
- if (view_yellow_lite && !p_ptr->wild_mode)
- {
+ /* Torch lite */
+ if (view_yellow_lite && !p_ptr->wild_mode)
+ {
if (use_graphics)
{
/*
}
}
- /* Handle "dark" grids */
- else if (!(c_ptr->info & CAVE_GLOW))
- {
+ /* Handle "dark" grids */
+ else if (!(c_ptr->info & CAVE_GLOW))
+ {
if (use_graphics)
{
/*
/* Use "dark gray" */
a = TERM_L_DARK;
}
- }
+ }
/* Handle "out-of-sight" grids */
else if (!(c_ptr->info & CAVE_VIEW))
}
}
- /* "Simple Lighting" */
- else
- {
- /* Handle "blind" */
- if (!(c_ptr->info & CAVE_MARK))
- {
+ /* "Simple Lighting" */
+ else
+ {
+ /* Handle "blind" */
+ if (!(c_ptr->info & CAVE_MARK))
+ {
/* Unsafe cave grid -- idea borrowed from Unangband */
if (view_unsafe_grids && (c_ptr->info & (CAVE_UNSAFE)))
feat = FEAT_UNDETECTD;
else
feat = FEAT_NONE;
- }
+ }
- /* Access feature */
- f_ptr = &f_info[feat];
+ /* Access feature */
+ f_ptr = &f_info[feat];
- /* Normal attr */
- a = f_ptr->x_attr;
+ /* Normal attr */
+ a = f_ptr->x_attr;
- /* Normal char */
- c = f_ptr->x_char;
- }
- }
+ /* Normal char */
+ c = f_ptr->x_char;
+ }
+ }
if (feat_priority == -1)
{
int hgt, wid, yrat, xrat;
- int **match_autopick_yx;
+ int **match_autopick_yx;
object_type ***object_autopick_yx;
/* Get size */
}
- for (y = 1; y < hgt + 1; ++y)
+ for (y = 1; y < hgt + 1; ++y)
{
match_autopick = -1;
for (x = 1; x <= wid; x++){
C_FREE(bigmp[y], (cur_wid + 2), byte);
}
- /* Free each line map */
+ /* Free each line map */
C_FREE(bigma, (cur_hgt + 2), byte_ptr);
C_FREE(bigmc, (cur_hgt + 2), char_ptr);
C_FREE(bigmp, (cur_hgt + 2), byte_ptr);
/* Clear the screen */
Term_clear();
- display_autopick = 0;
+ display_autopick = 0;
/* Display the map */
display_map(&cy, &cx);
/* Wait for it */
- if(max_autopick && !p_ptr->wild_mode)
+ if(max_autopick && !p_ptr->wild_mode)
{
display_autopick = ITEM_DISPLAY;
c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* All non-walls are "checked" */
if ((feat <= FEAT_DOOR_TAIL) ||
{
c_ptr = &cave[y + ddy_ddd[i]][x + ddx_ddd[i]];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Memorize walls (etc) */
if ((feat >= FEAT_RUBBLE) && (feat != FEAT_DIRT) && (feat != FEAT_GRASS))
{
cave_type *c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Process all non-walls */
if (cave_floor_bold(y, x) || (feat == FEAT_RUBBLE) || (feat == FEAT_TREES) || (feat == FEAT_MOUNTAIN))
/* Get the grid */
c_ptr = &cave[yy][xx];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Memorize normal features */
if (ninja)
{
cave_type *c_ptr = &cave[y][x];
- /* Clear mimic type */
- c_ptr->mimic = 0;
+ /* Clear mimic type */
+ c_ptr->mimic = 0;
- /* Remove flag for mirror/glyph */
+ /* Remove flag for mirror/glyph */
c_ptr->info &= ~(CAVE_OBJECT);
/* Change the feature */
{
/* Remove the mirror */
cave[y][x].info &= ~(CAVE_OBJECT);
- cave[y][x].mimic = 0;
+ cave[y][x].mimic = 0;
if (d_info[dungeon_type].flags1 & DF1_DARKNESS)
{
*/
bool is_mirror_grid(cave_type *c_ptr)
{
- if ((c_ptr->info & CAVE_OBJECT) && c_ptr->mimic == FEAT_MIRROR)
- return TRUE;
- else
- return FALSE;
+ if ((c_ptr->info & CAVE_OBJECT) && c_ptr->mimic == FEAT_MIRROR)
+ return TRUE;
+ else
+ return FALSE;
}
*/
bool is_glyph_grid(cave_type *c_ptr)
{
- if ((c_ptr->info & CAVE_OBJECT) && c_ptr->mimic == FEAT_GLYPH)
- return TRUE;
- else
- return FALSE;
+ if ((c_ptr->info & CAVE_OBJECT) && c_ptr->mimic == FEAT_GLYPH)
+ return TRUE;
+ else
+ return FALSE;
}
*/
bool is_explosive_rune_grid(cave_type *c_ptr)
{
- if ((c_ptr->info & CAVE_OBJECT) && c_ptr->mimic == FEAT_MINOR_GLYPH)
- return TRUE;
- else
- return FALSE;
+ if ((c_ptr->info & CAVE_OBJECT) && c_ptr->mimic == FEAT_MINOR_GLYPH)
+ return TRUE;
+ else
+ return FALSE;
}
bind = (err == noErr);
}
if (err == noErr){
- OTInitInetAddress(&inAddr, server_port, host_addr);
+ OTInitInetAddress(&inAddr, server_port, host_addr);
sndCall.addr.len = sizeof(InetAddress);
sndCall.addr.buf = (unsigned char*) &inAddr;
c_ptr = &cave[y][x];
/* Invisible trap */
- if (c_ptr->mimic && is_trap(c_ptr->feat))
+ if (c_ptr->mimic && is_trap(c_ptr->feat))
{
/* Pick a trap */
disclose_grid(y, x);
}
/* Secret door */
- if (is_hidden_door(c_ptr))
+ if (is_hidden_door(c_ptr))
{
/* Message */
#ifdef JP
/* Message */
#ifdef JP
msg_format(" $%ld ¤Î²ÁÃͤ¬¤¢¤ë%s¤ò¸«¤Ä¤±¤¿¡£",
- (long)value, o_name);
+ (long)value, o_name);
#else
msg_format("You collect %ld gold pieces worth of %s.",
(long)value, o_name);
break;
}
- case FEAT_TRAP_OPEN:
- {
+ case FEAT_TRAP_OPEN:
+ {
#ifdef JP
- msg_print("Âç²»¶Á¤È¶¦¤Ë¤Þ¤ï¤ê¤ÎÊɤ¬Êø¤ì¤¿¡ª");
+ msg_print("Âç²»¶Á¤È¶¦¤Ë¤Þ¤ï¤ê¤ÎÊɤ¬Êø¤ì¤¿¡ª");
#else
- msg_print("Suddenly, surrounding walls are opened!");
+ msg_print("Suddenly, surrounding walls are opened!");
#endif
- (void)project(0, 3, y, x, 0, GF_DISINTEGRATE, PROJECT_GRID | PROJECT_HIDE, -1);
- (void)project(0, 3, y, x - 4, 0, GF_DISINTEGRATE, PROJECT_GRID | PROJECT_HIDE, -1);
- (void)project(0, 3, y, x + 4, 0, GF_DISINTEGRATE, PROJECT_GRID | PROJECT_HIDE, -1);
- aggravate_monsters(0);
+ (void)project(0, 3, y, x, 0, GF_DISINTEGRATE, PROJECT_GRID | PROJECT_HIDE, -1);
+ (void)project(0, 3, y, x - 4, 0, GF_DISINTEGRATE, PROJECT_GRID | PROJECT_HIDE, -1);
+ (void)project(0, 3, y, x + 4, 0, GF_DISINTEGRATE, PROJECT_GRID | PROJECT_HIDE, -1);
+ aggravate_monsters(0);
- break;
- }
+ break;
+ }
- case FEAT_TRAP_ARMAGEDDON:
- {
- static int levs[10] = {0, 0, 20, 10, 5, 3, 2, 1, 1, 1};
+ case FEAT_TRAP_ARMAGEDDON:
+ {
+ static int levs[10] = {0, 0, 20, 10, 5, 3, 2, 1, 1, 1};
- int lev;
+ int lev;
#ifdef JP
- msg_print("ÆÍÁ³Å·³¦¤ÎÀïÁè¤Ë´¬¤¹þ¤Þ¤ì¤¿¡ª");
+ msg_print("ÆÍÁ³Å·³¦¤ÎÀïÁè¤Ë´¬¤¹þ¤Þ¤ì¤¿¡ª");
#else
- msg_print("Suddenly, you are surrounded by immotal beings!");
+ msg_print("Suddenly, you are surrounded by immotal beings!");
#endif
/* Destroy this trap */
cave_set_feat(y, x, floor_type[randint0(100)]);
- /* Summon Demons and Angels */
- for (lev = dun_level; lev >= 20; lev -= 1 + lev/16)
- {
- num = levs[MIN(lev/10, 9)];
- for (i = 0; i < num; i++)
- {
- int x1 = rand_spread(x, 7);
- int y1 = rand_spread(y, 5);
+ /* Summon Demons and Angels */
+ for (lev = dun_level; lev >= 20; lev -= 1 + lev/16)
+ {
+ num = levs[MIN(lev/10, 9)];
+ for (i = 0; i < num; i++)
+ {
+ int x1 = rand_spread(x, 7);
+ int y1 = rand_spread(y, 5);
- /* Skip illegal grids */
- if (!in_bounds(y1, x1)) continue;
+ /* Skip illegal grids */
+ if (!in_bounds(y1, x1)) continue;
- /* Require line of sight */
- if (!player_has_los_bold(y1, x1)) continue;
+ /* Require line of sight */
+ if (!player_has_los_bold(y1, x1)) continue;
- (void)summon_specific(0, y1, x1, lev, SUMMON_DEMON, (PM_NO_PET));
- (void)summon_specific(0, y1, x1, lev, SUMMON_ANGEL, (PM_NO_PET));
- }
- }
- break;
- }
+ (void)summon_specific(0, y1, x1, lev, SUMMON_DEMON, (PM_NO_PET));
+ (void)summon_specific(0, y1, x1, lev, SUMMON_ANGEL, (PM_NO_PET));
+ }
+ }
+ break;
+ }
- case FEAT_TRAP_PIRANHA:
- {
+ case FEAT_TRAP_PIRANHA:
+ {
#ifdef JP
- msg_print("ÆÍÁ³Êɤ«¤é¿å¤¬°î¤ì½Ð¤·¤¿¡ª¥Ô¥é¥Ë¥¢¤¬¤¤¤ë¡ª");
+ msg_print("ÆÍÁ³Êɤ«¤é¿å¤¬°î¤ì½Ð¤·¤¿¡ª¥Ô¥é¥Ë¥¢¤¬¤¤¤ë¡ª");
#else
- msg_print("Suddenly, the room is filled with water with piranhas!");
+ msg_print("Suddenly, the room is filled with water with piranhas!");
#endif
/* Destroy this trap */
cave_set_feat(y, x, floor_type[randint0(100)]);
/* Water fills room */
- fire_ball_hide(GF_WATER_FLOW, 0, 1, 10);
+ fire_ball_hide(GF_WATER_FLOW, 0, 1, 10);
- /* Summon Piranhas */
+ /* Summon Piranhas */
num = 1 + dun_level/20;
for (i = 0; i < num; i++)
{
(void)summon_specific(0, y, x, dun_level, SUMMON_PIRANHAS, (PM_ALLOW_GROUP | PM_NO_PET));
}
- break;
- }
+ break;
+ }
}
if (break_trap && is_trap(c_ptr->feat))
{
if (k <= 0) can_drain = FALSE;
if (drain_result > m_ptr->hp)
- drain_result = m_ptr->hp;
+ drain_result = m_ptr->hp;
/* Damage, check for fear and death */
if (mon_take_hit(c_ptr->m_idx, k, fear, NULL))
{
if (m_ptr->ml) r_ptr->r_flags3 |= RF3_RES_TELE;
#ifdef JP
- msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", m_name);
+ msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", m_name);
#else
msg_format("%^s is unaffected!", m_name);
#endif
}
else if ((chaos_effect == 5) && cave_floor_bold(y, x) &&
- (randint1(90) > r_ptr->level))
+ (randint1(90) > r_ptr->level))
{
if (!(r_ptr->flags1 & RF1_UNIQUE) &&
!(r_ptr->flags4 & RF4_BR_CHAO) &&
}
k += (p_ptr->to_d[hand] + o_ptr->to_d);
- if (k < 0) k = 0;
+ if (k < 0) k = 0;
#ifdef JP
take_hit(DAMAGE_FORCE, k, "»à¤ÎÂç³ù", -1);
return TRUE;
}
else if ((cave[n_y][n_x].feat == FEAT_PATTERN_OLD) ||
- (cave[n_y][n_x].feat == FEAT_PATTERN_END) ||
- (cave[n_y][n_x].feat == FEAT_PATTERN_XTRA2))
+ (cave[n_y][n_x].feat == FEAT_PATTERN_END) ||
+ (cave[n_y][n_x].feat == FEAT_PATTERN_XTRA2))
{
if (pattern_tile(c_y, c_x))
{
}
}
else if ((cave[n_y][n_x].feat == FEAT_PATTERN_XTRA1) ||
- (cave[c_y][c_x].feat == FEAT_PATTERN_XTRA1))
+ (cave[c_y][c_x].feat == FEAT_PATTERN_XTRA1))
{
return TRUE;
}
}
}
else if ((cave[c_y][c_x].feat == FEAT_PATTERN_OLD) ||
- (cave[c_y][c_x].feat == FEAT_PATTERN_END) ||
- (cave[c_y][c_x].feat == FEAT_PATTERN_XTRA2))
+ (cave[c_y][c_x].feat == FEAT_PATTERN_END) ||
+ (cave[c_y][c_x].feat == FEAT_PATTERN_XTRA2))
{
if (!pattern_tile(n_y, n_x))
{
case FEAT_PERM_INNER:
case FEAT_PERM_OUTER:
case FEAT_PERM_SOLID:
- case FEAT_PATTERN_START:
- case FEAT_PATTERN_1:
- case FEAT_PATTERN_2:
- case FEAT_PATTERN_3:
- case FEAT_PATTERN_4:
- case FEAT_PATTERN_END:
- case FEAT_PATTERN_OLD:
- case FEAT_PATTERN_XTRA1:
- case FEAT_PATTERN_XTRA2:
+ case FEAT_PATTERN_START:
+ case FEAT_PATTERN_1:
+ case FEAT_PATTERN_2:
+ case FEAT_PATTERN_3:
+ case FEAT_PATTERN_4:
+ case FEAT_PATTERN_END:
+ case FEAT_PATTERN_OLD:
+ case FEAT_PATTERN_XTRA1:
+ case FEAT_PATTERN_XTRA2:
{
return (FALSE);
}
p_ptr->wilderness_x--;
p_ptr->oldpy = cur_hgt - 2;
p_ptr->oldpx = cur_wid - 2;
- ambush_flag = FALSE;
+ ambush_flag = FALSE;
}
else if ((y == 0) && (x == MAX_WID - 1))
p_ptr->wilderness_x++;
p_ptr->oldpy = cur_hgt - 2;
p_ptr->oldpx = 1;
- ambush_flag = FALSE;
+ ambush_flag = FALSE;
}
else if ((y == MAX_HGT - 1) && (x == 0))
p_ptr->wilderness_x--;
p_ptr->oldpy = 1;
p_ptr->oldpx = cur_wid - 2;
- ambush_flag = FALSE;
+ ambush_flag = FALSE;
}
else if ((y == MAX_HGT - 1) && (x == MAX_WID - 1))
p_ptr->wilderness_x++;
p_ptr->oldpy = 1;
p_ptr->oldpx = 1;
- ambush_flag = FALSE;
+ ambush_flag = FALSE;
}
else if (y == 0)
p_ptr->wilderness_y--;
p_ptr->oldpy = cur_hgt - 2;
p_ptr->oldpx = x;
- ambush_flag = FALSE;
+ ambush_flag = FALSE;
}
else if (y == MAX_HGT - 1)
p_ptr->wilderness_y++;
p_ptr->oldpy = 1;
p_ptr->oldpx = x;
- ambush_flag = FALSE;
+ ambush_flag = FALSE;
}
else if (x == 0)
p_ptr->wilderness_x--;
p_ptr->oldpx = cur_wid - 2;
p_ptr->oldpy = y;
- ambush_flag = FALSE;
+ ambush_flag = FALSE;
}
else if (x == MAX_WID - 1)
p_ptr->wilderness_x++;
p_ptr->oldpx = 1;
p_ptr->oldpy = y;
- ambush_flag = FALSE;
+ ambush_flag = FALSE;
}
p_ptr->leftbldg = TRUE;
else if ((!cave_floor_bold(y, x)) &&
(!p_can_pass_walls))
{
- byte feat;
+ byte feat;
oktomove = FALSE;
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Disturb the player */
disturb(0, 0);
if (feat == FEAT_RUBBLE)
{
#ifdef JP
- msg_print("´äÀФ¬¹Ô¤¯¼ê¤ò¤Ï¤Ð¤ó¤Ç¤¤¤ë¤è¤¦¤À¡£");
+ msg_print("´äÀФ¬¹Ô¤¯¼ê¤ò¤Ï¤Ð¤ó¤Ç¤¤¤ë¤è¤¦¤À¡£");
#else
msg_print("You feel some rubble blocking your way.");
#endif
else if (is_closed_door(feat))
{
#ifdef JP
- msg_print("¥É¥¢¤¬¹Ô¤¯¼ê¤ò¤Ï¤Ð¤ó¤Ç¤¤¤ë¤è¤¦¤À¡£");
+ msg_print("¥É¥¢¤¬¹Ô¤¯¼ê¤ò¤Ï¤Ð¤ó¤Ç¤¤¤ë¤è¤¦¤À¡£");
#else
msg_print("You feel a closed door blocking your way.");
#endif
/* Check for new panel (redraw map) */
verify_panel();
- /* For get everything when requested hehe I'm *NASTY* */
- if (dun_level && (d_info[dungeon_type].flags1 & DF1_FORGET))
- {
- wiz_dark();
- }
+ /* For get everything when requested hehe I'm *NASTY* */
+ if (dun_level && (d_info[dungeon_type].flags1 & DF1_FORGET))
+ {
+ wiz_dark();
+ }
if ((p_ptr->pclass == CLASS_NINJA))
{
/* Disturb */
disturb(0, 0);
- /* Hidden trap */
- if (c_ptr->mimic)
- {
- /* Message */
+ /* Hidden trap */
+ if (c_ptr->mimic)
+ {
+ /* Message */
#ifdef JP
- msg_print("¥È¥é¥Ã¥×¤À¡ª");
+ msg_print("¥È¥é¥Ã¥×¤À¡ª");
#else
- msg_print("You found a trap!");
+ msg_print("You found a trap!");
#endif
- /* Pick a trap */
- disclose_grid(py, px);
- }
+ /* Pick a trap */
+ disclose_grid(py, px);
+ }
/* Hit the trap */
hit_trap(break_trap);
*/
static int see_wall(int dir, int y, int x)
{
- cave_type *c_ptr;
- byte feat;
+ cave_type *c_ptr;
+ byte feat;
/* Get the new location */
y += ddy[dir];
/* Illegal grids are not known walls */
if (!in_bounds2(y, x)) return (FALSE);
- /* Access grid */
- c_ptr = &cave[y][x];
+ /* Access grid */
+ c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Must be known to the player */
if (c_ptr->info & (CAVE_MARK))
- {
- /* Rubble, Magma, Quartz, Wall, Perm wall */
- if (feat >= FEAT_RUBBLE && feat <= FEAT_PERM_SOLID) return TRUE;
+ {
+ /* Rubble, Magma, Quartz, Wall, Perm wall */
+ if (feat >= FEAT_RUBBLE && feat <= FEAT_PERM_SOLID) return TRUE;
- /* Tree */
- if (feat == FEAT_TREES) return TRUE;
+ /* Tree */
+ if (feat == FEAT_TREES) return TRUE;
- /* Mountain */
- if (feat == FEAT_MOUNTAIN) return TRUE;
- }
+ /* Mountain */
+ if (feat == FEAT_MOUNTAIN) return TRUE;
+ }
- return FALSE;
+ return FALSE;
}
/* Access grid */
c_ptr = &cave[row][col];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Visible monsters abort running */
if (c_ptr->m_idx)
/* Access grid */
c_ptr = &cave[row][col];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Unknown grid or non-wall XXX XXX XXX cave_floor_grid(c_ptr)) */
if (!(c_ptr->info & (CAVE_MARK)) ||
((feat <= FEAT_DOOR_TAIL) ||
(feat == FEAT_FLOWER) ||
(feat == FEAT_DEEP_GRASS) ||
- ((feat >= FEAT_DEEP_WATER) &&
- (feat <= FEAT_GRASS))))
+ ((feat >= FEAT_DEEP_WATER) &&
+ (feat <= FEAT_GRASS))))
{
/* Looking to break right */
/* Access grid */
c_ptr = &cave[row][col];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Unknown grid or non-wall XXX XXX XXX cave_floor_grid(c_ptr)) */
if (!(c_ptr->info & (CAVE_MARK)) ||
((feat <= FEAT_DOOR_TAIL) ||
(feat == FEAT_FLOWER) ||
(feat == FEAT_DEEP_GRASS) ||
- ((feat >= FEAT_DEEP_WATER) &&
- (feat <= FEAT_GRASS))))
+ ((feat >= FEAT_DEEP_WATER) &&
+ (feat <= FEAT_GRASS))))
{
/* Looking to break left */
/* Start running */
if (dir)
{
- cave_type *c_ptr;
- byte feat;
-
- /* Access grid */
- c_ptr = &cave[py+ddy[dir]][px+ddx[dir]];
-
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ cave_type *c_ptr;
+ byte feat;
+
+ /* Access grid */
+ c_ptr = &cave[py+ddy[dir]][px+ddx[dir]];
+
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Hack -- do not start silly run */
if (see_wall(dir, py, px) &&
msg_print("¤Ê¤ó¤À¤³¤Î³¬Ãʤϡª");
else if (0 == dun_level)
msg_print("ÃϾå¤ËÌá¤Ã¤¿¡£");
- else
+ else
msg_print("³¬Ãʤò¾å¤Ã¤Æ¿·¤¿¤Ê¤ë̵ܤؤȤòƧ¤ßÆþ¤ì¤¿¡£");
#else
- if (0 == dun_level)
+ if (0 == dun_level)
msg_print("You go back to the surface.");
- else
- msg_print("You enter a maze of up staircases.");
+ else
+ msg_print("You enter a maze of up staircases.");
#endif
/* Check around (and under) the character */
for (d = 0; d < 9; d++)
{
- cave_type *c_ptr;
- byte feat;
+ cave_type *c_ptr;
+ byte feat;
- /* if not searching under player continue */
- if ((d == 8) && !under) continue;
+ /* if not searching under player continue */
+ if ((d == 8) && !under) continue;
/* Extract adjacent (legal) location */
yy = py + ddy_ddd[d];
xx = px + ddx_ddd[d];
- /* Get the cave */
- c_ptr = &cave[yy][xx];
+ /* Get the cave */
+ c_ptr = &cave[yy][xx];
/* Must have knowledge */
if (!(c_ptr->info & (CAVE_MARK))) continue;
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
-
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+
/* Not looking for this feature */
if (!((*test)(feat))) continue;
/* Get requested grid */
c_ptr = &cave[y][x];
- /* Seeing true feature code (ignore mimic) */
-
+ /* Seeing true feature code (ignore mimic) */
+
/* Jammed door */
if (c_ptr->feat >= FEAT_DOOR_HEAD + 0x08)
{
/* Get a "repeated" direction */
if (get_rep_dir(&dir, TRUE))
{
- byte feat;
- cave_type *c_ptr;
+ byte feat;
+ cave_type *c_ptr;
/* Get requested location */
y = py + ddy[dir];
/* Get requested grid */
c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
-
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+
/* Check for chest */
o_idx = chest_check(y, x);
/* Get grid and contents */
c_ptr = &cave[y][x];
- /* Seeing true feature code (ignore mimic) */
-
+ /* Seeing true feature code (ignore mimic) */
+
/* Broken door */
if (c_ptr->feat == FEAT_BROKEN)
{
/* Get a "repeated" direction */
if (get_rep_dir(&dir,FALSE))
{
- cave_type *c_ptr;
- byte feat;
+ cave_type *c_ptr;
+ byte feat;
/* Get requested location */
y = py + ddy[dir];
/* Get grid and contents */
c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
-
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+
/* Require open/broken door */
if ((feat != FEAT_OPEN) && (feat != FEAT_BROKEN))
{
/* Message */
#ifdef JP
- msg_print("¤½¤³¤Ë¤ÏÊĤ¸¤ë¤â¤Î¤¬¸«Åö¤¿¤é¤Ê¤¤¡£");
+ msg_print("¤½¤³¤Ë¤ÏÊĤ¸¤ë¤â¤Î¤¬¸«Åö¤¿¤é¤Ê¤¤¡£");
#else
msg_print("You see nothing there to close.");
#endif
/* Get grid */
c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Sound */
sound(SOUND_DIG);
/* Map border (mimiccing Permanent wall) */
else if ((c_ptr->feat >= FEAT_PERM_EXTRA &&
- c_ptr->feat <= FEAT_PERM_SOLID) ||
- c_ptr->feat == FEAT_MOUNTAIN)
+ c_ptr->feat <= FEAT_PERM_SOLID) ||
+ c_ptr->feat == FEAT_MOUNTAIN)
{
#ifdef JP
msg_print("¤½¤³¤Ï·¡¤ì¤Ê¤¤!");
/* Granite */
else if ((feat >= FEAT_WALL_EXTRA) &&
- (feat <= FEAT_WALL_SOLID))
+ (feat <= FEAT_WALL_SOLID))
{
/* Tunnel */
if ((p_ptr->skill_dig > 40 + randint0(1600)) && twall(y, x, floor_type[randint0(100)]))
/* Found gold (ignore mimic; maybe a hidden treasure) */
if (c_ptr->feat >= FEAT_MAGMA_H &&
- c_ptr->feat <= FEAT_QUARTZ_K) gold = TRUE;
+ c_ptr->feat <= FEAT_QUARTZ_K) gold = TRUE;
/* Extract "quartz" flag XXX XXX XXX */
if ((feat - FEAT_MAGMA) & 0x01) hard = TRUE;
}
}
- if (is_hidden_door(c_ptr))
- {
- /* Occasional Search XXX XXX */
- if (randint0(100) < 25) search();
- }
+ if (is_hidden_door(c_ptr))
+ {
+ /* Occasional Search XXX XXX */
+ if (randint0(100) < 25) search();
+ }
/* Result */
return (more);
/* Get grid */
c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* No tunnelling through doors */
if (((feat >= FEAT_DOOR_HEAD) && (feat <= FEAT_DOOR_TAIL)) ||
{
/* Message */
#ifdef JP
- msg_print("¸°¤ò¤Ï¤º¤·¤¿¡£");
+ msg_print("¸°¤ò¤Ï¤º¤·¤¿¡£");
#else
msg_print("You have picked the lock.");
#endif
/* Message */
#ifdef JP
- msg_print("¸°¤ò¤Ï¤º¤»¤Ê¤«¤Ã¤¿¡£");
+ msg_print("¸°¤ò¤Ï¤º¤»¤Ê¤«¤Ã¤¿¡£");
#else
msg_print("You failed to pick the lock.");
#endif
/* Variable power! */
/* Extract trap "power" */
- switch (c_ptr->feat)
- {
- case FEAT_TRAP_OPEN:
- case FEAT_TRAP_ARMAGEDDON:
- case FEAT_TRAP_PIRANHA:
- /* Special traps are very difficult to disarm */
- power = 100;
- break;
- default:
- power = 5;
- break;
- }
+ switch (c_ptr->feat)
+ {
+ case FEAT_TRAP_OPEN:
+ case FEAT_TRAP_ARMAGEDDON:
+ case FEAT_TRAP_PIRANHA:
+ /* Special traps are very difficult to disarm */
+ power = 100;
+ break;
+ default:
+ power = 5;
+ break;
+ }
/* Extract the difficulty */
j = i - power;
c_ptr->info &= ~(CAVE_MARK);
/* Remove the trap */
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, floor_type[randint0(100)]);
#ifdef ALLOW_EASY_DISARM /* TNB */
/* Get a direction (or abort) */
if (get_rep_dir(&dir,TRUE))
{
- cave_type *c_ptr;
- byte feat;
+ cave_type *c_ptr;
+ byte feat;
/* Get location */
y = py + ddy[dir];
/* Get grid and contents */
c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Check for chests */
o_idx = chest_check(y, x);
{
/* Message */
#ifdef JP
- msg_print("¤½¤³¤Ë¤Ï²ò½ü¤¹¤ë¤â¤Î¤¬¸«Åö¤¿¤é¤Ê¤¤¡£");
+ msg_print("¤½¤³¤Ë¤Ï²ò½ü¤¹¤ë¤â¤Î¤¬¸«Åö¤¿¤é¤Ê¤¤¡£");
#else
msg_print("You see nothing there to disarm.");
#endif
/* Saving throw against stun */
else if (randint0(100) < adj_dex_safe[p_ptr->stat_ind[A_DEX]] +
- p_ptr->lev)
+ p_ptr->lev)
{
/* Message */
#ifdef JP
/* Get a "repeated" direction */
if (get_rep_dir(&dir,FALSE))
{
- byte feat;
+ byte feat;
/* Bash location */
y = py + ddy[dir];
/* Get grid */
c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Nothing useful */
if (!((feat >= FEAT_DOOR_HEAD) &&
/* Get a direction */
if (get_rep_dir(&dir,TRUE))
{
- byte feat;
+ byte feat;
/* Get location */
y = py + ddy[dir];
/* Get grid */
c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Take a turn */
energy_use = 100;
/* Tunnel through walls */
else if (((feat >= FEAT_RUBBLE) &&
- (feat < FEAT_MINOR_GLYPH)) ||
- ((feat == FEAT_TREES) ||
- (feat == FEAT_MOUNTAIN)))
+ (feat < FEAT_MINOR_GLYPH)) ||
+ ((feat == FEAT_TREES) ||
+ (feat == FEAT_MOUNTAIN)))
{
more = do_cmd_tunnel_aux(y, x);
}
- else if (is_closed_door(feat))
- {
- /* Bash jammed doors */
- if (feat >= FEAT_DOOR_HEAD + 0x08)
- {
- more = do_cmd_bash_aux(y, x, dir);
- }
-
- /* Locked doors */
- else
- {
- more = do_cmd_open_aux(y, x);
- }
- }
+ else if (is_closed_door(feat))
+ {
+ /* Bash jammed doors */
+ if (feat >= FEAT_DOOR_HEAD + 0x08)
+ {
+ more = do_cmd_bash_aux(y, x, dir);
+ }
+
+ /* Locked doors */
+ else
+ {
+ more = do_cmd_open_aux(y, x);
+ }
+ }
/* Close open doors */
else if ((feat == FEAT_OPEN) ||
- (feat == FEAT_BROKEN))
+ (feat == FEAT_BROKEN))
{
more = do_cmd_close_aux(y, x);
}
/* Get a "repeated" direction */
if (get_rep_dir(&dir,FALSE))
{
- int y, x, item;
- cave_type *c_ptr;
- byte feat;
+ int y, x, item;
+ cave_type *c_ptr;
+ byte feat;
/* Get location */
y = py + ddy[dir];
/* Get grid and contents */
c_ptr = &cave[y][x];
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Require closed door */
if (!((feat >= FEAT_DOOR_HEAD) &&
more = TRUE;
}
- /* Hack again -- Is there a special encounter ??? */
+ /* Hack again -- Is there a special encounter ??? */
if(p_ptr->wild_mode && (cave[py][px].feat != FEAT_TOWN))
- {
+ {
int tmp = 120 + p_ptr->lev*10 - wilderness[py][px].level + 5;
if (tmp < 1)
tmp = 1;
{
/* Inform the player of his horrible fate :=) */
#ifdef JP
- msg_print("½±·â¤À¡ª");
+ msg_print("½±·â¤À¡ª");
#else
- msg_print("You are ambushed !");
+ msg_print("You are ambushed !");
#endif
/* Go into large wilderness view */
{
#ifdef JP
msg_format("%d/%d ¤Î¥À¥á¡¼¥¸¤òÍ¿¤¨¤¿¡£",
- tdam, m_ptr->hp);
+ tdam, m_ptr->hp);
#else
msg_format("You do %d (out of %d) damage.",
- tdam, m_ptr->hp);
+ tdam, m_ptr->hp);
#endif
}
{
#ifdef JP
msg_format("%d/%d¤Î¥À¥á¡¼¥¸¤òÍ¿¤¨¤¿¡£",
- tdam, m_ptr->hp);
+ tdam, m_ptr->hp);
#else
msg_format("You do %d (out of %d) damage.",
- tdam, m_ptr->hp);
+ tdam, m_ptr->hp);
#endif
}
item_tester_full = FALSE;
#ifdef JP
- sprintf(out_val, "»ý¤Áʪ¡§ ¹ç·× %3d.%1d kg (¸Â³¦¤Î%ld%%) ¥³¥Þ¥ó¥É: ",
- lbtokg1(p_ptr->total_weight) , lbtokg2(p_ptr->total_weight) ,
- (p_ptr->total_weight * 100) / ((adj_str_wgt[p_ptr->stat_ind[A_STR]] * (p_ptr->pclass == CLASS_BERSERKER ? 150 : 100))
+ sprintf(out_val, "»ý¤Áʪ¡§ ¹ç·× %3d.%1d kg (¸Â³¦¤Î%ld%%) ¥³¥Þ¥ó¥É: ",
+ lbtokg1(p_ptr->total_weight) , lbtokg2(p_ptr->total_weight) ,
+ (p_ptr->total_weight * 100) / ((adj_str_wgt[p_ptr->stat_ind[A_STR]] * (p_ptr->pclass == CLASS_BERSERKER ? 150 : 100))
/ 2));
#else
sprintf(out_val, "Inventory: carrying %d.%d pounds (%ld%% of capacity). Command: ",
/* Build a prompt */
#ifdef JP
- sprintf(out_val, "ÁõÈ÷¡§ ¹ç·× %3d.%1d kg (¸Â³¦¤Î%ld%%) ¥³¥Þ¥ó¥É: ",
- lbtokg1(p_ptr->total_weight) , lbtokg2(p_ptr->total_weight) ,
- (p_ptr->total_weight * 100) / ((adj_str_wgt[p_ptr->stat_ind[A_STR]] * (p_ptr->pclass == CLASS_BERSERKER ? 150 : 100))
+ sprintf(out_val, "ÁõÈ÷¡§ ¹ç·× %3d.%1d kg (¸Â³¦¤Î%ld%%) ¥³¥Þ¥ó¥É: ",
+ lbtokg1(p_ptr->total_weight) , lbtokg2(p_ptr->total_weight) ,
+ (p_ptr->total_weight * 100) / ((adj_str_wgt[p_ptr->stat_ind[A_STR]] * (p_ptr->pclass == CLASS_BERSERKER ? 150 : 100))
/ 2));
#else
sprintf(out_val, "Equipment: carrying %d.%d pounds (%ld%% of capacity). Command: ",
/* Message */
#ifdef JP
- msg_format("%s%s¤Ï¼ö¤ï¤ì¤Æ¤¤¤ë¤è¤¦¤À¡£",
- describe_use(slot) , o_name );
+ msg_format("%s%s¤Ï¼ö¤ï¤ì¤Æ¤¤¤ë¤è¤¦¤À¡£",
+ describe_use(slot) , o_name );
#else
msg_format("The %s you are %s appears to be cursed.",
- o_name, describe_use(slot));
+ o_name, describe_use(slot));
#endif
/* Message */
#ifdef JP
- msg_format("%s(%c)%s¡£", o_name, index_to_label(slot), act );
+ msg_format("%s(%c)%s¡£", o_name, index_to_label(slot), act );
#else
msg_format("%s %s (%c).", act, o_name, index_to_label(slot));
#endif
inven_item_optimize(INVEN_RARM);
object_desc(o_name, o_ptr, TRUE, 3);
#ifdef JP
- msg_format("%s¤ò»ý¤ÁÂؤ¨¤¿¡£", o_name );
+ msg_format("%s¤ò»ý¤ÁÂؤ¨¤¿¡£", o_name );
#else
- msg_format("You switched hand of %s.", o_name );
+ msg_format("You switched hand of %s.", o_name );
#endif
}
}
{
/* Oops */
#ifdef JP
- msg_print("¤Õ¡¼¤à¡¢¤É¤¦¤ä¤é¼ö¤ï¤ì¤Æ¤¤¤ë¤è¤¦¤À¡£");
+ msg_print("¤Õ¡¼¤à¡¢¤É¤¦¤ä¤é¼ö¤ï¤ì¤Æ¤¤¤ë¤è¤¦¤À¡£");
#else
msg_print("Hmmm, it seems to be cursed.");
#endif
/* Get a new inscription (possibly empty) */
#ifdef JP
- if (get_string("ÌÃ: ", out_val, 80))
+ if (get_string("ÌÃ: ", out_val, 80))
#else
if (get_string("Inscription: ", out_val, 80))
#endif
if ((y2 == y1) && (x2 == x1))
{
#ifdef JP
- strcpy(tmp_val, "¿¿¾å");
+ strcpy(tmp_val, "¿¿¾å");
#else
tmp_val[0] = '\0';
#endif
{
#ifdef JP
sprintf(tmp_val, "%s%s",
- ((y2 < y1) ? "ËÌ" : (y2 > y1) ? "Æî" : ""),
- ((x2 < x1) ? "À¾" : (x2 > x1) ? "Åì" : ""));
+ ((y2 < y1) ? "ËÌ" : (y2 > y1) ? "Æî" : ""),
+ ((x2 < x1) ? "À¾" : (x2 > x1) ? "Åì" : ""));
#else
sprintf(tmp_val, "%s%s of",
- ((y2 < y1) ? " North" : (y2 > y1) ? " South" : ""),
- ((x2 < x1) ? " West" : (x2 > x1) ? " East" : ""));
+ ((y2 < y1) ? " North" : (y2 > y1) ? " South" : ""),
+ ((x2 < x1) ? " West" : (x2 > x1) ? " East" : ""));
#endif
}
/* Prepare to ask which way to look */
sprintf(out_val,
#ifdef JP
- "¥Þ¥Ã¥×°ÌÃÖ [%d(%02d),%d(%02d)] (¥×¥ì¥¤¥ä¡¼¤Î%s) Êý¸þ?",
+ "¥Þ¥Ã¥×°ÌÃÖ [%d(%02d),%d(%02d)] (¥×¥ì¥¤¥ä¡¼¤Î%s) Êý¸þ?",
#else
- "Map sector [%d(%02d),%d(%02d)], which is%s your sector. Direction?",
+ "Map sector [%d(%02d),%d(%02d)], which is%s your sector. Direction?",
#endif
- y2 / (hgt / 2), y2 % (hgt / 2),
- x2 / (wid / 2), x2 % (wid / 2), tmp_val);
+ y2 / (hgt / 2), y2 % (hgt / 2),
+ x2 / (wid / 2), x2 % (wid / 2), tmp_val);
/* Assume no direction */
dir = 0;
strcpy(buf, "Non-unique monster list.");
#endif
}
- else if (sym == KTRL('M'))
+ else if (sym == KTRL('M'))
{
all = TRUE;
#ifdef JP
{
temp[0]=0;
- /* Restore */
- screen_load();
+ /* Restore */
+ screen_load();
return FALSE;
}
{
sprintf(buf, "%c - %s.", sym, ident_info[i] + 2);
}
- else
- {
+ else
+ {
#ifdef JP
sprintf(buf, "%c - %s", sym, "̵¸ú¤Êʸ»ú");
#else
{
int tmp;
- if (!sscanf(buf + mark_len, " (%d)", &tmp)
+ if (!sscanf(buf + mark_len, " (%d)", &tmp)
|| tmp != line_num)
{
fseek(orig_fff, header_location, SEEK_SET);
{
get_name();
- /* Process the player name */
- process_player_name(FALSE);
+ /* Process the player name */
+ process_player_name(FALSE);
}
/* File dump */
#ifdef JP
/* translation */
prt(format("°ÊÁ°¤Î¥á¥Ã¥»¡¼¥¸ %d-%d Á´Éô¤Ç(%d) ¥ª¥Õ¥»¥Ã¥È(%d)",
- i, i+j-1, n, q), 0, 0);
+ i, i+j-1, n, q), 0, 0);
#else
prt(format("Message Recall (%d-%d of %d), Offset %d",
i, i+j-1, n, q), 0, 0);
#else
"cheat_peek", "Peek into object creation"
#endif
- },
+ },
{ &cheat_hear, FALSE, 255, 0x02, 0x00,
#ifdef JP
#else
"cheat_hear", "Peek into monster creation"
#endif
- },
+ },
{ &cheat_room, FALSE, 255, 0x04, 0x00,
#ifdef JP
#else
"cheat_room", "Peek into dungeon creation"
#endif
- },
+ },
{ &cheat_xtra, FALSE, 255, 0x08, 0x00,
#ifdef JP
#else
"cheat_xtra", "Peek into something else"
#endif
- },
+ },
{ &cheat_know, FALSE, 255, 0x10, 0x00,
#ifdef JP
#else
"cheat_know", "Know complete monster info"
#endif
- },
+ },
{ &cheat_live, FALSE, 255, 0x20, 0x00,
#ifdef JP
#else
"cheat_live", "Allow player to avoid death"
#endif
- },
+ },
{ &cheat_save, FALSE, 255, 0x40, 0x00,
#ifdef JP
#else
"cheat_save", "Ask for saving death"
#endif
- }
+ }
};
/*
/* Interact with the player */
while (TRUE)
{
- int dir;
+ int dir;
/* Prompt XXX XXX XXX */
#ifdef JP
break;
}
- case '?':
- {
+ case '?':
+ {
#ifdef JP
- strnfmt(buf, sizeof(buf), "joption.txt#%s", cheat_info[k].o_text);
+ strnfmt(buf, sizeof(buf), "joption.txt#%s", cheat_info[k].o_text);
#else
- strnfmt(buf, sizeof(buf), "option.txt#%s", cheat_info[k].o_text);
+ strnfmt(buf, sizeof(buf), "option.txt#%s", cheat_info[k].o_text);
#endif
- /* Peruse the help file */
- (void)show_file(TRUE, buf, NULL, 0, 0);
+ /* Peruse the help file */
+ (void)show_file(TRUE, buf, NULL, 0, 0);
Term_clear();
- break;
- }
+ break;
+ }
default:
{
autosave_freq = toggle_frequency(autosave_freq);
#ifdef JP
prt(format("¼«Æ°¥»¡¼¥Ö¤ÎÉÑÅÙ¡§ %d ¥¿¡¼¥óËè",
- autosave_freq), 5, 0);
+ autosave_freq), 5, 0);
#else
prt(format("Timed autosave frequency: every %d turns",
- autosave_freq), 5, 0);
+ autosave_freq), 5, 0);
#endif
- break;
+ break;
}
- case '?':
- {
+ case '?':
+ {
#ifdef JP
- (void)show_file(TRUE, "joption.txt#Autosave", NULL, 0, 0);
+ (void)show_file(TRUE, "joption.txt#Autosave", NULL, 0, 0);
#else
- (void)show_file(TRUE, "option.txt#Autosave", NULL, 0, 0);
+ (void)show_file(TRUE, "option.txt#Autosave", NULL, 0, 0);
#endif
Term_clear();
- break;
- }
+ break;
+ }
default:
{
/* Interact with the player */
while (TRUE)
{
- int dir;
+ int dir;
/* Prompt XXX XXX XXX */
#ifdef JP
prt(buf, 0, 0);
- /* HACK -- description for easy-auto-destroy options */
+ /* HACK -- description for easy-auto-destroy options */
#ifdef JP
- if (page == PAGE_AUTODESTROY) c_prt(TERM_YELLOW, "°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢´Ê°×¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë¤È¤¤Î¤ß͸ú", 6, 6);
+ if (page == PAGE_AUTODESTROY) c_prt(TERM_YELLOW, "°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢´Ê°×¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë¤È¤¤Î¤ß͸ú", 6, 6);
#else
- if (page == PAGE_AUTODESTROY) c_prt(TERM_YELLOW, "Following options will protect items from easy auto-destroyer.", 6, 3);
+ if (page == PAGE_AUTODESTROY) c_prt(TERM_YELLOW, "Following options will protect items from easy auto-destroyer.", 6, 3);
#endif
/* Display the options */
/* Display the option text */
sprintf(buf, "%-48s: %s (%.19s)",
- option_info[opt[i]].o_desc,
+ option_info[opt[i]].o_desc,
#ifdef JP
- (*option_info[opt[i]].o_var ? "¤Ï¤¤ " : "¤¤¤¤¤¨"),
+ (*option_info[opt[i]].o_var ? "¤Ï¤¤ " : "¤¤¤¤¤¨"),
#else
- (*option_info[opt[i]].o_var ? "yes" : "no "),
+ (*option_info[opt[i]].o_var ? "yes" : "no "),
#endif
- option_info[opt[i]].o_text);
+ option_info[opt[i]].o_text);
if ((page == PAGE_AUTODESTROY) && i > 2) c_prt(a, buf, i + 5, 0);
else c_prt(a, buf, i + 2, 0);
}
break;
}
- case '?':
- {
+ case '?':
+ {
#ifdef JP
- strnfmt(buf, sizeof(buf), "joption.txt#%s", option_info[opt[k]].o_text);
+ strnfmt(buf, sizeof(buf), "joption.txt#%s", option_info[opt[k]].o_text);
#else
- strnfmt(buf, sizeof(buf), "option.txt#%s", option_info[opt[k]].o_text);
+ strnfmt(buf, sizeof(buf), "option.txt#%s", option_info[opt[k]].o_text);
#endif
- /* Peruse the help file */
- (void)show_file(TRUE, buf, NULL, 0, 0);
+ /* Peruse the help file */
+ (void)show_file(TRUE, buf, NULL, 0, 0);
Term_clear();
- break;
- }
+ break;
+ }
default:
{
break;
}
- case '?':
- {
+ case '?':
+ {
#ifdef JP
- (void)show_file(TRUE, "joption.txt#Window", NULL, 0, 0);
+ (void)show_file(TRUE, "joption.txt#Window", NULL, 0, 0);
#else
- (void)show_file(TRUE, "option.txt#Window", NULL, 0, 0);
+ (void)show_file(TRUE, "option.txt#Window", NULL, 0, 0);
#endif
Term_clear();
- break;
- }
+ break;
+ }
default:
{
/* Interact */
while (1)
{
- /* Clear screen */
- Term_clear();
+ /* Clear screen */
+ Term_clear();
/* Why are we here */
#ifdef JP
prt("(W) Window Flags", 15, 5);
#endif
- if (p_ptr->noscore || allow_debug_opts)
- {
- /* Cheating */
+ if (p_ptr->noscore || allow_debug_opts)
+ {
+ /* Cheating */
#ifdef JP
- prt("(C) º¾µ½ ¥ª¥×¥·¥ç¥ó", 16, 5);
+ prt("(C) º¾µ½ ¥ª¥×¥·¥ç¥ó", 16, 5);
#else
- prt("(C) Cheating Options", 16, 5);
+ prt("(C) Cheating Options", 16, 5);
#endif
- }
+ }
/* Prompt */
break;
}
- /* Object auto-destruction Options */
- case '6':
- {
- /* Spawn */
+ /* Object auto-destruction Options */
+ case '6':
+ {
+ /* Spawn */
#ifdef JP
- do_cmd_options_aux(7, "´Ê°×¥¢¥¤¥Æ¥à¼«Æ°Ç˲õ¥ª¥×¥·¥ç¥ó");
+ do_cmd_options_aux(7, "´Ê°×¥¢¥¤¥Æ¥à¼«Æ°Ç˲õ¥ª¥×¥·¥ç¥ó");
#else
- do_cmd_options_aux(7, "Easy Auto-Destroyer Options");
+ do_cmd_options_aux(7, "Easy Auto-Destroyer Options");
#endif
- break;
- }
+ break;
+ }
- /* Play-record Options */
- case 'R':
- case 'r':
- {
- /* Spawn */
+ /* Play-record Options */
+ case 'R':
+ case 'r':
+ {
+ /* Spawn */
#ifdef JP
- do_cmd_options_aux(10, "¥×¥ì¥¤µÏ¿¥ª¥×¥·¥ç¥ó");
+ do_cmd_options_aux(10, "¥×¥ì¥¤µÏ¿¥ª¥×¥·¥ç¥ó");
#else
- do_cmd_options_aux(10, "Play-record Option");
+ do_cmd_options_aux(10, "Play-record Option");
#endif
- break;
- }
+ break;
+ }
/* Cheating Options */
case 'C':
{
- if (!p_ptr->noscore && !allow_debug_opts)
- {
- /* Cheat options are not permitted */
- bell();
- break;
- }
+ if (!p_ptr->noscore && !allow_debug_opts)
+ {
+ /* Cheat options are not permitted */
+ bell();
+ break;
+ }
/* Spawn */
#ifdef JP
/* Spawn */
do_cmd_options_win();
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL |
- PW_PLAYER | PW_MESSAGE | PW_OVERHEAD |
- PW_MONSTER | PW_OBJECT | PW_SNAPSHOT |
- PW_BORG_1 | PW_BORG_2 | PW_DUNGEON);
+ PW_PLAYER | PW_MESSAGE | PW_OVERHEAD |
+ PW_MONSTER | PW_OBJECT | PW_SNAPSHOT |
+ PW_BORG_1 | PW_BORG_2 | PW_DUNGEON);
break;
}
int msec = delay_factor * delay_factor * delay_factor;
#ifdef JP
prt(format("¸½ºß¤Î¥¦¥§¥¤¥È: %d (%d¥ß¥êÉÃ)",
- delay_factor, msec), 22, 0);
+ delay_factor, msec), 22, 0);
#else
prt(format("Current base delay factor: %d (%d msec)",
- delay_factor, msec), 22, 0);
+ delay_factor, msec), 22, 0);
#endif
#ifdef JP
k = inkey();
if (k == ESCAPE) break;
- else if (k == '?')
- {
+ else if (k == '?')
+ {
#ifdef JP
- (void)show_file(TRUE, "joption.txt#BaseDelay", NULL, 0, 0);
+ (void)show_file(TRUE, "joption.txt#BaseDelay", NULL, 0, 0);
#else
- (void)show_file(TRUE, "option.txt#BaseDelay", NULL, 0, 0);
+ (void)show_file(TRUE, "option.txt#BaseDelay", NULL, 0, 0);
#endif
- Term_clear();
- }
+ Term_clear();
+ }
else if (isdigit(k)) delay_factor = D2I(k);
else bell();
}
while (1)
{
#ifdef JP
- prt(format("¸½ºß¤ÎÄã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð: %d0%%",
- hitpoint_warn), 22, 0);
+ prt(format("¸½ºß¤ÎÄã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð: %d0%%",
+ hitpoint_warn), 22, 0);
#else
prt(format("Current hitpoint warning: %d0%%",
- hitpoint_warn), 22, 0);
+ hitpoint_warn), 22, 0);
#endif
#ifdef JP
- prt("Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð (0-9) ESC¤Ç·èÄê: ", 20, 0);
+ prt("Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È·Ù¹ð (0-9) ESC¤Ç·èÄê: ", 20, 0);
#else
prt("Hitpoint Warning (0-9 or ESC to accept): ", 20, 0);
#endif
k = inkey();
if (k == ESCAPE) break;
- else if (k == '?')
- {
+ else if (k == '?')
+ {
#ifdef JP
- (void)show_file(TRUE, "joption.txt#Hitpoint", NULL, 0, 0);
+ (void)show_file(TRUE, "joption.txt#Hitpoint", NULL, 0, 0);
#else
- (void)show_file(TRUE, "option.txt#Hitpoint", NULL, 0, 0);
+ (void)show_file(TRUE, "option.txt#Hitpoint", NULL, 0, 0);
#endif
- Term_clear();
- }
+ Term_clear();
+ }
else if (isdigit(k)) hitpoint_warn = D2I(k);
else bell();
}
break;
}
- case '?':
+ case '?':
#ifdef JP
- (void)show_file(TRUE, "joption.txt", NULL, 0, 0);
+ (void)show_file(TRUE, "joption.txt", NULL, 0, 0);
#else
- (void)show_file(TRUE, "option.txt", NULL, 0, 0);
+ (void)show_file(TRUE, "option.txt", NULL, 0, 0);
#endif
Term_clear();
- break;
+ break;
/* Unknown option */
default:
#ifdef ALLOW_MACROS
#ifdef JP
- prt("(2) ¥Õ¥¡¥¤¥ë¤Ë¥Þ¥¯¥í¤òÄɲÃ", 5, 5);
- prt("(3) ¥Þ¥¯¥í¤Î³Îǧ", 6, 5);
- prt("(4) ¥Þ¥¯¥í¤ÎºîÀ®", 7, 5);
- prt("(5) ¥Þ¥¯¥í¤Îºï½ü", 8, 5);
- prt("(6) ¥Õ¥¡¥¤¥ë¤Ë¥¡¼ÇÛÃÖ¤òÄɲÃ", 9, 5);
- prt("(7) ¥¡¼ÇÛÃ֤γÎǧ", 10, 5);
- prt("(8) ¥¡¼ÇÛÃ֤κîÀ®", 11, 5);
- prt("(9) ¥¡¼ÇÛÃ֤κï½ü", 12, 5);
- prt("(0) ¥Þ¥¯¥í¹ÔÆ°¤ÎÆþÎÏ", 13, 5);
+ prt("(2) ¥Õ¥¡¥¤¥ë¤Ë¥Þ¥¯¥í¤òÄɲÃ", 5, 5);
+ prt("(3) ¥Þ¥¯¥í¤Î³Îǧ", 6, 5);
+ prt("(4) ¥Þ¥¯¥í¤ÎºîÀ®", 7, 5);
+ prt("(5) ¥Þ¥¯¥í¤Îºï½ü", 8, 5);
+ prt("(6) ¥Õ¥¡¥¤¥ë¤Ë¥¡¼ÇÛÃÖ¤òÄɲÃ", 9, 5);
+ prt("(7) ¥¡¼ÇÛÃ֤γÎǧ", 10, 5);
+ prt("(8) ¥¡¼ÇÛÃ֤κîÀ®", 11, 5);
+ prt("(9) ¥¡¼ÇÛÃ֤κï½ü", 12, 5);
+ prt("(0) ¥Þ¥¯¥í¹ÔÆ°¤ÎÆþÎÏ", 13, 5);
#else
prt("(2) Append macros to a file", 5, 5);
prt("(3) Query a macro", 6, 5);
/* Dump the monster attr/char info */
fprintf(fff, "R:%d:0x%02X:0x%02X\n\n", i,
- (byte)(r_ptr->x_attr), (byte)(r_ptr->x_char));
+ (byte)(r_ptr->x_attr), (byte)(r_ptr->x_char));
line_num += 2;
}
/* Dump the object attr/char info */
fprintf(fff, "K:%d:0x%02X:0x%02X\n\n", i,
- (byte)(k_ptr->x_attr), (byte)(k_ptr->x_char));
+ (byte)(k_ptr->x_attr), (byte)(k_ptr->x_char));
line_num += 2;
}
/* Dump the feature attr/char info */
fprintf(fff, "F:%d:0x%02X:0x%02X\n\n", i,
- (byte)(f_ptr->x_attr), (byte)(f_ptr->x_char));
+ (byte)(f_ptr->x_attr), (byte)(f_ptr->x_char));
line_num += 2;
}
/* Label the object */
#ifdef JP
Term_putstr(5, 17, -1, TERM_WHITE,
- format("¥â¥ó¥¹¥¿¡¼ = %d, ̾Á° = %-40.40s",
- r, (r_name + r_ptr->name)));
+ format("¥â¥ó¥¹¥¿¡¼ = %d, ̾Á° = %-40.40s",
+ r, (r_name + r_ptr->name)));
#else
Term_putstr(5, 17, -1, TERM_WHITE,
- format("Monster = %d, Name = %-40.40s",
- r, (r_name + r_ptr->name)));
+ format("Monster = %d, Name = %-40.40s",
+ r, (r_name + r_ptr->name)));
#endif
/* Label the Default values */
#ifdef JP
Term_putstr(10, 19, -1, TERM_WHITE,
- format("½é´üÃÍ ¿§ / ʸ»ú = %3u / %3u", da, dc));
+ format("½é´üÃÍ ¿§ / ʸ»ú = %3u / %3u", da, dc));
#else
Term_putstr(10, 19, -1, TERM_WHITE,
- format("Default attr/char = %3u / %3u", da, dc));
+ format("Default attr/char = %3u / %3u", da, dc));
#endif
Term_putstr(40, 19, -1, TERM_WHITE, "<< ? >>");
/* Label the Current values */
#ifdef JP
Term_putstr(10, 20, -1, TERM_WHITE,
- format("¸½ºßÃÍ ¿§ / ʸ»ú = %3u / %3u", ca, cc));
+ format("¸½ºßÃÍ ¿§ / ʸ»ú = %3u / %3u", ca, cc));
#else
Term_putstr(10, 20, -1, TERM_WHITE,
- format("Current attr/char = %3u / %3u", ca, cc));
+ format("Current attr/char = %3u / %3u", ca, cc));
#endif
Term_putstr(40, 20, -1, TERM_WHITE, "<< ? >>");
/* Prompt */
#ifdef JP
Term_putstr(0, 22, -1, TERM_WHITE,
- "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
+ "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
#else
Term_putstr(0, 22, -1, TERM_WHITE,
- "Command (n/N/^N/a/A/^A/c/C/^C): ");
+ "Command (n/N/^N/a/A/^A/c/C/^C): ");
#endif
/* Get a command */
/* Label the object */
#ifdef JP
Term_putstr(5, 17, -1, TERM_WHITE,
- format("¥¢¥¤¥Æ¥à = %d, ̾Á° = %-40.40s",
- k, (k_name + k_ptr->name)));
+ format("¥¢¥¤¥Æ¥à = %d, ̾Á° = %-40.40s",
+ k, (k_name + k_ptr->name)));
#else
Term_putstr(5, 17, -1, TERM_WHITE,
- format("Object = %d, Name = %-40.40s",
- k, (k_name + k_ptr->name)));
+ format("Object = %d, Name = %-40.40s",
+ k, (k_name + k_ptr->name)));
#endif
/* Label the Default values */
#ifdef JP
Term_putstr(10, 19, -1, TERM_WHITE,
- format("½é´üÃÍ ¿§ / ʸ»ú = %3d / %3d", da, dc));
+ format("½é´üÃÍ ¿§ / ʸ»ú = %3d / %3d", da, dc));
#else
Term_putstr(10, 19, -1, TERM_WHITE,
- format("Default attr/char = %3d / %3d", da, dc));
+ format("Default attr/char = %3d / %3d", da, dc));
#endif
Term_putstr(40, 19, -1, TERM_WHITE, "<< ? >>");
/* Label the Current values */
#ifdef JP
Term_putstr(10, 20, -1, TERM_WHITE,
- format("¸½ºßÃÍ ¿§ / ʸ»ú = %3d / %3d", ca, cc));
+ format("¸½ºßÃÍ ¿§ / ʸ»ú = %3d / %3d", ca, cc));
#else
Term_putstr(10, 20, -1, TERM_WHITE,
- format("Current attr/char = %3d / %3d", ca, cc));
+ format("Current attr/char = %3d / %3d", ca, cc));
#endif
Term_putstr(40, 20, -1, TERM_WHITE, "<< ? >>");
/* Prompt */
#ifdef JP
Term_putstr(0, 22, -1, TERM_WHITE,
- "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
+ "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
#else
Term_putstr(0, 22, -1, TERM_WHITE,
- "Command (n/N/^N/a/A/^A/c/C/^C): ");
+ "Command (n/N/^N/a/A/^A/c/C/^C): ");
#endif
/* Get a command */
/* Label the object */
#ifdef JP
Term_putstr(5, 17, -1, TERM_WHITE,
- format("ÃÏ·Á = %d, ̾Á° = %-40.40s",
- f, (f_name + f_ptr->name)));
+ format("ÃÏ·Á = %d, ̾Á° = %-40.40s",
+ f, (f_name + f_ptr->name)));
#else
Term_putstr(5, 17, -1, TERM_WHITE,
- format("Terrain = %d, Name = %-40.40s",
- f, (f_name + f_ptr->name)));
+ format("Terrain = %d, Name = %-40.40s",
+ f, (f_name + f_ptr->name)));
#endif
/* Label the Default values */
#ifdef JP
Term_putstr(10, 19, -1, TERM_WHITE,
- format("½é´üÃÍ ¿§ / ʸ»ú = %3d / %3d", da, dc));
+ format("½é´üÃÍ ¿§ / ʸ»ú = %3d / %3d", da, dc));
#else
Term_putstr(10, 19, -1, TERM_WHITE,
- format("Default attr/char = %3d / %3d", da, dc));
+ format("Default attr/char = %3d / %3d", da, dc));
#endif
Term_putstr(40, 19, -1, TERM_WHITE, "<< ? >>");
/* Label the Current values */
#ifdef JP
Term_putstr(10, 20, -1, TERM_WHITE,
- format("¸½ºßÃÍ ¿§ / ʸ»ú = %3d / %3d", ca, cc));
+ format("¸½ºßÃÍ ¿§ / ʸ»ú = %3d / %3d", ca, cc));
#else
Term_putstr(10, 20, -1, TERM_WHITE,
- format("Current attr/char = %3d / %3d", ca, cc));
+ format("Current attr/char = %3d / %3d", ca, cc));
#endif
Term_putstr(40, 20, -1, TERM_WHITE, "<< ? >>");
/* Prompt */
#ifdef JP
Term_putstr(0, 22, -1, TERM_WHITE,
- "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
+ "¥³¥Þ¥ó¥É (n/N/^N/a/A/^A/c/C/^C): ");
#else
Term_putstr(0, 22, -1, TERM_WHITE,
- "Command (n/N/^N/a/A/^A/c/C/^C): ");
+ "Command (n/N/^N/a/A/^A/c/C/^C): ");
#endif
/* Get a command */
#ifdef ALLOW_COLORS
#ifdef JP
- prt("(2) ¥«¥é¡¼¤ÎÀßÄê¤ò¥Õ¥¡¥¤¥ë¤Ë½ñ¤½Ð¤¹", 5, 5);
- prt("(3) ¥«¥é¡¼¤ÎÀßÄê¤òÊѹ¹¤¹¤ë", 6, 5);
+ prt("(2) ¥«¥é¡¼¤ÎÀßÄê¤ò¥Õ¥¡¥¤¥ë¤Ë½ñ¤½Ð¤¹", 5, 5);
+ prt("(3) ¥«¥é¡¼¤ÎÀßÄê¤òÊѹ¹¤¹¤ë", 6, 5);
#else
prt("(2) Dump colors", 5, 5);
prt("(3) Modify colors", 6, 5);
/* Dump the monster attr/char info */
fprintf(fff, "V:%d:0x%02X:0x%02X:0x%02X:0x%02X\n\n",
- i, kv, rv, gv, bv);
+ i, kv, rv, gv, bv);
line_num += 2;
}
/* Describe the color */
#ifdef JP
Term_putstr(5, 10, -1, TERM_WHITE,
- format("¥«¥é¡¼ = %d, ̾Á° = %s", a, name));
+ format("¥«¥é¡¼ = %d, ̾Á° = %s", a, name));
#else
Term_putstr(5, 10, -1, TERM_WHITE,
- format("Color = %d, Name = %s", a, name));
+ format("Color = %d, Name = %s", a, name));
#endif
/* Label the Current values */
Term_putstr(5, 12, -1, TERM_WHITE,
- format("K = 0x%02x / R,G,B = 0x%02x,0x%02x,0x%02x",
- angband_color_table[a][0],
- angband_color_table[a][1],
- angband_color_table[a][2],
- angband_color_table[a][3]));
+ format("K = 0x%02x / R,G,B = 0x%02x,0x%02x,0x%02x",
+ angband_color_table[a][0],
+ angband_color_table[a][1],
+ angband_color_table[a][2],
+ angband_color_table[a][3]));
/* Prompt */
#ifdef JP
Term_putstr(0, 14, -1, TERM_WHITE,
- "¥³¥Þ¥ó¥É (n/N/k/K/r/R/g/G/b/B): ");
+ "¥³¥Þ¥ó¥É (n/N/k/K/r/R/g/G/b/B): ");
#else
Term_putstr(0, 14, -1, TERM_WHITE,
- "Command (n/N/k/K/r/R/g/G/b/B): ");
+ "Command (n/N/k/K/r/R/g/G/b/B): ");
#endif
/* Silly message */
#ifdef JP
msg_format("ÊѶòÈÚÅÜ(Hengband) %d.%d.%d",
- FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+ FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
#else
msg_format("You are playing Hengband %d.%d.%d.",
- FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+ FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
#endif
}
}
/* Display the feeling */
- if (turn - old_turn >= (150 - dun_level)*TURNS_PER_TICK || cheat_xtra)
- {
- if (p_ptr->muta3 & MUT3_GOOD_LUCK) msg_print(do_cmd_feeling_text_lucky[feeling]);
- else {
+ if (turn - old_turn >= (150 - dun_level)*TURNS_PER_TICK || cheat_xtra)
+ {
+ if (p_ptr->muta3 & MUT3_GOOD_LUCK) msg_print(do_cmd_feeling_text_lucky[feeling]);
+ else {
if((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON)){
msg_print(do_cmd_feeling_text_combat[feeling]);
}else
msg_print(do_cmd_feeling_text[feeling]);
}
- }
- else
- {
- msg_print(do_cmd_feeling_text[0]);
- }
+ }
+ else
+ {
+ msg_print(do_cmd_feeling_text[0]);
+ }
}
/*
* HACK:Ring of Lordly protection and Dragon shield/helm
- * have random resistances.
- */
+ * have random resistances.
+ */
if ( ((o_ptr->tval >= TV_BOW && o_ptr->tval<= TV_DRAG_ARMOR && o_ptr->name2)
|| (o_ptr->tval == TV_RING && o_ptr->sval == SV_RING_LORDLY)
|| (o_ptr->tval == TV_SHIELD && o_ptr->sval == SV_DRAGON_SHIELD)
byte tval;
int i=0;
- int j=0;
+ int j=0;
char where[32];
}
fprintf(fff,"%s\n",inven_res_label);
- for (tval=TV_BOW; tval <= TV_RING; tval++){
+ for (tval=TV_BOW; tval <= TV_RING; tval++){
- if (j!=0) {
- for (;j<9;j++) fprintf(fff, "\n");
- j=0;
+ if (j!=0) {
+ for (;j<9;j++) fprintf(fff, "\n");
+ j=0;
fprintf(fff,"%s\n",inven_res_label);
}
if (okay[k]) who[n++] = k;
}
- /* Select the sort method */
- ang_sort_comp = ang_sort_art_comp;
- ang_sort_swap = ang_sort_art_swap;
+ /* Select the sort method */
+ ang_sort_comp = ang_sort_art_comp;
+ ang_sort_swap = ang_sort_art_swap;
- /* Sort the array by dungeon depth of monsters */
- ang_sort(who, &why, n);
+ /* Sort the array by dungeon depth of monsters */
+ ang_sort(who, &why, n);
/* Scan the artifacts */
for (k = 0; k < n; k++)
if (r_ptr->name) who[n++] = i;
}
- /* Select the sort method */
- ang_sort_comp = ang_sort_comp_hook;
- ang_sort_swap = ang_sort_swap_hook;
+ /* Select the sort method */
+ ang_sort_comp = ang_sort_comp_hook;
+ ang_sort_swap = ang_sort_swap_hook;
- /* Sort the array by dungeon depth of monsters */
- ang_sort(who, &why, n);
+ /* Sort the array by dungeon depth of monsters */
+ ang_sort(who, &why, n);
/* Scan the monster races */
for (k = 0; k < n; k++)
/* Print a message */
#ifdef JP
fprintf(fff, " %s¤Ï¤Þ¤ÀÀ¸¤¤Æ¤¤¤ë¡£\n",
- (r_name + r_ptr->name));
+ (r_name + r_ptr->name));
#else
fprintf(fff, " %s is alive\n",
- (r_name + r_ptr->name));
+ (r_name + r_ptr->name));
#endif
}
if (r_ptr->name) who[n++] = i;
}
- /* Select the sort method */
- ang_sort_comp = ang_sort_comp_hook;
- ang_sort_swap = ang_sort_swap_hook;
+ /* Select the sort method */
+ ang_sort_comp = ang_sort_comp_hook;
+ ang_sort_swap = ang_sort_swap_hook;
- /* Sort the array by dungeon depth of monsters */
- ang_sort(who, &why, n);
+ /* Sort the array by dungeon depth of monsters */
+ ang_sort(who, &why, n);
/* Scan the monster races */
for (k = 0; k < n; k++)
/* Print a message */
#ifdef JP
fprintf(fff, " %s¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡£\n",
- (r_name + r_ptr->name));
+ (r_name + r_ptr->name));
#else
fprintf(fff, " %s is dead\n",
- (r_name + r_ptr->name));
+ (r_name + r_ptr->name));
#endif
}
strcpy(&(Name[NameLen - 2]), "lves");
}
else if (suffix(Name, "ch") ||
- suffix(Name, "sh") ||
+ suffix(Name, "sh") ||
suffix(Name, "nx") ||
suffix(Name, "s") ||
suffix(Name, "o"))
fprintf(fff, " °Ý»ý¥³¥¹¥È: %d%% MP\n", show_upkeep);
#else
fprintf(fff, " Total: %d pet%s.\n",
- t_friends, (t_friends == 1 ? "" : "s"));
+ t_friends, (t_friends == 1 ? "" : "s"));
fprintf(fff, " Upkeep: %d%% mana.\n", show_upkeep);
#endif
if (r_ptr->name) who[n++] = i;
}
- /* Select the sort method */
- ang_sort_comp = ang_sort_comp_hook;
- ang_sort_swap = ang_sort_swap_hook;
+ /* Select the sort method */
+ ang_sort_comp = ang_sort_comp_hook;
+ ang_sort_swap = ang_sort_swap_hook;
- /* Sort the array by dungeon depth of monsters */
- ang_sort(who, &why, n);
+ /* Sort the array by dungeon depth of monsters */
+ ang_sort(who, &why, n);
/* Scan the monster races */
for (k = 0; k < n; k++)
fprintf(fff," ¹ç·×: %lu ɤ¤òÅݤ·¤¿¡£\n", Total);
#else
fprintf(fff," Total: %lu creature%s killed.\n",
- Total, (Total == 1 ? "" : "s"));
+ Total, (Total == 1 ? "" : "s"));
#endif
/* Reset the old quest number */
p_ptr->inside_quest = old_quest;
- /* No info from "silent" quests */
- if (quest[i].flags & QUEST_FLAG_SILENT) continue;
+ /* No info from "silent" quests */
+ if (quest[i].flags & QUEST_FLAG_SILENT) continue;
total++;
}
}
else if ((quest[i].type == QUEST_TYPE_RANDOM) &&
- (quest[i].level < rand_level))
+ (quest[i].level < rand_level))
{
/* New random */
rand_level = quest[i].level;
{
if (i < MIN_RANDOM_QUEST)
{
- int old_quest;
+ int old_quest;
/* Set the quest number temporary */
old_quest = p_ptr->inside_quest;
/* Reset the old quest number */
p_ptr->inside_quest = old_quest;
- /* No info from "silent" quests */
- if (quest[i].flags & QUEST_FLAG_SILENT) continue;
+ /* No info from "silent" quests */
+ if (quest[i].flags & QUEST_FLAG_SILENT) continue;
}
total++;
{
/* Print the quest info */
- if (quest[i].complev == 0)
- {
- sprintf(tmp_str,
+ if (quest[i].complev == 0)
+ {
+ sprintf(tmp_str,
#ifdef JP
- "%s (%d³¬) - ÉÔÀﾡ\n",
+ "%s (%d³¬) - ÉÔÀﾡ\n",
#else
- "%s (Dungeon level: %d) - (Cancelled)\n",
+ "%s (Dungeon level: %d) - (Cancelled)\n",
#endif
- r_name+r_info[quest[i].r_idx].name,
- quest[i].level);
- }
- else
- {
- sprintf(tmp_str,
+ r_name+r_info[quest[i].r_idx].name,
+ quest[i].level);
+ }
+ else
+ {
+ sprintf(tmp_str,
#ifdef JP
- "%s (%d³¬) - ¥ì¥Ù¥ë%d\n",
+ "%s (%d³¬) - ¥ì¥Ù¥ë%d\n",
#else
- "%s (Dungeon level: %d) - level %d\n",
+ "%s (Dungeon level: %d) - level %d\n",
#endif
- r_name+r_info[quest[i].r_idx].name,
- quest[i].level,
- quest[i].complev);
- }
+ r_name+r_info[quest[i].r_idx].name,
+ quest[i].level,
+ quest[i].complev);
+ }
}
else
{
{
if (i < MIN_RANDOM_QUEST)
{
- int old_quest;
+ int old_quest;
/* Set the quest number temporary */
old_quest = p_ptr->inside_quest;
/* Reset the old quest number */
p_ptr->inside_quest = old_quest;
- /* No info from "silent" quests */
- if (quest[i].flags & QUEST_FLAG_SILENT) continue;
+ /* No info from "silent" quests */
+ if (quest[i].flags & QUEST_FLAG_SILENT) continue;
}
total++;
for (i = 0; i < st_ptr->stock_num; i++)
{
#ifdef JP
- if ((i % 12) == 0) fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++);
+ if ((i % 12) == 0) fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++);
object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
if (strlen(o_name) <= 80-3)
{
char out_val[160];
cptr p;
#ifdef JP
- char jverb_buf[128];
+ char jverb_buf[128];
#endif
int menu_line = (use_menu ? 1 : 0);
#ifdef JP
jverb1( prompt, jverb_buf );
(void) strnfmt(out_val, 78, "(%^s:%c-%c, '*'¤Ç°ìÍ÷, ESC¤ÇÃæÃÇ) ¤É¤Î%s¤ò%^s¤Þ¤¹¤«? ",
- p, I2A(0), I2A(num - 1), p, jverb_buf );
+ p, I2A(0), I2A(num - 1), p, jverb_buf );
#else
(void)strnfmt(out_val, 78, "(%^ss %c-%c, *=List, ESC=exit) %^s which %s? ",
p, I2A(0), I2A(num - 1), prompt, p);
/* Get a spell from the user */
- choice = (always_show_list || use_menu) ? ESCAPE:1;
- while (!flag)
- {
+ choice = (always_show_list || use_menu) ? ESCAPE:1;
+ while (!flag)
+ {
if( choice==ESCAPE ) choice = ' ';
else if( !get_com(out_val, &choice, TRUE) )break;
{
bell();
#ifdef JP
- msg_format("¤½¤Î%s¤ò%s¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¡£", p, prompt);
+ msg_format("¤½¤Î%s¤ò%s¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¡£", p, prompt);
#else
msg_format("You may not %s that %s.", prompt, p);
#endif
/* Prompt */
#ifdef JP
jverb1( prompt, jverb_buf );
- /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½¤ËÂбþ */
- (void) strnfmt(tmp_val, 78, "%s(MP%d, ¼ºÇÔΨ%d%%)¤ò%s¤Þ¤¹¤«? ",
- spell_names[technic2magic(use_realm)-1][spell], shouhimana,
+ /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½¤ËÂбþ */
+ (void) strnfmt(tmp_val, 78, "%s(MP%d, ¼ºÇÔΨ%d%%)¤ò%s¤Þ¤¹¤«? ",
+ spell_names[technic2magic(use_realm)-1][spell], shouhimana,
spell_chance(spell, use_realm),jverb_buf);
#else
(void)strnfmt(tmp_val, 78, "%^s %s (%d mana, %d%% fail)? ",
s = "You have no books that you can read.";
#endif
- select_spellbook=TRUE;
+ select_spellbook=TRUE;
if (p_ptr->pclass == CLASS_FORCETRAINER)
select_the_force = TRUE;
if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))){
- select_spellbook = FALSE;
+ select_spellbook = FALSE;
select_the_force = FALSE;
- return;
- }
- select_spellbook = FALSE;
+ return;
+ }
+ select_spellbook = FALSE;
select_the_force = FALSE;
if (item == 1111) { /* the_force */
s = "You have no books that you can read.";
#endif
- select_spellbook=TRUE;
+ select_spellbook=TRUE;
if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
- select_spellbook=FALSE;
+ select_spellbook=FALSE;
/* Get the item (in the pack) */
if (item >= 0)
{
/* Ask for a spell, allow cancel */
#ifdef JP
- if (!get_spell(&spell, "³Ø¤Ö", sval, FALSE, o_ptr->tval - TV_LIFE_BOOK + 1)
+ if (!get_spell(&spell, "³Ø¤Ö", sval, FALSE, o_ptr->tval - TV_LIFE_BOOK + 1)
&& (spell == -1)) return;
#else
if (!get_spell(&spell, "study", sval, FALSE, o_ptr->tval - TV_LIFE_BOOK + 1)
/* Mention the result */
#ifdef JP
- /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½¤ËÂбþ */
+ /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½¤ËÂбþ */
if (mp_ptr->spell_book == TV_MUSIC_BOOK)
{
- msg_format("%s¤ò³Ø¤ó¤À¡£",
+ msg_format("%s¤ò³Ø¤ó¤À¡£",
spell_names[technic2magic(increment ? p_ptr->realm2 : p_ptr->realm1)-1][spell % 32]);
}
else
{
- msg_format("%s¤Î%s¤ò³Ø¤ó¤À¡£",
+ msg_format("%s¤Î%s¤ò³Ø¤ó¤À¡£",
spell_names[technic2magic(increment ? p_ptr->realm2 : p_ptr->realm1)-1][spell % 32] ,p);
}
#else
{
/* Message */
#ifdef JP
- if( p_ptr->new_spells < 10 ){
- msg_format("¤¢¤È %d ¤Ä¤Î%s¤ò³Ø¤Ù¤ë¡£", p_ptr->new_spells, p);
- }else{
- msg_format("¤¢¤È %d ¸Ä¤Î%s¤ò³Ø¤Ù¤ë¡£", p_ptr->new_spells, p);
- }
+ if( p_ptr->new_spells < 10 ){
+ msg_format("¤¢¤È %d ¤Ä¤Î%s¤ò³Ø¤Ù¤ë¡£", p_ptr->new_spells, p);
+ }else{
+ msg_format("¤¢¤È %d ¸Ä¤Î%s¤ò³Ø¤Ù¤ë¡£", p_ptr->new_spells, p);
+ }
#else
msg_format("You can learn %d more %s%s.",
p_ptr->new_spells, p,
p_ptr->update |= (PU_SPELLS);
update_stuff();
- /* Redraw object recall */
- p_ptr->window |= (PW_OBJECT);
+ /* Redraw object recall */
+ p_ptr->window |= (PW_OBJECT);
}
if ((p_ptr->pclass == CLASS_ROGUE) ||
(p_ptr->pclass == CLASS_HIGH_MAGE) ||
- (p_ptr->pclass == CLASS_SORCERER))
+ (p_ptr->pclass == CLASS_SORCERER))
die = (randint1(110)) + plev / 5;
/* Card sharks and high mages get a level bonus */
if (!get_aim_dir(&dir)) return FALSE;
fire_ball(GF_HOLY_FIRE, dir,
- (damroll(3, 6) + plev +
- (plev / ((p_ptr->pclass == CLASS_PRIEST ||
- p_ptr->pclass == CLASS_HIGH_MAGE ||
+ (damroll(3, 6) + plev +
+ (plev / ((p_ptr->pclass == CLASS_PRIEST ||
+ p_ptr->pclass == CLASS_HIGH_MAGE ||
p_ptr->pclass == CLASS_SORCERER) ? 2 : 4))),
- ((plev < 30) ? 2 : 3));
+ ((plev < 30) ? 2 : 3));
break;
case 10: /* Exorcism */
set_action(ACTION_NONE);
- switch(p_ptr->magic_num1[0])
- {
- case MUSIC_BLESS:
- if (!p_ptr->blessed)
+ switch(p_ptr->magic_num1[0])
+ {
+ case MUSIC_BLESS:
+ if (!p_ptr->blessed)
#ifdef JP
msg_print("¹â·é¤Êµ¤Ê¬¤¬¾Ã¤¨¼º¤»¤¿¡£");
#else
msg_print("The prayer has expired.");
#endif
- break;
- case MUSIC_HERO:
- if (!p_ptr->hero)
+ break;
+ case MUSIC_HERO:
+ if (!p_ptr->hero)
{
#ifdef JP
msg_print("¥Ò¡¼¥í¡¼¤Îµ¤Ê¬¤¬¾Ã¤¨¼º¤»¤¿¡£");
/* Recalculate hitpoints */
p_ptr->update |= (PU_HP);
}
- break;
- case MUSIC_MIND:
- if (!p_ptr->tim_esp)
+ break;
+ case MUSIC_MIND:
+ if (!p_ptr->tim_esp)
{
#ifdef JP
msg_print("°Õ¼±¤Ï¸µ¤ËÌá¤Ã¤¿¡£");
/* Update the monsters */
p_ptr->update |= (PU_MONSTERS);
}
- break;
- case MUSIC_STEALTH:
- if (!p_ptr->tim_stealth)
+ break;
+ case MUSIC_STEALTH:
+ if (!p_ptr->tim_stealth)
#ifdef JP
msg_print("»Ñ¤¬¤Ï¤Ã¤¤ê¤È¸«¤¨¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¡£");
#else
msg_print("You are no longer hided.");
#endif
- break;
- case MUSIC_RESIST:
- if (!p_ptr->oppose_acid)
+ break;
+ case MUSIC_RESIST:
+ if (!p_ptr->oppose_acid)
#ifdef JP
msg_print("»À¤Ø¤ÎÂÑÀ¤¬Çö¤ì¤¿µ¤¤¬¤¹¤ë¡£");
#else
msg_print("You feel less resistant to acid.");
#endif
- if (!p_ptr->oppose_elec)
+ if (!p_ptr->oppose_elec)
#ifdef JP
msg_print("ÅÅ·â¤Ø¤ÎÂÑÀ¤¬Çö¤ì¤¿µ¤¤¬¤¹¤ë¡£");
#else
msg_print("You feel less resistant to elec.");
#endif
- if (!p_ptr->oppose_fire)
+ if (!p_ptr->oppose_fire)
#ifdef JP
msg_print("²Ð¤Ø¤ÎÂÑÀ¤¬Çö¤ì¤¿µ¤¤¬¤¹¤ë¡£");
#else
msg_print("You feel less resistant to fire.");
#endif
- if (!p_ptr->oppose_cold)
+ if (!p_ptr->oppose_cold)
#ifdef JP
msg_print("Î䵤¤Ø¤ÎÂÑÀ¤¬Çö¤ì¤¿µ¤¤¬¤¹¤ë¡£");
#else
msg_print("You feel less resistant to cold.");
#endif
- if (!p_ptr->oppose_pois)
+ if (!p_ptr->oppose_pois)
#ifdef JP
msg_print("ÆǤؤÎÂÑÀ¤¬Çö¤ì¤¿µ¤¤¬¤¹¤ë¡£");
#else
msg_print("You feel less resistant to pois.");
#endif
- break;
- case MUSIC_SPEED:
- if (!p_ptr->fast)
+ break;
+ case MUSIC_SPEED:
+ if (!p_ptr->fast)
#ifdef JP
msg_print("Æ°¤¤ÎÁÇÁᤵ¤¬¤Ê¤¯¤Ê¤Ã¤¿¤è¤¦¤À¡£");
#else
msg_print("You feel yourself slow down.");
#endif
- break;
- case MUSIC_SHERO:
- if (!p_ptr->hero)
+ break;
+ case MUSIC_SHERO:
+ if (!p_ptr->hero)
{
#ifdef JP
msg_print("¥Ò¡¼¥í¡¼¤Îµ¤Ê¬¤¬¾Ã¤¨¼º¤»¤¿¡£");
p_ptr->update |= (PU_HP);
}
- if (!p_ptr->fast)
+ if (!p_ptr->fast)
#ifdef JP
msg_print("Æ°¤¤ÎÁÇÁᤵ¤¬¤Ê¤¯¤Ê¤Ã¤¿¤è¤¦¤À¡£");
#else
msg_print("You feel yourself slow down.");
#endif
- break;
- case MUSIC_INVULN:
- if (!p_ptr->invuln)
+ break;
+ case MUSIC_INVULN:
+ if (!p_ptr->invuln)
{
#ifdef JP
msg_print("̵Ũ¤Ç¤Ï¤Ê¤¯¤Ê¤Ã¤¿¡£");
/* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
}
- break;
- }
+ break;
+ }
p_ptr->magic_num1[0] = MUSIC_NONE;
p_ptr->magic_num2[0] = 0;
int plev = p_ptr->lev;
int dir;
- if(p_ptr->magic_num1[0])
- {
- stop_singing();
- }
+ if(p_ptr->magic_num1[0])
+ {
+ stop_singing();
+ }
- p_ptr->magic_num2[0] = spell;
+ p_ptr->magic_num2[0] = spell;
switch (spell)
{
s = "You have no spell books!";
#endif
- select_spellbook=TRUE;
+ select_spellbook=TRUE;
if (p_ptr->pclass == CLASS_FORCETRAINER)
select_the_force = TRUE;
if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))){
- select_spellbook = FALSE;
+ select_spellbook = FALSE;
select_the_force = FALSE;
- return;
- }
- select_spellbook = FALSE;
+ return;
+ }
+ select_spellbook = FALSE;
select_the_force = FALSE;
if (item == 1111) { /* the_force */
/* Ask for a spell */
#ifdef JP
- if (!get_spell(&spell,
- ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "±Ó¾§¤¹¤ë" : (mp_ptr->spell_book == TV_MUSIC_BOOK) ? "²Î¤¦" : "¾§¤¨¤ë"),
+ if (!get_spell(&spell,
+ ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "±Ó¾§¤¹¤ë" : (mp_ptr->spell_book == TV_MUSIC_BOOK) ? "²Î¤¦" : "¾§¤¨¤ë"),
sval, TRUE, realm))
- {
- if (spell == -2) msg_format("¤½¤ÎËܤˤÏÃΤäƤ¤¤ë%s¤¬¤Ê¤¤¡£", prayer);
- return;
- }
+ {
+ if (spell == -2) msg_format("¤½¤ÎËܤˤÏÃΤäƤ¤¤ë%s¤¬¤Ê¤¤¡£", prayer);
+ return;
+ }
#else
if (!get_spell(&spell, ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "recite" : "cast"),
sval, TRUE, realm))
/* Gain experience */
gain_exp(e * s_ptr->slevel);
- /* Redraw object recall */
- p_ptr->window |= (PW_OBJECT);
+ /* Redraw object recall */
+ p_ptr->window |= (PW_OBJECT);
if (realm == REALM_LIFE)
{
}
}
else if ((p_ptr->prace == RACE_GOLEM) ||
- (p_ptr->prace == RACE_ZOMBIE) ||
- (p_ptr->prace == RACE_ENT) ||
- (p_ptr->prace == RACE_DEMON) ||
- (p_ptr->prace == RACE_ANDROID) ||
- (p_ptr->prace == RACE_SPECTRE) ||
+ (p_ptr->prace == RACE_ZOMBIE) ||
+ (p_ptr->prace == RACE_ENT) ||
+ (p_ptr->prace == RACE_DEMON) ||
+ (p_ptr->prace == RACE_ANDROID) ||
+ (p_ptr->prace == RACE_SPECTRE) ||
(mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING))
{
#ifdef JP
return;
}
- if((p_ptr->pclass == CLASS_BARD) && p_ptr->magic_num1[0])
- {
- stop_singing();
- }
+ if((p_ptr->pclass == CLASS_BARD) && p_ptr->magic_num1[0])
+ {
+ stop_singing();
+ }
/* Get the item (in the pack) */
if (item >= 0)
if (!p_ptr->free_act)
{
#ifdef JP
- msg_print("¤¢¤Ê¤¿¤Ï̲¤Ã¤Æ¤·¤Þ¤Ã¤¿¡£");
+ msg_print("¤¢¤Ê¤¿¤Ï̲¤Ã¤Æ¤·¤Þ¤Ã¤¿¡£");
#else
- msg_print("You fall asleep.");
+ msg_print("You fall asleep.");
#endif
return;
}
- if((p_ptr->pclass == CLASS_BARD) && p_ptr->magic_num1[0])
- {
- stop_singing();
- }
+ if((p_ptr->pclass == CLASS_BARD) && p_ptr->magic_num1[0])
+ {
+ stop_singing();
+ }
/* Not identified yet */
ident = FALSE;
msg_print(NULL);
msg_print("°Å°Ç¤ÎÃæ¤Ë·Ò¤®¤È¤á¤ë¡£¡×");
#else
- msg_print("'One Ring to rule them all, ");
+ msg_print("'One Ring to rule them all, ");
msg_print(NULL);
msg_print("One Ring to find them, ");
msg_print(NULL);
}
for (k = 0; k < num; k++)
{
- attempts = 1000;
+ attempts = 1000;
while(attempts--)
{
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- p_ptr->window |= (PW_INVEN);
+ p_ptr->window |= (PW_INVEN);
return;
}
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- p_ptr->window |= (PW_INVEN);
+ p_ptr->window |= (PW_INVEN);
return;
}
static void do_cmd_zap_rod_aux(int item)
{
int ident, chance, lev, fail;
- int dir = 0;
+ int dir = 0;
object_type *o_ptr;
bool success;
for (k = 0; k < num; k++)
{
- attempts = 1000;
+ attempts = 1000;
while(attempts--)
{
o_ptr->timeout = 15;
break;
}
- case ART_PALANTIR:
- {
- monster_type *m_ptr;
- monster_race *r_ptr;
- int i;
+ case ART_PALANTIR:
+ {
+ monster_type *m_ptr;
+ monster_race *r_ptr;
+ int i;
#ifdef JP
- msg_print("´ñ̯¤Ê¾ì½ê¤¬Æ¬¤ÎÃæ¤ËÉ⤫¤ó¤À¡¥¡¥¡¥");
+ msg_print("´ñ̯¤Ê¾ì½ê¤¬Æ¬¤ÎÃæ¤ËÉ⤫¤ó¤À¡¥¡¥¡¥");
#else
- msg_print("Some strange places show up in your mind. And you see ...");
+ msg_print("Some strange places show up in your mind. And you see ...");
#endif
- /* Process the monsters (backwards) */
- for (i = m_max - 1; i >= 1; i--)
- {
- /* Access the monster */
- m_ptr = &m_list[i];
+ /* Process the monsters (backwards) */
+ for (i = m_max - 1; i >= 1; i--)
+ {
+ /* Access the monster */
+ m_ptr = &m_list[i];
- /* Ignore "dead" monsters */
- if (!m_ptr->r_idx) continue;
+ /* Ignore "dead" monsters */
+ if (!m_ptr->r_idx) continue;
- r_ptr = &r_info[m_ptr->r_idx];
+ r_ptr = &r_info[m_ptr->r_idx];
- if(r_ptr->flags1 & RF1_UNIQUE)
- {
+ if(r_ptr->flags1 & RF1_UNIQUE)
+ {
#ifdef JP
msg_format("%s¡¥ ",r_name + r_ptr->name);
#else
- msg_format("%s. ",r_name + r_ptr->name);
+ msg_format("%s. ",r_name + r_ptr->name);
#endif
- }
- }
- o_ptr->timeout = 200;
- break;
- }
+ }
+ }
+ o_ptr->timeout = 200;
+ break;
+ }
case ART_STONE_LORE:
{
o_ptr->timeout = randint0(120) + 120;
break;
}
- case ART_HURIN:
+ case ART_HURIN:
{
(void)set_fast(randint1(50) + 50, FALSE);
hp_player(10);
(void)set_image(0);
o_ptr->timeout = 100;
- break;
+ break;
}
case ART_BOLISHOI:
(void)charm_animal(dir, p_ptr->lev);
o_ptr->timeout = 200;
- break;
+ break;
}
case ART_ARUNRUTH:
}
else if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3))
- {
- switch (o_ptr->xtra3-1)
- {
- case ESSENCE_TMP_RES_ACID:
- (void)set_oppose_acid(randint1(20) + 20, FALSE);
- o_ptr->timeout = randint0(50) + 50;
- return;
-
- case ESSENCE_TMP_RES_ELEC:
- (void)set_oppose_elec(randint1(20) + 20, FALSE);
- o_ptr->timeout = randint0(50) + 50;
- return;
-
- case ESSENCE_TMP_RES_FIRE:
- (void)set_oppose_fire(randint1(20) + 20, FALSE);
- o_ptr->timeout = randint0(50) + 50;
- return;
-
- case ESSENCE_TMP_RES_COLD:
- (void)set_oppose_cold(randint1(20) + 20, FALSE);
- o_ptr->timeout = randint0(50) + 50;
- return;
-
- case TR_IMPACT:
- earthquake(py, px, 5);
- o_ptr->timeout = 100 + randint1(100);
-
- /* Window stuff */
- p_ptr->window |= (PW_INVEN | PW_EQUIP);
-
- /* Done */
- return;
- }
- }
+ {
+ switch (o_ptr->xtra3-1)
+ {
+ case ESSENCE_TMP_RES_ACID:
+ (void)set_oppose_acid(randint1(20) + 20, FALSE);
+ o_ptr->timeout = randint0(50) + 50;
+ return;
+
+ case ESSENCE_TMP_RES_ELEC:
+ (void)set_oppose_elec(randint1(20) + 20, FALSE);
+ o_ptr->timeout = randint0(50) + 50;
+ return;
+
+ case ESSENCE_TMP_RES_FIRE:
+ (void)set_oppose_fire(randint1(20) + 20, FALSE);
+ o_ptr->timeout = randint0(50) + 50;
+ return;
+
+ case ESSENCE_TMP_RES_COLD:
+ (void)set_oppose_cold(randint1(20) + 20, FALSE);
+ o_ptr->timeout = randint0(50) + 50;
+ return;
+
+ case TR_IMPACT:
+ earthquake(py, px, 5);
+ o_ptr->timeout = 100 + randint1(100);
+
+ /* Window stuff */
+ p_ptr->window |= (PW_INVEN | PW_EQUIP);
+
+ /* Done */
+ return;
+ }
+ }
else if (o_ptr->name2 == EGO_TRUMP)
chance = randint0(5);
#ifdef JP
msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",
- ((chance == 1) ? "°ðºÊ" :
- ((chance == 2) ? "Î䵤" :
- ((chance == 3) ? "»À" :
- ((chance == 4) ? "ÆÇ¥¬¥¹" : "²Ð±ê")))));
+ ((chance == 1) ? "°ðºÊ" :
+ ((chance == 2) ? "Î䵤" :
+ ((chance == 3) ? "»À" :
+ ((chance == 4) ? "ÆÇ¥¬¥¹" : "²Ð±ê")))));
#else
msg_format("You breathe %s.",
- ((chance == 1) ? "lightning" :
- ((chance == 2) ? "frost" :
- ((chance == 3) ? "acid" :
- ((chance == 4) ? "poison gas" : "fire")))));
+ ((chance == 1) ? "lightning" :
+ ((chance == 2) ? "frost" :
+ ((chance == 3) ? "acid" :
+ ((chance == 4) ? "poison gas" : "fire")))));
#endif
fire_ball(((chance == 1) ? GF_ELEC :
- ((chance == 2) ? GF_COLD :
- ((chance == 3) ? GF_ACID :
- ((chance == 4) ? GF_POIS : GF_FIRE)))),
- dir, 250, -2);
+ ((chance == 2) ? GF_COLD :
+ ((chance == 3) ? GF_ACID :
+ ((chance == 4) ? GF_POIS : GF_FIRE)))),
+ dir, 250, -2);
o_ptr->timeout = randint0(200) + 200;
break;
}
chance = randint0(2);
#ifdef JP
msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",
- ((chance == 1 ? "¥«¥ª¥¹" : "Îô²½")));
+ ((chance == 1 ? "¥«¥ª¥¹" : "Îô²½")));
#else
msg_format("You breathe %s.",
- ((chance == 1 ? "chaos" : "disenchantment")));
+ ((chance == 1 ? "chaos" : "disenchantment")));
#endif
fire_ball((chance == 1 ? GF_CHAOS : GF_DISENCHANT),
- dir, 220, -2);
+ dir, 220, -2);
o_ptr->timeout = randint0(200) + 200;
break;
}
chance = randint0(2);
#ifdef JP
msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",
- ((chance == 1 ? "¹ì²»" : "ÇËÊÒ")));
+ ((chance == 1 ? "¹ì²»" : "ÇËÊÒ")));
#else
msg_format("You breathe %s.",
- ((chance == 1 ? "sound" : "shards")));
+ ((chance == 1 ? "sound" : "shards")));
#endif
fire_ball((chance == 1 ? GF_SOUND : GF_SHARDS),
- dir, 230, -2);
+ dir, 230, -2);
o_ptr->timeout = randint0(200) + 200;
break;
}
chance = randint0(4);
#ifdef JP
msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿",
- ((chance == 1) ? "¥«¥ª¥¹" :
- ((chance == 2) ? "Îô²½" :
- ((chance == 3) ? "¹ì²»" : "ÇËÊÒ"))));
+ ((chance == 1) ? "¥«¥ª¥¹" :
+ ((chance == 2) ? "Îô²½" :
+ ((chance == 3) ? "¹ì²»" : "ÇËÊÒ"))));
#else
msg_format("You breathe %s.",
- ((chance == 1) ? "chaos" :
- ((chance == 2) ? "disenchantment" :
- ((chance == 3) ? "sound" : "shards"))));
+ ((chance == 1) ? "chaos" :
+ ((chance == 2) ? "disenchantment" :
+ ((chance == 3) ? "sound" : "shards"))));
#endif
fire_ball(((chance == 1) ? GF_CHAOS :
- ((chance == 2) ? GF_DISENCHANT :
- ((chance == 3) ? GF_SOUND : GF_SHARDS))),
- dir, 250, -2);
+ ((chance == 2) ? GF_DISENCHANT :
+ ((chance == 3) ? GF_SOUND : GF_SHARDS))),
+ dir, 250, -2);
o_ptr->timeout = randint0(200) + 200;
break;
}
chance = randint0(2);
#ifdef JP
msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",
- ((chance == 0 ? "Á®¸÷" : "°Å¹õ")));
+ ((chance == 0 ? "Á®¸÷" : "°Å¹õ")));
#else
msg_format("You breathe %s.",
- ((chance == 0 ? "light" : "darkness")));
+ ((chance == 0 ? "light" : "darkness")));
#endif
fire_ball((chance == 0 ? GF_LITE : GF_DARK), dir, 200, -2);
/* Save the screen */
screen_save();
- request_list = always_show_list;
+ request_list = always_show_list;
/* Get a spell from the user */
- while (!flag)
- {
+ while (!flag)
+ {
/* Show the list */
if (request_list || use_menu)
{
}
else
{
- int dir = 0;
+ int dir = 0;
if (tval == TV_ROD)
{
TRC_CALL_DEMON | TRC_CALL_DRAGON | TRC_TELEPORT)
#define TRC_P_FLAG_MASK \
- (TRC_TELEPORT_SELF | TRC_CHAINSWORD | \
+ (TRC_TELEPORT_SELF | TRC_CHAINSWORD | \
TRC_TY_CURSE | TRC_DRAIN_EXP | TRC_ADD_L_CURSE | TRC_ADD_H_CURSE | \
TRC_CALL_ANIMAL | TRC_CALL_DEMON | TRC_CALL_DRAGON | TRC_COWARDICE | \
TRC_TELEPORT | TRC_DRAIN_HP | TRC_DRAIN_MANA)
}
case FEEL_CURSED:
{
- if (heavy)
- feel = randint0(3) ? FEEL_GOOD : FEEL_AVERAGE;
- else
- feel = FEEL_UNCURSED;
+ if (heavy)
+ feel = randint0(3) ? FEEL_GOOD : FEEL_AVERAGE;
+ else
+ feel = FEEL_UNCURSED;
break;
}
case FEEL_AVERAGE:
}
case FEEL_GOOD:
{
- if (heavy)
- feel = randint0(3) ? FEEL_CURSED : FEEL_AVERAGE;
- else
- feel = FEEL_CURSED;
+ if (heavy)
+ feel = randint0(3) ? FEEL_CURSED : FEEL_AVERAGE;
+ else
+ feel = FEEL_CURSED;
break;
}
case FEEL_EXCELLENT:
describe_use(slot),o_name, index_to_label(slot),game_inscriptions[feel]);
#else
msg_format("You feel the %s (%c) you are %s %s %s...",
- o_name, index_to_label(slot), describe_use(slot),
- ((o_ptr->number == 1) ? "is" : "are"),
+ o_name, index_to_label(slot), describe_use(slot),
+ ((o_ptr->number == 1) ? "is" : "are"),
game_inscriptions[feel]);
#endif
o_name, index_to_label(slot),game_inscriptions[feel]);
#else
msg_format("You feel the %s (%c) in your pack %s %s...",
- o_name, index_to_label(slot),
- ((o_ptr->number == 1) ? "is" : "are"),
+ o_name, index_to_label(slot),
+ ((o_ptr->number == 1) ? "is" : "are"),
game_inscriptions[feel]);
#endif
/* Auto-inscription/destroy */
idx = is_autopick(o_ptr);
auto_inscribe_item(slot, idx);
- if (destroy_feeling)
- auto_destroy_item(slot, idx);
+ if (destroy_feeling)
+ auto_destroy_item(slot, idx);
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
max_level = 100;
}
else
- {
- max_level = d_info[dungeon_type].maxdepth;
- min_level = d_info[dungeon_type].mindepth;
- }
+ {
+ max_level = d_info[dungeon_type].maxdepth;
+ min_level = d_info[dungeon_type].mindepth;
+ }
/* Prompt */
#ifdef JP
char o_name[MAX_NLEN];
byte feel;
cptr q, s;
- bool okay = FALSE;
+ bool okay = FALSE;
int idx;
item_tester_no_ryoute = TRUE;
/* Window stuff */
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
- /* Valid "tval" codes */
- switch (o_ptr->tval)
- {
- case TV_SHOT:
- case TV_ARROW:
- case TV_BOLT:
- case TV_BOW:
- case TV_DIGGING:
- case TV_HAFTED:
- case TV_POLEARM:
- case TV_SWORD:
- case TV_BOOTS:
- case TV_GLOVES:
- case TV_HELM:
- case TV_CROWN:
- case TV_SHIELD:
- case TV_CLOAK:
- case TV_SOFT_ARMOR:
- case TV_HARD_ARMOR:
- case TV_DRAG_ARMOR:
- case TV_CARD:
- case TV_RING:
- case TV_AMULET:
- case TV_LITE:
- case TV_FIGURINE:
- okay = TRUE;
- break;
- }
+ /* Valid "tval" codes */
+ switch (o_ptr->tval)
+ {
+ case TV_SHOT:
+ case TV_ARROW:
+ case TV_BOLT:
+ case TV_BOW:
+ case TV_DIGGING:
+ case TV_HAFTED:
+ case TV_POLEARM:
+ case TV_SWORD:
+ case TV_BOOTS:
+ case TV_GLOVES:
+ case TV_HELM:
+ case TV_CROWN:
+ case TV_SHIELD:
+ case TV_CLOAK:
+ case TV_SOFT_ARMOR:
+ case TV_HARD_ARMOR:
+ case TV_DRAG_ARMOR:
+ case TV_CARD:
+ case TV_RING:
+ case TV_AMULET:
+ case TV_LITE:
+ case TV_FIGURINE:
+ okay = TRUE;
+ break;
+ }
/* Auto-inscription/destroy */
idx = is_autopick(o_ptr);
auto_inscribe_item(item, idx);
if (okay && destroy_feeling)
- auto_destroy_item(item, idx);
+ auto_destroy_item(item, idx);
/* Something happened */
return (TRUE);
static void gere_music(s32b music)
{
- switch(music)
- {
- case MUSIC_SLOW:
- slow_monsters();
- break;
- case MUSIC_STUN:
- stun_monsters(damroll(p_ptr->lev/10,2));
- break;
- case MUSIC_L_LIFE:
- hp_player(damroll(2,6));
- break;
- case MUSIC_FEAR:
- project_hack(GF_TURN_ALL, p_ptr->lev);
- break;
- case MUSIC_PSI:
- project_hack(GF_PSI, randint1(p_ptr->lev * 3 / 2));
- break;
- case MUSIC_ID:
- project(0, 1, py, px, 0, GF_IDENTIFY, PROJECT_ITEM, -1);
- break;
- case MUSIC_CONF:
- confuse_monsters(p_ptr->lev * 2);
- break;
- case MUSIC_SOUND:
- project_hack(GF_SOUND, damroll(10 + p_ptr->lev/5,7));
- break;
- case MUSIC_CHARM:
- charm_monsters(damroll(10 + p_ptr->lev/15,6));
- break;
- case MUSIC_WALL:
+ switch(music)
+ {
+ case MUSIC_SLOW:
+ slow_monsters();
+ break;
+ case MUSIC_STUN:
+ stun_monsters(damroll(p_ptr->lev/10,2));
+ break;
+ case MUSIC_L_LIFE:
+ hp_player(damroll(2,6));
+ break;
+ case MUSIC_FEAR:
+ project_hack(GF_TURN_ALL, p_ptr->lev);
+ break;
+ case MUSIC_PSI:
+ project_hack(GF_PSI, randint1(p_ptr->lev * 3 / 2));
+ break;
+ case MUSIC_ID:
+ project(0, 1, py, px, 0, GF_IDENTIFY, PROJECT_ITEM, -1);
+ break;
+ case MUSIC_CONF:
+ confuse_monsters(p_ptr->lev * 2);
+ break;
+ case MUSIC_SOUND:
+ project_hack(GF_SOUND, damroll(10 + p_ptr->lev/5,7));
+ break;
+ case MUSIC_CHARM:
+ charm_monsters(damroll(10 + p_ptr->lev/15,6));
+ break;
+ case MUSIC_WALL:
project(0, 0, py, px,
0, GF_DISINTEGRATE, PROJECT_KILL | PROJECT_ITEM | PROJECT_HIDE, -1);
- break;
- case MUSIC_DISPEL:
- dispel_monsters(randint1(p_ptr->lev * 3));
- dispel_evil(randint1(p_ptr->lev * 3));
- break;
- case MUSIC_SARUMAN:
- slow_monsters();
- sleep_monsters();
- break;
- case MUSIC_QUAKE:
- earthquake(py, px, 10);
- break;
- case MUSIC_STASIS:
- stasis_monsters(p_ptr->lev * 4);
- break;
- case MUSIC_SHERO:
- dispel_monsters(randint1(p_ptr->lev * 3));
- break;
- case MUSIC_H_LIFE:
- hp_player(damroll(15,10));
+ break;
+ case MUSIC_DISPEL:
+ dispel_monsters(randint1(p_ptr->lev * 3));
+ dispel_evil(randint1(p_ptr->lev * 3));
+ break;
+ case MUSIC_SARUMAN:
+ slow_monsters();
+ sleep_monsters();
+ break;
+ case MUSIC_QUAKE:
+ earthquake(py, px, 10);
+ break;
+ case MUSIC_STASIS:
+ stasis_monsters(p_ptr->lev * 4);
+ break;
+ case MUSIC_SHERO:
+ dispel_monsters(randint1(p_ptr->lev * 3));
+ break;
+ case MUSIC_H_LIFE:
+ hp_player(damroll(15,10));
set_stun(0);
set_cut(0);
- break;
- case MUSIC_DETECT+19:
+ break;
+ case MUSIC_DETECT+19:
wiz_lite(FALSE, FALSE);
- case MUSIC_DETECT+11:
- case MUSIC_DETECT+12:
- case MUSIC_DETECT+13:
- case MUSIC_DETECT+14:
- case MUSIC_DETECT+15:
- case MUSIC_DETECT+16:
- case MUSIC_DETECT+17:
- case MUSIC_DETECT+18:
+ case MUSIC_DETECT+11:
+ case MUSIC_DETECT+12:
+ case MUSIC_DETECT+13:
+ case MUSIC_DETECT+14:
+ case MUSIC_DETECT+15:
+ case MUSIC_DETECT+16:
+ case MUSIC_DETECT+17:
+ case MUSIC_DETECT+18:
map_area(DETECT_RAD_MAP);
if ((p_ptr->lev > 39) && (music < MUSIC_DETECT+19)) p_ptr->magic_num1[0] = music+1;
- case MUSIC_DETECT+6:
- case MUSIC_DETECT+7:
- case MUSIC_DETECT+8:
- case MUSIC_DETECT+9:
- case MUSIC_DETECT+10:
+ case MUSIC_DETECT+6:
+ case MUSIC_DETECT+7:
+ case MUSIC_DETECT+8:
+ case MUSIC_DETECT+9:
+ case MUSIC_DETECT+10:
detect_treasure(DETECT_RAD_DEFAULT);
detect_objects_gold(DETECT_RAD_DEFAULT);
detect_objects_normal(DETECT_RAD_DEFAULT);
if ((p_ptr->lev > 24) && (music < MUSIC_DETECT+11)) p_ptr->magic_num1[0] = music+1;
- case MUSIC_DETECT+3:
- case MUSIC_DETECT+4:
- case MUSIC_DETECT+5:
+ case MUSIC_DETECT+3:
+ case MUSIC_DETECT+4:
+ case MUSIC_DETECT+5:
detect_monsters_invis(DETECT_RAD_DEFAULT);
detect_monsters_normal(DETECT_RAD_DEFAULT);
if ((p_ptr->lev > 19) && (music < MUSIC_DETECT+6)) p_ptr->magic_num1[0] = music+1;
- case MUSIC_DETECT:
- case MUSIC_DETECT+1:
- case MUSIC_DETECT+2:
+ case MUSIC_DETECT:
+ case MUSIC_DETECT+1:
+ case MUSIC_DETECT+2:
detect_traps(DETECT_RAD_DEFAULT, TRUE);
detect_doors(DETECT_RAD_DEFAULT);
detect_stairs(DETECT_RAD_DEFAULT);
if ((p_ptr->lev > 14) && (music < MUSIC_DETECT+3)) p_ptr->magic_num1[0] = music+1;
break;
- }
+ }
}
/*
static void check_music(void)
{
- magic_type *s_ptr;
+ magic_type *s_ptr;
u32b shouhimana;
- /* Music singed by player */
- if(p_ptr->pclass != CLASS_BARD) return;
- if(!p_ptr->magic_num1[0] && !p_ptr->magic_num1[1]) return;
+ /* Music singed by player */
+ if(p_ptr->pclass != CLASS_BARD) return;
+ if(!p_ptr->magic_num1[0] && !p_ptr->magic_num1[1]) return;
- s_ptr = &technic_info[REALM_MUSIC - MIN_TECHNIC][p_ptr->magic_num2[0]];
+ s_ptr = &technic_info[REALM_MUSIC - MIN_TECHNIC][p_ptr->magic_num2[0]];
shouhimana = (s_ptr->smana*(3800-p_ptr->spell_exp[p_ptr->magic_num2[0]])+2399);
if(p_ptr->dec_mana)
else shouhimana *= 4;
shouhimana /= 9600;
if(shouhimana < 1) shouhimana = 1;
- shouhimana *= 0x8000;
- if (((u16b)(p_ptr->csp) < (shouhimana / 0x10000)) || (p_ptr->anti_magic))
- {
- stop_singing();
+ shouhimana *= 0x8000;
+ if (((u16b)(p_ptr->csp) < (shouhimana / 0x10000)) || (p_ptr->anti_magic))
+ {
+ stop_singing();
return;
- }
- else
- {
+ }
+ else
+ {
p_ptr->csp -= (u16b) (shouhimana / 0x10000);
shouhimana = (shouhimana & 0xffff);
if (p_ptr->csp_frac < shouhimana)
p_ptr->csp_frac -= (u16b)shouhimana;
}
- p_ptr->redraw |= PR_MANA;
+ p_ptr->redraw |= PR_MANA;
if (p_ptr->magic_num1[1])
{
p_ptr->magic_num1[0] = p_ptr->magic_num1[1];
/* Redraw status bar */
p_ptr->redraw |= (PR_STATUS);
}
- }
+ }
if (p_ptr->spell_exp[p_ptr->magic_num2[0]] < 900)
p_ptr->spell_exp[p_ptr->magic_num2[0]]+=5;
else if(p_ptr->spell_exp[p_ptr->magic_num2[0]] < 1200)
else if(p_ptr->spell_exp[p_ptr->magic_num2[0]] < 1600)
{if (one_in_(5) && ((dun_level + 5) > p_ptr->lev) && (dun_level > s_ptr->slevel)) p_ptr->spell_exp[p_ptr->magic_num2[0]]+=1;}
- gere_music(p_ptr->magic_num1[0]);
+ gere_music(p_ptr->magic_num1[0]);
}
/* Choose one of items that have cursed flag */
extract_day_hour_min(&day, &hour, &min);
prev_min = (1440 * (tick - TURNS_PER_TICK) / len) % 60;
- if ((turn - old_turn == (150 - dun_level) * TURNS_PER_TICK)
+ if ((turn - old_turn == (150 - dun_level) * TURNS_PER_TICK)
&& (dun_level) &&
!(quest_number(dun_level) && ((quest_number(dun_level) < MIN_RANDOM_QUEST) && !(quest_number(dun_level) == QUEST_OBERON || quest_number(dun_level) == QUEST_SERPENT || !(quest[quest_number(dun_level)].flags & QUEST_FLAG_PRESET)))) &&
!(p_ptr->inside_battle))
do_cmd_save_game(TRUE);
}
- if (mon_fight)
- {
+ if (mon_fight)
+ {
#ifdef JP
- msg_print("²¿¤«¤¬Ê¹¤³¤¨¤¿¡£");
+ msg_print("²¿¤«¤¬Ê¹¤³¤¨¤¿¡£");
#else
- msg_print("You hear noise.");
+ msg_print("You hear noise.");
#endif
- }
+ }
/*** Handle the wilderness/town (sunshine) ***/
{
/* Basic digestion rate based on speed */
i = /* extract_energy[p_ptr->pspeed] * 2;*/
- ((p_ptr->pspeed > 199) ? 49 : ((p_ptr->pspeed < 0) ?
- 1 : extract_energy[p_ptr->pspeed]));
+ ((p_ptr->pspeed > 199) ? 49 : ((p_ptr->pspeed < 0) ?
+ 1 : extract_energy[p_ptr->pspeed]));
/* Regeneration takes more food */
if (p_ptr->regenerate) i += 20;
if (!p_ptr->word_recall)
{
/* Disturbing! */
- disturb(0, 0);
+ disturb(0, 0);
/* Determine the level */
if (dun_level || p_ptr->inside_quest)
msg_print("You feel yourself yanked upwards!");
#endif
- p_ptr->recall_dungeon = dungeon_type;
+ p_ptr->recall_dungeon = dungeon_type;
if (record_stair)
do_cmd_write_nikki(NIKKI_RECALL, dun_level, NULL);
msg_print("You feel yourself yanked downwards!");
#endif
- dungeon_type = p_ptr->recall_dungeon;
+ dungeon_type = p_ptr->recall_dungeon;
if (record_stair)
do_cmd_write_nikki(NIKKI_RECALL, dun_level, NULL);
/* Ask first time */
if (!p_ptr->noscore)
{
- /* Wizard mode is not permitted */
- if (!allow_debug_opts)
- {
+ /* Wizard mode is not permitted */
+ if (!allow_debug_opts)
+ {
#ifdef JP
- msg_print("¥¦¥£¥¶¡¼¥É¥â¡¼¥É¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ ");
+ msg_print("¥¦¥£¥¶¡¼¥É¥â¡¼¥É¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ ");
#else
- msg_print("Wizard mode is not permitted.");
+ msg_print("Wizard mode is not permitted.");
#endif
- return FALSE;
- }
+ return FALSE;
+ }
/* Mention effects */
#ifdef JP
/* Ask first time */
if (!p_ptr->noscore)
{
- /* Debug mode is not permitted */
- if (!allow_debug_opts)
- {
+ /* Debug mode is not permitted */
+ if (!allow_debug_opts)
+ {
#ifdef JP
- msg_print("¥Ç¥Ð¥Ã¥°¥³¥Þ¥ó¥É¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ ");
+ msg_print("¥Ç¥Ð¥Ã¥°¥³¥Þ¥ó¥É¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ ");
#else
- msg_print("Use of debug command is not permitted.");
+ msg_print("Use of debug command is not permitted.");
#endif
- return FALSE;
- }
+ return FALSE;
+ }
/* Mention effects */
#ifdef JP
/* Go up staircase */
case '<':
{
- if(!p_ptr->wild_mode && !dun_level && !p_ptr->inside_arena && !p_ptr->inside_quest)
- {
- if (!vanilla_town)
- {
- if(ambush_flag)
+ if(!p_ptr->wild_mode && !dun_level && !p_ptr->inside_arena && !p_ptr->inside_quest)
+ {
+ if (!vanilla_town)
+ {
+ if(ambush_flag)
{
#ifdef JP
- msg_print("½±·â¤«¤éƨ¤²¤ë¤Ë¤Ï¥Þ¥Ã¥×¤Îü¤Þ¤Ç°ÜÆ°¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£");
+ msg_print("½±·â¤«¤éƨ¤²¤ë¤Ë¤Ï¥Þ¥Ã¥×¤Îü¤Þ¤Ç°ÜÆ°¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£");
#else
- msg_print("To flee the ambush you have to reach the edge of the map.");
+ msg_print("To flee the ambush you have to reach the edge of the map.");
#endif
}
else if (p_ptr->food < PY_FOOD_WEAK)
{
#ifdef JP
- msg_print("¤½¤ÎÁ°¤Ë¿©»ö¤ò¤È¤é¤Ê¤¤¤È¡£");
+ msg_print("¤½¤ÎÁ°¤Ë¿©»ö¤ò¤È¤é¤Ê¤¤¤È¡£");
#else
- msg_print("You must eat something here.");
+ msg_print("You must eat something here.");
#endif
}
- else
- {
+ else
+ {
if (change_wild_mode())
{
p_ptr->oldpx = px;
p_ptr->oldpy = py;
}
- }
- }
- }
- else
+ }
+ }
+ }
+ else
do_cmd_go_up();
break;
}
/* Go down staircase */
case '>':
{
- if(!p_ptr->wild_mode) do_cmd_go_down();
- else
- {
+ if(!p_ptr->wild_mode) do_cmd_go_down();
+ else
+ {
p_ptr->wilderness_x = px;
p_ptr->wilderness_y = py;
change_wild_mode();
- }
- break;
+ }
+ break;
}
/* Open a door or chest */
char error_m[1024];
sound(SOUND_ILLEGAL);
#ifdef JP
- if (!get_rnd_line("error_j.txt", 0, error_m))
+ if (!get_rnd_line("error_j.txt", 0, error_m))
#else
if (!get_rnd_line("error.txt", 0, error_m))
#endif
if (!is_pet(m_ptr)) continue;
if (i == p_ptr->riding) continue;
- if (reinit_wilderness)
- {
- /* Don't lose sight of pets when getting a Quest */
- }
- else
- {
- int dis = distance(py, px, m_ptr->fy, m_ptr->fx);
-
- /*
- * Pets with nickname will follow even from 3 blocks away
- * when you or the pet can see the other.
- */
- if (m_ptr->nickname &&
- (player_has_los_bold(m_ptr->fy, m_ptr->fx) ||
- los(m_ptr->fy, m_ptr->fx, py, px)))
- {
- if (dis > 3) continue;
- }
- else
- {
- if (dis > 1) continue;
- }
- if (m_ptr->confused || m_ptr->stunned || m_ptr->csleep) continue;
- }
+ if (reinit_wilderness)
+ {
+ /* Don't lose sight of pets when getting a Quest */
+ }
+ else
+ {
+ int dis = distance(py, px, m_ptr->fy, m_ptr->fx);
+
+ /*
+ * Pets with nickname will follow even from 3 blocks away
+ * when you or the pet can see the other.
+ */
+ if (m_ptr->nickname &&
+ (player_has_los_bold(m_ptr->fy, m_ptr->fx) ||
+ los(m_ptr->fy, m_ptr->fx, py, px)))
+ {
+ if (dis > 3) continue;
+ }
+ else
+ {
+ if (dis > 1) continue;
+ }
+ if (m_ptr->confused || m_ptr->stunned || m_ptr->csleep) continue;
+ }
COPY(&party_mon[num], &m_list[i], monster_type);
num++;
- /* Mark as followed */
+ /* Mark as followed */
delete_monster_idx(i);
}
- /* Forget the flag */
- reinit_wilderness = FALSE;
+ /* Forget the flag */
+ reinit_wilderness = FALSE;
if (record_named_pet)
{
init_autopicker();
#ifdef JP
- sprintf(buf, "picktype-%s.prf", player_base);
+ sprintf(buf, "picktype-%s.prf", player_base);
#else
- sprintf(buf, "pickpref-%s.prf", player_base);
+ sprintf(buf, "pickpref-%s.prf", player_base);
#endif
err = process_pickpref_file(buf);
if(p_ptr->pseikaku == SEIKAKU_SEXY)
s_info[p_ptr->pclass].w_max[TV_HAFTED-TV_BOW][SV_WHIP] = 8000;
- /* Fill the arrays of floors and walls in the good proportions */
- for (i = 0; i < 100; i++)
- {
- int lim1, lim2, lim3;
+ /* Fill the arrays of floors and walls in the good proportions */
+ for (i = 0; i < 100; i++)
+ {
+ int lim1, lim2, lim3;
- lim1 = d_info[dungeon_type].floor_percent1;
- lim2 = lim1 + d_info[dungeon_type].floor_percent2;
- lim3 = lim2 + d_info[dungeon_type].floor_percent3;
+ lim1 = d_info[dungeon_type].floor_percent1;
+ lim2 = lim1 + d_info[dungeon_type].floor_percent2;
+ lim3 = lim2 + d_info[dungeon_type].floor_percent3;
if (i < lim1)
floor_type[i] = d_info[dungeon_type].floor1;
fill_type[i] = d_info[dungeon_type].fill_type2;
else if (i < lim3)
fill_type[i] = d_info[dungeon_type].fill_type3;
- }
+ }
/* Flavor the objects */
flavor_init();
/* Hack -- Enter wizard mode */
if (arg_wizard)
- {
- if (enter_wizard_mode()) p_ptr->wizard = TRUE;
- else if (p_ptr->is_dead) quit("Already dead.");
- }
+ {
+ if (enter_wizard_mode()) p_ptr->wizard = TRUE;
+ else if (p_ptr->is_dead) quit("Already dead.");
+ }
/* Initialize the town-buildings if necessary */
if (!dun_level && !p_ptr->inside_quest)
{
if (p_ptr->tim_mimic > v) return FALSE;
}
- else if ((!p_ptr->tim_mimic) || (p_ptr->mimic_form != p))
+ else if ((!p_ptr->tim_mimic) || (p_ptr->mimic_form != p))
{
#ifdef JP
- msg_print("¼«Ê¬¤ÎÂΤ¬ÊѤï¤Ã¤Æ¤æ¤¯¤Î¤ò´¶¤¸¤¿¡£");
+ msg_print("¼«Ê¬¤ÎÂΤ¬ÊѤï¤Ã¤Æ¤æ¤¯¤Î¤ò´¶¤¸¤¿¡£");
#else
- msg_print("You feel that your body changes.");
+ msg_print("You feel that your body changes.");
#endif
- p_ptr->mimic_form=p;
+ p_ptr->mimic_form=p;
notice = TRUE;
}
}
/* Shut */
else
{
- if (p_ptr->tim_mimic)
+ if (p_ptr->tim_mimic)
{
#ifdef JP
- msg_print("ÊѿȤ¬²ò¤±¤¿¡£");
+ msg_print("ÊѿȤ¬²ò¤±¤¿¡£");
#else
- msg_print("You are no longer transformed.");
+ msg_print("You are no longer transformed.");
#endif
if (p_ptr->mimic_form == MIMIC_DEMON) set_oppose_fire(0, TRUE);
- p_ptr->mimic_form=0;
+ p_ptr->mimic_form=0;
notice = TRUE;
p = 0;
}
}
/* Use the value */
- p_ptr->tim_mimic = v;
+ p_ptr->tim_mimic = v;
/* Nothing to notice */
if (!notice)
if (disturb_state)
disturb(0, 0);
- /* Redraw title */
- p_ptr->redraw |= (PR_BASIC | PR_STATUS);
+ /* Redraw title */
+ p_ptr->redraw |= (PR_BASIC | PR_STATUS);
/* Recalculate bonuses */
- p_ptr->update |= (PU_BONUS | PU_HP);
+ p_ptr->update |= (PU_BONUS | PU_HP);
handle_stuff();
((attack_type == ATTACK_ACID) ? "»À" :
((attack_type == ATTACK_ELEC) ? "ÅÅ·â" :
((attack_type == ATTACK_FIRE) ? "²Ð±ê" :
- ((attack_type == ATTACK_COLD) ? "Î䵤" :
- ((attack_type == ATTACK_POIS) ? "ÆÇ" :
+ ((attack_type == ATTACK_COLD) ? "Î䵤" :
+ ((attack_type == ATTACK_POIS) ? "ÆÇ" :
"(¤Ê¤·)"))))));
#else
msg_format("For a while, the blows you deal will %s",
((attack_type == ATTACK_ACID) ? "melt with acid!" :
((attack_type == ATTACK_ELEC) ? "shock your foes!" :
((attack_type == ATTACK_FIRE) ? "burn with fire!" :
- ((attack_type == ATTACK_COLD) ? "chill to the bone!" :
- ((attack_type == ATTACK_POIS) ? "poison your enemies!" :
+ ((attack_type == ATTACK_COLD) ? "chill to the bone!" :
+ ((attack_type == ATTACK_POIS) ? "poison your enemies!" :
"do nothing special."))))));
#endif
}
((immune_type == DEFENSE_ACID) ? "»À" :
((immune_type == DEFENSE_ELEC) ? "ÅÅ·â" :
((immune_type == DEFENSE_FIRE) ? "²Ð±ê" :
- ((immune_type == DEFENSE_COLD) ? "Î䵤" :
- ((immune_type == DEFENSE_POIS) ? "ÆÇ" :
+ ((immune_type == DEFENSE_COLD) ? "Î䵤" :
+ ((immune_type == DEFENSE_POIS) ? "ÆÇ" :
"(¤Ê¤·)"))))));
#else
msg_format("For a while, You are immune to %s",
((immune_type == DEFENSE_ACID) ? "acid!" :
((immune_type == DEFENSE_ELEC) ? "electricity!" :
((immune_type == DEFENSE_FIRE) ? "fire!" :
- ((immune_type == DEFENSE_COLD) ? "cold!" :
- ((immune_type == DEFENSE_POIS) ? "poison!" :
+ ((immune_type == DEFENSE_COLD) ? "cold!" :
+ ((immune_type == DEFENSE_POIS) ? "poison!" :
"do nothing special."))))));
#endif
}
p_ptr->stat_cur[stat] = cur;
p_ptr->stat_max[stat] = max;
- /* Redisplay the stats later */
- p_ptr->redraw |= (PR_STATS);
+ /* Redisplay the stats later */
+ p_ptr->redraw |= (PR_STATS);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
/* Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
- /* Redisplay the stats later */
- p_ptr->redraw |= (PR_STATS);
+ /* Redisplay the stats later */
+ p_ptr->redraw |= (PR_STATS);
/* Success */
return (TRUE);
#endif
}
#ifdef JP
- while (!get_string(streq(p_ptr->died_from, "Seppuku") ? "¼À¤¤Î¶ç: " : "ÃÇËöËâ¤Î¶«¤Ó: ", death_message, 1024)) ;
+ while (!get_string(streq(p_ptr->died_from, "Seppuku") ? "¼À¤¤Î¶ç: " : "ÃÇËöËâ¤Î¶«¤Ó: ", death_message, 1024)) ;
#else
while (!get_string("Last word: ", death_message, 1024)) ;
#endif
if (*str == 0) break;
}
- /* Hide cursor */
- Term_putstr(w-1, h-1, 1, TERM_WHITE, " ");
+ /* Hide cursor */
+ Term_putstr(w-1, h-1, 1, TERM_WHITE, " ");
flush();
#ifdef WORLD_SCORE
- /* Make screen dump */
- screen_dump = make_screen_dump();
+ /* Make screen dump */
+ screen_dump = make_screen_dump();
#endif
- /* Wait a key press */
+ /* Wait a key press */
(void)inkey();
#else
msg_print(death_message);
extern void delete_monster_callback(int m_idx);
extern void copy_monster_callback(int i1, int i2);
extern char inkey_borg_callback(bool inkey_base, bool inkey_xtra,
- bool inkey_flag, bool inkey_scan);
+ bool inkey_flag, bool inkey_scan);
extern char inkey_callback(char key);
/* Birth */
v = ANGBAND_SYS;
}
- else if (streq(b+1, "KEYBOARD"))
- {
- v = ANGBAND_KEYBOARD;
- }
+ else if (streq(b+1, "KEYBOARD"))
+ {
+ v = ANGBAND_KEYBOARD;
+ }
/* Graphics */
else if (streq(b+1, "GRAF"))
else if (streq(b+1, "RACE"))
{
#ifdef JP
- v = rp_ptr->E_title;
+ v = rp_ptr->E_title;
#else
v = rp_ptr->title;
#endif
else if (streq(b+1, "CLASS"))
{
#ifdef JP
- v = cp_ptr->E_title;
+ v = cp_ptr->E_title;
#else
v = cp_ptr->title;
#endif
#ifdef JP
v = E_realm_names[p_ptr->realm1];
#else
- v = realm_names[p_ptr->realm1];
+ v = realm_names[p_ptr->realm1];
#endif
}
else if (streq(b+1, "REALM2"))
{
#ifdef JP
- v = E_realm_names[p_ptr->realm2];
+ v = E_realm_names[p_ptr->realm2];
#else
v = realm_names[p_ptr->realm2];
#endif
/* Print error message */
/* ToDo: Add better error messages */
#ifdef JP
- msg_format("¥Õ¥¡¥¤¥ë'%s'¤Î%d¹Ô¤Ç¥¨¥é¡¼ÈÖ¹æ%d¤Î¥¨¥é¡¼¡£", name, line, err);
- msg_format("('%s'¤ò²òÀÏÃæ)", old);
+ msg_format("¥Õ¥¡¥¤¥ë'%s'¤Î%d¹Ô¤Ç¥¨¥é¡¼ÈÖ¹æ%d¤Î¥¨¥é¡¼¡£", name, line, err);
+ msg_format("('%s'¤ò²òÀÏÃæ)", old);
#else
msg_format("Error %d in line %d of file '%s'.", err, line, name);
msg_format("Parsing '%s'", old);
*/
static void display_player_middle(void)
{
- char buf[160];
+ char buf[160];
int show_tohit, show_todam;
object_type *o_ptr;
int tmul = 0;
- int e;
+ int e;
if(p_ptr->migite)
{
/* Dump experience */
if (p_ptr->prace == RACE_ANDROID) e = ENTRY_EXP_ANDR;
- else e = ENTRY_CUR_EXP;
+ else e = ENTRY_CUR_EXP;
if (p_ptr->exp >= p_ptr->max_exp)
display_player_one_line(e, format("%ld", p_ptr->exp), TERM_L_GREEN);
/* Dump exp to advance */
if (p_ptr->lev >= PY_MAX_LEVEL)
display_player_one_line(ENTRY_EXP_TO_ADV, "*****", TERM_L_GREEN);
- else if (p_ptr->prace == RACE_ANDROID)
+ else if (p_ptr->prace == RACE_ANDROID)
display_player_one_line(ENTRY_EXP_TO_ADV, format("%ld", (s32b)(player_exp_a[p_ptr->lev - 1] * p_ptr->expfact / 100L)), TERM_L_GREEN);
else
display_player_one_line(ENTRY_EXP_TO_ADV, format("%ld", (s32b)(player_exp[p_ptr->lev - 1] * p_ptr->expfact / 100L)), TERM_L_GREEN);
object_type *o_ptr;
- /* Weapon flags need only two column */
- if (mode & DP_WP) max_i = INVEN_LARM + 1;
- else max_i = INVEN_TOTAL;
+ /* Weapon flags need only two column */
+ if (mode & DP_WP) max_i = INVEN_LARM + 1;
+ else max_i = INVEN_TOTAL;
/* Dump equippy chars */
for (i = INVEN_RARM; i < max_i; i++)
* A struct for storing misc. flags
*/
typedef struct {
- u32b player_flags[TR_FLAG_SIZE];
- u32b tim_player_flags[TR_FLAG_SIZE];
- u32b player_imm[TR_FLAG_SIZE];
- u32b tim_player_imm[TR_FLAG_SIZE];
- u32b player_vuln[TR_FLAG_SIZE];
- u32b known_obj_imm[TR_FLAG_SIZE];
+ u32b player_flags[TR_FLAG_SIZE];
+ u32b tim_player_flags[TR_FLAG_SIZE];
+ u32b player_imm[TR_FLAG_SIZE];
+ u32b tim_player_imm[TR_FLAG_SIZE];
+ u32b player_vuln[TR_FLAG_SIZE];
+ u32b known_obj_imm[TR_FLAG_SIZE];
} all_player_flags;
{
int i;
bool vuln = FALSE;
- int max_i;
+ int max_i;
if (have_flag(f->player_vuln, flag1) &&
- !(have_flag(f->known_obj_imm, flag1) ||
- have_flag(f->player_imm, flag1) ||
- have_flag(f->tim_player_imm, flag1)))
+ !(have_flag(f->known_obj_imm, flag1) ||
+ have_flag(f->player_imm, flag1) ||
+ have_flag(f->tim_player_imm, flag1)))
vuln = TRUE;
/* Header */
/* Advance */
col += strlen(header) + 1;
- /* Weapon flags need only two column */
- if (mode & DP_WP) max_i = INVEN_LARM + 1;
- else max_i = INVEN_TOTAL;
+ /* Weapon flags need only two column */
+ if (mode & DP_WP) max_i = INVEN_LARM + 1;
+ else max_i = INVEN_TOTAL;
/* Check equipment */
for (i = INVEN_RARM; i < max_i; i++)
{
- u32b flgs[TR_FLAG_SIZE];
+ u32b flgs[TR_FLAG_SIZE];
object_type *o_ptr;
/* Object */
object_flags_known(o_ptr, flgs);
/* Default */
- if (!(mode & DP_IMM))
- c_put_str((byte)(vuln ? TERM_RED : TERM_SLATE), ".", row, col);
+ if (!(mode & DP_IMM))
+ c_put_str((byte)(vuln ? TERM_RED : TERM_SLATE), ".", row, col);
/* Check flags */
- if (mode & DP_CURSE)
- {
- if ((mode & DP_CURSE) && (o_ptr->curse_flags & (TRC_CURSED | TRC_HEAVY_CURSE)))
- c_put_str(TERM_WHITE, "+", row, col);
- if ((mode & DP_CURSE) && (o_ptr->curse_flags & TRC_PERMA_CURSE))
- c_put_str(TERM_WHITE, "*", row, col);
- }
- else
- {
- if (have_flag(flgs, flag1))
- c_put_str((byte)(vuln ? TERM_L_RED : TERM_WHITE),
- (mode & DP_IMM) ? "*" : "+", row, col);
- }
+ if (mode & DP_CURSE)
+ {
+ if ((mode & DP_CURSE) && (o_ptr->curse_flags & (TRC_CURSED | TRC_HEAVY_CURSE)))
+ c_put_str(TERM_WHITE, "+", row, col);
+ if ((mode & DP_CURSE) && (o_ptr->curse_flags & TRC_PERMA_CURSE))
+ c_put_str(TERM_WHITE, "*", row, col);
+ }
+ else
+ {
+ if (have_flag(flgs, flag1))
+ c_put_str((byte)(vuln ? TERM_L_RED : TERM_WHITE),
+ (mode & DP_IMM) ? "*" : "+", row, col);
+ }
/* Advance */
col++;
}
- /* Assume that player flag is already written */
- if (mode & DP_IMM) return;
+ /* Assume that player flag is already written */
+ if (mode & DP_IMM) return;
/* Default */
c_put_str((byte)(vuln ? TERM_RED : TERM_SLATE), ".", row, col);
int row;
int col;
- all_player_flags f;
+ all_player_flags f;
- /* Extract flags and store */
+ /* Extract flags and store */
player_flags(f.player_flags);
tim_player_flags(f.tim_player_flags, TRUE);
player_immunity(f.player_imm);
int row;
int col;
- all_player_flags f;
+ all_player_flags f;
- /* Extract flags and store */
+ /* Extract flags and store */
player_flags(f.player_flags);
tim_player_flags(f.tim_player_flags, TRUE);
player_immunity(f.player_imm);
c_put_str(TERM_WHITE, "ab@", row-1, col+12);
#ifdef JP
- display_flag_aux(row+ 0, col, "¼Ù° ÇÜÂÇ :", TR_SLAY_EVIL, &f, DP_WP);
- display_flag_aux(row+ 0, col, "¼Ù° ÇÜÂÇ :", TR_KILL_EVIL, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 1, col, "ÉÔ»à ÇÜÂÇ :", TR_SLAY_UNDEAD, &f, DP_WP);
- display_flag_aux(row+ 1, col, "ÉÔ»à ÇÜÂÇ :", TR_KILL_UNDEAD, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 2, col, "°Ëâ ÇÜÂÇ :", TR_SLAY_DEMON, &f, DP_WP);
- display_flag_aux(row+ 2, col, "°Ëâ ÇÜÂÇ :", TR_KILL_DEMON, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 3, col, "ζ ÇÜÂÇ :", TR_SLAY_DRAGON, &f, DP_WP);
- display_flag_aux(row+ 3, col, "ζ ÇÜÂÇ :", TR_KILL_DRAGON, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 4, col, "¿Í´Ö ÇÜÂÇ :", TR_SLAY_HUMAN, &f, DP_WP);
- display_flag_aux(row+ 4, col, "¿Í´Ö ÇÜÂÇ :", TR_KILL_HUMAN, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 5, col, "ưʪ ÇÜÂÇ :", TR_SLAY_ANIMAL, &f, DP_WP);
- display_flag_aux(row+ 5, col, "ưʪ ÇÜÂÇ :", TR_KILL_ANIMAL, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 6, col, "¥ª¡¼¥¯ÇÜÂÇ:", TR_SLAY_ORC, &f, DP_WP);
- display_flag_aux(row+ 6, col, "¥ª¡¼¥¯ÇÜÂÇ:", TR_KILL_ORC, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 7, col, "¥È¥í¥ëÇÜÂÇ:", TR_SLAY_TROLL, &f, DP_WP);
- display_flag_aux(row+ 7, col, "¥È¥í¥ëÇÜÂÇ:", TR_KILL_TROLL, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 8, col, "µð¿Í ÇÜÂÇ :", TR_SLAY_GIANT, &f, DP_WP);
- display_flag_aux(row+ 8, col, "µð¿Í ÇÜÂÇ :", TR_KILL_GIANT, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 9, col, "Íϲò :", TR_BRAND_ACID, &f, DP_WP);
- display_flag_aux(row+10, col, "ÅÅ·â :", TR_BRAND_ELEC, &f, DP_WP);
- display_flag_aux(row+11, col, "¾Æ´þ :", TR_BRAND_FIRE, &f, DP_WP);
- display_flag_aux(row+12, col, "Åà·ë :", TR_BRAND_COLD, &f, DP_WP);
- display_flag_aux(row+13, col, "ÆÇ»¦ :", TR_BRAND_POIS, &f, DP_WP);
- display_flag_aux(row+14, col, "ÀÚ¤ìÌ£ :", TR_VORPAL, &f, DP_WP);
- display_flag_aux(row+15, col, "ÃÏ¿Ì :", TR_IMPACT, &f, DP_WP);
- display_flag_aux(row+16, col, "µÛ·ì :", TR_VAMPIRIC, &f, DP_WP);
- display_flag_aux(row+17, col, "¥«¥ª¥¹¸ú²Ì:", TR_CHAOTIC, &f, DP_WP);
- display_flag_aux(row+18, col, "ÍýÎÏ :", TR_FORCE_WEAPON, &f, DP_WP);
-#else
- display_flag_aux(row+ 0, col, "Slay Evil :", TR_SLAY_EVIL, &f, DP_WP);
- display_flag_aux(row+ 0, col, "Slay Evil :", TR_KILL_EVIL, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 1, col, "Slay Und. :", TR_SLAY_UNDEAD, &f, DP_WP);
- display_flag_aux(row+ 1, col, "Slay Und. :", TR_KILL_UNDEAD, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 2, col, "Slay Demon:", TR_SLAY_DEMON, &f, DP_WP);
- display_flag_aux(row+ 2, col, "Slay Demon:", TR_KILL_DEMON, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 3, col, "Slay Drag.:", TR_SLAY_DRAGON, &f, DP_WP);
- display_flag_aux(row+ 3, col, "Slay Drag.:", TR_KILL_DRAGON, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 4, col, "Slay Human:", TR_SLAY_HUMAN, &f, DP_WP);
- display_flag_aux(row+ 4, col, "Slay Human:", TR_KILL_HUMAN, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 5, col, "Slay Anim.:", TR_SLAY_ANIMAL, &f, DP_WP);
- display_flag_aux(row+ 5, col, "Slay Anim.:", TR_KILL_ANIMAL, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 6, col, "Slay Orc :", TR_SLAY_ORC, &f, DP_WP);
- display_flag_aux(row+ 6, col, "Slay Orc :", TR_KILL_ORC, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 7, col, "Slay Troll:", TR_SLAY_TROLL, &f, DP_WP);
- display_flag_aux(row+ 7, col, "Slay Troll:", TR_KILL_TROLL, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 8, col, "Slay Giant:", TR_SLAY_GIANT, &f, DP_WP);
- display_flag_aux(row+ 8, col, "Slay Giant:", TR_KILL_GIANT, &f, (DP_WP|DP_IMM));
- display_flag_aux(row+ 9, col, "Acid Brand:", TR_BRAND_ACID, &f, DP_WP);
- display_flag_aux(row+10, col, "Elec Brand:", TR_BRAND_ELEC, &f, DP_WP);
- display_flag_aux(row+11, col, "Fire Brand:", TR_BRAND_FIRE, &f, DP_WP);
- display_flag_aux(row+12, col, "Cold Brand:", TR_BRAND_COLD, &f, DP_WP);
- display_flag_aux(row+13, col, "Poison Brd:", TR_BRAND_POIS, &f, DP_WP);
- display_flag_aux(row+14, col, "Sharpness :", TR_VORPAL, &f, DP_WP);
- display_flag_aux(row+15, col, "Quake :", TR_IMPACT, &f, DP_WP);
- display_flag_aux(row+16, col, "Vampicic :", TR_VAMPIRIC, &f, DP_WP);
- display_flag_aux(row+17, col, "Chatic :", TR_CHAOTIC, &f, DP_WP);
- display_flag_aux(row+18, col, "Force Wep.:", TR_FORCE_WEAPON, &f, DP_WP);
+ display_flag_aux(row+ 0, col, "¼Ù° ÇÜÂÇ :", TR_SLAY_EVIL, &f, DP_WP);
+ display_flag_aux(row+ 0, col, "¼Ù° ÇÜÂÇ :", TR_KILL_EVIL, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 1, col, "ÉÔ»à ÇÜÂÇ :", TR_SLAY_UNDEAD, &f, DP_WP);
+ display_flag_aux(row+ 1, col, "ÉÔ»à ÇÜÂÇ :", TR_KILL_UNDEAD, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 2, col, "°Ëâ ÇÜÂÇ :", TR_SLAY_DEMON, &f, DP_WP);
+ display_flag_aux(row+ 2, col, "°Ëâ ÇÜÂÇ :", TR_KILL_DEMON, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 3, col, "ζ ÇÜÂÇ :", TR_SLAY_DRAGON, &f, DP_WP);
+ display_flag_aux(row+ 3, col, "ζ ÇÜÂÇ :", TR_KILL_DRAGON, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 4, col, "¿Í´Ö ÇÜÂÇ :", TR_SLAY_HUMAN, &f, DP_WP);
+ display_flag_aux(row+ 4, col, "¿Í´Ö ÇÜÂÇ :", TR_KILL_HUMAN, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 5, col, "ưʪ ÇÜÂÇ :", TR_SLAY_ANIMAL, &f, DP_WP);
+ display_flag_aux(row+ 5, col, "ưʪ ÇÜÂÇ :", TR_KILL_ANIMAL, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 6, col, "¥ª¡¼¥¯ÇÜÂÇ:", TR_SLAY_ORC, &f, DP_WP);
+ display_flag_aux(row+ 6, col, "¥ª¡¼¥¯ÇÜÂÇ:", TR_KILL_ORC, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 7, col, "¥È¥í¥ëÇÜÂÇ:", TR_SLAY_TROLL, &f, DP_WP);
+ display_flag_aux(row+ 7, col, "¥È¥í¥ëÇÜÂÇ:", TR_KILL_TROLL, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 8, col, "µð¿Í ÇÜÂÇ :", TR_SLAY_GIANT, &f, DP_WP);
+ display_flag_aux(row+ 8, col, "µð¿Í ÇÜÂÇ :", TR_KILL_GIANT, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 9, col, "Íϲò :", TR_BRAND_ACID, &f, DP_WP);
+ display_flag_aux(row+10, col, "ÅÅ·â :", TR_BRAND_ELEC, &f, DP_WP);
+ display_flag_aux(row+11, col, "¾Æ´þ :", TR_BRAND_FIRE, &f, DP_WP);
+ display_flag_aux(row+12, col, "Åà·ë :", TR_BRAND_COLD, &f, DP_WP);
+ display_flag_aux(row+13, col, "ÆÇ»¦ :", TR_BRAND_POIS, &f, DP_WP);
+ display_flag_aux(row+14, col, "ÀÚ¤ìÌ£ :", TR_VORPAL, &f, DP_WP);
+ display_flag_aux(row+15, col, "ÃÏ¿Ì :", TR_IMPACT, &f, DP_WP);
+ display_flag_aux(row+16, col, "µÛ·ì :", TR_VAMPIRIC, &f, DP_WP);
+ display_flag_aux(row+17, col, "¥«¥ª¥¹¸ú²Ì:", TR_CHAOTIC, &f, DP_WP);
+ display_flag_aux(row+18, col, "ÍýÎÏ :", TR_FORCE_WEAPON, &f, DP_WP);
+#else
+ display_flag_aux(row+ 0, col, "Slay Evil :", TR_SLAY_EVIL, &f, DP_WP);
+ display_flag_aux(row+ 0, col, "Slay Evil :", TR_KILL_EVIL, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 1, col, "Slay Und. :", TR_SLAY_UNDEAD, &f, DP_WP);
+ display_flag_aux(row+ 1, col, "Slay Und. :", TR_KILL_UNDEAD, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 2, col, "Slay Demon:", TR_SLAY_DEMON, &f, DP_WP);
+ display_flag_aux(row+ 2, col, "Slay Demon:", TR_KILL_DEMON, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 3, col, "Slay Drag.:", TR_SLAY_DRAGON, &f, DP_WP);
+ display_flag_aux(row+ 3, col, "Slay Drag.:", TR_KILL_DRAGON, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 4, col, "Slay Human:", TR_SLAY_HUMAN, &f, DP_WP);
+ display_flag_aux(row+ 4, col, "Slay Human:", TR_KILL_HUMAN, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 5, col, "Slay Anim.:", TR_SLAY_ANIMAL, &f, DP_WP);
+ display_flag_aux(row+ 5, col, "Slay Anim.:", TR_KILL_ANIMAL, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 6, col, "Slay Orc :", TR_SLAY_ORC, &f, DP_WP);
+ display_flag_aux(row+ 6, col, "Slay Orc :", TR_KILL_ORC, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 7, col, "Slay Troll:", TR_SLAY_TROLL, &f, DP_WP);
+ display_flag_aux(row+ 7, col, "Slay Troll:", TR_KILL_TROLL, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 8, col, "Slay Giant:", TR_SLAY_GIANT, &f, DP_WP);
+ display_flag_aux(row+ 8, col, "Slay Giant:", TR_KILL_GIANT, &f, (DP_WP|DP_IMM));
+ display_flag_aux(row+ 9, col, "Acid Brand:", TR_BRAND_ACID, &f, DP_WP);
+ display_flag_aux(row+10, col, "Elec Brand:", TR_BRAND_ELEC, &f, DP_WP);
+ display_flag_aux(row+11, col, "Fire Brand:", TR_BRAND_FIRE, &f, DP_WP);
+ display_flag_aux(row+12, col, "Cold Brand:", TR_BRAND_COLD, &f, DP_WP);
+ display_flag_aux(row+13, col, "Poison Brd:", TR_BRAND_POIS, &f, DP_WP);
+ display_flag_aux(row+14, col, "Sharpness :", TR_VORPAL, &f, DP_WP);
+ display_flag_aux(row+15, col, "Quake :", TR_IMPACT, &f, DP_WP);
+ display_flag_aux(row+16, col, "Vampicic :", TR_VAMPIRIC, &f, DP_WP);
+ display_flag_aux(row+17, col, "Chatic :", TR_CHAOTIC, &f, DP_WP);
+ display_flag_aux(row+18, col, "Force Wep.:", TR_FORCE_WEAPON, &f, DP_WP);
#endif
c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+12);
#ifdef JP
- display_flag_aux(row+ 0, col, "¥Æ¥ì¥Ñ¥·¡¼:", TR_TELEPATHY, &f, 0);
- display_flag_aux(row+ 1, col, "¼Ù°ESP :", TR_ESP_EVIL, &f, 0);
- display_flag_aux(row+ 2, col, "̵À¸ÊªESP :", TR_ESP_NONLIVING, &f, 0);
- display_flag_aux(row+ 3, col, "Á±ÎÉESP :", TR_ESP_GOOD, &f, 0);
- display_flag_aux(row+ 4, col, "ÉÔ»àESP :", TR_ESP_UNDEAD, &f, 0);
- display_flag_aux(row+ 5, col, "°ËâESP :", TR_ESP_DEMON, &f, 0);
- display_flag_aux(row+ 6, col, "ζESP :", TR_ESP_DRAGON, &f, 0);
- display_flag_aux(row+ 7, col, "¿Í´ÖESP :", TR_ESP_HUMAN, &f, 0);
- display_flag_aux(row+ 8, col, "ưʪESP :", TR_ESP_ANIMAL, &f, 0);
- display_flag_aux(row+ 9, col, "¥ª¡¼¥¯ESP :", TR_ESP_ORC, &f, 0);
- display_flag_aux(row+10, col, "¥È¥í¥ëESP :", TR_ESP_TROLL, &f, 0);
- display_flag_aux(row+11, col, "µð¿ÍESP :", TR_ESP_GIANT, &f, 0);
-
- display_flag_aux(row+13, col, "ÏÓÎÏ°Ý»ý :", TR_SUST_STR, &f, 0);
- display_flag_aux(row+14, col, "ÃÎÎÏ°Ý»ý :", TR_SUST_INT, &f, 0);
- display_flag_aux(row+15, col, "¸¤µ°Ý»ý :", TR_SUST_WIS, &f, 0);
- display_flag_aux(row+16, col, "´ïÍÑ°Ý»ý :", TR_SUST_DEX, &f, 0);
- display_flag_aux(row+17, col, "Âѵװݻý :", TR_SUST_CON, &f, 0);
- display_flag_aux(row+18, col, "Ì¥ÎÏ°Ý»ý :", TR_SUST_CHR, &f, 0);
-#else
- display_flag_aux(row+ 0, col, "Telepathy :", TR_TELEPATHY, &f, 0);
- display_flag_aux(row+ 1, col, "ESP Evil :", TR_ESP_EVIL, &f, 0);
- display_flag_aux(row+ 2, col, "ESP Noliv.:", TR_ESP_NONLIVING, &f, 0);
- display_flag_aux(row+ 3, col, "ESP Good :", TR_ESP_GOOD, &f, 0);
- display_flag_aux(row+ 4, col, "ESP Undead:", TR_ESP_UNDEAD, &f, 0);
- display_flag_aux(row+ 5, col, "ESP Demon :", TR_ESP_DEMON, &f, 0);
- display_flag_aux(row+ 6, col, "ESP Dragon:", TR_ESP_DRAGON, &f, 0);
- display_flag_aux(row+ 7, col, "ESP Human :", TR_ESP_HUMAN, &f, 0);
- display_flag_aux(row+ 8, col, "ESP Animal:", TR_ESP_ANIMAL, &f, 0);
- display_flag_aux(row+ 9, col, "ESP Orc :", TR_ESP_ORC, &f, 0);
- display_flag_aux(row+10, col, "ESP Troll :", TR_ESP_TROLL, &f, 0);
- display_flag_aux(row+11, col, "ESP Giant :", TR_ESP_GIANT, &f, 0);
-
- display_flag_aux(row+13, col, "Sust Str :", TR_SUST_STR, &f, 0);
- display_flag_aux(row+14, col, "Sust Int :", TR_SUST_INT, &f, 0);
- display_flag_aux(row+15, col, "Sust Wis :", TR_SUST_WIS, &f, 0);
- display_flag_aux(row+16, col, "Sust Dex :", TR_SUST_DEX, &f, 0);
- display_flag_aux(row+17, col, "Sust Con :", TR_SUST_CON, &f, 0);
- display_flag_aux(row+18, col, "Sust Chr :", TR_SUST_CHR, &f, 0);
+ display_flag_aux(row+ 0, col, "¥Æ¥ì¥Ñ¥·¡¼:", TR_TELEPATHY, &f, 0);
+ display_flag_aux(row+ 1, col, "¼Ù°ESP :", TR_ESP_EVIL, &f, 0);
+ display_flag_aux(row+ 2, col, "̵À¸ÊªESP :", TR_ESP_NONLIVING, &f, 0);
+ display_flag_aux(row+ 3, col, "Á±ÎÉESP :", TR_ESP_GOOD, &f, 0);
+ display_flag_aux(row+ 4, col, "ÉÔ»àESP :", TR_ESP_UNDEAD, &f, 0);
+ display_flag_aux(row+ 5, col, "°ËâESP :", TR_ESP_DEMON, &f, 0);
+ display_flag_aux(row+ 6, col, "ζESP :", TR_ESP_DRAGON, &f, 0);
+ display_flag_aux(row+ 7, col, "¿Í´ÖESP :", TR_ESP_HUMAN, &f, 0);
+ display_flag_aux(row+ 8, col, "ưʪESP :", TR_ESP_ANIMAL, &f, 0);
+ display_flag_aux(row+ 9, col, "¥ª¡¼¥¯ESP :", TR_ESP_ORC, &f, 0);
+ display_flag_aux(row+10, col, "¥È¥í¥ëESP :", TR_ESP_TROLL, &f, 0);
+ display_flag_aux(row+11, col, "µð¿ÍESP :", TR_ESP_GIANT, &f, 0);
+
+ display_flag_aux(row+13, col, "ÏÓÎÏ°Ý»ý :", TR_SUST_STR, &f, 0);
+ display_flag_aux(row+14, col, "ÃÎÎÏ°Ý»ý :", TR_SUST_INT, &f, 0);
+ display_flag_aux(row+15, col, "¸¤µ°Ý»ý :", TR_SUST_WIS, &f, 0);
+ display_flag_aux(row+16, col, "´ïÍÑ°Ý»ý :", TR_SUST_DEX, &f, 0);
+ display_flag_aux(row+17, col, "Âѵװݻý :", TR_SUST_CON, &f, 0);
+ display_flag_aux(row+18, col, "Ì¥ÎÏ°Ý»ý :", TR_SUST_CHR, &f, 0);
+#else
+ display_flag_aux(row+ 0, col, "Telepathy :", TR_TELEPATHY, &f, 0);
+ display_flag_aux(row+ 1, col, "ESP Evil :", TR_ESP_EVIL, &f, 0);
+ display_flag_aux(row+ 2, col, "ESP Noliv.:", TR_ESP_NONLIVING, &f, 0);
+ display_flag_aux(row+ 3, col, "ESP Good :", TR_ESP_GOOD, &f, 0);
+ display_flag_aux(row+ 4, col, "ESP Undead:", TR_ESP_UNDEAD, &f, 0);
+ display_flag_aux(row+ 5, col, "ESP Demon :", TR_ESP_DEMON, &f, 0);
+ display_flag_aux(row+ 6, col, "ESP Dragon:", TR_ESP_DRAGON, &f, 0);
+ display_flag_aux(row+ 7, col, "ESP Human :", TR_ESP_HUMAN, &f, 0);
+ display_flag_aux(row+ 8, col, "ESP Animal:", TR_ESP_ANIMAL, &f, 0);
+ display_flag_aux(row+ 9, col, "ESP Orc :", TR_ESP_ORC, &f, 0);
+ display_flag_aux(row+10, col, "ESP Troll :", TR_ESP_TROLL, &f, 0);
+ display_flag_aux(row+11, col, "ESP Giant :", TR_ESP_GIANT, &f, 0);
+
+ display_flag_aux(row+13, col, "Sust Str :", TR_SUST_STR, &f, 0);
+ display_flag_aux(row+14, col, "Sust Int :", TR_SUST_INT, &f, 0);
+ display_flag_aux(row+15, col, "Sust Wis :", TR_SUST_WIS, &f, 0);
+ display_flag_aux(row+16, col, "Sust Dex :", TR_SUST_DEX, &f, 0);
+ display_flag_aux(row+17, col, "Sust Con :", TR_SUST_CON, &f, 0);
+ display_flag_aux(row+18, col, "Sust Chr :", TR_SUST_CHR, &f, 0);
#endif
c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+14);
#ifdef JP
- display_flag_aux(row+ 0, col, "Äɲù¶·â :", TR_BLOWS, &f, 0);
- display_flag_aux(row+ 1, col, "ºÎ·¡ :", TR_TUNNEL, &f, 0);
- display_flag_aux(row+ 2, col, "ÀÖ³°Àþ»ëÎÏ :", TR_INFRA, &f, 0);
- display_flag_aux(row+ 3, col, "ËâË¡Æ»¶ñ»ÙÇÛ:", TR_MAGIC_MASTERY, &f, 0);
- display_flag_aux(row+ 4, col, "±£Ì© :", TR_STEALTH, &f, 0);
- display_flag_aux(row+ 5, col, "õº÷ :", TR_SEARCH, &f, 0);
-
- display_flag_aux(row+ 7, col, "¾èÇÏ :", TR_RIDING, &f, 0);
- display_flag_aux(row+ 8, col, "ÅêÚ³ :", TR_THROW, &f, 0);
- display_flag_aux(row+ 9, col, "½ËÊ¡ :", TR_BLESSED, &f, 0);
- display_flag_aux(row+10, col, "È¿¥Æ¥ì¥Ý¡¼¥È:", TR_NO_TELE, &f, 0);
- display_flag_aux(row+11, col, "È¿ËâË¡ :", TR_NO_MAGIC, &f, 0);
- display_flag_aux(row+12, col, "¾ÃÈñËâÎϸº¾¯:", TR_DEC_MANA, &f, 0);
-
- display_flag_aux(row+14, col, "·Ð¸³Ã͸º¾¯ :", TR_DRAIN_EXP, &f, 0);
- display_flag_aux(row+15, col, "Íð¥Æ¥ì¥Ý¡¼¥È:", TR_TELEPORT, &f, 0);
- display_flag_aux(row+16, col, "È¿´¶ :", TR_AGGRAVATE, &f, 0);
- display_flag_aux(row+17, col, "ÂÀ¸Å¤Î±åÇ° :", TR_TY_CURSE, &f, 0);
-#else
- display_flag_aux(row+ 0, col, "Add Blows :", TR_BLOWS, &f, 0);
- display_flag_aux(row+ 1, col, "Add Tunnel :", TR_TUNNEL, &f, 0);
- display_flag_aux(row+ 2, col, "Add Infra :", TR_INFRA, &f, 0);
- display_flag_aux(row+ 3, col, "Add Device :", TR_MAGIC_MASTERY, &f, 0);
- display_flag_aux(row+ 4, col, "Add Stealth :", TR_STEALTH, &f, 0);
- display_flag_aux(row+ 5, col, "Add Search :", TR_SEARCH, &f, 0);
-
- display_flag_aux(row+ 7, col, "Riding :", TR_RIDING, &f, 0);
- display_flag_aux(row+ 8, col, "Throw :", TR_THROW, &f, 0);
- display_flag_aux(row+ 9, col, "Blessed :", TR_BLESSED, &f, 0);
- display_flag_aux(row+10, col, "No Teleport :", TR_NO_TELE, &f, 0);
- display_flag_aux(row+11, col, "Anti Magic :", TR_NO_MAGIC, &f, 0);
- display_flag_aux(row+12, col, "Econom. Mana:", TR_DEC_MANA, &f, 0);
-
- display_flag_aux(row+14, col, "Drain Exp :", TR_DRAIN_EXP, &f, 0);
- display_flag_aux(row+15, col, "Rnd.Teleport:", TR_TELEPORT, &f, 0);
- display_flag_aux(row+16, col, "Aggravate :", TR_AGGRAVATE, &f, 0);
- display_flag_aux(row+17, col, "TY Curse :", TR_TY_CURSE, &f, 0);
+ display_flag_aux(row+ 0, col, "Äɲù¶·â :", TR_BLOWS, &f, 0);
+ display_flag_aux(row+ 1, col, "ºÎ·¡ :", TR_TUNNEL, &f, 0);
+ display_flag_aux(row+ 2, col, "ÀÖ³°Àþ»ëÎÏ :", TR_INFRA, &f, 0);
+ display_flag_aux(row+ 3, col, "ËâË¡Æ»¶ñ»ÙÇÛ:", TR_MAGIC_MASTERY, &f, 0);
+ display_flag_aux(row+ 4, col, "±£Ì© :", TR_STEALTH, &f, 0);
+ display_flag_aux(row+ 5, col, "õº÷ :", TR_SEARCH, &f, 0);
+
+ display_flag_aux(row+ 7, col, "¾èÇÏ :", TR_RIDING, &f, 0);
+ display_flag_aux(row+ 8, col, "ÅêÚ³ :", TR_THROW, &f, 0);
+ display_flag_aux(row+ 9, col, "½ËÊ¡ :", TR_BLESSED, &f, 0);
+ display_flag_aux(row+10, col, "È¿¥Æ¥ì¥Ý¡¼¥È:", TR_NO_TELE, &f, 0);
+ display_flag_aux(row+11, col, "È¿ËâË¡ :", TR_NO_MAGIC, &f, 0);
+ display_flag_aux(row+12, col, "¾ÃÈñËâÎϸº¾¯:", TR_DEC_MANA, &f, 0);
+
+ display_flag_aux(row+14, col, "·Ð¸³Ã͸º¾¯ :", TR_DRAIN_EXP, &f, 0);
+ display_flag_aux(row+15, col, "Íð¥Æ¥ì¥Ý¡¼¥È:", TR_TELEPORT, &f, 0);
+ display_flag_aux(row+16, col, "È¿´¶ :", TR_AGGRAVATE, &f, 0);
+ display_flag_aux(row+17, col, "ÂÀ¸Å¤Î±åÇ° :", TR_TY_CURSE, &f, 0);
+#else
+ display_flag_aux(row+ 0, col, "Add Blows :", TR_BLOWS, &f, 0);
+ display_flag_aux(row+ 1, col, "Add Tunnel :", TR_TUNNEL, &f, 0);
+ display_flag_aux(row+ 2, col, "Add Infra :", TR_INFRA, &f, 0);
+ display_flag_aux(row+ 3, col, "Add Device :", TR_MAGIC_MASTERY, &f, 0);
+ display_flag_aux(row+ 4, col, "Add Stealth :", TR_STEALTH, &f, 0);
+ display_flag_aux(row+ 5, col, "Add Search :", TR_SEARCH, &f, 0);
+
+ display_flag_aux(row+ 7, col, "Riding :", TR_RIDING, &f, 0);
+ display_flag_aux(row+ 8, col, "Throw :", TR_THROW, &f, 0);
+ display_flag_aux(row+ 9, col, "Blessed :", TR_BLESSED, &f, 0);
+ display_flag_aux(row+10, col, "No Teleport :", TR_NO_TELE, &f, 0);
+ display_flag_aux(row+11, col, "Anti Magic :", TR_NO_MAGIC, &f, 0);
+ display_flag_aux(row+12, col, "Econom. Mana:", TR_DEC_MANA, &f, 0);
+
+ display_flag_aux(row+14, col, "Drain Exp :", TR_DRAIN_EXP, &f, 0);
+ display_flag_aux(row+15, col, "Rnd.Teleport:", TR_TELEPORT, &f, 0);
+ display_flag_aux(row+16, col, "Aggravate :", TR_AGGRAVATE, &f, 0);
+ display_flag_aux(row+17, col, "TY Curse :", TR_TY_CURSE, &f, 0);
#endif
}
else if (p_ptr->is_dead)
{
if (!dun_level)
- {
+ {
#ifdef JP
sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï%s¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", map_name(), p_ptr->died_from);
#else
sprintf(statmsg, "...You were killed by %s in %s.", p_ptr->died_from, map_name());
#endif
- }
- else if (p_ptr->inside_quest && (p_ptr->inside_quest < MIN_RANDOM_QUEST))
- {
- /* Get the quest text */
- /* Bewere that INIT_ASSIGN resets the cur_num. */
- init_flags = INIT_ASSIGN;
+ }
+ else if (p_ptr->inside_quest && (p_ptr->inside_quest < MIN_RANDOM_QUEST))
+ {
+ /* Get the quest text */
+ /* Bewere that INIT_ASSIGN resets the cur_num. */
+ init_flags = INIT_ASSIGN;
- process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+ process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
#ifdef JP
- sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢¥¯¥¨¥¹¥È¡Ö%s¡×¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", quest[p_ptr->inside_quest].name, p_ptr->died_from);
+ sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢¥¯¥¨¥¹¥È¡Ö%s¡×¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", quest[p_ptr->inside_quest].name, p_ptr->died_from);
#else
- sprintf(statmsg, "...You were killed by %s in the quest '%s'.", p_ptr->died_from, quest[p_ptr->inside_quest].name);
+ sprintf(statmsg, "...You were killed by %s in the quest '%s'.", p_ptr->died_from, quest[p_ptr->inside_quest].name);
#endif
- }
- else
- {
+ }
+ else
+ {
#ifdef JP
- sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢%s¤Î%d³¬¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", map_name(), dun_level, p_ptr->died_from);
+ sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢%s¤Î%d³¬¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", map_name(), dun_level, p_ptr->died_from);
#else
- sprintf(statmsg, "...You were killed by %s on level %d of %s.", p_ptr->died_from, dun_level, map_name());
+ sprintf(statmsg, "...You were killed by %s on level %d of %s.", p_ptr->died_from, dun_level, map_name());
#endif
- }
+ }
}
else if (character_dungeon)
{
#ifdef JP
sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¸½ºß¡¢ %s ¤Ë¤¤¤ë¡£", map_name());
#else
- sprintf(statmsg, "...Now, you are in %s.", map_name());
+ sprintf(statmsg, "...Now, you are in %s.", map_name());
#endif
- }
- else if (p_ptr->inside_quest && (p_ptr->inside_quest < MIN_RANDOM_QUEST))
- {
- /* Clear the text */
- /* Must be done before doing INIT_SHOW_TEXT */
- for (i = 0; i < 10; i++)
- {
- quest_text[i][0] = '\0';
- }
- quest_text_line = 0;
+ }
+ else if (p_ptr->inside_quest && (p_ptr->inside_quest < MIN_RANDOM_QUEST))
+ {
+ /* Clear the text */
+ /* Must be done before doing INIT_SHOW_TEXT */
+ for (i = 0; i < 10; i++)
+ {
+ quest_text[i][0] = '\0';
+ }
+ quest_text_line = 0;
- /* Get the quest text */
- init_flags = INIT_SHOW_TEXT;
+ /* Get the quest text */
+ init_flags = INIT_SHOW_TEXT;
- process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
+ process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
#ifdef JP
- sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¸½ºß¡¢ ¥¯¥¨¥¹¥È¡Ö%s¡×¤ò¿ë¹ÔÃæ¤À¡£", quest[p_ptr->inside_quest].name);
+ sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¸½ºß¡¢ ¥¯¥¨¥¹¥È¡Ö%s¡×¤ò¿ë¹ÔÃæ¤À¡£", quest[p_ptr->inside_quest].name);
#else
- sprintf(statmsg, "...Now, you are in the quest '%s'.", quest[p_ptr->inside_quest].name);
+ sprintf(statmsg, "...Now, you are in the quest '%s'.", quest[p_ptr->inside_quest].name);
#endif
- }
- else
- {
+ }
+ else
+ {
#ifdef JP
- sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¸½ºß¡¢ %s ¤Î %d ³¬¤Çõº÷¤·¤Æ¤¤¤ë¡£", map_name(), dun_level);
+ sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¸½ºß¡¢ %s ¤Î %d ³¬¤Çõº÷¤·¤Æ¤¤¤ë¡£", map_name(), dun_level);
#else
- sprintf(statmsg, "...Now, you are exploring level %d of %s.", dun_level, map_name());
+ sprintf(statmsg, "...Now, you are exploring level %d of %s.", dun_level, map_name());
#endif
- }
+ }
}
if (*statmsg)
/* Special */
else if (mode == 3)
{
- display_player_other_flag_info();
+ display_player_other_flag_info();
}
else if (mode == 4)
static bool ang_sort_comp_quest_num(vptr u, vptr v, int a, int b)
{
int *q_num = (int *)u;
- quest_type *qa = &quest[q_num[a]];
- quest_type *qb = &quest[q_num[b]];
+ quest_type *qa = &quest[q_num[a]];
+ quest_type *qb = &quest[q_num[b]];
if (qa->complev < qb->complev) return TRUE;
if (qa->complev > qb->complev) return FALSE;
if (qa->level <= qb->level) return TRUE;
- return FALSE;
+ return FALSE;
}
static void ang_sort_swap_quest_num(vptr u, vptr v, int a, int b)
#ifdef JP
fprintf(fff, " [ÊѶòÈÚÅÜ %d.%d.%d ¥¥ã¥é¥¯¥¿¾ðÊó]\n\n",
- FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+ FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
#else
fprintf(fff, " [Hengband %d.%d.%d Character Dump]\n\n",
- FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+ FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
#endif
update_playtime();
/* End the row */
#ifdef JP
- fprintf(fff, "%s\n", buf);
+ fprintf(fff, "%s\n", buf);
#else
fprintf(fff, "%s\n", buf);
#endif
{
if (num < MIN_RANDOM_QUEST)
{
- int old_quest;
-
+ int old_quest;
+
/* Set the quest number temporary */
old_quest = p_ptr->inside_quest;
p_ptr->inside_quest = num;
/* Get the quest */
- init_flags = INIT_ASSIGN;
+ init_flags = INIT_ASSIGN;
process_dungeon_file("q_info_j.txt", 0, 0, 0, 0);
/* Reset the old quest number */
p_ptr->inside_quest = old_quest;
- /* No info from "silent" quests */
- if (quest[num].flags & QUEST_FLAG_SILENT) continue;
+ /* No info from "silent" quests */
+ if (quest[num].flags & QUEST_FLAG_SILENT) continue;
}
total++;
{
/* Print the quest info */
- if (quest[num].complev == 0)
- {
- fprintf(fff,
+ if (quest[num].complev == 0)
+ {
+ fprintf(fff,
#ifdef JP
- " %s (%d³¬) - ÉÔÀﾡ\n",
+ " %s (%d³¬) - ÉÔÀﾡ\n",
#else
- " %s (Dungeon level: %d) - (Cancelled)\n",
+ " %s (Dungeon level: %d) - (Cancelled)\n",
#endif
- r_name+r_info[quest[num].r_idx].name,
- quest[num].level);
- }
- else
- {
- fprintf(fff,
+ r_name+r_info[quest[num].r_idx].name,
+ quest[num].level);
+ }
+ else
+ {
+ fprintf(fff,
#ifdef JP
- " %s (%d³¬) - ¥ì¥Ù¥ë%d\n",
+ " %s (%d³¬) - ¥ì¥Ù¥ë%d\n",
#else
- " %s (Dungeon level: %d) - level %d\n",
+ " %s (Dungeon level: %d) - level %d\n",
#endif
- r_name+r_info[quest[num].r_idx].name,
- quest[num].level,
- quest[num].complev);
- }
+ r_name+r_info[quest[num].r_idx].name,
+ quest[num].level,
+ quest[num].complev);
+ }
}
else
{
{
if (num < MIN_RANDOM_QUEST)
{
- int old_quest;
+ int old_quest;
/* Set the quest number temporary */
old_quest = p_ptr->inside_quest;
/* Reset the old quest number */
p_ptr->inside_quest = old_quest;
- /* No info from "silent" quests */
- if (quest[num].flags & QUEST_FLAG_SILENT) continue;
+ /* No info from "silent" quests */
+ if (quest[num].flags & QUEST_FLAG_SILENT) continue;
}
total++;
#ifdef JP
fprintf(fff, "\n µ¢´Ô¾ì½ê:\n");
#else
- fprintf(fff, "\n Recall Depth:\n");
+ fprintf(fff, "\n Recall Depth:\n");
#endif
for (y = 1; y < max_d_idx; y++)
{
if (ironman_autoscum)
#ifdef JP
- fprintf(fff, "\n ¼«Æ°Áª¤ê¹¥¤ß : ALWAYS");
+ fprintf(fff, "\n ¼«Æ°Áª¤ê¹¥¤ß : ALWAYS");
#else
fprintf(fff, "\n Autoscum: ALWAYS");
#endif
else if (auto_scum)
#ifdef JP
- fprintf(fff, "\n ¼«Æ°Áª¤ê¹¥¤ß : ON");
+ fprintf(fff, "\n ¼«Æ°Áª¤ê¹¥¤ß : ON");
#else
fprintf(fff, "\n Autoscum: ON");
#endif
else
#ifdef JP
- fprintf(fff, "\n ¼«Æ°Áª¤ê¹¥¤ß : OFF");
+ fprintf(fff, "\n ¼«Æ°Áª¤ê¹¥¤ß : OFF");
#else
fprintf(fff, "\n Autoscum: OFF");
#endif
else
#ifdef JP
- fprintf(fff, "\n ¥¢¥ê¡¼¥Ê: OFF");
+ fprintf(fff, "\n ¥¢¥ê¡¼¥Ê: OFF");
#else
fprintf(fff, "\n Arena Levels: OFF");
#endif
#ifdef JP
fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++);
#else
- fprintf(fff, "\n ( page %d )\n", x++);
+ fprintf(fff, "\n ( page %d )\n", x++);
#endif
object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
fprintf(fff, "%c%s %s\n", I2A(i%12), paren, o_name);
for (i = 0; i < st_ptr->stock_num; i++)
{
#ifdef JP
- if ((i % 12) == 0) fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++);
+ if ((i % 12) == 0) fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++);
object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
fprintf(fff, "%c%s %s\n", I2A(i%12), paren, o_name);
#else
- if ((i % 12) == 0) fprintf(fff, "\n ( page %d )\n", x++);
+ if ((i % 12) == 0) fprintf(fff, "\n ( page %d )\n", x++);
object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
fprintf(fff, "%c%s %s\n", I2A(i%12), paren, o_name);
#endif
}
#ifdef JP
- fprintf(fff, " [¥Á¥§¥Ã¥¯¥µ¥à: \"%s\"]\n\n", get_check_sum());
+ fprintf(fff, " [¥Á¥§¥Ã¥¯¥µ¥à: \"%s\"]\n\n", get_check_sum());
#else
- fprintf(fff, " [Check Sum: \"%s\"]\n\n", get_check_sum());
+ fprintf(fff, " [Check Sum: \"%s\"]\n\n", get_check_sum());
#endif
return 0;
/* Build query */
#ifdef JP
- (void)sprintf(out_val, "¸½Â¸¤¹¤ë¥Õ¥¡¥¤¥ë %s ¤Ë¾å½ñ¤¤·¤Þ¤¹¤«? ", buf);
+ (void)sprintf(out_val, "¸½Â¸¤¹¤ë¥Õ¥¡¥¤¥ë %s ¤Ë¾å½ñ¤¤·¤Þ¤¹¤«? ", buf);
#else
(void)sprintf(out_val, "Replace existing file %s? ", buf);
#endif
{
/* Message */
#ifdef JP
- prt("¥¥ã¥é¥¯¥¿¾ðÊó¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡ª", 0, 0);
+ prt("¥¥ã¥é¥¯¥¿¾ðÊó¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡ª", 0, 0);
#else
prt("Character dump failed!", 0, 0);
#endif
- (void)inkey();
+ (void)inkey();
/* Error */
return (-1);
else if (str[6] == '<')
{
str[strlen(str) - 1] = '\0';
- if (tag && streq(str + 7, tag)) line = next;
+ if (tag && streq(str + 7, tag)) line = next;
}
/* Skip this */
"[Hengband %d.%d.%d, %s, Line %d/%d]",
#endif
- FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH,
- caption, line, size), 0, 0);
+ FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH,
+ caption, line, size), 0, 0);
}
else
{
/* Close it */
my_fclose(fff);
- /* Drop priv's */
+ /* Drop priv's */
safe_setuid_drop();
/* Build the filename */
if (mult < 5) mult = 5;
- for (i = 0; i < max_d_idx; i++)
- if(max_dlv[i] > max_dl)
- max_dl = max_dlv[i];
+ for (i = 0; i < max_d_idx; i++)
+ if(max_dlv[i] > max_dl)
+ max_dl = max_dlv[i];
point_l = (p_ptr->max_exp + (100 * max_dl));
point_h = point_l / 0x10000L;
if (p_ptr->total_winner || (p_ptr->lev > PY_MAX_LEVEL))
{
#ifdef JP
- /* ±ÑÆüÀÚ¤êÂؤ¨ */
+ /* ±ÑÆüÀÚ¤êÂؤ¨ */
p= "°ÎÂç¤Ê¤ë¼Ô";
#else
p = "Magnificent";
put_str(buf, 13, 11);
#ifdef JP
- /* Êè¤Ë¹ï¤à¸ÀÍÕ¤ò¥ª¥ê¥¸¥Ê¥ë¤è¤êºÙ¤«¤¯É½¼¨ */
- if (streq(p_ptr->died_from, "ÅÓÃ潪λ"))
- {
- strcpy(tmp, "<¼«»¦>");
- }
- else
- {
- if (streq(p_ptr->died_from, "ripe"))
- {
- strcpy(tmp, "°úÂà¸å¤ËÅ·¼÷¤òÁ´¤¦");
- }
- else if (streq(p_ptr->died_from, "Seppuku"))
- {
- strcpy(tmp, "¾¡Íø¤Î¸å¡¢ÀÚÊ¢");
- }
- else
- {
- strcpy(tmp, p_ptr->died_from);
- }
- }
- center_string(buf, tmp);
- put_str(buf, 14, 11);
-
- if(!streq(p_ptr->died_from, "ripe") && !streq(p_ptr->died_from, "Seppuku"))
- {
- if( dun_level == 0 )
- {
+ /* Êè¤Ë¹ï¤à¸ÀÍÕ¤ò¥ª¥ê¥¸¥Ê¥ë¤è¤êºÙ¤«¤¯É½¼¨ */
+ if (streq(p_ptr->died_from, "ÅÓÃ潪λ"))
+ {
+ strcpy(tmp, "<¼«»¦>");
+ }
+ else
+ {
+ if (streq(p_ptr->died_from, "ripe"))
+ {
+ strcpy(tmp, "°úÂà¸å¤ËÅ·¼÷¤òÁ´¤¦");
+ }
+ else if (streq(p_ptr->died_from, "Seppuku"))
+ {
+ strcpy(tmp, "¾¡Íø¤Î¸å¡¢ÀÚÊ¢");
+ }
+ else
+ {
+ strcpy(tmp, p_ptr->died_from);
+ }
+ }
+ center_string(buf, tmp);
+ put_str(buf, 14, 11);
+
+ if(!streq(p_ptr->died_from, "ripe") && !streq(p_ptr->died_from, "Seppuku"))
+ {
+ if( dun_level == 0 )
+ {
cptr town = (p_ptr->town_num ? "³¹" : "¹ÓÌî");
- if(streq(p_ptr->died_from, "ÅÓÃ潪λ"))
- {
- sprintf(tmp, "%s¤Ç»à¤ó¤À", town);
- }
- else
- {
- sprintf(tmp, "¤Ë%s¤Ç»¦¤µ¤ì¤¿", town);
- }
- }
- else
- {
- if(streq(p_ptr->died_from, "ÅÓÃ潪λ"))
- {
- sprintf(tmp, "Ãϲ¼ %d ³¬¤Ç»à¤ó¤À", dun_level);
- }
- else
- {
- sprintf(tmp, "¤ËÃϲ¼ %d ³¬¤Ç»¦¤µ¤ì¤¿", dun_level);
- }
- }
- center_string(buf, tmp);
- put_str(buf, 15, 11);
- }
+ if(streq(p_ptr->died_from, "ÅÓÃ潪λ"))
+ {
+ sprintf(tmp, "%s¤Ç»à¤ó¤À", town);
+ }
+ else
+ {
+ sprintf(tmp, "¤Ë%s¤Ç»¦¤µ¤ì¤¿", town);
+ }
+ }
+ else
+ {
+ if(streq(p_ptr->died_from, "ÅÓÃ潪λ"))
+ {
+ sprintf(tmp, "Ãϲ¼ %d ³¬¤Ç»à¤ó¤À", dun_level);
+ }
+ else
+ {
+ sprintf(tmp, "¤ËÃϲ¼ %d ³¬¤Ç»¦¤µ¤ì¤¿", dun_level);
+ }
+ }
+ center_string(buf, tmp);
+ put_str(buf, 15, 11);
+ }
#else
(void)sprintf(tmp, "Killed on Level %d", dun_level);
center_string(buf, tmp);
{
/* Error while converting the monster number */
msg_format("Error in line %d of %s!",
- line_num, file_name);
+ line_num, file_name);
my_fclose(fp);
return (-1);
}
/* Reached end of file without finding the number */
msg_format("Error in line %d of %s!",
- line_num, file_name);
+ line_num, file_name);
my_fclose(fp);
return (-1);
break;
}
- if (test==0)
+ if (test==0)
{
/* Found the line */
if (counter == line) break;
{
/* Error - End of file */
msg_format("Error in line %d of %s!",
- line_num, file_name);
+ line_num, file_name);
my_fclose(fp);
return (-1);
#ifdef JP
"¶²¤í¤·¤¤¥½¥Õ¥È¤Î¥Ð¥°¤¬Èô¤Ó¤«¤«¤Ã¤Æ¤¤¿¡ª");
#else
- "A gruesome software bug LEAPS out at you!");
+ "A gruesome software bug LEAPS out at you!");
#endif
void get_table_name(char *out_string)
{
#ifdef JP
- char Syllable[80];
+ char Syllable[80];
strcpy(out_string, "¡Ø");
get_rnd_line("aname_j.txt", 1, Syllable);
strcat(out_string, Syllable);
case TV_FOOD:
{
if(o_ptr->sval == SV_FOOD_JERKY)
- {
+ {
t = object_desc_str(t, "ÀÚ¤ì");
break;
}
{ "Éâ", "Lv", TR_FEATHER, -1 },
{ "ÌÀ", "Lu", TR_LITE, -1 },
{ "·Ù", "Wr", TR_WARNING, -1 },
- { "ÇÜ", "Xm", TR_XTRA_MIGHT, -1 },
+ { "ÇÜ", "Xm", TR_XTRA_MIGHT, -1 },
{ "¼Í", "Xs", TR_XTRA_SHOTS, -1 },
{ "ÅÜ", "Ag", TR_AGGRAVATE, -1 },
{ "½Ë", "Bs", TR_BLESSED, -1 },
#else
static flag_insc_table flag_insc_plus[] =
{
- { "At", TR_BLOWS, -1 },
- { "Sp", TR_SPEED, -1 },
- { "St", TR_STR, -1 },
- { "In", TR_INT, -1 },
- { "Wi", TR_WIS, -1 },
- { "Dx", TR_DEX, -1 },
- { "Cn", TR_CON, -1 },
- { "Ch", TR_CHR, -1 },
- { "Sl", TR_STEALTH, -1 },
- { "Sr", TR_SEARCH, -1 },
- { "If", TR_INFRA, -1 },
- { "Dg", TR_TUNNEL, -1 },
- { NULL, 0, -1 }
+ { "At", TR_BLOWS, -1 },
+ { "Sp", TR_SPEED, -1 },
+ { "St", TR_STR, -1 },
+ { "In", TR_INT, -1 },
+ { "Wi", TR_WIS, -1 },
+ { "Dx", TR_DEX, -1 },
+ { "Cn", TR_CON, -1 },
+ { "Ch", TR_CHR, -1 },
+ { "Sl", TR_STEALTH, -1 },
+ { "Sr", TR_SEARCH, -1 },
+ { "If", TR_INFRA, -1 },
+ { "Dg", TR_TUNNEL, -1 },
+ { NULL, 0, -1 }
};
static flag_insc_table flag_insc_immune[] =
{
- { "Ac", TR_IM_ACID, -1 },
- { "El", TR_IM_ELEC, -1 },
- { "Fi", TR_IM_FIRE, -1 },
- { "Co", TR_IM_COLD, -1 },
- { NULL, 0, -1 }
+ { "Ac", TR_IM_ACID, -1 },
+ { "El", TR_IM_ELEC, -1 },
+ { "Fi", TR_IM_FIRE, -1 },
+ { "Co", TR_IM_COLD, -1 },
+ { NULL, 0, -1 }
};
static flag_insc_table flag_insc_resistance[] =
{
- { "Ac", TR_RES_ACID, TR_IM_ACID },
- { "El", TR_RES_ELEC, TR_IM_ELEC },
- { "Fi", TR_RES_FIRE, TR_IM_FIRE },
- { "Co", TR_RES_COLD, TR_IM_COLD },
- { "Po", TR_RES_POIS, -1 },
- { "Li", TR_RES_LITE, -1 },
- { "Dk", TR_RES_DARK, -1 },
- { "Sh", TR_RES_SHARDS, -1 },
- { "Bl", TR_RES_BLIND, -1 },
- { "Cf", TR_RES_CONF, -1 },
- { "So", TR_RES_SOUND, -1 },
- { "Nt", TR_RES_NETHER, -1 },
- { "Nx", TR_RES_NEXUS, -1 },
- { "Ca", TR_RES_CHAOS, -1 },
- { "Di", TR_RES_DISEN, -1 },
- { "Fe", TR_RES_FEAR, -1 },
- { NULL, 0, -1 }
+ { "Ac", TR_RES_ACID, TR_IM_ACID },
+ { "El", TR_RES_ELEC, TR_IM_ELEC },
+ { "Fi", TR_RES_FIRE, TR_IM_FIRE },
+ { "Co", TR_RES_COLD, TR_IM_COLD },
+ { "Po", TR_RES_POIS, -1 },
+ { "Li", TR_RES_LITE, -1 },
+ { "Dk", TR_RES_DARK, -1 },
+ { "Sh", TR_RES_SHARDS, -1 },
+ { "Bl", TR_RES_BLIND, -1 },
+ { "Cf", TR_RES_CONF, -1 },
+ { "So", TR_RES_SOUND, -1 },
+ { "Nt", TR_RES_NETHER, -1 },
+ { "Nx", TR_RES_NEXUS, -1 },
+ { "Ca", TR_RES_CHAOS, -1 },
+ { "Di", TR_RES_DISEN, -1 },
+ { "Fe", TR_RES_FEAR, -1 },
+ { NULL, 0, -1 }
};
static flag_insc_table flag_insc_misc[] =
{
- { "Ma", TR_DEC_MANA, -1 },
- { "Th", TR_THROW, -1 },
- { "Rf", TR_REFLECT, -1 },
- { "Fa", TR_FREE_ACT, -1 },
- { "Si", TR_SEE_INVIS, -1 },
- { "Hl", TR_HOLD_LIFE, -1 },
- { "Sd", TR_SLOW_DIGEST, -1 },
- { "Rg", TR_REGEN, -1 },
- { "Lv", TR_FEATHER, -1 },
- { "Lu", TR_LITE, -1 },
+ { "Ma", TR_DEC_MANA, -1 },
+ { "Th", TR_THROW, -1 },
+ { "Rf", TR_REFLECT, -1 },
+ { "Fa", TR_FREE_ACT, -1 },
+ { "Si", TR_SEE_INVIS, -1 },
+ { "Hl", TR_HOLD_LIFE, -1 },
+ { "Sd", TR_SLOW_DIGEST, -1 },
+ { "Rg", TR_REGEN, -1 },
+ { "Lv", TR_FEATHER, -1 },
+ { "Lu", TR_LITE, -1 },
{ "Wr", TR_WARNING, -1 },
{ "Xm", TR_XTRA_MIGHT, -1 },
- { "Xs", TR_XTRA_SHOTS, -1 },
- { "Ag", TR_AGGRAVATE, -1 },
- { "Bs", TR_BLESSED, -1 },
- { "Ty", TR_TY_CURSE, -1 },
- { NULL, 0, -1 }
+ { "Xs", TR_XTRA_SHOTS, -1 },
+ { "Ag", TR_AGGRAVATE, -1 },
+ { "Bs", TR_BLESSED, -1 },
+ { "Ty", TR_TY_CURSE, -1 },
+ { NULL, 0, -1 }
};
static flag_insc_table flag_insc_aura[] =
{
- { "F", TR_SH_FIRE, -1 },
- { "E", TR_SH_ELEC, -1 },
- { "C", TR_SH_COLD, -1 },
- { "M", TR_NO_MAGIC, -1 },
- { "T", TR_NO_TELE, -1 },
- { NULL, 0, -1 }
+ { "F", TR_SH_FIRE, -1 },
+ { "E", TR_SH_ELEC, -1 },
+ { "C", TR_SH_COLD, -1 },
+ { "M", TR_NO_MAGIC, -1 },
+ { "T", TR_NO_TELE, -1 },
+ { NULL, 0, -1 }
};
static flag_insc_table flag_insc_brand[] =
{
- { "A", TR_BRAND_ACID, -1 },
- { "E", TR_BRAND_ELEC, -1 },
- { "F", TR_BRAND_FIRE, -1 },
- { "Co", TR_BRAND_COLD, -1 },
- { "P", TR_BRAND_POIS, -1 },
- { "Ca", TR_CHAOTIC, -1 },
- { "V", TR_VAMPIRIC, -1 },
- { "Q", TR_IMPACT, -1 },
- { "S", TR_VORPAL, -1 },
- { "M", TR_FORCE_WEAPON, -1 },
- { NULL, 0, -1 }
+ { "A", TR_BRAND_ACID, -1 },
+ { "E", TR_BRAND_ELEC, -1 },
+ { "F", TR_BRAND_FIRE, -1 },
+ { "Co", TR_BRAND_COLD, -1 },
+ { "P", TR_BRAND_POIS, -1 },
+ { "Ca", TR_CHAOTIC, -1 },
+ { "V", TR_VAMPIRIC, -1 },
+ { "Q", TR_IMPACT, -1 },
+ { "S", TR_VORPAL, -1 },
+ { "M", TR_FORCE_WEAPON, -1 },
+ { NULL, 0, -1 }
};
static flag_insc_table flag_insc_kill[] =
static flag_insc_table flag_insc_sust[] =
{
- { "St", TR_SUST_STR, -1 },
- { "In", TR_SUST_INT, -1 },
- { "Wi", TR_SUST_WIS, -1 },
- { "Dx", TR_SUST_DEX, -1 },
- { "Cn", TR_SUST_CON, -1 },
- { "Ch", TR_SUST_CHR, -1 },
- { NULL, 0, -1 }
+ { "St", TR_SUST_STR, -1 },
+ { "In", TR_SUST_INT, -1 },
+ { "Wi", TR_SUST_WIS, -1 },
+ { "Dx", TR_SUST_DEX, -1 },
+ { "Cn", TR_SUST_CON, -1 },
+ { "Ch", TR_SUST_CHR, -1 },
+ { NULL, 0, -1 }
};
#endif
*/
static void get_inscription(char *buff, object_type *o_ptr)
{
- cptr insc = quark_str(o_ptr->inscription);
+ cptr insc = quark_str(o_ptr->inscription);
char *ptr = buff;
char *prev_ptr = buff;
/* Not fully identified */
if (!(o_ptr->ident & IDENT_MENTAL))
- {
- /* Copy until end of line or '#' */
- while (*insc)
- {
- if (*insc == '#') break;
+ {
+ /* Copy until end of line or '#' */
+ while (*insc)
+ {
+ if (*insc == '#') break;
#ifdef JP
- if (iskanji(*insc)) *buff++ = *insc++;
+ if (iskanji(*insc)) *buff++ = *insc++;
#endif
- *buff++ = *insc++;
- }
+ *buff++ = *insc++;
+ }
- *buff = '\0';
- return;
- }
+ *buff = '\0';
+ return;
+ }
/* Extract the flags */
object_flags(o_ptr, flgs);
*buff = '\0';
for (; *insc; insc++)
{
- bool kanji = FALSE;
- bool all;
+ bool kanji = FALSE;
+ bool all;
- /* Ignore fake artifact inscription */
- if (*insc == '#') break;
+ /* Ignore fake artifact inscription */
+ if (*insc == '#') break;
- /* {%} will be automatically converted */
+ /* {%} will be automatically converted */
else if ('%' == *insc)
{
cptr start_percent = ptr;
if (o_ptr->name2)
{
- bool teleport = have_flag(flgs, TR_TELEPORT);
+ bool teleport = have_flag(flgs, TR_TELEPORT);
ego_item_type *e_ptr = &e_info[o_ptr->name2];
for (j = 0; j < TR_FLAG_SIZE; j++)
flgs[j] &= ~e_ptr->flags[j];
- /* Always inscribe {.} for random teleport */
- if (teleport) add_flag(flgs, TR_TELEPORT);
+ /* Always inscribe {.} for random teleport */
+ if (teleport) add_flag(flgs, TR_TELEPORT);
}
}
ptr = inscribe_flags_aux(flag_insc_slay, flgs, kanji, ptr);
/* Esp */
- if (kanji)
- {
- if (have_flag_of(flag_insc_esp1, flgs) ||
- have_flag_of(flag_insc_esp2, flgs))
- ADD_INSC("~");
- ptr = inscribe_flags_aux(flag_insc_esp1, flgs, kanji, ptr);
- ptr = inscribe_flags_aux(flag_insc_esp2, flgs, kanji, ptr);
- }
- else
- {
- if (have_flag_of(flag_insc_esp1, flgs))
- ADD_INSC("~");
- ptr = inscribe_flags_aux(flag_insc_esp1, flgs, kanji, ptr);
- if (have_flag_of(flag_insc_esp2, flgs))
- ADD_INSC("~");
- ptr = inscribe_flags_aux(flag_insc_esp2, flgs, kanji, ptr);
- }
+ if (kanji)
+ {
+ if (have_flag_of(flag_insc_esp1, flgs) ||
+ have_flag_of(flag_insc_esp2, flgs))
+ ADD_INSC("~");
+ ptr = inscribe_flags_aux(flag_insc_esp1, flgs, kanji, ptr);
+ ptr = inscribe_flags_aux(flag_insc_esp2, flgs, kanji, ptr);
+ }
+ else
+ {
+ if (have_flag_of(flag_insc_esp1, flgs))
+ ADD_INSC("~");
+ ptr = inscribe_flags_aux(flag_insc_esp1, flgs, kanji, ptr);
+ if (have_flag_of(flag_insc_esp2, flgs))
+ ADD_INSC("~");
+ ptr = inscribe_flags_aux(flag_insc_esp2, flgs, kanji, ptr);
+ }
/* Random Teleport */
if (have_flag(flgs, TR_TELEPORT))
*ptr++ = *insc;
}
}
- *ptr = '\0';
+ *ptr = '\0';
}
{
modstr = basenm;
#ifdef JP
- basenm = "& ÍÓÈé»æ - #";
+ basenm = "& ÍÓÈé»æ - #";
#else
- basenm = "& Parchement~ - #";
+ basenm = "& Parchement~ - #";
#endif
break;
}
default:
{
#ifdef JP
- strcpy(buf, "(¤Ê¤·)");
+ strcpy(buf, "(¤Ê¤·)");
#else
strcpy(buf, "(nothing)");
#endif
t = object_desc_str(t,format("ÃÃÌê»Õ%s¤Î",player_name));
}
- /* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¡¢Ì¾¤Î¤¢¤ë¥¢¥¤¥Æ¥à¤Î̾Á°¤òÉղ乤ë */
- if (known) {
- /* ¥é¥ó¥À¥à¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È */
+ /* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¡¢Ì¾¤Î¤¢¤ë¥¢¥¤¥Æ¥à¤Î̾Á°¤òÉղ乤ë */
+ if (known) {
+ /* ¥é¥ó¥À¥à¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È */
if (o_ptr->art_name)
{ char temp[256];
- strcpy(temp, quark_str(o_ptr->art_name));
- /* '¡Ø' ¤«¤é»Ï¤Þ¤é¤Ê¤¤ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ½é¤ËÉղ乤ë */
- /* ±Ñ¸ìÈǤΥ»¡¼¥Ö¥Õ¥¡¥¤¥ë¤«¤éÍ褿 'of XXX' ¤Ï,¡ÖXXX¤Î¡×¤Èɽ¼¨¤¹¤ë */
+ strcpy(temp, quark_str(o_ptr->art_name));
+ /* '¡Ø' ¤«¤é»Ï¤Þ¤é¤Ê¤¤ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ½é¤ËÉղ乤ë */
+ /* ±Ñ¸ìÈǤΥ»¡¼¥Ö¥Õ¥¡¥¤¥ë¤«¤éÍ褿 'of XXX' ¤Ï,¡ÖXXX¤Î¡×¤Èɽ¼¨¤¹¤ë */
if ( strncmp( temp , "of ",3)==0 ) {t=object_desc_str(t,&temp[3]);t=object_desc_str(t,"¤Î");}
else
- if ( strncmp( temp , "¡Ø" , 2 ) != 0 && temp[0]!='\'')
- t=object_desc_str(t, temp);
- }
- /* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à */
- else if (o_ptr->name1 && !have_flag(flgs, TR_FULL_NAME)) {
- artifact_type *a_ptr = &a_info[o_ptr->name1];
- /* '¡Ø' ¤«¤é»Ï¤Þ¤é¤Ê¤¤ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ½é¤ËÉղ乤ë */
- if ( strncmp( (a_name + a_ptr->name), "¡Ø" , 2) != 0){
- t=object_desc_str(t, (a_name + a_ptr->name));
- }
- }
- /* ̾¤Î¤¢¤ë¥¢¥¤¥Æ¥à */
- else if (o_ptr->name2) {
- ego_item_type *e_ptr = &e_info[o_ptr->name2];
- t=object_desc_str(t, (e_name + e_ptr->name));
- }
- }
+ if ( strncmp( temp , "¡Ø" , 2 ) != 0 && temp[0]!='\'')
+ t=object_desc_str(t, temp);
+ }
+ /* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à */
+ else if (o_ptr->name1 && !have_flag(flgs, TR_FULL_NAME)) {
+ artifact_type *a_ptr = &a_info[o_ptr->name1];
+ /* '¡Ø' ¤«¤é»Ï¤Þ¤é¤Ê¤¤ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ½é¤ËÉղ乤ë */
+ if ( strncmp( (a_name + a_ptr->name), "¡Ø" , 2) != 0){
+ t=object_desc_str(t, (a_name + a_ptr->name));
+ }
+ }
+ /* ̾¤Î¤¢¤ë¥¢¥¤¥Æ¥à */
+ else if (o_ptr->name2) {
+ ego_item_type *e_ptr = &e_info[o_ptr->name2];
+ t=object_desc_str(t, (e_name + e_ptr->name));
+ }
+ }
#endif
/* Copy the string */
for (; *s; s++)
{
/* Pluralizer */
#ifdef JP
- if (*s == '#')
+ if (*s == '#')
#else
if (*s == '~')
{
#ifdef JP
- /* '¡Ø'¤«¤é»Ï¤Þ¤ëÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ¸å¤ËÉղ乤ë */
- if (known) {
+ /* '¡Ø'¤«¤é»Ï¤Þ¤ëÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ¸å¤ËÉղ乤ë */
+ if (known) {
/* ¥é¥ó¥À¥à¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î̾Á°¤Ï¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤ËµÏ¿
- ¤µ¤ì¤ë¤Î¤Ç¡¢±Ñ¸ìÈǤÎ̾Á°¤â¤½¤ì¤é¤·¤¯ÊÑ´¹¤¹¤ë */
+ ¤µ¤ì¤ë¤Î¤Ç¡¢±Ñ¸ìÈǤÎ̾Á°¤â¤½¤ì¤é¤·¤¯ÊÑ´¹¤¹¤ë */
if (o_ptr->art_name)
{ char temp[256];int itemp;
- strcpy(temp, quark_str(o_ptr->art_name));
+ strcpy(temp, quark_str(o_ptr->art_name));
/* MEGA HACK by ita*/
- if ( strncmp( temp , "¡Ø" , 2 ) == 0 ) t=object_desc_str(t, temp);else
+ if ( strncmp( temp , "¡Ø" , 2 ) == 0 ) t=object_desc_str(t, temp);else
if( temp[0]=='\'' ) { itemp=strlen(temp);temp[itemp-1]=0;
t=object_desc_str(t,"¡Ø");
t=object_desc_str(t,&temp[1]);
t=object_desc_str(t,"¡Ù");}
-
- }
- else if (o_ptr->name1) {
- artifact_type *a_ptr = &a_info[o_ptr->name1];
- if ( strncmp( (a_name + a_ptr->name) , "¡Ø" , 2 ) == 0 ){
- t=object_desc_str(t, (a_name + a_ptr->name));
- }
- }
+
+ }
+ else if (o_ptr->name1) {
+ artifact_type *a_ptr = &a_info[o_ptr->name1];
+ if ( strncmp( (a_name + a_ptr->name) , "¡Ø" , 2 ) == 0 ){
+ t=object_desc_str(t, (a_name + a_ptr->name));
+ }
+ }
else if (o_ptr->inscription)
{
cptr str = quark_str(o_ptr->inscription);
t=object_desc_str(t,"¡Ù");
}
}
- }
+ }
#else
if ((o_ptr->tval > TV_CAPTURE) && o_ptr->xtra3)
{
}
t = object_desc_num(t, o_ptr->pval);
#ifdef JP
- t = object_desc_str(t, "²óʬ");
+ t = object_desc_str(t, "²óʬ");
#else
t = object_desc_str(t, " charge");
/* Find out how many rods are charging, by dividing
* current timeout by each rod's maximum timeout.
* Ensure that any remainder is rounded up. Display
- * very discharged stacks as merely fully discharged.
- */
+ * very discharged stacks as merely fully discharged.
+ */
power = (o_ptr->timeout + (k_ptr->pval - 1)) / k_ptr->pval;
if (power > o_ptr->number) power = o_ptr->number;
/* Use the standard inscription if available */
if (o_ptr->inscription)
{
- char buff[1024];
+ char buff[1024];
if (tmp_val2[0]) strcat(tmp_val2, ", ");
- /* Get inscription and convert {%} */
- get_inscription(buff, o_ptr);
+ /* Get inscription and convert {%} */
+ get_inscription(buff, o_ptr);
- /* strcat with correct treating of kanji */
- my_strcat(tmp_val2, buff, sizeof(tmp_val2));
+ /* strcat with correct treating of kanji */
+ my_strcat(tmp_val2, buff, sizeof(tmp_val2));
}
/* Note the discount, if any */
}
else if (feat == FEAT_MORE)
{
- int q_idx = quest_number(dun_level);
+ int q_idx = quest_number(dun_level);
/* No downstairs on quest levels */
if (dun_level > 1 && q_idx)
- {
+ {
monster_race *r_ptr = &r_info[quest[q_idx].r_idx];
/* The quest monster(s) is still alive? */
if (!(r_ptr->flags1 & RF1_UNIQUE) || 0 < r_ptr->max_num)
- return TRUE;
- }
+ return TRUE;
+ }
/* No downstairs at the bottom */
if (dun_level >= d_info[dungeon_type].maxdepth) return TRUE;
/* Require a certain number of adjacent walls */
if (next_to_walls(y, x) < walls) continue;
- /* Clear possible garbage of hidden trap */
- c_ptr->mimic = 0;
+ /* Clear possible garbage of hidden trap */
+ c_ptr->mimic = 0;
/* Clear previous contents, add stairs */
if (i < more_num) c_ptr->feat = feat+0x07;
/* Skip non "empty floor" grids */
if (!is_floor_grid(c_ptr))
- continue;
+ continue;
/* Skip grids inside rooms */
if (c_ptr->info & (CAVE_ROOM)) continue;
dun_data dun_body;
- /* Fill the arrays of floors and walls in the good proportions */
- for (i = 0; i < 100; i++)
- {
- int lim1, lim2, lim3;
+ /* Fill the arrays of floors and walls in the good proportions */
+ for (i = 0; i < 100; i++)
+ {
+ int lim1, lim2, lim3;
- lim1 = d_info[dungeon_type].floor_percent1;
- lim2 = lim1 + d_info[dungeon_type].floor_percent2;
- lim3 = lim2 + d_info[dungeon_type].floor_percent3;
+ lim1 = d_info[dungeon_type].floor_percent1;
+ lim2 = lim1 + d_info[dungeon_type].floor_percent2;
+ lim3 = lim2 + d_info[dungeon_type].floor_percent3;
if (i < lim1)
floor_type[i] = d_info[dungeon_type].floor1;
fill_type[i] = d_info[dungeon_type].fill_type2;
else if (i < lim3)
fill_type[i] = d_info[dungeon_type].fill_type3;
- }
+ }
/* Prepare allocation table */
get_mon_num_prep(get_monster_hook(), NULL);
- feat_wall_outer = d_info[dungeon_type].outer_wall;
- feat_wall_inner = d_info[dungeon_type].inner_wall;
- feat_wall_solid = d_info[dungeon_type].outer_wall;
+ feat_wall_outer = d_info[dungeon_type].outer_wall;
+ feat_wall_inner = d_info[dungeon_type].inner_wall;
+ feat_wall_solid = d_info[dungeon_type].outer_wall;
/* Global data */
dun = &dun_body;
/* Hack -- Add some rivers */
if (one_in_(3) && (randint1(dun_level) > 5))
{
- /* Choose water or lava */
+ /* Choose water or lava */
if ((randint1(MAX_DEPTH * 2) - 1 > dun_level) && (d_info[dungeon_type].flags1 & DF1_WATER_RIVER))
{
feat1 = FEAT_DEEP_WATER;
else feat1 = 0;
- /* Only add river if matches lake type or if have no lake at all */
- if ((((laketype == 1) && (feat1 == FEAT_DEEP_LAVA)) ||
- ((laketype == 2) && (feat1 == FEAT_DEEP_WATER)) ||
+ /* Only add river if matches lake type or if have no lake at all */
+ if ((((laketype == 1) && (feat1 == FEAT_DEEP_LAVA)) ||
+ ((laketype == 2) && (feat1 == FEAT_DEEP_WATER)) ||
(laketype == 0)) && feat1)
- {
+ {
add_river(feat1, feat2);
}
}
alloc_object(ALLOC_SET_BOTH, ALLOC_TYP_OBJECT, randnor(DUN_AMT_ITEM, 3));
alloc_object(ALLOC_SET_BOTH, ALLOC_TYP_GOLD, randnor(DUN_AMT_GOLD, 3));
- /* Put an Artifact and Artifact Guardian is requested */
- if(d_info[dungeon_type].final_guardian && (d_info[dungeon_type].maxdepth == dun_level))
- {
- int oy;
- int ox;
- int try = 4000;
-
- /* Find a good position */
- while(try)
- {
- /* Get a random spot */
- oy = randint1(cur_hgt - 4) + 2;
- 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[d_info[dungeon_type].final_guardian]))
+ /* Put an Artifact and Artifact Guardian is requested */
+ if(d_info[dungeon_type].final_guardian && (d_info[dungeon_type].maxdepth == dun_level))
+ {
+ int oy;
+ int ox;
+ int try = 4000;
+
+ /* Find a good position */
+ while(try)
+ {
+ /* Get a random spot */
+ oy = randint1(cur_hgt - 4) + 2;
+ 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[d_info[dungeon_type].final_guardian]))
{
/* Place the guardian */
if (place_monster_aux(0, oy, ox, d_info[dungeon_type].final_guardian, (PM_ALLOW_GROUP | PM_NO_KAGE | PM_NO_PET))) break;
}
- /* One less try */
- try--;
- }
+ /* One less try */
+ try--;
+ }
}
if ((empty_level && (!one_in_(DARK_EMPTY) || (randint1(100) > dun_level))) && !(d_info[dungeon_type].flags1 & DF1_DARKNESS))
/* Hack -- Have a special feeling sometimes */
if (good_item_flag && !preserve_mode) return 1;
- if (rating > 100) return 2;
+ if (rating > 100) return 2;
if (rating > 80) return 3;
if (rating > 60) return 4;
if (rating > 40) return 5;
cave[cy][cx].m_idx = m_idx;
m_ptr->r_idx = party_mon[i].r_idx;
- r_ptr = &r_info[m_ptr->r_idx];
+ r_ptr = &r_info[m_ptr->r_idx];
m_ptr->ap_r_idx = party_mon[i].ap_r_idx;
m_ptr->sub_align = party_mon[i].sub_align;
void place_random_door(int y, int x)
{
int tmp;
- cave_type *c_ptr = &cave[y][x];
+ cave_type *c_ptr = &cave[y][x];
- /* Initialize mimic info */
- c_ptr->mimic = 0;
-
+ /* Initialize mimic info */
+ c_ptr->mimic = 0;
+
if (d_info[dungeon_type].flags1 & DF1_NO_DOORS)
{
place_floor_bold(y, x);
else if (tmp < 600)
{
/* Create secret door */
- place_closed_door(y, x);
+ place_closed_door(y, x);
- /* Hide */
- c_ptr->mimic = fill_type[randint0(100)];
+ /* Hide */
+ c_ptr->mimic = fill_type[randint0(100)];
- /* Floor type terrain cannot hide a door */
- if (!(c_ptr->mimic & 0x20))
- {
- c_ptr->feat = c_ptr->mimic;
- c_ptr->mimic = 0;
- }
+ /* Floor type terrain cannot hide a door */
+ if (!(c_ptr->mimic & 0x20))
+ {
+ c_ptr->feat = c_ptr->mimic;
+ c_ptr->mimic = 0;
+ }
}
/* Closed, locked, or stuck doors (400/1000) */
#else
(void)strnfmt(out_val, 78, "(%^ss %c-%c, *=List, ESC=exit) Use which %s? ",
#endif
- p, I2A(0), "abcdefghijklmnopqrstuvwxyz012345"[num-1], p);
+ p, I2A(0), "abcdefghijklmnopqrstuvwxyz012345"[num-1], p);
if (use_menu) screen_save();
/* Get a spell from the user */
- choice= always_show_list ? ESCAPE:1 ;
- while (!flag)
- {
+ choice= always_show_list ? ESCAPE:1 ;
+ while (!flag)
+ {
if(choice==ESCAPE) choice = ' ';
else if( !get_com(out_val, &choice, FALSE) )break;
/* Dump the spell --(-- */
strcat(psi_desc, format(" %-18s%2d %3d",
- spell_names[technic2magic(REALM_HISSATSU)-1][i],
- spell.slevel, spell.smana));
+ spell_names[technic2magic(REALM_HISSATSU)-1][i],
+ spell.slevel, spell.smana));
prt(psi_desc, y + (line%17) + (line >= 17), x+(line/17)*30);
prt("", y + (line%17) + (line >= 17) + 1, x+(line/17)*30);
}
cave[y][x].info &= ~(CAVE_MARK);
/* Destroy the feature */
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, floor_type[randint0(100)]);
/* Update some things */
p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE);
if (dir == 5) return FALSE;
for (i = 0; i < 3; i++)
{
- int oy, ox;
- int ny, nx;
- int m_idx;
- monster_type *m_ptr;
+ int oy, ox;
+ int ny, nx;
+ int m_idx;
+ monster_type *m_ptr;
- y = py + ddy[dir];
- x = px + ddx[dir];
+ y = py + ddy[dir];
+ x = px + ddx[dir];
if (cave[y][x].m_idx)
py_attack(y, x, HISSATSU_3DAN);
return TRUE;
}
- /* Monster is dead? */
+ /* Monster is dead? */
if (!cave[y][x].m_idx) break;
- ny = y + ddy[dir];
- nx = x + ddx[dir];
- m_idx = cave[y][x].m_idx;
- m_ptr = &m_list[m_idx];
+ ny = y + ddy[dir];
+ nx = x + ddx[dir];
+ m_idx = cave[y][x].m_idx;
+ m_ptr = &m_list[m_idx];
- /* Monster cannot move back? */
- if (!monster_can_enter(ny, nx, &r_info[m_ptr->r_idx])) continue;
+ /* Monster cannot move back? */
+ if (!monster_can_enter(ny, nx, &r_info[m_ptr->r_idx])) continue;
- cave[y][x].m_idx = 0;
- cave[ny][nx].m_idx = m_idx;
- m_ptr->fy = ny;
- m_ptr->fx = nx;
+ cave[y][x].m_idx = 0;
+ cave[ny][nx].m_idx = m_idx;
+ m_ptr->fy = ny;
+ m_ptr->fx = nx;
- update_mon(m_idx, TRUE);
+ update_mon(m_idx, TRUE);
- /* Player can move forward? */
- if (player_can_enter(cave[y][x].feat))
- {
- /* Save the old location */
- oy = py;
- ox = px;
+ /* Player can move forward? */
+ if (player_can_enter(cave[y][x].feat))
+ {
+ /* Save the old location */
+ oy = py;
+ ox = px;
- /* Move the player */
- py = y;
- px = x;
+ /* Move the player */
+ py = y;
+ px = x;
- if (p_ptr->riding)
- {
- int tmp;
- tmp = cave[py][px].m_idx;
- cave[py][px].m_idx = cave[oy][ox].m_idx;
- cave[oy][ox].m_idx = tmp;
- m_list[p_ptr->riding].fy = py;
- m_list[p_ptr->riding].fx = px;
- update_mon(cave[py][px].m_idx, TRUE);
- }
+ if (p_ptr->riding)
+ {
+ int tmp;
+ tmp = cave[py][px].m_idx;
+ cave[py][px].m_idx = cave[oy][ox].m_idx;
+ cave[oy][ox].m_idx = tmp;
+ m_list[p_ptr->riding].fy = py;
+ m_list[p_ptr->riding].fx = px;
+ update_mon(cave[py][px].m_idx, TRUE);
+ }
- forget_flow();
+ forget_flow();
- /* Redraw the old spot */
- lite_spot(oy, ox);
+ /* Redraw the old spot */
+ lite_spot(oy, ox);
- /* Redraw the new spot */
- lite_spot(py, px);
- }
+ /* Redraw the new spot */
+ lite_spot(py, px);
+ }
- /* Redraw the old spot */
- lite_spot(y, x);
+ /* Redraw the old spot */
+ lite_spot(y, x);
- /* Redraw the new spot */
- lite_spot(ny, nx);
+ /* Redraw the new spot */
+ lite_spot(ny, nx);
- /* Check for new panel (redraw map) */
- verify_panel();
+ /* Check for new panel (redraw map) */
+ verify_panel();
- /* Update stuff */
- p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW);
+ /* Update stuff */
+ p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW);
- /* Update the monsters */
- p_ptr->update |= (PU_DISTANCE);
+ /* Update the monsters */
+ p_ptr->update |= (PU_DISTANCE);
- /* Window stuff */
- p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
+ /* Window stuff */
+ p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
- /* Handle stuff */
- handle_stuff();
+ /* Handle stuff */
+ handle_stuff();
- /* -more- */
- if (i < 2) msg_print(NULL);
+ /* -more- */
+ if (i < 2) msg_print(NULL);
}
break;
}
};
extern errr init_info_txt(FILE *fp, char *buf, header *head,
- parse_info_txt_func parse_info_txt_line);
+ parse_info_txt_func parse_info_txt_line);
#ifdef ALLOW_TEMPLATES
extern errr parse_z_info(char *buf, header *head);
*/
static cptr d_info_flags1[] =
{
- "WINNER",
- "MAZE",
- "SMALLEST",
- "BEGINNER",
- "BIG",
- "NO_DOORS",
- "WATER_RIVER",
- "LAVA_RIVER",
- "WATER_RIVERS",
- "LAVA_RIVERS",
- "CAVE",
- "CAVERN",
- "NO_UP",
- "HOT",
- "COLD",
- "NO_DOWN",
- "FORGET",
- "LAKE_WATER",
- "LAKE_LAVA",
- "LAKE_RUBBLE",
- "LAKE_TREE",
- "NO_VAULT",
- "ARENA",
- "DESTROY",
- "XXX1",
- "NO_CAVE",
- "NO_MAGIC",
- "NO_MELEE",
- "CHAMELEON",
- "DARKNESS",
- "XXX1",
- "XXX1"
+ "WINNER",
+ "MAZE",
+ "SMALLEST",
+ "BEGINNER",
+ "BIG",
+ "NO_DOORS",
+ "WATER_RIVER",
+ "LAVA_RIVER",
+ "WATER_RIVERS",
+ "LAVA_RIVERS",
+ "CAVE",
+ "CAVERN",
+ "NO_UP",
+ "HOT",
+ "COLD",
+ "NO_DOWN",
+ "FORGET",
+ "LAKE_WATER",
+ "LAKE_LAVA",
+ "LAKE_RUBBLE",
+ "LAKE_TREE",
+ "NO_VAULT",
+ "ARENA",
+ "DESTROY",
+ "XXX1",
+ "NO_CAVE",
+ "NO_MAGIC",
+ "NO_MELEE",
+ "CHAMELEON",
+ "DARKNESS",
+ "XXX1",
+ "XXX1"
};
* Initialize an "*_info" array, by parsing an ascii "template" file
*/
errr init_info_txt(FILE *fp, char *buf, header *head,
- parse_info_txt_func parse_info_txt_line)
+ parse_info_txt_func parse_info_txt_line)
{
errr err;
continue;
}
- /* Mega Hack -- Calculate Check Sum */
- if (buf[0] != 'N' && buf[0] != 'D')
- {
- int i;
- for (i = 0; buf[i]; i++)
- {
- head->v_extra += (byte)buf[i];
- head->v_extra ^= (1 << (i % 8));
- }
- }
+ /* Mega Hack -- Calculate Check Sum */
+ if (buf[0] != 'N' && buf[0] != 'D')
+ {
+ int i;
+ for (i = 0; buf[i]; i++)
+ {
+ head->v_extra += (byte)buf[i];
+ head->v_extra ^= (1 << (i % 8));
+ }
+ }
/* Parse the line */
if ((err = (*parse_info_txt_line)(buf, head)) != 0)
/* Scan flags1 */
for (i = 0; i < 32; i++)
{
- if (streq(what, d_info_flags1[i]))
+ if (streq(what, d_info_flags1[i]))
{
- d_ptr->flags1 |= (1L << i);
+ d_ptr->flags1 |= (1L << i);
return (0);
}
}
/* Oops */
#ifdef JP
- msg_format("̤ÃΤΥÀ¥ó¥¸¥ç¥ó¡¦¥Õ¥é¥° '%s'¡£", what);
+ msg_format("̤ÃΤΥÀ¥ó¥¸¥ç¥ó¡¦¥Õ¥é¥° '%s'¡£", what);
#else
- msg_format("Unknown dungeon type flag '%s'.", what);
+ msg_format("Unknown dungeon type flag '%s'.", what);
#endif
/* Failure */
/* Scan flags1 */
for (i = 0; i < 32; i++)
{
- if (streq(what, r_info_flags1[i]))
+ if (streq(what, r_info_flags1[i]))
{
- d_ptr->mflags1 |= (1L << i);
+ d_ptr->mflags1 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags2[i]))
{
- d_ptr->mflags2 |= (1L << i);
+ d_ptr->mflags2 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags3[i]))
{
- d_ptr->mflags3 |= (1L << i);
+ d_ptr->mflags3 |= (1L << i);
return (0);
}
}
/* Scan flags7 */
for (i = 0; i < 32; i++)
{
- if (streq(what, r_info_flags7[i]))
+ if (streq(what, r_info_flags7[i]))
{
- d_ptr->mflags7 |= (1L << i);
+ d_ptr->mflags7 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags8[i]))
{
- d_ptr->mflags8 |= (1L << i);
+ d_ptr->mflags8 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags9[i]))
{
- d_ptr->mflags9 |= (1L << i);
+ d_ptr->mflags9 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags4[i]))
{
- d_ptr->mflags4 |= (1L << i);
+ d_ptr->mflags4 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags5[i]))
{
- d_ptr->mflags5 |= (1L << i);
+ d_ptr->mflags5 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags6[i]))
{
- d_ptr->mflags6 |= (1L << i);
+ d_ptr->mflags6 |= (1L << i);
return (0);
}
}
/* Scan for the values */
if (7 != sscanf(buf+2, "%d:%d:%d:%d:%d:%d:%d",
- &f1, &p1, &f2, &p2, &f3, &p3, &tunnel)) return (1);
+ &f1, &p1, &f2, &p2, &f3, &p3, &tunnel)) return (1);
/* Save the values */
d_ptr->floor1 = f1;
while (*t == ' ' || *t == '|') t++;
}
- /* XXX XXX XXX Hack -- Read Final Artifact */
+ /* XXX XXX XXX Hack -- Read Final Artifact */
if (1 == sscanf(s, "FINAL_ARTIFACT_%d", &artif))
{
/* Extract a "Final Artifact" */
continue;
}
- /* XXX XXX XXX Hack -- Read Final Object */
+ /* XXX XXX XXX Hack -- Read Final Object */
if (1 == sscanf(s, "FINAL_OBJECT_%d", &artif))
{
/* Extract a "Final Artifact" */
continue;
}
- /* XXX XXX XXX Hack -- Read Artifact Guardian */
+ /* XXX XXX XXX Hack -- Read Artifact Guardian */
if (1 == sscanf(s, "FINAL_GUARDIAN_%d", &monst))
{
/* Extract a "Artifact Guardian" */
continue;
}
- /* XXX XXX XXX Hack -- Read Special Percentage */
+ /* XXX XXX XXX Hack -- Read Special Percentage */
if (1 == sscanf(s, "MONSTER_DIV_%d", &monst))
{
/* Extract a "Special %" */
while (*t == ' ' || *t == '|') t++;
}
- /* XXX XXX XXX Hack -- Read monster symbols */
+ /* XXX XXX XXX Hack -- Read monster symbols */
if (1 == sscanf(s, "R_CHAR_%c", &r_char))
{
/* Limited to 5 races */
{
place_trap(*y, *x);
}
- /* Hidden trap (or door) */
- else if (letter[idx].trap)
- {
- c_ptr->mimic = c_ptr->feat;
- c_ptr->feat = letter[idx].trap;
- }
+ /* Hidden trap (or door) */
+ else if (letter[idx].trap)
+ {
+ c_ptr->mimic = c_ptr->feat;
+ c_ptr->feat = letter[idx].trap;
+ }
else if (object_index)
{
/* Get local object */
max_e_idx = atoi(zz[1]);
}
- /* Maximum d_idx */
- else if (zz[0][0] == 'D')
+ /* Maximum d_idx */
+ else if (zz[0][0] == 'D')
{
- max_d_idx = atoi(zz[1]);
+ max_d_idx = atoi(zz[1]);
}
/* Maximum o_idx */
else if (streq(b+1, "RACE"))
{
#ifdef JP
- v = rp_ptr->E_title;
+ v = rp_ptr->E_title;
#else
v = rp_ptr->title;
#endif
else if (streq(b+1, "CLASS"))
{
#ifdef JP
- v = cp_ptr->E_title;
+ v = cp_ptr->E_title;
#else
v = cp_ptr->title;
#endif
#ifdef JP
v = E_realm_names[p_ptr->realm1];
#else
- v = realm_names[p_ptr->realm1];
+ v = realm_names[p_ptr->realm1];
#endif
}
else if (streq(b+1, "REALM2"))
{
#ifdef JP
- v = E_realm_names[p_ptr->realm2];
+ v = E_realm_names[p_ptr->realm2];
#else
v = realm_names[p_ptr->realm2];
#endif
{
NULL,
#ifdef JP
- "ʸˡ¥¨¥é¡¼",
- "¸Å¤¤¥Õ¥¡¥¤¥ë",
- "µÏ¿¥Ø¥Ã¥À¤¬¤Ê¤¤",
- "ÉÔϢ³¥ì¥³¡¼¥É",
- "¤ª¤«¤·¤Ê¥Õ¥é¥°Â¸ºß",
- "̤ÄêµÁÌ¿Îá",
- "¥á¥â¥êÉÔÂ",
- "ºÂɸÈϰϳ°",
- "°ú¿ôÉÔÂ",
+ "ʸˡ¥¨¥é¡¼",
+ "¸Å¤¤¥Õ¥¡¥¤¥ë",
+ "µÏ¿¥Ø¥Ã¥À¤¬¤Ê¤¤",
+ "ÉÔϢ³¥ì¥³¡¼¥É",
+ "¤ª¤«¤·¤Ê¥Õ¥é¥°Â¸ºß",
+ "̤ÄêµÁÌ¿Îá",
+ "¥á¥â¥êÉÔÂ",
+ "ºÂɸÈϰϳ°",
+ "°ú¿ôÉÔÂ",
#else
"parse error",
"obsolete file",
{
#ifdef CHECK_MODIFICATION_TIME
- err = check_modification_date(fd, format("%s_j.txt", filename));
+ err = check_modification_date(fd, format("%s_j.txt", filename));
#endif /* CHECK_MODIFICATION_TIME */
#endif /* ALLOW_TEMPLATES */
return init_info("f_info", &f_head,
- (void*)&f_info, (void*)&f_name, (void*)&f_text);
+ (void*)&f_info, (void*)&f_name, (void*)&f_text);
}
#endif /* ALLOW_TEMPLATES */
return init_info("k_info", &k_head,
- (void*)&k_info, (void*)&k_name, (void*)&k_text);
+ (void*)&k_info, (void*)&k_name, (void*)&k_text);
}
#endif /* ALLOW_TEMPLATES */
return init_info("a_info", &a_head,
- (void*)&a_info, (void*)&a_name, (void*)&a_text);
+ (void*)&a_info, (void*)&a_name, (void*)&a_text);
}
#endif /* ALLOW_TEMPLATES */
return init_info("e_info", &e_head,
- (void*)&e_info, (void*)&e_name, (void*)&e_text);
+ (void*)&e_info, (void*)&e_name, (void*)&e_text);
}
#endif /* ALLOW_TEMPLATES */
return init_info("r_info", &r_head,
- (void*)&r_info, (void*)&r_name, (void*)&r_text);
+ (void*)&r_info, (void*)&r_name, (void*)&r_text);
}
#endif /* ALLOW_TEMPLATES */
return init_info("d_info", &d_head,
- (void*)&d_info, (void*)&d_name, (void*)&d_text);
+ (void*)&d_info, (void*)&d_name, (void*)&d_text);
}
#endif /* ALLOW_TEMPLATES */
return init_info("v_info", &v_head,
- (void*)&v_info, (void*)&v_name, (void*)&v_text);
+ (void*)&v_info, (void*)&v_name, (void*)&v_text);
}
#endif /* ALLOW_TEMPLATES */
return init_info("s_info", &s_head,
- (void*)&s_info, (void*)&s_name, (void*)&s_text);
+ (void*)&s_info, (void*)&s_name, (void*)&s_text);
}
#endif /* ALLOW_TEMPLATES */
return init_info("m_info", &m_head,
- (void*)&m_info, (void*)&m_name, (void*)&m_text);
+ (void*)&m_info, (void*)&m_name, (void*)&m_text);
}
/* Allocate and Wipe the monster list */
C_MAKE(m_list, max_m_idx, monster_type);
- /* Allocate and Wipe the max dungeon level */
- C_MAKE(max_dlv, max_d_idx, s16b);
+ /* Allocate and Wipe the max dungeon level */
+ C_MAKE(max_dlv, max_d_idx, s16b);
/* Allocate and wipe each line of the cave */
for (i = 0; i < MAX_HGT; i++)
}
/*
- * Set the "default" window flags
+ * Set the "default" window flags
* Window 1 : Display messages
* Window 2 : Display inven/equip
*/
- window_flag[1] = 1L << 6;
- window_flag[2] = 1L << 0;
+ window_flag[1] = 1L << 6;
+ window_flag[2] = 1L << 0;
/*** Pre-allocate space for the "format()" buffer ***/
*/
cptr get_check_sum(void)
{
- return format("%02x%02x%02x%02x%02x%02x%02x%02x%02x",
- f_head.v_extra,
- k_head.v_extra,
- a_head.v_extra,
- e_head.v_extra,
- r_head.v_extra,
- d_head.v_extra,
- m_head.v_extra,
- s_head.v_extra,
- v_head.v_extra);
+ return format("%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+ f_head.v_extra,
+ k_head.v_extra,
+ a_head.v_extra,
+ e_head.v_extra,
+ r_head.v_extra,
+ d_head.v_extra,
+ m_head.v_extra,
+ s_head.v_extra,
+ v_head.v_extra);
}
rd_u32b(&o_ptr->art_flags[1]);
rd_u32b(&o_ptr->art_flags[2]);
if (h_older_than(1, 3, 0, 0)) o_ptr->art_flags[3] = 0L;
- else rd_u32b(&o_ptr->art_flags[3]);
+ else rd_u32b(&o_ptr->art_flags[3]);
- if (h_older_than(1, 3, 0, 0))
- {
- if (o_ptr->name2 == EGO_TELEPATHY)
- add_flag(o_ptr->art_flags, TR_TELEPATHY);
- }
+ if (h_older_than(1, 3, 0, 0))
+ {
+ if (o_ptr->name2 == EGO_TELEPATHY)
+ add_flag(o_ptr->art_flags, TR_TELEPATHY);
+ }
if (z_older_than(11, 0, 11))
{
else
{
rd_byte(&o_ptr->xtra3);
- if (h_older_than(1, 3, 0, 1))
- {
- if (o_ptr->tval > TV_CAPTURE && o_ptr->xtra3 >= 1+96)
- o_ptr->xtra3 += -96 + MIN_SPECIAL_ESSENCE;
- }
+ if (h_older_than(1, 3, 0, 1))
+ {
+ if (o_ptr->tval > TV_CAPTURE && o_ptr->xtra3 >= 1+96)
+ o_ptr->xtra3 += -96 + MIN_SPECIAL_ESSENCE;
+ }
rd_s16b(&o_ptr->xtra4);
rd_s16b(&o_ptr->xtra5);
o_ptr->pval = 0;
}
- rd_byte(&o_ptr->feeling);
+ rd_byte(&o_ptr->feeling);
/* Inscription */
rd_string(buf, sizeof(buf));
rd_s16b(&m_ptr->target_x);
}
- rd_byte(&m_ptr->invulner);
+ rd_byte(&m_ptr->invulner);
if (!(z_major == 2 && z_minor == 0 && z_patch == 6))
rd_u32b(&m_ptr->smart);
{
for (i = 0; i < 108; i++) rd_s32b(&p_ptr->magic_num1[i]);
for (i = 0; i < 108; i++) rd_byte(&p_ptr->magic_num2[i]);
- if (h_older_than(1, 3, 0, 1))
- {
- if (p_ptr->pclass == CLASS_SMITH)
- {
- p_ptr->magic_num1[TR_ES_ATTACK] = p_ptr->magic_num1[96];
- p_ptr->magic_num1[96] = 0;
- p_ptr->magic_num1[TR_ES_AC] = p_ptr->magic_num1[97];
- p_ptr->magic_num1[97] = 0;
- }
- }
+ if (h_older_than(1, 3, 0, 1))
+ {
+ if (p_ptr->pclass == CLASS_SMITH)
+ {
+ p_ptr->magic_num1[TR_ES_ATTACK] = p_ptr->magic_num1[96];
+ p_ptr->magic_num1[96] = 0;
+ p_ptr->magic_num1[TR_ES_AC] = p_ptr->magic_num1[97];
+ p_ptr->magic_num1[97] = 0;
+ }
+ }
}
if ((p_ptr->pclass == CLASS_BARD) && p_ptr->magic_num1[0]) p_ptr->action = ACTION_SING;
}
else
{
- byte max = (byte)max_d_idx;
+ byte max = (byte)max_d_idx;
- rd_byte(&max);
+ rd_byte(&max);
- for(i = 0; i < max; i++)
+ for(i = 0; i < max; i++)
{
- rd_s16b(&max_dlv[i]);
+ rd_s16b(&max_dlv[i]);
if (max_dlv[i] > d_info[i].maxdepth) max_dlv[i] = d_info[i].maxdepth;
}
- }
+ }
/* Repair maximum player level XXX XXX XXX */
if (p_ptr->max_plv < p_ptr->lev) p_ptr->max_plv = p_ptr->lev;
/* Header info */
rd_s16b(&dun_level);
- if (z_older_than(10, 3, 8)) dungeon_type = DUNGEON_ANGBAND;
+ if (z_older_than(10, 3, 8)) dungeon_type = DUNGEON_ANGBAND;
else rd_byte(&dungeon_type);
/* Set the base level for old versions */
/* Load the dungeon data */
for (x = y = 0; y < ymax; )
{
- u16b info;
+ u16b info;
/* Grab RLE info */
rd_byte(&count);
if (z_older_than(10,3,6))
- {
+ {
rd_byte(&tmp8u);
- info = (u16b)tmp8u;
- }
+ info = (u16b)tmp8u;
+ }
else
- {
+ {
rd_u16b(&info);
- /* Decline invalid flags */
- info &= ~(CAVE_LITE | CAVE_VIEW | CAVE_MNLT);
- }
+ /* Decline invalid flags */
+ info &= ~(CAVE_LITE | CAVE_VIEW | CAVE_MNLT);
+ }
/* Apply the RLE info */
for (i = count; i > 0; i--)
c_ptr = &cave[y][x];
/* Extract "info" */
- c_ptr->info = info;
+ c_ptr->info = info;
/* Advance/Wrap */
if (++x >= xmax)
}
}
- /* Convert cave data */
- if (z_older_than(11, 0, 99))
- {
- for (y = 0; y < ymax; y++) for (x = 0; x < xmax; x++)
- {
+ /* Convert cave data */
+ if (z_older_than(11, 0, 99))
+ {
+ for (y = 0; y < ymax; y++) for (x = 0; x < xmax; x++)
+ {
/* Wipe old unused flags */
cave[y][x].info &= ~(CAVE_MASK);
- }
- }
+ }
+ }
- if (h_older_than(1, 1, 1, 0))
- {
- for (y = 0; y < ymax; y++) for (x = 0; x < xmax; x++)
- {
+ if (h_older_than(1, 1, 1, 0))
+ {
+ for (y = 0; y < ymax; y++) for (x = 0; x < xmax; x++)
+ {
/* Access the cave */
c_ptr = &cave[y][x];
- /* Very old */
- if (c_ptr->feat == FEAT_INVIS)
- {
- c_ptr->feat = FEAT_FLOOR;
- c_ptr->info |= CAVE_TRAP;
- }
-
- /* Older than 1.1.1 */
- if (c_ptr->feat == FEAT_MIRROR)
- {
- c_ptr->feat = FEAT_FLOOR;
- c_ptr->info |= CAVE_OBJECT;
- }
- }
- }
-
- if (h_older_than(1, 3, 1, 0))
- {
- for (y = 0; y < ymax; y++) for (x = 0; x < xmax; x++)
- {
+ /* Very old */
+ if (c_ptr->feat == FEAT_INVIS)
+ {
+ c_ptr->feat = FEAT_FLOOR;
+ c_ptr->info |= CAVE_TRAP;
+ }
+
+ /* Older than 1.1.1 */
+ if (c_ptr->feat == FEAT_MIRROR)
+ {
+ c_ptr->feat = FEAT_FLOOR;
+ c_ptr->info |= CAVE_OBJECT;
+ }
+ }
+ }
+
+ if (h_older_than(1, 3, 1, 0))
+ {
+ for (y = 0; y < ymax; y++) for (x = 0; x < xmax; x++)
+ {
/* Access the cave */
c_ptr = &cave[y][x];
- /* Old CAVE_IN_MIRROR flag */
- if (c_ptr->info & CAVE_OBJECT)
- {
- c_ptr->mimic = FEAT_MIRROR;
- }
-
- /* Runes will be mimics and flags */
- else if (c_ptr->feat == FEAT_MINOR_GLYPH ||
- c_ptr->feat == FEAT_GLYPH)
- {
- c_ptr->info |= CAVE_OBJECT;
- c_ptr->mimic = c_ptr->feat;
- c_ptr->feat = FEAT_FLOOR;
- }
-
- /* Hidden traps will be trap terrains mimicing floor */
- else if (c_ptr->info & CAVE_TRAP)
- {
- c_ptr->info &= ~CAVE_TRAP;
- c_ptr->mimic = c_ptr->feat;
- c_ptr->feat = choose_random_trap();
- }
-
- /* Another hidden trap */
- else if (c_ptr->feat == FEAT_INVIS)
- {
- c_ptr->mimic = FEAT_FLOOR;
- c_ptr->feat = FEAT_TRAP_OPEN;
- }
-
- /* Hidden doors will be closed doors mimicing wall */
- else if (c_ptr->feat == FEAT_SECRET)
- {
- place_closed_door(y, x);
- c_ptr->mimic = FEAT_WALL_EXTRA;
- }
- }
- }
+ /* Old CAVE_IN_MIRROR flag */
+ if (c_ptr->info & CAVE_OBJECT)
+ {
+ c_ptr->mimic = FEAT_MIRROR;
+ }
+
+ /* Runes will be mimics and flags */
+ else if (c_ptr->feat == FEAT_MINOR_GLYPH ||
+ c_ptr->feat == FEAT_GLYPH)
+ {
+ c_ptr->info |= CAVE_OBJECT;
+ c_ptr->mimic = c_ptr->feat;
+ c_ptr->feat = FEAT_FLOOR;
+ }
+
+ /* Hidden traps will be trap terrains mimicing floor */
+ else if (c_ptr->info & CAVE_TRAP)
+ {
+ c_ptr->info &= ~CAVE_TRAP;
+ c_ptr->mimic = c_ptr->feat;
+ c_ptr->feat = choose_random_trap();
+ }
+
+ /* Another hidden trap */
+ else if (c_ptr->feat == FEAT_INVIS)
+ {
+ c_ptr->mimic = FEAT_FLOOR;
+ c_ptr->feat = FEAT_TRAP_OPEN;
+ }
+
+ /* Hidden doors will be closed doors mimicing wall */
+ else if (c_ptr->feat == FEAT_SECRET)
+ {
+ place_closed_door(y, x);
+ c_ptr->mimic = FEAT_WALL_EXTRA;
+ }
+ }
+ }
/*** Objects ***/
/* Mention the savefile version */
- note(format(
+ note(format(
#ifdef JP
- "¥Ð¡¼¥¸¥ç¥ó %d.%d.%d ¤Î¥»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥ÉÃæ...",
+ "¥Ð¡¼¥¸¥ç¥ó %d.%d.%d ¤Î¥»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥ÉÃæ...",
#else
- "Loading a %d.%d.%d savefile...",
+ "Loading a %d.%d.%d savefile...",
#endif
- (z_major > 9) ? z_major - 10 : z_major, z_minor, z_patch));
+ (z_major > 9) ? z_major - 10 : z_major, z_minor, z_patch));
/* Strip the version bytes */
x_check = 0L;
/* Read the version number of the savefile */
- /* Old savefile will be version 0.0.0.3 */
- rd_byte(&h_ver_extra);
- rd_byte(&h_ver_patch);
- rd_byte(&h_ver_minor);
- rd_byte(&h_ver_major);
+ /* Old savefile will be version 0.0.0.3 */
+ rd_byte(&h_ver_extra);
+ rd_byte(&h_ver_patch);
+ rd_byte(&h_ver_minor);
+ rd_byte(&h_ver_major);
/* Operating system info */
rd_u32b(&sf_system);
if (!(XAllocColor(dpy, cmap, &xcolour)))
{
quit_fmt("Couldn't allocate bitmap color '#%02x%02x%02x'\n",
- red, green, blue);
+ red, green, blue);
}
return (xcolour.pixel);
{
RGBQUAD clrg;
- /* Read an "RGBQUAD" */
- rd_byte(f, &(clrg.b));
- rd_byte(f, &(clrg.g));
- rd_byte(f, &(clrg.r));
- rd_byte(f, &(clrg.filler));
+ /* Read an "RGBQUAD" */
+ rd_byte(f, &(clrg.b));
+ rd_byte(f, &(clrg.g));
+ rd_byte(f, &(clrg.r));
+ rd_byte(f, &(clrg.filler));
/* Analyze the color */
clr_pixels[i] = create_pixel(dpy, clrg.r, clrg.g, clrg.b);
C_MAKE(Data, total, char);
Res = XCreateImage(dpy, visual, depth, ZPixmap, 0 /*offset*/,
- Data, infoheader.biWidth, infoheader.biHeight,
- 8 /*bitmap_pad*/, 0 /*bytes_per_line*/);
+ Data, infoheader.biWidth, infoheader.biHeight,
+ 8 /*bitmap_pad*/, 0 /*bytes_per_line*/);
/* Failure */
if (Res == NULL)
{
/* Technically 1 bit is legal too */
quit_fmt("Illegal biBitCount %d in %s",
- infoheader.biBitCount, Name);
+ infoheader.biBitCount, Name);
}
}
}
* redScan, greenScan and blueScan must be sufficiently sized
*/
static void GetScaledRow(XImage *Im, int x, int y, int iw, int ow,
- unsigned long *redScan, unsigned long *greenScan,
- unsigned long *blueScan)
+ unsigned long *redScan, unsigned long *greenScan,
+ unsigned long *blueScan)
{
int xi, si, sifrac, ci, cifrac, addWhole, addFrac;
unsigned long pix;
* are divided first.
*/
static void PutRGBScan(XImage *Im, int x, int y, int w, int div,
- unsigned long *redScan, unsigned long *greenScan,
- unsigned long *blueScan)
+ unsigned long *redScan, unsigned long *greenScan,
+ unsigned long *blueScan)
{
int xi;
unsigned long pix;
* vertical directions (eg. shrink horizontal, grow vertical).
*/
static void ScaleIcon(XImage *ImIn, XImage *ImOut,
- int x1, int y1, int x2, int y2,
+ int x1, int y1, int x2, int y2,
int ix, int iy, int ox, int oy)
{
int div;
for (yi = 0; yi < oy; yi++)
{
GetScaledRow(ImIn, x1, y1 + yi, ix, ox,
- tempRed, tempGreen, tempBlue);
+ tempRed, tempGreen, tempBlue);
PutRGBScan(ImOut, x2, y2 + yi, ox, div,
- tempRed, tempGreen, tempBlue);
+ tempRed, tempGreen, tempBlue);
}
}
else if (iy < oy)
{
/* only get next row if in same icon */
GetScaledRow(ImIn, x1, si + 1, ix, ox,
- nextRed, nextGreen, nextBlue);
+ nextRed, nextGreen, nextBlue);
}
}
for (xi = 0; xi < ox; xi++)
{
tempRed[xi] = (prevRed[xi] * (oy - sifrac) +
- nextRed[xi] * sifrac);
+ nextRed[xi] * sifrac);
tempGreen[xi] = (prevGreen[xi] * (oy - sifrac) +
- nextGreen[xi] * sifrac);
+ nextGreen[xi] * sifrac);
tempBlue[xi] = (prevBlue[xi] * (oy - sifrac) +
- nextBlue[xi] * sifrac);
+ nextBlue[xi] * sifrac);
}
/* write row to output image: */
PutRGBScan(ImOut, x2, y2 + yi, ox, div,
- tempRed, tempGreen, tempBlue);
+ tempRed, tempGreen, tempBlue);
/* advance sampling position: */
sifrac += iy;
while (si < ci)
{
GetScaledRow(ImIn, x1, si, ix, ox,
- nextRed, nextGreen, nextBlue);
+ nextRed, nextGreen, nextBlue);
for (xi = 0; xi < ox; xi++)
{
tempRed[xi] += nextRed[xi] * oy;
{
/* only get next row if still in icon: */
GetScaledRow(ImIn, x1, si, ix, ox,
- nextRed, nextGreen, nextBlue);
+ nextRed, nextGreen, nextBlue);
}
sifrac = cifrac;
for (xi = 0; xi < ox; xi++)
}
/* write row to output image: */
PutRGBScan(ImOut, x2, y2 + yi, ox, div,
- tempRed, tempGreen, tempBlue);
+ tempRed, tempGreen, tempBlue);
}
}
}
static XImage *ResizeImageSmooth(Display *dpy, XImage *Im,
- int ix, int iy, int ox, int oy)
+ int ix, int iy, int ox, int oy)
{
Visual *visual = DefaultVisual(dpy, DefaultScreen(dpy));
Data = (char *)malloc(width2 * height2 * Im->bits_per_pixel / 8);
Tmp = XCreateImage(dpy, visual,
- Im->depth, ZPixmap, 0, Data, width2, height2,
- 32, 0);
+ Im->depth, ZPixmap, 0, Data, width2, height2,
+ 32, 0);
/* compute values for decomposing pixel into color values: */
redMask = Im->red_mask;
for (x1 = 0, x2 = 0; (x1 < width1) && (x2 < width2); x1 += ix, x2 += ox)
{
ScaleIcon(Im, Tmp, x1, y1, x2, y2,
- ix, iy, ox, oy);
+ ix, iy, ox, oy);
}
}
* Also appears in "main-xaw.c".
*/
static XImage *ResizeImage(Display *dpy, XImage *Im,
- int ix, int iy, int ox, int oy)
+ int ix, int iy, int ox, int oy)
{
Visual *visual = DefaultVisual(dpy, DefaultScreen(dpy));
Data = (char *)malloc(width2 * height2 * Im->bits_per_pixel / 8);
Tmp = XCreateImage(dpy, visual,
- Im->depth, ZPixmap, 0, Data, width2, height2,
- 32, 0);
+ Im->depth, ZPixmap, 0, Data, width2, height2,
+ 32, 0);
if (ix > ox)
{
{
/* Draw the Term black */
rectfill(screen,
- x1, y1, x1 + w1 - 1, y1 + h1 - 1,
+ x1, y1, x1 + w1 - 1, y1 + h1 - 1,
COLOR_OFFSET + TERM_DARK);
}
}
{
/* Draw a black block */
rectfill(screen, x1, y1, x1 + w1 - 1, y1 + h1 - 1,
- COLOR_OFFSET + TERM_DARK);
+ COLOR_OFFSET + TERM_DARK);
}
/* Success */
/* Dump the text */
textout(screen, td->font, text, x1, y1,
- COLOR_OFFSET + (a & 0x0F));
+ COLOR_OFFSET + (a & 0x0F));
}
/* Stretch needed */
else
/* Dump some text */
textout(screen, td->font, text, x1, y1,
- COLOR_OFFSET + (a & 0x0F));
+ COLOR_OFFSET + (a & 0x0F));
/* Advance */
x1 += td->tile_wid;
/* Prepare the sounds */
for (i = 1; i < SOUND_MAX; i++)
{
- /* Extract name of sound file */
- sprintf(wav, "%s.wav", angband_sound_name[i]);
+ /* Extract name of sound file */
+ sprintf(wav, "%s.wav", angband_sound_name[i]);
- /* Access the sound */
- path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA_SOUND, wav);
+ /* Access the sound */
+ path_build(buf, sizeof(buf), ANGBAND_DIR_XTRA_SOUND, wav);
- /* Save the sound filename, if it exists */
- if (check_file(buf)) sound_file[i] = string_make(buf);
+ /* Save the sound filename, if it exists */
+ if (check_file(buf)) sound_file[i] = string_make(buf);
}
/* Sound available */
{
/* Set one color (note scaling) */
init_color(i, angband_color_table[i][1] * 1000 / 255,
- angband_color_table[i][2] * 1000 / 255,
- angband_color_table[i][3] * 1000 / 255);
+ angband_color_table[i][2] * 1000 / 255,
+ angband_color_table[i][3] * 1000 / 255);
}
#endif
#ifdef USE_SOUND
/* Make a special sound */
case TERM_XTRA_SOUND:
- return (Term_xtra_gcu_sound(v));
+ return (Term_xtra_gcu_sound(v));
#endif
/* Flush the Curses buffer */
/* Do we have color, and enough color, available? */
can_use_color = ((start_color() != ERR) && has_colors() &&
- (COLORS >= 8) && (COLOR_PAIRS >= 8));
+ (COLORS >= 8) && (COLOR_PAIRS >= 8));
#ifdef REDEFINE_COLORS
/* Can we change colors? */
can_fix_color = (can_use_color && can_change_color() &&
- (COLORS >= 16) && (COLOR_PAIRS > 8));
+ (COLORS >= 16) && (COLOR_PAIRS > 8));
#endif
/* Attempt to use customized colors */
/* Prepare the color pairs */
for (i = 1; i <= 63; i++)
{
- /* Reset the color */
- if (init_pair(i, (i - 1) % 8, (i - 1) / 8) == ERR)
- {
- quit("Color pair init failed");
- }
+ /* Reset the color */
+ if (init_pair(i, (i - 1) % 8, (i - 1) / 8) == ERR)
+ {
+ quit("Color pair init failed");
+ }
/* Set up the colormap */
colortable[i - 1] = (COLOR_PAIR(i) | A_NORMAL);
colortable[i + 7] = (COLOR_PAIR(i) | A_BRIGHT);
- /* XXX XXX XXX Take account of "gamma correction" */
+ /* XXX XXX XXX Take account of "gamma correction" */
/* Prepare the "Angband Colors" */
Term_xtra_gcu_react();
/* Attempt to use colors */
else if (can_use_color)
{
- /* Color-pair 0 is *always* WHITE on BLACK */
+ /* Color-pair 0 is *always* WHITE on BLACK */
/* Prepare the color pairs */
init_pair(1, COLOR_RED, COLOR_BLACK);
/* Initialize (if needed) */
if (arg_sound && !init_sound())
{
- /* Warning */
- plog("Cannot initialize sound!");
+ /* Warning */
+ plog("Cannot initialize sound!");
- /* Cannot enable */
- arg_sound = FALSE;
+ /* Cannot enable */
+ arg_sound = FALSE;
}
/* Change setting */
switch (i)
{
- /* Upper left */
- case 0: rows = 24;
- cols = 80;
- y = x = 0;
- break;
- /* Lower left */
- case 1: rows = LINES - 25;
- cols = 80;
- y = 24;
- x = 0;
- break;
- /* Upper right */
- case 2: rows = 24;
- cols = COLS - 81;
- y = 0;
- x = 81;
- break;
- /* Lower right */
- case 3: rows = LINES - 25;
- cols = COLS - 81;
- y = 24;
- x = 81;
- break;
- /* XXX */
- default: rows = cols = 0;
- y = x = 0;
- break;
+ /* Upper left */
+ case 0: rows = 24;
+ cols = 80;
+ y = x = 0;
+ break;
+ /* Lower left */
+ case 1: rows = LINES - 25;
+ cols = 80;
+ y = 24;
+ x = 0;
+ break;
+ /* Upper right */
+ case 2: rows = 24;
+ cols = COLS - 81;
+ y = 0;
+ x = 81;
+ break;
+ /* Lower right */
+ case 3: rows = LINES - 25;
+ cols = COLS - 81;
+ y = 24;
+ x = 81;
+ break;
+ /* XXX */
+ default: rows = cols = 0;
+ y = x = 0;
+ break;
}
/* No non-windows */
#ifdef JP
/* Dump the text */
for (i = 0; i < n; i++) {
- if (iskanji(cp[i])) {
- char jbuf[3];
- jbuf[0] = cp[i++];
- jbuf[1] = cp[i];
- jbuf[2] = '\0';
- cputs(jbuf);
- } else {
- putch(cp[i]);
- }
+ if (iskanji(cp[i])) {
+ char jbuf[3];
+ jbuf[0] = cp[i++];
+ jbuf[1] = cp[i];
+ jbuf[2] = '\0';
+ cputs(jbuf);
+ } else {
+ putch(cp[i]);
+ }
}
#else
- /* Dump the text */
- for (i = 0; i < n; i++) putch(cp[i]);
+ /* Dump the text */
+ for (i = 0; i < n; i++) putch(cp[i]);
#endif
#else /* USE_CONIO */
#define _farsetsel(x) __dpmi_sel=(x)
extern void _farnspokeb(unsigned long offset, unsigned char value);
#pragma aux _farnspokeb = \
- "push fs" \
- "mov fs,__dpmi_sel" \
- "mov fs:[eax],bl" \
- "pop fs" \
- parm [eax] [bl];
+ "push fs" \
+ "mov fs,__dpmi_sel" \
+ "mov fs:[eax],bl" \
+ "pop fs" \
+ parm [eax] [bl];
#else /* USE_WAT */
*/
#ifdef USE_TRANSPARENCY
static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp,
- const byte *tap, const char *tcp)
+ const byte *tap, const char *tcp)
#else
static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp)
#endif
/* Find the folder */
err = FindFolder(kOnSystemDisk, kPreferencesFolderType, kCreateFolder,
- &vref, &dirID);
+ &vref, &dirID);
/* Success */
if (!err)
/* Find the folder */
err = FindFolder(kOnSystemDisk, kPreferencesFolderType, kCreateFolder,
- &vref, &dirID);
+ &vref, &dirID);
/* Success */
if (!err)
break;
}
- case 9: /* bigtile mode */
+ case 9: /* bigtile mode */
{
term_data *td = &data[0];
Size actualSize;
aeError = AEGetAttributePtr(theAppleEvent, keyMissedKeywordAttr, typeWildCard,
- &returnedType, NULL, 0, &actualSize);
+ &returnedType, NULL, 0, &actualSize);
if (aeError == errAEDescNotFound) return (noErr);
* Apple Event Handler -- Open Application
*/
static pascal OSErr AEH_Start(const AppleEvent *theAppleEvent,
- const AppleEvent *reply, long handlerRefCon)
+ const AppleEvent *reply, long handlerRefCon)
{
#pragma unused(reply, handlerRefCon)
* Apple Event Handler -- Quit Application
*/
static pascal OSErr AEH_Quit(const AppleEvent *theAppleEvent,
- const AppleEvent *reply, long handlerRefCon)
+ const AppleEvent *reply, long handlerRefCon)
{
#pragma unused(reply, handlerRefCon)
#if TARGET_API_MAC_CARBON
* Apple Event Handler -- Print Documents
*/
static pascal OSErr AEH_Print(const AppleEvent *theAppleEvent,
- const AppleEvent *reply, long handlerRefCon)
+ const AppleEvent *reply, long handlerRefCon)
{
#pragma unused(theAppleEvent, reply, handlerRefCon)
* "shamelessly swiped & hacked")
*/
static pascal OSErr AEH_Open(AppleEvent *theAppleEvent,
- AppleEvent* reply, long handlerRefCon)
+ AppleEvent* reply, long handlerRefCon)
{
#pragma unused(reply, handlerRefCon)
*/
err = AEGetNthPtr(&docList, 1L, typeFSS, &keywd,
- &returnedType, (Ptr) &myFSS, sizeof(myFSS), &actualSize);
+ &returnedType, (Ptr) &myFSS, sizeof(myFSS), &actualSize);
if (err) return err;
/* Only needed to check savefile type below */
AEH_Start_UPP = NewAEEventHandlerUPP(AEH_Start);
/* Install the hook (ignore error codes) */
AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, AEH_Start_UPP,
- 0L, FALSE);
+ 0L, FALSE);
/* Obtain a "Universal Procedure Pointer" */
AEH_Quit_UPP = NewAEEventHandlerUPP(AEH_Quit);
/* Install the hook (ignore error codes) */
AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, AEH_Quit_UPP,
- 0L, FALSE);
+ 0L, FALSE);
/* Obtain a "Universal Procedure Pointer" */
AEH_Print_UPP = NewAEEventHandlerUPP(AEH_Print);
/* Install the hook (ignore error codes) */
AEInstallEventHandler(kCoreEventClass, kAEPrintDocuments, AEH_Print_UPP,
- 0L, FALSE);
+ 0L, FALSE);
/* Obtain a "Universal Procedure Pointer" */
AEH_Open_UPP = NewAEEventHandlerUPP(AEH_Open);
/* Install the hook (ignore error codes) */
AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, AEH_Open_UPP,
- 0L, FALSE);
+ 0L, FALSE);
#endif
/* Find the current application */
*/
#ifdef USE_TRANSPARENCY
static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp,
- const byte *tap, const char *tcp)
+ const byte *tap, const char *tcp)
#else
static errr Term_pict_mac(int x, int y, int n, const byte *ap, const char *cp)
#endif
/* Find the folder */
err = FindFolder(kOnSystemDisk, kPreferencesFolderType, kCreateFolder,
- &vref, &dirID);
+ &vref, &dirID);
/* Success */
if (!err)
/* Find the folder */
err = FindFolder(kOnSystemDisk, kPreferencesFolderType, kCreateFolder,
- &vref, &dirID);
+ &vref, &dirID);
/* Success */
if (!err)
break;
}
- case 9: /* bigtile mode */
+ case 9: /* bigtile mode */
{
term_data *td = &data[0];
Size actualSize;
aeError = AEGetAttributePtr(theAppleEvent, keyMissedKeywordAttr, typeWildCard,
- &returnedType, NULL, 0, &actualSize);
+ &returnedType, NULL, 0, &actualSize);
if (aeError == errAEDescNotFound) return (noErr);
* Apple Event Handler -- Open Application
*/
static pascal OSErr AEH_Start(const AppleEvent *theAppleEvent,
- const AppleEvent *reply, long handlerRefCon)
+ const AppleEvent *reply, long handlerRefCon)
{
#pragma unused(reply, handlerRefCon)
* Apple Event Handler -- Quit Application
*/
static pascal OSErr AEH_Quit(const AppleEvent *theAppleEvent,
- const AppleEvent *reply, long handlerRefCon)
+ const AppleEvent *reply, long handlerRefCon)
{
#pragma unused(reply, handlerRefCon)
* Apple Event Handler -- Print Documents
*/
static pascal OSErr AEH_Print(const AppleEvent *theAppleEvent,
- const AppleEvent *reply, long handlerRefCon)
+ const AppleEvent *reply, long handlerRefCon)
{
#pragma unused(theAppleEvent, reply, handlerRefCon)
* "shamelessly swiped & hacked")
*/
static pascal OSErr AEH_Open(AppleEvent *theAppleEvent,
- AppleEvent* reply, long handlerRefCon)
+ AppleEvent* reply, long handlerRefCon)
{
#pragma unused(reply, handlerRefCon)
*/
err = AEGetNthPtr(&docList, 1L, typeFSS, &keywd,
- &returnedType, (Ptr) &myFSS, sizeof(myFSS), &actualSize);
+ &returnedType, (Ptr) &myFSS, sizeof(myFSS), &actualSize);
if (err) return err;
/* Only needed to check savefile type below */
/* Install the hook (ignore error codes) */
AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, AEH_Start_UPP,
- 0L, FALSE);
+ 0L, FALSE);
/* Obtain a "Universal Procedure Pointer" */
AEH_Quit_UPP = NewAEEventHandlerProc(AEH_Quit);
/* Install the hook (ignore error codes) */
AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, AEH_Quit_UPP,
- 0L, FALSE);
+ 0L, FALSE);
/* Obtain a "Universal Procedure Pointer" */
AEH_Print_UPP = NewAEEventHandlerProc(AEH_Print);
/* Install the hook (ignore error codes) */
AEInstallEventHandler(kCoreEventClass, kAEPrintDocuments, AEH_Print_UPP,
- 0L, FALSE);
+ 0L, FALSE);
/* Obtain a "Universal Procedure Pointer" */
AEH_Open_UPP = NewAEEventHandlerProc(AEH_Open);
/* Install the hook (ignore error codes) */
AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, AEH_Open_UPP,
- 0L, FALSE);
+ 0L, FALSE);
#endif
/* Resize the window */
SetWindowPos(td->w, 0, 0, 0,
- td->size_wid, td->size_hgt,
- SWP_NOMOVE | SWP_NOZORDER);
+ td->size_wid, td->size_hgt,
+ SWP_NOMOVE | SWP_NOZORDER);
/* Redraw later */
InvalidateRect(td->w, NULL, TRUE);
if (!td->font_id) return (1);
#else
td->font_id = CreateFont(hgt, wid, 0, 0, FW_DONTCARE, 0, 0, 0,
- ANSI_CHARSET, OUT_DEFAULT_PRECIS,
- CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
- FIXED_PITCH | FF_DONTCARE, base);
+ ANSI_CHARSET, OUT_DEFAULT_PRECIS,
+ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
+ FIXED_PITCH | FF_DONTCARE, base);
#endif
rc.right += td->font_wid;
/* Dump the text */
ExtTextOut(hdc, rc.left, rc.top, ETO_CLIPPED, &rc,
- s+i, 2, NULL);
+ s+i, 2, NULL);
rc.right -= td->font_wid;
/* Advance */
} else {
/* Dump the text */
ExtTextOut(hdc, rc.left, rc.top, ETO_CLIPPED, &rc,
- s+i, 1, NULL);
+ s+i, 1, NULL);
/* Advance */
rc.left += td->tile_wid;
#else
/* Dump the text */
ExtTextOut(hdc, rc.left, rc.top, 0, &rc,
- s+i, 1, NULL);
+ s+i, 1, NULL);
/* Advance */
rc.left += td->tile_wid;
{
/* Dump the text */
ExtTextOut(hdc, rc.left, rc.top, ETO_OPAQUE | ETO_CLIPPED, &rc,
- s, n, NULL);
+ s, n, NULL);
}
/* Release DC */
/* Main window (need these before term_getsize gets called) */
td = &data[0];
td->dwStyle = (WS_OVERLAPPED | WS_THICKFRAME | WS_SYSMENU |
- WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CAPTION |
- WS_VISIBLE);
+ WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CAPTION |
+ WS_VISIBLE);
td->dwExStyle = 0;
td->visible = TRUE;
my_td = td;
td->w = CreateWindowEx(td->dwExStyle, AngList,
- td->s, td->dwStyle,
- td->pos_x, td->pos_y,
- td->size_wid, td->size_hgt,
- HWND_DESKTOP, NULL, hInstance, NULL);
+ td->s, td->dwStyle,
+ td->pos_x, td->pos_y,
+ td->size_wid, td->size_hgt,
+ HWND_DESKTOP, NULL, hInstance, NULL);
my_td = NULL;
#ifdef JP
if (!td->w) quit("¥µ¥Ö¥¦¥£¥ó¥É¥¦¤ËºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿");
/* Main window */
my_td = td;
td->w = CreateWindowEx(td->dwExStyle, AppName,
- td->s, td->dwStyle,
- td->pos_x, td->pos_y,
- td->size_wid, td->size_hgt,
- HWND_DESKTOP, NULL, hInstance, NULL);
+ td->s, td->dwStyle,
+ td->pos_x, td->pos_y,
+ td->size_wid, td->size_hgt,
+ HWND_DESKTOP, NULL, hInstance, NULL);
my_td = NULL;
#ifdef JP
if (!td->w) quit("¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿");
/* Menu "File", Disable all */
EnableMenuItem(hm, IDM_FILE_NEW,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
EnableMenuItem(hm, IDM_FILE_OPEN,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
EnableMenuItem(hm, IDM_FILE_SAVE,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
EnableMenuItem(hm, IDM_FILE_EXIT,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
EnableMenuItem(hm, IDM_FILE_SCORE,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
/* No character available */
{
/* Menu "File", Item "Save" */
EnableMenuItem(hm, IDM_FILE_SAVE,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
}
/* Menu "File", Item "Exit" */
EnableMenuItem(hm, IDM_FILE_EXIT,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
EnableMenuItem(hm, IDM_FILE_SCORE,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
/* Menu "Window::Visibility" */
for (i = 0; i < MAX_TERM_DATA; i++)
{
EnableMenuItem(hm, IDM_WINDOW_VIS_0 + i,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
CheckMenuItem(hm, IDM_WINDOW_VIS_0 + i,
- (data[i].visible ? MF_CHECKED : MF_UNCHECKED));
+ (data[i].visible ? MF_CHECKED : MF_UNCHECKED));
EnableMenuItem(hm, IDM_WINDOW_VIS_0 + i,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
}
/* Menu "Window::Font" */
for (i = 0; i < MAX_TERM_DATA; i++)
{
EnableMenuItem(hm, IDM_WINDOW_FONT_0 + i,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
if (data[i].visible)
{
EnableMenuItem(hm, IDM_WINDOW_FONT_0 + i,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
}
}
for (i = 0; i < MAX_TERM_DATA; i++)
{
EnableMenuItem(hm, IDM_WINDOW_POS_0 + i,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
CheckMenuItem(hm, IDM_WINDOW_POS_0 + i,
- (data[i].posfix ? MF_CHECKED : MF_UNCHECKED));
+ (data[i].posfix ? MF_CHECKED : MF_UNCHECKED));
if (data[i].visible)
{
EnableMenuItem(hm, IDM_WINDOW_POS_0 + i,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
}
}
for (i = 0; i < MAX_TERM_DATA; i++)
{
EnableMenuItem(hm, IDM_WINDOW_BIZ_0 + i,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
CheckMenuItem(hm, IDM_WINDOW_BIZ_0 + i,
- (data[i].bizarre ? MF_CHECKED : MF_UNCHECKED));
+ (data[i].bizarre ? MF_CHECKED : MF_UNCHECKED));
if (data[i].visible)
{
EnableMenuItem(hm, IDM_WINDOW_BIZ_0 + i,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
}
}
for (i = 0; i < MAX_TERM_DATA; i++)
{
EnableMenuItem(hm, IDM_WINDOW_I_WID_0 + i,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
if (data[i].visible)
{
EnableMenuItem(hm, IDM_WINDOW_I_WID_0 + i,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
}
}
for (i = 0; i < MAX_TERM_DATA; i++)
{
EnableMenuItem(hm, IDM_WINDOW_D_WID_0 + i,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
if (data[i].visible)
{
EnableMenuItem(hm, IDM_WINDOW_D_WID_0 + i,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
}
}
for (i = 0; i < MAX_TERM_DATA; i++)
{
EnableMenuItem(hm, IDM_WINDOW_I_HGT_0 + i,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
if (data[i].visible)
{
EnableMenuItem(hm, IDM_WINDOW_I_HGT_0 + i,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
}
}
for (i = 0; i < MAX_TERM_DATA; i++)
{
EnableMenuItem(hm, IDM_WINDOW_D_HGT_0 + i,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
if (data[i].visible)
{
EnableMenuItem(hm, IDM_WINDOW_D_HGT_0 + i,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
}
}
/* Menu "Options", disable all */
EnableMenuItem(hm, IDM_OPTIONS_NO_GRAPHICS,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
EnableMenuItem(hm, IDM_OPTIONS_OLD_GRAPHICS,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
EnableMenuItem(hm, IDM_OPTIONS_NEW_GRAPHICS,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
EnableMenuItem(hm, IDM_OPTIONS_BIGTILE,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
EnableMenuItem(hm, IDM_OPTIONS_SOUND,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
#ifndef JP
EnableMenuItem(hm, IDM_OPTIONS_SAVER,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
#endif
/* Menu "Options", Item "Map" */
EnableMenuItem(GetMenu(data[0].w), IDM_OPTIONS_MAP, MF_BYCOMMAND | MF_ENABLED);
else
EnableMenuItem(GetMenu(data[0].w), IDM_OPTIONS_MAP,
- MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
/* Menu "Options", update all */
CheckMenuItem(hm, IDM_OPTIONS_NO_GRAPHICS,
- (arg_graphics == GRAPHICS_NONE ? MF_CHECKED : MF_UNCHECKED));
+ (arg_graphics == GRAPHICS_NONE ? MF_CHECKED : MF_UNCHECKED));
CheckMenuItem(hm, IDM_OPTIONS_OLD_GRAPHICS,
- (arg_graphics == GRAPHICS_ORIGINAL ? MF_CHECKED : MF_UNCHECKED));
+ (arg_graphics == GRAPHICS_ORIGINAL ? MF_CHECKED : MF_UNCHECKED));
CheckMenuItem(hm, IDM_OPTIONS_NEW_GRAPHICS,
- (arg_graphics == GRAPHICS_ADAM_BOLT ? MF_CHECKED : MF_UNCHECKED));
+ (arg_graphics == GRAPHICS_ADAM_BOLT ? MF_CHECKED : MF_UNCHECKED));
CheckMenuItem(hm, IDM_OPTIONS_BIGTILE,
- (arg_bigtile ? MF_CHECKED : MF_UNCHECKED));
+ (arg_bigtile ? MF_CHECKED : MF_UNCHECKED));
CheckMenuItem(hm, IDM_OPTIONS_SOUND,
- (arg_sound ? MF_CHECKED : MF_UNCHECKED));
+ (arg_sound ? MF_CHECKED : MF_UNCHECKED));
CheckMenuItem(hm, IDM_OPTIONS_BG,
- (use_bg ? MF_CHECKED : MF_UNCHECKED));
+ (use_bg ? MF_CHECKED : MF_UNCHECKED));
#ifndef JP
CheckMenuItem(hm, IDM_OPTIONS_SAVER,
- (hwndSaver ? MF_CHECKED : MF_UNCHECKED));
+ (hwndSaver ? MF_CHECKED : MF_UNCHECKED));
#endif
#ifdef USE_GRAPHICS
#ifdef USE_SAVER
/* Menu "Options", Item "ScreenSaver" */
EnableMenuItem(hm, IDM_OPTIONS_SAVER,
- MF_BYCOMMAND | MF_ENABLED);
+ MF_BYCOMMAND | MF_ENABLED);
#endif /* USE_SAVER */
}
{
/* Create a screen scaver window */
hwndSaver = CreateWindowEx(WS_EX_TOPMOST, "WindowsScreenSaverClass",
- "Angband Screensaver",
- WS_POPUP | WS_MAXIMIZE | WS_VISIBLE,
- 0, 0, GetSystemMetrics(SM_CXSCREEN),
- GetSystemMetrics(SM_CYSCREEN),
- NULL, NULL, hInstance, NULL);
+ "Angband Screensaver",
+ WS_POPUP | WS_MAXIMIZE | WS_VISIBLE,
+ 0, 0, GetSystemMetrics(SM_CXSCREEN),
+ GetSystemMetrics(SM_CYSCREEN),
+ NULL, NULL, hInstance, NULL);
if (hwndSaver)
{
#ifdef __MWERKS__
LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam);
+ WPARAM wParam, LPARAM lParam);
LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam)
+ WPARAM wParam, LPARAM lParam)
#else /* __MWERKS__ */
LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam)
+ WPARAM wParam, LPARAM lParam)
#endif /* __MWERKS__ */
{
PAINTSTRUCT ps;
#ifdef __MWERKS__
LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam);
+ WPARAM wParam, LPARAM lParam);
LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam)
+ WPARAM wParam, LPARAM lParam)
#else /* __MWERKS__ */
LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam)
+ WPARAM wParam, LPARAM lParam)
#endif /* __MWERKS__ */
{
term_data *td;
#ifdef __MWERKS__
LRESULT FAR PASCAL AngbandSaverProc(HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam);
+ WPARAM wParam, LPARAM lParam);
LRESULT FAR PASCAL AngbandSaverProc(HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam)
+ WPARAM wParam, LPARAM lParam)
#else /* __MWERKS__ */
LRESULT FAR PASCAL AngbandSaverProc(HWND hWnd, UINT uMsg,
- WPARAM wParam, LPARAM lParam)
+ WPARAM wParam, LPARAM lParam)
#endif /* __MWERKS__ */
{
static int iMouse = 0;
{
#ifdef JP
MessageBox(NULL, str, "·Ù¹ð¡ª",
- MB_ICONEXCLAMATION | MB_OK);
+ MB_ICONEXCLAMATION | MB_OK);
#else
MessageBox(NULL, str, "Warning",
- MB_ICONEXCLAMATION | MB_OK);
+ MB_ICONEXCLAMATION | MB_OK);
#endif
}
{
#ifdef JP
MessageBox(NULL, str, "¥¨¥é¡¼¡ª",
- MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
+ MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
#else
MessageBox(NULL, str, "Error",
- MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
+ MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
#endif
}
{
#ifdef JP
MessageBox(data[0].w, str, "·Ù¹ð¡ª",
- MB_ICONEXCLAMATION | MB_OK);
+ MB_ICONEXCLAMATION | MB_OK);
#else
MessageBox(data[0].w, str, "Warning",
- MB_ICONEXCLAMATION | MB_OK);
+ MB_ICONEXCLAMATION | MB_OK);
#endif
}
{
#ifdef JP
MessageBox(data[0].w, str, "¥¨¥é¡¼¡ª",
- MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
+ MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
#else
MessageBox(data[0].w, str, "Error",
- MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
+ MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP);
#endif
}
int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
- LPSTR lpCmdLine, int nCmdShow)
+ LPSTR lpCmdLine, int nCmdShow)
{
int i;
/* Init an infowin by giving father as an (info_win*) (or NULL), and data */
#define Infowin_init_dad(D,X,Y,W,H,B,FG,BG) \
Infowin_init_data(((D) ? ((D)->win) : (Window)(None)), \
- X,Y,W,H,B,FG,BG)
+ X,Y,W,H,B,FG,BG)
/* Init a top level infowin by pos,size,bord,Colors */
#ifdef _JP
#define Infokfnt_set(I) \
- (Infokfnt = (I))
+ (Infokfnt = (I))
#endif
/*
* Init the current metadpy, with various initialization stuff.
* If 'dad == None' assume 'dad == root'
*/
static errr Infowin_init_data(Window dad, int x, int y, int w, int h,
- int b, Pixell fg, Pixell bg)
+ int b, Pixell fg, Pixell bg)
{
Window xid;
{
/* Execute the request */
XFillRectangle(Metadpy->dpy, Infowin->win, Infoclr->gc,
- 0, 0, Infowin->w, Infowin->h);
+ 0, 0, Infowin->w, Infowin->h);
/* Success */
return (0);
/* Set up the GC mask */
gc_mask = (GCFunction | GCBackground | GCForeground |
- GCFillStyle | GCGraphicsExposures);
+ GCFillStyle | GCGraphicsExposures);
/* Create the GC detailed above */
gc = XCreateGC(Metadpy->dpy, Metadpy->root, gc_mask, &gcv);
#ifdef TOFU
if ( (*str) == 0x7f ) {
-
- /* 0x7F¤Ï¢£¤Ç·è¤áÂǤÁ */
-
- /* Ϣ³¤¹¤ë0x7F¤ÎŤµ¤ò¸¡½Ð */
- slen = 0;
- while ( str < endp && (*str) == 0x7f ) {
- slen++;
+
+ /* 0x7F¤Ï¢£¤Ç·è¤áÂǤÁ */
+
+ /* Ϣ³¤¹¤ë0x7F¤ÎŤµ¤ò¸¡½Ð */
+ slen = 0;
+ while ( str < endp && (*str) == 0x7f ) {
+ slen++;
str++;
- }
-
- /* ÉÁ²è */
- XFillRectangle( display, d, gc, x, y-afont_ascent,
- slen * afont_width, afont_height);
+ }
+
+ /* ÉÁ²è */
+ XFillRectangle( display, d, gc, x, y-afont_ascent,
+ slen * afont_width, afont_height);
- /* ¥Ý¥¤¥ó¥¿¤ò¿Ê¤á¤ë */
- x += afont_width * slen;
+ /* ¥Ý¥¤¥ó¥¿¤ò¿Ê¤á¤ë */
+ x += afont_width * slen;
}
else
#endif
if ( iskanji(*str) ) {
-
- /* UJIS¤Î»Ï¤Þ¤ê */
-
- /* Ϣ³¤¹¤ëUJISʸ»ú¤ÎŤµ¤ò¸¡½Ð */
- slen = 0;
- while ( str < endp && *str && iskanji(*str) ) {
- kanji[slen].byte1 = *str++ & 0x7f;
- kanji[slen++].byte2 = *str++ & 0x7f;
- }
-
- /* ÉÁ²è */
- XSetFont( display, gc, kfont->fid );
- XDrawImageString16( display, d, gc, x, y, kanji, slen );
+
+ /* UJIS¤Î»Ï¤Þ¤ê */
+
+ /* Ϣ³¤¹¤ëUJISʸ»ú¤ÎŤµ¤ò¸¡½Ð */
+ slen = 0;
+ while ( str < endp && *str && iskanji(*str) ) {
+ kanji[slen].byte1 = *str++ & 0x7f;
+ kanji[slen++].byte2 = *str++ & 0x7f;
+ }
+
+ /* ÉÁ²è */
+ XSetFont( display, gc, kfont->fid );
+ XDrawImageString16( display, d, gc, x, y, kanji, slen );
- /* ¥Ý¥¤¥ó¥¿¤ò¿Ê¤á¤ë */
- x += kfont_width * slen;
-
+ /* ¥Ý¥¤¥ó¥¿¤ò¿Ê¤á¤ë */
+ x += kfont_width * slen;
+
} else {
-
- /* Èó´Á»ú(=ASCII¤È²¾Äê)¤Î»Ï¤Þ¤ê */
-
- /* Ϣ³¤¹¤ëASCIIʸ»ú¤ò¸¡½Ð */
- p = str;
- slen = 0;
- while ( str < endp && *str && !iskanji(*str) ) {
+
+ /* Èó´Á»ú(=ASCII¤È²¾Äê)¤Î»Ï¤Þ¤ê */
+
+ /* Ϣ³¤¹¤ëASCIIʸ»ú¤ò¸¡½Ð */
+ p = str;
+ slen = 0;
+ while ( str < endp && *str && !iskanji(*str) ) {
#ifdef TOFU
- if (*str == 0x7f)break;
-#endif
- str++;
- slen++;
- }
-
- /* ÉÁ²è */
- XSetFont( display, gc, afont->fid );
- XDrawImageString( display, d, gc, x, y, p, slen );
-
- /* ¥Ý¥¤¥ó¥¿¤ò¿Ê¤á¤ë */
- x += afont_width * slen;
+ if (*str == 0x7f)break;
+#endif
+ str++;
+ slen++;
+ }
+
+ /* ÉÁ²è */
+ XSetFont( display, gc, afont->fid );
+ XDrawImageString( display, d, gc, x, y, p, slen );
+
+ /* ¥Ý¥¤¥ó¥¿¤ò¿Ê¤á¤ë */
+ x += afont_width * slen;
}
}
}
{
/* Note that the Infoclr is set up to contain the Infofnt */
XDrawImageString(Metadpy->dpy, Infowin->win, Infoclr->gc,
- x + i * Infofnt->wid + Infofnt->off, y, str + i, 1);
+ x + i * Infofnt->wid + Infofnt->off, y, str + i, 1);
}
}
#ifdef _JP
/* ´Á»ú¥Õ¥©¥ó¥È¤Îɽ¼¨Éý¤Ï ASCII¥Õ¥©¥ó¥È¤Î2Çܤ˸ÇÄê */
XDrawMultiString(Metadpy->dpy, Infowin->win, Infoclr->gc,
- x, y, str, len,
- Infofnt->info, Infofnt->wid, Infofnt->hgt,
- Infofnt->asc,
- Infokfnt->info, Infofnt->wid * 2);
+ x, y, str, len,
+ Infofnt->info, Infofnt->wid, Infofnt->hgt,
+ Infofnt->asc,
+ Infokfnt->info, Infofnt->wid * 2);
#else
#ifdef USE_FONTSET
XmbDrawImageString(Metadpy->dpy, Infowin->win, Infofnt->info,
- Infoclr->gc, x, y, str, len);
+ Infoclr->gc, x, y, str, len);
#else
XDrawImageString(Metadpy->dpy, Infowin->win, Infoclr->gc,
- x, y, str, len);
+ x, y, str, len);
#endif
#endif
if (ks)
{
sprintf(msg, "%c%s%s%s%s_%lX%c", 31,
- mc ? "N" : "", ms ? "S" : "",
- mo ? "O" : "", mx ? "M" : "",
- (unsigned long)(ks), 13);
+ mc ? "N" : "", ms ? "S" : "",
+ mo ? "O" : "", mx ? "M" : "",
+ (unsigned long)(ks), 13);
}
/* Hack -- Use the Keycode */
else
{
sprintf(msg, "%c%s%s%s%sK_%X%c", 31,
- mc ? "N" : "", ms ? "S" : "",
- mo ? "O" : "", mx ? "M" : "",
- ev->keycode, 13);
+ mc ? "N" : "", ms ? "S" : "",
+ mo ? "O" : "", mx ? "M" : "",
+ ev->keycode, 13);
}
/* Enqueue the "macro trigger" string */
/* Create pixel */
pixel = create_pixel(Metadpy->dpy,
- color_table[i][1],
- color_table[i][2],
- color_table[i][3]);
+ color_table[i][1],
+ color_table[i][2],
+ color_table[i][3]);
/* Change the foreground */
Infoclr_set(clr[i]);
#ifdef USE_SOUND
/* Make a special sound */
- case TERM_XTRA_SOUND: return (Term_xtra_x11_sound(v));
+ case TERM_XTRA_SOUND: return (Term_xtra_x11_sound(v));
#endif
/* Flush the output XXX XXX */
Infoclr_set(xor);
/* Hilite the cursor character */
- Infofnt_text_non(x, y, " ", 2);
+ Infofnt_text_non(x, y, " ", 2);
/* Success */
return (0);
{
/* Draw object / terrain */
XPutImage(Metadpy->dpy, td->win->win,
- clr[0]->gc,
- td->tiles,
- x1, y1,
- x, y,
- td->fnt->twid, td->fnt->hgt);
+ clr[0]->gc,
+ td->tiles,
+ x1, y1,
+ x, y,
+ td->fnt->twid, td->fnt->hgt);
}
else
{
/* Draw to screen */
XPutImage(Metadpy->dpy, td->win->win,
- clr[0]->gc,
- td->TmpImage,
- 0, 0, x, y,
- td->fnt->twid, td->fnt->hgt);
+ clr[0]->gc,
+ td->TmpImage,
+ 0, 0, x, y,
+ td->fnt->twid, td->fnt->hgt);
}
#else /* USE_TRANSPARENCY */
/* Draw object / terrain */
XPutImage(Metadpy->dpy, td->win->win,
- clr[0]->gc,
- td->tiles,
- x1, y1,
- x, y,
- td->fnt->twid, td->fnt->hgt);
+ clr[0]->gc,
+ td->tiles,
+ x1, y1,
+ x, y,
+ td->fnt->twid, td->fnt->hgt);
#endif /* USE_TRANSPARENCY */
}
MAKE(td->win, infowin);
Infowin_set(td->win);
Infowin_init_top(x, y, wid, hgt, 0,
- Metadpy->fg, Metadpy->bg);
+ Metadpy->fg, Metadpy->bg);
/* Ask for certain events */
#if defined(USE_XIM)
{
/* Create pixel */
pixel = create_pixel(Metadpy->dpy,
- color_table[i][1],
- color_table[i][2],
- color_table[i][3]);
+ color_table[i][1],
+ color_table[i][2],
+ color_table[i][3]);
}
/* Initialize the color */
/* Resize tiles */
td->tiles =
ResizeImage(dpy, tiles_raw,
- pict_wid, pict_hgt,
- td->fnt->twid, td->fnt->hgt);
+ pict_wid, pict_hgt,
+ td->fnt->twid, td->fnt->hgt);
}
#ifdef USE_TRANSPARENCY
static void Initialize(AngbandWidget request, AngbandWidget new);
static void Redisplay(AngbandWidget w, XEvent *event, Region region);
static Boolean SetValues(AngbandWidget current, AngbandWidget request,
- AngbandWidget new, ArgList args, Cardinal *num_args);
+ AngbandWidget new, ArgList args, Cardinal *num_args);
static void Destroy(AngbandWidget widget);
/* Forward declaration for internal functions */
static void calculateSizeHints(AngbandWidget new);
static XFontStruct *getFont(AngbandWidget widget,
- String font, Boolean fallback);
+ String font, Boolean fallback);
/* Class record constanst */
* Public procedures
*/
static void AngbandOutputText(AngbandWidget widget, int x, int y,
- String txt, int len, int color)
+ String txt, int len, int color)
{
/* Do nothing if the string is null */
if (!txt || !*txt)
/* Place the string */
XDrawImageString (XtDisplay(widget), XtWindow(widget),
- widget->angband.gc[color], x, y, txt, len);
+ widget->angband.gc[color], x, y, txt, len);
}
static void AngbandClearArea(AngbandWidget widget,
- int x, int y, int w, int h, int color)
+ int x, int y, int w, int h, int color)
{
/* Figure out which area to clear */
y = y * widget->angband.fontheight + widget->angband.internal_border;
/* Clear the area */
XFillRectangle(XtDisplay(widget), XtWindow(widget),
- widget->angband.gc[color],
- x, y, widget->angband.fontwidth*w,
- widget->angband.fontheight*h);
+ widget->angband.gc[color],
+ x, y, widget->angband.fontwidth*w,
+ widget->angband.fontheight*h);
}
/*
else
gcv.foreground = new->angband.color[n];
new->angband.gc[n] = XtGetGC((Widget)new, GCFont | GCForeground |
- GCBackground | GCGraphicsExposures,
- &gcv);
+ GCBackground | GCGraphicsExposures,
+ &gcv);
}
/* Create a special GC for highlighting */
WhitePixelOfScreen(XtScreen((Widget)new));
gcv.function = GXxor;
new->angband.gc[NUM_COLORS] = XtGetGC((Widget)new, GCFunction |
- GCGraphicsExposures |
- GCForeground, &gcv);
+ GCGraphicsExposures |
+ GCForeground, &gcv);
/* Calculate window geometry */
new->core.height = new->angband.start_rows * new->angband.fontheight +
* can potentially have effects that spans the whole widget).
*/
static Boolean SetValues(AngbandWidget current, AngbandWidget request,
- AngbandWidget new, ArgList args,
- Cardinal *num_args)
+ AngbandWidget new, ArgList args,
+ Cardinal *num_args)
{
int depth = DefaultDepthOfScreen(XtScreen((Widget) new));
Boolean font_changed = FALSE;
XtReleaseGC((Widget)current, current->angband.gc[n]);
/* Get the new GC */
new->angband.gc[n] = XtGetGC((Widget)new, GCFont | GCForeground |
- GCBackground | GCGraphicsExposures,
- &gcv);
+ GCBackground | GCGraphicsExposures,
+ &gcv);
}
/* Replace the old XOR/highlighting GC */
gcv.function = GXxor;
XtReleaseGC((Widget)current, current->angband.gc[NUM_COLORS]);
new->angband.gc[NUM_COLORS] = XtGetGC((Widget)new, GCFunction |
- GCGraphicsExposures |
- GCForeground, &gcv);
+ GCGraphicsExposures |
+ GCForeground, &gcv);
/* Fix the background color */
new->core.background_pixel = new->angband.color[0];
}
* Load a font
*/
static XFontStruct *getFont(AngbandWidget widget,
- String font, Boolean fallback)
+ String font, Boolean fallback)
{
Display *dpy = XtDisplay((Widget) widget);
char buf[256];
* Do a redraw
*/
static void react_redraw(Widget widget,
- XtPointer client_data, XtPointer call_data)
+ XtPointer client_data, XtPointer call_data)
{
term_data *old_td = (term_data*)(Term->data);
term_data *td = (term_data*)client_data;
if (ks)
{
sprintf(msg, "%c%s%s%s%s_%lX%c", 31,
- mc ? "N" : "", ms ? "S" : "",
- mo ? "O" : "", mx ? "M" : "",
- (unsigned long)(ks), 13);
+ mc ? "N" : "", ms ? "S" : "",
+ mo ? "O" : "", mx ? "M" : "",
+ (unsigned long)(ks), 13);
}
/* Hack -- Use the Keycode */
else
{
sprintf(msg, "%c%s%s%s%sK_%X%c", 31,
- mc ? "N" : "", ms ? "S" : "",
- mo ? "O" : "", mx ? "M" : "",
- ev->keycode, 13);
+ mc ? "N" : "", ms ? "S" : "",
+ mo ? "O" : "", mx ? "M" : "",
+ ev->keycode, 13);
}
/* Enqueue the "fake" string */
static void handle_event (Widget widget, XtPointer client_data, XEvent *event,
- Boolean *continue_to_dispatch)
+ Boolean *continue_to_dispatch)
{
term_data *old_td = (term_data*)(Term->data);
term_data *td = (term_data *)client_data;
for (i=0; i<MAX_TERM_DATA; i++) {
if (Term == &data[i].t)
XClearWindow(XtDisplay((Widget)data[i].widget),
- XtWindow((Widget)data[i].widget));
+ XtWindow((Widget)data[i].widget));
}
return (0);
}
* Initialize a term_data
*/
static errr term_data_init(term_data *td, Widget topLevel,
- int key_buf, String name,
- ArgList widget_arg, Cardinal widget_arg_no)
+ int key_buf, String name,
+ ArgList widget_arg, Cardinal widget_arg_no)
{
Widget parent;
term *t = &td->t;
/* Create the shell widget */
parent = XtCreatePopupShell(name, topLevelShellWidgetClass, topLevel,
- NULL, 0);
+ NULL, 0);
/* Create the interior widget */
td->widget = (AngbandWidget)
XtCreateManagedWidget (name, angbandWidgetClass,
- parent, widget_arg, widget_arg_no);
+ parent, widget_arg, widget_arg_no);
/* Initialize the term (full size) */
term_init(t, 80, 24, key_buf);
/* Register the keypress event handler */
XtAddEventHandler((Widget)td->widget, KeyPressMask,
- False, (XtEventHandler) handle_event, td);
+ False, (XtEventHandler) handle_event, td);
/* Redraw callback */
XtAddCallback((Widget)td->widget, XtNredrawCallback,
- react_redraw, td);
+ react_redraw, td);
/* Realize the widget */
XtRealizeWidget(parent);
/* Initialize the toolkit */
topLevel = XtAppInitialize (&appcon, "Angband", NULL, 0, &argc, argv,
- fallback, NULL, 0);
+ fallback, NULL, 0);
/* Initialize the windows */
for (i=0; i<MAX_TERM_DATA; i++) {
(void)strnfmt(out_val, 78, "(%c-%c, *=List, ESC=exit) Use which %s? ",
#endif
- I2A(0), I2A(num - 1), p);
+ I2A(0), I2A(num - 1), p);
/* Get a spell from the user */
- choice= always_show_list ? ESCAPE:1 ;
- while (!flag)
- {
+ choice= always_show_list ? ESCAPE:1 ;
+ while (!flag)
+ {
if(choice==ESCAPE) choice = ' ';
else if( !get_com(out_val, &choice, TRUE) )break;
/* Dump the spell --(-- */
sprintf(psi_desc, " %c) %-30s %3d%%%s",
- I2A(i), spell.name,
- chance, comment);
+ I2A(i), spell.name,
+ chance, comment);
prt(psi_desc, y + i + 1, x);
}
bool blinked;
bool touched = FALSE, fear = FALSE, alive = TRUE;
bool explode = FALSE;
- bool resist_drain = FALSE;
+ bool resist_drain = FALSE;
bool do_silly_attack = (one_in_(2) && p_ptr->image);
int syouryaku = 0;
int get_damage = 0;
case RBM_CHARGE:
{
#ifdef JP
- syouryaku = -1;
+ syouryaku = -1;
act = "¤ÏÀÁµá½ñ¤ò¤è¤³¤·¤¿¡£";
#else
act = "charges you.";
case RBM_CRAWL:
{
#ifdef JP
- syouryaku = -1;
+ syouryaku = -1;
act = "¤¬ÂΤξå¤òÇ礤²ó¤Ã¤¿¡£";
#else
act = "crawls on you.";
case RBM_EXPLODE:
{
- syouryaku = -1;
+ syouryaku = -1;
#ifdef JP
act = "¤ÏÇúȯ¤·¤¿¡£";
#else
case RBM_XXX4:
{
- syouryaku = -1;
+ syouryaku = -1;
#ifdef JP
act = "¤¬ XXX4 ¤òȯ¼Í¤·¤¿¡£";
#else
case RBM_INSULT:
{
- syouryaku = -1;
+ syouryaku = -1;
act = desc_insult[randint0(m_ptr->r_idx == MON_DEBBY ? 10 : 8)];
sound(SOUND_MOAN);
break;
case RBM_MOAN:
{
- syouryaku = -1;
+ syouryaku = -1;
act = desc_moan[randint0(4)];
sound(SOUND_MOAN);
break;
case RBM_SHOW:
{
- syouryaku = -1;
+ syouryaku = -1;
if (m_ptr->r_idx == MON_JAIAN)
{
#ifdef JP
/* Saving throw (unless paralyzed) based on dex and level */
if (!p_ptr->paralyzed &&
(randint0(100) < (adj_dex_safe[p_ptr->stat_ind[A_DEX]] +
- p_ptr->lev)))
+ p_ptr->lev)))
{
/* Saving throw message */
#ifdef JP
/* Saving throw (unless paralyzed) based on dex and level */
if (!p_ptr->paralyzed &&
(randint0(100) < (adj_dex_safe[p_ptr->stat_ind[A_DEX]] +
- p_ptr->lev)))
+ p_ptr->lev)))
{
/* Saving throw message */
#ifdef JP
/* Message */
#ifdef JP
msg_format("%s(%c)¤ò%sÅð¤Þ¤ì¤¿¡ª",
- o_name, index_to_label(i),
- ((o_ptr->number > 1) ? "°ì¤Ä" : ""));
+ o_name, index_to_label(i),
+ ((o_ptr->number > 1) ? "°ì¤Ä" : ""));
#else
msg_format("%sour %s (%c) was stolen!",
- ((o_ptr->number > 1) ? "One of y" : "Y"),
- o_name, index_to_label(i));
+ ((o_ptr->number > 1) ? "One of y" : "Y"),
+ o_name, index_to_label(i));
#endif
chg_virtue(V_SACRIFICE, 1);
/* Message */
#ifdef JP
msg_format("%s(%c)¤ò%s¿©¤Ù¤é¤ì¤Æ¤·¤Þ¤Ã¤¿¡ª",
- o_name, index_to_label(i),
- ((o_ptr->number > 1) ? "°ì¤Ä" : ""));
+ o_name, index_to_label(i),
+ ((o_ptr->number > 1) ? "°ì¤Ä" : ""));
#else
msg_format("%sour %s (%c) was eaten!",
- ((o_ptr->number > 1) ? "One of y" : "Y"),
- o_name, index_to_label(i));
+ ((o_ptr->number > 1) ? "One of y" : "Y"),
+ o_name, index_to_label(i));
#endif
else if (p_ptr->hold_life && (randint0(100) < 75))
{
#ifdef JP
- msg_print("¤·¤«¤·¼«¸Ê¤ÎÀ¸Ì¿ÎϤò¼é¤ê¤¤Ã¤¿¡ª");
+ msg_print("¤·¤«¤·¼«¸Ê¤ÎÀ¸Ì¿ÎϤò¼é¤ê¤¤Ã¤¿¡ª");
#else
msg_print("You keep hold of your life force!");
#endif
if (p_ptr->hold_life)
{
#ifdef JP
- msg_print("À¸Ì¿ÎϤò¾¯¤·µÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
+ msg_print("À¸Ì¿ÎϤò¾¯¤·µÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
#else
msg_print("You feel your life slipping away!");
#endif
else
{
#ifdef JP
- msg_print("À¸Ì¿ÎϤ¬ÂΤ«¤éµÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
+ msg_print("À¸Ì¿ÎϤ¬ÂΤ«¤éµÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
#else
msg_print("You feel your life draining away!");
#endif
else if (p_ptr->hold_life && (randint0(100) < 50))
{
#ifdef JP
- msg_print("¤·¤«¤·¼«¸Ê¤ÎÀ¸Ì¿ÎϤò¼é¤ê¤¤Ã¤¿¡ª");
+ msg_print("¤·¤«¤·¼«¸Ê¤ÎÀ¸Ì¿ÎϤò¼é¤ê¤¤Ã¤¿¡ª");
#else
msg_print("You keep hold of your life force!");
#endif
if (p_ptr->hold_life)
{
#ifdef JP
- msg_print("À¸Ì¿ÎϤò¾¯¤·µÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
+ msg_print("À¸Ì¿ÎϤò¾¯¤·µÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
#else
msg_print("You feel your life slipping away!");
#endif
else
{
#ifdef JP
- msg_print("À¸Ì¿ÎϤ¬ÂΤ«¤éµÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
+ msg_print("À¸Ì¿ÎϤ¬ÂΤ«¤éµÛ¤¤¼è¤é¤ì¤¿µ¤¤¬¤¹¤ë¡ª");
#else
msg_print("You feel your life draining away!");
#endif
case 10:
{
#ifdef JP
- msg_print("¤¢¤Ê¤¿¤Ï°ÊÁ°¤Û¤ÉÎ϶¯¤¯¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿...¡£");
+ msg_print("¤¢¤Ê¤¿¤Ï°ÊÁ°¤Û¤ÉÎ϶¯¤¯¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿...¡£");
#else
msg_print("You're not as powerful as you used to be...");
#endif
bool no_flow = ((m_ptr->mflag2 & MFLAG_NOFLOW) && (cave[m_ptr->fy][m_ptr->fx].cost > 2));
bool can_pass_wall;
- /* Flow towards the player */
- (void)get_moves_aux(m_idx, &y2, &x2, no_flow);
+ /* Flow towards the player */
+ (void)get_moves_aux(m_idx, &y2, &x2, no_flow);
can_pass_wall = ((r_ptr->flags2 & RF2_PASS_WALL) && ((m_idx != p_ptr->riding) || (p_ptr->pass_wall)));
}
- /* Check for no move */
- if (!x && !y) return (FALSE);
+ /* Check for no move */
+ if (!x && !y) return (FALSE);
/* Extract the "absolute distances" */
/* Aura fire */
if ((tr_ptr->flags2 & RF2_AURA_FIRE) &&
!(r_ptr->flags3 & RF3_IM_FIRE) &&
- !(r_ptr->flags3 & RF3_RES_ALL) && m_ptr->r_idx)
+ !(r_ptr->flags3 & RF3_RES_ALL) && m_ptr->r_idx)
{
if (see_either)
{
/* Aura cold */
if ((tr_ptr->flags3 & RF3_AURA_COLD) &&
!(r_ptr->flags3 & RF3_IM_COLD) &&
- !(r_ptr->flags3 & RF3_RES_ALL) && m_ptr->r_idx)
+ !(r_ptr->flags3 & RF3_RES_ALL) && m_ptr->r_idx)
{
if (see_either)
{
/* Aura elec */
if ((tr_ptr->flags2 & (RF2_AURA_ELEC)) &&
- !(r_ptr->flags3 & (RF3_IM_ELEC)) &&
- !(r_ptr->flags3 & RF3_RES_ALL) && m_ptr->r_idx)
+ !(r_ptr->flags3 & (RF3_IM_ELEC)) &&
+ !(r_ptr->flags3 & RF3_RES_ALL) && m_ptr->r_idx)
{
if (see_either)
{
#ifdef JP
msg_print("ÃÏÌ̤ËÍî¤È¤µ¤ì¤¿¡£");
#else
- msg_print("You have fallen from riding pet.");
+ msg_print("You have fallen from riding pet.");
#endif
}
}
/* 75% random movement */
else if ((r_ptr->flags1 & RF1_RAND_50) &&
(r_ptr->flags1 & RF1_RAND_25) &&
- (randint0(100) < 75))
+ (randint0(100) < 75))
{
/* Memorize flags */
if (m_ptr->ml) r_ptr->r_flags1 |= (RF1_RAND_50);
c_ptr->info &= ~(CAVE_MARK);
/* Notice */
- cave_set_feat(ny, nx, floor_type[randint0(100)]);
+ cave_set_feat(ny, nx, floor_type[randint0(100)]);
/* Note changes to viewable region */
if (player_has_los_bold(ny, nx)) do_view = TRUE;
c_ptr->info &= ~(CAVE_MARK);
/* Break the rune */
- c_ptr->info &= ~(CAVE_OBJECT);
- c_ptr->mimic = 0;
+ c_ptr->info &= ~(CAVE_OBJECT);
+ c_ptr->mimic = 0;
/* Allow movement */
do_move = TRUE;
}
}
else if (do_move && is_explosive_rune_grid(c_ptr) &&
- !((r_ptr->flags1 & RF1_NEVER_BLOW) && (py == ny) && (px == nx)))
+ !((r_ptr->flags1 & RF1_NEVER_BLOW) && (py == ny) && (px == nx)))
{
/* Assume no move allowed */
do_move = FALSE;
c_ptr->info &= ~(CAVE_MARK);
/* Break the rune */
- c_ptr->info &= ~(CAVE_OBJECT);
- c_ptr->mimic = 0;
+ c_ptr->info &= ~(CAVE_OBJECT);
+ c_ptr->mimic = 0;
note_spot(ny, nx);
lite_spot(ny, nx);
{
if (r_ptr->flags2 & RF2_KILL_WALL)
{
- cave_set_feat(ny, nx, FEAT_GRASS);
+ cave_set_feat(ny, nx, FEAT_GRASS);
}
if (!(r_ptr->flags7 & RF7_CAN_FLY) && !(r_ptr->flags8 & RF8_WILD_WOOD))
/* Possible disturb */
if (m_ptr->ml &&
- (disturb_move ||
- (disturb_near && (m_ptr->mflag & MFLAG_VIEW)) ||
- (disturb_high && ap_r_ptr->r_tkills && ap_r_ptr->level >= p_ptr->lev)))
+ (disturb_move ||
+ (disturb_near && (m_ptr->mflag & MFLAG_VIEW)) ||
+ (disturb_high && ap_r_ptr->r_tkills && ap_r_ptr->level >= p_ptr->lev)))
{
/* Disturb */
if (is_hostile(m_ptr))
int speed;
- /* Clear monster fighting indicator */
- mon_fight = FALSE;
+ /* Clear monster fighting indicator */
+ mon_fight = FALSE;
/* Memorize old race */
old_monster_race_idx = p_ptr->monster_race_idx;
#ifdef JP
msg_print("¡Ö»þ¤è¡ª¡×");
#else
- msg_format("%s yells 'Time!'", m_name);
+ msg_format("%s yells 'Time!'", m_name);
#endif
else msg_print("hek!");
#else
(void)strnfmt(out_val, 78, "(%^ss %c-%c, *=List, ESC=exit) Use which %s? ",
#endif
- p, I2A(0), I2A(num - 1), p);
+ p, I2A(0), I2A(num - 1), p);
}
if (use_menu && !only_browse) screen_save();
/* Get a spell from the user */
- choice= (always_show_list || use_menu) ? ESCAPE:1 ;
- while (!flag)
- {
+ choice= (always_show_list || use_menu) ? ESCAPE:1 ;
+ while (!flag)
+ {
if(choice==ESCAPE) choice = ' ';
else if( !get_com(out_val, &choice, TRUE) )break;
/* Update the old location */
cave[target_row][target_col].m_idx = 0;
- /* Update the new location */
+ /* Update the new location */
cave[ty][tx].m_idx = m_idx;
/* Move the monster */
cptr p, q;
#ifdef JP
- char jverb_buf[64];
+ char jverb_buf[64];
#endif
int msex = 0;
/* Killed ancestors */
#ifdef JP
hooked_roff(format("%^s¤Ï¤¢¤Ê¤¿¤ÎÀèÁĤò %d ¿ÍÁò¤Ã¤Æ¤¤¤ë",
- wd_he[msex], r_ptr->r_deaths));
+ wd_he[msex], r_ptr->r_deaths));
#else
hooked_roff(format("%^s has slain %d of your ancestors",
- wd_he[msex], r_ptr->r_deaths));
+ wd_he[msex], r_ptr->r_deaths));
#endif
hooked_roff(format("¤¬¡¢¤¹¤Ç¤ËµØƤ¤Á¤Ï²Ì¤¿¤·¤Æ¤¤¤ë¡ª"));
#else
hooked_roff(format(", but you have avenged %s! ",
- plural(r_ptr->r_deaths, "him", "them")));
+ plural(r_ptr->r_deaths, "him", "them")));
#endif
}
hooked_roff(format("¤Î¤Ë¡¢¤Þ¤ÀµØƤ¤Á¤ò²Ì¤¿¤·¤Æ¤¤¤Ê¤¤¡£"));
#else
hooked_roff(format(", who %s unavenged. ",
- plural(r_ptr->r_deaths, "remains", "remain")));
+ plural(r_ptr->r_deaths, "remains", "remain")));
#endif
}
- /* Start a new line */
- hooked_roff("\n");
+ /* Start a new line */
+ hooked_roff("\n");
}
/* Dead unique who never hurt us */
hooked_roff("You have slain this foe. ");
#endif
- /* Start a new line */
- hooked_roff("\n");
+ /* Start a new line */
+ hooked_roff("\n");
}
}
/* Dead ancestors */
#ifdef JP
hooked_roff(format("¤³¤Î¥â¥ó¥¹¥¿¡¼¤Ï¤¢¤Ê¤¿¤ÎÀèÁĤò %d ¿ÍÁò¤Ã¤Æ¤¤¤ë",
- r_ptr->r_deaths ));
+ r_ptr->r_deaths ));
#else
hooked_roff(format("%d of your ancestors %s been killed by this creature, ",
- r_ptr->r_deaths, plural(r_ptr->r_deaths, "has", "have")));
+ r_ptr->r_deaths, plural(r_ptr->r_deaths, "has", "have")));
#endif
{
#ifdef JP
hooked_roff(format("¤¬¡¢%s¤Ï¤³¤Î¥â¥ó¥¹¥¿¡¼¤ò¾¯¤Ê¤¯¤È¤â %d ÂΤÏÅݤ·¤Æ¤¤¤ë¡£",
- "¤¢¤Ê¤¿¤ÎÀèÁÄ", r_ptr->r_tkills));
+ "¤¢¤Ê¤¿¤ÎÀèÁÄ", r_ptr->r_tkills));
#else
hooked_roff(format("and %s have exterminated at least %d of the creatures. ",
- "your ancestors", r_ptr->r_tkills));
+ "your ancestors", r_ptr->r_tkills));
#endif
}
}
- /* Start a new line */
- hooked_roff("\n");
+ /* Start a new line */
+ hooked_roff("\n");
}
/* Normal monsters */
#endif
}
- /* Start a new line */
- hooked_roff("\n");
+ /* Start a new line */
+ hooked_roff("\n");
}
/* Descriptions */
#endif
- if (buf[0])
- {
- /* Dump it */
- hooked_roff(buf);
+ if (buf[0])
+ {
+ /* Dump it */
+ hooked_roff(buf);
- /* Start a new line */
- hooked_roff("\n");
- }
+ /* Start a new line */
+ hooked_roff("\n");
+ }
}
if (r_idx == MON_KAGE)
hooked_roff(format("%^s is normally found at depths of %d feet",
#endif
- wd_he[msex], r_ptr->level * 50));
+ wd_he[msex], r_ptr->level * 50));
}
else
{
hooked_roff(format("%^s is normally found on dungeon level %d",
#endif
- wd_he[msex], r_ptr->level));
+ wd_he[msex], r_ptr->level));
}
old = TRUE;
}
(long)1000 / (p_ptr->max_plv+2) + 5) / 10);
hooked_roff(format(" Ìó%ld.%02ld ¥Ý¥¤¥ó¥È¤Î·Ð¸³¤È¤Ê¤ë¡£",
- (long)i, (long)j ));
+ (long)i, (long)j ));
#else
/* calculate the integer exp part */
i = (long)r_ptr->mexp * r_ptr->level / (p_ptr->max_plv+2);
/* Mention the experience */
hooked_roff(format(" is worth about %ld.%02ld point%s",
- (long)i, (long)j,
- (((i == 1) && (j == 0)) ? "" : "s")));
+ (long)i, (long)j,
+ (((i == 1) && (j == 0)) ? "" : "s")));
/* Take account of annoying English */
p = "th";
/* Mention the dependance on the player's level */
hooked_roff(format(" for a%s %lu%s level character. ",
- q, (long)i, p));
+ q, (long)i, p));
#endif
}
hooked_roff(format("%^s usually appears with escorts. ",
#endif
- wd_he[msex]));
+ wd_he[msex]));
}
/* Describe friends */
hooked_roff(format("%^s usually appears in groups. ",
#endif
- wd_he[msex]));
+ wd_he[msex]));
}
#endif
#ifdef JP
- if (flags6 & (RF6_INVULNER)) {vp[vn] = "̵Ũ²½";color[vn++] = TERM_WHITE;}
+ if (flags6 & (RF6_INVULNER)) {vp[vn] = "̵Ũ²½";color[vn++] = TERM_WHITE;}
#else
if (flags6 & (RF6_INVULNER)) {vp[vn] = "make invulnerable";color[vn++] = TERM_WHITE;}
#endif
hook_c_roff(color[n], vp[n]);
}
#ifdef JP
- hooked_roff("¤Î¼öʸ¤ò¾§¤¨¤ë¤³¤È¤¬¤¢¤ë");
+ hooked_roff("¤Î¼öʸ¤ò¾§¤¨¤ë¤³¤È¤¬¤¢¤ë");
#endif
}
hooked_roff(format("%^s has an armor rating of %d",
#endif
- wd_he[msex], r_ptr->ac));
+ wd_he[msex], r_ptr->ac));
/* Maximized hitpoints */
if (flags1 & RF1_FORCE_MAXHP)
hooked_roff(format(" and a life rating of %d. ",
#endif
- r_ptr->hdice * r_ptr->hside));
+ r_ptr->hdice * r_ptr->hside));
}
/* Variable hitpoints */
hooked_roff(format(" and a life rating of %dd%d. ",
#endif
- r_ptr->hdice, r_ptr->hside));
+ r_ptr->hdice, r_ptr->hside));
}
}
/* Do we know how aware it is? */
if ((((int)r_ptr->r_wake * (int)r_ptr->r_wake) > r_ptr->sleep) ||
- (r_ptr->r_ignore == MAX_UCHAR) ||
+ (r_ptr->r_ignore == MAX_UCHAR) ||
(r_ptr->sleep == 0 && r_ptr->r_tkills >= 10) || know_everything)
{
cptr act;
wd_he[msex], act, 10 * r_ptr->aaf));
#else
hooked_roff(format("%^s %s intruders, which %s may notice from %d feet. ",
- wd_he[msex], act, wd_he[msex], 10 * r_ptr->aaf));
+ wd_he[msex], act, wd_he[msex], 10 * r_ptr->aaf));
#endif
}
#ifdef JP
- if ( r == 0 ) hooked_roff( format("%^s¤Ï", wd_he[msex]) );
+ if ( r == 0 ) hooked_roff( format("%^s¤Ï", wd_he[msex]) );
/***¼ã´³É½¸½¤òÊѹ¹ ita ***/
- /* Describe damage (if known) */
+ /* Describe damage (if known) */
if (d1 && d2 && (know_everything || know_damage(r_idx, m)))
{
/* A title (use "The" for non-uniques) */
#ifdef JP
- if (0)
+ if (0)
#else
if (!(r_ptr->flags1 & RF1_UNIQUE))
#endif
if (!(r_ptr->flags8 & RF8_WILD_ONLY))
return TRUE;
else
- {
- dungeon_info_type *d_ptr = &d_info[dungeon_type];
- if ((d_ptr->mflags8 & RF8_WILD_MOUNTAIN) &&
- (r_ptr->flags8 & RF8_WILD_MOUNTAIN)) return TRUE;
+ {
+ dungeon_info_type *d_ptr = &d_info[dungeon_type];
+ if ((d_ptr->mflags8 & RF8_WILD_MOUNTAIN) &&
+ (r_ptr->flags8 & RF8_WILD_MOUNTAIN)) return TRUE;
return FALSE;
- }
+ }
}
*/
bool monster_can_enter(int y, int x, monster_race *r_ptr)
{
- cave_type *c_ptr = &cave[y][x];
- byte feat = c_ptr->feat;
-
- /* Player or other monster */
- if ((y == py) && (x == px)) return FALSE;
- if (c_ptr->m_idx) return FALSE;
-
- /* Permanent wall */
- if ((c_ptr->feat >= FEAT_PERM_EXTRA) &&
- (c_ptr->feat <= FEAT_PERM_SOLID))
- return FALSE;
-
- /* Can fly over the Pattern */
- if ((c_ptr->feat >= FEAT_PATTERN_START) &&
- (c_ptr->feat <= FEAT_PATTERN_XTRA2))
- {
- if (!(r_ptr->flags7 & RF7_CAN_FLY))
- return FALSE;
- else
- return TRUE;
- }
-
- /* Can fly over mountain on the surface */
- if (feat == FEAT_MOUNTAIN)
- {
- if (!dun_level &&
- ((r_ptr->flags7 & RF7_CAN_FLY) ||
- (r_ptr->flags8 & RF8_WILD_MOUNTAIN)))
- return TRUE;
- else
- return FALSE;
- }
-
- /* Cannot enter wall without pass wall ability */
- if (!cave_floor_grid(c_ptr) && !(r_ptr->flags2 & RF2_PASS_WALL))
- return FALSE;
+ cave_type *c_ptr = &cave[y][x];
+ byte feat = c_ptr->feat;
+
+ /* Player or other monster */
+ if ((y == py) && (x == px)) return FALSE;
+ if (c_ptr->m_idx) return FALSE;
+
+ /* Permanent wall */
+ if ((c_ptr->feat >= FEAT_PERM_EXTRA) &&
+ (c_ptr->feat <= FEAT_PERM_SOLID))
+ return FALSE;
+
+ /* Can fly over the Pattern */
+ if ((c_ptr->feat >= FEAT_PATTERN_START) &&
+ (c_ptr->feat <= FEAT_PATTERN_XTRA2))
+ {
+ if (!(r_ptr->flags7 & RF7_CAN_FLY))
+ return FALSE;
+ else
+ return TRUE;
+ }
+
+ /* Can fly over mountain on the surface */
+ if (feat == FEAT_MOUNTAIN)
+ {
+ if (!dun_level &&
+ ((r_ptr->flags7 & RF7_CAN_FLY) ||
+ (r_ptr->flags8 & RF8_WILD_MOUNTAIN)))
+ return TRUE;
+ else
+ return FALSE;
+ }
+
+ /* Cannot enter wall without pass wall ability */
+ if (!cave_floor_grid(c_ptr) && !(r_ptr->flags2 & RF2_PASS_WALL))
+ return FALSE;
/* Pit */
if (feat == FEAT_DARK_PIT)
case SUMMON_HI_UNDEAD:
{
okay = ((r_ptr->d_char == 'L') ||
- (r_ptr->d_char == 'V') ||
- (r_ptr->d_char == 'W'));
+ (r_ptr->d_char == 'V') ||
+ (r_ptr->d_char == 'W'));
break;
}
case SUMMON_BIZARRE6:
{
okay = ((r_ptr->d_char == '!') ||
- (r_ptr->d_char == '?') ||
- (r_ptr->d_char == '=') ||
- (r_ptr->d_char == '$') ||
- (r_ptr->d_char == '|'));
+ (r_ptr->d_char == '?') ||
+ (r_ptr->d_char == '=') ||
+ (r_ptr->d_char == '$') ||
+ (r_ptr->d_char == '|'));
break;
}
case SUMMON_CYBER:
{
okay = ((r_ptr->d_char == 'U') &&
- (r_ptr->flags4 & RF4_ROCKET));
+ (r_ptr->flags4 & RF4_ROCKET));
break;
}
case SUMMON_EAGLES:
{
okay = (r_ptr->d_char == 'B' &&
- (r_ptr->flags8 & RF8_WILD_MOUNTAIN) &&
- (r_ptr->flags8 & RF8_WILD_ONLY));
+ (r_ptr->flags8 & RF8_WILD_MOUNTAIN) &&
+ (r_ptr->flags8 & RF8_WILD_ONLY));
break;
}
case SUMMON_PIRANHAS:
{
dungeon_info_type *d_ptr = &d_info[dungeon_type];
monster_race *r_ptr = &r_info[r_idx];
- byte a;
+ byte a;
if (d_ptr->flags1 & DF1_CHAMELEON)
{
if (d_ptr->flags1 & DF1_NO_MAGIC)
{
if (r_idx != MON_CHAMELEON &&
- r_ptr->freq_spell &&
- !(r_ptr->flags4 & RF4_NOMAGIC_MASK) &&
- !(r_ptr->flags5 & RF5_NOMAGIC_MASK) &&
- !(r_ptr->flags6 & RF6_NOMAGIC_MASK))
+ r_ptr->freq_spell &&
+ !(r_ptr->flags4 & RF4_NOMAGIC_MASK) &&
+ !(r_ptr->flags5 & RF5_NOMAGIC_MASK) &&
+ !(r_ptr->flags6 & RF6_NOMAGIC_MASK))
return FALSE;
}
if (d_ptr->flags1 & DF1_NO_MELEE)
if (d_ptr->special_div == 64) return TRUE;
if (summon_specific_type && !(d_ptr->flags1 & DF1_CHAMELEON)) return TRUE;
- if(d_ptr->mode == DUNGEON_MODE_AND)
- {
- if (d_ptr->mflags1)
+ if(d_ptr->mode == DUNGEON_MODE_AND)
+ {
+ if (d_ptr->mflags1)
{
- if((d_ptr->mflags1 & r_ptr->flags1) != d_ptr->mflags1)
- return FALSE;
+ if((d_ptr->mflags1 & r_ptr->flags1) != d_ptr->mflags1)
+ return FALSE;
}
- if (d_ptr->mflags2)
+ if (d_ptr->mflags2)
{
- if((d_ptr->mflags2 & r_ptr->flags2) != d_ptr->mflags2)
- return FALSE;
+ if((d_ptr->mflags2 & r_ptr->flags2) != d_ptr->mflags2)
+ return FALSE;
}
- if (d_ptr->mflags3)
+ if (d_ptr->mflags3)
{
- if((d_ptr->mflags3 & r_ptr->flags3) != d_ptr->mflags3)
- return FALSE;
+ if((d_ptr->mflags3 & r_ptr->flags3) != d_ptr->mflags3)
+ return FALSE;
}
- if (d_ptr->mflags4)
+ if (d_ptr->mflags4)
{
- if((d_ptr->mflags4 & r_ptr->flags4) != d_ptr->mflags4)
- return FALSE;
+ if((d_ptr->mflags4 & r_ptr->flags4) != d_ptr->mflags4)
+ return FALSE;
}
- if (d_ptr->mflags5)
+ if (d_ptr->mflags5)
{
- if((d_ptr->mflags5 & r_ptr->flags5) != d_ptr->mflags5)
- return FALSE;
+ if((d_ptr->mflags5 & r_ptr->flags5) != d_ptr->mflags5)
+ return FALSE;
}
- if (d_ptr->mflags6)
+ if (d_ptr->mflags6)
{
- if((d_ptr->mflags6 & r_ptr->flags6) != d_ptr->mflags6)
- return FALSE;
+ if((d_ptr->mflags6 & r_ptr->flags6) != d_ptr->mflags6)
+ return FALSE;
}
- if (d_ptr->mflags7)
+ if (d_ptr->mflags7)
{
- if((d_ptr->mflags7 & r_ptr->flags7) != d_ptr->mflags7)
- return FALSE;
+ if((d_ptr->mflags7 & r_ptr->flags7) != d_ptr->mflags7)
+ return FALSE;
}
- if (d_ptr->mflags8)
+ if (d_ptr->mflags8)
{
- if((d_ptr->mflags8 & r_ptr->flags8) != d_ptr->mflags8)
- return FALSE;
+ if((d_ptr->mflags8 & r_ptr->flags8) != d_ptr->mflags8)
+ return FALSE;
}
- if (d_ptr->mflags9)
+ if (d_ptr->mflags9)
{
- if((d_ptr->mflags9 & r_ptr->flags9) != d_ptr->mflags9)
- return FALSE;
+ if((d_ptr->mflags9 & r_ptr->flags9) != d_ptr->mflags9)
+ return FALSE;
}
- for(a = 0; a < 5; a++)
- if(d_ptr->r_char[a] && (d_ptr->r_char[a] != r_ptr->d_char)) return FALSE;
- }
- else if(d_ptr->mode == DUNGEON_MODE_NAND)
- {
- byte ok[9 + 5], i = 0, j = 0;
+ for(a = 0; a < 5; a++)
+ if(d_ptr->r_char[a] && (d_ptr->r_char[a] != r_ptr->d_char)) return FALSE;
+ }
+ else if(d_ptr->mode == DUNGEON_MODE_NAND)
+ {
+ byte ok[9 + 5], i = 0, j = 0;
- if (d_ptr->mflags1)
+ if (d_ptr->mflags1)
{
- i++;
- if(d_ptr->mflags1 & r_ptr->flags1)
- ok[0] = 1;
+ i++;
+ if(d_ptr->mflags1 & r_ptr->flags1)
+ ok[0] = 1;
}
- if (d_ptr->mflags2)
+ if (d_ptr->mflags2)
{
- i++;
- if(d_ptr->mflags2 & r_ptr->flags2)
- ok[1] = 1;
+ i++;
+ if(d_ptr->mflags2 & r_ptr->flags2)
+ ok[1] = 1;
}
- if (d_ptr->mflags3)
+ if (d_ptr->mflags3)
{
- i++;
- if(d_ptr->mflags3 & r_ptr->flags3)
- ok[2] = 1;
+ i++;
+ if(d_ptr->mflags3 & r_ptr->flags3)
+ ok[2] = 1;
}
- if (d_ptr->mflags4)
+ if (d_ptr->mflags4)
{
- i++;
- if(d_ptr->mflags4 & r_ptr->flags4)
- ok[3] = 1;
+ i++;
+ if(d_ptr->mflags4 & r_ptr->flags4)
+ ok[3] = 1;
}
- if (d_ptr->mflags5)
+ if (d_ptr->mflags5)
{
- i++;
- if(d_ptr->mflags5 & r_ptr->flags5)
- ok[4] = 1;
+ i++;
+ if(d_ptr->mflags5 & r_ptr->flags5)
+ ok[4] = 1;
}
- if (d_ptr->mflags6)
+ if (d_ptr->mflags6)
{
- i++;
- if(d_ptr->mflags6 & r_ptr->flags6)
- ok[5] = 1;
+ i++;
+ if(d_ptr->mflags6 & r_ptr->flags6)
+ ok[5] = 1;
}
- if (d_ptr->mflags7)
+ if (d_ptr->mflags7)
{
- i++;
- if(d_ptr->mflags7 & r_ptr->flags7)
- ok[6] = 1;
+ i++;
+ if(d_ptr->mflags7 & r_ptr->flags7)
+ ok[6] = 1;
}
- if (d_ptr->mflags8)
+ if (d_ptr->mflags8)
{
- i++;
- if(d_ptr->mflags8 & r_ptr->flags8)
- ok[7] = 1;
+ i++;
+ if(d_ptr->mflags8 & r_ptr->flags8)
+ ok[7] = 1;
}
- if (d_ptr->mflags9)
+ if (d_ptr->mflags9)
{
- i++;
- if(d_ptr->mflags9 & r_ptr->flags9)
- ok[8] = 1;
+ i++;
+ if(d_ptr->mflags9 & r_ptr->flags9)
+ ok[8] = 1;
}
- for(a = 0; a < 5; a++)
- {
- if(d_ptr->r_char[a])
- {
- i++;
- if (d_ptr->r_char[a] != r_ptr->d_char) ok[9 + a] = 1;
- }
- }
+ for(a = 0; a < 5; a++)
+ {
+ if(d_ptr->r_char[a])
+ {
+ i++;
+ if (d_ptr->r_char[a] != r_ptr->d_char) ok[9 + a] = 1;
+ }
+ }
- j = ok[0] + ok[1] + ok[2] + ok[3] + ok[4] + ok[5] + ok[6] + ok[7] + ok[8] + ok[9] + ok[10] + ok[11] + ok[12] + ok[13];
+ j = ok[0] + ok[1] + ok[2] + ok[3] + ok[4] + ok[5] + ok[6] + ok[7] + ok[8] + ok[9] + ok[10] + ok[11] + ok[12] + ok[13];
- if(i == j) return FALSE;
- }
- else if(d_ptr->mode == DUNGEON_MODE_OR)
- {
- byte ok = FALSE, i;
- s32b flag;
+ if(i == j) return FALSE;
+ }
+ else if(d_ptr->mode == DUNGEON_MODE_OR)
+ {
+ byte ok = FALSE, i;
+ s32b flag;
- for(i = 0; i < 32; i++)
- {
- flag = d_ptr->mflags1 & (1 << i);
- if(r_ptr->flags1 & flag) ok = TRUE;
+ for(i = 0; i < 32; i++)
+ {
+ flag = d_ptr->mflags1 & (1 << i);
+ if(r_ptr->flags1 & flag) ok = TRUE;
- flag = d_ptr->mflags2 & (1 << i);
- if(r_ptr->flags2 & flag) ok = TRUE;
+ flag = d_ptr->mflags2 & (1 << i);
+ if(r_ptr->flags2 & flag) ok = TRUE;
- flag = d_ptr->mflags3 & (1 << i);
- if(r_ptr->flags3 & flag) ok = TRUE;
+ flag = d_ptr->mflags3 & (1 << i);
+ if(r_ptr->flags3 & flag) ok = TRUE;
- flag = d_ptr->mflags4 & (1 << i);
- if(r_ptr->flags4 & flag) ok = TRUE;
+ flag = d_ptr->mflags4 & (1 << i);
+ if(r_ptr->flags4 & flag) ok = TRUE;
- flag = d_ptr->mflags5 & (1 << i);
- if(r_ptr->flags5 & flag) ok = TRUE;
+ flag = d_ptr->mflags5 & (1 << i);
+ if(r_ptr->flags5 & flag) ok = TRUE;
- flag = d_ptr->mflags6 & (1 << i);
- if(r_ptr->flags6 & flag) ok = TRUE;
+ flag = d_ptr->mflags6 & (1 << i);
+ if(r_ptr->flags6 & flag) ok = TRUE;
- flag = d_ptr->mflags7 & (1 << i);
- if(r_ptr->flags7 & flag) ok = TRUE;
+ flag = d_ptr->mflags7 & (1 << i);
+ if(r_ptr->flags7 & flag) ok = TRUE;
- flag = d_ptr->mflags8 & (1 << i);
- if(r_ptr->flags8 & flag) ok = TRUE;
+ flag = d_ptr->mflags8 & (1 << i);
+ if(r_ptr->flags8 & flag) ok = TRUE;
- flag = d_ptr->mflags9 & (1 << i);
- if(r_ptr->flags9 & flag) ok = TRUE;
- }
- for(a = 0; a < 5; a++)
- if(d_ptr->r_char[a] == r_ptr->d_char) ok = TRUE;
+ flag = d_ptr->mflags9 & (1 << i);
+ if(r_ptr->flags9 & flag) ok = TRUE;
+ }
+ for(a = 0; a < 5; a++)
+ if(d_ptr->r_char[a] == r_ptr->d_char) ok = TRUE;
- return ok;
- }
- else if(d_ptr->mode == DUNGEON_MODE_NOR)
- {
- byte ok = TRUE, i;
- s32b flag;
+ return ok;
+ }
+ else if(d_ptr->mode == DUNGEON_MODE_NOR)
+ {
+ byte ok = TRUE, i;
+ s32b flag;
- for(i = 0; i < 32; i++)
- {
- flag = d_ptr->mflags1 & (1 << i);
- if(r_ptr->flags1 & flag) ok = FALSE;
+ for(i = 0; i < 32; i++)
+ {
+ flag = d_ptr->mflags1 & (1 << i);
+ if(r_ptr->flags1 & flag) ok = FALSE;
- flag = d_ptr->mflags2 & (1 << i);
- if(r_ptr->flags2 & flag) ok = FALSE;
+ flag = d_ptr->mflags2 & (1 << i);
+ if(r_ptr->flags2 & flag) ok = FALSE;
- flag = d_ptr->mflags3 & (1 << i);
- if(r_ptr->flags3 & flag) ok = FALSE;
+ flag = d_ptr->mflags3 & (1 << i);
+ if(r_ptr->flags3 & flag) ok = FALSE;
- flag = d_ptr->mflags4 & (1 << i);
- if(r_ptr->flags4 & flag) ok = FALSE;
+ flag = d_ptr->mflags4 & (1 << i);
+ if(r_ptr->flags4 & flag) ok = FALSE;
- flag = d_ptr->mflags5 & (1 << i);
- if(r_ptr->flags5 & flag) ok = FALSE;
+ flag = d_ptr->mflags5 & (1 << i);
+ if(r_ptr->flags5 & flag) ok = FALSE;
- flag = d_ptr->mflags6 & (1 << i);
- if(r_ptr->flags6 & flag) ok = FALSE;
+ flag = d_ptr->mflags6 & (1 << i);
+ if(r_ptr->flags6 & flag) ok = FALSE;
- flag = d_ptr->mflags7 & (1 << i);
- if(r_ptr->flags7 & flag) ok = FALSE;
+ flag = d_ptr->mflags7 & (1 << i);
+ if(r_ptr->flags7 & flag) ok = FALSE;
- flag = d_ptr->mflags8 & (1 << i);
- if(r_ptr->flags8 & flag) ok = FALSE;
+ flag = d_ptr->mflags8 & (1 << i);
+ if(r_ptr->flags8 & flag) ok = FALSE;
- flag = d_ptr->mflags9 & (1 << i);
- if(r_ptr->flags9 & flag) ok = FALSE;
- }
- for(a = 0; a < 5; a++)
- if(d_ptr->r_char[a] == r_ptr->d_char) ok = FALSE;
- return ok;
- }
+ flag = d_ptr->mflags9 & (1 << i);
+ if(r_ptr->flags9 & flag) ok = FALSE;
+ }
+ for(a = 0; a < 5; a++)
+ if(d_ptr->r_char[a] == r_ptr->d_char) ok = FALSE;
+ return ok;
+ }
- return TRUE;
+ return TRUE;
}
/*
{
/* The monster is visible, so use its gender */
#ifdef JP
- if (r_ptr->flags1 & (RF1_FEMALE)) strcpy(desc, "Èà½÷¼«¿È");
- else if (r_ptr->flags1 & (RF1_MALE)) strcpy(desc, "È༫¿È");
- else strcpy(desc, "¤½¤ì¼«¿È");
+ if (r_ptr->flags1 & (RF1_FEMALE)) strcpy(desc, "Èà½÷¼«¿È");
+ else if (r_ptr->flags1 & (RF1_MALE)) strcpy(desc, "È༫¿È");
+ else strcpy(desc, "¤½¤ì¼«¿È");
#else
if (r_ptr->flags1 & RF1_FEMALE) strcpy(desc, "herself");
else if (r_ptr->flags1 & RF1_MALE) strcpy(desc, "himself");
monster_race *r_ptr = &r_info[m_ptr->r_idx];
- bool do_disturb = disturb_move;
+ bool do_disturb = disturb_move;
int d;
/* Seen by vision */
bool easy = FALSE;
- /* Do disturb? */
- if (disturb_high)
- {
- monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
+ /* Do disturb? */
+ if (disturb_high)
+ {
+ monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
- if (ap_r_ptr->r_tkills && ap_r_ptr->level >= p_ptr->lev)
- do_disturb = TRUE;
- }
+ if (ap_r_ptr->r_tkills && ap_r_ptr->level >= p_ptr->lev)
+ do_disturb = TRUE;
+ }
/* Compute distance */
if (full)
*/
static int initial_r_appearance(int r_idx)
{
- int attempts = 1000;
+ int attempts = 1000;
int ap_r_idx;
int min = MIN(base_level-5, 50);
cptr name = (r_name + r_ptr->name);
- /* DO NOT PLACE A MONSTER IN THE SMALL SCALE WILDERNESS !!! */
- if(p_ptr->wild_mode) return FALSE;
+ /* DO NOT PLACE A MONSTER IN THE SMALL SCALE WILDERNESS !!! */
+ if(p_ptr->wild_mode) return FALSE;
/* Verify location */
if (!in_bounds(y, x)) return (FALSE);
if (!(!dun_level && (cave[y][x].feat == FEAT_MOUNTAIN) && ((r_ptr->flags8 & RF8_WILD_MOUNTAIN) || (r_ptr->flags7 & RF7_CAN_FLY))) &&
!(cave_empty_bold2(y, x) || (mode & PM_IGNORE_TERRAIN)) &&
!((r_ptr->flags2 & RF2_PASS_WALL) &&
- !(cave_perma_bold(y, x) || cave[y][x].m_idx ||
- ((y == py) && (x == px))))) return (FALSE);
+ !(cave_perma_bold(y, x) || cave[y][x].m_idx ||
+ ((y == py) && (x == px))))) return (FALSE);
/* Paranoia */
if (!r_idx) return (FALSE);
c_ptr->info &= ~(CAVE_MARK);
/* Break the rune */
- c_ptr->info &= ~(CAVE_OBJECT);
- c_ptr->mimic = 0;
+ c_ptr->info &= ~(CAVE_OBJECT);
+ c_ptr->mimic = 0;
/* Notice */
note_spot(y, x);
c_ptr->info &= ~(CAVE_MARK);
/* Break the rune */
- c_ptr->info &= ~(CAVE_OBJECT);
- c_ptr->mimic = 0;
+ c_ptr->info &= ~(CAVE_OBJECT);
+ c_ptr->mimic = 0;
note_spot(y, x);
lite_spot(y, x);
int attempts_left = 10000;
int guardian = d_info[dungeon_type].final_guardian;
- /* Put an Guardian */
- if(guardian && d_info[dungeon_type].maxdepth == dun_level && r_info[guardian].cur_num < r_info[guardian].max_num )
- {
- int oy;
- int ox;
- int try = 4000;
-
- /* Find a good position */
- while(try)
- {
- /* Get a random spot */
- oy = randint1(cur_hgt - 4) + 2;
- 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]))
+ /* Put an Guardian */
+ if(guardian && d_info[dungeon_type].maxdepth == dun_level && r_info[guardian].cur_num < r_info[guardian].max_num )
+ {
+ int oy;
+ int ox;
+ int try = 4000;
+
+ /* Find a good position */
+ while(try)
+ {
+ /* Get a random spot */
+ oy = randint1(cur_hgt - 4) + 2;
+ 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]))
{
/* Place the guardian */
if (place_monster_aux(0, oy, ox, guardian, (PM_ALLOW_GROUP | PM_NO_KAGE | PM_NO_PET))) break;
}
- /* One less try */
- try--;
- }
+ /* One less try */
+ try--;
+ }
}
byte summon[96], summon_num = 0;
byte tactic[96], tactic_num = 0;
byte annoy[96], annoy_num = 0;
- byte invul[96], invul_num = 0;
+ byte invul[96], invul_num = 0;
byte haste[96], haste_num = 0;
byte world[96], world_num = 0;
byte special[96], special_num = 0;
break;
case MON_BANOR:
case MON_LUPART:
- break;
+ break;
default:
- if (randint0(100) < 50) success = TRUE;
- break;
+ if (randint0(100) < 50) success = TRUE;
+ break;
}
if (success) return (special[randint0(special_num)]);
}
if (!chance) return (FALSE);
- /* Only do spells occasionally */
- if (randint0(100) >= chance) return (FALSE);
+ /* Only do spells occasionally */
+ if (randint0(100) >= chance) return (FALSE);
- /* Sometimes forbid inate attacks (breaths) */
- if (randint0(100) >= (chance * 2)) no_inate = TRUE;
+ /* Sometimes forbid inate attacks (breaths) */
+ if (randint0(100) >= (chance * 2)) no_inate = TRUE;
/* XXX XXX XXX Handle "track_target" option (?) */
/* Extract the monster level */
rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
- /* Forbid inate attacks sometimes */
- if (no_inate) f4 &= 0x500000FF;
+ /* Forbid inate attacks sometimes */
+ if (no_inate) f4 &= 0x500000FF;
if (!p_ptr->csp)
{
/* No spells left */
if (!f4 && !f5 && !f6) return (FALSE);
- /* Check for a clean bolt shot */
- if (((f4 & RF4_BOLT_MASK) ||
- (f5 & RF5_BOLT_MASK) ||
- (f6 & RF6_BOLT_MASK)) &&
- !(r_ptr->flags2 & RF2_STUPID) &&
- !clean_shot(m_ptr->fy, m_ptr->fx, py, px, FALSE))
- {
- /* Remove spells that will only hurt friends */
- f4 &= ~(RF4_BOLT_MASK);
- f5 &= ~(RF5_BOLT_MASK);
- f6 &= ~(RF6_BOLT_MASK);
- }
-
- /* Check for a possible summon */
- if (((f4 & RF4_SUMMON_MASK) ||
- (f5 & RF5_SUMMON_MASK) ||
- (f6 & RF6_SUMMON_MASK)) &&
- !(r_ptr->flags2 & RF2_STUPID) &&
- !(summon_possible(y, x)))
- {
- /* Remove summoning spells */
- f4 &= ~(RF4_SUMMON_MASK);
- f5 &= ~(RF5_SUMMON_MASK);
- f6 &= ~(RF6_SUMMON_MASK);
- }
-
- /* No spells left */
- if (!f4 && !f5 && !f6) return (FALSE);
+ /* Check for a clean bolt shot */
+ if (((f4 & RF4_BOLT_MASK) ||
+ (f5 & RF5_BOLT_MASK) ||
+ (f6 & RF6_BOLT_MASK)) &&
+ !(r_ptr->flags2 & RF2_STUPID) &&
+ !clean_shot(m_ptr->fy, m_ptr->fx, py, px, FALSE))
+ {
+ /* Remove spells that will only hurt friends */
+ f4 &= ~(RF4_BOLT_MASK);
+ f5 &= ~(RF5_BOLT_MASK);
+ f6 &= ~(RF6_BOLT_MASK);
+ }
+
+ /* Check for a possible summon */
+ if (((f4 & RF4_SUMMON_MASK) ||
+ (f5 & RF5_SUMMON_MASK) ||
+ (f6 & RF6_SUMMON_MASK)) &&
+ !(r_ptr->flags2 & RF2_STUPID) &&
+ !(summon_possible(y, x)))
+ {
+ /* Remove summoning spells */
+ f4 &= ~(RF4_SUMMON_MASK);
+ f5 &= ~(RF5_SUMMON_MASK);
+ f6 &= ~(RF6_SUMMON_MASK);
+ }
+
+ /* No spells left */
+ if (!f4 && !f5 && !f6) return (FALSE);
/* Extract the "inate" spells */
for (k = 0; k < 32; k++)
/* Hack -- Get the "died from" name */
monster_desc(ddesc, m_ptr, 0x288);
- if (do_disi)
- thrown_spell = 96+31;
- else
- {
- int attempt = 10;
- while(attempt--)
- {
- thrown_spell = choose_attack_spell(m_idx, spell, num);
- if (thrown_spell) break;
- }
- }
+ if (do_disi)
+ thrown_spell = 96+31;
+ else
+ {
+ int attempt = 10;
+ while(attempt--)
+ {
+ thrown_spell = choose_attack_spell(m_idx, spell, num);
+ if (thrown_spell) break;
+ }
+ }
- /* Abort if no spell was chosen */
- if (!thrown_spell) return (FALSE);
+ /* Abort if no spell was chosen */
+ if (!thrown_spell) return (FALSE);
- /* Calculate spell failure rate */
- failrate = 25 - (rlev + 3) / 4;
+ /* Calculate spell failure rate */
+ failrate = 25 - (rlev + 3) / 4;
- /* Hack -- Stupid monsters will never fail (for jellies and such) */
- if (r_ptr->flags2 & RF2_STUPID) failrate = 0;
+ /* Hack -- Stupid monsters will never fail (for jellies and such) */
+ if (r_ptr->flags2 & RF2_STUPID) failrate = 0;
- /* Check for spell failure (inate attacks never fail) */
- if ((thrown_spell >= 128) && ((m_ptr->stunned && one_in_(2)) || (randint0(100) < failrate)))
- {
- disturb(1, 0);
- /* Message */
- if (thrown_spell != (160+7)) /* Not RF6_SPECIAL */
- {
+ /* Check for spell failure (inate attacks never fail) */
+ if ((thrown_spell >= 128) && ((m_ptr->stunned && one_in_(2)) || (randint0(100) < failrate)))
+ {
+ disturb(1, 0);
+ /* Message */
+ if (thrown_spell != (160+7)) /* Not RF6_SPECIAL */
+ {
#ifdef JP
- msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
+ msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
#else
- msg_format("%^s tries to cast a spell, but fails.", m_name);
+ msg_format("%^s tries to cast a spell, but fails.", m_name);
#endif
- }
+ }
- return (TRUE);
- }
+ return (TRUE);
+ }
/* Cast the spell. */
break;
}
- default:
- if (r_ptr->d_char == 'B')
- {
- if (!direct) break;
- disturb(1, 0);
- if (one_in_(3) || x!=px || y!=py)
- {
-#ifdef JP
- msg_format("%^s¤ÏÆÍÁ³»ë³¦¤«¤é¾Ã¤¨¤¿!", m_name);
-#else
- msg_format("%^s suddenly go out of your sight!", m_name);
-#endif
- teleport_away(m_idx, 10, FALSE);
- p_ptr->update |= (PU_MONSTERS | PU_MON_LITE);
- break;
- }
- else
- {
- int dam = damroll(4, 8);
+ default:
+ if (r_ptr->d_char == 'B')
+ {
+ if (!direct) break;
+ disturb(1, 0);
+ if (one_in_(3) || x!=px || y!=py)
+ {
+#ifdef JP
+ msg_format("%^s¤ÏÆÍÁ³»ë³¦¤«¤é¾Ã¤¨¤¿!", m_name);
+#else
+ msg_format("%^s suddenly go out of your sight!", m_name);
+#endif
+ teleport_away(m_idx, 10, FALSE);
+ p_ptr->update |= (PU_MONSTERS | PU_MON_LITE);
+ break;
+ }
+ else
+ {
+ int dam = damroll(4, 8);
int get_damage = 0;
#ifdef JP
- msg_format("%^s¤¬¤¢¤Ê¤¿¤òÄϤó¤Ç¶õÃ椫¤éÅꤲÍ¤¿¡£", m_name);
+ msg_format("%^s¤¬¤¢¤Ê¤¿¤òÄϤó¤Ç¶õÃ椫¤éÅꤲÍ¤¿¡£", m_name);
#else
- msg_format("%^s holds you, and drops from the sky.", m_name);
+ msg_format("%^s holds you, and drops from the sky.", m_name);
#endif
- teleport_player_to(m_ptr->fy, m_ptr->fx, FALSE);
+ teleport_player_to(m_ptr->fy, m_ptr->fx, FALSE);
- sound(SOUND_FALL);
+ sound(SOUND_FALL);
- if (p_ptr->ffall)
- {
+ if (p_ptr->ffall)
+ {
#ifdef JP
- msg_print("¤¢¤Ê¤¿¤ÏÀŤ«¤ËÃåÃϤ·¤¿¡£");
+ msg_print("¤¢¤Ê¤¿¤ÏÀŤ«¤ËÃåÃϤ·¤¿¡£");
#else
- msg_print("You float gently down to the ground.");
+ msg_print("You float gently down to the ground.");
#endif
- }
- else
- {
+ }
+ else
+ {
#ifdef JP
- msg_print("¤¢¤Ê¤¿¤ÏÃÏÌ̤ËᤤĤ±¤é¤ì¤¿¡£");
+ msg_print("¤¢¤Ê¤¿¤ÏÃÏÌ̤ËᤤĤ±¤é¤ì¤¿¡£");
#else
- msg_print("You crashed into the ground.");
+ msg_print("You crashed into the ground.");
#endif
- dam += damroll(6, 8);
- }
+ dam += damroll(6, 8);
+ }
/* Mega hack -- this special action deals damage to the player. Therefore the code of "eyeeye" is necessary.
-- henkma
*/
- get_damage = take_hit(DAMAGE_NOESCAPE, dam, m_name, -1);
+ get_damage = take_hit(DAMAGE_NOESCAPE, dam, m_name, -1);
if (p_ptr->tim_eyeeye && get_damage > 0 && !p_ptr->is_dead)
{
#ifdef JP
project(0, 0, m_ptr->fy, m_ptr->fx, get_damage, GF_MISSILE, PROJECT_KILL, -1);
set_tim_eyeeye(p_ptr->tim_eyeeye-5, TRUE);
}
- }
- break;
- }
+ }
+ break;
+ }
- /* Something is wrong */
- else return FALSE;
+ /* Something is wrong */
+ else return FALSE;
}
break;
}
}
}
else if(m_ptr->r_idx == MON_THORONDOR ||
- m_ptr->r_idx == MON_GWAIHIR ||
- m_ptr->r_idx == MON_MENELDOR)
- {
+ m_ptr->r_idx == MON_GWAIHIR ||
+ m_ptr->r_idx == MON_MENELDOR)
+ {
int num = 4 + randint1(3);
for (k = 0; k < num; k++)
{
count += summon_specific(m_idx, y, x, rlev, SUMMON_EAGLES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
- }
+ }
else if(m_ptr->r_idx == MON_LOUSY)
{
int num = 2 + randint1(3);
/* Prevent collateral damage */
if (!(p_ptr->pet_extra_flags & PF_BALL_SPELL) && pet && (m_idx != p_ptr->riding))
{
- int dist = distance(py, px, y, x);
+ int dist = distance(py, px, y, x);
- /* Expected breath radius */
- int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 3 : 2;
+ /* Expected breath radius */
+ int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 3 : 2;
if (dist <= 2)
{
/* Remove some spells if necessary */
- /* Check for a clean bolt shot */
- if (((f4 & RF4_BOLT_MASK) ||
- (f5 & RF5_BOLT_MASK) ||
- (f6 & RF6_BOLT_MASK)) &&
- !(r_ptr->flags2 & RF2_STUPID) &&
- !clean_shot(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, pet))
- {
- f4 &= ~(RF4_BOLT_MASK);
- f5 &= ~(RF5_BOLT_MASK);
- f6 &= ~(RF6_BOLT_MASK);
- }
-
- /* Check for a possible summon */
- if (((f4 & RF4_SUMMON_MASK) ||
- (f5 & RF5_SUMMON_MASK) ||
- (f6 & RF6_SUMMON_MASK)) &&
- !(r_ptr->flags2 & RF2_STUPID) &&
- !(summon_possible(t_ptr->fy, t_ptr->fx)))
- {
- /* Remove summoning spells */
- f4 &= ~(RF4_SUMMON_MASK);
- f5 &= ~(RF5_SUMMON_MASK);
- f6 &= ~(RF6_SUMMON_MASK);
- }
+ /* Check for a clean bolt shot */
+ if (((f4 & RF4_BOLT_MASK) ||
+ (f5 & RF5_BOLT_MASK) ||
+ (f6 & RF6_BOLT_MASK)) &&
+ !(r_ptr->flags2 & RF2_STUPID) &&
+ !clean_shot(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx, pet))
+ {
+ f4 &= ~(RF4_BOLT_MASK);
+ f5 &= ~(RF5_BOLT_MASK);
+ f6 &= ~(RF6_BOLT_MASK);
+ }
+
+ /* Check for a possible summon */
+ if (((f4 & RF4_SUMMON_MASK) ||
+ (f5 & RF5_SUMMON_MASK) ||
+ (f6 & RF6_SUMMON_MASK)) &&
+ !(r_ptr->flags2 & RF2_STUPID) &&
+ !(summon_possible(t_ptr->fy, t_ptr->fx)))
+ {
+ /* Remove summoning spells */
+ f4 &= ~(RF4_SUMMON_MASK);
+ f5 &= ~(RF5_SUMMON_MASK);
+ f6 &= ~(RF6_SUMMON_MASK);
+ }
/* Hack -- allow "desperate" spells */
if ((r_ptr->flags2 & RF2_SMART) &&
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_SHOOT);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
#ifdef JP
msg_format("¡Ö¥Ü¥©¥¨¡Á¡Á¡Á¡Á¡Á¡Á¡×");
#else
- msg_format("'Booooeeeeee'");
+ msg_format("'Booooeeeeee'");
#endif
else if (blind)
{
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
#ifdef JP
msg_format("¡Ö¥ÜÄë¥Ó¥ë¥«¥Ã¥¿¡¼¡ª¡ª¡ª¡×");
#else
- msg_format("'Boty-Build cutter!!!'");
+ msg_format("'Boty-Build cutter!!!'");
#endif
else if (blind)
{
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
sound(SOUND_BREATH);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
return FALSE;
}
- /* RF6_SPECIAL */
+ /* RF6_SPECIAL */
case 160+7:
{
int k;
}
return FALSE;
}
- default:
- if (r_ptr->d_char == 'B')
- {
- if (one_in_(3))
- {
- if (see_m)
- {
-#ifdef JP
- msg_format("%^s¤ÏÆÍÁ³µÞ¾å¾º¤·¤Æ»ë³¦¤«¤é¾Ã¤¨¤¿!", m_name);
-#else
- msg_format("%^s suddenly go out of your sight!", m_name);
-#endif
- }
- teleport_away(m_idx, 10, FALSE);
- p_ptr->update |= (PU_MONSTERS | PU_MON_LITE);
- break;
- }
- else
- {
- /* Not implemented */
- return FALSE;
- }
- break;
- }
-
- /* Something is wrong */
- else return FALSE;
- }
-
- /* done */
- break;
- }
+ default:
+ if (r_ptr->d_char == 'B')
+ {
+ if (one_in_(3))
+ {
+ if (see_m)
+ {
+#ifdef JP
+ msg_format("%^s¤ÏÆÍÁ³µÞ¾å¾º¤·¤Æ»ë³¦¤«¤é¾Ã¤¨¤¿!", m_name);
+#else
+ msg_format("%^s suddenly go out of your sight!", m_name);
+#endif
+ }
+ teleport_away(m_idx, 10, FALSE);
+ p_ptr->update |= (PU_MONSTERS | PU_MON_LITE);
+ break;
+ }
+ else
+ {
+ /* Not implemented */
+ return FALSE;
+ }
+ break;
+ }
+
+ /* Something is wrong */
+ else return FALSE;
+ }
+
+ /* done */
+ break;
+ }
/* RF6_TELE_TO */
case 160+8:
{
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
animate_dead(m_idx, m_ptr->fy, m_ptr->fx);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
count += summon_named_creature(m_idx, y, x, MON_SHURYUUDAN, p_mode);
}
}
- else if(m_ptr->r_idx == MON_THORONDOR ||
- m_ptr->r_idx == MON_GWAIHIR ||
- m_ptr->r_idx == MON_MENELDOR)
- {
- int num = 4 + randint1(3);
- for (k = 0; k < num; k++)
- {
- count += summon_specific(m_idx, y, x, rlev, SUMMON_EAGLES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | p_mode));
- }
- }
+ else if(m_ptr->r_idx == MON_THORONDOR ||
+ m_ptr->r_idx == MON_GWAIHIR ||
+ m_ptr->r_idx == MON_MENELDOR)
+ {
+ int num = 4 + randint1(3);
+ for (k = 0; k < num; k++)
+ {
+ count += summon_specific(m_idx, y, x, rlev, SUMMON_EAGLES, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | p_mode));
+ }
+ }
else if(m_ptr->r_idx == MON_LOUSY)
{
int num = 2 + randint1(3);
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
}
else
{
- mon_fight = TRUE;
+ mon_fight = TRUE;
}
}
(void)strnfmt(out_val, 78, "(%c-%c, *=List, ESC=exit) Use which %s? ",
#endif
- I2A(0), I2A(num - 1), p);
+ I2A(0), I2A(num - 1), p);
if (use_menu) screen_save();
/* Get a spell from the user */
- choice= (always_show_list || use_menu) ? ESCAPE:1 ;
- while (!flag)
- {
+ choice= (always_show_list || use_menu) ? ESCAPE:1 ;
+ while (!flag)
+ {
if(choice==ESCAPE) choice = ' ';
else if( !get_com(out_val, &choice, TRUE) )break;
/* Dump the spell --(-- */
strcat(psi_desc, format(" %-26s %3d %3d%%%s",
- spell.name, shouhimana,
- chance, comment));
+ spell.name, shouhimana,
+ chance, comment));
prt(psi_desc, y + i + 1, x);
}
/*
some races are apt to gain specified mutations
This should be allowed only if "choose_mut" is 0.
- --- henkma
+ --- henkma
*/
if(!choose_mut){
if (p_ptr->prace == RACE_VAMPIRE &&
!(p_ptr->muta2 & MUT2_HORNS) &&
(randint1(10) < 7))
{
- muta_class = &(p_ptr->muta2);
- muta_which = MUT2_HORNS;
+ muta_class = &(p_ptr->muta2);
+ muta_which = MUT2_HORNS;
#ifdef JP
muta_desc = "³Ñ¤¬³Û¤«¤éÀ¸¤¨¤Æ¤¤¿¡ª";
#else
- muta_desc = "Horns pop forth into your forehead!";
+ muta_desc = "Horns pop forth into your forehead!";
#endif
}
static int count_mutations(void)
{
return (count_bits(p_ptr->muta1) +
- count_bits(p_ptr->muta2) +
- count_bits(p_ptr->muta3));
+ count_bits(p_ptr->muta2) +
+ count_bits(p_ptr->muta3));
}
if ((o_ptr->tval > TV_CAPTURE) && o_ptr->xtra3)
{
- int add = o_ptr->xtra3 - 1;
+ int add = o_ptr->xtra3 - 1;
if (add < TR_FLAG_MAX)
{
if ((o_ptr->tval > TV_CAPTURE) && o_ptr->xtra3)
{
- int add = o_ptr->xtra3 - 1;
+ int add = o_ptr->xtra3 - 1;
if (add < TR_FLAG_MAX)
{
}
if ((o_ptr->tval > TV_CAPTURE) && o_ptr->xtra3)
- {
- switch (o_ptr->xtra3 - 1)
- {
- case ESSENCE_TMP_RES_ACID:
+ {
+ switch (o_ptr->xtra3 - 1)
+ {
+ case ESSENCE_TMP_RES_ACID:
#ifdef JP
- return "»À¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "»À¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
- return "resist acid every 50+d50 turns";
+ return "resist acid every 50+d50 turns";
#endif
- break;
+ break;
- case ESSENCE_TMP_RES_ELEC:
+ case ESSENCE_TMP_RES_ELEC:
#ifdef JP
- return "ÅÅ·â¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "ÅÅ·â¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
- return "resist elec every 50+d50 turns";
+ return "resist elec every 50+d50 turns";
#endif
- break;
+ break;
- case ESSENCE_TMP_RES_FIRE:
+ case ESSENCE_TMP_RES_FIRE:
#ifdef JP
- return "²Ð¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "²Ð¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
- return "resist fire every 50+d50 turns";
+ return "resist fire every 50+d50 turns";
#endif
- break;
+ break;
- case ESSENCE_TMP_RES_COLD:
+ case ESSENCE_TMP_RES_COLD:
#ifdef JP
- return "Î䵤¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "Î䵤¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
- return "resist cold every 50+d50 turns";
+ return "resist cold every 50+d50 turns";
#endif
- break;
+ break;
- case TR_IMPACT:
+ case TR_IMPACT:
#ifdef JP
- return "ÃÏ¿Ì : 100+d100 ¥¿¡¼¥óËè";
+ return "ÃÏ¿Ì : 100+d100 ¥¿¡¼¥óËè";
#else
- return "earthquake every 100+d100 turns";
+ return "earthquake every 100+d100 turns";
#endif
- break;
- }
+ break;
+ }
}
if (o_ptr->name2 == EGO_TRUMP)
char temp[70 * 20];
roff_to_buf(o_ptr->name1 ? (a_text + a_info[o_ptr->name1].text) :
- (k_text + k_info[lookup_kind(o_ptr->tval, o_ptr->sval)].text),
- 77 - 15, temp);
+ (k_text + k_info[lookup_kind(o_ptr->tval, o_ptr->sval)].text),
+ 77 - 15, temp);
for (j = 0; temp[j]; j += 1 + strlen(&temp[j]))
{ info[i] = &temp[j]; i++;}
}
if (o_ptr->name2 == EGO_LITE_DARKNESS)
{
#ifdef JP
- info[i++] = "¤½¤ì¤ÏÁ´¤¯¸÷¤é¤Ê¤¤¡£";
+ info[i++] = "¤½¤ì¤ÏÁ´¤¯¸÷¤é¤Ê¤¤¡£";
#else
info[i++] = "It provides no light..";
#endif
if (o_ptr->sval == SV_LITE_FEANOR ||
- o_ptr->sval == SV_LITE_LANTERN)
+ o_ptr->sval == SV_LITE_LANTERN)
{
#ifdef JP
- info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-2)¡£";
+ info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-2)¡£";
#else
info[i++] = "It decreases radius of light source by 2.";
#endif
else
{
#ifdef JP
- info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
+ info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
#else
info[i++] = "It decreases radius of light source by 1.";
#endif
strcpy(inven_spellbook_label, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
for (i = 0; i < 52; i++)
{
- char c;
- if (i < 26) c = (char)('a' + i);
- else c = (char)('A' + i - 26);
+ char c;
+ if (i < 26) c = (char)('a' + i);
+ else c = (char)('A' + i - 26);
if (get_tag(&index, c))
{
if (inven_spellbook_label[i] == c)
- inven_spellbook_label[i] = ' ';
+ inven_spellbook_label[i] = ' ';
inven_spellbook_label[index] = c;
}
}
/* Extract the maximal length (see below) */
#ifdef JP
- l = strlen(out_desc[k]) + (2 + 1);
+ l = strlen(out_desc[k]) + (2 + 1);
#else
l = strlen(out_desc[k]) + (2 + 3);
#endif
/* Increase length for labels (if needed) */
#ifdef JP
- if (show_labels) l += (7 + 2);
+ if (show_labels) l += (7 + 2);
#else
if (show_labels) l += (14 + 2);
#endif
/* Hack -- Find a column to start in */
#ifdef JP
- col = (len > wid - 6) ? 0 : (wid - len - 1);
+ col = (len > wid - 6) ? 0 : (wid - len - 1);
#else
col = (len > wid - 4) ? 0 : (wid - len - 1);
#endif
{
int wgt = o_ptr->weight * o_ptr->number;
#ifdef JP
- (void)sprintf(tmp_val, "%3d.%1d kg", lbtokg1(wgt) , lbtokg2(wgt) );
+ (void)sprintf(tmp_val, "%3d.%1d kg", lbtokg1(wgt) , lbtokg2(wgt) );
#else
(void)sprintf(tmp_val, "%3d.%d lb", wgt / 10, wgt % 10);
#endif
/* Get the item index */
if (repeat_pull(cp))
{
- if (*cp == 1111) { /* the_force */
+ if (*cp == 1111) { /* the_force */
item_tester_tval = 0;
item_tester_hook = NULL;
return (TRUE);
}
- /*
- * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
- */
- if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
+ /*
+ * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
+ */
+ if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
/* Hack -- start out in "display" mode */
if (command_see)
sprintf(tmp_val, " %c-%c,'(',')',",
#endif
- index_to_label(i1), index_to_label(i2));
+ index_to_label(i1), index_to_label(i2));
/* Append */
strcat(out_val, tmp_val);
sprintf(tmp_val, " %c-%c,'(',')',",
#endif
- index_to_label(e1), index_to_label(e2));
+ index_to_label(e1), index_to_label(e2));
/* Append */
strcat(out_val, tmp_val);
done = TRUE;
break;
}
- case 'w':
+ case 'w':
{
if (select_the_force) {
*cp = 1111;
break;
}
- case 'w':
+ case 'w':
{
if (select_the_force) {
*cp = 1111;
{
int ver;
if(select_spellbook){
- bool not_found = FALSE;
- /* Look up the tag */
- if (!get_tag(&k, which))
- {
+ bool not_found = FALSE;
+ /* Look up the tag */
+ if (!get_tag(&k, which))
+ {
not_found = TRUE;
- }
+ }
- /* Hack -- Validate the item */
- if ((k < INVEN_RARM) ? !inven : !equip)
- {
+ /* Hack -- Validate the item */
+ if ((k < INVEN_RARM) ? !inven : !equip)
+ {
not_found = TRUE;
- }
+ }
- /* Validate the item */
- if (!get_item_okay(k))
- {
+ /* Validate the item */
+ if (!get_item_okay(k))
+ {
not_found = TRUE;
- }
-
- if( !not_found ){
- /* Accept that choice */
- (*cp) = k;
- item = TRUE;
- done = TRUE;
- break;
- }
+ }
+
+ if( !not_found ){
+ /* Accept that choice */
+ (*cp) = k;
+ item = TRUE;
+ done = TRUE;
+ break;
+ }
}
/* Extract "query" setting */
/* Convert letter to inventory index */
if (!command_wrk)
{
- if (which == '(') k = i1;
- else if (which == ')') k = i2;
- else k = label_to_inven(which);
+ if (which == '(') k = i1;
+ else if (which == ')') k = i2;
+ else k = label_to_inven(which);
}
/* Convert letter to equipment index */
else
{
- if (which == '(') k = e1;
- else if (which == ')') k = e2;
+ if (which == '(') k = e1;
+ else if (which == ')') k = e2;
else k = label_to_equip(which);
}
/* Get the item index */
if (repeat_pull(cp))
{
- if (*cp == 1111) { /* the_force */
+ if (*cp == 1111) { /* the_force */
item_tester_tval = 0;
item_tester_hook = NULL;
return (TRUE);
}
}
- /*
- * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
- */
- if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
+ /*
+ * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
+ */
+ if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
/* Hack -- start out in "display" mode */
if (command_see)
sprintf(tmp_val, " %c-%c,'(',')',",
#endif
- index_to_label(i1), index_to_label(i2));
+ index_to_label(i1), index_to_label(i2));
/* Append */
strcat(out_val, tmp_val);
sprintf(tmp_val, " %c-%c,'(',')',",
#endif
- index_to_label(e1), index_to_label(e2));
+ index_to_label(e1), index_to_label(e2));
/* Append */
strcat(out_val, tmp_val);
done = TRUE;
break;
}
- case 'w':
+ case 'w':
{
if (select_the_force) {
*cp = 1111;
/* Remove the first object from the list. */
excise_object_idx(o_idx);
-
+
/* Find end of the list. */
i = c_ptr->o_idx;
while (o_list[i].next_o_idx)
i = o_list[i].next_o_idx;
-
+
/* Add after the last object. */
o_list[i].next_o_idx = o_idx;
-
+
/* Re-scan floor list */
floor_num = scan_floor(floor_list, py, px, 0x01);
}
#endif
- case 'w':
+ case 'w':
{
if (select_the_force) {
*cp = 1111;
int ver;
if(select_spellbook){
- bool not_found = FALSE;
- /* Look up the tag */
- if (!get_tag(&k, which))
- {
+ bool not_found = FALSE;
+ /* Look up the tag */
+ if (!get_tag(&k, which))
+ {
not_found = TRUE;
- }
+ }
- /* Hack -- Validate the item */
- if ((k < INVEN_RARM) ? !inven : !equip)
- {
+ /* Hack -- Validate the item */
+ if ((k < INVEN_RARM) ? !inven : !equip)
+ {
not_found = TRUE;
- }
+ }
- /* Validate the item */
- if (!get_item_okay(k))
- {
+ /* Validate the item */
+ if (!get_item_okay(k))
+ {
not_found = TRUE;
- }
-
- if( !not_found ){
- /* Accept that choice */
- (*cp) = k;
- item = TRUE;
- done = TRUE;
- break;
- }
+ }
+
+ if( !not_found ){
+ /* Accept that choice */
+ (*cp) = k;
+ item = TRUE;
+ done = TRUE;
+ break;
+ }
}
/* Extract "query" setting */
/* Convert letter to inventory index */
if (command_wrk == (USE_INVEN))
{
- if (which == '(') k = i1;
- else if (which == ')') k = i2;
+ if (which == '(') k = i1;
+ else if (which == ')') k = i2;
else k = label_to_inven(which);
}
/* Convert letter to equipment index */
else if (command_wrk == (USE_EQUIP))
{
- if (which == '(') k = e1;
- else if (which == ')') k = e2;
+ if (which == '(') k = e1;
+ else if (which == ')') k = e2;
else k = label_to_equip(which);
}
/* Convert letter to floor index */
else if (command_wrk == USE_FLOOR)
{
- if (which == '(') k = 0;
- else if (which == ')') k = floor_num - 1;
+ if (which == '(') k = 0;
+ else if (which == ')') k = floor_num - 1;
else k = islower(which) ? A2I(which) : -1;
if (k < 0 || k >= floor_num || k >= 23)
{
{
/* Message */
#ifdef JP
- msg_format(" $%ld ¤Î²ÁÃͤ¬¤¢¤ë%s¤ò¸«¤Ä¤±¤¿¡£",
- (long)o_ptr->pval, o_name);
+ msg_format(" $%ld ¤Î²ÁÃͤ¬¤¢¤ë%s¤ò¸«¤Ä¤±¤¿¡£",
+ (long)o_ptr->pval, o_name);
#else
msg_format("You have found %ld gold pieces worth of %s.",
(long) o_ptr->pval, o_name);
/* Message */
#ifdef JP
- msg_format("%s¤¬¤¢¤ë¡£", o_name);
+ msg_format("%s¤¬¤¢¤ë¡£", o_name);
#else
msg_format("You see %s.", o_name);
#endif
/* Message */
#ifdef JP
- msg_format("¥¶¥Ã¥¯¤Ë¤Ï%s¤òÆþ¤ì¤ë·ä´Ö¤¬¤Ê¤¤¡£", o_name);
+ msg_format("¥¶¥Ã¥¯¤Ë¤Ï%s¤òÆþ¤ì¤ë·ä´Ö¤¬¤Ê¤¤¡£", o_name);
#else
msg_format("You have no room for %s.", o_name);
#endif
{
/* Message */
#ifdef JP
- msg_format("¥¶¥Ã¥¯¤Ë¤Ï¾²¤Ë¤¢¤ë¤É¤Î¥¢¥¤¥Æ¥à¤âÆþ¤é¤Ê¤¤¡£", o_name);
+ msg_format("¥¶¥Ã¥¯¤Ë¤Ï¾²¤Ë¤¢¤ë¤É¤Î¥¢¥¤¥Æ¥à¤âÆþ¤é¤Ê¤¤¡£", o_name);
#else
msg_print("You have no room for any of the objects on the floor.");
#endif
}
else
{
- if ((o_ptr->tval == TV_RING) || (o_ptr->tval == TV_AMULET))
- {
- object_kind *k_ptr = &k_info[o_ptr->k_idx];
+ if ((o_ptr->tval == TV_RING) || (o_ptr->tval == TV_AMULET))
+ {
+ object_kind *k_ptr = &k_info[o_ptr->k_idx];
- for (i = 0; i < TR_FLAG_SIZE; i++)
- flgs[i] &= ~(k_ptr->flags[i]);
- }
+ for (i = 0; i < TR_FLAG_SIZE; i++)
+ flgs[i] &= ~(k_ptr->flags[i]);
+ }
if (o_ptr->name2)
{
}
else
- {
- int i;
- bool flag = FALSE;
+ {
+ int i;
+ bool flag = FALSE;
- for (i = 0; i < TR_FLAG_SIZE; i++)
- if (o_ptr->art_flags[i]) flag = TRUE;
+ for (i = 0; i < TR_FLAG_SIZE; i++)
+ if (o_ptr->art_flags[i]) flag = TRUE;
if (flag) value += flag_cost(o_ptr, o_ptr->pval);
}
static void add_esp_strong(object_type *o_ptr)
{
- switch (randint1(3))
- {
- case 1: add_flag(o_ptr->art_flags, TR_ESP_EVIL); break;
- case 2: add_flag(o_ptr->art_flags, TR_ESP_NONLIVING); break;
- case 3: add_flag(o_ptr->art_flags, TR_TELEPATHY); break;
- }
+ switch (randint1(3))
+ {
+ case 1: add_flag(o_ptr->art_flags, TR_ESP_EVIL); break;
+ case 2: add_flag(o_ptr->art_flags, TR_ESP_NONLIVING); break;
+ case 3: add_flag(o_ptr->art_flags, TR_TELEPATHY); break;
+ }
}
static void add_esp_weak(object_type *o_ptr)
{
- int idx[3];
- int n = randint1(3);
-
- idx[0] = randint1(9);
-
- idx[1] = randint1(8);
- if (idx[1] >= idx[0]) idx[1]++;
-
- idx[2] = randint1(7);
- if (idx[2] >= idx[0]) idx[2]++;
- if (idx[2] >= idx[1]) idx[2]++;
-
- while (n--) switch (idx[n])
- {
- case 1: add_flag(o_ptr->art_flags, TR_ESP_ANIMAL); break;
- case 2: add_flag(o_ptr->art_flags, TR_ESP_UNDEAD); break;
- case 3: add_flag(o_ptr->art_flags, TR_ESP_DEMON); break;
- case 4: add_flag(o_ptr->art_flags, TR_ESP_ORC); break;
- case 5: add_flag(o_ptr->art_flags, TR_ESP_TROLL); break;
- case 6: add_flag(o_ptr->art_flags, TR_ESP_GIANT); break;
- case 7: add_flag(o_ptr->art_flags, TR_ESP_DRAGON); break;
- case 8: add_flag(o_ptr->art_flags, TR_ESP_HUMAN); break;
- case 9: add_flag(o_ptr->art_flags, TR_ESP_GOOD); break;
- }
+ int idx[3];
+ int n = randint1(3);
+
+ idx[0] = randint1(9);
+
+ idx[1] = randint1(8);
+ if (idx[1] >= idx[0]) idx[1]++;
+
+ idx[2] = randint1(7);
+ if (idx[2] >= idx[0]) idx[2]++;
+ if (idx[2] >= idx[1]) idx[2]++;
+
+ while (n--) switch (idx[n])
+ {
+ case 1: add_flag(o_ptr->art_flags, TR_ESP_ANIMAL); break;
+ case 2: add_flag(o_ptr->art_flags, TR_ESP_UNDEAD); break;
+ case 3: add_flag(o_ptr->art_flags, TR_ESP_DEMON); break;
+ case 4: add_flag(o_ptr->art_flags, TR_ESP_ORC); break;
+ case 5: add_flag(o_ptr->art_flags, TR_ESP_TROLL); break;
+ case 6: add_flag(o_ptr->art_flags, TR_ESP_GIANT); break;
+ case 7: add_flag(o_ptr->art_flags, TR_ESP_DRAGON); break;
+ case 8: add_flag(o_ptr->art_flags, TR_ESP_HUMAN); break;
+ case 9: add_flag(o_ptr->art_flags, TR_ESP_GOOD); break;
+ }
}
switch (o_ptr->name2)
{
case EGO_TELEPATHY:
- add_esp_strong(o_ptr);
- add_esp_weak(o_ptr);
- break;
+ add_esp_strong(o_ptr);
+ add_esp_weak(o_ptr);
+ break;
case EGO_MAGI:
case EGO_MIGHT:
case EGO_REGENERATION:
break;
case EGO_SEEING:
if (one_in_(3))
- {
- if (one_in_(2)) add_esp_strong(o_ptr);
- else add_esp_weak(o_ptr);
- }
+ {
+ if (one_in_(2)) add_esp_strong(o_ptr);
+ else add_esp_weak(o_ptr);
+ }
break;
default:/* not existing crown (wisdom,lite, etc...) */
ok_flag = FALSE;
}
break;
- case SV_RING_WARNING:
- {
- if (one_in_(3)) one_low_esp(o_ptr);
- break;
- }
+ case SV_RING_WARNING:
+ {
+ if (one_in_(3)) one_low_esp(o_ptr);
+ break;
+ }
/* Searching */
case SV_RING_SEARCHING:
{
/* Message */
#ifdef JP
- msg_format("%s¤Ï¾Ã¤¨¤¿¡£", o_name);
+ msg_format("%s¤Ï¾Ã¤¨¤¿¡£", o_name);
#else
msg_format("The %s disappear%s.",
o_name, (plural ? "" : "s"));
(c_ptr->feat != FEAT_FLOWER) &&
(c_ptr->feat != FEAT_DEEP_GRASS) &&
(c_ptr->feat != FEAT_SHAL_LAVA) &&
- (c_ptr->feat != FEAT_TREES)) continue;
+ (c_ptr->feat != FEAT_TREES)) continue;
if (c_ptr->info & (CAVE_OBJECT)) continue;
/* No objects */
{
/* Message */
#ifdef JP
- msg_format("%s¤Ï¾Ã¤¨¤¿¡£", o_name);
+ msg_format("%s¤Ï¾Ã¤¨¤¿¡£", o_name);
#else
msg_format("The %s disappear%s.",
o_name, (plural ? "" : "s"));
{
/* Message */
#ifdef JP
- msg_format("%s¤Ï¾Ã¤¨¤¿¡£", o_name);
+ msg_format("%s¤Ï¾Ã¤¨¤¿¡£", o_name);
#else
msg_format("The %s disappear%s.",
o_name, (plural ? "" : "s"));
break;
}
- return feat;
+ return feat;
}
/*
/* Paranoia */
if (!c_ptr->mimic) return;
- /* No longer hidden */
- c_ptr->mimic = 0;
+ /* No longer hidden */
+ c_ptr->mimic = 0;
/* Notice */
note_spot(y, x);
if (!cave_naked_bold(y, x)) return;
/* Place an invisible trap */
- c_ptr->mimic = c_ptr->feat;
- c_ptr->feat = choose_random_trap();
+ c_ptr->mimic = c_ptr->feat;
+ c_ptr->feat = choose_random_trap();
}
if (!object_known_p(o_ptr)) return;
#ifdef JP
- if (o_ptr->pval <= 0)
- {
- msg_print("¤â¤¦ËâÎϤ¬»Ä¤Ã¤Æ¤¤¤Ê¤¤¡£");
- }
- else
- {
- msg_format("¤¢¤È %d ²óʬ¤ÎËâÎϤ¬»Ä¤Ã¤Æ¤¤¤ë¡£", o_ptr->pval);
- }
+ if (o_ptr->pval <= 0)
+ {
+ msg_print("¤â¤¦ËâÎϤ¬»Ä¤Ã¤Æ¤¤¤Ê¤¤¡£");
+ }
+ else
+ {
+ msg_format("¤¢¤È %d ²óʬ¤ÎËâÎϤ¬»Ä¤Ã¤Æ¤¤¤ë¡£", o_ptr->pval);
+ }
#else
/* Multiple charges */
if (o_ptr->pval != 1)
/* Print a message */
#ifdef JP
- /* "no more" ¤Î¾ì¹ç¤Ï¤³¤Á¤é¤Çɽ¼¨¤¹¤ë */
- if (o_ptr->number <= 0)
- {
- /*FIRST*//*¤³¤³¤Ï¤â¤¦Ä̤é¤Ê¤¤¤«¤â */
- msg_format("¤â¤¦%s¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¡£", o_name);
- }
- else
- {
- /* ¥¢¥¤¥Æ¥à̾¤ò±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½Âбþ */
- msg_format("¤Þ¤À %s¤ò»ý¤Ã¤Æ¤¤¤ë¡£", o_name);
- }
+ /* "no more" ¤Î¾ì¹ç¤Ï¤³¤Á¤é¤Çɽ¼¨¤¹¤ë */
+ if (o_ptr->number <= 0)
+ {
+ /*FIRST*//*¤³¤³¤Ï¤â¤¦Ä̤é¤Ê¤¤¤«¤â */
+ msg_format("¤â¤¦%s¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¡£", o_name);
+ }
+ else
+ {
+ /* ¥¢¥¤¥Æ¥à̾¤ò±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½Âбþ */
+ msg_format("¤Þ¤À %s¤ò»ý¤Ã¤Æ¤¤¤ë¡£", o_name);
+ }
#else
msg_format("You have %s.", o_name);
#endif
if (!object_known_p(o_ptr)) return;
#ifdef JP
- if (o_ptr->pval <= 0)
- {
- msg_print("¤³¤Î¾²¾å¤Î¥¢¥¤¥Æ¥à¤Ï¡¢¤â¤¦ËâÎϤ¬»Ä¤Ã¤Æ¤¤¤Ê¤¤¡£");
- }
- else
- {
- msg_format("¤³¤Î¾²¾å¤Î¥¢¥¤¥Æ¥à¤Ï¡¢¤¢¤È %d ²óʬ¤ÎËâÎϤ¬»Ä¤Ã¤Æ¤¤¤ë¡£", o_ptr->pval);
- }
+ if (o_ptr->pval <= 0)
+ {
+ msg_print("¤³¤Î¾²¾å¤Î¥¢¥¤¥Æ¥à¤Ï¡¢¤â¤¦ËâÎϤ¬»Ä¤Ã¤Æ¤¤¤Ê¤¤¡£");
+ }
+ else
+ {
+ msg_format("¤³¤Î¾²¾å¤Î¥¢¥¤¥Æ¥à¤Ï¡¢¤¢¤È %d ²óʬ¤ÎËâÎϤ¬»Ä¤Ã¤Æ¤¤¤ë¡£", o_ptr->pval);
+ }
#else
/* Multiple charges */
if (o_ptr->pval != 1)
/* Print a message */
#ifdef JP
- /* "no more" ¤Î¾ì¹ç¤Ï¤³¤Á¤é¤Çɽ¼¨¤òʬ¤±¤ë */
- if (o_ptr->number <= 0)
- {
- msg_format("¾²¾å¤Ë¤Ï¡¢¤â¤¦%s¤Ï¤Ê¤¤¡£", o_name);
- }
- else
- {
- msg_format("¾²¾å¤Ë¤Ï¡¢¤Þ¤À %s¤¬¤¢¤ë¡£", o_name);
- }
+ /* "no more" ¤Î¾ì¹ç¤Ï¤³¤Á¤é¤Çɽ¼¨¤òʬ¤±¤ë */
+ if (o_ptr->number <= 0)
+ {
+ msg_format("¾²¾å¤Ë¤Ï¡¢¤â¤¦%s¤Ï¤Ê¤¤¡£", o_name);
+ }
+ else
+ {
+ msg_format("¾²¾å¤Ë¤Ï¡¢¤Þ¤À %s¤¬¤¢¤ë¡£", o_name);
+ }
#else
msg_format("You see %s.", o_name);
#endif
/* Message */
#ifdef JP
- msg_format("%s(%c)%s¡£", o_name, index_to_label(slot), act);
+ msg_format("%s(%c)%s¡£", o_name, index_to_label(slot), act);
#else
msg_format("%s %s (%c).", act, o_name, index_to_label(slot));
#endif
#define DAMCALC(f,val,max,im,vln,res,resx,resy,op,opx,opy,dmax) \
if (f){ int dam = (val)>(max)? (max):(val); \
- if (im) dam=0; \
- if (vln) dam *= 2; \
- if (res) {dam = (dam * resx) / resy;} \
- if (op) {dam = (dam * opx) / opy;} \
- if (dam>dmax) dmax = dam; \
- }
+ if (im) dam=0; \
+ if (vln) dam *= 2; \
+ if (res) {dam = (dam * resx) / resy;} \
+ if (op) {dam = (dam * opx) / opy;} \
+ if (dam>dmax) dmax = dam; \
+ }
DAMCALC(f4 & (RF4_BR_FIRE), m_ptr->hp / 3, 1600,
p_ptr->immune_fire, p_ptr->muta3 & MUT3_VULN_ELEM,
c_ptr = &cave[yy][xx];
if (((!easy_disarm && (is_trap(c_ptr->feat) || c_ptr->feat == FEAT_INVIS))
- || (c_ptr->mimic && is_trap(c_ptr->feat))) && !one_in_(13))
+ || (c_ptr->mimic && is_trap(c_ptr->feat))) && !one_in_(13))
{
object_type *o_ptr = choose_warning_item();
#ifdef JP
static essence_type essence_info[] =
{
- {TR_STR, "ÏÓÎÏ", 4, TR_STR, 20},
- {TR_INT, "ÃÎǽ", 4, TR_INT, 20},
- {TR_WIS, "¸¤µ", 4, TR_WIS, 20},
- {TR_DEX, "´ïÍѤµ", 4, TR_DEX, 20},
- {TR_CON, "Âѵ×ÎÏ", 4, TR_CON, 20},
- {TR_CHR, "Ì¥ÎÏ", 4, TR_CHR, 20},
- {TR_MAGIC_MASTERY, "ËâÎÏ»ÙÇÛ", 4, TR_MAGIC_MASTERY, 20},
- {TR_STEALTH, "±£Ì©", 4, TR_STEALTH, 40},
- {TR_SEARCH, "õº÷", 4, TR_SEARCH, 15},
- {TR_INFRA, "ÀÖ³°Àþ»ëÎÏ", 4, TR_INFRA, 15},
- {TR_TUNNEL, "ºÎ·¡", 4, TR_TUNNEL, 15},
- {TR_SPEED, "¥¹¥Ô¡¼¥É", 4, TR_SPEED, 12},
- {TR_BLOWS, "Äɲù¶·â", 1, TR_BLOWS, 20},
- {TR_CHAOTIC, "¥«¥ª¥¹¹¶·â", 1, TR_CHAOTIC, 15},
- {TR_VAMPIRIC, "µÛ·ì¹¶·â", 1, TR_VAMPIRIC, 60},
- {TR_IMPACT, "ÃÏ¿Ìȯư", 7, TR_IMPACT, 15},
- {TR_BRAND_POIS, "ÆÇ»¦", 1, TR_BRAND_POIS, 20},
- {TR_BRAND_ACID, "Íϲò", 1, TR_BRAND_ACID, 20},
- {TR_BRAND_ELEC, "ÅÅ·â", 1, TR_BRAND_ELEC, 20},
- {TR_BRAND_FIRE, "¾Æ´þ", 1, TR_BRAND_FIRE, 20},
- {TR_BRAND_COLD, "Åà·ë", 1, TR_BRAND_COLD, 20},
- {TR_SUST_STR, "ÏÓÎÏ°Ý»ý", 3, TR_SUST_STR, 15},
- {TR_SUST_INT, "ÃÎǽ°Ý»ý", 3, TR_SUST_STR, 15},
- {TR_SUST_WIS, "¸¤µ°Ý»ý", 3, TR_SUST_STR, 15},
- {TR_SUST_DEX, "´ïÍѤµ°Ý»ý", 3, TR_SUST_STR, 15},
- {TR_SUST_CON, "Âѵ×ÎÏ°Ý»ý", 3, TR_SUST_STR, 15},
- {TR_SUST_CHR, "Ì¥ÎÏ°Ý»ý", 3, TR_SUST_STR, 15},
- {TR_IM_ACID, "»ÀÌȱÖ", 2, TR_IM_ACID, 20},
- {TR_IM_ELEC, "ÅÅ·âÌȱÖ", 2, TR_IM_ACID, 20},
- {TR_IM_FIRE, "²Ð±êÌȱÖ", 2, TR_IM_ACID, 20},
- {TR_IM_COLD, "Î䵤ÌȱÖ", 2, TR_IM_ACID, 20},
- {TR_REFLECT, "È¿¼Í", 2, TR_REFLECT, 20},
- {TR_FREE_ACT, "ËãáãÃΤ餺", 3, TR_FREE_ACT, 20},
- {TR_HOLD_LIFE, "À¸Ì¿ÎÏ°Ý»ý", 3, TR_HOLD_LIFE, 20},
- {TR_RES_ACID, "ÂÑ»À", 2, TR_RES_ACID, 15},
- {TR_RES_ELEC, "ÂÑÅÅ·â", 2, TR_RES_ELEC, 15},
- {TR_RES_FIRE, "ÂѲбê", 2, TR_RES_FIRE, 15},
- {TR_RES_COLD, "ÂÑÎ䵤", 2, TR_RES_COLD, 15},
- {TR_RES_POIS, "ÂÑÆÇ", 2, TR_RES_POIS, 25},
- {TR_RES_FEAR, "ÂѶ²ÉÝ", 2, TR_RES_FEAR, 20},
- {TR_RES_LITE, "ÂÑÁ®¸÷", 2, TR_RES_LITE, 20},
- {TR_RES_DARK, "ÂѰŹõ", 2, TR_RES_DARK, 20},
- {TR_RES_BLIND, "ÂÑÌÕÌÜ", 2, TR_RES_BLIND, 20},
- {TR_RES_CONF, "ÂѺ®Íð", 2, TR_RES_CONF, 20},
- {TR_RES_SOUND, "Âѹ첻", 2, TR_RES_SOUND, 20},
- {TR_RES_SHARDS, "ÂÑÇËÊÒ", 2, TR_RES_SHARDS, 20},
- {TR_RES_NETHER, "ÂÑÃϹö", 2, TR_RES_NETHER, 20},
- {TR_RES_NEXUS, "ÂÑ°ø²Ìº®Íð", 2, TR_RES_NEXUS, 20},
- {TR_RES_CHAOS, "ÂÑ¥«¥ª¥¹", 2, TR_RES_CHAOS, 20},
- {TR_RES_DISEN, "ÂÑÎô²½", 2, TR_RES_DISEN, 20},
- {TR_SH_FIRE, "", 0, -2, 0},
- {TR_SH_ELEC, "", 0, -2, 0},
- {TR_SH_COLD, "", 0, -2, 0},
- {TR_NO_MAGIC, "È¿ËâË¡", 3, TR_NO_MAGIC, 15},
- {TR_WARNING, "·Ù¹ð", 3, TR_WARNING, 20},
- {TR_FEATHER, "ÉâÍ·", 3, TR_FEATHER, 20},
- {TR_LITE, "±Êµ×¸÷¸»", 3, TR_LITE, 15},
- {TR_SEE_INVIS, "²Ä»ëÆ©ÌÀ", 3, TR_SEE_INVIS, 20},
- {TR_TELEPATHY, "¥Æ¥ì¥Ñ¥·¡¼", 6, TR_TELEPATHY, 15},
- {TR_SLOW_DIGEST, "Ãپò½", 3, TR_SLOW_DIGEST, 15},
- {TR_REGEN, "µÞ®²óÉü", 3, TR_REGEN, 20},
- {TR_TELEPORT, "¥Æ¥ì¥Ý¡¼¥È", 3, TR_TELEPORT, 25},
-
- {TR_SLAY_EVIL, "¼Ù°ÇÜÂÇ", 5, TR_SLAY_EVIL, 100},
- {TR_KILL_EVIL, "¼Ù°ÇÜÇÜÂÇ", 0, TR_SLAY_EVIL, 60},
- {TR_SLAY_ANIMAL, "ưʪÇÜÂÇ", 5, TR_SLAY_ANIMAL, 20},
- {TR_KILL_ANIMAL, "ưʪÇÜÇÜÂÇ", 5, TR_SLAY_ANIMAL, 60},
- {TR_SLAY_UNDEAD, "ÉÔ»àÇÜÂÇ", 5, TR_SLAY_UNDEAD, 20},
- {TR_KILL_UNDEAD, "ÉÔ»àÇÜÇÜÂÇ", 5, TR_SLAY_UNDEAD, 60},
- {TR_SLAY_DEMON, "°ËâÇÜÂÇ", 5, TR_SLAY_DEMON, 20},
- {TR_KILL_DEMON, "°ËâÇÜÇÜÂÇ", 5, TR_SLAY_DEMON, 60},
- {TR_SLAY_ORC, "¥ª¡¼¥¯ÇÜÂÇ", 5, TR_SLAY_ORC, 15},
- {TR_KILL_ORC, "¥ª¡¼¥¯ÇÜÇÜÂÇ", 5, TR_SLAY_ORC, 60},
- {TR_SLAY_TROLL, "¥È¥í¥ëÇÜÂÇ", 5, TR_SLAY_TROLL, 15},
- {TR_KILL_TROLL, "¥È¥í¥ëÇÜÇÜÂÇ", 5, TR_SLAY_TROLL, 60},
- {TR_SLAY_GIANT, "µð¿ÍÇÜÂÇ", 5, TR_SLAY_GIANT, 20},
- {TR_KILL_GIANT, "µð¿ÍÇÜÇÜÂÇ", 5, TR_SLAY_GIANT, 60},
- {TR_SLAY_DRAGON, "εÇÜÂÇ", 5, TR_SLAY_DRAGON, 20},
- {TR_KILL_DRAGON, "εÇÜÇÜÂÇ", 5, TR_SLAY_DRAGON, 60},
- {TR_SLAY_HUMAN, "¿Í´ÖÇÜÂÇ", 5, TR_SLAY_HUMAN, 20},
- {TR_KILL_HUMAN, "¿Í´ÖÇÜÇÜÂÇ", 5, TR_SLAY_HUMAN, 60},
-
- {TR_ESP_ANIMAL, "ưʪESP", 6, TR_SLAY_ANIMAL, 40},
- {TR_ESP_UNDEAD, "ÉÔ»àESP", 6, TR_SLAY_UNDEAD, 40},
- {TR_ESP_DEMON, "°ËâESP", 6, TR_SLAY_DEMON, 40},
- {TR_ESP_ORC, "¥ª¡¼¥¯ESP", 6, TR_SLAY_ORC, 40},
- {TR_ESP_TROLL, "¥È¥í¥ëESP", 6, TR_SLAY_TROLL, 40},
- {TR_ESP_GIANT, "µð¿ÍESP", 6, TR_SLAY_GIANT, 40},
- {TR_ESP_DRAGON, "εESP", 6, TR_SLAY_DRAGON, 40},
- {TR_ESP_HUMAN, "¿Í´ÖESP", 6, TR_SLAY_HUMAN, 40},
-
- {ESSENCE_ATTACK, "¹¶·â", 10, TR_ES_ATTACK, 30},
- {ESSENCE_AC, "Ëɸæ", 10, TR_ES_AC, 15},
- {ESSENCE_TMP_RES_ACID, "»ÀÂÑÀȯư", 7, TR_RES_ACID, 50},
- {ESSENCE_TMP_RES_ELEC, "ÅÅ·âÂÑÀȯư", 7, TR_RES_ELEC, 50},
- {ESSENCE_TMP_RES_FIRE, "²Ð±êÂÑÀȯư", 7, TR_RES_FIRE, 50},
- {ESSENCE_TMP_RES_COLD, "Î䵤ÂÑÀȯư", 7, TR_RES_COLD, 50},
- {ESSENCE_SH_FIRE, "²Ð±ê¥ª¡¼¥é", 7, -1, 50},
- {ESSENCE_SH_ELEC, "Åŷ⥪¡¼¥é", 7, -1, 50},
- {ESSENCE_SH_COLD, "Î䵤¥ª¡¼¥é", 7, -1, 50},
- {ESSENCE_RESISTANCE, "Á´ÂÑÀ", 2, -1, 150},
- {ESSENCE_SUSTAIN, "ÁõÈ÷ÊÝ»ý", 10, -1, 10},
- {ESSENCE_SLAY_GLOVE, "»¦Ù¤¤Î¾®¼ê", 1, TR_ES_ATTACK, 200},
-
- {-1, NULL, 0, -1, 0}
+ {TR_STR, "ÏÓÎÏ", 4, TR_STR, 20},
+ {TR_INT, "ÃÎǽ", 4, TR_INT, 20},
+ {TR_WIS, "¸¤µ", 4, TR_WIS, 20},
+ {TR_DEX, "´ïÍѤµ", 4, TR_DEX, 20},
+ {TR_CON, "Âѵ×ÎÏ", 4, TR_CON, 20},
+ {TR_CHR, "Ì¥ÎÏ", 4, TR_CHR, 20},
+ {TR_MAGIC_MASTERY, "ËâÎÏ»ÙÇÛ", 4, TR_MAGIC_MASTERY, 20},
+ {TR_STEALTH, "±£Ì©", 4, TR_STEALTH, 40},
+ {TR_SEARCH, "õº÷", 4, TR_SEARCH, 15},
+ {TR_INFRA, "ÀÖ³°Àþ»ëÎÏ", 4, TR_INFRA, 15},
+ {TR_TUNNEL, "ºÎ·¡", 4, TR_TUNNEL, 15},
+ {TR_SPEED, "¥¹¥Ô¡¼¥É", 4, TR_SPEED, 12},
+ {TR_BLOWS, "Äɲù¶·â", 1, TR_BLOWS, 20},
+ {TR_CHAOTIC, "¥«¥ª¥¹¹¶·â", 1, TR_CHAOTIC, 15},
+ {TR_VAMPIRIC, "µÛ·ì¹¶·â", 1, TR_VAMPIRIC, 60},
+ {TR_IMPACT, "ÃÏ¿Ìȯư", 7, TR_IMPACT, 15},
+ {TR_BRAND_POIS, "ÆÇ»¦", 1, TR_BRAND_POIS, 20},
+ {TR_BRAND_ACID, "Íϲò", 1, TR_BRAND_ACID, 20},
+ {TR_BRAND_ELEC, "ÅÅ·â", 1, TR_BRAND_ELEC, 20},
+ {TR_BRAND_FIRE, "¾Æ´þ", 1, TR_BRAND_FIRE, 20},
+ {TR_BRAND_COLD, "Åà·ë", 1, TR_BRAND_COLD, 20},
+ {TR_SUST_STR, "ÏÓÎÏ°Ý»ý", 3, TR_SUST_STR, 15},
+ {TR_SUST_INT, "ÃÎǽ°Ý»ý", 3, TR_SUST_STR, 15},
+ {TR_SUST_WIS, "¸¤µ°Ý»ý", 3, TR_SUST_STR, 15},
+ {TR_SUST_DEX, "´ïÍѤµ°Ý»ý", 3, TR_SUST_STR, 15},
+ {TR_SUST_CON, "Âѵ×ÎÏ°Ý»ý", 3, TR_SUST_STR, 15},
+ {TR_SUST_CHR, "Ì¥ÎÏ°Ý»ý", 3, TR_SUST_STR, 15},
+ {TR_IM_ACID, "»ÀÌȱÖ", 2, TR_IM_ACID, 20},
+ {TR_IM_ELEC, "ÅÅ·âÌȱÖ", 2, TR_IM_ACID, 20},
+ {TR_IM_FIRE, "²Ð±êÌȱÖ", 2, TR_IM_ACID, 20},
+ {TR_IM_COLD, "Î䵤ÌȱÖ", 2, TR_IM_ACID, 20},
+ {TR_REFLECT, "È¿¼Í", 2, TR_REFLECT, 20},
+ {TR_FREE_ACT, "ËãáãÃΤ餺", 3, TR_FREE_ACT, 20},
+ {TR_HOLD_LIFE, "À¸Ì¿ÎÏ°Ý»ý", 3, TR_HOLD_LIFE, 20},
+ {TR_RES_ACID, "ÂÑ»À", 2, TR_RES_ACID, 15},
+ {TR_RES_ELEC, "ÂÑÅÅ·â", 2, TR_RES_ELEC, 15},
+ {TR_RES_FIRE, "ÂѲбê", 2, TR_RES_FIRE, 15},
+ {TR_RES_COLD, "ÂÑÎ䵤", 2, TR_RES_COLD, 15},
+ {TR_RES_POIS, "ÂÑÆÇ", 2, TR_RES_POIS, 25},
+ {TR_RES_FEAR, "ÂѶ²ÉÝ", 2, TR_RES_FEAR, 20},
+ {TR_RES_LITE, "ÂÑÁ®¸÷", 2, TR_RES_LITE, 20},
+ {TR_RES_DARK, "ÂѰŹõ", 2, TR_RES_DARK, 20},
+ {TR_RES_BLIND, "ÂÑÌÕÌÜ", 2, TR_RES_BLIND, 20},
+ {TR_RES_CONF, "ÂѺ®Íð", 2, TR_RES_CONF, 20},
+ {TR_RES_SOUND, "Âѹ첻", 2, TR_RES_SOUND, 20},
+ {TR_RES_SHARDS, "ÂÑÇËÊÒ", 2, TR_RES_SHARDS, 20},
+ {TR_RES_NETHER, "ÂÑÃϹö", 2, TR_RES_NETHER, 20},
+ {TR_RES_NEXUS, "ÂÑ°ø²Ìº®Íð", 2, TR_RES_NEXUS, 20},
+ {TR_RES_CHAOS, "ÂÑ¥«¥ª¥¹", 2, TR_RES_CHAOS, 20},
+ {TR_RES_DISEN, "ÂÑÎô²½", 2, TR_RES_DISEN, 20},
+ {TR_SH_FIRE, "", 0, -2, 0},
+ {TR_SH_ELEC, "", 0, -2, 0},
+ {TR_SH_COLD, "", 0, -2, 0},
+ {TR_NO_MAGIC, "È¿ËâË¡", 3, TR_NO_MAGIC, 15},
+ {TR_WARNING, "·Ù¹ð", 3, TR_WARNING, 20},
+ {TR_FEATHER, "ÉâÍ·", 3, TR_FEATHER, 20},
+ {TR_LITE, "±Êµ×¸÷¸»", 3, TR_LITE, 15},
+ {TR_SEE_INVIS, "²Ä»ëÆ©ÌÀ", 3, TR_SEE_INVIS, 20},
+ {TR_TELEPATHY, "¥Æ¥ì¥Ñ¥·¡¼", 6, TR_TELEPATHY, 15},
+ {TR_SLOW_DIGEST, "Ãپò½", 3, TR_SLOW_DIGEST, 15},
+ {TR_REGEN, "µÞ®²óÉü", 3, TR_REGEN, 20},
+ {TR_TELEPORT, "¥Æ¥ì¥Ý¡¼¥È", 3, TR_TELEPORT, 25},
+
+ {TR_SLAY_EVIL, "¼Ù°ÇÜÂÇ", 5, TR_SLAY_EVIL, 100},
+ {TR_KILL_EVIL, "¼Ù°ÇÜÇÜÂÇ", 0, TR_SLAY_EVIL, 60},
+ {TR_SLAY_ANIMAL, "ưʪÇÜÂÇ", 5, TR_SLAY_ANIMAL, 20},
+ {TR_KILL_ANIMAL, "ưʪÇÜÇÜÂÇ", 5, TR_SLAY_ANIMAL, 60},
+ {TR_SLAY_UNDEAD, "ÉÔ»àÇÜÂÇ", 5, TR_SLAY_UNDEAD, 20},
+ {TR_KILL_UNDEAD, "ÉÔ»àÇÜÇÜÂÇ", 5, TR_SLAY_UNDEAD, 60},
+ {TR_SLAY_DEMON, "°ËâÇÜÂÇ", 5, TR_SLAY_DEMON, 20},
+ {TR_KILL_DEMON, "°ËâÇÜÇÜÂÇ", 5, TR_SLAY_DEMON, 60},
+ {TR_SLAY_ORC, "¥ª¡¼¥¯ÇÜÂÇ", 5, TR_SLAY_ORC, 15},
+ {TR_KILL_ORC, "¥ª¡¼¥¯ÇÜÇÜÂÇ", 5, TR_SLAY_ORC, 60},
+ {TR_SLAY_TROLL, "¥È¥í¥ëÇÜÂÇ", 5, TR_SLAY_TROLL, 15},
+ {TR_KILL_TROLL, "¥È¥í¥ëÇÜÇÜÂÇ", 5, TR_SLAY_TROLL, 60},
+ {TR_SLAY_GIANT, "µð¿ÍÇÜÂÇ", 5, TR_SLAY_GIANT, 20},
+ {TR_KILL_GIANT, "µð¿ÍÇÜÇÜÂÇ", 5, TR_SLAY_GIANT, 60},
+ {TR_SLAY_DRAGON, "εÇÜÂÇ", 5, TR_SLAY_DRAGON, 20},
+ {TR_KILL_DRAGON, "εÇÜÇÜÂÇ", 5, TR_SLAY_DRAGON, 60},
+ {TR_SLAY_HUMAN, "¿Í´ÖÇÜÂÇ", 5, TR_SLAY_HUMAN, 20},
+ {TR_KILL_HUMAN, "¿Í´ÖÇÜÇÜÂÇ", 5, TR_SLAY_HUMAN, 60},
+
+ {TR_ESP_ANIMAL, "ưʪESP", 6, TR_SLAY_ANIMAL, 40},
+ {TR_ESP_UNDEAD, "ÉÔ»àESP", 6, TR_SLAY_UNDEAD, 40},
+ {TR_ESP_DEMON, "°ËâESP", 6, TR_SLAY_DEMON, 40},
+ {TR_ESP_ORC, "¥ª¡¼¥¯ESP", 6, TR_SLAY_ORC, 40},
+ {TR_ESP_TROLL, "¥È¥í¥ëESP", 6, TR_SLAY_TROLL, 40},
+ {TR_ESP_GIANT, "µð¿ÍESP", 6, TR_SLAY_GIANT, 40},
+ {TR_ESP_DRAGON, "εESP", 6, TR_SLAY_DRAGON, 40},
+ {TR_ESP_HUMAN, "¿Í´ÖESP", 6, TR_SLAY_HUMAN, 40},
+
+ {ESSENCE_ATTACK, "¹¶·â", 10, TR_ES_ATTACK, 30},
+ {ESSENCE_AC, "Ëɸæ", 10, TR_ES_AC, 15},
+ {ESSENCE_TMP_RES_ACID, "»ÀÂÑÀȯư", 7, TR_RES_ACID, 50},
+ {ESSENCE_TMP_RES_ELEC, "ÅÅ·âÂÑÀȯư", 7, TR_RES_ELEC, 50},
+ {ESSENCE_TMP_RES_FIRE, "²Ð±êÂÑÀȯư", 7, TR_RES_FIRE, 50},
+ {ESSENCE_TMP_RES_COLD, "Î䵤ÂÑÀȯư", 7, TR_RES_COLD, 50},
+ {ESSENCE_SH_FIRE, "²Ð±ê¥ª¡¼¥é", 7, -1, 50},
+ {ESSENCE_SH_ELEC, "Åŷ⥪¡¼¥é", 7, -1, 50},
+ {ESSENCE_SH_COLD, "Î䵤¥ª¡¼¥é", 7, -1, 50},
+ {ESSENCE_RESISTANCE, "Á´ÂÑÀ", 2, -1, 150},
+ {ESSENCE_SUSTAIN, "ÁõÈ÷ÊÝ»ý", 10, -1, 10},
+ {ESSENCE_SLAY_GLOVE, "»¦Ù¤¤Î¾®¼ê", 1, TR_ES_ATTACK, 200},
+
+ {-1, NULL, 0, -1, 0}
};
#else
static essence_type essence_info[] =
{
- {TR_STR, "strength", 4, TR_STR, 20},
- {TR_INT, "intelligence", 4, TR_INT, 20},
- {TR_WIS, "wisdom", 4, TR_WIS, 20},
- {TR_DEX, "dexterity", 4, TR_DEX, 20},
- {TR_CON, "constitution", 4, TR_CON, 20},
- {TR_CHR, "charisma", 4, TR_CHR, 20},
- {TR_MAGIC_MASTERY, "magic mastery", 4, TR_MAGIC_MASTERY, 20},
- {TR_STEALTH, "stealth", 4, TR_STEALTH, 40},
- {TR_SEARCH, "serching", 4, TR_SEARCH, 15},
- {TR_INFRA, "inflavision", 4, TR_INFRA, 15},
- {TR_TUNNEL, "digging", 4, TR_TUNNEL, 15},
- {TR_SPEED, "speed", 4, TR_SPEED, 12},
- {TR_BLOWS, "extra attack", 1, TR_BLOWS, 20},
- {TR_CHAOTIC, "chaos brand", 1, TR_CHAOTIC, 15},
- {TR_VAMPIRIC, "vampiric brand", 1, TR_VAMPIRIC, 60},
- {TR_IMPACT, "quake activation", 7, TR_IMPACT, 15},
- {TR_BRAND_POIS, "poison brand", 1, TR_BRAND_POIS, 20},
- {TR_BRAND_ACID, "acid brand", 1, TR_BRAND_ACID, 20},
- {TR_BRAND_ELEC, "electric brand", 1, TR_BRAND_ELEC, 20},
- {TR_BRAND_FIRE, "fire brand", 1, TR_BRAND_FIRE, 20},
- {TR_BRAND_COLD, "cold brand", 1, TR_BRAND_COLD, 20},
- {TR_SUST_STR, "sustain strength", 3, TR_SUST_STR, 15},
- {TR_SUST_INT, "sustain intelligence", 3, TR_SUST_STR, 15},
- {TR_SUST_WIS, "sustain wisdom", 3, TR_SUST_STR, 15},
- {TR_SUST_DEX, "sustain dexterity", 3, TR_SUST_STR, 15},
- {TR_SUST_CON, "sustain constitution", 3, TR_SUST_STR, 15},
- {TR_SUST_CHR, "sustain charisma", 3, TR_SUST_STR, 15},
- {TR_IM_ACID, "acid immunity", 2, TR_IM_ACID, 20},
- {TR_IM_ELEC, "electric immunity", 2, TR_IM_ACID, 20},
- {TR_IM_FIRE, "fire immunity", 2, TR_IM_ACID, 20},
- {TR_IM_COLD, "cold immunity", 2, TR_IM_ACID, 20},
- {TR_REFLECT, "reflection", 2, TR_REFLECT, 20},
- {TR_FREE_ACT, "free action", 3, TR_FREE_ACT, 20},
- {TR_HOLD_LIFE, "hold life", 3, TR_HOLD_LIFE, 20},
- {TR_RES_ACID, "resistance to acid", 2, TR_RES_ACID, 15},
- {TR_RES_ELEC, "resistance to electric", 2, TR_RES_ELEC, 15},
- {TR_RES_FIRE, "resistance to fire", 2, TR_RES_FIRE, 15},
- {TR_RES_COLD, "resistance to cold", 2, TR_RES_COLD, 15},
- {TR_RES_POIS, "resistance to poison", 2, TR_RES_POIS, 25},
- {TR_RES_FEAR, "resistance to fear", 2, TR_RES_FEAR, 20},
- {TR_RES_LITE, "resistance to light", 2, TR_RES_LITE, 20},
- {TR_RES_DARK, "resistance to dark", 2, TR_RES_DARK, 20},
- {TR_RES_BLIND, "resistance to blind", 2, TR_RES_BLIND, 20},
- {TR_RES_CONF, "resistance to confusion", 2, TR_RES_CONF, 20},
- {TR_RES_SOUND, "resistance to sound", 2, TR_RES_SOUND, 20},
- {TR_RES_SHARDS, "resistance to shard", 2, TR_RES_SHARDS, 20},
- {TR_RES_NETHER, "resistance to nether", 2, TR_RES_NETHER, 20},
- {TR_RES_NEXUS, "resistance to nexus", 2, TR_RES_NEXUS, 20},
- {TR_RES_CHAOS, "resistance to chaos", 2, TR_RES_CHAOS, 20},
- {TR_RES_DISEN, "resistance to disenchantment", 2, TR_RES_DISEN, 20},
- {TR_SH_FIRE, "", 0, -2, 0},
- {TR_SH_ELEC, "", 0, -2, 0},
- {TR_SH_COLD, "", 0, -2, 0},
- {TR_NO_MAGIC, "anti magic", 3, TR_NO_MAGIC, 15},
- {TR_WARNING, "warning", 3, TR_WARNING, 20},
- {TR_FEATHER, "levitation", 3, TR_FEATHER, 20},
- {TR_LITE, "permanent light", 3, TR_LITE, 15},
- {TR_SEE_INVIS, "see invisible", 3, TR_SEE_INVIS, 20},
- {TR_TELEPATHY, "telepathy", 6, TR_TELEPATHY, 15},
- {TR_SLOW_DIGEST, "slow digestion", 3, TR_SLOW_DIGEST, 15},
- {TR_REGEN, "regeneration", 3, TR_REGEN, 20},
- {TR_TELEPORT, "teleport", 3, TR_TELEPORT, 25},
-
- {TR_SLAY_EVIL, "slay evil", 5, TR_SLAY_EVIL, 100},
- {TR_SLAY_ANIMAL, "slay animal", 5, TR_SLAY_ANIMAL, 20},
- {TR_KILL_ANIMAL, "kill animal", 5, TR_SLAY_ANIMAL, 60},
- {TR_KILL_EVIL, "kill evil", 0, TR_SLAY_EVIL, 60},
- {TR_SLAY_UNDEAD, "slay undead", 5, TR_SLAY_UNDEAD, 20},
- {TR_KILL_UNDEAD, "kill undead", 5, TR_SLAY_UNDEAD, 60},
- {TR_SLAY_DEMON, "slay demon", 5, TR_SLAY_DEMON, 20},
- {TR_KILL_DEMON, "kill demon", 5, TR_SLAY_DEMON, 60},
- {TR_SLAY_ORC, "slay orc", 5, TR_SLAY_ORC, 15},
- {TR_KILL_ORC, "kill orc", 5, TR_SLAY_ORC, 60},
- {TR_SLAY_TROLL, "slay troll", 5, TR_SLAY_TROLL, 15},
- {TR_KILL_TROLL, "kill troll", 5, TR_SLAY_TROLL, 60},
- {TR_SLAY_GIANT, "slay giant", 5, TR_SLAY_GIANT, 20},
- {TR_KILL_GIANT, "kill giant", 5, TR_SLAY_GIANT, 60},
- {TR_SLAY_DRAGON, "slay dragon", 5, TR_SLAY_DRAGON, 20},
- {TR_KILL_DRAGON, "kill dragon", 5, TR_SLAY_DRAGON, 60},
- {TR_SLAY_HUMAN, "slay human", 5, TR_SLAY_HUMAN, 20},
- {TR_KILL_HUMAN, "kill human", 5, TR_SLAY_HUMAN, 60},
-
- {TR_ESP_ANIMAL, "sense animal", 6, TR_SLAY_ANIMAL, 40},
- {TR_ESP_UNDEAD, "sense undead", 6, TR_SLAY_UNDEAD, 40},
- {TR_ESP_DEMON, "sense demon", 6, TR_SLAY_DEMON, 40},
- {TR_ESP_ORC, "sense orc", 6, TR_SLAY_ORC, 40},
- {TR_ESP_TROLL, "sense troll", 6, TR_SLAY_TROLL, 40},
- {TR_ESP_GIANT, "sense giant", 6, TR_SLAY_GIANT, 40},
- {TR_ESP_DRAGON, "sense dragon", 6, TR_SLAY_DRAGON, 40},
- {TR_ESP_HUMAN, "sense human", 6, TR_SLAY_HUMAN, 40},
-
- {ESSENCE_ATTACK, "weapon enchant", 10, TR_ES_ATTACK, 30},
- {ESSENCE_AC, "armor enchant", 10, TR_ES_AC, 15},
- {ESSENCE_TMP_RES_ACID, "resist acid activation", 7, TR_RES_ACID, 50},
- {ESSENCE_TMP_RES_ELEC, "resist electricity activation", 7, TR_RES_ELEC, 50},
- {ESSENCE_TMP_RES_FIRE, "resist fire activation", 7, TR_RES_FIRE, 50},
- {ESSENCE_TMP_RES_COLD, "resist cold activation", 7, TR_RES_COLD, 50},
- {ESSENCE_SH_FIRE, "fiery sheath", 7, -1, 50},
- {ESSENCE_SH_ELEC, "electric sheath", 7, -1, 50},
- {ESSENCE_SH_COLD, "sheath of coldness", 7, -1, 50},
- {ESSENCE_RESISTANCE, "resistance", 2, -1, 150},
- {ESSENCE_SUSTAIN, "elements proof", 10, -1, 10},
- {ESSENCE_SLAY_GLOVE, "gauntlets of slaying", 1, TR_ES_ATTACK, 200},
-
- {-1, NULL, 0, -1, 0}
+ {TR_STR, "strength", 4, TR_STR, 20},
+ {TR_INT, "intelligence", 4, TR_INT, 20},
+ {TR_WIS, "wisdom", 4, TR_WIS, 20},
+ {TR_DEX, "dexterity", 4, TR_DEX, 20},
+ {TR_CON, "constitution", 4, TR_CON, 20},
+ {TR_CHR, "charisma", 4, TR_CHR, 20},
+ {TR_MAGIC_MASTERY, "magic mastery", 4, TR_MAGIC_MASTERY, 20},
+ {TR_STEALTH, "stealth", 4, TR_STEALTH, 40},
+ {TR_SEARCH, "serching", 4, TR_SEARCH, 15},
+ {TR_INFRA, "inflavision", 4, TR_INFRA, 15},
+ {TR_TUNNEL, "digging", 4, TR_TUNNEL, 15},
+ {TR_SPEED, "speed", 4, TR_SPEED, 12},
+ {TR_BLOWS, "extra attack", 1, TR_BLOWS, 20},
+ {TR_CHAOTIC, "chaos brand", 1, TR_CHAOTIC, 15},
+ {TR_VAMPIRIC, "vampiric brand", 1, TR_VAMPIRIC, 60},
+ {TR_IMPACT, "quake activation", 7, TR_IMPACT, 15},
+ {TR_BRAND_POIS, "poison brand", 1, TR_BRAND_POIS, 20},
+ {TR_BRAND_ACID, "acid brand", 1, TR_BRAND_ACID, 20},
+ {TR_BRAND_ELEC, "electric brand", 1, TR_BRAND_ELEC, 20},
+ {TR_BRAND_FIRE, "fire brand", 1, TR_BRAND_FIRE, 20},
+ {TR_BRAND_COLD, "cold brand", 1, TR_BRAND_COLD, 20},
+ {TR_SUST_STR, "sustain strength", 3, TR_SUST_STR, 15},
+ {TR_SUST_INT, "sustain intelligence", 3, TR_SUST_STR, 15},
+ {TR_SUST_WIS, "sustain wisdom", 3, TR_SUST_STR, 15},
+ {TR_SUST_DEX, "sustain dexterity", 3, TR_SUST_STR, 15},
+ {TR_SUST_CON, "sustain constitution", 3, TR_SUST_STR, 15},
+ {TR_SUST_CHR, "sustain charisma", 3, TR_SUST_STR, 15},
+ {TR_IM_ACID, "acid immunity", 2, TR_IM_ACID, 20},
+ {TR_IM_ELEC, "electric immunity", 2, TR_IM_ACID, 20},
+ {TR_IM_FIRE, "fire immunity", 2, TR_IM_ACID, 20},
+ {TR_IM_COLD, "cold immunity", 2, TR_IM_ACID, 20},
+ {TR_REFLECT, "reflection", 2, TR_REFLECT, 20},
+ {TR_FREE_ACT, "free action", 3, TR_FREE_ACT, 20},
+ {TR_HOLD_LIFE, "hold life", 3, TR_HOLD_LIFE, 20},
+ {TR_RES_ACID, "resistance to acid", 2, TR_RES_ACID, 15},
+ {TR_RES_ELEC, "resistance to electric", 2, TR_RES_ELEC, 15},
+ {TR_RES_FIRE, "resistance to fire", 2, TR_RES_FIRE, 15},
+ {TR_RES_COLD, "resistance to cold", 2, TR_RES_COLD, 15},
+ {TR_RES_POIS, "resistance to poison", 2, TR_RES_POIS, 25},
+ {TR_RES_FEAR, "resistance to fear", 2, TR_RES_FEAR, 20},
+ {TR_RES_LITE, "resistance to light", 2, TR_RES_LITE, 20},
+ {TR_RES_DARK, "resistance to dark", 2, TR_RES_DARK, 20},
+ {TR_RES_BLIND, "resistance to blind", 2, TR_RES_BLIND, 20},
+ {TR_RES_CONF, "resistance to confusion", 2, TR_RES_CONF, 20},
+ {TR_RES_SOUND, "resistance to sound", 2, TR_RES_SOUND, 20},
+ {TR_RES_SHARDS, "resistance to shard", 2, TR_RES_SHARDS, 20},
+ {TR_RES_NETHER, "resistance to nether", 2, TR_RES_NETHER, 20},
+ {TR_RES_NEXUS, "resistance to nexus", 2, TR_RES_NEXUS, 20},
+ {TR_RES_CHAOS, "resistance to chaos", 2, TR_RES_CHAOS, 20},
+ {TR_RES_DISEN, "resistance to disenchantment", 2, TR_RES_DISEN, 20},
+ {TR_SH_FIRE, "", 0, -2, 0},
+ {TR_SH_ELEC, "", 0, -2, 0},
+ {TR_SH_COLD, "", 0, -2, 0},
+ {TR_NO_MAGIC, "anti magic", 3, TR_NO_MAGIC, 15},
+ {TR_WARNING, "warning", 3, TR_WARNING, 20},
+ {TR_FEATHER, "levitation", 3, TR_FEATHER, 20},
+ {TR_LITE, "permanent light", 3, TR_LITE, 15},
+ {TR_SEE_INVIS, "see invisible", 3, TR_SEE_INVIS, 20},
+ {TR_TELEPATHY, "telepathy", 6, TR_TELEPATHY, 15},
+ {TR_SLOW_DIGEST, "slow digestion", 3, TR_SLOW_DIGEST, 15},
+ {TR_REGEN, "regeneration", 3, TR_REGEN, 20},
+ {TR_TELEPORT, "teleport", 3, TR_TELEPORT, 25},
+
+ {TR_SLAY_EVIL, "slay evil", 5, TR_SLAY_EVIL, 100},
+ {TR_SLAY_ANIMAL, "slay animal", 5, TR_SLAY_ANIMAL, 20},
+ {TR_KILL_ANIMAL, "kill animal", 5, TR_SLAY_ANIMAL, 60},
+ {TR_KILL_EVIL, "kill evil", 0, TR_SLAY_EVIL, 60},
+ {TR_SLAY_UNDEAD, "slay undead", 5, TR_SLAY_UNDEAD, 20},
+ {TR_KILL_UNDEAD, "kill undead", 5, TR_SLAY_UNDEAD, 60},
+ {TR_SLAY_DEMON, "slay demon", 5, TR_SLAY_DEMON, 20},
+ {TR_KILL_DEMON, "kill demon", 5, TR_SLAY_DEMON, 60},
+ {TR_SLAY_ORC, "slay orc", 5, TR_SLAY_ORC, 15},
+ {TR_KILL_ORC, "kill orc", 5, TR_SLAY_ORC, 60},
+ {TR_SLAY_TROLL, "slay troll", 5, TR_SLAY_TROLL, 15},
+ {TR_KILL_TROLL, "kill troll", 5, TR_SLAY_TROLL, 60},
+ {TR_SLAY_GIANT, "slay giant", 5, TR_SLAY_GIANT, 20},
+ {TR_KILL_GIANT, "kill giant", 5, TR_SLAY_GIANT, 60},
+ {TR_SLAY_DRAGON, "slay dragon", 5, TR_SLAY_DRAGON, 20},
+ {TR_KILL_DRAGON, "kill dragon", 5, TR_SLAY_DRAGON, 60},
+ {TR_SLAY_HUMAN, "slay human", 5, TR_SLAY_HUMAN, 20},
+ {TR_KILL_HUMAN, "kill human", 5, TR_SLAY_HUMAN, 60},
+
+ {TR_ESP_ANIMAL, "sense animal", 6, TR_SLAY_ANIMAL, 40},
+ {TR_ESP_UNDEAD, "sense undead", 6, TR_SLAY_UNDEAD, 40},
+ {TR_ESP_DEMON, "sense demon", 6, TR_SLAY_DEMON, 40},
+ {TR_ESP_ORC, "sense orc", 6, TR_SLAY_ORC, 40},
+ {TR_ESP_TROLL, "sense troll", 6, TR_SLAY_TROLL, 40},
+ {TR_ESP_GIANT, "sense giant", 6, TR_SLAY_GIANT, 40},
+ {TR_ESP_DRAGON, "sense dragon", 6, TR_SLAY_DRAGON, 40},
+ {TR_ESP_HUMAN, "sense human", 6, TR_SLAY_HUMAN, 40},
+
+ {ESSENCE_ATTACK, "weapon enchant", 10, TR_ES_ATTACK, 30},
+ {ESSENCE_AC, "armor enchant", 10, TR_ES_AC, 15},
+ {ESSENCE_TMP_RES_ACID, "resist acid activation", 7, TR_RES_ACID, 50},
+ {ESSENCE_TMP_RES_ELEC, "resist electricity activation", 7, TR_RES_ELEC, 50},
+ {ESSENCE_TMP_RES_FIRE, "resist fire activation", 7, TR_RES_FIRE, 50},
+ {ESSENCE_TMP_RES_COLD, "resist cold activation", 7, TR_RES_COLD, 50},
+ {ESSENCE_SH_FIRE, "fiery sheath", 7, -1, 50},
+ {ESSENCE_SH_ELEC, "electric sheath", 7, -1, 50},
+ {ESSENCE_SH_COLD, "sheath of coldness", 7, -1, 50},
+ {ESSENCE_RESISTANCE, "resistance", 2, -1, 150},
+ {ESSENCE_SUSTAIN, "elements proof", 10, -1, 10},
+ {ESSENCE_SLAY_GLOVE, "gauntlets of slaying", 1, TR_ES_ATTACK, 200},
+
+ {-1, NULL, 0, -1, 0}
};
#endif
#ifdef JP
static cptr essence_name[] =
{
- "ÏÓÎÏ",
- "ÃÎǽ",
- "¸¤µ",
- "´ïÍѤµ",
- "Âѵ×ÎÏ",
- "Ì¥ÎÏ",
- "ËâÎÏ»ÙÇÛ",
- "",
- "±£Ì©",
- "õº÷",
- "ÀÖ³°Àþ»ëÎÏ",
- "ºÎ·¡",
- "¥¹¥Ô¡¼¥É",
- "Äɲù¶·â",
- "¥«¥ª¥¹¹¶·â",
- "µÛ·ì¹¶·â",
- "ưʪÇÜÂÇ",
- "¼Ù°ÇÜÂÇ",
- "ÉÔ»àÇÜÂÇ",
- "°ËâÇÜÂÇ",
- "¥ª¡¼¥¯ÇÜÂÇ",
- "¥È¥í¥ëÇÜÂÇ",
- "µð¿ÍÇÜÂÇ",
- "εÇÜÂÇ",
- "",
- "",
- "ÃÏ¿Ì",
- "ÆÇ»¦",
- "Íϲò",
- "ÅÅ·â",
- "¾Æ´þ",
- "Åà·ë",
- "ǽÎÏ°Ý»ý",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "ÌȱÖ",
- "",
- "",
- "",
- "",
- "È¿¼Í",
- "ËãáãÃΤ餺",
- "À¸Ì¿ÎÏ°Ý»ý",
- "ÂÑ»À",
- "ÂÑÅÅ·â",
- "ÂѲбê",
- "ÂÑÎ䵤",
- "ÂÑÆÇ",
- "ÂѶ²ÉÝ",
- "ÂÑÁ®¸÷",
- "ÂѰŹõ",
- "ÂÑÌÕÌÜ",
- "ÂѺ®Íð",
- "Âѹ첻",
- "ÂÑÇËÊÒ",
- "ÂÑÃϹö",
- "ÂÑ°ø²Ìº®Íð",
- "ÂÑ¥«¥ª¥¹",
- "ÂÑÎô²½",
- "",
- "",
- "¿Í´ÖÇÜÂÇ",
- "",
- "",
- "È¿ËâË¡",
- "",
- "",
- "·Ù¹ð",
- "",
- "",
- "",
- "ÉâÍ·",
- "±Êµ×¸÷¸»",
- "²Ä»ëÆ©ÌÀ",
- "¥Æ¥ì¥Ñ¥·¡¼",
- "Ãپò½",
- "µÞ®²óÉü",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "¥Æ¥ì¥Ý¡¼¥È",
- "",
- "",
- "¹¶·â",
- "Ëɸæ",
-
- NULL
+ "ÏÓÎÏ",
+ "ÃÎǽ",
+ "¸¤µ",
+ "´ïÍѤµ",
+ "Âѵ×ÎÏ",
+ "Ì¥ÎÏ",
+ "ËâÎÏ»ÙÇÛ",
+ "",
+ "±£Ì©",
+ "õº÷",
+ "ÀÖ³°Àþ»ëÎÏ",
+ "ºÎ·¡",
+ "¥¹¥Ô¡¼¥É",
+ "Äɲù¶·â",
+ "¥«¥ª¥¹¹¶·â",
+ "µÛ·ì¹¶·â",
+ "ưʪÇÜÂÇ",
+ "¼Ù°ÇÜÂÇ",
+ "ÉÔ»àÇÜÂÇ",
+ "°ËâÇÜÂÇ",
+ "¥ª¡¼¥¯ÇÜÂÇ",
+ "¥È¥í¥ëÇÜÂÇ",
+ "µð¿ÍÇÜÂÇ",
+ "εÇÜÂÇ",
+ "",
+ "",
+ "ÃÏ¿Ì",
+ "ÆÇ»¦",
+ "Íϲò",
+ "ÅÅ·â",
+ "¾Æ´þ",
+ "Åà·ë",
+ "ǽÎÏ°Ý»ý",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "ÌȱÖ",
+ "",
+ "",
+ "",
+ "",
+ "È¿¼Í",
+ "ËãáãÃΤ餺",
+ "À¸Ì¿ÎÏ°Ý»ý",
+ "ÂÑ»À",
+ "ÂÑÅÅ·â",
+ "ÂѲбê",
+ "ÂÑÎ䵤",
+ "ÂÑÆÇ",
+ "ÂѶ²ÉÝ",
+ "ÂÑÁ®¸÷",
+ "ÂѰŹõ",
+ "ÂÑÌÕÌÜ",
+ "ÂѺ®Íð",
+ "Âѹ첻",
+ "ÂÑÇËÊÒ",
+ "ÂÑÃϹö",
+ "ÂÑ°ø²Ìº®Íð",
+ "ÂÑ¥«¥ª¥¹",
+ "ÂÑÎô²½",
+ "",
+ "",
+ "¿Í´ÖÇÜÂÇ",
+ "",
+ "",
+ "È¿ËâË¡",
+ "",
+ "",
+ "·Ù¹ð",
+ "",
+ "",
+ "",
+ "ÉâÍ·",
+ "±Êµ×¸÷¸»",
+ "²Ä»ëÆ©ÌÀ",
+ "¥Æ¥ì¥Ñ¥·¡¼",
+ "Ãپò½",
+ "µÞ®²óÉü",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "¥Æ¥ì¥Ý¡¼¥È",
+ "",
+ "",
+ "¹¶·â",
+ "Ëɸæ",
+
+ NULL
};
#else
static cptr essence_name[] =
{
- "strength",
- "intelligen.",
- "wisdom",
- "dexterity",
- "constitut.",
- "charisma",
- "magic mast.",
- "",
- "stealth",
- "serching",
- "inflavision",
- "digging",
- "speed",
- "extra atk",
- "chaos brand",
- "vampiric",
- "slay animal",
- "slay evil",
- "slay undead",
- "slay demon",
- "slay orc",
- "slay troll",
- "slay giant",
- "slay dragon",
- "",
- "",
- "quake",
- "pois. brand",
- "acid brand",
- "elec. brand",
- "fire brand",
- "cold brand",
- "sustain",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "immunity",
- "",
- "",
- "",
- "",
- "reflection",
- "free action",
- "hold life",
- "res. acid",
- "res. elec.",
- "res. fire",
- "res. cold",
- "res. poison",
- "res. fear",
- "res. light",
- "res. dark",
- "res. blind",
- "res.confuse",
- "res. sound",
- "res. shard",
- "res. nether",
- "res. nexus",
- "res. chaos",
- "res. disen.",
- "",
- "",
- "slay human",
- "",
- "",
- "anti magic",
- "",
- "",
- "warning",
- "",
- "",
- "",
- "levitation",
- "perm. light",
- "see invis.",
- "telepathy",
- "slow dige.",
- "regen.",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "teleport",
- "",
- "",
- "weapon enc.",
- "armor enc.",
-
- NULL
+ "strength",
+ "intelligen.",
+ "wisdom",
+ "dexterity",
+ "constitut.",
+ "charisma",
+ "magic mast.",
+ "",
+ "stealth",
+ "serching",
+ "inflavision",
+ "digging",
+ "speed",
+ "extra atk",
+ "chaos brand",
+ "vampiric",
+ "slay animal",
+ "slay evil",
+ "slay undead",
+ "slay demon",
+ "slay orc",
+ "slay troll",
+ "slay giant",
+ "slay dragon",
+ "",
+ "",
+ "quake",
+ "pois. brand",
+ "acid brand",
+ "elec. brand",
+ "fire brand",
+ "cold brand",
+ "sustain",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "immunity",
+ "",
+ "",
+ "",
+ "",
+ "reflection",
+ "free action",
+ "hold life",
+ "res. acid",
+ "res. elec.",
+ "res. fire",
+ "res. cold",
+ "res. poison",
+ "res. fear",
+ "res. light",
+ "res. dark",
+ "res. blind",
+ "res.confuse",
+ "res. sound",
+ "res. shard",
+ "res. nether",
+ "res. nexus",
+ "res. chaos",
+ "res. disen.",
+ "",
+ "",
+ "slay human",
+ "",
+ "",
+ "anti magic",
+ "",
+ "",
+ "warning",
+ "",
+ "",
+ "",
+ "levitation",
+ "perm. light",
+ "see invis.",
+ "telepathy",
+ "slow dige.",
+ "regen.",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "teleport",
+ "",
+ "",
+ "weapon enc.",
+ "armor enc.",
+
+ NULL
};
#endif
for (i = 0; essence_info[i].add_name; i++)
{
- essence_type *es_ptr = &essence_info[i];
+ essence_type *es_ptr = &essence_info[i];
int pval = 0;
if (es_ptr->add < TR_FLAG_MAX && is_pval_flag(es_ptr->add) && old_pval)
- pval = (have_flag(new_flgs, es_ptr->add)) ? old_pval - o_ptr->pval : old_pval;
+ pval = (have_flag(new_flgs, es_ptr->add)) ? old_pval - o_ptr->pval : old_pval;
if (es_ptr->add < TR_FLAG_MAX &&
- (!have_flag(new_flgs, es_ptr->add) || pval) &&
- have_flag(old_flgs, es_ptr->add))
+ (!have_flag(new_flgs, es_ptr->add) || pval) &&
+ have_flag(old_flgs, es_ptr->add))
{
if (pval)
{
#endif
for (i = 0; essence_name[i]; i++)
{
- if (!essence_name[i][0]) continue;
+ if (!essence_name[i][0]) continue;
if (!drain_value[i]) continue;
p_ptr->magic_num1[i] += drain_value[i];
int menu_line = (use_menu ? 1 : 0);
#ifdef JP
- cptr menu_name[] = {
- "Éð´ï°À",
- "ÂÑÀ",
- "ǽÎÏ",
- "¿ôÃÍ",
- "¥¹¥ì¥¤",
- "ESP",
- "¤½¤Î¾"
- };
+ cptr menu_name[] = {
+ "Éð´ï°À",
+ "ÂÑÀ",
+ "ǽÎÏ",
+ "¿ôÃÍ",
+ "¥¹¥ì¥¤",
+ "ESP",
+ "¤½¤Î¾"
+ };
#else
- cptr menu_name[] = {
- "Brand weapon",
- "Resistance",
- "Ability",
- "Magic number",
- "Slay",
- "ESP",
- "Others"
- };
+ cptr menu_name[] = {
+ "Brand weapon",
+ "Resistance",
+ "Ability",
+ "Magic number",
+ "Slay",
+ "ESP",
+ "Others"
+ };
#endif
- const int mode_max = 7;
+ const int mode_max = 7;
#ifdef ALLOW_REPEAT
if (repeat_pull(&mode) && 1 <= mode && mode <= mode_max)
while(!mode)
{
- int i;
- for (i = 0; i < mode_max; i++)
+ int i;
+ for (i = 0; i < mode_max; i++)
#ifdef JP
- prt(format(" %s %s", (menu_line == 1+i) ? "¡Õ" : " ", menu_name[i]), 2 + i, 14);
+ prt(format(" %s %s", (menu_line == 1+i) ? "¡Õ" : " ", menu_name[i]), 2 + i, 14);
prt("¤É¤Î¼ïÎà¤Î¥¨¥Ã¥»¥ó¥¹Éղäò¹Ô¤¤¤Þ¤¹¤«¡©", 0, 0);
#else
- prt(format(" %s %s", (menu_line == 1+i) ? "> " : " ", menu_name[i]), 2 + i, 14);
+ prt(format(" %s %s", (menu_line == 1+i) ? "> " : " ", menu_name[i]), 2 + i, 14);
prt("Choose from menu.", 0, 0);
#endif
screen_save();
while (!mode)
{
- int i;
+ int i;
- for (i = 0; i < mode_max; i++)
- prt(format(" %c) %s", 'a' + i, menu_name[i]), 2 + i, 14);
+ for (i = 0; i < mode_max; i++)
+ prt(format(" %c) %s", 'a' + i, menu_name[i]), 2 + i, 14);
#ifdef JP
if (!get_com("²¿¤òÉղä·¤Þ¤¹¤«:", &choice, TRUE))
return 0;
}
- if (isupper(choice)) choice = tolower(choice);
+ if (isupper(choice)) choice = tolower(choice);
- if ('a' <= choice && choice <= 'a' + (char)mode_max - 1)
- mode = (int)choice - 'a' + 1;
+ if ('a' <= choice && choice <= 'a' + (char)mode_max - 1)
+ mode = (int)choice - 'a' + 1;
}
screen_load();
}
int num[22];
char o_name[MAX_NLEN];
int use_essence;
- essence_type *es_ptr;
+ essence_type *es_ptr;
int menu_line = (use_menu ? 1 : 0);
for (i = 0; essence_info[i].add_name; i++)
{
- es_ptr = &essence_info[i];
+ es_ptr = &essence_info[i];
if (es_ptr->type != mode) continue;
num[max_num++] = i;
/* Get a spell from the user */
- choice = (always_show_list || use_menu) ? ESCAPE:1;
- while (!flag)
- {
+ choice = (always_show_list || use_menu) ? ESCAPE:1;
+ while (!flag)
+ {
bool able[22];
if( choice==ESCAPE ) choice = ' ';
else if( !get_com(out_val, &choice, FALSE) )break;
/* Print list */
for (ctr = 0; ctr < max_num; ctr++)
{
- es_ptr = &essence_info[num[ctr]];
+ es_ptr = &essence_info[num[ctr]];
if (use_menu)
{
}
#endif /* ALLOW_REPEAT */
- es_ptr = &essence_info[num[i]];
+ es_ptr = &essence_info[num[i]];
if (es_ptr->add == ESSENCE_SLAY_GLOVE)
item_tester_tval = TV_GLOVES;
}
else
{
- o_ptr->xtra3 = es_ptr->add + 1;
+ o_ptr->xtra3 = es_ptr->add + 1;
}
}
else
add_flag(o_ptr->art_flags, TR_IGNORE_COLD);
}
else
- {
- o_ptr->xtra3 = es_ptr->add + 1;
- }
+ {
+ o_ptr->xtra3 = es_ptr->add + 1;
+ }
}
energy_use = 100;
} while (only_browse);
#ifdef ALLOW_REPEAT
repeat_push(mode);
- }
+ }
#endif /* ALLOW_REPEAT */
switch(mode)
#ifdef JP
msg_print("¤â¤È¤â¤È¹½¤¨¤Æ¤¤¤Ê¤¤¡£");
#else
- msg_print("You are not assuming a posture.");
+ msg_print("You are not assuming a posture.");
#endif
screen_load();
return TRUE;
return FALSE;
}
if (racial_aux(30, 0, A_INT, 20)){
- if( is_mirror_grid(&cave[py][px]))
+ if( is_mirror_grid(&cave[py][px]))
{
#ifdef JP
msg_print("¾¯¤·Æ¬¤¬¥Ï¥Ã¥¥ê¤·¤¿¡£");
if (use_menu) screen_save();
/* Get a spell from the user */
- choice = (always_show_list || use_menu) ? ESCAPE:1;
- while (!flag)
- {
+ choice = (always_show_list || use_menu) ? ESCAPE:1;
+ while (!flag)
+ {
if( choice==ESCAPE ) choice = ' ';
else if( !get_com(out_val, &choice, FALSE) )break;
if (lpInfo->biClrUsed)
{
npPal = (PLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
- (WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
+ (WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
if (!npPal)
return(FALSE);
* (unable to create objects, both pointer are invalid).
*/
static BOOL NEAR PASCAL MakeBitmapAndPalette(HDC hDC, HANDLE hDIB,
- HPALETTE * phPal, HBITMAP * phBitmap)
+ HPALETTE * phPal, HBITMAP * phBitmap)
{
LPBITMAPINFOHEADER lpInfo;
BOOL result = FALSE;
RealizePalette(hDC);
lpBits = ((LPSTR)lpInfo + (WORD)lpInfo->biSize +
- (WORD)lpInfo->biClrUsed * sizeof(RGBQUAD));
+ (WORD)lpInfo->biClrUsed * sizeof(RGBQUAD));
hBitmap = CreateDIBitmap(hDC, lpInfo, CBM_INIT, lpBits,
- (LPBITMAPINFO)lpInfo, DIB_RGB_COLORS);
+ (LPBITMAPINFO)lpInfo, DIB_RGB_COLORS);
SelectPalette(hDC, hOldPal, TRUE);
RealizePalette(hDC);
}
pInfo->hDIB = GlobalAlloc(GHND, (DWORD)(sizeof(BITMAPINFOHEADER) +
- 256 * sizeof(RGBQUAD)));
+ 256 * sizeof(RGBQUAD)));
if (!pInfo->hDIB)
return (FALSE);
if (lpbi->biSizeImage == 0)
{
lpbi->biSizeImage = (((((lpbi->biWidth * (DWORD)lpbi->biBitCount) + 31) & ~31) >> 3)
- * lpbi->biHeight);
+ * lpbi->biHeight);
}
/* otherwise wouldn't work with 16 color bitmaps -- S.K. */
hDC = GetDC(hWnd);
if (!MakeBitmapAndPalette(hDC, pInfo->hDIB, &((HPALETTE)pInfo->hPalette),
- &((HBITMAP)pInfo->hBitmap)))
+ &((HBITMAP)pInfo->hBitmap)))
{
ReleaseDC(hWnd,hDC);
goto ErrExit2;
3, /* 11 = Circular rooms (22x22) */
10, /* 12 = Crypts (22x22) */
20, /* 13 = Trapped monster pit */
- 20, /* 14 = Piranha/Armageddon trap room */
+ 20, /* 14 = Piranha/Armageddon trap room */
};
}
else
{
- cave_type *c_ptr = &cave[y][x];
+ cave_type *c_ptr = &cave[y][x];
/* Create secret door */
- place_closed_door(y, x);
+ place_closed_door(y, x);
- /* Hide */
- c_ptr->mimic = fill_type[randint0(100)];
+ /* Hide */
+ c_ptr->mimic = fill_type[randint0(100)];
- /* Floor type terrain cannot hide a door */
- if (!(c_ptr->mimic & 0x20))
- {
- c_ptr->feat = c_ptr->mimic;
- c_ptr->mimic = 0;
- }
+ /* Floor type terrain cannot hide a door */
+ if (!(c_ptr->mimic & 0x20))
+ {
+ c_ptr->feat = c_ptr->mimic;
+ c_ptr->mimic = 0;
+ }
c_ptr->info &= ~(CAVE_FLOOR);
}
* If so, fix by tunneling outside the room in such a way as to connect the caves.
*/
check_room_boundary(*xx - x / 2 - 1, *yy - y / 2 - 1,
- *xx + (x - 1) / 2 + 1, *yy + (y - 1) / 2 + 1);
+ *xx + (x - 1) / 2 + 1, *yy + (y - 1) / 2 + 1);
/* Success */
return (TRUE);
/* Pick some monster types */
for (i = 0; i < 64; i++)
- {
+ {
int r_idx = 0, attempts = 100;
while (attempts--)
- {
+ {
/* Get a (hard) monster type */
r_idx = get_mon_num(dun_level + 10);
/* Lay down a floor */
place_floor_grid(c_ptr);
- /* Remove any mimic */
- c_ptr->mimic = 0;
+ /* Remove any mimic */
+ c_ptr->mimic = 0;
/* Part of a vault */
c_ptr->info |= (CAVE_ICKY);
place_trap(y, x);
break;
- /* Black market in a dungeon */
- case 'S':
- set_cave_feat(y, x, FEAT_SHOP_HEAD + STORE_BLACK);
- store_init(NO_TOWN, STORE_BLACK);
- break;
-
- /* The Pattern */
- case 'p':
- set_cave_feat(y, x, FEAT_PATTERN_START);
- break;
-
- case 'a':
- set_cave_feat(y, x, FEAT_PATTERN_1);
- break;
-
- case 'b':
- set_cave_feat(y, x, FEAT_PATTERN_2);
- break;
-
- case 'c':
- set_cave_feat(y, x, FEAT_PATTERN_3);
- break;
-
- case 'd':
- set_cave_feat(y, x, FEAT_PATTERN_4);
- break;
-
- case 'P':
- set_cave_feat(y, x, FEAT_PATTERN_END);
- break;
-
- case 'B':
- set_cave_feat(y, x, FEAT_PATTERN_XTRA1);
- break;
-
- case 'A':
- /* Reward for Pattern walk */
- object_level = base_level + 12;
- place_object(y, x, TRUE, FALSE);
- object_level = base_level;
- break;
+ /* Black market in a dungeon */
+ case 'S':
+ set_cave_feat(y, x, FEAT_SHOP_HEAD + STORE_BLACK);
+ store_init(NO_TOWN, STORE_BLACK);
+ break;
+
+ /* The Pattern */
+ case 'p':
+ set_cave_feat(y, x, FEAT_PATTERN_START);
+ break;
+
+ case 'a':
+ set_cave_feat(y, x, FEAT_PATTERN_1);
+ break;
+
+ case 'b':
+ set_cave_feat(y, x, FEAT_PATTERN_2);
+ break;
+
+ case 'c':
+ set_cave_feat(y, x, FEAT_PATTERN_3);
+ break;
+
+ case 'd':
+ set_cave_feat(y, x, FEAT_PATTERN_4);
+ break;
+
+ case 'P':
+ set_cave_feat(y, x, FEAT_PATTERN_END);
+ break;
+
+ case 'B':
+ set_cave_feat(y, x, FEAT_PATTERN_XTRA1);
+ break;
+
+ case 'A':
+ /* Reward for Pattern walk */
+ object_level = base_level + 12;
+ place_object(y, x, TRUE, FALSE);
+ object_level = base_level;
+ break;
}
}
}
/* Hack -- Build the vault */
build_vault(yval, xval, v_ptr->hgt, v_ptr->wid,
- v_text + v_ptr->text, xoffset, yoffset, transno);
+ v_text + v_ptr->text, xoffset, yoffset, transno);
}
/* Hack -- Build the vault */
build_vault(yval, xval, v_ptr->hgt, v_ptr->wid,
- v_text + v_ptr->text, xoffset, yoffset, transno);
+ v_text + v_ptr->text, xoffset, yoffset, transno);
}
/*
/* If greater than 'grid' level then is random */
store_height(ii, jj, randint1(maxsize));
}
- else
+ else
{
/* Average of left and right points +random bit */
store_height(ii, jj,
for (j = yhstep; j <= yysize - yhstep; j += ystep)
{
for (i = 0; i <= xxsize; i += xstep)
- {
+ {
/* cache often used values */
ii = i / 256 + fill_data.xmin;
jj = j / 256 + fill_data.ymin;
/* If greater than 'grid' level then is random */
store_height(ii, jj, randint1(maxsize));
}
- else
+ else
{
/* Average of up and down points +random bit */
store_height(ii, jj,
{
for (j = yhstep; j <= yysize - yhstep; j += ystep)
{
- /* cache often used values */
+ /* cache often used values */
ii = i / 256 + fill_data.xmin;
jj = j / 256 + fill_data.ymin;
/* If greater than 'grid' level then is random */
store_height(ii, jj, randint1(maxsize));
}
- else
+ else
{
/* Cache reused values. */
xm = fill_data.xmin + (i - xhstep) / 256;
fill_data.c1, fill_data.c2, fill_data.c3,
fill_data.feat1, fill_data.feat2, fill_data.feat3,
fill_data.info1, fill_data.info2, fill_data.info3))
- {
+ {
/* Enqueue that entry */
temp_y[flow_tail] = j;
temp_x[flow_tail] = i;
if (room) cave[y0 + y - yhsize][x0 + x - xhsize].info |= (CAVE_ROOM);
}
else if (is_outer_bold(y0 + y - yhsize, x0 + x - xhsize) &&
- (cave[y0 + y - yhsize][x0 + x - xhsize].info & CAVE_ICKY))
+ (cave[y0 + y - yhsize][x0 + x - xhsize].info & CAVE_ICKY))
{
/* Walls */
cave[y0 + y - yhsize][x0 + x - xhsize].info &= ~(CAVE_ICKY);
/* about size/2 */
cutoff = randint1(xsize / 4) + randint1(ysize / 4) +
- randint1(xsize / 4) + randint1(ysize / 4);
+ randint1(xsize / 4) + randint1(ysize / 4);
/* make it */
generate_hmap(y0, x0, xsize, ysize, grd, roug, cutoff);
else if (temp < min2)
{
/* second smallest */
- min2 = temp;
+ min2 = temp;
}
}
if (((min2 - min1) <= 2) && (!(min1 < 3)))
/* about size/2 */
cutoff = randint1(xsize / 4) + randint1(ysize / 4) +
- randint1(xsize / 4) + randint1(ysize / 4);
+ randint1(xsize / 4) + randint1(ysize / 4);
/* make it */
generate_hmap(y0, x0, xsize, ysize, grd, roug, cutoff);
* twists and turns in the labyrinth: smaller number, more twists.
*/
static void r_visit(int y1, int x1, int y2, int x2,
- int node, int dir, int *visited)
+ int node, int dir, int *visited)
{
int i, j, m, n, temp, x, y, adj[4];
*/
static void build_mini_c_vault(int x0, int y0, int xsize, int ysize)
{
- int dy, dx;
- int y1, x1, y2, x2, y, x, total;
+ int dy, dx;
+ int y1, x1, y2, x2, y, x, total;
int m, n, num_vertices;
int *visited;
- if (cheat_room) msg_print("Mini Checker Board Vault");
+ if (cheat_room) msg_print("Mini Checker Board Vault");
- /* Pick a random room size */
+ /* Pick a random room size */
dy = ysize / 2 - 1;
dx = xsize / 2 - 1;
y1 = y0 - dy;
- x1 = x0 - dx;
- y2 = y0 + dy;
- x2 = x0 + dx;
+ x1 = x0 - dx;
+ y2 = y0 + dy;
+ x2 = x0 + dx;
/* generate the room */
dx = xsize / 2 - 1;
y1 = y0 - dy;
- x1 = x0 - dx;
- y2 = y0 + dy;
- x2 = x0 + dx;
+ x1 = x0 - dx;
+ y2 = y0 + dy;
+ x2 = x0 + dx;
if (cheat_room) msg_print("Castle Vault");
* Used to build crypts
*/
static int dist2(int x1, int y1, int x2, int y2,
- int h1, int h2, int h3, int h4)
+ int h1, int h2, int h3, int h4)
{
int dx, dy;
dx = abs(x2 - x1);
if (dx >= 2 * dy) return (dx + (dy * h1) / h2);
if (dy >= 2 * dx) return (dy + (dx * h1) / h2);
return (((dx + dy) * 128) / 181 +
- (dx * dx / (dy * h3) + dy * dy / (dx * h3)) * h4);
+ (dx * dx / (dy * h3) + dy * dy / (dx * h3)) * h4);
/* 128/181 is approx. 1/sqrt(2) */
}
/* Find visible outer walls and set to be FEAT_OUTER */
add_outer_wall(x0, y0, FALSE, x0 - rad - 1, y0 - rad - 1,
- x0 + rad + 1, y0 + rad + 1);
+ x0 + rad + 1, y0 + rad + 1);
/* Add inner wall */
for (x = x0 - rad / 2; x <= x0 + rad / 2; x++)
for (i = 1; i <= (xsize * ysize) / 50; i++)
{
build_small_room(x0 + randint0(xsize - 4) - xsize / 2 + 2,
- y0 + randint0(ysize - 4) - ysize / 2 + 2);
+ y0 + randint0(ysize - 4) - ysize / 2 + 2);
}
/* Fill with monsters and treasure, low difficulty */
fill_treasure(x0 - xhsize + 1, x0 - xhsize + xsize - 1,
- y0 - yhsize + 1, y0 - yhsize + ysize - 1, randint1(5));
+ y0 - yhsize + 1, y0 - yhsize + ysize - 1, randint1(5));
}
#endif /* ALLOW_CAVERNS_AND_LAKES */
/* Find visible outer walls and set to be FEAT_OUTER */
add_outer_wall(x0, y0, light, x0 - rad - 1, y0 - rad - 1,
- x0 + rad + 1, y0 + rad + 1);
+ x0 + rad + 1, y0 + rad + 1);
/* Check to see if there is room for an inner vault */
for (x = x0 - 2; x <= x0 + 2; x++)
/* Validate the monster */
if (!vault_monster_okay(r_idx)) return (FALSE);
- /* No wall passing monster */
+ /* No wall passing monster */
if (r_ptr->flags2 & (RF2_PASS_WALL | RF2_KILL_WALL)) return (FALSE);
/* Okay */
*/
static void build_type13(int by0, int bx0)
{
- static int placing[][3] = {
- {-2, -9, 0}, {-2, -8, 0}, {-3, -7, 0}, {-3, -6, 0},
- {+2, -9, 0}, {+2, -8, 0}, {+3, -7, 0}, {+3, -6, 0},
- {-2, +9, 0}, {-2, +8, 0}, {-3, +7, 0}, {-3, +6, 0},
- {+2, +9, 0}, {+2, +8, 0}, {+3, +7, 0}, {+3, +6, 0},
- {-2, -7, 1}, {-3, -5, 1}, {-3, -4, 1},
- {+2, -7, 1}, {+3, -5, 1}, {+3, -4, 1},
- {-2, +7, 1}, {-3, +5, 1}, {-3, +4, 1},
- {+2, +7, 1}, {+3, +5, 1}, {+3, +4, 1},
- {-2, -6, 2}, {-2, -5, 2}, {-3, -3, 2},
- {+2, -6, 2}, {+2, -5, 2}, {+3, -3, 2},
- {-2, +6, 2}, {-2, +5, 2}, {-3, +3, 2},
- {+2, +6, 2}, {+2, +5, 2}, {+3, +3, 2},
- {-2, -4, 3}, {-3, -2, 3},
- {+2, -4, 3}, {+3, -2, 3},
- {-2, +4, 3}, {-3, +2, 3},
- {+2, +4, 3}, {+3, +2, 3},
- {-2, -3, 4}, {-3, -1, 4},
- {+2, -3, 4}, {+3, -1, 4},
- {-2, +3, 4}, {-3, +1, 4},
- {+2, +3, 4}, {+3, +1, 4},
- {-2, -2, 5}, {-3, 0, 5}, {-2, +2, 5},
- {+2, -2, 5}, {+3, 0, 5}, {+2, +2, 5},
- {-2, -1, 6}, {-2, +1, 6},
- {+2, -1, 6}, {+2, +1, 6},
- {-2, 0, 7}, {+2, 0, 7},
- {0, 0, -1}
- };
+ static int placing[][3] = {
+ {-2, -9, 0}, {-2, -8, 0}, {-3, -7, 0}, {-3, -6, 0},
+ {+2, -9, 0}, {+2, -8, 0}, {+3, -7, 0}, {+3, -6, 0},
+ {-2, +9, 0}, {-2, +8, 0}, {-3, +7, 0}, {-3, +6, 0},
+ {+2, +9, 0}, {+2, +8, 0}, {+3, +7, 0}, {+3, +6, 0},
+ {-2, -7, 1}, {-3, -5, 1}, {-3, -4, 1},
+ {+2, -7, 1}, {+3, -5, 1}, {+3, -4, 1},
+ {-2, +7, 1}, {-3, +5, 1}, {-3, +4, 1},
+ {+2, +7, 1}, {+3, +5, 1}, {+3, +4, 1},
+ {-2, -6, 2}, {-2, -5, 2}, {-3, -3, 2},
+ {+2, -6, 2}, {+2, -5, 2}, {+3, -3, 2},
+ {-2, +6, 2}, {-2, +5, 2}, {-3, +3, 2},
+ {+2, +6, 2}, {+2, +5, 2}, {+3, +3, 2},
+ {-2, -4, 3}, {-3, -2, 3},
+ {+2, -4, 3}, {+3, -2, 3},
+ {-2, +4, 3}, {-3, +2, 3},
+ {+2, +4, 3}, {+3, +2, 3},
+ {-2, -3, 4}, {-3, -1, 4},
+ {+2, -3, 4}, {+3, -1, 4},
+ {-2, +3, 4}, {-3, +1, 4},
+ {+2, +3, 4}, {+3, +1, 4},
+ {-2, -2, 5}, {-3, 0, 5}, {-2, +2, 5},
+ {+2, -2, 5}, {+3, 0, 5}, {+2, +2, 5},
+ {-2, -1, 6}, {-2, +1, 6},
+ {+2, -1, 6}, {+2, +1, 6},
+ {-2, 0, 7}, {+2, 0, 7},
+ {0, 0, -1}
+ };
int y, x, y1, x1, y2, x2, xval, yval;
int i, j;
vault_aux_type *n_ptr = pick_vault_type(pit_types, ROOM_PIT);
- /* Only in Angband */
- if (dungeon_type != 1) return;
+ /* Only in Angband */
+ if (dungeon_type != 1) return;
/* Try to allocate space for room. */
if (!room_alloc(25, 13, TRUE, by0, bx0, &xval, &yval)) return;
{
for (x = x1 - 1; x <= x2 + 1; x++)
{
- c_ptr = &cave[y][x];
- place_inner_grid(c_ptr);
+ c_ptr = &cave[y][x];
+ place_inner_grid(c_ptr);
c_ptr->info |= (CAVE_ROOM);
}
}
/* Place the floor area 1 */
- for (x = x1 + 3; x <= x2 - 3; x++)
- {
- c_ptr = &cave[yval-2][x];
- place_floor_grid(c_ptr);
- add_cave_info(yval-2, x, CAVE_ICKY);
+ for (x = x1 + 3; x <= x2 - 3; x++)
+ {
+ c_ptr = &cave[yval-2][x];
+ place_floor_grid(c_ptr);
+ add_cave_info(yval-2, x, CAVE_ICKY);
- c_ptr = &cave[yval+2][x];
- place_floor_grid(c_ptr);
- add_cave_info(yval+2, x, CAVE_ICKY);
- }
+ c_ptr = &cave[yval+2][x];
+ place_floor_grid(c_ptr);
+ add_cave_info(yval+2, x, CAVE_ICKY);
+ }
/* Place the floor area 2 */
- for (x = x1 + 5; x <= x2 - 5; x++)
- {
- c_ptr = &cave[yval-3][x];
- place_floor_grid(c_ptr);
- add_cave_info(yval-3, x, CAVE_ICKY);
+ for (x = x1 + 5; x <= x2 - 5; x++)
+ {
+ c_ptr = &cave[yval-3][x];
+ place_floor_grid(c_ptr);
+ add_cave_info(yval-3, x, CAVE_ICKY);
- c_ptr = &cave[yval+3][x];
- place_floor_grid(c_ptr);
- add_cave_info(yval+3, x, CAVE_ICKY);
- }
+ c_ptr = &cave[yval+3][x];
+ place_floor_grid(c_ptr);
+ add_cave_info(yval+3, x, CAVE_ICKY);
+ }
/* Corridor */
- for (x = x1; x <= x2; x++)
- {
- c_ptr = &cave[yval][x];
- place_floor_grid(c_ptr);
- c_ptr = &cave[y1][x];
- place_floor_grid(c_ptr);
- c_ptr = &cave[y2][x];
- place_floor_grid(c_ptr);
+ for (x = x1; x <= x2; x++)
+ {
+ c_ptr = &cave[yval][x];
+ place_floor_grid(c_ptr);
+ c_ptr = &cave[y1][x];
+ place_floor_grid(c_ptr);
+ c_ptr = &cave[y2][x];
+ place_floor_grid(c_ptr);
}
/* Place the outer walls */
}
/* Random corridor */
- if (one_in_(2))
- {
- for (y = y1; y <= yval; y++)
- {
- place_floor_bold(y, x2);
- place_solid_bold(y, x1-1);
- }
- for (y = yval; y <= y2 + 1; y++)
- {
- place_floor_bold(y, x1);
- place_solid_bold(y, x2+1);
- }
- }
- else
- {
- for (y = yval; y <= y2 + 1; y++)
- {
- place_floor_bold(y, x1);
- place_solid_bold(y, x2+1);
- }
- for (y = y1; y <= yval; y++)
- {
- place_floor_bold(y, x2);
- place_solid_bold(y, x1-1);
- }
- }
+ if (one_in_(2))
+ {
+ for (y = y1; y <= yval; y++)
+ {
+ place_floor_bold(y, x2);
+ place_solid_bold(y, x1-1);
+ }
+ for (y = yval; y <= y2 + 1; y++)
+ {
+ place_floor_bold(y, x1);
+ place_solid_bold(y, x2+1);
+ }
+ }
+ else
+ {
+ for (y = yval; y <= y2 + 1; y++)
+ {
+ place_floor_bold(y, x1);
+ place_solid_bold(y, x2+1);
+ }
+ for (y = y1; y <= yval; y++)
+ {
+ place_floor_bold(y, x2);
+ place_solid_bold(y, x1-1);
+ }
+ }
/* Place the wall open trap */
cave[yval][xval].mimic = cave[yval][xval].feat;
if (cheat_room)
{
#ifdef JP
- msg_format("%s¤Î櫥ԥåÈ", n_ptr->name);
+ msg_format("%s¤Î櫥ԥåÈ", n_ptr->name);
#else
/* Room type */
msg_format("Trapped monster pit (%s)", n_ptr->name);
}
- for (i = 0; placing[i][2] >= 0; i++)
- {
- y = yval + placing[i][0];
- x = xval + placing[i][1];
+ for (i = 0; placing[i][2] >= 0; i++)
+ {
+ y = yval + placing[i][0];
+ x = xval + placing[i][1];
place_monster_aux(0, y, x, what[placing[i][2]], PM_NO_KAGE);
- }
+ }
}
bool light;
cave_type *c_ptr;
- byte trap;
+ byte trap;
/* Pick a room size */
y1 = randint1(4);
place_outer_grid(c_ptr);
}
- if (dun_level < 30 + randint1(30))
- trap = FEAT_TRAP_PIRANHA;
- else
- trap = FEAT_TRAP_ARMAGEDDON;
+ if (dun_level < 30 + randint1(30))
+ trap = FEAT_TRAP_PIRANHA;
+ else
+ trap = FEAT_TRAP_ARMAGEDDON;
/* Place a special trap */
cave[yval][xval].mimic = cave[yval][xval].feat;
if (cheat_room)
{
#ifdef JP
- msg_format("%s¤ÎÉô²°", f_name + f_info[trap].name);
+ msg_format("%s¤ÎÉô²°", f_name + f_info[trap].name);
#else
- msg_format("Room of %s", f_name + f_info[trap].name);
+ msg_format("Room of %s", f_name + f_info[trap].name);
#endif
}
}
/* Max Player and Dungeon Levels */
wr_s16b(p_ptr->max_plv);
- tmp8u = (byte)max_d_idx;
- wr_byte(tmp8u);
- for (i = 0; i < tmp8u; i++)
- wr_s16b(max_dlv[i]);
+ tmp8u = (byte)max_d_idx;
+ wr_byte(tmp8u);
+ for (i = 0; i < tmp8u; i++)
+ wr_s16b(max_dlv[i]);
/* More info */
wr_s16b(0); /* oops */
wr_s16b(p_ptr->blessed);
wr_s16b(p_ptr->tim_invis);
wr_s16b(p_ptr->word_recall);
- wr_s16b(p_ptr->recall_dungeon);
+ wr_s16b(p_ptr->recall_dungeon);
wr_s16b(p_ptr->see_infra);
wr_s16b(p_ptr->tim_infra);
wr_s16b(p_ptr->oppose_fire);
wr_byte(FAKE_VER_PATCH);
xor_byte = 0;
- /* Initial value of xor_byte */
+ /* Initial value of xor_byte */
tmp8u = (byte)randint0(256);
wr_byte(tmp8u);
/* Clear screen */
Term_clear();
- /* Attempt to load */
- err = rd_savefile_new();
+ /* Attempt to load */
+ err = rd_savefile_new();
/* Message (below) */
#ifdef JP
if ((*when == '@') && strlen(when) == 9)
{
sprintf(tmp_val, "%.4s-%.2s-%.2s",
- when + 1, when + 5, when + 7);
+ when + 1, when + 5, when + 7);
when = tmp_val;
}
#ifdef JP
/*sprintf(out_val, "%3d.%9s %s%s%s¤È¤¤¤¦Ì¾¤Î%s¤Î%s (¥ì¥Ù¥ë %d)", */
sprintf(out_val, "%3d.%9s %s%s%s - %s%s (¥ì¥Ù¥ë %d)",
- place, the_score.pts,
- seikaku_info[pa].title, (seikaku_info[pa].no ? "¤Î" : ""),
+ place, the_score.pts,
+ seikaku_info[pa].title, (seikaku_info[pa].no ? "¤Î" : ""),
the_score.who,
race_info[pr].title, class_info[pc].title,
- clev);
+ clev);
#else
sprintf(out_val, "%3d.%9s %s %s the %s %s, Level %d",
- place, the_score.pts,
+ place, the_score.pts,
seikaku_info[pa].title,
the_score.who, race_info[pr].title, class_info[pc].title,
- clev);
+ clev);
#endif
sprintf(out_val, " ");
- /* »àË´¸¶°ø¤ò¥ª¥ê¥¸¥Ê¥ë¤è¤êºÙ¤«¤¯É½¼¨ */
- if (streq(the_score.how, "yet"))
- {
- sprintf(out_val+13, " ¤Þ¤ÀÀ¸¤¤Æ¤¤¤ë (%d%s)",
- cdun, "³¬");
- }
- else
+ /* »àË´¸¶°ø¤ò¥ª¥ê¥¸¥Ê¥ë¤è¤êºÙ¤«¤¯É½¼¨ */
+ if (streq(the_score.how, "yet"))
+ {
+ sprintf(out_val+13, " ¤Þ¤ÀÀ¸¤¤Æ¤¤¤ë (%d%s)",
+ cdun, "³¬");
+ }
+ else
if (streq(the_score.how, "ripe"))
{
sprintf(out_val+13, " ¾¡Íø¤Î¸å¤Ë°úÂà (%d%s)",
/* And still another line of info */
#ifdef JP
- {
- char buf[11];
-
- /* ÆüÉÕ¤ò 19yy/mm/dd ¤Î·Á¼°¤ËÊѹ¹¤¹¤ë */
- if (strlen(when) == 8 && when[2] == '/' && when[5] == '/') {
- sprintf(buf, "%d%s/%.5s", 19 + (when[6] < '8'), when + 6, when);
- when = buf;
- }
- sprintf(out_val,
- " (¥æ¡¼¥¶¡¼:%s, ÆüÉÕ:%s, ½ê»ý¶â:%s, ¥¿¡¼¥ó:%s)",
- user, when, gold, aged);
- }
+ {
+ char buf[11];
+
+ /* ÆüÉÕ¤ò 19yy/mm/dd ¤Î·Á¼°¤ËÊѹ¹¤¹¤ë */
+ if (strlen(when) == 8 && when[2] == '/' && when[5] == '/') {
+ sprintf(buf, "%d%s/%.5s", 19 + (when[6] < '8'), when + 6, when);
+ when = buf;
+ }
+ sprintf(out_val,
+ " (¥æ¡¼¥¶¡¼:%s, ÆüÉÕ:%s, ½ê»ý¶â:%s, ¥¿¡¼¥ó:%s)",
+ user, when, gold, aged);
+ }
#else
sprintf(out_val,
- " (User %s, Date %s, Gold %s, Turn %s).",
- user, when, gold, aged);
+ " (User %s, Date %s, Gold %s, Turn %s).",
+ user, when, gold, aged);
#endif
c_put_str(attr, out_val, n*4 + 4, 0);
bool send_world_score(bool do_send)
{
#ifdef WORLD_SCORE
- if(send_score && do_send)
+ if(send_score && do_send)
{
if(easy_band)
{
(void)inkey();
}
else return FALSE;
- }
+ }
#endif
return TRUE;
}
/* Save the version */
sprintf(the_score.what, "%u.%u.%u",
- FAKE_VER_MAJOR, FAKE_VER_MINOR, FAKE_VER_PATCH);
+ FAKE_VER_MAJOR, FAKE_VER_MINOR, FAKE_VER_PATCH);
/* Calculate and save the points */
sprintf(the_score.pts, "%9ld", (long)total_points());
#endif
}
else
- {
+ {
strcpy(the_score.how, p_ptr->died_from);
- }
+ }
/* Lock (for writing) the highscore file, or fail */
if (fd_lock(highscore_fd, F_WRLCK)) return (1);
/* Save the version */
sprintf(the_score.what, "%u.%u.%u",
- FAKE_VER_MAJOR, FAKE_VER_MINOR, FAKE_VER_PATCH);
+ FAKE_VER_MAJOR, FAKE_VER_MINOR, FAKE_VER_PATCH);
/* Calculate and save the points */
sprintf(the_score.pts, "%9ld", (long)total_points());
/* Hack -- no cause of death */
#ifdef JP
- /* ¤Þ¤À»à¤ó¤Ç¤¤¤Ê¤¤¤È¤¤Î¼±ÊÌʸ»ú */
- strcpy(the_score.how, "yet");
+ /* ¤Þ¤À»à¤ó¤Ç¤¤¤Ê¤¤¤È¤¤Î¼±ÊÌʸ»ú */
+ strcpy(the_score.how, "yet");
#else
strcpy(the_score.how, "nobody (yet!)");
#endif
/* Fake death */
if (!streq(p_ptr->died_from, "Seppuku"))
#ifdef JP
- /* °úÂष¤¿¤È¤¤Î¼±ÊÌʸ»ú */
- (void)strcpy(p_ptr->died_from, "ripe");
+ /* °úÂष¤¿¤È¤¤Î¼±ÊÌʸ»ú */
+ (void)strcpy(p_ptr->died_from, "ripe");
#else
(void)strcpy(p_ptr->died_from, "Ripe Old Age");
#endif
if (flg & (PROJECT_STOP))
{
if ((n > 0) &&
- ((y == py && x == px) || cave[y][x].m_idx != 0))
- break;
+ ((y == py && x == px) || cave[y][x].m_idx != 0))
+ break;
}
if (!in_bounds(y, x)) break;
if (flg & (PROJECT_STOP))
{
if ((n > 0) &&
- ((y == py && x == px) || cave[y][x].m_idx != 0))
- break;
+ ((y == py && x == px) || cave[y][x].m_idx != 0))
+ break;
}
if (!in_bounds(y, x)) break;
if (flg & (PROJECT_STOP))
{
if ((n > 0) &&
- ((y == py && x == px) || cave[y][x].m_idx != 0))
- break;
+ ((y == py && x == px) || cave[y][x].m_idx != 0))
+ break;
}
if (!in_bounds(y, x)) break;
{
/* Destroy all doors and traps */
if ((c_ptr->feat == FEAT_OPEN) ||
- (c_ptr->feat == FEAT_BROKEN) ||
- is_trap(c_ptr->feat) ||
- ((c_ptr->feat >= FEAT_DOOR_HEAD) &&
- (c_ptr->feat <= FEAT_DOOR_TAIL)))
+ (c_ptr->feat == FEAT_BROKEN) ||
+ is_trap(c_ptr->feat) ||
+ ((c_ptr->feat >= FEAT_DOOR_HEAD) &&
+ (c_ptr->feat <= FEAT_DOOR_TAIL)))
{
/* Check line of sight */
if (known)
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the wall */
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, floor_type[randint0(100)]);
}
/* Quartz / Magma with treasure */
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the wall */
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, floor_type[randint0(100)]);
/* Place some gold */
place_gold(y, x);
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the wall */
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, floor_type[randint0(100)]);
}
/* Rubble */
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the rubble */
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, floor_type[randint0(100)]);
/* Hack -- place an object */
if (randint0(100) < 10)
c_ptr->info &= ~(CAVE_MARK);
/* Destroy the feature */
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, floor_type[randint0(100)]);
}
/* Notice */
/* Require a "naked" floor grid */
if (!cave_naked_bold(y, x)) break;
- /* Create a glyph */
- cave[y][x].info |= CAVE_OBJECT;
- cave[y][x].mimic = FEAT_GLYPH;
+ /* Create a glyph */
+ cave[y][x].info |= CAVE_OBJECT;
+ cave[y][x].mimic = FEAT_GLYPH;
- /* Notice */
- note_spot(y, x);
+ /* Notice */
+ note_spot(y, x);
- /* Redraw */
- lite_spot(y, x);
+ /* Redraw */
+ lite_spot(y, x);
break;
}
}
- case GF_LAVA_FLOW:
+ case GF_LAVA_FLOW:
{
- /* Shallow Lava */
- if(dam == 1)
- {
- /* Require a "naked" floor grid */
- if (!cave_naked_bold(y, x)) break;
+ /* Shallow Lava */
+ if(dam == 1)
+ {
+ /* Require a "naked" floor grid */
+ if (!cave_naked_bold(y, x)) break;
- /* Place a shallow lava */
- cave_set_feat(y, x, FEAT_SHAL_LAVA);
- }
- /* Deep Lava */
- else
- {
- /* Require a "naked" floor grid */
- if (cave_perma_bold(y, x) || !dam) break;
+ /* Place a shallow lava */
+ cave_set_feat(y, x, FEAT_SHAL_LAVA);
+ }
+ /* Deep Lava */
+ else
+ {
+ /* Require a "naked" floor grid */
+ if (cave_perma_bold(y, x) || !dam) break;
- /* Place a deep lava */
- cave_set_feat(y, x, FEAT_DEEP_LAVA);
+ /* Place a deep lava */
+ cave_set_feat(y, x, FEAT_DEEP_LAVA);
- /* Dam is used as a counter for the number of grid to convert */
- dam--;
- }
+ /* Dam is used as a counter for the number of grid to convert */
+ dam--;
+ }
break;
}
- case GF_WATER_FLOW:
+ case GF_WATER_FLOW:
{
- /* Shallow Water */
- if(dam == 1)
- {
- /* Require a "naked" floor grid */
- if (!cave_naked_bold(y, x)) break;
+ /* Shallow Water */
+ if(dam == 1)
+ {
+ /* Require a "naked" floor grid */
+ if (!cave_naked_bold(y, x)) break;
- /* Place a shallow lava */
- cave_set_feat(y, x, FEAT_SHAL_WATER);
- }
- /* Deep Water */
- else
- {
- /* Require a "naked" floor grid */
- if (cave_perma_bold(y, x) || !dam) break;
+ /* Place a shallow lava */
+ cave_set_feat(y, x, FEAT_SHAL_WATER);
+ }
+ /* Deep Water */
+ else
+ {
+ /* Require a "naked" floor grid */
+ if (cave_perma_bold(y, x) || !dam) break;
- /* Place a deep lava */
- cave_set_feat(y, x, FEAT_DEEP_WATER);
+ /* Place a deep lava */
+ cave_set_feat(y, x, FEAT_DEEP_WATER);
- /* Dam is used as a counter for the number of grid to convert */
- dam--;
- }
+ /* Dam is used as a counter for the number of grid to convert */
+ dam--;
+ }
break;
}
break;
}
- case GF_IDENTIFY:
- {
+ case GF_IDENTIFY:
+ {
identify_item(o_ptr);
break;
- }
+ }
/* Unlock chests */
case GF_KILL_TRAP:
/* Can the player know about this effect? */
bool known = ((m_ptr->cdis <= MAX_SIGHT) || p_ptr->inside_battle);
- /* Can the player see the source of this effect? */
- bool see_s = ((who <= 0) || m_list[who].ml);
+ /* Can the player see the source of this effect? */
+ bool see_s = ((who <= 0) || m_list[who].ml);
/* Were the effects "irrelevant"? */
bool skipped = FALSE;
}
else if ((r_ptr->flags2 & RF2_STUPID) ||
- (r_ptr->flags2 & RF2_WEIRD_MIND) ||
- (r_ptr->flags3 & RF3_ANIMAL) ||
+ (r_ptr->flags2 & RF2_WEIRD_MIND) ||
+ (r_ptr->flags3 & RF3_ANIMAL) ||
(r_ptr->level > randint1(3 * dam)))
{
dam /= 3;
/* Attempt a saving throw */
if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
(m_ptr->mflag2 & MFLAG_NOPET) ||
- (r_ptr->flags3 & (RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING)) ||
+ (r_ptr->flags3 & (RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING)) ||
((r_ptr->level+10) > randint1(dam)))
{
/* Resist */
/* Give detailed messages if destroyed */
if (known && note)
- {
- monster_desc(m_name, m_ptr, 0x100);
- if (see_s)
- {
- msg_format("%^s%s", m_name, note);
- }
- else
- {
- mon_fight = TRUE;
- }
- }
+ {
+ monster_desc(m_name, m_ptr, 0x100);
+ if (see_s)
+ {
+ msg_format("%^s%s", m_name, note);
+ }
+ else
+ {
+ mon_fight = TRUE;
+ }
+ }
monster_gain_exp(who, m_ptr->r_idx);
if (note && seen) msg_format("%^s%s", m_name, note);
/* Hack -- Pain message */
- else if (see_s)
- {
- message_pain(c_ptr->m_idx, dam);
- }
- else
- {
- mon_fight = TRUE;
- }
+ else if (see_s)
+ {
+ message_pain(c_ptr->m_idx, dam);
+ }
+ else
+ {
+ mon_fight = TRUE;
+ }
/* Hack -- handle sleep */
if (do_sleep) m_ptr->csleep = do_sleep;
#endif
else if ((inventory[INVEN_RARM].name1 == ART_ZANTETSU) || (inventory[INVEN_LARM].name1 == ART_ZANTETSU))
- {
+ {
#ifdef JP
msg_print("Ìð¤ò»Â¤ê¼Î¤Æ¤¿¡ª");
#else
*/
static bool do_disintegration(int by, int bx, int y, int x)
{
- byte feat;
+ byte feat;
- /* Disintegration balls explosions are stopped by perma-walls */
- if (!in_disintegration_range(by, bx, y, x)) return FALSE;
+ /* Disintegration balls explosions are stopped by perma-walls */
+ if (!in_disintegration_range(by, bx, y, x)) return FALSE;
- /* Permanent walls and artifacts don't get effect */
- /* But not protect monsters and other objects */
- if (!cave_valid_bold(y, x)) return TRUE;
+ /* Permanent walls and artifacts don't get effect */
+ /* But not protect monsters and other objects */
+ if (!cave_valid_bold(y, x)) return TRUE;
- /* Destroy mirror/glyph */
- remove_mirror(y,x);
+ /* Destroy mirror/glyph */
+ remove_mirror(y,x);
- feat = cave[y][x].feat;
+ feat = cave[y][x].feat;
- if ((feat < FEAT_PATTERN_START || feat > FEAT_PATTERN_XTRA2) &&
- (feat < FEAT_DEEP_WATER || feat > FEAT_GRASS))
- {
- if (feat == FEAT_TREES || feat == FEAT_FLOWER || feat == FEAT_DEEP_GRASS)
- cave_set_feat(y, x, FEAT_GRASS);
- else
- cave_set_feat(y, x, floor_type[randint0(100)]);
- }
+ if ((feat < FEAT_PATTERN_START || feat > FEAT_PATTERN_XTRA2) &&
+ (feat < FEAT_DEEP_WATER || feat > FEAT_GRASS))
+ {
+ if (feat == FEAT_TREES || feat == FEAT_FLOWER || feat == FEAT_DEEP_GRASS)
+ cave_set_feat(y, x, FEAT_GRASS);
+ else
+ cave_set_feat(y, x, floor_type[randint0(100)]);
+ }
- /* Update some things -- similar to GF_KILL_WALL */
- p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE);
+ /* Update some things -- similar to GF_KILL_WALL */
+ p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE);
- return TRUE;
+ return TRUE;
}
if (disint_ball)
{
- /* Disintegration are stopped only by perma-walls */
- if (real_breath)
- {
- /* Destroy terrains */
- if (!do_disintegration(by, bx, y, x)) continue;
- }
- else
- {
- /* No actual disintegration */
- if (!in_disintegration_range(by, bx, y, x)) continue;
- }
+ /* Disintegration are stopped only by perma-walls */
+ if (real_breath)
+ {
+ /* Destroy terrains */
+ if (!do_disintegration(by, bx, y, x)) continue;
+ }
+ else
+ {
+ /* No actual disintegration */
+ if (!in_disintegration_range(by, bx, y, x)) continue;
+ }
}
else
{
monster_target_y=py;
monster_target_x=px;
- /* Initialize with nul string */
- who_name[0] = '\0';
+ /* Initialize with nul string */
+ who_name[0] = '\0';
/* Hack -- Jump to target */
if (flg & (PROJECT_JUMP))
if( is_mirror_grid(&cave[y][x]))
{
/* The target of monsterspell becomes tha mirror(broken) */
- monster_target_y=(s16b)y;
+ monster_target_y=(s16b)y;
monster_target_x=(s16b)x;
remove_mirror(y,x);
cave[y][x].feat == FEAT_DOOR_TAIL ||
(cave[y][x].feat >= FEAT_WALL_EXTRA &&
cave[y][x].feat <= FEAT_PERM_SOLID ))
- {
+ {
if( second_step )continue;
break;
}
if( is_mirror_grid(&cave[y][x]) && !second_step )
{
/* The target of monsterspell becomes tha mirror(broken) */
- monster_target_y=(s16b)y;
+ monster_target_y=(s16b)y;
monster_target_x=(s16b)x;
remove_mirror(y,x);
if (typ == GF_DISINTEGRATE)
{
- /* Disintegration are stopped only by perma-walls */
- if (!do_disintegration(y2, x2, y, x)) continue;
+ /* Disintegration are stopped only by perma-walls */
+ if (!do_disintegration(y2, x2, y, x)) continue;
}
else
{
/* Hack -- Memorize */
c_ptr->info |= (CAVE_MARK);
- if (c_ptr->mimic)
- {
- /* Disclose a hidden trap */
- disclose_grid(y, x);
- }
- else
- {
- /* Redraw */
- lite_spot(y, x);
- }
+ if (c_ptr->mimic)
+ {
+ /* Disclose a hidden trap */
+ disclose_grid(y, x);
+ }
+ else
+ {
+ /* Redraw */
+ lite_spot(y, x);
+ }
/* Obvious */
detect = TRUE;
(c_ptr->feat == FEAT_LESS_LESS) ||
(c_ptr->feat == FEAT_MORE) ||
(c_ptr->feat == FEAT_MORE_MORE) ||
- (c_ptr->feat == FEAT_ENTRANCE))
+ (c_ptr->feat == FEAT_ENTRANCE))
{
/* Hack -- Memorize */
c_ptr->info |= (CAVE_MARK);
if (t < 20)
{
/* Create granite wall */
- cave_set_feat(y, x, FEAT_WALL_EXTRA);
+ cave_set_feat(y, x, FEAT_WALL_EXTRA);
}
/* Quartz */
else if (t < 70)
{
/* Create quartz vein */
- cave_set_feat(y, x, FEAT_QUARTZ);
+ cave_set_feat(y, x, FEAT_QUARTZ);
}
/* Magma */
else if (t < 100)
{
/* Create magma vein */
- cave_set_feat(y, x, FEAT_MAGMA);
+ cave_set_feat(y, x, FEAT_MAGMA);
}
/* Floor */
else
{
/* Create floor */
- cave_set_feat(y, x, floor_type[randint0(100)]);
+ cave_set_feat(y, x, floor_type[randint0(100)]);
}
}
}
/* Delete objects */
delete_object(yy, xx);
- /* Clear mirror, runes flag */
- c_ptr->info &= ~CAVE_OBJECT;
+ /* Clear mirror, runes flag */
+ c_ptr->info &= ~CAVE_OBJECT;
/* Wall (or floor) type */
t = (floor ? randint0(100) : 200);
if (t < 20)
{
/* Create granite wall */
- cave_set_feat(yy, xx, FEAT_WALL_EXTRA);
+ cave_set_feat(yy, xx, FEAT_WALL_EXTRA);
}
/* Quartz */
else if (t < 70)
{
/* Create quartz vein */
- cave_set_feat(yy, xx, FEAT_QUARTZ);
+ cave_set_feat(yy, xx, FEAT_QUARTZ);
}
/* Magma */
else if (t < 100)
{
/* Create magma vein */
- cave_set_feat(yy, xx, FEAT_MAGMA);
+ cave_set_feat(yy, xx, FEAT_MAGMA);
}
/* Floor */
else
{
/* Create floor */
- cave_set_feat(yy, xx, floor_type[randint0(100)]);
+ cave_set_feat(yy, xx, floor_type[randint0(100)]);
}
}
}
#else
msg_format("%^s wakes up.", m_name);
#endif
- /* Redraw the health bar */
- if (p_ptr->health_who == c_ptr->m_idx)
+ /* Redraw the health bar */
+ if (p_ptr->health_who == c_ptr->m_idx)
p_ptr->redraw |= (PR_HEALTH);
}
if ((c_ptr->feat <= FEAT_INVIS) || (c_ptr->feat == FEAT_DIRT) || (c_ptr->feat == FEAT_GRASS))
{
/* Forget the grid */
- if (!view_torch_grids) c_ptr->info &= ~(CAVE_MARK);
+ if (!view_torch_grids) c_ptr->info &= ~(CAVE_MARK);
/* Notice */
note_spot(y, x);
* This leaves only a check for 6 bounding walls!
*/
if (in_bounds(y, x) && cave_floor_bold(y, x) &&
- (next_to_walls_adj(y, x) == 6) && (next_to_open(y, x) <= 1)) return;
+ (next_to_walls_adj(y, x) == 6) && (next_to_open(y, x) <= 1)) return;
}
/* Paranoia -- verify space */
/* Create a glyph */
cave[py][px].info |= CAVE_OBJECT;
- cave[py][px].mimic = FEAT_GLYPH;
+ cave[py][px].mimic = FEAT_GLYPH;
/* Notice */
note_spot(py, px);
/* Create a mirror */
cave[py][px].info |= CAVE_OBJECT;
- cave[py][px].mimic = FEAT_MIRROR;
+ cave[py][px].mimic = FEAT_MIRROR;
/* Turn on the light */
cave[py][px].info |= CAVE_GLOW;
/* Create a glyph */
cave[py][px].info |= CAVE_OBJECT;
- cave[py][px].mimic = FEAT_MINOR_GLYPH;
+ cave[py][px].mimic = FEAT_MINOR_GLYPH;
/* Notice */
note_spot(py, px);
msg_format("%s ¤ÏâÁ¤¤¸÷¤òȯ¤·¤¿¡ª",o_name);
#else
msg_format("%s %s radiate%s a blinding light!",
- ((item >= 0) ? "Your" : "The"), o_name,
- ((o_ptr->number > 1) ? "" : "s"));
+ ((item >= 0) ? "Your" : "The"), o_name,
+ ((o_ptr->number > 1) ? "" : "s"));
#endif
if (o_ptr->name1 || o_ptr->art_name)
idx = is_autopick(o_ptr);
auto_inscribe_item(item, idx);
if (destroy_identify && !old_known)
- auto_destroy_item(item, idx);
+ auto_destroy_item(item, idx);
/* Something happened */
return (TRUE);
idx = is_autopick(o_ptr);
auto_inscribe_item(item, idx);
if (destroy_identify && !old_known)
- auto_destroy_item(item, idx);
+ auto_destroy_item(item, idx);
/* Success */
return (TRUE);
"¶²ÉݤΰŹõ¥ª¡¼¥é", "Ëɶñ", o_name);
#else
msg_format("A %s tries to %s, but your %s resists the effects!",
- "terrible black aura", "surround your armor", o_name);
+ "terrible black aura", "surround your armor", o_name);
#endif
}
"¶²ÉݤΰŹõ¥ª¡¼¥é", "Éð´ï", o_name);
#else
msg_format("A %s tries to %s, but your %s resists the effects!",
- "terrible black aura", "surround your weapon", o_name);
+ "terrible black aura", "surround your weapon", o_name);
#endif
}
{
/* Placing the new monster failed */
if (place_monster_aux(0, y, x, old_r_idx, (mode | PM_NO_KAGE | PM_IGNORE_TERRAIN)))
- m_list[hack_m_idx_ii] = back_m;
+ m_list[hack_m_idx_ii] = back_m;
}
if (targeted) target_who = hack_m_idx_ii;
char rumour[1024];
#ifdef JP
- /* ¥Ö¥é¥Ã¥¯¥Þ¡¼¥±¥Ã¥È¤Î¤È¤¤ÏÊ̤Υá¥Ã¥»¡¼¥¸¤ò½Ð¤¹ */
- if ( cur_store_num == STORE_BLACK ) {
- msg_print(comment_1_B[randint0(MAX_COMMENT_1)]);
- }
- else{
- msg_print(comment_1[randint0(MAX_COMMENT_1)]);
- }
+ /* ¥Ö¥é¥Ã¥¯¥Þ¡¼¥±¥Ã¥È¤Î¤È¤¤ÏÊ̤Υá¥Ã¥»¡¼¥¸¤ò½Ð¤¹ */
+ if ( cur_store_num == STORE_BLACK ) {
+ msg_print(comment_1_B[randint0(MAX_COMMENT_1)]);
+ }
+ else{
+ msg_print(comment_1[randint0(MAX_COMMENT_1)]);
+ }
#else
msg_print(comment_1[randint0(MAX_COMMENT_1)]);
#endif
static void say_comment_4(void)
{
#ifdef JP
- /* ¥Ö¥é¥Ã¥¯¥Þ¡¼¥±¥Ã¥È¤Î»þ¤ÏÊ̤Υá¥Ã¥»¡¼¥¸¤ò½Ð¤¹ */
- if ( cur_store_num == STORE_BLACK ){
- msg_print(comment_4a_B[randint0(MAX_COMMENT_4A)]);
- msg_print(comment_4b_B[randint0(MAX_COMMENT_4B)]);
- }
- else{
- msg_print(comment_4a[randint0(MAX_COMMENT_4A)]);
- msg_print(comment_4b[randint0(MAX_COMMENT_4B)]);
- }
+ /* ¥Ö¥é¥Ã¥¯¥Þ¡¼¥±¥Ã¥È¤Î»þ¤ÏÊ̤Υá¥Ã¥»¡¼¥¸¤ò½Ð¤¹ */
+ if ( cur_store_num == STORE_BLACK ){
+ msg_print(comment_4a_B[randint0(MAX_COMMENT_4A)]);
+ msg_print(comment_4b_B[randint0(MAX_COMMENT_4B)]);
+ }
+ else{
+ msg_print(comment_4a[randint0(MAX_COMMENT_4A)]);
+ msg_print(comment_4b[randint0(MAX_COMMENT_4B)]);
+ }
#else
msg_print(comment_4a[randint0(MAX_COMMENT_4A)]);
msg_print(comment_4b[randint0(MAX_COMMENT_4B)]);
static void say_comment_5(void)
{
#ifdef JP
- /* ¥Ö¥é¥Ã¥¯¥Þ¡¼¥±¥Ã¥È¤Î»þ¤ÏÊ̤Υá¥Ã¥»¡¼¥¸¤ò½Ð¤¹ */
- if ( cur_store_num == STORE_BLACK ){
- msg_print(comment_5_B[randint0(MAX_COMMENT_5)]);
- }
- else{
- msg_print(comment_5[randint0(MAX_COMMENT_5)]);
- }
+ /* ¥Ö¥é¥Ã¥¯¥Þ¡¼¥±¥Ã¥È¤Î»þ¤ÏÊ̤Υá¥Ã¥»¡¼¥¸¤ò½Ð¤¹ */
+ if ( cur_store_num == STORE_BLACK ){
+ msg_print(comment_5_B[randint0(MAX_COMMENT_5)]);
+ }
+ else{
+ msg_print(comment_5[randint0(MAX_COMMENT_5)]);
+ }
#else
msg_print(comment_5[randint0(MAX_COMMENT_5)]);
#endif
/* Only show the weight of an individual item */
int wgt = o_ptr->weight;
#ifdef JP
- sprintf(out_val, "%3d.%1d kg", lbtokg1(wgt) , lbtokg2(wgt) );
- put_str(out_val, i+6, 67);
+ sprintf(out_val, "%3d.%1d kg", lbtokg1(wgt) , lbtokg2(wgt) );
+ put_str(out_val, i+6, 67);
#else
(void)sprintf(out_val, "%3d.%d lb", wgt / 10, wgt % 10);
put_str(out_val, i+6, 68);
/* Only show the weight of an individual item */
int wgt = o_ptr->weight;
#ifdef JP
- sprintf(out_val, "%3d.%1d", lbtokg1(wgt) , lbtokg2(wgt) );
- put_str(out_val, i+6, 60);
+ sprintf(out_val, "%3d.%1d", lbtokg1(wgt) , lbtokg2(wgt) );
+ put_str(out_val, i+6, 60);
#else
(void)sprintf(out_val, "%3d.%d", wgt / 10, wgt % 10);
put_str(out_val, i+6, 61);
/* Build the prompt */
#ifdef JP
- (void)sprintf(out_val, "(%s:%c-%c, ESC¤ÇÃæÃÇ) %s",
- (((cur_store_num == STORE_HOME) || (cur_store_num == STORE_MUSEUM)) ? "¥¢¥¤¥Æ¥à" : "¾¦ÉÊ"),
+ (void)sprintf(out_val, "(%s:%c-%c, ESC¤ÇÃæÃÇ) %s",
+ (((cur_store_num == STORE_HOME) || (cur_store_num == STORE_MUSEUM)) ? "¥¢¥¤¥Æ¥à" : "¾¦ÉÊ"),
I2A(i), I2A(j), pmt);
#else
(void)sprintf(out_val, "(Items %c-%c, ESC to exit) %s",
* Return TRUE if offer is NOT okay
*/
static bool receive_offer(cptr pmt, s32b *poffer,
- s32b last_offer, int factor,
- s32b price, int final)
+ s32b last_offer, int factor,
+ s32b price, int final)
{
/* Haggle till done */
while (TRUE)
cancel = receive_offer("What do you offer? ",
#endif
- &offer, last_offer, 1, cur_ask, final);
+ &offer, last_offer, 1, cur_ask, final);
if (cancel)
{
prt("", 1, 0);
(void)sprintf(out_val,
#ifdef JP
- "Á°²ó¤ÎÄ󼨲Á³Ê $%ld", (long)last_offer);
+ "Á°²ó¤ÎÄ󼨲Á³Ê $%ld", (long)last_offer);
#else
"Your last bid %ld", (long)last_offer);
#endif
/* Prompt */
#ifdef JP
- /* ¥Ö¥é¥Ã¥¯¥Þ¡¼¥±¥Ã¥È¤Î»þ¤ÏÊ̤Υá¥Ã¥»¡¼¥¸ */
- switch( cur_store_num ) {
- case 7:
- sprintf(out_val, "¤É¤Î¥¢¥¤¥Æ¥à¤ò¼è¤ê¤Þ¤¹¤«? ");
- break;
- case 6:
- sprintf(out_val, "¤É¤ì? ");
- break;
- default:
- sprintf(out_val, "¤É¤ÎÉÊʪ¤¬Íߤ·¤¤¤ó¤À¤¤? ");
- break;
- }
+ /* ¥Ö¥é¥Ã¥¯¥Þ¡¼¥±¥Ã¥È¤Î»þ¤ÏÊ̤Υá¥Ã¥»¡¼¥¸ */
+ switch( cur_store_num ) {
+ case 7:
+ sprintf(out_val, "¤É¤Î¥¢¥¤¥Æ¥à¤ò¼è¤ê¤Þ¤¹¤«? ");
+ break;
+ case 6:
+ sprintf(out_val, "¤É¤ì? ");
+ break;
+ default:
+ sprintf(out_val, "¤É¤ÎÉÊʪ¤¬Íߤ·¤¤¤ó¤À¤¤? ");
+ break;
+ }
#else
if (cur_store_num == STORE_HOME)
{
{
if (cur_store_num == STORE_HOME)
#ifdef JP
- msg_print("²æ¤¬²È¤Ë¤Ï²¿¤âÃÖ¤¤¤Æ¤¢¤ê¤Þ¤»¤ó¡£");
+ msg_print("²æ¤¬²È¤Ë¤Ï²¿¤âÃÖ¤¤¤Æ¤¢¤ê¤Þ¤»¤ó¡£");
#else
msg_print("Your home is empty.");
#endif
- else if (cur_store_num == STORE_MUSEUM)
+ else if (cur_store_num == STORE_MUSEUM)
#ifdef JP
- msg_print("Çîʪ´Û¤Ë¤Ï²¿¤âÃÖ¤¤¤Æ¤¢¤ê¤Þ¤»¤ó¡£");
+ msg_print("Çîʪ´Û¤Ë¤Ï²¿¤âÃÖ¤¤¤Æ¤¢¤ê¤Þ¤»¤ó¡£");
#else
msg_print("Museum is empty.");
#endif
else
#ifdef JP
- msg_print("¸½ºß¾¦Éʤκ߸ˤòÀڤ餷¤Æ¤¤¤Þ¤¹¡£");
+ msg_print("¸½ºß¾¦Éʤκ߸ˤòÀڤ餷¤Æ¤¤¤Þ¤¹¡£");
#else
msg_print("I am currently out of stock.");
#endif
else
{
store_top += 12;
- /*
- * ±£¤·¥ª¥×¥·¥ç¥ó(powerup_home)¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¤¤Ï
- * ²æ¤¬²È¤Ç¤Ï 2 ¥Ú¡¼¥¸¤Þ¤Ç¤·¤«É½¼¨¤·¤Ê¤¤
- */
- if ((cur_store_num == STORE_HOME) &&
- (powerup_home == FALSE) &&
- (st_ptr->stock_num >= STORE_INVEN_MAX))
- {
- if (store_top >= (STORE_INVEN_MAX - 1))
- {
- store_top = 0;
- }
- }
- else
- {
- if (store_top >= st_ptr->stock_num) store_top = 0;
- }
+ /*
+ * ±£¤·¥ª¥×¥·¥ç¥ó(powerup_home)¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¤¤Ï
+ * ²æ¤¬²È¤Ç¤Ï 2 ¥Ú¡¼¥¸¤Þ¤Ç¤·¤«É½¼¨¤·¤Ê¤¤
+ */
+ if ((cur_store_num == STORE_HOME) &&
+ (powerup_home == FALSE) &&
+ (st_ptr->stock_num >= STORE_INVEN_MAX))
+ {
+ if (store_top >= (STORE_INVEN_MAX - 1))
+ {
+ store_top = 0;
+ }
+ }
+ else
+ {
+ if (store_top >= st_ptr->stock_num) store_top = 0;
+ }
display_inventory();
}
if (cur_store_num == STORE_HOME)
{
#ifdef JP
- prt("g) ¥¢¥¤¥Æ¥à¤ò¼è¤ë", 21, 27);
- prt("d) ¥¢¥¤¥Æ¥à¤òÃÖ¤¯", 22, 27);
+ prt("g) ¥¢¥¤¥Æ¥à¤ò¼è¤ë", 21, 27);
+ prt("d) ¥¢¥¤¥Æ¥à¤òÃÖ¤¯", 22, 27);
prt("x) ²È¤Î¥¢¥¤¥Æ¥à¤òÄ´¤Ù¤ë", 23,27);
#else
prt("g) Get an item.", 21, 27);
else if (cur_store_num == STORE_MUSEUM)
{
#ifdef JP
- prt("d) ¥¢¥¤¥Æ¥à¤òÃÖ¤¯", 21, 27);
+ prt("d) ¥¢¥¤¥Æ¥à¤òÃÖ¤¯", 21, 27);
prt("x) Çîʪ´Û¤Î¥¢¥¤¥Æ¥à¤òÄ´¤Ù¤ë", 23,27);
#else
prt("d) Drop an item.", 21, 27);
else
{
#ifdef JP
- prt("p) ¾¦ÉʤòÇ㤦", 21, 30);
- prt("s) ¥¢¥¤¥Æ¥à¤òÇä¤ë", 22, 30);
+ prt("p) ¾¦ÉʤòÇ㤦", 21, 30);
+ prt("s) ¥¢¥¤¥Æ¥à¤òÇä¤ë", 22, 30);
prt("x) ¾¦ÉʤòÄ´¤Ù¤ë", 23,30);
#else
prt("p) Purchase an item.", 21, 30);
}
#ifdef JP
- /* ´ðËÜŪ¤Ê¥³¥Þ¥ó¥É¤ÎÄɲÃɽ¼¨ */
-
- prt("i/e) »ý¤Áʪ/ÁõÈ÷¤Î°ìÍ÷", 21, 56);
-
- if( rogue_like_commands == TRUE )
- {
- prt("w/T) ÁõÈ÷¤¹¤ë/¤Ï¤º¤¹", 22, 56);
- }
- else
- {
- prt("w/t) ÁõÈ÷¤¹¤ë/¤Ï¤º¤¹", 22, 56);
- }
+ /* ´ðËÜŪ¤Ê¥³¥Þ¥ó¥É¤ÎÄɲÃɽ¼¨ */
+
+ prt("i/e) »ý¤Áʪ/ÁõÈ÷¤Î°ìÍ÷", 21, 56);
+
+ if( rogue_like_commands == TRUE )
+ {
+ prt("w/T) ÁõÈ÷¤¹¤ë/¤Ï¤º¤¹", 22, 56);
+ }
+ else
+ {
+ prt("w/t) ÁõÈ÷¤¹¤ë/¤Ï¤º¤¹", 22, 56);
+ }
#else
- prt("i/e) Inventry/Equipment list", 21, 56);
-
- if( rogue_like_commands == TRUE )
- {
- prt("w/T) Wear/Take off equipment", 22, 56);
- }
- else
- {
- prt("w/t) Wear/Take off equipment", 22, 56);
- }
+ prt("i/e) Inventry/Equipment list", 21, 56);
+
+ if( rogue_like_commands == TRUE )
+ {
+ prt("w/T) Wear/Take off equipment", 22, 56);
+ }
+ else
+ {
+ prt("w/t) Wear/Take off equipment", 22, 56);
+ }
#endif
/* Prompt */
#ifdef JP
if (one_in_(DUN_WAT_CHG) && (width > 0))
{
recursive_river(x1 + dx + changex, y1 + dy + changey,
- x1 + 8 * (dx + changex), y1 + 8 * (dy + changey),
- feat1, feat2, width - 1);
+ x1 + 8 * (dx + changex), y1 + 8 * (dy + changey),
+ feat1, feat2, width - 1);
}
}
else
else
c_ptr->feat = feat1;
- /* Clear garbage of hidden trap or door */
- c_ptr->mimic = 0;
+ /* Clear garbage of hidden trap or door */
+ c_ptr->mimic = 0;
/* Lava terrain glows */
if ((feat1 == FEAT_DEEP_LAVA) || (feat1 == FEAT_SHAL_LAVA))
/* Clear previous contents, add proper vein type */
c_ptr->feat = feat;
- /* Paranoia: Clear mimic field */
- c_ptr->mimic = 0;
+ /* Paranoia: Clear mimic field */
+ c_ptr->mimic = 0;
/* Hack -- Add some (known) treasure */
if (treasure && one_in_(chance)) c_ptr->feat += 0x04;
cave[j][i].feat = FEAT_RUBBLE;
}
- /* Clear garbage of hidden trap or door */
- c_ptr->mimic = 0;
+ /* Clear garbage of hidden trap or door */
+ c_ptr->mimic = 0;
/* Light area since is open above */
cave[j][i].info |= (CAVE_GLOW | CAVE_ROOM);
place_floor_grid(c_ptr);
}
- /* Clear garbage of hidden trap or door */
- c_ptr->mimic = 0;
+ /* Clear garbage of hidden trap or door */
+ c_ptr->mimic = 0;
/* No longer part of a room or vault */
c_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY);
*/
#ifdef JP
- { "¥Õ¥ì¥ó¥É¥ê¡¼¤Ê¥Ó¥ë¥Ü", 200, 170, 108, 5, 15, RACE_HOBBIT},
+ { "¥Õ¥ì¥ó¥É¥ê¡¼¤Ê¥Ó¥ë¥Ü", 200, 170, 108, 5, 15, RACE_HOBBIT},
/* { "²±É¼ԥ饹¥È¥ê¥ó", 200, 175, 108, 4, 12, RACE_HUMAN}, */
- { "²±É¼ԥê¥ó¥¹¥¦¥£¥ó¥É", 200, 175, 108, 4, 12, RACE_HUMAN},
- { "ÇؤÎÄ㤤¥µ¥ë¥¿¥ó", 300, 170, 107, 5, 15, RACE_GNOME},
- { "¥Ï¥ó¥µ¥à¤Ê¥é¥¤¥¢=¥¨¥ë", 300, 165, 107, 6, 18, RACE_ELF},
+ { "²±É¼ԥê¥ó¥¹¥¦¥£¥ó¥É", 200, 175, 108, 4, 12, RACE_HUMAN},
+ { "ÇؤÎÄ㤤¥µ¥ë¥¿¥ó", 300, 170, 107, 5, 15, RACE_GNOME},
+ { "¥Ï¥ó¥µ¥à¤Ê¥é¥¤¥¢=¥¨¥ë", 300, 165, 107, 6, 18, RACE_ELF},
#else
{ "Bilbo the Friendly", 200, 170, 108, 5, 15, RACE_HOBBIT},
/* { "Raistlin the Chicken", 200, 175, 108, 4, 12, RACE_HUMAN}, */
{
/* Armoury - 28 unique names */
#ifdef JP
- { "½¹°¥³¥ó=¥À¡¼", 5000, 210, 115, 5, 7, RACE_HALF_ORC},
- { "´è¸Ç¼Ô¥À¡¼¥°=¥í¥¦", 10000, 190, 111, 4, 9, RACE_HUMAN},
- { "¸¼Ô¥Ç¥«¥É", 25000, 200, 112, 4, 10, RACE_DUNADAN},
- { "ÃÃÌê²°¤Î¥¦¥£¡¼¥é¥ó¥É", 30000, 200, 112, 4, 5, RACE_DWARF},
+ { "½¹°¥³¥ó=¥À¡¼", 5000, 210, 115, 5, 7, RACE_HALF_ORC},
+ { "´è¸Ç¼Ô¥À¡¼¥°=¥í¥¦", 10000, 190, 111, 4, 9, RACE_HUMAN},
+ { "¸¼Ô¥Ç¥«¥É", 25000, 200, 112, 4, 10, RACE_DUNADAN},
+ { "ÃÃÌê²°¤Î¥¦¥£¡¼¥é¥ó¥É", 30000, 200, 112, 4, 5, RACE_DWARF},
#else
{ "Kon-Dar the Ugly", 5000, 210, 115, 5, 7, RACE_HALF_ORC},
{ "Darg-Low the Grim", 10000, 190, 111, 4, 9, RACE_HUMAN},
{ "Decado the Handsome", 25000, 200, 112, 4, 10, RACE_AMBERITE},
#endif
#ifdef JP
- { "¥¨¥í¡¼¡¦¥É¥é¥´¥ó¥¹¥±¥¤¥ë", 30000, 200, 112, 4, 5, RACE_ELF},
+ { "¥¨¥í¡¼¡¦¥É¥é¥´¥ó¥¹¥±¥¤¥ë", 30000, 200, 112, 4, 5, RACE_ELF},
#else
- { "Elo Dragonscale", 30000, 200, 112, 4, 5, RACE_ELF},
+ { "Elo Dragonscale", 30000, 200, 112, 4, 5, RACE_ELF},
#endif
#ifdef JP
{ "¥Ç¥ê¥«¥È¥¹", 10000, 210, 115, 5, 7, RACE_SPRITE},
{ "Animus", 25000, 200, 112, 4, 10, RACE_GOLEM},
#endif
#ifdef JP
- { "¥Þ¥ë¥ô¥¡¥¹", 30000, 200, 112, 4, 5, RACE_HALF_TITAN},
+ { "¥Þ¥ë¥ô¥¡¥¹", 30000, 200, 112, 4, 5, RACE_HALF_TITAN},
#else
- { "Malvus", 30000, 200, 112, 4, 5, RACE_HALF_TITAN},
+ { "Malvus", 30000, 200, 112, 4, 5, RACE_HALF_TITAN},
#endif
#ifdef JP
{ "¥»¥é¥¯¥·¥¹", 10000, 210, 115, 5, 7, RACE_ZOMBIE},
{ "Drios the Faint", 25000, 200, 112, 4, 10, RACE_SPECTRE},
#endif
#ifdef JP
- { "Î䤿¤¤¥Ð¥¹¥ê¥Ã¥¯", 30000, 200, 112, 4, 5, RACE_VAMPIRE},
+ { "Î䤿¤¤¥Ð¥¹¥ê¥Ã¥¯", 30000, 200, 112, 4, 5, RACE_VAMPIRE},
#else
- { "Bathric the Cold", 30000, 200, 112, 4, 5, RACE_VAMPIRE},
+ { "Bathric the Cold", 30000, 200, 112, 4, 5, RACE_VAMPIRE},
#endif
#ifdef JP
{ "Îä¹ó¥ô¥§¥ó¥¸¥§¥é", 10000, 210, 115, 5, 7, RACE_HALF_TROLL},
{ "Yojo II", 25000, 200, 112, 4, 10, RACE_DWARF},
#endif
#ifdef JP
- { "Í¥¤·¤¤¥é¥Ê¥é¡¼", 30000, 200, 112, 4, 5, RACE_AMBERITE},
+ { "Í¥¤·¤¤¥é¥Ê¥é¡¼", 30000, 200, 112, 4, 5, RACE_AMBERITE},
#else
- { "Ranalar the Sweet", 30000, 200, 112, 4, 5, RACE_AMBERITE},
+ { "Ranalar the Sweet", 30000, 200, 112, 4, 5, RACE_AMBERITE},
#endif
#ifdef JP
{ "ÉÔ¾ô¤Î¥Û¥ë¥Ð¥°", 5000, 210, 115, 5, 7, RACE_HALF_ORC},
{ "Isedrelias", 25000, 200, 112, 4, 10, RACE_SPRITE},
#endif
#ifdef JP
- { "°ì¤ÄÌÜ¥ô¥§¥°¥Ê¡¼", 5000, 200, 112, 4, 5, RACE_CYCLOPS},
+ { "°ì¤ÄÌÜ¥ô¥§¥°¥Ê¡¼", 5000, 200, 112, 4, 5, RACE_CYCLOPS},
#else
- { "Vegnar One-eye", 5000, 200, 112, 4, 5, RACE_CYCLOPS},
+ { "Vegnar One-eye", 5000, 200, 112, 4, 5, RACE_CYCLOPS},
#endif
#ifdef JP
{ "º®Æ٤Υí¥Ç¥£¥Ã¥·¥å", 10000, 210, 115, 5, 7, RACE_BEASTMAN},
{ "Elvererith the Cheat", 10000, 200, 112, 4, 10, RACE_DARK_ELF},
#endif
#ifdef JP
- { "¥¤¥ó¥×¤Î¥¶¥µ¥¹", 30000, 200, 112, 4, 5, RACE_IMP},
+ { "¥¤¥ó¥×¤Î¥¶¥µ¥¹", 30000, 200, 112, 4, 5, RACE_IMP},
#else
- { "Zzathath the Imp", 30000, 200, 112, 4, 5, RACE_IMP},
+ { "Zzathath the Imp", 30000, 200, 112, 4, 5, RACE_IMP},
#endif
#ifdef JP
{ "½¹°¥³¥ó=¥À¡¼", 5000, 210, 115, 5, 7, RACE_HALF_ORC},
{
/* Weapon Smith - 28 unique names */
#ifdef JP
- { "»ÄǦ¤Ê¤ë¥¢¡¼¥Î¥ë¥É", 5000, 210, 115, 6, 6, RACE_HALF_TROLL},
- { "½Ã»¦¤·¤Î¥¢¡¼¥ó¥À¥ë", 10000, 185, 110, 5, 9, RACE_HALF_ELF},
- { "½Ã¥Þ¥¹¥¿¡¼¤Î¥¨¥Ç¥£¡¼", 25000, 190, 115, 5, 7, RACE_HOBBIT},
- { "廦¤·¤Î¥ª¥°¥é¥¤¥ó", 30000, 195, 112, 4, 8, RACE_DWARF},
+ { "»ÄǦ¤Ê¤ë¥¢¡¼¥Î¥ë¥É", 5000, 210, 115, 6, 6, RACE_HALF_TROLL},
+ { "½Ã»¦¤·¤Î¥¢¡¼¥ó¥À¥ë", 10000, 185, 110, 5, 9, RACE_HALF_ELF},
+ { "½Ã¥Þ¥¹¥¿¡¼¤Î¥¨¥Ç¥£¡¼", 25000, 190, 115, 5, 7, RACE_HOBBIT},
+ { "廦¤·¤Î¥ª¥°¥é¥¤¥ó", 30000, 195, 112, 4, 8, RACE_DWARF},
#else
{ "Arnold the Beastly", 5000, 210, 115, 6, 6, RACE_BARBARIAN},
{ "Arndal Beast-Slayer", 10000, 185, 110, 5, 9, RACE_HALF_ELF},
{
/* Temple - 22 unique names */
#ifdef JP
- { "¼ÁÁǤʥ롼¥É¥ô¥£¥Ò", 5000, 175, 109, 6, 15, RACE_HUMAN},
- { "¥Ñ¥é¥Ç¥£¥ó¤Î¥¬¥ó¥Ê¡¼", 10000, 185, 110, 5, 23, RACE_HUMAN},
- { "Áª¤Ð¤ì¤·¥È¥ê¥ó", 25000, 180, 107, 6, 20, RACE_ELF},
- { "¸ÌÀ¤Ê¤ë¥µ¥é¥¹¥È¥í", 30000, 185, 109, 5, 15, RACE_DWARF},
+ { "¼ÁÁǤʥ롼¥É¥ô¥£¥Ò", 5000, 175, 109, 6, 15, RACE_HUMAN},
+ { "¥Ñ¥é¥Ç¥£¥ó¤Î¥¬¥ó¥Ê¡¼", 10000, 185, 110, 5, 23, RACE_HUMAN},
+ { "Áª¤Ð¤ì¤·¥È¥ê¥ó", 25000, 180, 107, 6, 20, RACE_ELF},
+ { "¸ÌÀ¤Ê¤ë¥µ¥é¥¹¥È¥í", 30000, 185, 109, 5, 15, RACE_DWARF},
#else
{ "Ludwig the Humble", 5000, 175, 109, 6, 15, RACE_DWARF},
{ "Gunnar the Paladin", 10000, 185, 110, 5, 23, RACE_HALF_TROLL},
{
/* Alchemist - 26 unique names */
#ifdef JP
- { "²½³Ø¼Ô¥Þ¥¦¥¶¡¼", 10000, 190, 111, 5, 8, RACE_HALF_ELF},
- { "¥«¥ª¥¹¤Î¥¦¥£¥º¥ë", 10000, 190, 110, 6, 8, RACE_HOBBIT},
- { "¶¯ÍߥߥÀ¥¹", 15000, 200, 116, 6, 9, RACE_GNOME},
- { "Éϼ奸¥ã=¥Õ¥¡¡¼", 15000, 220, 111, 4, 9, RACE_ELF},/*FIRST*/
+ { "²½³Ø¼Ô¥Þ¥¦¥¶¡¼", 10000, 190, 111, 5, 8, RACE_HALF_ELF},
+ { "¥«¥ª¥¹¤Î¥¦¥£¥º¥ë", 10000, 190, 110, 6, 8, RACE_HOBBIT},
+ { "¶¯ÍߥߥÀ¥¹", 15000, 200, 116, 6, 9, RACE_GNOME},
+ { "Éϼ奸¥ã=¥Õ¥¡¡¼", 15000, 220, 111, 4, 9, RACE_ELF},/*FIRST*/
#else
{ "Mauser the Chemist", 10000, 190, 111, 5, 8, RACE_HALF_ELF},
{ "Wizzle the Chaotic", 10000, 190, 110, 6, 8, RACE_HOBBIT},
#endif
#ifdef JP
- { "¥«¥«¥ë¥é¥«¥«¥ë", 15000, 200, 116, 6, 9, RACE_KLACKON},
+ { "¥«¥«¥ë¥é¥«¥«¥ë", 15000, 200, 116, 6, 9, RACE_KLACKON},
#else
- { "Kakalrakakal", 15000, 200, 116, 6, 9, RACE_KLACKON},
+ { "Kakalrakakal", 15000, 200, 116, 6, 9, RACE_KLACKON},
#endif
#ifdef JP
- { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹", 15000, 220, 111, 4, 9, RACE_ELF},
+ { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹", 15000, 220, 111, 4, 9, RACE_ELF},
#else
- { "Jal-Eth the Alchemist", 15000, 220, 111, 4, 9, RACE_ELF},
+ { "Jal-Eth the Alchemist", 15000, 220, 111, 4, 9, RACE_ELF},
#endif
#ifdef JP
{ "ÍÑ¿´¿¼¤¤¥Õ¥¡¥Í¥é¥¹", 10000, 190, 111, 5, 8, RACE_DWARF},
{ "Runcie the Insane", 10000, 190, 110, 6, 8, RACE_HUMAN},
#endif
#ifdef JP
- { "¥°¥é¥ó¥Ö¥ë¥ï¡¼¥¹", 15000, 200, 116, 6, 9, RACE_GNOME},
+ { "¥°¥é¥ó¥Ö¥ë¥ï¡¼¥¹", 15000, 200, 116, 6, 9, RACE_GNOME},
#else
- { "Grumbleworth", 15000, 200, 116, 6, 9, RACE_GNOME},
+ { "Grumbleworth", 15000, 200, 116, 6, 9, RACE_GNOME},
#endif
#ifdef JP
- { "¥Õ¥ê¥Ã¥¿¡¼", 15000, 220, 111, 4, 9, RACE_SPRITE},
+ { "¥Õ¥ê¥Ã¥¿¡¼", 15000, 220, 111, 4, 9, RACE_SPRITE},
#else
- { "Flitter", 15000, 220, 111, 4, 9, RACE_SPRITE},
+ { "Flitter", 15000, 220, 111, 4, 9, RACE_SPRITE},
#endif
#ifdef JP
{ "¥¶¥ê¥ë¥¹", 10000, 190, 111, 5, 8, RACE_HUMAN},
{ "Egbert the Old", 10000, 190, 110, 6, 8, RACE_DWARF},
#endif
#ifdef JP
- { "¸Ø¤ê¹â¤¥ô¥¡¥ê¥ó¥É¥é", 15000, 200, 116, 6, 9, RACE_HIGH_ELF},
+ { "¸Ø¤ê¹â¤¥ô¥¡¥ê¥ó¥É¥é", 15000, 200, 116, 6, 9, RACE_HIGH_ELF},
#else
- { "Valindra the Proud", 15000, 200, 116, 6, 9, RACE_HIGH_ELF},
+ { "Valindra the Proud", 15000, 200, 116, 6, 9, RACE_HIGH_ELF},
#endif
#ifdef JP
- { "Ï£¶â½Ñ»Õ¥¿¥¨¥ó", 15000, 220, 111, 4, 9, RACE_HUMAN},
+ { "Ï£¶â½Ñ»Õ¥¿¥¨¥ó", 15000, 220, 111, 4, 9, RACE_HUMAN},
#else
- { "Taen the Alchemist", 15000, 220, 111, 4, 9, RACE_HUMAN},
+ { "Taen the Alchemist", 15000, 220, 111, 4, 9, RACE_HUMAN},
#endif
#ifdef JP
{ "¹ª¸À¥«¥¤¥É", 10000, 190, 111, 5, 8, RACE_VAMPIRE},
{ "Fulir the Dark", 10000, 190, 110, 6, 8, RACE_NIBELUNG},
#endif
#ifdef JP
- { "¼ÁÁǤʥɥà¥ê", 15000, 200, 116, 6, 9, RACE_DWARF},
+ { "¼ÁÁǤʥɥà¥ê", 15000, 200, 116, 6, 9, RACE_DWARF},
#else
- { "Domli the Humble", 15000, 200, 116, 6, 9, RACE_DWARF},
+ { "Domli the Humble", 15000, 200, 116, 6, 9, RACE_DWARF},
#endif
#ifdef JP
- { "Ëâ¤Î»Ò¥ä¥¡¥¸¥å¥Ã¥«", 15000, 220, 111, 4, 9, RACE_IMP},
+ { "Ëâ¤Î»Ò¥ä¥¡¥¸¥å¥Ã¥«", 15000, 220, 111, 4, 9, RACE_IMP},
#else
- { "Yaarjukka Demonspawn", 15000, 220, 111, 4, 9, RACE_IMP},
+ { "Yaarjukka Demonspawn", 15000, 220, 111, 4, 9, RACE_IMP},
#endif
#ifdef JP
{ "ÌôÁð»Õ¥¸¥§¥é¥é¥ë¥É¡¼¥ë", 10000, 190, 111, 5, 8, RACE_HIGH_ELF},
{ "Olelaldan the Wise", 10000, 190, 110, 6, 8, RACE_BARBARIAN},
#endif
#ifdef JP
- { "¥Ç¥â¥Ë¥·¥¹¥È¤Î¥Õ¥¾¥°¥í", 15000, 200, 116, 6, 9, RACE_IMP},
+ { "¥Ç¥â¥Ë¥·¥¹¥È¤Î¥Õ¥¾¥°¥í", 15000, 200, 116, 6, 9, RACE_IMP},
#else
- { "Fthoglo the Demonicist", 15000, 200, 116, 6, 9, RACE_IMP},
+ { "Fthoglo the Demonicist", 15000, 200, 116, 6, 9, RACE_IMP},
#endif
#ifdef JP
- { "Ï£¶â½Ñ»Õ¥É¥¥¥ê¥¢¥·¥å", 15000, 220, 111, 4, 9, RACE_HALF_ORC},
+ { "Ï£¶â½Ñ»Õ¥É¥¥¥ê¥¢¥·¥å", 15000, 220, 111, 4, 9, RACE_HALF_ORC},
#else
- { "Dridash the Alchemist", 15000, 220, 111, 4, 9, RACE_HALF_ORC},
+ { "Dridash the Alchemist", 15000, 220, 111, 4, 9, RACE_HALF_ORC},
#endif
#ifdef JP
{ "¶¯¼Ô¥Í¥ê¥¢", 10000, 190, 111, 5, 8, RACE_CYCLOPS},
{ "Lignus the Pungent", 10000, 190, 110, 6, 8, RACE_HALF_ORC},
#endif
#ifdef JP
- { "¥Æ¥£¥ë¥Ð", 15000, 200, 116, 6, 9, RACE_HOBBIT},
+ { "¥Æ¥£¥ë¥Ð", 15000, 200, 116, 6, 9, RACE_HOBBIT},
#else
- { "Tilba", 15000, 200, 116, 6, 9, RACE_HOBBIT},
+ { "Tilba", 15000, 200, 116, 6, 9, RACE_HOBBIT},
#endif
#ifdef JP
- { "¶â»ý¤Á¥ß¥ê¥ë¥É¥ê¥Ã¥¯", 15000, 220, 111, 4, 9, RACE_HUMAN},
+ { "¶â»ý¤Á¥ß¥ê¥ë¥É¥ê¥Ã¥¯", 15000, 220, 111, 4, 9, RACE_HUMAN},
#else
- { "Myrildric the Wealthy", 15000, 220, 111, 4, 9, RACE_HUMAN},
+ { "Myrildric the Wealthy", 15000, 220, 111, 4, 9, RACE_HUMAN},
#endif
#ifdef JP
{ "²Ê³Ø¼Ô¥Þ¥¦¥¶¡¼", 10000, 190, 111, 5, 8, RACE_HALF_ELF},
{ "Ja-Far the Alchemist", 15000, 220, 111, 4, 9, RACE_ELF},
#endif
#ifdef JP
- { "¥«¥«¥ë¥é¥«¥«¥ë", 15000, 200, 116, 6, 9, RACE_KLACKON},
+ { "¥«¥«¥ë¥é¥«¥«¥ë", 15000, 200, 116, 6, 9, RACE_KLACKON},
#else
- { "Kakalrakakal", 15000, 200, 116, 6, 9, RACE_KLACKON},
+ { "Kakalrakakal", 15000, 200, 116, 6, 9, RACE_KLACKON},
#endif
#ifdef JP
- { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹", 15000, 220, 111, 4, 9, RACE_ELF},
+ { "Ï£¶â½Ñ»Õ¥¸¥ã¥ë=¥¨¥¹", 15000, 220, 111, 4, 9, RACE_ELF},
#else
- { "Jal-Eth the Alchemist", 15000, 220, 111, 4, 9, RACE_ELF},
+ { "Jal-Eth the Alchemist", 15000, 220, 111, 4, 9, RACE_ELF},
#endif
},
{
/* Magic Shop - 23 unique names */
#ifdef JP
- { "¥½¡¼¥µ¥é¡¼¤Î¥í=¥Ñ¥ó", 20000, 200, 110, 7, 8, RACE_HALF_ELF},
- { "°ÎÂç¤Ê¤ë¥Ö¥¬¡¼¥Ó¥¤", 20000, 215, 113, 6, 10, RACE_GNOME},
- { "¥¤¥§¥ó¥À¡¼¤ÎËâË¡»È¤¤", 30000, 200, 110, 7, 10, RACE_HUMAN},
- { "»àÎî»È¤¤¥ê¥ã¥¯",30000, 175, 110, 5, 11, RACE_HIGH_ELF},
+ { "¥½¡¼¥µ¥é¡¼¤Î¥í=¥Ñ¥ó", 20000, 200, 110, 7, 8, RACE_HALF_ELF},
+ { "°ÎÂç¤Ê¤ë¥Ö¥¬¡¼¥Ó¥¤", 20000, 215, 113, 6, 10, RACE_GNOME},
+ { "¥¤¥§¥ó¥À¡¼¤ÎËâË¡»È¤¤", 30000, 200, 110, 7, 10, RACE_HUMAN},
+ { "»àÎî»È¤¤¥ê¥ã¥¯",30000, 175, 110, 5, 11, RACE_HIGH_ELF},
#else
{ "Lo Pan the Sorcerer", 20000, 200, 110, 7, 8, RACE_HALF_ELF},
{ "Buggerby the Great", 20000, 215, 113, 6, 10, RACE_GNOME},
#endif
#ifdef JP
- { "Ëâ½Ñ»Õ¥¹¥¥É¥¥¥Ë¡¼", 15000, 200, 110, 7, 8, RACE_HALF_ELF},
+ { "Ëâ½Ñ»Õ¥¹¥¥É¥¥¥Ë¡¼", 15000, 200, 110, 7, 8, RACE_HALF_ELF},
#else
- { "Skidney the Sorcerer", 15000, 200, 110, 7, 8, RACE_HALF_ELF},
+ { "Skidney the Sorcerer", 15000, 200, 110, 7, 8, RACE_HALF_ELF},
#endif
#ifdef JP
- { "¸¸½Ñ»Õ¥¥ê¥¢", 30000, 200, 110, 7, 10, RACE_HUMAN},
+ { "¸¸½Ñ»Õ¥¥ê¥¢", 30000, 200, 110, 7, 10, RACE_HUMAN},
#else
- { "Kyria the Illusionist", 30000, 200, 110, 7, 10, RACE_HUMAN},
+ { "Kyria the Illusionist", 30000, 200, 110, 7, 10, RACE_HUMAN},
#endif
#ifdef JP
- { "»àÎî½Ñ»Õ¥Ë¥Ã¥", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
+ { "»àÎî½Ñ»Õ¥Ë¥Ã¥", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
#else
- { "Nikki the Necromancer", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
+ { "Nikki the Necromancer", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
#endif
#ifdef JP
- { "¥½¥í¥¹¥È¥é¥ó", 15000, 200, 110, 7, 8, RACE_SPRITE},
+ { "¥½¥í¥¹¥È¥é¥ó", 15000, 200, 110, 7, 8, RACE_SPRITE},
#else
- { "Solostoran", 15000, 200, 110, 7, 8, RACE_SPRITE},
+ { "Solostoran", 15000, 200, 110, 7, 8, RACE_SPRITE},
#endif
#ifdef JP
{ "±¨Â±¸ý¥¢¥Á¥·¥§", 20000, 215, 113, 6, 10, RACE_MIND_FLAYER},
{ "Achshe the Tentacled", 20000, 215, 113, 6, 10, RACE_MIND_FLAYER},
#endif
#ifdef JP
- { "µ®Â²¤Î¥«¥¶", 30000, 200, 110, 7, 10, RACE_HIGH_ELF},
+ { "µ®Â²¤Î¥«¥¶", 30000, 200, 110, 7, 10, RACE_HIGH_ELF},
#else
- { "Kaza the Noble", 30000, 200, 110, 7, 10, RACE_HIGH_ELF},
+ { "Kaza the Noble", 30000, 200, 110, 7, 10, RACE_HIGH_ELF},
#endif
#ifdef JP
- { "°Å¤¥Õ¥¡¥¸¥ë", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
+ { "°Å¤¥Õ¥¡¥¸¥ë", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
#else
- { "Fazzil the Dark", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
+ { "Fazzil the Dark", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
#endif
#ifdef JP
- { "°ÎÂç¤Ê¤ë¥±¥ë¥É¡¼¥ó", 15000, 200, 110, 7, 8, RACE_DWARF},
+ { "°ÎÂç¤Ê¤ë¥±¥ë¥É¡¼¥ó", 15000, 200, 110, 7, 8, RACE_DWARF},
#else
- { "Keldorn the Grand", 15000, 200, 110, 7, 8, RACE_DWARF},
+ { "Keldorn the Grand", 15000, 200, 110, 7, 8, RACE_DWARF},
#endif
#ifdef JP
{ "¥Õ¥£¥é¥ó¥¹¥í¥×¥¹", 20000, 215, 113, 6, 10, RACE_HOBBIT},
{ "Philanthropus", 20000, 215, 113, 6, 10, RACE_HOBBIT},
#endif
#ifdef JP
- { "Ëâ½÷¤Î¥¢¥°¥Ê¡¼", 30000, 200, 110, 7, 10, RACE_HUMAN},
+ { "Ëâ½÷¤Î¥¢¥°¥Ê¡¼", 30000, 200, 110, 7, 10, RACE_HUMAN},
#else
- { "Agnar the Enchantress", 30000, 200, 110, 7, 10, RACE_HUMAN},
+ { "Agnar the Enchantress", 30000, 200, 110, 7, 10, RACE_HUMAN},
#endif
#ifdef JP
- { "»àÎî½Ñ»Õ¥Ó¥å¥ê¥¢¥ó¥¹", 30000, 175, 110, 5, 11, RACE_BEASTMAN},
+ { "»àÎî½Ñ»Õ¥Ó¥å¥ê¥¢¥ó¥¹", 30000, 175, 110, 5, 11, RACE_BEASTMAN},
#else
- { "Buliance the Necromancer", 30000, 175, 110, 5, 11, RACE_BEASTMAN},
+ { "Buliance the Necromancer", 30000, 175, 110, 5, 11, RACE_BEASTMAN},
#endif
#ifdef JP
- { "¥Ï¥¤¥á¥¤¥¸¤Î¥ô¥¤¥é¥¯", 15000, 200, 110, 7, 8, RACE_BEASTMAN},
+ { "¥Ï¥¤¥á¥¤¥¸¤Î¥ô¥¤¥é¥¯", 15000, 200, 110, 7, 8, RACE_BEASTMAN},
#else
- { "Vuirak the High-Mage", 15000, 200, 110, 7, 8, RACE_BEASTMAN},
+ { "Vuirak the High-Mage", 15000, 200, 110, 7, 8, RACE_BEASTMAN},
#endif
#ifdef JP
{ "Ãηüԥޥǥ£¥Ã¥·¥å", 20000, 215, 113, 6, 10, RACE_BEASTMAN},
{ "Madish the Smart", 20000, 215, 113, 6, 10, RACE_BEASTMAN},
#endif
#ifdef JP
- { "¥Õ¥¡¥ì¥Ö¥ê¥ó¥Ü¡¼¥ë", 30000, 200, 110, 7, 10, RACE_HIGH_ELF},
+ { "¥Õ¥¡¥ì¥Ö¥ê¥ó¥Ü¡¼¥ë", 30000, 200, 110, 7, 10, RACE_HIGH_ELF},
#else
- { "Falebrimbor", 30000, 200, 110, 7, 10, RACE_HIGH_ELF},
+ { "Falebrimbor", 30000, 200, 110, 7, 10, RACE_HIGH_ELF},
#endif
#ifdef JP
- { "±¢¸±¥Õ¥§¥ê¥ë=¥¬¥ó¥É", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
+ { "±¢¸±¥Õ¥§¥ê¥ë=¥¬¥ó¥É", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
#else
- { "Felil-Gand the Subtle", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
+ { "Felil-Gand the Subtle", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
#endif
#ifdef JP
- { "¼ö½Ñ»Õ¥µ¥ì¥´¡¼¥É", 15000, 200, 110, 7, 8, RACE_BARBARIAN},
+ { "¼ö½Ñ»Õ¥µ¥ì¥´¡¼¥É", 15000, 200, 110, 7, 8, RACE_BARBARIAN},
#else
- { "Thalegord the Shaman", 15000, 200, 110, 7, 8, RACE_BARBARIAN},
+ { "Thalegord the Shaman", 15000, 200, 110, 7, 8, RACE_BARBARIAN},
#endif
#ifdef JP
{ "¿ÀÈë²È¥¯¥È¥¥¥¢¥í¥¹", 20000, 215, 113, 6, 10, RACE_MIND_FLAYER},
{ "Cthoaloth the Mystic", 20000, 215, 113, 6, 10, RACE_MIND_FLAYER},
#endif
#ifdef JP
- { "¸¸½Ñ»Õ¥¤¥Ù¥ê", 30000, 200, 110, 7, 10, RACE_SKELETON},
+ { "¸¸½Ñ»Õ¥¤¥Ù¥ê", 30000, 200, 110, 7, 10, RACE_SKELETON},
#else
- { "Ibeli the Illusionist", 30000, 200, 110, 7, 10, RACE_SKELETON},
+ { "Ibeli the Illusionist", 30000, 200, 110, 7, 10, RACE_SKELETON},
#endif
#ifdef JP
- { "»àÎî½Ñ»Õ¥Ø¥È¡¼", 30000, 175, 110, 5, 11, RACE_YEEK},
+ { "»àÎî½Ñ»Õ¥Ø¥È¡¼", 30000, 175, 110, 5, 11, RACE_YEEK},
#else
- { "Heto the Necromancer", 30000, 175, 110, 5, 11, RACE_YEEK},
+ { "Heto the Necromancer", 30000, 175, 110, 5, 11, RACE_YEEK},
#endif
#ifdef JP
{ "Ëâ½Ñ»Õ¥í=¥Ñ¥ó", 20000, 200, 110, 7, 8, RACE_HALF_ELF},
{ "Rjak the Necromancer", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
#endif
#ifdef JP
- { "Ëâ½Ñ»Õ¥¹¥¥É¥¥¥Ë¡¼", 15000, 200, 110, 7, 8, RACE_HALF_ELF},
+ { "Ëâ½Ñ»Õ¥¹¥¥É¥¥¥Ë¡¼", 15000, 200, 110, 7, 8, RACE_HALF_ELF},
#else
- { "Skidney the Sorcerer", 15000, 200, 110, 7, 8, RACE_HALF_ELF},
+ { "Skidney the Sorcerer", 15000, 200, 110, 7, 8, RACE_HALF_ELF},
#endif
#ifdef JP
- { "¸¸½Ñ»Õ¥¥ê¥¢", 30000, 200, 110, 7, 10, RACE_HUMAN},
+ { "¸¸½Ñ»Õ¥¥ê¥¢", 30000, 200, 110, 7, 10, RACE_HUMAN},
#else
- { "Kyria the Illusionist", 30000, 200, 110, 7, 10, RACE_HUMAN},
+ { "Kyria the Illusionist", 30000, 200, 110, 7, 10, RACE_HUMAN},
#endif
#ifdef JP
- { "»àÎî½Ñ»Õ¥Ë¥Ã¥", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
+ { "»àÎî½Ñ»Õ¥Ë¥Ã¥", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
#else
- { "Nikki the Necromancer", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
+ { "Nikki the Necromancer", 30000, 175, 110, 5, 11, RACE_DARK_ELF},
#endif
#ifdef JP
- { "¥½¥í¥¹¥È¥é¥ó", 15000, 200, 110, 7, 8, RACE_SPRITE},
+ { "¥½¥í¥¹¥È¥é¥ó", 15000, 200, 110, 7, 8, RACE_SPRITE},
#else
- { "Solostoran", 15000, 200, 110, 7, 8, RACE_SPRITE},
+ { "Solostoran", 15000, 200, 110, 7, 8, RACE_SPRITE},
#endif
#ifdef JP
{ "±¨Â±¸ý¥¢¥Á¥·¥§", 20000, 215, 113, 6, 10, RACE_MIND_FLAYER},
{
/* Black Market - 32 unique names */
#ifdef JP
- { "¥¬¥ê¡¼=¥®¥¬¥º", 20000, 250, 150, 10, 5, RACE_HALF_TROLL},
- { "¥´¥Ö¥ê¥ó¤Î¥Ò¥¹¥È¡¼¥¢", 20000, 250, 150, 10, 5, RACE_HALF_ORC},
- { "¥Õ¥§¥ì¥ó¥®¿Í¥¯¥¢¡¼¥¯", 30000, 250, 150, 10, 5, RACE_HUMAN},
- { "¸øÀµ¤Ê¤ë(?)¥È¥Ã¥Ô", 30000, 250, 150, 10, 5, RACE_ELF},
+ { "¥¬¥ê¡¼=¥®¥¬¥º", 20000, 250, 150, 10, 5, RACE_HALF_TROLL},
+ { "¥´¥Ö¥ê¥ó¤Î¥Ò¥¹¥È¡¼¥¢", 20000, 250, 150, 10, 5, RACE_HALF_ORC},
+ { "¥Õ¥§¥ì¥ó¥®¿Í¥¯¥¢¡¼¥¯", 30000, 250, 150, 10, 5, RACE_HUMAN},
+ { "¸øÀµ¤Ê¤ë(?)¥È¥Ã¥Ô", 30000, 250, 150, 10, 5, RACE_ELF},
#else
{ "Gary Gygaz", 20000, 250, 150, 10, 5, RACE_HALF_TROLL},
{ "Histor the Goblin", 20000, 250, 150, 10, 5, RACE_HALF_ORC},
{
{
#ifdef JP
- "½÷À",
- "¥¯¥¤¡¼¥ó",
+ "½÷À",
+ "¥¯¥¤¡¼¥ó",
#endif
"Female",
"Queen"
},
{
#ifdef JP
- "ÃËÀ",
- "¥¥ó¥°",
+ "ÃËÀ",
+ "¥¥ó¥°",
#endif
"Male",
"King"
72, 6, 180, 25,
66, 4, 150, 20,
0,
- 0x7FFFFFF,
+ 0x7FFFFFF,
},
{
#ifdef JP
- "¥Ï¡¼¥Õ¥¨¥ë¥Õ",
+ "¥Ï¡¼¥Õ¥¨¥ë¥Õ",
#endif
"Half-Elf",
66, 6, 130, 15,
62, 6, 100, 10,
2,
- 0x677E7FF,
+ 0x677E7FF,
},
{
#ifdef JP
- "¥¨¥ë¥Õ",
+ "¥¨¥ë¥Õ",
#endif
"Elf",
60, 4, 100, 6,
54, 4, 80, 6,
3,
- 0x677E75B,
+ 0x677E75B,
},
{
36, 3, 60, 3,
33, 3, 50, 3,
4,
- 0x76FFC0B,
+ 0x76FFC0B,
},
{
#ifdef JP
42, 3, 90, 6,
39, 3, 75, 3,
4,
- 0x767D60F,
+ 0x767D60F,
},
{
#ifdef JP
48, 3, 150, 10,
46, 3, 120, 10,
5,
- 0x1890005,
+ 0x1890005,
},
{
#ifdef JP
66, 1, 150, 5,
62, 1, 120, 5,
3,
- 0x5D8818D,
+ 0x5D8818D,
},
{
#ifdef JP
96, 10, 250, 50,
84, 8, 225, 40,
3,
- 0x0880005,
+ 0x0880005,
},
{
#ifdef JP
- "¥¢¥ó¥Ð¥é¥¤¥È",
+ "¥¢¥ó¥Ð¥é¥¤¥È",
#endif
"Amberite",
82, 5, 190, 20,
78, 6, 180, 15,
0,
- 0x7FFF7FF,
+ 0x7FFF7FF,
},
{
#ifdef JP
- "¥Ï¥¤¥¨¥ë¥Õ",
+ "¥Ï¥¤¥¨¥ë¥Õ",
#endif
"High-Elf",
111, 11, 255, 50,
99, 11, 250, 45,
0,
- 0x0010005,
+ 0x0010005,
},
{
#ifdef JP
- "¥¢¥ë¥³¥ó",
+ "¥¢¥ë¥³¥ó",
#endif
"Archon",
82, 5, 190, 20,
78, 6, 180, 15,
3,
- 0x779F777,
+ 0x779F777,
},
{
#ifdef JP
- "¥Ð¥ë¥í¥°",
+ "¥Ð¥ë¥í¥°",
"Balrog",
#else
"Balrog",
100,10, 255, 65,
80, 10, 240, 64,
5,
- 0x7EDC4DB,
+ 0x7EDC4DB,
},
{
#ifdef JP
- "¥É¥¥¥Ê¥À¥ó",
+ "¥É¥¥¥Ê¥À¥ó",
#endif
"Dunadan",
82, 5, 190, 20,
78, 6, 180, 15,
0,
- 0x7FFF7FF,
+ 0x7FFF7FF,
},
{
#ifdef JP
48, 6, 150, 25,
44, 4, 130, 20,
0,
- 0x418B7AD,
+ 0x418B7AD,
},
{
#ifdef JP
#ifdef JP
"¶ãÍ·»í¿Í",
#endif
- "Bard", /* Note : spell stat is Charisma */
- {-2, 1, 2, -1, -2, 4},
- 20, 33, 34, -5, 16, 20, 34, 20,
- 8, 13, 11, 0, 0, 0, 10, 8,
- 2, 40, 25
+ "Bard", /* Note : spell stat is Charisma */
+ {-2, 1, 2, -1, -2, 4},
+ 20, 33, 34, -5, 16, 20, 34, 20,
+ 8, 13, 11, 0, 0, 0, 10, 8,
+ 2, 40, 25
},
{
0, 0, 0, 0,
0, 0, 0, 0,
0,
- 0x000000,
+ 0x000000,
},
{
#ifdef JP
0, 0, 0, 0,
0, 0, 0, 0,
5,
- 0x000003,
+ 0x000003,
},
{
#ifdef JP
0, 0, 0, 0,
0, 0, 0, 0,
20,
- 0x000003,
+ 0x000003,
},
{
#ifdef JP
0, 0, 0, 0,
0, 0, 0, 0,
5,
- 0x000005,
+ 0x000005,
},
};
{
/* Warrior */
{
- "¿·»²Ê¼",
- "ʼ»Î",
- "ÍÃʼ",
- "¸Å»²Ê¼",
- "·õ»Î",
- "Æ®»Î",
- "±Ñͺ",
- "Ã˼ß",
- "Çì¼ß",
- "Îμç",
+ "¿·»²Ê¼",
+ "ʼ»Î",
+ "ÍÃʼ",
+ "¸Å»²Ê¼",
+ "·õ»Î",
+ "Æ®»Î",
+ "±Ñͺ",
+ "Ã˼ß",
+ "Çì¼ß",
+ "Îμç",
},
/* Mage */
{
/*"¸«½¬¤¤",*/
- "Îý½¬À¸", /*ÃúÃÕ¡¢Îý½¬À¸ */
- "´ñ½Ñ»Õ", /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
- "¸¸½Ñ»Õ",
- "¼ö½Ñ»Õ",
- "¾¤Îî»Õ",
- "¾¤Ëâ»Õ",
- "Ëâ½Ñ»Õ",
- "ËâÆ»»Õ",
- "¥¤¥×¥·¥·¥Þ¥¹",
- "ÂçËâÆ»»Õ",
+ "Îý½¬À¸", /*ÃúÃÕ¡¢Îý½¬À¸ */
+ "´ñ½Ñ»Õ", /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
+ "¸¸½Ñ»Õ",
+ "¼ö½Ñ»Õ",
+ "¾¤Îî»Õ",
+ "¾¤Ëâ»Õ",
+ "Ëâ½Ñ»Õ",
+ "ËâÆ»»Õ",
+ "¥¤¥×¥·¥·¥Þ¥¹",
+ "ÂçËâÆ»»Õ",
},
/* Priest */
{
- "¿®¼Ô", /*¿®ÅÌ */
- "»øÁÎ", /*¶µ²ñÊô»Å¼Ô¡¢¸«½¬¤¤ÁΡ¢È¼ÁΡ¢½¾¼Ô */
- "½ÏÎýÁÎ",
- "À»¿¦¼Ô", /*À»¿¦¼Ô */
- "ÅÁÆ»»Õ", /*»Êº×ɾµÄ°÷¡¢½¤Æ»²ñ²ñ°÷ */
- "ËÒ»Õ", /*¥é¥Þ¶µ¤ÎÁÎ */
- "À»¿Í", /*Âç»Ê¶µ¡¢Áí¼ç¶µ¡¢ÁíÂç»Ê¶µ */
- "º×»Ê", /*º×»Ê¡¢»Êº× */
- "º×»ÊĹ", /*Âçº×»Ê¡¢º×»ÊĹ */
- "¶µ¹Ä",
+ "¿®¼Ô", /*¿®ÅÌ */
+ "»øÁÎ", /*¶µ²ñÊô»Å¼Ô¡¢¸«½¬¤¤ÁΡ¢È¼ÁΡ¢½¾¼Ô */
+ "½ÏÎýÁÎ",
+ "À»¿¦¼Ô", /*À»¿¦¼Ô */
+ "ÅÁÆ»»Õ", /*»Êº×ɾµÄ°÷¡¢½¤Æ»²ñ²ñ°÷ */
+ "ËÒ»Õ", /*¥é¥Þ¶µ¤ÎÁÎ */
+ "À»¿Í", /*Âç»Ê¶µ¡¢Áí¼ç¶µ¡¢ÁíÂç»Ê¶µ */
+ "º×»Ê", /*º×»Ê¡¢»Êº× */
+ "º×»ÊĹ", /*Âçº×»Ê¡¢º×»ÊĹ */
+ "¶µ¹Ä",
},
/* Rogues */
{
/* "¤´¤í¤Ä¤",*/ /*¤´¤í¤Ä¤¡¢É÷ÍèË·¡¢Éâϲ¼Ô */
- "¤¹¤ê",
- "Äɤ¤¤Ï¤®", /*Äɤ¤Çí¤®¡¢¶¯Åð¡¢Å¥ËÀ */
- "ÌëÅð", /*¶¯Åð¡¢ÌëÅð¡¢Å¥ËÀ */
- "¤³¤½Å¥", /*¤³¤½Å¥¡¢¾®Å¥ËÀ */
- "¥Ú¥Æ¥ó»Õ", /*ÇîÅÌ¡¢¥Ú¥Æ¥ó»Õ¡¢º¾µ½»Õ */
- "¥í¥¦¥·¡¼¥Õ",
- "¥Ï¥¤¥·¡¼¥Õ",
- "¥Þ¥¹¥¿¡¼¥·¡¼¥Õ",
- "¥¢¥µ¥·¥ó", /* °Å»¦¼Ô */
- "¥®¥ë¥É¥Þ¥¹¥¿¡¼",
+ "¤¹¤ê",
+ "Äɤ¤¤Ï¤®", /*Äɤ¤Çí¤®¡¢¶¯Åð¡¢Å¥ËÀ */
+ "ÌëÅð", /*¶¯Åð¡¢ÌëÅð¡¢Å¥ËÀ */
+ "¤³¤½Å¥", /*¤³¤½Å¥¡¢¾®Å¥ËÀ */
+ "¥Ú¥Æ¥ó»Õ", /*ÇîÅÌ¡¢¥Ú¥Æ¥ó»Õ¡¢º¾µ½»Õ */
+ "¥í¥¦¥·¡¼¥Õ",
+ "¥Ï¥¤¥·¡¼¥Õ",
+ "¥Þ¥¹¥¿¡¼¥·¡¼¥Õ",
+ "¥¢¥µ¥·¥ó", /* °Å»¦¼Ô */
+ "¥®¥ë¥É¥Þ¥¹¥¿¡¼",
},
/* Rangers */
{
- "»È¤¤Áö¤ê",
- "ÃÚÉ×",
- "À͸õ", /*À͸õ¡¢¸«Ä¥¤ê¡¢Ä廡ʼ */
- "¼í¿Í",
- "ÄÉÀ×¼Ô",
- "ÀèƳ¼Ô",
- "õ¸±¼Ô", /*³«Âó¼Ô¡¢Ãµ¸±¼Ô */
- "ÌîÉú",
- "ÌîÉúƬ",
- "ÌîÉú¤ÎÁíÎÎ",
+ "»È¤¤Áö¤ê",
+ "ÃÚÉ×",
+ "À͸õ", /*À͸õ¡¢¸«Ä¥¤ê¡¢Ä廡ʼ */
+ "¼í¿Í",
+ "ÄÉÀ×¼Ô",
+ "ÀèƳ¼Ô",
+ "õ¸±¼Ô", /*³«Âó¼Ô¡¢Ãµ¸±¼Ô */
+ "ÌîÉú",
+ "ÌîÉúƬ",
+ "ÌîÉú¤ÎÁíÎÎ",
},
/* Paladins */
{
- "ͦ»Î", /*¿§ÃË¡¢°¦¿Í¡¢¤·¤ã¤ì¼Ô¡¢Í¦´º¤Ê¿Í */
- "±Ò»Î",
- "Êݸî¼Ô",
- "ËɱҼÔ",
- "¸î±Ò¼Ô",
- "µ³»Î",
- "½Åµ³»Î",
- "À»µ³»Î",
- "¾åµéÀ»µ³»Î",
- "À»µ³»ÎĹ",
+ "ͦ»Î", /*¿§ÃË¡¢°¦¿Í¡¢¤·¤ã¤ì¼Ô¡¢Í¦´º¤Ê¿Í */
+ "±Ò»Î",
+ "Êݸî¼Ô",
+ "ËɱҼÔ",
+ "¸î±Ò¼Ô",
+ "µ³»Î",
+ "½Åµ³»Î",
+ "À»µ³»Î",
+ "¾åµéÀ»µ³»Î",
+ "À»µ³»ÎĹ",
},
/* Warrior-Mage */
/* Chaos Warrior */
{
- "¿·»²Ê¼",
- "ʼ»Î",
- "ÍÃʼ",
- "¸Å»²Ê¼",
- "·õ»Î",
- "Æ®»Î",
- "º®Æ٤αÑͺ",
- "º®ÆÙ¤ÎÃ˼ß",
- "º®Æ٤θø¼ß",
- "º®Æ٤β¦¼Ô",
+ "¿·»²Ê¼",
+ "ʼ»Î",
+ "ÍÃʼ",
+ "¸Å»²Ê¼",
+ "·õ»Î",
+ "Æ®»Î",
+ "º®Æ٤αÑͺ",
+ "º®ÆÙ¤ÎÃ˼ß",
+ "º®Æ٤θø¼ß",
+ "º®Æ٤β¦¼Ô",
},
/* Monk */
/* High Mage; same as Mage */
{
/*"¸«½¬¤¤",*/
- "Îý½¬À¸", /*ÃúÃÕ¡¢Îý½¬À¸ */
- "´ñ½Ñ»Õ", /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
- "¸¸½Ñ»Õ",
- "¼ö½Ñ»Õ",
- "¾¤Îî»Õ",
- "¾¤Ëâ»Õ",
- "Ëâ½Ñ»Õ",
- "ËâÆ»»Õ",
- "¥¤¥×¥·¥·¥Þ¥¹",
- "ÂçËâÆ»»Õ",
+ "Îý½¬À¸", /*ÃúÃÕ¡¢Îý½¬À¸ */
+ "´ñ½Ñ»Õ", /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
+ "¸¸½Ñ»Õ",
+ "¼ö½Ñ»Õ",
+ "¾¤Îî»Õ",
+ "¾¤Ëâ»Õ",
+ "Ëâ½Ñ»Õ",
+ "ËâÆ»»Õ",
+ "¥¤¥×¥·¥·¥Þ¥¹",
+ "ÂçËâÆ»»Õ",
},
/* Tourist */
/* Sorcerer; same as Mage */
{
/*"¸«½¬¤¤",*/
- "Îý½¬À¸", /*ÃúÃÕ¡¢Îý½¬À¸ */
- "´ñ½Ñ»Õ", /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
- "¸¸½Ñ»Õ",
- "¼ö½Ñ»Õ",
- "¾¤Îî»Õ",
- "¾¤Ëâ»Õ",
- "Ëâ½Ñ»Õ",
- "ËâÆ»»Õ",
- "¥¤¥×¥·¥·¥Þ¥¹",
- "ÂçËâÆ»»Õ",
+ "Îý½¬À¸", /*ÃúÃÕ¡¢Îý½¬À¸ */
+ "´ñ½Ñ»Õ", /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
+ "¸¸½Ñ»Õ",
+ "¼ö½Ñ»Õ",
+ "¾¤Îî»Õ",
+ "¾¤Ëâ»Õ",
+ "Ëâ½Ñ»Õ",
+ "ËâÆ»»Õ",
+ "¥¤¥×¥·¥·¥Þ¥¹",
+ "ÂçËâÆ»»Õ",
},
/* Archer */
{
- "¿·»²Ê¼",
- "ʼ»Î",
- "ÍÃʼ",
- "¸Å»²Ê¼",
- "·õ»Î",
- "Æ®»Î",
- "±Ñͺ",
- "Ã˼ß",
- "Çì¼ß",
- "Îμç",
+ "¿·»²Ê¼",
+ "ʼ»Î",
+ "ÍÃʼ",
+ "¸Å»²Ê¼",
+ "·õ»Î",
+ "Æ®»Î",
+ "±Ñͺ",
+ "Ã˼ß",
+ "Çì¼ß",
+ "Îμç",
},
/* Magic eater */
{
- "̵ÃΤʤë¼Ô",
- "ÆþÌç¼Ô",
- "´ñ½Ñ»Õ",
- "Èë½Ñ»Õ",
- "Èë½Ñ»Õ",
- "½ÏÎý¼Ô",
- "ã¿Í",
- "ã¿Í",
- "ËâÆ»»Õ",
- "Á´¤Æ¤òÃΤë¼Ô",
- },
-
- /* Harper */
- {
- "¸«½¬¤¤", /*"Apprentice"*/
- "ºî¶Ê²È", /*"Songsmith"*/
- "¶ãÍ·»í¿Í", /*"Bard"*/
- "¥³¥ó¥Ñ¥Ë¥ª¥ó", /*"Companion"*/
- "¿´¤ÎÌþ¤·¼ê", /*"Minstrel"*/
- "è¶×»Õ", /*"Harper"*/
- "ÅÁ¾µ¤Îˤ®¼ê", /*"Loreweaver"*/
- "»í¿À¤Î¿½¤·»Ò", /*"Muse"*/
- "̴ˤ®", /*"Dreamweaver"*/
- "¥Þ¥¹¥¿¡¼", /*"Master Harper"*/
+ "̵ÃΤʤë¼Ô",
+ "ÆþÌç¼Ô",
+ "´ñ½Ñ»Õ",
+ "Èë½Ñ»Õ",
+ "Èë½Ñ»Õ",
+ "½ÏÎý¼Ô",
+ "ã¿Í",
+ "ã¿Í",
+ "ËâÆ»»Õ",
+ "Á´¤Æ¤òÃΤë¼Ô",
+ },
+
+ /* Harper */
+ {
+ "¸«½¬¤¤", /*"Apprentice"*/
+ "ºî¶Ê²È", /*"Songsmith"*/
+ "¶ãÍ·»í¿Í", /*"Bard"*/
+ "¥³¥ó¥Ñ¥Ë¥ª¥ó", /*"Companion"*/
+ "¿´¤ÎÌþ¤·¼ê", /*"Minstrel"*/
+ "è¶×»Õ", /*"Harper"*/
+ "ÅÁ¾µ¤Îˤ®¼ê", /*"Loreweaver"*/
+ "»í¿À¤Î¿½¤·»Ò", /*"Muse"*/
+ "̴ˤ®", /*"Dreamweaver"*/
+ "¥Þ¥¹¥¿¡¼", /*"Master Harper"*/
},
/* Red Mage; same as Warrior-Mage */
/* Blue Mage; same as Mage */
{
/*"¸«½¬¤¤",*/
- "Îý½¬À¸", /*ÃúÃÕ¡¢Îý½¬À¸ */
- "´ñ½Ñ»Õ", /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
- "¸¸½Ñ»Õ",
- "¼ö½Ñ»Õ",
- "¾¤Îî»Õ",
- "¾¤Ëâ»Õ",
- "Ëâ½Ñ»Õ",
- "ËâÆ»»Õ",
- "¥¤¥×¥·¥·¥Þ¥¹",
- "ÂçËâÆ»»Õ",
+ "Îý½¬À¸", /*ÃúÃÕ¡¢Îý½¬À¸ */
+ "´ñ½Ñ»Õ", /*º¾µ½»Õ¡¢¥Ú¥Æ¥ó»Õ */
+ "¸¸½Ñ»Õ",
+ "¼ö½Ñ»Õ",
+ "¾¤Îî»Õ",
+ "¾¤Ëâ»Õ",
+ "Ëâ½Ñ»Õ",
+ "ËâÆ»»Õ",
+ "¥¤¥×¥·¥·¥Þ¥¹",
+ "ÂçËâÆ»»Õ",
},
/* Kihei */
{
- "¿·»²Ê¼",
- "ʼ»Î",
- "ÍÃʼ",
- "¸Å»²Ê¼",
- "·õ»Î",
- "Æ®»Î",
- "±Ñͺ",
- "Ã˼ß",
- "Çì¼ß",
- "Îμç",
+ "¿·»²Ê¼",
+ "ʼ»Î",
+ "ÍÃʼ",
+ "¸Å»²Ê¼",
+ "·õ»Î",
+ "Æ®»Î",
+ "±Ñͺ",
+ "Ã˼ß",
+ "Çì¼ß",
+ "Îμç",
},
/* Berserker */
/* Magic eater */
{
- "Apprentice",
- "Beginner",
- "Jagguler",
- "Skilled",
- "Conjurer",
- "Magician",
- "Master",
- "Master",
- "Wizard",
- "Almighty",
+ "Apprentice",
+ "Beginner",
+ "Jagguler",
+ "Skilled",
+ "Conjurer",
+ "Magician",
+ "Master",
+ "Master",
+ "Wizard",
+ "Almighty",
},
- /* Harper */
+ /* Harper */
{
- "Apprentice", /*"Apprentice"*/
- "Songsmith", /*"Songsmith"*/
- "Bard", /*"Bard"*/
- "Companion", /*"Companion"*/
- "Minstrel", /*"Minstrel"*/
- "Harper", /*"Harper"*/
- "Loreweaver", /*"Loreweaver"*/
- "Muse", /*"Muse"*/
- "Dreamweaver", /*"Dreamweaver"*/
- "Master Harper", /*"Master Harper"*/
+ "Apprentice", /*"Apprentice"*/
+ "Songsmith", /*"Songsmith"*/
+ "Bard", /*"Bard"*/
+ "Companion", /*"Companion"*/
+ "Minstrel", /*"Minstrel"*/
+ "Harper", /*"Harper"*/
+ "Loreweaver", /*"Loreweaver"*/
+ "Muse", /*"Muse"*/
+ "Dreamweaver", /*"Dreamweaver"*/
+ "Master Harper", /*"Master Harper"*/
},
/* Red Mage */
/* Kaji */
{
- "Copper smith",
- "Iron smith",
- "Steel smith",
- "Silver smith",
- "Dragon smith",
- "Spirit smith",
- "Magic smith",
- "Soul smith",
- "God smith",
- "AlmightySmith",
+ "Copper smith",
+ "Iron smith",
+ "Steel smith",
+ "Silver smith",
+ "Dragon smith",
+ "Spirit smith",
+ "Magic smith",
+ "Soul smith",
+ "God smith",
+ "AlmightySmith",
},
/* Mirror Master */
cptr color_names[16] =
{
#ifdef JP
- "¹õ",
- "Çò",
- "Àij¥¿§",
- "¥ª¥ì¥ó¥¸",
- "ÀÖ",
- "ÎÐ",
- "ÀÄ",
- "àèàῧ",
- "³¥¿§",
- "ÌÀÀij¥¿§",
- "ȍ",
- "²«",
- "ÌÀ¤ë¤¤ÀÖ",
- "ÌÀ¤ë¤¤ÎÐ",
- "ÌÀ¤ë¤¤ÀÄ",
- "ÌÀàèàῧ",
+ "¹õ",
+ "Çò",
+ "Àij¥¿§",
+ "¥ª¥ì¥ó¥¸",
+ "ÀÖ",
+ "ÎÐ",
+ "ÀÄ",
+ "àèàῧ",
+ "³¥¿§",
+ "ÌÀÀij¥¿§",
+ "ȍ",
+ "²«",
+ "ÌÀ¤ë¤¤ÀÖ",
+ "ÌÀ¤ë¤¤ÎÐ",
+ "ÌÀ¤ë¤¤ÀÄ",
+ "ÌÀàèàῧ",
#else
"Dark",
"White",
cptr stat_names[6] =
{
#ifdef JP
- "ÏÓÎÏ :", "ÃÎǽ :", "¸¤µ :", "´ïÍÑ :", "ÂÑµ× :", "Ì¥ÎÏ :"
+ "ÏÓÎÏ :", "ÃÎǽ :", "¸¤µ :", "´ïÍÑ :", "ÂÑµ× :", "Ì¥ÎÏ :"
#else
"STR : ", "INT : ", "WIS : ", "DEX : ", "CON : ", "CHR : "
#endif
cptr stat_names_reduced[6] =
{
#ifdef JP
- "ÏÓÎÏx:", "ÃÎǽx:", "¸¤µx:", "´ïÍÑx:", "Âѵ×x:", "Ì¥ÎÏx:"
+ "ÏÓÎÏx:", "ÃÎǽx:", "¸¤µx:", "´ïÍÑx:", "Âѵ×x:", "Ì¥ÎÏx:"
#else
"Str : ", "Int : ", "Wis : ", "Dex : ", "Con : ", "Chr : "
#endif
cptr window_flag_desc[32] =
{
#ifdef JP
- "»ý¤Áʪ/ÁõÈ÷°ìÍ÷",
+ "»ý¤Áʪ/ÁõÈ÷°ìÍ÷",
#else
"Display inven/equip",
#endif
#ifdef JP
- "ÁõÈ÷/»ý¤Áʪ°ìÍ÷",
+ "ÁõÈ÷/»ý¤Áʪ°ìÍ÷",
#else
"Display equip/inven",
#endif
#ifdef JP
- "¼öʸ°ìÍ÷",
+ "¼öʸ°ìÍ÷",
#else
"Display spell list",
#endif
#ifdef JP
- "¥¥ã¥é¥¯¥¿¾ðÊó",
+ "¥¥ã¥é¥¯¥¿¾ðÊó",
#else
"Display character",
#endif
NULL,
NULL,
#ifdef JP
- "¥á¥Ã¥»¡¼¥¸",
+ "¥á¥Ã¥»¡¼¥¸",
#else
"Display messages",
#endif
#ifdef JP
- "¥À¥ó¥¸¥ç¥óÁ´ÂοÞ",
+ "¥À¥ó¥¸¥ç¥óÁ´ÂοÞ",
#else
"Display overhead view",
#endif
#ifdef JP
- "¥â¥ó¥¹¥¿¡¼¤Î»×¤¤½Ð",
+ "¥â¥ó¥¹¥¿¡¼¤Î»×¤¤½Ð",
#else
"Display monster recall",
#endif
#ifdef JP
- "¥¢¥¤¥Æ¥à¤Î¾ÜºÙ",
+ "¥¢¥¤¥Æ¥à¤Î¾ÜºÙ",
#else
"Display object recall",
#endif
#ifdef JP
- "¼«Ê¬¤Î¼þ°Ï¤òɽ¼¨",
+ "¼«Ê¬¤Î¼þ°Ï¤òɽ¼¨",
#else
"Display dungeon view",
#endif
#ifdef JP
- "µÇ°»£±Æ",
+ "µÇ°»£±Æ",
#else
"Display snap-shot",
#endif
NULL,
NULL,
#ifdef JP
- "¥Ü¡¼¥°¡¦¥á¥Ã¥»¡¼¥¸",
+ "¥Ü¡¼¥°¡¦¥á¥Ã¥»¡¼¥¸",
#else
"Display borg messages",
#endif
#ifdef JP
- "¥Ü¡¼¥°¡¦¥¹¥Æ¡¼¥¿¥¹",
+ "¥Ü¡¼¥°¡¦¥¹¥Æ¡¼¥¿¥¹",
#else
"Display borg status",
#endif
#ifdef JP
{ &rogue_like_commands, FALSE, 1, 0, 0,
- "rogue_like_commands", "¥í¡¼¥°É÷¥¡¼ÇÛÃÖ¤ò»ÈÍѤ¹¤ë" },
+ "rogue_like_commands", "¥í¡¼¥°É÷¥¡¼ÇÛÃÖ¤ò»ÈÍѤ¹¤ë" },
#else
{ &rogue_like_commands, FALSE, 1, 0, 0,
"rogue_like_commands", "Rogue-like commands" },
#ifdef JP
{ &always_pickup, FALSE, 1, 0, 5,
- "always_pickup", "¾ï¤Ë¥¢¥¤¥Æ¥à¤ò½¦¤¦" },
+ "always_pickup", "¾ï¤Ë¥¢¥¤¥Æ¥à¤ò½¦¤¦" },
#else
{ &always_pickup, FALSE, 1, 0, 5,
"always_pickup", "Pick things up by default" },
#ifdef JP
{ &auto_more, FALSE, 1, 2, 6,
- "auto_more", "¥¡¼ÂÔ¤Á¤·¤Ê¤¤¤ÇϢ³¤Ç¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë" },
+ "auto_more", "¥¡¼ÂÔ¤Á¤·¤Ê¤¤¤ÇϢ³¤Ç¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë" },
#else
{ &auto_more, FALSE, 1, 2, 6,
"auto_more", "Automatically clear '-more-' prompts" },
#ifdef JP
{ &command_menu, TRUE, 1, 2, 7,
- "command_menu", "¥á¥Ë¥å¡¼¤Ë¤è¤ê¥³¥Þ¥ó¥ÉÁªÂò¤ò͸ú¤Ë¤¹¤ë" },
+ "command_menu", "¥á¥Ë¥å¡¼¤Ë¤è¤ê¥³¥Þ¥ó¥ÉÁªÂò¤ò͸ú¤Ë¤¹¤ë" },
#else
{ &command_menu, TRUE, 1, 2, 7,
"command_menu", "Enable command selection menu" },
#ifdef JP
{ &always_repeat, TRUE, 1, 0, 6,
- "always_repeat", "¥³¥Þ¥ó¥É¼«Æ°·«¤êÊÖ¤·" },
+ "always_repeat", "¥³¥Þ¥ó¥É¼«Æ°·«¤êÊÖ¤·" },
#else
{ &always_repeat, TRUE, 1, 0, 6,
"always_repeat", "Repeat obvious commands" },
#ifdef JP
{ &target_pet, FALSE, 1, 2, 5,
- "target_pet", "¥Ú¥Ã¥È¤ò¥¿¡¼¥²¥Ã¥È¤Ë¤¹¤ë" },
+ "target_pet", "¥Ú¥Ã¥È¤ò¥¿¡¼¥²¥Ã¥È¤Ë¤¹¤ë" },
#else
{ &target_pet, FALSE, 1, 2, 5,
"target_pet", "Allow targetting pets" },
#ifdef JP
{ &depth_in_feet, FALSE, 2, 0, 7,
- "depth_in_feet", "¥À¥ó¥¸¥ç¥ó¤Î¿¼¤µ¤ò¥Õ¥£¡¼¥È¤Çɽ¼¨¤¹¤ë" },
+ "depth_in_feet", "¥À¥ó¥¸¥ç¥ó¤Î¿¼¤µ¤ò¥Õ¥£¡¼¥È¤Çɽ¼¨¤¹¤ë" },
#else
{ &depth_in_feet, FALSE, 2, 0, 7,
"depth_in_feet", "Show dungeon level in feet" },
#ifdef JP
{ &show_labels, TRUE, 2, 0, 10,
- "show_labels", "ÁõÈ÷°ìÍ÷¤ÇÁõÈ÷¾ì½ê¤òɽ¼¨¤¹¤ë" },
+ "show_labels", "ÁõÈ÷°ìÍ÷¤ÇÁõÈ÷¾ì½ê¤òɽ¼¨¤¹¤ë" },
#else
{ &show_labels, TRUE, 2, 0, 10,
"show_labels", "Show labels in object listings" },
#ifdef JP
{ &show_weights, TRUE, 2, 0, 11,
- "show_weights", "¥¢¥¤¥Æ¥à°ìÍ÷¤Ç½ÅÎ̤òɽ¼¨¤¹¤ë" },
+ "show_weights", "¥¢¥¤¥Æ¥à°ìÍ÷¤Ç½ÅÎ̤òɽ¼¨¤¹¤ë" },
#else
{ &show_weights, TRUE, 2, 0, 11,
"show_weights", "Show weights in object listings" },
#ifdef JP
{ &show_choices, TRUE, 2, 0, 12,
- "show_choices", "»ý¤Áʪ/ÁõÈ÷¥¦¥£¥ó¥É¥¦¤ËÁªÂò¥¢¥¤¥Æ¥àɽ¼¨" },
+ "show_choices", "»ý¤Áʪ/ÁõÈ÷¥¦¥£¥ó¥É¥¦¤ËÁªÂò¥¢¥¤¥Æ¥àɽ¼¨" },
#else
{ &show_choices, TRUE, 2, 0, 12,
"show_choices", "Show choices in certain sub-windows" },
#ifdef JP
{ &plain_pickup, FALSE, 2, 6, 6,
- "plain_pickup", "¡Ö½¦¤Ã¤¿¡×¥á¥Ã¥»¡¼¥¸¤ò´Êά²½¤¹¤ë" },
+ "plain_pickup", "¡Ö½¦¤Ã¤¿¡×¥á¥Ã¥»¡¼¥¸¤ò´Êά²½¤¹¤ë" },
#else
{ &plain_pickup, FALSE,99, 6, 6,
"plain_pickup", "Plain pickup messages(japanese only)" },
#ifdef JP
- { ¢er_player, FALSE, 2, 5, 11,
- "center_player", "¾ï¤Ë¥×¥ì¥¤¥ä¡¼¤òÃæ¿´¤ËÃÖ¤¯(*ÃÙ¤¤*)" },
+ { ¢er_player, FALSE, 2, 5, 11,
+ "center_player", "¾ï¤Ë¥×¥ì¥¤¥ä¡¼¤òÃæ¿´¤ËÃÖ¤¯(*ÃÙ¤¤*)" },
#else
{ ¢er_player, FALSE, 2, 5, 11,
"center_player", "Center map while walking (*slow*)" },
#ifdef JP
- { ¢er_running, TRUE, 2, 5, 12,
- "center_running", "Áö¤Ã¤Æ¤¤¤ë»þ¤Ç¤âÃæ¿´¤ËÃÖ¤¯" },
+ { ¢er_running, TRUE, 2, 5, 12,
+ "center_running", "Áö¤Ã¤Æ¤¤¤ë»þ¤Ç¤âÃæ¿´¤ËÃÖ¤¯" },
#else
{ ¢er_running, TRUE, 2, 5, 12,
"center_running", "Centering even while running" },
#ifdef JP
{ &view_yellow_lite, TRUE, 2, 1, 28,
- "view_yellow_lite", "ÌÀ¤«¤ê¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
+ "view_yellow_lite", "ÌÀ¤«¤ê¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
#else
{ &view_yellow_lite, TRUE, 2, 1, 28,
"view_yellow_lite", "Use special colors for torch-lit grids" },
#ifdef JP
{ &view_bright_lite, TRUE, 2, 1, 29,
- "view_bright_lite", "»ë³¦¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
+ "view_bright_lite", "»ë³¦¤ÎÈϰϤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë" },
#else
{ &view_bright_lite, TRUE, 2, 1, 29,
"view_bright_lite", "Use special colors for 'viewable' grids" },
#ifdef JP
{ &view_granite_lite, TRUE, 2, 1, 30,
- "view_granite_lite", "ÊɤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
+ "view_granite_lite", "ÊɤòÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
#else
{ &view_granite_lite, TRUE, 2, 1, 30,
"view_granite_lite", "Use special colors for wall grids (slow)" },
#ifdef JP
{ &view_special_lite, TRUE, 2, 1, 31,
- "view_special_lite", "¾²¤òÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
+ "view_special_lite", "¾²¤òÆÃÊ̤ʿ§¤Çɽ¼¨¤¹¤ë(½Å¤¤)" },
#else
{ &view_special_lite, TRUE, 2, 1, 31,
"view_special_lite", "Use special colors for floor grids (slow)" },
#ifdef JP
{ &new_ascii_graphics, FALSE, 2, 2, 4,
- "new_ascii_graphics", "ÃÏ·Á¤ÎÌÀ°Å¤ò¤Ï¤Ã¤¤ê¤Èɽ¼¨¤¹¤ë" },
+ "new_ascii_graphics", "ÃÏ·Á¤ÎÌÀ°Å¤ò¤Ï¤Ã¤¤ê¤Èɽ¼¨¤¹¤ë" },
#else
{ &new_ascii_graphics, FALSE, 2, 2, 4,
"new_ascii_graphics", "Show a clear contrast between light and dark" },
#ifdef JP
{ &display_path, FALSE, 2, 2, 8,
- "display_path", "ËâË¡¤äÌð¤Îµ°Àפòɽ¼¨¤¹¤ë" },
+ "display_path", "ËâË¡¤äÌð¤Îµ°Àפòɽ¼¨¤¹¤ë" },
#else
{ &display_path, FALSE, 2, 2, 8,
"display_path", "Display actual path before shooting" },
#ifdef JP
{ &always_show_list, TRUE, 2, 4, 0,
- "always_show_list", "ÁªÂò»þ¤Ë¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë" },
+ "always_show_list", "ÁªÂò»þ¤Ë¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë" },
#else
{ &always_show_list, TRUE, 2, 4, 0,
- "always_show_list", "Always show list at first when select items" },
+ "always_show_list", "Always show list at first when select items" },
#endif
#ifdef JP
{ &change_numeral, TRUE, 2, 4, 5,
- "change_numeral", "¥¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¿ô¤¨Êý¤òÊѤ¨¤ë" },
+ "change_numeral", "¥¢¥¤¥Æ¥à¤Î¼ïÎà¤Ë¤è¤Ã¤Æ¿ô¤¨Êý¤òÊѤ¨¤ë" },
#else
{ &change_numeral, TRUE, 99, 4, 5,
- "change_numeral", "Change a way to counting (japanese only)" },
+ "change_numeral", "Change a way to counting (japanese only)" },
#endif
#ifdef JP
{ &auto_scum, FALSE, 3, 1, 1,
- "auto_scum", "³¬¤ÎÊ·°Ïµ¤¼«Æ°Áª¤ê¹¥¤ß" },
+ "auto_scum", "³¬¤ÎÊ·°Ïµ¤¼«Æ°Áª¤ê¹¥¤ß" },
#else
{ &auto_scum, FALSE, 3, 1, 1,
"auto_scum", "Auto-scum for good levels" },
#ifdef JP
{ &stack_force_notes, TRUE, 3, 0, 8,
- "stack_force_notes", "°Û¤Ê¤ëÌäΥ¢¥¤¥Æ¥à¤ò¤Þ¤È¤á¤ë" },
+ "stack_force_notes", "°Û¤Ê¤ëÌäΥ¢¥¤¥Æ¥à¤ò¤Þ¤È¤á¤ë" },
#else
{ &stack_force_notes, TRUE, 3, 0, 8,
"stack_force_notes", "Merge inscriptions when stacking" },
#ifdef JP
{ &stack_force_costs, FALSE, 3, 0, 9,
- "stack_force_costs", "°Û¤Ê¤ë³ä°úɽ¼¨¤Î¥¢¥¤¥Æ¥à¤ò¤Þ¤È¤á¤ë" },
+ "stack_force_costs", "°Û¤Ê¤ë³ä°úɽ¼¨¤Î¥¢¥¤¥Æ¥à¤ò¤Þ¤È¤á¤ë" },
#else
{ &stack_force_costs, FALSE, 3, 0, 9,
"stack_force_costs", "Merge discounts when stacking" },
#ifdef JP
{ &expand_look, TRUE, 3, 1, 4,
- "expand_look", "¡Ö²ó¤ê¤òÄ´¤Ù¤ë¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" },
+ "expand_look", "¡Ö²ó¤ê¤òÄ´¤Ù¤ë¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" },
#else
{ &expand_look, TRUE, 3, 1, 4,
"expand_look", "Expand the power of the look command" },
#ifdef JP
{ &expand_list, TRUE, 3, 1, 5,
- "expand_list", "¡Ö°ìÍ÷¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" },
+ "expand_list", "¡Ö°ìÍ÷¡×¥³¥Þ¥ó¥É¤ò³ÈÄ¥¤¹¤ë" },
#else
{ &expand_list, TRUE, 3, 1, 5,
"expand_list", "Expand the power of the list commands" },
#ifdef JP
{ &view_perma_grids, TRUE, 3, 1, 6,
- "view_perma_grids", "ÌÀ¤ë¤¤¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
+ "view_perma_grids", "ÌÀ¤ë¤¤¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
#else
{ &view_perma_grids, TRUE, 3, 1, 6,
"view_perma_grids", "Map remembers all perma-lit grids" },
#ifdef JP
{ &view_torch_grids, FALSE, 3, 1, 7,
- "view_torch_grids", "ÌÀ¤«¤ê¤Ç¾È¤é¤·¤¿¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
+ "view_torch_grids", "ÌÀ¤«¤ê¤Ç¾È¤é¤·¤¿¾ì½ê¤Ï¤½¤Î¤Þ¤Þ¤Ë¤¹¤ë" },
#else
{ &view_torch_grids, FALSE, 3, 1, 7,
"view_torch_grids", "Map remembers all torch-lit grids" },
#ifdef JP
{ &view_unsafe_grids, FALSE, 3, 1, 8,
- "view_unsafe_grids", "¥È¥é¥Ã¥×´¶ÃκѤߤǤʤ¤¾ì½ê¤òɽ¼¨¤¹¤ë" },
+ "view_unsafe_grids", "¥È¥é¥Ã¥×´¶ÃκѤߤǤʤ¤¾ì½ê¤òɽ¼¨¤¹¤ë" },
#else
{ &view_unsafe_grids, FALSE, 3, 1, 8,
"view_unsafe_grids", "Map marked by detect traps" },
#ifdef JP
{ &dungeon_stair, TRUE, 3, 1, 9,
- "dungeon_stair", "³¬Ãʤò¤Ä¤Ê¤²¤Æ¥À¥ó¥¸¥ç¥ó¤òÀ¸À®¤¹¤ë" },
+ "dungeon_stair", "³¬Ãʤò¤Ä¤Ê¤²¤Æ¥À¥ó¥¸¥ç¥ó¤òÀ¸À®¤¹¤ë" },
#else
{ &dungeon_stair, TRUE, 3, 1, 9,
"dungeon_stair", "Generate dungeons with connected stairs" },
#ifdef JP
{ &empty_levels, TRUE, 3, 0, 31,
- "empty_levels", "¶õ¤Ã¤Ý¤Î¡Ö¥¢¥ê¡¼¥Ê¡×¥ì¥Ù¥ë¤ÎÀ¸À®¤ò²Äǽ¤Ë¤¹¤ë" },
+ "empty_levels", "¶õ¤Ã¤Ý¤Î¡Ö¥¢¥ê¡¼¥Ê¡×¥ì¥Ù¥ë¤ÎÀ¸À®¤ò²Äǽ¤Ë¤¹¤ë" },
#else
{ &empty_levels, TRUE, 3, 0, 31,
"empty_levels", "Allow empty 'arena' levels" },
#ifdef WORLD_SCORE
#ifdef JP
{ &send_score, TRUE, 3, 4, 6,
- "send_score", "¥¹¥³¥¢¥µ¡¼¥Ð¤Ë¥¹¥³¥¢¤òÁ÷¤ë" },
+ "send_score", "¥¹¥³¥¢¥µ¡¼¥Ð¤Ë¥¹¥³¥¢¤òÁ÷¤ë" },
#else
{ &send_score, TRUE, 3, 4, 6,
- "send_score", "Send score dump to the world score server" },
+ "send_score", "Send score dump to the world score server" },
#endif
#endif
#ifdef JP
{ &disturb_move, FALSE, 4, 0, 20,
- "disturb_move", "¤É¤³¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+ "disturb_move", "¤É¤³¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
#else
{ &disturb_move, FALSE, 4, 0, 20,
"disturb_move", "Disturb whenever any monster moves" },
#ifdef JP
{ &disturb_high, FALSE, 4, 1, 3,
- "disturb_high", "¥ì¥Ù¥ë¤Î¹â¤¤¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤¿¤é¹ÔÆ°¤òÃæ»ß¤¹¤ë"},
+ "disturb_high", "¥ì¥Ù¥ë¤Î¹â¤¤¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤¿¤é¹ÔÆ°¤òÃæ»ß¤¹¤ë"},
#else
{ &disturb_high, FALSE, 4, 1, 3,
"disturb_high", "Disturb whenever high-level monster moves" },
#ifdef JP
{ &disturb_near, TRUE, 4, 0, 21,
- "disturb_near", "»ë³¦Æâ¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤¿¤é¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+ "disturb_near", "»ë³¦Æâ¤Î¥â¥ó¥¹¥¿¡¼¤¬Æ°¤¤¤¿¤é¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
#else
{ &disturb_near, TRUE, 4, 0, 21,
"disturb_near", "Disturb whenever viewable monster moves" },
#ifdef JP
{ &disturb_panel, TRUE, 4, 0, 22,
- "disturb_panel", "²èÌÌ¥¹¥¯¥í¡¼¥ë»þ¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+ "disturb_panel", "²èÌÌ¥¹¥¯¥í¡¼¥ë»þ¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
#else
{ &disturb_panel, TRUE, 4, 0, 22,
"disturb_panel", "Disturb whenever map panel changes" },
#ifdef JP
{ &disturb_state, TRUE, 4, 0, 23,
- "disturb_state", "¼«Ê¬¤Î¥¹¥Æ¡¼¥¿¥¹ÊѲ½»þ¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+ "disturb_state", "¼«Ê¬¤Î¥¹¥Æ¡¼¥¿¥¹ÊѲ½»þ¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
#else
{ &disturb_state, TRUE, 4, 0, 23,
"disturb_state", "Disturb whenever player state changes" },
#ifdef JP
{ &disturb_minor, TRUE, 4, 0, 24,
- "disturb_minor", "º³ºÙ¤Ê¤³¤È¤¬µ¯¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+ "disturb_minor", "º³ºÙ¤Ê¤³¤È¤¬µ¯¤¤Æ¤â¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
#else
{ &disturb_minor, TRUE, 4, 0, 24,
"disturb_minor", "Disturb whenever boring things happen" },
#ifdef JP
{ &ring_bell, FALSE, 4, 0, 14,
- "ring_bell", "¥¨¥é¡¼»þ¤Ë¥Ó¡¼¥×²»¤òÌĤ餹" },
+ "ring_bell", "¥¨¥é¡¼»þ¤Ë¥Ó¡¼¥×²»¤òÌĤ餹" },
#else
{ &ring_bell, FALSE, 4, 0, 14,
"ring_bell", "Audible bell (on errors, etc)" },
#ifdef JP
{ &alert_hitpoint, TRUE, 4, 0, 26,
- "alert_hitpoint", "Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤Î·Ù¹ð»þ¤Ë¥Ó¡¼¥×¤òÌĤ餹" },
+ "alert_hitpoint", "Äã¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤Î·Ù¹ð»þ¤Ë¥Ó¡¼¥×¤òÌĤ餹" },
#else
{ &alert_hitpoint, TRUE, 4, 0, 26,
"alert_hitpoint", "Alert user to critical hitpoints" },
#ifdef JP
{ &disturb_trap_detect, TRUE, 4, 0, 27,
- "disturb_trap_detect", "¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤ëľÁ°¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
+ "disturb_trap_detect", "¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤ëľÁ°¤Ë¹ÔÆ°¤òÃæ»ß¤¹¤ë" },
#else
{ &disturb_trap_detect, TRUE, 4, 0, 27,
"disturb_trap_detect", "Disturb when leaving trap detected area"},
#ifdef JP
{ &alert_trap_detect, FALSE, 4, 0, 25,
- "alert_trap_detect", "¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤ëľÁ°¤Ë·Ù¹ð¤¹¤ë" },
+ "alert_trap_detect", "¥È¥é¥Ã¥×´¶ÃÎÈϰϳ°¤Ë½Ð¤ëľÁ°¤Ë·Ù¹ð¤¹¤ë" },
#else
{ &alert_trap_detect, FALSE, 4, 0, 25,
"alert_trap_detect", "Alert when leaving trap detected area"},
#ifdef JP
{ &check_abort, TRUE, 5, 1, 18,
- "check_abort", "Ϣ³¥³¥Þ¥ó¥É¤Ï¥¡¼ÆþÎϤÇÃæÃǤ¹¤ë" },
+ "check_abort", "Ϣ³¥³¥Þ¥ó¥É¤Ï¥¡¼ÆþÎϤÇÃæÃǤ¹¤ë" },
#else
{ &check_abort, TRUE, 5, 1, 18,
"check_abort", "Check for user abort while continuous command" },
#ifdef JP
{ &flush_failure, TRUE, 5, 1, 20,
- "flush_failure", "ÍÍ¡¹¤Ê¥ß¥¹È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
+ "flush_failure", "ÍÍ¡¹¤Ê¥ß¥¹È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
#else
{ &flush_failure, TRUE, 5, 1, 20,
"flush_failure", "Flush input on various failures" },
#ifdef JP
{ &flush_disturb, FALSE, 5, 1, 21,
- "flush_disturb", "¾ã³²È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
+ "flush_disturb", "¾ã³²È¯À¸»þ¤ËÆþÎϤò¥¯¥ê¥¢¤¹¤ë" },
#else
{ &flush_disturb, FALSE, 5, 1, 21,
"flush_disturb", "Flush input whenever disturbed" },
#ifdef JP
{ &fresh_before, TRUE, 5, 1, 23,
- "fresh_before", "Ϣ³¥³¥Þ¥ó¥ÉÃæ¤Ë²èÌ̤òºÆÉÁ²è¤·Â³¤±¤ë" },
+ "fresh_before", "Ϣ³¥³¥Þ¥ó¥ÉÃæ¤Ë²èÌ̤òºÆÉÁ²è¤·Â³¤±¤ë" },
#else
{ &fresh_before, TRUE, 5, 1, 23,
- "fresh_before", "Flush output while continuous command" },
+ "fresh_before", "Flush output while continuous command" },
#endif
#ifdef JP
{ &fresh_after, FALSE, 5, 1, 24,
- "fresh_after", "¥³¥Þ¥ó¥É¸å¤Ë²èÌ̤ò¾ï¤ËºÆÉÁ²è¤·Â³¤±¤ë" },
+ "fresh_after", "¥³¥Þ¥ó¥É¸å¤Ë²èÌ̤ò¾ï¤ËºÆÉÁ²è¤·Â³¤±¤ë" },
#else
{ &fresh_after, FALSE, 5, 1, 24,
"fresh_after", "Flush output after monster's move" },
#ifdef JP
{ &compress_savefile, FALSE, 5, 1, 26,
- "compress_savefile", "¥»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ëÃæ¤Î¥á¥Ã¥»¡¼¥¸¤ò°µ½Ì¤¹¤ë" },
+ "compress_savefile", "¥»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ëÃæ¤Î¥á¥Ã¥»¡¼¥¸¤ò°µ½Ì¤¹¤ë" },
#else
{ &compress_savefile, FALSE, 5, 1, 26,
"compress_savefile", "Compress messages in savefiles" },
#ifdef JP
{ &manual_haggle, FALSE, 6, 1, 0,
- "manual_haggle", "Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë" },
+ "manual_haggle", "Ź¤ÇÃÍÀÚ¤ê¸ò¾Ä¤ò¤¹¤ë" },
#else
{ &manual_haggle, FALSE, 6, 1, 0,
"manual_haggle", "Manually haggle in stores" },
#ifdef JP
{ &easy_band, FALSE, 6, 6, 31,
- "easy_band", "½é¿´¼ÔÍÑ´Êñ¥â¡¼¥É(*)" },
+ "easy_band", "½é¿´¼ÔÍÑ´Êñ¥â¡¼¥É(*)" },
#else
{ &easy_band, FALSE, 6, 6, 31,
"easy_band", "Easy Mode (*)" },
#ifdef JP
{ &smart_learn, TRUE, 6, 1, 14,
- "smart_learn", "¥â¥ó¥¹¥¿¡¼¤Ï¼ºÇÔ¤ò³Ø½¬¤¹¤ë(*)" },
+ "smart_learn", "¥â¥ó¥¹¥¿¡¼¤Ï¼ºÇÔ¤ò³Ø½¬¤¹¤ë(*)" },
#else
{ &smart_learn, TRUE, 6, 1, 14,
"smart_learn", "Monsters learn from their mistakes (*)" },
#ifdef JP
{ &smart_cheat, FALSE, 6, 1, 15,
- "smart_cheat", "¥â¥ó¥¹¥¿¡¼¤Ï¥×¥ì¥¤¥ä¡¼¤Î¼å¤ß¤òÆͤ¯(*)" },
+ "smart_cheat", "¥â¥ó¥¹¥¿¡¼¤Ï¥×¥ì¥¤¥ä¡¼¤Î¼å¤ß¤òÆͤ¯(*)" },
#else
{ &smart_cheat, FALSE, 6, 1, 15,
"smart_cheat", "Monsters exploit players weaknesses (*)" },
#ifdef JP
{ &ironman_nightmare, FALSE, 6, 6, 18,
- "ironman_nightmare", "¡ÊÅ´¿ÍÍÑ¡Ë°Ì´¥â¡¼¥É(¤³¤ì¤ÏÁ´¤¯ÉÔ¾òÍý¤Ç¤¹¡ª)(*)" },
+ "ironman_nightmare", "¡ÊÅ´¿ÍÍÑ¡Ë°Ì´¥â¡¼¥É(¤³¤ì¤ÏÁ´¤¯ÉÔ¾òÍý¤Ç¤¹¡ª)(*)" },
#else
{ &ironman_nightmare, FALSE, 6, 6, 18,
- "ironman_nightmare", "Nightmare mode(it isn't even remotely fair!)(*)" },
+ "ironman_nightmare", "Nightmare mode(it isn't even remotely fair!)(*)" },
#endif
#ifdef JP
- { &left_hander, FALSE, 6, 6, 13,
- "left_hander", "º¸Íø¤¤Ç¤¢¤ë" },
+ { &left_hander, FALSE, 6, 6, 13,
+ "left_hander", "º¸Íø¤¤Ç¤¢¤ë" },
#else
{ &left_hander, FALSE, 6, 6, 13,
"left_hander", "Left-Hander" },
#ifdef JP
- { &preserve_mode, TRUE, 6, 6, 14,
- "preserve_mode", "ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤ò¼è¤êƨ¤·¤Æ¤âºÆÀ¸À®¤µ¤ì¤ë(*)" },
+ { &preserve_mode, TRUE, 6, 6, 14,
+ "preserve_mode", "ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤ò¼è¤êƨ¤·¤Æ¤âºÆÀ¸À®¤µ¤ì¤ë(*)" },
#else
{ &preserve_mode, TRUE, 6, 6, 14,
"preserve_mode", "Preserve artifacts (*)" },
#ifdef JP
- { &autoroller, TRUE, 6, 6, 15,
- "autoroller", "ǽÎÏÃͤ˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ(*)" },
+ { &autoroller, TRUE, 6, 6, 15,
+ "autoroller", "ǽÎÏÃͤ˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ(*)" },
#else
{ &autoroller, TRUE, 6, 6, 15,
"autoroller", "Allow use of autoroller for stats (*)" },
#ifdef JP
- { &autochara, FALSE, 6, 6, 16,
- "autochara", "ÂγÊ/Ãϰ̤˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ" },
+ { &autochara, FALSE, 6, 6, 16,
+ "autochara", "ÂγÊ/Ãϰ̤˥ª¡¼¥È¥í¡¼¥é¡¼»ÈÍÑ" },
#else
{ &autochara, FALSE, 6, 6, 16,
"autochara", "Autoroll for weight, height and social status" },
#ifdef JP
{ &powerup_home, TRUE, 6, 4, 3,
- "powerup_home", "²æ¤¬²È¤ò³ÈÄ¥¤¹¤ë(*)" },
+ "powerup_home", "²æ¤¬²È¤ò³ÈÄ¥¤¹¤ë(*)" },
#else
{ &powerup_home, TRUE, 6, 4, 3,
- "powerup_home", "Increase capacity of your home (*)" },
+ "powerup_home", "Increase capacity of your home (*)" },
#endif
/*** Easy Object Auto-Destroyer ***/
#ifdef JP
- { &destroy_items, FALSE, 7, 7, 0,
- "destroy_items", "¥¢¥¤¥Æ¥à¤Î´Ê°×¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë" },
+ { &destroy_items, FALSE, 7, 7, 0,
+ "destroy_items", "¥¢¥¤¥Æ¥à¤Î´Ê°×¼«Æ°Ç˲õ¤ò»ÈÍѤ¹¤ë" },
#else
- { &destroy_items, FALSE, 7, 7, 0,
- "destroy_items", "Use easy auto-destroyer" },
+ { &destroy_items, FALSE, 7, 7, 0,
+ "destroy_items", "Use easy auto-destroyer" },
#endif
#ifdef JP
- { &destroy_feeling, FALSE, 7, 7, 8,
- "destroy_feeling", "´Ê°×´ÕÄꤷ¤¿¤È¤¼«Æ°Ç˲õ¤òŬÍѤ¹¤ë" },
+ { &destroy_feeling, FALSE, 7, 7, 8,
+ "destroy_feeling", "´Ê°×´ÕÄꤷ¤¿¤È¤¼«Æ°Ç˲õ¤òŬÍѤ¹¤ë" },
#else
- { &destroy_feeling, FALSE, 7, 7, 8,
- "destroy_feeling", "Apply auto-destroy as sense feeling" },
+ { &destroy_feeling, FALSE, 7, 7, 8,
+ "destroy_feeling", "Apply auto-destroy as sense feeling" },
#endif
#ifdef JP
- { &destroy_identify, FALSE, 7, 7, 9,
- "destroy_identify", "´ÕÄꤷ¤¿¤È¤¼«Æ°Ç˲õ¤òŬÍѤ¹¤ë" },
+ { &destroy_identify, FALSE, 7, 7, 9,
+ "destroy_identify", "´ÕÄꤷ¤¿¤È¤¼«Æ°Ç˲õ¤òŬÍѤ¹¤ë" },
#else
- { &destroy_identify, FALSE, 7, 7, 9,
- "destroy_identify", "Apply auto-destroy as identify an item" },
+ { &destroy_identify, FALSE, 7, 7, 9,
+ "destroy_identify", "Apply auto-destroy as identify an item" },
#endif
#ifdef JP
- { &leave_worth, TRUE, 7, 7, 2,
- "leave_worth", "²ÁÃͤ¬¤¢¤ë¥¢¥¤¥Æ¥à¤Ï²õ¤µ¤Ê¤¤" },
+ { &leave_worth, TRUE, 7, 7, 2,
+ "leave_worth", "²ÁÃͤ¬¤¢¤ë¥¢¥¤¥Æ¥à¤Ï²õ¤µ¤Ê¤¤" },
#else
- { &leave_worth, TRUE, 7, 7, 2,
- "leave_worth", "Auto-destroyer leaves known worthy items" },
+ { &leave_worth, TRUE, 7, 7, 2,
+ "leave_worth", "Auto-destroyer leaves known worthy items" },
#endif
#ifdef JP
- { &leave_equip, FALSE, 7, 7, 3,
- "leave_equip", "Éð´ï/Ëɶñ¤Ï²õ¤µ¤Ê¤¤" },
+ { &leave_equip, FALSE, 7, 7, 3,
+ "leave_equip", "Éð´ï/Ëɶñ¤Ï²õ¤µ¤Ê¤¤" },
#else
- { &leave_equip, FALSE, 7, 7, 3,
- "leave_equip", "Auto-destroyer leaves weapons and armour" },
+ { &leave_equip, FALSE, 7, 7, 3,
+ "leave_equip", "Auto-destroyer leaves weapons and armour" },
#endif
#ifdef JP
- { &leave_chest, TRUE, 7, 7, 7,
- "leave_chest", "³«Éõ¤µ¤ì¤Æ¤¤¤Ê¤¤È¢¤Ï²õ¤µ¤Ê¤¤" },
+ { &leave_chest, TRUE, 7, 7, 7,
+ "leave_chest", "³«Éõ¤µ¤ì¤Æ¤¤¤Ê¤¤È¢¤Ï²õ¤µ¤Ê¤¤" },
#else
- { &leave_chest, TRUE, 7, 7, 7,
- "leave_chest", "Auto-destroyer leaves closed chests" },
+ { &leave_chest, TRUE, 7, 7, 7,
+ "leave_chest", "Auto-destroyer leaves closed chests" },
#endif
#ifdef JP
- { &leave_wanted, TRUE, 7, 7, 4,
- "leave_wanted", "¾Þ¶â¼ó¤Î»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
+ { &leave_wanted, TRUE, 7, 7, 4,
+ "leave_wanted", "¾Þ¶â¼ó¤Î»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
#else
- { &leave_wanted, TRUE, 7, 7, 4,
- "leave_wanted", "Auto-destroyer leaves wanted corpses" },
+ { &leave_wanted, TRUE, 7, 7, 4,
+ "leave_wanted", "Auto-destroyer leaves wanted corpses" },
#endif
#ifdef JP
- { &leave_corpse, FALSE, 7, 7, 5,
- "leave_corpse", "»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
+ { &leave_corpse, FALSE, 7, 7, 5,
+ "leave_corpse", "»àÂÎ/¹ü¤Ï²õ¤µ¤Ê¤¤" },
#else
- { &leave_corpse, FALSE, 7, 7, 5,
- "leave_corpse", "Auto-destroyer leaves corpses and skeletons" },
+ { &leave_corpse, FALSE, 7, 7, 5,
+ "leave_corpse", "Auto-destroyer leaves corpses and skeletons" },
#endif
#ifdef JP
- { &leave_junk, FALSE, 7, 7, 6,
- "leave_junk", "¤¬¤é¤¯¤¿¤Ï²õ¤µ¤Ê¤¤" },
+ { &leave_junk, FALSE, 7, 7, 6,
+ "leave_junk", "¤¬¤é¤¯¤¿¤Ï²õ¤µ¤Ê¤¤" },
#else
- { &leave_junk, FALSE, 7, 7, 6,
- "leave_junk", "Auto-destroyer leaves junk" },
+ { &leave_junk, FALSE, 7, 7, 6,
+ "leave_junk", "Auto-destroyer leaves junk" },
#endif
/*** Play-record Options ***/
#ifdef JP
- { &record_fix_art, TRUE, 10, 4, 11,
- "record_fix_art", "¸ÇÄꥢ¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÆþ¼ê¤òµÏ¿¤¹¤ë" },
+ { &record_fix_art, TRUE, 10, 4, 11,
+ "record_fix_art", "¸ÇÄꥢ¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÆþ¼ê¤òµÏ¿¤¹¤ë" },
#else
- { &record_fix_art, TRUE, 10, 4, 11,
- "record_fix_art", "Record fixed artifacts" },
+ { &record_fix_art, TRUE, 10, 4, 11,
+ "record_fix_art", "Record fixed artifacts" },
#endif
#ifdef JP
- { &record_rand_art, TRUE, 10, 4, 12,
- "record_rand_art", "¥é¥ó¥À¥à¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÆþ¼ê¤òµÏ¿¤¹¤ë" },
+ { &record_rand_art, TRUE, 10, 4, 12,
+ "record_rand_art", "¥é¥ó¥À¥à¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÆþ¼ê¤òµÏ¿¤¹¤ë" },
#else
- { &record_rand_art, TRUE, 10, 4, 12,
- "record_rand_art", "Record random artifacts" },
+ { &record_rand_art, TRUE, 10, 4, 12,
+ "record_rand_art", "Record random artifacts" },
#endif
#ifdef JP
- { &record_destroy_uniq, TRUE, 10, 4, 13,
- "record_destroy_uniq", "¥æ¥Ë¡¼¥¯¥â¥ó¥¹¥¿¡¼¤òÅݤ·¤¿¤È¤¤òµÏ¿¤¹¤ë" },
+ { &record_destroy_uniq, TRUE, 10, 4, 13,
+ "record_destroy_uniq", "¥æ¥Ë¡¼¥¯¥â¥ó¥¹¥¿¡¼¤òÅݤ·¤¿¤È¤¤òµÏ¿¤¹¤ë" },
#else
- { &record_destroy_uniq, TRUE, 10, 4, 13,
- "record_destroy_uniq", "Record when destroy unique monster" },
+ { &record_destroy_uniq, TRUE, 10, 4, 13,
+ "record_destroy_uniq", "Record when destroy unique monster" },
#endif
#ifdef JP
- { &record_fix_quest, TRUE, 10, 4, 14,
- "record_fix_quest", "¸ÇÄꥯ¥¨¥¹¥È¤ÎãÀ®¤òµÏ¿¤¹¤ë" },
+ { &record_fix_quest, TRUE, 10, 4, 14,
+ "record_fix_quest", "¸ÇÄꥯ¥¨¥¹¥È¤ÎãÀ®¤òµÏ¿¤¹¤ë" },
#else
- { &record_fix_quest, TRUE, 10, 4, 14,
- "record_fix_quest", "Record fixed quests" },
+ { &record_fix_quest, TRUE, 10, 4, 14,
+ "record_fix_quest", "Record fixed quests" },
#endif
#ifdef JP
- { &record_rand_quest, TRUE, 10, 4, 15,
- "record_rand_quest", "¥é¥ó¥À¥à¥¯¥¨¥¹¥È¤ÎãÀ®¤òµÏ¿¤¹¤ë" },
+ { &record_rand_quest, TRUE, 10, 4, 15,
+ "record_rand_quest", "¥é¥ó¥À¥à¥¯¥¨¥¹¥È¤ÎãÀ®¤òµÏ¿¤¹¤ë" },
#else
- { &record_rand_quest, TRUE, 10, 4, 15,
- "record_rand_quest", "Record random quests" },
+ { &record_rand_quest, TRUE, 10, 4, 15,
+ "record_rand_quest", "Record random quests" },
#endif
#ifdef JP
- { &record_maxdeapth, TRUE, 10, 4, 16,
- "record_maxdeapth", "ºÇ¿¼³¬¤ò¹¹¿·¤·¤¿¤È¤¤ËµÏ¿¤¹¤ë" },
+ { &record_maxdeapth, TRUE, 10, 4, 16,
+ "record_maxdeapth", "ºÇ¿¼³¬¤ò¹¹¿·¤·¤¿¤È¤¤ËµÏ¿¤¹¤ë" },
#else
- { &record_maxdeapth, TRUE, 10, 4, 16,
- "record_maxdeapth", "Record movements to deepest level" },
+ { &record_maxdeapth, TRUE, 10, 4, 16,
+ "record_maxdeapth", "Record movements to deepest level" },
#endif
#ifdef JP
- { &record_stair, TRUE, 10, 4, 17,
- "record_stair", "³¬¤Î°ÜÆ°¤òµÏ¿¤¹¤ë" },
+ { &record_stair, TRUE, 10, 4, 17,
+ "record_stair", "³¬¤Î°ÜÆ°¤òµÏ¿¤¹¤ë" },
#else
- { &record_stair, TRUE, 10, 4, 17,
- "record_stair", "Record recall and stair movements" },
+ { &record_stair, TRUE, 10, 4, 17,
+ "record_stair", "Record recall and stair movements" },
#endif
#ifdef JP
- { &record_buy, TRUE, 10, 4, 18,
- "record_buy", "¥¢¥¤¥Æ¥à¤Î¹ØÆþ¤òµÏ¿¤¹¤ë" },
+ { &record_buy, TRUE, 10, 4, 18,
+ "record_buy", "¥¢¥¤¥Æ¥à¤Î¹ØÆþ¤òµÏ¿¤¹¤ë" },
#else
- { &record_buy, TRUE, 10, 4, 18,
- "record_buy", "Record purchased items" },
+ { &record_buy, TRUE, 10, 4, 18,
+ "record_buy", "Record purchased items" },
#endif
#ifdef JP
- { &record_sell, FALSE, 10, 4, 19,
- "record_sell", "¥¢¥¤¥Æ¥à¤ÎÇäµÑ¤òµÏ¿¤¹¤ë" },
+ { &record_sell, FALSE, 10, 4, 19,
+ "record_sell", "¥¢¥¤¥Æ¥à¤ÎÇäµÑ¤òµÏ¿¤¹¤ë" },
#else
- { &record_sell, FALSE, 10, 4, 19,
- "record_sell", "Record sold items" },
+ { &record_sell, FALSE, 10, 4, 19,
+ "record_sell", "Record sold items" },
#endif
#ifdef JP
- { &record_danger, TRUE, 10, 4, 20,
- "record_danger", "¥Ô¥ó¥Á¤Ë¤Ê¤Ã¤¿¤È¤¤òµÏ¿¤¹¤ë" },
+ { &record_danger, TRUE, 10, 4, 20,
+ "record_danger", "¥Ô¥ó¥Á¤Ë¤Ê¤Ã¤¿¤È¤¤òµÏ¿¤¹¤ë" },
#else
- { &record_danger, TRUE, 10, 4, 20,
- "record_danger", "Record hitpoint warning" },
+ { &record_danger, TRUE, 10, 4, 20,
+ "record_danger", "Record hitpoint warning" },
#endif
#ifdef JP
- { &record_arena, TRUE, 10, 4, 21,
- "record_arena", "¥¢¥ê¡¼¥Ê¤Ç¤Î¾¡Íø¤òµÏ¿¤¹¤ë" },
+ { &record_arena, TRUE, 10, 4, 21,
+ "record_arena", "¥¢¥ê¡¼¥Ê¤Ç¤Î¾¡Íø¤òµÏ¿¤¹¤ë" },
#else
- { &record_arena, TRUE, 10, 4, 21,
- "record_arena", "Record arena victories" },
+ { &record_arena, TRUE, 10, 4, 21,
+ "record_arena", "Record arena victories" },
#endif
#ifdef JP
- { &record_ident, TRUE, 10, 4, 22,
- "record_ident", "̤ȽÌÀ¤Î¥¢¥¤¥Æ¥à¤Î¼±Ê̤òµÏ¿¤¹¤ë" },
+ { &record_ident, TRUE, 10, 4, 22,
+ "record_ident", "̤ȽÌÀ¤Î¥¢¥¤¥Æ¥à¤Î¼±Ê̤òµÏ¿¤¹¤ë" },
#else
- { &record_ident, TRUE, 10, 4, 22,
- "record_ident", "Record first identified items" },
+ { &record_ident, TRUE, 10, 4, 22,
+ "record_ident", "Record first identified items" },
#endif
#ifdef JP
- { &record_named_pet, FALSE, 10, 4, 23,
- "record_named_pet", "̾Á°¤Ä¤¥Ú¥Ã¥È¤Î¾ðÊó¤òµÏ¿¤¹¤ë" },
+ { &record_named_pet, FALSE, 10, 4, 23,
+ "record_named_pet", "̾Á°¤Ä¤¥Ú¥Ã¥È¤Î¾ðÊó¤òµÏ¿¤¹¤ë" },
#else
- { &record_named_pet, FALSE, 10, 4, 23,
- "record_named_pet", "Record informations of named pets" },
+ { &record_named_pet, FALSE, 10, 4, 23,
+ "record_named_pet", "Record informations of named pets" },
#endif
{
u32b name; /* Name (offset) */
#ifdef JP
- u32b E_name; /* ±Ñ¸ì̾ (offset) */
+ u32b E_name; /* ±Ñ¸ì̾ (offset) */
#endif
u32b text; /* Text (offset) */
s16b tim_sh_holy;
s16b tim_eyeeye;
- /* for mirror master */
+ /* for mirror master */
s16b tim_reflect; /* Timed -- Reflect */
s16b multishadow; /* Timed -- Multi-shadow */
s16b dustrobe; /* Timed -- Robe of dust */
# if defined(MACINTOSH) && defined(MAC_MPW)
/* setting file type and creator -- AR */
- {
- errr errr_tmp;
- errr_tmp = open(buf, O_CREAT | O_EXCL | O_WRONLY | O_BINARY, mode);
- fsetfileinfo(file, _fcreator, _ftype);
- return(errr_tmp);
- }
+ {
+ errr errr_tmp;
+ errr_tmp = open(buf, O_CREAT | O_EXCL | O_WRONLY | O_BINARY, mode);
+ fsetfileinfo(file, _fcreator, _ftype);
+ return(errr_tmp);
+ }
# else
/* Create the file, fail if exists, write-only, binary */
/* Skip the backslash */
str++;
- /* Macro Trigger */
+ /* Macro Trigger */
if (*str == '[')
{
trigger_text_to_ascii(&s, &str);
void flush(void)
{
/* Do it later */
- inkey_xtra = TRUE;
+ inkey_xtra = TRUE;
}
for (t = buf; *t && (*t != '<' || (*(t+1) != 'x' )); t++)
if( iskanji(*t))t++;
#else
- for (t = buf; *t && (*t != '<'); t++);
+ for (t = buf; *t && (*t != '<'); t++);
#endif
if (*t)
/* Clear line, move cursor */
Term_erase(x, y, 255);
- break;
+ break;
}
/* Clean up the char */
/* Dump */
#ifdef JP
- Term_addch((byte)(a|0x10), ch);
+ Term_addch((byte)(a|0x10), ch);
#else
Term_addch(a, ch);
#endif
default:
#ifdef JP
{ /* ÊÒ»³¤µ¤óºîÀ® */
- int next;
-
- if (iskanji (i)) {
- inkey_base = TRUE;
- next = inkey ();
- if (k+1 < len) {
- buf[k++] = i;
- buf[k] = next;
- k_flag[k++] = 1;
- } else
- bell();
- } else {
+ int next;
+
+ if (iskanji (i)) {
+ inkey_base = TRUE;
+ next = inkey ();
+ if (k+1 < len) {
+ buf[k++] = i;
+ buf[k] = next;
+ k_flag[k++] = 1;
+ } else
+ bell();
+ } else {
#ifdef SJIS
- if(k<len && (isprint(i) || (0xa0<=i && i<=0xdf))){
+ if(k<len && (isprint(i) || (0xa0<=i && i<=0xdf))){
#else
- if(k<len && isprint(i)){
+ if(k<len && isprint(i)){
#endif
- buf[k] = i;
- k_flag[k++] = 0;
- } else
- bell();
- }
+ buf[k] = i;
+ k_flag[k++] = 0;
+ } else
+ bell();
+ }
}
#else
if ((k < len) && (isprint(i)))
cptr act;
#ifdef JP
- int caretcmd = 0;
+ int caretcmd = 0;
#endif
/* Roguelike */
if (rogue_like_commands)
}
#ifdef JP
- for (i = 0; i < 256; i++)
- {
- cptr s;
- if ((s = keymap_act[mode][i]) != NULL)
- {
- if (*s == command_cmd && *(s+1) == 0)
- {
- caretcmd = i;
- break;
- }
- }
- }
- if (!caretcmd)
- caretcmd = command_cmd;
+ for (i = 0; i < 256; i++)
+ {
+ cptr s;
+ if ((s = keymap_act[mode][i]) != NULL)
+ {
+ if (*s == command_cmd && *(s+1) == 0)
+ {
+ caretcmd = i;
+ break;
+ }
+ }
+ }
+ if (!caretcmd)
+ caretcmd = command_cmd;
#endif
/* Hack -- Scan equipment */
for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
{
/* Check the "restriction" character */
#ifdef JP
- if ((s[1] == caretcmd) || (s[1] == '*'))
+ if ((s[1] == caretcmd) || (s[1] == '*'))
#else
if ((s[1] == command_cmd) || (s[1] == '*'))
#endif
}
else
{
- int mode;
- cptr act, s;
+ int mode;
+ cptr act, s;
/* Roguelike */
if (rogue_like_commands)
/* Copy as many bytes as will fit */
while (len < bufsize)
- {
+ {
if (iskanji(*s))
- {
+ {
if (len + 1 >= bufsize || !*(s+1)) break;
*d++ = *s++;
*d++ = *s++;
len += 2;
}
- else
- {
+ else
+ {
*d++ = *s++;
len++;
}
Rand_quick = TRUE;
/* Hack -- Induce consistant town layout */
- Rand_value = wilderness[y][x].seed;
+ Rand_value = wilderness[y][x].seed;
dy = rand_range(6, cur_hgt - 6);
dx = rand_range(6, cur_wid - 6);
int i, y, x, lim;
cave_type *c_ptr;
- /* Big town */
+ /* Big town */
cur_hgt = MAX_HGT;
cur_wid = MAX_WID;
*/
void wilderness_gen_small()
{
- int i, j;
+ int i, j;
- /* To prevent stupid things */
- for (i = 0; i < MAX_WID; i++)
- for (j = 0; j < MAX_HGT; j++)
+ /* To prevent stupid things */
+ for (i = 0; i < MAX_WID; i++)
+ for (j = 0; j < MAX_HGT; j++)
{
- cave[j][i].feat = FEAT_PERM_SOLID;
+ cave[j][i].feat = FEAT_PERM_SOLID;
}
/* Init the wilderness */
process_dungeon_file("w_info_j.txt", 0, 0, max_wild_y, max_wild_x);
- /* Fill the map */
- for (i = 0; i < max_wild_x; i++)
- for (j = 0; j < max_wild_y; j++)
+ /* Fill the map */
+ for (i = 0; i < max_wild_x; i++)
+ for (j = 0; j < max_wild_y; j++)
{
if (wilderness[j][i].town && (wilderness[j][i].town != NO_TOWN))
{
cave[j][i].feat = FEAT_ENTRANCE;
cave[j][i].special = (byte)wilderness[j][i].entrance;
}
- else cave[j][i].feat = conv_terrain2feat[wilderness[j][i].terrain];
+ else cave[j][i].feat = conv_terrain2feat[wilderness[j][i].terrain];
- cave[j][i].info |= (CAVE_GLOW | CAVE_MARK);
+ cave[j][i].info |= (CAVE_GLOW | CAVE_MARK);
}
cur_hgt = (max_wild_y / SCREEN_HGT + 1) * SCREEN_HGT;
panel_row_min = cur_hgt;
panel_col_min = cur_wid;
- /* Place the player */
- px = p_ptr->wilderness_x;
- py = p_ptr->wilderness_y;
+ /* Place the player */
+ px = p_ptr->wilderness_x;
+ py = p_ptr->wilderness_y;
p_ptr->town_num = 0;
}
char buf[80];
sprintf(buf, "Artifact Spoilers for Hengband Version %d.%d.%d",
- FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+ FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
spoiler_underline(buf);
}
/* Dump the header */
fprintf(fff, "Monster Spoilers for Hengband Version %d.%d.%d\n",
- FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+ FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
fprintf(fff, "------------------------------------------\n\n");
/* Dump the header */
if (r_ptr->name) who[n++] = i;
}
- /* Select the sort method */
- ang_sort_comp = ang_sort_comp_hook;
- ang_sort_swap = ang_sort_swap_hook;
+ /* Select the sort method */
+ ang_sort_comp = ang_sort_comp_hook;
+ ang_sort_swap = ang_sort_swap_hook;
- /* Sort the array by dungeon depth of monsters */
- ang_sort(who, &why, n);
+ /* Sort the array by dungeon depth of monsters */
+ ang_sort(who, &why, n);
/* Scan again */
for (i = 0; i < n; i++)
for (; *str; str++)
{
#ifdef JP
- char cbak;
- int k_flag = iskanji((unsigned char)(*str));
+ char cbak;
+ int k_flag = iskanji((unsigned char)(*str));
#endif
char ch = *str;
int wrap = (ch == '\n');
#ifdef JP
- if (!isprint(ch) && !k_flag && !iskanji2) ch = ' ';
+ if (!isprint(ch) && !k_flag && !iskanji2) ch = ' ';
if(k_flag && !iskanji2)iskanji2=1;else iskanji2=0;
#else
if (!isprint(ch)) ch = ' ';
#endif
#ifdef JP
- if ( roff_p >= roff_buf+( (k_flag) ? 74 : 75) ) wrap=1;
+ if ( roff_p >= roff_buf+( (k_flag) ? 74 : 75) ) wrap=1;
if ((ch == ' ') && (roff_p + 2 >= roff_buf + ((k_flag) ? 74 : 75))) wrap = 1;
#else
if (roff_p >= roff_buf + 75) wrap = 1;
*roff_p = '\0';
r = roff_p;
#ifdef JP
- cbak=' ';
+ cbak=' ';
#endif
if (roff_s && (ch != ' '))
{
#ifdef JP
- cbak=*roff_s;
+ cbak=*roff_s;
#endif
*roff_s = '\0';
r = roff_s + 1;
}
else{
if( iskanji2 &&
- strncmp(str, "¡£", 2) != 0 &&
+ strncmp(str, "¡£", 2) != 0 &&
strncmp(str, "¡¢", 2) != 0 &&
- strncmp(str, "¥£", 2) != 0 &&
+ strncmp(str, "¥£", 2) != 0 &&
strncmp(str, "¡¼", 2) != 0) roff_s = roff_p;
}
#else
prt(buf, 2, j);
prt(format("kind = %-5d level = %-4d tval = %-5d sval = %-5d",
- o_ptr->k_idx, get_object_level(o_ptr),
- o_ptr->tval, o_ptr->sval), 4, j);
+ o_ptr->k_idx, get_object_level(o_ptr),
+ o_ptr->tval, o_ptr->sval), 4, j);
prt(format("number = %-3d wgt = %-6d ac = %-5d damage = %dd%d",
- o_ptr->number, o_ptr->weight,
- o_ptr->ac, o_ptr->dd, o_ptr->ds), 5, j);
+ o_ptr->number, o_ptr->weight,
+ o_ptr->ac, o_ptr->dd, o_ptr->ds), 5, j);
prt(format("pval = %-5d toac = %-5d tohit = %-4d todam = %-4d",
- o_ptr->pval, o_ptr->to_a, o_ptr->to_h, o_ptr->to_d), 6, j);
+ o_ptr->pval, o_ptr->to_a, o_ptr->to_h, o_ptr->to_d), 6, j);
prt(format("name1 = %-4d name2 = %-4d cost = %ld",
- o_ptr->name1, o_ptr->name2, (long)object_value(o_ptr)), 7, j);
+ o_ptr->name1, o_ptr->name2, (long)object_value(o_ptr)), 7, j);
prt(format("ident = %04x xtra1 = %-4d xtra2 = %-4d timeout = %-d",
- o_ptr->ident, o_ptr->xtra1, o_ptr->xtra2, o_ptr->timeout), 8, j);
+ o_ptr->ident, o_ptr->xtra1, o_ptr->xtra2, o_ptr->timeout), 8, j);
prt(format("xtra3 = %-4d xtra4 = %-4d xtra5 = %-4d cursed = %-d",
- o_ptr->xtra3, o_ptr->xtra4, o_ptr->xtra5, o_ptr->curse_flags), 9, j);
+ o_ptr->xtra3, o_ptr->xtra4, o_ptr->xtra5, o_ptr->curse_flags), 9, j);
prt("+------------FLAGS1------------+", 10, j);
prt("AFFECT........SLAY........BRAND.", 11, j);
{
o_ptr = &o_list[0 - item];
}
-
+
/* The item was not changed */
changed = FALSE;
/* Message */
msg_print("Changes accepted.");
- /* Recalcurate object's weight */
- if (item >= 0)
- {
- p_ptr->total_weight += (q_ptr->weight * q_ptr->number)
- - (o_ptr->weight * o_ptr->number);
- }
+ /* Recalcurate object's weight */
+ if (item >= 0)
+ {
+ p_ptr->total_weight += (q_ptr->weight * q_ptr->number)
+ - (o_ptr->weight * o_ptr->number);
+ }
/* Change */
object_copy(o_ptr, q_ptr);
if (a_info[i].sval != k_info[k_idx].sval) continue;
/* Create this artifact */
- create_named_art(i, py, px);
+ create_named_art(i, py, px);
- /* All done */
- msg_print("Allocated(INSTA_ART).");
+ /* All done */
+ msg_print("Allocated(INSTA_ART).");
- return;
+ return;
}
}
/* Create the item */
object_prep(q_ptr, k_idx);
- /* Apply magic */
- apply_magic(q_ptr, dun_level, FALSE, FALSE, FALSE, FALSE);
+ /* Apply magic */
+ apply_magic(q_ptr, dun_level, FALSE, FALSE, FALSE, FALSE);
/* Drop the object from heaven */
(void)drop_near(q_ptr, -1, py, px);
p_ptr->leftbldg = FALSE;
energy_use = 0;
- /* Prevent energy_need from being too lower than 0 */
- p_ptr->energy_need = 0;
+ /* Prevent energy_need from being too lower than 0 */
+ p_ptr->energy_need = 0;
/* Leaving */
p_ptr->leaving = TRUE;
#ifdef JP
return "¥¯¥¨¥¹¥È";
#else
- return "Quest";
+ return "Quest";
#endif
else if (p_ptr->wild_mode)
#ifdef JP
/* tim levitation */
if (p_ptr->tim_ffall) ADD_FLG(BAR_LEVITATE);
- if (p_ptr->tim_res_nether) ADD_FLG(BAR_RESNETH);
+ if (p_ptr->tim_res_nether) ADD_FLG(BAR_RESNETH);
if (p_ptr->dustrobe) ADD_FLG(BAR_DUSTROBE);
if (p_ptr->wizard)
{
#ifdef JP
- /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½ ¾Î¹æ */
+ /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½ ¾Î¹æ */
p = "[¥¦¥£¥¶¡¼¥É]";
#else
p = "[=-WIZARD-=]";
else
{
#ifdef JP
- /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½ ¾Î¹æ */
+ /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½ ¾Î¹æ */
p = "***¾¡Íø¼Ô***";
#else
if (p_ptr->exp >= p_ptr->max_exp)
{
#ifdef JP
- if (p_ptr->prace == RACE_ANDROID) 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
- if (p_ptr->prace == RACE_ANDROID) put_str("Cst ", 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
if (num_allowed>(80+bonus)) num_allowed = 80+bonus;
}
- /* Count the number of spells we know */
- for (j = 0; j < 64; j++)
+ /* Count the number of spells we know */
+ for (j = 0; j < 64; j++)
{
/* Count known spells */
if ((j < 32) ?
- (p_ptr->spell_forgotten1 & (1L << j)) :
- (p_ptr->spell_forgotten2 & (1L << (j - 32))))
+ (p_ptr->spell_forgotten1 & (1L << j)) :
+ (p_ptr->spell_forgotten2 & (1L << (j - 32))))
{
num_boukyaku++;
- }
- }
+ }
+ }
/* See how many spells we must forget or may learn */
p_ptr->new_spells = num_allowed + p_ptr->add_spells + num_boukyaku - p_ptr->learned_spells;
/* Message */
#ifdef JP
- msg_format("%s¤Î%s¤ò˺¤ì¤Æ¤·¤Þ¤Ã¤¿¡£",
+ msg_format("%s¤Î%s¤ò˺¤ì¤Æ¤·¤Þ¤Ã¤¿¡£",
spell_names[technic2magic(which)-1][j%32], p );
#else
msg_format("You have forgotten the %s of %s.", p,
/* Message */
#ifdef JP
- msg_format("%s¤Î%s¤ò˺¤ì¤Æ¤·¤Þ¤Ã¤¿¡£",
+ msg_format("%s¤Î%s¤ò˺¤ì¤Æ¤·¤Þ¤Ã¤¿¡£",
spell_names[technic2magic(which)-1][j%32], p );
#else
msg_format("You have forgotten the %s of %s.", p,
- spell_names[technic2magic(which)-1][j%32]);
+ spell_names[technic2magic(which)-1][j%32]);
#endif
/* Message */
#ifdef JP
- msg_format("%s¤Î%s¤ò»×¤¤½Ð¤·¤¿¡£",
+ msg_format("%s¤Î%s¤ò»×¤¤½Ð¤·¤¿¡£",
spell_names[technic2magic(which)-1][j%32], p );
#else
msg_format("You have remembered the %s of %s.",
- p, spell_names[technic2magic(which)-1][j%32]);
+ p, spell_names[technic2magic(which)-1][j%32]);
#endif
}
#else
msg_format("You can learn %d more %s%s.",
- p_ptr->new_spells, p,
- (p_ptr->new_spells != 1) ? "s" : "");
+ p_ptr->new_spells, p,
+ (p_ptr->new_spells != 1) ? "s" : "");
#endif
}
/* Redraw Study Status */
p_ptr->redraw |= (PR_STUDY);
- /* Redraw object recall */
- p_ptr->window |= (PW_OBJECT);
+ /* Redraw object recall */
+ p_ptr->window |= (PW_OBJECT);
}
}
}
#ifdef JP
- /* ¥ì¥Ù¥ë¥¢¥Ã¥×¤Î»þ¤Ï¾å¾ºÎ̤òɽ¼¨¤¹¤ë */
- if ((level_up == 1) && (msp > p_ptr->msp))
- {
- msg_format("ºÇÂç¥Þ¥¸¥Ã¥¯¡¦¥Ý¥¤¥ó¥È¤¬ %d Áý²Ã¤·¤¿¡ª",
- (msp - p_ptr->msp));
- }
+ /* ¥ì¥Ù¥ë¥¢¥Ã¥×¤Î»þ¤Ï¾å¾ºÎ̤òɽ¼¨¤¹¤ë */
+ if ((level_up == 1) && (msp > p_ptr->msp))
+ {
+ msg_format("ºÇÂç¥Þ¥¸¥Ã¥¯¡¦¥Ý¥¤¥ó¥È¤¬ %d Áý²Ã¤·¤¿¡ª",
+ (msp - p_ptr->msp));
+ }
#endif
/* Save new mana */
p_ptr->msp = msp;
}
#ifdef JP
- /* ¥ì¥Ù¥ë¥¢¥Ã¥×¤Î»þ¤Ï¾å¾ºÎ̤òɽ¼¨¤¹¤ë */
- if ((level_up == 1) && (mhp > p_ptr->mhp))
- {
- msg_format("ºÇÂç¥Ò¥Ã¥È¡¦¥Ý¥¤¥ó¥È¤¬ %d Áý²Ã¤·¤¿¡ª",
- (mhp - p_ptr->mhp) );
- }
+ /* ¥ì¥Ù¥ë¥¢¥Ã¥×¤Î»þ¤Ï¾å¾ºÎ̤òɽ¼¨¤¹¤ë */
+ if ((level_up == 1) && (mhp > p_ptr->mhp))
+ {
+ msg_format("ºÇÂç¥Ò¥Ã¥È¡¦¥Ý¥¤¥ó¥È¤¬ %d Áý²Ã¤·¤¿¡ª",
+ (mhp - p_ptr->mhp) );
+ }
#endif
/* Save the new max-hitpoints */
p_ptr->mhp = mhp;
p_ptr->cur_lite = 1;
/*
- * check if the player doesn't have light radius,
+ * check if the player doesn't have light radius,
* but does weakly glow as an intrinsic.
- */
+ */
if (p_ptr->cur_lite <= 0 && p_ptr->lite) p_ptr->cur_lite++;
if (p_ptr->cur_lite > 14) p_ptr->cur_lite = 14;
switch(p_ptr->mimic_form)
{
case MIMIC_DEMON:
- p_ptr->hold_life=TRUE;
- p_ptr->resist_chaos=TRUE;
- p_ptr->resist_neth=TRUE;
- p_ptr->resist_fire=TRUE;
+ p_ptr->hold_life=TRUE;
+ p_ptr->resist_chaos=TRUE;
+ p_ptr->resist_neth=TRUE;
+ p_ptr->resist_fire=TRUE;
p_ptr->oppose_fire = 1;
- p_ptr->see_inv=TRUE;
+ p_ptr->see_inv=TRUE;
p_ptr->pspeed += 3;
p_ptr->redraw |= PR_STATUS;
p_ptr->to_a += 10;
p_ptr->dis_to_a += 10;
break;
case MIMIC_DEMON_LORD:
- p_ptr->hold_life=TRUE;
- p_ptr->resist_chaos=TRUE;
- p_ptr->resist_neth=TRUE;
- p_ptr->immune_fire=TRUE;
- p_ptr->resist_acid = TRUE;
- p_ptr->resist_fire=TRUE;
- p_ptr->resist_cold = TRUE;
- p_ptr->resist_elec = TRUE;
- p_ptr->resist_pois = TRUE;
- p_ptr->resist_conf = TRUE;
- p_ptr->resist_disen = TRUE;
- p_ptr->resist_nexus = TRUE;
- p_ptr->resist_fear = TRUE;
- p_ptr->sh_fire = TRUE;
- p_ptr->see_inv = TRUE;
+ p_ptr->hold_life=TRUE;
+ p_ptr->resist_chaos=TRUE;
+ p_ptr->resist_neth=TRUE;
+ p_ptr->immune_fire=TRUE;
+ p_ptr->resist_acid = TRUE;
+ p_ptr->resist_fire=TRUE;
+ p_ptr->resist_cold = TRUE;
+ p_ptr->resist_elec = TRUE;
+ p_ptr->resist_pois = TRUE;
+ p_ptr->resist_conf = TRUE;
+ p_ptr->resist_disen = TRUE;
+ p_ptr->resist_nexus = TRUE;
+ p_ptr->resist_fear = TRUE;
+ p_ptr->sh_fire = TRUE;
+ p_ptr->see_inv = TRUE;
p_ptr->telepathy = TRUE;
p_ptr->ffall = TRUE;
p_ptr->kill_wall = TRUE;
{
if (cursed_p(o_ptr)) p_ptr->cursed |= TRC_TELEPORT;
else
- {
- cptr insc = quark_str(o_ptr->inscription);
-
- if (o_ptr->inscription &&
- (strchr(insc, '.') || strchr(insc, '%')))
- {
- /*
- * {.} will stop random teleportation.
- * {%} includes '.' after conversion.
- */
- }
- else
- {
- /* Controlled random teleportation */
- p_ptr->cursed |= TRC_TELEPORT_SELF;
- }
- }
+ {
+ cptr insc = quark_str(o_ptr->inscription);
+
+ if (o_ptr->inscription &&
+ (strchr(insc, '.') || strchr(insc, '%')))
+ {
+ /*
+ * {.} will stop random teleportation.
+ * {%} includes '.' after conversion.
+ */
+ }
+ else
+ {
+ /* Controlled random teleportation */
+ p_ptr->cursed |= TRC_TELEPORT_SELF;
+ }
+ }
}
/* Immunity flags */
j = 0;
p_ptr->align = friend_align;
- /* Determine player alignment */
- for (i = 0; i < 8; i++)
- {
+ /* Determine player alignment */
+ for (i = 0; i < 8; i++)
+ {
if ((p_ptr->vir_types[i] == V_HARMONY) || (p_ptr->vir_types[i] == V_NATURE))
{
neutral[j] = i;
else if (p_ptr->vir_types[i] == V_UNLIFE) p_ptr->align -= p_ptr->virtues[i];
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;
{
p_ptr->update &= ~(PU_DISTANCE);
- /* Still need to call update_monsters(FALSE) after update_mon_lite() */
+ /* Still need to call update_monsters(FALSE) after update_mon_lite() */
/* p_ptr->update &= ~(PU_MONSTERS); */
update_monsters(TRUE);
int number_of_quests(void)
{
- int i, j;
-
- /* Clear the counter */
- i = 0;
-
- for (j = MIN_RANDOM_QUEST; j < MAX_RANDOM_QUEST+1; j++)
- {
- if (quest[j].status != QUEST_STATUS_UNTAKEN)
- {
- /* Increment count of quests taken. */
- i++;
- }
- }
-
- /* Return the number of quests taken */
- return (i);
+ int i, j;
+
+ /* Clear the counter */
+ i = 0;
+
+ for (j = MIN_RANDOM_QUEST; j < MAX_RANDOM_QUEST+1; j++)
+ {
+ if (quest[j].status != QUEST_STATUS_UNTAKEN)
+ {
+ /* Increment count of quests taken. */
+ i++;
+ }
+ }
+
+ /* Return the number of quests taken */
+ return (i);
}
p_ptr->window |= (PW_PLAYER | PW_SPELL);
/* HP¤ÈMP¤Î¾å¾ºÎ̤òɽ¼¨ */
- level_up = 1;
+ level_up = 1;
/* Handle stuff */
handle_stuff();
- level_up = 0;
+ level_up = 0;
if (level_inc_stat)
{
/* Bloodletters of Khorne may drop a blade of chaos */
else if (m_ptr->r_idx == MON_BLOODLETTER &&
- (randint1(100) < 15) &&
+ (randint1(100) < 15) &&
!(p_ptr->inside_arena || p_ptr->inside_battle))
{
/* Get local object */
#define M_INT_RSHIFT63(h1,l1) {l1=(l1>>1)|(h1<<30);h1>>=1;}
#define M_INT_DIV63(h1,l1,h2,l2,result) \
do{ \
- int bit=1; \
- result = 0; \
+ int bit=1; \
+ result = 0; \
while( M_INT_GREATER63(h1,l1, h2, l2) ){M_INT_LSHIFT63(h2, l2); bit<<=1;} \
for(bit>>=1; bit>=1; bit>>=1){ \
M_INT_RSHIFT63(h2, l2); \
if(M_INT_GREATER63(h1, l1, h2, l2)) \
{result|=bit;M_INT_SUB63(h1, l1, h2, l2);} \
} \
- } while(0)
+ } while(0)
/* Give some experience for the kill */
M_INT_DIV63(m_exp_h, m_exp_l, div_h, div_l, new_exp);
* Run (sometimes) if at 10% or less of max hit points,
* or (usually) when hit for half its current hit points
*/
- if ((randint1(10) >= percentage) ||
+ if ((randint1(10) >= percentage) ||
((dam >= m_ptr->hp) && (randint0(100) < 80)))
{
/* Hack -- note fear */
/* XXX XXX XXX Hack -- Add some timed fear */
m_ptr->monfear = (randint1(10) +
- (((dam >= m_ptr->hp) && (percentage > 7)) ?
- 20 : ((11 - percentage) * 5)));
+ (((dam >= m_ptr->hp) && (percentage > 7)) ?
+ 20 : ((11 - percentage) * 5)));
}
}
/* Interesting memorized features */
if (c_ptr->info & (CAVE_MARK))
{
- byte feat;
+ byte feat;
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Notice glyphs */
if (c_ptr->info & CAVE_OBJECT) return (TRUE);
/* Use a preposition */
#ifdef JP
- s2 = "¤Î¾å";
- s3 = "¤Ë¤¤¤ë";
+ s2 = "¤Î¾å";
+ s3 = "¤Ë¤¤¤ë";
#else
s2 = "on ";
#endif
/* Remove the first object from the list. */
excise_object_idx(o_idx);
-
+
/* Find end of the list. */
i = c_ptr->o_idx;
while (o_list[i].next_o_idx)
i = o_list[i].next_o_idx;
-
+
/* Add after the last object. */
o_list[i].next_o_idx = o_idx;
}
/* Double break */
if (this_o_idx) break;
- /* Feature code (applying "mimic" field) */
- feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
+ /* Feature code (applying "mimic" field) */
+ feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic;
/* Require knowledge about grid, or ability to see grid */
if (!(c_ptr->info & CAVE_MARK) && !player_can_see_bold(y, x))
#else
name = format("%s(level %d)", d_text + d_info[c_ptr->special].text, d_info[c_ptr->special].mindepth);
#endif
- }
+ }
else if (feat == FEAT_TOWN)
{
name = town[c_ptr->special].name;
- }
+ }
else if (p_ptr->wild_mode && (feat == FEAT_FLOOR))
{
#ifdef JP
int dx = ddx[d];
int dy = ddy[d];
- /* XTRA HACK MOVEFAST */
- if (move_fast)
- {
- x += dx * wid / 2;
- y += dy * hgt / 2;
- } else {
- x += dx;
- y += dy;
- }
+ /* XTRA HACK MOVEFAST */
+ if (move_fast)
+ {
+ x += dx * wid / 2;
+ y += dy * hgt / 2;
+ } else {
+ x += dx;
+ y += dy;
+ }
/* Do not move horizontally if unnecessary */
if (((x < panel_col_min + wid / 2) && (dx > 0)) ||
/* Hack -- Ignore non-changes */
if ((*scr_aa == *a) && (*scr_cc == *c) &&
- (*scr_taa == *ta) && (*scr_tcc == *tc))
+ (*scr_taa == *ta) && (*scr_tcc == *tc))
{
x++;
a++;
byte *scr_aa = Term->scr->a[y];
#ifdef JP
- char *scr_cc = Term->scr->c[y];
+ char *scr_cc = Term->scr->c[y];
#ifdef USE_TRANSPARENCY
byte *scr_taa = Term->scr->ta[y];
#ifdef JP
- /* ɽ¼¨Ê¸»ú¤Ê¤· */
- if (n == 0 || *s == 0) return;
- /*
- * Á´³Ñʸ»ú¤Î±¦È¾Ê¬¤«¤éʸ»ú¤òɽ¼¨¤¹¤ë¾ì¹ç¡¢
- * ½Å¤Ê¤Ã¤¿Ê¸»ú¤Îº¸Éôʬ¤ò¾Ãµî¡£
- * ɽ¼¨³«»Ï°ÌÃÖ¤¬º¸Ã¼¤Ç¤Ê¤¤¤È²¾Äê¡£
- */
- if ((scr_aa[x] & KANJI2) && !(scr_aa[x] & 0x80))
- {
- scr_cc[x - 1] = ' ';
- scr_aa[x - 1] &= KANJIC;
- x1 = x2 = x - 1;
- }
+ /* ɽ¼¨Ê¸»ú¤Ê¤· */
+ if (n == 0 || *s == 0) return;
+ /*
+ * Á´³Ñʸ»ú¤Î±¦È¾Ê¬¤«¤éʸ»ú¤òɽ¼¨¤¹¤ë¾ì¹ç¡¢
+ * ½Å¤Ê¤Ã¤¿Ê¸»ú¤Îº¸Éôʬ¤ò¾Ãµî¡£
+ * ɽ¼¨³«»Ï°ÌÃÖ¤¬º¸Ã¼¤Ç¤Ê¤¤¤È²¾Äê¡£
+ */
+ if ((scr_aa[x] & KANJI2) && !(scr_aa[x] & 0x80))
+ {
+ scr_cc[x - 1] = ' ';
+ scr_aa[x - 1] &= KANJIC;
+ x1 = x2 = x - 1;
+ }
#endif
/* Queue the attr/chars */
for ( ; n; x++, s++, n--)
if (x != w && !(scr_aa[x] & 0x80) && (scr_aa[x] & KANJI2))
{
scr_cc[x] = ' ';
- scr_aa[x] &= KANJIC;
+ scr_aa[x] &= KANJIC;
if (x1 < 0) x1 = x;
x2 = x;
}
#ifdef JP
if ((na == oa) && (nc == oc) && (nta == ota) && (ntc == otc)
&&(!kanji || (scr_aa[x + 1] == old_aa[x + 1] &&
- scr_cc[x + 1] == old_cc[x + 1] &&
- scr_taa[x + 1] == old_taa[x + 1] &&
- scr_tcc[x + 1] == old_tcc[x + 1])))
+ scr_cc[x + 1] == old_cc[x + 1] &&
+ scr_taa[x + 1] == old_taa[x + 1] &&
+ scr_tcc[x + 1] == old_tcc[x + 1])))
#else
if ((na == oa) && (nc == oc) && (nta == ota) && (ntc == otc))
#endif
#ifdef JP
if ((na == oa) && (nc == oc) &&
(!kanji || (scr_aa[x + 1] == old_aa[x + 1] &&
- scr_cc[x + 1] == old_cc[x + 1])))
+ scr_cc[x + 1] == old_cc[x + 1])))
#else
if ((na == oa) && (nc == oc))
#endif
#ifdef JP
if ((na == oa) && (nc == oc) && (nta == ota) && (ntc == otc)&&
(!kanji || (scr_aa[x + 1] == old_aa[x + 1] &&
- scr_cc[x + 1] == old_cc[x + 1] &&
- scr_taa[x + 1] == old_taa[x + 1] &&
- scr_tcc[x + 1] == old_tcc[x + 1])))
+ scr_cc[x + 1] == old_cc[x + 1] &&
+ scr_taa[x + 1] == old_taa[x + 1] &&
+ scr_tcc[x + 1] == old_tcc[x + 1])))
#else
if ((na == oa) && (nc == oc) && (nta == ota) && (ntc == otc))
#endif
#ifdef JP
if ((na == oa) && (nc == oc) &&
(!kanji || (scr_aa[x + 1] == old_aa[x + 1] &&
- scr_cc[x + 1] == old_cc[x + 1])))
+ scr_cc[x + 1] == old_cc[x + 1])))
#else
if ((na == oa) && (nc == oc))
#endif
#ifdef JP
if ((na == oa) && (nc == oc) &&
(!kanji || (scr_aa[x + 1] == old_aa[x + 1] &&
- scr_cc[x + 1] == old_cc[x + 1])))
+ scr_cc[x + 1] == old_cc[x + 1])))
#else
if ((na == oa) && (nc == oc))
#endif
if (!scr->cu && scr->cv)
{
#ifdef CHUUKEI
- send_curs_to_chuukei_server(scr->cx, scr->cy);
+ send_curs_to_chuukei_server(scr->cx, scr->cy);
#endif
#ifdef JP
if ((scr->cx + 1 < w) &&
- ((old->a[scr->cy][scr->cx + 1] == 255) ||
- (!(old->a[scr->cy][scr->cx] & 0x80) &&
- iskanji(old->c[scr->cy][scr->cx]))))
+ ((old->a[scr->cy][scr->cx + 1] == 255) ||
+ (!(old->a[scr->cy][scr->cx] & 0x80) &&
+ iskanji(old->c[scr->cy][scr->cx]))))
#else
if ((scr->cx + 1 < w) && (old->a[scr->cy][scr->cx + 1] == 255))
#endif
{
/* Double width cursor for the Bigtile mode */
- (void)((*Term->bigcurs_hook)(scr->cx, scr->cy));
- }
- else
- {
- /* Call the cursor display routine */
- (void)((*Term->curs_hook)(scr->cx, scr->cy));
- }
+ (void)((*Term->bigcurs_hook)(scr->cx, scr->cy));
+ }
+ else
+ {
+ /* Call the cursor display routine */
+ (void)((*Term->curs_hook)(scr->cx, scr->cy));
+ }
}
}
#endif /* USE_TRANSPARENCY */
#ifdef JP
- /*
- * Á´³Ñʸ»ú¤Î±¦È¾Ê¬¤«¤éʸ»ú¤òɽ¼¨¤¹¤ë¾ì¹ç¡¢
- * ½Å¤Ê¤Ã¤¿Ê¸»ú¤Îº¸Éôʬ¤ò¾Ãµî¡£
- */
- if (n > 0 && (((scr_aa[x] & KANJI2) && !(scr_aa[x] & 0x80))
+ /*
+ * Á´³Ñʸ»ú¤Î±¦È¾Ê¬¤«¤éʸ»ú¤òɽ¼¨¤¹¤ë¾ì¹ç¡¢
+ * ½Å¤Ê¤Ã¤¿Ê¸»ú¤Îº¸Éôʬ¤ò¾Ãµî¡£
+ */
+ if (n > 0 && (((scr_aa[x] & KANJI2) && !(scr_aa[x] & 0x80))
|| ((byte)scr_cc[x] == 255 && scr_aa[x] == 255)))
#else
- if (n > 0 && (byte)scr_cc[x] == 255 && scr_aa[x] == 255)
+ if (n > 0 && (byte)scr_cc[x] == 255 && scr_aa[x] == 255)
#endif
- {
- x--;
- n++;
- }
+ {
+ x--;
+ n++;
+ }
/* Scan every column */
for (i = 0; i < n; i++, x++)
if ((oa == na) && (oc == nc)) continue;
#ifdef JP
- /*
- * Á´³Ñʸ»ú¤Îº¸È¾Ê¬¤Çɽ¼¨¤ò½ªÎ»¤¹¤ë¾ì¹ç¡¢
- * ½Å¤Ê¤Ã¤¿Ê¸»ú¤Î±¦Éôʬ¤ò¾Ãµî¡£
+ /*
+ * Á´³Ñʸ»ú¤Îº¸È¾Ê¬¤Çɽ¼¨¤ò½ªÎ»¤¹¤ë¾ì¹ç¡¢
+ * ½Å¤Ê¤Ã¤¿Ê¸»ú¤Î±¦Éôʬ¤ò¾Ãµî¡£
*
* 2001/04/29 -- Habu
* ¹Ô¤Î±¦Ã¼¤Î¾ì¹ç¤Ï¤³¤Î½èÍý¤ò¤·¤Ê¤¤¤è¤¦¤Ë½¤Àµ¡£
- */
- if ((oa & KANJI1) && (i + 1) == n && x != w - 1)
- n++;
+ */
+ if ((oa & KANJI1) && (i + 1) == n && x != w - 1)
+ n++;
#endif
/* Save the "literal" information */
scr_aa[x] = na;
{
char buf[80];
sprintf(buf, "Kill (%ld): %ld - %ld = %ld.",
- len, virt_make, virt_kill, virt_make - virt_kill);
+ len, virt_make, virt_kill, virt_make - virt_kill);
plog(buf);
}
{
char buf[80];
sprintf(buf, "Make (%ld): %ld - %ld = %ld.",
- len, virt_make, virt_kill, virt_make - virt_kill);
+ len, virt_make, virt_kill, virt_make - virt_kill);
plog(buf);
}
OSDN Git Service
