fiddlerwoaroof/crawl - Change QG7MKYZECIRDJJZKVRFI6XTCH42GTKA55BFIWPJBQZ27CZVLUJDQC

Removed Ogre-Mages, hopefully without breaking anything. Docs are unchanged.

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

Created by haranp on September 25, 2008

QG7MKYZECIRDJJZKVRFI6XTCH42GTKA55BFIWPJBQZ27CZVLUJDQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tilepick.cc at line 2610 [4.96318]

B:BD[4.163608] → [4.163608:163697]

        case SP_OGRE_MAGE:
            result = TILEP_BASE_OGRE_MAGE;
            break;

Replacement in crawl-ref/source/spl-cast.cc at line 366 [5.293070]

B:BD[5.301122] → [5.301122:301194]

            if ((you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE)

[5.301122]

[5.301194]

            if (you.species == SP_OGRE || you.species == SP_TROLL

Replacement in crawl-ref/source/skills2.cc at line 669 [5.647133]

B:BD[5.680693] → [5.680693:680791]

B:BD[5.680791] → [6.813:863]

∅:D[6.863] → [5.680841:680931]

B:BD[5.680841] → [5.680841:680931]

     100,                       // SK_FIGHTING
     140,                       // SK_SHORT_BLADES
     120,                       // SK_LONG_BLADES
     110,                       // SK_UNUSED_1
     100,                       // SK_AXES

[5.680693]

[5.680931]

      70,                       // SK_FIGHTING
     160,                       // SK_SHORT_BLADES
     150,                       // SK_LONG_BLADES
     100,                       // SK_UNUSED_1
     150,                       // SK_AXES

Replacement in crawl-ref/source/skills2.cc at line 681 [5.647133]

B:BD[5.681254] → [7.1132:1179]

∅:D[7.1179] → [5.681301:681438]

∅:D[8.160417] → [5.681301:681438]

B:BD[5.681301] → [5.681301:681438]

     100,                       // SK_THROWING
     140,                       // SK_ARMOUR
     150,                       // SK_DODGING
     200,                       // SK_STEALTH

[5.681254]

[5.681438]

      80,                       // SK_THROWING
     150,                       // SK_ARMOUR
     120,                       // SK_DODGING
     150,                       // SK_STEALTH

Replacement in crawl-ref/source/skills2.cc at line 686 [5.647133]

B:BD[5.681485] → [5.681485:681581]

     110,                       // SK_SHIELDS
     200,                       // SK_TRAPS_DOORS

[5.681485]

[5.681581]

     120,                       // SK_SHIELDS
     150,                       // SK_TRAPS_DOORS

Replacement in crawl-ref/source/skills2.cc at line 694 [5.647133]

B:BD[5.681859] → [9.2167:2218]

∅:D[9.2218] → [5.681910:682061]

B:BD[5.681910] → [5.681910:682061]

     (220 * 130) / 100,         // SK_SPELLCASTING
     180,                       // SK_CONJURATIONS
     220,                       // SK_ENCHANTMENTS
     200,                       // SK_SUMMONINGS

[5.681859]

[5.682061]

     (70 * 130) / 100,          // SK_SPELLCASTING
     150,                       // SK_CONJURATIONS
     150,                       // SK_ENCHANTMENTS
     150,                       // SK_SUMMONINGS

Replacement in crawl-ref/source/skills2.cc at line 699 [5.647133]

B:BD[5.682110] → [5.682110:682266]

     200,                       // SK_TRANSLOCATIONS
     200,                       // SK_TRANSMIGRATION
     200,                       // SK_DIVINATIONS

[5.682110]

[5.682266]

     150,                       // SK_TRANSLOCATIONS
     150,                       // SK_TRANSMIGRATION
     150,                       // SK_DIVINATIONS

Replacement in crawl-ref/source/skills2.cc at line 704 [5.647133]

B:BD[5.682363] → [5.682363:682461]

     200,                       // SK_AIR_MAGIC
     120,                       // SK_EARTH_MAGIC

[5.682363]

[5.682461]

     150,                       // SK_AIR_MAGIC
     150,                       // SK_EARTH_MAGIC

Replacement in crawl-ref/source/skills2.cc at line 707 [5.647133]

B:BD[5.682512] → [9.2219:2318]

     (130 * 75) / 100,          // SK_INVOCATIONS
     (170 * 75) / 100,          // SK_EVOCATIONS

[5.682512]

[5.682611]

     (100 * 75) / 100,          // SK_INVOCATIONS
     (150 * 75) / 100,          // SK_EVOCATIONS

Deletion in crawl-ref/source/skills2.cc at line 752 [5.647133]

∅:D[9.2470] → [5.684587:684747]

B:BD[5.684587] → [5.684587:684747]

B:BD[5.684747] → [6.915:965]

∅:D[6.965] → [5.684797:685210]

B:BD[5.684797] → [5.684797:685210]

B:BD[5.685210] → [7.1228:1275]

∅:D[7.1275] → [5.685257:685815]

∅:D[8.160523] → [5.685257:685815]

B:BD[5.685257] → [5.685257:685815]

B:BD[5.685815] → [9.2471:2522]

∅:D[9.2522] → [5.685866:686468]

B:BD[5.685866] → [5.685866:686468]

B:BD[5.686468] → [9.2523:2623]

     },
    {                           // SP_OGRE_MAGE (17)
     100,                       // SK_FIGHTING
     110,                       // SK_SHORT_BLADES
     100,                       // SK_LONG_BLADES
     100,                       // SK_UNUSED_1
     100,                       // SK_AXES
     100,                       // SK_MACES_FLAILS
     100,                       // SK_POLEARMS
     100,                       // SK_STAVES
     150,                       // SK_SLINGS
     150,                       // SK_BOWS
     150,                       // SK_CROSSBOWS
     150,                       // SK_DARTS
     150,                       // SK_THROWING
     170,                       // SK_ARMOUR
     130,                       // SK_DODGING
     100,                       // SK_STEALTH
     130,                       // SK_STABBING
     150,                       // SK_SHIELDS
     150,                       // SK_TRAPS_DOORS
     100,                       // SK_UNARMED_COMBAT
     100,                       // undefined
     100,                       // undefined
     100,                       // undefined
     100,                       // undefined
     100,                       // undefined
     (70 * 130) / 100,          // SK_SPELLCASTING
     100,                       // SK_CONJURATIONS
     80,                        // SK_ENCHANTMENTS
     100,                       // SK_SUMMONINGS
     100,                       // SK_NECROMANCY
     100,                       // SK_TRANSLOCATIONS
     100,                       // SK_TRANSMIGRATION
     100,                       // SK_DIVINATIONS
     100,                       // SK_FIRE_MAGIC
     100,                       // SK_ICE_MAGIC
     100,                       // SK_AIR_MAGIC
     100,                       // SK_EARTH_MAGIC
     100,                       // SK_POISON_MAGIC
     (100 * 75) / 100,          // SK_INVOCATIONS
     (100 * 75) / 100,           // SK_EVOCATIONS

Insertion in crawl-ref/source/skills2.cc at line 1576 [5.647133]
[10.183]
[10.183]
```
    {
    },
    // SP_OGRE_MAGE placeholder
```

Deletion in crawl-ref/source/skills2.cc at line 1929 [5.647133]

B:BD[3.1547] → [3.1547:1658]

// [ds] @Genus@ distinguishes between Ogre-Mages and Ogres, but
// @genus@ does not. This is rather confusing.

Replacement in crawl-ref/source/skills2.cc at line 1931 [5.647133]

B:BD[3.1696] → [3.1696:1759]

    return species_name(Skill_Species, 1, true, false, false);

[3.1696]

[3.1759]

    return species_name(Skill_Species, 1, true, false);

Replacement in crawl-ref/source/skills2.cc at line 1936 [5.647133]

B:BD[3.1802] → [3.1802:1873]

    std::string s = species_name(Skill_Species, 1, true, false, true);

[3.1802]

[3.1873]

    std::string s = species_name(Skill_Species, 1, true, false);

Deletion in crawl-ref/source/skills2.cc at line 1957 [5.647133]
B:BD[3.2294] → [3.2294:2317]
```
    case SP_OGRE_MAGE:
```

Replacement in crawl-ref/source/player.h at line 83 [5.945993]

B:BD[11.8679] → [11.8679:8744]

                          bool adj = false, bool ogre = false );

[11.8679]

[12.939]

                          bool adj = false );

