This commit is contained in:
2023-09-04 20:50:50 -07:00
parent 2d2dea616c
commit ef3045b3d2
12 changed files with 428 additions and 38 deletions

View File

@@ -210,16 +210,16 @@ animations = [{
}]
[sub_resource type="BoxShape3D" id="BoxShape3D_r4spg"]
size = Vector3(1, 1.04415, 1)
size = Vector3(1, 5, 1)
[node name="Capricorn" type="CharacterBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.626543, 0)
[node name="Capricorn" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0)
script = ExtResource("1_rngpf")
[node name="Pivot" type="Node3D" parent="."]
[node name="Sprite" type="AnimatedSprite3D" parent="Pivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.75113, -0.606137, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.778099, 0.160949, 0.291765)
centered = false
billboard = 1
sprite_frames = SubResource("SpriteFrames_h2iud")
@@ -227,3 +227,15 @@ animation = &"WalkSide"
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("BoxShape3D_r4spg")
[node name="Area3D" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0)
disable_mode = 2
collision_layer = 16
collision_mask = 4100
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(0.999665, -0.0258978, -7.10543e-15, 0.0258978, 0.999665, 0, 0, 0, 1, 0, 0, 0)
shape = SubResource("BoxShape3D_r4spg")
[connection signal="body_entered" from="Area3D" to="." method="OnHit"]

View File

@@ -0,0 +1,244 @@
[gd_scene load_steps=35 format=3 uid="uid://kd7mdmo5i7nw"]
[ext_resource type="Script" path="res://Scripts/Capricorn2.cs" id="1_iu20s"]
[ext_resource type="Texture2D" uid="uid://s0j0kj4ila8s" path="res://Scenes/Characters/Capricorn/GameJam_DevilCapricorn_AttackForward.png" id="2_chht3"]
[ext_resource type="Texture2D" uid="uid://dchysrwcxhfvx" path="res://Scenes/Characters/Capricorn/GameJam_DevilCapricorn_AttackBehind.png" id="3_5nvnq"]
[ext_resource type="Texture2D" uid="uid://cju5ycxiuwy25" path="res://Scenes/Characters/Capricorn/GameJam_DevilCapricorn_AttackSide.png" id="4_y2kns"]
[ext_resource type="Texture2D" uid="uid://utm2g5q7m2b3" path="res://Scenes/Characters/Capricorn/GameJam_DevilCapricorn_WalkForward.png" id="5_65b4c"]
[ext_resource type="Texture2D" uid="uid://w444vcu8rvae" path="res://Scenes/Characters/Capricorn/GameJam_DevilCapricorn_WalkBehind.png" id="6_y20id"]
[ext_resource type="Texture2D" uid="uid://c5t256wcykb47" path="res://Scenes/Characters/Capricorn/GameJam_DevilCapricorn_WalkSide.png" id="7_pfrtm"]
[sub_resource type="AtlasTexture" id="AtlasTexture_njxhk"]
atlas = ExtResource("2_chht3")
region = Rect2(0, 0, 120, 140)
[sub_resource type="AtlasTexture" id="AtlasTexture_bmuvx"]
atlas = ExtResource("2_chht3")
region = Rect2(120, 0, 120, 140)
[sub_resource type="AtlasTexture" id="AtlasTexture_14ft5"]
atlas = ExtResource("2_chht3")
region = Rect2(240, 0, 120, 140)
[sub_resource type="AtlasTexture" id="AtlasTexture_olmdj"]
atlas = ExtResource("2_chht3")
region = Rect2(360, 0, 120, 140)
[sub_resource type="AtlasTexture" id="AtlasTexture_qaudm"]
atlas = ExtResource("3_5nvnq")
region = Rect2(0, 0, 120, 144)
[sub_resource type="AtlasTexture" id="AtlasTexture_a52sr"]
atlas = ExtResource("3_5nvnq")
region = Rect2(120, 0, 120, 144)
[sub_resource type="AtlasTexture" id="AtlasTexture_qkrgl"]
atlas = ExtResource("3_5nvnq")
region = Rect2(240, 0, 120, 144)
[sub_resource type="AtlasTexture" id="AtlasTexture_k5oj5"]
atlas = ExtResource("3_5nvnq")
region = Rect2(360, 0, 120, 144)
[sub_resource type="AtlasTexture" id="AtlasTexture_6iqcx"]
atlas = ExtResource("4_y2kns")
region = Rect2(0, 0, 113, 142)
[sub_resource type="AtlasTexture" id="AtlasTexture_kiiv3"]
atlas = ExtResource("4_y2kns")
region = Rect2(113, 0, 113, 142)
[sub_resource type="AtlasTexture" id="AtlasTexture_up4ur"]
atlas = ExtResource("4_y2kns")
region = Rect2(226, 0, 113, 142)
[sub_resource type="AtlasTexture" id="AtlasTexture_hvxie"]
atlas = ExtResource("4_y2kns")
region = Rect2(339, 0, 113, 142)
[sub_resource type="AtlasTexture" id="AtlasTexture_vc5hj"]
atlas = ExtResource("5_65b4c")
region = Rect2(0, 0, 120, 128)
[sub_resource type="AtlasTexture" id="AtlasTexture_672u0"]
atlas = ExtResource("5_65b4c")
region = Rect2(120, 0, 120, 128)
[sub_resource type="AtlasTexture" id="AtlasTexture_po3o8"]
atlas = ExtResource("5_65b4c")
region = Rect2(240, 0, 120, 128)
[sub_resource type="AtlasTexture" id="AtlasTexture_v0my0"]
atlas = ExtResource("5_65b4c")
region = Rect2(360, 0, 120, 128)
[sub_resource type="AtlasTexture" id="AtlasTexture_fge82"]
atlas = ExtResource("6_y20id")
region = Rect2(0, 0, 120, 132)
[sub_resource type="AtlasTexture" id="AtlasTexture_v2d05"]
atlas = ExtResource("6_y20id")
region = Rect2(120, 0, 120, 132)
[sub_resource type="AtlasTexture" id="AtlasTexture_mkdc6"]
atlas = ExtResource("6_y20id")
region = Rect2(240, 0, 120, 132)
[sub_resource type="AtlasTexture" id="AtlasTexture_0nnnw"]
atlas = ExtResource("6_y20id")
region = Rect2(360, 0, 120, 132)
[sub_resource type="AtlasTexture" id="AtlasTexture_sjqet"]
atlas = ExtResource("7_pfrtm")
region = Rect2(0, 0, 113, 130)
[sub_resource type="AtlasTexture" id="AtlasTexture_l8c3l"]
atlas = ExtResource("7_pfrtm")
region = Rect2(113, 0, 113, 130)
[sub_resource type="AtlasTexture" id="AtlasTexture_a72tn"]
atlas = ExtResource("7_pfrtm")
region = Rect2(226, 0, 113, 130)
[sub_resource type="AtlasTexture" id="AtlasTexture_s2v14"]
atlas = ExtResource("7_pfrtm")
region = Rect2(339, 0, 113, 130)
[sub_resource type="SpriteFrames" id="SpriteFrames_h2iud"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_njxhk")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_bmuvx")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_14ft5")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_olmdj")
}],
"loop": true,
"name": &"AttackBack",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_qaudm")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_a52sr")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_qkrgl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_k5oj5")
}],
"loop": true,
"name": &"AttackForward",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_6iqcx")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_kiiv3")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_up4ur")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_hvxie")
}],
"loop": true,
"name": &"AttackSide",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_vc5hj")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_672u0")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_po3o8")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_v0my0")
}],
"loop": true,
"name": &"WalkBack",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_fge82")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_v2d05")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_mkdc6")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_0nnnw")
}],
"loop": true,
"name": &"WalkForward",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_sjqet")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_l8c3l")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_a72tn")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_s2v14")
}],
"loop": true,
"name": &"WalkSide",
"speed": 5.0
}]
[sub_resource type="BoxShape3D" id="BoxShape3D_r4spg"]
size = Vector3(1, 1.04415, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_yilru"]
size = Vector3(1, 5, 1)
[node name="Capricorn" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0)
script = ExtResource("1_iu20s")
[node name="Pivot" type="Node3D" parent="."]
[node name="Sprite" type="AnimatedSprite3D" parent="Pivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.778099, 0.160949, 0.291765)
centered = false
billboard = 1
sprite_frames = SubResource("SpriteFrames_h2iud")
animation = &"WalkSide"
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("BoxShape3D_r4spg")
[node name="Area3D" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0)
disable_mode = 2
collision_layer = 16
collision_mask = 4100
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(0.999665, -0.0258978, -7.10543e-15, 0.0258978, 0.999665, 0, 0, 0, 1, 0, 0, 0)
shape = SubResource("BoxShape3D_yilru")
[connection signal="body_entered" from="Area3D" to="." method="OnHit"]

File diff suppressed because one or more lines are too long

View File

@@ -103,6 +103,7 @@ libraries = {
}
[node name="Area3D" type="Area3D" parent="." index="4"]
disable_mode = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" index="0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.11619)

View File

@@ -1,8 +1,7 @@
[gd_scene load_steps=7 format=3 uid="uid://dqv03pua4j8ga"]
[gd_scene load_steps=6 format=3 uid="uid://dqv03pua4j8ga"]
[ext_resource type="Script" path="res://Scripts/Level.cs" id="1_mbqlj"]
[ext_resource type="PackedScene" uid="uid://bt5rolsyjmx55" path="res://Scenes/MeleeEnemyOrb.tscn" id="5_dqbra"]
[ext_resource type="PackedScene" uid="uid://crkon4c8ah1a2" path="res://Scenes/Characters/Capricorn/CapricornP1.tscn" id="5_rf5s4"]
[ext_resource type="PackedScene" uid="uid://bnn68u04ktmas" path="res://Levels/Final Levels/Stage1/Stage1Fix.tscn" id="6_60jd6"]
[ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="6_gegi6"]
@@ -36,17 +35,7 @@ shape = SubResource("CylinderShape3D_kv6vl")
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -3.17988, 0, 0)
gizmo_extents = 1.0
[node name="Capricorn" parent="." instance=ExtResource("5_rf5s4")]
process_mode = 3
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.626543, 5.15016)
[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)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.37194, 6.02102)
[connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]

View File

@@ -1,17 +1,18 @@
[gd_scene load_steps=6 format=3 uid="uid://xcmspevaqcrc"]
[gd_scene load_steps=7 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/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/P1PlayerScorpio.tscn" id="3_mtqa2"]
[ext_resource type="PackedScene" uid="uid://bgkqfamdiwrrw" path="res://Scenes/Characters/P1Megami.tscn" id="4_1xs5f"]
[ext_resource type="PackedScene" uid="uid://crkon4c8ah1a2" path="res://Scenes/Characters/Capricorn/CapricornP1.tscn" id="5_tfkdo"]
[node name="Player1" type="Node3D" node_paths=PackedStringArray("SpawnPoint")]
script = ExtResource("1_ctl2x")
SpawnPoint = NodePath("Marker3D")
PlayableCharacterScenes = Array[PackedScene]([ExtResource("2_7c6mk"), ExtResource("3_mtqa2"), ExtResource("4_1xs5f")])
PlayableCharacterScenes = Array[PackedScene]([ExtResource("2_7c6mk"), ExtResource("3_mtqa2"), ExtResource("4_1xs5f"), ExtResource("5_tfkdo")])
[node name="Marker3D" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0.123, 5.513)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0, 5.513)
gizmo_extents = 1.0
script = ExtResource("2_mkhuu")

View File

@@ -1,15 +1,16 @@
[gd_scene load_steps=6 format=3 uid="uid://jircpua5fl80"]
[gd_scene load_steps=7 format=3 uid="uid://jircpua5fl80"]
[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://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"]
[ext_resource type="PackedScene" uid="uid://kd7mdmo5i7nw" path="res://Scenes/Characters/Capricorn/CapricornP2.tscn" id="5_ef5xs"]
[node name="Player2" type="Node3D" node_paths=PackedStringArray("SpawnPoint")]
script = ExtResource("1_k788q")
SpawnPoint = NodePath("Marker3D")
PlayableCharacterScenes = Array[PackedScene]([ExtResource("2_w2id2"), ExtResource("3_8owb2"), ExtResource("4_w8v7n")])
PlayableCharacterScenes = Array[PackedScene]([ExtResource("2_w2id2"), ExtResource("3_8owb2"), ExtResource("4_w8v7n"), ExtResource("5_ef5xs")])
[node name="Marker3D" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 0, 5.609)