Merge branch 'CleverRaven:master' into master

data/json/hobbies.json

@@ -1102,6 +1102,16 @@
     "skills": [ { "level": 3, "name": "fabrication" } ],
     "proficiencies": [ "prof_carving", "prof_carpentry_basic" ]
   },
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "luthier",
+    "name": "Woodworking - Luthier",
+    "description": "You've learned woodworking in the field of making musical instruments.  You'll be able to create musical instruments in the Cataclysm.",
+    "points": 3,
+    "skills": [ { "level": 3, "name": "fabrication" } ],
+    "proficiencies": [ "prof_luthier_basic" ]
+  },
   {
     "type": "profession",
     "subtype": "hobby",

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -995,9 +995,11 @@
           { "item": "harmonica_holder", "prob": 70 },
           { "item": "jug_clay", "prob": 20 },
           { "item": "saw", "prob": 20 },
+          { "item": "tonewood", "prob": 30 },
           { "item": "saxophone", "prob": 50 },
           { "item": "trumpet", "prob": 50 },
           { "item": "tuba", "prob": 25 },
+          { "item": "drum_percussion", "prob": 10 },
           { "item": "kantele", "prob": 10 },
           { "item": "ukulele", "prob": 50 },
           { "item": "fog_machine", "prob": 1, "charges": [ 0, 500 ] },
@@ -1024,6 +1026,7 @@
       [ "clarinet", 25 ],
       [ "saxophone", 25 ],
       [ "harmonica_holder", 25 ],
+      [ "tonewood", 10 ],
       [ "bagpipes", 5 ]
     ]
   },
@@ -1037,6 +1040,7 @@
       [ "ukulele", 90 ],
       [ "kantele", 10 ],
       [ "banjo", 100 ],
+      [ "tonewood", 10 ],
       [ "guitar_electric", 100 ]
     ]
   },

data/json/itemgroups/Locations_MapExtras/private_resort_item_groups.json

@@ -218,6 +218,7 @@
     "type": "item_group",
     "items": [
       { "item": "acoustic_guitar", "prob": 80 },
+      { "item": "drum_percussion", "prob": 40 },
       { "item": "guitar_electric", "prob": 20 },
       { "item": "saxophone", "prob": 50 },
       { "item": "harmonica_holder", "prob": 30 }

data/json/itemgroups/collections_domestic.json

@@ -1103,6 +1103,7 @@
       { "item": "slingpack", "prob": 15 },
       { "item": "fanny", "prob": 10 },
       { "item": "acoustic_guitar", "prob": 20 },
+      { "item": "drum_percussion", "prob": 10 },
       { "item": "saxophone", "prob": 15 },
       { "item": "clarinet", "prob": 10 },
       { "item": "flute", "prob": 10 },

data/json/itemgroups/tools.json

@@ -71,6 +71,21 @@
       [ "sandpaper", 100 ]
     ]
   },
+  {
+    "id": "tools_luthier",
+    "type": "item_group",
+    "//": "Portable tools used for luthier",
+    "items": [
+      { "item": "luthier_toolset", "prob": 100 },
+      { "item": "tonewood", "prob": 100, "count-min": 1, "count-max": 6 },
+      { "item": "tuning_pegs", "prob": 100, "count-min": 5, "count-max": 15 },
+      { "item": "piano_wire", "prob": 100, "count-min": 1, "count-max": 3 },
+      [ "hand_drill", 20 ],
+      { "item": "superglue", "prob": 100, "count-min": 1, "count-max": 3 },
+      [ "chisel", 10 ],
+      [ "sandpaper", 100 ]
+    ]
+  },
   {
     "id": "tools_construction",
     "type": "item_group",

data/json/items/generic.json

@@ -1001,6 +1001,21 @@
     "volume": "100 ml",
     "to_hit": -2
   },
