Skip to content

Commit 3af56f8

Browse files
NathanLovatoNathanLovato
committed
chore: rework end project files to match video series
1 parent 6c5306a commit 3af56f8

File tree

19 files changed

+266
-123
lines changed

19 files changed

+266
-123
lines changed

3d-project-completed/game.gd renamed to 3d-project-completed/lessons_reference/video_16/game.gd

File renamed without changes.

3d-project-completed/game.tscn renamed to 3d-project-completed/lessons_reference/video_16/game.tscn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[gd_scene load_steps=9 format=3 uid="uid://bpqvmc7qt8xut"]
22

3-
[ext_resource type="PackedScene" uid="uid://d3kp34dihjeyd" path="res://player/player_controller.tscn" id="1_fqdcw"]
4-
[ext_resource type="Script" path="res://game.gd" id="1_xym6k"]
3+
[ext_resource type="PackedScene" uid="uid://d3kp34dihjeyd" path="res://lessons_reference/video_16/player/player.tscn" id="1_fqdcw"]
4+
[ext_resource type="Script" path="res://lessons_reference/video_16/game.gd" id="1_xym6k"]
55
[ext_resource type="Material" uid="uid://spdpie6nlr1q" path="res://level/bridges.tres" id="4_mc4jw"]
6-
[ext_resource type="PackedScene" uid="uid://xtl5acmpaa04" path="res://mob/spawner_3d.tscn" id="5_7vlo8"]
7-
[ext_resource type="PackedScene" uid="uid://dfwbq2vombjvr" path="res://mob/mob.tscn" id="5_787o4"]
6+
[ext_resource type="PackedScene" uid="uid://xtl5acmpaa04" path="res://lessons_reference/video_16/mob/spawner_3d.tscn" id="5_7vlo8"]
7+
[ext_resource type="PackedScene" uid="uid://dfwbq2vombjvr" path="res://lessons_reference/video_16/mob/mob.tscn" id="5_787o4"]
88
[ext_resource type="Material" uid="uid://cp4gi8r3s3twb" path="res://level/platforms.tres" id="5_l41we"]
99

1010
[sub_resource type="Environment" id="Environment_pev5d"]

3d-project-completed/mob/bat/bat_skin.gd renamed to 3d-project-completed/lessons_reference/video_16/mob/bat/bat_model.gd

File renamed without changes.

‎3d-project-completed/lessons_reference/video_16/mob/bat/bat_model.tscn‎

Lines changed: 171 additions & 0 deletions
Large diffs are not rendered by default.

3d-project-completed/mob/bat/bat_skin.tscn renamed to 3d-project-completed/lessons_reference/video_16/mob/bat/bat_skin.tscn

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
[gd_scene load_steps=13 format=3 uid="uid://brv1jmhrpfw7p"]
1+
[gd_scene load_steps=12 format=3 uid="uid://brv1jmhrpfw7p"]
22

3-
[ext_resource type="Script" path="res://mob/bat/bat_skin.gd" id="1_ppjak"]
43
[ext_resource type="PackedScene" uid="uid://cb4uxoephhm18" path="res://mob/bat/bat_model.glb" id="1_tpnu0"]
54
[ext_resource type="Material" uid="uid://c28yvvp6nnmq4" path="res://mob/bat/bat_material.tres" id="3_41uov"]
65

@@ -134,6 +133,7 @@ _data = {
134133
}
135134

136135
[sub_resource type="Animation" id="Animation_dh2rk"]
136+
resource_name = "hurt"
137137
length = 0.2
138138
tracks/0/type = "value"
139139
tracks/0/imported = false
@@ -186,26 +186,25 @@ nodes/output/position = Vector2(720, 97.7778)
186186
node_connections = [&"HurtShot", 0, &"idle", &"HurtShot", 1, &"hurt", &"output", 0, &"HurtShot"]
187187

188188
[node name="BatSkin" type="Node3D"]
189-
script = ExtResource("1_ppjak")
190189

191190
[node name="bat" parent="." instance=ExtResource("1_tpnu0")]
192191
unique_name_in_owner = true
193192
transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0, 0, 0)
194193

195194
[node name="Skeleton3D" parent="bat/Armature" index="0"]
196-
bones/0/position = Vector3(0, 0.0049879, 0)
197-
bones/1/rotation = Quaternion(0.0260107, 0.133295, -0.690319, 0.710644)
198-
bones/2/rotation = Quaternion(0.0372676, 0.012441, 0.309049, 0.950234)
199-
bones/3/rotation = Quaternion(0.121165, 0.0884758, 0.299659, 0.942176)
200-
bones/4/rotation = Quaternion(0.0260107, -0.133295, 0.690319, 0.710644)
201-
bones/5/rotation = Quaternion(0.0372676, -0.012441, -0.309049, 0.950234)
202-
bones/6/rotation = Quaternion(0.121165, -0.0884758, -0.299659, 0.942176)
195+
bones/0/position = Vector3(0, 0.00849031, 0)
196+
bones/1/rotation = Quaternion(0.0443379, 0.115217, -0.688357, 0.71479)
197+
bones/2/rotation = Quaternion(0.0632529, 0.0216032, 0.319841, 0.945111)
198+
bones/3/rotation = Quaternion(0.139189, 0.0960697, 0.309345, 0.93579)
199+
bones/4/rotation = Quaternion(0.0443379, -0.115217, 0.688357, 0.71479)
200+
bones/5/rotation = Quaternion(0.0632529, -0.0216032, -0.319841, 0.945111)
201+
bones/6/rotation = Quaternion(0.139189, -0.0960697, -0.309345, 0.93579)
203202
bones/7/position = Vector3(0.130992, -0.227392, -0.0878515)
204203
bones/7/rotation = Quaternion(0.261968, 0.0834552, 0.265751, 0.924005)
205-
bones/8/rotation = Quaternion(3.84036e-08, 0.702774, 0.711413, 2.26466e-08)
204+
bones/8/rotation = Quaternion(3.84836e-08, 0.702774, 0.711413, 2.27266e-08)
206205
bones/10/position = Vector3(-0.130992, -0.227392, -0.0878515)
207206
bones/10/rotation = Quaternion(0.261968, -0.0834552, -0.265751, 0.924005)
208-
bones/11/rotation = Quaternion(2.13885e-08, 0.702774, 0.711413, 3.52665e-08)
207+
bones/11/rotation = Quaternion(2.13084e-08, 0.702774, 0.711413, 3.51865e-08)
209208

