- Corrected @whomap directly invoking msg_table[] rather than msg_txt()

- Guessed where the pet data goes in spawn packet 0x7c
- Updated Charge Attack's state from none to move_enable.
- Made tomahawk an NPC_SKILL so that it may not be plagiarized.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6459 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 22 insertions, 8 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a6546ce9f..ce7983b9d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,14 @@ 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.

 

+2006/05/03

+	* Corrected @whomap directly invoking msg_table[] rather than msg_txt()

+	  [Skotlex]

+	* Guessed where the pet data goes in spawn packet 0x7c. This may be wrong

+	  and not fix the pet issue, but I doubt it'll cause any problems that won't

+	  be fixed by making the pet move. [Skotlex]

+	* Updated Charge Attack's state from none to move_enable. [Skotlex]

+	* Made tomahawk an NPC_SKILL so that it may not be plagiarized. [Skotlex]

 2006/05/02

 	* Fixed standing up not really standing you up. [Skotlex]

 	* Moved battle_consume_ammo to the end of skill_castend_damage_id,

diff --git a/db/skill_db.txt b/db/skill_db.txt
index 44f9c6900..e4e2fe851 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -356,7 +356,7 @@
 334,9,6,4,0,1,0,1,1,yes,0,4,0,none,0	//WE_MALE#I Will Protect You#

 335,9,6,4,0,1,0,1,1,yes,0,4,0,none,0	//WE_FEMALE#I Look up to You#

 336,9,6,4,0,1,3,1,1,yes,0,4,1,none,0	//WE_CALLPARTNER#I miss You#

-337,9,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//ITM_TOMAHAWK#Throw Tomahawk#

+337,9,6,1,-1,0,0,1,1,no,0,2,0,weapon,0	//ITM_TOMAHAWK#Throw Tomahawk#

 338,-1,8,1,7,0,0,0,-2,no,0,2,0,weapon,0	//NPC_DARKCROSS#Cross of Darkness#

 339,0,6,4,7,0,0,10,1,no,33,258,0,magic,0		//NPC_GRANDDARKNESS#Grand cross of Darkness#

 340,9,8,1,7,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,2,0,magic,0	//NPC_DARKSTRIKE#Soul Strike of Darkness#

diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt
index dd9181a4a..d568d52a2 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -432,7 +432,7 @@
 543,0,0,20:30:40:50:60,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_NEN

 544,0,0,55:60:65:70:75:80:85:90:95:100,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_ISSEN

 

-1001,0,0,40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KN_CHARGEATK#ƒ`ƒƒ?[ƒWƒAƒ^ƒbƒN#

+1001,0,0,40,0,0,0,99,0,0,move_enable,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KN_CHARGEATK#ƒ`ƒƒ?[ƒWƒAƒ^ƒbƒN#

 1002,0,0,15,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//CR_SHRINK#ƒVƒ…ƒŠƒ“ƒN#

 1004,0,0,15,0,0,0,99,2,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AS_VENOMKNIFE#ƒxƒiƒ€ƒiƒCƒt#

 1005,0,0,25,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RG_CLOSECONFINE#ƒNƒ??[ƒYƒRƒ“ƒtƒ@ƒCƒ“#

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index d15b04937..92b27e103 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1835,11 +1835,11 @@ int atcommand_whomap(
 	}

 

 	if (count == 0)

-		sprintf(atcmd_output, msg_table[54], map[map_id].name); // No player found in map '%s'.

+		sprintf(atcmd_output, msg_txt(54), map[map_id].name); // No player found in map '%s'.

 	else if (count == 1)

-		sprintf(atcmd_output, msg_table[55], map[map_id].name); // 1 player found in map '%s'.

+		sprintf(atcmd_output, msg_txt(55), map[map_id].name); // 1 player found in map '%s'.

 	else {

-		sprintf(atcmd_output, msg_table[56], count, map[map_id].name); // %d players found in map '%s'.

+		sprintf(atcmd_output, msg_txt(56), count, map[map_id].name); // %d players found in map '%s'.

 	}

 	clif_displaymessage(fd, atcmd_output);

 

diff --git a/src/map/clif.c b/src/map/clif.c
index 51f8c5bb2..fb2157989 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1334,13 +1334,19 @@ int clif_spawn(struct block_list *bl)
 

 	} else {	//Mob spawn packet.

 		struct status_change *sc = status_get_sc(bl);

+		memset(buf,0,sizeof(buf));

 		WBUFW(buf,0)=0x7c;

 		WBUFL(buf,2)=bl->id;

 		WBUFW(buf,6)=status_get_speed(bl);

-		WBUFW(buf,8)=sc?sc->opt1:0;

-		WBUFW(buf,10)=sc?sc->opt2:0;

-		WBUFW(buf,12)=sc?sc->option:0;

+		if (sc) {

+			WBUFW(buf,8)=sc->opt1;

+			WBUFW(buf,10)=sc->opt2;

+			WBUFW(buf,12)=sc->option;

+		}

 		WBUFW(buf,20)=vd->class_;

+		WBUFW(buf,22)=vd->hair_style;  //Required for pets.

+		WBUFW(buf,24)=vd->head_bottom;	//Pet armor

+

 		WBUFPOS(buf,36,bl->x,bl->y);

 		clif_send(buf,packet_len_table[0x7c],bl,AREA_WOS);

 		if (disguised(bl)) {