Merge pull request #107 from AtomicFox556/CleverRaven-master

Port changes from other forks

.clang-tidy

@@ -66,8 +66,6 @@ readability-*,\
 -bugprone-throw-keyword-missing,\
 -bugprone-unchecked-optional-access,\
 -bugprone-unhandled-exception-at-new,\
--cata-almost-never-auto,\
--cert-dcl58-cpp,\
 -cert-err33-c,\
 -clang-analyzer-cplusplus.NewDeleteLeaks,\
 -clang-analyzer-cplusplus.StringChecker,\

data/changelog.txt

@@ -14,6 +14,8 @@ Allow JSON monster special attacks to use the dialog condition system
 Confirmation before attacking neutral mobs
 Unhardcode and rework grabs, ranged pulls
 EOCs can have context vars that can be passed into nested EOCs
+Pockets overflow into their parent pockets if possible
+Stored conditionals for EOCs
 
 
 ## Content:
@@ -43,6 +45,7 @@ Add min/max feedback to new character stats interface
 Mouse thumb button support
 Show NPC location when selecting NPC to chat with, guard, or follow
 Display why vehicle parts cannot be installed
+Open multiple containers in Advanced Inventory Manager
 
 
 ## Mods:
@@ -81,6 +84,7 @@ Converts most of the armor and clothing still using the old limb system to the n
 partial skill levels contribute to most game tests
 Portal Storm Coherency Pass
 Stop zomborgs from exploding on death
+Add a more accessible holy symbol mission, replacing the small relic one
 
 
 ## Bugfixes:
@@ -116,6 +120,8 @@ Fix calculation for inserting into nested containers
 Make copy-from copy terrain/furniture examine actions
 Prevent mission marker from being cutoff in the overmap
 Exodii will now properly be mad at you if you steal all their resources from stone barns
+NPC morale modifiers now updates regularly instead of being permanently applied
+Fix UI and accessibility issues in the overmap UI and character creation menu
 
 
 ## Performance:

data/json/EraOfDecay/items/tools/other.json

@@ -62,5 +62,13 @@
     "symbol": ";",
     "color": "brown",
     "melee_damage": { "bash": 8 }
+  },
+  {
+    "id": "e_tool_sharpened",
+    "copy-from": "e_tool",
+    "type": "TOOL",
+    "name": { "str": "sharpened entrenching tool" },
+    "description": "A stout, collapsible spade.  It's commonly used by military forces and favored by hikers for digging.  This one had its edges crudely shapened, turning it into a much more dangerous weapon in melee combat.",
+    "melee_damage": { "bash": 6, "cut": 16 }
   }
 ]

data/json/EraOfDecay/recipes/other/containers.json

@@ -327,5 +327,22 @@
     "proficiencies": [ { "proficiency": "prof_pottery" } ],
     "using": [ [ "cordage_short", 1 ], [ "stoneware_firing", 50 ] ],
     "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 4 ] ], [ [ "leather", 2 ], [ "fur", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "jerrycan",
+    "id_suffix": "with_plastic_molding",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_CONTAINERS",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "80 m",
+    "autolearn": true,
+    "book_learn": [ [ "plastics_book", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_plasticworking" } ],
+    "tools": [ [ [ "surface_heat", 40, "LIST" ] ] ],
+    "using": [ [ "plastic_molding", 1 ] ],
+    "components": [ [ [ "plastic_chunk", 40 ] ] ]
   }
 ]

data/json/EraOfDecay/recipes/recipe_disassembly.json

@@ -30,5 +30,94 @@
     "time": "1 s",
     "components": [ [ [ "sheet", 1 ] ] ],
     "flags": [ "BLIND_EASY" ]
