Forráskód Böngészése

Added support for Rebellion class (no skills) - Credits to Hercules, Sanasol, Cydh
Packets update for banking and 2013-08-07 - Credits to Shakto
Fixed a problem where players could use items in Invisibility

Akinari1087 11 éve
szülő
commit
f0566292bb

+ 1 - 1
conf/help.txt

@@ -102,7 +102,7 @@ jobchange: "Params: <job name|ID>\n" "Changes your job.\n"
 	"     23 Super Novice      24 Gunslinger              25 Ninja                 4045 Super Baby\n"
 	"4046 Taekwon           4047 Star Gladiator     4049 Soul Linker            4050 Gangsi\n"
 	"4051 Death Knight    4052 Dark Collector    4190 Ex. Super Novice  4191 Ex. Super Baby\n"
-	"4211 Kagerou            4212 Oboro\n"
+	"4211 Kagerou            4212 Oboro             4215 Rebellion\n"
 	"----- Baby Novice And Baby 1st Class -----\n"
 	"4023 Baby Novice      4024 Baby Swordman    4025 Baby Magician   4026 Baby Archer\n"
 	"4027 Baby Acolyte      4028 Baby Merchant       4029 Baby Thief\n"

+ 1 - 0
conf/msg_conf/map_msg.conf

@@ -684,6 +684,7 @@
 692: Genetic T
 693: Shadow Chaser T
 694: Hanbok
+695: Rebellion
 
 
 //------------------------------------

+ 1 - 0
conf/msg_conf/map_msg_chn.conf

@@ -671,6 +671,7 @@
 692: 基因學者 T
 693: 魅影追蹤者 T
 694: 韓服
+695: Rebellion
 
 
 //------------------------------------

+ 1 - 0
conf/msg_conf/map_msg_frn.conf

@@ -683,6 +683,7 @@
 692: Genetic T
 693: Shadow Chaser T
 694: Hanbok
+695: Rebellion
 
 
 //------------------------------------

+ 1 - 0
conf/msg_conf/map_msg_idn.conf

@@ -683,6 +683,7 @@
 692: Genetic T
 693: Shadow Chaser T
 694: Hanbok
+695: Rebellion
 
 
 //------------------------------------

+ 1 - 0
conf/msg_conf/map_msg_por.conf

@@ -663,6 +663,7 @@
 692: Bioquímico T
 693: Renegado T
 694: Hanbok
+695: Rebellion
 
 
 //------------------------------------

+ 1 - 0
conf/msg_conf/map_msg_rus.conf

@@ -682,6 +682,7 @@
 692: Genetic T
 693: Shadow Chaser T
 694: Hanbok
+695: Rebellion
 
 //695-899 ÍÅ ÈÑÏÎËÜÇÓÅÒÑß
 

+ 1 - 0
conf/msg_conf/map_msg_spn.conf

@@ -670,6 +670,7 @@
 692: Genetic T
 693: Shadow Chaser T
 694: Hanbok
+695: Rebellion
 
 
 //------------------------------------

+ 1 - 0
conf/msg_conf/map_msg_tha.conf

@@ -677,6 +677,7 @@
 692: Genetic T
 693: Shadow Chaser T
 694: Hanbok
+695: Rebellion
 
 
 //------------------------------------

+ 2 - 0
db/const.txt

@@ -166,6 +166,8 @@ Job_Super_Baby_E	4191
 Job_Kagerou	4211
 Job_Oboro	4212
 
+Job_Rebellion  4215
+
 EAJL_2_1	0x100
 EAJL_2_2	0x200
 EAJL_2	0x300

+ 2 - 0
db/job_db2.txt

@@ -287,3 +287,5 @@
 4211,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
 // Oboro
 4212,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
+// Rebellion
+4215,5,6,0,6,0,5,0,0,0,6,5,6,0,0,4,0,5,0,0,5,6,0,0,0,5,2,0,0,0,3,6,1,0,0,5,4,0,0,5,0,1,0,6,0,5,0,0,1,0,1

+ 42 - 0
db/packet_db.txt

@@ -2190,3 +2190,45 @@ packet_ver: 44
 0x0863,26,friendslistadd,2
 0x088A,5,hommenu,2:4
 0x095B,36,storagepassword,2:4:20
+0x09A6,12 // ZC_BANKING_CHECK
+0x09A7,10,bankdeposit,2:6
+0x09A8,14 // ZC_ACK_BANKING_DEPOSIT
+0x09A9,10,bankwithdrawal,2:6
+0x09AA,14 // ZC_ACK_BANKING_WITHDRAW
+0x09AB,6,bankcheck,2
+0x09B6,6,bankopen,2
+0x09B7,4 // ZC_ACK_OPEN_BANKING
+0x09B8,6,bankclose,2
+0x09B9,4 // ZC_ACK_CLOSE_BANKING
+
+//2013-08-07Ragexe (Shakto)
+packet_ver: 45
+0x0369,7,actionrequest,2:6
+0x083C,10,useskilltoid,2:4:6
+0x0437,5,walktoxy,2
+0x035F,6,ticksend,2
+0x0202,5,changedir,2:4
+0x07E4,6,takeitem,2
+0x0362,6,dropitem,2:4
+0x07EC,8,movetokafra,2:4
+0x0364,8,movefromkafra,2:4
+0x0438,10,useskilltopos,2:4:6:8
+0x0366,90,useskilltoposinfo,2:4:6:8:10
+0x096A,6,getcharnamerequest,2
+0x0368,6,solvecharname,2
+0x0838,12,searchstoreinfolistitemclick,2:6:10
+0x0835,2,searchstoreinfonextpage,0
+0x0819,-1,searchstoreinfo,2:4:5:9:13:14:15
+0x0811,-1,reqtradebuyingstore,2:4:8:12
+0x0360,6,reqclickbuyingstore,2
+0x0817,2,reqclosebuyingstore,0
+0x0815,-1,reqopenbuyingstore,2:4:8:9:89
+0x0365,18,bookingregreq,2:4:6
+// 0x363,8 CZ_JOIN_BATTLE_FIELD
+0x0281,-1,itemlistwindowselected,2:4:8:12
+0x022D,19,wanttoconnection,2:6:10:14:18
+0x0802,26,partyinvite2,2
+// 0x436,4 CZ_GANGSI_RANK
+0x023B,26,friendslistadd,2
+0x0361,5,hommenu,2:4
+0x0887,36,storagepassword,2:4:20

+ 2 - 0
db/pre-re/job_db1.txt

@@ -279,3 +279,5 @@
 4211,	26000,80   ,  0  ,515  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000
 // Oboro
 4212,	26000,80   ,  0  ,515  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000
+// Rebellion
+4215,	28000,88   ,  0  ,450  ,500  ,2000, 2000, 2000, 2000, 2000, 2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 700 , 750 , 700 ,1500 ,1500 ,2000 ,2000

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
db/pre-re/job_exp.txt


+ 4 - 4
db/pre-re/job_maxhpsp_db.txt

@@ -48,8 +48,8 @@
 //MaxHP - Bard/Dancer/Clown/Gypsy/Baby Bard/Baby Dancer
 1,99,19:20:4020:4021:4042:4043,0,40,47,54,62,71,81,91,102,114,127,140,154,169,180,196,212,224,242,260,278,296,316,330,350,371,393,415,438,451,477,503,530,558,587,616,646,677,709,741,774,808,843,878,914,951,989,1027,1066,1106,1147,1188,1230,1273,1317,1361,1406,1452,1499,1546,1594,1643,1693,1743,1794,1846,1899,1952,2006,2061,2117,2173,2230,2288,2347,2406,2466,2527,2589,2651,2714,2778,2843,2908,2974,3041,3109,3177,3246,3316,3387,3458,3530,3603,3677,3751,3826,3902,3979,4056
 
-//MaxHP - Gunslinger
-1,99,24,0,40,47,54,61,69,77,85,94,103,202,212,222,232,243,254,265,277,289,301,316,331,346,364,382,400,420,440,460,490,520,550,580,610,650,680,710,740,770,800,830,865,890,925,955,990,1025,1050,1080,1110,1145,1180,1215,1275,1335,1395,1455,1515,1575,1635,1695,1760,1820,1885,1950,2015,2080,2145,2210,2275,2340,2410,2480,2550,2620,2690,2760,2830,2900,2970,3040,3115,3190,3265,3340,3415,3490,3565,3640,3715,3790,3870,3950,4030,4110,4190,4270,4350,4430,4510
+//MaxHP - Gunslinger/Rebellion
+1,99,24:4215,0,40,47,54,61,69,77,85,94,103,202,212,222,232,243,254,265,277,289,301,316,331,346,364,382,400,420,440,460,490,520,550,580,610,650,680,710,740,770,800,830,865,890,925,955,990,1025,1050,1080,1110,1145,1180,1215,1275,1335,1395,1455,1515,1575,1635,1695,1760,1820,1885,1950,2015,2080,2145,2210,2275,2340,2410,2480,2550,2620,2690,2760,2830,2900,2970,3040,3115,3190,3265,3340,3415,3490,3565,3640,3715,3790,3870,3950,4030,4110,4190,4270,4350,4430,4510
 
 //MaxHP - Ninja
 1,99,25,0,40,47,54,61,69,77,85,94,103,202,212,222,232,243,254,265,277,289,301,316,331,346,364,382,400,420,440,460,482,504,526,548,572,596,620,646,672,698,726,754,784,814,844,876,908,940,975,1010,1100,1140,1180,1220,1260,1300,1340,1385,1430,1475,1520,1565,1615,1665,1715,1765,1815,1880,1935,1990,2045,2100,2160,2220,2280,2340,2400,2460,2520,2580,2640,2705,2770,2835,2900,2965,3030,3100,3170,3240,3310,3380,3455,3530,3605,3680,3760,3840,3920,4000,4080
@@ -129,8 +129,8 @@
 //MaxSP - Sage/Professor/Baby Sage
 1,99,16:4017:4039,1,17,24,31,38,45,52,59,66,73,80,87,94,101,108,115,122,129,136,143,150,157,164,171,178,185,192,199,206,213,220,227,234,241,248,255,262,269,276,283,290,297,304,311,318,325,332,339,346,353,360,367,374,381,388,395,402,409,416,423,430,437,444,451,458,465,472,479,486,493,500,507,514,521,528,535,542,549,556,563,570,577,584,591,598,605,612,619,626,633,640,647,654,661,668,675,682,689,696,703
 
-//MaxSP - Gunslinger
-1,99,24,1,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57,61,64,67,70,73,76,79,82,85,89,93,97,101,105,109,113,117,121,125,129,131,135,139,141,145,149,153,157,161,165,169,173,177,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,256,261,266,271,276,281,286,291,296,301,306,312,318,324,336,342,348,354,360,366,372,378,384,390,396,402,408,414,420,426,432,438,444,450,456
+//MaxSP - Gunslinger/Rebellion
+1,99,24:4215,1,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57,61,64,67,70,73,76,79,82,85,89,93,97,101,105,109,113,117,121,125,129,131,135,139,141,145,149,153,157,161,165,169,173,177,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,256,261,266,271,276,281,286,291,296,301,306,312,318,324,336,342,348,354,360,366,372,378,384,390,396,402,408,414,420,426,432,438,444,450,456
 
 //MaxSP - Ninja
 1,99,25,1,14,17,20,23,26,29,32,35,38,41,44,47,50,53,56,59,62,65,68,71,75,79,83,87,91,95,99,103,107,111,115,119,123,127,131,135,139,143,147,151,156,161,166,171,176,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,257,263,269,275,281,287,293,299,305,311,317,323,329,335,341,347,353,359,365,371,378,386,394,402,410,418,426,434,442,450,458,466,474,482,490,498,506,514,522

+ 354 - 349
db/pre-re/skill_cast_db.txt

@@ -1110,586 +1110,591 @@
 2019,0,0,0,180000,0,0
 //==========================================
 
-//===== Gillotine Cross ==================== 
-//-- GC_VENOMIMPRESS 
+//===== Gillotine Cross ====================
+//-- GC_VENOMIMPRESS
 2021,0,3000:2500:2000:1500:1000,0,10000:20000:30000:40000:50000,0,0
-//-- GC_CROSSIMPACT 
+//-- GC_CROSSIMPACT
 2022,0,2500:2000:1500:1000:500,0,0,0,0
-//-- GC_DARKILLUSION 
+//-- GC_DARKILLUSION
 2023,0,1500,0,0,0,0
 
-//-- GC_CREATENEWPOISON 
+//-- GC_CREATENEWPOISON
 2025,0,500,0,0,0,0
-//-- GC_ANTIDOTE 
+//-- GC_ANTIDOTE
 2026,0,0,0,0,0,0
-//-- GC_POISONINGWEAPON 
+//-- GC_POISONINGWEAPON
 2027,0,1000,0,60000:120000:180000:240000:300000,300000,0
-//-- GC_WEAPONBLOCKING 
+//-- GC_WEAPONBLOCKING
 2028,0,2000,0,180000,0,0
-//-- GC_COUNTERSLASH 
+//-- GC_COUNTERSLASH
 2029,0,2000,0,0,0,0
