feat(content,port): `More NPCs` #3917

Zlorthishen · 2023-12-16T00:23:35Z

Purpose of change

This pull request imports several different NPCs. This will make the post-cataclysmic world feel more alive.

Describe the solution

Imports the three following dda prs
~~CleverRaven/Cataclysm-DDA#36287 by Maleclypse~~
CleverRaven/Cataclysm-DDA#57483 by MNG-cataclysm
CleverRaven/Cataclysm-DDA#62134 by MNG-cataclysm

Describe alternatives you've considered

This could work as an standalone mod, but it works better integrated into the vanilla experience.

Testing

Spawned the various maps and verifed that NPCs dialogue options and missions work

Additional context

Co-authored-by: Maleclypse <https://github.com/Maleclypse>
Co-authored-by: MNG-cataclysm <https://github.com/MNG-cataclysm>

autofix-ci · 2023-12-16T00:24:39Z

The Autofix app has automatically formatted this Pull Request.

If you edit your PR on web UI, you can ignore this message.
If you edit your PR locally, YOU MUST DO EITHER OF THE FOLLOWING:

Run git pull to merge the automated commit into your local copy of the PR branch.
Format your code locally, and force push to your PR branch.

If you don't do this, your following work will be based on the old commit, and cause MERGE CONFLICT.

scarf005

Hi, thanks for the port. however, these commits are ported from DDA and thus must be attributed accordingly. could you add attribution to individual commits?

RoyalFox2140

You've left in DDA exclusive items in the dialogue. lc_steel_lump mc_steel_lump and hc_steel_lump are not in BN and are not candidates to port as those are different carbon grades of steel. I am also unsure if we even have muriatic acid in the game. You'll need to playtest the changes and remove references to things that don't exist.

I also may have missed it but I didn't see a blacksmith NPC in this pull that is referenced in the scrapyard questline, we need to either port that blacksmith or remove that quest for now.

I give my overall general approval of the npc's, quest, and dialogue once any JSON issues are ironed out. Asking thoughts on the NPC's from @KheirFerrum as the lore re-writer.

RoyalFox2140 · 2023-12-16T01:10:53Z

@scarf005 The tests won't account for item ID's we're missing from DDA.

scarf005 · 2024-01-09T03:57:55Z

@chaosvolt could you review the changes made since my last review (from 2 weeks ago)?

data/json/mapgen/apartment_con_new.json

chaosvolt · 2024-01-09T06:03:05Z

data/json/mapgen/apartment_con_new.json

