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

fixed trajectories

Browse Source
This commit is contained in:
Kristofers Solo 2021-11-18 21:47:12 +02:00
parent 7e8eb3d74c
commit 0c37f03d8b
16 changed files with 189 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,11 +110,13 @@ func _ready():
if is_network_master():
Global.player_master = self
Global.set("player", self)
enable_trajectory_line("line")
# Allow update process override.
set_process(true)
$player_animated_sprite.play("idle")
# enable_trajectory_line('line')
func get_user_state():
@ -309,7 +311,6 @@ func enable_trajectory_line(new_trajectory_line:String):
x.queue_free()
var x = bullet_trajectory[new_trajectory_line].instance()
# print(x)
get_node('weaponHolder/Player-character-theme-gun/shoot_point').add_child(x)
@ -379,7 +380,6 @@ func _on_network_tick_rate_timeout():
rset_unreliable("puppet_weapon_position", weaponPosition)
rset_unreliable("puppet_weapon_angle", weaponAngle)
rset_unreliable("puppet_direction", direction)
#rset_unreliable("puppet_character_states", characterStates)
rset_unreliable("puppet_bullet_position", bullet)
if get_tree().is_network_server():
rset_unreliable("puppet_phase", clientPhase)

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

@ -3,12 +3,13 @@ extends Node
var player_master = null
var ui = null
var alive_players = []
var killed_players = []
var player
var global
var control
var user_input
var bot_weapon
var killed_players = []
var clientPhase = {
"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()
text.hide()
# if get_tree().has_network_peer():
# if is_network_master():
Global.set("user_input", null)
Global.start_game(false)

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

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

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

@ -17,18 +17,18 @@ func _ready():
func trajectory(delta):
while dot_position.x < 2000:
if pos.x > 0:
# if pos.x > 0:
add_point(dot_position)
velocity.x = 10
velocity.y = a_parameter/(time*b_parameter)
dot_position += velocity * speed_hyper * delta
time += delta
if pos.x < 0:
add_point(dot_position)
velocity.x = 10
velocity.y = -a_parameter/(time*b_parameter)
dot_position += velocity * speed_hyper * delta
time += delta
# if pos.x < 0:
# add_point(dot_position)
# velocity.x = 10
# velocity.y = -a_parameter/(time*b_parameter)
# dot_position += velocity * speed_hyper * delta
# time += delta
func _process(delta):
trajectory(delta)

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

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

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

@ -5,20 +5,25 @@ var velocity = Vector2(0, 0)
var dot_position = Vector2(0, 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 trajectory():
func trajectory(delta):
while dot_position.x < 2000:
add_point(dot_position)
velocity.y = 10 * a_parameter
velocity.x = 10
dot_position += velocity * speed * 0.06944
time += 0.06944
dot_position += velocity * speed * delta
time += delta
pass
func _process(_delta):
trajectory()
func _process(delta):
trajectory(delta)
update()

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

@ -6,12 +6,16 @@ var velocity = Vector2()
var player_owner = 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 follow_line_trajectory():
velocity.x = time
velocity.y = time*a_parameter

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

@ -19,18 +19,18 @@ func _ready():
func trajectory(delta):
while dot_position.x < 2000:
if pos.x > 0:
# if pos.x > 0:
add_point(dot_position)
velocity.y = time*(a_parameter * time + b_parameter)
velocity.x = 5
dot_position += velocity * speed_parab * delta
time += delta
if pos.x < 0:
add_point(dot_position)
velocity.y = -time*(a_parameter * time + b_parameter)
velocity.x = 5
dot_position += velocity * speed_parab * delta
time += delta
# if pos.x < 0:
# add_point(dot_position)
# velocity.y = -time*(a_parameter * time + b_parameter)
# velocity.x = 5
# dot_position += velocity * speed_parab * delta
# time += delta
func _process(delta):

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

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

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

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

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

@ -13,53 +13,53 @@ var amp = 5
# Called when the node enters the scene tree for the first time.
func _ready():
Global.set('user_input', self)
Global.set("user_input", self)
func _on_line_SpinBox_value_changed(value):
a_param_line = 0
a_param_line = value
Global.get('player').enable_trajectory_line('line')
Global.get('player').trajectory = 'line'
Global.get("player").enable_trajectory_line("line")
Global.get("player").trajectory = "line"
func _on_a_param_SpinBox_value_changed(value):
a_param_parab = value
Global.get('player').enable_trajectory_line('parab')
Global.get('player').trajectory = 'parab'
Global.get("player").enable_trajectory_line("parab")
Global.get("player").trajectory = "parab"
func _on_b_param_SpinBox_value_changed(value):
b_param_parab = value
Global.get('player').enable_trajectory_line('parab')
Global.get('player').trajectory = 'parab'
Global.get("player").enable_trajectory_line("parab")
Global.get("player").trajectory = "parab"
func _on_b_param_h_SpinBox_value_changed(value):
b_param_hyper = value
if b_param_hyper != 0:
Global.get('player').enable_trajectory_line('hyper')
Global.get('player').trajectory = 'hyper'
Global.get("player").enable_trajectory_line("hyper")
Global.get("player").trajectory = "hyper"
func _on_a_param_h_SpinBox_value_changed(value):
a_param_hyper = value
Global.get('player').enable_trajectory_line('hyper')
Global.get('player').trajectory = 'hyper'
Global.get("player").enable_trajectory_line("hyper")
Global.get("player").trajectory = "hyper"
func _on_amp_SpinBox_value_changed(value):
amp = value
Global.get('player').enable_trajectory_line('sine')
Global.get('player').trajectory = 'sine'
Global.get("player").enable_trajectory_line("sine")
Global.get("player").trajectory = "sine"
func _on_freq_SpinBox_value_changed(value):
freq = value
Global.get('player').enable_trajectory_line('sine')
Global.get('player').trajectory = 'sine'
Global.get("player").enable_trajectory_line("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:
# print(Global.alive_players.size())
if Global.killed_players.size() >= 1:
lose_screen.show()
else:

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

@ -1,4 +1,4 @@
[gd_scene load_steps=175 format=2]
[gd_scene load_steps=177 format=2]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/na/Player-character-theme-01.png" type="Texture" id=1]
[ext_resource path="res://source/assets/scripts/player_handlers/player_collider_handler.gd" type="Script" id=2]
@ -15,6 +15,7 @@
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 7.png" type="Texture" id=13]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 12.png" type="Texture" id=14]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 10.png" type="Texture" id=15]
[ext_resource path="res://source/assets/sprites/character/player/theme/03/na/Player-character-theme-gun-03.png" type="Texture" id=16]
[ext_resource path="res://source/assets/sprites/character/player/player_dead/player_character_theme_dead.svg" type="Texture" id=17]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 18.png" type="Texture" id=18]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/right_r/Player-character-theme-01_anim-idle – 34.png" type="Texture" id=19]
@ -25,6 +26,7 @@
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/right_r/Player-character-theme-01_anim-idle – 24.png" type="Texture" id=24]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/right_r/Player-character-theme-01_anim-idle – 36.png" type="Texture" id=25]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/na/Player-character-theme-particle-01.svg" type="Texture" id=26]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/na/Player-character-theme-gun-01.png" type="Texture" id=27]
[ext_resource path="res://source/assets/sprites/character/player/theme/03/animation/left_r/Player-character-theme-01_anim-idle – 64.png" type="Texture" id=28]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/right_r/Player-character-theme-01_anim-idle – 35.png" type="Texture" id=29]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/right_r/Player-character-theme-01_anim-idle – 27.png" type="Texture" id=30]
@ -171,35 +173,25 @@
[sub_resource type="SpriteFrames" id=1]
animations = [ {
"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( 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( 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( 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( 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( 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-right-03",
"name": "boost-speed-left-01",
"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( 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-04",
"speed": 35.0
"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,
@ -208,19 +200,14 @@ animations = [ {
}, {
"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",
"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( 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( 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-01",
"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-04",
@ -228,27 +215,7 @@ animations = [ {
}, {
"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( 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( 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( 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( 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",
"name": "move-speed-right-03",
"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 ) ],
@ -258,27 +225,62 @@ animations = [ {
}, {
"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
"name": "move-speed-left-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": "idle-speed-right-04",
"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 ) ],
"loop": true,
"name": "idle-speed-right-03",
"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 ) ],
"loop": true,
"name": "boost-speed-right-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": "idle-speed-left-04",
"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( 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": "move-speed-left-03",
"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( 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( 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": "boost-speed-right-02",
"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 ) ],
"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-left-04",
"speed": 55.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": "move-speed-left-03",
"name": "move-speed-right-01",
"speed": 35.0
} ]
@ -312,9 +314,9 @@ radius = 41.5403
[sub_resource type="SpriteFrames" id=6]
animations = [ {
"frames": [ ExtResource( 27 ) ],
"frames": [ ExtResource( 169 ) ],
"loop": true,
"name": "01",
"name": "04",
"speed": 5.0
}, {
"frames": [ ExtResource( 170 ) ],
@ -322,15 +324,15 @@ animations = [ {
"name": "02",
"speed": 5.0
}, {
"frames": [ ExtResource( 27 ) ],
"loop": true,
"name": "01",
"speed": 5.0
}, {
"frames": [ ExtResource( 16 ) ],
"loop": true,
"name": "03",
"speed": 5.0
}, {
"frames": [ ExtResource( 169 ) ],
"loop": true,
"name": "04",
"speed": 5.0
} ]
[node name="player" type="KinematicBody2D" groups=[
@ -364,7 +366,7 @@ wait_time = 0.03
autostart = true
[node name="reload_timer" type="Timer" parent="."]
wait_time = 0.7
wait_time = 0.15
one_shot = true
[node name="hit_timer" type="Timer" parent="."]
@ -389,7 +391,7 @@ texture = ExtResource( 26 )
shape = SubResource( 5 )
[node name="Player-character-theme-gun-na3" type="Sprite" parent="weaponHolder"]
scale = Vector2( 0.25, 0.25 )
scale = Vector2( 0.3, 0.25 )
texture = ExtResource( 171 )
[node name="Player-character-theme-gun" type="AnimatedSprite" parent="weaponHolder"]
@ -403,6 +405,7 @@ rotation = 3.14159
scale = Vector2( 4, 4 )
[node name="player_character_theme_dead" type="Sprite" parent="."]
visible = false
texture = ExtResource( 17 )
[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 )
[node name="win_lose_screen" parent="game_UI" instance=ExtResource( 12 )]
visible = false
position = Vector2( 0, 360 )
script = ExtResource( 4 )

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

@ -355,8 +355,8 @@ anchor_bottom = 1.0
margin_left = -39.0
margin_top = -19.0
margin_right = 39.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 10 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "parabol"
align = 1
valign = 1
@ -439,8 +439,8 @@ anchor_bottom = 1.0
margin_left = -39.0
margin_top = -19.0
margin_right = 40.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 10 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "hyperbol"
align = 1
valign = 1
@ -481,8 +481,8 @@ anchor_bottom = 1.0
margin_left = -39.0
margin_top = -19.0
margin_right = 39.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 10 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "sine"
align = 1
valign = 1