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.

Sign up for GitHub

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

Jump to bottom

More npc locations revived #57483

Merged
merged 90 commits into from
Jul 17, 2022
Merged

More npc locations revived #57483

merged 90 commits into from
Jul 17, 2022

Conversation

MNG-cataclysm
Copy link
Contributor

Summary

Content "Add more NPC locations"

Purpose of change

The purpose of this change is to add more places where NPC's can spawn, either alone or in groups; providing a greater variety within the world of Cataclysm.

This adds more NPC's in various places. Currently, two random lone NPC's will spawn at evac shelters and homeless camps. This also adds a homeless camp with a group of survivors; so far including a chain of missions and an ability to trade. Additionally, this adds several new varieties of evac shelters.

Essentially, this is a revival of pull request #55196, with great thanks to onura46 for resurrecting it.

Describe the solution

This branch contains the same content as #55196, adding various NPCs to the world of Cataclysm. onura46 added cooldown timers for certain rare products sold by the chemist, fleshed out dialogue, and had the player spawn in the basement of the evac shelter for the “Infested Shelter” challenge start.

Describe alternatives you've considered

None

Testing

According to onura46, all code runs smoothly and works as intended.

Additional context

The original content was inspired by two Discourse boards, seen below:

https://discourse.cataclysmdda.org/t/more-evac-shelter-varieties/27336/9

https://discourse.cataclysmdda.org/t/npc-s-what-do-you-want-changed-and-improved/27102/18

@MNG-cataclysm
Update recipe_deconstruction.json
7d2a174
@MNG-cataclysm
Update recipe_deconstruction.json
6f513d4
@MNG-cataclysm
Update recipe_deconstruction.json
8fec58b
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
c3b6616
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
73fd737
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
e96b17f
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
dd8028e
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
56bf91d
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
c23fda0
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
23b7e20
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
24bd3c2
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
6fdf923
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
b64c87d
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
aea1769
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
8177874
@MNG-cataclysm
Merge branch 'CleverRaven:master' into master
d53965d
@MNG-cataclysm
Add files via upload
0db490f
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Missions Quests and missions Scenarios New Scenarios, balancing, bugs with scenarios Spawn Creatures, items, vehicles, locations appearing on map astyled astyled PR, label is assigned by github actions labels May 6, 2022
@github-actions
Copy link
Contributor

github-actions bot commented May 6, 2022

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

Click to expand
  • Do you have the magnetrons?
  • Obtain 25 magnetrons in exchange for credit with the scrap merchant.
  • Since business is increasing around here, I've decided to start selling more specialized metal. Problem is, I can't separate the metal out. Fortunately, I found some old schematics on a machine for this sort of thing. If you could get me 25 magnetrons, I can melt down the sorted stuff into bars. I can quickly pay you in raw materials.
  • The last thing I really need to get going is hydrochloric acid. It's one of those chemicals that's just perfect for so many things. An acidifying reagent, and one of the best. With a large supply of hydrochloric acid, you and I are only a few steps removed from a stable source of antiseptic, fungicide, and even some light explosives! As the only apparent health authority left, I do have to warn you not to get it on your skin, though. Find this for me and I'll sell you whatever I can make.

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.

@MNG-cataclysm MNG-cataclysm mentioned this pull request May 6, 2022
Closed
@Zireael07
Copy link
Contributor

Finally, the PR looks ok at first glance :)

@anothersimulacrum
Copy link
Member

anothersimulacrum commented May 6, 2022 •
edited
Loading

It doesn't quite to me - looks like line endings are changed in one file, and there are several other large files diffs here, which I can't look at much on phone. Also, the filenames contain spaces.

@Zireael07
Copy link
Contributor

But at least there are no extraneous commits, so a step in the right direction ;)

@haveric
Copy link
Contributor

haveric commented May 6, 2022

But at least there are no extraneous commits, so a step in the right direction ;)

It's a lot better than before! I feel like there are 3-4 things going on here that could/should still be broken up though for easier review and testing, but it'll be easier to see once line endings are fixed.

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label May 12, 2022
@MNG-cataclysm
Copy link
Contributor Author

MNG-cataclysm commented May 13, 2022 •
edited
Loading

I merged your PR, and I don't see no problem with the spawn adjustments. Don't worry about the reviews, I just hope you enjoy your week.

@github-actions github-actions bot added the NPC / Factions NPCs, AI, Speech, Factions, Ownership label Jun 5, 2022
@MNG-cataclysm
Copy link
Contributor Author

I resolved the conflict listed in the scenario file.

@Maleclypse
Copy link
Member

Ok so to review a gigantic mapgen PR with 4k lines I need you to take screenshots of the locations in game, please. I'll review the non mapgen parts now and come back and review the maps once I can compare them to the screenshots. Thanks!

Maleclypse
Maleclypse requested changes Jun 28, 2022
View reviewed changes
Copy link
Member

@Maleclypse Maleclypse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK I've stopped reviewing this because there are numerous places where the tests have told you that there is a mistake and how to fix it and you haven't fixed them. That's what is stalling out this PR. I've corrected them up to where I stopped but there may be more. Please correct the errors that are causing the tests to fail and let me know and I'll review.

data/json/items/fluff.json Outdated Show resolved Hide resolved
data/json/npcs/cabin_chemist/chemist_missions.json Outdated Show resolved Hide resolved
data/json/npcs/isolated_road/isolated_road_cody_dialogue.json Show resolved Hide resolved
data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json Show resolved Hide resolved
data/json/npcs/lumbermill_employees/lumbermill_missions.json Outdated Show resolved Hide resolved
data/json/npcs/other/homeless/group_camp/TALK_homeless_broker.json Outdated Show resolved Hide resolved
data/json/npcs/other/homeless/group_camp/TALK_homeless_broker.json Outdated Show resolved Hide resolved
data/json/npcs/other/homeless/group_camp/TALK_homeless_broker.json Outdated Show resolved Hide resolved
@MNG-cataclysm
Copy link
Contributor Author

@Maleclypse I'm sorry I didn't get to this after we spoke on Discord, I was on vacation.

@Maleclypse
Copy link
Member

@Maleclypse I'm sorry I didn't get to this after we spoke on Discord, I was on vacation.

No stress. :)

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 7, 2022
@MNG-cataclysm
Copy link
Contributor Author

MNG-cataclysm commented Jul 9, 2022 •
edited
Loading

@Maleclypse I fixed the errors in the altered JSON files, the only errors now come from the Clang 12 build matrix, giving some errors on item density compared to max density ( CHECK( item_density <= max_density ) ). For how little the PR deals in items, I don't know why the matrix finds that unacceptable. I also don't know how to fix it.
Anyway, I fixed the errors you told me about in the "Basic Build and Test" General Build Matrix.

Maleclypse
Maleclypse approved these changes Jul 17, 2022
View reviewed changes
Copy link
Member

@Maleclypse Maleclypse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are great additions. I appreciate you fixing the errors that were blocking this.

@dseguin dseguin merged commit 3e2c598 into CleverRaven:master Jul 17, 2022
@MNG-cataclysm MNG-cataclysm deleted the more_npc_locations_revived branch July 17, 2022 15:01
pjf added a commit to pjf/Cataclysm-DDA that referenced this pull request Jul 18, 2022
@pjf
Merge remote-tracking branch 'origin/master' into play_2022
5d90ce4 
* origin/master:
  More npc locations revived (CleverRaven#57483)
  Add FBI Paranormal Investigator profession to Xedra Evolved (CleverRaven#59316)
  allow using nearby items to start or quench fires (CleverRaven#59317)
  Fix summon time (CleverRaven#59318)
  Self aware sidebar health widgets (CleverRaven#59319)
  Add test to prune item density known bad list (CleverRaven#59324)
  Optional widget color scale `breaks` (CleverRaven#59336)
  Sidebar widgets rel. weight carried / overburdened (CleverRaven#59330)
  [DinoMod] stegoceras and egg and dung rebalance (CleverRaven#59343)
  Add FIREWOOD to twigs and leaves, adjust twig volume (CleverRaven#59345)
  fix: guns spawning with double shoulder straps (CleverRaven#59346)
  Appease clang-tidy: move cata::mdarray to heap (CleverRaven#59335)
  Playtest fixes + Shaman doesn't override medical resident
  Miner, fisher & four hunters
  Shaman & Backpacker
@MNG-cataclysm MNG-cataclysm mentioned this pull request Jul 26, 2022
Merged
8 tasks
@onura46 onura46 mentioned this pull request Aug 20, 2022
Merged
@MNG-cataclysm MNG-cataclysm mentioned this pull request Nov 8, 2022
Merged
This was referenced Jan 10, 2023
Closed
Closed
@Zlorthishen Zlorthishen mentioned this pull request Dec 16, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haveric haveric haveric left review comments

@bombasticSlacks bombasticSlacks bombasticSlacks left review comments

@onura46 onura46 onura46 left review comments

@Maleclypse Maleclypse Maleclypse approved these changes

Assignees
No one assigned
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 Map / Mapgen Overmap, Mapgen, Map extras, Map display Missions Quests and missions NPC / Factions NPCs, AI, Speech, Factions, Ownership Scenarios New Scenarios, balancing, bugs with scenarios Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@MNG-cataclysm @Zireael07 @anothersimulacrum @haveric @dseguin @onura46 @snipercup @Maleclypse @bombasticSlacks