Merge pull request CleverRaven#9 from CleverRaven/master

Update Master

SIGNOFF

@@ -60,3 +60,4 @@ BorkBorkGoesTheCode <imreallytoolazy@protonmail.com>
 Patrik Stridvall <patrik@stridvall.se>
 Ryan Schneider (RadHazard) <rslego@gmail.com>
 Paul Bransford (draeath) <draeath@gmail.com>
+Mark Langsdorf (mlangsdorf) <mark.langsdorf@gmail.com> / <mlangsdo@redhat.com>

data/json/item_actions.json

@@ -757,6 +757,11 @@
         "id" : "CATTLEFODDER",
         "name" : "Place"
     },
+    {
+        "type" : "item_action",
+        "id" : "BIRDFOOD",
+        "name" : "Place"
+    },
     {
         "type" : "item_action",
         "id" : "install_bionic",

data/json/item_groups.json

@@ -1792,6 +1792,7 @@
       ["concrete", 20],
       ["metal_smoother", 10],
       ["brick_kiln", 5],
+      ["kiln", 2],
       ["brick", 20],
       ["bucket", 5],
       ["con_mix", 5],

data/json/itemgroups/tools.json

@@ -29,6 +29,7 @@
     "//": "Industrial machinery used for construction",
     "items": [
       [ "brick_kiln", 80 ],
+      [ "kiln", 40 ],
       [ "con_mix", 120 ],
       [ "elec_jackhammer", 40 ],
       [ "metal_smoother", 90 ],

data/json/items/tools.json

@@ -984,6 +984,22 @@
     "ammo": "charcoal",
     "max_charges": 1000
   },
+  {
+    "id": "kiln",
+    "type": "TOOL",
+    "name": "electric kiln",
+    "description": "This is a portable electric kiln, powered by batteries.  It is designed for firing bricks, but you could use it to fire anything made of clay.  With a little mechanical know-how, you could probably even convert it to run directly off a vehicle's power system.",
+    "weight": 12000,
+    "volume": 30,
+    "price": 50000,
+    "to_hit": -3,
+    "bashing": 12,
+    "material": "steel",
+    "symbol": ";",
+    "color": "dark_gray",
+    "ammo": "battery",
+    "max_charges": 1000
+  },
   {
     "id": "broadfire_off",
     "type": "TOOL",
@@ -4920,6 +4936,21 @@
     "techniques": "WBLOCK_1",
     "use_action": "MOP"
   },
+  {
+    "id": "mortar_pestle",
+    "type": "TOOL",
+    "name": "mortar and pestle",
+    "name_plural": "sets of mortar and pestle",
+    "description": "This is a simple combination of a small grindstone and a bowl-shaped stone.  Used for grinding grain, but time-consuming compared to more complex methods.",
+    "weight": 1632,
+    "volume": 4,
+    "price": 0,
+    "to_hit": -4,
+    "bashing": 3,
+    "material": "stone",
+    "symbol": ":",
+    "color": "light_gray"
+  },
   {
     "id": "mp3",
     "type": "TOOL",
@@ -8348,6 +8379,21 @@
     "color": "brown",
     "use_action": "CATTLEFODDER"
   },
+  {
+    "id": "birdfood",
+    "type": "TOOL",
+    "name": "bird food",
+    "name_plural": "bird food",
+    "description": "What birds eat.  Mainly made of seeds, silages or legumes.  It's perfect for small birds.",
+    "weight": 60,
+    "volume": 1,
+    "price": 20,
+    "to_hit": -5,
+    "material": "veggy",
+    "symbol": ";",
+    "color": "brown",
+    "use_action": "BIRDFOOD"
+  },
   {
     "id": "link_sheet",
     "type": "TOOL",

data/json/items/vehicle/engineering.json

@@ -37,5 +37,18 @@
     "material": "steel",
     "symbol": "&",
     "color": "dark_gray"
+  },
+  {
+    "type": "GENERIC",
+    "id": "v_rockwheel_item",
+    "symbol": "&",
+    "name": "rockwheel",
+    "color": "dark_gray",
+    "description": "A large and heavy jagged metal disc to dig trenches.",
+    "weight": 62000,
+    "material": "steel",
+    "category": "veh_parts",
+    "price": 8500,
+    "volume": 29
   }
 ]

data/json/items/vehicle/rigs.json

@@ -33,6 +33,13 @@
     "name": "vehicle forge rig",
     "description": "A forge rig made to run off a vehicle's storage battery with integrated tool storage for metalworking equipment."
   },
