Updated to 2022-02-04-1939

Revert generic nv and telescopic lens changes.

5 files changed, 1619 insertions, 1161 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5275ad7..3921cb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202201220831
-_pkgver=2022-01-22-0831
-pkgrel=9
+pkgver=202202041939
+_pkgver=2022-02-04-1939
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -30,6 +30,11 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
 
+        "revert-01_removed-traits.patch"
+        "revert-02_revert-book-revamp.patch"
+        "revert-03_generic-nv.patch"
+        "revert-04_telescopic-lenses.patch"
+
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
         "ammo-03_fix-reloaded-50bmg.patch"
@@ -89,7 +94,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "etc-01_fix-rubbersplosion.patch"
         "etc-02_add-missing-price-postapoc.patch"
-        "etc-03_revert-book-revamp.patch"
 
         "jc_radio-can-use-ups.patch"
         "jc_ammo-loudness-ap-times-2.patch"
@@ -98,7 +102,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "jc_stop-non-faction-npc-malnourishment.patch"
         "jc_stop-sleeping-on-tables.patch"
         "jc_allow-hacker-laptop.patch"
-        "jc_restore-removed-traits.patch"
         "jc_more-military-base-overmap.patch"
         "jc_npc-eat-from-further-camp.patch"
         "jc_reduced-kcal-during-sleep.patch"
@@ -110,10 +113,14 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b0474855c05edfaeb004ca18b3d3b88a355704d4736167dcb42699dceb'
+b2sums=('e63a887564927e1bef9e7f01656c46576f8ed76d7003d47e7c3b1b02619f1c7ef53cf8e45c5f6630133f59cbf111155ec7ab5ef8c834ea57db080db1c68f08e1'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
+        '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
+        '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
+        '32f7c7090c094bcf87c116ccc4843f63c2f7600f591e26ab7d5a31d7c3abfcc5dec0edf5a9750dba07fe087c3880bbd6d322d0435ebbce06c930bd32c9c814d9'
+        '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '88668ebe3c1f66da6515043c799872082fdc7ddd85c31a1713e5753caa6ed862c047a910af80fa4f5717f0b921a863c7de24b1985a9a8242d129ca14f120a988'
         '0b782de320b3e459380cd618d5db2f3998a6dae879a84a3e4c58b1c61ecb1109f7a63485c2d6c77682eb62ba4a4aa4763a1f25eadde52486f1ce481acbf02504'
         '3fb051162e4dfc5aca3d4f41ebea18ac85d661f0ebba056a807a2a6ecf34ca117a11aeb286790f5ea6f9c6528d6b6981076da405ea0992ce8870bbe6951bdc2d'
@@ -157,7 +164,6 @@ b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         '5a5a61ccb7e2e343fb6de2e3426688485a2f4ad65d4b001d8bd542907fd8ceb9315da7fd9e5f89a5aa6210edcd5f334c73657fc16349000d6f6a394303e22000'
-        'c620bbf0411860ebaafc48123f280e685a535fab91c0736285430ab5d36d26d028cea4ceca1cbcbf466d494ee87b76008d2a3fb64437a069650948945b3dec88'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'dede4f0774159243f87121e4d53107bb9de31f9658823fc7ab02124974b87defecf3ab0f2edf6779f2fe1ca437f16f83bf193cf3143fd5eb3a686b731319c11f'
@@ -165,7 +171,6 @@ b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b
         'd006a51f306a1397c14111788a23029a894e223a196649cac476acab761479db543bf4537ed5a2f4173ec94af04874b521a1d598ed8e98406cc2cf526d8e0083'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'f25f01c5b27dced202fe76c1717b9eaec65dfa5f28db1910529f60f5ec21cc89c1a15df26c2dd09066a0d89e3f7d87c790e7886c3c2f0978a25f5ec7d1236099'
-        '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
@@ -190,13 +195,27 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-01-22-0831|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-02-04-1939|' Makefile
 
 
   # # # Hotfixes
   #echo "Applying hotfixes"
 
 
+  # # # Reverts
+  # Revert the book changes for now.
+  patch -NREp1 -i "$srcdir"/revert-02_revert-book-revamp.patch
+
+  # Revert generic night vision.
+  patch -NRp1 -i "$srcdir"/revert-03_generic-nv.patch
+
+  # Revert telescopic lenses.
+  patch -NRp1 -i "$srcdir"/revert-04_telescopic-lenses.patch
+
+  # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller.
+  patch -Np1 -i "$srcdir"/revert-01_removed-traits.patch
+
+
   # # # Various fixes for bugs I came across
   # # Ammo fixes
   echo "Applying ammo fixes"
@@ -314,9 +333,7 @@ prepare() {
   patch -Np1 -i "$srcdir"/npc-04_island-prison-update.patch
 
   # Port the updates to kindred from DDA
-  # rm the old file else the linter errors from empty file
-  rm data/json/npcs/NPC_Brigitte_LaCroix.json
-  patch -Np1 -i "$srcdir"/npc-05_kindred-update.patch
+  patch -NEp1 -i "$srcdir"/npc-05_kindred-update.patch
 
   # Port the updates to Mr Lapin from DDA
   patch -Np1 -i "$srcdir"/npc-06_lapin-update.patch
@@ -408,10 +425,6 @@ prepare() {
 
   # Add price_postapoc to a number of items that did not have one set.
   patch -Np1 -i "$srcdir"/etc-02_add-missing-price-postapoc.patch
-  
-  # Revert the book changes for now.
-  patch -Np1 -i "$srcdir"/etc-03_revert-book-revamp.patch
-  rm data/json/items/book/bloat.json
 
 
   # # # Various other fixes for bugs I came across that modify src
@@ -437,9 +450,6 @@ prepare() {
   # Allow the hacker_laptop to utilize the extra functions.
   patch -Np1 -i "$srcdir"/jc_allow-hacker-laptop.patch
 
-  # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller.
-  patch -Np1 -i "$srcdir"/jc_restore-removed-traits.patch
-
   # Expand the overmap tiles for the miltiary base to be less MMMM
   patch -Np1 -i "$srcdir"/jc_more-military-base-overmap.patch
 
diff --git a/jc_restore-removed-traits.patch b/revert-01_removed-traits.patch
index cfe8c5d..cfe8c5d 100644
--- a/jc_restore-removed-traits.patch
+++ b/revert-01_removed-traits.patch
diff --git a/etc-03_revert-book-revamp.patch b/revert-02_revert-book-revamp.patch
index 4554cd5..e8356f6 100644
--- a/etc-03_revert-book-revamp.patch
+++ b/revert-02_revert-book-revamp.patch
@@ -1,90 +1,597 @@
 --- a/data/json/itemgroups/books.json
 +++ b/data/json/itemgroups/books.json
-@@ -184,6 +184,7 @@
+@@ -184,7 +184,6 @@
        { "item": "novel_swash", "prob": 14 },
        { "item": "novel_western", "prob": 22 },
        { "item": "novel_war", "prob": 20 },
-+      { "item": "novel_war2", "prob": 20 },
+-      { "item": "novel_war2", "prob": 20 },
        { "item": "novel_adventure", "prob": 14 },
        { "item": "novel_experimental", "prob": 1 },
        { "item": "novel_road", "prob": 10 },
-@@ -196,7 +197,9 @@
+@@ -197,9 +196,7 @@
        { "item": "novel_pulp", "prob": 16 },
        { "item": "novel_thriller", "prob": 18 },
        { "item": "novel_coa", "prob": 5 },
-+      { "item": "novel_coa2", "prob": 5 },
+-      { "item": "novel_coa2", "prob": 5 },
        { "item": "novel_crime", "prob": 20 },
-+      { "item": "novel_crime2", "prob": 20 },
+-      { "item": "novel_crime2", "prob": 20 },
        { "item": "novel_horror", "prob": 18 },
        { "item": "novel_tragedy", "prob": 8 },
        { "item": "survnote", "prob": 1 }
-@@ -223,6 +226,7 @@
+@@ -226,7 +223,6 @@
        { "item": "story_book", "prob": 4 },
        { "item": "fairy_tales", "prob": 10 },
        { "item": "novel_coa", "prob": 10 },
-+      { "item": "novel_coa2", "prob": 10 },
+-      { "item": "novel_coa2", "prob": 10 },
        { "item": "child_book", "prob": 50 },
        { "item": "manual_dodge_kid", "prob": 20 },
        { "item": "mag_comic", "prob": 20 }
+
 --- a/data/json/items/book/bloat.json
 +++ b/data/json/items/book/bloat.json
-@@ -1,199 +0,0 @@
--[
+@@ -0,0 +1,199 @@
++[
++  {
++    "id": "mycenacean_hymns",
++    "type": "BOOK",
++    "name": { "str": "Mycenacean Hymns", "str_pl": "copies of Mycenacean Hymns" },
++    "description": "A vellum book containing the hymns central to Marloss faith.  As the verses lead to each other, the text sings of unity and promised paradise.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_bible2",
++    "type": "BOOK",
++    "name": { "str": "Eastern Orthodox Bible", "str_pl": "copies of Eastern Orthodox Bible" },
++    "description": "An English copy of the Eastern Orthodox translation of The Holy Bible.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_bible3",
++    "type": "BOOK",
++    "name": { "str": "Gideon Bible", "str_pl": "copies of Gideon Bible" },
++    "description": "An English translation of the Christian Bible, distributed free of charge by Gideons International.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_granth",
++    "type": "BOOK",
++    "name": { "str": "The Guru Granth Sahib", "str_pl": "copies of The Guru Granth Sahib" },
++    "description": "A single-volume copy of the central religious texts of Sikhism.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_hadith",
++    "type": "BOOK",
++    "name": { "str": "Hadith", "str_pl": "copies of Hadith" },
++    "description": "A Muslim religious text containing an account of the sayings and actions of the prophet Muhammad.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_kallisti",
++    "type": "BOOK",
++    "name": { "str": "Principia Discordia", "str_pl": "copies of Principia Discordia" },
++    "description": "A book that embodies the main beliefs of Discordianism.  It seems to primarily concern chaos, and features a card in the back which informs you that you are now a 'genuine and authorized Pope of Discordia'.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_kojiki",
++    "type": "BOOK",
++    "name": { "str": "The Kojiki", "str_pl": "copies of The Kojiki" },
++    "description": "The oldest extant chronicle of Japan's myths and history, the stories contained in the Kojiki are part of the inspiration behind Shinto practices.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_mormon",
++    "type": "BOOK",
++    "name": { "str": "The Book of Mormon", "str_pl": "copies of The Book of Mormon" },
++    "description": "The sacred text of the Latter Day Saint movement of Christianity, originally published in 1830 by Joseph Smith.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_pastafarian",
++    "type": "BOOK",
++    "name": {
++      "str": "The Gospel of the Flying Spaghetti Monster",
++      "str_pl": "copies of The Gospel of the Flying Spaghetti Monster"
++    },
++    "description": "A book that embodies the main beliefs of the Church of the Flying Spaghetti Monster.  It seems to involve a lot of pirates and some sort of invisible drunken monster made of pasta.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_quran",
++    "type": "BOOK",
++    "name": { "str": "Quran", "str_pl": "copies of Quran" },
++    "description": "An English translation of the Muslim book of holy scriptures, with explanatory notes and commentaries to aid in understanding.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_scientology",
++    "type": "BOOK",
++    "name": { "str": "Dianetics", "str_pl": "copies of Dianetics" },
++    "description": "This book is the canonical text of Scientology.  Written by a science fiction author, it contains self-improvement techniques and musings on psychology called Dianetics.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_slack",
++    "type": "BOOK",
++    "name": { "str": "The Book of the SubGenius", "str_pl": "copies of The Book of the SubGenius" },
++    "description": "A book about the Church of the SubGenius.  It seems to involve a salesman named J. R. \"Bob\" Dobbs and a concept called 'slack'.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_sutras",
++    "type": "BOOK",
++    "name": { "str": "The Sutras of the Buddha", "str_pl": "copies of The Sutras of the Buddha" },
++    "description": "A collection of discourses attributed to the Buddha and his close disciples.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_talmud",
++    "type": "BOOK",
++    "name": { "str": "Talmud", "str_pl": "copies of Talmud" },
++    "description": "One of the central texts of Rabbinic Judaism, the Talmud expounds upon the Hebrew Bible with teachings and opinions of thousands of rabbis.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_tanakh",
++    "type": "BOOK",
++    "name": { "str": "Tanakh", "str_pl": "copies of Tanakh" },
++    "description": "A single-volume book containing the complete canon of the Jewish Bible.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_tripitaka",
++    "type": "BOOK",
++    "name": { "str": "The Tripitaka", "str_pl": "copies of The Tripitaka" },
++    "description": "A collection of sacred Buddhist writings describing their canons of scriptures.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_upanishads",
++    "type": "BOOK",
++    "name": { "str": "The Upanishads", "str_pl": "copies of The Upanishads" },
++    "description": "A collection of sacred Hindu writings regarding the nature of reality and describing the character and form of human salvation.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_vedas",
++    "type": "BOOK",
++    "name": { "str": "The Four Vedas", "str_pl": "copies of The Four Vedas" },
++    "description": "A single volume containing all four Vedas, which are the oldest scriptures of Hinduism.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_satanic",
++    "type": "BOOK",
++    "name": { "str": "The Satanic Bible", "str_pl": "copies of The Satanic Bible" },
++    "description": "A collection of essays, observations, and rituals published by Anton LaVey in 1969.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "holybook_havamal",
++    "type": "BOOK",
++    "name": { "str": "Hávamál", "str_pl": "copies of Hávamál" },
++    "description": "An English translation of several Old Norse poems.  The poems contain proverbs and stories attributed to the god Odin, many transcribed from oral history.",
++    "copy-from": "holybook_bible1"
++  },
++  {
++    "id": "priest_diary",
++    "type": "BOOK",
++    "name": { "str": "priest's diary", "str_pl": "priests' diaries" },
++    "description": "A small book filled with journal entries in Latin.",
++    "copy-from": "holybook_bible1",
++    "price": 1500,
++    "fun": -1
++  },
++  {
++    "id": "guidebook",
++    "type": "BOOK",
++    "name": { "str": "The Hitchhiker's Guide to the Cataclysm", "str_pl": "copies of The Hitchhiker's Guide to the Cataclysm" },
++    "description": "Inscribed on the cover in large, friendly letters, is the message \"Don't Panic\".",
++    "copy-from": "paperback_novel",
++    "price": 4200
++  },
++  {
++    "id": "novel_crime_murdergrape",
++    "type": "BOOK",
++    "name": { "str": "Murdered by the Grapevine", "str_pl": "copies of Murdered by the Grapevine" },
++    "description": "This cheap paperback tells the story of a mob boss done in by mere suspicion.  She never breaks a confidence, never rats out an accomplice, and never turns her back on a friend.  Nonetheless her grip on the reigns of the underworld is eroded by rumor and paranoia.",
++    "copy-from": "paperback_novel"
++  },
++  {
++    "id": "novel_spy_comefly",
++    "type": "BOOK",
++    "name": { "str": "Come Fly the Treacherous Skies", "str_pl": "copies of Come Fly the Treacherous Skies" },
++    "description": "This tale of intrigue betrays the story of a debonair mechanic driven by a lust for revenge.  As she uncovers a sophisticated network of amateur pilots turned smugglers, the good guys and the bad guys begin to all look the same.",
++    "copy-from": "paperback_novel"
++  },
++  {
++    "id": "novel_spy_rocketsci",
++    "type": "BOOK",
++    "name": { "str": "Lies, Damn Lies, and Rocket Science", "str_pl": "copies of Lies, Damn Lies, and Rocket Science" },
++    "description": "This spy novel tells the story of a jaded rocket scientist looking for redemption in all the wrong places.  As selling state secrets becomes her career, she learns there isn't much of difference between a double-agent and a triple-agent.",
++    "copy-from": "paperback_novel"
++  },
++  {
++    "id": "visions_solitude",
++    "type": "BOOK",
++    "name": { "str": "Visions in Solitude", "str_pl": "copies of Visions in Solitude" },
++    "description": "A small book detailing 'visions' a prisoner had on death row.",
++    "copy-from": "paperback_novel",
++    "price": 2900
++  },
++  {
++    "id": "ZSG",
++    "type": "BOOK",
++    "name": { "str": "Zombie Survival Guide", "str_pl": "copies of Zombie Survival Guide" },
++    "description": "While this seems like it would be very useful in this situation, the sheer amount of misinformation present makes it practically useless.",
++    "copy-from": "paperback_novel",
++    "price": 1290
++  }
++]
+
+--- a/data/json/items/book/misc.json
++++ b/data/json/items/book/misc.json
+@@ -4,36 +4,46 @@
+     "type": "BOOK",
+     "name": { "str": "paperback abstract" },
+     "description": "An ordinary paperback book.  Or is it?  It is.",
+-    "weight": "371 g",
+-    "volume": "700 ml",
++    "weight": "400 g",
++    "volume": "750 ml",
+     "price": 750,
+     "price_postapoc": 50,
+     "material": [ "paper" ],
++    "bashing": 5,
++    "intelligence": 6,
+     "symbol": "?",
+     "looks_like": "story_book",
+     "color": "light_cyan",
+     "flags": [ "TINDER", "FLAMMABLE" ],
++    "time": "40 m",
++    "fun": 2
++  },
++  {
++    "id": "mag_comic",
++    "type": "BOOK",
++    "name": { "str": "comic book" },
++    "description": "A super-hero comic.",
++    "copy-from": "paperback_novel",
++    "weight": "60 g",
++    "volume": "200 ml",
++    "price": 300,
++    "bashing": 1,
+     "intelligence": 4,
+     "time": "15 m",
+-    "chapters": 16,
+-    "fun": 2
++    "fun": 1
+   },
+   {
+-    "id": "ZSG",
++    "id": "holybook_bible1",
+     "type": "BOOK",
+-    "name": { "str": "Zombie Survival Guide", "str_pl": "copies of Zombie Survival Guide" },
+-    "description": "While this seems like it would be very useful in this situation, the sheer amount of misinformation present makes it practically useless.",
+-    "weight": "227 g",
+-    "volume": "1 L",
+-    "price": 1290,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "green",
++    "name": { "str": "King James Bible", "str_pl": "copies of King James Bible" },
++    "description": "An English translation of the Christian Bible, which originated in England in the early 1600s.",
++    "copy-from": "paperback_novel",
++    "price": 550,
++    "color": "dark_gray",
++    "time": "40 m",
+     "intelligence": 7,
+-    "time": "18 m",
+-    "chapters": 28,
+-    "fun": 2
++    "fun": 1,
++    "flags": [ "INSPIRATIONAL" ]
+   },
+   {
+     "id": "black_box_transcript",
+@@ -41,32 +51,18 @@
+     "name": { "str": "black box transcript" },
+     "//": "ooh, military records, probably Classified!",
+     "description": "A full flight log for a military aircraft.  Nothing of interest stands out.",
+-    "weight": "566 g",
+-    "volume": "1250 ml",
++    "copy-from": "paperback_novel",
+     "price": 5000,
+-    "price_postapoc": 50,
+-    "bashing": 5,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+     "color": "light_green",
+-    "intelligence": 8,
+-    "time": "30 m",
+-    "fun": -1
++    "fun": -2
+   },
+   {
+     "id": "child_book",
+     "type": "BOOK",
+     "name": { "str": "children's book" },
+     "description": "A little book for little readers.  The colorful cartoon characters and sweet stories contained herein belong to a different time, before the dead walked and the world moved on.",
+-    "weight": "52 g",
+-    "volume": "250 ml",
++    "copy-from": "paperback_novel",
+     "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_cyan",
+-    "time": "4 m",
+-    "chapters": 4,
+     "fun": 1
+   },
+   {
+@@ -74,66 +70,33 @@
+     "type": "BOOK",
+     "name": { "str_sp": "Ranch Prospectus" },
+     "description": "A short paper of the economic viability of constructing an agricultural outpost.",
+-    "weight": "1 g",
+-    "volume": "250 ml",
+-    "price": 3000,
+-    "price_postapoc": 50,
+-    "bashing": 1,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_cyan",
+-    "intelligence": 5,
+-    "time": "10 m"
++    "copy-from": "paperback_novel",
++    "price": 3000
+   },
+   {
+     "id": "decoy_elfa",
+     "type": "BOOK",
+     "name": { "str": "standpipe maintenance log" },
+     "description": "This binder details the scheduled maintenance for several plumbing systems throughout the facility.",
+-    "weight": "400 g",
+-    "volume": "750 ml",
++    "copy-from": "black_box_transcript",
+     "price": 400,
+-    "price_postapoc": 50,
+-    "material": [ "paper", "plastic" ],
+-    "symbol": "?",
+-    "color": "light_green",
+-    "intelligence": 8,
+-    "time": "45 m",
+-    "fun": -2
++    "material": [ "paper", "plastic" ]
+   },
+   {
+     "id": "essay_book",
+     "type": "BOOK",
+     "name": { "str": "book of essays", "str_pl": "books of essays" },
+     "description": "A collection of essays by various authors from around the world, including works by Churchill, Mailer, Eco, and Voltaire.",
+-    "weight": "700 g",
+-    "volume": "750 ml",
+-    "price": 1250,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 10,
+-    "time": "26 m",
+-    "chapters": 40,
+-    "fun": 3
++    "copy-from": "paperback_novel",
++    "price": 1250
+   },
+   {
+     "id": "fairy_tales",
+     "type": "BOOK",
+     "name": { "str": "book of fairy tales", "str_pl": "books of fairy tales" },
+     "description": "An amusing collection of folklore featuring the usual cast of fairies, goblins, and trolls.",
+-    "weight": "410 g",
+-    "volume": "750 ml",
++    "copy-from": "paperback_novel",
+     "price": 950,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 6,
+-    "time": "18 m",
+-    "chapters": 24,
+-    "fun": 3,
+     "//": "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."
+-      }
+-    ]
+-  },
+-  {
+-    "id": "guidebook",
+-    "type": "BOOK",
+-    "name": { "str": "The Hitchhiker's Guide to the Cataclysm", "str_pl": "copies of The Hitchhiker's Guide to the Cataclysm" },
+-    "description": "Inscribed on the cover in large, friendly letters, is the message \"Don't Panic\".",
+-    "weight": "1764 g",
+-    "volume": "1 L",
+-    "price": 88200,
+-    "price_postapoc": 50,
+-    "bashing": 2,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "green",
+-    "intelligence": 3,
+-    "time": "1 m"
+-  },
 -  {
 -    "id": "mycenacean_hymns",
 -    "type": "BOOK",
 -    "name": { "str": "Mycenacean Hymns", "str_pl": "copies of Mycenacean Hymns" },
 -    "description": "A vellum book containing the hymns central to Marloss faith.  As the verses lead to each other, the text sings of unity and promised paradise.",
--    "copy-from": "holybook_bible1"
+-    "weight": "368 g",
+-    "volume": "1 L",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "cyan",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
+-  },
+-  {
+-    "id": "holybook_bible1",
+-    "type": "BOOK",
+-    "name": { "str": "King James Bible", "str_pl": "copies of King James Bible" },
+-    "description": "An English translation of the Christian Bible, which originated in England in the early 1600s.",
+-    "weight": "368 g",
+-    "volume": "1 L",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_bible2",
 -    "type": "BOOK",
 -    "name": { "str": "Eastern Orthodox Bible", "str_pl": "copies of Eastern Orthodox Bible" },
 -    "description": "An English copy of the Eastern Orthodox translation of The Holy Bible.",
--    "copy-from": "holybook_bible1"
+-    "weight": "428 g",
+-    "volume": "1250 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_bible3",
 -    "type": "BOOK",
 -    "name": { "str": "Gideon Bible", "str_pl": "copies of Gideon Bible" },
 -    "description": "An English translation of the Christian Bible, distributed free of charge by Gideons International.",
--    "copy-from": "holybook_bible1"
+-    "weight": "368 g",
+-    "volume": "1 L",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_granth",
 -    "type": "BOOK",
 -    "name": { "str": "The Guru Granth Sahib", "str_pl": "copies of The Guru Granth Sahib" },
 -    "description": "A single-volume copy of the central religious texts of Sikhism.",
--    "copy-from": "holybook_bible1"
+-    "weight": "590 g",
+-    "volume": "1 L",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_hadith",
 -    "type": "BOOK",
 -    "name": { "str": "Hadith", "str_pl": "copies of Hadith" },
 -    "description": "A Muslim religious text containing an account of the sayings and actions of the prophet Muhammad.",
--    "copy-from": "holybook_bible1"
+-    "weight": "398 g",
+-    "volume": "500 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_kallisti",
 -    "type": "BOOK",
 -    "name": { "str": "Principia Discordia", "str_pl": "copies of Principia Discordia" },
 -    "description": "A book that embodies the main beliefs of Discordianism.  It seems to primarily concern chaos, and features a card in the back which informs you that you are now a 'genuine and authorized Pope of Discordia'.",
--    "copy-from": "holybook_bible1"
+-    "weight": "292 g",
+-    "volume": "150 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_kojiki",
 -    "type": "BOOK",
 -    "name": { "str": "The Kojiki", "str_pl": "copies of The Kojiki" },
 -    "description": "The oldest extant chronicle of Japan's myths and history, the stories contained in the Kojiki are part of the inspiration behind Shinto practices.",
--    "copy-from": "holybook_bible1"
+-    "weight": "368 g",
+-    "volume": "600 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_mormon",
 -    "type": "BOOK",
 -    "name": { "str": "The Book of Mormon", "str_pl": "copies of The Book of Mormon" },
 -    "description": "The sacred text of the Latter Day Saint movement of Christianity, originally published in 1830 by Joseph Smith.",
--    "copy-from": "holybook_bible1"
+-    "weight": "368 g",
+-    "volume": "600 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_pastafarian",
@@ -94,1467 +601,991 @@
 -      "str_pl": "copies of The Gospel of the Flying Spaghetti Monster"
 -    },
 -    "description": "A book that embodies the main beliefs of the Church of the Flying Spaghetti Monster.  It seems to involve a lot of pirates and some sort of invisible drunken monster made of pasta.",
--    "copy-from": "holybook_bible1"
+-    "weight": "292 g",
+-    "volume": "500 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_quran",
 -    "type": "BOOK",
 -    "name": { "str": "Quran", "str_pl": "copies of Quran" },
 -    "description": "An English translation of the Muslim book of holy scriptures, with explanatory notes and commentaries to aid in understanding.",
--    "copy-from": "holybook_bible1"
+-    "weight": "412 g",
+-    "volume": "600 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_scientology",
 -    "type": "BOOK",
 -    "name": { "str": "Dianetics", "str_pl": "copies of Dianetics" },
 -    "description": "This book is the canonical text of Scientology.  Written by a science fiction author, it contains self-improvement techniques and musings on psychology called Dianetics.",
--    "copy-from": "holybook_bible1"
+-    "weight": "486 g",
+-    "volume": "1300 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_slack",
 -    "type": "BOOK",
 -    "name": { "str": "The Book of the SubGenius", "str_pl": "copies of The Book of the SubGenius" },
 -    "description": "A book about the Church of the SubGenius.  It seems to involve a salesman named J. R. \"Bob\" Dobbs and a concept called 'slack'.",
--    "copy-from": "holybook_bible1"
+-    "weight": "292 g",
+-    "volume": "600 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_sutras",
 -    "type": "BOOK",
 -    "name": { "str": "The Sutras of the Buddha", "str_pl": "copies of The Sutras of the Buddha" },
 -    "description": "A collection of discourses attributed to the Buddha and his close disciples.",
--    "copy-from": "holybook_bible1"
+-    "weight": "496 g",
+-    "volume": "1 L",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_talmud",
 -    "type": "BOOK",
 -    "name": { "str": "Talmud", "str_pl": "copies of Talmud" },
 -    "description": "One of the central texts of Rabbinic Judaism, the Talmud expounds upon the Hebrew Bible with teachings and opinions of thousands of rabbis.",
--    "copy-from": "holybook_bible1"
+-    "weight": "460 g",
+-    "volume": "1 L",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_tanakh",
 -    "type": "BOOK",
 -    "name": { "str": "Tanakh", "str_pl": "copies of Tanakh" },
 -    "description": "A single-volume book containing the complete canon of the Jewish Bible.",
--    "copy-from": "holybook_bible1"
+-    "weight": "512 g",
+-    "volume": "1800 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_tripitaka",
 -    "type": "BOOK",
 -    "name": { "str": "The Tripitaka", "str_pl": "copies of The Tripitaka" },
 -    "description": "A collection of sacred Buddhist writings describing their canons of scriptures.",
--    "copy-from": "holybook_bible1"
+-    "weight": "513 g",
+-    "volume": "1 L",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_upanishads",
 -    "type": "BOOK",
 -    "name": { "str": "The Upanishads", "str_pl": "copies of The Upanishads" },
 -    "description": "A collection of sacred Hindu writings regarding the nature of reality and describing the character and form of human salvation.",
--    "copy-from": "holybook_bible1"
+-    "weight": "482 g",
+-    "volume": "750 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_vedas",
 -    "type": "BOOK",
 -    "name": { "str": "The Four Vedas", "str_pl": "copies of The Four Vedas" },
 -    "description": "A single volume containing all four Vedas, which are the oldest scriptures of Hinduism.",
--    "copy-from": "holybook_bible1"
+-    "weight": "540 g",
+-    "volume": "1700 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "holybook_satanic",
 -    "type": "BOOK",
 -    "name": { "str": "The Satanic Bible", "str_pl": "copies of The Satanic Bible" },
 -    "description": "A collection of essays, observations, and rituals published by Anton LaVey in 1969.",
--    "copy-from": "holybook_bible1"
--  },
--  {
--    "id": "holybook_havamal",
--    "type": "BOOK",
--    "name": { "str": "Hávamál", "str_pl": "copies of Hávamál" },
--    "description": "An English translation of several Old Norse poems.  The poems contain proverbs and stories attributed to the god Odin, many transcribed from oral history.",
--    "copy-from": "holybook_bible1"
--  },
--  {
--    "id": "priest_diary",
--    "type": "BOOK",
--    "name": { "str": "priest's diary", "str_pl": "priests' diaries" },
--    "description": "A small book filled with journal entries in Latin.",
--    "copy-from": "holybook_bible1",
--    "price": 1500,
--    "fun": -1
--  },
--  {
--    "id": "guidebook",
--    "type": "BOOK",
--    "name": { "str": "The Hitchhiker's Guide to the Cataclysm", "str_pl": "copies of The Hitchhiker's Guide to the Cataclysm" },
--    "description": "Inscribed on the cover in large, friendly letters, is the message \"Don't Panic\".",
--    "copy-from": "paperback_novel",
--    "price": 4200
--  },
--  {
--    "id": "novel_crime_murdergrape",
--    "type": "BOOK",
--    "name": { "str": "Murdered by the Grapevine", "str_pl": "copies of Murdered by the Grapevine" },
--    "description": "This cheap paperback tells the story of a mob boss done in by mere suspicion.  She never breaks a confidence, never rats out an accomplice, and never turns her back on a friend.  Nonetheless her grip on the reigns of the underworld is eroded by rumor and paranoia.",
--    "copy-from": "paperback_novel"
--  },
--  {
--    "id": "novel_spy_comefly",
--    "type": "BOOK",
--    "name": { "str": "Come Fly the Treacherous Skies", "str_pl": "copies of Come Fly the Treacherous Skies" },
--    "description": "This tale of intrigue betrays the story of a debonair mechanic driven by a lust for revenge.  As she uncovers a sophisticated network of amateur pilots turned smugglers, the good guys and the bad guys begin to all look the same.",
--    "copy-from": "paperback_novel"
--  },
--  {
--    "id": "novel_spy_rocketsci",
--    "type": "BOOK",
--    "name": { "str": "Lies, Damn Lies, and Rocket Science", "str_pl": "copies of Lies, Damn Lies, and Rocket Science" },
--    "description": "This spy novel tells the story of a jaded rocket scientist looking for redemption in all the wrong places.  As selling state secrets becomes her career, she learns there isn't much of difference between a double-agent and a triple-agent.",
--    "copy-from": "paperback_novel"
--  },
--  {
--    "id": "visions_solitude",
--    "type": "BOOK",
--    "name": { "str": "Visions in Solitude", "str_pl": "copies of Visions in Solitude" },
--    "description": "A small book detailing 'visions' a prisoner had on death row.",
--    "copy-from": "paperback_novel",
--    "price": 2900
--  },
--  {
--    "id": "ZSG",
--    "type": "BOOK",
--    "name": { "str": "Zombie Survival Guide", "str_pl": "copies of Zombie Survival Guide" },
--    "description": "While this seems like it would be very useful in this situation, the sheer amount of misinformation present makes it practically useless.",
--    "copy-from": "paperback_novel",
--    "price": 1290
--  }
--]
---- a/data/json/items/book/misc.json
-+++ b/data/json/items/book/misc.json
-@@ -4,46 +4,36 @@
-     "type": "BOOK",
-     "name": { "str": "paperback abstract" },
-     "description": "An ordinary paperback book.  Or is it?  It is.",
--    "weight": "400 g",
--    "volume": "750 ml",
-+    "weight": "371 g",
-+    "volume": "700 ml",
-     "price": 750,
-     "price_postapoc": 50,
-     "material": [ "paper" ],
--    "bashing": 5,
--    "intelligence": 6,
-     "symbol": "?",
-     "looks_like": "story_book",
-     "color": "light_cyan",
-     "flags": [ "TINDER", "FLAMMABLE" ],
--    "time": "40 m",
--    "fun": 2
+-    "weight": "130 g",
+-    "volume": "250 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
 -  },
 -  {
 -    "id": "mag_comic",
 -    "type": "BOOK",
 -    "name": { "str": "comic book" },
 -    "description": "A super-hero comic.",
--    "copy-from": "paperback_novel",
 -    "weight": "60 g",
--    "volume": "200 ml",
+-    "volume": "250 ml",
 -    "price": 300,
--    "bashing": 1,
-     "intelligence": 4,
-     "time": "15 m",
--    "fun": 1
-+    "chapters": 16,
-+    "fun": 2
-   },
-   {
--    "id": "holybook_bible1",
-+    "id": "ZSG",
-     "type": "BOOK",
--    "name": { "str": "King James Bible", "str_pl": "copies of King James Bible" },
--    "description": "An English translation of the Christian Bible, which originated in England in the early 1600s.",
--    "copy-from": "paperback_novel",
--    "price": 550,
--    "color": "dark_gray",
--    "time": "40 m",
-+    "name": { "str": "Zombie Survival Guide", "str_pl": "copies of Zombie Survival Guide" },
-+    "description": "While this seems like it would be very useful in this situation, the sheer amount of misinformation present makes it practically useless.",
-+    "weight": "227 g",
-+    "volume": "1 L",
-+    "price": 1290,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "green",
-     "intelligence": 7,
--    "fun": 1,
--    "flags": [ "INSPIRATIONAL" ]
-+    "time": "18 m",
-+    "chapters": 28,
-+    "fun": 2
-   },
-   {
-     "id": "black_box_transcript",
-@@ -51,18 +41,32 @@
-     "name": { "str": "black box transcript" },
-     "//": "ooh, military records, probably Classified!",
-     "description": "A full flight log for a military aircraft.  Nothing of interest stands out.",
--    "copy-from": "paperback_novel",
-+    "weight": "566 g",
-+    "volume": "1250 ml",
-     "price": 5000,
-+    "price_postapoc": 50,
-+    "bashing": 5,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-     "color": "light_green",
--    "fun": -2
-+    "intelligence": 8,
-+    "time": "30 m",
-+    "fun": -1
-   },
-   {
-     "id": "child_book",
-     "type": "BOOK",
-     "name": { "str": "children's book" },
-     "description": "A little book for little readers.  The colorful cartoon characters and sweet stories contained herein belong to a different time, before the dead walked and the world moved on.",
--    "copy-from": "paperback_novel",
-+    "weight": "52 g",
-+    "volume": "250 ml",
-     "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_cyan",
-+    "time": "4 m",
-+    "chapters": 4,
-     "fun": 1
-   },
-   {
-@@ -70,33 +74,66 @@
-     "type": "BOOK",
-     "name": { "str_sp": "Ranch Prospectus" },
-     "description": "A short paper of the economic viability of constructing an agricultural outpost.",
--    "copy-from": "paperback_novel",
--    "price": 3000
-+    "weight": "1 g",
-+    "volume": "250 ml",
-+    "price": 3000,
-+    "price_postapoc": 50,
-+    "bashing": 1,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_cyan",
-+    "intelligence": 5,
-+    "time": "10 m"
-   },
-   {
-     "id": "decoy_elfa",
-     "type": "BOOK",
-     "name": { "str": "standpipe maintenance log" },
-     "description": "This binder details the scheduled maintenance for several plumbing systems throughout the facility.",
--    "copy-from": "black_box_transcript",
-+    "weight": "400 g",
-+    "volume": "750 ml",
-     "price": 400,
--    "material": [ "paper", "plastic" ]
-+    "price_postapoc": 50,
-+    "material": [ "paper", "plastic" ],
-+    "symbol": "?",
-+    "color": "light_green",
-+    "intelligence": 8,
-+    "time": "45 m",
-+    "fun": -2
-   },
-   {
-     "id": "essay_book",
-     "type": "BOOK",
-     "name": { "str": "book of essays", "str_pl": "books of essays" },
-     "description": "A collection of essays by various authors from around the world, including works by Churchill, Mailer, Eco, and Voltaire.",
--    "copy-from": "paperback_novel",
--    "price": 1250
-+    "weight": "700 g",
-+    "volume": "750 ml",
-+    "price": 1250,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 10,
-+    "time": "26 m",
-+    "chapters": 40,
-+    "fun": 3
-   },
-   {
-     "id": "fairy_tales",
-     "type": "BOOK",
-     "name": { "str": "book of fairy tales", "str_pl": "books of fairy tales" },
-     "description": "An amusing collection of folklore featuring the usual cast of fairies, goblins, and trolls.",
--    "copy-from": "paperback_novel",
-+    "weight": "410 g",
-+    "volume": "750 ml",
-     "price": 950,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 6,
-+    "time": "18 m",
-+    "chapters": 24,
-+    "fun": 3,
-     "//": "The ids below represent the Aarne-Thompson System of folklore classification.  Do not change.",
-     "snippet_category": [
-       {
-@@ -180,46 +217,458 @@
-     ]
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "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": "guidebook",
-+    "type": "BOOK",
-+    "name": { "str": "The Hitchhiker's Guide to the Cataclysm", "str_pl": "copies of The Hitchhiker's Guide to the Cataclysm" },
-+    "description": "Inscribed on the cover in large, friendly letters, is the message \"Don't Panic\".",
-+    "weight": "1764 g",
-+    "volume": "1 L",
-+    "price": 88200,
-+    "price_postapoc": 50,
-+    "bashing": 2,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "green",
-+    "intelligence": 3,
-+    "time": "1 m"
-+  },
-+  {
-+    "id": "mycenacean_hymns",
-+    "type": "BOOK",
-+    "name": { "str": "Mycenacean Hymns", "str_pl": "copies of Mycenacean Hymns" },
-+    "description": "A vellum book containing the hymns central to Marloss faith.  As the verses lead to each other, the text sings of unity and promised paradise.",
-+    "weight": "368 g",
-+    "volume": "1 L",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "cyan",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_bible1",
-+    "type": "BOOK",
-+    "name": { "str": "King James Bible", "str_pl": "copies of King James Bible" },
-+    "description": "An English translation of the Christian Bible, which originated in England in the early 1600s.",
-+    "weight": "368 g",
-+    "volume": "1 L",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_bible2",
-+    "type": "BOOK",
-+    "name": { "str": "Eastern Orthodox Bible", "str_pl": "copies of Eastern Orthodox Bible" },
-+    "description": "An English copy of the Eastern Orthodox translation of The Holy Bible.",
-+    "weight": "428 g",
-+    "volume": "1250 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_bible3",
-+    "type": "BOOK",
-+    "name": { "str": "Gideon Bible", "str_pl": "copies of Gideon Bible" },
-+    "description": "An English translation of the Christian Bible, distributed free of charge by Gideons International.",
-+    "weight": "368 g",
-+    "volume": "1 L",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_granth",
-+    "type": "BOOK",
-+    "name": { "str": "The Guru Granth Sahib", "str_pl": "copies of The Guru Granth Sahib" },
-+    "description": "A single-volume copy of the central religious texts of Sikhism.",
-+    "weight": "590 g",
-+    "volume": "1 L",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_hadith",
-+    "type": "BOOK",
-+    "name": { "str": "Hadith", "str_pl": "copies of Hadith" },
-+    "description": "A Muslim religious text containing an account of the sayings and actions of the prophet Muhammad.",
-+    "weight": "398 g",
-+    "volume": "500 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_kallisti",
-+    "type": "BOOK",
-+    "name": { "str": "Principia Discordia", "str_pl": "copies of Principia Discordia" },
-+    "description": "A book that embodies the main beliefs of Discordianism.  It seems to primarily concern chaos, and features a card in the back which informs you that you are now a 'genuine and authorized Pope of Discordia'.",
-+    "weight": "292 g",
-+    "volume": "150 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_kojiki",
-+    "type": "BOOK",
-+    "name": { "str": "The Kojiki", "str_pl": "copies of The Kojiki" },
-+    "description": "The oldest extant chronicle of Japan's myths and history, the stories contained in the Kojiki are part of the inspiration behind Shinto practices.",
-+    "weight": "368 g",
-+    "volume": "600 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_mormon",
-+    "type": "BOOK",
-+    "name": { "str": "The Book of Mormon", "str_pl": "copies of The Book of Mormon" },
-+    "description": "The sacred text of the Latter Day Saint movement of Christianity, originally published in 1830 by Joseph Smith.",
-+    "weight": "368 g",
-+    "volume": "600 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_pastafarian",
-+    "type": "BOOK",
-+    "name": {
-+      "str": "The Gospel of the Flying Spaghetti Monster",
-+      "str_pl": "copies of The Gospel of the Flying Spaghetti Monster"
-+    },
-+    "description": "A book that embodies the main beliefs of the Church of the Flying Spaghetti Monster.  It seems to involve a lot of pirates and some sort of invisible drunken monster made of pasta.",
-+    "weight": "292 g",
-+    "volume": "500 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_quran",
-+    "type": "BOOK",
-+    "name": { "str": "Quran", "str_pl": "copies of Quran" },
-+    "description": "An English translation of the Muslim book of holy scriptures, with explanatory notes and commentaries to aid in understanding.",
-+    "weight": "412 g",
-+    "volume": "600 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_scientology",
-+    "type": "BOOK",
-+    "name": { "str": "Dianetics", "str_pl": "copies of Dianetics" },
-+    "description": "This book is the canonical text of Scientology.  Written by a science fiction author, it contains self-improvement techniques and musings on psychology called Dianetics.",
-+    "weight": "486 g",
-+    "volume": "1300 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_slack",
-+    "type": "BOOK",
-+    "name": { "str": "The Book of the SubGenius", "str_pl": "copies of The Book of the SubGenius" },
-+    "description": "A book about the Church of the SubGenius.  It seems to involve a salesman named J. R. \"Bob\" Dobbs and a concept called 'slack'.",
-+    "weight": "292 g",
-+    "volume": "600 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_sutras",
-+    "type": "BOOK",
-+    "name": { "str": "The Sutras of the Buddha", "str_pl": "copies of The Sutras of the Buddha" },
-+    "description": "A collection of discourses attributed to the Buddha and his close disciples.",
-+    "weight": "496 g",
-+    "volume": "1 L",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_talmud",
-+    "type": "BOOK",
-+    "name": { "str": "Talmud", "str_pl": "copies of Talmud" },
-+    "description": "One of the central texts of Rabbinic Judaism, the Talmud expounds upon the Hebrew Bible with teachings and opinions of thousands of rabbis.",
-+    "weight": "460 g",
-+    "volume": "1 L",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_tanakh",
-+    "type": "BOOK",
-+    "name": { "str": "Tanakh", "str_pl": "copies of Tanakh" },
-+    "description": "A single-volume book containing the complete canon of the Jewish Bible.",
-+    "weight": "512 g",
-+    "volume": "1800 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_tripitaka",
-+    "type": "BOOK",
-+    "name": { "str": "The Tripitaka", "str_pl": "copies of The Tripitaka" },
-+    "description": "A collection of sacred Buddhist writings describing their canons of scriptures.",
-+    "weight": "513 g",
-+    "volume": "1 L",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_upanishads",
-+    "type": "BOOK",
-+    "name": { "str": "The Upanishads", "str_pl": "copies of The Upanishads" },
-+    "description": "A collection of sacred Hindu writings regarding the nature of reality and describing the character and form of human salvation.",
-+    "weight": "482 g",
-+    "volume": "750 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_vedas",
-+    "type": "BOOK",
-+    "name": { "str": "The Four Vedas", "str_pl": "copies of The Four Vedas" },
-+    "description": "A single volume containing all four Vedas, which are the oldest scriptures of Hinduism.",
-+    "weight": "540 g",
-+    "volume": "1700 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_satanic",
-+    "type": "BOOK",
-+    "name": { "str": "The Satanic Bible", "str_pl": "copies of The Satanic Bible" },
-+    "description": "A collection of essays, observations, and rituals published by Anton LaVey in 1969.",
-+    "weight": "130 g",
-+    "volume": "250 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "mag_comic",
-+    "type": "BOOK",
-+    "name": { "str": "comic book" },
-+    "description": "A super-hero comic.",
-+    "weight": "60 g",
-+    "volume": "250 ml",
-+    "price": 300,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_cyan",
-+    "time": "7 m",
-+    "fun": 2
-+  },
-+  {
      "id": "mag_gaming",
      "type": "BOOK",
      "name": { "str": "Computer Gaming", "str_pl": "issues of Computer Gaming" },
      "description": "Reviews of recently released computer games and previews of upcoming titles.",
--    "copy-from": "mag_comic"
-+    "weight": "60 g",
-+    "volume": "250 ml",
-+    "price": 300,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "pink",
-+    "intelligence": 7,
-+    "time": "8 m",
-+    "fun": 2
+-    "weight": "60 g",
+-    "volume": "250 ml",
+-    "price": 300,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "pink",
+-    "intelligence": 7,
+-    "time": "8 m",
+-    "fun": 2
++    "copy-from": "mag_comic"
    },
    {
      "id": "mag_news",
      "type": "BOOK",
      "name": { "str": "TIME magazine" },
      "description": "Current events concerning a bunch of people who're all (un)dead now.",
--    "copy-from": "mag_comic",
--    "price": 400
-+    "weight": "60 g",
-+    "volume": "250 ml",
-+    "price": 400,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "pink",
-+    "intelligence": 7,
-+    "time": "10 m",
-+    "fun": 2
+-    "weight": "60 g",
+-    "volume": "250 ml",
+-    "price": 400,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "pink",
+-    "intelligence": 7,
+-    "time": "10 m",
+-    "fun": 2
++    "copy-from": "mag_comic",
++    "price": 400
    },
    {
      "id": "mag_porn",
      "type": "BOOK",
      "name": { "str": "Playboy", "str_pl": "issues of Playboy" },
      "description": "You can read it for the articles.  Or not.",
--    "copy-from": "mag_comic",
-+    "weight": "60 g",
-+    "volume": "250 ml",
+-    "weight": "60 g",
+-    "volume": "250 ml",
++    "copy-from": "mag_comic",
      "price": 400,
      "price_postapoc": 250,
--    "color": "pink"
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "pink",
-+    "time": "10 m",
-+    "chapters": 4,
-+    "fun": 1
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "pink",
+-    "time": "10 m",
+-    "chapters": 4,
+-    "fun": 1
++    "color": "pink"
    },
    {
      "id": "necropolis_freq",
      "type": "BOOK",
      "name": { "str": "frequency list" },
      "description": "A notepad with a number of frequencies scribbled on it.",
--    "copy-from": "mag_comic",
-+    "weight": "1 g",
-+    "volume": "250 ml",
+-    "weight": "1 g",
+-    "volume": "250 ml",
++    "copy-from": "mag_comic",
      "price": 3000,
--    "fun": -2
-+    "price_postapoc": 50,
-+    "bashing": 1,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_cyan",
-+    "intelligence": 2,
-+    "time": "10 m"
+-    "price_postapoc": 50,
+-    "bashing": 1,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_cyan",
+-    "intelligence": 2,
+-    "time": "10 m"
++    "fun": -2
    },
    {
      "id": "news_regional",
      "type": "BOOK",
      "name": { "str": "Rural Digest-Examiner", "str_pl": "issues of Rural Digest-Examiner" },
      "description": "A newsweekly covering regional events.  There is an article on the winter's snowstorms and several letters to the editor concerning the community response.",
--    "copy-from": "mag_comic",
--    "price": 350
-+    "weight": "80 g",
-+    "volume": "250 ml",
-+    "price": 350,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "pink",
-+    "intelligence": 5,
-+    "time": "5 m",
-+    "fun": 1
+-    "weight": "80 g",
+-    "volume": "250 ml",
+-    "price": 350,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "pink",
+-    "intelligence": 5,
+-    "time": "5 m",
+-    "fun": 1
++    "copy-from": "mag_comic",
++    "price": 350
    },
    {
      "id": "novel_adventure",
-@@ -227,7 +676,10 @@
+@@ -676,10 +227,7 @@
      "name": { "str": "adventure novel" },
      "description": "The stirring tale of a race against time, in search of a lost city located in the dark heart of the African continent.",
      "copy-from": "paperback_novel",
--    "price": 850
-+    "price": 850,
-+    "price_postapoc": 50,
-+    "time": "20 m",
-+    "fun": 3
+-    "price": 850,
+-    "price_postapoc": 50,
+-    "time": "20 m",
+-    "fun": 3
++    "price": 850
    },
    {
      "id": "novel_buddy",
-@@ -235,78 +687,158 @@
+@@ -687,158 +235,78 @@
      "name": { "str": "buddy novel" },
      "description": "A gripping tale of two friends struggling to survive on the streets of New York City.",
      "copy-from": "paperback_novel",
--    "price": 650
-+    "weight": "244 g",
-+    "volume": "500 ml",
-+    "price": 650,
-+    "time": "20 m"
+-    "weight": "244 g",
+-    "volume": "500 ml",
+-    "price": 650,
+-    "time": "20 m"
++    "price": 650
    },
    {
      "id": "novel_coa",
      "type": "BOOK",
      "name": { "str": "coming of age novel" },
      "description": "A classic tale about growing up, portraying one young man's funny and poignant experiences with life, love, and sex.",
--    "copy-from": "paperback_novel"
-+    "weight": "187 g",
-+    "volume": "500 ml",
-+    "price": 750,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 4,
-+    "time": "20 m",
-+    "chapters": 16,
-+    "fun": 2
-+  },
-+  {
-+    "id": "novel_coa2",
-+    "type": "BOOK",
-+    "name": { "str": "coming of age novel" },
-+    "copy-from": "novel_coa",
-+    "description": "A graphic novel about a young girl living in Iran during the 1980's, seeing the world change around her as Iraq invaded her country.",
-+    "relative": { "time": -4, "chapters": -2, "fun": 1 }
+-    "weight": "187 g",
+-    "volume": "500 ml",
+-    "price": 750,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 4,
+-    "time": "20 m",
+-    "chapters": 16,
+-    "fun": 2
+-  },
+-  {
+-    "id": "novel_coa2",
+-    "type": "BOOK",
+-    "name": { "str": "coming of age novel" },
+-    "copy-from": "novel_coa",
+-    "description": "A graphic novel about a young girl living in Iran during the 1980's, seeing the world change around her as Iraq invaded her country.",
+-    "relative": { "time": -4, "chapters": -2, "fun": 1 }
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_crime",
      "type": "BOOK",
      "name": { "str": "crime novel" },
      "description": "After their diamond heist goes wrong, the surviving criminals begin to suspect that one of them is a police informant.",
--    "copy-from": "paperback_novel",
--    "price": 850
-+    "weight": "227 g",
-+    "volume": "750 ml",
-+    "price": 850,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 6,
-+    "time": "20 m",
-+    "chapters": 24,
-+    "fun": 3
-+  },
-+  {
-+    "id": "novel_crime2",
-+    "type": "BOOK",
-+    "name": { "str": "crime novel" },
-+    "copy-from": "novel_crime",
-+    "description": "A story about three people in the fictional city of Los Santos, a gangster, an upper-class man, and a psychopath, eventually banding together to pull-off the biggest heist in the city's history",
-+    "relative": { "time": -3, "chapters": -3 }
-+  },
-+  {
-+    "id": "novel_crime_murdergrape",
-+    "type": "BOOK",
-+    "name": { "str": "Murdered by the Grapevine", "str_pl": "copies of Murdered by the Grapevine" },
-+    "description": "This cheap paperback tells the story of a mob boss done in by mere suspicion.  She never breaks a confidence, never rats out an accomplice, and never turns her back on a friend.  Nonetheless her grip on the reigns of the underworld is eroded by rumor and paranoia.",
-+    "copy-from": "paperback_novel"
+-    "weight": "227 g",
+-    "volume": "750 ml",
+-    "price": 850,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 6,
+-    "time": "20 m",
+-    "chapters": 24,
+-    "fun": 3
+-  },
+-  {
+-    "id": "novel_crime2",
+-    "type": "BOOK",
+-    "name": { "str": "crime novel" },
+-    "copy-from": "novel_crime",
+-    "description": "A story about three people in the fictional city of Los Santos, a gangster, an upper-class man, and a psychopath, eventually banding together to pull-off the biggest heist in the city's history",
+-    "relative": { "time": -3, "chapters": -3 }
+-  },
+-  {
+-    "id": "novel_crime_murdergrape",
+-    "type": "BOOK",
+-    "name": { "str": "Murdered by the Grapevine", "str_pl": "copies of Murdered by the Grapevine" },
+-    "description": "This cheap paperback tells the story of a mob boss done in by mere suspicion.  She never breaks a confidence, never rats out an accomplice, and never turns her back on a friend.  Nonetheless her grip on the reigns of the underworld is eroded by rumor and paranoia.",
+-    "copy-from": "paperback_novel"
++    "copy-from": "paperback_novel",
++    "price": 850
    },
    {
      "id": "novel_drama",
      "type": "BOOK",
      "name": { "str": "drama novel" },
      "description": "A real book for real adults.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "intelligence": 7,
-+    "time": "25 m",
-+    "chapters": 28,
-+    "fun": 3
+-    "copy-from": "paperback_novel",
+-    "intelligence": 7,
+-    "time": "25 m",
+-    "chapters": 28,
+-    "fun": 3
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_erotic",
      "type": "BOOK",
      "name": { "str": "erotic novel" },
      "description": "A hackneyed fictional narrative concealing low-grade literary smut.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "weight": "200 g",
-+    "volume": "500 ml",
-+    "time": "18 m",
-+    "chapters": 28
+-    "copy-from": "paperback_novel",
+-    "weight": "200 g",
+-    "volume": "500 ml",
+-    "time": "18 m",
+-    "chapters": 28
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_experimental",
      "type": "BOOK",
      "name": { "str": "experimental novel" },
      "description": "A bizarre play about the philosophy of existential absurdity.  Or maybe it's about two guys waiting for their friend to show up.  It's confusing.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "weight": "142 g",
-+    "volume": "500 ml",
-+    "intelligence": 7,
-+    "time": "20 m",
-+    "chapters": 20
+-    "copy-from": "paperback_novel",
+-    "weight": "142 g",
+-    "volume": "500 ml",
+-    "intelligence": 7,
+-    "time": "20 m",
+-    "chapters": 20
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_fantasy",
      "type": "BOOK",
      "name": { "str": "fantasy novel" },
      "description": "Basic sword & sorcery.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "weight": "227 g",
-+    "volume": "1 L",
-+    "intelligence": 7,
-+    "time": "20 m",
-+    "chapters": 28,
-+    "fun": 3
+-    "copy-from": "paperback_novel",
+-    "weight": "227 g",
+-    "volume": "1 L",
+-    "intelligence": 7,
+-    "time": "20 m",
+-    "chapters": 28,
+-    "fun": 3
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_horror",
      "type": "BOOK",
      "name": { "str": "horror novel" },
      "description": "Maybe not the best reading material considering the situation.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "weight": "227 g",
-+    "intelligence": 7,
-+    "time": "18 m",
-+    "chapters": 28
+-    "copy-from": "paperback_novel",
+-    "weight": "227 g",
+-    "intelligence": 7,
+-    "time": "18 m",
+-    "chapters": 28
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_mystery",
      "type": "BOOK",
      "name": { "str": "mystery novel" },
      "description": "A detective investigates an unusual murder in a secluded location.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "intelligence": 7,
-+    "time": "18 m",
-+    "chapters": 28,
-+    "fun": 3
+-    "copy-from": "paperback_novel",
+-    "intelligence": 7,
+-    "time": "18 m",
+-    "chapters": 28,
+-    "fun": 3
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_pulp",
      "type": "BOOK",
      "name": { "str": "pulp novel" },
      "description": "A hardboiled detective tale filled with hard hitting action and intrigue.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "intelligence": 6,
-+    "time": "18 m",
-+    "chapters": 24,
-+    "fun": 3
+-    "copy-from": "paperback_novel",
+-    "intelligence": 6,
+-    "time": "18 m",
+-    "chapters": 24,
+-    "fun": 3
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_road",
      "type": "BOOK",
      "name": { "str": "road novel" },
      "description": "A tale about a group of friends who wander the USA in the 1960s against a backdrop of jazz, poetry and drug use.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "weight": "244 g",
-+    "volume": "500 ml",
-+    "time": "20 m",
-+    "fun": 3
+-    "copy-from": "paperback_novel",
+-    "weight": "244 g",
+-    "volume": "500 ml",
+-    "time": "20 m",
+-    "fun": 3
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_romance",
-@@ -320,23 +852,51 @@
+@@ -852,51 +320,23 @@
      "type": "BOOK",
      "name": { "str": "samurai novel" },
      "description": "The classic tale of a wandering swordsman who comes to a small settlement and is hired to help the townsfolk defend themselves from a band of marauding outlaws.",
--    "copy-from": "paperback_novel"
-+    "weight": "322 g",
-+    "volume": "750 ml",
-+    "price": 750,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 7,
-+    "time": "20 m",
-+    "chapters": 28,
-+    "fun": 4
+-    "weight": "322 g",
+-    "volume": "750 ml",
+-    "price": 750,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 7,
+-    "time": "20 m",
+-    "chapters": 28,
+-    "fun": 4
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_satire",
      "type": "BOOK",
      "name": { "str": "satire novel" },
      "description": "A political satire of the pre-apocalypse world.  Looking back on it from this side of Armageddon makes it seem all the more ridiculous.",
--    "copy-from": "paperback_novel",
--    "price": 850
-+    "weight": "520 g",
-+    "volume": "750 ml",
-+    "price": 850,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 7,
-+    "time": "36 m",
-+    "chapters": 28,
-+    "fun": 2
+-    "weight": "520 g",
+-    "volume": "750 ml",
+-    "price": 850,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 7,
+-    "time": "36 m",
+-    "chapters": 28,
+-    "fun": 2
++    "copy-from": "paperback_novel",
++    "price": 850
    },
    {
      "id": "novel_scifi",
      "type": "BOOK",
      "name": { "str": "scifi novel" },
      "description": "Aliens, ray guns, and space ships.",
--    "copy-from": "paperback_novel",
-+    "weight": "227 g",
-+    "volume": "750 ml",
+-    "weight": "227 g",
+-    "volume": "750 ml",
++    "copy-from": "paperback_novel",
      "price": 850,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 6,
-+    "time": "20 m",
-+    "chapters": 24,
-+    "fun": 3,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 6,
+-    "time": "20 m",
+-    "chapters": 24,
+-    "fun": 3,
      "snippet_category": [
        {
          "id": "scifi1_1",
-@@ -487,13 +1047,35 @@
+@@ -1047,35 +487,13 @@
      "type": "BOOK",
      "name": { "str": "sports novel" },
      "description": "The dramatic tale of a small-time boxer who gets a rare chance to fight the heavy-weight champion, and seize his one chance to make a better life for himself while impressing the cute girl who works in the pet store.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "intelligence": 7,
-+    "time": "20 m",
-+    "chapters": 28,
-+    "fun": 3
+-    "copy-from": "paperback_novel",
+-    "intelligence": 7,
+-    "time": "20 m",
+-    "chapters": 28,
+-    "fun": 3
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_spy",
      "type": "BOOK",
      "name": { "str": "spy novel" },
      "description": "A tale of intrigue and espionage amongst Nazis, no, Commies, no, Iraqis!",
-+    "copy-from": "paperback_novel",
-+    "intelligence": 5,
-+    "time": "18 m",
-+    "chapters": 20,
-+    "fun": 3
-+  },
-+  {
-+    "id": "novel_spy_comefly",
-+    "type": "BOOK",
-+    "name": { "str": "Come Fly the Treacherous Skies", "str_pl": "copies of Come Fly the Treacherous Skies" },
-+    "description": "This tale of intrigue betrays the story of a debonair mechanic driven by a lust for revenge.  As she uncovers a sophisticated network of amateur pilots turned smugglers, the good guys and the bad guys begin to all look the same.",
-+    "copy-from": "paperback_novel"
-+  },
-+  {
-+    "id": "novel_spy_rocketsci",
-+    "type": "BOOK",
-+    "name": { "str": "Lies, Damn Lies, and Rocket Science", "str_pl": "copies of Lies, Damn Lies, and Rocket Science" },
-+    "description": "This spy novel tells the story of a jaded rocket scientist looking for redemption in all the wrong places.  As selling state secrets becomes her career, she learns there isn't much of difference between a double-agent and a triple-agent.",
+-    "copy-from": "paperback_novel",
+-    "intelligence": 5,
+-    "time": "18 m",
+-    "chapters": 20,
+-    "fun": 3
+-  },
+-  {
+-    "id": "novel_spy_comefly",
+-    "type": "BOOK",
+-    "name": { "str": "Come Fly the Treacherous Skies", "str_pl": "copies of Come Fly the Treacherous Skies" },
+-    "description": "This tale of intrigue betrays the story of a debonair mechanic driven by a lust for revenge.  As she uncovers a sophisticated network of amateur pilots turned smugglers, the good guys and the bad guys begin to all look the same.",
+-    "copy-from": "paperback_novel"
+-  },
+-  {
+-    "id": "novel_spy_rocketsci",
+-    "type": "BOOK",
+-    "name": { "str": "Lies, Damn Lies, and Rocket Science", "str_pl": "copies of Lies, Damn Lies, and Rocket Science" },
+-    "description": "This spy novel tells the story of a jaded rocket scientist looking for redemption in all the wrong places.  As selling state secrets becomes her career, she learns there isn't much of difference between a double-agent and a triple-agent.",
      "copy-from": "paperback_novel"
    },
    {
-@@ -501,42 +1083,74 @@
+@@ -1083,74 +501,42 @@
      "type": "BOOK",
      "name": { "str": "swashbuckling novel" },
      "description": "An exciting seventeenth century tale of how an enslaved Irish doctor and his comrades-in-chains escape and become heroic pirates of the Robin Hood variety.",
--    "copy-from": "paperback_novel"
-+    "weight": "582 g",
-+    "volume": "750 ml",
-+    "copy-from": "paperback_novel",
-+    "intelligence": 7,
-+    "time": "20 m",
-+    "chapters": 28,
-+    "fun": 4
+-    "weight": "582 g",
+-    "volume": "750 ml",
+-    "copy-from": "paperback_novel",
+-    "intelligence": 7,
+-    "time": "20 m",
+-    "chapters": 28,
+-    "fun": 4
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_thriller",
      "type": "BOOK",
      "name": { "str": "thriller novel" },
      "description": "A suspenseful tale of betrayal and revenge.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "intelligence": 5,
-+    "time": "18 m",
-+    "chapters": 20,
-+    "fun": 3
+-    "copy-from": "paperback_novel",
+-    "intelligence": 5,
+-    "time": "18 m",
+-    "chapters": 20,
+-    "fun": 3
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_tragedy",
      "type": "BOOK",
      "name": { "str": "tragedy novel" },
      "description": "The story of two young lovers whose feuding families threaten to keep them apart.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "weight": "263 g",
-+    "volume": "1 L",
-+    "intelligence": 7,
-+    "time": "18 m",
-+    "chapters": 28
+-    "copy-from": "paperback_novel",
+-    "weight": "263 g",
+-    "volume": "1 L",
+-    "intelligence": 7,
+-    "time": "18 m",
+-    "chapters": 28
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_war",
      "type": "BOOK",
      "name": { "str": "war novel" },
      "description": "A thrilling narrative of survival in a prisoner of war camp during the Second World War, filled with riveting subplots about rat farming and dysentery.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "weight": "686 g",
-+    "price_postapoc": 50,
-+    "intelligence": 7,
-+    "time": "20 m",
-+    "chapters": 28,
-+    "fun": 3
-+  },
-+  {
-+    "id": "novel_war2",
-+    "type": "BOOK",
-+    "name": { "str": "war novel" },
-+    "copy-from": "novel_war",
-+    "description": "A story about a Bosnian citizen who goes through many hardships and near death during the breakup of Yugoslavia.",
-+    "relative": { "time": -4, "chapters": -4 }
+-    "copy-from": "paperback_novel",
+-    "weight": "686 g",
+-    "price_postapoc": 50,
+-    "intelligence": 7,
+-    "time": "20 m",
+-    "chapters": 28,
+-    "fun": 3
+-  },
+-  {
+-    "id": "novel_war2",
+-    "type": "BOOK",
+-    "name": { "str": "war novel" },
+-    "copy-from": "novel_war",
+-    "description": "A story about a Bosnian citizen who goes through many hardships and near death during the breakup of Yugoslavia.",
+-    "relative": { "time": -4, "chapters": -4 }
++    "copy-from": "paperback_novel"
    },
    {
      "id": "novel_western",
      "type": "BOOK",
      "name": { "str": "western novel" },
      "description": "The classic tale of a gunfighting stranger who comes to a small settlement and is hired to help the townsfolk defend themselves from a band of marauding outlaws.",
--    "copy-from": "paperback_novel"
-+    "copy-from": "paperback_novel",
-+    "intelligence": 5,
-+    "time": "20 m",
-+    "chapters": 28,
-+    "fun": 4
+-    "copy-from": "paperback_novel",
+-    "intelligence": 5,
+-    "time": "20 m",
+-    "chapters": 28,
+-    "fun": 4
++    "copy-from": "paperback_novel"
    },
    {
      "id": "philosophy_book",
      "type": "BOOK",
      "name": { "str": "book of philosophy", "str_pl": "books of philosophy" },
      "description": "A deep discussion of morality with an emphasis on epistemology and logic.",
--    "copy-from": "paperback_novel",
++    "copy-from": "paperback_novel",
      "snippet_category": [
        {
          "id": "philosophy1",
-@@ -686,90 +1300,230 @@
+@@ -1300,230 +686,90 @@
        },
        { "id": "philosophy45", "text": "This is a copy of \"Anti-Capitalist Mentality\" by Ludwig von Mises." }
      ],
--    "price": 1250
-+    "weight": "350 g",
-+    "volume": "750 ml",
-+    "price": 1250,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 9,
-+    "time": "36 m",
-+    "chapters": 44,
-+    "fun": 3
+-    "weight": "350 g",
+-    "volume": "750 ml",
+-    "price": 1250,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 9,
+-    "time": "36 m",
+-    "chapters": 44,
+-    "fun": 3
++    "price": 1250
    },
    {
      "id": "phonebook",
      "type": "BOOK",
      "name": { "str": "phone book" },
      "description": "This hefty volume contains the telephone numbers of individuals, businesses, and utilities in the nearby area, pretty useless during the apocalypse and all.",
--    "copy-from": "black_box_transcript",
--    "weight": "2 kg",
--    "volume": "1500 ml",
--    "price": 800
-+    "weight": "854 g",
-+    "volume": "2500 ml",
-+    "price": 800,
-+    "price_postapoc": 50,
-+    "bashing": 2,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "yellow",
-+    "intelligence": 4,
-+    "time": "1 m",
-+    "chapters": 200,
-+    "fun": -5
+-    "weight": "854 g",
+-    "volume": "2500 ml",
+-    "price": 800,
+-    "price_postapoc": 50,
+-    "bashing": 2,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "yellow",
+-    "intelligence": 4,
+-    "time": "1 m",
+-    "chapters": 200,
+-    "fun": -5
++    "copy-from": "black_box_transcript",
++    "weight": "2 kg",
++    "volume": "1500 ml",
++    "price": 800
    },
    {
      "id": "photo_album",
      "type": "BOOK",
      "name": { "str": "photo album" },
      "description": "A leather album full of photos of somebody's family.  You don't know any of the people in them, but seeing these pictures still makes you think of happier times.",
--    "copy-from": "paperback_novel",
-+    "weight": "180 g",
-+    "volume": "250 ml",
+-    "weight": "180 g",
+-    "volume": "250 ml",
++    "copy-from": "paperback_novel",
      "price": 3000,
-+    "price_postapoc": 50,
+-    "price_postapoc": 50,
      "material": [ "paper", "leather" ],
--    "fun": 1
-+    "symbol": "?",
-+    "color": "light_gray",
-+    "time": "10 m",
-+    "chapters": 4,
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
+-    "symbol": "?",
+-    "color": "light_gray",
+-    "time": "10 m",
+-    "chapters": 4,
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
++    "fun": 1
    },
    {
      "id": "plays_book",
      "type": "BOOK",
      "name": { "str": "book of plays", "str_pl": "books of plays" },
      "description": "A collection of plays by various authors from around the world, including scripts by Wilde, Beckett, Checkov, and Shakespeare.",
--    "copy-from": "paperback_novel",
--    "price": 1150
-+    "weight": "700 g",
-+    "volume": "750 ml",
-+    "price": 1150,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 9,
-+    "time": "18 m",
-+    "chapters": 36,
-+    "fun": 2
+-    "weight": "700 g",
+-    "volume": "750 ml",
+-    "price": 1150,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 9,
+-    "time": "18 m",
+-    "chapters": 36,
+-    "fun": 2
++    "copy-from": "paperback_novel",
++    "price": 1150
    },
    {
      "id": "poetry_book",
      "type": "BOOK",
      "name": { "str": "book of poetry", "str_pl": "books of poetry" },
      "description": "A collection of poetry by various authors from around the world, including writings by Dickinson, Goethe, Thoreau, and Yeats.",
--    "copy-from": "paperback_novel",
--    "price": 1050
-+    "weight": "400 g",
-+    "volume": "500 ml",
-+    "price": 1050,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 9,
-+    "time": "18 m",
-+    "chapters": 36,
-+    "fun": 2
-+  },
-+  {
-+    "id": "priest_diary",
-+    "type": "BOOK",
-+    "name": { "str": "priest's diary", "str_pl": "priests' diaries" },
-+    "description": "A small book filled with journal entries in Latin.",
-+    "weight": "340 g",
-+    "volume": "750 ml",
-+    "price": 1500,
-+    "price_postapoc": 50,
-+    "bashing": 3,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_gray",
-+    "intelligence": 15,
-+    "time": "30 m",
-+    "fun": -1,
-+    "flags": [ "INSPIRATIONAL" ]
+-    "weight": "400 g",
+-    "volume": "500 ml",
+-    "price": 1050,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 9,
+-    "time": "18 m",
+-    "chapters": 36,
+-    "fun": 2
+-  },
+-  {
+-    "id": "priest_diary",
+-    "type": "BOOK",
+-    "name": { "str": "priest's diary", "str_pl": "priests' diaries" },
+-    "description": "A small book filled with journal entries in Latin.",
+-    "weight": "340 g",
+-    "volume": "750 ml",
+-    "price": 1500,
+-    "price_postapoc": 50,
+-    "bashing": 3,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_gray",
+-    "intelligence": 15,
+-    "time": "30 m",
+-    "fun": -1,
+-    "flags": [ "INSPIRATIONAL" ]
++    "copy-from": "paperback_novel",
++    "price": 1050
    },
    {
      "id": "record_accounting",
      "type": "BOOK",
      "name": { "str": "corporate accounting ledger" },
      "description": "If you knew what to look for something might stand out…",
--    "copy-from": "black_box_transcript",
--    "price": 2000
-+    "weight": "566 g",
-+    "volume": "1250 ml",
-+    "price": 2000,
-+    "price_postapoc": 50,
-+    "bashing": 5,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_green",
-+    "intelligence": 10,
-+    "time": "30 m",
-+    "fun": -1
+-    "weight": "566 g",
+-    "volume": "1250 ml",
+-    "price": 2000,
+-    "price_postapoc": 50,
+-    "bashing": 5,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_green",
+-    "intelligence": 10,
+-    "time": "30 m",
+-    "fun": -1
++    "copy-from": "black_box_transcript",
++    "price": 2000
    },
    {
      "id": "record_patient",
      "type": "BOOK",
      "name": { "str_sp": "patient treatment records" },
      "description": "A massive stack of medical records that contain every gory detail.",
--    "copy-from": "paperback_novel",
--    "price": 500
-+    "weight": "680 g",
-+    "volume": "1500 ml",
-+    "price": 500,
-+    "price_postapoc": 50,
-+    "bashing": 6,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_green",
-+    "intelligence": 8,
-+    "time": "30 m",
-+    "fun": -1
+-    "weight": "680 g",
+-    "volume": "1500 ml",
+-    "price": 500,
+-    "price_postapoc": 50,
+-    "bashing": 6,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_green",
+-    "intelligence": 8,
+-    "time": "30 m",
+-    "fun": -1
++    "copy-from": "paperback_novel",
++    "price": 500
    },
    {
      "id": "record_weather",
      "type": "BOOK",
      "name": { "str_sp": "national weather transcripts" },
      "description": "Old weather records are about as interesting as a rock.",
--    "copy-from": "black_box_transcript",
--    "price": 500
-+    "weight": "454 g",
-+    "volume": "1750 ml",
-+    "price": 500,
-+    "price_postapoc": 50,
-+    "bashing": 7,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_green",
-+    "intelligence": 4,
-+    "time": "30 m",
-+    "fun": -1
+-    "weight": "454 g",
+-    "volume": "1750 ml",
+-    "price": 500,
+-    "price_postapoc": 50,
+-    "bashing": 7,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_green",
+-    "intelligence": 4,
+-    "time": "30 m",
+-    "fun": -1
++    "copy-from": "black_box_transcript",
++    "price": 500
    },
    {
      "id": "story_book",
      "type": "BOOK",
      "name": { "str": "big book of short stories", "str_pl": "big books of short stories" },
      "description": "This humongous volume contains a vast collection of short stories by different authors, spanning a wide variety of topics and genres.",
--    "copy-from": "paperback_novel",
--    "price": 1400
-+    "weight": "1720 g",
-+    "volume": "1 L",
-+    "price": 1400,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 7,
-+    "time": "48 m",
-+    "chapters": 28,
-+    "fun": 5
+-    "weight": "1720 g",
+-    "volume": "1 L",
+-    "price": 1400,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 7,
+-    "time": "48 m",
+-    "chapters": 28,
+-    "fun": 5
++    "copy-from": "paperback_novel",
++    "price": 1400
    },
    {
      "id": "tall_tales",
      "type": "BOOK",
      "name": { "str": "book of tall tales", "str_pl": "books of tall tales" },
      "description": "An entertaining collection of early American folklore, featuring tales of larger than life individuals and their amazing adventures.",
--    "copy-from": "paperback_novel",
--    "price": 1050
-+    "weight": "360 g",
-+    "volume": "750 ml",
-+    "price": 1050,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_blue",
-+    "intelligence": 6,
-+    "time": "18 m",
-+    "chapters": 24,
-+    "fun": 3
-+  },
-+  {
-+    "id": "visions_solitude",
-+    "type": "BOOK",
-+    "name": { "str": "Visions in Solitude", "str_pl": "copies of Visions in Solitude" },
-+    "description": "A small book detailing 'visions' a prisoner had on death row.",
-+    "weight": "227 g",
-+    "volume": "750 ml",
-+    "price": 2900,
-+    "price_postapoc": 50,
-+    "bashing": 3,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "light_cyan",
-+    "intelligence": 6,
-+    "time": "30 m",
-+    "fun": 2,
-+    "flags": [ "INSPIRATIONAL" ]
-+  },
-+  {
-+    "id": "holybook_havamal",
-+    "type": "BOOK",
-+    "name": { "str": "Hávamál", "str_pl": "copies of Hávamál" },
-+    "description": "An English translation of several Old Norse poems.  The poems contain proverbs and stories attributed to the god Odin, many transcribed from oral history.",
-+    "weight": "292 g",
-+    "volume": "750 ml",
-+    "price": 550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "symbol": "?",
-+    "color": "dark_gray",
-+    "intelligence": 8,
-+    "time": "10 m",
-+    "fun": 1,
-+    "flags": [ "INSPIRATIONAL" ]
+-    "weight": "360 g",
+-    "volume": "750 ml",
+-    "price": 1050,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_blue",
+-    "intelligence": 6,
+-    "time": "18 m",
+-    "chapters": 24,
+-    "fun": 3
+-  },
+-  {
+-    "id": "visions_solitude",
+-    "type": "BOOK",
+-    "name": { "str": "Visions in Solitude", "str_pl": "copies of Visions in Solitude" },
+-    "description": "A small book detailing 'visions' a prisoner had on death row.",
+-    "weight": "227 g",
+-    "volume": "750 ml",
+-    "price": 2900,
+-    "price_postapoc": 50,
+-    "bashing": 3,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "light_cyan",
+-    "intelligence": 6,
+-    "time": "30 m",
+-    "fun": 2,
+-    "flags": [ "INSPIRATIONAL" ]
+-  },
+-  {
+-    "id": "holybook_havamal",
+-    "type": "BOOK",
+-    "name": { "str": "Hávamál", "str_pl": "copies of Hávamál" },
+-    "description": "An English translation of several Old Norse poems.  The poems contain proverbs and stories attributed to the god Odin, many transcribed from oral history.",
+-    "weight": "292 g",
+-    "volume": "750 ml",
+-    "price": 550,
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "symbol": "?",
+-    "color": "dark_gray",
+-    "intelligence": 8,
+-    "time": "10 m",
+-    "fun": 1,
+-    "flags": [ "INSPIRATIONAL" ]
++    "copy-from": "paperback_novel",
++    "price": 1050
    },
    {
      "type": "BOOK",
      "id": "classic_literature",
      "name": { "str": "book of classic literature", "str_pl": "books of classic literature" },
      "description": "A book of classic literature, timeless and enjoyable but a bit dense to read.",
--    "copy-from": "paperback_novel",
++    "copy-from": "paperback_novel",
      "snippet_category": [
        { "id": "classic1", "text": "This is a copy of Dickens' \"Bleak House\"." },
        { "id": "classic2", "text": "This is a copy of \"Great Expectations\" by Charles Dickens." },
-@@ -868,15 +1622,24 @@
+@@ -1622,24 +868,15 @@
        { "id": "classic53", "text": "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat." },
        { "id": "classic54", "text": "This is a copy of \"Peter Simple\" by Frederick Marryat." }
      ],
-+    "weight": "350 g",
-+    "volume": "750 ml",
+-    "weight": "350 g",
+-    "volume": "750 ml",
      "price": 2000,
--    "looks_like": "tall_tales"
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
-+    "looks_like": "tall_tales",
-+    "color": "light_blue",
-+    "symbol": "?",
-+    "intelligence": 7,
-+    "time": "28 m",
-+    "chapters": 40,
-+    "fun": 3
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
+-    "looks_like": "tall_tales",
+-    "color": "light_blue",
+-    "symbol": "?",
+-    "intelligence": 7,
+-    "time": "28 m",
+-    "chapters": 40,
+-    "fun": 3
++    "looks_like": "tall_tales"
    },
    {
      "type": "BOOK",
      "id": "collector_book",
      "name": { "str": "collector's edition book" },
      "description": "A unique, valuable book that has been kept as a collector's item.",
--    "copy-from": "paperback_novel",
++    "copy-from": "paperback_novel",
      "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\"." },
-@@ -954,8 +1717,17 @@
+@@ -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.\""
        }
      ],
-+    "weight": "400 g",
-+    "volume": "750 ml",
+-    "weight": "400 g",
+-    "volume": "750 ml",
      "price": 4550,
-+    "price_postapoc": 50,
-+    "material": [ "paper" ],
+-    "price_postapoc": 50,
+-    "material": [ "paper" ],
      "looks_like": "tall_tales",
--    "fun": 3
-+    "color": "light_blue",
-+    "symbol": "?",
-+    "intelligence": 7,
-+    "time": "28 m",
-+    "chapters": 40,
-+    "fun": 4
+-    "color": "light_blue",
+-    "symbol": "?",
+-    "intelligence": 7,
+-    "time": "28 m",
+-    "chapters": 40,
+-    "fun": 4
++    "fun": 3
    }
  ]