210209
[node name="bat" parent="bat/Armature/Skeleton3D" index="0"]
211210
surface_material_override/0 = ExtResource("3_41uov")

3d-project-completed/mob/mob.gd renamed to 3d-project-completed/lessons_reference/video_16/mob/mob.gd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ extends RigidBody3D
22

33
signal died
44

5-
var speed = randf_range(2, 4)
5+
var speed = randf_range(2.0, 4.0)
66
var health = 3
77

88
@onready var player = get_node("/root/Game/Player")
9-
@onready var bat_skin = %BatSkin
9+
@onready var bat_model = %bat_model
1010

1111
@onready var hurt_sound = %HurtSound
1212
@onready var ko_sound = %KOSound
@@ -16,14 +16,14 @@ func _physics_process(delta):
1616
var direction = global_position.direction_to(player.global_position)
1717
direction.y = 0.0
1818
linear_velocity = direction * speed
19-
bat_skin.rotation.y = -Vector2(direction.x, direction.z).angle() - PI / 2.0
19+
bat_model.rotation.y = Vector3.FORWARD.signed_angle_to(direction, Vector3.UP) + PI
2020

2121

2222
func take_damage():
2323
if health <= 0:
2424
return
2525

26-
bat_skin.hurt()
26+
bat_model.hurt()
2727
health -= 1
2828
hurt_sound.pitch_scale = randfn(1.0, 0.1)
2929
hurt_sound.play()

3d-project-completed/mob/mob.tscn renamed to 3d-project-completed/lessons_reference/video_16/mob/mob.tscn

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
1-
[gd_scene load_steps=7 format=3 uid="uid://dfwbq2vombjvr"]
1+
[gd_scene load_steps=6 format=3 uid="uid://dfwbq2vombjvr"]
22

3-
[ext_resource type="Script" path="res://mob/mob.gd" id="1_ebh3x"]
4-
[ext_resource type="PackedScene" uid="uid://brv1jmhrpfw7p" path="res://mob/bat/bat_skin.tscn" id="2_4oaqh"]
3+
[ext_resource type="Script" path="res://lessons_reference/video_16/mob/mob.gd" id="1_ebh3x"]
4+
[ext_resource type="PackedScene" uid="uid://12e7gwo50sef" path="res://lessons_reference/video_16/mob/bat/bat_model.tscn" id="2_5vr7j"]
55
[ext_resource type="AudioStream" uid="uid://bec5opkuf77c7" path="res://mob/mob_take_damage.wav" id="3_sikhy"]
66
[ext_resource type="AudioStream" uid="uid://ha0bp3cygkq1" path="res://mob/mob_ko.wav" id="4_qnk8k"]
77

8-
[sub_resource type="SphereMesh" id="SphereMesh_7xh84"]
9-
108
[sub_resource type="SphereShape3D" id="SphereShape3D_gkbwe"]
119

1210
[node name="Mob" type="RigidBody3D"]
1311
top_level = true
1412
gravity_scale = 0.0
1513
script = ExtResource("1_ebh3x")
1614

17-
[node name="BatSkin" parent="." instance=ExtResource("2_4oaqh")]
15+
[node name="bat_model" parent="." instance=ExtResource("2_5vr7j")]
1816
unique_name_in_owner = true
1917

20-
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
21-
visible = false
22-
mesh = SubResource("SphereMesh_7xh84")
23-
2418
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
2519
shape = SubResource("SphereShape3D_gkbwe")
2620

3d-project-completed/mob/spawner_3d.gd renamed to 3d-project-completed/lessons_reference/video_16/mob/spawner_3d.gd

File renamed without changes.

3d-project-completed/mob/spawner_3d.tscn renamed to 3d-project-completed/lessons_reference/video_16/mob/spawner_3d.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=3 format=3 uid="uid://xtl5acmpaa04"]
22

3-
[ext_resource type="Script" path="res://mob/spawner_3d.gd" id="1_5kn8d"]
3+
[ext_resource type="Script" path="res://lessons_reference/video_16/mob/spawner_3d.gd" id="1_5kn8d"]
44
[ext_resource type="PackedScene" uid="uid://c2oal6rrmeo67" path="res://mob/spawner/spawner_skin.tscn" id="2_vlo78"]
55

66
[node name="MobSpawner3D" type="Node3D"]

3d-project-completed/player/bullet_3d.gd renamed to 3d-project-completed/lessons_reference/video_16/player/bullet_3d.gd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
extends Area3D
22

3-
const SPEED = 55
4-
const RANGE = 40
3+
const SPEED = 55.0
4+
const RANGE = 40.0
55

6-
var travelled_distance = 0
6+
var travelled_distance = 0.0
77

88

99
func _physics_process(delta):

0 commit comments

Comments
 (0)