diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-04 16:44:19 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-04 16:44:19 +0000 |
| commit | 9f301a592ce1c2646bbda3404e45e4276b072fcd (patch) | |
| tree | afab43a917fd76edc4a14d86ed61b5d193cc332e | |
| parent | c3c4b55d56bc72a77df54990832029a3280a72d2 (diff) | |
| download | hercules-9f301a592ce1c2646bbda3404e45e4276b072fcd.tar.gz hercules-9f301a592ce1c2646bbda3404e45e4276b072fcd.tar.bz2 hercules-9f301a592ce1c2646bbda3404e45e4276b072fcd.tar.xz hercules-9f301a592ce1c2646bbda3404e45e4276b072fcd.zip | |
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7515 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 3a66e9c95..a40191fb0 100644 --- a/Changelog-Trunk.txt +++ b/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.
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
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]
diff --git a/src/map/skill.c b/src/map/skill.c index cd67cceb2..dacb57a75 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3338,7 +3338,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in do { abra_skillid = rand() % MAX_SKILL_ABRA_DB; 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_abra_db[abra_skillid].req_lv > skilllv || //Required lv for it to appear rand()%10000 >= skill_abra_db[abra_skillid].per |