Merge branch 'banked-rebalance' of https://github.com/Standing-Storm/…

…Cataclysm-DDA into banked-rebalance

data/changelog.txt

@@ -139,10 +139,13 @@ Add persistent boomer bile effect that causes a stench and skin irritation
 Place_vending function can place unpowered machines
 Add option to make the bleeding of a pet stop
 Add different levels of vision to the overmap
+Allow some small parts on helicopters
 Google Maps
 Dynamic trait purifiability
 Add drugs and mutagens to your faction camp stores.
 Allow military night vision goggles to attach to combat exoskeleton head armors
+Butchering now require proficiency to do it fast and effectively
+Functioning toasters
 
 
 ## Content:
@@ -305,6 +308,8 @@ Overhaul and flesh out Barry Isherwood's rescue mission, part 2.
 Adds a home canning hobby/background to character creation
 Mute very divergent mouth mutations
 Added apiary overmap tile to farm generation
+Add Variable Snippets for Home Pictures
+More detailed sunset/sunrise morale based on actual weather and traits
 More detailed sunset/sunrise morale based on actual weather and traits
 Sand and gravel pit location
 Neutral NPCs may now be shoved.
@@ -396,6 +401,7 @@ Zone Manager: "Show All / Hide Distant" highlights selection
 Add sorting by amount and value/volume in advanced inventory search
 Addiction withdrawals are a toggleable distraction
 The filter is reset when you open the construction menu
+Select CC-Sounds as default soundpack if it's present on first run
 Removes XS/XXXL traits from the player display
 Fix message 'There is nothing to pickup'
 migrate uilist implementation to use ImGui
@@ -406,6 +412,11 @@ Fix ImGui Demo in curses
 make ImTui render text as text, so that the players can read our spiffy new menus
 toggle to only draw overmap during autotravel
 mouse input in uilists does not block keyboard navigation
+Print church/school bells ringing sound in the message log once again
+Add imgui version of the iteminfo window
+Updated default keybindings for changing start dates in character creation menu
+rewrite the loading screen to use ImGui
+Custom loading screen the game deserves
 
 
 ## Mods:
@@ -617,6 +628,9 @@ Document how spellcasting proficiencies work.
 [Magiclysm] Add WATERWALKING and ITEM_WATERPROOFING to Body of Spirit spell
 [Bombastic Perks] Sword and sorcery-esque perks
 [XE] make Tier 5 of vampirism attainable + more vampire-related tweaks
+XE Stalking Warper and Cryptid Video snippets
+Add a bunch of new perks to Bombastic Perks
+[Sky Island] Add bunker climate control upgrade
 [MoM] Make Oxygen Absorption effect visible
 [MoM] Update morphic reinforcement serum with MUT_INSTABILITY_MOD, switch it and noetic resilience treatment over to `consume_drug` use action
 [XE] Add Tier 5 vampire powers
@@ -643,6 +657,9 @@ Isolation Protocol: Add roguelike style health regen and pain reduction
 [MoM] Add Illuminate Photokinetic power
 [MoM] Add Headblind trait and Latent Psion trait
 [Xedra Evolved] Extend hedge magic research system
+[Magiclysm] Move bulk of spellcasting proficiency processing to dedicated EoCs and out of spell JSON 
+XE Playable Gracken 
+[Magiclysm] Add spell school deficiency traits
 
 
 ## Balance:
@@ -727,6 +744,8 @@ more monster balance documentation
 update Hub 01 armor repair fees and timeframes
 Add Wound Care proficiency for Park Rangers
 Opiate shakes caused by cravings go away after taking opiates. Other shakes are unaffected.
+Remove guaranteed residential solar, add random residential solar
+Mortar is now a recipe on cement bags
 let hospitalized humans revive as zed crawlers
 Cramped space doesn't prevent sleep
 rebalance beverage quench based on oral hydration index
