Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{CR} Adds three new lore log snippets! #79058

Merged
merged 13 commits into from
Jan 13, 2025

Conversation

7erracotta
Copy link
Contributor

Summary

Content "adds three new lore log snippets for the player to find in smartphones or laptops"

Purpose of change

The lore log snippets in CDDA are some of my most favorite things in the entire game, and I figured adding a couple would help me familiarize myself with writing them! (so that way I can write more in the future!)

Describe the solution

As said earlier, this just adds 3 new lore log snippets in the game for players to find

Describe alternatives you've considered

N/A

Testing

Wrote out the text in Google Docs, copied and pasted it into the JSON folder, and then edited it out until it was correctly worded and formatted!

Additional context

the lore log snippets are one of my favorite things to be featured in cataclysm, and I wanted to write some of my own!
@github-actions github-actions bot added the [JSON] Changes (can be) made in JSON label Jan 10, 2025
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jan 10, 2025
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jan 11, 2025
@7erracotta
Copy link
Contributor Author

is there anything else that needs to be done? just checking

@Procyonae
Copy link
Contributor

Should hopefully be good now it was just moaning about some non double spaces

@GuardianDll
Copy link
Member

Still moans about double spaces

data/json/snippets/e_logs.json Outdated Show resolved Hide resolved
data/json/snippets/e_logs.json Outdated Show resolved Hide resolved
@GuardianDll
Copy link
Member

plenty more of single spaces

Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • Fergie Hensen's suicide note
  • The video starts with an exhausted-looking white woman with shaggy brown hair clumsily setting her phone onto what you assume to be a table. She then sits back, leaving her face and upper body in frame with a stained wallpaper behind her. "Hello, my name is Fergie Hensen, I am 47 years old and have worked the last 10 years of my life as a neonatal nurse. By the time you see this video, I've committed suicide." She winces and gasps in pain lifting up her left arm - showing a massive bite mark leaking with muddy green pus. "I don't have long before I die - and before I do, I have to say something important, something you MUST remember." She looks back at the camera with a pained half-smile and gritted teeth, speaking with a low but sincere tone. "You, you watching this video, don't ever give up, keep pushing, don't call it quits by killing yourself. Keep going for as long as you can." Her voice trembles and her eyes get watery, "I… believe there are people out there in this hell, people like you, who can make things better." The woman is trying her best to hold back the agonized tears streaming down her disheveled face as her voice starts to crack. "Find happiness and friends wherever you can, and remember you've got a purpose, and that purpose is not only to survive, it's to thrive." She lets out an anguished gasp, nearly doubling over in pain before stammering out "Promise me, please, j-just promise me whoever you are, that you'll do that, please." She then tries to grab the phone off the table to stop recording, but it falls onto the floor the video doesn't end until 7 seconds later. In the time remaining, she languorously picks the phone off the floor and holds it close to her face - it is only then you register just how bloodshot her eyes are.
  • You find a zoomed-in photo of what appears to be a gargantuan brown recluse spider (you guess to be relatively above the size of a cow) lying in wait for its prey in a thick sprawling web strung between multiple pine trees. The sky is cloudy and the area surrounding and including the forest is relatively foggy, but the photos have been edited to make the spider clearer. There is a caption overlaying a semi-transparent gray bar below the spider. "I should've stayed in Atlanta dawg what the FUUCKKKKKK" followed by a crying and laughing emoji.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@GuardianDll GuardianDll merged commit 0d4cea3 into CleverRaven:master Jan 13, 2025
23 of 26 checks passed
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 13, 2025
@7erracotta 7erracotta deleted the newloresnippets branch January 15, 2025 14:06
b3brodie added a commit to b3brodie/Cataclysm-DDA that referenced this pull request Jan 18, 2025
* 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 <[email protected]>

