Skip to content

Commit 36fd4c8

Browse files
committed
Fix stair lighting
1 parent 8b2a43a commit 36fd4c8

File tree

8 files changed

+212
-641
lines changed

8 files changed

+212
-641
lines changed
57 Bytes
Loading

Assets/Images/Objects/Props/StairSpriteNonTransparent.png.import

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/StairSpriteNonTransparent.png-95c28d7458c6881
1818
compress/mode=0
1919
compress/high_quality=false
2020
compress/lossy_quality=0.7
21+
compress/uastc_level=0
22+
compress/rdo_quality_loss=0.0
2123
compress/hdr_compression=1
2224
compress/normal_map=0
2325
compress/channel_pack=0
2426
mipmaps/generate=false
2527
mipmaps/limit=-1
2628
roughness/mode=0
2729
roughness/src_normal=""
30+
process/channel_remap/red=0
31+
process/channel_remap/green=1
32+
process/channel_remap/blue=2
33+
process/channel_remap/alpha=3
2834
process/fix_alpha_border=true
2935
process/premult_alpha=false
3036
process/normal_map_invert_y=false

Levels/Playable/Medium/5Easy/Floor1.tscn

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

3-
[ext_resource type="Script" path="res://Scripts/LevelScripts/LevelManager.gd" id="1_3ry76"]
3+
[ext_resource type="Script" uid="uid://nduqecan1fld" path="res://Scripts/LevelScripts/LevelManager.gd" id="1_3ry76"]
44
[ext_resource type="Texture2D" uid="uid://bu0stjydydrdj" path="res://Assets/Images/Tilesets/TileMap3DWall.png" id="2_k7tq6"]
55
[ext_resource type="TileSet" uid="uid://dtsvfundbj5" path="res://Objects/StaticObjects/Tileset.tres" id="3_3igbv"]
66
[ext_resource type="Texture2D" uid="uid://vfxsefxanr00" path="res://Assets/Images/Tilesets/DirectionalSignsTileset.png" id="3_hmu40"]
@@ -9,14 +9,13 @@
99
[ext_resource type="TileSet" uid="uid://b8wvvoyytbju2" path="res://Objects/StaticObjects/Gravel.tres" id="6_5ewe1"]
1010
[ext_resource type="PackedScene" uid="uid://dlchuo004ji5k" path="res://Objects/Player.tscn" id="7_nm8ya"]
1111
[ext_resource type="Texture2D" uid="uid://bato62a53682m" path="res://Assets/Images/Tilesets/TileMap3DWallBlank.png" id="8_lb0sn"]
12-
[ext_resource type="Script" path="res://Scripts/FrameworkScripts/NextLevel.gd" id="10_bxd2n"]
12+
[ext_resource type="Script" uid="uid://dsxmj5jix14a2" path="res://Scripts/FrameworkScripts/NextLevel.gd" id="10_bxd2n"]
1313
[ext_resource type="Texture2D" uid="uid://sffyncbf6klt" path="res://Assets/Images/Objects/Props/DoorAjarSprite.png" id="11_pcuoe"]
1414
[ext_resource type="PackedScene" uid="uid://dhan07vwy03tg" path="res://Objects/StaticObjects/Drill.tscn" id="12_3rx5p"]
1515
[ext_resource type="Texture2D" uid="uid://cwxh4s8o0yiko" path="res://Assets/Images/Objects/Props/PropBench.png" id="13_3lsyc"]
1616
[ext_resource type="PackedScene" uid="uid://cm566haiwff2j" path="res://Objects/StaticObjects/Floodlight.tscn" id="16_ioa5m"]
1717
[ext_resource type="PackedScene" uid="uid://btl0cv6b8cmh" path="res://Objects/StaticObjects/GrappleHook.tscn" id="16_tou6m"]
1818
[ext_resource type="PackedScene" uid="uid://dvftqxgnkhk7v" path="res://Objects/StaticObjects/WallTurret.tscn" id="18_1ue77"]
19-
[ext_resource type="Texture2D" uid="uid://centqdm3rkc8p" path="res://Assets/Images/Objects/Props/StairSpriteNonTransparent.png" id="18_gqwt1"]
2019
[ext_resource type="Texture2D" uid="uid://d2sayxj4530sd" path="res://Assets/Images/Objects/Props/PropDoorFaceForwardLocked.png" id="19_2rb5e"]
2120
[ext_resource type="PackedScene" uid="uid://bdwnporw18dhy" path="res://Objects/StaticObjects/LightEmitter.tscn" id="20_51f2t"]
2221
[ext_resource type="Texture2D" uid="uid://dg2g03ffmhsby" path="res://Assets/Images/Objects/Props/PropWaterBottle.png" id="20_k5ujn"]
@@ -27,6 +26,7 @@
2726
[ext_resource type="PackedScene" uid="uid://bmu0h2ahup28b" path="res://Objects/StaticObjects/PreviousLevelArea.tscn" id="25_cra30"]
2827
[ext_resource type="PackedScene" uid="uid://dvmdybceqknkh" path="res://Objects/StaticObjects/PressEAreaPopup.tscn" id="26_sakk7"]
2928
[ext_resource type="PackedScene" uid="uid://ddynqq6tu5pqi" path="res://Objects/StaticObjects/TextScrollActivator.tscn" id="27_0bfiu"]
29+
[ext_resource type="PackedScene" uid="uid://dyuudd0mcchkr" path="res://Objects/StaticObjects/Stair.tscn" id="28_l0bb5"]
3030
[ext_resource type="PackedScene" uid="uid://bhgftpn5phvwc" path="res://Objects/StaticObjects/BiodomeCamera.tscn" id="28_t2kvm"]
3131

3232
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_yd36w"]
@@ -122,36 +122,20 @@ metadata/_better_terrain = {
122122
texture = ExtResource("4_ayq1c")
123123
texture_region_size = Vector2i(32, 32)
124124
0:0/0 = 0
125-
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
126-
0:0/0/physics_layer_0/angular_velocity = 0.0
127125
0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
128126
1:0/0 = 0
129-
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
130-
1:0/0/physics_layer_0/angular_velocity = 0.0
131127
1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
132128
2:0/0 = 0
133-
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
134-
2:0/0/physics_layer_0/angular_velocity = 0.0
135129
2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
136130
3:0/0 = 0
137-
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
138-
3:0/0/physics_layer_0/angular_velocity = 0.0
139131
3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
140132
0:1/0 = 0
141-
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
142-
0:1/0/physics_layer_0/angular_velocity = 0.0
143133
0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
144134
1:1/0 = 0
145-
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
146-
1:1/0/physics_layer_0/angular_velocity = 0.0
147135
1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
148136
2:1/0 = 0
149-
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
150-
2:1/0/physics_layer_0/angular_velocity = 0.0
151137
2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
152138
3:1/0 = 0
153-
3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
154-
3:1/0/physics_layer_0/angular_velocity = 0.0
155139
3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
156140

157141
[sub_resource type="TileSet" id="TileSet_fpdeq"]
@@ -162,36 +146,20 @@ sources/0 = SubResource("TileSetAtlasSource_khs7b")
162146
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_7qd54"]
163147
texture = ExtResource("5_pdj0b")
164148
0:0/0 = 0
165-
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
166-
0:0/0/physics_layer_0/angular_velocity = 0.0
167149
0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
168150
1:0/0 = 0
169-
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
170-
1:0/0/physics_layer_0/angular_velocity = 0.0
171151
1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
172152
0:1/0 = 0
173-
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
174-
0:1/0/physics_layer_0/angular_velocity = 0.0
175153
0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
176154
1:1/0 = 0
177-
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
178-
1:1/0/physics_layer_0/angular_velocity = 0.0
179155
1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
180156
2:1/0 = 0
181-
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
182-
2:1/0/physics_layer_0/angular_velocity = 0.0
183157
2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
184158
3:1/0 = 0
185-
3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
186-
3:1/0/physics_layer_0/angular_velocity = 0.0
187159
3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
188160
3:0/0 = 0
189-
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
190-
3:0/0/physics_layer_0/angular_velocity = 0.0
191161
3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
192162
2:0/0 = 0
193-
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
194-
2:0/0/physics_layer_0/angular_velocity = 0.0
195163
2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
196164

197165
[sub_resource type="TileSet" id="TileSet_2gdyw"]
@@ -282,6 +250,9 @@ layer_0/tile_data = PackedInt32Array(-26280076, 0, 0)
282250
tile_set = ExtResource("6_5ewe1")
283251
format = 2
284252

253+
[node name="Stair" parent="." instance=ExtResource("28_l0bb5")]
254+
position = Vector2(1600, 0)
255+
285256
[node name="StaticBody2D" type="StaticBody2D" parent="."]
286257
scale = Vector2(0.5, 0.5)
287258
collision_layer = 2
@@ -340,8 +311,7 @@ autoplay = true
340311
bus = &"SFX"
341312

342313
[node name="CanvasModulate" type="CanvasModulate" parent="."]
343-
visible = false
344-
color = Color(0.0784314, 0.0784314, 0.0784314, 1)
314+
color = Color(0.7019608, 0.7019608, 0.7019608, 1)
345315

346316
[node name="PropBench" type="Sprite2D" parent="."]
347317
position = Vector2(64, 16)
@@ -481,15 +451,6 @@ item_switch_type = "Grapple"
481451
[node name="ItemSwitcher4" parent="." instance=ExtResource("24_7b6p3")]
482452
position = Vector2(2031, -304)
483453

484-
[node name="StairSprite" type="Sprite2D" parent="."]
485-
position = Vector2(1568, 16)
486-
texture = ExtResource("18_gqwt1")
487-
488-
[node name="StairCollision" type="StaticBody2D" parent="."]
489-
490-
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="StairCollision"]
491-
polygon = PackedVector2Array(1536, 32, 1584, 0, 1633, 0, 1584, 32)
492-
493454
[node name="LightEmitter" parent="." instance=ExtResource("20_51f2t")]
494455
visible = false
495456
position = Vector2(1, -58)

Levels/Playable/Medium/8BigDrone/Floor1.tscn

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

3-
[ext_resource type="Script" path="res://Scripts/LevelScripts/LevelManager.gd" id="1_hjtrt"]
3+
[ext_resource type="Script" uid="uid://nduqecan1fld" path="res://Scripts/LevelScripts/LevelManager.gd" id="1_hjtrt"]
44
[ext_resource type="Texture2D" uid="uid://bu0stjydydrdj" path="res://Assets/Images/Tilesets/TileMap3DWall.png" id="2_jkpvj"]
55
[ext_resource type="Texture2D" uid="uid://47vvy211o436" path="res://Assets/Images/Objects/Props/PropDoorFaceForward.png" id="3_s3kju"]
66
[ext_resource type="TileSet" uid="uid://dtsvfundbj5" path="res://Objects/StaticObjects/Tileset.tres" id="4_wpm32"]
@@ -9,7 +9,7 @@
99
[ext_resource type="TileSet" uid="uid://cvy3v64tsv3k5" path="res://Objects/StaticObjects/Spikes.tres" id="7_dba0d"]
1010
[ext_resource type="PackedScene" uid="uid://dlchuo004ji5k" path="res://Objects/Player.tscn" id="7_lb12w"]
1111
[ext_resource type="Texture2D" uid="uid://bato62a53682m" path="res://Assets/Images/Tilesets/TileMap3DWallBlank.png" id="8_x137m"]
12-
[ext_resource type="Script" path="res://Scripts/FrameworkScripts/NextLevel.gd" id="9_ggust"]
12+
[ext_resource type="Script" uid="uid://dsxmj5jix14a2" path="res://Scripts/FrameworkScripts/NextLevel.gd" id="9_ggust"]
1313
[ext_resource type="PackedScene" uid="uid://bqy1gmd6wwrqx" path="res://Objects/StaticObjects/LargeDrone.tscn" id="10_osp52"]
1414
[ext_resource type="PackedScene" uid="uid://dy1jq84e4ww4" path="res://Objects/StaticObjects/Drone.tscn" id="11_sjoqh"]
1515
[ext_resource type="Texture2D" uid="uid://cwxh4s8o0yiko" path="res://Assets/Images/Objects/Props/PropBench.png" id="12_hrvsf"]
@@ -19,7 +19,7 @@
1919
[ext_resource type="PackedScene" uid="uid://cwm1lj78dxm6r" path="res://Objects/StaticObjects/ItemSwitcher.tscn" id="16_b2qe8"]
2020
[ext_resource type="PackedScene" uid="uid://bmu0h2ahup28b" path="res://Objects/StaticObjects/PreviousLevelArea.tscn" id="19_ukffx"]
2121
[ext_resource type="PackedScene" uid="uid://cwa3y585mpfea" path="res://Objects/StaticObjects/SecretAreaVoicelineLaptop.tscn" id="20_0drmv"]
22-
[ext_resource type="Script" path="res://Levels/Playable/Medium/27BossFight/TimerDisabler.gd" id="20_73ci2"]
22+
[ext_resource type="Script" uid="uid://g83tj0axoggb" path="res://Levels/Playable/Medium/27BossFight/TimerDisabler.gd" id="20_73ci2"]
2323
[ext_resource type="Texture2D" uid="uid://d2sayxj4530sd" path="res://Assets/Images/Objects/Props/PropDoorFaceForwardLocked.png" id="21_8fs24"]
2424
[ext_resource type="AudioStream" uid="uid://bjrj0rc2d5n3x" path="res://Assets/Audio/Voicelines/AlexHarveyRecording6.ogg" id="22_sjndb"]
2525
[ext_resource type="PackedScene" uid="uid://dvmdybceqknkh" path="res://Objects/StaticObjects/PressEAreaPopup.tscn" id="23_ymgl5"]
@@ -97,36 +97,20 @@ metadata/_better_terrain = {
9797
texture = ExtResource("5_3mykt")
9898
texture_region_size = Vector2i(32, 32)
9999
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
102100
0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
103101
0:1/0 = 0
104-
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
105-
0:1/0/physics_layer_0/angular_velocity = 0.0
106102
0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
107103
1:0/0 = 0
108-
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
109-
1:0/0/physics_layer_0/angular_velocity = 0.0
110104
1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
111105
2:0/0 = 0
112-
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
113-
2:0/0/physics_layer_0/angular_velocity = 0.0
114106
2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
115107
3:0/0 = 0
116-
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
117-
3:0/0/physics_layer_0/angular_velocity = 0.0
118108
3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
119109
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
122110
3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
123111
2:1/0 = 0
124-
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
125-
2:1/0/physics_layer_0/angular_velocity = 0.0
126112
2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
127113
1:1/0 = 0
128-
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
129-
1:1/0/physics_layer_0/angular_velocity = 0.0
130114
1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
131115

132116
[sub_resource type="TileSet" id="TileSet_k7pq2"]
@@ -271,6 +255,7 @@ position = Vector2(451, -80)
271255
item_switch_type = "RocketBoost"
272256

273257
[node name="CanvasModulate" type="CanvasModulate" parent="."]
258+
color = Color(0.7019608, 0.7019608, 0.7019608, 1)
274259

275260
[node name="PropDoorFaceForwardLocked" type="Sprite2D" parent="."]
276261
position = Vector2(1172, -31)

Objects/FrameworkNodes/SelectSlotMenu.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=12 format=3 uid="uid://demml7f8xyw1n"]
22

3-
[ext_resource type="Script" path="res://Scripts/FrameworkScripts/Menu.gd" id="1_egacv"]
3+
[ext_resource type="Script" uid="uid://bg6gjg1kn2jxy" path="res://Scripts/FrameworkScripts/Menu.gd" id="1_egacv"]
44
[ext_resource type="Theme" uid="uid://by6yqsmwuyf3i" path="res://Objects/UIThemes/Menu.tres" id="2_0kaei"]
55
[ext_resource type="FontFile" uid="uid://kq5pe5ver0ga" path="res://Assets/Fonts/KodeMono-VariableFont_wght.ttf" id="3_6rlta"]
66
[ext_resource type="FontFile" uid="uid://d8ujl3e7yh8r" path="res://Assets/Fonts/VT323-Regular.ttf" id="3_21k4g"]

Objects/StaticObjects/Stair.tscn

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

3-
[ext_resource type="Texture2D" uid="uid://e1ii3u7d8gku" path="res://Assets/Images/Objects/Props/StairSprite.png" id="1_eawra"]
3+
[ext_resource type="Texture2D" uid="uid://centqdm3rkc8p" path="res://Assets/Images/Objects/Props/StairSpriteNonTransparent.png" id="1_1tq6j"]
44

55
[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_a3hca"]
66
polygon = PackedVector2Array(16.1288, 23.8085, -47.8712, 23.8085, -47.8712, 15.8085, -31.8712, 15.8085, -31.8712, 7.80848, -15.8712, 7.80848, -15.8712, -0.191525, 0.128807, -0.191525, 0.128807, -8.19152, 16.1288, -8.19152)
@@ -9,7 +9,7 @@ polygon = PackedVector2Array(16.1288, 23.8085, -47.8712, 23.8085, -47.8712, 15.8
99

1010
[node name="StairSprite" type="Sprite2D" parent="."]
1111
position = Vector2(-32, 16)
12-
texture = ExtResource("1_eawra")
12+
texture = ExtResource("1_1tq6j")
1313

1414
[node name="LightOccluder2D" type="LightOccluder2D" parent="."]
1515
position = Vector2(-16.1288, 8.19152)
@@ -18,4 +18,5 @@ occluder = SubResource("OccluderPolygon2D_a3hca")
1818
[node name="StaticBody2D" type="StaticBody2D" parent="."]
1919

2020
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="StaticBody2D"]
21+
visible = false
2122
polygon = PackedVector2Array(0, 0, 0, 32, -64, 32)

0 commit comments

Comments
 (0)