Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove special casing test for Alpha and increase vitamin max/thresbreach #74101

Merged
merged 4 commits into from
May 27, 2024
+4 −11
Merged

Remove special casing test for Alpha and increase vitamin max/thresbreach #74101

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7e9c39
Remove Alpha special casing
Maleclypse May 26, 2024
fc06edd
Adjust vitamin requirement to break threshold
Maleclypse May 26, 2024
9e58e8a
Increase max vitamin dose of alpha
Maleclypse May 26, 2024
c846c92
Apply suggestions from code review
Maleclypse May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/json/mutations/mutation_category.json
View file
Open in desktop
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
View file
Open in desktop
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": 3200,
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"rate": "1 h",
"disease_excess": [ [ 100, 500 ], [ 501, 2199 ], [ 2200, 2500 ] ]
"disease_excess": [ [ 100, 500 ], [ 501, 2199 ], [ 2200, 3200 ] ]
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
},
{
"id": "mutagen_batrachian",
Expand Down
10 changes: 1 addition & 9 deletions tests/mutation_test.cpp
View file
Open in desktop
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
Loading