@@ -950,6 +969,15 @@ Civilianize Semi Auto MP40
 Stop wasting dodge attempts on things you can't even see
 [MoM] Fix possibility of studying new powers concurrently.
 Wrong header restoring saved AIM layout
+Provide insertion failure reasons from only eligible pockets
+Prevent segfault when unloading from spillable container
+safer NPC ranged weapon use
+XE Undine and Salamanders no longer sweat
+Prevent segfault when target of firstaid_activity_actor disappears
+Prevent segfault if repair item disappears
+Prevent negative array index for floor_cache
+Set owner of disassembly result
+Avoid crash when the character has no proficiencies and we press enter on them inside Character menu "@
 Prevent phantom cramped space on empty tiles
 increase Flame Immunity heat resist so you're actually immune to fire for real this time
 Removes superglue recipe
@@ -1004,7 +1032,9 @@ Decrease memory overhead by about 200MB or about 15% by slimming down mapgen dat
 Faster ascii overmap drawing
 Optimize item::stacks as well as allocation patterns in item and elsewhere
 cache available recipe list in craft menu
+Optimize typed coordinate conversion functions for widespread savings
 NPCs take less time to check for enemies.
+Improve point hash functions to eliminate map overhead in nps los checks and elsewhere
 
 
 ## Infrastructure:
@@ -1069,12 +1099,15 @@ LIXA connect_group
 Allow EOCs to check and modify battery charge in items
 clean up overmap drawing code and consolidate to one function
 Jsonized end screen
+Quick setup at start for debug worlds/characters
+Random NPC classes can define weighted chance of spawning, relative to other random NPC classes
 Specify see_cost for overmap terrain with an enum instead of an integer
 Add Flathub download button and Flatpak manifest
 [EOC] Support user-input text in EOC (similar to num_input in `math`)
 Added support for multiple randomized field sprite variants
 JSON-ify sleep-affecting mutations
 Extend/delete support for harvest lists
+Migrate ACT_PULP to the new activity actor system.
 
 
 ## Build:

data/json/bionics.json

@@ -826,6 +826,25 @@
     "included_bionics": [ "bio_earplugs" ],
     "activated_on_install": true
   },
