From 1c500ef828222e40abe964945b8d915447f9a351 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Thu, 11 Nov 2021 18:29:14 +0200 Subject: [PATCH] commit --- project.godot | 4 --- .../player_handlers/player_body_handler.gd | 5 ++-- .../assets/scripts/server_handlers/global.gd | 8 +++++ .../server_handlers/trinity_site_level.gd | 11 ++++++- source/entities/player/player_node.tscn | 30 +++++++++---------- .../trinity_site/trinity_site_level.tscn | 18 ++++++++++- 6 files changed, 53 insertions(+), 23 deletions(-) diff --git a/project.godot b/project.godot index 0544c5c..64ea969 100644 --- a/project.godot +++ b/project.godot @@ -20,10 +20,6 @@ Network="*res://source/assets/scripts/server_handlers/network_processors/network Global="*res://source/assets/scripts/server_handlers/global.gd" PersistentNodes="*res://source/scenes/OVERLAY/elements/persistent_nodes.tscn" -[debug] - -settings/stdout/print_fps=true - [display] window/size/width=1920 diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 8fad253..9f26d95 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -6,7 +6,6 @@ var trajectory:String = 'line' var trajectory_line = 'line' var bullet -var player_bullet = load("res://source/entities/shooting/Line_Trajectory/Line_Bullet.tscn") var username_text = load("res://source/scenes/OVERLAY/elements/username_text.tscn") var username setget username_set var username_text_instance = null @@ -85,6 +84,7 @@ var particleTexture = ImageTexture.new() var particleImage = Image.new() func _ready(): + weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na3".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na3".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na3".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na3".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) $"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset @@ -142,6 +142,8 @@ func process_rotation(): func _process(delta: float) -> void: +# print(OS.get_time()) + print(Global.time_output()) $"weaponHolder/Player-character-theme-gun".play(theme) particleImage.load("res://source/assets/sprites/character/player/theme/" + theme + "/na/Player-character-theme-particle-"+theme+".png") particleTexture.create_from_image(particleImage) @@ -256,7 +258,6 @@ func _physics_process(delta) -> void: else: rotation = lerp_angle(rotation, puppet_rotation, delta * 8) - #rotation = puppet_rotation $"weaponHolder/Player-character-theme-gun".position = puppet_weapon_position weaponAngle = puppet_weapon_angle direction = puppet_direction diff --git a/source/assets/scripts/server_handlers/global.gd b/source/assets/scripts/server_handlers/global.gd index 9a35339..a6fd8cf 100644 --- a/source/assets/scripts/server_handlers/global.gd +++ b/source/assets/scripts/server_handlers/global.gd @@ -15,3 +15,11 @@ func instance_node(node: Object, parent: Object) -> Object: var node_instance = node.instance() parent.add_child(node_instance) return node_instance + +var time + +func time_input(d): + time = d + +func time_output(): + return time diff --git a/source/assets/scripts/server_handlers/trinity_site_level.gd b/source/assets/scripts/server_handlers/trinity_site_level.gd index e9e25a1..00ac16f 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level.gd @@ -2,7 +2,7 @@ extends Node2D var current_spawn_location_instance_number = 1 var current_player_location_instance_number = null - +var time = 20 func _ready() -> void: get_tree().connect("network_peer_disconnected", self, "_player_disconnected") @@ -24,3 +24,12 @@ func _player_disconnected(id) -> void: if PersistentNodes.has_node(str(id)): PersistentNodes.get_node(str(id)).username_text_instance.queue_free() PersistentNodes.get_node(str(id)).queue_free() + + +func _on_timer_timeout(): + time -= 1 + + +func _process(delta): + Global.time_input(time) + $timer.text = str(time) diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 8a06688..0448643 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -173,6 +173,16 @@ [sub_resource type="SpriteFrames" id=2] animations = [ { +"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": "move-speed-left-03", +"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": 50.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": "boost-speed-right-01", @@ -267,16 +277,6 @@ animations = [ { "loop": true, "name": "move-speed-right-04", "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 ) ], -"loop": true, -"name": "move-speed-left-03", -"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": 50.0 } ] [sub_resource type="RectangleShape2D" id=3] @@ -307,11 +307,6 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { -"frames": [ ExtResource( 170 ) ], -"loop": true, -"name": "03", -"speed": 5.0 -}, { "frames": [ ExtResource( 169 ) ], "loop": true, "name": "04", @@ -326,6 +321,11 @@ animations = [ { "loop": true, "name": "02", "speed": 5.0 +}, { +"frames": [ ExtResource( 170 ) ], +"loop": true, +"name": "03", +"speed": 5.0 } ] [node name="player" type="KinematicBody2D" groups=[ diff --git a/source/levels/trinity_site/trinity_site_level.tscn b/source/levels/trinity_site/trinity_site_level.tscn index 1867346..9e5c5b5 100644 --- a/source/levels/trinity_site/trinity_site_level.tscn +++ b/source/levels/trinity_site/trinity_site_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://source/assets/scripts/server_handlers/trinity_site_level.gd" type="Script" id=1] [ext_resource path="res://source/assets/scripts/ui_element_handlers/UI.gd" type="Script" id=2] @@ -9,6 +9,7 @@ [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout-level_design_z-index_-2-version_ct_f_hd_3840_2160 – 01.png" type="Texture" id=7] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout-level_design_z-index_-1-version_ct_f_hd_3840_2160.png" type="Texture" id=8] [ext_resource path="res://source/entities/grass/grass_node.tscn" type="PackedScene" id=9] +[ext_resource path="res://source/fonts/oxygen/oxygen_bold.tres" type="DynamicFont" id=10] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout-level_design_z-index_-2-version_ct_f_hd_3840_2160 – 02.png" type="Texture" id=44] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout-level_design_z-index_-2-version_ct_f_hd_3840_2160 – 025.png" type="Texture" id=45] [ext_resource path="res://source/assets/scripts/trinity_site_body_handler.gd" type="Script" id=46] @@ -159,4 +160,19 @@ __meta__ = { [node name="win_timer" type="Timer" parent="game_UI/Control/winner"] wait_time = 4.0 +[node name="timer" type="Label" parent="."] +margin_right = 347.0 +margin_bottom = 164.0 +custom_fonts/font = ExtResource( 10 ) +text = "null" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="timer" type="Timer" parent="timer"] +autostart = true + [connection signal="timeout" from="game_UI/Control/winner/win_timer" to="game_UI/Control/winner" method="_on_win_timer_timeout"] +[connection signal="timeout" from="timer/timer" to="." method="_on_timer_timeout"]