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 'master' of github.com:KristofersSolo/Godot

Browse Source
This commit is contained in:
Kristofers-Solo 2021-11-12 02:16:27 +02:00
commit eb09bfbf02
17 changed files with 318 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
icon.png.import
View File

@ -1,35 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://icon.png"
dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

38
project.godot
View File

@ -42,42 +42,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={
@ -87,37 +87,37 @@ 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={

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

@ -14,6 +14,7 @@ var hp = 100 setget set_hp
var can_shoot = true var can_shoot = true
var is_reloading = false var is_reloading = false
puppet var puppet_hp = 100 setget puppet_hp_set puppet var puppet_hp = 100 setget puppet_hp_set
puppet var puppet_position = Vector2(0, 0) setget puppet_position_set puppet var puppet_position = Vector2(0, 0) setget puppet_position_set
puppet var puppet_velocity = Vector2() puppet var puppet_velocity = Vector2()
@ -85,6 +86,9 @@ var particleTexture = ImageTexture.new()
var particleImage = Image.new() var particleImage = Image.new()
func _ready(): func _ready():
Global.set("player", self)
weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na3".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na3".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na3".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na3".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na3".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na3".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na3".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na3".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0)
$"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset $"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset
@ -142,9 +146,9 @@ func process_rotation():
func _process(delta: float) -> void: func _process(delta: float) -> void:
$"weaponHolder/Player-character-theme-gun".play(theme) #$"weaponHolder/Player-character-theme-gun".play(theme)
particleImage.load("res://source/assets/sprites/character/player/theme/" + theme + "/na/Player-character-theme-particle-"+theme+".png") #particleImage.load("res://source/assets/sprites/character/player/theme/" + theme + "/na/Player-character-theme-particle-"+theme+".png")
particleTexture.create_from_image(particleImage) #particleTexture.create_from_image(particleImage)
$Particles2D.texture = particleTexture $Particles2D.texture = particleTexture
if username_text_instance != null: if username_text_instance != null:
username_text_instance.name = "username" + name username_text_instance.name = "username" + name
@ -279,16 +283,21 @@ func _physics_process(delta) -> void:
func choose_trajectory(): func choose_trajectory():
Global.get('line_button')
Global.get('sine_button')
Global.get('parab_button')
Global.get('hyper_button')
if Input.is_action_just_pressed("line"): if Input.is_action_just_pressed("line"):
trajectory = 'line' trajectory = 'line'
trajectory_line = 'line' trajectory_line = 'line'
elif Input.is_action_just_pressed("sine"): if Input.is_action_just_pressed("sine"):
trajectory = 'sine' trajectory = 'sine'
trajectory_line = 'sine' trajectory_line = 'sine'
elif Input.is_action_just_pressed("parab"): if Input.is_action_just_pressed("parab"):
trajectory = 'parab' trajectory = 'parab'
trajectory_line = 'parab' trajectory_line = 'parab'
elif Input.is_action_just_pressed("hyper"): if Input.is_action_just_pressed("hyper"):
trajectory = 'hyper' trajectory = 'hyper'
trajectory_line = 'hyper' trajectory_line = 'hyper'

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

@ -3,6 +3,12 @@ extends Node
var player_master = null var player_master = null
var ui = null var ui = null
var alive_players = [] var alive_players = []
var player
var line_button
var sine_button
var parab_button
var hyper_button
var global
func instance_node_at_location(node: Object, parent: Object, location: Vector2) -> Object: func instance_node_at_location(node: Object, parent: Object, location: Vector2) -> Object:

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

@ -4,18 +4,36 @@ export var speed_hyper = 100
var velocity = Vector2(0, 0) var velocity = Vector2(0, 0)
var dot_position = Vector2(0, 0) var dot_position = Vector2(0, 0)
var x = 10
var time = 0.05 var time = 0.05
var a_parameter = 1 var a_parameter = 1
var b_parameter = 1 var b_parameter = 1
var pos
func _ready():
pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position
func _draw(): func _draw():
update()
if pos.x > 0:
if dot_position.x < 1000:
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, 1, Color(225, 225, 225)) draw_circle(dot_position, 2, Color(225, 225, 225))
time += 0.06944 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 _process(delta): func _process(delta):
update() update()
pass

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

@ -8,12 +8,17 @@ var a_parameter = 1
var b_parameter = 1 var b_parameter = 1
var player_owner = 0 var player_owner = 0
var pos
func _ready():
pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position
func follow_hyperbolic_trajectory(): func follow_hyperbolic_trajectory():
if pos.x > 0:
velocity.x = 5 velocity.x = 5
velocity.y = a_parameter/(time*b_parameter) velocity.y = a_parameter/(time*b_parameter)
if pos.x < 0:
velocity.x = 5
velocity.y = -a_parameter/(time*b_parameter)
func _process(delta): func _process(delta):
follow_hyperbolic_trajectory() follow_hyperbolic_trajectory()

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

@ -9,10 +9,11 @@ var a_parameter = 0
func _draw(): func _draw():
if dot_position.x < 1000:
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, 1, Color(225, 225, 225)) draw_circle(dot_position, 2, Color(225, 225, 225))
time += 0.06944 time += 0.06944
func _process(delta): func _process(delta):

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

@ -8,12 +8,24 @@ var time = 0
var a_parameter = 1 var a_parameter = 1
var b_parameter = 0 var b_parameter = 0
var pos
func _ready():
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.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, 1, Color(225, 225, 225)) 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 time += 0.06944
func _process(delta): func _process(delta):

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

@ -9,10 +9,18 @@ var time = 0
var a_parameter = 1 var a_parameter = 1
var b_parameter = 0 var b_parameter = 0
var pos
func _ready():
pos = Global.get("player").get_node('weaponHolder/Player-character-theme-gun').position
func follow_parabolic_trajectory(): func follow_parabolic_trajectory():
if pos.x > 0:
velocity.x = 5 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): func _process(delta):

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

@ -11,10 +11,11 @@ export var frequency = 5
func _draw(): func _draw():
if dot_position.x < 1000:
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, 1, Color(225, 225, 225)) draw_circle(dot_position, 2, Color(225, 225, 225))
time += 0.06944 time += 0.06944
func _process(delta): func _process(delta):

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

