Help with Fire Emblem skill based on Brave Sword equipped.

I have Yanfly's Action Sequences Pack 1-3, and I am trying to modify a skill's function based on a certain weapon equipped, while doubling an enemy based on higher speed (AGI), with the help of Yanfly's Auto Passive States plug-in.

-Link to Action Sequences: http://yanfly.moe/2015/10/11/yep-4-action-sequence-pack-1/

-Link to Auto Passive States: http://yanfly.moe/2015/10/17/yep-13-auto-passive-states/

The weapon I have is "Brave Weapon" from the Fire Emblem series, it grants 4 consecutive strikes (2 strikes if the user's speed is the lower than foe's speed).

The two skills I have are "Sol" and "Luna". They follow this sequence (without the Brave Weapon effect)

Code:

[/SIZE][/SIZE][/SIZE][/SIZE][/SIZE][/SIZE]
[SIZE=2][SIZE=4][SIZE=2][SIZE=4][SIZE=2][SIZE=4]<target action>
if (user.agi  >= target.agi)
motion swing: user, sword
motion wait: user
action animation: target
motion wait: user
action animation: target
wait for animation
action effect: target
motion wait: user
death break
wait for animation
action effect: target
motion wait: user
death break
else
motion swing: user, sword
motion wait: user
action animation: target
wait for animation
action effect: target
motion wait: user
death break
end
<target action>

Now here comes the part where the Brave Weapon should come into play into the two skills. Using the Brave Weapon should deal 4 hits with either of the two skills (unless the target's speed is higher making that 2 hits instead.)

Code:

[/SIZE][/SIZE][/SIZE][/SIZE][/SIZE][/SIZE]
[SIZE=2][SIZE=4][SIZE=2][SIZE=4][SIZE=2][SIZE=4]<target action>
if (user.isStateAffected(48))
if (user.agi  >= target.agi)
motion swing: user, sword
motion wait: user
action animation: target
motion wait: user
action animation: target
wait for animation
action effect: target
motion wait: user
death break
wait for animation
action effect: target
motion wait: user
death break
motion swing: user, sword
motion wait: user
action animation: target
motion wait: user
action animation: target
wait for animation
action effect: target
motion wait: user
death break
wait for animation
action effect: target
motion wait: user
death break
else
motion swing: user, sword
motion wait: user
action animation: target
motion wait: user
action animation: target
wait for animation
action effect: target
motion wait: user
death break
wait for animation
action effect: target
motion wait: user
death break
end
else
if (user.agi >= target.agi)
motion swing: user, sword
motion wait: user
action animation: target
motion wait: user
action animation: target
wait for animation
action effect: target
motion wait: user
death break
wait for animation
action effect: target
motion wait: user
death break
else
motion swing: user, sword
motion wait: user
action animation: target
wait for animation
action effect: target
motion wait: user
death break
end
</target action>

But when I use this code for the two skills and execute the action, the actor with Brave Sword completely follows the action sequence since she's equipped with the weapon and has the passive state (48) from the Brave Sword.

And unfortunately, I can't seem to get the actor to follow just the second half of the code since she doesn't have the Brave Sword, but a regular weapon. She's supposed to attack twice (or once if due to lower speed than enemy), but she will rather attack twice and then attack again but once.

Actor 1 uses a regular weapon:
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
If Actor 1 has a regular sword and uses "Sol" or "Luna", she should attack twice (or once if her speed is lower than the enemy).
But in testing with the seemingly long code, she instead attacks twice despite lower speed and then attacks again but once.
------------------------------------------------------------------------------------------------
If Actor was switched to a Brave Sword and used "Sol" or "Luna", she perfectly follows the code and attacks 4 times (2 times if user's speed is lower).
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Can someone please aid me on this problem here? How do I change the code where the actor should attack twice with Sol or Luna with a regular weapon equipped? And as I said, it works perfectly for the actor with the brave weapon.

-------------------------------------------
EDIT:
Ignore the "[SIZE]" on the two codes posted. I don't know how that got in there, when making the post.