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

hengband: Commit

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


Commit MetaInfo

Revisionde90c6ae9fdce77b04a22740e7ab075e9a346dbb (tree)
Time2002-08-21 13:18:53
Authormogami <mogami@0568...>
Commitermogami

Log Message

ｷﾙｹﾎｻﾘﾎﾘ､ﾋ1/3､ﾎｳﾎﾎｨ､ﾇｲｼｵ颱SPﾉﾕｲﾃ｡｣

Change Summary

Incremental Difference

--- a/src/artifact.c
+++ b/src/artifact.c
@@ -124,6 +124,27 @@ void one_dragon_ele_resistance(object_type *o_ptr)
124124
125125
126126 /*
127+ * Choose one lower rank esp
128+ */
129+void one_low_esp(object_type *o_ptr)
130+{
131+ switch (randint1(9))
132+ {
133+ case 1: add_flag(o_ptr->art_flags, TR_ESP_ANIMAL); break;
134+ case 2: add_flag(o_ptr->art_flags, TR_ESP_UNDEAD); break;
135+ case 3: add_flag(o_ptr->art_flags, TR_ESP_DEMON); break;
136+ case 4: add_flag(o_ptr->art_flags, TR_ESP_ORC); break;
137+ case 5: add_flag(o_ptr->art_flags, TR_ESP_TROLL); break;
138+ case 6: add_flag(o_ptr->art_flags, TR_ESP_GIANT); break;
139+ case 7: add_flag(o_ptr->art_flags, TR_ESP_DRAGON); break;
140+ case 8: add_flag(o_ptr->art_flags, TR_ESP_HUMAN); break;
141+ case 9: add_flag(o_ptr->art_flags, TR_ESP_GOOD); break;
142+ }
143+}
144+
145+
146+
147+/*
127148 * Choose one random resistance
128149 */
129150 void one_resistance(object_type *o_ptr)
@@ -156,18 +177,7 @@ void one_ability(object_type *o_ptr)
156177 case 7: add_flag(o_ptr->art_flags, TR_HOLD_LIFE); break;
157178 case 8:
158179 case 9:
159- switch (randint1(9))
160- {
161- case 1: add_flag(o_ptr->art_flags, TR_ESP_ANIMAL); break;
162- case 2: add_flag(o_ptr->art_flags, TR_ESP_UNDEAD); break;
163- case 3: add_flag(o_ptr->art_flags, TR_ESP_DEMON); break;
164- case 4: add_flag(o_ptr->art_flags, TR_ESP_ORC); break;
165- case 5: add_flag(o_ptr->art_flags, TR_ESP_TROLL); break;
166- case 6: add_flag(o_ptr->art_flags, TR_ESP_GIANT); break;
167- case 7: add_flag(o_ptr->art_flags, TR_ESP_DRAGON); break;
168- case 8: add_flag(o_ptr->art_flags, TR_ESP_HUMAN); break;
169- case 9: add_flag(o_ptr->art_flags, TR_ESP_GOOD); break;
170- }
180+ one_low_esp(o_ptr);
171181 break;
172182 }
173183 }
--- a/src/externs.h
+++ b/src/externs.h
@@ -1315,6 +1315,7 @@ extern void one_high_resistance(object_type *o_ptr);
13151315 extern void one_lordly_high_resistance(object_type *o_ptr);
13161316 extern void one_ele_resistance(object_type *o_ptr);
13171317 extern void one_dragon_ele_resistance(object_type *o_ptr);
1318+extern void one_low_esp(object_type *o_ptr);
13181319 extern void one_resistance(object_type *o_ptr);
13191320 extern void one_ability(object_type *o_ptr);
13201321 extern bool create_artifact(object_type *o_ptr, bool a_scroll);
--- a/src/object2.c
+++ b/src/object2.c
@@ -885,6 +885,14 @@ s32b flag_cost(object_type * o_ptr, int plusses)
885885 }
886886 else
887887 {
888+ if ((o_ptr->tval == TV_RING) || (o_ptr->tval == TV_AMULET))
889+ {
890+ object_kind *k_ptr = &k_info[o_ptr->k_idx];
891+
892+ for (i = 0; i < TR_FLAG_SIZE; i++)
893+ flgs[i] &= ~(k_ptr->flags[i]);
894+ }
895+
888896 if (o_ptr->name2)
889897 {
890898 ego_item_type *e_ptr = &e_info[o_ptr->name2];
@@ -892,13 +900,6 @@ s32b flag_cost(object_type * o_ptr, int plusses)
892900 for (i = 0; i < TR_FLAG_SIZE; i++)
893901 flgs[i] &= ~(e_ptr->flags[i]);
894902
895- if ((o_ptr->tval == TV_RING) || (o_ptr->tval == TV_AMULET))
896- {
897- object_kind *k_ptr = &k_info[o_ptr->k_idx];
898-
899- for (i = 0; i < TR_FLAG_SIZE; i++)
900- flgs[i] &= ~(k_ptr->flags[i]);
901- }
902903 }
903904 else if (o_ptr->art_name)
904905 {
@@ -1005,17 +1006,17 @@ s32b flag_cost(object_type * o_ptr, int plusses)
10051006 if (have_flag(flgs, TR_LITE)) total += 1250;
10061007 if (have_flag(flgs, TR_SEE_INVIS)) total += 2000;
10071008 if (have_flag(flgs, TR_TELEPATHY)) total += 20000;
1008- if (have_flag(flgs, TR_ESP_ANIMAL)) total += 3000;
1009- if (have_flag(flgs, TR_ESP_UNDEAD)) total += 3000;
1010- if (have_flag(flgs, TR_ESP_DEMON)) total += 3000;
1011- if (have_flag(flgs, TR_ESP_ORC)) total += 3000;
1012- if (have_flag(flgs, TR_ESP_TROLL)) total += 3000;
1013- if (have_flag(flgs, TR_ESP_GIANT)) total += 3000;
1014- if (have_flag(flgs, TR_ESP_DRAGON)) total += 3000;
1015- if (have_flag(flgs, TR_ESP_HUMAN)) total += 3000;
1016- if (have_flag(flgs, TR_ESP_EVIL)) total += 10000;
1017- if (have_flag(flgs, TR_ESP_GOOD)) total += 6000;
1018- if (have_flag(flgs, TR_ESP_NONLIVING)) total += 6000;
1009+ if (have_flag(flgs, TR_ESP_ANIMAL)) total += 1000;
1010+ if (have_flag(flgs, TR_ESP_UNDEAD)) total += 1000;
1011+ if (have_flag(flgs, TR_ESP_DEMON)) total += 1000;
1012+ if (have_flag(flgs, TR_ESP_ORC)) total += 1000;
1013+ if (have_flag(flgs, TR_ESP_TROLL)) total += 1000;
1014+ if (have_flag(flgs, TR_ESP_GIANT)) total += 1000;
1015+ if (have_flag(flgs, TR_ESP_DRAGON)) total += 1000;
1016+ if (have_flag(flgs, TR_ESP_HUMAN)) total += 1000;
1017+ if (have_flag(flgs, TR_ESP_EVIL)) total += 15000;
1018+ if (have_flag(flgs, TR_ESP_GOOD)) total += 2000;
1019+ if (have_flag(flgs, TR_ESP_NONLIVING)) total += 2000;
10191020 if (have_flag(flgs, TR_ESP_UNIQUE)) total += 10000;
10201021 if (have_flag(flgs, TR_SLOW_DIGEST)) total += 750;
10211022 if (have_flag(flgs, TR_REGEN)) total += 2500;
@@ -1192,7 +1193,7 @@ s32b object_value_real(object_type *o_ptr)
11921193 value += flag_cost(o_ptr, o_ptr->pval);
11931194 }
11941195
1195- else if (o_ptr->art_flags[0] || o_ptr->art_flags[1] || o_ptr->art_flags[2])
1196+ else if (o_ptr->art_flags[0] || o_ptr->art_flags[1] || o_ptr->art_flags[2] || o_ptr->art_flags[3])
11961197 {
11971198 value += flag_cost(o_ptr, o_ptr->pval);
11981199 }
@@ -3089,6 +3090,12 @@ static void a_m_aux_3(object_type *o_ptr, int level, int power)
30893090 }
30903091 break;
30913092
3093+ case SV_RING_WARNING:
3094+ {
3095+ if (one_in_(3)) one_low_esp(o_ptr);
3096+ break;
3097+ }
3098+
30923099 /* Searching */
30933100 case SV_RING_SEARCHING:
30943101 {
Show on old repository browser