From 0bfb3a8ba51835728cf520bfc14334de47b1dc43 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 27 May 2024 08:29:47 -0500 Subject: [PATCH] Remove special casing test for Alpha and increase vitamin max/thresbreach (#74101) * Remove Alpha special casing * Adjust vitamin requirement to break threshold * Increase max vitamin dose of alpha * Apply suggestions from code review --- data/json/mutations/mutation_category.json | 1 + data/json/vitamin.json | 4 ++-- tests/mutation_test.cpp | 10 +--------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/data/json/mutations/mutation_category.json b/data/json/mutations/mutation_category.json index 8ee8ebe23faf4..8670d8f46dec1 100644 --- a/data/json/mutations/mutation_category.json +++ b/data/json/mutations/mutation_category.json @@ -209,6 +209,7 @@ "threshold_mut": "THRESH_ALPHA", "mutagen_message": "You feel… better. Somehow.", "memorial_message": "Started representing.", + "threshold_min": 2800, "vitamin": "mutagen_alpha", "base_removal_chance": 20 }, diff --git a/data/json/vitamin.json b/data/json/vitamin.json index 4b7dac5429ca6..4b5be4e2fd8bb 100644 --- a/data/json/vitamin.json +++ b/data/json/vitamin.json @@ -186,9 +186,9 @@ "name": { "str": "Alpha Primer" }, "excess": "mutagen_alpha", "min": 0, - "max": 2500, + "max": 5000, "rate": "1 h", - "disease_excess": [ [ 100, 500 ], [ 501, 2199 ], [ 2200, 2500 ] ] + "disease_excess": [ [ 100, 500 ], [ 501, 2199 ], [ 2200, 5000 ] ] }, { "id": "mutagen_batrachian", diff --git a/tests/mutation_test.cpp b/tests/mutation_test.cpp index 28d8fadbb442f..d6bfb34c704e7 100644 --- a/tests/mutation_test.cpp +++ b/tests/mutation_test.cpp @@ -210,7 +210,6 @@ TEST_CASE( "Having_all_mutations_give_correct_highest_category", "[mutations][st // If a category breach power falls below 55, it suggests that category lacks enough pre-threshold mutations // to comfortably cross the Threshold // -// Alpha threshold is intentionally meant to be harder to breach, so the permitted range is 35-60 // // When creating or editing a category, remember that 55 is a limit, not suggestion // 65+ is the suggested range @@ -239,14 +238,7 @@ TEST_CASE( "Having_all_pre-threshold_mutations_gives_a_sensible_threshold_breach dummy.give_all_mutations( cur_cat, false ); const int breach_chance = dummy.mutation_category_level[cat_id]; - if( cat_id == mutation_category_ALPHA ) { - THEN( "Alpha Threshold breach power is between 35 and 60" ) { - INFO( "MUTATIONS: " << get_mutations_as_string( dummy ) ); - CHECK( breach_chance >= 35 ); - CHECK( breach_chance <= 60 ); - } - continue; - } else if( cat_id == mutation_category_CHIMERA ) { + if( cat_id == mutation_category_CHIMERA ) { THEN( "Chimera Threshold breach power is 100+" ) { INFO( "MUTATIONS: " << get_mutations_as_string( dummy ) ); CHECK( breach_chance >= 100 );