Skip to content

Commit

Permalink
Remove special casing test for Alpha and increase vitamin max/thresbr…
Browse files Browse the repository at this point in the history
…each (#74101)

* Remove Alpha special casing

* Adjust vitamin requirement to break threshold

* Increase max vitamin dose of alpha

* Apply suggestions from code review
  • Loading branch information
Maleclypse authored May 27, 2024
1 parent d12ebbc commit 0bfb3a8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
1 change: 1 addition & 0 deletions data/json/mutations/mutation_category.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
4 changes: 2 additions & 2 deletions data/json/vitamin.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 1 addition & 9 deletions tests/mutation_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 );
Expand Down

0 comments on commit 0bfb3a8

Please sign in to comment.