Sekira's Martial arts Patches

[sekira]

I thought I would put all my martial arts patches in one place here, and also add in the changes that allow martial artists to use soft armor without penalty. All changes are in passive.lua in the calc_bonuses() function. I think I found all the places where martial artists are penalized for wearing soft armor, and changed that, but I'm not 100% sure. If someone finds another place, feel free to post the location and I'll see if I can come up with a lua fix, or if you did your own fix, post that. Enjoy!

WARNING: I'm sure most of you already know this, but just for those who don't (and for those who are absent minded about such things some times, like me) Any time you intend to change a lua script in the script folder or a txt file in the edit folder, be sure to back up your original file before you make the change. Lots of things can happen when you attempt to copy and paste code like this... if you are off by just one line, it could break the whole game. You want to be able to roll back the changes quickly instead of having to download the original files and copy them in.

---

First Patch:

        -- 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_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


                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

---

Next patch:

        -- Base AC from Martial Arts skill
        if (inven(INVEN_BODY).tval == 0) then

        	p_ptr.ac = p_ptr.ac + (p_ptr.skill[19] * 2)
        	p_ptr.dis_ac = p_ptr.dis_ac + (p_ptr.skill[19] * 2)
        end

would become:

        -- Base AC from Martial Arts skill
        if (not(inven(INVEN_BODY).tval == TV_HARD_ARMOR) and not(inven(INVEN_BODY).tval == TV_DRAG_ARMOR)) then

        	p_ptr.ac = p_ptr.ac + (p_ptr.skill[19] * 2) + ((p_ptr.skill[19] * 2 * p_ptr.skill[6] * 10) / 100)
        	p_ptr.dis_ac = p_ptr.dis_ac + (p_ptr.skill[19] * 2) + ((p_ptr.skill[19] * 2 * p_ptr.skill[6] * 10) / 100)
        end

---

Next Patch:

        -- Base AC bonus for the Unarmored Combat monk ability!
        if (p_ptr.abilities[(CLASS_MONK * 10) + 1] >= 1 and (inven(INVEN_BODY).tval == 0)) then

                p_ptr.ac = p_ptr.ac + (p_ptr.abilities[(CLASS_MONK * 10) + 1] * 4)
                p_ptr.dis_ac = p_ptr.dis_ac + (p_ptr.abilities[(CLASS_MONK * 10) + 1] * 4)
        end

would become:

        -- Base AC bonus for the Unarmored Combat monk ability!
        if (p_ptr.abilities[(CLASS_MONK * 10) + 1] >= 1 and not(inven(INVEN_BODY).tval == TV_HARD_ARMOR) and not(inven(INVEN_BODY).tval == TV_DRAG_ARMOR)) then

                p_ptr.ac = p_ptr.ac + (p_ptr.abilities[(CLASS_MONK * 10) + 1] * 4) + ((p_ptr.abilities[(CLASS_MONK * 10) + 1] * 4 * p_ptr.skill[6] * 10) / 100)
                p_ptr.dis_ac = p_ptr.dis_ac + (p_ptr.abilities[(CLASS_MONK * 10) + 1] * 4) + ((p_ptr.abilities[(CLASS_MONK * 10) + 1] * 4 * p_ptr.skill[6] * 10) / 100)
        end

---

Next Patch:
Note: This one had an error anyway... in the inner if statement conditional clause every instance of or should be replaced with and. The way it is written originally, you will always have monk speed no matter what armor you wear... might be a good reason to multiclass to monk for that one ability

        -- Monk Speed!
        if (p_ptr.abilities[(CLASS_MONK * 10) + 8] >= 1) then

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

                        p_ptr.pspeed = p_ptr.pspeed + ((p_ptr.abilities[(CLASS_MONK * 10) + 8] / 2) + 1)
                end
        end

would become:

        -- Monk Speed!
        if (p_ptr.abilities[(CLASS_MONK * 10) + 8] >= 1) then

                if (not(inven(INVEN_BODY).tval == TV_HARD_ARMOR) and not(inven(INVEN_BODY).tval == TV_DRAG_ARMOR)) then

                        p_ptr.pspeed = p_ptr.pspeed + ((p_ptr.abilities[(CLASS_MONK * 10) + 8] / 2) + 1)
                end
        end

EDIT: modified first patch per Variaz's comments in the first reply post.

[Variaz]

The last patch makes ashames me... Why do I always do this kind of mistakes??

But the first patch is to be redone completely, as the arm slot shouldn't be counted anymore in the new system, since shields are now used in the Wield slots.

For the second and third patches, I've implemented it yesterday, and credited you in a comment. I think it's a great idea!

[phlinn]

For the or's and ands, I had to parse it again. Not A and Not B and Not C is the same as Not(A or B or C). (Edit: Placed this after proper section. A compiler might actually convert that way in the background for you, but I doubt lua scripting is that performance minded. ) You may have started to write it the second way, which is marginally less complicated, then come back to it. I've done that sort of thing before. But I suggest the following as being better style for armor checks.

if (inven(INVEN_BODY).tval == 0 or inven(INVEN_BODY).tval == TV_SOFT_ARMOR) then

There's no additional use of 'not' to complicate the logic, and it makes it clear that it's only soft or nothing, leaving it open to adding additional types later without having to revisit this section unless you explicitly want to . It's also fewer cycles to calculate. You might want to add a TV_EMPTY constant to use in place of the 0 for readability.

Actually, since it's used as a check multiple places it might be worthwhile to create a function called Lightly_Armored(), which returns true if the user is wearing soft, nothing, or any additional light armor type you invent in the future. This has the added advantage that if you change your mind, you would only have to edit that function, not every place in the script it is checked.

[sekira]

Please, please, please don't feel bad.

You've created a great game here, and with all the work you've done it is understandable that some small things here and there would get missed. Everyone misses little things if they are trying to do some big huge task all by themselves. That is why you have us, the Portralis community to help! Everyone gives good input (even if I personally disagree with some opinions, I still love to see the discussion and hear things that get me thinking!) And some of us can help you with the monumental task of coding in some small ways.

I love this game, it is by far my favorite band variant. I think it is so much better that I never play any other variants anymore. Portralis is all I need because of all the options for character building, there is more replayablility than I will get from all the other variants combined, so I just chucked them. And just think: I feel this way even though it isn't even finished yet! ;D

As far as that first patch, I was wondering about that arm slot myself. I didn't change it because it looks like it should still work correctly as it is written, just an extra if condition that always resolves to true, so it always runs. I guess it would be good coding practice to remove the statement though, in case other tvals are created for the arms wear location. I'll edit my first post to do just that.

[sekira]

Phlinn:

I coded it that way purposely, because I have a hope of creating another class of items that work with martial arts: tattoos.

So we both were coding for expandability, but I was hoping to expand the wearables for martial artists, and you were expecting new wearables to not be compatable with martial artists, heh.

I like the idea of the function, but I'll leave that up to Variaz, since his will be the the version that is released to everyone. I'm happy to just patch existing functions, I'll let him make the call on new functions and such.

[Gando]

All in all I agree with Phlinn's remarks programatically speaking though i get not wanting to rewrite something thats going to be repatched by Variaz. I dont mind doing that sort of thing myself but Im fairly confident in my ability to not break the game while adding things.

The thing about arms Variaz is there are bracers still...or are you phasing those out too?

[Variaz]

I'm not removing bracers. They just don't hinder martial arts, so there's no point in having a check for them. That's what I meant actually, sorry if there was confusion.

Also, speaking of hindrance, I have now changed the script to allow soft armors to be usable in combination with Martial Arts. I have added all of sekira's patches too! So I will probably soon try out a monk.