Skip to content

Custom Graphics Tools #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NQNStudios wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Custom Graphics Tools #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1a5ae18
add image editor preference to scenedit
NQNStudios Jun 23, 2025
b4ea916
edit/reload buttons in graphic editor
NQNStudios Jun 23, 2025
a459332
MacOS find inner binary of image editor app bundle
NQNStudios Jun 23, 2025
9f7c775
allow selecting range of icons in graphics sheet
NQNStudios Jun 23, 2025
6e187a1
clear icon selection when sheet changes
NQNStudios Jun 23, 2025
0a4039c
non-mac targets scenario editor must save LastScenario pref
NQNStudios Jun 23, 2025
6a8b6b0
allow cPict to draw on any RenderTarget
NQNStudios Jun 23, 2025
70cc682
import terrain icons to custom sheets
NQNStudios Jun 23, 2025
5d052d7
strip and re-add terrain backgrounds
NQNStudios Jun 24, 2025
b29727b
refactor custom graphics dialog into a class
NQNStudios Jul 1, 2025
7889ae0
show selected icons visually
NQNStudios Jul 1, 2025
198c0a0
add function call that prevents black custom sheet canvas
NQNStudios Jul 31, 2025
4710a2a
try fix test compilation
NQNStudios Jul 31, 2025
a2f0654
Fix undo reload/import full-sheet graphic
NQNStudios Jul 31, 2025
0878388
fix updating the in-memory image for full-sheets replaced
NQNStudios Jul 31, 2025
ceac9f5
add donor to credits
NQNStudios Jul 31, 2025
304f8f2
Load image directly
NQNStudios Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/credits/Funding.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Confirmed:
- K L
- Laura Nelson
- Mariann Krizsan
- Maryanne Wachter
- Mike Lapinsky
- Nathan Rickey
- Nick Chaimov
Expand Down
9 changes: 5 additions & 4 deletions rsrc/dialogs/about-boe.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<!-- The height of this text needs to be 10 times the number of lines. -->
<text top='52' left='50' width='400' height='240'>
ORIGINAL GAME: <br/><br/><br/><br/><br/><br/>
OPEN SOURCE CREDITS: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
OPEN SOURCE CREDITS: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
SCENARIO FIXES AND UPDATES: <br/><br/>
</text>
<!-- This text is right-aligned and fills out the above text with sub-headings -->
<text top='52' left='40' width='190' height='840' align='right'>
<text top='52' left='40' width='190' height='850' align='right'>
<br/>
Concept, Design, Programming: <br/>
Graphics: <br/>
Expand All @@ -34,11 +34,11 @@
Graphics: <br/><br/><br/><br/><br/><br/><br/>
Consulting: <br/><br/><br/><br/>
Testing and Troubleshooting: <br/><br/>
Funding: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
Funding: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
<br/><br/>
Bandit Busywork: <br/>
</text>
<text top='52' left='250' width='230' height='840'>
<text top='52' left='250' width='230' height='850'>
<!-- ORIGINAL GAME --><br/>
<!-- Concept, Design, Programming -->Jeff Vogel <br/>
<!-- Graphics -->Andrew Hunter <br/>
Expand Down Expand Up @@ -99,6 +99,7 @@
K L <br/>
Laura Nelson <br/>
Mariann Krizsan <br/>
Maryanne Wachter <br/>
Mike Lapinsky <br/>
Nathan Rickey <br/>
Nick Chaimov <br/>
Expand Down
36 changes: 31 additions & 5 deletions rsrc/dialogs/graphic-sheets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,46 @@
<?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' escbtn='cancel'>
<pict type='dlog' num='16' top='6' left='6'/>
<text size='large' top='18' left='50' width='250' height='17'>Edit Custom Graphics:</text>
<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'/>

<!-- Icon grid segments -->
<tilemap name='zrows' anchor='sheet' relative='pos-in pos-in' top='0' left='0' rows='11' cols='10' framed='false'>
<line name='zrow' left='0' top='0' width='28' height='0'/>
<text height='36' left='0' top='0' />
</tilemap>
<tilemap name='zcols' anchor='sheet' relative='pos-in pos-in' top='0' left='0' rows='10' cols='11' framed='false'>
<line name='zcol' left='0' top='0' width='0' height='36'/>
<text width='28' left='0' top='0' />
</tilemap>

