fiddlerwoaroof/crawl - Change TTHOIZMSG2GWUO5IQWOPYK5V5DS6HIPD7ULFI6P6E7LQ6MMKPMHAC

Applying patches by dolorous:

1795373: level-2 carnivorous mutation gets another description to differentiate the levels 1795116: more levitation cleanups (using you.flies()) 1794858: cleanup for vampires and fangs mutation

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

Created by j-p-e-g on September 15, 2007

TTHOIZMSG2GWUO5IQWOPYK5V5DS6HIPD7ULFI6P6E7LQ6MMKPMHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 389 [3.962854]
B:BD[3.965593] → [2.398:457]
∅:D[2.457] → [4.2073:2131]
B:BD[3.965629] → [4.2073:2131]
```
    return (!player_is_levitating() && !beogh_water_walk()
            && grid_is_water(grd[you.x_pos][you.y_pos]));
```
[3.965593]
[2.458]
```
    return (you.in_water());
```

Replacement in crawl-ref/source/player.cc at line 5092 [3.962854]

B:BD[4.2772] → [4.2772:2853]

    return !is_levitating()
        && grid_is_water(grd[you.x_pos][you.y_pos]);

[4.2772]

[4.2853]

    return (!player_is_levitating() && !beogh_water_walk()
            && grid_is_water(grd[you.x_pos][you.y_pos]));

Deletion in crawl-ref/source/output.cc at line 1707 [3.1088282]

B:BD[5.67020] → [6.896:897]

B:BD[6.897] → [7.7955:8057]


      case SP_VAMPIRE:
          text += "sharp teeth 3";
          have_any = true;
          break;

Deletion in crawl-ref/source/output.cc at line 2094 [3.1088282]

B:BD[7.8142] → [7.8142:8215]

                if (you.species == SP_VAMPIRE)
                   break;

Replacement in crawl-ref/source/mutation.cc at line 105 [3.1263003]

B:BD[3.1265644] → [3.1265644:1265705]

     "Your digestive system is specialised to digest meat.",

[3.1265644]

[8.89]

     "Your digestive system is highly specialised to digest meat.",

Replacement in crawl-ref/source/misc.cc at line 1260 [3.1933596]
B:BD[3.1949692] → [9.529:577]
∅:D[9.577] → [10.251854:251909]
B:BD[10.251854] → [10.251854:251909]
```
    if (!force_stair && player_is_levitating() 
            && !wearing_amulet(AMU_CONTROLLED_FLIGHT))
```
[3.1949692]
[3.1949766]
```
    if (!force_stair && you.flies() == FL_LEVITATE)
```
Replacement in crawl-ref/source/items.cc at line 1031 [3.2584728]
B:BD[10.351306] → [10.351306:351380]
```
    if (player_is_levitating() && !wearing_amulet(AMU_CONTROLLED_FLIGHT))
```
[10.351306]
[10.351380]
```
    if (you.flies() == FL_LEVITATE)
```
Replacement in crawl-ref/source/items.cc at line 1073 [3.2584728]
B:BD[3.2608027] → [3.2608027:2608101]
```
    if (player_is_levitating() && !wearing_amulet(AMU_CONTROLLED_FLIGHT))
```
[3.2608027]
[3.2608101]
```
    if (you.flies() == FL_LEVITATE)
```
Replacement in crawl-ref/source/items.cc at line 2782 [3.2584728]
B:BD[3.2657679] → [3.2657679:2657753]
```
    if (player_is_levitating() && !wearing_amulet(AMU_CONTROLLED_FLIGHT))
```
[3.2657679]
[11.7712]
```
    if (you.flies() == FL_LEVITATE)
```
Replacement in crawl-ref/source/food.cc at line 233 [3.3043806]
B:BD[3.3052527] → [12.850945:851019]
```
    if (player_is_levitating() && !wearing_amulet(AMU_CONTROLLED_FLIGHT))
```
[3.3052527]
[3.3052623]
```
    if (you.flies() == FL_LEVITATE)
```
Replacement in crawl-ref/source/food.cc at line 727 [3.3043806]
B:BD[3.3062753] → [3.3062753:3062827]
```
    if (player_is_levitating() && !wearing_amulet(AMU_CONTROLLED_FLIGHT))
```
[3.3062716]
[3.3062827]
```
    if (you.flies() == FL_LEVITATE)
```

Replacement in crawl-ref/source/clua.cc at line 728 [10.483969]

B:BD[10.499955] → [10.499955:500165]

LUARET1(you_levitating, boolean, 
        player_is_levitating() && !wearing_amulet(AMU_CONTROLLED_FLIGHT))
LUARET1(you_flying, boolean,
        player_is_levitating() && wearing_amulet(AMU_CONTROLLED_FLIGHT))

[10.499955]

[10.500165]

LUARET1(you_levitating, boolean, you.flies() == FL_LEVITATE)
LUARET1(you_flying, boolean, you.flies() == FL_FLY)

Applying patches by dolorous:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 389 [3.962854]

Replacement in crawl-ref/source/player.cc at line 5092 [3.962854]

Deletion in crawl-ref/source/output.cc at line 1707 [3.1088282]

Deletion in crawl-ref/source/output.cc at line 2094 [3.1088282]

Replacement in crawl-ref/source/mutation.cc at line 105 [3.1263003]

Replacement in crawl-ref/source/misc.cc at line 1260 [3.1933596]

Replacement in crawl-ref/source/items.cc at line 1031 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 1073 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 2782 [3.2584728]

Replacement in crawl-ref/source/food.cc at line 233 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 727 [3.3043806]

Replacement in crawl-ref/source/clua.cc at line 728 [10.483969]