From 0e5a47b83a49bf0c2718851ed457fd051c3452ee Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Mon, 15 Nov 2021 00:54:58 +0200 Subject: [PATCH 1/8] Revert "Revert "pushed"" This reverts commit 263490eb418d45297bb56fd31450496c7daefd4c. --- .../shooting/Hyperbola/Hyperbolic_Barrel.gd | 35 ++++++++++++++----- .../scripts/shooting/Line/Line_Barrel.gd | 18 ++++++++-- .../shooting/Parabola/Parabolic_Barrel.gd | 32 +++++++++++++---- .../scripts/shooting/Sine/Sine_Barrel.gd | 16 +++++++-- source/scenes/GUI/main_menu.tscn | 6 ++-- 5 files changed, 82 insertions(+), 25 deletions(-) diff --git a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd index 4ee2205..3e27b8d 100644 --- a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd +++ b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd @@ -15,23 +15,40 @@ func _ready(): pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position -func _draw(): - update() - if pos.x > 0: - if dot_position.x < 1000: +#func _draw(): +# update() +# if pos.x > 0: +# if dot_position.x < 1000: +# velocity.x = 10 +# velocity.y = a_parameter/(time*b_parameter) +# dot_position += velocity * speed_hyper * 0.06944 +# draw_circle(dot_position, 2, Color(225, 225, 225)) +# time += 0.06944 +# if pos.x < 0: +# if dot_position.x < 1000: +# velocity.x = 10 +# velocity.y = -a_parameter/(time*b_parameter) +# dot_position += velocity * speed_hyper * 0.06944 +# draw_circle(dot_position, 2, Color(225, 225, 225)) +# time += 0.06944 + + +func trajectory(): + clear_points() + while dot_position.x < 1000: + if pos.x > 0: + add_point(dot_position) velocity.x = 10 velocity.y = a_parameter/(time*b_parameter) dot_position += velocity * speed_hyper * 0.06944 - draw_circle(dot_position, 2, Color(225, 225, 225)) time += 0.06944 - if pos.x < 0: - if dot_position.x < 1000: + if pos.x < 0: + add_point(dot_position) velocity.x = 10 velocity.y = -a_parameter/(time*b_parameter) dot_position += velocity * speed_hyper * 0.06944 - draw_circle(dot_position, 2, Color(225, 225, 225)) time += 0.06944 - func _process(_delta): + trajectory() update() diff --git a/source/assets/scripts/shooting/Line/Line_Barrel.gd b/source/assets/scripts/shooting/Line/Line_Barrel.gd index 35f9e74..fa78907 100644 --- a/source/assets/scripts/shooting/Line/Line_Barrel.gd +++ b/source/assets/scripts/shooting/Line/Line_Barrel.gd @@ -8,14 +8,26 @@ var time = 0 var a_parameter = 0 -func _draw(): - if dot_position.x < 1000: +#func _draw(): +# if dot_position.x < 1000: +# velocity.y = 10 * a_parameter +# velocity.x = 10 +# dot_position += velocity * speed * 0.06944 +# draw_circle(dot_position, 2, Color(225, 225, 225)) +# time += 0.06944 + + +func trajectory(): + clear_points() + while dot_position.x < 1000: + add_point(dot_position) velocity.y = 10 * a_parameter velocity.x = 10 dot_position += velocity * speed * 0.06944 - draw_circle(dot_position, 2, Color(225, 225, 225)) time += 0.06944 + pass func _process(_delta): + trajectory() update() diff --git a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd index 8097f78..c18708b 100644 --- a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd +++ b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd @@ -12,23 +12,41 @@ var pos func _ready(): pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position -func _draw(): - if pos.x > 0: - if dot_position.x < 1000: +#func _draw(): +# if pos.x > 0: +# if dot_position.x < 1000: +# velocity.y = time*(a_parameter * time + b_parameter) +# velocity.x = 5 +# dot_position += velocity * speed_parab * 0.06944 +# draw_circle(dot_position, 2, Color(225, 225, 225)) +# time += 0.06944 +# if pos.x < 0: +# if dot_position.x < 1000: +# velocity.y = -time*(a_parameter * time + b_parameter) +# velocity.x = 5 +# dot_position += velocity * speed_parab * 0.06944 +# draw_circle(dot_position, 2, Color(225, 225, 225)) +# time += 0.06944 +# + +func trajectory(): + clear_points() + while dot_position.x < 1000: + if pos.x > 0: + add_point(dot_position) velocity.y = time*(a_parameter * time + b_parameter) velocity.x = 5 dot_position += velocity * speed_parab * 0.06944 - draw_circle(dot_position, 2, Color(225, 225, 225)) time += 0.06944 - if pos.x < 0: - if dot_position.x < 1000: + if pos.x < 0: + add_point(dot_position) velocity.y = -time*(a_parameter * time + b_parameter) velocity.x = 5 dot_position += velocity * speed_parab * 0.06944 - draw_circle(dot_position, 2, Color(225, 225, 225)) time += 0.06944 func _process(_delta): + trajectory() update() diff --git a/source/assets/scripts/shooting/Sine/Sine_Barrel.gd b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd index f093b70..ecf104a 100644 --- a/source/assets/scripts/shooting/Sine/Sine_Barrel.gd +++ b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd @@ -10,13 +10,23 @@ export var amplitude = 4 export var frequency = 5 -func _draw(): - if dot_position.x < 1000: +#func _draw(): +# if dot_position.x < 1000: +# velocity.y = amplitude * cos(time * frequency) +# velocity.x = 5 +# dot_position += velocity * speed * 0.06944 +# draw_circle(dot_position, 2, Color(225, 225, 225)) +# time += 0.06944 + +func trajectory(): + clear_points() + while dot_position.x < 1000: + add_point(dot_position) velocity.y = amplitude * cos(time * frequency) velocity.x = 5 dot_position += velocity * speed * 0.06944 - draw_circle(dot_position, 2, Color(225, 225, 225)) time += 0.06944 func _process(_delta): + trajectory() update() diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index 308c53f..c298a45 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -54,8 +54,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "PLAY" align = 1 valign = 1 @@ -79,8 +79,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "LAN Party" align = 1 valign = 1 @@ -111,8 +111,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "EXIT" align = 1 valign = 1 From cb1fd92c7c131011cbff18a482b9604da7060f38 Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Mon, 15 Nov 2021 02:01:02 +0200 Subject: [PATCH 2/8] check --- .../player_handlers/player_body_handler.gd | 29 +++- .../assets/scripts/server_handlers/global.gd | 1 + .../shooting/Parabola/Parabolic_Barrel.gd | 1 - source/entities/player/player_node.tscn | 132 +++++++++--------- .../shooting/Line_Trajectory/Line_Bullet.tscn | 8 +- .../trinity_site/trinity_site_level.tscn | 2 +- .../OVERLAY/elements/Trajectory_Control.gd | 30 ++++ .../OVERLAY/elements/trajectory_control.tscn | 26 +++- .../scenes/OVERLAY/elements/user_input.tscn | 8 +- 9 files changed, 146 insertions(+), 91 deletions(-) create mode 100644 source/scenes/OVERLAY/elements/Trajectory_Control.gd diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index cdfebf6..3d40a2b 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -153,6 +153,16 @@ func process_rotation(): func _process(_delta: float) -> void: + print(Global.get('control')) +# if Global.get('control')._on_line_pressed(): +# enable_trajectory('line') +# if Global.get('control')._on_sine_pressed(): +# enable_trajectory('sine') +# if Global.get('control')._on_parab_pressed(): +# enable_trajectory('parab') +# if Global.get('control')._on_hyper_pressed(): +# enable_trajectory('hyper') + user_input = UIN_preset_pre_processor_instance.update(Global.get_current_phase()) if get_tree().is_network_server(): Global.phase_update_global() @@ -163,8 +173,8 @@ func _process(_delta: float) -> void: clientPhase = puppet_phase Global.set_current_phase(clientPhase) $"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) + #particleImage.load("res://source/assets/sprites/character/player/theme/" + theme + "/na/Player-character-theme-particle-"+theme+".png") + #particleTexture.create_from_image(particleImage) $Particles2D.texture = particleTexture if username_text_instance != null: username_text_instance.name = "username" + name @@ -267,7 +277,7 @@ func _physics_process(delta) -> void: move_and_slide(velocityVDIR.rotated(rotationalHolder)) rotate_weapon() choose_trajectory() - enable_trajectory_line(trajectory_line) + #enable_trajectory_line(trajectory_line) if user_input["shoot"] and can_shoot and not is_reloading: rpc("shoot", trajectory) is_reloading = true @@ -296,10 +306,6 @@ func _physics_process(delta) -> void: func choose_trajectory(): - Global.get('line_button') - Global.get('sine_button') - Global.get('parab_button') - Global.get('hyper_button') if Input.is_action_just_pressed("line"): trajectory = 'line' @@ -324,9 +330,18 @@ sync func shoot(new_trajectory:String): func enable_trajectory_line(new_trajectory_line:String): var x = bullet_trajectory[new_trajectory_line].instance() + print(x) get_parent().add_child(x) x.global_position = shoot_point.global_position x.global_rotation = shoot_point.global_rotation + +func enable_trajectory(new_trajectory_line:String): + for gun in get_children(): #if there is gun remove it + gun.queue_free() + + var gun = bullet_trajectory[new_trajectory_line].instance() + add_child(gun) + pass func _draw(): diff --git a/source/assets/scripts/server_handlers/global.gd b/source/assets/scripts/server_handlers/global.gd index f5ba27e..ecb476d 100644 --- a/source/assets/scripts/server_handlers/global.gd +++ b/source/assets/scripts/server_handlers/global.gd @@ -9,6 +9,7 @@ var sine_button var parab_button var hyper_button var global +var control = false var clientPhase = { "0": { diff --git a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd index c18708b..b741d04 100644 --- a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd +++ b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd @@ -30,7 +30,6 @@ func _ready(): # func trajectory(): - clear_points() while dot_position.x < 1000: if pos.x > 0: add_point(dot_position) diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 276739b..eddab1a 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -173,29 +173,14 @@ [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 ) ], +"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": "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( 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": "boost-speed-left-03", +"name": "boost-speed-right-03", "speed": 50.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( 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-left-02", -"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", +"name": "idle-speed-right-04", "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 ) ], @@ -203,56 +188,11 @@ animations = [ { "name": "boost-speed-left-04", "speed": 50.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( 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( 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": 50.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": 50.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": "move-speed-right-02", -"speed": 35.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( 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": "idle-speed-right-04", -"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-02", -"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": 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", -"speed": 50.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", @@ -263,10 +203,70 @@ animations = [ { "name": "move-speed-right-03", "speed": 35.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( 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( 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", +"speed": 50.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( 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-02", +"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": "move-speed-left-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": "boost-speed-left-03", +"speed": 50.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": "move-speed-right-02", +"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( 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": 50.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": "move-speed-left-02", +"speed": 35.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( 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 } ] [sub_resource type="RectangleShape2D" id=3] @@ -299,12 +299,12 @@ radius = 41.5403 animations = [ { "frames": [ ExtResource( 170 ) ], "loop": true, -"name": "02", +"name": "03", "speed": 5.0 }, { "frames": [ ExtResource( 170 ) ], "loop": true, -"name": "03", +"name": "02", "speed": 5.0 }, { "frames": [ ExtResource( 27 ) ], diff --git a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn index 9675fcd..76383e2 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn @@ -7,15 +7,11 @@ radius = 9.85811 height = 35.0082 -[node name="player_character_bullet" type="Sprite" groups=[ -"Net", -]] +[node name="player_character_bullet" type="Sprite" groups=["Net"]] texture = ExtResource( 1 ) script = ExtResource( 2 ) -[node name="hitbox" type="Area2D" parent="." groups=[ -"Player_damager", -]] +[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]] [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] position = Vector2( 10.8253, -0.381073 ) diff --git a/source/levels/trinity_site/trinity_site_level.tscn b/source/levels/trinity_site/trinity_site_level.tscn index 48df8da..a7e97ec 100644 --- a/source/levels/trinity_site/trinity_site_level.tscn +++ b/source/levels/trinity_site/trinity_site_level.tscn @@ -160,10 +160,10 @@ margin_left = 2.37842 margin_top = -35.5 margin_right = 2.37842 margin_bottom = 106.5 -custom_fonts/font = SubResource( 1 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) custom_constants/shadow_offset_x = 6 custom_constants/shadow_offset_y = 6 +custom_fonts/font = SubResource( 1 ) text = "You are the winner" align = 1 valign = 1 diff --git a/source/scenes/OVERLAY/elements/Trajectory_Control.gd b/source/scenes/OVERLAY/elements/Trajectory_Control.gd new file mode 100644 index 0000000..e885de6 --- /dev/null +++ b/source/scenes/OVERLAY/elements/Trajectory_Control.gd @@ -0,0 +1,30 @@ +extends Control + +var on_line_pressed = false +var on_sine_pressed = false +var on_parab_pressed = false +var on_hyper_pressed = false + +func _ready(): + Global.set('control', self) + + + +func _on_line_pressed(): + Global.get('player').enable_trajectory_line('line') + pass # Replace with function body. + + +func _on_parabol_pressed(): + on_parab_pressed = true + pass # Replace with function body. + + +func _on_hyperbol_pressed(): + on_hyper_pressed = true + pass # Replace with function body. + + +func _on_sine_pressed(): + on_sine_pressed = true + pass # Replace with function body. diff --git a/source/scenes/OVERLAY/elements/trajectory_control.tscn b/source/scenes/OVERLAY/elements/trajectory_control.tscn index ba01923..364c5c1 100644 --- a/source/scenes/OVERLAY/elements/trajectory_control.tscn +++ b/source/scenes/OVERLAY/elements/trajectory_control.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/background.svg" type="Texture" id=1] [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/line_inactive.svg" type="Texture" id=2] @@ -10,6 +10,7 @@ [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/hyperbol_inactive.svg" type="Texture" id=8] [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg" type="Texture" id=9] [ext_resource path="res://source/fonts/oxygen/Oxygen-Regular.ttf" type="DynamicFontData" id=10] +[ext_resource path="res://source/scenes/OVERLAY/elements/Trajectory_Control.gd" type="Script" id=11] [sub_resource type="StyleBoxTexture" id=1] texture = ExtResource( 1 ) @@ -61,8 +62,8 @@ margin_left = 128.0 margin_top = 24.0 margin_right = 253.0 margin_bottom = 35.0 -custom_fonts/font = SubResource( 3 ) custom_colors/font_color = Color( 0.113725, 0.203922, 0.552941, 1 ) +custom_fonts/font = SubResource( 3 ) text = "Government issued - v/613.92.1" align = 1 valign = 1 @@ -98,8 +99,8 @@ anchor_bottom = 1.0 margin_left = 11.0 margin_top = -18.0 margin_right = -11.0 -custom_fonts/font = SubResource( 4 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 4 ) text = "line" align = 1 valign = 1 @@ -132,8 +133,8 @@ anchor_bottom = 1.0 margin_left = 11.0 margin_top = -18.0 margin_right = -11.0 -custom_fonts/font = SubResource( 4 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 4 ) text = "parabol" align = 1 valign = 1 @@ -167,8 +168,8 @@ anchor_bottom = 1.0 margin_left = 11.0 margin_top = -18.0 margin_right = -11.0 -custom_fonts/font = SubResource( 4 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 4 ) text = "hyperbol" align = 1 valign = 1 @@ -202,8 +203,8 @@ margin_left = 11.0 margin_top = -18.0 margin_right = -11.0 margin_bottom = 1.0 -custom_fonts/font = SubResource( 4 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 4 ) text = "sin" align = 1 valign = 1 @@ -212,3 +213,16 @@ __meta__ = { "_edit_lock_": true, "_edit_use_anchors_": false } + +[node name="Control" type="Control" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +script = ExtResource( 11 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[connection signal="pressed" from="line" to="Control" method="_on_line_pressed"] +[connection signal="pressed" from="parabol" to="Control" method="_on_parabol_pressed"] +[connection signal="pressed" from="hyperbol" to="Control" method="_on_hyperbol_pressed"] +[connection signal="pressed" from="sine" to="Control" method="_on_sine_pressed"] diff --git a/source/scenes/OVERLAY/elements/user_input.tscn b/source/scenes/OVERLAY/elements/user_input.tscn index 5acf2ef..f97aba3 100644 --- a/source/scenes/OVERLAY/elements/user_input.tscn +++ b/source/scenes/OVERLAY/elements/user_input.tscn @@ -112,8 +112,8 @@ anchor_bottom = 1.0 margin_left = -39.0 margin_top = -19.0 margin_right = 39.0 -custom_fonts/font = SubResource( 3 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 3 ) text = "line" align = 1 valign = 1 @@ -147,8 +147,8 @@ anchor_bottom = 1.0 margin_left = -39.0 margin_top = -19.0 margin_right = 39.0 -custom_fonts/font = SubResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 5 ) text = "parabol" align = 1 valign = 1 @@ -182,8 +182,8 @@ anchor_bottom = 1.0 margin_left = -39.0 margin_top = -19.0 margin_right = 39.0 -custom_fonts/font = SubResource( 7 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 7 ) text = "hyperbol" align = 1 valign = 1 @@ -217,8 +217,8 @@ anchor_bottom = 1.0 margin_left = -39.0 margin_top = -19.0 margin_right = 39.0 -custom_fonts/font = SubResource( 7 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 7 ) text = "sin" align = 1 valign = 1 From 0706f7397016e2a22ba89a478e2b994b0e4f3762 Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Mon, 15 Nov 2021 12:25:46 +0200 Subject: [PATCH 3/8] lilbit of progress (only instancin a single line with bullet --- .../scripts/player_handlers/player_body_handler.gd | 12 ++++++++++-- source/assets/scripts/server_handlers/global.gd | 2 +- .../scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd | 2 +- source/assets/scripts/shooting/Line/Line_Barrel.gd | 1 - 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 3d40a2b..6e666d0 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: - print(Global.get('control')) + #print(Global.get('control')) # if Global.get('control')._on_line_pressed(): # enable_trajectory('line') # if Global.get('control')._on_sine_pressed(): @@ -329,11 +329,19 @@ sync func shoot(new_trajectory:String): func enable_trajectory_line(new_trajectory_line:String): +# var x = bullet_trajectory[new_trajectory_line].instance() +# #print(x) +# get_parent().add_child(x) +# x.global_position = shoot_point.global_position +# x.global_rotation = shoot_point.global_rotation + #for x in get_children(): #if there is gun remove it + #x.queue_free() + var x = bullet_trajectory[new_trajectory_line].instance() - print(x) get_parent().add_child(x) x.global_position = shoot_point.global_position x.global_rotation = shoot_point.global_rotation + func enable_trajectory(new_trajectory_line:String): for gun in get_children(): #if there is gun remove it diff --git a/source/assets/scripts/server_handlers/global.gd b/source/assets/scripts/server_handlers/global.gd index ecb476d..af8b93c 100644 --- a/source/assets/scripts/server_handlers/global.gd +++ b/source/assets/scripts/server_handlers/global.gd @@ -9,7 +9,7 @@ var sine_button var parab_button var hyper_button var global -var control = false +var control var clientPhase = { "0": { diff --git a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd index 3e27b8d..dee6e58 100644 --- a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd +++ b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd @@ -34,7 +34,7 @@ func _ready(): func trajectory(): - clear_points() + while dot_position.x < 1000: if pos.x > 0: add_point(dot_position) diff --git a/source/assets/scripts/shooting/Line/Line_Barrel.gd b/source/assets/scripts/shooting/Line/Line_Barrel.gd index fa78907..84c4c97 100644 --- a/source/assets/scripts/shooting/Line/Line_Barrel.gd +++ b/source/assets/scripts/shooting/Line/Line_Barrel.gd @@ -18,7 +18,6 @@ var a_parameter = 0 func trajectory(): - clear_points() while dot_position.x < 1000: add_point(dot_position) velocity.y = 10 * a_parameter From 3c9189aef050667628612a983b0ba9bcdeca08e0 Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Mon, 15 Nov 2021 12:59:44 +0200 Subject: [PATCH 4/8] Almost working buttons instead of bullet flying trajectory changing and hyperbollic line --- .../player_handlers/player_body_handler.gd | 10 +++++----- .../shooting/Hyperbola/Hyperbolic_Barrel.gd | 15 +++++++-------- .../assets/scripts/shooting/Sine/Sine_Barrel.gd | 1 - .../shooting/Sine_Trajectory/Sine_Barrel.tscn | 1 - .../scenes/OVERLAY/elements/Trajectory_Control.gd | 10 +++++++--- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 6e666d0..0163ad8 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -334,13 +334,13 @@ func enable_trajectory_line(new_trajectory_line:String): # get_parent().add_child(x) # x.global_position = shoot_point.global_position # x.global_rotation = shoot_point.global_rotation - #for x in get_children(): #if there is gun remove it - #x.queue_free() + for x in get_node('weaponHolder/Player-character-theme-gun/shoot_point').get_children(): #if there is gun remove it + x.queue_free() var x = bullet_trajectory[new_trajectory_line].instance() - get_parent().add_child(x) - x.global_position = shoot_point.global_position - x.global_rotation = shoot_point.global_rotation + print(x) + get_node('weaponHolder/Player-character-theme-gun/shoot_point').add_child(x) + func enable_trajectory(new_trajectory_line:String): diff --git a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd index dee6e58..6995a64 100644 --- a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd +++ b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd @@ -34,20 +34,19 @@ func _ready(): func trajectory(): - while dot_position.x < 1000: - if pos.x > 0: + if true: add_point(dot_position) velocity.x = 10 velocity.y = a_parameter/(time*b_parameter) dot_position += velocity * speed_hyper * 0.06944 time += 0.06944 - if pos.x < 0: - add_point(dot_position) - velocity.x = 10 - velocity.y = -a_parameter/(time*b_parameter) - dot_position += velocity * speed_hyper * 0.06944 - time += 0.06944 +# if pos.x < 0: +# add_point(dot_position) +# velocity.x = 10 +# velocity.y = -a_parameter/(time*b_parameter) +# dot_position += velocity * speed_hyper * 0.06944 +# time += 0.06944 func _process(_delta): trajectory() diff --git a/source/assets/scripts/shooting/Sine/Sine_Barrel.gd b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd index ecf104a..a37190a 100644 --- a/source/assets/scripts/shooting/Sine/Sine_Barrel.gd +++ b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd @@ -19,7 +19,6 @@ export var frequency = 5 # time += 0.06944 func trajectory(): - clear_points() while dot_position.x < 1000: add_point(dot_position) velocity.y = amplitude * cos(time * frequency) diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn index 5c2db70..3a0e275 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn @@ -4,5 +4,4 @@ [node name="Sine_Barrel" type="Line2D"] show_behind_parent = true -width = 4.0 script = ExtResource( 1 ) diff --git a/source/scenes/OVERLAY/elements/Trajectory_Control.gd b/source/scenes/OVERLAY/elements/Trajectory_Control.gd index e885de6..5ae7223 100644 --- a/source/scenes/OVERLAY/elements/Trajectory_Control.gd +++ b/source/scenes/OVERLAY/elements/Trajectory_Control.gd @@ -12,19 +12,23 @@ func _ready(): func _on_line_pressed(): Global.get('player').enable_trajectory_line('line') + #Global.get('player').choose_trajectory('line') pass # Replace with function body. func _on_parabol_pressed(): - on_parab_pressed = true + Global.get('player').enable_trajectory_line('parab') + #Global.get('player').choose_trajectory('parab') pass # Replace with function body. func _on_hyperbol_pressed(): - on_hyper_pressed = true + Global.get('player').enable_trajectory_line('hyper') + #Global.get('player').trajectory_line = 'hyper' pass # Replace with function body. func _on_sine_pressed(): - on_sine_pressed = true + Global.get('player').enable_trajectory_line('sine') + #Global.get('player').trajectory_line = 'sine' pass # Replace with function body. From 71bbc2afac16f666722760a8152dc494825eae72 Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Mon, 15 Nov 2021 22:19:45 +0200 Subject: [PATCH 5/8] Completely fixed Added bullet trajectories --- project.godot | 40 +++--- .../player_handlers/player_body_handler.gd | 17 +-- .../shooting/Hyperbola/Hyperbolic_Barrel.gd | 14 +- source/entities/player/player_node.tscn | 130 +++++++++--------- .../Hyperbolic_Barrel.tscn | 5 +- .../Hyperbolic_Bullet.tscn | 8 +- source/scenes/GUI/singleplayer_setup.tscn | 16 +-- .../OVERLAY/elements/Trajectory_Control.gd | 8 +- .../OVERLAY/elements/trajectory_control.tscn | 6 + 9 files changed, 115 insertions(+), 129 deletions(-) diff --git a/project.godot b/project.godot index c90e8a2..e5984ad 100644 --- a/project.godot +++ b/project.godot @@ -42,42 +42,42 @@ fps=false input_right={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_left={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_up={ "deadzone": 0.49, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_down={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_debug={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":96,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":96,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_enter={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_shift={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_shoot={ @@ -87,42 +87,42 @@ input_shoot={ } esc={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } rotation_increase={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } rotation_decrease={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } line={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777351,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777351,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } sine={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777352,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777352,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } hyper={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777353,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777353,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } parab={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777354,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777354,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } fullscreen_toggle={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777254,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777254,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 0163ad8..f2a6c10 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -276,7 +276,7 @@ func _physics_process(delta) -> void: # warning-ignore:return_value_discarded move_and_slide(velocityVDIR.rotated(rotationalHolder)) rotate_weapon() - choose_trajectory() + #choose_trajectory() #enable_trajectory_line(trajectory_line) if user_input["shoot"] and can_shoot and not is_reloading: rpc("shoot", trajectory) @@ -305,20 +305,7 @@ func _physics_process(delta) -> void: rpc("destroy") -func choose_trajectory(): - - if Input.is_action_just_pressed("line"): - trajectory = 'line' - trajectory_line = 'line' - if Input.is_action_just_pressed("sine"): - trajectory = 'sine' - trajectory_line = 'sine' - if Input.is_action_just_pressed("parab"): - trajectory = 'parab' - trajectory_line = 'parab' - if Input.is_action_just_pressed("hyper"): - trajectory = 'hyper' - trajectory_line = 'hyper' + sync func shoot(new_trajectory:String): diff --git a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd index 6995a64..754df53 100644 --- a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd +++ b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd @@ -35,18 +35,18 @@ func _ready(): func trajectory(): while dot_position.x < 1000: - if true: + if pos.x > 0: add_point(dot_position) velocity.x = 10 velocity.y = a_parameter/(time*b_parameter) dot_position += velocity * speed_hyper * 0.06944 time += 0.06944 -# if pos.x < 0: -# add_point(dot_position) -# velocity.x = 10 -# velocity.y = -a_parameter/(time*b_parameter) -# dot_position += velocity * speed_hyper * 0.06944 -# time += 0.06944 + if pos.x < 0: + add_point(dot_position) + velocity.x = 10 + velocity.y = -a_parameter/(time*b_parameter) + dot_position += velocity * speed_hyper * 0.06944 + time += 0.06944 func _process(_delta): trajectory() diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index eddab1a..40b9c7a 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -183,11 +183,71 @@ animations = [ { "name": "idle-speed-right-04", "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": "move-speed-right-04", +"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": "boost-speed-left-04", "speed": 50.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( 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", +"speed": 50.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": "boost-speed-left-03", +"speed": 50.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": 50.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": "move-speed-right-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": "move-speed-right-02", +"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": "move-speed-left-02", +"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( 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( 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( 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( 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", @@ -198,75 +258,15 @@ animations = [ { "name": "boost-speed-right-02", "speed": 50.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": "move-speed-right-03", -"speed": 35.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( 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( 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", -"speed": 50.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( 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-02", "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": "move-speed-left-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": "boost-speed-left-03", -"speed": 50.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": "move-speed-right-02", -"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( 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": 50.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": "move-speed-left-02", -"speed": 35.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( 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 } ] [sub_resource type="RectangleShape2D" id=3] @@ -299,11 +299,6 @@ radius = 41.5403 animations = [ { "frames": [ ExtResource( 170 ) ], "loop": true, -"name": "03", -"speed": 5.0 -}, { -"frames": [ ExtResource( 170 ) ], -"loop": true, "name": "02", "speed": 5.0 }, { @@ -316,6 +311,11 @@ animations = [ { "loop": true, "name": "04", "speed": 5.0 +}, { +"frames": [ ExtResource( 170 ) ], +"loop": true, +"name": "03", +"speed": 5.0 } ] [node name="player" type="KinematicBody2D" groups=["Net", "Player"]] diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn index ea3509b..2495618 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn @@ -1,9 +1,6 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=2 format=2] [ext_resource path="res://source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd" type="Script" id=1] -[sub_resource type="Curve" id=1] - [node name="Hyperbolic_Barrel" type="Line2D"] -width_curve = SubResource( 1 ) script = ExtResource( 1 ) diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn index 1047204..bf87d51 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn @@ -7,15 +7,11 @@ radius = 9.85811 height = 35.0082 -[node name="player_character_bullet" type="Sprite" groups=[ -"Net", -]] +[node name="player_character_bullet" type="Sprite" groups=["Net"]] texture = ExtResource( 1 ) script = ExtResource( 2 ) -[node name="hitbox" type="Area2D" parent="." groups=[ -"Player_damager", -]] +[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]] [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] position = Vector2( 10.8253, -0.381073 ) diff --git a/source/scenes/GUI/singleplayer_setup.tscn b/source/scenes/GUI/singleplayer_setup.tscn index 7cfcf24..b06b1f2 100644 --- a/source/scenes/GUI/singleplayer_setup.tscn +++ b/source/scenes/GUI/singleplayer_setup.tscn @@ -12,16 +12,16 @@ use_mipmaps = true use_filter = true font_data = ExtResource( 2 ) -[sub_resource type="StyleBoxEmpty" id=2] - -[sub_resource type="StyleBoxEmpty" id=3] - [sub_resource type="DynamicFont" id=4] size = 36 use_mipmaps = true use_filter = true font_data = ExtResource( 2 ) +[sub_resource type="StyleBoxEmpty" id=2] + +[sub_resource type="StyleBoxEmpty" id=3] + [sub_resource type="DynamicFont" id=5] size = 36 use_mipmaps = true @@ -61,8 +61,8 @@ margin_left = -225.0 margin_top = -25.0 margin_right = -225.0 margin_bottom = -25.0 -custom_fonts/font = SubResource( 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 1 ) text = "Enter your username" align = 1 valign = 1 @@ -93,10 +93,10 @@ margin_left = -175.0 margin_top = -28.0 margin_right = 175.0 margin_bottom = 28.0 +custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) +custom_fonts/font = SubResource( 4 ) custom_styles/focus = SubResource( 2 ) custom_styles/normal = SubResource( 3 ) -custom_fonts/font = SubResource( 4 ) -custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) align = 1 placeholder_text = "username" __meta__ = { @@ -117,8 +117,8 @@ margin_bottom = 97.0 [node name="Label" type="Label" parent="popup_screen/panel/confirm"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_fonts/font = SubResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 5 ) text = "CONFIRM" align = 1 valign = 1 diff --git a/source/scenes/OVERLAY/elements/Trajectory_Control.gd b/source/scenes/OVERLAY/elements/Trajectory_Control.gd index 5ae7223..222b837 100644 --- a/source/scenes/OVERLAY/elements/Trajectory_Control.gd +++ b/source/scenes/OVERLAY/elements/Trajectory_Control.gd @@ -12,23 +12,23 @@ func _ready(): func _on_line_pressed(): Global.get('player').enable_trajectory_line('line') - #Global.get('player').choose_trajectory('line') + Global.get('player').trajectory = 'line' pass # Replace with function body. func _on_parabol_pressed(): Global.get('player').enable_trajectory_line('parab') - #Global.get('player').choose_trajectory('parab') + Global.get('player').trajectory = 'parab' pass # Replace with function body. func _on_hyperbol_pressed(): Global.get('player').enable_trajectory_line('hyper') - #Global.get('player').trajectory_line = 'hyper' + Global.get('player').trajectory = 'hyper' pass # Replace with function body. func _on_sine_pressed(): Global.get('player').enable_trajectory_line('sine') - #Global.get('player').trajectory_line = 'sine' + Global.get('player').trajectory = 'sine' pass # Replace with function body. diff --git a/source/scenes/OVERLAY/elements/trajectory_control.tscn b/source/scenes/OVERLAY/elements/trajectory_control.tscn index 364c5c1..0d11933 100644 --- a/source/scenes/OVERLAY/elements/trajectory_control.tscn +++ b/source/scenes/OVERLAY/elements/trajectory_control.tscn @@ -119,6 +119,8 @@ margin_left = -125.0 margin_top = -40.0 margin_right = -25.0 margin_bottom = 60.0 +focus_mode = 0 +enabled_focus_mode = 0 texture_normal = ExtResource( 7 ) texture_pressed = ExtResource( 4 ) texture_hover = ExtResource( 4 ) @@ -153,6 +155,8 @@ margin_left = 5.23596 margin_top = -40.0 margin_right = 105.236 margin_bottom = 60.0 +focus_mode = 0 +enabled_focus_mode = 0 texture_normal = ExtResource( 8 ) texture_pressed = ExtResource( 9 ) texture_hover = ExtResource( 9 ) @@ -188,6 +192,8 @@ margin_left = 135.0 margin_top = -40.0 margin_right = 235.0 margin_bottom = 60.0 +focus_mode = 0 +enabled_focus_mode = 0 texture_normal = ExtResource( 6 ) texture_pressed = ExtResource( 5 ) texture_hover = ExtResource( 5 ) From ae31ad670efc8cd6e943867173bb66bc27db7f25 Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Mon, 15 Nov 2021 23:29:04 +0200 Subject: [PATCH 6/8] /info/ /informed/ --- .../player_handlers/player_body_handler.gd | 28 ------------------- .../shooting/Hyperbola/Hyperbolic_Barrel.gd | 1 + .../shooting/Parabola/Parabolic_Barrel.gd | 13 +++++++++ 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index f2a6c10..769ab09 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -153,16 +153,6 @@ func process_rotation(): func _process(_delta: float) -> void: - #print(Global.get('control')) -# if Global.get('control')._on_line_pressed(): -# enable_trajectory('line') -# if Global.get('control')._on_sine_pressed(): -# enable_trajectory('sine') -# if Global.get('control')._on_parab_pressed(): -# enable_trajectory('parab') -# if Global.get('control')._on_hyper_pressed(): -# enable_trajectory('hyper') - user_input = UIN_preset_pre_processor_instance.update(Global.get_current_phase()) if get_tree().is_network_server(): Global.phase_update_global() @@ -276,8 +266,6 @@ func _physics_process(delta) -> void: # warning-ignore:return_value_discarded move_and_slide(velocityVDIR.rotated(rotationalHolder)) rotate_weapon() - #choose_trajectory() - #enable_trajectory_line(trajectory_line) if user_input["shoot"] and can_shoot and not is_reloading: rpc("shoot", trajectory) is_reloading = true @@ -306,8 +294,6 @@ func _physics_process(delta) -> void: - - sync func shoot(new_trajectory:String): bullet = bullet_env[new_trajectory].instance() get_parent().add_child(bullet) @@ -316,11 +302,6 @@ sync func shoot(new_trajectory:String): func enable_trajectory_line(new_trajectory_line:String): -# var x = bullet_trajectory[new_trajectory_line].instance() -# #print(x) -# get_parent().add_child(x) -# x.global_position = shoot_point.global_position -# x.global_rotation = shoot_point.global_rotation for x in get_node('weaponHolder/Player-character-theme-gun/shoot_point').get_children(): #if there is gun remove it x.queue_free() @@ -329,15 +310,6 @@ func enable_trajectory_line(new_trajectory_line:String): get_node('weaponHolder/Player-character-theme-gun/shoot_point').add_child(x) - -func enable_trajectory(new_trajectory_line:String): - for gun in get_children(): #if there is gun remove it - gun.queue_free() - - var gun = bullet_trajectory[new_trajectory_line].instance() - add_child(gun) - pass - func _draw(): if debugMode: diff --git a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd index 754df53..7d53e79 100644 --- a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd +++ b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd @@ -13,6 +13,7 @@ var b_parameter = 1 var pos func _ready(): pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position + #func _draw(): diff --git a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd index b741d04..7dae485 100644 --- a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd +++ b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd @@ -8,6 +8,8 @@ var time = 0 var a_parameter = 1 var b_parameter = 0 +var pos_diff = [] + var pos func _ready(): pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position @@ -30,6 +32,7 @@ func _ready(): # func trajectory(): + clear_points() while dot_position.x < 1000: if pos.x > 0: add_point(dot_position) @@ -43,8 +46,18 @@ func trajectory(): velocity.x = 5 dot_position += velocity * speed_parab * 0.06944 time += 0.06944 + +func is_flipped(): + while len(pos_diff) < 2: + pos_diff.append(pos) + + if pos_diff[1].x/pos_diff[0].x < 0: + return true + func _process(_delta): + #if is_flipped(): + #clear_points() trajectory() update() From 3b81f718c80a4a9edac57461b74f4cdb8e4bf812 Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Tue, 16 Nov 2021 00:12:43 +0200 Subject: [PATCH 7/8] funny changes get acquainted with non-working(for now) user input --- .../trinity_site_level_playground.tscn | 2 +- .../scenes/OVERLAY/elements/trajectories.gd | 16 ++++++++ .../scenes/OVERLAY/elements/user_input.tscn | 38 ++++++++++++++++++- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 source/scenes/OVERLAY/elements/trajectories.gd diff --git a/source/levels/trinity_site/trinity_site_level_playground.tscn b/source/levels/trinity_site/trinity_site_level_playground.tscn index 14ac053..169a1a5 100644 --- a/source/levels/trinity_site/trinity_site_level_playground.tscn +++ b/source/levels/trinity_site/trinity_site_level_playground.tscn @@ -158,10 +158,10 @@ margin_left = 2.37842 margin_top = -35.5 margin_right = 2.37842 margin_bottom = 106.5 -custom_fonts/font = SubResource( 1 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) custom_constants/shadow_offset_x = 6 custom_constants/shadow_offset_y = 6 +custom_fonts/font = SubResource( 1 ) text = "You are the winner" align = 1 valign = 1 diff --git a/source/scenes/OVERLAY/elements/trajectories.gd b/source/scenes/OVERLAY/elements/trajectories.gd new file mode 100644 index 0000000..49abbc9 --- /dev/null +++ b/source/scenes/OVERLAY/elements/trajectories.gd @@ -0,0 +1,16 @@ +extends Control + +var a_param_line = 0 + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + + + +func _on_LineEdit_text_entered(new_text): + a_param_line = new_text + Global.get('player').enable_trajectory_line('line') + Global.get('player').trajectory = 'line' + pass # Replace with function body. diff --git a/source/scenes/OVERLAY/elements/user_input.tscn b/source/scenes/OVERLAY/elements/user_input.tscn index f97aba3..c394ff9 100644 --- a/source/scenes/OVERLAY/elements/user_input.tscn +++ b/source/scenes/OVERLAY/elements/user_input.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=25 format=2] [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/background_panel.svg" type="Texture" id=1] [ext_resource path="res://source/fonts/oxygen/Oxygen-Regular.ttf" type="DynamicFontData" id=2] @@ -12,6 +12,7 @@ [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_pressed.svg" type="Texture" id=10] [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_hover.svg" type="Texture" id=11] [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button.svg" type="Texture" id=12] +[ext_resource path="res://source/scenes/OVERLAY/elements/trajectories.gd" type="Script" id=13] [sub_resource type="StyleBoxTexture" id=1] texture = ExtResource( 1 ) @@ -85,6 +86,7 @@ margin_left = 50.0 margin_top = 28.0 margin_right = -330.0 margin_bottom = -28.0 +script = ExtResource( 13 ) __meta__ = { "_edit_use_anchors_": false } @@ -123,6 +125,26 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="LineEdit" type="LineEdit" parent="trajectories/line"] +margin_left = 205.0 +margin_top = 35.0 +margin_right = 263.0 +margin_bottom = 59.0 +max_length = 2 +placeholder_text = "a" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="x_label" type="Label" parent="trajectories/line"] +margin_left = 277.0 +margin_top = 44.0 +margin_right = 317.0 +margin_bottom = 58.0 +text = "x" +align = 1 +valign = 1 + [node name="parabol" type="Panel" parent="trajectories"] visible = false anchor_left = 0.5 @@ -228,6 +250,18 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="Func_Label" type="Label" parent="trajectories"] +margin_left = 121.0 +margin_top = 28.0 +margin_right = 237.0 +margin_bottom = 65.0 +text = "f(x) = " +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + [node name="controls" type="Control" parent="."] margin_left = 165.0 margin_top = 13.0 @@ -292,3 +326,5 @@ custom_fonts/font = SubResource( 11 ) text = "Skip" align = 1 valign = 1 + +[connection signal="text_entered" from="trajectories/line/LineEdit" to="trajectories" method="_on_LineEdit_text_entered"] From 0af4721c06f7e2719965264768acf000e1bc1783 Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Tue, 16 Nov 2021 13:17:38 +0200 Subject: [PATCH 8/8] fully working input needs some adjustments --- .../assets/scripts/server_handlers/global.gd | 5 +- .../shooting/Hyperbola/Hyperbolic_Barrel.gd | 22 +-- .../shooting/Hyperbola/Hyperbolic_Bullet.gd | 6 +- .../scripts/shooting/Line/Line_Barrel.gd | 2 +- .../scripts/shooting/Line/Line_Bullet.gd | 4 +- .../shooting/Parabola/Parabolic_Barrel.gd | 21 +-- .../shooting/Parabola/Parabolic_Bullet.gd | 4 +- .../scripts/shooting/Sine/Sine_Barrel.gd | 4 +- .../scripts/shooting/Sine/Sine_Bullet.gd | 4 +- .../shooting/Sine_Trajectory/Sine_Bullet.tscn | 8 +- .../OVERLAY/elements/Trajectory_Control.gd | 20 ++- .../scenes/OVERLAY/elements/trajectories.gd | 56 +++++++- .../scenes/OVERLAY/elements/user_input.tscn | 132 +++++++++++++++++- 13 files changed, 217 insertions(+), 71 deletions(-) diff --git a/source/assets/scripts/server_handlers/global.gd b/source/assets/scripts/server_handlers/global.gd index af8b93c..a417131 100644 --- a/source/assets/scripts/server_handlers/global.gd +++ b/source/assets/scripts/server_handlers/global.gd @@ -4,12 +4,9 @@ var player_master = null var ui = null var alive_players = [] var player -var line_button -var sine_button -var parab_button -var hyper_button var global var control +var user_input var clientPhase = { "0": { diff --git a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd index 7d53e79..7eb495f 100644 --- a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd +++ b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd @@ -7,8 +7,8 @@ var dot_position = Vector2(0, 0) var x = 10 var time = 0.05 -var a_parameter = 1 -var b_parameter = 1 +var a_parameter = Global.get('user_input').a_param_hyper +var b_parameter = Global.get('user_input').b_param_hyper var pos func _ready(): @@ -16,24 +16,6 @@ func _ready(): -#func _draw(): -# update() -# if pos.x > 0: -# if dot_position.x < 1000: -# velocity.x = 10 -# velocity.y = a_parameter/(time*b_parameter) -# dot_position += velocity * speed_hyper * 0.06944 -# draw_circle(dot_position, 2, Color(225, 225, 225)) -# time += 0.06944 -# if pos.x < 0: -# if dot_position.x < 1000: -# velocity.x = 10 -# velocity.y = -a_parameter/(time*b_parameter) -# dot_position += velocity * speed_hyper * 0.06944 -# draw_circle(dot_position, 2, Color(225, 225, 225)) -# time += 0.06944 - - func trajectory(): while dot_position.x < 1000: if pos.x > 0: diff --git a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd index c45bcc6..cc39981 100644 --- a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd +++ b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd @@ -4,8 +4,10 @@ export(int) var damage = 25 var velocity = Vector2() var speed_hyper = 100 var time = 0.05 -var a_parameter = 1 -var b_parameter = 1 + +var a_parameter = Global.get('user_input').a_param_hyper +var b_parameter = Global.get('user_input').b_param_hyper + var player_owner = 0 var pos diff --git a/source/assets/scripts/shooting/Line/Line_Barrel.gd b/source/assets/scripts/shooting/Line/Line_Barrel.gd index 84c4c97..4b752ea 100644 --- a/source/assets/scripts/shooting/Line/Line_Barrel.gd +++ b/source/assets/scripts/shooting/Line/Line_Barrel.gd @@ -5,7 +5,7 @@ var velocity = Vector2(0, 0) var dot_position = Vector2(0, 0) var time = 0 -var a_parameter = 0 +var a_parameter = -Global.get('user_input').a_param_line #func _draw(): diff --git a/source/assets/scripts/shooting/Line/Line_Bullet.gd b/source/assets/scripts/shooting/Line/Line_Bullet.gd index f9120d3..50ec70b 100644 --- a/source/assets/scripts/shooting/Line/Line_Bullet.gd +++ b/source/assets/scripts/shooting/Line/Line_Bullet.gd @@ -6,10 +6,12 @@ var velocity = Vector2() var player_owner = 0 var time = 0 -var a_parameter = 0 +var a_parameter = 0 + func follow_line_trajectory(): + a_parameter = -Global.get('user_input').a_param_line velocity.x = time velocity.y = time*a_parameter diff --git a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd index 7dae485..20f1121 100644 --- a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd +++ b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd @@ -5,8 +5,8 @@ var velocity = Vector2(0, 0) var dot_position = Vector2(0, 0) var time = 0 -var a_parameter = 1 -var b_parameter = 0 +var a_parameter = -Global.get('user_input').a_param_parab +var b_parameter = Global.get('user_input').b_param_parab var pos_diff = [] @@ -14,25 +14,8 @@ var pos func _ready(): pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position -#func _draw(): -# if pos.x > 0: -# if dot_position.x < 1000: -# velocity.y = time*(a_parameter * time + b_parameter) -# velocity.x = 5 -# dot_position += velocity * speed_parab * 0.06944 -# draw_circle(dot_position, 2, Color(225, 225, 225)) -# time += 0.06944 -# if pos.x < 0: -# if dot_position.x < 1000: -# velocity.y = -time*(a_parameter * time + b_parameter) -# velocity.x = 5 -# dot_position += velocity * speed_parab * 0.06944 -# draw_circle(dot_position, 2, Color(225, 225, 225)) -# time += 0.06944 -# func trajectory(): - clear_points() while dot_position.x < 1000: if pos.x > 0: add_point(dot_position) diff --git a/source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd index 582455f..02d623c 100644 --- a/source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd +++ b/source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd @@ -6,8 +6,8 @@ var velocity = Vector2() var player_owner = 0 var time = 0 -var a_parameter = 1 -var b_parameter = 0 +var a_parameter = -Global.get('user_input').a_param_parab +var b_parameter = Global.get('user_input').b_param_parab var pos func _ready(): diff --git a/source/assets/scripts/shooting/Sine/Sine_Barrel.gd b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd index a37190a..58c7de8 100644 --- a/source/assets/scripts/shooting/Sine/Sine_Barrel.gd +++ b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd @@ -6,8 +6,8 @@ var velocity = Vector2(0, 0) var dot_position = Vector2(0, 0) var time = 0 -export var amplitude = 4 -export var frequency = 5 +var amplitude = Global.get('user_input').amp +var frequency = Global.get('user_input').freq #func _draw(): diff --git a/source/assets/scripts/shooting/Sine/Sine_Bullet.gd b/source/assets/scripts/shooting/Sine/Sine_Bullet.gd index 821963b..8ccdc41 100644 --- a/source/assets/scripts/shooting/Sine/Sine_Bullet.gd +++ b/source/assets/scripts/shooting/Sine/Sine_Bullet.gd @@ -6,8 +6,8 @@ var velocity = Vector2() var player_owner = 0 var time = 0 -export var amplitude = 4 -export var frequency = 5 +var amplitude = Global.get('user_input').amp +var frequency = Global.get('user_input').freq func follow_sine_trajectory(): velocity.y = amplitude * cos(time * frequency) diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn index 52075ae..be4845b 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn @@ -7,15 +7,11 @@ radius = 9.85811 height = 35.0082 -[node name="player_character_bullet" type="Sprite" groups=[ -"Net", -]] +[node name="player_character_bullet" type="Sprite" groups=["Net"]] texture = ExtResource( 1 ) script = ExtResource( 2 ) -[node name="hitbox" type="Area2D" parent="." groups=[ -"Player_damager", -]] +[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]] [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] position = Vector2( 10.8253, -0.381073 ) diff --git a/source/scenes/OVERLAY/elements/Trajectory_Control.gd b/source/scenes/OVERLAY/elements/Trajectory_Control.gd index 222b837..be75fba 100644 --- a/source/scenes/OVERLAY/elements/Trajectory_Control.gd +++ b/source/scenes/OVERLAY/elements/Trajectory_Control.gd @@ -1,9 +1,5 @@ extends Control -var on_line_pressed = false -var on_sine_pressed = false -var on_parab_pressed = false -var on_hyper_pressed = false func _ready(): Global.set('control', self) @@ -11,24 +7,40 @@ func _ready(): func _on_line_pressed(): + Global.get('user_input').get_node('line').visible = true + Global.get('user_input').get_node('parabol').visible = false + Global.get('user_input').get_node('hyperbol').visible = false + Global.get('user_input').get_node('sin').visible = false Global.get('player').enable_trajectory_line('line') Global.get('player').trajectory = 'line' pass # Replace with function body. func _on_parabol_pressed(): + Global.get('user_input').get_node('parabol').visible = true + Global.get('user_input').get_node('line').visible = false + Global.get('user_input').get_node('hyperbol').visible = false + Global.get('user_input').get_node('sin').visible = false Global.get('player').enable_trajectory_line('parab') Global.get('player').trajectory = 'parab' pass # Replace with function body. func _on_hyperbol_pressed(): + Global.get('user_input').get_node('hyperbol').visible = true + Global.get('user_input').get_node('sin').visible = false + Global.get('user_input').get_node('line').visible = false + Global.get('user_input').get_node('parabol').visible = false Global.get('player').enable_trajectory_line('hyper') Global.get('player').trajectory = 'hyper' pass # Replace with function body. func _on_sine_pressed(): + Global.get('user_input').get_node('sin').visible = true + Global.get('user_input').get_node('line').visible = false + Global.get('user_input').get_node('hyperbol').visible = false + Global.get('user_input').get_node('parabol').visible = false Global.get('player').enable_trajectory_line('sine') Global.get('player').trajectory = 'sine' pass # Replace with function body. diff --git a/source/scenes/OVERLAY/elements/trajectories.gd b/source/scenes/OVERLAY/elements/trajectories.gd index 49abbc9..f8b4f42 100644 --- a/source/scenes/OVERLAY/elements/trajectories.gd +++ b/source/scenes/OVERLAY/elements/trajectories.gd @@ -2,15 +2,69 @@ extends Control var a_param_line = 0 +var a_param_parab = 1 +var b_param_parab = 0 + +var a_param_hyper = 1 +var b_param_hyper = 1 + +var freq = 5 +var amp = 5 + # Called when the node enters the scene tree for the first time. func _ready(): + Global.set('user_input', self) pass # Replace with function body. func _on_LineEdit_text_entered(new_text): - a_param_line = new_text + a_param_line = int(new_text) Global.get('player').enable_trajectory_line('line') Global.get('player').trajectory = 'line' pass # Replace with function body. + + +func _on_a_param_LineEdit_text_entered(new_text): + a_param_parab = int(new_text) + Global.get('player').enable_trajectory_line('parab') + Global.get('player').trajectory = 'parab' + pass # Replace with function body. + + +func _on_b_param_LineEdit_text_entered(new_text): + b_param_parab = int(new_text) + Global.get('player').enable_trajectory_line('parab') + Global.get('player').trajectory = 'parab' + pass # Replace with function body. + + +func _on_a_param_h_LineEdit_text_entered(new_text): + a_param_hyper = int(new_text) + Global.get('player').enable_trajectory_line('hyper') + Global.get('player').trajectory = 'hyper' + pass # Replace with function body. + + +func _on_b_param_h_LineEdit_text_entered(new_text): + b_param_hyper = int(new_text) + if b_param_hyper != 0: + Global.get('player').enable_trajectory_line('hyper') + Global.get('player').trajectory = 'hyper' + + pass # Replace with function body. + + +func _on_amp_text_entered(new_text): + amp = int(new_text) + Global.get('player').enable_trajectory_line('sine') + Global.get('player').trajectory = 'sine' + pass # Replace with function body. + + +func _on_freq_text_entered(new_text): + freq = int(new_text) + Global.get('player').enable_trajectory_line('sine') + Global.get('player').trajectory = 'sine' + pass # Replace with function body. diff --git a/source/scenes/OVERLAY/elements/user_input.tscn b/source/scenes/OVERLAY/elements/user_input.tscn index c394ff9..e21bd46 100644 --- a/source/scenes/OVERLAY/elements/user_input.tscn +++ b/source/scenes/OVERLAY/elements/user_input.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=26 format=2] [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/background_panel.svg" type="Texture" id=1] [ext_resource path="res://source/fonts/oxygen/Oxygen-Regular.ttf" type="DynamicFontData" id=2] @@ -13,6 +13,7 @@ [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_hover.svg" type="Texture" id=11] [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button.svg" type="Texture" id=12] [ext_resource path="res://source/scenes/OVERLAY/elements/trajectories.gd" type="Script" id=13] +[ext_resource path="res://icon.png" type="Texture" id=14] [sub_resource type="StyleBoxTexture" id=1] texture = ExtResource( 1 ) @@ -73,6 +74,7 @@ font_data = ExtResource( 2 ) [node name="user_input" type="Panel"] margin_right = 480.0 margin_bottom = 156.0 +mouse_filter = 1 custom_styles/panel = SubResource( 1 ) __meta__ = { "_edit_lock_": true, @@ -86,12 +88,14 @@ margin_left = 50.0 margin_top = 28.0 margin_right = -330.0 margin_bottom = -28.0 +mouse_filter = 1 script = ExtResource( 13 ) __meta__ = { "_edit_use_anchors_": false } [node name="line" type="Panel" parent="trajectories"] +visible = false anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -100,6 +104,7 @@ margin_left = -50.0 margin_top = -50.0 margin_right = 50.0 margin_bottom = 50.0 +mouse_filter = 1 custom_styles/panel = SubResource( 2 ) __meta__ = { "_edit_lock_": true, @@ -126,12 +131,13 @@ __meta__ = { } [node name="LineEdit" type="LineEdit" parent="trajectories/line"] -margin_left = 205.0 -margin_top = 35.0 -margin_right = 263.0 -margin_bottom = 59.0 -max_length = 2 -placeholder_text = "a" +margin_left = 206.0 +margin_top = 12.0 +margin_right = 288.0 +margin_bottom = 78.0 +focus_mode = 1 +mouse_filter = 1 +max_length = 3 __meta__ = { "_edit_use_anchors_": false } @@ -155,6 +161,7 @@ margin_left = -50.0 margin_top = -50.0 margin_right = 50.0 margin_bottom = 50.0 +mouse_filter = 1 custom_styles/panel = SubResource( 4 ) __meta__ = { "_edit_lock_": true, @@ -180,6 +187,41 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="x^2 label" type="Label" parent="trajectories/parabol"] +margin_left = 256.0 +margin_top = 41.0 +margin_right = 296.0 +margin_bottom = 55.0 +text = "x^2 +" + +[node name="a_param_LineEdit" type="LineEdit" parent="trajectories/parabol"] +margin_left = 193.0 +margin_top = 35.0 +margin_right = 251.0 +margin_bottom = 59.0 +focus_mode = 1 +max_length = 3 + +[node name="b_param_LineEdit" type="LineEdit" parent="trajectories/parabol"] +margin_left = 293.0 +margin_top = 36.0 +margin_right = 351.0 +margin_bottom = 60.0 +focus_mode = 1 +max_length = 3 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="x_label" type="Label" parent="trajectories/parabol"] +margin_left = 340.0 +margin_top = 41.0 +margin_right = 380.0 +margin_bottom = 55.0 +text = "x" +align = 1 +valign = 1 + [node name="hyperbol" type="Panel" parent="trajectories"] visible = false anchor_left = 0.5 @@ -215,6 +257,35 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="a_param_h_LineEdit" type="LineEdit" parent="trajectories/hyperbol"] +margin_left = 225.0 +margin_top = 13.0 +margin_right = 283.0 +margin_bottom = 37.0 +focus_mode = 1 +max_length = 3 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="b_param_h_LineEdit" type="LineEdit" parent="trajectories/hyperbol"] +margin_left = 211.0 +margin_top = 45.0 +margin_right = 269.0 +margin_bottom = 69.0 +focus_mode = 1 +max_length = 3 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Sprite" type="Sprite" parent="trajectories/hyperbol"] +modulate = Color( 0, 0, 0, 1 ) +self_modulate = Color( 0, 0, 0, 1 ) +position = Vector2( 254, 41 ) +scale = Vector2( 0.0401042, 0.00260416 ) +texture = ExtResource( 14 ) + [node name="sin" type="Panel" parent="trajectories"] visible = false anchor_left = 0.5 @@ -250,6 +321,46 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="x_label" type="Label" parent="trajectories/sin"] +margin_left = 341.0 +margin_top = 37.0 +margin_right = 381.0 +margin_bottom = 51.0 +text = "x)" +align = 1 +valign = 1 + +[node name="amp" type="LineEdit" parent="trajectories/sin"] +margin_left = 204.0 +margin_top = 33.0 +margin_right = 262.0 +margin_bottom = 57.0 +focus_mode = 1 +max_length = 3 + +[node name="freq" type="LineEdit" parent="trajectories/sin"] +margin_left = 291.0 +margin_top = 33.0 +margin_right = 349.0 +margin_bottom = 57.0 +focus_mode = 1 +max_length = 3 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="sin()" type="Label" parent="trajectories/sin"] +margin_left = 255.0 +margin_top = 37.0 +margin_right = 295.0 +margin_bottom = 51.0 +text = "sin(" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + [node name="Func_Label" type="Label" parent="trajectories"] margin_left = 121.0 margin_top = 28.0 @@ -267,6 +378,7 @@ margin_left = 165.0 margin_top = 13.0 margin_right = 465.0 margin_bottom = 143.0 +mouse_filter = 2 __meta__ = { "_edit_use_anchors_": false } @@ -328,3 +440,9 @@ align = 1 valign = 1 [connection signal="text_entered" from="trajectories/line/LineEdit" to="trajectories" method="_on_LineEdit_text_entered"] +[connection signal="text_entered" from="trajectories/parabol/a_param_LineEdit" to="trajectories" method="_on_a_param_LineEdit_text_entered"] +[connection signal="text_entered" from="trajectories/parabol/b_param_LineEdit" to="trajectories" method="_on_b_param_LineEdit_text_entered"] +[connection signal="text_entered" from="trajectories/hyperbol/a_param_h_LineEdit" to="trajectories" method="_on_a_param_h_LineEdit_text_entered"] +[connection signal="text_entered" from="trajectories/hyperbol/b_param_h_LineEdit" to="trajectories" method="_on_b_param_h_LineEdit_text_entered"] +[connection signal="text_entered" from="trajectories/sin/amp" to="trajectories" method="_on_amp_text_entered"] +[connection signal="text_entered" from="trajectories/sin/freq" to="trajectories" method="_on_freq_text_entered"]