Merge pull request #86 from AtomicFox556/devbranch2

Update fluff items

data/json/itemgroups/Locations_MapExtras/mall_item_groups.json

@@ -130,7 +130,7 @@
       [ "baseball", 40 ],
       [ "football", 40 ],
       [ "basketball", 50 ],
-      [ "shark_plushie", 25 ],
+      [ "teddy_bear", 25 ],
       { "item": "talking_doll", "prob": 50, "charges": 100 },
       { "item": "marble", "prob": 60, "charges": [ 1, 20 ] },
       { "item": "creepy_doll", "prob": 1, "charges": 100 },

data/json/itemgroups/Locations_MapExtras/mansion.json

@@ -679,7 +679,7 @@
       [ "football", 20 ],
       [ "frisbee", 40 ],
       [ "disc_golf", 20 ],
-      [ "shark_plushie", 20 ],
+      [ "teddy_bear", 20 ],
       { "group": "toy_radio_car", "prob": 10 },
       { "group": "toy_makerspace_kit", "prob": 8 },
       { "group": "toy_robot_kit", "prob": 8 },
@@ -1026,7 +1026,7 @@
       [ "pride_flag", 5 ],
       [ "national_flag", 3 ],
       [ "state_flag", 3 ],
-      [ "shark_plushie", 10 ],
+      [ "teddy_bear", 10 ],
       [ "bottle_plastic", 30 ],
       [ "leathersandals", 30 ],
       [ "leather_belt", 30 ],

data/json/itemgroups/furniture.json

@@ -39,8 +39,7 @@
       { "item": "electric_blanket", "prob": 4 },
       { "item": "quilt", "prob": 10 },
       { "item": "quilt_patchwork", "prob": 8 },
-      { "item": "teddy_bear", "prob": 2 },
-      { "item": "shark_plushie", "prob": 2 },
+      { "item": "teddy_bear", "prob": 4 },
       { "item": "bodypillow", "prob": 1 }
     ]
   },

data/json/itemgroups/stashes.json

@@ -359,7 +359,7 @@
     "//": "this list is for toys that children may have wanted to take with themselves while preparing to run away for whatever reason.",
     "items": [
       { "item": "talking_doll", "prob": 50 },
-      { "item": "teddy_bear", "prob": 50 },
+      { "item": "teddy_bear", "prob": 52 },
       { "item": "toy_figurine", "prob": 45 },
       { "item": "toy_figurine_large", "prob": 35 },
       { "item": "bath_toy", "prob": 30 },
@@ -370,7 +370,6 @@
       { "group": "toy_makerspace_kit", "prob": 10 },
       { "group": "toy_robot_kit", "prob": 10 },
       { "group": "toy_engine_kit", "prob": 10 },
-      { "item": "shark_plushie", "prob": 2 },
       { "item": "air_launcher", "prob": 2 }
     ]
   },

data/json/items/book/nonfiction.json

@@ -211,7 +211,7 @@
     "id": "book_nonf_soft_psych_psycolo",
     "type": "BOOK",
     "name": { "str": "Psychoanalysis and Colonialism", "str_pl": "copies of Psychoanalysis and Colonialism" },
-    "description": "Freud referred to women's sexuality as a \"dark continent\" for psychoanalysis, drawing on colonial use of the same phrase to refer to Africa.  This book details how the problematic universalism of psychoanalysis led theorists to reject its relevance for postcolonial critique.",
+    "description": "This book traces the colonial backgrounds of psychoanalysis from its beginnings in the late nineteenth century up to the present, and details how the problematic universalism of psychoanalysis led theorists to reject its relevance for postcolonial critique.",
     "weight": "454 g",
     "volume": "734 ml",
     "time": "30 m",

data/json/items/fluff.json

@@ -19,7 +19,7 @@
     "id": "deck_of_cards",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "deck of cards", "str_pl": "decks of cards" },
+    "name": { "str": "card deck" },
     "description": "A deck of 52 playing cards.",
     "weight": "50 g",
     "volume": "100 ml",
@@ -35,7 +35,7 @@
     "id": "deck_of_cards_makeshift",
     "type": "GENERIC",
     "copy-from": "deck_of_cards",