+
 --- a/data/json/obsoletion/items.json
 +++ b/data/json/obsoletion/items.json
-@@ -3408,27 +3408,6 @@
+@@ -3408,6 +3408,27 @@
      "symbol": "|",
      "color": "brown"
    },
--  {
--    "id": "novel_coa2",
--    "type": "BOOK",
--    "name": { "str": "coming of age novel" },
--    "copy-from": "novel_coa",
--    "description": "A graphic novel about a young girl living in Iran during the 1980's, seeing the world change around her as Iraq invaded her country."
--  },
--  {
--    "id": "novel_crime2",
--    "type": "BOOK",
--    "name": { "str": "crime novel" },
--    "copy-from": "novel_crime",
--    "description": "A story about three people in the fictional city of Los Santos, a gangster, an upper-class man, and a psychopath, eventually banding together to pull-off the biggest heist in the city's history"
--  },
--  {
--    "id": "novel_war2",
--    "type": "BOOK",
--    "name": { "str": "war novel" },
--    "copy-from": "novel_war",
--    "description": "A story about a Bosnian citizen who goes through many hardships and near death during the breakup of Yugoslavia."
--  },
++  {
++    "id": "novel_coa2",
++    "type": "BOOK",
++    "name": { "str": "coming of age novel" },
++    "copy-from": "novel_coa",
++    "description": "A graphic novel about a young girl living in Iran during the 1980's, seeing the world change around her as Iraq invaded her country."
++  },
++  {
++    "id": "novel_crime2",
++    "type": "BOOK",
++    "name": { "str": "crime novel" },
++    "copy-from": "novel_crime",
++    "description": "A story about three people in the fictional city of Los Santos, a gangster, an upper-class man, and a psychopath, eventually banding together to pull-off the biggest heist in the city's history"
++  },
++  {
++    "id": "novel_war2",
++    "type": "BOOK",
++    "name": { "str": "war novel" },
++    "copy-from": "novel_war",
++    "description": "A story about a Bosnian citizen who goes through many hardships and near death during the breakup of Yugoslavia."
++  },
    {
      "id": "tanning_hide",
      "type": "GENERIC",
diff --git a/revert-03_generic-nv.patch b/revert-03_generic-nv.patch
new file mode 100644
index 0000000..fa6e34c
--- /dev/null
+++ b/revert-03_generic-nv.patch
@@ -0,0 +1,364 @@
+--- a/data/json/mutations/mutations.json
++++ b/data/json/mutations/mutations.json
+@@ -151,7 +151,7 @@
+     "description": "You heal faster when sleeping and will even recover a small amount of HP when not sleeping.",
+     "starting_trait": true,
+     "types": [ "HEALING" ],
+-    "changes_to": [ "FASTHEALER2", "REGEN_LIZ" ],
++    "changes_to": [ "FASTHEALER2" ],
+     "category": [ "MEDICAL" ],
+     "healing_awake": 0.2,
+     "healing_resting": 0.5,
+@@ -213,7 +213,7 @@
+     "starting_trait": true,
+     "changes_to": [ "NIGHTVISION2" ],
+     "cancels": [ "ELFA_NV", "ELFA_FNV", "FEL_NV", "URSINE_EYE" ],
+-    "category": [ "BIRD", "CATTLE", "INSECT" ],
++    "category": [ "BIRD", "CATTLE", "INSECT", "URSINE" ],
+     "active": true,
+     "starts_active": true,
+     "night_vision_range": 2
+@@ -692,7 +692,7 @@
+     "description": "Without glasses, your seeing radius is severely reduced!  However, you are guaranteed to start with a pair of glasses.",
+     "starting_trait": true,
+     "cancels": [ "URSINE_EYE", "EAGLEEYED", "HYPEROPIC" ],
+-    "category": [ "BEAST", "TROGLOBITE" ]
++    "category": [ "BEAST", "TROGLOBITE", "URSINE" ]
+   },
+   {
+     "type": "mutation",
+@@ -1238,7 +1238,7 @@
+     "prereqs": [ "NIGHTVISION" ],
+     "changes_to": [ "NIGHTVISION3" ],
+     "cancels": [ "ELFA_NV", "ELFA_FNV", "FEL_NV", "URSINE_EYE" ],
+-    "category": [ "FISH", "BEAST", "INSECT", "RAT", "CHIMERA", "LUPINE", "MOUSE" ],
++    "category": [ "FISH", "BEAST", "INSECT", "RAT", "CHIMERA", "LUPINE", "MOUSE", "FELINE", "URSINE" ],
+     "active": true,
+     "starts_active": true,
+     "night_vision_range": 4.5
+@@ -1252,7 +1252,8 @@
+     "prereqs": [ "NIGHTVISION2" ],
+     "leads_to": [ "INFRARED" ],
+     "cancels": [ "ELFA_NV", "ELFA_FNV", "FEL_NV", "URSINE_EYE" ],
+-    "category": [ "FISH", "TROGLOBITE", "SPIDER" ],
++    "threshreq": [ "THRESH_FISH", "THRESH_TROGLOBITE", "THRESH_SPIDER", "THRESH_INSECT", "THRESH_ELFA", "THRESH_CEPHALOPOD" ],
++    "category": [ "FISH", "TROGLOBITE", "SPIDER", "INSECT", "ELFA", "CEPHALOPOD" ],
+     "active": true,
+     "starts_active": true,
+     "night_vision_range": 10
+@@ -1265,62 +1266,22 @@
+     "visibility": 8,
+     "ugliness": 5,
+     "description": "Your eyes still bulge, yet your pupils look different somehow.  Water doesn't seem to cause any trouble at all, though.",
+-    "leads_to": [ "CEPH_VISION" ],
++    "leads_to": [ "NIGHTVISION3" ],
+     "cancels": [ "BIRD_EYE", "LIZ_EYE", "FEL_EYE", "URSINE_EYE", "COMPOUND_EYES", "ELFAEYES" ],
+     "category": [ "CEPHALOPOD" ]
+   },
+-  {
+-    "type": "mutation",
+-    "id": "CEPH_VISION",
+-    "name": { "str": "Cephalopod Vision" },
+-    "points": 3,
+-    "description": "Your brain has caught up with your eyes.  You can see much better in the dark, but sunlight seems much brighter now.  Activate to toggle NV-visible areas on or off.",
+-    "prereqs": [ "CEPH_EYES" ],
+-    "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3", "ELFA_NV", "ELFA_FNV" ],
+-    "category": [ "CEPHALOPOD" ],
+-    "active": true,
+-    "starts_active": true,
+-    "night_vision_range": 10
+-  },
+   {
+     "type": "mutation",
+     "id": "ELFAEYES",
+     "name": { "str": "Fey Eyes" },
+     "points": 1,
+     "description": "Your eyes have turned… green.  It's tough to tell the exact shade as it seems to shift.  The effect is… pleasant.",
+-    "leads_to": [ "ELFA_NV" ],
+     "valid": false,
+     "cancels": [ "BIRD_EYE", "LIZ_EYE", "FEL_EYE", "URSINE_EYE", "COMPOUND_EYES" ],
++    "leads_to": [ "NIGHTVISION2" ],
+     "category": [ "ELFA" ],
+     "social_modifiers": { "lie": 5, "persuade": 5, "intimidate": -5 }
+   },
+-  {
+-    "type": "mutation",
+-    "id": "ELFA_NV",
+-    "name": { "str": "Fey Vision" },
+-    "points": 3,
+-    "description": "The shadows don't seem as dark now.  Activate to toggle NV-visible areas on or off.",
+-    "prereqs": [ "ELFAEYES" ],
+-    "changes_to": [ "ELFA_FNV" ],
+-    "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ],
+-    "category": [ "ELFA" ],
+-    "active": true,
+-    "starts_active": true,
+-    "night_vision_range": 4.5
+-  },
+-  {
+-    "type": "mutation",
+-    "id": "ELFA_FNV",
+-    "name": { "str": "Fey Nightsight" },
+-    "points": 5,
+-    "description": "You have great low-light vision now, though that doesn't allow you to perform fine tasks such as crafting and reading in darkness.  Activate to toggle NV-visible areas on or off.",
+-    "prereqs": [ "ELFA_NV" ],
+-    "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ],
+-    "category": [ "ELFA" ],
+-    "active": true,
+-    "starts_active": true,
+-    "night_vision_range": 10
+-  },
+   {
+     "type": "mutation",
+     "id": "FEL_EYE",
+@@ -1330,46 +1291,10 @@
+     "ugliness": 1,
+     "description": "Your eyes have mutated, now having a slitted pupil and glittering in light, much like those of cats.  This is visually striking, but it isn't helping you see at night.",
+     "social_modifiers": { "lie": 2, "persuade": 2 },
+-    "leads_to": [ "FEL_NV" ],
++    "prereqs": [ "NIGHTVISION" ],
+     "cancels": [ "ELFAEYES", "LIZ_EYE", "BIRD_EYE", "URSINE_EYE", "COMPOUND_EYES" ],
+     "category": [ "FELINE", "BEAST" ]
+   },
+-  {
+-    "type": "mutation",
+-    "id": "FEL_NV",
+-    "name": { "str": "Feline Vision" },
+-    "points": 4,
+-    "description": "Your optic nerves and brain caught up with your eyes.  Now you can see pretty well at night.  Activate to toggle NV-visible areas on or off.",
+-    "prereqs": [ "FEL_EYE" ],
+-    "cancels": [ "ELFA_NV", "ELFA_FNV", "LIZ_IR", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ],
+-    "category": [ "FELINE" ],
+-    "active": true,
+-    "starts_active": true,
+-    "night_vision_range": 4.5
+-  },
+-  {
+-    "type": "mutation",
+-    "id": "URSINE_EYE",
+-    "name": { "str": "Ursine Vision" },
+-    "points": 1,
+-    "description": "Your visual processing has shifted: though you can see better in the dark, you're nearsighted in the light.  Maybe glasses would help.  Activate to toggle NV-visible areas on or off.",
+-    "cancels": [
+-      "ELFAEYES",
+-      "LIZ_EYE",
+-      "BIRD_EYE",
+-      "FEL_EYE",
+-      "COMPOUND_EYES",
+-      "NIGHTVISION",
+-      "NIGHTVISION2",
+-      "NIGHTVISION3",
+-      "MYOPIC",
+-      "HYPEROPIC"
+-    ],
+-    "category": [ "URSINE" ],
+-    "active": true,
+-    "starts_active": true,
+-    "night_vision_range": 4.5
+-  },
+   {
+     "type": "mutation",
+     "id": "BIRD_EYE",
+@@ -1378,7 +1303,7 @@
+     "visibility": 1,
+     "description": "Your vision has become particularly acute: you suspect you could pick out zombies much farther away.  Perception +4.",
+     "cancels": [ "ELFAEYES", "FEL_EYE", "LIZ_EYE", "URSINE_EYE", "COMPOUND_EYES" ],
+-    "prereqs": [ "PER_UP" ],
++    "prereqs": [ "PER_UP_2" ],
+     "threshreq": [ "THRESH_BIRD" ],
+     "category": [ "BIRD" ],
+     "passive_mods": { "per_mod": 4 }
+@@ -1391,7 +1316,8 @@
+     "description": "Your eyes have mutated to pick up radiation in the infrared spectrum.",
+     "prereqs": [ "NIGHTVISION3" ],
+     "cancels": [ "LIZ_IR" ],
+-    "category": [ "INSECT", "TROGLOBITE", "SPIDER" ]
++    "category": [ "INSECT", "TROGLOBITE", "SPIDER" ],
++    "threshreq": [ "THRESH_INSECT", "THRESH_TROGLOBITE", "THRESH_SPIDER" ]
+   },
+   {
+     "type": "mutation",
+@@ -1425,7 +1351,7 @@
+     "types": [ "HEALING" ],
+     "prereqs": [ "FASTHEALER" ],
+     "changes_to": [ "REGEN" ],
+-    "category": [ "PLANT" ],
++    "category": [ "PLANT", "LIZARD" ],
+     "healing_awake": 0.66,
+     "healing_resting": 0.5,
+     "mending_modifier": 4.0
+@@ -1452,7 +1378,7 @@
+     "purifiable": false,
+     "description": "Your broken limbs mend themselves without significant difficulty.",
+     "cancels": [ "ROT1", "ROT2", "ROT3" ],
+-    "prereqs": [ "FASTHEALER" ],
++    "prereqs": [ "FASTHEALER2" ],
+     "threshreq": [ "THRESH_LIZARD" ],
+     "category": [ "LIZARD" ],
+     "mending_modifier": 20.0
+@@ -1790,7 +1716,7 @@
+     "points": 0,
+     "visibility": 4,
+     "ugliness": 1,
+-    "bodytemp_modifiers": [ 300, 800 ],
++    "bodytemp_modifiers": [ 250, 800 ],
+     "bodytemp_sleep": 250,
+     "description": "You shan't need to migrate south with your layer of down.  It's even better with no apes around to kill you for it!",
+     "types": [ "SKIN" ],
+@@ -1820,7 +1746,7 @@
+     "points": 1,
+     "visibility": 10,
+     "ugliness": 3,
+-    "bodytemp_modifiers": [ 750, 1500 ],
++    "bodytemp_modifiers": [ 250, 1200 ],
+     "bodytemp_sleep": 500,
+     "description": "Thick black fur has grown to cover your entire body, providing a marginal protection against bashing attacks, and considerable protection from cold.",
+     "types": [ "SKIN" ],
+@@ -1836,7 +1762,7 @@
+     "points": 2,
+     "visibility": 10,
+     "ugliness": 3,
+-    "bodytemp_modifiers": [ 750, 1500 ],
++    "bodytemp_modifiers": [ 250, 1200 ],
+     "bodytemp_sleep": 500,
+     "description": "Your fur has grown out and thickened, providing noticeable protection from bashing attacks as well as considerable insulation.",
+     "types": [ "SKIN" ],
+@@ -1851,7 +1777,7 @@
+     "points": 1,
+     "visibility": 10,
+     "ugliness": 3,
+-    "bodytemp_modifiers": [ 750, 1500 ],
++    "bodytemp_modifiers": [ 250, 1200 ],
+     "bodytemp_sleep": 500,
+     "description": "Dense gray fur has grown to cover your entire body, providing a marginal protection against bashing attacks, and considerable protection from cold.",
+     "types": [ "SKIN" ],
+@@ -1866,7 +1792,7 @@
+     "points": 0,
+     "visibility": 10,
+     "ugliness": 3,
+-    "bodytemp_modifiers": [ 500, 1000 ],
++    "bodytemp_modifiers": [ 250, 1000 ],
+     "bodytemp_sleep": 300,
+     "description": "You've grown sleek brown fur, providing some protection from cold.",
+     "types": [ "SKIN" ],
+@@ -2651,6 +2577,7 @@
+     "description": "Your eyes are compound, like those of an insect.  This increases your Perception by 2 so long as you aren't wearing eyewear.",
+     "cancels": [ "ELFAEYES", "FEL_EYE", "URSINE_EYE", "BIRD_EYE", "LIZ_EYE" ],
+     "prereqs": [ "EYEBULGE" ],
++    "leads_to": [ "NIGHTVISION2" ],
+     "category": [ "INSECT" ]
+   },
+   {
+@@ -4294,7 +4221,8 @@
+     "description": "You're a real head-turner.  Some people will react well to your appearance, and most people have an easier time trusting you.",
+     "cancels": [ "UGLY", "DEFORMED", "DEFORMED2", "DEFORMED3" ],
+     "prereqs": [ "PRETTY" ],
+-    "changes_to": [ "BEAUTIFUL2" ]
++    "changes_to": [ "BEAUTIFUL2" ],
++    "category": [ "FELINE", "LUPINE" ]
+   },
+   {
+     "type": "mutation",
+@@ -4963,7 +4891,8 @@
+     "points": -3,
+     "description": "Your body's ability to digest meat is severely hampered.  Eating meat has a good chance of making you vomit it back up; even if you manage to keep it down, its nutritional value is greatly reduced.",
+     "cancels": [ "CARNIVORE", "SAPROVORE", "ANTIFRUIT", "MEATARIAN" ],
+-    "leads_to": [ "RUMINANT" ]
++    "leads_to": [ "RUMINANT" ],
++    "category": [ "CATTLE" ]
+   },
+   {
+     "type": "mutation",
+@@ -5515,7 +5444,7 @@
+     "points": -1,
+     "visibility": 10,
+     "ugliness": 3,
+-    "bodytemp_modifiers": [ 500, 750 ],
++    "bodytemp_modifiers": [ 250, 750 ],
+     "bodytemp_sleep": 200,
+     "mixed_effect": true,
+     "description": "Your protective shell has grown large enough to accommodate--if need be--your whole body.  Activate to pull your head and limbs into your shell, trading mobility and vision for warmth and shelter.",
+
+--- a/data/json/obsoletion/mutations.json
++++ b/data/json/obsoletion/mutations.json
+@@ -174,5 +174,80 @@
+     "points": -4,
+     "description": "Spending any amount of time in familiar places makes you miserable.  Must.  Keep.  Moving.",
+     "valid": false
++  },
++  {
++    "type": "mutation",
++    "id": "ELFA_NV",
++    "name": { "str": "Fey Vision" },
++    "points": 3,
++    "description": "The shadows don't seem as dark now.  Activate to toggle NV-visible areas on or off.",
++    "prereqs": [ "ELFAEYES" ],
++    "changes_to": [ "ELFA_FNV" ],
++    "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ],
++    "active": true,
++    "starts_active": true,
++    "valid": false,
++    "night_vision_range": 4.5
++  },
++  {
++    "type": "mutation",
++    "id": "ELFA_FNV",
++    "name": { "str": "Fey Nightsight" },
++    "points": 5,
++    "description": "You have great low-light vision now, though that doesn't allow you to perform fine tasks such as crafting and reading in darkness.  Activate to toggle NV-visible areas on or off.",
++    "prereqs": [ "ELFA_NV" ],
++    "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ],
++    "active": true,
++    "starts_active": true,
++    "valid": false,
++    "night_vision_range": 10
++  },
++  {
++    "type": "mutation",
++    "id": "FEL_NV",
++    "name": { "str": "Feline Vision" },
++    "points": 4,
++    "description": "Your optic nerves and brain caught up with your eyes.  Now you can see pretty well at night.  Activate to toggle NV-visible areas on or off.",
++    "prereqs": [ "FEL_EYE" ],
++    "cancels": [ "ELFA_NV", "ELFA_FNV", "LIZ_IR", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3" ],
++    "active": true,
++    "starts_active": true,
++    "valid": false,
++    "night_vision_range": 4.5
++  },
++  {
++    "type": "mutation",
++    "id": "CEPH_VISION",
++    "name": { "str": "Cephalopod Vision" },
++    "points": 3,
++    "description": "Your brain has caught up with your eyes.  You can see much better in the dark, but sunlight seems much brighter now.  Activate to toggle NV-visible areas on or off.",
++    "cancels": [ "LIZ_IR", "FEL_NV", "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3", "ELFA_NV", "ELFA_FNV" ],
++    "active": true,
++    "starts_active": true,
++    "valid": false,
++    "night_vision_range": 10
++  },
++  {
++    "type": "mutation",
++    "id": "URSINE_EYE",
++    "name": { "str": "Ursine Vision" },
++    "points": 1,
++    "description": "Your visual processing has shifted: though you can see better in the dark, you're nearsighted in the light.  Maybe glasses would help.  Activate to toggle NV-visible areas on or off.",
++    "cancels": [
++      "ELFAEYES",
++      "LIZ_EYE",
++      "BIRD_EYE",
++      "FEL_EYE",
++      "COMPOUND_EYES",
++      "NIGHTVISION",
++      "NIGHTVISION2",
++      "NIGHTVISION3",
++      "MYOPIC",
++      "HYPEROPIC"
++    ],
++    "valid": false,
++    "active": true,
++    "starts_active": true,
++    "night_vision_range": 4.5
+   }
+ ]
diff --git a/revert-04_telescopic-lenses.patch b/revert-04_telescopic-lenses.patch
new file mode 100644
index 0000000..bbe4ef7
--- /dev/null
+++ b/revert-04_telescopic-lenses.patch
@@ -0,0 +1,53 @@
+--- a/data/json/bionics.json
++++ b/data/json/bionics.json
+@@ -394,32 +394,10 @@
+   {
+     "id": "bio_eye_optic",
+     "type": "bionic",
+-    "name": { "str": "Telescopic Eyes" },
+-    "description": "Much of the material in your inner eye has been surgically removed and replaced with an array of high-powered, auto-focusing lenses.  They function as integrated binoculars, letting you see much farther than before, and any vision problems you might have had are now gone.",
++    "name": { "str": "Telescopic Lenses" },
++    "description": "The lenses in your eyes have been surgically removed and replaced with an array of high-powered, auto-focusing lenses.  They function as integrated binoculars, letting you see much farther than before, and any mundane vision problems you might have had are now gone.",
+     "occupied_bodyparts": [ [ "eyes", 2 ] ],
+-    "canceled_mutations": [
+-      "HYPEROPIC",
+-      "MYOPIC",
+-      "URSINE_EYE",
+-      "NIGHTVISION3",
+-      "NIGHTVISION2",
+-      "NIGHTVISION",
+-      "BIRD_EYE",
+-      "COMPOUND_EYES",
+-      "LIZ_IR",
+-      "EAGLEEYED",
+-      "CEPH_VISION",
+-      "CEPH_EYES",
+-      "ELFA_FNV",
+-      "ELFA_NV",
+-      "ELFAEYES",
+-      "FEL_NV",
+-      "FEL_EYE",
+-      "INFRARED",
+-      "LIZ_EYE",
+-      "EYEBULGE",
+-      "SEESLEEP"
+-    ]
++    "canceled_mutations": [ "HYPEROPIC", "MYOPIC" ]
+   },
+   {
+     "id": "bio_face_mask",
+
+--- a/data/json/items/bionics.json
++++ b/data/json/items/bionics.json
+@@ -339,9 +339,9 @@
+     "id": "bio_eye_optic",
+     "copy-from": "bionic_general",
+     "type": "BIONIC_ITEM",
+-    "name": { "str": "Telescopic Eyes CBM" },
++    "name": { "str": "Telescopic Lenses CBM" },
+     "looks_like": "bio_int_enhancer",
+-    "description": "An array of high-powered, auto-focusing lenses that replaces much of the material in the inner eye.  This fixes any vision problems and allows for an increased vision range akin to binoculars.",
++    "description": "An array of high-powered, auto-focusing lenses that replaces your natural lenses.  This fixes any mundane vision problems and allows for an increased vision range akin to binoculars.  Once installed they will be impossible to remove, having replaced part of your eyes.",
+     "price": 500000,
+     "weight": "100 g",
+     "difficulty": 5