Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8acd390
SV: add supervised isolated-hunt acquisition prototype
dayfine Oct 24, 2026
1ad1d25
SV prototype: keep kill tracker alive until inference stops
dayfine Oct 24, 2026
68ef7bb
Add supervised Area Zero return mode for prototype handback
dayfine Oct 24, 2026
d0152b4
Add tested isolated-hunt planning and bounded action loop
dayfine Oct 24, 2026
8a59974
Split isolated prototype orchestration to meet incremental lint limits
dayfine Oct 24, 2026
4e18806
Add hunt configuration table and shared encounter policy mapping
dayfine Oct 24, 2026
188a5b3
Share regional flight navigation outside material farming
dayfine Oct 24, 2026
f2347d3
Wire sandwich, travel, roaming and shared encounters into isolated hu…
dayfine Oct 24, 2026
c18a234
Default isolated hunts to ordinary Encounter Power sandwiches
dayfine Oct 24, 2026
3d222e3
Refly the starting anchor before isolated hunt ingredients
dayfine Oct 24, 2026
da0db2a
Use ordinary Fire Encounter Power level two recipe
dayfine Oct 24, 2026
c6f8707
Support persistent local macOS app signing with a dedicated bundle ID
dayfine Oct 24, 2026
09c1f31
Allow a distinct display name for the signed lab app
dayfine Oct 24, 2026
6ca8566
Resign local bundles after metadata-only builds too
dayfine Oct 24, 2026
5db7dfe
Require named Central flights and supervised hunt verification
dayfine Oct 25, 2026
8ad4c65
Log isolated hunt stages, rounds and prepared clearing time
dayfine Oct 25, 2026
cd12a6e
Verify active isolated Encounter Power with native OCR
dayfine Oct 25, 2026
3136433
Select a Central flight candidate automatically before name verification
dayfine Oct 25, 2026
c6de2bf
Add bounded Central uphill hunt with guarded flight resets
dayfine Oct 25, 2026
be6f865
Keep accepted hunt departure under its own stage deadline
dayfine Oct 25, 2026
9f2416f
SV isolated hunt: resume with verified existing sandwich power
dayfine Oct 25, 2026
282e9b3
SV sandwiches: bound picnic observation by elapsed time
dayfine Oct 25, 2026
3ca0fd1
SV navigation: correct signed-axis documentation to match controller …
dayfine Oct 25, 2026
2c7bd65
SV isolated hunt: correct southward map seek and forward ascent axes
dayfine Oct 25, 2026
4f13d4f
SV isolated hunt: resume an existing meal near the verified hunting a…
dayfine Oct 25, 2026
a7de933
SV isolated hunt: expose local fly icon before name-verified reflight
dayfine Oct 25, 2026
11fd321
SV isolated hunt: begin anchor resume at the supervised patch
dayfine Oct 25, 2026
d1a0a75
Merge origin/main into prototype/sv-isolated-hunt
dayfine Oct 30, 2026
3366618
Merge origin/main into prototype/sv-isolated-hunt
dayfine Oct 31, 2026
0975b71
Merge origin/main into prototype/sv-isolated-hunt
dayfine Nov 1, 2026
11b75ae
Merge origin/main into prototype/sv-isolated-hunt
dayfine Nov 2, 2026
485668f
Merge origin/main into prototype/sv-isolated-hunt
dayfine Nov 12, 2026
c1f269b
Merge origin/main into prototype/sv-isolated-hunt
dayfine Nov 12, 2026
16b8697
Merge origin/main into prototype/sv-isolated-hunt
dayfine Nov 13, 2026
07ff61c
Merge origin/main into prototype/sv-isolated-hunt
dayfine Nov 14, 2026
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
15 changes: 13 additions & 2 deletions SerialPrograms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,12 @@ add_library(SerialProgramsLib STATIC ${CORE_LIBRARY_SOURCES} ${LIBRARY_SOURCES})

# Create binary target
if (APPLE)
set(PA_MACOS_BUNDLE_IDENTIFIER "PokemonAutomation.SerialPrograms" CACHE STRING "Bundle identifier for this macOS build")
set(PA_MACOS_BUNDLE_NAME "SerialPrograms" CACHE STRING "Display name for this macOS build")
set(PA_MACOS_SIGNING_IDENTITY "" CACHE STRING "Optional persistent certificate for local macOS code signing")
if (PA_MACOS_SIGNING_IDENTITY AND PA_MACOS_BUNDLE_IDENTIFIER STREQUAL "PokemonAutomation.SerialPrograms")
message(FATAL_ERROR "Set PA_MACOS_BUNDLE_IDENTIFIER to a dedicated local identifier before enabling local signing.")
endif()
set(SerialPrograms_ICON ${CMAKE_CURRENT_SOURCE_DIR}/../IconResource/icon.icns)
# set_source_files_properties(SerialPrograms_ICON PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")

Expand All @@ -238,8 +244,8 @@ if (APPLE)
add_executable(SerialPrograms MACOSX_BUNDLE ${SerialPrograms_ICON} ${EXECUTABLE_SOURCES})
set_target_properties(SerialPrograms PROPERTIES
BUNDLE True
MACOSX_BUNDLE_GUI_IDENTIFIER PokemonAutomation.SerialPrograms
MACOSX_BUNDLE_BUNDLE_NAME SerialPrograms
MACOSX_BUNDLE_GUI_IDENTIFIER ${PA_MACOS_BUNDLE_IDENTIFIER}
MACOSX_BUNDLE_BUNDLE_NAME ${PA_MACOS_BUNDLE_NAME}
MACOSX_BUNDLE_BUNDLE_VERSION "0.1"
MACOSX_BUNDLE_SHORT_VERSION_STRING "0.1"
MACOSX_BUNDLE_ICON_FILE "icon.icns"
Expand Down Expand Up @@ -944,6 +950,11 @@ if(COMMAND_LINE_EXE)
include(Source/CommandLine/CommandLineExecutable.cmake)
endif()

if (APPLE AND PA_MACOS_SIGNING_IDENTITY)
include(cmake/LocalMacSigning.cmake)
pa_sign_local_macos_app(SerialPrograms)
endif()

if(PA_PYTHON_BINDINGS)
# Python bindings (GUI-free) from subdirectory
include(Source/PythonBindings/PythonBindings.cmake)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#include "Common/Cpp/Json/JsonArray.h"
#include "PokemonSV_IsolatedHuntSandwichOption.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
namespace PokemonSV{

IsolatedHuntSandwichOption::IsolatedHuntSandwichOption(OCR::LanguageOCROption* language)
: SandwichMakerOption("<b>Sandwich:</b> Encounter Power from ordinary ingredients by default. "
"Fire: 6 Rice + 2 Curry Powder + 2 Wasabi (expected Lv. 2; inspect active powers). Grass: Great Klawf Claw (Lv. 2). "
"Herba Mystica settings apply only when explicitly enabled below.",
language, BaseRecipe::shiny, false, GroupOption::EnableMode::ALWAYS_ENABLED)
, USE_HERBA("<b>Use Herba Mystica:</b><br>Add Sparkling Power using two selected herbs.",
LockMode::LOCK_WHILE_RUNNING, false)
{
PA_ADD_OPTION(USE_HERBA);
configure_for(IsolatedEncounterType::FIRE);
}

void IsolatedHuntSandwichOption::load_json(const JsonValue& json){
SandwichMakerOption::load_json(json);
configure_for(TYPE == PokemonType::grass ? IsolatedEncounterType::GRASS : IsolatedEncounterType::FIRE);
}

void IsolatedHuntSandwichOption::configure_for(IsolatedEncounterType type){
TYPE.set(type == IsolatedEncounterType::GRASS ? PokemonType::grass : PokemonType::fire);
if (USE_HERBA){
BASE_RECIPE.set(BaseRecipe::shiny);
}else{
// Ordinary Fire Lv2 custom recipe and Grass Lv2 recipe #105; no rare herbs.
// https://www.reddit.com/r/PokemonScarletViolet/comments/zhff1k/
// https://bulbapedia.bulbagarden.net/wiki/Sandwich_recipe
JsonArray ingredients;
const std::vector<std::string> recipe = type == IsolatedEncounterType::FIRE
? std::vector<std::string>{"rice", "rice", "rice", "rice", "rice", "rice",
"curry-powder", "curry-powder", "wasabi", "wasabi"}
: std::vector<std::string>{"klawf-stick", "tomato", "lettuce", "salt", "olive-oil", "wasabi"};
for (const auto& item : recipe){ ingredients.push_back(item); }

Check failure on line 38 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntSandwichOption.cpp

View workflow job for this annotation

GitHub Actions / code-health

Code health

style: for body goes on its own lines, braced (upstream AGENTS.md "Control flow formatting")
BASE_RECIPE.set(BaseRecipe::custom);
SANDWICH_INGREDIENTS.load_json(JsonValue(std::move(ingredients)));
}
HERBA_ONE.set_visibility(ConfigOptionState::ENABLED);
HERBA_TWO.set_visibility(ConfigOptionState::ENABLED);
TYPE.set_visibility(ConfigOptionState::HIDDEN);
BASE_RECIPE.set_visibility(ConfigOptionState::HIDDEN);
SANDWICH_INGREDIENTS.set_visibility(ConfigOptionState::HIDDEN);
}

}

Check failure on line 49 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntSandwichOption.cpp

View workflow job for this annotation

GitHub Actions / code-health

Code health

namespace-close: close this namespace with // namespace PokemonSV
}

