Merge pull request #3 from CleverRaven/master

BackToRootsJune11

data/json/construction.json

@@ -2712,5 +2712,29 @@
     "pre_note": "Can be deconstructed without tools.",
     "pre_flags": [ "DIGGABLE", "FLAT" ],
     "post_terrain": "t_tarptent"
+  },
+  {
+    "type": "construction",
+    "skill": "survival",
+    "description": "Dig a Shallow Pit",
+    "category": "CONSTRUCT",
+    "difficulty": 1,
+    "time": "30m",
+    "on_display": false,
+    "qualities": [ { "id": "DIG", "level": 1 } ],
+    "pre_flags": [ "DIGGABLE", "FLAT" ],
+    "post_terrain": "t_pit_shallow"
+  },
+  {
+    "type": "construction",
+    "skill": "survival",
+    "description": "Dig a Deep Pit",
+    "category": "CONSTRUCT",
+    "difficulty": 1,
+    "time": "150m",
+    "on_display": false,
+    "qualities": [ { "id": "DIG", "level": 2 } ],
+    "pre_flags": [ "DIGGABLE", "FLAT" ],
+    "post_terrain": "t_pit"
   }
 ]

data/json/item_actions.json

@@ -634,6 +634,11 @@
     "id": "MP3_ON",
     "name": "Turn off music"
   },
+  {
+    "type": "item_action",
+    "id": "RPGDIE",
+    "name": "Roll die"
+  },
   {
     "type": "item_action",
     "id": "GASMASK",

data/json/item_groups.json

@@ -61,6 +61,8 @@
       [ "slingshot", 10 ],
       [ "frisbee", 10 ],
       [ "dnd_handbook", 1 ],
+      [ "RPG_die", 1 ],
+      [ "metal_RPG_die", 1 ],
       [ "milkshake_fastfood", 3 ]
     ]
   },

data/json/itemgroups/SUS_specific_use_storage_items.json

@@ -102,6 +102,8 @@
       { "item": "corkscrew", "prob": 60 },
       { "item": "bottle_opener", "prob": 75 },
       { "item": "candle", "prob": 75 },
+      { "item": "RPG_die", "prob": 10 },
+      { "item": "metal_RPG_die", "prob": 1 },
       { "distribution": [ { "item": "matches" }, { "item": "lighter" } ], "prob": 90 }
     ]
   },

data/json/itemgroups/mall_item_groups.json

@@ -118,7 +118,9 @@
       [ "jedi_cloak", 5 ],
       [ "clown_suit", 5 ],
       [ "clownshoes", 5 ],
-      [ "radio_car_box", 10 ]
+      [ "radio_car_box", 10 ],
+      [ "RPG_die", 5 ],
+      [ "metal_RPG_die", 1 ]
     ]
   },
   {

data/json/itemgroups/misc.json

@@ -83,6 +83,8 @@
       { "item": "family_photo", "prob": 5 },
       { "item": "coin_quarter", "prob": 5 },
       { "item": "mobile_memory_card_used", "count": [ 1, 4 ], "prob": 15 },
+      { "item": "RPG_die", "prob": 5 },
+      { "item": "metal_RPG_die", "prob": 1 },
       { "item": "mobile_memory_card_encrypted", "count": [ 1, 2 ], "prob": 15 }
     ]
   },

data/json/itemgroups/supplies.json

