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

Rework the scenario editor toolbars.

Browse Source 
* The rightmost column is now mostly dedicated to non-modifying operations – eyedropper and zoom are moved there, pushing the 3 palette buttons down in town mode.
* Set Starting Location and Set Town Boundaries moved from the menus into the toolbar.
* Place Same Creature and Place Same Monster removed, since placing a monster or creature no longer resets the mode, so you can place as many of the same one as you like.
* Erase Town Entrance removed – what is it even good for? Removing the entrance without removing the town terrain is nonsensical. A town entrance can now be erased just by painting over it.
* Copy Item, Copy Monster, and Copy Terrain added. The latter copies a rectangle of terrain.
* Paste Special is removed. Instead there's a generic Paste button which pastes whatever type of thing you copied last, whether it be a special, a monster, an item, or even some terrain.
* Horse and boat no longer share a row with road. Instead, some of the fields have been reshuffled, so now fields take up three rows (though not three complete rows)
This commit is contained in:
Celtic Minstrel
2025-03-10 22:43:46 -04:00
committed by Celtic Minstrel
parent 61c4bfdc99
commit 2fd35b1053
12 changed files with 217 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rsrc/menus/ScenEditor.rc
View File

@@ -122,12 +122,10 @@ BEGIN
BEGIN
MENUITEM "Town &Details\tCtrl+D", IDM_TOWN_DETAILS
MENUITEM "Town &Wandering Monsters", IDM_TOWN_WANDER
MENUITEM "Set Town &Boundaries", IDM_TOWN_BOUNDS
MENUITEM "&Frill Up Terrain", IDM_TOWN_FRILL
MENUITEM "&Remove Terrain Frills", IDM_TOWN_UNFRILL
MENUITEM "Edit &Area Descriptions", IDM_TOWN_AREAS
MENUITEM SEPARATOR
MENUITEM "Set Starting &Location", IDM_SCEN_START
MENUITEM "Add Rand&om Items", IDM_TOWN_RANDOM_ITEMS
MENUITEM "Set All Items Not Propert&y", IDM_TOWN_NOT_PROPERTY
MENUITEM "Clear All &Items", IDM_TOWN_CLEAR_ITEMS
@@ -149,8 +147,6 @@ BEGIN
MENUITEM "&Remove Terrain Frills", IDM_OUT_UNFRILL
MENUITEM "Edit &Area Descriptions", IDM_OUT_AREAS
MENUITEM SEPARATOR
MENUITEM "Set Starting &Location", IDM_OUT_START
MENUITEM SEPARATOR
MENUITEM "Advanced:", IDM_GRAYED_LABEL, GRAYED
MENUITEM " Edit Special &Nodes\tCtrl+7", IDM_OUT_ADV_SPECIALS
MENUITEM " Edit Outdoor &Text\tCtrl+8", IDM_OUT_ADV_TEXT

58
rsrc/menus/scenedit.xib
View File

@@ -587,14 +587,6 @@
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="787350">
<reference key="NSMenu" ref="61689393"/>
<string key="NSTitle">Set Town Boundaries</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="562756354">
<reference key="NSMenu" ref="61689393"/>
<string key="NSTitle">Frill Up Terrain</string>
@@ -629,14 +621,6 @@
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="646438288">
<reference key="NSMenu" ref="61689393"/>
<string key="NSTitle">Set Starting Location</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="1038227897">
<reference key="NSMenu" ref="61689393"/>
<string key="NSTitle">Add Random Items</string>
@@ -783,24 +767,6 @@
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="176104287">
<reference key="NSMenu" ref="784697102"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="739405725">
<reference key="NSMenu" ref="784697102"/>
<string key="NSTitle">Set Starting Location</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="910633781">
<reference key="NSMenu" ref="784697102"/>
<bool key="NSIsDisabled">YES</bool>
@@ -1326,7 +1292,6 @@
<reference ref="795424393"/>
<reference ref="562756354"/>
<reference ref="665547983"/>
<reference ref="787350"/>
<reference ref="1071553007"/>
<reference ref="861242611"/>
<reference ref="1038227897"/>
@@ -1338,7 +1303,6 @@
<reference ref="654574897"/>
<reference ref="156465632"/>
<reference ref="2020849"/>
<reference ref="646438288"/>
</array>
<reference key="parent" ref="12009264"/>
</object>
@@ -1365,8 +1329,6 @@
<reference ref="461847598"/>
<reference ref="102319515"/>
<reference ref="31942883"/>
<reference ref="176104287"/>
<reference ref="739405725"/>
<reference ref="910633781"/>
<reference ref="976110066"/>
<reference ref="913717399"/>
@@ -1475,11 +1437,6 @@
<reference key="object" ref="665547983"/>
<reference key="parent" ref="61689393"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">828</int>
<reference key="object" ref="787350"/>
<reference key="parent" ref="61689393"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">829</int>
<reference key="object" ref="1071553007"/>
@@ -1555,16 +1512,6 @@
<reference key="object" ref="31942883"/>
<reference key="parent" ref="784697102"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">844</int>
<reference key="object" ref="176104287"/>
<reference key="parent" ref="784697102"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">845</int>
<reference key="object" ref="739405725"/>
<reference key="parent" ref="784697102"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">846</int>
<reference key="object" ref="910633781"/>
@@ -1665,11 +1612,6 @@
<reference key="object" ref="327378958"/>
<reference key="parent" ref="399390342"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">805</int>
<reference key="object" ref="646438288"/>
<reference key="parent" ref="61689393"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">

4
rsrc/menus/scenresource.h
View File

@@ -11,12 +11,10 @@
#define IDM_FILE_QUIT 106
#define IDM_SCEN_NEW_TOWN 107
#define IDM_SCEN_DETAILS 108
#define IDM_SCEN_START 109
#define IDM_SCEN_ADV_SPECIALS 110
#define IDM_SCEN_ADV_TEXT 111
#define IDM_SCEN_ADV_JOURNAL 112
#define IDM_SCEN_ADV_IMPORT_TOWN 113
#define IDM_SCEN_ADV_SAVE_RECTS 114
#define IDM_SCEN_ADV_HORSES 115
#define IDM_SCEN_ADV_BOATS 116
#define IDM_SCEN_ADV_TOWN_VARY 117
@@ -29,7 +27,6 @@
#define IDM_SCEN_PASSWORD 124
#define IDM_TOWN_DETAILS 125
#define IDM_TOWN_WANDER 126
#define IDM_TOWN_BOUNDS 127
#define IDM_TOWN_FRILL 128
#define IDM_TOWN_UNFRILL 129
#define IDM_TOWN_AREAS 130
@@ -48,7 +45,6 @@
#define IDM_OUT_FRILL 143
#define IDM_OUT_UNFRILL 144
#define IDM_OUT_AREAS 145
#define IDM_OUT_START 146
#define IDM_OUT_ADV_SPECIALS 147
#define IDM_OUT_ADV_TEXT 148
#define IDM_OUT_ADV_SIGNS 149