-//-- GC_WEAPONCRUSH 
+//-- GC_WEAPONCRUSH
 2030,0,1000,0,60000,0,0
-//-- GC_VENOMPRESSURE 
+//-- GC_VENOMPRESSURE
 2031,0,1000,0,0,0,0
-//-- GC_POISONSMOKE 
+//-- GC_POISONSMOKE
 2032,0,2000,0,6000:8000:10000:12000:14000,0,0
-//-- GC_CLOAKINGEXCEED 
+//-- GC_CLOAKINGEXCEED
 2033,0,2000,0,0,0,0
-//-- GC_PHANTOMMENACE 
+//-- GC_PHANTOMMENACE
 2034,0,1000,0,0,0,0
-//-- GC_HALLUCINATIONWALK 
+//-- GC_HALLUCINATIONWALK
 2035,0,0,0,30000:35000:40000:45000:50000,25000,300000
-//-- GC_ROLLINGCUTTER 
+//-- GC_ROLLINGCUTTER
 2036,0,200,0,3000,0,0
-//-- GC_CROSSRIPPERSLASHER 
+//-- GC_CROSSRIPPERSLASHER
 2037,0,1000,0,0,0,0
-//========================================== 
+//==========================================
 
-//===== Arch Bishop ======================== 
-//-- AB_JUDEX 
+//===== Arch Bishop ========================
+//-- AB_JUDEX
 2038,2000,500,0,0,0,0
-//-- AB_ANCILLA 
+//-- AB_ANCILLA
 2039,1000,1000,0,0,0,0
-//-- AB_ADORAMUS 
+//-- AB_ADORAMUS
 2040,2000,500,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,2000
-//-- AB_CLEMENTIA 
+//-- AB_CLEMENTIA
 2041,3000,0,0,120000:180000:240000,0,0
-//-- AB_CANTO 
+//-- AB_CANTO
 2042,3000,0,0,120000:180000:240000,0,0
-//-- AB_CHEAL 
+//-- AB_CHEAL
 2043,3000,0,0,0,0,2000
-//-- AB_EPICLESIS 
+//-- AB_EPICLESIS
 2044,2000:2500:3000:3500:4000,2000,0,18000:21000:24000:27000:30000,0,60000
-//-- AB_PRAEFATIO 
+//-- AB_PRAEFATIO
 2045,2000,0,0,120000,0,13000:16000:19000:22000:25000:28000:31000:34000:37000:40000
-//-- AB_ORATIO 
+//-- AB_ORATIO
 2046,4000,0,0,30000,0,2000
-//-- AB_LAUDAAGNUS 
+//-- AB_LAUDAAGNUS
 2047,1000,0,0,60000,0,3000
-//-- AB_LAUDARAMUS 
+//-- AB_LAUDARAMUS
 2048,1000,0,0,60000,0,3000
 
-//-- AB_RENOVATIO 
+//-- AB_RENOVATIO
 2050,3000,0,0,90000,0,0
-//-- AB_HIGHNESSHEAL 
+//-- AB_HIGHNESSHEAL
 2051,1000,1000,0,0,0,3000
-//-- AB_CLEARANCE 
+//-- AB_CLEARANCE
 2052,4000,0,0,0,0,10000
-//-- AB_EXPIATIO 
+//-- AB_EXPIATIO
 2053,1000,0,0,150000:180000:210000:240000:270000,0,0
-//-- AB_DUPLELIGHT 
+//-- AB_DUPLELIGHT
 2054,2000,1000,0,90000:120000:150000:180000:210000:240000:270000:300000:330000:360000,0,0
 
-//-- AB_SILENTIUM 
+//-- AB_SILENTIUM
 2057,4000,0,0,20000:30000:40000:50000:60000,0,15000
-//========================================== 
+//==========================================
 
-//===== Warlock ============================ 
-//-- WL_WHITEIMPRISON 
+//===== Warlock ============================
+//-- WL_WHITEIMPRISON
 2201,0,0,0,6000:8000:10000:12000:14000,15000,4000
-//-- WL_SOULEXPANSION 
+//-- WL_SOULEXPANSION
 2202,2000,500,0,0,0,0
-//-- WL_FROSTMISTY 
+//-- WL_FROSTMISTY
 2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000
-//-- WL_JACKFROST 
+//-- WL_JACKFROST
 2204,2000:2500:3000:3500:4000,1000,0,10000:15000:20000:25000:30000,0,0
-//-- WL_MARSHOFABYSS 
+//-- WL_MARSHOFABYSS
 2205,2500,1000,0,25000,0,0
-//-- WL_RECOGNIZEDSPELL 
+//-- WL_RECOGNIZEDSPELL
 2206,1000,1000,0,60000:90000:120000:150000:180000,0,50000:80000:110000:140000:170000
-//-- WL_SIENNAEXECRATE 
+//-- WL_SIENNAEXECRATE
 2207,2000,2000,0,10000:12000:14000:16000:18000,0,0
 
-//-- WL_STASIS 
+//-- WL_STASIS
 2209,3000,1000,0,10000:15000:20000:25000:30000,0,300000
-//-- WL_DRAINLIFE 
+//-- WL_DRAINLIFE
 2210,4000,0,0,0,0,2000
-//-- WL_CRIMSONROCK 
+//-- WL_CRIMSONROCK
 2211,5000,2000,0,3000:4000:5000:6000:7000,0,5000
-//-- WL_HELLINFERNO 
+//-- WL_HELLINFERNO
 2212,3000,1000,0,15000,0,0
-//-- WL_COMET 
+//-- WL_COMET
 2213,10000:11000:12000:13000:14000,0,0,15000,0,60000
-//-- WL_CHAINLIGHTNING 
+//-- WL_CHAINLIGHTNING
 2214,3500:4000:4500:5000:5500,0,0,100,0,3000
 
-//-- WL_EARTHSTRAIN 
+//-- WL_EARTHSTRAIN
 2216,2000:3000:4000:5000:6000,1000,0,150,75000:90000:105000:120000:135000,10000
-//-- WL_TETRAVORTEX 
+//-- WL_TETRAVORTEX
 2217,5000:6000:7000:8000:9000,2000,0,20000,0,15000
 
-//-- WL_SUMMONFB 
+//-- WL_SUMMONFB
 2222,2000,0,0,120000:160000:200000:240000:280000,0,0
-//-- WL_SUMMONBL 
+//-- WL_SUMMONBL
 2223,2000,0,0,120000:160000:200000:240000:280000,0,0
-//-- WL_SUMMONWB 
+//-- WL_SUMMONWB
 2224,2000,0,0,120000:160000:200000:240000:280000,0,0
-//-- WL_SUMMONSTONE 
+//-- WL_SUMMONSTONE
 2229,2000,0,0,120000:160000:200000:240000:280000,0,0
 
-//-- WL_READING_SB 
+//-- WL_READING_SB
 2231,5000,500,0,0,0,0
-//========================================== 
+//==========================================
 
-//===== Ranger ============================= 
-//-- RA_ARROWSTORM 
+//===== Ranger =============================
+//-- RA_ARROWSTORM
 2233,2000:2200:2400:2600:2800,0,0,0,0,5400:5600:5800:6000:6400
-//-- RA_FEARBREEZE 
+//-- RA_FEARBREEZE
 2234,2000,0,0,60000:90000:120000:150000:180000,0,0
 
-//-- RA_AIMEDBOLT 
+//-- RA_AIMEDBOLT
 2236,4000,1000,0,0,0,0
-//-- RA_DETONATOR 
+//-- RA_DETONATOR
 2237,0,0,0,1000,0,0
-//-- RA_ELECTRICSHOCKER 
+//-- RA_ELECTRICSHOCKER
 2238,0,0,0,15000,20000:22000:24000:26000,0
-//-- RA_CLUSTERBOMB 
+//-- RA_CLUSTERBOMB
 2239,0,0,0,15000,0,0
-//-- RA_WUGMASTERY 
+//-- RA_WUGMASTERY
 2240,0,1000,0,0,0,0
-//-- RA_WUGRIDER 
+//-- RA_WUGRIDER
 2241,0,500,0,0,0,0
 
-//-- RA_WUGBITE 
+//-- RA_WUGBITE
 2244,0,2000,0,1000:2000:3000:4000:5000,0,4000:6000:8000:10000:12000
 
-//-- RA_SENSITIVEKEEN 
+//-- RA_SENSITIVEKEEN
 2246,0,3000,0,0,0,0
-//-- RA_CAMOUFLAGE 
+//-- RA_CAMOUFLAGE
 2247,0,0,0,10000,0,0
 
-//-- RA_MAGENTATRAP 
+//-- RA_MAGENTATRAP
 2249,0,2000,0,15000,10000,0
-//-- RA_COBALTTRAP 
+//-- RA_COBALTTRAP
 2250,0,2000,0,15000,10000,0
-//-- RA_MAIZETRAP 
+//-- RA_MAIZETRAP
 2251,0,2000,0,15000,10000,0
-//-- RA_VERDURETRAP 
+//-- RA_VERDURETRAP
 2252,0,2000,0,15000,10000,0
-//-- RA_FIRINGTRAP 
+//-- RA_FIRINGTRAP
 2253,0,0,0,20000,15000,0
-//-- RA_ICEBOUNDTRAP 
+//-- RA_ICEBOUNDTRAP
 2254,0,0,0,20000,15000,0
-//========================================== 
+//==========================================
 
-//===== Mechanic =========================== 
-//-- NC_BOOSTKNUCKLE 
+//===== Mechanic ===========================
+//-- NC_BOOSTKNUCKLE
 2256,200:400:600:800:1000,0,0,0,0,0
-//-- NC_PILEBUNKER 
+//-- NC_PILEBUNKER
 2257,0,2000,0,0,0,5000
-//-- NC_VULCANARM 
+//-- NC_VULCANARM
 2258,0,300:200:100,0,0,0,0
-//-- NC_FLAMELAUNCHER 
+//-- NC_FLAMELAUNCHER
 2259,1000:1500:2000,1500:1000:500,0,7000:14000:21000,0,0
-//-- NC_COLDSLOWER 
+//-- NC_COLDSLOWER
 2260,1000,1000:2000:3000,0,7000:14000:21000,0,0
-// -- NC_ARMSCANNON 
+// -- NC_ARMSCANNON
 2261,1400:1600:1800,500:1000:2000,0,0,0,0
-//-- NC_ACCELERATION 
+//-- NC_ACCELERATION
 2262,0,0,0,30000:60000:90000,0,0
-//-- NC_HOVERING 
+//-- NC_HOVERING
 2263,0,0,0,90000,0,0
-//-- NC_F_SIDESLIDE 
+//-- NC_F_SIDESLIDE
 2264,0,500,0,0,0,0
-//-- NC_B_SIDESLIDE 
+//-- NC_B_SIDESLIDE
 2265,0,500,0,0,0,0
 
-//-- NC_SELFDESTRUCTION 
+//-- NC_SELFDESTRUCTION
 2267,2000:1500:1000,0,0,0,0,300000
-//-- NC_SHAPESHIFT 
+//-- NC_SHAPESHIFT
 2268,0,2000,0,300000,0,0
-//-- NC_EMERGENCYCOOL 
+//-- NC_EMERGENCYCOOL
 2269,0,500,0,0,0,5000
-//-- NC_INFRAREDSCAN 
+//-- NC_INFRAREDSCAN
 2270,0,500,0,3000,0,3000
-//-- NC_ANALYZE 
+//-- NC_ANALYZE
 2271,0,1000,0,20000,0,0
-//-- NC_MAGNETICFIELD 
+//-- NC_MAGNETICFIELD
 2272,500:1000:1500,0,0,15000,0,20000:15000:10000
-//-- NC_NEUTRALBARRIER 
+//-- NC_NEUTRALBARRIER
 2273,500:1000:1500,0,0,30000:45000:60000,0,20000:15000:10000
-//-- NC_STEALTHFIELD 
+//-- NC_STEALTHFIELD
 2274,500:1000:1500,0,0,15000:20000:25000,0,20000:15000:10000
-//-- NC_REPAIR 
+//-- NC_REPAIR
 2275,200:300:400:500:600,1000,0,0,0,0
 
-//-- NC_AXEBOOMERANG 
+//-- NC_AXEBOOMERANG
 2278,0,0,0,0,0,5000:4500:4000:3500:3000
-//-- NC_POWERSWING 
+//-- NC_POWERSWING
 2279,0,1000,0,2000,0,0
-//-- NC_AXETORNADO 
+//-- NC_AXETORNADO
 2280,0,500,0,0,0,4000:3500:3000:2500:2000
-//-- NC_SILVERSNIPER 
+//-- NC_SILVERSNIPER
 2281,0,0,0,20000:30000:40000:50000:60000,0,0
-//-- NC_MAGICDECOY 
+//-- NC_MAGICDECOY
 2282,0,0,0,20000:30000:40000:50000:60000,0,0
-//-- NC_DISJOINT 
+//-- NC_DISJOINT
 2283,2000,0,0,0,0,0
