Finished for playtesting

Benzooos · Benzooos · commit 3c137e06717f · 2025-03-25T15:50:45.000+01:00
diff --git a/scenes/levels/ExampleScene.tscn b/scenes/levels/ExampleScene.tscn
diff --git a/scripts/Ally.cs b/scripts/Ally.cs
@@ -48,7 +48,7 @@ public partial class Ally : CharacterBody2D
     private PointLight2D _torch = null!;
     private AiNode _well = null!;
 
-    //Enum with states for ally in darkness, in bigger or smaller circle for map damage system
+    //enum with states for ally in darkness, in bigger or smaller circle for map damage system
     public enum AllyState
     {
         Darkness,
diff --git a/scripts/Interaction/CodeInput.cs b/scripts/Interaction/CodeInput.cs
@@ -1,9 +1,13 @@
+using System;
+using System.Runtime.CompilerServices;
+
 using Godot;
 public partial class CodeInput : Node2D
 {
     private LineEdit _codeinputfield = null!;
     private AnimationPlayer _fadeToWhite = null!;
     private Node2D _victoryScreen = null!;
+    public static Boolean CodeCorrect = false;
     public override void _Ready()
     {
         _codeinputfield = GetTree().Root.GetNode<LineEdit>("Node2D/RuneHolder/CodeInputField");
@@ -24,14 +28,20 @@ private void OnInputSubmitted(string text)
     {
         if (text.Contains("1234"))
         {
-            GD.Print("Game Won");
-            _fadeToWhite.Play("fade_to_white");
+            CodeCorrect = true;
         }
     }
 
     private void OpenTextField()
     {
+        if(!CodeCorrect) {
         _codeinputfield.Visible = true;
         _codeinputfield.GrabFocus();
+        }
+    }
+
+    public void CloseTextField()
+    {
+        _codeinputfield.Visible = false;
     }
 }
diff --git a/scripts/Interaction/Interactable.cs b/scripts/Interaction/Interactable.cs
@@ -22,6 +22,7 @@ public partial class Interactable : Node2D
     private AnimationPlayer _animTree = null!;
     private AnimationPlayer _animEntrance = null!;
     private AnimationPlayer _animDoorOpener = null!;
+    private Sprite2D _keySprite = null!;
 
     public override void _Ready()
     {
@@ -31,6 +32,7 @@ public override void _Ready()
         _animTree = GetTree().Root.GetNode<AnimationPlayer>("Node2D/Node2D/AnimationPlayer");
         _animEntrance = GetTree().Root.GetNode<AnimationPlayer>("Node2D/CaveEntranceTerminal/AnimationPlayer");
         _animDoorOpener = GetTree().Root.GetNode<AnimationPlayer>("Node2D/DoorOpener/AnimationPlayer");
+        _keySprite = GetTree().Root.GetNode<Sprite2D>("Node2D/RuneHolder/Key");
         _scar = GetTree().Root.GetNode<AiNode>("Node2D/Scar");
         if (GetParent().Equals(_scar))
         {
@@ -60,6 +62,18 @@ public async Task Trigger(Node caller)
             ally.Chat.SendSystemMessage(SystemMessageForAlly, new Ally());
         }
 
+        //Open door
+        if (GetParent<AiNode>().Name.Equals("LockedDoor") && caller.Name.ToString().Contains("Ally"))
+        {
+            Ally ally = (caller as Ally)!;
+            if (!ally.SsInventory.ContainsMaterial(Game.Scripts.Items.Material.Key)) {
+                Ally? confirmedAlly = caller as Ally;
+                Chat confirmedAllyChat = confirmedAlly!.Chat;
+                confirmedAllyChat.SendSystemMessage("The door is locked, you cannot enter.", new Ally());
+                return;
+            }
+        }
+
         //Fill bucket with water
         if (GetParent<AiNode>().Name.Equals("Well") && caller.Name.ToString().Contains("Ally"))
         {
@@ -154,7 +168,11 @@ public async Task Trigger(Node caller)
             Ally? james = caller as Ally;
             Chat jonesChat = james!.Chat;
             jonesChat.SendSystemMessage("You've picked up the empty bucket. Maybe fill it with something.", new Ally());
+        }
 
+        if (GetParent<AiNode>().Name.Equals("Key") && caller.Name.ToString().Equals("Ally"))
+        {
+            _keySprite.Visible = false;
         }
 
         EmitSignal(SignalName.Interact);
diff --git a/scripts/Interaction/ShowWhileInRadius.cs b/scripts/Interaction/ShowWhileInRadius.cs
@@ -34,6 +34,11 @@ public partial class ShowWhileInRadius : Node2D
     Boolean _notebookspawned = false;
     AiNode _notebookCode = null!;
     Sprite2D _notebookSprite = null!;
+    Sprite2D _keySprite = null!;
+    CodeInput _codeInput = null!;
+    private CollisionShape2D _smallHouseBarrier= null!;
+
+    private bool _keyExist = false;
 
     // Load the scene you want to instance.   ONLY FOR CHEST INSIDE BIG HOUSE
     private PackedScene _sceneToInstance = null!;
@@ -44,6 +49,9 @@ public override void _Ready()
         _core = GetTree().GetNodesInGroup("Core").Cast<Core>().SingleOrDefault();
         _notebookSprite = GetTree().Root.GetNode<Sprite2D>("Node2D/NotebookWithCode/Notebook_sprite");
         _entitiesList = GetTree().GetNodesInGroup("Entities");
+        _keySprite = GetTree().Root.GetNode<Sprite2D>("Node2D/RuneHolder/Key");
+        _codeInput = GetTree().Root.GetNode<CodeInput>("Node2D/RuneHolder/CodeInput");
+        _smallHouseBarrier = GetTree().Root.GetNode<CollisionShape2D>("Node2D/StaticBody2D/CollisionShape2D");
         float dist = float.MaxValue;
         _notebookSprite.Visible = false;
         foreach (Ally ally in _entitiesList)
@@ -160,6 +168,7 @@ public override void _PhysicsProcess(double delta)
                     //GD.Print("Ally has FestiveStaff: ", allyinv.SsInventory.ContainsMaterial(Game.Scripts.Items.Material.FestiveStaff));
                     if (parentNode.Name == "Rune" && allyinv.GlobalPosition.DistanceTo(parentNode.GlobalPosition) < 250 && allyinv.SsInventory.ContainsMaterial(Game.Scripts.Items.Material.FestiveStaff) && !_ghostspawned)
                     {
+                        
                         GD.Print("Ghost spawned");
                         PackedScene scene = (PackedScene)ResourceLoader.Load("res://scenes/prefabs/ai_node.tscn");
                         AiNode instance = scene.Instantiate<AiNode>();
@@ -188,6 +197,32 @@ public override void _PhysicsProcess(double delta)
                         _notebookCode.ObjectDescription = "A Notebook that contains the code for the runeholder";
                         _notebookCode.CustomOverrideMessage = "Tell the commander that the code for the rune holder is 1234";
                     }
+                    /*
+                    if (parentNode.Name == "Rune" && CodeInput.CodeCorrect && !_keyExist)
+                    {
+                        _keyExist = true;
+                        _codeInput.CloseTextField();
+                        GD.Print("Code correct");
+                        _keySprite.Visible = true;
+                        PackedScene scene = (PackedScene)ResourceLoader.Load("res://scenes/prefabs/ai_node.tscn");
+                        AiNode instance = scene.Instantiate<AiNode>();
+                        instance.ObjectName = "Key";
+                        instance.ObjectDescription = "Maybe usefull to enter some house.";
+                        Interactable keyInteractable = instance.GetNode<Interactable>("Interactible");
+                        Removeable removeable = instance.GetNode<Removeable>("Removeable");
+                        ItemAdder itemAdder = instance.GetNode<ItemAdder>("ItemAdder");
+                        itemAdder.ItemToAdd = Game.Scripts.Items.Material.Key;
+                        itemAdder.Amount = 1;
+                        itemAdder.ItemToAddName = "Key";
+                        _keySprite.AddChild(instance);
+                        GD.Print("Key spawned");
+                    }
+                    */
+                    if(CodeInput.CodeCorrect) {
+                        _smallHouseBarrier.SetDeferred("disabled", true);
+                    }
+                    
+                    
                 }
             }
         }
