Merge branch 'master' into basements

CleverRaven · Mar 26, 2019 · e4f68e2 · e4f68e2
2 parents d25f4d5 + e3964f4
commit e4f68e2
Show file tree

Hide file tree

Showing 15 changed files with 10,391 additions and 10,557 deletions.
diff --git a/data/json/item_groups.json b/data/json/item_groups.json
diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json
@@ -1,8 +1,8 @@
 [
   {
-    "type" : "item_group",
-    "id" : "book_gunmags",
-    "//" : "Magazines about guns",
+    "type": "item_group",
+    "id": "book_gunmags",
+    "//": "Magazines about guns",
     "items": [
       [ "mag_guns", 100 ],
       [ "mag_launcher", 5 ],
@@ -13,9 +13,9 @@
     ]
   },
   {
-    "type" : "item_group",
-    "id" : "book_gunref",
-    "//" : "Reference books about guns",
+    "type": "item_group",
+    "id": "book_gunref",
+    "//": "Reference books about guns",
     "items": [
       [ "manual_launcher", 5 ],
       [ "manual_pistol", 50 ],
@@ -27,9 +27,9 @@
     ]
   },
   {
-    "type" : "item_group",
-    "id" : "book_martial",
-    "//" : "Books about martial arts",
+    "type": "item_group",
+    "id": "book_martial",
+    "//": "Books about martial arts",
     "items": [
       [ "manual_eskrima", 100 ],
       [ "manual_krav_maga", 100 ],
@@ -39,10 +39,10 @@
     ]
   },
   {
-    "type" : "item_group",
-    "id" : "book_military",
-    "//" : "Military combat manuals and related books",
-    "items":[
+    "type": "item_group",
+    "id": "book_military",
+    "//": "Military combat manuals and related books",
+    "items": [
       { "group": "book_gunmags", "prob": 100 },
       { "group": "book_martial", "prob": 100 },
       [ "manual_bashing", 40 ],
@@ -60,9 +60,9 @@
     ]
   },
   {
-    "type" : "item_group",
-    "id" : "book_survival",
-    "//" : "Survival skill books weighted according to level",
+    "type": "item_group",
+    "id": "book_survival",
+    "//": "Survival skill books weighted according to level",
     "items": [
       [ "atomic_survival", 12 ],
       [ "fun_survival", 33 ],
@@ -75,11 +75,11 @@
     ]
   },
   {
-    "type" : "item_group",
-    "id" : "book_school",
+    "type": "item_group",
+    "id": "book_school",
     "subtype": "collection",
-    "//" : "Books found in school library",
-    "items":[
+    "//": "Books found in school library",
+    "items": [
       { "group": "novels", "prob": 50 },
       { "group": "manuals", "prob": 40 },
       { "group": "textbooks", "prob": 30 },