+  },
+  {
+    "type": "uncraft",
+    "result": "cable_xlr",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "electronics",
+    "time": "1 m",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "cable", 8 ] ] ]
+  },
+  {
+    "type": "uncraft",
+    "result": "cable_speaker",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "electronics",
+    "time": "1 m",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "cable", 16 ] ] ]
+  },
+  {
+    "type": "uncraft",
+    "result": "cable_instrument",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "electronics",
+    "time": "1 m",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "cable", 8 ] ] ]
+  },
+  {
+    "type": "uncraft",
+    "result": "headphones_circumaural",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "electronics",
+    "difficulty": 1,
+    "time": "8 m",
+    "using": [ [ "soldering_standard", 5 ] ],
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "components": [ [ [ "plastic_chunk", 1 ] ], [ [ "cable", 1 ] ], [ [ "e_scrap", 2 ] ] ]
+  },
+  {
+    "type": "uncraft",
+    "result": "microphone_xlr_generic",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "electronics",
+    "difficulty": 1,
+    "time": "8 m",
+    "using": [ [ "soldering_standard", 5 ] ],
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "components": [ [ [ "scrap_aluminum", 3 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "cable", 2 ] ], [ [ "e_scrap", 4 ] ] ]
+  },
+  {
+    "type": "uncraft",
+    "result": "mic_stand_tall",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "10 m",
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ [ "scrap_aluminum", 27 ] ], [ [ "plastic_chunk", 3 ] ] ]
+  },
+  {
+    "type": "uncraft",
+    "result": "guitar_stand",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "5 m",
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ [ "scrap_aluminum", 9 ] ], [ [ "plastic_chunk", 1 ] ] ]
+  },
+  {
+    "type": "uncraft",
+    "result": "mixer_music",
+    "activity_level": "MODERATE_EXERCISE",
+    "skill_used": "electronics",
+    "difficulty": 3,
+    "time": "30 m",
+    "using": [ [ "soldering_standard", 20 ] ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [
+      [ [ "scrap_aluminum", 30 ] ],
+      [ [ "scrap", 20 ] ],
+      [ [ "plastic_chunk", 10 ] ],
+      [ [ "amplifier", 8 ] ],
+      [ [ "power_supply", 8 ] ],
+      [ [ "processor", 1 ] ],
+      [ [ "RAM", 2 ] ],
+      [ [ "sheet_metal_small", 12 ] ],
+      [ [ "small_lcd_screen", 2 ] ],
+      [ [ "cable", 20 ] ],
+      [ [ "e_scrap", 16 ] ],
+      [ [ "circuit", 8 ] ]
+    ]
   }
 ]

data/json/EraOfDecay/recipes/weapon/cutting.json

@@ -0,0 +1,15 @@
+[
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "e_tool_sharpened",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "skill_used": "fabrication",
+    "time": "1 h",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "tools": [ [ [ "rock", -1 ], [ "ceramic_shard", -1 ], [ "sharp_rock", -1 ] ] ],
+    "components": [ [ [ "e_tool", 1 ] ] ]
+  }
+]

data/json/ascii_art/gun_ascii.json

@@ -1428,7 +1428,7 @@
   },
   {
     "type": "ascii_art",
-    "id": "m4a1",
+    "id": "modular_m4a1",
     "picture": [
       "                           ",
       "                           ",

data/json/bionics.json

@@ -45,7 +45,7 @@
     "id": "bio_ar",
     "type": "bionic",
     "name": { "str": "Integrated AR System" },
-    "description": "Extreamly thin lenses provide user with augmented reality overlay allowing the user to zoom, and it displays handy information about local topology.",
+    "description": "Extremely thin lenses provide user with augmented reality overlay allowing the user to zoom, and it displays handy information about local topology.",
     "//": "Basically implanted contact lenses with AR capabilities",
     "occupied_bodyparts": [ [ "eyes", 1 ] ],
     "flags": [ "USES_BIONIC_POWER" ],

data/json/connect_groups.json

@@ -53,6 +53,14 @@
     "type": "connect_group",
     "id": "SAND"
   },
+  {
+    "type": "connect_group",
+    "id": "SANDMOUND"
+  },
+  {
+    "type": "connect_group",
+    "id": "SANDGLASS"
+  },
   {
     "type": "connect_group",
     "id": "PIT_DEEP"
@@ -81,10 +89,22 @@
     "type": "connect_group",
     "id": "CLAY"
   },
+  {
+    "type": "connect_group",
+    "id": "CLAYMOUND"
+  },
   {
     "type": "connect_group",
     "id": "DIRT"
   },
+  {
+    "type": "connect_group",
+    "id": "DIRTMOUND"
+  },
+  {
+    "type": "connect_group",
+    "id": "MUD"
+  },
   {
     "type": "connect_group",
     "id": "ROCKFLOOR"