diff -i smaug14/src/act_move.c smaug18/src/act_move.c
8c8
< * Tricops and Fireblade | *
---
> * Tricops, Fireblade, Edmond, Conran | *
513c513
< if ( IS_SET( ch->in_room->room_flags, ROOM_NOFLOOR )
---
> if ( xIS_SET( ch->in_room->room_flags, ROOM_NOFLOOR )
680a681,691
>
> /*
> * Make them rise out of their stance when they attempt to move.
> * * This may need to be changed later if we decide they should only
> * * come out of their stance if they actually make it out of the room.
> * * SHADDAI
> */
>
> if ( ch->stance > STANCE_NONE )
> do_stance( ch, "" );
>
743c754
< if ( IS_SET( pexit->exit_info, EX_NOMOB ) && IS_NPC( ch ) )
---
> if ( IS_SET( pexit->exit_info, EX_NOMOB ) && IS_NPC( ch ) && !xIS_SET( ch->act, ACT_PET ) )
791a803,808
> if ( IS_NPC( ch ) && xIS_SET( to_room->room_flags, ROOM_NO_MOB ) && !xIS_SET( ch->act, ACT_PET ) )
> {
> act( AT_PLAIN, "Mobs can't enter there.", ch, NULL, NULL, TO_CHAR );
> return rNONE;
> }
>
806c823
< send_to_char( "A voice in your mind says, 'You are nearly ready to go that way...'", ch );
---
> send_to_char( "A voice in your mind says, 'You are nearly ready to go that way...'\n\r", ch );
810c827
< ( "A voice in your mind says, 'Soon you shall be ready to travel down this path... soon.'",
---
> ( "A voice in your mind says, 'Soon you shall be ready to travel down this path... soon.'\n\r",
825c842
< send_to_char( "A voice in your mind says, 'There is nothing more for you down that path.'", ch );
---
> send_to_char( "A voice in your mind says, 'There is nothing more for you down that path.'\n\r", ch );
1185c1202
< if ( IS_SET( ch->in_room->room_flags, ROOM_DEATH ) && !IS_IMMORTAL( ch ) )
---
> if ( xIS_SET( ch->in_room->room_flags, ROOM_DEATH ) && !IS_IMMORTAL( ch ) )
1199c1216
< if ( IS_SET( ch->in_room->room_flags, ROOM_DEATH ) && !IS_IMMORTAL( ch ) )
---
> if ( xIS_SET( ch->in_room->room_flags, ROOM_DEATH ) && !IS_IMMORTAL( ch ) )
1206c1223
< to_channel( buf, CHANNEL_MONITOR, "Monitor", LEVEL_IMMORTAL );
---
> to_channel( buf, CHANNEL_DEATH, "Death", LEVEL_IMMORTAL );
1471c1488
< if ( !IS_SET( pexit->exit_info, EX_ISDOOR ) )
---
> if ( !IS_SET( pexit->exit_info, EX_ISDOOR ) || IS_SET( pexit->exit_info, EX_DIG ) )
1575a1593,1597
> if ( IS_SET( pexit->exit_info, EX_SECRET ) && pexit->keyword && !nifty_is_name( arg, pexit->keyword ) )
> {
> ch_printf( ch, "You see no %s here.\n\r", arg );
> return;
> }
1586d1607
<
1687a1709,1714
> if ( IS_SET( pexit->exit_info, EX_SECRET ) /* added */
> && pexit->keyword && !nifty_is_name( arg, pexit->keyword ) )
> {
> ch_printf( ch, "You see no %s here.\n\r", arg );
> return;
> }
1792a1820,1825
> if ( IS_SET( pexit->exit_info, EX_SECRET ) /* added */
> && pexit->keyword && !nifty_is_name( arg, pexit->keyword ) )
> {
> ch_printf( ch, "You see no %s here.\n\r", arg );
> return;
> }
2063a2097,2098
> if ( ch->stance > STANCE_NONE )
> do_stance( ch, "" );
2108a2144,2145
> if ( ch->stance > STANCE_NONE )
> do_stance( ch, "" );
2178a2216,2217
> if ( ch->stance > STANCE_NONE )
> do_stance( ch, "" );
2209a2249
> do_look( ch, "auto" );
2239a2280
> do_look( victim, "auto" );
2259c2300
< if ( IS_SET( ch->in_room->room_flags, ROOM_DEATH ) && !IS_IMMORTAL( ch ) )
---
> if ( xIS_SET( ch->in_room->room_flags, ROOM_DEATH ) && !IS_IMMORTAL( ch ) )
2266c2307
< to_channel( buf, CHANNEL_MONITOR, "Monitor", LEVEL_IMMORTAL );
---
> to_channel( buf, CHANNEL_DEATH, "Death", LEVEL_IMMORTAL );
2271c2312
< void teleport( CHAR_DATA * ch, sh_int room, int flags )
---
> void teleport( CHAR_DATA * ch, int room, int flags )
2369c2410
< || IS_SET( pexit->to_room->room_flags, ROOM_INDOORS ) ) )
---
> || xIS_SET( pexit->to_room->room_flags, ROOM_INDOORS ) ) )
2407c2448
< && !IS_SET( pexit->to_room->room_flags, ROOM_INDOORS ) )
---
> && !xIS_SET( pexit->to_room->room_flags, ROOM_INDOORS ) )
2488c2529
< if ( ( pulse % pullfact ) != 0 )
---
> if ( ( pulse % pullfact ) == 0 )
2502a2544,2557
> if ( IS_SET( xit->exit_info, EX_CLOSED ) )
> return rNONE;
>
> /* check for tunnel */
> if ( xit->to_room->tunnel > 0 )
> {
> CHAR_DATA *ctmp;
> int count = ch->mount ? 1 : 0;
>
> for ( ctmp = xit->to_room->first_person; ctmp; ctmp = ctmp->next_in_room )
> if ( ++count >= xit->to_room->tunnel )
> return rNONE;
> }
>
2733d2787
<
2748,2758c2802
< act( AT_PLAIN, toroom, ch, NULL, dir_name[xit->vdir], TO_ROOM );
<
< /*
< * display an appropriate entrance message
< */
< if ( destrm && xit->to_room->first_person )
< {
< act( AT_PLAIN, destrm, xit->to_room->first_person, NULL, dtxt, TO_CHAR );
< act( AT_PLAIN, destrm, xit->to_room->first_person, NULL, dtxt, TO_ROOM );
< }
<
---
> act( AT_PLAIN, toroom, ch, NULL, dir_name[xit->vdir], TO_NOTVICT );
2764a2809
>
2767a2813,2818
> /*
> * display an appropriate entrance message
> */
> if ( destrm )
> act( AT_PLAIN, destrm, ch, NULL, dtxt, TO_NOTVICT );
>
2827,2828d2877
< {
< act( AT_PLAIN, objmsg, room->first_person, obj, dir_name[xit->vdir], TO_CHAR );
2830d2878
< }
2832,2833d2879
< {
< act( AT_PLAIN, destob, xit->to_room->first_person, obj, dtxt, TO_CHAR );
2835d2880
< }
2841d2885
<
2844a2889
>
2848d2892
<
2864c2908,2912
<
---
> if ( IS_SET( pexit->exit_info, EX_SECRET ) && pexit->keyword && !nifty_is_name( arg, pexit->keyword ) )
> {
> ch_printf( ch, "You see no %s here.\n\r", arg );
> return;
> }
2894d2941
<
2900d2946
<
2904d2949
<
2920c2965,2969
<
---
> if ( IS_SET( pexit->exit_info, EX_SECRET ) && pexit->keyword && !nifty_is_name( arg, pexit->keyword ) )
> {
> ch_printf( ch, "You see no %s here.\n\r", arg );
> return;
> }
2950d2998
<