diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 359f96b..6662f61 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -67,18 +67,6 @@ var weaponAngle = 0 var particleTexture = ImageTexture.new() var particleImage = Image.new() -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 - 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) diff --git a/source/entities/player/Gun_.gd b/source/entities/player/Gun_.gd index 6b3ae8a..fbf4151 100644 --- a/source/entities/player/Gun_.gd +++ b/source/entities/player/Gun_.gd @@ -1,6 +1,7 @@ extends AnimatedSprite var trajectory:String = 'line' +var trajectory_line = 'sine' var bullet = { 'line' : preload("res://source/entities/shooting/Line_Trajectory/Line_Env.tscn"), @@ -9,8 +10,16 @@ var bullet = { 'hyper' : preload("res://source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Env.tscn") } +var bullet_trajectory = { + '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 choose_trajectory(): trajectory + enable_trajectory_line(trajectory_line) if Input.is_action_just_pressed("line"): trajectory = 'line' elif Input.is_action_just_pressed("sine"): @@ -28,8 +37,16 @@ func shoot(trajectory:String): b.global_rotation = $Position2D.global_rotation pass +func enable_trajectory_line(trajectory_line:String): + var x = bullet_trajectory[trajectory_line].instance() + get_parent().get_parent().get_parent().add_child(x) + x.global_position = $Position2D.global_position + x.global_rotation = $Position2D.global_rotation func _process(delta): choose_trajectory() if Input.is_action_just_pressed("shoot"): + #enable_trajectory_line(trajectory_line) + pass + elif Input.is_action_just_released('shoot'): shoot(trajectory) diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index fbf24b8..824b885 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -175,66 +175,56 @@ [sub_resource type="SpriteFrames" id=2] 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": "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": "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": "move-speed-left-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": "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": "idle-speed-right-01", "speed": 25.0 }, { +"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"loop": true, +"name": "idle-speed-left-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": "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( 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": "idle-speed-left-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": "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": "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( 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( 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": "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( 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", @@ -245,6 +235,36 @@ animations = [ { "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", +"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( 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": "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, +"name": "idle-speed-left-04", +"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( 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", @@ -255,30 +275,10 @@ animations = [ { "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": "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": "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", -"speed": 50.0 -}, { -"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], -"loop": true, -"name": "idle-speed-left-02", -"speed": 25.0 -}, { -"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], -"loop": true, -"name": "boost-speed-left-01", -"speed": 50.0 +"name": "move-speed-right-02", +"speed": 35.0 } ] [sub_resource type="RectangleShape2D" id=3] @@ -309,25 +309,25 @@ radius = 41.5403 [sub_resource type="SpriteFrames" id=6] animations = [ { -"frames": [ ExtResource( 169 ) ], -"loop": true, -"name": "04", -"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( 169 ) ], +"loop": true, +"name": "04", +"speed": 5.0 +}, { "frames": [ ExtResource( 168 ) ], "loop": true, "name": "03", "speed": 5.0 +}, { +"frames": [ ExtResource( 27 ) ], +"loop": true, +"name": "01", +"speed": 5.0 } ] [node name="player" type="KinematicBody2D" groups=["Net", "Player"]] @@ -381,7 +381,6 @@ 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" @@ -392,28 +391,8 @@ 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 ) +scale = Vector2( 0.3, 0.25 ) texture = ExtResource( 171 ) [connection signal="timeout" from="network_tick_rate" to="." method="_on_network_tick_rate_timeout"] diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn index 9e1a160..851f564 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn @@ -1,22 +1,6 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=2 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="Curve" id=1] -[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 ) +[node name="Hyperbolic_Barrel" type="Line2D"] +width_curve = SubResource( 1 ) diff --git a/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn b/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn index 1b2e3c9..9bd312b 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn @@ -1,22 +1,3 @@ -[gd_scene load_steps=4 format=2] +[gd_scene 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 ) +[node name="Line_Barrel" type="Line2D"] diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn index d7e228d..6bb42a2 100644 --- a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn @@ -1,22 +1,3 @@ -[gd_scene load_steps=4 format=2] +[gd_scene 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 ) +[node name="Parabolic_Barrel" type="Line2D"] diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.gd b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.gd new file mode 100644 index 0000000..4e5e58a --- /dev/null +++ b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.gd @@ -0,0 +1,33 @@ +extends Line2D + + +export var speed = 100 +var velocity = Vector2(0, 0) +var dot_position = Vector2(0, 0) +var dot_array:PoolVector2Array = [] + +var time = 0 +export var amplitude = 4 +export var frequency = 5 + +var maxpoints = 15 + + +func follow_sine_trajectory(time): + for x in range(maxpoints): + velocity.y = amplitude * cos(time * frequency) + velocity.x = 5 + dot_position += velocity + dot_array.append(dot_position) + return dot_array + +func construct_a_line(): + clear_points() + for x in range(maxpoints): + add_point(follow_sine_trajectory(x)) + pass + +func _process(delta): + time += delta + self.points = follow_sine_trajectory(time) + pass diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn index 690b1ca..ff87d5d 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn @@ -1,22 +1,8 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=2 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/entities/shooting/Sine_Trajectory/Sine_Barrel.gd" type="Script" id=1] -[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 ) +[node name="Sine_Barrel" type="Line2D"] +show_behind_parent = true +width = 4.0 +script = ExtResource( 1 )