+  {
+    "id": "kilnrig",
+    "copy-from": "vehicle_rig",
+    "type": "GENERIC",
+    "name": "vehicle kiln",
+    "description": "An electric kiln made to run off a vehicle's storage battery."
+  },
   {
     "id": "kitchen_unit",
     "copy-from": "vehicle_rig",

data/json/mapgen/mil_surplus.json

@@ -0,0 +1,100 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "mil_surplus" ],
+    "weight": 300,
+    "object": {
+      "rows": [
+        "...........~~...........",
+        "...........~~...........",
+        "..-''''''--++--''''''--.",
+        "..|                   |.",
+        "..| #                 |.",
+        "..| #                 |.",
+        "..| #                 |.",
+        "..| #                 |.",
+        "..|                   |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..| R R R R R R R R R |.",
+        "..|                   |.",
+        "..---------------------.",
+        "........................",
+        "........................"
+      ],
+      "palettes": [ "mil_surplus" ],
+      "place_loot": [
+        { "group": "mil_armor", "x": 4, "y": [ 9, 19 ], "chance": 70 },
+        { "group": "mil_armor", "x": 6, "y": [ 9, 19 ], "chance": 70 },
+        { "group": "mil_armor", "x": 8, "y": [ 9, 19 ], "chance": 70 },
+        { "group": "mil_surplus", "x": 10, "y": [ 9, 19 ], "chance": 70 },
+        { "group": "mil_surplus", "x": 12, "y": [ 9, 19 ], "chance": 70 },
+        { "group": "mil_surplus", "x": 14, "y": [ 9, 19 ], "chance": 70 },
+        { "group": "mil_food_nodrugs", "x": 16, "y": [ 9, 19 ], "chance": 70 },
+        { "group": "mil_food_nodrugs", "x": 18, "y": [ 9, 19 ], "chance": 70 },
+        { "group": "mil_food_nodrugs", "x": 20, "y": [ 9, 19 ], "chance": 70 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "mil_surplus" ],
+    "weight": 300,
+    "object": {
+      "rows": [
+        "...........~~...........",
+        "...........~~...........",
+        ".--``````--++--``````--.",
+        ".|###           @  @  |.",
+        ".| h#                 |.",
+        ".|  #          R RR R |.",
+        ".|                    |.",
+        ".|---   A  A  A    ---|.",
+        ".|& |   A  A  A    / ^|.",
+        ".|  +   A  A  A    ---|.",
+        ".|% |   A  A  A    / ^|.",
+        ".|---   A  A  A    ---|.",
+        ".|                    |.",
+        ".| BBBBBBB    D D D D |.",
+        ".|            D D D D |.",
+        ".| BBBBBBB    D D D D |.",
+        ".|            D D D D |.",
+        ".| BBBBBBB    D D D D |.",
+        ".|                    |.",
+        ".| CCCCCCC    CCCCCCC |.",
+        ".|                    |.",
+        ".| CCCCCCC    CCCCCCC |.",
+        ".----------------------.",
+        "........................"
+      ],
+      "palettes": [ "mil_surplus" ],
+      "items": { "R": { "item": "mil_armor", "chance": 50 } },
+      "place_loot": [
+        { "group": "mil_armor", "x": 8, "y": [ 7, 11 ], "chance": 70 },
+        { "group": "mil_armor", "x": 11, "y": [ 7, 11 ], "chance": 70 },
+        { "group": "mil_armor", "x": 14, "y": [ 7, 11 ], "chance": 70 },
+        { "group": "mil_surplus", "x": 14, "y": [ 13, 17 ], "chance": 70 },
+        { "group": "mil_surplus", "x": 16, "y": [ 13, 17 ], "chance": 70 },
+        { "group": "mil_surplus", "x": 18, "y": [ 13, 17 ], "chance": 70 },
+        { "group": "mil_surplus", "x": 20, "y": [ 13, 17 ], "chance": 70 },
+        { "group": "mil_armor_torso", "x": [ 3, 9 ], "y": 13, "chance": 70 },
+        { "group": "mil_armor_helmet", "x": [ 3, 9 ], "y": 15, "chance": 70 },
+        { "group": "mil_armor_pants", "x": [ 3, 9 ], "y": 17, "chance": 70 },
+        { "group": "mil_food_nodrugs", "x": [ 3, 9 ], "y": 19, "chance": 70 },
+        { "group": "mil_food_nodrugs", "x": [ 3, 9 ], "y": 21, "chance": 70 },
+        { "group": "mil_food_nodrugs", "x": [ 14, 20 ], "y": 19, "chance": 70 },
+        { "group": "mil_food_nodrugs", "x": [ 14, 20 ], "y": 21, "chance": 70 }
+      ]
+    }
+  }
+]

data/json/mapgen/station_radio.json

