diff options
| -rw-r--r-- | .gitignore | 49 | ||||
| -rw-r--r-- | db/packet_db.txt | 23 | ||||
| -rw-r--r-- | src/map/clif.c | 4 | ||||
| -rw-r--r-- | src/map/clif.h | 4 | ||||
| -rw-r--r-- | src/map/mob.c | 2 |
5 files changed, 33 insertions, 49 deletions
diff --git a/.gitignore b/.gitignore index 5eb3969ca..447365f22 100644 --- a/.gitignore +++ b/.gitignore @@ -23,9 +23,6 @@ /Makefile.cache /map-server_sql /mapcache -/rAthena - -# /3rdparty/cmake/ # /3rdparty/libconfig/ /3rdparty/libconfig/Makefile @@ -42,35 +39,6 @@ /log/*.log /log/map-server_sql.leaks -# /npc/airports/ - -# /npc/cities/ - -# /npc/jobs/ - -# /npc/kafras/ - -# /npc/merchants/ - -# /npc/mobs/ - -# /npc/other/ - -# /npc/quests/ - -# /npc/re/quests/eden/ -/npc/re/quests/eden/55-70.txt - -# /npc/warps/ - -# /npc/warps/cities/ - -# /npc/warps/dungeons/ - -# /npc/warps/fields/ - -# /npc/warps/other/ - # /src/char/ /src/char/Makefile /src/char/obj_sql @@ -86,16 +54,12 @@ /src/login/obj_txt /src/login/obj_sql -# /src/login/sql/ - # /src/map/ /src/map/Makefile /src/map/obj_sql /src/map/obj_txt /src/map/pcre.h -# /src/map/sql/ - # /src/test/ /src/test/Makefile /src/test/obj @@ -111,13 +75,18 @@ /tools/*.ilk /tools/*.pdb +# /vcproj-12/ +/vcproj-12/char-server_sql +/vcproj-12/login-server_sql +/vcproj-12/mapcache +/vcproj-12/map-server_sql +/vcproj-12/*.user + # /vcproj-10/ /vcproj-10/char-server_sql /vcproj-10/login-server_sql /vcproj-10/mapcache /vcproj-10/map-server_sql -/vcproj-10/txt-converter-char -/vcproj-10/txt-converter-login /vcproj-10/*.user # /vcproj-9/ @@ -126,7 +95,3 @@ /vcproj-9/login-server_sql /vcproj-9/map-server_sql /vcproj-9/mapcache -/vcproj-9/plugin-console -/vcproj-9/plugin-pid -/vcproj-9/txt-converter-char -/vcproj-9/txt-converter-login diff --git a/db/packet_db.txt b/db/packet_db.txt index f54690bd3..50fae98bc 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -34,7 +34,7 @@ // Client detection is faster when all clients use this version. // Version 23 is the latest Sakexe (above versions are for Renewal clients) //packet_db_ver: 25 -packet_db_ver: default +packet_db_ver: 30 packet_ver: 5 0x0064,55 @@ -1758,7 +1758,7 @@ packet_ver: 30 0x0977,14 //Monster HP Bar //2012-04-18aRagexeRE [Special Thanks to Judas!] -packet_ver:31 +packet_ver: 31 0x023B,26,friendslistadd,2 0x0361,5,hommenu,2:4 0x08A8,36,storagepassword,0 @@ -1776,5 +1776,22 @@ packet_ver:31 0x08E5,41,bookingregreq,2:4 //Added to prevent disconnections 0x08d2,10 +//2012-07-02aRagexeRE +packet_ver: 32 +0x0363,19,wanttoconnection,2:6:10:14:18 +0x0364,6,ticksend,2 +0x085a,7,actionrequest,2:6 +0x0861,8,movefromkafra,2:4 +0x0862,10,useskilltoid,2:4:6 +0x0863,10,useskilltopos,2:4:6:8 +0x0886,6,solvecharname,2 +0x0889,90,useskilltoposinfo,2:4:6:8:10 +0x089e,6,dropitem,2:4 +0x089f,6,takeitem,2 +0x08a0,8,movetokafra,2:4 +0x094a,6,getcharnamerequest,2 +0x0953,5,walktoxy,2 +0x0960,5,changedir,2:4 + //Add new packets here -//packet_ver: 32 +//packet_ver: 33 diff --git a/src/map/clif.c b/src/map/clif.c index e04941336..8d5090c2c 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5344,6 +5344,9 @@ void clif_cooking_list(struct map_session_data *sd, int trigger, uint16 skill_id /// Notifies clients of a status change. /// 0196 <index>.W <id>.L <state>.B (ZC_MSG_STATE_CHANGE) [used for ending status changes and starting them on non-pc units (when needed)] /// 043f <index>.W <id>.L <state>.B <remain msec>.L { <val>.L }*3 (ZC_MSG_STATE_CHANGE2) [used exclusively for starting statuses on pcs] +/// 08ff <id>.L <index>.W <remain msec>.L { <val>.L }*3 (PACKETVER >= 20111108) +/// 0983 <index>.W <id>.L <state>.B <total msec>.L <remain msec>.L { <val>.L }*3 (PACKETVER >= 20120618) +/// 0984 <id>.L <index>.W <total msec>.L <remain msec>.L { <val>.L }*3 (PACKETVER >= 20120618) void clif_status_change(struct block_list *bl,int type,int flag,int tick,int val1, int val2, int val3) { unsigned char buf[32]; @@ -17111,7 +17114,6 @@ int do_init_clif(void) { clif_config.packet_db_ver = -1; // the main packet version of the DB memset(clif_config.connect_cmd, 0, sizeof(clif_config.connect_cmd)); //The default connect command will be determined after reading the packet_db [Skotlex] - memset(packet_db,0,sizeof(packet_db)); //Using the packet_db file is the only way to set up packets now [Skotlex] packetdb_readdb(); diff --git a/src/map/clif.h b/src/map/clif.h index 45e2fd4f0..8e0fc6629 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -31,8 +31,8 @@ struct party_booking_ad_info; enum {// packet DB - MAX_PACKET_DB = 0xA00, - MAX_PACKET_VER = 31, + MAX_PACKET_DB = 0xF00, + MAX_PACKET_VER = 32, MAX_PACKET_POS = 20, }; diff --git a/src/map/mob.c b/src/map/mob.c index 6550d9b0e..aceebc506 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1537,7 +1537,7 @@ static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick) // Scan area for targets if (!tbl && mode&MD_LOOTER && md->lootitem && DIFF_TICK(tick, md->ud.canact_tick) > 0 && (md->lootitem_count < LOOTITEM_SIZE || battle_config.monster_loot_type != 1)) - { // Scan area for items to loot, avoid trying to loot of the mob is full and can't consume the items. + { // Scan area for items to loot, avoid trying to loot if the mob is full and can't consume the items. map_foreachinrange (mob_ai_sub_hard_lootsearch, &md->bl, view_range, BL_ITEM, md, &tbl); } |