* [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 <[email protected]>
Co-authored-by: Maleclypse <[email protected]>

* {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 <[email protected]>

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

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

* lint changes

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

* replace 3 spaces with 2 spaces

---------

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

* 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 <[email protected]>
Co-authored-by: Maleclypse <[email protected]>
Co-authored-by: Anton Simakov <[email protected]>

* 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 <[email protected]>
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 <[email protected]>

* Aftershock: Genetech Mutation system or Genetically engineered Catgirls. (CleverRaven#79128)

* Aftershock Genetech

* Apply suggestions from code review

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

---------

Co-authored-by: Anton Simakov <[email protected]>
Co-authored-by: Marc <[email protected]>

* [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 <[email protected]>

* 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 <[email protected]>

* [ 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 <[email protected]>

* [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 <[email protected]>
Co-authored-by: Sab Pyrope <[email protected]>
Co-authored-by: moxian <[email protected]>
Co-authored-by: gettingusedto <[email protected]>
Co-authored-by: EliadOArias <[email protected]>
Co-authored-by: Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm <[email protected]>
Co-authored-by: Andrew Rosa <[email protected]>
Co-authored-by: GuardianDll <[email protected]>
Co-authored-by: Dee Anzorge <[email protected]>
Co-authored-by: Standing-Storm <[email protected]>
Co-authored-by: Maleclypse <[email protected]>
Co-authored-by: Anton Simakov <[email protected]>
Co-authored-by: Procyonae <[email protected]>
Co-authored-by: gisaku33 <[email protected]>
Co-authored-by: Kevin Granade <[email protected]>
Co-authored-by: David Seguin <[email protected]>
Co-authored-by: 7erracotta <[email protected]>
Co-authored-by: John Candlebury <[email protected]>
Co-authored-by: Further Reading <[email protected]>
Co-authored-by: osuphobia <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: EArias <[email protected]>
Co-authored-by: Marc <[email protected]>
Co-authored-by: akrieger <[email protected]>
Co-authored-by: mqrause <[email protected]>
Co-authored-by: alef <[email protected]>
Co-authored-by: marilynias <[email protected]>
Co-authored-by: marilynias <[email protected]>
Co-authored-by: Risuga <[email protected]>
Maleclypse added a commit that referenced this pull request Jan 18, 2025
* adjust dreaming spell xp requirements

* remove old xp eoc

* Add max book learn value and use for dream magic type

* method definition fix

* add casting_xp_formula_id which calculates how much xp is gained per cast and add a simple use for dream magic

* add failure cost percent field

* dream spells use 10% mana on failure

* add failure_eocs field to magic_type

* add failure_exp_percent and make dream magic give full xp on failure

* astyle

* documentation

* Fix Conflict (#2)

* 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 (#79113)

* Initial commit

* Add NO_SPELLCASTING to flags too

* Focus the default selection in popups

* [Magiclysm] Biomancy is disturbing (#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 (#79119)

* Extended description window shows potential deconstruction and bash yields (#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 (#79096)

* Remove ghc/filesystem polyfill now that we are on C++17 (#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 (#79091)

* Update toolmod.json

* Lint

---------

Co-authored-by: Anton Simakov <[email protected]>

* [MoM] Fix Leukocyte Accumulation class (#79123)

* Initial commit

* Add magic class

* remove const from distance_limit

* [Xedra Evolved] Fix treesung baselard recipe (#79131)

* Extract special vision descriptions for translation (#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 (#79127)

* Weekly Changelog 2025-01-06 to 2025-01-13

* Apply suggestions from code review

---------

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

* {CR} Adds three new lore log snippets! (#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 <[email protected]>

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

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

* lint changes

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

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

* Update data/json/snippets/e_logs.json

* replace 3 spaces with 2 spaces

---------

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

* Weekly Changelog 2024-12-30 to 2025-01-06 (#78977)

* Weekly Changelog 2024-12-30 to 2025-01-06

* Apply suggestions from code review

---------

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

* Fix Irradiant weapon attack

* Move refugee center start from isolationist to its own scenario (#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 (#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 (#79137)

* Don't try to GENERATE typed coordinates

* Adjusted according to comments

* [MoM] Add null grenades (#79147)

* Initial commit

* Add expended grenades

* Add snippet

* Change id to avoid confusion with _null terrain etc

* Create user mods dir automatically. (#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 <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [Magiclysm] Fix werewolf aura (#79151)

* Initial commit

* Fixes

* typified a-f

* [Magiclysm] Rename 'Introduction to the Divine' to 'The Limits of Magical Recovery' (#79153)

* Initial commit

* Itemgroup changes

* Update data/mods/Magiclysm/items/spellbooks.json

---------

Co-authored-by: Anton Simakov <[email protected]>

* Aftershock: Genetech Mutation system or Genetically engineered Catgirls. (#79128)

* Aftershock Genetech

* Apply suggestions from code review

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

---------

Co-authored-by: Anton Simakov <[email protected]>
Co-authored-by: Marc <[email protected]>

* [Aftershock] Add human++ genemods (#79149)

* Add genemods

* Add hobbies

* Add Genemod: Beauty

* Fix errors

* Spelling

* [Aftershock] UICA Shuttle Bases (#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 (#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 <[email protected]>

* 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 (#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 (#79173)

* Remove evil overloads

* Deal with fallout

* Rename map:: get_global->get_abs, bub_from_abs->get_bub, omt_from_abs->get_omt (#79167)

* Renamed map:: getglobal->get_abs, bub_from_abs->get_bub, omt_from_abs->get_omt

* astyle

* [Magiclysm] Remove duplicate religious professions (#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 <[email protected]>

* [ Xedra Evolved ] Fix Renfield Drops (#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 (#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 (#79191)

* Initial commit

* Implement suggestions from code review

* fix not being able to move items with charges with AIM (#79183)

* fix can move items with charges

* astyle

---------

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

* [Aftershock] Gene Clinics (#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 (#79086)

* [MoM] Switch mi-go psions to copy-from, giver the mindrender a power-based telepathic attack (#79199)

* Initial commit

* Kick tests

* [Aftershock] Ensure Outfitter always has at least one full EVA suit (#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 (#79203)

---------

Co-authored-by: anothersimulacrum <[email protected]>
Co-authored-by: Sab Pyrope <[email protected]>
Co-authored-by: moxian <[email protected]>
Co-authored-by: gettingusedto <[email protected]>
Co-authored-by: EliadOArias <[email protected]>
Co-authored-by: Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm <[email protected]>
Co-authored-by: Andrew Rosa <[email protected]>
Co-authored-by: GuardianDll <[email protected]>
Co-authored-by: Dee Anzorge <[email protected]>
Co-authored-by: Standing-Storm <[email protected]>
Co-authored-by: Maleclypse <[email protected]>
Co-authored-by: Anton Simakov <[email protected]>
Co-authored-by: Procyonae <[email protected]>
Co-authored-by: gisaku33 <[email protected]>
Co-authored-by: Kevin Granade <[email protected]>
Co-authored-by: David Seguin <[email protected]>
Co-authored-by: 7erracotta <[email protected]>
Co-authored-by: John Candlebury <[email protected]>
Co-authored-by: Further Reading <[email protected]>
Co-authored-by: osuphobia <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: EArias <[email protected]>
Co-authored-by: Marc <[email protected]>
Co-authored-by: akrieger <[email protected]>
Co-authored-by: mqrause <[email protected]>
Co-authored-by: alef <[email protected]>
Co-authored-by: marilynias <[email protected]>
Co-authored-by: marilynias <[email protected]>
Co-authored-by: Risuga <[email protected]>

* clang stuff

---------

Co-authored-by: anothersimulacrum <[email protected]>
Co-authored-by: Sab Pyrope <[email protected]>
Co-authored-by: moxian <[email protected]>
Co-authored-by: gettingusedto <[email protected]>
Co-authored-by: EliadOArias <[email protected]>
Co-authored-by: Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm <[email protected]>
Co-authored-by: Andrew Rosa <[email protected]>
Co-authored-by: GuardianDll <[email protected]>
Co-authored-by: Dee Anzorge <[email protected]>
Co-authored-by: Standing-Storm <[email protected]>
Co-authored-by: Maleclypse <[email protected]>
Co-authored-by: Anton Simakov <[email protected]>
Co-authored-by: Procyonae <[email protected]>
Co-authored-by: gisaku33 <[email protected]>
Co-authored-by: Kevin Granade <[email protected]>
Co-authored-by: David Seguin <[email protected]>
Co-authored-by: 7erracotta <[email protected]>
Co-authored-by: John Candlebury <[email protected]>
Co-authored-by: Further Reading <[email protected]>
Co-authored-by: osuphobia <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: EArias <[email protected]>
Co-authored-by: Marc <[email protected]>
Co-authored-by: akrieger <[email protected]>
Co-authored-by: mqrause <[email protected]>
Co-authored-by: alef <[email protected]>
Co-authored-by: marilynias <[email protected]>
Co-authored-by: marilynias <[email protected]>
Co-authored-by: Risuga <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants