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

Fix various issues

Browse Source
This commit is contained in:
Zenny
2023-09-12 09:35:00 -07:00
parent a5d36734ef
commit 37180e2def
21 changed files with 247 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Player/Base/Player.cs
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);
}
}
}

2
Player/Capricorn/Capricorn.tscn
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="."]

2
Player/Pisces/Attacks/Single.tscn
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

10
Player/Sagittarius/Attacks/MegamiBeam.tscn
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")

58
Player/Sagittarius/Attacks/MegamiBeamAltFire.tscn Normal file
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"]

5
Player/Sagittarius/Sagittarius.tscn
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="."]

0
Player/Sagittarius/TestShader.gdshader
View File