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 https://github.com/KristofersSolo/Godot

Browse Source
This commit is contained in:
Alan Alexander Cerna 2021-11-09 01:08:04 +02:00
commit 88cecda848
12 changed files with 96 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Game/default_env.tres
View File

@ -1,7 +0,0 @@
[gd_resource type="Environment" load_steps=2 format=2]
[sub_resource type="ProceduralSky" id=1]
[resource]
background_mode = 2
background_sky = SubResource( 1 )

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

@ -230,12 +230,10 @@ func _physics_process(delta) -> void:
velocityVDIR = Vector2(clamp(velocityVDIR.x, -maxMovementSpeed.x, maxMovementSpeed.x), clamp(velocityVDIR.y, -maxMovementSpeed.y, maxMovementSpeed.y))
move_and_slide(velocityVDIR.rotated(rotationalHolder))
#if Input.is_action_pressed("input_shoot") and can_shoot and not is_reloading:
# rpc("instance_bullet", get_tree().get_network_unique_id())
# is_reloading = true
# reload_timer.start()
if Input.is_action_pressed("input_shoot") and can_shoot and not is_reloading:
rpc("instance_bullet", get_tree().get_network_unique_id())
is_reloading = true
reload_timer.start()
rotate_weapon()
else:
rotation = lerp_angle(rotation, puppet_rotation, delta * 8)
@ -252,19 +250,15 @@ func _physics_process(delta) -> void:
else:
$player_animated_sprite.play("idle-speed-"+direction+"-"+theme)
$Particles2D.set_emitting(false)
rotate_weapon()
if not tween.is_active():
pass
if hp <= 0:
if get_tree().is_network_server():
rpc("destroy")
func _draw():
if debugMode:
for vector_type in VDIR:
@ -427,4 +421,3 @@ func rotate_weapon():
weaponPosition += Vector2(weaponPositionalOffset.x,0).rotated(deg2rad(weaponAngle)) + Vector2(0,weaponPositionalOffset.y)
$"weaponHolder/Player-character-theme-gun".position = weaponPosition
$"weaponHolder/Player-character-theme-gun".rotation_degrees = weaponAngle
pass

2
source/assets/scripts/player_handlers/player_bullet.gd
View File

@ -50,7 +50,7 @@ sync func destroy() -> void:
queue_free()
func _on_Destroy_timer_timeout():
func _on_destroy_timer_timeout():
if get_tree().has_network_peer():
if get_tree().is_network_server():
rpc("destroy")

1
source/assets/scripts/server_handlers/network_processors/network_setup.gd
View File

@ -51,6 +51,7 @@ func _ready() -> void:
func _process(_delta: float) -> void:
if Input.is_action_just_pressed("esc") and username.is_visible_in_tree():
username.hide()
controls.show()
if get_tree().network_peer != null:
if get_tree().get_network_connected_peers().size() >= 0 and get_tree().is_network_server():

1
source/assets/scripts/server_handlers/server_processors/server_browser.gd
View File

@ -13,6 +13,7 @@ func _ready() -> void:
func _process(delta):
if Input.is_action_just_pressed("esc") and popup_screen.is_visible_in_tree():
popup_screen.hide()
$controls.show()
func _on_server_listener_new_server(serverInfo):

5
source/assets/scripts/ui_element_handlers/username_text.gd
View File

@ -2,12 +2,15 @@ extends Node2D
var player_following = null
var text = "" setget text_set
var distanceToPlayerOffset = -100
onready var label = $Label
func _process(delta: float) -> void:
if player_following != null:
global_position = player_following.global_position
global_position = player_following.global_position + Vector2(0,distanceToPlayerOffset).rotated(player_following.rotation)
func text_set(new_text) -> void:

9
source/entities/bullet/player_bullet.tscn
View File

