kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2025-10-21 19:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'kritofers-test'

Browse Source
This commit is contained in:
Kristofers Solo 2021-11-18 22:06:44 +02:00
commit c36f7231b8
19 changed files with 209 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/assets/scripts/player_handlers/player_body_handler.gd
View File

@ -110,11 +110,13 @@ func _ready():
if is_network_master(): if is_network_master():
Global.player_master = self Global.player_master = self
Global.set("player", self) Global.set("player", self)
enable_trajectory_line("line")
# Allow update process override. # Allow update process override.
set_process(true) set_process(true)
$player_animated_sprite.play("idle") $player_animated_sprite.play("idle")
# enable_trajectory_line('line')
func get_user_state(): func get_user_state():
@ -269,7 +271,8 @@ func _physics_process(delta) -> void:
# warning-ignore:return_value_discarded # warning-ignore:return_value_discarded
move_and_slide(velocityVDIR.rotated(rotationalHolder)) move_and_slide(velocityVDIR.rotated(rotationalHolder))
rotate_weapon() rotate_weapon()
if user_input["shoot"] and can_shoot and not is_reloading:
if user_input["shoot"] and can_shoot and not is_reloading and Global.mode == 1:
rpc("shoot", trajectory) rpc("shoot", trajectory)
is_reloading = true is_reloading = true
reload_timer.start() reload_timer.start()
@ -309,7 +312,6 @@ func enable_trajectory_line(new_trajectory_line:String):
x.queue_free() x.queue_free()
var x = bullet_trajectory[new_trajectory_line].instance() var x = bullet_trajectory[new_trajectory_line].instance()
# print(x)
get_node('weaponHolder/Player-character-theme-gun/shoot_point').add_child(x) get_node('weaponHolder/Player-character-theme-gun/shoot_point').add_child(x)
@ -379,7 +381,6 @@ func _on_network_tick_rate_timeout():
rset_unreliable("puppet_weapon_position", weaponPosition) rset_unreliable("puppet_weapon_position", weaponPosition)
rset_unreliable("puppet_weapon_angle", weaponAngle) rset_unreliable("puppet_weapon_angle", weaponAngle)
rset_unreliable("puppet_direction", direction) rset_unreliable("puppet_direction", direction)
#rset_unreliable("puppet_character_states", characterStates)
rset_unreliable("puppet_bullet_position", bullet) rset_unreliable("puppet_bullet_position", bullet)
if get_tree().is_network_server(): if get_tree().is_network_server():
rset_unreliable("puppet_phase", clientPhase) rset_unreliable("puppet_phase", clientPhase)

4
source/assets/scripts/server_handlers/global.gd
View File

@ -3,12 +3,14 @@ extends Node
var player_master = null var player_master = null
var ui = null var ui = null
var alive_players = [] var alive_players = []
var killed_players = []
var player var player
var global var global
var control var control
var user_input var user_input
var bot_weapon var bot_weapon
var killed_players = [] var mode = 1
var clientPhase = { var clientPhase = {
"0": { "0": {

4
source/assets/scripts/server_handlers/network_processors/network_setup.gd
View File

@ -25,7 +25,9 @@ func _ready() -> void:
device_ip_address.hide() device_ip_address.hide()
text.hide() text.hide()
# if get_tree().has_network_peer():
# if is_network_master():
Global.set("user_input", null)
Global.start_game(false) Global.start_game(false)

1
source/assets/scripts/server_handlers/trinity_site_level.gd
View File

@ -15,6 +15,7 @@ func _ready() -> void:
if get_tree().is_network_server(): if get_tree().is_network_server():
setup_player_positions() setup_player_positions()
Global.start_game(true) Global.start_game(true)
Global.mode = 2
func setup_player_positions() -> void: func setup_player_positions() -> void:

1
source/assets/scripts/server_handlers/trinity_site_level_playground.gd
View File

@ -6,6 +6,7 @@ var current_player_location_instance_number = null
var globalActivePhase = null var globalActivePhase = null
func _ready() -> void: func _ready() -> void:
Global.mode = 1
$controls/user_input/controls/ready_button.hide() $controls/user_input/controls/ready_button.hide()
$controls/user_input/controls/skip_button.hide() $controls/user_input/controls/skip_button.hide()
# warning-ignore:return_value_discarded # warning-ignore:return_value_discarded

1
source/assets/scripts/shooting/Control.gd
View File

@ -1,7 +1,6 @@
extends Control extends Control
func _ready(): func _ready():
Global.set('line_button', self) Global.set('line_button', self)

27
source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd
View File

@ -1,10 +1,9 @@
extends Line2D extends Line2D
export var speed_hyper = 100 export var speed_hyper = 130
var velocity = Vector2(0, 0) var velocity = Vector2(0, 0)
var dot_position = Vector2(0, 0) var dot_position = Vector2(0, 0)
var x = 10
var time = 0.05 var time = 0.05
var a_parameter = Global.get('user_input').a_param_hyper var a_parameter = Global.get('user_input').a_param_hyper
@ -16,21 +15,21 @@ func _ready():
func trajectory(): func trajectory(delta):
while dot_position.x < 2000: while dot_position.x < 2000:
if pos.x > 0: # if pos.x > 0:
add_point(dot_position) add_point(dot_position)
velocity.x = 10 velocity.x = 10
velocity.y = a_parameter/(time*b_parameter) velocity.y = a_parameter/(time*b_parameter)
dot_position += velocity * speed_hyper * 0.06944 dot_position += velocity * speed_hyper * delta
time += 0.06944 time += delta
if pos.x < 0: # if pos.x < 0:
add_point(dot_position) # add_point(dot_position)
velocity.x = 10 # velocity.x = 10
velocity.y = -a_parameter/(time*b_parameter) # velocity.y = -a_parameter/(time*b_parameter)
dot_position += velocity * speed_hyper * 0.06944 # dot_position += velocity * speed_hyper * delta
time += 0.06944 # time += delta
func _process(_delta): func _process(delta):
trajectory() trajectory(delta)
update() update()

8
source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd
View File

@ -16,12 +16,12 @@ func _ready():
func follow_hyperbolic_trajectory(): func follow_hyperbolic_trajectory():
if pos.x > 0: # if pos.x > 0:
velocity.x = 5 velocity.x = 5
velocity.y = a_parameter/(time*b_parameter) velocity.y = a_parameter/(time*b_parameter)
if pos.x < 0: # if pos.x < 0:
velocity.x = 5 # velocity.x = 5
velocity.y = -a_parameter/(time*b_parameter) # velocity.y = -a_parameter/(time*b_parameter)
func _process(delta): func _process(delta):

27
source/assets/scripts/shooting/Line/Line_Barrel.gd
View File

@ -5,28 +5,25 @@ var velocity = Vector2(0, 0)
var dot_position = Vector2(0, 0) var dot_position = Vector2(0, 0)
var time = 0 var time = 0
var a_parameter = -Global.get('user_input').a_param_line var a_parameter
func _ready():
if Global.get("user_input") != null:
a_parameter = -Global.get("user_input").a_param_line
else:
a_parameter = 0
#func _draw(): func trajectory(delta):
# 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():
while dot_position.x < 2000: while dot_position.x < 2000:
add_point(dot_position) add_point(dot_position)
velocity.y = 10 * a_parameter velocity.y = 10 * a_parameter
velocity.x = 10 velocity.x = 10
dot_position += velocity * speed * 0.06944 dot_position += velocity * speed * delta
time += 0.06944 time += delta
pass pass
func _process(_delta): func _process(delta):
trajectory() trajectory(delta)
update() update()

8
source/assets/scripts/shooting/Line/Line_Bullet.gd
View File

@ -6,12 +6,16 @@ var velocity = Vector2()
var player_owner = 0 var player_owner = 0
var time = 0 var time = 0
var a_parameter = 0 var a_parameter
func _ready():
if Global.get("user_input") != null:
a_parameter = -Global.get("user_input").a_param_line
else:
a_parameter = 0
func follow_line_trajectory(): func follow_line_trajectory():
a_parameter = -Global.get('user_input').a_param_line
velocity.x = time velocity.x = time
velocity.y = time*a_parameter velocity.y = time*a_parameter

27
source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd
View File

@ -19,34 +19,21 @@ func _ready():
func trajectory(delta): func trajectory(delta):
while dot_position.x < 2000: while dot_position.x < 2000:
if pos.x > 0: # if pos.x > 0:
add_point(dot_position) add_point(dot_position)
velocity.y = time*(a_parameter * time + b_parameter) velocity.y = time*(a_parameter * time + b_parameter)
velocity.x = 5 velocity.x = 5
dot_position += velocity * speed_parab * delta dot_position += velocity * speed_parab * delta
time += delta time += delta
if pos.x < 0: # if pos.x < 0:
add_point(dot_position) # add_point(dot_position)
velocity.y = -time*(a_parameter * time + b_parameter) # velocity.y = -time*(a_parameter * time + b_parameter)
velocity.x = 5 # velocity.x = 5
dot_position += velocity * speed_parab * delta # dot_position += velocity * speed_parab * delta
time += delta # time += delta
func is_flipped():
while len(pos_diff) < 2:
pos_diff.append(rot)
if cos(pos):
pass
if pos_diff[0] + pos_diff[1] > pos_diff[1] or pos_diff[0] + pos_diff[1] > pos_diff[0]:
pass
if pos_diff[1].x/pos_diff[0].x < 0:
return true
func _process(delta): func _process(delta):
#if is_flipped():
#clear_points()
trajectory(delta) trajectory(delta)
update() update()

10
source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd
View File

@ -15,12 +15,12 @@ func _ready():
func follow_parabolic_trajectory(): func follow_parabolic_trajectory():
if pos.x > 0: # if pos.x > 0:
velocity.x = 5 velocity.x = 5
velocity.y = time*(a_parameter * time + b_parameter) velocity.y = time * (a_parameter * time + b_parameter)
if pos.x < 0: # if pos.x < 0:
velocity.x = 5 # velocity.x = 5
velocity.y = -time*(a_parameter * time + b_parameter) # velocity.y = -time*(a_parameter * time + b_parameter)
func _process(delta): func _process(delta):

8
source/assets/scripts/shooting/Sine/Sine_Barrel.gd
View File

@ -10,14 +10,6 @@ var amplitude = Global.get('user_input').amp
var frequency = Global.get('user_input').freq var frequency = Global.get('user_input').freq
#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(delta): func trajectory(delta):
while dot_position.x < 2000: while dot_position.x < 2000:
add_point(dot_position) add_point(dot_position)

62
source/assets/scripts/shooting/Trajectories/Trajectory_Control.gd
View File

@ -1,43 +1,53 @@
extends Control extends Control
var FuncItLine
func _ready(): func _ready():
Global.set('control', self) Global.set("control", self)
FuncItLine = "line"
func _on_line_pressed() -> void: func _on_line_pressed() -> void:
Global.get('user_input').get_node('line').visible = true FuncItLine = "line"
Global.get('user_input').get_node('parabol').visible = false Global.get("user_input").get_node("line").visible = true
Global.get('user_input').get_node('hyperbol').visible = false Global.get("user_input").get_node("parabol").visible = false
Global.get('user_input').get_node('sin').visible = false Global.get("user_input").get_node("hyperbol").visible = false
Global.get('player').enable_trajectory_line('line') Global.get("user_input").get_node("sin").visible = false
Global.get('player').trajectory = 'line' Global.get("player").enable_trajectory_line("line")
Global.get("player").trajectory = "line"
func _on_parabol_pressed() -> void: func _on_parabol_pressed() -> void:
Global.get('user_input').get_node('parabol').visible = true FuncItLine = "parab"
Global.get('user_input').get_node('line').visible = false Global.get("user_input").get_node("parabol").visible = true
Global.get('user_input').get_node('hyperbol').visible = false Global.get("user_input").get_node("line").visible = false
Global.get('user_input').get_node('sin').visible = false Global.get("user_input").get_node("hyperbol").visible = false
Global.get('player').enable_trajectory_line('parab') Global.get("user_input").get_node("sin").visible = false
Global.get('player').trajectory = 'parab' Global.get("player").enable_trajectory_line("parab")
Global.get("player").trajectory = "parab"
func _on_hyperbol_pressed() -> void: func _on_hyperbol_pressed() -> void:
Global.get('user_input').get_node('hyperbol').visible = true FuncItLine = "hyper"
Global.get('user_input').get_node('sin').visible = false Global.get("user_input").get_node("hyperbol").visible = true
Global.get('user_input').get_node('line').visible = false Global.get("user_input").get_node("sin").visible = false
Global.get('user_input').get_node('parabol').visible = false Global.get("user_input").get_node("line").visible = false
Global.get('player').enable_trajectory_line('hyper') Global.get("user_input").get_node("parabol").visible = false
Global.get('player').trajectory = 'hyper' Global.get("player").enable_trajectory_line("hyper")
Global.get("player").trajectory = "hyper"
func _on_sine_pressed() -> void: func _on_sine_pressed() -> void:
Global.get('user_input').get_node('sin').visible = true FuncItLine = "sine"
Global.get('user_input').get_node('line').visible = false Global.get("user_input").get_node("sin").visible = true
Global.get('user_input').get_node('hyperbol').visible = false Global.get("user_input").get_node("line").visible = false
Global.get('user_input').get_node('parabol').visible = false Global.get("user_input").get_node("hyperbol").visible = false
Global.get('player').enable_trajectory_line('sine') Global.get("user_input").get_node("parabol").visible = false
Global.get('player').trajectory = 'sine' Global.get("player").enable_trajectory_line("sine")
Global.get("player").trajectory = "sine"
func _physics_process(_delta):
FuncItLine
if Input.is_action_pressed("input_left") or Input.is_action_pressed("input_right"):
Global.get("player").enable_trajectory_line(FuncItLine)

61
source/assets/scripts/shooting/Trajectories/trajectories.gd
View File

@ -1,7 +1,5 @@
extends Control extends Control
var FuncItline = 'line'
var a_param_line = 0 var a_param_line = 0
var a_param_parab = 1 var a_param_parab = 1
@ -15,71 +13,58 @@ var amp = 5
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
Global.set('user_input', self) Global.set("user_input", self)
func _on_ready_button_pressed():
pass # Replace with function body.
func _on_skip_button_pressed():
pass # Replace with function body.
func _on_line_SpinBox_value_changed(value): func _on_line_SpinBox_value_changed(value):
a_param_line = 0
a_param_line = value a_param_line = value
FuncItline = 'line' Global.get("player").enable_trajectory_line("line")
Global.get('player').enable_trajectory_line('line') Global.get("player").trajectory = "line"
Global.get('player').trajectory = 'line'
func _on_a_param_SpinBox_value_changed(value): func _on_a_param_SpinBox_value_changed(value):
a_param_parab = value a_param_parab = value
FuncItline = 'parab' Global.get("player").enable_trajectory_line("parab")
Global.get('player').enable_trajectory_line('parab') Global.get("player").trajectory = "parab"
Global.get('player').trajectory = 'parab'
func _on_b_param_SpinBox_value_changed(value): func _on_b_param_SpinBox_value_changed(value):
b_param_parab = value b_param_parab = value
FuncItline = 'parab' Global.get("player").enable_trajectory_line("parab")
Global.get('player').enable_trajectory_line('parab') Global.get("player").trajectory = "parab"
Global.get('player').trajectory = 'parab'
func _on_b_param_h_SpinBox_value_changed(value): func _on_b_param_h_SpinBox_value_changed(value):
b_param_hyper = value b_param_hyper = value
FuncItline = 'hyper'
if b_param_hyper != 0: if b_param_hyper != 0:
Global.get('player').enable_trajectory_line('hyper') Global.get("player").enable_trajectory_line("hyper")
Global.get('player').trajectory = 'hyper' Global.get("player").trajectory = "hyper"
func _on_a_param_h_SpinBox_value_changed(value): func _on_a_param_h_SpinBox_value_changed(value):
a_param_hyper = value a_param_hyper = value
FuncItline = 'hyper' Global.get("player").enable_trajectory_line("hyper")
Global.get('player').enable_trajectory_line('hyper') Global.get("player").trajectory = "hyper"
Global.get('player').trajectory = 'hyper'
func _on_amp_SpinBox_value_changed(value): func _on_amp_SpinBox_value_changed(value):
amp = value amp = value
FuncItline = 'sine' Global.get("player").enable_trajectory_line("sine")
Global.get('player').enable_trajectory_line('sine') Global.get("player").trajectory = "sine"
Global.get('player').trajectory = 'sine'
func _on_freq_SpinBox_value_changed(value): func _on_freq_SpinBox_value_changed(value):
freq = value freq = value
FuncItline = 'sine' Global.get("player").enable_trajectory_line("sine")
Global.get('player').enable_trajectory_line('sine') Global.get("player").trajectory = "sine"
Global.get('player').trajectory = 'sine'

1
source/assets/scripts/ui_element_handlers/game_UI_playground.gd
View File

@ -10,7 +10,6 @@ func _ready() -> void:
func _process(_delta: float) -> void: func _process(_delta: float) -> void:
# print(Global.alive_players.size())
if Global.killed_players.size() >= 1: if Global.killed_players.size() >= 1:
lose_screen.show() lose_screen.show()
else: else:

139
source/entities/player/player_node.tscn
View File

@ -173,24 +173,59 @@
[sub_resource type="SpriteFrames" id=1] [sub_resource type="SpriteFrames" id=1]
animations = [ { animations = [ {
"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ],
"loop": true,
"name": "boost-speed-right-04",
"speed": 55.0
}, {
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
"loop": true,
"name": "boost-speed-left-01",
"speed": 55.0
}, {
"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": 55.0
}, {
"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ],
"loop": true,
"name": "idle-speed-left-03",
"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": "boost-speed-left-03",
"speed": 55.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": 55.0
}, {
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
"loop": true,
"name": "move-speed-left-02",
"speed": 35.0
}, {
"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ],
"loop": true,
"name": "move-speed-right-04",
"speed": 35.0
}, {
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], "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, "loop": true,
"name": "move-speed-right-03", "name": "move-speed-right-03",
"speed": 35.0 "speed": 35.0
}, { }, {
"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], "frames": [ ExtResource( 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, "loop": true,
"name": "move-speed-left-03", "name": "move-speed-right-02",
"speed": 35.0 "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 ) ], "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, "loop": true,
"name": "move-speed-left-04", "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 "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 ) ], "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 ) ],
@ -198,20 +233,30 @@ animations = [ {
"name": "idle-speed-left-03", "name": "idle-speed-left-03",
"speed": 25.0 "speed": 25.0
}, { }, {
"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], "frames": [ ExtResource( 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, "loop": true,
"name": "move-speed-right-02", "name": "idle-speed-right-03",
"speed": 35.0 "speed": 25.0
}, { }, {
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], "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, "loop": true,
"name": "boost-speed-right-03", "name": "boost-speed-right-03",
"speed": 55.0 "speed": 55.0
}, { }, {
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "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, "loop": true,
"name": "move-speed-left-02", "name": "idle-speed-left-04",
"speed": 35.0 "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": "idle-speed-left-01",
"speed": 25.0
}, {
"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ],
"loop": true,
"name": "boost-speed-left-02",
"speed": 55.0
}, { }, {
"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], "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, "loop": true,
@ -228,9 +273,9 @@ animations = [ {
"name": "move-speed-right-04", "name": "move-speed-right-04",
"speed": 35.0 "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 ) ], "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, "loop": true,
"name": "move-speed-left-01", "name": "move-speed-left-04",
"speed": 35.0 "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 ) ], "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 ) ],
@ -238,50 +283,15 @@ animations = [ {
"name": "idle-speed-left-01", "name": "idle-speed-left-01",
"speed": 25.0 "speed": 25.0
}, { }, {
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ],
"loop": true,
"name": "boost-speed-left-04",
"speed": 55.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( 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( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ],
"loop": true,
"name": "boost-speed-left-02",
"speed": 55.0
}, {
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
"loop": true,
"name": "boost-speed-left-01",
"speed": 55.0
}, {
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ],
"loop": true,
"name": "idle-speed-right-03",
"speed": 25.0
}, {
"frames": [ ExtResource( 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": 55.0
}, {
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
"loop": true,
"name": "boost-speed-right-01",
"speed": 55.0
}, {
"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], "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, "loop": true,
"name": "boost-speed-right-02", "name": "boost-speed-right-02",
"speed": 55.0 "speed": 55.0
}, {
"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ],
"loop": true,
"name": "move-speed-right-01",
"speed": 35.0
} ] } ]
[sub_resource type="CircleShape2D" id=2] [sub_resource type="CircleShape2D" id=2]
@ -314,24 +324,24 @@ radius = 41.5403
[sub_resource type="SpriteFrames" id=6] [sub_resource type="SpriteFrames" id=6]
animations = [ { animations = [ {
"frames": [ ExtResource( 169 ) ],
"loop": true,
"name": "04",
"speed": 5.0
}, {
"frames": [ ExtResource( 170 ) ], "frames": [ ExtResource( 170 ) ],
"loop": true, "loop": true,
"name": "02", "name": "02",
"speed": 5.0 "speed": 5.0
}, { }, {
"frames": [ ExtResource( 16 ) ],
"loop": true,
"name": "03",
"speed": 5.0
}, {
"frames": [ ExtResource( 27 ) ], "frames": [ ExtResource( 27 ) ],
"loop": true, "loop": true,
"name": "01", "name": "01",
"speed": 5.0 "speed": 5.0
}, { }, {
"frames": [ ExtResource( 169 ) ], "frames": [ ExtResource( 16 ) ],
"loop": true, "loop": true,
"name": "04", "name": "03",
"speed": 5.0 "speed": 5.0
} ] } ]
@ -405,6 +415,7 @@ rotation = 3.14159
scale = Vector2( 4, 4 ) scale = Vector2( 4, 4 )
[node name="player_character_theme_dead" type="Sprite" parent="."] [node name="player_character_theme_dead" type="Sprite" parent="."]
visible = false
texture = ExtResource( 17 ) texture = ExtResource( 17 )
[connection signal="timeout" from="network_tick_rate" to="." method="_on_network_tick_rate_timeout"] [connection signal="timeout" from="network_tick_rate" to="." method="_on_network_tick_rate_timeout"]

1
source/levels/trinity_site/trinity_site_level.tscn
View File

@ -145,6 +145,7 @@ script = ExtResource( 2 )
script = ExtResource( 6 ) script = ExtResource( 6 )
[node name="win_lose_screen" parent="game_UI" instance=ExtResource( 12 )] [node name="win_lose_screen" parent="game_UI" instance=ExtResource( 12 )]
visible = false
position = Vector2( 0, 360 ) position = Vector2( 0, 360 )
script = ExtResource( 4 ) script = ExtResource( 4 )

2
source/scenes/OVERLAY/elements/user_input.tscn
View File

@ -596,3 +596,5 @@ valign = 1
[connection signal="value_changed" from="controls/hyperbol/b_param_h_SpinBox" to="controls" method="_on_b_param_h_SpinBox_value_changed"] [connection signal="value_changed" from="controls/hyperbol/b_param_h_SpinBox" to="controls" method="_on_b_param_h_SpinBox_value_changed"]
[connection signal="value_changed" from="controls/sin/amp_SpinBox" to="controls" method="_on_amp_SpinBox_value_changed"] [connection signal="value_changed" from="controls/sin/amp_SpinBox" to="controls" method="_on_amp_SpinBox_value_changed"]
[connection signal="value_changed" from="controls/sin/freq_SpinBox" to="controls" method="_on_freq_SpinBox_value_changed"] [connection signal="value_changed" from="controls/sin/freq_SpinBox" to="controls" method="_on_freq_SpinBox_value_changed"]
[connection signal="pressed" from="controls/ready_button" to="controls" method="_on_ready_button_pressed"]
[connection signal="pressed" from="controls/skip_button" to="controls" method="_on_skip_button_pressed"]