Browse Source

- Adjusted the range of Wall of Fog to 9 and Spider Web to 7
- Modified a bit the skill packets of Sharp-Shooting and Brandish Spear in hopes of fixing it.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5824 54d463be-8e91-2dee-dedb-b68131a5f0ec

skotlex 19 năm trước cách đây
mục cha
commit
361d4018ee
4 tập tin đã thay đổi với 15 bổ sung6 xóa
  1. 2 0
      Changelog-Trunk.txt
  2. 2 1
      db/Changelog.txt
  3. 2 2
      db/skill_db.txt
  4. 9 3
      src/map/skill.c

+ 2 - 0
Changelog-Trunk.txt

@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 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.
 
 
 2006/03/31
 2006/03/31
+	* Modified a bit the skill packets of Sharp-Shooting and Brandish Spear in
+	  hopes of fixing it. [Skotlex]
 	* Should fix a bug in GM stealth mode (@hide). [Lance]
 	* Should fix a bug in GM stealth mode (@hide). [Lance]
 
 
 2006/03/30
 2006/03/30

+ 2 - 1
db/Changelog.txt

@@ -27,9 +27,10 @@
 
 
 =========================
 =========================
 
 
+03/31
+	* Adjusted the range of Wall of Fog to 9 and Spider Web to 7 [Skotlex]
 03/30
 03/30
 	* Fixed a lot of Jnames [Poki#3]
 	* Fixed a lot of Jnames [Poki#3]
-
 03/29
 03/29
 	* Updated FULL BUSTER aftercast delays, thanks to Haplo [Lupus]
 	* Updated FULL BUSTER aftercast delays, thanks to Haplo [Lupus]
 	- Fixed Rose Nile bonus
 	- Fixed Rose Nile bonus

+ 2 - 2
db/skill_db.txt

@@ -423,8 +423,8 @@
 401,0,6,4,0,1,0,1,1,yes,0,0,0,none,0	//CH_SOULCOLLECT#Zen#
 401,0,6,4,0,1,0,1,1,yes,0,0,0,none,0	//CH_SOULCOLLECT#Zen#
 402,9,6,1,0,1,0,5,1,no,0,0,0,none,0	//PF_MINDBREAKER#Mind Breaker#
 402,9,6,1,0,1,0,5,1,no,0,0,0,none,0	//PF_MINDBREAKER#Mind Breaker#
 403,0,0,4,0,1,0,1,1,yes,0,0,0,magic,0	//PF_MEMORIZE#Foresight#
 403,0,0,4,0,1,0,1,1,yes,0,0,0,magic,0	//PF_MEMORIZE#Foresight#
-404,3,6,2,2,1,0,5,1,yes,0,256,2,magic,0	//PF_FOGWALL#Blinding Mist#
-405,3,6,2,0,1,0,1,1,no,0,128,3,magic,0	//PF_SPIDERWEB#Fiber Lock#
+404,9,6,2,2,1,0,5,1,yes,0,256,2,magic,0	//PF_FOGWALL#Blinding Mist#
+405,7,6,2,0,1,0,1,1,no,0,128,3,magic,0	//PF_SPIDERWEB#Fiber Lock#
 406,0,6,4,-1,2,2,10,1,no,33,0,0,weapon,0	//ASC_METEORASSAULT#Meteor Assault#
 406,0,6,4,-1,2,2,10,1,no,33,0,0,weapon,0	//ASC_METEORASSAULT#Meteor Assault#
 407,0,6,4,0,1,0,1,0,no,0,0,0,none,0	//ASC_CDP#Create Deadly Poison#
 407,0,6,4,0,1,0,1,0,no,0,0,0,none,0	//ASC_CDP#Create Deadly Poison#
 408,9,6,4,0,1,0,1,1,yes,0,4,0,none,0	//WE_BABY#Baby#
 408,9,6,4,0,1,0,1,1,yes,0,4,0,none,0	//WE_BABY#Baby#

+ 9 - 3
src/map/skill.c

@@ -1911,7 +1911,6 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds
 	switch(skillid){
 	switch(skillid){
 	//Skills who's damage should't show any skill-animation.
 	//Skills who's damage should't show any skill-animation.
 	case SM_MAGNUM:
 	case SM_MAGNUM:
-	case KN_BRANDISHSPEAR:
 	case AS_SPLASHER:
 	case AS_SPLASHER:
 	case ASC_METEORASSAULT:
 	case ASC_METEORASSAULT:
 	case SG_SUN_WARM:
 	case SG_SUN_WARM:
@@ -1919,6 +1918,15 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds
 	case SG_STAR_WARM:
 	case SG_STAR_WARM:
 		clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, skillid, -1, 5);
 		clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, skillid, -1, 5);
 		break;
 		break;
+	case KN_BRANDISHSPEAR:
+	case SN_SHARPSHOOTING:
+		{	//Only display skill animation for skill's target.
+			struct unit_data *ud = unit_bl2ud(src);
+			if (ud && ud->skilltarget == bl->id)
+				clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, skillid, (lv!=0)?lv:skilllv, type);
+			else
+				clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, skillid, -1, type);
+		}
 	case PA_GOSPEL: //Should look like Holy Cross [Skotlex]
 	case PA_GOSPEL: //Should look like Holy Cross [Skotlex]
 		clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, CR_HOLYCROSS, -1, 5);
 		clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, CR_HOLYCROSS, -1, 5);
 		break;
 		break;
@@ -1940,7 +1948,6 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds
 			dmg.blewcount = 10;
 			dmg.blewcount = 10;
 		break;
 		break;
 	case KN_AUTOCOUNTER: //Skills that need be passed as a normal attack for the client to display correctly.
 	case KN_AUTOCOUNTER: //Skills that need be passed as a normal attack for the client to display correctly.
-	case SN_SHARPSHOOTING:
 	case TF_DOUBLE:
 	case TF_DOUBLE:
 	case GS_CHAINACTION:
 	case GS_CHAINACTION:
 		clif_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,dmg.type,dmg.damage2);
 		clif_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,dmg.type,dmg.damage2);
@@ -8268,7 +8275,6 @@ int skill_check_condition(struct map_session_data *sd,int skill, int lv, int typ
  */
  */
 int skill_castfix( struct block_list *bl, int skill_id, int skill_lv)
 int skill_castfix( struct block_list *bl, int skill_id, int skill_lv)
 {
 {
-	struct status_change *sc;
 	int castnodex = skill_get_castnodex(skill_id, skill_lv);
 	int castnodex = skill_get_castnodex(skill_id, skill_lv);
 	int time = skill_get_cast(skill_id, skill_lv);	
 	int time = skill_get_cast(skill_id, skill_lv);	
 	struct map_session_data *sd;
 	struct map_session_data *sd;