shevernitskiy
91f4c3d561
mirgate preloaded assets to lua
2023-08-14 08:17:57 +03:00
shevernitskiy
1409af67de
expose api to lua
2023-08-13 20:09:12 +03:00
Myk
71e5901214
Merge pull request #3672 from myk002/myk_gui
...
[orders] prevent overlay from appearing on the new workorder page
2023-08-12 23:21:13 -07:00
shevernitskiy
22b0671038
review 2
2023-08-13 08:33:31 +03:00
Myk Taylor
b787c2bb1e
make creating a workorder a subscreen instead of a top-level
2023-08-12 22:02:17 -07:00
Myk Taylor
c37dce7c33
detect extended tile properties and communicate them back to lua
2023-08-12 15:53:22 -07:00
shevernitskiy
687bd82542
pathable & unsuspend specific tile size
2023-08-12 20:05:15 +03:00
shevernitskiy
fe8bd4fa78
assets use dynamic texture loading
2023-08-12 16:11:42 +03:00
Myk Taylor
8d8c139ccb
don't add keys as text when ctrl or alt are pressed
2023-08-11 12:54:49 -07:00
shevernitskiy
e81a90821a
review
2023-08-11 21:40:41 +03:00
shevernitskiy
4bbcc7b05d
eof fix
2023-08-11 09:48:03 +03:00
shevernitskiy
e21f0f2b69
dynamic texture loading
2023-08-11 09:14:05 +03:00
Myk Taylor
03edea8257
add focus string support for legends mode
2023-08-07 02:50:37 -07:00
Myk Taylor
db48e0eba0
remove caravan_buying param from getValue call
...
the identity of the selling party doesn't actually affect the value!
2023-08-06 17:38:34 -07:00
lethosor
eb12ff17f6
Refactor: move static identity_traits to their own file, simplify field defs
...
DataStaticsFields.cpp used to contain identity_traits specializations for
primitive and opaque STL types, as well as macros used for the generated struct
field definitions. Only one of these were actually used in any compilation unit,
and the identity_traits definitions were hidden behind a guard to prevent them
from being compiled at all when building the struct field definitions.
Now, the identity_traits specializations live in their own file,
DataIdentity.cpp (matching their declarations, which live in DataIdentity.h).
This speeds up build times because modifying these specializations no longer
requires rebuilding all of the field definitions unnecessarily.
2023-08-02 00:15:26 -04:00
lethosor
9f168214dd
Merge remote-tracking branch 'lethosor/fix-textures-cleanup-segfault' into develop
2023-08-01 00:35:19 -04:00
lethosor
e2ca506e23
Fix off-by-one error in Textures::cleanup()
...
In a ASCII-only configuration, I was seeing `textures.raws.size() == 164` and
`texpos_end == 164`. This resulted in reading one item past the end of the
vector.
This may not be occurring in configurations with graphics enabled, or
Windows/WINE may be more permissive.
2023-08-01 00:13:09 -04:00
lethosor
e55984c529
Fix startup crashes when global addresses are missing
...
Useful for initial research. Can be tested with `DFHACK_NO_GLOBALS=1`
2023-08-01 00:05:02 -04:00
Myk Taylor
77d0fb297c
convert tabs to spaces when getting clipboard text
...
this avoids tab characters being translated to "?" when converted to
cp437
2023-07-21 15:03:06 -07:00
Myk Taylor
dff4816287
update dwarfvet
2023-07-21 04:12:56 -07:00
Myk Taylor
0d81f5ce6e
don't include dead citizens in the citizens list
2023-07-18 23:09:19 -07:00
Myk
2cd226d879
Merge pull request #3566 from myk002/myk_pasture
...
[zone] initial implementation of pasture assignment screen
2023-07-16 14:36:57 -07:00
Myk Taylor
5fb299c6df
expand egg-laying filter to the entire race, not just the unit
2023-07-16 12:30:12 -07:00
Myk Taylor
39612f0d5a
trade a bin if any contents can be traded
...
the new trade screens will make it easy to filter out unwanted items
later
2023-07-16 12:15:51 -07:00
Kelly Kinkade
1fba8b16f5
replace `dts:make_unique` with `std::make_unique`
...
2014 here we come!
2023-07-07 21:38:15 -05:00
Myk Taylor
6a8522ab5e
generalize dfhack.items.isRequestedTradeGood
2023-07-06 03:27:05 -07:00
Myk Taylor
b938891e11
add dfhack.items.isRequestedTradeGood
2023-07-06 03:24:36 -07:00
Myk Taylor
c45dcdd7b0
implement sell_prices adjustments
2023-07-06 03:24:16 -07:00
Myk Taylor
2aeb86ba8f
implement trade agreement buy prices
2023-07-06 03:24:16 -07:00
Myk Taylor
c2e647b79b
fix item prices and algorithm
...
adjust prices according to race WAR affinity
2023-07-06 03:24:15 -07:00
Myk Taylor
9849885df6
Revert "generalize dfhack.items.isRequestedTradeGood"
...
This reverts commit aa6d28bab6
.
2023-07-06 03:23:17 -07:00
Myk Taylor
aa6d28bab6
generalize dfhack.items.isRequestedTradeGood
2023-07-06 03:21:36 -07:00
Myk
79dbcf0461
Merge pull request #3524 from myk002/myk_copypaste
...
support copy/paste from system clipboard
2023-07-05 23:09:08 -07:00
Myk
785405b281
Update DFSDL.cpp
2023-07-05 22:34:25 -07:00
Myk
50b3cecfcf
Merge pull request #3481 from myk002/myk_cpp20
...
get compiling with c++-20
2023-07-05 22:28:59 -07:00
Myk
c25b6e642e
Merge pull request #3533 from myk002/myk_noble
...
port API for unit lookup by noble role from quickfort
2023-07-05 19:34:29 -07:00
Myk Taylor
c587cad471
generalize to civ roles as well
2023-07-05 17:37:49 -07:00
Myk
8e7d7fefc0
Merge pull request #3527 from myk002/myk_no_extra_keys
...
filter out spurious STRING keybindings
2023-07-05 12:10:51 -07:00
Myk Taylor
43ea9b94c3
move clipboard wrappers into DFSDL module (but not in the namespace)
2023-07-05 12:08:18 -07:00
Myk Taylor
125e4c623b
avoid inducing link dependency on dfhack
2023-07-05 11:07:51 -07:00
Myk Taylor
cbdb56a1ac
port API for unit lookup by noble role from quickfort
2023-07-03 13:47:43 -07:00
Myk Taylor
f111b69f2f
Merge branch 'develop' into myk_cpp20
2023-07-03 11:49:54 -07:00
Myk Taylor
9ca96567a5
move conversion logic to MiscUtils
...
but keep minimal wrappers in SDL module so we don't leak memory
2023-07-03 11:05:58 -07:00
Myk Taylor
fdf2430fc4
filter out spurious STRING keybindings
...
that don't match actual SDL string input
2023-07-03 09:09:52 -07:00
Myk Taylor
c660a12502
differentiate between choosing merchant screen and default trade screen
2023-07-02 19:09:15 -07:00
Myk Taylor
d39440d33b
migrate markForTrade logic from logistics to core
2023-07-02 19:05:50 -07:00
Myk Taylor
acd03486a9
add some more detail to the focus strings for buildings
2023-07-02 19:05:50 -07:00
Myk Taylor
175c249d29
support copy/paste from system clipboard
2023-07-02 18:04:06 -07:00
Myk Taylor
e308d3204a
Merge branch 'develop' into sdl2
2023-06-26 16:04:50 -07:00
Myk Taylor
b5f4cef187
differentiate trade request screen from other diplomacy screens
2023-06-26 02:29:36 -07:00
Myk Taylor
8235680ff0
add unsuspend map textures
2023-06-25 18:40:04 -07:00
Myk Taylor
78448f438d
don't leak warning suppression out of protobuf
2023-06-25 17:53:16 -07:00
Myk
b958727655
Update Textures.cpp
2023-06-23 14:36:26 -07:00
Myk Taylor
f7bef53b42
prefer symbols to descriptions for hotkey names
2023-06-23 14:36:18 -07:00
Myk Taylor
840a2b3525
ensure DFHack screens get all string input
2023-06-23 14:36:18 -07:00
Taxi Service
3e2940ef8f
attempt to set optional tilesize arguments for load_texture()
2023-06-23 14:35:45 -07:00
Myk Taylor
52151b0e98
remove SDL functions that don't exist anymore
2023-06-23 14:31:14 -07:00
Myk Taylor
4e48ce64f1
get things mostly ported to SDL2
2023-06-23 14:31:12 -07:00
Myk Taylor
b571e5b52b
don't diplay orders overlay on subscreens
2023-06-19 16:48:07 -07:00
Myk Taylor
8a079e1ae7
get compiling on windows
2023-06-17 22:14:11 -07:00
Myk Taylor
2efef75b4e
re-constify
2023-06-17 10:46:56 -07:00
Myk Taylor
4a2b97105c
only initialize steam if launched from steam
2023-06-05 14:18:55 -07:00
Myk Taylor
5c914280c3
change dynamic_cast -> virtual_cast
2023-06-01 10:53:08 -07:00
Myk Taylor
974a6155c0
reinstated Buildings.setOwner
2023-05-31 18:48:08 -07:00
Myk Taylor
8b3eef699f
adjust findCivzonesAt to v50 semantics
2023-05-27 05:37:31 -07:00
Myk Taylor
8c01f3efe0
don't relaunch launchdf if it's already running
2023-05-20 02:59:41 -07:00
Myk Taylor
a5a6b70a51
launch DFHack through steam if DF is run from steam
2023-05-20 02:59:39 -07:00
Myk Taylor
11361975f9
look up texpos values instead of assuming they're constant
2023-05-16 17:14:36 -07:00
Myk Taylor
8f5c454b39
add focus strings for new_region
2023-05-03 15:52:01 -07:00
Myk
b1ae39764b
Merge branch '5008-beta1' into myk_nosdlreal
2023-04-26 15:48:13 -07:00
Myk Taylor
73b5e37f67
simplify loops with foreach syntax
2023-04-24 14:28:47 -07:00
Myk Taylor
6203894c99
add title screen focus string detection
2023-04-24 08:03:11 -07:00
Myk Taylor
a7aded65e4
match new gems category
2023-04-17 01:04:03 -07:00
Myk Taylor
275513319c
remove last reference to SDLReal
2023-04-12 23:14:03 -07:00
Myk Taylor
460b1e8eaf
adjust code to new tree root type
2023-04-11 10:14:28 -07:00
Myk Taylor
17373dcffd
constify!
2023-04-10 04:35:34 -07:00
Myk Taylor
836a3edcb9
add some more logging
2023-04-10 04:35:34 -07:00
Kelly Kinkade
ce017ee4a8
properly callIs SteamRunningOnSteamDeck
2023-04-10 04:35:34 -07:00
Myk Taylor
e4777d2688
add shutdown and cleanup logic
2023-04-10 04:35:34 -07:00
Myk Taylor
f0d19c9363
add note about dfhooks
2023-04-10 04:35:34 -07:00
Myk Taylor
6a7446780b
hide terminal console when running on steam deck
2023-04-10 04:35:34 -07:00
silverflyone
4aa5e9d17b
Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop
2023-04-05 12:23:20 +10:00
silverflyone
37d6a05aea
Merge branch 'develop' into develop
2023-04-05 11:49:38 +10:00
silverflyone
2bd24efa4b
Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop
2023-04-05 11:49:30 +10:00
silverflyone
0cebad1078
Update Buildings.cpp
...
Removed extra min/max checks.
2023-04-05 11:49:14 +10:00
Taxi Service
824f7ed038
clean up Items.cpp quality symbols definitions
2023-04-04 00:08:01 +02:00
Taxi Service
7c63ea9394
added BOLD_FRAME and INTERIOR_MEDIUM_FRAME
2023-04-03 20:13:57 +02:00
silverflyone
c6fc55f98f
Merge branch 'DFHack:develop' into develop
2023-04-04 03:45:23 +10:00
silverflyone
181f0bdf72
Update Buildings.cpp
...
Boundary checks added.
2023-04-04 03:27:32 +10:00
silverflyone
f8de51aba3
Update Buildings.cpp
...
Fixes #3159 .
Valid map coordinates from (0, 0, 0) to (world->map.x_count - 1, world->map.y_count - 1, world->map.z_count - 1).
Stockpile coords (x1, y1, z) to (x2, y2, z) may lie outside of this region.
Use min of (0, 0) and max of (world->map.x_count - 1, world->map.y_count - 1) when iterating the block.
2023-04-04 03:08:43 +10:00
TaxiService
8d8a4abd13
reverted loss of readability
2023-04-02 02:33:09 +02:00
TaxiService
e3bab1eb6b
simplifying character definition even more
...
removed those pesky superfluous consts and casts...
2023-04-01 23:40:45 +02:00
TaxiService
3a6893de53
attempt to increase code readability
...
following lethosor and myk's suggestions, each symbol now is its own constant with a descriptive name.
...will it work though?
2023-04-01 16:43:05 +02:00
TaxiService
18f1b5c675
attempt#2 to fix masterwork/exceptional/decorated symbols
...
this time we're using a couple of `static_cast<char>(...)` thingies
2023-03-31 17:33:23 +02:00
Myk Taylor
fe0590503f
mark tiles with magma or deep water as "not free"
2023-03-24 15:05:17 -07:00
Myk Taylor
03e44f1e7f
fix initial extended/retracted position for upright spike traps
2023-03-23 00:25:29 -07:00
Myk Taylor
9b7860125d
ensure elements in deepest dir are added to output list
2023-03-11 02:01:50 -08:00
Myk Taylor
0562dc5234
constify some MaterialInfo methods
2023-03-05 18:16:49 -08:00
Myk Taylor
df0c7c27cb
adjust to structures change
2023-02-26 22:04:22 -08:00
Myk
663b014eae
Merge pull request #2682 from 20k/squadwork
...
makeSquad, updateRoomAssignments
2023-02-26 21:40:33 -08:00