Преглед изворни кода

Mob and NPC Identity Update

rAthenaAPI пре 5 година
родитељ
комит
285071dd3b
3 измењених фајлова са 112 додато и 0 уклоњено
  1. 78 0
      db/re/mob_db.txt
  2. 17 0
      src/map/npc.hpp
  3. 17 0
      src/map/script_constants.hpp

+ 78 - 0
db/re/mob_db.txt

@@ -3761,6 +3761,84 @@
 //20617,BONE_ACIDUS
 //20618,BONE_DETALE
 //20619,GLOOMUNDERNIGHT2
+//20620,MD_REDPEPPER
+//20621,MD_REDPEPPER_H
+//20622,MD_ASSISTANT
+//20623,MD_ASSISTANT_H
+//20624,MD_DRY_RAFFLESIA
+//20625,MD_DRY_RAFFLESIA_H
+//20626,MD_ALNOLDI_EX
+//20627,MD_ALNOLDI_EX_H
+//20628,EP17_2_ALPHA_MASTER
+//20629,EP17_2_BETA_BASIC
+//20630,EP17_2_BETA_BASIC_NG
+//20631,MD_BETA_SCISSORE_NG
+//20632,MD_BETA_SCISSORE_NG_H
+//20633,EP17_2_BETA_CLEANER_A
+//20634,EP17_2_BETA_CLEANER_B
+//20635,EP17_2_BETA_BATHS_A
+//20636,EP17_2_BETA_BATHS_B
+//20637,EP17_2_BETA_ITEMKEEPER
+//20638,EP17_2_BETA_GUARDS
+//20639,EP17_2_BETA_GUARDS_NG
+//20640,EP17_2_OMEGA_CLEANER
+//20641,EP17_2_OMEGA_CLEANER_NG
+//20642,MD_SWEETY
+//20643,EP17_2_PHEN
+//20644,EP17_2_MARC
+//20645,EP17_2_SWORD_FISH
+//20646,EP17_2_PIRANHA
+//20647,EP17_2_BATH_MERMAID
+//20648,EP17_2_PITAYA_BOSS
+//20649,EP17_2_PITAYA_R
+//20650,EP17_2_PITAYA_Y
+//20651,EP17_2_PITAYA_B
+//20652,EP17_2_PITAYA_V
+//20653,EP17_2_PITAYA_G
+//20654,G_PITAYA_R
+//20655,G_PITAYA_Y
+//20656,G_PITAYA_B
+//20657,G_PITAYA_V
+//20658,G_PITAYA_G
+//20659,MD_PITAYA_BOSS
+//20660,MD_PITAYA_R
+//20661,MD_PITAYA_Y
+//20662,MD_PITAYA_B
+//20663,MD_PITAYA_V
+//20664,MD_PITAYA_G
+//20665,MD_VERPORTA
+//20666,MD_VERPORTE_H
+//20667,MD_SILVA_PAPILIA
+//20668,MD_GRAN_PAPILIA
+//20669,MD_PAPILA
+//20670,MD_PAPILA_H
+//20671,MD_PAPILA_RUBA
+//20672,MD_PAPILA_RUBA_H
+//20673,MD_PAPILA_RUBA2
+//20674,MD_PAPILA_CAE
+//20675,MD_PAPILA_CAE_H
+//20676,MD_PAPILA_CAE2
+//20677,MD_ARIES
+//20678,MD_ARIES_H
+//20679,EP17_2_GUARDIAN_PARTS
+//20680,EP17_2_HEART_HUNTER
+//20681,G_EP17_2_HEART_HUNTER
+//20682,EP17_2_HEART_HUNTER_H
+//20683,EP17_2_BOOKWORM
+//20684,EP17_2_ROAMING_SPLBOOK
+//20685,EP17_2_VENENUM3
+//20686,EP17_2_CRAMP
+//20687,EP17_2_WATERFALL
+//20688,EP17_2_BELLARE3
+//20689,EP17_2_DOLOR3
+//20690,EP17_2_PLASMA_Y
+//20691,EP17_2_PLAGA3
+//20692,EP17_2_SANARE3
+//20693,EP17_2_PLASMA_R
+//20694,EP17_2_PLASMA_R2
+
+//20696,EP17_2_CHILD_ADMIN1
+//20697,EP17_2_CHILD_ADMIN2
 
 //31999,HUNTING_GID_DEFAULT
 //32000,MONSTER_2ND_END

+ 17 - 0
src/map/npc.hpp

@@ -1144,6 +1144,23 @@ enum e_job_types
 	JT_4_PIGOCTO,
 	JT_4_ORK_HERO,
 	JT_4_JP_16TH,
+	JT_4_EP17_MASTER_A,
+	JT_4_EP17_BASIC_B,
+	JT_4_EP17_GUARD_B,
+	JT_4_EP17_BASIC_B_NG,
+	JT_4_EP17_GUARD_B_NG,
+	JT_4_EP17_SWEETY,
+	JT_4_EP17_BOY_A,
+	JT_4_EP17_BOY_B,
+	JT_4_EP17_TAMARIN,
+	JT_4_EP17_SCISSORE,
+	JT_4_EP17_TABLET,
+	JT_4_EP17_BUCKETS,
+	JT_4_EP17_CLEANER,
+	JT_4_EP17_BASKET,
+	JT_4_EP17_BROKENBETA,
+	JT_4_EP17_CLEANER_W,
+	JT_4_EP17_MERMAID,
 
 	JT_NEW_NPC_3RD_END = 19999,
 	NPC_RANGE3_END, // Official: JT_NEW_NPC_3RD_END=19999

+ 17 - 0
src/map/script_constants.hpp

@@ -5953,6 +5953,23 @@
 	export_constant_npc(JT_4_PIGOCTO);
 	export_constant_npc(JT_4_ORK_HERO);
 	export_constant_npc(JT_4_JP_16TH);
+	export_constant_npc(JT_4_EP17_MASTER_A);
+	export_constant_npc(JT_4_EP17_BASIC_B);
+	export_constant_npc(JT_4_EP17_GUARD_B);
+	export_constant_npc(JT_4_EP17_BASIC_B_NG);
+	export_constant_npc(JT_4_EP17_GUARD_B_NG);
+	export_constant_npc(JT_4_EP17_SWEETY);
+	export_constant_npc(JT_4_EP17_BOY_A);
+	export_constant_npc(JT_4_EP17_BOY_B);
+	export_constant_npc(JT_4_EP17_TAMARIN);
+	export_constant_npc(JT_4_EP17_SCISSORE);
+	export_constant_npc(JT_4_EP17_TABLET);
+	export_constant_npc(JT_4_EP17_BUCKETS);
+	export_constant_npc(JT_4_EP17_CLEANER);
+	export_constant_npc(JT_4_EP17_BASKET);
+	export_constant_npc(JT_4_EP17_BROKENBETA);
+	export_constant_npc(JT_4_EP17_CLEANER_W);
+	export_constant_npc(JT_4_EP17_MERMAID);
 	export_constant_npc(JT_NEW_NPC_3RD_END);
 	#undef export_constant_npc