Skip to content

Commit 657279d

Browse files
committed
Fix particles
1 parent 82f2044 commit 657279d

2 files changed

Lines changed: 33 additions & 49 deletions

File tree

Levels/Playable/Medium/1Tutorial/Floor1.tscn

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[gd_scene load_steps=171 format=3 uid="uid://duynmnq82mben"]
22

3-
[ext_resource type="Script" path="res://Scripts/LevelScripts/LevelManager.gd" id="1_fl7hs"]
3+
[ext_resource type="Script" uid="uid://nduqecan1fld" path="res://Scripts/LevelScripts/LevelManager.gd" id="1_fl7hs"]
44
[ext_resource type="Texture2D" uid="uid://bu0stjydydrdj" path="res://Assets/Images/Tilesets/TileMap3DWall.png" id="2_xrlir"]
55
[ext_resource type="Texture2D" uid="uid://vfxsefxanr00" path="res://Assets/Images/Tilesets/DirectionalSignsTileset.png" id="3_0nphy"]
66
[ext_resource type="TileSet" uid="uid://dtsvfundbj5" path="res://Objects/StaticObjects/Tileset.tres" id="3_eufvj"]
77
[ext_resource type="Texture2D" uid="uid://bato62a53682m" path="res://Assets/Images/Tilesets/TileMap3DWallBlank.png" id="3_vr272"]
88
[ext_resource type="Texture2D" uid="uid://dx3pyxtqxduw3" path="res://Assets/Images/Tilesets/PipeTilesetSmallTest.png" id="4_mouxu"]
99
[ext_resource type="TileSet" uid="uid://b8wvvoyytbju2" path="res://Objects/StaticObjects/Gravel.tres" id="5_ap23i"]
1010
[ext_resource type="PackedScene" uid="uid://dlchuo004ji5k" path="res://Objects/Player.tscn" id="6_ad5ab"]
11-
[ext_resource type="Script" path="res://Scripts/FrameworkScripts/NextLevel.gd" id="7_6b3e4"]
11+
[ext_resource type="Script" uid="uid://dsxmj5jix14a2" path="res://Scripts/FrameworkScripts/NextLevel.gd" id="7_6b3e4"]
1212
[ext_resource type="TileSet" uid="uid://cvy3v64tsv3k5" path="res://Objects/StaticObjects/Spikes.tres" id="7_dr4u2"]
1313
[ext_resource type="PackedScene" uid="uid://cwm1lj78dxm6r" path="res://Objects/StaticObjects/ItemSwitcher.tscn" id="8_j5v6x"]
1414
[ext_resource type="PackedScene" uid="uid://dy1jq84e4ww4" path="res://Objects/StaticObjects/Drone.tscn" id="9_rgrfr"]
15-
[ext_resource type="Shader" path="res://Scripts/Shaders/Fog.gdshader" id="9_sblmb"]
15+
[ext_resource type="Shader" uid="uid://b13tifkdi2pjq" path="res://Scripts/Shaders/Fog.gdshader" id="9_sblmb"]
1616
[ext_resource type="PackedScene" uid="uid://btl0cv6b8cmh" path="res://Objects/StaticObjects/GrappleHook.tscn" id="10_p42e6"]
1717
[ext_resource type="AudioStream" uid="uid://c3e5iry4m6flo" path="res://Assets/Audio/SFX/ItemSwitch.wav" id="11_434au"]
1818
[ext_resource type="PackedScene" uid="uid://kupdltxkw0wt" path="res://Objects/StaticObjects/Checkpoint.tscn" id="11_unlok"]
@@ -40,10 +40,10 @@
4040
[ext_resource type="PackedScene" uid="uid://dary5muymue13" path="res://Objects/StaticObjects/BGLeafBunch.tscn" id="36_ck8f7"]
4141
[ext_resource type="PackedScene" uid="uid://dpkkyo8c5driy" path="res://Objects/StaticObjects/SidewaysDoor.tscn" id="38_oitav"]
4242
[ext_resource type="PackedScene" uid="uid://bcwrdriivsxv0" path="res://Objects/StaticObjects/Ladder.tscn" id="39_843o4"]
43-
[ext_resource type="Script" path="res://Levels/Playable/Medium/1Tutorial/SecondDoorCloser.gd" id="42_so2o2"]
43+
[ext_resource type="Script" uid="uid://bgqw4b085oj2" path="res://Levels/Playable/Medium/1Tutorial/SecondDoorCloser.gd" id="42_so2o2"]
4444
[ext_resource type="Texture2D" uid="uid://failsjwtufog" path="res://Assets/Images/Objects/Misc/FireParticle1.png" id="43_i4ym5"]
4545
[ext_resource type="Texture2D" uid="uid://etxao5kfq5qj" path="res://Assets/Images/Objects/Props/MistMaker.png" id="44_ay3la"]
46-
[ext_resource type="Script" path="res://Levels/Playable/Medium/1Tutorial/TutorialDoorCloser.gd" id="44_xp1je"]
46+
[ext_resource type="Script" uid="uid://d4fa0qbqrtjfb" path="res://Levels/Playable/Medium/1Tutorial/TutorialDoorCloser.gd" id="44_xp1je"]
4747
[ext_resource type="PackedScene" uid="uid://bt786e16fyak1" path="res://Objects/StaticObjects/PlayerObjectiveSetter.tscn" id="46_6ebp4"]
4848
[ext_resource type="Texture2D" uid="uid://lmu0hho8kukf" path="res://Assets/Images/Objects/FunctionalProps/PlayerRocketShip.png" id="47_ec3rt"]
4949
[ext_resource type="PackedScene" uid="uid://ddynqq6tu5pqi" path="res://Objects/StaticObjects/TextScrollActivator.tscn" id="48_abwk2"]
@@ -163,36 +163,20 @@ physics_layer_0/collision_layer = 1
163163
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_7qd54"]
164164
texture = ExtResource("4_mouxu")
165165
0:0/0 = 0
166-
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
167-
0:0/0/physics_layer_0/angular_velocity = 0.0
168166
0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
169167
1:0/0 = 0
170-
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
171-
1:0/0/physics_layer_0/angular_velocity = 0.0
172168
1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
173169
0:1/0 = 0
174-
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
175-
0:1/0/physics_layer_0/angular_velocity = 0.0
176170
0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
177171
1:1/0 = 0
178-
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
179-
1:1/0/physics_layer_0/angular_velocity = 0.0
180172
1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
181173
2:1/0 = 0
182-
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
183-
2:1/0/physics_layer_0/angular_velocity = 0.0
184174
2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
185175
3:1/0 = 0
186-
3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
187-
3:1/0/physics_layer_0/angular_velocity = 0.0
188176
3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
189177
3:0/0 = 0
190-
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
191-
3:0/0/physics_layer_0/angular_velocity = 0.0
192178
3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
193179
2:0/0 = 0
194-
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
195-
2:0/0/physics_layer_0/angular_velocity = 0.0
196180
2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
197181

