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

Progress check-in to laptop

Browse Source
This commit is contained in:
Zenny
2023-09-10 19:49:59 -07:00
parent ed28a4bb70
commit ebf9f6c117
18 changed files with 806 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Enemies/GodCircuit.tscn
View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=12 format=3 uid="uid://brbshysbgd47q"]
[gd_scene load_steps=13 format=3 uid="uid://brbshysbgd47q"]
[ext_resource type="Script" path="res://Enemies/Scripts/GodCircuit.cs" id="1_gyfww"]
[ext_resource type="Texture2D" uid="uid://b41ur7kyd8vdl" path="res://Levels/Models/Stage10/god circuit stage 1_image.png" id="2_2fhjk"]
[ext_resource type="Shader" path="res://Levels/Scenes/Door.gdshader" id="3_05w5o"]
[ext_resource type="AudioStream" uid="uid://crto2nljfvqnm" path="res://Audio/SFX/midboss hurt.wav" id="4_kc3iq"]
[sub_resource type="Animation" id="Animation_n85p2"]
resource_name = "OnHit"
@@ -31,6 +32,18 @@ tracks/1/keys = {
"update": 1,
"values": [0, 1, 0]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("AudioStreamPlayer:playing")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [true]
}
[sub_resource type="Animation" id="Animation_47f75"]
length = 0.001
@@ -58,6 +71,18 @@ tracks/1/keys = {
"update": 1,
"values": [0]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("AudioStreamPlayer:playing")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [true]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_qiwcq"]
_data = {
@@ -145,4 +170,7 @@ can_sleep = false
transform = Transform3D(1, 0, 0, 0, 1, 0, 4.30333e-22, 0, 1, 0.317906, -0.678684, 1.59406)
shape = SubResource("BoxShape3D_n2erm")
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource("4_kc3iq")
[connection signal="body_entered" from="StaticBody3D" to="." method="OnHit"]

22
Enemies/MeleeEnemy.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=48 format=3 uid="uid://bt5rolsyjmx55"]
[gd_scene load_steps=49 format=3 uid="uid://bt5rolsyjmx55"]
[ext_resource type="Script" path="res://Enemies/Scripts/MeleeEnemy.cs" id="1_50och"]
[ext_resource type="PackedScene" uid="uid://b1j0g6ikmnibm" path="res://Enemies/HPComponent.tscn" id="2_1leby"]
@@ -1174,11 +1174,13 @@ _data = {
"Animation": SubResource("Animation_xyhqi")
}
[sub_resource type="BoxShape3D" id="BoxShape3D_1kyxx"]
size = Vector3(0.540778, 1.5012, 0.644069)
[node name="Melee Enemy" type="CharacterBody3D" node_paths=PackedStringArray("_hp") groups=["Enemy"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.251952, 0)
collision_layer = 0
collision_mask = 5
axis_lock_angular_x = true
collision_mask = 4
script = ExtResource("1_50och")
_hp = NodePath("HP Component")
@@ -1247,3 +1249,17 @@ libraries = {
[node name="HP Component" parent="." instance=ExtResource("2_1leby")]
MaximumHP = 1
[node name="RigidBody3D" type="RigidBody3D" parent="."]
collision_layer = 2
collision_mask = 3
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 20
contact_monitor = true
can_sleep = false
freeze = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0726432, 0.732257, 0.127868)
shape = SubResource("BoxShape3D_1kyxx")

34
Enemies/RangedEnemy.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=61 format=3 uid="uid://dahp73fwld24h"]
[gd_scene load_steps=60 format=3 uid="uid://dahp73fwld24h"]
[ext_resource type="Script" path="res://Enemies/Scripts/RangedEnemy.cs" id="1_01lvj"]
[ext_resource type="PackedScene" uid="uid://rlxnnw4yay7e" path="res://Enemies/Attacks/EnemyBullet.tscn" id="3_qenx3"]
@@ -891,16 +891,10 @@ _surfaces = [{
blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_j7wsk")
[sub_resource type="Animation" id="Animation_201mc"]
resource_name = "OnHit"
length = 0.2
[sub_resource type="BoxShape3D" id="BoxShape3D_wt0ss"]
size = Vector3(0.721796, 2.37333, 0.564825)
[sub_resource type="AnimationLibrary" id="AnimationLibrary_f1x7o"]
_data = {
"OnHit": SubResource("Animation_201mc")
}
[node name="CharacterBody" type="CharacterBody3D" node_paths=PackedStringArray("_hp") groups=["Enemy"]]
[node name="RangedEnemy" type="CharacterBody3D" 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 = 5
@@ -1066,11 +1060,21 @@ mesh = SubResource("ArrayMesh_lu7e3")
skeleton = NodePath("")
[node name="HP Component" parent="." instance=ExtResource("4_1vt55")]
MaximumHP = 2
MaximumHP = 1
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_f1x7o")
}
[node name="RigidBody3D" type="RigidBody3D" parent="."]
collision_layer = 0
collision_mask = 3
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 20
contact_monitor = true
can_sleep = false
freeze = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0734575, 0.791657, 0)
shape = SubResource("BoxShape3D_wt0ss")
[connection signal="timeout" from="Timer" to="Timer" method="OnFireAtPlayer"]
[connection signal="body_entered" from="RigidBody3D" to="." method="OnPlayerHit"]

10
Enemies/Scripts/BasicEnemy.cs
View File

@@ -23,4 +23,14 @@ public partial class BasicEnemy : Node3D
QueueFree();
}
}
public void OnPlayerHit(Node3D node)
{
GD.Print("Collision with player");
if (node is Character character && character.HasMethod(Character.MethodName.OnHit))
{
GD.Print("Player hit: " + character.Name);
character.Call(Character.MethodName.OnHit, node);
}
}
}