diff --git a/3D/MapScenes/TestLevel.tscn b/3D/MapScenes/TestLevel.tscn index 865a3f6f..00e0c6f6 100644 --- a/3D/MapScenes/TestLevel.tscn +++ b/3D/MapScenes/TestLevel.tscn @@ -37,7 +37,7 @@ [ext_resource type="Material" uid="uid://br4foqdn2f8ge" path="res://textures/Manual/Wall_Corner.tres" id="27_c4mw0"] [ext_resource type="Material" uid="uid://bijkqqi8bqi3c" path="res://textures/Floors/Floor26.tres" id="28_btjo4"] [ext_resource type="Material" uid="uid://fc0n5jo05seu" path="res://textures/Manual/Wall_Light_Test.tres" id="30_pvlbf"] -[ext_resource type="Material" path="res://textures/Manual/Chevron.tres" id="30_um16p"] +[ext_resource type="Material" uid="uid://dfs1tc2ry78pb" path="res://textures/Manual/Chevron.tres" id="30_um16p"] [ext_resource type="Material" uid="uid://0x6sr7ehv4t1" path="res://textures/Floors/Floor167.tres" id="31_bbydx"] [ext_resource type="Script" uid="uid://crjplbs250g75" path="res://3D/TrenchBroom/EntityScripts/Lights/light_spot.gd" id="31_c2mph"] [ext_resource type="Material" uid="uid://l3g1l0y47c7r" path="res://textures/Manual/Electric_Panel_Wall.tres" id="32_k4tgc"] diff --git a/Resources/BossPhases/Rumia/Rumia_NS1_3D.tres b/Resources/BossPhases/Rumia/Rumia_NS1_3D.tres index 16872428..4c9f44e8 100644 --- a/Resources/BossPhases/Rumia/Rumia_NS1_3D.tres +++ b/Resources/BossPhases/Rumia/Rumia_NS1_3D.tres @@ -48,7 +48,7 @@ metadata/_custom_type_script = "uid://fo8sf11p058s" [resource] script = ExtResource("4_okj7o") PhaseName = "" -Threshold = 100 +Threshold = 440 PlayAnimation = false Patterns = Array[Object]([SubResource("Resource_xfnue"), ExtResource("2_nr3fd"), ExtResource("3_d7m3h"), SubResource("Resource_lrsat"), ExtResource("2_nr3fd"), ExtResource("3_d7m3h"), SubResource("Resource_ovn8y"), ExtResource("2_nr3fd"), ExtResource("3_d7m3h"), SubResource("Resource_mi6hp"), ExtResource("2_nr3fd"), ExtResource("3_d7m3h")]) metadata/_custom_type_script = "uid://cdd6q2h0t1hhq" diff --git a/Resources/BossPhases/Rumia/Rumia_SP1_3D.tres b/Resources/BossPhases/Rumia/Rumia_SP1_3D.tres index fdfe6663..22f4b151 100644 --- a/Resources/BossPhases/Rumia/Rumia_SP1_3D.tres +++ b/Resources/BossPhases/Rumia/Rumia_SP1_3D.tres @@ -230,7 +230,7 @@ metadata/_custom_type_script = "uid://fo8sf11p058s" [resource] script = ExtResource("1_a65t7") PhaseName = "Darkness Sign \"Demarcation\"" -Threshold = 50 +Threshold = 380 PlayAnimation = false Patterns = [SubResource("Resource_4hlom"), SubResource("Resource_ali57"), SubResource("Resource_38hmx"), SubResource("Resource_487di"), SubResource("Resource_4rhw5"), SubResource("Resource_xmchp"), SubResource("Resource_cprus"), ExtResource("8_4hlom"), SubResource("Resource_ddofg"), ExtResource("9_4hlom"), SubResource("Resource_x84ys"), ExtResource("8_4hlom"), SubResource("Resource_46ksb"), ExtResource("9_4hlom"), SubResource("Resource_78gkf")] metadata/_custom_type_script = "uid://cdd6q2h0t1hhq" diff --git a/Resources/BossPhases/Rumia_Boss_Script_3D.tres b/Resources/BossPhases/Rumia_Boss_Script_3D.tres index 2de2abc5..a8fba479 100644 --- a/Resources/BossPhases/Rumia_Boss_Script_3D.tres +++ b/Resources/BossPhases/Rumia_Boss_Script_3D.tres @@ -1,13 +1,12 @@ -[gd_resource type="Resource" script_class="BossScript" load_steps=6 format=3 uid="uid://1u4y6hvc318e"] +[gd_resource type="Resource" script_class="BossScript" load_steps=5 format=3 uid="uid://1u4y6hvc318e"] [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="1_k3wbt"] [ext_resource type="Resource" uid="uid://cnsmcexyhppdo" path="res://Resources/BossPhases/Rumia/Rumia_NS1_3D.tres" id="2_ovn8y"] [ext_resource type="Script" uid="uid://inasa76li3ym" path="res://Scripts/Resources/ScriptableBullets/BossScript.cs" id="2_t8f0y"] [ext_resource type="Resource" uid="uid://cwrjsponw40pd" path="res://Resources/BossPhases/Rumia/Rumia_SP1_3D.tres" id="3_mi6hp"] -[ext_resource type="Resource" uid="uid://ddb5dqocmk6x7" path="res://Resources/BossPhases/Rumia_NS2.tres" id="4_xfnue"] [resource] script = ExtResource("2_t8f0y") BossName = &"Rumia" -Phases = Array[ExtResource("1_k3wbt")]([ExtResource("2_ovn8y"), ExtResource("3_mi6hp"), ExtResource("4_xfnue")]) +Phases = Array[ExtResource("1_k3wbt")]([ExtResource("2_ovn8y"), ExtResource("3_mi6hp")]) metadata/_custom_type_script = "uid://inasa76li3ym" diff --git a/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet_3D.tres b/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet_3D.tres index 8c6e24af..3f38259b 100644 --- a/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet_3D.tres +++ b/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet_3D.tres @@ -19,19 +19,15 @@ Continuous = false [resource] script = ExtResource("4_2o0fq") BulletScene = ExtResource("1_2ooja") +BulletSize = 0.0 BulletSpeed = 6.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 Modifier = SubResource("Resource_jeq72") diff --git a/Resources/Bullets/cheat_bullet.tres b/Resources/Bullets/cheat_bullet.tres index 2909cc00..67636b0c 100644 --- a/Resources/Bullets/cheat_bullet.tres +++ b/Resources/Bullets/cheat_bullet.tres @@ -19,6 +19,7 @@ metadata/_custom_type_script = "uid://ci2vjo54w7i18" [resource] script = ExtResource("2_dbvc7") BulletScene = ExtResource("1_5pffv") +BulletSize = 0.0 DestructionParticlesScene = ExtResource("2_26vvh") BulletSpeed = 100.0 Direction = Vector2(1, 0) @@ -26,13 +27,8 @@ BulletDamage = 50.0 MaxDamage = 100.0 Knockback = 1.0 LifeTime = 10.0 -DestroyOnCollision = true Owner = 1 DamageType = 0 -RotateSprite = false -Controllable = false -Freezable = true -Grazeable = false GrazeValue = 1.0 Attributes = 0 TimeModifiers = Array[Object]([SubResource("Resource_26vvh")]) diff --git a/Resources/Bullets/yin_yang_bullet.tres b/Resources/Bullets/yin_yang_bullet.tres index afb156af..40e90f99 100644 --- a/Resources/Bullets/yin_yang_bullet.tres +++ b/Resources/Bullets/yin_yang_bullet.tres @@ -19,6 +19,7 @@ metadata/_custom_type_script = "uid://ci2vjo54w7i18" [resource] script = ExtResource("3_78iov") BulletScene = ExtResource("1_lfcuj") +BulletSize = 0.0 DestructionParticlesScene = ExtResource("2_mdq2b") BulletSpeed = 100.0 Direction = Vector2(1, 0) @@ -26,13 +27,8 @@ BulletDamage = 8.0 MaxDamage = 12.0 Knockback = 200.0 LifeTime = 10.0 -DestroyOnCollision = true Owner = 1 DamageType = 1 -RotateSprite = false -Controllable = false -Freezable = true -Grazeable = false GrazeValue = 1.0 Attributes = 264 TimeModifiers = Array[Object]([SubResource("Resource_lcgqc")]) diff --git a/Resources/Weapons/Enemy/TurretWeapon.tres b/Resources/Weapons/Enemy/TurretWeapon.tres index 585f0276..97ea5c3e 100644 --- a/Resources/Weapons/Enemy/TurretWeapon.tres +++ b/Resources/Weapons/Enemy/TurretWeapon.tres @@ -13,19 +13,15 @@ metadata/_custom_type_script = "uid://b6h8slfcd5suh" [sub_resource type="Resource" id="Resource_5eesc"] script = ExtResource("3_elbjf") BulletScene = ExtResource("1_uu3nm") +BulletSize = 0.0 BulletSpeed = 100.0 Direction = Vector2(1, 0) BulletDamage = 40.0 MaxDamage = 1.0 Knockback = 1.0 LifeTime = 10.0 -DestroyOnCollision = true Owner = 2 DamageType = 0 -RotateSprite = true -Controllable = false -Freezable = true -Grazeable = true GrazeValue = 1.0 Attributes = 0 Modifier = SubResource("Resource_ktwe0") diff --git a/Scenes/Hacking/HackingBackground.tscn b/Scenes/Hacking/HackingBackground.tscn index 2210caf4..d8775ba8 100644 --- a/Scenes/Hacking/HackingBackground.tscn +++ b/Scenes/Hacking/HackingBackground.tscn @@ -14,22 +14,6 @@ category = "" data_type = 0 stride = 1 -[sub_resource type="Resource" id="Resource_bqhgn"] -script = ExtResource("3_lad6o") -data = PackedInt32Array(-1, -1, -1, -1, -1, -1) -name = &"material_index" -category = "" -data_type = 1 -stride = 1 - -[sub_resource type="Resource" id="Resource_f6dmw"] -script = ExtResource("2_idys7") -data = PackedByteArray(1, 1, 1, 1, 1, 1) -name = &"visible" -category = "" -data_type = 0 -stride = 1 - [sub_resource type="Resource" id="Resource_5oni7"] script = ExtResource("4_wgaie") data = PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1) @@ -38,13 +22,13 @@ category = "" data_type = 4 stride = 4 -[sub_resource type="Resource" id="Resource_0tm5b"] -script = ExtResource("4_wgaie") -data = PackedFloat32Array(1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0) -name = &"uv_transform" +[sub_resource type="Resource" id="Resource_bqhgn"] +script = ExtResource("3_lad6o") +data = PackedInt32Array(-1, -1, -1, -1, -1, -1) +name = &"material_index" category = "" -data_type = 8 -stride = 6 +data_type = 1 +stride = 1 [sub_resource type="Resource" id="Resource_gp8qv"] script = ExtResource("2_idys7") @@ -54,20 +38,20 @@ category = "" data_type = 0 stride = 1 -[sub_resource type="Resource" id="Resource_awppo"] -script = ExtResource("3_lad6o") -data = PackedInt32Array(0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5) -name = &"face_index" +[sub_resource type="Resource" id="Resource_0tm5b"] +script = ExtResource("4_wgaie") +data = PackedFloat32Array(1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0) +name = &"uv_transform" category = "" -data_type = 1 -stride = 1 +data_type = 8 +stride = 6 -[sub_resource type="Resource" id="Resource_55odd"] -script = ExtResource("3_lad6o") -data = PackedInt32Array(0, 1, 2, 3, 7, 6, 5, 4, 1, 0, 4, 5, 2, 1, 5, 6, 3, 2, 6, 7, 0, 3, 7, 4) -name = &"vertex_index" +[sub_resource type="Resource" id="Resource_f6dmw"] +script = ExtResource("2_idys7") +data = PackedByteArray(1, 1, 1, 1, 1, 1) +name = &"visible" category = "" -data_type = 1 +data_type = 0 stride = 1 [sub_resource type="Resource" id="Resource_ip31u"] @@ -78,6 +62,14 @@ category = "" data_type = 4 stride = 4 +[sub_resource type="Resource" id="Resource_awppo"] +script = ExtResource("3_lad6o") +data = PackedInt32Array(0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5) +name = &"face_index" +category = "" +data_type = 1 +stride = 1 + [sub_resource type="Resource" id="Resource_ml8l3"] script = ExtResource("4_wgaie") data = PackedFloat32Array(-1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1) @@ -86,6 +78,14 @@ category = "" data_type = 6 stride = 3 +[sub_resource type="Resource" id="Resource_55odd"] +script = ExtResource("3_lad6o") +data = PackedInt32Array(0, 1, 2, 3, 7, 6, 5, 4, 1, 0, 4, 5, 2, 1, 5, 6, 3, 2, 6, 7, 0, 3, 7, 4) +name = &"vertex_index" +category = "" +data_type = 1 +stride = 1 + [sub_resource type="Resource" id="Resource_nvynb"] script = ExtResource("4_wgaie") data = PackedFloat32Array(0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0) @@ -145,22 +145,6 @@ category = "" data_type = 0 stride = 1 -[sub_resource type="Resource" id="Resource_idys7"] -script = ExtResource("3_lad6o") -data = PackedInt32Array(-1, -1, -1, -1, -1, -1) -name = &"material_index" -category = "" -data_type = 1 -stride = 1 - -[sub_resource type="Resource" id="Resource_lad6o"] -script = ExtResource("2_idys7") -data = PackedByteArray(1, 1, 1, 1, 1, 1) -name = &"visible" -category = "" -data_type = 0 -stride = 1 - [sub_resource type="Resource" id="Resource_wgaie"] script = ExtResource("4_wgaie") data = PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1) @@ -169,13 +153,13 @@ category = "" data_type = 4 stride = 4 -[sub_resource type="Resource" id="Resource_msw1m"] -script = ExtResource("4_wgaie") -data = PackedFloat32Array(1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0) -name = &"uv_transform" +[sub_resource type="Resource" id="Resource_idys7"] +script = ExtResource("3_lad6o") +data = PackedInt32Array(-1, -1, -1, -1, -1, -1) +name = &"material_index" category = "" -data_type = 8 -stride = 6 +data_type = 1 +stride = 1 [sub_resource type="Resource" id="Resource_1nv3l"] script = ExtResource("2_idys7") @@ -185,20 +169,20 @@ category = "" data_type = 0 stride = 1 -[sub_resource type="Resource" id="Resource_wja3m"] -script = ExtResource("3_lad6o") -data = PackedInt32Array(0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5) -name = &"face_index" +[sub_resource type="Resource" id="Resource_msw1m"] +script = ExtResource("4_wgaie") +data = PackedFloat32Array(1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0) +name = &"uv_transform" category = "" -data_type = 1 -stride = 1 +data_type = 8 +stride = 6 -[sub_resource type="Resource" id="Resource_gcw4q"] -script = ExtResource("3_lad6o") -data = PackedInt32Array(0, 1, 2, 3, 7, 6, 5, 4, 1, 0, 4, 5, 2, 1, 5, 6, 3, 2, 6, 7, 0, 3, 7, 4) -name = &"vertex_index" +[sub_resource type="Resource" id="Resource_lad6o"] +script = ExtResource("2_idys7") +data = PackedByteArray(1, 1, 1, 1, 1, 1) +name = &"visible" category = "" -data_type = 1 +data_type = 0 stride = 1 [sub_resource type="Resource" id="Resource_32acy"] @@ -209,6 +193,14 @@ category = "" data_type = 4 stride = 4 +[sub_resource type="Resource" id="Resource_wja3m"] +script = ExtResource("3_lad6o") +data = PackedInt32Array(0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5) +name = &"face_index" +category = "" +data_type = 1 +stride = 1 + [sub_resource type="Resource" id="Resource_2m5ey"] script = ExtResource("4_wgaie") data = PackedFloat32Array(-1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1) @@ -217,6 +209,14 @@ category = "" data_type = 6 stride = 3 +[sub_resource type="Resource" id="Resource_gcw4q"] +script = ExtResource("3_lad6o") +data = PackedInt32Array(0, 1, 2, 3, 7, 6, 5, 4, 1, 0, 4, 5, 2, 1, 5, 6, 3, 2, 6, 7, 0, 3, 7, 4) +name = &"vertex_index" +category = "" +data_type = 1 +stride = 1 + [sub_resource type="Resource" id="Resource_4opuo"] script = ExtResource("4_wgaie") data = PackedFloat32Array(0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0)