feature/showcase_bugfixing_kathi_partII #16

Merged
Jonathan merged 33 commits from feature/showcase_bugfixing_kathi_partII into develop 2025-10-24 18:31:56 +02:00
4 changed files with 10 additions and 2 deletions
Showing only changes of commit eeb56fd7ad - Show all commits
+1 -1
View File
@@ -11,4 +11,4 @@ ifquest res://resources/quests/demo/2_collect_ducks.tres, 1:
join Yeli right join Yeli right
Yeli: Have you collected all the ducks yet? Yeli: Have you collected all the ducks yet?
[end_timeline] [end_timeline]
No dialogue for active quest "{ACTIVEQUEST}" Yeli doesn't seem to have anything to say...
+1
View File
@@ -224,6 +224,7 @@ scale = Vector2(0.7, 0.7)
script = ExtResource("44_aqu1t") script = ExtResource("44_aqu1t")
itemToToggle = NodePath("../TalkingControl/AnimatedSprite") itemToToggle = NodePath("../TalkingControl/AnimatedSprite")
[connection signal="FinishedTalking" from="." to="InteractionArea" method="SetActiveInverse"]
[connection signal="Talking" from="." to="Dialogic starter" method="open"] [connection signal="Talking" from="." to="Dialogic starter" method="open"]
[connection signal="Interacted" from="InteractionArea" to="." method="ToggleTalking"] [connection signal="Interacted" from="InteractionArea" to="." method="ToggleTalking"]
[connection signal="timelineEnded" from="DialogicToggle" to="." method="ToggleTalking"] [connection signal="timelineEnded" from="DialogicToggle" to="." method="ToggleTalking"]
@@ -26,6 +26,10 @@ public partial class InteractionArea2D : Node2D
set => _active = value; set => _active = value;
} }
public void SetActiveInverse(bool active)
{
IsActive = !active;
}
public override void _Ready() public override void _Ready()
{ {
@@ -12,7 +12,8 @@ public partial class TalkingCharacter : Node2D
private int _timelineIndex = 0; private int _timelineIndex = 0;
[Signal] public delegate void TalkingEventHandler(string timelineName); [Signal] public delegate void TalkingEventHandler(string timelineName);
[Signal] public delegate void FinishedTalkingEventHandler(bool hasTimeLinesToPlay);
public override void _Ready() public override void _Ready()
{ {
ToggleTalking(); ToggleTalking();
@@ -37,5 +38,7 @@ public partial class TalkingCharacter : Node2D
} }
if (_sprite != null) if (_sprite != null)
_sprite.Play(); _sprite.Play();
EmitSignal(SignalName.FinishedTalking, _timelineIndex >= _timelinesToPlay.Length);
} }
} }