From 26aa11444ca03571a2bf1ea14d54402094b5c15f Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Fri, 17 Feb 2023 09:51:36 -0500 Subject: many changes (should stop doing this) max_len_diff is an attempt to make mid blue and mid purple more reasonable. It maybe works for blue, but it is not good enough for purple. what we will need to do is limit on how much of the word can be removed, and that's going to require a change to verbly to allow that kind of query. copy_hidden was added for the champion's rest colour pairs. The solution to the pair is found at champion's rest, and the corresponding colour pair has a hint that is just question marks. must_be_broad forces a generated word to be targettable by bottom white/red/blue. this + reusing solution for most bottom white/red/blue puzzles makes those puzzles much more reasonable (though still hard). an attempt to randomise cross tower was made, but I'm not happy with it. hyphens in obscured hints will no longer be obscured. I think obscured hints tend to be too obscured sometimes though, especially when it comes to the number hunt and uncommon words. middle red triviality check: middle red two word puzzles should not just remove one of the words middle yellow triviality check: middle yellow two word puzzles should not just swap the words top yellow triviality check: top yellow should not be able to swap two phonemes that are identical other than stress and say that it rearranged the word. the colorful is partially randomised. champion's rest is as randomsied as it could be (it is likely not reasonable to randomise the red/blue/yellow panels behind the walls. the fearless is partially randomised (besides the chain puzzles). the challenge is partially randomised. --- generator.cpp | 106 +++++++++++++++++++- generator.h | 3 + main.cpp | 309 ++++++++++++++++++++++++++++++++++++---------------------- vendor/verbly | 2 +- 4 files changed, 298 insertions(+), 122 deletions(-) diff --git a/generator.cpp b/generator.cpp index d0ef1a9..c4dd76f 100644 --- a/generator.cpp +++ b/generator.cpp @@ -1,6 +1,9 @@ #include "generator.h" #include #include +#include +#include +#include verbly::filter Generator::MakeHintFilter(verbly::filter subfilter, Height height, Colour colour, FilterDirection filter_direction) { @@ -262,6 +265,11 @@ bool Generator::GenerateSinglePanelImpl(std::string name, Height height, Colour solution = database_->forms(verbly::form::text == word).first(); } else { verbly::filter forward = MakeHintFilter({}, height, colour, kTowardSolution); + if (options.must_be_broad) { + forward &= MakeHintFilter({}, kBottom, kWhite, kTowardSolution); + forward &= MakeHintFilter({}, kBottom, kRed, kTowardSolution); + forward &= MakeHintFilter({}, kBottom, kBlue, kTowardSolution); + } std::vector solutions = database_->forms(forward && GetWordFilter(kTowardSolution, options)).all(); solution = solutions.front();//solutions.at(std::uniform_int_distribution(0, solutions.size())(rng_)); } @@ -282,6 +290,12 @@ bool Generator::GenerateSinglePanelImpl(std::string name, Height height, Colour // Finish early if this is a middle white. if (height == kMiddle && colour == kWhite) { SavePanel(name, solution.getText(), solution.getText(), options); + if (!options.copy_to.empty()) { + SavePanel(options.copy_to, solution.getText(), solution.getText(), options); + } + if (!options.copy_hidden.empty()) { + SavePanel(options.copy_hidden, std::string(solution.getText().size(), '?'), solution.getText(), options); + } return true; } @@ -293,6 +307,9 @@ bool Generator::GenerateSinglePanelImpl(std::string name, Height height, Colour if (IsClueTrivial(height, colour, question, solution)) { return false; } + if (options.max_len_diff >= 0 && std::abs(static_cast(question.getText().size() - solution.getText().size())) > options.max_len_diff) { + return false; + } SavePanel(name, question.getText(), solution.getText(), options); if (!options.copy_to.empty()) { @@ -314,6 +331,11 @@ bool Generator::GenerateDoublePanelImpl(std::string name1, std::string name2, He solution = database_->forms(verbly::form::text == word).first(); } else { verbly::filter forward = MakeHintFilter({}, height, colour, kTowardSolution); + if (options.must_be_broad) { + forward &= MakeHintFilter({}, kBottom, kWhite, kTowardSolution); + forward &= MakeHintFilter({}, kBottom, kRed, kTowardSolution); + forward &= MakeHintFilter({}, kBottom, kBlue, kTowardSolution); + } std::vector solutions = database_->forms(forward && GetWordFilter(kTowardSolution, options)).all(); solution = solutions.front();//solutions.at(std::uniform_int_distribution(0, solutions.size())(rng_)); } @@ -338,6 +360,12 @@ bool Generator::GenerateDoublePanelImpl(std::string name1, std::string name2, He if (IsClueTrivial(height, colour, questions[0], solution) || IsClueTrivial(height, colour, questions[1], solution)) { return false; } + if (options.max_len_diff >= 0) { + if (std::abs(static_cast(questions[0].getText().size() - solution.getText().size())) > options.max_len_diff + || std::abs(static_cast(questions[1].getText().size() - solution.getText().size())) > options.max_len_diff) { + return false; + } + } SavePanel(name1, questions[0].getText(), solution.getText(), options); SavePanel(name2, questions[1].getText(), solution.getText(), options); @@ -370,6 +398,12 @@ bool Generator::GenerateCohintedPanelsImpl(std::string name1, std::string name2, if (IsClueTrivial(height, colour, question, solutions[0]) || IsClueTrivial(height, colour, question, solutions[1])) { return false; } + if (options.max_len_diff >= 0) { + if (std::abs(static_cast(question.getText().size() - solutions[0].getText().size())) > options.max_len_diff + || std::abs(static_cast(question.getText().size() - solutions[1].getText().size())) > options.max_len_diff) { + return false; + } + } SavePanel(name1, question.getText(), solutions[0].getText(), options); SavePanel(name2, question.getText(), solutions[1].getText(), options); @@ -408,6 +442,12 @@ bool Generator::GeneratePairedPanelsImpl(std::string name1, std::string name2, H } } + if (options.max_len_diff >= 0) { + if (std::abs(static_cast(question.getText().size() - solution.getText().size())) > options.max_len_diff) { + return false; + } + } + if (height == kMiddle && colour == kWhite) { SavePanel(name1, question.getText(), question.getText(), options); SavePanel(name2, solution.getText(), solution.getText(), options); @@ -587,7 +627,30 @@ void Generator::GenerateCrossTower( std::string west_other_name3) { std::vector> sets = cross_tower_->GetPuzzleSet(rng_); - + + SavePanel(north_tower_name, "", sets[0][0]); + SavePanel(north_lookout_name, "", sets[0][0]); + SavePanel(north_other_name1, sets[0][1], sets[0][1]); + SavePanel(north_other_name2, sets[0][2], sets[0][2]); + SavePanel(north_other_name3, sets[0][3], sets[0][3]); + + SavePanel(south_tower_name, "", sets[1][0]); + SavePanel(south_lookout_name, "", sets[1][0]); + SavePanel(south_other_name1, sets[1][1], sets[1][1]); + SavePanel(south_other_name2, sets[1][2], sets[1][2]); + SavePanel(south_other_name3, sets[1][3], sets[1][3]); + + SavePanel(east_tower_name, "", sets[2][0]); + SavePanel(east_lookout_name, "", sets[2][0]); + SavePanel(east_other_name1, sets[2][1], sets[2][1]); + SavePanel(east_other_name2, sets[2][2], sets[2][2]); + SavePanel(east_other_name3, sets[2][3], sets[2][3]); + + SavePanel(west_tower_name, "", sets[3][0]); + SavePanel(west_lookout_name, "", sets[3][0]); + SavePanel(west_other_name1, sets[3][1], sets[3][1]); + SavePanel(west_other_name2, sets[3][2], sets[3][2]); + SavePanel(west_other_name3, sets[3][3], sets[3][3]); } void Generator::SavePanel(std::string name, std::string question, std::string answer, GenerateOptions options) { @@ -606,7 +669,7 @@ void Generator::SavePanel(std::string name, std::string question, std::string an std::shuffle(indicies.begin(), indicies.end(), rng_); for (int i=0; iforms((verbly::filter)clue && (verbly::form::merographs %= solution)).all().empty() || !database_->forms((verbly::filter)clue && (verbly::form::holographs %= solution)).all().empty(); + } else if (height == kMiddle && colour == kRed) { + if (clue.getComplexity() == 2 && solution.getComplexity() == 1) { + auto words = hatkirby::split>(clue.getText(), " "); + for (const auto& word : words) { + if (word == solution.getText()) { + return true; + } + } + } + } else if (height == kMiddle && colour == kYellow) { + if (clue.getComplexity() == solution.getComplexity()) { + auto clueWords = hatkirby::split>(clue.getText(), " "); + auto solutionWords = hatkirby::split>(solution.getText(), " "); + std::sort(clueWords.begin(), clueWords.end()); + std::sort(solutionWords.begin(), solutionWords.end()); + if (clueWords == solutionWords) { + return true; + } + } + } else if (height == kTop && colour == kYellow) { + std::set hint_stressless; + for (const verbly::pronunciation& pronunciation : clue.getPronunciations()) { + std::string stressed = hatkirby::implode(pronunciation.getPhonemes(), " "); + std::string stressless; + std::remove_copy_if(stressed.begin(), stressed.end(), std::back_inserter(stressless), &isDigitWrapper); + hint_stressless.insert(stressless); + } + for (const verbly::pronunciation& pronunciation : solution.getPronunciations()) { + std::string stressed = hatkirby::implode(pronunciation.getPhonemes(), " "); + std::string stressless; + std::remove_copy_if(stressed.begin(), stressed.end(), std::back_inserter(stressless), &isDigitWrapper); + if (hint_stressless.count(stressless)) { + return true; + } + } } return false; } diff --git a/generator.h b/generator.h index 1381cd3..1c7934e 100644 --- a/generator.h +++ b/generator.h @@ -45,6 +45,7 @@ struct GenerateOptions { int max_answer_len = 0; int max_hint_len = 0; int exact_len = 0; + int max_len_diff = -1; // supported by single, double, paired, cohinted bool multiword = false; bool save_for_later = false; bool reuse_solution = false; // supported by single, double, and stack @@ -52,7 +53,9 @@ struct GenerateOptions { PalindromeQuery palindrome = kPalindromeUnspecified; // only important for middle black. supported by single and paired std::string copy_to; // supported by single and paired std::string copy_to2; // supported by paired + std::string copy_hidden; // supported by single mid white bool force_two_words = false; + bool must_be_broad = false; // the solution must also be gettable by bottom white/red/blue. supported by single and double }; class Wanderlust { diff --git a/main.cpp b/main.cpp index ab19805..3b6e8e1 100644 --- a/main.cpp +++ b/main.cpp @@ -16,31 +16,16 @@ public: gen_.GenerateStaticPanel("Panel_this_this", "normal"); gen_.GenerateStaticPanel("Panel_write_write", "random seed"); gen_.GenerateStaticPanel("Panel_same_same", std::to_string(seed_)); - gen_.GenerateSinglePanel("Panel_hidden_hidden", kMiddle, kWhite); - gen_.GenerateSinglePanel("Panel_hi_high", kTop, kWhite); + gen_.GenerateSinglePanel("Panel_hidden_hidden", kMiddle, kWhite, {.save_for_later = true}); + gen_.GenerateSinglePanel("Panel_hi_high", kTop, kWhite, {.save_for_later = true}); gen_.GenerateSinglePanel("Panel_low_low", kBottom, kWhite, {.max_answer_len = 7}); - gen_.GenerateSinglePanel("Panel_forward_forward", kMiddle, kWhite, {.obscure_hint = true, .max_answer_len = 20}); - gen_.GenerateSinglePanel("Panel_between_between", kMiddle, kWhite, {.obscure_hint = true, .max_answer_len = 20}); - gen_.GenerateSinglePanel("Panel_backward_backward", kMiddle, kWhite, {.obscure_hint = true, .max_answer_len = 20}); - gen_.GenerateSinglePanel("Panel_secret_secret", kMiddle, kWhite, {.obscure_hint = true, .max_answer_len = 20}); - - // The Traveled - gen_.GenerateSinglePanel("Panel_open_open", kMiddle, kWhite, {.obscure_hint = true, .unique_pool = "traveled"}); - gen_.GenerateSinglePanel("Panel_close_near", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateDoublePanel("Panel_compose_write", "Panel_record_write", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateSinglePanel("Panel_category_type", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateSinglePanel("Panel_hello_hi", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateDoublePanel("Panel_duplicate_same", "Panel_identical_same", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateSinglePanel("Panel_distant_far", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateSinglePanel("Panel_hay_straw", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateDoublePanel("Panel_giggle_laugh", "Panel_chuckle_laugh", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateSinglePanel("Panel_snitch_rat", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateSinglePanel("Panel_concealed_hidden", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateDoublePanel("Panel_plunge_fall", "Panel_autumn_fall", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); - gen_.GenerateSinglePanel("Panel_growths_warts", kBottom, kWhite, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "traveled"}); + gen_.GenerateSinglePanel("Panel_forward_forward", kMiddle, kWhite, {.obscure_hint = true, .max_answer_len = 20, .save_for_later = true, .must_be_broad = true}); + gen_.GenerateSinglePanel("Panel_between_between", kMiddle, kWhite, {.obscure_hint = true, .max_answer_len = 20, .save_for_later = true, .must_be_broad = true}); + gen_.GenerateSinglePanel("Panel_backward_backward", kMiddle, kWhite, {.obscure_hint = true, .max_answer_len = 20, .save_for_later = true, .must_be_broad = true}); + gen_.GenerateSinglePanel("Panel_secret_secret", kMiddle, kWhite, {.obscure_hint = true, .max_answer_len = 20, .save_for_later = true, .must_be_broad = true}); // The Agreeable - gen_.GenerateSinglePanel("Panel_close_open", kBottom, kBlack, {.max_answer_len = 6, .unique_pool = "agreeable"}); + gen_.GenerateSinglePanel("Panel_close_open", kBottom, kBlack, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "agreeable"}); gen_.GenerateSinglePanel("Panel_retool_looter", kMiddle, kBlack, {.save_for_later = true, .unique_pool = "agreeable", .palindrome = kRejectPalindrome}); gen_.GenerateSinglePanel("Panel_drawer_reward", kMiddle, kBlack, {.save_for_later = true, .unique_pool = "agreeable", .palindrome = kRejectPalindrome}); gen_.GenerateSinglePanel("Panel_read_write", kBottom, kBlack, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "agreeable"}); @@ -49,24 +34,24 @@ public: gen_.GenerateSinglePanel("Panel_low_high", kBottom, kBlack, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "agreeable"}); gen_.GenerateSinglePanel("Panel_alive_dead", kBottom, kBlack, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "agreeable"}); gen_.GenerateSinglePanel("Panel_that_this", kBottom, kBlack, {.max_answer_len = 7, .save_for_later = true, .unique_pool = "agreeable"}); - gen_.GenerateSinglePanel("Panel_stressed_desserts", kMiddle, kBlack, {.unique_pool = "agreeable", .palindrome = kRejectPalindrome}); - gen_.GenerateSinglePanel("Panel_star_rats", kMiddle, kBlack, {.unique_pool = "agreeable", .palindrome = kRejectPalindrome}); - gen_.GenerateSinglePanel("Panel_tame_mate", kTop, kBlack, {.unique_pool = "agreeable"}); - gen_.GenerateSinglePanel("Panel_cat_tack", kTop, kBlack, {.unique_pool = "agreeable"}); + gen_.GenerateSinglePanel("Panel_stressed_desserts", kMiddle, kBlack, {.unique_pool = "agreeable", .palindrome = kRejectPalindrome, .save_for_later = true}); + gen_.GenerateSinglePanel("Panel_star_rats", kMiddle, kBlack, {.unique_pool = "agreeable", .palindrome = kRejectPalindrome, .save_for_later = true}); + gen_.GenerateSinglePanel("Panel_tame_mate", kTop, kBlack, {.unique_pool = "agreeable", .save_for_later = true}); + gen_.GenerateSinglePanel("Panel_cat_tack", kTop, kBlack, {.unique_pool = "agreeable", .save_for_later = true}); gen_.GeneratePairedPanels("Panel_leaf_feel", "Panel_feel_leaf", kTop, kBlack, {.obscure_hint = true, .save_for_later = true}); gen_.GeneratePairedPanels("Panel_warts_straw", "Panel_straw_warts", kMiddle, kBlack, {.obscure_hint = true, .save_for_later = true, .palindrome = kRejectPalindrome}); gen_.GeneratePairedPanels("Panel_near_far", "Panel_far_near", kBottom, kBlack, {.obscure_hint = true, .save_for_later = true}); // Panel_left_wrong: left? wrong! - gen_.GenerateSinglePanel("Panel_black_white", kBottom, kBlack, {.max_answer_len = 7}); - gen_.GeneratePairedPanels("Panel_left_right", "Panel_right_left", kBottom, kBlack, {.obscure_hint = true}); + gen_.GenerateSinglePanel("Panel_black_white", kBottom, kBlack, {.max_answer_len = 7, .save_for_later = true}); + gen_.GeneratePairedPanels("Panel_left_right", "Panel_right_left", kBottom, kBlack, {.obscure_hint = true, .save_for_later = true}); // The Seeker - gen_.GenerateSinglePanel("Panel_entrance_entrance", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker"}); - gen_.GenerateSinglePanel("Panel_bear_bear", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker"}); - gen_.GenerateDoublePanel("Panel_mine_mine", "Panel_mine_mine_2", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker"}); - gen_.GenerateSinglePanel("Panel_bow_bow", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker"}); - gen_.GenerateSinglePanel("Panel_does_does", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker"}); - gen_.GenerateDoublePanel("Panel_mobile_mobile", "Panel_mobile_mobile_2", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker"}); + gen_.GenerateSinglePanel("Panel_entrance_entrance", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker", .must_be_broad = true}); + gen_.GenerateSinglePanel("Panel_bear_bear", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker", .must_be_broad = true}); + gen_.GenerateDoublePanel("Panel_mine_mine", "Panel_mine_mine_2", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker", .must_be_broad = true}); + gen_.GenerateSinglePanel("Panel_bow_bow", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker", .must_be_broad = true}); + gen_.GenerateSinglePanel("Panel_does_does", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker", .must_be_broad = true}); + gen_.GenerateDoublePanel("Panel_mobile_mobile", "Panel_mobile_mobile_2", kMiddle, kWhite, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker", .must_be_broad = true}); gen_.GeneratePanelStack("Panel_desert_dessert", kWhite, "Panel_desert_desert", kWhite, "", {}, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker"}); gen_.GeneratePanelStack("Panel_sow_so", kWhite, "Panel_sow_sow", kWhite, "", {}, {.obscure_hint = true, .save_for_later = true, .unique_pool = "seeker"}); gen_.GenerateDoublePanel("Panel_two_to", "Panel_two_too", kTop, kWhite, {.save_for_later = true, .unique_pool = "seeker"}); @@ -76,14 +61,29 @@ public: gen_.GenerateSinglePanel("Panel_bear_bare", kTop, kWhite, {.save_for_later = true, .unique_pool = "seeker"}); // The Tenacious - gen_.GenerateSinglePanel("Panel_slaughter_laughter", kMiddle, kRed, {.unique_pool = "tenacious"}); - gen_.GenerateSinglePanel("Panel_dread_dead", kMiddle, kRed, {.unique_pool = "tenacious"}); - gen_.GenerateSinglePanel("Panel_massacred_sacred", kMiddle, kRed, {.unique_pool = "tenacious"}); - gen_.GenerateSinglePanel("Panel_decay_day", kMiddle, kRed, {.unique_pool = "tenacious"}); + gen_.GenerateSinglePanel("Panel_slaughter_laughter", kMiddle, kRed, {.unique_pool = "tenacious", .save_for_later = true}); + gen_.GenerateSinglePanel("Panel_dread_dead", kMiddle, kRed, {.unique_pool = "tenacious", .save_for_later = true}); + gen_.GenerateSinglePanel("Panel_massacred_sacred", kMiddle, kRed, {.unique_pool = "tenacious", .save_for_later = true}); + gen_.GenerateSinglePanel("Panel_decay_day", kMiddle, kRed, {.unique_pool = "tenacious", .save_for_later = true}); gen_.GeneratePairedPanels("Panel_solos_solos", "Panel_solos_solos_2", kMiddle, kBlack, {.palindrome = kForcePalindrome}); gen_.GeneratePairedPanels("Panel_racecar_racecar", "Panel_racecar_racecar_2", kMiddle, kBlack, {.palindrome = kForcePalindrome}); gen_.GeneratePairedPanels("Panel_level_level", "Panel_level_level_2", kMiddle, kBlack, {.palindrome = kForcePalindrome}); + // The Discerning + gen_.GenerateSinglePanel("Panel_nope_open", kMiddle, kYellow, {.max_answer_len = 4, .unique_pool = "discerning"}); + gen_.GenerateSinglePanel("Panel_hits_this", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateDoublePanel("Panel_warred_drawer", "Panel_redraw_drawer", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateSinglePanel("Panel_adder_dread", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateSinglePanel("Panel_laughters_slaughter", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateDoublePanel("Panel_stone_notes", "Panel_onset_notes", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateSinglePanel("Panel_rat_art", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateSinglePanel("Panel_dusty_study", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateDoublePanel("Panel_arts_star", "Panel_tsar_star", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateSinglePanel("Panel_state_taste", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateSinglePanel("Panel_react_trace", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateDoublePanel("Panel_dear_read", "Panel_dare_read", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateSinglePanel("Panel_seam_same", kMiddle, kYellow, {.max_answer_len = 6, .save_for_later = true, .unique_pool = "discerning"}); + // The Bold gen_.GenerateSinglePanel("Panel_heartbreak_brake", kTop, kRed, {.save_for_later = true, .unique_pool = "bold"}); gen_.GenerateSinglePanel("Panel_airplane_plain", kTop, kRed, {.save_for_later = true, .unique_pool = "bold"}); @@ -91,45 +91,30 @@ public: gen_.GenerateSinglePanel("Panel_sign_sigh", kTop, kRed, {.save_for_later = true, .unique_pool = "bold"}); gen_.GenerateSinglePanel("Panel_unopened_open", kMiddle, kRed, {.save_for_later = true, .unique_pool = "bold"}); gen_.GenerateDoublePanel("Panel_undead_dead", "Panel_deadline_dead", kMiddle, kRed, {.save_for_later = true, .unique_pool = "bold"}); - gen_.GenerateSinglePanel("Panel_sushi_hi", kMiddle, kRed, {.reuse_solution = true, .unique_pool = "bold"}); - gen_.GenerateSinglePanel("Panel_thistle_this", kMiddle, kRed, {.reuse_solution = true, .unique_pool = "bold"}); + gen_.GenerateSinglePanel("Panel_sushi_hi", kMiddle, kRed, {.save_for_later = true, .unique_pool = "bold"}); + gen_.GenerateSinglePanel("Panel_thistle_this", kMiddle, kRed, {.save_for_later = true, .unique_pool = "bold"}); gen_.GenerateDoublePanel("Panel_landmass_mass", "Panel_massacred_mass", kMiddle, kRed, {.save_for_later = true, .unique_pool = "bold"}); - gen_.GenerateDoublePanel("Panel_face_eye", "Panel_needle_eye", kBottom, kRed, {.max_answer_len = 6, .unique_pool = "bold"}); - gen_.GenerateSinglePanel("Panel_foot_toe", kBottom, kRed, {.max_answer_len = 6, .unique_pool = "bold"}); - gen_.GenerateDoublePanel("Panel_mouth_teeth", "Panel_saw_teeth", kBottom, kRed, {.max_answer_len = 6, .unique_pool = "bold"}); - gen_.GenerateSinglePanel("Panel_hand_finger", kBottom, kRed, {.max_answer_len = 6, .unique_pool = "bold"}); + gen_.GenerateDoublePanel("Panel_face_eye", "Panel_needle_eye", kBottom, kRed, {.reuse_solution = true, .unique_pool = "bold"}); + gen_.GenerateSinglePanel("Panel_foot_toe", kBottom, kRed, {.reuse_solution = true, .unique_pool = "bold"}); + gen_.GenerateDoublePanel("Panel_mouth_teeth", "Panel_saw_teeth", kBottom, kRed, {.reuse_solution = true, .unique_pool = "bold"}); + gen_.GenerateSinglePanel("Panel_hand_finger", kBottom, kRed, {.reuse_solution = true, .unique_pool = "bold"}); // The Steady // The Undeterred - gen_.GenerateSinglePanel("Panel_two_toucan", kTop, kBlue, {.unique_pool = "undeterred", .reuse_solution = true}); - gen_.GenerateDoublePanel("Panel_ice_eyesight", "Panel_height_eyesight", kTop, kBlue, {.unique_pool = "undeterred", .max_answer_len = 6}); + gen_.GenerateSinglePanel("Panel_two_toucan", kTop, kBlue, {.unique_pool = "undeterred", .reuse_solution = true, .max_len_diff = 3}); + gen_.GenerateDoublePanel("Panel_ice_eyesight", "Panel_height_eyesight", kTop, kBlue, {.unique_pool = "undeterred", .max_len_diff = 4, .reuse_solution = true}); gen_.GenerateSinglePanel("Panel_eye_hi", kTop, kBlue, {.unique_pool = "undeterred", .reuse_solution = true}); gen_.GenerateSinglePanel("Panel_pen_open", kMiddle, kBlue, {.max_answer_len = 4, .unique_pool = "undeterred"}); - gen_.GenerateSinglePanel("Panel_not_notice", kMiddle, kBlue, {.unique_pool = "undeterred", .max_answer_len = 6}); - gen_.GenerateDoublePanel("Panel_just_readjust", "Panel_read_readjust", kMiddle, kBlue, {.unique_pool = "undeterred"}); + gen_.GenerateSinglePanel("Panel_not_notice", kMiddle, kBlue, {.unique_pool = "undeterred", .max_len_diff = 3, .reuse_solution = true}); + gen_.GenerateDoublePanel("Panel_just_readjust", "Panel_read_readjust", kMiddle, kBlue, {.unique_pool = "undeterred", .max_len_diff = 4}); gen_.GenerateSinglePanel("Panel_ate_primate", kMiddle, kBlue, {.unique_pool = "undeterred", .reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_bone_skeleton", kBottom, kBlue, {.max_answer_len = 7, .unique_pool = "undeterred"}); - gen_.GenerateDoublePanel("Panel_mouth_face", "Panel_eye_face", kBottom, kBlue, {.max_answer_len = 4, .unique_pool = "undeterred"}); - gen_.GenerateSinglePanel("Panel_toucan_bird", kBottom, kBlue, {.max_answer_len = 4, .unique_pool = "undeterred"}); - gen_.GenerateSinglePanel("Panel_primate_mammal", kBottom, kBlue, {.max_answer_len = 6, .unique_pool = "undeterred"}); - gen_.GenerateDoublePanel("Panel_continent_planet", "Panel_ocean_planet", kBottom, kBlue, {.max_answer_len = 6, .unique_pool = "undeterred"}); - gen_.GenerateSinglePanel("Panel_wall_room", kBottom, kBlue, {.max_answer_len = 4, .unique_pool = "undeterred"}); - - // The Discerning - gen_.GenerateSinglePanel("Panel_nope_open", kMiddle, kYellow, {.max_answer_len = 4, .unique_pool = "discerning"}); - gen_.GenerateSinglePanel("Panel_hits_this", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateDoublePanel("Panel_warred_drawer", "Panel_redraw_drawer", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateSinglePanel("Panel_adder_dread", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateSinglePanel("Panel_laughters_slaughter", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateDoublePanel("Panel_stone_notes", "Panel_onset_notes", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateSinglePanel("Panel_rat_art", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateSinglePanel("Panel_dusty_study", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateDoublePanel("Panel_arts_star", "Panel_tsar_star", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateSinglePanel("Panel_state_taste", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateSinglePanel("Panel_react_trace", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateDoublePanel("Panel_dear_read", "Panel_dare_read", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); - gen_.GenerateSinglePanel("Panel_seam_same", kMiddle, kYellow, {.save_for_later = true, .unique_pool = "discerning"}); + gen_.GenerateSinglePanel("Panel_bone_skeleton", kBottom, kBlue, {.reuse_solution = true, .unique_pool = "undeterred"}); + gen_.GenerateDoublePanel("Panel_mouth_face", "Panel_eye_face", kBottom, kBlue, {.reuse_solution = true, .unique_pool = "undeterred"}); + gen_.GenerateSinglePanel("Panel_toucan_bird", kBottom, kBlue, {.reuse_solution = true, .unique_pool = "undeterred"}); + gen_.GenerateSinglePanel("Panel_primate_mammal", kBottom, kBlue, {.reuse_solution = true, .unique_pool = "undeterred"}); + gen_.GenerateDoublePanel("Panel_continent_planet", "Panel_ocean_planet", kBottom, kBlue, {.reuse_solution = true, .unique_pool = "undeterred"}); + gen_.GenerateSinglePanel("Panel_wall_room", kBottom, kBlue, {.reuse_solution = true, .unique_pool = "undeterred"}); // Crossroads gen_.GeneratePairedPanels("Panel_sword_words", "Panel_words_sword", kMiddle, kYellow); @@ -190,7 +175,7 @@ public: // Knight/Night gen_.GenerateSinglePanel("Panel_rat_tar", kMiddle, kBlack, {.palindrome = kRejectPalindrome}); - gen_.GenerateSinglePanel("Panel_discover_recover", kMiddle, kPurple, {.max_answer_len = 7}); + gen_.GenerateSinglePanel("Panel_discover_recover", kMiddle, kPurple, {.max_len_diff = 1}); gen_.GenerateSinglePanel("Panel_deadend_deadened", kTop, kWhite, {.multiword = true}); gen_.GenerateSinglePanel("Panel_deadend_deadend", kMiddle, kWhite, {.multiword = true, .obscure_hint = true}); gen_.GenerateSinglePanel("Panel_warner_corner", kTop, kPurple); @@ -203,46 +188,51 @@ public: gen_.GenerateCohintedPanels("Panel_rust_trust", "Panel_rust_crust", kMiddle, kBlue, {.max_answer_len = 5, .save_for_later = true}); gen_.GenerateSinglePanel("Panel_encrusted_rust", kMiddle, kRed, {.save_for_later = true}); gen_.GenerateCohintedPanels("Panel_adjust_readjust", "Panel_adjust_adjusted", kMiddle, kBlue, {.max_answer_len = 6, .save_for_later = true}); - gen_.GenerateSinglePanel("Panel_adjust_readjusted", kMiddle, kBlue, {.save_for_later = true}); + gen_.GenerateSinglePanel("Panel_adjust_readjusted", kMiddle, kBlue, {.save_for_later = true, .max_len_diff = 2}); gen_.GeneratePairedPanels("Panel_before_fore", "Panel_be_before", kMiddle, kRed, {.obscure_hint = true}); - gen_.GenerateSinglePanel("Panel_trust_crust", kMiddle, kPurple, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_trust_crust_2", kMiddle, kPurple, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_trusted_readjusted", kMiddle, kPurple, {.reuse_solution = true}); + gen_.GenerateSinglePanel("Panel_trust_crust", kMiddle, kPurple, {.reuse_solution = true, .max_len_diff = 0}); + gen_.GenerateSinglePanel("Panel_trust_crust_2", kMiddle, kPurple, {.reuse_solution = true, .max_len_diff = 0}); + gen_.GenerateSinglePanel("Panel_trusted_readjusted", kMiddle, kPurple, {.reuse_solution = true, .max_len_diff = 1}); + + // The Traveled + gen_.GenerateSinglePanel("Panel_open_open", kMiddle, kWhite, {.obscure_hint = true, .unique_pool = "traveled", .save_for_later = true}); + gen_.GenerateSinglePanel("Panel_close_near", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateDoublePanel("Panel_compose_write", "Panel_record_write", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateSinglePanel("Panel_category_type", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateSinglePanel("Panel_hello_hi", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateDoublePanel("Panel_duplicate_same", "Panel_identical_same", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateSinglePanel("Panel_distant_far", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateSinglePanel("Panel_hay_straw", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateDoublePanel("Panel_giggle_laugh", "Panel_chuckle_laugh", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateSinglePanel("Panel_snitch_rat", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateSinglePanel("Panel_concealed_hidden", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateDoublePanel("Panel_plunge_fall", "Panel_autumn_fall", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); + gen_.GenerateSinglePanel("Panel_growths_warts", kBottom, kWhite, {.reuse_solution = true, .unique_pool = "traveled"}); // The Initiated - gen_.GenerateSinglePanel("Panel_locked_knocked", kMiddle, kPurple, {.max_hint_len = 5, .max_answer_len = 5, .reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateSinglePanel("Panel_daughter_laughter", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateDoublePanel("Panel_move_love", "Panel_stove_love", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateSinglePanel("Panel_scope_type", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateSinglePanel("Panel_abyss_this", kMiddle, kPurple, {.max_hint_len = 6, .reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateDoublePanel("Panel_sweat_great", "Panel_beat_great", kMiddle, kPurple, {.max_hint_len = 6, .reuse_solution = true, .unique_pool = "initiated"}); + gen_.GenerateSinglePanel("Panel_locked_knocked", kMiddle, kPurple, {.max_answer_len = 5, .reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 1}); + gen_.GenerateSinglePanel("Panel_daughter_laughter", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 1}); + gen_.GenerateDoublePanel("Panel_move_love", "Panel_stove_love", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 1}); + gen_.GenerateSinglePanel("Panel_scope_type", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 1}); + gen_.GenerateSinglePanel("Panel_abyss_this", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 1}); + gen_.GenerateDoublePanel("Panel_sweat_great", "Panel_beat_great", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 1}); gen_.GenerateSinglePanel("Panel_alumni_hi", kTop, kPurple, {.reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateSinglePanel("Panel_wrath_path", kMiddle, kPurple, {.max_hint_len = 6, .reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateDoublePanel("Panel_knight_write", "Panel_byte_write", kTop, kPurple, {.reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateSinglePanel("Panel_maim_same", kTop, kPurple, {.reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateSinglePanel("Panel_bare_bear", kTop, kPurple, {.reuse_solution = true, .unique_pool = "initiated"}); - gen_.GeneratePanelStack("Panel_chair_bear", kPurple, "", {}, "Panel_cost_most", kPurple, {.reuse_solution = true, .unique_pool = "initiated"}); - gen_.GenerateSinglePanel("Panel_bed_dead", kMiddle, kPurple, {.max_hint_len = 6, .reuse_solution = true, .unique_pool = "initiated"}); + gen_.GenerateSinglePanel("Panel_wrath_path", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 1}); + gen_.GenerateDoublePanel("Panel_knight_write", "Panel_byte_write", kTop, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 2}); + gen_.GenerateSinglePanel("Panel_maim_same", kTop, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 0}); + gen_.GenerateSinglePanel("Panel_bare_bear", kTop, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 0}); + gen_.GeneratePanelStack("Panel_chair_bear", kPurple, "", {}, "Panel_cost_most", kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 1}); + gen_.GenerateSinglePanel("Panel_bed_dead", kMiddle, kPurple, {.reuse_solution = true, .unique_pool = "initiated", .max_len_diff = 2}); // The Bearer - // Panel_north_missing: ? north! - // Panel_diamonds_missing: ? diamonds! - // Panel_fire_missing: ? fire! - // Panel_winter_missing: ? winter! + gen_.GenerateCrossTower( + "Panel_north_missing", "Panel_diamonds_missing", "Panel_fire_missing", "Panel_winter_missing", + "Panel_north_north", "Panel_diamonds_diamonds", "Panel_fire_fire", "Panel_winter_winter", + "Panel_mouth_south", "Panel_yeast_east", "Panel_wet_west", + "Panel_spades_spades", "Panel_clubs_clubs", "Panel_hearts_hearts", + "Panel_earth_earth", "Panel_water_water", "Panel_water_water", + "Panel_summer_summer", "Panel_autumn_autumn", "Panel_spring_spring"); gen_.GenerateSinglePanel("Panel_shortcut_shortcut", kMiddle, kWhite, {.obscure_hint = true, .max_answer_len = 20}); - // Panel_north_north: ? north! - // Panel_mouth_south: sound? south! - // Panel_yeast_east: yeast? east! - // Panel_wet_west: wet? west! - // Panel_fire_fire: ? fire! - // Panel_earth_earth: earth? earth! - // Panel_water_water: water? water! - // Panel_air_air: air? air! - // Panel_winter_winter: ? winter! - // Panel_diamonds_diamonds: ? diamonds! - // Panel_spades_spades: spades? spades! - // Panel_clubs_clubs: clubs? clubs! - // Panel_hearts_hearts: hearts? hearts! // Panel_part_rap: part? rap! // Panel_heart_tar: heart? tar! // Panel_smile_lime: smile? lime! @@ -295,8 +285,8 @@ public: // Art Gallery gen_.GenerateSinglePanel("Panel_eon_one", kMiddle, kYellow, {.max_answer_len = 5}); gen_.GenerateSinglePanel("Panel_to_two", kMiddle, kRed); - gen_.GenerateSinglePanel("Panel_free_three", kMiddle, kPurple, {.reuse_solution = true, .max_hint_len = 5}); - gen_.GenerateSinglePanel("Panel_our_four", kMiddle, kBlue, {.reuse_solution = true}); + gen_.GenerateSinglePanel("Panel_free_three", kMiddle, kPurple, {.reuse_solution = true, .max_len_diff = 1}); + gen_.GenerateSinglePanel("Panel_our_four", kMiddle, kBlue, {.reuse_solution = true, .max_len_diff = 1}); gen_.GenerateSinglePanel("Panel_house_neighborhood", kBottom, kBlue, {.max_answer_len = 6}); gen_.GenerateStaticPanel("Panel_path_road", "path", "road"); // can't randomise brown yet gen_.GenerateSinglePanel("Panel_park_drive", kBottom, kBlack, {.max_answer_len = 6}); @@ -305,8 +295,8 @@ public: gen_.GenerateSinglePanel("Panel_may_many", kMiddle, kBlue, {.max_answer_len = 4}); gen_.GenerateSinglePanel("Panel_any_many", kMiddle, kBlue, {.max_answer_len = 4}); gen_.GenerateSinglePanel("Panel_man_many", kMiddle, kBlue, {.max_answer_len = 4}); - gen_.GenerateSinglePanel("Panel_urns_turns", kMiddle, kBlue, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_learns_turns", kMiddle, kPurple, {.reuse_solution = true, .max_answer_len = 5}); + gen_.GenerateSinglePanel("Panel_urns_turns", kMiddle, kBlue, {.max_len_diff = 1}); + gen_.GenerateSinglePanel("Panel_learns_turns", kMiddle, kPurple, {.reuse_solution = true, .max_len_diff = 0}); gen_.GenerateSinglePanel("Panel_runts_turns", kMiddle, kYellow); gen_.GenerateOrangeAdditionPanel("Panel_send_use_turns"); gen_.GenerateOrangeWordPanel("Panel_trust_06890"); @@ -398,16 +388,97 @@ public: // Directional Gallery gen_.GenerateStaticPanel("Panel_paranoid_paranoid", "welcome back"); gen_.GeneratePairedPanels("Panel_salt_pepper", "Panel_pepper_salt", kBottom, kBlack); - gen_.GenerateSinglePanel("Panel_ward_forward", kMiddle, kBlue, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_hind_behind", kMiddle, kBlue, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_rig_right", kMiddle, kBlue, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_windward_forward", kMiddle, kPurple, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_light_right", kMiddle, kPurple, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_rewind_behind", kMiddle, kPurple, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_learn_return", kMiddle, kPurple, {.reuse_solution = true}); - gen_.GenerateSinglePanel("Panel_turn_return", kMiddle, kBlue, {.reuse_solution = true}); - - + gen_.GenerateSinglePanel("Panel_ward_forward", kMiddle, kBlue, {.reuse_solution = true, .max_len_diff = 3}); + gen_.GenerateSinglePanel("Panel_hind_behind", kMiddle, kBlue, {.reuse_solution = true, .max_len_diff = 2}); + gen_.GenerateSinglePanel("Panel_rig_right", kMiddle, kBlue, {.reuse_solution = true, .max_len_diff = 2}); + gen_.GenerateSinglePanel("Panel_windward_forward", kMiddle, kPurple, {.reuse_solution = true, .max_len_diff = 1}); + gen_.GenerateSinglePanel("Panel_light_right", kMiddle, kPurple, {.reuse_solution = true, .max_len_diff = 0}); + gen_.GenerateSinglePanel("Panel_rewind_behind", kMiddle, kPurple, {.reuse_solution = true, .max_len_diff = 0}); + gen_.GenerateSinglePanel("Panel_learn_return", kMiddle, kPurple, {.reuse_solution = true, .max_len_diff = 1}); + gen_.GenerateSinglePanel("Panel_turn_return", kMiddle, kBlue, {.reuse_solution = true, .max_len_diff = 2}); + + + + + + + + + // The Colorful + gen_.GenerateSinglePanel("Panel_begin_start", kBottom, kWhite, {.reuse_solution = true}); + gen_.GenerateSinglePanel("Panel_found_lost", kBottom, kBlack, {.reuse_solution = true}); + gen_.GenerateSinglePanel("Panel_loaf_crust", kBottom, kRed, {.reuse_solution = true}); + //Panel_eggs_breakfast: cream? butter! + gen_.GenerateSinglePanel("Panel_sun_sky", kBottom, kBlue, {.reuse_solution = true}); + //Panel_teacher_substitute: spoon? fork! + //Panel_walnuts_orange: letters? numbers! + //Panel_path_i: walls? green! + //Panel_iron_rust: iron? rust! + //Panel_obstacle_door: obstacle? door! + + // Champion's Rest + gen_.GenerateSinglePanel("Panel_hues_colors", kBottom, kWhite, {.max_answer_len = 6}); + gen_.GenerateSinglePanel("Panel_red_near", kMiddle, kWhite, {.copy_hidden = "Panel_red_afar"}); + gen_.GenerateSinglePanel("Panel_blue_near", kMiddle, kWhite, {.copy_hidden = "Panel_blue_afar"}); + gen_.GenerateSinglePanel("Panel_yellow_near", kMiddle, kWhite, {.copy_hidden = "Panel_yellow_afar"}); + gen_.GenerateSinglePanel("Panel_purple_near", kMiddle, kWhite, {.copy_hidden = "Panel_purple_afar"}); + gen_.GenerateSinglePanel("Panel_orange_near", kMiddle, kWhite, {.copy_hidden = "Panel_orange_afar"}); + gen_.GenerateSinglePanel("Panel_green_near", kMiddle, kWhite, {.copy_hidden = "Panel_green_afar"}); + //Panel_you: you? jeff! + gen_.GenerateStaticPanel("Panel_me", "me", "hatkirby"); + //Panel_secret_blue: blue? blue! + //Panel_secret_yellow: yellow? yellow! + //Panel_secret_red: red? red! + + // The Fearless + gen_.GenerateSinglePanel("Panel_naps_span", kMiddle, kBlack, {.unique_pool = "fearless"}); + gen_.GenerateSinglePanel("Panel_funny_enough", kTop, kBlack, {.unique_pool = "fearless"}); + //Panel_easy_soft: easy? soft! + //Panel_sometimes_always: sometimes? always! + //Panel_dark_extinguish: dark? heavy! + //Panel_impatient_doctor: impatient? doctor! + //Panel_even_ordinary: even? ordinary! + //Panel_one_none: sum? none! + //Panel_one_many: none? sum! + gen_.GenerateSinglePanel("Panel_team_meet", kTop, kBlack, {.unique_pool = "fearless"}); + gen_.GenerateSinglePanel("Panel_teem_meat", kTop, kBlack, {.unique_pool = "fearless"}); + gen_.GenerateSinglePanel("Panel_eat_tea", kTop, kBlack, {.unique_pool = "fearless"}); + gen_.GenerateSinglePanel("Panel_came_make", kTop, kBlack, {.unique_pool = "fearless"}); + gen_.GenerateSinglePanel("Panel_same_mace", kTop, kBlack, {.unique_pool = "fearless"}); + gen_.GenerateSinglePanel("Panel_safe_face", kTop, kBlack, {.unique_pool = "fearless"}); + gen_.GenerateSinglePanel("Panel_might_time", kTop, kBlack, {.unique_pool = "fearless"}); + + // The Scientific + + + + // Challenge + gen_.GenerateSinglePanel("Panel_challenge_challenge", kMiddle, kWhite, {.unique_pool = "challenge", .obscure_hint = true, .max_answer_len = 20}); + gen_.GenerateSinglePanel("Panel_welcome_welcome", kMiddle, kWhite, {.unique_pool = "challenge", .obscure_hint = true, .max_answer_len = 20}); + //Panel_open_nepotism: open? nepotism! + gen_.GenerateSinglePanel("Panel_singed_singsong", kMiddle, kPurple, {.unique_pool = "challenge", .reuse_solution = true}); + gen_.GenerateSinglePanel("Panel_nevertrusted_maladjusted", kMiddle, kPurple, {.unique_pool = "challenge", .reuse_solution = true}); + gen_.GenerateSinglePanel("Panel_corner_corn", kMiddle, kRed, {.unique_pool = "challenge"}); + //Panel_strawberries_mold: strawberries? mold! + //Panel_grub_burger: grub? burger! + //Panel_bread_mold: cheese? mold! + //Panel_color_gray: color? gray! + gen_.GenerateSinglePanel("Panel_writer_songwriter", kMiddle, kBlue, {.unique_pool = "challenge", .reuse_solution = true}); + //Panel_tales_stale: 02759? stale! + gen_.GenerateSinglePanel("Panel_realeyes_realize", kTop, kWhite, {.unique_pool = "challenge", .multiword = true, .max_answer_len = 20}); + gen_.GenerateSinglePanel("Panel_lobs_lobster", kMiddle, kBlue, {.unique_pool = "challenge", .max_len_diff = 4}); + gen_.GenerateSinglePanel("Panel_double_anagram_1", kMiddle, kYellow, {.unique_pool = "challenge", .force_two_words = true}); + gen_.GenerateSinglePanel("Panel_double_anagram_2", kMiddle, kYellow, {.unique_pool = "challenge", .force_two_words = true}); + gen_.GenerateSinglePanel("Panel_double_anagram_3", kMiddle, kYellow, {.unique_pool = "challenge", .force_two_words = true}); + gen_.GenerateSinglePanel("Panel_double_anagram_4", kMiddle, kYellow, {.unique_pool = "challenge", .force_two_words = true}); + gen_.GenerateSinglePanel("Panel_double_anagram_5", kMiddle, kYellow, {.unique_pool = "challenge", .force_two_words = true}); + gen_.GenerateSinglePanel("Panel_double_anagram_6", kMiddle, kYellow, {.unique_pool = "challenge", .force_two_words = true}); + //Panel_facts: facts? car! + //Panel_facts2: facts? acts! + //Panel_facts3: acts? axe! + //Panel_facts4: acts? axle! + //Panel_facts5: acts? axles! + //Panel_facts6: acts? car! @@ -489,13 +560,13 @@ public: gen_.GenerateComboPanel("Panel_lingo_4", kBottom, kWhite, kMiddle, kPurple); gen_.GenerateComboPanel("Panel_lingo_6", kBottom, kBlack, kBottom, kWhite); gen_.GenerateSinglePanel("Panel_lingo_3", kBottom, kWhite); - gen_.GenerateComboPanel("Panel_lingo_10", kBottom, kBlack, kMiddle, kRed); + gen_.GenerateComboPanel("Panel_lingo_10", kMiddle, kBlue, kMiddle, kRed); gen_.GenerateSinglePanel("Panel_lingo_2", kBottom, kWhite); gen_.GenerateSinglePanel("Panel_lingo_5", kMiddle, kYellow, {.multiword = true, .max_answer_len = 20}); gen_.GenerateSinglePanel("Panel_lingo_11", kMiddle, kYellow, {.multiword = true, .max_answer_len = 20}); // Panel_lingo_9: this? pilgrim room! - std::ifstream level1("../level1.tscn"); + std::ifstream level1("../babe.tscn"); std::ofstream output("newlevel.tscn"); std::string line; std::string name; diff --git a/vendor/verbly b/vendor/verbly index e5d8d42..1e30651 160000 --- a/vendor/verbly +++ b/vendor/verbly @@ -1 +1 @@ -Subproject commit e5d8d42eae6ce486678d87e33c1a7c26e2a6c1a1 +Subproject commit 1e30651c96912e5475f1ceb46972ec4e2fa54b10 -- cgit 1.4.1