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

Refactor

Browse Source
This commit is contained in:
Zenny
2023-09-06 14:43:12 -07:00
parent f8cca640a6
commit d536aa2014
41 changed files with 2747 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Player/Pisces/P2PiscesWitch.tscn
View File

@@ -1,39 +0,0 @@
[gd_scene load_steps=7 format=3 uid="uid://dfanwejjy3iue"]
[ext_resource type="Script" path="res://Player/Base/P2Controls.cs" id="1_0onpw"]
[ext_resource type="PackedScene" uid="uid://cyn2wn6ffsnu7" path="res://Player/Pisces/Attacks/Single.tscn" id="2_285w6"]
[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Player/Pisces/Attacks/ShotgunBullet.tscn" id="3_00thi"]
[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Player/Pisces/Models/fwitch.gltf" id="4_hwtlk"]
[sub_resource type="BoxShape3D" id="BoxShape3D_gqlci"]
size = Vector3(3.04879, 3.92906, 2.56521)
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_fqik1"]
radius = 0.704872
height = 1.67894
[node name="PiscesP2" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(0.33, 0, 0, 0, 0.33, 0, 0, 0, 0.33, 0, 0.533944, 0)
motion_mode = 1
script = ExtResource("1_0onpw")
_fireProjectile = ExtResource("2_285w6")
_altFireProjectile = ExtResource("3_00thi")
[node name="Pivot" type="Node3D" parent="."]
[node name="fwitch" parent="Pivot" instance=ExtResource("4_hwtlk")]
[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.0242356, 2.05297, -0.302385)
shape = SubResource("BoxShape3D_gqlci")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.06805, -0.211049)
shape = SubResource("CapsuleShape3D_fqik1")
[connection signal="body_entered" from="Pivot/Area3D" to="." method="OnHit"]

18
Player/Pisces/P1PiscesWitch.tscn → Player/Pisces/Pisces.tscn
View File

@@ -1,9 +1,9 @@
[gd_scene load_steps=7 format=3 uid="uid://b38hcomu4tpm5"]
[ext_resource type="Script" path="res://Player/Base/P1Controls.cs" id="1_13s3m"]
[ext_resource type="PackedScene" uid="uid://cyn2wn6ffsnu7" path="res://Player/Pisces/Attacks/Single.tscn" id="2_y0wmm"]
[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Player/Pisces/Attacks/ShotgunBullet.tscn" id="3_p4fqi"]
[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Player/Pisces/Models/fwitch.gltf" id="4_mtwuo"]
[ext_resource type="Script" path="res://Player/Base/Character.cs" id="1_gp8nm"]
[ext_resource type="PackedScene" uid="uid://cyn2wn6ffsnu7" path="res://Player/Pisces/Attacks/Single.tscn" id="2_rsvhh"]
[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Player/Pisces/Attacks/ShotgunBullet.tscn" id="3_5m8tq"]
[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Player/Pisces/Models/fwitch.gltf" id="4_d60j6"]
[sub_resource type="BoxShape3D" id="BoxShape3D_xynge"]
size = Vector3(3.04879, 3.92906, 2.56521)
@@ -12,16 +12,16 @@ size = Vector3(3.04879, 3.92906, 2.56521)
radius = 0.704872
height = 1.67894
[node name="PiscesP1" type="CharacterBody3D" groups=["Player"]]
[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)
motion_mode = 1
script = ExtResource("1_13s3m")
_fireProjectile = ExtResource("2_y0wmm")
_altFireProjectile = ExtResource("3_p4fqi")
script = ExtResource("1_gp8nm")
_fireProjectile = ExtResource("2_rsvhh")
_altFireProjectile = ExtResource("3_5m8tq")
[node name="Pivot" type="Node3D" parent="."]
[node name="fwitch" parent="Pivot" instance=ExtResource("4_mtwuo")]
[node name="fwitch" parent="Pivot" instance=ExtResource("4_d60j6")]
[node name="Area3D" type="Area3D" parent="Pivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0)