fiddlerwoaroof/crawl - Change WV7UHA3KCZ5FOIFXFVCTSPVPR6YR5FAG2RSGCQCF6INYG5OYYHYAC

Add chaos-branded weapons to the good gods' dislike list, for the same

reason as with Feawn. Also, fix some warnings, and add some minor cosmetic fixes.

Created by David Lawrence Ramsey on October 7, 2009

WV7UHA3KCZ5FOIFXFVCTSPVPR6YR5FAG2RSGCQCF6INYG5OYYHYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1506 [7.804403]
B:BD[5.2766] → [6.2695:2732]
```
        return is_undead_slave(mon);
```
[5.2766]
[5.2801]
```
        return (is_undead_slave(mon));
```
Replacement in crawl-ref/source/religion.cc at line 1508 [7.804403]
∅:D[5.2841] → [8.2725:2765]
∅:D[9.3099] → [8.2725:2765]
B:BD[8.2725] → [8.2725:2765]
```
        return is_orcish_follower(mon);
```
[5.2841]
[10.2883]
```
        return (is_orcish_follower(mon));
```
Replacement in crawl-ref/source/religion.cc at line 1510 [7.804403]
B:BD[10.2923] → [10.2923:2960]
```
        return is_fellow_slime(mon);
```
[10.2923]
[11.4701]
```
        return (is_fellow_slime(mon));
```
Replacement in crawl-ref/source/religion.cc at line 1512 [7.804403]
B:BD[11.4741] → [11.4741:4779]
```
        return is_neutral_plant(mon);
```
[11.4741]
[9.3100]
```
        return (is_neutral_plant(mon));
```
Replacement in crawl-ref/source/religion.cc at line 1514 [7.804403]
B:BD[9.3138] → [9.3138:3183]
```
        return is_good_lawful_follower(mon);
```
[9.3138]
[9.3183]
```
        return (is_good_lawful_follower(mon));
```
Replacement in crawl-ref/source/religion.cc at line 1516 [7.804403]
B:BD[9.3223] → [9.3223:3261]
```
        return is_good_follower(mon);
```
[9.3223]
[8.2765]
```
        return (is_good_follower(mon));
```
Insertion in crawl-ref/source/religion.cc at line 3473 [7.804403]
[12.2578]
[13.21339]
```
        case DID_NOTHING:
```
Replacement in crawl-ref/source/religion.cc at line 4072 [7.804403]
B:BD[14.3467] → [14.3467:3495]
```
        return DID_NOTHING;
```
[14.3467]
[14.3495]
```
        return (DID_NOTHING);
```

Replacement in crawl-ref/source/religion.cc at line 4075 [7.804403]

B:BD[14.3521] → [14.3521:3634]

        return DID_UNHOLY;
    if (item_type_known(item))
        return DID_NECROMANCY;
    return DID_NOTHING;

[14.3521]

[15.2784]

        return (DID_UNHOLY);
    if (item_type_known(item)
        || item.base_type == OBJ_WEAPONS
            && get_weapon_brand(item) == SPWPN_CHAOS)
    {
        return (DID_NECROMANCY);
    }
    return (DID_NOTHING);

Replacement in crawl-ref/source/religion.cc at line 4097 [7.804403]

B:BD[16.2947] → [4.2932:2999]

        if(!item_type_known(item))
            return DID_NOTHING;

[16.2947]

[4.2999]

        if (!item_type_known(item))
            return (DID_NOTHING);

Insertion in crawl-ref/source/religion.cc at line 4103 [7.804403]
[4.3134]
[14.3728]
```
        {
```
Insertion in crawl-ref/source/religion.cc at line 4105 [7.804403]
[14.3765]
[16.3031]
```
        }
```

Replacement in crawl-ref/source/beam.cc at line 5954 [7.4128068]

B:BD[17.8486] → [18.5722:5890]

    case BEAM_NONE:                 return("none");
    case BEAM_MISSILE:              return("missile");
    case BEAM_MMISSILE:             return("magic missile");

[17.8486]

[17.8613]

    case BEAM_NONE:                 return ("none");
    case BEAM_MISSILE:              return ("missile");
    case BEAM_MMISSILE:             return ("magic missile");

Replacement in crawl-ref/source/beam.cc at line 5959 [7.4128068]
B:BD[18.5943] → [18.5943:5995]
```
    case BEAM_FIRE:                 return("fire");
```
[18.5943]
[17.8677]
```
    case BEAM_FIRE:                 return ("fire");
```
Replacement in crawl-ref/source/beam.cc at line 5962 [7.4128068]
B:BD[18.6048] → [18.6048:6100]
```
    case BEAM_COLD:                 return("cold");
```
[18.6048]
[17.8741]
```
    case BEAM_COLD:                 return ("cold");
```

Replacement in crawl-ref/source/beam.cc at line 5964 [7.4128068]

B:BD[17.8742] → [18.6101:6213]

    case BEAM_MAGIC:                return("magic");
    case BEAM_ELECTRICITY:          return("electricity");

[17.8742]

[17.8830]

    case BEAM_MAGIC:                return ("magic");
    case BEAM_ELECTRICITY:          return ("electricity");

Replacement in crawl-ref/source/beam.cc at line 5969 [7.4128068]

B:BD[18.6266] → [18.6266:6320]

    case BEAM_POISON:               return("poison");

[18.6266]

[18.6320]

    case BEAM_POISON:               return ("poison");

Replacement in crawl-ref/source/beam.cc at line 5971 [7.4128068]

B:BD[18.6321] → [18.6321:6436]

    case BEAM_NEG:                  return("negative energy");
    case BEAM_ACID:                 return("acid");

[18.6321]

[17.8937]

    case BEAM_NEG:                  return ("negative energy");
    case BEAM_ACID:                 return ("acid");

Replacement in crawl-ref/source/beam.cc at line 5975 [7.4128068]

B:BD[18.6489] → [18.6489:6543]

    case BEAM_POTION_MIASMA:        return("miasma");

[18.6489]

[17.9020]

    case BEAM_POTION_MIASMA:        return ("miasma");

Replacement in crawl-ref/source/beam.cc at line 5977 [7.4128068]

B:BD[17.9021] → [18.6544:6773]

    case BEAM_SPORE:                return("spores");
    case BEAM_POISON_ARROW:         return("poison arrow");
    case BEAM_HELLFIRE:             return("hellfire");
    case BEAM_NAPALM:               return("sticky fire");

[17.9021]

[17.9090]

    case BEAM_SPORE:                return ("spores");
    case BEAM_POISON_ARROW:         return ("poison arrow");
    case BEAM_HELLFIRE:             return ("hellfire");
    case BEAM_NAPALM:               return ("sticky fire");

Replacement in crawl-ref/source/beam.cc at line 5983 [7.4128068]

B:BD[18.6826] → [18.6826:6879]

    case BEAM_STEAM:                return("steam");

[18.6826]

[17.9271]

    case BEAM_STEAM:                return ("steam");

Replacement in crawl-ref/source/beam.cc at line 5985 [7.4128068]

B:BD[17.9272] → [18.6880:7418]

B:BD[18.7418] → [3.5496:5549]

∅:D[3.5549] → [18.7418:8569]

B:BD[18.7418] → [18.7418:8569]

B:BD[18.8569] → [19.32505:32558]

∅:D[19.32558] → [20.9643:9701]

B:BD[18.8569] → [20.9643:9701]

∅:D[20.9701] → [18.8569:8865]

B:BD[18.8569] → [18.8569:8865]

B:BD[18.8865] → [2.5060:5121]

∅:D[2.5121] → [19.32559:32621]

B:BD[18.8865] → [19.32559:32621]

∅:D[19.32621] → [18.8928:9048]