@@ -56,8 +56,9 @@
     "//": "large quantities of common building supplies.",
     "items": [
       { "item": "2x4", "prob": 100, "count": [ 5, 20 ] },
-      { "item": "wood_sheet", "prob": 50, "count": [ 1, 2 ] },
-      { "item": "wood_panel", "prob": 60, "count": [ 1, 4 ] },
+      { "item": "wood_beam", "prob": 50, "count": [ 1, 5 ] },
+      { "item": "wood_sheet", "prob": 50, "count": [ 1, 4 ] },
+      { "item": "wood_panel", "prob": 60, "count": [ 1, 8 ] },
       { "item": "rock", "prob": 70, "count": [ 10, 20 ] },
       { "item": "coal_lump", "prob": 20, "count": [ 1, 10 ] },
       { "item": "material_cement", "prob": 100, "charges": 500, "container-item": "bag_canvas" },
@@ -136,6 +137,7 @@
       {
         "distribution": [
           { "item": "2x4", "prob": 500, "count": [ 20, 50 ] },
+          { "item": "wood_beam", "prob": 50, "count": [ 5, 20 ] },
           { "item": "wood_sheet", "prob": 400, "count": [ 10, 30 ] },
           { "item": "wood_panel", "prob": 300, "count": [ 15, 40 ] },
           { "item": "log", "prob": 200, "count": [ 5, 10 ] },

data/json/items/ammo.json

@@ -1328,5 +1328,49 @@
     "count": 50,
     "ammo_type": "tinder",
     "effects": [ "NEVER_MISFIRES" ]
+  },
+  {
+    "type": "AMMO",
+    "id": "RPG_die",
+    "price": 10,
+    "name": "RPG die",
+    "name_plural": "RPG dice",
+    "symbol": "=",
+    "color": "light_gray",
+    "looks_like": "marble",
+    "description": "A die used to play various role-playing games.",
+    "material": "plastic",
+    "volume": 1,
+    "weight": 1,
+    "ammo_type": "pebble",
+    "damage": 1,
+    "range": 20,
+    "dispersion": 15,
+    "loudness": 0,
+    "count": 7,
+    "effects": [ "NEVER_MISFIRES" ],
+    "use_action": "RPGDIE"
+  },
+  {
+    "type": "AMMO",
+    "id": "metal_RPG_die",
+    "price": 50,
+    "name": "metal RPG die",
+    "name_plural": "metal RPG dice",
+    "symbol": "=",
+    "color": "light_gray",
+    "looks_like": "marble",
+    "description": "A metal die used to play various role-playing games",
+    "material": "zinc",
+    "volume": 1,
+    "weight": 1,
+    "ammo_type": "pebble",
+    "damage": 3,
+    "range": 15,
+    "dispersion": 10,
+    "loudness": 0,
+    "count": 7,
+    "effects": [ "NEVER_MISFIRES" ],
+    "use_action": "RPGDIE"
   }
 ]

data/json/items/ammo/shotcanister.json

@@ -0,0 +1,89 @@
+[
+  {
+    "type": "AMMO",
+    "id": "shotcanister_scrap",
+    "price": 1000,
+    "name": "scrap shotcanister",
+    "symbol": "=",
+    "color": "green",
+    "description": "This small paper canister resembling a crude shotshell is filled to the brim with assorted pieces of scrap metal.",
+    "material": [ "steel" ],
+    "volume": 1,
+    "weight": 55,
+    "bashing": 2,
+    "cutting": 1,
+    "ammo_type": "shotcanister",
+    "looks_like": "shot_scrap",
+    "range": 1,
+    "damage": 10,
+    "dispersion": 250,
+    "loudness": 0,
+    "count": 10
+  },
+  {
+    "type": "AMMO",
+    "id": "shotcanister_pebble",
+    "price": 1000,
+    "name": "pebble shotcanister",
+    "symbol": "=",
+    "color": "green",
+    "description": "This small paper canister resembling a crude shotshell is filled to the brim with tiny pebbles.  Damage is pathetic but flight is much more stable than scrap",
+    "material": [ "steel" ],
+    "volume": 1,
+    "weight": 55,
+    "bashing": 2,
+    "cutting": 1,
+    "ammo_type": "shotcanister",
+    "looks_like": "shot_scrap",
+    "range": 2,
+    "pierce": 1,
+    "damage": 7,
+    "dispersion": 80,
+    "loudness": 0,
+    "count": 10
+  },
+  {
+    "type": "AMMO",
+    "id": "shotcanister_flechette",
+    "price": 1000,
+    "name": "flechette shotcanister",
+    "symbol": "=",
+    "color": "green",
+    "description": "This small paper canister resembling a crude shotshell is filled to the brim with handmade flechettes, giving it some armor piercing capabilities.",
+    "material": [ "steel" ],
+    "volume": 1,
+    "weight": 55,
+    "bashing": 2,
+    "cutting": 1,
+    "ammo_type": "shotcanister",
+    "looks_like": "shot_scrap",
+    "range": 3,
+    "damage": 13,
+    "pierce": 7,
+    "dispersion": 50,
+    "loudness": 0,
+    "count": 10
+  },
+  {
+    "type": "AMMO",
+    "id": "shotcanister_bearing",
+    "price": 1000,
+    "name": "bearing shotcanister",
+    "symbol": "=",
+    "color": "green",
+    "description": "This small paper canister resembling a crude shotshell is filled to the brim with handmade bearings, stabilizing it's flight pattern a tiny bit.",
+    "material": [ "steel" ],
+    "volume": 1,
+    "weight": 55,
+    "bashing": 2,
+    "cutting": 1,
+    "ammo_type": "shotcanister",
+    "looks_like": "shot_scrap",
+    "range": 2,
+    "damage": 12,
+    "pierce": 2,
+    "dispersion": 100,
+    "loudness": 0,
+    "count": 10
+  }
+]

data/json/items/ammo_types.json

@@ -53,6 +53,12 @@
     "name": "pebbles",
     "default": "pebble"
   },
+  {
+    "type": "ammunition_type",
+    "id": "shotcanister",
+    "name": "shotcanisters",
+    "default": "shotcanister_scrap"
+  },
   {
     "type": "ammunition_type",
     "id": "shot",

data/json/items/comestibles/other.json

@@ -366,15 +366,16 @@
   {
     "type": "COMESTIBLE",
     "id": "soybean",
-    "name": "soybean",
+    "name": "soybeans",
+    "name_plural": "soybeans",
     "copy-from": "seed",
     "weight": 160,
     "symbol": ".",
     "color": "yellow",
     "healthy": -5,
     "spoils_in": "364 days",
     "calories": 56,
-    "description": "A light brown bean, has many uses, mildly toxic and not recommended, but you could eat them raw.",
+    "description": "Light brown beans, they have many uses, mildly toxic and not recommended, but you could eat them raw.",
     "price": 90,
     "fun": -5,
     "vitamins": [ [ "iron", 25 ], [ "vitC", 1 ], [ "calcium", 3 ] ]