-//========================================== 
+//==========================================
 
-//===== Shadow Chaser ====================== 
-//-- SC_FATALMENACE 
+//===== Shadow Chaser ======================
+//-- SC_FATALMENACE
 2284,0,500,0,0,0,0
-//-- SC_REPRODUCE 
+//-- SC_REPRODUCE
 2285,0,1000,0,60000,0,0
-//-- SC_AUTOSHADOWSPELL 
+//-- SC_AUTOSHADOWSPELL
 2286,4000:3600:3200:2800:2400:2000:1600:1200:800:400,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:300000,0,0
-//-- SC_SHADOWFORM 
+//-- SC_SHADOWFORM
 2287,0,1000,0,30000:40000:50000:60000:70000,0,0
-//-- SC_TRIANGLESHOT 
+//-- SC_TRIANGLESHOT
 2288,1000,500,0,0,0,0
-//-- SC_BODYPAINT 
+//-- SC_BODYPAINT
 2289,0,1000,0,5000:7000:9000:11000:13000,0,2000
-//-- SC_INVISIBILITY 
+//-- SC_INVISIBILITY
 2290,1000,1000,0,20000,0,20000:30000:40000:50000:60000
-//-- SC_DEADLYINFECT 
+//-- SC_DEADLYINFECT
 2291,0,1000,0,10000:15000:20000:25000:30000,0,2000
-//-- SC_ENERVATION 
+//-- SC_ENERVATION
 2292,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_GROOMY 
+//-- SC_GROOMY
 2293,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_IGNORANCE 
+//-- SC_IGNORANCE
 2294,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_LAZINESS 
+//-- SC_LAZINESS
 2295,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_UNLUCKY 
+//-- SC_UNLUCKY
 2296,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_WEAKNESS 
+//-- SC_WEAKNESS
 2297,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_STRIPACCESORY 
+//-- SC_STRIPACCESORY
 2298,1000,1000,0,60000:70000:80000:90000:100000,0,0
-//-- SC_MANHOLE 
+//-- SC_MANHOLE
 2299,1000,2000,0,5000:10000:15000,5000:10000:15000,0
-//-- SC_DIMENSIONDOOR 
+//-- SC_DIMENSIONDOOR
 2300,1000,2000,0,4000:8000:12000,0,0
-//-- SC_CHAOSPANIC 
+//-- SC_CHAOSPANIC
 2301,2000,2000,0,5000:10000:15000,4000:8000:12000,0
-//-- SC_MAELSTROM 
+//-- SC_MAELSTROM
 2302,2000,2000,0,7000:14000:21000,0,0
-//-- SC_BLOODYLUST //dur2=intr 
+//-- SC_BLOODYLUST //dur2=intr
 2303,2000,2000,0,10000:20000:30000,0,180000
-//-- SC_FEINTBOMB 
+//-- SC_FEINTBOMB
 2304,1000,0,0,1000,0,5000
-//========================================== 
+//==========================================
 
-//==== Royal Guard skills ================== 
-//-- LG_CANNONSPEAR 
+//==== Royal Guard skills ==================
+//-- LG_CANNONSPEAR
 2307,0,0,0,0,0,2000
 
-//-- LG_TRAMPLE 
+//-- LG_TRAMPLE
 2309,0,0,0,0,0,1000
-//-- LG_SHIELDPRESS 
+//-- LG_SHIELDPRESS
 2310,0,0,0,3500:4000:4500:5000:5500,0,2000
-//-- LG_REFLECTDAMAGE 
+//-- LG_REFLECTDAMAGE
 2311,0,0,0,300000,0,0
-//-- LG_PINPOINTATTACK 
+//-- LG_PINPOINTATTACK
 2312,0,1000,0,5000,0,5000
-//-- LG_FORCEOFVANGUARD 
+//-- LG_FORCEOFVANGUARD
 2313,0,1000,0,300000,0,0
-//-- LG_RAGEBURST 
+//-- LG_RAGEBURST
 2314,0,3000,0,0,0,0
-//-- LG_SHIELDSPELL //TODO apply proper duration [malufett] 
+//-- LG_SHIELDSPELL //TODO apply proper duration [malufett]
 2315,1000,1000,0,3000:30000:30000,0,2000
-//-- LG_EXEEDBREAK 
+//-- LG_EXEEDBREAK
 2316,5000:5500:6000:6500:7000,1000,0,300000,0,0
-//-- LG_OVERBRAND 
+//-- LG_OVERBRAND
 2317,500,2000,0,0,0,0
-//-- LG_PRESTIGE 
+//-- LG_PRESTIGE
 2318,1000,0,0,30000:45000:60000:75000:90000,0,60000
-//-- LG_BANDING 
+//-- LG_BANDING
 2319,0,0,0,-1,2000:4000:6000:8000:10000,0
-//-- LG_MOONSLASHER 
+//-- LG_MOONSLASHER
 2320,1000,1000,0,0,0,6000:5000:4000:3000:2000
-//-- LG_RAYOFGENESIS 
+//-- LG_RAYOFGENESIS
 2321,2000:2500:3000:3500:4000,2000,0,10000,0,5000
-//-- LG_PIETY 
+//-- LG_PIETY
 2322,3000:2500:2000:1500:1000,0,0,60000:80000:100000:120000:140000,0,0
-//-- LG_EARTHDRIVE 
+//-- LG_EARTHDRIVE
 2323,1000,1000,0,3000:6000:9000:12000:15000,0,7000:6000:5000:4000:3000
-//-- LG_HESPERUSLIT 
+//-- LG_HESPERUSLIT
 2324,1000,3000,0,0,0,20000
-//-- LG_INSPIRATION 
+//-- LG_INSPIRATION
 2325,2000,2000,0,30000:45000:60000:75000:90000,0,540000:480000:420000:360000:300000
-//========================================== 
+//==========================================
 
-//===== Sura Skills ======================== 
-//-- SR_DRAGONCOMBO 
+//===== Sura Skills ========================
+//-- SR_DRAGONCOMBO
 2326,0,0,0,3000,0,0
-//-- SR_SKYNETBLOW 
+//-- SR_SKYNETBLOW
 2327,0,500,0,0,0,0
-//-- SR_EARTHSHAKER 
+//-- SR_EARTHSHAKER
 2328,0,0,0,1000,0,3000
-//-- SR_FALLENEMPIRE 
+//-- SR_FALLENEMPIRE
 2329,0,0,0,500:1000:1500:2000:2500,0,0
-//-- SR_TIGERCANNON 
+//-- SR_TIGERCANNON
 2330,1100:1200:1300:1400:1500:1600:1700:1800:1900:2000,1000,0,0,0,5000
 
-//-- SR_RAMPAGEBLASTER 
+//-- SR_RAMPAGEBLASTER
 2332,0,1000,0,0,0,10000
-//-- SR_CRESCENTELBOW 
+//-- SR_CRESCENTELBOW
 2333,0,1000,0,3000:4000:5000:6000:7000,0,5000
-//-- SR_CURSEDCIRCLE 
+//-- SR_CURSEDCIRCLE
 2334,0,1000,0,3000:4000:5000:6000:7000,0,10000
-//-- SR_LIGHTNINGWALK 
+//-- SR_LIGHTNINGWALK
 2335,0,1000,0,5000:6000:7000:8000:9000,0,5000
-//-- SR_KNUCKLEARROW 
+//-- SR_KNUCKLEARROW
 2336,0,1000,0,0,0,0
-//-- SR_WINDMILL 
+//-- SR_WINDMILL
 2337,1000,500,0,0,0,3000
-//-- SR_RAISINGDRAGON 
+//-- SR_RAISINGDRAGON
 2338,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0,30000
 
-//-- SR_ASSIMILATEPOWER 
+//-- SR_ASSIMILATEPOWER
 2340,0,1000,0,0,0,5000
-//-- SR_POWERVELOCITY 
+//-- SR_POWERVELOCITY
 2341,1500,0,0,0,0,0
 
-//-- SR_GATEOFHELL 
+//-- SR_GATEOFHELL
 2343,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,100:200:300:400:500:600:700:800:900:1000,0,0,0,0
-//-- SR_GENTLETOUCH_QUIET 
+//-- SR_GENTLETOUCH_QUIET
 2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000
-//-- SR_GENTLETOUCH_CURE 
+//-- SR_GENTLETOUCH_CURE
 2345,0,1000,0,0,0,1000:1500:2000:2500:3000
-//-- SR_GENTLETOUCH_ENERGYGAIN 
+//-- SR_GENTLETOUCH_ENERGYGAIN
 2346,1000,1000,0,240000,0,0
-//-- SR_GENTLETOUCH_CHANGE 
+//-- SR_GENTLETOUCH_CHANGE
 2347,1000,1000,0,240000,0,200000:180000:160000:140000:120000
-//-- SR_GENTLETOUCH_REVITALIZE 
+//-- SR_GENTLETOUCH_REVITALIZE
 2348,1000,1000,0,240000,0,200000:180000:160000:140000:120000
-//========================================== 
+//==========================================
 
-//==== Wanderer skills ===================== 
-//-- WA_SWING_DANCE 
+//==== Wanderer skills =====================
+//-- WA_SWING_DANCE
 2350,1000,2000,0,60000,0,0
-//-- WA_SYMPHONY_OF_LOVER 
+//-- WA_SYMPHONY_OF_LOVER
 2351,1000,2000,0,60000,0,0
-//-- WA_MOONLIT_SERENADE 
+//-- WA_MOONLIT_SERENADE
 2352,1000,2000,0,60000,0,0
-//========================================== 
+//==========================================
 
-//==== Minstresl skills ==================== 
-//-- MI_RUSH_WINDMILL 
+//==== Minstresl skills ====================
+//-- MI_RUSH_WINDMILL
 2381,0,2000,0,60000,0,0
-//-- MI_ECHOSONG 
+//-- MI_ECHOSONG
 2382,1000,2000,0,60000,0,0
-//-- MI_HARMONIZE 
+//-- MI_HARMONIZE
 2383,1000,1000,0,60000,0,5000
-//========================================== 
+//==========================================
 
-//==== Minstrel/Wanderer skills ============ 
-//-- WM_METALICSOUND 
+//==== Minstrel/Wanderer skills ============
+//-- WM_METALICSOUND
 2413,1000:1500:2000:2500:3000,1000,0,0,0,2000:2500:3000:3500:4000
-//-- WM_REVERBERATION 
+//-- WM_REVERBERATION
 2414,1100:1200:1300:1400:1500,1000,0,9000:10000:11000:12000:13000,0,0
 
-//-- WM_DOMINION_IMPULSE 
+//-- WM_DOMINION_IMPULSE
 2417,0,1000,0,0,0,0
-//-- WM_SEVERE_RAINSTORM 
+//-- WM_SEVERE_RAINSTORM
 2418,1000:1500:2000:2500:3000,1000,0,900:1500:2100:2700:3000,0,5000:5500:6000:6500:7000
-//-- WM_POEMOFNETHERWORLD 
+//-- WM_POEMOFNETHERWORLD
 2419,3000,0,0,9000:11000:13000:15000:17000,8000:10000:12000:14000:16000,0
-//-- WM_VOICEOFSIREN 
+//-- WM_VOICEOFSIREN
 2420,2000:2200:2400:2600:2800,1000,0,15000:18000:21000:24000:27000,0,5000
-//-- WM_DEADHILLHERE 
+//-- WM_DEADHILLHERE
 2421,4000:3500:3000:2500:2000,1000,0,0,0,0
-//-- WM_LULLABY_DEEPSLEEP 
+//-- WM_LULLABY_DEEPSLEEP
 2422,2000,1000,0,12000:14000:16000:18000:20000,0,10000
-//-- WM_SIRCLEOFNATURE 
+//-- WM_SIRCLEOFNATURE
 2423,2000,1000,0,60000,0,15000
-//-- WM_RANDOMIZESPELL 
+//-- WM_RANDOMIZESPELL
 2424,0,1000,0,0,0,3000
-//-- WM_GLOOMYDAY 
+//-- WM_GLOOMYDAY
 2425,1000,1000,0,30000:45000:60000:75000:90000,0,10000
-//-- WM_GREAT_ECHO 
+//-- WM_GREAT_ECHO
 2426,2000:2200:2400:2600:2800,1000,0,0,0,10000
-//-- WM_SONG_OF_MANA 
+//-- WM_SONG_OF_MANA
 2427,1000,1000,0,30000:60000:90000:120000:150000,0,90000
-//-- WM_DANCE_WITH_WUG 
+//-- WM_DANCE_WITH_WUG
 2428,1500:2000:2500:3000:3500,1000,0,30000:60000:90000:120000:150000,0,90000
-//-- WM_SOUND_OF_DESTRUCTION 
+//-- WM_SOUND_OF_DESTRUCTION
 2429,0:500:1000:1500:2000,1000,0,0,0,20000
-//-- WM_SATURDAY_NIGHT_FEVER 
+//-- WM_SATURDAY_NIGHT_FEVER
 2430,1000:2000:3000:4000:5000,1000,0,10000:15000:20000:25000:30000,10000:8000:6000:4000:2000,180000
-//-- WM_LERADS_DEW 
+//-- WM_LERADS_DEW
 2431,1000,1000,0,20000:30000:40000:50000:60000,0,180000
-//-- WM_MELODYOFSINK 
+//-- WM_MELODYOFSINK
 2432,100,1000,0,20000:30000:40000:50000:60000,0,180000
-//-- WM_BEYOND_OF_WARCRY 
+//-- WM_BEYOND_OF_WARCRY
 2433,1000,1000,0,20000:30000:40000:50000:60000,0,180000
-//-- WM_UNLIMITED_HUMMING_VOICE 
+//-- WM_UNLIMITED_HUMMING_VOICE
 2434,1000,1000,0,60000:90000:120000:150000:180000,0,110000:120000:130000:140000:150000
-//========================================== 
+//==========================================
 
-//==== Sorcerer skills ===================== 
-//-- SO_FIREWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech] 
+//==== Sorcerer skills =====================
+//-- SO_FIREWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech]
 2443,1000,1000,0,12000,0,0
-//-- SO_ELECTRICWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech] 
+//-- SO_ELECTRICWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech]
 2444,1000,1000,0,12000,0,0
-//-- SO_SPELLFIST 
+//-- SO_SPELLFIST
 2445,0,1000,0,20000:25000:30000:35000:40000,0,0
-//-- SO_EARTHGRAVE 
+//-- SO_EARTHGRAVE
 2446,2200:2400:2600:2800:3000,1000,0,500,8000:11000:14000:17000:20000,5000
-//-- SO_DIAMONDDUST 
+//-- SO_DIAMONDDUST
 2447,5000:5500:6000:6500:7000,1000,0,500,12000:14000:16000:18000:20000,5000
-//-- SO_POISON_BUSTER 
+//-- SO_POISON_BUSTER
 2450,2200:3400:4600:5800:7000,1000,0,0,0,2000
-//-- SO_PSYCHIC_WAVE 
+//-- SO_PSYCHIC_WAVE
 2449,8000:9000:10000:11000:12000,1000,0,1200:1700:2200:2700:3200,0,5000
-//-- SO_CLOUD_KILL 
+//-- SO_CLOUD_KILL
 2450,2300:2500:2700:2900:3100,1000,0,8000:10000:12000:14000:16000,10000:15000:20000:25000:30000,5000
-//-- SO_STRIKING 
+//-- SO_STRIKING
 2451,1000,1000,0,60000,0,2000
-//-- SO_WARMER 
+//-- SO_WARMER
 2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000
-//-- SO_VACUUM_EXTREME 
+//-- SO_VACUUM_EXTREME
 2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,0,5000
-//-- SO_VARETYR_SPEAR 
+//-- SO_VARETYR_SPEAR
 2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000
-//-- SO_ARULLO 
+//-- SO_ARULLO
 2455,2200:2400:2600:2800:3000,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000
-//-- SO_EL_CONTROL 
+//-- SO_EL_CONTROL
 2456,2000,0,0,0,0,5000
-//-- SO_SUMMON_AGNI 
+//-- SO_SUMMON_AGNI
 2457,1000:2000:3000,0,0,600000:900000:1200000,0,60000
-//-- SO_SUMMON_AQUA 
+//-- SO_SUMMON_AQUA
 2458,1000:2000:3000,0,0,600000:900000:1200000,0,60000
-//-- SO_SUMMON_VENTUS 
+//-- SO_SUMMON_VENTUS
 2459,1000:2000:3000,0,0,600000:900000:1200000,0,60000
-//-- SO_SUMMON_TERA 
+//-- SO_SUMMON_TERA
 2460,1000:2000:3000,0,0,600000:900000:1200000,0,60000
-//-- SO_EL_ACTION 
+//-- SO_EL_ACTION
 2461,0,0,0,0,0,5000
-//-- SO_EL_ANALYSIS 
+//-- SO_EL_ANALYSIS
 2462,0,0,0,0,0,0
 
-//-- SO_EL_CURE 
+//-- SO_EL_CURE
 2464,2000,1000,0,0,0,0
-//-- SO_FIRE_INSIGNIA 
+//-- SO_FIRE_INSIGNIA
 2465,1000,0,0,60000,0,60000
-//-- SO_WATER_INSIGNIA 
+//-- SO_WATER_INSIGNIA
 2466,1000,0,0,60000,0,60000
-//-- SO_WIND_INSIGNIA 
+//-- SO_WIND_INSIGNIA
 2467,1000,0,0,60000,0,60000
-//-- SO_EARTH_INSIGNIA 
+//-- SO_EARTH_INSIGNIA
 2468,1000,0,0,60000,0,60000
-//========================================== 
+//==========================================
 
-//==== Genetic skills ====================== 
-//-- GN_CART_TORNADO 
+//==== Genetic skills ======================
+//-- GN_CART_TORNADO
 2476,0,500,0,5000,0,0:500:1000:1500:2000
-//-- GN_CARTCANNON 
+//-- GN_CARTCANNON
 2477,1000:1500:2000:2500:3000,500,0,0,0,0
-//-- GN_CARTBOOST 
+//-- GN_CARTBOOST
 2478,1500,500,0,90000,0,0
-//-- GN_THORNS_TRAP 
+//-- GN_THORNS_TRAP
 2479,1500,500,0,10000:12000:14000:16000:18000,20000,0
-//-- GN_BLOOD_SUCKER 
+//-- GN_BLOOD_SUCKER
 2480,1500,500,0,20000:22000:24000:26000:28000,0,0
-//-- GN_SPORE_EXPLOSION 
+//-- GN_SPORE_EXPLOSION
 2481,1500,500,0,2000:2000:3000:3000:4000,0,5000
-//-- GN_WALLOFTHORN 
+//-- GN_WALLOFTHORN
 2482,1500,500,0,10000:11000:12000:13000:14000,0,5000
-//-- GN_CRAZYWEED 
+//-- GN_CRAZYWEED
 2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000
-//-- GN_CRAZYWEED_ATK 
+//-- GN_CRAZYWEED_ATK
 2484,0,0,0,100,0,0
 
-//-- GN_DEMONIC_FIRE 
+//-- GN_DEMONIC_FIRE
 2485,3000:3500:4000:4500:5000,500,0,10000:12000:14000:16000:18000,15000,5000
-//-- GN_FIRE_EXPANSION 
+//-- GN_FIRE_EXPANSION
 2486,2000,500,0,0,0,0
-//-- GN_FIRE_EXPANSION_SMOKE_POWDER 
+//-- GN_FIRE_EXPANSION_SMOKE_POWDER
 2487,0,0,0,10000:12000:14000:16000:18000,0,0
-//-- GN_FIRE_EXPANSION_TEAR_GAS 
+//-- GN_FIRE_EXPANSION_TEAR_GAS
 2488,0,0,0,10000:12000:14000:16000:18000,0,0
 
-//-- GN_HELLS_PLANT 
+//-- GN_HELLS_PLANT
 2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0
-//-- GN_HELLS_PLANT_ATK 
+//-- GN_HELLS_PLANT_ATK
 2491,0,0,0,20000,0,0
-//-- GN_MANDRAGORA 
+//-- GN_MANDRAGORA
 2492,1000,500,0,10000:15000:20000:25000:30000,0,15000
-//-- GN_SLINGITEM 
+//-- GN_SLINGITEM
 2493,0,0,0,77000,10000,1000
 
-//-- GN_SLINGITEM_RANGEMELEEATK 
+//-- GN_SLINGITEM_RANGEMELEEATK
 2498,0,0,0,3000,0,0
-//========================================== 
+//==========================================
 
-//===== Extra 3rd Class Skills ============= 
-//-- AB_SECRAMENT 
+//===== Extra 3rd Class Skills =============
+//-- AB_SECRAMENT
 2515,1000,500,0,60000:90000:120000:150000:180000,0,0
 
-//-- SR_HOWLINGOFLION 
+//-- SR_HOWLINGOFLION
 2517,1000,0,0,12000:14000:16000:18000:20000,0,10000
-//-- SR_RIDEINLIGHTNING 
+//-- SR_RIDEINLIGHTNING
 2518,1000:2000:3000:4000:5000,200,0,0,0,1000
-//========================================== 
+//==========================================
 
-//===== Misc. Skills ======================= 
-//-- ALL_ODINS_RECALL 
+//===== Misc. Skills =======================
+//-- ALL_ODINS_RECALL
 2533,10000,0,0,0,0,300000
-//-- RETURN_TO_ELDICASTES 
+//-- RETURN_TO_ELDICASTES
 2534,3000,0,0,0,0,300000
-//-- ALL_GUARDIAN_RECALL 
+//-- ALL_GUARDIAN_RECALL
 2536,3000,0,0,0,0,300000
-//-- ALL_ODINS_POWER 
+//-- ALL_ODINS_POWER
 2537,5000,5000,0,60000,0,60000
-//========================================== 
+//==========================================
+
+//==== Rebellion ===========================
+//-- RL_B_TRAP
+2555,0,0,0,10000:11000:12000:13000:14000,0,0
+//==========================================
 
-//==== Kagerou & Oboro skills ============== 
-//-- KO_YAMIKUMO 
+//==== Kagerou & Oboro skills ==============
+//-- KO_YAMIKUMO
 3001,0,0,0,60000,0,0
-//-- KO_JYUMONJIKIRI 
+//-- KO_JYUMONJIKIRI
 3004,0,2500,0,5000,0,0
-//-- KO_SETSUDAN 
+//-- KO_SETSUDAN
 3005,0,2000,0,0,0,0
-//-- KO_BAKURETSU 
+//-- KO_BAKURETSU
 3006,1000:1500:2000:2500:3000,1000,0,100,0,3000
-//-- KO_HAPPOKUNAI 
+//-- KO_HAPPOKUNAI
 3007,0,1000,0,0,0,0
-//-- KO_MUCHANAGE 
+//-- KO_MUCHANAGE
 3008,0,0,0,100,0,10000
-//-- KO_HUUMARANKA 
+//-- KO_HUUMARANKA
 3009,0,3000,0,500,0,0
-//-- KO_MAKIBISHI 
+//-- KO_MAKIBISHI
 3010,0,0,0,12000:14000:16000:18000:20000,10000,0
-//-- KO_MEIKYOUSISUI 
+//-- KO_MEIKYOUSISUI
 3011,3000,0,0,10000,0,0
-//-- KO_ZANZOU 
+//-- KO_ZANZOU
 3012,0,0,0,27000:24000:21000:18000:15000,0,0
-//-- KO_KYOUGAKU 
+//-- KO_KYOUGAKU
 3013,1000,0,0,12000:14000:16000:18000:20000,0,0
-//-- KO_JYUSATSU 
+//-- KO_JYUSATSU
 3014,1000,0,0,8000:10000:12000:14000:16000,0,0
-//-- KO_KAHU_ENTEN 
+//-- KO_KAHU_ENTEN
 3015,500,0,0,300000,0,0
-//-- KO_HYOUHU_HUBUKI 
+//-- KO_HYOUHU_HUBUKI
 3016,500,0,0,300000,0,0
-//-- KO_KAZEHU_SEIRAN 
+//-- KO_KAZEHU_SEIRAN
 3017,500,0,0,300000,0,0
-//-- KO_DOHU_KOUKAI 
+//-- KO_DOHU_KOUKAI
 3018,500,0,0,300000,0,0
-//-- KO_KAIHOU 
+//-- KO_KAIHOU
 3019,1000,0,0,0,0,0
-//-- KO_ZENKAI 
+//-- KO_ZENKAI
 3020,1000,0,0,10000,10000,0
-//-- KO_GENWAKU 
+//-- KO_GENWAKU
 3021,500,0,0,5000,0,0
-//-- KO_IZAYOI 
+//-- KO_IZAYOI
 3022,0,0,0,30000:45000:60000:75000:90000,0,60000
-//-- KG_KAGEHUMI 
+//-- KG_KAGEHUMI
 3023,0,0,0,5000,0,5000
-//-- KG_KYOMU 
+//-- KG_KYOMU
 3024,0,0,0,10000:15000:20000:25000:30000,0,0
-//-- KG_KAGEMUSYA 
+//-- KG_KAGEMUSYA
 3025,0,0,0,60000:90000:120000:15000:180000,0,0
-//-- OB_ZANGETSU 
+//-- OB_ZANGETSU
 3026,0,0,0,60000:75000:90000:105000:120000,0,0
-//-- OB_OBOROGENSOU 
+//-- OB_OBOROGENSOU
 3027,0,0,0,10000:15000:20000:25000:30000,0,0
-//-- OB_AKAITSUKI 
+//-- OB_AKAITSUKI
 3029,0,0,0,10000:15000:20000:25000:30000,0,0
 //==========================================
 
@@ -1720,57 +1725,57 @@
 8016,0,0,1000,0,0,0
 //==========================================
 
-//-- MH_SUMMON_LEGION 
+//-- MH_SUMMON_LEGION
 8018,1600:1400:1200:1000:800,0,0,20000:30000:40000:50000:60000,0,0