B:BD[18.8928] → [18.8928:9048]

    case BEAM_ENERGY:               return("energy");
    case BEAM_HOLY:                 return("holy energy");
    case BEAM_FRAG:                 return("fragments");
    case BEAM_LAVA:                 return("magma");
    case BEAM_ICE:                  return("ice");
    case BEAM_NUKE:                 return("nuke");
    case BEAM_RANDOM:               return("random");
    case BEAM_CHAOS:                return("chaos");
    case BEAM_SLOW:                 return("slow");
    case BEAM_HASTE:                return("haste");
    case BEAM_MIGHT:                return("might");
    case BEAM_HEALING:              return("healing");
    case BEAM_PARALYSIS:            return("paralysis");
    case BEAM_CONFUSION:            return("confusion");
    case BEAM_INVISIBILITY:         return("invisibility");
    case BEAM_DIGGING:              return("digging");
    case BEAM_TELEPORT:             return("teleportation");
    case BEAM_POLYMORPH:            return("polymorph");
    case BEAM_CHARM:                return("enslave");
    case BEAM_BANISH:               return("banishment");
    case BEAM_DEGENERATE:           return("degeneration");
    case BEAM_ENSLAVE_UNDEAD:       return("enslave undead");
    case BEAM_ENSLAVE_SOUL:         return("enslave soul");
    case BEAM_PAIN:                 return("pain");
    case BEAM_DISPEL_UNDEAD:        return("dispel undead");
    case BEAM_DISINTEGRATION:       return("disintegration");
    case BEAM_ENSLAVE_DEMON:        return("enslave demon");
    case BEAM_BLINK:                return("blink");
    case BEAM_PETRIFY:              return("petrify");
    case BEAM_BACKLIGHT:            return("backlight");
    case BEAM_SLEEP:                return("sleep");
    case BEAM_SLIME:                return("slime");
    case BEAM_PORKALATOR:           return("porkalator");
    case BEAM_POTION_BLACK_SMOKE:   return("black smoke");
    case BEAM_POTION_GREY_SMOKE:    return("grey smoke");
    case BEAM_POTION_BLUE_SMOKE:    return("blue smoke");
    case BEAM_POTION_PURP_SMOKE:    return("purple smoke");
    case BEAM_POTION_RANDOM:        return("random potion");
    case BEAM_POTION_MUTAGENIC:     return("mutagenic fog");
    case BEAM_VISUAL:               return("visual effects");
    case BEAM_TORMENT_DAMAGE:       return("torment damage");
    case BEAM_STEAL_FOOD:           return("steal food");

[17.9272]

[17.9338]

    case BEAM_ENERGY:               return ("energy");
    case BEAM_HOLY:                 return ("holy energy");
    case BEAM_FRAG:                 return ("fragments");
    case BEAM_LAVA:                 return ("magma");
    case BEAM_ICE:                  return ("ice");
    case BEAM_NUKE:                 return ("nuke");
    case BEAM_RANDOM:               return ("random");
    case BEAM_CHAOS:                return ("chaos");
    case BEAM_SLOW:                 return ("slow");
    case BEAM_HASTE:                return ("haste");
    case BEAM_MIGHT:                return ("might");
    case BEAM_HEALING:              return ("healing");
    case BEAM_PARALYSIS:            return ("paralysis");
    case BEAM_CONFUSION:            return ("confusion");
    case BEAM_INVISIBILITY:         return ("invisibility");
    case BEAM_DIGGING:              return ("digging");
    case BEAM_TELEPORT:             return ("teleportation");
    case BEAM_POLYMORPH:            return ("polymorph");
    case BEAM_CHARM:                return ("enslave");
    case BEAM_BANISH:               return ("banishment");
    case BEAM_DEGENERATE:           return ("degeneration");
    case BEAM_ENSLAVE_UNDEAD:       return ("enslave undead");
    case BEAM_ENSLAVE_SOUL:         return ("enslave soul");
    case BEAM_PAIN:                 return ("pain");
    case BEAM_DISPEL_UNDEAD:        return ("dispel undead");
    case BEAM_DISINTEGRATION:       return ("disintegration");
    case BEAM_ENSLAVE_DEMON:        return ("enslave demon");
    case BEAM_BLINK:                return ("blink");
    case BEAM_PETRIFY:              return ("petrify");
    case BEAM_BACKLIGHT:            return ("backlight");
    case BEAM_PORKALATOR:           return ("porkalator");
    case BEAM_SLIME:                return ("slime");
    case BEAM_SLEEP:                return ("sleep");
    case BEAM_BERSERK:              return ("berserk");
    case BEAM_POTION_BLACK_SMOKE:   return ("black smoke");
    case BEAM_POTION_GREY_SMOKE:    return ("grey smoke");
    case BEAM_POTION_BLUE_SMOKE:    return ("blue smoke");
    case BEAM_POTION_PURP_SMOKE:    return ("purple smoke");
    case BEAM_POTION_RANDOM:        return ("random potion");
    case BEAM_POTION_MUTAGENIC:     return ("mutagenic fog");
    case BEAM_VISUAL:               return ("visual effects");
    case BEAM_TORMENT_DAMAGE:       return ("torment damage");
    case BEAM_STEAL_FOOD:           return ("steal food");

Replacement in crawl-ref/source/beam.cc at line 6030 [7.4128068]

B:BD[18.9116] → [18.9116:9171]

                                    return("INVALID");

[18.9116]

[17.11217]

                                    return ("INVALID");

Add chaos-branded weapons to the good gods' dislike list, for the same

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 1506 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 1508 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 1510 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 1512 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 1514 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 1516 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 3473 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4072 [7.804403]