From f0566292bb6bcd79f5ed5435e251c92657dccb79 Mon Sep 17 00:00:00 2001 From: Akinari1087 Date: Sun, 27 Oct 2013 12:58:24 -0700 Subject: [PATCH] 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 --- conf/help.txt | 2 +- conf/msg_conf/map_msg.conf | 1 + conf/msg_conf/map_msg_chn.conf | 1 + conf/msg_conf/map_msg_frn.conf | 1 + conf/msg_conf/map_msg_idn.conf | 1 + conf/msg_conf/map_msg_por.conf | 1 + conf/msg_conf/map_msg_rus.conf | 1 + conf/msg_conf/map_msg_spn.conf | 1 + conf/msg_conf/map_msg_tha.conf | 1 + db/const.txt | 2 + db/job_db2.txt | 2 + db/packet_db.txt | 42 ++ db/pre-re/job_db1.txt | 2 + db/pre-re/job_exp.txt | 8 +- db/pre-re/job_maxhpsp_db.txt | 8 +- db/pre-re/skill_cast_db.txt | 703 +++++++++++++++++---------------- db/pre-re/skill_db.txt | 27 ++ db/pre-re/skill_require_db.txt | 27 ++ db/pre-re/skill_tree.txt | 46 +++ db/pre-re/skill_unit_db.txt | 2 + db/re/job_db1.txt | 2 + db/re/job_exp.txt | 8 +- db/re/job_maxhpsp_db.txt | 8 +- db/re/skill_cast_db.txt | 11 +- db/re/skill_db.txt | 27 ++ db/re/skill_require_db.txt | 27 ++ db/re/skill_tree.txt | 46 +++ db/re/skill_unit_db.txt | 2 + doc/item_db.txt | 1 + src/common/mmo.h | 2 + src/map/atcommand.c | 8 +- src/map/clif.h | 2 +- src/map/itemdb.c | 9 +- src/map/map.h | 1 + src/map/pc.c | 6 + src/map/pc.h | 18 +- src/map/skill.c | 4 +- src/map/skill.h | 25 ++ src/map/status.c | 2 + 39 files changed, 700 insertions(+), 388 deletions(-) diff --git a/conf/help.txt b/conf/help.txt index 33b6b585a8..427cbfe620 100644 --- a/conf/help.txt +++ b/conf/help.txt @@ -102,7 +102,7 @@ jobchange: "Params: \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" diff --git a/conf/msg_conf/map_msg.conf b/conf/msg_conf/map_msg.conf index 2d33a3ed26..f1810ceed8 100644 --- a/conf/msg_conf/map_msg.conf +++ b/conf/msg_conf/map_msg.conf @@ -684,6 +684,7 @@ 692: Genetic T 693: Shadow Chaser T 694: Hanbok +695: Rebellion //------------------------------------ diff --git a/conf/msg_conf/map_msg_chn.conf b/conf/msg_conf/map_msg_chn.conf index 2b4380183c..e1a23aa0c0 100644 --- a/conf/msg_conf/map_msg_chn.conf +++ b/conf/msg_conf/map_msg_chn.conf @@ -671,6 +671,7 @@ 692: 基因學者 T 693: 魅影追蹤者 T 694: 韓服 +695: Rebellion //------------------------------------ diff --git a/conf/msg_conf/map_msg_frn.conf b/conf/msg_conf/map_msg_frn.conf index 35bff0a96a..039a032d6c 100644 --- a/conf/msg_conf/map_msg_frn.conf +++ b/conf/msg_conf/map_msg_frn.conf @@ -683,6 +683,7 @@ 692: Genetic T 693: Shadow Chaser T 694: Hanbok +695: Rebellion //------------------------------------ diff --git a/conf/msg_conf/map_msg_idn.conf b/conf/msg_conf/map_msg_idn.conf index cbef7ac430..daf1b4dec0 100644 --- a/conf/msg_conf/map_msg_idn.conf +++ b/conf/msg_conf/map_msg_idn.conf @@ -683,6 +683,7 @@ 692: Genetic T 693: Shadow Chaser T 694: Hanbok +695: Rebellion //------------------------------------ diff --git a/conf/msg_conf/map_msg_por.conf b/conf/msg_conf/map_msg_por.conf index e9598ab378..0f480aab53 100644 --- a/conf/msg_conf/map_msg_por.conf +++ b/conf/msg_conf/map_msg_por.conf @@ -663,6 +663,7 @@ 692: Bioqumico T 693: Renegado T 694: Hanbok +695: Rebellion //------------------------------------ diff --git a/conf/msg_conf/map_msg_rus.conf b/conf/msg_conf/map_msg_rus.conf index 21d1d30c87..53b2f30e60 100644 --- a/conf/msg_conf/map_msg_rus.conf +++ b/conf/msg_conf/map_msg_rus.conf @@ -682,6 +682,7 @@ 692: Genetic T 693: Shadow Chaser T 694: Hanbok +695: Rebellion //695-899 diff --git a/conf/msg_conf/map_msg_spn.conf b/conf/msg_conf/map_msg_spn.conf index b5bc3479e6..8a8f6c8daf 100644 --- a/conf/msg_conf/map_msg_spn.conf +++ b/conf/msg_conf/map_msg_spn.conf @@ -670,6 +670,7 @@ 692: Genetic T 693: Shadow Chaser T 694: Hanbok +695: Rebellion //------------------------------------ diff --git a/conf/msg_conf/map_msg_tha.conf b/conf/msg_conf/map_msg_tha.conf index d8dfc224ca..cdf2821e88 100644 --- a/conf/msg_conf/map_msg_tha.conf +++ b/conf/msg_conf/map_msg_tha.conf @@ -677,6 +677,7 @@ 692: Genetic T 693: Shadow Chaser T 694: Hanbok +695: Rebellion //------------------------------------ diff --git a/db/const.txt b/db/const.txt index 7aaf84f043..aa2df3aafe 100644 --- a/db/const.txt +++ b/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 diff --git a/db/job_db2.txt b/db/job_db2.txt index c7024f9ad3..4381c12e74 100644 --- a/db/job_db2.txt +++ b/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 diff --git a/db/packet_db.txt b/db/packet_db.txt index 1306491420..92e7a09aa2 100644 --- a/db/packet_db.txt +++ b/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 diff --git a/db/pre-re/job_db1.txt b/db/pre-re/job_db1.txt index d25f0891a5..3872789e96 100644 --- a/db/pre-re/job_db1.txt +++ b/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 diff --git a/db/pre-re/job_exp.txt b/db/pre-re/job_exp.txt index a8f3ffbeb9..0bb8fe8ade 100644 --- a/db/pre-re/job_exp.txt +++ b/db/pre-re/job_exp.txt @@ -51,9 +51,9 @@ // Renewal content (required for some core features) //================================ -//Base - 3rd Jobs, Baby 3rds, Expanded Super Novice, and Kagerou/Oboro +//Base - 3rd Jobs, Baby 3rds, Expanded Super Novice, Kagerou/Oboro, and Rebellion //Note: (First 98 values [Level 1 - 98] are dummy values (used Adv Jobs values), because 3rd classes start at level 99.) -99,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212,0,10,18,28,40,85,123,168,220,278,400,481,613,731,875,1038,1213,1400,1575,1775,2268,2604,2786,3136,3506,4130,4796,5508,6264,9645,12392,14220,16159,18209,21649,24451,27401,30499,33748,47342,58160,64711,71573,78749,90144,99312,108870,118816,129154,174196,213220,238080,264150,291427,329640,363155,398116,434526,472381,610848,731828,806448,884232,965180,1073896,1170382,1270556,1374422,1481976,1850800,3389616,3666333,3953534,4251217,4559382,5129260,5488173,5859059,6241919,7374168,9570662,10458427,11380262,12336168,13326144,14994907,16130400,17304200,18516326,19766760,21085096,22473939,23935933,25473761,27090141,28787825,30569594,32438257,34396650,36447628,38594068,40838862,43184915,45635142,48192464,50859807,53640095,56536248,59551182,62687799,65948990,69337627,72856561,76508620,80296602,84223275,88291372,92503586,96862571,101370933,106031232,110845975,115817614,120948544,126241098,131697545,137320088,143110859,149071919,155205253,161512770,167996297,174657580,181498280,188519973,195724146,203112195,210685425,218445048,226392181,234527844,242852961,251368358,260074760,268972793,278062983,287345754,296821429,306490229,316352273,326407578,336656059,347097530,357731703,368558190,379576502,390786051,402186149,413776012,425554759,437521412,449674899,462014055,474537623,487244256,500132518,513200886,526447751,539871420,553470119,567241993,581185110,595297462,609576966,624021468,638628745,653396504,668322389,683403980,698638797,714024301,729557897,745236936,761058717,777020492,793119465,809352795,825717601,842210961,858829917,875571475,892432609,909410264,926501355,943702774,961011389,978424047,995937576,1013548788,1031254481,1049051440,1066936441,1084906252,1102957634,1121087346,1139292145,1157568786,1175914029,1194324635,1212797373,1231329018,1249916355,1268556179,1287245299,1305980536,1324758729,1343576732,1362431419,1381319683,1400238439,1419184625,1438155202,1457147157,1476157502,1495183278,1514221554,1533269429,1552324031,1571382520,1590442090,1609499966,1628553409,1647599713,1666636209,1685660263,1704669278,1723660695,1742631992,1761580687,1780504336,1799400534,1818266916,1837101157,1855900974,1874664122,1893388399,1912071644,1930711737,1949306600,1967854196,1986352530,2004799649,2023193642,2041532640,2059814816,2078038384,2096201600,2114302763,2132340212,2150312328,2168217533,2186054291,2203821106,2221516523,2239139127,2256687544,2274160439,2291556517,2308874523,2326113241,2343271492,2360348137,2377342074,2394252239,2411077605,2427817182,2444470016,2461035190,2477511822,2493899065,2510196107,2526402170,2542516509,2558538414,2574467207,2590302243,2606042908,2621688620,2637238829,2652693014,2668050684,2683311379,2698474666,2713540143,2728507434,2743376192,2758146097,2772816855,2787388198,2801859883,2816231694,2830503439,2844674950,2858746082,2872716714,2886586747,2900356105,2914024733,2927592598,2941059688,2954426010,2967691593,2980856483,2993920747,3006884469,3019747752,3032510717,3045173501,3057736259,3070199161,3082562393,3094826158,3106990673,3119056170,3131022894,3142891106,3154661079,3166333099,3177907466,3189384491,3200764497,3212047820,3223234805,3234325809,3245321200,3256221356,3267026664,3277737521,3288354333,3298877514,3309307489,3319644689,3329889553,3340042528,3350104069,3360074637,3369954700,3379744733,3389445216,3399056636,3408579485,3418014261,3427361466,3436621608,3445795199,3454882755,3463884797,3472801849,3481634440,3490383101,3499048368,3507630778,3516130872,3524549194,3532886290,3541142708,3549318998,3557415713,3565433406,3573372633,3581233950,3589017916,3596725090,3604356032,3611911302,3619391462,3626797073,3634128697,3641386897,3648572235,3655685273,3662726573,3669696697,3676596205,3683425658,3690185617,3696876640,3703499285,3710054109,3716541669,3722962519,3729317213,3735606303,3741830339,3747989871,3754085446,3760117610,3766086907,3771993879,3777839066,3783623006,3789346235,3795009287,3800612694,3806156985,3811642688,3817070327,3822440424,3827753500,3833010071,3838210653,3843355757,3848445893,3853481568,3858463286,3863391548,3868266853,3873089696,3877860570,3882579965,3887248368,3891866263,3896434130,3900952448,3905421692,3909842333,3914214841,3918539681,3922817316,3927048205,3931232805,3935371569,3939464947,3943513385,3947517328,3951477216,3955393486,3959266573,3963096907,3966884916,3970631025,3974335655,3977999224,3981622147,3985204835,3988747697,3992251137,3995715558,3999141358,4002528933,4005878676,4009190975,4012466216,4015704782,4018907052,4022073402,4025204206,4028299834,4031360652,4034387025,4037379312,4040337871,4043263057,4046155220,4049014709,4051841869,4054637042,4057400566,4060132778,4062834010,4065504592,4068144851,4070755111,4073335693,4075886914,4078409090,4080902532,4083367550,4085804450,4088213536,4090595108,4092949463,4095276897,4097577701,4099852165,4102100575,4104323215,4106520366,4108692307,4110839312,4112961655,4115059606,4117133433,4119183400,4121209770,4123212802,4125192754,4127149880,4129084433,4130996662,4132886814,4134755133,4136601862,4138427240,4140231505,4142014891,4143777631,4145519954,4147242089,4148944261,4150626693,4152289606,4153933218,4155557746,4157163403,4158750402,4160318952,4161869260,4163401532,4164915971,4166412777,4167892150,4169354286,4170799380,4172227625,4173639211,4175034327,4176413160,4177775894,4179122712,4180453795,4181769321,4183069467,4184354408,4185624318,4186879367,4188119725,4189345560,4190557037,4191754321,4192937573,4194106954,4195262623,4196404736,4197533449,4198648916,4199751289,4200840717,4201917350,4202981334,4204032815,4205071936,4206098840,4207113668,4208116558,4209107648,4210087074,4211054971,4212011472,4212956708,4213890810,4214813906,4215726123,4216627588,4217518424,4218398755,4219268703,4220128387,4220977927,4221817441,4222647044,4223466852,4224276979,4225077537,4225868637,4226650390,4227422904,4228186286,4228940643,4229686080,4230422700,4231150607,4231869902,4232580686,4233283058,4233977116,4234662957,4235340677,4236010370,4236672131,4237326053,4237972227,4238610743,4239241692,4239865161,4240481239,4241090012,4241691565,4242285983,4242873350,4243453749,4244027261,4244593967,4245153947,4245707279,4246254042,4246794313,4247328169,4247855684,4248376933,4248891990,4249400928,4249903818,4250400732,4250891740,4251376912,4251856316,4252330020,4252798092,4253260597,4253717602,4254169171,4254615368,4255056257,4255491900,4255922359,4256347695,4256767969,4257183240,4257593568,4257999011,4258399627,4258795472,4259186603,4259573076,4259954946,4260332267,4260705093,4261073477,4261437472,4261797129,4262152500,4262503636,4262850586,4263193401,4263532129,4263866819,4264197518,4264524274,4264847134,4265166143,4265481348,4265792793,4266100523,4266404582,4266705014,4267001861,4267295166,4267584971,4267871318,4268154248,4268433801,4268710017,4268982936,4269252597,4269519039,4269782300,4270042418,4270299430,4270553373,4270804284,4271052198,4271297151,4271539179,4271778316,4272014596,4272248054,4272478723,4272706636,4272931826,4273154325,4273374166,4273591380,4273805998,4274018051,4274227570,4274434585,4274639125,4274841221,4275040901,4275238194,4275433128,4275625732,4275816033,4276004059,4276189837,4276373393,4276554754,4276733946,4276910995,4277085927,4277258767,4277429540,4277598270,4277764982,4277929700,4278092447,4278253247,4278412124,4278569100,4278724198,4278877440,4279028849,4279178446,4279326253,4279472291,4279616582,4279759146,4279900004,4280039176,4280176683,4280312544,4280446779,4280579407,4280710448,4280839920,4280967842,4281094233,4281219111,4281342494,4281464400,4281584846,4281703850,4281821429,4281937601,4282052382,4282165788,4282277836,4282388543,4282497924,4282605995,4282712772,4282818270,4282922505,4283025492,4283127245,4283227779,4283327109,4283425250,4283522215,4283618019,4283712675,4283806197,4283898599,4283989894,4284080096,4284169217,4284257270,4284344268,4284430224,4284515150,4284599059,4284681963,4284763873,4284844802,4284924761,4285003762,4285081817,4285158936,4285235131,4285310413,4285384793,4285458282,4285530890,4285602628,4285673507,4285743536,4285812726,4285881087,4285948628,4286015360,4286081292,4286146434,4286210795,4286274385,4286337213,4286399288,4286460619,4286521215,4286581084,4286640236,4286698679,4286756421,4286813471,4286869837,4286925527,4286980550,4287034913,4287088625,4287141693,4287194125,4287245928,4287297110,4287347678,4287397640,4287447003,4287495774,4287543961,4287591570,4287638608,4287685082,4287730999,4287776365,4287821187,4287865472,4287909226,4287952455,4287995166,4288037365,4288079058,4288120251,4288160950,4288201161,4288240890,4288280143,4288318925,4288357242,4288395099,4288432502,4288469457,4288505969,4288542043,4288577684,4288612898,4288647690,4288682064,4288716026,4288749581,4288782733,4288815488,4288847850,4288879824,4288911414,4288942626,4288973463,4289003930,4289034032,4289063773,4289093157,4289122189,4289150873,4289179213,4289207213,4289234877,4289262209,4289289213,4289315893,4289342253,4289368297,4289394029,4289419452,4289444570,4289469387,4289493906,4289518131,4289542066,4289565714,4289589078,4289612162,4289634969,4289657502,4289679765,4289701761,4289723493,4289744964,4289766178,4289787137,4289807845,4289828305,4289848519,4289868491,4289888223,4289907718,4289926979,4289946009,4289964811,4289983388,4290001742,4290019876,4290037792,4290055493,4290072982,4290090261,4290107333,4290124200,4290140865,4290157330,4290173597,4290189669,4290205548,4290221237,4290236737,4290252051,4290267182,4290282131,4290296901,4290311494,4290325912,4290340157,4290354231,4290368136,4290381874,4290395447,4290408857,4290422107,4290435198,4290448132,4290460910,4290473535,4290486009,4290498333,4290510509,4290522539,4290534425,4290546168,4290557770,4290569233,4290580558,4290591748,4290602803,4290613726,4290624518,4290635180,4290645714,4290656122,4290666405,4290676565,4290686603,4290696520,4290706318,4290715999,4290725564,4290735014,4290744350,4290753574,4290762688,4290771692,4290780588,4290789378,4290798062,4290806642,4290815119,4290823494,4290831769,4290839944,4290848021,4290856001,4290863886,4290871676,4290879373,4290886977,4290894490,4290901913,4290909247,4290916493,4290923652,4290930725,4290937713,4290944617,4290951438,4290958178,4290964837,4290971416,4290977916,4290984338,4290990683,4290996952,4291003145,4291009264,4291015310,4291021283,4291027184,4291033015,4291038776,4291044468,4291050091,4291055647,4291061136,4291066559,4291071917,4291077211,4291082441,4291087609,4291092715,4291097759,4291102743,4291107667,4291112532,4291117338,4291122087,4291126779 +99,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212:4215,0,10,18,28,40,85,123,168,220,278,400,481,613,731,875,1038,1213,1400,1575,1775,2268,2604,2786,3136,3506,4130,4796,5508,6264,9645,12392,14220,16159,18209,21649,24451,27401,30499,33748,47342,58160,64711,71573,78749,90144,99312,108870,118816,129154,174196,213220,238080,264150,291427,329640,363155,398116,434526,472381,610848,731828,806448,884232,965180,1073896,1170382,1270556,1374422,1481976,1850800,3389616,3666333,3953534,4251217,4559382,5129260,5488173,5859059,6241919,7374168,9570662,10458427,11380262,12336168,13326144,14994907,16130400,17304200,18516326,19766760,21085096,22473939,23935933,25473761,27090141,28787825,30569594,32438257,34396650,36447628,38594068,40838862,43184915,45635142,48192464,50859807,53640095,56536248,59551182,62687799,65948990,69337627,72856561,76508620,80296602,84223275,88291372,92503586,96862571,101370933,106031232,110845975,115817614,120948544,126241098,131697545,137320088,143110859,149071919,155205253,161512770,167996297,174657580,181498280,188519973,195724146,203112195,210685425,218445048,226392181,234527844,242852961,251368358,260074760,268972793,278062983,287345754,296821429,306490229,316352273,326407578,336656059,347097530,357731703,368558190,379576502,390786051,402186149,413776012,425554759,437521412,449674899,462014055,474537623,487244256,500132518,513200886,526447751,539871420,553470119,567241993,581185110,595297462,609576966,624021468,638628745,653396504,668322389,683403980,698638797,714024301,729557897,745236936,761058717,777020492,793119465,809352795,825717601,842210961,858829917,875571475,892432609,909410264,926501355,943702774,961011389,978424047,995937576,1013548788,1031254481,1049051440,1066936441,1084906252,1102957634,1121087346,1139292145,1157568786,1175914029,1194324635,1212797373,1231329018,1249916355,1268556179,1287245299,1305980536,1324758729,1343576732,1362431419,1381319683,1400238439,1419184625,1438155202,1457147157,1476157502,1495183278,1514221554,1533269429,1552324031,1571382520,1590442090,1609499966,1628553409,1647599713,1666636209,1685660263,1704669278,1723660695,1742631992,1761580687,1780504336,1799400534,1818266916,1837101157,1855900974,1874664122,1893388399,1912071644,1930711737,1949306600,1967854196,1986352530,2004799649,2023193642,2041532640,2059814816,2078038384,2096201600,2114302763,2132340212,2150312328,2168217533,2186054291,2203821106,2221516523,2239139127,2256687544,2274160439,2291556517,2308874523,2326113241,2343271492,2360348137,2377342074,2394252239,2411077605,2427817182,2444470016,2461035190,2477511822,2493899065,2510196107,2526402170,2542516509,2558538414,2574467207,2590302243,2606042908,2621688620,2637238829,2652693014,2668050684,2683311379,2698474666,2713540143,2728507434,2743376192,2758146097,2772816855,2787388198,2801859883,2816231694,2830503439,2844674950,2858746082,2872716714,2886586747,2900356105,2914024733,2927592598,2941059688,2954426010,2967691593,2980856483,2993920747,3006884469,3019747752,3032510717,3045173501,3057736259,3070199161,3082562393,3094826158,3106990673,3119056170,3131022894,3142891106,3154661079,3166333099,3177907466,3189384491,3200764497,3212047820,3223234805,3234325809,3245321200,3256221356,3267026664,3277737521,3288354333,3298877514,3309307489,3319644689,3329889553,3340042528,3350104069,3360074637,3369954700,3379744733,3389445216,3399056636,3408579485,3418014261,3427361466,3436621608,3445795199,3454882755,3463884797,3472801849,3481634440,3490383101,3499048368,3507630778,3516130872,3524549194,3532886290,3541142708,3549318998,3557415713,3565433406,3573372633,3581233950,3589017916,3596725090,3604356032,3611911302,3619391462,3626797073,3634128697,3641386897,3648572235,3655685273,3662726573,3669696697,3676596205,3683425658,3690185617,3696876640,3703499285,3710054109,3716541669,3722962519,3729317213,3735606303,3741830339,3747989871,3754085446,3760117610,3766086907,3771993879,3777839066,3783623006,3789346235,3795009287,3800612694,3806156985,3811642688,3817070327,3822440424,3827753500,3833010071,3838210653,3843355757,3848445893,3853481568,3858463286,3863391548,3868266853,3873089696,3877860570,3882579965,3887248368,3891866263,3896434130,3900952448,3905421692,3909842333,3914214841,3918539681,3922817316,3927048205,3931232805,3935371569,3939464947,3943513385,3947517328,3951477216,3955393486,3959266573,3963096907,3966884916,3970631025,3974335655,3977999224,3981622147,3985204835,3988747697,3992251137,3995715558,3999141358,4002528933,4005878676,4009190975,4012466216,4015704782,4018907052,4022073402,4025204206,4028299834,4031360652,4034387025,4037379312,4040337871,4043263057,4046155220,4049014709,4051841869,4054637042,4057400566,4060132778,4062834010,4065504592,4068144851,4070755111,4073335693,4075886914,4078409090,4080902532,4083367550,4085804450,4088213536,4090595108,4092949463,4095276897,4097577701,4099852165,4102100575,4104323215,4106520366,4108692307,4110839312,4112961655,4115059606,4117133433,4119183400,4121209770,4123212802,4125192754,4127149880,4129084433,4130996662,4132886814,4134755133,4136601862,4138427240,4140231505,4142014891,4143777631,4145519954,4147242089,4148944261,4150626693,4152289606,4153933218,4155557746,4157163403,4158750402,4160318952,4161869260,4163401532,4164915971,4166412777,4167892150,4169354286,4170799380,4172227625,4173639211,4175034327,4176413160,4177775894,4179122712,4180453795,4181769321,4183069467,4184354408,4185624318,4186879367,4188119725,4189345560,4190557037,4191754321,4192937573,4194106954,4195262623,4196404736,4197533449,4198648916,4199751289,4200840717,4201917350,4202981334,4204032815,4205071936,4206098840,4207113668,4208116558,4209107648,4210087074,4211054971,4212011472,4212956708,4213890810,4214813906,4215726123,4216627588,4217518424,4218398755,4219268703,4220128387,4220977927,4221817441,4222647044,4223466852,4224276979,4225077537,4225868637,4226650390,4227422904,4228186286,4228940643,4229686080,4230422700,4231150607,4231869902,4232580686,4233283058,4233977116,4234662957,4235340677,4236010370,4236672131,4237326053,4237972227,4238610743,4239241692,4239865161,4240481239,4241090012,4241691565,4242285983,4242873350,4243453749,4244027261,4244593967,4245153947,4245707279,4246254042,4246794313,4247328169,4247855684,4248376933,4248891990,4249400928,4249903818,4250400732,4250891740,4251376912,4251856316,4252330020,4252798092,4253260597,4253717602,4254169171,4254615368,4255056257,4255491900,4255922359,4256347695,4256767969,4257183240,4257593568,4257999011,4258399627,4258795472,4259186603,4259573076,4259954946,4260332267,4260705093,4261073477,4261437472,4261797129,4262152500,4262503636,4262850586,4263193401,4263532129,4263866819,4264197518,4264524274,4264847134,4265166143,4265481348,4265792793,4266100523,4266404582,4266705014,4267001861,4267295166,4267584971,4267871318,4268154248,4268433801,4268710017,4268982936,4269252597,4269519039,4269782300,4270042418,4270299430,4270553373,4270804284,4271052198,4271297151,4271539179,4271778316,4272014596,4272248054,4272478723,4272706636,4272931826,4273154325,4273374166,4273591380,4273805998,4274018051,4274227570,4274434585,4274639125,4274841221,4275040901,4275238194,4275433128,4275625732,4275816033,4276004059,4276189837,4276373393,4276554754,4276733946,4276910995,4277085927,4277258767,4277429540,4277598270,4277764982,4277929700,4278092447,4278253247,4278412124,4278569100,4278724198,4278877440,4279028849,4279178446,4279326253,4279472291,4279616582,4279759146,4279900004,4280039176,4280176683,4280312544,4280446779,4280579407,4280710448,4280839920,4280967842,4281094233,4281219111,4281342494,4281464400,4281584846,4281703850,4281821429,4281937601,4282052382,4282165788,4282277836,4282388543,4282497924,4282605995,4282712772,4282818270,4282922505,4283025492,4283127245,4283227779,4283327109,4283425250,4283522215,4283618019,4283712675,4283806197,4283898599,4283989894,4284080096,4284169217,4284257270,4284344268,4284430224,4284515150,4284599059,4284681963,4284763873,4284844802,4284924761,4285003762,4285081817,4285158936,4285235131,4285310413,4285384793,4285458282,4285530890,4285602628,4285673507,4285743536,4285812726,4285881087,4285948628,4286015360,4286081292,4286146434,4286210795,4286274385,4286337213,4286399288,4286460619,4286521215,4286581084,4286640236,4286698679,4286756421,4286813471,4286869837,4286925527,4286980550,4287034913,4287088625,4287141693,4287194125,4287245928,4287297110,4287347678,4287397640,4287447003,4287495774,4287543961,4287591570,4287638608,4287685082,4287730999,4287776365,4287821187,4287865472,4287909226,4287952455,4287995166,4288037365,4288079058,4288120251,4288160950,4288201161,4288240890,4288280143,4288318925,4288357242,4288395099,4288432502,4288469457,4288505969,4288542043,4288577684,4288612898,4288647690,4288682064,4288716026,4288749581,4288782733,4288815488,4288847850,4288879824,4288911414,4288942626,4288973463,4289003930,4289034032,4289063773,4289093157,4289122189,4289150873,4289179213,4289207213,4289234877,4289262209,4289289213,4289315893,4289342253,4289368297,4289394029,4289419452,4289444570,4289469387,4289493906,4289518131,4289542066,4289565714,4289589078,4289612162,4289634969,4289657502,4289679765,4289701761,4289723493,4289744964,4289766178,4289787137,4289807845,4289828305,4289848519,4289868491,4289888223,4289907718,4289926979,4289946009,4289964811,4289983388,4290001742,4290019876,4290037792,4290055493,4290072982,4290090261,4290107333,4290124200,4290140865,4290157330,4290173597,4290189669,4290205548,4290221237,4290236737,4290252051,4290267182,4290282131,4290296901,4290311494,4290325912,4290340157,4290354231,4290368136,4290381874,4290395447,4290408857,4290422107,4290435198,4290448132,4290460910,4290473535,4290486009,4290498333,4290510509,4290522539,4290534425,4290546168,4290557770,4290569233,4290580558,4290591748,4290602803,4290613726,4290624518,4290635180,4290645714,4290656122,4290666405,4290676565,4290686603,4290696520,4290706318,4290715999,4290725564,4290735014,4290744350,4290753574,4290762688,4290771692,4290780588,4290789378,4290798062,4290806642,4290815119,4290823494,4290831769,4290839944,4290848021,4290856001,4290863886,4290871676,4290879373,4290886977,4290894490,4290901913,4290909247,4290916493,4290923652,4290930725,4290937713,4290944617,4290951438,4290958178,4290964837,4290971416,4290977916,4290984338,4290990683,4290996952,4291003145,4291009264,4291015310,4291021283,4291027184,4291033015,4291038776,4291044468,4291050091,4291055647,4291061136,4291066559,4291071917,4291077211,4291082441,4291087609,4291092715,4291097759,4291102743,4291107667,4291112532,4291117338,4291122087,4291126779 -//Job - 3rd Jobs, Baby 3rds, Expanded Super Novice, and Kagerou/Oboro -50,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212,1,368,568,696,1206,1774,2192,3196,5080,7352,8580,9892,13358,18984,31925,35860,40013,51605,68585,87770,96443,105515,131770,167428,206720,223860,241673,294553,362303,479053,513362,548856,656197,787507,927154,985696,1046034,1231134,1449220,1678177,1943306,2244059,2584282,2968115,3400000,3884688,4427246,5033064,5707855,6457661,7288852,8208125,9222500,10339317,11566230,12911197,14382470,15988583,17738338,19640789,21705223,23941143,26358244,28966392,31775600,34796000,38037819,41511350,45226922,49194872,53425513,57929105,62715823,67795725,73178721,78874542,84892710,91242506,97932943,104972733,112370263,120133566,128270295,136787699,145692601,154991375,164689926,174793673,185307530,196235893,207582627,219351052,231543938,244163492,257211358,270688607,284595740,298932685,313698799,328892871,344513126,360557232,377022309,393904936,411201163,428906522,447016041,465524258,484425237,503712583,523379460,543418608,563822364,584582678,605691135,627138976,648917115,671016163,693426449,716138040,739140762,762424222,785977830,809790819,833852265,858151108,882676174,907416194,932359821,957495652,982812246,1008298142,1033941875,1059731995,1085657082,1111705763,1137866726,1164128735,1190480643,1216911407,1243410098,1269965914,1296568193,1323206421,1349870242,1376549469,1403234090,1429914278,1456580397,1483223010,1509832883,1536400993,1562918530,1589376904,1615767747,1642082917,1668314501,1694454815,1720496409,1746432067,1772254807,1797957882,1823534782,1848979230,1874285184,1899446836,1924458610,1949315159,1974011367,1998542342,2022903418,2047090150,2071098310,2094923887,2118563083,2142012307,2165268175,2188327503,2211187307,2233844796,2256297369,2278542611,2300578289,2322402347,2344012903,2365408244,2386586822,2407547248,2428288289,2448808865,2469108042,2489185029,2509039173,2528669956,2548076989,2567260008,2586218871,2604953553,2623464142,2641750834,2659813929,2677653830,2695271035,2712666136,2729839813,2746792832,2763526041,2780040365,2796336805,2812416433,2828280388,2843929874,2859366157,2874590560,2889604462,2904409294,2919006536,2933397714,2947584399,2961568203,2975350775,2988933801,3002319001,3015508125,3028502953,3041305291,3053916970,3066339843,3078575783,3090626683,3102494451,3114181011,3125688300,3137018266,3148172868,3159154072,3169963851,3180604184,3191077054,3201384446,3211528348,3221510747,3231333629,3240998979,3250508779,3259865006,3269069632,3278124624,3287031942,3295793538,3304411356,3312887331,3321223387,3329421440,3337483392,3345411135,3353206549,3360871500,3368407842,3375817414,3383102041,3390263534,3397303689,3404224286,3411027090,3417713850,3424286299,3430746152,3437095109,3443334852,3449467047,3455493342,3461415367,3467234735,3472953041,3478571863,3484092761,3489517276,3494846931,3500083232,3505227667,3510281705,3515246797,3520124376,3524915857,3529622637,3534246095,3538787592,3543248471,3547630058,3551933659,3556160565,3560312047,3564389360,3568393741,3572326410,3576188570,3579981406,3583706087,3587363764,3590955573,3594482632,3597946043,3601346892,3604686248,3607965165,3611184681,3614345817,3617449581,3620496963,3623488939,3626426470,3629310502,3632141966,3634921779,3637650842,3640330044,3642960259,3645542346,3648077152,3650565509,3653008236,3655406140,3657760013,3660070635,3662338774,3664565184,3666750607,3668895774,3671001402,3673068197,3675096854,3677088055,3679042471,3680960763,3682843579,3684691557,3686505325,3688285499,3690032685,3691747478,3693430465,3695082220,3696703310,3698294290,3699855707,3701388097,3702891989,3704367901,3705816342,3707237813,3708632806,3710001804,3711345282,3712663706,3713957535,3715227220,3716473203,3717695918,3718895792,3720073245,3721228689,3722362528,3723475160,3724566975,3725638356,3726689680,3727721318,3728733632,3729726979,3730701710,3731658168,3732596692,3733517613,3734421257,3735307945,3736177990,3737031701,3737869381,3738691328,3739497833,3740289184,3741065662,3741827543,3742575099,3743308597,3744028298,3744734459,3745427333,3746107167,3746774204,3747428682,3748070836,3748700896,3749319088,3749925634,3750520750,3751104651,3751677546,3752239641,3752791138,3753332236,3753863129,3754384008,3754895060,3755396470,3755888418,3756371081,3756844634,3757309248,3757765090,3758212325,3758651114,3759081616,3759503986,3759918377,3760324939,3760723819,3761115161,3761499107,3761875797,3762245366,3762607949,3762963676,3763312677,3763655079,3763991005,3764320578,3764643917,3764961140,3765272361,3765577694,3765877250,3766171137,3766459463,3766742332,3767019847,3767292109,3767559217,3767821269,3768078359,3768330582,3768578029,3768820790,3769058954,3769292607,3769521835,3769746721,3769967347,3770183794,3770396141,3770604465,3770808842,3771009346,3771206051,3771399029,3771588350,3771774083,3771956296,3772135055,3772310426,3772482473,3772651259,3772816845,3772979292,3773138659,3773295005,3773448386,3773598859,3773746479,3773891300,3774033375,3774172755,3774309492,3774443636,3774575236,3774704340,3774830995,3774955248,3775077144,3775196728,3775314043,3775429133,3775542040,3775652805,3775761468,3775868070,3775972649,3776075244,3776175892,3776274631,3776371496,3776466523,3776559747,3776651202,3776740921,3776828938,3776915285,3776999993,3777083093,3777164616,3777244592,3777323050,3777400019,3777475527,3777549602,3777622271,3777693560,3777763496,3777832105,3777899411,3777965440,3778030215,3778093760,3778156099,3778217255,3778277250,3778336106,3778393844,3778450486,3778506053,3778560565,3778614042,3778666503,3778717968,3778768456,3778817986,3778866575,3778914242,3778961003,3779006877,3779051880,3779096028,3779139338,3779181825,3779223505,3779264394,3779304506,3779343857,3779382460,3779420330,3779457481,3779493927,3779529681,3779564756,3779599164,3779632919,3779666033,3779698518,3779730386,3779761649,3779792318,3779822405,3779851920,3779880875,3779909280,3779937145,3779964481,3779991298,3780017605,3780043413,3780068731,3780093568,3780117933,3780141835,3780165283,3780188286,3780210852,3780232989,3780254706,3780276010,3780296909,3780317412,3780337525,3780357256,3780376612,3780395601,3780414229,3780432503,3780450430,3780468016,3780485268,3780502193,3780518796,3780535084,3780551062,3780566737,3780582114,3780597199,3780611997,3780626514,3780640755,3780654726,3780668431,3780681876,3780695066,3780708005,3780720698,3780733150,3780745366,3780757349,3780769105,3780780637,3780791950,3780803048,3780813936,3780824617,3780835095,3780845374,3780855458,3780865350,3780875054,3780884574,3780893913,3780903074,3780912061,3780920878,3780929527,3780938012,3780946336,3780954501,3780962511,3780970369,3780978078,3780985640,3780993059,3781000337,3781007476,3781014480,3781021351,3781028091,3781034703,3781041189,3781047552,3781053794,3781059918,3781065925,3781071818,3781077599,3781083270,3781088834,3781094292,3781099646,3781104899,3781110052,3781115107,3781120066,3781124931,3781129703,3781134384,3781138976,3781143481,3781147901,3781152237,3781156490,3781160662,3781164755,3781168770,3781172709,3781176573,3781180364,3781184083,3781187731,3781191310,3781194821,3781198265,3781201644,3781204958,3781208209,3781211399,3781214528,3781217598,3781220609,3781223563,3781226461,3781229304,3781232093,3781234829,3781237513,3781240146,3781242729,3781245263,3781247749,3781250187,3781252579,3781254926,3781257228,3781259486,3781261701,3781263874,3781266006,3781268097,3781270149,3781272162,3781274136,3781276073,3781277973,3781279837,3781281666,3781283460,3781285220,3781286946,3781288639,3781290300,3781291930,3781293529,3781295097,3781296636,3781298145,3781299626,3781301078,3781302503,3781303901,3781305272,3781306617,3781307937,3781309231,3781310501,3781311747,3781312969,3781314168,3781315344,3781316498,3781317630,3781318740,3781319829,3781320897,3781321945,3781322973,3781323982,3781324972,3781325943,3781326895,3781327829,3781328745,3781329644,3781330526,3781331391,3781332240,3781333073,3781333890,3781334691,3781335477,3781336248,3781337004,3781337746,3781338474,3781339188,3781339888,3781340575,3781341249,3781341910,3781342559,3781343195,3781343819,3781344431,3781345032,3781345621,3781346199,3781346766,3781347322,3781347868,3781348403,3781348928,3781349443,3781349948,3781350444,3781350930,3781351407,3781351875,3781352334,3781352784,3781353226,3781353659,3781354084,3781354501,3781354910,3781355311,3781355705,3781356091,3781356470,3781356842,3781357207,3781357565,3781357916,3781358260,3781358598,3781358929,3781359254,3781359573,3781359886,3781360193,3781360494,3781360789,3781361079,3781361363,3781361642,3781361915,3781362183,3781362446,3781362704,3781362957,3781363205,3781363449,3781363688,3781363922,3781364152,3781364378,3781364599,3781364816,3781365029,3781365238,3781365443,3781365644,3781365841,3781366034,3781366224,3781366410,3781366593,3781366772,3781366948,3781367120,3781367289,3781367455,3781367618,3781367778,3781367934,3781368088,3781368239,3781368387,3781368532,3781368674,3781368813,3781368950,3781369084,3781369216,3781369345,3781369472,3781369596,3781369718,3781369838,3781369955,3781370070,3781370183,3781370294,3781370403,3781370509,3781370613,3781370715,3781370815,3781370914,3781371011,3781371106,3781371199,3781371290,3781371380,3781371468,3781371554,3781371638,3781371721,3781371802,3781371882,3781371960,3781372037,3781372112,3781372186,3781372258,3781372329,3781372399,3781372467,3781372534,3781372600,3781372664,3781372727,3781372789,3781372850,3781372910,3781372969,3781373026,3781373082,3781373137,3781373191,3781373244,3781373296,3781373347,3781373397,3781373446,3781373494,3781373541,3781373587,3781373632,3781373677,3781373721,3781373764,3781373806,3781373847,3781373887,3781373927,3781373966,3781374004,3781374041,3781374078,3781374114,3781374149,3781374184,3781374218,3781374251,3781374284,3781374316,3781374347,3781374378,3781374408,3781374438,3781374467,3781374496,3781374524,3781374551,3781374578,3781374604,3781374630,3781374655,3781374680,3781374704,3781374728,3781374751,3781374774,3781374797,3781374819,3781374841,3781374862,3781374883,3781374903,3781374923,3781374943,3781374962,3781374981,3781375000,3781375018,3781375036,3781375053,3781375070,3781375087,3781375103,3781375119,3781375135,3781375151,3781375166,3781375181,3781375196,3781375210,3781375224,3781375238,3781375252,3781375265,3781375278,3781375291,3781375303,3781375315,3781375327,3781375339,3781375351,3781375362,3781375373,3781375384,3781375395,3781375405,3781375415,3781375425,3781375435,3781375445,3781375454,3781375463,3781375472,3781375481,3781375490,3781375499,3781375507,3781375515,3781375523,3781375531,3781375539,3781375547,3781375554,3781375561,3781375568,3781375575,3781375582,3781375589,3781375596,3781375602,3781375608,3781375614,3781375620,3781375626,3781375632,3781375638,3781375644,3781375649,3781375654,3781375659,3781375664 +//Job - 3rd Jobs, Baby 3rds, Expanded Super Novice, Kagerou/Oboro, and Rebellion +50,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212:4215,1,368,568,696,1206,1774,2192,3196,5080,7352,8580,9892,13358,18984,31925,35860,40013,51605,68585,87770,96443,105515,131770,167428,206720,223860,241673,294553,362303,479053,513362,548856,656197,787507,927154,985696,1046034,1231134,1449220,1678177,1943306,2244059,2584282,2968115,3400000,3884688,4427246,5033064,5707855,6457661,7288852,8208125,9222500,10339317,11566230,12911197,14382470,15988583,17738338,19640789,21705223,23941143,26358244,28966392,31775600,34796000,38037819,41511350,45226922,49194872,53425513,57929105,62715823,67795725,73178721,78874542,84892710,91242506,97932943,104972733,112370263,120133566,128270295,136787699,145692601,154991375,164689926,174793673,185307530,196235893,207582627,219351052,231543938,244163492,257211358,270688607,284595740,298932685,313698799,328892871,344513126,360557232,377022309,393904936,411201163,428906522,447016041,465524258,484425237,503712583,523379460,543418608,563822364,584582678,605691135,627138976,648917115,671016163,693426449,716138040,739140762,762424222,785977830,809790819,833852265,858151108,882676174,907416194,932359821,957495652,982812246,1008298142,1033941875,1059731995,1085657082,1111705763,1137866726,1164128735,1190480643,1216911407,1243410098,1269965914,1296568193,1323206421,1349870242,1376549469,1403234090,1429914278,1456580397,1483223010,1509832883,1536400993,1562918530,1589376904,1615767747,1642082917,1668314501,1694454815,1720496409,1746432067,1772254807,1797957882,1823534782,1848979230,1874285184,1899446836,1924458610,1949315159,1974011367,1998542342,2022903418,2047090150,2071098310,2094923887,2118563083,2142012307,2165268175,2188327503,2211187307,2233844796,2256297369,2278542611,2300578289,2322402347,2344012903,2365408244,2386586822,2407547248,2428288289,2448808865,2469108042,2489185029,2509039173,2528669956,2548076989,2567260008,2586218871,2604953553,2623464142,2641750834,2659813929,2677653830,2695271035,2712666136,2729839813,2746792832,2763526041,2780040365,2796336805,2812416433,2828280388,2843929874,2859366157,2874590560,2889604462,2904409294,2919006536,2933397714,2947584399,2961568203,2975350775,2988933801,3002319001,3015508125,3028502953,3041305291,3053916970,3066339843,3078575783,3090626683,3102494451,3114181011,3125688300,3137018266,3148172868,3159154072,3169963851,3180604184,3191077054,3201384446,3211528348,3221510747,3231333629,3240998979,3250508779,3259865006,3269069632,3278124624,3287031942,3295793538,3304411356,3312887331,3321223387,3329421440,3337483392,3345411135,3353206549,3360871500,3368407842,3375817414,3383102041,3390263534,3397303689,3404224286,3411027090,3417713850,3424286299,3430746152,3437095109,3443334852,3449467047,3455493342,3461415367,3467234735,3472953041,3478571863,3484092761,3489517276,3494846931,3500083232,3505227667,3510281705,3515246797,3520124376,3524915857,3529622637,3534246095,3538787592,3543248471,3547630058,3551933659,3556160565,3560312047,3564389360,3568393741,3572326410,3576188570,3579981406,3583706087,3587363764,3590955573,3594482632,3597946043,3601346892,3604686248,3607965165,3611184681,3614345817,3617449581,3620496963,3623488939,3626426470,3629310502,3632141966,3634921779,3637650842,3640330044,3642960259,3645542346,3648077152,3650565509,3653008236,3655406140,3657760013,3660070635,3662338774,3664565184,3666750607,3668895774,3671001402,3673068197,3675096854,3677088055,3679042471,3680960763,3682843579,3684691557,3686505325,3688285499,3690032685,3691747478,3693430465,3695082220,3696703310,3698294290,3699855707,3701388097,3702891989,3704367901,3705816342,3707237813,3708632806,3710001804,3711345282,3712663706,3713957535,3715227220,3716473203,3717695918,3718895792,3720073245,3721228689,3722362528,3723475160,3724566975,3725638356,3726689680,3727721318,3728733632,3729726979,3730701710,3731658168,3732596692,3733517613,3734421257,3735307945,3736177990,3737031701,3737869381,3738691328,3739497833,3740289184,3741065662,3741827543,3742575099,3743308597,3744028298,3744734459,3745427333,3746107167,3746774204,3747428682,3748070836,3748700896,3749319088,3749925634,3750520750,3751104651,3751677546,3752239641,3752791138,3753332236,3753863129,3754384008,3754895060,3755396470,3755888418,3756371081,3756844634,3757309248,3757765090,3758212325,3758651114,3759081616,3759503986,3759918377,3760324939,3760723819,3761115161,3761499107,3761875797,3762245366,3762607949,3762963676,3763312677,3763655079,3763991005,3764320578,3764643917,3764961140,3765272361,3765577694,3765877250,3766171137,3766459463,3766742332,3767019847,3767292109,3767559217,3767821269,3768078359,3768330582,3768578029,3768820790,3769058954,3769292607,3769521835,3769746721,3769967347,3770183794,3770396141,3770604465,3770808842,3771009346,3771206051,3771399029,3771588350,3771774083,3771956296,3772135055,3772310426,3772482473,3772651259,3772816845,3772979292,3773138659,3773295005,3773448386,3773598859,3773746479,3773891300,3774033375,3774172755,3774309492,3774443636,3774575236,3774704340,3774830995,3774955248,3775077144,3775196728,3775314043,3775429133,3775542040,3775652805,3775761468,3775868070,3775972649,3776075244,3776175892,3776274631,3776371496,3776466523,3776559747,3776651202,3776740921,3776828938,3776915285,3776999993,3777083093,3777164616,3777244592,3777323050,3777400019,3777475527,3777549602,3777622271,3777693560,3777763496,3777832105,3777899411,3777965440,3778030215,3778093760,3778156099,3778217255,3778277250,3778336106,3778393844,3778450486,3778506053,3778560565,3778614042,3778666503,3778717968,3778768456,3778817986,3778866575,3778914242,3778961003,3779006877,3779051880,3779096028,3779139338,3779181825,3779223505,3779264394,3779304506,3779343857,3779382460,3779420330,3779457481,3779493927,3779529681,3779564756,3779599164,3779632919,3779666033,3779698518,3779730386,3779761649,3779792318,3779822405,3779851920,3779880875,3779909280,3779937145,3779964481,3779991298,3780017605,3780043413,3780068731,3780093568,3780117933,3780141835,3780165283,3780188286,3780210852,3780232989,3780254706,3780276010,3780296909,3780317412,3780337525,3780357256,3780376612,3780395601,3780414229,3780432503,3780450430,3780468016,3780485268,3780502193,3780518796,3780535084,3780551062,3780566737,3780582114,3780597199,3780611997,3780626514,3780640755,3780654726,3780668431,3780681876,3780695066,3780708005,3780720698,3780733150,3780745366,3780757349,3780769105,3780780637,3780791950,3780803048,3780813936,3780824617,3780835095,3780845374,3780855458,3780865350,3780875054,3780884574,3780893913,3780903074,3780912061,3780920878,3780929527,3780938012,3780946336,3780954501,3780962511,3780970369,3780978078,3780985640,3780993059,3781000337,3781007476,3781014480,3781021351,3781028091,3781034703,3781041189,3781047552,3781053794,3781059918,3781065925,3781071818,3781077599,3781083270,3781088834,3781094292,3781099646,3781104899,3781110052,3781115107,3781120066,3781124931,3781129703,3781134384,3781138976,3781143481,3781147901,3781152237,3781156490,3781160662,3781164755,3781168770,3781172709,3781176573,3781180364,3781184083,3781187731,3781191310,3781194821,3781198265,3781201644,3781204958,3781208209,3781211399,3781214528,3781217598,3781220609,3781223563,3781226461,3781229304,3781232093,3781234829,3781237513,3781240146,3781242729,3781245263,3781247749,3781250187,3781252579,3781254926,3781257228,3781259486,3781261701,3781263874,3781266006,3781268097,3781270149,3781272162,3781274136,3781276073,3781277973,3781279837,3781281666,3781283460,3781285220,3781286946,3781288639,3781290300,3781291930,3781293529,3781295097,3781296636,3781298145,3781299626,3781301078,3781302503,3781303901,3781305272,3781306617,3781307937,3781309231,3781310501,3781311747,3781312969,3781314168,3781315344,3781316498,3781317630,3781318740,3781319829,3781320897,3781321945,3781322973,3781323982,3781324972,3781325943,3781326895,3781327829,3781328745,3781329644,3781330526,3781331391,3781332240,3781333073,3781333890,3781334691,3781335477,3781336248,3781337004,3781337746,3781338474,3781339188,3781339888,3781340575,3781341249,3781341910,3781342559,3781343195,3781343819,3781344431,3781345032,3781345621,3781346199,3781346766,3781347322,3781347868,3781348403,3781348928,3781349443,3781349948,3781350444,3781350930,3781351407,3781351875,3781352334,3781352784,3781353226,3781353659,3781354084,3781354501,3781354910,3781355311,3781355705,3781356091,3781356470,3781356842,3781357207,3781357565,3781357916,3781358260,3781358598,3781358929,3781359254,3781359573,3781359886,3781360193,3781360494,3781360789,3781361079,3781361363,3781361642,3781361915,3781362183,3781362446,3781362704,3781362957,3781363205,3781363449,3781363688,3781363922,3781364152,3781364378,3781364599,3781364816,3781365029,3781365238,3781365443,3781365644,3781365841,3781366034,3781366224,3781366410,3781366593,3781366772,3781366948,3781367120,3781367289,3781367455,3781367618,3781367778,3781367934,3781368088,3781368239,3781368387,3781368532,3781368674,3781368813,3781368950,3781369084,3781369216,3781369345,3781369472,3781369596,3781369718,3781369838,3781369955,3781370070,3781370183,3781370294,3781370403,3781370509,3781370613,3781370715,3781370815,3781370914,3781371011,3781371106,3781371199,3781371290,3781371380,3781371468,3781371554,3781371638,3781371721,3781371802,3781371882,3781371960,3781372037,3781372112,3781372186,3781372258,3781372329,3781372399,3781372467,3781372534,3781372600,3781372664,3781372727,3781372789,3781372850,3781372910,3781372969,3781373026,3781373082,3781373137,3781373191,3781373244,3781373296,3781373347,3781373397,3781373446,3781373494,3781373541,3781373587,3781373632,3781373677,3781373721,3781373764,3781373806,3781373847,3781373887,3781373927,3781373966,3781374004,3781374041,3781374078,3781374114,3781374149,3781374184,3781374218,3781374251,3781374284,3781374316,3781374347,3781374378,3781374408,3781374438,3781374467,3781374496,3781374524,3781374551,3781374578,3781374604,3781374630,3781374655,3781374680,3781374704,3781374728,3781374751,3781374774,3781374797,3781374819,3781374841,3781374862,3781374883,3781374903,3781374923,3781374943,3781374962,3781374981,3781375000,3781375018,3781375036,3781375053,3781375070,3781375087,3781375103,3781375119,3781375135,3781375151,3781375166,3781375181,3781375196,3781375210,3781375224,3781375238,3781375252,3781375265,3781375278,3781375291,3781375303,3781375315,3781375327,3781375339,3781375351,3781375362,3781375373,3781375384,3781375395,3781375405,3781375415,3781375425,3781375435,3781375445,3781375454,3781375463,3781375472,3781375481,3781375490,3781375499,3781375507,3781375515,3781375523,3781375531,3781375539,3781375547,3781375554,3781375561,3781375568,3781375575,3781375582,3781375589,3781375596,3781375602,3781375608,3781375614,3781375620,3781375626,3781375632,3781375638,3781375644,3781375649,3781375654,3781375659,3781375664 diff --git a/db/pre-re/job_maxhpsp_db.txt b/db/pre-re/job_maxhpsp_db.txt index b11985bb0d..35345e3384 100644 --- a/db/pre-re/job_maxhpsp_db.txt +++ b/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 diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt index 683af14e28..fcd6f057d2 100644 --- a/db/pre-re/skill_cast_db.txt +++ b/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 -//========================================== +//========================================== -//==== Kagerou & Oboro skills ============== -//-- KO_YAMIKUMO +//==== Rebellion =========================== +//-- RL_B_TRAP +2555,0,0,0,10000:11000:12000:13000:14000,0,0 +//========================================== + +//==== 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 //========================================== diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index b124ea36fb..c5072e0669 100644 --- a/db/pre-re/skill_db.txt +++ b/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 diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt index b333649b01..71defaa5b0 100644 --- a/db/pre-re/skill_require_db.txt +++ b/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# diff --git a/db/pre-re/skill_tree.txt b/db/pre-re/skill_tree.txt index 24fe730f75..3ea48eab13 100644 --- a/db/pre-re/skill_tree.txt +++ b/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# diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt index 66a22daa59..69f47c44dd 100644 --- a/db/pre-re/skill_unit_db.txt +++ b/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 diff --git a/db/re/job_db1.txt b/db/re/job_db1.txt index e0edb88308..0381a463eb 100644 --- a/db/re/job_db1.txt +++ b/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 diff --git a/db/re/job_exp.txt b/db/re/job_exp.txt index eb18b40903..e991775b0d 100644 --- a/db/re/job_exp.txt +++ b/db/re/job_exp.txt @@ -12,9 +12,9 @@ //Base - Adv Jobs 99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,420,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,6827199,6854507,6881924,6909451,6937088,6964835,6992693,7020663,7048745,7076939,7105246,7133666,7162200,7190848,7219611,7248489,7277482,7306591,7335816,7365158,7394618,7424196,7453892,7483707,7513641,7543695,7573869,7604164,7634580,7665117,7695777,7726559,7757464,7788493,7819646,7850924,7882327,7913855,7945510,7977291,8009199,8041235,8073399,8105692,8138114,8170666,8203348,8236160,8269104,8302179,8335387,8368728,8402202,8435810,8469552,8503429,8537442,8571591,8605876,8640299,8674859,8709557,8744394,8779371,8814488,8849745,8885143,8920683,8956365,8992189,9028157,9064269,9100525,9136926,9173473,9210166,9247006,9283993,9321128,9358412,9395845,9433427,9471160,9509044,9547079,9585266,9623606,9662099,9700746,9739548,9778505,9817618,9856887,9896314,9935898,9975641,10015543,10055604,10095825,10136207,10176751,10217457,10258326,10299358,10340554,10381915,10423442,10465135,10506995,10549022,10591217,10633581,10676114,10718817,10761691,10804737,10847955,10891346,10934910,10978649,11022563,11066652,11110918,11155361,11199981,11244780,11289758,11334916,11380255,11425775,11471477,11517362,11563430,11609683,11656121,11702744,11749554,11796551,11843736,11891110,11938673,11986427,12034372,12082508,12130837,12179359,12228075,12276986,12326093,12375396,12424896,12474594,12524491,12574588,12624885,12675383,12726083,12776986,12828093,12879404,12930920,12982643,13034572,13086709,13139055,13191610,13244375,13297351,13350539,13403940,13457555,13511384,13565428,13619689,13674167,13728862,13783776,13838910,13894264,13949840,14005638,14061659,14117904,14174374,14231070,14287993,14345144,14402523,14460132,14517971,14576042,14634345,14692881,14751651,14810656,14869897,14929375,14989091,15049046,15109241,15169677,15230354,15291274,15352438,15413846,15475500,15537401,15599549,15661946,15724592,15787489,15850638,15914039,15977694,16041603,16105768,16170190,16234869,16299807,16365005,16430464,16496185,16562168,16628415,16694927,16761705,16828750,16896064,16963647,17031501,17099625,17168021,17236691,17305637,17374857,17444354,17514130,17584185,17654519,17725137,17796035,17867219,17938687,18010441,18082480,18154808,18227426,18300334,18373534,18447027,18520815,18594898,18669276,18743952,18818926,18894200,18969775,19045654,19121835,19198322,19275114,19352213,19429619,19507337,19585364,19663704,19742357,19821324,19900608,19980209,20060127,20140367,20220928,20301810,20383016,20464547,20546405,20628588,20711101,20793943,20877118,20960625,21044465,21128640,21213153,21298003,21383194,21468725,21554597,21640813,21727374,21814282,21901538,21989143,22077099,22165407,22254068,22343083,22432455,22522184,22612271,22702719,22793529,22884700,22976237,23068139,23160411,23253052,23346063,23439447,23533204,23627335,23721844,23816730,23911995,24007642,24103671,24200085,24296883,24394070,24491645,24589609,24687965,24786714,24885859,24985402,25085342,25185682,25286423,25387568,25489116,25591071,25693434,25796206,25899389,26002984,26106994,26211420,26316264,26421527,26527212,26633319,26739851,26846810,26954195,27062011,27170258,27278937,27388050,27497600,27607588,27718016,27828886,27940200,28051959,28164166,28276821,28389925,28503482,28617494,28731962,28846888,28962274,29078121,29194430,29311206,29428449,29546160,29664343,29782999,29902130,30021736,30141821,30262385,30383431,30504964,30626982,30749488,30872484,30995972,31119954,31244432,31369408,31494884,31620861,31747341,31874327,32001823,32129829,32258345,32387375,32516923,32646990,32777576,32908684,33040317,33172475,33305164,33438382,33572133,33706418,33841239,33976603,34112508,34248956,34385950,34523494,34661588,34800232,34939431,35079187,35219502,35360380,35501819,35643825,35786397,35929539,36073256,36217547,36362416,36507863,36653893,36800505,36947704,37095492,37243872,37392845,37542413,37692579,37843348,37994719,38146696,38299280,38452475,38606283,38760707,38915748,39071408,39227691,39384600,39542136,39700302,39859103,40018538,40178608,40339320,40500675,40662676,40825324,40988623,41152576,41317184,41482450,41648375,41814967,41982225,42150150,42318750,42488024,42657973,42828601,42999912,43171909,43344593,43517968,43692037,43866801,44042264,44218430,44395303,44572882,44751169,44930170,45109886,45290325,45471482,45653363,45835975,46019317,46203390,46388203,46573754,46760044,46947081,47134865,47323401,47512691,47702740,47893548,48085119,48277458,48470563,48664443,48859099,49054533,49250747,49447748,49645536,49844115,50043489,50243659,50444632,50646407,50848991,51052385,51256590,51461615,51667459,51874127,52081621,52289943,52499101,52709093,52919925,53131600,53344123,53557497,53771723,53986808,54202752,54419560,54637235,54855782,55075204,55295501,55516679,55738743,55961696,56185539,56410279,56635918,56862460,57089906,57318260,57547530,57777715,58008823,58240856,58473816,58707708,58942535,59178303,59415014,59652673,59891279,60130842,60371360,60612842,60855288,61098706,61343095,61588465,61834814,62082152,62330477,62579794,62830107,63081425,63333746,63587075,63841421,64096782,64353167,64610577,64869014,65128488,65388998,65650552,65913150,66176801,66441503,66707266,66974089,67241980,67510948,67780984,68052104,68324308,68597597,68871986,69147468,69424058,69701748,69980547,70260462,70541502,70823666,71106955,71391376,71676937,71963640,72251490,72540490,72830646,73121966,73414452,73708102,74002932,74298935,74596127,74894508,75194086,75494860,75796839,76100023,76404420,76710029,77016868,77324927,77634223,77944756,78256526,78569550,78883826,79199355,79516145,79834204,80153540,80474146,80796036,81119211,81443680,81769450,82096521,82424901,82754599,83085614,83417954,83751619,84086618,84422958,84760647,85099686,85440082,85781835,86124954,86469447,86815321,87162576,87511221,87861264,88212704,88565550,88919809,89275482,89632577,89991101,90351063,90712463,91075309,91439608,91805361,92172576,92541261,92911424,93283064,93656191,94030811,94406926,94784550,95163685,95544337,95926508,96310213,96695451,97082224,97470547,97860421,98251860,98644858,99039430,99435584,99833321,100232648,100633573,101036105,101440243,101845995,102253370,102662376,103073020,103485310,103899247,104314839,104732093,105151018,105571614,105993897,106417866,106843529,107270896,107699974,108130770,108563285,108997535,109433520,109871248,110310727,110751965,111194970,111639742,112086297,112534635,112984764,113436701,113890444,114346003,114803378,115262583,115723628,116186520,116651260,117117863,117586329,118056667,118528884,119002989,119478997,119956909,120436733,120918476,121402147,121887746,122375288,122864782,123356236,123849658,124345048,124842421,125341787,125843144,126346510,126851891,127359289,127868718,128380188,128893706,129409272,129926902,130446604,130968387,131492250,132018210,132546274,133076450,133608746,134143172,134679733,135218439,135759298,136302326,136847522,137394903,137944468,138496234,139050217,139606417,140164834,140725484,141288382,141853530,142420942,142990620,143562579,144136818,144713355,145292205,145873369,146456861,147042683,147630851,148221363,148814237,149409489,150007118,150607140,151209556,151814382,152421633,153031310,153643429,154257989,154875007,155494500,156116465,156740921,157367883,157997351,158629325,159263837,159900887,160540475,161182633,161827362,162474661,163124546,163777033,164432139,165089864,165750206,166413200,167078844,167747154,168418131,169091791,169768150,170447207,171128980,171813483,172500733,173190730,173883490,174579012,175277315,175978412,176682320,177389040,178098587,178810977,179526210,180244303,180965271,181689115,182415867,183145526,183878092,184613598,185352044,186093446,186837804,187585149,188335482,189088820,189845161,190604538,191366952,192132401,192900919,193672505,194447192,195224978,196005865,196789885,197577037,198367337,199160803,199957432,200757259,201560282,202366518,203175967,203988661,204804600,205623815,206446292,207272062,208101141,208933529,209769259,210608330,211450758,212296544,213145719,213998283,214854270,215713678,216576523,217442822,218312576,219185815,220062539,220942782,221826543,222713838,223604683,224499095,225397072,226298648,227203838,228112643,229025078,229941160,230860904,231784327,232711445,233642273,234576829,235515127,236457168,237402984,238352575,239305974,240263179,241224224,242189108,243157847,244130458,245106973,246087391,247071728,248060002 -//Base - 3rd Jobs, Baby 3rds, Expanded Super Novice, and Kagerou/Oboro +//Base - 3rd Jobs, Baby 3rds, Expanded Super Novice, Kagerou/Oboro, and Rebellion //Note: (First 98 values [Level 1 - 98] are dummy values (used Adv Jobs values), because 3rd classes start at level 99.) -160,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212,0,420,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,95285001,95570856,95857570,96145142,96433581,96722886,97013058,97304097,97596010,97888798,98182468,98477013,98772449,99068767,99365976,99664076,99963074,100262963,100563750,100865445,101168046,101471554,101775968,102081298,102387542,102694708,103002790,103311802,103621737,103932603,104244399,104557135,104870809,105185422,105500982,105817489,106134942,106453351,106772714,107093032,107414313,107736557,108059771,108383949,108709106,109035233,109362339,109690425,110019497,110349556,110680602,111012644,111345680,111679719,112014761,112350806,112687862,113025929,113365008,113705105,114046221,114388365,114731535,115075733,115420965,115767233,116114536,116462882,116812271,117162711,117514202,117866745,118220346,118575007,118930735,119287530,119645393,120004330,120364343,120725439,121087618,121450881,121815235,122180680,122547224,122914868,123283611,123653461,124024426,124396499,124769688,125143999,125519434,125895992,126273682,126652503,127032464,127413564,127795811,128179198,128563740,128949437,129336291,129724299,130113471,130503815,130895330,131288016,131681882,132076928,132473161,132870582,133269198,133669010,134070017,134472228,134875643,135280277,135686115,136093173,136501450,136910963,137321695,137733663,138146867,138561307,138976998,139393925,139812104,140231535,140652233,141074199,141497417,141921919,142347688,142774726,143203047,143632652,144063556,144495745,144929234,145364022,145800111,146237515,146676235,147116271,147557623,148000291,148444291,148889623,149336287,149784299,150233660,150684368,151136424,151589828,152044596,152500728,152958241,153417117,153877374,154339011,154802028,155266441,155732250,156199456,156668057,157138071,157609481,158082319,158556570,159032249,159509356,159987891,160467855,160949262,161432115,161916411,162402168,162889385,163378063,163868201,164359816,164852890,165347458,165843501,166341037,166840066,167340587,167842617,168346155,168851202,169357757,169865836,170375441,170886569,171399239,171913433,172429183,172946475,173465323,173985727,174507688,175031206,175556297,176082976,176611228,177141069,177672498,178205517,178740140,179276368,179814200,180353654,180894712,181437407,181981724,182527677,183075266,183624493,184175373,184727905,185282091,185837946,186395469,186954662,187515523,188078070,188642302,189208234,189775868,190345203,190916239,191488992,192063462,192639650,193217570,193797224,194378611,194961747,195546633,196133284,196721683,197311849,197903795,198497507,199093000,199690275,200289347,200890216,201492882,202097362,202703656,203311763,203921699,204533465,205147076,205762517,206379803,206998951,207619945,208242816,208867548,209494159,210122646,210753012,211385271,212019424,212655486,213293458,213933340,214575148,215218881,215864541,216512142,217161684,217813169,218466612,219122012,219779386,220438734,221100056,221763368,222428654,223095946,223765244,224436548,225109858,225785190,226462544,227141936,227823366,228506834,229192357,229879933,230569580,231261297,231955084,232650958,233348917,234048963,234751111,235455362,236161731,236870218,237580839,238293579,239008469,239725494,240444669,241166011,241889519,242615193,243343050,244073090,244805312,245539733,246276352,247015186,247756234,248499513,249245023,249992764,250742751,251494985,252249482,253006241,253765264,254526565,255290145,256056019,256824189,257594669,258367461,259142563,259919993,260699765,261481864,262266307,263053108,263842268,264633804,265427714,266224000,267022677,267823745,268627220,269433119,270241425,271052169,271865322,272680913,273498976,274319478,275142452,275967897,276795813,277626201,278459092,279294487,280132385,280972787,281815724,282661165,283509141,284359685,285212765,286068412,286926627,287787409,288650792,289516742,290385292,291256441,292130223,293006604,293885617,294767295,295651604,296538577,297428213,298320514,299215479,300113140,301013497,301916550,302822299,303730777,304641982,305555916,306472578,307392000,308314182,309239124,310166859,311097355,312030642,312966754,313905658,314847387,315791940,316739318,317689552,318642611,319598558,320557362,321519054,322483603,323451073,324421432,325394711,326370910,327350031,328332072,329317067,330305014,331295946,332289830,333286700,334286555,335289426,336295315,337304221,338316143,339331083,340349072,341370110,342394229,343421429,344451711,345485074,346521550,347561107,348603810,349649626,350698588,351750695,352805947,353864377,354925984,355990769,357058763,358129935,359204317,360281940,361362805,362446912,363534260,364624882,365718778,366815948,367916391,369020140,370127196,371237589,372351320,373468389,374588796,375712574,376839721,377970239,379104158,380241480,381382204,382526362,383673955,384824981,385979475,387137434,388298860,389463752,390632143,391804032,392979452,394158402,395340883,396526926,397716501,398909669,400106401,401306727,402510648,403718196,404929371,406144172,407362601,408584688,409810466,411039903,412273032,413509851,414750394,415994659,417242648,418494392,419749891,421009146,422272188,423539017,424809633,426084069,427362325,428644431,429930358,431220168,432513829,433811374,435112803,436418147,437727407,439040583,440357706,441678778,443003829,444332860,445665871,447002862,448343865,449688913,451038004,452391139,453748318,455109574,456474906,457844346,459217894,460595551,461977348,463363285,464753395,466147677,467546132,468948792,470355656,471766724,473182030,474601571,476025382,477453462,478885842,480322523,481763505,483208820,484658468,486112449,487570795,489033506,490500614,491972120,493448054,494928418,496413211,497902466,499396181,500894391,502397093,503904289,505416011,506932258,508453063,509978425,511508377,513042919,514582051,516125804,517674180,519227209,520784892,522347261,523914316,525486057,527062517,528643726,530229654,531820364,533415824,535016066,536621123,538230994,539845680,541465244,543089623,544718880,546353015,547992094,549636051,551284951,552938794,554597644,556261436,557930235,559604042,561282855,562966740,564655631,566349594,568048628,569752797,571462038,573176414,574895925,576620635,578350481,580085527,581825772,583571281,585321990,587077962,588839198,590605697,592377525,594154681,595937164,597724975,599518179,601316775,603120763,604930142,606744915,608565143,610390828,612222033,614058694,615900876,617748579,619601866,621460674,623325067,625195044,627070670,628951881,630838740,632731249,634629471,636533341,638442925,640358286,642279360,644206211,646138840,648077246,650021493,651971582,653927512,655889284,657856961,659830544,661810033,663795492,665786920,667784318,669787686,671797089,673812525,675833995,677861500,679895102,681934803,683980602,686032564,688090688,690154974,692225423,694302098,696385000,698474193,700569613,702671323,704779324,706893680,709014391,711141458,713274879,715414719,717560979,719713657,721872820,724038465,726210594,728389271,730574431,732766138,734964457,737169388,739380931,741599086,743823916,746055423,748293605,750538528,752790127,755048530,757313673,759585620,761864372,764149993,766442482,768741839,771048065,773361224,775681315,778008404,780342425,782683443,785031522,787386663,789748864,792118127,794494515,796878028,799268666,801666494,804071512,806483719,808903180,811329894,813763926,816205212,818653816,821109802,823573170,826043920,828522053,831007631,833500656,836001191,838509237,841024793,843547859,846078501,848616781,851162636,853716129,856277326,858846161,861422700,864007006,866599015,869198855,871806462,874421901,877045172,879676337,882315399,884962356,887617273,890280150,892950987,895629847,898316732,901011705,903714766,906425915,909145216,911872670,914608277,917352099,920104203,922864523,925633124,928410070,931195297,933988933,936790914,939601304,942420103,945247376,948083121,950927405,953780226,956641584,959511544,962390106,965277270,968173099,971077659,973990885,976912905,979843655,982783199,985731538,988688735,991654790,994629769,997613670,1000606558,1003608368,1006619230,1009639078,1012668042,1015706057,1018753187,1021809497,1024874921,1027949590,1031033438,1034126529,1037228929,1040340636,1043461651,1046592038,1049731862,1052881057,1056039753,1059207885,1062385517,1065572714,1068769476,1071975802,1075191757,1078417405,1081652682,1084897716,1088152379,1091416799,1094691105,1097975168,1101269116,1104572950,1107886669,1111210403,1114544022,1117887655,1121241302,1124605091,1127978894,1131362840,1134756928,1138161158,1141575659,1145000430,1148435473,1151880786,1155336498,1158802481,1162278863,1165765773,1169263081,1172770917,1176289281,1179818172,1183357591,1186907665,1190468395,1194039782,1197621952,1201214907,1204818517,1208433040,1212058348 +160,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212:4215,0,420,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,95285001,95570856,95857570,96145142,96433581,96722886,97013058,97304097,97596010,97888798,98182468,98477013,98772449,99068767,99365976,99664076,99963074,100262963,100563750,100865445,101168046,101471554,101775968,102081298,102387542,102694708,103002790,103311802,103621737,103932603,104244399,104557135,104870809,105185422,105500982,105817489,106134942,106453351,106772714,107093032,107414313,107736557,108059771,108383949,108709106,109035233,109362339,109690425,110019497,110349556,110680602,111012644,111345680,111679719,112014761,112350806,112687862,113025929,113365008,113705105,114046221,114388365,114731535,115075733,115420965,115767233,116114536,116462882,116812271,117162711,117514202,117866745,118220346,118575007,118930735,119287530,119645393,120004330,120364343,120725439,121087618,121450881,121815235,122180680,122547224,122914868,123283611,123653461,124024426,124396499,124769688,125143999,125519434,125895992,126273682,126652503,127032464,127413564,127795811,128179198,128563740,128949437,129336291,129724299,130113471,130503815,130895330,131288016,131681882,132076928,132473161,132870582,133269198,133669010,134070017,134472228,134875643,135280277,135686115,136093173,136501450,136910963,137321695,137733663,138146867,138561307,138976998,139393925,139812104,140231535,140652233,141074199,141497417,141921919,142347688,142774726,143203047,143632652,144063556,144495745,144929234,145364022,145800111,146237515,146676235,147116271,147557623,148000291,148444291,148889623,149336287,149784299,150233660,150684368,151136424,151589828,152044596,152500728,152958241,153417117,153877374,154339011,154802028,155266441,155732250,156199456,156668057,157138071,157609481,158082319,158556570,159032249,159509356,159987891,160467855,160949262,161432115,161916411,162402168,162889385,163378063,163868201,164359816,164852890,165347458,165843501,166341037,166840066,167340587,167842617,168346155,168851202,169357757,169865836,170375441,170886569,171399239,171913433,172429183,172946475,173465323,173985727,174507688,175031206,175556297,176082976,176611228,177141069,177672498,178205517,178740140,179276368,179814200,180353654,180894712,181437407,181981724,182527677,183075266,183624493,184175373,184727905,185282091,185837946,186395469,186954662,187515523,188078070,188642302,189208234,189775868,190345203,190916239,191488992,192063462,192639650,193217570,193797224,194378611,194961747,195546633,196133284,196721683,197311849,197903795,198497507,199093000,199690275,200289347,200890216,201492882,202097362,202703656,203311763,203921699,204533465,205147076,205762517,206379803,206998951,207619945,208242816,208867548,209494159,210122646,210753012,211385271,212019424,212655486,213293458,213933340,214575148,215218881,215864541,216512142,217161684,217813169,218466612,219122012,219779386,220438734,221100056,221763368,222428654,223095946,223765244,224436548,225109858,225785190,226462544,227141936,227823366,228506834,229192357,229879933,230569580,231261297,231955084,232650958,233348917,234048963,234751111,235455362,236161731,236870218,237580839,238293579,239008469,239725494,240444669,241166011,241889519,242615193,243343050,244073090,244805312,245539733,246276352,247015186,247756234,248499513,249245023,249992764,250742751,251494985,252249482,253006241,253765264,254526565,255290145,256056019,256824189,257594669,258367461,259142563,259919993,260699765,261481864,262266307,263053108,263842268,264633804,265427714,266224000,267022677,267823745,268627220,269433119,270241425,271052169,271865322,272680913,273498976,274319478,275142452,275967897,276795813,277626201,278459092,279294487,280132385,280972787,281815724,282661165,283509141,284359685,285212765,286068412,286926627,287787409,288650792,289516742,290385292,291256441,292130223,293006604,293885617,294767295,295651604,296538577,297428213,298320514,299215479,300113140,301013497,301916550,302822299,303730777,304641982,305555916,306472578,307392000,308314182,309239124,310166859,311097355,312030642,312966754,313905658,314847387,315791940,316739318,317689552,318642611,319598558,320557362,321519054,322483603,323451073,324421432,325394711,326370910,327350031,328332072,329317067,330305014,331295946,332289830,333286700,334286555,335289426,336295315,337304221,338316143,339331083,340349072,341370110,342394229,343421429,344451711,345485074,346521550,347561107,348603810,349649626,350698588,351750695,352805947,353864377,354925984,355990769,357058763,358129935,359204317,360281940,361362805,362446912,363534260,364624882,365718778,366815948,367916391,369020140,370127196,371237589,372351320,373468389,374588796,375712574,376839721,377970239,379104158,380241480,381382204,382526362,383673955,384824981,385979475,387137434,388298860,389463752,390632143,391804032,392979452,394158402,395340883,396526926,397716501,398909669,400106401,401306727,402510648,403718196,404929371,406144172,407362601,408584688,409810466,411039903,412273032,413509851,414750394,415994659,417242648,418494392,419749891,421009146,422272188,423539017,424809633,426084069,427362325,428644431,429930358,431220168,432513829,433811374,435112803,436418147,437727407,439040583,440357706,441678778,443003829,444332860,445665871,447002862,448343865,449688913,451038004,452391139,453748318,455109574,456474906,457844346,459217894,460595551,461977348,463363285,464753395,466147677,467546132,468948792,470355656,471766724,473182030,474601571,476025382,477453462,478885842,480322523,481763505,483208820,484658468,486112449,487570795,489033506,490500614,491972120,493448054,494928418,496413211,497902466,499396181,500894391,502397093,503904289,505416011,506932258,508453063,509978425,511508377,513042919,514582051,516125804,517674180,519227209,520784892,522347261,523914316,525486057,527062517,528643726,530229654,531820364,533415824,535016066,536621123,538230994,539845680,541465244,543089623,544718880,546353015,547992094,549636051,551284951,552938794,554597644,556261436,557930235,559604042,561282855,562966740,564655631,566349594,568048628,569752797,571462038,573176414,574895925,576620635,578350481,580085527,581825772,583571281,585321990,587077962,588839198,590605697,592377525,594154681,595937164,597724975,599518179,601316775,603120763,604930142,606744915,608565143,610390828,612222033,614058694,615900876,617748579,619601866,621460674,623325067,625195044,627070670,628951881,630838740,632731249,634629471,636533341,638442925,640358286,642279360,644206211,646138840,648077246,650021493,651971582,653927512,655889284,657856961,659830544,661810033,663795492,665786920,667784318,669787686,671797089,673812525,675833995,677861500,679895102,681934803,683980602,686032564,688090688,690154974,692225423,694302098,696385000,698474193,700569613,702671323,704779324,706893680,709014391,711141458,713274879,715414719,717560979,719713657,721872820,724038465,726210594,728389271,730574431,732766138,734964457,737169388,739380931,741599086,743823916,746055423,748293605,750538528,752790127,755048530,757313673,759585620,761864372,764149993,766442482,768741839,771048065,773361224,775681315,778008404,780342425,782683443,785031522,787386663,789748864,792118127,794494515,796878028,799268666,801666494,804071512,806483719,808903180,811329894,813763926,816205212,818653816,821109802,823573170,826043920,828522053,831007631,833500656,836001191,838509237,841024793,843547859,846078501,848616781,851162636,853716129,856277326,858846161,861422700,864007006,866599015,869198855,871806462,874421901,877045172,879676337,882315399,884962356,887617273,890280150,892950987,895629847,898316732,901011705,903714766,906425915,909145216,911872670,914608277,917352099,920104203,922864523,925633124,928410070,931195297,933988933,936790914,939601304,942420103,945247376,948083121,950927405,953780226,956641584,959511544,962390106,965277270,968173099,971077659,973990885,976912905,979843655,982783199,985731538,988688735,991654790,994629769,997613670,1000606558,1003608368,1006619230,1009639078,1012668042,1015706057,1018753187,1021809497,1024874921,1027949590,1031033438,1034126529,1037228929,1040340636,1043461651,1046592038,1049731862,1052881057,1056039753,1059207885,1062385517,1065572714,1068769476,1071975802,1075191757,1078417405,1081652682,1084897716,1088152379,1091416799,1094691105,1097975168,1101269116,1104572950,1107886669,1111210403,1114544022,1117887655,1121241302,1124605091,1127978894,1131362840,1134756928,1138161158,1141575659,1145000430,1148435473,1151880786,1155336498,1158802481,1162278863,1165765773,1169263081,1172770917,1176289281,1179818172,1183357591,1186907665,1190468395,1194039782,1197621952,1201214907,1204818517,1208433040,1212058348 //Job - Novice & Baby Novice 10,0:4023,1,4,10,18,28,40,91,151,205,268,340 @@ -34,8 +34,8 @@ //Job - Adv Second Classes 70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,2400,3800,6200,10400,15200,22900,27100,30000,32500,35700,41300,45000,45800,47600,50300,58700,63900,67100,70300,73500,90600,96200,102700,110200,121400,144700,152900,163100,173300,183500,213500,224700,236000,247200,260700,299800,324800,343600,362300,374800,474400,497000,512100,542200,564800,644300,678200,712100,754500,796900,949300,988100,1026800,1065600,1104300,1334800,1391400,1425300,1470600,1515800,2003800,2032800,2119900,2236100,2323200,3025300,3433300,3776600,4436900,6758400,6893567,7031438,7172066,7315507,7461817,7611053,7763273,7918538,8076908,8238446,8403214,8571278,8742703,8917556,9095906,9277823,9463379,9652646,9845698,10042611,10243463,10448332,10657298,10870443,11087851,11309607,11535798,11766513,12001843,12241879,12486716,12736450,12991178,13251001,13516020,13786340,14062066,14343307,14630172,14922775,15221230,15525654,15836166,16152889,16475946,16805464,17141572,17484403,17834091,18190773,18554587,18925679,19304193,19690275,20084081,20485761,20895474,21313383,21739651,22174444,22617932,23070290,23531695,24002329,24482374,24972021,25471459,25980888,26500505,27030513,27571121,28122541,28684990,29258689,29843861,30440736,31049550,31670540,32303950,32950028,33609027,34281207,34966831,35666167,36379490,37107077,37849216,38606199,39378323,40165889,40969204,41788587,42624358,43476846,44346384,45233310,46137977,47060734,48001949,48961986,49941222,50940047,51958847,52998023,54057983,55139142,56241925,57366761,58514094,59684376,60878062,62095624,63337535,64604285,65896368,67214294,68558580,69929746,71328337,72754901,74210000,75694198,77208082,78752240,80327283,81933824,83572498,85243944,86948821,88687798,90461554,92270781,94116197,95998522,97918488,99876855,101874391,103911877,105990115,108109912,110272108,112477552,114727100,117021643,119362070,121749311,124184295,126667979,129201333,131785360,134421064,137109474,139851658,142648694,145501659,148411694,151379927,154407515,157495667,160645574,163858476,167135646,170478357,173887915,177365675,180912990,184531248,188221869,191986305,195826026,199742548,203737391,207812135,211968366,216207731,220531878,224942505,229441357,234030182,238710775,243484978,248354670,253321760,258388190,263555950 -//Job - 3rd Jobs, Baby 3rds, Expanded Super Novice, and Kagerou/Oboro -50,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212,1,106000,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,120267768,121470444,122685151,123912002,125151118,126402630,127666657,128943321,130232751,131535078,132850429,134178935,135520724,136875925,138244677,139627117,141023389,142433624,143857966,145296546,146749508,148216997,149699160,151196158,152708120,154235207,155777550,157335326,158908679,160497757,162102736,163723761,165360996,167014600,168684736,170371581,172075298,173796047,175534006,177289338,179062235,180852860,182661390,184488004,186332878,188196207,190078168,191978955,193898747,195837737,197796119,199774071,201771802,203789524,205827413,207885680,209964534,212064171,214184815,216326662,218489920,220674817,222881562,225110381,227361485,229635100,231931452,234250768,236593273,238959210,241348805,243762285,246199908,248661900,251148520,253659994,256196597,258758555,261346143,263959602,266599193,269265189,271957833,274677399,277424179,280198431,283000413,285830417,288688733,291575620,294491369,297436270,300410615,303414727,306448864,309513349,312608474,315734561,318891902,322080819,325301637,328554645,331840199,335158590,338510174,341895274,345314213,348767346,352255030,355777587,359335372,362928710,366557987,370223560,373925783,377665046,381441702,385256109,389108653,392999722,396929705,400898989,404907961,408957043,413046622,417177086,421348854,425562348,429817955,434116127,438457285,442841848,447270270,451742970,456260401,460823015,465431233,470085539,474786386,479534259,484329610,489172891,494064620,499005249,503995295,509035244,514125579,519266818,524459479,529704077,535001099,540351093,545754609,551212165,556724276,562291525,567914429,573593570,579329530,585122825,590974038,596883750,602852608,608881128,614969957,621119677,627330870,633604182,639940195,646339620,652803038,659331031,665924311,672583524,679309381,686102463,692963482,699893083,706891979,713960880,721100498,728311477,735594595,742950563,750380090,757883889,765462735,773117339,780848477,788656925,796543457,804508915,812554009,820679516,828886275,837175126,845546847,854002276,862542318,871167751,879879413,888678209,897564981,906540633,915606005 +//Job - 3rd Jobs, Baby 3rds, Expanded Super Novice, Kagerou/Oboro, and Rebellion +50,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212:4215,1,106000,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,120267768,121470444,122685151,123912002,125151118,126402630,127666657,128943321,130232751,131535078,132850429,134178935,135520724,136875925,138244677,139627117,141023389,142433624,143857966,145296546,146749508,148216997,149699160,151196158,152708120,154235207,155777550,157335326,158908679,160497757,162102736,163723761,165360996,167014600,168684736,170371581,172075298,173796047,175534006,177289338,179062235,180852860,182661390,184488004,186332878,188196207,190078168,191978955,193898747,195837737,197796119,199774071,201771802,203789524,205827413,207885680,209964534,212064171,214184815,216326662,218489920,220674817,222881562,225110381,227361485,229635100,231931452,234250768,236593273,238959210,241348805,243762285,246199908,248661900,251148520,253659994,256196597,258758555,261346143,263959602,266599193,269265189,271957833,274677399,277424179,280198431,283000413,285830417,288688733,291575620,294491369,297436270,300410615,303414727,306448864,309513349,312608474,315734561,318891902,322080819,325301637,328554645,331840199,335158590,338510174,341895274,345314213,348767346,352255030,355777587,359335372,362928710,366557987,370223560,373925783,377665046,381441702,385256109,389108653,392999722,396929705,400898989,404907961,408957043,413046622,417177086,421348854,425562348,429817955,434116127,438457285,442841848,447270270,451742970,456260401,460823015,465431233,470085539,474786386,479534259,484329610,489172891,494064620,499005249,503995295,509035244,514125579,519266818,524459479,529704077,535001099,540351093,545754609,551212165,556724276,562291525,567914429,573593570,579329530,585122825,590974038,596883750,602852608,608881128,614969957,621119677,627330870,633604182,639940195,646339620,652803038,659331031,665924311,672583524,679309381,686102463,692963482,699893083,706891979,713960880,721100498,728311477,735594595,742950563,750380090,757883889,765462735,773117339,780848477,788656925,796543457,804508915,812554009,820679516,828886275,837175126,845546847,854002276,862542318,871167751,879879413,888678209,897564981,906540633,915606005 //Job - Ninja/Gunslinger 70,24:25,1,100,200,300,400,600,700,1000,1200,1400,1700,1900,2400,2700,3200,3600,4200,4900,5500,6100,6900,7700,8400,9300,10100,11100,12100,13000,14600,16100,17500,18600,21500,23300,24700,27000,29000,30000,32400,35000,38100,41100,44000,46700,49600,52500,55600,58900,62700,65500,69200,72300,81200,84100,89300,95500,100900,107800,114900,120700,128600,150500,176900,196100,219600,234200,247900,266400,281300,296600,308000,311079,314189,317330,320503,323708,326945,330214,333516,336851,340219,343621,347057,350527,354032,357572,361147,364758,368405,372089,375809,379567,383362,387195,391066,394976,398925,402914,406943,411012,415122,419273,423465,427699,431975,436294,440656,445062,449512,454007,458547,463132,467763,472440,477164,481935,486754,491621,496537,501502,506517,511582,516697,521863,527081,532351,537674,543050,548480,553964,559503,565098,570748,576455,582219,588041,593921,599860,605858,611916,618035,624215,630457,636761,643128,649559,656054,662614,669240,675932,682691,689517,696412,703376,710409,717513,724688,731934,739253,746645,754111,761652,769268,776960,784729,792576,800501,808506,816591,824756,833003,841333,849746,858243,866825,875493,884247,893089,902019,911039,920149,929350,938643,948029,957509,967084,976754,996289,1016214,1036538,1057268,1078413,1099981,1121980,1144419,1167307,1190653,1214466,1238755,1263530,1288800,1314575,1340866,1367683,1395036,1422936,1451394,1480421,1510029,1540229,1571033,1602453,1634502,1667192,1700535,1734545,1769235,1804619,1840711,1877525,1915075,1953376,1992443,2032291,2072936,2114394,2156681,2199814,2243810,2288686,2334459,2381148,2428770,2477345,2526891,2577428,2628976,2681555,2735186,2789889,2845686,2902599,2960650,3019862,3080259,3141864,3204701,3268794,3334169,3400852,3468868,3538245,3609009,3681189,3754812,3829908 diff --git a/db/re/job_maxhpsp_db.txt b/db/re/job_maxhpsp_db.txt index 21ca44d784..55f97f086a 100644 --- a/db/re/job_maxhpsp_db.txt +++ b/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 diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 6a42cb945f..423e35d120 100644 --- a/db/re/skill_cast_db.txt +++ b/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 diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index 715562c41e..7df0c3d57d 100644 --- a/db/re/skill_db.txt +++ b/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 diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt index 51bebd1cbe..015d2c5015 100644 --- a/db/re/skill_require_db.txt +++ b/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# diff --git a/db/re/skill_tree.txt b/db/re/skill_tree.txt index 71c2eccb86..862365e8a8 100644 --- a/db/re/skill_tree.txt +++ b/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# diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt index 074ee6c69d..601a7a325f 100644 --- a/db/re/skill_unit_db.txt +++ b/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 diff --git a/doc/item_db.txt b/doc/item_db.txt index 2c8a00d662..a5101e150b 100644 --- a/doc/item_db.txt +++ b/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 diff --git a/src/common/mmo.h b/src/common/mmo.h index db707ba92a..b048787612 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -750,6 +750,8 @@ enum { JOB_KAGEROU = 4211, JOB_OBORO, + JOB_REBELLION = 4215, + JOB_MAX, }; diff --git a/src/map/atcommand.c b/src/map/atcommand.c index c84f2ffdf2..7a10623b2c 100644 --- a/src/map/atcommand.c +++ b/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; } diff --git a/src/map/clif.h b/src/map/clif.h index 4cf641205b..bd210ca41c 100644 --- a/src/map/clif.h +++ b/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, }; diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 853e60d72c..73f6b369cb 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -260,9 +260,10 @@ static void itemdb_jobid2mapid(unsigned int *bclass, unsigned int jobmask) bclass[2] |= 1<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); } diff --git a/src/map/pc.h b/src/map/pc.h index 087619f5c5..6f9f4f95c3 100644 --- a/src/map/pc.h +++ b/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_) diff --git a/src/map/skill.c b/src/map/skill.c index 40e50ce137..cef20776e7 100644 --- a/src/map/skill.c +++ b/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); diff --git a/src/map/skill.h b/src/map/skill.h index 4e9bcd4868..8bef61e8fe 100644 --- a/src/map/skill.h +++ b/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, diff --git a/src/map/status.c b/src/map/status.c index d5c2839605..966bbd1cbe 100644 --- a/src/map/status.c +++ b/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