+  {
+    "id": "bio_mp3",
+    "type": "bionic",
+    "name": { "str": "WearMan" },
+    "description": "Surgically implanted into your skull near the eardrums are two speakers, as well as a small port behind the left earlobe.  They can pick up local radio waves and play downloaded music in concert hall quality.  It came pre-installed with \"Rubik's Mickse\".",
+    "occupied_bodyparts": [ [ "head", 1 ] ],
+    "flags": [ "USES_BIONIC_POWER" ],
+    "passive_pseudo_items": [ "internal_mp3" ]
+  },
+  {
+    "id": "bio_voice_b",
+    "type": "bionic",
+    "name": { "str": "AudioVox" },
+    "description": "Hailing from a world choked with neon smog, and appreciated by Exodii artists, the AudioVox implant allows you to change, remodulate, and even autotune your voice.  It also causes vocalizations /(such as shouts and singing/) to be much louder.  It consists of an electronic voice box, synthetic larynx and multiple speakers implanted throughout your throat.",
+    "occupied_bodyparts": [ [ "torso", 3 ], [ "mouth", 2 ] ],
+    "enchantments": [ { "values": [ { "value": "SHOUT_NOISE", "add": 25 }, { "value": "SHOUT_NOISE_STR_MULT", "add": 2 } ] } ],
+    "canceled_mutations": [ "GROWL", "SNARL", "HISS", "CROAK", "BOOMING_VOICE" ],
+    "mutation_conflicts": [ "SCREECH" ]
+  },
   {
     "id": "bio_emp",
     "type": "bionic",

data/json/construction/terrain.json

@@ -242,7 +242,43 @@
   },
   {
     "type": "construction",
-    "id": "constr_pit_shallow",
+    "id": "constr_pit_shallow_sand",
+    "skill": "survival",
+    "group": "dig_a_shallow_pit",
+    "category": "CONSTRUCT",
+    "difficulty": 0,
+    "time": "20m",
+    "on_display": true,
+    "qualities": [ { "id": "DIG", "level": 1 } ],
+    "pre_flags": [ "DIGGABLE", "FLAT" ],
+    "pre_special": "check_empty",
+    "pre_terrain": "t_sand",
+    "post_terrain": "t_pit_shallow",
+    "byproducts": [ { "group": "digging_sand_50L", "count": 1 } ],
+    "activity_level": "EXTRA_EXERCISE",
+    "do_turn_special": "do_turn_shovel"
+  },
+  {
+    "type": "construction",
+    "id": "constr_pit_shallow_clay",
+    "skill": "survival",
+    "group": "dig_a_shallow_pit",
+    "category": "CONSTRUCT",
+    "difficulty": 0,
+    "time": "20m",
+    "on_display": true,
+    "qualities": [ { "id": "DIG", "level": 1 } ],
+    "pre_flags": [ "DIGGABLE", "FLAT" ],
+    "pre_special": "check_empty",
+    "pre_terrain": "t_clay",
+    "post_terrain": "t_pit_shallow",
+    "byproducts": [ { "group": "digging_clay_50L", "count": 1 } ],
+    "activity_level": "EXTRA_EXERCISE",
+    "do_turn_special": "do_turn_shovel"
+  },
+  {
+    "type": "construction",
+    "id": "constr_pit_shallow_gravel",
     "skill": "survival",
     "group": "dig_a_shallow_pit",
     "category": "CONSTRUCT",
@@ -252,6 +288,25 @@
     "qualities": [ { "id": "DIG", "level": 1 } ],
     "pre_flags": [ "DIGGABLE", "FLAT" ],
     "pre_special": "check_empty",
+    "pre_terrain": "t_railroad_rubble",
+    "post_terrain": "t_pit_shallow",
+    "byproducts": [ { "group": "digging_gravel_50L", "count": 1 } ],
+    "activity_level": "EXTRA_EXERCISE",
+    "do_turn_special": "do_turn_shovel"
+  },
+  {
+    "type": "construction",
+    "id": "constr_pit_shallow",
+    "skill": "survival",
+    "group": "dig_a_shallow_pit",
+    "category": "CONSTRUCT",
+    "difficulty": 0,
+    "time": "20m",
+    "on_display": true,
+    "qualities": [ { "id": "DIG", "level": 1 } ],
+    "//": "We specifically require the PLOWABLE flag here so that some diggable terrain will NOT match this construction recipe, and will instead refer to its specific variant (e.g. constr_pit_shallow_sand)",
+    "pre_flags": [ "DIGGABLE", "FLAT", "PLOWABLE" ],
+    "pre_special": "check_empty",
     "post_terrain": "t_pit_shallow",
     "byproducts": [ { "group": "digging_soil_loam_50L", "count": 4 }, { "group": "digging_topsoil_loam_50L", "count": 1 } ],
     "activity_level": "EXTRA_EXERCISE",

data/json/furniture_and_terrain/terrain-doors.json

@@ -3086,7 +3086,7 @@
     "connect_groups": "WALL",
     "connects_to": "WALL",
     "rotates_to": "INDOORFLOOR",
-    "flags": [ "DOOR", "NOITEM", "BLOCK_WIND", "SUPPORTS_ROOF" ],
+    "flags": [ "DOOR", "NOITEM", "BLOCK_WIND", "SUPPORTS_ROOF", "TRANSLUCENT" ],
     "open": "t_door_glass_frosted_o",
     "copy-from": "t_door_glass_c"
   },
@@ -3101,7 +3101,7 @@
     "connect_groups": "WALL",
     "connects_to": "WALL",
     "rotates_to": "INDOORFLOOR",
