Fix various issues

This commit is contained in:
2023-09-12 09:35:00 -07:00
parent a5d36734ef
commit 37180e2def
21 changed files with 247 additions and 124 deletions

View File

@@ -11,7 +11,7 @@ _data = {
point_count = 2
[sub_resource type="CylinderShape3D" id="CylinderShape3D_e4v7f"]
height = 15.359
height = 7.0
radius = 0.154574
[node name="EnemyBullet" type="Path3D"]
@@ -26,7 +26,7 @@ tilt_enabled = false
[node name="RigidBody3D" type="RigidBody3D" parent="PathFollow3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
collision_layer = 0
collision_mask = 3
collision_mask = 2
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 10

View File

@@ -1176,16 +1176,14 @@ _data = {
[node name="Melee Enemy" type="RigidBody3D" node_paths=PackedStringArray("_hp") groups=["Enemy"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.251952, 0)
disable_mode = 2
collision_layer = 0
collision_mask = 69
axis_lock_angular_x = true
axis_lock_angular_z = true
collision_mask = 33
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 20
contact_monitor = true
can_sleep = false
freeze = true
freeze_mode = 1
script = ExtResource("1_50och")
_hp = NodePath("HP Component")
@@ -1194,7 +1192,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401
shape = SubResource("BoxShape3D_1nq5h")
[node name="MeleeEnemy" type="Node3D" parent="CollisionShape3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0840461, -0.010569, -0.143401)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0840461, -0.612543, -0.143401)
[node name="Icosphere001" type="MeshInstance3D" parent="CollisionShape3D/MeleeEnemy"]
transform = Transform3D(0.850843, 0, 0, 0, 0.850843, 0, 0, 0, 0.850843, 0.0805536, 0.468312, 0.158035)
@@ -1255,4 +1253,13 @@ libraries = {
[node name="HP Component" parent="." instance=ExtResource("2_1leby")]
MaximumHP = 1
[connection signal="body_entered" from="." to="." method="OnPlayerHit"]
[node name="Area3D" type="Area3D" parent="."]
collision_layer = 0
collision_mask = 68
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401)
shape = SubResource("BoxShape3D_1nq5h")
[connection signal="body_entered" from="Area3D" to="." method="OnEnemyHit"]
[connection signal="body_entered" from="Area3D" to="." method="OnPlayerHit"]

View File

@@ -894,7 +894,7 @@ shadow_mesh = SubResource("ArrayMesh_j7wsk")
[node name="RangedEnemy" type="RigidBody3D" 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 = 69
collision_mask = 68
gravity_scale = 0.0
max_contacts_reported = 20
contact_monitor = true
@@ -905,6 +905,7 @@ script = ExtResource("1_01lvj")
_hp = NodePath("HP Component")
[node name="Timer" type="Timer" parent="." node_paths=PackedStringArray("_enemy")]
wait_time = 0.75
autostart = true
script = ExtResource("3_qt2md")
_enemy = NodePath("..")

View File

@@ -14,6 +14,9 @@ public partial class BasicEnemy : Node3D
public void OnEnemyHit(Node3D node)
{
if (node is Character)
return;
_hp.TakeDamage(1);
if (_hp.CurrentHP <= 0)

View File

@@ -61,15 +61,16 @@ public partial class GameManager : Node
public void OnCharacterSelected(Player player)
{
player.SelectedCharacter = null;
var sfxPlayer = GetTree().Root.GetNode<AudioStreamPlayer>("Main/SFXPlayer");
var audioStream = ResourceLoader.Load<AudioStream>("Audio/SFX/Select.wav");
sfxPlayer.Stream = audioStream;
sfxPlayer.Play();
GD.Print(player.Name);
if (player.CharactersLeftOnStage.Any())
{
player.SelectedCharacter = player.CharactersLeftOnStage[player.CharacterIndex];
var character = player.CharactersLeftOnStage[player.CharacterIndex];
var instance = (Character)character.Instantiate();
instance.Initialize(player);
player.SelectedCharacter = instance;
player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter);
GetTree().Root.AddChild(player.SelectedCharacter);
}
@@ -79,12 +80,10 @@ public partial class GameManager : Node
{
ResetPlayerPosition(player);
player.CharactersLeftOnStage.Remove(player.SelectedCharacter);
player.CharactersLeftOnStage.RemoveAt(player.CharacterIndex);
if (player.SelectedCharacter is not null)
GetTree().Root.RemoveChild(player.SelectedCharacter);
GD.Print(player.CharactersLeftOnStage.Select(x => x.Name).ToArray());
player.CharacterIndex = 0;
if (player.CharactersLeftOnStage.Any())
EmitSignal(SignalName.ReselectCharacter, player);
@@ -99,7 +98,7 @@ public partial class GameManager : Node
public void RemoveCharacterAndAddToExit(Player player)
{
ResetPlayerPosition(player);
player.CharactersExited.Add(player.SelectedCharacter);
player.CharactersExited.Add(player.CharactersLeftOnStage.ElementAt(player.CharacterIndex));
RemoveCharacter(player);
}

View File

@@ -17,12 +17,6 @@
script = ExtResource("1_ya2kt")
PlayerScenes = Array[PackedScene]([ExtResource("4_3fl70"), ExtResource("3_y1wkr")])
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.527878, 10.966, 6.61121)
projection = 1
current = true
size = 10.8546
[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)
visible = false

View File

@@ -1,7 +1,16 @@
[gd_scene load_steps=8 format=3 uid="uid://vwrw05ob2caq"]
[gd_scene load_steps=17 format=3 uid="uid://vwrw05ob2caq"]
[ext_resource type="Script" path="res://GameLogic/Main.cs" id="1_g4hua"]
[ext_resource type="PackedScene" uid="uid://btl5fdyjewnwc" path="res://Levels/Scenes/Level3.tscn" id="2_0yhby"]
[ext_resource type="PackedScene" uid="uid://dqv03pua4j8ga" path="res://Levels/Scenes/Level1.tscn" id="2_jq3qe"]
[ext_resource type="PackedScene" uid="uid://b12gq4yqc3d8i" path="res://UI/MainMenu.tscn" id="2_kvovw"]
[ext_resource type="PackedScene" uid="uid://basequfmpg04f" path="res://Levels/Scenes/Level2.tscn" id="3_nhrqr"]
[ext_resource type="PackedScene" uid="uid://ctvkevnc0wxka" path="res://Levels/Scenes/Level4.tscn" id="5_xj47l"]
[ext_resource type="PackedScene" uid="uid://col60npvg7wr1" path="res://Levels/Scenes/Level5.tscn" id="6_xmedq"]
[ext_resource type="PackedScene" uid="uid://8ukphol1isp2" path="res://Levels/Scenes/Level6.tscn" id="7_58n7x"]
[ext_resource type="PackedScene" uid="uid://bsq7edeueqyjg" path="res://Levels/Scenes/Level7.tscn" id="8_pcp3p"]
[ext_resource type="PackedScene" uid="uid://c4xcka4ekuur8" path="res://Levels/Scenes/Level8.tscn" id="9_n1hja"]
[ext_resource type="PackedScene" uid="uid://djwln4at4ho44" path="res://Levels/Scenes/Level9.tscn" id="10_rs7ve"]
[ext_resource type="PackedScene" uid="uid://0hdnmilwrsq6" path="res://Levels/Scenes/Level10.tscn" id="11_o275c"]
[ext_resource type="PackedScene" uid="uid://cxj6yeddshy16" path="res://GameLogic/GameManager.tscn" id="11_wiyvp"]
[ext_resource type="PackedScene" uid="uid://cvvjbka5nf52j" path="res://UI/SceneTransition.tscn" id="14_ai16y"]
@@ -14,7 +23,7 @@ font_color = Color(0, 1, 0, 1)
[node name="Main" type="Node3D" node_paths=PackedStringArray("_fpsCounter")]
script = ExtResource("1_g4hua")
Levels = Array[PackedScene]([ExtResource("11_o275c")])
Levels = Array[PackedScene]([ExtResource("6_xmedq"), ExtResource("2_jq3qe"), ExtResource("3_nhrqr"), ExtResource("5_xj47l"), ExtResource("2_0yhby"), ExtResource("7_58n7x"), ExtResource("8_pcp3p"), ExtResource("9_n1hja"), ExtResource("10_rs7ve"), ExtResource("11_o275c")])
GameManager = ExtResource("11_wiyvp")
_fpsCounter = NodePath("FPS Counter")
@@ -39,3 +48,9 @@ offset_bottom = 42.0
text = "FPS
"
label_settings = SubResource("LabelSettings_ucjnc")
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.527878, 10.966, 6.61121)
projection = 1
current = true
size = 10.8546

BIN
Levels/STAGE 5_aztec.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 KiB

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://x445g44huk0k"
path="res://.godot/imported/STAGE 5_aztec.png-4b5a91f709adb3f366329cf40c601225.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Levels/STAGE 5_aztec.png"
dest_files=["res://.godot/imported/STAGE 5_aztec.png-4b5a91f709adb3f366329cf40c601225.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

View File

@@ -22,7 +22,7 @@ size = Vector3(5, 20, 27.822)
size = Vector3(1, 1.0878, 0.909629)
[sub_resource type="BoxShape3D" id="BoxShape3D_3fmyi"]
size = Vector3(1.01672, 1.53478, 5.31772)
size = Vector3(1.01672, 1.53478, 5.06912)
[sub_resource type="BoxShape3D" id="BoxShape3D_d3tdv"]
size = Vector3(1.01556, 1.80238, 7.12857)
@@ -31,7 +31,7 @@ size = Vector3(1.01556, 1.80238, 7.12857)
size = Vector3(2.51995, 1.80782, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_ccgpo"]
size = Vector3(1.81712, 1.43756, 8.27492)
size = Vector3(1.57333, 1.43756, 8.27492)
[node name="Level2" type="Node3D" groups=["Level"]]
process_mode = 3
@@ -101,7 +101,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.510721, 0.196356, -3.73385
shape = SubResource("BoxShape3D_15sb2")
[node name="CollisionShape3D6" type="CollisionShape3D" parent="Collisions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.539914, 0, 0.307289)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.539914, 0, 0.409884)
shape = SubResource("BoxShape3D_3fmyi")
[node name="CollisionShape3D7" type="CollisionShape3D" parent="Collisions"]

View File

@@ -411,6 +411,7 @@ size = Vector3(1.31359, 2.38677, 1.56842)
[node name="Level3" type="Node3D" groups=["Level"]]
process_mode = 3
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.100843, 0, 0)
script = ExtResource("1_1xwm7")
[node name="STAGE 3" type="Node3D" parent="."]
@@ -450,22 +451,22 @@ libraries = {
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.380475, 0)
[node name="RangedEnemy" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.88431, 0, -5.01806)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.66723, 0, -5.01806)
[node name="RangedEnemy2" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.92009, 0, -3.45365)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.70301, 0, -3.45365)
[node name="RangedEnemy3" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.9633, 0, -2.02987)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.74622, 0, -2.02987)
[node name="RangedEnemy4" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.04326, 0, -0.934418)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.82618, 0, -0.934418)
[node name="MeleeEnemyOrb" parent="Enemies" instance=ExtResource("6_b7xn3")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.08149, 0, 0.325685)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.86441, 0, 0.325685)
[node name="MeleeEnemyOrb2" parent="Enemies" instance=ExtResource("6_b7xn3")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.14518, 0, 1.65492)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.9281, 0, 1.65492)
[node name="RangedEnemy5" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.99163, 0, -3.39695)

View File

@@ -35,7 +35,7 @@ size = Vector3(5, 20, 27.822)
size = Vector3(5, 20, 27.822)
[sub_resource type="BoxShape3D" id="BoxShape3D_5qrun"]
size = Vector3(3.244, 10, 3.17)
size = Vector3(3.244, 5.0593, 3.17)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5mnb2"]
resource_name = "Material.001"
@@ -45,6 +45,7 @@ alpha_antialiasing_mode = 0
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_color = Color(0, 0, 0, 1)
metallic = 1.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0yy7f"]
resource_name = "Material.003"
@@ -57,7 +58,6 @@ resource_name = "Material.022"
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_color = Color(0, 0, 0, 1)
roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vnp6j"]
resource_name = "Material.025"
@@ -70,7 +70,6 @@ resource_name = "Material.024"
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_color = Color(0, 0, 0, 1)
roughness = 0.5
[sub_resource type="ArrayMesh" id="ArrayMesh_innp1"]
_surfaces = [{
@@ -224,12 +223,14 @@ shadow_mesh = SubResource("ArrayMesh_iabwd")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yff5r"]
resource_name = "Material.005"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("6_u54xf")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lq31e"]
resource_name = "Material.006"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("7_e155e")
@@ -237,12 +238,14 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_kg8cv"]
resource_name = "Material.007"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("8_pv0jt")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qocbi"]
resource_name = "Material.008"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("9_57fec")
@@ -250,6 +253,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cxkmp"]
resource_name = "Material.009"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("10_5awpo")
@@ -257,6 +261,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_oci18"]
resource_name = "Material.010"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("11_lecpt")
@@ -264,9 +269,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_inn1i"]
resource_name = "Material.011"
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("12_dmqnu")
@@ -274,6 +277,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l3r5c"]
resource_name = "Material.012"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("13_p4lg5")
@@ -281,6 +285,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4lt6h"]
resource_name = "Material.013"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("14_vy0xd")
@@ -288,6 +293,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xf2r3"]
resource_name = "Material.014"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("15_w5cbh")
@@ -295,6 +301,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x4m66"]
resource_name = "Material.015"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("9_57fec")
@@ -302,9 +309,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ogq2g"]
resource_name = "Material.016"
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("16_2qqmx")
@@ -312,6 +317,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m3vpq"]
resource_name = "Material.017"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("17_3idst")
@@ -803,7 +809,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.505, -0.358024, 1.095)
script = ExtResource("1_gkcpw")
[node name="Enemies" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.7046, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.341564, -0.707, -0.316941)
[node name="MeleeEnemyOrb" parent="Enemies" instance=ExtResource("4_np1us")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.13385, 0, 0.371333)
@@ -864,64 +870,73 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.22039)
collision_mask = 0
[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.01032, 2.71587, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.03, 2.71587, 0)
shape = SubResource("BoxShape3D_7qgo5")
[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.81573, 0, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.61537, 0, 0)
shape = SubResource("BoxShape3D_ooasb")
[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.5122)
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -6.81151)
shape = SubResource("BoxShape3D_aaw7g")
[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.03101)
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 12.1027)
shape = SubResource("BoxShape3D_omips")
[node name="CollisionShape3D5" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.93058, -2.24614, -4.79498)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.37433, -2.24614, -3.56982)
shape = SubResource("BoxShape3D_5qrun")
[node name="CollisionShape3D6" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.67572, -2.24614, -4.79498)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.23197, -2.24614, -3.56982)
shape = SubResource("BoxShape3D_5qrun")
[node name="Exit Portal" parent="." instance=ExtResource("3_wflo5")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.481772, -0.12655, -4.85299)
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.527878, 10.966, 6.61121)
projection = 1
current = true
size = 10.8546
[node name="STAGE 4 final" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.135092, 1.13298)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.847963, -0.287248, 2.28422)
[node name="Plane" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0966516, 0, -1.18466)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.50716, 0.15796, -2.3124)
mesh = SubResource("ArrayMesh_rd6yo")
skeleton = NodePath("")
[node name="Circle" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.152571, 0.124069, 0.00191349)
transform = Transform3D(-0.449436, 0, -0.893313, 0, 1, 0, 0.893313, 0, -0.449436, 0.257937, 0.28203, -1.12583)
mesh = SubResource("ArrayMesh_1b6jf")
skeleton = NodePath("")
[node name="Plane_001" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(0.937709, 0, 0, 0, 1, 0, 0, 0, 1, -0.0912335, 0.0786147, 0.00649853)
transform = Transform3D(-0.42144, 0, 0.893313, 0, 1, 0, -0.837667, 0, -0.449436, 0.319275, 0.236575, -1.12124)
mesh = SubResource("ArrayMesh_c4efb")
skeleton = NodePath("")
[node name="oxface" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(0.690153, 0, 0, 0, 0.690153, 0, 0, 0, 0.690153, 4.10002, 1.59775, -6.14638)
transform = Transform3D(-0.310179, 0, -0.616522, 0, 0.690153, 0, 0.616522, 0, -0.310179, 4.51053, 1.75571, -7.27413)
mesh = SubResource("ArrayMesh_oeul8")
skeleton = NodePath("")
[node name="horsehead" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(0.746961, 0, 0, 0, 0.746961, 0, 0, 0, 0.746961, -4.28265, 1.57514, -6.14861)
transform = Transform3D(-0.335711, 0, 0.66727, 0, 0.746961, 0, -0.66727, 0, -0.335711, -3.87214, 1.7331, -7.27635)
mesh = SubResource("ArrayMesh_igw1j")
skeleton = NodePath("")
[node name="Circle_001" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(-4.74551, 0, 0, 0, -4.74551, 0, 0, 0, -4.74551, -0.0650039, 0.026309, -0.0410134)
transform = Transform3D(2.1328, 0, -4.23922, 0, -4.74551, 0, 4.23922, 0, 2.1328, 0.345504, 0.184269, -1.16876)
mesh = SubResource("ArrayMesh_ox0hg")
skeleton = NodePath("")
[node name="Circle_002" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(-4.74551, 0, 0, 0, -4.74551, 0, 0, 0, -4.74551, -0.165268, 0.0788137, 0.00132829)
transform = Transform3D(2.1328, 0, 4.23922, 0, -4.74551, 0, -4.23922, 0, 2.1328, 0.245241, 0.236774, -1.12641)
mesh = SubResource("ArrayMesh_pcbqa")
skeleton = NodePath("")
@@ -930,6 +945,3 @@ autoplay = "Animation"
libraries = {
"": SubResource("AnimationLibrary_biich")
}
[node name="Exit Portal" parent="." instance=ExtResource("3_wflo5")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.174136, -4.61389)

File diff suppressed because one or more lines are too long

View File

@@ -1,5 +1,6 @@
using Godot;
using Godot.Collections;
using System.Collections.Generic;
public partial class Player : Node3D
{
@@ -15,8 +16,8 @@ public partial class Player : Node3D
[Export]
public int PlayerNumber;
public Array<Character> CharactersLeftOnStage = new Array<Character>();
public Array<Character> CharactersExited = new Array<Character>();
public List<PackedScene> CharactersLeftOnStage = new List<PackedScene>();
public List<PackedScene> CharactersExited = new List<PackedScene>();
public Character SelectedCharacter;
@@ -30,9 +31,7 @@ public partial class Player : Node3D
{
foreach (var character in PlayableCharacterScenes)
{
var instance = (Character)character.Instantiate();
instance.Initialize(this);
CharactersLeftOnStage.Add(instance);
CharactersLeftOnStage.Add(character);
}
}
}

View File

@@ -221,7 +221,7 @@ motion_mode = 1
script = ExtResource("1_aqn5t")
_fireProjectile = ExtResource("2_e6qos")
_altFireProjectile = ExtResource("3_wbhxk")
_speed = 1.5
_speed = 1.7
[node name="Pivot" type="Node3D" parent="."]

View File

@@ -27,7 +27,7 @@ _soundEffect = ExtResource("2_7lbn3")
_projectileSpeed = 3.0
[node name="PathFollow3D" type="PathFollow3D" parent="Center Shot"]
transform = Transform3D(0.999998, 0, -0.0016, 0, 1, 0, 0.0016, 0, 0.999998, 0, 0, 0)
transform = Transform3D(0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 0, 0, 0)
loop = false
tilt_enabled = false

View File

@@ -6,7 +6,7 @@
[sub_resource type="Curve3D" id="Curve3D_7ok4f"]
_data = {
"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 2, -3, 0, 0, 0, 0, 0, 0, 0, 1, -5),
"points": PackedVector3Array(0, 0, 0, 0, 0, 0, -0.0230103, 0.941895, -0.379715, 0, 0, 0, 0, 0, 0, 0, 2, -3, 0, 0, 0, 0, 0, 0, 0, 1, -5),
"tilts": PackedFloat32Array(0, 0, 0)
}
point_count = 3
@@ -16,19 +16,19 @@ height = 3.3177
radius = 0.57027
[node name="MegamiBeam" type="Node3D" groups=["Projectile"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.000150919)
[node name="Path3D" type="Path3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0430247, 0.484383)
top_level = true
curve = SubResource("Curve3D_7ok4f")
script = ExtResource("1_6e1or")
Cooldown = 2.0
_soundEffect = ExtResource("2_vvcho")
_projectileSpeed = 3.0
_projectileSpeed = 2.0
HasRotation = true
[node name="PathFollow3D" type="PathFollow3D" parent="Path3D"]
transform = Transform3D(0.999993, 0, 0, 0, 0.999995, 0, 0, 0, 0.999999, 0, 1, -1)
transform = Transform3D(0.999993, 0, 0, 0, 0.999995, 0, 0, 0, 0.999999, -0.0230103, 0.941895, -0.379715)
rotation_mode = 0
loop = false
tilt_enabled = false
@@ -48,7 +48,7 @@ transform = Transform3D(0.5, 0, 8.73115e-11, 0, 0.5, 0, -8.73115e-11, 0, 0.5, 0.
shape = SubResource("CylinderShape3D_bnunv")
[node name="Sprite3D2" type="Sprite3D" parent="Path3D/PathFollow3D/Beam"]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.00355998, -0.119854, 0.205225)
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 1.42109e-14, -1, -0.00355998, -0.119854, 0.205225)
axis = 1
texture = ExtResource("1_57flt")

View File

@@ -0,0 +1,58 @@
[gd_scene load_steps=6 format=3 uid="uid://bmqcck4srfd1u"]
[ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_c33ey"]
[ext_resource type="AudioStream" uid="uid://m8mvw8acs5sk" path="res://Audio/SFX/Green Wave.wav" id="2_wafm2"]
[ext_resource type="Texture2D" uid="uid://cferkvvp0rjht" path="res://Textures/Projectiles/Projectile_Sagittarius.png" id="3_mg23b"]
[sub_resource type="Curve3D" id="Curve3D_7ok4f"]
_data = {
"points": PackedVector3Array(0, 0, 0, 0, 0, 0, -0.023, 1, -0.38, 0, 0, 0, 0, 0, 0, 0, 1, -3),
"tilts": PackedFloat32Array(0, 0)
}
point_count = 2
[sub_resource type="CylinderShape3D" id="CylinderShape3D_bnunv"]
height = 3.3177
radius = 0.57027
[node name="MegamiBeam" type="Node3D" groups=["Projectile"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.000150919)
[node name="Path3D" type="Path3D" parent="."]
top_level = true
curve = SubResource("Curve3D_7ok4f")
script = ExtResource("1_c33ey")
Cooldown = 0.5
_soundEffect = ExtResource("2_wafm2")
_projectileSpeed = 3.0
HasRotation = true
[node name="PathFollow3D" type="PathFollow3D" parent="Path3D"]
transform = Transform3D(0.999993, 0, 0, 0, 0.999995, 0, 0, 0, 0.999999, -0.023, 1, -0.38)
rotation_mode = 0
loop = false
tilt_enabled = false
[node name="Beam" type="RigidBody3D" parent="Path3D/PathFollow3D"]
transform = Transform3D(1, 0, 0, 0, -1, -1.50996e-07, 0, 1.50996e-07, -1, 0, 0, 0)
collision_layer = 44
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 1000
contact_monitor = true
can_sleep = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="Path3D/PathFollow3D/Beam"]
transform = Transform3D(0.5, 0, 8.73115e-11, 0, 0.5, 0, -8.73115e-11, 0, 0.5, 0.000155393, 0, 0.194262)
shape = SubResource("CylinderShape3D_bnunv")
[node name="Sprite3D2" type="Sprite3D" parent="Path3D/PathFollow3D/Beam"]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 1.42109e-14, -1, -0.00355998, -0.119854, 0.205225)
axis = 1
texture = ExtResource("3_mg23b")
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource("2_wafm2")
autoplay = true
[connection signal="body_entered" from="Path3D/PathFollow3D/Beam" to="Path3D" method="OnProjectileHit"]

View File

@@ -1,7 +1,8 @@
[gd_scene load_steps=27 format=3 uid="uid://bgkqfamdiwrrw"]
[gd_scene load_steps=28 format=3 uid="uid://bgkqfamdiwrrw"]
[ext_resource type="Script" path="res://Player/Base/Character.cs" id="1_s1hsr"]
[ext_resource type="PackedScene" uid="uid://criqb4bokctlr" path="res://Player/Sagittarius/Attacks/MegamiBeam.tscn" id="2_c3ma7"]
[ext_resource type="PackedScene" uid="uid://bmqcck4srfd1u" path="res://Player/Sagittarius/Attacks/MegamiBeamAltFire.tscn" id="3_lj2w4"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ru85r"]
resource_name = "Material.006"
@@ -608,7 +609,7 @@ motion_mode = 1
wall_min_slide_angle = 3.14159
script = ExtResource("1_s1hsr")
_fireProjectile = ExtResource("2_c3ma7")
_altFireProjectile = ExtResource("2_c3ma7")
_altFireProjectile = ExtResource("3_lj2w4")
_speed = 2.25
[node name="Pivot" type="Node3D" parent="."]

View File

@@ -74,7 +74,8 @@ public partial class StageGUI : Control
private void ChangeBG(Player player)
{
var name = player.CharactersLeftOnStage.ElementAt(player.CharacterIndex).Name;
var instance = player.CharactersLeftOnStage.ElementAt(player.CharacterIndex).Instantiate();
var name = instance.Name;
GD.Print(name);
switch (name)
{