diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/defines.h | 3 | ||||
-rw-r--r-- | src/init1.cc | 6 | ||||
-rw-r--r-- | src/object1.cc | 2 | ||||
-rw-r--r-- | src/status.cc | 2 | ||||
-rw-r--r-- | src/tables.cc | 2 | ||||
-rw-r--r-- | src/xtra1.cc | 31 |
6 files changed, 6 insertions, 40 deletions
diff --git a/src/defines.h b/src/defines.h index 8182c1ee..2c05acf5 100644 --- a/src/defines.h +++ b/src/defines.h @@ -2679,9 +2679,6 @@ #define TR4_CHEAPNESS 0x00008000L /* Rod spells are cheaper(in mana cost) to cast */ #define TR4_FOUNTAIN 0x00010000L /* Available as fountain (for potions) */ #define TR4_ANTIMAGIC_50 0x00020000L /* Forbid magic */ -#define TR4_ANTIMAGIC_30 0x00040000L /* Forbid magic */ -#define TR4_ANTIMAGIC_20 0x00080000L /* Forbid magic */ -#define TR4_ANTIMAGIC_10 0x00100000L /* Forbid magic */ #define TR4_EASY_USE 0x00200000L /* Easily activable */ #define TR4_IM_NETHER 0x00400000L /* Immunity to nether */ #define TR4_RECHARGED 0x00800000L /* Object has been recharged once */ diff --git a/src/init1.cc b/src/init1.cc index fdf87da2..1f2023f0 100644 --- a/src/init1.cc +++ b/src/init1.cc @@ -685,9 +685,9 @@ cptr k_info_flags4[] = "CHEAPNESS", "FOUNTAIN", "ANTIMAGIC_50", - "ANTIMAGIC_30", - "ANTIMAGIC_20", - "ANTIMAGIC_10", + "XXX5", + "XXX5", + "XXX5", "EASY_USE", "IM_NETHER", "RECHARGED", diff --git a/src/object1.cc b/src/object1.cc index 0f79d0ee..95cd0522 100644 --- a/src/object1.cc +++ b/src/object1.cc @@ -2999,7 +2999,7 @@ bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait text_out("It prevents the space-time continuum from being disrupted. "); } - if ((f4 & (TR4_ANTIMAGIC_50)) || (f4 & (TR4_ANTIMAGIC_30)) || (f4 & (TR4_ANTIMAGIC_20)) || (f4 & (TR4_ANTIMAGIC_10))) + if (f4 & TR4_ANTIMAGIC_50) { text_out("It generates an antimagic field. "); } diff --git a/src/status.cc b/src/status.cc index 3fbd9708..0a3977c7 100644 --- a/src/status.cc +++ b/src/status.cc @@ -308,7 +308,7 @@ static void status_curses(void) row_bival("Clone", 4, TR4_CLONE, yo++, flag_arr); row_bival("Temp", 5, TR5_TEMPORARY, yo++, flag_arr); yo++; - row_count("Antimagic", 4, TR4_ANTIMAGIC_50, 5, 4, TR4_ANTIMAGIC_30, 3, 4, TR4_ANTIMAGIC_20, 2, 4, TR4_ANTIMAGIC_10, 1, yo++, flag_arr); + row_bival("Antimagic", 4, TR4_ANTIMAGIC_50, yo++, flag_arr); c_put_str(TERM_WHITE, "Press ESC to continue", 23, 0); Term_fresh(); diff --git a/src/tables.cc b/src/tables.cc index 53b86ae7..42244d6c 100644 --- a/src/tables.cc +++ b/src/tables.cc @@ -2795,7 +2795,7 @@ flags_group flags_groups[MAX_FLAG_GROUP] = TR1_VAMPIRIC | TR1_CHAOTIC | TR1_BLOWS | TR1_SPEED, TR2_LIFE | TR2_REFLECT | TR2_FREE_ACT | TR2_HOLD_LIFE, TR3_NO_MAGIC | TR3_NO_TELE | TR3_SEE_INVIS, - TR4_ANTIMAGIC_10 | TR4_ANTIMAGIC_20, + TR4_ANTIMAGIC_50, 0, }, }; diff --git a/src/xtra1.cc b/src/xtra1.cc index 25cf66e7..87ecd62f 100644 --- a/src/xtra1.cc +++ b/src/xtra1.cc @@ -2691,37 +2691,6 @@ void apply_flags(u32b f1, u32b f2, u32b f3, u32b f4, u32b f5, u32b esp, s16b pva if (tmp > 0) p_ptr->antimagic_dis += tmp; } - if (f4 & (TR4_ANTIMAGIC_30)) - { - s32b tmp; - - tmp = 7 + get_skill_scale(SKILL_ANTIMAGIC, 33) - antimagic_mod; - if (tmp > 0) p_ptr->antimagic += tmp; - - tmp = 1 + get_skill_scale(SKILL_ANTIMAGIC, 2) - antimagic_mod / 15; - if (tmp > 0) p_ptr->antimagic_dis += tmp; - } - - if (f4 & (TR4_ANTIMAGIC_20)) - { - s32b tmp; - - tmp = 5 + get_skill_scale(SKILL_ANTIMAGIC, 15) - antimagic_mod; - if (tmp > 0) p_ptr->antimagic += tmp; - - p_ptr->antimagic_dis += 2; - } - - if (f4 & (TR4_ANTIMAGIC_10)) - { - s32b tmp; - - tmp = 1 + get_skill_scale(SKILL_ANTIMAGIC, 9) - antimagic_mod; - if (tmp > 0) p_ptr->antimagic += tmp; - - p_ptr->antimagic_dis += 1; - } - if (f4 & (TR4_AUTO_ID)) { p_ptr->auto_id = TRUE; |