-//-- MH_NEEDLE_OF_PARALYZE 
+//-- MH_NEEDLE_OF_PARALYZE
 8019,1000:1100:1200:1300:1400,0,0,12000:14000:16000:18000:20000,0,0
-//-- MH_POISON_MIST 
+//-- MH_POISON_MIST
 8020,500:700:900:1100:1300,0,0,12000:14000:16000:18000:20000,4000:6000:8000:10000:12000,0
-//-- MH_PAIN_KILLER 
+//-- MH_PAIN_KILLER
 8021,1000:1200:1400:1600:1800,0,0,20000:30000:40000:50000:60000,0,0
-//-- MH_LIGHT_OF_REGENE 
+//-- MH_LIGHT_OF_REGENE
 8022,1600:1400:1200:1000:800,0,0,360000:420000:480000:540000:600000,0,0
-//-- MH_OVERED_BOOST 
+//-- MH_OVERED_BOOST
 8023,800:700:600:500:400,0,0,30000:45000:60000:75000:90000,0,0
-//-- MH_ERASER_CUTTER 
+//-- MH_ERASER_CUTTER
 8024,1000:1500:2000:2500:3000,0,0,0,0,0
-//-- MH_XENO_SLASHER 
+//-- MH_XENO_SLASHER
 8025,1500:2500:3500:4500:5500,0,0,500,0,0
-//-- MH_SILENT_BREEZE 
+//-- MH_SILENT_BREEZE
 8026,2000,0,0,9000:12000:15000:18000:21000,0,0
-//-- MH_STYLE_CHANGE 
-//8027,0,0,0,0,0,0,0 
-//-- MH_SONIC_CRAW 
-//8028,0,0,0,0,0,0,0 
-//-- MH_SILVERVEIN_RUSH 
-//8029,0,0,0,0,0,0,0 
-//-- MH_MIDNIGHT_FRENZY 
-//8030,0,0,0,0,0,0,0 
-//-- MH_STAHL_HORN 
+//-- MH_STYLE_CHANGE
+//8027,0,0,0,0,0,0,0
+//-- MH_SONIC_CRAW
+//8028,0,0,0,0,0,0,0
+//-- MH_SILVERVEIN_RUSH
+//8029,0,0,0,0,0,0,0
+//-- MH_MIDNIGHT_FRENZY
+//8030,0,0,0,0,0,0,0
+//-- MH_STAHL_HORN
 8031,800:600:400:200:0,0,0,5000,0,0
-//-- MH_GOLDENE_FERSE 
+//-- MH_GOLDENE_FERSE
 8032,1000:1200:1400:1600:1800,0,0,30000:45000:60000:75000:90000,0,0
-//-- MH_STEINWAND 
+//-- MH_STEINWAND
 8033,1000,0,0,30000:45000:60000:75000:90000,0,0
-//-- MH_HEILIGE_STANGE 
+//-- MH_HEILIGE_STANGE
 8034,200:400:600:800:1000,0,0,0,0,0
-//-- MH_ANGRIFFS_MODUS 
+//-- MH_ANGRIFFS_MODUS
 8035,200:400:600:800:1000,0,0,30000:45000:60000:75000:90000,0,0
-//-- MH_TINDER_BREAKER 
-//8036,0,0,0,0,0,0,0 
-//-- MH_CBC 
-//8037,0,0,0,0,0,0,0 
-//-- MH_EQC 
-//8038,0,0,0,0,0,0,0 
-//-- MH_MAGMA_FLOW 
+//-- MH_TINDER_BREAKER
+//8036,0,0,0,0,0,0,0
+//-- MH_CBC
+//8037,0,0,0,0,0,0,0
+//-- MH_EQC
+//8038,0,0,0,0,0,0,0
+//-- MH_MAGMA_FLOW
 8039,2000:2500:3000:3500:4000,0,0,30000:45000:60000:75000:90000,0,0
-//-- MH_GRANITIC_ARMOR 
+//-- MH_GRANITIC_ARMOR
 8040,6000:5500:5000:4500:4000,0,0,60000,0,0
-//-- MH_LAVA_SLIDE 
+//-- MH_LAVA_SLIDE
 8041,6000:5500:5000:4500:4000,0,0,12000:14000:16000:18000:20000,0,0
-//-- MH_PYROCLASTIC 
+//-- MH_PYROCLASTIC
 8042,5000:4500:4000:3500:3000,0,0,60000:90000:120000:150000:180000,0,0
-//-- MH_VOLCANIC_ASH 
+//-- MH_VOLCANIC_ASH
 8043,5000:4500:4000:3500:3000,0,0,12000:14000:16000:18000:20000,0,0
 //==========================================
 
@@ -1835,66 +1840,66 @@
 8240,1000,1000,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0
 //==========================================
 
-//===== Elemental Skills ======================= 
-//-- EL_CIRCLE_OF_FIRE 
+//===== Elemental Skills =======================
+//-- EL_CIRCLE_OF_FIRE
 8401,0,0,0,-1,0,0
-//-- EL_FIRE_CLOAK 
+//-- EL_FIRE_CLOAK
 8402,0,0,0,-1,0,0
-//-- EL_FIRE_MANTLE 
+//-- EL_FIRE_MANTLE
 8403,0,0,0,15000,0,0
-//-- EL_WATER_SCREEN 
+//-- EL_WATER_SCREEN
 8404,0,0,0,-1,0,0
-//-- EL_WATER_DROP 
+//-- EL_WATER_DROP
 8405,0,0,0,-1,0,0
-//-- EL_WATER_BARRIER 
+//-- EL_WATER_BARRIER
 8406,1000,0,0,15000,0,0
-//-- EL_WIND_STEP 
+//-- EL_WIND_STEP
 8407,0,0,0,-1,0,0
-//-- EL_WIND_CURTAIN 
+//-- EL_WIND_CURTAIN
 8408,0,0,0,-1,0,0
-//-- EL_ZEPHYR 
+//-- EL_ZEPHYR
 8409,0,0,0,15000,0,0
-//-- EL_STONE_SHIELD 
+//-- EL_STONE_SHIELD
 8411,0,0,0,-1,0,0
-//-- EL_POWER_OF_GAIA 
+//-- EL_POWER_OF_GAIA
 8412,0,0,0,15000,0,0
-//-- EL_PYROTECHNIC 
+//-- EL_PYROTECHNIC
 8413,0,0,0,-1,0,0
-//-- EL_HEATER 
+//-- EL_HEATER
 8414,0,0,0,-1,0,0
-//-- EL_TROPIC 
+//-- EL_TROPIC
 8415,0,0,0,-1,0,0
-//-- EL_AQUAPLAY 
+//-- EL_AQUAPLAY
 8416,0,0,0,-1,0,0
-//-- EL_COOLER 
+//-- EL_COOLER
 8417,0,0,0,-1,0,0
-//-- EL_CHILLY_AIR 
+//-- EL_CHILLY_AIR
 8418,0,0,0,-1,0,0
-//-- EL_GUST 
+//-- EL_GUST
 8419,0,0,0,-1,0,0
-//-- EL_BLAST 
+//-- EL_BLAST
 8420,0,0,0,-1,0,0
-//-- EL_WILD_STORM 
+//-- EL_WILD_STORM
 8421,0,0,0,-1,0,0
-//-- EL_PETROLOGY 
+//-- EL_PETROLOGY
 8422,0,0,0,-1,0,0
-//-- EL_CURSED_SOIL 
+//-- EL_CURSED_SOIL
 8423,0,0,0,-1,0,0
-//-- EL_UPHEAVAL 
+//-- EL_UPHEAVAL
 8424,0,0,0,-1,0,0
-//-- EL_TIDAL_WEAPON 
+//-- EL_TIDAL_WEAPON
 8433,0,0,0,-1,0,0
 //-- EL_WIND_SLASH
 8434,1000,0,0,0,0,0
 //-- EL_HURRICANE
 8435,1000,0,0,0,0,0
-//-- EL_TYPOON_MIS 
+//-- EL_TYPOON_MIS
 8437,1000,0,0,15000,0,0
-//-- EL_STONE_HAMMER 
+//-- EL_STONE_HAMMER
 8439,0,0,0,5000,0,0
-//-- EL_ROCK_CRUSHER 
+//-- EL_ROCK_CRUSHER
 8440,0,0,0,15000,0,0
-//-- EL_ROCK_CRUSHER_ATK 
+//-- EL_ROCK_CRUSHER_ATK
 8441,0,0,0,15000,0,0
 //==========================================
 

+ 27 - 0
db/pre-re/skill_db.txt

@@ -1206,6 +1206,33 @@
 //2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		ALL_RAY_OF_PROTECTION,Ray of Protection
 //2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		MC_CARTDECORATE,Decorate Cart
 
+//****
+// Rebellion
+2551,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0,	RL_GLITTERING_GREED,Flip The Coin Greed
+2552,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0,	RL_RICHS_COIN,Rich's Coin
+2553,15,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_MASS_SPIRAL,Mass Spiral
+2554,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0,	RL_BANISHING_BUSTER,Banishing Buster
+2555,0,6,4,0,0x1,0,5,1,no,0,0,3,none,0,0,	RL_B_TRAP,Bind Trap
+2556,0,6,4,0,0x3,-1,1,1,no,0,0,0,none,0,0,	RL_FLICKER,Flicker
+2557,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0,	RL_S_STORM,Shatter Storm
+2558,0,6,4,0,0x1,0,10,1,no,0,0,0,none,0,0,	RL_E_CHAIN,Eternal Chain
+2559,0,6,4,-1,0,0,1,1,no,0,0x200,0,weapon,0,0,	RL_QD_SHOT,Quick Draw Shot
+2560,11,6,1,0,0x1,0,1,1,no,0,0,3,none,0,0,	RL_C_MARKER,Crimson Marker
+2561,0,6,4,-1,0x2,2,5,1,no,0,0,0,weapon,0,0,	RL_FIREDANCE,Fire Dance
+2562,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_H_MINE,Howling Mine
+2563,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0,	RL_P_ALTER,Platinum Alter
+2564,9,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0,	RL_FALLEN_ANGEL,Fallen Angel
+2565,0,6,4,-1,0x2,2:3:4:5:6,5,1,no,0,0,0,weapon,3,0,	RL_R_TRIP,Round Trip
+2566,0,6,4,-1,0x2,-1,5,1,no,0,0,0,weapon,0,0,	RL_D_TAIL,Dragon Tail
+2567,3,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_FIRE_RAIN,Fire Rain
+2568,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0,	RL_HEAT_BARREL,Heat Barrel
+2569,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_AM_BLAST,Anti-Material Blast
+2570,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,6,0,	RL_SLUGSHOT,Slug Shot
+2571,7:8:9:10:11,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0,	RL_HAMMER_OF_GOD,Hammer of God
+2572,0,6,1,-1,0x40,0,5,1,no,0,0,0,weapon,0,0,	RL_R_TRIP_PLUSATK,Round Trip Plus Attack
+2573,0,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_B_FLICKER_ATK,Bind Flicker Attack
+2574,0,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0,	RL_GLITTERING_GREED_ATK,Flip The Coin Greed Attack
+
 //****
 // Kagerou & Oboro
 3001,0,6,4,0,0,0,1,1,no,0,0,0,none,0,0x4,		KO_YAMIKUMO,Yamikumo

+ 27 - 0
db/pre-re/skill_require_db.txt

@@ -794,6 +794,33 @@
 //2543,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,0,0	//ALL_RAY_OF_PROTECTION#Ray of Protection#
 //2544,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,0,0	//MC_CARTDECORATE#Cart Decorate#
 
+//***
+// Rebellion
+2551,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,0,0	//RL_GLITTERING_GREED#Flip The Coin Greed#
+2552,0,0,10,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,0,0	//RL_RICHS_COIN#Rich's Coin#
+2553,0,0,80:84:88:92:96,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,0,0	//RL_MASS_SPIRAL#Mass Spiral#
+2554,0,0,55:60:65:70:75,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,0,0	//RL_BANISHING_BUSTER#Banishing Buster#
+2555,0,0,30:32:34:36:38,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,0,0	//RL_B_TRAP#Bind Trap#
+2556,0,0,2,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,0,0	//RL_FLICKER#Flicker#
+2557,0,0,55:60:65:70:75,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,0,0	//RL_S_STORM#Shatter Storm#
+2558,0,0,45,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,0,0	//RL_E_CHAIN#Eternal Chain#
+2559,0,0,5,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,0,0	//RL_QD_SHOT#Quick Draw Shot#
+2560,0,0,10,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,0,0	//RL_C_MARKER#Crimson Marker#
+2561,0,0,10:15:20:25:30,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,0,0	//RL_FIREDANCE#Fire Dance#
+2562,0,0,45:50:55:60:65,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,0,0	//RL_H_MINE#Howling Mine#
+2563,0,0,20:24:28:32:36,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,0,0	//RL_P_ALTER#Platinum Alter#
+2564,0,0,90,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,0,0	//RL_FALLEN_ANGEL#Fallen Angel#
+2565,0,0,40:45:50:55:60,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,0,0	//RL_R_TRIP#Round Trip#
+2566,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,0,0	//RL_D_TAIL#Dragon Tail#
+2567,0,0,70,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,0,0	//RL_FIRE_RAIN#Fire Rain#
+2568,0,0,30:40:50:60:70,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,0,0	//RL_HEAT_BARREL#Heat Barrel#
+2569,0,0,80:84:88:92:96,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,0,0	//RL_AM_BLAST#Anti-Material Blast#
+2570,0,0,55:60:65:70:75,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,0,0	//RL_SLUGSHOT#Slug Shot#
+2571,0,0,70:80:90:100:110,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,0,0	//RL_HAMMER_OF_GOD#Hammer of God#
+2572,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,0,0	//RL_R_TRIP_PLUSATK#Round Trip Plus Attack#
+2573,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,0,0	//RL_B_FLICKER_ATK#Bind Flicker Attack#
+2574,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,0,0	//RL_GLITTERING_GREED_ATK#Flip The Coin Greed Attack#
+
 //****
 // Kagerou/Oboro
 3001,0,0,10,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,0,0	//KO_YAMIKUMO#Yamikumo#

