2 additional AI turn actions #718
Open
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
Jan 15, 2025
Try
reviewed
Jan 15, 2025
All characters (except only the humans in Gothic 2) have T_SURPRISE_CW and T_SURPRISE_CCW animations used in the whirl-around type of movement. This is mainly used in Gothic 1 to portray a different style of turning to an enemy or surprising event. This adds the animation to the solver. Normally the whirl animation should not happen in water, but keep the case around just to be on the save side.
There are multiple turning variants (regular, whirl, away) that all will need the same preparation steps, so move them to a separate function for re-use.
It is supposed to be a faster version of AI_TurnToNpc and seemlingly used in Gothic 1 in a number of places. It's for example used when the player draws a weapon behind an NPC but also with the Firedaemon in Xardas' tower.
Defined as 'npc' turns away from 'other', just like turnTo but +180 degrees. One user is for example Baal Netbek in the swamp where the player character ends the dialog with turning away saying "This guy won't be of help", the other example is the fire demon in Xardas' tower, where the player first turns away before whirling back to the demon.
|
With the underlying rotation issues out of the way I think I found a nice way for those two turn variants now. |
Try
reviewed
Feb 2, 2025
| @@ -519,3 +521,9 @@ enum class AaPreset : uint32_t { | |||
| ULTRA, | |||
| PRESETS_COUNT | |||
| }; | |||
|
|
|||
| enum TurnAnim : uint8_t { | |||
There was a problem hiding this comment.
Should be moved into AnimationSolver, similar to AnimationSolver::Anim.
| @@ -812,7 +812,7 @@ Vec2 Pose::headRotation() const { | |||
| return Vec2(headRotX,headRotY); | |||
| } | |||
|
|
|||
| void Pose::setAnimRotate(const AnimationSolver &solver, Npc &npc, WeaponState fightMode, int dir) { | |||
| void Pose::setAnimRotate(const AnimationSolver &solver, Npc &npc, WeaponState fightMode, enum TurnAnim turn, int dir) { | |||
There was a problem hiding this comment.
enum TurnAnim turn
In opengothic we are not using enum or struct as part of function signature. In C++ you don't need to.
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.
AI_WhirlAround is doing the same as ai_turntonpc, just faster.
The script does not contain specific values for whirl-speed, so just use
double of the NPc's turn-speed.
AI_turnaway does what the name implies and turns the back to the npc.
There might be a nicer way to calculate that angle than in my code.