Add basic grenade icon for testing.

Add inputnames for making input keys more esay
Edit GunBase to use UsableBase
AnimPlayer exposed to public
MainMenu temporarly moving you to Inventory Instead of Settings (soon be back)
Remove GunUse in InvModule
Changing player to use InputNames
Adding Slow, Run speed for player
add InputHandle for server (commands and stuff)
Add basic ItemSlot, inventory Scene

Author: SlejmUr

assets/game-icons/grenade.png

@@ -0,0 +1,6 @@
+grenade.png 
+https://game-icons.net/1x1/lorc/grenade.html#download
+https://lorcblog.blogspot.com/
+https://creativecommons.org/licenses/by/3.0/
+
+---

assets/game-icons/licenses.txt

@@ -0,0 +1,8 @@
+All icons downloaded from https://game-icons.net/
+
+See licenses.txt for individual icon assets.
+
+FileName
+Link to download page
+Who made it (Link if can)
+License Link

assets/game-icons/readme.txt

@@ -6,6 +6,9 @@ public partial class GameSettings : Resource
 {
     [Export]
     public VideoSettings Video { get; set; } = new();
+
+    [Export]
+    public ControlSettings Control { get; set; } = new();
 }
 
 public partial class VideoSettings : Resource
@@ -37,6 +40,13 @@ public partial class VideoSettings : Resource
     public ScreenSizeEnum ScreenSize = ScreenSizeEnum._1280x720;
 }
 
+public partial class ControlSettings : Resource
+{
+    //var s = InputMap.ActionGetEvents("move_left")[0] as InputEventKey;
+     
+}
+
+
 public enum Scaling3DScaleEnum : byte
 {
     Performance,

csharp/Client/GameSettings.cs

@@ -0,0 +1,8 @@
+using Godot;
+
+namespace ExtractIntoVoid;
+
+public static partial class Consts
+{
+    public static float Gravity => ProjectSettings.GetSetting("physics/3d/default_gravity").AsSingle();
+}

csharp/Game/Consts.cs

@@ -0,0 +1,33 @@
+using Godot;
+
+namespace ExtractIntoVoid;
+
+public static partial class InputNames
+{
+    public static StringName MoveForward = "move_forward";
+    public static StringName MoveBackward = "move_backward";
+    public static StringName MoveLeft = "move_left";
+    public static StringName MoveRight = "move_right";
+    public static StringName Sprint = "move_sprint";
+    public static StringName SlowWalk = "move_slowly";
+    public static StringName Jump = "move_jump";
+    public static StringName Crouch = "move_crouch";
+    public static StringName Prone = "move_prone"; // Currently not implemented.
+    public static StringName InventoryOpen = "inventory_open";
+    public static StringName ItemUse = "item_use";
+    public static StringName ItemCancel = "item_cancel";
+    public static StringName WeaponReload = "weapon_reload";
+    public static StringName ToolSlot0 = "slot0";
+    public static StringName ToolSlot1 = "slot1";
+    public static StringName ToolSlot2 = "slot2";
+    public static StringName ToolSlot3 = "slot3";
+    public static StringName ToolSlot4 = "slot4";
+    public static StringName ToolSlot5 = "slot5";
+    public static StringName ToolSlot6 = "slot6"; 
+    public static StringName ToolSlot7 = "slot7";
+    public static StringName ToolSlot8 = "slot8";
+    public static StringName ToolSlot9 = "slot9";
+    public static StringName MenuButton = "menu";   //Esc
+
+    // Add 
+}

csharp/Game/InputNames.cs

@@ -7,39 +7,48 @@
 
 namespace ExtractIntoVoid.Items;
 
-public abstract partial class GunBase : InventoryItemBase
+public abstract partial class GunBase : UsableBase
 {
-    Marker3D BulletSpawner;
-    public Gun Gun => InventoryModule.Inventory.Hand.As<Gun>();
-
+    public Gun Gun => UsableItem.As<Gun>();
     public bool IsJammed { get; internal set; } = false;
+    public Marker3D BulletSpawner { get; internal set; }
+
     public override void _Ready()
     {
         BulletSpawner = GetNode<Marker3D>("BulletSpawner");
     }
 
-    public virtual void Shoot()
+    public override void OnTick(double delta)
     {
         if (Gun.Magazine == null)
             return;
         if (IsJammed)
             return;
-        if (Gun.Magazine.Ammunitions.Count > 0)
+        if (Gun.Magazine.Ammunitions.Count == 0)
+            return;
+
+        Ammo ammo = Gun.Magazine.Ammunitions.First();
+        // Ammo doesnt have 3D representation of itself :(
+        if (!ammo.HasValidAssetPath())
         {
-            var ammo = Gun.Magazine.Ammunitions.First();
-            // Ammo doesnt have 3D representation of itself :(
-            if (!ammo.HasValidAssetPath())
-            {
-                PlayJammed();
-                return;
-            }
-            var id = GD.Randi();
-            var BulletSpawnTransform = BulletSpawner.GlobalTransform.LookingAt(BulletSpawner.Position);
-            Rpc("ShootBullet", (int)id, ammo.Serialize(), BulletSpawnTransform);
-            GetNode<AnimationPlayer>("AnimationPlayer").Play("Shoot");
-            // UI update here
-            Gun.Magazine.Ammunitions.Remove(ammo);
+            PlayJammed();
+            return;
         }
+        Transform3D BulletSpawnTransform = BulletSpawner.GlobalTransform.LookingAt(BulletSpawner.Position);
+        Rpc("ShootBullet", (int)GD.Randi(), ammo.Serialize(), BulletSpawnTransform);
+        if (AnimPlayer != null)
+            AnimPlayer.Play("Shoot");
+
+#if CLIENT || GAME
+        // UI update here
+#endif
+        Gun.Magazine.Ammunitions.Remove(ammo);
+    }
+
+    // Overriding cancel because we use that to "AIM"
+    public override void UsingCancel()
+    {
+        // Todo Aim logic
     }
 
     public virtual void PlayJammed()
@@ -74,9 +83,8 @@ private void ShootBullet(int id, byte[] ammo_bytes, Transform3D transform)
             GD.Print("Bullet Couldnt spawned because the scene is null");
             return;
         }
-  
-        //
-        var bullet = bulletScene.Instantiate<Bullet>();
+
+        Bullet bullet = bulletScene.Instantiate<Bullet>();
         bullet.Name = "Bullet_" + id.ToString();
         bullet.SetMP(id);
         bullet.SetAmmo(ammo);

csharp/Items/GunBase.cs

@@ -6,19 +6,17 @@ namespace ExtractIntoVoid.Items;
 
 public abstract partial class ThrowableBase : UsableBase
 {
-    public float Gravity = ProjectSettings.GetSetting("physics/3d/default_gravity").AsSingle();
     public Throwable Throwable => UsableItem.As<Throwable>();
-    
-    decimal FuseTime;
     public bool IsThrown { get; internal set; }
+    private decimal FuseTime;
     public override void _Process(double delta)
     {
         if (!IsThrown)
             return;
         // Calculate to dont go to direction always, use the weight to be down a little i guess.
         Vector3 Pos = Position;
         Pos = Pos + -GlobalTransform.Basis.Z * 1;
-        Pos.Y = Pos.Y - Gravity * (float)delta * 0.01f;
+        Pos.Y = Pos.Y - Consts.Gravity * (float)delta * 0.1f;
         Position = Pos;
 
         FuseTime -= (decimal)delta;

csharp/Items/ThrowableBase.cs

@@ -6,16 +6,16 @@ namespace ExtractIntoVoid.Items;
 
 public abstract partial class UsableBase : InventoryItemBase
 {
-    AnimationPlayer Animation;
     public CoreUsable UsableItem => InventoryModule.Inventory.Hand.As<CoreUsable>();
+    public AnimationPlayer AnimPlayer { get; protected set; }
     bool IsInUse = false;
     decimal UseTime = 0;
 
     public UsableBase() : base()
     {
         if (HasNode("Animation"))
-            Animation = GetNode<AnimationPlayer>("Animation");
-        Animation = null;
+            AnimPlayer = GetNode<AnimationPlayer>("Animation");
+        AnimPlayer = null;
     }
 
     public virtual void UsingStart()
@@ -33,17 +33,18 @@ public virtual void UsingCancel()
             IsInUse = false;
             UseTime = UsableItem.UseTime;
         }
+        OnUsingCancelled();
     }
     public virtual void OnUsingStarted()
     {
-        if (Animation != null)
-            Animation.Play("Start");
+        if (AnimPlayer != null)
+            AnimPlayer.Play("Start");
     }
 
     public virtual void OnUsingCancelled()
     {
-        if (Animation != null)
-            Animation.Play("RESET");
+        if (AnimPlayer != null)
+            AnimPlayer.Play("RESET");
     }
 
     public virtual void OnUsingFinished()

csharp/Items/UsableBase.cs

@@ -25,13 +25,11 @@ public static string GetArgParam(string search)
 
     public static bool HasArgParam(string search)
     {
-        var cmd_args = Godot.OS.GetCmdlineArgs().AsSpan();
-        return cmd_args.Contains($"--{search}=");
+        return Godot.OS.GetCmdlineArgs().AsSpan().Contains($"--{search}=");
     }
 
     public static bool HasArg(string search)
     {
-        var cmd_args = Godot.OS.GetCmdlineArgs().AsSpan();
-        return cmd_args.Contains($"--{search}");
+        return Godot.OS.GetCmdlineArgs().AsSpan().Contains($"--{search}");
     }
 }