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

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

Conflicts:
	NEWS
develop
lethosor 2015-02-11 23:18:54 -05:00
parent bb4c2e1838 81b37f4f60
commit 3411704140
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
Unescape Escape View File

@ -12,6 +12,7 @@ DFHack Future
fix-armory compiles and is available again (albeit with issues) fix-armory compiles and is available again (albeit with issues)
gui/gm-editor: Added search option (accessible with "s") gui/gm-editor: Added search option (accessible with "s")
hack-wish: Made items stack properly. hack-wish: Made items stack properly.
modtools/skill-change: made level granularity work properly.
show-unit-syndromes should work show-unit-syndromes should work
zone: Stopped crash when scrolling cage owner list zone: Stopped crash when scrolling cage owner list
New Plugins New Plugins

6
scripts/modtools/skill-change.lua
Unescape Escape View File

@ -36,7 +36,7 @@ arguments
set the skill that we're talking about set the skill that we're talking about
-mode (add/set) -mode (add/set)
are we adding experience/levels or setting them? are we adding experience/levels or setting them?
-granularity (experience/levels) -granularity (experience/level)
direct experience, or experience levels? direct experience, or experience levels?
-unit id -unit id
id of the target unit id of the target unit
@ -87,9 +87,9 @@ if args.granularity == granularity.experience then
end end
elseif args.granularity == granularity.level then elseif args.granularity == granularity.level then
if args.mode == mode.set then if args.mode == mode.set then
skill.rating = df.skill_rating[args.value] skill.rating = args.value
elseif args.mode == mode.add then elseif args.mode == mode.add then
skill.rating = df.skill_rating[args.value + df.skill_rating[skill.rating]] skill.rating = args.value + skill.rating
else else
error 'bad mode' error 'bad mode'
end end