summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/skill_cast_db.txt2
-rw-r--r--db/skill_db.txt40
-rw-r--r--src/map/skill.c2
5 files changed, 27 insertions, 22 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6e60b6b89..88ddcdda5 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ 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/05/08
+ * Made all Soul Link Spirit skills not be castable on self. [Skotlex]
+ * Changed rate of NPC status effect skills to 50+10*lv% base chance
+ (guessed, but better than 100% for all levels) [Skotlex]
+ * Changed max level of NPC status effect skills to 5 [Skotlex]
* Increased max number of tries to find a random spot in maps to 1000 since
some maps have so many non-walkable tiles it's hard to find one in just 100
tries. [Skotlex]
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 4734e3789..90f38e546 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -27,6 +27,7 @@
=========================
05/08
+ * Corrected Stun Duration for Meteor assault to 3 secs. [Skotlex]
* Reduced Stun duration of multiple skills to 3 secs. Skills affected:
Meteor Storm, Land Mine, Bash (fatal blow), Throw Stone, NPC_LICK, Raid,
shield Charge, Cart Termination. [Skotlex]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index eade6637a..b64b13e6f 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -649,7 +649,7 @@
//-- PF_SPIDERWEB
405,0,0,0,30000,8000
//-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3)
-406,500,500,0,0,10000:5000:120000
+406,500,500,0,0,10000:3000:120000
//-- ASC_CDP
407,0,500,0,0,0
//==========================================
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 9a32c152f..ffee96135 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -195,13 +195,13 @@
173,1,6,4,3,2,5,10,1,no,0,2,0,misc,3 //NPC_SELFDESTRUCTION#Suicide bombing#
174,-1,6,1,-1,2,3,10,1,no,0,2,0,weapon,0 //NPC_SPLASHATTACK#Range attack#
175,0,0,4,0,1,0,10,1,no,0,2,0,misc,0 //NPC_SUICIDE#Suicide#
-176,-1,6,1,-1,0,0,10,1,no,0,2,0,weapon,0 //NPC_POISON#Poison Attack#
-177,7,6,1,-1,0,0,10,1,no,0,2,0,weapon,0 //NPC_BLINDATTACK#Darkness Attack#
-178,-1,6,1,-1,0,0,10,1,no,0,2,0,weapon,0 //NPC_SILENCEATTACK#Silence Attack#
+176,-1,6,1,-1,0,0,5,1,no,0,2,0,weapon,0 //NPC_POISON#Poison Attack#
+177,7,6,1,-1,0,0,5,1,no,0,2,0,weapon,0 //NPC_BLINDATTACK#Darkness Attack#
+178,-1,6,1,-1,0,0,5,1,no,0,2,0,weapon,0 //NPC_SILENCEATTACK#Silence Attack#
179,-1,6,1,-1,0,0,5,1,no,0,2,0,weapon,0 //NPC_STUNATTACK#Stun Attack#
-180,7,6,1,-1,0,0,10,1,no,0,2,0,weapon,0 //NPC_PETRIFYATTACK#Petrify Attack#
-181,7,6,1,7,0,0,10,1,no,0,2,0,weapon,0 //NPC_CURSEATTACK#Cursing Attack #
-182,-1,6,1,-1,0,0,10,1,no,0,2,0,weapon,0 //NPC_SLEEPATTACK#Sleep attack#
+180,7,6,1,-1,0,0,5,1,no,0,2,0,weapon,0 //NPC_PETRIFYATTACK#Petrify Attack#
+181,7,6,1,7,0,0,5,1,no,0,2,0,weapon,0 //NPC_CURSEATTACK#Cursing Attack #
+182,-1,6,1,-1,0,0,5,1,no,0,2,0,weapon,0 //NPC_SLEEPATTACK#Sleep attack#
183,-1,6,1,-1,0,0,10,1,no,0,2,0,weapon,0 //NPC_RANDOMATTACK#Random Attack #
184,-1,6,1,1,0,0,10,1,no,0,2,0,weapon,0 //NPC_WATERATTACK#Water Attribute Attack#
185,-1,6,1,2,0,0,10,1,no,0,2,0,weapon,0 //NPC_GROUNDATTACK#Earth Attribute Attack#
@@ -464,22 +464,22 @@
442,0,0,0,0,0,0,3,0,no,0,0,0,none,0 //SG_FRIEND#Friend of the Sun, Moon and Stars#
443,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //SG_KNOWLEDGE#Knowledge of the Sun, Moon and Stars#
444,0,6,4,0,1,0,1,1,no,0,0,0,misc,0 //SG_FUSION#Union of the Sun, Moon and Stars#
-445,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_ALCHEMIST#Spirit of the Alchemist#
+445,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_ALCHEMIST#Spirit of the Alchemist#
446,9,6,16,0,1,0,1,1,yes,0,3080,0,none,0 //AM_BERSERKPITCHER#Berserk Pitcher#
-447,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_MONK#Spirit of the Monk#
-448,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_STAR#Spirit of the Star Knight#
-449,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_SAGE#Spirit of the Professor#
-450,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_CRUSADER#Spirit of the Crusader#
-451,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_SUPERNOVICE#Spirit of the Supernovice#
-452,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_KNIGHT#Spirit of the Knight#
-453,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_WIZARD#Spirit of the Wizard#
-454,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_PRIEST#Spirit of the Priest#
-455,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_BARDDANCER#Spirit of the Artist#
-456,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_ROGUE#Spirit of the Rogue#
-457,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_ASSASIN#Spirit of the Assasin#
-458,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_BLACKSMITH#Spirit of the Blacksmith#
+447,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_MONK#Spirit of the Monk#
+448,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_STAR#Spirit of the Star Knight#
+449,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_SAGE#Spirit of the Professor#
+450,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_CRUSADER#Spirit of the Crusader#
+451,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_SUPERNOVICE#Spirit of the Supernovice#
+452,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_KNIGHT#Spirit of the Knight#
+453,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_WIZARD#Spirit of the Wizard#
+454,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_PRIEST#Spirit of the Priest#
+455,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_BARDDANCER#Spirit of the Artist#
+456,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_ROGUE#Spirit of the Rogue#
+457,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_ASSASIN#Spirit of the Assasin#
+458,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_BLACKSMITH#Spirit of the Blacksmith#
459,0,6,4,0,3,-1,1,1,no,0,8,0,weapon,0 //BS_ADRENALINE2#Full Adrenaline Rush#
-460,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_HUNTER#Spirit of the Hunter#
+460,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_HUNTER#Spirit of the Hunter#
461,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_SOULLINKER#Spirit of the Soul Linker#
462,9,6,16,0,1,0,7,1,yes,0,0,0,magic,0 //SL_KAIZEL#Kaizel#
463,9,6,16,0,1,0,7,1,yes,0,0,0,magic,0 //SL_KAAHI#Kahai#
diff --git a/src/map/skill.c b/src/map/skill.c
index 3d2fa7d9f..dc76f65db 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1176,7 +1176,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
case NPC_POISON:
case NPC_SILENCEATTACK:
case NPC_STUNATTACK:
- sc_start(bl,SkillStatusChangeTable[skillid],100,skilllv,src->type==BL_PET?skilllv*1000:skill_get_time2(skillid,skilllv));
+ sc_start(bl,SkillStatusChangeTable[skillid],50+10*skilllv,skilllv,src->type==BL_PET?skilllv*1000:skill_get_time2(skillid,skilllv));
break;
case NPC_MENTALBREAKER: