Merge pull request #117 from hepfnepf/ch

Improved crosshair scaling and balancing.

Author: hepfnepf

Scenes/Game.tscn

@@ -73,8 +73,23 @@ bus = "Music"
 tracks = [ ExtResource( 19 ), ExtResource( 18 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 20 ) ]
 volumes = {
 ExtResource( 18 ): 0.0,
-ExtResource( 21 ): -6.0,
-ExtResource( 22 ): 0.0,
 ExtResource( 20 ): 0.0,
-ExtResource( 19 ): 6.0
+ExtResource( 19 ): 6.0,
+ExtResource( 21 ): -6.0,
+ExtResource( 22 ): 0.0
 }
+
+[node name="AkItem" parent="." instance=ExtResource( 23 )]
+position = Vector2( -1075.13, 495.935 )
+
+[node name="EffectItemBasis" parent="." instance=ExtResource( 13 )]
+position = Vector2( -1125.85, 955.12 )
+
+[node name="EffectItemBasis2" parent="." instance=ExtResource( 13 )]
+position = Vector2( -714.721, 1109.96 )
+
+[node name="EffectItemBasis3" parent="." instance=ExtResource( 13 )]
+position = Vector2( -1518.29, 1262.13 )
+
+[node name="EffectItemBasis4" parent="." instance=ExtResource( 13 )]
+position = Vector2( -1502.28, 1011.18 )

Scenes/UI/GUI/Crosshair.gd

@@ -10,5 +10,7 @@ func _process(delta) -> void:
 	global_position = get_viewport().get_mouse_position()
 
 func set_spread(new_spread) -> void:
-	var _spread = clamp(new_spread*spread_scaler,min_size,max_size)
+	var _spread =new_spread*spread_scaler
+	_spread = sqrt(_spread)+(1/pow((_spread+1),2))*1/8
+	_spread = clamp(_spread*1.1,min_size,max_size)
 	outer_crosshair.scale = Vector2(_spread,_spread)

Scenes/UI/GUI/Crosshair.tscn

@@ -60,8 +60,9 @@ shader_param/color = Color( 0.25098, 0.541176, 0.819608, 0.956863 )
 
 [node name="Crosshair" type="Node2D"]
 script = ExtResource( 1 )
-max_size = 10.0
+max_size = 7.0
 min_size = 0.7
+spread_scaler = 30.0
 
 [node name="OuterCrosshair" type="Sprite" parent="."]
 material = SubResource( 2 )

Scenes/Weapons/Weapons/AkRifle.tscn

@@ -13,12 +13,12 @@
 
 [node name="AkRifle" instance=ExtResource( 1 )]
 script = ExtResource( 10 )
-damage = 15
+damage = 18
 speed = 3500
 reload_time = 1.5
 fire_rate = 8.0
 base_spread = 0.01
-max_spread = 0.121
+max_spread = 0.15
 spread_inc = 1.148
 spread_dec = 0.078
 Bullet = ExtResource( 6 )

Scenes/Weapons/Weapons/LongShotgun.tscn

@@ -17,7 +17,7 @@
 position = Vector2( -1.12369, 1.52588e-05 )
 script = ExtResource( 6 )
 max_ammo = 7
-damage = 16
+damage = 17
 speed = 3500
 reload_time = 3.0
 fire_rate = 0.9

Scenes/Weapons/Weapons/ShortShotgun.tscn

@@ -17,7 +17,7 @@
 position = Vector2( -1.12369, 1.52588e-05 )
 script = ExtResource( 6 )
 max_ammo = 7
-damage = 16
+damage = 18
 speed = 3500
 reload_time = 3.0
 fire_rate = 0.9

Scenes/Weapons/Weapons/StandardRifle.tscn

@@ -20,7 +20,7 @@ reload_time = 1.58
 fire_rate = 1.0
 base_spread = 0.01
 spread_inc = 0.515
-spread_dec = 0.021
+spread_dec = 0.041
 Bullet = ExtResource( 6 )
 shoot_sfx = ExtResource( 7 )
 reload_sfx = ExtResource( 8 )