Deletion in crawl-ref/source/player.cc at line 442 [5.962854]
B:BD[13.227] → [13.227:250]
```
    case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/player.cc at line 493 [5.962854]
B:BD[14.2259] → [14.2259:2286]
```
        case SP_OGRE_MAGE:
```
Insertion in crawl-ref/source/player.cc at line 1162 [5.962854]
[15.225]
[5.976392]
```
    case SP_OGRE:
```
Deletion in crawl-ref/source/player.cc at line 1166 [5.962854]
B:BD[5.976464] → [15.226:249]
```
    case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/player.cc at line 3175 [5.962854]
B:BD[5.1015449] → [5.1015449:1015475]
```
            case SP_OGRE:
```

Deletion in crawl-ref/source/player.cc at line 3178 [5.962854]

B:BD[5.1015532] → [5.1015532:1015673]

                // lowered because of HD raise -- bwr
                // if (you.experience_level < 14)
                //     hp_adjust++;

Replacement in crawl-ref/source/player.cc at line 3188 [5.962854]
B:BD[5.1015967] → [5.1015967:1015998]
```
            case SP_OGRE_MAGE:
```
[5.1015967]
[5.1015998]
```
            case SP_OGRE:
```

Replacement in crawl-ref/source/player.cc at line 3190 [5.962854]

