Skip to content

Commit

Permalink
Updated to master via squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 5672ce2534e424b7ff19b84b9c0729d0029cf121
Author: misora31 <[email protected]>
Date:   Wed May 3 11:28:49 2023 -0600

    Adding the Crustacean Mutation Tree to the game, also adds a mutation from that branch to the Insect and Spider pool. (#65310)

    * Add the necessary items, recipes, and mutations to add the crustacean mutation line.

    Co-authored-by: Maleclypse <[email protected]>

commit 15703184b51631073a3fb5706eedc957fbdc5169
Author: RenechCDDA <[email protected]>
Date:   Wed May 3 13:24:03 2023 -0400

    Display why vehicle parts cannot be installed (#65341)

    Co-authored-by: [email protected]

commit 39e7de041eaa066b6f989d5c0ae1de9bd3a2c58f
Author: Andrey Andreyevich Bienkowski <[email protected]>
Date:   Wed May 3 18:31:56 2023 +0300

    Fix crash: dangling pointer to faction (#65442)

    https://github.com/CleverRaven/Cataclysm-DDA/issues/65440

commit d71b577f6f1dc6783d62433106ddf2a41a79d02a
Author: Maleclypse <[email protected]>
Date:   Wed May 3 05:07:33 2023 -0500

    Fix the transforming mutation eocs in Xedra Evolved (#65396)

    * Update mutation_eocs.json

    * lint

    * Perfection

commit d53bbbeae0455f9de1a871c5a47e0503047caa41
Merge: 08d5b10ea8 d31ce1d522
Author: Angela Graves <[email protected]>
Date:   Wed May 3 00:11:44 2023 -0500

    Merge pull request #65439 from RenechCDDA/calories_again

    Fix calories for raw-->cooked foods

commit 08d5b10ea8bb73fce74ae3cd399fef199b47636f
Author: Nebnis <[email protected]>
Date:   Wed May 3 00:23:00 2023 -0300

    New item: large shelter kit and the recipes for it. (#65415)

    * https://github.com/Nebnis/Cataclysm-DDA

    * a

    * a

    * shelter_kit

    * Update src/mapdata.h

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Update data/json/furniture_and_terrain/furniture-terrains.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Update data/json/furniture_and_terrain/furniture-terrains.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Update data/json/furniture_and_terrain/furniture-terrains.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Update mapdata.cpp

    * Update shelters.json

    * Update shelters.json

    * Update mapdata.cpp

    * Update mapdata.h

    * large_damaged

    * Update data/json/recipes/recipe_others.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Update shelters.json

    * Update shelters.json

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit f6247133d22b003eecf58b7d6036e4266ed6a2f0
Author: Bence <[email protected]>
Date:   Wed May 3 05:20:10 2023 +0200

    Resurrecting the nether monster corpse (#65421)

    * the revive

    * organize overmap tiles, fix eoc

    * mapgen

    * mutable

    * lint

    * co-author

    Co-authored-by: gkarfakis19 <[email protected]>
    Co-authored-by: MNG-cataclysm <[email protected]>

    * simplify

    ---------

    Co-authored-by: gkarfakis19 <[email protected]>
    Co-authored-by: MNG-cataclysm <[email protected]>

commit c5464ce2cfe454f19dad12fc6858d1b9afbf6b78
Author: Jianxiang Wang (王健翔) <[email protected]>
Date:   Wed May 3 11:16:07 2023 +0800

    Show NPC location when selecting NPC to chat with, guard, or follow (#65432)

    * Show NPC location when selecting NPC to chat with

    * Update cursor location when selecting uilist entry with mouse

    * Show NPC location when selecting NPC to guard or follow

commit ad27fe8663796249569b01e639957667278c9f49
Author: Mateusz Marszałek <[email protected]>
Date:   Wed May 3 05:15:05 2023 +0200

    Fix issues with house_38 (#65435)

    There are currently few issues with house_38, like not being able
    to drag furnitures through screen doors

    fixes #64185

    modified house38.json and terrain-fences-gates.json

commit 9f7c25d97335bc2991e8c5a135bc645052bd66a0
Author: Alexey <[email protected]>
Date:   Wed May 3 01:58:08 2023 +0300

    Obsolete NO_QUICKDRAW flag (#65423)

commit 058d7a2d6fc14ecd48d17dc7e23c0fbe79a923d6
Author: Karol1223 <[email protected]>
Date:   Tue May 2 21:47:20 2023 +0200

    More misc item fixes & AID obsoletion (#64905)

    * first wave

    * the wrenchening

    * second wrenchening

    * wave 2

    * silly syntax

    * wave 3

    * wave 3.5

    * wave 4

    * the evil test

    * wave 5

    * wicked syntax

    * wave bonus: fuck the bionics

    * stop

    * no mapgen!!!

    * it can't be easy

    * the mods are evil

    * I am stupid

    * when the soap isn't working

    * Update containers.json

    * Update fake.json

    * Update swords_and_blades.json

    * Update cooking.json

    * Update landscaping.json

    * Update metalworking.json

    * Update misc.json

    * Update woodworking.json

    * Update workshop.json

    * Update misc.json

    * Update workshop.json

    * Update workshop.json

    * Update mechanics.json

    * Update swords_and_blades.json

    * Update bionics_mainline_override.json

    * Update bionics_mainline_override.json

commit d31ce1d52203824d5efc15f304415760dc612495
Author: RenechCDDA <[email protected]>
Date:   Tue May 2 14:24:02 2023 -0400

    set cooked flag for components for correct calorie amounts

commit ffc75ab9b5fe379330e60bd80fb51a7cdc0d782d
Merge: 0d71f5407a 6ea266794a
Author: Angela Graves <[email protected]>
Date:   Tue May 2 00:23:44 2023 -0500

    Merge pull request #65425 from CleverRaven/update-toc

    Update the table of contents in doc/JSON_INFO.md

commit 0d71f5407a38ea6f9728ac3004ffe402124936b1
Merge: 85cc8ac818 edeb2d06c0
Author: Angela Graves <[email protected]>
Date:   Mon May 1 20:58:50 2023 -0500

    Merge pull request #65399 from CleverRaven/tileset-updates

    Routine tileset updates on 30 April 2023

commit 85cc8ac81853ea90ecbee5c0693dbb7339c980de
Merge: 1ff8037f42 d6865f8930
Author: David Seguin <[email protected]>
Date:   Mon May 1 21:42:58 2023 -0400

    Merge pull request #65367 from irwiss/veh-protos-factory

    Make vehicle prototypes use generic_factory

commit 6ea266794a485216b7925fa583e03fba22d1df98
Author: dseguin <[email protected]>
Date:   Tue May 2 01:40:40 2023 +0000

    Update the table of contents

commit 1ff8037f42e75de5b0dfec1654c95e200cea8995
Author: casswedson <[email protected]>
Date:   Mon May 1 20:36:20 2023 -0500

    fix: tundra mage enchantment typo (#65405)

    grep for tundra_mage_aoe and notice the bad bad use all lowercase for an
    id and all uppercase for another, prone to mixing them up

    one of the tundra mage's mutations calls a spell id in its enchantment
    array, fix that; replace it with the id that's an enchantment

    `vi"~`

    Co-authored-by: casswedson <[email protected]>

commit 92e28b581fbef87a18e650e43207f0876531dbb2
Author: RenechCDDA <[email protected]>
Date:   Mon May 1 21:35:03 2023 -0400

    document burn_data for materials (#65409)

commit 775f16e9412ba004433caffbd2d1d15f8eb71224
Merge: c9db418910 959332a865
Author: David Seguin <[email protected]>
Date:   Mon May 1 21:32:19 2023 -0400

    Merge pull request #65414 from irwiss/tidy-vehicle-funcs

    Refactor index_of_part, tidy vehicle functions

commit c9db418910d4120117052f6bcbc300cfbb1a1669
Author: Alexey <[email protected]>
Date:   Tue May 2 04:24:41 2023 +0300

    Fix recipe lang parser expecting result field (#65420)

commit 066d74ad289b483468e1825fd93c3d6ad33e4b0f
Author: ZigVert <[email protected]>
Date:   Mon May 1 21:23:43 2023 -0400

    added proficiencies (#65422)

commit a19fe3d8821643a11d718c1ac61954559207b3c5
Author: alef <[email protected]>
Date:   Tue May 2 03:14:51 2023 +0200

    Downgrade cmake files to v3.20 (#65376)

    * Use CMake version 3.20 and presets version 2

    * Flatten presets into one

    * Use presetName for the include file

    * Start using multi-config generators

    * Add a Linux release configuration and build preset

    * Display PROJECT_NAME during configuration

    * Fix all SDL2 related target names

commit c8c38c1f19a3d252ededc25fd551113599c4e72a
Author: Dillon Matchett <[email protected]>
Date:   Mon May 1 22:11:43 2023 -0300

    [Bombastic Perks] Recycler (#65397)

    * recycler perk works

    * Update data/mods/BombasticPerks/perkmenu.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit c27bbe964ea97724d4becfefcab5adfbaf2b4a9a
Author: Miner239 <[email protected]>
Date:   Tue May 2 08:10:48 2023 +0700

    Change anvil volume from 4L to 24L (#65416)

    * Change anvil volume from 4L to 24L

    * Remove anvil from known_bad_density.json

commit 2c393f6d88f95aa36b97fe29211d76b35f06c51d
Author: Dillon Matchett <[email protected]>
Date:   Mon May 1 22:09:21 2023 -0300

    Context Vars (#65307)

    * Documentation

    Update NPCs.md

    Update EFFECT_ON_CONDITION.md

    Event Docs

    * Code

    Clang fix

    progress

    compiles

    start of tests

    cleanup the rebase

    Apply suggestions from code review

    Remove copy_dialogue

    fixes for constructors

    fixes

    Update src/math_parser.cpp

    Co-Authored-By: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-Authored-By: andrei <[email protected]>

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: andrei <[email protected]>

commit 2bd8d91274d883aa5ec73ebd4589d85421abb2e5
Author: John Candlebury <[email protected]>
Date:   Mon May 1 18:57:16 2023 -0600

    Aftershock: Elemental bionic weapons. (#65391)

    * Elemental bionic weapons.

    * Fix plural forms

    * Apply suggestions from code review

    Co-authored-by: Maleclypse <[email protected]>

    ---------

    Co-authored-by: Maleclypse <[email protected]>

commit 959332a86574bf09006d4ddebbd35e8a4852dae0
Author: Alexey <[email protected]>
Date:   Mon Apr 10 19:28:48 2023 +0300

    Vehicle steering / part_vpower_w cleanups

commit 211c40338dc1be410d8d60879fd98defeb1566cd
Author: Alexey <[email protected]>
Date:   Mon Apr 10 18:04:41 2023 +0300

    Refactor vehicle::index_of_part to search by address

commit 4195db11de2669f8b76fb73614092f17cf0536e9
Author: Alexey <[email protected]>
Date:   Mon May 1 00:31:07 2023 +0300

    Constify get_non_fake_part, minor cleanups

commit bbfa357890ee6dc63f1eabda4ecb5160359bcdb8
Author: Brambor <[email protected]>
Date:   Mon May 1 16:08:41 2023 +0200

    fixing grammar in comments - mostly it's -> its (#65388)

commit d6865f89307269d1c763640ebde64bfaee860629
Author: Alexey <[email protected]>
Date:   Sat Apr 29 10:44:34 2023 +0300

    Break the law, remove a vehicle definition

commit 031720272f4a1c89d0bb07d8e33e55a2f85dde7e
Author: Alexey <[email protected]>
Date:   Sat Apr 29 10:44:25 2023 +0300

    Move vehicle_prototype to generic_factory

commit edeb2d06c0715d85af34904a028fad747bcc59c8
Author: casswedson <[email protected]>
Date:   Sun Apr 30 23:41:31 2023 +0000

    Routine tileset updates on 30 April 2023

commit 3010c6251a9313c6f8173f36cf45d76a04882788
Author: SurFlurer <[email protected]>
Date:   Sun Apr 30 23:20:22 2023 +0000

    [CR] NPC spawn with reasonable stored_kcal (#64718)

    * NPC spawn with healthy stored_kcal

    * Set stored kcal before mutate

    * Use a chi_squared distribution

    * Cleanup

commit 80684259bdb5ecefc2c46450b5bbebc4c60b3bf0
Author: Alexey <[email protected]>
Date:   Mon May 1 02:12:35 2023 +0300

    Make `f`iring action UX more pleasant (#65382)

    * Let fire_turret_manual return success

    * Make avatar handle relax_gas

    * Reorder 'f'ire avatar action priority

commit e5ffceec4e1f07eeacd1e22fbeb0e49516af74f6
Author: Bence <[email protected]>
Date:   Mon May 1 00:02:27 2023 +0200

    Cleanup: regional airport (#65386)

    * airport update

    * no hope fix

    * remove unused stuff

commit e60b308bbbb697281cf05d8ce0a614212dd17f88
Author: anoobindisguise <[email protected]>
Date:   Sun Apr 30 14:22:54 2023 -0700

    obsolete the power armor bionics (#65077)

    * add power armor bionics to obsoletion

    * obsoletion

    * obsolete

    * obsolete

    * obsolete

    * obsolete power armor bionic spawns

    * fix mistakes

    * fix mistakes

    * migrations

    * migrations

    * comma

    * address removed powerarmor bionics

commit ef311b32294b022dd3ec9bcd8454fd600ea73a57
Author: Rewryte <[email protected]>
Date:   Mon May 1 05:20:51 2023 +0800

    Confirmation before attacking neutral mobs (#65204)

    * add confirmation

    * astyle

    * fix attack hostile

    * comment and astyle

    * safemode as toggle

    Co-Authored-By: Alexey <[email protected]>

    ---------

    Co-authored-by: Alexey <[email protected]>

commit a1503f9ca75a6221919fb0d5b0340db0816b1cc9
Author: Ranik <[email protected]>
Date:   Sun Apr 30 16:17:54 2023 -0500

    Addition of Profession requirements (#65329)

    * Addition of Profession requirements

    * Update professions.json

    * Update achievements.json

    * Profession updates and Some Misc fixes

commit 02a55134f5676070db267c1fd696086269fff73a
Author: NetSysFire <[email protected]>
Date:   Sun Apr 30 23:16:01 2023 +0200

    Make some locations more rare (#65366)

    * location spawning nerf

    * forgot one lmoe variant

commit a82558795a210d26ec58807c8ee5f04f08d488c6
Merge: 533dd1f5bc b191cc1951
Author: Angela Graves <[email protected]>
Date:   Sun Apr 30 08:09:29 2023 -0500

    Merge pull request #65374 from Daved27hundred/general-appliance-repair-and-stuff

    appliance recipes update + home improvement backround

commit 533dd1f5bc45cfc742c13dccd55537671013c8d1
Author: Alexey <[email protected]>
Date:   Sun Apr 30 14:09:24 2023 +0300

    Remove unused static (#65383)

commit 621d53eaf428c4c50c7a80885a045f706e3b172a
Author: bateau-de-coal <[email protected]>
Date:   Sun Apr 30 09:05:15 2023 +0800

    dark_gray to light_gray (#65157)

commit 73f653aa0f6b235f3af204b7e91b33196ede2bdb
Merge: bb2a075d0b 476fd04ea1
Author: David Seguin <[email protected]>
Date:   Sat Apr 29 21:01:43 2023 -0400

    Merge pull request #65300 from irwiss/obsolete-accessories

    Obsolete "accessories" gunmod slot

commit bb2a075d0bff4e5862009ad4c3dd15ac4db4d198
Author: Dillon Matchett <[email protected]>
Date:   Sat Apr 29 21:50:12 2023 -0300

    [bombastic perks] Forcefield and Evasion enchants (#65246)

    * Forcefield and Evasion

    * spelling

commit 728416f36d4fd22e1b3e2484529f201f9838950a
Author: Bence <[email protected]>
Date:   Sun Apr 30 02:48:01 2023 +0200

    Apartment complex: parking garage, lobby variants, roof additions (#65249)

    * apt update

    parking garage, roof stuff, lobby variants

    * remove 'stairs' map variant

    use conditional nesteds instead

    * flag

commit c00d6a7cac705de5a9bad0f019ee65c5575a1996
Merge: 6f0752f964 e9b8371fd5
Author: David Seguin <[email protected]>
Date:   Sat Apr 29 20:47:08 2023 -0400

    Merge pull request #65293 from irwiss/vehicle-fixes

    Vehicle interaction menu fixes

commit 6f0752f964dba8dca37c0eebdf95e1d4219bad34
Author: Dillon Matchett <[email protected]>
Date:   Sat Apr 29 21:45:04 2023 -0300

    Random missions fixes (#65342)

    * Stop being global

    * added process EOCs

    * pointer safety and removed mi-go prisoners

commit 58a5020c8bdfc08331e1b908988aa50ae165cf78
Author: Dillon Matchett <[email protected]>
Date:   Sat Apr 29 21:41:16 2023 -0300

    Additional ambient guns (#65372)

    * pre style

    * styled

    * updated to imply also groups like antifascists

    * Update data/json/monsters/zed_survivor.json

    Co-authored-by: TheShadowFerret <[email protected]>

    ---------

    Co-authored-by: TheShadowFerret <[email protected]>

commit fbeaf5d4040a5bb352a962f9a28b2e59f4ad8cdd
Author: Dillon Matchett <[email protected]>
Date:   Sat Apr 29 21:37:35 2023 -0300

    UI fixes (#65309)

commit bdac83965572396da262b8f39599f569f75a163b
Author: Rewryte <[email protected]>
Date:   Sun Apr 30 08:36:06 2023 +0800

    Fix calculation for inserting into nested containers (#65373)

    * change recursive function

    * change max charges function

    * format and astyle

    * remove unnecessary variable

    * remove unneeded check

    check bypasses new calculations which account weight even for rigid containers

    * auto format

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * use get_pocket_data and avoid div0

    as per review by irwiss

    * close loopholes

    closed more loopholes that allow rigid containers to skip checking for parent weight capacity

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit a7dafba55700402294f1dae0747c6f58e4860422
Author: Bence <[email protected]>
Date:   Sun Apr 30 02:35:19 2023 +0200

    pharmacy update (#65375)

commit 137a84d228ba5034cd3757c2d0b99d7fae48a2ee
Author: akrieger <[email protected]>
Date:   Sat Apr 29 17:33:59 2023 -0700

    Don't report json member errors if currently throwing an exception. (#65363)

commit ddf5cfa446d043a89a3a5a3b65fcf642e17a50e8
Author: Bence <[email protected]>
Date:   Sun Apr 30 02:33:14 2023 +0200

    Update musicstore.json (#65361)

commit ded3a0413f05cf840481eddfee0f60678610f3e9
Author: Maleclypse <[email protected]>
Date:   Sat Apr 29 19:32:09 2023 -0500

    Lodge basement variant - normal (#65353)

    * Lodge basement variant

    * Update data/json/mapgen/hunting_lodge.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Fix

    * Update data/json/overmap/overmap_terrain/overmap_terrain.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit 7fbae15dbc43d20f7bc620e2d0d06e15605d74ad
Author: andrei <[email protected]>
Date:   Sun Apr 30 03:31:15 2023 +0300

    math_parser: force classic locale before parsing (#65352)

commit dd5f78ff4219bb0d6f4e7913a6f58a1512697dcf
Author: Andrey Andreyevich Bienkowski <[email protected]>
Date:   Sun Apr 30 03:30:47 2023 +0300

    json: document families shorthand (#65347)

    Looking at the code there appears to be a shorthand for specifying weakpoint families that is not currently documented https://github.com/CleverRaven/Cataclysm-DDA/blob/69c3dbb431febdff993c92b285e4b8542a06dfa7/src/weakpoint.cpp#L111

commit 2d5ae2ca082bfb57ebe9061a4c31c361c0e26a89
Author: Alexey <[email protected]>
Date:   Sun Apr 30 03:29:31 2023 +0300

    Fix some clang-tidy and MSVC errors/warnings (#65304)

commit 2a07b928dc30c6b7a082b3724e44f80e1a564e53
Author: Clarence "Sparr" Risher <[email protected]>
Date:   Sat Apr 29 20:28:14 2023 -0400

    Actually run tests with `make RUNTESTS=1` (#65177)

commit b191cc1951276c7b3781d6d79d4a90c1c378299e
Author: ZigVert <[email protected]>
Date:   Sat Apr 29 15:11:15 2023 -0400

    tim allen grunt

commit c02676adeab8ebddda09af6726ffec4fa272d60a
Author: Jianxiang Wang (王健翔) <[email protected]>
Date:   Sun Apr 30 00:10:13 2023 +0800

    Fix clang-tidy.sh to correctly handle paths without a starting slash and empty subsets (#65354)

commit 5dec49381252c95e448f48e6b9c2aca947707365
Merge: 094c9e46ce 85199ca35e
Author: Angela Graves <[email protected]>
Date:   Sat Apr 29 00:10:44 2023 -0500

    Merge pull request #65365 from CleverRaven/i18n

    Routine i18n updates on 29 April 2023

commit 85199ca35ef0edad5b1cfe8ef2d9602fb43d6014
Author: kevingranade <[email protected]>
Date:   Sat Apr 29 02:06:51 2023 +0000

    Routine i18n updates on 29 April 2023

commit 094c9e46cef9d584532ed3b391d024b40925510b
Author: NetSysFire <[email protected]>
Date:   Sat Apr 29 00:45:45 2023 +0200

    Hospitals now have a chance of piled up corpses in body bags on the porch (#65359)

    * hospitals are now overburdened by dead people

    * fix density

    * i am literally just copying that item, dont bother me about the density please

    * minor sentence rewording

commit 7c09c1d51b5b8738dbd80866e844652a7cc0f225
Author: SolventMercury <[email protected]>
Date:   Fri Apr 28 14:40:11 2023 -0700

    Weakpoints & Proficiencies for Zombie-Adjacent Monsters (#65346)

    * Weakpoints & Proficiencies for Zombie-Adjacent Monsters

    * Update data/json/monsters/fungus_zombie.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Update data/json/monsters/fungus_zombie.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Update data/json/monsters/fungus_zombie.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Fixed Incorrect Proficiency

    - Fixed the incorrect use of the Synthetic Armors proficiency on an enemy with no armor.

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit 0b9b1fa700787f65a85773824dffaad161503849
Merge: 5fb5ee5b5b 8ca4d0e534
Author: Angela Graves <[email protected]>
Date:   Fri Apr 28 00:22:32 2023 -0500

    Merge pull request #65350 from CleverRaven/update-toc

    Update the table of contents in doc/JSON_INFO.md

commit 5fb5ee5b5bc81f3e3db7b16e9780169f7c4f0678
Author: aMegaSloth <[email protected]>
Date:   Thu Apr 27 20:03:17 2023 -0700

    Seperate weather tolerance from stomach related traits (#65335)

    * seperate weather tolerance from stomach related traits

    * Add removable mutation

    ---------

    Co-authored-by: aMegaSloth <[email protected]>

commit 8ca4d0e5341c807ed1a420532892816d1c8dfc99
Author: I-am-Erk <[email protected]>
Date:   Thu Apr 27 23:26:18 2023 +0000

    Update the table of contents

commit 45a7c244e949a838a6781b827fa4e277795d9b5f
Author: RenechCDDA <[email protected]>
Date:   Thu Apr 27 19:25:42 2023 -0400

    document "location" for vehicle parts (#65327)

commit 69c3dbb431febdff993c92b285e4b8542a06dfa7
Author: ZigVert <[email protected]>
Date:   Thu Apr 27 16:54:26 2023 -0400

    im not removing that pun (#65343)

commit a1e68b32a666780f341773566d7b58571c5f40d3
Author: halosammy <[email protected]>
Date:   Thu Apr 27 13:27:05 2023 -0700

    Updated Phase Immersion Suit (#65324)

    * Updated Phase Immersion Suit

    * Update tool_armor.json

commit 1a7ffd7a0d4434d6534ea3e9286c004acd8b700d
Author: Jianxiang Wang (王健翔) <[email protected]>
Date:   Thu Apr 27 21:05:21 2023 +0800

    Do not cancel clang-tidy run when a subset finishes (#65320)

commit 48ed876c6a1ae35d64951d99f672237580345f72
Author: Alexey <[email protected]>
Date:   Thu Apr 27 14:17:07 2023 +0300

    Fix vehicles' initial fuel spawns (#65323)

    * Fix vehicle fuel spawning

    * Fix hybrid cars always spawning with no fuel

commit feebf9037e49b8e46762169f078dfcfcfd173f0d
Author: Bence <[email protected]>
Date:   Thu Apr 27 13:07:58 2023 +0200

    fix (#65322)

commit bffe6c5f565da8361e30762c1be2836399da7fc7
Author: Aerin <[email protected]>
Date:   Thu Apr 27 07:04:37 2023 -0400

    Carpet Armor (#65331)

    * Fix carpet weight/volume. Add carpet pilling material. Add carpet armor.

    * Add recipes and carpet scraps item

    * lint

commit 56eb4f6d7c6d3ecbd45e2d92335f8e821212edcf
Author: Eric <[email protected]>
Date:   Thu Apr 27 05:36:53 2023 -0400

    Add ability to find terrain, furnitures, traps, monsters or npcs with EOC. (#65228)

    * More json power

    * Update NPCs.md

    * Remove shift hack

    * Update npctalk.cpp

    * Update npctalk.cpp

commit bd7a3976e465a68c5d16eb236bdfd6c7e72c18f7
Merge: 5f2a60d7e3 25e8b859b9
Author: Angela Graves <[email protected]>
Date:   Thu Apr 27 00:38:31 2023 -0500

    Merge pull request #65308 from anoobindisguise/patch-8

    remove gross food from hardtack

commit 5f2a60d7e3ee4756ad6acc4906acce930730cec6
Author: Alexey <[email protected]>
Date:   Thu Apr 27 04:57:34 2023 +0300

    Tidy up repaired_with field (#65189)

commit 9d637bb79c16b335de9a9495f779243309c121af
Author: Eric <[email protected]>
Date:   Wed Apr 26 20:42:23 2023 -0400

    Make refugee center guards move around in shifts. (#64988)

commit 015860edcee6b1a95ea9afbb9e5046d0688e1c64
Author: anoobindisguise <[email protected]>
Date:   Wed Apr 26 17:35:54 2023 -0700

    Hopefully refine telefragging behavior (#64810)

commit 01203da51d7a1155b07fd3e4d454b63723963633
Merge: 5c08c4c3ac 001333c123
Author: Angela Graves <[email protected]>
Date:   Wed Apr 26 00:11:36 2023 -0500

    Merge pull request #65286 from CleverRaven/changelog-weekly-2023-04-24

    Weekly Changelog 2023-04-17 to 2023-04-24

commit 25e8b859b98b943d9ce396787dde14e667df826c
Author: anoobindisguise <[email protected]>
Date:   Tue Apr 25 19:29:54 2023 -0700

    no bad food vitamin

commit a5ea85511744ac9f13f0d26fc766491de5b9f1fe
Author: anoobindisguise <[email protected]>
Date:   Tue Apr 25 19:29:31 2023 -0700

    remove other hardtack bad vitamins

commit 953e0b2ae0edc5a5b6bdc46a178979a41af3421d
Author: anoobindisguise <[email protected]>
Date:   Tue Apr 25 19:28:38 2023 -0700

    remove other hardtack grossfood

commit ba65dcbad252744cef92859fc4735fa7de7b767d
Author: anoobindisguise <[email protected]>
Date:   Tue Apr 25 18:16:05 2023 -0700

    remove bad food from hardtack

commit 5c08c4c3ac4946ea5c78934913712da77c70598c
Merge: 2671deb3ba a697831937
Author: John Candlebury <[email protected]>
Date:   Tue Apr 25 18:48:42 2023 -0600

    Merge pull request #65306 from anoobindisguise/patch-7

    fix wrong artifacts spawning in distorted labs

commit 2671deb3ba888914d794cf85526024afb9065672
Author: anoobindisguise <[email protected]>
Date:   Tue Apr 25 16:14:30 2023 -0700

    reduction of coal spawns in mines and coal/charcoal price (#64572)

commit f9fe8e4772442829e8e70ab2ecf442bdcec0c757
Author: MNG-cataclysm <[email protected]>
Date:   Tue Apr 25 19:06:42 2023 -0400

    Add beekeeping and beekeeping acessories (#63718)

    Co-authored-by: Venera3 <[email protected]>

commit 4b69f91d370f8bc69cf76caf8de2eb491f6afee6
Author: MNG-cataclysm <[email protected]>
Date:   Tue Apr 25 19:00:17 2023 -0400

    Add a way for static NPCs to have randomly generated missions. (#62640)

commit 042fff658a10c96e4680f3915c43436d844699f0
Author: Hirmuolio <[email protected]>
Date:   Wed Apr 26 01:55:38 2023 +0300

    Add units::temperature_delta (#62452)

    Co-authored-by: Fris0uman <[email protected]>

commit c3f26cdcb702733c79b6f77eca894d21969318fa
Author: DoctorBoomstick <[email protected]>
Date:   Tue Apr 25 23:34:59 2023 +0200

    Introduces .303 British as a calibre (#62174)

    * Starts work on creating the .303 calibre, adds the basic  framework for .303 bullets.

    * keeps working on adding the fraimwork for .303 ammo.

    * adds a .303 onhand ammo group, and adds .303 ammo types to existing item groups.

    * keeps adding to the item groups.

    * adds the .303 SMLE Mk III and No. 4 Mk I battle rifles. also adds their magazine and clip.

    * last tweeks before pr.

    * starts trying to fix errors.

    * fixes bugs.

    * Update data/json/items/ammo/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * Update data/json/items/ammo/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * Update data/json/items/ammo/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * Update data/json/items/gun/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * Update data/json/items/gun/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * ups the weight of .303 ammo to 25 gm.

    * Update data/json/items/ammo/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * reworks .303 round discriptions to try and make them less wordy.

    * axes the unneeded No. 4 entry in the migration file.

    * retrigger checks

    * retrigger checks

    * Makes .303 ammo drastically more rare.

    * splits the Mk III and No. 4 into two items.

    * fixes errors.

    * retrigger checks

    * Starts work on creating the .303 calibre, adds the basic  framework for .303 bullets.

    * keeps working on adding the fraimwork for .303 ammo.

    * adds a .303 onhand ammo group, and adds .303 ammo types to existing item groups.

    * keeps adding to the item groups.

    * adds the .303 SMLE Mk III and No. 4 Mk I battle rifles. also adds their magazine and clip.

    * last tweeks before pr.

    * starts trying to fix errors.

    * fixes bugs.

    * Update data/json/items/ammo/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * Update data/json/items/ammo/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * Update data/json/items/ammo/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * Update data/json/items/gun/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * Update data/json/items/gun/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * ups the weight of .303 ammo to 25 gm.

    * Update data/json/items/ammo/303.json

    Co-authored-by: TheShadowFerret <[email protected]>

    * reworks .303 round discriptions to try and make them less wordy.

    * axes the unneeded No. 4 entry in the migration file.

    * retrigger checks

    * retrigger checks

    * Makes .303 ammo drastically more rare.

    * splits the Mk III and No. 4 into two items.

    * fixes errors.

    * retrigger checks

    * starts tuning up the PR.

    * Finishes reworking stuff.

    * adds .303 to the list of ammo types that can be held in the ammo powch.

    * Adds gun barrel lengths, and tweaks ammo armour piercing, range, and volume numbers to be more sensible and in line with real world data.

    * fixes merge errors.

    * adds barrel length values for the ammo.

    * fixes bugs.

    * fixes more bugs.

    * Replaces the “cut” damage entry with “stab” and removes the flag. Also rebalances magazine spawns, as Enfield mags are quite rare when compared to clips.

    ---------

    Co-authored-by: TheShadowFerret <[email protected]>

commit 7c26d11858178bd60f407e38295d1f11e5d75c32
Merge: ee6be48fd7 e5c57d5ab3
Author: Kevin Granade <[email protected]>
Date:   Tue Apr 25 14:29:29 2023 -0700

    Merge pull request #65301 from taatu/remove-zomborg-explosion

    Stop zomborgs from exploding on death

commit a6978319377eac36b73b350bb7f84159716ac0e2
Author: anoobindisguise <[email protected]>
Date:   Tue Apr 25 11:49:23 2023 -0700

    fix wrong artifacts spawning in distorted labs

commit 476fd04ea1a024af205757dbc7489bf00b2f3112
Author: Alexey <[email protected]>
Date:   Tue Apr 25 16:16:47 2023 +0300

    Update inherited flags cache when de/attaching gun and tool mods

commit 4b7917f8763172d739efeca0e929ef8b02660b62
Author: Alexey <[email protected]>
Date:   Tue Apr 25 16:12:12 2023 +0300

    Allow belt_clip mod to spawn

commit ac1e93c8a3fcd9518786f1e63c185d6f70c7440e
Author: Alexey <[email protected]>
Date:   Tue Apr 25 15:22:25 2023 +0300

    Delete obsoletion script

commit b776240439327d8b816ca7efe37c799f32e7deb7
Author: Alexey <[email protected]>
Date:   Tue Apr 25 15:21:58 2023 +0300

    Obsolete "accessories" gunmod slot

commit e5c57d5ab3ae2ccb2015e0373695fa15a251203e
Author: taatu <[email protected]>
Date:   Tue Apr 25 16:28:54 2023 +0300

    Stop zomborgs from exploding

commit 3e80fad337face31404f5dcb755b2ba20909f6e8
Author: Alexey <[email protected]>
Date:   Tue Apr 25 15:18:59 2023 +0300

    Script to remove accessories slot

commit 1edd977f6c1ea8c7eb8bfb1b015a7c43a151212f
Author: Alexey <[email protected]>
Date:   Tue Apr 25 14:40:02 2023 +0300

    Move belt_clip to dedicated gunmod slot

commit ee6be48fd707e0cede4c8e47330ba790b24182ed
Author: Rewryte <[email protected]>
Date:   Tue Apr 25 20:51:15 2023 +0800

    Quadrupedal movement with paws (#65186)

    * paw crouch

    * lint

    http://dev.narc.ro/cataclysm/format.html

    * add thresh req

    * lint

    * manual merge

    Co-Authored-By: fairyarmadillo <[email protected]>

    ---------

    Co-authored-by: fairyarmadillo <[email protected]>

commit 43581b499c9ade2b5a218a945b483d544619e0af
Merge: e3d5a0b53e 964f13e715
Author: Angela Graves <[email protected]>
Date:   Tue Apr 25 00:15:00 2023 -0500

    Merge pull request #65254 from anoobindisguise/anoobindisguise-gambeson-refine3

    gambeson fixes

commit 001333c1235cf35485b6eafcbdd452fe580f3520
Author: Maleclypse <[email protected]>
Date:   Mon Apr 24 23:43:16 2023 -0500

    Apply suggestions from code review

    Co-authored-by: David Seguin <[email protected]>

commit e3d5a0b53e34fd1843cbb223d794c44aed0d83cc
Author: Maleclypse <[email protected]>
Date:   Mon Apr 24 23:10:06 2023 -0500

    [Xedra Evolved] How do vampires deal with blood spoilage? (#65288)

    * Blood Banks

    Update containers.json

    lint

    * Apply suggestions from code review

    Co-authored-by: David Seguin <[email protected]>

    ---------

    Co-authored-by: David Seguin <[email protected]>

commit b5cd22cba08ae265f728a170a816cbe7d180be70
Author: halosammy <[email protected]>
Date:   Mon Apr 24 20:45:15 2023 -0700

    Resizing the HWP 12.3 60-Round Magazine (#65296)

    * Magazine resizing

    * Update robofac_gun.json

    * Update robofac_gun.json

    * Update robofac_gun.json

    * Update robofac_gun.json

    * Update robofac_gun.json

    * Update robofac_gun.json

commit 6deb3022a6b86305596f49b45af7db7a77abf685
Author: Dark Daskin <[email protected]>
Date:   Tue Apr 25 06:35:28 2023 +0300

    Fixed display of tools required to repair an item (#65284)

    * Fixed display of tools required to repair an item.

    * astyle src/item_factory.cpp

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit 18f596f744e6168a074c61ee0470f94221b9d73d
Author: David Seguin <[email protected]>
Date:   Mon Apr 24 23:27:34 2023 -0400

    Apply suggestions from code review

    Co-authored-by: Maleclypse <[email protected]>

commit aed326ce25e25ed44cc1965284b19a41f9b233db
Author: Hirmuolio <[email protected]>
Date:   Tue Apr 25 06:25:49 2023 +0300

    consume energy (#65289)

commit 5c07b37d35f9d9b3c66333595f58d3fcea69060f
Author: Dark Daskin <[email protected]>
Date:   Tue Apr 25 06:23:54 2023 +0300

    Inherit relative rot when disassembling. (#65291)

commit dad8ff7a8a6ca89768e71c60b2b445cd15387326
Author: PerfectlyInternal <[email protected]>
Date:   Mon Apr 24 23:23:01 2023 -0400

    fixed large wooden box description (#65294)

commit fb4c843540cc96935281d7df2dbddbbc316173cb
Author: Dee Anzorge <[email protected]>
Date:   Tue Apr 25 05:22:35 2023 +0200

    Fix archery stamina calculations (#65295)

commit a2f5875d92995cba39653f3c15a0b2d396258b37
Merge: 853ea1cbce fcac354139
Author: Kevin Granade <[email protected]>
Date:   Mon Apr 24 13:46:26 2023 -0700

    Merge pull request #64386 from dseguin/jsonify_damage_types

    Jsonify damage types

commit e9b8371fd52fd371d9e4791d449511e6e5d82c05
Author: Alexey <[email protected]>
Date:   Mon Apr 24 20:42:03 2023 +0300

    Make cruise control on the default and only behavior

commit 5c1860ebed85a20d86d1fe460cd0861cead0db20
Author: Alexey <[email protected]>
Date:   Mon Apr 24 20:41:52 2023 +0300

    Make fuel_current work correctly with muscle fuel

commit d8d7dec4db04330d8d66ba3a3379b8803d2c1cca
Author: Alexey <[email protected]>
Date:   Mon Apr 24 20:41:44 2023 +0300

    Hide individual engine controls if less than 2 exist

commit 853ea1cbceabf756d229682bfccd1d4b01766657
Merge: d2b9061607 2f8d5ec5bd
Author: Angela Graves <[email protected]>
Date:   Mon Apr 24 06:21:58 2023 -0500

    Merge pull request #65279 from kwl01skz/patch-2

    Fix spelling mistakes

commit d2b90616077c1b6105b567ab7859d6d8be151abb
Author: Fris0uman <[email protected]>
Date:   Mon Apr 24 07:46:44 2023 +0200

    Replace short rope by actual seatbelt in vehicles (#64834)

commit 5e3ceb1e3294403f90b7eaff5c9e46d3cc1b7cba
Author: LyleSY <[email protected]>
Date:   Mon Apr 24 01:46:21 2023 -0400

    spawn forest mammals in winter (#65193)

commit fa460e41b62194cf8e67f219416924ae4df867e6
Author: RenechCDDA <[email protected]>
Date:   Mon Apr 24 01:45:57 2023 -0400

    update spell id to match current implementation (#65256)

commit d9900c4f107aa89cf2092090939f22b46c3e14e9
Merge: bc86a4eca3 7afa062d96
Author: Zhilkin Serg <[email protected]>
Date:   Mon Apr 24 08:45:48 2023 +0300

    Merge pull request #65253 from irwiss/tidy-assign-activity

    Tidy assign activity

commit bc86a4eca380b097c564f276b1f7c3fccfe2b216
Author: RenechCDDA <[email protected]>
Date:   Mon Apr 24 01:45:15 2023 -0400

    remove duplicated meat_canned recipes (#65255)

commit c01108c2cf8cc9e7b35707dd9dfa4bf2fe701054
Author: DoctorBoomstick <[email protected]>
Date:   Mon Apr 24 07:44:38 2023 +0200

    does the changes, and fixes the gun. (#65268)

commit 2a42d05461d120a7558ab0b0ee5799f5b4c7d840
Author: Eric <[email protected]>
Date:   Mon Apr 24 01:44:13 2023 -0400

    Remove trailing zeros from variables (#65273)

commit 7ab4bab38d27439d69dffdc54694b29d5cd654c3
Author: Eric <[email protected]>
Date:   Mon Apr 24 01:43:27 2023 -0400

    Update portal_storm_effect_on_condition.json (#65287)

commit 287df8774b69a32d7fd7e4f1708111c364b13b18
Author: Kevin Granade <[email protected]>
Date:   Sun Apr 23 22:43:12 2023 -0700

    Routine tileset updates on 23 April 2023 (#65283)

    Co-authored-by: casswedson <[email protected]>

commit fe71de11c79d81a31eff25396e909b799a5f6458
Author: LyleSY <[email protected]>
Date:   Mon Apr 24 01:42:55 2023 -0400

    fix Free Merchant guard gear groups (#65281)

commit 9b617154362528a4563cad75ba5f16ccf886d361
Author: Karol1223 <[email protected]>
Date:   Mon Apr 24 07:42:43 2023 +0200

    abstract the abstracts (#65276)

commit d251f9a5a21ef8b489d5d537e951b2fb0987c1ef
Author: fairyarmadillo <[email protected]>
Date:   Sun Apr 23 22:42:26 2023 -0700

    Reduce maid spam (#65275)

    Also reduce the top hat, sombrero, 10 gallon hat, kufi, eboshi, haori, hakama, and union suit.

commit a419d2b67c3ff0f990974c5919a63cd879c9677d
Merge: b7ebfe27a4 241261e07b
Author: Zhilkin Serg <[email protected]>
Date:   Mon Apr 24 08:42:09 2023 +0300

    Merge pull request #65269 from jbytheway/string_view-check

    Add clang-tidy check looking for opportunities to convert functions to use string_view

commit b7ebfe27a4c0f280f4595bdf5dff90339e50a2b2
Author: John Bytheway <[email protected]>
Date:   Mon Apr 24 01:41:58 2023 -0400

    Split clang-tidy workflow into two parts (#65272)

    The full clang-tidy run takes too long, so split it into one part for
    src and one for everything else.

commit 11508d2693bb63cc4f5a2bc9da8baeed11bac3d4
Author: John Bytheway <[email protected]>
Date:   Mon Apr 24 01:41:37 2023 -0400

    Install gettext on pull translations workflow (#65271)

    This is because we need to use msgattrib to compute the stats used for
    lang_stats.inc.

commit fcac354139a2af4c5e7a943ae935872da5e32917
Author: David Seguin <[email protected]>
Date:   Sun Apr 9 03:35:49 2023 -0400

    damage_type: documentation

commit f021edd2e78cd87e2484301be66fe2c5498e99ce
Author: David Seguin <[email protected]>
Date:   Sun Apr 9 02:16:39 2023 -0400

    damage_type: string extractor

commit 5d2a891f5e0b8cb87d9ae1399bab6086bd2906b3
Author: David Seguin <[email protected]>
Date:   Mon Apr 24 01:06:14 2023 -0400

    damage_type: data-driven damage type UI ordering

commit 06f8b689e81181305aed016ad3b27cf4dd57ebd6
Author: David Seguin <[email protected]>
Date:   Sat Apr 22 21:27:44 2023 -0400

    damage_type: damage type tests

commit 0b7365bdcf72beeade0e2a396860bdd948265865
Author: David Seguin <[email protected]>
Date:   Sat Apr 22 21:27:09 2023 -0400

    damage_type: on-hit EOCs

commit 740ad64ddfa5c2b4de7ec1f0da344b2fdb534b87
Author: David Seguin <[email protected]>
Date:   Tue Apr 18 00:05:46 2023 -0400

    damage_type: read proportional/relative values for item damage

commit 7872906abd4f7484fccba92ce5322475c6314f16
Author: David Seguin <[email protected]>
Date:   Tue Apr 18 00:04:20 2023 -0400

    damage_type: read proportional/relative values for monster armor

commit b2ac3dd5e1c6402ef954e770f081855a75d804b4
Author: David Seguin <[email protected]>
Date:   Wed Apr 12 02:23:15 2023 -0400

    damage_type: convert item melee damage (goodbye STAB flag)

commit dfc2f4ceb2dd79e74b401c31c04244ddc3968596
Author: David Seguin <[email protected]>
Date:   Tue Apr 18 02:12:24 2023 -0400

    damage_type: convert bionic protection values

commit fa0b42949033c7cc69db8b10e842b22374ed642e
Author: David Seguin <[email protected]>
Date:   Tue Apr 18 02:49:22 2023 -0400

    damage_type: convert material resistance values

commit 651a0c66389a4502534507d90aab3fd3cab8f9f6
Author: David Seguin <[email protected]>
Date:   Sat Apr 22 16:31:39 2023 -0400

    damage_type: convert monster resistance values

commit 30a92e13fcd65f3f844cf12ac87511a3bd1c0865
Author: David Seguin <[email protected]>
Date:   Tue Apr 11 21:01:07 2023 -0400

    damage_type: use ids in object creator

commit 6141f7651e48740ecb26a7462282cf313250bbec
Author: David Seguin <[email protected]>
Date:   Sat Apr 22 16:25:26 2023 -0400

    damage_type: jsonify damage types

    It turns out that a lot of loading code depends on
    the availability of certain damage types.

    I see two ways to resolve this:
    1) Juggle the loading order of JSON types so that damage
       types always load first.
    2) Add deferred processing for every type with inline
       damage type definitions.

    I went with option 2, which is better but still
    not great since new code that loads damage/resistance
    definitions would need to also call finalize_damage_map
    in the finalizing stage. Option 1 would cause problems
    for mods, especially because the load order would matter.

    None of this can be done piecemeal, it has to all be ripped
    out in one go unless we want commits that don't compile
    on their own.

commit 8730d60c79ebe1c16212dc156a90f66d8b70cd6d
Author: David Seguin <[email protected]>
Date:   Mon Apr 24 01:10:37 2023 +0000

    Weekly Changelog 2023-04-17 to 2023-04-24

commit 04e230caae463b3428552e2ef87fee74abb2f417
Merge: e75cf05801 873e6554b1
Author: Kevin Granade <[email protected]>
Date:   Sun Apr 23 16:42:15 2023 -0700

    Merge pull request #64597 from Brambor/ui_refactor

    refactor ui.h & fix clamp to min instead of 0

commit e75cf058015b9f617ef0c7c212802dfefaf327ab
Author: Venera3 <[email protected]>
Date:   Mon Apr 24 00:28:50 2023 +0200

    Expand mattacks to use the dialog condition system (#65229)

commit 531e7be246bdc51e43a240c37ff83a2904879d38
Merge: 2b551829d2 e9fe517801
Author: Angela Graves <[email protected]>
Date:   Sun Apr 23 14:11:09 2023 -0500

    Merge pull request #65251 from anoobindisguise/anoobindisguise-rez-hallu

    Fix issues with low tier artifact resonance

commit 2f8d5ec5bd994b04fae37eae29dd676a213e785d
Author: Amans Tofu <[email protected]>
Date:   Mon Apr 24 02:46:10 2023 +0800

    Spelling error

commit 241261e07b5ed4b1720aedd2b5cc60c9988311a0
Author: John Bytheway <[email protected]>
Date:   Sun Apr 9 09:21:24 2023 -0400

    Add use-string_view check

    This check looks for functions that currently have const std::string &
    parameters which could have those parameters changed to use
    std::string_view instead.

    It tried to be relatively conservative in what it changes, so that the
    majority of changed functions should continue to compile and function
    correctly (although there certainly remain some corner cases where it
    can run into trouble).

    Here are (most of) the reasons a parameter might not be converted to
    string_view:

    - If we do not see the function definition.
    - If the parameter is passed to another function as a const string &.
    - If the parameter is passed to a function with dependent type.
    - If the parameter is passed to an unresolved constructor.
    - If the function is a template instantiation.
    - If the function is implicitly generated by the compiler.
    - If the parameter is used to initialize a string class member.
    - If the parameter is bound to a string reference.
    - If c_str() is called on the parameter.
    - If the parameter is returned from the function as a string.
    - If the function is virtual.
    - If the address of the parameter is taken.

commit a6476b9e586b05e89d8cc7679013a977811bd0f8
Author: John Bytheway <[email protected]>
Date:   Sun Apr 23 08:26:10 2023 -0400

    Port even more functions to string_view

    This is the last of what my automated conversion check will convert to
    string_view.

    We could certainly change more, but my priority right now is to get the
    check itself merged.

commit 2b551829d28c70f57d919e1221e7f1b923a17abb
Author: Maleclypse <[email protected]>
Date:   Sat Apr 22 22:33:27 2023 -0500

    [Xedra Evolved] Fix Oneiric Hammer Segfault  (#65113)

    * Update ethereal_items.json

    * Update data/mods/Xedra_Evolved/items/ethereal_items.json

    * Update data/mods/Xedra_Evolved/items/ethereal_items.json

    * Update ethereal_items.json

    * Update data/mods/Xedra_Evolved/items/ethereal_items.json

    * Create blacksmithing.json

    * Apply suggestions from code review

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Fixes

    * Update data/mods/Xedra_Evolved/items/ammo_type.json

    * Update data/mods/Xedra_Evolved/items/ammo.json

    * Update data/mods/Xedra_Evolved/items/ammo.json

    * Fixes

    * Update data/mods/Xedra_Evolved/recipes/blacksmithing.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Update data/mods/Xedra_Evolved/items/resources.json

    * Update ammo.json

    * Update blacksmithing.json

    * Update data/mods/Xedra_Evolved/items/ethereal_items.json

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit 964f13e7151294d2212509b30a6913b678b965b0
Author: anoobindisguise <[email protected]>
Date:   Sat Apr 22 19:22:06 2023 -0700

    gambeson fixes

commit 7afa062d9671d2b8a04b9cf6a9593b5b58bb9bc0
Author: Alexey <[email protected]>
Date:   Sun Apr 23 04:16:01 2023 +0300

    Make read_activity_actor accept time_duration

commit 568aa76de8f85798b7364dd4c3c579c00599018e
Author: Alexey <[email protected]>
Date:   Sun Apr 23 03:58:10 2023 +0300

    Unwrap activity_actors into their own assign_activity overload

commit c49e37f013a5fbd970e690921022d5abe84e8926
Author: Alexey <[email protected]>
Date:   Sun Apr 23 00:33:49 2023 +0300

    Remove redundant allow_resume from Character::assign_activity

commit ce7781efb899c06a9b68b9a30bf356f129228a2b
Author: Geeves <[email protected]>
Date:   Sun Apr 23 01:33:03 2023 +0200

    Mounted Police Officer (#64977)

    * Mounted Police Officer

    * linter

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * how did this get here I am not good at computer

    * linter

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * woops

    * the paddening

    * the ABCs

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit e9fe51780193cbf9e85f3f01290dfd07d7671f1f
Author: anoobindisguise <[email protected]>
Date:   Sat Apr 22 15:02:59 2023 -0700

    effect_hallu -> effect_visuals

commit 14b206d8da7a2e954db435df62d084403d27e6f2
Merge: c0d43a60ab 6dec1fa397
Author: David Seguin <[email protected]>
Date:   Sat Apr 22 17:10:32 2023 -0400

    Merge pull request #65174 from ralreegorganon/avatar-diving

    Allow vertical movement for avatar in water

commit c0d43a60ab09182c74941fc2a932df3fb55e1fd1
Author: SurFlurer <[email protected]>
Date:   Sat Apr 22 21:07:34 2023 +0000

    Activate cometibles at once (#65245)

commit 48fef730512bb2084e5a6f3de30e5da25a835019
Author: mqrause <[email protected]>
Date:   Sat Apr 22 23:06:56 2023 +0200

    item::in_container can fill up a container with non-charge items (#65247)

    Co-authored-by: mqrause <[email protected]>

commit 34b078d16d903dfe67703bc95c3338290e7ffa91
Author: Rewryte <[email protected]>
Date:   Sun Apr 23 05:06:10 2023 +0800

    Add option to hide bionics (#65243)

    * add toggle

    * astyle

    * tidy up

    * tidy up more

commit 8adf00c9172c1ee8ea0ed4b1703f724d25ac64d6
Author: Bence <[email protected]>
Date:   Sat Apr 22 23:05:33 2023 +0200

    house32 update (#65190)

commit 1a8f8b4bd7e02172cb68bee61b55598d7dc00cc0
Author: Dillon Matchett <[email protected]>
Date:   Sat Apr 22 18:05:10 2023 -0300

    new begin event (#65235)

    * new begin event

    * switch

commit e4255439f35edc4111a8bbee6648f75b05d4ba43
Author: Rewryte <[email protected]>
Date:   Sun Apr 23 05:04:25 2023 +0800

    mouse thumb support (#65169)

commit 4492ec3cf9454d3d614048395f274b1cbb1b9d19
Merge: 8c7018c1af b82fb427b6
Author: David Seguin <[email protected]>
Date:   Sat Apr 22 17:02:38 2023 -0400

    Merge pull request #65148 from irwiss/minor-veh-fixes

    Minor vehicle fixes

commit 8c7018c1af594b2ec970b425528bd3ef936f1d29
Author: alef <[email protected]>
Date:   Sat Apr 22 23:01:42 2023 +0200

    Update COMPILING.md (#64956)

    - Add unsupported `COMPILING-CMAKE-VCPKG.md`
    - Fix links
    - Remove backticks from one-liner to avoid shell command substitution
    - Add `\` to long one-liner
    - Remove `$`/`#` prompts to allow one-click copy

commit def46094801382ea1f7d63de48b3250a7369ff44
Author: Alexey <[email protected]>
Date:   Sat Apr 22 19:46:52 2023 +0300

    Ignore hostile_spotted_far while aiming, jsonify activity ignored distractions (#65175)

    * Unhardcode ignored distractions for activities

    * Tidy activity_type enums and loader, remove 0.F migration

    * Ignore hostile_spotted_far while aiming

commit 26486c87f5cbaecac61a1c80d56c763abff9f440
Author: MarcusAseth <[email protected]>
Date:   Sat Apr 22 18:39:04 2023 +0200

    Set Fixed ordering for skills in info menu, regardless of language chosen (#65226)

    * Fixed ordering for skills in player info menu, regardless of language choosen

    Adds an ordering value to the skills in skills.json, and uses it to control the order in which the skills appear in the player info menu

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * small spacing fix

    * applied suggested changes

    Removed garbage parameter passed to constructor, added a warning for when a skill has no "ordering" field specified, applied an "ordering" value to skills from Aftershok, Magiclysm and Xedra_Evolved

    * changed "ordering" field name into "sort_rank"

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit 3bf4661362218aa3b571fb533eb96f85dd42215f
Author: crypticcollaborator <[email protected]>
Date:   Sat Apr 22 09:37:01 2023 -0700

    Add new types of artifacts (#65203)

    * Add new types of artifacts

    * Update data/json/artifact/artifact_item_types.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Update formatting, spacing, plurals

    * Update data/json/artifact/artifact_item_types.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Fix strpl and spacing

    * Linted

    * Fix density

    * More density fixes

    * Fix badge densities

    * Account for proportions on badge densities

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit 367b69796d0d0b5e10d0a5dfc20079f01a3246fc
Author: Termineitor244 <[email protected]>
Date:   Sat Apr 22 10:36:05 2023 -0600

    Cowboy profession (#65215)

    * Cowboy

    * Weapon outside of holster

commit 80d38b174c0e35fbcb660291b312b2837e1554ed
Author: fairyarmadillo <[email protected]>
Date:   Sat Apr 22 09:33:06 2023 -0700

    Rebalanced generic zombie drops and bugout bags (#65234)

    * Rebalanced generic zombie drops and bugout bags

    * Update data/json/monsterdrops/zombie_default.json

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    * Reduced vending_drink_items to 10

    * removed wedding dresses from zombie drops

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit ce6c293b439e0daa74faf7a500afec2bef655783
Author: Termineitor244 <[email protected]>
Date:   Sat Apr 22 10:31:33 2023 -0600

    Start Locations Expanded (#65239)

commit 12f8e3a020ecd029c4b24336e4cf20582413ac0c
Author: Eric <[email protected]>
Date:   Sat Apr 22 12:03:46 2023 -0400

    Update effects.json (#65237)

commit e7a013dbe1197b8abbd4e87c98d6b650276e0cb2
Author: Dillon Matchett <[email protected]>
Date:   Sat Apr 22 11:11:17 2023 -0300

    [bombastic perks] Frankenperk (#65199)

    Co-authored-by: TheShadowFerret <[email protected]>
    Co-authored-by: Maleclypse <[email protected]>

commit 730b398839bf1f0ab1e0708530e806762cf61622
Author: Գրիկոր Մ <[email protected]>
Date:   Sat Apr 22 17:08:21 2023 +0300

    Even more temperature tolerance traits! (#62248)

    Co-authored-by: Maleclypse <[email protected]>

commit 82d993b02a55cc0bd8b4112cd5031ccf034f9ae1
Merge: e8a1eafffb 92ec4f79f6
Author: Kevin Granade <[email protected]>
Date:   Sat Apr 22 07:06:01 2023 -0700

    Merge pull request #65176 from jbytheway/lots-of-string_view

    Lots of string view

commit e8a1eafffb8ed3925d53126efcc23785b1ab9afc
Merge: af4a7b3d35 41786b7357
Author: Angela Graves <[email protected]>
Date:   Sat Apr 22 03:36:48 2023 -0500

    Merge pull request #65236 from CleverRaven/i18n

    Routine i18n updates on 22 April 2023

commit 41786b735785bd39f4625b2cf9b6dced5f458edd
Author: kevingranade <[email protected]>
Date:   Sat Apr 22 02:05:02 2023 +0000

    Routine i18n updates on 22 April 2023

commit af4a7b3d354b4e854588c1a518f153e8cce2cb7e
Author: Anton Simakov <[email protected]>
Date:   Fri Apr 21 21:24:02 2023 +0200

    Fog and mist weather (#64954)

    * initial commit

    * no message

    * improve calculations, currently uses test values

    * oops

    * no message

    * no message

    * fixing the wrong values, remove debug message

    * tests: override weather in tests that need clear vision

    * Andrei's fix of vision test

    * vision_junction_reciprocity fix

    * weather realism test fix

    ---------

    Co-authored-by: andrei <[email protected]>

commit 9d5ac50f07149f40c153572f7e5b7786b03da36b
Author: Termineitor244 <[email protected]>
Date:   Fri Apr 21 12:58:52 2023 -0600

    Magic Professions (#65214)

    * Magic Professions

    * Grammar

    * grammar 2

    * Spaces

commit e1c731c1c268f8a6817083e167c862929aa6ea23
Author: SolventMercury <[email protected]>
Date:   Fri Apr 21 11:54:52 2023 -0700

    Finished Zombie Proficiency & Weakpoint Review (#64194)

    * Reviewed all Zombie Weakpoints & Proficiencies

    # GENERAL TWEAKS
    - Renamed Large Humanoids proficiency to Giant Humanoids, to clarify that it does not apply to somewhat large humanoids, like brutes, and only works on hulks and similar.
    - Changed description of Natural Armors proficiency, as many enemies that used this proficiency had something more like a thick hide than any kind of shell.
    - Renamed Natural Armor weakpoint set (wps_natural_armor) to wps_armored_hide, to better reflect its purpose and to avoid confusion with the unrelated Natural Armor proficiency, as well as to prevent its misapplication to monsters which have more of a carapace or plate armor thing going on. Natural Armors proficiency should be reserved for uniquely resilient armored foes, like kevlar zombies, whereas armored hide applies to anything with a particularly thick hide, even if not outrageously so.
    # ZOMBIES
    ## ACID ZOMBIES
    - Edited description of Corrosive Zombie to hint at its thick hide. Corrosive zombie now also trains Natural Armor proficiency.
    - Spitter now has big head weakpoint set, based on description.
    ## AMALGAMATIONS (Their file is named like the zombie files so I put them here)
    - All amalgamations now have intro_biology in their families. This should really be on any living creature of flesh and blood, with exceptions only for stuff like robots, physics-defying nether creatures, extra-dimensional anomalies, and the cafeteria meatloaf. I didn't add this to the cocoons because I wasn't sure if that made sense to do.
    - Caustic amalgamation now trains biochemistry, like acid zombies do.
    - Charged amalgamation now trains electromagnetics, like zapper zombies do.
    ## BURNED ZOMBIES
    - Fixed a typo in the description for Zombie Kinderlings.
    - Zombie Fiend now trains Ossified Exoskeletons. Thought I added that one earlier.
    - Scorched Zombie now gets Armored Hide weakpoints due to its "leathery shell".
    ## FERROUS ZOMBIES
    - Removed Armored Hides weakpoint set from rust shell zombie and plated zombie. Could possibly apply Ossified Exoskeletons to them, but I'm not sure.
    ## COMMAND ZOMBIES
    - Slight description tweaks, typo fix.
    ## FUSED ZOMBIES
    - Added proficiencies to Aberration and Dissoluted Devourer. Aberration doesn't give zombie bio because it isn't an actual zombie.
    ## LAB ZOMBIES
    - Removed zombie bio from phase skulker, phase shrike, etc, as they aren't actually zombies.
    - Gave phase shrike Ossified Exoskeletons proficiency.
    ## MISC ZOMBIES
    - Added basic proficiencies to zombullfrog, frogmother, zombie nemesis, smoker
    - Added basic weakpoints to smoker.
    - Headless Horror trains giant humanoids proficiency, based on description.
    - Removed Malicious Mane's natural armor training and body armor weakpoints, as it had no natural armor (or armor at all, for that matter).
    ## RADIATION ZOMBIES
    - Added standard proficiencies and weakpoints to all of them.
    ## SOLDIER ZOMBIES
    - Replaced body armor weakpoint set with armored hide.
    - Removed military pilot's synthetic armor proficiency
    ## ANIMAL ZOMBIES
    - Gave gastro bufo standard proficiencies and biochemistry.
    ## CLASSIC ZOMBIES
    - Replaced beekeper's body armor weakpoints with armored hide weakpoints
    ## PUPATING ZOMBIES
    - Added expected proficiencies and weakpoints to pupating hulks, as they were the only pupa zombies that didn't have a copy-from pointing to the base type, and did not include this information.
    I noticed that most things that disappear on death - boomers, certain cocoons, etc. - tend not to have weakpoints or train proficiencies. Is this an oversight, or is this intentional? For now I left that as is.
    ## FLYING ZOMBIES
    - Gave raptors standard and flying proficiencies.
    - Electric raptor also teaches electromagnetics, like electric zombies.

    * Removed my Personal Changelog from the Project Directory

    * Fixed Fungal Wretch Typos

    * Linted zed_amalgamations.json

    * MANY Zombie Weakpoint Refinements (& Tests)

    - Gave standard weakpoints to standard zombies - manually defined weakpoints for some of the basic zombie models (in zed_misc), like the zombie brute and zombie hulk, is a bit strange, since they have become some of the game's staple enemies. THIS WIL…
  • Loading branch information
@Procyonae
Procyonae committed May 10, 2023
1 parent 1eff10f commit 32e56ea
Show file tree
Hide file tree
Showing 132 changed files with 157,380 additions and 219,211 deletions.
33 changes: 11 additions & 22 deletions .github/workflows/clang-tidy.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Clang-tidy 16
name: Clang-tidy (clang-12, tiles)

on:
push:
Expand Down Expand Up @@ -49,37 +49,26 @@ jobs:
# parts: the src directory and everything else
subset: [ 'src', 'other' ]

runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
env:
CMAKE: 1
CLANG: clang++-16
COMPILER: clang++-16
CLANG: clang++-12
COMPILER: clang++-12
CATA_CLANG_TIDY: plugin
CATA_CLANG_TIDY_SUBSET: ${{ matrix.subset }}
TILES: 1
SOUND: 1
RELEASE: 1
steps:
- name: install LLVM 16
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
sudo apt update
sudo apt install llvm-16 llvm-16-dev llvm-16-tools clang-16 clang-tidy-16 clang-tools-16 \
libclang-16-dev libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-mixer-dev \
libpulse-dev ccache gettext jq
- uses: actions/checkout@v3
- name: install dependencies
run: |
sudo apt install python3-pip libncursesw5-dev ninja-build cmake gettext
pip3 install --user lit
- name: ensure clang-tidy and FileCheck commands point to LLVM 16
run: |
mkdir ~/llvm-command-override
ln -s /usr/bin/clang-tidy-16 ~/llvm-command-override/clang-tidy
ln -s /usr/bin/FileCheck-16 ~/llvm-command-override/FileCheck
echo "$HOME/llvm-command-override" >> $GITHUB_PATH
- name: checkout repository
uses: actions/checkout@v3
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main"
sudo apt-get update
sudo apt-get install libncursesw5-dev clang-12 libclang-12-dev llvm-12-dev llvm-12-tools \
libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-mixer-dev libpulse-dev ccache \
gettext jq
- name: prepare
run: bash ./build-scripts/requirements.sh
- name: determine changed files
Expand Down
9 changes: 1 addition & 8 deletions data/changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Added sorting, showing&hiding pocket contents, and scrolling via mouse in invent
New game event that triggers on load or new game start
Add option to hide bionics
Allow JSON monster special attacks to use the dialog condition system
Confirmation before attacking neutral mobs


## Content:
Expand All @@ -24,9 +23,7 @@ Updates to several existing maps
Add the first Exodii mission
Combat Capable Mounts
Add new Exodii NPC: Luliya
Add new weather types: mist and fog
Allow players to keep bees
Apartment complex: parking garage, lobby variants, roof additions
Add new weather: mist and fog. maybe.


## Interface:
Expand Down Expand Up @@ -57,7 +54,6 @@ Mouse thumb button support
[Xedra Evolved] Museum Location for Xedra Evolved
[Magiclysm] Adds several new professions to the Magiclysm mod
[Bombastic Perks] Added resurrecting meat monstrosities to bombastic perks
[Bombastic Perks] Forcefield and Evasion enchants


## Balance:
Expand All @@ -71,7 +67,6 @@ Remove flaming eye phantom melee attack that can disrupt aim
Converts most of the armor and clothing still using the old limb system to the new system with sub-limbs
partial skill levels contribute to most game tests
Portal Storm Coherency Pass
Stop zomborgs from exploding on death


## Bugfixes:
Expand Down Expand Up @@ -103,7 +98,6 @@ Ferals can use their guns in GG
Prevent fire damaging unbreakable items
Fix energy guns(AFS) on NPC
Faction camps now distribute calories based on actual calories and not default calories
Fix calculation for inserting into nested containers


## Performance:
Expand All @@ -118,7 +112,6 @@ Refactor some crafting infrastructure to support removal of charges
Unify gun battery/ups/bionic energy consumption
Modernize string_formatter
Migrate some JSON APIs to string_view
Add units::temperature_delta


## Build:
Expand Down
8 changes: 0 additions & 8 deletions data/json/character_modifiers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@
"mod_type": "x",
"value": { "builtin": "move_mode_move_cost_modifier" }
},
{
"id": "grab_break_limb_mod",
"type": "character_mod",
"description": "Grab break success modifier",
"mod_type": "x",
"//": "Major limb scores - grip would be nice but unless",
"value": { "limb_score": [ "balance", [ "lift", 2 ], "move_speed", "grip" ], "limb_score_op": "x", "min": 0.1, "max": 0.9 }
},
{
"type": "character_mod",
"id": "stamina_move_cost_mod",
Expand Down
10 changes: 0 additions & 10 deletions data/json/construction_group.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -749,11 +749,6 @@
"id": "build_standing_tank",
"name": "Build Standing Tank"
},
{
"type": "construction_group",
"id": "build_storage_tank",
"name": "Build Storage Tank"
},
{
"type": "construction_group",
"id": "build_stone_fireplace",
Expand Down Expand Up @@ -1733,10 +1728,5 @@
"type": "construction_group",
"id": "obstacle_rock",
"name": "Build a Rocky Obstacle"
},
{
"type": "construction_group",
"id": "constr_excavate_forestfloor",
"name": "Turn forest floor into dirt"
}
]
2 changes: 1 addition & 1 deletion data/json/effect_on_condition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@
{
"type": "effect_on_condition",
"id": "EOC_READ_LOCAL_FILES",
"condition": { "and": [ { "math": [ "u_skill('computer')", ">=", "2" ] }, { "one_in_chance": 15 } ] },
"condition": { "and": [ { "u_has_skill": { "skill": "computer", "level": 2 } }, { "one_in_chance": 15 } ] },
"effect": [ { "u_message": "local_files_simple", "snippet": true, "same_snippet": true, "popup": true } ],
"false_effect": [ { "u_message": "You found nothing interesting in the local files." } ]
},
Expand Down
17 changes: 4 additions & 13 deletions data/json/itemgroups/Clothing_Gear/clothing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,7 @@
{ "item": "pocketwatch", "prob": 30 },
{ "item": "diving_watch", "prob": 20 },
{ "item": "game_watch", "prob": 20, "charges": [ 0, 50 ] },
{ "item": "fitness_band", "prob": 10 },
{ "item": "smart_watch", "prob": 10, "charges": [ 0, 80 ] }
{ "item": "fitness_band", "prob": 10 }
]
},
{
Expand Down Expand Up @@ -1422,17 +1421,12 @@
"type": "item_group",
"id": "pants_female",
"subtype": "distribution",
"entries": [ { "item": "nanoskirt", "prob": 10 }, { "group": "pants_female_child", "prob": 290 } ]
},
{
"type": "item_group",
"id": "pants_female_child",
"subtype": "distribution",
"entries": [
{ "group": "pants_male", "prob": 200 },
{ "item": "skirt", "prob": 75 },
{ "item": "skirt_leather", "prob": 5 },
{ "item": "leggings", "prob": 15 },
{ "item": "nanoskirt", "prob": 10 },
{ "item": "cheerleader_skirt", "prob": 1 },
{ "item": "cheerleader_skirt_short", "prob": 1 },
{ "group": "costume_skirts", "prob": 200, "event": "halloween" }
Expand Down Expand Up @@ -2061,11 +2055,6 @@
{
"type": "item_group",
"id": "female_underwear_top",
"items": [ [ "corset", 5 ], [ "corset_waist", 5 ], { "group": "female_underwear_top_child", "prob": 190 } ]
},
{
"type": "item_group",
"id": "female_underwear_top_child",
"items": [
[ "bra", 70 ],
[ "sports_bra", 50 ],
Expand All @@ -2075,6 +2064,8 @@
[ "bikini_top_short", 1 ],
[ "bikini_top_leather", 3 ],
[ "bikini_top_fur", 2 ],
[ "corset", 5 ],
[ "corset_waist", 5 ],
{ "item": "bikini_top", "variant": "flag_bikini_top", "prob": 70, "event": "independence_day" }
]
},
Expand Down
10 changes: 6 additions & 4 deletions data/json/items/armor/gloves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -779,20 +779,22 @@
},
{
"id": "gloves_medical",
"repairs_like": "gloves_light",
"type": "ARMOR",
"name": { "str": "pair of medical gloves", "str_pl": "pairs of medical gloves" },
"description": "A pair of thin latex gloves, designed to limit the spread of disease. Too fragile to protect you from much else.",
"weight": "3 g",
"volume": "5 ml",
"price": 10,
"weight": "10 g",
"volume": "2 ml",
"price": 1000,
"price_postapoc": 10,
"to_hit": 1,
"material": [ "plastic" ],
"symbol": "[",
"looks_like": "gloves_light",
"color": "white",
"material_thickness": 0.1,
"environmental_protection": 2,
"flags": [ "WATER_FRIENDLY", "WATERPROOF", "SKINTIGHT", "SOFT", "FRAGILE", "NO_REPAIR" ],
"flags": [ "WATER_FRIENDLY", "WATERPROOF", "SKINTIGHT", "SOFT", "FRAGILE" ],
"armor": [ { "encumbrance": 1, "coverage": 100, "covers": [ "hand_l", "hand_r" ] } ]
},
{
Expand Down
31 changes: 1 addition & 30 deletions data/json/items/armor/integrated.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@
"material": [ "sclerotin" ],
"symbol": "x",
"color": "brown",
"warmth": 20,
"warmth": 7,
"environmental_protection": 1,
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "BLOCK_WHILE_WORN", "UNBREAKABLE", "OUTER" ],
"armor": [
Expand Down Expand Up @@ -772,35 +772,6 @@
}
]
},
{
"id": "integrated_giant_pincer",
"type": "ARMOR",
"category": "armor",
"name": { "str_sp": "sclerotin right pincer" },
"description": "A powerful tool for snatching fish or breaking open shells.",
"weight": "900 g",
"volume": "1 L",
"price": 0,
"price_postapoc": 0,
"material": [ "sclerotin" ],
"symbol": ",",
"color": "brown",
"warmth": 10,
"to_hit": 1,
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", -4 ], [ "PRY", 1 ], [ "HAMMER", 1 ] ],
"environmental_protection": 3,
"techniques": [ "BRUTAL", "WBLOCK_2" ],
"flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "OUTER", "PADDED" ],
"armor": [
{
"material": [ { "type": "sclerotin", "covered_by_mat": 100, "thickness": 6.4 } ],
"covers": [ "hand_r" ],
"coverage": 80,
"encumbrance": 30
}
],
"melee_damage": { "bash": 12, "cut": 3 }
},
{
"id": "integrated_shell",
"type": "ARMOR",
Expand Down
11 changes: 0 additions & 11 deletions data/json/items/bionics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,6 @@
"weight": "500 g",
"difficulty": 1
},
{
"id": "bio_ar",
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": { "str": "Integrated AR System CBM" },
"looks_like": "bio_int_enhancer",
"description": "This bionic module integrates augmented reality interface into user's eyes.",
"price": 500000,
"weight": "100 g",
"difficulty": 6
},
{
"id": "bio_armor_arms",
"copy-from": "bionic_general_npc_usable",
Expand Down
46 changes: 16 additions & 30 deletions data/json/items/generic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -711,12 +711,11 @@
"color": "white",
"name": { "str": "USB drive" },
"description": "A USB thumb drive. Useful for holding software.",
"price": "12 USD",
"price": 10000,
"price_postapoc": 10,
"material": [ "plastic", "aluminum" ],
"weight": "4536 mg",
"volume": "4 ml",
"longest_side": "5 cm",
"material": [ "plastic" ],
"weight": "18 g",
"volume": "5 ml",
"pocket_data": [
{ "pocket_type": "SOFTWARE", "max_contains_volume": "1 L", "max_contains_weight": "1 kg" },
{
Expand All @@ -727,9 +726,8 @@
"weight_multiplier": 0.0
}
],
"to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
"flags": [ "MC_USED" ],
"//": "Based on https://www.amazon.com/SanDisk-Ultra-Flair-128GB-Flash/dp/B015CH1PJU/ref=sr_1_3?crid=3QN3ALWDNXCOT&keywords=usb%2Bdrive&qid=1683302125&sprefix=usb%2Bdrive%2Caps%2C499&sr=8-3&th=1"
"to_hit": -3,
"flags": [ "MC_USED" ]
},
{
"type": "TOOL",
Expand All @@ -742,8 +740,8 @@
"price_postapoc": 10,
"material": [ "steel", "plastic" ],
"weight": "55 g",
"volume": "45 ml",
"to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" }
"volume": "5 ml",
"to_hit": -3
},
{
"id": "robofac_hardcase",
Expand Down Expand Up @@ -782,27 +780,15 @@
"symbol": "/",
"color": "yellow",
"name": { "str": "candlestick" },
"description": "A brass candlestick with a gold finish.",
"description": "A gold candlestick.",
"category": "other",
"price": "5 USD",
"price": 10000,
"price_postapoc": 10,
"material": [ "brass" ],
"weight": "180 g",
"volume": "100 ml",
"longest_side": "28 cm",
"to_hit": { "grip": "solid", "length": "hand", "surface": "any", "balance": "neutral" },
"melee_damage": { "bash": 3 },
"pocket_data": [
{
"pocket_type": "CONTAINER",
"holster": true,
"//1": "It's specifically not rigid because volume of candlestick and candle should be additive.",
"max_contains_weight": "500 g",
"max_contains_volume": "500 ml",
"item_restriction": [ "candle", "candle_lit" ]
}
],
"//2": "Based on the medium variation from https://www.amazon.com/Holders-Candlestick-Decorative-Centerpieces-Fitting/dp/B09TNCS7HL/ref=sr_1_27?crid=2NAMJT9OZJDQT&keywords=gold%2Bcandlesticks&qid=1683196194&sprefix=gold%2Bcandlest%2Caps%2C619&sr=8-27&th=1"
"material": [ "gold" ],
"weight": "1500 g",
"volume": "250 ml",
"to_hit": -2,
"melee_damage": { "bash": 9 }
},
{
"type": "GENERIC",
Expand Down Expand Up @@ -3710,7 +3696,7 @@
"looks_like": "adobe_brick",
"price": 5000,
"price_postapoc": 100,
"material": [ "salt", "stone" ],
"material": [ "stone" ],
"symbol": ".",
"color": "white",
"flags": [ "NO_REPAIR" ]
Expand Down
Loading

0 comments on commit 32e56ea

Please sign in to comment.