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

Make unit_ishostile always return a non-nil value 

Have been messing with this function in the dfhack repl and when it returns nil it's hard to know what that means unless you have also already read the code. So this handles a couple spots in `unit_ishostile` that previously just returned false-ey `nil`s to return `false`
develop
Joel "The Merciless" Meador 2019-05-21 09:25:57 -04:00 committed by Joel Meador
parent ba54730ed0
commit cddfb87e22
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ruby/unit.rb
Unescape Escape View File

@ -134,7 +134,7 @@ module DFHack
# does not include ghosts / wildlife # does not include ghosts / wildlife
def unit_ishostile(u) def unit_ishostile(u)
# return true if u.flags3.ghostly and not u.flags1.inactive # return true if u.flags3.ghostly and not u.flags1.inactive
return unless unit_category(u) == :Others return false unless unit_category(u) == :Others
case unit_other_category(u) case unit_other_category(u)
when :Berserk, :Undead, :Hostile, :Invader, :Underworld when :Berserk, :Undead, :Hostile, :Invader, :Underworld
@ -152,6 +152,8 @@ module DFHack
case unit_checkdiplomacy_hf_ent(histfig, group) case unit_checkdiplomacy_hf_ent(histfig, group)
when 4, 5 when 4, 5
true true
else
false
end end
elsif diplo = u.civ_tg.unknown1b.diplomacy.binsearch(df.ui.group_id, :group_id) elsif diplo = u.civ_tg.unknown1b.diplomacy.binsearch(df.ui.group_id, :group_id)