diff --git a/Scenes/Characters/PiscesWitch.tscn b/Scenes/Characters/PiscesWitch.tscn index 7234920..d4051df 100644 --- a/Scenes/Characters/PiscesWitch.tscn +++ b/Scenes/Characters/PiscesWitch.tscn @@ -27,7 +27,7 @@ _altFireProjectile = ExtResource("3_4eh4a") [node name="Area3D" type="Area3D" parent="Pivot"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0) collision_layer = 16 -collision_mask = 4 +collision_mask = 4100 [node name="CollisionShape3D" type="CollisionShape3D" parent="Pivot/Area3D"] transform = Transform3D(0.999665, -0.0258978, -7.10543e-15, 0.0258978, 0.999665, 0, 0, 0, 1, -0.0242356, 2.05297, -0.302385) @@ -37,12 +37,4 @@ shape = SubResource("CapsuleShape3D_ayco3") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.06805, -0.211049) shape = SubResource("CapsuleShape3D_fqik1") -[node name="Button" type="Button" parent="."] -offset_left = 1602.0 -offset_top = 40.0 -offset_right = 1872.0 -offset_bottom = 178.0 -text = "Hit" - [connection signal="body_entered" from="Pivot/Area3D" to="." method="OnHit"] -[connection signal="pressed" from="Button" to="." method="HitDebug"] diff --git a/Scenes/Characters/PlayerScorpio.tscn b/Scenes/Characters/PlayerScorpio.tscn index 505c757..901a28c 100644 --- a/Scenes/Characters/PlayerScorpio.tscn +++ b/Scenes/Characters/PlayerScorpio.tscn @@ -1,14 +1,19 @@ -[gd_scene load_steps=6 format=3 uid="uid://iempdafdn6ct"] +[gd_scene load_steps=7 format=3 uid="uid://iempdafdn6ct"] [ext_resource type="Script" path="res://Scripts/Player1.cs" id="1_mn5ui"] [ext_resource type="PackedScene" uid="uid://dyhimd6qec8fu" path="res://Scenes/Characters/ScorpioAnimated.tscn" id="2_pahgr"] [ext_resource type="PackedScene" uid="uid://cxnek5wgpxbft" path="res://Scenes/Weapons/CutterShot.tscn" id="2_uayjr"] [ext_resource type="PackedScene" uid="uid://cwt4rum7tvyvb" path="res://Scenes/Weapons/CutterShotAltFire.tscn" id="3_tw078"] +[sub_resource type="BoxShape3D" id="BoxShape3D_wqp0e"] +size = Vector3(0.822782, 0.527059, 0.80108) + [sub_resource type="BoxShape3D" id="BoxShape3D_f8aaj"] size = Vector3(0.822782, 0.527059, 0.80108) [node name="PlayerScorpio" type="CharacterBody3D" groups=["Player"]] +collision_layer = 0 +collision_mask = 4097 script = ExtResource("1_mn5ui") _speed = 3.0 _fireProjectile = ExtResource("2_uayjr") @@ -18,6 +23,17 @@ _altFireProjectile = ExtResource("3_tw078") [node name="scoprion" parent="Pivot" instance=ExtResource("2_pahgr")] +[node name="Area3D" type="Area3D" parent="Pivot"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0) +collision_layer = 16 +collision_mask = 4100 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Pivot/Area3D"] +transform = Transform3D(0.999665, -0.0258978, -7.10543e-15, 0.0258978, 0.999665, 0, 0, 0, 1, 0, 0, 0) +shape = SubResource("BoxShape3D_wqp0e") + [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0761452, 0) shape = SubResource("BoxShape3D_f8aaj") + +[connection signal="body_entered" from="Pivot/Area3D" to="." method="OnHit"] diff --git a/Scenes/MeleeEnemyOrb.tscn b/Scenes/MeleeEnemyOrb.tscn index bd8f49f..2b5ae00 100644 --- a/Scenes/MeleeEnemyOrb.tscn +++ b/Scenes/MeleeEnemyOrb.tscn @@ -12,7 +12,7 @@ size = Vector3(0.470892, 0.604331, 0.423598) [node name="MeleeEnemyOrb" type="Node3D"] [node name="CharacterBody3D" type="CharacterBody3D" parent="."] -collision_layer = 0 +collision_layer = 4096 collision_mask = 0 script = ExtResource("1_50och") _speed = 0.5