refactor file scoped namespace

BoundingBoxes/BoundingBox.cs

@@ -1,11 +1,10 @@
 using Godot;
 using SupaLidlGame.Utils;
 
-namespace SupaLidlGame.BoundingBoxes
-{
+namespace SupaLidlGame.BoundingBoxes;
+
 public abstract partial class BoundingBox : Area2D, IFaction
 {
     [Export]
     public ushort Faction { get; set; }
 }
-}

BoundingBoxes/ConnectorBox.cs

@@ -2,8 +2,8 @@ using Godot;
 using System;
 using SupaLidlGame.Characters;
 
-namespace SupaLidlGame.BoundingBoxes
-{
+namespace SupaLidlGame.BoundingBoxes;
+
 public partial class ConnectorBox : Area2D
 {
     [Signal]
@@ -69,4 +69,3 @@ namespace SupaLidlGame.BoundingBoxes
         base._Process(delta);
     }
 }
-}

BoundingBoxes/Hitbox.cs

@@ -3,8 +3,8 @@ using Godot;
 using SupaLidlGame.Characters;
 using SupaLidlGame.Items;
 
-namespace SupaLidlGame.BoundingBoxes
-{
+namespace SupaLidlGame.BoundingBoxes;
+
 public partial class Hitbox : BoundingBox
 {
     private HashSet<BoundingBox> _ignoreList = new HashSet<BoundingBox>();
@@ -102,4 +102,3 @@ namespace SupaLidlGame.BoundingBoxes
         get => _ignoreList;
     }
 }
-}

BoundingBoxes/Hurtbox.cs

@@ -2,8 +2,8 @@ using Godot;
 using SupaLidlGame.Characters;
 using SupaLidlGame.Utils;
 
-namespace SupaLidlGame.BoundingBoxes
-{
+namespace SupaLidlGame.BoundingBoxes;
+
 public partial class Hurtbox : BoundingBox, IFaction
 {
     [Signal]
@@ -37,4 +37,3 @@ namespace SupaLidlGame.BoundingBoxes
             knockbackOrigin, knockbackVector);
     }
 }
-}

Characters/Character.cs

@@ -4,8 +4,8 @@ using SupaLidlGame.Items;
 using SupaLidlGame.Utils;
 using SupaLidlGame.State.Character;
 
-namespace SupaLidlGame.Characters
-{
+namespace SupaLidlGame.Characters;
+
 public partial class Character : CharacterBody2D, IFaction
 {
     [Export]
@@ -221,4 +221,3 @@ namespace SupaLidlGame.Characters
         }
     }
 }
-}

Characters/Enemy.cs

@@ -1,8 +1,8 @@
 using Godot;
 using System;
 
-namespace SupaLidlGame.Characters
-{
+namespace SupaLidlGame.Characters;
+
 public partial class Enemy : NPC
 {
     public override void _Ready()
@@ -16,4 +16,3 @@ namespace SupaLidlGame.Characters
         base.Die();
     }
 }
-}

Characters/NPC.cs

@@ -3,8 +3,8 @@ using SupaLidlGame.Extensions;
 using SupaLidlGame.Items;
 using System;
 
-namespace SupaLidlGame.Characters
-{
+namespace SupaLidlGame.Characters;
+
 public partial class NPC : Character
 {
     /// <summary>
@@ -226,4 +226,3 @@ namespace SupaLidlGame.Characters
         }
     }
 }
-}

Characters/Player.cs

@@ -1,8 +1,8 @@
 using Godot;
 using SupaLidlGame.Utils;
 
