C++ attack speed attribute on crossbows and bows

[dragon1155]

Hey guys, I'm having trouble getting the attack speed attribute to work with crossbows and bows. I tried a workaround I found in another discussion, but strangely, it only works when the attack speed attribute is applied to the ammunition, completely ignoring the attribute applied to the distance weapon.
player.cpp:

void Player::doAttacking(uint32_t)
{
    Item* item = getWeapon(false);
    uint32_t attackSpeed = (item && item->getAttackSpeed() != 0) ? item->getAttackSpeed() : getAttackSpeed();


    if(!lastAttack)
        lastAttack = OTSYS_TIME() - attackSpeed - 1;
    else if((OTSYS_TIME() - lastAttack) < attackSpeed)
        return;


    if(hasCondition(CONDITION_PACIFIED) && !hasCustomFlag(PlayerCustomFlag_IgnorePacification))
    {
        lastAttack = OTSYS_TIME();
        return;
    }


    if(const Weapon* _weapon = g_weapons->getWeapon(item))
    {

so, I think this line is for regular weapons (not including distance weapons that use ammunition):
player.cpp:

uint32_t Player::getAttackSpeed() const
{
    return ((weapon && weapon->getAttackSpeed() != 0) ? weapon->getAttackSpeed() : (vocation->getAttackSpeed() / std::max((size_t)1, getWeapons().size())));
}

interestingly, the attack speed value set for vocation in vocations.xml works well with all weapon types. Im not familiar with C++ at all, so i would really appreciate any suggestions and tips on what to do. TFS 0.4

 

[dragon1155]

bump

 

[pelek2002]

void Player::doAttacking(uint32_t)
{
Item* item = getWeapon(false);
uint32_t attackSpeed = (item && item->getAttackSpeed() != 0) ? item->getAttackSpeed() : getAttackSpeed();


if(!lastAttack)
lastAttack = OTSYS_TIME() - attackSpeed - 1;
else if((OTSYS_TIME() - lastAttack) < attackSpeed)
return;

if(const Weapon* _weapon = g_weapons->getWeapon(item))
{

Post automatically merged: Apr 27, 2024

void Player::doAttacking(uint32_t)

{

Item* item = getWeapon(false);

uint32_t attackSpeed = (item && item->getAttackSpeed() != 0) ? item->getAttackSpeed() : getAttackSpeed();





if(!lastAttack)

lastAttack = OTSYS_TIME() - attackSpeed - 1;

else if((OTSYS_TIME() - lastAttack) < attackSpeed)

return;



if(const Weapon* _weapon = g_weapons->getWeapon(item))

{

 

[dragon1155]

void Player::doAttacking(uint32_t)
{
Item* item = getWeapon(false);
uint32_t attackSpeed = (item && item->getAttackSpeed() != 0) ? item->getAttackSpeed() : getAttackSpeed();


if(!lastAttack)
lastAttack = OTSYS_TIME() - attackSpeed - 1;
else if((OTSYS_TIME() - lastAttack) < attackSpeed)
return;

if(const Weapon* _weapon = g_weapons->getWeapon(item))
{

Post automatically merged: Apr 27, 2024

hey, thanks for looking into this. unfortunately, after compiling this code nothings changed

 

[dragon1155]

bump

 

[dragon1155]

bump
@edit: i know i can fix this in lua (script for every distance weapon using ammo) - that works, but honestly, Im not totally happy with that solution :/

 

[dragon1155]

bump

 

[dragon1155]

bump

 

[dragon1155]

bumppp

 

[highsanta]

bump
@edit: i know i can fix this in lua (script for every distance weapon using ammo) - that works, but honestly, Im not totally happy with that solution :/

Why not?

 

[dragon1155]

Why not?

because it seems like it would be a whole lot more work than just changing a few lines in the source and then adding a simple attribute in items.xml. though, considering how (potentially) tough that change in the source might be, guess ill have to do it in lua ;p