Commit Graph

3397 Commits (1618ccf5bb4044cdde97d45ef9e6173150cdddbc)
 

Author SHA1 Message Date
Warmist 95947a8635 Reworked to use start_dwarf_count offset from version info 2012-03-31 01:27:26 +03:00
Warmist c0cd5b9212 New offset for embark/simple-embark (starting dwarfs) 2012-03-31 00:54:37 +03:00
Quietust 0f3ae4499f New devel plugin - list counters for selected creature 2012-03-30 16:39:19 -05:00
Petr Mrázek a4c41bf64c Merge https://github.com/rh73/dfhack 2012-03-30 23:34:51 +02:00
Quietust 4d5aade389 Update changeitem, allow attempting to change item subtype 2012-03-30 16:34:07 -05:00
Petr Mrázek 1da914fb87 Fix init.lua 2012-03-30 21:59:35 +02:00
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 703aca81d8 Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-30 10:06:43 -07: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
Kelly Martin e8ee876ddc Track. 2012-03-29 21:18:57 -05: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
Quietust 07bb51946f Fix bug in MapCache - squash veins with the correct priority 2012-03-29 18:59:07 -05:00
Petr Mrázek dd33c80324 Another revision number... 2012-03-29 22:01:37 +02:00
Warmist 531704da8c print (after dfuse/dfusion) no longer needs tostring 2012-03-29 22:08:45 +03:00
Alexander Gavrilov ec48405f0a Fix mistake: static initialization code cannot access other static objects.
Specifically, the eid->type() call depends on the order of linking.
2012-03-29 22:56:06 +04: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 b847a026e3 Increment revision due to DERP. 2012-03-29 19:17:48 +02:00
Petr Mrázek adc0a6396d DERP: missed the readme. 2012-03-29 19:17:04 +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 cc54d5dfa9 Merge branch 'master' of git://github.com/angavrilov/dfhack
Conflicts:
	library/xml
2012-03-29 16:12:54 +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
Alexander Gavrilov a9b7c74a23 Allow assigning NULL lightuserdata to pointers, and export a global.
Otherwise there is no way to specify NULL via recursive lua table assign.
2012-03-29 14:47:33 +04:00
Alexander Gavrilov 85c91c92d8 Implement __pairs and __ipairs for DF objects.
Structs enumerate fields in memory order in pairs().
Containers & biftields enumerate int indexes in ipairs, and
string keys in pairs (i.e. using index-enum for arrays).
2012-03-29 14:39:13 +04:00
Alexander Gavrilov f6c6218909 Temporary tweak: patch in __pairs and __ipairs from 5.2 into lua 5.1. 2012-03-29 11:32:22 +04:00
Alexander Gavrilov 17ff235c81 Use codegen.out.xml instead of static.inc in cmake code generation rules.
Now only that file is guaranteed to always be overwritten.
2012-03-29 10:59:54 +04:00
Kelly Martin e968e936c7 Merge remote-tracking branch 'origin/master' 2012-03-28 23:24:35 -05:00
Kelly Martin d9d1d34d5a track 2012-03-28 23:24:05 -05: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
Kelly Martin 1a92f561fe autolabor: set reequip flag when appropriate 2012-03-28 21:56:23 -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
Petr Mrázek 757ad3334c Track structures 2012-03-29 00:27:03 +02:00
Petr Mrázek 1f5c586f62 Merge https://github.com/rh73/dfhack 2012-03-28 20:16:14 +02:00
Petr Mrázek 6235d2e801 Merge https://github.com/angavrilov/dfhack 2012-03-28 19:53:10 +02:00
Petr Mrázek 6ea0d810bb Merge https://github.com/mikestewart/dfhack 2012-03-28 19:52:36 +02:00