-namespace SupaLidlGame.Characters
-{
+namespace SupaLidlGame.Characters;
+
 public partial class Player : Character
 {
     private AnimatedSprite2D _sprite;
@@ -18,8 +18,8 @@ namespace SupaLidlGame.Characters
         {
             // the Player.Animation property might be set before this node is
             // even ready, so if _sprite is null, then we just hold the new
-                // animation in a temp value, which will be assigned once this
-                // node is ready
+            // animation in a temp value, which will be assigned once this node
+            // is ready
             if (_sprite is null)
             {
                 _spriteAnim = value;
@@ -62,4 +62,3 @@ namespace SupaLidlGame.Characters
         //base.Die();
     }
 }
-}

Characters/Thinkers/Thinker.cs

@@ -1,5 +1,5 @@
-namespace SupaLidlGame.Characters.Thinkers
-{
+namespace SupaLidlGame.Characters.Thinkers;
+
 public class Thinker
 {
     public virtual void Think()
@@ -7,4 +7,3 @@ namespace SupaLidlGame.Characters.Thinkers
 
     }
 }
-}

Entities/Campfire.cs

@@ -1,8 +1,8 @@
 using Godot;
 using System;
 
-namespace SupaLidlGame.Entities
-{
+namespace SupaLidlGame.Entities;
+
 public partial class Campfire : StaticBody2D
 {
     private PointLight2D _light;
@@ -21,4 +21,3 @@ namespace SupaLidlGame.Entities
         _light.Energy = Math.Clamp(_light.Energy, 1.2f, 2.0f);
     }
 }
-}

Entities/Projectile.cs

@@ -2,8 +2,8 @@ using Godot;
 using SupaLidlGame.Characters;
 using SupaLidlGame.BoundingBoxes;
 
-namespace SupaLidlGame.Entities
-{
+namespace SupaLidlGame.Entities;
+
 public partial class Projectile : RigidBody2D
 {
     public Vector2 Velocity => Direction * Speed;
@@ -49,4 +49,3 @@ namespace SupaLidlGame.Entities
         }
     }
 }
-}

Extensions/AudioStreamPlayer2D.cs

@@ -2,8 +2,8 @@ using Godot;
 using System;
 using SupaLidlGame.Utils;
 
-namespace SupaLidlGame.Extensions
-{
+namespace SupaLidlGame.Extensions;
+
 public static class AudioStreamPlayer2DExtensions
 {
     public static AudioStreamPlayer2D Clone(
@@ -70,4 +70,3 @@ namespace SupaLidlGame.Extensions
         return audio;
     }
 }
-}

Extensions/Node.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.Extensions
-{
+namespace SupaLidlGame.Extensions;
+
 public static class NodeExtensions
 {
     /// <summary>
@@ -38,4 +38,3 @@ namespace SupaLidlGame.Extensions
         return node.GetNode(name) as T;
     }
 }
-}

Extensions/Node2DExtensions.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.Extensions
-{
+namespace SupaLidlGame.Extensions;
+
 public static class Node2DExtensions
 {
     public static void RayCast(this Node2D node, Vector2 ray)
@@ -10,4 +10,3 @@ namespace SupaLidlGame.Extensions
         //var result = spaceState.IntersectRay();
     }
 }
-}

Extensions/Vector2.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.Extensions
-{
+namespace SupaLidlGame.Extensions;
+
 public static class Vector2Extensions
 {
     public static Vector2 Midpoint(this Vector2 vector, Vector2 other)
@@ -38,4 +38,3 @@ namespace SupaLidlGame.Extensions
         return new Vector2(vector.Y, -vector.X);
     }
 }
-}

Items/Inventory.cs

@@ -2,8 +2,8 @@ using Godot;
 using SupaLidlGame.Characters;
 using Godot.Collections;
 
-namespace SupaLidlGame.Items
-{
+namespace SupaLidlGame.Items;
+
 public partial class Inventory : Node2D
 {
     public Character Character { get; private set; }
@@ -143,4 +143,3 @@ namespace SupaLidlGame.Items
         throw new System.NotImplementedException();
     }
 }
-}

Items/Item.cs

@@ -1,8 +1,8 @@
 using Godot;
 using SupaLidlGame.Characters;
 
-namespace SupaLidlGame.Items
-{
+namespace SupaLidlGame.Items;
+
 public abstract partial class Item : Node2D
 {
     [Export]
@@ -50,4 +50,3 @@ namespace SupaLidlGame.Items
 
     public abstract void Deuse();
 }
-}

