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

Merge remote-tracking branch 'jjyg/develop' into develop

develop
expwnent 2014-11-16 17:07:36 -05:00
parent 7560fbdb6b c43685ae76
commit f2e594ddfb
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ruby/ruby.rb
Unescape Escape View File

@ -241,7 +241,7 @@ end
# load autogenned file # load autogenned file
require './hack/ruby/ruby-autogen-defs' require './hack/ruby/ruby-autogen-defs'
require(RUBY_PLATFORM =~ /mswin/i ? './hack/ruby/ruby-autogen-win' : './hack/ruby/ruby-autogen-gcc') require(RUBY_PLATFORM =~ /mswin|mingw|cygwin/i ? './hack/ruby/ruby-autogen-win' : './hack/ruby/ruby-autogen-gcc')
# load all modules # load all modules
Dir['./hack/ruby/*.rb'].each { |m| require m.chomp('.rb') if m !~ /ruby-autogen/ } Dir['./hack/ruby/*.rb'].each { |m| require m.chomp('.rb') if m !~ /ruby-autogen/ }

23
scripts/superdwarf.rb
Unescape Escape View File

@ -3,13 +3,6 @@
$superdwarf_onupdate ||= nil $superdwarf_onupdate ||= nil
$superdwarf_ids ||= [] $superdwarf_ids ||= []
def unregister
unless $superdwarf_onupdate.nil?
df.onupdate_unregister($superdwarf_onupdate)
$superdwarf_onupdate = nil
end
end
case $script_args[0] case $script_args[0]
when 'add' when 'add'
if u = df.unit_find if u = df.unit_find
@ -17,7 +10,8 @@ when 'add'
$superdwarf_onupdate ||= df.onupdate_register('superdwarf', 1) { $superdwarf_onupdate ||= df.onupdate_register('superdwarf', 1) {
if $superdwarf_ids.empty? if $superdwarf_ids.empty?
unregister() df.onupdate_unregister($superdwarf_onupdate)
$superdwarf_onupdate = nil
else else
$superdwarf_ids.each { |id| $superdwarf_ids.each { |id|
if u = df.unit_find(id) and not u.flags1.dead if u = df.unit_find(id) and not u.flags1.dead
@ -32,11 +26,11 @@ when 'add'
when :Job2 when :Job2
a.data.job2.timer = 1 a.data.job2.timer = 1
when :Attack when :Attack
# Attack execution timer; fires when reaches zero. # Attack execution timer; fires when reaches zero.
a.data.attack.timer1 = 1 a.data.attack.timer1 = 1
# Attack completion timer: finishes action at zero. # Attack completion timer: finishes action at zero.
# An action must complete before target re-seleciton # An action must complete before target re-seleciton
# occurs. # occurs.
a.data.attack.timer2 = 0 a.data.attack.timer2 = 0
end end
} }
@ -67,13 +61,8 @@ when 'del'
puts "Select a creature using 'v'" puts "Select a creature using 'v'"
end end
if $superdwarf_ids.empty?
unregister()
end
when 'clear' when 'clear'
$superdwarf_ids.clear $superdwarf_ids.clear
unregister()
when 'list' when 'list'
puts "current superdwarves:", $superdwarf_ids.map { |id| df.unit_find(id).name } puts "current superdwarves:", $superdwarf_ids.map { |id| df.unit_find(id).name }