Commit Graph

127 Commits (5b1e2ff01f1200291738ba182418b6c992373e65)

Author SHA1 Message Date
lethosor af92b3ae1f Fix some confirm plugin issues and add a simple configuration UI
- Detect null pointers in trade-related functions
- Fix typo/issues pointed out by @dscorbett
- Reorder includes
2015-11-21 20:58:49 -05:00
lethosor b7dd93b6e8 Implement most of the confirm plugin in Lua
This should make resolving future issues easier, although implementing
new confirmations in lua isn't possible yet (each one requires a line
in confirm.cpp).

This also resolves an issue with note-delete and route-delete, with
dfhack/df-structures@1bc4f61
2015-11-21 19:01:35 -05:00
expwnent fabcfcd921 Fixed trailing whitespace. 2015-09-21 17:42:30 -04:00
Warmist 80fd4b1365 Some additions and fixes.
Added new functions: select, set(non)blocking, isBlocking.
Set default to non-blocking. Added "would block" to ignored errors.
2015-09-16 09:57:22 +03:00
warmist 7639420455 Update luasocket.lua 2015-08-17 10:07:20 +03:00
Warmist d9c50d677f A lua interface for csockets in a spirit of luasocket 2015-08-15 15:09:12 +03:00
lethosor a90f3c3d67 stockpiles: Restrict characters in filenames when saving
Previously, it was possible to save outside of the stocksettings
directory or fail to save in a nonexistent subdirectory (e.g. when
a stockpile name had slashes in it).

Resolves #621
2015-07-29 14:17:14 -04:00
lethosor 8145a04944 dwarfmonitor: Add mouse cursor widget
Suggested by @ragundo
2015-06-15 13:42:29 -04:00
lethosor 7581bda7d5 Update dwarfmonitor documentation and NEWS 2015-06-13 21:50:15 -04:00
lethosor 93c9a41a3a Reimplement dwarfmonitor widgets in Lua (and improve customizability)
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.

Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
  no longer copied into the DF directory when building DFHack. This
  keeps developers' personal settings intact, but will require
  copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
Ross Morgan-Linial 3001053cef Change tabs to spaces. 2015-05-07 21:51:03 -07:00
Ross Morgan-Linial 7aac9a8fb8 Improve workflow handling of plant reactions
Makes workflow understand "seeds of any plant", "thread of any plant",
"drink of any plant", "powder of any plant", and "liquid of any plant"
when counting items.

Changes workflow's handling of the built-in plant reactions to
understand that they always produce plant products, and that they also
produce seeds.

