fiddlerwoaroof/crawl - Change 3ZUPHPFVGLZ6GPKZ4NSFUX5Z4FUQCE7NJX2EUNN2AXARWOXX7U7AC

Change skill titles as discussed in FR 1957095. There might have to be a

second round tweaking them some more.

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

Created by j-p-e-g on May 24, 2008

3ZUPHPFVGLZ6GPKZ4NSFUX5Z4FUQCE7NJX2EUNN2AXARWOXX7U7AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/skills2.cc at line 43 [4.647133]

B:BD[4.648084] → [4.648084:648357]

/* jmf: some references for words I used below:
 Peltast http://www.geocities.com/Athens/Aegean/9659/shields_main.htm
 Phalangite http://www.users.cts.com/funtv/j/jjartist/EpiroteScenario1.htm
 Yeoman: http://snt.student.utwente.nl/campus/sagi/artikel/longbow/longbow.html

[4.648084]

[4.648357]

/* Basic goals for titles:
   The higher titles must be come last.
   Referring to the skill itself is fine ("Transmuter") but not impressive.
   No overlaps, high diversity.

Replacement in crawl-ref/source/skills2.cc at line 55 [4.647133]

∅:D[5.72154] → [4.648617:648872]

B:BD[4.648617] → [4.648617:648872]

    {"Fighting", "Skirmisher", "Grunt", "Veteran", "Warrior", "Slayer"},      // 0
    {"Short Blades", "Stabber", "Cutter", "Knifefighter", "Eviscerator", "Blademaster"},
    {"Long Blades", "Slasher", "Slicer", "Fencer", "Swordfighter", "Swordmaster"},

[5.72154]

[4.648872]

    {"Fighting", "Skirmisher", "Fighter", "Warrior", "Slayer", "Conqueror"},               // 0
    {"Short Blades", "Cutter", "Slicer", "Swashbuckler", "Blademaster", "Eviscerator"},
    {"Long Blades", "Slasher", "Carver", "Fencer", "%s Blade", "Swordmaster"},

Replacement in crawl-ref/source/skills2.cc at line 59 [4.647133]

B:BD[4.648935] → [4.648935:649623]

B:BD[4.649623] → [6.475:555]

∅:D[6.555] → [4.649703:649704]

∅:D[7.159622] → [4.649703:649704]

B:BD[4.649703] → [4.649703:649704]

    {"Axes", "Chopper", "Cleaver", "Hacker", "Severer", "Axe Maniac"},
    {"Maces & Flails", "Basher", "Cudgeler", "Shatterer", "Bludgeoner", "Skullcrusher"},   // 5
    {"Polearms", "Spear-Bearer", "Pike-%s", "Phalangite", "Lancer", "Halberdier"},
    {"Staves", "Twirler", "Cruncher", "Smasher", "Stickfighter", "Skullbreaker"},
    {"Slings", "Vandal", "Slinger", "Whirler", "Crazy %s", "Very Crazy %s"},
    {"Bows", "Shooter", "Yeoman", "Archer", "Merry %s", "Merry %s"},
    {"Crossbows", "Shooter", "Sharpshooter", "Archer", "%s Ballista", "%s Ballista"},     // 10
    {"Darts", "Dart Thrower", "Hurler", "Hurler, First Class", "%s Darts Champion", "Universal Darts Champion"},
    {"Throwing", "Chucker", "Thrower", "Deadly Accurate", "Hawkeye", "Sniper"},

[4.648935]

[4.649704]

    {"Axes", "Chopper", "Cleaver", "Hacker", "Severer", "Executioner"},
    {"Maces & Flails", "Cudgeler", "Basher", "Bludgeoner", "Shatterer", "Skullcrusher"},   // 5
    {"Polearms", "Poker", "Spear-Bearer", "Impaler", "Phalangite", "%s Porcupine"},
    {"Staves", "Twirler", "Cruncher", "Stickfighter", "Pulverizerr", "Chief of Staff"},
    {"Slings", "Vandal", "Slinger", "Whirler", "Slingshot", "%s Catapult"},
    {"Bows", "Shooter", "Archer", "Marks%s", "Crack Shot", "Merry %s"},
    {"Crossbows", "Bolt Thrower", "Quickloader", "Sharpshooter", "Sniper", "%s Arbalest"}, // 10
    {"Darts", "Dart Thrower", "Hurler", "Hedgehog", "Darts Champion", "Perforator"},
    {"Throwing", "Chucker", "Thrower", "Deadly Accurate", "Hawkeye", "%s Ballista"},

Replacement in crawl-ref/source/skills2.cc at line 69 [4.647133]

B:BD[4.649787] → [4.649787:649927]

    {"Dodging", "Ducker", "Dodger", "Nimble", "Spry", "Acrobat"},
    {"Stealth", "Footpad", "Sneak", "Covert", "Unseen", "Imperceptible"},

[4.649787]

[4.649927]

    {"Dodging", "Ducker", "Nimble", "Spry", "Acrobat", "Intangible"},
    {"Stealth", "Sneak", "Covert", "Unseen", "Imperceptible", "Ninja"},                    // 15

Replacement in crawl-ref/source/skills2.cc at line 72 [4.647133]

B:BD[4.650014] → [4.650014:650187]

    {"Shields", "Shield-Bearer", "Blocker", "%s Barricade", "Peltast", "Hoplite"},
    {"Traps & Doors", "Disarmer", "Trapper", "Architect", "Engineer", "Dungeon Master"},

[4.650014]

[4.650187]

    {"Shields", "Shield-Bearer", "Hoplite", "Blocker", "Peltast", "%s Barricade"},
    {"Traps & Doors", "Scout", "Disarmer", "Vigilant", "Perceptive", "Dungeon Master"},

Replacement in crawl-ref/source/skills2.cc at line 75 [4.647133]

B:BD[4.650252] → [4.650252:650332]

    {"Unarmed Combat", "Ruffian", "Grappler", "Brawler", "Wrestler", "Boxer" },

[4.650252]

[4.650332]

    {"Unarmed Combat", "Ruffian", "Grappler", "Brawler", "Wrestler", "%sweight Champion"},

Replacement in crawl-ref/source/skills2.cc at line 83 [4.647133]

B:BD[4.650559] → [4.650559:650657]

    {"Spellcasting", "Magician", "Thaumaturge", "Eclecticist", "Sorcerer", "Archmage"},     // 25

[4.650559]

[2.149]

    {"Spellcasting", "Magician", "Thaumaturge", "Eclecticist", "Sorcerer", "Archmage"},    // 25

Replacement in crawl-ref/source/skills2.cc at line 88 [4.647133]

B:BD[4.651014] → [4.651014:651206]

    {"Translocations", "Jumper", "Blinker", "Shifter", "Portalist", "Plane Walker"},       // 30
    {"Transmigration", "Changer", "Transmogrifier", "Transformer", "Alchemist", "Transmuter"},

[4.651014]

[4.651206]

    {"Translocations", "Grasshopper", "Placeless %s", "Blinker", "Portalist", "Plane %s"}, // 30
    {"Transmigration", "Changer", "Transmogrifier", "Alchemist", "Malleable", "Shapeless %s"},

Replacement in crawl-ref/source/skills2.cc at line 93 [4.647133]

B:BD[4.651364] → [4.651364:651539]

    {"Ice Magic", "Chiller", "Frost Mage", "Ice Mage", "Cryomancer", "Englaciator"},
    {"Air Magic", "Wind Mage", "Cloud Mage", "Air Mage", "Sky Mage", "Storm Mage"}, // 35

[4.651364]

[4.651539]

    {"Ice Magic", "Chiller", "Frost Mage", "Gelid", "Cryomancer", "Englaciator"},
    {"Air Magic", "Gusty", "Cloud Mage", "Aerator", "Anemomancer", "Meteorologist"},       // 35

Replacement in crawl-ref/source/skills2.cc at line 96 [4.647133]

B:BD[4.651632] → [4.651632:651716]

    {"Poison Magic", "Stinger", "Tainter", "Polluter", "Poisoner", "Envenomancer"},

[4.651632]

[4.651716]

    {"Poison Magic", "Stinger", "Tainter", "Polluter", "Contaminator", "Envenomancer"},

Replacement in crawl-ref/source/skills2.cc at line 98 [4.647133]

B:BD[4.651717] → [4.651717:651806]

    {"Invocations", "Believer", "Servant", "Worldly Agent", "Theurge", "Avatar"},  // 38

[4.651717]

[4.651806]

    {"Invocations", "Believer", "Agitator", "Worldly Agent", "Theurge", "Avatar"},  // 38

Replacement in crawl-ref/source/skills2.cc at line 117 [4.647133]

B:BD[4.652539] → [4.652539:652631]

    {"Unarmed Combat", "Martial Artist", "Black Belt", "Sensei", "Master", "Grand Master"};

[4.652539]

[4.652631]

    {"Unarmed Combat", "Insei", "Martial Artist", "Black Belt", "Sensei", "Grand Master"};

Insertion in crawl-ref/source/skills2.cc at line 119 [4.647133]

[4.652632]

const char *atheist_inv_titles[6] =
    {"Invocations", "Unbeliever", "Agnostic", "Dissident", "Heretic", "Apostate"};

Replacement in crawl-ref/source/skills2.cc at line 1919 [4.647133]

∅:D[3.1772] → [4.732983:733059]

B:BD[4.732983] → [4.732983:733059]

        || (best_skill > SK_UNARMED_COMBAT && best_skill < SK_SPELLCASTING)

[3.1772]

[4.733059]

        || best_skill > SK_UNARMED_COMBAT && best_skill < SK_SPELLCASTING

Replacement in crawl-ref/source/skills2.cc at line 1962 [4.647133]

B:BD[4.734225] → [8.1903:1939]

                result = "Godless";

[4.734225]

[3.1877]

                result = atheist_inv_titles[skill_rank];
            else if (god == GOD_TROG || god == GOD_XOM
                     || god == GOD_NEMELEX_XOBEH)
            {
                // don't care about Invocations
                result = "Prodigal";
            }

Replacement in crawl-ref/source/skills2.cc at line 1980 [4.647133]
B:BD[8.2135] → [8.2135:2173]
```
    if ( where != std::string::npos )
```
[8.2135]
[4.734595]
```
    if (where != std::string::npos)
```

Replacement in crawl-ref/source/skills2.cc at line 1982 [4.647133]

B:BD[4.734601] → [8.2174:2431]

        const bool need_cap = (where == 0 && best_skill != SK_NECROMANCY);
        const std::string sp = species_name(static_cast<species_type>(species),
                                            0, true, need_cap);
        result.replace(where, 2, sp);

[4.734601]

[4.734933]

        if (best_skill == SK_UNARMED_COMBAT)
        {
            std::string weightclass = "";
            switch (species)
            {
            case SP_OGRE:
            case SP_OGRE_MAGE:
            case SP_TROLL:
                weightclass = "Heavy";
                break;
            case SP_NAGA:
            case SP_CENTAUR:
                weightclass = "Cruiser";
                break;
            default:
                weightclass = "Middle";
                break;
            case SP_HIGH_ELF:
            case SP_GREY_ELF:
            case SP_DEEP_ELF:
            case SP_SLUDGE_ELF:
            case SP_KENKU:
                weightclass = "Little";
                break;
            case SP_HALFLING:
            case SP_GNOME:
            case SP_KOBOLD:
                weightclass = "Feather";
                break;
            case SP_SPRIGGAN:
                weightclass = "Fly";
                break;
            }
            result.replace(where, 2, weightclass);
        }
        else if (best_skill == SK_TRANSLOCATIONS && skill_rank == 5)
        {
            result.replace(where, 2, (species == SP_NAGA ? "Slider"
                                                         : "Walker"));
        }
        else
        {
            const bool need_cap = (best_skill != SK_BOWS);
            const std::string sp = species_name(static_cast<species_type>(species),
                                                0, true, need_cap);
            result.replace(where, 2, sp);
        }

Replacement in crawl-ref/source/skills2.cc at line 2035 [4.647133]

B:BD[4.734939] → [8.2432:2499]

    return result.empty() ? std::string("Invalid Title") : result;

[4.734939]

[8.2499]

    return (result.empty() ? std::string("Invalid Title")
                           : result);