Items/Weapon.cs

@@ -2,8 +2,8 @@ using Godot;
 using SupaLidlGame.BoundingBoxes;
 using SupaLidlGame.Characters;
 
-namespace SupaLidlGame.Items
-{
+namespace SupaLidlGame.Items;
+
 public abstract partial class Weapon : Item
 {
     public double RemainingUseTime { get; protected set; } = 0;
@@ -107,4 +107,3 @@ namespace SupaLidlGame.Items
         }
     }
 }
-}

Items/Weapons/IParryable.cs

@@ -1,5 +1,5 @@
-namespace SupaLidlGame.Items.Weapons
-{
+namespace SupaLidlGame.Items.Weapons;
+
 public interface IParryable
 {
     public bool IsParryable { get; }
@@ -7,4 +7,3 @@ namespace SupaLidlGame.Items.Weapons
     public ulong ParryTimeOrigin { get; }
     public void Stun();
 }
-}

Items/Weapons/Railgun.cs

@@ -1,8 +1,8 @@
 using Godot;
 using SupaLidlGame.Extensions;
 
-namespace SupaLidlGame.Items.Weapons
-{
+namespace SupaLidlGame.Items.Weapons;
+
 public partial class Railgun : Ranged
 {
     public override void Attack()
@@ -19,4 +19,3 @@ namespace SupaLidlGame.Items.Weapons
             .Entities.AddChild(projectile);
     }
 }
-}

Items/Weapons/Ranged.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.Items.Weapons
-{
+namespace SupaLidlGame.Items.Weapons;
+
 public abstract partial class Ranged : Weapon
 {
     [Export]
@@ -40,4 +40,3 @@ namespace SupaLidlGame.Items.Weapons
 
     public abstract void Attack();
 }
-}

Items/Weapons/Sword.cs

@@ -4,8 +4,8 @@ using SupaLidlGame.Characters;
 using SupaLidlGame.Extensions;
 using SupaLidlGame.State.Weapon;
 
-namespace SupaLidlGame.Items.Weapons
-{
+namespace SupaLidlGame.Items.Weapons;
+
 public partial class Sword : Weapon, IParryable
 {
     public bool IsAttacking { get; protected set; }
@@ -234,4 +234,3 @@ namespace SupaLidlGame.Items.Weapons
         AnimationTree.Set("parameters/conditions/" + condition, value);
     }
 }
-}

Scenes/Level.tscn

@@ -3,7 +3,6 @@
 [ext_resource type="Script" path="res://Utils/World.cs" id="1_1k6ew"]
 [ext_resource type="PackedScene" uid="uid://bxtpv6jqodj4v" path="res://Scenes/Maps/Hills.tscn" id="2_juio7"]
 
-[node name="World" type="Node2D" node_paths=PackedStringArray("CurrentPlayer")]
+[node name="World" type="Node2D"]
 script = ExtResource("1_1k6ew")
 StartingArea = ExtResource("2_juio7")
-CurrentPlayer = NodePath("")

Scenes/Map.cs

@@ -1,8 +1,8 @@
 using Godot;
 using System;
 
-namespace SupaLidlGame.Scenes
-{
+namespace SupaLidlGame.Scenes;
+
 public partial class Map : TileMap
 {
     [Export]
@@ -45,4 +45,3 @@ namespace SupaLidlGame.Scenes
         base._Process(delta);
     }
 }
-}

State/Character/CharacterState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Character
-{
+namespace SupaLidlGame.State.Character;
+
 public abstract partial class CharacterState : Node, IState<CharacterState>
 {
     [Export]
@@ -67,4 +67,3 @@ namespace SupaLidlGame.State.Character
 
     public virtual CharacterState Input(InputEvent @event) => null;
 }
-}

State/Character/CharacterStateMachine.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Character
-{
+namespace SupaLidlGame.State.Character;
+
 public partial class CharacterStateMachine : StateMachine<CharacterState>
 {
     [Export]
@@ -37,4 +37,3 @@ namespace SupaLidlGame.State.Character
         }
     }
 }
