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.

Sign up for GitHub

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

Jump to bottom

Feature/npc idle dialogs #333

Merged
merged 19 commits into from
Apr 3, 2024
Merged

Feature/npc idle dialogs #333

merged 19 commits into from
Apr 3, 2024

Conversation

JaXt0r
Copy link
Contributor

@JaXt0r JaXt0r commented Apr 1, 2024 •
edited
Loading

Merge blocked by: #310

To test

  1. Spawn Scar (101) and Arto (102)
  2. Go into Gomez throne room
  3. Listen to them talking

Bonus:
Please record a small audio for Romeyyy. He'll love it. ;-)

Boundary - can be ignored for now ;-) :

  • NPCs don't fully look towards each other
  • They sometimes slightly rotated away from other NPC before next talk
  • If you spawn on a Freepoint where e.g. Arto spawns, it tries to kind of initialize a hero dialog, but fails. Therefore Arto is stuck in place. It's a topic for another PR, but for now: Spawn at a FP/WP where no NPC is right now, please.

JaXt0r added 17 commits February 13, 2024 08:17
@JaXt0r
fix(UseItemToState): Will now execute the animation transistions step…
052993b 
…-by-step and loop once reached. Also called ZS_*_End() when routine changes.
@JaXt0r
fix(Rotation): RotationDirection is now analyzed right. (was reversed…
38f93bf 
… before).
@JaXt0r
fix(AbstractRotateAnimationAction): Do not stop rotation when animati…
0101cd0 
…on is done and speed rotation up.
@JaXt0r
fix(FreePointLocking): Now the collider won't trigger unlock of FP. W…
7417f12 
…e need to do it via logic later. (Otherwise a rotation can already lead to unlocking which is wrong.)
@JaXt0r
Merge branch 'main' into feature/idle-states
73d4fc2 
# Conflicts:
#	Assets/GothicVR/Scripts/Npc/RootCollisionHandler.cs
@JaXt0r
revert(HeadMorph): Logic from something local was applied before.
590bbad
@JaXt0r
fix(FindNpc): Some bugs resolved so that ZS_Talk will now find neares…
5b95889 
…t NPC.
@JaXt0r
fix(DetectNpc): Now aligns with G1 Daedalus documentation and also im…
8a34b77 
…plemented index check and aistate check.
@JaXt0r
fix(DetectNpc): Now aligns with G1 Daedalus documentation and also im…
aee75e4 
…plemented index check and aistate check.
@JaXt0r
optimize(TurnToNpc): Dynamic rotation as other NPC can still walk, wh…
98222f0 
…en NPC wants to talk.
@JaXt0r
revert(TurnToNpc): Dynamic rotation as other NPC can still walk, when…
8c95662 
… NPC wants to talk. - Don't know if this is needed/right...
@JaXt0r
fix(GetNpc): Nullpointer check before getting empty NPCs.
48fa318
@JaXt0r
fix(NpcRotations): Moving from Euler to Quaternion and fixing LookAtN…
4e83f0e 
…pc+TurnToNpc to work at all.
@JaXt0r
Merge branch 'main' into feature/idle-states
237bbad
@JaXt0r
add(SvmOutput): NPC idle dialogs implementation. But SVM file name ca…
78794b7 
…n't be loaded due to the ZenKit exception "Must be DaedalusInstance".
@JaXt0r
Merge branch 'main' into feature/npc-idle-dialogs
94b4b64
@JaXt0r
fix(SvmDialogStringMapping): NPCs now talk to each other.
b5a738b
@JaXt0r JaXt0r requested a review from JucanAndreiDaniel April 1, 2024 16:20
@JaXt0r JaXt0r marked this pull request as ready for review April 1, 2024 16:22
Romeeey
Romeeey approved these changes Apr 1, 2024
View reviewed changes
Copy link
Contributor

@Romeeey Romeeey left a comment

Choose a reason for hiding this comment

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

Function test was successful. I submitted some questions, which would be interesting to be answered but overall the PR is good to go from my side.

JucanAndreiDaniel
JucanAndreiDaniel requested changes Apr 3, 2024
View reviewed changes
Copy link
Contributor

@JucanAndreiDaniel JucanAndreiDaniel left a comment

Choose a reason for hiding this comment

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

Commit e57a63d makes unity crash as there is a stack overflow in DaedalusVM probably because of missing hero instance being properly instanciated

@JaXt0r
Copy link
Contributor Author

JaXt0r commented Apr 3, 2024

Commit e57a63d makes unity crash as there is a stack overflow in DaedalusVM probably because of missing hero instance being properly instanciated

Oh my. What did you do? Any specific FeatureFlags you used etc.? I will try to reproduce to understand...

@JaXt0r
Copy link
Contributor Author

JaXt0r commented Apr 3, 2024

I fixed the hero lookup. Please check again.

@JaXt0r JaXt0r requested a review from JucanAndreiDaniel April 3, 2024 19:47
JucanAndreiDaniel
JucanAndreiDaniel approved these changes Apr 3, 2024
View reviewed changes
Copy link
Contributor

@JucanAndreiDaniel JucanAndreiDaniel left a comment

Choose a reason for hiding this comment

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

go for it :D

@JaXt0r JaXt0r merged commit a5fa85d into main Apr 3, 2024
@JaXt0r JaXt0r deleted the feature/npc-idle-dialogs branch April 3, 2024 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JucanAndreiDaniel JucanAndreiDaniel JucanAndreiDaniel approved these changes

@Romeeey Romeeey Romeeey approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JaXt0r @JucanAndreiDaniel @Romeeey