+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [
+      [ "apartments_con_tower_113", "apartments_con_tower_013" ],


Is it intended that this be basically identical to the mapgen entry above except for placing the NPC and related zones, by the way? I guess there's no real sane or easy way to shift the ownership and zone placement such that it only triggers if the NPC spawns, though nested chunk or mapgen update stuff could be done to pare this down into just being a fixed chance of spawning in the baseline variant.

data/json/snippets/epilogue_factions.json

chaosvolt

Proposed some easy fixes but moving the epilogues to the existing set of epilogues (honestly with how much other stuff this PR added related to him was redundant I'm surprised he doesn't already HAVE epilogues) will be slightly more complicated than what chance suggestions can do.

data/json/overmap/overmap_terrain/overmap_terrain.json

data/json/overmap/overmap_special/specials.json

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

added Mr. Lapin's faction

chaosvolt

Can't see anything else that stands out as odd so think it's all good, but can let Scarf take a last-minute look at it too.

scarf005

I highly trust CV

could merge once the tests pass.

Lamandus · 2024-03-15T09:43:31Z

data/json/npcs/cabin_chemist/cabin_chemist.json

+      },
+      {
+        "text": "[40$]  I'll buy some aspirin.",
+        "effect": [ { "u_buy_item": "aspirin", "container": "bottle_plastic_pill_prescription", "cost": 4000, "count": 20 } ],


that is the problem. Sadly noone checked the container.

Zlorthishen added 15 commits December 15, 2023 18:04

Update fluff.json

09bf023

Update misc.json

0a3e303

Update misc.json

dc65192

Update overmap_terrain_evac_center.json

7cfbdab

Update specials.json

54dabd2

Update campsite.json

83ea83b

Update ws_survivor_camp.json

854108a

Update moonshine_camp.json

5f8c1d9

Update homeless_camp.json

e0552a9

Update homeless_camp.json

eef1df3

Update apartment_con_new.json

9264bc8

Add files via upload

a2a5d12

Update epilogue_factions.json

5389f45

Update NPC_free_merchant_shopkeep.json

c4bb1a6

Add files via upload

cde1272

github-actions bot added the JSON related to game datas in JSON format. label Dec 16, 2023

style(autofix.ci): automated formatting

dff5679

Zlorthishen changed the title ~~featport (content): More NPCs~~ refactor (content): More NPCs Dec 16, 2023

Zlorthishen marked this pull request as ready for review December 16, 2023 00:31

Update TALK_NPC_moonshiner.json

823101b

scarf005 changed the title ~~refactor (content): More NPCs~~ refactor(content): More NPCs Dec 16, 2023

scarf005 self-requested a review December 16, 2023 01:02

scarf005 self-assigned this Dec 16, 2023

scarf005 changed the title ~~refactor(content): More NPCs~~ feat(content,port): More NPCs Dec 16, 2023

scarf005 requested changes Dec 16, 2023

View reviewed changes

Zlorthishen requested a review from scarf005 December 16, 2023 01:07

RoyalFox2140 requested changes Dec 16, 2023

View reviewed changes

Update scrap_trader.json

b751279

autofix-ci bot and others added 7 commits January 4, 2024 02:55

style(autofix.ci): automated formatting

a903064

Update occupied_lumber_mill.json

b30430e

Update fluff.json

b64623b

style(autofix.ci): automated formatting

fef9357

Update scrap_trader_missions.json

10fce95

Update NPC_free_merchant_shopkeep.json

a317ef6

style(autofix.ci): automated formatting

f42406f

scarf005 requested a review from chaosvolt January 9, 2024 03:57

scarf005 assigned chaosvolt and unassigned scarf005 Jan 9, 2024

chaosvolt reviewed Jan 9, 2024

View reviewed changes

data/json/mapgen/apartment_con_new.json Outdated Show resolved Hide resolved

chaosvolt reviewed Jan 9, 2024

View reviewed changes

data/json/snippets/epilogue_factions.json Outdated Show resolved Hide resolved

chaosvolt requested changes Jan 9, 2024

View reviewed changes

Zlorthishen and others added 9 commits January 10, 2024 17:54

Update data/json/overmap/overmap_special/specials.json

6590a69

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

Update data/json/overmap/overmap_special/specials.json

a6978ce

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

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

f1ddf14

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

Update data/json/overmap/overmap_special/specials.json

59b2735

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

Update epilogue_factions.json

5e3bfa1

Update apartment_con_new.json

3e68af8

Update factions.json

51805c9

added Mr. Lapin's faction

Update Mr_Lapin.json

33d12d1

added Mr. Lapin's faction

style(autofix.ci): automated formatting

584b7ad

chaosvolt approved these changes Jan 11, 2024

View reviewed changes

scarf005 approved these changes Jan 11, 2024

View reviewed changes

chaosvolt merged commit 35d7c1c into cataclysmbnteam:main Jan 11, 2024
9 checks passed

Zlorthishen deleted the More-NPCs branch January 11, 2024 01:43

scarf005 mentioned this pull request Mar 15, 2024

The chemists sells drugs in prescription bottles which do not exist in Bright Nights #4351

Closed

Lamandus reviewed Mar 15, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(content,port): `More NPCs` #3917

feat(content,port): `More NPCs` #3917

Zlorthishen commented Dec 16, 2023 •

edited

Loading

autofix-ci bot commented Dec 16, 2023

scarf005 left a comment

RoyalFox2140 left a comment

RoyalFox2140 commented Dec 16, 2023

scarf005 commented Jan 9, 2024 •

edited

Loading

chaosvolt Jan 9, 2024

chaosvolt left a comment

chaosvolt left a comment

scarf005 left a comment •

edited

Loading

Lamandus Mar 15, 2024

feat(content,port): More NPCs #3917

feat(content,port): More NPCs #3917

Conversation

Zlorthishen commented Dec 16, 2023 • edited Loading

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

autofix-ci bot commented Dec 16, 2023

scarf005 left a comment

Choose a reason for hiding this comment

RoyalFox2140 left a comment

Choose a reason for hiding this comment

RoyalFox2140 commented Dec 16, 2023

scarf005 commented Jan 9, 2024 • edited Loading

chaosvolt Jan 9, 2024

Choose a reason for hiding this comment

chaosvolt left a comment

Choose a reason for hiding this comment

chaosvolt left a comment

Choose a reason for hiding this comment

scarf005 left a comment • edited Loading

Choose a reason for hiding this comment

Lamandus Mar 15, 2024

Choose a reason for hiding this comment

feat(content,port): `More NPCs` #3917

feat(content,port): `More NPCs` #3917

Zlorthishen commented Dec 16, 2023 •

edited

Loading

scarf005 commented Jan 9, 2024 •

edited

Loading

scarf005 left a comment •

edited

Loading