fiddlerwoaroof/crawl - Change S2FTVAH7NLTLI5CEINIAMJIW3PTZUE22APSK633Y4PLDZ4L6UK4QC

Clean up TSO artefact handling some more, and fix indentation.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4322 c06c8d41-db1a-0410-9941-cceddc491573

Created by dolorous on April 18, 2008

S2FTVAH7NLTLI5CEINIAMJIW3PTZUE22APSK633Y4PLDZ4L6UK4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/randart.cc at line 62 [8.893152]

B:BD[7.3607] → [7.3607:3648]

B:BD[7.3648] → [9.2620:2678]

∅:D[9.2678] → [7.3677:3693]

B:BD[7.3677] → [7.3677:3693]

         if (brand == SPWPN_ORC_SLAYING)
             return (false); // goes against orcish theme
         break;

[7.3607]

[7.3693]

        if (brand == SPWPN_ORC_SLAYING)
            return (false); // goes against orcish theme
        break;

Replacement in crawl-ref/source/randart.cc at line 67 [8.893152]

B:BD[7.3767] → [7.3767:3840]

         if (item.base_type == OBJ_WEAPONS)
             return (false);

[7.3767]

[10.9403]

        if (item.base_type == OBJ_WEAPONS)
            return (false);

Replacement in crawl-ref/source/randart.cc at line 70 [8.893152]

∅:D[10.9404] → [7.3854:3958]

B:BD[7.3854] → [7.3854:3958]

         if (item.base_type == OBJ_JEWELLERY && item.sub_type == AMU_RAGE)
             return (false);

[10.9404]

[7.3958]

        if (item.base_type == OBJ_JEWELLERY && item.sub_type == AMU_RAGE)
            return (false);

Replacement in crawl-ref/source/randart.cc at line 73 [8.893152]

B:BD[7.3959] → [7.3959:4138]

         if (randart_wpn_property( item, RAP_ANGRY )
             || randart_wpn_property( item, RAP_BERSERK ))
         {
             return (false);
         }
         break;

[7.3959]

[7.4138]

        if (randart_wpn_property( item, RAP_ANGRY )
            || randart_wpn_property( item, RAP_BERSERK ))
        {
            return (false);
        }
        break;

Replacement in crawl-ref/source/randart.cc at line 81 [8.893152]

B:BD[7.4182] → [7.4182:4308]

         if (item.base_type == OBJ_JEWELLERY && item.sub_type == AMU_INACCURACY)
             return (false);
         break;

[7.4182]

[7.4308]

        if (item.base_type == OBJ_JEWELLERY && item.sub_type == AMU_INACCURACY)
            return (false);
        break;

Replacement in crawl-ref/source/randart.cc at line 86 [8.893152]

B:BD[7.4327] → [7.4327:4461]

         if (item.base_type == OBJ_JEWELLERY && item.sub_type == RING_HUNGER)
             return (false); // goes against food theme

[7.4327]

[7.4461]

        if (item.base_type == OBJ_JEWELLERY && item.sub_type == RING_HUNGER)
            return (false); // goes against food theme

Replacement in crawl-ref/source/randart.cc at line 89 [8.893152]

B:BD[7.4462] → [7.4462:4586]

B:BD[7.4586] → [9.2679:2695]

         if (randart_wpn_property( item, RAP_MUTAGENIC ))
             return (false); // goes against anti-mutagenic theme
         break;

[7.4462]

[11.2526]

        if (randart_wpn_property( item, RAP_MUTAGENIC ))
            return (false); // goes against anti-mutagenic theme
        break;

Replacement in crawl-ref/source/randart.cc at line 94 [8.893152]

B:BD[12.2583] → [6.2526:2599]

∅:D[6.2599] → [13.2623:2675]

∅:D[14.2622] → [13.2623:2675]

B:BD[13.2623] → [13.2623:2675]

B:BD[11.2632] → [15.2683:2740]

B:BD[16.2710] → [16.2710:2784]

B:BD[16.2784] → [17.2627:2656]

∅:D[17.2656] → [16.2853:2864]

B:BD[16.2853] → [16.2853:2864]

         if (item.base_type == OBJ_WEAPONS && brand != SPWPN_HOLY_WRATH)
         {
             return (false);
         }
         if (randart_wpn_property( item, RAP_INVISIBLE )
             || randart_wpn_property( item, RAP_STEALTH ) > 0)
         {
             return (false);
         }

[12.2583]

[16.2864]

        if (item.base_type == OBJ_WEAPONS && brand != SPWPN_HOLY_WRATH)
        {
            return (false);
        }

Replacement in crawl-ref/source/randart.cc at line 99 [8.893152]

B:BD[16.2865] → [16.2865:3293]

B:BD[15.2859] → [16.3610:3738]

∅:D[16.3738] → [15.2859:2929]

B:BD[15.2859] → [15.2859:2929]

B:BD[15.2929] → [16.3739:3811]

B:BD[16.3811] → [3.2526:2582]

∅:D[3.2582] → [18.2526:2587]

B:BD[16.3811] → [18.2526:2587]

B:BD[18.2587] → [5.2526:2711]

∅:D[19.2587] → [11.2762:2773]

∅:D[18.2653] → [11.2762:2773]

∅:D[5.2711] → [11.2762:2773]

∅:D[15.3049] → [11.2762:2773]

∅:D[16.4129] → [11.2762:2773]

B:BD[11.2762] → [11.2762:2773]

B:BD[11.2773] → [4.2526:2586]

∅:D[4.2586] → [11.2842:2853]

∅:D[20.2591] → [11.2842:2853]

