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

Fix megami box

Browse Source
This commit is contained in:
Zenny
2023-09-06 19:51:25 -07:00
parent 41adf908a5
commit 7733032397
8 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Enemies/RangedEnemy.tscn
View File

@@ -1063,4 +1063,4 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0714533, 0.795379, 0.013890
shape = SubResource("BoxShape3D_dm3u7")
[connection signal="timeout" from="Timer" to="Timer" method="OnFireAtPlayer"]
[connection signal="body_exited" from="Area3D" to="." method="OnEnemyHit"]
[connection signal="body_entered" from="Area3D" to="." method="OnEnemyHit"]

2
Levels/ExitPortal.tscn
View File

@@ -103,6 +103,8 @@ libraries = {
[node name="Area3D" type="Area3D" parent="." index="4"]
disable_mode = 2
collision_layer = 8
collision_mask = 8
script = ExtResource("2_4y188")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" index="0"]

2
Player/Base/Character.cs
View File

@@ -50,6 +50,8 @@ public partial class Character : CharacterBody3D
var inputDir = Input.GetVector(OwnerPlayer.PlayerInput.Left(), OwnerPlayer.PlayerInput.Right(), OwnerPlayer.PlayerInput.Up(), OwnerPlayer.PlayerInput.Down());
var direction = (Transform.Basis * new Vector3(inputDir.X, 0, inputDir.Y)).Normalized();
direction = new Vector3(direction.X, 0, direction.Z);
if (direction != Vector3.Zero)
{
velocity.X = direction.X * _speed;

2
Player/Capricorn/Capricorn.tscn
View File

@@ -216,7 +216,7 @@ size = Vector3(0.856928, 1.65704, 0.82877)
[node name="Capricorn" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.408962, 0)
collision_layer = 17
collision_layer = 25
motion_mode = 1
script = ExtResource("1_aqn5t")
_fireProjectile = ExtResource("2_e6qos")

2
Player/Pisces/Pisces.tscn
View File

@@ -14,7 +14,7 @@ height = 1.67894
[node name="Pisces" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(0.33, 0, 0, 0, 0.33, 0, 0, 0, 0.33, 0, 0.332056, 0)
collision_layer = 17
collision_layer = 25
motion_mode = 1
script = ExtResource("1_gp8nm")
_fireProjectile = ExtResource("2_rsvhh")

18
Player/Sagittarius/Sagittarius.tscn
View File

@@ -601,8 +601,7 @@ blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_htkik")
[node name="Sagittarius" type="CharacterBody3D" groups=["Player"]]
collision_layer = 0
collision_mask = 0
collision_layer = 9
motion_mode = 1
slide_on_ceiling = false
floor_stop_on_slope = false
@@ -610,15 +609,10 @@ script = ExtResource("1_s1hsr")
_fireProjectile = ExtResource("2_c3ma7")
_altFireProjectile = ExtResource("2_c3ma7")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.726881, 0.14479)
shape = SubResource("BoxShape3D_te8tc")
[node name="Pivot" type="Node3D" parent="."]
[node name="RigidBody3D" type="RigidBody3D" parent="Pivot"]
collision_layer = 17
collision_mask = 17
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 1
@@ -630,9 +624,6 @@ freeze = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.726881, 0.14479)
shape = SubResource("BoxShape3D_te8tc")
[node name="megami" type="Node3D" parent="Pivot/RigidBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0476897, 0, 0.00673294)
[node name="Plane" type="MeshInstance3D" parent="Pivot/RigidBody3D"]
transform = Transform3D(0.00858108, 0.00109693, 0.00129912, 0, 0.00668392, -0.00564368, -0.00170029, 0.00553605, 0.00655646, 0.0457722, 1.25172, -0.0470017)
mesh = SubResource("ArrayMesh_5aftx")
@@ -646,4 +637,11 @@ collision_mask = 4100
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.726881, 0.14479)
shape = SubResource("BoxShape3D_te8tc")
[node name="megami" type="Node3D" parent="Pivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0476897, 0, 0.00673294)
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.726881, 0.14479)
shape = SubResource("BoxShape3D_te8tc")
[connection signal="body_entered" from="Pivot/RigidBody3D/Area3D" to="." method="OnHit"]

3
Player/Scorpio/Models/ScorpioAnimated.tscn
View File

@@ -58,9 +58,10 @@ _data = {
}
[node name="scoprion" type="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.125745, 0)
[node name="Cube" type="MeshInstance3D" parent="."]
transform = Transform3D(0.0769273, 0, 0.0568499, 0, 0.082328, 0, -0.0293272, 0, 0.149121, 0, 0, 0)
transform = Transform3D(0.0813447, 0, 0.0245918, 0, 0.082328, 0, -0.0126862, 0, 0.157684, 0, 0, 0)
mesh = SubResource("ArrayMesh_lnvn0")
skeleton = NodePath("")

7
Player/Scorpio/Scorpio.tscn
View File

@@ -13,6 +13,7 @@ size = Vector3(0.822782, 0.853857, 0.80108)
[node name="Scorpio" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55696, 0)
collision_layer = 9
motion_mode = 1
slide_on_ceiling = false
script = ExtResource("1_gw30u")
@@ -22,8 +23,6 @@ _altFireProjectile = ExtResource("3_tw078")
[node name="Pivot" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.496155, 0)
[node name="scoprion" parent="Pivot" instance=ExtResource("2_pahgr")]
[node name="Area3D" type="Area3D" parent="Pivot"]
collision_layer = 16
collision_mask = 4100
@@ -31,8 +30,10 @@ collision_mask = 4100
[node name="CollisionShape3D" type="CollisionShape3D" parent="Pivot/Area3D"]
shape = SubResource("BoxShape3D_wqp0e")
[node name="scoprion" parent="Pivot" instance=ExtResource("2_pahgr")]
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.315199, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.506071, 0)
shape = SubResource("BoxShape3D_f8aaj")
[connection signal="body_entered" from="Pivot/Area3D" to="." method="OnHit"]