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 'fix_t' into shooting-mechanics

Browse Source
This commit is contained in:
Kristofers Solo 2021-11-16 10:34:20 +02:00
commit 7714b175eb
13 changed files with 163 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
project.godot
View File

@ -38,42 +38,42 @@ fps=false
input_right={ input_right={
"deadzone": 0.5, "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) "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,"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={ input_left={
"deadzone": 0.5, "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) "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,"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={ input_up={
"deadzone": 0.49, "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) "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,"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,"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={ input_down={
"deadzone": 0.5, "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) "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,"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={ input_debug={
"deadzone": 0.5, "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={ input_enter={
"deadzone": 0.5, "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={ input_shift={
"deadzone": 0.5, "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={ input_shoot={
@ -83,42 +83,42 @@ input_shoot={
} }
esc={ esc={
"deadzone": 0.5, "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={ rotation_increase={
"deadzone": 0.5, "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={ rotation_decrease={
"deadzone": 0.5, "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={ line={
"deadzone": 0.5, "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={ sine={
"deadzone": 0.5, "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={ hyper={
"deadzone": 0.5, "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={ parab={
"deadzone": 0.5, "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={ fullscreen_toggle={
"deadzone": 0.5, "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)
] ]
} }

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

@ -154,16 +154,6 @@ func process_rotation():
func _process(_delta: float) -> void: 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()) user_input = UIN_preset_pre_processor_instance.update(Global.get_current_phase())
if get_tree().is_network_server(): if get_tree().is_network_server():
Global.phase_update_global() Global.phase_update_global()
@ -277,8 +267,6 @@ 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()
choose_trajectory()
#enable_trajectory_line(trajectory_line)
if user_input["shoot"] and can_shoot and not is_reloading: if user_input["shoot"] and can_shoot and not is_reloading:
rpc("shoot", trajectory) rpc("shoot", trajectory)
is_reloading = true is_reloading = true
@ -306,21 +294,6 @@ func _physics_process(delta) -> void:
rpc("destroy") 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): sync func shoot(new_trajectory:String):
bullet = bullet_env[new_trajectory].instance() bullet = bullet_env[new_trajectory].instance()
@ -330,11 +303,6 @@ sync func shoot(new_trajectory:String):
func enable_trajectory_line(new_trajectory_line: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 for x in get_node('weaponHolder/Player-character-theme-gun/shoot_point').get_children(): #if there is gun remove it
x.queue_free() x.queue_free()
@ -344,15 +312,6 @@ func enable_trajectory_line(new_trajectory_line:String):
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(): func _draw():
if debugMode: if debugMode:
for vector_type in VDIR: for vector_type in VDIR:

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

@ -15,6 +15,7 @@ func _ready():
pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position
#func _draw(): #func _draw():
# update() # update()
# if pos.x > 0: # if pos.x > 0:
@ -35,18 +36,18 @@ func _ready():
func trajectory(): func trajectory():
while dot_position.x < 1000: while dot_position.x < 1000:
if true: 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 * 0.06944
time += 0.06944 time += 0.06944
# 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 * 0.06944
# time += 0.06944 time += 0.06944
func _process(_delta): func _process(_delta):
trajectory() trajectory()

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

@ -8,6 +8,8 @@ var time = 0
var a_parameter = 1 var a_parameter = 1
var b_parameter = 0 var b_parameter = 0
var pos_diff = []
var pos var pos
func _ready(): func _ready():
pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position
@ -30,6 +32,7 @@ func _ready():
# #
func trajectory(): func trajectory():
clear_points()
while dot_position.x < 1000: while dot_position.x < 1000:
if pos.x > 0: if pos.x > 0:
add_point(dot_position) add_point(dot_position)
@ -44,7 +47,17 @@ func trajectory():
dot_position += velocity * speed_parab * 0.06944 dot_position += velocity * speed_parab * 0.06944
time += 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): func _process(_delta):
#if is_flipped():
#clear_points()
trajectory() trajectory()
update() update()

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

