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

Merge pull request #528 from BenLubar/fix-showunitsyndromes 

fix ShowUnitSyndromes
develop
Lethosor 2015-02-03 21:23:33 -05:00
parent 7aa82fdbdb 02a14c6b57
commit 51b7b1adba
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/ShowUnitSyndromes.rb
Unescape Escape View File

@ -290,13 +290,13 @@ def get_interaction(interaction)
#result = result + "m=#{interaction.unk_170} n=#{interaction.unk_18c} o=#{interaction.unk_1a8} p=#{interaction.unk_1c4} q=#{interaction.unk_1e8} r=#{interaction.unk_25c} "
#result = result + "s=#{interaction.unk_278}"
if interaction.unk_25c == ""
if interaction.name == ""
name = "mystery"
else
name = interaction.unk_25c
name = interaction.name
end
return "ability=#{get_display_name(interaction.unk_25c, interaction.unk_e4)}, delay=#{interaction.unk_278}, actionType=TODO, range=TODO, maxTargets=TODO"
return "ability=#{get_display_name(interaction.name, interaction.verb[0])}, delay=#{interaction.usage_delay}, actionType=TODO, range=TODO, maxTargets=TODO"
end
def get_effect_flags(flags)
@ -702,7 +702,7 @@ def get_effect(logger, ce, ticks, showdisplayeffects)
when "DISPLAY_TILE"
if !showdisplayeffects then return "", Output::DEFAULT end
name = "Tile"
desc = "Tile=#{ce.unk_6c}, Colour=#{ce.unk_70}"
desc = "Tile=#{ce.tile}, Colour=#{ce.color}"
color = Output::DEFAULT
when "FLASH_TILE"
if !showdisplayeffects then return "", Output::DEFAULT end
@ -715,8 +715,8 @@ def get_effect(logger, ce, ticks, showdisplayeffects)
name = "Physical"
desc = "speed("
value = ce.unk_6c
percent = ce.unk_70
value = ce.bonus_add
percent = ce.bonus_perc
if(value!=0)
desc = desc + "%+d" % value
end
@ -745,11 +745,11 @@ def get_effect(logger, ce, ticks, showdisplayeffects)
color = Output::GREEN
when "SKILL_ROLL_ADJUST"
name = "Skill check"
desc = "modifier=#{ce.unk_6c}%, chance=#{ce.unk_70}%"
desc = "modifier=#{ce.multiplier}%, chance=#{ce.chance}%"
if ce.unk_6c > 100
if ce.multiplier > 100
color = Output::GREEN
elsif ce.unk_6c < 100
elsif ce.multiplier < 100
color = Output::RED
else
color = Output::DEFAULT
@ -758,8 +758,8 @@ def get_effect(logger, ce, ticks, showdisplayeffects)
when "BODY_TRANSFORMATION"
name = "Transformation"
if ce.unk_6c > 0
chance = ", chance=#{ce.unk_6c} "
if ce.chance > 0
chance = ", chance=#{ce.chance} "
else
chance = ""
end
@ -785,19 +785,19 @@ def get_effect(logger, ce, ticks, showdisplayeffects)
color = data[1]
when "MATERIAL_FORCE_MULTIPLIER"
name = "Material force multiplier"
desc = "received damage scaled by #{(ce.unk_c8 * 100 / ce.unk_cc * 100)/100}%"
if ce.unk_cc > ce.unk_c8
desc = "received damage scaled by #{(ce.fraction_mul * 100 / ce.fraction_div * 100)/100}%"
if ce.fraction_div > ce.fraction_mul
color = Output::GREEN
elsif ce.unk_cc < ce.unk_c8
elsif ce.fraction_div < ce.fraction_mul
color = Output::RED
else
color = Output::DEFAULT
end
if ce.unk_c4 >=0
mat = df.decode_mat(ce.unk_c0, ce.unk_c4 )
elsif ce.unk_c0 >= 0
mat = df.decode_mat(ce.unk_c0, 0 )
if ce.mat_index >=0
mat = df.decode_mat(ce.mat_type, ce.mat_index )
elsif ce.mat_type >= 0
mat = df.decode_mat(ce.mat_type, 0 )
else
mat = nil
end