diff --git a/Resources/BossPhases/Rumia_Boss_Script_3D.tres b/Resources/BossPhases/Rumia_Boss_Script_3D.tres index 7b3c0233..81c287b0 100644 --- a/Resources/BossPhases/Rumia_Boss_Script_3D.tres +++ b/Resources/BossPhases/Rumia_Boss_Script_3D.tres @@ -1,9 +1,10 @@ -[gd_resource type="Resource" script_class="BossScript" load_steps=10 format=3 uid="uid://1u4y6hvc318e"] +[gd_resource type="Resource" script_class="BossScript" load_steps=11 format=3 uid="uid://1u4y6hvc318e"] [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="1_k3wbt"] [ext_resource type="Script" uid="uid://fo8sf11p058s" path="res://Scripts/Resources/BulletScripts/SimpleMovementPattern3D.cs" id="2_mi6hp"] [ext_resource type="Script" uid="uid://inasa76li3ym" path="res://Scripts/Resources/ScriptableBullets/BossScript.cs" id="2_t8f0y"] [ext_resource type="Resource" uid="uid://bmdxhsjh2qla6" path="res://Resources/BossPhases/Rumia/Rumia_NS_1_Chase.tres" id="3_ovn8y"] +[ext_resource type="Resource" uid="uid://chcinoo8pkkwq" path="res://Resources/Patterns/Rumia_NS_2_3D.tres" id="5_mi6hp"] [ext_resource type="Script" uid="uid://cg7gi3tva4gvw" path="res://Scripts/AttackPatterns/WaitPattern.cs" id="6_xfnue"] [sub_resource type="Resource" id="Resource_xfnue"] @@ -37,7 +38,7 @@ script = ExtResource("1_k3wbt") PhaseName = "" Threshold = 0 PlayAnimation = false -Patterns = Array[Object]([SubResource("Resource_xfnue"), ExtResource("3_ovn8y"), SubResource("Resource_lrsat"), SubResource("Resource_0t311")]) +Patterns = Array[Object]([SubResource("Resource_xfnue"), ExtResource("3_ovn8y"), SubResource("Resource_lrsat"), ExtResource("5_mi6hp"), SubResource("Resource_0t311")]) metadata/_custom_type_script = "uid://cdd6q2h0t1hhq" [resource] diff --git a/Resources/Bullets/Boss/Rumia/Rumia_Blue_Bullet_Mid_3D.tres b/Resources/Bullets/Boss/Rumia/Rumia_Blue_Bullet_Mid_3D.tres new file mode 100644 index 00000000..7748fcca --- /dev/null +++ b/Resources/Bullets/Boss/Rumia/Rumia_Blue_Bullet_Mid_3D.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="BulletResource" load_steps=3 format=3 uid="uid://dkxi1b14e7f87"] + +[ext_resource type="PackedScene" uid="uid://br865qeq1n63s" path="res://Scenes/Weapons/Bullets/enemyBullet_mid_blue_3D.tscn" id="1_4fh0n"] +[ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="2_kmsk8"] + +[resource] +script = ExtResource("2_kmsk8") +BulletScene = ExtResource("1_4fh0n") +BulletSpeed = 5.0 +Direction = Vector2(1, 0) +BulletDamage = 20.0 +MaxDamage = 1.0 +Knockback = 1.0 +LifeTime = 20.0 +DestroyOnCollision = true +Owner = 2 +DamageType = 0 +RotateSprite = false +Controllable = false +Freezable = true +Grazeable = true +GrazeValue = 0.2 +Attributes = 34 +TimeModifiers = null +metadata/_custom_type_script = "uid://dslyrfcej3g2n" diff --git a/Resources/Bullets/Boss/Rumia/Rumia_Green_Bullet_Small_3D.tres b/Resources/Bullets/Boss/Rumia/Rumia_Green_Bullet_Small_3D.tres new file mode 100644 index 00000000..0f3c8d2f --- /dev/null +++ b/Resources/Bullets/Boss/Rumia/Rumia_Green_Bullet_Small_3D.tres @@ -0,0 +1,24 @@ +[gd_resource type="Resource" script_class="BulletResource" load_steps=3 format=3 uid="uid://ct86iyo1nbo30"] + +[ext_resource type="PackedScene" uid="uid://dtcn342i4l847" path="res://Scenes/Weapons/Bullets/enemyBullet_small_green_3D.tscn" id="1_wkmu4"] +[ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="2_krx1r"] + +[resource] +script = ExtResource("2_krx1r") +BulletScene = ExtResource("1_wkmu4") +BulletSpeed = 6.0 +Direction = Vector2(1, 0) +BulletDamage = 20.0 +MaxDamage = 1.0 +Knockback = 1.0 +LifeTime = 20.0 +DestroyOnCollision = false +Owner = 2 +DamageType = 0 +RotateSprite = false +Controllable = false +Freezable = true +Grazeable = true +GrazeValue = 1.0 +Attributes = 34 +TimeModifiers = [] diff --git a/Resources/Patterns/Rumia_NS_2_3D.tres b/Resources/Patterns/Rumia_NS_2_3D.tres new file mode 100644 index 00000000..d255ea4a --- /dev/null +++ b/Resources/Patterns/Rumia_NS_2_3D.tres @@ -0,0 +1,188 @@ +[gd_resource type="Resource" script_class="PatternGroup" load_steps=13 format=3 uid="uid://chcinoo8pkkwq"] + +[ext_resource type="Resource" uid="uid://dkxi1b14e7f87" path="res://Resources/Bullets/Boss/Rumia/Rumia_Blue_Bullet_Mid_3D.tres" id="1_22yix"] +[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="2_08ptr"] +[ext_resource type="Script" uid="uid://bxiprx5nwmpnu" path="res://Scripts/AttackPatterns/ShootingPattern3D.cs" id="3_si5ca"] +[ext_resource type="Resource" uid="uid://ct86iyo1nbo30" path="res://Resources/Bullets/Boss/Rumia/Rumia_Green_Bullet_Small_3D.tres" id="4_vxh5u"] +[ext_resource type="Script" uid="uid://cbafxkmgns6ry" path="res://Scripts/Resources/PatternGroup.cs" id="5_f3tws"] + +[sub_resource type="Resource" id="Resource_rdwk1"] +script = ExtResource("3_si5ca") +BulletResource = ExtResource("1_22yix") +EmitterOffset = Vector3(0, 0, 0) +bulletCount = 10 +rotationSpeed = 120.0 +_rotationOffset = 0.0 +duration = 0.4 +spread = 360.0 +burstInterval = 2.0 +ShotsPerBurst = 100 +BurstRate = 0.0 +_targetPlayer = false +_predictPlayer = false +OverrideOwner = false +Owner = 0 +OverrideDamageType = false +DamageType = 0 +OverrideControllable = false +Controllable = false +OverrideCreationModifier = false +TimeModifiers = Array[ExtResource("2_08ptr")]([]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://bxiprx5nwmpnu" + +[sub_resource type="Resource" id="Resource_2yamt"] +script = ExtResource("3_si5ca") +BulletResource = ExtResource("4_vxh5u") +EmitterOffset = Vector3(0, 0, 0) +bulletCount = 16 +rotationSpeed = 0.0 +_rotationOffset = 0.0 +duration = 0.4 +spread = 360.0 +burstInterval = 0.5 +ShotsPerBurst = 100 +BurstRate = 0.0 +_targetPlayer = false +_predictPlayer = false +OverrideOwner = false +Owner = 0 +OverrideDamageType = false +DamageType = 0 +OverrideControllable = false +Controllable = false +OverrideCreationModifier = false +TimeModifiers = Array[ExtResource("2_08ptr")]([]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://bxiprx5nwmpnu" + +[sub_resource type="Resource" id="Resource_ye6gf"] +script = ExtResource("3_si5ca") +BulletResource = ExtResource("4_vxh5u") +EmitterOffset = Vector3(0, 0, 0) +bulletCount = 16 +rotationSpeed = 60.0 +_rotationOffset = 0.0 +duration = 0.4 +spread = 360.0 +burstInterval = 2.0 +ShotsPerBurst = 100 +BurstRate = 0.0 +_targetPlayer = false +_predictPlayer = false +OverrideOwner = false +Owner = 0 +OverrideDamageType = false +DamageType = 0 +OverrideControllable = false +Controllable = false +OverrideCreationModifier = false +TimeModifiers = Array[ExtResource("2_08ptr")]([]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://bxiprx5nwmpnu" + +[sub_resource type="Resource" id="Resource_8xphn"] +script = ExtResource("3_si5ca") +BulletResource = ExtResource("1_22yix") +EmitterOffset = Vector3(0, 0, 0) +bulletCount = 10 +rotationSpeed = 60.0 +_rotationOffset = 0.0 +duration = 0.4 +spread = 360.0 +burstInterval = 2.0 +ShotsPerBurst = 100 +BurstRate = 0.0 +_targetPlayer = false +_predictPlayer = false +OverrideOwner = false +Owner = 0 +OverrideDamageType = false +DamageType = 0 +OverrideControllable = false +Controllable = false +OverrideCreationModifier = false +TimeModifiers = Array[ExtResource("2_08ptr")]([]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://bxiprx5nwmpnu" + +[sub_resource type="Resource" id="Resource_d0o1f"] +script = ExtResource("3_si5ca") +BulletResource = ExtResource("1_22yix") +EmitterOffset = Vector3(0, 0, 0) +bulletCount = 10 +rotationSpeed = 60.0 +_rotationOffset = 0.0 +duration = 0.4 +spread = 360.0 +burstInterval = 2.0 +ShotsPerBurst = 100 +BurstRate = 0.0 +_targetPlayer = false +_predictPlayer = false +OverrideOwner = false +Owner = 0 +OverrideDamageType = false +DamageType = 0 +OverrideControllable = false +Controllable = false +OverrideCreationModifier = false +TimeModifiers = Array[ExtResource("2_08ptr")]([]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://bxiprx5nwmpnu" + +[sub_resource type="Resource" id="Resource_yrur2"] +script = ExtResource("3_si5ca") +BulletResource = ExtResource("4_vxh5u") +EmitterOffset = Vector3(0, 0, 0) +bulletCount = 16 +rotationSpeed = 60.0 +_rotationOffset = 0.0 +duration = 0.4 +spread = 360.0 +burstInterval = 2.0 +ShotsPerBurst = 100 +BurstRate = 0.0 +_targetPlayer = false +_predictPlayer = false +OverrideOwner = false +Owner = 0 +OverrideDamageType = false +DamageType = 0 +OverrideControllable = false +Controllable = false +OverrideCreationModifier = false +TimeModifiers = Array[ExtResource("2_08ptr")]([]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://bxiprx5nwmpnu" + +[sub_resource type="Resource" id="Resource_t7cg8"] +script = ExtResource("3_si5ca") +BulletResource = ExtResource("1_22yix") +EmitterOffset = Vector3(0, 0, 0) +bulletCount = 10 +rotationSpeed = 60.0 +_rotationOffset = 0.0 +duration = 0.4 +spread = 360.0 +burstInterval = 2.0 +ShotsPerBurst = 100 +BurstRate = 0.0 +_targetPlayer = false +_predictPlayer = false +OverrideOwner = false +Owner = 0 +OverrideDamageType = false +DamageType = 0 +OverrideControllable = false +Controllable = false +OverrideCreationModifier = false +TimeModifiers = Array[ExtResource("2_08ptr")]([]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://bxiprx5nwmpnu" + +[resource] +script = ExtResource("5_f3tws") +patterns = Array[Object]([SubResource("Resource_rdwk1"), SubResource("Resource_2yamt"), SubResource("Resource_ye6gf"), SubResource("Resource_8xphn"), SubResource("Resource_d0o1f"), SubResource("Resource_yrur2"), SubResource("Resource_t7cg8")]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://cbafxkmgns6ry" diff --git a/Resources/Patterns/rumia_ns_2.tres b/Resources/Patterns/rumia_ns_2.tres index 56c773a9..707de4eb 100644 --- a/Resources/Patterns/rumia_ns_2.tres +++ b/Resources/Patterns/rumia_ns_2.tres @@ -78,7 +78,7 @@ EmitterOffset = Vector2(0, 0) bulletCount = 16 rotationSpeed = 60.0 _rotationOffset = 0.0 -duration = 0.4 +duration = 5.0 spread = 360.0 burstInterval = 2.0 ShotsPerBurst = 100 diff --git a/Scenes/Weapons/Bullets/enemyBullet_mid_blue_3D.tscn b/Scenes/Weapons/Bullets/enemyBullet_mid_blue_3D.tscn new file mode 100644 index 00000000..d7850669 --- /dev/null +++ b/Scenes/Weapons/Bullets/enemyBullet_mid_blue_3D.tscn @@ -0,0 +1,29 @@ +[gd_scene load_steps=4 format=3 uid="uid://br865qeq1n63s"] + +[ext_resource type="Script" uid="uid://cg6y36s7buapp" path="res://Scripts/Weapons/Bullet3D.cs" id="1_r84dk"] +[ext_resource type="Texture2D" uid="uid://dooyhu8vt63vm" path="res://Sprites/Bullets/mid_bullet_blue.png" id="2_bm31f"] + +[sub_resource type="SphereShape3D" id="SphereShape3D_pklkt"] +radius = 0.161126 + +[node name="Bullet" type="Area3D" groups=["bullets"]] +collision_layer = 128 +collision_mask = 23 +script = ExtResource("1_r84dk") +Speed = 200.0 +metadata/_edit_group_ = true + +[node name="Sprite" type="Sprite3D" parent="."] +transform = Transform3D(0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, -0.5, 0.5, 0, 0, 0) +pixel_size = 0.05 +texture_filter = 0 +texture = ExtResource("2_bm31f") + +[node name="CollisionShape" type="CollisionShape3D" parent="."] +shape = SubResource("SphereShape3D_pklkt") + +[node name="VisibleOnScreenNotifier" type="VisibleOnScreenNotifier3D" parent="."] + +[connection signal="area_entered" from="." to="." method="_on_area_entered"] +[connection signal="body_entered" from="." to="." method="_on_body_entered"] +[connection signal="screen_exited" from="VisibleOnScreenNotifier" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"] diff --git a/Scenes/Weapons/Bullets/enemyBullet_small_green_3D.tscn b/Scenes/Weapons/Bullets/enemyBullet_small_green_3D.tscn new file mode 100644 index 00000000..2407ec0f --- /dev/null +++ b/Scenes/Weapons/Bullets/enemyBullet_small_green_3D.tscn @@ -0,0 +1,29 @@ +[gd_scene load_steps=4 format=3 uid="uid://dtcn342i4l847"] + +[ext_resource type="Script" uid="uid://cg6y36s7buapp" path="res://Scripts/Weapons/Bullet3D.cs" id="1_n7lnb"] +[ext_resource type="Texture2D" uid="uid://dmwi86k7hr8sl" path="res://Sprites/Bullets/small_bullet_green.png" id="2_n7lnb"] + +[sub_resource type="SphereShape3D" id="SphereShape3D_pklkt"] +radius = 0.0703811 + +[node name="Bullet" type="Area3D" groups=["bullets"]] +collision_layer = 128 +collision_mask = 23 +script = ExtResource("1_n7lnb") +Speed = 200.0 +metadata/_edit_group_ = true + +[node name="Sprite" type="Sprite3D" parent="."] +transform = Transform3D(0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, -0.5, 0.5, 0, 0, 0) +pixel_size = 0.05 +texture_filter = 0 +texture = ExtResource("2_n7lnb") + +[node name="CollisionShape" type="CollisionShape3D" parent="."] +shape = SubResource("SphereShape3D_pklkt") + +[node name="VisibleOnScreenNotifier" type="VisibleOnScreenNotifier3D" parent="."] + +[connection signal="area_entered" from="." to="." method="_on_area_entered"] +[connection signal="body_entered" from="." to="." method="_on_body_entered"] +[connection signal="screen_exited" from="VisibleOnScreenNotifier" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"] diff --git a/Sprites/Bullets/mid_bullet_blue.png.import b/Sprites/Bullets/mid_bullet_blue.png.import index 90d7561e..3c81502b 100644 --- a/Sprites/Bullets/mid_bullet_blue.png.import +++ b/Sprites/Bullets/mid_bullet_blue.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dooyhu8vt63vm" -path="res://.godot/imported/mid_bullet_blue.png-7dedada0d0ba94d6aea4a296c5a19e63.ctex" +path.s3tc="res://.godot/imported/mid_bullet_blue.png-7dedada0d0ba94d6aea4a296c5a19e63.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Sprites/Bullets/mid_bullet_blue.png" -dest_files=["res://.godot/imported/mid_bullet_blue.png-7dedada0d0ba94d6aea4a296c5a19e63.ctex"] +dest_files=["res://.godot/imported/mid_bullet_blue.png-7dedada0d0ba94d6aea4a296c5a19e63.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ 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 +detect_3d/compress_to=0 diff --git a/Sprites/Bullets/small_bullet_green.png.import b/Sprites/Bullets/small_bullet_green.png.import index 9374b641..eb7fbf84 100644 --- a/Sprites/Bullets/small_bullet_green.png.import +++ b/Sprites/Bullets/small_bullet_green.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dmwi86k7hr8sl" -path="res://.godot/imported/small_bullet_green.png-06ba77c665a606eaa98def679ad773e0.ctex" +path.s3tc="res://.godot/imported/small_bullet_green.png-06ba77c665a606eaa98def679ad773e0.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Sprites/Bullets/small_bullet_green.png" -dest_files=["res://.godot/imported/small_bullet_green.png-06ba77c665a606eaa98def679ad773e0.ctex"] +dest_files=["res://.godot/imported/small_bullet_green.png-06ba77c665a606eaa98def679ad773e0.s3tc.ctex"] [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ 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 +detect_3d/compress_to=0