diff --git a/scripts/Items/InventoryUiSlot.cs b/scripts/Items/InventoryUiSlot.cs
@@ -101,6 +101,11 @@ public void Update(Itemstack item)
                 _icon.Visible = true;
                 _icon.Texture = GD.Load<Texture2D>("res://assets/items/chip_card.png");
                 break;
+
+            case Game.Scripts.Items.Material.Key:
+                _icon.Visible = true;
+                _icon.Texture = GD.Load<Texture2D>("res://Key.png");
+                break;
         }
         _count.Text = item.Amount <= 1 ? "" : item.Amount.ToString();
     }
diff --git a/scripts/PathFindingMovement.cs b/scripts/PathFindingMovement.cs
@@ -10,9 +10,9 @@ public partial class PathFindingMovement : Node
     [Signal] public delegate void ReachedTargetEventHandler();
 
     [Export] private int _minTargetDistance = 40;
-    [Export] private int _targetDistanceVariation = 50; // Not currently used, consider removing or implementing variation
+    [Export] private int _targetDistanceVariation = 50;
     [Export] private int _speed = 250;
-    [Export] int _minimumSpeed = 50;
+    [Export] int _minimumSpeed = 150;
     private int _origMinimumSpeed;
 
     [Export] bool _debug = false;
@@ -22,8 +22,8 @@ public partial class PathFindingMovement : Node
     [Export] Sprite2D _sprite = null!;
 
     public Vector2 TargetPosition { get; set; }
