MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Putnam3145/patch-20' into develop

develop
lethosor 2015-06-15 13:06:39 -04:00
parent 73de6a3051 8132e34240
commit 4e391603f5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
Unescape Escape View File

@ -30,6 +30,7 @@ DFHack Future
dwarfmonitor widgets' positions, formats, etc. are now customizable (see Readme) dwarfmonitor widgets' positions, formats, etc. are now customizable (see Readme)
dwarfmonitor weather display now separated from the date display dwarfmonitor weather display now separated from the date display
gui/gm-editor: Pointers can now be displaced gui/gm-editor: Pointers can now be displaced
gui/hack-wish: renamed to gui/create-item
"keybinding list" accepts a context "keybinding list" accepts a context
nyan: Can now be stopped with dfhack-run nyan: Can now be stopped with dfhack-run
quicksave: Restricted to fortress mode quicksave: Restricted to fortress mode

2
Readme.rst
Unescape Escape View File

@ -2254,7 +2254,7 @@ gui/*
Scripts that implement dialogs inserted into the main game window are put in this Scripts that implement dialogs inserted into the main game window are put in this
directory. directory.
* gui/hack-wish * gui/create-item
A graphical interface for creating items. A graphical interface for creating items.

6
scripts/gui/hack-wish.lua → scripts/gui/create-item.lua
Unescape Escape View File

@ -1,5 +1,5 @@
-- hack-wish.lua -- create-item.lua
-- Allows for script-based wishing. -- A gui-based item creation script.
-- author Putnam -- author Putnam
-- edited by expwnent -- edited by expwnent
@ -235,7 +235,7 @@ if not args.startup then
if unit then if unit then
hackWish(unit) hackWish(unit)
else else
qerror('A unit needs to be selected to use hackwish.') qerror('A unit needs to be selected to use gui/create-item.')
end end
else else
eventful.onReactionComplete.hackWishP=function(reaction,unit,input_items,input_reagents,output_items,call_native) eventful.onReactionComplete.hackWishP=function(reaction,unit,input_items,input_reagents,output_items,call_native)