More story progression

Author: Benzooos

scenes/levels/CaveTileset.tres

@@ -559,7 +559,7 @@ texture_region_size = Vector2i(32, 32)
 19:3/0 = 0
 19:1/0 = 0
 20:1/0 = 0
-20:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
+20:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-13.5, -13, -7.75, -16, 5, -16, 4.75, -7.75, 6, -2.75, -7, 4.25, -12.25, 0.5)
 20:0/0 = 0
 
 [resource]

scenes/levels/ExampleScene.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=132 format=4 uid="uid://dfkwq6qwtxw25"]
+[gd_scene load_steps=133 format=4 uid="uid://dfkwq6qwtxw25"]
 
 [ext_resource type="Script" path="res://scripts/EnemyManager.cs" id="1_bmkfv"]
 [ext_resource type="Script" path="res://scripts/Map.cs" id="1_pa1ge"]
@@ -14990,14 +14990,18 @@ size = Vector2(190.043, 242.52)
 a = Vector2(-14, -120)
 b = Vector2(-14, 132)
 
+[sub_resource type="SegmentShape2D" id="SegmentShape2D_k0qre"]
+a = Vector2(-11, -257)
+b = Vector2(-11, -7)
+
 [node name="Node2D" type="Node2D"]
 position = Vector2(2595, 2509)
 script = ExtResource("1_pa1ge")
 _darknessCircleDamage = 1
 _allyHealthChangeIntervall = 5.0
 
 [node name="Ally" parent="." node_paths=PackedStringArray("_responseField", "_nameLabel", "Chat", "_animPlayer") instance=ExtResource("6_l8h37")]
-position = Vector2(923, 2052)
+position = Vector2(5780, -4309)
 _responseField = NodePath("ResponseField")
 _nameLabel = NodePath("Label")
 _visionRadius = 200
@@ -15098,10 +15102,11 @@ shadow_filter_smooth = 2.3
 texture_scale = 14.0
 
 [node name="Ally2" parent="." node_paths=PackedStringArray("_responseField", "_nameLabel", "Chat", "_animPlayer") groups=["navigation"] instance=ExtResource("6_l8h37")]
-position = Vector2(289, 2015)
+position = Vector2(7410, -6307)
 _responseField = NodePath("ResponseField")
 _nameLabel = NodePath("Label")
 _visionRadius = 200
+_interactionRadius = 250
 Chat = NodePath("Ally2Cam/Ally2Chat")
 _animPlayer = NodePath("AnimationPlayer2")
 
@@ -15355,16 +15360,17 @@ position = Vector2(8600, -2333)
 scale = Vector2(0.999999, 0.999999)
 
 [node name="InsideBigHouse" type="Node2D" parent="Abandoned Village/Sprite2D"]
+z_index = 2
 position = Vector2(-221, -475.001)
 script = ExtResource("25_0y114")
 SceneToShow = ExtResource("26_vmw0c")
 Radius = 500
-NeedsToBeInInventoryName = 11
+ItemActivationStatus = false
 
 [node name="InsideBigHouse2" parent="Abandoned Village/Sprite2D" instance=ExtResource("26_vmw0c")]
 z_index = 30
 position = Vector2(-222, -200.001)
-scale = Vector2(3.7, 3.7)
+scale = Vector2(3.7, 6.5)
 
 [node name="VisibleForAI" type="Node2D" parent="Abandoned Village/Sprite2D"]
 script = ExtResource("6_7bcmx")
@@ -15383,17 +15389,6 @@ WalkingObject = NodePath("../../../../Ally")
 WalkingObject2 = NodePath("../../../../Ally2")
 Sound = NodePath("../../../../AudioManager/door_sound")
 
-[node name="InsideSmallHouse" parent="Abandoned Village/Sprite2D" instance=ExtResource("19_qd0ov")]
-z_index = 30
-position = Vector2(550.001, 1808)
-scale = Vector2(4, 5)
-
-[node name="ShowWhileInRadius" type="Node2D" parent="Abandoned Village/Sprite2D"]
-position = Vector2(540, 1479)
-script = ExtResource("25_0y114")
-SceneToShow = ExtResource("19_qd0ov")
-Radius = 500
-
 [node name="HauntedForestVillageAiNode" parent="Abandoned Village" instance=ExtResource("13_05imv")]
 position = Vector2(8649, -1315)
 scale = Vector2(3, 3)
@@ -15411,6 +15406,22 @@ script = ExtResource("24_sabha")
 MusicPlayer1 = NodePath("../../AudioManager/game_music")
 MusicPlayer2 = NodePath("../../AudioManager/creepy_music")
 