<!-- Whole-sheet operations -->
<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='paste' type='regular' def-key='ctrl v' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Paste</button>
<button name='edit' type='regular' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Edit</button>
<button name='reload' type='regular' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Reload</button>
<button name='open' type='regular' def-key='ctrl o' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Import</button>
<button name='save' type='regular' def-key='ctrl s' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Export</button>
<button name='del' type='regular' def-key='ctrl x' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Delete</button>

<!-- Icon operations -->
<text name='icon-head' relative='pos-in pos' rel-anchor='prev' top='5' left='0'>Selected icons:</text>
<text name='icon-min' relative='pos-in pos' rel-anchor='prev' top='2' left='0' width='30' framed='true'>0</text>
<text relative='pos pos-in' rel-anchor='prev' top='0' left='0'>-</text>
<text name='icon-max' relative='pos pos-in' rel-anchor='prev' top='0' left='0' width='30' framed='true'>0</text>

<button name='icon-terr' type='tiny' text-size='9' relative='pos-in pos' anchor='icon-min' top='2' left='0'>Import Terrain</button>
<button name='strip-terr' type='tiny' text-size='9' relative='pos-in pos' rel-anchor='prev' top='2' left='0'>Strip Terrain Background</button>
<field name='diff-threshold' relative='pos-in pos' rel-anchor='prev' top='2' left='0' width='40' height='12' type='uint'>0</field>
<button name='add-terr' type='tiny' text-size='9' relative='pos-in pos' rel-anchor='prev' top='2' left='0'>Add Terrain Background</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' def-key='ctrl n' top='426' left='162'>New</button>

<button name='cancel' type='regular' top='426' left='239'>Cancel</button>
<button name='okay' type='regular' top='426' left='304'>OK</button>
</dialog>
18 changes: 11 additions & 7 deletions rsrc/dialogs/pref-scenario.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,23 @@
<led name='nosound' relative='pos-in pos' rel-anchor='prev' top='10' left='0'>No UI Sounds</led>
<text name='scale-head' size='large' relative='neg pos' rel-anchor='prev' top='17' left='10' width='260' height='17'>Scale UI:</text>
<group name='scaleui'>
<led name='1' relative='pos-in pos' anchor='scale-head' top='4' left='15'>1</led>
<led name='1_5' relative='pos-in pos' anchor='scale-head' top='4' left='55'>1.5</led>
<led name='2' relative='pos-in pos' anchor='scale-head' top='4' left='95'>2</led>
<led name='3' relative='pos-in pos' anchor='scale-head' top='4' left='135'>3</led>
<led name='4' relative='pos-in pos' anchor='scale-head' top='4' left='175'>4</led>
<led name='other' relative='pos-in pos' anchor='scale-head' top='4' left='215'/>
<led name='1' relative='neg pos' anchor='scale-head' top='4' left='20'>1</led>
<led name='1_5' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>1.5</led>
<led name='2' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>2</led>
<led name='3' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>3</led>
<led name='4' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>4</led>
<led name='other' relative='pos pos-in' rel-anchor='prev' top='0' left='3'/>
</group>

<text name='debug-party-head' size='large' relative='pos pos-in' anchor='nosound' top='0' left='50'>Debug Party:</text>
<field name='party-path' type='text' relative='neg-in neg' rel-anchor='prev' top='2' left='5' width='100' height='15'/>
<button name='choose-party' relative='pos neg' rel-anchor='prev' type='regular' top='3' left='2'>Choose</button>
<led name='force-default-party' relative='pos-in pos' anchor='debug-party-head' top='2' left='0'>Force default party (ignore above)</led>

<button name='okay' relative='abs pos' anchor='scale-head' type='regular' top='7' left='354'>OK</button>
<text name='image-editor-head' size='large' relative='pos-in pos-in' anchor='force-default-party' top='30' left='0'>Image Editor:</text>
<field name='image-editor' type='text' relative='neg-in neg' rel-anchor='prev' top='2' left='5' width='100' height='15'/>
<button name='choose-image-editor' relative='pos neg' rel-anchor='prev' type='regular' top='3' left='2'>Choose</button>

<button name='okay' relative='abs pos' anchor='scale-head' type='regular' top='37' left='354'>OK</button>
<button name='cancel' relative='neg pos-in' anchor='okay' type='regular' top='0' left='73'>Cancel</button>
</dialog>
Binary file modified rsrc/graphics/startanim.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading