Skip to content

[core] [lua] Make GEO trusts untargetable#10083

Draft
WinterSolstice8 wants to merge 1 commit into
LandSandBoat:basefrom
WinterSolstice8:geo_trust_untargetable
Draft

[core] [lua] Make GEO trusts untargetable#10083
WinterSolstice8 wants to merge 1 commit into
LandSandBoat:basefrom
WinterSolstice8:geo_trust_untargetable

Conversation

@WinterSolstice8
Copy link
Copy Markdown
Contributor

I affirm:

  • I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
  • I understand I should leave resolving conversations to the LandSandBoat team so that reviewers won't miss what was said.
  • I have read and understood the Contributing Guide and the Code of Conduct.
  • I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.

What does this pull request do?

Make GEO trusts untargetable

Steps to test these changes

Spot check with curaga, ancient circle, mob aoe TP moves, etc

@WinterSolstice8 WinterSolstice8 added the hold On hold, pending further action/info label May 21, 2026
@WinterSolstice8 WinterSolstice8 force-pushed the geo_trust_untargetable branch from 8e93ebd to 2fb4804 Compare May 21, 2026 16:40
Comment thread src/map/utils/trustutils.cpp Outdated
struct TrustData
{
uint32 trustID{};
bool isGeoTrust{};
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this not misleading, given that Sylvie exists?

Comment thread src/map/utils/trustutils.cpp Outdated
auto LoadTrust(CCharEntity* PMaster, uint32 TrustID) -> CTrustEntity*;
void LoadTrustStatsAndSkills(CTrustEntity* PTrust);

static std::map<SpellID, bool> geoTrustIDs = {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This can be an unordered set

Comment thread src/map/entities/trustentity.cpp Outdated

bool CTrustEntity::GetUntargetable() const
{
if (m_isGeoTrust)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This override is good, but can we instead use the job GEO without a subjob? Or something along those lines, so we let Sylvie through and block the others?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Changed the naming to be more obvious of the real intent and not purely "job" based though that was largely just a coincidence

@WinterSolstice8 WinterSolstice8 force-pushed the geo_trust_untargetable branch 2 times, most recently from 1862b66 to 94c090c Compare May 21, 2026 17:46
@WinterSolstice8 WinterSolstice8 force-pushed the geo_trust_untargetable branch from 94c090c to ae200a2 Compare May 21, 2026 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hold On hold, pending further action/info

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants