rand bullets

systems/bullets/bullet.gd

@@ -52,20 +52,22 @@ var _hitbox: CollisionShape2D = CollisionShape2D.new()
 ## Returns a new [Bullet], which may be sourced from the cached bullets.
 @warning_ignore("shadowed_variable")
 static func create(
-	texture: Texture2D = null,
-	hitbox_size: Vector2i = Vector2i.ZERO,
+	preset: BulletPreset,
 	direction: Vector2 = Vector2.RIGHT,
-	face_direction: bool = false,
 ) -> Bullet:
 	#var bullet: Bullet = _cached_bullets.pop_back()
 	#if not bullet:
 		#bullet = Bullet.new()
 	var bullet := Bullet.new()
 	
-	bullet.texture = texture
-	bullet.hitbox_size = hitbox_size
+	if not preset.textures.is_empty():
+		bullet.texture = preset.textures.pick_random()
+	if not preset.colors.is_empty():
+		bullet.modulate = preset.colors.pick_random()
+	bullet.hitbox_size = preset.hitbox_size
+	bullet.face_direction = preset.face_direction
+	
 	bullet.direction = direction
-	bullet.face_direction = face_direction
 	
 	bullet.time_elapsed = 0.0
 	bullet.grazed = false

systems/bullets/bullet_preset.gd

@@ -5,6 +5,7 @@ extends Resource
 @export_group("Bullets")
 @export var behavior: BulletBehavior = null
 @export var textures: Array[Texture2D] = []
+@export var colors: Array[Color] = [Color.WHITE]
 @export var hitbox_size: Vector2i = Vector2i.ZERO
 @export var face_direction: bool = false
 

systems/bullets/bullet_set.gd

@@ -10,9 +10,7 @@ var spawn_rotation: float = 0.0
 
 
 func _ready() -> void:
-	for _n in preset.rounds:
-		preset.pattern.spawn_bullets(self, preset)
-		await get_tree().create_timer(preset.round_delay, false, true).timeout
+	_spawn_rounds()
 
 
 func _physics_process(delta: float) -> void:
@@ -36,3 +34,9 @@ func add_bullets(new_bullets: Array[Bullet]) -> void:
 	for bullet in new_bullets:
 		preset.behavior.init_bullet(bullet)
 		add_child(bullet)
+
+
+func _spawn_rounds() -> void:
+	for _n in preset.rounds:
+		preset.pattern.spawn_bullets(self, preset)
+		await get_tree().create_timer(preset.round_delay, false, true).timeout

systems/bullets/set_behaviors/random_spawn_set_behavior.gd

@@ -0,0 +1,34 @@
+@tool
+class_name RandomSpawnSetBehavior
+extends BulletSetBehavior
+
+
+@export var spawn_offset_min: Vector2:
+	set(value):
+		if spawn_offset_min != value:
+			spawn_offset_min = value
+			spawn_offset_max = spawn_offset_max.max(spawn_offset_min)
+@export var spawn_offset_max: Vector2:
+	set(value):
+		if spawn_offset_max != value:
+			spawn_offset_max = value
+			spawn_offset_min = spawn_offset_min.min(spawn_offset_max)
+
+@export_custom(0, "radians_as_degrees") var spawn_rotation_min: float:
+	set(value):
+		spawn_rotation_min = value
+		if spawn_rotation_max < spawn_rotation_min:
+			spawn_rotation_max = maxf(spawn_rotation_min, spawn_rotation_max)
+@export_custom(0, "radians_as_degrees") var spawn_rotation_max: float:
+	set(value):
+		spawn_rotation_max = value
+		if spawn_rotation_min > spawn_rotation_max:
+			spawn_rotation_min = minf(spawn_rotation_min, spawn_rotation_max)
+
+
+func _process_set(bullet_set: BulletSet, delta: float) -> void:
+	bullet_set.spawn_offset = Vector2(
+		randf_range(spawn_offset_min.x, spawn_offset_max.x),
+		randf_range(spawn_offset_min.y, spawn_offset_max.y)
+	)
+	bullet_set.spawn_rotation = randf_range(spawn_rotation_min, spawn_rotation_max)

systems/bullets/set_behaviors/random_spawn_set_behavior.gd.uid

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

systems/bullets/spawn_patterns/bullet_spawn_pattern.gd

@@ -3,4 +3,15 @@ class_name BulletSpawnPattern
 extends Resource
 
 
-@abstract func spawn_bullets(bullet_set: BulletSet, preset: BulletPreset) -> void
+## The amount of times to spawning this pattern for one "round".
+## This is mostly useful if the pattern or behavior introduces some
+## form of randomness.
+@export_range(1, 1, 1, "or_greater") var iterations: int = 1
+
+
+func spawn_bullets(bullet_set: BulletSet, preset: BulletPreset) -> void:
+	for _n in iterations:
+		_spawn_bullets(bullet_set, preset)
+
+
+@abstract func _spawn_bullets(bullet_set: BulletSet, preset: BulletPreset) -> void

systems/bullets/spawn_patterns/line_pattern.gd

@@ -7,14 +7,9 @@ extends BulletSpawnPattern
 @export_custom(0, "direction") var line_normal: Vector2 = Vector2.RIGHT
 
 
-func spawn_bullets(bullet_set: BulletSet, preset: BulletPreset) -> void:
+func _spawn_bullets(bullet_set: BulletSet, preset: BulletPreset) -> void:
 	for i in bullet_count:
-		var bullet = Bullet.create(
-			preset.textures.pick_random(),
-			preset.hitbox_size,
-			line_normal,
-			preset.face_direction
-		)
+		var bullet = Bullet.create(preset, line_normal)
 		
 		var line = line_normal.orthogonal().rotated(bullet_set.spawn_rotation)
 		var weight = float(i) / float(bullet_count - 1)

systems/bullets/spawn_patterns/ring_pattern.gd

@@ -8,14 +8,9 @@ extends BulletSpawnPattern
 @export_custom(0, "radians_as_degrees") var direction_rotation: float
 
 
-func spawn_bullets(bullet_set: BulletSet, preset: BulletPreset) -> void:
+func _spawn_bullets(bullet_set: BulletSet, preset: BulletPreset) -> void:
 	for i in bullet_count:
 		var angle = (float(i) / float(bullet_count)) * TAU + angle_offset + bullet_set.spawn_rotation
-		var bullet = Bullet.create(
-			preset.textures.pick_random(),
-			preset.hitbox_size,
-			Vector2.from_angle(angle + direction_rotation),
-			preset.face_direction
-		)
+		var bullet = Bullet.create(preset, Vector2.from_angle(angle + direction_rotation))
 		bullet.position = bullet_set.spawn_offset + Vector2.from_angle(angle) * distance_offset
 		bullet_set.add_bullet(bullet)

systems/bullets/spawn_patterns/spawn_pattern_randomizer.gd

@@ -0,0 +1,26 @@
+@tool
+class_name SpawnPatternRandomizer
+extends BulletSpawnPattern
+## Randomizes properties of a child [BulletSpawnPattern] each [member iteration].
+##
+## WARNING: Experimental. Only float properties are currently
+## supported and this class is subject to change in the future.
+
+
+## The pattern to randomize and defer to.
+@export var pattern: BulletSpawnPattern
+
+## Minimum value for each randomized property.
+@export var property_min_values: Dictionary[StringName, float] = {}
+## Maximum value for each randomized property.
+@export var property_max_values: Dictionary[StringName, float] = {}
+
+
+func _spawn_bullets(bullet_set: BulletSet, preset: BulletPreset) -> void:
+	for property in property_min_values:
+		if property_max_values.has(property):
+			pattern.set(property, randf_range(
+				property_min_values[property],
+				property_max_values[property]
+			))
+	pattern.spawn_bullets(bullet_set, preset)

systems/bullets/spawn_patterns/spawn_pattern_randomizer.gd.uid

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