diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2017-02-28 19:44:12 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2017-02-28 19:44:12 +0100 |
| commit | 5bc01c584066a0cea37021eb6e13bd96d74de7b5 (patch) | |
| tree | 359f7c0dd68410faf66bb243d2bcf38f397d30cc /src/object2.cc | |
| parent | 64d0292f358de0212f7d88e379d829c01d2ab9dd (diff) | |
Remove Runecrafting
Diffstat (limited to 'src/object2.cc')
| -rw-r--r-- | src/object2.cc | 61 |
1 files changed, 3 insertions, 58 deletions
diff --git a/src/object2.cc b/src/object2.cc index 95fcf041..51fdcb95 100644 --- a/src/object2.cc +++ b/src/object2.cc @@ -1505,17 +1505,6 @@ bool_ object_similar(object_type const *o_ptr, object_type const *j_ptr) return FALSE; } - case TV_RUNE1: - { - return TRUE; - } - - case TV_RUNE2: - { - if ((o_ptr->sval == RUNE_STONE) || (j_ptr->sval == RUNE_STONE)) return FALSE; - else return TRUE; - } - case TV_INSTRUMENT: { return FALSE; @@ -2559,29 +2548,7 @@ static void a_m_aux_1(object_type *o_ptr, int level, int power) { case TV_MSTAFF: { - if (is_ego_p(o_ptr, EGO_MSTAFF_SPELL)) - { - int gf[2], i; - - for (i = 0; i < 2; i++) - { - int k = 0; - - gf[i] = 0; - while (!k) - { - k = lookup_kind(TV_RUNE1, (gf[i] = rand_int(MAX_GF))); - } - } - - o_ptr->pval = gf[0] + (gf[1] << 16); - o_ptr->pval3 = rand_int(RUNE_MOD_MAX) + (rand_int(RUNE_MOD_MAX) << 16); - o_ptr->pval2 = randint(70) + (randint(70) << 8); - } - else - { - o_ptr->art_flags |= (TR_SPELL_CONTAIN | TR_WIELD_CAST); - } + o_ptr->art_flags |= (TR_SPELL_CONTAIN | TR_WIELD_CAST); break; } case TV_BOLT: @@ -4212,15 +4179,7 @@ try_an_other_ego: /* Spell in it ? No! */ if (flags & TR_SPELL_CONTAIN) { - /* Mega hack, mage staves of spell cannot SPELL_CONTAIN */ - if (is_ego_p(o_ptr, EGO_MSTAFF_SPELL)) - { - o_ptr->art_flags &= ~TR_SPELL_CONTAIN; - } - else - { - o_ptr->pval2 = -1; - } + o_ptr->pval2 = -1; } /* Cheat -- describe the item */ @@ -4251,15 +4210,7 @@ try_an_other_ego: /* Spell in it ? No! */ if (flags & TR_SPELL_CONTAIN) { - /* Mega hack, mage staves of spell cannot SPELL_CONTAIN */ - if (is_ego_p(o_ptr, EGO_MSTAFF_SPELL)) - { - o_ptr->art_flags &= ~TR_SPELL_CONTAIN; - } - else - { - o_ptr->pval2 = -1; - } + o_ptr->pval2 = -1; } /* Hacccccccckkkkk attack ! :) -- To prevent som ugly crashs */ @@ -4439,12 +4390,6 @@ static bool kind_is_theme(obj_theme const *theme, int k_idx) case TV_RANDART: prob = theme->magic; break; - case TV_RUNE1: - prob = theme->magic; - break; - case TV_RUNE2: - prob = theme->magic; - break; case TV_BOOK: prob = theme->magic; break; |