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

scripts/exterminate: nicer error message on invalid race

develop
jj 2013-03-16 01:36:49 +01:00
parent cc5d354a59
commit 87b8dc137d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/exterminate.rb
Unescape Escape View File

@ -62,7 +62,7 @@ With no argument, lists possible targets with their head count.
With the special argument 'him' or 'her', kill only the currently selected creature. With the special argument 'him' or 'her', kill only the currently selected creature.
With the special argument 'undead', kill all undead creatures/thralls. With the special argument 'undead', kill all undead creatures/thralls.
The targets will bleed out, or if they are immune to that, will vanish in a puff of smoke. The targets will bleed out on the next game tick, or if they are immune to that, will vanish in a puff of smoke.
The special final argument 'magma' will make magma rain on the targets instead. The special final argument 'magma' will make magma rain on the targets instead.
@ -93,7 +93,10 @@ when /^undead/i
else else
raw_race = df.match_rawname(race, all_races.keys) raw_race = df.match_rawname(race, all_races.keys)
raise 'invalid race' if not raw_race if not raw_race
puts "Invalid race, use one of #{all_races.keys.sort.join(' ')}"
throw :script_finished
end
race_nr = df.world.raws.creatures.all.index { |cr| cr.creature_id == raw_race } race_nr = df.world.raws.creatures.all.index { |cr| cr.creature_id == raw_race }