@ -181,33 +181,48 @@ animations = [ {
}, { }, {
"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], "frames": [ ExtResource( 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,
"name": "boost-speed-right-04", "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 "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 ) ], "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-right-02", "name": "move-speed-left-04",
"speed": 35.0 "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( 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 ) ],
"loop": true, "loop": true,
"name": "move-speed-left-01", "name": "move-speed-left-01",
"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( 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": "idle-speed-left-01", "name": "move-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": "move-speed-right-04",
"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( 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, "loop": true,
"name": "boost-speed-left-03", "name": "move-speed-left-02",
"speed": 50.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( 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,
@ -219,60 +234,35 @@ animations = [ {
"name": "move-speed-left-03", "name": "move-speed-left-03",
"speed": 35.0 "speed": 35.0
}, { }, {
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ],
"loop": true,
"name": "move-speed-right-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": "boost-speed-right-01",
"speed": 50.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": "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": "move-speed-left-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( 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-right-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": "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 ) ], "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-01", "name": "move-speed-left-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( 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",
"speed": 50.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, "loop": true,
"name": "boost-speed-right-02", "name": "boost-speed-right-02",
"speed": 50.0 "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": "idle-speed-right-02",
"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 ) ], "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": "boost-speed-left-01", "name": "idle-speed-left-01",
"speed": 50.0 "speed": 25.0
} ] } ]
[sub_resource type="RectangleShape2D" id=3] [sub_resource type="RectangleShape2D" id=3]
@ -305,7 +295,7 @@ radius = 41.5403
animations = [ { animations = [ {
"frames": [ ExtResource( 170 ) ], "frames": [ ExtResource( 170 ) ],
"loop": true, "loop": true,
"name": "03", "name": "02",
"speed": 5.0 "speed": 5.0
}, { }, {
"frames": [ ExtResource( 27 ) ], "frames": [ ExtResource( 27 ) ],

5
source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn
View File

@ -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] [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"] [node name="Hyperbolic_Barrel" type="Line2D"]
width_curve = SubResource( 1 )
script = ExtResource( 1 ) script = ExtResource( 1 )

8
source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn
View File

@ -7,15 +7,11 @@
radius = 9.85811 radius = 9.85811
height = 35.0082 height = 35.0082
[node name="player_character_bullet" type="Sprite" groups=[ [node name="player_character_bullet" type="Sprite" groups=["Net"]]
"Net",
]]
texture = ExtResource( 1 ) texture = ExtResource( 1 )
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="hitbox" type="Area2D" parent="." groups=[ [node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
"Player_damager",
]]
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
position = Vector2( 10.8253, -0.381073 ) position = Vector2( 10.8253, -0.381073 )

2
source/levels/trinity_site/trinity_site_level_playground.tscn
View File

@ -160,10 +160,10 @@ margin_left = 2.37842
margin_top = -35.5 margin_top = -35.5
margin_right = 2.37842 margin_right = 2.37842
margin_bottom = 106.5 margin_bottom = 106.5
custom_fonts/font = SubResource( 1 )
custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
custom_constants/shadow_offset_x = 6 custom_constants/shadow_offset_x = 6
custom_constants/shadow_offset_y = 6 custom_constants/shadow_offset_y = 6
custom_fonts/font = SubResource( 1 )
text = "You are the winner" text = "You are the winner"
align = 1 align = 1
valign = 1 valign = 1

16
source/scenes/GUI/singleplayer_setup.tscn
View File

@ -12,16 +12,16 @@ use_mipmaps = true
use_filter = true use_filter = true
font_data = ExtResource( 2 ) font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=2]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="DynamicFont" id=4] [sub_resource type="DynamicFont" id=4]
size = 36 size = 36
use_mipmaps = true use_mipmaps = true
use_filter = true use_filter = true
font_data = ExtResource( 2 ) font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=2]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="DynamicFont" id=5] [sub_resource type="DynamicFont" id=5]
size = 36 size = 36
use_mipmaps = true use_mipmaps = true
@ -61,8 +61,8 @@ margin_left = -225.0
margin_top = -25.0 margin_top = -25.0
margin_right = -225.0 margin_right = -225.0
margin_bottom = -25.0 margin_bottom = -25.0
custom_fonts/font = SubResource( 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 1 )
text = "Enter your username" text = "Enter your username"
align = 1 align = 1
valign = 1 valign = 1
@ -93,10 +93,10 @@ margin_left = -175.0
margin_top = -28.0 margin_top = -28.0
margin_right = 175.0 margin_right = 175.0
margin_bottom = 28.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/focus = SubResource( 2 )
custom_styles/normal = SubResource( 3 ) custom_styles/normal = SubResource( 3 )
custom_fonts/font = SubResource( 4 )
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
align = 1 align = 1
placeholder_text = "username" placeholder_text = "username"
__meta__ = { __meta__ = {
@ -117,8 +117,8 @@ margin_bottom = 97.0
[node name="Label" type="Label" parent="popup_screen/panel/confirm"] [node name="Label" type="Label" parent="popup_screen/panel/confirm"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
custom_fonts/font = SubResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 5 )
text = "CONFIRM" text = "CONFIRM"
align = 1 align = 1
valign = 1 valign = 1

8
source/scenes/OVERLAY/elements/Trajectory_Control.gd
View File

@ -12,23 +12,23 @@ func _ready():
func _on_line_pressed(): func _on_line_pressed():
Global.get('player').enable_trajectory_line('line') Global.get('player').enable_trajectory_line('line')
#Global.get('player').choose_trajectory('line') Global.get('player').trajectory = 'line'
pass # Replace with function body. pass # Replace with function body.
func _on_parabol_pressed(): func _on_parabol_pressed():
Global.get('player').enable_trajectory_line('parab') Global.get('player').enable_trajectory_line('parab')
#Global.get('player').choose_trajectory('parab') Global.get('player').trajectory = 'parab'
pass # Replace with function body. pass # Replace with function body.
func _on_hyperbol_pressed(): func _on_hyperbol_pressed():
Global.get('player').enable_trajectory_line('hyper') Global.get('player').enable_trajectory_line('hyper')
#Global.get('player').trajectory_line = 'hyper' Global.get('player').trajectory = 'hyper'
pass # Replace with function body. pass # Replace with function body.
func _on_sine_pressed(): func _on_sine_pressed():
Global.get('player').enable_trajectory_line('sine') Global.get('player').enable_trajectory_line('sine')
#Global.get('player').trajectory_line = 'sine' Global.get('player').trajectory = 'sine'
pass # Replace with function body. pass # Replace with function body.

16
source/scenes/OVERLAY/elements/trajectories.gd Normal file
View File

@ -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.

6
source/scenes/OVERLAY/elements/trajectory_control.tscn
View File

@ -119,6 +119,8 @@ margin_left = -125.0
margin_top = -40.0 margin_top = -40.0
margin_right = -25.0 margin_right = -25.0
margin_bottom = 60.0 margin_bottom = 60.0
focus_mode = 0
enabled_focus_mode = 0
texture_normal = ExtResource( 7 ) texture_normal = ExtResource( 7 )
texture_pressed = ExtResource( 4 ) texture_pressed = ExtResource( 4 )
texture_hover = ExtResource( 4 ) texture_hover = ExtResource( 4 )
@ -153,6 +155,8 @@ margin_left = 5.23596
margin_top = -40.0 margin_top = -40.0
margin_right = 105.236 margin_right = 105.236
margin_bottom = 60.0 margin_bottom = 60.0
focus_mode = 0
enabled_focus_mode = 0
texture_normal = ExtResource( 8 ) texture_normal = ExtResource( 8 )
texture_pressed = ExtResource( 9 ) texture_pressed = ExtResource( 9 )
texture_hover = ExtResource( 9 ) texture_hover = ExtResource( 9 )
@ -188,6 +192,8 @@ margin_left = 135.0
margin_top = -40.0 margin_top = -40.0
margin_right = 235.0 margin_right = 235.0
margin_bottom = 60.0 margin_bottom = 60.0
focus_mode = 0
enabled_focus_mode = 0
texture_normal = ExtResource( 6 ) texture_normal = ExtResource( 6 )
texture_pressed = ExtResource( 5 ) texture_pressed = ExtResource( 5 )
texture_hover = ExtResource( 5 ) texture_hover = ExtResource( 5 )

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

@ -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/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] [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_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/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/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] [sub_resource type="StyleBoxTexture" id=1]
texture = ExtResource( 1 ) texture = ExtResource( 1 )
@ -85,6 +86,7 @@ margin_left = 50.0
margin_top = 28.0 margin_top = 28.0
margin_right = -330.0 margin_right = -330.0
margin_bottom = -28.0 margin_bottom = -28.0
script = ExtResource( 13 )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
@ -123,6 +125,26 @@ __meta__ = {
"_edit_use_anchors_": false "_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"] [node name="parabol" type="Panel" parent="trajectories"]
visible = false visible = false
anchor_left = 0.5 anchor_left = 0.5
@ -228,6 +250,18 @@ __meta__ = {
"_edit_use_anchors_": false "_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="."] [node name="controls" type="Control" parent="."]
margin_left = 165.0 margin_left = 165.0
margin_top = 13.0 margin_top = 13.0
@ -292,3 +326,5 @@ custom_fonts/font = SubResource( 11 )
text = "Skip" text = "Skip"
align = 1 align = 1
valign = 1 valign = 1
[connection signal="text_entered" from="trajectories/line/LineEdit" to="trajectories" method="_on_LineEdit_text_entered"]