diff --git a/source/assets/sprites/GUI/in_game/Player-character-bullet.svg b/source/assets/sprites/GUI/in_game/Player-character-bullet.svg deleted file mode 100644 index 4a33b15..0000000 --- a/source/assets/sprites/GUI/in_game/Player-character-bullet.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/source/assets/sprites/bullet/player_character_bullet.svg b/source/assets/sprites/bullet/player_character_bullet.svg new file mode 100644 index 0000000..6766961 --- /dev/null +++ b/source/assets/sprites/bullet/player_character_bullet.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/character/menu_player/player_character_theme-menu.svg b/source/assets/sprites/character/menu_player/player_character_theme-menu.svg new file mode 100644 index 0000000..fef5ecd --- /dev/null +++ b/source/assets/sprites/character/menu_player/player_character_theme-menu.svg @@ -0,0 +1,858 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/entities/menu_player/player_node.tscn b/source/entities/menu_player/player_node.tscn index 1887611..36cb598 100644 --- a/source/entities/menu_player/player_node.tscn +++ b/source/entities/menu_player/player_node.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://source/assets/sprites/character/menu_player/tank.svg" type="Texture" id=1] +[ext_resource path="res://source/assets/sprites/character/menu_player/player_character_theme-menu.svg" type="Texture" id=1] [sub_resource type="CircleShape2D" id=1] radius = 76.0267 @@ -10,6 +10,5 @@ radius = 76.0267 [node name="player_collider" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) -[node name="player_sprite" type="Sprite" parent="."] -position = Vector2( 0.561218, -8.41847 ) +[node name="player_character_theme-menu" type="Sprite" parent="."] texture = ExtResource( 1 ) diff --git a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn index 4cdb733..0e6aa2a 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn @@ -1,11 +1,13 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1] +[ext_resource path="res://source/assets/sprites/bullet/player_character_bullet.svg" 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 = 12.2565 +height = 48.3215 -[node name="player_bullet" type="Sprite" groups=[ +[node name="player_character_bullet" type="Sprite" groups=[ "Net", ]] texture = ExtResource( 1 ) @@ -16,7 +18,6 @@ script = ExtResource( 2 ) ]] [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] +position = Vector2( -14.0379, 0.26487 ) rotation = 1.5708 shape = SubResource( 1 ) - -[connection signal="body_entered" from="hitbox" to="." method="_on_hitbox_body_entered"] diff --git a/source/entities/shooting/player_bullet.tscn b/source/entities/shooting/player_bullet.tscn deleted file mode 100644 index d3813c1..0000000 --- a/source/entities/shooting/player_bullet.tscn +++ /dev/null @@ -1,27 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1] -[ext_resource path="res://source/assets/scripts/player_handlers/player_bullet.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.0883, 10 ) - -[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="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] -visible = false -shape = SubResource( 1 ) - -[node name="destroy_timer" type="Timer" parent="."] -one_shot = true -autostart = true - -[connection signal="timeout" from="destroy_timer" to="." method="_on_destroy_timer_timeout"] diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index f1b0856..308c53f 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -27,6 +27,7 @@ anchor_bottom = 1.0 margin_top = 1.49835 margin_bottom = 1.49829 __meta__ = { +"_edit_lock_": true, "_edit_use_anchors_": false } @@ -34,6 +35,9 @@ __meta__ = { position = Vector2( 980, 333.502 ) scale = Vector2( 0.462963, 0.462963 ) texture = ExtResource( 4 ) +__meta__ = { +"_edit_lock_": true +} [node name="play" parent="foreground" instance=ExtResource( 7 )] margin_left = 810.0