-}

State/Character/NPCIdleState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Character
-{
+namespace SupaLidlGame.State.Character;
+
 public partial class NPCIdleState : NPCState
 {
     [Export]
@@ -23,4 +23,3 @@ namespace SupaLidlGame.State.Character
         return base.Enter(previousState);
     }
 }
-}

State/Character/NPCMoveState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Character
-{
+namespace SupaLidlGame.State.Character;
+
 public partial class NPCMoveState : NPCState
 {
     [Export]
@@ -23,4 +23,3 @@ namespace SupaLidlGame.State.Character
         return base.Enter(prev);
     }
 }
-}

State/Character/NPCState.cs

@@ -1,5 +1,5 @@
-namespace SupaLidlGame.State.Character
-{
+namespace SupaLidlGame.State.Character;
+
 public abstract partial class NPCState : CharacterState
 {
     protected Characters.NPC _npc => Character as Characters.NPC;
@@ -10,4 +10,3 @@ namespace SupaLidlGame.State.Character
         return base.Process(delta);
     }
 }
-}

State/Character/PlayerIdleState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Character
-{
+namespace SupaLidlGame.State.Character;
+
 public partial class PlayerIdleState : PlayerState
 {
     [Export]
@@ -35,4 +35,3 @@ namespace SupaLidlGame.State.Character
         return null;
     }
 }
-}

State/Character/PlayerMoveState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Character
-{
+namespace SupaLidlGame.State.Character;
+
 public partial class PlayerMoveState : PlayerState
 {
     [Export]
@@ -43,4 +43,3 @@ namespace SupaLidlGame.State.Character
         return base.Input(@event);
     }
 }
-}

State/Character/PlayerRollState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Character
-{
+namespace SupaLidlGame.State.Character;
+
 public partial class PlayerRollState : PlayerState
 {
     private double _timeLeftToRoll = 0;
@@ -36,4 +36,3 @@ namespace SupaLidlGame.State.Character
         return null;
     }
 }
-}

State/Character/PlayerState.cs

@@ -1,8 +1,8 @@
 using Godot;
 using SupaLidlGame.Characters;
 
-namespace SupaLidlGame.State.Character
-{
+namespace SupaLidlGame.State.Character;
+
 public abstract partial class PlayerState : CharacterState
 {
     protected Player _player => Character as Player;
@@ -69,4 +69,3 @@ namespace SupaLidlGame.State.Character
         return base.Process(delta);
     }
 }
-}

State/IState.cs

@@ -1,5 +1,5 @@
-namespace SupaLidlGame.State
-{
+namespace SupaLidlGame.State;
+
 public interface IState<T> where T : IState<T>
 {
     /// <summary>
@@ -20,4 +20,3 @@ namespace SupaLidlGame.State
 
     public IState<T> Process(double delta) => null;
 }
-}

State/StateMachine.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State
-{
+namespace SupaLidlGame.State;
+
 public abstract partial class StateMachine<T> : Node where T : IState<T>
 {
     public T CurrentState { get; protected set; }
@@ -38,4 +38,3 @@ namespace SupaLidlGame.State
         return true;
     }
 }
-}

State/Weapon/RangedFireState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Weapon
-{
+namespace SupaLidlGame.State.Weapon;
+
 public partial class RangedFireState : WeaponState
 {
     [Export]
@@ -35,4 +35,3 @@ namespace SupaLidlGame.State.Weapon
 
     }
 }
-}

State/Weapon/RangedIdleState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Weapon
-{
+namespace SupaLidlGame.State.Weapon;
+
 public partial class RangedIdleState : WeaponState
 {
     [Export]
@@ -26,4 +26,3 @@ namespace SupaLidlGame.State.Weapon
         Weapon.Visible = true;
     }
 }
-}

State/Weapon/SwordAnticipateState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Weapon
-{
+namespace SupaLidlGame.State.Weapon;
+
 public partial class SwordAnticipateState : WeaponState
 {
     [Export]
@@ -43,4 +43,3 @@ namespace SupaLidlGame.State.Weapon
         return null;
     }
 }
-}

State/Weapon/SwordAttackState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Weapon
-{
+namespace SupaLidlGame.State.Weapon;
+
 public partial class SwordAttackState : WeaponState
 {
     [Export]
@@ -86,4 +86,3 @@ namespace SupaLidlGame.State.Weapon
         return null;
     }
 }
-}

State/Weapon/SwordIdleState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Weapon
-{
+namespace SupaLidlGame.State.Weapon;
+
 public partial class SwordIdleState : WeaponState
 {
     [Export]
@@ -49,4 +49,3 @@ namespace SupaLidlGame.State.Weapon
         return null;
     }
 }
-}

State/Weapon/WeaponState.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Weapon
-{
+namespace SupaLidlGame.State.Weapon;
+
 public abstract partial class WeaponState : Node, IState<WeaponState>
 {
     public virtual WeaponState Use() => null;
@@ -17,4 +17,3 @@ namespace SupaLidlGame.State.Weapon
 
     public virtual IState<WeaponState> Process(double delta) => null;
 }
-}

State/Weapon/WeaponStateMachine.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.State.Weapon
-{
+namespace SupaLidlGame.State.Weapon;
+
 public partial class WeaponStateMachine : StateMachine<WeaponState>
 {
     [Export]
@@ -34,4 +34,3 @@ namespace SupaLidlGame.State.Weapon
         }
     }
 }
-}

Tests/ContextBasedSteering.cs

@@ -2,8 +2,8 @@ using Godot;
 using SupaLidlGame.Extensions;
 using System;
 
-namespace SupaLidlGame.Prototyping
-{
+namespace SupaLidlGame.Prototyping;
+
 public partial class ContextBasedSteering : Node2D
 {
     public float PreferredDistance { get; set; } = 256.0f;
@@ -55,4 +55,3 @@ namespace SupaLidlGame.Prototyping
         DrawLine(Vector2.Zero, _direction * 256, Colors.Green);
     }
 }
-}

UI/FloatingText.cs

@@ -1,8 +1,8 @@
 using Godot;
 using System;
 
-namespace SupaLidlGame.UI
-{
+namespace SupaLidlGame.UI;
+
 public partial class FloatingText : Node2D
 {
     private Label _label;
@@ -48,4 +48,3 @@ namespace SupaLidlGame.UI
         QueueFree();
     }
 }
-}

Utils/IFaction.cs

@@ -1,7 +1,7 @@
 using Godot;
 
-namespace SupaLidlGame.Utils
-{
+namespace SupaLidlGame.Utils;
+
 public interface IFaction
 {
     /// <summary>
@@ -10,4 +10,3 @@ namespace SupaLidlGame.Utils
     [Export]
     public ushort Faction { get; set; }
 }
-}

Utils/PlayerCamera.cs

@@ -1,8 +1,8 @@
 using Godot;
 using System;
 
-namespace SupaLidlGame.Utils
-{
+namespace SupaLidlGame.Utils;
+
 public partial class PlayerCamera : Camera2D
 {
     protected float _intensity;
@@ -47,4 +47,3 @@ namespace SupaLidlGame.Utils
         return ret;
     }
 }
-}

Utils/Spawner.cs

@@ -2,8 +2,8 @@ using Godot;
 using Godot.Collections;
 using SupaLidlGame.Extensions;
 
-namespace SupaLidlGame.Utils
-{
+namespace SupaLidlGame.Utils;
+
 public partial class Spawner : Node2D
 {
     [Export]
@@ -56,4 +56,3 @@ namespace SupaLidlGame.Utils
         }
     }
 }
-}

Utils/World.cs

@@ -5,8 +5,8 @@ using SupaLidlGame.Extensions;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SupaLidlGame.Utils
-{
+namespace SupaLidlGame.Utils;
+
 public partial class World : Node2D
 {
     [Export]
@@ -147,4 +147,3 @@ namespace SupaLidlGame.Utils
         throw new System.NotImplementedException();
     }
 }
-}