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

Fix multiplayer

Browse Source
This commit is contained in:
Zenny
2023-09-04 07:20:33 -07:00
parent c32bbfe45a
commit c2239d240e
16 changed files with 954 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Scenes/Characters/Megami.tscn → Scenes/Characters/P1Megami.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=27 format=3 uid="uid://bgkqfamdiwrrw"]
[ext_resource type="Script" path="res://Scripts/Character.cs" id="1_yxmbs"]
[ext_resource type="Script" path="res://Scripts/Character1.cs" id="1_ah2xl"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4qqwi"]
resource_name = "Material.006"
@@ -603,7 +603,7 @@ size = Vector3(0.822782, 0.527059, 0.80108)
size = Vector3(1.19222, 2.13872, 1.37879)
[node name="Megami" type="CharacterBody3D"]
script = ExtResource("1_yxmbs")
script = ExtResource("1_ah2xl")
[node name="Pivot" type="Node3D" parent="."]

4
Scenes/Characters/PiscesWitch.tscn → Scenes/Characters/P1PiscesWitch.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=7 format=3 uid="uid://b38hcomu4tpm5"]
[ext_resource type="Script" path="res://Scripts/Character.cs" id="1_gro0b"]
[ext_resource type="Script" path="res://Scripts/Character1.cs" id="1_ug7pg"]
[ext_resource type="PackedScene" uid="uid://cyn2wn6ffsnu7" path="res://Scenes/Weapons/Single.tscn" id="2_y0wmm"]
[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Scenes/Weapons/ShotgunBullet.tscn" id="3_p4fqi"]
[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Models/Characters/fwitch.gltf" id="4_mtwuo"]
@@ -15,7 +15,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, 0)
script = ExtResource("1_gro0b")
script = ExtResource("1_ug7pg")
_fireProjectile = ExtResource("2_y0wmm")
_altFireProjectile = ExtResource("3_p4fqi")

2
Scenes/Characters/PlayerScorpio.tscn → Scenes/Characters/P1PlayerScorpio.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=7 format=3 uid="uid://iempdafdn6ct"]
[ext_resource type="Script" path="res://Scripts/Character.cs" id="1_mn5ui"]
[ext_resource type="Script" path="res://Scripts/Character1.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"]

629
Scenes/Characters/P2Megami.tscn Normal file
View File

File diff suppressed because one or more lines are too long

39
Scenes/Characters/P2PiscesWitch.tscn Normal file
View File

