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

Remove the Edit Saved Item Rectangles menu item in favour of a toolbar button.

Browse Source 
The limit of 3 saved item rectangles has been removed - you can now add as many as you want.
However, the 1 per town limit is now strictly enforced.

The saved item rectangle is now shown with a cyan border when editing town.
This commit is contained in:
Celtic Minstrel
2025-03-02 15:19:56 -05:00
committed by Celtic Minstrel
parent c60d151ed3
commit a1bc923de8
30 changed files with 103 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
rsrc/dialogs/edit-save-rects.xml
View File

@@ -1,46 +0,0 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
<dialog defbtn='okay'>
<!--
TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
-->
<field name='town1' top='161' left='214' width='67' height='16'/>
<field name='top1' top='161' left='293' width='39' height='16'/>
<field name='left1' top='161' left='343' width='39' height='16'/>
<field name='bottom1' top='161' left='393' width='39' height='16'/>
<field name='right1' top='161' left='443' width='39' height='16'/>
<field name='town2' top='189' left='214' width='67' height='16'/>
<field name='top2' top='189' left='293' width='39' height='16'/>
<field name='left2' top='189' left='343' width='39' height='16'/>
<field name='bottom2' top='189' left='393' width='39' height='16'/>
<field name='right2' top='189' left='443' width='39' height='16'/>
<field name='town3' top='217' left='214' width='67' height='16'/>
<field name='top3' top='217' left='293' width='39' height='16'/>
<field name='left3' top='217' left='343' width='39' height='16'/>
<field name='bottom3' top='217' left='393' width='39' height='16'/>
<field name='right3' top='217' left='443' width='39' height='16'/>
<button name='okay' type='regular' top='248' left='413'>OK</button>
<pict type='dlog' num='16' top='8' left='8'/>
<text size='large' top='6' left='50' width='256' height='44'>Save Items Rectangles</text>
<text top='25' left='50' width='438' height='53'>
There can be areas in towns where items left there are remembered,
even after the party leaves town.
Enter the numbers of the towns where items are saved (-1 means no area),
and the rectangles where the items left are remembered.
</text>
<text top='79' left='50' width='438' height='54'>
if the party leaves the given town with an item on the ground inside the given rectangle,
the item will still be there when they get back.
If the item is not inside the rectangle, it is lost.
Note that the three towns must be different.
</text>
<text top='164' left='50' width='153' height='14'>Items save rectangle 1</text>
<text top='192' left='50' width='153' height='14'>Items save rectangle 2</text>
<text top='220' left='50' width='153' height='14'>Items save rectangle 3</text>
<text top='139' left='211' width='70' height='14'>Town num.</text>
<text top='139' left='290' width='38' height='14'>Top</text>
<text top='139' left='344' width='38' height='14'>Left</text>
<text top='139' left='389' width='47' height='14'>Bottom</text>
<text top='139' left='441' width='40' height='14'>Right</text>
</dialog>

6
rsrc/dialogs/edit-town-advanced.xml
View File

@@ -66,6 +66,12 @@
<led name='tavern' relative='pos-in pos' rel-anchor='prev' font='plain' top='7' left='0'>Has a tavern</led>
<button name='prop-help' type='help' relative='neg-in pos-in' anchor='props' top='2' left='18'/>
<text name='saved-items' relative='pos-in pos' anchor='exits' top='10' left='0' width='185' height='72' framed='true'/>
<text relative='pos-in' anchor='saved-items' top='3' left='3' width='100' height='16'>Saved Item Rectangle:</text>
<text name='saved-item-rect' relative='pos-in pos' rel-anchor='prev' top='3' left='10' height='14'>(none)</text>
<button name='saved-item-delete' type='regular' relative='pos-in pos' rel-anchor='prev' top='3' left='0'>Delete</button>
<button name='saved-help' type='help' relative='neg-in pos-in' anchor='saved-items' top='2' left='18'/>
<button name='okay' relative='neg' type='regular' top='28' left='68'>OK</button>
<button name='cancel' relative='neg' type='regular' def-key='esc' top='28' left='136'>Cancel</button>
</dialog>

BIN
rsrc/graphics/edbuttons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

1
rsrc/menus/ScenEditor.rc
View File

@@ -107,7 +107,6 @@ BEGIN
MENUITEM " Advanced Scenario Details", IDM_SCEN_ADV_DETAILS
MENUITEM " &Import Town", IDM_SCEN_ADV_IMPORT_TOWN
MENUITEM " Import Outdoor Sector", IDM_SCEN_ADV_IMPORT_OUT
MENUITEM " Edit Saved Item &Rectangles", IDM_SCEN_ADV_SAVE_RECTS
MENUITEM " Set &Variable Town Entry", IDM_SCEN_ADV_TOWN_VARY
MENUITEM " Set Scenario &Event Timers", IDM_SCEN_ADV_EVENTS
MENUITEM " Edit Item &Placement Shortcuts", IDM_SCEN_ADV_SHORTCUTS

14
rsrc/menus/scenedit.xib
View File

@@ -508,14 +508,6 @@
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="580939217">
<reference key="NSMenu" ref="399390342"/>
<string key="NSTitle"> Edit Saved Item Rectangles</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
<reference key="NSMixedImage" ref="909111550"/>
</object>
<object class="NSMenuItem" id="949025402">
<reference key="NSMenu" ref="399390342"/>
<string key="NSTitle"> Set Variable Town Entry</string>
@@ -1302,7 +1294,6 @@
<reference ref="878691898"/>
<reference ref="800006778"/>
<reference ref="344591363"/>
<reference ref="580939217"/>
<reference ref="949025402"/>
<reference ref="72958416"/>
<reference ref="963208893"/>
@@ -1459,11 +1450,6 @@
<reference key="object" ref="344591363"/>
<reference key="parent" ref="399390342"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">822</int>
<reference key="object" ref="580939217"/>
<reference key="parent" ref="399390342"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">823</int>
<reference key="object" ref="949025402"/>

2
rsrc/schemas/readme.md
View File

@@ -180,7 +180,7 @@ in, as a point.
sector.
* `<on-init>` - Indicates the number of a scenario special node to call when the scenario
first starts.
* `<store-items>` - (max 3) Specifies a rectangle from which the player can retrieve items
* `<store-items>` - (max unbounded) Specifies a rectangle from which the player can retrieve items
after completing the scenario, as a rectangle with an extra `town` attribute that
specifies which town the area
* `<town-flag>` - (max 10) Specifies a rule to add the value of an SDF to a town upon

2
rsrc/schemas/scenario.xsd
View File

@@ -189,7 +189,7 @@
<xs:attributeGroup ref="point"/>
</xs:complexType>
</xs:element>
<xs:element name="store-items" minOccurs="0" maxOccurs="3">
<xs:element name="store-items" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:attributeGroup ref="rect"/>
<xs:attribute name="town" type="xs:integer" use="required"/>

2
rsrc/strings/town-advanced-help.txt
View File

@@ -3,7 +3,7 @@ Enter the number of the town special node to call if the party enters the town w
These are the locations the party ends up at outdoors if they leave in the given direction. Leave at -1 for the regular location to be used.
Miscellaneous advanced properties that can be set in a town. Alt-click an individual property for more information.
Customize the backgrounds shown behind the UI for this town.
There can be areas in towns where items left there are remembered, even after the party leaves town. Such areas are added with the Set Saved Item Rectangle tool. There can be at most one such rectangle per town.