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

Revert "Revert "pushed""

Browse Source 
This reverts commit 263490eb418d45297bb56fd31450496c7daefd4c.
This commit is contained in:
Moonshrike 2021-11-15 00:54:58 +02:00
parent dacc55ed48
commit 0e5a47b83a
5 changed files with 82 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,23 +15,40 @@ 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 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: if pos.x > 0:
if dot_position.x < 1000: 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
draw_circle(dot_position, 2, Color(225, 225, 225))
time += 0.06944 time += 0.06944
if pos.x < 0: if pos.x < 0:
if dot_position.x < 1000: 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
draw_circle(dot_position, 2, Color(225, 225, 225))
time += 0.06944 time += 0.06944
func _process(_delta): func _process(_delta):
trajectory()
update() update()

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

@ -8,14 +8,26 @@ var time = 0
var a_parameter = 0 var a_parameter = 0
func _draw(): #func _draw():
if dot_position.x < 1000: # 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.y = 10 * a_parameter
velocity.x = 10 velocity.x = 10
dot_position += velocity * speed * 0.06944 dot_position += velocity * speed * 0.06944
draw_circle(dot_position, 2, Color(225, 225, 225))
time += 0.06944 time += 0.06944
pass
func _process(_delta): func _process(_delta):
trajectory()
update() update()

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

@ -12,23 +12,41 @@ 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
func _draw(): #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: if pos.x > 0:
if dot_position.x < 1000: 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 * 0.06944 dot_position += velocity * speed_parab * 0.06944
draw_circle(dot_position, 2, Color(225, 225, 225))
time += 0.06944 time += 0.06944
if pos.x < 0: if pos.x < 0:
if dot_position.x < 1000: 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 * 0.06944 dot_position += velocity * speed_parab * 0.06944
draw_circle(dot_position, 2, Color(225, 225, 225))
time += 0.06944 time += 0.06944
func _process(_delta): func _process(_delta):
trajectory()
update() update()

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

@ -10,13 +10,23 @@ export var amplitude = 4
export var frequency = 5 export var frequency = 5
func _draw(): #func _draw():
if dot_position.x < 1000: # 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.y = amplitude * cos(time * frequency)
velocity.x = 5 velocity.x = 5
dot_position += velocity * speed * 0.06944 dot_position += velocity * speed * 0.06944
draw_circle(dot_position, 2, Color(225, 225, 225))
time += 0.06944 time += 0.06944
func _process(_delta): func _process(_delta):
trajectory()
update() update()

6
source/scenes/GUI/main_menu.tscn
View File

@ -54,8 +54,8 @@ margin_left = -150.0
margin_top = -36.0 margin_top = -36.0
margin_right = 150.0 margin_right = 150.0
margin_bottom = 36.0 margin_bottom = 36.0
custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 )
text = "PLAY" text = "PLAY"
align = 1 align = 1
valign = 1 valign = 1
@ -79,8 +79,8 @@ margin_left = -98.8223
margin_top = -36.0 margin_top = -36.0
margin_right = 134.178 margin_right = 134.178
margin_bottom = 36.0 margin_bottom = 36.0
custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 )
text = "LAN Party" text = "LAN Party"
align = 1 align = 1
valign = 1 valign = 1
@ -111,8 +111,8 @@ margin_left = -150.0
margin_top = -36.0 margin_top = -36.0
margin_right = 150.0 margin_right = 150.0
margin_bottom = 36.0 margin_bottom = 36.0
custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 )
text = "EXIT" text = "EXIT"
align = 1 align = 1
valign = 1 valign = 1