Browse Source

- Removed the NPC/Dance/Song inf2 check of AbraCadabra. whether a skill can come out or not is entirely decided by the abra db file now.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7515 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 years ago
parent
commit
9b6412ad1b
2 changed files with 4 additions and 1 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 2 1
      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/07/04
 2006/07/04
+	* Removed the NPC/Dance/Song inf2 check of AbraCadabra. whether a skill can
+	  come out or not is entirely decided by the abra db file now. [Skotlex]
 	* Added structure s_addeffect to handle status change additions. Cleaned up
 	* Added structure s_addeffect to handle status change additions. Cleaned up
 	  relevant code. It is now possible to specify ANY status change, not just
 	  relevant code. It is now possible to specify ANY status change, not just
 	  the basic ones. NOTE that the code is proof-read, but untested! [Skotlex]
 	  the basic ones. NOTE that the code is proof-read, but untested! [Skotlex]

+ 2 - 1
src/map/skill.c

@@ -3338,7 +3338,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 			do {
 			do {
 				abra_skillid = rand() % MAX_SKILL_ABRA_DB;
 				abra_skillid = rand() % MAX_SKILL_ABRA_DB;
 				if (
 				if (
-					skill_get_inf2(abra_skillid)&(INF2_NPC_SKILL|INF2_SONG_DANCE|INF2_ENSEMBLE_SKILL) || //NPC/Song/Dance skills are out
+//Unneeded check, use the "per" field to know if the skill is valid.
+//					skill_get_inf2(abra_skillid)&(INF2_NPC_SKILL|INF2_SONG_DANCE|INF2_ENSEMBLE_SKILL) || //NPC/Song/Dance skills are out
 					!skill_get_inf(abra_skillid) || //Passive skills cannot be casted
 					!skill_get_inf(abra_skillid) || //Passive skills cannot be casted
 					skill_abra_db[abra_skillid].req_lv > skilllv || //Required lv for it to appear
 					skill_abra_db[abra_skillid].req_lv > skilllv || //Required lv for it to appear
 					rand()%10000 >= skill_abra_db[abra_skillid].per
 					rand()%10000 >= skill_abra_db[abra_skillid].per