From f8b5449a4d882fbad26b353a028d0cf555ffd773 Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Thu, 18 Nov 2021 19:38:14 +0200 Subject: [PATCH 1/5] [Medium] Small fixes to loading and tutorial --- .../trinity_site_level_tutorial.gd | 40 ++++++++++++++++--- .../ts_bot_handlers/ts_bot_handlergd.gd | 4 +- source/entities/ts_bot/ts_bot.tscn | 10 ++--- source/scenes/GAME/game_tutorial.tscn | 9 ++++- .../OVERLAY/elements/win_lose_screen.tscn | 25 +++++++++--- 5 files changed, 67 insertions(+), 21 deletions(-) diff --git a/source/assets/scripts/server_handlers/trinity_site_level_tutorial.gd b/source/assets/scripts/server_handlers/trinity_site_level_tutorial.gd index e0a3d2b..e6ff14e 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level_tutorial.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level_tutorial.gd @@ -6,20 +6,29 @@ var current_player_location_instance_number = null var globalActivePhase = null var timer = 0 +var begunTutorial = false var finishedMovementZone = false var finishedJumpZone = false var finishedAiming = false var botCount = 0 +var botsActivated = false +var finishedTutorial = false var ts_bot = preload("res://source/entities/ts_bot/ts_bot.tscn") func _ready() -> void: + $controls/user_input/controls/ready_button.hide() + $controls/user_input/controls/skip_button.hide() $controls/timer/phase.text = "Tutorial" # warning-ignore:return_value_discarded $controls.modulate[3] = 0 get_tree().connect("network_peer_disconnected", self, "_player_disconnected") if get_tree().is_network_server(): setup_player_positions() + $win_lose_screen.show() + $win_lose_screen/Panel/Label.text = "Tutorial" + $win_lose_screen/Panel/Label2.show() + $win_lose_screen/Panel/Label2.text = "Press ENTER to begin or ESC to skip" func setup_player_positions() -> void: for player in PersistentNodes.get_children(): @@ -40,6 +49,14 @@ func _player_disconnected(id) -> void: func _process(delta): timer += delta begin_tutorial() + if Input.is_action_pressed("esc") and not begunTutorial: + Network._server_leave() + get_tree().change_scene("res://source/scenes/GUI/main_menu.tscn") + if Input.is_action_pressed("enter") and not begunTutorial: + $win_lose_screen.modulate[3] = 0 + begunTutorial = true + if Input.is_action_pressed("enter") and finishedAiming: + finishedTutorial = true func begin_tutorial(): # Reset initial setup @@ -48,22 +65,29 @@ func begin_tutorial(): finishedMovementZone = false # Request to start tutorial. # Show a movement target to test ( A / D / SHIFT ) - if not finishedMovementZone: $simpleTargetZone_basic.show() + if not finishedMovementZone and begunTutorial: $simpleTargetZone_basic.show() else: $simpleTargetZone_basic.hide() if not finishedJumpZone and finishedMovementZone: $simpleTargetZone_jump.show() else: $simpleTargetZone_jump.hide() - if finishedJumpZone and finishedMovementZone and $controls.modulate[3] < 1: + if finishedJumpZone and finishedMovementZone and $controls.modulate[3] < 1 and not finishedAiming: $controls.modulate[3] += 0.1 $weaponInstruction.show() if botCount < 6: var bot = ts_bot.instance() add_child(bot) + connect("bot_died", bot, "bot_died") bot.global_position = $bot_spawn_locations.get_child(botCount).global_position botCount += 1 - # After target destroyed request permission to move on to menu. - # Remove player before moving on. !!!!!!!!!!! - - if finishedMovementZone and finishedJumpZone and finishedAiming and timer > 2: + botsActivated = true + if botsActivated and botCount == 0: + finishedAiming = true + if finishedAiming: + if $controls.modulate[3] > 0: $controls.modulate[3] -= 0.1 + $win_lose_screen/Panel/Label.text = "Complete" + $win_lose_screen/Panel/Label2.show() + $win_lose_screen/Panel/Label2.text = "Press ENTER to continue" + if $win_lose_screen.modulate[3] < 1: $win_lose_screen.modulate[3] += 0.1 + if finishedTutorial: Network._server_leave() get_tree().change_scene("res://source/scenes/GUI/main_menu.tscn") @@ -74,3 +98,7 @@ func _on_simpleTargetZone_jump_zone_entered(): func _on_simpleTargetZone_basic_zone_entered(): finishedMovementZone = true + + +func bot_died(): + if botsActivated: botCount -= 1 diff --git a/source/assets/scripts/ts_bot_handlers/ts_bot_handlergd.gd b/source/assets/scripts/ts_bot_handlers/ts_bot_handlergd.gd index f0a9e8a..a827979 100644 --- a/source/assets/scripts/ts_bot_handlers/ts_bot_handlergd.gd +++ b/source/assets/scripts/ts_bot_handlers/ts_bot_handlergd.gd @@ -7,8 +7,6 @@ var accelerationSpeed = 2 var deccelerationSpeed = 20 var maxSpeed = 250 -signal bot_died - var worldSpace2d = null var coreRay = {} @@ -112,4 +110,4 @@ func hit_by_damager(damage, b_rotation, b_velocity): Mode = 2 if hp <= 0: queue_free() - emit_signal("bot_died") + get_tree().call_group("bot_listener", "bot_died") diff --git a/source/entities/ts_bot/ts_bot.tscn b/source/entities/ts_bot/ts_bot.tscn index 8aff849..c6de023 100644 --- a/source/entities/ts_bot/ts_bot.tscn +++ b/source/entities/ts_bot/ts_bot.tscn @@ -17,16 +17,16 @@ height = 46.0 [sub_resource type="SpriteFrames" id=3] animations = [ { -"frames": [ ExtResource( 1 ) ], -"loop": true, -"name": "agressive_idle", -"speed": 5.0 -}, { "frames": [ ExtResource( 4 ) ], "loop": true, "name": "friendly_idle", "speed": 5.0 }, { +"frames": [ ExtResource( 1 ) ], +"loop": true, +"name": "agressive_idle", +"speed": 5.0 +}, { "frames": [ ExtResource( 3 ) ], "loop": true, "name": "passive_idle", diff --git a/source/scenes/GAME/game_tutorial.tscn b/source/scenes/GAME/game_tutorial.tscn index 667c2ee..4244875 100644 --- a/source/scenes/GAME/game_tutorial.tscn +++ b/source/scenes/GAME/game_tutorial.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://source/assets/scripts/server_handlers/trinity_site_level_tutorial.gd" type="Script" id=1] [ext_resource path="res://source/assets/scripts/ui_element_handlers/UI.gd" type="Script" id=2] @@ -6,11 +6,12 @@ [ext_resource path="res://source/levels/tutorial/elements/simpleTargetZone.tscn" type="PackedScene" id=4] [ext_resource path="res://source/assets/sprites/GUI/tutorial/trinity_site_level_layout_level_design_z_index_4.svg" type="Texture" id=5] [ext_resource path="res://source/fonts/oxygen/oxygen_bold.tres" type="DynamicFont" id=6] +[ext_resource path="res://source/scenes/OVERLAY/elements/win_lose_screen.tscn" type="PackedScene" id=7] [ext_resource path="res://source/scenes/OVERLAY/elements/user_input.tscn" type="PackedScene" id=15] [ext_resource path="res://source/scenes/OVERLAY/elements/timer.tscn" type="PackedScene" id=17] [ext_resource path="res://source/scenes/OVERLAY/elements/trajectory_control.tscn" type="PackedScene" id=18] -[node name="trinity-site-playground" type="Node2D"] +[node name="trinity-site-playground" type="Node2D" groups=["bot_listener"]] script = ExtResource( 1 ) [node name="simpleTargetZone_basic" parent="." instance=ExtResource( 4 )] @@ -114,6 +115,7 @@ margin_top = -150.0 margin_bottom = 0.0 [node name="timer" parent="controls" instance=ExtResource( 17 )] +visible = false anchor_left = 0.5 anchor_right = 0.5 margin_left = -225.0 @@ -156,5 +158,8 @@ position = Vector2( 1584, 600 ) [node name="6" type="Position2D" parent="bot_spawn_locations"] position = Vector2( 1762, 600 ) +[node name="win_lose_screen" parent="." instance=ExtResource( 7 )] +position = Vector2( 0, 350 ) + [connection signal="zone_entered" from="simpleTargetZone_basic" to="." method="_on_simpleTargetZone_basic_zone_entered"] [connection signal="zone_entered" from="simpleTargetZone_jump" to="." method="_on_simpleTargetZone_jump_zone_entered"] diff --git a/source/scenes/OVERLAY/elements/win_lose_screen.tscn b/source/scenes/OVERLAY/elements/win_lose_screen.tscn index dc38f74..9e432cd 100644 --- a/source/scenes/OVERLAY/elements/win_lose_screen.tscn +++ b/source/scenes/OVERLAY/elements/win_lose_screen.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://source/fonts/oxygen/Oxygen-Bold.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://source/fonts/oxygen/oxygen_bold.tres" type="DynamicFont" id=2] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0, 0, 0, 0.588235 ) @@ -23,13 +24,10 @@ __meta__ = { } [node name="Label" type="Label" parent="Panel"] -anchor_left = 0.5 anchor_top = 0.5 -anchor_right = 0.5 +anchor_right = 1.0 anchor_bottom = 0.5 -margin_left = -492.5 margin_top = -91.0 -margin_right = 492.5 margin_bottom = 91.0 custom_fonts/font = SubResource( 2 ) text = "null" @@ -39,3 +37,20 @@ uppercase = true __meta__ = { "_edit_use_anchors_": false } + +[node name="Label2" type="Label" parent="Panel"] +visible = false +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +margin_left = -1.99776 +margin_top = 105.0 +margin_right = -1.9978 +margin_bottom = 151.0 +custom_fonts/font = ExtResource( 2 ) +text = "NULL" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} From be089b29609412595ee6aa91d28d036a71d0b483 Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Thu, 18 Nov 2021 19:41:20 +0200 Subject: [PATCH 2/5] [Micro] Project settings fix --- project.godot | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/project.godot b/project.godot index 09ed93f..c8cfcdc 100644 --- a/project.godot +++ b/project.godot @@ -10,8 +10,9 @@ config_version=4 [application] -config/name="Game" -run/main_scene="res://source/scenes/GUI/main_menu.tscn" +config/name="FuncIt" +config/description="Modern, yet simplistic 2D platform-shooter developed as an entertaining game and an educational tool." +run/main_scene="res://source/scenes/GUI/game_loading_screen.tscn" config/icon="res://icon.png" [autoload] From 51c17f21a7fbd2155bead5238cf19a0edc5830f5 Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Thu, 18 Nov 2021 19:43:15 +0200 Subject: [PATCH 3/5] [Nano] Tutorial-skip-implementation --- .../scripts/loading_handlers/game_loading_screen_handler.gd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/assets/scripts/loading_handlers/game_loading_screen_handler.gd b/source/assets/scripts/loading_handlers/game_loading_screen_handler.gd index 8e07e74..08be2be 100644 --- a/source/assets/scripts/loading_handlers/game_loading_screen_handler.gd +++ b/source/assets/scripts/loading_handlers/game_loading_screen_handler.gd @@ -3,10 +3,12 @@ extends Node2D var time = 0 var first_transitioned = false var transitioned = false +var skipTutorial = true func _ready(): $FunCitGameLogoDarkTransparent.modulate[3] = 0 $Fb_Geo_Game.modulate[3] = 0 + if skipTutorial: get_tree().change_scene("res://source/scenes/GUI/main_menu.tscn") pass func _process(delta): From e5ffc4c41ca02d320168da85279e2d602adb1938 Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Thu, 18 Nov 2021 19:54:20 +0200 Subject: [PATCH 4/5] [Micro] Killed added --- .../player_handlers/player_body_handler.gd | 3 +- .../pre_processors/uin_pre_processor.gd | 15 ++- .../assets/scripts/server_handlers/global.gd | 1 + source/entities/player/player_node.tscn | 99 +++++++------------ 4 files changed, 54 insertions(+), 64 deletions(-) diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 21d3d7d..c2a6cbf 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -153,7 +153,7 @@ func process_rotation(): func _process(_delta: float) -> void: - user_input = UIN_preset_pre_processor_instance.update(Global.get_current_phase()) + user_input = UIN_preset_pre_processor_instance.update(Global.get_current_phase(), self) if get_tree().is_network_server(): Global.phase_update_global() clientPhase = Global.get_current_phase() @@ -292,6 +292,7 @@ func _physics_process(delta) -> void: if hp <= 0: if get_tree().is_network_server(): rpc("destroy") + Global.get("killed_players").append(self) diff --git a/source/assets/scripts/pre_processors/uin_pre_processor.gd b/source/assets/scripts/pre_processors/uin_pre_processor.gd index 6f2db51..41a078c 100644 --- a/source/assets/scripts/pre_processors/uin_pre_processor.gd +++ b/source/assets/scripts/pre_processors/uin_pre_processor.gd @@ -17,7 +17,7 @@ func _init() -> void: } pass -func update(clientPhase): +func update(clientPhase, player): inputState = { "right": Input.is_action_pressed("input_right"), "left": Input.is_action_pressed("input_left"), @@ -61,4 +61,17 @@ func update(clientPhase): "r_dec": false, "shoot": false } + if player in Global.get("killed_players"): + inputState = { + "right": false, + "left": false, + "up": false, + "down": false, + "debug": false, + "boost": false, + "enter": false, + "r_inc": false, + "r_dec": false, + "shoot": false + } return inputState diff --git a/source/assets/scripts/server_handlers/global.gd b/source/assets/scripts/server_handlers/global.gd index 5e9f7c7..6d78c49 100644 --- a/source/assets/scripts/server_handlers/global.gd +++ b/source/assets/scripts/server_handlers/global.gd @@ -8,6 +8,7 @@ var global var control var user_input var bot_weapon +var killed_players = [] var clientPhase = { "0": { diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index d797472..67df589 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -172,19 +172,19 @@ [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], "loop": true, -"name": "idle-speed-right-04", -"speed": 25.0 +"name": "move-speed-left-03", +"speed": 35.0 }, { "frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], "loop": true, "name": "move-speed-left-04", "speed": 35.0 }, { -"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], "loop": true, -"name": "move-speed-left-02", +"name": "move-speed-left-01", "speed": 35.0 }, { "frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], @@ -199,12 +199,17 @@ animations = [ { }, { "frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "loop": true, -"name": "move-speed-left-02", +"name": "move-speed-right-01", "speed": 35.0 }, { -"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], +"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], "loop": true, -"name": "move-speed-left-03", +"name": "boost-speed-left-04", +"speed": 55.0 +}, { +"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], +"loop": true, +"name": "move-speed-left-02", "speed": 35.0 }, { "frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], @@ -212,34 +217,14 @@ animations = [ { "name": "move-speed-right-02", "speed": 35.0 }, { -"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], -"loop": true, -"name": "boost-speed-right-02", -"speed": 55.0 -}, { -"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], -"loop": true, -"name": "idle-speed-left-01", -"speed": 25.0 -}, { "frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "loop": true, "name": "idle-speed-right-01", "speed": 25.0 }, { -"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], +"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], "loop": true, -"name": "boost-speed-right-02", -"speed": 55.0 -}, { -"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], -"loop": true, -"name": "move-speed-right-01", -"speed": 35.0 -}, { -"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], -"loop": true, -"name": "boost-speed-left-02", +"name": "boost-speed-left-01", "speed": 55.0 }, { "frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], @@ -247,54 +232,44 @@ animations = [ { "name": "boost-speed-left-03", "speed": 55.0 }, { +"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"loop": true, +"name": "boost-speed-left-02", +"speed": 55.0 +}, { "frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], "loop": true, -"name": "boost-speed-left-01", -"speed": 55.0 +"name": "idle-speed-left-01", +"speed": 25.0 }, { "frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], "loop": true, "name": "boost-speed-right-03", "speed": 55.0 }, { -"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], -"loop": true, -"name": "move-speed-left-01", -"speed": 35.0 -}, { "frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], "loop": true, "name": "idle-speed-left-04", "speed": 25.0 }, { -"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], -"loop": true, -"name": "idle-speed-right-03", -"speed": 25.0 -}, { -"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], -"loop": true, -"name": "boost-speed-left-02", -"speed": 55.0 -}, { "frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], "loop": true, "name": "move-speed-right-04", "speed": 35.0 }, { +"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], +"loop": true, +"name": "idle-speed-right-03", +"speed": 25.0 +}, { "frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], "loop": true, "name": "boost-speed-right-04", "speed": 55.0 }, { -"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], +"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], "loop": true, -"name": "idle-speed-left-03", -"speed": 25.0 -}, { -"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], -"loop": true, -"name": "boost-speed-left-04", +"name": "boost-speed-right-02", "speed": 55.0 }, { "frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], @@ -302,10 +277,10 @@ animations = [ { "name": "idle-speed-left-03", "speed": 25.0 }, { -"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], +"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], "loop": true, -"name": "move-speed-right-02", -"speed": 35.0 +"name": "idle-speed-right-04", +"speed": 25.0 } ] [sub_resource type="CircleShape2D" id=2] @@ -338,11 +313,6 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { -"frames": [ ExtResource( 169 ) ], -"loop": true, -"name": "04", -"speed": 5.0 -}, { "frames": [ ExtResource( 170 ) ], "loop": true, "name": "02", @@ -357,6 +327,11 @@ animations = [ { "loop": true, "name": "03", "speed": 5.0 +}, { +"frames": [ ExtResource( 169 ) ], +"loop": true, +"name": "04", +"speed": 5.0 } ] [node name="player" type="KinematicBody2D" groups=["Net", "Player"]] From fbda5ea0f546591b20eeb5edc6cfb6e8ec829cb9 Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Thu, 18 Nov 2021 20:01:14 +0200 Subject: [PATCH 5/5] [Partial-Completion] Tutorial, loading_screen, player-killed --- .../scripts/server_handlers/trinity_site_level_tutorial.gd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/assets/scripts/server_handlers/trinity_site_level_tutorial.gd b/source/assets/scripts/server_handlers/trinity_site_level_tutorial.gd index e6ff14e..e28649a 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level_tutorial.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level_tutorial.gd @@ -17,6 +17,8 @@ var finishedTutorial = false var ts_bot = preload("res://source/entities/ts_bot/ts_bot.tscn") func _ready() -> void: + for player in PersistentNodes.get_children(): + Global.get("killed_players").append(player) $controls/user_input/controls/ready_button.hide() $controls/user_input/controls/skip_button.hide() $controls/timer/phase.text = "Tutorial" @@ -55,6 +57,7 @@ func _process(delta): if Input.is_action_pressed("enter") and not begunTutorial: $win_lose_screen.modulate[3] = 0 begunTutorial = true + Global.get("killed_players").clear() if Input.is_action_pressed("enter") and finishedAiming: finishedTutorial = true @@ -81,6 +84,8 @@ func begin_tutorial(): botsActivated = true if botsActivated and botCount == 0: finishedAiming = true + for player in PersistentNodes.get_children(): + Global.get("killed_players").append(player) if finishedAiming: if $controls.modulate[3] > 0: $controls.modulate[3] -= 0.1 $win_lose_screen/Panel/Label.text = "Complete" @@ -88,6 +93,7 @@ func begin_tutorial(): $win_lose_screen/Panel/Label2.text = "Press ENTER to continue" if $win_lose_screen.modulate[3] < 1: $win_lose_screen.modulate[3] += 0.1 if finishedTutorial: + Global.get("killed_players").clear() Network._server_leave() get_tree().change_scene("res://source/scenes/GUI/main_menu.tscn")