From f15e1031bdca5e10f1b2194dfa8d807566e56729 Mon Sep 17 00:00:00 2001
From: Zenny <zenayi@gmail.com>
Date: Mon, 17 Jul 2023 13:10:38 -0700
Subject: [PATCH] Merge cont

---
 Models/Cookie.blend.import | 48 ++++++++++++++++++++++++++++++++++++++
 Sandbox.csproj             |  2 +-
 Sandbox.csproj.old         |  9 +++++++
 Scenes/Main.tscn           |  6 ++---
 Scripts/DebugText.cs       | 15 ++++++++++++
 project.godot              |  2 +-
 6 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 Models/Cookie.blend.import
 create mode 100644 Sandbox.csproj.old
 create mode 100644 Scripts/DebugText.cs

diff --git a/Models/Cookie.blend.import b/Models/Cookie.blend.import
new file mode 100644
index 0000000..316ff9b
--- /dev/null
+++ b/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
diff --git a/Sandbox.csproj b/Sandbox.csproj
index 6d96b26..101e97a 100644
--- a/Sandbox.csproj
+++ b/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>
diff --git a/Sandbox.csproj.old b/Sandbox.csproj.old
new file mode 100644
index 0000000..6d96b26
--- /dev/null
+++ b/Sandbox.csproj.old
@@ -0,0 +1,9 @@
+<Project Sdk="Godot.NET.Sdk/4.0.3">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+  </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="Scenes\" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Scenes/Main.tscn b/Scenes/Main.tscn
index d0462ab..42dc480 100644
--- a/Scenes/Main.tscn
+++ b/Scenes/Main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=15 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"]
@@ -8,7 +8,7 @@
 [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="Script" path="res://Scripts/DebugText.cs" id="8_ksx3s"]
-[ext_resource type="ArrayMesh" uid="uid://35saq7eyk446" path="res://Models/Cookie.obj" id="8_8xb3w"]
+[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)
@@ -122,7 +122,7 @@ 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"]
diff --git a/Scripts/DebugText.cs b/Scripts/DebugText.cs
new file mode 100644
index 0000000..4379c13
--- /dev/null
+++ b/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}";
+  }
+}
diff --git a/project.godot b/project.godot
index 33a47fb..18e928a 100644
--- a/project.godot
+++ b/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]