Added basic support for 4th and 4th-ex class (#6412)

This commit is contained in:
Lemongrass3110 2021-12-19 13:17:50 +01:00 committed by GitHub
parent 55a1ad2881
commit 6ddb09cbbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 3737 additions and 3 deletions

View File

@ -283,12 +283,19 @@ Body:
4064 Mechanic 4065 Guillotine Cross 4073 Royal Guard 4074 Sorcerer
4075 Minstrel 4076 Wanderer 4077 Sura 4078 Genetic
4079 Shadow Chaser
----- 4th Class -----
4252 Dragon Knight 4253 Meister 4254 Shadow Cross 4255 Arch Mage
4256 Cardinal 4257 Windhawk 4258 Imperial Guard 4259 Biolo
4260 Abyss Chaser 4261 Elemental Master 4262 Inquisitor 4263 Troubadour
4264 Trouvere
----- Expanded Class -----
23 Super Novice 24 Gunslinger 25 Ninja 4045 Super Baby
4046 Taekwon 4047 Star Gladiator 4049 Soul Linker 4050 Gangsi
4051 Death Knight 4052 Dark Collector 4190 Ex. Super Novice 4191 Ex. Super Baby
4211 Kagerou 4212 Oboro 4215 Rebellion 4218 Summoner
4239 Star Emperor 4240 Soul Reaper
4302 Sky Emperor 4303 Soul Ascetic 4304 Shinkiro 4305 Shiranui
4306 Night Watch 4307 Hyper Novice 4308 Spirit Handler
----- Baby Novice And Baby 1st Class -----
4023 Baby Novice 4024 Baby Swordman 4025 Baby Magician 4026 Baby Archer
4027 Baby Acolyte 4028 Baby Merchant 4029 Baby Thief

View File

@ -129,6 +129,26 @@
119: Soul Reaper
120: Baby Star Emperor
121: Baby Soul Reaper
122: Dragon Knight
123: Meister
124: Shadow Cross
125: Arch Mage
126: Cardinal
127: Windhawk
128: Imperial Guard
129: Biolo
130: Abyss Chaser
131: Elemental Master
132: Inquisitor
133: Troubadour
134: Trouvere
144: Sky Emperor
145: Soul Ascetic
146: Shinkiro
147: Shiranui
148: Night Watch
149: Hyper Novice
150: Spirit Handler
199: Unknown Job

View File

@ -876,7 +876,30 @@
797: This command is unavailable to non-4th class.
//798-899 free
//798-799 free
800: Dragon Knight
801: Meister
802: Shadow Cross
803: Arch Mage
804: Cardinal
805: Windhawk
806: Imperial Guard
807: Biolo
808: Abyss Chaser
809: Elemental Master
810: Inquisitor
811: Troubadour
812: Trouvere
813: Sky Emperor
814: Soul Ascetic
815: Shinkiro
816: Shiranui
817: Night Watch
818: Hyper Novice
819: Spirit Handler
//820-899 free
//------------------------------------
// More atcommands message

View File

@ -289,6 +289,7 @@ Body:
Super_Baby: true
Super_Novice_E: true
Super_Baby_E: true
Hyper_Novice: true
BaseHp:
- Level: 1
Hp: 40
@ -2121,6 +2122,8 @@ Body:
Rune_Knight_T2: true
Baby_Rune_Knight: true
Baby_Rune_Knight2: true
Dragon_Knight: true
Dragon_Knight2: true
BaseHp:
- Level: 99
Hp: 8100
@ -2533,6 +2536,7 @@ Body:
Arch_Bishop: true
Arch_Bishop_T: true
Baby_Arch_Bishop: true
Cardinal: true
BaseHp:
- Level: 99
Hp: 4300
@ -2945,6 +2949,7 @@ Body:
Warlock: true
Warlock_T: true
Baby_Warlock: true
Arch_Mage: true
BaseHp:
- Level: 99
Hp: 3200
@ -3360,6 +3365,8 @@ Body:
Mechanic_T2: true
Baby_Mechanic: true
Baby_Mechanic2: true
Meister: true
Meister2: true
BaseHp:
- Level: 99
Hp: 5807
@ -3775,6 +3782,8 @@ Body:
Ranger_T2: true
Baby_Ranger: true
Baby_Ranger2: true
Windhawk: true
Windhawk2: true
BaseHp:
- Level: 99
Hp: 4800
@ -4187,6 +4196,7 @@ Body:
Guillotine_Cross: true
Guillotine_Cross_T: true
Baby_Guillotine_Cross: true
Shadow_Cross: true
BaseHp:
- Level: 99
Hp: 6050
@ -4605,6 +4615,8 @@ Body:
Royal_Guard_T2: true
Baby_Royal_Guard: true
Baby_Royal_Guard2: true
Imperial_Guard: true
Imperial_Guard2: true
BaseHp:
- Level: 99
Hp: 6050
@ -5017,6 +5029,7 @@ Body:
Sura: true
Sura_T: true
Baby_Sura: true
Inquisitor: true
BaseHp:
- Level: 99
Hp: 5050
@ -5429,6 +5442,7 @@ Body:
Sorcerer: true
Sorcerer_T: true
Baby_Sorcerer: true
Elemental_Master: true
BaseHp:
- Level: 99
Hp: 4080
@ -5841,6 +5855,7 @@ Body:
Shadow_Chaser: true
Shadow_Chaser_T: true
Baby_Shadow_Chaser: true
Abyss_Chaser: true
BaseHp:
- Level: 99
Hp: 6050
@ -6253,6 +6268,7 @@ Body:
Genetic: true
Genetic_T: true
Baby_Genetic: true
Biolo: true
BaseHp:
- Level: 99
Hp: 4730
@ -6665,6 +6681,7 @@ Body:
Minstrel: true
Minstrel_T: true
Baby_Minstrel: true
Troubadour: true
BaseHp:
- Level: 99
Hp: 4800
@ -7077,6 +7094,7 @@ Body:
Wanderer: true
Wanderer_T: true
Baby_Wanderer: true
Trouvere: true
BaseHp:
- Level: 99
Hp: 4800
@ -7487,6 +7505,7 @@ Body:
- Jobs:
Rebellion: true
Baby_Rebellion: true
Night_Watch: true
BaseHp:
- Level: 99
Hp: 4938
@ -7897,6 +7916,7 @@ Body:
- Jobs:
Kagerou: true
Baby_Kagerou: true
Shinkiro: true
BaseHp:
- Level: 99
Hp: 4250
@ -8105,6 +8125,7 @@ Body:
- Jobs:
Oboro: true
Baby_Oboro: true
Shiranui: true
BaseHp:
- Level: 99
Hp: 4250
@ -9524,6 +9545,7 @@ Body:
- Jobs:
Summoner: true
Baby_Summoner: true
Spirit_Handler: true
BaseHp:
- Level: 1
Hp: 40
@ -9884,6 +9906,7 @@ Body:
Super_Baby: true
Super_Novice_E: true
Super_Baby_E: true
Hyper_Novice: true
BaseSp:
- Level: 1
Sp: 11
@ -11716,6 +11739,8 @@ Body:
Rune_Knight_T2: true
Baby_Rune_Knight: true
Baby_Rune_Knight2: true
Dragon_Knight: true
Dragon_Knight2: true
BaseSp:
- Level: 99
Sp: 300
@ -12128,6 +12153,7 @@ Body:
Arch_Bishop: true
Arch_Bishop_T: true
Baby_Arch_Bishop: true
Cardinal: true
BaseSp:
- Level: 99
Sp: 800
@ -12540,6 +12566,7 @@ Body:
Warlock: true
Warlock_T: true
Baby_Warlock: true
Arch_Mage: true
BaseSp:
- Level: 99
Sp: 900
@ -12955,6 +12982,8 @@ Body:
Mechanic_T2: true
Baby_Mechanic: true
Baby_Mechanic2: true
Meister: true
Meister2: true
BaseSp:
- Level: 99
Sp: 400
@ -13370,6 +13399,8 @@ Body:
Ranger_T2: true
Baby_Ranger: true
Baby_Ranger2: true
Windhawk: true
Windhawk2: true
BaseSp:
- Level: 99
Sp: 400
@ -13782,6 +13813,7 @@ Body:
Guillotine_Cross: true
Guillotine_Cross_T: true
Baby_Guillotine_Cross: true
Shadow_Cross: true
BaseSp:
- Level: 99
Sp: 400
@ -14200,6 +14232,8 @@ Body:
Royal_Guard_T2: true
Baby_Royal_Guard: true
Baby_Royal_Guard2: true
Imperial_Guard: true
Imperial_Guard2: true
BaseSp:
- Level: 99
Sp: 400
@ -14612,6 +14646,7 @@ Body:
Sura: true
Sura_T: true
Baby_Sura: true
Inquisitor: true
BaseSp:
- Level: 99
Sp: 400
@ -15024,6 +15059,7 @@ Body:
Sorcerer: true
Sorcerer_T: true
Baby_Sorcerer: true
Elemental_Master: true
BaseSp:
- Level: 99
Sp: 900
@ -15436,6 +15472,7 @@ Body:
Shadow_Chaser: true
Shadow_Chaser_T: true
Baby_Shadow_Chaser: true
Abyss_Chaser: true
BaseSp:
- Level: 99
Sp: 400
@ -15848,6 +15885,7 @@ Body:
Genetic: true
Genetic_T: true
Baby_Genetic: true
Biolo: true
BaseSp:
- Level: 99
Sp: 900
@ -16260,6 +16298,7 @@ Body:
Minstrel: true
Minstrel_T: true
Baby_Minstrel: true
Troubadour: true
BaseSp:
- Level: 99
Sp: 400
@ -16672,6 +16711,7 @@ Body:
Wanderer: true
Wanderer_T: true
Baby_Wanderer: true
Trouvere: true
BaseSp:
- Level: 99
Sp: 400
@ -16882,6 +16922,7 @@ Body:
Rebellion: true
Baby_Gunslinger: true
Baby_Rebellion: true
Night_Watch: true
BaseSp:
- Level: 1
Sp: 12
@ -17488,6 +17529,7 @@ Body:
- Jobs:
Kagerou: true
Baby_Kagerou: true
Shinkiro: true
BaseSp:
- Level: 99
Sp: 522
@ -17696,6 +17738,7 @@ Body:
- Jobs:
Oboro: true
Baby_Oboro: true
Shiranui: true
BaseSp:
- Level: 99
Sp: 522
@ -19115,6 +19158,7 @@ Body:
- Jobs:
Summoner: true
Baby_Summoner: true
Spirit_Handler: true
BaseSp:
- Level: 1
Sp: 8
@ -19472,6 +19516,7 @@ Body:
Baby_Star_Emperor: true
Star_Emperor2: true
Baby_Star_Emperor2: true
Sky_Emperor: true
BaseHp:
- Level: 99
Hp: 4300
@ -19631,6 +19676,7 @@ Body:
- Jobs:
Soul_Reaper: true
Baby_Soul_Reaper: true
Soul_Ascetic: true
BaseHp:
- Level: 99
Hp: 4300
@ -19792,6 +19838,7 @@ Body:
Baby_Star_Emperor: true
Star_Emperor2: true
Baby_Star_Emperor2: true
Sky_Emperor: true
BaseSp:
- Level: 99
Sp: 522
@ -19951,6 +19998,7 @@ Body:
- Jobs:
Soul_Reaper: true
Baby_Soul_Reaper: true
Soul_Ascetic: true
BaseSp:
- Level: 99
Sp: 900

View File

@ -3308,3 +3308,650 @@ Body:
Exp: 132528619
- Level: 60
Exp: 999999999
- Jobs:
Dragon_Knight: true
Meister: true
Shadow_Cross: true
Arch_Mage: true
Cardinal: true
Windhawk: true
Imperial_Guard: true
Biolo: true
Abyss_Chaser: true
Elemental_Master: true
Inquisitor: true
Troubadour: true
Trouvere: true
Windhawk2: true
Meister2: true
Dragon_Knight2: true
Imperial_Guard2: true
Sky_Emperor: true
Soul_Ascetic: true
Shinkiro: true
Shiranui: true
Night_Watch: true
Hyper_Novice: true
Spirit_Handler: true
MaxBaseLevel: 250
BaseExp:
- Level: 1
Exp: 600
- Level: 2
Exp: 1080
- Level: 3
Exp: 1800
- Level: 4
Exp: 2640
- Level: 5
Exp: 3840
- Level: 6
Exp: 4560
- Level: 7
Exp: 5040
- Level: 8
Exp: 5460
- Level: 9
Exp: 6000
- Level: 10
Exp: 6600
- Level: 11
Exp: 7200
- Level: 12
Exp: 7320
- Level: 13
Exp: 7620
- Level: 14
Exp: 8040
- Level: 15
Exp: 8820
- Level: 16
Exp: 9600
- Level: 17
Exp: 10080
- Level: 18
Exp: 10560
- Level: 19
Exp: 11040
- Level: 20
Exp: 12610
- Level: 21
Exp: 13390
- Level: 22
Exp: 14300
- Level: 23
Exp: 15340
- Level: 24
Exp: 16900
- Level: 25
Exp: 18460
- Level: 26
Exp: 19500
- Level: 27
Exp: 20800
- Level: 28
Exp: 22100
- Level: 29
Exp: 23400
- Level: 30
Exp: 24700
- Level: 31
Exp: 26000
- Level: 32
Exp: 27300
- Level: 33
Exp: 28600
- Level: 34
Exp: 30160
- Level: 35
Exp: 31200
- Level: 36
Exp: 33800
- Level: 37
Exp: 35750
- Level: 38
Exp: 37700
- Level: 39
Exp: 39000
- Level: 40
Exp: 44100
- Level: 41
Exp: 46200
- Level: 42
Exp: 47600
- Level: 43
Exp: 50400
- Level: 44
Exp: 52500
- Level: 45
Exp: 53200
- Level: 46
Exp: 56000
- Level: 47
Exp: 58800
- Level: 48
Exp: 62300
- Level: 49
Exp: 65800
- Level: 50
Exp: 68600
- Level: 51
Exp: 71400
- Level: 52
Exp: 74200
- Level: 53
Exp: 77000
- Level: 54
Exp: 79800
- Level: 55
Exp: 82600
- Level: 56
Exp: 86100
- Level: 57
Exp: 88200
- Level: 58
Exp: 91000
- Level: 59
Exp: 93800
- Level: 60
Exp: 103500
- Level: 61
Exp: 105000
- Level: 62
Exp: 109500
- Level: 63
Exp: 115500
- Level: 64
Exp: 120000
- Level: 65
Exp: 126000
- Level: 66
Exp: 132000
- Level: 67
Exp: 136500
- Level: 68
Exp: 142500
- Level: 69
Exp: 165000
- Level: 70
Exp: 192000
- Level: 71
Exp: 210000
- Level: 72
Exp: 232500
- Level: 73
Exp: 244500
- Level: 74
Exp: 255000
- Level: 75
Exp: 270000
- Level: 76
Exp: 282000
- Level: 77
Exp: 292500
- Level: 78
Exp: 300000
- Level: 79
Exp: 345000
- Level: 80
Exp: 416000
- Level: 81
Exp: 480000
- Level: 82
Exp: 560000
- Level: 83
Exp: 640000
- Level: 84
Exp: 768000
- Level: 85
Exp: 880000
- Level: 86
Exp: 960000
- Level: 87
Exp: 1088000
- Level: 88
Exp: 1200000
- Level: 89
Exp: 1440000
- Level: 90
Exp: 1700000
- Level: 91
Exp: 2040000
- Level: 92
Exp: 2550000
- Level: 93
Exp: 3060000
- Level: 94
Exp: 3570000
- Level: 95
Exp: 4080000
- Level: 96
Exp: 4760000
- Level: 97
Exp: 5610000
- Level: 98
Exp: 6800000
- Level: 99
Exp: 1272747
- Level: 100
Exp: 1354202
- Level: 101
Exp: 1440870
- Level: 102
Exp: 1533085
- Level: 103
Exp: 1631202
- Level: 104
Exp: 1735598
- Level: 105
Exp: 1846676
- Level: 106
Exp: 1964863
- Level: 107
Exp: 2090614
- Level: 108
Exp: 2224413
- Level: 109
Exp: 2366775
- Level: 110
Exp: 2518248
- Level: 111
Exp: 2679415
- Level: 112
Exp: 2850897
- Level: 113
Exp: 3033354
- Level: 114
Exp: 3227488
- Level: 115
Exp: 3434047
- Level: 116
Exp: 3653826
- Level: 117
Exp: 3887670
- Level: 118
Exp: 4136480
- Level: 119
Exp: 4401214
- Level: 120
Exp: 4755467
- Level: 121
Exp: 5138234
- Level: 122
Exp: 5551810
- Level: 123
Exp: 5998675
- Level: 124
Exp: 6481508
- Level: 125
Exp: 7003204
- Level: 126
Exp: 7566891
- Level: 127
Exp: 8175950
- Level: 128
Exp: 8834032
- Level: 129
Exp: 9545083
- Level: 130
Exp: 10313366
- Level: 131
Exp: 11143488
- Level: 132
Exp: 12040427
- Level: 133
Exp: 13009560
- Level: 134
Exp: 14056699
- Level: 135
Exp: 15188122
- Level: 136
Exp: 16410613
- Level: 137
Exp: 17731503
- Level: 138
Exp: 19158711
- Level: 139
Exp: 20700795
- Level: 140
Exp: 22367001
- Level: 141
Exp: 24167320
- Level: 142
Exp: 26112547
- Level: 143
Exp: 28214345
- Level: 144
Exp: 30485317
- Level: 145
Exp: 32939080
- Level: 146
Exp: 35590346
- Level: 147
Exp: 38455012
- Level: 148
Exp: 41550255
- Level: 149
Exp: 44894635
- Level: 150
Exp: 48508204
- Level: 151
Exp: 52412629
- Level: 152
Exp: 56631321
- Level: 153
Exp: 61189576
- Level: 154
Exp: 66114724
- Level: 155
Exp: 71436298
- Level: 156
Exp: 77186205
- Level: 157
Exp: 83398922
- Level: 158
Exp: 90111701
- Level: 159
Exp: 97364791
- Level: 160
Exp: 105201683
- Level: 161
Exp: 113669366
- Level: 162
Exp: 122818613
- Level: 163
Exp: 132704283
- Level: 164
Exp: 143385650
- Level: 165
Exp: 154926760
- Level: 166
Exp: 167396814
- Level: 167
Exp: 180870583
- Level: 168
Exp: 195428856
- Level: 169
Exp: 211158924
- Level: 170
Exp: 229155105
- Level: 171
Exp: 246519309
- Level: 172
Exp: 266361648
- Level: 173
Exp: 287801097
- Level: 174
Exp: 310966207
- Level: 175
Exp: 352013746
- Level: 176
Exp: 398479560
- Level: 177
Exp: 451078861
- Level: 178
Exp: 510621270
- Level: 179
Exp: 578023277
- Level: 180
Exp: 654322349
- Level: 181
Exp: 740692899
- Level: 182
Exp: 838464361
- Level: 183
Exp: 949141656
- Level: 184
Exp: 1074428354
- Level: 185
Exp: 1216252896
- Level: 186
Exp: 1376798278
- Level: 187
Exp: 1558535650
- Level: 188
Exp: 1764262355
- Level: 189
Exp: 1997144985
- Level: 190
Exp: 2260768123
- Level: 191
Exp: 2559189515
- Level: 192
Exp: 2897002530
- Level: 193
Exp: 3279406863
- Level: 194
Exp: 3712288568
- Level: 195
Exp: 4202310658
- Level: 196
Exp: 4757015664
- Level: 197
Exp: 5384941731
- Level: 198
Exp: 6095754039
- Level: 199
Exp: 6900363572
- Level: 200
Exp: 653047446
- Level: 201
Exp: 655006588
- Level: 202
Exp: 656971607
- Level: 203
Exp: 658942521
- Level: 204
Exp: 660919348
- Level: 205
Exp: 662902106
- Level: 206
Exp: 664890812
- Level: 207
Exp: 666885484
- Level: 208
Exp: 668886140
- Level: 209
Exp: 670892798
- Level: 210
Exp: 672905476
- Level: 211
Exp: 674924192
- Level: 212
Exp: 676948964
- Level: 213
Exp: 678979810
- Level: 214
Exp: 681016749
- Level: 215
Exp: 683059799
- Level: 216
Exp: 685108978
- Level: 217
Exp: 687164304
- Level: 218
Exp: 689225796
- Level: 219
Exp: 691293473
- Level: 220
Exp: 843378037
- Level: 221
Exp: 1028921205
- Level: 222
Exp: 1255283870
- Level: 223
Exp: 1531446321
- Level: 224
Exp: 1868364511
- Level: 225
Exp: 2279404703
- Level: 226
Exp: 2780873737
- Level: 227
Exp: 3392665959
- Level: 228
Exp: 4139052469
- Level: 229
Exp: 5049644012
- Level: 230
Exp: 6160565694
- Level: 231
Exp: 7515890146
- Level: 232
Exp: 9169385978
- Level: 233
Exp: 11186650893
- Level: 234
Exp: 13647714089
- Level: 235
Exp: 16650211188
- Level: 236
Exp: 20313257649
- Level: 237
Exp: 24782174331
- Level: 238
Exp: 30234252683
- Level: 239
Exp: 36885788273
- Level: 240
Exp: 45000661693
- Level: 241
Exp: 54900807265
- Level: 242
Exp: 66978984863
- Level: 243
Exp: 81714361532
- Level: 244
Exp: 99691521069
- Level: 245
Exp: 121623655704
- Level: 246
Exp: 148380859958
- Level: 247
Exp: 181024649148
- Level: 248
Exp: 220850071960
- Level: 249
Exp: 269437087791
- Level: 250
Exp: 999999999999
- Jobs:
Dragon_Knight: true
Meister: true
Shadow_Cross: true
Arch_Mage: true
Cardinal: true
Windhawk: true
Imperial_Guard: true
Biolo: true
Abyss_Chaser: true
Elemental_Master: true
Inquisitor: true
Troubadour: true
Trouvere: true
Windhawk2: true
Meister2: true
Dragon_Knight2: true
Imperial_Guard2: true
MaxJobLevel: 50
JobExp:
- Level: 1
Exp: 4700000
- Level: 2
Exp: 5522500
- Level: 3
Exp: 6488938
- Level: 4
Exp: 7624502
- Level: 5
Exp: 8958789
- Level: 6
Exp: 10526577
- Level: 7
Exp: 12368729
- Level: 8
Exp: 14533256
- Level: 9
Exp: 17076576
- Level: 10
Exp: 20064977
- Level: 11
Exp: 23576347
- Level: 12
Exp: 27702208
- Level: 13
Exp: 32550095
- Level: 14
Exp: 38246361
- Level: 15
Exp: 44939475
- Level: 16
Exp: 52803883
- Level: 17
Exp: 62044562
- Level: 18
Exp: 72902360
- Level: 19
Exp: 85660274
- Level: 20
Exp: 100650821
- Level: 21
Exp: 118264715
- Level: 22
Exp: 138961040
- Level: 23
Exp: 163279222
- Level: 24
Exp: 191853086
- Level: 25
Exp: 216793987
- Level: 26
Exp: 244977206
- Level: 27
Exp: 276824243
- Level: 28
Exp: 312811394
- Level: 29
Exp: 353476875
- Level: 30
Exp: 399428869
- Level: 31
Exp: 451354622
- Level: 32
Exp: 510030723
- Level: 33
Exp: 576334717
- Level: 34
Exp: 651258230
- Level: 35
Exp: 735921800
- Level: 36
Exp: 831591634
- Level: 37
Exp: 939698547
- Level: 38
Exp: 1061859358
- Level: 39
Exp: 1199901074
- Level: 40
Exp: 1355888214
- Level: 41
Exp: 1532153682
- Level: 42
Exp: 1731333660
- Level: 43
Exp: 1956407036
- Level: 44
Exp: 2210739951
- Level: 45
Exp: 2498136145
- Level: 46
Exp: 2822893843
- Level: 47
Exp: 3189870043
- Level: 48
Exp: 3604553149
- Level: 49
Exp: 4073145058
- Level: 50
Exp: 9999999999

File diff suppressed because it is too large Load Diff

View File

@ -322,6 +322,42 @@ const char* job_name(int class_) {
case JOB_BABY_STAR_EMPEROR2:
return msg_txt(120);
case JOB_DRAGON_KNIGHT:
case JOB_MEISTER:
case JOB_SHADOW_CROSS:
case JOB_ARCH_MAGE:
case JOB_CARDINAL:
case JOB_WINDHAWK:
case JOB_IMPERIAL_GUARD:
case JOB_BIOLO:
case JOB_ABYSS_CHASER:
case JOB_ELEMENTAL_MASTER:
case JOB_INQUISITOR:
case JOB_TROUBADOUR:
case JOB_TROUVERE:
return msg_txt( 122 - JOB_DRAGON_KNIGHT + class_ );
case JOB_WINDHAWK2:
return msg_txt( 127 );
case JOB_MEISTER2:
return msg_txt( 123 );
case JOB_DRAGON_KNIGHT2:
return msg_txt( 122 );
case JOB_IMPERIAL_GUARD2:
return msg_txt( 128 );
case JOB_SKY_EMPEROR:
case JOB_SOUL_ASCETIC:
case JOB_SHINKIRO:
case JOB_SHIRANUI:
case JOB_NIGHT_WATCH:
case JOB_HYPER_NOVICE:
case JOB_SPIRIT_HANDLER:
return msg_txt( 143 - JOB_SKY_EMPEROR + class_ );
default:
return msg_txt(199);
}

View File

@ -995,6 +995,33 @@ enum e_job {
JOB_STAR_EMPEROR2,
JOB_BABY_STAR_EMPEROR2,
JOB_DRAGON_KNIGHT = 4252,
JOB_MEISTER,
JOB_SHADOW_CROSS,
JOB_ARCH_MAGE,
JOB_CARDINAL,
JOB_WINDHAWK,
JOB_IMPERIAL_GUARD,
JOB_BIOLO,
JOB_ABYSS_CHASER,
JOB_ELEMENTAL_MASTER,
JOB_INQUISITOR,
JOB_TROUBADOUR,
JOB_TROUVERE,
JOB_WINDHAWK2 = 4278,
JOB_MEISTER2,
JOB_DRAGON_KNIGHT2,
JOB_IMPERIAL_GUARD2,
JOB_SKY_EMPEROR = 4302,
JOB_SOUL_ASCETIC,
JOB_SHINKIRO,
JOB_SHIRANUI,
JOB_NIGHT_WATCH,
JOB_HYPER_NOVICE,
JOB_SPIRIT_HANDLER,
JOB_MAX,
};

View File

@ -222,12 +222,17 @@ enum e_mapid : uint64{
MAPID_BABY_SHADOW_CHASER,
MAPID_BABY_SOUL_REAPER,
//4-1 Jobs
MAPID_DRAGON_KNIGHT = JOBL_FOURTH|JOBL_THIRD|JOBL_UPPER|MAPID_KNIGHT,
MAPID_HYPER_NOVICE = JOBL_FOURTH|JOBL_THIRD|JOBL_UPPER|MAPID_SUPER_NOVICE,
MAPID_DRAGON_KNIGHT,
MAPID_ARCH_MAGE,
MAPID_WINDHAWK,
MAPID_CARDINAL,
MAPID_MEISTER,
MAPID_SHADOW_CROSS,
MAPID_SKY_EMPEROR,
MAPID_NIGHT_WATCH = JOBL_FOURTH|JOBL_THIRD|JOBL_UPPER|MAPID_REBELLION,
MAPID_SHINKIRO_SHIRANUI,
MAPID_SPIRIT_HANDLER = JOBL_FOURTH|JOBL_THIRD|JOBL_UPPER|JOBL_2_1|MAPID_SUMMONER,
//4-2 Jobs
MAPID_IMPERIAL_GUARD = JOBL_FOURTH|JOBL_THIRD|JOBL_UPPER|MAPID_CRUSADER,
MAPID_ELEMENTAL_MASTER,
@ -235,6 +240,7 @@ enum e_mapid : uint64{
MAPID_INQUISITOR,
MAPID_BIOLO,
MAPID_ABYSS_CHASER,
MAPID_SOUL_ASCETIC,
// Additional constants
MAPID_ALL = UINT64_MAX
};

View File

@ -6763,6 +6763,28 @@ uint64 pc_jobid2mapid(unsigned short b_class)
case JOB_BABY_SOUL_REAPER: return MAPID_BABY_SOUL_REAPER;
//Doram Jobs
case JOB_SUMMONER: return MAPID_SUMMONER;
case JOB_SPIRIT_HANDLER: return MAPID_SPIRIT_HANDLER;
//4-1 Jobs
case JOB_HYPER_NOVICE: return MAPID_HYPER_NOVICE;
case JOB_DRAGON_KNIGHT: return MAPID_DRAGON_KNIGHT;
case JOB_ARCH_MAGE: return MAPID_ARCH_MAGE;
case JOB_WINDHAWK: return MAPID_WINDHAWK;
case JOB_CARDINAL: return MAPID_CARDINAL;
case JOB_MEISTER: return MAPID_MEISTER;
case JOB_SHADOW_CROSS: return MAPID_SHADOW_CROSS;
case JOB_SKY_EMPEROR: return MAPID_SKY_EMPEROR;
case JOB_NIGHT_WATCH: return MAPID_NIGHT_WATCH;
case JOB_SHINKIRO:
case JOB_SHIRANUI: return MAPID_SHINKIRO_SHIRANUI;
//4-2 Jobs
case JOB_IMPERIAL_GUARD: return MAPID_IMPERIAL_GUARD;
case JOB_ELEMENTAL_MASTER: return MAPID_ELEMENTAL_MASTER;
case JOB_INQUISITOR: return MAPID_INQUISITOR;
case JOB_TROUBADOUR:
case JOB_TROUVERE: return MAPID_TROUBADOURTROUVERE;
case JOB_BIOLO: return MAPID_BIOLO;
case JOB_ABYSS_CHASER: return MAPID_ABYSS_CHASER;
//Unknown
default:
return -1;
}
@ -6914,6 +6936,22 @@ int pc_mapid2jobid(uint64 class_, int sex)
case MAPID_BABY_SOUL_REAPER: return JOB_BABY_SOUL_REAPER;
//Doram Jobs
case MAPID_SUMMONER: return JOB_SUMMONER;
case MAPID_SPIRIT_HANDLER: return JOB_SPIRIT_HANDLER;
//4-1 Jobs
case MAPID_DRAGON_KNIGHT: return JOB_DRAGON_KNIGHT;
case MAPID_ARCH_MAGE: return JOB_ARCH_MAGE;
case MAPID_WINDHAWK: return JOB_WINDHAWK;
case MAPID_CARDINAL: return JOB_CARDINAL;
case MAPID_MEISTER: return JOB_MEISTER;
case MAPID_SHADOW_CROSS: return JOB_SHADOW_CROSS;
//4-2 Jobs
case MAPID_IMPERIAL_GUARD: return JOB_IMPERIAL_GUARD;
case MAPID_ELEMENTAL_MASTER: return JOB_ELEMENTAL_MASTER;
case MAPID_INQUISITOR: return JOB_INQUISITOR;
case MAPID_TROUBADOURTROUVERE: return sex?JOB_TROUBADOUR:JOB_TROUVERE;
case MAPID_BIOLO: return JOB_BIOLO;
case MAPID_ABYSS_CHASER: return JOB_ABYSS_CHASER;
//Unknown
default:
return -1;
}
@ -7173,6 +7211,42 @@ const char* job_name(int class_)
case JOB_BABY_STAR_EMPEROR2:
return msg_txt(NULL,784);
case JOB_DRAGON_KNIGHT:
case JOB_MEISTER:
case JOB_SHADOW_CROSS:
case JOB_ARCH_MAGE:
case JOB_CARDINAL:
case JOB_WINDHAWK:
case JOB_IMPERIAL_GUARD:
case JOB_BIOLO:
case JOB_ABYSS_CHASER:
case JOB_ELEMENTAL_MASTER:
case JOB_INQUISITOR:
case JOB_TROUBADOUR:
case JOB_TROUVERE:
return msg_txt( nullptr, 800 - JOB_DRAGON_KNIGHT + class_ );
case JOB_WINDHAWK2:
return msg_txt( nullptr, 805);
case JOB_MEISTER2:
return msg_txt( nullptr, 801 );
case JOB_DRAGON_KNIGHT2:
return msg_txt( nullptr, 800 );
case JOB_IMPERIAL_GUARD2:
return msg_txt( nullptr, 806 );
case JOB_SKY_EMPEROR:
case JOB_SOUL_ASCETIC:
case JOB_SHINKIRO:
case JOB_SHIRANUI:
case JOB_NIGHT_WATCH:
case JOB_HYPER_NOVICE:
case JOB_SPIRIT_HANDLER:
return msg_txt( nullptr, 813 - JOB_SKY_EMPEROR + class_ );
default:
return msg_txt(NULL,655);
}

