From 239cedf2b8947f2c207e475df26964381a396b05 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 9 Nov 2021 10:13:47 +0200 Subject: [PATCH] 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 }