[FactionInfo] Expose getter and setter for faction relationships #1951

oznogon · 2023-03-24T05:09:27Z

Add conversion functions for EFactionVsFactionState as a parameter and return value
Replace the overloaded FactionInfo::getState function with separate getRelationshipWith and getRelationshipBetween functions, and replaces usage of FactionInfo::getState with the equivalent getRelationshipBetween

Expose getRelationshipWith to scripting:

human_navy = getFactionInfo("Human Navy")
kraylor = getFactionInfo("Kraylor")
human_kraylor_relationship = kraylor:getRelationshipWith(human_navy) -- returns "enemy"

Add setRelationshipWith

Towards #530.

…tween Distinguish between these two interfaces with more detailed names while facilitating exposure to the scripting interface.

oznogon · 2023-03-24T20:57:50Z

src/factionInfo.cpp

+
+    if (state == FVF_Enemy) { setEnemy(other); }
+    else if (state == FVF_Friendly) { setFriendly(other); }
+    // else if (state == FVF_Neutral) { setNeutral(other); }


If #1953 is merged, uncomment this liine.

Suggested change

// else if (state == FVF_Neutral) { setNeutral(other); }

else if (state == FVF_Neutral) { setNeutral(other); }

oznogon added 3 commits March 23, 2023 21:21

[FactionInfo] Add enum/string conversions for EFactionVsFactionState

048626a

[FactionInfo] Replace overloaded getState with getRelationshipWith/Be…

be9273c

…tween Distinguish between these two interfaces with more detailed names while facilitating exposure to the scripting interface.

[FactionInfo] Expose getRelationshipWith to scripting

2db0bea

oznogon force-pushed the convert-efactionvsfactionstate branch from 3f96c89 to 2db0bea Compare March 24, 2023 05:13

oznogon added 2 commits March 24, 2023 11:26

[FactionInfo] Add setRelationshipWith

6a5a1c4

[FactionInfo] Add setRelationshipWith

785fd20

oznogon changed the title ~~[FactionInfo] Expose getter for faction relationships~~ [FactionInfo] Expose getter and setter for faction relationships Mar 24, 2023

oznogon mentioned this pull request Mar 24, 2023

REQUEST faction tools and relationships #530

Open

oznogon commented Mar 24, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FactionInfo] Expose getter and setter for faction relationships #1951

[FactionInfo] Expose getter and setter for faction relationships #1951

oznogon commented Mar 24, 2023 •

edited

oznogon Mar 24, 2023 •

edited

	// else if (state == FVF_Neutral) { setNeutral(other); }
	else if (state == FVF_Neutral) { setNeutral(other); }

[FactionInfo] Expose getter and setter for faction relationships #1951

Are you sure you want to change the base?

[FactionInfo] Expose getter and setter for faction relationships #1951

Conversation

oznogon commented Mar 24, 2023 • edited

oznogon Mar 24, 2023 • edited

Choose a reason for hiding this comment

oznogon commented Mar 24, 2023 •

edited

oznogon Mar 24, 2023 •

edited