Final Formatting

Author: Benzooos

scenes/levels/ExampleScene.tscn

@@ -15124,14 +15124,13 @@ script = ExtResource("1_pa1ge")
 _darknessCircleDamage = 1
 _allyHealthChangeIntervall = 5.0
 
-[node name="Ally" parent="." node_paths=PackedStringArray("_responseField", "_nameLabel", "Chat", "_animPlayer") instance=ExtResource("6_l8h37")]
+[node name="Ally" parent="." node_paths=PackedStringArray("_responseField", "_nameLabel", "Chat") instance=ExtResource("6_l8h37")]
 position = Vector2(937, 2122)
 _responseField = NodePath("ResponseField")
 _nameLabel = NodePath("Label")
 _visionRadius = 300
 _interactionRadius = 300
 Chat = NodePath("Ally1Cam/Ally1Chat")
-_animPlayer = NodePath("AnimationPlayer2")
 
 [node name="Ally1Cam" type="Camera2D" parent="Ally"]
 light_mask = 2
@@ -15225,14 +15224,13 @@ shadow_filter = 2
 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")]
+[node name="Ally2" parent="." node_paths=PackedStringArray("_responseField", "_nameLabel", "Chat") groups=["navigation"] instance=ExtResource("6_l8h37")]
 position = Vector2(179, 2125)
 _responseField = NodePath("ResponseField")
 _nameLabel = NodePath("Label")
 _visionRadius = 200
 _interactionRadius = 250
 Chat = NodePath("Ally2Cam/Ally2Chat")
-_animPlayer = NodePath("AnimationPlayer2")
 
 [node name="Ally2Cam" type="Camera2D" parent="Ally2"]
 light_mask = 2

scripts/Ally.cs

@@ -42,7 +42,7 @@ public partial class Ally : CharacterBody2D
     [Export] public VisibleForAI[] AlwaysVisible = [];
     private GenerativeAI.Methods.ChatSession? _chat;
     private GeminiService? _geminiService;
-    [Export] public AnimationPlayer _animPlayer = null!;
+    [Export] public AnimationPlayer AnimPlayer = null!;
     private PointLight2D _coreLight = null!;
 
     private PointLight2D _torch = null!;
@@ -117,8 +117,8 @@ public override void _Ready()
             GD.PrintErr("PathFindingMovement node is not assigned in the editor!");
         }
         Chat.ResponseReceived += HandleResponse;
-        _animPlayer = GetNode<AnimationPlayer>("AnimationPlayer2");
-        _animPlayer.Play("Idle-Left");
+        AnimPlayer = GetNode<AnimationPlayer>("AnimationPlayer2");
+        AnimPlayer.Play("Idle-Left");
 
         RunBeginning();
     }
@@ -186,21 +186,21 @@ public void SetAllyInDarkness()
 
     }
 
-    private void playPlayerAnimation()
+    private void PlayPlayerAnimation()
     {
         if (PathFindingMovement.CurrentDirection == PathFindingMovement.WalkingState.Left)
         {
-            _animPlayer.Play("Walk-Left");
+            AnimPlayer.Play("Walk-Left");
         }
         else if (PathFindingMovement.CurrentDirection == PathFindingMovement.WalkingState.Right)
         {
-            _animPlayer.Play("Walk-Right");
+            AnimPlayer.Play("Walk-Right");
         }
         else if (PathFindingMovement.CurrentDirection == PathFindingMovement.WalkingState.IdleLeft)
         {
-            _animPlayer.Play("Idle-Left");
+            AnimPlayer.Play("Idle-Left");
         }
-        else { _animPlayer.Play("Idle-Right"); }
+        else { AnimPlayer.Play("Idle-Right"); }
     }
 
     private bool _hasSeenOtherAlly = false;
@@ -240,9 +240,9 @@ public override void _PhysicsProcess(double delta)
 
         if (!AnimationIsAlreadyPlaying)
         {
-            playPlayerAnimation();
+            PlayPlayerAnimation();
         }
-        else if (!_animPlayer.IsPlaying())
+        else if (!AnimPlayer.IsPlaying())
         {
             AnimationIsAlreadyPlaying = false;
         }

scripts/Interaction/Interactable.cs

@@ -81,7 +81,7 @@ public async Task Trigger(Node caller)
             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");
+            ally.AnimPlayer.Play("Fill-Bucket");
         }
         //Remove scrub with Jones
         if (GetParent<AiNode>().Name.Equals("Big Tree") && caller.Name.ToString().Equals("Ally2"))
@@ -120,7 +120,7 @@ public async Task Trigger(Node caller)
             }
 
             ally.AnimationIsAlreadyPlaying = true;
-            ally._animPlayer.Play("Empty-Bucket");
+            ally.AnimPlayer.Play("Empty-Bucket");
             _animTree.Play("TreeOpens");
             ally.SsInventory.HardSwapItems(Game.Scripts.Items.Material.BucketWater, Game.Scripts.Items.Material.BucketEmpty);
             //Tree is now cured (for story progression)

scripts/SpriteSheetAnimation.cs

@@ -5,11 +5,11 @@
 public partial class SpriteSheetAnimation : Sprite2D
 {
     private Sprite2D _animTree = null!;
-    private int currentFrame = 0;
-    private float frameTimer = 0f;
-    public static bool isAnimating = false;
-    private float frameDuration = 0.1f;
-    private int frameCount = 17;
+    private int _currentFrame = 0;
+    private float _frameTimer = 0f;
+    public static bool IsAnimating = false;
+    private float _frameDuration = 0.1f;
+    private int _frameCount = 17;
 
     public override void _Ready()
     {
@@ -18,20 +18,20 @@ public override void _Ready()
 
     public override void _Process(double delta)
     {
-        if (isAnimating)
+        if (IsAnimating)
         {
             _animTree.Frame += 1;
-            frameTimer += (float)delta;
-            if (frameTimer >= frameDuration)
+            _frameTimer += (float)delta;
+            if (_frameTimer >= _frameDuration)
             {
                 if (_animTree.Frame == 9)
                 {
-                    isAnimating = false;
+                    IsAnimating = false;
                 }
 
                 if (_animTree.Frame == 16)
                 {
-                    isAnimating = false;
+                    IsAnimating = false;
                 }
             }