fiddlerwoaroof/crawl - Change V4F3SDV2H4HBH6G6W5M3REN3BDSSE4IDF2RNM7PJMKRW3IDJ7PNAC

Change colouring of sacrifice messages to colour the entire message

rather than only a portion of it. Also tidy up Ely's destruction code and print the evil weapon destruction message in addition to the normal one, so you know which one Ely was so happy about.

And use the non-blessed weapon tiles for the blessed blade also for building the player doll.

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

Created by j-p-e-g on April 22, 2008

V4F3SDV2H4HBH6G6W5M3REN3BDSSE4IDF2RNM7PJMKRW3IDJ7PNAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile1.cc at line 2974 [5.96318]

B:BD[4.25734] → [4.25734:26581]

    case WPN_KNIFE:         return TILEP_HAND1_DAGGER_SLANT;
    case WPN_DAGGER:        return TILEP_HAND1_DAGGER_SLANT;
    case WPN_SHORT_SWORD:   return TILEP_HAND1_SHORT_SWORD_SLANT;
    case WPN_LONG_SWORD:    return TILEP_HAND1_LONG_SWORD_SLANT;
    case WPN_GREAT_SWORD:   return TILEP_HAND1_GREAT_SWORD_SLANT;
    case WPN_SCIMITAR:      return TILEP_HAND1_SCIMITAR;
    case WPN_FALCHION:      return TILEP_HAND1_FALCHION;
    case WPN_SABRE:         return TILEP_HAND1_SABRE;
    case WPN_DEMON_BLADE:   return TILEP_HAND1_SWORD_BLACK;
    case WPN_QUICK_BLADE:   return TILEP_HAND1_DAGGER;
    case WPN_KATANA:        return TILEP_HAND1_KATANA_SLANT;
    case WPN_DOUBLE_SWORD:  return TILEP_HAND1_DOUBLE_SWORD;
    case WPN_TRIPLE_SWORD:  return TILEP_HAND1_TRIPLE_SWORD;
    case WPN_BLESSED_BLADE: return TILEP_HAND1_BLESSED_BLADE;

[4.25734]

[5.184277]

    case WPN_KNIFE:                 return TILEP_HAND1_DAGGER_SLANT;
    case WPN_DAGGER:                return TILEP_HAND1_DAGGER_SLANT;
    case WPN_SHORT_SWORD:           return TILEP_HAND1_SHORT_SWORD_SLANT;
    case WPN_LONG_SWORD:            return TILEP_HAND1_LONG_SWORD_SLANT;
    case WPN_GREAT_SWORD:           return TILEP_HAND1_GREAT_SWORD_SLANT;
    case WPN_SCIMITAR:              return TILEP_HAND1_SCIMITAR;
    case WPN_FALCHION:              return TILEP_HAND1_FALCHION;
    case WPN_SABRE:                 return TILEP_HAND1_SABRE;
    case WPN_DEMON_BLADE:           return TILEP_HAND1_SWORD_BLACK;
    case WPN_QUICK_BLADE:           return TILEP_HAND1_DAGGER;
    case WPN_KATANA:                return TILEP_HAND1_KATANA_SLANT;
    case WPN_DOUBLE_SWORD:          return TILEP_HAND1_DOUBLE_SWORD;
    case WPN_TRIPLE_SWORD:          return TILEP_HAND1_TRIPLE_SWORD;
    case WPN_BLESSED_BLADE:         return TILEP_HAND1_BLESSED_BLADE;
    // new blessed blades
    case WPN_BLESSED_LONG_SWORD:    return TILEP_HAND1_LONG_SWORD_SLANT;
    case WPN_BLESSED_GREAT_SWORD:   return TILEP_HAND1_GREAT_SWORD_SLANT;
    case WPN_BLESSED_SCIMITAR:      return TILEP_HAND1_SCIMITAR;
    case WPN_BLESSED_FALCHION:      return TILEP_HAND1_FALCHION;
    case WPN_BLESSED_KATANA:        return TILEP_HAND1_KATANA_SLANT;
    case WPN_BLESSED_DOUBLE_SWORD:  return TILEP_HAND1_DOUBLE_SWORD;
    case WPN_BLESSED_TRIPLE_SWORD:  return TILEP_HAND1_TRIPLE_SWORD;

Replacement in crawl-ref/source/religion.cc at line 176 [8.804403]

B:BD[6.1365] → [7.2887:3053]

         " disappear% <>without a glow</>.",
         " <>glow% slightly</> and disappear%.",
         " <>glow% with a rainbow of weird colours</> and disappear%.",

[6.1365]

[6.1474]

         " disappear% without a glow.",
         " glow% slightly and disappear%.",
         " glow% with a rainbow of weird colours and disappear%.",

Replacement in crawl-ref/source/religion.cc at line 182 [8.804403]

B:BD[6.1488] → [7.3128:3235]

B:BD[7.3235] → [3.2523:2580]

