Fix: thiefstone put items into a bag of tricks

Bags of tricks for some reason return true from Is_container despite not
actually being usable as one. This meant that thiefstones could teleport
items into a bag of tricks, which could then not easily be gotten out
(it was possible, via wand of opening or polymorphing the bag, but this
was certainly not intended in the first place).

Adding an exception so bags of tricks don't count as containers breaks
them in several ways, however, so instead I changed thiefstone behavior
such that they now ignore bags completely. It's cleaner this way (rather
than special-casing an exception only for bags of tricks) and slightly
more thematic; sending items to a treasure chest makes more sense than a
"treasure bag".

Author: copperwater

src/dokick.c

@@ -1885,22 +1885,27 @@ obj_delivery(boolean near_hero)
         if (nx > 0) {
             if (where == MIGR_THIEFSTONE && Fits_in_container(otmp)) {
                 struct obj* cobj;
-                boolean found_container = FALSE;
-                /* put into a container on this spot, if possible */
+                boolean found_box = FALSE;
+                /* put into a box on this spot, if possible;
+                 * only allow putting into boxes rather than bags because if
+                 * bags are allowed, it creates weirdness like safely nesting a
+                 * bag of holding into another, or putting items into a bag of
+                 * tricks (Is_container is true for them!) from which they
+                 * can't be removed */
                 cobj = svl.level.objects[nx][ny];
                 for (; cobj; cobj = cobj->nexthere) {
-                    if (Is_container(cobj)) {
+                    if (Is_box(cobj)) {
                         if (obj_is_burning(otmp))
                             end_burn(otmp, TRUE);
                         add_to_container(cobj, otmp);
                         cobj->owt = weight(cobj);
                         cobj->cknown = 0; /* contents have changed out of
                                            * sight of the hero */
-                        found_container = TRUE;
+                        found_box = TRUE;
                         break;
                     }
                 }
-                if (found_container)
+                if (found_box)
                     continue;
                 /* if no containers here, continue normally */
             }

src/mkobj.c

@@ -4136,6 +4136,7 @@ choose_thiefstone_loc(coord *cc)
             }
             if (levl[x][y].typ == ROOM || levl[x][y].typ == CORR ||
                 levl[x][y].typ == SCORR) {
+                struct obj *otmp;
                 /* other terrain might be walkable but we don't want to put it
                  * on another feature */
                 quality += 2;
@@ -4146,8 +4147,14 @@ choose_thiefstone_loc(coord *cc)
                     && levl[x][y].is_niche) {
                     quality += 20;
                 }
-                if (container_at(x, y, FALSE)) {
-                    quality += 15;
+                /* modified version of container_at that ignores bags because
+                 * thiefstone can't put items into bags */
+                for (otmp = svl.level.objects[x][y]; otmp;
+                     otmp = otmp->nexthere) {
+                    if (Is_box(otmp)) {
+                        quality += 15;
+                        break;
+                    }
                 }
             }
             if (levl[x][y].typ == STAIRS) {
@@ -4325,9 +4332,11 @@ static const struct icp statue_materials[] = {
     { 1, GOLD}
 };
 static const struct icp figurine_materials[] = {
-    {45, MINERAL},
-    {35, WOOD},
-    {10, PLASTIC},
+    {40, MINERAL},
+    {30, WOOD},
+    {10, BONE},
+    { 5, PLASTIC},
+    { 5, GLASS},
     { 5, METAL},
     { 4, COPPER},
     { 1, GOLD}

src/pickup.c

@@ -1934,7 +1934,7 @@ thiefstone_teleport(struct obj* stone, struct obj* obj, boolean dobill)
             /* put into a container on this spot, if possible */
             for (cobj = svl.level.objects[obj->ox][obj->oy]; cobj;
                  cobj = cobj->nexthere) {
-                if (Is_container(cobj)) {
+                if (Is_box(cobj)) {
                     if (obj_is_burning(obj))
                         end_burn(obj, TRUE);
                     add_to_container(cobj, obj);