-    "flags": [ "DOOR", "NOITEM", "SUPPORTS_ROOF" ],
+    "flags": [ "DOOR", "NOITEM", "SUPPORTS_ROOF", "TRANSLUCENT" ],
     "open": "t_door_glass_frosted_lab_o",
     "copy-from": "t_door_glass_frosted_c"
   },

data/json/furniture_and_terrain/terrain-windows.json

@@ -1019,6 +1019,7 @@
       "BLOCK_WIND",
       "REDUCE_SCENT",
       "WINDOW",
+      "TRANSLUCENT",
       "SUPPORTS_ROOF"
     ],
     "bash": {
@@ -1051,6 +1052,7 @@
       "BLOCK_WIND",
       "REDUCE_SCENT",
       "WINDOW",
+      "TRANSLUCENT",
       "SUPPORTS_ROOF"
     ],
     "bash": {
@@ -1083,6 +1085,7 @@
       "BLOCK_WIND",
       "REDUCE_SCENT",
       "WINDOW",
+      "TRANSLUCENT",
       "SUPPORTS_ROOF"
     ],
     "bash": {

data/json/item_actions.json

@@ -854,6 +854,11 @@
     "id": "WATER_PURIFIER",
     "name": { "str": "Purify some water" }
   },
+  {
+    "type": "item_action",
+    "id": "WATER_TABLETS",
+    "name": { "str": "Purify some water" }
+  },
   {
     "type": "item_action",
     "id": "WEATHER_TOOL",

data/json/itemgroups/Locations_MapExtras/airdrop.json

@@ -43,7 +43,7 @@
     "type": "item_group",
     "subtype": "collection",
     "container-item": "box_small",
-    "entries": [ { "count": 8, "group": "pur_tablets_bottle_plastic_small_15" } ]
+    "entries": [ { "count": 8, "group": "pur_tablets_bottle_plastic_small_50" } ]
   },
   {
     "id": "twoliter_water_batch",

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -2154,7 +2154,7 @@
       { "item": "apron_plastic", "prob": 25 },
       { "item": "apron_cotton", "prob": 8 },
       { "item": "apron_leather", "prob": 2 },
-      { "prob": 15, "group": "pur_tablets_bottle_plastic_small_1_15" },
+      { "prob": 15, "group": "pur_tablets_bottle_plastic_small_1_50" },
       { "item": "lye_powder", "prob": 10, "charges": [ 1, 200 ] },
       { "item": "oxy_powder", "prob": 12, "charges": [ 1, 200 ] },
       { "item": "chemistry_set", "prob": 8 },
@@ -2576,7 +2576,7 @@
       [ "flaregun", 5 ],
       [ "signal_flare", 10 ],
       [ "survivormap", 1 ],
-      { "prob": 5, "group": "pur_tablets_bottle_plastic_small_1_15" },
+      { "prob": 5, "group": "pur_tablets_bottle_plastic_small_1_50" },
       [ "razor_blade", 5 ],
       [ "sheath", 5 ],
       [ "bootsheath", 5 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -752,7 +752,7 @@
       [ "jacket_army", 40 ],
       [ "helmet_army_outdated", 10 ],
       [ "helmet_soviet_tanker", 1 ],
-      { "prob": 10, "group": "pur_tablets_bottle_plastic_small_1_15" },
+      { "prob": 10, "group": "pur_tablets_bottle_plastic_small_1_50" },
       [ "knife_trench", 14 ],
       [ "flaregun", 20 ],
       [ "signal_flare", 25 ],

data/json/itemgroups/Locations_MapExtras/locations_mapextras.json

@@ -146,7 +146,7 @@
       [ "popcan_stove", 10 ],
       [ "denat_alcohol", 6 ],
       [ "methed_alcohol", 4 ],
-      { "prob": 10, "group": "pur_tablets_bottle_plastic_small_1_15" },
+      { "prob": 10, "group": "pur_tablets_bottle_plastic_small_1_50" },
       [ "water_clean", 50 ],
       [ "granola", 60 ],
       [ "fruit_leather", 50 ],

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -404,8 +404,7 @@
       { "group": "nested_scar_l", "prob": 50 },
       { "group": "nested_scar_h", "prob": 50 },
       { "group": "nested_m110a1", "prob": 50 },
-      { "group": "nested_M24", "prob": 15 },
-      { "group": "nested_acr_300blk", "prob": 15 }
+      { "group": "nested_M24", "prob": 15 }
     ]
   },
   {
@@ -437,7 +436,6 @@
       { "group": "nested_arx160", "prob": 40 },
       { "group": "nested_psl", "prob": 10 },
       { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 },
-      { "group": "nested_acr_300blk", "prob": 15 },
       { "group": "nested_type99", "prob": 20 },
       { "group": "nested_type99_sniper", "prob": 5 },
       { "group": "nested_ak308", "prob": 25 },
@@ -465,8 +463,6 @@
       { "group": "modular_m4a1", "prob": 45 },
       { "item": "m14ebr", "prob": 15 },
       { "item": "arx160", "prob": 10 },
-      { "item": "modular_m16_auto_rifle", "variant": "modular_acr", "prob": 25 },
-      { "item": "acr_300blk", "prob": 15 },
       { "item": "hk417_13", "prob": 40 },
       { "item": "m2carbine", "prob": 5 },
       { "item": "ak308", "prob": 10 },

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -1625,7 +1625,7 @@
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      { "item": "modular_m16_auto_rifle", "variant": "modular_acr", "charges": [ 0, 30 ] },
+      { "item": "modular_m16_auto_rifle", "variant": "modular_m16a3", "charges": [ 0, 30 ] },
       { "item": "stanag10" },
       { "item": "stanag10", "prob": 50 },
       { "group": "on_hand_223" }
@@ -2014,19 +2014,6 @@
       { "group": "on_hand_308" }
     ]
   },
