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

fix(port): npc_at_om_location and u_at_om_location not registering overmap terrains #4168

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Jan 27, 2024

Purpose of change

Fixes #4122 by porting CleverRaven/Cataclysm-DDA#44844 by https://github.com/mlangsdorf

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Checklist

@github-actions github-actions bot added src PR changes related to source code. tests PR changes related to tests labels Jan 27, 2024
Copy link
Contributor

autofix-ci bot commented Jan 27, 2024

The Autofix app has found code style violation and automatically formatted this Pull Request.

I locally edit my commits (e.g: git, github desktop)

Please choose following options:

I'd like to accept the automated commit
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

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

This PR is complete and I don't want to edit it anymore

It's safe to ignore this message.

I edit this PR through web UI

You can ignore this message and continue working.

I have no idea what this message is talking about

You can ignore this message and continue working. If you find any problem, please ask for help and ping @scarf005.

@Zlorthishen Zlorthishen changed the title feat(fix): Issue #4122 - npc_at_om_location along with u_at_om_location don't register overmap terrains feat(port): Issue #4122 - npc_at_om_location along with u_at_om_location don't register overmap terrains Jan 27, 2024
@scarf005 scarf005 changed the title feat(port): Issue #4122 - npc_at_om_location along with u_at_om_location don't register overmap terrains fix(port): npc_at_om_location and u_at_om_location not registering overmap terrains Jan 28, 2024
@scarf005 scarf005 self-assigned this Mar 2, 2024
@scarf005 scarf005 self-requested a review March 2, 2024 01:53
Co-authored-by: Mark Langsdorf <mark.langsdorf@gmail.com>
@Zlorthishen
Copy link
Contributor Author

i dont know where to put the data/json/npcs/TALK_TEST.json file within the framework of Bright Nights codebase

@scarf005
Copy link
Member

scarf005 commented Mar 2, 2024


Starting the actual test at Sat Mar  2 11:12:33 2024
Filters: npc_talk_location

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cata_test-tiles is a Catch v2.13.8 host application.
Run with -? for options

-------------------------------------------------------------------------------
npc_talk_location
-------------------------------------------------------------------------------
/home/scarf/repo/cata/Cataclysm/tests/npc_talk_test.cpp:290
...............................................................................

/home/scarf/repo/cata/Cataclysm/tests/npc_talk_test.cpp:79: FAILED:
  REQUIRE( d.responses.size() == expected_count )
with expansion:
  1 == 2
with messages:
  topic stack: TALK_TEST_LOCATION
  reponse size: 1
  d.responses := { This is a basic test response. }

===============================================================================
test cases:  1 |  0 passed | 1 failed
assertions: 11 | 10 passed | 1 failed

Test world "Tom" left for inspection.
Ended test at Sat Mar  2 11:12:33 2024
The test took 0.037 seconds

...strange, test doesn't work.

@scarf005 scarf005 removed their request for review March 4, 2024 07:54
@scarf005 scarf005 removed their assignment Mar 4, 2024
Copy link
Contributor

autofix-ci bot commented May 24, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src PR changes related to source code. tests PR changes related to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

npc_at_om_location along with u_at_om_location don't register overmap terrains
2 participants