fiddlerwoaroof/crawl - Change UIOGH5PMU2M3THTAJLY3FID4USBFZZDQ7H4OUOOUY53BHAAH7X7QC

Go back to consistently pluralizing "dwarf" as "dwarves".

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

Created by dolorous on July 11, 2008

UIOGH5PMU2M3THTAJLY3FID4USBFZZDQ7H4OUOOUY53BHAAH7X7QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/makeitem.cc at line 1669 [6.927]

B:BD[5.510] → [4.2613:2678]

        // Dwarfs don't make arrows, sling bullets, javelins, or

[5.510]

[7.2735]

        // Dwarves don't make arrows, sling bullets, javelins, or

Replacement in crawl-ref/source/makeitem.cc at line 1677 [6.927]
B:BD[6.59752] → [4.2679:2717]
```
        // Dwarfs don't make needles.
```
[6.59752]
[8.22389]
```
        // Dwarves don't make needles.
```

Replacement in crawl-ref/source/libutil.cc at line 342 [11.2494093]

∅:D[9.381] → [10.2126:2189]

∅:D[12.38881] → [10.2126:2189]

B:BD[10.2126] → [10.2126:2189]

    else if (ends_with(name, "elf") || ends_with(name, "olf"))

[12.38881]

[12.38882]

    else if (ends_with(name, "elf") || ends_with(name, "olf")
              || ends_with(name, "arf"))

Replacement in crawl-ref/source/libutil.cc at line 345 [11.2494093]
∅:D[12.38888] → [10.2189:2257]
B:BD[10.2189] → [10.2189:2257]
```
        // Elf, wolf. Dwarfs can stay dwarfs, if there were dwarfs.
```
[12.38888]
[10.2257]
```
        // Elf, wolf, dwarf.
```

Replacement in crawl-ref/source/item_use.cc at line 2333 [11.2781507]

B:BD[13.275] → [4.2755:2811]

            // Dwarfs/orcs with dwarven/orcish weapons.

[13.275]

[14.14323]

            // Dwarves/orcs with dwarven/orcish weapons.

Replacement in crawl-ref/source/describe.cc at line 1080 [11.3736416]

B:BD[15.2853] → [15.2853:2918]

            description += (race == ISFLAG_DWARVEN) ? "Dwarfs" :

[15.2853]

[15.2918]

            description += (race == ISFLAG_DWARVEN) ? "Dwarves" :

Replacement in crawl-ref/source/describe.cc at line 1193 [11.3736416]

B:BD[16.3437] → [16.3437:3502]

            description += (race == ISFLAG_DWARVEN) ? "dwarfs" :

[16.3437]

[16.3502]

            description += (race == ISFLAG_DWARVEN) ? "dwarves" :

Replacement in crawl-ref/source/describe.cc at line 1346 [11.3736416]

B:BD[15.3388] → [2.2679:2740]

        description += (race == ISFLAG_DWARVEN) ? "dwarfs" :

[15.3388]

[15.3450]

        description += (race == ISFLAG_DWARVEN) ? "dwarves" :

Replacement in crawl-ref/docs/crawl_manual.txt at line 900 [18.108269]

B:BD[17.36306] → [3.2833:2901]

difficult. Dwarfs get a larger bonus without the magical hampering.

[17.36306]

[18.141929]

difficult. Dwarves get a larger bonus without the magical hampering.

Replacement in crawl-ref/docs/crawl_manual.txt at line 1471 [18.108269]

B:BD[18.160693] → [3.2902:3006]

Mountain Dwarfs
---------------
Dwarfs are generally short, hardy people. They love to fight, and often

[18.160693]

[19.33846]

Mountain Dwarves
----------------
Dwarves are generally short, hardy people. They love to fight, and often

Replacement in crawl-ref/docs/crawl_manual.txt at line 1476 [18.108269]

B:BD[20.259035] → [3.3007:3077]

lesser artisans. Dwarfs are particularly dangerous when using dwarven

[20.259035]

[20.259107]

lesser artisans. Dwarves are particularly dangerous when using dwarven

Replacement in crawl-ref/docs/crawl_manual.txt at line 1479 [18.108269]

B:BD[18.161042] → [3.3078:3147]

Mountain Dwarfs, as opposed to the subterranean specimen, come from

[18.161042]

[20.259188]

Mountain Dwarves, as opposed to the subterranean specimen, come from

Replacement in crawl-ref/docs/crawl_manual.txt at line 1485 [18.108269]
B:BD[21.4444] → [3.3148:3178]
```
quite bad weapons for Dwarfs.
```
[21.4444]
[22.1483]
```
quite bad weapons for Dwarves.
```

Replacement in crawl-ref/docs/crawl_manual.txt at line 1499 [18.108269]

B:BD[23.4875] → [3.3179:3245]

Hill Orcs are as robust as the Mountain Dwarfs, but have very low

[23.4875]

[19.34212]

Hill Orcs are as robust as the Mountain Dwarves, but have very low

Replacement in crawl-ref/docs/crawl_manual.txt at line 1552 [18.108269]
B:BD[19.35448] → [3.3246:3301]
```
Dwarfs, but even more closely in touch with the earth.
```
[19.35448]
[18.162758]
```
Dwarves, but even more closely in touch with the earth.
```

Replacement in crawl-ref/docs/changes.stone_soup at line 69 [18.210753]

B:BD[24.2881] → [3.3305:3371]

* Added +1 damage bonus for orcs and dwarfs throwing racial gear.

[24.2881]

[25.4687]

* Added +1 damage bonus for orcs and dwarves throwing racial gear.