+ 46 - 0
db/pre-re/skill_tree.txt

@@ -5476,3 +5476,49 @@
 4212,3026,5,3021,1,0,0,0,0,0,0,0,0 //OB_ZANGETSU##
 4212,3027,5,3029,3,0,0,0,0,0,0,0,0 //OB_OBOROGENSOU##
 4212,3029,5,3026,2,0,0,0,0,0,0,0,0 //OB_AKAITSUKI##
+//Rebellion
+4215,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
+4215,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
+4215,500,5,0,0,0,0,0,0,0,0,0,0 //GS_GLITTERING#Flip the Coin#
+4215,501,1,500,1,0,0,0,0,0,0,0,0 //GS_FLING#Fling#
+4215,502,1,500,1,511,10,0,0,0,0,0,0 //GS_TRIPLEACTION#Triple Action#
+4215,503,1,500,5,512,10,0,0,0,0,0,0 //GS_BULLSEYE#Bulls Eye#
+4215,504,1,500,4,517,10,0,0,0,0,0,0 //GS_MADNESSCANCEL#Madness Canceler#
+4215,505,1,500,4,513,5,0,0,0,0,0,0 //GS_ADJUSTMENT#AdJustment#
+4215,506,1,500,2,510,10,0,0,0,0,0,0 //GS_INCREASING#Increasing Accuracy#
+4215,507,1,500,1,0,0,0,0,0,0,0,0 //GS_MAGICALBULLET#Magical Bullet#
+4215,508,1,500,1,0,0,0,0,0,0,0,0 //GS_CRACKER#Cracker#
+4215,509,10,0,0,0,0,0,0,0,0,0,0 //GS_SINGLEACTION#Single Action#
+4215,510,10,0,0,0,0,0,0,0,0,0,0 //GS_SNAKEEYE#Snake Eye#
+4215,511,10,509,1,0,0,0,0,0,0,0,0 //GS_CHAINACTION#Chain Action#
+4215,512,10,509,5,0,0,0,0,0,0,0,0 //GS_TRACKING#Tracking#
+4215,513,5,512,7,0,0,0,0,0,0,0,0 //GS_DISARM#Disarm#
+4215,514,5,512,5,0,0,0,0,0,0,0,0 //GS_PIERCINGSHOT#Piercing Shot#
+4215,515,10,511,3,0,0,0,0,0,0,0,0 //GS_RAPIDSHOWER#Rapid Shower#
+4215,516,10,515,5,0,0,0,0,0,0,0,0 //GS_DESPERADO#Desperado#
+4215,517,10,515,7,516,5,0,0,0,0,0,0 //GS_GATLINGFEVER#Gatling Fever#
+4215,518,10,509,5,0,0,0,0,0,0,0,0 //GS_DUST#Dust#
+4215,519,10,518,3,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster#
+4215,520,10,519,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
+4215,521,10,520,7,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift#
+4215,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
+4215,2552,1,500,5,0,0,0,0,0,0,0,0 //RL_RICHS_COIN#Rich's Coin#
+4215,2553,5,514,1,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL#Mass Spiral#
+4215,2554,5,2557,1,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER#Banishing Buster#
+4215,2555,5,0,0,0,0,0,0,0,0,0,0 //RL_B_TRAP#Bind Trap#
+4215,2556,1,501,1,0,0,0,0,0,0,0,0 //RL_FLICKER#Flicker#
+4215,2557,5,513,1,518,1,0,0,0,0,0,0 //RL_S_STORM#Shatter Storm#
+4215,2558,10,511,10,0,0,0,0,0,0,0,0 //RL_E_CHAIN#Eternal Chain#
+4215,2559,1,2558,1,0,0,0,0,0,0,0,0 //RL_QD_SHOT#Quick Draw Shot#
+4215,2560,1,506,1,0,0,0,0,0,0,0,0 //RL_C_MARKER#Crimson Marker#
+4215,2561,5,2564,1,0,0,0,0,0,0,0,0 //RL_FIREDANCE#Fire Dance#
+4215,2562,5,520,1,0,0,0,0,0,0,0,0 //RL_H_MINE#Howling Mine#
+4215,2563,5,0,0,0,0,0,0,0,0,0,0 //RL_P_ALTER#Platinum Alter#
+4215,2564,5,516,10,0,0,0,0,0,0,0,0 //RL_FALLEN_ANGEL#Fallen Angel#
+4215,2565,5,2567,1,0,0,0,0,0,0,0,0 //RL_R_TRIP#Round Trip#
+4215,2566,5,2560,1,2562,3,0,0,0,0,0,0 //RL_D_TAIL#Dragon Tail#
+4215,2567,5,517,1,0,0,0,0,0,0,0,0 //RL_FIRE_RAIN#Fire Rain#
+4215,2568,5,2561,2,0,0,0,0,0,0,0,0 //RL_HEAT_BARREL#Heat Barrel#
+4215,2569,5,2553,1,0,0,0,0,0,0,0,0 //RL_AM_BLAST#Anti-Material Blast#
+4215,2570,5,2554,3,0,0,0,0,0,0,0,0 //RL_SLUGSHOT#Slug Shot#
+4215,2571,5,2569,3,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD#Hammer of God#

+ 2 - 0
db/pre-re/skill_unit_db.txt

@@ -152,6 +152,8 @@
 2488,0xe9,    ,  0, 3,1000,enemy, 0x000	//GN_FIRE_EXPANSION_TEAR_GAS
 2490,0xea,    ,  0, 1,1000,enemy, 0x002	//GN_HELLS_PLANT
 
+2555,0x104,   ,  0, 1:2:2:3:3,500,enemy,0x006	//RL_B_TRAP
+
 3006,0x86,    ,  0, 2,1000,enemy, 0x018	//KO_BAKURETSU
 3008,0x86,    ,  0, 2,1000,enemy, 0x018	//KO_MUCHANAGE
 3009,0x86,    ,  0, 3, 500,enemy, 0x018	//KO_HUUMARANKA

+ 2 - 0
db/re/job_db1.txt

@@ -269,3 +269,5 @@
 4211,	26000,80   ,  0  ,515  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000 ,500
 // Oboro
 4212,	26000,80   ,  0  ,515  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000 ,500
+// Rebellion
+4215,   28000,88   ,  0  ,450  ,540  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490  ,590  ,440  ,940  ,1040 ,2000 ,2000 ,600

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
db/re/job_exp.txt


+ 4 - 4
db/re/job_maxhpsp_db.txt

@@ -48,8 +48,8 @@
 //MaxHP - Bard/Dancer/Clown/Gypsy/Baby Bard/Baby Dancer
 1,99,19:20:4020:4021:4042:4043,0,40,47,54,62,71,81,91,102,114,127,140,154,169,180,196,212,224,242,260,278,296,316,330,350,371,393,415,438,451,477,503,530,558,587,616,646,677,709,741,774,808,843,878,914,951,989,1027,1066,1106,1147,1188,1230,1273,1317,1361,1406,1452,1499,1546,1594,1643,1693,1743,1794,1846,1899,1952,2006,2061,2117,2173,2230,2288,2347,2406,2466,2527,2589,2651,2714,2778,2843,2908,2974,3041,3109,3177,3246,3316,3387,3458,3530,3603,3677,3751,3826,3902,3979,4056
 
-//MaxHP - Gunslinger
-1,99,24,0,40,47,55,64,74,84,95,107,120,134,149,165,182,200,219,238,258,306,329,354,379,406,433,462,491,521,551,583,615,649,683,719,755,793,831,870,909,950,991,1034,1077,1122,1167,1214,1261,1309,1357,1407,1457,1509,1561,1615,1669,1725,1781,1838,1895,1954,2013,2074,2135,2198,2261,2326,2391,2457,2523,2591,2659,2670,2680,2690,2700,2710,2720,2730,2740,2750,2760,3000,3020,3040,3060,3080,3100,3120,3140,3160,3180,3455,3524,3593,3663,3734,3806,3878,3951,4025,4500
+//MaxHP - Gunslinger/Rebellion
+1,99,24:4215,0,40,47,55,64,74,84,95,107,120,134,149,165,182,200,219,238,258,306,329,354,379,406,433,462,491,521,551,583,615,649,683,719,755,793,831,870,909,950,991,1034,1077,1122,1167,1214,1261,1309,1357,1407,1457,1509,1561,1615,1669,1725,1781,1838,1895,1954,2013,2074,2135,2198,2261,2326,2391,2457,2523,2591,2659,2670,2680,2690,2700,2710,2720,2730,2740,2750,2760,3000,3020,3040,3060,3080,3100,3120,3140,3160,3180,3455,3524,3593,3663,3734,3806,3878,3951,4025,4500
 
 //MaxHP - Ninja
 1,99,25:4211:4212,0,40,47,54,62,71,81,91,102,114,127,140,154,169,185,201,218,236,255,274,294,315,337,359,382,406,431,456,482,509,537,565,594,624,655,686,718,751,785,819,854,890,927,964,1002,1041,1081,1121,1162,1204,1247,1290,1334,1379,1425,1471,1518,1566,1615,1664,1714,1765,1817,1869,1922,1976,2031,2086,2142,2199,2257,2275,2294,2314,2335,2356,2378,2401,2425,2449,2874,2890,2907,2924,2942,2971,2991,3011,3032,3054,3567,3590,3614,3649,3675,3701,3728,3756,3800,4250
@@ -129,8 +129,8 @@
 //MaxSP - Sage/Professor/Baby Sage
 1,99,16:4017:4039,1,17,24,31,38,45,52,59,66,73,80,87,94,101,108,115,122,129,136,143,150,157,164,171,178,185,192,199,206,213,220,227,234,241,248,255,262,269,276,283,290,297,304,311,318,325,332,339,346,353,360,367,374,381,388,395,402,409,416,423,430,437,444,451,458,465,472,479,486,493,500,507,514,521,528,535,542,549,556,563,570,577,584,591,598,605,612,619,626,633,640,647,654,661,668,675,682,689,696,703
 
-//MaxSP - Gunslinger
-1,99,24,1,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57,61,64,67,70,73,76,79,82,85,89,93,97,101,105,109,113,117,121,125,129,131,135,139,141,145,149,153,157,161,165,169,173,177,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,256,261,266,271,276,281,286,291,296,301,306,312,318,324,336,342,348,354,360,366,372,378,384,390,396,402,408,414,420,426,432,438,444,450,456
+//MaxSP - Gunslinger/Rebellion
+1,99,24:4215,1,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57,61,64,67,70,73,76,79,82,85,89,93,97,101,105,109,113,117,121,125,129,131,135,139,141,145,149,153,157,161,165,169,173,177,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,256,261,266,271,276,281,286,291,296,301,306,312,318,324,336,342,348,354,360,366,372,378,384,390,396,402,408,414,420,426,432,438,444,450,456
 
 //MaxSP - Ninja
 1,99,25:4211:4212,1,14,17,20,23,26,29,32,35,38,41,44,47,50,53,56,59,62,65,68,71,75,79,83,87,91,95,99,103,107,111,115,119,123,127,131,135,139,143,147,151,156,161,166,171,176,181,186,191,196,201,206,211,216,221,226,231,236,241,246,251,257,263,269,275,281,287,293,299,305,311,317,323,329,335,341,347,353,359,365,371,378,386,394,402,410,418,426,434,442,450,458,466,474,482,490,498,506,514,522

+ 8 - 3
db/re/skill_cast_db.txt

@@ -553,8 +553,8 @@
 //===== High Wzard =========================
 //-- HW_MAGICCRASHER
 365,300,300,0,0,0,0,0
-//-- HW_MAGICPOWER 
-366,0,0,0,30000,0,0,0 
+//-- HW_MAGICPOWER
+366,0,0,0,30000,0,0,0
 //==========================================
 
 
@@ -1561,7 +1561,7 @@
 2451,1000,1000,0,60000,0,2000,-1
 //-- SO_WARMER
 2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000,1800:1600:1400:1200:1000
-//-- SO_VACUUM_EXTREME 
+//-- SO_VACUUM_EXTREME
 2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,0,5000,0
 //-- SO_VARETYR_SPEAR
 2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000,1800:1600:1400:1200:1000
@@ -1661,6 +1661,11 @@
 2537,5000,5000,0,60000,0,60000,0
 //==========================================
 
+//===== Rebellion ==========================
+//-- RL_B_TRAP
+2555,0,0,0,10000:11000:12000:13000:14000,0,0,-1
+//==========================================
+
 //==== Kagerou & Oboro skills ==============
 //-- KO_YAMIKUMO
 3001,0,0,0,60000,0,0,-1

+ 27 - 0
db/re/skill_db.txt

@@ -1220,6 +1220,33 @@
 //2547,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0,	GM_ITEM_MATKMAX,Maximize Magic Attack
 //2548,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0,	GM_ITEM_MATKMIN,Minimize Magic Attack
 
+//****
+// Rebellion
+2551,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0,	RL_GLITTERING_GREED,Flip The Coin Greed
+2552,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0,	RL_RICHS_COIN,Rich's Coin
+2553,15,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_MASS_SPIRAL,Mass Spiral
+2554,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0,	RL_BANISHING_BUSTER,Banishing Buster
+2555,0,6,4,0,0x1,0,5,1,no,0,0,3,none,0,0,	RL_B_TRAP,Bind Trap
+2556,0,6,4,0,0x3,-1,1,1,no,0,0,0,none,0,0,	RL_FLICKER,Flicker
+2557,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0,	RL_S_STORM,Shatter Storm
+2558,0,6,4,0,0x1,0,10,1,no,0,0,0,none,0,0,	RL_E_CHAIN,Eternal Chain
+2559,0,6,4,-1,0,0,1,1,no,0,0x200,0,weapon,0,0,	RL_QD_SHOT,Quick Draw Shot
+2560,11,6,1,0,0x1,0,1,1,no,0,0,3,none,0,0,	RL_C_MARKER,Crimson Marker
+2561,0,6,4,-1,0x2,2,5,1,no,0,0,0,weapon,0,0,	RL_FIREDANCE,Fire Dance
+2562,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_H_MINE,Howling Mine
+2563,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0,	RL_P_ALTER,Platinum Alter
+2564,9,6,2,0,0x1,0,5,1,no,0,0,0,none,0,0,	RL_FALLEN_ANGEL,Fallen Angel
+2565,0,6,4,-1,0x2,2:3:4:5:6,5,1,no,0,0,0,weapon,3,0,	RL_R_TRIP,Round Trip
+2566,0,6,4,-1,0x2,-1,5,1,no,0,0,0,weapon,0,0,	RL_D_TAIL,Dragon Tail
+2567,3,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_FIRE_RAIN,Fire Rain
+2568,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0,	RL_HEAT_BARREL,Heat Barrel
+2569,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_AM_BLAST,Anti-Material Blast
+2570,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,6,0,	RL_SLUGSHOT,Slug Shot
+2571,7:8:9:10:11,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0,	RL_HAMMER_OF_GOD,Hammer of God
+2572,0,6,1,-1,0x40,0,5,1,no,0,0,0,weapon,0,0,	RL_R_TRIP_PLUSATK,Round Trip Plus Attack
+2573,0,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0,	RL_B_FLICKER_ATK,Bind Flicker Attack
+2574,0,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0,	RL_GLITTERING_GREED_ATK,Flip The Coin Greed Attack
+
 //****
 // Kagerou & Oboro
 3001,0,6,4,0,0,0,1,1,no,0,0,0,none,0,0x4,		KO_YAMIKUMO,Yamikumo

+ 27 - 0
db/re/skill_require_db.txt

@@ -800,6 +800,33 @@
 //2547,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,0,0	//GM_ITEM_MATKMAX#Maximum Magic Attack#
 //2548,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,0,0	//GM_ITEM_MATKMIN#Minimal Magic Attack#
 
+//****
+// Rebellion
+2551,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,0,0	//RL_GLITTERING_GREED#Flip The Coin Greed#
+2552,0,0,10,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,0,0	//RL_RICHS_COIN#Rich's Coin#
+2553,0,0,80:84:88:92:96,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,0,0	//RL_MASS_SPIRAL#Mass Spiral#
+2554,0,0,55:60:65:70:75,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,0,0	//RL_BANISHING_BUSTER#Banishing Buster#
+2555,0,0,30:32:34:36:38,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,0,0	//RL_B_TRAP#Bind Trap#
+2556,0,0,2,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,0,0	//RL_FLICKER#Flicker#
+2557,0,0,55:60:65:70:75,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,0,0	//RL_S_STORM#Shatter Storm#
+2558,0,0,45,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,0,0	//RL_E_CHAIN#Eternal Chain#
+2559,0,0,5,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,0,0	//RL_QD_SHOT#Quick Draw Shot#
+2560,0,0,10,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,0,0	//RL_C_MARKER#Crimson Marker#
+2561,0,0,10:15:20:25:30,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,0,0	//RL_FIREDANCE#Fire Dance#
+2562,0,0,45:50:55:60:65,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,0,0	//RL_H_MINE#Howling Mine#
+2563,0,0,20:24:28:32:36,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,0,0	//RL_P_ALTER#Platinum Alter#
+2564,0,0,90,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,0,0	//RL_FALLEN_ANGEL#Fallen Angel#
+2565,0,0,40:45:50:55:60,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,0,0	//RL_R_TRIP#Round Trip#
+2566,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,0,0	//RL_D_TAIL#Dragon Tail#
+2567,0,0,70,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,0,0	//RL_FIRE_RAIN#Fire Rain#
+2568,0,0,30:40:50:60:70,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,0,0	//RL_HEAT_BARREL#Heat Barrel#
+2569,0,0,80:84:88:92:96,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,0,0	//RL_AM_BLAST#Anti-Material Blast#
+2570,0,0,55:60:65:70:75,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,0,0	//RL_SLUGSHOT#Slug Shot#
+2571,0,0,70:80:90:100:110,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,0,0	//RL_HAMMER_OF_GOD#Hammer of God#
+2572,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,0,0	//RL_R_TRIP_PLUSATK#Round Trip Plus Attack#
+2573,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,0,0	//RL_B_FLICKER_ATK#Bind Flicker Attack#
+2574,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,0,0	//RL_GLITTERING_GREED_ATK#Flip The Coin Greed Attack#
+
 //****
 // Kagerou/Oboro
 3001,0,0,10,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,0,0	//KO_YAMIKUMO#Yamikumo#

+ 46 - 0
db/re/skill_tree.txt

@@ -5578,3 +5578,49 @@
 4212,3026,5,3021,1,0,0,0,0,0,0,0,0 //OB_ZANGETSU##
 4212,3027,5,3029,3,0,0,0,0,0,0,0,0 //OB_OBOROGENSOU##
 4212,3029,5,3026,2,0,0,0,0,0,0,0,0 //OB_AKAITSUKI##
+//Rebellion
+4215,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
+4215,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
+4215,500,5,0,0,0,0,0,0,0,0,0,0 //GS_GLITTERING#Flip the Coin#
+4215,501,1,500,1,0,0,0,0,0,0,0,0 //GS_FLING#Fling#
+4215,502,1,500,1,511,10,0,0,0,0,0,0 //GS_TRIPLEACTION#Triple Action#
+4215,503,1,500,5,512,10,0,0,0,0,0,0 //GS_BULLSEYE#Bulls Eye#
+4215,504,1,500,4,517,10,0,0,0,0,0,0 //GS_MADNESSCANCEL#Madness Canceler#
+4215,505,1,500,4,513,5,0,0,0,0,0,0 //GS_ADJUSTMENT#AdJustment#
+4215,506,1,500,2,510,10,0,0,0,0,0,0 //GS_INCREASING#Increasing Accuracy#
+4215,507,1,500,1,0,0,0,0,0,0,0,0 //GS_MAGICALBULLET#Magical Bullet#
+4215,508,1,500,1,0,0,0,0,0,0,0,0 //GS_CRACKER#Cracker#
+4215,509,10,0,0,0,0,0,0,0,0,0,0 //GS_SINGLEACTION#Single Action#
+4215,510,10,0,0,0,0,0,0,0,0,0,0 //GS_SNAKEEYE#Snake Eye#
+4215,511,10,509,1,0,0,0,0,0,0,0,0 //GS_CHAINACTION#Chain Action#
+4215,512,10,509,5,0,0,0,0,0,0,0,0 //GS_TRACKING#Tracking#
+4215,513,5,512,7,0,0,0,0,0,0,0,0 //GS_DISARM#Disarm#
+4215,514,5,512,5,0,0,0,0,0,0,0,0 //GS_PIERCINGSHOT#Piercing Shot#
+4215,515,10,511,3,0,0,0,0,0,0,0,0 //GS_RAPIDSHOWER#Rapid Shower#
+4215,516,10,515,5,0,0,0,0,0,0,0,0 //GS_DESPERADO#Desperado#
+4215,517,10,515,7,516,5,0,0,0,0,0,0 //GS_GATLINGFEVER#Gatling Fever#
+4215,518,10,509,5,0,0,0,0,0,0,0,0 //GS_DUST#Dust#
+4215,519,10,518,3,0,0,0,0,0,0,0,0 //GS_FULLBUSTER#Full Buster#
+4215,520,10,519,5,0,0,0,0,0,0,0,0 //GS_SPREADATTACK#Spread Attack#
+4215,521,10,520,7,0,0,0,0,0,0,0,0 //GS_GROUNDDRIFT#Ground Drift#
+4215,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
+4215,2552,1,500,5,0,0,0,0,0,0,0,0 //RL_RICHS_COIN#Rich's Coin#
+4215,2553,5,514,1,0,0,0,0,0,0,0,0 //RL_MASS_SPIRAL#Mass Spiral#
+4215,2554,5,2557,1,0,0,0,0,0,0,0,0 //RL_BANISHING_BUSTER#Banishing Buster#
+4215,2555,5,0,0,0,0,0,0,0,0,0,0 //RL_B_TRAP#Bind Trap#
+4215,2556,1,501,1,0,0,0,0,0,0,0,0 //RL_FLICKER#Flicker#
+4215,2557,5,513,1,518,1,0,0,0,0,0,0 //RL_S_STORM#Shatter Storm#
+4215,2558,10,511,10,0,0,0,0,0,0,0,0 //RL_E_CHAIN#Eternal Chain#
+4215,2559,1,2558,1,0,0,0,0,0,0,0,0 //RL_QD_SHOT#Quick Draw Shot#
+4215,2560,1,506,1,0,0,0,0,0,0,0,0 //RL_C_MARKER#Crimson Marker#
+4215,2561,5,2564,1,0,0,0,0,0,0,0,0 //RL_FIREDANCE#Fire Dance#
+4215,2562,5,520,1,0,0,0,0,0,0,0,0 //RL_H_MINE#Howling Mine#
+4215,2563,5,0,0,0,0,0,0,0,0,0,0 //RL_P_ALTER#Platinum Alter#
+4215,2564,5,516,10,0,0,0,0,0,0,0,0 //RL_FALLEN_ANGEL#Fallen Angel#
+4215,2565,5,2567,1,0,0,0,0,0,0,0,0 //RL_R_TRIP#Round Trip#
+4215,2566,5,2560,1,2562,3,0,0,0,0,0,0 //RL_D_TAIL#Dragon Tail#
+4215,2567,5,517,1,0,0,0,0,0,0,0,0 //RL_FIRE_RAIN#Fire Rain#
+4215,2568,5,2561,2,0,0,0,0,0,0,0,0 //RL_HEAT_BARREL#Heat Barrel#
+4215,2569,5,2553,1,0,0,0,0,0,0,0,0 //RL_AM_BLAST#Anti-Material Blast#
+4215,2570,5,2554,3,0,0,0,0,0,0,0,0 //RL_SLUGSHOT#Slug Shot#
+4215,2571,5,2569,3,0,0,0,0,0,0,0,0 //RL_HAMMER_OF_GOD#Hammer of God#

+ 2 - 0
db/re/skill_unit_db.txt

@@ -155,6 +155,8 @@
 2488,0xe9,    ,  0, 3,1000,enemy, 0x000	//GN_FIRE_EXPANSION_TEAR_GAS
 2490,0xea,    ,  0, 1,1000,enemy, 0x002	//GN_HELLS_PLANT
 
+2555,0x104,   ,  0, 1:2:2:3:3,500,enemy,0x006	//RL_B_TRAP
+
 3006,0x86,    ,  0, 2,1000,enemy, 0x018	//KO_BAKURETSU
 3008,0x86,    ,  0, 2,1000,enemy, 0x018	//KO_MUCHANAGE
 3009,0x86,    ,  0, 3,1000,enemy, 0x018	//KO_HUUMARANKA

+ 1 - 0
doc/item_db.txt

@@ -99,6 +99,7 @@ Job: Equippable jobs. Uses the following bitmask table:
 	Death Knight   (2^27): 0x08000000
 	Dark Collector (2^28): 0x10000000
 	Kagerou/Oboro  (2^29): 0x20000000
