summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-19 13:26:50 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-19 13:26:50 +0000
commitc1d7d16b0e4010b27591f37ee93a1ca8d1137ecb (patch)
treeffa19893e7d612e011d2d441a48ed23c37a15898 /db
parenta36580661f18d01c8b4f97be7d56d827df520638 (diff)
downloadhercules-c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb.tar.gz
hercules-c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb.tar.bz2
hercules-c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb.tar.xz
hercules-c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb.zip
* Implemented script command "areamobuseskill" and skill NPC_INVINCIBLE and NPC_INVINCIBLEOFF. (topic:217330)
* Using items no longer cancels invincibility(but using target and ground skills through items does). (bugreport:3259) * Fixed Butterfly Wings not working during GVG. (bugreport:3264) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13897 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/const.txt3
-rw-r--r--db/skill_cast_db.txt4
-rw-r--r--db/skill_db.txt4
3 files changed, 9 insertions, 2 deletions
diff --git a/db/const.txt b/db/const.txt
index bd7df1748..b34502b89 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -817,6 +817,9 @@ SC_S_LIFEPOTION 290
SC_L_LIFEPOTION 291
SC_JEXPBOOST 292
SC_IGNOREDEF 293
+SC_HELLPOWER 294
+SC_INVINCIBLE 295
+SC_INVINCIBLEOFF 296
e_gasp 0
e_what 1
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 0e0b4f438..ff5a63e70 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -975,6 +975,10 @@
683,0,0,0,0,300000
//-- NPC_WIDEHELLDIGNITY
684,0,0,0,0,300000
+//-- NPC_INVINCIBLE
+685,0,0,0,-1,0
+//-- NPC_INVINCIBLEOFF
+686,0,0,0,60000,0
//===== Item Use-Only Skills ===============
//-- CASH_BLESSING
diff --git a/db/skill_db.txt b/db/skill_db.txt
index fd4754a2c..4573d5015 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -625,8 +625,8 @@
//682,0,0,0,0,0,0,9,0,no,0,0,0,none,0, NPC_TALK,Talk
683,-9,6,1,-1,0,0,1,1,no,0,0x2,0,none,0, NPC_HELLPOWER,Hell Power
684,0,6,4,0,0x3,-1,1,1,no,0,0x2,0,none,0, NPC_WIDEHELLDIGNITY,Hell Dignity
-//685,0,0,0,0,0,0,9,0,no,0,0,0,none,0, NPC_INVINCIBLE,Incinvible
-//686,0,0,0,0,0,0,9,0,no,0,0,0,none,0, NPC_INVINCIBLEOFF,Invincible off
+685,0,0,4,0,0x1,0,1,1,no,0,0x2,0,none,0, NPC_INVINCIBLE,Incinvible
+686,0,0,4,0,0x1,0,1,1,no,0,0x2,0,none,0, NPC_INVINCIBLEOFF,Invincible off
687,0,6,4,0,0x1,0,1,1,yes,0,0x2,0,none,0, NPC_ALLHEAL,Full Heal
// Additional Skill (??)