diff --git a/Cirno.csproj b/Cirno.csproj index afde3cb6..146ec715 100644 --- a/Cirno.csproj +++ b/Cirno.csproj @@ -1,4 +1,4 @@ - + net8.0 true diff --git a/Dialogue/Styles/Briefing_Style.tres b/Dialogue/Styles/Briefing_Style.tres index b87aa020..c70c76eb 100644 --- a/Dialogue/Styles/Briefing_Style.tres +++ b/Dialogue/Styles/Briefing_Style.tres @@ -14,22 +14,18 @@ [sub_resource type="Resource" id="Resource_1umci"] script = ExtResource("1_1na1v") -overrides = {} [sub_resource type="Resource" id="Resource_k5ph0"] script = ExtResource("1_1na1v") scene = ExtResource("2_yysma") -overrides = {} [sub_resource type="Resource" id="Resource_pd24n"] script = ExtResource("1_1na1v") scene = ExtResource("3_tapfv") -overrides = {} [sub_resource type="Resource" id="Resource_msgpj"] script = ExtResource("1_1na1v") scene = ExtResource("4_c3ltj") -overrides = {} [sub_resource type="Resource" id="Resource_20kch"] script = ExtResource("1_1na1v") @@ -53,27 +49,22 @@ overrides = { [sub_resource type="Resource" id="Resource_7dp66"] script = ExtResource("1_1na1v") scene = ExtResource("6_eh3mk") -overrides = {} [sub_resource type="Resource" id="Resource_63vmy"] script = ExtResource("1_1na1v") scene = ExtResource("7_tsnk8") -overrides = {} [sub_resource type="Resource" id="Resource_disj7"] script = ExtResource("1_1na1v") scene = ExtResource("8_ipd3l") -overrides = {} [sub_resource type="Resource" id="Resource_6rqr5"] script = ExtResource("1_1na1v") scene = ExtResource("9_sowdg") -overrides = {} [sub_resource type="Resource" id="Resource_tapfv"] script = ExtResource("1_1na1v") scene = ExtResource("10_yysma") -overrides = {} [resource] script = ExtResource("10_lggnn") @@ -91,6 +82,4 @@ layer_info = { "17": SubResource("Resource_6rqr5"), "18": SubResource("Resource_tapfv") } -base_overrides = {} -layers = Array[ExtResource("1_1na1v")]([]) metadata/_latest_layer = "13" diff --git a/Dialogue/Styles/Terminal_Style.tres b/Dialogue/Styles/Terminal_Style.tres index 59298512..36688d26 100644 --- a/Dialogue/Styles/Terminal_Style.tres +++ b/Dialogue/Styles/Terminal_Style.tres @@ -22,12 +22,10 @@ overrides = { [sub_resource type="Resource" id="Resource_c8l3y"] script = ExtResource("1_01ap4") scene = ExtResource("2_7kcue") -overrides = {} [sub_resource type="Resource" id="Resource_xa87i"] script = ExtResource("1_01ap4") scene = ExtResource("3_sjmr0") -overrides = {} [sub_resource type="Resource" id="Resource_g4kwc"] script = ExtResource("1_01ap4") @@ -46,22 +44,18 @@ overrides = { [sub_resource type="Resource" id="Resource_5oxfq"] script = ExtResource("1_01ap4") scene = ExtResource("5_57bio") -overrides = {} [sub_resource type="Resource" id="Resource_8n5bm"] script = ExtResource("1_01ap4") scene = ExtResource("6_g4wyu") -overrides = {} [sub_resource type="Resource" id="Resource_woagc"] script = ExtResource("1_01ap4") scene = ExtResource("7_0tq0p") -overrides = {} [sub_resource type="Resource" id="Resource_8pdfk"] script = ExtResource("1_01ap4") scene = ExtResource("8_rq6rw") -overrides = {} [resource] script = ExtResource("9_bq3y2") @@ -77,6 +71,4 @@ layer_info = { "15": SubResource("Resource_woagc"), "16": SubResource("Resource_8pdfk") } -base_overrides = {} -layers = Array[ExtResource("1_01ap4")]([]) metadata/_latest_layer = "12" diff --git a/Dialogue/Styles/TextBubbleStyle.tres b/Dialogue/Styles/TextBubbleStyle.tres index 33ce5e7e..2fcddedd 100644 --- a/Dialogue/Styles/TextBubbleStyle.tres +++ b/Dialogue/Styles/TextBubbleStyle.tres @@ -7,17 +7,14 @@ [sub_resource type="Resource" id="Resource_dekin"] script = ExtResource("1_4qba7") -overrides = {} [sub_resource type="Resource" id="Resource_o1mph"] script = ExtResource("1_4qba7") scene = ExtResource("2_ha15j") -overrides = {} [sub_resource type="Resource" id="Resource_i8sxs"] script = ExtResource("1_4qba7") scene = ExtResource("3_k85uv") -overrides = {} [resource] script = ExtResource("4_8lqfv") @@ -28,6 +25,4 @@ layer_info = { "10": SubResource("Resource_o1mph"), "11": SubResource("Resource_i8sxs") } -base_overrides = {} -layers = Array[ExtResource("1_4qba7")]([]) metadata/_latest_layer = "" diff --git a/Dialogue/Styles/Textbox_style.tres b/Dialogue/Styles/Textbox_style.tres index 5a13469e..2d1aa62b 100644 --- a/Dialogue/Styles/Textbox_style.tres +++ b/Dialogue/Styles/Textbox_style.tres @@ -22,12 +22,10 @@ overrides = { [sub_resource type="Resource" id="Resource_fuhfn"] script = ExtResource("1_5pbjb") scene = ExtResource("2_6fieu") -overrides = {} [sub_resource type="Resource" id="Resource_5bkv5"] script = ExtResource("1_5pbjb") scene = ExtResource("3_uwd3s") -overrides = {} [sub_resource type="Resource" id="Resource_seyn7"] script = ExtResource("1_5pbjb") @@ -47,22 +45,18 @@ overrides = { [sub_resource type="Resource" id="Resource_cbrr4"] script = ExtResource("1_5pbjb") scene = ExtResource("5_xqoux") -overrides = {} [sub_resource type="Resource" id="Resource_y1r12"] script = ExtResource("1_5pbjb") scene = ExtResource("6_6flnb") -overrides = {} [sub_resource type="Resource" id="Resource_6b16y"] script = ExtResource("1_5pbjb") scene = ExtResource("7_qp31f") -overrides = {} [sub_resource type="Resource" id="Resource_ndh5g"] script = ExtResource("1_5pbjb") scene = ExtResource("8_ckc0n") -overrides = {} [resource] script = ExtResource("9_qfqf2") @@ -78,6 +72,4 @@ layer_info = { "15": SubResource("Resource_6b16y"), "16": SubResource("Resource_ndh5g") } -base_overrides = {} -layers = Array[ExtResource("1_5pbjb")]([]) metadata/_latest_layer = "12" diff --git a/Dialogue/Styles/VN.tres b/Dialogue/Styles/VN.tres index 56e8b117..832c7c48 100644 --- a/Dialogue/Styles/VN.tres +++ b/Dialogue/Styles/VN.tres @@ -23,17 +23,14 @@ overrides = { [sub_resource type="Resource" id="Resource_5h7h2"] script = ExtResource("1_47mos") scene = ExtResource("2_obap8") -overrides = {} [sub_resource type="Resource" id="Resource_qrpnw"] script = ExtResource("1_47mos") scene = ExtResource("3_kxjow") -overrides = {} [sub_resource type="Resource" id="Resource_dgo1k"] script = ExtResource("1_47mos") scene = ExtResource("4_d8rd6") -overrides = {} [sub_resource type="Resource" id="Resource_6e5ca"] script = ExtResource("1_47mos") @@ -57,22 +54,18 @@ overrides = { [sub_resource type="Resource" id="Resource_30jrk"] script = ExtResource("1_47mos") scene = ExtResource("6_mk3bt") -overrides = {} [sub_resource type="Resource" id="Resource_aobjt"] script = ExtResource("1_47mos") scene = ExtResource("7_8cj1f") -overrides = {} [sub_resource type="Resource" id="Resource_dr1ns"] script = ExtResource("1_47mos") scene = ExtResource("8_aoqfk") -overrides = {} [sub_resource type="Resource" id="Resource_tdu6c"] script = ExtResource("1_47mos") scene = ExtResource("9_86wuu") -overrides = {} [resource] script = ExtResource("10_ixmpf") @@ -89,6 +82,4 @@ layer_info = { "16": SubResource("Resource_dr1ns"), "17": SubResource("Resource_tdu6c") } -base_overrides = {} -layers = Array[ExtResource("1_47mos")]([]) metadata/_latest_layer = "13" diff --git a/Resources/BossPhases/Reimu/Reimu_NS1.tres b/Resources/BossPhases/Reimu/Reimu_NS1.tres index c06ac500..8fcc0a46 100644 --- a/Resources/BossPhases/Reimu/Reimu_NS1.tres +++ b/Resources/BossPhases/Reimu/Reimu_NS1.tres @@ -13,123 +13,67 @@ [sub_resource type="Resource" id="Resource_0ug5q"] script = ExtResource("6_8tj6w") TimeInSeconds = 0.01 -ModifierType = 0 Value = 40.0 -Continuous = false metadata/_custom_type_script = "uid://cq7pfooyqayc4" [sub_resource type="Resource" id="Resource_8tj6w"] script = ExtResource("3_xjypu") BulletResource = ExtResource("1_x3pjh") -EmitterOffset = Vector2(0, 0) -bulletCount = 16 rotationSpeed = 15.0 -_rotationOffset = 0.0 duration = 1.5 -spread = 360.0 burstInterval = 0.1 ShotsPerBurst = 3 BurstRate = 0.6 -_targetPlayer = false -_predictPlayer = false -OverrideOwner = false -Owner = 0 -OverrideDamageType = false -DamageType = 0 -OverrideControllable = false -Controllable = false -OverrideCreationModifier = false TimeModifiers = Array[ExtResource("2_sai2e")]([SubResource("Resource_0ug5q")]) -WaitForCompletion = true metadata/_custom_type_script = "uid://c0ndqalsc4jve" [sub_resource type="Resource" id="Resource_nvh37"] script = ExtResource("6_8tj6w") TimeInSeconds = 0.01 -ModifierType = 0 Value = 60.0 -Continuous = false metadata/_custom_type_script = "uid://cq7pfooyqayc4" [sub_resource type="Resource" id="Resource_x1u88"] script = ExtResource("3_xjypu") BulletResource = ExtResource("1_x3pjh") -EmitterOffset = Vector2(0, 0) -bulletCount = 16 rotationSpeed = 105.0 _rotationOffset = 105.0 duration = 1.5 -spread = 360.0 burstInterval = 0.01 ShotsPerBurst = 5 BurstRate = 0.6 -_targetPlayer = false -_predictPlayer = false -OverrideOwner = false -Owner = 0 -OverrideDamageType = false -DamageType = 0 -OverrideControllable = false -Controllable = false -OverrideCreationModifier = false TimeModifiers = Array[ExtResource("2_sai2e")]([SubResource("Resource_nvh37")]) -WaitForCompletion = true metadata/_custom_type_script = "uid://c0ndqalsc4jve" [sub_resource type="Resource" id="Resource_8m6wu"] script = ExtResource("5_vtvh5") Duration = 2.0 Patterns = Array[ExtResource("1_xjypu")]([SubResource("Resource_8tj6w"), SubResource("Resource_x1u88")]) -WaitForCompletion = true metadata/_custom_type_script = "uid://rqtkxuqmo7gi" [sub_resource type="Resource" id="Resource_vrrpx"] script = ExtResource("7_8m6wu") relativeTargetPosition = Vector2(-32, 0) -moveDuration = 2.0 transitionType = 4 -easeType = 2 -WaitForCompletion = true metadata/_custom_type_script = "uid://bj3v4rlov86gw" [sub_resource type="Resource" id="Resource_x3pjh"] script = ExtResource("3_xjypu") BulletResource = ExtResource("5_8tj6w") -EmitterOffset = Vector2(0, 0) bulletCount = 4 -rotationSpeed = 0.0 -_rotationOffset = 0.0 duration = 2.0 -spread = 360.0 burstInterval = 0.1 ShotsPerBurst = 4 BurstRate = 4.0 _targetPlayer = true -_predictPlayer = false -OverrideOwner = false -Owner = 0 -OverrideDamageType = false -DamageType = 0 -OverrideControllable = false -Controllable = false -OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("2_sai2e")]([]) -WaitForCompletion = true metadata/_custom_type_script = "uid://c0ndqalsc4jve" [sub_resource type="Resource" id="Resource_vdysv"] script = ExtResource("7_8m6wu") -relativeTargetPosition = Vector2(0, 0) -moveDuration = 2.0 -transitionType = 0 -easeType = 2 -WaitForCompletion = true metadata/_custom_type_script = "uid://bj3v4rlov86gw" [resource] script = ExtResource("1_4trvi") -PhaseName = "" Threshold = 400 -PlayAnimation = false Patterns = Array[Object]([SubResource("Resource_8m6wu"), SubResource("Resource_vrrpx"), SubResource("Resource_x3pjh"), SubResource("Resource_vdysv")]) metadata/_custom_type_script = "uid://cdd6q2h0t1hhq" diff --git a/Resources/BossPhases/Rumia/Rumia_NS1_3D.tres b/Resources/BossPhases/Rumia/Rumia_NS1_3D.tres index 4c9f44e8..8a08157a 100644 --- a/Resources/BossPhases/Rumia/Rumia_NS1_3D.tres +++ b/Resources/BossPhases/Rumia/Rumia_NS1_3D.tres @@ -8,47 +8,32 @@ [sub_resource type="Resource" id="Resource_xfnue"] script = ExtResource("1_yfihc") relativeTargetPosition = Vector2(-4, 0) -moveDuration = 2.0 RelativeToPlayer = true transitionType = 4 -easeType = 2 WaitForCompletion = false metadata/_custom_type_script = "uid://fo8sf11p058s" [sub_resource type="Resource" id="Resource_lrsat"] script = ExtResource("1_yfihc") -relativeTargetPosition = Vector2(0, 0) moveDuration = 1.0 -RelativeToPlayer = false -transitionType = 0 -easeType = 2 WaitForCompletion = false metadata/_custom_type_script = "uid://fo8sf11p058s" [sub_resource type="Resource" id="Resource_ovn8y"] script = ExtResource("1_yfihc") relativeTargetPosition = Vector2(4, 0) -moveDuration = 2.0 RelativeToPlayer = true -transitionType = 0 -easeType = 2 WaitForCompletion = false metadata/_custom_type_script = "uid://fo8sf11p058s" [sub_resource type="Resource" id="Resource_mi6hp"] script = ExtResource("1_yfihc") -relativeTargetPosition = Vector2(0, 0) moveDuration = 1.0 -RelativeToPlayer = false -transitionType = 0 -easeType = 2 WaitForCompletion = false metadata/_custom_type_script = "uid://fo8sf11p058s" [resource] script = ExtResource("4_okj7o") -PhaseName = "" 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 22f4b151..5da9af47 100644 --- a/Resources/BossPhases/Rumia/Rumia_SP1_3D.tres +++ b/Resources/BossPhases/Rumia/Rumia_SP1_3D.tres @@ -13,91 +13,42 @@ [sub_resource type="Resource" id="Resource_r87xf"] script = ExtResource("3_gq3ok") -TimeInSeconds = 1.0 ModifierType = 1 Value = 90.0 -Continuous = false metadata/_custom_type_script = "uid://dka43xos84kbw" [sub_resource type="Resource" id="Resource_4hlom"] script = ExtResource("4_38hmx") BulletResource = ExtResource("1_d7vfp") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 20 -rotationSpeed = 0.0 -_rotationOffset = 0.0 duration = 1.0 -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_ali57")]([SubResource("Resource_r87xf")]) WaitForCompletion = false metadata/_custom_type_script = "uid://bxiprx5nwmpnu" [sub_resource type="Resource" id="Resource_d7vfp"] script = ExtResource("3_gq3ok") -TimeInSeconds = 1.0 ModifierType = 1 Value = -90.0 -Continuous = false metadata/_custom_type_script = "uid://dka43xos84kbw" [sub_resource type="Resource" id="Resource_ali57"] script = ExtResource("4_38hmx") BulletResource = ExtResource("1_d7vfp") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 20 -rotationSpeed = 0.0 -_rotationOffset = 0.0 duration = 1.0 -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_ali57")]([SubResource("Resource_d7vfp")]) -WaitForCompletion = true metadata/_custom_type_script = "uid://bxiprx5nwmpnu" [sub_resource type="Resource" id="Resource_38hmx"] script = ExtResource("4_38hmx") BulletResource = ExtResource("6_gq3ok") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 20 -rotationSpeed = 0.0 _rotationOffset = 22.0 duration = 1.0 -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_ali57")]([SubResource("Resource_r87xf")]) WaitForCompletion = false metadata/_custom_type_script = "uid://bxiprx5nwmpnu" @@ -105,49 +56,19 @@ metadata/_custom_type_script = "uid://bxiprx5nwmpnu" [sub_resource type="Resource" id="Resource_487di"] script = ExtResource("4_38hmx") BulletResource = ExtResource("6_gq3ok") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 20 -rotationSpeed = 0.0 _rotationOffset = 22.0 duration = 1.0 -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_ali57")]([SubResource("Resource_d7vfp")]) -WaitForCompletion = true metadata/_custom_type_script = "uid://bxiprx5nwmpnu" [sub_resource type="Resource" id="Resource_4rhw5"] script = ExtResource("4_38hmx") BulletResource = ExtResource("6_38hmx") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 20 -rotationSpeed = 0.0 -_rotationOffset = 0.0 duration = 1.0 -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_ali57")]([SubResource("Resource_r87xf")]) WaitForCompletion = false metadata/_custom_type_script = "uid://bxiprx5nwmpnu" @@ -155,36 +76,16 @@ metadata/_custom_type_script = "uid://bxiprx5nwmpnu" [sub_resource type="Resource" id="Resource_xmchp"] script = ExtResource("4_38hmx") BulletResource = ExtResource("6_38hmx") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 20 -rotationSpeed = 0.0 -_rotationOffset = 0.0 duration = 1.0 -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_ali57")]([SubResource("Resource_d7vfp")]) -WaitForCompletion = true metadata/_custom_type_script = "uid://bxiprx5nwmpnu" [sub_resource type="Resource" id="Resource_cprus"] script = ExtResource("7_4rhw5") relativeTargetPosition = Vector2(4, 2) -moveDuration = 2.0 RelativeToPlayer = true -transitionType = 0 -easeType = 2 -WaitForCompletion = true metadata/_custom_type_script = "uid://fo8sf11p058s" [sub_resource type="Resource" id="Resource_ddofg"] @@ -192,9 +93,6 @@ script = ExtResource("7_4rhw5") relativeTargetPosition = Vector2(2, 0) moveDuration = 0.4 RelativeToPlayer = true -transitionType = 0 -easeType = 2 -WaitForCompletion = true metadata/_custom_type_script = "uid://fo8sf11p058s" [sub_resource type="Resource" id="Resource_x84ys"] @@ -202,9 +100,6 @@ script = ExtResource("7_4rhw5") relativeTargetPosition = Vector2(-2, 0) moveDuration = 0.4 RelativeToPlayer = true -transitionType = 0 -easeType = 2 -WaitForCompletion = true metadata/_custom_type_script = "uid://fo8sf11p058s" [sub_resource type="Resource" id="Resource_46ksb"] @@ -212,25 +107,15 @@ script = ExtResource("7_4rhw5") relativeTargetPosition = Vector2(-4, 1) moveDuration = 0.4 RelativeToPlayer = true -transitionType = 0 -easeType = 2 -WaitForCompletion = true metadata/_custom_type_script = "uid://fo8sf11p058s" [sub_resource type="Resource" id="Resource_78gkf"] script = ExtResource("7_4rhw5") -relativeTargetPosition = Vector2(0, 0) -moveDuration = 2.0 -RelativeToPlayer = false -transitionType = 0 -easeType = 2 -WaitForCompletion = true metadata/_custom_type_script = "uid://fo8sf11p058s" [resource] script = ExtResource("1_a65t7") PhaseName = "Darkness Sign \"Demarcation\"" 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/BulletScripts/Emitter_Sprial_Test_Bullets.tres b/Resources/BulletScripts/Emitter_Sprial_Test_Bullets.tres index 51a5db86..fb6a512e 100644 --- a/Resources/BulletScripts/Emitter_Sprial_Test_Bullets.tres +++ b/Resources/BulletScripts/Emitter_Sprial_Test_Bullets.tres @@ -8,26 +8,12 @@ [sub_resource type="Resource" id="Resource_2y301"] script = ExtResource("3_2rxa2") BulletResource = ExtResource("1_bjips") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 6 rotationSpeed = 60.0 -_rotationOffset = 0.0 duration = 10.0 -spread = 360.0 burstInterval = 0.1 ShotsPerBurst = 6 BurstRate = 0.5 -_targetPlayer = false -_predictPlayer = false -OverrideOwner = false -Owner = 0 -OverrideDamageType = false -DamageType = 0 -OverrideControllable = false -Controllable = false -OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("2_yjtbi")]([]) -WaitForCompletion = true metadata/_custom_type_script = "uid://bxiprx5nwmpnu" [resource] 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 3f38259b..7f27951a 100644 --- a/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet_3D.tres +++ b/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet_3D.tres @@ -13,22 +13,14 @@ decreaseRate = 0.4 script = ExtResource("3_eppnc") TimeInSeconds = 0.0 ModifierType = 2 -Value = 0.0 -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 Owner = 2 -DamageType = 0 -GrazeValue = 0.2 Attributes = 34 Modifier = SubResource("Resource_jeq72") TimeModifiers = Array[Object]([SubResource("Resource_edsop")]) diff --git a/Resources/Bullets/cheat_bullet.tres b/Resources/Bullets/cheat_bullet.tres index 67636b0c..ffd87157 100644 --- a/Resources/Bullets/cheat_bullet.tres +++ b/Resources/Bullets/cheat_bullet.tres @@ -8,27 +8,17 @@ [sub_resource type="Resource" id="Resource_26vvh"] script = ExtResource("2_w7k7r") TransitionType = 2 -EaseType = 2 Duration = 0.5 TimeInSeconds = 0.0 -ModifierType = 0 Value = 20.0 -Continuous = false 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) BulletDamage = 50.0 MaxDamage = 100.0 -Knockback = 1.0 -LifeTime = 10.0 Owner = 1 -DamageType = 0 GrazeValue = 1.0 -Attributes = 0 TimeModifiers = Array[Object]([SubResource("Resource_26vvh")]) diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index c99a443a..06f3bc05 100644 --- a/Resources/Debug/DebugLevels.tres +++ b/Resources/Debug/DebugLevels.tres @@ -16,32 +16,23 @@ [sub_resource type="Resource" id="Resource_qnbi6"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Cutscenes/Intro.tscn" _name = "Intro" [sub_resource type="Resource" id="Resource_cfhv5"] script = ExtResource("1_ov731") -EggIndex = 0 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) -RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_0k62o"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/Tutorial.tscn" _name = "Tutorial" StartData = SubResource("Resource_cfhv5") [sub_resource type="Resource" id="Resource_tpb7s"] script = ExtResource("1_ov731") -EggIndex = 0 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) -RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_edoov"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/test.tscn" _name = "Level 1" StartData = SubResource("Resource_tpb7s") @@ -49,12 +40,9 @@ StartData = SubResource("Resource_tpb7s") [sub_resource type="Resource" id="Resource_1sw5g"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) -RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_47bot"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/test.tscn" _name = "Level 1 (Debug Room)" StartData = SubResource("Resource_1sw5g") @@ -63,30 +51,23 @@ StartData = SubResource("Resource_1sw5g") script = ExtResource("1_ov731") EggIndex = 2 StartingEquipment = Array[ExtResource("2_bkci5")]([ExtResource("3_fydgr"), ExtResource("4_38yta"), ExtResource("5_em757"), ExtResource("6_sdmg8")]) -RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_mgdm6"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/test.tscn" _name = "Level 1 (Boss)" StartData = SubResource("Resource_o7bux") [sub_resource type="Resource" id="Resource_v2as6"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/RebelBase.tscn" _name = "Rebel Base" [sub_resource type="Resource" id="Resource_maxpt"] script = ExtResource("1_ov731") -EggIndex = 0 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) -RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_pein5"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/Level2.tscn" _name = "Level 2" StartData = SubResource("Resource_maxpt") @@ -117,20 +98,16 @@ _name = "Default Scene" [sub_resource type="Resource" id="Resource_ujm2a"] script = ExtResource("1_ov731") -EggIndex = 0 StartingEquipment = Array[ExtResource("2_bkci5")]([ExtResource("7_b3oo5")]) -RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_6ijnv"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/NewActorTest.tscn" _name = "New Actor Test" StartData = SubResource("Resource_ujm2a") [sub_resource type="Resource" id="Resource_bkci5"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/PlayerFSMTest.tscn" _name = "FSM Test" metadata/_custom_type_script = "uid://dnthdjrx78u6m" @@ -138,13 +115,10 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_7sue8"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) -RemoveEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_ognca"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/Tutorial.tscn" _name = "Tutorial (End)" StartData = SubResource("Resource_7sue8") @@ -152,14 +126,10 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_olpjo"] script = ExtResource("1_ov731") -EggIndex = 0 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) -RemoveEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_nbnej"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/Beams_Test.tscn" _name = "Beams Test" StartData = SubResource("Resource_olpjo") @@ -167,21 +137,18 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_w7lsm"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/Level3.tscn" _name = "Level 3" metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_vq1um"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/Level4.tscn" _name = "Level 4" metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_hougo"] script = ExtResource("2_tnajf") -Enabled = true Path = "res://Scenes/Maps/Level1_End_Cutscene.tscn" _name = "Level 1 Intermission" metadata/_custom_type_script = "uid://dnthdjrx78u6m" @@ -197,24 +164,19 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" script = ExtResource("2_tnajf") Enabled = false Map = ExtResource("9_ognca") -Path = "" _name = "Roguelite" StartData = ExtResource("10_olpjo") metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_c3ldk"] script = ExtResource("2_tnajf") -Enabled = true Map = ExtResource("11_olpjo") -Path = "" _name = "Reimu Test" metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_rmbs0"] script = ExtResource("2_tnajf") -Enabled = true Map = ExtResource("12_nbnej") -Path = "" _name = "Isometric Test" metadata/_custom_type_script = "uid://dnthdjrx78u6m" diff --git a/Resources/Enemies/Base_Fairy_3D.tres b/Resources/Enemies/Base_Fairy_3D.tres index db84a385..737692f6 100644 --- a/Resources/Enemies/Base_Fairy_3D.tres +++ b/Resources/Enemies/Base_Fairy_3D.tres @@ -54,8 +54,6 @@ MaxHealth = 6.0 MovementSpeed = 1.5 Weapon = ExtResource("8_ihub2") LootDrops = Array[ExtResource("2_gbbb4")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")]) -MotivationReward = 4.0 -PredictPlayer = false PlayerDetectionRange = 4.0 ViewRange = 5.0 AlarmReactRange = 8.0 @@ -63,7 +61,6 @@ PlayerDisengageRange = 10.0 StrafeSpeed = 1.5 MaxStrafeDistance = 1.0 MinStrafeDistance = 0.2 -ResponseTime = 0.5 IconSprite = SubResource("AtlasTexture_ppsgt") AnimationFrames = ExtResource("1_gbbb4") metadata/_custom_type_script = "uid://cd5o0ceb50jki" diff --git a/Resources/Enemies/Base_Fairy_Special_3D.tres b/Resources/Enemies/Base_Fairy_Special_3D.tres index 6a073973..6081912d 100644 --- a/Resources/Enemies/Base_Fairy_Special_3D.tres +++ b/Resources/Enemies/Base_Fairy_Special_3D.tres @@ -54,8 +54,6 @@ MaxHealth = 12.0 MovementSpeed = 1.6 Weapon = ExtResource("9_dkgyx") LootDrops = Array[ExtResource("2_6r34r")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")]) -MotivationReward = 4.0 -PredictPlayer = false PlayerDetectionRange = 4.0 ViewRange = 5.0 AlarmReactRange = 8.0 @@ -63,7 +61,6 @@ PlayerDisengageRange = 10.0 StrafeSpeed = 1.5 MaxStrafeDistance = 1.0 MinStrafeDistance = 0.2 -ResponseTime = 0.5 IconSprite = SubResource("AtlasTexture_c0hok") AnimationFrames = ExtResource("1_6r34r") metadata/_custom_type_script = "uid://cd5o0ceb50jki" diff --git a/Resources/Enemies/Fairy_Guard.tres b/Resources/Enemies/Fairy_Guard.tres index f851e23d..096e4104 100644 --- a/Resources/Enemies/Fairy_Guard.tres +++ b/Resources/Enemies/Fairy_Guard.tres @@ -54,16 +54,9 @@ MaxHealth = 10.0 MovementSpeed = 40.0 Weapon = ExtResource("7_u7yd8") LootDrops = Array[ExtResource("2_ivudp")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")]) -MotivationReward = 4.0 -PredictPlayer = false -PlayerDetectionRange = 90.0 -ViewRange = 120.0 AlarmReactRange = 150.0 PlayerDisengageRange = 500.0 -StrafeSpeed = 25.0 MaxStrafeDistance = 32.0 -MinStrafeDistance = 16.0 -ResponseTime = 0.5 IconSprite = SubResource("AtlasTexture_n54y5") AnimationFrames = ExtResource("1_n54y5") metadata/_custom_type_script = "uid://cd5o0ceb50jki" diff --git a/Resources/Enemies/Fairy_Guard_3D.tres b/Resources/Enemies/Fairy_Guard_3D.tres index 84891810..aa915337 100644 --- a/Resources/Enemies/Fairy_Guard_3D.tres +++ b/Resources/Enemies/Fairy_Guard_3D.tres @@ -54,8 +54,6 @@ MaxHealth = 10.0 MovementSpeed = 2.0 Weapon = ExtResource("9_b2551") LootDrops = Array[ExtResource("3_juf1x")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")]) -MotivationReward = 4.0 -PredictPlayer = false PlayerDetectionRange = 4.0 ViewRange = 5.0 AlarmReactRange = 8.0 @@ -63,7 +61,6 @@ PlayerDisengageRange = 10.0 StrafeSpeed = 1.5 MaxStrafeDistance = 1.0 MinStrafeDistance = 0.2 -ResponseTime = 0.5 IconSprite = SubResource("AtlasTexture_n54y5") AnimationFrames = ExtResource("1_b2551") metadata/_custom_type_script = "uid://cd5o0ceb50jki" diff --git a/Resources/Enemies/Reimu_Boss.tres b/Resources/Enemies/Reimu_Boss.tres index d54e9a64..3cff434d 100644 --- a/Resources/Enemies/Reimu_Boss.tres +++ b/Resources/Enemies/Reimu_Boss.tres @@ -17,19 +17,7 @@ EnemyName = &"Reimu" EnemyKey = &"REIMU" PrefabPath = &"uid://d2xmlov4ee2fc" MaxHealth = 500.0 -MovementSpeed = 20.0 Weapon = ExtResource("2_amg33") -LootDrops = Array[ExtResource("1_0qdnn")]([]) -MotivationReward = 4.0 -PredictPlayer = false -PlayerDetectionRange = 90.0 -ViewRange = 120.0 -AlarmReactRange = 0.0 -PlayerDisengageRange = 0.0 -StrafeSpeed = 25.0 -MaxStrafeDistance = 64.0 -MinStrafeDistance = 16.0 -ResponseTime = 0.5 IconSprite = SubResource("AtlasTexture_gdgx5") AnimationFrames = ExtResource("1_gjra5") BossScript = ExtResource("1_amg33") diff --git a/Resources/Enemies/Rumia_3D.tres b/Resources/Enemies/Rumia_3D.tres index 60a1c22e..18c67cbc 100644 --- a/Resources/Enemies/Rumia_3D.tres +++ b/Resources/Enemies/Rumia_3D.tres @@ -55,8 +55,6 @@ MaxHealth = 500.0 MovementSpeed = 2.0 Weapon = ExtResource("9_80fxw") LootDrops = Array[ExtResource("3_lo74v")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")]) -MotivationReward = 4.0 -PredictPlayer = false PlayerDetectionRange = 4.0 ViewRange = 5.0 AlarmReactRange = 8.0 @@ -64,7 +62,6 @@ PlayerDisengageRange = 10.0 StrafeSpeed = 1.5 MaxStrafeDistance = 1.0 MinStrafeDistance = 0.2 -ResponseTime = 0.5 IconSprite = SubResource("AtlasTexture_n54y5") AnimationFrames = ExtResource("1_jhiim") BossScript = ExtResource("2_2p3bo") diff --git a/Resources/Items/Ammo1.tres b/Resources/Items/Ammo1.tres index e2f11c1e..e6448aff 100644 --- a/Resources/Items/Ammo1.tres +++ b/Resources/Items/Ammo1.tres @@ -13,14 +13,9 @@ ShortName = &"" ItemDescription = &"Ammo for Ice-Based Weapons" ItemKey = &"ICE_AMMO" Item = 3 -Tier = 0 -Price = 0 Amount = 20 Max = 250 -PickupIfMaxed = false ConsumeOnUse = true -UiType = 0 -Selectable = false AutoPickup = true InventorySprite = SubResource("AtlasTexture_3y0hf") DropScenePath = &"res://Scenes/Items/GenericItem.tscn" diff --git a/Resources/Items/Blue_Keycard.tres b/Resources/Items/Blue_Keycard.tres index 87f1760d..5a3e3867 100644 --- a/Resources/Items/Blue_Keycard.tres +++ b/Resources/Items/Blue_Keycard.tres @@ -14,15 +14,9 @@ ShortName = &"" ItemDescription = &"Activates Blue KeyPads" ItemKey = &"BLUE_KEY" Item = 1 -Tier = 0 -Price = 0 Amount = 1 Max = 1 -PickupIfMaxed = false -ConsumeOnUse = false UiType = 3 -Selectable = false -AutoPickup = false InventorySprite = SubResource("AtlasTexture_ebbst") DropScenePath = &"res://Scenes/Items/GenericItem.tscn" DropScenePath3D = &"uid://cnot7sft7lpf3" diff --git a/Resources/Items/Generic_Keycard.tres b/Resources/Items/Generic_Keycard.tres index 0274cd4b..783441f7 100644 --- a/Resources/Items/Generic_Keycard.tres +++ b/Resources/Items/Generic_Keycard.tres @@ -14,15 +14,10 @@ ShortName = &"" ItemDescription = &"Activates Gray KeyPads" ItemKey = &"GRAY_KEY" Item = 1 -Tier = 0 -Price = 0 Amount = 1 Max = 99 -PickupIfMaxed = false ConsumeOnUse = true UiType = 6 -Selectable = false -AutoPickup = false InventorySprite = SubResource("AtlasTexture_munhl") DropScenePath = &"res://Scenes/Items/GenericItem.tscn" DropScenePath3D = &"uid://cnot7sft7lpf3" diff --git a/Resources/Items/Green_Keycard.tres b/Resources/Items/Green_Keycard.tres index b56200c6..01392a97 100644 --- a/Resources/Items/Green_Keycard.tres +++ b/Resources/Items/Green_Keycard.tres @@ -14,15 +14,9 @@ ShortName = &"" ItemDescription = &"Activates Green KeyPads" ItemKey = &"GREEN_KEY" Item = 2 -Tier = 0 -Price = 0 Amount = 1 Max = 1 -PickupIfMaxed = false -ConsumeOnUse = false UiType = 3 -Selectable = false -AutoPickup = false InventorySprite = SubResource("AtlasTexture_iasoh") DropScenePath = &"res://Scenes/Items/GenericItem.tscn" DropScenePath3D = &"uid://cnot7sft7lpf3" diff --git a/Resources/Items/Heart_Pickup.tres b/Resources/Items/Heart_Pickup.tres index c9606cdf..d5589b68 100644 --- a/Resources/Items/Heart_Pickup.tres +++ b/Resources/Items/Heart_Pickup.tres @@ -6,8 +6,6 @@ [sub_resource type="Resource" id="Resource_vsvqq"] script = ExtResource("2_yj7ej") -HealPercentage = 25.0 -ResourceType = 0 metadata/_custom_type_script = "uid://bxgjw8wis5l0t" [resource] @@ -17,14 +15,11 @@ ShortName = &"Health" ItemDescription = &"Gives back 25% of Max Health on use" ItemKey = &"HEALTH" Item = 4 -Tier = 0 Price = 3 ItemEffect = SubResource("Resource_vsvqq") Amount = 1 Max = 10 -PickupIfMaxed = false ConsumeOnUse = true -UiType = 0 Selectable = true AutoPickup = true InventorySprite = ExtResource("1_xg75n") diff --git a/Resources/Items/Shield_Extend_Pickup.tres b/Resources/Items/Shield_Extend_Pickup.tres index 62e7d4b3..c44b24e5 100644 --- a/Resources/Items/Shield_Extend_Pickup.tres +++ b/Resources/Items/Shield_Extend_Pickup.tres @@ -6,7 +6,6 @@ [sub_resource type="Resource" id="Resource_7h0ch"] script = ExtResource("2_da583") -IncreaseAmount = 4.0 ResourceType = 1 metadata/_custom_type_script = "uid://6cupx85nnda4" @@ -17,16 +16,10 @@ ShortName = &"" ItemDescription = &"Extends the max shield" ItemKey = &"SHIELD_EXTEND" Item = 13 -Tier = 0 -Price = 0 ItemEffect = SubResource("Resource_7h0ch") Amount = 1 Max = 10 -PickupIfMaxed = false ConsumeOnUse = true -UiType = 0 -Selectable = false -AutoPickup = false InventorySprite = ExtResource("1_e61f8") DropScenePath = &"res://Scenes/Items/GenericItem.tscn" DropScenePath3D = &"uid://cnot7sft7lpf3" diff --git a/Resources/Items/Shield_Pickup.tres b/Resources/Items/Shield_Pickup.tres index 0ef86453..f895cf28 100644 --- a/Resources/Items/Shield_Pickup.tres +++ b/Resources/Items/Shield_Pickup.tres @@ -6,7 +6,6 @@ [sub_resource type="Resource" id="Resource_qh6j2"] script = ExtResource("2_mvfwl") -HealPercentage = 25.0 ResourceType = 1 metadata/_custom_type_script = "uid://bxgjw8wis5l0t" @@ -17,14 +16,11 @@ ShortName = &"Shield" ItemDescription = &"Recharges the shield by 25%" ItemKey = &"SHIELD" Item = 8 -Tier = 0 Price = 3 ItemEffect = SubResource("Resource_qh6j2") Amount = 1 Max = 10 -PickupIfMaxed = false ConsumeOnUse = true -UiType = 0 Selectable = true AutoPickup = true InventorySprite = ExtResource("1_0hq6q") diff --git a/Resources/Items/Yellow_Keycard.tres b/Resources/Items/Yellow_Keycard.tres index 9b54e965..1dd0a34a 100644 --- a/Resources/Items/Yellow_Keycard.tres +++ b/Resources/Items/Yellow_Keycard.tres @@ -13,16 +13,9 @@ ItemName = &"Yellow Keycard" ShortName = &"" ItemDescription = &"Opens Yellow KeyPads" ItemKey = &"YELLOW_KEY" -Item = 0 -Tier = 0 -Price = 0 Amount = 1 Max = 1 -PickupIfMaxed = false -ConsumeOnUse = false UiType = 3 -Selectable = false -AutoPickup = false InventorySprite = SubResource("AtlasTexture_ew85h") DropScenePath = &"res://Scenes/Items/GenericItem.tscn" DropScenePath3D = &"uid://cnot7sft7lpf3" diff --git a/Resources/Patterns/Rumia_NS_2_3D.tres b/Resources/Patterns/Rumia_NS_2_3D.tres index f31edd1c..4308b664 100644 --- a/Resources/Patterns/Rumia_NS_2_3D.tres +++ b/Resources/Patterns/Rumia_NS_2_3D.tres @@ -9,180 +9,65 @@ [sub_resource type="Resource" id="Resource_rdwk1"] script = ExtResource("3_si5ca") BulletResource = ExtResource("1_22yix") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 14 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 = 18 -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 = 18 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 = 14 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 = 14 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 = 18 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 = 14 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_SP1_Part2.tres b/Resources/Patterns/Rumia_SP1_Part2.tres index 63b69402..b32c50f7 100644 --- a/Resources/Patterns/Rumia_SP1_Part2.tres +++ b/Resources/Patterns/Rumia_SP1_Part2.tres @@ -10,37 +10,20 @@ script = ExtResource("3_p1i4g") TimeInSeconds = 0.5 ModifierType = 2 -Value = 0.0 -Continuous = false [sub_resource type="Resource" id="Resource_wk3la"] script = ExtResource("4_6wavh") TimeInSeconds = 0.8 -ModifierType = 0 Value = 5.0 -Continuous = false [resource] script = ExtResource("5_fqpy4") BulletResource = ExtResource("1_u1m81") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 12 -rotationSpeed = 0.0 _rotationOffset = 45.0 duration = 0.8 spread = 180.0 burstInterval = 1.0 -ShotsPerBurst = 100 -BurstRate = 0.0 _targetPlayer = true -_predictPlayer = false -OverrideOwner = false -Owner = 0 -OverrideDamageType = false -DamageType = 0 -OverrideControllable = false -Controllable = false -OverrideCreationModifier = false TimeModifiers = Array[ExtResource("2_hpyh2")]([SubResource("Resource_xt3r4"), SubResource("Resource_wk3la")]) -WaitForCompletion = true metadata/_custom_type_script = "uid://bxiprx5nwmpnu" diff --git a/Resources/Patterns/Rumia_SP1_Part2_Predicting.tres b/Resources/Patterns/Rumia_SP1_Part2_Predicting.tres index bba7a358..002e4df1 100644 --- a/Resources/Patterns/Rumia_SP1_Part2_Predicting.tres +++ b/Resources/Patterns/Rumia_SP1_Part2_Predicting.tres @@ -10,37 +10,21 @@ script = ExtResource("3_ygi0w") TimeInSeconds = 0.5 ModifierType = 2 -Value = 0.0 -Continuous = false [sub_resource type="Resource" id="Resource_wk3la"] script = ExtResource("4_gk7f1") TimeInSeconds = 0.8 -ModifierType = 0 Value = 5.0 -Continuous = false [resource] script = ExtResource("5_fu7ru") BulletResource = ExtResource("1_1ov13") -EmitterOffset = Vector3(0, 0, 0) bulletCount = 12 -rotationSpeed = 0.0 _rotationOffset = 45.0 duration = 0.8 spread = 180.0 burstInterval = 1.0 -ShotsPerBurst = 100 -BurstRate = 0.0 _targetPlayer = true _predictPlayer = true -OverrideOwner = false -Owner = 0 -OverrideDamageType = false -DamageType = 0 -OverrideControllable = false -Controllable = false -OverrideCreationModifier = false TimeModifiers = Array[ExtResource("2_m3ok6")]([SubResource("Resource_xt3r4"), SubResource("Resource_wk3la")]) -WaitForCompletion = true metadata/_custom_type_script = "uid://bxiprx5nwmpnu" diff --git a/Resources/Weapons/Enemy/TurretWeapon.tres b/Resources/Weapons/Enemy/TurretWeapon.tres index 97ea5c3e..be07f8b7 100644 --- a/Resources/Weapons/Enemy/TurretWeapon.tres +++ b/Resources/Weapons/Enemy/TurretWeapon.tres @@ -7,23 +7,14 @@ [sub_resource type="Resource" id="Resource_ktwe0"] script = ExtResource("2_1ok24") -decreaseRate = 0.1 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 Owner = 2 -DamageType = 0 GrazeValue = 1.0 -Attributes = 0 Modifier = SubResource("Resource_ktwe0") TimeModifiers = Array[Object]([]) metadata/_custom_type_script = "uid://dslyrfcej3g2n" @@ -32,17 +23,8 @@ metadata/_custom_type_script = "uid://dslyrfcej3g2n" script = ExtResource("4_17dut") Name = &"" BulletData = SubResource("Resource_5eesc") -Priority = 0 -AmmoPerShot = 1 RateOfFire = 0.4 -BulletCapacity = 20 ReloadTime = 2.0 -AutoReload = true -InfiniteAmmo = true ItemKey = &"" AmmoKey = &"" -BulletsPerShot = 1 -SpreadAngle = 0.0 -RandomSpread = 0.0 -_rotationOffset = 0.0 metadata/_custom_type_script = "uid://b6fmrnipv88bk" diff --git a/addons/cyclops_level_builder/data/tool_tags/tool_tag_clip.tres b/addons/cyclops_level_builder/data/tool_tags/tool_tag_clip.tres index af019bc6..f0ecbfeb 100644 --- a/addons/cyclops_level_builder/data/tool_tags/tool_tag_clip.tres +++ b/addons/cyclops_level_builder/data/tool_tags/tool_tag_clip.tres @@ -15,7 +15,6 @@ script = ExtResource("2_4grct") id = "clip" name = "Clip" input_events = Array[InputEvent]([SubResource("InputEventKey_hd0cm")]) -input_events_override = false tooltip = "Clip Click on surface of block to place first cutting point. diff --git a/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_cylinder.tres b/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_cylinder.tres index 2c758d5c..66f79ad3 100644 --- a/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_cylinder.tres +++ b/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_cylinder.tres @@ -15,7 +15,6 @@ script = ExtResource("2_8mpiw") id = "cylinder" name = "Cylinder" input_events = Array[InputEvent]([SubResource("InputEventKey_qk3nx")]) -input_events_override = false tooltip = "Cylinder Click on surface of block or in empty space to begin creating base of a cylinder. diff --git a/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_prism.tres b/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_prism.tres index 8d5fa8a9..4950f969 100644 --- a/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_prism.tres +++ b/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_prism.tres @@ -15,7 +15,6 @@ script = ExtResource("1_oalyb") id = "prism" name = "Prism" input_events = Array[InputEvent]([SubResource("InputEventKey_ral6n")]) -input_events_override = false tooltip = "Prism Click on surface of block or in empty space to begin creating base of a prism. diff --git a/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_stairs.tres b/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_stairs.tres index 5c273341..5d38034e 100644 --- a/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_stairs.tres +++ b/addons/cyclops_level_builder/data/tool_tags/tool_tag_create_stairs.tres @@ -16,7 +16,6 @@ script = ExtResource("1_kdc1t") id = "stairs" name = "Stairs" input_events = Array[InputEvent]([SubResource("InputEventKey_bydj5")]) -input_events_override = false tooltip = "Click on surface of block or in empty space to begin creating base of a stair case. Release mouse button and drag upwards to adjust the height of the stairs. diff --git a/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_edge.tres b/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_edge.tres index 5664767d..4b7b6904 100644 --- a/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_edge.tres +++ b/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_edge.tres @@ -15,7 +15,6 @@ script = ExtResource("1_w2hsk") id = "edit_edge" name = "Edge" input_events = Array[InputEvent]([SubResource("InputEventKey_k6fuk")]) -input_events_override = false tooltip = "Edge Click on an edge to select it. Shift Click to toggle selecton, Ctrl Click to add to selection, Shift-Ctrl click to subtract from selection. diff --git a/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_face.tres b/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_face.tres index 609b9f9a..2f33522c 100644 --- a/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_face.tres +++ b/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_face.tres @@ -19,7 +19,6 @@ script = ExtResource("2_qfyqw") id = "edit_face" name = "Face" input_events = Array[InputEvent]([SubResource("InputEventKey_xxi5p"), SubResource("InputEventKey_1smmt")]) -input_events_override = false tooltip = "Face Click on a face to select it. Shift Click to toggle selecton, Ctrl Click to add to selection, Shift-Ctrl click to subtract from selection. diff --git a/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_vertex.tres b/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_vertex.tres index 1b5853bf..a2accf33 100644 --- a/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_vertex.tres +++ b/addons/cyclops_level_builder/data/tool_tags/tool_tag_edit_vertex.tres @@ -15,7 +15,6 @@ script = ExtResource("2_yi1sl") id = "edit_vertex" name = "Vertex" input_events = Array[InputEvent]([SubResource("InputEventKey_11fdh")]) -input_events_override = false tooltip = "Vertex Click on a vertex to select it. Shift Click to toggle selecton, Ctrl Click to add to selection, Shift-Ctrl click to subtract from selection. diff --git a/addons/cyclops_level_builder/data/tool_tags/tool_tag_material_brush.tres b/addons/cyclops_level_builder/data/tool_tags/tool_tag_material_brush.tres index cf691c84..72cef3b4 100644 --- a/addons/cyclops_level_builder/data/tool_tags/tool_tag_material_brush.tres +++ b/addons/cyclops_level_builder/data/tool_tags/tool_tag_material_brush.tres @@ -14,7 +14,6 @@ script = ExtResource("2_ooato") id = "material_brush" name = "Material Brush" input_events = Array[InputEvent]([SubResource("InputEventKey_enkb2")]) -input_events_override = false tooltip = "Material Brush Click and drag on surfaces to apply the currently selected material. diff --git a/addons/cyclops_level_builder/data/tool_tags/tool_tag_vertex_color_brush.tres b/addons/cyclops_level_builder/data/tool_tags/tool_tag_vertex_color_brush.tres index 0af7fa1f..14c94298 100644 --- a/addons/cyclops_level_builder/data/tool_tags/tool_tag_vertex_color_brush.tres +++ b/addons/cyclops_level_builder/data/tool_tags/tool_tag_vertex_color_brush.tres @@ -14,7 +14,6 @@ script = ExtResource("2_pcbhj") id = "vertex_color_brush" name = "Vertex Color Brush" input_events = Array[InputEvent]([SubResource("InputEventKey_v56kt")]) -input_events_override = false tooltip = "Vertex Color Brush Click and drag on surfaces to adjust the vertex color. diff --git a/addons/cyclops_level_builder/shaders/outline_shader.tres b/addons/cyclops_level_builder/shaders/outline_shader.tres index f39feff7..c333f1f4 100644 --- a/addons/cyclops_level_builder/shaders/outline_shader.tres +++ b/addons/cyclops_level_builder/shaders/outline_shader.tres @@ -15,7 +15,7 @@ default_input_values = [0, 0.0, 1, 1.0] [resource] code = "shader_type spatial; -render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_lambert, specular_schlick_ggx; +render_mode blend_mix, depth_draw_opaque, depth_test_default, cull_back, diffuse_lambert, specular_schlick_ggx; uniform vec4 ColorParameter : source_color = vec4(0.000000, 0.000000, 0.000000, 1.000000); uniform sampler2D depth_tex_frg_4 : hint_depth_texture; diff --git a/project.godot b/project.godot index 896553d5..39c26bda 100644 --- a/project.godot +++ b/project.godot @@ -35,7 +35,7 @@ resources_spreadsheet_view/freeze_first_column=true config/name="Cirno" run/main_scene="uid://dew6axbejrusj" -config/features=PackedStringArray("4.4", "C#", "GL Compatibility") +config/features=PackedStringArray("4.5", "C#", "GL Compatibility") config/icon="res://icon.svg" [audio]