From ef1a207c69611b980f666c8a985b3cfedd17600f Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Tue, 2 Nov 2021 23:17:20 +0200 Subject: [PATCH] [Minimal] Trinity-Site level z-index adjustments --- Game/project.godot | 1 + .../player_handlers/player_body_handler.gd | 18 ++++++++++-------- .../scripts/ui_element_handlers/winner.gd | 6 +++--- .../trinity_site/trinity_site_level.tscn | 6 ++++++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/Game/project.godot b/Game/project.godot index b592607..3da92fd 100644 --- a/Game/project.godot +++ b/Game/project.godot @@ -27,6 +27,7 @@ window/size/height=1080 window/size/test_width=1024 window/size/test_height=600 window/stretch/mode="2d" +window/stretch/aspect="keep" [global] diff --git a/Game/source/assets/scripts/player_handlers/player_body_handler.gd b/Game/source/assets/scripts/player_handlers/player_body_handler.gd index f92da2d..893a423 100644 --- a/Game/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/Game/source/assets/scripts/player_handlers/player_body_handler.gd @@ -6,6 +6,7 @@ var player_bullet = load("res://source/entities/bullet/player_bullet.tscn") var username_text = load("res://source/scenes/OVERLAY/elements/username_text.tscn") var username setget username_set var username_text_instance = null +export var debug_mode = false var can_shoot = true var is_reloading = false @@ -141,7 +142,7 @@ func _process(delta: float) -> void: func _physics_process(delta) -> void: if get_tree().has_network_peer(): if is_network_master() and visible: - look_at(get_global_mouse_position()) + #look_at(get_global_mouse_position()) if "0" in VDIR: if VDIR["1"]["0"]["ray"]["length"] - dimensions["collider"]["radius"] > 2 and jumpState == false: gravityVector = (VDIR["1"]["0"]["ray"]["position"] - user_state["global_position"]).normalized() @@ -178,7 +179,7 @@ func _physics_process(delta) -> void: jumpSpeed = move_toward(jumpSpeed, maxJumpSpeed, accelerationSpeed * 10) else: jumpState = false - jumpSpeed = 100 + jumpSpeed = 300 if user_input["boost"] == true: maxMovementSpeed = move_toward(maxMovementSpeed,120,accelerationSpeed) else: @@ -200,12 +201,13 @@ func _physics_process(delta) -> void: move_and_slide(puppet_velocity * movementSpeed) func _draw(): - for vector_type in VDIR: - var v_t = str(vector_type) - for vector in VDIR[v_t]: - var v = str(vector) - if v_t == "1": - draw_line(VDIR[v_t][v]["start"] - user_state["global_position"],(VDIR[v_t][v]["ray"]["position"] - user_state["global_position"]).rotated(-rotation),Color(255,255,255,1),1) + if debug_mode == true: + for vector_type in VDIR: + var v_t = str(vector_type) + for vector in VDIR[v_t]: + var v = str(vector) + if v_t == "1": + draw_line(VDIR[v_t][v]["start"] - user_state["global_position"],(VDIR[v_t][v]["ray"]["position"] - user_state["global_position"]).rotated(-rotation),Color(255,255,255,1),1) func lerp_angle(from, to, weight): diff --git a/Game/source/assets/scripts/ui_element_handlers/winner.gd b/Game/source/assets/scripts/ui_element_handlers/winner.gd index 8470d75..ddf9da1 100644 --- a/Game/source/assets/scripts/ui_element_handlers/winner.gd +++ b/Game/source/assets/scripts/ui_element_handlers/winner.gd @@ -4,6 +4,6 @@ sync func return_to_lobby(): get_tree().change_scene("res://source/scenes/GUI/main_menu.tscn") -func _on_win_timer_timeout(): - if get_tree().is_network_server(): - rpc("return_to_lobby") +#func _on_win_timer_timeout(): +# if get_tree().is_network_server(): +# rpc("return_to_lobby") diff --git a/Game/source/levels/trinity_site/trinity_site_level.tscn b/Game/source/levels/trinity_site/trinity_site_level.tscn index ff87141..44c3444 100644 --- a/Game/source/levels/trinity_site/trinity_site_level.tscn +++ b/Game/source/levels/trinity_site/trinity_site_level.tscn @@ -25,12 +25,14 @@ script = ExtResource( 1 ) [node name="trinity_site_level_layout-level_design_z-index_-2-version_ct_f_hd_3840_2160" type="Sprite" parent="trinity_site_body"] position = Vector2( 960, 540 ) scale = Vector2( 0.5, 0.5 ) +z_index = -1 texture = ExtResource( 7 ) [node name="trinity_site_level_layout-level_design_z-index_-1-version_ct_f_hd_3840_2160" type="Sprite" parent="trinity_site_body/trinity_site_level_layout-level_design_z-index_-2-version_ct_f_hd_3840_2160"] texture = ExtResource( 8 ) [node name="trinity_site_level_layout-level_design_z-index_0-version_ct_f_hd_3840_2160" type="Sprite" parent="trinity_site_body/trinity_site_level_layout-level_design_z-index_-2-version_ct_f_hd_3840_2160/trinity_site_level_layout-level_design_z-index_-1-version_ct_f_hd_3840_2160"] +z_index = 2 texture = ExtResource( 3 ) [node name="trinity_site_outer_collider" type="CollisionPolygon2D" parent="trinity_site_body"] @@ -43,15 +45,19 @@ polygon = PoolVector2Array( 761.5, 423.238, 765.865, 418.476, 769.04, 403.395, 7 [node name="1" type="Position2D" parent="spawn_locations"] position = Vector2( 460, 540 ) +z_index = 1 [node name="2" type="Position2D" parent="spawn_locations"] position = Vector2( 260, 540 ) +z_index = 1 [node name="3" type="Position2D" parent="spawn_locations"] position = Vector2( 1460, 540 ) +z_index = 1 [node name="4" type="Position2D" parent="spawn_locations"] position = Vector2( 1640, 540 ) +z_index = 1 [node name="UI" type="CanvasLayer" parent="."] script = ExtResource( 2 )