From a49780f049be6dc7c79dcc77a0047b392130b286 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 9 Nov 2021 00:05:56 +0200 Subject: [PATCH 01/13] Enabled schooting mechanics --- .../player_handlers/player_body_handler.gd | 17 +-- source/entities/player/player_node.tscn | 142 ++++++++---------- 2 files changed, 70 insertions(+), 89 deletions(-) diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 6d1ce46..4dfcd7e 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -228,12 +228,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) @@ -250,19 +248,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: @@ -425,4 +419,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 diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index b604957..0a58fe8 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -179,66 +179,26 @@ animations = [ { "name": "boost-speed-right-03", "speed": 50.0 }, { +"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], +"loop": true, +"name": "move-speed-right-02", +"speed": 35.0 +}, { "frames": [ ExtResource( 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( 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( 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-01", +"name": "move-speed-right-03", "speed": 35.0 }, { -"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], +"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-right-02", -"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", -"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 ) ], -"loop": true, -"name": "move-speed-left-01", -"speed": 35.0 -}, { -"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], -"loop": true, -"name": "boost-speed-left-03", -"speed": 50.0 -}, { -"frames": [ ExtResource( 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", +"name": "idle-speed-left-02", "speed": 25.0 }, { -"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], -"loop": true, -"name": "idle-speed-right-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 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( 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": "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": "move-speed-right-04", @@ -259,6 +219,46 @@ animations = [ { "name": "idle-speed-left-04", "speed": 25.0 }, { +"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], +"loop": true, +"name": "move-speed-left-01", +"speed": 35.0 +}, { +"frames": [ ExtResource( 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 ) ], +"loop": true, +"name": "move-speed-right-01", +"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": 50.0 +}, { +"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], +"loop": true, +"name": "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 ) ], +"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": "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": "idle-speed-right-01", +"speed": 25.0 +}, { "frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], "loop": true, "name": "boost-speed-left-04", @@ -271,28 +271,13 @@ animations = [ { }, { "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( 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( 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( 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( 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", +"name": "idle-speed-right-02", "speed": 25.0 +}, { +"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], +"loop": true, +"name": "move-speed-left-04", +"speed": 35.0 } ] [sub_resource type="RectangleShape2D" id=3] @@ -323,25 +308,25 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { -"frames": [ ExtResource( 27 ) ], -"loop": true, -"name": "01", -"speed": 5.0 -}, { "frames": [ ExtResource( 168 ) ], "loop": true, "name": "03", "speed": 5.0 }, { -"frames": [ ExtResource( 169 ) ], +"frames": [ ExtResource( 27 ) ], "loop": true, -"name": "04", +"name": "01", "speed": 5.0 }, { "frames": [ ExtResource( 170 ) ], "loop": true, "name": "02", "speed": 5.0 +}, { +"frames": [ ExtResource( 169 ) ], +"loop": true, +"name": "04", +"speed": 5.0 } ] [node name="player" type="KinematicBody2D" groups=[ @@ -407,6 +392,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"] From 401a6f053de439cafe8ab90c3f3aa3cd34ab2055 Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Tue, 9 Nov 2021 00:06:27 +0200 Subject: [PATCH 02/13] [Minimal] Fix up --- Game/default_env.tres | 7 + .../player_handlers/player_body_handler.gd | 4 +- source/entities/player/player_node.tscn | 130 +++++++++--------- 3 files changed, 75 insertions(+), 66 deletions(-) create mode 100644 Game/default_env.tres diff --git a/Game/default_env.tres b/Game/default_env.tres new file mode 100644 index 0000000..20207a4 --- /dev/null +++ b/Game/default_env.tres @@ -0,0 +1,7 @@ +[gd_resource type="Environment" load_steps=2 format=2] + +[sub_resource type="ProceduralSky" id=1] + +[resource] +background_mode = 2 +background_sky = SubResource( 1 ) diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index f056744..be90133 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -67,6 +67,8 @@ var weaponAngle = 0 var particleTexture = ImageTexture.new() var particleImage = Image.new() +var weaponDirectory = {"Parabolic": true, "Line": false, "Hyperbolic": false, "Sin": false} + func _ready(): weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) $"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset @@ -238,7 +240,7 @@ func _physics_process(delta) -> void: else: rotation = lerp_angle(rotation, puppet_rotation, delta * 8) #rotation = puppet_rotation - $"weaponHolder/Player-character-theme-gun-01".position = puppet_weapon_position + $"weaponHolder/Player-character-theme-gun".position = puppet_weapon_position weaponAngle = puppet_weapon_angle direction = puppet_direction diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 01a266f..eaa23f7 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -174,14 +174,9 @@ [sub_resource type="SpriteFrames" id=2] animations = [ { -"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], +"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-right-03", -"speed": 25.0 -}, { -"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], -"loop": true, -"name": "move-speed-left-01", +"name": "move-speed-left-02", "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 ) ], @@ -189,21 +184,6 @@ animations = [ { "name": "boost-speed-left-02", "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", -"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( 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( 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", @@ -216,16 +196,6 @@ animations = [ { }, { "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( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], -"loop": true, -"name": "boost-speed-right-04", -"speed": 50.0 -}, { -"frames": [ ExtResource( 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 }, { @@ -234,14 +204,24 @@ animations = [ { "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", +"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 -}, { -"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", +"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 ) ], @@ -249,21 +229,6 @@ animations = [ { "name": "boost-speed-right-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": "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": "idle-speed-right-04", -"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": "boost-speed-left-04", -"speed": 50.0 -}, { "frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "loop": true, "name": "boost-speed-right-01", @@ -271,19 +236,44 @@ animations = [ { }, { "frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], "loop": true, -"name": "move-speed-right-03", +"name": "idle-speed-right-03", +"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 +}, { +"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", +"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 ) ], "loop": true, -"name": "boost-speed-left-01", -"speed": 50.0 +"name": "move-speed-left-01", +"speed": 35.0 }, { -"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"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-left-02", +"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": "move-speed-right-02", @@ -293,6 +283,16 @@ animations = [ { "loop": true, "name": "idle-speed-left-04", "speed": 25.0 +}, { +"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], +"loop": true, +"name": "idle-speed-left-01", +"speed": 25.0 +}, { +"frames": [ ExtResource( 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 } ] [sub_resource type="RectangleShape2D" id=3] @@ -323,9 +323,9 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { -"frames": [ ExtResource( 27 ) ], +"frames": [ ExtResource( 168 ) ], "loop": true, -"name": "01", +"name": "03", "speed": 5.0 }, { "frames": [ ExtResource( 170 ) ], @@ -333,15 +333,15 @@ animations = [ { "name": "02", "speed": 5.0 }, { -"frames": [ ExtResource( 168 ) ], -"loop": true, -"name": "03", -"speed": 5.0 -}, { "frames": [ ExtResource( 169 ) ], "loop": true, "name": "04", "speed": 5.0 +}, { +"frames": [ ExtResource( 27 ) ], +"loop": true, +"name": "01", +"speed": 5.0 } ] [node name="player" type="KinematicBody2D" groups=["Net", "Player"]] From c780a4db788e54fa8b8006ff65af097af6b085db Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Tue, 9 Nov 2021 00:21:39 +0200 Subject: [PATCH 03/13] trajectory_list traajs --- Pavels/README.md | 12 + .../Hyperbolic_Barrel.tscn | 22 ++ .../Hyperbolic_Bullet.tscn | 22 ++ .../Hyperbolic_Trajectory/Hyperbolic_Env.tscn | 12 + .../Line_Trajectory/Line_Barrel.tscn | 22 ++ .../Line_Trajectory/Line_Bullet.tscn | 22 ++ .../Line_Trajectory/Line_Env.tscn | 10 + .../Parabolic_Barrel.tscn | 22 ++ .../Parabolic_Bullet.tscn | 22 ++ .../Parabolic_Trajectory/Parabolic_Env.tscn | 12 + Pavels/bullet_trajectory/Player.tscn | 19 ++ .../Sine_Trajectory/Sine_Barrel.tscn | 22 ++ .../Sine_Trajectory/Sine_Bullet.tscn | 22 ++ .../Sine_Trajectory/Sine_Env.tscn | 12 + Pavels/bullet_trajectory/default_env.tres | 7 + Pavels/bullet_trajectory/game.tscn | 32 +++ Pavels/bullet_trajectory/icon.png | Bin 0 -> 3305 bytes Pavels/bullet_trajectory/icon.png.import | 34 +++ .../bullet_trajectory/pixil-frame-0 (1).png | Bin 0 -> 29132 bytes .../pixil-frame-0 (1).png.import | 34 +++ Pavels/bullet_trajectory/pixilart-drawing.png | Bin 0 -> 818 bytes .../pixilart-drawing.png.import | 34 +++ Pavels/bullet_trajectory/project.godot | 85 +++++++ Pavels/bullet_trajectory/script/Gun.gd | 30 +++ .../script/Hyperbola/Hyperbolic_Barrel.gd | 16 ++ .../script/Hyperbola/Hyperbolic_Bullet.gd | 24 ++ .../script/Hyperbola/Hyperbolic_Env.gd | 10 + .../script/KinematicBody2D.gd | 26 ++ .../script/Line/Line_Barrel.gd | 16 ++ .../script/Line/Line_Bullet.gd | 43 ++++ .../bullet_trajectory/script/Line/Line_Env.gd | 9 + Pavels/bullet_trajectory/script/Mob.gd | 10 + .../script/Parabola/Parabolic_Barrel.gd | 16 ++ .../script/Parabola/Parabolic_Bullet.gd | 24 ++ .../script/Parabola/Parabolic_Env.gd | 9 + .../script/Sine/Sine_Barrel.gd | 20 ++ .../script/Sine/Sine_Bullet.gd | 25 ++ .../bullet_trajectory/script/Sine/Sine_Env.gd | 9 + project.godot | 50 ++-- .../player_handlers/player_body_handler.gd | 25 +- source/entities/player/player_node.tscn | 224 +++++++++--------- .../Hyperbolic_Barrel.tscn | 22 ++ .../Hyperbolic_Bullet.tscn | 22 ++ .../Hyperbolic_Trajectory/Hyperbolic_Env.tscn | 12 + .../shooting/Line_Trajectory/Line_Barrel.tscn | 22 ++ .../shooting/Line_Trajectory/Line_Bullet.tscn | 22 ++ .../shooting/Line_Trajectory/Line_Env.tscn | 10 + .../Parabolic_Barrel.tscn | 22 ++ .../Parabolic_Bullet.tscn | 22 ++ .../Parabolic_Trajectory/Parabolic_Env.tscn | 12 + .../shooting/Sine_Trajectory/Sine_Barrel.tscn | 22 ++ .../shooting/Sine_Trajectory/Sine_Bullet.tscn | 22 ++ .../shooting/Sine_Trajectory/Sine_Env.tscn | 12 + .../{bullet => shooting}/player_bullet.tscn | 0 source/entities/shooting/script/Gun.gd | 30 +++ .../script/Hyperbola/Hyperbolic_Barrel.gd | 16 ++ .../script/Hyperbola/Hyperbolic_Bullet.gd | 24 ++ .../script/Hyperbola/Hyperbolic_Env.gd | 10 + .../shooting/script/KinematicBody2D.gd | 26 ++ .../shooting/script/Line/Line_Barrel.gd | 16 ++ .../shooting/script/Line/Line_Bullet.gd | 43 ++++ .../entities/shooting/script/Line/Line_Env.gd | 9 + source/entities/shooting/script/Mob.gd | 10 + .../script/Parabola/Parabolic_Barrel.gd | 16 ++ .../script/Parabola/Parabolic_Bullet.gd | 24 ++ .../shooting/script/Parabola/Parabolic_Env.gd | 9 + .../shooting/script/Sine/Sine_Barrel.gd | 20 ++ .../shooting/script/Sine/Sine_Bullet.gd | 25 ++ .../entities/shooting/script/Sine/Sine_Env.gd | 9 + source/scenes/GUI/main_menu.tscn | 8 +- 70 files changed, 1443 insertions(+), 139 deletions(-) create mode 100644 Pavels/README.md create mode 100644 Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn create mode 100644 Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn create mode 100644 Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Env.tscn create mode 100644 Pavels/bullet_trajectory/Line_Trajectory/Line_Barrel.tscn create mode 100644 Pavels/bullet_trajectory/Line_Trajectory/Line_Bullet.tscn create mode 100644 Pavels/bullet_trajectory/Line_Trajectory/Line_Env.tscn create mode 100644 Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Barrel.tscn create mode 100644 Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Bullet.tscn create mode 100644 Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Env.tscn create mode 100644 Pavels/bullet_trajectory/Player.tscn create mode 100644 Pavels/bullet_trajectory/Sine_Trajectory/Sine_Barrel.tscn create mode 100644 Pavels/bullet_trajectory/Sine_Trajectory/Sine_Bullet.tscn create mode 100644 Pavels/bullet_trajectory/Sine_Trajectory/Sine_Env.tscn create mode 100644 Pavels/bullet_trajectory/default_env.tres create mode 100644 Pavels/bullet_trajectory/game.tscn create mode 100644 Pavels/bullet_trajectory/icon.png create mode 100644 Pavels/bullet_trajectory/icon.png.import create mode 100644 Pavels/bullet_trajectory/pixil-frame-0 (1).png create mode 100644 Pavels/bullet_trajectory/pixil-frame-0 (1).png.import create mode 100644 Pavels/bullet_trajectory/pixilart-drawing.png create mode 100644 Pavels/bullet_trajectory/pixilart-drawing.png.import create mode 100644 Pavels/bullet_trajectory/project.godot create mode 100644 Pavels/bullet_trajectory/script/Gun.gd create mode 100644 Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Barrel.gd create mode 100644 Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Bullet.gd create mode 100644 Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Env.gd create mode 100644 Pavels/bullet_trajectory/script/KinematicBody2D.gd create mode 100644 Pavels/bullet_trajectory/script/Line/Line_Barrel.gd create mode 100644 Pavels/bullet_trajectory/script/Line/Line_Bullet.gd create mode 100644 Pavels/bullet_trajectory/script/Line/Line_Env.gd create mode 100644 Pavels/bullet_trajectory/script/Mob.gd create mode 100644 Pavels/bullet_trajectory/script/Parabola/Parabolic_Barrel.gd create mode 100644 Pavels/bullet_trajectory/script/Parabola/Parabolic_Bullet.gd create mode 100644 Pavels/bullet_trajectory/script/Parabola/Parabolic_Env.gd create mode 100644 Pavels/bullet_trajectory/script/Sine/Sine_Barrel.gd create mode 100644 Pavels/bullet_trajectory/script/Sine/Sine_Bullet.gd create mode 100644 Pavels/bullet_trajectory/script/Sine/Sine_Env.gd create mode 100644 source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn create mode 100644 source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn create mode 100644 source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn create mode 100644 source/entities/shooting/Line_Trajectory/Line_Barrel.tscn create mode 100644 source/entities/shooting/Line_Trajectory/Line_Bullet.tscn create mode 100644 source/entities/shooting/Line_Trajectory/Line_Env.tscn create mode 100644 source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn create mode 100644 source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn create mode 100644 source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn create mode 100644 source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn create mode 100644 source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn create mode 100644 source/entities/shooting/Sine_Trajectory/Sine_Env.tscn rename source/entities/{bullet => shooting}/player_bullet.tscn (100%) create mode 100644 source/entities/shooting/script/Gun.gd create mode 100644 source/entities/shooting/script/Hyperbola/Hyperbolic_Barrel.gd create mode 100644 source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd create mode 100644 source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd create mode 100644 source/entities/shooting/script/KinematicBody2D.gd create mode 100644 source/entities/shooting/script/Line/Line_Barrel.gd create mode 100644 source/entities/shooting/script/Line/Line_Bullet.gd create mode 100644 source/entities/shooting/script/Line/Line_Env.gd create mode 100644 source/entities/shooting/script/Mob.gd create mode 100644 source/entities/shooting/script/Parabola/Parabolic_Barrel.gd create mode 100644 source/entities/shooting/script/Parabola/Parabolic_Bullet.gd create mode 100644 source/entities/shooting/script/Parabola/Parabolic_Env.gd create mode 100644 source/entities/shooting/script/Sine/Sine_Barrel.gd create mode 100644 source/entities/shooting/script/Sine/Sine_Bullet.gd create mode 100644 source/entities/shooting/script/Sine/Sine_Env.gd diff --git a/Pavels/README.md b/Pavels/README.md new file mode 100644 index 0000000..2df8b92 --- /dev/null +++ b/Pavels/README.md @@ -0,0 +1,12 @@ +Download git and run in terminal: +```terminal +git config --global user.name "Your Name" +git config --global user.email "youremail@yourdomain.com" +``` + +Enter in required directory and run: +```terminal +git clone https://github.com/KristofersSolo/Godot +``` + +or just use [GitHub Desktop](https://desktop.github.com) \ No newline at end of file diff --git a/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn b/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn new file mode 100644 index 0000000..9e1a160 --- /dev/null +++ b/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://icon.png" type="Texture" id=1] +[ext_resource path="res://script/Hyperbola/Hyperbolic_Barrel.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22.5946, 3.60519 ) + +[node name="Hyperbolic_Barrel" type="StaticBody2D"] +script = ExtResource( 2 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 30.4661, 0.749161 ) +shape = SubResource( 1 ) + +[node name="icon" type="Sprite" parent="."] +position = Vector2( 42.4007, 0.196289 ) +scale = Vector2( 1.31624, 0.140625 ) +texture = ExtResource( 1 ) + +[node name="Position2D" type="Position2D" parent="."] +position = Vector2( 97.6552, 0.0842819 ) diff --git a/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn b/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn new file mode 100644 index 0000000..cd9ffd6 --- /dev/null +++ b/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 5.4212 +height = 7.62897 + +[node name="Bullet" type="Area2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 2, -19 ) +scale = Vector2( 0.199834, 0.199834 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +rotation = 1.5708 +shape = SubResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Env.tscn b/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Env.tscn new file mode 100644 index 0000000..6dd98e1 --- /dev/null +++ b/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Env.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://script/Hyperbola/Hyperbolic_Env.gd" type="Script" id=2] +[ext_resource path="res://script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=3] + +[node name="Env" type="Node2D"] +script = ExtResource( 2 ) + +[node name="Bullet" parent="." instance=ExtResource( 1 )] +position = Vector2( 0, -0.222725 ) +script = ExtResource( 3 ) diff --git a/Pavels/bullet_trajectory/Line_Trajectory/Line_Barrel.tscn b/Pavels/bullet_trajectory/Line_Trajectory/Line_Barrel.tscn new file mode 100644 index 0000000..1b2e3c9 --- /dev/null +++ b/Pavels/bullet_trajectory/Line_Trajectory/Line_Barrel.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://icon.png" type="Texture" id=1] +[ext_resource path="res://script/Line/Line_Barrel.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22.5946, 3.60519 ) + +[node name="Line_Barrel" type="StaticBody2D"] +script = ExtResource( 2 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 30.4661, 0.749161 ) +shape = SubResource( 1 ) + +[node name="icon" type="Sprite" parent="."] +position = Vector2( 32.281, 0.196289 ) +scale = Vector2( 1, 0.140625 ) +texture = ExtResource( 1 ) + +[node name="Position2D" type="Position2D" parent="."] +position = Vector2( 64.7166, 0.0842819 ) diff --git a/Pavels/bullet_trajectory/Line_Trajectory/Line_Bullet.tscn b/Pavels/bullet_trajectory/Line_Trajectory/Line_Bullet.tscn new file mode 100644 index 0000000..b342e67 --- /dev/null +++ b/Pavels/bullet_trajectory/Line_Trajectory/Line_Bullet.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 5.4212 +height = 7.62897 + +[node name="Bullet" type="Area2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 2, -19 ) +scale = Vector2( 0.199834, 0.199834 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +rotation = 1.5708 +shape = SubResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/Pavels/bullet_trajectory/Line_Trajectory/Line_Env.tscn b/Pavels/bullet_trajectory/Line_Trajectory/Line_Env.tscn new file mode 100644 index 0000000..0640b7e --- /dev/null +++ b/Pavels/bullet_trajectory/Line_Trajectory/Line_Env.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://script/Line/Line_Env.gd" type="Script" id=2] + +[node name="Env" type="Node2D"] +script = ExtResource( 2 ) + +[node name="Bullet" parent="." instance=ExtResource( 1 )] +position = Vector2( 0, -0.222725 ) diff --git a/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Barrel.tscn b/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Barrel.tscn new file mode 100644 index 0000000..d7e228d --- /dev/null +++ b/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Barrel.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://icon.png" type="Texture" id=1] +[ext_resource path="res://script/Parabola/Parabolic_Barrel.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 8.79762, 3.60519 ) + +[node name="Parabolic_Barrel" type="StaticBody2D"] +script = ExtResource( 2 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 13.539, 2.08551 ) +shape = SubResource( 1 ) + +[node name="icon" type="Sprite" parent="."] +position = Vector2( 16.2448, 0.641744 ) +scale = Vector2( 0.387507, 0.251987 ) +texture = ExtResource( 1 ) + +[node name="Position2D" type="Position2D" parent="."] +position = Vector2( 34.426, 0.975182 ) diff --git a/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Bullet.tscn b/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Bullet.tscn new file mode 100644 index 0000000..b342e67 --- /dev/null +++ b/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Bullet.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 5.4212 +height = 7.62897 + +[node name="Bullet" type="Area2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 2, -19 ) +scale = Vector2( 0.199834, 0.199834 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +rotation = 1.5708 +shape = SubResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Env.tscn b/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Env.tscn new file mode 100644 index 0000000..07cfd7f --- /dev/null +++ b/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Env.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://script/Parabola/Parabolic_Env.gd" type="Script" id=2] +[ext_resource path="res://script/Parabola/Parabolic_Bullet.gd" type="Script" id=3] + +[node name="Env" type="Node2D"] +script = ExtResource( 2 ) + +[node name="Bullet" parent="." instance=ExtResource( 1 )] +position = Vector2( 0, -0.222725 ) +script = ExtResource( 3 ) diff --git a/Pavels/bullet_trajectory/Player.tscn b/Pavels/bullet_trajectory/Player.tscn new file mode 100644 index 0000000..2daf1ef --- /dev/null +++ b/Pavels/bullet_trajectory/Player.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://pixilart-drawing.png" type="Texture" id=1] +[ext_resource path="res://script/KinematicBody2D.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22.279, 10 ) + +[node name="Player" type="KinematicBody2D"] +position = Vector2( 400, 296 ) +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 4, -17 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0.381104, 0.412598 ) +shape = SubResource( 1 ) diff --git a/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Barrel.tscn b/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Barrel.tscn new file mode 100644 index 0000000..690b1ca --- /dev/null +++ b/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Barrel.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://icon.png" type="Texture" id=1] +[ext_resource path="res://script/Sine/Sine_Barrel.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 21.0351, 6.99966 ) + +[node name="Sine_Barrel" type="StaticBody2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 32.0917, 0.471939 ) +scale = Vector2( 1, 0.336339 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 30.8681, 0 ) +shape = SubResource( 1 ) + +[node name="Position2D" type="Position2D" parent="."] +position = Vector2( 64.7166, 0.0842819 ) diff --git a/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Bullet.tscn b/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Bullet.tscn new file mode 100644 index 0000000..b342e67 --- /dev/null +++ b/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Bullet.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 5.4212 +height = 7.62897 + +[node name="Bullet" type="Area2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 2, -19 ) +scale = Vector2( 0.199834, 0.199834 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +rotation = 1.5708 +shape = SubResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Env.tscn b/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Env.tscn new file mode 100644 index 0000000..f0c77d5 --- /dev/null +++ b/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Env.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://script/Sine/Sine_Env.gd" type="Script" id=2] +[ext_resource path="res://script/Sine/Sine_Bullet.gd" type="Script" id=3] + +[node name="Env" type="Node2D"] +script = ExtResource( 2 ) + +[node name="Bullet" parent="." instance=ExtResource( 1 )] +position = Vector2( 0, -0.222725 ) +script = ExtResource( 3 ) diff --git a/Pavels/bullet_trajectory/default_env.tres b/Pavels/bullet_trajectory/default_env.tres new file mode 100644 index 0000000..20207a4 --- /dev/null +++ b/Pavels/bullet_trajectory/default_env.tres @@ -0,0 +1,7 @@ +[gd_resource type="Environment" load_steps=2 format=2] + +[sub_resource type="ProceduralSky" id=1] + +[resource] +background_mode = 2 +background_sky = SubResource( 1 ) diff --git a/Pavels/bullet_trajectory/game.tscn b/Pavels/bullet_trajectory/game.tscn new file mode 100644 index 0000000..109ab9e --- /dev/null +++ b/Pavels/bullet_trajectory/game.tscn @@ -0,0 +1,32 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://Player.tscn" type="PackedScene" id=1] +[ext_resource path="res://icon.png" type="Texture" id=3] +[ext_resource path="res://script/Gun.gd" type="Script" id=4] +[ext_resource path="res://script/Mob.gd" type="Script" id=5] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 31.7698, 29.9446 ) + +[node name="Node2D" type="Node2D"] + +[node name="Mob" type="KinematicBody2D" parent="." groups=[ +"mobs", +]] +position = Vector2( -0.000213623, 0.000244141 ) +script = ExtResource( 5 ) + +[node name="Sprite" type="Sprite" parent="Mob"] +position = Vector2( 748.393, 296.081 ) +texture = ExtResource( 3 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Mob"] +position = Vector2( 748.393, 293.562 ) +shape = SubResource( 1 ) +one_way_collision_margin = 0.0 + +[node name="Player" parent="." instance=ExtResource( 1 )] + +[node name="Gun_Position" type="Position2D" parent="Player"] +position = Vector2( 37.1728, -6.00076 ) +script = ExtResource( 4 ) diff --git a/Pavels/bullet_trajectory/icon.png b/Pavels/bullet_trajectory/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c98fbb601c83c81ec8c22b1dba7d1d57c62b323c GIT binary patch literal 3305 zcmVNc=P)Px>qe(&U$es`gSqKCHF-lq>v1vga#%UF>TTrLR zW%{UNJKZi|Pj@Rc9GyPBD1CamMMf6SL~V^ag9~Vzut^L^0!Tv0LK0FTdnJ`x->EF(MZIP5kY*1-@^egP~7mH>({qi7{6 zQF;bN-XMq~+RzA8lI9AtJuz@PY*+{SP-Gbd@mZ(r*eE&`XO5!C>w#-pcmS28K^qzY zfTGCjor*I@ltgKb03nh#Fh$KpDL=o}gj-g4v6{}ZR1*mvXv?|gEA&Yr#r;Zw*d zUabIx8iHf+WoIO_c11Ba&!34XihSMF&C#YFDjU0)mmbXz3ex!D&t9UYp>;&R%(O(_ z*z^;&A84SWzKiQpqsdQ+Vs?rFS(f?R;c8xg_ft;Roec_~1KsVww}wzq5D}*5x6k|& zf~2A3@L4|ix|Q=L>rnmKE;B3UB=OMQxAK$Ce;LvDp?hwn-{Rn}Uo~U4IXTs4V%MQY zCWULcZFU0R%gbU;_Ef(A#76r1%|YWis0t`9$R{cyjFnsV(POrI)SGQi-l{mu{e?5R zepcp?AQ54D3g_mswd@RLn{z~;^Cl}>%j@}TWixL+audY``MmSV{-E(3R0Ws^U9%mk zmAond;N8k*{(f!}e^~d(i1Hq@jdv@XN2MLAl}3yaECf{nz5N3KMCjDCFzB_7)gkjj z>2Z={^e74l7u>P4oo1{Kc~sgFI`xP#f`uR}z_p~qLwws5)h)eLxAX=?+fB2_6kG)a zeE3U}YSi;Qc}gq*;kw|Tu5Oy{F)l`0;$$RA6)@d^I9>n9N^W1g0D!WJYJT&d@6p`W zfmWmD=^x$2@|)+=&@n(wn<-#M#zIY-iH42=UU>XI3i7l0^?#ILwb@CU63f5b_jeS| zn+d@CpB>^?Ti*1WuHSaRniWO-^Xl8!b+D0stAl$BQjr8G`KX-vGpCc0lEAKmjl6lN z5r?ddL)6hBi2|!`NM+@MRO*^qsi>~y`%4$%P+-S_M#8ibt8Pf;m7O23?cF^-X$52l zEV@3AM^`Q9vy(=)?W+gi)8lPCP&k!)Z(Bsa#m@S7j#1gzJx&pQ!yzlYvA==iExkN@ zTMnz!68Wg=9Ius~p?A=A>P(5$@#w1MG`6<$`Il8=(j0RI#KlIj>!qL4)MMjk|8*3* zbL8w!iwnbSb<*17eb=8TBt(Uv*Qz*e>>p9CRtapnJD-#&4Xd8ojIpD~Yk&6&7;_U` z|L{sgNzJAYPkIOsaN5{^*@Xva?HTkC9>DHY*!1B^L`lv1hgXhC$EO1BSh9fYXU*VG zpVwjRvs^m2ml?)B3xE2&j_YU5;Ep8=e75zefN3cSw04`>U3D&~3|AIJAJnEseqE*p>uF=1Cv$SfvI z!(+vnRMj+4vb)@8Tb~MW$}-RYemjyN^W@U3pfWj;cyehLk|6W*KkUFMkM3W9AE!Wb zTL-_}Udr6GXl}`!5;P_!3b*7=VQyM9zuR6)b6dxl?fo)@-u`$$Pu#bHB*W+#Gp!_Y z*ZdUbq#B3_QPbElK4*QE)$x+;qpGazKD1C!=jx=^ta=2+!&oRjmg4Jf{ z?T`J78TjoBD9Y&OtwFEhrIq<48uS2IEEbY8C$TVd5`X!kj*`Qd7RI`3elib!C*xb1 z(UIgPMzT12GEcpEly0*vU|ugqP(r~!E}l-JK~G&>9S_|9Aj@uD&azvVQ&RF4YZp!> zJ3hi|zlabu5u>=y+3^vqT{xAJlDCHFJ#hbn)Ya9IXwdWH;_1O)ef$at)k@qrEf%ZQ z%DU&)(a_KUxMpn2t6Mm@e?LVzaUT6LCWo=>;TzfYZ~+;U!#wJXa^g66-~d}*-Gas9 zGQt`f8d&$-daPC}H%^NkiV}?n<5oawj2=M{sHv&JXl(bWFDox6HP$o6KRY=Jl_;PR zMP?^QdD4vyrL3&XqugjTQd3idAPA(!=*P?c_!Z!e`f9aWuk~t4qQew;9IwMq>%w#92+*iNN#Qp zadB}J6)j=I#urf#czO3X!C*Z&LD5rfCLY^S$>ZP6}eFW#%-2L)+t{`cPyqLD6))yK1?m7F>6=?Y&8f)>3zbH1O)cT}QNtB4KL(A@1i zMzF88gDrb&hn~H`?o`-XUeDI@dXfwwboAS>*qvV6UMhkfzO~q$V+s%8loj4P(&9H= ze`sC`uI?L9L4e;YK&2A7XF)0}u1lh+%Z$S*Q{ORwtSHpAyWYpI>bqzU!p`gqlf$*l zO^*g(+T?Hq0n%ebkyIin(R#FM6&9;^6WJU5R)By&tZQ6PV zS^MWhqtcj}7)kON#>?4Gv(K#2=6mv)5;@W->l(1q*>9t&xfesIn$&3j4WxkffXaq0 zwwBkAD2vjoi4E8CK;cwoC3#wO!|}v-XOJ`obIo05{&DMQIRyHAd5@%-0xA%uA0UK2qng>xb(kvMzX)7t^ z);-|T`mgSsHKM$+a{!w|Mt5QLwD>sA+;u-+k%z_ZL?el$#&|kX?ygLfm zxZ^Fo^bOhx)w*6In?vS{Q|uk08cKRK}t+0ukQSCOyP$^HEC+zzX51M#=e-?*xHWMDRcLdIV41daHy{HimwDo z6!_O=*(}MK!YeyJpmgu(cF1tpEv}m;0s8{4z4HlHyMxDncn8zs!g+OXEk`CeEj}9N zq#Ag1$#jyV_5AjYQg*!mS->;`S^;iU)ih9D+eks)H2z`1RHny;F<^CEwk+}d^k^Ph zl);*XQ|ayL;rZWh=fA(G2#AJz1&r&as9I8S@9m3Owftrb5n*)pTluK^9LHOFIo{G2 zG}l$9R*{<+L2hCsOJ~Lt6Q-rRub*8X{*4{)e}>%=_&DxOFeq1LRia4Yyj*Tyynw>F zxkKf(MiaG0*L|V-^Zhtvg-(-|F0&1rU8bqab*n5TT8~C860O$|6Rt%P1=1(EjIQZ% z;Y^PU2VC*~^2!sG?mbBPS0~0yd-+086)+rHjhfk6>CB$t`o%;=kdYF9NwiKkwbIpN z;_FlOuHQHHSZ&@fUuSI-S*t`DjsiIB z{=1M@JKVC$a8z{2;xCPfRb{~T>uo#5rL4L+z9n`rSUt3Tt nAZ`TZm+q1gPVN84&*%Ra7her>#-hHS00000NkvXXu0mjf|6N@O literal 0 HcmV?d00001 diff --git a/Pavels/bullet_trajectory/icon.png.import b/Pavels/bullet_trajectory/icon.png.import new file mode 100644 index 0000000..96cbf46 --- /dev/null +++ b/Pavels/bullet_trajectory/icon.png.import @@ -0,0 +1,34 @@ +[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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Pavels/bullet_trajectory/pixil-frame-0 (1).png b/Pavels/bullet_trajectory/pixil-frame-0 (1).png new file mode 100644 index 0000000000000000000000000000000000000000..ecdddeac28feab66f10c07101cd4acda698c8f6c GIT binary patch literal 29132 zcmeHQX-rgC6rMMXbX1@N#0^14P{E~uaY0341Qaj|R6tP+Jh!4zSyWtDAI7TGNFg{# z-L+V1R6tvbiolC8(b5)Dw4%idjRixIfZzm%W$0nvy(}~RQJb_e&G|u?nfLCw=brPO zbH97uy)!BPzFx*7EJlb#B4ZzK&y^yPB){)ZY6zb+PW-w8{xQ2&dbx{o%Pkv3BDu)N zb8+Cl&{t1>ie9%`=DB#9^_8qlt90e)W#xxWnD*rJQJK{mmF@h(aJRs=7e6LRq%ygJ z6EWg}7k9;Ocb|IN>U;|KwS3I)lnmTQTW)0xR^6WP8+|))gHdqAP|1C_$Uk8DWmUG8 zgL~9A<(Th{^>mSD4>JmGh&`yUjT3uIPlPD>8;+SC@>$e?4pb|{8P56xN*nFOUTQQ= z9WwmB7CcvHNLvobsuUYu-M#3psjk7KWAmTsiQp7#c}|(@HE)n*iAaOY@p>X;-Xq86 zSE{65dKP2(odyFsP_5ADXmmunUa(+#5iyuvFsI{0iW8|0-$C|*lo5G4@^oAr>8!|b zMT(RW%K%t=!P<*%RSGF1QbweVNEwkbB4wlx9_XV8tTJMi5vzegyvX>l23FNR?SgscsE~%3^iRt^V{G=bDpZbYPgm>Cc8PZd}mv|#)jNb8vv(_ z{a&lr3rkJ*JjZNfx7wHsdozomaZy)$toCC5hdftsJtlIBK*E;73F4(yb_)eTEgZ)* zGPB*>NdafyC3vsw)XXK9M=%DDr$6dhK~}W9ox~{k9N+eZu+rtd;qrrD4ieFGLG;|h z<|ge$HV0G+Zw_4{NH&5))W!~ey9GhD6QQBU_QWG(254CT?;BtBY$liI!04)Oc3mM0 z>g2;Pp!XlD7Ymo!uR!#c=nZ7Fad0uNsC}pQVtx>ewqSoVQK@8k?Tf1F`^qp)O={vGY-}=6ba04=-uQaiBz!zlmH1>T#xMV(0o9VKV^1&Y?; zRQ3UoEza~4G-1Sc(6#yG8rrxVx_Y^)WD@Dia`@Q%)U0?<;yYv^J2a&UjRZ;1_6 z0vw)tIo_KpVFpUfR8yx$Ie-#{t&^z|o}k3V-^U9|0DwztYTR5^BMooXcU*$s}l@+@_`b~Lr8 zz{Y1ovzf+*?8J#e&;DQ=Wp(;7t!?7X!6y%o&Sn>#dE`ipSq6jL>2gCm$mB>HmXD21 zH@upY(fNsBA;lV=3yScXtJR=o1=zsPv655mURg@)Z4Y)RYkII$Ylo5)ux`T=i~O^` ze~d8`0&+8a`N1u#r&_D>&ZbW6qGE4Q!>7kxu*UfrEI+N#cDz>Mjwzr|&X}!y?1IZ- z#J0!5`*nLZ314tf1C~_1vHACmz=&;!xh58eSY&Cs+IuQpdOKh4Y3Q;}3hV4{YVRso z=oabR`{kXbueK3iUgVOter>L&t$-duhkBpySUo@@O30hmJQ+vnFtmqymP#mb=n8It}*|BA%Eax*FP!uz2I@i9^e)-Ins_nv#d;x1dyzcgoOGx zS!_qCm5aR?3J~%qr3IGt-!hGd`{!##5T6_r5*n$;oKrZ1#!Y`gwS$=VR>kZu)+5e# zVw0;G7xbBS;4sVJpX*el+%SOc)6#kQzK8UQw*ROoHt0l^9`}#3spS`p(_bv$0H{sT z0|eCwAzC)UASQJ!%t9nKFpbi5i4z%#4V;NdxyEfmCAXA`z(s z4UxB@5-*Q*cZx)&8~T1Dpl>mc%oLgF;Ce7v<89!C5E@iI#*Fk&G7>@vA%ulqoQVm) zmB}%UVj3Ot#9kuB8WGlrbXY3Zh_FUP^CZ@Y2o|tL^v=|X4A}{3e0We(9{fC`$Y+VK JXRbSY;7<{&pymJo literal 0 HcmV?d00001 diff --git a/Pavels/bullet_trajectory/pixil-frame-0 (1).png.import b/Pavels/bullet_trajectory/pixil-frame-0 (1).png.import new file mode 100644 index 0000000..553ec28 --- /dev/null +++ b/Pavels/bullet_trajectory/pixil-frame-0 (1).png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/pixil-frame-0 (1).png-160dd9969d7e45d14d604c370b40e019.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://pixil-frame-0 (1).png" +dest_files=[ "res://.import/pixil-frame-0 (1).png-160dd9969d7e45d14d604c370b40e019.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Pavels/bullet_trajectory/pixilart-drawing.png b/Pavels/bullet_trajectory/pixilart-drawing.png new file mode 100644 index 0000000000000000000000000000000000000000..a2d76a70f33c57a3d0e20c8c4a1f359ab038888b GIT binary patch literal 818 zcmeAS@N?(olHy`uVBq!ia0vp^DImV0z=};uum9 z_jazMpR}Qb+e3!fVg{`x9x@H8;trPDuUL1zVVt0(Sko)piyMR3@wOpG%~?6Y{KT%0(i>b4tnFF- z`*pL`&(ELB&Fi~O&&OqV7v#53yLi!(O*36prSqr$(xbc5w=QutNODd)c&g%Z(!6f{ z34%e2k`totJuq;x+4L{d-6pj+?~SfsoBo$af0wRpQe5(5%GTZPo9tw!Rk+AC+~4jU zo$FNMTy)5nD_W`Z-wbOu=exQ`Dl zbJJyU=gUQWN0(MP7oAIpH&!UvFn2-gUltLj+mc*?96by=eY`|ajhsKZuQ literal 0 HcmV?d00001 diff --git a/Pavels/bullet_trajectory/pixilart-drawing.png.import b/Pavels/bullet_trajectory/pixilart-drawing.png.import new file mode 100644 index 0000000..187733d --- /dev/null +++ b/Pavels/bullet_trajectory/pixilart-drawing.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/pixilart-drawing.png-9e9c431ac86a42d1fefc4da3ac6bc15c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://pixilart-drawing.png" +dest_files=[ "res://.import/pixilart-drawing.png-9e9c431ac86a42d1fefc4da3ac6bc15c.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Pavels/bullet_trajectory/project.godot b/Pavels/bullet_trajectory/project.godot new file mode 100644 index 0000000..671b2cb --- /dev/null +++ b/Pavels/bullet_trajectory/project.godot @@ -0,0 +1,85 @@ +; Engine configuration file. +; It's best edited using the editor UI and not directly, +; since the parameters that go here are not all obvious. +; +; Format: +; [section] ; section goes between [] +; param=value ; assign values to parameters + +config_version=4 + +[application] + +config/name="Bullet Trajectory" +run/main_scene="res://game.tscn" +config/icon="res://icon.png" + +[input] + +ui_left={ +"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) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) + ] +} +ui_right={ +"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) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) + ] +} +ui_up={ +"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":87,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) + ] +} +ui_down={ +"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) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) + ] +} +shoot={ +"deadzone": 0.5, +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) + ] +} +gun_up={ +"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":16777232,"unicode":0,"echo":false,"script":null) + ] +} +gun_down={ +"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":16777234,"unicode":0,"echo":false,"script":null) + ] +} +line={ +"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) + ] +} +parab={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777352,"unicode":0,"echo":false,"script":null) + ] +} +hyper={ +"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) + ] +} +sine={ +"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) + ] +} + +[physics] + +common/enable_pause_aware_picking=true + +[rendering] + +environment/default_environment="res://default_env.tres" diff --git a/Pavels/bullet_trajectory/script/Gun.gd b/Pavels/bullet_trajectory/script/Gun.gd new file mode 100644 index 0000000..88a20a3 --- /dev/null +++ b/Pavels/bullet_trajectory/script/Gun.gd @@ -0,0 +1,30 @@ +extends Position2D + +var trajectories = { + 'line' : preload("res://Line_Trajectory/Line_Barrel.tscn"), + 'sine' : preload("res://Sine_Trajectory/Sine_Barrel.tscn"), + 'parab' : preload("res://Parabolic_Trajectory/Parabolic_Barrel.tscn"), + 'hyper' : preload("res://Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn") +} + + +func equip_gun(gun_type:String): + for gun in get_children(): #if there is gun remove it + gun.queue_free() + + var gun = trajectories[gun_type].instance() + add_child(gun) + + + +func _process(delta): + look_at(get_global_mouse_position()) + if Input.is_action_just_pressed("line"): + equip_gun('line') + if Input.is_action_just_pressed("sine"): + equip_gun('sine') + if Input.is_action_just_pressed("parab"): + equip_gun('parab') + if Input.is_action_just_pressed("hyper"): + equip_gun('hyper') + pass diff --git a/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Barrel.gd b/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Barrel.gd new file mode 100644 index 0000000..fc808d6 --- /dev/null +++ b/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Barrel.gd @@ -0,0 +1,16 @@ +extends StaticBody2D # Y = aX + +onready var bullet = preload("res://Hyperbolic_Trajectory/Hyperbolic_Env.tscn") + + +func shoot(): + var b = bullet.instance() + get_parent().get_parent().get_parent().add_child(b) + b.global_position = $Position2D.global_position + b.global_rotation = $Position2D.global_rotation + + + +func _process(delta): + if Input.is_action_just_pressed("shoot"): + shoot() diff --git a/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Bullet.gd b/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Bullet.gd new file mode 100644 index 0000000..69f7b2e --- /dev/null +++ b/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Bullet.gd @@ -0,0 +1,24 @@ +extends Area2D + +var velocity = Vector2() +var speed = 1 +var time = 0.5 +var gravitile = 5 + + + +func follow_hyperbolic_trajectory(): + velocity.x = gravitile * time + velocity.y = 1/time + + +func _process(delta): + follow_hyperbolic_trajectory() + time += delta + position += velocity * speed * delta + + +func _on_Bullet_body_entered(body): + if body.is_in_group("mobs"): + body.queue_free() + queue_free() diff --git a/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Env.gd b/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Env.gd new file mode 100644 index 0000000..344a757 --- /dev/null +++ b/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Env.gd @@ -0,0 +1,10 @@ +extends Node2D + + +var time = 0 + + +func _process(delta): + time += delta + if time > 17: + queue_free() diff --git a/Pavels/bullet_trajectory/script/KinematicBody2D.gd b/Pavels/bullet_trajectory/script/KinematicBody2D.gd new file mode 100644 index 0000000..1aa9367 --- /dev/null +++ b/Pavels/bullet_trajectory/script/KinematicBody2D.gd @@ -0,0 +1,26 @@ +extends KinematicBody2D + +export var speed = 400 +var movement = Vector2(0, 0) + +#func shoot(): + #var b = env.instance() + #get_parent().add_child(b) + #b.global_transform = $Gun.global_transform + +func get_input(): + movement = Vector2() + if Input.is_action_pressed("ui_right"): + movement.x += 10 + if Input.is_action_pressed("ui_left"): + movement.x -= 10 + if Input.is_action_pressed("ui_down"): + movement.y += 10 + if Input.is_action_pressed("ui_up"): + movement.y -= 10 + #if Input.is_action_just_pressed("shoot"): + #shoot() + +func _physics_process(delta): + get_input() + position += movement.normalized() * speed * delta diff --git a/Pavels/bullet_trajectory/script/Line/Line_Barrel.gd b/Pavels/bullet_trajectory/script/Line/Line_Barrel.gd new file mode 100644 index 0000000..4ba9307 --- /dev/null +++ b/Pavels/bullet_trajectory/script/Line/Line_Barrel.gd @@ -0,0 +1,16 @@ +extends StaticBody2D # Y = aX + +onready var bullet = preload("res://Line_Trajectory/Line_Env.tscn") + + +func shoot(): + var b = bullet.instance() + get_parent().get_parent().get_parent().add_child(b) + b.global_position = $Position2D.global_position + b.global_rotation = $Position2D.global_rotation + + + +func _process(delta): + if Input.is_action_just_pressed("shoot"): + shoot() diff --git a/Pavels/bullet_trajectory/script/Line/Line_Bullet.gd b/Pavels/bullet_trajectory/script/Line/Line_Bullet.gd new file mode 100644 index 0000000..3c958c0 --- /dev/null +++ b/Pavels/bullet_trajectory/script/Line/Line_Bullet.gd @@ -0,0 +1,43 @@ +extends Area2D + +export var speed = 100 +var velocity = Vector2() + +var time = 0 +export var amplitude = 4 +export var frequency = 5 +var gravitile = 5 + + +func follow_line_trajectory(): + velocity = Vector2(10, 0) + +#func follow_parabolic_trajectory(): + #velocity.x = 5 + #velocity.y = 1 * time * gravitile + #return velocity + +#func follow_hyperbolic_trajectory(): + #velocity.x = gravitile * time + #velocity.y = 1 + #return velocity + +#func input(): + #if Input.is_action_just_pressed("line"): + #return follow_sine_trajectory() + #elif Input.is_action_just_pressed("sine"): + #return follow_line_trajectory() + #else: + #print('Trajectory is not selected') + #queue_free() + +func _process(delta): + follow_line_trajectory() + time += delta + position += velocity * speed * delta + + +func _on_Bullet_body_entered(body): + if body.is_in_group("mobs"): + body.queue_free() + queue_free() diff --git a/Pavels/bullet_trajectory/script/Line/Line_Env.gd b/Pavels/bullet_trajectory/script/Line/Line_Env.gd new file mode 100644 index 0000000..3a7645d --- /dev/null +++ b/Pavels/bullet_trajectory/script/Line/Line_Env.gd @@ -0,0 +1,9 @@ +extends Node2D + +var time = 0 + + +func _process(delta): + time += delta + if time > 17: + queue_free() diff --git a/Pavels/bullet_trajectory/script/Mob.gd b/Pavels/bullet_trajectory/script/Mob.gd new file mode 100644 index 0000000..16a9985 --- /dev/null +++ b/Pavels/bullet_trajectory/script/Mob.gd @@ -0,0 +1,10 @@ +extends KinematicBody2D + + +var velocity = Vector2(1, 1) + +func _process(delta): + var collision = move_and_collide(velocity * delta) + + + diff --git a/Pavels/bullet_trajectory/script/Parabola/Parabolic_Barrel.gd b/Pavels/bullet_trajectory/script/Parabola/Parabolic_Barrel.gd new file mode 100644 index 0000000..d020184 --- /dev/null +++ b/Pavels/bullet_trajectory/script/Parabola/Parabolic_Barrel.gd @@ -0,0 +1,16 @@ +extends StaticBody2D # Y = aX + +onready var bullet = preload("res://Parabolic_Trajectory/Parabolic_Env.tscn") + + +func shoot(): + var b = bullet.instance() + get_parent().get_parent().get_parent().add_child(b) + b.global_position = $Position2D.global_position + b.global_rotation = $Position2D.global_rotation + + + +func _process(delta): + if Input.is_action_just_pressed("shoot"): + shoot() diff --git a/Pavels/bullet_trajectory/script/Parabola/Parabolic_Bullet.gd b/Pavels/bullet_trajectory/script/Parabola/Parabolic_Bullet.gd new file mode 100644 index 0000000..beee2de --- /dev/null +++ b/Pavels/bullet_trajectory/script/Parabola/Parabolic_Bullet.gd @@ -0,0 +1,24 @@ +extends Area2D + +export var speed = 100 +var velocity = Vector2() + +var time = 0 +var gravitile = 5 + + +func follow_parabolic_trajectory(): + velocity.x = 5 + velocity.y = 1 * time * gravitile + + +func _process(delta): + follow_parabolic_trajectory() + time += delta + position += velocity * speed * delta + + +func _on_Bullet_body_entered(body): + if body.is_in_group("mobs"): + body.queue_free() + queue_free() diff --git a/Pavels/bullet_trajectory/script/Parabola/Parabolic_Env.gd b/Pavels/bullet_trajectory/script/Parabola/Parabolic_Env.gd new file mode 100644 index 0000000..3a7645d --- /dev/null +++ b/Pavels/bullet_trajectory/script/Parabola/Parabolic_Env.gd @@ -0,0 +1,9 @@ +extends Node2D + +var time = 0 + + +func _process(delta): + time += delta + if time > 17: + queue_free() diff --git a/Pavels/bullet_trajectory/script/Sine/Sine_Barrel.gd b/Pavels/bullet_trajectory/script/Sine/Sine_Barrel.gd new file mode 100644 index 0000000..79ce4e8 --- /dev/null +++ b/Pavels/bullet_trajectory/script/Sine/Sine_Barrel.gd @@ -0,0 +1,20 @@ +extends StaticBody2D + +onready var bullet = preload("res://Sine_Trajectory/Sine_Env.tscn") + +var velocity = Vector2(1, 0) +var shooting_speed = 200 + + + +func shoot(): + var b = bullet.instance() + get_parent().get_parent().get_parent().add_child(b) + b.global_position = $Position2D.global_position + b.global_rotation = $Position2D.global_rotation + pass + + +func _process(delta): + if Input.is_action_just_pressed("shoot"): + shoot() diff --git a/Pavels/bullet_trajectory/script/Sine/Sine_Bullet.gd b/Pavels/bullet_trajectory/script/Sine/Sine_Bullet.gd new file mode 100644 index 0000000..1196b54 --- /dev/null +++ b/Pavels/bullet_trajectory/script/Sine/Sine_Bullet.gd @@ -0,0 +1,25 @@ +extends Area2D + +export var speed = 100 +var velocity = Vector2() + +var time = 0 +export var amplitude = 4 +export var frequency = 5 +var gravitile = 5 + + +func follow_sine_trajectory(): + velocity.y = amplitude * cos(time * frequency) + velocity.x = 5 + +func _process(delta): + follow_sine_trajectory() + time += delta + position += velocity * speed * delta + + +func _on_Bullet_body_entered(body): + if body.is_in_group("mobs"): + body.queue_free() + queue_free() diff --git a/Pavels/bullet_trajectory/script/Sine/Sine_Env.gd b/Pavels/bullet_trajectory/script/Sine/Sine_Env.gd new file mode 100644 index 0000000..3a7645d --- /dev/null +++ b/Pavels/bullet_trajectory/script/Sine/Sine_Env.gd @@ -0,0 +1,9 @@ +extends Node2D + +var time = 0 + + +func _process(delta): + time += delta + if time > 17: + queue_free() diff --git a/project.godot b/project.godot index 243da71..bdd770c 100644 --- a/project.godot +++ b/project.godot @@ -37,42 +37,42 @@ fps=false input_right={ "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) -, 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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_left={ "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) -, 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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_up={ "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) -, 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":32,"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,"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_down={ "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) -, 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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_debug={ "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={ "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={ "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={ @@ -82,17 +82,37 @@ input_shoot={ } esc={ "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={ "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={ "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={ +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) + ] +} +sine={ +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) + ] +} +hyper={ +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) + ] +} +parab={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777354,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 6d1ce46..69b6454 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -67,9 +67,23 @@ var weaponAngle = 0 var particleTexture = ImageTexture.new() var particleImage = Image.new() -func _ready(): - weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) +func equip_weapon(): + if Input.is_action_just_pressed("line"): + weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na1".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na1".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na1".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na1".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) + if Input.is_action_just_pressed("sine"): + weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na2".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na2".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na2".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na2".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) + if Input.is_action_just_pressed("parab"): + 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) + if Input.is_action_just_pressed("hyper"): + weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na4".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na4".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na4".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na4".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) $"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset + return weaponPositionalOffset + pass + + +func _ready(): + #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 get_tree().connect("network_peer_connected", self, "_network_peer_connected") username_text_instance = Global.instance_node_at_location(username_text, PersistentNodes, global_position) username_text_instance.player_following = self @@ -125,8 +139,8 @@ func process_rotation(): func _process(delta: float) -> void: $"weaponHolder/Player-character-theme-gun".play(theme) - particleImage.load("res://source/assets/sprites/character/player/theme/" + theme + "/na/Player-character-theme-particle-"+theme+".png") - particleTexture.create_from_image(particleImage) + #particleImage.load("res://source/assets/sprites/character/player/theme/" + theme + "/na/Player-character-theme-particle-"+theme+".png") + #particleTexture.create_from_image(particleImage) $Particles2D.texture = particleTexture if username_text_instance != null: username_text_instance.name = "username" + name @@ -159,6 +173,7 @@ func _process(delta: float) -> void: VDIR[v_t][v]["ray"]["collided"] = false update() process_rotation() + equip_weapon() func _physics_process(delta) -> void: @@ -219,7 +234,7 @@ func _physics_process(delta) -> void: $player_animated_sprite.play("boost-speed-"+direction+"-"+theme) $Particles2D.set_emitting(true) else: - $player_animated_sprite.play("idle-speed-"+direction+"-"+theme) + #$player_animated_sprite.play("idle-speed-"+direction+"-"+theme) $Particles2D.set_emitting(false) if not characterStates["onGround"]: velocityVDIR.y += accelerationSpeed diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index b604957..9fa6531 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -174,111 +174,6 @@ [sub_resource type="SpriteFrames" id=2] animations = [ { -"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], -"loop": true, -"name": "boost-speed-right-03", -"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": "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 ) ], -"loop": true, -"name": "move-speed-right-01", -"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": 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", -"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 ) ], -"loop": true, -"name": "move-speed-left-01", -"speed": 35.0 -}, { -"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], -"loop": true, -"name": "boost-speed-left-03", -"speed": 50.0 -}, { -"frames": [ ExtResource( 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": "idle-speed-right-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], -"loop": true, -"name": "idle-speed-right-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 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( 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": "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": "move-speed-right-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( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], -"loop": true, -"name": "boost-speed-right-04", -"speed": 50.0 -}, { -"frames": [ ExtResource( 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( 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": 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 -}, { -"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( 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( 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", @@ -291,8 +186,98 @@ 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 ) ], "loop": true, +"name": "move-speed-left-02", +"speed": 35.0 +}, { +"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], +"loop": true, +"name": "move-speed-right-02", +"speed": 35.0 +}, { +"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], +"loop": true, +"name": "move-speed-left-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": "idle-speed-right-02", +"speed": 25.0 +}, { +"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], +"loop": true, +"name": "idle-speed-left-04", +"speed": 25.0 +}, { +"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], +"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", +"speed": 50.0 +}, { +"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], +"loop": true, +"name": "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": "idle-speed-left-01", +"speed": 25.0 +}, { +"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"loop": true, +"name": "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": "move-speed-right-01", +"speed": 35.0 +}, { +"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], +"loop": true, +"name": "move-speed-left-01", +"speed": 35.0 +}, { +"frames": [ ExtResource( 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( 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( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"loop": true, +"name": "boost-speed-right-04", +"speed": 50.0 +}, { +"frames": [ ExtResource( 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( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], +"loop": true, +"name": "boost-speed-right-03", +"speed": 50.0 +}, { +"frames": [ ExtResource( 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 +}, { +"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 } ] [sub_resource type="RectangleShape2D" id=3] @@ -323,11 +308,6 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { -"frames": [ ExtResource( 27 ) ], -"loop": true, -"name": "01", -"speed": 5.0 -}, { "frames": [ ExtResource( 168 ) ], "loop": true, "name": "03", @@ -342,12 +322,14 @@ animations = [ { "loop": true, "name": "02", "speed": 5.0 +}, { +"frames": [ ExtResource( 27 ) ], +"loop": true, +"name": "01", +"speed": 5.0 } ] -[node name="player" type="KinematicBody2D" groups=[ -"Net", -"Player", -]] +[node name="player" type="KinematicBody2D" groups=["Net", "Player"]] script = ExtResource( 11 ) theme = "03" @@ -403,10 +385,22 @@ scale = Vector2( 0.25, 0.25 ) frames = SubResource( 6 ) animation = "04" -[node name="Player-character-theme-gun-na" type="Sprite" parent="weaponHolder"] +[node name="Player-character-theme-gun-na1" type="Sprite" parent="weaponHolder"] scale = Vector2( 0.25, 0.25 ) texture = ExtResource( 171 ) +[node name="Player-character-theme-gun-na2" type="Sprite" parent="weaponHolder"] +scale = Vector2( 0.177591, 0.18125 ) +texture = ExtResource( 171 ) + +[node name="Player-character-theme-gun-na3" type="Sprite" parent="weaponHolder"] +scale = Vector2( 0.375937, 0.251953 ) +texture = ExtResource( 171 ) + +[node name="Player-character-theme-gun-na4" type="Sprite" parent="weaponHolder"] +scale = Vector2( 0.508138, 0.140008 ) +texture = ExtResource( 171 ) + [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"] diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn new file mode 100644 index 0000000..9e1a160 --- /dev/null +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://icon.png" type="Texture" id=1] +[ext_resource path="res://script/Hyperbola/Hyperbolic_Barrel.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22.5946, 3.60519 ) + +[node name="Hyperbolic_Barrel" type="StaticBody2D"] +script = ExtResource( 2 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 30.4661, 0.749161 ) +shape = SubResource( 1 ) + +[node name="icon" type="Sprite" parent="."] +position = Vector2( 42.4007, 0.196289 ) +scale = Vector2( 1.31624, 0.140625 ) +texture = ExtResource( 1 ) + +[node name="Position2D" type="Position2D" parent="."] +position = Vector2( 97.6552, 0.0842819 ) diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn new file mode 100644 index 0000000..cd9ffd6 --- /dev/null +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 5.4212 +height = 7.62897 + +[node name="Bullet" type="Area2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 2, -19 ) +scale = Vector2( 0.199834, 0.199834 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +rotation = 1.5708 +shape = SubResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn new file mode 100644 index 0000000..6dd98e1 --- /dev/null +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://script/Hyperbola/Hyperbolic_Env.gd" type="Script" id=2] +[ext_resource path="res://script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=3] + +[node name="Env" type="Node2D"] +script = ExtResource( 2 ) + +[node name="Bullet" parent="." instance=ExtResource( 1 )] +position = Vector2( 0, -0.222725 ) +script = ExtResource( 3 ) diff --git a/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn b/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn new file mode 100644 index 0000000..1b2e3c9 --- /dev/null +++ b/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://icon.png" type="Texture" id=1] +[ext_resource path="res://script/Line/Line_Barrel.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22.5946, 3.60519 ) + +[node name="Line_Barrel" type="StaticBody2D"] +script = ExtResource( 2 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 30.4661, 0.749161 ) +shape = SubResource( 1 ) + +[node name="icon" type="Sprite" parent="."] +position = Vector2( 32.281, 0.196289 ) +scale = Vector2( 1, 0.140625 ) +texture = ExtResource( 1 ) + +[node name="Position2D" type="Position2D" parent="."] +position = Vector2( 64.7166, 0.0842819 ) diff --git a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn new file mode 100644 index 0000000..b342e67 --- /dev/null +++ b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 5.4212 +height = 7.62897 + +[node name="Bullet" type="Area2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 2, -19 ) +scale = Vector2( 0.199834, 0.199834 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +rotation = 1.5708 +shape = SubResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/source/entities/shooting/Line_Trajectory/Line_Env.tscn b/source/entities/shooting/Line_Trajectory/Line_Env.tscn new file mode 100644 index 0000000..0640b7e --- /dev/null +++ b/source/entities/shooting/Line_Trajectory/Line_Env.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://script/Line/Line_Env.gd" type="Script" id=2] + +[node name="Env" type="Node2D"] +script = ExtResource( 2 ) + +[node name="Bullet" parent="." instance=ExtResource( 1 )] +position = Vector2( 0, -0.222725 ) diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn new file mode 100644 index 0000000..d7e228d --- /dev/null +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://icon.png" type="Texture" id=1] +[ext_resource path="res://script/Parabola/Parabolic_Barrel.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 8.79762, 3.60519 ) + +[node name="Parabolic_Barrel" type="StaticBody2D"] +script = ExtResource( 2 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 13.539, 2.08551 ) +shape = SubResource( 1 ) + +[node name="icon" type="Sprite" parent="."] +position = Vector2( 16.2448, 0.641744 ) +scale = Vector2( 0.387507, 0.251987 ) +texture = ExtResource( 1 ) + +[node name="Position2D" type="Position2D" parent="."] +position = Vector2( 34.426, 0.975182 ) diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn new file mode 100644 index 0000000..b342e67 --- /dev/null +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 5.4212 +height = 7.62897 + +[node name="Bullet" type="Area2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 2, -19 ) +scale = Vector2( 0.199834, 0.199834 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +rotation = 1.5708 +shape = SubResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn new file mode 100644 index 0000000..07cfd7f --- /dev/null +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://script/Parabola/Parabolic_Env.gd" type="Script" id=2] +[ext_resource path="res://script/Parabola/Parabolic_Bullet.gd" type="Script" id=3] + +[node name="Env" type="Node2D"] +script = ExtResource( 2 ) + +[node name="Bullet" parent="." instance=ExtResource( 1 )] +position = Vector2( 0, -0.222725 ) +script = ExtResource( 3 ) diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn new file mode 100644 index 0000000..690b1ca --- /dev/null +++ b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://icon.png" type="Texture" id=1] +[ext_resource path="res://script/Sine/Sine_Barrel.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 21.0351, 6.99966 ) + +[node name="Sine_Barrel" type="StaticBody2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 32.0917, 0.471939 ) +scale = Vector2( 1, 0.336339 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 30.8681, 0 ) +shape = SubResource( 1 ) + +[node name="Position2D" type="Position2D" parent="."] +position = Vector2( 64.7166, 0.0842819 ) diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn new file mode 100644 index 0000000..b342e67 --- /dev/null +++ b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 5.4212 +height = 7.62897 + +[node name="Bullet" type="Area2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 2, -19 ) +scale = Vector2( 0.199834, 0.199834 ) +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +rotation = 1.5708 +shape = SubResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn new file mode 100644 index 0000000..f0c77d5 --- /dev/null +++ b/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://script/Sine/Sine_Env.gd" type="Script" id=2] +[ext_resource path="res://script/Sine/Sine_Bullet.gd" type="Script" id=3] + +[node name="Env" type="Node2D"] +script = ExtResource( 2 ) + +[node name="Bullet" parent="." instance=ExtResource( 1 )] +position = Vector2( 0, -0.222725 ) +script = ExtResource( 3 ) diff --git a/source/entities/bullet/player_bullet.tscn b/source/entities/shooting/player_bullet.tscn similarity index 100% rename from source/entities/bullet/player_bullet.tscn rename to source/entities/shooting/player_bullet.tscn diff --git a/source/entities/shooting/script/Gun.gd b/source/entities/shooting/script/Gun.gd new file mode 100644 index 0000000..d802ed6 --- /dev/null +++ b/source/entities/shooting/script/Gun.gd @@ -0,0 +1,30 @@ +extends Position2D + +var trajectories = { + 'line' : preload("res://source/entities/shooting/Line_Trajectory/Line_Barrel.tscn"), + 'sine' : preload("res://source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn"), + 'parab' : preload("res://source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn"), + 'hyper' : preload("res://source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn") +} + + +func equip_gun(gun_type:String): + for gun in get_children(): #if there is gun remove it + gun.queue_free() + + var gun = trajectories[gun_type].instance() + add_child(gun) + + + +func _process(delta): + look_at(get_global_mouse_position()) + if Input.is_action_just_pressed("line"): + equip_gun('line') + if Input.is_action_just_pressed("sine"): + equip_gun('sine') + if Input.is_action_just_pressed("parab"): + equip_gun('parab') + if Input.is_action_just_pressed("hyper"): + equip_gun('hyper') + pass diff --git a/source/entities/shooting/script/Hyperbola/Hyperbolic_Barrel.gd b/source/entities/shooting/script/Hyperbola/Hyperbolic_Barrel.gd new file mode 100644 index 0000000..fc808d6 --- /dev/null +++ b/source/entities/shooting/script/Hyperbola/Hyperbolic_Barrel.gd @@ -0,0 +1,16 @@ +extends StaticBody2D # Y = aX + +onready var bullet = preload("res://Hyperbolic_Trajectory/Hyperbolic_Env.tscn") + + +func shoot(): + var b = bullet.instance() + get_parent().get_parent().get_parent().add_child(b) + b.global_position = $Position2D.global_position + b.global_rotation = $Position2D.global_rotation + + + +func _process(delta): + if Input.is_action_just_pressed("shoot"): + shoot() diff --git a/source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd b/source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd new file mode 100644 index 0000000..69f7b2e --- /dev/null +++ b/source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd @@ -0,0 +1,24 @@ +extends Area2D + +var velocity = Vector2() +var speed = 1 +var time = 0.5 +var gravitile = 5 + + + +func follow_hyperbolic_trajectory(): + velocity.x = gravitile * time + velocity.y = 1/time + + +func _process(delta): + follow_hyperbolic_trajectory() + time += delta + position += velocity * speed * delta + + +func _on_Bullet_body_entered(body): + if body.is_in_group("mobs"): + body.queue_free() + queue_free() diff --git a/source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd b/source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd new file mode 100644 index 0000000..344a757 --- /dev/null +++ b/source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd @@ -0,0 +1,10 @@ +extends Node2D + + +var time = 0 + + +func _process(delta): + time += delta + if time > 17: + queue_free() diff --git a/source/entities/shooting/script/KinematicBody2D.gd b/source/entities/shooting/script/KinematicBody2D.gd new file mode 100644 index 0000000..1aa9367 --- /dev/null +++ b/source/entities/shooting/script/KinematicBody2D.gd @@ -0,0 +1,26 @@ +extends KinematicBody2D + +export var speed = 400 +var movement = Vector2(0, 0) + +#func shoot(): + #var b = env.instance() + #get_parent().add_child(b) + #b.global_transform = $Gun.global_transform + +func get_input(): + movement = Vector2() + if Input.is_action_pressed("ui_right"): + movement.x += 10 + if Input.is_action_pressed("ui_left"): + movement.x -= 10 + if Input.is_action_pressed("ui_down"): + movement.y += 10 + if Input.is_action_pressed("ui_up"): + movement.y -= 10 + #if Input.is_action_just_pressed("shoot"): + #shoot() + +func _physics_process(delta): + get_input() + position += movement.normalized() * speed * delta diff --git a/source/entities/shooting/script/Line/Line_Barrel.gd b/source/entities/shooting/script/Line/Line_Barrel.gd new file mode 100644 index 0000000..4ba9307 --- /dev/null +++ b/source/entities/shooting/script/Line/Line_Barrel.gd @@ -0,0 +1,16 @@ +extends StaticBody2D # Y = aX + +onready var bullet = preload("res://Line_Trajectory/Line_Env.tscn") + + +func shoot(): + var b = bullet.instance() + get_parent().get_parent().get_parent().add_child(b) + b.global_position = $Position2D.global_position + b.global_rotation = $Position2D.global_rotation + + + +func _process(delta): + if Input.is_action_just_pressed("shoot"): + shoot() diff --git a/source/entities/shooting/script/Line/Line_Bullet.gd b/source/entities/shooting/script/Line/Line_Bullet.gd new file mode 100644 index 0000000..3c958c0 --- /dev/null +++ b/source/entities/shooting/script/Line/Line_Bullet.gd @@ -0,0 +1,43 @@ +extends Area2D + +export var speed = 100 +var velocity = Vector2() + +var time = 0 +export var amplitude = 4 +export var frequency = 5 +var gravitile = 5 + + +func follow_line_trajectory(): + velocity = Vector2(10, 0) + +#func follow_parabolic_trajectory(): + #velocity.x = 5 + #velocity.y = 1 * time * gravitile + #return velocity + +#func follow_hyperbolic_trajectory(): + #velocity.x = gravitile * time + #velocity.y = 1 + #return velocity + +#func input(): + #if Input.is_action_just_pressed("line"): + #return follow_sine_trajectory() + #elif Input.is_action_just_pressed("sine"): + #return follow_line_trajectory() + #else: + #print('Trajectory is not selected') + #queue_free() + +func _process(delta): + follow_line_trajectory() + time += delta + position += velocity * speed * delta + + +func _on_Bullet_body_entered(body): + if body.is_in_group("mobs"): + body.queue_free() + queue_free() diff --git a/source/entities/shooting/script/Line/Line_Env.gd b/source/entities/shooting/script/Line/Line_Env.gd new file mode 100644 index 0000000..3a7645d --- /dev/null +++ b/source/entities/shooting/script/Line/Line_Env.gd @@ -0,0 +1,9 @@ +extends Node2D + +var time = 0 + + +func _process(delta): + time += delta + if time > 17: + queue_free() diff --git a/source/entities/shooting/script/Mob.gd b/source/entities/shooting/script/Mob.gd new file mode 100644 index 0000000..16a9985 --- /dev/null +++ b/source/entities/shooting/script/Mob.gd @@ -0,0 +1,10 @@ +extends KinematicBody2D + + +var velocity = Vector2(1, 1) + +func _process(delta): + var collision = move_and_collide(velocity * delta) + + + diff --git a/source/entities/shooting/script/Parabola/Parabolic_Barrel.gd b/source/entities/shooting/script/Parabola/Parabolic_Barrel.gd new file mode 100644 index 0000000..d020184 --- /dev/null +++ b/source/entities/shooting/script/Parabola/Parabolic_Barrel.gd @@ -0,0 +1,16 @@ +extends StaticBody2D # Y = aX + +onready var bullet = preload("res://Parabolic_Trajectory/Parabolic_Env.tscn") + + +func shoot(): + var b = bullet.instance() + get_parent().get_parent().get_parent().add_child(b) + b.global_position = $Position2D.global_position + b.global_rotation = $Position2D.global_rotation + + + +func _process(delta): + if Input.is_action_just_pressed("shoot"): + shoot() diff --git a/source/entities/shooting/script/Parabola/Parabolic_Bullet.gd b/source/entities/shooting/script/Parabola/Parabolic_Bullet.gd new file mode 100644 index 0000000..beee2de --- /dev/null +++ b/source/entities/shooting/script/Parabola/Parabolic_Bullet.gd @@ -0,0 +1,24 @@ +extends Area2D + +export var speed = 100 +var velocity = Vector2() + +var time = 0 +var gravitile = 5 + + +func follow_parabolic_trajectory(): + velocity.x = 5 + velocity.y = 1 * time * gravitile + + +func _process(delta): + follow_parabolic_trajectory() + time += delta + position += velocity * speed * delta + + +func _on_Bullet_body_entered(body): + if body.is_in_group("mobs"): + body.queue_free() + queue_free() diff --git a/source/entities/shooting/script/Parabola/Parabolic_Env.gd b/source/entities/shooting/script/Parabola/Parabolic_Env.gd new file mode 100644 index 0000000..3a7645d --- /dev/null +++ b/source/entities/shooting/script/Parabola/Parabolic_Env.gd @@ -0,0 +1,9 @@ +extends Node2D + +var time = 0 + + +func _process(delta): + time += delta + if time > 17: + queue_free() diff --git a/source/entities/shooting/script/Sine/Sine_Barrel.gd b/source/entities/shooting/script/Sine/Sine_Barrel.gd new file mode 100644 index 0000000..79ce4e8 --- /dev/null +++ b/source/entities/shooting/script/Sine/Sine_Barrel.gd @@ -0,0 +1,20 @@ +extends StaticBody2D + +onready var bullet = preload("res://Sine_Trajectory/Sine_Env.tscn") + +var velocity = Vector2(1, 0) +var shooting_speed = 200 + + + +func shoot(): + var b = bullet.instance() + get_parent().get_parent().get_parent().add_child(b) + b.global_position = $Position2D.global_position + b.global_rotation = $Position2D.global_rotation + pass + + +func _process(delta): + if Input.is_action_just_pressed("shoot"): + shoot() diff --git a/source/entities/shooting/script/Sine/Sine_Bullet.gd b/source/entities/shooting/script/Sine/Sine_Bullet.gd new file mode 100644 index 0000000..1196b54 --- /dev/null +++ b/source/entities/shooting/script/Sine/Sine_Bullet.gd @@ -0,0 +1,25 @@ +extends Area2D + +export var speed = 100 +var velocity = Vector2() + +var time = 0 +export var amplitude = 4 +export var frequency = 5 +var gravitile = 5 + + +func follow_sine_trajectory(): + velocity.y = amplitude * cos(time * frequency) + velocity.x = 5 + +func _process(delta): + follow_sine_trajectory() + time += delta + position += velocity * speed * delta + + +func _on_Bullet_body_entered(body): + if body.is_in_group("mobs"): + body.queue_free() + queue_free() diff --git a/source/entities/shooting/script/Sine/Sine_Env.gd b/source/entities/shooting/script/Sine/Sine_Env.gd new file mode 100644 index 0000000..3a7645d --- /dev/null +++ b/source/entities/shooting/script/Sine/Sine_Env.gd @@ -0,0 +1,9 @@ +extends Node2D + +var time = 0 + + +func _process(delta): + time += delta + if time > 17: + queue_free() diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index c35c9fc..e01614e 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -66,8 +66,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "PLAY" align = 1 valign = 1 @@ -91,8 +91,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "LAN Party" align = 1 valign = 1 @@ -123,8 +123,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "EXIT" align = 1 valign = 1 @@ -138,8 +138,8 @@ margin_left = 1798.91 margin_top = 989.536 margin_right = 1889.91 margin_bottom = 1061.54 -custom_fonts/font = ExtResource( 8 ) custom_colors/font_color_disabled = Color( 1, 1, 1, 1 ) +custom_fonts/font = ExtResource( 8 ) __meta__ = { "_edit_use_anchors_": false } From 002d67968bd09c780d5b01e97d5f5cddb1f21236 Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Tue, 9 Nov 2021 00:30:10 +0200 Subject: [PATCH 04/13] [Minimal] Fixed username rotation --- project.godot | 30 ++--- .../ui_element_handlers/username_text.gd | 6 +- source/entities/player/player_node.tscn | 127 +++++++++--------- .../trinity_site/trinity_site_level.tscn | 2 +- source/scenes/GUI/main_menu.tscn | 8 +- .../OVERLAY/elements/simple_prompt.tscn | 2 +- .../OVERLAY/elements/username_text.tscn | 12 +- 7 files changed, 94 insertions(+), 93 deletions(-) diff --git a/project.godot b/project.godot index 243da71..c295a5d 100644 --- a/project.godot +++ b/project.godot @@ -37,42 +37,42 @@ fps=false input_right={ "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) -, 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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_left={ "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) -, 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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_up={ "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) -, 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":32,"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,"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_down={ "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) -, 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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_debug={ "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={ "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={ "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={ @@ -82,17 +82,17 @@ input_shoot={ } esc={ "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={ "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={ "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) ] } diff --git a/source/assets/scripts/ui_element_handlers/username_text.gd b/source/assets/scripts/ui_element_handlers/username_text.gd index 42618e2..a685510 100644 --- a/source/assets/scripts/ui_element_handlers/username_text.gd +++ b/source/assets/scripts/ui_element_handlers/username_text.gd @@ -2,12 +2,16 @@ 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 + print(player_following.global_position) + global_position = player_following.global_position + Vector2(0,distanceToPlayerOffset).rotated(player_following.rotation) func text_set(new_text) -> void: diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 0a58fe8..8c20894 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -174,6 +174,46 @@ [sub_resource type="SpriteFrames" id=2] 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( 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 ) ], +"loop": true, +"name": "boost-speed-left-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": "move-speed-left-02", +"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": "idle-speed-right-01", +"speed": 25.0 +}, { +"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], +"loop": true, +"name": "boost-speed-left-04", +"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": "idle-speed-right-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", @@ -184,26 +224,11 @@ animations = [ { "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": "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": "move-speed-right-03", -"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": "idle-speed-left-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 ) ], -"loop": true, -"name": "move-speed-right-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", @@ -219,6 +244,21 @@ animations = [ { "name": "idle-speed-left-04", "speed": 25.0 }, { +"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], +"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": "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( 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", @@ -238,46 +278,6 @@ animations = [ { "loop": true, "name": "boost-speed-right-02", "speed": 50.0 -}, { -"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], -"loop": true, -"name": "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 ) ], -"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": "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": "idle-speed-right-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], -"loop": true, -"name": "boost-speed-left-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 -}, { -"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( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], -"loop": true, -"name": "move-speed-left-04", -"speed": 35.0 } ] [sub_resource type="RectangleShape2D" id=3] @@ -308,6 +308,11 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { +"frames": [ ExtResource( 169 ) ], +"loop": true, +"name": "04", +"speed": 5.0 +}, { "frames": [ ExtResource( 168 ) ], "loop": true, "name": "03", @@ -322,17 +327,9 @@ animations = [ { "loop": true, "name": "02", "speed": 5.0 -}, { -"frames": [ ExtResource( 169 ) ], -"loop": true, -"name": "04", -"speed": 5.0 } ] -[node name="player" type="KinematicBody2D" groups=[ -"Net", -"Player", -]] +[node name="player" type="KinematicBody2D" groups=["Net", "Player"]] script = ExtResource( 11 ) theme = "03" @@ -345,6 +342,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 diff --git a/source/levels/trinity_site/trinity_site_level.tscn b/source/levels/trinity_site/trinity_site_level.tscn index b3db345..f9d472b 100644 --- a/source/levels/trinity_site/trinity_site_level.tscn +++ b/source/levels/trinity_site/trinity_site_level.tscn @@ -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 diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index c35c9fc..e01614e 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -66,8 +66,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "PLAY" align = 1 valign = 1 @@ -91,8 +91,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "LAN Party" align = 1 valign = 1 @@ -123,8 +123,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "EXIT" align = 1 valign = 1 @@ -138,8 +138,8 @@ margin_left = 1798.91 margin_top = 989.536 margin_right = 1889.91 margin_bottom = 1061.54 -custom_fonts/font = ExtResource( 8 ) custom_colors/font_color_disabled = Color( 1, 1, 1, 1 ) +custom_fonts/font = ExtResource( 8 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/source/scenes/OVERLAY/elements/simple_prompt.tscn b/source/scenes/OVERLAY/elements/simple_prompt.tscn index 16826ac..7d394fb 100644 --- a/source/scenes/OVERLAY/elements/simple_prompt.tscn +++ b/source/scenes/OVERLAY/elements/simple_prompt.tscn @@ -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 diff --git a/source/scenes/OVERLAY/elements/username_text.tscn b/source/scenes/OVERLAY/elements/username_text.tscn index 5d70358..236ed60 100644 --- a/source/scenes/OVERLAY/elements/username_text.tscn +++ b/source/scenes/OVERLAY/elements/username_text.tscn @@ -9,17 +9,15 @@ use_mipmaps = true use_filter = true font_data = ExtResource( 1 ) -[node name="username_text" type="Node2D" groups=[ -"Net", -]] +[node name="username_text" type="Node2D" groups=["Net"]] 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 From c45e9fc300b0ca1f54d1e144d72cd9054827df18 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 9 Nov 2021 00:47:46 +0200 Subject: [PATCH 05/13] Added bullet despawn timer --- project.godot | 10 ++++++++++ source/assets/scripts/player_handlers/player_bullet.gd | 2 +- source/entities/bullet/player_bullet.tscn | 9 ++++++--- source/entities/player/player_node.tscn | 1 - 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/project.godot b/project.godot index 243da71..9f433a9 100644 --- a/project.godot +++ b/project.godot @@ -95,6 +95,16 @@ rotation_decrease={ "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) ] } +weapon_1={ +"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) + ] +} +weapon_2={ +"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) + ] +} [physics] diff --git a/source/assets/scripts/player_handlers/player_bullet.gd b/source/assets/scripts/player_handlers/player_bullet.gd index 76106da..d3d5199 100644 --- a/source/assets/scripts/player_handlers/player_bullet.gd +++ b/source/assets/scripts/player_handlers/player_bullet.gd @@ -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") diff --git a/source/entities/bullet/player_bullet.tscn b/source/entities/bullet/player_bullet.tscn index 1b30fbc..d3813c1 100644 --- a/source/entities/bullet/player_bullet.tscn +++ b/source/entities/bullet/player_bullet.tscn @@ -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 diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 0a58fe8..4b1ce08 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -334,7 +334,6 @@ animations = [ { "Player", ]] script = ExtResource( 11 ) -theme = "03" [node name="player_collider" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) From 16ede8b64fd7d685f83e6a7f8f5c443d01ba2fab Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 9 Nov 2021 00:50:38 +0200 Subject: [PATCH 06/13] Added bullet despawn timer --- .../ui_element_handlers/username_text.gd | 1 - source/entities/player/player_node.tscn | 167 +++++++++--------- source/scenes/GUI/main_menu.tscn | 8 +- .../OVERLAY/elements/username_text.tscn | 4 +- 4 files changed, 92 insertions(+), 88 deletions(-) diff --git a/source/assets/scripts/ui_element_handlers/username_text.gd b/source/assets/scripts/ui_element_handlers/username_text.gd index a685510..c009c2f 100644 --- a/source/assets/scripts/ui_element_handlers/username_text.gd +++ b/source/assets/scripts/ui_element_handlers/username_text.gd @@ -10,7 +10,6 @@ onready var label = $Label func _process(delta: float) -> void: if player_following != null: - print(player_following.global_position) global_position = player_following.global_position + Vector2(0,distanceToPlayerOffset).rotated(player_following.rotation) diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index ce2f328..816845c 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -174,21 +174,86 @@ [sub_resource type="SpriteFrames" id=2] 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( 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", +"name": "idle-speed-right-01", +"speed": 25.0 +}, { +"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], +"loop": true, +"name": "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 ) ], "loop": true, -"name": "boost-speed-left-01", +"name": "idle-speed-left-01", +"speed": 25.0 +}, { +"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"loop": true, +"name": "boost-speed-right-04", "speed": 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 ) ], +"loop": true, +"name": "move-speed-left-01", +"speed": 35.0 +}, { +"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], +"loop": true, +"name": "boost-speed-left-03", +"speed": 50.0 +}, { +"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], +"loop": true, +"name": "move-speed-right-02", +"speed": 35.0 +}, { +"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"loop": true, +"name": "idle-speed-left-02", +"speed": 25.0 +}, { +"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], +"loop": true, +"name": "move-speed-right-01", +"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": 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": "idle-speed-right-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": 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 +}, { +"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( 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( 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( 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", @@ -201,83 +266,18 @@ 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": "idle-speed-right-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], -"loop": true, -"name": "boost-speed-left-04", +"name": "boost-speed-right-01", "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": "idle-speed-right-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": 50.0 -}, { -"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], -"loop": true, -"name": "move-speed-right-02", -"speed": 35.0 -}, { -"frames": [ ExtResource( 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", -"speed": 25.0 -}, { -"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], -"loop": true, -"name": "boost-speed-right-04", +"name": "boost-speed-left-01", "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": "idle-speed-left-04", -"speed": 25.0 -}, { -"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], -"loop": true, -"name": "move-speed-left-03", +"name": "move-speed-left-04", "speed": 35.0 -}, { -"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], -"loop": true, -"name": "move-speed-right-03", -"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( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], -"loop": true, -"name": "move-speed-left-01", -"speed": 35.0 -}, { -"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], -"loop": true, -"name": "boost-speed-left-03", -"speed": 50.0 -}, { -"frames": [ ExtResource( 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( 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 } ] [sub_resource type="RectangleShape2D" id=3] @@ -318,18 +318,21 @@ animations = [ { "name": "03", "speed": 5.0 }, { -"frames": [ ExtResource( 27 ) ], -"loop": true, -"name": "01", -"speed": 5.0 -}, { "frames": [ ExtResource( 170 ) ], "loop": true, "name": "02", "speed": 5.0 +}, { +"frames": [ ExtResource( 27 ) ], +"loop": true, +"name": "01", +"speed": 5.0 } ] -[node name="player" type="KinematicBody2D" groups=["Net", "Player"]] +[node name="player" type="KinematicBody2D" groups=[ +"Net", +"Player", +]] script = ExtResource( 11 ) [node name="player_collider" type="CollisionShape2D" parent="."] @@ -341,7 +344,7 @@ scale = Vector2( 0.25, 0.25 ) z_index = 1 frames = SubResource( 2 ) animation = "idle-speed-left-01" -frame = 5 +frame = 17 playing = true [node name="player_sprite" type="Sprite" parent="."] diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index e01614e..c35c9fc 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -66,8 +66,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "PLAY" align = 1 valign = 1 @@ -91,8 +91,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "LAN Party" align = 1 valign = 1 @@ -123,8 +123,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "EXIT" align = 1 valign = 1 @@ -138,8 +138,8 @@ 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 ) +custom_colors/font_color_disabled = Color( 1, 1, 1, 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/source/scenes/OVERLAY/elements/username_text.tscn b/source/scenes/OVERLAY/elements/username_text.tscn index 236ed60..ca2df41 100644 --- a/source/scenes/OVERLAY/elements/username_text.tscn +++ b/source/scenes/OVERLAY/elements/username_text.tscn @@ -9,7 +9,9 @@ use_mipmaps = true use_filter = true font_data = ExtResource( 1 ) -[node name="username_text" type="Node2D" groups=["Net"]] +[node name="username_text" type="Node2D" groups=[ +"Net", +]] z_index = 10 script = ExtResource( 2 ) From 64a2d2332da43b25c2ac7f417bc7a6b7238bbe18 Mon Sep 17 00:00:00 2001 From: Kristofers Solo <67258855+KristofersSolo@users.noreply.github.com> Date: Tue, 9 Nov 2021 00:52:05 +0200 Subject: [PATCH 07/13] Delete Game directory --- Game/default_env.tres | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Game/default_env.tres diff --git a/Game/default_env.tres b/Game/default_env.tres deleted file mode 100644 index 20207a4..0000000 --- a/Game/default_env.tres +++ /dev/null @@ -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 ) From f4b5e60376fdf799edf49f3c68e367c92d479feb Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 9 Nov 2021 01:01:04 +0200 Subject: [PATCH 08/13] Fixed missing elements on 'esc' pressed --- .../network_processors/network_setup.gd | 1 + .../server_processors/server_browser.gd | 1 + source/entities/player/player_node.tscn | 106 +++++++++--------- source/scenes/GUI/network_setup.tscn | 34 +++--- 4 files changed, 72 insertions(+), 70 deletions(-) diff --git a/source/assets/scripts/server_handlers/network_processors/network_setup.gd b/source/assets/scripts/server_handlers/network_processors/network_setup.gd index 93bf673..590e106 100644 --- a/source/assets/scripts/server_handlers/network_processors/network_setup.gd +++ b/source/assets/scripts/server_handlers/network_processors/network_setup.gd @@ -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(): diff --git a/source/assets/scripts/server_handlers/server_processors/server_browser.gd b/source/assets/scripts/server_handlers/server_processors/server_browser.gd index 44081ef..c9b5439 100644 --- a/source/assets/scripts/server_handlers/server_processors/server_browser.gd +++ b/source/assets/scripts/server_handlers/server_processors/server_browser.gd @@ -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): diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 9af791d..724ce6b 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -173,51 +173,6 @@ [sub_resource type="SpriteFrames" id=2] 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": "idle-speed-right-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], -"loop": true, -"name": "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 ) ], -"loop": true, -"name": "idle-speed-left-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], -"loop": true, -"name": "boost-speed-right-04", -"speed": 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", -"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 ) ], -"loop": true, -"name": "boost-speed-left-01", -"speed": 50.0 -}, { -"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], -"loop": true, -"name": "move-speed-right-01", -"speed": 35.0 -}, { -"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], -"loop": true, -"name": "boost-speed-left-03", -"speed": 50.0 -}, { -"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], -"loop": true, -"name": "move-speed-right-02", -"speed": 35.0 -}, { "frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], "loop": true, "name": "idle-speed-right-03", @@ -228,6 +183,11 @@ animations = [ { "name": "move-speed-left-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": "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": "idle-speed-left-02", @@ -238,6 +198,11 @@ animations = [ { "name": "boost-speed-right-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 ) ], +"loop": true, +"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": "move-speed-right-03", @@ -248,6 +213,21 @@ animations = [ { "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", @@ -258,9 +238,29 @@ animations = [ { "name": "boost-speed-right-01", "speed": 50.0 }, { -"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"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-right-04", +"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", +"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", +"speed": 50.0 +}, { +"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], +"loop": true, +"name": "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": "move-speed-right-02", "speed": 35.0 } ] @@ -292,11 +292,6 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { -"frames": [ ExtResource( 169 ) ], -"loop": true, -"name": "04", -"speed": 5.0 -}, { "frames": [ ExtResource( 170 ) ], "loop": true, "name": "02", @@ -306,6 +301,11 @@ animations = [ { "loop": true, "name": "01", "speed": 5.0 +}, { +"frames": [ ExtResource( 169 ) ], +"loop": true, +"name": "04", +"speed": 5.0 } ] [node name="player" type="KinematicBody2D" groups=[ @@ -323,7 +323,7 @@ scale = Vector2( 0.25, 0.25 ) z_index = 1 frames = SubResource( 2 ) animation = "idle-speed-left-01" -frame = 1 +frame = 5 playing = true [node name="player_sprite" type="Sprite" parent="."] diff --git a/source/scenes/GUI/network_setup.tscn b/source/scenes/GUI/network_setup.tscn index 62ce7ce..c03b136 100644 --- a/source/scenes/GUI/network_setup.tscn +++ b/source/scenes/GUI/network_setup.tscn @@ -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 From dbd491a9f2a7135211592c0783376480ed71100b Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Tue, 9 Nov 2021 01:07:39 +0200 Subject: [PATCH 09/13] [Minimal] Undefined --- project.godot | 30 +++++++++++++++--------------- source/scenes/GUI/main_menu.tscn | 8 ++++---- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/project.godot b/project.godot index 243da71..c295a5d 100644 --- a/project.godot +++ b/project.godot @@ -37,42 +37,42 @@ fps=false input_right={ "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) -, 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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_left={ "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) -, 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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_up={ "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) -, 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":32,"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,"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_down={ "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) -, 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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } input_debug={ "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={ "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={ "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={ @@ -82,17 +82,17 @@ input_shoot={ } esc={ "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={ "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={ "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) ] } diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index c35c9fc..e01614e 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -66,8 +66,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "PLAY" align = 1 valign = 1 @@ -91,8 +91,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "LAN Party" align = 1 valign = 1 @@ -123,8 +123,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "EXIT" align = 1 valign = 1 @@ -138,8 +138,8 @@ margin_left = 1798.91 margin_top = 989.536 margin_right = 1889.91 margin_bottom = 1061.54 -custom_fonts/font = ExtResource( 8 ) custom_colors/font_color_disabled = Color( 1, 1, 1, 1 ) +custom_fonts/font = ExtResource( 8 ) __meta__ = { "_edit_use_anchors_": false } From 10d5d393d37086313054b989990838f39826b78c Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Tue, 9 Nov 2021 01:34:28 +0200 Subject: [PATCH 10/13] [Medium] Animation fix. --- .../player_handlers/player_body_handler.gd | 1 - source/entities/player/player_node.tscn | 131 +++++++++++------- 2 files changed, 79 insertions(+), 53 deletions(-) diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index ccdbb68..4d6e22f 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -241,7 +241,6 @@ func _physics_process(delta) -> void: $"weaponHolder/Player-character-theme-gun".position = puppet_weapon_position weaponAngle = puppet_weapon_angle direction = puppet_direction - if velocityVDIR.x != 0 and maxMovementSpeed.x == 200: $player_animated_sprite.play("move-speed-"+direction+"-"+theme) elif maxMovementSpeed.x > 200 and not characterStates["jumped"]: diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 724ce6b..bd6f584 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -173,49 +173,44 @@ [sub_resource type="SpriteFrames" id=2] 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": "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": "move-speed-left-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": "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": "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 ) ], +"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-03", +"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": "boost-speed-left-02", "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( 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-right-01", -"speed": 35.0 +"name": "boost-speed-left-04", +"speed": 50.0 }, { "frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], "loop": true, "name": "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 ) ], +"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-04", +"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 ) ], +"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-left-01", +"name": "idle-speed-right-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 ) ], +"loop": true, +"name": "idle-speed-right-03", "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 ) ], @@ -223,6 +218,36 @@ animations = [ { "name": "boost-speed-left-01", "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 ), ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"loop": true, +"name": "move-speed-left-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( 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( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], +"loop": true, +"name": "move-speed-left-01", +"speed": 35.0 +}, { +"frames": [ ExtResource( 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": "boost-speed-right-03", +"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", @@ -230,17 +255,7 @@ animations = [ { }, { "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", +"name": "boost-speed-right-04", "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 ) ], @@ -248,20 +263,35 @@ animations = [ { "name": "boost-speed-right-02", "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 ) ], +"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-04", +"name": "boost-speed-left-03", "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": "idle-speed-left-03", +"speed": 25.0 +}, { "frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "loop": true, -"name": "idle-speed-right-01", +"name": "move-speed-right-01", +"speed": 35.0 +}, { +"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"loop": true, +"name": "move-speed-left-02", +"speed": 35.0 +}, { +"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], +"loop": true, +"name": "idle-speed-left-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 ) ], +"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-02", -"speed": 35.0 +"name": "boost-speed-right-01", +"speed": 50.0 } ] [sub_resource type="RectangleShape2D" id=3] @@ -292,6 +322,11 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { +"frames": [ ExtResource( 169 ) ], +"loop": true, +"name": "04", +"speed": 5.0 +}, { "frames": [ ExtResource( 170 ) ], "loop": true, "name": "02", @@ -301,17 +336,9 @@ animations = [ { "loop": true, "name": "01", "speed": 5.0 -}, { -"frames": [ ExtResource( 169 ) ], -"loop": true, -"name": "04", -"speed": 5.0 } ] -[node name="player" type="KinematicBody2D" groups=[ -"Net", -"Player", -]] +[node name="player" type="KinematicBody2D" groups=["Net", "Player"]] script = ExtResource( 11 ) [node name="player_collider" type="CollisionShape2D" parent="."] @@ -322,8 +349,8 @@ script = ExtResource( 2 ) scale = Vector2( 0.25, 0.25 ) z_index = 1 frames = SubResource( 2 ) -animation = "idle-speed-left-01" -frame = 5 +animation = "idle-speed-right-04" +frame = 14 playing = true [node name="player_sprite" type="Sprite" parent="."] From d04434256c916fe041877401cb21ddeb709d7f25 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 9 Nov 2021 02:07:56 +0200 Subject: [PATCH 11/13] Fixed removing of hitboxes after player death --- project.godot | 30 ++-- .../player_handlers/player_body_handler.gd | 4 + source/entities/player/player_node.tscn | 158 +++++++++--------- source/scenes/GUI/main_menu.tscn | 8 +- 4 files changed, 103 insertions(+), 97 deletions(-) diff --git a/project.godot b/project.godot index c295a5d..243da71 100644 --- a/project.godot +++ b/project.godot @@ -37,42 +37,42 @@ fps=false input_right={ "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,"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,"physical_scancode":0,"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,"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) ] } input_left={ "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,"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,"physical_scancode":0,"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,"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) ] } input_up={ "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,"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,"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,"physical_scancode":0,"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,"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":32,"unicode":0,"echo":false,"script":null) ] } input_down={ "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,"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,"physical_scancode":0,"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,"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) ] } input_debug={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } input_enter={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } input_shift={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } input_shoot={ @@ -82,17 +82,17 @@ input_shoot={ } esc={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } rotation_increase={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } rotation_decrease={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 4d6e22f..dab52fa 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -373,6 +373,8 @@ sync func enable() -> void: visible = true $player_collider.disabled = false $hitbox/CollisionShape2D.disabled = false + $player_collider.disabled = false + $weaponHolder.disabled = false if get_tree().has_network_peer(): if is_network_master(): @@ -387,6 +389,8 @@ sync func destroy() -> void: visible = false $player_collider.disabled = true $hitbox/CollisionShape2D.disabled = true + $player_collider.disabled = true + $weaponHolder.disabled = true Global.alive_players.erase(self) if get_tree().has_network_peer(): diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index bd6f584..26a48c9 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -175,68 +175,28 @@ 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 ) ], "loop": true, -"name": "idle-speed-left-02", -"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( 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": 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", -"speed": 50.0 +"name": "move-speed-left-02", +"speed": 35.0 }, { "frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], "loop": true, -"name": "move-speed-right-03", -"speed": 35.0 +"name": "boost-speed-right-03", +"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": "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 ) ], -"loop": true, -"name": "idle-speed-right-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 ) ], -"loop": true, -"name": "idle-speed-right-03", -"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( 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 ), ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "loop": true, -"name": "move-speed-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": "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": "move-speed-right-02", -"speed": 35.0 -}, { -"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], -"loop": true, -"name": "move-speed-left-01", -"speed": 35.0 +"name": "boost-speed-right-01", +"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, @@ -245,9 +205,34 @@ animations = [ { }, { "frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], "loop": true, -"name": "boost-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 ), ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"loop": true, +"name": "move-speed-left-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": "move-speed-right-01", +"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": 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( 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( 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", @@ -258,29 +243,9 @@ animations = [ { "name": "boost-speed-right-04", "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( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], "loop": true, -"name": "boost-speed-right-02", -"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( 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( 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( 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", +"name": "move-speed-left-01", "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 ) ], @@ -288,9 +253,44 @@ animations = [ { "name": "idle-speed-left-01", "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": "boost-speed-left-03", +"speed": 50.0 +}, { +"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"loop": true, +"name": "boost-speed-left-02", +"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": "idle-speed-right-03", +"speed": 25.0 +}, { +"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"loop": true, +"name": "idle-speed-right-04", +"speed": 25.0 +}, { +"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], +"loop": true, +"name": "idle-speed-left-03", +"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( 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", +"name": "idle-speed-right-01", +"speed": 25.0 +}, { +"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], +"loop": true, +"name": "boost-speed-left-04", "speed": 50.0 } ] @@ -322,6 +322,11 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { +"frames": [ ExtResource( 27 ) ], +"loop": true, +"name": "01", +"speed": 5.0 +}, { "frames": [ ExtResource( 169 ) ], "loop": true, "name": "04", @@ -331,14 +336,12 @@ animations = [ { "loop": true, "name": "02", "speed": 5.0 -}, { -"frames": [ ExtResource( 27 ) ], -"loop": true, -"name": "01", -"speed": 5.0 } ] -[node name="player" type="KinematicBody2D" groups=["Net", "Player"]] +[node name="player" type="KinematicBody2D" groups=[ +"Net", +"Player", +]] script = ExtResource( 11 ) [node name="player_collider" type="CollisionShape2D" parent="."] @@ -350,7 +353,6 @@ scale = Vector2( 0.25, 0.25 ) z_index = 1 frames = SubResource( 2 ) animation = "idle-speed-right-04" -frame = 14 playing = true [node name="player_sprite" type="Sprite" parent="."] diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index e01614e..c35c9fc 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -66,8 +66,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "PLAY" align = 1 valign = 1 @@ -91,8 +91,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "LAN Party" align = 1 valign = 1 @@ -123,8 +123,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "EXIT" align = 1 valign = 1 @@ -138,8 +138,8 @@ 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 ) +custom_colors/font_color_disabled = Color( 1, 1, 1, 1 ) __meta__ = { "_edit_use_anchors_": false } From 78488a2b4d1f8dcc564a4a9ff3c8cc3071617994 Mon Sep 17 00:00:00 2001 From: Moonshrike Date: Tue, 9 Nov 2021 02:45:31 +0200 Subject: [PATCH 12/13] Changing trajectories using numpad(as always) do not remove fucking Position2D --- project.godot | 5 + .../player_handlers/player_body_handler.gd | 8 +- source/entities/player/Gun_.gd | 35 ++++++ source/entities/player/player_node.tscn | 100 ++++++++++-------- .../Hyperbolic_Bullet.tscn | 4 +- .../Hyperbolic_Trajectory/Hyperbolic_Env.tscn | 6 +- .../shooting/Line_Trajectory/Line_Bullet.tscn | 4 +- .../shooting/Line_Trajectory/Line_Env.tscn | 5 +- .../Parabolic_Bullet.tscn | 4 +- .../Parabolic_Trajectory/Parabolic_Env.tscn | 6 +- .../shooting/Sine_Trajectory/Sine_Bullet.tscn | 4 +- .../shooting/Sine_Trajectory/Sine_Env.tscn | 6 +- .../shooting/script/Line/Line_Bullet.gd | 3 - .../shooting/script/Sine/Sine_Bullet.gd | 1 - .../shooting/script/pixil-frame-0 (1).png | Bin 0 -> 29132 bytes .../script/pixil-frame-0 (1).png.import | 35 ++++++ 16 files changed, 156 insertions(+), 70 deletions(-) create mode 100644 source/entities/player/Gun_.gd create mode 100644 source/entities/shooting/script/pixil-frame-0 (1).png create mode 100644 source/entities/shooting/script/pixil-frame-0 (1).png.import diff --git a/project.godot b/project.godot index bdd770c..5e962a7 100644 --- a/project.godot +++ b/project.godot @@ -115,6 +115,11 @@ parab={ "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) ] } +shoot={ +"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":82,"physical_scancode":0,"unicode":0,"echo":false,"script":null) + ] +} [physics] diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 69b6454..27bded0 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -77,13 +77,12 @@ func equip_weapon(): if Input.is_action_just_pressed("hyper"): weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na4".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na4".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na4".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na4".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) $"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset - return weaponPositionalOffset pass func _ready(): - #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 + 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 get_tree().connect("network_peer_connected", self, "_network_peer_connected") username_text_instance = Global.instance_node_at_location(username_text, PersistentNodes, global_position) username_text_instance.player_following = self @@ -173,7 +172,6 @@ func _process(delta: float) -> void: VDIR[v_t][v]["ray"]["collided"] = false update() process_rotation() - equip_weapon() func _physics_process(delta) -> void: @@ -249,6 +247,7 @@ func _physics_process(delta) -> void: # 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) @@ -421,6 +420,7 @@ func _exit_tree() -> void: Global.player_master = null func rotate_weapon(): + #equip_weapon() weaponPosition = $"weaponHolder/Player-character-theme-gun".position weaponPosition -= Vector2(weaponPositionalOffset.x,0).rotated(deg2rad(weaponAngle)) + Vector2(0,weaponPositionalOffset.y) if user_input["r_inc"]: diff --git a/source/entities/player/Gun_.gd b/source/entities/player/Gun_.gd new file mode 100644 index 0000000..6b3ae8a --- /dev/null +++ b/source/entities/player/Gun_.gd @@ -0,0 +1,35 @@ +extends AnimatedSprite + +var trajectory:String = 'line' + +var bullet = { + 'line' : preload("res://source/entities/shooting/Line_Trajectory/Line_Env.tscn"), + 'sine' : preload("res://source/entities/shooting/Sine_Trajectory/Sine_Env.tscn"), + 'parab' : preload("res://source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn"), + 'hyper' : preload("res://source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn") +} + +func choose_trajectory(): + trajectory + if Input.is_action_just_pressed("line"): + trajectory = 'line' + elif Input.is_action_just_pressed("sine"): + trajectory = 'sine' + elif Input.is_action_just_pressed("parab"): + trajectory = 'parab' + elif Input.is_action_just_pressed("hyper"): + trajectory = 'hyper' + + +func shoot(trajectory:String): + var b = bullet[trajectory].instance() + get_parent().get_parent().get_parent().add_child(b) + b.global_position = $Position2D.global_position + b.global_rotation = $Position2D.global_rotation + pass + + +func _process(delta): + choose_trajectory() + if Input.is_action_just_pressed("shoot"): + shoot(trajectory) diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 9fa6531..0f6a442 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -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/scripts/player_handlers/player_collider_handler.gd" type="Script" id=2] @@ -15,6 +15,7 @@ [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 7.png" type="Texture" id=13] [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 12.png" type="Texture" id=14] [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 10.png" type="Texture" id=15] +[ext_resource path="res://source/entities/player/Gun_.gd" type="Script" id=16] [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/left_r/Player-character-theme-01_anim-idle – 17.png" type="Texture" id=20] @@ -174,6 +175,11 @@ [sub_resource type="SpriteFrames" id=2] 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( 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", @@ -194,36 +200,41 @@ animations = [ { "name": "move-speed-right-02", "speed": 35.0 }, { -"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], +"frames": [ ExtResource( 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-04", +"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 ) ], +"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-02", +"name": "idle-speed-right-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 ) ], +"loop": true, +"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": "idle-speed-left-04", "speed": 25.0 }, { +"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"loop": true, +"name": "idle-speed-left-02", +"speed": 25.0 +}, { +"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"loop": true, +"name": "boost-speed-right-04", +"speed": 50.0 +}, { "frames": [ ExtResource( 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", -"speed": 50.0 -}, { -"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], -"loop": true, -"name": "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": "idle-speed-left-01", @@ -234,49 +245,39 @@ animations = [ { "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 ) ], +"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-right-01", -"speed": 35.0 +"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 ) ], "loop": true, "name": "move-speed-left-01", "speed": 35.0 }, { -"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], "loop": true, -"name": "idle-speed-left-02", +"name": "idle-speed-right-02", "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( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], -"loop": true, -"name": "boost-speed-right-04", -"speed": 50.0 -}, { -"frames": [ ExtResource( 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( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], "loop": true, "name": "boost-speed-right-03", "speed": 50.0 }, { +"frames": [ ExtResource( 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-02", "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 ) ], +"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "loop": true, -"name": "move-speed-right-04", +"name": "move-speed-right-01", "speed": 35.0 } ] @@ -318,15 +319,15 @@ animations = [ { "name": "04", "speed": 5.0 }, { -"frames": [ ExtResource( 170 ) ], -"loop": true, -"name": "02", -"speed": 5.0 -}, { "frames": [ ExtResource( 27 ) ], "loop": true, "name": "01", "speed": 5.0 +}, { +"frames": [ ExtResource( 170 ) ], +"loop": true, +"name": "02", +"speed": 5.0 } ] [node name="player" type="KinematicBody2D" groups=["Net", "Player"]] @@ -381,23 +382,38 @@ texture = ExtResource( 26 ) shape = SubResource( 5 ) [node name="Player-character-theme-gun" type="AnimatedSprite" parent="weaponHolder"] +position = Vector2( -13, 1 ) scale = Vector2( 0.25, 0.25 ) frames = SubResource( 6 ) animation = "04" +script = ExtResource( 16 ) + +[node name="Position2D" type="Position2D" parent="weaponHolder/Player-character-theme-gun"] +position = Vector2( -120, 0 ) +rotation = 3.14159 +scale = Vector2( 4, 4 ) [node name="Player-character-theme-gun-na1" type="Sprite" parent="weaponHolder"] +visible = false +position = Vector2( -100, 7 ) scale = Vector2( 0.25, 0.25 ) texture = ExtResource( 171 ) [node name="Player-character-theme-gun-na2" type="Sprite" parent="weaponHolder"] +visible = false +position = Vector2( -106, -18 ) scale = Vector2( 0.177591, 0.18125 ) texture = ExtResource( 171 ) [node name="Player-character-theme-gun-na3" type="Sprite" parent="weaponHolder"] +visible = false +position = Vector2( -93, -65 ) scale = Vector2( 0.375937, 0.251953 ) texture = ExtResource( 171 ) [node name="Player-character-theme-gun-na4" type="Sprite" parent="weaponHolder"] +visible = false +position = Vector2( -104, -38 ) scale = Vector2( 0.508138, 0.140008 ) texture = ExtResource( 171 ) diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn index cd9ffd6..ceca1f7 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2] +[ext_resource path="res://source/entities/shooting/script/pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] radius = 5.4212 diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn index 6dd98e1..5ec5b09 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://script/Hyperbola/Hyperbolic_Env.gd" type="Script" id=2] -[ext_resource path="res://script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=3] +[ext_resource path="res://source/entities/shooting/Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd" type="Script" id=2] +[ext_resource path="res://source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=3] [node name="Env" type="Node2D"] script = ExtResource( 2 ) diff --git a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn index b342e67..663d286 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] +[ext_resource path="res://source/entities/shooting/script/pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://source/entities/shooting/script/Line/Line_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] radius = 5.4212 diff --git a/source/entities/shooting/Line_Trajectory/Line_Env.tscn b/source/entities/shooting/Line_Trajectory/Line_Env.tscn index 0640b7e..fd6cdd7 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Env.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Env.tscn @@ -1,10 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://script/Line/Line_Env.gd" type="Script" id=2] +[ext_resource path="res://source/entities/shooting/Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://source/entities/shooting/script/Line/Line_Env.gd" type="Script" id=2] [node name="Env" type="Node2D"] script = ExtResource( 2 ) [node name="Bullet" parent="." instance=ExtResource( 1 )] -position = Vector2( 0, -0.222725 ) diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn index b342e67..663d286 100644 --- a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] +[ext_resource path="res://source/entities/shooting/script/pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://source/entities/shooting/script/Line/Line_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] radius = 5.4212 diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn index 07cfd7f..6be9026 100644 --- a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://script/Parabola/Parabolic_Env.gd" type="Script" id=2] -[ext_resource path="res://script/Parabola/Parabolic_Bullet.gd" type="Script" id=3] +[ext_resource path="res://source/entities/shooting/Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://source/entities/shooting/script/Parabola/Parabolic_Env.gd" type="Script" id=2] +[ext_resource path="res://source/entities/shooting/script/Parabola/Parabolic_Bullet.gd" type="Script" id=3] [node name="Env" type="Node2D"] script = ExtResource( 2 ) diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn index b342e67..342b744 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] +[ext_resource path="res://source/entities/shooting/script/pixil-frame-0 (1).png" type="Texture" id=1] +[ext_resource path="res://source/entities/shooting/script/Sine/Sine_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] radius = 5.4212 diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn index f0c77d5..96b2aa5 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://script/Sine/Sine_Env.gd" type="Script" id=2] -[ext_resource path="res://script/Sine/Sine_Bullet.gd" type="Script" id=3] +[ext_resource path="res://source/entities/shooting/Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] +[ext_resource path="res://source/entities/shooting/script/Sine/Sine_Env.gd" type="Script" id=2] +[ext_resource path="res://source/entities/shooting/script/Sine/Sine_Bullet.gd" type="Script" id=3] [node name="Env" type="Node2D"] script = ExtResource( 2 ) diff --git a/source/entities/shooting/script/Line/Line_Bullet.gd b/source/entities/shooting/script/Line/Line_Bullet.gd index 3c958c0..7ca1846 100644 --- a/source/entities/shooting/script/Line/Line_Bullet.gd +++ b/source/entities/shooting/script/Line/Line_Bullet.gd @@ -4,9 +4,6 @@ export var speed = 100 var velocity = Vector2() var time = 0 -export var amplitude = 4 -export var frequency = 5 -var gravitile = 5 func follow_line_trajectory(): diff --git a/source/entities/shooting/script/Sine/Sine_Bullet.gd b/source/entities/shooting/script/Sine/Sine_Bullet.gd index 1196b54..dfd000a 100644 --- a/source/entities/shooting/script/Sine/Sine_Bullet.gd +++ b/source/entities/shooting/script/Sine/Sine_Bullet.gd @@ -6,7 +6,6 @@ var velocity = Vector2() var time = 0 export var amplitude = 4 export var frequency = 5 -var gravitile = 5 func follow_sine_trajectory(): diff --git a/source/entities/shooting/script/pixil-frame-0 (1).png b/source/entities/shooting/script/pixil-frame-0 (1).png new file mode 100644 index 0000000000000000000000000000000000000000..ecdddeac28feab66f10c07101cd4acda698c8f6c GIT binary patch literal 29132 zcmeHQX-rgC6rMMXbX1@N#0^14P{E~uaY0341Qaj|R6tP+Jh!4zSyWtDAI7TGNFg{# z-L+V1R6tvbiolC8(b5)Dw4%idjRixIfZzm%W$0nvy(}~RQJb_e&G|u?nfLCw=brPO zbH97uy)!BPzFx*7EJlb#B4ZzK&y^yPB){)ZY6zb+PW-w8{xQ2&dbx{o%Pkv3BDu)N zb8+Cl&{t1>ie9%`=DB#9^_8qlt90e)W#xxWnD*rJQJK{mmF@h(aJRs=7e6LRq%ygJ z6EWg}7k9;Ocb|IN>U;|KwS3I)lnmTQTW)0xR^6WP8+|))gHdqAP|1C_$Uk8DWmUG8 zgL~9A<(Th{^>mSD4>JmGh&`yUjT3uIPlPD>8;+SC@>$e?4pb|{8P56xN*nFOUTQQ= z9WwmB7CcvHNLvobsuUYu-M#3psjk7KWAmTsiQp7#c}|(@HE)n*iAaOY@p>X;-Xq86 zSE{65dKP2(odyFsP_5ADXmmunUa(+#5iyuvFsI{0iW8|0-$C|*lo5G4@^oAr>8!|b zMT(RW%K%t=!P<*%RSGF1QbweVNEwkbB4wlx9_XV8tTJMi5vzegyvX>l23FNR?SgscsE~%3^iRt^V{G=bDpZbYPgm>Cc8PZd}mv|#)jNb8vv(_ z{a&lr3rkJ*JjZNfx7wHsdozomaZy)$toCC5hdftsJtlIBK*E;73F4(yb_)eTEgZ)* zGPB*>NdafyC3vsw)XXK9M=%DDr$6dhK~}W9ox~{k9N+eZu+rtd;qrrD4ieFGLG;|h z<|ge$HV0G+Zw_4{NH&5))W!~ey9GhD6QQBU_QWG(254CT?;BtBY$liI!04)Oc3mM0 z>g2;Pp!XlD7Ymo!uR!#c=nZ7Fad0uNsC}pQVtx>ewqSoVQK@8k?Tf1F`^qp)O={vGY-}=6ba04=-uQaiBz!zlmH1>T#xMV(0o9VKV^1&Y?; zRQ3UoEza~4G-1Sc(6#yG8rrxVx_Y^)WD@Dia`@Q%)U0?<;yYv^J2a&UjRZ;1_6 z0vw)tIo_KpVFpUfR8yx$Ie-#{t&^z|o}k3V-^U9|0DwztYTR5^BMooXcU*$s}l@+@_`b~Lr8 zz{Y1ovzf+*?8J#e&;DQ=Wp(;7t!?7X!6y%o&Sn>#dE`ipSq6jL>2gCm$mB>HmXD21 zH@upY(fNsBA;lV=3yScXtJR=o1=zsPv655mURg@)Z4Y)RYkII$Ylo5)ux`T=i~O^` ze~d8`0&+8a`N1u#r&_D>&ZbW6qGE4Q!>7kxu*UfrEI+N#cDz>Mjwzr|&X}!y?1IZ- z#J0!5`*nLZ314tf1C~_1vHACmz=&;!xh58eSY&Cs+IuQpdOKh4Y3Q;}3hV4{YVRso z=oabR`{kXbueK3iUgVOter>L&t$-duhkBpySUo@@O30hmJQ+vnFtmqymP#mb=n8It}*|BA%Eax*FP!uz2I@i9^e)-Ins_nv#d;x1dyzcgoOGx zS!_qCm5aR?3J~%qr3IGt-!hGd`{!##5T6_r5*n$;oKrZ1#!Y`gwS$=VR>kZu)+5e# zVw0;G7xbBS;4sVJpX*el+%SOc)6#kQzK8UQw*ROoHt0l^9`}#3spS`p(_bv$0H{sT z0|eCwAzC)UASQJ!%t9nKFpbi5i4z%#4V;NdxyEfmCAXA`z(s z4UxB@5-*Q*cZx)&8~T1Dpl>mc%oLgF;Ce7v<89!C5E@iI#*Fk&G7>@vA%ulqoQVm) zmB}%UVj3Ot#9kuB8WGlrbXY3Zh_FUP^CZ@Y2o|tL^v=|X4A}{3e0We(9{fC`$Y+VK JXRbSY;7<{&pymJo literal 0 HcmV?d00001 diff --git a/source/entities/shooting/script/pixil-frame-0 (1).png.import b/source/entities/shooting/script/pixil-frame-0 (1).png.import new file mode 100644 index 0000000..16d5212 --- /dev/null +++ b/source/entities/shooting/script/pixil-frame-0 (1).png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/pixil-frame-0 (1).png-aa4fc3ac5779e5dd3e9b1e2bedd174f2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/entities/shooting/script/pixil-frame-0 (1).png" +dest_files=[ "res://.import/pixil-frame-0 (1).png-aa4fc3ac5779e5dd3e9b1e2bedd174f2.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 From 239cedf2b8947f2c207e475df26964381a396b05 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 9 Nov 2021 10:13:47 +0200 Subject: [PATCH 13/13] Fixed dependencies --- Pavels/README.md | 12 --- .../Hyperbolic_Barrel.tscn | 22 ----- .../Hyperbolic_Bullet.tscn | 22 ----- .../Hyperbolic_Trajectory/Hyperbolic_Env.tscn | 12 --- .../Line_Trajectory/Line_Barrel.tscn | 22 ----- .../Line_Trajectory/Line_Bullet.tscn | 22 ----- .../Line_Trajectory/Line_Env.tscn | 10 --- .../Parabolic_Barrel.tscn | 22 ----- .../Parabolic_Bullet.tscn | 22 ----- .../Parabolic_Trajectory/Parabolic_Env.tscn | 12 --- Pavels/bullet_trajectory/Player.tscn | 19 ---- .../Sine_Trajectory/Sine_Barrel.tscn | 22 ----- .../Sine_Trajectory/Sine_Bullet.tscn | 22 ----- .../Sine_Trajectory/Sine_Env.tscn | 12 --- Pavels/bullet_trajectory/default_env.tres | 7 -- Pavels/bullet_trajectory/game.tscn | 32 ------- Pavels/bullet_trajectory/icon.png | Bin 3305 -> 0 bytes Pavels/bullet_trajectory/icon.png.import | 34 ------- .../bullet_trajectory/pixil-frame-0 (1).png | Bin 29132 -> 0 bytes .../pixil-frame-0 (1).png.import | 34 ------- Pavels/bullet_trajectory/pixilart-drawing.png | Bin 818 -> 0 bytes .../pixilart-drawing.png.import | 34 ------- Pavels/bullet_trajectory/project.godot | 85 ------------------ Pavels/bullet_trajectory/script/Gun.gd | 30 ------- .../script/Hyperbola/Hyperbolic_Barrel.gd | 16 ---- .../script/KinematicBody2D.gd | 26 ------ .../script/Line/Line_Barrel.gd | 16 ---- .../script/Line/Line_Bullet.gd | 43 --------- Pavels/bullet_trajectory/script/Mob.gd | 10 --- .../script/Parabola/Parabolic_Barrel.gd | 16 ---- .../script/Sine/Sine_Barrel.gd | 20 ----- .../script/Sine/Sine_Bullet.gd | 25 ------ project.godot | 43 ++++----- .../player_handlers/player_body_handler.gd | 2 + .../scripts/shooting}/Gun_.gd | 13 ++- .../shooting/Hyperbola/Hyperbolic_Barrel.gd | 16 ++++ .../shooting}/Hyperbola/Hyperbolic_Bullet.gd | 0 .../shooting}/Hyperbola/Hyperbolic_Env.gd | 0 .../scripts/shooting/Line/Line_Barrel.gd | 16 ++++ .../scripts/shooting}/Line/Line_Bullet.gd | 0 .../assets/scripts/shooting}/Line/Line_Env.gd | 0 .../shooting/Parabola/Parabolic_Barrel.gd | 16 ++++ .../shooting}/Parabola/Parabolic_Bullet.gd | 0 .../shooting}/Parabola/Parabolic_Env.gd | 0 .../scripts/shooting/Sine/Sine_Barrel.gd | 20 +++++ .../scripts/shooting}/Sine/Sine_Bullet.gd | 0 .../assets/scripts/shooting}/Sine/Sine_Env.gd | 0 source/entities/player/player_node.tscn | 36 ++++---- .../Hyperbolic_Barrel.tscn | 2 +- .../Hyperbolic_Bullet.tscn | 9 +- .../Hyperbolic_Trajectory/Hyperbolic_Env.tscn | 4 +- .../shooting/Line_Trajectory/Line_Barrel.tscn | 2 +- .../shooting/Line_Trajectory/Line_Bullet.tscn | 9 +- .../shooting/Line_Trajectory/Line_Env.tscn | 2 +- .../Parabolic_Barrel.tscn | 2 +- .../Parabolic_Bullet.tscn | 9 +- .../Parabolic_Trajectory/Parabolic_Env.tscn | 4 +- .../shooting/Sine_Trajectory/Sine_Barrel.tscn | 2 +- .../shooting/Sine_Trajectory/Sine_Bullet.tscn | 9 +- .../shooting/Sine_Trajectory/Sine_Env.tscn | 4 +- source/entities/shooting/script/Gun.gd | 30 ------- .../script/Hyperbola/Hyperbolic_Barrel.gd | 16 ---- .../script/Hyperbola/Hyperbolic_Bullet.gd | 24 ----- .../script/Hyperbola/Hyperbolic_Env.gd | 10 --- .../shooting/script/KinematicBody2D.gd | 26 ------ .../shooting/script/Line/Line_Barrel.gd | 16 ---- .../entities/shooting/script/Line/Line_Env.gd | 9 -- source/entities/shooting/script/Mob.gd | 10 --- .../script/Parabola/Parabolic_Barrel.gd | 16 ---- .../script/Parabola/Parabolic_Bullet.gd | 24 ----- .../shooting/script/Parabola/Parabolic_Env.gd | 9 -- .../shooting/script/Sine/Sine_Barrel.gd | 20 ----- .../entities/shooting/script/Sine/Sine_Env.gd | 9 -- .../shooting/script/pixil-frame-0 (1).png | Bin 29132 -> 0 bytes .../script/pixil-frame-0 (1).png.import | 35 -------- source/scenes/GUI/main_menu.tscn | 8 +- 76 files changed, 145 insertions(+), 1018 deletions(-) delete mode 100644 Pavels/README.md delete mode 100644 Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn delete mode 100644 Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn delete mode 100644 Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Env.tscn delete mode 100644 Pavels/bullet_trajectory/Line_Trajectory/Line_Barrel.tscn delete mode 100644 Pavels/bullet_trajectory/Line_Trajectory/Line_Bullet.tscn delete mode 100644 Pavels/bullet_trajectory/Line_Trajectory/Line_Env.tscn delete mode 100644 Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Barrel.tscn delete mode 100644 Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Bullet.tscn delete mode 100644 Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Env.tscn delete mode 100644 Pavels/bullet_trajectory/Player.tscn delete mode 100644 Pavels/bullet_trajectory/Sine_Trajectory/Sine_Barrel.tscn delete mode 100644 Pavels/bullet_trajectory/Sine_Trajectory/Sine_Bullet.tscn delete mode 100644 Pavels/bullet_trajectory/Sine_Trajectory/Sine_Env.tscn delete mode 100644 Pavels/bullet_trajectory/default_env.tres delete mode 100644 Pavels/bullet_trajectory/game.tscn delete mode 100644 Pavels/bullet_trajectory/icon.png delete mode 100644 Pavels/bullet_trajectory/icon.png.import delete mode 100644 Pavels/bullet_trajectory/pixil-frame-0 (1).png delete mode 100644 Pavels/bullet_trajectory/pixil-frame-0 (1).png.import delete mode 100644 Pavels/bullet_trajectory/pixilart-drawing.png delete mode 100644 Pavels/bullet_trajectory/pixilart-drawing.png.import delete mode 100644 Pavels/bullet_trajectory/project.godot delete mode 100644 Pavels/bullet_trajectory/script/Gun.gd delete mode 100644 Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Barrel.gd delete mode 100644 Pavels/bullet_trajectory/script/KinematicBody2D.gd delete mode 100644 Pavels/bullet_trajectory/script/Line/Line_Barrel.gd delete mode 100644 Pavels/bullet_trajectory/script/Line/Line_Bullet.gd delete mode 100644 Pavels/bullet_trajectory/script/Mob.gd delete mode 100644 Pavels/bullet_trajectory/script/Parabola/Parabolic_Barrel.gd delete mode 100644 Pavels/bullet_trajectory/script/Sine/Sine_Barrel.gd delete mode 100644 Pavels/bullet_trajectory/script/Sine/Sine_Bullet.gd rename source/{entities/player => assets/scripts/shooting}/Gun_.gd (73%) create mode 100644 source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd rename {Pavels/bullet_trajectory/script => source/assets/scripts/shooting}/Hyperbola/Hyperbolic_Bullet.gd (100%) rename {Pavels/bullet_trajectory/script => source/assets/scripts/shooting}/Hyperbola/Hyperbolic_Env.gd (100%) create mode 100644 source/assets/scripts/shooting/Line/Line_Barrel.gd rename source/{entities/shooting/script => assets/scripts/shooting}/Line/Line_Bullet.gd (100%) rename {Pavels/bullet_trajectory/script => source/assets/scripts/shooting}/Line/Line_Env.gd (100%) create mode 100644 source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd rename {Pavels/bullet_trajectory/script => source/assets/scripts/shooting}/Parabola/Parabolic_Bullet.gd (100%) rename {Pavels/bullet_trajectory/script => source/assets/scripts/shooting}/Parabola/Parabolic_Env.gd (100%) create mode 100644 source/assets/scripts/shooting/Sine/Sine_Barrel.gd rename source/{entities/shooting/script => assets/scripts/shooting}/Sine/Sine_Bullet.gd (100%) rename {Pavels/bullet_trajectory/script => source/assets/scripts/shooting}/Sine/Sine_Env.gd (100%) delete mode 100644 source/entities/shooting/script/Gun.gd delete mode 100644 source/entities/shooting/script/Hyperbola/Hyperbolic_Barrel.gd delete mode 100644 source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd delete mode 100644 source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd delete mode 100644 source/entities/shooting/script/KinematicBody2D.gd delete mode 100644 source/entities/shooting/script/Line/Line_Barrel.gd delete mode 100644 source/entities/shooting/script/Line/Line_Env.gd delete mode 100644 source/entities/shooting/script/Mob.gd delete mode 100644 source/entities/shooting/script/Parabola/Parabolic_Barrel.gd delete mode 100644 source/entities/shooting/script/Parabola/Parabolic_Bullet.gd delete mode 100644 source/entities/shooting/script/Parabola/Parabolic_Env.gd delete mode 100644 source/entities/shooting/script/Sine/Sine_Barrel.gd delete mode 100644 source/entities/shooting/script/Sine/Sine_Env.gd delete mode 100644 source/entities/shooting/script/pixil-frame-0 (1).png delete mode 100644 source/entities/shooting/script/pixil-frame-0 (1).png.import diff --git a/Pavels/README.md b/Pavels/README.md deleted file mode 100644 index 2df8b92..0000000 --- a/Pavels/README.md +++ /dev/null @@ -1,12 +0,0 @@ -Download git and run in terminal: -```terminal -git config --global user.name "Your Name" -git config --global user.email "youremail@yourdomain.com" -``` - -Enter in required directory and run: -```terminal -git clone https://github.com/KristofersSolo/Godot -``` - -or just use [GitHub Desktop](https://desktop.github.com) \ No newline at end of file diff --git a/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn b/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn deleted file mode 100644 index 9e1a160..0000000 --- a/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://script/Hyperbola/Hyperbolic_Barrel.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5946, 3.60519 ) - -[node name="Hyperbolic_Barrel" type="StaticBody2D"] -script = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 30.4661, 0.749161 ) -shape = SubResource( 1 ) - -[node name="icon" type="Sprite" parent="."] -position = Vector2( 42.4007, 0.196289 ) -scale = Vector2( 1.31624, 0.140625 ) -texture = ExtResource( 1 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( 97.6552, 0.0842819 ) diff --git a/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn b/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn deleted file mode 100644 index cd9ffd6..0000000 --- a/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2] - -[sub_resource type="CapsuleShape2D" id=1] -radius = 5.4212 -height = 7.62897 - -[node name="Bullet" type="Area2D"] -script = ExtResource( 2 ) - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 2, -19 ) -scale = Vector2( 0.199834, 0.199834 ) -texture = ExtResource( 1 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -rotation = 1.5708 -shape = SubResource( 1 ) - -[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Env.tscn b/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Env.tscn deleted file mode 100644 index 6dd98e1..0000000 --- a/Pavels/bullet_trajectory/Hyperbolic_Trajectory/Hyperbolic_Env.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://script/Hyperbola/Hyperbolic_Env.gd" type="Script" id=2] -[ext_resource path="res://script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=3] - -[node name="Env" type="Node2D"] -script = ExtResource( 2 ) - -[node name="Bullet" parent="." instance=ExtResource( 1 )] -position = Vector2( 0, -0.222725 ) -script = ExtResource( 3 ) diff --git a/Pavels/bullet_trajectory/Line_Trajectory/Line_Barrel.tscn b/Pavels/bullet_trajectory/Line_Trajectory/Line_Barrel.tscn deleted file mode 100644 index 1b2e3c9..0000000 --- a/Pavels/bullet_trajectory/Line_Trajectory/Line_Barrel.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://script/Line/Line_Barrel.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5946, 3.60519 ) - -[node name="Line_Barrel" type="StaticBody2D"] -script = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 30.4661, 0.749161 ) -shape = SubResource( 1 ) - -[node name="icon" type="Sprite" parent="."] -position = Vector2( 32.281, 0.196289 ) -scale = Vector2( 1, 0.140625 ) -texture = ExtResource( 1 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( 64.7166, 0.0842819 ) diff --git a/Pavels/bullet_trajectory/Line_Trajectory/Line_Bullet.tscn b/Pavels/bullet_trajectory/Line_Trajectory/Line_Bullet.tscn deleted file mode 100644 index b342e67..0000000 --- a/Pavels/bullet_trajectory/Line_Trajectory/Line_Bullet.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] - -[sub_resource type="CapsuleShape2D" id=1] -radius = 5.4212 -height = 7.62897 - -[node name="Bullet" type="Area2D"] -script = ExtResource( 2 ) - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 2, -19 ) -scale = Vector2( 0.199834, 0.199834 ) -texture = ExtResource( 1 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -rotation = 1.5708 -shape = SubResource( 1 ) - -[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/Pavels/bullet_trajectory/Line_Trajectory/Line_Env.tscn b/Pavels/bullet_trajectory/Line_Trajectory/Line_Env.tscn deleted file mode 100644 index 0640b7e..0000000 --- a/Pavels/bullet_trajectory/Line_Trajectory/Line_Env.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://script/Line/Line_Env.gd" type="Script" id=2] - -[node name="Env" type="Node2D"] -script = ExtResource( 2 ) - -[node name="Bullet" parent="." instance=ExtResource( 1 )] -position = Vector2( 0, -0.222725 ) diff --git a/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Barrel.tscn b/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Barrel.tscn deleted file mode 100644 index d7e228d..0000000 --- a/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Barrel.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://script/Parabola/Parabolic_Barrel.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 8.79762, 3.60519 ) - -[node name="Parabolic_Barrel" type="StaticBody2D"] -script = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 13.539, 2.08551 ) -shape = SubResource( 1 ) - -[node name="icon" type="Sprite" parent="."] -position = Vector2( 16.2448, 0.641744 ) -scale = Vector2( 0.387507, 0.251987 ) -texture = ExtResource( 1 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( 34.426, 0.975182 ) diff --git a/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Bullet.tscn b/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Bullet.tscn deleted file mode 100644 index b342e67..0000000 --- a/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Bullet.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] - -[sub_resource type="CapsuleShape2D" id=1] -radius = 5.4212 -height = 7.62897 - -[node name="Bullet" type="Area2D"] -script = ExtResource( 2 ) - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 2, -19 ) -scale = Vector2( 0.199834, 0.199834 ) -texture = ExtResource( 1 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -rotation = 1.5708 -shape = SubResource( 1 ) - -[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Env.tscn b/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Env.tscn deleted file mode 100644 index 07cfd7f..0000000 --- a/Pavels/bullet_trajectory/Parabolic_Trajectory/Parabolic_Env.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://script/Parabola/Parabolic_Env.gd" type="Script" id=2] -[ext_resource path="res://script/Parabola/Parabolic_Bullet.gd" type="Script" id=3] - -[node name="Env" type="Node2D"] -script = ExtResource( 2 ) - -[node name="Bullet" parent="." instance=ExtResource( 1 )] -position = Vector2( 0, -0.222725 ) -script = ExtResource( 3 ) diff --git a/Pavels/bullet_trajectory/Player.tscn b/Pavels/bullet_trajectory/Player.tscn deleted file mode 100644 index 2daf1ef..0000000 --- a/Pavels/bullet_trajectory/Player.tscn +++ /dev/null @@ -1,19 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://pixilart-drawing.png" type="Texture" id=1] -[ext_resource path="res://script/KinematicBody2D.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.279, 10 ) - -[node name="Player" type="KinematicBody2D"] -position = Vector2( 400, 296 ) -script = ExtResource( 2 ) - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 4, -17 ) -texture = ExtResource( 1 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0.381104, 0.412598 ) -shape = SubResource( 1 ) diff --git a/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Barrel.tscn b/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Barrel.tscn deleted file mode 100644 index 690b1ca..0000000 --- a/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Barrel.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://script/Sine/Sine_Barrel.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 21.0351, 6.99966 ) - -[node name="Sine_Barrel" type="StaticBody2D"] -script = ExtResource( 2 ) - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 32.0917, 0.471939 ) -scale = Vector2( 1, 0.336339 ) -texture = ExtResource( 1 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 30.8681, 0 ) -shape = SubResource( 1 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( 64.7166, 0.0842819 ) diff --git a/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Bullet.tscn b/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Bullet.tscn deleted file mode 100644 index b342e67..0000000 --- a/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Bullet.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://script/Line/Line_Bullet.gd" type="Script" id=2] - -[sub_resource type="CapsuleShape2D" id=1] -radius = 5.4212 -height = 7.62897 - -[node name="Bullet" type="Area2D"] -script = ExtResource( 2 ) - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 2, -19 ) -scale = Vector2( 0.199834, 0.199834 ) -texture = ExtResource( 1 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -rotation = 1.5708 -shape = SubResource( 1 ) - -[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] diff --git a/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Env.tscn b/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Env.tscn deleted file mode 100644 index f0c77d5..0000000 --- a/Pavels/bullet_trajectory/Sine_Trajectory/Sine_Env.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://script/Sine/Sine_Env.gd" type="Script" id=2] -[ext_resource path="res://script/Sine/Sine_Bullet.gd" type="Script" id=3] - -[node name="Env" type="Node2D"] -script = ExtResource( 2 ) - -[node name="Bullet" parent="." instance=ExtResource( 1 )] -position = Vector2( 0, -0.222725 ) -script = ExtResource( 3 ) diff --git a/Pavels/bullet_trajectory/default_env.tres b/Pavels/bullet_trajectory/default_env.tres deleted file mode 100644 index 20207a4..0000000 --- a/Pavels/bullet_trajectory/default_env.tres +++ /dev/null @@ -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 ) diff --git a/Pavels/bullet_trajectory/game.tscn b/Pavels/bullet_trajectory/game.tscn deleted file mode 100644 index 109ab9e..0000000 --- a/Pavels/bullet_trajectory/game.tscn +++ /dev/null @@ -1,32 +0,0 @@ -[gd_scene load_steps=6 format=2] - -[ext_resource path="res://Player.tscn" type="PackedScene" id=1] -[ext_resource path="res://icon.png" type="Texture" id=3] -[ext_resource path="res://script/Gun.gd" type="Script" id=4] -[ext_resource path="res://script/Mob.gd" type="Script" id=5] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 31.7698, 29.9446 ) - -[node name="Node2D" type="Node2D"] - -[node name="Mob" type="KinematicBody2D" parent="." groups=[ -"mobs", -]] -position = Vector2( -0.000213623, 0.000244141 ) -script = ExtResource( 5 ) - -[node name="Sprite" type="Sprite" parent="Mob"] -position = Vector2( 748.393, 296.081 ) -texture = ExtResource( 3 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Mob"] -position = Vector2( 748.393, 293.562 ) -shape = SubResource( 1 ) -one_way_collision_margin = 0.0 - -[node name="Player" parent="." instance=ExtResource( 1 )] - -[node name="Gun_Position" type="Position2D" parent="Player"] -position = Vector2( 37.1728, -6.00076 ) -script = ExtResource( 4 ) diff --git a/Pavels/bullet_trajectory/icon.png b/Pavels/bullet_trajectory/icon.png deleted file mode 100644 index c98fbb601c83c81ec8c22b1dba7d1d57c62b323c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3305 zcmVNc=P)Px>qe(&U$es`gSqKCHF-lq>v1vga#%UF>TTrLR zW%{UNJKZi|Pj@Rc9GyPBD1CamMMf6SL~V^ag9~Vzut^L^0!Tv0LK0FTdnJ`x->EF(MZIP5kY*1-@^egP~7mH>({qi7{6 zQF;bN-XMq~+RzA8lI9AtJuz@PY*+{SP-Gbd@mZ(r*eE&`XO5!C>w#-pcmS28K^qzY zfTGCjor*I@ltgKb03nh#Fh$KpDL=o}gj-g4v6{}ZR1*mvXv?|gEA&Yr#r;Zw*d zUabIx8iHf+WoIO_c11Ba&!34XihSMF&C#YFDjU0)mmbXz3ex!D&t9UYp>;&R%(O(_ z*z^;&A84SWzKiQpqsdQ+Vs?rFS(f?R;c8xg_ft;Roec_~1KsVww}wzq5D}*5x6k|& zf~2A3@L4|ix|Q=L>rnmKE;B3UB=OMQxAK$Ce;LvDp?hwn-{Rn}Uo~U4IXTs4V%MQY zCWULcZFU0R%gbU;_Ef(A#76r1%|YWis0t`9$R{cyjFnsV(POrI)SGQi-l{mu{e?5R zepcp?AQ54D3g_mswd@RLn{z~;^Cl}>%j@}TWixL+audY``MmSV{-E(3R0Ws^U9%mk zmAond;N8k*{(f!}e^~d(i1Hq@jdv@XN2MLAl}3yaECf{nz5N3KMCjDCFzB_7)gkjj z>2Z={^e74l7u>P4oo1{Kc~sgFI`xP#f`uR}z_p~qLwws5)h)eLxAX=?+fB2_6kG)a zeE3U}YSi;Qc}gq*;kw|Tu5Oy{F)l`0;$$RA6)@d^I9>n9N^W1g0D!WJYJT&d@6p`W zfmWmD=^x$2@|)+=&@n(wn<-#M#zIY-iH42=UU>XI3i7l0^?#ILwb@CU63f5b_jeS| zn+d@CpB>^?Ti*1WuHSaRniWO-^Xl8!b+D0stAl$BQjr8G`KX-vGpCc0lEAKmjl6lN z5r?ddL)6hBi2|!`NM+@MRO*^qsi>~y`%4$%P+-S_M#8ibt8Pf;m7O23?cF^-X$52l zEV@3AM^`Q9vy(=)?W+gi)8lPCP&k!)Z(Bsa#m@S7j#1gzJx&pQ!yzlYvA==iExkN@ zTMnz!68Wg=9Ius~p?A=A>P(5$@#w1MG`6<$`Il8=(j0RI#KlIj>!qL4)MMjk|8*3* zbL8w!iwnbSb<*17eb=8TBt(Uv*Qz*e>>p9CRtapnJD-#&4Xd8ojIpD~Yk&6&7;_U` z|L{sgNzJAYPkIOsaN5{^*@Xva?HTkC9>DHY*!1B^L`lv1hgXhC$EO1BSh9fYXU*VG zpVwjRvs^m2ml?)B3xE2&j_YU5;Ep8=e75zefN3cSw04`>U3D&~3|AIJAJnEseqE*p>uF=1Cv$SfvI z!(+vnRMj+4vb)@8Tb~MW$}-RYemjyN^W@U3pfWj;cyehLk|6W*KkUFMkM3W9AE!Wb zTL-_}Udr6GXl}`!5;P_!3b*7=VQyM9zuR6)b6dxl?fo)@-u`$$Pu#bHB*W+#Gp!_Y z*ZdUbq#B3_QPbElK4*QE)$x+;qpGazKD1C!=jx=^ta=2+!&oRjmg4Jf{ z?T`J78TjoBD9Y&OtwFEhrIq<48uS2IEEbY8C$TVd5`X!kj*`Qd7RI`3elib!C*xb1 z(UIgPMzT12GEcpEly0*vU|ugqP(r~!E}l-JK~G&>9S_|9Aj@uD&azvVQ&RF4YZp!> zJ3hi|zlabu5u>=y+3^vqT{xAJlDCHFJ#hbn)Ya9IXwdWH;_1O)ef$at)k@qrEf%ZQ z%DU&)(a_KUxMpn2t6Mm@e?LVzaUT6LCWo=>;TzfYZ~+;U!#wJXa^g66-~d}*-Gas9 zGQt`f8d&$-daPC}H%^NkiV}?n<5oawj2=M{sHv&JXl(bWFDox6HP$o6KRY=Jl_;PR zMP?^QdD4vyrL3&XqugjTQd3idAPA(!=*P?c_!Z!e`f9aWuk~t4qQew;9IwMq>%w#92+*iNN#Qp zadB}J6)j=I#urf#czO3X!C*Z&LD5rfCLY^S$>ZP6}eFW#%-2L)+t{`cPyqLD6))yK1?m7F>6=?Y&8f)>3zbH1O)cT}QNtB4KL(A@1i zMzF88gDrb&hn~H`?o`-XUeDI@dXfwwboAS>*qvV6UMhkfzO~q$V+s%8loj4P(&9H= ze`sC`uI?L9L4e;YK&2A7XF)0}u1lh+%Z$S*Q{ORwtSHpAyWYpI>bqzU!p`gqlf$*l zO^*g(+T?Hq0n%ebkyIin(R#FM6&9;^6WJU5R)By&tZQ6PV zS^MWhqtcj}7)kON#>?4Gv(K#2=6mv)5;@W->l(1q*>9t&xfesIn$&3j4WxkffXaq0 zwwBkAD2vjoi4E8CK;cwoC3#wO!|}v-XOJ`obIo05{&DMQIRyHAd5@%-0xA%uA0UK2qng>xb(kvMzX)7t^ z);-|T`mgSsHKM$+a{!w|Mt5QLwD>sA+;u-+k%z_ZL?el$#&|kX?ygLfm zxZ^Fo^bOhx)w*6In?vS{Q|uk08cKRK}t+0ukQSCOyP$^HEC+zzX51M#=e-?*xHWMDRcLdIV41daHy{HimwDo z6!_O=*(}MK!YeyJpmgu(cF1tpEv}m;0s8{4z4HlHyMxDncn8zs!g+OXEk`CeEj}9N zq#Ag1$#jyV_5AjYQg*!mS->;`S^;iU)ih9D+eks)H2z`1RHny;F<^CEwk+}d^k^Ph zl);*XQ|ayL;rZWh=fA(G2#AJz1&r&as9I8S@9m3Owftrb5n*)pTluK^9LHOFIo{G2 zG}l$9R*{<+L2hCsOJ~Lt6Q-rRub*8X{*4{)e}>%=_&DxOFeq1LRia4Yyj*Tyynw>F zxkKf(MiaG0*L|V-^Zhtvg-(-|F0&1rU8bqab*n5TT8~C860O$|6Rt%P1=1(EjIQZ% z;Y^PU2VC*~^2!sG?mbBPS0~0yd-+086)+rHjhfk6>CB$t`o%;=kdYF9NwiKkwbIpN z;_FlOuHQHHSZ&@fUuSI-S*t`DjsiIB z{=1M@JKVC$a8z{2;xCPfRb{~T>uo#5rL4L+z9n`rSUt3Tt nAZ`TZm+q1gPVN84&*%Ra7her>#-hHS00000NkvXXu0mjf|6N@O diff --git a/Pavels/bullet_trajectory/icon.png.import b/Pavels/bullet_trajectory/icon.png.import deleted file mode 100644 index 96cbf46..0000000 --- a/Pavels/bullet_trajectory/icon.png.import +++ /dev/null @@ -1,34 +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 -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/Pavels/bullet_trajectory/pixil-frame-0 (1).png b/Pavels/bullet_trajectory/pixil-frame-0 (1).png deleted file mode 100644 index ecdddeac28feab66f10c07101cd4acda698c8f6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29132 zcmeHQX-rgC6rMMXbX1@N#0^14P{E~uaY0341Qaj|R6tP+Jh!4zSyWtDAI7TGNFg{# z-L+V1R6tvbiolC8(b5)Dw4%idjRixIfZzm%W$0nvy(}~RQJb_e&G|u?nfLCw=brPO zbH97uy)!BPzFx*7EJlb#B4ZzK&y^yPB){)ZY6zb+PW-w8{xQ2&dbx{o%Pkv3BDu)N zb8+Cl&{t1>ie9%`=DB#9^_8qlt90e)W#xxWnD*rJQJK{mmF@h(aJRs=7e6LRq%ygJ z6EWg}7k9;Ocb|IN>U;|KwS3I)lnmTQTW)0xR^6WP8+|))gHdqAP|1C_$Uk8DWmUG8 zgL~9A<(Th{^>mSD4>JmGh&`yUjT3uIPlPD>8;+SC@>$e?4pb|{8P56xN*nFOUTQQ= z9WwmB7CcvHNLvobsuUYu-M#3psjk7KWAmTsiQp7#c}|(@HE)n*iAaOY@p>X;-Xq86 zSE{65dKP2(odyFsP_5ADXmmunUa(+#5iyuvFsI{0iW8|0-$C|*lo5G4@^oAr>8!|b zMT(RW%K%t=!P<*%RSGF1QbweVNEwkbB4wlx9_XV8tTJMi5vzegyvX>l23FNR?SgscsE~%3^iRt^V{G=bDpZbYPgm>Cc8PZd}mv|#)jNb8vv(_ z{a&lr3rkJ*JjZNfx7wHsdozomaZy)$toCC5hdftsJtlIBK*E;73F4(yb_)eTEgZ)* zGPB*>NdafyC3vsw)XXK9M=%DDr$6dhK~}W9ox~{k9N+eZu+rtd;qrrD4ieFGLG;|h z<|ge$HV0G+Zw_4{NH&5))W!~ey9GhD6QQBU_QWG(254CT?;BtBY$liI!04)Oc3mM0 z>g2;Pp!XlD7Ymo!uR!#c=nZ7Fad0uNsC}pQVtx>ewqSoVQK@8k?Tf1F`^qp)O={vGY-}=6ba04=-uQaiBz!zlmH1>T#xMV(0o9VKV^1&Y?; zRQ3UoEza~4G-1Sc(6#yG8rrxVx_Y^)WD@Dia`@Q%)U0?<;yYv^J2a&UjRZ;1_6 z0vw)tIo_KpVFpUfR8yx$Ie-#{t&^z|o}k3V-^U9|0DwztYTR5^BMooXcU*$s}l@+@_`b~Lr8 zz{Y1ovzf+*?8J#e&;DQ=Wp(;7t!?7X!6y%o&Sn>#dE`ipSq6jL>2gCm$mB>HmXD21 zH@upY(fNsBA;lV=3yScXtJR=o1=zsPv655mURg@)Z4Y)RYkII$Ylo5)ux`T=i~O^` ze~d8`0&+8a`N1u#r&_D>&ZbW6qGE4Q!>7kxu*UfrEI+N#cDz>Mjwzr|&X}!y?1IZ- z#J0!5`*nLZ314tf1C~_1vHACmz=&;!xh58eSY&Cs+IuQpdOKh4Y3Q;}3hV4{YVRso z=oabR`{kXbueK3iUgVOter>L&t$-duhkBpySUo@@O30hmJQ+vnFtmqymP#mb=n8It}*|BA%Eax*FP!uz2I@i9^e)-Ins_nv#d;x1dyzcgoOGx zS!_qCm5aR?3J~%qr3IGt-!hGd`{!##5T6_r5*n$;oKrZ1#!Y`gwS$=VR>kZu)+5e# zVw0;G7xbBS;4sVJpX*el+%SOc)6#kQzK8UQw*ROoHt0l^9`}#3spS`p(_bv$0H{sT z0|eCwAzC)UASQJ!%t9nKFpbi5i4z%#4V;NdxyEfmCAXA`z(s z4UxB@5-*Q*cZx)&8~T1Dpl>mc%oLgF;Ce7v<89!C5E@iI#*Fk&G7>@vA%ulqoQVm) zmB}%UVj3Ot#9kuB8WGlrbXY3Zh_FUP^CZ@Y2o|tL^v=|X4A}{3e0We(9{fC`$Y+VK JXRbSY;7<{&pymJo diff --git a/Pavels/bullet_trajectory/pixil-frame-0 (1).png.import b/Pavels/bullet_trajectory/pixil-frame-0 (1).png.import deleted file mode 100644 index 553ec28..0000000 --- a/Pavels/bullet_trajectory/pixil-frame-0 (1).png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/pixil-frame-0 (1).png-160dd9969d7e45d14d604c370b40e019.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://pixil-frame-0 (1).png" -dest_files=[ "res://.import/pixil-frame-0 (1).png-160dd9969d7e45d14d604c370b40e019.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 -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/Pavels/bullet_trajectory/pixilart-drawing.png b/Pavels/bullet_trajectory/pixilart-drawing.png deleted file mode 100644 index a2d76a70f33c57a3d0e20c8c4a1f359ab038888b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 818 zcmeAS@N?(olHy`uVBq!ia0vp^DImV0z=};uum9 z_jazMpR}Qb+e3!fVg{`x9x@H8;trPDuUL1zVVt0(Sko)piyMR3@wOpG%~?6Y{KT%0(i>b4tnFF- z`*pL`&(ELB&Fi~O&&OqV7v#53yLi!(O*36prSqr$(xbc5w=QutNODd)c&g%Z(!6f{ z34%e2k`totJuq;x+4L{d-6pj+?~SfsoBo$af0wRpQe5(5%GTZPo9tw!Rk+AC+~4jU zo$FNMTy)5nD_W`Z-wbOu=exQ`Dl zbJJyU=gUQWN0(MP7oAIpH&!UvFn2-gUltLj+mc*?96by=eY`|ajhsKZuQ diff --git a/Pavels/bullet_trajectory/pixilart-drawing.png.import b/Pavels/bullet_trajectory/pixilart-drawing.png.import deleted file mode 100644 index 187733d..0000000 --- a/Pavels/bullet_trajectory/pixilart-drawing.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/pixilart-drawing.png-9e9c431ac86a42d1fefc4da3ac6bc15c.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://pixilart-drawing.png" -dest_files=[ "res://.import/pixilart-drawing.png-9e9c431ac86a42d1fefc4da3ac6bc15c.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 -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/Pavels/bullet_trajectory/project.godot b/Pavels/bullet_trajectory/project.godot deleted file mode 100644 index 671b2cb..0000000 --- a/Pavels/bullet_trajectory/project.godot +++ /dev/null @@ -1,85 +0,0 @@ -; Engine configuration file. -; It's best edited using the editor UI and not directly, -; since the parameters that go here are not all obvious. -; -; Format: -; [section] ; section goes between [] -; param=value ; assign values to parameters - -config_version=4 - -[application] - -config/name="Bullet Trajectory" -run/main_scene="res://game.tscn" -config/icon="res://icon.png" - -[input] - -ui_left={ -"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) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) - ] -} -ui_right={ -"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) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) - ] -} -ui_up={ -"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":87,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) - ] -} -ui_down={ -"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) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) - ] -} -shoot={ -"deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) - ] -} -gun_up={ -"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":16777232,"unicode":0,"echo":false,"script":null) - ] -} -gun_down={ -"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":16777234,"unicode":0,"echo":false,"script":null) - ] -} -line={ -"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) - ] -} -parab={ -"deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777352,"unicode":0,"echo":false,"script":null) - ] -} -hyper={ -"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) - ] -} -sine={ -"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) - ] -} - -[physics] - -common/enable_pause_aware_picking=true - -[rendering] - -environment/default_environment="res://default_env.tres" diff --git a/Pavels/bullet_trajectory/script/Gun.gd b/Pavels/bullet_trajectory/script/Gun.gd deleted file mode 100644 index 88a20a3..0000000 --- a/Pavels/bullet_trajectory/script/Gun.gd +++ /dev/null @@ -1,30 +0,0 @@ -extends Position2D - -var trajectories = { - 'line' : preload("res://Line_Trajectory/Line_Barrel.tscn"), - 'sine' : preload("res://Sine_Trajectory/Sine_Barrel.tscn"), - 'parab' : preload("res://Parabolic_Trajectory/Parabolic_Barrel.tscn"), - 'hyper' : preload("res://Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn") -} - - -func equip_gun(gun_type:String): - for gun in get_children(): #if there is gun remove it - gun.queue_free() - - var gun = trajectories[gun_type].instance() - add_child(gun) - - - -func _process(delta): - look_at(get_global_mouse_position()) - if Input.is_action_just_pressed("line"): - equip_gun('line') - if Input.is_action_just_pressed("sine"): - equip_gun('sine') - if Input.is_action_just_pressed("parab"): - equip_gun('parab') - if Input.is_action_just_pressed("hyper"): - equip_gun('hyper') - pass diff --git a/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Barrel.gd b/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Barrel.gd deleted file mode 100644 index fc808d6..0000000 --- a/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Barrel.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends StaticBody2D # Y = aX - -onready var bullet = preload("res://Hyperbolic_Trajectory/Hyperbolic_Env.tscn") - - -func shoot(): - var b = bullet.instance() - get_parent().get_parent().get_parent().add_child(b) - b.global_position = $Position2D.global_position - b.global_rotation = $Position2D.global_rotation - - - -func _process(delta): - if Input.is_action_just_pressed("shoot"): - shoot() diff --git a/Pavels/bullet_trajectory/script/KinematicBody2D.gd b/Pavels/bullet_trajectory/script/KinematicBody2D.gd deleted file mode 100644 index 1aa9367..0000000 --- a/Pavels/bullet_trajectory/script/KinematicBody2D.gd +++ /dev/null @@ -1,26 +0,0 @@ -extends KinematicBody2D - -export var speed = 400 -var movement = Vector2(0, 0) - -#func shoot(): - #var b = env.instance() - #get_parent().add_child(b) - #b.global_transform = $Gun.global_transform - -func get_input(): - movement = Vector2() - if Input.is_action_pressed("ui_right"): - movement.x += 10 - if Input.is_action_pressed("ui_left"): - movement.x -= 10 - if Input.is_action_pressed("ui_down"): - movement.y += 10 - if Input.is_action_pressed("ui_up"): - movement.y -= 10 - #if Input.is_action_just_pressed("shoot"): - #shoot() - -func _physics_process(delta): - get_input() - position += movement.normalized() * speed * delta diff --git a/Pavels/bullet_trajectory/script/Line/Line_Barrel.gd b/Pavels/bullet_trajectory/script/Line/Line_Barrel.gd deleted file mode 100644 index 4ba9307..0000000 --- a/Pavels/bullet_trajectory/script/Line/Line_Barrel.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends StaticBody2D # Y = aX - -onready var bullet = preload("res://Line_Trajectory/Line_Env.tscn") - - -func shoot(): - var b = bullet.instance() - get_parent().get_parent().get_parent().add_child(b) - b.global_position = $Position2D.global_position - b.global_rotation = $Position2D.global_rotation - - - -func _process(delta): - if Input.is_action_just_pressed("shoot"): - shoot() diff --git a/Pavels/bullet_trajectory/script/Line/Line_Bullet.gd b/Pavels/bullet_trajectory/script/Line/Line_Bullet.gd deleted file mode 100644 index 3c958c0..0000000 --- a/Pavels/bullet_trajectory/script/Line/Line_Bullet.gd +++ /dev/null @@ -1,43 +0,0 @@ -extends Area2D - -export var speed = 100 -var velocity = Vector2() - -var time = 0 -export var amplitude = 4 -export var frequency = 5 -var gravitile = 5 - - -func follow_line_trajectory(): - velocity = Vector2(10, 0) - -#func follow_parabolic_trajectory(): - #velocity.x = 5 - #velocity.y = 1 * time * gravitile - #return velocity - -#func follow_hyperbolic_trajectory(): - #velocity.x = gravitile * time - #velocity.y = 1 - #return velocity - -#func input(): - #if Input.is_action_just_pressed("line"): - #return follow_sine_trajectory() - #elif Input.is_action_just_pressed("sine"): - #return follow_line_trajectory() - #else: - #print('Trajectory is not selected') - #queue_free() - -func _process(delta): - follow_line_trajectory() - time += delta - position += velocity * speed * delta - - -func _on_Bullet_body_entered(body): - if body.is_in_group("mobs"): - body.queue_free() - queue_free() diff --git a/Pavels/bullet_trajectory/script/Mob.gd b/Pavels/bullet_trajectory/script/Mob.gd deleted file mode 100644 index 16a9985..0000000 --- a/Pavels/bullet_trajectory/script/Mob.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends KinematicBody2D - - -var velocity = Vector2(1, 1) - -func _process(delta): - var collision = move_and_collide(velocity * delta) - - - diff --git a/Pavels/bullet_trajectory/script/Parabola/Parabolic_Barrel.gd b/Pavels/bullet_trajectory/script/Parabola/Parabolic_Barrel.gd deleted file mode 100644 index d020184..0000000 --- a/Pavels/bullet_trajectory/script/Parabola/Parabolic_Barrel.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends StaticBody2D # Y = aX - -onready var bullet = preload("res://Parabolic_Trajectory/Parabolic_Env.tscn") - - -func shoot(): - var b = bullet.instance() - get_parent().get_parent().get_parent().add_child(b) - b.global_position = $Position2D.global_position - b.global_rotation = $Position2D.global_rotation - - - -func _process(delta): - if Input.is_action_just_pressed("shoot"): - shoot() diff --git a/Pavels/bullet_trajectory/script/Sine/Sine_Barrel.gd b/Pavels/bullet_trajectory/script/Sine/Sine_Barrel.gd deleted file mode 100644 index 79ce4e8..0000000 --- a/Pavels/bullet_trajectory/script/Sine/Sine_Barrel.gd +++ /dev/null @@ -1,20 +0,0 @@ -extends StaticBody2D - -onready var bullet = preload("res://Sine_Trajectory/Sine_Env.tscn") - -var velocity = Vector2(1, 0) -var shooting_speed = 200 - - - -func shoot(): - var b = bullet.instance() - get_parent().get_parent().get_parent().add_child(b) - b.global_position = $Position2D.global_position - b.global_rotation = $Position2D.global_rotation - pass - - -func _process(delta): - if Input.is_action_just_pressed("shoot"): - shoot() diff --git a/Pavels/bullet_trajectory/script/Sine/Sine_Bullet.gd b/Pavels/bullet_trajectory/script/Sine/Sine_Bullet.gd deleted file mode 100644 index 1196b54..0000000 --- a/Pavels/bullet_trajectory/script/Sine/Sine_Bullet.gd +++ /dev/null @@ -1,25 +0,0 @@ -extends Area2D - -export var speed = 100 -var velocity = Vector2() - -var time = 0 -export var amplitude = 4 -export var frequency = 5 -var gravitile = 5 - - -func follow_sine_trajectory(): - velocity.y = amplitude * cos(time * frequency) - velocity.x = 5 - -func _process(delta): - follow_sine_trajectory() - time += delta - position += velocity * speed * delta - - -func _on_Bullet_body_entered(body): - if body.is_in_group("mobs"): - body.queue_free() - queue_free() diff --git a/project.godot b/project.godot index 5e962a7..64ea969 100644 --- a/project.godot +++ b/project.godot @@ -37,42 +37,42 @@ fps=false input_right={ "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,"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,"physical_scancode":0,"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,"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) ] } input_left={ "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,"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,"physical_scancode":0,"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,"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) ] } input_up={ "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,"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,"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,"physical_scancode":0,"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,"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":32,"unicode":0,"echo":false,"script":null) ] } input_down={ "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,"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,"physical_scancode":0,"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,"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) ] } input_debug={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } input_enter={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } input_shift={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } input_shoot={ @@ -82,42 +82,37 @@ input_shoot={ } esc={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } rotation_increase={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } rotation_decrease={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } line={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } sine={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } hyper={ "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,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } parab={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777354,"physical_scancode":0,"unicode":0,"echo":false,"script":null) - ] -} -shoot={ -"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":82,"physical_scancode":0,"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,"unicode":0,"echo":false,"script":null) ] } diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 27bded0..d6311e8 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -392,6 +392,7 @@ sync func enable() -> void: visible = true $player_collider.disabled = false $hitbox/CollisionShape2D.disabled = false + $weaponHolder.disabled = false if get_tree().has_network_peer(): if is_network_master(): @@ -406,6 +407,7 @@ sync func destroy() -> void: visible = false $player_collider.disabled = true $hitbox/CollisionShape2D.disabled = true + $weaponHolder.disabled = true Global.alive_players.erase(self) if get_tree().has_network_peer(): diff --git a/source/entities/player/Gun_.gd b/source/assets/scripts/shooting/Gun_.gd similarity index 73% rename from source/entities/player/Gun_.gd rename to source/assets/scripts/shooting/Gun_.gd index 6b3ae8a..54d4399 100644 --- a/source/entities/player/Gun_.gd +++ b/source/assets/scripts/shooting/Gun_.gd @@ -2,7 +2,7 @@ extends AnimatedSprite var trajectory:String = 'line' -var bullet = { +var bullet_trajectory = { 'line' : preload("res://source/entities/shooting/Line_Trajectory/Line_Env.tscn"), 'sine' : preload("res://source/entities/shooting/Sine_Trajectory/Sine_Env.tscn"), 'parab' : preload("res://source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn"), @@ -10,7 +10,6 @@ var bullet = { } func choose_trajectory(): - trajectory if Input.is_action_just_pressed("line"): trajectory = 'line' elif Input.is_action_just_pressed("sine"): @@ -22,14 +21,14 @@ func choose_trajectory(): func shoot(trajectory:String): - var b = bullet[trajectory].instance() - get_parent().get_parent().get_parent().add_child(b) - b.global_position = $Position2D.global_position - b.global_rotation = $Position2D.global_rotation + var bullet = bullet_trajectory[trajectory].instance() + get_parent().get_parent().get_parent().add_child(bullet) + bullet.global_position = $Position2D.global_position + bullet.global_rotation = $Position2D.global_rotation pass func _process(delta): choose_trajectory() - if Input.is_action_just_pressed("shoot"): + if Input.is_action_just_pressed("input_shoot"): shoot(trajectory) diff --git a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd new file mode 100644 index 0000000..f5edb55 --- /dev/null +++ b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd @@ -0,0 +1,16 @@ +extends StaticBody2D # Y = aX + +onready var bullet_env = preload("res://source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn") + + +func shoot(): + var bullet = bullet_env.instance() + get_parent().get_parent().get_parent().add_child(bullet) + bullet.global_position = $Position2D.global_position + bullet.global_rotation = $Position2D.global_rotation + + + +func _process(delta): + if Input.is_action_just_pressed("input_shoot"): + shoot() diff --git a/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Bullet.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd similarity index 100% rename from Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Bullet.gd rename to source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd diff --git a/Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Env.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Env.gd similarity index 100% rename from Pavels/bullet_trajectory/script/Hyperbola/Hyperbolic_Env.gd rename to source/assets/scripts/shooting/Hyperbola/Hyperbolic_Env.gd diff --git a/source/assets/scripts/shooting/Line/Line_Barrel.gd b/source/assets/scripts/shooting/Line/Line_Barrel.gd new file mode 100644 index 0000000..0d193a9 --- /dev/null +++ b/source/assets/scripts/shooting/Line/Line_Barrel.gd @@ -0,0 +1,16 @@ +extends StaticBody2D # Y = aX + +onready var bullet_env = preload("res://source/entities/shooting/Line_Trajectory/Line_Env.tscn") + + +func shoot(): + var bullet = bullet_env.instance() + get_parent().get_parent().get_parent().add_child(bullet) + bullet.global_position = $Position2D.global_position + bullet.global_rotation = $Position2D.global_rotation + + + +func _process(delta): + if Input.is_action_just_pressed("input_shoot"): + shoot() diff --git a/source/entities/shooting/script/Line/Line_Bullet.gd b/source/assets/scripts/shooting/Line/Line_Bullet.gd similarity index 100% rename from source/entities/shooting/script/Line/Line_Bullet.gd rename to source/assets/scripts/shooting/Line/Line_Bullet.gd diff --git a/Pavels/bullet_trajectory/script/Line/Line_Env.gd b/source/assets/scripts/shooting/Line/Line_Env.gd similarity index 100% rename from Pavels/bullet_trajectory/script/Line/Line_Env.gd rename to source/assets/scripts/shooting/Line/Line_Env.gd diff --git a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd new file mode 100644 index 0000000..6de1e86 --- /dev/null +++ b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd @@ -0,0 +1,16 @@ +extends StaticBody2D # Y = aX + +onready var bullet_env = preload("res://source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn") + + +func shoot(): + var bullet = bullet_env.instance() + get_parent().get_parent().get_parent().add_child(bullet) + bullet.global_position = $Position2D.global_position + bullet.global_rotation = $Position2D.global_rotation + + + +func _process(delta): + if Input.is_action_just_pressed("shoot"): + shoot() diff --git a/Pavels/bullet_trajectory/script/Parabola/Parabolic_Bullet.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd similarity index 100% rename from Pavels/bullet_trajectory/script/Parabola/Parabolic_Bullet.gd rename to source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd diff --git a/Pavels/bullet_trajectory/script/Parabola/Parabolic_Env.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Env.gd similarity index 100% rename from Pavels/bullet_trajectory/script/Parabola/Parabolic_Env.gd rename to source/assets/scripts/shooting/Parabola/Parabolic_Env.gd diff --git a/source/assets/scripts/shooting/Sine/Sine_Barrel.gd b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd new file mode 100644 index 0000000..6526775 --- /dev/null +++ b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd @@ -0,0 +1,20 @@ +extends StaticBody2D + +onready var bullet_env = preload("res://source/entities/shooting/Sine_Trajectory/Sine_Env.tscn") + +var velocity = Vector2(1, 0) +var shooting_speed = 200 + + + +func shoot(): + var bullet = bullet_env.instance() + get_parent().get_parent().get_parent().add_child(bullet) + bullet.global_position = $Position2D.global_position + bullet.global_rotation = $Position2D.global_rotation + pass + + +func _process(delta): + if Input.is_action_just_pressed("input_shoot"): + shoot() diff --git a/source/entities/shooting/script/Sine/Sine_Bullet.gd b/source/assets/scripts/shooting/Sine/Sine_Bullet.gd similarity index 100% rename from source/entities/shooting/script/Sine/Sine_Bullet.gd rename to source/assets/scripts/shooting/Sine/Sine_Bullet.gd diff --git a/Pavels/bullet_trajectory/script/Sine/Sine_Env.gd b/source/assets/scripts/shooting/Sine/Sine_Env.gd similarity index 100% rename from Pavels/bullet_trajectory/script/Sine/Sine_Env.gd rename to source/assets/scripts/shooting/Sine/Sine_Env.gd diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 0f6a442..6a4f678 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -15,7 +15,7 @@ [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 7.png" type="Texture" id=13] [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 12.png" type="Texture" id=14] [ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 10.png" type="Texture" id=15] -[ext_resource path="res://source/entities/player/Gun_.gd" type="Script" id=16] +[ext_resource path="res://source/assets/scripts/shooting/Gun_.gd" type="Script" id=16] [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/left_r/Player-character-theme-01_anim-idle – 17.png" type="Texture" id=20] @@ -175,11 +175,6 @@ [sub_resource type="SpriteFrames" id=2] 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( 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", @@ -279,6 +274,11 @@ animations = [ { "loop": true, "name": "move-speed-right-01", "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 } ] [sub_resource type="RectangleShape2D" id=3] @@ -309,14 +309,9 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { -"frames": [ ExtResource( 168 ) ], +"frames": [ ExtResource( 170 ) ], "loop": true, -"name": "03", -"speed": 5.0 -}, { -"frames": [ ExtResource( 169 ) ], -"loop": true, -"name": "04", +"name": "02", "speed": 5.0 }, { "frames": [ ExtResource( 27 ) ], @@ -324,15 +319,22 @@ animations = [ { "name": "01", "speed": 5.0 }, { -"frames": [ ExtResource( 170 ) ], +"frames": [ ExtResource( 169 ) ], "loop": true, -"name": "02", +"name": "04", +"speed": 5.0 +}, { +"frames": [ ExtResource( 168 ) ], +"loop": true, +"name": "03", "speed": 5.0 } ] -[node name="player" type="KinematicBody2D" groups=["Net", "Player"]] +[node name="player" type="KinematicBody2D" groups=[ +"Net", +"Player", +]] script = ExtResource( 11 ) -theme = "03" [node name="player_collider" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn index 9e1a160..d1bea7d 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://script/Hyperbola/Hyperbolic_Barrel.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 22.5946, 3.60519 ) diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn index ceca1f7..2e85e5d 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://source/entities/shooting/script/pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2] +[ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1] +[ext_resource path="res://source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] radius = 5.4212 @@ -10,9 +10,8 @@ height = 7.62897 [node name="Bullet" type="Area2D"] script = ExtResource( 2 ) -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 2, -19 ) -scale = Vector2( 0.199834, 0.199834 ) +[node name="bullet" type="Sprite" parent="."] +scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn index 5ec5b09..da147ed 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://source/entities/shooting/Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd" type="Script" id=2] -[ext_resource path="res://source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=3] +[ext_resource path="res://source/assets/scripts/shooting/Hyperbola/Hyperbolic_Env.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=3] [node name="Env" type="Node2D"] script = ExtResource( 2 ) diff --git a/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn b/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn index 1b2e3c9..4faa39b 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://script/Line/Line_Barrel.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Line/Line_Barrel.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 22.5946, 3.60519 ) diff --git a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn index 663d286..bdd5dc9 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://source/entities/shooting/script/pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://source/entities/shooting/script/Line/Line_Bullet.gd" type="Script" id=2] +[ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1] +[ext_resource path="res://source/assets/scripts/shooting/Line/Line_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] radius = 5.4212 @@ -10,9 +10,8 @@ height = 7.62897 [node name="Bullet" type="Area2D"] script = ExtResource( 2 ) -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 2, -19 ) -scale = Vector2( 0.199834, 0.199834 ) +[node name="bullet" type="Sprite" parent="."] +scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/source/entities/shooting/Line_Trajectory/Line_Env.tscn b/source/entities/shooting/Line_Trajectory/Line_Env.tscn index fd6cdd7..d355a02 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Env.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Env.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://source/entities/shooting/Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://source/entities/shooting/script/Line/Line_Env.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Line/Line_Env.gd" type="Script" id=2] [node name="Env" type="Node2D"] script = ExtResource( 2 ) diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn index d7e228d..0fcdc54 100644 --- a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://script/Parabola/Parabolic_Barrel.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8.79762, 3.60519 ) diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn index 663d286..bdd5dc9 100644 --- a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://source/entities/shooting/script/pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://source/entities/shooting/script/Line/Line_Bullet.gd" type="Script" id=2] +[ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1] +[ext_resource path="res://source/assets/scripts/shooting/Line/Line_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] radius = 5.4212 @@ -10,9 +10,8 @@ height = 7.62897 [node name="Bullet" type="Area2D"] script = ExtResource( 2 ) -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 2, -19 ) -scale = Vector2( 0.199834, 0.199834 ) +[node name="bullet" type="Sprite" parent="."] +scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn index 6be9026..86beaa0 100644 --- a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Env.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://source/entities/shooting/Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://source/entities/shooting/script/Parabola/Parabolic_Env.gd" type="Script" id=2] -[ext_resource path="res://source/entities/shooting/script/Parabola/Parabolic_Bullet.gd" type="Script" id=3] +[ext_resource path="res://source/assets/scripts/shooting/Parabola/Parabolic_Env.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd" type="Script" id=3] [node name="Env" type="Node2D"] script = ExtResource( 2 ) diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn index 690b1ca..07882a0 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://script/Sine/Sine_Barrel.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Sine/Sine_Barrel.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 21.0351, 6.99966 ) diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn index 342b744..e05e92a 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://source/entities/shooting/script/pixil-frame-0 (1).png" type="Texture" id=1] -[ext_resource path="res://source/entities/shooting/script/Sine/Sine_Bullet.gd" type="Script" id=2] +[ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1] +[ext_resource path="res://source/assets/scripts/shooting/Sine/Sine_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] radius = 5.4212 @@ -10,9 +10,8 @@ height = 7.62897 [node name="Bullet" type="Area2D"] script = ExtResource( 2 ) -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 2, -19 ) -scale = Vector2( 0.199834, 0.199834 ) +[node name="bullet" type="Sprite" parent="."] +scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn index 96b2aa5..43043ba 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Env.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://source/entities/shooting/Line_Trajectory/Line_Bullet.tscn" type="PackedScene" id=1] -[ext_resource path="res://source/entities/shooting/script/Sine/Sine_Env.gd" type="Script" id=2] -[ext_resource path="res://source/entities/shooting/script/Sine/Sine_Bullet.gd" type="Script" id=3] +[ext_resource path="res://source/assets/scripts/shooting/Sine/Sine_Env.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Sine/Sine_Bullet.gd" type="Script" id=3] [node name="Env" type="Node2D"] script = ExtResource( 2 ) diff --git a/source/entities/shooting/script/Gun.gd b/source/entities/shooting/script/Gun.gd deleted file mode 100644 index d802ed6..0000000 --- a/source/entities/shooting/script/Gun.gd +++ /dev/null @@ -1,30 +0,0 @@ -extends Position2D - -var trajectories = { - 'line' : preload("res://source/entities/shooting/Line_Trajectory/Line_Barrel.tscn"), - 'sine' : preload("res://source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn"), - 'parab' : preload("res://source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn"), - 'hyper' : preload("res://source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn") -} - - -func equip_gun(gun_type:String): - for gun in get_children(): #if there is gun remove it - gun.queue_free() - - var gun = trajectories[gun_type].instance() - add_child(gun) - - - -func _process(delta): - look_at(get_global_mouse_position()) - if Input.is_action_just_pressed("line"): - equip_gun('line') - if Input.is_action_just_pressed("sine"): - equip_gun('sine') - if Input.is_action_just_pressed("parab"): - equip_gun('parab') - if Input.is_action_just_pressed("hyper"): - equip_gun('hyper') - pass diff --git a/source/entities/shooting/script/Hyperbola/Hyperbolic_Barrel.gd b/source/entities/shooting/script/Hyperbola/Hyperbolic_Barrel.gd deleted file mode 100644 index fc808d6..0000000 --- a/source/entities/shooting/script/Hyperbola/Hyperbolic_Barrel.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends StaticBody2D # Y = aX - -onready var bullet = preload("res://Hyperbolic_Trajectory/Hyperbolic_Env.tscn") - - -func shoot(): - var b = bullet.instance() - get_parent().get_parent().get_parent().add_child(b) - b.global_position = $Position2D.global_position - b.global_rotation = $Position2D.global_rotation - - - -func _process(delta): - if Input.is_action_just_pressed("shoot"): - shoot() diff --git a/source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd b/source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd deleted file mode 100644 index 69f7b2e..0000000 --- a/source/entities/shooting/script/Hyperbola/Hyperbolic_Bullet.gd +++ /dev/null @@ -1,24 +0,0 @@ -extends Area2D - -var velocity = Vector2() -var speed = 1 -var time = 0.5 -var gravitile = 5 - - - -func follow_hyperbolic_trajectory(): - velocity.x = gravitile * time - velocity.y = 1/time - - -func _process(delta): - follow_hyperbolic_trajectory() - time += delta - position += velocity * speed * delta - - -func _on_Bullet_body_entered(body): - if body.is_in_group("mobs"): - body.queue_free() - queue_free() diff --git a/source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd b/source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd deleted file mode 100644 index 344a757..0000000 --- a/source/entities/shooting/script/Hyperbola/Hyperbolic_Env.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends Node2D - - -var time = 0 - - -func _process(delta): - time += delta - if time > 17: - queue_free() diff --git a/source/entities/shooting/script/KinematicBody2D.gd b/source/entities/shooting/script/KinematicBody2D.gd deleted file mode 100644 index 1aa9367..0000000 --- a/source/entities/shooting/script/KinematicBody2D.gd +++ /dev/null @@ -1,26 +0,0 @@ -extends KinematicBody2D - -export var speed = 400 -var movement = Vector2(0, 0) - -#func shoot(): - #var b = env.instance() - #get_parent().add_child(b) - #b.global_transform = $Gun.global_transform - -func get_input(): - movement = Vector2() - if Input.is_action_pressed("ui_right"): - movement.x += 10 - if Input.is_action_pressed("ui_left"): - movement.x -= 10 - if Input.is_action_pressed("ui_down"): - movement.y += 10 - if Input.is_action_pressed("ui_up"): - movement.y -= 10 - #if Input.is_action_just_pressed("shoot"): - #shoot() - -func _physics_process(delta): - get_input() - position += movement.normalized() * speed * delta diff --git a/source/entities/shooting/script/Line/Line_Barrel.gd b/source/entities/shooting/script/Line/Line_Barrel.gd deleted file mode 100644 index 4ba9307..0000000 --- a/source/entities/shooting/script/Line/Line_Barrel.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends StaticBody2D # Y = aX - -onready var bullet = preload("res://Line_Trajectory/Line_Env.tscn") - - -func shoot(): - var b = bullet.instance() - get_parent().get_parent().get_parent().add_child(b) - b.global_position = $Position2D.global_position - b.global_rotation = $Position2D.global_rotation - - - -func _process(delta): - if Input.is_action_just_pressed("shoot"): - shoot() diff --git a/source/entities/shooting/script/Line/Line_Env.gd b/source/entities/shooting/script/Line/Line_Env.gd deleted file mode 100644 index 3a7645d..0000000 --- a/source/entities/shooting/script/Line/Line_Env.gd +++ /dev/null @@ -1,9 +0,0 @@ -extends Node2D - -var time = 0 - - -func _process(delta): - time += delta - if time > 17: - queue_free() diff --git a/source/entities/shooting/script/Mob.gd b/source/entities/shooting/script/Mob.gd deleted file mode 100644 index 16a9985..0000000 --- a/source/entities/shooting/script/Mob.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends KinematicBody2D - - -var velocity = Vector2(1, 1) - -func _process(delta): - var collision = move_and_collide(velocity * delta) - - - diff --git a/source/entities/shooting/script/Parabola/Parabolic_Barrel.gd b/source/entities/shooting/script/Parabola/Parabolic_Barrel.gd deleted file mode 100644 index d020184..0000000 --- a/source/entities/shooting/script/Parabola/Parabolic_Barrel.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends StaticBody2D # Y = aX - -onready var bullet = preload("res://Parabolic_Trajectory/Parabolic_Env.tscn") - - -func shoot(): - var b = bullet.instance() - get_parent().get_parent().get_parent().add_child(b) - b.global_position = $Position2D.global_position - b.global_rotation = $Position2D.global_rotation - - - -func _process(delta): - if Input.is_action_just_pressed("shoot"): - shoot() diff --git a/source/entities/shooting/script/Parabola/Parabolic_Bullet.gd b/source/entities/shooting/script/Parabola/Parabolic_Bullet.gd deleted file mode 100644 index beee2de..0000000 --- a/source/entities/shooting/script/Parabola/Parabolic_Bullet.gd +++ /dev/null @@ -1,24 +0,0 @@ -extends Area2D - -export var speed = 100 -var velocity = Vector2() - -var time = 0 -var gravitile = 5 - - -func follow_parabolic_trajectory(): - velocity.x = 5 - velocity.y = 1 * time * gravitile - - -func _process(delta): - follow_parabolic_trajectory() - time += delta - position += velocity * speed * delta - - -func _on_Bullet_body_entered(body): - if body.is_in_group("mobs"): - body.queue_free() - queue_free() diff --git a/source/entities/shooting/script/Parabola/Parabolic_Env.gd b/source/entities/shooting/script/Parabola/Parabolic_Env.gd deleted file mode 100644 index 3a7645d..0000000 --- a/source/entities/shooting/script/Parabola/Parabolic_Env.gd +++ /dev/null @@ -1,9 +0,0 @@ -extends Node2D - -var time = 0 - - -func _process(delta): - time += delta - if time > 17: - queue_free() diff --git a/source/entities/shooting/script/Sine/Sine_Barrel.gd b/source/entities/shooting/script/Sine/Sine_Barrel.gd deleted file mode 100644 index 79ce4e8..0000000 --- a/source/entities/shooting/script/Sine/Sine_Barrel.gd +++ /dev/null @@ -1,20 +0,0 @@ -extends StaticBody2D - -onready var bullet = preload("res://Sine_Trajectory/Sine_Env.tscn") - -var velocity = Vector2(1, 0) -var shooting_speed = 200 - - - -func shoot(): - var b = bullet.instance() - get_parent().get_parent().get_parent().add_child(b) - b.global_position = $Position2D.global_position - b.global_rotation = $Position2D.global_rotation - pass - - -func _process(delta): - if Input.is_action_just_pressed("shoot"): - shoot() diff --git a/source/entities/shooting/script/Sine/Sine_Env.gd b/source/entities/shooting/script/Sine/Sine_Env.gd deleted file mode 100644 index 3a7645d..0000000 --- a/source/entities/shooting/script/Sine/Sine_Env.gd +++ /dev/null @@ -1,9 +0,0 @@ -extends Node2D - -var time = 0 - - -func _process(delta): - time += delta - if time > 17: - queue_free() diff --git a/source/entities/shooting/script/pixil-frame-0 (1).png b/source/entities/shooting/script/pixil-frame-0 (1).png deleted file mode 100644 index ecdddeac28feab66f10c07101cd4acda698c8f6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29132 zcmeHQX-rgC6rMMXbX1@N#0^14P{E~uaY0341Qaj|R6tP+Jh!4zSyWtDAI7TGNFg{# z-L+V1R6tvbiolC8(b5)Dw4%idjRixIfZzm%W$0nvy(}~RQJb_e&G|u?nfLCw=brPO zbH97uy)!BPzFx*7EJlb#B4ZzK&y^yPB){)ZY6zb+PW-w8{xQ2&dbx{o%Pkv3BDu)N zb8+Cl&{t1>ie9%`=DB#9^_8qlt90e)W#xxWnD*rJQJK{mmF@h(aJRs=7e6LRq%ygJ z6EWg}7k9;Ocb|IN>U;|KwS3I)lnmTQTW)0xR^6WP8+|))gHdqAP|1C_$Uk8DWmUG8 zgL~9A<(Th{^>mSD4>JmGh&`yUjT3uIPlPD>8;+SC@>$e?4pb|{8P56xN*nFOUTQQ= z9WwmB7CcvHNLvobsuUYu-M#3psjk7KWAmTsiQp7#c}|(@HE)n*iAaOY@p>X;-Xq86 zSE{65dKP2(odyFsP_5ADXmmunUa(+#5iyuvFsI{0iW8|0-$C|*lo5G4@^oAr>8!|b zMT(RW%K%t=!P<*%RSGF1QbweVNEwkbB4wlx9_XV8tTJMi5vzegyvX>l23FNR?SgscsE~%3^iRt^V{G=bDpZbYPgm>Cc8PZd}mv|#)jNb8vv(_ z{a&lr3rkJ*JjZNfx7wHsdozomaZy)$toCC5hdftsJtlIBK*E;73F4(yb_)eTEgZ)* zGPB*>NdafyC3vsw)XXK9M=%DDr$6dhK~}W9ox~{k9N+eZu+rtd;qrrD4ieFGLG;|h z<|ge$HV0G+Zw_4{NH&5))W!~ey9GhD6QQBU_QWG(254CT?;BtBY$liI!04)Oc3mM0 z>g2;Pp!XlD7Ymo!uR!#c=nZ7Fad0uNsC}pQVtx>ewqSoVQK@8k?Tf1F`^qp)O={vGY-}=6ba04=-uQaiBz!zlmH1>T#xMV(0o9VKV^1&Y?; zRQ3UoEza~4G-1Sc(6#yG8rrxVx_Y^)WD@Dia`@Q%)U0?<;yYv^J2a&UjRZ;1_6 z0vw)tIo_KpVFpUfR8yx$Ie-#{t&^z|o}k3V-^U9|0DwztYTR5^BMooXcU*$s}l@+@_`b~Lr8 zz{Y1ovzf+*?8J#e&;DQ=Wp(;7t!?7X!6y%o&Sn>#dE`ipSq6jL>2gCm$mB>HmXD21 zH@upY(fNsBA;lV=3yScXtJR=o1=zsPv655mURg@)Z4Y)RYkII$Ylo5)ux`T=i~O^` ze~d8`0&+8a`N1u#r&_D>&ZbW6qGE4Q!>7kxu*UfrEI+N#cDz>Mjwzr|&X}!y?1IZ- z#J0!5`*nLZ314tf1C~_1vHACmz=&;!xh58eSY&Cs+IuQpdOKh4Y3Q;}3hV4{YVRso z=oabR`{kXbueK3iUgVOter>L&t$-duhkBpySUo@@O30hmJQ+vnFtmqymP#mb=n8It}*|BA%Eax*FP!uz2I@i9^e)-Ins_nv#d;x1dyzcgoOGx zS!_qCm5aR?3J~%qr3IGt-!hGd`{!##5T6_r5*n$;oKrZ1#!Y`gwS$=VR>kZu)+5e# zVw0;G7xbBS;4sVJpX*el+%SOc)6#kQzK8UQw*ROoHt0l^9`}#3spS`p(_bv$0H{sT z0|eCwAzC)UASQJ!%t9nKFpbi5i4z%#4V;NdxyEfmCAXA`z(s z4UxB@5-*Q*cZx)&8~T1Dpl>mc%oLgF;Ce7v<89!C5E@iI#*Fk&G7>@vA%ulqoQVm) zmB}%UVj3Ot#9kuB8WGlrbXY3Zh_FUP^CZ@Y2o|tL^v=|X4A}{3e0We(9{fC`$Y+VK JXRbSY;7<{&pymJo diff --git a/source/entities/shooting/script/pixil-frame-0 (1).png.import b/source/entities/shooting/script/pixil-frame-0 (1).png.import deleted file mode 100644 index 16d5212..0000000 --- a/source/entities/shooting/script/pixil-frame-0 (1).png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/pixil-frame-0 (1).png-aa4fc3ac5779e5dd3e9b1e2bedd174f2.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://source/entities/shooting/script/pixil-frame-0 (1).png" -dest_files=[ "res://.import/pixil-frame-0 (1).png-aa4fc3ac5779e5dd3e9b1e2bedd174f2.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 diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index e01614e..c35c9fc 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -66,8 +66,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "PLAY" align = 1 valign = 1 @@ -91,8 +91,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "LAN Party" align = 1 valign = 1 @@ -123,8 +123,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "EXIT" align = 1 valign = 1 @@ -138,8 +138,8 @@ 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 ) +custom_colors/font_color_disabled = Color( 1, 1, 1, 1 ) __meta__ = { "_edit_use_anchors_": false }