∅:D[9.2570] → [7.3280:3393]

∅:D[10.2580] → [7.3280:3393]

∅:D[3.2580] → [7.3280:3393]

B:BD[7.3280] → [7.3280:3393]

        " <>barely shimmer%</> and break% into pieces.",
        " <>shimmer%</> and break% into pieces.",
        " <>shimmer% wildly</> and break% into pieces.",
        // " <>slowly evaporate%</>.",
        // " <>evaporate%</>.",
        // " <>glow% and evaporate%</>.",

[6.1488]

[6.1543]

        " barely shimmer% and break% into pieces.",
        " shimmer% and break% into pieces.",
        " shimmer% wildly and break% into pieces.",

Insertion in crawl-ref/source/religion.cc at line 2436 [8.804403]

[2.3793]

[11.447]

}
// Is the destroyed weapon valuable enough to gain piety by doing so?
// Evil weapon are handled specially.
static bool _destroyed_valuable_weapon(int value, int type)
{
    // Artefacts (incl. most randarts).
    if (random2(value) >= random2(250))
        return true;
    // Medium valuable items are more likely to net piety at low piety.
    // This includes missiles in sufficiently large quantities.
    if (random2(value) >= random2(100)
        && one_chance_in(1 + you.piety/50))
    {
        return true;
    }
    // If not for the above, missiles shouldn't yield piety.
    if (type == OBJ_MISSILES)
        return false;
    // Weapons, on the other hand, are always acceptable to boost low piety.
    if (you.piety < 30 || player_under_penance())
        return true;
    return false;

Replacement in crawl-ref/source/religion.cc at line 2479 [8.804403]

B:BD[12.1053] → [13.172:221]

            && mitm[i].base_type != OBJ_MISSILES

[12.1053]

[13.221]

                && mitm[i].base_type != OBJ_MISSILES

Replacement in crawl-ref/source/religion.cc at line 2491 [8.804403]

B:BD[12.1606] → [2.3794:3829]

        if (is_evil_item(mitm[i]))

[12.1606]

[12.1761]

        piety_gain_t pgain = PIETY_NONE;
        bool is_evil_weapon = is_evil_item(mitm[i]);
        if (is_evil_weapon
            || _destroyed_valuable_weapon(value, mitm[i].base_type))

Replacement in crawl-ref/source/religion.cc at line 2496 [8.804403]

B:BD[12.1771] → [14.2548:2675]

            simple_god_message(" welcomes the destruction of this evil weapon.",
                               GOD_ELYVILON);

[12.1771]

[15.529]

            pgain = PIETY_SOME;

Deletion in crawl-ref/source/religion.cc at line 2499 [8.804403]

B:BD[12.1812] → [14.2676:2699]

B:BD[14.2699] → [7.3475:3520]

∅:D[7.3520] → [14.2731:3055]

B:BD[14.2731] → [14.2731:3055]

B:BD[14.3055] → [7.3521:3557]

∅:D[7.3557] → [14.3085:3130]

B:BD[14.3085] → [14.3085:3130]

        else
        {
            piety_gain_t pgain = PIETY_NONE;
            if (random2(value) >= random2(250) // artefacts (incl. most randarts)
                || (random2(value) >= random2(100)
                    && one_chance_in(1 + you.piety/50))
                || (mitm[i].base_type == OBJ_WEAPONS
                    && (you.piety < 30 || player_under_penance())))
            {
                pgain = PIETY_SOME;
                gain_piety(1);
            }

Replacement in crawl-ref/source/religion.cc at line 2500 [8.804403]

B:BD[11.805] → [7.3558:3748]

            // Elyvilon doesn't care about item sacrifices at altars, so
            // I'm stealing _Sacrifice_Messages.
            _print_sacrifice_message(GOD_ELYVILON, mitm[i], pgain);

[11.805]

[14.3502]

        // Elyvilon doesn't care about item sacrifices at altars, so
        // I'm stealing _Sacrifice_Messages.
        _print_sacrifice_message(GOD_ELYVILON, mitm[i], pgain);
        if (is_evil_weapon)
        {
            simple_god_message(" welcomes the destruction of this evil weapon.",
                               GOD_ELYVILON);

Deletion in crawl-ref/source/religion.cc at line 4170 [8.804403]
B:BD[7.4791] → [7.4791:4862]
```
    _replace(msg, "<>", tag_start);
    _replace(msg, "</>", tag_end);
```
Insertion in crawl-ref/source/religion.cc at line 4172 [8.804403]
[9.3132]
[7.4911]
```
    msg = tag_start + msg + tag_end;
```

Replacement in crawl-ref/source/religion.cc at line 4562 [8.804403]

B:BD[8.882889] → [16.163:237]

    if (!yesno( info, true, 'n' ) || !yesno("Are you sure?", false, 'n'))

[8.882889]

[8.882913]

    if (!yesno( info, false, 'n' ) || !yesno("Are you sure?", false, 'n'))