When attempting to tame monsters in the Black Market, you won't anger…

… everybody - it's a bit cheesy for people that don't know about it. The taming will merely have no effect. I also removed the blocking of scrolls of earth since shopkeepers can just break through boulders now.

src/dog.c

@@ -1155,6 +1155,10 @@ struct obj *obj;
     /* Taming is much harder on the Astral Plane! */
     if (Is_astralevel(&u.uz) && rn2(10))
         return FALSE;
+
+    /* No taming in the Black Market! */
+    if (Is_blackmarket(&u.uz))
+        return FALSE;
 
     /* Knights can never tame dragons of differing alignment */
     if (Role_if(PM_KNIGHT) && is_dragon(mtmp->data)

src/muse.c

@@ -2688,7 +2688,6 @@ struct monst *mtmp;
                 if (isok(x, y) && !closed_door(x, y)
                     && !IS_ROCK(levl[x][y].typ) 
                     && !IS_AIR(levl[x][y].typ)
-                    && !(Is_blackmarket(&u.uz) && rn2(2))
                     && (((x == mmx) && (y == mmy)) ? !is_blessed
                                                    : !is_cursed)
                     && (x != u.ux || y != u.uy)) {

src/read.c

@@ -1251,10 +1251,10 @@ struct obj *sobj;
     unsigned was_peaceful = mtmp->mpeaceful;
 
     /* No taming in the Black Market! */
-    if (sobj->cursed || Is_blackmarket(&u.uz)) {
-        setmangry(mtmp, FALSE);
-        if (was_peaceful && !mtmp->mpeaceful)
-            return -1;
+    if (Is_blackmarket(&u.uz)) {
+        return 0;
+    } else if (sobj->cursed) {
+        return -1;
     } else {
         if (mtmp->isshk)
             make_happy_shk(mtmp, FALSE);

src/shk.c

@@ -750,12 +750,9 @@ char *enterstring;
     }
 
     /* Visible striped prison shirt */
-    if (!Is_blackmarket(&u.uz) &&
-        (uarmu && (uarmu->otyp == STRIPED_SHIRT))
-        && !uarm
-        && !uarmc) {
+    if (!Is_blackmarket(&u.uz) && (uarmu && (uarmu->otyp == STRIPED_SHIRT))
+        && !uarm && !uarmc) 
         eshkp->pbanned = TRUE;
-    }
 
     rt = rooms[*enterstring - ROOMOFFSET].rtype;