View File

@ -1107,7 +1107,10 @@ enum e_mado_type : uint16 {
(class_) == JOB_REBELLION || (class_) == JOB_SUMMONER || \
(class_) == JOB_BABY_SUMMONER || \
( (class_) >= JOB_BABY_NINJA && (class_) <= JOB_BABY_REBELLION ) || \
( (class_) >= JOB_BABY_STAR_GLADIATOR2 && (class_) <= JOB_BABY_STAR_EMPEROR2 ) \
( (class_) >= JOB_BABY_STAR_GLADIATOR2 && (class_) <= JOB_BABY_STAR_EMPEROR2 ) || \
( (class_) >= JOB_DRAGON_KNIGHT && (class_) <= JOB_TROUVERE ) || \
( (class_) >= JOB_WINDHAWK2 && (class_) <= JOB_IMPERIAL_GUARD2 ) || \
( (class_) >= JOB_SKY_EMPEROR && (class_) <= JOB_SPIRIT_HANDLER ) \
)
#define pcdb_checkid(class_) pcdb_checkid_sub((unsigned int)class_)

View File

@ -229,6 +229,33 @@
export_constant(JOB_STAR_EMPEROR2);
export_constant(JOB_BABY_STAR_EMPEROR2);
export_constant(JOB_DRAGON_KNIGHT);
export_constant(JOB_MEISTER);
export_constant(JOB_SHADOW_CROSS);
export_constant(JOB_ARCH_MAGE);
export_constant(JOB_CARDINAL);
export_constant(JOB_WINDHAWK);
export_constant(JOB_IMPERIAL_GUARD);
export_constant(JOB_BIOLO);
export_constant(JOB_ABYSS_CHASER);
export_constant(JOB_ELEMENTAL_MASTER);
export_constant(JOB_INQUISITOR);
export_constant(JOB_TROUBADOUR);
export_constant(JOB_TROUVERE);
export_constant(JOB_WINDHAWK2);
export_constant(JOB_MEISTER2);
export_constant(JOB_DRAGON_KNIGHT2);
export_constant(JOB_IMPERIAL_GUARD2);
export_constant(JOB_SKY_EMPEROR);
export_constant(JOB_SOUL_ASCETIC);
export_constant(JOB_SHINKIRO);
export_constant(JOB_SHIRANUI);
export_constant(JOB_NIGHT_WATCH);
export_constant(JOB_HYPER_NOVICE);
export_constant(JOB_SPIRIT_HANDLER);
/* EA jobs */
export_constant2("EAJL_2_1",JOBL_2_1);
export_constant2("EAJL_2_2",JOBL_2_2);
@ -388,6 +415,26 @@
export_constant2("EAJ_SUPER_BABY_E",MAPID_SUPER_BABY_E);
export_constant2("EAJ_SUMMONER",MAPID_SUMMONER);
export_constant2("EAJ_SPIRIT_HANDLER", MAPID_SPIRIT_HANDLER);
export_constant2("EAJ_HYPER_NOVICE", MAPID_HYPER_NOVICE);
export_constant2("EAJ_DRAGON_KNIGHT",MAPID_DRAGON_KNIGHT);
export_constant2("EAJ_ARCH_MAGE",MAPID_ARCH_MAGE);
export_constant2("EAJ_WINDHAWK",MAPID_WINDHAWK);
export_constant2("EAJ_CARDINAL",MAPID_CARDINAL);
export_constant2("EAJ_MEISTER",MAPID_MEISTER);
export_constant2("EAJ_SHADOW_CROSS",MAPID_SHADOW_CROSS);
export_constant2("EAJ_SKY_EMPEROR", MAPID_SKY_EMPEROR);
export_constant2("EAJ_NIGHT_WATCH", MAPID_NIGHT_WATCH);
export_constant2("EAJ_SHINKIRO_SHIRANUI", MAPID_SHINKIRO_SHIRANUI);
export_constant2("EAJ_IMPERIAL_GUARD",MAPID_IMPERIAL_GUARD);
export_constant2("EAJ_ELEMENTAL_MASTER",MAPID_ELEMENTAL_MASTER);
export_constant2("EAJ_TROUBADOURTROUVERE",MAPID_TROUBADOURTROUVERE);
export_constant2("EAJ_INQUISITOR",MAPID_INQUISITOR);
export_constant2("EAJ_BIOLO",MAPID_BIOLO);
export_constant2("EAJ_ABYSS_CHASER",MAPID_ABYSS_CHASER);
export_constant2("EAJ_SOUL_ASCETIC", MAPID_SOUL_ASCETIC);
/* sex */
export_constant(SEX_FEMALE);