fiddlerwoaroof/crawl - Change LJK4ZQATLSB4MKZG3ARZX5V6RFGTN3NLCN6GTCUGJQKU26SOXMUAC

Implementing merfolk monsters. There are two types, merfolk fighters,

and mermaids. The latter are more interesting. ;)

Whenever a mermaid sings there's a chance you get beheld, meaning you cannot move away from the mermaid, that is cannot increase the distance between you and her. (Because of the distance pecularities this means at dist 1 you can only be NSW or E of the mermaid but not the diagonal directions.) If you manage to be beheld by several mermaids at the same time, your movements have to respect the distance to all of them.

I've added a vector beheld_by that keeps track of beholding monsters and makes checking distance and updating beholding status easier.

Merfolk are immune to the mermaid song.

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

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

LJK4ZQATLSB4MKZG3ARZX5V6RFGTN3NLCN6GTCUGJQKU26SOXMUAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 1362 [10.16817]

[9.13930]

        if (loudness >= 20 && you.duration[DUR_BEHELD])
        {
            mprf("For a moment, you cannot hear the mermaid%s!",
                 you.beheld_by.size() == 1? "" : "s");
            mpr("You break out of your daze!", MSGCH_DURATION);
            you.duration[DUR_BEHELD] = 0;
            you.beheld_by.clear();
        }

Insertion in crawl-ref/source/tags.cc at line 931 [10.164589]

[11.1079]

[10.184463]

    
    // list of currently beholding monsters (usually empty)
    marshallByte(th, you.beheld_by.size());
    for (unsigned int k = 0; k < you.beheld_by.size(); k++)
         marshallByte(th, you.beheld_by[k]);

Insertion in crawl-ref/source/tags.cc at line 1271 [10.164589]

[11.1207]

[10.199467]

    
    // list of currently beholding monsters (usually empty)
    count_c = unmarshallByte(th);
    for (i = 0; i < count_c; i++)
         you.beheld_by.push_back(unmarshallByte(th));

Insertion in crawl-ref/source/spells4.cc at line 1235 [10.436250]

[10.470202]

        
    if (you.duration[DUR_BEHELD])
    {
        mpr("You break out of your daze!", MSGCH_RECOVERY);
        you.duration[DUR_BEHELD] = 0;
        you.beheld_by.clear();
    }

Insertion in crawl-ref/source/player.h at line 266 [10.945993]

[10.956579]

bool player_beheld_by( const monsters *mon );
void update_beholders( const monsters *mon, bool force = false);

Replacement in crawl-ref/source/player.cc at line 2327 [10.962854]

B:BD[10.1003460] → [10.1003460:1003531]

// to find if the square the monster is in is visible see mons_near().

[10.1003460]

[9.348272]

// to find if the square the monster is in los see mons_near().

Insertion in crawl-ref/source/player.cc at line 2337 [10.962854]

[10.1003756]

}
// returns true if player is beheld by a given monster
bool player_beheld_by( const monsters *mon )
{
    if (!you.duration[DUR_BEHELD])
        return false;
        
    // can this monster even behold you?
    if (mon->type != MONS_MERMAID)
        return false;
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "beheld_by.size: %d, DUR_BEHELD: %d, current mon: %d",
                            you.beheld_by.size(), you.duration[DUR_BEHELD],
                            monster_index(mon));
