Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Make storage unit pallete and array of objects All of the other JSON in data/json is. * Gun variants: Better common token & dupe checking Require at least 3 letters for common tokens, with some explicit exceptions. It might be worth going to 4 letters, but going to 3 cleaned up some issues. Also make the dupe check an actual error (resulting in test failure) than just a silent one. The guns caught by the dupe check are allowed as separate by the variant criteria, but it may be being too lenient there and they should instead be combined. Fix the errors that surfaced. - two guns had 16" and 20" barrels, name the longer one long-barreled - Two revolvers (chiappa_rhino and colt_python) were named the same, name the python to indicate it looks like a old west revolver - Name the BLR magazine with a common identifier to the the gun - Give the FN57 an identifier (FN) - Add pistol to BAD_IDENTIFIERS, so the USP identifier is detected Both the FN57 and USP pistol were using "pistol" as the identifier. The BLR was using "ing". * Sort gun variant script valid identifier list So it's stable and looks nicer. * Remove some unused CBM snippets * Reuse built clang-tidy plugin across the shards * makes lit candle more distinct * Update NPC.md * Initial commit * Fire action accounts for all kinds of shoulder straps I've noticed only "adjustable strap" works with the fire action to drawn weapon, and only with default format (hanging like backpack). Happens that code checks for that specific item. Solution is to check for a flag instead, and so works with all kinds of attachments * initial commit * A couple small C++20 fixes * Add versioning to vcpkg setup * make xedra translocators examinable in faction territory * Set SDL_HINT_APP_NAME for tiles See https://wiki.libsdl.org/SDL2/SDL_HINT_APP_NAME * [Xedra Evolved] Add `fey_magick` magic type (CleverRaven#79113) * Initial commit * Add NO_SPELLCASTING to flags too * Focus the default selection in popups * [Magiclysm] Biomancy is disturbing (CleverRaven#79117) * Initial commit * Add pain effects to some spells * Reduce amount of pain caused * Fix scroll name * Fix ClangBuildAnalyzer workflow * [MoM] Fix Mind-sight goggles special vision sprite (CleverRaven#79119) * Extended description window shows potential deconstruction and bash yields (CleverRaven#79107) * Basic addition of deconstruction yields to extended description * Deduplicate and add skill info * Add bash yields replacing the Smashable tag * Add the extended description keybind text to the look around window * Less lazy formatting * [Xedra Evolved] Increase mana cost on Arvore mana-using traits (CleverRaven#79096) * Remove ghc/filesystem polyfill now that we are on C++17 (CleverRaven#79092) * Remove ghc/filesystem shim now that we are on C++17 * fixies * astyle * teach clang-tidy about <filesystem> * Battery compartment mod can use medium storage batteries (CleverRaven#79091) * Update toolmod.json * Lint --------- Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * [MoM] Fix Leukocyte Accumulation class (CleverRaven#79123) * Initial commit * Add magic class * remove const from distance_limit * [Xedra Evolved] Fix treesung baselard recipe (CleverRaven#79131) * Extract special vision descriptions for translation (CleverRaven#79108) * Extract special vision descriptions for translation * Add includes * Add origin arguments * Attempt to appease flake8 * Missed iterating an array * Fix typo * Our flake8 makes me want to commit war crimes * Fix various flake8 errors * Weekly Changelog 2025-01-06 to 2025-01-13 (CleverRaven#79127) * Weekly Changelog 2025-01-06 to 2025-01-13 * Apply suggestions from code review --------- Co-authored-by: David Seguin <davidseguin@live.ca> Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> * {CR} Adds three new lore log snippets! (CleverRaven#79058) * new lore log snippets (draft) the lore log snippets are one of my favorite things to be featured in cataclysm, and I wanted to write some of my own! * Update e_logs.json * Add three new lore log snippets * Update data/json/snippets/e_logs.json Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> * Update data/json/snippets/e_logs.json Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> * Update data/json/snippets/e_logs.json Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> * lint changes * Update data/json/snippets/e_logs.json Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> * Update data/json/snippets/e_logs.json Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> * Update data/json/snippets/e_logs.json Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> * Update data/json/snippets/e_logs.json Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> * Update data/json/snippets/e_logs.json * replace 3 spaces with 2 spaces --------- Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> * Weekly Changelog 2024-12-30 to 2025-01-06 (CleverRaven#78977) * Weekly Changelog 2024-12-30 to 2025-01-06 * Apply suggestions from code review --------- Co-authored-by: David Seguin <davidseguin@live.ca> Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Fix Irradiant weapon attack * Move refugee center start from isolationist to its own scenario (CleverRaven#79140) * Change to start outside refugee center entrance * Move refugee center start to its own option * Starting on path by entrance * use test monsters in shotgun tests (CleverRaven#79141) * use test monsters * Apply suggestions from code review 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> * Don't try to GENERATE typed coordinates (CleverRaven#79137) * Don't try to GENERATE typed coordinates * Adjusted according to comments * [MoM] Add null grenades (CleverRaven#79147) * Initial commit * Add expended grenades * Add snippet * Change id to avoid confusion with _null terrain etc * Create user mods dir automatically. (CleverRaven#79057) * mod manager * Update src/mod_manager.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [Magiclysm] Fix werewolf aura (CleverRaven#79151) * Initial commit * Fixes * typified a-f * [Magiclysm] Rename 'Introduction to the Divine' to 'The Limits of Magical Recovery' (CleverRaven#79153) * Initial commit * Itemgroup changes * Update data/mods/Magiclysm/items/spellbooks.json --------- Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Aftershock: Genetech Mutation system or Genetically engineered Catgirls. (CleverRaven#79128) * Aftershock Genetech * Apply suggestions from code review Co-authored-by: Marc <altairre.atsu@gmail.com> --------- Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Co-authored-by: Marc <altairre.atsu@gmail.com> * [Aftershock] Add human++ genemods (CleverRaven#79149) * Add genemods * Add hobbies * Add Genemod: Beauty * Fix errors * Spelling * [Aftershock] UICA Shuttle Bases (CleverRaven#79144) * Add UICA Shuttlebases to the Exo-Planet * Lint * Add a Quartermaster NPC. They can be bribed to sell you UICA gear and supplies. * Lint * Add Lynx Explorer Vehicle, Quartermaster has less stuff to sell, Shuttlebase spawns ground vehicles * Add Vehicle Repair group stub * Bump up Bribe to $3000 * Rewrite some Quartermaster dialog * Please test gods * Test gods please, I beg * Correct Shuttlebase to Shuttle Base * [ Xedrea Evolved ] Gracken Legs first tier (CleverRaven#79122) * Legs first tier Update harvest_monster_hunter_gracken.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Xedra_Evolved/items/gracken_trait_improvements.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Sort docs into subfolders * update paths to moved docs * better name for LORE_FAQ doc, as suggested by Kevin (thanks!) * [MoM] Concentrating on powers at higher Nether Attunement has a chance of backlash (CleverRaven#79163) * Initial commit * Check for backlash on concentration breaking too. * Change backlash messages to not reference unleashing powers * Nether Attunement vitamin at 15 or higher, not powers maintained at 15 or higher * Spelling * Temporary script to automate this * Remove meaningless weight fields * Fix compile error, remove unneeded string initialisation, correct translation, don't write required mutation string if we're about to overwrite it with incompatible bionics * Update skyscraper_lab_modular.json * monstergroups "name" -> "id" in /data/json * Commit the script so out of repo + personal mods can use it * monstergroups "name" -> "id" in /data/mods * Update deserialisation * Get annoyed at flake8 * Put the script in the wrong folder like a numpty * Fix MSVC build with lld linker * Add an ignorable error and legacy load * flake8 is rood * Change C++ ids called "name" to something better too * Rename doc/COMPILING/ -> doc/c++/ * Remove string spawn item overloads (CleverRaven#79173) * Remove evil overloads * Deal with fallout * Rename map:: get_global->get_abs, bub_from_abs->get_bub, omt_from_abs->get_omt (CleverRaven#79167) * Renamed map:: getglobal->get_abs, bub_from_abs->get_bub, omt_from_abs->get_omt * astyle * [Magiclysm] Remove duplicate religious professions (CleverRaven#79162) * Update professions.json * Redirect Lost Faith to vanilla professions, add books * Reformat item field? * Update data/mods/Magiclysm/scenarios.json * Add scenario EoC * Remove debug message * Kick tests --------- Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * [ Xedra Evolved ] Fix Renfield Drops (CleverRaven#79166) * typify game.h/cpp * use typed point in android code * Use sub_bodypart_str_id::NULL_ID() where appropriate * Add attack_vector_id::NULL_ID() * typify g - lightmap * [MoM] Update and simplify Nether Attunement backlash EoC (CleverRaven#79175) * More updates * More edits * Updating remaining effects * Initial commit * Initial commit * Expand bodypart_str_id::NULL_ID() usage where appropriate * Deal with /tests fallout * Initial commit * please clang * Add CMake function do debug targets * Add targets with dynamic linking * Use VCPKG dynamic linking triplet * Obey linter * Apply review suggestions * Fix Debug configuration linking with MSVS + LLD * Fix zlib linking * Prevent initialising an activity actor's type every turn it's active * [MoM] Fix Research Facility having an oldlab underneath (CleverRaven#79191) * Initial commit * Implement suggestions from code review * fix not being able to move items with charges with AIM (CleverRaven#79183) * fix can move items with charges * astyle --------- Co-authored-by: marilynias <marilynias57+github@gmail.com> * [Aftershock] Gene Clinics (CleverRaven#79197) * Implement Gene Clinic variant 1 * Renovate Clinic to Add service room. Add Murder Bots and Moxies. Implement powered down gene editor * Add most of the item spawn groups * Add item groups, Monster Spawns, and Mapgen Nests * Add trash to the ground in looted variant. Adjust spawn rates of looted vrs unlooted to 60-40 in the players favor * Geneclinics also spawn without the Exo-Planet * Remove redudant spawn of the larger genetech disposable group, low tier already spawns worker and combat rarely * Mapgen now correctly murders plants when power is out * String fixes for test gods * Slime body can't hold cbms (CleverRaven#79086) * [MoM] Switch mi-go psions to copy-from, giver the mindrender a power-based telepathic attack (CleverRaven#79199) * Initial commit * Kick tests * [Aftershock] Ensure Outfitter always has at least one full EVA suit (CleverRaven#79218) * Outfitter always has at least one full suit. * Lint 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> * Update fema_evacuee_1.json (CleverRaven#79203) --------- Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com> Co-authored-by: Sab Pyrope <99945024+Uwuewsky@users.noreply.github.com> Co-authored-by: moxian <moxian@users.noreply.github.com> Co-authored-by: gettingusedto <78019001+gettingusedto@users.noreply.github.com> Co-authored-by: EliadOArias <2144359102@qq.com> Co-authored-by: Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm <dorchadas@gmail.com> Co-authored-by: Andrew Rosa <dev@andrewhr.io> Co-authored-by: GuardianDll <antisim009@gmail.com> Co-authored-by: Dee Anzorge <d.anzorge@gmail.com> Co-authored-by: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com> Co-authored-by: gisaku33 <jjboyd21@gmail.com> Co-authored-by: Kevin Granade <kevin.granade@gmail.com> Co-authored-by: David Seguin <davidseguin@live.ca> Co-authored-by: 7erracotta <89712754+7erracotta@users.noreply.github.com> Co-authored-by: John Candlebury <johncandlebury@gmail.com> Co-authored-by: Further Reading <roy.healy87+gh@gmail.com> Co-authored-by: osuphobia <78858975+osuphobia@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: PatrikLundell <j.patrik.r.lundell@gmail.com> Co-authored-by: EArias <152629049+EliadOArias@users.noreply.github.com> Co-authored-by: Marc <altairre.atsu@gmail.com> Co-authored-by: akrieger <akrieger@users.noreply.github.com> Co-authored-by: mqrause <martin@qrause.de> Co-authored-by: alef <alef@users.noreply.github.com> Co-authored-by: marilynias <98028585+marilynias@users.noreply.github.com> Co-authored-by: marilynias <marilynias57+github@gmail.com> Co-authored-by: Risuga <oosyrag@gmail.com>
- Loading branch information
31 people
authored
Jan 18, 2025
1 parent
75520f4
commit acc64a7