Merge pull request #1 from CleverRaven/master

sync from mainline

GUIDE_COMESTIBLES.md

@@ -17,7 +17,7 @@ When you have a comestible you want to add to the files, just go down this list,
 
 `alcohol.json` -- "Drink" comestible with alcohol addiction
 `soup.json` -- "Drink" comestible which is a soup. This is more of a "food" than a drink - you primarily want the calories from this
-`drinks.json` -- "Drink" comestible. This is your drink of choice when you're thirsty! examples: tea, juice, water
+`drink.json` -- "Drink" comestible. This is your drink of choice when you're thirsty! examples: tea, juice, water
 `drink_other.json` -- "Drink" comestible that does not fit any other criteria. example: vinegar, mustard
 
 `junkfood.json` -- comestible with the "junk" material. examples: cake, sugary cereal, nachos
@@ -36,5 +36,5 @@ When you have a comestible you want to add to the files, just go down this list,
 `egg.json` -- either an egg, or made of egg
 `dairy.json` -- made of milk
 `mushroom.json` -- a mushroom or made of mushrooms
-`nut.json` -- a nut or made of nuts
+`nuts.json` -- a nut or made of nuts
 `other.json` -- if you made it here, your comestible doesn't fit any other category!

build-scripts/build.sh

@@ -7,9 +7,9 @@ set -ex
 function run_tests
 {
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-        $WINE "$@" -r cata --rng-seed `gshuf -i 0-1000000000 -n 1`
+        $WINE "$@" -d yes -r cata --rng-seed `gshuf -i 0-1000000000 -n 1`
     else
-        $WINE "$@" -r cata --rng-seed `shuf -i 0-1000000000 -n 1`
+        $WINE "$@" -d yes -r cata --rng-seed `shuf -i 0-1000000000 -n 1`
     fi
 }
 

data/json/construction.json

@@ -2514,5 +2514,18 @@
     ],
     "pre_special" : "check_empty",
     "post_terrain": "t_junk_floor"
+  },
+  {
+    "type" : "construction",
+    "description" : "Build Pillow Fort",
+    "category" : "CONSTRUCT",
+    "required_skills" : [ [ "fabrication", 0 ] ],
+    "time" : 15,
+    "components" : [
+      [ [ "pillow", 19 ],[ "down_pillow", 19 ] ],
+      [ [ "down_blanket", 3 ], [ "blanket", 3 ], [ "fur_blanket", 3 ] ]
+    ],
+    "pre_terrain" : "t_floor",
+    "post_terrain" : "f_pillow_fort"
   }
 ]

data/json/flags.json

@@ -471,6 +471,12 @@
     "description": "Allows wielding with unarmed fighting styles and trains unarmed when used.",
     "info": "This weapon <good>can be used with</good> <info>unarmed fighting styles</info>."
   },
+  {
+    "id": "NANOFAB_TEMPLATE",
+    "type": "json_flag",
+    "context": [ "generic", "TOOL" ],
+    "info": "This item contains a nanofabricator recipe."
+  },
   {
     "id": "BIONIC_FAULTY",
     "type": "json_flag",

data/json/furniture.json

@@ -2264,7 +2264,7 @@
     "type": "furniture",
     "id": "f_lily",
     "name": "lily",
-    "looks_like": "f_tulip",
+    "looks_like": "f_flower_tulip",
     "symbol": "f",
     "color": "magenta",
     "move_cost_mod": 0,
@@ -3349,5 +3349,28 @@
       "sound_fail": "whump.",
       "items": [ { "item": "fiber_mat", "count": [ 1, 1 ] } ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_pillow_fort",
+    "name": "pillow fort",
+    "symbol": "^",
+    "description": "A comfy place to hide from the world.",
+    "color": "white",
+    "move_cost_mod": 3,
+    "comfort": 4,
+    "floor_bedding_warmth": 1000,
+    "required_str": -1,
+    "deconstruct": { "items": [ { "item": "pillow", "count": 19 }, { "item": "blanket", "count": 3 } ] },
+    "max_volume": 4000,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "REDUCE_SCENT", "EASY_DECONSTRUCT", "BASHABLE" ],
+    "bash": {
+      "str_min": 1,
+      "str_max": 1,
+      "sound": "paf!",
+      "sound_fail": "poof.",
+      "ter_set": "t_floor",
+      "items": [ { "item": "pillow", "count": 19 }, { "item": "blanket", "count": 3 } ]
+    }
   }
 ]

data/json/item_groups.json

@@ -4338,6 +4338,8 @@
     "items":[
       ["purifier", 12],
       ["plut_cell", 10],
+      ["standard_template_construct", 5],
+      ["nanomaterial", 5],
       ["ftk93", 1],
       ["canister_goo", 8],
       ["UPS_off", 5],
@@ -5629,6 +5631,7 @@
       ["eink_tablet_pc", 15],
       ["mobile_memory_card", 40],
       ["mobile_memory_card_science", 10],
+      ["standard_template_construct", 5],
       ["camera", 15],
       ["camera_pro", 5],
       ["lighter", 50],
@@ -6828,6 +6831,7 @@
       ["eink_tablet_pc", 1],
       ["mobile_memory_card", 8],
       ["mobile_memory_card_science", 1],
+      ["standard_template_construct", 8],
       ["id_military", 3],
       ["militarymap", 3],
       ["pistol_bayonet", 4],
@@ -7493,6 +7497,7 @@
       ["eink_tablet_pc", 20],
       ["mobile_memory_card", 50],
       ["mobile_memory_card_science", 5],
+      ["standard_template_construct", 5],
       ["camera", 3],
       ["thermometer", 3],
       ["hygrometer", 3],

data/json/itemgroups/main.json

@@ -32,6 +32,7 @@
       ["knife_rm42", 20],
       ["l-stick", 10],
       ["large_repairkit", 20],
+      ["standard_template_construct", 15],
       ["laser_pack", 100],
       ["laser_rifle", 10],
       ["m240", 10],
@@ -73,7 +74,51 @@
       ["tool_rdx_charge", 10],
       ["v29", 10]
     ]
-  },{
+  },
+  {
+    "type" : "item_group",
+    "id" : "nanofab_recipes",
+    "//" : "Very rare high level loot. This list doesnt spawn anywere directly, it is used to create the recipes inside nanofabricator templates. ",
+    "magazine": 100,
+    "items":[
+      ["12mm", 10],
+      ["bot_laserturret", 10],
+      ["alloy_plate", 10],
+      ["ftk93", 10],
+      ["solar_panel_v3", 10],
+      ["q_solarpack", 10],
+      ["can_sealer", 10],
+      ["hk_g80", 10],
+      ["hk_g80mag", 10],
+      ["stillsuit", 10],
+      ["hk_g80mag", 10],
+      ["emp_gun", 10],
+      ["knife_rm42", 10],
+      ["laser_pack", 10],
+      ["laser_rifle", 10],
+      ["mininuke", 10],
+      ["adv_UPS_off", 10],
+      ["optical_cloak", 10],
+      ["holo_cloak", 10],
+      ["plasma_rifle", 10],
+      ["portal", 10],
+      ["atomic_coffeepot", 10],
+      ["power_armor_basic", 10],
+      ["power_armor_frame", 10],
+      ["power_armor_heavy", 10],
+      ["power_armor_helmet_basic", 10],
+      ["power_armor_helmet_heavy", 10],
+      ["power_armor_helmet_light", 10],
+      ["high_density_capacitor", 10],
+      ["beam_scatterer", 10 ],
+      ["power_armor_light", 10],
+      ["control_laptop", 10],
+      ["rm11b_sniper_rifle", 10],
+      ["rm13_armor", 10],
+      ["v29", 10]
+    ]
+  },
+  {
     "type" : "item_group",
     "id" : "player_crafted",
     "//" : "items that should only be crafted by the player. Excluded from all other item groups. this is just an FYI list, it's not used to spawn items in game.",

data/json/items/chemicals_and_resources.json

@@ -953,6 +953,24 @@
     "category" : "chems",
     "fun": -20
    },
+   {
+    "type" : "AMMO",
+    "id" : "nanomaterial",
+    "category" : "chems",
+    "price" : 250000,
+    "price_postapoc": 1500,
+    "name" : "nanomaterial canisters",
+    "name_plural" : "nanomaterial canisters",
+    "symbol" : "=",
+    "color" : "light_gray",
+    "flags" : [ "TRADER_AVOID" ],
+    "description" : "Steel canisters containing carbon, iron, titanium, copper and other elements in specifically engineered atomic scale configurations.  A nanofabricator can assemble them into usable items.",
+    "material" : "steel",
+    "volume" : 60,
+    "weight" : 250,
+    "ammo_type" : "components",
+    "count" : 50
+   },
    {
     "type" : "AMMO",
     "id" : "ash",