diff --git a/runtime/tools/m61_campaign_density_probe.gd b/runtime/tools/m61_campaign_density_probe.gd index 5c01e16b..d472ec09 100644 --- a/runtime/tools/m61_campaign_density_probe.gd +++ b/runtime/tools/m61_campaign_density_probe.gd @@ -28,6 +28,9 @@ var remove_round10_extra := false var remove_late_extras := false var enemy_level_offset := 2 var enemy_region_cap := 0 +var late_only := false +var region_from := 1 +var region_to := 8 func _initialize() -> void: @@ -40,6 +43,13 @@ func _run() -> void: var stride := int(args[1]) if args.size() > 1 else 3 remove_round10_extra = OS.get_environment("ABG_M61_REMOVE_ROUND10_EXTRA") == "1" remove_late_extras = OS.get_environment("ABG_M61_REMOVE_LATE_EXTRAS") == "1" + late_only = OS.get_environment("ABG_M61_LATE_ONLY") == "1" + var region_from_text := OS.get_environment("ABG_M61_REGION_FROM") + if not region_from_text.is_empty(): + region_from = clampi(int(region_from_text), 1, 8) + var region_to_text := OS.get_environment("ABG_M61_REGION_TO") + if not region_to_text.is_empty(): + region_to = clampi(int(region_to_text), region_from, 8) var offset_text := OS.get_environment("ABG_M61_ENEMY_LEVEL_OFFSET") if not offset_text.is_empty(): enemy_level_offset = maxi(0, int(offset_text)) @@ -50,18 +60,21 @@ func _run() -> void: var enemy_meta := Ladder.enemy_meta(catalog) var item_pool := Ladder.item_pool(catalog) print("region round party_size level clear_rate seconds per_decision") - for region_index in range(1, 9): + for region_index in range(region_from, region_to + 1): var enemy_ids := Ladder.enemy_ids(catalog, region_index) if enemy_ids.is_empty(): continue var late_clear := -1.0 var rounds: Array = [] - var round_index := 1 - while round_index <= 12: - rounds.append(round_index) - round_index += stride - if not rounds.has(12): - rounds.append(12) + if late_only: + rounds = [7, 10, 12] + else: + var round_index := 1 + while round_index <= 12: + rounds.append(round_index) + round_index += stride + if not rounds.has(12): + rounds.append(12) for sampled in rounds: var level := Ladder.level(region_index, sampled) var party_size := Ladder.capacity(sampled) @@ -110,12 +123,14 @@ func _run() -> void: var mean_all := seconds_total / float(maxi(1, battles)) var mean_decision := (mean_all + POST_BATTLE_SECONDS) / float(DECISIONS_PER_BATTLE) var variant := "remove_late_extras" if remove_late_extras else "remove_round10_extra" if remove_round10_extra else "baseline" + if late_only: + variant = "%s_late_only" % variant if enemy_level_offset != 2: variant = "%s_level_offset_%d" % [variant, enemy_level_offset] if enemy_region_cap > 0: variant = "%s_region_cap_%d" % [variant, enemy_region_cap] - print("ABG_M61_CAMPAIGN_DENSITY_OK variant=%s regions=8 battles=%d timeouts=%d defeats=%d battle_mean=%.1fs battle_max=%.1fs per_decision_mean=%.1fs per_decision_max=%.1fs trivial_late=%d wall_late=%d band=%.0f-%.0f human_share=on_top" - % [variant, battles, timeouts, defeats, mean_all, seconds_max, mean_decision, + print("ABG_M61_CAMPAIGN_DENSITY_OK variant=%s regions=%d-%d rounds=%s battles=%d timeouts=%d defeats=%d battle_mean=%.1fs battle_max=%.1fs per_decision_mean=%.1fs per_decision_max=%.1fs trivial_late=%d wall_late=%d band=%.0f-%.0f human_share=on_top" + % [variant, region_from, region_to, "7,10,12" if late_only else "sampled", battles, timeouts, defeats, mean_all, seconds_max, mean_decision, (seconds_max + POST_BATTLE_SECONDS) / float(DECISIONS_PER_BATTLE), trivial_late, wall_late, INTERVAL_LOW, INTERVAL_HIGH]) quit(0)