Skip to content

Commit 8b2a43a

Browse files
committed
Mele ragdolls now have better weight, and bullet auto-aim is framerate independant
1 parent 514019e commit 8b2a43a

File tree

5 files changed

+35
-245
lines changed

5 files changed

+35
-245
lines changed

Levels/Playable/Medium/30SurfaceElevatorPuzzle/Floor1.tscn

Lines changed: 19 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=56 format=3 uid="uid://cog3jp2ops40s"]
22

3-
[ext_resource type="Script" path="res://Scripts/LevelScripts/LevelManager.gd" id="1_y5xwq"]
3+
[ext_resource type="Script" uid="uid://nduqecan1fld" path="res://Scripts/LevelScripts/LevelManager.gd" id="1_y5xwq"]
44
[ext_resource type="TileSet" uid="uid://bfmnlsmvueif0" path="res://Objects/StaticObjects/Decorations.tres" id="2_tssok"]
55
[ext_resource type="Texture2D" uid="uid://vfxsefxanr00" path="res://Assets/Images/Tilesets/DirectionalSignsTileset.png" id="4_s2duu"]
66
[ext_resource type="TileSet" uid="uid://dtsvfundbj5" path="res://Objects/StaticObjects/Tileset.tres" id="5_n3b1c"]
@@ -11,21 +11,21 @@
1111
[ext_resource type="TileSet" uid="uid://c15403c3j8mi2" path="res://Objects/StaticObjects/TransparentMetal.tres" id="10_mjc51"]
1212
[ext_resource type="PackedScene" uid="uid://dlchuo004ji5k" path="res://Objects/Player.tscn" id="11_m5piq"]
1313
[ext_resource type="Texture2D" uid="uid://bato62a53682m" path="res://Assets/Images/Tilesets/TileMap3DWallBlank.png" id="12_15hnn"]
14-
[ext_resource type="Script" path="res://Scripts/FrameworkScripts/NextLevel.gd" id="13_66gg7"]
14+
[ext_resource type="Script" uid="uid://dsxmj5jix14a2" path="res://Scripts/FrameworkScripts/NextLevel.gd" id="13_66gg7"]
1515
[ext_resource type="AudioStream" uid="uid://dgahhl602nprq" path="res://Assets/Audio/SFX/AmbientBackground1.wav" id="14_brjks"]
16-
[ext_resource type="Shader" path="res://Scripts/Shaders/Bulge.gdshader" id="15_s4chd"]
16+
[ext_resource type="Shader" uid="uid://dnksso1vjltix" path="res://Scripts/Shaders/Bulge.gdshader" id="15_s4chd"]
1717
[ext_resource type="PackedScene" uid="uid://bbjsnlu46xco0" path="res://Objects/StaticObjects/Key.tscn" id="16_l1asd"]
1818
[ext_resource type="PackedScene" uid="uid://cwm1lj78dxm6r" path="res://Objects/StaticObjects/ItemSwitcher.tscn" id="17_8njnc"]
1919
[ext_resource type="PackedScene" uid="uid://btl0cv6b8cmh" path="res://Objects/StaticObjects/GrappleHook.tscn" id="18_ao25b"]
2020
[ext_resource type="PackedScene" uid="uid://dpgkdmaf2nwpc" path="res://Objects/StaticObjects/NextLevelRequiresKey.tscn" id="19_5d67w"]
2121
[ext_resource type="Texture2D" uid="uid://ydc0ydkg2c3r" path="res://Assets/Images/Objects/Props/PropDoorSideways2.png" id="20_3txb6"]
22-
[ext_resource type="Script" path="res://Levels/Playable/Medium/30SurfaceElevatorPuzzle/ElevatorManager.gd" id="21_3al8j"]
22+
[ext_resource type="Script" uid="uid://bqa25s8a682nh" path="res://Levels/Playable/Medium/30SurfaceElevatorPuzzle/ElevatorManager.gd" id="21_3al8j"]
2323
[ext_resource type="Texture2D" uid="uid://b8sqcnj3m3ksh" path="res://Assets/Images/Objects/FunctionalProps/ElevatorCharage.png" id="21_3e8m8"]
2424
[ext_resource type="Texture2D" uid="uid://xe4n818le3p8" path="res://addons/controller_icons/assets/key/e.png" id="22_metxa"]
25-
[ext_resource type="Script" path="res://addons/controller_icons/objects/TextureRect.gd" id="23_bw2sv"]
25+
[ext_resource type="Script" uid="uid://c35v1akp1r2rs" path="res://addons/controller_icons/objects/TextureRect.gd" id="23_bw2sv"]
2626
[ext_resource type="AudioStream" uid="uid://cqppk2cadvdk5" path="res://Assets/Audio/Music/ElevatorMusic.ogg" id="23_uehp8"]
2727
[ext_resource type="PackedScene" uid="uid://7gkuoslfisye" path="res://Objects/StaticObjects/PistonSmasher.tscn" id="25_tjqer"]
28-
[ext_resource type="Script" path="res://Levels/Playable/Medium/30SurfaceElevatorPuzzle/AnimationActivator.gd" id="26_6qcrf"]
28+
[ext_resource type="Script" uid="uid://n5bkdisdhklg" path="res://Levels/Playable/Medium/30SurfaceElevatorPuzzle/AnimationActivator.gd" id="26_6qcrf"]
2929
[ext_resource type="Texture2D" uid="uid://g33u6pnalcvl" path="res://Assets/Images/Objects/Misc/PrometheusLogoGlowingNoText.png" id="28_olsre"]
3030
[ext_resource type="Texture2D" uid="uid://sffyncbf6klt" path="res://Assets/Images/Objects/Props/DoorAjarSprite.png" id="29_lvhg8"]
3131
[ext_resource type="PackedScene" uid="uid://cdiesn1utq8vv" path="res://Objects/StaticObjects/SteamPipe.tscn" id="30_iivlj"]
@@ -57,36 +57,20 @@ metadata/_better_terrain = {
5757
texture = ExtResource("6_cjnlc")
5858
texture_region_size = Vector2i(32, 32)
5959
0:0/0 = 0
60-
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
61-
0:0/0/physics_layer_0/angular_velocity = 0.0
6260
0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
6361
1:0/0 = 0
64-
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
65-
1:0/0/physics_layer_0/angular_velocity = 0.0
6662
1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
6763
2:0/0 = 0
68-
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
69-
2:0/0/physics_layer_0/angular_velocity = 0.0
7064
2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
7165
3:0/0 = 0
72-
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
73-
3:0/0/physics_layer_0/angular_velocity = 0.0
7466
3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
7567
0:1/0 = 0
76-
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
77-
0:1/0/physics_layer_0/angular_velocity = 0.0
7868
0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
7969
1:1/0 = 0
80-
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
81-
1:1/0/physics_layer_0/angular_velocity = 0.0
8270
1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
8371
2:1/0 = 0
84-
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
85-
2:1/0/physics_layer_0/angular_velocity = 0.0
8672
2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
8773
3:1/0 = 0
88-
3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
89-
3:1/0/physics_layer_0/angular_velocity = 0.0
9074
3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
9175

9276
[sub_resource type="TileSet" id="TileSet_yk64r"]
@@ -97,36 +81,20 @@ sources/0 = SubResource("TileSetAtlasSource_fx8ic")
9781
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_7qd54"]
9882
texture = ExtResource("7_w4nc3")
9983
0:0/0 = 0
100-
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
101-
0:0/0/physics_layer_0/angular_velocity = 0.0
10284
0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
10385
1:0/0 = 0
104-
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
105-
1:0/0/physics_layer_0/angular_velocity = 0.0
10686
1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
10787
0:1/0 = 0
108-
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
109-
0:1/0/physics_layer_0/angular_velocity = 0.0
11088
0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
11189
1:1/0 = 0
112-
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
113-
1:1/0/physics_layer_0/angular_velocity = 0.0
11490
1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
11591
2:1/0 = 0
116-
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
117-
2:1/0/physics_layer_0/angular_velocity = 0.0
11892
2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
11993
3:1/0 = 0
120-
3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
121-
3:1/0/physics_layer_0/angular_velocity = 0.0
12294
3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
12395
3:0/0 = 0
124-
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
125-
3:0/0/physics_layer_0/angular_velocity = 0.0
12696
3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
12797
2:0/0 = 0
128-
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
129-
2:0/0/physics_layer_0/angular_velocity = 0.0
13098
2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
13199

132100
[sub_resource type="TileSet" id="TileSet_2gdyw"]
@@ -210,8 +178,8 @@ tracks/0/keys = {
210178

211179
[sub_resource type="AnimationLibrary" id="AnimationLibrary_cghqg"]
212180
_data = {
213-
"ElevatorUp": SubResource("Animation_uks5k"),
214-
"RESET": SubResource("Animation_80vb5")
181+
&"ElevatorUp": SubResource("Animation_uks5k"),
182+
&"RESET": SubResource("Animation_80vb5")
215183
}
216184

217185
[sub_resource type="Animation" id="Animation_1nfsu"]
@@ -333,10 +301,10 @@ tracks/2/keys = {
333301

334302
[sub_resource type="AnimationLibrary" id="AnimationLibrary_mtwqf"]
335303
_data = {
336-
"DOWN": SubResource("Animation_1nfsu"),
337-
"RESET": SubResource("Animation_2s6i3"),
338-
"SmasherUp": SubResource("Animation_3ciao"),
339-
"UP": SubResource("Animation_texy7")
304+
&"DOWN": SubResource("Animation_1nfsu"),
305+
&"RESET": SubResource("Animation_2s6i3"),
306+
&"SmasherUp": SubResource("Animation_3ciao"),
307+
&"UP": SubResource("Animation_texy7")
340308
}
341309

342310
[sub_resource type="RectangleShape2D" id="RectangleShape2D_nrvtc"]
@@ -487,6 +455,11 @@ dont_use_swing_mode = true
487455
position = Vector2(-174, 196)
488456
dont_use_swing_mode = true
489457

458+
[node name="GrappleHook4" parent="." instance=ExtResource("18_ao25b")]
459+
position = Vector2(-572, 358)
460+
rotation = -1.5707964
461+
dont_use_swing_mode = true
462+
490463
[node name="GrappleHook3" parent="." instance=ExtResource("18_ao25b")]
491464
position = Vector2(-454, -4)
492465
rotation = 3.14159
@@ -546,7 +519,7 @@ autoplay = "default"
546519
[node name="AnimationPlayer" type="AnimationPlayer" parent="ElevatorManager"]
547520
root_node = NodePath("../..")
548521
libraries = {
549-
"": SubResource("AnimationLibrary_cghqg")
522+
&"": SubResource("AnimationLibrary_cghqg")
550523
}
551524

552525
[node name="ElevatorMusicPlayer" type="AudioStreamPlayer2D" parent="ElevatorManager"]
@@ -579,7 +552,7 @@ wait_time = 1000.0
579552

580553
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
581554
libraries = {
582-
"": SubResource("AnimationLibrary_mtwqf")
555+
&"": SubResource("AnimationLibrary_mtwqf")
583556
}
584557

585558
[node name="AnimationActivator" type="Area2D" parent="."]

0 commit comments

Comments
 (0)