fiddlerwoaroof/crawl - Change NJYEH3GBN6OXEMHKOTHVJNIPHXIVW3ZFCLIHYV7I5NFNJZACOYEQC

Another one of those mixed commits.

Fix 1915277: Blade Hands time-out removing bardings.
Ely's Lesser Healing costs range(0,1) piety (avg. 0.5)
Allow synonym for "yes" in yesnoquit(), and use it for eating (e=y).

Also, in preparation for 0.4 (yes, I can't wait) finally disallow random generation of weapons of orc slaying. Demon lords use a check of their own and as a randart property it's also allowed, which I think is fine. Allow random generation of nets and increase shop prices for nets and javelins.

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

Created by j-p-e-g on March 20, 2008

NJYEH3GBN6OXEMHKOTHVJNIPHXIVW3ZFCLIHYV7I5NFNJZACOYEQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.cc at line 591 [5.143977]

B:BD[4.2609] → [4.2609:2670]

    if (you.species == SP_NAGA || you.species == SP_CENTAUR)

[4.2609]

[4.2670]

    // *coughs* Ahem, blade hands... -- jpeg
    if ((you.species == SP_NAGA || you.species == SP_CENTAUR)
        && you.inv[you.equip[EQ_BOOTS]].sub_type == ARM_BOOTS)
    {

Insertion in crawl-ref/source/transfor.cc at line 596 [5.143977]
[4.2706]
[5.158484]
```
    }
```

Replacement in crawl-ref/source/stuff.h at line 80 [5.217090]

B:BD[5.221772] → [6.103527:103577]

B:BD[6.103577] → [7.866:928]

int yesnoquit( const char* str, bool safe = true,
               int safeanswer = 0, bool clear_after = true );

[5.221772]

int yesnoquit( const char* str, bool safe = true, int safeanswer = 0,
               bool clear_after = true, char alt_yes = 'Y' );

Replacement in crawl-ref/source/stuff.cc at line 833 [5.224557]

B:BD[6.106122] → [6.106122:106200]

int yesnoquit( const char* str, bool safe, int safeanswer, bool clear_after )

[6.106122]

[6.106200]

int yesnoquit( const char* str, bool safe, int safeanswer,
               bool clear_after, char alt_yes )

Replacement in crawl-ref/source/stuff.cc at line 866 [5.224557]
B:BD[6.106833] → [6.106833:106862]
```
        else if (tmp == 'Y')
```
[6.106833]
[6.106862]
```
        else if (tmp == 'Y' || tmp == alt_yes)
```

Insertion in crawl-ref/source/shopping.cc at line 805 [5.759950]

[5.779766]

        case MI_JAVELIN:
            valued += 8;
            break;
        case MI_THROWING_NET:
            valued += 30;
            break;

Deletion in crawl-ref/source/shopping.cc at line 812 [5.759950]
B:BD[5.779783] → [5.779783:779860]
```
            // was: cases 6 through 16 with empty strcat()'s 15jan2000 {dlb}
```
Replacement in crawl-ref/source/shopping.cc at line 813 [5.759950]
B:BD[5.779885] → [5.779885:779945]
```
            break;              //strcat(glog , ""); break;
```
[5.779885]
[5.779945]
```
            break;
```

Replacement in crawl-ref/source/randart.cc at line 1707 [5.893152]

B:BD[5.938320] → [5.938320:938392]

            (which_descrip == 2) ? unrand->spec_descrip3 : "Unknown.");

[5.938320]

[8.826]

            (which_descrip == 2) ? unrand->spec_descrip3
                                 : "Unknown.");

Deletion in crawl-ref/source/makeitem.cc at line 1250 [9.927]
∅:D[8.10917] → [9.41974:41975]
B:BD[9.41974] → [9.41974:41975]
B:BD[9.41975] → [8.10918:10993]
```
            if (one_chance_in(10))
                rc = SPWPN_ORC_SLAYING;
```
Deletion in crawl-ref/source/makeitem.cc at line 1294 [9.927]
B:BD[9.44288] → [8.12230:12304]
∅:D[8.12304] → [9.44403:44404]
B:BD[9.44403] → [9.44403:44404]
```
            if (one_chance_in(8))
                rc = SPWPN_ORC_SLAYING;
```
Deletion in crawl-ref/source/makeitem.cc at line 1336 [9.927]
∅:D[8.13507] → [9.46007:46008]
B:BD[9.46007] → [9.46007:46008]
B:BD[9.46008] → [8.13508:13582]
```
            if (one_chance_in(6))
                rc = SPWPN_ORC_SLAYING;
```
Deletion in crawl-ref/source/makeitem.cc at line 1399 [9.927]
B:BD[8.15332] → [8.15332:15372]
∅:D[8.15372] → [9.49048:49049]
B:BD[9.49048] → [9.49048:49049]
B:BD[9.49049] → [8.15373:15407]
```
                rc = SPWPN_ORC_SLAYING;
            if (one_chance_in(6))
```

Insertion in crawl-ref/source/makeitem.cc at line 1743 [9.927]

[8.24663]

                                   1,  MI_THROWING_NET,

Replacement in crawl-ref/source/makeitem.cc at line 1754 [9.927]

B:BD[8.24935] → [8.24935:25015]

        item.quantity = 1+random2(9) + random2(12) + random2(15) + random2(12);

[8.24935]

[8.25015]

        item.quantity = 1+ random2(9) + random2(12) + random2(15) + random2(12);
        return;
    }
    else if (item.sub_type == MI_THROWING_NET) // no fancy nets, either
    {
        item.quantity = 1 + one_chance_in(4); // and only one, rarely two

Insertion in crawl-ref/source/makeitem.cc at line 1763 [9.927]
[9.62684]
[8.25038]

Replacement in crawl-ref/source/makeitem.cc at line 1777 [9.927]

∅:D[3.288] → [8.25429:25495]

B:BD[8.25429] → [8.25429:25495]

        item.quantity = 1+random2(9) + random2(12) + random2(12);

[3.288]

[8.25495]

        item.quantity = 1 + random2(9) + random2(12) + random2(12);

Replacement in crawl-ref/source/makeitem.cc at line 1779 [9.927]

B:BD[8.25504] → [8.25504:25584]

        item.quantity = 1+random2(9) + random2(12) + random2(12) + random2(15);

[8.25504]

[9.62855]

        item.quantity = 1+ random2(9) + random2(12) + random2(12) + random2(15);

Replacement in crawl-ref/source/makeitem.cc at line 2770 [9.927]

B:BD[8.57081] → [8.57081:57161]

            item.quantity = 150+random2(150) + random2(random2(random2(2000)));

[8.57081]

[9.97806]

            item.quantity = 150+ random2(150) + random2(random2(random2(2000)));

Replacement in crawl-ref/source/food.cc at line 866 [5.3043806]

B:BD[2.933] → [2.933:1008]

        const int ans = yesnoquit( prompt.str().c_str(), true, 0, false );

[2.933]

[2.1008]

        const int ans = yesnoquit( prompt.str().c_str(), true, 0, false, 'E' );

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

∅:D[10.7405] → [11.481:573]

B:BD[5.4502598] → [11.481:573]

    { ABIL_ELYVILON_LESSER_HEALING, "Lesser Healing", 1, 0, 100, 0,
      ABFLAG_CONF_OK },

[10.7405]

[11.573]

    { ABIL_ELYVILON_LESSER_HEALING, "Lesser Healing",
      1, 0, 100, generic_cost::range(0, 1), ABFLAG_CONF_OK },

Another one of those mixed commits.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/transfor.cc at line 591 [5.143977]

Insertion in crawl-ref/source/transfor.cc at line 596 [5.143977]

Replacement in crawl-ref/source/stuff.h at line 80 [5.217090]

Replacement in crawl-ref/source/stuff.cc at line 833 [5.224557]

Replacement in crawl-ref/source/stuff.cc at line 866 [5.224557]

Insertion in crawl-ref/source/shopping.cc at line 805 [5.759950]

Deletion in crawl-ref/source/shopping.cc at line 812 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 813 [5.759950]

Replacement in crawl-ref/source/randart.cc at line 1707 [5.893152]

Deletion in crawl-ref/source/makeitem.cc at line 1250 [9.927]

Deletion in crawl-ref/source/makeitem.cc at line 1294 [9.927]

Deletion in crawl-ref/source/makeitem.cc at line 1336 [9.927]

Deletion in crawl-ref/source/makeitem.cc at line 1399 [9.927]