fiddlerwoaroof/crawl - Change 5FECCMAC5QKG3SJ4ATZFE2QF7I3A4YKWKCU4XQEW2P2SWZ2J33YQC

Adding Vampire aptitudes to tables.txt (Bug 1816344).

Also changed Ranged Combat to Throwing, while I was at it.

Fixing 1817775: portaled projectile treats returning weapons like any other projectile (no duplicates any more, but also no returning). I think this makes sense, seeing how the spell teleports it somewhere so how should it know the path back.

Fixing 1817995: starting items not stacking correctly. Question: Why is the flag BEEN_IN_INV even set for starting inventory?

Applying two patches by dolorous: 1818736: comment fix for MUT_SAPROVOROUS 1818667: remove redundant MUT_HOOVES check

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

Created by j-p-e-g on October 23, 2007

5FECCMAC5QKG3SJ4ATZFE2QF7I3A4YKWKCU4XQEW2P2SWZ2J33YQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/transfor.cc at line 613 [7.143977]
B:BD[7.159050] → [7.159050:159079]
```
            case SP_CENTAUR:
```

Insertion in crawl-ref/source/newgame.cc at line 885 [7.1132300]

[7.1152074]

[5.2539]

            // Why is this here? Elsewhere it's only ever used for runes

Replacement in crawl-ref/source/newgame.cc at line 2371 [7.1132300]
B:BD[8.291] → [8.291:314]
```
    if (you.is_undead)
```
[8.291]
[9.623]
```
    if (you.is_undead) // no Berserk for undeads
```
Insertion in crawl-ref/source/mutation.cc at line 541 [7.1263003]
[7.1281495]
[7.1281495]
```
    
```
Deletion in crawl-ref/source/mutation.cc at line 751 [7.1263003]
B:BD[7.1288976] → [6.1085:1153]
```
    // saprovorous: can never be gained or lost, only started with
```
Deletion in crawl-ref/source/mutation.cc at line 752 [7.1263003]
B:BD[7.1288994] → [6.1154:1155]
Insertion in crawl-ref/source/mutation.cc at line 759 [7.1263003]
[10.1658]
[7.1289048]
```
    // saprovorous: can never be gained or lost, only started with
```
Insertion in crawl-ref/source/mutation.cc at line 762 [7.1263003]
[7.1289066]
[7.1289066]
```
    
```
Replacement in crawl-ref/source/items.cc at line 1335 [7.2584728]
B:BD[3.322] → [3.322:344]
```
    // and note flags
```
[3.322]
[3.344]
```
    // and note flags. Also, whether item was in inventory before.
```

Replacement in crawl-ref/source/items.cc at line 1338 [7.2584728]

B:BD[3.476] → [3.476:538]

                          ISFLAG_NOTED_ID | ISFLAG_NOTED_GET)

[3.476]

[3.538]

                          ISFLAG_NOTED_ID | ISFLAG_NOTED_GET | \
                          ISFLAG_BEEN_IN_INV)

Deletion in crawl-ref/source/itemprop.cc at line 1135 [11.646661]

B:BD[11.680246] → [11.680246:680302]

B:BD[11.680302] → [4.3296:3342]

∅:D[4.3342] → [11.680353:680471]

B:BD[11.680353] → [11.680353:680471]


                    return (false);
                }
                if (you.mutation[MUT_HOOVES])
                {
                    if (!quiet)
                        mpr( "You can't wear boots with hooves!" );

Replacement in crawl-ref/source/item_use.cc at line 2002 [7.2781507]

B:BD[7.2825397] → [12.2256:2322]

        returning = (get_weapon_brand(item) == SPWPN_RETURNING &&

[7.2825397]

[13.5542]

        returning = (get_weapon_brand(item) == SPWPN_RETURNING && !teleport &&

Replacement in crawl-ref/docs/tables.txt at line 29 [14.6039]

B:BD[14.7677] → [14.7677:7751]

                             Ran - Ranged Combat         Fir - Fire Magic

[14.7677]

[14.7751]

                             Thr - Throwing              Fir - Fire Magic

Insertion in crawl-ref/docs/tables.txt at line 70 [14.6039]
[14.10570]
[14.10570]
```
Vampire         140 110  50 100 140 110   140 140                 150
```

Replacement in crawl-ref/docs/tables.txt at line 75 [14.6039]

B:BD[14.10712] → [2.306:376]

                Fgt SBl LBl Axs M&F Pla Stv U C   Ran Slg Bws Crb Drt

[14.10712]

[14.10775]

                Fgt SBl LBl Axs M&F Pla Stv U C   Thr Slg Bws Crb Drt

Insertion in crawl-ref/docs/tables.txt at line 109 [14.6039]
[14.13225]
[14.13225]
```
Vampire         110 100 110 110 140 110 140  90   140 140 140 140 140
```

Replacement in crawl-ref/docs/tables.txt at line 111 [14.6039]

B:BD[14.13295] → [2.377:447]

                Fgt SBl LBl Axs M&F Pla Stv U C   Ran Slg Bws Crb Drt

[14.13295]

[14.13351]

                Fgt SBl LBl Axs M&F Pla Stv U C   Thr Slg Bws Crb Drt

Insertion in crawl-ref/docs/tables.txt at line 148 [14.6039]
[14.15873]
[14.15873]
```
Vampire         130 160 140 100 100 140 120 140   140 140 140 140 140
```

Adding Vampire aptitudes to tables.txt (Bug 1816344).

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/transfor.cc at line 613 [7.143977]

Insertion in crawl-ref/source/newgame.cc at line 885 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2371 [7.1132300]

Insertion in crawl-ref/source/mutation.cc at line 541 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 751 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 752 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 759 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 762 [7.1263003]

Replacement in crawl-ref/source/items.cc at line 1335 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 1338 [7.2584728]

Deletion in crawl-ref/source/itemprop.cc at line 1135 [11.646661]

Replacement in crawl-ref/source/item_use.cc at line 2002 [7.2781507]

Replacement in crawl-ref/docs/tables.txt at line 29 [14.6039]

Insertion in crawl-ref/docs/tables.txt at line 70 [14.6039]

Replacement in crawl-ref/docs/tables.txt at line 75 [14.6039]

Insertion in crawl-ref/docs/tables.txt at line 109 [14.6039]

Replacement in crawl-ref/docs/tables.txt at line 111 [14.6039]

Insertion in crawl-ref/docs/tables.txt at line 148 [14.6039]