Merge pull request #4 from CleverRaven/master

Update

.clang-tidy

@@ -36,8 +36,6 @@ readability-*,\
 -modernize-use-auto,\
 -modernize-use-default-member-init,\
 -modernize-use-emplace,\
--modernize-use-equals-default,\
--modernize-use-equals-delete,\
 -modernize-use-transparent-functors,\
 -performance-for-range-copy,\
 -performance-inefficient-vector-operation,\

.travis.yml

@@ -62,7 +62,7 @@ jobs:
       addons: &clang38
         apt:
           packages: ["clang-3.8", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
-          sources: *apt_sources
+          sources: [*apt_sources]
 
     # Then build different configurations and targets in parallel.
     - stage: "Main Compilers"
@@ -75,11 +75,12 @@ jobs:
           sources: [*apt_sources]
 
     - env: COMPILER=g++-8 CXXFLAGS='-Wno-implicit-fallthrough' TILES=1 SOUND=1 SANITIZE=address
-      name: "GCC 8 Make build with Tiles, Sound and address sanitization"
+      name: "GCC 8 Make build with Tiles, Sound, astyle and address sanitization"
+      dist: bionic
       compiler: gcc
       addons: &gcc8
         apt:
-          packages: ["g++-8",   "g++-8-multilib",   "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
+          packages: ["g++-8",   "g++-8-multilib",   "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "astyle"]
           sources: *apt_sources
 
     - env: CLANG=clang++-8 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"

data/help/texts.json

@@ -174,7 +174,7 @@
       "To attack a monster with a melee weapon, simply move into them.  The time it takes to attack depends on the size and weight of your weapon.  Small, light weapons are the fastest; unarmed attacks increase in speed with your Unarmed Combat skill, and will eventually be VERY fast.  A successful hit with a bashing weapon may stun the monster temporarily.  A miss may make you stumble and lose movement points.  If a monster hits you, your clothing may absorb some damage, but you will absorb the excess.",
       "Swarms of monsters may call for firearms.  Most firearms in the game require compatible magazines to hold the ammunition.  Compatible magazines are listed in a given firearm's description.  Fortunately, a firearm often spawns with one such magazine in it.",
       "You can eject a magazine from a firearm by pressing <press_unload> and load it with compatible ammunition separately, or if you have a firearm with a partially filled magazine in it, and some matching loose ammo in the inventory, you can simply order a reload by pressing <press_reload>, so you will automatically eject the magazine, fill it with as much ammo as possible, and then put the magazine back in.  You don't have to worry about chambering a round though.  Of course all this takes some time, so try not to do it if there are monsters nearby.",
-      "While magazines are often firearm-specific, on some occasions a magazine is compatible with several other firearms.  The firearms in the game often reflect real-world prototypes in terms of caliber and compatibility. Below are some examples of interchangeable ammo:\n.308 = 7.62x51mm,\n.223 = 5.56 NATO,\n.270 = .30-06,\n.40 S&W = 10mm.",
+      "While magazines and clips are often firearm-specific, on some occasions a magazine/speedloader is compatible with several other firearms or calibers.  Below are some examples of calibers that might share magazines or speedloaders:\n.380 ACP and 9mm Luger,\n .40 S&W and 10mm Auto 3\n.45 ACP and .460 Rowland,\n.45 Colt and .454 Casull.",
       "Magazine descriptions also list the compatible ammo.",
       "Note that while several ammo types exist for a given caliber and magazine type, you can't mix and match these types into a single magazine.  You can't for example load 9x19mm JHP and 9x19mm FMJ ammo into the same magazine, since a magazine always requires identical rounds to be loaded in it.",
       "Magazines can be stored inside several worn accessories for quicker access, such as chest rigs and ammo pouches.  All these compatible storage items are listed in a given magazine's description.  To store a magazine into a clothing item, activate (<press_apply>) appropriate clothing item, at which point you'll get to choose which magazine to store.",

data/json/construction.json

@@ -2721,7 +2721,10 @@
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "15 m",
     "pre_special": "check_empty",
-    "components": [ [ [ "pillow", 19 ], [ "down_pillow", 19 ] ], [ [ "down_blanket", 3 ], [ "blanket", 3 ], [ "fur_blanket", 3 ] ] ],
+    "components": [
+      [ [ "pillow", 19 ], [ "down_pillow", 19 ], [ "mattress", 4 ] ],
+      [ [ "down_blanket", 3 ], [ "blanket", 3 ], [ "fur_blanket", 3 ] ]
+    ],
     "pre_terrain": "t_floor",
     "post_terrain": "f_pillow_fort"
   },

data/json/furniture_and_terrain/terrain-floors-outdoors.json

@@ -237,6 +237,29 @@
       "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_metal_floor_no_roof",
+    "name": "metal floor",
+    "looks_like": "t_metal_floor",
+    "description": "High-quality and tough checkered flooring to reduce risk of slips and falls.",
+    "symbol": ".",
+    "color": "light_cyan",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
+    "bash": {
+      "sound": "thump",
+      "ter_set": "t_null",
+      "str_min": 200,
+      "str_max": 500,
+      "str_min_supported": 200,
+      "items": [
+        { "item": "steel_lump", "count": [ 1, 4 ] },
+        { "item": "steel_chunk", "count": [ 3, 12 ] },
+        { "item": "scrap", "count": [ 9, 36 ] }
+      ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_linoleum_white_no_roof",

data/json/furniture_and_terrain/terrain-floors_indoor.json

@@ -7,6 +7,7 @@
     "symbol": ".",
     "color": "cyan",
     "move_cost": 2,
+    "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
     "bash": {
       "sound": "SMASH!",
@@ -30,6 +31,7 @@
     "color": "yellow",
     "looks_like": "t_wall_y",
     "move_cost": 2,
+    "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
     "bash": {
       "sound": "SMASH!",
@@ -319,6 +321,7 @@
     "symbol": ".",
     "color": "white",
     "move_cost": 2,
+    "roof": "t_flat_roof",
     "light_emitted": 240,
     "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD", "MINEABLE" ],
     "bash": {

data/json/item_groups.json

@@ -3320,6 +3320,9 @@
       [ "file", 5 ],
       [ "RPG", 1 ],
       [ "RPG-7_ammo", 1 ],
+      [ "RPG-7_og7v", 2 ],
+      [ "RPG-7_tbg7v", 1 ],
+      [ "RPG-7_pg7vr", 1 ],
       [ "clown_suit", 2 ],
       [ "clownshoes", 2 ],
       [ "bondage_suit", 1 ],
@@ -7575,6 +7578,9 @@
       [ "u_shotgun", 4 ],
       [ "RPG", 1 ],
       [ "RPG-7_ammo", 1 ],
+      [ "RPG-7_og7v", 2 ],
+      [ "RPG-7_tbg7v", 1 ],
+      [ "RPG-7_pg7vr", 1 ],
       [ "flask_hip", 10 ],
       [ "chemistry_set", 2 ],
       [ "knife_trench", 7 ],

data/json/itemgroups/food.json

@@ -65,6 +65,7 @@
     "items": [
       [ "yeast", 50 ],
       [ "sugar", 40 ],
+      [ "sprinkles", 5 ],
       [ "salt", 40 ],
       [ "pepper", 30 ],
       [ "cinnamon", 15 ],

data/json/itemgroups/food_service.json

@@ -653,6 +653,7 @@
       [ "ketchup", 60 ],
       [ "mustard", 60 ],
       [ "horseradish", 10 ],
+      [ "sprinkles", 20 ],
       [ "honey_bottled", 35 ],
       [ "honey_glassed", 35 ],
       [ "peanutbutter", 60 ],

data/json/itemgroups/main.json

@@ -67,6 +67,9 @@
       [ "royal_jelly", 80 ],
       [ "RPG", 10 ],
       [ "RPG-7_ammo", 10 ],
+      [ "RPG-7_og7v", 25 ],
+      [ "RPG-7_tbg7v", 8 ],
+      [ "RPG-7_pg7vr", 8 ],
       [ "atgm_heat", 1 ],
       [ "rx11_stimpack", 50 ],
       [ "rx12_injector", 50 ],
@@ -174,7 +177,10 @@
       [ "m3_carlgustav", 10 ],
       [ "m202_flash", 20 ],
       [ "RPG", 40 ],
-      [ "RPG-7_ammo", 40 ],
+      [ "RPG-7_ammo", 35 ],
+      [ "RPG-7_og7v", 45 ],
+      [ "RPG-7_tbg7v", 15 ],
+      [ "RPG-7_pg7vr", 20 ],
       [ "atgm_launcher", 3 ],
       [ "atgm_heat", 6 ],
       [ "flamethrower", 50 ],

data/json/itemgroups/mall_item_groups.json

@@ -249,11 +249,6 @@
       [ "seed_tobacco", 5 ],
       [ "rolling_paper", 45 ],
       [ "pipe_glass", 20 ],
-      [ "coke", 5 ],
-      [ "meth", 2 ],
-      [ "heroin", 1 ],
-      [ "crack", 4 ],
-      [ "crackpipe", 7 ],
       [ "cig", 60 ],
       [ "chaw", 60 ]
     ]

data/json/items/ammo.json

@@ -659,6 +659,63 @@
     "recoil": 450,
     "effects": [ "COOKOFF", "EXPLOSIVE", "TRAIL", "NEVER_MISFIRES" ]
   },
+  {
+    "type": "AMMO",
+    "id": "RPG-7_pg7vr",
+    "price": 10000,
+    "name": "PG-7VR 64mm/105mm rocket",
+    "symbol": "=",
+    "color": "dark_gray",
+    "description": "64mm/105mm high-explosive tandem ammunition for the RPG-7.",
+    "material": [ "steel", "powder" ],
+    "volume": 9,
+    "weight": 4500,
+    "ammo_type": "RPG-7",
+    "damage": 3250,
+    "pierce": 1450,
+    "range": 30,
+    "dispersion": 75,
+    "recoil": 450,
+    "effects": [ "COOKOFF", "EXPLOSIVE", "TRAIL", "NEVER_MISFIRES" ]
+  },
+  {
+    "type": "AMMO",
+    "id": "RPG-7_tbg7v",
+    "price": 10000,
+    "name": "TBG-7V 105mm rocket",
+    "symbol": "=",
+    "color": "dark_gray",
+    "description": "105mm thermobaric ammunition for the RPG-7.",
+    "material": [ "plastic", "powder" ],
+    "volume": 9,
+    "weight": 4500,
+    "ammo_type": "RPG-7",
+    "damage": 150,
+    "pierce": 10,
+    "range": 30,
+    "dispersion": 50,
+    "recoil": 450,
+    "effects": [ "COOKOFF", "TRAIL", "NEVER_MISFIRES", "NAPALM_BIG" ]
+  },
+  {
+    "type": "AMMO",
+    "id": "RPG-7_og7v",
+    "price": 8000,
+    "name": "OG-7V 40mm rocket",
+    "symbol": "=",
+    "color": "dark_gray",
+    "description": "40mm high-explosive fragmentation antipersonnel ammunition for the RPG-7.",
+    "material": [ "steel", "powder" ],
+    "volume": 4,
+    "weight": 2000,
+    "ammo_type": "RPG-7",
+    "damage": 80,
+    "pierce": 10,
+    "range": 45,
+    "dispersion": 50,
+    "recoil": 350,
+    "effects": [ "COOKOFF", "TRAIL", "NEVER_MISFIRES", "FRAG" ]
+  },
   {
     "type": "AMMO",
     "id": "m235tpa",

data/json/items/ammo/45.json

@@ -4,7 +4,7 @@
     "copy-from": "45_jhp",
     "type": "AMMO",
     "name": ".45 ACP FMJ",
-    "description": ".45 ACP ammunition with 230gr FMJ bullets.  Noted for its stopping power, the .45 ACP round has been common for almost 150 years.",
+    "description": ".45 ACP ammunition with 230gr FMJ bullets.  Noted for its stopping power, the .45 ACP round has been common for over a century.",
     "relative": { "damage": -3, "pierce": 6 }
   },
   {

data/json/items/ammo/9mm.json

@@ -25,7 +25,7 @@
     "copy-from": "9mm",
     "type": "AMMO",
     "name": "9x19mm FMJ",
-    "description": "9x19mm ammunition with a brass jacketed 115gr bullet.  It is a popular round for military, law enforcement, and civilian use even after almost 150 years.",
+    "description": "9x19mm ammunition with a brass jacketed 115gr bullet.  It has been a popular round for military, law enforcement, and civilian use for over a century.",
     "relative": { "damage": -2, "pierce": 4 }
   },
   {

data/json/items/ammo_types.json

@@ -428,7 +428,7 @@
   {
     "type": "ammunition_type",
     "id": "RPG-7",
-    "name": "93mm RPG-7",
+    "name": "RPG-7 rocket",
     "default": "RPG-7_ammo"
   },
   {

data/json/items/comestibles/mutagen.json

@@ -38,7 +38,7 @@
     "stim": -5,
     "addiction_potential": 6,
     "container": "test_tube",
-    "tools_needed": "syringe",
+    "tool": "syringe",
     "flags": [ "NO_INGEST" ]
   },
   {

data/json/items/comestibles/other.json

@@ -586,6 +586,7 @@
     "description": "This is food for dogs.  It smells strange, but dogs seem to love it.",
     "weight": 554,
     "spoils_in": "1 day",
+    "container": "can_food",
     "volume": 1,
     "price": 300,
     "to_hit": -5,
@@ -609,6 +610,7 @@
     "description": "This is food for cats.  It smells strange, but cats seem to love it.",
     "weight": 223,
     "spoils_in": "1 day",
+    "container": "can_food",
     "volume": 1,
     "price": 300,
     "to_hit": -5,

data/json/items/comestibles/sandwich.json

@@ -110,6 +110,25 @@
     "fun": 15,
     "vitamins": [ [ "vitC", 6 ], [ "calcium", 7 ], [ "iron", 12 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "sandwich_fairy",
+    "name": "fairy bread",
+    "name_plural": "fairy bread",
+    "weight": 114,
+    "color": "brown",
+    "spoils_in": "3 days",
+    "container": "wrapper",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "calories": 640,
+    "description": "An 'open-faced sandwich' consisting of sliced white bread, a healthy crust-to-crust slathering of butter, and sprinkles.  Supposedly a staple of birthday parties in Australia.",
+    "price": 85,
+    "material": [ "junk", "wheat" ],
+    "primary_material": "wheat",
+    "volume": "250 ml",
+    "fun": 10
+  },
   {
     "type": "COMESTIBLE",
     "id": "sandwich_honey",

data/json/items/comestibles/spice.json

@@ -82,6 +82,19 @@
     "//": "a tbps is 4.2g of sugar, meaning the volume needed to be adjusted.",
     "charges": 71
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "sprinkles",
+    "name": "sprinkles",
+    "name_plural": "sprinkles",
+    "weight": 4,
+    "copy-from": "sugar",
+    "container": "bottle_plastic_small",
+    "description": "Known as nonpareils, sprinkles, jimmies, sugar strands or 'hundreds-and-thousands', these colorful balls, rods or flakes of sugar and starch are intended for use decorating soft surfaces of sweets.  Like sugar, they are bad for your teeth and surprisingly not very tasty on their own.",
+    "price": 399,
+    "calories": 20,
+    "charges": 66
+  },
   {
     "type": "COMESTIBLE",
     "id": "wild_herbs",

data/json/items/generic.json

@@ -1413,6 +1413,18 @@
     "to_hit": -1,
     "flags": [ "NANOFAB_TEMPLATE", "TRADER_AVOID" ]
   },
+  {
+    "type": "GENERIC",
+    "id": "template_photonics",
+    "copy-from": "standard_template_construct",
+    "color": "yellow",
+    "name": "nanofabricator template (silicon photonics)",
+    "description": "A state-of-the-art optical storage system, containing the instruction set required for the fabrication of complex silicon photonic circuitry.  The data within was once clearly worth millions, but now, you are not sure if it's anything more than a fancy, high-tech paperweight.",
+    "price": 200000000,
+    "//": "actually worth millions",
+    "price_postapoc": 350,
+    "flags": [ "TRADER_AVOID" ]
+  },
   {
     "type": "GENERIC",
     "id": "antenna",

data/json/mapgen/apartment_con.json

@@ -26,8 +26,8 @@
         "   Rssw..A.....F.|+-|......|-+|..........wssR   ",
         "   Rss|.....FFFF^|.Y|......|Y.|^....FFF.o|ssR   ",
         "   |------------||--|......|--||------------|   ",
-        "   |############|EEE=......=xEE|############|   ",
-        "   |############|EEx=......=EEE|############|   ",
+        "   |############|...=......=xEE|############|   ",
+        "   |############|<..=......=EEE|############|   ",
         "   |------|-|-|-|---|......|---|-|-|-|------|   ",
         "   |.dBBd.+r|u+..e32|......|23e..+u|r+.dBBd.|   ",
         "   w..BB..|-|-|....u|......|u....|-|-|..BB..w   ",

data/json/mapgen/apartment_mod.json

@@ -15,10 +15,10 @@
         "    |--|-----+--|+|--|    |--|+|--+-----|--|    ",
         "    RsswFFFF...^|.STb|    |bTS.|...FFFF.wssR    ",
         "    Rssw........+...b|-WW-|b...+........wssR    ",
-        "    RssX........|--|-|EEEE|-|--|........XssR    ",
-        "    Rss|1.htth...oo|Y|EEEE|Y|..........1|ssR    ",
-        "    Rss|e.htth.....+.|xEEE|.+..........e|ssR    ",
-        " |-----|2.........A|-|-==-|-|..hh......u|-----| ",
+        "    RssX........|--|-|....|-|--|........XssR    ",
+        "    Rss|1.htth...oo|Y|<...|Y|..........1|ssR    ",
+        "    Rss|e.htth.....+.|....|.+..........e|ssR    ",
+        " |-----|2.........A|-|-..-|-|..hh......u|-----| ",
         " |..BBd|uO3........|........|..tt....3O2|dBB..| ",
         " w..BB.|--|+|......D........D..tt..|+|--|.BB..w ",
         " |d....+.r|u|^....t|........|..hh.^|u|r.+....d| ",