expwnent
957a4da474
Minor changes.
2012-12-17 18:05:57 -05:00
expwnent
ef80dbacde
More fiddling. Almost kind of works.
2012-12-17 17:36:35 -05:00
expwnent
76fcf1c335
Digging invaders: multi-dimensional edge cost: always prefer walking over digging, no matter how far.
2012-12-17 14:22:45 -05:00
expwnent
94673e447d
diggingInvaders: reimplemented path-based digging. Works kind of ok.
2012-12-17 13:37:02 -05:00
expwnent
ed1766936b
diggingInvaders: sadly, it seems that minimum spanning tree is a terrible heuristic for vertex Steiner tree in this case.
2012-12-17 00:54:39 -05:00
expwnent
bf25ea5129
diggingInvaders: fixed a major bug with edge sorting.
2012-12-17 00:17:07 -05:00
expwnent
d79583a2c9
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-16 23:39:36 -05: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
expwnent
a61cbc661b
diggingInvaders: starting a rewrite. Unstable
2012-12-16 21:44:23 -05:00
expwnent
9aa95ddca8
diggingInvaders: int -> int32_t
2012-12-16 17:06:46 -05:00
expwnent
2760484c37
diggingInvaders: cleanup.
2012-12-16 16:53:02 -05:00
expwnent
131d19e4cf
Merge branch 'eventManager' into diggingInvaders
2012-12-16 16:43:58 -05:00
expwnent
8a242b3c0d
Merge branch 'master' into diggingInvaders
2012-12-16 16:34:45 -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
Warmist
86ec66c0fb
More work on dfusion. Embark anywhere script separated.
2012-10-21 13:42:55 +03:00
Anuradha Dissanayake
c5b38a24eb
Refactoring to use templates
2012-10-21 20:57:03 +13:00
Alexander Gavrilov
67674a7676
Merge remote-tracking branch 'jjyg/master'
2012-10-21 11:12:32 +04:00
jj
1f7a01d685
follow rename unit.military.squad_index to squad_id in df-structures
2012-10-20 22:35:39 +02:00
Anuradha Dissanayake
fd60db44ab
Search plugin, early work. Unit and stocks screen.
2012-10-21 00:49:46 +13:00
Alexander Gavrilov
687dc7105f
Merge remote-tracking branch 'kmartin/master'
2012-10-20 15:39:20 +04:00
Anuradha Dissanayake
6a54878a6b
Fix autobutcher resume
2012-10-20 01:38:08 +13:00
Warmist
da92fb9a1c
Start of dfusion module. Fixed small error in memscan.lua and start of custom embark command.
2012-10-17 21:43:44 +03:00
Quietust
5f4f540bfa
Fix "fastdwarf" command to print syntax where appropriate, silence warning
2012-10-17 07:57:14 -05:00
jj
ffe70e9ee7
ruby: unregister onupdate callback on exception
2012-10-17 14:40:28 +02:00
Kelly Martin
0003fe0b2a
Merge remote-tracking branch 'jjyg/master'
2012-10-12 20:33:07 -05:00
jj
c089534f73
ruby: fix assigning value to pointer to number
2012-10-12 13:33:58 +02:00
jj
1f88c0eeed
ruby: codegen: avoid bad vector_reftg accessor
2012-10-12 11:42:42 +02:00
jj
0547ee7f83
ruby: add magic "nolock " prefix to run ruby without Suspending main df
2012-10-12 11:12:31 +02:00
ab9rf
12eeb9e5c0
Correct wrong variable use in start_autonestbox.
2012-10-12 00:38:45 -05:00
jj
424c37c0ea
ruby: fix codegen to handle composite vtables
2012-10-11 17:51:49 +02:00
jj
9148079745
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-10-10 19:47:01 +02:00
jj
46a24a83fb
ruby: fix item_find(:selected) in item details screen
2012-10-10 18:01:57 +02:00
Alexander Gavrilov
41de37a5c1
Add a special workshop for add spatter reactions into example raws.
2012-10-10 18:29:59 +04:00
Alexander Gavrilov
7c969f774f
Split the liquipowder fix-dimensions hook into separate liquid and powder.
...
The item_liquipowder vtable is completely optimized out by MSVC.
2012-10-10 18:22:01 +04:00
jj
5cf42fd6f8
ruby: add Matinfo#===
2012-10-10 14:57:45 +02:00
Quietust
ab90e3eefe
Manipulator - take false identities into account
2012-10-07 17:35:41 -05:00
Warmist
49476818c4
Dfusion rebuild start (lua script side plugins)
2012-10-07 20:45:14 +03:00
Warmist
923ea3f4b0
Reactionhooks more usefull and gm-editor minor tweaks (e.g. search in containers)
2012-10-07 20:44:18 +03:00
Alexander Gavrilov
459c69046b
Dissolve the World module class into a namespace.
...
It made accessing persistent data way too cumbersome.
2012-10-06 13:46:20 +04:00
Alexander Gavrilov
696cc4a911
Stop autobutcher and autonestbox crashing if started without world.
2012-10-06 13:07:11 +04:00
Alexander Gavrilov
6fefd09072
Fix re-enabling autobutcher after being disabled.
2012-10-06 12:51:34 +04:00
Alexander Gavrilov
5396a67465
Some tweaking and edited NEWS.
2012-10-06 12:40:46 +04:00
jj
cbbb164dad
ruby: add MapTile distance_to and spiral_search
2012-10-05 20:44:29 +02:00
Quietust
ddcc2ee90d
Should use "break" in this construct, not "continue"
2012-10-04 20:20:35 -05:00
Quietust
6b3d85eb0f
Don't make teledwarf skip everything after it if there's a problem
2012-10-04 20:17:33 -05:00
Quietust
faa131942c
Partial rewrite of 'fastdwarf' plugin:
...
* add "fastdwarf 2" to use DF builtin "turbo speed" debug setting
* use Units::isCitizen() instead of race/civ check
* only scan active units, not all of them
* do both fastdwarf and teledwarf in the same loop
* teledwarf: don't use MapCache - it's faster to do it directly
* teledwarf: don't clear both occupancy flags - check unit 'prone' flag
* teledwarf: set proper unit occupancy flag at destination tile
* teledwarf: if destination tile has standing unit, make dwarf lie down
* cleanup 'fastdwarf' command
* improve help text
2012-10-04 20:14:50 -05:00
Alexander Gavrilov
9f687f64a4
Fix build.
2012-10-03 12:58:05 +04:00
Quietust
7962f24cce
Display actual key bindings for Manipulator
2012-10-02 10:20:54 -05:00
Kelly Martin
43532e4871
Progress commit of a rewrite of autolabor to draw from the jobs list and other world information. A lot still to do on this.
...
DO NOT MERGE INTO THE MAIN BRANCH. This code is incomplete and only vaguely tested.
2012-10-01 17:48:47 -05:00
jj
150704f1af
ruby: raise when using unknown symbols in viewscreen.feed
2012-10-01 16:05:07 +02:00
jj
fbc2d85609
ruby: rename building_isitemfree to item_isfree, add trader flag check
2012-10-01 11:14:00 +02:00
jj
4de245d691
ruby: install generated autogen after copying *.rb
2012-09-30 17:08:03 +02:00
jj
6fd002382f
ruby: fix cmake dependency on codegen.out.xml
2012-09-29 12:13:04 +02:00
Alexander Gavrilov
7a74088287
Make backspace seek to top left corner in manipulator.
2012-09-29 13:01:11 +04:00
Petr Mrázek
1bac22884e
xMerge https://github.com/jjyg/dfhack
2012-09-29 01:58:29 +02:00
jj
12f5e6028c
manipulator: avoid NULL deref with unassigned job in unit list
2012-09-29 01:38:32 +02:00
Petr Mrázek
4258d1eb83
Merge branch 'experimental' of https://github.com/expwnent/dfhack
2012-09-29 01:31:12 +02:00
expwnent
0e124bf62b
Merge branch 'teledwarf' into experimental
2012-09-28 19:17:56 -04:00
expwnent
d41c4849f9
Fixed unit_grounded in teleporting dwarf tile.
2012-09-28 19:17:12 -04:00
expwnent
4b99d096da
Merge branch 'teledwarf' into experimental
2012-09-28 19:07:29 -04:00
expwnent
1bde32fa5b
Fixed a tile occupancy problem with teleporting dwarves.
2012-09-28 19:06:22 -04:00
jj
44a74ddc38
ruby: remove unused var
2012-09-28 22:58:26 +02:00
expwnent
ce7e21f869
Merge branches 'digAll', 'misery' and 'teledwarf' into experimental
2012-09-28 16:44:08 -04:00
expwnent
79ac1a81b9
It was backwards when calling fastdwarf with just one argument. Also made it print the current status of fastdwarf when no arguments are given.
2012-09-28 16:36:37 -04:00
Petr Mrázek
53c6ee4673
Track structures and stonesense
2012-09-28 21:57:12 +02:00
jj
687657f2da
manipulator: show full group when navigating labor groups
2012-09-28 19:48:28 +02:00
jj
4a495c2c7f
manipulator: make cursor_down_z go to beginning of next group
2012-09-28 19:20:10 +02:00
jj
ca0097b910
manipulator: better screen width usage
2012-09-28 19:20:10 +02:00
jj
c4f26d0aa8
manipulator: make up/down keys wrap around
2012-09-28 19:20:04 +02:00
Alexander Gavrilov
783b218eec
Try a different color scheme when highlighting squad members in tweak.
2012-09-28 18:50:01 +04:00
Alexander Gavrilov
ba763b773d
New tweaks for the military assign to position screen.
2012-09-28 18:01:17 +04:00
Alexander Gavrilov
bd7cd690aa
Implement the common suggestion of Shift-Enter in trade screens.
2012-09-28 13:32:41 +04:00
Alexander Gavrilov
164c61b638
Forbid stuff from bins in siege-engine, if forbid ammo standing order set.
2012-09-27 10:43:42 +04:00
jj
7cc29250f8
fix for updated viewlist_petst
2012-09-26 18:22:07 +02:00
jj
d975ce5135
ruby: add onstatechange_register_once
2012-09-26 15:08:54 +02:00
Warmist
ddc83a0a72
Another dfusion nuking (not much left :) )
2012-09-25 11:30:38 +03:00
Warmist
0bee8c360e
Reaction hooks experimentation.
2012-09-25 10:25:47 +03:00
Warmist
bd2f3a9998
Moved lua out of dfusion.
...
Now lua is a script. supports --file (or -f) flag, usage: lua <command> or lua --file <filename> or just "lua" for interactive interpreter.
2012-09-25 00:24:37 +03:00
jj
f628c3732a
ruby: avoid smoothing grass/trees
2012-09-24 19:19:34 +02:00
jj
a622ee52e9
ruby: fix building_alloc Trap, and init Floodgates as closed
2012-09-24 19:11:42 +02:00
jj
a2bb322344
ruby: item_find now works in z/stocks
2012-09-24 15:40:35 +02:00
jj
962a057ffa
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-23 23:31:05 +02:00
jj
aefedb9887
ruby: MapTile#offset, tweak #dig to check for existing jobs
2012-09-23 23:26:57 +02:00
Alexander Gavrilov
6385128c28
Sort by units.active (arrival), and seek to top/bottom in manipulator.
2012-09-23 16:41:14 +04:00
jj
f2199c2951
ruby: fix activity zone_num
2012-09-23 11:44:27 +02:00
jj
f7272e4a8f
ruby: use cursor as default map_tile_at arg
2012-09-23 10:58:31 +02:00
jj
ebd4b94c2d
ruby: add onupdate_register_once
2012-09-22 11:57:33 +02:00
Alexander Gavrilov
038d62367e
Implement explicit hook priority in vmethod interpose.
...
This resolves a getName order conflict between power-meter and rename.
2012-09-22 13:14:06 +04:00
jj
b115edcf68
ruby: return selected zone in building_find
2012-09-20 19:57:43 +02:00
Alexander Gavrilov
e2d6a14720
Make manipulator re-read names and professions if change is suspected.
...
Namely, if it either invoked View Unit itself, or was queried
(possibly by the rename plugin) via getSelectedUnit.
2012-09-20 12:27:03 +04:00
Alexander Gavrilov
1f7c10252e
Support renaming activity zones.
...
This one required hooking the dwarfmode render method.
2012-09-20 11:48:53 +04:00
Alexander Gavrilov
462bedb757
Fix the rename plugin and script to use the new getSelectedBuilding API.
2012-09-20 11:11:59 +04:00
Alexander Gavrilov
c39a337223
Add unit/item/job/building getter hook vmethods to dfhack_viewscreen.
2012-09-20 11:11:20 +04:00
Quietust
1fd0654d63
Restore stonesense to the proper revision
2012-09-19 22:55:38 -05:00
jj
e154d5447b
ruby: fix building linking more
2012-09-20 01:33:10 +02:00
jj
2d5942d5d7
ruby: fix building linking
2012-09-20 00:33:22 +02:00
Warmist
bef9e9af7c
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-09-19 20:24:38 +03:00
jj
b6d9863172
ruby: allow Civzone constants in building_alloc
2012-09-19 19:19:58 +02:00
Alexander Gavrilov
a80f574be8
Only initialize siege engine in dwarf mode.
2012-09-19 19:52:57 +04:00
Alexander Gavrilov
b5ede66224
Switch some plugins to using world load/unload instead of map.
...
Otherwise they apply and remove hooks every time fast travel is used.
2012-09-19 19:46:54 +04:00
Quietust
19e1711a2f
Several Manipulator updates
...
* Add documentation to README, cleanup some docs for other plugins
* Preserve existing unit list order and cursor/scroll position
* Adjust mouse input handling, don't move cursor on left-click
2012-09-19 10:20:18 -05:00
jj
27fd3f5fc7
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-19 15:05:42 +02:00
jj
45c057b3d2
ruby: handle ptr-strings in df-structures
2012-09-19 14:25:14 +02:00
Alexander Gavrilov
65a382a2d7
Document some of the new stuff in the readme.
2012-09-19 15:55:08 +04:00
Warmist
a02a120e2d
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
...
Conflicts:
dfhack.init-example
library/xml
plugins/CMakeLists.txt
2012-09-18 23:46:16 +03:00
Quietust
69e8fcce91
Add mouse input to Manipulator, along with column labels
2012-09-18 13:57:06 -05:00
jj
b470abed90
ruby: misc tweaks
2012-09-18 18:13:22 +02:00
Alexander Gavrilov
a7998f71a2
Add a tweak workaround for the issue with container reactions in advmode.
2012-09-18 17:39:37 +04:00
Alexander Gavrilov
f2e7ee4756
Tweak the add spatter plugin.
2012-09-18 13:15:25 +04:00
Alexander Gavrilov
d70a79deb9
Follow changes in XML defs.
2012-09-18 13:11:11 +04:00
jj
57d01f0008
ruby: use ui.follow_item/unit in unit_find, show non-english names by default
2012-09-18 10:17:33 +02:00
jj
72141a3c9b
ruby: use implicit init-value -1 for ref-target/refers-to in codegen
2012-09-18 10:17:32 +02:00
jj
eacca723e0
ruby: fix building subtype/customtype init value
2012-09-18 10:17:32 +02:00
Alexander Gavrilov
36e44c682c
Add a plugin implementing 'add spatter to item' reactions.
2012-09-17 21:15:51 +04:00
Alexander Gavrilov
613063cef4
Add a tweak to fix subtractDimension of small amounts.
2012-09-17 17:19:24 +04:00
Alexander Gavrilov
82e870c8dd
Move siege engine out of devel.
2012-09-17 14:59:59 +04:00
Alexander Gavrilov
f2fde21b10
Implement a slightly more sensible aiming AI in siege engine.
2012-09-17 14:45:22 +04:00
Alexander Gavrilov
c1e20c6f05
Follow changes to structures.
2012-09-17 12:47:18 +04:00
Kelly Martin
58fda716e6
Explicit cast is required for MSVC.
2012-09-16 17:06:31 -05:00
Kelly Martin
847dadd3f5
Merge remote-tracking branch 'angavrilov/master'
2012-09-16 16:37:08 -05:00
Kelly Martin
38f920dd65
Merge remote-tracking branch 'q/master'
2012-09-16 16:36:51 -05:00
Warmist
b6d9a3c3ad
More useless stuff removed
2012-09-16 13:20:55 +03:00
Warmist
2f131178d8
Removed unused triggers folder
2012-09-15 18:05:53 +03:00
Warmist
4f9732bfda
Useless files removed, small bugfix
2012-09-15 15:44:15 +03:00
Alexander Gavrilov
000e3baf27
Implement skill-based miss probability in siege engine.
2012-09-14 20:57:03 +04:00
Alexander Gavrilov
811c096c0e
Vaporize liquids from barrels, and destroy bin contents in siege engine.
2012-09-14 20:22:49 +04:00
jj
5474ccacb6
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-14 14:30:25 +02:00
jj
b05905a0ba
ruby: basic stl::set<uint32> support, add Viewscreen.feed_keys
2012-09-14 13:55:22 +02:00
Alexander Gavrilov
d22591e240
Fix a file descriptor leak and a crash in linux getMemRanges.
2012-09-14 12:35:55 +04:00
Alexander Gavrilov
aaf5d181bd
Add yet one more performance-oriented tweak for temperature updates.
2012-09-14 12:14:36 +04:00
Quietust
c927623050
Rework handling of column positions, and insert a new "Happiness" column
2012-09-13 15:42:51 -05:00
Quietust
1325b70e41
Cleanup autolabor+cleanowned, fix depends/clsocket
2012-09-13 14:42:17 -05:00
Quietust
1d8c9a6a5f
Merge https://github.com/danaris/dfhack
2012-09-13 14:30:44 -05:00
Quietust
cae01250ff
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-09-13 14:08:26 -05:00
jj
a9ce19b826
ruby: add raw_rtti_classname to read real classname from RTTI info
2012-09-13 19:07:37 +02:00
Alexander Gavrilov
881fed41de
Support setting workshop profile for siege engines.
...
Since can't use built-in viewscreen, UI limited to skills only.
2012-09-13 20:20:56 +04:00
Alexander Gavrilov
5690a26439
On second thought, remove stockpile->engine links; keep only reverse.
...
Bi-directional links involve the risk of crashes if the plugin
is unloaded, and the engine subsequently deconstructed.
2012-09-13 17:49:41 +04:00
Quietust
ae6e0f617d
Make it clear that this is from DFHack, and properly name it Dwarf Manipulator
2012-09-13 08:27:28 -05:00
jj
19a150fb38
ruby: fix dig smooth overdigging
2012-09-12 20:59:37 +02:00
Quietust
c9d73cb6fb
Fix crash bug when using manipulator in Arena mode
2012-09-12 13:42:16 -05:00
Alexander Gavrilov
f06f9af6b8
Throw items from bins around in siege engine, like minecarts do.
2012-09-12 20:57:25 +04:00
Alexander Gavrilov
448d7e3633
Support linking siege engines to stockpiles.
...
Since they can't do that natively, the links object has to
be maintained in dfhack memory, and with dfhack persistence.
2012-09-12 12:15:12 +04:00
jj
cda17954c8
ruby: add MapTile.dig(:Smooth)
2012-09-12 01:07:19 +02:00
Alexander Gavrilov
b0938d7e0d
Allow specifying arbitrary items to use in catapults.
2012-09-11 22:46:17 +04:00
Alexander Gavrilov
3a075f4bc7
Trivial siege engine aiming at units, with logic in lua.
2012-09-11 19:17:24 +04:00
Timothy Collett
ccefd02ee3
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-10 11:56:23 -04:00
Timothy Collett
96abc903ab
Merge branch 'master' of http://github.com/peterix/dfhack
2012-09-10 11:54:56 -04:00
Timothy Collett
274d6038ad
Merge further changes (???)
2012-09-10 09:19:21 -04:00
Timothy Collett
270351f510
Merge branch 'master' of https://github.com/danaris/dfhack
2012-09-10 09:18:24 -04:00
Alexander Gavrilov
8ab615f6d0
Implement unit path prediction in siege engine.
2012-09-09 20:54:12 +04:00
Alexander Gavrilov
9679b7729c
Clean up the movement speed calculation function and move into the core.
2012-09-09 17:04:58 +04:00
Alexander Gavrilov
ec3d489bda
Move curse-affected attribute value getters to the core.
2012-09-09 12:51:08 +04:00
Alexander Gavrilov
a36fe25e72
Finish the effective skill computation function, and move to core.
2012-09-09 12:27:40 +04:00
Alexander Gavrilov
fb88aad51d
Reverse-engineer unit speed computation from DF code.
2012-09-08 21:07:18 +04:00
Alexander Gavrilov
003c3391d1
Implement aiming projectiles at random points in the designated area.
2012-09-08 15:49:46 +04:00
Alexander Gavrilov
bfa6ed3e08
Support setting the target area for the siege engine.
2012-09-08 13:46:02 +04:00
Alexander Gavrilov
325e294af2
Start the siege engine plugin with code to highlight obstacles on screen.
2012-09-07 19:54:32 +04:00
Warmist
85fc3384dd
Little cleanup and update to gm-editor
2012-09-07 17:25:39 +03:00
Warmist
0db873493a
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
...
Conflicts:
dfhack.init-example
2012-09-07 17:24:38 +03:00
Alexander Gavrilov
d0e630d4c3
Move steam engine out of devel, since it should be fully functional.
2012-09-06 17:10:58 +04:00
Alexander Gavrilov
d5ea05ebb8
Implement a pressure plate sensitive to machine power.
...
When built next to a gearbox, it will monitor its powered state.
2012-09-06 12:37:29 +04:00
Warmist
3dcaee7cb9
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-09-05 21:55:17 +03:00
Warmist
6fc10fc268
Fixed embark anywhere to use more sane code segment search
2012-09-05 21:52:54 +03:00
jj
e09b98216f
ruby: fix vector[length+50] = 0 segfault
2012-09-05 20:39:13 +02:00
Alexander Gavrilov
8d876cc7d9
Support renaming some buildings, and arbitrary units, via gui script.
2012-09-05 21:27:42 +04:00
jj
afbace8af6
ruby: alloc_building(:Furnace, :Smelter)
2012-09-05 19:18:21 +02:00
Alexander Gavrilov
9c6fcee9a9
Add steam engine documentation, and use barrel quality in efficiency calc.
2012-09-05 11:23:00 +04:00
Kelly Martin
96fec768c7
Merge remote-tracking branch 'angavrilov/master'
2012-09-04 12:05:05 -05:00
Alexander Gavrilov
aa449a2180
Add a tweak to work around the endless temperature update bug.
...
This obsoletes fix/stable-temp.lua, which only fixes items once.
2012-09-03 21:11:35 +04:00
Alexander Gavrilov
1618ccf5bb
Fix steam-engine build on msvc, and add a script for listing mem ranges.
2012-09-03 10:28:17 +04:00
Alexander Gavrilov
2249cb14fa
Require level 3 both for water & magma, and indicate level 5 by brightness.
2012-09-02 18:57:10 +04:00
Alexander Gavrilov
3b08ee44d1
Vary the internal power consumption of the engine depending on quality.
2012-09-02 17:32:44 +04:00
Alexander Gavrilov
67630776ee
Tweak steam engine raws.
2012-09-02 17:17:18 +04:00
Alexander Gavrilov
9c3843c1d4
Use new API in steam engine; always explode if destroyed with steam inside.
2012-09-02 14:59:13 +04:00
Alexander Gavrilov
3713c5ea9e
Add some APIs required by steam engine to the core.
2012-09-02 14:10:58 +04:00
jj
a4c028b3b7
ruby: buildings tweaks
2012-09-02 01:38:58 +02:00
Warmist
2574bb1e3d
embark anywhere upgrade.
2012-09-01 21:58:01 +03:00
Alexander Gavrilov
8536785d1d
Boilers made out of unsuitable materials should explode!
2012-09-01 20:46:34 +04:00
Alexander Gavrilov
bae85ac77d
Make the steam engine consume liquids from Z level below.
2012-09-01 17:52:51 +04:00
Alexander Gavrilov
74501d3197
Try preventing "boiling water" from freezing, and dump steam on destroy.
2012-09-01 14:42:19 +04:00
Warmist
532839a4d5
Embark anywhere ported
2012-09-01 10:54:45 +03:00
Alexander Gavrilov
f158e1894d
Further work on steam engine.
...
- Display water inside as 'boiling' by hooking item_liquid_miscst.
- Store current power in flags to avoid mess if items disappear etc.
- Suspend/unsuspend stoke jobs depending on steam level.
- Implement intelligent steam use rate and boiler capacity cap.
- Modify appearance of special tiles to display status.
2012-09-01 11:29:05 +04:00
jj
acdf0ffb42
ruby: fix create building map occupancy
2012-09-01 03:35:47 +02:00
Quietust
c68afdaad2
Display command key helper for Manipulator on Unit List, various tweaks
2012-08-31 20:35:35 -05:00
jj
dcc9498dbc
ruby: tweak apis
2012-09-01 03:22:48 +02:00
Warmist
262233aa33
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-08-31 23:53:31 +03:00
Alexander Gavrilov
ece0833c93
Prototype steam engine workshop :)
...
Very broken and incomplete still.
2012-09-01 00:22:55 +04:00
jj
ce608e4f6a
ruby: yield announcements for further customization
2012-08-31 19:16:13 +02:00
jj
54780cac3f
ruby: allow vmethod call with 6 args, use direct fptr
2012-08-31 15:51:22 +02:00
Warmist
90021b4e5e
simple_embark/plugin.lua sanitized
2012-08-30 20:41:10 +03:00
Alexander Gavrilov
e6b2cb73af
Add a tweak for pressure plate creature weight limit rendering.
...
Print them as readable "???K", instead of the normal truncated numbers.
2012-08-30 20:48:06 +04:00
Warmist
6b7594dbd7
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-08-30 18:52:48 +03:00
Quietust
c414aafc59
Add "Toggle Group" key
2012-08-30 10:03:12 -05:00
Alexander Gavrilov
1dee51abb0
Use generic DOCTOR tile for wound dresser labor.
2012-08-30 19:01:43 +04:00
Quietust
7676f07b06
Display creature graphics tiles beneath the column headers
2012-08-30 09:46:09 -05:00
Kelly Martin
a8158cb19a
Merge remote-tracking branch 'q/master'
2012-08-30 09:25:26 -05:00
Kelly Martin
604cf80832
Repurpose the nestboxes plugin as a watcher that automatically forbids fertile eggs.
2012-08-30 09:23:11 -05:00
Quietust
4e169558f5
Tweak column labels a bit
2012-08-28 15:52:26 -05:00
Quietust
b2587c1e6d
Fix skill sort
2012-08-28 15:33:22 -05:00
Warmist
fee3cfda96
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-08-28 20:18:12 +03:00
Alexander Gavrilov
834d7fa1fa
Tweak prospector: try using the biome elevation for soil depth.
...
Until a better idea presents itself (or maybe it is the right way).
Soil depth computation affects which soil layers are reported, and
Z level alignment of the layer stack.
2012-08-28 11:52:54 +04:00
expwnent
d69a7c63e3
Tabs to spaces.
2012-08-27 16:05:23 -04:00
expwnent
1a5f05768f
Made it not run every tick.
2012-08-27 15:06:41 -04:00
Quietust
c587ea2c74
Add new tweak command to make Train orders no longer count as patrol duty
2012-08-27 14:06:10 -05:00
Alexander Gavrilov
f73cebff68
Account for caves and magma sea in pre-embark prospector.
2012-08-27 23:03:17 +04:00
Alexander Gavrilov
f1915915b4
Follow change in xml again.
2012-08-27 23:03:02 +04:00
expwnent
e12e7ddd40
Fixed some memory leaks.
2012-08-27 14:42:00 -04:00
Quietust
5ad9b82ace
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-08-27 09:17:27 -05:00
Quietust
faf3bdf2b7
Adjust grid display - labors without skills use different tiles, and skills without labors have a red background
2012-08-27 09:04:32 -05:00
Alexander Gavrilov
5fed060d7d
Follow field rename in xml.
2012-08-27 16:01:11 +04:00
Quietust
f562871867
Add ViewCre and Zoom-Cre to Manipulator (by forwarding them to Unitlist)
2012-08-26 13:58:37 -05:00
Alexander Gavrilov
84f6663a07
Add a tweak to save the cursor position of dwarfmode between menus.
2012-08-26 21:19:56 +04:00
Alexander Gavrilov
8171652323
Support permaflow in liquids, including the gui.
2012-08-26 20:08:28 +04:00
Alexander Gavrilov
bee33fd486
Add a performance test for location caching in general refs.
2012-08-26 14:43:14 +04:00
Quietust
f6e4969e19
Key names are bright green, not dark green
2012-08-25 11:07:42 -05:00
Quietust
da6567e374
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-08-25 11:02:28 -05:00
Alexander Gavrilov
bd9800055d
Link to the lua library in the liquids plugin.
2012-08-25 20:01:03 +04:00
Quietust
dcdff40c85
Add sorting, command help; replace filtering with just using the current page of the UnitList viewscreen (and don't close it)
2012-08-25 10:57:50 -05:00
Alexander Gavrilov
41ad42d0fd
Expose the liquids plugin engine to lua, and make a wrapper gui script.
2012-08-25 10:37:03 +04:00
Petr Mrázek
21904fd607
Merge https://github.com/jjyg/dfhack
2012-08-24 22:30:39 +02:00
Petr Mrázek
9154564e71
Sync up submodules
2012-08-24 21:56:16 +02:00
expwnent
45efcfc763
Warning: does not work. Temp commit!
2012-08-24 11:40:51 -04:00
expwnent
cb24f1e53a
Converted tabs to spaces.
2012-08-23 22:25:25 -04:00
expwnent
15adb17559
Converted tabs to spaces.
2012-08-23 22:21:09 -04:00
expwnent
76cd941084
Added teledwarf: teleports dwarves to their destination instantly.
2012-08-23 22:17:28 -04:00
expwnent
6de9049dcc
Very rough draft. Invaders tend to overdestroy buildings. They also overdig. Also they only do it on user request. Also it happens instantly. Also they can't dig through constructions. Also I have tabs in the indentation.
2012-08-23 22:12:07 -04:00
expwnent
eac2f3f5d1
Added misery plugin: multiply effects of negative thoughts.
2012-08-23 22:05:35 -04:00
Warmist
27bdc9f2df
Start gutting dfusion.
2012-08-23 21:38:38 +03:00
jj
c339c7085a
ruby: add memory_check / memory_patch native methods
2012-08-23 18:44:03 +02:00
jj
5b0f37276f
Merge branch 'master' of git://github.com/quietust/dfhack
2012-08-23 17:19:15 +02:00
Quietust
7046a6abbc
Manipulator - store unit 'summary' objects so names/professions can be cached (for faster sorting), and properly display skill level when it's exactly at the level threshold
2012-08-22 20:52:19 -05:00
Quietust
132491e868
Use Units module to get unit colors, fix initial scroll position
2012-08-22 16:54:34 -05:00
Quietust
92c0b555dc
Use Units module to get profession strings
2012-08-22 11:15:05 -05:00
Quietust
83214ccb72
Fix bugs in window resizing, cleanup some other stuff
2012-08-22 10:43:26 -05:00
Alexander Gavrilov
7987ea9a98
Put some compatibility features into the base dfhack viewscreen.
2012-08-22 18:18:19 +04:00
Alexander Gavrilov
8969fc9435
manipulator: Inherit from dfhack_viewscreen, and don't use itoa.
2012-08-22 12:23:56 +04:00
Quietust
b6e5786b4f
Manipulator - display summary of selected unit + skill/labor
2012-08-21 16:41:20 -05:00
Quietust
2c0a42296c
New plugin: Dwarf Manipulator - enter the [u]nits list and press [l]abors to get a DwarfTherapist-style labor editor
2012-08-21 15:43:32 -05:00
expwnent
6d12368724
Added digtype to dig.cpp. Digtype allows designation of all veins of a given type.
2012-08-19 22:45:47 -04:00
Alexander Gavrilov
b8ee52131b
Add a module for painting tiles into the gps global.
2012-08-19 09:31:09 +04:00
Alexander Gavrilov
fd0bf2ef92
Extract the color enum from color_ostream to toplevel.
2012-08-19 09:21:25 +04:00
Quietust
8ed219d4e0
Add "clean plants", currently just removes water from rain (and lets you set them on fire)
2012-08-18 19:21:40 -05:00
Alexander Gavrilov
01ba2a31fc
Tweak the interpose API, and fix a couple of bugs.
2012-08-18 11:48:07 +04:00
Alexander Gavrilov
236ffd578b
Add experimental support for interposing vmethods of known classes.
...
The hairiest bit is the abuse of compiler-specific pointer-to-member
internals in order to provide more or less transparent API.
2012-08-17 22:40:53 +04:00
Petr Mrázek
cde97bba6f
Fix workflow some more
2012-08-13 07:42:02 +02:00
Petr Mrázek
4eedd6f5f0
Fix workflow.
2012-08-13 07:39:11 +02:00
jj
e659d845ab
ruby: fix LinkList.next=
2012-08-13 02:06:56 +02:00
jj
53a0536506
ruby: typo in building_deconstruct
2012-08-13 00:46:27 +02:00
jj@jj
5a880d619c
ruby: add MapTile#dig, tweak unit_iscitizen
2012-08-12 22:36:54 +02:00
Petr Mrázek
7cc100b26e
Merge https://github.com/jjyg/dfhack
2012-08-12 01:10:37 +02:00
jj
030bd8ab57
fix/loyaltycascade: clear the enemy status cache, dont require a save/reload anymore
2012-08-12 00:24:34 +02:00
jj
2362bb8eea
ruby: add popup_announcement method
2012-08-11 22:25:08 +02:00
jj
4c720c7504
ruby: add explicit paths everywhere for ruby-autogen
2012-08-11 20:11:00 +02:00
jj
942b245461
ruby: add method to check if an item is free for use as construction material
2012-08-11 20:08:33 +02:00
jj
8f4c39d3f5
showmood: fix fetched/needed quantity calculation
2012-08-09 17:07:20 +02:00
jj
7a03f93dbd
ruby: add raw stl::string allocation, add _cpp_delete, tweak readme
2012-08-09 14:50:52 +02:00
Valentin Ochs
2abb9a898c
One more autolabor cleanup
2012-08-08 10:50:07 +02:00
Valentin Ochs
4039d2c0b7
Don't disable autolabor when you input "autolabor 1|enable" and it's
...
already enabled.
2012-08-08 10:47:02 +02:00
Valentin Ochs
2c703ffbca
Remove unnecessary whitespace
2012-08-06 16:59:09 +02:00
Valentin Ochs
bb760bd376
Added quality constraints to workflow plugin
2012-08-06 16:55:55 +02:00
jj
c1bcd270e9
ruby: add spawn_water/spawn_magma methods to MapTile
2012-08-03 17:00:02 +02:00
jj
f400591080
ruby: use enums in single-bit values too
2012-08-03 16:53:54 +02:00
Petr Mrázek
81ea0345ad
Fix cage-related bug in the sort plugin.
2012-08-03 16:09:51 +02:00
jj
160487f7eb
ruby: move all generated/downloaded stuff in the build/ directory
2012-08-03 15:19:43 +02:00
jj
61195859e3
fix autolabor compilation error
2012-08-03 03:28:29 +02:00
Quietust
1ed6d6e7e0
Merge https://github.com/ab9rf/dfhack
...
Conflicts:
plugins/autolabor.cpp
2012-08-02 10:32:25 -05:00
Petr Mrázek
144802e3ef
Merge https://github.com/hashaash/dfhack
2012-08-02 14:44:52 +02:00
Petr Mrázek
8a8b45d840
Merge https://github.com/warmist/dfhack
2012-08-02 14:44:31 +02:00
Donald Ruegsegger
d8cb6e2c4e
Fixed seedwatch not working on reclaim
...
Just needed to add a check for game_type::DWARF_RECLAIM in two places
2012-08-01 19:52:50 -05:00
Kelly Martin
78fc850ce2
Autolabor: dwarves who are scheduled for a meeting are automatically cleared of all labors.
...
Labor to skill map is now generated at plugin start rather than with every iteration.
Also partially refactored the code; no behavioral changes from that.
2012-07-22 12:16:50 -05:00
Warmist
9f53f6296d
Removed Console module from dfusion.
2012-07-18 21:07:27 +03:00
Quietust
9705497a7e
Merge branch 'master' of git://github.com/peterix/dfhack
2012-07-17 10:39:20 -05:00
Quietust
2695d55090
Make indentation consistent (spaces), only display "not enabled" error if you actually try to do something
2012-07-17 10:27:30 -05:00
Kelly Martin
671f8cc1ff
Synchronize with changes to df-structures
2012-07-16 20:56:46 -05:00
Kelly Martin
ab4c4b63c0
Merge remote-tracking branch 'jjyg/master'
2012-07-16 20:52:15 -05:00
Kelly Martin
70ac2ffa17
Merge remote-tracking branch 'upstream/master'
2012-07-16 20:52:03 -05:00
Petr Mrázek
6be752454d
Check zone plugin parameters better
2012-07-12 02:16:08 +02:00
jj
0615a27663
ruby: refix unit_idlers, make unit_find handle 'u'nitlist viewscreen
2012-07-12 00:44:07 +02:00
jj
d8e55196c2
ruby: better handling of errors in onupdate callbacks
2012-07-11 23:25:55 +02:00
jj
b0edb33023
ruby: fix unit_idlers
2012-07-11 23:24:53 +02:00
Kelly Martin
b2623e68a3
Track submodules
2012-07-11 14:38:04 -05:00
Kelly Martin
79ca632f64
Merge remote-tracking branch 'jjyg/master'
2012-07-11 14:37:19 -05:00
Kelly Martin
08469abd09
Merge branch 'master' of https://github.com/angavrilov/dfhack.git
2012-07-11 14:37:06 -05:00
Quietust
0f23aba89d
Sync with df-structures
2012-07-11 14:31:47 -05:00
Kelly Martin
4c7c38df93
* Autolabor: really exclude the broker from all labors when trader requested
...
* Autolabor: add 'haulpct' config option to control percentage of non-idle dwarfs assigned to hauling labors (default is 33)
* Zones: allow nontamed birds to be nestboxes. warning: does not check for 'hostile to civilization' birds, so if you try to tame a hostile elk bird, !!fun!! will happen
* Stripcaged: changed default behavior to keep armor, reduced noisiness
2012-07-11 14:30:47 -05:00
Petr Mrázek
a5977db443
Merge https://github.com/jjyg/dfhack
2012-07-09 01:13:07 +02:00
Petr Mrázek
6975f643fc
Fixage, syncing with structures
2012-07-09 01:05:40 +02:00
jj
c20951c30b
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-07-06 20:37:14 +02:00
Alexander Gavrilov
4bbb185f7b
Fix build and allow autodump to any walkable tile (e.g. a stair).
2012-07-06 20:11:20 +04:00
jj
d645d6b046
ruby: better message on out of bounds array access
2012-07-06 13:32:39 +02:00
jj
bef5079d43
ruby: add vector.first/last
2012-07-06 13:25:47 +02:00
jj
8e17ebbefc
add SC_PAUSED / SC_UNPAUSED onStateChange events
2012-07-05 18:03:02 +02:00
Timothy Collett
45456b2230
Enable building Stonesense and Ruby support
2012-07-05 11:39:27 -04:00
Timothy Collett
068542d58a
Submodule changes
2012-07-05 11:39:08 -04:00
Kelly Martin
6f4f3039e1
Merge remote-tracking branch 'jjyg/master'
2012-07-05 10:04:28 -05:00
Kelly Martin
fb2d901e01
Merge remote-tracking branch 'angavrilov/master'
2012-07-05 10:01:04 -05:00
Kelly Martin
217ef18aef
Merge remote-tracking branch 'upstream/master'
2012-07-05 10:00:36 -05:00
Kelly Martin
83f00e5583
Autolabor: allow setting the nonidle hauler percentage at runtime.
...
Stripcaged: add keeparmor option
2012-07-05 09:59:28 -05:00
Timothy Collett
b718912184
Fix Ruby build
2012-07-05 10:31:55 -04:00
jj
7074048146
showmood: display number of items already collected
2012-07-05 16:17:41 +02:00