+	Rebellion      (2^30): 0x40000000
 
 	Novice + Swordman + Magician + Archer = 0x0000000F, why?
 	Because: 10 = A, 11 = B, 12 = C, 13 = D, 14 = E, and 15 = F

+ 2 - 0
src/common/mmo.h

@@ -750,6 +750,8 @@ enum {
 	JOB_KAGEROU = 4211,
 	JOB_OBORO,
 
+	JOB_REBELLION = 4215,
+
 	JOB_MAX,
 };
 

+ 4 - 4
src/map/atcommand.c

@@ -945,7 +945,7 @@ ACMD_FUNC(jobchange)
 		upper = 0;
 
 		// Normal Jobs
-		for( i = JOB_NOVICE; i < JOB_MAX_BASIC && !found; i++ ){
+		for( i = JOB_NOVICE; i < JOB_MAX_BASIC && !found; i++ ) {
 			if (strncmpi(message, job_name(i), 16) == 0) {
 				job = i;
 				found = true;
@@ -953,7 +953,7 @@ ACMD_FUNC(jobchange)
 		}
 
 		// High Jobs, Babys and Third
-		for( i = JOB_NOVICE_HIGH; i < JOB_MAX && !found; i++ ){
+		for( i = JOB_NOVICE_HIGH; i < JOB_MAX && !found; i++ ) {
 			if (strncmpi(message, job_name(i), 16) == 0) {
 				job = i;
 				found = true;
@@ -970,8 +970,8 @@ ACMD_FUNC(jobchange)
 
     if (job == JOB_KNIGHT2 || job == JOB_CRUSADER2 || job == JOB_WEDDING || job == JOB_XMAS || job == JOB_SUMMER || job == JOB_HANBOK
         || job == JOB_LORD_KNIGHT2 || job == JOB_PALADIN2 || job == JOB_BABY_KNIGHT2 || job == JOB_BABY_CRUSADER2 || job == JOB_STAR_GLADIATOR2
-		 || (job >= JOB_RUNE_KNIGHT2 && job <= JOB_MECHANIC_T2) || (job >= JOB_BABY_RUNE2 && job <= JOB_BABY_MECHANIC2)
-	){ // Deny direct transformation into dummy jobs
+		 || (job >= JOB_RUNE_KNIGHT2 && job <= JOB_MECHANIC_T2) || (job >= JOB_BABY_RUNE2 && job <= JOB_BABY_MECHANIC2))
+	{ // Deny direct transformation into dummy jobs
 		clif_displaymessage(fd, msg_txt(sd,923)); //"You can not change to this job by command."
 		return 0;
 	}

+ 1 - 1
src/map/clif.h

@@ -35,7 +35,7 @@ struct party_booking_ad_info;
 enum
 {// packet DB
 	MAX_PACKET_DB  = 0xf00,
-	MAX_PACKET_VER = 44,
+	MAX_PACKET_VER = 45,
 	MAX_PACKET_POS = 20,
 };
 

+ 6 - 3
src/map/itemdb.c

@@ -260,9 +260,10 @@ static void itemdb_jobid2mapid(unsigned int *bclass, unsigned int jobmask)
 		bclass[2] |= 1<<MAPID_TAEKWON;
 	if (jobmask & 1<<JOB_GUNSLINGER)
 		bclass[0] |= 1<<MAPID_GUNSLINGER;
-	if (jobmask & 1<<JOB_NINJA)
-		{bclass[0] |= 1<<MAPID_NINJA;
-		bclass[1] |= 1<<MAPID_NINJA;}//Kagerou/Oboro jobs can equip Ninja equips. [Rytech]
+	if (jobmask & 1<<JOB_NINJA) { //Kagerou/Oboro jobs can equip Ninja equips. [Rytech]
+		bclass[0] |= 1<<MAPID_NINJA;
+		bclass[1] |= 1<<MAPID_NINJA;
+	}
 	if (jobmask & 1<<26) //Bongun/Munak
 		bclass[0] |= 1<<MAPID_GANGSI;
 	if (jobmask & 1<<27) //Death Knight
@@ -271,6 +272,8 @@ static void itemdb_jobid2mapid(unsigned int *bclass, unsigned int jobmask)
 		bclass[2] |= 1<<MAPID_GANGSI;
 	if (jobmask & 1<<29) //Kagerou / Oboro
 		bclass[1] |= 1<<MAPID_NINJA;
+	if (jobmask & 1<<30) //Rebellion
+		bclass[1] |= 1<<MAPID_GUNSLINGER;
 }
 
 static void create_dummy_data(void)

+ 1 - 0
src/map/map.h

@@ -114,6 +114,7 @@ enum {
 	MAPID_BLACKSMITH,
 	MAPID_ASSASSIN,
 	MAPID_STAR_GLADIATOR,
+	MAPID_REBELLION = JOBL_2_1 | 0x09,
 	MAPID_KAGEROUOBORO = JOBL_2_1|0x0A,
 	MAPID_DEATH_KNIGHT = JOBL_2_1|0x0E,
 //2-2 Jobs

+ 6 - 0
src/map/pc.c

@@ -4343,6 +4343,7 @@ int pc_isUseitem(struct map_session_data *sd,int n)
 		sd->sc.data[SC_TRICKDEAD] ||
 		sd->sc.data[SC_HIDING] ||
 		sd->sc.data[SC__SHADOWFORM] ||
+		sd->sc.data[SC__INVISIBILITY] ||
 		sd->sc.data[SC__MANHOLE] ||
 		sd->sc.data[SC_KAGEHUMI] ||
 		(sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM)
@@ -5229,6 +5230,7 @@ int pc_jobid2mapid(unsigned short b_class)
 		case JOB_STAR_GLADIATOR:        return MAPID_STAR_GLADIATOR;
 		case JOB_KAGEROU:
 		case JOB_OBORO:                 return MAPID_KAGEROUOBORO;
+		case JOB_REBELLION:             return MAPID_REBELLION;
 		case JOB_DEATH_KNIGHT:          return MAPID_DEATH_KNIGHT;
 	//2-2 Jobs
 		case JOB_CRUSADER:              return MAPID_CRUSADER;
@@ -5370,6 +5372,7 @@ int pc_mapid2jobid(unsigned short class_, int sex)
 		case MAPID_ASSASSIN:              return JOB_ASSASSIN;
 		case MAPID_STAR_GLADIATOR:        return JOB_STAR_GLADIATOR;
 		case MAPID_KAGEROUOBORO:          return sex?JOB_KAGEROU:JOB_OBORO;
+		case MAPID_REBELLION:             return JOB_REBELLION;
 		case MAPID_DEATH_KNIGHT:          return JOB_DEATH_KNIGHT;
 	//2-2 Jobs
 		case MAPID_CRUSADER:              return JOB_CRUSADER;
@@ -5690,6 +5693,9 @@ const char* job_name(int class_)
 	case JOB_OBORO:
 		return msg_txt(NULL,653 - JOB_KAGEROU+class_);
 
+	case JOB_REBELLION:
+		return msg_txt(NULL,695);
+
 	default:
 		return msg_txt(NULL,655);
 	}

+ 9 - 9
src/map/pc.h

@@ -679,7 +679,7 @@ struct {
 #define pc_isinvisible(sd)    ( (sd)->sc.option&OPTION_INVISIBLE )
 #define pc_is50overweight(sd) ( (sd)->weight*100 >= (sd)->max_weight*battle_config.natural_heal_weight_rate )
 #define pc_is90overweight(sd) ( (sd)->weight*10 >= (sd)->max_weight*9 )
-#define pc_maxparameter(sd)   ( ((((sd)->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO) || (sd)->class_&JOBL_THIRD ? ((sd)->class_&JOBL_BABY ? battle_config.max_baby_third_parameter : battle_config.max_third_parameter) : ((sd)->class_&JOBL_BABY ? battle_config.max_baby_parameter : battle_config.max_parameter)) )
+#define pc_maxparameter(sd)   ( ((((sd)->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO) || ((sd)->class_&MAPID_UPPERMASK) == MAPID_REBELLION || (sd)->class_&JOBL_THIRD ? ((sd)->class_&JOBL_BABY ? battle_config.max_baby_third_parameter : battle_config.max_third_parameter) : ((sd)->class_&JOBL_BABY ? battle_config.max_baby_parameter : battle_config.max_parameter)) )
 /**
  * Ranger
  **/
@@ -698,14 +698,14 @@ struct {
 	1<<(sd)->status.weapon:(1<<(sd)->weapontype1)|(1<<(sd)->weapontype2)|(1<<(sd)->status.weapon)))
 //Checks if the given class value corresponds to a player class. [Skotlex]
 //JOB_NOVICE isn't checked for class_ is supposed to be unsigned
-#define pcdb_checkid_sub(class_) \
-( \
-	( (class_) <  JOB_MAX_BASIC ) \
-||	( (class_) >= JOB_NOVICE_HIGH    && (class_) <= JOB_DARK_COLLECTOR ) \
-||	( (class_) >= JOB_RUNE_KNIGHT    && (class_) <= JOB_MECHANIC_T2    ) \
-||	( (class_) >= JOB_BABY_RUNE      && (class_) <= JOB_BABY_MECHANIC2 ) \
-||	( (class_) >= JOB_SUPER_NOVICE_E && (class_) <= JOB_SUPER_BABY_E   ) \
-||	( (class_) >= JOB_KAGEROU        && (class_) <  JOB_MAX            ) \
+#define pcdb_checkid_sub(class_) ( \
+	( (class_) < JOB_MAX_BASIC ) || \
+	( (class_) >= JOB_NOVICE_HIGH    && (class_) <= JOB_DARK_COLLECTOR ) || \
+	( (class_) >= JOB_RUNE_KNIGHT    && (class_) <= JOB_MECHANIC_T2    ) || \
+	( (class_) >= JOB_BABY_RUNE      && (class_) <= JOB_BABY_MECHANIC2 ) || \
+	( (class_) >= JOB_SUPER_NOVICE_E && (class_) <= JOB_SUPER_BABY_E   ) || \
+	( (class_) >= JOB_KAGEROU        && (class_) <= JOB_OBORO          ) || \
+	( (class_) >= JOB_REBELLION      && (class_) <  JOB_MAX            ) \
 )
 #define pcdb_checkid(class_) pcdb_checkid_sub((unsigned int)class_)
 

+ 2 - 2
src/map/skill.c

@@ -5839,7 +5839,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 		break;
 
 	case MO_KITRANSLATION:
-		if(dstsd && (dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER) {
+		if(dstsd && ((dstsd->class_&MAPID_BASEMASK) != MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK) != MAPID_REBELLION)) {
 			pc_addspiritball(dstsd,skill_get_time(skill_id,skill_lv),5);
 		}
 		break;
@@ -5854,7 +5854,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 
 	case MO_ABSORBSPIRITS:
 		i = 0;
-		if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m)) && (dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER)
+		if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m)) && ((dstsd->class_&MAPID_BASEMASK) != MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK) != MAPID_REBELLION))
 		{	// split the if for readability, and included gunslingers in the check so that their coins cannot be removed [Reddozen]
 			i = dstsd->spiritball * 7;
 			pc_delspiritball(dstsd,dstsd->spiritball,0);

+ 25 - 0
src/map/skill.h

@@ -1572,6 +1572,31 @@ enum e_skill {
 	GM_ITEM_MATKMAX,
 	GM_ITEM_MATKMIN,
 
+	RL_GLITTERING_GREED = 2551,
+	RL_RICHS_COIN,
+	RL_MASS_SPIRAL,
+	RL_BANISHING_BUSTER,
+	RL_B_TRAP,
+	RL_FLICKER,
+	RL_S_STORM,
+	RL_E_CHAIN,
+	RL_QD_SHOT,
+	RL_C_MARKER,
+	RL_FIREDANCE,
+	RL_H_MINE,
+	RL_P_ALTER,
+	RL_FALLEN_ANGEL,
+	RL_R_TRIP,
+	RL_D_TAIL,
+	RL_FIRE_RAIN,
+	RL_HEAT_BARREL,
+	RL_AM_BLAST,
+	RL_SLUGSHOT,
+	RL_HAMMER_OF_GOD,
+	RL_R_TRIP_PLUSATK,
+	RL_B_FLICKER_ATK,
+	RL_GLITTERING_GREED_ATK,
+
 	KO_YAMIKUMO = 3001,
 	KO_RIGHT,
 	KO_LEFT,

+ 2 - 0
src/map/status.c

@@ -2277,6 +2277,8 @@ static unsigned int status_base_pc_maxhp(struct map_session_data* sd, struct sta
 		val *= 3; //Triple max HP for top ranking Taekwons over level 90.
 	if((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE && sd->status.base_level >= 99)
 		val += 2000; //Supernovice lvl99 hp bonus.
+	if((sd->class_&MAPID_UPPERMASK) == MAPID_REBELLION)
+		val += 100; //Since Rebellion's HP can't be approximated well enough without this.
 
 	val += val * status->vit/100; // +1% per each point of VIT
 

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott