sagi/platformer-game-test
sagi/platformer-game-test
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases Wiki Activity

tweaks

Browse source
This commit is contained in:
Sagi Dayan 2020-11-27 20:41:35 -05:00
parent 5925b02fe7
commit 5d4222b061
6 changed files with 70 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assets/Tiles/FakeSolidsTileMap.tscn
View file

@ -32,6 +32,5 @@ z_index = 1
tile_set = SubResource( 35 ) tile_set = SubResource( 35 )
cell_size = Vector2( 16, 16 ) cell_size = Vector2( 16, 16 )
collision_layer = 9 collision_layer = 9
collision_mask = 0 occluder_light_mask = 0
occluder_light_mask = 8
format = 1 format = 1

18
assets/Tiles/TrapTiles.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=2] [gd_scene load_steps=14 format=2]
[ext_resource path="res://assets/Tiles/spikes.png" type="Texture" id=1] [ext_resource path="res://assets/Tiles/spikes.png" type="Texture" id=1]
[ext_resource path="res://assets/Tiles/spikes_left.png" type="Texture" id=2] [ext_resource path="res://assets/Tiles/spikes_left.png" type="Texture" id=2]
@ -6,17 +6,26 @@
[ext_resource path="res://assets/Tiles/spikes_right.png" type="Texture" id=4] [ext_resource path="res://assets/Tiles/spikes_right.png" type="Texture" id=4]
[sub_resource type="OccluderPolygon2D" id=1] [sub_resource type="OccluderPolygon2D" id=1]
polygon = PoolVector2Array( 0, 13.9545, 0, 13.7219, 3.48895, 8.37286, 6.97746, 14.1871, 11.6288, 8.1403, 15.3499, 13.7219, 16, 14.1871, 16, 16, 0, 16 ) polygon = PoolVector2Array( 0, 13.9545, 0, 13.7219, 3.4588, 9.51524, 6.97746, 14.1871, 11.5341, 9.51524, 15.3499, 13.7219, 16, 14.1871, 16, 16, 0, 16 )
[sub_resource type="ConvexPolygonShape2D" id=2] [sub_resource type="ConvexPolygonShape2D" id=2]
points = PoolVector2Array( 16, 16, 0, 16, 2.1503, 7.92169, 13.4183, 7.92712 ) points = PoolVector2Array( 16, 16, 0, 16, 2.1503, 7.92169, 13.4183, 7.92712 )
[sub_resource type="OccluderPolygon2D" id=7]
polygon = PoolVector2Array( 0, 0, 0, 1.38512, 4.409, 5.5131, 8.50584, 1.21566, 12.3192, 5.58977, 16, 2.00076, 16, 0 )
[sub_resource type="ConvexPolygonShape2D" id=3] [sub_resource type="ConvexPolygonShape2D" id=3]
points = PoolVector2Array( 13.7554, 7.7776, 3.16282, 7.69971, 0, 0, 16, 0 ) points = PoolVector2Array( 13.7554, 7.7776, 3.16282, 7.69971, 0, 0, 16, 0 )
[sub_resource type="OccluderPolygon2D" id=8]
polygon = PoolVector2Array( 0.0473595, 0.0473595, 0.125248, 0.203133, 2.30607, 0, 5.49942, 3.39648, 1.13777, 7.44658, 5.42153, 11.3409, 1.44932, 16, 0, 16 )
[sub_resource type="ConvexPolygonShape2D" id=4] [sub_resource type="ConvexPolygonShape2D" id=4]
points = PoolVector2Array( 7.75813, 12.6593, 0, 16, 0, 0, 7.83601, 2.26145 ) points = PoolVector2Array( 7.75813, 12.6593, 0, 16, 0, 0, 7.83601, 2.26145 )
[sub_resource type="OccluderPolygon2D" id=9]
polygon = PoolVector2Array( 14.4564, 0.0473595, 10.3284, 4.25323, 14.5343, 8.22545, 10.6399, 12.1198, 13.5996, 16, 16, 16, 16, 0 )
[sub_resource type="ConvexPolygonShape2D" id=5] [sub_resource type="ConvexPolygonShape2D" id=5]
points = PoolVector2Array( 8.22545, 2.91456, 16, 0, 16, 16, 8.31891, 13.9433 ) points = PoolVector2Array( 8.22545, 2.91456, 16, 0, 16, 16, 8.31891, 13.9433 )
@ -50,6 +59,7 @@ points = PoolVector2Array( 8.22545, 2.91456, 16, 0, 16, 16, 8.31891, 13.9433 )
1/region = Rect2( 0, 0, 16, 16 ) 1/region = Rect2( 0, 0, 16, 16 )
1/tile_mode = 0 1/tile_mode = 0
1/occluder_offset = Vector2( 0, 0 ) 1/occluder_offset = Vector2( 0, 0 )
1/occluder = SubResource( 7 )
1/navigation_offset = Vector2( 0, 0 ) 1/navigation_offset = Vector2( 0, 0 )
1/shape_offset = Vector2( 0, 0 ) 1/shape_offset = Vector2( 0, 0 )
1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) 1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
@ -71,6 +81,7 @@ points = PoolVector2Array( 8.22545, 2.91456, 16, 0, 16, 16, 8.31891, 13.9433 )
2/region = Rect2( 0, 0, 16, 16 ) 2/region = Rect2( 0, 0, 16, 16 )
2/tile_mode = 0 2/tile_mode = 0
2/occluder_offset = Vector2( 0, 0 ) 2/occluder_offset = Vector2( 0, 0 )
2/occluder = SubResource( 8 )
2/navigation_offset = Vector2( 0, 0 ) 2/navigation_offset = Vector2( 0, 0 )
2/shape_offset = Vector2( 0, 0 ) 2/shape_offset = Vector2( 0, 0 )
2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) 2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
@ -92,6 +103,7 @@ points = PoolVector2Array( 8.22545, 2.91456, 16, 0, 16, 16, 8.31891, 13.9433 )
3/region = Rect2( 0, 0, 16, 16 ) 3/region = Rect2( 0, 0, 16, 16 )
3/tile_mode = 0 3/tile_mode = 0
3/occluder_offset = Vector2( 0, 0 ) 3/occluder_offset = Vector2( 0, 0 )
3/occluder = SubResource( 9 )
3/navigation_offset = Vector2( 0, 0 ) 3/navigation_offset = Vector2( 0, 0 )
3/shape_offset = Vector2( 0, 0 ) 3/shape_offset = Vector2( 0, 0 )
3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) 3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
@ -110,6 +122,6 @@ points = PoolVector2Array( 8.22545, 2.91456, 16, 0, 16, 16, 8.31891, 13.9433 )
[node name="TrapTiles" type="TileMap"] [node name="TrapTiles" type="TileMap"]
tile_set = SubResource( 6 ) tile_set = SubResource( 6 )
cell_size = Vector2( 16, 16 ) cell_size = Vector2( 16, 16 )
collision_layer = 4 collision_layer = 8
occluder_light_mask = 0 occluder_light_mask = 0
format = 1 format = 1

2
src/Actors/Player.tscn
View file

@ -700,7 +700,7 @@ position = Vector2( 1.90735e-06, -7 )
scale = Vector2( 3.83333, 3.83333 ) scale = Vector2( 3.83333, 3.83333 )
texture = ExtResource( 7 ) texture = ExtResource( 7 )
texture_scale = 3.07 texture_scale = 3.07
color = Color( 0.87451, 0.976471, 0.984314, 1 ) color = Color( 0.854902, 0.952941, 0.682353, 1 )
range_height = -2048.0 range_height = -2048.0
range_item_cull_mask = 7 range_item_cull_mask = 7
shadow_enabled = true shadow_enabled = true

56
src/GameWorld/Levels/Area1/Area11.tscn
View file

File diff suppressed because one or more lines are too long

2
src/GameWorld/Levels/PreGame.tscn
View file

@ -119,7 +119,7 @@ tracks/0/keys = {
[node name="PreGame" type="Node2D"] [node name="PreGame" type="Node2D"]
script = ExtResource( 1 ) script = ExtResource( 1 )
level_entry_point = Vector2( 25, 240 ) level_entry_point = Vector2( 25, 241 )
level_exit_point = Vector2( 700, 224 ) level_exit_point = Vector2( 700, 224 )
camer_limits = { camer_limits = {
"bottom": 260, "bottom": 260,

2
src/Hazards/Arrow.tscn
View file

@ -102,7 +102,7 @@ scale = Vector2( 1.84, 0.28 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
color = Color( 0.976471, 0.282353, 0.282353, 1 ) color = Color( 0.976471, 0.282353, 0.282353, 1 )
energy = 1.44 energy = 1.44
range_item_cull_mask = 1071 range_item_cull_mask = 31871
shadow_enabled = true shadow_enabled = true
[connection signal="body_entered" from="HitZone" to="." method="_on_HitZone_body_entered"] [connection signal="body_entered" from="HitZone" to="." method="_on_HitZone_body_entered"]
[connection signal="body_entered" from="PinZone" to="." method="_on_PinZone_body_entered"] [connection signal="body_entered" from="PinZone" to="." method="_on_PinZone_body_entered"]