GameJammer/GameJam2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix various issues

Browse Source
This commit is contained in:
Zenny
2023-09-12 09:35:00 -07:00
parent a5d36734ef
commit 37180e2def
21 changed files with 247 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Enemies/Attacks/EnemyBullet.tscn
View File

@@ -11,7 +11,7 @@ _data = {
point_count = 2
[sub_resource type="CylinderShape3D" id="CylinderShape3D_e4v7f"]
height = 15.359
height = 7.0
radius = 0.154574
[node name="EnemyBullet" type="Path3D"]
@@ -26,7 +26,7 @@ tilt_enabled = false
[node name="RigidBody3D" type="RigidBody3D" parent="PathFollow3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
collision_layer = 0
collision_mask = 3
collision_mask = 2
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 10

21
Enemies/MeleeEnemy.tscn
View File

@@ -1176,16 +1176,14 @@ _data = {
[node name="Melee Enemy" type="RigidBody3D" node_paths=PackedStringArray("_hp") groups=["Enemy"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.251952, 0)
disable_mode = 2
collision_layer = 0
collision_mask = 69
axis_lock_angular_x = true
axis_lock_angular_z = true
collision_mask = 33
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 20
contact_monitor = true
can_sleep = false
freeze = true
freeze_mode = 1
script = ExtResource("1_50och")
_hp = NodePath("HP Component")
@@ -1194,7 +1192,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401
shape = SubResource("BoxShape3D_1nq5h")
[node name="MeleeEnemy" type="Node3D" parent="CollisionShape3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0840461, -0.010569, -0.143401)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0840461, -0.612543, -0.143401)
[node name="Icosphere001" type="MeshInstance3D" parent="CollisionShape3D/MeleeEnemy"]
transform = Transform3D(0.850843, 0, 0, 0, 0.850843, 0, 0, 0, 0.850843, 0.0805536, 0.468312, 0.158035)
@@ -1255,4 +1253,13 @@ libraries = {
[node name="HP Component" parent="." instance=ExtResource("2_1leby")]
MaximumHP = 1
[connection signal="body_entered" from="." to="." method="OnPlayerHit"]
[node name="Area3D" type="Area3D" parent="."]
collision_layer = 0
collision_mask = 68
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401)
shape = SubResource("BoxShape3D_1nq5h")
[connection signal="body_entered" from="Area3D" to="." method="OnEnemyHit"]
[connection signal="body_entered" from="Area3D" to="." method="OnPlayerHit"]

3
Enemies/RangedEnemy.tscn
View File

@@ -894,7 +894,7 @@ shadow_mesh = SubResource("ArrayMesh_j7wsk")
[node name="RangedEnemy" type="RigidBody3D" node_paths=PackedStringArray("_hp") groups=["Enemy"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.257979, 0)
collision_layer = 0
collision_mask = 69
collision_mask = 68
gravity_scale = 0.0
max_contacts_reported = 20
contact_monitor = true
@@ -905,6 +905,7 @@ script = ExtResource("1_01lvj")
_hp = NodePath("HP Component")
[node name="Timer" type="Timer" parent="." node_paths=PackedStringArray("_enemy")]
wait_time = 0.75
autostart = true
script = ExtResource("3_qt2md")
_enemy = NodePath("..")

3
Enemies/Scripts/BasicEnemy.cs
View File

@@ -14,6 +14,9 @@ public partial class BasicEnemy : Node3D
public void OnEnemyHit(Node3D node)
{
if (node is Character)
return;
_hp.TakeDamage(1);
if (_hp.CurrentHP <= 0)