Small bug fixing

Author: Benzooos

scenes/levels/ExampleScene.tscn

@@ -15125,7 +15125,7 @@ _darknessCircleDamage = 1
 _allyHealthChangeIntervall = 5.0
 
 [node name="Ally" parent="." node_paths=PackedStringArray("_responseField", "_nameLabel", "Chat") instance=ExtResource("6_l8h37")]
-position = Vector2(937, 2122)
+position = Vector2(-1309, -7572)
 _responseField = NodePath("ResponseField")
 _nameLabel = NodePath("Label")
 _visionRadius = 300
@@ -15225,7 +15225,7 @@ shadow_filter_smooth = 2.3
 texture_scale = 14.0
 
 [node name="Ally2" parent="." node_paths=PackedStringArray("_responseField", "_nameLabel", "Chat") groups=["navigation"] instance=ExtResource("6_l8h37")]
-position = Vector2(179, 2125)
+position = Vector2(-1387, -8894)
 _responseField = NodePath("ResponseField")
 _nameLabel = NodePath("Label")
 _visionRadius = 200
@@ -15752,6 +15752,7 @@ offset_top = 1955.0
 offset_right = 1457.0
 offset_bottom = 2618.0
 _ally = NodePath("../Ally")
+_enableIntroScene = false
 
 [node name="Landscape" type="Control" parent="."]
 visible = false
@@ -15997,6 +15998,7 @@ offset_left = 536.0
 offset_top = 898.0
 offset_right = 536.0
 offset_bottom = 898.0
+_enableTutorial = false
 
 [node name="Tombstone" parent="." instance=ExtResource("13_05imv")]
 position = Vector2(3836, -1047)
@@ -16064,7 +16066,7 @@ hframes = 5
 [node name="Scar" parent="." instance=ExtResource("13_05imv")]
 position = Vector2(5651, -7877)
 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"
+ObjectDescription = "A big scar on the tree which could be the reason for the tree looking dead"
 CustomOverrideMessage = "The tree seems to have recovered from the injurys and opens up to give the entrance to it's inside."
 ShowWhileInRadius = true
 
@@ -16100,20 +16102,22 @@ rotation = -1.56804
 shape = SubResource("CapsuleShape2D_630vn")
 
 [node name="DoorOpener" parent="." instance=ExtResource("13_05imv")]
-position = Vector2(-1917, -7812)
+position = Vector2(-1875, -7741)
 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"]
+position = Vector2(-41.6, -70.0005)
 
 [node name="CaveEntrance1" type="CollisionShape2D" parent="DoorOpener/StaticBody2D"]
 z_index = 2
 position = Vector2(-40.25, -967.75)
 shape = SubResource("RectangleShape2D_6wyny")
 
 [node name="StaticBody2D2" type="StaticBody2D" parent="DoorOpener"]
+position = Vector2(-41.6, -70.0005)
 
 [node name="CaveEntrance2" type="CollisionShape2D" parent="DoorOpener/StaticBody2D2"]
 z_index = 2
@@ -16122,7 +16126,7 @@ shape = SubResource("RectangleShape2D_1a47p")
 
 [node name="AnimatedSprite2D" type="Sprite2D" parent="DoorOpener"]
 z_index = 2
-position = Vector2(-39.6, -967.8)
+position = Vector2(-81.2, -1037.8)
 scale = Vector2(3.84999, 3.84999)
 texture = ExtResource("58_vqwoj")
 hframes = 5
@@ -16134,7 +16138,7 @@ libraries = {
 
 [node name="AnimatedSprite2D2" type="Sprite2D" parent="DoorOpener"]
 z_index = 2
-position = Vector2(-548, -965)
+position = Vector2(-589.6, -1035)
 scale = Vector2(3.84999, 3.84999)
 texture = ExtResource("58_vqwoj")
 hframes = 5

scripts/Ally.cs

@@ -75,7 +75,7 @@ public override void _Ready()
         //SsInventory.AddItem(new Itemstack(Items.Material.FestiveStaff, 1));
         // SsInventory.AddItem(new Itemstack(Items.Material.Copper, 1));
         //SsInventory.AddItem(new Itemstack(Items.Material.BucketWater, 1));
-        //SsInventory.AddItem(new Itemstack(Items.Material.Chipcard, 1));
+        SsInventory.AddItem(new Itemstack(Items.Material.Chipcard, 1));
         _torch = GetNode<PointLight2D>("AllyTorch");
         _ally1ResponseField = GetNode<RichTextLabel>("ResponseField");
         _ally2ResponseField = GetNode<RichTextLabel>("ResponseField");

scripts/Interaction/Interactable.cs

@@ -11,11 +11,14 @@ public partial class Interactable : Node2D
 {
     public const string GroupName = "Interactable";
     public static bool TreeCured = false;
+
+    public static bool ScrubRemoved = false;
     [Signal] public delegate void InteractFromNodeEventHandler(Node caller);
     [Signal] public delegate void InteractEventHandler();
 
     public string? SystemMessageForAlly;
     private CollisionShape2D _caveEntrance1 = null!;
+    private CollisionShape2D _scrub = null!;
     private CollisionShape2D _caveEntrance2 = null!;
     private float _doorDuration = 5.0f;
     private AiNode _scar = null!;
@@ -29,6 +32,7 @@ public override void _Ready()
         AddToGroup(GroupName);
         _caveEntrance1 = GetTree().Root.GetNode<CollisionShape2D>("Node2D/DoorOpener/StaticBody2D/CaveEntrance1");
         _caveEntrance2 = GetTree().Root.GetNode<CollisionShape2D>("Node2D/DoorOpener/StaticBody2D2/CaveEntrance2");
+        _scrub = GetTree().Root.GetNode<CollisionShape2D>("Node2D/Big Tree/StaticBody2D/CollisionShape2D");
         _animTree = GetTree().Root.GetNode<AnimationPlayer>("Node2D/Node2D/AnimationPlayer");
         _animEntrance = GetTree().Root.GetNode<AnimationPlayer>("Node2D/CaveEntranceTerminal/AnimationPlayer");
         _animDoorOpener = GetTree().Root.GetNode<AnimationPlayer>("Node2D/DoorOpener/AnimationPlayer");
@@ -84,8 +88,9 @@ public async Task Trigger(Node caller)
             ally.AnimPlayer.Play("Fill-Bucket");
         }
         //Remove scrub with Jones
-        if (GetParent<AiNode>().Name.Equals("Big Tree") && caller.Name.ToString().Equals("Ally2"))
+        if (GetParent<AiNode>().Name.Equals("Big Tree") && caller.Name.ToString().Equals("Ally2") && !ScrubRemoved)
         {
+            ScrubRemoved = true;
             Ally? jones = caller as Ally;
             Chat jonesChat = jones!.Chat;
             jonesChat.SendSystemMessage("You've successfully removed the scrub from the tree and a big hideous scar appears underneath it", new Ally());
@@ -98,6 +103,7 @@ public async Task Trigger(Node caller)
             };
             _scar.AddChild(scarVisibileForAI, false);
             GD.Print("Scar VFAI added");
+            _scrub.SetDeferred("disabled", true);
             EmitSignal(SignalName.Interact);
             EmitSignal(SignalName.InteractFromNode, caller);
         }