Merge branch 'master' into returne-archery-balance

.appveyor.yml

@@ -1,26 +1,15 @@
 version: '{branch}.{build}'
-os: Windows
-clone_folder: C:\Projects\Cataclysm-DDA
+image: Visual Studio 2019
+configuration: Release
+platform: x64
 shallow_clone: true
-pull_requests:
-    do_not_increment_build_number: false
-environment:
-    matrix:
-        - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-          PROJECT: /msvc-full-features/Cataclysm-vcpkg-static.sln
-          COMPILER: msvc2017
-          TOOLCHAIN: msvc15
-          PLATFORM: x64
-          CONFIGURATION: Release
-          APPVEYOR_SAVE_CACHE_ON_ERROR: true
-matrix:
-    fast_finish: false
-cache:
-  - 'c:\tools\vcpkg\installed'
+clone_folder: C:\Projects\Cataclysm-DDA
 install:
-    # Install dependency packages
-    - cmd: vcpkg --triplet %PLATFORM%-windows-static install sdl2 sdl2-image sdl2-mixer sdl2-ttf gettext
+  - cmd: vcpkg --triplet x64-windows-static install sdl2 sdl2-image sdl2-mixer sdl2-ttf gettext
+cache: c:\tools\vcpkg\installed\
 build:
-  parallel: true
   project: /msvc-full-features/Cataclysm-vcpkg-static.sln
+  parallel: true
   verbosity: minimal
+test_script:
+  - cmd: Cataclysm-test-vcpkg-static-Release-x64.exe --rng-seed time

.lgtm.yml

@@ -0,0 +1,4 @@
+# Disable FIXME query, in DDA it is as likely to be a future feature as a bug.
+queries:
+  - exclude: cpp/fixme-comment
+

.travis.yml

@@ -7,9 +7,6 @@ cache: ccache
 
 notifications:
   email: false
-  irc: "irc.freenode.org#Cataclysm-DDA"
-  use_notice: true
-  skip_join: true
 
 git:
   depth: 5

CMakeLists.txt

@@ -240,9 +240,10 @@ ELSE()
     IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
         SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")
     ENDIF()
+    SET(CATA_OTHER_FLAGS "${CATA_OTHER_FLAGS} -fsigned-char")
     # Compact the whitespace in the warning string
     string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS} ${CATA_OTHER_FLAGS}")
     SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
 ENDIF()
 

README.md

