kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2026-03-22 00:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fully working input

Browse Source 
needs some adjustments
This commit is contained in:
Moonshrike
2021-11-16 13:17:38 +02:00
parent 3b81f718c8
commit 0af4721c06
13 changed files with 217 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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": {

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

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

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

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

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

@@ -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():

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

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

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

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

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

@@ -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():

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

@@ -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():

4
source/assets/scripts/shooting/Sine/Sine_Bullet.gd
View File

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