expwnent
151ff0f296
Infinite sky: rename from sky eternal.
2013-01-05 16:34:33 -05:00
expwnent
4920293c2d
Infinite sky: get it to compile.
2013-01-05 16:30:48 -05:00
expwnent
471e82a88a
Merge branch 'skyEternal' into infiniteSky
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 16:18:01 -05:00
expwnent
9246ac9b05
Merge branch 'workNow' into recent
2013-01-05 13:36:24 -05:00
expwnent
cf3ac48518
Merge in autoSyndrome, trueTransformation, ...
2013-01-05 13:35:49 -05:00
expwnent
6622e9e06f
Merge branch 'canStepBetween' into recent
...
Conflicts:
library/modules/Maps.cpp
2013-01-05 13:32:29 -05:00
expwnent
5fc466ef7e
Work now: also update dig on pause.
2013-01-05 12:50:44 -05:00
expwnent
d2a2a63d01
Merge branch 'recent' into workNow
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 12:45:34 -05:00
expwnent
874dfbdc4f
Merge branch 'eventManager' into autoSyndrome
2013-01-05 11:40:55 -05:00
expwnent
bc5cdf8877
Auto syndrome: got rid of allow multiple syndromes option that didn't make any sense, and made sure that if allowing multiple targets it doesn't attach the syndrome to the worker twice.
2013-01-05 11:37:56 -05:00
Anuradha Dissanayake
4bef70ab6f
Merge branch 'search'
2013-01-06 02:27:57 +13:00
Anuradha Dissanayake
91ee8ac020
Refactor search to handle more types of screens cleanly.
...
Added search to screens:
* Animals
* Military positions assignment
* Announcements
* Room list
* Job list
* Burrow assignment
2013-01-06 00:26:16 +13:00
Kelly Martin
9404267c1f
Autolabor: Tell DF to immediately process jobs after each run.
2013-01-04 13:14:20 -06:00
expwnent
715f191c26
EventManager: made the frequency part of EventHandler.
2013-01-03 19:31:29 -05:00
expwnent
910e398a7b
EventManager: added invasion event.
2013-01-03 15:52:56 -05:00
Warmist
c22c4d009c
Added convenience functions to eventful (see Lua API.rst)
2013-01-03 20:30:51 +02:00
Kelly Martin
796e387398
Add a guard against an invalid item pointer, and don't try to deduce construction labor for item_lost jobs
2013-01-03 12:24:32 -06:00
Anuradha Dissanayake
7b561f108b
Fix hotkey detection
2013-01-03 22:01:01 +13:00
expwnent
4e4e382b8f
EventManager: added syndrome event.
2013-01-02 18:30:15 -05:00
Warmist
8b5e847dfa
New event for eventful. postWorkshopFillSidebarMenu for tweaking the sidebar menu on workshops.
2013-01-02 23:43:38 +02:00
expwnent
38ef75418a
AutoSyndrome: added an option to delete boiling rocks as they are created (on by default).
2013-01-02 14:09:16 -05:00
expwnent
5e2877be23
AutoSyndrome: added options for worker only (vs all in building), allow multiple targets, and allow multiple syndromes.
2013-01-02 13:47:59 -05:00
expwnent
bf0f0e910b
Merge branch 'eventManager' into autoSyndrome
2013-01-02 12:40:20 -05:00
expwnent
c3b2ae2137
EventManager: allowed plugins to specify how often they need events to be checked, in the event that monitoring is necessary.
2013-01-02 11:07:56 -05:00
Anuradha Dissanayake
581a8dd955
Prevent material selection cursor from going past its bounds
2013-01-02 22:27:26 +13:00
expwnent
fa78d6ccfc
Merge branch 'recent' into eventManager-unstable
...
Conflicts:
library/modules/Job.cpp
2013-01-02 03:16:45 -05:00
expwnent
b320fb25f3
AutoSyndrome: added smart arguments for location, worker id, and reaction id.
2013-01-02 00:07:23 -05:00
Anuradha Dissanayake
1fe3a0e343
Merge branch 'automaterial_box'
2013-01-02 14:01:11 +13:00
Kelly Martin
41615d0446
Autolabor: adjust idle clawback to deal with "pickup equipment" for miners.
2013-01-01 17:53:24 -06:00
Kelly Martin
d50aa24ebf
Autolabor: fix idle stepdown (seems to work much better), change some scoring weights, change autolabor list output to include busy and idle counters
2013-01-01 16:35:09 -06:00
Kelly Martin
3a24565728
Autolabor: add construction labor for hatch.
2013-01-01 15:12:45 -06:00
Anuradha Dissanayake
7df7b1758c
Merge branch 'automaterial' of https://github.com/Falconne/dfhack into automaterial_box
2013-01-01 19:51:29 +13:00
Anuradha Dissanayake
a1eadd0f08
Allocate sky blocks when needed.
...
Allow stairs to be designated on top of each other in open space.
2013-01-01 19:46:11 +13:00
expwnent
0572e87d7b
SkyEternal: allocates new z-levels of sky as needed, or on request.
2012-12-31 13:57:59 -05:00
Kelly Martin
6ab8c8c30e
Autolabor: change fishery build labor to CLEAN_FISH to control random acts of fish extermination; add build labor for wells.
2012-12-28 07:58:29 -06:00
Kelly Martin
6d4c003748
Autolabor: fix dig-from-below bug regaring mining jobs, add overallocation detection and remediation, fix fishing and hunting
2012-12-27 02:52:54 -06:00
Anuradha Dissanayake
5d04148aad
Make gcc happy
2012-12-27 20:15:32 +13:00
Anuradha Dissanayake
1ed129e1a7
Allow placing constructions in unconnected open space, with sensible restrictions
2012-12-26 01:02:57 +13:00
falconne
40e25b6a1f
Better handling of open space construction placement
2012-12-25 18:08:41 +13:00
Anuradha Dissanayake
5e54c9919a
Improved check for figuring out what tiles can have constructions.
2012-12-24 00:59:12 +13:00
Warmist
e4f4943b10
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-12-23 12:34:05 +02:00
rampaging-poet
2f48ed5d9a
Added restrictliquids and restrictice commands.
2012-12-23 01:09:21 -08:00
Anuradha Dissanayake
03aedf6895
Enabling designation like rectangular selection for constructions, with unlimited selection size and auto skipping of tiles that can't be built on.
2012-12-23 03:04:41 +13:00
expwnent
a4dc79565a
AutoSyndrome: allowed for triggering DFHack commands from in game reactions.
2012-12-22 00:13:07 -05:00
Warmist
786149a630
Added new event to eventful: onWorkshopFillSidebarMenu
2012-12-21 00:42:15 +02:00
expwnent
7972902c81
stepBetween: named a few things better, and fixed a lot.
2012-12-19 20:30:37 -05:00
expwnent
555c754636
EventManager: added construction and building events.
2012-12-18 18:34:38 -05:00
Kelly Martin
a9fec84c72
Autolabor: add paved roads.
2012-12-18 16:23:02 -06:00
expwnent
01e5e93825
Renamed Maps::canWalkBetween to Maps::canPathBetween and added Maps::canWalkBetween, which does what it says.
2012-12-16 23:26:50 -05:00
Kelly Martin
4ac6d9c0c3
Autolabor: add a number of destroy furniture labors (all "haul furniture")
2012-12-16 00:03:26 -06:00
Kelly Martin
8bf359ba02
Autolabor: add labor for ivory & horn crafts (yawn)
2012-12-15 21:18:06 -06:00
expwnent
75db99a3c7
autoSyndrome: deleted an unused constant.
2012-12-15 18:52:05 -05:00
expwnent
3e5537e321
autoSyndrome: made it use EventManager.
2012-12-15 18:47:51 -05:00
expwnent
dae162a0b4
Merge branch 'eventManager' into autoSyndrome
2012-12-15 18:18:59 -05:00
expwnent
935058f0a5
EventManager: moved files around, made eventExample not run by default, and got rid of the silly NONE event type.
2012-12-15 17:43:41 -05:00
expwnent
86e002f3ff
EventManager: added item creation event.
2012-12-15 16:49:13 -05:00
expwnent
b0314755e0
EventManager: added unit death event.
2012-12-15 14:40:11 -05:00
Warmist
4af6b728b7
Small fix to gm-editor. Added proj_itemst and proj_unitst to eventful. Now you can make custom projectiles (e.g. rockets?)
2012-12-15 13:27:16 +02:00
expwnent
155a4d044c
EventManager: fiddled with time events. Made it possible to register for time events before a world is loaded. Also added some files I forgot to add to the previous commit.
2012-12-14 23:29:28 -05:00
expwnent
cf619a519e
EventManager: made event handlers unregister when plugins are unloaded. Also changed PluginManager so that plugins can call core.getPluginManager() during plugin_init.
2012-12-14 22:14:38 -05:00
expwnent
747723187f
EventManager: first draft.
2012-12-14 21:05:38 -05:00
Kelly Martin
cd7c39f2db
Autolabor: add deconstruct labor for cages
2012-12-14 09:34:03 -06:00
Warmist
08f454cc81
Removed old reactionhooks.lua
2012-12-14 16:41:59 +02:00
Warmist
e46d434c25
Missing lua file for eventful.
2012-12-14 16:33:26 +02:00
expwnent
af7f11fdfa
autoSyndrome: made the syndrome logic make more sense.
2012-12-13 11:30:37 -05:00
jj
bba96494f3
ruby: add unit_hostiles to list hostiles units (duh)
2012-12-13 17:20:21 +01:00
expwnent
a28fc65e6d
autoSyndrome now deals with creature_class.
2012-12-13 11:13:56 -05:00
Kelly Martin
2535b50bfc
Autolabor: add construct chain labor, add destruct trap labor, change overbroad test for military status (was catching uniformed reservists, who are eligible to do civilian labor)
2012-12-12 22:25:23 -06:00
expwnent
3a541e26be
autoSyndrome: automatically detects boiling rock syndromes better, and checks if each syndrome is applicable to the unit that finished the job.
2012-12-12 23:01:05 -05:00
Kelly Martin
82031092a9
Autolabor: rework tool management to try to reduce tool litter
2012-12-12 14:28:11 -06:00
Warmist
ddceabbfb7
Merge branch 'master' of git://github.com/jjyg/dfhack
2012-12-12 18:58:11 +02:00
Kelly Martin
3b9f21a1ea
Autolabor: do not count designations in hidden squares (since your dwarves can't reach them anyway). Also apply an assignment penalty for assigning a dwarf to a labor other than the one the dwarf is doing
2012-12-12 10:37:09 -06:00
Kelly Martin
0fc01c48e1
Autolabor: add construct labor for GearAssembly, AxleHorizonal, and AxleVertical (the last is a guess, but probably right)
2012-12-12 09:52:13 -06:00
Kelly Martin
b75c1da95e
Autolabor: add build waterwheel.
2012-12-12 08:46:52 -06:00
jj
662d3101c7
ruby: fix onupdate tick limiting + advmode, add pageprotect, add :script_finished
2012-12-11 17:25:51 +01:00
Kelly Martin
bd1756e5d0
Autolabor: change the fallback labor (for dwarfs for which nothing seems appropriate) from NONE to CLEAN. Fiddle with weights in assignment algorithm.
2012-12-11 09:29:03 -06:00
Kelly Martin
3e8ba2dd06
Autolabor: fix bring-crutch labor
2012-12-11 09:19:38 -06:00
Kelly Martin
017b986987
Autolabor: fix wound cleaning labor.
2012-12-11 09:06:37 -06:00
Alexander Gavrilov
966deb4647
Fix crash and confusing behavior in automaterial.
2012-12-11 22:05:00 +13:00
jj
6bc791d985
follow df-structure rename unit.unknown8 + able_stand_*
2012-12-10 22:50:33 +01:00
Kelly Martin
a914f8e8e0
Autolabor: busy dwarfs may be reassigned now, but with a strong preference for their current job; armed dwarfs are given preference for outside jobs; include experience gained toward next level in preference weighting
2012-12-10 08:34:11 -06:00
expwnent
e85f4eb880
First draft of autoSyndrome: a tool for replacing boiling rock syndromes with something more reliable. Uses non-df-recognized tags in material definition raws.
2012-12-09 21:19:40 -05:00
Warmist
6c4f163a5e
Merge branch 'master' of https://github.com/angavrilov/dfhack
...
Conflicts:
NEWS
2012-12-09 14:25:31 +02:00
Warmist
6d0e505fd2
Added onItemContaminate to eventful and readme/news for eventful
2012-12-09 14:15:39 +02:00
Warmist
a0a566dbf2
Tidy up eventful.cpp
2012-12-09 13:00:49 +02:00
Kelly Martin
0ef4522f95
Merge branch 'master' into autolabor
2012-12-08 21:26:50 -06:00
Kelly Martin
468412b9fc
Autolabor: fix unitialized variable bug causing broker to be inappropriately excluded from work
2012-12-08 21:14:23 -06:00
expwnent
72921fbfd5
Made workNow only check jobs when the game becomes paused instead of constantly when paused. Also made it enable/disable on command.
2012-12-08 12:50:33 -05:00
Kelly Martin
412a004751
Autolabor: identify labors that may involve going outside and apply an assignment penalty for such labors to dwarfs who have minor children (in order to keep the kids inside)
2012-12-08 10:55:44 -06:00
Kelly Martin
6ae82187d2
Autolabor: more tweaks to hauling labor decoding, fix heap corruption due to array underflow
2012-12-08 03:51:07 -06:00
Kelly Martin
e7d3fbe97b
Autolabor: track labors actually being used (to avoid "gone fishing" bug); fix several wrong labor map entries; add several special cases for hauling (still not all there yet); add debug warning if job deduction appears wrong; flail about mightily trying to resolve heap corruption on unload
2012-12-08 02:42:22 -06:00
Alexander Gavrilov
7307f4e870
Fix crash and confusing behavior in automaterial.
2012-12-08 09:51:35 +04:00
Kelly Martin
42670f0233
Autolabor: only care about skills that are used for labors, when determining a dwarf's highest skill.
2012-12-07 15:41:39 -06:00
jj
ebc2625d97
ditch the unused Vegetation module
2012-12-06 23:47:25 +01:00
Kelly Martin
fa9b71adc5
autolabor: add archery targets, improve JobLaborMapper's destructor
2012-12-06 09:39:14 -06:00
jj
e1b70d171c
ruby: tweak is_citizen test
2012-12-06 12:48:16 +01:00
Alexander Gavrilov
cd6eb9edd3
If training ammo is forbidden for all use, don't move it to combat chests.
2012-12-06 12:00:18 +04:00
Kelly Martin
0df60a0b4f
Autolabor: slabs, animal trainers
2012-12-06 01:38:43 -06:00
Kelly Martin
f8d6b83088
Add 'allow fishing' and 'allow hunting' config options. Protect against accidentially trying to set or unset the NONE labor or any other invalid labor value (which corrupts DF). Add traction benches. Change prioritization around quite a bit.
2012-12-04 20:23:19 -06:00
jj
74ebe7d207
ruby: add df-static-flagarray
2012-12-04 17:55:29 +01:00
jj
0b80dff09d
ruby: add d-float support
2012-12-04 17:18:09 +01:00
Kelly Martin
0f1aaa6ec4
Autolabor: Items marked for dump now generate haul refuse demand. Also corrected labor for dump item jobs.
2012-12-04 01:59:44 -06:00
Anuradha Dissanayake
745b347b5b
Fix const correctness
2012-12-04 10:30:49 +13:00
Kelly Martin
287ee2bc04
Autolabor: allow multiple simultaneous jobs at farms.
2012-12-03 14:20:57 -06:00
jj
3953112eb9
dump Vegetation::t_plant, fix plant.is_burning
2012-12-03 19:03:07 +01:00
Kelly Martin
208b9915ea
Autolabor: splints and crutches are furniture (at least at a forge); remove test that excludes pet owners from being given jobs when they're idle; add test for hungry/thirsty dwarves to trigger a feed/water civilians requirement; add a vehicle hauling requirement based on the existence of hauling routes
2012-12-03 04:28:08 -06:00
Kelly Martin
9563dae5d7
Autolabor: add labors for construct bridge, construct nestbox, construct trap, deconstruct wagon; fix error in labor for deconstruct furnace/tradedepot/construction; actually update the "active dwarf" numbers displayed in "autolabor list"; increase assignment penalty for dwarfs using skills lower than their best skill; increase assignment bonus for continuing in the same labor and for having the right tool for the job.
2012-12-03 01:41:02 -06:00
Kelly Martin
44bb965c97
Autolabor: add more building labors
2012-12-02 18:41:20 -06:00
Kelly Martin
4cd217b782
to new assignment algorithm. Add priority boost for labors based on how long it's been since they were last used, to avoid labor starvation. Move persistent configuration to "autolabor/2.0" to avoid conflicting with older versions.
2012-12-02 14:27:13 -06:00
Kelly Martin
b743f4f42d
Autolabor: remove some debug spam, and fix an error in computing preference scoring
2012-12-02 09:47:15 -06:00
Alexander Gavrilov
dc7f9f56cd
Implement a low stock level announcement as suggested by falconne.
2012-12-02 15:31:43 +04:00
Kelly Martin
799da41f70
Autolabor: Add debugging messages from the labor deduction module; add deduction rules for some building destroy jobs; automatically exclude handless dwarfs from labor poor; use DF's own hauling job counts to compute hauling demand (and arrange for the "hauling canary" so that this always works)
2012-12-02 02:02:16 -06:00
Kelly Martin
45564ca0cb
Autolabor: generating haulers based on unstockpiled items (less than ideal). Fix wrong build labor for Farmer's workshop. Add build labor function for constructions (also works for furnaces and trade depots). Add architect detection. Use a different mechanism for selecting dwarfs for labors.
2012-12-01 23:12:41 -06:00
Kelly Martin
15f7ffa0e2
autolabor: add ConstructBuilding (Farm); change priority calculation
2012-12-01 17:39:01 -06:00
Kelly Martin
bb2b97baa3
autolabor: exclude "item lost" jobs, exclude jobs that are not first-in-queue at workshop, improve debug messages
2012-12-01 16:09:52 -06:00
Kelly Martin
201430ed08
Autolabor: add health awareness, fix initialization crash, fix idle dwarf loop crash
2012-12-01 14:08:15 -06:00
Alexander Gavrilov
df2e9f00e1
Document that search now works in the stockpile settings screen.
2012-12-01 17:21:06 +04:00
Alexander Gavrilov
fd5b19fe8d
Merge remote-tracking branch 'falconne/search'
...
Conflicts:
plugins/search.cpp
2012-12-01 16:55:52 +04:00
Kelly Martin
afb6d8ef79
Autolabor: improve (hopefully) the functionality for mapping jobs to labors. Still some gaps to fill, but not many.
2012-12-01 02:26:06 -06:00
Kelly Martin
d2ec52fa0b
Merge branch 'master' into autolabor
2012-11-30 21:47:30 -06:00
Kelly Martin
05dce0d2f1
Fix inadvertently prematurely terminated block comment.
2012-11-30 21:24:18 -06:00
Kelly Martin
384a667e97
Assorted progress on new autolabor. Still lots of issues.
2012-11-30 20:22:58 -06:00
Anuradha Dissanayake
6bc6f3e555
Merge branch 'search'
2012-12-01 10:21:37 +13:00
Kelly Martin
5f3328dcb2
Merge branch 'master' into autolabor
...
Conflicts:
plugins/autolabor.cpp
2012-11-30 11:25:41 -06:00
Kelly Martin
eecb604800
Sync submodules
2012-11-30 11:23:58 -06:00
Anuradha Dissanayake
210c1650ec
Add stockpile screen searching capability
2012-12-01 01:01:04 +13:00
Alexander Gavrilov
2cb594ba89
Tweak the workflow lua api: include history in output of listConstraints.
2012-11-30 14:48:05 +04:00
Anuradha Dissanayake
abe027c940
Copy changes from ag fork
2012-11-30 22:44:05 +13:00
Anuradha Dissanayake
13666ec6e6
Merge remote-tracking branch 'remotes/origin/automaterial'
2012-11-30 20:27:32 +13:00
Anuradha Dissanayake
d2a13ad2c7
Merge branch 'autopasture'
2012-11-30 19:53:14 +13:00
Anuradha Dissanayake
d59d1c652e
Fix gcc compile of search plugin
2012-11-30 19:50:42 +13:00
jj
d7f7538d01
ruby: fix Pointer assignment
2012-11-29 17:11:29 +01:00
Anuradha Dissanayake
3095c43d26
Fix location of workshop ui, based on menu width
2012-11-29 23:15:24 +13:00
Warmist
57b69da1f0
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-11-29 12:13:28 +02:00
Warmist
2c9b560872
Made dfusion not stop df on input.
2012-11-28 22:13:28 +02:00
jj
771a5ac50b
ruby: tweak flagarray#inspect
2012-11-28 20:08:34 +01:00
jj
614225cc5f
follow rename itemst.flags.artifact1 -> artifact
2012-11-28 19:48:47 +01:00
Alexander Gavrilov
bfc11cf946
Add persistent history of per-constraint item counts in workflow.
...
This will be needed for properly merging or integrating the status
screen by falconne. The history is maintained as a circular buffer
of up to 28 entries, and persists in save files.
2012-11-28 19:25:01 +04:00
Anuradha Dissanayake
593dc4f554
Fix handling of manipulator hotkey in unit search screen
2012-11-28 17:18:38 +04:00
jj
8f0d552556
ruby: add DFHack::VERSION
2012-11-28 13:33:07 +01:00
Anuradha Dissanayake
7a2a746347
Add filtering to zone creature assignment menu. First steps towards adding autopasture functionality.
2012-11-29 00:31:39 +13:00
jj
76bb5f0196
ruby: items in containers are free
2012-11-26 20:09:56 +01:00
Warmist
2bbcfe912a
Site spawner added to adv_tools
2012-11-26 21:04:17 +02:00
jj
f091284a75
ruby: avoid crash on ArgumentError in onupdate
2012-11-25 17:29:03 +01:00
Anuradha Dissanayake
3db5684ae7
Fix handling of manipulator hotkey in unit search screen
2012-11-25 19:01:58 +13:00
Quietust
e9141f34f6
Adjust minimum widths so they actually work at 80x25 without glitching out
2012-11-24 11:13:54 -06:00
Quietust
c58f30ba00
Use teal background instead of red for no-labor cells
2012-11-24 10:37:22 -06:00
Quietust
cdc44b74f2
Fix possible crash when using shift+enter on cells that don't have labors
2012-11-24 10:36:32 -06:00
jj
4dfe46e26f
manipulator: fix column width calculations for 80x25 window
2012-11-24 16:52:21 +01:00
jj
e73274d281
ruby: add description field to onupdate_register
2012-11-24 16:10:55 +01:00
Anuradha Dissanayake
e750cbe5e9
MouseQuery Plugin
2012-11-25 04:02:49 +13:00
Quietust
139fd07df3
missed a spot
2012-11-23 19:23:06 -06:00
Quietust
e3eb325d36
Minimize references to gps->dimx/dimy
2012-11-23 19:18:56 -06:00
Alexander Gavrilov
2a0d048040
Make tweak stable-cursor interact with the build menu properly.
2012-11-22 20:08:47 +04:00
Alexander Gavrilov
e7905a5cff
Add docs for the automaterial plugin, and use the new Painter class.
2012-11-22 19:38:45 +04:00
Alexander Gavrilov
2794143f77
Merge remote-tracking branch 'falconne/automaterial'
2012-11-22 18:27:31 +04:00
Anuradha Dissanayake
2a83d92290
Code cleanup
2012-11-21 23:45:26 +13:00
Anuradha Dissanayake
0d9efec062
Disable plugin in non construction menu
2012-11-21 20:17:36 +13:00
jj
5b5c674f6e
ruby: update map_tile.mat_info for soil/stone special cases
2012-11-20 21:17:33 +01:00
Anuradha Dissanayake
9cb1a45855
Automaterial branch commit
2012-11-20 23:12:11 +13:00
Anuradha Dissanayake
5c18952caa
Select by item name
2012-11-20 22:52:44 +13:00
expwnent
fe2257427f
workNow: plugin to make DF process jobs every time you pause.
2012-11-19 20:17:05 -05:00
Alexander Gavrilov
f587d603e8
Allow the workflow goal gap in any range between 1..goal-1
2012-11-19 18:59:58 +04:00
Anuradha Dissanayake
0e2aa299b9
Auto material selection plugin - First push
2012-11-20 00:25:25 +13:00
Alexander Gavrilov
902d2d5597
Try reducing the replace with sparring chance due to xp gain overkill.
...
Also add more debug spam to make behavior tracking easier.
2012-11-18 22:06:47 +04:00
Alexander Gavrilov
ae7bf5aca6
Check unit inventory when replacing skill demo with sparring.
...
E.g. if they have no shields, they won't gain that skill when sparring.
2012-11-18 13:02:49 +04:00
Warmist
ee15086963
Some preparations for new plugin.
2012-11-18 01:52:46 +02:00
Alexander Gavrilov
2953e4c386
Implement a dialog to specify a workflow constraint with all features.
2012-11-17 20:32:39 +04:00
Alexander Gavrilov
0b568942f4
Follow changes in the xml defs.
2012-11-17 16:43:29 +04:00
Quietust
1ab48aa2de
Merge https://github.com/ab9rf/dfhack
2012-11-16 21:15:38 -06:00
Quietust
e2b9b703a0
Get rid of tabs
2012-11-16 15:33:36 -06:00
Kelly Martin
fc1a1e1f0e
Merge remote-tracking branch 'jjyg/master'
...
Conflicts:
NEWS
2012-11-16 13:20:46 -06:00
Kelly Martin
2a0171a4ff
Merge remote-tracking branch 'angavrilov/master'
2012-11-16 13:15:55 -06:00
Kelly Martin
cbe3741751
Check all depots for trader requested, not just the last one.
2012-11-16 13:09:05 -06:00
Alexander Gavrilov
d506dd7137
Add a tweak to speed up melee squad training.
2012-11-16 22:51:07 +04:00
jj
423c122424
ruby: fix unit_find for advmode
2012-11-16 17:59:39 +01:00
Quietust
bbe94c006f
Update for temperaturest
2012-11-12 11:54:21 -06:00
Quietust
55fcb7e3ca
One more missed
2012-11-12 08:33:05 -06:00
Quietust
766aca4911
Rename general_ref vectors for consistency
2012-11-12 08:27:58 -06:00
Alexander Gavrilov
c32f85d637
Merge remote-tracking branch 'warmist/master'
...
Conflicts:
plugins/Dfusion/include/OutFile.h
2012-11-12 10:50:48 +04:00
Warmist
ce8ada4419
More bug fixing
2012-11-11 22:14:00 +02:00
Warmist
3eb852a43b
Added cheat commands to companion-order, (including rumrushers)
2012-11-11 21:18:59 +02:00
Warmist
df3b791665
Fixed error in dfusion and added some readme.
2012-11-11 17:19:37 +02:00
Alexander Gavrilov
683da39636
Fix dfusion build on linux.
2012-11-11 17:24:25 +04:00
Alexander Gavrilov
d5c31942b5
Add a way to only count locally-made items in workflow.
2012-11-11 15:56:31 +04:00
Warmist
0e4df55364
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-11-11 12:46:55 +02:00
Warmist
33f674eee2
Removed dfusion lua files. Updated plugins.
2012-11-11 12:33:54 +02:00
Warmist
f1d4eac700
Pre-class remove
2012-11-11 11:58:43 +02:00
Anuradha Dissanayake
7ee817b324
Add gcc compile fixes
2012-11-11 19:42:30 +13:00
Anuradha Dissanayake
6803a83e07
Refresh constraints on map reload
2012-11-11 18:18:54 +13:00
Alexander Gavrilov
f86371cfc3
Try blocking any use of stockpiles for squad stuff in fix-armory.
2012-11-10 18:06:41 +04:00
Anuradha Dissanayake
b16bbdd6df
Generate correct constraint string for persistence
2012-11-11 03:00:55 +13:00
Alexander Gavrilov
56ef33ea0e
Support building steam engines on top of brooks without any down stairs.
2012-11-10 17:33:05 +04:00
Alexander Gavrilov
eb936c4ce0
Support milking and shearing in workflow.
2012-11-10 17:06:54 +04:00
Anuradha Dissanayake
0222b93bb0
Fix bug with non-repeating jobs getting protected
2012-11-10 03:47:15 +13:00
Anuradha Dissanayake
69bb6a5b3b
Finished dashboard, colour coding, trend calculation and charts, material selection screen, mouse support
2012-11-09 20:05:16 +13:00
Alexander Gavrilov
a7bf526f41
Make workflow consider squad-assigned items busy.
2012-11-08 21:27:56 +04:00
Petr Mrázek
0c70a448d0
Update submodules
2012-11-07 23:06:02 +01:00
Alexander Gavrilov
f6b6d730a0
Fix fix-armory constantly trying to store ammo already stored in chest.
2012-11-07 22:49:40 +04:00
Anuradha Dissanayake
b089221400
Inventory Monitor - first checkin
2012-11-06 06:59:51 +13:00
Alexander Gavrilov
edf80ff748
Show the sex of the unit in the bottom line of Dwarf Manipulator.
2012-11-04 18:03:02 +04:00
Alexander Gavrilov
9bf24bde10
More various updates for search.
...
- Keep the search state as long as the screen is alive.
- Properly forget saved state when clearing search.
- Fix the start column in render for stocks screen.
- Allow search by profession in all Units pages.
- Dismiss search when trying to trade.
2012-11-03 15:34:04 +04:00
Alexander Gavrilov
8bccfb1e9a
Fix gcc compiler errors and warnings in search, reindent plugin_init, etc.
2012-11-03 14:31:07 +04:00
Alexander Gavrilov
43ab172652
Merge remote-tracking branch 'falconne/master'
...
Conflicts:
plugins/zone.cpp
2012-11-03 14:07:42 +04:00
Alexander Gavrilov
71c1ba84e3
Merge remote-tracking branch 'q-github/master'
2012-11-03 14:05:15 +04:00
Quietust
3257eb80a1
Add checks to avoid crashing if we encounter a soulless unit
2012-11-02 16:28:48 -05:00
Warmist
e887c60e93
Removed unused buffers.
2012-11-02 21:00:35 +02:00
Warmist
86e4a42bdd
Small fix due to vmethod change
2012-11-02 20:59:05 +02:00
Warmist
6be65690f7
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-11-02 20:29:27 +02:00
Warmist
5295be5fdb
More work done. Only bin-plugs left (and docs)
2012-11-02 20:28:08 +02:00
Warmist
296d1cf090
More scripts for dfusion. Only fixes left, and updating bin-plugins (friendship and migrants(??))
2012-11-02 00:50:20 +02:00
Warmist
ba071468dc
New way of doing things!
...
Now using a class for menus, also no (non script) way to use bin-plugins.
2012-11-02 00:28:16 +02:00
Warmist
209d593f21
Another day, another commit.
2012-11-01 16:00:00 +02:00
jj
0a78064467
ruby: raise on invalid enum symbols
2012-10-31 16:11:06 +01:00
Alexander Gavrilov
69bdb0f8b8
Update fix-armory documentation and comments.
2012-10-31 11:31:31 +04:00
Alexander Gavrilov
05b73af9bb
Extend fix-armory with support for storing ammo in barracks.
2012-10-30 23:20:34 +04:00
Quietust
c4f544d796
Fix stupid MSVC
2012-10-30 13:50:14 -05:00
Quietust
b46885bb3c
Fix compile
2012-10-30 11:48:28 -05:00
Alexander Gavrilov
4fa826d2b9
Block instant creation of store in stockpile jobs when removing uniforms.
2012-10-30 13:11:57 +04:00
Alexander Gavrilov
3ff5d38a5c
Add a few utility functions to the main library.
2012-10-30 12:40:26 +04:00
Alexander Gavrilov
dc2805b1f3
Link the renderer vtable from libgraphics on linux.
2012-10-30 10:38:32 +04:00
Quietust
cd14bdfd43
Disable dfstream by default
2012-10-29 22:29:07 -05:00
Quietust
3a6b0357a2
Fix compilation on Windows, incorporate latest df-structures data
2012-10-29 16:56:22 -05:00
Quietust
c69ae2fc4a
Merge https://github.com/Mortal/dfhack
2012-10-29 16:34:26 -05:00
Mathias Rav
7646fa6aa3
Add dfstream plugin. Broadcasts the Dwarf Fortress display on TCP port 8008. For use with https://github.com/Mortal/dfstream
2012-10-29 22:18:50 +01:00
Alexander Gavrilov
7219200d17
Split the armory tweak into a separate plugin - it is too big now.
2012-10-28 22:05:00 +04:00
Alexander Gavrilov
ed4904fb66
Add a tweak that makes dwarves haul equipment from stockpiles to the armory.
2012-10-28 21:13:28 +04:00
Alexander Gavrilov
fa88ee5f17
Update the armory tweak to protect other potential squad equipment.
...
Specifically clothing in cabinets and flasks/backpacks/quivers in boxes.
2012-10-28 15:37:16 +04:00
Alexander Gavrilov
4c2c6a1911
Fix handling of Collect Webs jobs in workflow.
2012-10-26 23:53:18 +04:00
Alexander Gavrilov
c5d8bd9db6
Add a tweak to stop stockpiling items on weapon racks and armor stands.
2012-10-26 23:30:44 +04:00
Alexander Gavrilov
b976e01b8c
Follow the change in the base-type of job_skill.
2012-10-26 20:29:21 +04:00
jj
1b9d11090f
ruby: ANY_FREE/IN_PLAY
2012-10-25 13:44:01 +02:00
Alexander Gavrilov
1f994295b8
Consider assigned vehicles in use, and tweak text color rendering.
2012-10-25 13:20:41 +04:00
Alexander Gavrilov
79d2cb1a5c
Remove the C++ version of the job output deduction code and switch to lua.
2012-10-25 12:44:23 +04:00
Alexander Gavrilov
8eebfa007c
Tweak the workflow gui script to make the UI operate smoother.
2012-10-25 12:15:18 +04:00
Alexander Gavrilov
a7f1ceb75d
Link lua to workflow.
2012-10-24 23:01:31 +04:00
Alexander Gavrilov
59ec9b304e
Implement adding workflow constraints from gui/workflow.
2012-10-24 21:49:30 +04:00
Alexander Gavrilov
616c57257d
Support changing the constraint ranges from the workflow gui script.
...
TODO: implement creating completely new constraints.
2012-10-24 19:25:06 +04:00
Alexander Gavrilov
cd852e2240
Fix one more place that was using ANY_FREE.
2012-10-24 17:51:47 +04:00
Alexander Gavrilov
7b67df4b4e
Merge remote-tracking branch 'q-github/master'
2012-10-24 16:49:12 +04:00
Alexander Gavrilov
09f8e8e419
Start working on gui for workflow.
2012-10-23 21:42:03 +04:00
Quietust
27c7dfde4f
ANY_FREE -> IN_PLAY, to match terminology used in DF's error messages
2012-10-23 12:14:21 -05:00
Anuradha Dissanayake
94898a73fb
Add Search plugin comments
2012-10-23 21:20:51 +13:00
jj
cfbdf47f6e
follow rename Carried->Hauled in df-structures unit inventory mode
2012-10-22 19:37:12 +02:00
Anuradha Dissanayake
2fcceaa65e
Set priority over manipulator plugin
...
Include animal type is search
2012-10-22 21:44:02 +13:00
Anuradha Dissanayake
c433a8eeff
Better handling of Trade screen. Tracks marked items and handles re-orders is sort plugin is used to sort filtered list.
2012-10-22 19:54:36 +13:00
Kelly Martin
59ece3d4f1
Merge branch 'master' into autolabor
2012-10-21 17:25:14 -05:00
Anuradha Dissanayake
f501ae0748
Bug fix on unit sort
2012-10-22 01:09:10 +13:00
Anuradha Dissanayake
bf01ecd206
Added Trade screen
2012-10-22 00:48:27 +13:00
Warmist
a3f6e9e305
Small error fix
2012-10-21 13:46:12 +03:00