B:BD[5.1016027] → [5.1016027:1016301]

B:BD[5.1016301] → [16.4933:5058]

∅:D[16.5058] → [5.1016379:1016397]

B:BD[5.1016379] → [5.1016379:1016397]


                // lowered because of HD raise -- bwr
                // if (you.experience_level < 14)
                //     hp_adjust++;
                if (!(you.experience_level % 5))
                {
                    modify_stat( (coinflip() ? STAT_INTELLIGENCE
                                                 : STAT_STRENGTH), 1, false,
                                 "level gain");
                }

[5.1016027]

[5.1016397]

                if (!(you.experience_level % 3))
                    modify_stat(STAT_STRENGTH, 1, false, "level gain");

Deletion in crawl-ref/source/player.cc at line 3540 [5.962854]
B:BD[5.1027476] → [5.1027476:1027507]
```
            case SP_OGRE_MAGE:
```

Replacement in crawl-ref/source/player.cc at line 4071 [5.962854]

B:BD[12.1508] → [11.8746:8860]

std::string species_name(species_type speci, int level, bool genus, bool adj,
                         bool ogre)

[12.1508]

[11.8860]

std::string species_name(species_type speci, int level, bool genus, bool adj)

Deletion in crawl-ref/source/player.cc at line 4076 [5.962854]
B:BD[11.8936] → [11.8936:9071]
∅:D[17.999] → [5.1037342:1037343]
∅:D[11.9071] → [5.1037342:1037343]
B:BD[5.1037342] → [5.1037342:1037343]
```
    // If 'ogre' is true, the Ogre-Mage is described as like the Ogre.
    if (ogre && speci == SP_OGRE_MAGE)
        speci = SP_OGRE;
```

Deletion in crawl-ref/source/player.cc at line 4148 [5.962854]

B:BD[17.2726] → [18.7888:8007]

∅:D[18.8007] → [17.2847:2890]

B:BD[17.2847] → [17.2847:2890]

