fiddlerwoaroof/crawl - Change XCEZ7OA2INNPSYNAB5U6JB7XNDAD5BKU26YLFPPZ3SEESFZKADQAC

Removed hard tabs.

Corrected sling bullet description.

Targeting forward wrap-around was broken, fixed.

Dropped damage bonus for kenku clawed-kick.

Don't show {tried} for equipped items.

Removed Elyvilon's protection from high-damage hits even when not praying.

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

Created by dshaligram on September 26, 2007

XCEZ7OA2INNPSYNAB5U6JB7XNDAD5BKU26YLFPPZ3SEESFZKADQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 95 [9.3]

B:BD[9.2718] → [9.2718:2773]

	return (you.piety > 160) ? "A beloved toy of Xom." :

[9.2718]

[9.2773]

    return (you.piety > 160) ? "A beloved toy of Xom." :

Replacement in crawl-ref/source/view.cc at line 566 [10.16817]

B:BD[5.114] → [5.114:175]

	     && grid_is_trap(grid_value) && igrd[x][y] != NON_ITEM)

[5.114]

[5.175]

             && grid_is_trap(grid_value) && igrd[x][y] != NON_ITEM)

Replacement in crawl-ref/source/tutorial.cc at line 1170 [12.5936]
B:BD[11.39278] → [11.39278:39297]
```
          	return;
```
[11.39278]
[11.39297]
```
              return;
```

Replacement in crawl-ref/source/player.cc at line 1349 [10.962854]

B:BD[13.4845] → [13.4845:4896]

 	      // Vampires get bonus only when not hungry

[13.4845]

[13.4896]

        // Vampires get bonus only when not hungry

Replacement in crawl-ref/source/ouch.cc at line 763 [10.1104358]

B:BD[10.1119697] → [10.1119697:1119774]

                                                && random2(you.piety) >= 30)

[10.1119697]

[10.1119774]

                && random2(you.piety) >= 30)

Insertion in crawl-ref/source/ouch.cc at line 774 [10.1104358]
[10.1119984]
[10.1119984]
```
        dec_hp( dam, true );
```

Deletion in crawl-ref/source/ouch.cc at line 779 [10.1104358]

B:BD[10.1120170] → [14.5367:5629]

        {
            if (you.religion == GOD_ELYVILON && one_chance_in(3))
            {
                simple_god_message( " shields you from harm!" );
                return;
            }
            // Damage applied here:
            dec_hp( dam, true );

Deletion in crawl-ref/source/ouch.cc at line 780 [10.1104358]
B:BD[9.34984] → [14.5630:5686]
```
        }
        else
            dec_hp( dam, true );
```
Deletion in crawl-ref/source/ouch.cc at line 781 [10.1104358]
B:BD[10.1120232] → [14.5687:5688]

Replacement in crawl-ref/source/ouch.cc at line 800 [10.1104358]

B:BD[8.904] → [8.904:992]

                damage_desc = scorefile_entry(dam, death_source, death_type, aux, true)

[8.904]

[8.992]

                damage_desc = scorefile_entry(dam, death_source,
                                              death_type, aux, true)

Replacement in crawl-ref/source/newgame.cc at line 2400 [10.1132300]
B:BD[4.256] → [4.256:267]
```
	return;
	
```
[4.256]
[10.1189569]
```
        return;
```
Replacement in crawl-ref/source/newgame.cc at line 2409 [10.1132300]
B:BD[4.314] → [4.314:328]
```
	temp_rand--;
```
[4.314]
[4.328]
```
        temp_rand--;
```
Replacement in crawl-ref/source/mutation.cc at line 1323 [10.1263003]
B:BD[10.1301161] → [6.288:316]
```
	    xom_is_stimulated(64);
```
[10.1301161]
[10.1301161]
```
            xom_is_stimulated(64);
```

Replacement in crawl-ref/source/mon-util.cc at line 1745 [10.1699344]

B:BD[15.482201] → [16.12172:12215]

∅:D[16.12215] → [15.482249:482317]

B:BD[15.482249] → [15.482249:482317]

    return (m->has_ench(ENCH_CONFUSION) &&
                            !mons_class_flag(m->type, M_CONFUSED));

[15.482201]

[17.12395]

    return (m->has_ench(ENCH_CONFUSION)
            && !mons_class_flag(m->type, M_CONFUSED));

Deletion in crawl-ref/source/mon-util.cc at line 5195 [10.1699344]
B:BD[18.31620] → [18.31620:31621]
Insertion in crawl-ref/source/itemname.cc at line 184 [10.2667494]
[10.2680817]
[19.10487]
```
    bool equipped = false;
```
Insertion in crawl-ref/source/itemname.cc at line 200 [10.2667494]
[10.2681327]
[10.2681327]
```
            equipped = true;
```
Insertion in crawl-ref/source/itemname.cc at line 210 [10.2667494]
[20.1964]
[10.2681722]
```
            equipped = true;
```
Insertion in crawl-ref/source/itemname.cc at line 215 [10.2667494]
[20.2001]
[10.2681857]
```
            equipped = true;
```
Insertion in crawl-ref/source/itemname.cc at line 220 [10.2667494]
[20.2039]
[10.2681994]
```
            equipped = true;
```
Insertion in crawl-ref/source/itemname.cc at line 225 [10.2667494]
[20.2078]
[10.2682128]
```
            equipped = true;
```

Replacement in crawl-ref/source/itemname.cc at line 229 [10.2667494]

B:BD[21.7852] → [21.7852:7916]

    const bool  tried     = (!ident && item_type_tried(*this));

[21.7852]

[21.7916]

    const bool  tried     = (!ident && !equipped && item_type_tried(*this));

Replacement in crawl-ref/source/it_use2.cc at line 353 [10.2904329]

B:BD[2.772] → [2.772:827]

	you.duration[DUR_RESIST_POISON] += random2(pow) + 10;

[2.772]

[2.827]

        you.duration[DUR_RESIST_POISON] += random2(pow) + 10;

Replacement in crawl-ref/source/fight.cc at line 647 [10.3140790]

B:BD[22.3164] → [7.2153:2232]

            aux_damage = ((you.mutation[MUT_HOOVES] || clawed_kick) ? 10 : 5);

[22.3164]

[23.36415]

            aux_damage = (you.mutation[MUT_HOOVES] ? 10
                          : clawed_kick            ?  8 : 5);

Replacement in crawl-ref/source/dungeon.cc at line 6962 [10.3429798]

B:BD[3.402] → [3.402:500]

			|| grd[i][j] > DNGN_EXIT_PORTAL_VAULT)
		    && grd[i][j] != DNGN_EXIT_HELL // just to be safe