∅:D[21.2594] → [11.2842:2853]

∅:D[15.3079] → [11.2842:2853]

∅:D[16.4189] → [11.2842:2853]

B:BD[11.2842] → [11.2842:2853]

         if (randart_wpn_property( item, RAP_AC ) < 0
             || randart_wpn_property( item, RAP_EVASION ) < 0
             || randart_wpn_property( item, RAP_STRENGTH ) < 0
             || randart_wpn_property( item, RAP_INTELLIGENCE ) < 0
             || randart_wpn_property( item, RAP_DEXTERITY ) < 0
             || randart_wpn_property( item, RAP_FIRE ) < 0
             || randart_wpn_property( item, RAP_COLD ) < 0
             || randart_wpn_property( item, RAP_NOISES )
             || randart_wpn_property( item, RAP_PREVENT_SPELLCASTING )
             || randart_wpn_property( item, RAP_CAUSE_TELEPORTATION )
             || randart_wpn_property( item, RAP_PREVENT_TELEPORTATION )
             || randart_wpn_property( item, RAP_ANGRY )
             || randart_wpn_property( item, RAP_METABOLISM )
             || randart_wpn_property( item, RAP_MUTAGENIC )
             || randart_wpn_property( item, RAP_ACCURACY ) < 0
             || randart_wpn_property( item, RAP_DAMAGE ) < 0)
         {
             return (false); // filter out negative effects
         }

[16.2865]

[22.2810]

        if (randart_wpn_property( item, RAP_INVISIBLE )
            || randart_wpn_property( item, RAP_STEALTH ) > 0)
        {
            return (false);
        }

Replacement in crawl-ref/source/randart.cc at line 105 [8.893152]

∅:D[22.2811] → [7.4586:4602]

∅:D[11.2853] → [7.4586:4602]

∅:D[9.2921] → [7.4586:4602]

B:BD[7.4586] → [7.4586:4602]

         break;

[22.2811]

[23.166]

        if (is_blessed(item)) // remove negative effects on blessed weapons
        {
            if (randart_wpn_property( item, RAP_AC ) < 0
                || randart_wpn_property( item, RAP_EVASION ) < 0
                || randart_wpn_property( item, RAP_STRENGTH ) < 0
                || randart_wpn_property( item, RAP_INTELLIGENCE ) < 0
                || randart_wpn_property( item, RAP_DEXTERITY ) < 0
                || randart_wpn_property( item, RAP_FIRE ) < 0
                || randart_wpn_property( item, RAP_COLD ) < 0
                || randart_wpn_property( item, RAP_NOISES )
                || randart_wpn_property( item, RAP_PREVENT_SPELLCASTING )
                || randart_wpn_property( item, RAP_CAUSE_TELEPORTATION )
                || randart_wpn_property( item, RAP_PREVENT_TELEPORTATION )
                || randart_wpn_property( item, RAP_ANGRY )
                || randart_wpn_property( item, RAP_METABOLISM )
                || randart_wpn_property( item, RAP_MUTAGENIC )
                || randart_wpn_property( item, RAP_ACCURACY ) < 0
                || randart_wpn_property( item, RAP_DAMAGE ) < 0)
            {
                return (false);
            }
        }
        break;

Replacement in crawl-ref/source/randart.cc at line 130 [8.893152]

B:BD[14.2658] → [14.2658:2776]

         if (item.base_type == OBJ_WEAPONS && brand != SPWPN_DISTORTION)
             return (false);
         break;

[14.2658]

[14.2776]

        if (item.base_type == OBJ_WEAPONS && brand != SPWPN_DISTORTION)
            return (false);
        break;

Replacement in crawl-ref/source/randart.cc at line 137 [8.893152]

B:BD[7.4676] → [6.2600:2669]

∅:D[6.2669] → [7.4744:4789]

B:BD[7.4744] → [7.4744:4789]

         if (randart_wpn_property( item, RAP_PREVENT_SPELLCASTING ))
             return (false);
         break;

[7.4676]

[24.368]

        if (randart_wpn_property( item, RAP_PREVENT_SPELLCASTING ))
            return (false);
        break;

Replacement in crawl-ref/source/randart.cc at line 142 [8.893152]

B:BD[7.4843] → [7.4843:5181]

         if (item.base_type == OBJ_JEWELLERY && (item.sub_type == RING_WIZARDRY
             || item.sub_type == RING_FIRE || item.sub_type == RING_ICE
             || item.sub_type == RING_MAGICAL_POWER))
         {
             return (false);
         }
         if (brand == SPWPN_PAIN) // involves magic
             return (false);

[7.4843]

[10.9405]

        if (item.base_type == OBJ_JEWELLERY && (item.sub_type == RING_WIZARDRY
            || item.sub_type == RING_FIRE || item.sub_type == RING_ICE
            || item.sub_type == RING_MAGICAL_POWER))
        {
            return (false);
        }
        if (brand == SPWPN_PAIN) // involves magic
            return (false);

Replacement in crawl-ref/source/randart.cc at line 151 [8.893152]

B:BD[10.9406] → [2.2526:2588]

∅:D[2.2588] → [7.5256:5285]

B:BD[7.5256] → [7.5256:5285]

         if (randart_wpn_property( item, RAP_MAGICAL_POWER ))
             return (false);

[10.9406]

[24.463]

        if (randart_wpn_property( item, RAP_MAGICAL_POWER ))
            return (false);

Replacement in crawl-ref/source/randart.cc at line 155 [8.893152]
B:BD[7.5299] → [7.5299:5315]
```
         break;
```
[7.5299]
[7.5315]
```
        break;
```