Trigger improvements #636
Merged
Trigger improvements #636
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Try
reviewed
Jun 26, 2024
Try
reviewed
Jun 27, 2024
game/world/world.h
Outdated
| @@ -122,6 +122,7 @@ class World final { | |||
| void triggerEvent(const TriggerEvent& e); | |||
| void triggerChangeWorld(std::string_view world, std::string_view wayPoint); | |||
| void execTriggerEvent(const TriggerEvent& e); | |||
| void addDefTrigger(AbstractTrigger& t); | |||
|
Merged, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This aims at fixing some more trigger quirks.
Apparently movers ignore
fireDelayandsendUntrigger. In #622 issues13.1 the stone gate opens immediately instead of respecting delay and the metal gate doesn't havesendUntriggerset to true, blocking it from opening. I addedretriggerDelayhere as well without testing.Same goes for collision. Part of code in #635 suggests movers can't have it and I confirmed it by testing. CsCamera behave the same way. In sleeper temple are some that could be wrongly triggered by normal walking.
I changed the test for number of npcs in a trigger zone to be any positive number instead of exactly one. There was a case where a number of skeletons following the player would prevent the trigger.
In another case a trigger activated by intersection had a
fireDelay. Because it was not called byWorldObjects::execTriggerEventit did not work. This made it necessary to move the call for population oftriggersDefobject insideAbstractTriggerclass.