openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

add 2 more launch types

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-01-11 21:08:21 -06:00
committed by Celtic Minstrel
parent 3db902ea37
commit 9739ab2f61
8 changed files with 91 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rsrc/menus/ScenEditor.rc
View File

@@ -86,7 +86,10 @@ BEGIN
END END
POPUP "&Scenario" POPUP "&Scenario"
BEGIN BEGIN
MENUITEM "Launch Scenario Here", IDM_SCEN_LAUNCH MENUITEM "Launch From Here", IDM_SCEN_LAUNCH_HERE
MENUITEM "Launch From Start", IDM_SCEN_LAUNCH_START
MENUITEM "Launch From Town Entrance", IDM_SCEN_LAUNCH_ENTRANCE
MENUITEM SEPARATOR
MENUITEM "&Create New Town", IDM_SCEN_NEW_TOWN MENUITEM "&Create New Town", IDM_SCEN_NEW_TOWN
MENUITEM "Resize Outdoors", IDM_SCEN_RESIZE_OUTDOORS MENUITEM "Resize Outdoors", IDM_SCEN_RESIZE_OUTDOORS
MENUITEM SEPARATOR MENUITEM SEPARATOR

28
rsrc/menus/scenedit.xib
View File

@@ -343,7 +343,33 @@
<array class="NSMutableArray" key="NSMenuItems"> <array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="142725491"> <object class="NSMenuItem" id="142725491">
<reference key="NSMenu" ref="399390342"/> <reference key="NSMenu" ref="399390342"/>
<string key="NSTitle">Launch Scenario Here</string> <string key="NSTitle">Launch From Here</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="142725492">
<reference key="NSMenu" ref="399390342"/>
<string key="NSTitle">Launch From Start</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="142725493">
<reference key="NSMenu" ref="399390342"/>
<string key="NSTitle">Launch From Town Entrance</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="610226443">
<reference key="NSMenu" ref="399390342"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/> <reference key="NSOnImage" ref="229763992"/>

6
rsrc/menus/scenresource.h
View File

@@ -72,7 +72,9 @@
#define IDM_SCEN_RESIZE_OUTDOORS 167 #define IDM_SCEN_RESIZE_OUTDOORS 167
#define IDM_SCEN_ADV_IMPORT_OUT 168 #define IDM_SCEN_ADV_IMPORT_OUT 168
#define IDM_GRAYED_LABEL 169 #define IDM_GRAYED_LABEL 169
#define IDM_SCEN_LAUNCH 170 #define IDM_SCEN_LAUNCH_HERE 170
#define IDM_SCEN_LAUNCH_START 171
#define IDM_SCEN_LAUNCH_ENTRANCE 172
// Next default values for new objects // Next default values for new objects
// //
@@ -81,6 +83,6 @@
#define _APS_NEXT_RESOURCE_VALUE 103 #define _APS_NEXT_RESOURCE_VALUE 103
#define _APS_NEXT_COMMAND_VALUE 40014 #define _APS_NEXT_COMMAND_VALUE 40014
#define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 171 #define _APS_NEXT_SYMED_VALUE 173
#endif #endif
#endif #endif

3
src/game/boe.main.cpp
View File

@@ -460,8 +460,9 @@ static void handle_scenario_args() {
town_entrance = *scen_arg_town_entrance; town_entrance = *scen_arg_town_entrance;
}else if(scen_arg_loc){ }else if(scen_arg_loc){
town_entrance = 9; town_entrance = 9;
town_location = *scen_arg_loc;
} }
force_town_enter(*scen_arg_town, *scen_arg_loc); force_town_enter(*scen_arg_town, town_location);
start_town_mode(*scen_arg_town, town_entrance); start_town_mode(*scen_arg_town, town_entrance);
}else if(scen_arg_out_sec){ }else if(scen_arg_out_sec){
if(!party_in_memory || !univ.party.is_in_scenario() || if(!party_in_memory || !univ.party.is_in_scenario() ||

50
src/scenedit/scen.main.cpp
View File

@@ -2,6 +2,7 @@
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include <memory> #include <memory>
#include <vector>
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
#include <boost/process/child.hpp> #include <boost/process/child.hpp>
#include <boost/process/io.hpp> #include <boost/process/io.hpp>
@@ -31,6 +32,7 @@
#include "tools/winutil.hpp" #include "tools/winutil.hpp"
#include "tools/cursors.hpp" #include "tools/cursors.hpp"
#include "dialogxml/dialogs/strdlog.hpp" #include "dialogxml/dialogs/strdlog.hpp"
#include "dialogxml/dialogs/strchoice.hpp"
#include "dialogxml/dialogs/choicedlog.hpp" #include "dialogxml/dialogs/choicedlog.hpp"
#include "scen.menus.hpp" #include "scen.menus.hpp"
#include "fileio/resmgr/res_dialog.hpp" #include "fileio/resmgr/res_dialog.hpp"
@@ -95,15 +97,24 @@ fs::path game_dir;
fs::path game_binary; fs::path game_binary;
extern std::string last_load_file; extern std::string last_load_file;
void launch_scenario() { enum eLaunchType {LOC,START,ENTRANCE};
void launch_scenario(eLaunchType type) {
if(boost::ends_with(last_load_file, ".exs")){ if(boost::ends_with(last_load_file, ".exs")){
showError("The scenario editor cannot launch an unpacked scenario directly. You'll need to re-open the scenario from its .boes archive."); showError("The scenario editor cannot launch an unpacked scenario directly. You'll need to re-open the scenario from its .boes archive.");
return; return;
} }
// Make sure scenario is loaded and currently editing the terrain of a town or outdoor section // Make sure scenario is loaded and currently editing the terrain of a town or outdoor section
if(overall_mode >= MODE_MAIN_SCREEN){ if(type == LOC){
showError("Must be viewing the terrain of a town or outdoor section at the place where you want to put the debug party."); if(overall_mode >= MODE_MAIN_SCREEN){
showError("Must be viewing the terrain of a town or outdoor section at the place where you want to put the debug party.");
return;
}
}
// Make sure scenario is loaded
else if(overall_mode == MODE_INTRO_SCREEN){
showError("Must have a scenario loaded.");
return; return;
} }
@@ -121,12 +132,27 @@ void launch_scenario() {
std::ostringstream command_stream; std::ostringstream command_stream;
command_stream << bp::search_path(game_binary, {fs::current_path()}) << " --scenario \"" << last_load_file << "\" "; command_stream << bp::search_path(game_binary, {fs::current_path()}) << " --scenario \"" << last_load_file << "\" ";
if(editing_town){ if(type == LOC){
if(editing_town){
command_stream << "--town " << cur_town;
}else{
command_stream << "--out-sec (" << cur_out.x << "," << cur_out.y << ")";
}
command_stream << " --loc (" << cen_x << "," << cen_y << ")";
}else if(type == ENTRANCE){
command_stream << "--town " << cur_town; command_stream << "--town " << cur_town;
}else{ std::ostringstream prompt;
command_stream << "--out-sec (" << cur_out.x << "," << cur_out.y << ")"; prompt << "Launch in " << scenario.towns[cur_town]->name << " at which entrance?";
std::vector<std::string> choices = {"North", "East", "South", "West"};
cStringChoice dlog(choices, prompt.str());
size_t choice = dlog.show(0);
if(dlog->accepted()){
command_stream << " --entrance " << choice;
}else{
// Cancel
return;
}
} }
command_stream << " --loc (" << cen_x << "," << cen_y << ")";
LOG(command_stream.str()); LOG(command_stream.str());
@@ -475,8 +501,14 @@ void handle_menu_choice(eMenu item_hit) {
editKey.k = key_selectall; editKey.k = key_selectall;
isEdit = true; isEdit = true;
break; break;
case eMenu::LAUNCH: case eMenu::LAUNCH_HERE:
launch_scenario(); launch_scenario(LOC);
break;
case eMenu::LAUNCH_START:
launch_scenario(START);
break;
case eMenu::LAUNCH_ENTRANCE:
launch_scenario(ENTRANCE);
break; break;
case eMenu::TOWN_CREATE: case eMenu::TOWN_CREATE:
if(scenario.towns.size() >= 200) { if(scenario.towns.size() >= 200) {

18
src/scenedit/scen.menu.cpp
View File

@@ -74,14 +74,16 @@ void OpenBoESceneditMenu::add_persistent_menu_items(tgui::MenuBar::Ptr& menubar)
// { { "Scenario", "Advanced", "Scenario Specials Dump" }, eMenu::NONE }, // { { "Scenario", "Advanced", "Scenario Specials Dump" }, eMenu::NONE },
// { { "Scenario", "Advanced", "Scenario Object Data Dump" }, eMenu::NONE }, // { { "Scenario", "Advanced", "Scenario Object Data Dump" }, eMenu::NONE },
{ { "Scenario", "Launch Scenario Here" }, eMenu::LAUNCH }, { { "Scenario", "Launch From Here" }, eMenu::LAUNCH_HERE },
{ { "Scenario", "Create New Town" }, eMenu::TOWN_CREATE }, { { "Scenario", "Launch From Start" }, eMenu::LAUNCH_START },
{ { "Scenario", "Resize Outdoors" }, eMenu::OUT_RESIZE }, { { "Scenario", "Launch From Town Entrance" }, eMenu::LAUNCH_ENTRANCE },
{ { "Scenario", "Scenario Details" }, eMenu::SCEN_DETAILS }, { { "Scenario", "Create New Town" }, eMenu::TOWN_CREATE },
{ { "Scenario", "Scenario Intro Text" }, eMenu::SCEN_INTRO }, { { "Scenario", "Resize Outdoors" }, eMenu::OUT_RESIZE },
{ { "Scenario", "Edit Custom Graphic Sheets" }, eMenu::SCEN_SHEETS }, { { "Scenario", "Scenario Details" }, eMenu::SCEN_DETAILS },
{ { "Scenario", "Classify Custom Graphics" }, eMenu::SCEN_PICS }, { { "Scenario", "Scenario Intro Text" }, eMenu::SCEN_INTRO },
{ { "Scenario", "Edit Custom Sounds" }, eMenu::SCEN_SNDS }, { { "Scenario", "Edit Custom Graphic Sheets" }, eMenu::SCEN_SHEETS },
{ { "Scenario", "Classify Custom Graphics" }, eMenu::SCEN_PICS },
{ { "Scenario", "Edit Custom Sounds" }, eMenu::SCEN_SNDS },
{ { "Town", "Advanced", "Edit Special Nodes" }, eMenu::TOWN_SPECIALS }, { { "Town", "Advanced", "Edit Special Nodes" }, eMenu::TOWN_SPECIALS },
{ { "Town", "Advanced", "Edit Town Text" }, eMenu::TOWN_TEXT }, { { "Town", "Advanced", "Edit Town Text" }, eMenu::TOWN_TEXT },

2
src/scenedit/scen.menus.hpp
View File

@@ -19,7 +19,7 @@ enum class eMenu {
EDIT_UNDO, EDIT_REDO, EDIT_CUT, EDIT_COPY, EDIT_PASTE, EDIT_DELETE, EDIT_SELECT_ALL, EDIT_UNDO, EDIT_REDO, EDIT_CUT, EDIT_COPY, EDIT_PASTE, EDIT_DELETE, EDIT_SELECT_ALL,
HELP_TOC, HELP_START, HELP_TEST, HELP_DIST, HELP_CONTEST, HELP_TOC, HELP_START, HELP_TEST, HELP_DIST, HELP_CONTEST,
// Scenario menu // Scenario menu
LAUNCH, TOWN_CREATE, OUT_RESIZE, SCEN_DETAILS, SCEN_INTRO, TOWN_START, LAUNCH_HERE, LAUNCH_START, LAUNCH_ENTRANCE, TOWN_CREATE, OUT_RESIZE, SCEN_DETAILS, SCEN_INTRO, TOWN_START,
SCEN_SPECIALS, SCEN_TEXT, SCEN_JOURNALS, TOWN_IMPORT, OUT_IMPORT, SCEN_SPECIALS, SCEN_TEXT, SCEN_JOURNALS, TOWN_IMPORT, OUT_IMPORT,
SCEN_SAVE_ITEM_RECTS, SCEN_SAVE_ITEM_RECTS,
TOWN_VARYING, SCEN_TIMERS, SCEN_ITEM_SHORTCUTS, TOWN_DELETE, TOWN_VARYING, SCEN_TIMERS, SCEN_ITEM_SHORTCUTS, TOWN_DELETE,

3
src/scenedit/scen.menus.mac.mm
View File

@@ -56,7 +56,8 @@ void init_menubar() {
eMenu::EDIT_CUT, eMenu::EDIT_COPY, eMenu::EDIT_PASTE, eMenu::EDIT_DELETE, eMenu::EDIT_SELECT_ALL, eMenu::EDIT_CUT, eMenu::EDIT_COPY, eMenu::EDIT_PASTE, eMenu::EDIT_DELETE, eMenu::EDIT_SELECT_ALL,
}; };
static const eMenu scen_choices[] = { static const eMenu scen_choices[] = {
eMenu::LAUNCH, eMenu::TOWN_CREATE, eMenu::OUT_RESIZE, eMenu::NONE, eMenu::LAUNCH_HERE, eMenu::LAUNCH_START, eMenu::LAUNCH_ENTRANCE, eMenu::NONE,
eMenu::TOWN_CREATE, eMenu::OUT_RESIZE, eMenu::NONE,
eMenu::SCEN_DETAILS, eMenu::SCEN_INTRO, eMenu::SCEN_SHEETS, eMenu::SCEN_PICS, eMenu::SCEN_SNDS, eMenu::NONE, eMenu::NONE, eMenu::SCEN_DETAILS, eMenu::SCEN_INTRO, eMenu::SCEN_SHEETS, eMenu::SCEN_PICS, eMenu::SCEN_SNDS, eMenu::NONE, eMenu::NONE,
eMenu::SCEN_SPECIALS, eMenu::SCEN_TEXT, eMenu::SCEN_JOURNALS, eMenu::TOWN_IMPORT, eMenu::OUT_IMPORT, eMenu::SCEN_SAVE_ITEM_RECTS, eMenu::SCEN_SPECIALS, eMenu::SCEN_TEXT, eMenu::SCEN_JOURNALS, eMenu::TOWN_IMPORT, eMenu::OUT_IMPORT, eMenu::SCEN_SAVE_ITEM_RECTS,
eMenu::TOWN_VARYING, eMenu::SCEN_TIMERS, eMenu::SCEN_ITEM_SHORTCUTS, eMenu::TOWN_VARYING, eMenu::SCEN_TIMERS, eMenu::SCEN_ITEM_SHORTCUTS,