Check failure on line 50 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntSandwichOption.cpp

View workflow job for this annotation

GitHub Actions / code-health

Code health

namespace-close: close this namespace with // namespace NintendoSwitch
}

Check failure on line 51 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntSandwichOption.cpp

View workflow job for this annotation

GitHub Actions / code-health

Code health

namespace-close: close this namespace with // namespace PokemonAutomation
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef PokemonAutomation_PokemonSV_IsolatedHuntSandwichOption_H
#define PokemonAutomation_PokemonSV_IsolatedHuntSandwichOption_H

#include "PokemonSV_SandwichMakerOption.h"
#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_IsolatedHuntPlan.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
namespace PokemonSV{

class IsolatedHuntSandwichOption : public SandwichMakerOption{

Check failure on line 11 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntSandwichOption.h

View workflow job for this annotation

GitHub Actions / code-health

Code health

header-comment: document each namespace-scope header symbol
public:
IsolatedHuntSandwichOption(OCR::LanguageOCROption* language);
virtual void load_json(const JsonValue& json) override;
void configure_for(IsolatedEncounterType type);

BooleanCheckBoxOption USE_HERBA;
};

}

Check failure on line 20 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntSandwichOption.h

View workflow job for this annotation

GitHub Actions / code-health

Code health

namespace-close: close this namespace with // namespace PokemonSV
}

Check failure on line 21 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntSandwichOption.h

View workflow job for this annotation

GitHub Actions / code-health

Code health

namespace-close: close this namespace with // namespace NintendoSwitch
}

Check failure on line 22 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntSandwichOption.h

View workflow job for this annotation

GitHub Actions / code-health

Code health

namespace-close: close this namespace with // namespace PokemonAutomation
#endif
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
#include "Common/Cpp/Json/JsonValue.h"
#include "PokemonSV_IsolatedHuntTable.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
namespace PokemonSV{
namespace{

const StringSelectDatabase& targets(){
static const StringSelectDatabase database([]{
StringSelectDatabase entries;
entries.add_entry(StringSelectEntry("charcadet", "Charcadet"));
entries.add_entry(StringSelectEntry("chespin", "Chespin"));
return entries;
}());
return database;
}

const EnumDropdownDatabase<IsolatedEncounterType>& types(){
static const EnumDropdownDatabase<IsolatedEncounterType> database{
{IsolatedEncounterType::FIRE, "fire", "Fire"},
{IsolatedEncounterType::GRASS, "grass", "Grass"},
};
return database;
}

const EnumDropdownDatabase<IsolatedHuntLocation>& locations(){
static const EnumDropdownDatabase<IsolatedHuntLocation> database{
{IsolatedHuntLocation::WEST_PROVINCE_ONE_CENTRAL, "west-province-one-central", "West Province One Central"},
{IsolatedHuntLocation::CHARGESTONE_CAVE, "chargestone-cave", "Chargestone Cavern"},
};
return database;
}

const EnumDropdownDatabase<IsolatedShinyAction>& actions(){
static const EnumDropdownDatabase<IsolatedShinyAction> database{
{IsolatedShinyAction::STOP, "stop", "Stop"},
{IsolatedShinyAction::CATCH, "catch", "Catch"},
{IsolatedShinyAction::CATCH_AND_SAVE, "catch-and-save", "Catch and save"},
};
return database;
}

}

Check failure on line 44 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntTable.cpp

View workflow job for this annotation

GitHub Actions / code-health

Code health

namespace-close: close this namespace with // namespace

IsolatedHuntRow::IsolatedHuntRow(EditableTableOption& parent)
: EditableTableRow(parent)
, enabled(LockMode::LOCK_WHILE_RUNNING, true)
, pokemon(targets(), LockMode::LOCK_WHILE_RUNNING, "charcadet")
, type(types(), LockMode::LOCK_WHILE_RUNNING, IsolatedEncounterType::FIRE)
, location(locations(), LockMode::LOCK_WHILE_RUNNING, IsolatedHuntLocation::WEST_PROVINCE_ONE_CENTRAL)
, shiny_action(actions(), LockMode::LOCK_WHILE_RUNNING, IsolatedShinyAction::STOP)
, ball(LockMode::LOCK_WHILE_RUNNING, "poke-ball")
, ball_limit(LockMode::LOCK_WHILE_RUNNING, 40, 1, 999)
{
PA_ADD_OPTION(enabled);
PA_ADD_OPTION(pokemon);
PA_ADD_OPTION(type);
PA_ADD_OPTION(location);
PA_ADD_OPTION(shiny_action);
PA_ADD_OPTION(ball);
PA_ADD_OPTION(ball_limit);
}

std::unique_ptr<EditableTableRow> IsolatedHuntRow::clone() const{
auto row = std::make_unique<IsolatedHuntRow>(parent());
row->load_json(to_json());
return row;
}

IsolatedHuntRequest IsolatedHuntRow::snapshot() const{
return {
.pokemon = pokemon.slug(), .type = type, .location = location,
.ball = ball.slug(), .ball_limit = ball_limit, .enabled = enabled,
.shiny_action = shiny_action,
};
}

IsolatedHuntTable::IsolatedHuntTable()
: EditableTableOption_t<IsolatedHuntRow>(
"<b>Hunts:</b><br>Choose a compatible target/type/location. Routes are experimental; verify the actual spawn patch.",
LockMode::LOCK_WHILE_RUNNING, make_defaults()
)
{}

std::vector<std::string> IsolatedHuntTable::make_header() const{
return {"Enabled", "Pokemon", "Encounter Type", "Location", "Shiny Action", "Ball", "Ball Limit"};
}

std::vector<IsolatedHuntRequest> IsolatedHuntTable::snapshot() const{
return EditableTableOption_t<IsolatedHuntRow>::snapshot<IsolatedHuntRequest>();
}

std::vector<std::unique_ptr<EditableTableRow>> IsolatedHuntTable::make_defaults(){
std::vector<std::unique_ptr<EditableTableRow>> rows;
rows.push_back(std::make_unique<IsolatedHuntRow>(*this));
return rows;
}

}

Check failure on line 100 in SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_IsolatedHuntTable.cpp

View workflow job for this annotation

GitHub Actions / code-health

Code health

namespace-close: close this namespace with // namespace PokemonSV
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#ifndef PokemonAutomation_PokemonSV_IsolatedHuntTable_H
#define PokemonAutomation_PokemonSV_IsolatedHuntTable_H

#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
#include "Common/Cpp/Options/EditableTableOption.h"
#include "Common/Cpp/Options/EnumDropdownOption.h"
#include "Common/Cpp/Options/SimpleIntegerOption.h"
#include "CommonTools/Options/StringSelectOption.h"
#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_IsolatedHuntPlan.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
namespace PokemonSV{

class IsolatedHuntRow : public EditableTableRow{
public:
IsolatedHuntRow(EditableTableOption& parent);
virtual std::unique_ptr<EditableTableRow> clone() const override;
IsolatedHuntRequest snapshot() const;
private:
BooleanCheckBoxCell enabled;
StringSelectCell pokemon;
EnumDropdownCell<IsolatedEncounterType> type;
EnumDropdownCell<IsolatedHuntLocation> location;
EnumDropdownCell<IsolatedShinyAction> shiny_action;
PokemonSwSh::PokemonBallSelectCell ball;
SimpleIntegerCell<uint16_t> ball_limit;
};

class IsolatedHuntTable : public EditableTableOption_t<IsolatedHuntRow>{
public:
IsolatedHuntTable();
virtual std::vector<std::string> make_header() const override;
std::vector<IsolatedHuntRequest> snapshot() const;
private:
std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
};

}
}
}
#endif
Loading
Loading