fiddlerwoaroof/crawl - Change KLCR26P7MSX4ZWIHQHRK7BZH7M2QGCITN46FCFVHNX7U7WQWYDAQC

Consolidate summon_ugly_thing() into summon_ice_beast_etc(), and rename

the latter summon_general_creature().

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

Created by dolorous on June 6, 2008

KLCR26P7MSX4ZWIHQHRK7BZH7M2QGCITN46FCFVHNX7U7WQWYDAQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1490 [5.293070]

[5.328091]

    // Remember that most holy spells don't yet use powc!
    case SPELL_CALL_IMP:

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

B:BD[5.328124] → [6.788:861]

        summon_ice_beast_etc(powc, MONS_ICE_BEAST, BEH_FRIENDLY, false);

[5.328124]

[5.328176]

    case SPELL_SUMMON_UGLY_THING:
    case SPELL_SUMMON_GUARDIAN:
    case SPELL_SUMMON_DAEVA:
    {
        monster_type mon = MONS_PROGRAM_BUG;
        switch (spell)
        {
            case SPELL_CALL_IMP:
                mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
                      (one_chance_in(7)) ? MONS_SHADOW_IMP
                                         : MONS_IMP;
                break;
            case SPELL_SUMMON_ICE_BEAST:
                mon = MONS_ICE_BEAST;
                break;
            case SPELL_SUMMON_UGLY_THING:
            {
                const int chance = std::max(6 - (powc / 12), 1);
                mon = (one_chance_in(chance)) ? MONS_VERY_UGLY_THING
                                              : MONS_UGLY_THING;
                break;
            }
            case SPELL_SUMMON_GUARDIAN:
                mon = MONS_ANGEL;
                break;
            case SPELL_SUMMON_DAEVA:
                mon = MONS_DAEVA;
                break;
            default:
                break;
        }
        summon_general_creature(powc, mon, BEH_FRIENDLY, false);

Insertion in crawl-ref/source/spl-cast.cc at line 1533 [5.293070]
[5.328191]
[5.328191]
```
    }
```

Deletion in crawl-ref/source/spl-cast.cc at line 1539 [5.293070]

B:BD[5.328273] → [5.328273:328298]

B:BD[5.328298] → [6.862:1118]

∅:D[6.1118] → [5.328539:328554]

B:BD[5.328539] → [5.328539:328554]

B:BD[5.328554] → [6.1119:1125]

∅:D[6.1125] → [5.328554:328555]

B:BD[5.328554] → [5.328554:328555]

    case SPELL_CALL_IMP:
    {
        monster_type mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
                           (one_chance_in(7)) ? MONS_SHADOW_IMP
                                              : MONS_IMP;
        summon_ice_beast_etc(powc, mon, BEH_FRIENDLY, false);
        break;
    }

Deletion in crawl-ref/source/spl-cast.cc at line 1552 [5.293070]
B:BD[5.328869] → [4.208:240]
∅:D[4.240] → [6.1126:1195]
B:BD[5.328894] → [6.1126:1195]
∅:D[6.1195] → [5.328942:328958]
B:BD[5.328942] → [5.328942:328958]
```
    case SPELL_SUMMON_GUARDIAN:
        summon_ice_beast_etc(powc, MONS_ANGEL, BEH_FRIENDLY, false);
        break;
```
Deletion in crawl-ref/source/spl-cast.cc at line 1562 [5.293070]
B:BD[5.329372] → [5.329372:329401]
B:BD[5.329401] → [6.1196:1265]
∅:D[6.1265] → [5.329521:329602]
B:BD[5.329521] → [5.329521:329602]
```
    case SPELL_SUMMON_DAEVA:
        summon_ice_beast_etc(powc, MONS_DAEVA, BEH_FRIENDLY, false);
        break;
    // Remember that most holy spells above don't yet use powc!
```

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

B:BD[5.330965] → [6.1266:1384]

        summon_ice_beast_etc(powc, summon_any_demon(DEMON_COMMON),
                             BEH_FRIENDLY, false);

[5.330965]

[5.331033]

        summon_general_creature(powc, summon_any_demon(DEMON_COMMON),
                                BEH_FRIENDLY, false);

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

B:BD[6.1399] → [6.1399:1533]

                summon_ice_beast_etc(powc, summon_any_demon(DEMON_LESSER),
                                     BEH_FRIENDLY, false);

[6.1399]

[6.1533]

                summon_general_creature(powc, summon_any_demon(DEMON_LESSER),
                                        BEH_FRIENDLY, false);

Deletion in crawl-ref/source/spl-cast.cc at line 1867 [5.293070]
B:BD[7.255] → [7.255:322]
∅:D[7.322] → [5.337287:337303]
B:BD[5.337287] → [5.337287:337303]
```
    case SPELL_SUMMON_UGLY_THING:
        summon_ugly_thing(powc);
        break;
```

Replacement in crawl-ref/source/spells2.h at line 135 [5.562867]

B:BD[5.567617] → [6.1853:1963]

bool summon_ice_beast_etc(int pow, monster_type mon, beh_type beha,
                          bool god_gift);

[5.567617]

[5.567662]

bool summon_general_creature(int pow, monster_type mon, beh_type beha,
                             bool god_gift);

Deletion in crawl-ref/source/spells2.h at line 145 [5.562867]
B:BD[7.362] → [7.362:395]
∅:D[7.395] → [8.151:152]
B:BD[5.567903] → [8.151:152]
```
void summon_ugly_thing(int pow);
```

Replacement in crawl-ref/source/spells2.cc at line 1534 [5.569242]

B:BD[5.605084] → [7.397:429]

void summon_ugly_thing(int pow)

[5.605084]

[7.429]

bool summon_general_creature(int pow, monster_type mon, beh_type beha,
                             bool god_gift)

Deletion in crawl-ref/source/spells2.cc at line 1537 [5.569242]
B:BD[7.431] → [3.169:215]
∅:D[3.215] → [9.215:266]
∅:D[10.228] → [9.215:266]
B:BD[9.215] → [9.215:266]
∅:D[9.266] → [11.227:275]
B:BD[11.227] → [11.227:275]
∅:D[11.275] → [12.2147:2148]
B:BD[7.561] → [12.2147:2148]
```
    int chance = std::max(6 - (pow / 12), 1);
    monster_type ugly = (one_chance_in(chance)) ?
        MONS_VERY_UGLY_THING : MONS_UGLY_THING;
```
Deletion in crawl-ref/source/spells2.cc at line 1538 [5.569242]
B:BD[7.614] → [12.2149:2190]
∅:D[13.641] → [7.683:684]
∅:D[12.2190] → [7.683:684]
B:BD[7.683] → [7.683:684]
B:BD[7.684] → [14.7921:7945]
B:BD[14.7945] → [15.288:316]
∅:D[15.316] → [14.7974:8035]
B:BD[14.7974] → [14.7974:8035]
B:BD[14.8035] → [6.3883:3923]
∅:D[6.3923] → [14.8097:8164]
B:BD[14.8097] → [14.8097:8164]
∅:D[12.2492] → [13.668:674]
∅:D[14.8164] → [13.668:674]
B:BD[13.668] → [13.668:674]
B:BD[13.674] → [2.169:246]
∅:D[2.246] → [12.2572:2573]
B:BD[12.2572] → [12.2572:2573]
B:BD[12.2573] → [2.247:297]
∅:D[2.297] → [16.1839:1900]
B:BD[16.1839] → [16.1839:1900]
∅:D[16.1900] → [13.1309:1315]
B:BD[13.1309] → [13.1309:1315]
∅:D[13.1315] → [7.995:1055]
B:BD[7.995] → [7.995:1055]
B:BD[7.1055] → [6.3924:4033]
∅:D[6.4033] → [5.605128:605130]
∅:D[14.8236] → [5.605128:605130]
∅:D[17.152464] → [5.605128:605130]
B:BD[5.605128] → [5.605128:605130]
B:BD[5.605130] → [18.619:672]
```
    bool friendly = (random2(pow) > 3);
    if (create_monster(
            mgen_data(ugly,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      numsc, you.pos(),
                      friendly ? you.pet_target : MHITYOU)) != -1)
    {
        const char *prefix = (ugly == MONS_VERY_UGLY_THING) ? " very" : "n";
        mprf("A%s ugly thing appears.%s", prefix,
            friendly ? "" : " It doesn't look very happy.");
    }
}                               // end summon_ugly_thing()
bool summon_ice_beast_etc(int pow, monster_type mon, beh_type beha,
                          bool god_gift)
{
    int numsc = std::min(2 + (random2(pow) / 4), 6);
```

Insertion in crawl-ref/source/spells2.cc at line 1557 [5.569242]

[5.605681]

        break;
    case MONS_UGLY_THING:
    case MONS_VERY_UGLY_THING:
    {
        bool friendly = (random2(pow) > 3);
        const char *prefix = (mon == MONS_VERY_UGLY_THING) ? " very" : "n";
        mprf("A%s ugly thing appears.%s", prefix,
            friendly ? "" : " It doesn't look very happy.");
        if (!friendly)
        {
            beha = BEH_HOSTILE;
            hitting = MHITYOU;
        }

Insertion in crawl-ref/source/spells2.cc at line 1574 [5.569242]
[5.605696]
[5.605696]
```
    }
```
Replacement in crawl-ref/source/mstuff2.cc at line 625 [5.1340842]
B:BD[11.2681] → [3.2612:2683]
∅:D[3.2683] → [9.2729:2730]
∅:D[10.2725] → [9.2729:2730]
∅:D[19.5634] → [9.2729:2730]
B:BD[9.2729] → [9.2729:2730]
```
                int chance = std::max(6 - (monster->hit_dice / 6), 1);
```
[11.2681]
[19.5635]
```
                const int chance = std::max(6 - (monster->hit_dice / 6), 1);
```

Replacement in crawl-ref/source/abl-show.cc at line 1280 [5.4494389]

B:BD[5.4516177] → [6.13568:13735]

        summon_ice_beast_etc(you.experience_level * 4,
                             summon_any_demon(DEMON_LESSER),
                             BEH_FRIENDLY, false);

[5.4516177]

[5.4516304]

        summon_general_creature(you.experience_level * 4,
                                summon_any_demon(DEMON_LESSER),
                                BEH_FRIENDLY, false);

Replacement in crawl-ref/source/abl-show.cc at line 1286 [5.4494389]

B:BD[17.1283118] → [6.13736:13903]

        summon_ice_beast_etc(you.experience_level * 4,
                             summon_any_demon(DEMON_COMMON),
                             BEH_FRIENDLY, false);

[17.1283118]

[5.4516475]

        summon_general_creature(you.experience_level * 4,
                                summon_any_demon(DEMON_COMMON),
                                BEH_FRIENDLY, false);

Replacement in crawl-ref/source/abl-show.cc at line 1441 [5.4494389]

B:BD[5.4521266] → [6.13904:14027]

        summon_ice_beast_etc(you.skills[SK_INVOCATIONS] * 4, MONS_DAEVA,
                             BEH_FRIENDLY, true);

[5.4521266]

[5.4521340]

        summon_general_creature(you.skills[SK_INVOCATIONS] * 4,
                                MONS_DAEVA, BEH_FRIENDLY, true);

Replacement in crawl-ref/source/abl-show.cc at line 1464 [5.4494389]

B:BD[5.4521858] → [17.1283429:1283459]

B:BD[17.1283459] → [6.14028:14131]

        summon_ice_beast_etc(
                20 + you.skills[SK_INVOCATIONS] * 3, MONS_REAPER,
                BEH_FRIENDLY, true);

[5.4521858]

[5.4521938]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3,
                                MONS_REAPER, BEH_FRIENDLY, true);

Replacement in crawl-ref/source/abl-show.cc at line 1545 [5.4494389]

B:BD[5.4524574] → [6.14132:14365]

∅:D[20.390] → [5.4524700:4524701]

∅:D[6.14365] → [5.4524700:4524701]

∅:D[14.54346] → [5.4524700:4524701]

B:BD[5.4524700] → [5.4524700:4524701]

        summon_ice_beast_etc(20 + you.skills[SK_INVOCATIONS] * 3,
                             static_cast<monster_type>(
                                 MONS_NEQOXEC + random2(5)),
                             BEH_FRIENDLY, true);

[5.4524574]

[5.4524701]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3,
                                static_cast<monster_type>(
                                    MONS_NEQOXEC + random2(5)),
                                BEH_FRIENDLY, true);

