diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-04 04:48:30 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-04 04:48:30 +0000 |
| commit | e27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb (patch) | |
| tree | e5f666a82c5a0f2c5a366c40c3f05f5d1da55953 | |
| parent | 4f44cd846049aa506f3c8c43fb25d78343e71551 (diff) | |
| download | hercules-e27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb.tar.gz hercules-e27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb.tar.bz2 hercules-e27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb.tar.xz hercules-e27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb.zip | |
- Fixed missing baby-dancer job in exp2.txt
- Added function battle_set_walkdelay in charge of updating walkdelays of characters based on two criterias: when the delay is induced by damage, if the current walk delay isn't over yet, do not update it. If the delay is instead caused by a skill, then the current walk delay cannot be decreased, only increased.
- Removed the canmove tick reset on skill cast cancel; likewise it isn't updated on begin casting. pc_can_move uses a skilltimer check to know whether you can move or not.
- Added GrandCross's can't move delay of 900ms to skill_cast_db
- Added Finger Offensive's can't move delay of 200ms/lv to skill_cast_db
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5457 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | db/Changelog.txt | 4 | ||||
| -rw-r--r-- | db/exp2.txt | 4 | ||||
| -rw-r--r-- | db/skill_cast_db.txt | 8 | ||||
| -rw-r--r-- | src/map/battle.c | 84 | ||||
| -rw-r--r-- | src/map/battle.h | 1 | ||||
| -rw-r--r-- | src/map/mob.c | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 8 | ||||
| -rw-r--r-- | src/map/pc.c | 3 | ||||
| -rw-r--r-- | src/map/skill.c | 52 |
10 files changed, 86 insertions, 85 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e670f14ef..88e4b269e 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,11 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/03
+ * Added function battle_set_walkdelay in charge of updating walkdelays of
+ characters based on two criterias: when the delay is induced by damage, if
+ the current walk delay isn't over yet, do not update it. If the delay is
+ instead caused by a skill, then the current walk delay cannot be decreased,
+ only increased. [Skotlex]
* Added upgrade_svn5455.sql, it converts the manner and karma columns to
signed. Apply this if your tables have the field as unsigned (which would
explain mute always disappearing after relogging) [Skotlex]
diff --git a/db/Changelog.txt b/db/Changelog.txt index c4387f846..49e7dca53 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -27,6 +27,10 @@ =========================
03/03
+ * Fixed missing baby-dancer job in exp2.txt [Skotlex]
+ * Added GrandCross's can't move delay of 900ms to skill_cast_db and Finger
+ Offensive's can't move delay of 200ms/lv to skill_cast_db (values taken
+ from the code) [Skotlex]
* Updated skill_cast_db time info for some skills: [Skotlex]
- Magnum's time2 is skill-block time
- St. Recovery/ Cure's time2 is the confuse/blind duration
diff --git a/db/exp2.txt b/db/exp2.txt index dff8d2c40..efb43dfaf 100644 --- a/db/exp2.txt +++ b/db/exp2.txt @@ -14,7 +14,7 @@ //Job - 1st Classes 50,1:2:3:4:5:6:24:25:26,1,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,329843,379102,434567,496856,566629,644589,731482,828096,935264,1053861,1184807,1329062,1487630,1661554,1851918,2059842,2286484,2533034,2800715,3090779,3404503,3743189,4108159,4500752,4922319,5374222,5857829,6374510,6925632,7512557,8136637,8799208,9501590,10245078,11030942,11860420,12734717,13654998,14622385,15637956,16702739,17817709,18983785,20201828,21472637,22796947,24175427,25608679,27097233,28641549,30242013,31898938,33612561,35383045,37210476,39094865,41036147,43034181,45088752,47199571,49366275,51588430,53865531,56197005,58582210,61020440,63510925,66052833,68645274,71287301,73977913,76716056,79500628,82330481,85204422,88121217,91079595,94078248,97115837,100190993,103302318,106448393,109627775,112839003,116080601,119351078,122648934,125972660,129320741,132691658,136083893,139495928,142926248,146373345,149835718,153311875,156800336,160299633,163808315,167324946,170848108,174376402,177908451,181442899,184978413,188513685,192047431,195578393,199105341,202627072,206142410,209650210,213149356,216638760,220117366,223584148,227038110,230478288,233903749,237313590,240706940,244082960,247440841,250779805,254099105,257398024,260675877,263932007,267165788,270376624,273563946,276727216,279865923,282979584,286067743,289129972,292165868,295175054,298157179,301111917,304038965,306938045,309808901,312651301,315465033,318249908,321005758,323732433,326429805,329097764,331736219,334345097,336924341,339473912,341993787,344483958,346944434,349375236,351776401,354147978,356490030,358802632,361085872,363339848,365564669,367760455,369927336,372065452,374174951,376255991,378308737,380333362,382330048,384298982,386240358,388154377,390041246,391901177,393734387,395541098,397321537,399075935,400804526,402507549,404185246,405837861,407465642,409068839,410647704,412202492,413733459,415240862,416724961,418186016,419624289,421040041,422433535,423805034,425154801,426483099,427790192,429076343,430341814,431586867,432811764,434016766,435202133,436368124,437514996,438643007,439752411,440843463,441916415,442971519,444009023,445029176,446032223,447018409,447987976,448941165,449878214,450799359,451704835,452594875,453469708,454329562,455174663,456005235,456821498,457623672,458411973,459186616,459947813,460695773,461430704,462152810,462862294,463559356,464244194,464917003,465577976,466227304,466865175,467491774,468107285,468711889,469305764,469889087,470462031,471024768,471577467,472120295,472653416,473176993,473691185,474196151,474692045,475179021,475657230,476126821,476587940,477040732,477485339,477921901,478350556,478771440,479184687,479590429,479988796,480379915,480763913,481140913,481511037,481874405,482231136,482581346,482925149,483262657,483593982,483919232,484238515,484551937,484859601,485161609,485458061,485749057,486034693,486315066,486590269,486860394,487125532,487385773,487641205,487891913,488137983,488379498,488616541,488849192,489077530,489301633,489521578,489737440,489949293,490157210,490361262,490561520,490758052,490950927,491140211,491325969,491508266,491687165,491862728,492035017,492204091,492370009,492532829,492692607,492849400,493003262,493154248,493302410,493447800,493590469,493730468,493867845,494002649,494134928,494264728,494392095,494517074,494639709,494760043,494878119,494993979,495107664,495219215,495328671,495436070,495541451,495644852,495746309,495845859,495943537,496039378,496133416,496225684,496316216,496405044,496492199,496577713,496661617,496743940,496824712,496903963,496981720,497058012,497132865,497206307,497278364,497349062,497418427,497486483,497553255,497618767,497683043,497746106,497807978,497868682,497928240,497986673,498044003,498100250,498155434,498209576,498262695,498314810,498365940,498416104,498465319,498513604,498560976,498607452,498653050,498697785,498741674,498784733,498826978,498868423,498909084,498948976,498988113,499026509,499064179,499101136,499137393,499172964,499207862,499242099,499275688,499308641,499340970,499372686,499403802,499434328,499464276,499493657,499522481,499550759,499578502,499605719,499632420,499658615,499684314,499709526,499734260,499758525,499782330,499805684,499828596,499851073,499873124,499894757,499915980,499936801,499957227,499977266,499996925,500016211,500035131,500053692,500071901,500089765,500107290,500124483,500141350,500157897,500174130,500190055,500205678,500221004,500236040,500250790,500265261,500279457,500293384,500307047,500320450,500333599,500346498,500359153,500371568,500383747,500395695,500407416,500418915,500430195,500441261,500452117,500462767,500473215,500483465,500493520,500503384,500513061,500522554,500531867,500541003,500549966,500558759,500567385,500575847,500584149,500592293,500600282,500608120,500615809,500623352,500630752,500638011,500645132,500652118,500658971,500665694,500672290,500678760,500685108,500691335,500697444,500703437,500709316,500715083,500720741,500726291,500731736,500737078,500742318,500747459,500752502,500757449,500762302,500767063,500771734,500776316,500780811,500785220,500789546,500793790,500797953,500802037,500806043,500809973,500813829,500817611,500821321,500824961,500828532,500832035,500835471,500838842,500842149,500845393,500848576,500851698,500854761,500857766,500860714,500863606,500866443,500869226,500871956,500874634,500877261,500879838,500882366,500884846,500887279,500889666,500892008,500894305,500896558,500898769,500900938,500903065,500905152,500907199,500909207,500911177,500913110,500915006,500916866,500918691,500920481,500922237,500923960,500925650,500927308,500928934,500930529,500932094,500933629,500935135,500936613,500938063,500939485,500940880,500942248,500943590,500944907,500946199,500947466,500948709,500949929,500951125,500952299,500953450,500954580,500955688,500956775,500957841,500958887,500959913,500960920,500961908,500962877,500963827,500964759,500965674,500966571,500967451,500968314,500969161,500969992,500970807,500971607,500972391,500973160,500973915,500974656,500975382,500976095,500976794,500977480,500978153,500978813,500979460,500980095,500980718,500981329,500981929,500982517,500983094,500983660,500984215,500984760,500985294,500985818,500986332,500986836,500987331,500987816,500988292,500988759,500989217,500989667,500990108,500990541,500990965,500991381,500991789,500992190,500992583,500992968,500993346,500993717,500994081,500994438,500994788,500995132,500995469,500995800,500996124,500996442,500996754,500997060,500997360,500997655,500997944,500998227,500998505,500998778,500999046,500999309,500999567,500999820,501000068,501000311,501000549,501000783,501001012,501001237,501001458,501001675,501001887,501002095,501002299,501002500,501002697,501002890,501003079,501003265,501003447,501003626,501003801,501003973,501004142,501004307,501004469,501004628,501004784,501004937,501005087,501005234,501005379,501005521,501005660,501005796,501005930,501006061,501006190,501006316,501006440,501006562,501006681,501006798,501006913,501007026,501007136,501007244,501007350,501007454,501007556,501007656,501007754,501007850,501007945,501008038,501008129,501008218,501008306,501008392,501008476,501008559,501008640,501008720,501008798,501008875,501008950,501009024,501009096,501009167,501009237,501009305,501009372,501009438,501009502,501009565,501009627,501009688,501009748,501009806,501009863,501009919,501009974,501010028,501010081,501010133,501010184,501010234,501010283,501010331,501010378,501010424,501010469,501010514,501010558,501010601,501010643,501010684,501010724,501010764,501010803,501010841,501010878,501010915,501010951,501010986,501011021,501011055,501011088,501011121,501011153,501011184,501011215,501011245,501011275,501011304,501011332,501011360,501011387,501011414,501011440,501011466,501011491,501011516,501011540,501011564,501011587,501011610,501011633,501011655,501011677,501011698,501011719,501011739,501011759,501011779,501011798,501011817,501011835,501011853,501011871,501011888,501011905,501011922,501011938,501011954,501011970,501011985,501012000,501012015,501012030,501012044,501012058,501012072,501012085,501012098,501012111,501012124,501012136,501012148,501012160,501012172,501012183,501012194,501012205,501012216,501012227,501012237,501012247,501012257,501012267,501012277,501012286,501012295,501012304,501012313,501012322,501012330,501012338,501012346,501012354,501012362,501012370,501012378,501012385,501012392,501012399,501012406,501012413,501012420,501012427,501012433,501012439,501012445,501012451,501012457,501012463,501012469,501012475,501012480,501012485,501012490,501012495,501012500,501012505,501012510,501012515,501012520,501012524,501012528,501012532,501012536,501012540,501012544,501012548,501012552,501012556,501012560,501012564,501012568,501012571,501012574,501012577,501012580,501012583,501012586,501012589,501012592,501012595,501012598,501012601,501012604,501012607,501012610,501012613,501012615,501012617,501012619,501012621,501012623,501012625,501012627,501012629,501012631,501012633,501012635,501012637,501012639,501012641,501012643,501012645,501012647,501012649,501012651,501012653,501012655,501012656,501012657,501012658,501012659,501012660,501012661,501012662,501012663,501012664,501012665,501012666,501012667,501012668,501012669,501012670,501012671,501012672,501012673,501012674,501012675,501012676,501012677,501012678,501012679,501012680,501012681,501012682,501012683,501012684,501012685,501012686,501012687,501012688,501012689,501012690,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691,501012691 //Job - 2nd Classes -50,7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4032:4044:4049,1,144,184,284,348,603,887,1096,1598,2540,3676,4290,4946,6679,9492,12770,14344,16005,20642,27434,35108,38577,42206,52708,66971,82688,89544,96669,117821,144921,174201,186677,199584,238617,286366,337147,358435,380376,447685,526989,610246,704689,811527,932059,1067681,1219884,1390260,1580501,1792401,2027857,2288870,2577542,2896079,3246785,3632064,4054414,4516427,5020783,5570245,6167657,6815936,7518065,8277089,9096106,9978260,10926733,11944736,13035502,14202274,15448298,16776813,18191041,19694176,21289377,22979756,24768369,26658206,28652182,30753126,32963775,35286762,37724609,40279720,42954371,45750705,48670723,51716280,54889077,58190657,61622401,65185522,68881063,72709894,76672708,80770021,85002169,89369310,93871421,98508300,103279567,108184665,113222861,118393251,123694760,129126148,134686012,140372791,146184770,152120084,158176725,164352547,170645270,177052488,183571672,190200181,196935263,203774065,210713640,217750950,224882876,232106223,239417728,246814065,254291853,261847661,269478017,277179412,284948306,292781137,300674324,308624274,316627388,324680066,332778713,340919742,349099582,357314681,365561510,373836570,382136392,390457544,398796635,407150316,415515285,423888291,432266134,440645671,449023816,457397543,465763888,474119952,482462902,490789971,499098461,507385745,515649266,523886539,532095151,540272763,548417108,556525995,564597304,572628991,580619086,588565690,596466980,604321205,612126687,619881818,627585062,635234954,642830098,650369167,657850901,665274107,672637658,679940491,687181606,694360067,701474996,708525577,715511052,722430719,729283933,736070103,742788691,749439211,756021226,762534350,768978243,775352612,781657209,787891828,794056307,800150524,806174396,812127878,818010962,823823676,829566082,835238274,840840378,846372551,851834978,857227874,862551478,867806057,872991902,878109327,883158668,888140283,893054550,897901867,902682649,907397329,912046357,916630197,921149329,925604246,929995454,934323471,938588826,942792060,946933722,951014371,955034574,958994906,962895949,966738291,970522526,974249254,977919079,981532609,985090456,988593235,992041563,995436060,998777348,1002066049,1005302786,1008488184,1011622866,1014707457,1017742580,1020728856,1023666907,1026557352,1029400809,1032197893,1034949218,1037655393,1040317027,1042934723,1045509083,1048040705,1050530182,1052978105,1055385060,1057751629,1060078390,1062365915,1064614774,1066825530,1068998742,1071134965,1073234748,1075298634,1077327163,1079320868,1081280278,1083205916,1085098299,1086957939,1088785342,1090581010,1092345438,1094079115,1095782526,1097456149,1099100457,1100715917,1102302990,1103862133,1105393795,1106898420,1108376447,1109828309,1111254434,1112655243,1114031153,1115382574,1116709911,1118013563,1119293924,1120551383,1121786323,1122999122,1124190152,1125359779,1126508366,1127636269,1128743839,1129831422,1130899359,1131947986,1132977634,1133988629,1134981292,1135955938,1136912879,1137852422,1138774868,1139680514,1140569653,1141442572,1142299555,1143140880,1143966822,1144777651,1145573633,1146355029,1147122096,1147875088,1148614253,1149339836,1150052079,1150751218,1151437486,1152111113,1152772324,1153421341,1154058381,1154683659,1155297386,1155899769,1156491012,1157071316,1157640877,1158199889,1158748542,1159287023,1159815516,1160334201,1160843257,1161342858,1161833175,1162314377,1162786630,1163250097,1163704937,1164151308,1164589365,1165019259,1165441139,1165855152,1166261441,1166660148,1167051412,1167435370,1167812155,1168181900,1168544733,1168900782,1169250171,1169593023,1169929459,1170259597,1170583552,1170901439,1171213370,1171519455,1171819803,1172114519,1172403707,1172687470,1172965908,1173239120,1173507203,1173770252,1174028360,1174281619,1174530119,1174773949,1175013195,1175247943,1175478276,1175704277,1175926026,1176143603,1176357085,1176566548,1176772068,1176973718,1177171570,1177365695,1177556163,1177743042,1177926399,1178106300,1178282809,1178455990,1178625906,1178792617,1178956183,1179116664,1179274117,1179428599,1179580165,1179728870,1179874768,1180017912,1180158353,1180296142,1180431328,1180563961,1180694088,1180821757,1180947013,1181069902,1181190469,1181308757,1181424809,1181538667,1181650373,1181759966,1181867487,1181972975,1182076467,1182178002,1182277616,1182375346,1182471227,1182565293,1182657579,1182748119,1182836945,1182924090,1183009586,1183093463,1183175752,1183256483,1183335686,1183413389,1183489621,1183564409,1183637781,1183709763,1183780382,1183849663,1183917632,1183984313,1184049731,1184113909,1184176871,1184238640,1184299239,1184358689,1184417013,1184474231,1184530365,1184585435,1184639461,1184692463,1184744460,1184795471,1184845515,1184894611,1184942776,1184990027,1185036382,1185081858,1185126472,1185170240,1185213178,1185255302,1185296627,1185337168,1185376940,1185415958,1185454236,1185491788,1185528627,1185564767,1185600222,1185635004,1185669126,1185702601,1185735441,1185767658,1185799263,1185830269,1185860686,1185890526,1185919800,1185948518,1185976691,1186004330,1186031444,1186058044,1186084139,1186109739,1186134853,1186159490,1186183659,1186207370,1186230631,1186253450,1186275836,1186297797,1186319341,1186340476,1186361210,1186381550,1186401504,1186421079,1186440283,1186459122,1186477604,1186495735,1186513521,1186530970,1186548087,1186564879,1186581353,1186597514,1186613368,1186628921,1186644179,1186659147,1186673831,1186688236,1186702367,1186716230,1186729830,1186743172,1186756260,1186769100,1186781696,1186794053,1186806175,1186818067,1186829733,1186841177,1186852404,1186863418,1186874223,1186884822,1186895220,1186905421,1186915428,1186925245,1186934875,1186944322,1186953590,1186962682,1186971601,1186980351,1186988935,1186997356,1187005617,1187013721,1187021671,1187029470,1187037121,1187044626,1187051989,1187059212,1187066298,1187073249,1187080068,1187086758,1187093321,1187099759,1187106075,1187112271,1187118349,1187124311,1187130160,1187135898,1187141527,1187147049,1187152466,1187157780,1187162993,1187168107,1187173124,1187178046,1187182874,1187187611,1187192258,1187196816,1187201288,1187205675,1187209978,1187214200,1187218341,1187222404,1187226390,1187230300,1187234136,1187237899,1187241590,1187245211,1187248763,1187252248,1187255667,1187259021,1187262311,1187265538,1187268704,1187271810,1187274857,1187277846,1187280778,1187283655,1187286477,1187289245,1187291961,1187294625,1187297238,1187299802,1187302317,1187304784,1187307204,1187309578,1187311907,1187314192,1187316434,1187318633,1187320790,1187322906,1187324982,1187327019,1187329017,1187330977,1187332900,1187334786,1187336636,1187338451,1187340232,1187341979,1187343693,1187345374,1187347023,1187348641,1187350228,1187351785,1187353312,1187354810,1187356280,1187357722,1187359136,1187360524,1187361885,1187363220,1187364530,1187365815,1187367076,1187368313,1187369526,1187370716,1187371883,1187373028,1187374151,1187375253,1187376334,1187377395,1187378435,1187379456,1187380457,1187381439,1187382403,1187383348,1187384275,1187385185,1187386077,1187386952,1187387811,1187388653,1187389479,1187390290,1187391085,1187391865,1187392630,1187393381,1187394118,1187394841,1187395550,1187396245,1187396927,1187397596,1187398252,1187398896,1187399528,1187400148,1187400756,1187401352,1187401937,1187402511,1187403074,1187403626,1187404168,1187404699,1187405220,1187405731,1187406233,1187406725,1187407208,1187407682,1187408147,1187408603,1187409050,1187409489,1187409919,1187410341,1187410755,1187411161,1187411559,1187411950,1187412333,1187412709,1187413078,1187413440,1187413795,1187414143,1187414485,1187414820,1187415149,1187415472,1187415788,1187416098,1187416402,1187416701,1187416994,1187417281,1187417563,1187417840,1187418111,1187418377,1187418638,1187418894,1187419145,1187419391,1187419633,1187419870,1187420103,1187420331,1187420555,1187420775,1187420990,1187421201,1187421408,1187421611,1187421810,1187422006,1187422198,1187422386,1187422571,1187422752,1187422930,1187423104,1187423275,1187423443,1187423608,1187423769,1187423927,1187424082,1187424234,1187424383,1187424530,1187424674,1187424815,1187424953,1187425089,1187425222,1187425353,1187425481,1187425607,1187425730,1187425851,1187425970,1187426086,1187426200,1187426312,1187426422,1187426530,1187426636,1187426740,1187426842,1187426942,1187427040,1187427136,1187427230,1187427322,1187427413,1187427502,1187427589,1187427674,1187427758,1187427840,1187427921,1187428000,1187428078,1187428154,1187428229,1187428302,1187428374,1187428444,1187428513,1187428581,1187428648,1187428713,1187428777,1187428840,1187428902,1187428962,1187429021,1187429079,1187429136,1187429192,1187429247,1187429301,1187429354,1187429406,1187429457,1187429507,1187429556,1187429604,1187429651,1187429697,1187429742,1187429786,1187429829,1187429872,1187429914,1187429955,1187429995,1187430034,1187430073,1187430111,1187430148,1187430184,1187430220,1187430255,1187430289,1187430323,1187430356,1187430388,1187430420,1187430451,1187430482,1187430512,1187430541,1187430570,1187430598,1187430626,1187430653,1187430680,1187430706,1187430732,1187430757,1187430782,1187430806,1187430830,1187430853,1187430876,1187430898,1187430920,1187430942,1187430963,1187430984,1187431004,1187431024,1187431044,1187431063,1187431082,1187431100,1187431118,1187431136,1187431153,1187431170,1187431187,1187431203,1187431219,1187431235,1187431250,1187431265,1187431280,1187431295,1187431309,1187431323,1187431337,1187431350,1187431363,1187431376,1187431389,1187431401,1187431413,1187431425,1187431437,1187431448,1187431459,1187431470,1187431481,1187431492,1187431502,1187431512,1187431522,1187431532,1187431542,1187431551,1187431560,1187431569,1187431578,1187431587,1187431595,1187431603,1187431611,1187431619,1187431627,1187431635,1187431642,1187431649,1187431656,1187431663,1187431670,1187431677,1187431684,1187431690,1187431696,1187431702,1187431708,1187431714,1187431720,1187431726,1187431732,1187431737,1187431742,1187431747,1187431752,1187431757,1187431762,1187431767,1187431772,1187431777,1187431782,1187431786,1187431790,1187431794,1187431798,1187431802,1187431806,1187431810,1187431814,1187431818,1187431822,1187431826,1187431829,1187431832,1187431835,1187431838,1187431841,1187431844,1187431847,1187431850,1187431853,1187431856,1187431859,1187431862,1187431865,1187431868,1187431871,1187431873,1187431875,1187431877,1187431879,1187431881,1187431883,1187431885,1187431887,1187431889,1187431891,1187431893,1187431895,1187431897,1187431899,1187431901,1187431903,1187431905,1187431907,1187431909,1187431911,1187431913,1187431915,1187431916,1187431917,1187431918,1187431919,1187431920,1187431921,1187431922 +50,7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4049,1,144,184,284,348,603,887,1096,1598,2540,3676,4290,4946,6679,9492,12770,14344,16005,20642,27434,35108,38577,42206,52708,66971,82688,89544,96669,117821,144921,174201,186677,199584,238617,286366,337147,358435,380376,447685,526989,610246,704689,811527,932059,1067681,1219884,1390260,1580501,1792401,2027857,2288870,2577542,2896079,3246785,3632064,4054414,4516427,5020783,5570245,6167657,6815936,7518065,8277089,9096106,9978260,10926733,11944736,13035502,14202274,15448298,16776813,18191041,19694176,21289377,22979756,24768369,26658206,28652182,30753126,32963775,35286762,37724609,40279720,42954371,45750705,48670723,51716280,54889077,58190657,61622401,65185522,68881063,72709894,76672708,80770021,85002169,89369310,93871421,98508300,103279567,108184665,113222861,118393251,123694760,129126148,134686012,140372791,146184770,152120084,158176725,164352547,170645270,177052488,183571672,190200181,196935263,203774065,210713640,217750950,224882876,232106223,239417728,246814065,254291853,261847661,269478017,277179412,284948306,292781137,300674324,308624274,316627388,324680066,332778713,340919742,349099582,357314681,365561510,373836570,382136392,390457544,398796635,407150316,415515285,423888291,432266134,440645671,449023816,457397543,465763888,474119952,482462902,490789971,499098461,507385745,515649266,523886539,532095151,540272763,548417108,556525995,564597304,572628991,580619086,588565690,596466980,604321205,612126687,619881818,627585062,635234954,642830098,650369167,657850901,665274107,672637658,679940491,687181606,694360067,701474996,708525577,715511052,722430719,729283933,736070103,742788691,749439211,756021226,762534350,768978243,775352612,781657209,787891828,794056307,800150524,806174396,812127878,818010962,823823676,829566082,835238274,840840378,846372551,851834978,857227874,862551478,867806057,872991902,878109327,883158668,888140283,893054550,897901867,902682649,907397329,912046357,916630197,921149329,925604246,929995454,934323471,938588826,942792060,946933722,951014371,955034574,958994906,962895949,966738291,970522526,974249254,977919079,981532609,985090456,988593235,992041563,995436060,998777348,1002066049,1005302786,1008488184,1011622866,1014707457,1017742580,1020728856,1023666907,1026557352,1029400809,1032197893,1034949218,1037655393,1040317027,1042934723,1045509083,1048040705,1050530182,1052978105,1055385060,1057751629,1060078390,1062365915,1064614774,1066825530,1068998742,1071134965,1073234748,1075298634,1077327163,1079320868,1081280278,1083205916,1085098299,1086957939,1088785342,1090581010,1092345438,1094079115,1095782526,1097456149,1099100457,1100715917,1102302990,1103862133,1105393795,1106898420,1108376447,1109828309,1111254434,1112655243,1114031153,1115382574,1116709911,1118013563,1119293924,1120551383,1121786323,1122999122,1124190152,1125359779,1126508366,1127636269,1128743839,1129831422,1130899359,1131947986,1132977634,1133988629,1134981292,1135955938,1136912879,1137852422,1138774868,1139680514,1140569653,1141442572,1142299555,1143140880,1143966822,1144777651,1145573633,1146355029,1147122096,1147875088,1148614253,1149339836,1150052079,1150751218,1151437486,1152111113,1152772324,1153421341,1154058381,1154683659,1155297386,1155899769,1156491012,1157071316,1157640877,1158199889,1158748542,1159287023,1159815516,1160334201,1160843257,1161342858,1161833175,1162314377,1162786630,1163250097,1163704937,1164151308,1164589365,1165019259,1165441139,1165855152,1166261441,1166660148,1167051412,1167435370,1167812155,1168181900,1168544733,1168900782,1169250171,1169593023,1169929459,1170259597,1170583552,1170901439,1171213370,1171519455,1171819803,1172114519,1172403707,1172687470,1172965908,1173239120,1173507203,1173770252,1174028360,1174281619,1174530119,1174773949,1175013195,1175247943,1175478276,1175704277,1175926026,1176143603,1176357085,1176566548,1176772068,1176973718,1177171570,1177365695,1177556163,1177743042,1177926399,1178106300,1178282809,1178455990,1178625906,1178792617,1178956183,1179116664,1179274117,1179428599,1179580165,1179728870,1179874768,1180017912,1180158353,1180296142,1180431328,1180563961,1180694088,1180821757,1180947013,1181069902,1181190469,1181308757,1181424809,1181538667,1181650373,1181759966,1181867487,1181972975,1182076467,1182178002,1182277616,1182375346,1182471227,1182565293,1182657579,1182748119,1182836945,1182924090,1183009586,1183093463,1183175752,1183256483,1183335686,1183413389,1183489621,1183564409,1183637781,1183709763,1183780382,1183849663,1183917632,1183984313,1184049731,1184113909,1184176871,1184238640,1184299239,1184358689,1184417013,1184474231,1184530365,1184585435,1184639461,1184692463,1184744460,1184795471,1184845515,1184894611,1184942776,1184990027,1185036382,1185081858,1185126472,1185170240,1185213178,1185255302,1185296627,1185337168,1185376940,1185415958,1185454236,1185491788,1185528627,1185564767,1185600222,1185635004,1185669126,1185702601,1185735441,1185767658,1185799263,1185830269,1185860686,1185890526,1185919800,1185948518,1185976691,1186004330,1186031444,1186058044,1186084139,1186109739,1186134853,1186159490,1186183659,1186207370,1186230631,1186253450,1186275836,1186297797,1186319341,1186340476,1186361210,1186381550,1186401504,1186421079,1186440283,1186459122,1186477604,1186495735,1186513521,1186530970,1186548087,1186564879,1186581353,1186597514,1186613368,1186628921,1186644179,1186659147,1186673831,1186688236,1186702367,1186716230,1186729830,1186743172,1186756260,1186769100,1186781696,1186794053,1186806175,1186818067,1186829733,1186841177,1186852404,1186863418,1186874223,1186884822,1186895220,1186905421,1186915428,1186925245,1186934875,1186944322,1186953590,1186962682,1186971601,1186980351,1186988935,1186997356,1187005617,1187013721,1187021671,1187029470,1187037121,1187044626,1187051989,1187059212,1187066298,1187073249,1187080068,1187086758,1187093321,1187099759,1187106075,1187112271,1187118349,1187124311,1187130160,1187135898,1187141527,1187147049,1187152466,1187157780,1187162993,1187168107,1187173124,1187178046,1187182874,1187187611,1187192258,1187196816,1187201288,1187205675,1187209978,1187214200,1187218341,1187222404,1187226390,1187230300,1187234136,1187237899,1187241590,1187245211,1187248763,1187252248,1187255667,1187259021,1187262311,1187265538,1187268704,1187271810,1187274857,1187277846,1187280778,1187283655,1187286477,1187289245,1187291961,1187294625,1187297238,1187299802,1187302317,1187304784,1187307204,1187309578,1187311907,1187314192,1187316434,1187318633,1187320790,1187322906,1187324982,1187327019,1187329017,1187330977,1187332900,1187334786,1187336636,1187338451,1187340232,1187341979,1187343693,1187345374,1187347023,1187348641,1187350228,1187351785,1187353312,1187354810,1187356280,1187357722,1187359136,1187360524,1187361885,1187363220,1187364530,1187365815,1187367076,1187368313,1187369526,1187370716,1187371883,1187373028,1187374151,1187375253,1187376334,1187377395,1187378435,1187379456,1187380457,1187381439,1187382403,1187383348,1187384275,1187385185,1187386077,1187386952,1187387811,1187388653,1187389479,1187390290,1187391085,1187391865,1187392630,1187393381,1187394118,1187394841,1187395550,1187396245,1187396927,1187397596,1187398252,1187398896,1187399528,1187400148,1187400756,1187401352,1187401937,1187402511,1187403074,1187403626,1187404168,1187404699,1187405220,1187405731,1187406233,1187406725,1187407208,1187407682,1187408147,1187408603,1187409050,1187409489,1187409919,1187410341,1187410755,1187411161,1187411559,1187411950,1187412333,1187412709,1187413078,1187413440,1187413795,1187414143,1187414485,1187414820,1187415149,1187415472,1187415788,1187416098,1187416402,1187416701,1187416994,1187417281,1187417563,1187417840,1187418111,1187418377,1187418638,1187418894,1187419145,1187419391,1187419633,1187419870,1187420103,1187420331,1187420555,1187420775,1187420990,1187421201,1187421408,1187421611,1187421810,1187422006,1187422198,1187422386,1187422571,1187422752,1187422930,1187423104,1187423275,1187423443,1187423608,1187423769,1187423927,1187424082,1187424234,1187424383,1187424530,1187424674,1187424815,1187424953,1187425089,1187425222,1187425353,1187425481,1187425607,1187425730,1187425851,1187425970,1187426086,1187426200,1187426312,1187426422,1187426530,1187426636,1187426740,1187426842,1187426942,1187427040,1187427136,1187427230,1187427322,1187427413,1187427502,1187427589,1187427674,1187427758,1187427840,1187427921,1187428000,1187428078,1187428154,1187428229,1187428302,1187428374,1187428444,1187428513,1187428581,1187428648,1187428713,1187428777,1187428840,1187428902,1187428962,1187429021,1187429079,1187429136,1187429192,1187429247,1187429301,1187429354,1187429406,1187429457,1187429507,1187429556,1187429604,1187429651,1187429697,1187429742,1187429786,1187429829,1187429872,1187429914,1187429955,1187429995,1187430034,1187430073,1187430111,1187430148,1187430184,1187430220,1187430255,1187430289,1187430323,1187430356,1187430388,1187430420,1187430451,1187430482,1187430512,1187430541,1187430570,1187430598,1187430626,1187430653,1187430680,1187430706,1187430732,1187430757,1187430782,1187430806,1187430830,1187430853,1187430876,1187430898,1187430920,1187430942,1187430963,1187430984,1187431004,1187431024,1187431044,1187431063,1187431082,1187431100,1187431118,1187431136,1187431153,1187431170,1187431187,1187431203,1187431219,1187431235,1187431250,1187431265,1187431280,1187431295,1187431309,1187431323,1187431337,1187431350,1187431363,1187431376,1187431389,1187431401,1187431413,1187431425,1187431437,1187431448,1187431459,1187431470,1187431481,1187431492,1187431502,1187431512,1187431522,1187431532,1187431542,1187431551,1187431560,1187431569,1187431578,1187431587,1187431595,1187431603,1187431611,1187431619,1187431627,1187431635,1187431642,1187431649,1187431656,1187431663,1187431670,1187431677,1187431684,1187431690,1187431696,1187431702,1187431708,1187431714,1187431720,1187431726,1187431732,1187431737,1187431742,1187431747,1187431752,1187431757,1187431762,1187431767,1187431772,1187431777,1187431782,1187431786,1187431790,1187431794,1187431798,1187431802,1187431806,1187431810,1187431814,1187431818,1187431822,1187431826,1187431829,1187431832,1187431835,1187431838,1187431841,1187431844,1187431847,1187431850,1187431853,1187431856,1187431859,1187431862,1187431865,1187431868,1187431871,1187431873,1187431875,1187431877,1187431879,1187431881,1187431883,1187431885,1187431887,1187431889,1187431891,1187431893,1187431895,1187431897,1187431899,1187431901,1187431903,1187431905,1187431907,1187431909,1187431911,1187431913,1187431915,1187431916,1187431917,1187431918,1187431919,1187431920,1187431921,1187431922 //Job - Super Novice 99,23,1,30,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,328955,377083,431132,491676,559324,634723,718557,811549,914458,1028082,1153255,1290848,1441766,1606949,1787369,1984031,2197968,2430240,2681934,2954159,3248044,3564736,3905397,4271200,4663326,5082962,5531297,6009517,6518804,7060331,7635258,8244729,8889869,9571780,10291536,11050182,11848729,12688151,13569383,14493317,15460800,16472628,17529549,18632256,19781387,20977523,22221186,23512836,24852871,26241627,27679375,29166322,30702608,32288308,33923432,35607923,37341659,39124453,40956055,42836150,44764361,46740250,48763319,50833011,52948714,55109760,57315427,59564942,61857484,64192184,66568128,68984360,71439882,73933660,76464624,79031670,81633664,84269444,86937821,89637583,92367498,95126314,97912764,100725566,103563428,106425047,109309113,112214313,115139328,118082841,121043535,124020096,127011214,130015587,133031921,136058931,139095344,142139901,145191355,148248476,151310051,154374884,157441798,160509638,163577267,166643572,169707462,172767868,175823747,178874080,181917872,184954154,187981983,191000442,194008641,197005716,199990830,202963174,205921964,208866445,211795888,214709591,217606880,220487106,223349647,226193908,229019320,231825340,234611449,237377155,240121991,242845513,245547302,248226962,250884122,253518432,256129566,258717218,261281106,263820967,266336559,268827661,271294071,273735605,276152100,278543408,280909401,283249967,285565011,287854454,290118232,292356296,294568612,296755160,298915934,301050940,303160198,305243739,307301606,309333854,311340547,313321762,315277584,317208107,319113436,320993684,322848972,324679429,326485191,328266402,330023212,331755778,333464263,335148836,336809671,338446947,340060848,341651562,343219283,344764207,346286534,347786469,349264218,350719990,352153998,353566457,354957584,356327598,357676720,359005172,360313177,361600961,362868749,364116768,365345245,366554409,367744487,368915708,370068300,371202492,372318512,373416587,374496946,375559815,376605421,377633989,378645744,379640909,380619707,381582360,382529088,383460111,384375646,385275910,386161118,387031483,387887217,388728531,389555633,390368730,391168027,391953728,392726034,393485145,394231258,394964570,395685274,396393563,397089626,397773652,398445826,399106332,399755353,400393068,401019655,401635289,402240145,402834393,403418204,403991744,404555179,405108673,405652386,406186478,406711105,407226423,407732584,408229739,408718037,409197625,409668648,410131248,410585566,411031741,411469910,411900208,412322767,412737719,413145193,413545315,413938212,414324006,414702820,415074773,415439983,415798566,416150637,416496308,416835690,417168893,417496024,417817188,418132490,418442033,418745917,419044242,419337105,419624602,419906829,420183878,420455840,420722806,420984864,421242102,421494605,421742458,421985743,422224542,422458935,422689001,422914818,423136461,423354006,423567526,423777094,423982781,424184657,424382791,424577250,424768101,424955409,425139238,425319652,425496712,425670480,425841015,426008376,426172621,426333807,426491990,426647225,426799565,426949063,427095772,427239742,427381024,427519667,427655720,427789230,427920243,428048806,428174964,428298761,428420241,428539446,428656418,428771199,428883829,428994348,429102794,429209207,429313623,429416080,429516614,429615261,429712056,429807033,429900226,429991668,430081391,430169428,430255809,430340566,430423729,430505327,430585390,430663946,430741024,430816650,430890852,430963657,431035091,431105179,431173946,431241417,431307617,431372569,431436296,431498821,431560167,431620356,431679410,431737350,431794196,431849969,431904690,431958378,432011052,432062732,432113436,432163182,432211988,432259872,432306852,432352944,432398165,432442532,432486060,432528765,432570663,432611769,432652098,432691664,432730482,432768566,432805929,432842585,432878548,432913831,432948446,432982406,433015723,433048410,433080478,433111939,433142805,433173086,433202794,433231939,433260533,433288585,433316106,433343106,433369594,433395581,433421075,433446086,433470624,433494697,433518314,433541483,433564213,433586512,433608389,433629851,433650906,433671562,433691827,433711708,433731212,433750346,433769117,433787533,433805599,433823323,433840711,433857769,433874504,433890921,433907027,433922828,433938329,433953536,433968454,433983089,433997447,434011533,434025351,434038907,434052206,434065253,434078052,434090608,434102926,434115010,434126865,434138495,434149905,434161098,434172079,434182851,434193419,434203786,434213957,434223935,434233723,434243325,434252745,434261986,434271052,434279946,434288671,434297230,434305627,434313865,434321946,434329874,434337651,434345281,434352766,434360109,434367312,434374379,434381311,434388112,434394784,434401329,434407750,434414049,434420228,434426290,434432237,434438071,434443794,434449408,434454916,434460319,434465620,434470820,434475921,434480925,434485834,434490650,434495375,434500010,434504557,434509017,434513393,434517686,434521897,434526028,434530081,434534057,434537957,434541783,434545536,434549218,434552830,434556374,434559850,434563260,434566605,434569887,434573107,434576265,434579363,434582403,434585385,434588310,434591180,434593995,434596757,434599466,434602124,434604731,434607289,434609798,434612259,434614674,434617043,434619367,434621647,434623883,434626077,434628229,434630340,434632411,434634443,434636436,434638391,434640309,434642191,434644037,434645848,434647624,434649367,434651077,434652754,434654399,434656013,434657596,434659149,434660673,434662168,434663634,434665072,434666483,434667867,434669225,434670557,434671864,434673146,434674404,434675638,434676848,434678035,434679200,434680343,434681464,434682564,434683643,434684701,434685739,434686757,434687756,434688736,434689697,434690640,434691565,434692473,434693363,434694236,434695093,434695934,434696759,434697568,434698362,434699140,434699904,434700653,434701388,434702109,434702816,434703510,434704191,434704859,434705514,434706156,434706786,434707404,434708011,434708606,434709190,434709763,434710325,434710876,434711417,434711947,434712467,434712977,434713478,434713969,434714451,434714924,434715388,434715843,434716289,434716727,434717156,434717577,434717990,434718395,434718793,434719183,434719566,434719941,434720309,434720670,434721024,434721372,434721713,434722047,434722375,434722697,434723013,434723323,434723627,434723925,434724217,434724504,434724785,434725061,434725332,434725598,434725859,434726115,434726366,434726612,434726853,434727090,434727322,434727550,434727773,434727992,434728207,434728418,434728625,434728828,434729027,434729222,434729414,434729602,434729786,434729967,434730144,434730318,434730489,434730656,434730820,434730981,434731139,434731294,434731446,434731595,434731741,434731885,434732026,434732164,434732299,434732432,434732562,434732690,434732815,434732938,434733059,434733177,434733293,434733407,434733519,434733629,434733737,434733842,434733945,434734046,434734146,434734244,434734340,434734434,434734526,434734616,434734705,434734792,434734877,434734961,434735043,434735123,434735202,434735279,434735355,434735430,434735503,434735575,434735645,434735714,434735782,434735848,434735913,434735977,434736040,434736101,434736161,434736220,434736278,434736335,434736391,434736446,434736500,434736553,434736605,434736656,434736706,434736755,434736803,434736850,434736896,434736941,434736985,434737028,434737071,434737113,434737154,434737194,434737233,434737272,434737310,434737347,434737383,434737419,434737454,434737488,434737522,434737555,434737587,434737619,434737650,434737681,434737711,434737740,434737769,434737797,434737825,434737852,434737879,434737905,434737931,434737956,434737981,434738005,434738029,434738052,434738075,434738097,434738119,434738140,434738161,434738182,434738202,434738222,434738241,434738260,434738279,434738297,434738315,434738333,434738350,434738367,434738384,434738400,434738416,434738432,434738447,434738462,434738477,434738491,434738505,434738519,434738533,434738546,434738559,434738572,434738585,434738597,434738609,434738621,434738633,434738644,434738655,434738666,434738677,434738688,434738698,434738708,434738718,434738728,434738738,434738747,434738756,434738765,434738774,434738783,434738791,434738799,434738807,434738815,434738823,434738831,434738838,434738845,434738852,434738859,434738866,434738873,434738880,434738886,434738892,434738898,434738904,434738910,434738916,434738922,434738928,434738933,434738938,434738943,434738948,434738953,434738958,434738963,434738968,434738973,434738978,434738982,434738986,434738990,434738994,434738998,434739002,434739006,434739010,434739014,434739018,434739022,434739025,434739028,434739031,434739034,434739037,434739040,434739043,434739046,434739049,434739052,434739055,434739058,434739061,434739064,434739067,434739069,434739071,434739073,434739075,434739077,434739079,434739081,434739083,434739085,434739087,434739089,434739091,434739093,434739095,434739097,434739099,434739101,434739103,434739105,434739107,434739109,434739110,434739111,434739112,434739113,434739114,434739115,434739116,434739117,434739118,434739119,434739120,434739121,434739122,434739123,434739124,434739125,434739126,434739127,434739128,434739129,434739130,434739131,434739132,434739133,434739134,434739135,434739136,434739137,434739138,434739139,434739140,434739141,434739142,434739143,434739144,434739145,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146 //Job - Novice High @@ -30,6 +30,6 @@ //Job - 1st Baby Classes 50,4024:4025:4026:4027:4028:4029:4046,1,30,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,328955,377083,431132,491676,559324,634723,718557,811549,914458,1028082,1153255,1290848,1441766,1606949,1787369,1984031,2197968,2430240,2681934,2954159,3248044,3564736,3905397,4271200,4663326,5082962,5531297,6009517,6518804,7060331,7635258,8244729,8889869,9571780,10291536,11050182,11848729,12688151,13569383,14493317,15460800,16472628,17529549,18632256,19781387,20977523,22221186,23512836,24852871,26241627,27679375,29166322,30702608,32288308,33923432,35607923,37341659,39124453,40956055,42836150,44764361,46740250,48763319,50833011,52948714,55109760,57315427,59564942,61857484,64192184,66568128,68984360,71439882,73933660,76464624,79031670,81633664,84269444,86937821,89637583,92367498,95126314,97912764,100725566,103563428,106425047,109309113,112214313,115139328,118082841,121043535,124020096,127011214,130015587,133031921,136058931,139095344,142139901,145191355,148248476,151310051,154374884,157441798,160509638,163577267,166643572,169707462,172767868,175823747,178874080,181917872,184954154,187981983,191000442,194008641,197005716,199990830,202963174,205921964,208866445,211795888,214709591,217606880,220487106,223349647,226193908,229019320,231825340,234611449,237377155,240121991,242845513,245547302,248226962,250884122,253518432,256129566,258717218,261281106,263820967,266336559,268827661,271294071,273735605,276152100,278543408,280909401,283249967,285565011,287854454,290118232,292356296,294568612,296755160,298915934,301050940,303160198,305243739,307301606,309333854,311340547,313321762,315277584,317208107,319113436,320993684,322848972,324679429,326485191,328266402,330023212,331755778,333464263,335148836,336809671,338446947,340060848,341651562,343219283,344764207,346286534,347786469,349264218,350719990,352153998,353566457,354957584,356327598,357676720,359005172,360313177,361600961,362868749,364116768,365345245,366554409,367744487,368915708,370068300,371202492,372318512,373416587,374496946,375559815,376605421,377633989,378645744,379640909,380619707,381582360,382529088,383460111,384375646,385275910,386161118,387031483,387887217,388728531,389555633,390368730,391168027,391953728,392726034,393485145,394231258,394964570,395685274,396393563,397089626,397773652,398445826,399106332,399755353,400393068,401019655,401635289,402240145,402834393,403418204,403991744,404555179,405108673,405652386,406186478,406711105,407226423,407732584,408229739,408718037,409197625,409668648,410131248,410585566,411031741,411469910,411900208,412322767,412737719,413145193,413545315,413938212,414324006,414702820,415074773,415439983,415798566,416150637,416496308,416835690,417168893,417496024,417817188,418132490,418442033,418745917,419044242,419337105,419624602,419906829,420183878,420455840,420722806,420984864,421242102,421494605,421742458,421985743,422224542,422458935,422689001,422914818,423136461,423354006,423567526,423777094,423982781,424184657,424382791,424577250,424768101,424955409,425139238,425319652,425496712,425670480,425841015,426008376,426172621,426333807,426491990,426647225,426799565,426949063,427095772,427239742,427381024,427519667,427655720,427789230,427920243,428048806,428174964,428298761,428420241,428539446,428656418,428771199,428883829,428994348,429102794,429209207,429313623,429416080,429516614,429615261,429712056,429807033,429900226,429991668,430081391,430169428,430255809,430340566,430423729,430505327,430585390,430663946,430741024,430816650,430890852,430963657,431035091,431105179,431173946,431241417,431307617,431372569,431436296,431498821,431560167,431620356,431679410,431737350,431794196,431849969,431904690,431958378,432011052,432062732,432113436,432163182,432211988,432259872,432306852,432352944,432398165,432442532,432486060,432528765,432570663,432611769,432652098,432691664,432730482,432768566,432805929,432842585,432878548,432913831,432948446,432982406,433015723,433048410,433080478,433111939,433142805,433173086,433202794,433231939,433260533,433288585,433316106,433343106,433369594,433395581,433421075,433446086,433470624,433494697,433518314,433541483,433564213,433586512,433608389,433629851,433650906,433671562,433691827,433711708,433731212,433750346,433769117,433787533,433805599,433823323,433840711,433857769,433874504,433890921,433907027,433922828,433938329,433953536,433968454,433983089,433997447,434011533,434025351,434038907,434052206,434065253,434078052,434090608,434102926,434115010,434126865,434138495,434149905,434161098,434172079,434182851,434193419,434203786,434213957,434223935,434233723,434243325,434252745,434261986,434271052,434279946,434288671,434297230,434305627,434313865,434321946,434329874,434337651,434345281,434352766,434360109,434367312,434374379,434381311,434388112,434394784,434401329,434407750,434414049,434420228,434426290,434432237,434438071,434443794,434449408,434454916,434460319,434465620,434470820,434475921,434480925,434485834,434490650,434495375,434500010,434504557,434509017,434513393,434517686,434521897,434526028,434530081,434534057,434537957,434541783,434545536,434549218,434552830,434556374,434559850,434563260,434566605,434569887,434573107,434576265,434579363,434582403,434585385,434588310,434591180,434593995,434596757,434599466,434602124,434604731,434607289,434609798,434612259,434614674,434617043,434619367,434621647,434623883,434626077,434628229,434630340,434632411,434634443,434636436,434638391,434640309,434642191,434644037,434645848,434647624,434649367,434651077,434652754,434654399,434656013,434657596,434659149,434660673,434662168,434663634,434665072,434666483,434667867,434669225,434670557,434671864,434673146,434674404,434675638,434676848,434678035,434679200,434680343,434681464,434682564,434683643,434684701,434685739,434686757,434687756,434688736,434689697,434690640,434691565,434692473,434693363,434694236,434695093,434695934,434696759,434697568,434698362,434699140,434699904,434700653,434701388,434702109,434702816,434703510,434704191,434704859,434705514,434706156,434706786,434707404,434708011,434708606,434709190,434709763,434710325,434710876,434711417,434711947,434712467,434712977,434713478,434713969,434714451,434714924,434715388,434715843,434716289,434716727,434717156,434717577,434717990,434718395,434718793,434719183,434719566,434719941,434720309,434720670,434721024,434721372,434721713,434722047,434722375,434722697,434723013,434723323,434723627,434723925,434724217,434724504,434724785,434725061,434725332,434725598,434725859,434726115,434726366,434726612,434726853,434727090,434727322,434727550,434727773,434727992,434728207,434728418,434728625,434728828,434729027,434729222,434729414,434729602,434729786,434729967,434730144,434730318,434730489,434730656,434730820,434730981,434731139,434731294,434731446,434731595,434731741,434731885,434732026,434732164,434732299,434732432,434732562,434732690,434732815,434732938,434733059,434733177,434733293,434733407,434733519,434733629,434733737,434733842,434733945,434734046,434734146,434734244,434734340,434734434,434734526,434734616,434734705,434734792,434734877,434734961,434735043,434735123,434735202,434735279,434735355,434735430,434735503,434735575,434735645,434735714,434735782,434735848,434735913,434735977,434736040,434736101,434736161,434736220,434736278,434736335,434736391,434736446,434736500,434736553,434736605,434736656,434736706,434736755,434736803,434736850,434736896,434736941,434736985,434737028,434737071,434737113,434737154,434737194,434737233,434737272,434737310,434737347,434737383,434737419,434737454,434737488,434737522,434737555,434737587,434737619,434737650,434737681,434737711,434737740,434737769,434737797,434737825,434737852,434737879,434737905,434737931,434737956,434737981,434738005,434738029,434738052,434738075,434738097,434738119,434738140,434738161,434738182,434738202,434738222,434738241,434738260,434738279,434738297,434738315,434738333,434738350,434738367,434738384,434738400,434738416,434738432,434738447,434738462,434738477,434738491,434738505,434738519,434738533,434738546,434738559,434738572,434738585,434738597,434738609,434738621,434738633,434738644,434738655,434738666,434738677,434738688,434738698,434738708,434738718,434738728,434738738,434738747,434738756,434738765,434738774,434738783,434738791,434738799,434738807,434738815,434738823,434738831,434738838,434738845,434738852,434738859,434738866,434738873,434738880,434738886,434738892,434738898,434738904,434738910,434738916,434738922,434738928,434738933,434738938,434738943,434738948,434738953,434738958,434738963,434738968,434738973,434738978,434738982,434738986,434738990,434738994,434738998,434739002,434739006,434739010,434739014,434739018,434739022,434739025,434739028,434739031,434739034,434739037,434739040,434739043,434739046,434739049,434739052,434739055,434739058,434739061,434739064,434739067,434739069,434739071,434739073,434739075,434739077,434739079,434739081,434739083,434739085,434739087,434739089,434739091,434739093,434739095,434739097,434739099,434739101,434739103,434739105,434739107,434739109,434739110,434739111,434739112,434739113,434739114,434739115,434739116,434739117,434739118,434739119,434739120,434739121,434739122,434739123,434739124,434739125,434739126,434739127,434739128,434739129,434739130,434739131,434739132,434739133,434739134,434739135,434739136,434739137,434739138,434739139,434739140,434739141,434739142,434739143,434739144,434739145,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146 //Job - 2nd Baby Classes -50,4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4032:4044:4049,1,144,184,284,348,603,887,1096,1598,2540,3676,4290,4946,6679,9492,12770,14344,16005,20642,27434,35108,38577,42206,52708,66971,82688,89544,96669,117821,144921,174201,186677,199584,238617,286366,337147,358435,380376,447685,526989,610246,704689,811527,932059,1067681,1219884,1390260,1580501,1792401,2027857,2288870,2577542,2896079,3246785,3632064,4054414,4516427,5020783,5570245,6167657,6815936,7518065,8277089,9096106,9978260,10926733,11944736,13035502,14202274,15448298,16776813,18191041,19694176,21289377,22979756,24768369,26658206,28652182,30753126,32963775,35286762,37724609,40279720,42954371,45750705,48670723,51716280,54889077,58190657,61622401,65185522,68881063,72709894,76672708,80770021,85002169,89369310,93871421,98508300,103279567,108184665,113222861,118393251,123694760,129126148,134686012,140372791,146184770,152120084,158176725,164352547,170645270,177052488,183571672,190200181,196935263,203774065,210713640,217750950,224882876,232106223,239417728,246814065,254291853,261847661,269478017,277179412,284948306,292781137,300674324,308624274,316627388,324680066,332778713,340919742,349099582,357314681,365561510,373836570,382136392,390457544,398796635,407150316,415515285,423888291,432266134,440645671,449023816,457397543,465763888,474119952,482462902,490789971,499098461,507385745,515649266,523886539,532095151,540272763,548417108,556525995,564597304,572628991,580619086,588565690,596466980,604321205,612126687,619881818,627585062,635234954,642830098,650369167,657850901,665274107,672637658,679940491,687181606,694360067,701474996,708525577,715511052,722430719,729283933,736070103,742788691,749439211,756021226,762534350,768978243,775352612,781657209,787891828,794056307,800150524,806174396,812127878,818010962,823823676,829566082,835238274,840840378,846372551,851834978,857227874,862551478,867806057,872991902,878109327,883158668,888140283,893054550,897901867,902682649,907397329,912046357,916630197,921149329,925604246,929995454,934323471,938588826,942792060,946933722,951014371,955034574,958994906,962895949,966738291,970522526,974249254,977919079,981532609,985090456,988593235,992041563,995436060,998777348,1002066049,1005302786,1008488184,1011622866,1014707457,1017742580,1020728856,1023666907,1026557352,1029400809,1032197893,1034949218,1037655393,1040317027,1042934723,1045509083,1048040705,1050530182,1052978105,1055385060,1057751629,1060078390,1062365915,1064614774,1066825530,1068998742,1071134965,1073234748,1075298634,1077327163,1079320868,1081280278,1083205916,1085098299,1086957939,1088785342,1090581010,1092345438,1094079115,1095782526,1097456149,1099100457,1100715917,1102302990,1103862133,1105393795,1106898420,1108376447,1109828309,1111254434,1112655243,1114031153,1115382574,1116709911,1118013563,1119293924,1120551383,1121786323,1122999122,1124190152,1125359779,1126508366,1127636269,1128743839,1129831422,1130899359,1131947986,1132977634,1133988629,1134981292,1135955938,1136912879,1137852422,1138774868,1139680514,1140569653,1141442572,1142299555,1143140880,1143966822,1144777651,1145573633,1146355029,1147122096,1147875088,1148614253,1149339836,1150052079,1150751218,1151437486,1152111113,1152772324,1153421341,1154058381,1154683659,1155297386,1155899769,1156491012,1157071316,1157640877,1158199889,1158748542,1159287023,1159815516,1160334201,1160843257,1161342858,1161833175,1162314377,1162786630,1163250097,1163704937,1164151308,1164589365,1165019259,1165441139,1165855152,1166261441,1166660148,1167051412,1167435370,1167812155,1168181900,1168544733,1168900782,1169250171,1169593023,1169929459,1170259597,1170583552,1170901439,1171213370,1171519455,1171819803,1172114519,1172403707,1172687470,1172965908,1173239120,1173507203,1173770252,1174028360,1174281619,1174530119,1174773949,1175013195,1175247943,1175478276,1175704277,1175926026,1176143603,1176357085,1176566548,1176772068,1176973718,1177171570,1177365695,1177556163,1177743042,1177926399,1178106300,1178282809,1178455990,1178625906,1178792617,1178956183,1179116664,1179274117,1179428599,1179580165,1179728870,1179874768,1180017912,1180158353,1180296142,1180431328,1180563961,1180694088,1180821757,1180947013,1181069902,1181190469,1181308757,1181424809,1181538667,1181650373,1181759966,1181867487,1181972975,1182076467,1182178002,1182277616,1182375346,1182471227,1182565293,1182657579,1182748119,1182836945,1182924090,1183009586,1183093463,1183175752,1183256483,1183335686,1183413389,1183489621,1183564409,1183637781,1183709763,1183780382,1183849663,1183917632,1183984313,1184049731,1184113909,1184176871,1184238640,1184299239,1184358689,1184417013,1184474231,1184530365,1184585435,1184639461,1184692463,1184744460,1184795471,1184845515,1184894611,1184942776,1184990027,1185036382,1185081858,1185126472,1185170240,1185213178,1185255302,1185296627,1185337168,1185376940,1185415958,1185454236,1185491788,1185528627,1185564767,1185600222,1185635004,1185669126,1185702601,1185735441,1185767658,1185799263,1185830269,1185860686,1185890526,1185919800,1185948518,1185976691,1186004330,1186031444,1186058044,1186084139,1186109739,1186134853,1186159490,1186183659,1186207370,1186230631,1186253450,1186275836,1186297797,1186319341,1186340476,1186361210,1186381550,1186401504,1186421079,1186440283,1186459122,1186477604,1186495735,1186513521,1186530970,1186548087,1186564879,1186581353,1186597514,1186613368,1186628921,1186644179,1186659147,1186673831,1186688236,1186702367,1186716230,1186729830,1186743172,1186756260,1186769100,1186781696,1186794053,1186806175,1186818067,1186829733,1186841177,1186852404,1186863418,1186874223,1186884822,1186895220,1186905421,1186915428,1186925245,1186934875,1186944322,1186953590,1186962682,1186971601,1186980351,1186988935,1186997356,1187005617,1187013721,1187021671,1187029470,1187037121,1187044626,1187051989,1187059212,1187066298,1187073249,1187080068,1187086758,1187093321,1187099759,1187106075,1187112271,1187118349,1187124311,1187130160,1187135898,1187141527,1187147049,1187152466,1187157780,1187162993,1187168107,1187173124,1187178046,1187182874,1187187611,1187192258,1187196816,1187201288,1187205675,1187209978,1187214200,1187218341,1187222404,1187226390,1187230300,1187234136,1187237899,1187241590,1187245211,1187248763,1187252248,1187255667,1187259021,1187262311,1187265538,1187268704,1187271810,1187274857,1187277846,1187280778,1187283655,1187286477,1187289245,1187291961,1187294625,1187297238,1187299802,1187302317,1187304784,1187307204,1187309578,1187311907,1187314192,1187316434,1187318633,1187320790,1187322906,1187324982,1187327019,1187329017,1187330977,1187332900,1187334786,1187336636,1187338451,1187340232,1187341979,1187343693,1187345374,1187347023,1187348641,1187350228,1187351785,1187353312,1187354810,1187356280,1187357722,1187359136,1187360524,1187361885,1187363220,1187364530,1187365815,1187367076,1187368313,1187369526,1187370716,1187371883,1187373028,1187374151,1187375253,1187376334,1187377395,1187378435,1187379456,1187380457,1187381439,1187382403,1187383348,1187384275,1187385185,1187386077,1187386952,1187387811,1187388653,1187389479,1187390290,1187391085,1187391865,1187392630,1187393381,1187394118,1187394841,1187395550,1187396245,1187396927,1187397596,1187398252,1187398896,1187399528,1187400148,1187400756,1187401352,1187401937,1187402511,1187403074,1187403626,1187404168,1187404699,1187405220,1187405731,1187406233,1187406725,1187407208,1187407682,1187408147,1187408603,1187409050,1187409489,1187409919,1187410341,1187410755,1187411161,1187411559,1187411950,1187412333,1187412709,1187413078,1187413440,1187413795,1187414143,1187414485,1187414820,1187415149,1187415472,1187415788,1187416098,1187416402,1187416701,1187416994,1187417281,1187417563,1187417840,1187418111,1187418377,1187418638,1187418894,1187419145,1187419391,1187419633,1187419870,1187420103,1187420331,1187420555,1187420775,1187420990,1187421201,1187421408,1187421611,1187421810,1187422006,1187422198,1187422386,1187422571,1187422752,1187422930,1187423104,1187423275,1187423443,1187423608,1187423769,1187423927,1187424082,1187424234,1187424383,1187424530,1187424674,1187424815,1187424953,1187425089,1187425222,1187425353,1187425481,1187425607,1187425730,1187425851,1187425970,1187426086,1187426200,1187426312,1187426422,1187426530,1187426636,1187426740,1187426842,1187426942,1187427040,1187427136,1187427230,1187427322,1187427413,1187427502,1187427589,1187427674,1187427758,1187427840,1187427921,1187428000,1187428078,1187428154,1187428229,1187428302,1187428374,1187428444,1187428513,1187428581,1187428648,1187428713,1187428777,1187428840,1187428902,1187428962,1187429021,1187429079,1187429136,1187429192,1187429247,1187429301,1187429354,1187429406,1187429457,1187429507,1187429556,1187429604,1187429651,1187429697,1187429742,1187429786,1187429829,1187429872,1187429914,1187429955,1187429995,1187430034,1187430073,1187430111,1187430148,1187430184,1187430220,1187430255,1187430289,1187430323,1187430356,1187430388,1187430420,1187430451,1187430482,1187430512,1187430541,1187430570,1187430598,1187430626,1187430653,1187430680,1187430706,1187430732,1187430757,1187430782,1187430806,1187430830,1187430853,1187430876,1187430898,1187430920,1187430942,1187430963,1187430984,1187431004,1187431024,1187431044,1187431063,1187431082,1187431100,1187431118,1187431136,1187431153,1187431170,1187431187,1187431203,1187431219,1187431235,1187431250,1187431265,1187431280,1187431295,1187431309,1187431323,1187431337,1187431350,1187431363,1187431376,1187431389,1187431401,1187431413,1187431425,1187431437,1187431448,1187431459,1187431470,1187431481,1187431492,1187431502,1187431512,1187431522,1187431532,1187431542,1187431551,1187431560,1187431569,1187431578,1187431587,1187431595,1187431603,1187431611,1187431619,1187431627,1187431635,1187431642,1187431649,1187431656,1187431663,1187431670,1187431677,1187431684,1187431690,1187431696,1187431702,1187431708,1187431714,1187431720,1187431726,1187431732,1187431737,1187431742,1187431747,1187431752,1187431757,1187431762,1187431767,1187431772,1187431777,1187431782,1187431786,1187431790,1187431794,1187431798,1187431802,1187431806,1187431810,1187431814,1187431818,1187431822,1187431826,1187431829,1187431832,1187431835,1187431838,1187431841,1187431844,1187431847,1187431850,1187431853,1187431856,1187431859,1187431862,1187431865,1187431868,1187431871,1187431873,1187431875,1187431877,1187431879,1187431881,1187431883,1187431885,1187431887,1187431889,1187431891,1187431893,1187431895,1187431897,1187431899,1187431901,1187431903,1187431905,1187431907,1187431909,1187431911,1187431913,1187431915,1187431916,1187431917,1187431918,1187431919,1187431920,1187431921,1187431922 +50,4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4049,1,144,184,284,348,603,887,1096,1598,2540,3676,4290,4946,6679,9492,12770,14344,16005,20642,27434,35108,38577,42206,52708,66971,82688,89544,96669,117821,144921,174201,186677,199584,238617,286366,337147,358435,380376,447685,526989,610246,704689,811527,932059,1067681,1219884,1390260,1580501,1792401,2027857,2288870,2577542,2896079,3246785,3632064,4054414,4516427,5020783,5570245,6167657,6815936,7518065,8277089,9096106,9978260,10926733,11944736,13035502,14202274,15448298,16776813,18191041,19694176,21289377,22979756,24768369,26658206,28652182,30753126,32963775,35286762,37724609,40279720,42954371,45750705,48670723,51716280,54889077,58190657,61622401,65185522,68881063,72709894,76672708,80770021,85002169,89369310,93871421,98508300,103279567,108184665,113222861,118393251,123694760,129126148,134686012,140372791,146184770,152120084,158176725,164352547,170645270,177052488,183571672,190200181,196935263,203774065,210713640,217750950,224882876,232106223,239417728,246814065,254291853,261847661,269478017,277179412,284948306,292781137,300674324,308624274,316627388,324680066,332778713,340919742,349099582,357314681,365561510,373836570,382136392,390457544,398796635,407150316,415515285,423888291,432266134,440645671,449023816,457397543,465763888,474119952,482462902,490789971,499098461,507385745,515649266,523886539,532095151,540272763,548417108,556525995,564597304,572628991,580619086,588565690,596466980,604321205,612126687,619881818,627585062,635234954,642830098,650369167,657850901,665274107,672637658,679940491,687181606,694360067,701474996,708525577,715511052,722430719,729283933,736070103,742788691,749439211,756021226,762534350,768978243,775352612,781657209,787891828,794056307,800150524,806174396,812127878,818010962,823823676,829566082,835238274,840840378,846372551,851834978,857227874,862551478,867806057,872991902,878109327,883158668,888140283,893054550,897901867,902682649,907397329,912046357,916630197,921149329,925604246,929995454,934323471,938588826,942792060,946933722,951014371,955034574,958994906,962895949,966738291,970522526,974249254,977919079,981532609,985090456,988593235,992041563,995436060,998777348,1002066049,1005302786,1008488184,1011622866,1014707457,1017742580,1020728856,1023666907,1026557352,1029400809,1032197893,1034949218,1037655393,1040317027,1042934723,1045509083,1048040705,1050530182,1052978105,1055385060,1057751629,1060078390,1062365915,1064614774,1066825530,1068998742,1071134965,1073234748,1075298634,1077327163,1079320868,1081280278,1083205916,1085098299,1086957939,1088785342,1090581010,1092345438,1094079115,1095782526,1097456149,1099100457,1100715917,1102302990,1103862133,1105393795,1106898420,1108376447,1109828309,1111254434,1112655243,1114031153,1115382574,1116709911,1118013563,1119293924,1120551383,1121786323,1122999122,1124190152,1125359779,1126508366,1127636269,1128743839,1129831422,1130899359,1131947986,1132977634,1133988629,1134981292,1135955938,1136912879,1137852422,1138774868,1139680514,1140569653,1141442572,1142299555,1143140880,1143966822,1144777651,1145573633,1146355029,1147122096,1147875088,1148614253,1149339836,1150052079,1150751218,1151437486,1152111113,1152772324,1153421341,1154058381,1154683659,1155297386,1155899769,1156491012,1157071316,1157640877,1158199889,1158748542,1159287023,1159815516,1160334201,1160843257,1161342858,1161833175,1162314377,1162786630,1163250097,1163704937,1164151308,1164589365,1165019259,1165441139,1165855152,1166261441,1166660148,1167051412,1167435370,1167812155,1168181900,1168544733,1168900782,1169250171,1169593023,1169929459,1170259597,1170583552,1170901439,1171213370,1171519455,1171819803,1172114519,1172403707,1172687470,1172965908,1173239120,1173507203,1173770252,1174028360,1174281619,1174530119,1174773949,1175013195,1175247943,1175478276,1175704277,1175926026,1176143603,1176357085,1176566548,1176772068,1176973718,1177171570,1177365695,1177556163,1177743042,1177926399,1178106300,1178282809,1178455990,1178625906,1178792617,1178956183,1179116664,1179274117,1179428599,1179580165,1179728870,1179874768,1180017912,1180158353,1180296142,1180431328,1180563961,1180694088,1180821757,1180947013,1181069902,1181190469,1181308757,1181424809,1181538667,1181650373,1181759966,1181867487,1181972975,1182076467,1182178002,1182277616,1182375346,1182471227,1182565293,1182657579,1182748119,1182836945,1182924090,1183009586,1183093463,1183175752,1183256483,1183335686,1183413389,1183489621,1183564409,1183637781,1183709763,1183780382,1183849663,1183917632,1183984313,1184049731,1184113909,1184176871,1184238640,1184299239,1184358689,1184417013,1184474231,1184530365,1184585435,1184639461,1184692463,1184744460,1184795471,1184845515,1184894611,1184942776,1184990027,1185036382,1185081858,1185126472,1185170240,1185213178,1185255302,1185296627,1185337168,1185376940,1185415958,1185454236,1185491788,1185528627,1185564767,1185600222,1185635004,1185669126,1185702601,1185735441,1185767658,1185799263,1185830269,1185860686,1185890526,1185919800,1185948518,1185976691,1186004330,1186031444,1186058044,1186084139,1186109739,1186134853,1186159490,1186183659,1186207370,1186230631,1186253450,1186275836,1186297797,1186319341,1186340476,1186361210,1186381550,1186401504,1186421079,1186440283,1186459122,1186477604,1186495735,1186513521,1186530970,1186548087,1186564879,1186581353,1186597514,1186613368,1186628921,1186644179,1186659147,1186673831,1186688236,1186702367,1186716230,1186729830,1186743172,1186756260,1186769100,1186781696,1186794053,1186806175,1186818067,1186829733,1186841177,1186852404,1186863418,1186874223,1186884822,1186895220,1186905421,1186915428,1186925245,1186934875,1186944322,1186953590,1186962682,1186971601,1186980351,1186988935,1186997356,1187005617,1187013721,1187021671,1187029470,1187037121,1187044626,1187051989,1187059212,1187066298,1187073249,1187080068,1187086758,1187093321,1187099759,1187106075,1187112271,1187118349,1187124311,1187130160,1187135898,1187141527,1187147049,1187152466,1187157780,1187162993,1187168107,1187173124,1187178046,1187182874,1187187611,1187192258,1187196816,1187201288,1187205675,1187209978,1187214200,1187218341,1187222404,1187226390,1187230300,1187234136,1187237899,1187241590,1187245211,1187248763,1187252248,1187255667,1187259021,1187262311,1187265538,1187268704,1187271810,1187274857,1187277846,1187280778,1187283655,1187286477,1187289245,1187291961,1187294625,1187297238,1187299802,1187302317,1187304784,1187307204,1187309578,1187311907,1187314192,1187316434,1187318633,1187320790,1187322906,1187324982,1187327019,1187329017,1187330977,1187332900,1187334786,1187336636,1187338451,1187340232,1187341979,1187343693,1187345374,1187347023,1187348641,1187350228,1187351785,1187353312,1187354810,1187356280,1187357722,1187359136,1187360524,1187361885,1187363220,1187364530,1187365815,1187367076,1187368313,1187369526,1187370716,1187371883,1187373028,1187374151,1187375253,1187376334,1187377395,1187378435,1187379456,1187380457,1187381439,1187382403,1187383348,1187384275,1187385185,1187386077,1187386952,1187387811,1187388653,1187389479,1187390290,1187391085,1187391865,1187392630,1187393381,1187394118,1187394841,1187395550,1187396245,1187396927,1187397596,1187398252,1187398896,1187399528,1187400148,1187400756,1187401352,1187401937,1187402511,1187403074,1187403626,1187404168,1187404699,1187405220,1187405731,1187406233,1187406725,1187407208,1187407682,1187408147,1187408603,1187409050,1187409489,1187409919,1187410341,1187410755,1187411161,1187411559,1187411950,1187412333,1187412709,1187413078,1187413440,1187413795,1187414143,1187414485,1187414820,1187415149,1187415472,1187415788,1187416098,1187416402,1187416701,1187416994,1187417281,1187417563,1187417840,1187418111,1187418377,1187418638,1187418894,1187419145,1187419391,1187419633,1187419870,1187420103,1187420331,1187420555,1187420775,1187420990,1187421201,1187421408,1187421611,1187421810,1187422006,1187422198,1187422386,1187422571,1187422752,1187422930,1187423104,1187423275,1187423443,1187423608,1187423769,1187423927,1187424082,1187424234,1187424383,1187424530,1187424674,1187424815,1187424953,1187425089,1187425222,1187425353,1187425481,1187425607,1187425730,1187425851,1187425970,1187426086,1187426200,1187426312,1187426422,1187426530,1187426636,1187426740,1187426842,1187426942,1187427040,1187427136,1187427230,1187427322,1187427413,1187427502,1187427589,1187427674,1187427758,1187427840,1187427921,1187428000,1187428078,1187428154,1187428229,1187428302,1187428374,1187428444,1187428513,1187428581,1187428648,1187428713,1187428777,1187428840,1187428902,1187428962,1187429021,1187429079,1187429136,1187429192,1187429247,1187429301,1187429354,1187429406,1187429457,1187429507,1187429556,1187429604,1187429651,1187429697,1187429742,1187429786,1187429829,1187429872,1187429914,1187429955,1187429995,1187430034,1187430073,1187430111,1187430148,1187430184,1187430220,1187430255,1187430289,1187430323,1187430356,1187430388,1187430420,1187430451,1187430482,1187430512,1187430541,1187430570,1187430598,1187430626,1187430653,1187430680,1187430706,1187430732,1187430757,1187430782,1187430806,1187430830,1187430853,1187430876,1187430898,1187430920,1187430942,1187430963,1187430984,1187431004,1187431024,1187431044,1187431063,1187431082,1187431100,1187431118,1187431136,1187431153,1187431170,1187431187,1187431203,1187431219,1187431235,1187431250,1187431265,1187431280,1187431295,1187431309,1187431323,1187431337,1187431350,1187431363,1187431376,1187431389,1187431401,1187431413,1187431425,1187431437,1187431448,1187431459,1187431470,1187431481,1187431492,1187431502,1187431512,1187431522,1187431532,1187431542,1187431551,1187431560,1187431569,1187431578,1187431587,1187431595,1187431603,1187431611,1187431619,1187431627,1187431635,1187431642,1187431649,1187431656,1187431663,1187431670,1187431677,1187431684,1187431690,1187431696,1187431702,1187431708,1187431714,1187431720,1187431726,1187431732,1187431737,1187431742,1187431747,1187431752,1187431757,1187431762,1187431767,1187431772,1187431777,1187431782,1187431786,1187431790,1187431794,1187431798,1187431802,1187431806,1187431810,1187431814,1187431818,1187431822,1187431826,1187431829,1187431832,1187431835,1187431838,1187431841,1187431844,1187431847,1187431850,1187431853,1187431856,1187431859,1187431862,1187431865,1187431868,1187431871,1187431873,1187431875,1187431877,1187431879,1187431881,1187431883,1187431885,1187431887,1187431889,1187431891,1187431893,1187431895,1187431897,1187431899,1187431901,1187431903,1187431905,1187431907,1187431909,1187431911,1187431913,1187431915,1187431916,1187431917,1187431918,1187431919,1187431920,1187431921,1187431922 //Job - Super Baby 99,4045,1,30,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,328955,377083,431132,491676,559324,634723,718557,811549,914458,1028082,1153255,1290848,1441766,1606949,1787369,1984031,2197968,2430240,2681934,2954159,3248044,3564736,3905397,4271200,4663326,5082962,5531297,6009517,6518804,7060331,7635258,8244729,8889869,9571780,10291536,11050182,11848729,12688151,13569383,14493317,15460800,16472628,17529549,18632256,19781387,20977523,22221186,23512836,24852871,26241627,27679375,29166322,30702608,32288308,33923432,35607923,37341659,39124453,40956055,42836150,44764361,46740250,48763319,50833011,52948714,55109760,57315427,59564942,61857484,64192184,66568128,68984360,71439882,73933660,76464624,79031670,81633664,84269444,86937821,89637583,92367498,95126314,97912764,100725566,103563428,106425047,109309113,112214313,115139328,118082841,121043535,124020096,127011214,130015587,133031921,136058931,139095344,142139901,145191355,148248476,151310051,154374884,157441798,160509638,163577267,166643572,169707462,172767868,175823747,178874080,181917872,184954154,187981983,191000442,194008641,197005716,199990830,202963174,205921964,208866445,211795888,214709591,217606880,220487106,223349647,226193908,229019320,231825340,234611449,237377155,240121991,242845513,245547302,248226962,250884122,253518432,256129566,258717218,261281106,263820967,266336559,268827661,271294071,273735605,276152100,278543408,280909401,283249967,285565011,287854454,290118232,292356296,294568612,296755160,298915934,301050940,303160198,305243739,307301606,309333854,311340547,313321762,315277584,317208107,319113436,320993684,322848972,324679429,326485191,328266402,330023212,331755778,333464263,335148836,336809671,338446947,340060848,341651562,343219283,344764207,346286534,347786469,349264218,350719990,352153998,353566457,354957584,356327598,357676720,359005172,360313177,361600961,362868749,364116768,365345245,366554409,367744487,368915708,370068300,371202492,372318512,373416587,374496946,375559815,376605421,377633989,378645744,379640909,380619707,381582360,382529088,383460111,384375646,385275910,386161118,387031483,387887217,388728531,389555633,390368730,391168027,391953728,392726034,393485145,394231258,394964570,395685274,396393563,397089626,397773652,398445826,399106332,399755353,400393068,401019655,401635289,402240145,402834393,403418204,403991744,404555179,405108673,405652386,406186478,406711105,407226423,407732584,408229739,408718037,409197625,409668648,410131248,410585566,411031741,411469910,411900208,412322767,412737719,413145193,413545315,413938212,414324006,414702820,415074773,415439983,415798566,416150637,416496308,416835690,417168893,417496024,417817188,418132490,418442033,418745917,419044242,419337105,419624602,419906829,420183878,420455840,420722806,420984864,421242102,421494605,421742458,421985743,422224542,422458935,422689001,422914818,423136461,423354006,423567526,423777094,423982781,424184657,424382791,424577250,424768101,424955409,425139238,425319652,425496712,425670480,425841015,426008376,426172621,426333807,426491990,426647225,426799565,426949063,427095772,427239742,427381024,427519667,427655720,427789230,427920243,428048806,428174964,428298761,428420241,428539446,428656418,428771199,428883829,428994348,429102794,429209207,429313623,429416080,429516614,429615261,429712056,429807033,429900226,429991668,430081391,430169428,430255809,430340566,430423729,430505327,430585390,430663946,430741024,430816650,430890852,430963657,431035091,431105179,431173946,431241417,431307617,431372569,431436296,431498821,431560167,431620356,431679410,431737350,431794196,431849969,431904690,431958378,432011052,432062732,432113436,432163182,432211988,432259872,432306852,432352944,432398165,432442532,432486060,432528765,432570663,432611769,432652098,432691664,432730482,432768566,432805929,432842585,432878548,432913831,432948446,432982406,433015723,433048410,433080478,433111939,433142805,433173086,433202794,433231939,433260533,433288585,433316106,433343106,433369594,433395581,433421075,433446086,433470624,433494697,433518314,433541483,433564213,433586512,433608389,433629851,433650906,433671562,433691827,433711708,433731212,433750346,433769117,433787533,433805599,433823323,433840711,433857769,433874504,433890921,433907027,433922828,433938329,433953536,433968454,433983089,433997447,434011533,434025351,434038907,434052206,434065253,434078052,434090608,434102926,434115010,434126865,434138495,434149905,434161098,434172079,434182851,434193419,434203786,434213957,434223935,434233723,434243325,434252745,434261986,434271052,434279946,434288671,434297230,434305627,434313865,434321946,434329874,434337651,434345281,434352766,434360109,434367312,434374379,434381311,434388112,434394784,434401329,434407750,434414049,434420228,434426290,434432237,434438071,434443794,434449408,434454916,434460319,434465620,434470820,434475921,434480925,434485834,434490650,434495375,434500010,434504557,434509017,434513393,434517686,434521897,434526028,434530081,434534057,434537957,434541783,434545536,434549218,434552830,434556374,434559850,434563260,434566605,434569887,434573107,434576265,434579363,434582403,434585385,434588310,434591180,434593995,434596757,434599466,434602124,434604731,434607289,434609798,434612259,434614674,434617043,434619367,434621647,434623883,434626077,434628229,434630340,434632411,434634443,434636436,434638391,434640309,434642191,434644037,434645848,434647624,434649367,434651077,434652754,434654399,434656013,434657596,434659149,434660673,434662168,434663634,434665072,434666483,434667867,434669225,434670557,434671864,434673146,434674404,434675638,434676848,434678035,434679200,434680343,434681464,434682564,434683643,434684701,434685739,434686757,434687756,434688736,434689697,434690640,434691565,434692473,434693363,434694236,434695093,434695934,434696759,434697568,434698362,434699140,434699904,434700653,434701388,434702109,434702816,434703510,434704191,434704859,434705514,434706156,434706786,434707404,434708011,434708606,434709190,434709763,434710325,434710876,434711417,434711947,434712467,434712977,434713478,434713969,434714451,434714924,434715388,434715843,434716289,434716727,434717156,434717577,434717990,434718395,434718793,434719183,434719566,434719941,434720309,434720670,434721024,434721372,434721713,434722047,434722375,434722697,434723013,434723323,434723627,434723925,434724217,434724504,434724785,434725061,434725332,434725598,434725859,434726115,434726366,434726612,434726853,434727090,434727322,434727550,434727773,434727992,434728207,434728418,434728625,434728828,434729027,434729222,434729414,434729602,434729786,434729967,434730144,434730318,434730489,434730656,434730820,434730981,434731139,434731294,434731446,434731595,434731741,434731885,434732026,434732164,434732299,434732432,434732562,434732690,434732815,434732938,434733059,434733177,434733293,434733407,434733519,434733629,434733737,434733842,434733945,434734046,434734146,434734244,434734340,434734434,434734526,434734616,434734705,434734792,434734877,434734961,434735043,434735123,434735202,434735279,434735355,434735430,434735503,434735575,434735645,434735714,434735782,434735848,434735913,434735977,434736040,434736101,434736161,434736220,434736278,434736335,434736391,434736446,434736500,434736553,434736605,434736656,434736706,434736755,434736803,434736850,434736896,434736941,434736985,434737028,434737071,434737113,434737154,434737194,434737233,434737272,434737310,434737347,434737383,434737419,434737454,434737488,434737522,434737555,434737587,434737619,434737650,434737681,434737711,434737740,434737769,434737797,434737825,434737852,434737879,434737905,434737931,434737956,434737981,434738005,434738029,434738052,434738075,434738097,434738119,434738140,434738161,434738182,434738202,434738222,434738241,434738260,434738279,434738297,434738315,434738333,434738350,434738367,434738384,434738400,434738416,434738432,434738447,434738462,434738477,434738491,434738505,434738519,434738533,434738546,434738559,434738572,434738585,434738597,434738609,434738621,434738633,434738644,434738655,434738666,434738677,434738688,434738698,434738708,434738718,434738728,434738738,434738747,434738756,434738765,434738774,434738783,434738791,434738799,434738807,434738815,434738823,434738831,434738838,434738845,434738852,434738859,434738866,434738873,434738880,434738886,434738892,434738898,434738904,434738910,434738916,434738922,434738928,434738933,434738938,434738943,434738948,434738953,434738958,434738963,434738968,434738973,434738978,434738982,434738986,434738990,434738994,434738998,434739002,434739006,434739010,434739014,434739018,434739022,434739025,434739028,434739031,434739034,434739037,434739040,434739043,434739046,434739049,434739052,434739055,434739058,434739061,434739064,434739067,434739069,434739071,434739073,434739075,434739077,434739079,434739081,434739083,434739085,434739087,434739089,434739091,434739093,434739095,434739097,434739099,434739101,434739103,434739105,434739107,434739109,434739110,434739111,434739112,434739113,434739114,434739115,434739116,434739117,434739118,434739119,434739120,434739121,434739122,434739123,434739124,434739125,434739126,434739127,434739128,434739129,434739130,434739131,434739132,434739133,434739134,434739135,434739136,434739137,434739138,434739139,434739140,434739141,434739142,434739143,434739144,434739145,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146,434739146 diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index e61e3a561..59fc3748c 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -369,7 +369,7 @@ //-- CR_HOLYCROSS
253,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
//-- CR_GRANDCROSS
-254,2000,1500,0,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
+254,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
//-- CR_DEVOTION
255,3000,0,0,0,30000:45000:60000:75000:90000
//-- CR_PROVIDENCE
@@ -390,7 +390,7 @@ //-- MO_INVESTIGATE
266,1000,500,0,0,0
//-- MO_FINGEROFFENSIVE
-267,1000,500,0,0,0
+267,1000,500,0:200:400:600:800,0,0
//-- MO_STEELBODY
268,5000,0,0,30000:60000:90000:120000:150000,0
//-- MO_BLADESTOP
@@ -504,8 +504,8 @@ //===== NPC Skills Part 2 ==================
-//-- NPC_DARKGRANDCROSS
-339,2000,1500,0,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
+//-- NPC_DARKGRANDNESS
+339,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000
//-- NPC_STOP
340,0,0,0,10000,0
//-- NPC_POWERUP
diff --git a/src/map/battle.c b/src/map/battle.c index d205034d4..79ec8bc68 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -439,34 +439,52 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag return damage*ratio/100;
}
-static int battle_walkdelay_sub(int tid, unsigned int tick, int id, int data)
+/*==========================================
+ * Applies walk delay to character, considering that
+ * if type is 0, this is a damage induced delay: if previous delay is active, do not change it.
+ * if type is 1, this is a skill induced delay: walk-delay may only be increased, not decreased.
+ *------------------------------------------
+ */
+int battle_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int type)
{
- struct block_list *bl = map_id2bl(id);
- if (!bl || status_isdead(bl))
- return 0;
+ unsigned int *canmove_tick=NULL;
+ if (delay <= 0) return 0;
switch (bl->type) {
case BL_PC:
- {
- struct map_session_data *sd = (struct map_session_data*)bl;
- if (sd->walktimer != -1)
- pc_stop_walking (sd,3);
- if (sd->canmove_tick < tick)
- sd->canmove_tick = tick + data;
- }
+ canmove_tick = &((TBL_PC*)bl)->canmove_tick;
break;
case BL_MOB:
- {
- struct mob_data *md = (struct mob_data*)bl;
- if (md->state.state == MS_WALK)
- mob_stop_walking(md,3);
- if (md->canmove_tick < tick)
- md->canmove_tick = tick + data;
- }
+ canmove_tick = &((TBL_MOB*)bl)->canmove_tick;
break;
+ case BL_NPC:
+ canmove_tick = &((TBL_NPC*)bl)->canmove_tick;
+ break;
+ }
+ if (!canmove_tick)
+ return 0;
+ if (type) {
+ if (DIFF_TICK(*canmove_tick, tick+delay) > 0)
+ return 0;
+ } else {
+ if (DIFF_TICK(*canmove_tick, tick) > 0)
+ return 0;
}
+ *canmove_tick = tick + delay;
+ return 1;
+}
+
+static int battle_walkdelay_sub(int tid, unsigned int tick, int id, int data)
+{
+ struct block_list *bl = map_id2bl(id);
+ if (!bl || status_isdead(bl))
+ return 0;
+
+ if (battle_set_walkdelay(bl, tick, data, 0))
+ battle_stopwalking(bl,3);
return 0;
}
+
/*==========================================
* Applies walk delay based on attack type. [Skotlex]
*------------------------------------------
@@ -489,31 +507,10 @@ int battle_walkdelay(struct block_list *bl, unsigned int tick, int adelay, int d if (delay <= 0)
return 0;
- //See if it makes sense to set this trigger.
- switch (bl->type) {
- case BL_PC:
- {
- struct map_session_data *sd = (struct map_session_data*)bl;
- if (DIFF_TICK(sd->canmove_tick, tick+adelay) > 0)
- return 0;
- if (!adelay) //No need of timer.
- sd->canmove_tick = tick + delay;
- break;
- }
- case BL_MOB:
- {
- struct mob_data *md = (struct mob_data*)bl;
- if (DIFF_TICK(md->canmove_tick, tick+adelay) > 0)
- return 0;
- if (!adelay) //No need of timer.
- md->canmove_tick = tick + delay;
- break;
- }
- default:
- return 0;
- }
if (adelay > 0)
add_timer(tick+adelay, battle_walkdelay_sub, bl->id, delay);
+ else
+ battle_set_walkdelay(bl, tick, delay, 0);
return 1;
}
@@ -580,10 +577,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i delay = 200;
else
delay = 100;
- if(sd)
- sd->canmove_tick = gettick() + delay;
- else if(md)
- md->canmove_tick = gettick() + delay;
+ battle_set_walkdelay(bl, gettick(), delay, 1);
if(sc->data[SC_SHRINK].timer != -1 && rand()%100<5*sc->data[SC_AUTOGUARD].val1)
skill_blown(bl,src,skill_get_blewcount(CR_SHRINK,1));
diff --git a/src/map/battle.h b/src/map/battle.h index 512179482..786db1d66 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -54,6 +54,7 @@ int battle_heal(struct block_list *bl,struct block_list *target,int hp,int sp,in int battle_stopattack(struct block_list *bl);
int battle_iswalking(struct block_list *bl);
int battle_stopwalking(struct block_list *bl,int type);
+int battle_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int type);
// 通常攻撃処理まとめ
int battle_weapon_attack( struct block_list *bl,struct block_list *target,
diff --git a/src/map/mob.c b/src/map/mob.c index 13df3a67c..529b75cea 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -741,7 +741,7 @@ static int mob_attack(struct mob_data *md,unsigned int tick,int data) //Use the attack delay for next can attack try
//But use the attack motion to know when it can start moving. [Skotlex]
md->attackabletime = tick + status_get_adelay(&md->bl);
- md->canmove_tick = tick + status_get_amotion(&md->bl);
+ battle_set_walkdelay(&md->bl, tick, status_get_amotion(&md->bl), 1);
md->timer=add_timer(md->attackabletime,mob_timer,md->bl.id,0);
md->state.state=MS_ATTACK;
diff --git a/src/map/npc.c b/src/map/npc.c index 3c3967762..a8765995e 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1472,12 +1472,8 @@ int npc_stop_walking(struct npc_data *nd,int type) }
if(type&0x01)
clif_fixnpcpos(nd);
- if(type&0x02) {
- int delay=status_get_dmotion(&nd->bl);
- unsigned int tick = gettick();
- if(nd->canmove_tick < tick)
- nd->canmove_tick = tick + delay;
- }
+ if(type&0x02)
+ battle_set_walkdelay(&nd->bl, gettick(), status_get_dmotion(&nd->bl), 1);
return 0;
}
diff --git a/src/map/pc.c b/src/map/pc.c index 04bd8a6d1..afe638f1b 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -360,6 +360,9 @@ int pc_can_move(struct map_session_data *sd) if ((sd->sc.option & OPTION_HIDE) && pc_checkskill(sd, RG_TUNNELDRIVE) <= 0)
return 0;
+ if (sd->skilltimer != -1 && pc_checkskill(sd, SA_FREECAST) <= 0)
+ return 0;
+
if (pc_issit(sd))
return 0; //Can't move while sitting...
diff --git a/src/map/skill.c b/src/map/skill.c index 217d9d3ec..a5a9242e5 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1688,7 +1688,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds pc_checkskill(sd, MO_CHAINCOMBO) > 0)
delay += 300 * battle_config.combo_delay_rate / 100;
sc_start4(src,SC_COMBO,100,MO_TRIPLEATTACK,skilllv,0,0,delay);
- sd->attackabletime = sd->canmove_tick = tick + delay;
+ sd->attackabletime = tick + delay;
+ battle_set_walkdelay(src, tick, delay, 1);
clif_combo_delay(src, delay);
if (sd->status.party_id>0) //bonus from SG_FRIEND [Komurka]
@@ -1702,7 +1703,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds (pc_checkskill(sd, MO_COMBOFINISH) > 0 && sd->spiritball > 0))
delay += 300 * battle_config.combo_delay_rate /100;
sc_start4(src,SC_COMBO,100,MO_CHAINCOMBO,skilllv,0,0,delay);
- sd->attackabletime = sd->canmove_tick = tick + delay;
+ sd->attackabletime = tick + delay;
+ battle_set_walkdelay(src, tick, delay, 1);
clif_combo_delay(src,delay);
break;
}
@@ -1717,7 +1719,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds ))
delay += 300 * battle_config.combo_delay_rate /100;
sc_start4(src,SC_COMBO,100,MO_COMBOFINISH,skilllv,0,0,delay);
- sd->attackabletime = sd->canmove_tick = tick + delay;
+ sd->attackabletime = tick + delay;
+ battle_set_walkdelay(src, tick, delay, 1);
clif_combo_delay(src,delay);
break;
}
@@ -1731,7 +1734,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds ))
delay += 300 * battle_config.combo_delay_rate /100;
sc_start4(src,SC_COMBO,100,CH_TIGERFIST,skilllv,0,0,delay);
- sd->attackabletime = sd->canmove_tick = tick + delay;
+ sd->attackabletime = tick + delay;
+ battle_set_walkdelay(src, tick, delay, 1);
clif_combo_delay(src,delay);
break;
}
@@ -1741,7 +1745,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds if(damage < status_get_hp(bl))
delay += 300 * battle_config.combo_delay_rate /100;
sc_start4(src,SC_COMBO,100,CH_CHAINCRUSH,skilllv,0,0,delay);
- sd->attackabletime = sd->canmove_tick = tick + delay;
+ sd->attackabletime = tick + delay;
+ battle_set_walkdelay(src, tick, delay, 1);
clif_combo_delay(src,delay);
break;
}
@@ -1765,7 +1770,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds case TK_DOWNKICK:
case TK_TURNKICK:
// Delay normal attack table until skill's delay has passed. Let's make it skip one attack motion. [Skotlex]
- sd->attackabletime = sd->canmove_tick = tick + status_get_amotion(&sd->bl);
+ sd->attackabletime = tick + status_get_amotion(&sd->bl);
+ battle_set_walkdelay(src, tick, status_get_amotion(&sd->bl), 1);
break;
case SL_STIN:
case SL_STUN:
@@ -2610,7 +2616,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s int i;
for (i = 1; i < sd->spiritball_old; i++)
skill_addtimerskill(src, tick + i * 200, bl->id, 0, 0, skillid, skilllv, BF_WEAPON, flag);
- sd->canmove_tick = tick + (sd->spiritball_old - 1) * 200;
+// sd->canmove_tick = tick + (sd->spiritball_old - 1) * 200; Should be handled by the canmove delay on skill_cast_db [Skotlex]
}
if (sc && sc->data[SC_BLADESTOP].timer != -1)
status_change_end(src,SC_BLADESTOP,-1);
@@ -2666,7 +2672,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s clif_movechar(sd);
if(dx < 0) dx = -dx;
if(dy < 0) dy = -dy;
- sd->attackabletime = sd->canmove_tick = tick + 100 + sd->speed * ((dx > dy)? dx:dy);
+ sd->attackabletime = tick + 100 + sd->speed * ((dx > dy)? dx:dy);
+ battle_set_walkdelay(src, tick, 100 + sd->speed * ((dx > dy)? dx:dy), 1);
if(sd->canact_tick < sd->canmove_tick)
sd->canact_tick = sd->canmove_tick;
sd->speed = speed;
@@ -3113,10 +3120,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case CR_GRANDCROSS:
case NPC_GRANDDARKNESS:
//These two are actually ground placed.
- if(sd)
- sd->canmove_tick = tick + 900;
- else if(md)
- mob_changestate(md,MS_DELAY,900);
return skill_castend_pos2(src,src->x,src->y,skillid,skilllv,tick,0);
}
tsc = status_get_sc(bl);
@@ -4755,8 +4758,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in sc_start(bl,type,100,skilllv,skill_time));
if (md)
mob_changestate(md,MS_DELAY,skill_time);
- else if (sd)
- sd->attackabletime = sd->canmove_tick = tick + skill_time;
+ else
+ battle_set_walkdelay(bl, tick, skill_time, 1);
}
break;
@@ -5547,7 +5550,7 @@ int skill_castend_id( int tid, unsigned int tick, int id,int data ) nullpo_retr(0, sd);
//Code cleanup.
-#define skill_failed(sd) { sd->skillid = sd->skilllv = sd->skillitem = sd->skillitemlv = -1; sd->canact_tick = sd->canmove_tick = tick; sd->skilltarget = 0; }
+#define skill_failed(sd) { sd->skillid = sd->skilllv = sd->skillitem = sd->skillitemlv = -1; sd->canact_tick = tick; sd->skilltarget = 0; }
if(sd->skillid != SA_CASTCANCEL && sd->skilltimer != tid )
{ /* タイマIDの確認 */
@@ -5654,7 +5657,7 @@ int skill_castend_id( int tid, unsigned int tick, int id,int data ) sd->canact_tick = tick;
else
sd->canact_tick = tick + skill_delayfix(&sd->bl, sd->skillid, sd->skilllv, 0);
- sd->canmove_tick = tick + skill_get_walkdelay(sd->skillid, sd->skilllv);
+ battle_set_walkdelay(&sd->bl, tick, skill_get_walkdelay(sd->skillid, sd->skilllv), 1);
if (skill_get_casttype(sd->skillid) == CAST_NODAMAGE)
skill_castend_nodamage_id(&sd->bl,bl,sd->skillid,sd->skilllv,tick,0);
else
@@ -5686,7 +5689,7 @@ int skill_castend_pos( int tid, unsigned int tick, int id,int data ) nullpo_retr(0, sd);
//Code cleanup.
-#define skill_failed(sd) { sd->skillid = sd->skilllv = sd->skillitem = sd->skillitemlv = -1; sd->canact_tick = sd->canmove_tick = tick; }
+#define skill_failed(sd) { sd->skillid = sd->skilllv = sd->skillitem = sd->skillitemlv = -1; sd->canact_tick = tick; }
if( sd->skilltimer != tid )
{ /* タイマIDの確認 */
@@ -5761,7 +5764,7 @@ int skill_castend_pos( int tid, unsigned int tick, int id,int data ) pc_stop_walking(sd,0);
sd->canact_tick = tick + skill_delayfix(&sd->bl, sd->skillid, sd->skilllv, 0);
- sd->canmove_tick = tick + skill_get_walkdelay(sd->skillid, sd->skilllv);
+ battle_set_walkdelay(&sd->bl, tick, skill_get_walkdelay(sd->skillid, sd->skilllv), 1);
skill_castend_pos2(&sd->bl,sd->skillx,sd->skilly,sd->skillid,sd->skilllv,tick,0);
@@ -7289,7 +7292,6 @@ static int skill_check_condition_char_sub (struct block_list *bl, va_list ap) struct map_session_data *sd;
struct map_session_data *tsd;
int *p_sd; //Contains the list of characters found.
- unsigned int tick = gettick();
nullpo_retr(0, bl);
nullpo_retr(0, ap);
@@ -7327,7 +7329,7 @@ static int skill_check_condition_char_sub (struct block_list *bl, va_list ap) default: //Warning: Assuming Ensemble Dance/Songs for code speed. [Skotlex]
{
int skilllv;
- if(pc_issit(tsd) || tsd->skilltimer!=-1 || tsd->canmove_tick > tick)
+ if(pc_issit(tsd) || !pc_can_move(tsd))
return 0;
if (sd->status.sex != tsd->status.sex &&
(tsd->class_&MAPID_UPPERMASK) == MAPID_BARDDANCER &&
@@ -8561,12 +8563,10 @@ int skill_use_id (struct map_session_data *sd, int target_id, int skill_num, int sd->skillx = 0;
sd->skilly = 0;
sd->canact_tick = tick + casttime + 100;
- //Recycling forcecast to store the skill's level. [Skotlex]
- sd->canmove_tick = tick + (casttime>0 && (forcecast = pc_checkskill(sd,SA_FREECAST)) > 0?0:casttime);
if (casttime > 0) {
sd->skilltimer = add_timer (tick + casttime, skill_castend_id, sd->bl.id, 0);
- if (forcecast > 0)
+ if ((forcecast = pc_checkskill(sd,SA_FREECAST)) > 0)
status_quick_recalc_speed (sd, SA_FREECAST, forcecast, 1);
else
pc_stop_walking(sd,0);
@@ -8678,11 +8678,10 @@ int skill_use_pos (struct map_session_data *sd, int skill_x, int skill_y, int sk sd->skilltarget = 0;
sd->canact_tick = tick + casttime + 100;
- sd->canmove_tick = tick + (casttime>0 && (skill = pc_checkskill(sd,SA_FREECAST))>0?0:casttime);
if (casttime > 0) {
sd->skilltimer = add_timer(tick + casttime, skill_castend_pos, sd->bl.id, 0);
- if (skill > 0)
+ if ((skill = pc_checkskill(sd,SA_FREECAST))>0)
status_quick_recalc_speed (sd, SA_FREECAST, skill, 1);
else
pc_stop_walking(sd,0);
@@ -8709,12 +8708,11 @@ int skill_castcancel (struct block_list *bl, int type) struct map_session_data *sd = (struct map_session_data *)bl;
unsigned long tick = gettick();
nullpo_retr(0, sd);
- sd->canact_tick = tick;
- sd->canmove_tick = tick;
if (sd->skilltimer != -1) {
if ((ret = pc_checkskill(sd,SA_FREECAST)) > 0) {
status_quick_recalc_speed(sd, SA_FREECAST, ret, 0); //Updated to use calc_speed [Skotlex]
}
+ sd->canact_tick = tick;
if (!type) {
if (skill_get_inf( sd->skillid ) & INF_GROUND_SKILL)
ret = delete_timer( sd->skilltimer, skill_castend_pos );
|