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

npc: allied NPCs aren't shopkeepers #62146

Merged
merged 1 commit into from Nov 10, 2022

Conversation

andrei8l
Copy link
Contributor

@andrei8l andrei8l commented Nov 9, 2022

Summary

None

Purpose of change

Allied "shopkeepers" improperly run some shopkeeper code since #62009

Describe the solution

Make sure allied NPCs aren't shopkeepers

Describe alternatives you've considered

N/A

Testing

  1. Spawn an NPC and change its class to NC_HUNTER, which has a shopkeeper_item_group defined
  2. Ally the NPC and open the trade ui
  3. Verify (lack of) fallback zones

Additional context

Fixes the issue from this reddit thread
I was pretty sloppy with #62009 and I'm sorry

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` NPC / Factions NPCs, AI, Speech, Factions, Ownership json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 9, 2022
@Fris0uman
Copy link
Contributor

There are no cases where we want an ally NPC to behave like a shopkeeper?

@andrei8l
Copy link
Contributor Author

andrei8l commented Nov 9, 2022

There are no cases where we want an ally NPC to behave like a shopkeeper?

I don't think so, as it'd be pretty hard to justify them restocking out of the ether while following the player around. It's also (currently) assumed elsewhere in code that allied NPCs always trade for free.

@Fris0uman Fris0uman merged commit f63f534 into CleverRaven:master Nov 10, 2022
@andrei8l andrei8l deleted the random-npc-no-shop branch November 10, 2022 14:24
@NetSysFire NetSysFire added the <Bugfix> This is a fix for a bug (or closes open issue) label Nov 10, 2022
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 <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants