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

Remove key-mod attribute from dialog schema

Browse Source 
- Modifiers are now given in the def-key attribute, as originally intended
- Dialogs that have a help button now assign F1 to that button (replacing shift+/ in some cases)
- F1 also brings up help in the main game (in addition to shift+/)
This commit is contained in:
Celtic Minstrel
2015-10-03 00:53:32 -04:00
parent edaf3baa2d
commit 03bc3d05e6
12 changed files with 46 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rsrc/dialogs/cast-spell.xml
View File

@@ -13,12 +13,12 @@
<!--
TODO: Use the <key/> element here.
-->
<button name='target1' type='small' def-key='1' key-mod='shift' top='82' left='235'>!</button>
<button name='target2' type='small' def-key='2' key-mod='shift' top='106' left='235'>@</button>
<button name='target3' type='small' def-key='3' key-mod='shift' top='130' left='235'>#</button>
<button name='target4' type='small' def-key='4' key-mod='shift' top='154' left='235'>$</button>
<button name='target5' type='small' def-key='5' key-mod='shift' top='178' left='235'>%</button>
<button name='target6' type='small' def-key='6' key-mod='shift' top='202' left='235'>^</button>
<button name='target1' type='small' def-key='shift 1' top='82' left='235'>!</button>
<button name='target2' type='small' def-key='shift 2' top='106' left='235'>@</button>
<button name='target3' type='small' def-key='shift 3' top='130' left='235'>#</button>
<button name='target4' type='small' def-key='shift 4' top='154' left='235'>$</button>
<button name='target5' type='small' def-key='shift 5' top='178' left='235'>%</button>
<button name='target6' type='small' def-key='shift 6' top='202' left='235'>^</button>
<button name='cancel' type='regular' def-key='esc' top='394' left='479'>Cancel</button>
<button name='cast' type='regular' top='394' left='549'>Cast</button>
<text name='pc1' top='84' left='88' width='122' height='16'/>
@@ -92,7 +92,7 @@
key by spell to cast spell.
Option-click spell name for description.
</text>
<button name='help' type='help' def-key='/' key-mod='shift' top='6' left='596'/>
<button name='help' type='help' def-key='help' top='6' left='596'/>
<text name='col1' top='227' left='10' width='100' height='16'/>
<text name='col2' top='227' left='162' width='100' height='16'/>
<text name='col3' top='227' left='326' width='100' height='16'/>

2
rsrc/dialogs/edit-party.xml
View File

@@ -45,7 +45,7 @@
<button name='pic4' type='tall' top='185' left='455'>Graphic</button>
<button name='pic5' type='tall' top='230' left='455'>Graphic</button>
<button name='pic6' type='tall' top='275' left='455'>Graphic</button>
<button name='help' type='help' def-key='/' key-mod='shift' top='4' left='498'/>
<button name='help' type='help' def-key='help' top='4' left='498'/>
<pict name='pc1' type='pc' num='0' top='52' left='12'/>
<pict name='pc2' type='pc' num='0' top='97' left='12'/>
<pict name='pc3' type='pc' num='0' top='142' left='12'/>

2
rsrc/dialogs/edit-special-node.xml
View File

@@ -24,7 +24,7 @@
<text size='large' top='28' left='50' width='158' height='16'>Special Type:</text>
<text name='type' framed='true' top='28' left='214' width='187' height='16'/>
<button name='node-help' type='help' top='28' left='410'/>
<button name='node-help' type='help' def-key='help' top='28' left='410'/>
<text size='large' top='102' left='8' width='158' height='16'>Stuff Done Flags:</text>

2
rsrc/dialogs/edit-terrain.xml
View File

@@ -105,5 +105,5 @@
<button name='left' type='left' top='455' left='11'/>
<button name='right' type='right' top='455' left='74'/>
<text top='7' left='431' height='50' width='157'>Enter properties for this terrain type. For a detailed description of the fields, see the documentation.</text>
<button name='help' type='help' def-key='/' key-mod='shift' top='5' left='588'/>
<button name='help' type='help' def-key='help' top='5' left='588'/>
</dialog>

12
rsrc/dialogs/graphic-sheets.xml
View File

@@ -6,14 +6,14 @@
<text top='36' left='152' width='80' height='16'>Sheet Number:</text>
<text name='num' top='36' left='242' width='40' height='16'/>
<pict name='sheet' framed='true' scaled='true' type='full' num='0' top='54' left='12' width='280' height='360'/>
<button name='copy' type='regular' key-mod='ctrl' def-key='c' top='54' left='304'>Copy</button>
<button name='paste' type='regular' key-mod='ctrl' def-key='v' top='80' left='304'>Paste</button>
<button name='open' type='regular' key-mod='ctrl' def-key='o' top='106' left='304'>Import</button>
<button name='save' type='regular' key-mod='ctrl' def-key='s' top='132' left='304'>Export</button>
<button name='del' type='regular' key-mod='ctrl' def-key='x' top='158' left='304'>Delete</button>
<button name='copy' type='regular' def-key='ctrl c' top='54' left='304'>Copy</button>
<button name='paste' type='regular' def-key='ctrl v' top='80' left='304'>Paste</button>
<button name='open' type='regular' def-key='ctrl o' top='106' left='304'>Import</button>
<button name='save' type='regular' def-key='ctrl s' top='132' left='304'>Export</button>
<button name='del' type='regular' def-key='ctrl x' top='158' left='304'>Delete</button>
<button name='left' type='left' def-key='left' top='426' left='20'/>
<button name='right' type='right' def-key='right' top='426' left='85'/>
<button name='new' type='regular' key-mod='ctrl' def-key='n' top='426' left='162'>New</button>
<button name='new' type='regular' def-key='ctrl n' top='426' left='162'>New</button>
<button name='cancel' type='regular' def-key='esc' top='426' left='239'>Cancel</button>
<button name='okay' type='regular' top='426' left='304'>OK</button>
</dialog>

2
rsrc/dialogs/pick-potion.xml
View File

@@ -55,5 +55,5 @@
<text name='label19' framed='true' top='259' left='311' width='160' height='16'/>
<button name='potion20' type='small' top='280' left='278'>20</button>
<text name='label20' framed='true' top='282' left='311' width='160' height='16'/>
<button name='help' type='help' top='8' left='448'/>
<button name='help' type='help' def-key='help' top='8' left='448'/>
</dialog>

2
rsrc/dialogs/spend-xp.xml
View File

@@ -89,5 +89,5 @@
<text top='365' left='6' width='382' height='16'>Cost: (Skill pts./Gold) Option-click for description</text>
<text top='344' left='71' width='68' height='16'>Skill Pts.:</text>
<text top='344' left='252' width='42' height='16'>Gold:</text>
<button name='help' type='help' def-key='/' key-mod='shift' top='6' left='506'/>
<button name='help' type='help' def-key='help' top='6' left='506'/>
</dialog>

70
rsrc/schemas/dialog.xsd
View File

@@ -41,64 +41,7 @@
<xs:union>
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="0"/>
<xs:enumeration value="1"/>
<xs:enumeration value="2"/>
<xs:enumeration value="3"/>
<xs:enumeration value="4"/>
<xs:enumeration value="5"/>
<xs:enumeration value="6"/>
<xs:enumeration value="7"/>
<xs:enumeration value="8"/>
<xs:enumeration value="9"/>
<xs:enumeration value="a"/>
<xs:enumeration value="b"/>
<xs:enumeration value="c"/>
<xs:enumeration value="d"/>
<xs:enumeration value="e"/>
<xs:enumeration value="f"/>
<xs:enumeration value="g"/>
<xs:enumeration value="h"/>
<xs:enumeration value="i"/>
<xs:enumeration value="j"/>
<xs:enumeration value="k"/>
<xs:enumeration value="l"/>
<xs:enumeration value="m"/>
<xs:enumeration value="n"/>
<xs:enumeration value="o"/>
<xs:enumeration value="p"/>
<xs:enumeration value="q"/>
<xs:enumeration value="r"/>
<xs:enumeration value="s"/>
<xs:enumeration value="t"/>
<xs:enumeration value="u"/>
<xs:enumeration value="v"/>
<xs:enumeration value="w"/>
<xs:enumeration value="x"/>
<xs:enumeration value="y"/>
<xs:enumeration value="z"/>
<xs:enumeration value="`"/>
<xs:enumeration value="-"/>
<xs:enumeration value="="/>
<xs:enumeration value="["/>
<xs:enumeration value="]"/>
<xs:enumeration value="\"/>
<xs:enumeration value=";"/>
<xs:enumeration value="'"/>
<xs:enumeration value=","/>
<xs:enumeration value="."/>
<xs:enumeration value="/"/>
<xs:enumeration value="left"/>
<xs:enumeration value="right"/>
<xs:enumeration value="up"/>
<xs:enumeration value="down"/>
<xs:enumeration value="esc"/>
<xs:enumeration value="enter"/>
<xs:enumeration value="return"/>
<xs:enumeration value="tab"/>
<xs:enumeration value="help"/>
<xs:enumeration value="space"/>
<xs:enumeration value="none"/>
<xs:pattern value="(ctrl +|alt +|shift +)*(\d|[a-z`=;',./-]|\[|\]|\\|left|right|up|down|esc|enter|return|tab|help|space)|none"/>
</xs:restriction>
</xs:simpleType>
</xs:union>
@@ -126,10 +69,7 @@
<xs:attribute name="width" type="xs:integer"/>
<xs:attribute name="height" type="xs:integer"/>
</xs:attributeGroup>
<xs:attributeGroup name="keys">
<xs:attribute name="def-key" type="key"/>
<xs:attribute name="key-mod" type="mod"/>
</xs:attributeGroup>
<xs:attribute name="def-key" type="key"/>
<xs:attributeGroup name="font">
<xs:attribute name="font" default="bold">
<xs:simpleType>
@@ -184,7 +124,7 @@
<xs:attribute name="name" type="xs:token"/>
<xs:attribute name="framed" default="false" type="bool"/>
<xs:attributeGroup ref="font"/>
<xs:attributeGroup ref="keys"/>
<xs:attribute ref="def-key"/>
<xs:attribute name="clickable" default="false" type="bool"/>
<xs:attribute name="fromlist" default="none" type="xs:string"/>
<xs:attributeGroup ref="rect-size"/>
@@ -207,7 +147,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attributeGroup ref="keys"/>
<xs:attribute ref="def-key"/>
<xs:attribute name="clickable" default="false" type="bool"/>
<xs:attribute name="num" use="required" type="xs:integer"/>
<xs:attributeGroup ref="rect-size"/>
@@ -223,7 +163,7 @@
<xs:attribute name="name" use="required" type="xs:token"/>
<xs:attribute name="type" use="required" type="btntype"/>
<xs:attribute name="wrap" default="false" type="bool"/>
<xs:attributeGroup ref="keys"/>
<xs:attribute ref="def-key"/>
<xs:attribute name="fromlist" default="none" type="xs:string"/>
<xs:attributeGroup ref="rect-size"/>
</xs:complexType>