@ -173,26 +173,45 @@
[sub_resource type="SpriteFrames" id=2] [sub_resource type="SpriteFrames" id=2]
animations = [ { animations = [ {
<<<<<<< Updated upstream
=======
"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( 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
}, {
>>>>>>> Stashed changes
"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": "idle-speed-right-04", "name": "move-speed-right-04",
"speed": 25.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 ) ],
"loop": true,
"name": "boost-speed-left-03",
"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 ) ], "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, "loop": true,
"name": "move-speed-right-01", "name": "move-speed-right-01",
"speed": 35.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( 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, "loop": true,
"name": "move-speed-left-04", "name": "idle-speed-right-01",
"speed": 35.0 "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 ) ], "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, "loop": true,
"name": "move-speed-right-04", "name": "boost-speed-right-01",
"speed": 35.0 "speed": 50.0
}, { }, {
<<<<<<< Updated upstream
"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( 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, "loop": true,
"name": "move-speed-left-03", "name": "move-speed-left-03",
@ -202,12 +221,24 @@ animations = [ {
"loop": true, "loop": true,
"name": "move-speed-right-03", "name": "move-speed-right-03",
"speed": 35.0 "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( 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": 50.0
>>>>>>> Stashed changes
}, { }, {
"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( 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": "move-speed-right-02", "name": "move-speed-right-02",
"speed": 35.0 "speed": 35.0
}, { }, {
<<<<<<< Updated upstream
"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",
@ -229,10 +260,24 @@ animations = [ {
"speed": 25.0 "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 ) ], "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 ) ],
=======
"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, "loop": true,
"name": "move-speed-left-02", "name": "boost-speed-right-03",
"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": "move-speed-right-03",
"speed": 35.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 ) ],
>>>>>>> Stashed changes
"loop": true,
"name": "move-speed-left-04",
"speed": 35.0
}, {
<<<<<<< Updated upstream
"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( 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, "loop": true,
"name": "boost-speed-right-03", "name": "boost-speed-right-03",
@ -244,17 +289,30 @@ animations = [ {
"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( 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 ) ],
>>>>>>> Stashed changes
"loop": true, "loop": true,
"name": "idle-speed-right-02", "name": "idle-speed-left-04",
"speed": 25.0 "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": "boost-speed-right-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,
<<<<<<< Updated upstream
"name": "boost-speed-right-01",
=======
"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 ) ],
"loop": true,
"name": "boost-speed-left-01",
>>>>>>> Stashed changes
"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,
<<<<<<< Updated upstream
"name": "idle-speed-left-01", "name": "idle-speed-left-01",
"speed": 25.0 "speed": 25.0
}, { }, {
@ -262,9 +320,19 @@ animations = [ {
"loop": true, "loop": true,
"name": "idle-speed-left-02", "name": "idle-speed-left-02",
"speed": 25.0 "speed": 25.0
=======
"name": "boost-speed-right-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": "move-speed-left-02",
"speed": 35.0
>>>>>>> Stashed changes
}, { }, {
"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 ) ], "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, "loop": true,
<<<<<<< Updated upstream
"name": "idle-speed-right-01", "name": "idle-speed-right-01",
"speed": 25.0 "speed": 25.0
}, { }, {
@ -272,6 +340,10 @@ animations = [ {
"loop": true, "loop": true,
"name": "boost-speed-right-04", "name": "boost-speed-right-04",
"speed": 50.0 "speed": 50.0
=======
"name": "idle-speed-right-02",
"speed": 25.0
>>>>>>> Stashed changes
}, { }, {
"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,
@ -328,10 +400,7 @@ animations = [ {
"speed": 5.0 "speed": 5.0
} ] } ]
[node name="player" type="KinematicBody2D" groups=[ [node name="player" type="KinematicBody2D" groups=["Net", "Player"]]
"Net",
"Player",
]]
script = ExtResource( 11 ) script = ExtResource( 11 )
[node name="player_collider" type="CollisionShape2D" parent="."] [node name="player_collider" type="CollisionShape2D" parent="."]

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

@ -5,15 +5,11 @@
[sub_resource type="CapsuleShape2D" id=1] [sub_resource type="CapsuleShape2D" id=1]
[node name="playert_bullet" type="Sprite" groups=[ [node name="playert_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"]
rotation = 1.5708 rotation = 1.5708

8
source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn
View File

@ -5,15 +5,11 @@
[sub_resource type="CapsuleShape2D" id=1] [sub_resource type="CapsuleShape2D" id=1]
[node name="player_bullet2" type="Sprite" groups=[ [node name="player_bullet2" 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"]
rotation = 1.5708 rotation = 1.5708

21
source/levels/trinity_site/Control.gd Normal file
View File

@ -0,0 +1,21 @@
extends Control
func _ready():
Global.set('line_button', self)
Global.set('sine_button', self)
Global.set('parab_button', self)
Global.set('hyper_button', self)
func _on_Line_pressed():
Global.set('control', self)
return true
pass # Replace with function body.
func _on_Sine_pressed():
Global.set('sine_button', self)
pass # Replace with function body.

65
source/levels/trinity_site/trinity_site_level.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=14 format=2] [gd_scene load_steps=15 format=2]
[ext_resource path="res://source/assets/scripts/server_handlers/trinity_site_level.gd" type="Script" id=1] [ext_resource path="res://source/assets/scripts/server_handlers/trinity_site_level.gd" type="Script" id=1]
[ext_resource path="res://source/assets/scripts/ui_element_handlers/UI.gd" type="Script" id=2] [ext_resource path="res://source/assets/scripts/ui_element_handlers/UI.gd" type="Script" id=2]
@ -9,8 +9,14 @@
[ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_4.svg" type="Texture" id=7] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_4.svg" type="Texture" id=7]
[ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_3.svg" type="Texture" id=8] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_3.svg" type="Texture" id=8]
[ext_resource path="res://source/entities/grass/grass_node.tscn" type="PackedScene" id=9] [ext_resource path="res://source/entities/grass/grass_node.tscn" type="PackedScene" id=9]
<<<<<<< Updated upstream
[ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_2.svg" type="Texture" id=10] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_2.svg" type="Texture" id=10]
[ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_1.svg" type="Texture" id=11] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_1.svg" type="Texture" id=11]
=======
[ext_resource path="res://source/levels/trinity_site/Control.gd" type="Script" id=10]
[ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout-level_design_z-index_-2-version_ct_f_hd_3840_2160 – 02.png" type="Texture" id=44]
[ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout-level_design_z-index_-2-version_ct_f_hd_3840_2160 – 025.png" type="Texture" id=45]
>>>>>>> Stashed changes
[ext_resource path="res://source/assets/scripts/trinity_site_body_handler.gd" type="Script" id=46] [ext_resource path="res://source/assets/scripts/trinity_site_body_handler.gd" type="Script" id=46]
[sub_resource type="DynamicFont" id=1] [sub_resource type="DynamicFont" id=1]
@ -151,6 +157,7 @@ script = ExtResource( 6 )
[node name="Control" type="Control" parent="game_UI"] [node name="Control" type="Control" parent="game_UI"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
script = ExtResource( 10 )
__meta__ = { __meta__ = {
"_edit_lock_": true, "_edit_lock_": true,
"_edit_use_anchors_": false "_edit_use_anchors_": false
@ -164,10 +171,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
@ -180,4 +187,58 @@ __meta__ = {
[node name="win_timer" type="Timer" parent="game_UI/Control/winner"] [node name="win_timer" type="Timer" parent="game_UI/Control/winner"]
wait_time = 4.0 wait_time = 4.0
[node name="Line" type="Button" parent="game_UI/Control"]
anchor_left = 0.018
anchor_top = 0.875
anchor_right = 0.06
anchor_bottom = 0.95
margin_left = 0.439999
margin_top = -6.10352e-05
margin_right = -0.200005
text = "Line"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Sine" type="Button" parent="game_UI/Control"]
anchor_left = 0.018
anchor_top = 0.875
anchor_right = 0.06
anchor_bottom = 0.95
margin_left = 118.44
margin_top = -6.10352e-05
margin_right = 117.8
text = "Sine"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Parab" type="Button" parent="game_UI/Control"]
anchor_left = 0.018
anchor_top = 0.875
anchor_right = 0.06
anchor_bottom = 0.95
margin_left = 233.44
margin_top = -6.10352e-05
margin_right = 232.8
text = "Parabola"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Hyper" type="Button" parent="game_UI/Control"]
anchor_left = 0.018
anchor_top = 0.875
anchor_right = 0.06
anchor_bottom = 0.95
margin_left = 348.44
margin_top = -6.10352e-05
margin_right = 347.8
text = "Hyperbola"
__meta__ = {
"_edit_use_anchors_": false
}
[connection signal="timeout" from="game_UI/Control/winner/win_timer" to="game_UI/Control/winner" method="_on_win_timer_timeout"] [connection signal="timeout" from="game_UI/Control/winner/win_timer" to="game_UI/Control/winner" method="_on_win_timer_timeout"]
[connection signal="pressed" from="game_UI/Control/Line" to="game_UI/Control" method="_on_Line_pressed"]
[connection signal="pressed" from="game_UI/Control/Sine" to="game_UI/Control" method="_on_Sine_pressed"]

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

@ -50,8 +50,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
@ -75,8 +75,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
@ -107,8 +107,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
@ -117,6 +117,20 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
<<<<<<< Updated upstream
=======
[node name="fullscreen" type="CheckButton" parent="."]
margin_left = 1798.91
margin_top = 989.536
margin_right = 1889.91
margin_bottom = 1061.54
custom_colors/font_color_disabled = Color( 1, 1, 1, 1 )
custom_fonts/font = ExtResource( 8 )
__meta__ = {
"_edit_use_anchors_": false
}
>>>>>>> Stashed changes
[connection signal="pressed" from="foreground/play" to="." method="_on_play_pressed"] [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/LAN_party" to="." method="_on_LAN_party_pressed"]
[connection signal="pressed" from="foreground/exit" to="." method="_on_exit_pressed"] [connection signal="pressed" from="foreground/exit" to="." method="_on_exit_pressed"]

28
source/scenes/GUI/network_setup.tscn
View File

@ -20,16 +20,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
@ -90,8 +90,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( 8 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 8 )
text = "CREATE SERVER" text = "CREATE SERVER"
align = 1 align = 1
valign = 1 valign = 1
@ -114,8 +114,8 @@ anchor_bottom = 0.5
margin_left = -233.0 margin_left = -233.0
margin_top = -36.0 margin_top = -36.0
margin_bottom = 36.0 margin_bottom = 36.0
custom_fonts/font = ExtResource( 8 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 8 )
text = "JOIN SERVER" text = "JOIN SERVER"
align = 1 align = 1
valign = 1 valign = 1
@ -146,8 +146,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( 8 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 8 )
text = "RETURN" text = "RETURN"
align = 1 align = 1
valign = 1 valign = 1
@ -177,8 +177,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
@ -209,10 +209,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__ = {
@ -233,8 +233,8 @@ margin_bottom = 97.0
[node name="Label" type="Label" parent="multiplayer_configure/popup_screen/panel/confirm"] [node name="Label" type="Label" parent="multiplayer_configure/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
@ -287,8 +287,8 @@ margin_left = -74.5
margin_top = -32.0 margin_top = -32.0
margin_right = 74.5 margin_right = 74.5
margin_bottom = 32.0 margin_bottom = 32.0
custom_fonts/font = ExtResource( 10 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 10 )
text = "START" text = "START"
align = 1 align = 1
valign = 1 valign = 1
@ -306,8 +306,8 @@ margin_left = -319.0
margin_top = -56.0 margin_top = -56.0
margin_right = 319.0 margin_right = 319.0
margin_bottom = 56.0 margin_bottom = 56.0
custom_fonts/font = SubResource( 6 )
custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 )
custom_fonts/font = SubResource( 6 )
align = 1 align = 1
valign = 1 valign = 1
__meta__ = { __meta__ = {
@ -324,8 +324,8 @@ margin_left = -116.5
margin_top = 60.0 margin_top = 60.0
margin_right = 116.5 margin_right = 116.5
margin_bottom = 89.0 margin_bottom = 89.0
custom_fonts/font = SubResource( 7 )
custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 )
custom_fonts/font = SubResource( 7 )
text = "WAITING FOR PLAYERS" text = "WAITING FOR PLAYERS"
align = 1 align = 1
valign = 1 valign = 1