diff -i smaug14/src/shops.c  smaug18/src/shops.c
8c8
<  * Tricops and Fireblade                                      |             *
---
>  * Tricops, Fireblade, Edmond, Conran                         |             *
66c66
<               do_shout( keeper, buf );
---
>               do_yell( keeper, buf );
74c74
<               do_shout( keeper, buf );
---
>               do_yell( keeper, buf );
190c190
<               do_shout( keeper, buf );
---
>               do_yell( keeper, buf );
198c198
<               do_shout( keeper, buf );
---
>               do_yell( keeper, buf );
400c400,405
<                       cost = ( int ) ( obj->cost * rShop->profit_fix / 1000 );
---
>                       if ( obj->item_type == ITEM_ARMOR && obj->cost == 0 )
>                               cost = ( int ) ( ( obj->pIndexData->cost * 66 ) / 100 * rShop->profit_fix / 1000 );
>                       else if ( obj->item_type == ITEM_WEAPON && obj->cost == 0 )
>                               cost = ( int ) ( ( obj->pIndexData->cost * 66 ) / 100 * rShop->profit_fix / 1000 );
>                       else
>                               cost = ( int ) ( obj->cost * rShop->profit_fix / 1000 );
455c460
<       if ( IS_SET( ch->in_room->room_flags, ROOM_PET_SHOP ) )
---
>       if ( xIS_SET( ch->in_room->room_flags, ROOM_PET_SHOP ) )
669a675,676
>               mprog_sell_trigger( keeper, ch, obj );
> 
701c708
<       if ( IS_SET( ch->in_room->room_flags, ROOM_PET_SHOP ) )
---
>       if ( xIS_SET( ch->in_room->room_flags, ROOM_PET_SHOP ) )
956c963
<               ch_printf( ch, "You can't let go of %s.\n\r", obj->name );
---
>               ch_printf( ch, "You can't let go of %s.\n\r", obj->short_descr );
972c979
<                       cost == 1 ? "" : "s", fixstr, obj->name );
---
>                       cost == 1 ? "" : "s", fixstr, obj->short_descr );
1081c1088
< 
---
>               {
1083c1090
<                               ch_printf( ch, "You can't let go of %s.\n\r", obj->name );
---
>                               ch_printf( ch, "You can't let go of %s.\n\r", obj->short_descr );
1095c1102
<                                       cost, cost == 1 ? "" : "s", fixstr, obj->name );
---
>                                       cost, cost == 1 ? "" : "s", fixstr, obj->short_descr );
1098a1106
>               }
1185c1193
<       sh_int vnum;
---
>       int vnum;
1231c1239
<       sh_int vnum;
---
>       int vnum;
1412c1420
<       sh_int vnum;
---
>       int vnum;
1472c1480
<       sh_int vnum;
---
>       int vnum;
1518c1526
<       sh_int vnum;
---
>       int vnum;
1671c1679
<       sh_int vnum;
---
>       int vnum;