mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement scenario select window

This commit is contained in:
Ted John 2021-01-27 22:50:31 +00:00
parent 8cfdbd871d
commit d2a97ab43c
5 changed files with 121 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/openrct2-ui/scripting/ScUi.hpp
View File

@ -22,6 +22,7 @@
# include <openrct2/Context.h>
# include <openrct2/Input.h>
# include <openrct2/common.h>
# include <openrct2/scenario/ScenarioRepository.h>
# include <openrct2/scripting/Duktape.hpp>
# include <openrct2/scripting/ScriptEngine.h>
# include <string>
@ -38,6 +39,37 @@ namespace OpenRCT2::Ui::Windows
namespace OpenRCT2::Scripting
{
static const DukEnumMap<SCENARIO_CATEGORY> ScenarioCategoryMap({
{ "beginner", SCENARIO_CATEGORY_BEGINNER },
{ "challenging", SCENARIO_CATEGORY_CHALLENGING },
{ "expert", SCENARIO_CATEGORY_EXPERT },
{ "real", SCENARIO_CATEGORY_REAL },
{ "other", SCENARIO_CATEGORY_OTHER },
{ "dlc", SCENARIO_CATEGORY_DLC },
{ "build_your_own", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
});
static const DukEnumMap<ScenarioSource> ScenarioSourceMap({
{ "rct1", ScenarioSource::RCT1 },
{ "rct1_aa", ScenarioSource::RCT1_AA },
{ "rct1_ll", ScenarioSource::RCT1_LL },
{ "rct2", ScenarioSource::RCT2 },
{ "rct2_ww", ScenarioSource::RCT2_WW },
{ "rct2_tt", ScenarioSource::RCT2_TT },
{ "real", ScenarioSource::Real },
{ "other", ScenarioSource::Other },
});
template<> inline DukValue ToDuk(duk_context* ctx, const SCENARIO_CATEGORY& value)
{
return ToDuk(ctx, ScenarioCategoryMap[value]);
}
template<> inline DukValue ToDuk(duk_context* ctx, const ScenarioSource& value)
{
return ToDuk(ctx, ScenarioSourceMap[value]);
}
class ScTool
{
private:
@ -250,6 +282,19 @@ namespace OpenRCT2::Scripting
}
}
void showScenarioSelect(const DukValue& desc)
{
auto plugin = _scriptEngine.GetExecInfo().GetCurrentPlugin();
auto callback = desc["callback"];
window_scenarioselect_open(
[this, plugin, callback](std::string_view path) {
auto dukValue = GetScenarioFile(path);
_scriptEngine.ExecutePluginCall(plugin, callback, { dukValue }, false);
},
false, true);
}
void activateTool(const DukValue& desc)
{
InitialiseCustomTool(_scriptEngine, desc);
@ -278,6 +323,7 @@ namespace OpenRCT2::Scripting
dukglue_register_method(ctx, &ScUi::showError, "showError");
dukglue_register_method(ctx, &ScUi::showTextInput, "showTextInput");
dukglue_register_method(ctx, &ScUi::showFileBrowse, "showFileBrowse");
dukglue_register_method(ctx, &ScUi::showScenarioSelect, "showScenarioSelect");
dukglue_register_method(ctx, &ScUi::activateTool, "activateTool");
dukglue_register_method(ctx, &ScUi::registerMenuItem, "registerMenuItem");
}
@ -287,6 +333,39 @@ namespace OpenRCT2::Scripting
{
return WC_NULL;
}
DukValue GetScenarioFile(std::string_view path)
{
auto ctx = _scriptEngine.GetContext();
DukObject obj(ctx);
obj.Set("path", path);
auto* scenarioRepo = GetScenarioRepository();
auto entry = scenarioRepo->GetByPath(std::string(path).c_str());
if (entry != nullptr)
{
obj.Set("id", entry->sc_id);
obj.Set("category", ToDuk(ctx, static_cast<SCENARIO_CATEGORY>(entry->category)));
obj.Set("sourceGame", ToDuk(ctx, entry->source_game));
obj.Set("internalName", entry->internal_name);
obj.Set("name", entry->name);
obj.Set("details", entry->details);
auto* highscore = entry->highscore;
if (highscore == nullptr)
{
obj.Set("highscore", nullptr);
}
else
{
DukObject dukHighscore(ctx);
dukHighscore.Set("name", highscore->name);
dukHighscore.Set("companyValue", highscore->company_value);
obj.Set("highscore", dukHighscore.Take());
}
}
return obj.Take();
}
};
} // namespace OpenRCT2::Scripting

37
src/openrct2-ui/windows/ScenarioSelect.cpp
View File

@ -130,32 +130,40 @@ static void initialise_list_items(rct_window* w);
static bool is_scenario_visible(rct_window* w, const scenario_index_entry* scenario);
static bool is_locking_enabled(rct_window* w);
static scenarioselect_callback _callback;
static std::function<void(std::string_view)> _callback;
static bool _showLockedInformation = false;
static bool _titleEditor = false;
static bool _disableLocking{};
/**
*
* rct2: 0x006781B5
*/
rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool titleEditor)
{
rct_window* window;
int32_t windowWidth;
int32_t windowHeight = 334;
_callback = callback;
if (_titleEditor != titleEditor)
{
_titleEditor = titleEditor;
window_close_by_class(WC_SCENARIO_SELECT);
}
window = window_bring_to_front_by_class(WC_SCENARIO_SELECT);
auto window = window_bring_to_front_by_class(WC_SCENARIO_SELECT);
if (window != nullptr)
return window;
return window_scenarioselect_open(
[callback](std::string_view scenario) { callback(std::string(scenario).c_str()); }, titleEditor, titleEditor);
}
/**
*
* rct2: 0x006781B5
*/
rct_window* window_scenarioselect_open(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking)
{
rct_window* window;
int32_t windowWidth;
int32_t windowHeight = 334;
_callback = callback;
_disableLocking = disableLocking;
// Load scenario list
scenario_repository_scan();
@ -328,10 +336,7 @@ static void window_scenarioselect_scrollmousedown(rct_window* w, int32_t scrollI
OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, w->windowPos.x + (w->width / 2));
gFirstTimeSaving = true;
_callback(listItem.scenario.scenario->path);
if (_titleEditor)
{
window_close(w);
}
window_close(w);
}
break;
}

1
src/openrct2-ui/windows/Window.h
View File

@ -105,6 +105,7 @@ rct_window* window_staff_fire_prompt_open(Peep* peep);
void window_title_editor_open(int32_t tab);
void window_title_command_editor_open(struct TitleSequence* sequence, int32_t command, bool insert);
rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool titleEditor);
rct_window* window_scenarioselect_open(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking);
rct_window* window_error_open(rct_string_id title, rct_string_id message, const class Formatter& formatter);
rct_window* window_error_open(std::string_view title, std::string_view message);

2
src/openrct2/scenario/Scenario.h
View File

@ -318,7 +318,7 @@ enum
#define S6_RCT2_VERSION 120001
#define S6_MAGIC_NUMBER 0x00031144
enum
enum SCENARIO_CATEGORY
{
// RCT2 categories (keep order)
SCENARIO_CATEGORY_BEGINNER,

19
src/openrct2/scripting/Duktape.hpp
View File

@ -80,6 +80,13 @@ namespace OpenRCT2::Scripting
PopObjectIfExists();
}
void Set(const char* name, std::nullptr_t)
{
EnsureObjectPushed();
duk_push_null(_ctx);
duk_put_prop_string(_ctx, _idx, name);
}
void Set(const char* name, bool value)
{
EnsureObjectPushed();
@ -101,6 +108,13 @@ namespace OpenRCT2::Scripting
duk_put_prop_string(_ctx, _idx, name);
}
void Set(const char* name, uint64_t value)
{
EnsureObjectPushed();
duk_push_number(_ctx, value);
duk_put_prop_string(_ctx, _idx, name);
}
void Set(const char* name, std::string_view value)
{
EnsureObjectPushed();
@ -108,6 +122,11 @@ namespace OpenRCT2::Scripting
duk_put_prop_string(_ctx, _idx, name);
}
void Set(const char* name, const char* value)
{
Set(name, std::string_view(value));
}
void Set(const char* name, const DukValue& value)
{
EnsureObjectPushed();