@@ -8,6 +8,7 @@ Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world. While
 
 [![Build Status](https://travis-ci.org/CleverRaven/Cataclysm-DDA.svg?branch=master)](https://travis-ci.org/CleverRaven/Cataclysm-DDA)
 [![Coverage Status](https://coveralls.io/repos/github/CleverRaven/Cataclysm-DDA/badge.svg?branch=master)](https://coveralls.io/github/CleverRaven/Cataclysm-DDA?branch=master)
+[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/CleverRaven/Cataclysm-DDA.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/CleverRaven/Cataclysm-DDA/context:cpp)
 [![Open Source Helpers](https://www.codetriage.com/cleverraven/cataclysm-dda/badges/users.svg)](https://www.codetriage.com/cleverraven/cataclysm-dda)
 [![Commit Activity](https://img.shields.io/github/commit-activity/m/CleverRaven/Cataclysm-DDA)](https://github.com/CleverRaven/Cataclysm-DDA/graphs/contributors)
 [![Lines of Code](https://tokei.rs/b1/github/CleverRaven/Cataclysm-DDA?category=code)](https://github.com/XAMPPRocky/tokei)

build-scripts/get_all_mods.py

@@ -12,27 +12,27 @@
 
 def add_mods(mods):
     for mod in mods:
-        if not mod in all_mod_dependecies:
+        if not mod in all_mod_dependencies:
             # Either an invalid mod id, or blacklisted.
             return False
     for mod in mods:
         if not mod in mods_to_keep:
             mods_to_keep.append(mod)
     return True
 
-all_mod_dependecies = {}
+all_mod_dependencies = {}
 
 for info in glob.glob('data/mods/*/modinfo.json'):
     mod_info = json.load(open(info))
     for e in mod_info:
         if e["type"] == "MOD_INFO":
             ident = e["ident"]
             if not ident in blacklist:
-                all_mod_dependecies[ident] = e.get("dependencies", [])
+                all_mod_dependencies[ident] = e.get("dependencies", [])
 
-for mod in all_mod_dependecies:
+for mod in all_mod_dependencies:
     if not mod in mods_to_keep:
-        if add_mods(all_mod_dependecies[mod]):
+        if add_mods(all_mod_dependencies[mod]):
             mods_to_keep.append(mod)
 
 print(','.join(mods_to_keep))

data/help/texts.json

@@ -156,7 +156,7 @@
     "messages": [
       "There is a wide variety of items available for your use.  You may find them lying on the ground; if so, simply press <press_pickup> to pick up items on the same square.  Some items are found inside a container, drawn as a { with a blue background. Pressing <press_examine>, then a direction key, will allow you to examine these containers and loot their contents.",
       "Pressing <press_compare> opens a comparison menu, where you can see two items side-by-side with their attributes highlighted to indicate which is superior.  You can also access the item comparison menu by pressing C after <press_listitems> to view nearby items menu is open and an item is selected.",
-      "All items may be used as a melee weapon, though some are better than others.  You can check the melee attributes of an item you're carrying by hitting <press_inventory> to enter your inventory, then pressing the letter of the item.  There are 3 melee values: bashing, cutting, and to-hit bonus (or penalty).  Bashing damage is universally effective, but is capped by low strength.  Cutting damage is a guaranteed increase in damage, but it may be reduced by a monster's natural armor.",
+      "Almost all items may be used as a melee weapon, though some are better than others.  You can check the melee attributes of an item you're carrying by hitting <press_inventory> to enter your inventory, then pressing the letter of the item.  There are 5 melee values: to-hit bonus (or penalty), moves per attack, and bash, cut, and pierce damage.  The to-hit bonus increases the chance of an attack connecting with a monster and the chance of a successful attack becoming a critical hit for more damage.  Moves per attack are how many moves it takes to attack with the weapon, and 100 moves passing every second.  Bash damage can stun a monster, preventing it from counter-attacking, but is capped by low strength.  Cut damage is usually an increase in damage over bash damage, but many monsters have natural armor against it.  Pierce damage usually penetrates armor better than cut damage, but does less damage overall, especially if you do not have a lot of skill in piercing weapons.  it may be reduced by a monster's natural armor.  The typical damage per second values are for your survivor and account for moves per attack, encumbrance, missed strikes, weapon skill, critical hits, and target armor.  The 'Best' value is against an unarmored target with no Dodge skill.  The 'Vs. Agile' value is against an unarmored target with a high Dodge skill.  The 'Vs. Armored' value is against a target with more than 15 Bash and 20 Cut resistance but no Dodge skill.  These are typical values to let you assess the effectiveness of weapons, and your actual damage in play will vary depending on the situation.",
       "To wield an item as a weapon, press <press_wield> then the proper letter.  Wielding the item you are currently wielding will unwield it, leaving your hands empty.  A wielded weapon will not contribute to your volume carried, so holding a large item in your hands may be a good option for travel.  When unwielding your weapon, it will go back in your inventory, or may be dropped on the ground if there is no space.",
       "To wear a piece of clothing, press <press_wear> then the proper letter.  Armor reduces damage and helps you resist things like smoke.  To take off an item, press <press_take_off> then the proper letter.  Clothing and armor are worn on layers, and provide different coverage, protection and warmth. Each piece has its own encumbrance, and wearing too much on each layer can significantly hamper your movement and other abilities, especially during combat. You can view and sort worn items by pressing <press_sort_armor>.",
       "Your clothing can sit in one of five layers on your body: next-to-skin, standard, waist, over, and belted.  You can wear one item from each layer on a body part without incurring an encumbrance penalty for too many worn items. Any items beyond the first on each layer add the encumbrance of the additional article(s) of clothing to the body part's encumbrance.  The layering penalty applies a minimum of 2 and a maximum of 10 encumbrance per article of clothing.",

data/json/furniture_and_terrain/terrain-manufactured.json

@@ -234,6 +234,27 @@
       "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_metal_ventilation_shutter",
+    "name": "ventilation shutters",
+    "description": "A large wall mounted panel, covered fragile metal sheets that regulate airflow.",
+    "symbol": "=",
+    "color": "light_gray",
+    "looks_like": "t_chainfence_v",
+    "move_cost": 0,
+    "coverage": 90,
+    "flags": [ "NOITEM", "WALL" ],
+    "bash": {
+      "str_min": 6,
+      "str_max": 20,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "ter_set": "t_metal_floor_no_roof",
+      "items": [ { "item": "scrap", "count": [ 8, 16 ] } ]
+    },
+    "deconstruct": { "ter_set": "t_metal_floor_no_roof", "items": [ { "item": "scrap", "count": [ 8, 16 ] } ] }
+  },
   {
     "type": "terrain",
     "id": "t_generator_broken",

data/json/items/ammo/10mm.json

@@ -7,7 +7,8 @@
     "weight": "9 g",
     "volume": "250 ml",
     "price": 400,
-    "price_postapoc": 2800,
+    "price_postapoc": 800,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "brass", "powder" ],
     "symbol": "=",
     "color": "yellow",
@@ -29,7 +30,7 @@
     "name": { "str": "10mm Auto FMJ, black powder" },
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "reloaded_10mm_fmj",
@@ -38,6 +39,6 @@
     "name": { "str": "10mm Auto FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]

data/json/items/ammo/12mm.json

@@ -7,7 +7,8 @@
     "weight": "11 g",
     "volume": "250 ml",
     "price": 6000,
-    "price_postapoc": 50000,
+    "price_postapoc": 8000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "steel" ],
     "symbol": "=",
     "color": "blue",

data/json/items/ammo/20x66mm.json

@@ -6,7 +6,8 @@
     "name": { "str": "20x66mm beanbag" },
     "description": "20x66mm caseless shotgun rounds, sublethal beanbag type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 8000,
-    "price_postapoc": 25000,
+    "price_postapoc": 1000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "proportional": { "damage": 0.1, "recoil": 0.4, "loudness": 0.6 },
     "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
@@ -19,7 +20,7 @@
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "20x66_bootleg_shot",
@@ -29,7 +30,7 @@
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "20x66_bootleg_slug",
@@ -39,7 +40,7 @@
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "20x66_exp",
@@ -48,7 +49,8 @@
     "name": { "str": "20x66mm explosive" },
     "description": "20x66mm caseless shotgun rounds, explosive projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 10000,
-    "price_postapoc": 80000,
+    "price_postapoc": 8000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "range": 20,
     "damage": 16,
     "pierce": 4,
@@ -62,7 +64,8 @@
     "name": { "str": "20x66mm flare" },
     "description": "20x66mm caseless shotgun rounds, signal flare type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 5000,
-    "price_postapoc": 20000,
+    "price_postapoc": 4000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "range": 20,
     "damage": 16,
@@ -78,7 +81,8 @@
     "name": { "str": "20x66mm flechette" },
     "description": "20x66mm caseless shotgun rounds, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 4000,
-    "price_postapoc": 55000,
+    "price_postapoc": 4000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "relative": { "damage": -10, "pierce": 20 }
   },
@@ -89,7 +93,8 @@
     "name": { "str": "20x66mm frag" },
     "description": "20x66mm caseless shotgun rounds, explosive fragmentation type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 7800,
-    "price_postapoc": 90000,
+    "price_postapoc": 5000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 5,
     "proportional": { "damage": 0.25, "pierce": 0.25 },
     "extend": { "effects": [ "FRAG" ] }
@@ -101,7 +106,8 @@
     "name": { "str": "20x66mm incendiary" },
     "description": "20x66mm caseless shotgun rounds, incendiary type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 10500,
-    "price_postapoc": 100000,
+    "price_postapoc": 5000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "extend": { "effects": [ "INCENDIARY" ] }
   },
@@ -114,7 +120,8 @@
     "weight": "56 g",
     "volume": "250 ml",
     "price": 1500,
-    "price_postapoc": 9000,
+    "price_postapoc": 4000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "steel", "powder" ],
     "symbol": "=",
     "color": "pink",
@@ -133,7 +140,8 @@
     "name": { "str": "20x66mm slug" },
     "description": "20x66mm caseless shotgun rounds, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 1500,
-    "price_postapoc": 9000,
+    "price_postapoc": 4000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "relative": { "range": 12, "pierce": 8 },
     "proportional": { "damage": 0.65, "dispersion": 1.3 },
     "delete": { "effects": [ "SHOT" ] }

data/json/items/ammo/22.json

@@ -6,7 +6,8 @@
     "name": { "str": ".22 CB" },
     "description": "The .22 Conical Ball is a variety of .22 ammunition that propels its bullet using a primer instead of gunpowder.  The end result is a subsonic round that is so weak as to be nearly useless given your predicament.",
     "price": 100,
-    "price_postapoc": 1800,
+    "price_postapoc": 1000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 100,
     "stack_size": 150,
     "recoil": 39,
@@ -29,7 +30,8 @@
     "weight": "3 g",
     "volume": "250 ml",
     "price": 150,
-    "price_postapoc": 2500,
+    "price_postapoc": 800,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "brass", "lead", "powder" ],
     "symbol": "=",
     "color": "yellow",
@@ -50,6 +52,7 @@
     "name": { "str": ".22 rat-shot" },
     "description": "A .22 caliber cartridge loaded with very small pieces of shot contained within a fragmenting plastic capsule.  It has an extremely short range and penetration ability, but it can hit targets with greater ease.",
     "count": 100,
+    "price_postapoc": 400,
     "dispersion": 0,
     "proportional": { "range": 0.6, "damage": 0.5, "recoil": 0.5 },
     "extend": { "effects": [ "SHOT", "NOGIB" ] }
@@ -61,7 +64,7 @@
     "name": { "str": ".22 LR FMJ, black powder" },
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "bp_22_lr",
@@ -70,7 +73,7 @@
     "name": { "str": ".22 LR, black powder" },
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "reloaded_22_lr",
@@ -79,7 +82,7 @@
     "name": { "str": ".22 LR, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "reloaded_22_fmj",
@@ -88,6 +91,6 @@
     "name": { "str": ".22 FMJ, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]