- Corrected the new packet version entries for skilluseposinfo

- Corrected item reloading not unsetting the "delay consume" flag if the item had changed it's type.
- the Attack_Type variable in skill_attack now inherits the damage.flag properties, this fixes ranged status effects not triggering.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9992 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-03-12 16:10:15 +00:00
parent 29cb0abe60
commit 3035c863f9
4 changed files with 11 additions and 3 deletions

View File

@ -3,6 +3,12 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/03/13
* Corrected the new packet version entries for skilluseposinfo
* Corrected item reloading not unsetting the "delay consume" flag if the
item had changed it's type.
* the Attack_Type variable in skill_attack now inherits the damage.flag
properties, this fixes ranged status effects not triggering.
2007/03/12 2007/03/12
* Added player not attached crash prevention to countitem/countitem2. * Added player not attached crash prevention to countitem/countitem2.
* Probably corrected delitem not deleting pet eggs at all. * Probably corrected delitem not deleting pet eggs at all.

View File

@ -826,7 +826,7 @@ packet_ver: 19
packet_ver: 20 packet_ver: 20
0x006d,110 0x006d,110
0x0072,30,useskilltoid,10:14:26 0x0072,30,useskilltoid,10:14:26
0x007e,120,useskilltopos,10:19:23:38:40 0x007e,120,useskilltoposinfo,10:19:23:38:40
0x0085,14,changedir,10:13 0x0085,14,changedir,10:13
0x0089,11,ticksend,7 0x0089,11,ticksend,7
0x008c,17,getcharnamerequest,13 0x008c,17,getcharnamerequest,13
@ -883,7 +883,7 @@ packet_ver: 20
packet_ver: 21 packet_ver: 21
0x006d,110 0x006d,110
0x0072,25,useskilltoid,6:10:21 0x0072,25,useskilltoid,6:10:21
0x007e,102,useskilltopos,5:9:12:20:22 0x007e,102,useskilltoposinfo,5:9:12:20:22
0x0085,11,changedir,7:10 0x0085,11,changedir,7:10
0x0089,8,ticksend,4 0x0089,8,ticksend,4
0x008c,11,getcharnamerequest,7 0x008c,11,getcharnamerequest,7

View File

@ -742,7 +742,8 @@ static int itemdb_read_sqldb(void)
//(yggdrasil leaf, spells & pet lures) [Skotlex] //(yggdrasil leaf, spells & pet lures) [Skotlex]
id->type = IT_USABLE; id->type = IT_USABLE;
id->flag.delay_consume=1; id->flag.delay_consume=1;
} } else //In case of an itemdb reload and the item type changed.
id->flag.delay_consume=0;
// If price_buy is not NULL and price_sell is not NULL... // If price_buy is not NULL and price_sell is not NULL...
if ((sql_row[4] != NULL) && (sql_row[5] != NULL)) { if ((sql_row[4] != NULL) && (sql_row[5] != NULL)) {

View File

@ -1867,6 +1867,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
return 0; return 0;
dmg=battle_calc_attack(attack_type,src,bl,skillid,skilllv,flag&0xFFF); dmg=battle_calc_attack(attack_type,src,bl,skillid,skilllv,flag&0xFFF);
attack_type|=dmg.flag; //Add on the rest of attack properties.
//Skotlex: Adjusted to the new system //Skotlex: Adjusted to the new system
if(src->type==BL_PET) if(src->type==BL_PET)