From 78a873529a54824bbc3aadb99e3ec8c6ccd703cf Mon Sep 17 00:00:00 2001 From: Zenny Date: Sat, 2 Sep 2023 13:40:50 -0700 Subject: [PATCH] Fix Project --- Scenes/2DTest.tscn | 9 --------- Scenes/TestCharacter.tscn | 4 ++-- Scenes/TestEnemy.tscn | 2 +- Scenes/TestLevel.cs | 16 ---------------- Scenes/TestLevel.tscn | 6 +++--- Scripts/TestCharacter.cs | 5 ++--- {Scenes => Scripts}/TestEnemy.cs | 0 Scripts/TestLevel.cs | 14 ++++++++++++++ 8 files changed, 22 insertions(+), 34 deletions(-) delete mode 100644 Scenes/2DTest.tscn delete mode 100644 Scenes/TestLevel.cs rename {Scenes => Scripts}/TestEnemy.cs (100%) create mode 100644 Scripts/TestLevel.cs diff --git a/Scenes/2DTest.tscn b/Scenes/2DTest.tscn deleted file mode 100644 index b152ac1..0000000 --- a/Scenes/2DTest.tscn +++ /dev/null @@ -1,9 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://0em7im554tr4"] - -[ext_resource type="PackedScene" uid="uid://d3m6e5iduqxhh" path="res://Levels/levelTEST-col.gltf" id="1_fyfwj"] - -[node name="2DTest" type="Node2D"] - -[node name="levelTEST-col" parent="." instance=ExtResource("1_fyfwj")] - -[node name="Camera2D" type="Camera2D" parent="."] diff --git a/Scenes/TestCharacter.tscn b/Scenes/TestCharacter.tscn index a58ab62..1f260cf 100644 --- a/Scenes/TestCharacter.tscn +++ b/Scenes/TestCharacter.tscn @@ -15,7 +15,7 @@ height = 1.67894 script = ExtResource("1_hddqi") [node name="Pivot" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 0, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) [node name="fwitch" parent="Pivot" instance=ExtResource("4_n3637")] @@ -29,7 +29,7 @@ transform = Transform3D(0.999665, -0.0258978, -7.10543e-15, 0.0258978, 0.999665, shape = SubResource("CapsuleShape3D_ayco3") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866026, 0.5, 0, 1.46483, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.06805, -0.211049) shape = SubResource("CapsuleShape3D_fqik1") [connection signal="body_entered" from="Pivot/Area3D" to="." method="OnHit"] diff --git a/Scenes/TestEnemy.tscn b/Scenes/TestEnemy.tscn index ea50a71..0e13d29 100644 --- a/Scenes/TestEnemy.tscn +++ b/Scenes/TestEnemy.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://dkjdt7uq3a4j3"] [ext_resource type="ArrayMesh" uid="uid://d3u564wle888o" path="res://Models/TestModels/Ness/nesspoly.obj" id="1_jhe4l"] -[ext_resource type="Script" path="res://Scenes/TestEnemy.cs" id="1_m03um"] +[ext_resource type="Script" path="res://Scripts/TestEnemy.cs" id="1_m03um"] [ext_resource type="PackedScene" uid="uid://rlxnnw4yay7e" path="res://Scenes/EnemyBullet.tscn" id="2_h68e2"] [ext_resource type="Script" path="res://Scripts/FireAtPlayer.cs" id="3_dhmfs"] diff --git a/Scenes/TestLevel.cs b/Scenes/TestLevel.cs deleted file mode 100644 index 2c4c650..0000000 --- a/Scenes/TestLevel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Godot; - -public partial class TestLevel : Node3D -{ - [Export] - private Marker3D _spawnPoint; - - public override void _Ready() - { - var players = GetTree().GetNodesInGroup("Player"); - foreach (TestCharacter player in players) - { - player.Transform = _spawnPoint.Transform; - } - } -} diff --git a/Scenes/TestLevel.tscn b/Scenes/TestLevel.tscn index 06ac0b3..60bdf09 100644 --- a/Scenes/TestLevel.tscn +++ b/Scenes/TestLevel.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=13 format=3 uid="uid://dy3d4e6qegyjg"] +[ext_resource type="Script" path="res://Scripts/TestLevel.cs" id="1_blhn0"] [ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/TestCharacter.tscn" id="1_fwf6c"] -[ext_resource type="Script" path="res://Scenes/TestLevel.cs" id="1_q0cc6"] [ext_resource type="PackedScene" uid="uid://bckd04543occ5" path="res://Levels/levelTEST.gltf" id="2_afl3s"] [ext_resource type="PackedScene" uid="uid://dkjdt7uq3a4j3" path="res://Scenes/TestEnemy.tscn" id="3_ds7vi"] [ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/TestBullet.tscn" id="3_lmb02"] @@ -29,7 +29,7 @@ height = 5.0 radius = 2.06347 [node name="Level" type="Node3D" node_paths=PackedStringArray("_spawnPoint")] -script = ExtResource("1_q0cc6") +script = ExtResource("1_blhn0") _spawnPoint = NodePath("SpawnPoint") [node name="Camera3D" type="Camera3D" parent="."] @@ -100,4 +100,4 @@ shape = SubResource("CylinderShape3D_krlem") transform = Transform3D(0.998405, 0.0226647, 0.0517184, -0.0544217, 0.630486, 0.77429, -0.0150588, -0.775869, 0.630714, -20.5579, 5.52246, -43.2246) [node name="SpawnPoint" type="Marker3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.757998, 6.71652, -10.4768) +transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.757998, 6.71652, -10.4768) diff --git a/Scripts/TestCharacter.cs b/Scripts/TestCharacter.cs index 86a9b9d..1114511 100644 --- a/Scripts/TestCharacter.cs +++ b/Scripts/TestCharacter.cs @@ -36,14 +36,13 @@ public partial class TestCharacter : CharacterBody3D if (direction != Vector3.Zero) { velocity.X = direction.X * _speed; - velocity.Z = direction.Z * _speed; + velocity.Z = direction.Z * _speed * 2; GetNode("Pivot").LookAt(Position + direction, Vector3.Forward + Vector3.Up); - GetNode("CollisionShape3D").LookAt(Position + direction, Vector3.Forward + Vector3.Up); } else { velocity.X = Mathf.MoveToward(Velocity.X, 0, _speed); - velocity.Z = Mathf.MoveToward(Velocity.Z, 0, _speed); + velocity.Z = Mathf.MoveToward(Velocity.Z, 0, _speed * 2); } return velocity; } diff --git a/Scenes/TestEnemy.cs b/Scripts/TestEnemy.cs similarity index 100% rename from Scenes/TestEnemy.cs rename to Scripts/TestEnemy.cs diff --git a/Scripts/TestLevel.cs b/Scripts/TestLevel.cs new file mode 100644 index 0000000..5f9b92a --- /dev/null +++ b/Scripts/TestLevel.cs @@ -0,0 +1,14 @@ +using Godot; + +public partial class TestLevel : Node3D +{ + [Export] + private Marker3D _spawnPoint; + + public override void _Ready() + { + var players = GetTree().GetNodesInGroup("Player"); + foreach (TestCharacter player in players) + player.Transform = _spawnPoint.Transform; + } +}