B:BD[17.2890] → [11.9072:9148]

        // We've previously declared that these are radically
        // different from Ogres... so we're not going to
        // refer to them as Ogres.  -- bwr
        case SP_OGRE_MAGE:  res = "Ogre-Mage";                       break;

Insertion in crawl-ref/source/player.cc at line 4249 [5.962854]
[5.1044452]
[5.1044452]
```
        case SP_OGRE:
```
Deletion in crawl-ref/source/player.cc at line 4261 [5.962854]
B:BD[5.1044741] → [5.1044741:1044763]
```
        case SP_OGRE:
```
Deletion in crawl-ref/source/player.cc at line 4269 [5.962854]
B:BD[5.1044937] → [5.1044937:1044964]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/player.cc at line 5715 [5.962854]
B:BD[19.3528] → [19.3528:3555]
```
        case SP_OGRE_MAGE:
```

Replacement in crawl-ref/source/player.cc at line 6715 [5.962854]

B:BD[20.223] → [20.223:318]

    return (species == SP_OGRE || species == SP_TROLL
            || species == SP_OGRE_MAGE);

[20.223]

[21.639]

    return (species == SP_OGRE || species == SP_TROLL);

Replacement in crawl-ref/source/output.cc at line 2412 [5.1088282]

B:BD[22.13004] → [23.4295:4432]

    if ( you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE
         || player_genus(GENPC_DRACONIAN) || you.species == SP_SPRIGGAN )

[22.13004]

[22.13152]

    if (you.species == SP_OGRE || you.species == SP_TROLL
        || player_genus(GENPC_DRACONIAN) || you.species == SP_SPRIGGAN)

Replacement in crawl-ref/source/output.cc at line 2418 [5.1088282]
B:BD[24.1520] → [24.1520:1550]
```
    if ( beogh_water_walk() )
```
[24.1520]
[23.4483]
```
    if (beogh_water_walk())
```

Replacement in crawl-ref/source/newgame.cc at line 117 [5.1132300]

B:BD[25.3472] → [25.3472:3880]

    SP_HUMAN,       SP_HIGH_ELF,
    SP_GREY_ELF,    SP_DEEP_ELF,
    SP_SLUDGE_ELF,  SP_MOUNTAIN_DWARF,
    SP_HALFLING,    SP_HILL_ORC,
    SP_KOBOLD,      SP_MUMMY,
    SP_NAGA,        SP_GNOME,
    SP_OGRE,        SP_TROLL,
    SP_OGRE_MAGE,   SP_RED_DRACONIAN,
    SP_CENTAUR,     SP_DEMIGOD,
    SP_SPRIGGAN,    SP_MINOTAUR,
    SP_DEMONSPAWN,  SP_GHOUL,
    SP_KENKU,       SP_MERFOLK,
    SP_VAMPIRE

[25.3472]

[25.3880]

    SP_HUMAN,         SP_HIGH_ELF,
    SP_GREY_ELF,      SP_DEEP_ELF,
    SP_SLUDGE_ELF,    SP_MOUNTAIN_DWARF,
    SP_HALFLING,      SP_HILL_ORC,
    SP_KOBOLD,        SP_MUMMY,
    SP_NAGA,          SP_GNOME,
    SP_OGRE,          SP_TROLL,
    SP_RED_DRACONIAN, SP_CENTAUR,
    SP_DEMIGOD,       SP_SPRIGGAN,
    SP_MINOTAUR,      SP_DEMONSPAWN,
    SP_GHOUL,         SP_KENKU,
    SP_MERFOLK,       SP_VAMPIRE

Replacement in crawl-ref/source/newgame.cc at line 145 [5.1132300]

B:BD[25.4471] → [25.4471:4576]

    SP_OGRE,        SP_OGRE_MAGE,
    SP_TROLL,       SP_MINOTAUR,
    SP_KENKU,       SP_RED_DRACONIAN,

[25.4471]

[25.4576]

    SP_OGRE,        SP_TROLL,
    SP_MINOTAUR,    SP_KENKU,
    SP_RED_DRACONIAN,

