Skip to content

Commit

Permalink
Debugger
Browse files Browse the repository at this point in the history
Closes Sparrowworks#49
Closes Sparrowworks#50

Fully functional!
  • Loading branch information
VargaDot committed Feb 28, 2025
1 parent 5d3def3 commit bba0d41
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 6 deletions.
5 changes: 0 additions & 5 deletions blueprints/ranged/ranged.gd
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ func shoot() -> void:
return

current_state = WEAPON_STATE.SHOOTING
print("Fire rate: " + str(fire_rate))
TIMER.wait_time = fire_rate
add_child(projectile.instantiate())
add_child(field.instantiate())
Expand All @@ -145,7 +144,6 @@ func reload() -> void:
return

current_state = WEAPON_STATE.RELOADING
print('started reloading')
if (current_mag == 0):
TIMER.wait_time = reload_time + reload_time_empty
else:
Expand Down Expand Up @@ -174,7 +172,6 @@ func equip_stat_kit(kit:RangedStatKit) -> void:
fire_rate = fire_rate + kit.fire_rate_modifier if kit.fire_rate_modifier != 0 else fire_rate

stat_kit_equipped.emit(kit)
prints("Equiped: ", kit.kit_name, mag_size, max_ammo, reload_time, reload_time_empty, fire_rate)

## Reverses the changes made by equip_kit
func unequip_stat_kit(kit:RangedStatKit) -> void:
Expand All @@ -186,7 +183,6 @@ func unequip_stat_kit(kit:RangedStatKit) -> void:
fire_rate -= kit.fire_rate_modifier

stat_kit_unequipped.emit(kit)
prints("Unequiped: ", kit.kit_name, mag_size, max_ammo, reload_time, reload_time_empty, fire_rate)

func has_stat_kit(kit: RangedStatKit) -> bool:
for kit_equipped in equipped_kits:
Expand Down Expand Up @@ -245,6 +241,5 @@ func _string_to_enum(value:String) -> int:
return 0

func _on_timer_timeout() -> void:
print("timer ended")
current_state = WEAPON_STATE.READY
weapon_ready.emit(current_mag, current_ammo)
66 changes: 66 additions & 0 deletions debugger/debugger.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
extends Node

@onready var pistol:Ranged = $"../Pistol"

func _ready() -> void:
connect_signals()
print("Debugger ready")

func connect_signals() -> void:
pistol.weapon_ready.connect(debug_weapon_ready)
pistol.weapon_firing.connect(debug_weapon_firing)
pistol.weapon_reloading.connect(debug_weapon_reloading)
pistol.state_updated.connect(debug_state_updated)
pistol.stat_kit_equipped.connect(debug_stat_kit_equipped)
pistol.stat_kit_unequipped.connect(debug_stat_kit_unequipped)
pistol.emission_kit_equipped.connect(debug_emission_kit_equipped)
pistol.reload_mode_changed.connect(debug_reload_mode_changed)
pistol.firing_mode_changed.connect(debug_firing_mode_changed)
pistol.TIMER.timeout.connect(debug_pistol_timeout)

func debug_weapon_ready(mag:int, ammo:int) -> void:
print("Weapon ready! Mag: %d, Ammo: %d" % [mag,ammo])

func debug_weapon_firing() -> void:
print("Started shooting")

func debug_weapon_reloading() -> void:
print("Started reloading")

func debug_state_updated(new_state: String) -> void:
print("Weapon state changed to %s" % [new_state])

func debug_stat_kit_equipped(kit:RangedStatKit) -> void:
print(
"Stat kit Equipped!
Name: %s, Magazine: %d, Ammo: %d, ReloadTime: %f, ReloadTimeEmpty: %f, Firerate: %f" %
[
kit.kit_name, kit.mag_size_modifier, kit.max_ammo_modifier,
kit.reload_time_modifier, kit.reload_time_empty_modifier, kit.fire_rate_modifier,
]
)

func debug_stat_kit_unequipped(kit:RangedStatKit) -> void:
print(
"Stat kit Un-Equipped!
Name: %s, Magazine: %d, Ammo: %d, ReloadTime: %f, ReloadTimeEmpty: %f, Firerate: %f" %
[
kit.kit_name, kit.mag_size_modifier, kit.max_ammo_modifier,
kit.reload_time_modifier, kit.reload_time_empty_modifier, kit.fire_rate_modifier,
]
)

func debug_emission_kit_equipped(kit:RangedEmissionKit) -> void:
print(
"Emission kit Equipped!
Name: %s" % [kit.resource_name]
)

func debug_reload_mode_changed(old_reload_mode:int, new_reload_mode:int) -> void:
print("Reload mode changed from %d to %d" % [old_reload_mode, new_reload_mode])

func debug_firing_mode_changed(old_firing_mode:int, new_firing_mode:int) -> void:
print("Firing mode changed from %d to %d" % [old_firing_mode, new_firing_mode])

func debug_pistol_timeout() -> void:
print("Timer ended")
6 changes: 6 additions & 0 deletions debugger/debugger.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://dj8ehpa0iwbtd"]

[ext_resource type="Script" path="res://debugger/debugger.gd" id="1_4oxym"]

[node name="Debugger" type="Node"]
script = ExtResource("1_4oxym")
5 changes: 4 additions & 1 deletion test_scene/test.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=3 uid="uid://cjuweh32idvkx"]
[gd_scene load_steps=4 format=3 uid="uid://cjuweh32idvkx"]

[ext_resource type="Script" path="res://test_scene/test.gd" id="1_jlb5m"]
[ext_resource type="PackedScene" uid="uid://cdg3qi6f4n7vf" path="res://weapons/pistol/pistol.tscn" id="2_tf4ak"]
[ext_resource type="PackedScene" uid="uid://dj8ehpa0iwbtd" path="res://debugger/debugger.tscn" id="3_vwx20"]

[node name="Test" type="Node2D"]
script = ExtResource("1_jlb5m")
Expand Down Expand Up @@ -37,6 +38,8 @@ layout_mode = 2
text = "State: READY"
horizontal_alignment = 1

[node name="Debugger" parent="." instance=ExtResource("3_vwx20")]

[connection signal="state_updated" from="Pistol" to="." method="_on_pistol_state_updated"]
[connection signal="weapon_ready" from="Pistol" to="." method="_on_pistol_weapon_ready"]
[connection signal="weapon_reloaded" from="Pistol" to="." method="_on_pistol_weapon_reloaded"]
Expand Down

0 comments on commit bba0d41

Please sign in to comment.