+[node name="Node2D" type="Node2D" parent="Abandoned Village"]
+
+[node name="Sprite2D" type="Sprite2D" parent="Abandoned Village/Node2D"]
+
+[node name="InsideSmallHouse" parent="Abandoned Village/Node2D/Sprite2D" instance=ExtResource("19_qd0ov")]
+z_index = 30
+position = Vector2(9150, -525.002)
+scale = Vector2(4, 4.99999)
+
+[node name="InsideSmallHouse2" type="Node2D" parent="Abandoned Village/Node2D/Sprite2D"]
+position = Vector2(9140, -854.001)
+scale = Vector2(0.999999, 0.999999)
+script = ExtResource("25_0y114")
+SceneToShow = ExtResource("19_qd0ov")
+Radius = 500
+
 [node name="Spaceport" type="Node" parent="."]
 
 [node name="Tilemap Layers" type="Node" parent="Spaceport"]
@@ -15838,37 +15849,35 @@ tile_map_data = PackedByteArray("AAASACMAAAAFAAQAAAATACcAAAAFAAQAAAAWACgAAAAGAAU
 tile_set = SubResource("TileSet_tur7q")
 
 [node name="Big Tree" parent="." instance=ExtResource("13_05imv")]
-unique_name_in_owner = true
-position = Vector2(5562, -7925)
+position = Vector2(5567, -7879)
 ObjectName = "Big Tree"
 ObjectDescription = "A massive tree that is surrounded by scrub and looks damaged"
-CustomOverrideMessage = "You've successfully removed the scrub from the tree and are now able to reach it"
+CustomOverrideMessage = "You've successfully removed the scrub from the tree and a big hideous scar appears underneath it"
 ShowWhileInRadius = true
 
 [node name="StaticBody2D" type="StaticBody2D" parent="Big Tree"]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Big Tree/StaticBody2D"]
 z_index = 50
-position = Vector2(100, -141)
+position = Vector2(95, -200)
 rotation = -1.56722
 shape = SubResource("RectangleShape2D_g520r")
 
-[node name="CaveEntrance" parent="." instance=ExtResource("13_05imv")]
+[node name="CaveEntranceTerminal" parent="." instance=ExtResource("13_05imv")]
 unique_name_in_owner = true
-position = Vector2(2025, -8275)
-ObjectName = "Cave entrance"
+position = Vector2(2086, -8391)
+ObjectName = "Cave entrance terminal"
 ObjectDescription = "Seems like a locked entracne with a small terminal next to it. Maybe there is some nfc device needed to enter."
-Interactable = false
 CustomOverrideMessage = "The door opens slowly and a big dark cave apperas behind it"
 
-[node name="StaticBody2D" type="StaticBody2D" parent="CaveEntrance"]
+[node name="StaticBody2D" type="StaticBody2D" parent="CaveEntranceTerminal"]
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="CaveEntrance/StaticBody2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="CaveEntranceTerminal/StaticBody2D"]
 z_index = 1
+position = Vector2(-60, 114)
 shape = SubResource("SegmentShape2D_i54bb")
 
 [node name="Scar" parent="." instance=ExtResource("13_05imv")]
-unique_name_in_owner = true
 position = Vector2(5613, -8059)
 ObjectName = "Scar"
 ObjectDescription = "A big scar on the tree which could be the reason for the tree looking dead. It is not reachable because of the scrub"
@@ -15883,17 +15892,39 @@ ObjectDescription = "can be used to fill an empty bucket with water"
 RemovedAfter = false
 CustomOverrideMessage = "the ally now has a water bucket"
 
-[node name="InsideBigTree" type="Node2D" parent="."]
+[node name="DoorOpener" parent="." instance=ExtResource("13_05imv")]
+position = Vector2(-1917, -7812)
+ObjectName = "Door opener"
+ObjectDescription = "Seems like a door can be opened through interacting. There is a timer that starts when the door opens, so there is only a limited amount of time to pass it."
+RemovedAfter = false
+CustomOverrideMessage = "Door is now open for 5 seconds"
+
+[node name="StaticBody2D" type="StaticBody2D" parent="DoorOpener"]
+
+[node name="CaveEntrance1" type="CollisionShape2D" parent="DoorOpener/StaticBody2D"]
+z_index = 2
+position = Vector2(-25, -835)
+shape = SubResource("SegmentShape2D_k0qre")
+
+[node name="StaticBody2D2" type="StaticBody2D" parent="DoorOpener"]
+
+[node name="CaveEntrance2" type="CollisionShape2D" parent="DoorOpener/StaticBody2D2"]
+z_index = 2
+position = Vector2(-541, -834)
+shape = SubResource("SegmentShape2D_k0qre")
+
+[node name="Node2D" type="Node2D" parent="."]
+
+[node name="Sprite2D" type="Sprite2D" parent="Node2D"]
 position = Vector2(5613, -8059)
 
-[node name="InsideBigTree" parent="InsideBigTree" instance=ExtResource("58_llp75")]
+[node name="InsideBigTree" parent="Node2D/Sprite2D" instance=ExtResource("58_llp75")]
 z_index = 30
 position = Vector2(114, 58)
 scale = Vector2(2.5, 2.5)
 
-[node name="ShowWhileInRadius" type="Node2D" parent="InsideBigTree"]
+[node name="ShowWhileInRadius" type="Node2D" parent="Node2D/Sprite2D"]
 scale = Vector2(2.5, 2.5)
 script = ExtResource("25_0y114")
 SceneToShow = ExtResource("58_llp75")
-Radius = 100
-ItemActivationStatus = false
+Radius = 500

scripts/Ally.cs

@@ -25,8 +25,6 @@ public partial class Ally : CharacterBody2D
     protected Game.Scripts.Core _core = null!;
     public Inventory SsInventory = new Inventory(12);
     private AudioOutput _audioOutput = null!;
-    private AiNode _caveEntrance = null!;
-    private AiNode _scar = null!;
 
 
     private RichTextLabel _ally1ResponseField = null!, _ally2ResponseField = null!;
@@ -36,6 +34,7 @@ public partial class Ally : CharacterBody2D
     private bool _interactOnArrival, _busy, _reached, _harvest, _returning;
     public bool IsTextBoxReady = true, Lit;
 
+    public bool AnimationIsAlreadyPlaying = false;
 
     [Export] public Chat Chat = null!;
     public Map? Map;
@@ -76,9 +75,6 @@ public override void _Ready()
         // SsInventory.AddItem(new Itemstack(Items.Material.Copper, 1));
         SsInventory.AddItem(new Itemstack(Items.Material.BucketWater, 1));
         _torch = GetNode<PointLight2D>("AllyTorch");
-        _caveEntrance = GetNode<AiNode>("%CaveEntrance");
-        _scar = GetNode<AiNode>("%Scar");
-
         _ally1ResponseField = GetNode<RichTextLabel>("ResponseField");
         _ally2ResponseField = GetNode<RichTextLabel>("ResponseField");
         _audioOutput = Chat.GetNode<AudioOutput>("Speech");
@@ -178,6 +174,22 @@ public void SetAllyInDarkness()
 
     }
 
