From 3e0e62675685bf18ef5ab0a12cdd97834462a0e4 Mon Sep 17 00:00:00 2001 From: Vicious Date: Thu, 9 Mar 2006 05:43:51 +0000 Subject: * included MAX_WEAPON_SIZE for flexible weapon types * more ninja/GS work git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5527 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index b5c078d06..b57ae27d2 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -507,20 +507,20 @@ int pc_calcweapontype(struct map_session_data *sd) if(sd->weapontype1 == 0 && sd->weapontype2 != 0)// 蕐 Only sd->status.weapon = sd->weapontype2; else if(sd->weapontype1 == 1 && sd->weapontype2 == 1)// ?Z? - sd->status.weapon = 0x11; + sd->status.weapon = MAX_WEAPON_TYPE+1; else if(sd->weapontype1 == 2 && sd->weapontype2 == 2)// ??? - sd->status.weapon = 0x12; + sd->status.weapon = MAX_WEAPON_TYPE+2; else if(sd->weapontype1 == 6 && sd->weapontype2 == 6)// ??蕀 - sd->status.weapon = 0x13; + sd->status.weapon = MAX_WEAPON_TYPE+3; else if( (sd->weapontype1 == 1 && sd->weapontype2 == 2) || (sd->weapontype1 == 2 && sd->weapontype2 == 1) ) // Z? - ?? - sd->status.weapon = 0x14; + sd->status.weapon = MAX_WEAPON_TYPE+4; else if( (sd->weapontype1 == 1 && sd->weapontype2 == 6) || (sd->weapontype1 == 6 && sd->weapontype2 == 1) ) // Z? - - sd->status.weapon = 0x15; + sd->status.weapon = MAX_WEAPON_TYPE+5; else if( (sd->weapontype1 == 2 && sd->weapontype2 == 6) || (sd->weapontype1 == 6 && sd->weapontype2 == 2) ) // ?? - - sd->status.weapon = 0x16; + sd->status.weapon = MAX_WEAPON_TYPE+6; else sd->status.weapon = sd->weapontype1; @@ -4335,7 +4335,8 @@ int pc_attack_timer(int tid,unsigned int tick,int id,int data) return 0; } - if(sd->status.weapon == 11 && sd->equip_index[10] < 0) + if((sd->status.weapon == 11 || sd->status.weapon == 17 || sd->status.weapon == 18 + || sd->status.weapon == 19 || sd->status.weapon == 20 || sd->status.weapon == 21)&& sd->equip_index[10] < 0) { clif_arrow_fail(sd,0); return 0; -- cgit v1.2.3-70-g09d2