diff --git a/Assets/Sprites/Particles/ArenaLeaves.tres b/Assets/Sprites/Particles/ArenaLeaves.tres index 34138d3..d015168 100644 --- a/Assets/Sprites/Particles/ArenaLeaves.tres +++ b/Assets/Sprites/Particles/ArenaLeaves.tres @@ -1,8 +1,8 @@ [gd_resource type="ParticleProcessMaterial" load_steps=3 format=3 uid="uid://b64pfv5ocwegv"] [sub_resource type="Gradient" id="Gradient_p5otp"] -offsets = PackedFloat32Array(0, 0.2, 0.5, 0.6, 0.7, 0.8, 1) -colors = PackedColorArray(0.105882, 0.0470588, 0.117647, 0, 0.105882, 0.0470588, 0.117647, 1, 0.105882, 0.0470588, 0.117647, 1, 0.0509804, 0.258824, 0.109804, 1, 0.396078, 0.658824, 0.309804, 1, 0.745098, 0.85098, 0.513726, 1, 0.745098, 0.85098, 0.513726, 0) +offsets = PackedFloat32Array(0, 0.2, 0.8, 1) +colors = PackedColorArray(0.105882, 0.0470588, 0.117647, 0, 0.105882, 0.0470588, 0.117647, 1, 0.105882, 0.0470588, 0.117647, 1, 0.745098, 0.85098, 0.513726, 0) [sub_resource type="GradientTexture1D" id="GradientTexture1D_4a2pn"] gradient = SubResource("Gradient_p5otp") @@ -22,6 +22,7 @@ initial_velocity_max = 64.0 angular_velocity_max = 30.0 orbit_velocity_min = 0.0 orbit_velocity_max = 0.0 +linear_accel_min = -64.0 +linear_accel_max = -32.0 color_ramp = SubResource("GradientTexture1D_4a2pn") -turbulence_enabled = true turbulence_noise_speed = Vector3(1, 0, 0) diff --git a/Scenes/Maps/Arena.tscn b/Scenes/Maps/Arena.tscn index 153b229..f8b59b9 100644 --- a/Scenes/Maps/Arena.tscn +++ b/Scenes/Maps/Arena.tscn @@ -12,7 +12,7 @@ [ext_resource type="PackedScene" uid="uid://malbos18dh7l" path="res://BoundingBoxes/CameraBounds.tscn" id="11_j2620"] [ext_resource type="Texture2D" uid="uid://c1a7lvb4uuwfy" path="res://Assets/Sprites/Particles/circle-16.png" id="11_yjp7m"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ov5gu"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_64d08"] resource_local_to_scene = true shader = ExtResource("5_h8k5p") shader_parameter/color = Vector4(1, 1, 1, 1) @@ -139,7 +139,7 @@ visible = false position = Vector2(120, -112) [node name="Doc" parent="Entities" index="0" instance=ExtResource("4_ej0f3")] -material = SubResource("ShaderMaterial_ov5gu") +material = SubResource("ShaderMaterial_64d08") [node name="PointLight2D" type="PointLight2D" parent="Entities" index="1"] position = Vector2(168, -42) @@ -164,6 +164,7 @@ texture = ExtResource("11_yjp7m") lifetime = 2.5 explosiveness = 0.1 randomness = 0.2 +fixed_fps = 8 [node name="Entrance" type="Area2D" parent="Areas" index="0"] position = Vector2(0, 384) @@ -176,22 +177,8 @@ ToConnector = "ArenaEntrance" [node name="CollisionShape2D" type="CollisionShape2D" parent="Areas/Entrance" index="0"] shape = SubResource("RectangleShape2D_2xagi") -[node name="ArenaCameraBounds" parent="Areas" index="1" node_paths=PackedStringArray("TopLeft", "BottomRight") instance=ExtResource("11_j2620")] -position = Vector2(0, -1) -TopLeft = NodePath("TopLeft") -BottomRight = NodePath("BottomRight") - -[node name="Area2D" parent="Areas/ArenaCameraBounds" index="0"] -monitoring = false - -[node name="TopLeft" parent="Areas/ArenaCameraBounds" index="1"] -position = Vector2(-256, -127) - -[node name="BottomRight" parent="Areas/ArenaCameraBounds" index="2"] -position = Vector2(256, 129) - -[node name="EntranceCameraBounds" parent="Areas" index="2" node_paths=PackedStringArray("TopLeft", "BottomRight") instance=ExtResource("11_j2620")] -TopLeft = NodePath("../ArenaCameraBounds/TopLeft") +[node name="EntranceCameraBounds" parent="Areas" index="1" node_paths=PackedStringArray("TopLeft", "BottomRight") instance=ExtResource("11_j2620")] +TopLeft = NodePath("") BottomRight = NodePath("BottomRight") [node name="Area2D" parent="Areas/EntranceCameraBounds" index="0"] @@ -209,5 +196,4 @@ position = Vector2(256, 440) [node name="Entrance" type="Marker2D" parent="Markers" index="0"] position = Vector2(0, 352) -[editable path="Areas/ArenaCameraBounds"] [editable path="Areas/EntranceCameraBounds"] diff --git a/Scenes/Maps/ArenaExterior.tscn b/Scenes/Maps/ArenaExterior.tscn index dec1dd4..395f9e0 100644 --- a/Scenes/Maps/ArenaExterior.tscn +++ b/Scenes/Maps/ArenaExterior.tscn @@ -166,91 +166,91 @@ size = Vector2(64, 97) [sub_resource type="RectangleShape2D" id="RectangleShape2D_5pcme"] size = Vector2(18, 6) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_3bro1"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_eh6ai"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_1isu6"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_0m0e7"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_xghu1"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_x7hn4"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_soiaq"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_hwrx0"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_jcgri"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_u5bpj"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_srykw"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_obne2"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_bybdu"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_4k68d"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_x0ian"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_p1mnf"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_pti1q"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_cgtqt"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_7sdwi"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_bk61n"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_kyaac"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_wqa86"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_axrky"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_k05ph"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) shader_parameter/intensity = 0.0 shader_parameter/alpha_modulate = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_iste5"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_sq2yd"] resource_local_to_scene = true shader = ExtResource("28_b3suq") shader_parameter/color = Vector4(1, 1, 1, 1) @@ -716,55 +716,55 @@ position = Vector2(256, -9) position = Vector2(80, 373) [node name="Centurion" parent="Entities" index="8" instance=ExtResource("30_qfl2k")] -material = SubResource("ShaderMaterial_3bro1") +material = SubResource("ShaderMaterial_eh6ai") position = Vector2(-360, 31) [node name="Centurion2" parent="Entities" index="9" instance=ExtResource("30_qfl2k")] -material = SubResource("ShaderMaterial_1isu6") +material = SubResource("ShaderMaterial_0m0e7") position = Vector2(-224, 131) [node name="Centurion3" parent="Entities" index="10" instance=ExtResource("30_qfl2k")] -material = SubResource("ShaderMaterial_xghu1") +material = SubResource("ShaderMaterial_x7hn4") position = Vector2(-280, 411) [node name="Centurion4" parent="Entities" index="11" instance=ExtResource("30_qfl2k")] -material = SubResource("ShaderMaterial_soiaq") +material = SubResource("ShaderMaterial_hwrx0") position = Vector2(-232, 728) [node name="Legionary" parent="Entities" index="12" instance=ExtResource("27_84gw4")] -material = SubResource("ShaderMaterial_jcgri") +material = SubResource("ShaderMaterial_u5bpj") position = Vector2(-214, 72) [node name="Legionary2" parent="Entities" index="13" instance=ExtResource("27_84gw4")] -material = SubResource("ShaderMaterial_srykw") +material = SubResource("ShaderMaterial_obne2") position = Vector2(-496, 15) [node name="Legionary3" parent="Entities" index="14" instance=ExtResource("27_84gw4")] -material = SubResource("ShaderMaterial_bybdu") +material = SubResource("ShaderMaterial_4k68d") position = Vector2(-384, 118) [node name="Legionary4" parent="Entities" index="15" instance=ExtResource("27_84gw4")] -material = SubResource("ShaderMaterial_x0ian") +material = SubResource("ShaderMaterial_p1mnf") position = Vector2(-300, 384) [node name="Legionary5" parent="Entities" index="16" instance=ExtResource("27_84gw4")] -material = SubResource("ShaderMaterial_pti1q") +material = SubResource("ShaderMaterial_cgtqt") position = Vector2(-152, 728) [node name="Legionary6" parent="Entities" index="17" instance=ExtResource("27_84gw4")] -material = SubResource("ShaderMaterial_7sdwi") +material = SubResource("ShaderMaterial_bk61n") position = Vector2(-258, 455) [node name="Legionary7" parent="Entities" index="18" instance=ExtResource("27_84gw4")] -material = SubResource("ShaderMaterial_kyaac") +material = SubResource("ShaderMaterial_wqa86") position = Vector2(-556, 402) [node name="Legionary8" parent="Entities" index="19" instance=ExtResource("27_84gw4")] -material = SubResource("ShaderMaterial_axrky") +material = SubResource("ShaderMaterial_k05ph") position = Vector2(-404, 505) [node name="Cultist" parent="Entities" index="20" instance=ExtResource("30_xj4yo")] -material = SubResource("ShaderMaterial_iste5") +material = SubResource("ShaderMaterial_sq2yd") position = Vector2(191, 567) [node name="CameraBounds" parent="Areas" index="0" instance=ExtResource("33_e4gty")]