Updated to 2023-04-30-2223

Revert more ammo patches.
Revert more books patches.
Clean up old book patch.
Fix removed traits patch.
Fix bathroom fluff patch.
Remove obsolete vacutainer patch.
Rename source patches.

1 files changed, 8 insertions, 36 deletions

diff --git a/revert-02_revert-book-revamp.patch b/revert-02_revert-book-revamp.patch
index 5888378..d932ec1 100644
--- a/revert-02_revert-book-revamp.patch
+++ b/revert-02_revert-book-revamp.patch
@@ -406,25 +406,10 @@
      "//": "The ids below represent the Aarne-Thompson System of folklore classification.  Do not change.",
      "snippet_category": [
        {
-@@ -202,473 +165,61 @@
-         "id": "fairyat_1084",
-         "text": "This book of rustic folk tales bears the title: \"How to Shout Down the Devil.\""
-       },
--      {
--        "id": "fairyat_1287",
--        "text": "The title of this book is \"Village Folk-tales of Ceylon.\"  It includes fables about logical errors and foolish misjudgements of the Kadambawa men."
--      },
--      {
--        "id": "fairyat_1461",
--        "text": "This book of folk tales is titled, \"The Girl with the Ugly Name, and Other Stories.\""
--      },
--      {
--        "id": "fairyat_2025",
--        "text": "Titled \"The Fleeing Pancake\", this collection of silly folk tales is suitable for small children."
--      }
--    ]
--  },
--  {
+@@ -217,458 +180,46 @@
+     ]
+   },
+   {
 -    "id": "guidebook",
 -    "type": "BOOK",
 -    "name": { "str": "The Hitchhiker's Guide to the Cataclysm", "str_pl": "copies of The Hitchhiker's Guide to the Cataclysm" },
@@ -797,21 +782,8 @@
 -    "color": "light_cyan",
 -    "time": "7 m",
 -    "fun": 2
-+      {
-+        "id": "fairyat_1287",
-+        "text": "The title of this book is \"Village Folk-tales of Ceylon.\"  It includes fables about logical errors and foolish misjudgements of the Kadambawa men."
-+      },
-+      {
-+        "id": "fairyat_1461",
-+        "text": "This book of folk tales is titled, \"The Girl with the Ugly Name, and Other Stories.\""
-+      },
-+      {
-+        "id": "fairyat_2025",
-+        "text": "Titled \"The Fleeing Pancake\", this collection of silly folk tales is suitable for small children."
-+      }
-+    ]
-   },
-   {
+-  },
+-  {
      "id": "mag_gaming",
      "type": "BOOK",
      "name": { "str": "Computer Gaming", "str_pl": "issues of Computer Gaming" },
@@ -1539,7 +1511,7 @@
      "snippet_category": [
        { "id": "fancy1", "text": "This is a high-quality leather bound copy of Charles Dickens' \"A Tale of Two Cities\"." },
        { "id": "fancy2", "text": "This is a very old but well-preserved copy of Charles Dickens' \"Oliver Twist\"." },
-@@ -1717,18 +954,9 @@
+@@ -1717,17 +954,8 @@
          "text": "This is a first edition copy of Terry Pratchett's \"The Colour of Magic\".  In the inner cover is a handwritten note that reads \"To Chris, thanks for believing I could do it.  Best regards, Terry.\""
        }
      ],
@@ -1557,7 +1529,7 @@
 -    "fun": 4
 +    "fun": 3
    },
-   {
+ ]
      "id": "sa_cryptology_key",
 
 --- a/data/json/obsoletion/items.json