-    "name": { "str": "makeshift deck of cards", "str_pl": "makeshift decks of cards" },
+    "name": { "str": "makeshift card deck" },
     "description": "A deck of 52 makeshift cards, made out of cardboard rectangles with simple designs drawn on them."
   },
   {
@@ -131,8 +131,8 @@
     "id": "cards_magic",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "deck of Sorcery cards", "str_pl": "decks of Sorcery cards" },
-    "description": "A set of cards meant to play the game \"Sorcery.\"  Each card has a fun picture of a different monster.",
+    "name": { "str": "fantasy CCG cards deck" },
+    "description": "A set of cards meant to play a fantasy-themed collectible card game.  Each card has a fun picture of a different monster.",
     "weight": "210 g",
     "volume": "250 ml",
     "price": 2300,
@@ -147,13 +147,13 @@
     "id": "pictionary",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Picturesque", "str_pl": "sets of Picturesque" },
-    "description": "A game where one player draws an image, and the others attempt to guess what it is.",
+    "name": { "str": "word-guessing game set" },
+    "description": "A set to play a board game where one player draws an image, and the others attempt to guess what it is.",
     "weight": "350 g",
     "volume": "500 ml",
     "price": 1500,
     "price_postapoc": 500,
-    "material": [ "plastic" ],
+    "material": [ "plastic", "paper" ],
     "symbol": "?",
     "color": "yellow",
     "flags": [ "NO_REPAIR" ],
@@ -163,13 +163,13 @@
     "id": "monopoly",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Capitalism", "str_pl": "sets of Capitalism" },
-    "description": "A game where players traverse around the board, buying property and swindling their friends.",
+    "name": { "str": "property trading game set" },
+    "description": "A set to play a board game where players traverse around the board, buying property and swindling their friends.",
     "weight": "300 g",
     "volume": "500 ml",
     "price": 99,
     "price_postapoc": 500,
-    "material": [ "plastic" ],
+    "material": [ "paper" ],
     "symbol": "?",
     "color": "red",
     "flags": [ "NO_REPAIR" ],
@@ -179,13 +179,13 @@
     "id": "dnd",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Blobs and Bandits", "str_pl": "sets of Blobs and Bandits" },
-    "description": "A roleplaying game set in the post-apocalypse, so you can pretend to survive the apocalypse while surviving the apocalypse.",
+    "name": { "str": "fantasy TTRPG game set" },
+    "description": "A set to play a fantasy-themed tabletop role-playing game.",
     "weight": "680 g",
     "volume": "1250 ml",
     "price": 12950,
     "price_postapoc": 500,
-    "material": [ "plastic" ],
+    "material": [ "paper", "plastic" ],
     "symbol": "?",
     "color": "red",
     "flags": [ "NO_REPAIR" ],
@@ -195,13 +195,13 @@
     "id": "g_warhammer",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Battlehammer", "str_pl": "sets of Battlehammer" },
-    "description": "A strategy game featuring a set of tiny figurines of fantasy creatures.",
+    "name": { "str": "fantasy tabletop wargame set" },
+    "description": "A set to play a fantasy-themed tabletop wargame.  Includes a set of tiny figurines of fantasy creatures.",
     "weight": "680 g",
     "volume": "1250 ml",
     "price": 10880,
     "price_postapoc": 500,
-    "material": [ "plastic" ],
+    "material": [ "paper", "plastic" ],
     "symbol": "?",
     "color": "yellow",
     "flags": [ "NO_REPAIR" ],
@@ -211,13 +211,13 @@
     "id": "g_warhammer40k",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Battlehammer 20k", "str_pl": "sets of Battlehammer 20k" },
-    "description": "A strategy game featuring a set of tiny figurines of space aliens and grotesque space marines.",
+    "name": { "str": "sci-fi tabletop wargame set" },
+    "description": "A set to play a sci-fi themed tabletop wargame.  Includes a set of tiny figurines of space aliens and grotesque space marines.",
     "weight": "680 g",
     "volume": "1250 ml",
     "price": 10880,
     "price_postapoc": 500,
-    "material": [ "plastic" ],
+    "material": [ "paper", "plastic" ],
     "symbol": "?",
     "color": "yellow",
     "flags": [ "NO_REPAIR" ],
@@ -227,8 +227,8 @@
     "id": "catan",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Settlers of the Ranch", "str_pl": "sets of Settlers of the Ranch" },
