summaryrefslogtreecommitdiff
path: root/db/re
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2013-07-04 23:22:12 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2013-07-04 23:22:12 +0800
commit83e3b8d22acc73aeaafbf2a95e1fb9e6b228a63a (patch)
tree08c8dc134b36176461531e29c4a5f247937f38e5 /db/re
parent38ad0593dd7d6c3357c2a2219fe59122969c84b9 (diff)
downloadhercules-83e3b8d22acc73aeaafbf2a95e1fb9e6b228a63a.tar.gz
hercules-83e3b8d22acc73aeaafbf2a95e1fb9e6b228a63a.tar.bz2
hercules-83e3b8d22acc73aeaafbf2a95e1fb9e6b228a63a.tar.xz
hercules-83e3b8d22acc73aeaafbf2a95e1fb9e6b228a63a.zip
Fixed Bug#7459
-where 'working in progress' state is not cancel in change map/teleport. Fixed Bug#7265 -where casting AL_INCAGI into chars force them to stand where it now suppose to be. Fixed Bug#7337 -fixed some skills that deals 'work in progress' state. Fixed Bug#7467 -fixed compiling warning message. Renewal Updates -Temporary fix for skills final damage reduction. -Updated NJ_KUNAI to its renewal formula. -Updated/Fixed some interface messages. -Implemented additional new 3rd job skills(GN_ILLUSIONDOPING,RK_LUXANIMA,SO_ELEMENTAL_SHIELD,SC_ESCAPE) Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'db/re')
-rw-r--r--db/re/item_db.txt1
-rw-r--r--db/re/skill_cast_db.txt13
-rw-r--r--db/re/skill_db.txt12
-rw-r--r--db/re/skill_require_db.txt4
-rw-r--r--db/re/skill_tree.conf20
5 files changed, 31 insertions, 19 deletions
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 98dd24ea6..e42443d73 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -8051,3 +8051,4 @@
21003,Muramasa_,Muramasa ,4,20,,1000,155,,1,2,0x00004082,7,2,34,4,48,1,3,{},{},{}
21004,Alca_Bringer_,Alca Bringer ,4,20,,3400,280,,2,2,125,7,2,34,3,100,1,3,{},{},{}
21005,Metal_Two_Hand_Sword,Metal Two Hand Sword,4,20,,0,95,,1,1,0x00004082,7,2,34,3,1,1,3,{},{},{}
+22540,Runstone_Luxanima,Lux Anima Rune,11,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{} \ No newline at end of file
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 446f0d698..e61b066be 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1113,6 +1113,8 @@
2019,0,0,0,180000,0,0,-1
//-- RK_DRAGONBREATH_WATER
5004,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,40000,0,0,500
+//-- RK_LUXANIMA
+5005,0,0,0,60000,0,0,-1
//==========================================
//===== Gillotine Cross ====================
@@ -1148,7 +1150,7 @@
//-- GC_CROSSRIPPERSLASHER
2037,0,1000,0,0,0,0,-1
//-- GC_DARKCROW
-5001,0,1500,0,5000,0,0,-1
+5001,0,1500,0,5000,0,60000,-1
//==========================================
//===== Arch Bishop ========================
@@ -1380,8 +1382,8 @@
2303,2000,2000,0,10000:20000:30000,0,180000,-1
//-- SC_FEINTBOMB
2304,1000,0,0,1000,0,5000,-1
-//-- SC_SCAPE
-5010,1000,0,0,1000,0,5000,-1
+//-- SC_ESCAPE
+5010,0,0,0,1000,0,15000,-1
//==========================================
//==== Royal Guard skills ==================
@@ -1591,6 +1593,8 @@
2467,1000,0,0,60000,0,60000,1000
//-- SO_EARTH_INSIGNIA
2468,1000,0,0,60000,0,60000,1000
+//-- SO_ELEMENTAL_SHIELD
+5008,1000,0,0,0,0,10000,-1
//==========================================
//==== Genetic skills ======================
@@ -1633,6 +1637,9 @@
//-- GN_SLINGITEM_RANGEMELEEATK
2498,0,0,0,3000,0,0,-1
+
+//-- GN_ILLUSIONDOPING
+5003,0,0,0,10000,0,10000,-1
//==========================================
//===== Extra 3rd Class Skills =============
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 45ec76c38..5164e511a 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -567,7 +567,7 @@
521,-9,6,2,-1,0x40,1,10,1,no,0,0,0,weapon,3, GS_GROUNDDRIFT,Ground Drift
522,0,0,0,0,0,0,10,1,no,0,0,0,weapon,0, NJ_TOBIDOUGU,Shuriken Training
523,9,6,1,-1,0x40,0,10,1,no,0,0,0,weapon,0, NJ_SYURIKEN,Throw Shuriken
-524,9,8,1,-1,0x40,0,5,3,no,0,0,0,weapon,0, NJ_KUNAI,Throw Kunai
+524,9,8,1,-1,0x40,0,5,-3,no,0,0,0,weapon,0, NJ_KUNAI,Throw Kunai
525,9,8,2,-1,0x2,0,5,-3:-3:-4:-4:-5,no,0,0,0,weapon,0, NJ_HUUMA,Throw Huuma Shuriken
526,9,6,1,0,0x50,0,10,1,no,0,0,0,misc,0, NJ_ZENYNAGE,Throw Zeny
527,0,6,4,-1,0,0,5,1,no,0,0,0,weapon,4, NJ_TATAMIGAESHI,Improvised Defense
@@ -1079,16 +1079,16 @@
3035,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, ECLAGE_RECALL,Return To Eclage
// EP 14.3 Part 2 3rd Job Skills
-5001,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, GC_DARKCROW,Dark Claw
+5001,1,8,1,-1,0,0,5,3,no,0,0,0,weapon,0, GC_DARKCROW,Dark Claw
5002,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, RA_UNLIMIT,Unlimited
-//5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0, GN_ILLUSIONDOPING,Illusion Doping
+5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0, GN_ILLUSIONDOPING,Illusion Doping
5004,9,6,2,1,0x2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,misc,0, RK_DRAGONBREATH_WATER,Dragon Breath - Water
-//5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0, RK_LUXANIMA,Lux Anima
+5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0, RK_LUXANIMA,Lux Anima
5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0, NC_MAGMA_ERUPTION,Magma Eruption
5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0, WM_FRIGG_SONG,Frigg's Song
-//5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0, SO_ELEMENTAL_SHIELD,Elemental Shield
+5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0, SO_ELEMENTAL_SHIELD,Elemental Shield
5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0, SR_FLASHCOMBO,Flash Combo
-//5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, SC_ESCAPE,Emergency Escape
+5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, SC_ESCAPE,Emergency Escape
5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, AB_OFFERTORIUM,Offertorium
5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, WL_TELEKINESIS_INTENSE,Intense Telekinesis
5013,0,6,4,0,0x3,5,5,1,no,0,0,0,none,0, LG_KINGS_GRACE,King's Grace
diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt
index 75ac6d3cf..2f2c1e8b6 100644
--- a/db/re/skill_require_db.txt
+++ b/db/re/skill_require_db.txt
@@ -842,9 +842,9 @@
5005,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_LUXANIMA#Lux Anima#
5006,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
5007,0,0,200:230:260:290:320,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#Frigg's Song#
-5008,0,0,120:120:120:120:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_ELEMENTAL_SHIELD#Elemental Shield#
+5008,0,0,120:120:120:120:120,0,0,0,99,0,0,elementalspirit,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_ELEMENTAL_SHIELD#Elemental Shield#
5009,0,0,75:65:55:45:35,0,0,0,99,0,0,none,5:5:4:4:3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO#Flash Combo#
-5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape#
+5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape#
5011,0,0,30:60:90:120:150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
5012,0,0,100:150:200:250:300,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WL_TELEKINESIS_INTENSE#Intense Telekinesis#
5013,0,0,200:180:160:140:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace#
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 80c4a43df..3cd90f201 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -2977,6 +2977,10 @@ Sorcerer: {
MaxLevel: 3
SO_SUMMON_TERA: 3
}
+ SO_ELEMENTAL_SHIELD: {
+ MaxLevel: 5
+ SO_EL_CONTROL: 3
+ }
ALL_FULL_THROTTLE: 5
}
}
@@ -3381,10 +3385,10 @@ Genetic: {
GN_MIX_COOKING: 1
}
GN_S_PHARMACY: 10
-// GN_ILLUSIONDOOPING: {
-// MaxLevel: 5
-// GN_S_PHARMACY: 1
-// }
+ GN_ILLUSIONDOPING: {
+ MaxLevel: 5
+ GN_S_PHARMACY: 1
+ }
ALL_FULL_THROTTLE: 5
}
}
@@ -3482,10 +3486,10 @@ Shadow_Chaser: {
MaxLevel: 3
SC_DIMENSIONDOOR: 3
}
-// SC_SCAPE: {
-// MaxLevel: 5
-// SC_TRIANGLESHOT: 2
-// }
+ SC_ESCAPE: {
+ MaxLevel: 5
+ SC_TRIANGLESHOT: 2
+ }
ALL_FULL_THROTTLE: 5
}
}