Merge cont

Models/Cookie.blend.import

@@ -0,0 +1,48 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://c4fnm4wmn7n83"
+path="res://.godot/imported/Cookie.blend-390d13d3a707da248d8fffd5b357a4cb.scn"
+
+[deps]
+
+source_file="res://Models/Cookie.blend"
+dest_files=["res://.godot/imported/Cookie.blend-390d13d3a707da248d8fffd5b357a4cb.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1
+blender/nodes/visible=0
+blender/nodes/punctual_lights=true
+blender/nodes/cameras=true
+blender/nodes/custom_properties=true
+blender/nodes/modifiers=1
+blender/meshes/colors=false
+blender/meshes/uvs=true
+blender/meshes/normals=true
+blender/meshes/tangents=true
+blender/meshes/skins=2
+blender/meshes/export_bones_deforming_mesh_only=false
+blender/materials/unpack_enabled=true
+blender/materials/export_materials=1
+blender/animation/limit_playback=true
+blender/animation/always_sample=true
+blender/animation/group_tracks=true

Sandbox.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.0.3">
+<Project Sdk="Godot.NET.Sdk/4.1.1">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>

Sandbox.csproj.old.1

@@ -1,9 +0,0 @@
-<Project Sdk="Godot.NET.Sdk/4.1.0">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
-  </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="Scenes\" />
-  </ItemGroup>
-</Project>

Scenes/Blizzard.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://ds2y8l8onrs4f"]
+[gd_scene load_steps=4 format=3 uid="uid://ds2y8l8onrs4f"]
 
 [ext_resource type="Script" path="res://Scripts/Blizzard.cs" id="1_rqtsv"]
 
@@ -9,24 +9,19 @@ albedo_color = Color(0.137255, 0.447059, 0.796078, 1)
 radial_segments = 4
 rings = 1
 
-[sub_resource type="SphereShape3D" id="SphereShape3D_xe0sc"]
-
 [node name="Blizzard" type="Node3D"]
 script = ExtResource("1_rqtsv")
+Cooldown = 1.0
 _projectileSpeed = 10.0
 
-[node name="RigidBody3D" type="RigidBody3D" parent="."]
-collision_layer = 0
-collision_mask = 16
-mass = 0.01
-gravity_scale = 0.0
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D"]
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11373, 0)
 material_override = SubResource("StandardMaterial3D_pd0mo")
 mesh = SubResource("SphereMesh_g0pbs")
-skeleton = NodePath("../..")
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11958, 0)
-shape = SubResource("SphereShape3D_xe0sc")
+[node name="TimeToLive" type="Timer" parent="."]
+wait_time = 2.5
+one_shot = true
+autostart = true
+
+[connection signal="timeout" from="TimeToLive" to="." method="OnTimeToLiveTimeout"]

Scenes/Main.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=3 uid="uid://bcsgd8vxy43g2"]
+[gd_scene load_steps=18 format=3 uid="uid://bcsgd8vxy43g2"]
 
 [ext_resource type="Script" path="res://Scripts/Player.cs" id="1_8dc05"]
 [ext_resource type="PackedScene" uid="uid://d20uxkpid4ynd" path="res://Models/vivi1.gltf" id="1_mqt2m"]
@@ -7,7 +7,8 @@
 [ext_resource type="Script" path="res://Scripts/CameraSystem.cs" id="3_5ecw2"]
 [ext_resource type="PackedScene" uid="uid://c13g5orvyhy1p" path="res://Models/moogle.gltf" id="4_dckjs"]
 [ext_resource type="Script" path="res://Scripts/NPCFollow.cs" id="4_o5mpp"]
-[ext_resource type="ArrayMesh" uid="uid://35saq7eyk446" path="res://Models/Cookie.obj" id="8_8xb3w"]
+[ext_resource type="Script" path="res://Scripts/DebugText.cs" id="8_ksx3s"]
+[ext_resource type="ArrayMesh" uid="uid://35saq7eyk446" path="res://Models/Cookie.obj" id="8_p45nj"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_8verc"]
 size = Vector3(100, 2, 100)
@@ -121,9 +122,16 @@ collision_mask = 16
 
 [node name="Cookie" type="MeshInstance3D" parent="CharacterBody3D"]
 transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -8.04457, -0.130408, -1.66095)
-mesh = ExtResource("8_8xb3w")
+mesh = ExtResource("8_p45nj")
 skeleton = NodePath("../..")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"]
 transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -8.04457, 0.690081, -1.66095)
 shape = SubResource("CapsuleShape3D_y33ih")
+
+[node name="DebugUI" type="Node2D" parent="."]
+
+[node name="TextEdit" type="TextEdit" parent="DebugUI"]
+offset_right = 3468.0
+offset_bottom = 777.0
+script = ExtResource("8_ksx3s")

Scenes/fireball.tscn

@@ -10,9 +10,16 @@ albedo_color = Color(0.666667, 0, 0.239216, 1)
 [node name="Fireball" type="Node3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.916843, 0)
 script = ExtResource("1_4ipg4")
+Cooldown = 0.3
 _projectileSpeed = 20.0
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.00392, 0)
 material_override = SubResource("StandardMaterial3D_jxwqo")
 mesh = SubResource("SphereMesh_6bhr7")
+
+[node name="TimeToLive" type="Timer" parent="."]
+one_shot = true
+autostart = true
+
+[connection signal="timeout" from="TimeToLive" to="." method="OnTimeToLiveTimeout"]

Scripts/Blizzard.cs

@@ -1,7 +1,9 @@
+using Godot;
+
 public partial class Blizzard : Projectile
 {
-   public override void _PhysicsProcess(double delta)
-   {
-      Translate(new Godot.Vector3(0, 0, Speed * (float)delta));
-   }
+  public override void _PhysicsProcess(double delta)
+  {
+    Translate(new Vector3(0, 0, Speed * (float)delta));
+  }
 }

Scripts/DebugText.cs

@@ -0,0 +1,15 @@
+using Godot;
+
+public partial class DebugText : TextEdit
+{
+  private Player _playerNode;
+
+  public override void _Ready()
+  {
+    _playerNode = GetNode<Player>("/root/Main/Player");
+  }
+  public override void _Process(double delta)
+  {
+    Text = $"Can Shoot: {_playerNode.CanShoot}";
+  }
+}

Scripts/Fireball.cs

@@ -2,8 +2,8 @@ using Godot;
 
 public partial class Fireball : Projectile
 {
-   public override void _PhysicsProcess(double delta)
-   {
-      Translate(new Vector3(0, 0, Speed * (float)delta));
-   }
+  public override void _PhysicsProcess(double delta)
+  {
+    Translate(new Vector3(0, 0, Speed * (float)delta));
+  }
 }

Scripts/Player.cs

@@ -4,93 +4,102 @@ using Godot.Collections;
 
 public partial class Player : CharacterBody3D
 {
-   [Export]
-   private float _speed = 5.0f;
-   [Export]
-   private float _jumpVelocity = 4.5f;
-   [Export]
-   private float _sensitivityHorizontal = 0.05f;
-   [Export]
-   private float _sensitivityVertical = 0.05f;
-   [Export]
-   private float _joystickDeadZone = 0.5f;
-   [Export]
-   private Array<PackedScene> _projectiles;
+  [Export]
+  private float _speed = 5.0f;
+  [Export]
+  private float _jumpVelocity = 4.5f;
+  [Export]
+  private float _sensitivityHorizontal = 0.05f;
+  [Export]
+  private float _sensitivityVertical = 0.05f;
+  [Export]
+  private float _joystickDeadZone = 0.5f;
+  [Export]
+  private Array<PackedScene> _projectiles;
 
-   private Node3D _cameraMount;
-   private Node3D _pivot;
-   private Node3D _camera;
-   private PackedScene _weaponType;
+  public bool CanShoot { get; private set; }
 
-   // Get the _gravity from the project settings to be synced with RigidBody nodes.
-   public float _gravity = ProjectSettings.GetSetting("physics/3d/default_gravity").AsSingle();
+  private Node3D _cameraMount;
+  private Node3D _pivot;
+  private Node3D _camera;
+  private PackedScene _weaponType;
 
-   public override void _Ready()
-   {
-      Input.MouseMode = Input.MouseModeEnum.Captured;
-      _cameraMount = GetNode<Node3D>("/root/Main/Player/CameraMount");
-      _camera = GetNode<Node3D>("/root/Main/Player/CameraMount/Camera");
-      _pivot = GetNode<Node3D>("/root/Main/Player/Pivot");
-      _weaponType = _projectiles.First();
-   }
+  // Get the _gravity from the project settings to be synced with RigidBody nodes.
+  public float _gravity = ProjectSettings.GetSetting("physics/3d/default_gravity").AsSingle();
+
+  public override void _Ready()
+  {
+    Input.MouseMode = Input.MouseModeEnum.Captured;
+    _cameraMount = GetNode<Node3D>("/root/Main/Player/CameraMount");
+    _camera = GetNode<Node3D>("/root/Main/Player/CameraMount/Camera");
+    _pivot = GetNode<Node3D>("/root/Main/Player/Pivot");
+    _weaponType = _projectiles.First();
+    CanShoot = true;
+  }
 
   public override void _Process(double delta)
   {
-      if (Input.IsActionJustPressed("quit"))
-         GetTree().Quit();
-      if (Input.IsActionJustPressed("shoot"))
-         Shoot();
-      if (Input.IsActionJustPressed("switch"))
-         SwitchWeaponType();
+    if (Input.IsActionJustPressed("quit"))
+      GetTree().Quit();
+    if (Input.IsActionJustPressed("shoot") && CanShoot)
+      Shoot();
+    if (Input.IsActionJustPressed("switch"))
+      SwitchWeaponType();
   }
 
   public override void _PhysicsProcess(double delta)
-   {
-      var gravityDelta = _gravity * (float)delta;
-      var velocity = CalculateMovement(Velocity, Transform, gravityDelta);
+  {
+    var gravityDelta = _gravity * (float)delta;
+    var velocity = CalculateMovement(Velocity, Transform, gravityDelta);
 
-      Velocity = velocity;
-      MoveAndSlide();
-   }
+    Velocity = velocity;
+    MoveAndSlide();
+  }
 
-   private void Shoot()
-   {
-      GD.Print("Shoot");
-      var projectile = _weaponType.Instantiate<Node3D>();
-      projectile.Position = Position;
-      projectile.Rotation = Rotation;
-      GetParent().AddChild(projectile);
-   }
+  private async void Shoot()
+  {
+    GD.Print("Shoot");
+    var projectile = _weaponType.Instantiate<Projectile>();
+    projectile.Position = Position;
+    projectile.Rotation = Rotation;
+    GetParent().AddChild(projectile);
+    CanShoot = false;
+    await ToSignal(GetTree().CreateTimer(projectile.Cooldown), "timeout");
+    CanShoot = true;
+  }
 
-   private void SwitchWeaponType()
-   {
-      var index = _projectiles.IndexOf(_weaponType);
-      _weaponType = _projectiles[(index + 1) % _projectiles.Count];
+  private async void SwitchWeaponType()
+  {
+    var index = _projectiles.IndexOf(_weaponType);
+    _weaponType = _projectiles[(index + 1) % _projectiles.Count];
+    CanShoot = false;
+    await ToSignal(GetTree().CreateTimer(.5), "timeout");
+    CanShoot = true;
 
-   }
+  }
 
-   private Vector3 CalculateMovement(Vector3 velocity, Transform3D transform, float gravityDelta)
-   {
-      if (!IsOnFloor())
-         velocity.Y -= gravityDelta;
+  private Vector3 CalculateMovement(Vector3 velocity, Transform3D transform, float gravityDelta)
+  {
+    if (!IsOnFloor())
+      velocity.Y -= gravityDelta;
 
-      if (Input.IsActionJustPressed("jump") && IsOnFloor())
-         velocity.Y = _jumpVelocity;
+    if (Input.IsActionJustPressed("jump") && IsOnFloor())
+      velocity.Y = _jumpVelocity;
 
-      Vector2 inputDir = Input.GetVector("right", "left", "back", "forward");
-      Vector3 direction = (transform.Basis * new Vector3(inputDir.X, 0, inputDir.Y)).Normalized();
-      if (direction != Vector3.Zero)
-      {
-         velocity.X = direction.X * _speed;
-         velocity.Z = direction.Z * _speed;
-         GetNode<Node3D>("Pivot").LookAt(Position + direction.Normalized(), Vector3.Up);
-      }
-      else
-      {
-         velocity.X = Mathf.MoveToward(Velocity.X, 0, _speed);
-         velocity.Z = Mathf.MoveToward(Velocity.Z, 0, _speed);
-      }
+    Vector2 inputDir = Input.GetVector("right", "left", "back", "forward");
+    Vector3 direction = (transform.Basis * new Vector3(inputDir.X, 0, inputDir.Y)).Normalized();
+    if (direction != Vector3.Zero)
+    {
+      velocity.X = direction.X * _speed;
+      velocity.Z = direction.Z * _speed;
+      GetNode<Node3D>("Pivot").LookAt(Position + direction.Normalized(), Vector3.Up);
+    }
+    else
+    {
+      velocity.X = Mathf.MoveToward(Velocity.X, 0, _speed);
+      velocity.Z = Mathf.MoveToward(Velocity.Z, 0, _speed);
+    }
 
-      return velocity;
-   }
+    return velocity;
+  }
 }

Scripts/Projectile.cs

@@ -2,13 +2,21 @@
 
 public partial class Projectile : Node3D
 {
-   [Export]
-   private float _projectileSpeed = 0.1f;
+  [Export]
+  public double Cooldown { get; protected set; }
 
-   public override void _Ready()
-   {
-      Speed = _projectileSpeed;
-   }
+  [Export]
+  private float _projectileSpeed = 0.1f;
 
-   public float Speed { get; private set; }
+  public override void _Ready()
+  {
+    Speed = _projectileSpeed;
+  }
+
+  public float Speed { get; private set; }
+
+  public void OnTimeToLiveTimeout()
+  {
+    QueueFree();
+  }
 }

Scripts/WeaponType.cs

@@ -1,8 +0,0 @@
-namespace Sandbox.Scripts
-{
-   internal enum WeaponType
-   {
-      Fire = 0,
-      Blizzard = 1
-   }
-}

project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Sandbox"
 run/main_scene="res://Scenes/Main.tscn"
-config/features=PackedStringArray("4.0", "C#", "Forward Plus")
+config/features=PackedStringArray("4.1", "C#", "Forward Plus")
 
 [dotnet]