From 261e63b7f3c4156476795a4cb49e00e9d354752e Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristians.cagulis@gmail.com>
Date: Sun, 14 Nov 2021 20:48:21 +0200
Subject: [PATCH] Added new bullet texture

---
 .../network_processors/network_setup.gd       |  2 +-
 .../server_handlers/trinity_site_level.gd     |  1 -
 .../scripts/ui_element_handlers/game_UI.gd    |  2 +-
 .../bullet/player_character_bullet.svg        | 14 ++++++------
 .../Hyperbolic_Bullet.tscn                    | 13 ++++++++---
 .../shooting/Line_Trajectory/Line_Bullet.tscn |  8 ++++---
 .../Parabolic_Bullet.tscn                     | 13 ++++++++---
 .../shooting/Sine_Trajectory/Sine_Bullet.tscn |  7 ++++--
 .../scenes/OVERLAY/elements/user_input.tscn   | 22 +++++++++----------
 9 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/source/assets/scripts/server_handlers/network_processors/network_setup.gd b/source/assets/scripts/server_handlers/network_processors/network_setup.gd
index 204dbc3..4b095de 100644
--- a/source/assets/scripts/server_handlers/network_processors/network_setup.gd
+++ b/source/assets/scripts/server_handlers/network_processors/network_setup.gd
@@ -1,6 +1,6 @@
 extends Control
 
-var player_amount = 1
+var player_amount = 0
 
 var player = load("res://source/entities/player/player_node.tscn")
 
diff --git a/source/assets/scripts/server_handlers/trinity_site_level.gd b/source/assets/scripts/server_handlers/trinity_site_level.gd
index d7bb757..e40f25d 100644
--- a/source/assets/scripts/server_handlers/trinity_site_level.gd
+++ b/source/assets/scripts/server_handlers/trinity_site_level.gd
@@ -36,4 +36,3 @@ func _process(delta):
 	globalActivePhase = Global.get_current_phase()
 	if globalActivePhase["active"] != null:
 		phase.text = str(globalActivePhase["active"]["phase_name"])
-		print(time)
diff --git a/source/assets/scripts/ui_element_handlers/game_UI.gd b/source/assets/scripts/ui_element_handlers/game_UI.gd
index 9c0b96e..3efd57b 100644
--- a/source/assets/scripts/ui_element_handlers/game_UI.gd
+++ b/source/assets/scripts/ui_element_handlers/game_UI.gd
@@ -1,7 +1,7 @@
 extends CanvasLayer
 
 # if 0, then singleplayer will work, if 1, then multiplayer only
-var winner_amount = 1
+var winner_amount = 0
 
 onready var win_timer = $winner/win_timer
 onready var winner = $winner
diff --git a/source/assets/sprites/bullet/player_character_bullet.svg b/source/assets/sprites/bullet/player_character_bullet.svg
index 6766961..4ee7201 100644
--- a/source/assets/sprites/bullet/player_character_bullet.svg
+++ b/source/assets/sprites/bullet/player_character_bullet.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="100"
-   height="25.635"
-   viewBox="0 0 100 25.635001"
+   width="75"
+   height="19.24"
+   viewBox="0 0 75 19.24"
    version="1.1"
    id="svg18"
    sodipodi:docname="player_character_bullet.svg"
@@ -21,9 +21,9 @@
      inkscape:pagecheckerboard="1"
      showgrid="false"
      height="25.635px"
-     inkscape:zoom="16"
-     inkscape:cx="44.0625"
-     inkscape:cy="22.125"
+     inkscape:zoom="11.313709"
+     inkscape:cx="38.714096"
+     inkscape:cy="21.743533"
      inkscape:window-width="1920"
      inkscape:window-height="1007"
      inkscape:window-x="1920"
@@ -45,7 +45,7 @@
   <g
      id="Player-character-bullet"
      clip-path="url(#clip-Player-character-bullet)"
-     transform="matrix(0.73224636,0,0,0.73224636,-7.3224197,-9.5184704)">
+     transform="matrix(-0.54918477,0,0,0.54918477,80.491815,-7.1388534)">
     <path
        id="Path_4"
        data-name="Path 4"
diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn
index 200bc31..1047204 100644
--- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn
+++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn
@@ -1,17 +1,24 @@
 [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/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2]
 
 [sub_resource type="CapsuleShape2D" id=1]
+radius = 9.85811
+height = 35.0082
 
-[node name="playert_bullet" type="Sprite" groups=["Net"]]
+[node name="player_character_bullet" type="Sprite" groups=[
+"Net",
+]]
 texture = ExtResource( 1 )
 script = ExtResource( 2 )
 