#endif
    if (you.beheld_by.empty()) // shouldn't happen
    {
        you.duration[DUR_BEHELD] = 0;
        return false;
    }
    
    for (unsigned int i = 0; i < you.beheld_by.size(); i++)
    {
         unsigned int which_mon = you.beheld_by[i];
         if (monster_index(mon) == which_mon)
             return true;
    }
    
    return false;
}
// removes a monster from the list of beholders
// if force == true (e.g. monster dead) or one of
// several cases is met
void update_beholders(const monsters *mon, bool force)
{
    if (!player_beheld_by(mon)) // not in list?
        return;
        
    // is an update even necessary?
    if (force || !mons_near(mon) || mons_friendly(mon) || mon->submerged()
        || mon->has_ench(ENCH_CONFUSION) || mons_is_paralysed(mon) || mon->asleep()
        || silenced(you.x_pos, you.y_pos) || silenced(mon->x, mon->y))
    {
        const std::vector<int> help = you.beheld_by;
        you.beheld_by.clear();
        for (unsigned int i = 0; i < help.size(); i++)
        {
             unsigned int which_mon = help[i];
             if (monster_index(mon) != which_mon)
                 you.beheld_by.push_back(i);
        }
        if (you.beheld_by.empty())
        {
            mpr("You are no longer entranced.", MSGCH_RECOVERY);
            you.duration[DUR_BEHELD] = 0;
        }
    }

Insertion in crawl-ref/source/player.cc at line 3427 [10.962854]
[10.1033533]
[10.1033533]
```
    if (you.duration[DUR_BEHELD])
        mpr( "You are beheld." );
```

Insertion in crawl-ref/source/output.cc at line 543 [10.1088282]

[10.1099941]

        }
        
        if (you.duration[DUR_BEHELD])
        {
            textcolor( RED );   // no different levels
            cprintf( "Bhld " );

Insertion in crawl-ref/source/monstuff.cc at line 425 [10.1396662]

[5.1608]

[12.7307]

    // update list of monsters beholding player
    update_beholders(monster, true);

Insertion in crawl-ref/source/monstuff.cc at line 2326 [10.1396662]
[10.1468808]
[10.1468808]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```

Replacement in crawl-ref/source/monstuff.cc at line 2335 [10.1396662]

B:BD[4.277] → [4.277:433]

            && (one_chance_in(5) || (grid_distance( monster->x, monster->y, 
                                                    you.x_pos, you.y_pos ) > 1

[4.277]

[4.433]

            && ( !player_beheld_by(monster) // no submerging if player entranced
                 && (one_chance_in(5) || (grid_distance( monster->x, monster->y,
                                         you.x_pos, you.y_pos ) > 1

Replacement in crawl-ref/source/monstuff.cc at line 2343 [10.1396662]

B:BD[4.783] → [4.783:843]

                                     && !one_chance_in(20))

[4.783]

[4.843]

                                     && (monster->type != MONS_MERMAID
                                          || you.species == SP_MERFOLK)
                                     && !one_chance_in(20)) )

Insertion in crawl-ref/source/monstuff.cc at line 2350 [10.1396662]
[13.8878]
[10.1470484]
```
            update_beholders(monster);
```

Insertion in crawl-ref/source/monstuff.cc at line 2678 [10.1396662]

[9.423559]


    case MONS_MERMAID:
    {
        // won't sing if either of you silenced, or it's friendly or confused
        if (monster->has_ench(ENCH_CONFUSION) || mons_friendly(monster)
            || silenced(monster->x, monster->y) || silenced(you.x_pos, you.y_pos))
        {
            break;
        }
        // reduce probability because of spamminess
        if (you.species == SP_MERFOLK && !one_chance_in(4))
            break;
        // a wounded invisible mermaid is less likely to give away her position
        if (monster->invisible()
            && monster->hit_points <= monster->max_hit_points / 2
            && !one_chance_in(3))
        {
            break;
        }

Insertion in crawl-ref/source/monstuff.cc at line 2700 [10.1396662]

[9.423560]

        bool already_beheld = player_beheld_by(monster);
            
        if (one_chance_in(5)
            || monster->foe == MHITYOU && !already_beheld && coinflip())
        {
            if (player_monster_visible(monster))
            {
                simple_monster_message(monster,
                    make_stringf(" chants %s song.",
                    already_beheld? "her luring" : "a haunting").c_str(),
                    MSGCH_MONSTER_SPELL);
            }
            else
            {
                // if you're already beheld by an invisible mermaid she can
                // still prolong the enchantment; otherwise you "resist"
                if (already_beheld)
                    mpr("You hear a luring song.", MSGCH_SOUND);
                else
                {
                    if (one_chance_in(4)) // reduce spamminess
                    {
                        if (coinflip())
                            mpr("You hear a haunting song.", MSGCH_SOUND);
                        else
                            mpr("You hear an eerie melody.", MSGCH_SOUND);
                            
                        canned_msg(MSG_YOU_RESIST); // flavour only
                    }
                    break;
                }
            }
                
            // once beheld by a particular monster, cannot resist anymore
            if (!already_beheld
                && (you.species == SP_MERFOLK || you_resist_magic(100)))
            {
                canned_msg(MSG_YOU_RESIST);
                break;
            }
            if (!you.duration[DUR_BEHELD])
            {
                you.duration[DUR_BEHELD] = 7;
                you.beheld_by.push_back(monster_index(monster));
                mpr("You are beheld!", MSGCH_WARN);
            }
            else
            {
                you.duration[DUR_BEHELD] += 5;
                if (!already_beheld)
                    you.beheld_by.push_back(monster_index(monster));
            }
            used = true;
            if (you.duration[DUR_BEHELD] > 12)
                you.duration[DUR_BEHELD] = 12;
        }
        break;
    }

Insertion in crawl-ref/source/monstuff.cc at line 4333 [10.1396662]
[14.8978]
[9.437708]
```
        update_beholders(monster);
        
```

Insertion in crawl-ref/source/monstuff.cc at line 4400 [10.1396662]

[15.260]

        {
            // clear list of beholding monsters
            if (you.duration[DUR_BEHELD])
            {
                you.beheld_by.clear();
                you.duration[DUR_BEHELD] = 0;
            }

Insertion in crawl-ref/source/monstuff.cc at line 4408 [10.1396662]
[15.279]
[10.1519072]
```
        }
