Allow true or false effects of talk effects #56932

Ramza13 · 2022-04-19T21:14:15Z

Summary

None

Purpose of change

Part of #55690
Different way of doing #56083
More eoc power

Describe the solution

Added ability to have eocs run after success or failure to talk effects that can fail.

Describe alternatives you've considered

Moving all existing instances of the changed functions to use true or false eocs. I ran out of energy and think I got the ones that should be an issue but more remain.

Testing

Additional context

doc/NPCs.md

I-am-Erk · 2022-04-22T13:16:10Z

So this basically lets us modularize a chunk of effects that we're going to call repeatedly, rather than typing it out every time, right?

haveric · 2022-04-23T02:30:01Z

So this basically lets us modularize a chunk of effects that we're going to call repeatedly, rather than typing it out every time, right?

The main thing this does is make some effects trigger others conditionally (such as when you successfully trade something, it will take effect, instead of always. This prevents you from say buying 100 logs from Tacoma without actually spending anything). It does seem Ramza has implemented it in a way that they can be shared though, which looks potentially useful.

Co-authored-by: haveric <breuerryan@gmail.com>

commit 302b8b0242b9a4f2531a21fd3f53682a0bd3ddb6 Author: Termineitor244 <termineitor244@hotmail.com> Date: Wed Apr 27 13:49:54 2022 -0500 group -> item commit cb72ee4be0124e426f305ed24fcc5b53a76bf923 Author: Termineitor244 <termineitor244@hotmail.com> Date: Wed Apr 27 13:29:10 2022 -0500 Zombie child drops update commit 12524b2e78216d8faeb3657d85c50c50531c9550 Author: andrei <68240139+andrei8l@users.noreply.github.com> Date: Thu Apr 28 07:15:58 2022 +0300 inv_ui: fix entry copy to/from hierarchical mode (#57210) commit e23126180a4d688c20aaa20fe5719b8c0f0a28cb Author: Aerin <75549031+Aerin-of-the-Toast@users.noreply.github.com> Date: Wed Apr 27 21:28:23 2022 -0400 Nailboard, 2-by-sword, nord, crude sword adjustments + fixes (#57147) * Nailboard and 2-by-sword + derivatives adjustments * Belt clip the swords, add budget steel to crude sword * Fixed the expected DPS tests commit 83846db48fd942c3381e7d619eaa3a9d3e1e1553 Author: andrei <a12l+git@runbox.com> Date: Tue Apr 26 11:24:53 2022 +0300 trade_ui: add action for auto-balancing commit a4d408aa6e042cfe89063689180dc3b1fbd1ef58 Author: andrei <a12l+git@runbox.com> Date: Tue Apr 26 10:50:00 2022 +0300 inv_multisel: add in/decrease selection action commit ea0945fa5b5bfc623e782c146be1eb362be3aca6 Author: PatrikLundell <j.patrik.r.lundell@gmail.com> Date: Thu Apr 28 03:04:04 2022 +0200 Scan basecamp (#57170) * Updated faction camp hide site UI * Added scanning base camp for furniture and appliances commit 9359574b221f6322eacf9f7e64cf95df8d2a95c2 Author: FayFlightee <71143790+FayFlightee@users.noreply.github.com> Date: Thu Apr 28 08:01:36 2022 +0700 Add looks_like to standing lamp in appliance and item form. (#57172) * Adding SHEATH_SPEAR to ji As title said. Since this is a spear and is very much missing the tag needed. * Adding Looks_like to Standing lamp appliance and item What the title said. * Linting I forgor to do this earlier commit 148d8697cc9395a5df4f4d1830e5394041488ddd Author: psuedolet <psuedolet@gmail.com> Date: Wed Apr 27 20:50:17 2022 -0400 Fix insertion error when looting valid ammo (#57192) * Don't attempt to fill the wielded gun's MAGAZINE pocket when picking up items. * Check for pocket_type::MAGAZINE instead of item type GUN * Astyle commit 4912cb53bd0966c841aef1e2b5d7049081086960 Author: Binrui Dong <brett.browning.dong@gmail.com> Date: Thu Apr 28 08:47:41 2022 +0800 Only load cataclysm-dda.mo from system locale directory (#57213) commit f17c272eae0c1ad5b4f75fd8e1833844cbcf40f3 Author: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Wed Apr 27 17:42:13 2022 -0700 Update exosuit plating (#55924) * Update modular_exoskeleton_plating.json * Update modular_exoskeleton_plating.json * Update modular_exoskeleton_plating.json * Create exo_components.json * Nanobracket * Update exo_components.json * Update modular_exoskeleton_plating.json * Update modular_exoskeleton_plating.json * Update modular_exoskeleton_plating.json * Update modular_exoskeleton_plating.json * Update modular_exoskeleton_plating.json * Update modular_exoskeleton.json * Update modular_exoskeleton_plating.json * Update modular_exoskeleton.json * Update exo_components.json * Update modular_exoskeleton.json * Update modular_exoskeleton_plating.json * Linting * Update modular_exoskeleton_plating.json * Update modular_exoskeleton_plating.json * Update modular_exoskeleton_plating.json * Update modular_exoskeleton_plating.json * Connectors * Plating organization * Delete exo_components.json * Update exosuit_plating_torso.json * Lint * Update exosuit_plating_legs.json * Update exosuit_plating_psu.json * Update exosuit_plating_psu.json * Update exosuit_plating_head.json * Exo connector as ammo * Update exosuit_ammo.json * Update exosuit_plating_arms.json * Update exosuit_ammo.json commit 9689a16a49dd261da0fb4980f92796fa6b95ace9 Author: bombasticSlacks <dillon.matchett@gmail.com> Date: Tue Apr 26 22:28:36 2022 -0300 migrate correctly in generic guns commit 4107dbca1f5421a6ad732b625b40203051a42497 Author: bombasticSlacks <dillon.matchett@gmail.com> Date: Tue Apr 26 21:59:50 2022 -0300 correct spawns and limits on size commit deb568beb80d05dd30a7b3faf8b2c67a9ef19f78 Author: bombasticSlacks <dillon.matchett@gmail.com> Date: Tue Apr 26 13:36:47 2022 -0300 breachers LBV commit b8b34419254b1084ecaea85c38f748618d95e408 Author: Qrox <qrox@sina.com> Date: Wed Apr 27 18:23:00 2022 +0800 Remove duplicate keys of an action commit a2bf1fe0156bf9d285a457fce9962a9b63d7a73a Author: Qrox <qrox@sina.com> Date: Wed Apr 27 17:44:40 2022 +0800 Add keypad enter key to old keybindings with return key commit aaadbe2567114857f593578505305242b99dd9e6 Author: Anton Burmistrov <Night_Pryanik@mail.ru> Date: Thu Apr 28 04:38:19 2022 +0400 Returned range check for shocker's attack (#57207) commit 97334d506af9ae38f4d12d70a87add592da8f705 Author: Anton Burmistrov <Night_Pryanik@mail.ru> Date: Thu Apr 28 04:29:30 2022 +0400 Added melee damage modifier to pistol bayonet (#57208) commit 916d778f84910ac193175411010c0b16ec1a5e06 Author: RandDenner <73523034+RandDenner@users.noreply.github.com> Date: Wed Apr 27 17:39:35 2022 -0400 Fix to radio station maps to allow them to be correctly faced to the street during mapgen (#57078) * Adding a note to allow PC creation * Update station_radio.json * Add new rotated, updated maps in place of originals * Update station_radio.json Palette update 1 * Update station_radio.json missing comma * Update station_radio.json extra comma (grrrrrrr......) * Update station_radio.json Revised map slightly commit 1e7f27184719ca541da64947b80937d4322fde54 Author: Sathra225 <100510526+Sathra225@users.noreply.github.com> Date: Thu Apr 28 07:07:01 2022 +1000 [Innawoods] Aphid ranching and wild crops (#57203) * Update recipe_food.json * Add files via upload * Add files via upload * Update innawood_map_settings.json * Add files via upload * Add files via upload * Update food_other.json commit d6087a2d18cdf0645dcbf3fcf26f9a147d706a23 Merge: 733ee330c30 3d98a929a93 Author: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Date: Wed Apr 27 09:55:47 2022 +0300 Merge pull request #57187 from anothersimulacrum/pointifex Allow applying arbitrary filters to tripoint_range, add points_in_radius_circ commit 733ee330c3059e0e2102a7f794d5cd8c30c684d5 Merge: 6eae86c242b a9327f21093 Author: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Date: Wed Apr 27 09:54:50 2022 +0300 Merge pull request #57200 from RandDenner/recipe-deleted-bugfix Replace chain link recipe line mistakenly deleted by PR #57124, previously merged commit 6eae86c242bf7458ddcedb820a8f572874bf0937 Merge: 6a76396aa69 455e0f41f00 Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Wed Apr 27 01:27:02 2022 -0500 Merge pull request #57184 from Termineitor244/misc-encumbering-updates Bags encumbrance update commit 6a76396aa69b94e0a290c208bda3de0cd1692edd Author: Termineitor244 <termineitor244@hotmail.com> Date: Wed Apr 27 00:41:28 2022 -0500 Aprons love (#57197) * Aprons love * Update weight of the kevlar apron commit 8280308943ccb19b2e678f7b1504ad4e54de3858 Author: RandDenner <73523034+RandDenner@users.noreply.github.com> Date: Wed Apr 27 01:40:17 2022 -0400 Update GAME_BALANCE.md with improved weapon to-hit descriptions (#57180) * Update GAME_BALANCE.md * Removed duplicate info * Clarity edit * spelling (sort-of) fix * Fixing lingering typos from the original document * Minor grammatical improvement * Grammar again * Can't stop adjusting grammar... commit b264d44e2b5495ba324b7a82e8aa62b3417b6e1e Author: RandDenner <73523034+RandDenner@users.noreply.github.com> Date: Wed Apr 27 01:39:21 2022 -0400 Quick to-hit fixes for a couple of weapons (#57181) * golf club and heavy sledge fixes * combat saws * Golf club -3 base damage to get to target DPS of 14 * Adjust chainsaw, electric chainsaw damage by -11 to get target DPS of 28 * combat saws damage decrease to 60 for target DPS of 28 * Make golf clubs a fragile melee weapon commit 706264230fdc9bc00165049ea7e261f735432d76 Author: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Tue Apr 26 22:37:50 2022 -0700 Afs exosuit undersuits (#56969) * Separate undersuits * Update exosuit_underlayers.json commit 9843146fc9ce42258bee811c14b96a68e082770b Author: Termineitor244 <termineitor244@hotmail.com> Date: Wed Apr 27 00:37:05 2022 -0500 Hockey stick love (#57190) commit 455e0f41f00a57563b7e0288fa43eec7b7930ce5 Author: Termineitor244 <termineitor244@hotmail.com> Date: Tue Apr 26 23:57:11 2022 -0500 volume_encumber_modifier partial update commit ce997fd932e2cca33b62d3f6f94742fd6f87233f Author: Termineitor244 <termineitor244@hotmail.com> Date: Tue Apr 26 22:48:54 2022 -0500 Update labeler.yml (#57185) commit 3d839aa6b2708634f1c781bdfbdcb05330b00f0b Author: PatrikLundell <j.patrik.r.lundell@gmail.com> Date: Wed Apr 27 05:43:15 2022 +0200 Updated faction camp hide site UI (#57150) * Updated faction camp hide site UI * removed unused stuff commit 379bb17874082e79b0b2dd1f3e8f45d70123a227 Author: Dillon Matchett <dillon.matchett@gmail.com> Date: Wed Apr 27 00:22:44 2022 -0300 added the deployment bag to molle pouches that are available (#57194) commit 64f669826b8c9f4db54a835311eceec049653888 Author: Dillon Matchett <dillon.matchett@gmail.com> Date: Wed Apr 27 00:20:32 2022 -0300 Rest of the consumes (#57195) commit a9327f210935a9bd8bd28ba70cb5cc84b50f56bd Author: RandDenner <73523034+RandDenner@users.noreply.github.com> Date: Tue Apr 26 23:15:18 2022 -0400 replace mistakenly deleted line from PR #57124 commit fad96223b78c2ea48b53266db3cf501ee3a0a3c0 Author: andrei <68240139+andrei8l@users.noreply.github.com> Date: Wed Apr 27 05:06:21 2022 +0300 json/evac_shelter: move trader zones to same submap (#57156) commit 4eeb0ac3214e2fe58ec98b6381a28b88a37c1c43 Author: Termineitor244 <termineitor244@hotmail.com> Date: Tue Apr 26 14:34:33 2022 -0500 Bags encumbrance update commit 1fa5cd42b294f802d88a2a9685218d899d77ccd1 Author: Ava <47678781+Ilysen@users.noreply.github.com> Date: Tue Apr 26 19:35:50 2022 -0400 Optional popup functionality for u_consume_item, including some implementation (#57183) * Popups for u_consume_item * Update the documentation commit 3d98a929a93bc0e959fb97dbc060d183a5507729 Author: anothersimulacrum <anothersimulacrum@gmail.com> Date: Tue Apr 26 19:10:11 2022 +0000 Allow applying arbitrary filters to tripoint_range In the aim of adding a circular points_in_radius function, and allowing other extension to points_in_radius, expand tripoint_range to take an (optional) 'predicate' function which determines whether or not a selected point is 'valid' - whether it belongs in the range. If a point does not match this predicate, we advance through the rest of the range until we either find a point which does, or we reach the end. Due to the nature of allowing an arbitrary function to determine membership in the range, the size function has been modified to go through and manually count all points, otherwise it would not be accurate. This is the motivation for making the predicate optional, as opposed to simply using an 'always true' function for when no predicate is specified. The non-predicate size function is modified to construct the range tripoint in a way that works for arbitrary point types, instead of only tripoints. The circle function may not be exactly what is expected due to requiring an integer radius as opposed to a diameter. I did what I believed was most correct, but others may have other expectations. There's some template voodoo in the points_in_radius_where function to allow passing in non-templated lambda functions, as it would be poorly usable otherwise. commit a85a36fa54dc9fd803d4c5fb32073b83d76d15f0 Merge: 46975540433 b572e011d3f Author: Curtis Merrill <curtis.r.merrill@gmail.com> Date: Tue Apr 26 17:27:17 2022 -0400 Merge pull request #57169 from Cerberus1746/patch-1 Minor text correction in sinister staff of bleeding commit 469755404338eb00f64ba8de68cb91c54ebf35ae Author: ZombieZilla <48612811+ZombieZilla@users.noreply.github.com> Date: Wed Apr 27 02:11:25 2022 +1000 Fix hydraulic press copy-paste (#57173) commit 3003d8809bcaac2c884a21ede59ae95fb1c51d1c Merge: 90c3b39f410 415474295ef Author: David Seguin <davidseguin@live.ca> Date: Tue Apr 26 12:06:35 2022 -0400 Merge pull request #57163 from bombasticSlacks/dep-bag deployment bag commit b572e011d3f66d573b97a5c0c70f07311005b107 Author: Leandro Benedet Garcia <leandro.benedet.garcia@gmail.com> Date: Tue Apr 26 11:00:23 2022 -0300 Minor correction in sinister staff of bleeding I just removed a the where it didn't make much sense. commit 90c3b39f4100a9089d8d05c23d211870aaf9731b Author: Ava <47678781+Ilysen@users.noreply.github.com> Date: Tue Apr 26 09:28:38 2022 -0400 [CR] Hub 01 intercom dialogue update pt 2: Missions (#57069) * Dialogue updates Prevent softlock of updating players work work * Rip out the old mind splicer code * elaborate more on entry/exit from the tower * Sort all new contracts at the bottom * Proofreading adjustments * top 10 EPIC linting fails!!!! * Remove a bunch of extraneous data * fool of a took * Missing whitespace * u_sell_item -> u_consume_item * and a rewording for good measure commit 3e81ac151aa06a98aaa35de64a3b118425ecdfcf Merge: d11f77a64b9 55a402c72eb Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Tue Apr 26 00:40:48 2022 -0500 Merge pull request #57124 from TheShadowFerret/ToolsToQualities Move explicit pliers/multitool requirements to WRENCH 1 requirement commit d11f77a64b90f5c2b5c9ca003fc47d9ba83656e3 Merge: 3a4370955f2 8973130abbf Author: David Seguin <davidseguin@live.ca> Date: Tue Apr 26 00:53:40 2022 -0400 Merge pull request #57159 from I-am-Erk/refcenter-minor-mission-fix Ensure it is always possible to clean the refugee center back bay commit 3a4370955f2f201ba300fe9cd500b3e8640e0679 Merge: c06edebc216 3f38ccc2bbd Author: David Seguin <davidseguin@live.ca> Date: Tue Apr 26 00:53:20 2022 -0400 Merge pull request #57142 from Termineitor244/Monster-spawn-update Sexy spawn revamp commit 3f38ccc2bbd2ccad1743f42ef934c155b52bcf55 Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 20:52:07 2022 -0500 More carpet for the sex shop commit 415474295ef01ccabce1221ed1e60b1fdafa97cd Author: bombasticSlacks <dillon.matchett@gmail.com> Date: Mon Apr 25 22:49:16 2022 -0300 spelling fixes commit 2ff2b90d61c72906c7e269b872ca79306b26ef37 Author: bombasticSlacks <dillon.matchett@gmail.com> Date: Mon Apr 25 22:41:24 2022 -0300 deployment bag commit 40d12632045f19185343f1e4f69bfc28d4287286 Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 20:20:38 2022 -0500 Strip club spawn revamp finished commit c06edebc21697d5e26c4c8b4d40c88ab8bc680f1 Merge: 4a24c9caf17 201989d97a0 Author: Curtis Merrill <curtis.r.merrill@gmail.com> Date: Mon Apr 25 20:27:58 2022 -0400 Merge pull request #57157 from Faalagorn/patch-2 Correct plural for sinister minor staff of bleeding commit 8973130abbf7c953c244776f6fc8958e73b40e53 Author: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon Apr 25 17:04:11 2022 -0700 Update NPC_free_merchant_teamster.json commit 9a6412e7ba7f14b8409b19ac6176d9f69345783b Author: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon Apr 25 17:00:18 2022 -0700 Update NPC_free_merchant_teamster.json The teamster is a "freebie" cleaner upper, which makes it possible to complete the mission even if you fail your speech checks. commit 4a24c9caf1743927431e6c959ce5967849297def Author: Fris0uman <41293484+Fris0uman@users.noreply.github.com> Date: Tue Apr 26 01:07:24 2022 +0200 Update Magiclysm's Security Van (#56726) commit a805f0c7ddd1fc1ba7f7292f4552de70d99a4de7 Author: PatrikLundell <j.patrik.r.lundell@gmail.com> Date: Tue Apr 26 00:47:39 2022 +0200 Adding yarn spinning to livestock area 2 (#57055) commit 209b7d18cf3b14d4b4ca96ec0b4b4613a1c047e2 Author: ZeroInternalReflection <89038572+ZeroInternalReflection@users.noreply.github.com> Date: Mon Apr 25 18:31:03 2022 -0400 Fix scrolling of dialog responses and standardize the scrollbar (#57153) The dialog response screen would, with certain window sizes and response lengths, fail to display the currently-selected response. In addition, the dialog response panel had a unique scrolling indicator implementation rather thatn using the standard scrollbar. commit 4cb7a56b2bcccf77869a4aec8ddb1e7d42551a30 Author: onura46 <67405765+onura46@users.noreply.github.com> Date: Mon Apr 25 15:25:12 2022 -0700 Fix a few typos in faction camp menus (#57141) Co-authored-by: Kaelin Bougneit <zerotepmusic@gmail.com> commit e8a4821289d0e37b8e1a820be6a90bda3374bc2c Author: andrei <68240139+andrei8l@users.noreply.github.com> Date: Tue Apr 26 01:07:29 2022 +0300 npctrade: fix bionic installation prices (#57135) add the bionic's trade price if it's not owned by the patient don't allow paying for the CBM with the CBM commit 2ccd6c4031b08ee1ced14c9047d37021592fafa1 Author: Hirmuolio <22011552+Hirmuolio@users.noreply.github.com> Date: Tue Apr 26 01:03:05 2022 +0300 Fix mixing NO_PARASITES water with normal water (#57145) * mix no parasite * astyle * Comment whitespace Co-authored-by: NetSysFire <59517351+NetSysFire@users.noreply.github.com> Co-authored-by: NetSysFire <59517351+NetSysFire@users.noreply.github.com> commit 25fea95546df3982388240ce49f2638161d6bbea Author: AtomicFox556 <98733651+AtomicFox556@users.noreply.github.com> Date: Tue Apr 26 01:01:58 2022 +0300 Add recipe for deck of cards (#56565) * Add recipe for deck of cards * Make recipe produce a makeshift deck * Update toolsets.json commit f3a72dafb62fe7e62677bc0b9d0a9e169d99a5dc Merge: fbc3587eb45 bbf2868d5ef Author: David Seguin <davidseguin@live.ca> Date: Mon Apr 25 17:59:04 2022 -0400 Merge pull request #56994 from AsterAdelfa/master Adding Furriery Proficiency In a recipe #56960 commit fbc3587eb45ed6a55505615f10652e4ff8ad1414 Merge: 6b281aa05c2 7d37a80a4a8 Author: David Seguin <davidseguin@live.ca> Date: Mon Apr 25 17:58:20 2022 -0400 Merge pull request #57139 from Qrox/keybindings Some keybinding fixes commit 6b281aa05c2db216b9c007ceefbd155a7d25339e Author: ZombieZilla <48612811+ZombieZilla@users.noreply.github.com> Date: Tue Apr 26 07:54:50 2022 +1000 Air compressor, Hydraulic press & Water purifier appliances (#57100) * air compressor app * hydraulic press tool Also converted heavy lathe fake item to match with the rest (but not turning it into an appliance) * water purifier appliance * water purifier description * fixes * plurals * Apply suggestions from code review commit 5aebbdcf325bc12734d54401556a4330966c76f9 Author: casswedson <58050969+casswedson@users.noreply.github.com> Date: Mon Apr 25 16:54:22 2022 -0500 fix: don't run comments command on prs (#57133) at the moment I don't want this running on pr comments, maybe in the future for now we just skip commit 067f831a7f66f3c630ab95731accfdf16de5ca09 Author: andrei <68240139+andrei8l@users.noreply.github.com> Date: Tue Apr 26 00:49:31 2022 +0300 vehicle: fix a collision crash (#57146) commit 201989d97a00c6f99241b0b6a8617859499272ff Author: Faalagorn <faalagorn@gmail.com> Date: Mon Apr 25 23:33:32 2022 +0200 Correct plural: sinister minor staff of bleeding commit 1387cbf0b8854eabfcd48dff0704afe80aa6f72e Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 16:31:47 2022 -0500 Zombie dancer item spawn revamp commit 176634a1337c0e913b19469384fa352ba5bf653d Author: Faalagorn <faalagorn@gmail.com> Date: Mon Apr 25 23:25:32 2022 +0200 Clarified drum/double drum for HWP gun (#57149) commit 459dcff2258ef613849c8c4f06c85ae747d39c1a Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 15:25:39 2022 -0500 Sex shop revamp commit 9263c615f7c16a001db0116ff00ada7f0b129629 Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 14:10:29 2022 -0500 Costume professions (#57062) * Vampire * Necromancer * Grim Reaper * Ninja * Cheerleader * Patriot * American Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Social and better athelthics skills for the cheerleader * Social -> Speech * Magic Items * Commas * Spelling * JSON style * Charges to the grim reaper scythe * Found -> find * Stockings and garter belt * Kunoichi, Ninja skills revamp and allowed scenarios * Remove duplicate name * comma Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> commit 6e6cea4292f6a6b25e17c62fce74245b5af4ac4d Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 13:25:31 2022 -0500 Swimming spawns revamp (#57103) * Swimming sets revamp * Camera bag spawns * expensive flip-flops spawns * Comma * Reorganize swimmer drops * Adds random damage * Reduces probability of head gear commit 9ed6953ffb48f1c9a7d1add2dab6a954a6a79fe6 Merge: 615ddec112a 7d3a7940919 Author: Curtis Merrill <curtis.r.merrill@gmail.com> Date: Mon Apr 25 14:23:54 2022 -0400 Merge pull request #57134 from Termineitor244/Revamp-Really-Bad-Day-professions Revamp Really Bad Day professions commit 615ddec112afe1bcb7db9727b8916fb528f88848 Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 13:23:37 2022 -0500 Naked description updates (#57136) * Naked description updates * Comma commit 44c51a442a58abae8ab93069cca7dc7ba14d6f97 Author: tornikeo <56438982+tornikeo@users.noreply.github.com> Date: Mon Apr 25 16:27:44 2022 +0400 Add two new drum magazines to Hub01 gun (#57128) * Add two new drum-type magazines for Hub01's HWP * Add new mags to generic guns migration list * Update data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json Co-authored-by: Dillon Matchett <dillon.matchett@gmail.com> * Update data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json Co-authored-by: Dillon Matchett <dillon.matchett@gmail.com> Co-authored-by: Dillon Matchett <dillon.matchett@gmail.com> commit 4c93a1c28ef5cbfa2753dfe02dd2d7d6e5b0f57e Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 05:56:32 2022 -0500 Start of the strip club spawn revamp commit b68e561e046da87625d098505e11e39bc303d5c1 Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 05:06:13 2022 -0500 Resolve movie theater spawn problems commit 74aa43a7a27e0eeead6e6991af285e778c1d9bb1 Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 05:00:52 2022 -0500 Strip club variant with no cops and backroom sofa commit 1a2f6dd73576f79860f89ca7659b3df502d1c0d1 Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 03:43:33 2022 -0500 Stripclub monster spawn problem fix commit d491af8d250502cf824d837ed1ecdb1b55cb01c4 Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 03:19:59 2022 -0500 Mansion spawn updates commit 7d37a80a4a837bc61aeee8cc80fb6699ad77b5fd Author: Qrox <qrox@sina.com> Date: Mon Apr 25 15:56:07 2022 +0800 Fix value of ncurses delete key commit cd3947fefa3a039b48f30ee5b4f70e256e48d553 Author: Qrox <qrox@sina.com> Date: Mon Apr 25 15:15:51 2022 +0800 Allow using keypad enter as return key on curses commit ac20ed68b0bae7bc3621d574477e4423e7e8b24d Author: Qrox <qrox@sina.com> Date: Mon Apr 18 00:50:30 2022 +0800 Fix symbol mode keybinding of FRIENDS_ME_CANCEL commit 82066144e7ef182fa42e379e9d6d9680c61cf0a9 Author: Perset <100487684+Perset@users.noreply.github.com> Date: Sun Apr 24 23:17:29 2022 -0700 Update NPC_Barry_Isherwood.json (#57131) commit d0acc646951882f1e352090d90cce412ec3b3f6b Author: Faalagorn <faalagorn@gmail.com> Date: Mon Apr 25 08:15:33 2022 +0200 Change 3 init.cpp items to title case (#57130) commit d2f35f034bc5799895787a2c51a8658476230bc6 Merge: c36b042cc79 88c7807d87b Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Mon Apr 25 01:06:14 2022 -0500 Merge pull request #57129 from Fris0uman/tielsetUpdat Tileset Update 2022-04-24 commit 24a6dffc86b3328aecaebb7b2454ca0eaa359e25 Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 01:02:34 2022 -0500 Strip club and sexshop dancers/scantily dressed zombies commit b4aeca480f921cdcd9617e3d059a970e2518110a Author: Termineitor244 <termineitor244@hotmail.com> Date: Mon Apr 25 00:47:12 2022 -0500 Zombie Swimmer spawn to zombie swimmer base spawn commit 7d3a7940919f677bc9bc5fd7549e923b155c128d Author: Termineitor244 <termineitor244@hotmail.com> Date: Sun Apr 24 23:50:44 2022 -0500 Revamp Really Bad Day professions commit c36b042cc7926adcf30d4f3cfcd12d38a27c8565 Author: Faalagorn <faalagorn@gmail.com> Date: Mon Apr 25 03:50:31 2022 +0200 Heres → Here's (#57089) Co-authored-by: Kevin Granade <kevin.granade@gmail.com> commit 0fb7a2ab2b141bd3d9ff63898a146482a5661895 Author: Dillon Matchett <dillon.matchett@gmail.com> Date: Sun Apr 24 22:50:07 2022 -0300 added missing opposites (#57117) commit 994ddeca24f2a30e5498d1a70cd4e090b7cce665 Author: andrei <68240139+andrei8l@users.noreply.github.com> Date: Mon Apr 25 04:30:43 2022 +0300 npc: sanitize trade value logic (#57029) commit 5db976cfe266663b3fb3aec127ac8f7949e9b0ce Merge: c2ed881a546 c7ebb4a692e Author: Kevin Granade <kevin.granade@gmail.com> Date: Sun Apr 24 18:05:14 2022 -0700 Merge pull request #57072 from casswedson/issue-auto-labeling feat: label issues by template+confirm bug command commit c2ed881a5462c407195613bdb1cddde0ce89ec78 Merge: 4b7f27b38d9 f5baa670d9c Author: Kevin Granade <kevin.granade@gmail.com> Date: Sun Apr 24 16:37:25 2022 -0700 Merge pull request #56768 from andrei8l/mapgen-veh-zones Allow placing vehicle zones at mapgen commit 4b7f27b38d994854af4ba2d11b8c49efe042f52e Author: haveric <breuerryan@gmail.com> Date: Sun Apr 24 17:42:44 2022 -0500 Fix encumbrance and comfort updating after tailoring and wielding worn items (#57077) * Fix encumbrance updating after tailoring * Check for discomfort when wielding from worn and destroying when repairing * astyle * Remove sight updates. Add more discomfort checks commit 1b7613f4fdde3fed55f3136b77951433a060ce4c Author: Faalagorn <faalagorn@gmail.com> Date: Mon Apr 25 00:34:10 2022 +0200 MP18 → MP 18, MP40 → MP 40 (#57112) * MP18 → MP 18, MP40 → MP 40 * R → r commit 4a9245fe6bca6032f915f925a2bf137d2920ebc0 Author: Dillon Matchett <dillon.matchett@gmail.com> Date: Sun Apr 24 19:33:16 2022 -0300 remove unused line (#57114) commit 2432b5c2706d052d95fe78c85aa8b55df5083c51 Author: andrei <68240139+andrei8l@users.noreply.github.com> Date: Mon Apr 25 01:32:47 2022 +0300 item: fix magazine_default for null ammo (#57115) commit 19a2a8df7dac2381fdd4bfc4da6c4900d9cd3455 Author: LyleSY <lyle.sollayates@Gmail.com> Date: Sun Apr 24 18:23:48 2022 -0400 [DinoMod] large boiled dino egg fixes (#57110) * big egg needs big pot * Create uncraft.json commit 01565ecdd75840c1f79461c15af567223887707a Author: Sathra225 <100510526+Sathra225@users.noreply.github.com> Date: Mon Apr 25 08:23:02 2022 +1000 [Innawoods] Fibrecloth (#57116) * Update tailoring.json * Add files via upload * Update tool_tailoring.json * Update other_materials.json commit 88c7807d87be76ab6dae06f791661f91e9b4dda4 Author: Fris0uman <sthapplz@gmail.com> Date: Sun Apr 24 22:53:46 2022 +0200 Update Ultica 2022-04-24 commit 47d1522346efe5751ddc2ab905e55baaea1f0b55 Author: Fris0uman <sthapplz@gmail.com> Date: Sun Apr 24 22:52:33 2022 +0200 Update Chibi Ultica 2022-04-24 commit 9ee703396ccff3dce43eec2b8ccb7d863035ef0f Author: Fris0uman <sthapplz@gmail.com> Date: Sun Apr 24 22:51:07 2022 +0200 Update MSX 2022-04-24 commit 301f29705235e4f42576b79def13179af80c43c0 Author: Fris0uman <sthapplz@gmail.com> Date: Sun Apr 24 22:50:07 2022 +0200 Update BrownLikeBears 2022-04-24 commit 52a88cb0f03fd99aeb3f12228535463aa1e8e4ad Author: Fris0uman <sthapplz@gmail.com> Date: Sun Apr 24 22:49:28 2022 +0200 Update Altica 2022-04-24 commit 55a402c72ebf4fdb3971abd74ff54d37a05f0bfe Author: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Date: Sun Apr 24 16:41:34 2022 -0400 Revert wall wiring change Co-authored-by: Fris0uman <41293484+Fris0uman@users.noreply.github.com> commit 30128aa2a3ccbec81bf6fe3688f01ffb3786810f Author: LaVeyanFiend <chimzor1@gmail.com> Date: Sun Apr 24 14:11:57 2022 -0400 Pliers/Multitool -> WRENCH 1 commit 2d997a10ec2a9bc2a6d6c0e4ba262bb9f80e37e1 Merge: d3b925e66a7 77235b67732 Author: LaVeyanFiend <chimzor1@gmail.com> Date: Sun Apr 24 14:14:52 2022 -0400 Merge remote-tracking branch 'origin/master' commit 77235b67732c05638887a1a5f023800957801f52 Author: Ava <47678781+Ilysen@users.noreply.github.com> Date: Sun Apr 24 12:37:01 2022 -0400 Fix an inaccuracy in NPCS.md regarding dialogue skill checks (#57118) commit 968108cb06cb85f5b9d790e27b3eee055304c440 Author: Dillon Matchett <dillon.matchett@gmail.com> Date: Sun Apr 24 11:59:36 2022 -0300 Warmth is now more granular on sub covered limbs (#57096) * warmth fixes * CLANNNNNG commit 30af53e09c26d543f7ce3a161bfe8aa4e8a8f7fb Author: Faalagorn <faalagorn@gmail.com> Date: Sun Apr 24 16:35:49 2022 +0200 Update options.cpp (#57113) commit fb703166d80a61c20590380330175d0a737139a8 Author: AtomicFox556 <98733651+AtomicFox556@users.noreply.github.com> Date: Sun Apr 24 17:33:45 2022 +0300 Add AR glasses (#56533) * Add AR glasses * Update tool_armor.json commit 5781898bdd7ebafb0b91aae52d4a3a2a12d22b3d Author: Sathra225 <100510526+Sathra225@users.noreply.github.com> Date: Mon Apr 25 00:32:28 2022 +1000 Clay ovens (#57066) * Update tool.json * Update dining_kitchen.json * Update furniture-fireplaces.json * Update construction_group.json * Update construction.json * Update tool.json Shouldn't get clay back. * Update tools.json * Update data/json/furniture_and_terrain/furniture-fireplaces.json Much nicer flow, thanks! Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> commit c62a89513317463c1e952d77e4467c77ad605479 Author: andrei <68240139+andrei8l@users.noreply.github.com> Date: Sun Apr 24 14:58:07 2022 +0300 item: unhardcode shoulder straps (#57108) commit d1c89ba9b713fd2ea9a3a949398d3fddc46b634d Author: Termineitor244 <termineitor244@hotmail.com> Date: Sun Apr 24 06:54:30 2022 -0500 Shuttlecock spawns (#57104) commit 0b45ac6530601a75a727ade7e9237c74ee1c3bb6 Author: LyleSY <lyle.sollayates@Gmail.com> Date: Sun Apr 24 02:03:01 2022 -0400 [DinoMod] DDoftD compatibility fix (#57091) commit df520cde34c43fa8bad59d61cdc2781d46398abc Author: Faalagorn <faalagorn@gmail.com> Date: Sun Apr 24 08:01:37 2022 +0200 elf-a → Elf-A (#57080) commit f4e99f5e74f8d2d0299dfd281087a2568dd2ab3f Author: AtomicFox556 <98733651+AtomicFox556@users.noreply.github.com> Date: Sun Apr 24 08:56:44 2022 +0300 Changes to foldable gear (#55902) * Changes to foldable gear * Update * Fix backwards migration * Update coats.json * Update bedding.json commit d56c8ad49a43d3f0994a5351a78d9ee56546a76e Author: Anton Burmistrov <Night_Pryanik@mail.ru> Date: Sun Apr 24 09:54:46 2022 +0400 Added external options to override status and fuel for spawned vehicles (#56956) * Added external options to override initial status and fuel for spawned vehicles * In No Hope mod all vehicles spawn in disabled state and without fuel * Double spaces. commit 0aa166720da3cbc660ca30205329cf18beed0ec4 Author: haveric <breuerryan@gmail.com> Date: Sun Apr 24 00:51:36 2022 -0500 Fix microlab toilet water generation and remove counters generating in walls (#57067) commit a864945e7f667d45867a1f1253f29a897bdef2bc Author: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Date: Sun Apr 24 01:50:36 2022 -0400 Swimming gloves soft (#57074) * Require prereq profs for speed knapping and adv. bandaging practice * Linty boi * Swimming gloves are soft * Revert "Merge branch 'ShowPrereqProfs'" This reverts commit d3b925e66a774c7675655ec304579145ad310bab. commit f479bd62e73f1294c43f8c528bcc8093e1715889 Author: Faalagorn <faalagorn@gmail.com> Date: Sun Apr 24 07:50:12 2022 +0200 Remove extra (#57087) commit 9844bc833e095a52846c9985dc9dba3a710a6d1a Author: Faalagorn <faalagorn@gmail.com> Date: Sun Apr 24 07:49:48 2022 +0200 Add missing comma (#57090) commit 9b9380812b76f9b984f3fcb57f3ea15410f5ab1f Author: Sathra225 <100510526+Sathra225@users.noreply.github.com> Date: Sun Apr 24 15:40:12 2022 +1000 [Innawoods] Baking and dummies (#57070) * Update recipe_food.json * Update recipe_others.json * Add files via upload commit 07dda6cb45a6588465ff494db83320c62793b159 Merge: cc329ef6e9c d30e1f5b814 Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Sun Apr 24 00:25:30 2022 -0500 Merge pull request #57093 from bombasticSlacks/rigies More Rigid Fixes commit cc329ef6e9c0245722a9a069dfb7feae5d51c14d Author: Anton Burmistrov <Night_Pryanik@mail.ru> Date: Sun Apr 24 08:58:34 2022 +0400 Try to break free before jumping over the ledge or climbing/crawling down (#57073) commit 526b9d35eb9c1a065a080c3375a2f9a702f456d5 Author: Aronai Sieyes <arokha@arokha.com> Date: Sun Apr 24 00:04:54 2022 -0400 Add hunger/thirst crafting distractions (#55913) * Add hunger/thirst crafting distractions * Update src/player_activity.cpp Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru> * Update src/player_activity.cpp Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru> * Update src/player_activity.cpp Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru> * Update src/player_activity.cpp * Update src/player_activity.cpp Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru> Co-authored-by: David Seguin <davidseguin@live.ca> commit eb7a26bb8d58581afb1ca223d477cfc42020fea1 Author: Dillon Matchett <dillon.matchett@gmail.com> Date: Sun Apr 24 01:01:49 2022 -0300 Very Robust Consolidate Body Parts Function (#56520) * UI fixes * remove extra space * fixes for clang * first kick * More Robust Limb Consolidate * clang appeasement * broken still but progress * Just needs cleanup and organization * cleaned up UI a bit * clang fixes * time to check the tests online * more clang cleanup * more clang cleanup * this change too * more test fixes * comment unused function inputs * test should all work now commit 8947c007b30086871f0773360e248ac73b7a482a Author: David Seguin <davidseguin@live.ca> Date: Sat Apr 23 23:37:22 2022 -0400 Make the mutagen addiction focus check less strict (#57053) commit 7e2f77a530519cdae102c24c81d11900dae9ee26 Author: David Seguin <davidseguin@live.ca> Date: Sat Apr 23 23:36:09 2022 -0400 Prevent item insert crash (#56863) * Item insert: don't consider nested pocket that already contains item * Item insert: unit test commit 45671a0d2f310f915dc3590dce6ea0e0e6101f67 Author: casswedson <58050969+casswedson@users.noreply.github.com> Date: Sat Apr 23 21:00:16 2022 -0500 Revert "Create proper rope uncraft recipes (#57068)" (#57095) This reverts commit e23603687ff12ec0830d2354e9dd1e957c0db331. commit d30e1f5b814c976dd457ba2ca35198c4a583f98d Author: bombasticSlacks <dillon.matchett@gmail.com> Date: Sat Apr 23 21:47:21 2022 -0300 Rigid additions commit ed649e06fc5425c60b4ffe46ce2f297626a1575c Author: Eric <52087122+Ramza13@users.noreply.github.com> Date: Sat Apr 23 20:14:23 2022 -0400 Allow true or false effects of talk effects (#56932) * Not fully json convert * second * fix * Updates * Update effect_on_condition.json * Update npctalk.cpp * Update doc/NPCs.md Co-authored-by: haveric <breuerryan@gmail.com> * Update doc/NPCs.md Co-authored-by: haveric <breuerryan@gmail.com> * Update doc/NPCs.md Co-authored-by: haveric <breuerryan@gmail.com> * Update doc/NPCs.md Co-authored-by: haveric <breuerryan@gmail.com> * Update doc/NPCs.md Co-authored-by: haveric <breuerryan@gmail.com> * Update doc/NPCs.md Co-authored-by: haveric <breuerryan@gmail.com> * Update doc/NPCs.md Co-authored-by: haveric <breuerryan@gmail.com> * Update effect_on_condition.json Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Co-authored-by: haveric <breuerryan@gmail.com> commit c7ebb4a692ee3da7a03bd51147bf4d8aaf8ef180 Author: casswedson <58050969+casswedson@users.noreply.github.com> Date: Sat Apr 23 19:06:05 2022 -0500 extend list of allowed users; featuring Termineitor244 Faalagorn Ilysen Aerin-of-the-Toast anoobindisguise PatrikLundell TheShadowFerret I didn't add Jan-Blasiak cuz they didn't show up when I tried to reference their username NOTE squash this commit commit a1be28bf8bbdfa45a61293dc9388e7d3d9bbe0f7 Author: andrei <68240139+andrei8l@users.noreply.github.com> Date: Sun Apr 24 01:57:40 2022 +0300 item: don't use ret_val for pocket accessors (#57056) commit 097be44ca6396773ffd157a822f849d51f2f985e Author: Faalagorn <faalagorn@gmail.com> Date: Sat Apr 23 23:52:37 2022 +0200 MP18 → MP 18 (#57043) commit c9f87344fddf2c7752c4daf71ff04222e71c69f0 Author: Faalagorn <faalagorn@gmail.com> Date: Sat Apr 23 23:52:05 2022 +0200 Update CRT_Bladework.json (#57038) commit a230c352a99170b7aa9143d8f494bd1bf7fec8b0 Author: Faalagorn <faalagorn@gmail.com> Date: Sat Apr 23 23:51:50 2022 +0200 Fungal-raptor → fungal raptor (#57032) commit 9cf28a8aae4106c679b708eb4ffab9e9e5a2c9ca Author: OmniscientQ <the.omniscient.q@gmail.com> Date: Sat Apr 23 15:25:15 2022 -0600 Makes Chlormorph an explicit upgrade over Roots/Rooter (#55399) * Chloromorph is now an explicit upgrade to Roots * Parentheses are hard... Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> commit 1bcf4bdb23dc165de415c00596e8d282edb3eed2 Author: mqrause <38702195+mqrause@users.noreply.github.com> Date: Sat Apr 23 23:15:50 2022 +0200 add ACT_FORAGE to deserializer map (#57020) Co-authored-by: mqrause <martin@qrause.de> commit ed29d539be0dada823068092271d03af322966d1 Author: Termineitor244 <termineitor244@hotmail.com> Date: Sat Apr 23 16:14:59 2022 -0500 conductive aluminum bat (#57079) commit 0c58b2a302f11375c79b5f640f3de1d95fc1f998 Author: jetomit <timotej.lazar@araneo.si> Date: Sat Apr 23 21:05:56 2022 +0000 Allow storing a smartphone in a case when flashlight/music is on (#56442) commit ec173c34a3b323f2511a39f825af763edde00b5f Author: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Sat Apr 23 13:53:35 2022 -0700 Dark Days of the Dead: Headshots, deadly bites, and a cleanup of out-of-setting stuff. (#56964) * Create zombie_heads.json * Weakpoints to ensure zombies can only get hurt by headshots * Update modinfo.json * deadly bites * Update modinfo.json * Update effect.json * fine tune some weakpoint settings * lint * hitting the zombie's chest can stagger it too, particularly in melee * block portal storms and limit scenarios * playtest fixes * Adjustments from play testing Went back to zombies being vulnerable but tough, with headshots the *main* way to kill them. * adjust what is considered a classic zombie * allow bleed_rate updates * Update weakpoints.json * Update weakpoints.json * Update weakpoints.json * mangled legs back in * lint * Coup de grace attacks on downed zombies * Update weakpoints.json Reduce the 'gaps in armour' thing and make arm and leg hits less harmful to the zombie except the status effect part. * Update weakpoints.json You can stagger and down a zombie without doing any damage * Update effect.json * fix messages not applying * forgot a tag commit 533d07afc43211193f9829d226364d3cce17c20a Author: haveric <breuerryan@gmail.com> Date: Sat Apr 23 14:16:19 2022 -0500 Fix hide site creation and make error message clearer (#57063) commit e23603687ff12ec0830d2354e9dd1e957c0db331 Author: mx-moonling <102900534+mx-moonling@users.noreply.github.com> Date: Sat Apr 23 20:55:14 2022 +0200 Create proper rope uncraft recipes (#57068) * creates proper rope uncraft recipes * linting * linting (better) * linting (best) probably copy and pasted the linted text wrong. not sure what's happening commit 40b02601f24b7e2fd84e595e0df8e49c8ae8598f Author: Termineitor244 <termineitor244@hotmail.com> Date: Sat Apr 23 13:18:17 2022 -0500 Wrist fixes (#57057) commit 9e8762693d04a943a9d2934c1d701e777a77316f Merge: 4f506d1fecd e85067bfb33 Author: David Seguin <davidseguin@live.ca> Date: Sat Apr 23 14:17:17 2022 -0400 Merge pull request #57034 from Termineitor244/Tamable-Wildlife New mod: Tamable Wildlife commit d3b925e66a774c7675655ec304579145ad310bab Merge: f37635a525f cc8edcf132c Author: LaVeyanFiend <chimzor1@gmail.com> Date: Sat Apr 23 11:53:18 2022 -0400 Merge branch 'ShowPrereqProfs' commit 4f506d1fecd8bb4fdacb89e1872e0a7176ad1d75 Author: Ava <47678781+Ilysen@users.noreply.github.com> Date: Sat Apr 23 11:25:26 2022 -0400 Smartphone cases can hold active smartphones (#57019) commit 65656f51652ffdf92179442225cd21c609fa135e Author: Davi-DeGanne <davi.deganne@gmail.com> Date: Sat Apr 23 09:24:54 2022 -0600 Audit spawns of tire-changing equipment in vehicles (#57017) * Tweak map extra mx_mayhem, scenario "tire change" - Dead guy was now smart enough to remember his scissor jack - The car will no longer spawn with an extra jack, tire, or tire iron * Adjust ratios in spare tire kits According to results from survey: - 35 had at least one - 26 had a tire (~74%) - 32 had a jack (~92%) - 31 had a lug wrench (~88%) - Didn't ask about deflated tires, so that ratio was left as-is, but adjusted so that ~74% of kits include an inflated tire (74%/95% = ~78%) * Audit spawning of spare tires and associated tools - Split tires and tire-changing gear from away from `car_kit`. - Lowered spawn chances of car_kit by 1/3 so other items' spawn rates are unchanged. - Gave new `spare_tire_kit` to vehicles it made sense with; for a lot of these, that also meant deleting existing in-line spawns of tires and jacks (but not tire irons). Overall, though, all three items will be vastly more common. - I decided on the following modifiers (additive) to determine the spawn chance of `spare_tire_kit`: - Baseline 40% - Hybrid vehicle: -15% - Electric vehicle: -30% - SUV: +40% - Pickup/van/bus/RV: +60% - Sports vehicle: -30% - Part of organizational fleet: Never - Budget vehicle: Never - Police cruisers: Always - Exceptions: - 4x4 has 100% chance, but gets a modified spawn group with no tire. - Survivor vehicles always spawn with tools, but sometimes no tire. - Hatchbacks should have 40% but don't have a cargo space big enough for a tire, so the spare tire and jack were removed entirely. * Change tire_iron to lug_wrench Co-authored-by: David DeGanne <david.deganne@legrand.us> commit b6f0180bdd3c79ec696c4b2ac368a9481aee8957 Author: Faalagorn <faalagorn@gmail.com> Date: Sat Apr 23 17:20:42 2022 +0200 Fix Sten Mk II plural (#57031) commit 2db3c8d50e7f02f08ab89cc020b0d3f2ce3bb578 Author: Faalagorn <faalagorn@gmail.com> Date: Sat Apr 23 17:20:06 2022 +0200 Add missing dot (#57040) commit 8b6b0374b362eeb066355263249d48af4c7b3832 Author: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat Apr 23 10:19:48 2022 -0500 A couple more labels (#57036) * Update labeler.yml * Update labeler.yml * Apply suggestions from code review Co-authored-by: casswedson <58050969+casswedson@users.noreply.github.com> Co-authored-by: casswedson <58050969+casswedson@users.noreply.github.com> commit 54468a4c57e11279d708e05cf92b9d4cf9502de1 Author: Faalagorn <faalagorn@gmail.com> Date: Sat Apr 23 17:19:15 2022 +0200 pokemon → Pokémon (#57039) commit 431c8c3a51816598ff98ecbc967b1beb7c6280cb Author: Faalagorn <faalagorn@gmail.com> Date: Sat Apr 23 17:18:59 2022 +0200 marloss → Marloss (#57042) commit 122079390c47e71bbd5dd6e43e4f2fa13bb6695f Author: klorpa <30924131+klorpa@users.noreply.github.com> Date: Sat Apr 23 10:18:43 2022 -0500 Small Text Fixes and Additions (#57048) * MaterialTags * MaterialUpdate * UseActions * Arrays * UseActions * AmmoTypes * AmmoFixes * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * Apply suggestions from code review * TalkTags * UpdatedText * MoreTalkTags * Update talk_tags.json * Update talk_tags.json * Update talk_tags_chat.json * Add Birds * Adjusting Weights * Volume Adjusting * Robins and Sparrows * ColorFix * BracketFix * FreqFixes * Aging Adjusts * EggWeights * VolumeFix * RevertMagpies * Bullfrogs * Suggestions * Update data/json/items/comestibles/egg.json Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com> * Update data/json/monsters/reptile_amphibian.json Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com> * Fixes * Update doc/POSTAPOC_PRICE_GUIDE.md * Update data/json/snippets/newspapers.json * my avacados! * Typos * TypoFixes Co-authored-by: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com> Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com> Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com> Co-authored-by: Kevin Granade <kevin.granade@gmail.com> commit 859d22a55453074ed8290bf5b42556ab88fe84bc Author: Anton Burmistrov <Night_Pryanik@mail.ru> Date: Sat Apr 23 19:16:02 2022 +0400 Removed changes which borked lab generation (#57051) commit 59836c4c5a99f759ad1baf47dde1f8af259a548d Author: ZombieZilla <48612811+ZombieZilla@users.noreply.github.com> Date: Sun Apr 24 00:52:43 2022 +1000 Autoclave Appliance (#57007) * Add autoclave appliance * Remove old autoclave item code * rip more autoclave item code * Update data/json/items/appliances.json Co-authored-by: Fris0uman <41293484+Fris0uman@users.noreply.github.com> * apply suggestion Co-authored-by: Fris0uman <41293484+Fris0uman@users.noreply.github.com> commit 86e004586d8b1cc50c32753ac01158a41c44567d Author: Inglonias <2125926+Inglonias@users.noreply.github.com> Date: Sat Apr 23 10:50:28 2022 -0400 Added a new evac shelter basement for shelter_1 (#57026) * Added a new evac shelter basement for shelter_1 * fix json error * Fixed more json * Added the missing overmap. * Adjusted new basement to match aboveground walls * I was off by one * Moved the trash cans an inch to the left * Hokey * Pokey * turn * around commit 1f3e2ac17b04dd42efac8867602349b5b6b7384f Author: ZombieZilla <48612811+ZombieZilla@users.noreply.github.com> Date: Sun Apr 24 00:49:39 2022 +1000 fix aleesha dialogue (#57065) commit dd9f086ad0b19c38fa9823a6069bec463f85c54c Author: Dillon Matchett <dillon.matchett@gmail.com> Date: Sat Apr 23 11:48:55 2022 -0300 update the silencer (#57045) commit e85067bfb33dff736790beb859d72759512ba70d Author: Termineitor244 <termineitor244@hotmail.com> Date: Sat Apr 23 07:16:32 2022 -0500 Tamable Wildlife label commit d546a904b32450d02573a37db1775e3a11831b3e Merge: 40392e513ed a17984b437e Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Sat Apr 23 00:22:49 2022 -0500 Merge pull request #57049 from CleverRaven/i18n Routine i18n updates on 23 April 2022 commit a17984b437edbfeabf82468150f7e12de5c2e90e Author: Brett Dong (BOT) <brett.browning.dong@gmail.com> Date: Sat Apr 23 02:25:27 2022 +0000 Routine i18n updates on 23 April 2022 commit 822fb35190e2925e1573ffed063deaa9b85f8c9d Author: casswedson <58050969+casswedson@users.noreply.github.com> Date: Fri Apr 22 20:48:23 2022 -0500 feat: label issues by template+confirm bug command commit 40392e513edeb57240515776471b28b43023207b Merge: 9c7e14e07f2 4b6dee443e8 Author: John Candlebury <johncandlebury@gmail.com> Date: Fri Apr 22 18:54:48 2022 -0600 Merge pull request #57018 from Ilysen/the-splittening Modestly granularize NPC_ROBOFAC_INTERCOM.json in prep for future changes commit 9c7e14e07f2167e06c9cfce7c9c3101852a34fbe Author: RandDenner <73523034+RandDenner@users.noreply.github.com> Date: Fri Apr 22 20:06:03 2022 -0400 Update entry_tools.json to-hit values to use the new categorized system (#56973) * Update entry_tools.json * Update entry_tools.json Attempting to get crowbar DPS back into test acceptable range * Update effective_dps_test.cpp Adjusting damage check value for crowbar up by half a point so the test can pass with game calculated stats as-is. Crowbar original check for DPS of 15.0 Test is resulting approximately DPS of 15.75 Adjusting check value to 15.5 allows values from 16 to 16 As per previous dev discussions, especially with esotericist * Update entry_tools.json Updating lengths, weights, and volumes from real world checks * Update entry_tools.json slight update * Update entry_tools.json crowbar 200ml back to 170ml * Update effective_dps_test.cpp * Update entry_tools.json adjust crowbar and ice axe damage to meet DPS targets * Update entry_tools.json * Update entry_tools.json * Update entry_tools.json Noticed logic errors in volume math, so I fixed them and updated the stats * Add files via upload * Delete entry_tools.json * Delete metalworking.json * Delete belts.json * Delete workshop.json * Update items.json * Update item_contents_test.cpp Using test items instead of in-game data * Update item_contents_test.cpp * Update items.json double spacing between periods in description commit 83611519ff7a03b9fb688cb929de0f52a01b8885 Author: Sathra225 <100510526+Sathra225@users.noreply.github.com> Date: Sat Apr 23 10:03:50 2022 +1000 Update scenario_whitelist.json (#57035) commit adf76a2b94b9a21620ce7adf405d8179960df5bf Merge: 091e66290eb e233697911e Author: David Seguin <davidseguin@live.ca> Date: Fri Apr 22 19:59:53 2022 -0400 Merge pull request #57008 from Termineitor244/Weapon-Categories-Final Weapon categories: Aikido, Judo, Bōjutsu and weapon category specific techniques commit 091e66290eb1626db5af190d8e2d950c6bde538f Author: Termineitor244 <termineitor244@hotmail.com> Date: Fri Apr 22 18:59:18 2022 -0500 Updated baseball bats with better techs and flags (#56995) commit a0be469acf953a642ec69d4214a163024ea6e4a4 Author: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Fri Apr 22 16:57:49 2022 -0700 Exosuit Updates (#56974) * Steel to qt_steel * Reduce Steel Thickness * Update modular_exoskeleton_plating.json commit db27ed6e716cf1437f31910083a9d324108d1b15 Author: Raphael Bosshard <raphael.bosshard@gmail.com> Date: Sat Apr 23 01:53:55 2022 +0200 add item and recipe to craft yogurt (#55595) * add item and recipe to craft yogurt * Update data/json/recipes/food/brewing.json * Update data/json/items/comestibles/brewing.json * Update dictionary.txt Co-authored-by: David Seguin <davidseguin@live.ca> commit a944c6e5bd74a07521699879751605d1c65f420e Author: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Sat Apr 23 01:52:20 2022 +0200 More 5.7mm guns (#56846) * Adds the Kel-Tec P50 pistol. * Adds a few more 5.7x28mm guns, the FN PS90, Ruger-57, and Kel-Tec P50. Adds their magazines and spawn locations. Adds non branded variants to the FN P90, it’s magazine, Kel-Tec P50, and FN PS90. * Update data/json/items/gun/57.json Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com> * Update data/json/items/gun/57.json Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com> * Update data/json/items/gun/57.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Update data/json/items/gun/57.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Update data/json/items/gun/57.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Update data/json/items/gun/57.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * passes the files through the lint tool. * does some strategic fixing of errors which came up thanks to me not quite knowing how to use github. * Fixes a possible syntax error. * Thanks to my attention being drawn to this fact by a very helpful comment, adds the gun and magazine ids to the migrations files in generic guns. Hopefully this solves the last few checks. * Update gg_firearms_migration.json Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com> Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Co-authored-by: David Seguin <davidseguin@live.ca> commit 1d7f4e7e96458301122842f6196ad8d8fd386c4e Author: Termineitor244 <termineitor244@hotmail.com> Date: Fri Apr 22 16:46:39 2022 -0500 underscore commit 31877102826f8abf3d6fdc35220411b6a3a41043 Author: Termineitor244 <termineitor244@hotmail.com> Date: Fri Apr 22 16:28:34 2022 -0500 Tamable birds commit ced65045e2e6ad4fc186b44dd29fdfd57f517a89 Author: Termineitor244 <termineitor244@hotmail.com> Date: Fri Apr 22 15:15:57 2022 -0500 Tamable Mammals commit f5baa670d9c3cab8637a9d3a09e337f55366b94e Author: andrei <a12l+git@runbox.com> Date: Tue Apr 12 21:06:27 2022 +0300 json/randenc: add vehicle loot zones to caravaner truck commit 2f02bb0427afd2756c58ade0d1b88b106d850f1d Author: andrei <a12l+git@runbox.com> Date: Fri Apr 22 16:23:44 2022 +0300 zones: rotate vehicle zones too commit 9b7ac55be43d9b0c729c6d28eefd3b8388641325 Author: andrei <a12l+git@runbox.com> Date: Tue Apr 12 20:29:42 2022 +0300 mapgen/zones: allow placing vehicle zones commit 4b6dee443e83356b8ef7ec53520553d68afee20c Author: Ilysen <ashe.f.higgs@gmail.com> Date: Fri Apr 22 06:26:05 2022 -0400 3. Granularize missions etc. into their own files commit d0be5a50e67e47871ead2b7c5386cfc8ce67608a Author: Ilysen <ashe.f.higgs@gmail.com> Date: Fri Apr 22 06:23:46 2022 -0400 2. Rename the files separately to keep authorship history commit 8d4420f4671232cb019a9b457e471897117c4204 Author: Ilysen <ashe.f.higgs@gmail.com> Date: Fri Apr 22 06:23:03 2022 -0400 1. Move intercom files into a new folder commit e233697911e7fc7266d56d38c3aa2312699d3b7a Author: Termineitor244 <termineitor244@hotmail.com> Date: Thu Apr 21 21:07:07 2022 -0500 Adds some weapon_categories_allowed commit badc7c5b32784905d0d2c1bcbdabe7589a81224a Author: Termineitor244 <termineitor244@hotmail.com> Date: Thu Apr 21 19:39:56 2022 -0500 Aikido, Judo and Bojutsu weapon categories commit bbf2868d5ef3359c06881ec3a86604bda07b4959 Author: AsterAdelfa <44351888+AsterAdelfa@users.noreply.github.com> Date: Thu Apr 21 10:28:08 2022 -0800 adding furriery proficiency #56960 adding furriery proficiency to wsurvivor hood as it uses fur in its recipe. commit 24273a06db859df5482e33e2a7ba6784c7fcdd50 Merge: 8abcb3f8971 a52173d7269 Author: AsterAdelfa <44351888+AsterAdelfa@users.noreply.github.com> Date: Thu Apr 21 10:20:17 2022 -0800 Merge pull request #1 from AsterAdelfa/adding-proficiency-fix-for-#56960 #56960 adding a furrier proficiency to wsurvivor commit a52173d7269080b6061eae3341a289f1b597054a Author: AsterAdelfa <44351888+AsterAdelfa@users.noreply.github.com> Date: Thu Apr 21 10:12:25 2022 -0800 #56960 adding a furrier proficiency to wsurvivor Fixing issue from #56960 to add a proficiency (furrier) to something that uses fur in order to craft. commit cc8edcf132c8ede6f7f2543a9ea1e78bb938ffb1 Author: LaVeyanFiend <chimzor1@gmail.com> Date: Wed Apr 20 16:58:19 2022 -0400 Linty boi commit dc014d125ed26cfdc3f7ab0f5eab12694f316e58 Author: LaVeyanFiend <chimzor1@gmail.com> Date: Sat Apr 16 23:33:53 2022 -0400 Require prereq profs for speed knapping and adv. bandaging practice