Petr Mrázek
5d8415c8d9
Merge https://github.com/warmist/dfhack
...
Conflicts:
plugins/Dfusion/luafiles/init.lua
2012-03-30 20:32:57 +02:00
Petr Mrázek
61fe605676
Merge https://github.com/RossM/dfhack
2012-03-30 20:30:28 +02:00
RossM
590ea629f3
Don't try to give labors to merchant guards or dead dwarves.
2012-03-30 10:01:33 -07:00
Alexander Gavrilov
063099e535
Set '_' to the first result value for both interactive shortcuts.
...
Makes it behave sort of like a general 'last result' reference.
2012-03-30 12:17:09 +04:00
Alexander Gavrilov
e989ca58db
Enhance the interactive interpreter mode of dfusion.
...
1. Reimplement Console.print* to behave exactly as the standard print
function, and apply print = Console.println from c++ init code.
2. Add a couple of convenience shortcuts to save some manual typing
when poking around data structures using the interactive prompt.
3. Change the prompt string to a more distinguished shape.
2012-03-30 11:57:27 +04:00
Alexander Gavrilov
81bc73f435
Follow a typo fix in flag name.
2012-03-30 10:44:52 +04:00
Quietust
6a7e7241b8
Fix bug in changevein - if multiple veins overlap the same tile, pick the LAST one rather than the first one
2012-03-29 19:05:53 -05:00
Warmist
531704da8c
print (after dfuse/dfusion) no longer needs tostring
2012-03-29 22:08:45 +03:00
Warmist
7d47208c65
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-29 21:33:41 +03:00
Petr Mrázek
0c2c94fa92
Remove random bad asserts
2012-03-29 20:18:14 +02:00
Petr Mrázek
69b1bbe59e
Turn sorting lambdas into functors in autolabor.
2012-03-29 20:00:26 +02:00
Petr Mrázek
5f53388890
Track stonesense
2012-03-29 19:03:51 +02:00
Petr Mrázek
541e0ca205
Merge https://github.com/rh73/dfhack
...
Conflicts:
plugins/changelayer.cpp
2012-03-29 18:42:45 +02:00
Petr Mrázek
004acdad4e
Tweaks!
...
Strip commands.clear() from all plugins
Fix changeitem - a variable name has changed in item flags
2012-03-29 18:37:22 +02:00
Robert Heinrich
2446fb7abf
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-29 18:27:40 +02:00
Robert Heinrich
a4995d7681
minor: return CR_WRONG_USAGE if user forgot to specify material and/or quality
2012-03-29 18:26:10 +02:00
Warmist
ce69cdb5df
New way of doing assignments used in tools/empregnate.
2012-03-29 18:39:11 +03:00
Robert Heinrich
836d8de73e
minor: commands.clear() is not needed in plugin_init() anymore. (done by pluginManager now)
...
removed some useless comments
2012-03-29 17:20:25 +02:00
Robert Heinrich
e249ef1377
minor fix (forgot a line break in helpstring)
2012-03-29 17:14:41 +02:00
Robert Heinrich
4525bee58f
Merge branch 'master' of git://github.com/ab9rf/dfhack
...
Conflicts:
library/xml
2012-03-29 16:10:31 +02:00
Robert Heinrich
9b75373403
Merge branch 'master' of git://github.com/peterix/dfhack
...
Conflicts:
library/xml
2012-03-29 16:03:12 +02:00
Robert Heinrich
88c914142b
added plugin changeitem (change material type and base quality)
2012-03-29 15:33:54 +02:00
Kelly Martin
453141920f
Merge remote-tracking branch 'upstream/master'
2012-03-28 23:22:28 -05:00
Kelly Martin
fea34bfdde
autolabor: set reequip flag when appropriate. also tweaked scoring to reduce job clumping.
2012-03-28 21:57:08 -05:00
Petr Mrázek
d82120a3db
More fixes
...
Include unistd.h in linux process file
Fix assert in autolabor
Don't print 'script missing' error on DF start
2012-03-29 02:49:44 +02:00
Kelly Martin
166392af62
Make autolabor accept "enable" and "disable" as well as "0" or "1".
...
Add ability to set target number of miners in autolabor with "autolabor miners".
2012-03-28 10:25:36 -05:00
Robert Heinrich
cebdbff46d
minor updates in readme.rst; moved changelayer plugin to main plugin folder
2012-03-28 17:00:33 +08:00
unknown
9604be2701
Fix crash in autolabor that happens when all dorfs decide to tipple at the same time
2012-03-28 16:59:38 +08:00
Warmist
13d7beda4b
Dfusion crash fix
2012-03-28 16:58:52 +08:00
Petr Mrázek
d2d16271f0
Track stonesense
2012-03-27 01:30:46 +02:00
Warmist
3761426ef5
Extern "C" mess fixed, bitlib mess fixed, bitlib added to autoload.
2012-03-26 18:48:24 +03:00
Warmist
18c94f8000
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-26 18:14:14 +03:00
Warmist
61f0bc66af
small changes to tools(lua)
2012-03-26 18:12:32 +03:00
Petr Mrázek
b4d458b47f
Track stonesense
2012-03-26 16:16:19 +02:00
Robert Heinrich
517fc310bf
documented changelayer plugin
2012-03-26 12:27:32 +02:00
Robert Heinrich
af344e57bd
Merge remote-tracking branch 'upstream/master'
2012-03-26 04:17:06 +02:00
Robert Heinrich
e63ba6f87d
added changelayer plugin
2012-03-26 04:15:42 +02:00
Petr Mrázek
1a19e17695
Track structures, stonesense
2012-03-26 03:39:14 +02:00
Petr Mrázek
85c3fbedcc
Merge https://github.com/warmist/dfhack
2012-03-26 03:38:16 +02:00
Robert Heinrich
96064da6ba
remove cursedump, use api instead
2012-03-25 12:11:00 +02:00
Robert Heinrich
b790909950
Merge remote-tracking branch 'upstream/master'
2012-03-25 11:57:13 +02:00
Warmist
63634de8d5
Fixed empregnate, and some other tools...
2012-03-25 11:48:53 +03:00
Petr Mrázek
def7e51564
Merge https://github.com/warmist/dfhack
2012-03-25 03:27:26 +02:00
Warmist
e36ed9ac07
Fixed more plugins (embark/friendship/simple_embark)
2012-03-25 01:31:58 +02:00
Petr Mrázek
ee66731d63
Remove Qt and server plugins.
2012-03-25 00:28:29 +01:00
Warmist
b8210a4cc7
Commented non working parts... Not very much left...
2012-03-25 01:16:41 +02:00
Warmist
b56917f91b
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-03-24 16:49:17 +02:00
Warmist
99da37ae46
Moving to new LuaWrapper.
2012-03-24 14:47:51 +02:00
Petr Mrázek
5453521da2
Make liquids and tiletypes reference Brushes.h in the build system
...
This should cause the header to show up in MSVC
2012-03-24 13:22:43 +01:00
Petr Mrázek
8a847dbaba
Tweaks and cleanups
...
Removed t_virtual.
Made lua use C++ compiler
Removed many silly exception types from Error.h and renamed the rest.
Removed Brush classes from tiletypes plugin.
2012-03-24 12:13:51 +01:00
Robert Heinrich
106aedbaa5
Merge remote-tracking branch 'upstream/master'
2012-03-24 12:02:50 +01:00
Robert Heinrich
9c38b1e6b5
minor: changed comment
2012-03-24 12:02:41 +01:00
Petr Mrázek
7fe5fc9a90
autolabor fixage
2012-03-24 01:33:29 +01:00
Petr Mrázek
e90da2bff1
Move autolabor to main plugin folder
2012-03-24 01:29:09 +01:00
Petr Mrázek
13cf648634
Merge https://github.com/RossM/dfhack
2012-03-24 01:26:36 +01:00
Petr Mrázek
addb5c87aa
liquids vs liquidsgo: FIGHT!
...
liquidsgo WINS, renamed to liquids to not confuse users.
2012-03-24 00:13:16 +01:00
Petr Mrázek
078caf363f
Move merged plugins into main plugin folder.
2012-03-23 23:49:28 +01:00
Petr Mrázek
2f76a52959
Merge https://github.com/rh73/dfhack
2012-03-23 23:06:48 +01:00
Petr Mrázek
90de6a1b62
Track submodules
2012-03-23 22:59:40 +01:00
Warmist
e10b1a50a3
Onfunction start
2012-03-23 11:07:54 +02:00
Warmist
61eef26c92
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-03-23 11:06:44 +02:00
Warmist
f25d15ce9c
Stupid mistake fixed
2012-03-22 23:27:25 +02:00
Warmist
8f72a642b2
Fixed getxyz(), getCreatureAtPos() (also returns nil/creature) and empregnate to work with look/talk
2012-03-22 21:47:33 +02:00
Robert Heinrich
aa807343cc
vampcheck is now generic cursecheck, added tweak clear-ghostly
2012-03-22 16:30:15 +01:00
RossM
c48c7cf874
Make logic closer to C# version. Address code comments from peterix.
2012-03-22 00:33:18 -07:00
Robert Heinrich
cf029e0a2e
fixed memory leak in liquids.cpp
2012-03-21 13:57:55 +01:00
Robert Heinrich
38686765a6
added plugin liquidsgo (like liquids but can run from hotkey)
2012-03-21 12:40:07 +01:00
Robert Heinrich
9277dfebb9
minor: added spaces between firstname, restofname and details (they got lost somehow when I wrote the check if firstname and first part of restofname is equal)
2012-03-20 11:55:11 +01:00
Robert Heinrich
c9701b536a
minor indentation fix
2012-03-20 11:41:17 +01:00
Robert Heinrich
9853cc137b
fixed double printing of first name if creature has no nickname
2012-03-20 11:01:33 +01:00
Robert Heinrich
6c6438267b
add plugin vampcheck
2012-03-20 09:36:36 +01:00
Alexander Gavrilov
bfb226b92e
Add a few comments.
2012-03-19 11:33:30 +04:00
RossM
14ae83ced5
Correctly handle military dwarves.
2012-03-18 16:54:47 -07:00
Petr Mrázek
2bec9f6711
Merge https://github.com/warmist/dfhack
2012-03-18 20:51:13 +01:00
Quietust
ff17e6c067
Neither of these plugins have anything at all in them, so don't bother building them
2012-03-18 14:44:10 -05:00
Quietust
a40c386cef
Update bprobe to always display ID numbers (and put them in parentheses after the name)
2012-03-18 14:42:13 -05:00
Warmist
fe211acb71
Small bug fixes
2012-03-18 16:23:31 +02:00
Petr Mrázek
a8a540eeb8
Merge https://github.com/warmist/dfhack
2012-03-18 13:14:00 +01:00
Petr Mrázek
19a317deeb
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-03-18 13:10:47 +01:00
Petr Mrázek
a092ded82d
Track stonesense
2012-03-18 12:48:09 +01:00
Warmist
3383aa7f6d
New pointer, setup pointer and df-array. ALso new tool, empregnate.
2012-03-18 12:24:28 +02:00
Alexander Gavrilov
b9ecd03fe2
Make the server suspend the core around calls unless disabled.
...
I expect the majority of methods will have to suspend the core
first thing anyway, so this will reduce typing and bugs.
Also get rid of the "me->" ugliness by splitting threadFn.
2012-03-18 11:04:15 +04:00
Petr Mrázek
293eb53677
Merge https://github.com/angavrilov/dfhack
2012-03-18 04:48:02 +01:00
Warmist
5367d28110
few small bugs (embark caste selection) and moved runsaved to non-auto.
2012-03-18 03:02:16 +02:00
Warmist
943c4abe76
updated readme.txt
2012-03-18 02:22:26 +02:00
Warmist
e1279d79db
small debug un-optimatization removed
2012-03-18 02:16:53 +02:00
Warmist
086ce16f0f
tools updated (not fully), added editor( edit everything in df)
2012-03-18 01:57:50 +02:00
Warmist
77738085e2
embark and friendship working.
2012-03-18 00:50:47 +02:00
Alexander Gavrilov
aa63493bb8
Add a ListSquads request.
2012-03-17 20:04:15 +04:00
Warmist
16861781c2
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-17 15:09:05 +02:00
Warmist
fd48c59aba
Started move to new system. Temp disabled non-working plugins.
2012-03-17 15:05:48 +02:00
Alexander Gavrilov
58eb199036
Add many new template functions for enums & bitfields.
...
An incompatible change: ENUM_KEY_STR returns std::string now.
The old behavior is available via enum_item_key_str function.
2012-03-17 12:52:22 +04:00
Alexander Gavrilov
14d6a62e1d
Move CoreService to a separate file.
2012-03-17 12:09:30 +04:00
unknown
89edfd4e15
Initial Autolabor code.
2012-03-16 21:45:52 -07:00
Petr Mrázek
3168a2ef62
Add a tiletype function to get basic shapes from shapes. Track modules.
2012-03-16 20:41:07 +01:00
Quietust
aa7f13266b
Fix dwarfexport to use enum macros
2012-03-15 20:43:27 -05:00
Quietust
5464564ef6
Merge branch 'master' of git://github.com/angavrilov/dfhack
...
Conflicts:
library/xml
2012-03-15 20:12:01 -05:00
Quietust
4d66218783
Update bprobe to print civzone subtypes
2012-03-15 20:09:56 -05:00
Warmist
dea215d0b9
Alignment done (at least for now). Now there is a working access to df.
2012-03-16 02:08:55 +02:00
Petr Mrázek
c72fb76316
MSVC fixage for the new socket API
2012-03-15 22:05:33 +01:00