[3.402]

[10.3694525]

                        || grd[i][j] > DNGN_EXIT_PORTAL_VAULT)
                    && grd[i][j] != DNGN_EXIT_HELL // just to be safe

Replacement in crawl-ref/source/dungeon.cc at line 7028 [10.3429798]

B:BD[3.553] → [3.553:651]

			|| grd[i][j] > DNGN_EXIT_PORTAL_VAULT)
		    && grd[i][j] != DNGN_EXIT_HELL // just to be safe

[3.553]

[10.3696412]

                        || grd[i][j] > DNGN_EXIT_PORTAL_VAULT)
                    && grd[i][j] != DNGN_EXIT_HELL // just to be safe

Insertion in crawl-ref/source/direct.cc at line 996 [10.3697945]

[24.458305]

    if ((mode == TARG_FRIEND || mode == TARG_ANY)
            && x == you.x_pos && y == you.y_pos)
        return (true);

Replacement in crawl-ref/source/direct.cc at line 1165 [10.3697945]

B:BD[24.462789] → [24.462789:462850]

                && temp_yps <= maxy && temp_yps >= miny - 1)

[24.462789]

[24.462850]

           && temp_yps <= maxy && temp_yps >= miny - 1)

Replacement in crawl-ref/source/direct.cc at line 1169 [10.3697945]

B:BD[24.462934] → [25.870:927]

            if (mode == TARG_ANY || mode == TARG_FRIEND)

[24.462934]

[25.927]

            if (find_targ(you.x_pos, you.y_pos, mode))

Replacement in crawl-ref/source/direct.cc at line 1171 [10.3697945]

B:BD[25.941] → [25.941:1007]

                mfp[0] = vyou.x;
                mfp[1] = vyou.y;

[25.941]

[25.1007]

                mfp[0] = ctrx;
                mfp[1] = ctry;

Replacement in crawl-ref/source/direct.cc at line 1176 [10.3697945]

∅:D[25.1125] → [24.463011:463071]

B:BD[24.463011] → [24.463011:463071]

                    false, next_los(direction, los, wrap));

[25.1125]

[24.463071]

                               false, next_los(direction, los, wrap));

Deletion in crawl-ref/source/direct.cc at line 1179 [10.3697945]
B:BD[24.463150] → [24.463150:463160]
```
        {
```

Replacement in crawl-ref/source/direct.cc at line 1180 [10.3697945]

∅:D[25.1202] → [24.463237:463307]

B:BD[24.463237] → [24.463237:463307]

                    false, next_los(direction, los, wrap));
        }

[25.1202]

[10.3713616]

                               false, next_los(direction, los, wrap));

Replacement in crawl-ref/source/describe.cc at line 1376 [10.3736416]

B:BD[26.16554] → [26.16554:16618]

            "It can be fired with a sling, or thrown by hand.";

[26.16554]

[26.16618]

            "It can be fired from a sling.";

Deletion in crawl-ref/source/beam.cc at line 2693 [10.4128068]
∅:D[27.859] → [28.1870:1876]
B:BD[28.1870] → [28.1870:1876]
```
	    
```

Removed hard tabs.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 95 [9.3]

Replacement in crawl-ref/source/view.cc at line 566 [10.16817]

Replacement in crawl-ref/source/tutorial.cc at line 1170 [12.5936]

Replacement in crawl-ref/source/player.cc at line 1349 [10.962854]

Replacement in crawl-ref/source/ouch.cc at line 763 [10.1104358]

Insertion in crawl-ref/source/ouch.cc at line 774 [10.1104358]

Deletion in crawl-ref/source/ouch.cc at line 779 [10.1104358]

Deletion in crawl-ref/source/ouch.cc at line 780 [10.1104358]

Deletion in crawl-ref/source/ouch.cc at line 781 [10.1104358]

Replacement in crawl-ref/source/ouch.cc at line 800 [10.1104358]

Replacement in crawl-ref/source/newgame.cc at line 2400 [10.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2409 [10.1132300]

Replacement in crawl-ref/source/mutation.cc at line 1323 [10.1263003]

Replacement in crawl-ref/source/mon-util.cc at line 1745 [10.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 5195 [10.1699344]

Insertion in crawl-ref/source/itemname.cc at line 184 [10.2667494]

Insertion in crawl-ref/source/itemname.cc at line 200 [10.2667494]

Insertion in crawl-ref/source/itemname.cc at line 210 [10.2667494]

Insertion in crawl-ref/source/itemname.cc at line 215 [10.2667494]

Insertion in crawl-ref/source/itemname.cc at line 220 [10.2667494]

Insertion in crawl-ref/source/itemname.cc at line 225 [10.2667494]