Deletion in crawl-ref/source/newgame.cc at line 1000 [5.1132300]
B:BD[5.1145526] → [5.1145526:1145553]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1295 [5.1132300]
∅:D[26.6389] → [5.1154742:1154769]
B:BD[5.1154742] → [5.1154742:1154769]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1315 [5.1132300]
∅:D[26.7032] → [5.1155720:1155747]
B:BD[5.1155720] → [5.1155720:1155747]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1337 [5.1132300]
∅:D[26.7441] → [5.1156517:1156544]
B:BD[5.1156517] → [5.1156517:1156544]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1363 [5.1132300]
B:BD[26.7703] → [27.3065:3092]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1391 [5.1132300]
B:BD[26.8177] → [26.8177:8204]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1412 [5.1132300]
B:BD[5.1157731] → [27.3403:3430]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1430 [5.1132300]
∅:D[26.8853] → [5.1158286:1158313]
B:BD[5.1158286] → [5.1158286:1158313]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1443 [5.1132300]
B:BD[28.3594] → [28.3594:3621]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1465 [5.1132300]
B:BD[26.9098] → [26.9098:9125]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1481 [5.1132300]
B:BD[5.1159498] → [28.4164:4191]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1505 [5.1132300]
B:BD[5.1159953] → [27.3885:3912]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1528 [5.1132300]
∅:D[27.4090] → [5.1160417:1160439]
B:BD[5.1160417] → [5.1160417:1160439]
```
        case SP_OGRE:
```
Deletion in crawl-ref/source/newgame.cc at line 1564 [5.1132300]
B:BD[28.4860] → [27.4221:4248]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1588 [5.1132300]
B:BD[26.10607] → [26.10607:10634]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1634 [5.1132300]
B:BD[26.11219] → [28.5348:5375]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1661 [5.1132300]
B:BD[5.1163222] → [27.4805:4832]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1780 [5.1132300]
B:BD[26.13766] → [26.13766:13793]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1804 [5.1132300]
∅:D[28.6607] → [5.1167039:1167066]
B:BD[5.1167039] → [5.1167039:1167066]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1821 [5.1132300]
B:BD[26.14561] → [27.5639:5666]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1869 [5.1132300]
B:BD[29.4759] → [29.4759:4786]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 1895 [5.1132300]
B:BD[29.5405] → [30.2585:2612]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 2108 [5.1132300]
B:BD[31.3905] → [31.3905:3932]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 2128 [5.1132300]
B:BD[31.4388] → [31.4388:4415]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 2201 [5.1132300]
B:BD[32.4171] → [32.4171:4198]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 2391 [5.1132300]
B:BD[2.3923] → [2.3923:3950]
```
        case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 2460 [5.1132300]
B:BD[33.5061] → [2.4372:4399]
```
        case SP_OGRE_MAGE:
```

Replacement in crawl-ref/source/newgame.cc at line 2578 [5.1132300]

B:BD[5.1175969] → [5.1175969:1176125]

    case SP_OGRE:               sb = 12; ib =  3; db =  3;      break;  // 18
    case SP_OGRE_MAGE:          sb =  9; ib =  7; db =  3;      break;  // 19

[5.1175969]

[5.1176125]

    case SP_OGRE:               sb = 10; ib =  5; db =  3;      break;  // 18

Deletion in crawl-ref/source/newgame.cc at line 2679 [5.1132300]
∅:D[34.764] → [35.281:366]
∅:D[36.12366] → [35.281:366]
B:BD[35.281] → [35.281:366]
```
        break;
    case SP_OGRE_MAGE:
        you.mutation[MUT_FAST_METABOLISM] = 1;
```
Deletion in crawl-ref/source/newgame.cc at line 5144 [5.1132300]
B:BD[37.19010] → [37.19010:19037]
```
        case SP_OGRE_MAGE:
```

Replacement in crawl-ref/source/mutation.cc at line 1248 [5.1263003]

B:BD[38.508] → [39.2883:2945]

    if (you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE

[38.508]

[40.2622]

    if (you.species == SP_OGRE || you.species == SP_TROLL

Replacement in crawl-ref/source/mon-util.cc at line 7142 [5.1699344]

B:BD[41.9499] → [42.3062:3132]

    std::string sp = species_name(you.species, 1, true, false, true);

[41.9499]

[41.9556]

    std::string sp = species_name(you.species, 1, true, false);

Replacement in crawl-ref/source/mon-util.cc at line 7211 [5.1699344]

B:BD[41.9964] → [42.3133:3213]

                      species_name(you.species, 1, true, false, true).c_str());

[41.9964]

[41.10031]

                      species_name(you.species, 1, true, false).c_str());

Replacement in crawl-ref/source/fight.cc at line 207 [5.3140790]

B:BD[5.3146048] → [5.3146048:3146120]

            if ((you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE)

[5.3146048]

[5.3146120]

            if (you.species == SP_OGRE || you.species == SP_TROLL

Replacement in crawl-ref/source/enum.h at line 2443 [5.3287960]
B:BD[5.3361202] → [5.3361202:3361249]
```
    SP_HUMAN = 1,                      //    1
```
[5.3361202]
[5.3361261]
```
    SP_HUMAN = 1,
```
Replacement in crawl-ref/source/enum.h at line 2447 [5.3287960]
B:BD[43.4211] → [43.4211:4258]
```
    SP_SLUDGE_ELF,                     //    5
```
[43.4211]
[5.3361380]
```
    SP_SLUDGE_ELF,
```
Replacement in crawl-ref/source/enum.h at line 2452 [5.3287960]
B:BD[5.3361482] → [43.4277:4324]
```
    SP_MUMMY,                          //   10
```
[5.3361482]
[5.3361496]
```
    SP_MUMMY,
```
Deletion in crawl-ref/source/enum.h at line 2457 [5.3287960]
B:BD[5.3361584] → [25.17972:18019]
```
    SP_OGRE_MAGE,                      //   15
```
Replacement in crawl-ref/source/enum.h at line 2461 [5.3287960]
∅:D[44.3169] → [43.4364:4411]
B:BD[5.3361720] → [43.4364:4411]
```
    SP_GREY_DRACONIAN,                 //   20
```
[44.3169]
[5.3361743]
```
    SP_GREY_DRACONIAN,
```
Replacement in crawl-ref/source/enum.h at line 2466 [5.3287960]
B:BD[5.3361862] → [25.18020:18067]
```
    SP_BASE_DRACONIAN,                 //   25
```
[5.3361862]
[45.10827]
```
    SP_BASE_DRACONIAN,
```
Replacement in crawl-ref/source/enum.h at line 2471 [5.3287960]
B:BD[5.3362028] → [25.18110:18157]
```
    SP_DEMONSPAWN,                     //   30
```
[5.3362028]
[45.10862]
```
    SP_DEMONSPAWN,
```
Replacement in crawl-ref/source/enum.h at line 2475 [5.3287960]
B:BD[25.18197] → [25.18197:18244]
```
    SP_VAMPIRE,                        //   34
```
[25.18197]
[10.417]
```
    SP_VAMPIRE,
```
Insertion in crawl-ref/source/enum.h at line 2478 [5.3287960]
[46.1283]
[5.3362124]
```
    SP_OGRE_MAGE,                      // (placeholder)
```
Deletion in crawl-ref/source/effects.cc at line 938 [5.3382105]
B:BD[5.3400765] → [5.3400765:3400792]
```
        case SP_OGRE_MAGE:
```

Replacement in crawl-ref/source/effects.cc at line 998 [5.3382105]

B:BD[47.675] → [36.32869:33018]

        // We could use player_mutation_level for the horns, but let's just
        // check for the mutation directly to avoid acquirement fiddles.

[47.675]

        // We check for the mutation directly to avoid acquirement fiddles
        // with vampires.

Replacement in crawl-ref/source/effects.cc at line 1001 [5.3382105]

B:BD[47.713] → [47.713:968]

            && ((you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE)
                || player_genus(GENPC_DRACONIAN)
                || you.species == SP_KENKU
                || you.species == SP_SPRIGGAN
                || you.mutation[MUT_HORNS]))

[47.713]

[47.968]

            && (!you_can_wear(EQ_HELMET) || you.mutation[MUT_HORNS]))

Deletion in crawl-ref/source/describe.cc at line 2585 [5.3736416]
B:BD[48.33701] → [48.33701:33724]
```
    case SP_OGRE_MAGE:
```

Replacement in crawl-ref/source/acr.cc at line 4537 [5.4397395]

B:BD[43.5349] → [25.18333:18388]

    COMPILE_CHECK(SP_VAMPIRE == 34              , c3);

[43.5349]

[43.5404]

    COMPILE_CHECK(SP_VAMPIRE == 33              , c3);

Removed Ogre-Mages, hopefully without breaking anything. Docs are unchanged.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/tilepick.cc at line 2610 [4.96318]

Replacement in crawl-ref/source/spl-cast.cc at line 366 [5.293070]

Replacement in crawl-ref/source/skills2.cc at line 669 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 681 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 686 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 694 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 699 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 704 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 707 [5.647133]

Deletion in crawl-ref/source/skills2.cc at line 752 [5.647133]

Insertion in crawl-ref/source/skills2.cc at line 1576 [5.647133]

Deletion in crawl-ref/source/skills2.cc at line 1929 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 1931 [5.647133]

Replacement in crawl-ref/source/skills2.cc at line 1936 [5.647133]

Deletion in crawl-ref/source/skills2.cc at line 1957 [5.647133]

Replacement in crawl-ref/source/player.h at line 83 [5.945993]

Deletion in crawl-ref/source/player.cc at line 442 [5.962854]

Deletion in crawl-ref/source/player.cc at line 493 [5.962854]

Insertion in crawl-ref/source/player.cc at line 1162 [5.962854]

Deletion in crawl-ref/source/player.cc at line 1166 [5.962854]

Deletion in crawl-ref/source/player.cc at line 3175 [5.962854]

Deletion in crawl-ref/source/player.cc at line 3178 [5.962854]

Replacement in crawl-ref/source/player.cc at line 3188 [5.962854]

Replacement in crawl-ref/source/player.cc at line 3190 [5.962854]

Deletion in crawl-ref/source/player.cc at line 3540 [5.962854]

Replacement in crawl-ref/source/player.cc at line 4071 [5.962854]

Deletion in crawl-ref/source/player.cc at line 4076 [5.962854]

Deletion in crawl-ref/source/player.cc at line 4148 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4249 [5.962854]

Deletion in crawl-ref/source/player.cc at line 4261 [5.962854]

Deletion in crawl-ref/source/player.cc at line 4269 [5.962854]

Deletion in crawl-ref/source/player.cc at line 5715 [5.962854]

Replacement in crawl-ref/source/player.cc at line 6715 [5.962854]

Replacement in crawl-ref/source/output.cc at line 2412 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 2418 [5.1088282]

Replacement in crawl-ref/source/newgame.cc at line 117 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 145 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1000 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1295 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1315 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1337 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1363 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1391 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1412 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1430 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1443 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1465 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1481 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1505 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1528 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1564 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1588 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1634 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1661 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1780 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1804 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1821 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1869 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1895 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2108 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2128 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2201 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2391 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2460 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2578 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2679 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 5144 [5.1132300]

Replacement in crawl-ref/source/mutation.cc at line 1248 [5.1263003]

Replacement in crawl-ref/source/mon-util.cc at line 7142 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7211 [5.1699344]

Replacement in crawl-ref/source/fight.cc at line 207 [5.3140790]

Replacement in crawl-ref/source/enum.h at line 2443 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2447 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2452 [5.3287960]

Deletion in crawl-ref/source/enum.h at line 2457 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2461 [5.3287960]