```
Insertion in crawl-ref/source/monstuff.cc at line 5595 [10.1396662]
[10.1553127]
[10.1553127]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```

Replacement in crawl-ref/source/monplace.cc at line 107 [10.1641732]

B:BD[9.453224] → [9.453224:453278]

            || (monster_class == MONS_WATER_ELEMENTAL

[9.453224]

[9.453278]

            || ((monster_class == MONS_WATER_ELEMENTAL
                  || monster_class == MONS_MERFOLK
                  || monster_class == MONS_MERMAID)

Insertion in crawl-ref/source/monplace.cc at line 118 [10.1641732]
[9.454040]
[9.454040]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```

Insertion in crawl-ref/source/mon-util.cc at line 490 [10.1699344]

[10.1704872]


    case 'm':   // merfolk
        if (mc == MONS_MERFOLK || mc == MONS_MERMAID)
            return (true);
        return (false);

Insertion in crawl-ref/source/mon-util.cc at line 2177 [10.1699344]
[16.1312]
[10.1749942]
```
            case MONS_MERMAID:
```
Insertion in crawl-ref/source/mon-pick.cc at line 2032 [10.1767507]
[10.1809009]
[17.3104]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```
Insertion in crawl-ref/source/mon-pick.cc at line 2074 [10.1767507]
[2.521]
[17.3668]
```
    case MONS_MERFOLK:
```
Insertion in crawl-ref/source/mon-pick.cc at line 2077 [10.1767507]
[17.3688]
[2.522]
```
    case MONS_MERMAID:
        return 40;
```
Insertion in crawl-ref/source/mon-pick.cc at line 2121 [10.1767507]
[6.3362]
[10.1809379]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```
Insertion in crawl-ref/source/mon-pick.cc at line 2200 [10.1767507]
[10.1810828]
[10.1810828]
```
    case MONS_MERFOLK:
```
Insertion in crawl-ref/source/mon-pick.cc at line 2228 [10.1767507]
[10.1811304]
[10.1811304]
```
    case MONS_MERMAID:
```
Insertion in crawl-ref/source/mon-pick.cc at line 2682 [10.1767507]
[10.1819704]
[10.1819704]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```
Insertion in crawl-ref/source/mon-pick.cc at line 2706 [10.1767507]
[10.1820214]
[10.1820214]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```

Insertion in crawl-ref/source/mon-data.h at line 3986 [10.1826214]

[8.55244]

[10.1927490]


{
    MONS_MERFOLK, 'm', LIGHTBLUE, "merfolk fighter",
    M_HUMANOID | M_WARM_BLOOD | M_AMPHIBIOUS,
    MR_RES_POISON | MR_RES_COLD,
    500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3,
    { {AT_HIT, AF_PLAIN, 14}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
    { 8, 2, 4, 0 },
    4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH,
    MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
}
,
{
    MONS_MERMAID, 'm', LIGHTCYAN, "mermaid",
    M_SPELLCASTER | M_HUMANOID | M_WARM_BLOOD | M_AMPHIBIOUS,
    MR_RES_POISON | MR_RES_COLD,
    500, 10, MONS_MERMAID, MONS_MERMAID, MH_NATURAL, -5,
    { {AT_HIT, AF_PLAIN, 10}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
    { 8, 2, 4, 0 },
    4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH,
    MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
}
,

Insertion in crawl-ref/source/misc.cc at line 1246 [10.1933596]

[10.1959149]

    // clear list of beholding monsters
    if (you.duration[DUR_BEHELD])
    {
        you.beheld_by.clear();
        you.duration[DUR_BEHELD] = 0;
    }

Insertion in crawl-ref/source/makeitem.cc at line 3420 [18.927]

[18.116131]

        }
        break;
    case MONS_MERMAID:
        if (one_chance_in(3))
        {
            item_race = MAKE_ITEM_NO_RACE;
            item.base_type = OBJ_WEAPONS;
            item.sub_type = WPN_SPEAR;
        }
        break;
    case MONS_MERFOLK:
        item_race = MAKE_ITEM_NO_RACE;
        item.base_type = OBJ_WEAPONS;
        // 1/3 each for trident, spears and javelins
        if (one_chance_in(3))
            item.sub_type = WPN_TRIDENT;
        else if (coinflip())
        {
            item.sub_type = WPN_SPEAR;
            iquan = 1 + random2(3);
        }
        else
        {
            item.base_type = OBJ_MISSILES;
            item.sub_type = MI_JAVELIN;
            iquan = 3 + random2(6);

Insertion in crawl-ref/source/makeitem.cc at line 3703 [18.927]

[19.600]

[18.124052]

    if (iquan > 1 && !force_item)
        mitm[thing_created].quantity = iquan;

Insertion in crawl-ref/source/makeitem.cc at line 3785 [18.927]
[20.3060]
[3.667]
```
        case MONS_MERFOLK:
```
Replacement in crawl-ref/source/externs.h at line 496 [10.3270163]
∅:D[9.897382] → [10.3275565:3275566]
B:BD[10.3275565] → [10.3275565:3275566]
[9.897382]
[21.7991]
```
  
```
Insertion in crawl-ref/source/externs.h at line 500 [10.3270163]
[21.8080]
[22.1756]
```
  std::vector<int> beheld_by; // monsters beholding player
```
Insertion in crawl-ref/source/enum.h at line 986 [10.3287960]
[23.14707]
[23.14707]
```
    DUR_BEHELD,
```
Insertion in crawl-ref/source/enum.h at line 1561 [10.3287960]
[10.3335212]
[10.3335212]
```
    MONS_MERFOLK,
    MONS_MERMAID,     // 193
```

Insertion in crawl-ref/source/dungeon.cc at line 2549 [10.3429798]

[10.3581263]

            else if (player_in_branch( BRANCH_SHOALS ))
            {
                if (one_chance_in(3))
                    swimming_things[i] = MONS_MERFOLK;
                else if (one_chance_in(5))
                    swimming_things[i] = MONS_MERMAID;
            }

Insertion in crawl-ref/source/direct.cc at line 1847 [10.3697945]

[24.2460]

    if (player_beheld_by(mon))
        mpr("You are beheld by her song.", MSGCH_EXAMINE);

Insertion in crawl-ref/source/acr.cc at line 651 [10.4397395]

[23.16234]

[10.4412620]

        if (you.duration[DUR_BEHELD])
        {
            you.duration[DUR_BEHELD] = 0;
            you.beheld_by.clear();
        }
        you.duration[DUR_CONF] = 0;

Insertion in crawl-ref/source/acr.cc at line 2466 [10.4397395]

[25.5582]

[10.4452118]


    if ( decrement_a_duration( DUR_BEHELD, "You break out of your daze.",
                               -1, 0, NULL, MSGCH_RECOVERY ))
    {
        you.beheld_by.clear();
    }

Insertion in crawl-ref/source/acr.cc at line 3616 [10.4397395]

[23.20058]

[10.4474561]


    const int targ_x = you.x_pos + move_x;
    const int targ_y = you.y_pos + move_y;
    const dungeon_feature_type targ_grid  =  grd[ targ_x ][ targ_y ];
    const unsigned short targ_monst = mgrd[ targ_x ][ targ_y ];
    const bool          targ_solid = grid_is_solid(targ_grid);
    // cannot move away from mermaid but you CAN fight neighbouring squares
    if (you.duration[DUR_BEHELD] && !you.duration[DUR_CONF]
        && (targ_monst == NON_MONSTER || mons_is_submerged(&menv[targ_monst])))
    {   
        for (unsigned int i = 0; i < you.beheld_by.size(); i++)
        {
             coord_def pos = menv[you.beheld_by[i]].pos();
             int olddist = distance(you.x_pos, you.y_pos, pos.x, pos.y);
             int newdist = distance(you.x_pos + move_x, you.y_pos + move_y, pos.x, pos.y);
             
             if (olddist < newdist)
             {
                 mprf("You cannot move away from %s!",
                      (menv[you.beheld_by[i]]).name(DESC_NOCAP_THE, true).c_str());
                      
                 move_x = 0;
                 move_y = 0;
                 return;
             }
        }
    } // end of beholding check

Deletion in crawl-ref/source/acr.cc at line 3654 [10.4397395]
B:BD[10.4474755] → [10.4474755:4474841]
B:BD[10.4474841] → [26.16879:16949]
B:BD[26.16949] → [7.934:998]
∅:D[7.998] → [9.1280987:1281050]
B:BD[10.4475036] → [9.1280987:1281050]
∅:D[9.1281050] → [10.4475036:4475037]
B:BD[10.4475036] → [10.4475036:4475037]
```
    const int targ_x = you.x_pos + move_x;
    const int targ_y = you.y_pos + move_y;
    const dungeon_feature_type targ_grid  =  grd[ targ_x ][ targ_y ];
    const unsigned short targ_monst = mgrd[ targ_x ][ targ_y ];
    const bool          targ_solid = grid_is_solid(targ_grid);
```

Implementing merfolk monsters. There are two types, merfolk fighters,

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 1362 [10.16817]

Insertion in crawl-ref/source/tags.cc at line 931 [10.164589]

Insertion in crawl-ref/source/tags.cc at line 1271 [10.164589]

Insertion in crawl-ref/source/spells4.cc at line 1235 [10.436250]

Insertion in crawl-ref/source/player.h at line 266 [10.945993]

Replacement in crawl-ref/source/player.cc at line 2327 [10.962854]

Insertion in crawl-ref/source/player.cc at line 2337 [10.962854]

Insertion in crawl-ref/source/player.cc at line 3427 [10.962854]

Insertion in crawl-ref/source/output.cc at line 543 [10.1088282]

Insertion in crawl-ref/source/monstuff.cc at line 425 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2326 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2335 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2343 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2350 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2678 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2700 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4333 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4400 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4408 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 5595 [10.1396662]

Replacement in crawl-ref/source/monplace.cc at line 107 [10.1641732]

Insertion in crawl-ref/source/monplace.cc at line 118 [10.1641732]

Insertion in crawl-ref/source/mon-util.cc at line 490 [10.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2177 [10.1699344]

Insertion in crawl-ref/source/mon-pick.cc at line 2032 [10.1767507]

Insertion in crawl-ref/source/mon-pick.cc at line 2074 [10.1767507]

Insertion in crawl-ref/source/mon-pick.cc at line 2077 [10.1767507]

Insertion in crawl-ref/source/mon-pick.cc at line 2121 [10.1767507]

Insertion in crawl-ref/source/mon-pick.cc at line 2200 [10.1767507]

Insertion in crawl-ref/source/mon-pick.cc at line 2228 [10.1767507]

Insertion in crawl-ref/source/mon-pick.cc at line 2682 [10.1767507]

Insertion in crawl-ref/source/mon-pick.cc at line 2706 [10.1767507]

Insertion in crawl-ref/source/mon-data.h at line 3986 [10.1826214]

Insertion in crawl-ref/source/misc.cc at line 1246 [10.1933596]

Insertion in crawl-ref/source/makeitem.cc at line 3420 [18.927]

Insertion in crawl-ref/source/makeitem.cc at line 3703 [18.927]

Insertion in crawl-ref/source/makeitem.cc at line 3785 [18.927]

Replacement in crawl-ref/source/externs.h at line 496 [10.3270163]

Insertion in crawl-ref/source/externs.h at line 500 [10.3270163]

Insertion in crawl-ref/source/enum.h at line 986 [10.3287960]

Insertion in crawl-ref/source/enum.h at line 1561 [10.3287960]

Insertion in crawl-ref/source/dungeon.cc at line 2549 [10.3429798]

Insertion in crawl-ref/source/direct.cc at line 1847 [10.3697945]

Insertion in crawl-ref/source/acr.cc at line 651 [10.4397395]

Insertion in crawl-ref/source/acr.cc at line 2466 [10.4397395]

Insertion in crawl-ref/source/acr.cc at line 3616 [10.4397395]

Deletion in crawl-ref/source/acr.cc at line 3654 [10.4397395]