Unarmed to damage bonus broken

[sekira]

I was playing a new martial artist last night and I think the martial arts skill bonus to damage is not correct.

I'm not at that computer so I can't say for certain, but I'm pretty sure that with a martial arts skill of 30, no weapon or shield or torso armor being used, my to damage bonus was 10, and it should be 150 just from martial arts alone, not including my other bonus.

I looked in passive.lua, and I think I found the error...

        -- When fighting bare handed, use the martial arts skill to boost
        -- the damages. Note that claws are NOT considered martial arts!!
        if (unarmed()) then

                if (p_ptr.body_monster > 0) then

                        if (inven(INVEN_ARM).tval == 0 or inven(INVEN_ARM).tval == TV_ARM_BAND) then

                                if (inven(INVEN_BODY).tval == TV_SOFT_ARMOR or inven(INVEN_BODY).tval == TV_HARD_ARMOR or inven(INVEN_BODY).tval == TV_DRAG_ARMOR) then

                                        p_ptr.to_h = p_ptr.to_h + p_ptr.skill[19]
                                        p_ptr.dis_to_h = p_ptr.dis_to_h + p_ptr.skill[19]
                                        
                                else

                                        p_ptr.to_h = p_ptr.to_h + (2 * p_ptr.skill[19])
                                        p_ptr.dis_to_h = p_ptr.dis_to_h + (2 * p_ptr.skill[19])
                                        
                                end
                        end

                else

                        p_ptr.to_h = p_ptr.to_h + (2 * p_ptr.skill[19])
                        p_ptr.dis_to_h = p_ptr.dis_to_h + (2 * p_ptr.skill[19])
                end
        end

should actually be

        -- When fighting bare handed, use the martial arts skill to boost
        -- the damages. Note that claws are NOT considered martial arts!!
        if (unarmed()) then

                if (p_ptr.body_monster > 0) then

                        if (inven(INVEN_ARM).tval == 0 or inven(INVEN_ARM).tval == TV_ARM_BAND) then

                                if (inven(INVEN_BODY).tval == TV_SOFT_ARMOR or inven(INVEN_BODY).tval == TV_HARD_ARMOR or inven(INVEN_BODY).tval == TV_DRAG_ARMOR) then

                                        p_ptr.to_h = p_ptr.to_h + p_ptr.skill[19]
                                        p_ptr.dis_to_h = p_ptr.dis_to_h + p_ptr.skill[19]
                                        p_ptr.to_d = p_ptr.to_d + (2 * p_ptr.skill[19])
                                        p_ptr.dis_to_d = p_ptr.dis_to_d + (2 * p_ptr.skill[19])
                                        
                                else

                                        p_ptr.to_h = p_ptr.to_h + (2 * p_ptr.skill[19])
                                        p_ptr.dis_to_h = p_ptr.dis_to_h + (2 * p_ptr.skill[19])
                                        p_ptr.to_d = p_ptr.to_d + (5 * p_ptr.skill[19])
                                        p_ptr.dis_to_d = p_ptr.dis_to_d + (5 * p_ptr.skill[19])
                                        
                                end
                        end

                else

                        p_ptr.to_h = p_ptr.to_h + (2 * p_ptr.skill[19])
                        p_ptr.dis_to_h = p_ptr.dis_to_h + (2 * p_ptr.skill[19])
                        p_ptr.to_d = p_ptr.to_d + (5 * p_ptr.skill[19])
                        p_ptr.dis_to_d = p_ptr.dis_to_d + (5 * p_ptr.skill[19])                
                end
        end

Variaz, could you confirm that I did find an error, or is the help file out of date? If I did find an error, could you confirm my fix?

[Variaz]

* My own post was deleted out of shame. *

[phlinn]

Umm...

- +5 to_damages per skill points(not with a shield, 2 with armor)

Isn't that what to_d is the variable for?

[Variaz]

[sekira]

I'm not really sure what happened there.

I hope I didn't inadvertently cause anyone any distress.

I was just trying to find out if what I found was a bug or not, and if it was a bug, fix it or find out how to fix it.

So just for clarification (I'm confused by the last couple posts), did I find a bug, and if I did, is my fix correct?

[Variaz]

Well, not a bug but an oversight.

Seems like it should be +5 to_d per points unless you have a shield on one hand, then it becomes +2.

[phlinn]

If i'm reading it right, it's 5 completely unarmed, 2 with armor, and nothing with a shield equipped. Since that section doesn't even run unless you are completely unarmed, I believe sekira's code fixed it.

Variaz, don't feel too bad. We still love you. I missed it at first too. I was scanning for to_d by itself, and to_damages was mentally discarded as too long.

Edit: my earlier post doesn't make sense with variaz's post deleted, but he missed the to_damages in the help file.

[Variaz]

That's exactly what happened to me! I use to_d everywhere, except here where I used to_damages.

[Gando]

seeing as the question of what the right algorithm is still up in the air...a correct fix post would be nice indeed (especially as Im revisiting the monk right now to investigate Phlinn's claims about the High Monk Class). ==EDIT== Im going to assume for now that the above fix is correct and patch it into my version.