198182
[sub_resource type="TileSet" id="TileSet_2gdyw"]
@@ -207,15 +191,15 @@ frequency = 0.003
207191
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_jqowm"]
208192
width = 1024
209193
height = 1024
194+
noise = SubResource("FastNoiseLite_ulv0b")
210195
seamless = true
211196
seamless_blend_skirt = 1.0
212-
noise = SubResource("FastNoiseLite_ulv0b")
213197

214198
[sub_resource type="ShaderMaterial" id="ShaderMaterial_l1flo"]
215199
shader = ExtResource("9_sblmb")
200+
shader_parameter/noise_texture = SubResource("NoiseTexture2D_jqowm")
216201
shader_parameter/density = 0.127
217202
shader_parameter/speed = Vector2(0.02, 0.006)
218-
shader_parameter/noise_texture = SubResource("NoiseTexture2D_jqowm")
219203

220204
[sub_resource type="RectangleShape2D" id="RectangleShape2D_fuwdw"]
221205
size = Vector2(40, 64)
@@ -916,7 +900,7 @@ emission_shape = 3
916900
emission_box_extents = Vector3(16, 1, 1)
917901
angle_min = -720.0
918902
angle_max = 720.0
919-
direction = Vector3(0, 0, 0)
903+
direction = Vector3(0, 1, 0)
920904
spread = 20.0
921905
initial_velocity_min = 11.24
922906
initial_velocity_max = 78.65
@@ -2101,18 +2085,18 @@ z_index = 50
21012085
position = Vector2(-2464, 76)
21022086
emitting = false
21032087
amount = 1000
2104-
process_material = SubResource("ParticleProcessMaterial_66x88")
21052088
texture = ExtResource("43_i4ym5")
21062089
lifetime = 4.5
2090+
process_material = SubResource("ParticleProcessMaterial_66x88")
21072091

21082092
[node name="GPUParticles2D2" type="GPUParticles2D" parent="."]
21092093
z_index = 50
21102094
position = Vector2(-2432, 76)
21112095
emitting = false
21122096
amount = 1000
2113-
process_material = SubResource("ParticleProcessMaterial_66x88")
21142097
texture = ExtResource("43_i4ym5")
21152098
lifetime = 4.5
2099+
process_material = SubResource("ParticleProcessMaterial_66x88")
21162100

21172101
[node name="MistMaker" type="Sprite2D" parent="."]
21182102
z_index = -1

Objects/FrameworkNodes/SelectCharacterMenu.tscn

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[gd_scene load_steps=13 format=3 uid="uid://b5jimb53wf7mf"]
22

33
[ext_resource type="Theme" uid="uid://by6yqsmwuyf3i" path="res://Objects/UIThemes/Menu.tres" id="1_0i2j1"]
4-
[ext_resource type="Script" path="res://Scripts/FrameworkScripts/Menu.gd" id="1_kscwv"]
4+
[ext_resource type="Script" uid="uid://bg6gjg1kn2jxy" path="res://Scripts/FrameworkScripts/Menu.gd" id="1_kscwv"]
55
[ext_resource type="Texture2D" uid="uid://x77mfqnbr3mo" path="res://Assets/Images/Objects/UI/CharacterIconType1.png" id="2_t6g8c"]
66
[ext_resource type="Texture2D" uid="uid://basots7w6wl3l" path="res://Assets/Images/Objects/UI/CharacterIconType2.png" id="3_2pl31"]
77
[ext_resource type="Texture2D" uid="uid://cihlwhrhtkp1e" path="res://Assets/Images/Objects/UI/CharacterIconType3.png" id="4_7ybwy"]
@@ -26,14 +26,6 @@ corner_radius_bottom_right = 20
2626
corner_radius_bottom_left = 20
2727
shadow_size = 43
2828

29-
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_p3bx2"]
30-
bg_color = Color(0.262745, 0.262745, 0.262745, 1)
31-
corner_radius_top_left = 20
32-
corner_radius_top_right = 20
33-
corner_radius_bottom_right = 20
34-
corner_radius_bottom_left = 20
35-
shadow_size = 25
36-
3729
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_eb7rl"]
3830
bg_color = Color(0, 0, 0, 1)
3931
corner_radius_top_left = 3
@@ -50,6 +42,14 @@ corner_radius_bottom_right = 3
5042
corner_radius_bottom_left = 3
5143
shadow_size = 4
5244

45+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_p3bx2"]
46+
bg_color = Color(0.262745, 0.262745, 0.262745, 1)
47+
corner_radius_top_left = 20
48+
corner_radius_top_right = 20
49+
corner_radius_bottom_right = 20
50+
corner_radius_bottom_left = 20
51+
shadow_size = 25
52+
5353
[node name="SelectCharacterMenu" type="Node2D"]
5454
script = ExtResource("1_kscwv")
5555

@@ -122,20 +122,6 @@ icon = ExtResource("5_skhgk")
122122
icon_alignment = 1
123123
metadata/_edit_use_anchors_ = true
124124

125-
[node name="Label" type="Label" parent="."]
126-
offset_left = -161.0
127-
offset_top = -182.0
128-
offset_right = 1459.0
129-
offset_bottom = -45.0
130-
scale = Vector2(0.2, 0.2)
131-
theme_override_fonts/font = ExtResource("7_bo22q")
132-
theme_override_font_sizes/font_size = 125
133-
theme_override_styles/normal = SubResource("StyleBoxFlat_p3bx2")
134-
text = "Please choose a character type
135-
"
136-
horizontal_alignment = 1
137-
metadata/_edit_use_anchors_ = true
138-
139125
[node name="SelectCharacterStart" type="Button" parent="."]
140126
offset_left = 22.0
141127
offset_top = 54.0
@@ -171,6 +157,20 @@ mouse_filter = 2
171157
theme_override_styles/panel = SubResource("StyleBoxFlat_dbquh")
172158
metadata/_edit_use_anchors_ = true
173159

160+
[node name="Label" type="Label" parent="."]
161+
offset_left = -161.0
162+
offset_top = -190.0
163+
offset_right = 1459.0
164+
offset_bottom = 63.0
165+
scale = Vector2(0.2, 0.2)
166+
theme_override_fonts/font = ExtResource("7_bo22q")
167+
theme_override_font_sizes/font_size = 125
168+
theme_override_styles/normal = SubResource("StyleBoxFlat_p3bx2")
169+
text = "Please choose a character type
170+
"
171+
horizontal_alignment = 1
172+
metadata/_edit_use_anchors_ = true
173+
174174
[connection signal="button_up" from="Type1" to="." method="_on_type_1_button_up"]
175175
[connection signal="button_up" from="Type2" to="." method="_on_type_2_button_up"]
176176
[connection signal="button_up" from="Type3" to="." method="_on_type_3_button_up"]

0 commit comments

Comments
 (0)