Replacement in crawl-ref/source/abl-show.cc at line 1606 [5.4494389]

B:BD[5.4526722] → [6.14366:14603]

∅:D[20.490] → [5.4526852:4526853]

∅:D[6.14603] → [5.4526852:4526853]

B:BD[5.4526852] → [5.4526852:4526853]

        summon_ice_beast_etc(20 + you.skills[SK_INVOCATIONS] * 3,
                             static_cast<monster_type>(
                                 MONS_EXECUTIONER + random2(5)),
                             BEH_FRIENDLY, true);

[5.4526722]

[5.4526853]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3,
                                static_cast<monster_type>(
                                    MONS_EXECUTIONER + random2(5)),
                                BEH_FRIENDLY, true);

Consolidate summon_ugly_thing() into summon_ice_beast_etc(), and rename

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1490 [5.293070]

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

Insertion in crawl-ref/source/spl-cast.cc at line 1533 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1539 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1552 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1562 [5.293070]

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

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

Deletion in crawl-ref/source/spl-cast.cc at line 1867 [5.293070]

Replacement in crawl-ref/source/spells2.h at line 135 [5.562867]

Deletion in crawl-ref/source/spells2.h at line 145 [5.562867]

Replacement in crawl-ref/source/spells2.cc at line 1534 [5.569242]

Deletion in crawl-ref/source/spells2.cc at line 1537 [5.569242]

Deletion in crawl-ref/source/spells2.cc at line 1538 [5.569242]