-    private object? _lastCollider = null; // Speichert den letzten Kollisionspartner
-    private bool _recentlyBumped = false; // Verhindert Dauersound
+    private object _lastCollider = null;
+    private bool _recentlyBumped = false;
     private bool _reachedTarget;
     private int _currentTargetDistance;
     private AudioStreamPlayer? _bumpSound = null!;
@@ -44,9 +44,10 @@ public override void _Ready()
     {
         _origMinimumSpeed = _minimumSpeed;
         _currentTargetDistance = _minTargetDistance;
-        this.CallDeferred("ActorSetup"); // Still good to defer setup
+        this.CallDeferred("ActorSetup");
         _bumpSound = GetTree().Root.GetNode<AudioStreamPlayer>("Node2D/AudioManager/bump_sound");
         _buttonControl = GetTree().Root.GetNode<ButtonControl>("Node2D/UI");
+
     }
 
     public async void ActorSetup()
@@ -60,79 +61,82 @@ public void GoTo(Vector2 loc)
         TargetPosition = loc;
     }
 
-public override void _PhysicsProcess(double delta)
-{
-    _speed = 250;
-    _agent.SetTargetPosition(TargetPosition);
-
-    float distanceToTarget = _character.GlobalPosition.DistanceTo(_agent.TargetPosition);
-
-    if (distanceToTarget > _currentTargetDistance)
+    public override void _PhysicsProcess(double delta)
     {
-        _reachedTarget = false;
+        _speed = 250;
 
-        Vector2 currentLocation = _character.GlobalPosition;
-        Vector2 nextLocation = _agent.GetNextPathPosition();
+        _agent.SetTargetPosition(TargetPosition);
 
-        // Motivation und Speed-Berechnung
-        Motivation motivation = GetParent().GetNode<Motivation>("Motivation");
-        double motivationFactor = (double)motivation.Amount / 10;
-        int modifiedSpeed = (int)(_minimumSpeed + (_speed - _minimumSpeed) * motivationFactor);
-
-        // Bewegung berechnen
-        Vector2 newVel = (nextLocation - currentLocation).Normalized() * modifiedSpeed;
-
-        // Richtung für die Animation setzen
-        CurrentDirection = nextLocation.X < currentLocation.X ? WalkingState.Left : WalkingState.Right;
-
-        if (newVel.X != 0 && distanceToTarget > 50)
+        if (_debug)
         {
-            _sprite.FlipH = newVel.X > 0;
+            float distance = _character.GlobalPosition.DistanceTo(_agent.TargetPosition);
+            //GD.Print($"Distance: {distance}, Target Position: {_agent.TargetPosition}");
         }
 
-        // **Langsamer werden bei Zielnähe (weiches Bremsen)**
-        if (distanceToTarget < 50)
+        float distanceToTarget = _character.GlobalPosition.DistanceTo(_agent.TargetPosition);
+
+        if (distanceToTarget > _currentTargetDistance)
         {
-            float slowdownFactor = Mathf.Clamp(distanceToTarget / 50, 0.1f, 1f);
-            newVel *= slowdownFactor;
-        }
+            _reachedTarget = false;
+            Vector2 currentLocation = _character.GlobalPosition, nextLocation = _agent.GetNextPathPosition();
+
+           /* Motivation motivation = GetParent().GetNode<Motivation>("Motivation");
+            double motivationFactor = (double)motivation.Amount / 10;*/
+            int modifiedSpeed = (int)(_minimumSpeed + (_speed - _minimumSpeed) * 2);
+            Ally ally = GetParent().GetParent().GetChild<Ally>(0);
+            Chat chat = ally.FindChild("Speech").GetParent() as Chat ?? throw new InvalidOperationException();
+            _minimumSpeed = (chat!.GeminiService.IsBusy() || ally!.GetResponseQueue().Count > 0 || !ally!.IsTextBoxReady) ? 0 : _origMinimumSpeed; // dont move while responding or if more than one response is being processed.
+            Vector2 newVel = (nextLocation - currentLocation).Normalized() * modifiedSpeed;
+            if (nextLocation.X < currentLocation.X)
+            {
+                CurrentDirection = WalkingState.Left;
+            }
+            else
+            {
+                CurrentDirection = WalkingState.Right;
+            }
 
-        _character.Velocity = newVel;
+            if (newVel.X != 0 && distanceToTarget > 50)
+            {
+                _sprite.FlipH = newVel.X > 0;
+            }
 
-        // Kollisionsabfrage bleibt bestehen
-        KinematicCollision2D collision = _character.MoveAndCollide(newVel * (float)delta);
-        if (collision != null && collision.GetCollider() != _lastCollider)
-        {
-            if ((_character.Name == "Ally" && _buttonControl.CurrentCamera == 1) ||
-                (_character.Name == "Ally2" && _buttonControl.CurrentCamera == 2))
+            _character.Velocity = newVel;
+            KinematicCollision2D collision = _character.MoveAndCollide(newVel * (float)delta);
+            if (collision != null)
             {
-                _lastCollider = collision.GetCollider();
-                _bumpSound!.Play();
-                _recentlyBumped = true;
+                if (collision.GetCollider() != _lastCollider)
+                {
+                    if (_character.Name == "Ally" && _buttonControl.CurrentCamera == 1 || _character.Name == "Ally2" && _buttonControl.CurrentCamera == 2)
+                    {
+                        _lastCollider = collision.GetCollider();
+                        _bumpSound!.Play();
+                        _recentlyBumped = true;
+                    }
+                }
+            }
+            else
+            {
+                _lastCollider = null;
+                _recentlyBumped = false;
             }
-        }
-        else
-        {
-            _lastCollider = null;
-            _recentlyBumped = false;
-        }
-    }
-    else if (!_reachedTarget)
-    {
-        // **Weiches Stoppen statt Teleport**
-        
 
-        if (distanceToTarget < 45f)  // Bei < 3 Pixel Restdistanz stoppen
+            _character.Velocity = newVel;
+        }
+        else if (!_reachedTarget) // only emit and set _reachedTarget once, when the condition is first met
         {
-            _character.Velocity = Vector2.Zero;
-
-            // Idle-Animation aktivieren
-            CurrentDirection = (CurrentDirection == WalkingState.Left) ? WalkingState.IdleLeft : WalkingState.IdleRight;
+            if (CurrentDirection == PathFindingMovement.WalkingState.Left)
+            {
+                CurrentDirection = WalkingState.IdleLeft;
+            }
+            else
+            {
+                CurrentDirection = WalkingState.IdleRight;
+            }
 
-            _currentTargetDistance = _minTargetDistance;
+            _currentTargetDistance = _minTargetDistance; // reset for the next target
             EmitSignal(SignalName.ReachedTarget);
             _reachedTarget = true;
         }
     }