-[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
+[node name="hitbox" type="Area2D" parent="." groups=[
+"Player_damager",
+]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
+position = Vector2( 10.8253, -0.381073 )
 rotation = 1.5708
 shape = SubResource( 1 )
 
diff --git a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn
index 0e6aa2a..9675fcd 100644
--- a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn
+++ b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn
@@ -4,8 +4,8 @@
 [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
+radius = 9.85811
+height = 35.0082
 
 [node name="player_character_bullet" type="Sprite" groups=[
 "Net",
@@ -18,6 +18,8 @@ script = ExtResource( 2 )
 ]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
-position = Vector2( -14.0379, 0.26487 )
+position = Vector2( 10.8253, -0.381073 )
 rotation = 1.5708
 shape = SubResource( 1 )
+
+[connection signal="body_entered" from="hitbox" to="." method="_on_hitbox_body_entered"]
diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn
index 0928004..c629678 100644
--- a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn
+++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn
@@ -1,17 +1,24 @@
 [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/Parabola/Parabolic_Bullet.gd" type="Script" id=2]
 
 [sub_resource type="CapsuleShape2D" id=1]
+radius = 9.85811
+height = 35.0082
 
-[node name="player_bullet2" type="Sprite" groups=["Net"]]
+[node name="player_character_bullet" type="Sprite" groups=[
+"Net",
+]]
 texture = ExtResource( 1 )
 script = ExtResource( 2 )
 
-[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
+[node name="hitbox" type="Area2D" parent="." groups=[
+"Player_damager",
+]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
+position = Vector2( 10.8253, -0.381073 )
 rotation = 1.5708
 shape = SubResource( 1 )
 
diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn
index 1a8a854..52075ae 100644
--- a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn
+++ b/source/entities/shooting/Sine_Trajectory/Sine_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/Sine/Sine_Bullet.gd" type="Script" id=2]
 
 [sub_resource type="CapsuleShape2D" id=1]
+radius = 9.85811
+height = 35.0082
 
-[node name="player_bullet2" type="Sprite" groups=[
+[node name="player_character_bullet" type="Sprite" groups=[
 "Net",
 ]]
 texture = ExtResource( 1 )
@@ -16,6 +18,7 @@ script = ExtResource( 2 )
 ]]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
+position = Vector2( 10.8253, -0.381073 )
 rotation = 1.5708
 shape = SubResource( 1 )
 
diff --git a/source/scenes/OVERLAY/elements/user_input.tscn b/source/scenes/OVERLAY/elements/user_input.tscn
index 43236ac..97037da 100644
--- a/source/scenes/OVERLAY/elements/user_input.tscn
+++ b/source/scenes/OVERLAY/elements/user_input.tscn
@@ -13,7 +13,7 @@
 [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_hover.svg" type="Texture" id=11]
 [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button.svg" type="Texture" id=12]
 
-[sub_resource type="StyleBoxTexture" id=1]
+[sub_resource type="StyleBoxTexture" id=9]
 texture = ExtResource( 1 )
 region_rect = Rect2( 0, 0, 480, 156 )
 
@@ -51,12 +51,6 @@ font_data = ExtResource( 2 )
 texture = ExtResource( 6 )
 region_rect = Rect2( 0, 0, 100, 100 )
 
-[sub_resource type="DynamicFont" id=9]
-size = 22
-use_mipmaps = true
-use_filter = true
-font_data = ExtResource( 2 )
-
 [sub_resource type="DynamicFont" id=10]
 size = 22
 use_mipmaps = true
@@ -69,10 +63,16 @@ use_mipmaps = true
 use_filter = true
 font_data = ExtResource( 2 )
 
+[sub_resource type="DynamicFont" id=12]
+size = 22
+use_mipmaps = true
+use_filter = true
+font_data = ExtResource( 2 )
+
 [node name="user_input" type="Panel"]
 margin_right = 480.0
 margin_bottom = 156.0
-custom_styles/panel = SubResource( 1 )
+custom_styles/panel = SubResource( 9 )
 __meta__ = {
 "_edit_lock_": true,
 "_edit_use_anchors_": false
@@ -240,7 +240,7 @@ __meta__ = {
 [node name="Label" type="Label" parent="controls"]
 anchor_right = 1.0
 margin_bottom = 29.0
-custom_fonts/font = SubResource( 9 )
+custom_fonts/font = SubResource( 10 )
 text = "Active formula"
 align = 1
 valign = 1
@@ -264,7 +264,7 @@ __meta__ = {
 [node name="Label" type="Label" parent="controls/ready_button"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-custom_fonts/font = SubResource( 10 )
+custom_fonts/font = SubResource( 11 )
 text = "Ready"
 align = 1
 valign = 1
@@ -288,7 +288,7 @@ __meta__ = {
 [node name="Label" type="Label" parent="controls/skip_button"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-custom_fonts/font = SubResource( 11 )
+custom_fonts/font = SubResource( 12 )
 text = "Skip"
 align = 1
 valign = 1