summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/magic.conf.template4
-rw-r--r--db/mob_skill_db.txt11
-rw-r--r--db/skill_db.txt3
3 files changed, 15 insertions, 3 deletions
diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index 7873163a..058ec51e 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -678,7 +678,7 @@ LOCAL SPELL rain : "#N13" =
=> EFFECT CALL adjust_spellpower(school);
CALL default_effect();
CALL gain_xp(1);
- range = min(MAX_RAIN_SPELL_RADIUS, 3 + spellpower / 30);
+ range = min(MAX_RAIN_SPELL_RADIUS, 3 + min(spellpower, 400) / 30);
area = rbox(location(caster), range);
IF (is_in(location(npc("#DruidTree0#_M")), area)
|| is_in(location(npc("#DruidTree1#_M")), area))
@@ -687,7 +687,7 @@ LOCAL SPELL rain : "#N13" =
callfunc "QuestTreeTrigger";
};
FOR i = 0 TO spellpower DO (
- FOR j = 0 TO spellpower / 100 DO (
+ FOR j = 0 TO min(spellpower, 500) / 100 DO (
location = random_location(area);
sfx(location, SFX_RAIN, 0);
FOREACH TARGET target IN rbox(location, 1) DO
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 4d553194..3d3f8730 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -60,4 +60,13 @@
1015,SantaSlime@NPC_EMOTION,idle,197,1,200,0,5000,yes,self,always,0,7,,,,,
1015,SantaSlime@NPC_EMOTION,walk,197,1,100,0,10000,yes,self,always,0,5,,,,,
1015,SantaSlime@NPC_SUMMONSLAVE,attack,196,5,10000,2000,60000,no,self,slavele,3,1016,,,,,
-1015,SantaSlime@NPC_SUMMONSLAVE,idle,196,5,10000,2000,60000,no,self,slavele,3,1016,,,,, \ No newline at end of file
+1015,SantaSlime@NPC_SUMMONSLAVE,idle,196,5,10000,2000,60000,no,self,slavele,3,1016,,,,,
+
+// Poison
+1009,BlackScorpion@NPC_POISON,attack,176,5,250,0,500,yes,target,always,0,,10,,,,
+1010,Snake@NPC_POISON,attack,176,3,250,0,400,yes,target,always,0,,10,,,,
+1021,CaveSnake@NPC_POISON,attack,176,2,100,0,500,yes,target,always,0,,10,,,,
+1026,MountainSnake@NPC_POISON,attack,176,6,500,0,300,yes,target,always,0,,10,,,,
+1034,GrassSnake@NPC_POISON,attack,176,5,1000,0,200,yes,target,always,0,,10,,,,
+//-- 1026,MountainSnake@NPC_POISONATTACK,attack,188,5,10000,0,500,yes,target,always,1,,,,,,
+//-- 1010,Snake@TF_POISON,attack,52,3,10000,0,500,yes,target,always,1,,,,,,
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 818e1d3a..f43ee8c6 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -8,10 +8,13 @@
38, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0 //MC_OVERCHARGE
48, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, weapon, 0 //TF_DOUBLE
49, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, weapon, 0 //TF_MISS
+52, 1, 6, 4, 0, 0, 100, 1, no, 0, 1, 0, none, 0 //TF_POISON
142, 0, 6, 4, 0, 1, 1, 1, no, 0, 1, 0, none, 0 //NV_FIRSTAID
144, 0, 0, 0, 0, 0, 1, 0, no, 0, 1, 0, none, 0 //SM_MOVINGRECOVERY
146, 0, 0, 0, 0, 0, 1, 0, no, 0, 1, 0, weapon, 0 //SM_AUTOBERSERK
150, 0, 6, 4, 0, 1, 1, 1, no, 0, 1, 0, weapon, 5 //TF_BACKSLIDING
+176, 1, 6, 4, 0, 0, 100, 1, no, 0, 1, 0, none, 0 //NPC_POISON
+188, 1, 6, 4, 0, 0, 100, 1, no, 0, 1, 0, none, 0 //NPC_POISONATTACK
196, 0, 0, 4, 0, 1, 10, 1, no, 0, 2, 0, magic, 0 //NPC_SUMMONSLAVE
197, 0, 0, 4, 0, 1, 10, 1, no, 0, 2, 0, none, 0 //NPC_EMOTION
340, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0 //TMW_MAGIC