This means that you can set a target for, for example, "powder of any
plant", and workflow will use a milling job to produce that.
2015-05-07 20:49:29 -07:00
Ben Lubar d182b6c1c3 only create the stocksettings directory when it is requested 2015-03-24 17:46:49 -05:00
Eric Wald 23707db1d3 Fixed ballistic arrow head orders 2015-03-15 16:38:59 -06:00
Eric Wald 6bfaa8d35d Better way to handle obsolete job types. 2015-03-15 16:37:35 -06:00
Eric Wald 81c2a6e79f Refactoring a table insert into reaction_entry. 2015-03-15 16:02:29 -06:00
Eric Wald 11d65b4f2d Always clear reactions when loading.
This removes a minor potential for memory leaks.
2015-03-15 15:43:46 -06:00
Eric Wald d18bd3e2a5 Preventing a stockflow error message in Arena mode 2015-03-15 14:08:47 -06:00
lethosor 0b912f54be Fix field name in lua/stockflow.lua
From DFHack/df-structures#39
2015-03-01 17:32:25 -05:00
Warmist e9ab892369 Building hacks changes.
Fixed buildings not consuming correct value of power. Added way to ignore unpowered state. Added setPower/getPower to change how much power building uses on the fly.
2015-02-24 15:37:38 +02:00
lethosor 10cfef0553 Fix whitespace issues 2015-02-14 22:53:06 -05:00
expwnent e5e0d93ef1 Added modtools/reaction-product-trigger. 2015-02-02 02:39:05 -05:00
Casey Link b0e0bbda9b stockpiles: show proper cased names in filter list 2014-12-05 16:53:19 +01:00
Casey Link 52f4cb3fc1 stockpiles: load prompt uses typing + filtering 2014-12-05 14:49:40 +01:00
Casey Link 332566f6a1 stockpiles: disable gui/script when plugin is disabled 2014-12-05 13:27:58 +01:00
Casey Link 7e6066daf2 stockpiles: user friendly error handling
* display errors in the GUI when necessary
* handle older versions of DFHack without the persist module
2014-12-05 12:35:24 +01:00
Casey Link b6118d272c stockpiles: integrate gui plugin into dfhack.init-example 2014-12-05 12:35:24 +01:00
Casey Link 1cde8cffa4 stockpiles: implement GUI controls 2014-12-05 12:35:19 +01:00
expwnent c927f0fa3c Merge remote-tracking branch 'lethosor/patch-5' 2014-09-16 17:25:28 -04:00
Lethosor 1ea1b50790 job_material_category -> dfhack_material_category
Fixes #330 - submitted by @finndibaenn
2014-09-14 11:13:26 -04:00
Eric Wald 83b1317173 Switching stockflow to the internal getStockpileContents.
This should speed it up over checking each space individually, but no longer counts spaces with empty assigned bins and barrels as empty.
2014-09-07 15:07:57 -06:00
Eric Wald 1ce07c063d Canonical way to find the stockpile by id. 2014-09-07 14:55:34 -06:00
Quietust 5c0588dd34 Merge pull request #299 from eswald/stockflow-40
Stockflow Repairs
2014-08-28 14:56:04 -05:00
Eric Wald 632b0b85bd Speeding up the stockpile item count.
kr0pper reports two orders of magnitude speed improvement for check_pile() by using the map tile item cache.
2014-08-23 17:49:03 -06:00
Eric Wald 8495bddc2d Removing an obsolete workaround 2014-08-23 17:46:35 -06:00
Warmist f04b93210a Bug fixing.
Fixes for "tab" in hacked buildings.
2014-08-16 16:58:09 +03:00
Warmist 6868cab1fe Exposed dfhack.jobs.linkIntoWorld. Simplified eventful and gui.dwarfmode for sidebar use/creation. 2014-08-16 16:58:01 +03:00
Eric Wald f5d50adf0d Removing the leaves check for stockpile acceptability.
That item type no longer exists in DF 0.40; such items will now always be considered properly stored by any stockpile they're on.
2014-08-15 21:41:23 -06:00
Eric Wald 2ebebaf62f Deleting old stockflow records.
Once a stockpile has been removed or abandoned, its persistent configuration is obsolete.
2014-08-03 15:07:04 -06:00
Eric Wald 1b1475fb94 Warning about mismatched stockflow entries.
For the most part, mismatches should only happen if the reaction list has changed between world loads, which means either the raw files or the plugin files have been changed.  For now, such entries are ignored, though in some cases it might be possible to recover a new order number by searching through the reaction list.
2014-08-03 15:04:28 -06:00
Eric Wald 2db1c9d722 Moving the global job_types cache into the two functions that use it.
It's mostly an artifact of a misunderstanding, anyway.
2014-08-03 14:57:20 -06:00
Eric Wald 1aafa206bc Localizing a few Lua variables.
It seems like the globals could be localized, too, but I'm not quite sure what that would accomplish.
2014-08-02 18:08:13 -06:00
Eric Wald ad4d545036 Ignoring the removed job types for DF 0.40+
The version check allows the plugin to work with DF 0.34, just in case.
2014-08-02 17:58:36 -06:00
expwnent 81c87d0921 EventManager: INTERACTION event for unit interactions. 2014-07-03 04:55:12 -04:00
expwnent fe875f7c02 Cleaned up eventful.lua.eventType. 2014-06-30 03:16:45 -04:00
expwnent 961d033ade EventManager: unload event for convenience. 2014-06-29 10:03:55 -04:00
expwnent 8e7e87ac73 Added UNIT_ATTACK event to EventManager and exposed it to Lua. 2014-06-28 02:31:34 -04:00
expwnent 7313c18a2a EventManager/eventful: added ON_REPORT event and exposed it to Lua. 2014-06-23 09:15:46 -04:00
Alexander Gavrilov 63254df6dd Fix obvious issues in stockflow.
- Duplicate definition of a function now in uicommon.h
- Assertion failure due to missing core suspend claim.
- Incorrect way of accessing the civ entity.
- Accessing nil objects in the lua module if filter matches nothing.
- Lua module breaking on reload('plugins.stockflow').
2014-06-03 12:57:45 +04:00
Alexander Gavrilov e7292379f7 Merge branch 'stockflow' of git://github.com/eswald/dfhack into develop 2014-06-03 12:13:56 +04:00