@ -6,18 +6,21 @@
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.0883, 10 )
[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"]
visible = false
shape = SubResource( 1 )
[node name="destroy_timer" type="Timer" parent="."]
wait_time = 5.0
one_shot = true
autostart = true

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

@ -1,4 +1,4 @@
[gd_scene load_steps=176 format=2]
[gd_scene load_steps=175 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]
@ -165,7 +165,6 @@
[ext_resource path="res://source/assets/sprites/character/player/theme/04/animation/left_r/Player-character-theme-01_anim-idle – 89.png" type="Texture" id=165]
[ext_resource path="res://source/assets/sprites/character/player/theme/04/animation/left_r/Player-character-theme-04_anim-idle – 1.png" type="Texture" id=166]
[ext_resource path="res://source/assets/sprites/character/player/theme/02/animation/right_r/Player-character-theme-01_anim-idle – 98.png" type="Texture" id=167]
[ext_resource path="res://source/assets/sprites/character/player/theme/03/na/Player-character-theme-gun-03.png" type="Texture" id=168]
[ext_resource path="res://source/assets/sprites/character/player/theme/04/na/Player-character-theme-gun-04.png" type="Texture" id=169]
[ext_resource path="res://source/assets/sprites/character/player/theme/02/na/Player-character-theme-gun-02.png" type="Texture" id=170]
[ext_resource path="res://source/assets/sprites/character/player/theme/Player-character-theme-gun-05.png" type="Texture" id=171]
@ -174,24 +173,9 @@
[sub_resource type="SpriteFrames" id=2]
animations = [ {
"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( 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-02",
"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": "move-speed-right-01",
"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": "move-speed-right-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": "idle-speed-left-03",
"name": "idle-speed-right-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 ) ],
@ -199,24 +183,9 @@ animations = [ {
"name": "move-speed-left-03",
"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 ) ],
"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-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",
"speed": 50.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( 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": "boost-speed-left-04",
"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 ) ],
@ -231,14 +200,49 @@ animations = [ {
}, {
"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
"name": "move-speed-right-01",
"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": "idle-speed-right-03",
"name": "move-speed-right-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( 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( 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": 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": "move-speed-right-04",
"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( 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( 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": "boost-speed-right-02",
@ -246,53 +250,18 @@ 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",
"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": "boost-speed-right-04",
"name": "boost-speed-left-04",
"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( 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-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": "move-speed-right-03",
"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": "move-speed-right-04",
"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": "boost-speed-right-01",
"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( 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",
"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": "idle-speed-right-02",
"speed": 25.0
"name": "move-speed-right-02",
"speed": 35.0
} ]
[sub_resource type="RectangleShape2D" id=3]
@ -323,29 +292,19 @@ radius = 41.5403
[sub_resource type="SpriteFrames" id=6]
animations = [ {
"frames": [ ExtResource( 168 ) ],
"loop": true,
"name": "03",
"speed": 5.0
}, {
"frames": [ ExtResource( 170 ) ],
"loop": true,
"name": "02",
"speed": 5.0
}, {
"frames": [ ExtResource( 169 ) ],
"loop": true,
"name": "04",
"speed": 5.0
}, {
"frames": [ ExtResource( 27 ) ],
"loop": true,
"name": "01",
"speed": 5.0
}, {
"frames": [ ExtResource( 170 ) ],
"frames": [ ExtResource( 169 ) ],
"loop": true,
"name": "02",
"name": "04",
"speed": 5.0
} ]
@ -354,7 +313,6 @@ animations = [ {
"Player",
]]
script = ExtResource( 11 )
theme = "03"
[node name="player_collider" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )
@ -365,6 +323,8 @@ scale = Vector2( 0.25, 0.25 )
z_index = 1
frames = SubResource( 2 )
animation = "idle-speed-left-01"
frame = 5
playing = true
[node name="player_sprite" type="Sprite" parent="."]
visible = false
@ -412,6 +372,9 @@ animation = "04"
scale = Vector2( 0.25, 0.25 )
texture = ExtResource( 171 )
[node name="shoot_point" type="Position2D" parent="."]
position = Vector2( -42.3812, -22.6923 )
[connection signal="timeout" from="network_tick_rate" to="." method="_on_network_tick_rate_timeout"]
[connection signal="timeout" from="reload_timer" to="." method="_on_reload_timer_timeout"]
[connection signal="timeout" from="hit_timer" to="." method="_on_hit_timer_timeout"]

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

@ -142,10 +142,10 @@ margin_left = 2.37842
margin_top = -35.5
margin_right = 2.37842
margin_bottom = 106.5
custom_fonts/font = SubResource( 1 )
custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
custom_constants/shadow_offset_x = 6
custom_constants/shadow_offset_y = 6
custom_fonts/font = SubResource( 1 )
text = "You are the winner"
align = 1
valign = 1

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

@ -14,15 +14,21 @@
[ext_resource path="res://source/scenes/OVERLAY/elements/wall.tscn" type="PackedScene" id=13]
[ext_resource path="res://source/assets/sprites/GUI/server_title.svg" type="Texture" id=15]
[sub_resource type="DynamicFont" id=11]
[sub_resource type="DynamicFont" id=1]
size = 36
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=12]
[sub_resource type="StyleBoxEmpty" id=2]
[sub_resource type="StyleBoxEmpty" id=4]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="DynamicFont" id=4]
size = 36
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="DynamicFont" id=5]
size = 36
@ -31,18 +37,12 @@ use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="DynamicFont" id=6]
size = 36
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="DynamicFont" id=9]
size = 88
use_mipmaps = true
use_filter = true
font_data = ExtResource( 3 )
[sub_resource type="DynamicFont" id=10]
[sub_resource type="DynamicFont" id=7]
size = 22
use_mipmaps = true
use_filter = true
@ -177,7 +177,7 @@ margin_left = -225.0
margin_top = -25.0
margin_right = -225.0
margin_bottom = -25.0
custom_fonts/font = SubResource( 11 )
custom_fonts/font = SubResource( 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Enter your username"
align = 1
@ -209,9 +209,9 @@ margin_left = -175.0
margin_top = -28.0
margin_right = 175.0
margin_bottom = 28.0
custom_styles/focus = SubResource( 12 )
custom_styles/normal = SubResource( 4 )
custom_fonts/font = SubResource( 5 )
custom_styles/focus = SubResource( 2 )
custom_styles/normal = SubResource( 3 )
custom_fonts/font = SubResource( 4 )
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
align = 1
placeholder_text = "username"
@ -233,7 +233,7 @@ margin_bottom = 97.0
[node name="Label" type="Label" parent="multiplayer_configure/popup_screen/panel/confirm"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = SubResource( 6 )
custom_fonts/font = SubResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "CONFIRM"
align = 1
@ -306,7 +306,7 @@ margin_left = -319.0
margin_top = -56.0
margin_right = 319.0
margin_bottom = 56.0
custom_fonts/font = SubResource( 9 )
custom_fonts/font = SubResource( 6 )
custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 )
align = 1
valign = 1
@ -324,7 +324,7 @@ margin_left = -116.5
margin_top = 60.0
margin_right = 116.5
margin_bottom = 89.0
custom_fonts/font = SubResource( 10 )
custom_fonts/font = SubResource( 7 )
custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 )
text = "WAITING FOR PLAYERS"
align = 1

2
source/scenes/OVERLAY/elements/simple_prompt.tscn
View File

@ -55,8 +55,8 @@ margin_bottom = 155.5
[node name="OK" type="Label" parent="Panel/ok"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 2 )
text = "OK"
align = 1
valign = 1

8
source/scenes/OVERLAY/elements/username_text.tscn
View File

@ -16,10 +16,10 @@ z_index = 10
script = ExtResource( 2 )
[node name="Label" type="Label" parent="."]
margin_left = -199.67
margin_top = -131.674
margin_right = 194.33
margin_bottom = -55.6742
margin_left = -200.0
margin_top = -40.0
margin_right = 200.0
margin_bottom = 40.0
custom_fonts/font = SubResource( 1 )
text = "null"
align = 1