mirror of
https://github.com/kristoferssolo/FuncIt.git
synced 2025-10-21 19:30:35 +00:00
Merge branch 'master' into client-sync
This commit is contained in:
Kristofers Solo
commit
d0e51943f1
@ -116,7 +116,7 @@ hyper={
|
||||
}
|
||||
parab={
|
||||
"deadzone": 0.5,
|
||||
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777354,"unicode":0,"echo":false,"script":null)
|
||||
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777354,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ func _process(delta):
|
||||
# Get the active player and allow their input into adjusting function.
|
||||
print("Awaiting player input and processing it to adjust aim.")
|
||||
# DO FOR EACH PLAYER - AT THE SAME TIME
|
||||
if gameControllerStates["allowShooot"]:
|
||||
if gameControllerStates["allowShoot"]:
|
||||
# Enable function locking feature and prepare for shooting phase -- simulatingEnvironment = true
|
||||
print("Awaiting player function confirmation.")
|
||||
# DO FOR EACH PLAYER - AT THE SAME TIME
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
extends AnimatedSprite
|
||||
|
||||
var trajectory:String = 'line'
|
||||
var trajectory_line = 'line'
|
||||
|
||||
var bullet_trajectory = {
|
||||
'line' : preload("res://source/entities/shooting/Line_Trajectory/Line_Env.tscn"),
|
||||
@ -10,25 +11,42 @@ var bullet_trajectory = {
|
||||
}
|
||||
|
||||
func choose_trajectory():
|
||||
trajectory
|
||||
trajectory_line
|
||||
if Input.is_action_just_pressed("line"):
|
||||
trajectory = 'line'
|
||||
trajectory_line = 'line'
|
||||
elif Input.is_action_just_pressed("sine"):
|
||||
trajectory = 'sine'
|
||||
trajectory_line = 'sine'
|
||||
elif Input.is_action_just_pressed("parab"):
|
||||
trajectory = 'parab'
|
||||
trajectory_line = 'parab'
|
||||
elif Input.is_action_just_pressed("hyper"):
|
||||
trajectory = 'hyper'
|
||||
trajectory_line = 'hyper'
|
||||
|
||||
|
||||
func shoot(trajectory:String):
|
||||
var bullet = bullet_trajectory[trajectory].instance()
|
||||
get_parent().get_parent().get_parent().add_child(bullet)
|
||||
bullet.global_position = $Position2D.global_position
|
||||
bullet.global_rotation = $Position2D.global_rotation
|
||||
bullet.global_position = $Shooting_Point.global_position
|
||||
bullet.global_rotation = $Shooting_Point.global_rotation
|
||||
pass
|
||||
|
||||
|
||||
func enable_trajectory_line(trajectory_line:String):
|
||||
var x = bullet_trajectory[trajectory_line].instance()
|
||||
get_parent().get_parent().get_parent().add_child(x)
|
||||
x.global_position = $Shooting_Point.global_position
|
||||
x.global_rotation = $Shooting_Point.global_rotation
|
||||
|
||||
|
||||
|
||||
func _process(delta):
|
||||
choose_trajectory()
|
||||
enable_trajectory_line(trajectory_line)
|
||||
if Input.is_action_just_pressed("input_shoot"):
|
||||
pass
|
||||
elif Input.is_action_just_released("input_shoot"):
|
||||
shoot(trajectory)
|
||||
|
||||
@ -1,16 +1,21 @@
|
||||
extends StaticBody2D # Y = aX
|
||||
extends Line2D
|
||||
|
||||
onready var bullet_env = preload("res://source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn")
|
||||
|
||||
|
||||
func shoot():
|
||||
var bullet = bullet_env.instance()
|
||||
get_parent().get_parent().get_parent().add_child(bullet)
|
||||
bullet.global_position = $Position2D.global_position
|
||||
bullet.global_rotation = $Position2D.global_rotation
|
||||
export var speed_hyper = 100
|
||||
var velocity = Vector2(0, 0)
|
||||
var dot_position = Vector2(0, 0)
|
||||
|
||||
var time = 0.05
|
||||
var a_parameter = 1
|
||||
var b_parameter = 1
|
||||
|
||||
|
||||
func _draw():
|
||||
velocity.x = 10
|
||||
velocity.y = a_parameter/(time*b_parameter)
|
||||
dot_position += velocity * speed_hyper * 0.06944
|
||||
draw_circle(dot_position, 1, Color(225, 225, 225))
|
||||
time += 0.06944
|
||||
|
||||
func _process(delta):
|
||||
if Input.is_action_just_pressed("input_shoot"):
|
||||
shoot()
|
||||
update()
|
||||
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
extends Sprite
|
||||
|
||||
var velocity = Vector2()
|
||||
var speed = 1
|
||||
var time = 0.5
|
||||
var gravitile = 5
|
||||
var speed_hyper = 100
|
||||
var time = 0.05
|
||||
var a_parameter = 1
|
||||
var b_parameter = 1
|
||||
|
||||
|
||||
|
||||
func follow_hyperbolic_trajectory():
|
||||
velocity.x = gravitile * time
|
||||
velocity.y = 1 / time
|
||||
velocity.x = 5
|
||||
velocity.y = a_parameter/(time*b_parameter)
|
||||
|
||||
|
||||
func _process(delta):
|
||||
follow_hyperbolic_trajectory()
|
||||
time += delta
|
||||
position += velocity * speed * delta
|
||||
position += velocity * speed_hyper * delta
|
||||
|
||||
|
||||
func _on_hitbox_body_entered(body):
|
||||
|
||||
@ -1,16 +1,20 @@
|
||||
extends StaticBody2D # Y = aX
|
||||
extends Line2D
|
||||
|
||||
onready var bullet_env = preload("res://source/entities/shooting/Line_Trajectory/Line_Env.tscn")
|
||||
|
||||
|
||||
func shoot():
|
||||
var bullet = bullet_env.instance()
|
||||
get_parent().get_parent().get_parent().add_child(bullet)
|
||||
bullet.global_position = $Position2D.global_position
|
||||
bullet.global_rotation = $Position2D.global_rotation
|
||||
export var speed = 100
|
||||
var velocity = Vector2(0, 0)
|
||||
var dot_position = Vector2(0, 0)
|
||||
|
||||
var time = 0
|
||||
var a_parameter = 0
|
||||
|
||||
|
||||
func _draw():
|
||||
velocity.y = 10 * a_parameter
|
||||
velocity.x = 10
|
||||
dot_position += velocity * speed * 0.06944
|
||||
draw_circle(dot_position, 1, Color(225, 225, 225))
|
||||
time += 0.06944
|
||||
|
||||
func _process(delta):
|
||||
if Input.is_action_just_pressed("input_shoot"):
|
||||
shoot()
|
||||
update()
|
||||
|
||||
|
||||
@ -1,37 +1,22 @@
|
||||
extends Sprite
|
||||
|
||||
export var speed = 100
|
||||
export var speed_line = 1000
|
||||
var velocity = Vector2()
|
||||
|
||||
var time = 0
|
||||
var a_parameter = 0
|
||||
|
||||
|
||||
func follow_line_trajectory():
|
||||
velocity = Vector2(10, 0)
|
||||
velocity.x = time
|
||||
velocity.y = time*a_parameter
|
||||
|
||||
#func follow_parabolic_trajectory():
|
||||
#velocity.x = 5
|
||||
#velocity.y = 1 * time * gravitile
|
||||
#return velocity
|
||||
|
||||
#func follow_hyperbolic_trajectory():
|
||||
#velocity.x = gravitile * time
|
||||
#velocity.y = 1
|
||||
#return velocity
|
||||
|
||||
#func input():
|
||||
#if Input.is_action_just_pressed("line"):
|
||||
#return follow_sine_trajectory()
|
||||
#elif Input.is_action_just_pressed("sine"):
|
||||
#return follow_line_trajectory()
|
||||
#else:
|
||||
#print('Trajectory is not selected')
|
||||
#queue_free()
|
||||
|
||||
func _process(delta):
|
||||
follow_line_trajectory()
|
||||
time += delta
|
||||
position += velocity * speed * delta
|
||||
position += velocity * speed_line * delta
|
||||
|
||||
|
||||
func _on_hitbox_body_entered(body):
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
extends StaticBody2D # Y = aX
|
||||
extends Line2D
|
||||
|
||||
onready var bullet_env = preload("res://source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn")
|
||||
|
||||
|
||||
func shoot():
|
||||
var bullet = bullet_env.instance()
|
||||
get_parent().get_parent().get_parent().add_child(bullet)
|
||||
bullet.global_position = $Position2D.global_position
|
||||
bullet.global_rotation = $Position2D.global_rotation
|
||||
var speed_parab = 100
|
||||
var velocity = Vector2(0, 0)
|
||||
var dot_position = Vector2(0, 0)
|
||||
|
||||
var time = 0
|
||||
var a_parameter = 1
|
||||
var b_parameter = 0
|
||||
|
||||
|
||||
func _draw():
|
||||
velocity.y = time*(a_parameter * time + b_parameter)
|
||||
velocity.x = 5
|
||||
dot_position += velocity * speed_parab * 0.06944
|
||||
draw_circle(dot_position, 1, Color(225, 225, 225))
|
||||
time += 0.06944
|
||||
|
||||
func _process(delta):
|
||||
if Input.is_action_just_pressed("input_shoot"):
|
||||
shoot()
|
||||
update()
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
extends Area2D
|
||||
extends Sprite
|
||||
|
||||
export var speed = 100
|
||||
export var speed_parab = 100
|
||||
var velocity = Vector2()
|
||||
|
||||
var time = 0
|
||||
var gravitile = 5
|
||||
var a_parameter = 1
|
||||
var b_parameter = 0
|
||||
|
||||
|
||||
func follow_parabolic_trajectory():
|
||||
velocity.x = 5
|
||||
velocity.y = 1 * time * gravitile
|
||||
velocity.y = time*(a_parameter * time + b_parameter)
|
||||
|
||||
|
||||
func _process(delta):
|
||||
follow_parabolic_trajectory()
|
||||
time += delta
|
||||
position += velocity * speed * delta
|
||||
position += velocity * speed_parab * delta
|
||||
|
||||
|
||||
func _on_hitbox_body_entered(body):
|
||||
|
||||
@ -4,30 +4,18 @@ extends Line2D
|
||||
export var speed = 100
|
||||
var velocity = Vector2(0, 0)
|
||||
var dot_position = Vector2(0, 0)
|
||||
var dot_array:PoolVector2Array = []
|
||||
|
||||
var time = 0
|
||||
export var amplitude = 4
|
||||
export var frequency = 5
|
||||
|
||||
var maxpoints = 15
|
||||
|
||||
|
||||
func follow_sine_trajectory(time):
|
||||
for x in range(maxpoints):
|
||||
velocity.y = amplitude * cos(time * frequency)
|
||||
velocity.x = 5
|
||||
dot_position += velocity
|
||||
dot_array.append(dot_position)
|
||||
return dot_array
|
||||
|
||||
func construct_a_line():
|
||||
clear_points()
|
||||
for x in range(maxpoints):
|
||||
add_point(follow_sine_trajectory(x))
|
||||
pass
|
||||
func _draw():
|
||||
velocity.y = amplitude * cos(time * frequency)
|
||||
velocity.x = 5
|
||||
dot_position += velocity * speed * 0.06944
|
||||
draw_circle(dot_position, 1, Color(225, 225, 225))
|
||||
time += 0.06944
|
||||
|
||||
func _process(delta):
|
||||
time += delta
|
||||
self.points = follow_sine_trajectory(time)
|
||||
pass
|
||||
update()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
extends Area2D
|
||||
extends Sprite
|
||||
|
||||
export var speed = 100
|
||||
var velocity = Vector2()
|
||||
@ -7,7 +7,6 @@ var time = 0
|
||||
export var amplitude = 4
|
||||
export var frequency = 5
|
||||
|
||||
|
||||
func follow_sine_trajectory():
|
||||
velocity.y = amplitude * cos(time * frequency)
|
||||
velocity.x = 5
|
||||
|
||||
@ -180,31 +180,16 @@ animations = [ {
|
||||
"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( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ],
|
||||
"loop": true,
|
||||
"name": "move-speed-left-01",
|
||||
"speed": 35.0
|
||||
"name": "boost-speed-right-04",
|
||||
"speed": 50.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ],
|
||||
"loop": true,
|
||||
"name": "boost-speed-right-03",
|
||||
"speed": 50.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 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": "idle-speed-left-02",
|
||||
"speed": 25.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
|
||||
"loop": true,
|
||||
"name": "idle-speed-right-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": "move-speed-left-02",
|
||||
"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",
|
||||
@ -220,10 +205,10 @@ animations = [ {
|
||||
"name": "idle-speed-left-04",
|
||||
"speed": 25.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ],
|
||||
"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-03",
|
||||
"speed": 50.0
|
||||
"name": "move-speed-left-02",
|
||||
"speed": 35.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ],
|
||||
"loop": true,
|
||||
@ -245,11 +230,6 @@ animations = [ {
|
||||
"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": "boost-speed-right-04",
|
||||
"speed": 50.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
|
||||
"loop": true,
|
||||
"name": "move-speed-right-01",
|
||||
@ -260,15 +240,30 @@ animations = [ {
|
||||
"name": "move-speed-left-03",
|
||||
"speed": 35.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
|
||||
"loop": true,
|
||||
"name": "move-speed-left-01",
|
||||
"speed": 35.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ],
|
||||
"loop": true,
|
||||
"name": "boost-speed-left-03",
|
||||
"speed": 50.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ],
|
||||
"loop": true,
|
||||
"name": "move-speed-right-02",
|
||||
"speed": 35.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ],
|
||||
"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-04",
|
||||
"speed": 35.0
|
||||
"name": "idle-speed-right-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": "idle-speed-left-02",
|
||||
"speed": 25.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ],
|
||||
"loop": true,
|
||||
@ -279,6 +274,11 @@ animations = [ {
|
||||
"loop": true,
|
||||
"name": "idle-speed-left-01",
|
||||
"speed": 25.0
|
||||
}, {
|
||||
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ],
|
||||
"loop": true,
|
||||
"name": "move-speed-left-04",
|
||||
"speed": 35.0
|
||||
} ]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=3]
|
||||
@ -389,7 +389,7 @@ frames = SubResource( 6 )
|
||||
animation = "04"
|
||||
script = ExtResource( 16 )
|
||||
|
||||
[node name="Position2D" type="Position2D" parent="weaponHolder/Player-character-theme-gun"]
|
||||
[node name="Shooting_Point" type="Position2D" parent="weaponHolder/Player-character-theme-gun"]
|
||||
position = Vector2( -120, 0 )
|
||||
rotation = 3.14159
|
||||
scale = Vector2( 4, 4 )
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
[gd_scene load_steps=2 format=2]
|
||||
[gd_scene load_steps=3 format=2]
|
||||
|
||||
[ext_resource path="res://source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd" type="Script" id=1]
|
||||
|
||||
[sub_resource type="Curve" id=1]
|
||||
|
||||
[node name="Hyperbolic_Barrel" type="Line2D"]
|
||||
width_curve = SubResource( 1 )
|
||||
script = ExtResource( 1 )
|
||||
|
||||
@ -5,15 +5,11 @@
|
||||
|
||||
[sub_resource type="CapsuleShape2D" id=1]
|
||||
|
||||
[node name="playert_bullet" type="Sprite" groups=[
|
||||
"Net",
|
||||
]]
|
||||
[node name="playert_bullet" type="Sprite" groups=["Net"]]
|
||||
texture = ExtResource( 1 )
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="hitbox" type="Area2D" parent="." groups=[
|
||||
"Player_damager",
|
||||
]]
|
||||
[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
|
||||
rotation = 1.5708
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
[gd_scene format=2]
|
||||
[gd_scene load_steps=2 format=2]
|
||||
|
||||
[ext_resource path="res://source/assets/scripts/shooting/Line/Line_Barrel.gd" type="Script" id=1]
|
||||
|
||||
[node name="Line_Barrel" type="Line2D"]
|
||||
script = ExtResource( 1 )
|
||||
|
||||
@ -5,15 +5,11 @@
|
||||
|
||||
[sub_resource type="CapsuleShape2D" id=1]
|
||||
|
||||
[node name="player_bullet" type="Sprite" groups=[
|
||||
"Net",
|
||||
]]
|
||||
[node name="player_bullet" type="Sprite" groups=["Net"]]
|
||||
texture = ExtResource( 1 )
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="hitbox" type="Area2D" parent="." groups=[
|
||||
"Player_damager",
|
||||
]]
|
||||
[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
|
||||
rotation = 1.5708
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
[gd_scene format=2]
|
||||
[gd_scene load_steps=2 format=2]
|
||||
|
||||
[ext_resource path="res://source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd" type="Script" id=1]
|
||||
|
||||
[node name="Parabolic_Barrel" type="Line2D"]
|
||||
script = ExtResource( 1 )
|
||||
|
||||
@ -5,15 +5,11 @@
|
||||
|
||||
[sub_resource type="CapsuleShape2D" id=1]
|
||||
|
||||
[node name="player_bullet" type="Sprite" groups=[
|
||||
"Net",
|
||||
]]
|
||||
[node name="player_bullet" type="Sprite" groups=["Net"]]
|
||||
texture = ExtResource( 1 )
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="hitbox" type="Area2D" parent="." groups=[
|
||||
"Player_damager",
|
||||
]]
|
||||
[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
|
||||
rotation = 1.5708
|
||||
|
||||
@ -5,15 +5,11 @@
|
||||
|
||||
[sub_resource type="CapsuleShape2D" id=1]
|
||||
|
||||
[node name="player_bullet" type="Sprite" groups=[
|
||||
"Net",
|
||||
]]
|
||||
[node name="player_bullet" type="Sprite" groups=["Net"]]
|
||||
texture = ExtResource( 1 )
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="hitbox" type="Area2D" parent="." groups=[
|
||||
"Player_damager",
|
||||
]]
|
||||
[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
|
||||
rotation = 1.5708
|
||||
|
||||
@ -31,6 +31,11 @@ __meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="FunCitGameLogoDarkTransparent" type="Sprite" parent="foreground"]
|
||||
position = Vector2( 980, 333.502 )
|
||||
scale = Vector2( 0.462963, 0.462963 )
|
||||
texture = ExtResource( 4 )
|
||||
|
||||
[node name="play" parent="foreground" instance=ExtResource( 7 )]
|
||||
margin_left = 810.0
|
||||
margin_top = 500.0
|
||||
@ -124,11 +129,6 @@ __meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="FunCitGameLogoDarkTransparent" type="Sprite" parent="."]
|
||||
position = Vector2( 980, 335 )
|
||||
scale = Vector2( 0.462963, 0.462963 )
|
||||
texture = ExtResource( 4 )
|
||||
|
||||
[connection signal="pressed" from="foreground/play" to="." method="_on_play_pressed"]
|
||||
[connection signal="pressed" from="foreground/LAN_party" to="." method="_on_LAN_party_pressed"]
|
||||
[connection signal="pressed" from="foreground/exit" to="." method="_on_exit_pressed"]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user