Fixed ammo infinity getting disabled when switching weapons.

Author: hepfnepf

Diff for: Scenes/Game.tscn

@@ -72,9 +72,27 @@ autoplay = false
 bus = "Music"
 tracks = [ ExtResource( 19 ), ExtResource( 18 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 20 ) ]
 volumes = {
-ExtResource( 19 ): 6.0,
-ExtResource( 21 ): -6.0,
 ExtResource( 18 ): 0.0,
+ExtResource( 21 ): -6.0,
+ExtResource( 22 ): 0.0,
 ExtResource( 20 ): 0.0,
-ExtResource( 22 ): 0.0
+ExtResource( 19 ): 6.0
 }
+
+[node name="EffectItemBasis" parent="." instance=ExtResource( 13 )]
+position = Vector2( -1569.48, 297.31 )
+
+[node name="EffectItemBasis2" parent="." instance=ExtResource( 13 )]
+position = Vector2( -1754.48, 815.302 )
+
+[node name="EffectItemBasis3" parent="." instance=ExtResource( 13 )]
+position = Vector2( -1902.48, 1249.2 )
+
+[node name="ItemIcicleGun" parent="." instance=ExtResource( 4 )]
+position = Vector2( -1434.94, -594.04 )
+
+[node name="ItemIcicleGun2" parent="." instance=ExtResource( 4 )]
+position = Vector2( -560.406, 1286.2 )
+
+[node name="ItemIcicleGun3" parent="." instance=ExtResource( 4 )]
+position = Vector2( -567.133, 774.939 )

Diff for: Scenes/Items/EffectNodes/AmmoInfinity.gd

@@ -5,23 +5,31 @@ export (float) var fire_rate_multiplyer = 3.0
 var reload_time_delta = 0
 var fire_rate_delta = 0
 
-var _weapon:Weapon=null
+var weapon:Weapon=null
+
+func _ready() -> void:
+	if is_instance_valid(player.weapon):
+		player.weapon.connect("weapon_switch",self,"_on_weapon_switch")
 
 func add_effect():
 	if player.weapon.current_weapon is Weapon:
 
-		_weapon = player.weapon.current_weapon
-		_weapon.ammo_infinity_stack += 1
+		weapon = player.weapon.current_weapon
+		weapon.ammo_infinity_stack += 1
 
 		#Increase fire rate
-		var new_fire_rate = int(_weapon.fire_rate*fire_rate_multiplyer)
-		fire_rate_delta = new_fire_rate - _weapon.fire_rate
-		_weapon.fire_rate_delta += fire_rate_delta
-		_weapon.set_fire_rate(new_fire_rate)
+		var new_fire_rate = int(weapon.fire_rate*fire_rate_multiplyer)
+		fire_rate_delta = new_fire_rate - weapon.fire_rate
+		weapon.fire_rate_delta += fire_rate_delta
+		weapon.set_fire_rate(new_fire_rate)
 
 func remove_effect():
-	if is_instance_valid(_weapon):
-		_weapon.ammo_infinity_stack -= 1
-		_weapon.fire_rate_delta -= fire_rate_delta
-		_weapon.set_fire_rate(_weapon.fire_rate - fire_rate_delta)
+	if is_instance_valid(weapon):
+		weapon.ammo_infinity_stack -= 1
+		weapon.fire_rate_delta -= fire_rate_delta
+		weapon.set_fire_rate(weapon.fire_rate - fire_rate_delta)
+
+func _on_weapon_switch(_weapon)->void:
+	if is_instance_valid(player.weapon):
+		add_effect()
 

Diff for: Scenes/Items/EffectNodes/AmmoInfinity.tscn

@@ -7,3 +7,4 @@
 [node name="EffectBasis" instance=ExtResource( 2 )]
 script = ExtResource( 1 )
 icon_texture = ExtResource( 3 )
+fire_rate_multiplyer = 3.0