-}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public partial class Ally : CharacterBody2D`
`48`	`48`	`private PointLight2D _torch = null!;`
`49`	`49`	`private AiNode _well = null!;`
`50`	`50`
`51`		`- //Enum with states for ally in darkness, in bigger or smaller circle for map damage system`
	`51`	`+ //enum with states for ally in darkness, in bigger or smaller circle for map damage system`
`52`	`52`	`public enum AllyState`
`53`	`53`	`{`
`54`	`54`	`Darkness,`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,13 @@`
	`1`	`+using System;`
	`2`	`+using System.Runtime.CompilerServices;`
	`3`	`+`
`1`	`4`	`using Godot;`
`2`	`5`	`public partial class CodeInput : Node2D`
`3`	`6`	`{`
`4`	`7`	`private LineEdit _codeinputfield = null!;`
`5`	`8`	`private AnimationPlayer _fadeToWhite = null!;`
`6`	`9`	`private Node2D _victoryScreen = null!;`
	`10`	`+ public static Boolean CodeCorrect = false;`
`7`	`11`	`public override void _Ready()`
`8`	`12`	`{`
`9`	`13`	`_codeinputfield = GetTree().Root.GetNode<LineEdit>("Node2D/RuneHolder/CodeInputField");`
`@@ -24,14 +28,20 @@ private void OnInputSubmitted(string text)`
`24`	`28`	`{`
`25`	`29`	`if (text.Contains("1234"))`
`26`	`30`	`{`
`27`		`- GD.Print("Game Won");`
`28`		`- _fadeToWhite.Play("fade_to_white");`
	`31`	`+ CodeCorrect = true;`
`29`	`32`	`}`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`private void OpenTextField()`
`33`	`36`	`{`
	`37`	`+ if(!CodeCorrect) {`
`34`	`38`	`_codeinputfield.Visible = true;`
`35`	`39`	`_codeinputfield.GrabFocus();`
	`40`	`+ }`
	`41`	`+ }`
	`42`	`+`
	`43`	`+ public void CloseTextField()`
	`44`	`+ {`
	`45`	`+ _codeinputfield.Visible = false;`
`36`	`46`	`}`
`37`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,11 @@ public void Update(Itemstack item)`
`101`	`101`	`_icon.Visible = true;`
`102`	`102`	`_icon.Texture = GD.Load<Texture2D>("res://assets/items/chip_card.png");`
`103`	`103`	`break;`
	`104`	`+`
	`105`	`+ case Game.Scripts.Items.Material.Key:`
	`106`	`+ _icon.Visible = true;`
	`107`	`+ _icon.Texture = GD.Load<Texture2D>("res://Key.png");`
	`108`	`+ break;`
`104`	`109`	`}`
`105`	`110`	`_count.Text = item.Amount <= 1 ? "" : item.Amount.ToString();`
`106`	`111`	`}`