@@ -0,0 +1,39 @@
[gd_scene load_steps=7 format=3 uid="uid://dfanwejjy3iue"]
[ext_resource type="Script" path="res://Scripts/Character2.cs" id="1_n3jg5"]
[ext_resource type="PackedScene" uid="uid://bwkp1ff25acp1" path="res://Scenes/Weapons/SingleShot.tscn" id="2_gw1od"]
[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Scenes/Weapons/ShotgunBullet.tscn" id="3_00thi"]
[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Models/Characters/fwitch.gltf" id="4_hwtlk"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ayco3"]
radius = 0.980738
height = 3.77708
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_fqik1"]
radius = 0.704872
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, 0)
script = ExtResource("1_n3jg5")
_fireProjectile = ExtResource("2_gw1od")
_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("CapsuleShape3D_ayco3")
[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"]

38
Scenes/Characters/P2PlayerScorpio.tscn Normal file
View File

@@ -0,0 +1,38 @@
[gd_scene load_steps=7 format=3 uid="uid://cg6hdoeq70ke8"]
[ext_resource type="Script" path="res://Scripts/Character2.cs" id="1_5q5l0"]
[ext_resource type="PackedScene" uid="uid://cxnek5wgpxbft" path="res://Scenes/Weapons/CutterShot.tscn" id="2_iw8b0"]
[ext_resource type="PackedScene" uid="uid://cwt4rum7tvyvb" path="res://Scenes/Weapons/CutterShotAltFire.tscn" id="3_61xde"]
[ext_resource type="PackedScene" uid="uid://dyhimd6qec8fu" path="res://Scenes/Characters/ScorpioAnimated.tscn" id="4_c22td"]
[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_5q5l0")
_fireProjectile = ExtResource("2_iw8b0")
_altFireProjectile = ExtResource("3_61xde")
[node name="Pivot" type="Node3D" parent="."]
[node name="scoprion" parent="Pivot" instance=ExtResource("4_c22td")]
[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"]

7
Scenes/GameManager.tscn
View File

@@ -35,10 +35,5 @@ script = ExtResource("7_4n1rc")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -0.504317, 0.863519, 0, -0.863519, -0.504317, 0, 19.9508, 0)
[node name="Player1" parent="." node_paths=PackedStringArray("SpawnPoint") instance=ExtResource("4_3fl70")]
SpawnPoint = NodePath("../P1SpawnPoint")
[node name="Player2" parent="." node_paths=PackedStringArray("SpawnPoint") instance=ExtResource("8_sixv3")]
SpawnPoint = NodePath("../P2SpawnPoint")
[connection signal="ReselectCharacter" from="." to="StageGUI" method="OnCharacterSelect"]
[connection signal="OnCharacterSelectionMade" from="StageGUI" to="." method="OnCharacterSelected"]

6
Scenes/Player1.tscn
View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=6 format=3 uid="uid://xcmspevaqcrc"]
[ext_resource type="Script" path="res://Scripts/Player.cs" id="1_ctl2x"]
[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/Characters/PiscesWitch.tscn" id="2_7c6mk"]
[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/Characters/P1PiscesWitch.tscn" id="2_7c6mk"]
[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="2_mkhuu"]
[ext_resource type="PackedScene" uid="uid://iempdafdn6ct" path="res://Scenes/Characters/PlayerScorpio.tscn" id="3_mtqa2"]
[ext_resource type="PackedScene" uid="uid://bgkqfamdiwrrw" path="res://Scenes/Characters/Megami.tscn" id="4_1xs5f"]
[ext_resource type="PackedScene" uid="uid://iempdafdn6ct" path="res://Scenes/Characters/P1PlayerScorpio.tscn" id="3_mtqa2"]
[ext_resource type="PackedScene" uid="uid://bgkqfamdiwrrw" path="res://Scenes/Characters/P1Megami.tscn" id="4_1xs5f"]
[node name="Player1" type="Node3D" node_paths=PackedStringArray("SpawnPoint")]
script = ExtResource("1_ctl2x")

8
Scenes/Player2.tscn
View File

@@ -2,14 +2,14 @@
[ext_resource type="Script" path="res://Scripts/Player.cs" id="1_k788q"]
[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="1_xs6nn"]
[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/Characters/PiscesWitch.tscn" id="2_ehwtn"]
[ext_resource type="PackedScene" uid="uid://iempdafdn6ct" path="res://Scenes/Characters/PlayerScorpio.tscn" id="3_eamga"]
[ext_resource type="PackedScene" uid="uid://bgkqfamdiwrrw" path="res://Scenes/Characters/Megami.tscn" id="4_uj8bq"]
[ext_resource type="PackedScene" uid="uid://dfanwejjy3iue" path="res://Scenes/Characters/P2PiscesWitch.tscn" id="2_w2id2"]
[ext_resource type="PackedScene" uid="uid://cg6hdoeq70ke8" path="res://Scenes/Characters/P2PlayerScorpio.tscn" id="3_8owb2"]
[ext_resource type="PackedScene" uid="uid://dk65etf7r8bm6" path="res://Scenes/Characters/P2Megami.tscn" id="4_w8v7n"]
[node name="Player2" type="Node3D" node_paths=PackedStringArray("SpawnPoint")]
script = ExtResource("1_k788q")
SpawnPoint = NodePath("Marker3D")
PlayableCharacters = Array[PackedScene]([ExtResource("2_ehwtn"), ExtResource("3_eamga"), ExtResource("4_uj8bq")])
PlayableCharacters = Array[PackedScene]([ExtResource("2_w2id2"), ExtResource("3_8owb2"), ExtResource("4_w8v7n")])
[node name="Marker3D" type="Marker3D" parent="."]
script = ExtResource("1_xs6nn")

11
Scenes/StageGUI.tscn
View File

@@ -124,4 +124,13 @@ offset_right = 336.0
offset_bottom = 889.0
text = "Character select"
[connection signal="pressed" from="CharacterSelect/Button" to="." method="OnCharacterSelect"]
[node name="Button2" type="Button" parent="CharacterSelect"]
layout_mode = 0
offset_left = 1589.0
offset_top = 785.0
offset_right = 1861.0
offset_bottom = 900.0
text = "Character select"
[connection signal="pressed" from="CharacterSelect/Button" to="." method="OnFirstPlayerCharacterSelect"]
[connection signal="pressed" from="CharacterSelect/Button2" to="." method="OnSecondPlayerCharacterSelect"]