+    private void playPlayerAnimation(){
+        if (PathFindingMovement.CurrentDirection == PathFindingMovement.WalkingState.Left)
+        {
+            _animPlayer.Play("Walk-Left");
+        }
+        else if (PathFindingMovement.CurrentDirection == PathFindingMovement.WalkingState.Right)
+        {
+            _animPlayer.Play("Walk-Right");
+        }
+        else if (PathFindingMovement.CurrentDirection == PathFindingMovement.WalkingState.IdleLeft)
+        {
+            _animPlayer.Play("Idle-Left");
+        }
+        else { _animPlayer.Play("Idle-Right"); }
+    }
+
     private bool _hasSeenOtherAlly = false;
     public override void _PhysicsProcess(double delta)
     {
@@ -213,19 +225,12 @@ public override void _PhysicsProcess(double delta)
 
         UpdateTarget();
 
-        if (PathFindingMovement.CurrentDirection == PathFindingMovement.WalkingState.Left)
-        {
-            _animPlayer.Play("Walk-Left");
-        }
-        else if (PathFindingMovement.CurrentDirection == PathFindingMovement.WalkingState.Right)
-        {
-            _animPlayer.Play("Walk-Right");
+        if(!AnimationIsAlreadyPlaying){
+            playPlayerAnimation();
         }
-        else if (PathFindingMovement.CurrentDirection == PathFindingMovement.WalkingState.IdleLeft)
-        {
-            _animPlayer.Play("Idle-Left");
+        else if(!_animPlayer.IsPlaying()){
+                AnimationIsAlreadyPlaying = false;
         }
-        else { _animPlayer.Play("Idle-Right"); }
 
         _reached = GlobalPosition.DistanceTo(PathFindingMovement.TargetPosition) < 150;
 
@@ -253,18 +258,6 @@ public override void _PhysicsProcess(double delta)
              */
         }
 
-        //Cave entrance logic:
-        if (this.SsInventory.ContainsMaterial(Items.Material.Chipcard) && this.GlobalPosition.DistanceTo(_caveEntrance.GlobalPosition) < 300)
-        {
-            _caveEntrance.Interactable = true;
-        }
-        //Well logic:
-        if (GlobalPosition.DistanceTo(_well.GlobalPosition) < 300 &&
-            SsInventory.ContainsMaterial(Game.Scripts.Items.Material.BucketEmpty))
-        {
-            _well.Interactable = true;
-        }
-
     }//Node2D/Abandoned Village/HauntedForestVillage/Big House/Sprite2D/InsideBigHouse2/InsideBigHouse/Sprite2D/ChestInsideHouse
 
     private void UpdateTarget()

scripts/Interaction/Interactable.cs

@@ -1,4 +1,5 @@
 using Game.Scripts;
+using Game.Scripts.AI;
 using Game.Scripts.Items;
 
 using Godot;
@@ -12,10 +13,20 @@ public partial class Interactable : Node2D
     [Signal] public delegate void InteractEventHandler();
 
     public string? SystemMessageForAlly;
+    private CollisionShape2D _caveEntrance1 = null!;
+    private CollisionShape2D _caveEntrance2 = null!;
+    private float _doorDuration = 5.0f;
+    private AiNode _scar = null!;
 
     public override void _Ready()
     {
         AddToGroup(GroupName);
+        _caveEntrance1 = GetTree().Root.GetNode<CollisionShape2D>("Node2D/DoorOpener/StaticBody2D/CaveEntrance1");
+        _caveEntrance2 = GetTree().Root.GetNode<CollisionShape2D>("Node2D/DoorOpener/StaticBody2D2/CaveEntrance2");
+        _scar = GetTree().Root.GetNode<AiNode>("Node2D/Scar");
+        if(GetParent().Equals(_scar)) {
+            _scar.GetNode<VisibleForAI>("VisibleForAI").QueueFree();
+        }
     }
 
     public void Trigger(Node caller)
@@ -31,10 +42,16 @@ public void Trigger(Node caller)
         if(this.GetParent<AiNode>().Name.Equals("Well") && caller.Name.ToString().Contains("Ally")) {
             Ally ally = (caller as Ally)!;
             ally.SsInventory.HardSwapItems(Game.Scripts.Items.Material.BucketEmpty, Game.Scripts.Items.Material.BucketWater);
+            ally.AnimationIsAlreadyPlaying = true;
             ally._animPlayer.Play("Fill-Bucket");
         }
         //Remove scrub with Jones
         if(this.GetParent<AiNode>().Name.Equals("Big Tree") && caller.Name.ToString().Contains("Ally2")) {
+            VisibleForAI scarVisibileForAI = new VisibleForAI();
+            scarVisibileForAI.NameForAi = "Scar";
+            scarVisibileForAI.DescriptionForAi = "A big scar on the tree which could be the reason for the tree looking dead. It is not reachable because of the scrub";
+            _scar.AddChild(scarVisibileForAI, true, InternalMode.Disabled);
+            GD.Print("Scar VFAI added");
             EmitSignal(SignalName.Interact);
             EmitSignal(SignalName.InteractFromNode, caller);
         }
@@ -44,10 +61,28 @@ public void Trigger(Node caller)
             if(!ally.SsInventory.ContainsMaterial(Game.Scripts.Items.Material.BucketWater)) {
                 return;
             }
+            ally.AnimationIsAlreadyPlaying = true;
             ally._animPlayer.Play("Empty-Bucket");
+            ally.SsInventory.HardSwapItems(Game.Scripts.Items.Material.BucketWater, Game.Scripts.Items.Material.BucketEmpty);
             //Tree is now cured (for story progression)
+            GD.Print("Tree cured");
             TreeCured = true;
         }
