Update terminology for Cartomancer.

In this commit I tried to tidy up how the Cart's card descriptions are implemented. I noticed that the inventory looks a bit more clogged up with descriptions than it needs to be. Instead of 'spell card', we just say card'. Instead of monster card, we say summon card. If the card is unknown, we'll display the rarity, but after it's known the rarity feels a bit redundant. Also, spellbooks are rulebooks, because cardplayers are obsessed with rules...

I also updated some of the item descriptions. I didn't like large boxes being renamed to deckboxes, or the lockpick being renamed - so I reverted those. Instead of the large box rename, I renamed some bags to variations oof deckboxes since the player will more likely carry around a bag than a large box.

Other miscellaneous fixes to plurals and inventory bits.

dat/quest.txt

@@ -804,7 +804,7 @@ lack of a deck?"
 "Tsk tsk tsk, %c. I really expected better from you."
 %E
 %Cp Car 00062
-"%l only cast me from the school because I was too skillful!"
+"%lC only cast me from the school because I was too skillful!"
 %E
 %Cp Car 00063
 "Love for your cards? Don't make me laugh. I shall defeat you through

src/invent.c

@@ -4247,7 +4247,7 @@ STATIC_VAR NEARDATA const char *names[] = {
 };
 static NEARDATA const char *carnames[] = {
     0, "Illegal objects", "Weapons", "Armor", "Rings", "Amulets", "Tools",
-    "Comestibles", "Potions", "Spell Cards", "Spellbooks", "Wands", "Coins", 
+    "Comestibles", "Potions", "Spell Cards", "Rulebooks", "Wands", "Coins", 
     "Gems/Stones", "Boulders/Statues", "Iron balls", "Chains", "Venoms",
     "Spirits"
 };

src/objnam.c

@@ -92,14 +92,33 @@ STATIC_OVL struct Jitem Pirate_items[] = {
     { ROBE, "long clothes" },
     { 0, "" } 
 };
+
 static struct Jitem Cartomancer_items[] = {
-    { LARGE_BOX, "deck box" },
-    { LOCK_PICK, "worthless card" },
+    /*{ LARGE_BOX, "deck box" },*/
+    /*{ LOCK_PICK, "worthless card" },*/
+
     { SHURIKEN, "razor card" },
+    { BOOMERANG, "warped card" },
+
     { HAWAIIAN_SHIRT, "graphic tee" },
+
     { EXPENSIVE_CAMERA, "holographic card" },
     { CREDIT_CARD, "banned card" },
+
     { SACK, "card bag" },
+    { OILSKIN_SACK, "waterproof deckbox" },
+    { BAG_OF_HOLDING, "professional deckbox" },
+    { BAG_OF_RATS, "tricky card bag" },
+    { BAG_OF_TRICKS, "ratty card bag" },
+#if 0
+    { LUCKSTONE, "lucky card" },
+    { HEALTHSTONE, "health insurance card" },
+    { LOADSTONE, "heavy card" },
+    { TOUCHSTONE, "siliceous card" },
+    { WHETSTONE, "diamond coated card" },
+    { FLINT, "flint card" },
+    { SLING_BULLET, "heavy die" },
+#endif
     { 0, "" } 
 };
 
@@ -232,17 +251,14 @@ register int otyp;
         Strcpy(buf, Role_if(PM_PIRATE) ? "bottle": "potion");
         break;
     case SCROLL_CLASS:
-        if (Role_if(PM_CARTOMANCER))
-            Strcpy(buf, "spell card");
-        else
-            Strcpy(buf, "scroll");
+        Strcpy(buf, Role_if(PM_CARTOMANCER) ? "card": "scroll");
         break;
     case WAND_CLASS:
         Strcpy(buf, "wand");
         break;
     case SPBOOK_CLASS:
         if (otyp != SPE_NOVEL) {
-            Strcpy(buf, "spellbook");
+            Strcpy(buf, Role_if(PM_CARTOMANCER) ? "rulebook": "spellbook");
         } else {
             Strcpy(buf, !nn ? "book" : "novel");
             nn = 0;
@@ -300,7 +316,11 @@ register int otyp;
 
     if (Role_if(PM_PIRATE))
         buf = (char *) replace(buf, "potion", "bottle");
-
+
+    if (Role_if(PM_CARTOMANCER)) {
+        buf = (char *) replace(buf, "scroll", "card");
+        buf = (char *) replace(buf, "spellbook", "rulebook");
+    }
     return buf;
 }
 
@@ -1085,7 +1105,14 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
         break;
     case SCROLL_CLASS:
         if (Role_if(PM_CARTOMANCER)) {
-            Strcpy(buf, Cartomancer_rarity(typ));
+            if (!dknown || obj->corpsenm != NON_PM)
+                Strcpy(buf, Cartomancer_rarity(typ));
+            else
+                Strcpy(buf, "card");
+            if (obj->quan > 1) {
+                Strcat(buf, "s");
+                pluralize = FALSE;
+            }
         } else
             Strcpy(buf, "scroll");
         if (!dknown)
@@ -1129,15 +1156,19 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
             break;
             /* end of tribute */
         } else if (!dknown) {
-            Strcpy(buf, "spellbook");
+            Strcpy(buf, Role_if(PM_CARTOMANCER) 
+                ? "rulebook": "spellbook");
         } else if (nn) {
             if (typ != SPE_BOOK_OF_THE_DEAD)
-                Strcat(buf, "spellbook of ");
+                Strcat(buf, Role_if(PM_CARTOMANCER) 
+                    ? "rulebook of ": "spellbook of ");
             Strcat(buf, actualn);
         } else if (un) {
-            xcalled(buf, BUFSZ - PREFIX, "spellbook", un);
+            xcalled(buf, BUFSZ - PREFIX, Role_if(PM_CARTOMANCER) 
+                ? "rulebook": "spellbook", un);
         } else
-            Sprintf(eos(buf), "%s spellbook", dn);
+            Sprintf(eos(buf), "%s %s", dn, Role_if(PM_CARTOMANCER) 
+                ? "rulebook": "spellbook");
         break;
     case RING_CLASS:
         if (dknown) {
@@ -5856,17 +5887,17 @@ Cartomancer_rarity(int otyp)
 {
     int price = objects[otyp].oc_cost;
     if (otyp == SCR_CREATE_MONSTER)
-        return "monster card";
+        return "summon card";
     else if (price < 60)
-        return flags.verbose ? "common spell card" : "common card";
+        return "common card";
     else if (price < 100)
-        return flags.verbose ? "uncommon spell card" : "uncommon card";
+        return "uncommon card";
     else if (price < 200)
-        return flags.verbose ? "rare spell card" : "rare card";
+        return "rare card";
     else if (price < 300)
-        return flags.verbose ? "legendary spell card" : "legendary card";
+        return "legendary card";
     else
-        return flags.verbose ? "mythic spell card" : "mythic card";
+        return "mythic card";
 
 }
 /*objnam.c*/

src/pline.c

@@ -194,7 +194,6 @@ const char *orig;
     orig = replace(orig, "read the scroll", "play the spell card");
     orig = replace(orig, " reads a", " plays a");
     orig = replace(orig, "scroll", "spell card");
-    orig = replace(orig, "scroll of genocide", "forbidden spell card");
     return orig;
 }