diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-12 16:10:15 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-12 16:10:15 +0000 |
| commit | 162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1 (patch) | |
| tree | f0cdd949fa860b66678f2b1d8c59464ce3b733d5 | |
| parent | 617311ef61537ed544e53e81956b8d687e8b8789 (diff) | |
| download | hercules-162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1.tar.gz hercules-162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1.tar.bz2 hercules-162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1.tar.xz hercules-162a6d4e0cf5c6728d594dfb70f6f12ac40a63c1.zip | |
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9992 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 6 | ||||
| -rw-r--r-- | db/packet_db.txt | 4 | ||||
| -rw-r--r-- | src/map/itemdb.c | 3 | ||||
| -rw-r--r-- | src/map/skill.c | 1 |
4 files changed, 11 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 4c373bf71..f04e237a1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,12 @@ Date Added 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. +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 * Added player not attached crash prevention to countitem/countitem2. * Probably corrected delitem not deleting pet eggs at all. diff --git a/db/packet_db.txt b/db/packet_db.txt index ff26ceb9b..bfca0c8e8 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -826,7 +826,7 @@ packet_ver: 19 packet_ver: 20 0x006d,110 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 0x0089,11,ticksend,7 0x008c,17,getcharnamerequest,13 @@ -883,7 +883,7 @@ packet_ver: 20 packet_ver: 21 0x006d,110 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 0x0089,8,ticksend,4 0x008c,11,getcharnamerequest,7 diff --git a/src/map/itemdb.c b/src/map/itemdb.c index f39e3d809..404d8514f 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -742,7 +742,8 @@ static int itemdb_read_sqldb(void) //(yggdrasil leaf, spells & pet lures) [Skotlex] id->type = IT_USABLE; 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 ((sql_row[4] != NULL) && (sql_row[5] != NULL)) { diff --git a/src/map/skill.c b/src/map/skill.c index 96fe56b94..93345b559 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1867,6 +1867,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds return 0; 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 if(src->type==BL_PET) |