+        //Cave entrance
+        if(this.GetParent<AiNode>().Name.Equals("CaveEntranceTerminal") && caller.Name.ToString().Contains("Ally")) {
+            Ally ally = (caller as Ally)!;
+            if(!ally.SsInventory.ContainsMaterial(Game.Scripts.Items.Material.Chipcard)) {
+                return;
+            }
+        }
+        //Door opener
+        if(this.GetParent<AiNode>().Name.Equals("DoorOpener") && caller.Name.ToString().Contains("Ally")) {
+            Ally ally = (caller as Ally)!;
+            if(!ally.SsInventory.ContainsMaterial(Game.Scripts.Items.Material.Chipcard)) {
+                return;
+            }
+    	    TemporarilyDisable();
+        }
 
         if(this.GetParent<AiNode>().Name.Equals("EmptyBucket") && caller.Name.ToString().Contains("Ally2")) {
             GD.Print("Jones already has his machine gun, so he can't carry the bucket");
@@ -58,4 +93,16 @@ public void Trigger(Node caller)
         EmitSignal(SignalName.Interact);
         EmitSignal(SignalName.InteractFromNode, caller);
     }
+
+    public async void TemporarilyDisable() {
+        _caveEntrance1.SetDeferred("disabled", true);
+        _caveEntrance2.SetDeferred("disabled", true);
+        GD.Print("Door is open!");
+
+        await ToSignal(GetTree().CreateTimer(_doorDuration), "timeout");
+
+        _caveEntrance1.SetDeferred("disabled", false);
+        _caveEntrance2.SetDeferred("disabled", false);
+        GD.Print("Door is closed");
+    }
 }