Honor authored barrier health bands

fishing/bass_catch_profile.tres

@@ -6,8 +6,6 @@
 script = ExtResource("1_profile")
 barrier_count_min = 3
 barrier_count_max = 4
-barrier_health_min = 4
-barrier_health_max = 7
 first_barrier_margin = 0.14
 final_barrier_margin = 0.1
 minimum_barrier_spacing = 0.14

fishing/carp_catch_profile.tres

@@ -6,8 +6,6 @@
 script = ExtResource("1_profile")
 barrier_count_min = 3
 barrier_count_max = 4
-barrier_health_min = 5
-barrier_health_max = 8
 first_barrier_margin = 0.13
 final_barrier_margin = 0.09
 minimum_barrier_spacing = 0.14

fishing/catch_controller.gd

@@ -69,8 +69,6 @@ var _reel_input_held: bool = false
 var _reel_speed: float = 0.0
 var _click_power: int = 1
 var _fish_quality: int = FishQualityType.Tier.BORING
-var _fish_rarity: int = 0
-var _fish_weight_percentile: float = 0.0
 var _chase_delay_remaining: float = 0.0
 var _failure_epsilon: float = 0.0001
 var _auto_click_accumulator: float = 0.0
@@ -113,8 +111,6 @@ func start_encounter(
 	reel_speed: float,
 	click_power: int,
 	fish_quality: int = FishQualityType.Tier.BORING,
-	fish_rarity: int = 0,
-	fish_weight_percentile: float = 0.0,
 ) -> void:
 	reset()
 	if profile == null:
@@ -128,8 +124,6 @@ func start_encounter(
 		if FishQualityType.is_valid(fish_quality)
 		else FishQualityType.Tier.BORING
 	)
-	_fish_rarity = clampi(fish_rarity, 0, 4)
-	_fish_weight_percentile = clampf(fish_weight_percentile, 0.0, 1.0)
 	_chase_delay_remaining = CHASE_START_DELAY
 	chase_progress = -CHASE_START_OFFSET
 	_seed_encounter_rng()
@@ -145,8 +139,6 @@ func start_authoritative_encounter(
 	click_power: int,
 	encounter_seed_value: int,
 	fish_quality: int = FishQualityType.Tier.BORING,
-	fish_rarity: int = 0,
-	fish_weight_percentile: float = 0.0,
 ) -> void:
 	var previous_test_mode: bool = use_deterministic_test_seed
 	var previous_seed: int = deterministic_test_seed
@@ -157,8 +149,6 @@ func start_authoritative_encounter(
 		reel_speed,
 		click_power,
 		fish_quality,
-		fish_rarity,
-		fish_weight_percentile,
 	)
 	use_deterministic_test_seed = previous_test_mode
 	deterministic_test_seed = previous_seed
@@ -327,11 +317,8 @@ func _generate_barriers(profile: CatchDifficultyProfileType) -> void:
 			+ spacing * float(barrier_index)
 			+ random_offsets[barrier_index] * random_slack
 		)
-		var health: int = FishQualityType.barrier_health_for_catch(
-			_fish_quality,
-			_fish_rarity,
-			_fish_weight_percentile,
-			_rng.randf_range(0.9, 1.1),
+		var health: int = FishQualityType.roll_barrier_health(
+			_rng, _fish_quality
 		)
 		_barriers.append(Barrier.new(position, health))
 

fishing/catch_difficulty_profile.gd

@@ -3,8 +3,6 @@ extends Resource
 
 @export_range(0, 12, 1) var barrier_count_min: int = 2
 @export_range(0, 12, 1) var barrier_count_max: int = 4
-@export_range(1, 100, 1) var barrier_health_min: int = 3
-@export_range(1, 100, 1) var barrier_health_max: int = 7
 @export_range(0.0, 0.45, 0.01) var first_barrier_margin: float = 0.15
 @export_range(0.0, 0.45, 0.01) var final_barrier_margin: float = 0.10
 @export_range(0.01, 1.0, 0.01) var minimum_barrier_spacing: float = 0.15
@@ -15,11 +13,6 @@ func get_barrier_count_range() -> Vector2i:
 	return Vector2i(minimum, maxi(minimum, barrier_count_max))
 
 
-func get_barrier_health_range() -> Vector2i:
-	var minimum: int = maxi(1, barrier_health_min)
-	return Vector2i(minimum, maxi(minimum, barrier_health_max))
-
-
 func get_generation_interval() -> Vector2:
 	var start: float = clampf(first_barrier_margin, 0.0, 0.95)
 	var finish: float = clampf(1.0 - final_barrier_margin, start, 1.0)

fishing/common_catch_profile.tres

@@ -6,8 +6,6 @@
 script = ExtResource("1_profile")
 barrier_count_min = 2
 barrier_count_max = 4
-barrier_health_min = 3
-barrier_health_max = 7
 first_barrier_margin = 0.15
 final_barrier_margin = 0.1
 minimum_barrier_spacing = 0.15

fishing/fishing_spot.gd

@@ -1045,8 +1045,6 @@ func _activate_bite(confirmation_override: bool = false) -> void:
 		_get_effective_reel_speed(),
 		_get_effective_barrier_damage(),
 		_pending_catch.quality,
-		int(_pending_catch.fish.rarity),
-		_pending_catch.fish.get_weight_percentile(_pending_catch.weight_lb),
 	)
 	_catch_controller.set_reel_input(
 		Input.is_action_pressed("fish_primary")