Compare commits

...

2 Commits

Author SHA1 Message Date
43f2da2f4b Add scorpio 2023-09-03 21:03:42 -07:00
53d8129cbb Fix hit detection 2023-09-03 19:40:34 -07:00
37 changed files with 3716 additions and 43 deletions

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,32 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dg3k3cvfyaqx1"
path="res://.godot/imported/STAGE 1.gltf-0983384355dffd1bcfa99f1135df3f5c.scn"
[deps]
source_file="res://Levels/Final Levels/STAGE 1.gltf"
dest_files=["res://.godot/imported/STAGE 1.gltf-0983384355dffd1bcfa99f1135df3f5c.scn"]
[params]
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/embedded_image_handling=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b8l4bipck52u"
path.s3tc="res://.godot/imported/STAGE 1_Screenshot 2023-09-03 at 13.29.png-b401d87bfc5e3dde8317f26fd0b66639.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://Levels/Final Levels/STAGE 1_Screenshot 2023-09-03 at 13.29.png"
dest_files=["res://.godot/imported/STAGE 1_Screenshot 2023-09-03 at 13.29.png-b401d87bfc5e3dde8317f26fd0b66639.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
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=0

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dcwooc3thxekc"
path.s3tc="res://.godot/imported/STAGE 1_hexa.png-7a18085f420a2ebfd63b9efa051add69.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://Levels/Final Levels/STAGE 1_hexa.png"
dest_files=["res://.godot/imported/STAGE 1_hexa.png-7a18085f420a2ebfd63b9efa051add69.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
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=0

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,32 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://cv33g1wyltecc"
path="res://.godot/imported/STAGE 2.gltf-c6998638fe7a0469f483b5cdcf2d8033.scn"
[deps]
source_file="res://Levels/Final Levels/STAGE 2.gltf"
dest_files=["res://.godot/imported/STAGE 2.gltf-c6998638fe7a0469f483b5cdcf2d8033.scn"]
[params]
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/embedded_image_handling=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 KiB

View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dtm0fwmeoa0dq"
path.s3tc="res://.godot/imported/STAGE 2_depositphotos_81714270-stock-photo-white-marble-tiles-seamless-flooring.png-74bfc985cc2953472bf613d8de2aaa57.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://Levels/Final Levels/STAGE 2_depositphotos_81714270-stock-photo-white-marble-tiles-seamless-flooring.png"
dest_files=["res://.godot/imported/STAGE 2_depositphotos_81714270-stock-photo-white-marble-tiles-seamless-flooring.png-74bfc985cc2953472bf613d8de2aaa57.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
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=0

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 KiB

View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c5jw58iiex4vy"
path.s3tc="res://.godot/imported/STAGE 2_tie-500x500.png-e52b74b6515bdbe14b825ff4983824a1.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://Levels/Final Levels/STAGE 2_tie-500x500.png"
dest_files=["res://.godot/imported/STAGE 2_tie-500x500.png-e52b74b6515bdbe14b825ff4983824a1.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
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=0

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 KiB

View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ctdyuer3eshms"
path.s3tc="res://.godot/imported/scoprion_GameJam_Scorpion_texture.png-0343eed5726c8284a07b6856db622e90.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://Models/Characters/scoprion_GameJam_Scorpion_texture.png"
dest_files=["res://.godot/imported/scoprion_GameJam_Scorpion_texture.png-0343eed5726c8284a07b6856db622e90.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
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=0

View File

@@ -1,9 +1,9 @@
[gd_scene load_steps=7 format=3 uid="uid://b38hcomu4tpm5"] [gd_scene load_steps=7 format=3 uid="uid://b38hcomu4tpm5"]
[ext_resource type="Script" path="res://Scripts/Player1.cs" id="1_tinf8"] [ext_resource type="Script" path="res://Scripts/Player1.cs" id="1_6cdju"]
[ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/TestBullet.tscn" id="2_ciujd"] [ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/TestBullet.tscn" id="2_xt4q8"]
[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Scenes/ShotgunBullet.tscn" id="3_0of1i"] [ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Scenes/ShotgunBullet.tscn" id="3_4eh4a"]
[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Models/Characters/fwitch.gltf" id="4_n3637"] [ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Models/Characters/fwitch.gltf" id="4_mtwuo"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ayco3"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ayco3"]
radius = 0.980738 radius = 0.980738
@@ -14,13 +14,14 @@ radius = 0.704872
height = 1.67894 height = 1.67894
[node name="Pisces" type="CharacterBody3D" groups=["Player"]] [node name="Pisces" type="CharacterBody3D" groups=["Player"]]
script = ExtResource("1_tinf8") transform = Transform3D(0.33, 0, 0, 0, 0.33, 0, 0, 0, 0.33, 0, 0, 0)
_fireProjectile = ExtResource("2_ciujd") script = ExtResource("1_6cdju")
_altFireProjectile = ExtResource("3_0of1i") _fireProjectile = ExtResource("2_xt4q8")
_altFireProjectile = ExtResource("3_4eh4a")
[node name="Pivot" type="Node3D" parent="."] [node name="Pivot" type="Node3D" parent="."]
[node name="fwitch" parent="Pivot" instance=ExtResource("4_n3637")] [node name="fwitch" parent="Pivot" instance=ExtResource("4_mtwuo")]
[node name="Area3D" type="Area3D" parent="Pivot"] [node name="Area3D" type="Area3D" parent="Pivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0)

View File

@@ -0,0 +1,18 @@
[gd_scene load_steps=4 format=3 uid="uid://iempdafdn6ct"]
[ext_resource type="Script" path="res://Scripts/Player1.cs" id="1_mn5ui"]
[ext_resource type="PackedScene" uid="uid://dyhimd6qec8fu" path="res://Scenes/Characters/ScorpioAnimated.tscn" id="2_pahgr"]
[sub_resource type="BoxShape3D" id="BoxShape3D_f8aaj"]
size = Vector3(0.822782, 0.527059, 0.80108)
[node name="PlayerScorpio" type="CharacterBody3D" groups=["Player"]]
script = ExtResource("1_mn5ui")
[node name="Pivot" type="Node3D" parent="."]
[node name="scoprion" parent="Pivot" instance=ExtResource("2_pahgr")]
[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")

View File

@@ -0,0 +1,11 @@
[gd_scene load_steps=2 format=3 uid="uid://ddt6566wf61ol"]
[ext_resource type="PackedScene" uid="uid://d3403he3mff31" path="res://Models/Characters/scoprion.gltf" id="1_bsb7k"]
[node name="scoprion" instance=ExtResource("1_bsb7k")]
[node name="Cube" parent="." index="0"]
transform = Transform3D(0.0769273, 0, 0.0568499, 0, 0.082328, 0, -0.0293273, 0, 0.149121, 0, 0, 0)
[node name="AnimationPlayer" parent="." index="1"]
autoplay = "Animation"

File diff suppressed because one or more lines are too long

View File

@@ -1,23 +1,24 @@
[gd_scene load_steps=5 format=3 uid="uid://cxj6yeddshy16"] [gd_scene load_steps=6 format=3 uid="uid://cxj6yeddshy16"]
[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/PiscesWitch.tscn" id="1_6lmun"]
[ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_ya2kt"] [ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_ya2kt"]
[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/Characters/PiscesWitch.tscn" id="2_am26u"]
[ext_resource type="PackedScene" uid="uid://iempdafdn6ct" path="res://Scenes/Characters/PlayerScorpio.tscn" id="3_e5mhu"]
[ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://Scenes/StageGUI.tscn" id="5_gsh7q"] [ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://Scenes/StageGUI.tscn" id="5_gsh7q"]
[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="7_4n1rc"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="7_4n1rc"]
[node name="GameManager" type="Node"] [node name="GameManager" type="Node"]
script = ExtResource("1_ya2kt") script = ExtResource("1_ya2kt")
_p1Characters = [ExtResource("1_6lmun"), ExtResource("1_6lmun")] _p1Characters = [ExtResource("2_am26u"), ExtResource("3_e5mhu")]
_p2Characters = [ExtResource("1_6lmun"), ExtResource("1_6lmun")] _p2Characters = [ExtResource("2_am26u"), ExtResource("3_e5mhu")]
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(-0.929007, 0.136193, 0.34409, 0.369825, 0.375014, 0.850055, -0.0132668, 0.91696, -0.398758, -3.58319, 11.9025, 0.163277) transform = Transform3D(-0.929007, 0.136193, 0.34409, 0.369825, 0.375014, 0.850055, -0.0132668, 0.91696, -0.398758, -3.58319, 11.9025, 0.163277)
[node name="Camera3D" type="Camera3D" parent="."] [node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.496974, 0.867765, 0, -0.867765, 0.496974, -0.536318, 21.2932, 12.4591) transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.527878, 10.966, 6.61121)
projection = 1 projection = 1
fov = 30.0 current = true
size = 9.0 size = 10.8546
[node name="StageGUI" parent="." instance=ExtResource("5_gsh7q")] [node name="StageGUI" parent="." instance=ExtResource("5_gsh7q")]
offset_left = 0.0 offset_left = 0.0
@@ -28,11 +29,11 @@ size_flags_horizontal = 4
size_flags_vertical = 4 size_flags_vertical = 4
[node name="P1SpawnPoint" type="Marker3D" parent="."] [node name="P1SpawnPoint" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.58707, 0, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.30792, 0, 5.60868)
script = ExtResource("7_4n1rc") script = ExtResource("7_4n1rc")
[node name="P2SpawnPoint" type="Marker3D" parent="."] [node name="P2SpawnPoint" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.651031, 0, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.910204, 0, 5.60868)
script = ExtResource("7_4n1rc") script = ExtResource("7_4n1rc")
[connection signal="OnCharacterSelectionMade" from="StageGUI" to="." method="OnP1CharacterSelected"] [connection signal="OnCharacterSelectionMade" from="StageGUI" to="." method="OnP1CharacterSelected"]

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=7 format=3 uid="uid://dqv03pua4j8ga"] [gd_scene load_steps=7 format=3 uid="uid://dqv03pua4j8ga"]
[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_owv8t"] [ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_owv8t"]
[ext_resource type="PackedScene" uid="uid://c0lv8ovqkl3a6" path="res://Levels/Models/STAGE 1.blend" id="1_pwpof"] [ext_resource type="PackedScene" uid="uid://dg3k3cvfyaqx1" path="res://Levels/Final Levels/STAGE 1.gltf" id="5_7416y"]
[ext_resource type="PackedScene" uid="uid://bt5rolsyjmx55" path="res://Scenes/MeleeEnemyOrb.tscn" id="5_dqbra"] [ext_resource type="PackedScene" uid="uid://bt5rolsyjmx55" path="res://Scenes/MeleeEnemyOrb.tscn" id="5_dqbra"]
[ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="6_gegi6"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="6_gegi6"]
[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="9_8v1uu"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="9_8v1uu"]
@@ -12,9 +12,8 @@ radius = 0.957319
[node name="Level1" type="Node3D" groups=["Level"]] [node name="Level1" type="Node3D" groups=["Level"]]
script = ExtResource("1_owv8t") script = ExtResource("1_owv8t")
[node name="STAGE 1" parent="." instance=ExtResource("1_pwpof")]
[node name="Area3D2" type="Area3D" parent="." groups=["Level"]] [node name="Area3D2" type="Area3D" parent="." groups=["Level"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.568617, 0, -1.72171)
collision_layer = 0 collision_layer = 0
collision_mask = 16 collision_mask = 16
@@ -35,4 +34,6 @@ script = ExtResource("9_8v1uu")
[node name="MeleeEnemyOrb" parent="." instance=ExtResource("5_dqbra")] [node name="MeleeEnemyOrb" parent="." instance=ExtResource("5_dqbra")]
[node name="STAGE 1" parent="." instance=ExtResource("5_7416y")]
[connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"] [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]

View File

@@ -1,9 +1,8 @@
[gd_scene load_steps=7 format=3 uid="uid://basequfmpg04f"] [gd_scene load_steps=6 format=3 uid="uid://basequfmpg04f"]
[ext_resource type="PackedScene" uid="uid://dmi76rb317oou" path="res://Levels/Models/STAGE 2.blend" id="1_5pcmj"]
[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_u04pt"] [ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_u04pt"]
[ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="2_sq8bv"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="2_sq8bv"]
[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="4_1ryhf"] [ext_resource type="PackedScene" uid="uid://cv33g1wyltecc" path="res://Levels/Final Levels/STAGE 2.gltf" id="4_kiw1e"]
[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="5_dg8k3"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="5_dg8k3"]
[sub_resource type="CylinderShape3D" id="CylinderShape3D_tux5n"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_tux5n"]
@@ -13,8 +12,6 @@ radius = 0.957319
script = ExtResource("1_u04pt") script = ExtResource("1_u04pt")
_levelIndex = 1 _levelIndex = 1
[node name="STAGE 2" parent="." instance=ExtResource("1_5pcmj")]
[node name="Area3D2" type="Area3D" parent="." groups=["Level"]] [node name="Area3D2" type="Area3D" parent="." groups=["Level"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.43759, 0, -2.42354) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.43759, 0, -2.42354)
collision_layer = 0 collision_layer = 0
@@ -29,10 +26,12 @@ shape = SubResource("CylinderShape3D_tux5n")
[node name="P1_SpawnPoint" type="Marker3D" parent="."] [node name="P1_SpawnPoint" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.503964, 0.123258, 4.44593) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.503964, 0.123258, 4.44593)
script = ExtResource("4_1ryhf") script = ExtResource("5_dg8k3")
[node name="P2_SpawnPoint" type="Marker3D" parent="."] [node name="P2_SpawnPoint" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.97394, 0.246516, 4.57028) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.97394, 0.246516, 4.57028)
script = ExtResource("5_dg8k3") script = ExtResource("5_dg8k3")
[node name="STAGE 2" parent="." instance=ExtResource("4_kiw1e")]
[connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"] [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]

View File

@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=3 uid="uid://b12gq4yqc3d8i"] [gd_scene load_steps=4 format=3 uid="uid://b12gq4yqc3d8i"]
[ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_6aikc"] [ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_6aikc"]
[ext_resource type="PackedScene" uid="uid://cjl20bs56430j" path="res://UI/Animations/UIAnimations.tscn" id="2_erh7e"] [ext_resource type="PackedScene" uid="uid://cjl20bs56430j" path="res://UI/Animations/UIAnimations.tscn" id="2_erh7e"]
[ext_resource type="Texture2D" uid="uid://srnf2fpwhlka" path="res://UI/titlescreenneedtext.png" id="3_7s65g"]
[node name="MainMenu" type="Node2D"] [node name="MainMenu" type="Node2D"]
script = ExtResource("1_6aikc") script = ExtResource("1_6aikc")
@@ -16,6 +17,7 @@ grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="Button" type="Button" parent="NewGame"] [node name="Button" type="Button" parent="NewGame"]
top_level = true
layout_mode = 0 layout_mode = 0
offset_left = 583.0 offset_left = 583.0
offset_top = 441.0 offset_top = 441.0
@@ -23,6 +25,22 @@ offset_right = 1155.0
offset_bottom = 645.0 offset_bottom = 645.0
text = "Play" text = "Play"
[node name="TextureRect" type="TextureRect" parent="NewGame"]
layout_mode = 1
anchors_preset = 14
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -7.0
offset_top = -170.0
offset_right = 1974.0
offset_bottom = 1395.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 4
texture = ExtResource("3_7s65g")
expand_mode = 1
[node name="UIAnimations" parent="." instance=ExtResource("2_erh7e")] [node name="UIAnimations" parent="." instance=ExtResource("2_erh7e")]
[connection signal="pressed" from="NewGame/Button" to="." method="OnStartButtonPressed"] [connection signal="pressed" from="NewGame/Button" to="." method="OnStartButtonPressed"]

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=4 format=3 uid="uid://bt5rolsyjmx55"] [gd_scene load_steps=5 format=3 uid="uid://bt5rolsyjmx55"]
[ext_resource type="PackedScene" uid="uid://bay1tvgtpfxns" path="res://Scenes/MeleeEnemySchmoove.tscn" id="1_0pxgq"] [ext_resource type="PackedScene" uid="uid://bay1tvgtpfxns" path="res://Scenes/MeleeEnemySchmoove.tscn" id="1_0pxgq"]
[ext_resource type="Script" path="res://Scripts/MeleeEnemy.cs" id="1_50och"] [ext_resource type="Script" path="res://Scripts/MeleeEnemy.cs" id="1_50och"]
@@ -6,13 +6,28 @@
[sub_resource type="BoxShape3D" id="BoxShape3D_1nq5h"] [sub_resource type="BoxShape3D" id="BoxShape3D_1nq5h"]
size = Vector3(0.470892, 0.604331, 0.423598) size = Vector3(0.470892, 0.604331, 0.423598)
[sub_resource type="BoxShape3D" id="BoxShape3D_i1yvp"]
size = Vector3(0.470892, 0.604331, 0.423598)
[node name="MeleeEnemyOrb" type="Node3D"] [node name="MeleeEnemyOrb" type="Node3D"]
[node name="CharacterBody3D" type="CharacterBody3D" parent="."] [node name="CharacterBody3D" type="CharacterBody3D" parent="."]
collision_layer = 0
collision_mask = 0
script = ExtResource("1_50och") script = ExtResource("1_50och")
[node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"] [node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.475385, 0.143401) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401)
shape = SubResource("BoxShape3D_1nq5h") shape = SubResource("BoxShape3D_1nq5h")
[node name="meleeenemy - Updated" parent="CharacterBody3D" instance=ExtResource("1_0pxgq")] [node name="meleeenemy - Updated" parent="CharacterBody3D" instance=ExtResource("1_0pxgq")]
[node name="Area3D" type="Area3D" parent="CharacterBody3D"]
collision_layer = 0
collision_mask = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D/Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401)
shape = SubResource("BoxShape3D_i1yvp")
[connection signal="body_entered" from="CharacterBody3D/Area3D" to="CharacterBody3D" method="OnHit"]

View File

@@ -1,10 +1,16 @@
[gd_scene load_steps=4 format=3 uid="uid://bq40xbqibrk1y"] [gd_scene load_steps=6 format=3 uid="uid://bq40xbqibrk1y"]
[ext_resource type="Script" path="res://Scripts/ShotgunBullet.cs" id="1_binxs"] [ext_resource type="Script" path="res://Scripts/ShotgunBullet.cs" id="1_binxs"]
[ext_resource type="Texture2D" uid="uid://borp7xvlfdcmq" path="res://Textures/Projectiles/bubble.png" id="2_dv80m"] [ext_resource type="Texture2D" uid="uid://borp7xvlfdcmq" path="res://Textures/Projectiles/bubble.png" id="2_dv80m"]
[sub_resource type="SphereShape3D" id="SphereShape3D_o6kys"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_eme14"]
radius = 0.2 radius = 0.3
[sub_resource type="CylinderShape3D" id="CylinderShape3D_752q2"]
radius = 0.3
[sub_resource type="CylinderShape3D" id="CylinderShape3D_ebbqv"]
radius = 0.3
[node name="ShotgunBullet" type="Node3D"] [node name="ShotgunBullet" type="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.73894, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.73894, 0)
@@ -23,7 +29,7 @@ contact_monitor = true
can_sleep = false can_sleep = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"] [node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
shape = SubResource("SphereShape3D_o6kys") shape = SubResource("CylinderShape3D_eme14")
[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D"] [node name="Sprite3D" type="Sprite3D" parent="RigidBody3D"]
axis = 1 axis = 1
@@ -40,7 +46,7 @@ contact_monitor = true
can_sleep = false can_sleep = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D2"] [node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D2"]
shape = SubResource("SphereShape3D_o6kys") shape = SubResource("CylinderShape3D_752q2")
[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D2"] [node name="Sprite3D" type="Sprite3D" parent="RigidBody3D2"]
axis = 1 axis = 1
@@ -57,7 +63,7 @@ contact_monitor = true
can_sleep = false can_sleep = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D3"] [node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D3"]
shape = SubResource("SphereShape3D_o6kys") shape = SubResource("CylinderShape3D_ebbqv")
[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D3"] [node name="Sprite3D" type="Sprite3D" parent="RigidBody3D3"]
axis = 1 axis = 1

View File

@@ -9,8 +9,7 @@ albedo_color = Color(0.584314, 0.0352941, 0.141176, 1)
[sub_resource type="SphereMesh" id="SphereMesh_wuk0e"] [sub_resource type="SphereMesh" id="SphereMesh_wuk0e"]
material = SubResource("StandardMaterial3D_phgri") material = SubResource("StandardMaterial3D_phgri")
[sub_resource type="SphereShape3D" id="SphereShape3D_rokeu"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_3c0di"]
radius = 0.2
[node name="TestBullet" type="Node3D"] [node name="TestBullet" type="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.538645, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.538645, 0)
@@ -20,7 +19,7 @@ _projectileSpeed = 15.0
[node name="RigidBody3D" type="RigidBody3D" parent="."] [node name="RigidBody3D" type="RigidBody3D" parent="."]
collision_layer = 34 collision_layer = 34
collision_mask = 32 collision_mask = 34
gravity_scale = 0.0 gravity_scale = 0.0
continuous_cd = true continuous_cd = true
max_contacts_reported = 1000 max_contacts_reported = 1000
@@ -34,7 +33,7 @@ skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"] [node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0054872, -0.00215495, 0.0167444) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0054872, -0.00215495, 0.0167444)
shape = SubResource("SphereShape3D_rokeu") shape = SubResource("CylinderShape3D_3c0di")
[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D"] [node name="Sprite3D" type="Sprite3D" parent="RigidBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00168204, -0.0587139, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00168204, -0.0587139, 0)

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=14 format=3 uid="uid://dy3d4e6qegyjg"] [gd_scene load_steps=14 format=3 uid="uid://dy3d4e6qegyjg"]
[ext_resource type="Script" path="res://Scripts/TestLevel.cs" id="1_blhn0"] [ext_resource type="Script" path="res://Scripts/TestLevel.cs" id="1_blhn0"]
[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/PiscesWitch.tscn" id="1_fwf6c"] [ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/Characters/PiscesWitch.tscn" id="1_fwf6c"]
[ext_resource type="PackedScene" uid="uid://bckd04543occ5" path="res://Levels/levelTEST.gltf" id="2_afl3s"] [ext_resource type="PackedScene" uid="uid://bckd04543occ5" path="res://Levels/levelTEST.gltf" id="2_afl3s"]
[ext_resource type="PackedScene" uid="uid://dkjdt7uq3a4j3" path="res://Scenes/TestEnemy.tscn" id="3_ds7vi"] [ext_resource type="PackedScene" uid="uid://dkjdt7uq3a4j3" path="res://Scenes/TestEnemy.tscn" id="3_ds7vi"]
[ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/TestBullet.tscn" id="3_lmb02"] [ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/TestBullet.tscn" id="3_lmb02"]

View File

@@ -1,9 +1,10 @@
using Godot; using Godot;
using System.Linq; using System.Linq;
public partial class MeleeEnemy : CharacterBody3D public partial class MeleeEnemy : BasicEnemy
{ {
private float _speed = 1.0f; [Export]
private float _speed = 0.4f;
public override void _PhysicsProcess(double delta) public override void _PhysicsProcess(double delta)
{ {
@@ -12,9 +13,22 @@ public partial class MeleeEnemy : CharacterBody3D
{ {
var convertedPlayers = players.Select(x => (Node3D)x); var convertedPlayers = players.Select(x => (Node3D)x);
var target = convertedPlayers.OrderBy(x => Position.DistanceTo(x.Position)).FirstOrDefault(); var target = convertedPlayers.OrderBy(x => Position.DistanceTo(x.Position)).FirstOrDefault();
GD.Print(Position.DirectionTo(target.Position));
Position = Position.MoveToward(target.Position, _speed * (float)delta); Position = Position.MoveToward(target.Position, _speed * (float)delta);
MoveAndSlide(); MoveAndSlide();
} }
} }
} }
public partial class BasicEnemy : CharacterBody3D
{
public void OnHit(Node3D node)
{
QueueFree();
}
private void DebugOnHit()
{
var node = new Node3D();
OnHit(node);
}
}

BIN
Textures/Models/Style_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cfmgah6fptc6j"
path="res://.godot/imported/Style_1.png-52418036716b62f67bb4c97aaa57f474.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Textures/Models/Style_1.png"
dest_files=["res://.godot/imported/Style_1.png-52418036716b62f67bb4c97aaa57f474.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

BIN
Textures/Models/giphy.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 993 KiB

BIN
Textures/giphy.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 993 KiB

BIN
UI/titlescreenneedtext.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 MiB

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://srnf2fpwhlka"
path="res://.godot/imported/titlescreenneedtext.png-9796aa90be3d270a75bc6477c67d0610.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://UI/titlescreenneedtext.png"
dest_files=["res://.godot/imported/titlescreenneedtext.png-9796aa90be3d270a75bc6477c67d0610.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

BIN
UI/titlescreenneedtext.tiff Normal file

Binary file not shown.

View File

@@ -23,6 +23,7 @@ BgmPlayer="*res://Scripts/BGMPlayer.cs"
window/size/viewport_width=1920 window/size/viewport_width=1920
window/size/viewport_height=1080 window/size/viewport_height=1080
window/size/borderless=true
[dotnet] [dotnet]