Adding loads of icons and starting refactor of weapons and mods

combat/modifiers/ModifierManager.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://dxk87qi05ffqy"]
+
+[ext_resource type="Script" uid="uid://cwtajnv8go4a" path="res://combat/modifiers/_scripts/modifier_manager.gd" id="1_jn4l3"]
+
+[node name="ModifierManager" type="Node2D"]
+script = ExtResource("1_jn4l3")

combat/modifiers/_scripts/modifier_manager.gd

@@ -0,0 +1,6 @@
+@icon("res://assets/editor/64x64/fc1098.png")
+extends Node2D
+class_name ModifierManagerTwo
+
+func _init() -> void:
+	Log.pr("ModifierManagerTwo initialized")

combat/modifiers/_scripts/modifier_manager.gd.uid

@@ -0,0 +1 @@
+uid://cwtajnv8go4a

combat/projectiles/_scripts/projectile_base.gd

@@ -0,0 +1,17 @@
+extends Area2D
+class_name ProjectileBaseTwo
+
+var lifetime_timer: Timer
+
+var stats = {
+	"speed": 500.0,
+	"damage": 10.0,
+	"lifetime": 2,
+}
+
+func destroy():
+	emit_signal("on_destroyed", self)
+	queue_free()
+
+func _on_lifetime_timeout():
+	destroy()

combat/projectiles/_scripts/projectile_base.gd.uid

@@ -0,0 +1 @@
+uid://bkyout6vd2xer

combat/projectiles/rock/RockProjectile.tscn

@@ -0,0 +1,12 @@
+[gd_scene load_steps=2 format=3 uid="uid://xil4f66wokxb"]
+
+[ext_resource type="Script" uid="uid://cv3jv78k0qqvc" path="res://combat/projectiles/rock/scripts/rock_projectile.gd" id="1_8myby"]
+
+[node name="RockProjectile" type="Node2D"]
+script = ExtResource("1_8myby")
+speed = null
+damage = null
+lifetime = null
+direction = null
+target_position = null
+is_friendly = null

combat/projectiles/rock/scripts/rock_projectile.gd

@@ -0,0 +1,19 @@
+class_name RockProjectile
+extends ProjectileBaseTwo
+
+func _ready():
+	lifetime_timer = Timer.new()
+	add_child(lifetime_timer)
+	lifetime_timer.one_shot = true
+	lifetime_timer.wait_time = lifetime
+	lifetime_timer.connect("timeout", _on_lifetime_timeout)
+	lifetime_timer.start()
+
+	emit_signal("on_spawned", self)
+	connect("body_entered", _on_body_entered)
+
+func _physics_process(delta):
+	position += direction * speed * delta
+
+func _on_lifetime_timeout():
+	super._on_lifetime_timeout()

combat/projectiles/rock/scripts/rock_projectile.gd.uid

@@ -0,0 +1 @@
+uid://cv3jv78k0qqvc

combat/weapons/MeleeWeaponComponent.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://dqful6et42ok8"]
+
+[ext_resource type="Script" uid="uid://bvoe382ee3088" path="res://combat/weapons/_scripts/melee_weapon_component.gd" id="1_jtxhn"]
+
+[node name="MeleeWeaponComponent" type="Node2D"]
+script = ExtResource("1_jtxhn")

combat/weapons/RangedWeaponComponent.tscn

@@ -0,0 +1,9 @@
+[gd_scene load_steps=3 format=3 uid="uid://dud7c465danl4"]
+
+[ext_resource type="Script" uid="uid://du7wmboxaiavv" path="res://combat/weapons/_scripts/ranged_weapon_component.gd" id="1_ag7i1"]
+[ext_resource type="PackedScene" uid="uid://dxk87qi05ffqy" path="res://combat/modifiers/ModifierManager.tscn" id="2_n81mi"]
+
+[node name="RangedWeaponComponent" type="Node2D"]
+script = ExtResource("1_ag7i1")
+
+[node name="ModifierManager" parent="." instance=ExtResource("2_n81mi")]

combat/weapons/_scripts/melee_weapon_component.gd

@@ -0,0 +1,18 @@
+@icon("res://assets/editor/64x64/fc728.png")
+extends WeaponComponent
+class_name MeleeWeaponComponent
+
+var stats = {
+	"piercing": 3,
+}
+var combined_stats = {}
+
+func _init() -> void:
+	Log.pr("MeleeWeaponComponent initialized")
+	super._init()
+
+	# Combine the base stats with the stats from the parent class
+	combined_stats = base_stats.duplicate()
+	combined_stats.merge(stats)
+
+	Log.pr("Combined stats: ", combined_stats)

combat/weapons/_scripts/melee_weapon_component.gd.uid

@@ -0,0 +1 @@
+uid://bvoe382ee3088

combat/weapons/_scripts/ranged_weapon_component.gd

@@ -0,0 +1,25 @@
+@icon("res://assets/editor/64x64/fc1515.png")
+extends WeaponComponent
+class_name RangedWeaponComponent
+
+var stats = {
+	"projectile_speed": 500.0,
+	"projectile_size": 1.0,
+	"projectile_lifetime": 1.0,
+	"projectile_quantity": 1,
+	"projectile_spread": 33,
+	"max_pierce": 0
+}
+var combined_stats = {}
+
+func _init() -> void:
+	Log.pr("RangedWeaponComponent initialized")
+	super._init()
+
+	# Combine the base stats with the stats from the parent class
+	combined_stats = base_stats.duplicate()
+	combined_stats.merge(stats)
+
+	Log.pr("Combined stats: ", combined_stats)
+
+	Log.pr("ModifierManager: ", modifier_manager)

combat/weapons/_scripts/ranged_weapon_component.gd.uid

@@ -0,0 +1 @@
+uid://du7wmboxaiavv

combat/weapons/_scripts/weapon_component.gd

@@ -0,0 +1,18 @@
+@icon("res://assets/editor/64x64/fc729.png")
+extends Node2D
+class_name WeaponComponent
+
+var modifier_manager
+
+var base_stats = {
+	"damage": 10.0,
+	"attack_rate": 3.0
+}
+
+func _init() -> void:
+	Log.pr("WeaponComponent initialized")
+
+func _ready() -> void:
+	await get_tree().process_frame
+	modifier_manager = $ModifierManager
+	Log.pr("ModifierManager: ", modifier_manager)

combat/weapons/_scripts/weapon_component.gd.uid

@@ -0,0 +1 @@
+uid://dl3kvbu0rwxky