mirror of
https://github.com/kristoferssolo/FuncIt.git
synced 2025-10-21 19:30:35 +00:00
Added dead player and fixed weapon position on respawn
This commit is contained in:
parent
132746d97f
commit
fc26a2d903
@ -10,7 +10,7 @@ config_version=4
|
|||||||
|
|
||||||
[application]
|
[application]
|
||||||
|
|
||||||
config/name="Game"
|
config/name="FUNCit"
|
||||||
run/main_scene="res://source/scenes/GUI/main_menu.tscn"
|
run/main_scene="res://source/scenes/GUI/main_menu.tscn"
|
||||||
config/icon="res://icon.png"
|
config/icon="res://icon.png"
|
||||||
|
|
||||||
|
|||||||
@ -34,6 +34,7 @@ onready var sprite = $player_sprite
|
|||||||
onready var reload_timer = $reload_timer
|
onready var reload_timer = $reload_timer
|
||||||
onready var shoot_point = $"weaponHolder/Player-character-theme-gun/shoot_point"
|
onready var shoot_point = $"weaponHolder/Player-character-theme-gun/shoot_point"
|
||||||
onready var hit_timer = $hit_timer
|
onready var hit_timer = $hit_timer
|
||||||
|
onready var dead_player = $player_character_theme_dead
|
||||||
|
|
||||||
|
|
||||||
var bullet_env = {
|
var bullet_env = {
|
||||||
@ -92,6 +93,7 @@ var globalActivePhase = null
|
|||||||
var clientPhase = null
|
var clientPhase = null
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
|
dead_player.hide()
|
||||||
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
|
||||||
# warning-ignore:return_value_discarded
|
# warning-ignore:return_value_discarded
|
||||||
@ -156,7 +158,7 @@ func _process(_delta: float) -> void:
|
|||||||
if get_tree().is_network_server():
|
if get_tree().is_network_server():
|
||||||
Global.phase_update_global()
|
Global.phase_update_global()
|
||||||
clientPhase = Global.get_current_phase()
|
clientPhase = Global.get_current_phase()
|
||||||
theme = "03"
|
# theme = "03"
|
||||||
else:
|
else:
|
||||||
if puppet_phase != null:
|
if puppet_phase != null:
|
||||||
clientPhase = puppet_phase
|
clientPhase = puppet_phase
|
||||||
@ -412,34 +414,47 @@ sync func hit_by_damager(damage):
|
|||||||
health_bar_instance.value = hp
|
health_bar_instance.value = hp
|
||||||
hit_timer.start()
|
hit_timer.start()
|
||||||
|
|
||||||
|
|
||||||
sync func enable() -> void:
|
sync func enable() -> void:
|
||||||
hp = 100
|
hp = 100
|
||||||
health_bar_instance.value = 100
|
health_bar_instance.value = 100
|
||||||
can_shoot = false
|
can_shoot = false
|
||||||
update_shoot_mode(false)
|
update_shoot_mode(false)
|
||||||
username_text_instance.visible = true
|
$player_animated_sprite.show()
|
||||||
health_bar_instance.visible = true
|
dead_player.hide()
|
||||||
visible = true
|
$"weaponHolder/Player-character-theme-gun".show()
|
||||||
$player_collider.disabled = false
|
|
||||||
$hitbox/CollisionShape2D.disabled = false
|
# $player_animated_sprite.show()
|
||||||
$weaponHolder.disabled = false
|
# $"Player-character-theme-gun".show()
|
||||||
|
# username_text_instance.visible = true
|
||||||
|
# health_bar_instance.visible = true
|
||||||
|
# visible = true
|
||||||
|
# $player_collider.disabled = false
|
||||||
|
# $hitbox/CollisionShape2D.disabled = false
|
||||||
|
# $weaponHolder.disabled = false
|
||||||
if get_tree().has_network_peer():
|
if get_tree().has_network_peer():
|
||||||
if is_network_master():
|
if is_network_master():
|
||||||
Global.player_master = self
|
Global.player_master = self
|
||||||
if not Global.alive_players.has(self):
|
if not Global.alive_players.has(self):
|
||||||
Global.alive_players.append(self)
|
Global.alive_players.append(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)
|
# direction = "left"
|
||||||
$"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset
|
# 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
|
||||||
|
|
||||||
|
|
||||||
sync func destroy() -> void:
|
sync func destroy() -> void:
|
||||||
username_text_instance.visible = false
|
$player_animated_sprite.hide()
|
||||||
health_bar_instance.visible = false
|
dead_player.show()
|
||||||
visible = false
|
$"weaponHolder/Player-character-theme-gun".hide()
|
||||||
$player_collider.disabled = true
|
# $player_animated_sprite.hide()
|
||||||
$hitbox/CollisionShape2D.disabled = true
|
|
||||||
$weaponHolder.disabled = true
|
# $"Player-character-theme-gun".hide()
|
||||||
|
# username_text_instance.visible = false
|
||||||
|
# health_bar_instance.visible = false
|
||||||
|
# visible = false
|
||||||
|
# $player_collider.disabled = true
|
||||||
|
# $hitbox/CollisionShape2D.disabled = true
|
||||||
|
# $weaponHolder.disabled = true
|
||||||
|
|
||||||
Global.alive_players.erase(self)
|
Global.alive_players.erase(self)
|
||||||
if get_tree().has_network_peer():
|
if get_tree().has_network_peer():
|
||||||
if is_network_master():
|
if is_network_master():
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
@ -1,4 +1,4 @@
|
|||||||
[gd_scene load_steps=176 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/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]
|
[ext_resource path="res://source/assets/scripts/player_handlers/player_collider_handler.gd" type="Script" id=2]
|
||||||
@ -16,6 +16,7 @@
|
|||||||
[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 – 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/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/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/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]
|
[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]
|
||||||
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 17.png" type="Texture" id=20]
|
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 17.png" type="Texture" id=20]
|
||||||
@ -172,34 +173,104 @@
|
|||||||
|
|
||||||
[sub_resource type="SpriteFrames" id=1]
|
[sub_resource type="SpriteFrames" id=1]
|
||||||
animations = [ {
|
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( 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": "boost-speed-left-02",
|
"name": "idle-speed-left-01",
|
||||||
"speed": 55.0
|
"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 ) ],
|
"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": "boost-speed-right-02",
|
"name": "move-speed-right-02",
|
||||||
"speed": 55.0
|
"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( 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": "idle-speed-right-01",
|
"name": "boost-speed-left-03",
|
||||||
"speed": 25.0
|
"speed": 55.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,
|
||||||
"name": "move-speed-left-01",
|
"name": "move-speed-left-01",
|
||||||
"speed": 35.0
|
"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( 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( 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": "move-speed-left-04",
|
||||||
|
"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": "idle-speed-left-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( 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",
|
||||||
|
"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,
|
||||||
|
"name": "move-speed-left-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": "boost-speed-right-02",
|
||||||
|
"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",
|
||||||
|
"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": "idle-speed-right-02",
|
||||||
|
"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( 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": "idle-speed-right-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 ) ],
|
"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": "boost-speed-right-01",
|
"name": "boost-speed-right-04",
|
||||||
|
"speed": 55.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( 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",
|
||||||
"speed": 55.0
|
"speed": 55.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 ) ],
|
||||||
@ -212,85 +283,15 @@ animations = [ {
|
|||||||
"name": "move-speed-right-01",
|
"name": "move-speed-right-01",
|
||||||
"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 ) ],
|
"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
|
|
||||||
}, {
|
|
||||||
"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": "move-speed-left-04",
|
|
||||||
"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": "move-speed-left-03",
|
|
||||||
"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": "boost-speed-right-03",
|
|
||||||
"speed": 55.0
|
"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": "boost-speed-left-03",
|
|
||||||
"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-04",
|
|
||||||
"speed": 55.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( 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": "move-speed-right-03",
|
"name": "move-speed-right-03",
|
||||||
"speed": 35.0
|
"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": "move-speed-right-02",
|
|
||||||
"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",
|
|
||||||
"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": "boost-speed-left-01",
|
|
||||||
"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": "boost-speed-left-04",
|
|
||||||
"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-right-02",
|
|
||||||
"speed": 25.0
|
|
||||||
}, {
|
|
||||||
"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ],
|
|
||||||
"loop": true,
|
|
||||||
"name": "idle-speed-left-02",
|
|
||||||
"speed": 25.0
|
|
||||||
} ]
|
} ]
|
||||||
|
|
||||||
[sub_resource type="CircleShape2D" id=2]
|
[sub_resource type="CircleShape2D" id=2]
|
||||||
@ -323,11 +324,6 @@ radius = 41.5403
|
|||||||
|
|
||||||
[sub_resource type="SpriteFrames" id=6]
|
[sub_resource type="SpriteFrames" id=6]
|
||||||
animations = [ {
|
animations = [ {
|
||||||
"frames": [ ExtResource( 27 ) ],
|
|
||||||
"loop": true,
|
|
||||||
"name": "01",
|
|
||||||
"speed": 5.0
|
|
||||||
}, {
|
|
||||||
"frames": [ ExtResource( 16 ) ],
|
"frames": [ ExtResource( 16 ) ],
|
||||||
"loop": true,
|
"loop": true,
|
||||||
"name": "03",
|
"name": "03",
|
||||||
@ -338,13 +334,21 @@ animations = [ {
|
|||||||
"name": "04",
|
"name": "04",
|
||||||
"speed": 5.0
|
"speed": 5.0
|
||||||
}, {
|
}, {
|
||||||
|
"frames": [ ExtResource( 27 ) ],
|
||||||
|
"loop": true,
|
||||||
|
"name": "01",
|
||||||
|
"speed": 5.0
|
||||||
|
}, {
|
||||||
"frames": [ ExtResource( 170 ) ],
|
"frames": [ ExtResource( 170 ) ],
|
||||||
"loop": true,
|
"loop": true,
|
||||||
"name": "02",
|
"name": "02",
|
||||||
"speed": 5.0
|
"speed": 5.0
|
||||||
} ]
|
} ]
|
||||||
|
|
||||||
[node name="player" type="KinematicBody2D" groups=["Net", "Player"]]
|
[node name="player" type="KinematicBody2D" groups=[
|
||||||
|
"Net",
|
||||||
|
"Player",
|
||||||
|
]]
|
||||||
script = ExtResource( 11 )
|
script = ExtResource( 11 )
|
||||||
|
|
||||||
[node name="trajectories" type="Node2D" parent="."]
|
[node name="trajectories" type="Node2D" parent="."]
|
||||||
@ -397,7 +401,7 @@ texture = ExtResource( 26 )
|
|||||||
shape = SubResource( 5 )
|
shape = SubResource( 5 )
|
||||||
|
|
||||||
[node name="Player-character-theme-gun-na3" type="Sprite" parent="weaponHolder"]
|
[node name="Player-character-theme-gun-na3" type="Sprite" parent="weaponHolder"]
|
||||||
scale = Vector2( 0.3, 0.25 )
|
scale = Vector2( 0.25, 0.25 )
|
||||||
texture = ExtResource( 171 )
|
texture = ExtResource( 171 )
|
||||||
|
|
||||||
[node name="Player-character-theme-gun" type="AnimatedSprite" parent="weaponHolder"]
|
[node name="Player-character-theme-gun" type="AnimatedSprite" parent="weaponHolder"]
|
||||||
@ -410,6 +414,9 @@ position = Vector2( -120, 0 )
|
|||||||
rotation = 3.14159
|
rotation = 3.14159
|
||||||
scale = Vector2( 4, 4 )
|
scale = Vector2( 4, 4 )
|
||||||
|
|
||||||
|
[node name="player_character_theme_dead" type="Sprite" parent="."]
|
||||||
|
texture = ExtResource( 17 )
|
||||||
|
|
||||||
[connection signal="timeout" from="network_tick_rate" to="." method="_on_network_tick_rate_timeout"]
|
[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="reload_timer" to="." method="_on_reload_timer_timeout"]
|
||||||
[connection signal="timeout" from="hit_timer" to="." method="_on_hit_timer_timeout"]
|
[connection signal="timeout" from="hit_timer" to="." method="_on_hit_timer_timeout"]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user