Myk Taylor
8c7be9a8c2
don't use negative plant indices
...
and clean up the Kitchen module a bit more
2023-02-02 23:33:24 -08:00
Myk
21f93173c3
Merge pull request #2778 from myk002/myk_halfsies
...
support offset text in graphics mode for pens
2023-02-01 17:50:24 -08:00
Myk
7468170751
Merge pull request #2771 from myk002/myk_seedwatch
...
update seedwatch
2023-02-01 17:49:57 -08:00
Myk Taylor
58be8cfd69
support offset text in graphics mode for pens
2023-02-01 17:39:32 -08:00
Myk Taylor
be40d55e64
update seedwatch
2023-02-01 04:03:28 -08:00
Myk Taylor
aa22917aeb
add new control panel textures
2023-01-31 23:52:30 -08:00
Myk
376526d512
Merge branch 'develop' into myk_no_stuck_df_viewscreens
2023-01-29 16:55:52 -08:00
Myk
274e995790
Merge pull request #2747 from myk002/myk_on_off
...
Add new on/off icons
2023-01-29 16:55:01 -08:00
Myk Taylor
1c6235633f
add dfhack.units.getCitizens()
2023-01-29 16:28:05 -08:00
Myk Taylor
c2d6debcd8
add on/off light textures and expose to lua
2023-01-29 00:35:29 -08:00
Myk
2003efc21f
Merge branch 'develop' into myk_no_stuck_df_viewscreens
2023-01-28 12:03:50 -08:00
Myk
99d1ed6828
Merge branch 'develop' into myk_no_inception
2023-01-28 11:58:37 -08:00
Myk Taylor
a931ca692d
Fix debug level typo
2023-01-28 08:21:13 -08:00
Myk Taylor
f12ca33c0b
ensure DF screens don't get "stuck" when DFHack tool windows are on top
2023-01-28 08:05:37 -08:00
Myk Taylor
863ca2ca65
solve the inception problem
...
where hideGuard smashes the viewscreen stack with multiple insertions
for the same screen
2023-01-28 08:02:46 -08:00
Myk Taylor
22dd49ce38
remove "room" checking for buildings -- there is no room
2023-01-27 13:38:21 -08:00
Myk Taylor
9aaa55cd7f
add textures and frames for various use cases
2023-01-23 03:58:51 -08:00
Myk
d82a795ef4
Merge pull request #2681 from 20k/develop
...
More civzone <-> building work, add removing zones with associated squads support
2023-01-22 17:14:24 -08:00
20k
4559168005
update for multiple ownership
2023-01-22 22:59:25 +00:00
20k
b15fcc93d2
remove assignments on zone destroy
2023-01-22 15:26:55 +00:00
20k
c7ca9d0d7b
reverse squad iteration delete
2023-01-22 15:25:16 +00:00
20k
598354d9d4
getbiometype naming, docs
2023-01-21 20:33:40 +00:00
20k
9054efd7c8
Update miscutils to support member pointer to a variable defined in the base when passing in a derived type
2023-01-21 19:15:28 +00:00
20k
3024c4a0df
update to remove ambiguity after structures change
2023-01-21 18:45:36 +00:00
20k
1dbf01e5d1
Civzone interop style changes
2023-01-21 18:45:36 +00:00
20k
8c68f54f50
update with squad removal support
2023-01-21 18:45:36 +00:00
Myk
310940e1a2
Merge branch 'develop' into Autoclothing
2023-01-20 14:05:26 -08:00
Rose
8e6252fc2b
Small fixes to make things more clean.
2023-01-20 13:45:56 -08:00
Myk Taylor
25c3bf4a24
adjust to name change
2023-01-20 11:57:13 -08:00
Myk Taylor
eae2cec22f
use keyboard cursor
...
and adapt to a "bad" cursor not being equal to -30000 anymore
2023-01-20 09:31:44 -08:00
Myk Taylor
4183bace4d
update autodump, only commands, add hotkeys
2023-01-20 09:31:44 -08:00
Myk
d201cf0182
Merge pull request #2662 from 20k/develop
...
Zone <-> building interactions
2023-01-20 09:30:52 -08:00
20k
4d9c411358
fix flag
2023-01-19 23:33:03 +00:00
20k
8b7c8d83b5
remove save fixup
...
Add notifyCivzoneModified
2023-01-19 21:55:20 +00:00
cjhammel
c05b7526b1
Update Units.cpp
...
fixes renamed value
2023-01-19 15:12:24 -05:00
20k
d5610ab859
zone <-> building interop
2023-01-19 16:39:41 +00:00
Rose
f9ac987367
Added bounds checking to various creature name functions in the Units module.
2023-01-18 20:52:58 -08:00
Rose
0e021e392d
Added a report to autoclothing, as well as some changes to DFHack::Units to enable it.
2023-01-13 21:20:01 -08:00
Myk Taylor
ac06508d92
add some more icon textures we can use
...
contributed by TaxiService on the DFHack Discord server
2023-01-12 21:04:41 -08:00
Myk Taylor
15998f2ebe
add gui.TRANSPARENT_PEN for clearing the UI layer
2023-01-12 12:44:50 -08:00
Myk Taylor
079d5e4178
support foreground and background writing from pens
2023-01-12 12:30:07 -08:00
Myk Taylor
1d0f6b3a95
more careful bounds checking for screen tiles
2023-01-10 19:40:13 -08:00
Myk Taylor
353117d484
fix a crash in Screen when read or paint tile indices are negative
2023-01-10 19:05:04 -08:00
Myk
c26ed36893
Merge pull request #2577 from myk002/myk_get_any
...
get rudimentary getAny(Unit|Item|Building) working
2023-01-09 23:50:02 -08:00
Myk Taylor
f8728a4388
get rudimentary getAny(Unit|Item|Building) working
2023-01-09 01:39:48 -08:00
Myk Taylor
2234328a91
use an actual pin texture for ZScreen pins
2023-01-09 00:47:13 -08:00
Myk Taylor
92489ef27d
get things to compile with the recent structure updates
2023-01-08 11:33:14 -08:00
Kelly Kinkade
3e4861b54b
fix persistence for changed file structure
...
`data/save` -> `save`
2023-01-06 21:24:01 -06:00
Myk Taylor
6f46ae672e
add Gui::getDFViewscreen and Lua binding
2023-01-06 12:17:36 -08:00
Myk Taylor
1934014659
framework for passthru, z-order swapping windows
2023-01-05 18:07:38 -08:00
Myk Taylor
845391f4e6
fix overzealous "ui" -> "plotinfo" replacement
...
some comments were just talking about the UI..
2023-01-05 17:46:30 -08:00
Myk Taylor
5e5775f5e3
rename globals according to structures update
2023-01-05 17:11:01 -08:00
Myk Taylor
412531bf03
really fix the format string this time
2023-01-04 21:29:45 -08:00
Myk Taylor
9cbcd81f63
fix format strings for vars that were size_t
2023-01-04 21:24:52 -08:00
Myk Taylor
4e51e02924
move SDL shims to a new DFSDL module
2023-01-04 17:15:32 -08:00
Myk Taylor
5d04b9c4cb
add Textures module and load DFHack logo
...
undocumented for now since it's internal. in the future, perhaps this
could morph into a dynamic texture loading facility for tools
2023-01-04 13:30:18 -08:00
Myk
6361b0a3a4
Merge pull request #2543 from myk002/myk_prep_for_quietust
...
prep for Quietust's structure updates
2023-01-02 20:42:48 -08:00
Myk
35ce361b09
Merge pull request #2542 from myk002/myk_dwarfmode_dims
...
clear out obsolete area map and menu logic from the Gui module
2023-01-02 20:42:30 -08:00
Myk Taylor
218fbdbd45
prep for Quietust's structure updates
2023-01-01 01:03:42 -08:00
Myk Taylor
aa091ed37e
overwrite anchored textures where we actually touch their anchor
2023-01-01 00:45:14 -08:00
Myk Taylor
7d5d2d0a9b
clear out obsolete area map and menu logic
...
in particular, return the correct map dimensions in getDwarfmodeDims()
2022-12-31 22:49:30 -08:00
Myk Taylor
a6294c24fb
implement Screen::paintTile and readTile
2022-12-31 21:16:42 -08:00
Myk Taylor
7d91f9262d
respect tile colors in pens
2022-12-30 05:36:41 -08:00
Myk Taylor
83a8e9a45a
render bright colors correctly
2022-12-30 03:30:01 -08:00
Myk Taylor
1265d531d5
only keep the anchor flag if it's already there
2022-12-30 00:53:44 -08:00
Myk Taylor
f45eac993a
use semantically clearer div rather than bit shift
2022-12-29 22:18:35 -08:00
Myk Taylor
a4c11de4fb
returns correct mouse pos when in ascii
2022-12-29 00:01:40 -08:00
Myk Taylor
371f5be050
fix signedness of comparison var
2022-12-28 23:31:06 -08:00
Myk Taylor
07f8fad787
implement Gui::getMousePos and Gui::getDepthAt
2022-12-28 16:00:10 -08:00
Myk Taylor
e2a4eeb422
write textures and chars to the map
2022-12-27 17:00:50 -08:00
Myk Taylor
033eb2aefd
use default background colors
...
and ensure texpos_lower doesn't peek through
2022-12-27 15:05:13 -08:00
Myk Taylor
69c9e3ffb7
render tiles if given in the pen; otherwise text
...
this commit also smooths out many conflicts with other layers, but the
anchor layer still gives us trouble. it will overwrite us unless we
cover the upper left tile of the anchor graphic, and then the entire
anchor graphic will disappear. not ideal, but it's a start
2022-12-27 14:39:03 -08:00
lethosor
12804a10a6
Fix Gui/Screen to work with g_src changes ( dfhack/df-structures#487 )
2022-12-23 00:36:09 -05:00
Myk Taylor
52c1e49197
get the text rendering back
2022-12-21 22:13:05 -08:00
Myk Taylor
48a9e1c518
more new var names
2022-12-22 05:16:40 +00:00
Myk Taylor
93c875fb56
adjust to new variable names
2022-12-21 14:07:36 -08:00
Myk Taylor
839e927f9b
comment out problematic code from Renderer
2022-12-21 14:06:58 -08:00
Myk Taylor
010b18c0e4
hide "offset" tiles that we occlude
2022-12-20 20:10:14 -08:00
Myk Taylor
663e1dd541
ascii is now in color
2022-12-20 16:33:11 -08:00
Myk Taylor
d7f51e5ed8
basic text drawing
2022-12-20 11:00:49 -08:00
Myk Taylor
7f91cf6e2a
more instrumentation for eventmanager
2022-12-20 09:49:35 -08:00
Myk Taylor
999d602e79
instrument eventmanager a bit
2022-12-19 13:43:57 -08:00
Kelly Kinkade
57e599a4d9
comment out barracks reference
...
barracks appears to have gone away in 50.03
2022-12-17 13:07:37 -06:00
Myk Taylor
5cd60e10f0
comment out problematic code in Gui.cpp
2022-12-16 14:47:43 -06:00
Myk Taylor
768c95ecb6
absorb Putnam's work on Screen
2022-12-16 14:47:43 -06:00
Myk Taylor
ccc9e976e2
comment out problematic code in Screen.cpp
2022-12-16 14:47:43 -06:00
Myk Taylor
55351951f0
comment out problematic code in Items.cpp
2022-12-16 14:47:43 -06:00
Myk Taylor
93b8479e94
comment out problematic code in Buildings.cpp
2022-12-16 14:47:43 -06:00
Myk Taylor
6c562a3fed
fix apparent typo in Materials scanning
2022-12-09 09:21:50 -08:00
Tachytaenius
0836962007
Rename [xyz]CategoryActionTimers to [xyz]GroupActionTimers in action timer API
2022-12-01 23:24:04 +00:00
Tachytaenius
ae532e1452
Rename affectedActionTypeCategory to affectedActionTypeGroup in action timer API
2022-12-01 23:22:02 +00:00
Tachytaenius
76cdbfbc5c
Rename affectedActionCategory to affectedActionTypeCategory in action timer API
2022-12-01 23:19:10 +00:00
Tachytaenius
f06f17b59c
Rename affectedActionTypes to affectedActionCategory in action timer API
2022-12-01 23:17:57 +00:00
Tachytaenius
aa2cf44c4b
Use lambdas to violate DRY less in action timer API
2022-12-01 13:34:54 +00:00
Tachytaenius
a925c34413
Rename [xyz]ActionTimer functions to [xyz]ActionTimers
2022-12-01 13:34:54 +00:00
Tachytaenius
f863b9807a
Add action timer API input validation
2022-12-01 13:34:54 +00:00
Tachytaenius
cc40b80456
Protect against integer overflow when subtracting with action timer API
2022-12-01 13:34:54 +00:00
Tachytaenius
6148307e9b
Change != 0 to > 0 in action timer API core functions
2022-12-01 13:34:54 +00:00
Tachytaenius
5e0c0d22cb
Group action timer API internal functions together
2022-12-01 13:34:54 +00:00
Tachytaenius
e93d7eefb3
Factor out set and add shared action timer code into own functions
2022-12-01 13:34:54 +00:00