team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

git fix: this time i changed the positioning of the respawn points in one of our vertical levels, echo mountain

Browse source
This commit is contained in:
penelope 2023-05-29 03:03:20 -04:00
parent 016a304303
commit 19638bb520
3 changed files with 23 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

70
maps/mountain.tscn
View file

@ -38,7 +38,7 @@ extents = Vector2( 32, 8 )
extents = Vector2( 36, 4 )
[sub_resource type="RectangleShape2D" id=8]
extents = Vector2( 28, 4 )
extents = Vector2( 24, 4 )
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 32, 4 )
@ -47,7 +47,7 @@ extents = Vector2( 32, 4 )
extents = Vector2( 48, 64 )
[sub_resource type="RectangleShape2D" id=6]
extents = Vector2( 20, 8 )
extents = Vector2( 16, 8 )
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 4, 294 )
@ -320,7 +320,7 @@ right_down_boundary = 3.0
[node name="Snake7" parent="Enemies" instance=ExtResource( 16 )]
position = Vector2( 208, -16 )
left_up_boundary = 3.0
left_up_boundary = 2.0
right_down_boundary = 5.0
speed = 80
@ -525,108 +525,78 @@ position = Vector2( 60, -320 )
[node name="Respawns" type="Node2D" parent="."]
[node name="RespawnPoint" parent="Respawns" instance=ExtResource( 25 )]
position = Vector2( 40, -32 )
__meta__ = {
"_edit_lock_": true
}
position = Vector2( 40, -16 )
match_v = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint"]
position = Vector2( 8, -4 )
position = Vector2( 8, -20 )
shape = SubResource( 2 )
__meta__ = {
"_edit_lock_": true
}
[node name="RespawnPoint2" parent="Respawns" instance=ExtResource( 25 )]
position = Vector2( 160, 16 )
position = Vector2( 157, 32 )
__meta__ = {
"_edit_group_": true,
"_edit_lock_": true
"_edit_group_": true
}
match_v = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint2"]
position = Vector2( 16, 0 )
shape = SubResource( 9 )
__meta__ = {
"_edit_lock_": true
}
[node name="RespawnPoint6" parent="Respawns" instance=ExtResource( 25 )]
position = Vector2( 48, 48 )
position = Vector2( 48, 56 )
__meta__ = {
"_edit_group_": true,
"_edit_lock_": true
"_edit_group_": true
}
match_v = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint6"]
position = Vector2( -12, -36 )
position = Vector2( -12, -44 )
shape = SubResource( 7 )
__meta__ = {
"_edit_lock_": true
}
[node name="RespawnPoint7" parent="Respawns" instance=ExtResource( 25 )]
position = Vector2( 112, 40 )
position = Vector2( 96, 24 )
__meta__ = {
"_edit_group_": true,
"_edit_lock_": true
"_edit_group_": true
}
match_v = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint7"]
position = Vector2( -4, 0 )
position = Vector2( 16, -4 )
shape = SubResource( 8 )
__meta__ = {
"_edit_lock_": true
}
[node name="RespawnPoint3" parent="Respawns" instance=ExtResource( 25 )]
position = Vector2( 16, -152 )
position = Vector2( 16, -144 )
__meta__ = {
"_edit_group_": true,
"_edit_lock_": true
"_edit_group_": true
}
match_v = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint3"]
position = Vector2( 24, -28 )
position = Vector2( 24, -36 )
shape = SubResource( 4 )
__meta__ = {
"_edit_lock_": true
}
[node name="RespawnPoint4" parent="Respawns" instance=ExtResource( 25 )]
position = Vector2( 184, -200 )
__meta__ = {
"_edit_group_": true,
"_edit_lock_": true
"_edit_group_": true
}
match_v = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint4"]
position = Vector2( 24, -64 )
shape = SubResource( 5 )
__meta__ = {
"_edit_lock_": true
}
[node name="RespawnPoint5" parent="Respawns" instance=ExtResource( 25 )]
position = Vector2( 172, -16 )
position = Vector2( 176, -8 )
__meta__ = {
"_edit_group_": true,
"_edit_lock_": true
"_edit_group_": true
}
match_v = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Respawns/RespawnPoint5"]
position = Vector2( -8, 0 )
position = Vector2( -16, -8 )
shape = SubResource( 6 )
__meta__ = {
"_edit_lock_": true
}
[node name="Boundaries" type="StaticBody2D" parent="."]

4
objects/player/player_scholar.tscn
View file

@ -762,7 +762,7 @@ collision_layer = 128
collision_mask = 7
moving_platform_apply_velocity_on_leave = 1
script = ExtResource( 1 )
walk_acceleration_frames = 8.0
walk_acceleration_frames = 4.0
gravity = 700.0
jump_force = 140.0
double_jump_force = 124.0
@ -1165,8 +1165,8 @@ script = ExtResource( 8 )
[connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"]
[connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"]
[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"]
[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"]
[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"]
[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"]
[connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"]
[connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"]
[connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"]

2
objects/respawn_point.gd
View file

@ -9,5 +9,5 @@ func _on_RespawnPoint_area_entered(area):
var player = area.get_parent()
Game.respawn_point = Vector2(
player.global_position.x if match_h else global_position.x,
player.global_position.y if match_v else global_position.y - 10
player.global_position.y if match_v else global_position.y
)