-    "description": "A strategy game where players build settlements and trade for supplies.",
+    "name": { "str": "settlement tabletop game set" },
+    "description": "A set to play a strategy game where players build settlements and trade for supplies.",
     "weight": "804 g",
     "volume": "1250 ml",
     "price": 7050,
@@ -419,8 +419,8 @@
     "id": "snakesnladders",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str_sp": "Snakes and Ladders" },
-    "description": "A board game for two or more players, regarded before the Cataclysm as as a worldwide classic.  The objective of the game is to navigate one's game piece to the goal on the board, helped by climbing ladders but hindered by sliding down snakes.",
+    "name": { "str_sp": "snakes and ladders game set" },
+    "description": "A set to play a board game for two or more players, regarded before the Cataclysm as as a worldwide classic.  The objective of the game is to navigate one's game piece to the goal on the board, helped by climbing ladders but hindered by sliding down snakes.",
     "weight": "300 g",
     "volume": "1800 ml",
     "price": 25,
@@ -435,7 +435,7 @@
     "id": "ludo",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Ludo" },
+    "name": { "str": "Ludo game set" },
     "description": "A strategy board game for two to four players, in which the players race their four tokens from start to finish according to the rolls of a single die.",
     "weight": "420 g",
     "volume": "2981 ml",
@@ -451,8 +451,8 @@
     "id": "poppirate",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Pop-up Pirate" },
-    "description": "A game of chance featuring a silly-looking pirate inside a spring-loaded barrel.  Players take turns inserting plastic swords into slots in the barrel, hoping to avoid the trigger slot that causes the pirate to be launched out of the barrel.",
+    "name": { "str": "luck-based children game set" },
+    "description": "A set to play a game of chance featuring a silly-looking pirate inside a spring-loaded barrel.  Players take turns inserting plastic swords into slots in the barrel, hoping to avoid the trigger slot that causes the pirate to be launched out of the barrel.",
     "weight": "1500 g",
     "volume": "8519 ml",
     "price": 25,
@@ -467,8 +467,8 @@
     "id": "ambush",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str_sp": "Ambuscade!" },
-    "description": "A board wargame that can be played alone or with friends.  When playing alone, the opponent's actions are chosen via tables, charts, and a 'paragraph book'.",
+    "name": { "str": "single-player board wargame set" },
+    "description": "A set to play a board wargame that can be played alone or with friends.  When playing alone, the opponent's actions are chosen via tables, charts, and a 'paragraph book'.",
     "weight": "1020 g",
     "volume": "3363 ml",
     "price": 25,
@@ -483,7 +483,7 @@
     "id": "ranger",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str_sp": "Patrol Leader" },
+    "name": { "str": "solitaire board wargame set" },
     "description": "A tactical solitaire board game.  The player is put in the role of a patrol leader in different modern battlefield scenarios, performing missions, capturing or killing enemies, protecting their teammates, and advancing on the map.",
     "weight": "1090 g",
     "volume": "5112 ml",
@@ -499,7 +499,7 @@
     "id": "openfire",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str_sp": "War Tanks" },
+    "name": { "str_sp": "solitaire board tank wargame set" },
     "description": "A tactical solitaire board game.  The player controls a platoon of tanks in six different scenarios with various victory conditions.  The player travels across the map, entering combat when an 'event marker' comes into their line of sight.",
     "weight": "840 g",
     "volume": "3660 ml",
@@ -515,13 +515,13 @@
     "id": "battleship",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Warships", "str_pl": "sets of Warships" },
+    "name": { "str": "guessing strategy board game set" },
     "description": "A game where players try to guess where the opponent placed their ships on the board.",
     "weight": "450 g",
     "volume": "500 ml",
     "price": 2000,
     "price_postapoc": 500,
-    "material": [ "plastic" ],
+    "material": [ "paper", "plastic" ],
     "symbol": "?",
     "color": "blue",
     "flags": [ "NO_REPAIR" ],
@@ -531,7 +531,7 @@
     "id": "clue",
     "type": "GENERIC",
     "category": "other",
-    "name": { "str": "Murder Mystery", "str_pl": "sets of Murder Mystery" },
+    "name": { "str": "murder mystery board game set" },
     "description": "A game where players try to figure out who murdered the butler.",
     "weight": "370 g",
     "volume": "500 ml",