OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision732da9d2817af6d509e8357ac4ddedfcc8461230 (tree)
Time2002-02-09 06:19:59
Authorhabu <habu@0568...>
Commiterhabu

Log Message

､ｵ､ｭ､ﾛ､ﾉ､ﾎﾊﾑｹｹ､ﾏ｡｢ｸ惕ﾃ､ﾆｴｴ､ﾎ､ﾛ､ｦ､ﾋcommit､ｷ､ﾆ､ｷ､ﾞ､ﾃ､ｿ､ﾎ､ﾇ｡｢ｴｴ､ommitﾁｰ､ﾎｾﾖ､ﾋﾌ皃ｷ､ｿ｡｣

Change Summary

Incremental Difference

--- a/lib/edit/a_info_j.txt
+++ b/lib/edit/a_info_j.txt
@@ -238,7 +238,7 @@ E:'Frakir'
238238 I:45:32:1
239239 W:50:40:2:75000
240240 F:STR | INT | WIS | DEX | CON | CHR | STEALTH | HIDE_TYPE |
241-F:RES_POIS | ACTIVATE | SEE_INVIS | SEARCH | WARNING | INSTA_ART
241+F:RES_POIS | ACTIVATE | SEE_INVIS | SEARCH | INSTA_ART
242242 D:混沌の王子マーリンがログルスから生み出した意思を持った腕輪だ。
243243 D:普段は目に見えないが脈動して危険を知らせてくれる。装備するものが
244244 D:命ずると形を変えて敵の首を締めることができる。
--- a/lib/edit/k_info_j.txt
+++ b/lib/edit/k_info_j.txt
@@ -5080,7 +5080,6 @@ G:=:d
50805080 I:45:54:0
50815081 W:10:0:2:200
50825082 A:10/2
5083-F:WARNING
50845083
50855084 N:619:& 鋼鉄のクロスボウの矢
50865085 E:& Steel Bolt~
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -4480,14 +4480,15 @@ msg_format("%s
44804480 {
44814481 int oy, ox;
44824482
4483- if (p_ptr->warning)
4484- {
4485- if(!process_frakir(x,y))
4486- {
4487- energy_use = 25;
4488- return;
4489- }
4490- }
4483+#ifdef USE_FRAKIR
4484+ if (p_ptr->warning)
4485+ {
4486+ if(!process_frakir(x,y))
4487+ {
4488+ energy_use = 25;return;
4489+ }
4490+ }
4491+#endif
44914492
44924493 if (do_past)
44934494 {
--- a/src/defines.h
+++ b/src/defines.h
@@ -2957,7 +2957,7 @@
29572957 #define TR3_NO_MAGIC 0x00000020L /* Anti-magic */
29582958 #define TR3_DEC_MANA 0x00000040L /* ??? */
29592959 #define TR3_TY_CURSE 0x00000080L /* The Ancient Curse */
2960-#define TR3_WARNING 0x00000100L /* Warning */
2960+#define TR3_XXX1 0x00000100L
29612961 #define TR3_HIDE_TYPE 0x00000200L /* Hide "pval" description */
29622962 #define TR3_SHOW_MODS 0x00000400L /* Always show Tohit/Todam */
29632963 #define TR3_INSTA_ART 0x00000800L /* Item must be an artifact */
--- a/src/externs.h
+++ b/src/externs.h
@@ -890,7 +890,10 @@ extern cptr item_activation(object_type *o_ptr);
890890 extern void combine_pack(void);
891891 extern void reorder_pack(void);
892892 extern void display_koff(int k_idx);
893+
894+#ifdef USE_FRAKIR
893895 extern bool process_frakir(int xx, int yy);
896+#endif
894897 extern void do_cmd_kaji(bool only_browse);
895898
896899 /* racial.c */
--- a/src/init1.c
+++ b/src/init1.c
@@ -578,7 +578,7 @@ static cptr k_info_flags3[] =
578578 "NO_MAGIC",
579579 "DEC_MANA",
580580 "TY_CURSE",
581- "WARNING",
581+ "XXX1",
582582 "HIDE_TYPE",
583583 "SHOW_MODS",
584584 "INSTA_ART",
--- a/src/object1.c
+++ b/src/object1.c
@@ -188,7 +188,7 @@ void object_flags(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3)
188188 case 0: (*f3) |= (TR3_FEATHER); break;
189189 case 1: (*f3) |= (TR3_LITE); break;
190190 case 2: (*f3) |= (TR3_SEE_INVIS); break;
191- case 3: (*f3) |= (TR3_WARNING); break;
191+ case 3: (*f3) |= (TR3_TELEPATHY); break;
192192 case 4: (*f3) |= (TR3_SLOW_DIGEST); break;
193193 case 5: (*f3) |= (TR3_REGEN); break;
194194 case 6: (*f2) |= (TR2_FREE_ACT); break;
@@ -387,7 +387,7 @@ void object_flags_known(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3)
387387 case 0: (*f3) |= (TR3_FEATHER); break;
388388 case 1: (*f3) |= (TR3_LITE); break;
389389 case 2: (*f3) |= (TR3_SEE_INVIS); break;
390- case 3: (*f3) |= (TR3_WARNING); break;
390+ case 3: (*f3) |= (TR3_TELEPATHY); break;
391391 case 4: (*f3) |= (TR3_SLOW_DIGEST); break;
392392 case 5: (*f3) |= (TR3_REGEN); break;
393393 case 6: (*f2) |= (TR2_FREE_ACT); break;
@@ -3413,15 +3413,6 @@ info[i++] = "
34133413 #endif
34143414
34153415 }
3416- if (f3 & (TR3_WARNING))
3417- {
3418-#ifdef JP
3419-info[i++] = "それは危険に対して警告を発する。";
3420-#else
3421- info[i++] = "XXX";
3422-#endif
3423-
3424- }
34253416 if (f2 & (TR2_REFLECT))
34263417 {
34273418 #ifdef JP
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -3958,6 +3958,8 @@ void calc_bonuses(void)
39583958 /* Extract the item flags */
39593959 object_flags(o_ptr, &f1, &f2, &f3);
39603960
3961+ if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_WARNING)) || (o_ptr->name1 == ART_BARAHIR)) p_ptr->warning = TRUE;
3962+
39613963 /* Affect stats */
39623964 if (f1 & (TR1_STR)) p_ptr->stat_add[A_STR] += o_ptr->pval;
39633965 if (f1 & (TR1_INT)) p_ptr->stat_add[A_INT] += o_ptr->pval;
@@ -4014,7 +4016,6 @@ void calc_bonuses(void)
40144016 if (f3 & (TR3_FEATHER)) p_ptr->ffall = TRUE;
40154017 if (f2 & (TR2_FREE_ACT)) p_ptr->free_act = TRUE;
40164018 if (f2 & (TR2_HOLD_LIFE)) p_ptr->hold_life = TRUE;
4017- if (f3 & (TR3_WARNING)) p_ptr->warning = TRUE;
40184019
40194020 /* Immunity flags */
40204021 if (f2 & (TR2_IM_FIRE)) p_ptr->immune_fire = TRUE;
--- a/src/z-config.h
+++ b/src/z-config.h
@@ -709,6 +709,11 @@
709709 /* # define SCRIPT_OBJ_KIND */
710710 #endif /* USE_SCRIPT */
711711
712+/*
713+ * The Frakir can predict danger when equipped
714+ */
715+#define USE_FRAKIR
716+
712717 #ifndef HAVE_CONFIG_H
713718 #ifndef MSDOS
714719 #define WORLD_SCORE
Show on old repository browser