+  {
+    "type": "GENERIC",
+    "id": "piano_wire",
+    "symbol": "l",
+    "color": "light_gray",
+    "name": { "str": "piano wire" },
+    "description": "A length of thin, relatively stretchy coiled steel wire.  Used to produce musical notes in instruments.",
+    "category": "spare_parts",
+    "price": 2000,
+    "price_postapoc": 10,
+    "material": [ "steel" ],
+    "weight": "1 g",
+    "volume": "3 ml",
+    "to_hit": -2
+  },
   {
     "type": "GENERIC",
     "id": "lc_wire",
@@ -1137,6 +1152,14 @@
     "milling": { "into": "meal_bone_tainted", "recipe": "meal_bone_tainted_mill_6_1" },
     "qualities": [ [ "COOK", 1 ] ]
   },
+  {
+    "type": "GENERIC",
+    "id": "drum_skin",
+    "name": { "str": "drum skin" },
+    "copy-from": "tanned_hide",
+    "weight": "10 g",
+    "description": "The tanned hide of an animal repursed to become the head on a percusssion drum."
+  },
   {
     "type": "GENERIC",
     "id": "torch_done",

data/json/items/resources/wood.json

@@ -132,6 +132,41 @@
     "flags": [ "FRAGILE_MELEE", "FIREWOOD" ],
     "melee_damage": { "bash": 16 }
   },
+  {
+    "type": "GENERIC",
+    "id": "tonewood",
+    "name": { "str": "tonewood", "str_pl": "blocks of tonewood" },
+    "description": "A block of tonally appropriate wood that has been air dryed for a year in preparation for being turned into a musical instrument.",
+    "category": "spare_parts",
+    "weight": "1830 g",
+    "color": "brown",
+    "symbol": "/",
+    "material": [ "wood" ],
+    "volume": "3099 ml",
+    "longest_side": "61 cm",
+    "to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "uneven" },
+    "price": 5000,
+    "price_postapoc": 100,
+    "flags": [ "FIREWOOD" ],
+    "melee_damage": { "bash": 6 }
+  },
+  {
+    "type": "GENERIC",
+    "id": "tuning_pegs",
+    "name": { "str": "tuning peg" },
+    "description": "Tuning pegs go on stringed instruments to both provide an anchor for the strings and to control the tightness of the wire which in turn controls the tune of the notes produced.",
+    "category": "spare_parts",
+    "weight": "50 mg",
+    "color": "brown",
+    "symbol": "/",
+    "material": [ "wood" ],
+    "volume": "1 ml",
+    "longest_side": "1 cm",
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "uneven" },
+    "price": 50,
+    "price_postapoc": 1,
+    "flags": [ "FIREWOOD" ]
+  },
   {
     "type": "GENERIC",
     "id": "plank_short",

data/json/items/tool/musical_instruments.json

@@ -297,8 +297,8 @@
     "name": { "str": "golden krar" },
     "description": "A shiny golden krar, similar to a harp.",
     "weight": "13000 g",
-    "volume": "2500 ml",
-    "longest_side": "60 cm",
+    "volume": "12 L",
+    "longest_side": "100 cm",
     "price": 1000000,
     "price_postapoc": 1000,
     "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "clumsy" },
@@ -317,6 +317,80 @@
     },
     "melee_damage": { "bash": 9 }
   },
+  {
+    "id": "krar",
+    "looks_like": "krar_golden",
+    "type": "TOOL",
+    "name": { "str": "krar" },
+    "description": "A wooden krar, similar to a harp.",
+    "copy-from": "krar_golden",
+    "material": "wood",
+    "weight": "2500 g"
+  },
+  {
+    "id": "drum_percussion",
+    "type": "TOOL",
+    "category": "tools",
+    "name": { "str": "drum, percussion", "str_pl": "drums, percussion" },
+    "description": "A standard factory-made percussion drum.  Looks to be in working condition.",
+    "weight": "2800 g",
+    "volume": "56629 ml",
+    "longest_side": "28 cm",
+    "price": 7500,
+    "price_postapoc": 500,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "clumsy" },
+    "flags": [ "FRAGILE_MELEE" ],
+    "material": [ { "type": "wood", "portion": 7 }, { "type": "steel" }, { "type": "nylon", "portion": 2 } ],
+    "symbol": "|",
+    "color": "white",
+    "use_action": [ { "type": "play_instrument" } ],
+    "tick_action": {
+      "type": "musical_instrument",
+      "volume": 28,
+      "fun": -3,
+      "fun_bonus": 2,
+      "speed_penalty": 18,
+      "description_frequency": 20,
+      "player_descriptions": [
+        "You play a beat on your drum.  Pa rum pa pum pum.",
+        "You play a fast beat on your drum.  Rat tat tat tat.",
+        "You play a march on your drums.  Brrrum brrum brrrrum."
+      ]
+    },
+    "melee_damage": { "bash": 2 }
+  },
+  {
+    "id": "drum_percussion_primitive",
+    "type": "TOOL",
+    "category": "tools",
+    "name": { "str": "primitive drum, percussion", "str_pl": "primitive drums, percussion" },
+    "description": "A handmade primitive percussion drum.  Looks to be in working condition.",
+    "weight": "2800 g",
+    "volume": "56629 ml",
+    "longest_side": "28 cm",
+    "price": 7500,
+    "price_postapoc": 500,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "clumsy" },
+    "flags": [ "FRAGILE_MELEE" ],
+    "material": [ { "type": "wood", "portion": 7 }, { "type": "steel" }, { "type": "leather", "portion": 2 } ],
+    "symbol": "|",
+    "color": "white",
+    "use_action": [ { "type": "play_instrument" } ],
+    "tick_action": {
+      "type": "musical_instrument",
+      "volume": 28,
+      "fun": -3,
+      "fun_bonus": 2,
+      "speed_penalty": 18,
+      "description_frequency": 20,
+      "player_descriptions": [
+        "You play a beat on your drum.  Pa rum pa pum pum.",
+        "You play a fast beat on your drum.  Rat tat tat tat.",
+        "You play a march on your drums.  Brrrum brrum brrrrum."
+      ]
+    },
+    "melee_damage": { "bash": 2 }
+  },
   {
     "type": "TOOL_ARMOR",
     "id": "harmonica_holder",

data/json/items/tool/woodworking.json

@@ -353,6 +353,25 @@
     "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "BUTCHER", 16 ] ],
     "melee_damage": { "bash": 10, "cut": 20 }
   },
+  {
+    "id": "luthier_toolset",
+    "type": "TOOL",
+    "name": { "str": "luthier toolset" },
+    "description": "A set of luthier tools in several sizes and types.  Guaranteed to have the right tools for creating musical instruments from wood.",
+    "looks_like": "screwdriver_set",
+    "weight": "1600 g",
+    "volume": "1500 ml",
+    "longest_side": "28 cm",
+    "price": 20000,
+    "price_postapoc": 250,
+    "to_hit": -2,
+    "material": [ "steel", "plastic" ],
+    "symbol": ";",
+    "color": "yellow",
+    "qualities": [ [ "LUTHIER", 1 ] ],
+    "flags": [ "BELT_CLIP", "NO_SALVAGE" ],
+    "melee_damage": { "bash": 2 }
+  },
   {
     "id": "elec_chainsaw_off",
     "type": "TOOL",

data/json/mapgen/Woodworker.json

@@ -85,7 +85,8 @@
         "D": { "item": "trash", "chance": 75, "repeat": [ 1, 3 ] },
         "R": [
           { "item": "home_hw", "chance": 20, "repeat": [ 1, 4 ] },
-          { "item": "tools_carpentry", "chance": 80, "repeat": [ 1, 2 ] }
+          { "item": "tools_carpentry", "chance": 80, "repeat": [ 1, 2 ] },
+          { "item": "tools_luthier", "chance": 40, "repeat": [ 1, 2 ] }
         ]
       },
       "place_loot": [

data/json/mapgen/musicstore.json

@@ -73,7 +73,7 @@
         { "group": "mussto_stringinst", "x": [ 5, 10 ], "y": 13, "chance": 70, "repeat": [ 3, 7 ] },
         { "group": "mussto_windinst", "x": [ 5, 10 ], "y": 14, "chance": 80, "repeat": [ 3, 7 ] },
         { "group": "mussto_stringinst", "x": [ 5, 10 ], "y": 16, "chance": 70, "repeat": [ 3, 7 ] },
-        { "group": "mussto_windinst", "x": [ 5, 10 ], "y": 17, "chance": 80, "repeat": [ 3, 7 ] },
+        { "group": "tools_luthier", "x": [ 5, 10 ], "y": 17, "chance": 80, "repeat": [ 3, 7 ] },
         { "group": "light_reading", "x": [ 13, 14 ], "y": [ 10, 12 ], "chance": 90, "repeat": [ 4, 10 ] },
         { "group": "musicstore_showpiece", "x": 21, "y": 8, "chance": 95 },
         { "item": "amplifier_head", "x": 15, "y": [ 16, 17 ], "chance": 80 },

data/json/mapgen/nested/basement_nested.json

@@ -1807,7 +1807,9 @@
         { "item": "amplifier_head", "x": 1, "y": 5, "chance": 100 },
         { "item": "mixer_music", "x": 6, "y": 2, "chance": 100 },
         { "item": "guitar_stand", "x": 3, "y": 3, "chance": 100 },
+        { "item": "piano_wire", "x": 3, "y": 3, "chance": 20 },
         { "item": "guitar_stand", "x": 0, "y": 5, "chance": 100 },
+        { "item": "piano_wire", "x": 0, "y": 5, "chance": 20 },
         { "item": "mic_stand_tall", "x": 5, "y": 5, "chance": 100 },
         { "item": "microphone_xlr_generic", "x": 5, "y": 5, "chance": 100 },
         { "item": "headphones_circumaural", "x": 6, "y": 2, "chance": 100 },
@@ -3376,6 +3378,7 @@
         { "item": "amplifier_head", "x": 6, "y": 5, "chance": 100 },
         { "item": "mixer_music", "x": [ 4, 7 ], "y": 3, "chance": 80, "repeat": [ 1, 4 ] },
         { "item": "guitar_stand", "x": 7, "y": [ 5, 8 ], "chance": 70, "repeat": [ 1, 4 ] },
+        { "item": "piano_wire", "x": 7, "y": 5, "chance": 20 },
         { "item": "guitar_stand", "x": 4, "y": 7, "chance": 100 },
         { "item": "mic_stand_tall", "x": 7, "y": 5, "chance": 100 },
         { "item": "mic_stand_tall", "x": 2, "y": 5, "chance": 100 },
@@ -3431,6 +3434,7 @@
         { "item": "amplifier_head", "x": 4, "y": 4, "chance": 100 },
         { "item": "amplifier_head", "x": 6, "y": 4, "chance": 100 },
         { "item": "mixer_music", "x": [ 4, 7 ], "y": 6, "chance": 80, "repeat": [ 1, 4 ] },
+        { "item": "piano_wire", "x": 4, "y": 6, "chance": 20 },
         { "item": "guitar_stand", "x": 7, "y": [ 1, 4 ], "chance": 70, "repeat": [ 1, 4 ] },
         { "item": "guitar_stand", "x": 4, "y": 2, "chance": 100 },
         { "item": "mic_stand_tall", "x": 7, "y": 4, "chance": 100 },
@@ -3489,6 +3493,7 @@
         { "item": "amplifier_head", "x": 6, "y": 4, "chance": 100 },
         { "item": "mixer_music", "x": [ 1, 4 ], "y": 6, "chance": 80, "repeat": [ 1, 4 ] },
         { "item": "guitar_stand", "x": 7, "y": [ 1, 4 ], "chance": 70, "repeat": [ 1, 4 ] },
+        { "item": "piano_wire", "x": 7, "y": 1, "chance": 20 },
         { "item": "guitar_stand", "x": 4, "y": 2, "chance": 100 },
         { "item": "mic_stand_tall", "x": 7, "y": 4, "chance": 100 },
         { "item": "mic_stand_tall", "x": 2, "y": 4, "chance": 100 },
@@ -3545,6 +3550,7 @@
         { "item": "amplifier_head", "x": 4, "y": 4, "chance": 100 },
         { "item": "amplifier_head", "x": 6, "y": 4, "chance": 100 },
         { "item": "mixer_music", "x": [ 4, 7 ], "y": 6, "chance": 80, "repeat": [ 1, 4 ] },
+        { "item": "piano_wire", "x": 5, "y": 6, "chance": 20 },
         { "item": "guitar_stand", "x": 7, "y": [ 1, 4 ], "chance": 70, "repeat": [ 1, 4 ] },
         { "item": "guitar_stand", "x": 4, "y": 2, "chance": 100 },
         { "item": "mic_stand_tall", "x": 7, "y": 4, "chance": 100 },

data/json/mapgen/s_hardware.json

@@ -334,6 +334,7 @@
       "place_items": [
         { "item": "hardware_bulk", "x": 2, "y": [ 2, 7 ], "chance": 90, "repeat": [ 1, 6 ] },
         { "item": "tools_carpentry", "x": 20, "y": [ 10, 14 ], "chance": 80, "repeat": [ 1, 4 ] },
+        { "item": "tools_luthier", "x": 20, "y": [ 10, 14 ], "chance": 5, "repeat": [ 1, 4 ] },
         { "item": "paint", "x": 17, "y": [ 10, 14 ], "chance": 80, "repeat": [ 1, 8 ] },
         { "item": "hardware", "x": 14, "y": [ 10, 14 ], "chance": 80, "repeat": [ 1, 8 ] },
         { "item": "cleaning", "x": 11, "y": [ 10, 14 ], "chance": 80, "repeat": [ 1, 6 ] },
@@ -485,6 +486,7 @@
         { "item": "hardware", "x": 13, "y": [ 16, 17 ], "chance": 80, "repeat": [ 1, 4 ] },
         { "item": "hardware", "x": 16, "y": [ 16, 17 ], "chance": 80, "repeat": [ 1, 4 ] },
         { "item": "tools_carpentry", "x": 19, "y": [ 6, 17 ], "chance": 70, "repeat": [ 1, 9 ] },
+        { "item": "tools_luthier", "x": 19, "y": [ 6, 17 ], "chance": 20, "repeat": [ 1, 3 ] },
         { "item": "cash_register_random", "x": 11, "y": [ 10, 13 ], "chance": 100 }
       ],
       "place_vehicles": [

data/json/npcs/godco/godco_missions.json

@@ -185,19 +185,19 @@
     "id": "MISSION_GODCO_GET_GUITAR_STRING",
     "type": "mission_definition",
     "name": { "str": "Obtain a guitar string" },
-    "description": "Find a wire to be used as a guitar string.",
+    "description": "Find a piano wire to be used as a guitar string.",
     "goal": "MGOAL_FIND_ITEM",
     "difficulty": 1,
     "value": 0,
-    "item": "wire",
+    "item": "piano_wire",
     "count": 1,
     "origins": [ "ORIGIN_SECONDARY" ],
     "dialogue": {
       "describe": "I need a new guitar string.",
-      "offer": "One of my guitar strings busted from where I smacked a zombie.  If you could get me a wire, I can rig it to work as a substitute.",
+      "offer": "One of my guitar strings busted from where I smacked a zombie.  If you could get me a piano wire, I can fix my guitar.",
       "accepted": "Thanks.  I'll give you a performance when you get back with it.",
       "rejected": "I guess I'll just skip that note.",
-      "advice": "Any old wire should do.",
+      "advice": "Music shops should have some.",
       "inquire": "Do you have it?",
       "success": "Thank you so much!  This should last for a while.",
       "success_lie": "Thanks for trying… I guess.",

data/json/obsoletion_and_migration_0.I/migration_items.json

@@ -1212,6 +1212,13 @@
     "type": "MIGRATION",
     "replace": "remington_870"
   },
+  {
+    "id": "mossberg_500",
+    "type": "MIGRATION",
+    "from_variant": "mossberg_500_security",
+    "replace": "benelli_tsa",
+    "variant": "mossberg_500_security"
+  },
   {
     "id": "bottle_suppressor",
     "type": "MIGRATION",