Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mob and NPC Identity Update (#5441)

Browse Source
This commit is contained in:
Lemongrass3110 2020-10-09 14:44:59 +02:00 committed by GitHub
parent 0605037a0d
commit d4c018cd90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 407 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
db/re/mob_db.txt
View File

@ -4217,6 +4217,207 @@
//21087,S_DUMMY_100_HUMANP
//21088,S_DUMMY_100_DORAMP
//21089,WANDERING_DUCK
//21090,JP_E_MONSTER_201
//21091,JP_E_MONSTER_202
//21092,JP_E_MONSTER_203
//21093,JP_E_MONSTER_204
//21094,JP_E_MONSTER_205
//21095,JP_E_MONSTER_206
//21096,JP_E_MONSTER_207
//21097,JP_E_MONSTER_208
//21098,JP_E_MONSTER_209
//21099,JP_E_MONSTER_210
//21100,JP_E_MONSTER_211
//21101,JP_E_MONSTER_212
//21102,JP_E_MONSTER_213
//21103,JP_E_MONSTER_214
//21104,JP_E_MONSTER_215
//21105,JP_E_MONSTER_216
//21106,JP_E_MONSTER_217
//21107,JP_E_MONSTER_218
//21108,JP_E_MONSTER_219
//21109,JP_E_MONSTER_220
//21110,JP_E_MONSTER_221
//21111,JP_E_MONSTER_222
//21112,JP_E_MONSTER_223
//21113,JP_E_MONSTER_224
//21114,JP_E_MONSTER_225
//21115,JP_E_MONSTER_226
//21116,JP_E_MONSTER_227
//21117,JP_E_MONSTER_228
//21118,JP_E_MONSTER_229
//21119,JP_E_MONSTER_230
//21120,JP_E_MONSTER_231
//21121,JP_E_MONSTER_232
//21122,JP_E_MONSTER_233
//21123,JP_E_MONSTER_234
//21124,JP_E_MONSTER_235
//21125,JP_E_MONSTER_236
//21126,JP_E_MONSTER_237
//21127,JP_E_MONSTER_238
//21128,JP_E_MONSTER_239
//21129,JP_E_MONSTER_240
//21130,JP_E_MONSTER_241
//21131,JP_E_MONSTER_242
//21132,JP_E_MONSTER_243
//21133,JP_E_MONSTER_244
//21134,JP_E_MONSTER_245
//21135,JP_E_MONSTER_246
//21136,JP_E_MONSTER_247
//21137,JP_E_MONSTER_248
//21138,JP_E_MONSTER_249
//21139,JP_E_MONSTER_250
//21140,JP_E_MONSTER_251
//21141,JP_E_MONSTER_252
//21142,JP_E_MONSTER_253
//21143,JP_E_MONSTER_254
//21144,JP_E_MONSTER_255
//21145,JP_E_MONSTER_256
//21146,JP_E_MONSTER_257
//21147,JP_E_MONSTER_258
//21148,JP_E_MONSTER_259
//21149,JP_E_MONSTER_260
//21150,JP_E_MONSTER_261
//21151,JP_E_MONSTER_262
//21152,JP_E_MONSTER_263
//21153,JP_E_MONSTER_264
//21154,JP_E_MONSTER_265
//21155,JP_E_MONSTER_266
//21156,JP_E_MONSTER_267
//21157,JP_E_MONSTER_268
//21158,JP_E_MONSTER_269
//21159,JP_E_MONSTER_270
//21160,JP_E_MONSTER_271
//21161,JP_E_MONSTER_272
//21162,JP_E_MONSTER_273
//21163,JP_E_MONSTER_274
//21164,JP_E_MONSTER_275
//21165,JP_E_MONSTER_276
//21166,JP_E_MONSTER_277
//21167,JP_E_MONSTER_278
//21168,JP_E_MONSTER_279
//21169,JP_E_MONSTER_280
//21170,JP_E_MONSTER_281
//21171,JP_E_MONSTER_282
//21172,JP_E_MONSTER_283
//21173,JP_E_MONSTER_284
//21174,JP_E_MONSTER_285
//21175,JP_E_MONSTER_286
//21176,JP_E_MONSTER_287
//21177,JP_E_MONSTER_288
//21178,JP_E_MONSTER_289
//21179,JP_E_MONSTER_290
//21180,JP_E_MONSTER_291
//21181,JP_E_MONSTER_292
//21182,JP_E_MONSTER_293
//21183,JP_E_MONSTER_294
//21184,JP_E_MONSTER_295
//21185,JP_E_MONSTER_296
//21186,JP_E_MONSTER_297
//21187,JP_E_MONSTER_298
//21188,JP_E_MONSTER_299
//21189,JP_E_MONSTER_300
//21190,JP_E_MONSTER_301
//21191,JP_E_MONSTER_302
//21192,JP_E_MONSTER_303
//21193,JP_E_MONSTER_304
//21194,JP_E_MONSTER_305
//21195,JP_E_MONSTER_306
//21196,JP_E_MONSTER_307
//21197,JP_E_MONSTER_308
//21198,JP_E_MONSTER_309
//21199,JP_E_MONSTER_310
//21200,JP_E_MONSTER_311
//21201,JP_E_MONSTER_312
//21202,JP_E_MONSTER_313
//21203,JP_E_MONSTER_314
//21204,JP_E_MONSTER_315
//21205,JP_E_MONSTER_316
//21206,JP_E_MONSTER_317
//21207,JP_E_MONSTER_318
//21208,JP_E_MONSTER_319
//21209,JP_E_MONSTER_320
//21210,JP_E_MONSTER_321
//21211,JP_E_MONSTER_322
//21212,JP_E_MONSTER_323
//21213,JP_E_MONSTER_324
//21214,JP_E_MONSTER_325
//21215,JP_E_MONSTER_326
//21216,JP_E_MONSTER_327
//21217,JP_E_MONSTER_328
//21218,JP_E_MONSTER_329
//21219,JP_E_MONSTER_330
//21220,JP_E_MONSTER_331
//21221,JP_E_MONSTER_332
//21222,JP_E_MONSTER_333
//21223,JP_E_MONSTER_334
//21224,JP_E_MONSTER_335
//21225,JP_E_MONSTER_336
//21226,JP_E_MONSTER_337
//21227,JP_E_MONSTER_338
//21228,JP_E_MONSTER_339
//21229,JP_E_MONSTER_340
//21230,JP_E_MONSTER_341
//21231,JP_E_MONSTER_342
//21232,JP_E_MONSTER_343
//21233,JP_E_MONSTER_344
//21234,JP_E_MONSTER_345
//21235,JP_E_MONSTER_346
//21236,JP_E_MONSTER_347
//21237,JP_E_MONSTER_348
//21238,JP_E_MONSTER_349
//21239,JP_E_MONSTER_350
//21240,JP_E_MONSTER_351
//21241,JP_E_MONSTER_352
//21242,JP_E_MONSTER_353
//21243,JP_E_MONSTER_354
//21244,JP_E_MONSTER_355
//21245,JP_E_MONSTER_356
//21246,JP_E_MONSTER_357
//21247,JP_E_MONSTER_358
//21248,JP_E_MONSTER_359
//21249,JP_E_MONSTER_360
//21250,JP_E_MONSTER_361
//21251,JP_E_MONSTER_362
//21252,JP_E_MONSTER_363
//21253,JP_E_MONSTER_364
//21254,JP_E_MONSTER_365
//21255,JP_E_MONSTER_366
//21256,JP_E_MONSTER_367
//21257,JP_E_MONSTER_368
//21258,JP_E_MONSTER_369
//21259,JP_E_MONSTER_370
//21260,JP_E_MONSTER_371
//21261,JP_E_MONSTER_372
//21262,JP_E_MONSTER_373
//21263,JP_E_MONSTER_374
//21264,JP_E_MONSTER_375
//21265,JP_E_MONSTER_376
//21266,JP_E_MONSTER_377
//21267,JP_E_MONSTER_378
//21268,JP_E_MONSTER_379
//21269,JP_E_MONSTER_380
//21270,JP_E_MONSTER_381
//21271,JP_E_MONSTER_382
//21272,JP_E_MONSTER_383
//21273,JP_E_MONSTER_384
//21274,JP_E_MONSTER_385
//21275,JP_E_MONSTER_386
//21276,JP_E_MONSTER_387
//21277,JP_E_MONSTER_388
//21278,JP_E_MONSTER_389
//21279,JP_E_MONSTER_390
//21280,JP_E_MONSTER_391
//21281,JP_E_MONSTER_392
//21282,JP_E_MONSTER_393
//21283,JP_E_MONSTER_394
//21284,JP_E_MONSTER_395
//21285,JP_E_MONSTER_396
//21286,JP_E_MONSTER_397
//21287,JP_E_MONSTER_398
//21288,JP_E_MONSTER_399
//21289,JP_E_MONSTER_400
//21290,KIEL_D_01_2
//31999,HUNTING_GID_DEFAULT
//32000,MONSTER_2ND_END

201
sql-files/mob_db_re.sql
View File

@ -4284,6 +4284,207 @@ REPLACE INTO `mob_db_re` VALUES (3790,'SWEETS_DROPS','Sweets Drops','Sweets Drop
#21087,S_DUMMY_100_HUMANP
#21088,S_DUMMY_100_DORAMP
#21089,WANDERING_DUCK
#21090,JP_E_MONSTER_201
#21091,JP_E_MONSTER_202
#21092,JP_E_MONSTER_203
#21093,JP_E_MONSTER_204
#21094,JP_E_MONSTER_205
#21095,JP_E_MONSTER_206
#21096,JP_E_MONSTER_207
#21097,JP_E_MONSTER_208
#21098,JP_E_MONSTER_209
#21099,JP_E_MONSTER_210
#21100,JP_E_MONSTER_211
#21101,JP_E_MONSTER_212
#21102,JP_E_MONSTER_213
#21103,JP_E_MONSTER_214
#21104,JP_E_MONSTER_215
#21105,JP_E_MONSTER_216
#21106,JP_E_MONSTER_217
#21107,JP_E_MONSTER_218
#21108,JP_E_MONSTER_219
#21109,JP_E_MONSTER_220
#21110,JP_E_MONSTER_221
#21111,JP_E_MONSTER_222
#21112,JP_E_MONSTER_223
#21113,JP_E_MONSTER_224
#21114,JP_E_MONSTER_225
#21115,JP_E_MONSTER_226
#21116,JP_E_MONSTER_227
#21117,JP_E_MONSTER_228
#21118,JP_E_MONSTER_229
#21119,JP_E_MONSTER_230
#21120,JP_E_MONSTER_231
#21121,JP_E_MONSTER_232
#21122,JP_E_MONSTER_233
#21123,JP_E_MONSTER_234
#21124,JP_E_MONSTER_235
#21125,JP_E_MONSTER_236
#21126,JP_E_MONSTER_237
#21127,JP_E_MONSTER_238
#21128,JP_E_MONSTER_239
#21129,JP_E_MONSTER_240
#21130,JP_E_MONSTER_241
#21131,JP_E_MONSTER_242
#21132,JP_E_MONSTER_243
#21133,JP_E_MONSTER_244
#21134,JP_E_MONSTER_245
#21135,JP_E_MONSTER_246
#21136,JP_E_MONSTER_247
#21137,JP_E_MONSTER_248
#21138,JP_E_MONSTER_249
#21139,JP_E_MONSTER_250
#21140,JP_E_MONSTER_251
#21141,JP_E_MONSTER_252
#21142,JP_E_MONSTER_253
#21143,JP_E_MONSTER_254
#21144,JP_E_MONSTER_255
#21145,JP_E_MONSTER_256
#21146,JP_E_MONSTER_257
#21147,JP_E_MONSTER_258
#21148,JP_E_MONSTER_259
#21149,JP_E_MONSTER_260
#21150,JP_E_MONSTER_261
#21151,JP_E_MONSTER_262
#21152,JP_E_MONSTER_263
#21153,JP_E_MONSTER_264
#21154,JP_E_MONSTER_265
#21155,JP_E_MONSTER_266
#21156,JP_E_MONSTER_267
#21157,JP_E_MONSTER_268
#21158,JP_E_MONSTER_269
#21159,JP_E_MONSTER_270
#21160,JP_E_MONSTER_271
#21161,JP_E_MONSTER_272
#21162,JP_E_MONSTER_273
#21163,JP_E_MONSTER_274
#21164,JP_E_MONSTER_275
#21165,JP_E_MONSTER_276
#21166,JP_E_MONSTER_277
#21167,JP_E_MONSTER_278
#21168,JP_E_MONSTER_279
#21169,JP_E_MONSTER_280
#21170,JP_E_MONSTER_281
#21171,JP_E_MONSTER_282
#21172,JP_E_MONSTER_283
#21173,JP_E_MONSTER_284
#21174,JP_E_MONSTER_285
#21175,JP_E_MONSTER_286
#21176,JP_E_MONSTER_287
#21177,JP_E_MONSTER_288
#21178,JP_E_MONSTER_289
#21179,JP_E_MONSTER_290
#21180,JP_E_MONSTER_291
#21181,JP_E_MONSTER_292
#21182,JP_E_MONSTER_293
#21183,JP_E_MONSTER_294
#21184,JP_E_MONSTER_295
#21185,JP_E_MONSTER_296
#21186,JP_E_MONSTER_297
#21187,JP_E_MONSTER_298
#21188,JP_E_MONSTER_299
#21189,JP_E_MONSTER_300
#21190,JP_E_MONSTER_301
#21191,JP_E_MONSTER_302
#21192,JP_E_MONSTER_303
#21193,JP_E_MONSTER_304
#21194,JP_E_MONSTER_305
#21195,JP_E_MONSTER_306
#21196,JP_E_MONSTER_307
#21197,JP_E_MONSTER_308
#21198,JP_E_MONSTER_309
#21199,JP_E_MONSTER_310
#21200,JP_E_MONSTER_311
#21201,JP_E_MONSTER_312
#21202,JP_E_MONSTER_313
#21203,JP_E_MONSTER_314
#21204,JP_E_MONSTER_315
#21205,JP_E_MONSTER_316
#21206,JP_E_MONSTER_317
#21207,JP_E_MONSTER_318
#21208,JP_E_MONSTER_319
#21209,JP_E_MONSTER_320
#21210,JP_E_MONSTER_321
#21211,JP_E_MONSTER_322
#21212,JP_E_MONSTER_323
#21213,JP_E_MONSTER_324
#21214,JP_E_MONSTER_325
#21215,JP_E_MONSTER_326
#21216,JP_E_MONSTER_327
#21217,JP_E_MONSTER_328
#21218,JP_E_MONSTER_329
#21219,JP_E_MONSTER_330
#21220,JP_E_MONSTER_331
#21221,JP_E_MONSTER_332
#21222,JP_E_MONSTER_333
#21223,JP_E_MONSTER_334
#21224,JP_E_MONSTER_335
#21225,JP_E_MONSTER_336
#21226,JP_E_MONSTER_337
#21227,JP_E_MONSTER_338
#21228,JP_E_MONSTER_339
#21229,JP_E_MONSTER_340
#21230,JP_E_MONSTER_341
#21231,JP_E_MONSTER_342
#21232,JP_E_MONSTER_343
#21233,JP_E_MONSTER_344
#21234,JP_E_MONSTER_345
#21235,JP_E_MONSTER_346
#21236,JP_E_MONSTER_347
#21237,JP_E_MONSTER_348
#21238,JP_E_MONSTER_349
#21239,JP_E_MONSTER_350
#21240,JP_E_MONSTER_351
#21241,JP_E_MONSTER_352
#21242,JP_E_MONSTER_353
#21243,JP_E_MONSTER_354
#21244,JP_E_MONSTER_355
#21245,JP_E_MONSTER_356
#21246,JP_E_MONSTER_357
#21247,JP_E_MONSTER_358
#21248,JP_E_MONSTER_359
#21249,JP_E_MONSTER_360
#21250,JP_E_MONSTER_361
#21251,JP_E_MONSTER_362
#21252,JP_E_MONSTER_363
#21253,JP_E_MONSTER_364
#21254,JP_E_MONSTER_365
#21255,JP_E_MONSTER_366
#21256,JP_E_MONSTER_367
#21257,JP_E_MONSTER_368
#21258,JP_E_MONSTER_369
#21259,JP_E_MONSTER_370
#21260,JP_E_MONSTER_371
#21261,JP_E_MONSTER_372
#21262,JP_E_MONSTER_373
#21263,JP_E_MONSTER_374
#21264,JP_E_MONSTER_375
#21265,JP_E_MONSTER_376
#21266,JP_E_MONSTER_377
#21267,JP_E_MONSTER_378
#21268,JP_E_MONSTER_379
#21269,JP_E_MONSTER_380
#21270,JP_E_MONSTER_381
#21271,JP_E_MONSTER_382
#21272,JP_E_MONSTER_383
#21273,JP_E_MONSTER_384
#21274,JP_E_MONSTER_385
#21275,JP_E_MONSTER_386
#21276,JP_E_MONSTER_387
#21277,JP_E_MONSTER_388
#21278,JP_E_MONSTER_389
#21279,JP_E_MONSTER_390
#21280,JP_E_MONSTER_391
#21281,JP_E_MONSTER_392
#21282,JP_E_MONSTER_393
#21283,JP_E_MONSTER_394
#21284,JP_E_MONSTER_395
#21285,JP_E_MONSTER_396
#21286,JP_E_MONSTER_397
#21287,JP_E_MONSTER_398
#21288,JP_E_MONSTER_399
#21289,JP_E_MONSTER_400
#21290,KIEL_D_01_2
#31999,HUNTING_GID_DEFAULT
#32000,MONSTER_2ND_END

3
src/map/npc.hpp
View File

@ -1188,6 +1188,9 @@ enum e_job_types
JT_4_4JOB_PHANTOMBOOK1,
JT_4_4JOB_PHANTOMBOOK2,
JT_4_4JOB_PHANTOMBOOK3,
JT_4_VENDING_MACHINE2,
JT_4_4JOB_MAURA = 10416,
JT_NEW_NPC_3RD_END = 19999,
NPC_RANGE3_END, // Official: JT_NEW_NPC_3RD_END=19999

2
src/map/script_constants.hpp
View File

@ -6252,6 +6252,8 @@
export_constant_npc(JT_4_4JOB_PHANTOMBOOK1);
export_constant_npc(JT_4_4JOB_PHANTOMBOOK2);
export_constant_npc(JT_4_4JOB_PHANTOMBOOK3);
export_constant_npc(JT_4_VENDING_MACHINE2);
export_constant_npc(JT_4_4JOB_MAURA);
export_constant_npc(JT_NEW_NPC_3RD_END);
#undef export_constant_npc