@@ -0,0 +1,104 @@
+[
+  {
+    "id": "record_weather",
+    "type": "item_group",
+    "items": [ [ "record_weather", 100 ] ]
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "station_radio" ],
+    "weight": 500,
+    "//": "Eventually the northern shed will house the main breaker or generator that must be activated prior to transmitting.",
+    "object": {
+      "rows": [
+        "                        ",
+        "        FffffffffffffF  ",
+        "        F____________F  ",
+        "   |----|______&&&&__F  ",
+        "   |....=______&&&&__F  ",
+        "   |x.ll|______&&&&__F  ",
+        "   |----|______&&&&__F  ",
+        "        F____________F  ",
+        " |--------|__________G  ",
+        " |tS|eSc.r|__________F  ",
+        " w..+.....=__________F  ",
+        " |-----|..|----------|  ",
+        " |..doo|..|..dW..h...|  ",
+        " w..h..|..D.hxW.c6c..|  ",
+        " |a....|..|...+......|  ",
+        " |--+--|..|-----WWW--|  ",
+        " |.+.................|  ",
+        " |l|..............ch.|  ",
+        " |--+--|--+--|....c..|  ",
+        " |o....|....o|--==-w-|  ",
+        " |o.d..|..d.o|  ss      ",
+        " |o.h..|..h..|  ss      ",
+        " |-www-|-www-|  ss      ",
+        "                ss      "
+      ],
+      "terrain": {
+        " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        "+": "t_door_c",
+        "=": "t_door_locked_alarm",
+        "D": "t_door_locked",
+        "|": "t_wall",
+        "-": "t_wall",
+        "w": "t_window_alarm",
+        "W": "t_window",
+        ".": "t_floor",
+        "o": "t_floor",
+        "d": "t_floor",
+        "h": "t_floor",
+        "a": "t_floor",
+        "l": "t_floor",
+        "c": "t_floor",
+        "t": "t_floor",
+        "S": "t_floor",
+        "e": "t_floor",
+        "r": "t_floor",
+        "6": "t_floor",
+        "_": "t_pavement",
+        "&": "t_radio_tower",
+        "s": "t_sidewalk",
+        "x": "t_console_broken",
+        "F": "t_chainfence",
+        "f": "t_chainfence",
+        "G": "t_chaingate_l"
+      },
+      "furniture": {
+        "o": "f_bookcase",
+        "d": "f_desk",
+        "h": "f_chair",
+        "a": "f_armchair",
+        "l": "f_locker",
+        "c": "f_counter",
+        "S": "f_sink",
+        "e": "f_fridge",
+        "r": "f_trashcan"
+      },
+      "toilets": { "t": {  } },
+      "computers": {
+        "6": {
+          "name": "Broadcasting Control",
+          "security": 2,
+          "options": [
+            { "name": "ERROR:  SIGNAL DISCONNECT", "action": "tower_unresponsive" },
+            { "name": "Install Repeater Mod", "action": "repeater_mod" }
+          ]
+        }
+      },
+      "items": {
+        "o": { "item": "novels", "chance": 70 },
+        "r": { "item": "trash", "chance": 70 },
+        "d": { "item": "office", "chance": 70 },
+        "e": { "item": "fridge", "chance": 70, "repeat": [ 2, 3 ] }
+      },
+      "place_loot": [
+        { "group": "record_weather", "x": 18, "y": 13 },
+        { "group": "cleaning", "x": 2, "y": 17, "chance": 70 },
+        { "group": "electronics", "x": [ 6, 7 ], "y": 5, "chance": 80 }
+      ]
+    }
+  }
+]

data/json/mapgen/veterinarian.json

@@ -52,6 +52,7 @@
       [ "pet_carrier", 30 ],
       [ "dogfood", 30 ],
       [ "catfood", 30 ],
+      [ "birdfood", 10 ],
       [ "towel", 20 ],
       [ "soap", 10 ],
       [ "gloves_medical", 20 ],

data/json/mapgen_palettes/mil_surplus.json

@@ -0,0 +1,41 @@
+[
+  {
+    "type": "palette",
+    "id": "mil_surplus",
+    "terrain": {
+      ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
+      " ": "t_floor",
+      "#": "t_floor",
+      "@": "t_floor",
+      "^": "t_floor",
+      "%": "t_floor",
+      "&": "t_floor",
+      "h": "t_floor",
+      "A": "t_floor",
+      "B": "t_floor",
+      "C": "t_floor",
+      "D": "t_floor",
+      "R": "t_floor",
+      "~": "t_sidewalk",
+      "-": "t_wall",
+      "|": "t_wall",
+      "'": "t_window",
+      "`": "t_window_alarm",
+      "+": "t_door_c",
+      "/": "t_door_curtain_c"
+    },
+    "furniture": {
+      "#": "f_counter",
+      "h": "f_chair",
+      "%": "f_sink",
+      "@": "f_mannequin",
+      "^": [ "f_bigmirror", "f_bigmirror", "f_bigmirror", "f_bigmirror_b" ],
+      "R": "f_rack",
+      "A": "f_rack",
+      "B": "f_rack",
+      "C": "f_rack",
+      "D": [ "f_displaycase", "f_displaycase", "f_displaycase", "f_displaycase", "f_displaycase_b" ]
+    },
+    "toilets": { "&": {  } }
+  }
+]