diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | db/mob_skill_db.txt | 8 | ||||
| -rw-r--r-- | db/skill_castnodex_db.txt | 8 | ||||
| -rw-r--r-- | doc/effect_list.txt | 8 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
5 files changed, 14 insertions, 14 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 2e4ffa353..fbcb96633 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ 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. 2007/06/11 + * Fixed NPC_PROVOCATION (now the casting mob doesn't keep attacking) * accumulated clif.c fixes [ultramage] - Fixed pet equip not displaying correctly at all - Removed old fixpos packet (the 'new' one is way smaller) diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt index 0427ffc09..e809fe881 100644 --- a/db/mob_skill_db.txt +++ b/db/mob_skill_db.txt @@ -305,14 +305,14 @@ 1060,Bigfoot@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,always,0,,,,,, 1060,Bigfoot@NPC_STUNATTACK,attack,179,2,500,1500,5000,no,target,always,0,,,,,, 1060,Bigfoot@SM_ENDURE,chase,8,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,6 -1062,Santa Poring@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,2,,,,, -1062,Santa Poring@NPC_HOLYATTACK,attack,189,1,2000,0,5000,yes,target,always,0,,,,,, -1063,Lunatic@AL_HEAL,idle,28,1,100,2000,60000,yes,self,always,0,,,,,, -1063,Lunatic@NPC_PROVOCATION,idle,194,1,20,0,0,yes,self,always,0,,,,,, 1061,Nightmare@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,, 1061,Nightmare@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,, 1061,Nightmare@NPC_MENTALBREAKER,attack,159,1,500,800,5000,no,target,always,0,,,,,, 1061,Nightmare@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,, +1062,Santa Poring@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,2,,,,, +1062,Santa Poring@NPC_HOLYATTACK,attack,189,1,2000,0,5000,yes,target,always,0,,,,,, +1063,Lunatic@AL_HEAL,idle,28,1,100,2000,60000,yes,self,always,0,,,,,, +1063,Lunatic@NPC_PROVOCATION,idle,194,1,20,0,0,yes,self,always,0,,,,,, 1064,Megalodon@NPC_CHANGETELEKINESIS,attack,169,1,500,2000,5000,no,self,myhpltmaxrate,30,,,,,,7 1064,Megalodon@NPC_UNDEADATTACK,attack,347,2,500,0,5000,yes,target,always,0,,,,,, 1065,Strouf@MG_FROSTDIVER,attack,15,9,500,1000,5000,yes,target,always,0,,,,,, diff --git a/db/skill_castnodex_db.txt b/db/skill_castnodex_db.txt index 57fbd3901..a942d99ce 100644 --- a/db/skill_castnodex_db.txt +++ b/db/skill_castnodex_db.txt @@ -3,15 +3,15 @@ // Cast: 0 - everything affects the skill's cast time // 1 - skill's cast time is not affected by dex // 2 - skill's cast time is not affected by statuses (Suffragium, etc) -// 4 - skill's cast time cannot be reduced by items (equip, cards, etc) +// 4 - skill's cast time is not affected by item bonuses (equip, cards) // // Delay: 0 - everything affects the skill's delay // 1 - skill's delay is not affected by dex -// 2 - skill's delay cannot be reduced by statuses (Magic Strings, etc) -// 4 - skill's delay cannot be reduced by items (equip, cards, etc) +// 2 - skill's delay is not affected by statuses (Magic Strings, etc) +// 4 - skill's delay is not affected by item bonuses (equip, cards) // // Note: Values are bit fields, add them up to combine their effects. -// Note: Delay setting 2 only makes sense when delay_dependon_dex is enabled. +// Note: Delay setting '1' only makes sense when delay_dependon_dex is enabled. // Example: 46,1,1 = Double Strafe's cast time and delay is not affected by dex. 263,0,2 //MO_TRIPLEATTACK diff --git a/doc/effect_list.txt b/doc/effect_list.txt index 2ee473b4e..63dcdc0b0 100644 --- a/doc/effect_list.txt +++ b/doc/effect_list.txt @@ -155,7 +155,7 @@ number description 133. Probably the old Frost Diver Effect 134. Probably the old Frost Diver Effect Without the Blue Circle 135. Probably the old Frost Diver Effect with Explosion -136. Poison +136. Slow Poison 137. Small pulsating green square (unused) 138. Fire pillar 139. Sandman Trap @@ -675,7 +675,7 @@ number description 653. Like Regeneration Number but Red 654. Like Regeneration Number but Purple 655. Mobs Skill (Change to Undead Element) -656. Final animation for Change Undead Element +656. Last animation before Change Undead Element finish 657. (nothing) 658. (nothing) 659. (nothing) @@ -684,7 +684,7 @@ number description 662. (nothing) 663. (nothing) 664. (nothing) -665. Little Blue Ball Falling From Sky +665. Little Blue Ball Falling From the Sky 666. Mobs Skill (Earthquake) 667. (nothing) 668. Mobs Skill (Scream) @@ -695,6 +695,6 @@ number description 673. (nothing) 674. Like Curse Effect 675. Like Parrying/Kyrie Eleison barrier but is Yellow with small Cross in every barrier piece -676. Mobs Skill (Maybe is Full Screen Slow Down, or something like Slow Cast) +676. Slow Poison (Clock Only) 677. Mobs Skill (Unamed) 678+. No More Effects in 2007/05/07 Sakexe diff --git a/src/map/skill.c b/src/map/skill.c index 918f90737..cfec700fe 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4879,8 +4879,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case NPC_PROVOCATION: clif_skill_nodamage(src,bl,skillid,skilllv,1); - if(md && md->skillidx >= 0) - clif_pet_performance(src,md->db->skill[md->skillidx].val[0]); + if (md) mob_unlocktarget(md, tick); break; case NPC_KEEPING: |