-  {
-    "id": "nested_acr_300blk",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [
-      { "item": "acr_300blk", "charges": [ 0, 30 ] },
-      { "item": "stanag30" },
-      { "item": "stanag30", "prob": 50 },
-      { "group": "on_hand_300BLK" }
-    ]
-  },
   {
     "id": "nested_ak47",
     "type": "item_group",

data/json/itemgroups/activities_hobbies.json

@@ -410,7 +410,7 @@
       [ "pocketwatch", 5 ],
       [ "boots_hiking", 20 ],
       [ "runner_bag", 15 ],
-      { "prob": 10, "group": "pur_tablets_bottle_plastic_small_1_15" },
+      { "prob": 10, "group": "pur_tablets_bottle_plastic_small_1_50" },
       [ "e_tool", 10 ],
       [ "knife_trench", 7 ],
       [ "flaregun", 20 ],
@@ -548,7 +548,7 @@
       [ "pocketwatch", 5 ],
       [ "boots_hiking", 20 ],
       [ "runner_bag", 15 ],
-      { "prob": 10, "group": "pur_tablets_bottle_plastic_small_1_15" },
+      { "prob": 10, "group": "pur_tablets_bottle_plastic_small_1_50" },
       [ "e_tool", 10 ],
       [ "knife_trench", 7 ],
       [ "flaregun", 20 ],
@@ -749,10 +749,10 @@
   },
   {
     "type": "item_group",
-    "id": "pur_tablets_bottle_plastic_small_1_15",
+    "id": "pur_tablets_bottle_plastic_small_1_50",
     "subtype": "collection",
     "//": "This group was created automatically and may contain errors.",
     "container-item": "bottle_plastic_small",
-    "entries": [ { "item": "pur_tablets", "count": [ 1, 15 ] } ]
+    "entries": [ { "item": "pur_tablets", "count": [ 1, 50 ] } ]
   }
 ]